From 94d722733630d88af45e0506e3fa653ae8f5753f Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 28 May 2026 11:13:03 -0700 Subject: [PATCH 001/591] Initial ruff formatting and uv project init --- .python-version | 1 + main.py | 6 + mpcontribs-api/main.py | 2 +- mpcontribs-api/maintenance.py | 3 +- mpcontribs-api/mpcontribs/api/__init__.py | 3 +- .../mpcontribs/api/attachments/document.py | 17 +- mpcontribs-api/mpcontribs/api/config.py | 14 +- .../mpcontribs/api/contributions/views.py | 2 +- mpcontribs-api/mpcontribs/api/core.py | 28 +- .../mpcontribs/api/notebooks/views.py | 105 ++++--- .../mpcontribs/api/projects/views.py | 2 +- .../mpcontribs/api/structures/views.py | 2 +- .../mpcontribs/api/tables/document.py | 24 +- mpcontribs-api/mpcontribs/api/tables/views.py | 8 +- mpcontribs-api/supervisord/conf.py | 6 +- .../mpcontribs/io/core/components/tdata.py | 2 +- mpcontribs-io/mpcontribs/io/core/utils.py | 5 +- mpcontribs-lux/mpcontribs/lux/autogen.py | 2 +- .../lux/projects/alab/schemas/base.py | 2 +- mpcontribs-portal/maintenance.py | 10 +- .../mpcontribs/portal/middleware.py | 3 +- mpcontribs-portal/mpcontribs/portal/urls.py | 4 +- mpcontribs-portal/mpcontribs/portal/views.py | 8 +- .../dilute_solute_diffusion/pre_submission.py | 4 - .../users/martin_lab/martin_lab.ipynb | 2 +- .../screening_inorganic_pv/pre_submission.py | 1 + .../mpcontribs/users/swf/pre_submission.py | 6 +- mpcontribs-portal/mpcontribs/users/utils.py | 5 +- .../2dmatpedia.ipynb | 91 +++--- .../Broberg_benchmark_defects.ipynb | 165 ++++------- .../ExpXAS.ipynb | 71 +++-- .../ForbiddenTransitions.ipynb | 164 +++++++--- .../HFP2023.ipynb | 69 ++--- .../MnO2_phase_selection.ipynb | 76 ++--- .../attachments.ipynb | 18 +- .../bioi_defects.ipynb | 32 +- .../contribs.materialsproject.org/cards.ipynb | 28 +- .../carrier_transport.ipynb | 226 +++++++------- .../defect_genome_pcfc_materials.ipynb | 70 +++-- .../deltaHvacancy.ipynb | 62 ++-- .../dilute_solute_diffusion.ipynb | 87 ++++-- .../download.ipynb | 21 +- .../contribs.materialsproject.org/dtu.ipynb | 51 ++-- .../ediffcrystalprediction.ipynb | 29 +- .../esters.ipynb | 27 +- .../experimental_thermo.ipynb | 279 ++++++++++-------- .../experimental_thermoelectrics.ipynb | 150 ++++++++-- .../ferroelectrics.ipynb | 162 ++++++---- .../contribs.materialsproject.org/gbdb.ipynb | 32 +- .../get_started.ipynb | 74 ++--- .../intermatch.ipynb | 9 +- .../ion_ref_data.ipynb | 115 +++++--- .../jarvis_dft.ipynb | 73 ++--- .../jarvis_dft_2023.ipynb | 156 +++++----- .../matscholar.ipynb | 30 +- .../melting_points.ipynb | 22 +- .../mg_cathode_screening_2022.ipynb | 252 +++++++++------- .../mofexplorer.ipynb | 12 +- .../ocp/ocp-update.ipynb | 13 +- .../ocp/ocp-upload.ipynb | 29 +- .../open_catalyst_project.ipynb | 55 ++-- .../perovskites_diffusion.ipynb | 17 +- .../pycroscopy.ipynb | 57 ++-- .../pydatarecognition.ipynb | 49 ++- .../qsgw_band_structures.ipynb | 164 +++++----- .../screening_inorganic_pv.ipynb | 18 +- .../silicon_defects.ipynb | 40 ++- .../simple_test.ipynb | 108 +++---- .../springer_materials.ipynb | 41 ++- .../contribs.materialsproject.org/swf.ipynb | 24 +- .../transparent_conductors.ipynb | 140 +++++---- .../genesis_efrc_minipipes.ipynb | 32 +- .../get_started.ipynb | 166 ++++++----- .../ml.materialsproject.org/get_started.ipynb | 119 ++++---- mpcontribs-portal/supervisord/conf.py | 2 +- mpcontribs-serverless/make_download/app.py | 17 +- pyproject.toml | 9 + uv.lock | 158 ++++++++++ 78 files changed, 2490 insertions(+), 1698 deletions(-) create mode 100644 .python-version create mode 100644 main.py create mode 100644 pyproject.toml create mode 100644 uv.lock diff --git a/.python-version b/.python-version new file mode 100644 index 0000000000..6324d401a0 --- /dev/null +++ b/.python-version @@ -0,0 +1 @@ +3.14 diff --git a/main.py b/main.py new file mode 100644 index 0000000000..bf67570ae8 --- /dev/null +++ b/main.py @@ -0,0 +1,6 @@ +def main(): + print("Hello from fastapi-conversion!") + + +if __name__ == "__main__": + main() diff --git a/mpcontribs-api/main.py b/mpcontribs-api/main.py index 2ec96e9fc6..a4c111b228 100755 --- a/mpcontribs-api/main.py +++ b/mpcontribs-api/main.py @@ -8,7 +8,7 @@ from supervisor.supervisorctl import Controller logger = logging.getLogger(__name__) -client = boto3.client('ecs') +client = boto3.client("ecs") def start(program): diff --git a/mpcontribs-api/maintenance.py b/mpcontribs-api/maintenance.py index d6c4682a08..6ff4b5f8aa 100644 --- a/mpcontribs-api/maintenance.py +++ b/mpcontribs-api/maintenance.py @@ -32,9 +32,10 @@ def fix_units(name): contrib.data = remap(contrib.data, visit=visit, enter=enter) # pull out display contrib.save(signal_kwargs={"skip": True}) # reparse display with intended unit - if idx and not idx%250: + if idx and not idx % 250: print(idx) + # additional maintenance functions # TODO generate JSON/CSV project downloads # TODO clean dangling notebooks diff --git a/mpcontribs-api/mpcontribs/api/__init__.py b/mpcontribs-api/mpcontribs/api/__init__.py index e61583b4b8..6885d1d65e 100644 --- a/mpcontribs-api/mpcontribs/api/__init__.py +++ b/mpcontribs-api/mpcontribs/api/__init__.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- """Flask App for MPContribs API""" + import os import smtplib import logging @@ -165,7 +166,7 @@ def get_kernels(): """retrieve list of kernels from KernelGateway service""" try: r = requests.get(get_kernel_endpoint(), timeout=2) - except (ConnectionError, Timeout): + except ConnectionError, Timeout: logger.warning("Kernel Gateway NOT AVAILABLE") return None diff --git a/mpcontribs-api/mpcontribs/api/attachments/document.py b/mpcontribs-api/mpcontribs/api/attachments/document.py index c5584a11aa..52e91702e3 100644 --- a/mpcontribs-api/mpcontribs/api/attachments/document.py +++ b/mpcontribs-api/mpcontribs/api/attachments/document.py @@ -3,7 +3,6 @@ import boto3 import binascii -from hashlib import md5 from flask import request from base64 import b64decode, b64encode from flask_mongoengine.documents import DynamicDocument @@ -27,7 +26,9 @@ class Attachments(DynamicDocument): name = StringField(required=True, help_text="file name") md5 = StringField(regex=r"^[a-z0-9]{32}$", unique=True, help_text="md5 sum") - mime = StringField(required=True, choices=SUPPORTED_MIMES, help_text="attachment mime type") + mime = StringField( + required=True, choices=SUPPORTED_MIMES, help_text="attachment mime type" + ) content = StringField(required=True, help_text="base64-encoded attachment content") meta = {"collection": "attachments", "indexes": ["name", "mime", "md5"]} @@ -44,7 +45,9 @@ def post_init(cls, sender, document, **kwargs): if "content" in requested_fields: if not document.md5: # document.reload("md5") # TODO AttributeError: _changed_fields - raise ValueError("Please also request md5 field to retrieve attachment content!") + raise ValueError( + "Please also request md5 field to retrieve attachment content!" + ) retr = s3_client.get_object(Bucket=BUCKET, Key=document.md5) document.content = b64encode(retr["Body"].read()).decode("utf-8") @@ -84,9 +87,13 @@ def pre_save_post_validation(cls, sender, document, **kwargs): Metadata={"name": document.name}, Body=content, ) - document.content = str(size) # set to something useful to distinguish in post_init + document.content = str( + size + ) # set to something useful to distinguish in post_init signals.post_init.connect(Attachments.post_init, sender=Attachments) signals.pre_delete.connect(Attachments.pre_delete, sender=Attachments) -signals.pre_save_post_validation.connect(Attachments.pre_save_post_validation, sender=Attachments) +signals.pre_save_post_validation.connect( + Attachments.pre_save_post_validation, sender=Attachments +) diff --git a/mpcontribs-api/mpcontribs/api/config.py b/mpcontribs-api/mpcontribs/api/config.py index f044f4ab95..e9539ed081 100644 --- a/mpcontribs-api/mpcontribs/api/config.py +++ b/mpcontribs-api/mpcontribs/api/config.py @@ -74,22 +74,22 @@ "tags": [ { "name": "projects", - "description": f'contain provenance information about contributed datasets. \ + "description": "contain provenance information about contributed datasets. \ Deleting projects will also delete all contributions including tables, structures, attachments, notebooks \ and cards for the project. Only users who have been added to a project can update its contents. While \ unpublished, only users on the project can retrieve its data or view it on the \ Portal. Making a project public does not automatically publish all \ - its contributions, tables, attachments, and structures. These are separately set to public individually or in bulk.' + its contributions, tables, attachments, and structures. These are separately set to public individually or in bulk." "", }, { "name": "contributions", - "description": f'contain simple hierarchical data which will show up as cards on the MP details \ + "description": "contain simple hierarchical data which will show up as cards on the MP details \ page for MP material(s). Tables (rows and columns), structures, and attachments can be added to a \ contribution. Each contribution uses `mp-id` or composition as identifier to associate its data with the \ according entries on MP. Only admins or users on the project can create, update or delete contributions, and \ while unpublished, retrieve its data or view it on the Portal. \ - Contribution components (tables, structures, and attachments) are deleted along with a contribution.', + Contribution components (tables, structures, and attachments) are deleted along with a contribution.", }, { "name": "structures", @@ -105,12 +105,12 @@ }, { "name": "attachments", - "description": 'are files saved as objects in AWS S3 and not accessible for querying (only retrieval) \ - which can be added to a contribution.', + "description": "are files saved as objects in AWS S3 and not accessible for querying (only retrieval) \ + which can be added to a contribution.", }, { "name": "notebooks", - "description": f'are Jupyter \ + "description": 'are Jupyter \ notebook \ documents generated and saved when a contribution is saved. They form the basis for Contribution \ Details Pages on the Portal.', diff --git a/mpcontribs-api/mpcontribs/api/contributions/views.py b/mpcontribs-api/mpcontribs/api/contributions/views.py index 86bfb70b8c..f78af3d671 100644 --- a/mpcontribs-api/mpcontribs/api/contributions/views.py +++ b/mpcontribs-api/mpcontribs/api/contributions/views.py @@ -179,7 +179,7 @@ def search(): try: comp = Composition(formula) - except (CompositionError, ValueError): + except CompositionError, ValueError: abort(400, description="Invalid formula provided.") ind_str = [] diff --git a/mpcontribs-api/mpcontribs/api/core.py b/mpcontribs-api/mpcontribs/api/core.py index ff24418d64..39da673ac3 100644 --- a/mpcontribs-api/mpcontribs/api/core.py +++ b/mpcontribs-api/mpcontribs/api/core.py @@ -1,8 +1,4 @@ -# -*- coding: utf-8 -*- -"""Custom meta-class and MethodView for Swagger""" - import os -import logging import yaml from copy import deepcopy @@ -598,7 +594,8 @@ def has_read_permission(self, request, qs): from mpcontribs.api.contributions.document import get_resource resource = get_resource(component) - qfilter = lambda qs: qs.clone() + def qfilter(qs): + return qs.clone() if pk: ids = [resource.get_object(pk, qfilter=qfilter).id] @@ -614,15 +611,20 @@ def has_read_permission(self, request, qs): qfilter = self.get_projects_filter(username, groups) component = component[:-1] if component == "notebooks" else component qfilter &= Q(**{f"{component}__in": ids}) - contribs = Contributions.objects(qfilter).only(component).limit(len(ids)) + contribs = ( + Contributions.objects(qfilter).only(component).limit(len(ids)) + ) # return new queryset using "ids__in" - readable_ids = [ - getattr(contrib, component).id for contrib in contribs - ] if component == "notebook" else [ - dbref.id for contrib in contribs - for dbref in getattr(contrib, component) - if dbref.id in ids - ] + readable_ids = ( + [getattr(contrib, component).id for contrib in contribs] + if component == "notebook" + else [ + dbref.id + for contrib in contribs + for dbref in getattr(contrib, component) + if dbref.id in ids + ] + ) if not readable_ids: return qs.none() diff --git a/mpcontribs-api/mpcontribs/api/notebooks/views.py b/mpcontribs-api/mpcontribs/api/notebooks/views.py index e3bf88af8c..93ea20e6b9 100644 --- a/mpcontribs-api/mpcontribs/api/notebooks/views.py +++ b/mpcontribs-api/mpcontribs/api/notebooks/views.py @@ -105,14 +105,17 @@ def restart_kernels(): for kernel_id in kernel_ids: kernel_url = get_kernel_endpoint(kernel_id) + "/restart" requests.post(kernel_url, json={}) - cells = [nbf.new_code_cell("\n".join([ - "from mpcontribs.client import Client", - "print('client imported')" - ]))] + cells = [ + nbf.new_code_cell( + "\n".join( + ["from mpcontribs.client import Client", "print('client imported')"] + ) + ) + ] run_cells(kernel_id, "import_client", cells) -@notebooks.route('/result', defaults={'job_id': None}) +@notebooks.route("/result", defaults={"job_id": None}) @notebooks.route("/result/") def result(job_id): if not current_app.kernels: @@ -156,7 +159,7 @@ def make(projects=None, cids=None, force=False): ret["job"] = { "id": job.id, "enqueued_at": job.enqueued_at.isoformat(), - "started_at": job.started_at.isoformat() + "started_at": job.started_at.isoformat(), } exclude = list(Contributions._fields.keys()) @@ -177,8 +180,11 @@ def make(projects=None, cids=None, force=False): start = time.perf_counter() - if not force and document.notebook and \ - not getattr(document, "needs_build", True): + if ( + not force + and document.notebook + and not getattr(document, "needs_build", True) + ): continue if document.notebook: @@ -197,49 +203,63 @@ def make(projects=None, cids=None, force=False): cells = [ # define client only once in kernel # avoids API calls for regex expansion for query parameters - nbf.new_code_cell("\n".join([ - "if 'client' not in locals():", - "\tclient = Client(", - f'\t\theaders={{"X-Authenticated-Groups": "{ADMIN_GROUP}"}},', - f'\t\thost="{MPCONTRIBS_API_HOST}"', - "\t)", - "print(client.get_totals())", - # return something. See while loop in `run_cells` - ])), - nbf.new_code_cell("\n".join([ - f'c = client.get_contribution("{document.id}")', - 'c.display()' - ])), + nbf.new_code_cell( + "\n".join( + [ + "if 'client' not in locals():", + "\tclient = Client(", + f'\t\theaders={{"X-Authenticated-Groups": "{ADMIN_GROUP}"}},', + f'\t\thost="{MPCONTRIBS_API_HOST}"', + "\t)", + "print(client.get_totals())", + # return something. See while loop in `run_cells` + ] + ) + ), + nbf.new_code_cell( + "\n".join( + [f'c = client.get_contribution("{document.id}")', "c.display()"] + ) + ), ] if document.tables: cells.append(nbf.new_markdown_cell("## Tables")) for table in document.tables: cells.append( - nbf.new_code_cell("\n".join([ - f't = client.get_table("{table.id}")', - 't.display()' - ])) + nbf.new_code_cell( + "\n".join( + [f't = client.get_table("{table.id}")', "t.display()"] + ) + ) ) if document.structures: cells.append(nbf.new_markdown_cell("## Structures")) for structure in document.structures: cells.append( - nbf.new_code_cell("\n".join([ - f's = client.get_structure("{structure.id}")', - 's.display()' - ])) + nbf.new_code_cell( + "\n".join( + [ + f's = client.get_structure("{structure.id}")', + "s.display()", + ] + ) + ) ) if document.attachments: cells.append(nbf.new_markdown_cell("## Attachments")) for attachment in document.attachments: cells.append( - nbf.new_code_cell("\n".join([ - f'a = client.get_attachment("{attachment.id}")', - 'a.info()' - ])) + nbf.new_code_cell( + "\n".join( + [ + f'a = client.get_attachment("{attachment.id}")', + "a.info()", + ] + ) + ) ) try: @@ -249,7 +269,11 @@ def make(projects=None, cids=None, force=False): restart_kernels() ret["result"] = { - "status": "ERROR", "cid": cid, "count": count, "total": total, "exc": str(e) + "status": "ERROR", + "cid": cid, + "count": count, + "total": total, + "exc": str(e), } return ret @@ -258,7 +282,10 @@ def make(projects=None, cids=None, force=False): restart_kernels() ret["result"] = { - "status": "ERROR: NO OUTPUTS", "cid": cid, "count": count, "total": total + "status": "ERROR: NO OUTPUTS", + "cid": cid, + "count": count, + "total": total, } return ret @@ -268,7 +295,7 @@ def make(projects=None, cids=None, force=False): doc = nbf.new_notebook() doc["cells"] = [ nbf.new_code_cell("from mpcontribs.client import Client"), - nbf.new_code_cell(f'client = Client()'), + nbf.new_code_cell("client = Client()"), ] doc["cells"] += cells[1:] # skip localhost Client @@ -280,7 +307,11 @@ def make(projects=None, cids=None, force=False): restart_kernels() ret["result"] = { - "status": "ERROR", "cid": cid, "count": count, "total": total, "exc": str(e) + "status": "ERROR", + "cid": cid, + "count": count, + "total": total, + "exc": str(e), } return ret diff --git a/mpcontribs-api/mpcontribs/api/projects/views.py b/mpcontribs-api/mpcontribs/api/projects/views.py index 1a000107bd..3b2dfa1110 100644 --- a/mpcontribs-api/mpcontribs/api/projects/views.py +++ b/mpcontribs-api/mpcontribs/api/projects/views.py @@ -161,7 +161,7 @@ def applications(token, action): else: obj.delete() # post_delete signal sends notification - return f'{project} {action.replace("y", "ie")}d and {owner} notified.' + return f"{project} {action.replace('y', 'ie')}d and {owner} notified." @projects.route("/search") diff --git a/mpcontribs-api/mpcontribs/api/structures/views.py b/mpcontribs-api/mpcontribs/api/structures/views.py index 07aeb79013..e30996dd59 100644 --- a/mpcontribs-api/mpcontribs/api/structures/views.py +++ b/mpcontribs-api/mpcontribs/api/structures/views.py @@ -20,7 +20,7 @@ class StructuresResource(Resource): "id": [ops.In, ops.Exact], "md5": [ops.In, ops.Exact], "name": FILTERS["STRINGS"], - "sites": [ops.Size] + "sites": [ops.Size], } fields = ["id", "name", "md5"] allowed_ordering = ["name"] diff --git a/mpcontribs-api/mpcontribs/api/tables/document.py b/mpcontribs-api/mpcontribs/api/tables/document.py index dc52876df1..c73aee76fb 100644 --- a/mpcontribs-api/mpcontribs/api/tables/document.py +++ b/mpcontribs-api/mpcontribs/api/tables/document.py @@ -1,11 +1,15 @@ # -*- coding: utf-8 -*- -from hashlib import md5 from flask_mongoengine.documents import DynamicDocument from mongoengine import signals, EmbeddedDocument from mongoengine.fields import StringField, ListField, IntField, EmbeddedDocumentField from mongoengine.queryset.manager import queryset_manager -from mpcontribs.api.contributions.document import format_cell, get_resource, get_md5, COMPONENTS +from mpcontribs.api.contributions.document import ( + format_cell, + get_resource, + get_md5, + COMPONENTS, +) class Labels(EmbeddedDocument): @@ -27,10 +31,18 @@ class Tables(DynamicDocument): data = ListField(ListField(StringField()), required=True, help_text="table rows") md5 = StringField(regex=r"^[a-z0-9]{32}$", unique=True, help_text="md5 sum") total_data_rows = IntField(help_text="total number of rows") - meta = {"collection": "tables", "indexes": [ - "name", "columns", "md5", "attrs.title", - "attrs.labels.index", "attrs.labels.value", "attrs.labels.variable" - ]} + meta = { + "collection": "tables", + "indexes": [ + "name", + "columns", + "md5", + "attrs.title", + "attrs.labels.index", + "attrs.labels.value", + "attrs.labels.variable", + ], + } @queryset_manager def objects(doc_cls, queryset): diff --git a/mpcontribs-api/mpcontribs/api/tables/views.py b/mpcontribs-api/mpcontribs/api/tables/views.py index a8f6579988..0e7f4a6d83 100644 --- a/mpcontribs-api/mpcontribs/api/tables/views.py +++ b/mpcontribs-api/mpcontribs/api/tables/views.py @@ -38,7 +38,13 @@ class TablesResource(Resource): "attrs__labels__variable": FILTERS["STRINGS"], } fields = [ - "id", "name", "md5", "attrs", "columns", "total_data_rows", "total_data_pages" + "id", + "name", + "md5", + "attrs", + "columns", + "total_data_rows", + "total_data_pages", ] allowed_ordering = ["name", "total_data_rows"] paginate = True diff --git a/mpcontribs-api/supervisord/conf.py b/mpcontribs-api/supervisord/conf.py index fb0dde081b..321c06a52f 100644 --- a/mpcontribs-api/supervisord/conf.py +++ b/mpcontribs-api/supervisord/conf.py @@ -18,7 +18,7 @@ "db": db, "s3": s3, "tm": tm.upper(), - "max_projects": int(max_projects) if max_projects else 3 + "max_projects": int(max_projects) if max_projects else 3, } kwargs = { @@ -28,7 +28,9 @@ "reload": int(not PRODUCTION), "node_env": "production" if PRODUCTION else "development", "flask_log_level": "INFO" if PRODUCTION else "DEBUG", - "jupyter_gateway_host": f"localhost:{KG_PORT}" if PRODUCTION else f"kernel-gateway:{KG_PORT}", + "jupyter_gateway_host": f"localhost:{KG_PORT}" + if PRODUCTION + else f"kernel-gateway:{KG_PORT}", "dd_agent_host": "localhost" if PRODUCTION else "datadog", "mpcontribs_api_host": "localhost" if PRODUCTION else "contribs-apis", } diff --git a/mpcontribs-io/mpcontribs/io/core/components/tdata.py b/mpcontribs-io/mpcontribs/io/core/components/tdata.py index 17293619a7..365c9d6221 100644 --- a/mpcontribs-io/mpcontribs/io/core/components/tdata.py +++ b/mpcontribs-io/mpcontribs/io/core/components/tdata.py @@ -105,7 +105,7 @@ def to_backgrid_dict(self): composition = get_composition_from_string(cell) composition = pmg_util.string.unicodeify(composition) table["rows"][row_index][col] = composition - except (CompositionError, ValueError, OverflowError): + except CompositionError, ValueError, OverflowError: try: # https://stackoverflow.com/a/38020041 result = urlparse(cell) diff --git a/mpcontribs-io/mpcontribs/io/core/utils.py b/mpcontribs-io/mpcontribs/io/core/utils.py index 1def24772d..b86075c234 100644 --- a/mpcontribs-io/mpcontribs/io/core/utils.py +++ b/mpcontribs-io/mpcontribs/io/core/utils.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- """module defines utility methods for MPContribs core.io library""" + from __future__ import unicode_literals from decimal import Decimal, DecimalException, InvalidOperation import six @@ -82,7 +83,7 @@ def normalize_root_level(title): try: composition = get_composition_from_string(title) return False, composition - except (CompositionError, KeyError, TypeError, ValueError): + except CompositionError, KeyError, TypeError, ValueError: if mp_id_pattern.match(title.lower()): return False, title.lower() return True, title @@ -157,6 +158,6 @@ def read_csv(body, is_data_section=True, **kwargs): squeeze=True, converters=converters, encoding="utf8", - **options + **options, ).dropna(how="all") ) diff --git a/mpcontribs-lux/mpcontribs/lux/autogen.py b/mpcontribs-lux/mpcontribs/lux/autogen.py index aeee406c21..a193ca9bbe 100644 --- a/mpcontribs-lux/mpcontribs/lux/autogen.py +++ b/mpcontribs-lux/mpcontribs/lux/autogen.py @@ -118,7 +118,7 @@ def pydantic_model(self) -> Type[BaseModel]: } return create_model( - f"{self.file_name.name.split('.',1)[0]}", + f"{self.file_name.name.split('.', 1)[0]}", **model_fields, ) diff --git a/mpcontribs-lux/mpcontribs/lux/projects/alab/schemas/base.py b/mpcontribs-lux/mpcontribs/lux/projects/alab/schemas/base.py index d514463dd4..b26e3d23e9 100644 --- a/mpcontribs-lux/mpcontribs/lux/projects/alab/schemas/base.py +++ b/mpcontribs-lux/mpcontribs/lux/projects/alab/schemas/base.py @@ -24,7 +24,7 @@ def ExcludeFromUpload(default: Any = None, description: str = "", **kwargs) -> A default=default, description=description, json_schema_extra={"exclude_from_upload": True}, - **kwargs + **kwargs, ) diff --git a/mpcontribs-portal/maintenance.py b/mpcontribs-portal/maintenance.py index 618bf78625..fd878968f1 100644 --- a/mpcontribs-portal/maintenance.py +++ b/mpcontribs-portal/maintenance.py @@ -12,9 +12,11 @@ def generate_downloads(names=None): q = {"name__in": names} if names else {} client = Client(host=os.environ["MPCONTRIBS_API_HOST"], headers=HEADERS) - projects = client.projects.queryProjects( - _fields=["name", "stats"], **q - ).result().get("data", []) + projects = ( + client.projects.queryProjects(_fields=["name", "stats"], **q) + .result() + .get("data", []) + ) skip = {"columns", "contributions"} print("PROJECTS", len(projects)) @@ -28,7 +30,7 @@ def generate_downloads(names=None): print(name, json.loads(resp.content)) if include: - for r in range(1, len(include)+1): + for r in range(1, len(include) + 1): for combo in combinations(include, r): resp = make_download(client, query, combo) print(name, combo, json.loads(resp.content)) diff --git a/mpcontribs-portal/mpcontribs/portal/middleware.py b/mpcontribs-portal/mpcontribs/portal/middleware.py index d9777c3d61..d41258cd54 100644 --- a/mpcontribs-portal/mpcontribs/portal/middleware.py +++ b/mpcontribs-portal/mpcontribs/portal/middleware.py @@ -1,9 +1,8 @@ class MyMiddleware: - def __init__(self, get_response): self.get_response = get_response def __call__(self, request): response = self.get_response(request) - response['X-Consumer-Id'] = request.META.get("HTTP_X_CONSUMER_ID") + response["X-Consumer-Id"] = request.META.get("HTTP_X_CONSUMER_ID") return response diff --git a/mpcontribs-portal/mpcontribs/portal/urls.py b/mpcontribs-portal/mpcontribs/portal/urls.py index fb87ece834..cb074fad97 100644 --- a/mpcontribs-portal/mpcontribs/portal/urls.py +++ b/mpcontribs-portal/mpcontribs/portal/urls.py @@ -25,7 +25,7 @@ url( r"^contributions/download/create/?$", views.create_download, - name="create_download" + name="create_download", ), url( r"^contributions/component/(?P[a-f\d]{24})$", @@ -53,7 +53,7 @@ url(r"^Fe-Co-V/?$", RedirectView.as_view(url="/projects/swf")), url( r"^ScreeningInorganicPV/?$", - RedirectView.as_view(url="/projects/screening_inorganic_pv") + RedirectView.as_view(url="/projects/screening_inorganic_pv"), ), url( r"^(?P[a-zA-Z0-9_]{3,31})/?$", diff --git a/mpcontribs-portal/mpcontribs/portal/views.py b/mpcontribs-portal/mpcontribs/portal/views.py index 566a6b6542..879ca4de14 100644 --- a/mpcontribs-portal/mpcontribs/portal/views.py +++ b/mpcontribs-portal/mpcontribs/portal/views.py @@ -55,7 +55,7 @@ def get_consumer(request): ] headers = {} for name in names: - key = f'HTTP_{name.upper().replace("-", "_")}' + key = f"HTTP_{name.upper().replace('-', '_')}" value = request.META.get(key) if value is not None: headers[name] = value @@ -126,7 +126,7 @@ def landingpage(request, project): ctx["columns"] = ["identifier", "id", "formula"] + [ col["path"] if col["unit"] == "NaN" - else f'{col["path"]} [{col["unit"]}]' + else f"{col['path']} [{col['unit']}]" for col in prov["columns"] ] ctx["search_columns"] = ["identifier", "formula"] + [ @@ -139,7 +139,7 @@ def landingpage(request, project): ] ctx["ranges"] = json.dumps( { - f'{col["path"]} [{col["unit"]}]': [col["min"], col["max"]] + f"{col['path']} [{col['unit']}]": [col["min"], col["max"]] for col in prov["columns"] if col["unit"] != "NaN" } @@ -166,7 +166,7 @@ def apply(request): if headers.get("X-Anonymous-Consumer", False): ctx["alert"] = f""" - Please log in to apply for a project. + Please log in to apply for a project. """.strip() return render(request, "apply.html", ctx.flatten()) diff --git a/mpcontribs-portal/mpcontribs/users/dilute_solute_diffusion/pre_submission.py b/mpcontribs-portal/mpcontribs/users/dilute_solute_diffusion/pre_submission.py index 045f5bd71f..ed983aaf7e 100644 --- a/mpcontribs-portal/mpcontribs/users/dilute_solute_diffusion/pre_submission.py +++ b/mpcontribs-portal/mpcontribs/users/dilute_solute_diffusion/pre_submission.py @@ -21,7 +21,6 @@ def run(mpfile, hosts=None, download=False): fpath = f"{project}.xlsx" if download or not os.path.exists(fpath): - figshare_id = 1546772 url = "https://api.figshare.com/v2/articles/{}".format(figshare_id) print("get figshare article {}".format(figshare_id)) @@ -133,7 +132,6 @@ def run(mpfile, hosts=None, download=False): mpfile.add_data_table(mpid, df_D0_Q, "D₀_Q") if hdata["Host"]["crystal_structure"] == "BCC": - print("add table for hop activation barriers for {} (BCC)".format(mpid)) columns_E = ( ["Hop activation barrier, E_{} [eV]".format(i) for i in range(2, 5)] @@ -169,7 +167,6 @@ def run(mpfile, hosts=None, download=False): mpfile.add_data_table(mpid, df_v, "hop_attempt_frequencies") elif hdata["Host"]["crystal_structure"] == "FCC": - print("add table for hop activation barriers for {} (FCC)".format(mpid)) columns_E = [ "Hop activation barrier, E_{} [eV]".format(i) for i in range(5) @@ -191,7 +188,6 @@ def run(mpfile, hosts=None, download=False): mpfile.add_data_table(mpid, df_v, "hop_attempt_frequencies") elif hdata["Host"]["crystal_structure"] == "HCP": - print("add table for hop activation barriers for {} (HCP)".format(mpid)) columns_E = [ "Hop activation barrier, E_X [eV]", diff --git a/mpcontribs-portal/mpcontribs/users/martin_lab/martin_lab.ipynb b/mpcontribs-portal/mpcontribs/users/martin_lab/martin_lab.ipynb index 63ddffaa99..c1813d0517 100644 --- a/mpcontribs-portal/mpcontribs/users/martin_lab/martin_lab.ipynb +++ b/mpcontribs-portal/mpcontribs/users/martin_lab/martin_lab.ipynb @@ -20,7 +20,7 @@ }, "outputs": [], "source": [ - "mpfile = MPFile.from_file('MPContribs/mpcontribs/users/martin_lab/mpfile_init.txt')" + "mpfile = MPFile.from_file(\"MPContribs/mpcontribs/users/martin_lab/mpfile_init.txt\")" ] }, { diff --git a/mpcontribs-portal/mpcontribs/users/screening_inorganic_pv/pre_submission.py b/mpcontribs-portal/mpcontribs/users/screening_inorganic_pv/pre_submission.py index 454a5597e3..b9eb3cfa4b 100644 --- a/mpcontribs-portal/mpcontribs/users/screening_inorganic_pv/pre_submission.py +++ b/mpcontribs-portal/mpcontribs/users/screening_inorganic_pv/pre_submission.py @@ -12,6 +12,7 @@ db = client["mpcontribs"] print(db.contributions.count_documents({"project": "screening_inorganic_pv"})) + # @duplicate_check def run(mpfile, **kwargs): diff --git a/mpcontribs-portal/mpcontribs/users/swf/pre_submission.py b/mpcontribs-portal/mpcontribs/users/swf/pre_submission.py index 6c46bc0c1a..98b38034fd 100644 --- a/mpcontribs-portal/mpcontribs/users/swf/pre_submission.py +++ b/mpcontribs-portal/mpcontribs/users/swf/pre_submission.py @@ -6,20 +6,20 @@ def round_to_100_percent(number_set, digit_after_decimal=1): unround_numbers = [ - x / float(sum(number_set)) * 100 * 10 ** digit_after_decimal for x in number_set + x / float(sum(number_set)) * 100 * 10**digit_after_decimal for x in number_set ] decimal_part_with_index = sorted( [(index, unround_numbers[index] % 1) for index in range(len(unround_numbers))], key=lambda y: y[1], reverse=True, ) - remainder = 100 * 10 ** digit_after_decimal - sum(map(int, unround_numbers)) + remainder = 100 * 10**digit_after_decimal - sum(map(int, unround_numbers)) index = 0 while remainder > 0: unround_numbers[decimal_part_with_index[index][0]] += 1 remainder -= 1 index = (index + 1) % len(number_set) - return [int(x) / float(10 ** digit_after_decimal) for x in unround_numbers] + return [int(x) / float(10**digit_after_decimal) for x in unround_numbers] @duplicate_check diff --git a/mpcontribs-portal/mpcontribs/users/utils.py b/mpcontribs-portal/mpcontribs/users/utils.py index 4cf02217e9..487f9af679 100644 --- a/mpcontribs-portal/mpcontribs/users/utils.py +++ b/mpcontribs-portal/mpcontribs/users/utils.py @@ -45,7 +45,10 @@ def wrapper(*args, **kwargs): # https://stackoverflow.com/a/55545369 -def unflatten(d: Dict[str, Any], base: Dict[str, Any] = None,) -> Dict[str, Any]: +def unflatten( + d: Dict[str, Any], + base: Dict[str, Any] = None, +) -> Dict[str, Any]: """Convert any keys containing dotted paths to nested dicts >>> unflatten({'a': 12, 'b': 13, 'c': 14}) # no expansion diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/2dmatpedia.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/2dmatpedia.ipynb index daf3c45748..69f3d106fe 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/2dmatpedia.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/2dmatpedia.ipynb @@ -20,7 +20,7 @@ "metadata": {}, "outputs": [], "source": [ - "name = '2dmatpedia'\n", + "name = \"2dmatpedia\"\n", "client = Client()\n", "mpr = MPRester()" ] @@ -61,20 +61,20 @@ " \"Eˣ\": \"exfoliation energy\",\n", " \"E\": \"energy\",\n", " \"Eᵛᵈʷ\": \"van-der-Waals energy\",\n", - " \"µ\": \"total magnetization\"\n", + " \"µ\": \"total magnetization\",\n", "}\n", "\n", "project = {\n", - " 'is_public': True,\n", - " 'title': '2DMatPedia',\n", - " 'long_title': '2D Materials Encyclopedia',\n", - " 'owner': 'migueldiascosta@nus.edu.sg',\n", - " 'authors': 'M. Dias Costa, F.Y. Ping, Z. Jun',\n", - " 'description': description,\n", - " 'references': [\n", - " {'label': 'WWW', 'url': 'http://www.2dmatpedia.org'},\n", - " {'label': 'PRL', 'url': 'https://doi.org/10.1103/PhysRevLett.118.106101'}\n", - " ]\n", + " \"is_public\": True,\n", + " \"title\": \"2DMatPedia\",\n", + " \"long_title\": \"2D Materials Encyclopedia\",\n", + " \"owner\": \"migueldiascosta@nus.edu.sg\",\n", + " \"authors\": \"M. Dias Costa, F.Y. Ping, Z. Jun\",\n", + " \"description\": description,\n", + " \"references\": [\n", + " {\"label\": \"WWW\", \"url\": \"http://www.2dmatpedia.org\"},\n", + " {\"label\": \"PRL\", \"url\": \"https://doi.org/10.1103/PhysRevLett.118.106101\"},\n", + " ],\n", "}\n", "\n", "# client.projects.update_entry(pk=name, project=project).result()\n", @@ -89,21 +89,18 @@ "outputs": [], "source": [ "columns = {\n", - " 'material_id': {'name': 'details'},\n", - " 'source_id': {'name': 'source'},\n", - " 'discovery_process': {'name': 'process'},\n", - " 'bandgap': {'name': 'ΔE', 'unit': 'eV'},\n", - " 'decomposition_energy': {'name': 'Eᵈ', 'unit': 'eV/atom'},\n", - " 'exfoliation_energy_per_atom': {'name': 'Eˣ', 'unit': 'eV/atom'},\n", - " 'energy_per_atom': {'name': 'E', 'unit': 'eV/atom'},\n", - " 'energy_vdw_per_atom': {'name': 'Eᵛᵈʷ', 'unit': 'eV/atom'},\n", - " 'total_magnetization': {'name': 'µ', 'unit': 'µᵇ'} \n", + " \"material_id\": {\"name\": \"details\"},\n", + " \"source_id\": {\"name\": \"source\"},\n", + " \"discovery_process\": {\"name\": \"process\"},\n", + " \"bandgap\": {\"name\": \"ΔE\", \"unit\": \"eV\"},\n", + " \"decomposition_energy\": {\"name\": \"Eᵈ\", \"unit\": \"eV/atom\"},\n", + " \"exfoliation_energy_per_atom\": {\"name\": \"Eˣ\", \"unit\": \"eV/atom\"},\n", + " \"energy_per_atom\": {\"name\": \"E\", \"unit\": \"eV/atom\"},\n", + " \"energy_vdw_per_atom\": {\"name\": \"Eᵛᵈʷ\", \"unit\": \"eV/atom\"},\n", + " \"total_magnetization\": {\"name\": \"µ\", \"unit\": \"µᵇ\"},\n", "}\n", "\n", - "init_columns = {\n", - " v[\"name\"]: v.get(\"unit\")\n", - " for v in columns.values()\n", - "}\n", + "init_columns = {v[\"name\"]: v.get(\"unit\") for v in columns.values()}\n", "init_columns[\"structures\"] = None\n", "\n", "# client.init_columns(name, init_columns)\n", @@ -125,13 +122,13 @@ "source": [ "db_json = \"http://www.2dmatpedia.org/static/db.json.gz\"\n", "raw_data = [] # as read from raw files\n", - "dbfile = db_json.rsplit('/')[-1]\n", + "dbfile = db_json.rsplit(\"/\")[-1]\n", "\n", "if not os.path.exists(dbfile):\n", - " print('downloading', dbfile, '...')\n", + " print(\"downloading\", dbfile, \"...\")\n", " urlretrieve(db_json, dbfile)\n", "\n", - "with gzip.open(dbfile, 'rb') as f:\n", + "with gzip.open(dbfile, \"rb\") as f:\n", " for line in f:\n", " raw_data.append(json.loads(line, cls=MontyDecoder))\n", "\n", @@ -146,23 +143,23 @@ "source": [ "details_url = \"http://www.2dmatpedia.org/2dmaterials/doc/\"\n", "contributions = []\n", - "prefixes = {'mp', 'mvc', '2dm'}\n", + "prefixes = {\"mp\", \"mvc\", \"2dm\"}\n", "\n", "for rd in raw_data:\n", - " source_id = rd['source_id']\n", - " prefix = source_id.split('-')[0]\n", - " \n", + " source_id = rd[\"source_id\"]\n", + " prefix = source_id.split(\"-\")[0]\n", + "\n", " if prefix not in prefixes:\n", " continue\n", - " \n", - " identifier = rd['material_id'] if prefix == \"2dm\" else source_id \n", + "\n", + " identifier = rd[\"material_id\"] if prefix == \"2dm\" else source_id\n", " d = {}\n", - " \n", + "\n", " for k, col in columns.items():\n", " value = rd.get(k)\n", " if not value:\n", " continue\n", - " \n", + "\n", " unit = col.get(\"unit\")\n", "\n", " if k == \"material_id\" or (k == \"source_id\" and rd[k].startswith(\"2dm\")):\n", @@ -175,8 +172,11 @@ " d[col[\"name\"]] = value\n", "\n", " contrib = {\n", - " 'project': name, 'is_public': True, 'identifier': identifier,\n", - " 'data': d, 'structures': [rd[\"structure\"]]\n", + " \"project\": name,\n", + " \"is_public\": True,\n", + " \"identifier\": identifier,\n", + " \"data\": d,\n", + " \"structures\": [rd[\"structure\"]],\n", " }\n", "\n", " contributions.append(contrib)\n", @@ -201,13 +201,18 @@ "# client.init_columns(name, init_columns)\n", "# do manual dupe check (due to unique_identifiers=False) and submit missing contributions\n", "all_ids = client.get_all_ids(\n", - " query={\"project\": name}, data_id_fields={name: \"details\"}\n", + " query={\"project\": name},\n", + " data_id_fields={name: \"details\"},\n", " # TODO use fmt=\"map\" for update\n", ").get(name)\n", - "client.submit_contributions([\n", - " contrib for contrib in contributions\n", - " if contrib[\"data\"][\"details\"] not in all_ids[\"details_set\"]\n", - "], per_page=30)" + "client.submit_contributions(\n", + " [\n", + " contrib\n", + " for contrib in contributions\n", + " if contrib[\"data\"][\"details\"] not in all_ids[\"details_set\"]\n", + " ],\n", + " per_page=30,\n", + ")" ] }, { diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/Broberg_benchmark_defects.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/Broberg_benchmark_defects.ipynb index 4a51055e57..0e1ea669f2 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/Broberg_benchmark_defects.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/Broberg_benchmark_defects.ipynb @@ -37,7 +37,9 @@ "source": [ "# load data\n", "drivedir = Path(\"/Users/patrick/GoogleDriveLBNL/My Drive/\")\n", - "datadir = drivedir / Path(\"MaterialsProject/gitrepos/mpcontribs-data/Broberg_benchmark_defects\")\n", + "datadir = drivedir / Path(\n", + " \"MaterialsProject/gitrepos/mpcontribs-data/Broberg_benchmark_defects\"\n", + ")\n", "df_bulk = read_excel(datadir / \"bulk_data.xlsx\")\n", "df_defect = read_excel(datadir / \"defect_level_data.xlsx\")\n", "df_transition = read_excel(datadir / \"transition_level_data.xlsx\")" @@ -52,10 +54,10 @@ "source": [ "# clean DOIs column\n", "def clean_dois(s):\n", - " return \",\".join([\n", - " doi.strip().replace(\"https://doi.org/\", \"\")\n", - " for doi in s.split(\",\")\n", - " ])\n", + " return \",\".join(\n", + " [doi.strip().replace(\"https://doi.org/\", \"\") for doi in s.split(\",\")]\n", + " )\n", + "\n", "\n", "df_bulk[\"DOI\"] = df_bulk[\"DOI\"].apply(clean_dois)" ] @@ -74,12 +76,13 @@ " formula, system, symmetry = name.split(\"_\")\n", " print(formula, system, symmetry)\n", " doc = mpr.summary.search(\n", - " formula=formula, crystal_system=system.capitalize(),\n", + " formula=formula,\n", + " crystal_system=system.capitalize(),\n", " fields=[\"material_id\", \"formula_pretty\", \"crystal_system\", \"symmetry\"],\n", - " sort_fields=\"energy_above_hull\"\n", + " sort_fields=\"energy_above_hull\",\n", " )[0]\n", " mpids.append(doc.material_id)\n", - " \n", + "\n", "df_bulk[\"mp-id\"] = mpids" ] }, @@ -96,133 +99,82 @@ " \"mp-id\": {\"name\": \"identifier\"},\n", " \"Bulk Name\": {\"name\": \"info.bulk\", \"unit\": None},\n", " \"DOI\": {\"name\": \"info.DOIs\", \"unit\": None},\n", - " \"GGA-PBE gap\": {\n", - " \"name\": \"PBE.gap\",\n", - " \"unit\": \"eV\"\n", - " },\n", - " \"GGA-PBE Elt A\": {\n", - " \"name\": \"PBE.elements.A.name\",\n", - " \"unit\": None\n", - " },\n", + " \"GGA-PBE gap\": {\"name\": \"PBE.gap\", \"unit\": \"eV\"},\n", + " \"GGA-PBE Elt A\": {\"name\": \"PBE.elements.A.name\", \"unit\": None},\n", " \"GGA-PBE Elt A chemical potential\": {\n", " \"name\": \"PBE.elements.A.chempot\",\n", - " \"unit\": \"eV\"\n", - " },\n", - " \"GGA-PBE Elt B\": {\n", - " \"name\": \"PBE.elements.B.name\",\n", - " \"unit\": None\n", + " \"unit\": \"eV\",\n", " },\n", + " \"GGA-PBE Elt B\": {\"name\": \"PBE.elements.B.name\", \"unit\": None},\n", " \"GGA-PBE Elt B chemical potential\": {\n", " \"name\": \"PBE.elements.B.chempot\",\n", - " \"unit\": \"eV\"\n", - " },\n", - " \"GGA-PBE Elt C\": {\n", - " \"name\": \"PBE.elements.C.name\",\n", - " \"unit\": None\n", + " \"unit\": \"eV\",\n", " },\n", + " \"GGA-PBE Elt C\": {\"name\": \"PBE.elements.C.name\", \"unit\": None},\n", " \"GGA-PBE Elt C chemical potential\": {\n", " \"name\": \"PBE.elements.C.chempot\",\n", - " \"unit\": \"eV\"\n", - " },\n", - " \"GGA-PBE Elt D\": {\n", - " \"name\": \"PBE.elements.D.name\",\n", - " \"unit\": None\n", + " \"unit\": \"eV\",\n", " },\n", + " \"GGA-PBE Elt D\": {\"name\": \"PBE.elements.D.name\", \"unit\": None},\n", " \"GGA-PBE Elt D chemical potential\": {\n", " \"name\": \"PBE.elements.D.chempot\",\n", - " \"unit\": \"eV\"\n", - " },\n", - " \"GGA-PBE Elt E\": {\n", - " \"name\": \"PBE.elements.E.name\",\n", - " \"unit\": None\n", + " \"unit\": \"eV\",\n", " },\n", + " \"GGA-PBE Elt E\": {\"name\": \"PBE.elements.E.name\", \"unit\": None},\n", " \"GGA-PBE Elt E chemical potential\": {\n", " \"name\": \"PBE.elements.E.chempot\",\n", - " \"unit\": \"eV\"\n", - " },\n", - " \"Auto HSE06 gap\": {\n", - " \"name\": \"HSE06.gap\",\n", - " \"unit\": \"eV\"\n", - " },\n", - " \"FL no_bes\": {\n", - " \"name\": \"fermi.noBES\",\n", - " \"unit\": \"eV\"\n", - " },\n", - " \"FL bes\": {\n", - " \"name\": \"fermi.BES\",\n", - " \"unit\": \"eV\"\n", - " },\n", - " \"FL bes_free\": {\n", - " \"name\": \"fermi.freeBES\",\n", - " \"unit\": \"eV\"\n", - " },\n", - " \"lower dopability no_bes\": {\n", - " \"name\": \"fermi.dopability.noBES.lower\",\n", - " \"unit\": \"eV\"\n", - " },\n", - " \"upper dopability no_bes\": {\n", - " \"name\": \"fermi.dopability.noBES.upper\",\n", - " \"unit\": \"eV\"\n", - " },\n", - " \"lower dopability bes\": {\n", - " \"name\": \"fermi.dopability.BES.lower\",\n", - " \"unit\": \"eV\"\n", - " },\n", - " \"upper dopability bes\": {\n", - " \"name\": \"fermi.dopability.BES.upper\",\n", - " \"unit\": \"eV\"\n", + " \"unit\": \"eV\",\n", " },\n", + " \"Auto HSE06 gap\": {\"name\": \"HSE06.gap\", \"unit\": \"eV\"},\n", + " \"FL no_bes\": {\"name\": \"fermi.noBES\", \"unit\": \"eV\"},\n", + " \"FL bes\": {\"name\": \"fermi.BES\", \"unit\": \"eV\"},\n", + " \"FL bes_free\": {\"name\": \"fermi.freeBES\", \"unit\": \"eV\"},\n", + " \"lower dopability no_bes\": {\"name\": \"fermi.dopability.noBES.lower\", \"unit\": \"eV\"},\n", + " \"upper dopability no_bes\": {\"name\": \"fermi.dopability.noBES.upper\", \"unit\": \"eV\"},\n", + " \"lower dopability bes\": {\"name\": \"fermi.dopability.BES.lower\", \"unit\": \"eV\"},\n", + " \"upper dopability bes\": {\"name\": \"fermi.dopability.BES.upper\", \"unit\": \"eV\"},\n", " \"lower dopability bes_free\": {\n", " \"name\": \"fermi.dopability.freeBES.lower\",\n", - " \"unit\": \"eV\"\n", + " \"unit\": \"eV\",\n", " },\n", " \"upper dopability bes_free\": {\n", " \"name\": \"fermi.dopability.freeBES.upper\",\n", - " \"unit\": \"eV\"\n", + " \"unit\": \"eV\",\n", " },\n", " \"hybrid-published gap\": {\"name\": \"hybrid.gap\", \"unit\": \"eV\"},\n", " \"FL hybrid-published\": {\"name\": \"hybrid.fermi\", \"unit\": \"eV\"},\n", - " \"lower dopability hybrid-published\": {\"name\": \"hybrid.dopability.lower\", \"unit\": \"eV\"},\n", - " \"upper dopability hybrid-published\": {\"name\": \"hybrid.dopability.upper\", \"unit\": \"eV\"},\n", - " \"hybrid-published Elt A\": {\n", - " \"name\": \"hybrid.elements.A.name\",\n", - " \"unit\": None\n", + " \"lower dopability hybrid-published\": {\n", + " \"name\": \"hybrid.dopability.lower\",\n", + " \"unit\": \"eV\",\n", + " },\n", + " \"upper dopability hybrid-published\": {\n", + " \"name\": \"hybrid.dopability.upper\",\n", + " \"unit\": \"eV\",\n", " },\n", + " \"hybrid-published Elt A\": {\"name\": \"hybrid.elements.A.name\", \"unit\": None},\n", " \"hybrid-published Elt A chemical potential\": {\n", " \"name\": \"hybrid.elements.A.chempot\",\n", - " \"unit\": \"eV\"\n", - " },\n", - " \"hybrid-published Elt B\": {\n", - " \"name\": \"hybrid.elements.B.name\",\n", - " \"unit\": None\n", + " \"unit\": \"eV\",\n", " },\n", + " \"hybrid-published Elt B\": {\"name\": \"hybrid.elements.B.name\", \"unit\": None},\n", " \"hybrid-published Elt B chemical potential\": {\n", " \"name\": \"hybrid.elements.B.chempot\",\n", - " \"unit\": \"eV\"\n", - " },\n", - " \"hybrid-published Elt C\": {\n", - " \"name\": \"hybrid.elements.C.name\",\n", - " \"unit\": None\n", + " \"unit\": \"eV\",\n", " },\n", + " \"hybrid-published Elt C\": {\"name\": \"hybrid.elements.C.name\", \"unit\": None},\n", " \"hybrid-published Elt C chemical potential\": {\n", " \"name\": \"hybrid.elements.C.chempot\",\n", - " \"unit\": \"eV\"\n", - " },\n", - " \"hybrid-published Elt D\": {\n", - " \"name\": \"hybrid.elements.D.name\",\n", - " \"unit\": None\n", + " \"unit\": \"eV\",\n", " },\n", + " \"hybrid-published Elt D\": {\"name\": \"hybrid.elements.D.name\", \"unit\": None},\n", " \"hybrid-published Elt D chemical potential\": {\n", " \"name\": \"hybrid.elements.D.chempot\",\n", - " \"unit\": \"eV\"\n", - " },\n", - " \"hybrid-published Elt E\": {\n", - " \"name\": \"hybrid.elements.E.name\",\n", - " \"unit\": None\n", + " \"unit\": \"eV\",\n", " },\n", + " \"hybrid-published Elt E\": {\"name\": \"hybrid.elements.E.name\", \"unit\": None},\n", " \"hybrid-published Elt E chemical potential\": {\n", " \"name\": \"hybrid.elements.E.chempot\",\n", - " \"unit\": \"eV\"\n", + " \"unit\": \"eV\",\n", " },\n", "}" ] @@ -250,13 +202,15 @@ "def apply_unit(cell, unit):\n", " if isinstance(cell, str) and cell.strip() == \"-\":\n", " return \"\"\n", - " \n", + "\n", " return f\"{cell} {unit}\" if unit and cell else cell\n", "\n", + "\n", "def apply_units(column):\n", " unit = columns_map_bulk[column.name].get(\"unit\")\n", " return column.apply(apply_unit, args=(unit,))\n", "\n", + "\n", "df_bulk = df_bulk.apply(apply_units)" ] }, @@ -290,7 +244,7 @@ " contrib = {\n", " \"identifier\": identifier,\n", " \"data\": unflatten(data, splitter=\"dot\"),\n", - " \"attachments\": []\n", + " \"attachments\": [],\n", " }\n", " bulk_name = data[\"info.bulk\"]\n", " formula, system, symmetry = bulk_name.split(\"_\")\n", @@ -314,8 +268,8 @@ " ]\n", " contrib[\"attachments\"].append(Attachment.from_data(\"transitions\", transitions))\n", " contributions.append(contrib)\n", - " \n", - " \n", + "\n", + "\n", "contributions[0]" ] }, @@ -327,7 +281,12 @@ "outputs": [], "source": [ "# initialize columns (including units)\n", - "columns = {\"info.bulk\": None, \"info.formula\": None, \"info.system\": None, \"info.symmetry\": None}\n", + "columns = {\n", + " \"info.bulk\": None,\n", + " \"info.formula\": None,\n", + " \"info.system\": None,\n", + " \"info.symmetry\": None,\n", + "}\n", "\n", "for col in columns_map_bulk.values():\n", " if \".\" in col[\"name\"]:\n", @@ -345,7 +304,7 @@ "client.init_columns(columns)\n", "client.submit_contributions(contributions)\n", "# this shouldn't be necessary but need to re-init columns likely due to bug in API server\n", - "client.init_columns(columns) " + "client.init_columns(columns)" ] } ], diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ExpXAS.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ExpXAS.ipynb index d2fdf9ba09..cd83f60e0d 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ExpXAS.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ExpXAS.ipynb @@ -32,7 +32,9 @@ "metadata": {}, "outputs": [], "source": [ - "indir = Path(\"/Users/patrick/GoogleDriveLBNL/MaterialsProject/gitrepos/mpcontribs-data/ExpXAS\")\n", + "indir = Path(\n", + " \"/Users/patrick/GoogleDriveLBNL/MaterialsProject/gitrepos/mpcontribs-data/ExpXAS\"\n", + ")\n", "ref_path = indir / \"reference.data\"\n", "spec_path = indir / \"spectrum.mu\"" ] @@ -46,10 +48,13 @@ "source": [ "# add project-wide meta data to \"Other Info\" dropdown\n", "client.projects.update_entry(\n", - " pk=name, project={\"other\": {\n", - " 'facility': 'NSLS-II',\n", - " 'beamline': 'ISS (8-ID)',\n", - " }}\n", + " pk=name,\n", + " project={\n", + " \"other\": {\n", + " \"facility\": \"NSLS-II\",\n", + " \"beamline\": \"ISS (8-ID)\",\n", + " }\n", + " },\n", ").result()" ] }, @@ -61,8 +66,12 @@ "outputs": [], "source": [ "index = \"energy [eV]\"\n", - "ref = read_csv(ref_path, sep=\" \", skiprows=[0, 1], index_col=0, names=[index, \"reference\"])\n", - "spec = read_csv(spec_path, sep=\" \", skiprows=[0, 1], index_col=0, names=[index, \"spectrum\"])" + "ref = read_csv(\n", + " ref_path, sep=\" \", skiprows=[0, 1], index_col=0, names=[index, \"reference\"]\n", + ")\n", + "spec = read_csv(\n", + " spec_path, sep=\" \", skiprows=[0, 1], index_col=0, names=[index, \"spectrum\"]\n", + ")" ] }, { @@ -75,7 +84,7 @@ "df = pd.concat([ref, spec], axis=1)\n", "df.columns.name = \"type\"\n", "df.attrs[\"title\"] = \"Fe XAS\"\n", - "df.attrs[\"labels\"] = {\"value\": \"flattened normalized μ(E)\"} \n", + "df.attrs[\"labels\"] = {\"value\": \"flattened normalized μ(E)\"}\n", "df.attrs[\"name\"] = \"Fe-XAS\"" ] }, @@ -92,30 +101,30 @@ " \"project\": name,\n", " \"identifier\": \"mp-1279742\", # assign to mp-id or use custom identifier?\n", " \"data\": {\n", - " 'meta': {\n", - " 'year': 2020,\n", - " 'cycle': 1,\n", - " 'SAF': 304823,\n", - " 'proposal': 305112,\n", - " 'PI': 'M. Liu',\n", + " \"meta\": {\n", + " \"year\": 2020,\n", + " \"cycle\": 1,\n", + " \"SAF\": 304823,\n", + " \"proposal\": 305112,\n", + " \"PI\": \"M. Liu\",\n", + " },\n", + " \"measurement\": {\n", + " \"method\": \"XAS\",\n", + " \"name\": \"FeO\",\n", + " \"composition\": \"Fe\",\n", + " \"element\": \"Fe\",\n", + " \"edge\": \"K\",\n", + " \"E₀\": \"7112 eV\", # submit numbers with units as space-separated strings\n", + " \"scanID\": 77303,\n", + " \"UID\": \"de753795-be14-402e-9a3f-5089a44ff67c\", # could be linked to BNL raw data\n", " },\n", - " 'measurement': {\n", - " 'method': 'XAS',\n", - " 'name': 'FeO',\n", - " 'composition': 'Fe',\n", - " 'element': 'Fe',\n", - " 'edge': 'K',\n", - " 'E₀': '7112 eV', # submit numbers with units as space-separated strings\n", - " 'scanID': 77303,\n", - " 'UID': 'de753795-be14-402e-9a3f-5089a44ff67c', # could be linked to BNL raw data\n", + " \"time\": {\n", + " \"start\": \"01/31/2020 17:20:43\", # TODO parse as datetime\n", + " \"stop\": \"01/31/2020 17:21:44\",\n", + " \"total\": \"1 h\",\n", " },\n", - " 'time': {\n", - " 'start': '01/31/2020 17:20:43', # TODO parse as datetime\n", - " 'stop': '01/31/2020 17:21:44',\n", - " 'total': '1 h'\n", - " } \n", " },\n", - " \"tables\": [df]\n", + " \"tables\": [df],\n", "}" ] }, @@ -137,9 +146,7 @@ "metadata": {}, "outputs": [], "source": [ - "all_ids = client.get_all_ids(\n", - " {\"project\": name}, include=[\"tables\"]\n", - ").get(name, {})\n", + "all_ids = client.get_all_ids({\"project\": name}, include=[\"tables\"]).get(name, {})\n", "cids = list(all_ids[\"ids\"])\n", "tids = list(all_ids[\"tables\"][\"ids\"])\n", "cids, tids" diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ForbiddenTransitions.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ForbiddenTransitions.ipynb index 35ee2fa6d4..ac6c0e7b3b 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ForbiddenTransitions.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ForbiddenTransitions.ipynb @@ -23,7 +23,9 @@ "metadata": {}, "outputs": [], "source": [ - "data_dir = Path(\"/Users/patrick/GoogleDriveLBNL/My Drive/MaterialsProject/gitrepos/mpcontribs-data/ForbiddenTransitions\")" + "data_dir = Path(\n", + " \"/Users/patrick/GoogleDriveLBNL/My Drive/MaterialsProject/gitrepos/mpcontribs-data/ForbiddenTransitions\"\n", + ")" ] }, { @@ -56,37 +58,114 @@ "source": [ "columns_map = {\n", " # root level\n", - " \"Materials Project ID (mpid)\": {\"name\": \"identifier\", \"description\": \"Materials Project ID as of May 30, 2023\"},\n", - " \"Formula\": {\"name\": \"formula\", \"description\": \"Chemical formula (from pretty_formula on MP)\"},\n", + " \"Materials Project ID (mpid)\": {\n", + " \"name\": \"identifier\",\n", + " \"description\": \"Materials Project ID as of May 30, 2023\",\n", + " },\n", + " \"Formula\": {\n", + " \"name\": \"formula\",\n", + " \"description\": \"Chemical formula (from pretty_formula on MP)\",\n", + " },\n", " # info\n", - " \"Space group\": {\"name\": \"info.spacegroup\", \"description\": \"Space group symbol from MP\"},\n", - " \"# ICSD entries\": {\"name\": \"info.numICSDs\", \"unit\": \"\", \"description\": \"Number of ICSD entries that structure-match to this compound (queried from the Materials Project)\"},\n", - " \"Calculation origin\": {\"name\": \"info.origin\", \"description\": \"The source of the calculation; note that some of these calculations derive from Fabini et al. 2019 (10.1021/acs.chemmater.8b04542) and the associated MPContribs data set)\"},\n", + " \"Space group\": {\n", + " \"name\": \"info.spacegroup\",\n", + " \"description\": \"Space group symbol from MP\",\n", + " },\n", + " \"# ICSD entries\": {\n", + " \"name\": \"info.numICSDs\",\n", + " \"unit\": \"\",\n", + " \"description\": \"Number of ICSD entries that structure-match to this compound (queried from the Materials Project)\",\n", + " },\n", + " \"Calculation origin\": {\n", + " \"name\": \"info.origin\",\n", + " \"description\": \"The source of the calculation; note that some of these calculations derive from Fabini et al. 2019 (10.1021/acs.chemmater.8b04542) and the associated MPContribs data set)\",\n", + " },\n", " # chemical properties\n", - " \"$t_\\mathrm{IPR}^\\mathrm{d}$\": {\"name\": \"properties.chemical.IPR\", \"description\": \"Inverse participation ratio of the direct VBM and CBM states, used as a proxy for localization of states at the band edges (a high IPR indicates strong localization), as defined by Wegner in 1980 (10.1007/BF01325284) and implemented by Xiong, et al. in 2023 (10.1126/sciadv.adh8617) (see manuscript for details)\"},\n", - " \"$σ^\\mathrm{d}$\": {\"name\": \"properties.chemical.sigma\", \"unit\": \"\", \"description\": \"Orbital similarity of the direct VBM and CBM states, derived from the dominant contributors to the density of states at the direct VBM and CBM to describe the similarity of CB-edge and VB-edge orbital contributions (see manuscript for details)\"},\n", + " \"$t_\\mathrm{IPR}^\\mathrm{d}$\": {\n", + " \"name\": \"properties.chemical.IPR\",\n", + " \"description\": \"Inverse participation ratio of the direct VBM and CBM states, used as a proxy for localization of states at the band edges (a high IPR indicates strong localization), as defined by Wegner in 1980 (10.1007/BF01325284) and implemented by Xiong, et al. in 2023 (10.1126/sciadv.adh8617) (see manuscript for details)\",\n", + " },\n", + " \"$σ^\\mathrm{d}$\": {\n", + " \"name\": \"properties.chemical.sigma\",\n", + " \"unit\": \"\",\n", + " \"description\": \"Orbital similarity of the direct VBM and CBM states, derived from the dominant contributors to the density of states at the direct VBM and CBM to describe the similarity of CB-edge and VB-edge orbital contributions (see manuscript for details)\",\n", + " },\n", " # other properties\n", - " \"$E_\\mathrm{hull}$ (eV/at.)\": {\"name\": \"properties.other.hull\", \"unit\": \"eV/atom\", \"description\": \"Energy above the convex hull, computed using GGA (or GGA+U when appropriate) and MP compatability scheme\"},\n", - " \"Synthesized?\": {\"name\": \"properties.other.synthesized\", \"description\": \"Whether a given compound has been synthesized in any form (queried from the Materials Project)\"},\n", + " \"$E_\\mathrm{hull}$ (eV/at.)\": {\n", + " \"name\": \"properties.other.hull\",\n", + " \"unit\": \"eV/atom\",\n", + " \"description\": \"Energy above the convex hull, computed using GGA (or GGA+U when appropriate) and MP compatability scheme\",\n", + " },\n", + " \"Synthesized?\": {\n", + " \"name\": \"properties.other.synthesized\",\n", + " \"description\": \"Whether a given compound has been synthesized in any form (queried from the Materials Project)\",\n", + " },\n", " # optical properties\n", - " \"$E_\\mathrm{G}^\\mathrm{GGA}$ (eV)\": {\"name\": \"properties.optical.bandgaps.GGA\", \"unit\": \"eV\", \"description\": \"Fundamental band gap computed using GGA (or GGA+U when appropriate)\"},\n", - " \"$E_\\mathrm{G}^\\mathrm{d,GGA}$ (eV)\": {\"name\": \"properties.optical.bandgaps.GGA|d\", \"unit\": \"eV\", \"description\": \"Direct band gap computed using GGA (or GGA+U when appropriate)\"},\n", - " \"$E_\\mathrm{G}^\\mathrm{da,GGA}$ (eV)\": {\"name\": \"properties.optical.bandgaps.GGA|da\", \"unit\": \"eV\", \"description\": \"Direct allowed band gap computed using GGA (or GGA+U when appropriate), defined as the energy at which dipole transition matrix elements become significant (see manuscript for details)\"},\n", - " \"$E_\\mathrm{edge}^\\mathrm{da,GGA}$ (eV)\": {\"name\": \"properties.optical.energy|edge.GGA|da\", \"unit\": \"eV\", \"description\": \"Absorption edge energy, defined as the approximate energy at which the absorption coefficient rises to 1e4 cm-1 and becomes significant (see manuscript for details)\"},\n", - " \"$Δ^\\mathrm{d,GGA}$\": {\"name\": \"properties.optical.delta.GGA|d\", \"unit\": \"\", \"description\": \"Forbidden energy difference, defined as the energy difference between the direct band gap and direct allowed band gap, such that a value greater than zero indicates the presence of forbidden or weak transitions\"},\n", - " \"$Δ_\\mathrm{edge}^\\mathrm{d,GGA}$\": {\"name\": \"properties.optical.delta|edge.GGA|d\", \"unit\": \"\", \"description\": \"Edge energy difference, defined as defined as the energy difference between the direct band gap and the absorption edge energy\"},\n", - " \"$α_\\mathrm{avg.vis}^\\mathrm{GGA}$ (cm$^{-1}$)\": {\"name\": \"properties.optical.alpha|vis\", \"unit\": \"cm⁻¹\", \"description\": \"Average GGA absorption coefficient in the visible regime, using an empirical gap correction from Morales et al. 2017 (10.1021/acs.jpcc.7b07421) (see manuscript for details; caution that this should be recalculated if using a scissor shift!)\"},\n", - " \"Optical type\": {\"name\": \"properties.optical.type\", \"description\": \"Optical type categorization (OT 1\\u20134), following the classification outlined by Yu and Zunger in 2012 (10.1103/PhysRevLett.108.068701)\"},\n", + " \"$E_\\mathrm{G}^\\mathrm{GGA}$ (eV)\": {\n", + " \"name\": \"properties.optical.bandgaps.GGA\",\n", + " \"unit\": \"eV\",\n", + " \"description\": \"Fundamental band gap computed using GGA (or GGA+U when appropriate)\",\n", + " },\n", + " \"$E_\\mathrm{G}^\\mathrm{d,GGA}$ (eV)\": {\n", + " \"name\": \"properties.optical.bandgaps.GGA|d\",\n", + " \"unit\": \"eV\",\n", + " \"description\": \"Direct band gap computed using GGA (or GGA+U when appropriate)\",\n", + " },\n", + " \"$E_\\mathrm{G}^\\mathrm{da,GGA}$ (eV)\": {\n", + " \"name\": \"properties.optical.bandgaps.GGA|da\",\n", + " \"unit\": \"eV\",\n", + " \"description\": \"Direct allowed band gap computed using GGA (or GGA+U when appropriate), defined as the energy at which dipole transition matrix elements become significant (see manuscript for details)\",\n", + " },\n", + " \"$E_\\mathrm{edge}^\\mathrm{da,GGA}$ (eV)\": {\n", + " \"name\": \"properties.optical.energy|edge.GGA|da\",\n", + " \"unit\": \"eV\",\n", + " \"description\": \"Absorption edge energy, defined as the approximate energy at which the absorption coefficient rises to 1e4 cm-1 and becomes significant (see manuscript for details)\",\n", + " },\n", + " \"$Δ^\\mathrm{d,GGA}$\": {\n", + " \"name\": \"properties.optical.delta.GGA|d\",\n", + " \"unit\": \"\",\n", + " \"description\": \"Forbidden energy difference, defined as the energy difference between the direct band gap and direct allowed band gap, such that a value greater than zero indicates the presence of forbidden or weak transitions\",\n", + " },\n", + " \"$Δ_\\mathrm{edge}^\\mathrm{d,GGA}$\": {\n", + " \"name\": \"properties.optical.delta|edge.GGA|d\",\n", + " \"unit\": \"\",\n", + " \"description\": \"Edge energy difference, defined as defined as the energy difference between the direct band gap and the absorption edge energy\",\n", + " },\n", + " \"$α_\\mathrm{avg.vis}^\\mathrm{GGA}$ (cm$^{-1}$)\": {\n", + " \"name\": \"properties.optical.alpha|vis\",\n", + " \"unit\": \"cm⁻¹\",\n", + " \"description\": \"Average GGA absorption coefficient in the visible regime, using an empirical gap correction from Morales et al. 2017 (10.1021/acs.jpcc.7b07421) (see manuscript for details; caution that this should be recalculated if using a scissor shift!)\",\n", + " },\n", + " \"Optical type\": {\n", + " \"name\": \"properties.optical.type\",\n", + " \"description\": \"Optical type categorization (OT 1\\u20134), following the classification outlined by Yu and Zunger in 2012 (10.1103/PhysRevLett.108.068701)\",\n", + " },\n", " # transport properties\n", - " \"$m^*_\\mathrm{e}$\": {\"name\": \"properties.transport.effmass.electron\", \"unit\": \"mₑ\", \"description\": \"Electron effective mass, computed using the BoltzTraP2 package assuming dopings of 10^18 cm-3 (see manuscript for details)\"},\n", - " \"$m^*_\\mathrm{h}$\": {\"name\": \"properties.transport.effmass.hole\", \"unit\": \"mₑ\", \"description\": \"Hole effective mass, computed using the BoltzTraP2 package assuming dopings of 10^18 cm-3 (see manuscript for details)\"},\n", + " \"$m^*_\\mathrm{e}$\": {\n", + " \"name\": \"properties.transport.effmass.electron\",\n", + " \"unit\": \"mₑ\",\n", + " \"description\": \"Electron effective mass, computed using the BoltzTraP2 package assuming dopings of 10^18 cm-3 (see manuscript for details)\",\n", + " },\n", + " \"$m^*_\\mathrm{h}$\": {\n", + " \"name\": \"properties.transport.effmass.hole\",\n", + " \"unit\": \"mₑ\",\n", + " \"description\": \"Hole effective mass, computed using the BoltzTraP2 package assuming dopings of 10^18 cm-3 (see manuscript for details)\",\n", + " },\n", "}\n", "\n", "legend = {v[\"name\"]: v[\"description\"] for v in columns_map.values()}\n", - "legend[\"tables.corrected\"] = \"Absorption coefficient computed with the IPA and a GGA functional, using the empirical gap correction from Morales et al. 2017 (10.1021/acs.jpcc.7b07421) (see manuscript for details)\"\n", - "legend[\"tables.uncorrected\"] = \"Absorption coefficient computed with the IPA and a GGA functional (without any empirical gap correction as in alpha; see manuscript for details)\"\n", + "legend[\"tables.corrected\"] = (\n", + " \"Absorption coefficient computed with the IPA and a GGA functional, using the empirical gap correction from Morales et al. 2017 (10.1021/acs.jpcc.7b07421) (see manuscript for details)\"\n", + ")\n", + "legend[\"tables.uncorrected\"] = (\n", + " \"Absorption coefficient computed with the IPA and a GGA functional (without any empirical gap correction as in alpha; see manuscript for details)\"\n", + ")\n", "\n", - "columns = {v[\"name\"]: v.get(\"unit\") for v in columns_map.values() if v[\"name\"] not in [\"identifier\", \"formula\"]}" + "columns = {\n", + " v[\"name\"]: v.get(\"unit\")\n", + " for v in columns_map.values()\n", + " if v[\"name\"] not in [\"identifier\", \"formula\"]\n", + "}" ] }, { @@ -114,7 +193,7 @@ " for k, v in record.items():\n", " if not isinstance(v, str) and isnan(v):\n", " continue\n", - " \n", + "\n", " key = columns_map[k][\"name\"]\n", " unit = columns_map[k].get(\"unit\")\n", " val = v\n", @@ -122,29 +201,38 @@ " val = \"Yes\" if v else \"No\"\n", " elif unit:\n", " val = f\"{v} {unit}\"\n", - " \n", + "\n", " clean[key] = val\n", "\n", - " contrib = {\"identifier\": clean.pop(\"identifier\"), \"formula\": clean.pop(\"formula\"), \"tables\": []}\n", + " contrib = {\n", + " \"identifier\": clean.pop(\"identifier\"),\n", + " \"formula\": clean.pop(\"formula\"),\n", + " \"tables\": [],\n", + " }\n", " contrib[\"data\"] = unflatten(clean, splitter=\"dot\")\n", "\n", " spectrum = spectra.get(contrib[\"identifier\"])\n", " if spectrum:\n", " spectrum.pop(\"mpid\", None)\n", " spectrum.pop(\"formula\", None)\n", - " table = pd.DataFrame(data=spectrum).rename(\n", - " columns={\"energy\": \"energy [eV]\", \"alpha\": \"α\", \"alpha_uncorr\": \"α|uncorrected\"}\n", - " ).set_index(\"energy [eV]\")\n", + " table = (\n", + " pd.DataFrame(data=spectrum)\n", + " .rename(\n", + " columns={\n", + " \"energy\": \"energy [eV]\",\n", + " \"alpha\": \"α\",\n", + " \"alpha_uncorr\": \"α|uncorrected\",\n", + " }\n", + " )\n", + " .set_index(\"energy [eV]\")\n", + " )\n", " table.attrs = {\n", " \"name\": \"absorption coefficients\",\n", " \"title\": \"Energy-dependent Absorption Coefficients\",\n", - " \"labels\": {\n", - " \"value\": \"absorption coefficient [cm⁻¹]\",\n", - " \"variable\": \"method\"\n", - " }\n", + " \"labels\": {\"value\": \"absorption coefficient [cm⁻¹]\", \"variable\": \"method\"},\n", " }\n", " contrib[\"tables\"].append(table)\n", - " \n", + "\n", " contributions.append(contrib)\n", "\n", "len(contributions)" @@ -203,7 +291,7 @@ "query = {\n", " \"data__properties__other__synthesized__exact\": \"Yes\",\n", " \"data__properties__optical__type__contains\": \"ia\",\n", - " \"data__properties__optical__bandgaps__GGA__value__gt\": 3\n", + " \"data__properties__optical__bandgaps__GGA__value__gt\": 3,\n", "}\n", "client.count(query=query)" ] @@ -215,7 +303,9 @@ "metadata": {}, "outputs": [], "source": [ - "contribs = client.query_contributions(query=query, fields=[\"identifier\", \"data.properties.other\"], paginate=True)\n", + "contribs = client.query_contributions(\n", + " query=query, fields=[\"identifier\", \"data.properties.other\"], paginate=True\n", + ")\n", "contribs[\"data\"][0][\"data\"]" ] }, @@ -227,7 +317,7 @@ "outputs": [], "source": [ "contribs = client.download_contributions(query=query, include=[\"tables\"])\n", - "contribs[0][\"tables\"][0] # DataFrame" + "contribs[0][\"tables\"][0] # DataFrame" ] } ], diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/HFP2023.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/HFP2023.ipynb index 9b0f05ceb1..586cdc419f 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/HFP2023.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/HFP2023.ipynb @@ -49,7 +49,10 @@ "metadata": {}, "outputs": [], "source": [ - "lookup = {doc[\"formula_pretty\"] + \"_\" + str(doc[\"symmetry\"][\"number\"]): doc[\"task_id\"] for doc in tasks}" + "lookup = {\n", + " doc[\"formula_pretty\"] + \"_\" + str(doc[\"symmetry\"][\"number\"]): doc[\"task_id\"]\n", + " for doc in tasks\n", + "}" ] }, { @@ -88,7 +91,7 @@ "def make_gzip(p_in):\n", " p_out = str(p_in) + \".gz\"\n", " if not Path(p_out).exists():\n", - " with p_in.open('rb') as f_in, gzip.open(p_out, 'wb') as f_out:\n", + " with p_in.open(\"rb\") as f_in, gzip.open(p_out, \"wb\") as f_out:\n", " f_out.writelines(f_in)" ] }, @@ -100,41 +103,37 @@ "outputs": [], "source": [ "columns = {\n", - " \"polarization\": {\n", - " \"v1\": \"C/m²\",\n", - " \"v2\": \"C/m²\",\n", - " \"v3\": \"C/m²\",\n", - " \"mag\": \"C/m²\"\n", - " },\n", + " \"polarization\": {\"v1\": \"C/m²\", \"v2\": \"C/m²\", \"v3\": \"C/m²\", \"mag\": \"C/m²\"},\n", " \"mechanic\": {\n", " \"moduli.bulk\": \"N/m²\",\n", " \"moduli.young\": \"N/m²\",\n", " \"moduli.shear\": \"N/m²\",\n", - " \"ratios.pugh\": \"\", # dimensionless number\n", + " \"ratios.pugh\": \"\", # dimensionless number\n", " \"ratios.poisson\": \"\",\n", " \"compressibility\": \"m²/N\",\n", - " \"unknown\": \"\"\n", - " }\n", + " \"unknown\": \"\",\n", + " },\n", "}\n", "\n", + "\n", "def make_data(key, vals):\n", " cols = columns[key]\n", " dct = {}\n", - " \n", + "\n", " for k, v in dict(zip(cols.keys(), vals)).items():\n", " unit = cols[k]\n", - " dct[k] = f\"{v} {unit}\" if unit else v # 5.5 eV, 100 N/m2\n", - " \n", + " dct[k] = f\"{v} {unit}\" if unit else v # 5.5 eV, 100 N/m2\n", + "\n", " return unflatten(dct, splitter=\"dot\")\n", "\n", "\n", "contributions = []\n", "\n", - "for subdir in datadir.glob('**/*'): # looping over subdirectories (DMP-Co)\n", + "for subdir in datadir.glob(\"**/*\"): # looping over subdirectories (DMP-Co)\n", " if subdir.is_file():\n", " continue\n", - " \n", - " identifier = subdir.name # default to subdir as identifier\n", + "\n", + " identifier = subdir.name # default to subdir as identifier\n", " cifs = list(subdir.glob(\"*.cif\"))\n", "\n", " if cifs:\n", @@ -154,7 +153,7 @@ " # _, spacegroup_number = structure.get_space_group_info()\n", " # chemsys = composition.chemical_system\n", "\n", - " # # 1) try formula and space group \n", + " # # 1) try formula and space group\n", " # docs = search(formula=formula, spacegroup_number=spacegroup_number)\n", " # if not docs:\n", " # # 2) try formula\n", @@ -171,17 +170,19 @@ " formula, _ = composition.get_reduced_formula_and_factor()\n", " _, spacegroup_number = structure.get_space_group_info()\n", " identifier = lookup[f\"{formula}_{spacegroup_number}\"]\n", - " print(identifier) # \"link to MP\"\n", - " \n", + " print(identifier) # \"link to MP\"\n", + "\n", " # make sure everything's gzipped\n", " for p in subdir.glob(\"*.*\"):\n", " if p.suffix in {\".txt\", \".vasp\", \".cif\"}:\n", " make_gzip(p)\n", - " \n", + "\n", " # init contribution; add all files as attachments; add structure\n", " contrib = {\n", - " \"identifier\": identifier, \"formula\": formula, \"data\": {},\n", - " \"attachments\": list(subdir.glob(\"*.gz\"))\n", + " \"identifier\": identifier,\n", + " \"formula\": formula,\n", + " \"data\": {},\n", + " \"attachments\": list(subdir.glob(\"*.gz\")),\n", " }\n", " if identifier.startswith(\"mp-\"):\n", " contrib[\"structures\"] = [structure]\n", @@ -194,16 +195,16 @@ " contrib[\"data\"][\"polarization\"] = make_data(\"polarization\", values)\n", " elif len(values) == 7:\n", " contrib[\"data\"][\"mechanic\"] = make_data(\"mechanic\", values)\n", - " \n", - "# # option to add tensors to `data` \n", - "# for fn in subdir.glob(\"*.txt\"):\n", - "# stem = fn.stem.lower()\n", - "# if stem.endswith(\"_tensor\"):\n", - "# field = \".\".join(stem.split(\"_\")[:-1])\n", - "# df = read_csv(fn, sep=\"\\t\", header=0, names=range(1, 7))\n", - "# df.index = range(1,4)\n", - "# contrib[\"data\"][field] = df.T.to_dict()\n", - " \n", + "\n", + " # # option to add tensors to `data`\n", + " # for fn in subdir.glob(\"*.txt\"):\n", + " # stem = fn.stem.lower()\n", + " # if stem.endswith(\"_tensor\"):\n", + " # field = \".\".join(stem.split(\"_\")[:-1])\n", + " # df = read_csv(fn, sep=\"\\t\", header=0, names=range(1, 7))\n", + " # df.index = range(1,4)\n", + " # contrib[\"data\"][field] = df.T.to_dict()\n", + "\n", " contributions.append(contrib)" ] }, @@ -229,7 +230,7 @@ "client.init_columns(columns)\n", "client.submit_contributions(contributions)\n", "# this shouldn't be necessary but need to re-init columns likely due to bug in API server\n", - "client.init_columns(columns) " + "client.init_columns(columns)" ] } ], diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/MnO2_phase_selection.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/MnO2_phase_selection.ipynb index d6c63cb805..8a2c617383 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/MnO2_phase_selection.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/MnO2_phase_selection.ipynb @@ -19,7 +19,7 @@ "metadata": {}, "outputs": [], "source": [ - "name = 'MnO2_phase_selection'\n", + "name = \"MnO2_phase_selection\"\n", "client = Client()\n", "mpr = MPRester()" ] @@ -47,13 +47,13 @@ "outputs": [], "source": [ "phase_names = {\n", - " 'beta': 'Pyrolusite',\n", - " 'gamma': 'Intergrowth',\n", - " 'ramsdellite': 'Ramsdellite',\n", - " 'alpha': 'Hollandite',\n", - " 'lambda': 'Spinel',\n", - " 'delta': 'Layered',\n", - " 'other': 'Other',\n", + " \"beta\": \"Pyrolusite\",\n", + " \"gamma\": \"Intergrowth\",\n", + " \"ramsdellite\": \"Ramsdellite\",\n", + " \"alpha\": \"Hollandite\",\n", + " \"lambda\": \"Spinel\",\n", + " \"delta\": \"Layered\",\n", + " \"other\": \"Other\",\n", "}" ] }, @@ -63,9 +63,9 @@ "metadata": {}, "outputs": [], "source": [ - "client.projects.update_entry(pk=name, project={\n", - " 'other.phase−names': phase_names\n", - "}).result()" + "client.projects.update_entry(\n", + " pk=name, project={\"other.phase−names\": phase_names}\n", + ").result()" ] }, { @@ -84,8 +84,10 @@ "# mp_contrib_phases: data/MPContrib_formatted_entries.json\n", "# hull_states: data/MPContrib_hull_entries.json\n", "data = {}\n", - "for fn in os.scandir('/Users/patrick/gitrepos/mp/MPContribs/mpcontribs-data/MnO2_phase_selection'):\n", - " with open(fn, 'r') as f:\n", + "for fn in os.scandir(\n", + " \"/Users/patrick/gitrepos/mp/MPContribs/mpcontribs-data/MnO2_phase_selection\"\n", + "):\n", + " with open(fn, \"r\") as f:\n", " data[fn.name] = json.load(f)" ] }, @@ -96,8 +98,10 @@ "outputs": [], "source": [ "other = [\n", - " ['LiMnO2', -3.064, 'Y', '--'], ['KMnO2', -2.222, 'Y', '--'],\n", - " ['Ca0.5MnO2', -2.941, 'Y', '--'], ['Na0.5MnO2', -1.415, 'Y', '--']\n", + " [\"LiMnO2\", -3.064, \"Y\", \"--\"],\n", + " [\"KMnO2\", -2.222, \"Y\", \"--\"],\n", + " [\"Ca0.5MnO2\", -2.941, \"Y\", \"--\"],\n", + " [\"Na0.5MnO2\", -1.415, \"Y\", \"--\"],\n", "]" ] }, @@ -109,43 +113,43 @@ "source": [ "identifiers, contributions = set(), []\n", "\n", - "for hstate in tqdm(data['MPContrib_hull_entries.json']):\n", - " contrib = {'project': name, 'is_public': True, 'structures': []}\n", - " phase = hstate['phase']\n", - " composition = Composition.from_dict(hstate['c'])\n", - " structure = Structure.from_dict(hstate['s'])\n", + "for hstate in tqdm(data[\"MPContrib_hull_entries.json\"]):\n", + " contrib = {\"project\": name, \"is_public\": True, \"structures\": []}\n", + " phase = hstate[\"phase\"]\n", + " composition = Composition.from_dict(hstate[\"c\"])\n", + " structure = Structure.from_dict(hstate[\"s\"])\n", " mpids = mpr.find_structure(structure)\n", " comp = composition.get_integer_formula_and_factor()[0]\n", " identifier = mpids[0] if mpids else comp\n", - " contrib['identifier'] = identifier\n", - " \n", + " contrib[\"identifier\"] = identifier\n", + "\n", " if identifier in identifiers:\n", " continue\n", - " \n", + "\n", " phase_name = phase_names[phase]\n", - " phase_data = data['MPContrib_formatted_entries.json'].get(phase_name, other)\n", + " phase_data = data[\"MPContrib_formatted_entries.json\"].get(phase_name, other)\n", " if not phase_data:\n", " # print('no data found for', composition, phase_name)\n", " continue\n", "\n", " for iv, values in enumerate(phase_data):\n", " if Composition(values[0]) == composition:\n", - " contrib['data'] = {'GS': values[2], 'ΔH': f'{values[1]} eV/mol'}\n", + " contrib[\"data\"] = {\"GS\": values[2], \"ΔH\": f\"{values[1]} eV/mol\"}\n", " if not isinstance(values[3], str):\n", - " contrib['data']['ΔHʰ'] = f'{values[3]} eV/mol'\n", + " contrib[\"data\"][\"ΔHʰ\"] = f\"{values[3]} eV/mol\"\n", " break\n", " else:\n", " # print('no data found for', composition, phase)\n", " continue\n", "\n", - " contrib['structures'].append(structure)\n", + " contrib[\"structures\"].append(structure)\n", " contributions.append(contrib)\n", " identifiers.add(identifier)\n", "\n", "# make sure that contributions with all columns come first\n", - "contributions = [d for d in sorted(\n", - " contributions, key=lambda x: len(x[\"data\"]), reverse=True\n", - ")]\n", + "contributions = [\n", + " d for d in sorted(contributions, key=lambda x: len(x[\"data\"]), reverse=True)\n", + "]\n", "len(contributions)" ] }, @@ -184,14 +188,18 @@ "query = {\n", " \"project\": name,\n", " \"formula__contains\": \"Mg\",\n", - "# \"data__GS__contains\": \"Y\",\n", + " # \"data__GS__contains\": \"Y\",\n", " \"data__ΔHʰ__value__lte\": -100,\n", " \"_order_by\": \"data__ΔH__value\",\n", " \"order\": \"desc\",\n", " \"_fields\": [\n", - " \"id\", \"identifier\", \"formula\",\n", - " \"data.GS\", \"data.ΔH.value\", \"data.ΔHʰ.value\"\n", - " ]\n", + " \"id\",\n", + " \"identifier\",\n", + " \"formula\",\n", + " \"data.GS\",\n", + " \"data.ΔH.value\",\n", + " \"data.ΔHʰ.value\",\n", + " ],\n", "}\n", "client.contributions.get_entries(**query).result()" ] diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/attachments.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/attachments.ipynb index d13b8dffe5..05dab6fcb5 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/attachments.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/attachments.ipynb @@ -33,13 +33,15 @@ "path_gz = downloads / \"2021-02-19_scan_mpids_changed.json.gz\"\n", "path_img = downloads / \"IMG-20210224-WA0010.jpg\"\n", "\n", - "attachment = Attachment.from_data(\"other\", {\"hello\": \"world\", \"test\": [1,2,4]})\n", + "attachment = Attachment.from_data(\"other\", {\"hello\": \"world\", \"test\": [1, 2, 4]})\n", "\n", - "contributions = [{\n", - " \"project\": name,\n", - " \"identifier\": \"mp-2\",\n", - " \"attachments\": [path_gz, path_img, attachment]\n", - "}]" + "contributions = [\n", + " {\n", + " \"project\": name,\n", + " \"identifier\": \"mp-2\",\n", + " \"attachments\": [path_gz, path_img, attachment],\n", + " }\n", + "]" ] }, { @@ -101,7 +103,9 @@ "metadata": {}, "outputs": [], "source": [ - "attms = client.attachments.get_entries(md5__in=md5s, mime__contains=\"jpeg\", _fields=[\"id\"]).result()\n", + "attms = client.attachments.get_entries(\n", + " md5__in=md5s, mime__contains=\"jpeg\", _fields=[\"id\"]\n", + ").result()\n", "aid = attms[\"data\"][0][\"id\"]" ] }, diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/bioi_defects.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/bioi_defects.ipynb index 2cc3b702f9..fbe85e3950 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/bioi_defects.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/bioi_defects.ipynb @@ -40,25 +40,29 @@ "metadata": {}, "outputs": [], "source": [ - "df1 = read_csv(StringIO(\"\"\"\n", + "df1 = read_csv(\n", + " StringIO(\"\"\"\n", "BiOI thickness [nm],Peak EQE [%],Integrated J|SC [mA/cm²],Measured J|SC [mA/cm²], Average J|SC [mA/cm²]\n", "440,79.5,6.4,6.2,5.5\n", "570,80.2,6.4,5.8,5.6\n", "720,72.6,6.5,6.6,6.3\n", "1090,46.4,3.5,3.9,4.0\n", "1670,17.6,1.3,0.6,0.4\n", - "\"\"\"))\n", + "\"\"\")\n", + ")\n", "df1.set_index(\"BiOI thickness [nm]\", inplace=True)\n", "df1.attrs[\"name\"] = \"Currents vs BiOI thickness\"\n", "\n", - "df2 = read_csv(StringIO(\"\"\"\n", + "df2 = read_csv(\n", + " StringIO(\"\"\"\n", "layer,VB-Eᶠ [eV],WF [eV],VB [eV],Eᵍ [eV],CB [eV]\n", "NiOₓ on ITO,0.6,4.8,5.4,3.6,1.8\n", "220 nm BiOI on NiOₓ|ITO,1.3,4.6,5.9,1.9,4.0\n", "440 nm BiOI on NiOₓ|ITO,1.1,5.0,6.1,1.9,4.2\n", "720 nm BiOI on NiOₓ|ITO,0.9,5.1,6.0,1.9,4.1\n", "ZnO on BiOI|NiOₓ|ITO,2.8,4.5,7.3,3.5,3.8\n", - "\"\"\"))\n", + "\"\"\")\n", + ")\n", "df2.set_index(\"layer\", inplace=True)\n", "df2.attrs[\"name\"] = \"Voltages vs layer\"" ] @@ -70,14 +74,18 @@ "metadata": {}, "outputs": [], "source": [ - "contributions = [{\n", - " \"project\": name, \"identifier\": \"mp-22987\", \"is_public\": True,\n", - " \"data\": {\n", - " \"rev\": {\"J\": \"6.3 mA/cm²\", \"V\": \"0.75 V\", \"FF\": \"39 %\", \"PCE\": \"1.79 %\"},\n", - " \"fwd\": {\"J\": \"6.3 mA/cm²\", \"V\": \"0.75 V\", \"FF\": \"37 %\", \"PCE\": \"1.74 %\"},\n", - " },\n", - " \"tables\": [df1, df2]\n", - "}]" + "contributions = [\n", + " {\n", + " \"project\": name,\n", + " \"identifier\": \"mp-22987\",\n", + " \"is_public\": True,\n", + " \"data\": {\n", + " \"rev\": {\"J\": \"6.3 mA/cm²\", \"V\": \"0.75 V\", \"FF\": \"39 %\", \"PCE\": \"1.79 %\"},\n", + " \"fwd\": {\"J\": \"6.3 mA/cm²\", \"V\": \"0.75 V\", \"FF\": \"37 %\", \"PCE\": \"1.74 %\"},\n", + " },\n", + " \"tables\": [df1, df2],\n", + " }\n", + "]" ] }, { diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/cards.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/cards.ipynb index e67952d37e..a8dc009b76 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/cards.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/cards.ipynb @@ -28,7 +28,12 @@ "metadata": {}, "outputs": [], "source": [ - "COMPONENTS = [\"data\", \"tables\", \"structures\", \"attachments\"] # supported contribution components\n", + "COMPONENTS = [\n", + " \"data\",\n", + " \"tables\",\n", + " \"structures\",\n", + " \"attachments\",\n", + "] # supported contribution components\n", "identifier = \"mp-2715\" # \"mp-6340\"" ] }, @@ -61,7 +66,8 @@ "# basic project info for all projects\n", "names = list(all_ids.keys())\n", "projects = client.projects.get_entries(\n", - " name__in=names, _fields=[\"name\", \"long_title\", \"authors\", \"description\", \"references\"]\n", + " name__in=names,\n", + " _fields=[\"name\", \"long_title\", \"authors\", \"description\", \"references\"],\n", ").result()" ] }, @@ -72,7 +78,7 @@ "metadata": {}, "outputs": [], "source": [ - "projects#[\"total_count\"] # total number of projects for this identifier" + "projects # [\"total_count\"] # total number of projects for this identifier" ] }, { @@ -90,8 +96,8 @@ "metadata": {}, "outputs": [], "source": [ - "name = \"carrier_transport\" #names[0] # selected project\n", - "ids = list(all_ids[name][\"ids\"]) # list of contribution ObjectIDs" + "name = \"carrier_transport\" # names[0] # selected project\n", + "ids = list(all_ids[name][\"ids\"]) # list of contribution ObjectIDs" ] }, { @@ -124,8 +130,10 @@ "metadata": {}, "outputs": [], "source": [ - "data_columns = {} # potential data columns in dot-notation and their units\n", - "root_data_columns = defaultdict(set) # potential root-level data columns and their (list of) unit(s)\n", + "data_columns = {} # potential data columns in dot-notation and their units\n", + "root_data_columns = defaultdict(\n", + " set\n", + ") # potential root-level data columns and their (list of) unit(s)\n", "has_component = {c: False for c in COMPONENTS} # potentially available components\n", "\n", "for column in info[\"columns\"]:\n", @@ -206,10 +214,10 @@ "outputs": [], "source": [ "# retrieve full sub-tree of values for the selected root data column\n", - "root_column = \"PF\" # list(root_data_columns.keys())[0]\n", + "root_column = \"PF\" # list(root_data_columns.keys())[0]\n", "fields = [\n", " f\"data.{col}\" if unit is None else f\"data.{col}.display\"\n", - " for col, unit in data_columns.items() \n", + " for col, unit in data_columns.items()\n", " if col.startswith(root_column)\n", "]\n", "resp = client.contributions.get_entry(pk=cid, _fields=fields).result()" @@ -251,7 +259,7 @@ "metadata": {}, "outputs": [], "source": [ - "resp[component] # use this to show list of available tables (and table ObjectIDs)" + "resp[component] # use this to show list of available tables (and table ObjectIDs)" ] }, { diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/carrier_transport.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/carrier_transport.ipynb index 68e1c4f64d..2ec37c22e1 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/carrier_transport.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/carrier_transport.ipynb @@ -15,7 +15,7 @@ "from unflatten import unflatten\n", "from pathlib import Path\n", "\n", - "name = 'carrier_transport'" + "name = \"carrier_transport\"" ] }, { @@ -50,26 +50,26 @@ " \"functional\": \"Type of DFT functional \\\n", " (GGA: generalized gradient approximation, GGA+U: GGA + U approximation)\",\n", " \"metal\": \"If True, crystal is a metal\",\n", - " 'ΔE': 'Band gap in eV',\n", - " 'V' : \"Unit cell volume, in cubic angstrom\",\n", - " 'mₑᶜ': 'Eigenvalues (ε₁, ε₂, ε₃) of the conductivity effective mass and their average (ε̄)',\n", - " 'S': 'Average eigenvalue of the Seebeck coefficient',\n", - " 'σ' : 'Average eigenvalue of the conductivity',\n", - " 'κₑ' : 'Average eigenvalue of the electrical thermal conductivity',\n", - " 'PF': 'Average eigenvalue of the Power Factor',\n", - " 'Sᵉ': 'Value (v), temperature (T), and doping level (c) at the \\\n", - " maximum of the average eigenvalue of the Seebeck coefficient', \n", - " 'σᵉ': 'Value (v), temperature (T), and doping level (c) at the \\\n", - " maximum of the average eigenvalue of the conductivity',\n", - " 'κₑᵉ': 'Value (v), temperature (T), and doping level (c) at the \\\n", - " maximum of the average eigenvalue of the electrical thermal conductivity',\n", - " 'PFᵉ': 'Value (v), temperature (T), and doping level (c) at the \\\n", - " maximum of the average eigenvalue of the Power Factor',\n", + " \"ΔE\": \"Band gap in eV\",\n", + " \"V\": \"Unit cell volume, in cubic angstrom\",\n", + " \"mₑᶜ\": \"Eigenvalues (ε₁, ε₂, ε₃) of the conductivity effective mass and their average (ε̄)\",\n", + " \"S\": \"Average eigenvalue of the Seebeck coefficient\",\n", + " \"σ\": \"Average eigenvalue of the conductivity\",\n", + " \"κₑ\": \"Average eigenvalue of the electrical thermal conductivity\",\n", + " \"PF\": \"Average eigenvalue of the Power Factor\",\n", + " \"Sᵉ\": \"Value (v), temperature (T), and doping level (c) at the \\\n", + " maximum of the average eigenvalue of the Seebeck coefficient\",\n", + " \"σᵉ\": \"Value (v), temperature (T), and doping level (c) at the \\\n", + " maximum of the average eigenvalue of the conductivity\",\n", + " \"κₑᵉ\": \"Value (v), temperature (T), and doping level (c) at the \\\n", + " maximum of the average eigenvalue of the electrical thermal conductivity\",\n", + " \"PFᵉ\": \"Value (v), temperature (T), and doping level (c) at the \\\n", + " maximum of the average eigenvalue of the Power Factor\",\n", "}\n", "\n", "references = [\n", " {\"label\": \"SData\", \"url\": \"https://doi.org/10.1038/sdata.2017.85\"},\n", - " {\"label\": \"Dryad\", \"url\": \"https://doi.org/10.5061/dryad.gn001\"}\n", + " {\"label\": \"Dryad\", \"url\": \"https://doi.org/10.5061/dryad.gn001\"},\n", "]\n", "\n", "# with Client() as client:\n", @@ -88,13 +88,13 @@ }, "outputs": [], "source": [ - "eigs_keys = ['ε₁', 'ε₂', 'ε₃', 'ε̄']\n", + "eigs_keys = [\"ε₁\", \"ε₂\", \"ε₃\", \"ε̄\"]\n", "prop_defs = {\n", - " 'mₑᶜ': \"mₑ\",\n", - " 'S': \"µV/K\",\n", - " 'σ': \"1/fΩ/m/s\",\n", - " 'κₑ': \"GW/K/m/s\",\n", - " 'PF': \"GW/K²/m/s\"\n", + " \"mₑᶜ\": \"mₑ\",\n", + " \"S\": \"µV/K\",\n", + " \"σ\": \"1/fΩ/m/s\",\n", + " \"κₑ\": \"GW/K/m/s\",\n", + " \"PF\": \"GW/K²/m/s\",\n", "}\n", "ext_defs = {\"T\": \"K\", \"c\": \"µm⁻³\"}\n", "columns = {\"task\": None, \"functional\": None, \"metal\": None, \"ΔE\": \"eV\", \"V\": \"ų\"}\n", @@ -110,15 +110,15 @@ "for kk, unit in prop_defs.items():\n", " if kk.startswith(\"mₑ\"):\n", " continue\n", - " \n", + "\n", " for k in [\"p\", \"n\"]:\n", " path = f\"{kk}ᵉ.{k}\"\n", " columns[f\"{path}.v\"] = unit\n", "\n", " for a, b in ext_defs.items():\n", " columns[f\"{path}.{a}\"] = b\n", - " \n", - " \n", + "\n", + "\n", "columns[\"tables\"] = None\n", "\n", "# with Client() as client:\n", @@ -138,13 +138,13 @@ "metadata": {}, "outputs": [], "source": [ - "input_dir = '/project/projectdirs/matgen/fricci/transport_data/coarse'\n", + "input_dir = \"/project/projectdirs/matgen/fricci/transport_data/coarse\"\n", "# input_dir = '/Users/patrick/gitrepos/mp/mpcontribs-data/transport_coarse'\n", - "props_map = { # original units\n", - " 'cond_eff_mass': {\"name\": 'mₑᶜ', \"unit\": \"mₑ\"},\n", - " 'seebeck_doping': {\"name\": 'S', \"unit\": \"µV/K\"},\n", - " 'cond_doping': {\"name\": 'σ', \"unit\": \"1/Ω/m/s\"},\n", - " 'kappa_doping': {\"name\": 'κₑ', \"unit\": \"W/K/m/s\"},\n", + "props_map = { # original units\n", + " \"cond_eff_mass\": {\"name\": \"mₑᶜ\", \"unit\": \"mₑ\"},\n", + " \"seebeck_doping\": {\"name\": \"S\", \"unit\": \"µV/K\"},\n", + " \"cond_doping\": {\"name\": \"σ\", \"unit\": \"1/Ω/m/s\"},\n", + " \"kappa_doping\": {\"name\": \"κₑ\", \"unit\": \"W/K/m/s\"},\n", "}" ] }, @@ -170,70 +170,74 @@ "title_prefix = \"Temperature- and Doping-Level-Dependence\"\n", "\n", "titles = {\n", - " 'S': \"Seebeck Coefficient\",\n", - " 'σ': \"Conductivity\",\n", - " 'κₑ': \"Electrical Thermal Conductivity\",\n", - " 'PF': \"Power Factor\"\n", + " \"S\": \"Seebeck Coefficient\",\n", + " \"σ\": \"Conductivity\",\n", + " \"κₑ\": \"Electrical Thermal Conductivity\",\n", + " \"PF\": \"Power Factor\",\n", "}\n", "\n", "with Client() as client:\n", - " identifiers = client.get_all_ids(dict(project=name)).get(name, {}).get(\"identifiers\", [])\n", - " \n", + " identifiers = (\n", + " client.get_all_ids(dict(project=name)).get(name, {}).get(\"identifiers\", [])\n", + " )\n", + "\n", "print(\"#contribs:\", len(identifiers))\n", "\n", "for obj in tqdm(files):\n", - " identifier = obj.name.split('.', 1)[0].rsplit('_', 1)[-1]\n", - " valid = bool(identifier.startswith('mp-') or identifier.startswith('mvc-'))\n", + " identifier = obj.name.split(\".\", 1)[0].rsplit(\"_\", 1)[-1]\n", + " valid = bool(identifier.startswith(\"mp-\") or identifier.startswith(\"mvc-\"))\n", "\n", " if not valid:\n", - " print(identifier, 'not valid')\n", + " print(identifier, \"not valid\")\n", " continue\n", "\n", " if identifier in identifiers:\n", " continue\n", "\n", - " with gzip.open(obj.path, 'rb') as input_file:\n", + " with gzip.open(obj.path, \"rb\") as input_file:\n", " data = json.loads(input_file.read())\n", - " task_type = 'GGA+U' if 'GGA+U' in data['gap'] else 'GGA'\n", - " gap = data['gap'][task_type]\n", + " task_type = \"GGA+U\" if \"GGA+U\" in data[\"gap\"] else \"GGA\"\n", + " gap = data[\"gap\"][task_type]\n", "\n", " cdata = {\n", - " \"task\": data['task_id'][task_type],\n", + " \"task\": data[\"task_id\"][task_type],\n", " \"functional\": task_type,\n", - " \"metal\": 'Yes' if gap < 0.1 else 'No',\n", + " \"metal\": \"Yes\" if gap < 0.1 else \"No\",\n", " \"ΔE\": f\"{gap} eV\",\n", - " \"V\": f\"{data['volume']} ų\"\n", + " \"V\": f\"{data['volume']} ų\",\n", " }\n", "\n", - " tables = [] \n", + " tables = []\n", " S2arr = []\n", "\n", - " for doping_type in ['p', 'n']:\n", - "\n", + " for doping_type in [\"p\", \"n\"]:\n", " for key, v in props_map.items():\n", " prop = data[task_type][key].get(doping_type, {})\n", - " d = prop.get('300', {}).get('1e+18', {})\n", + " d = prop.get(\"300\", {}).get(\"1e+18\", {})\n", " unit = v[\"unit\"]\n", "\n", " if d:\n", - " eigs = d if isinstance(d, list) else d['eigs']\n", + " eigs = d if isinstance(d, list) else d[\"eigs\"]\n", " k = f\"{v['name']}.{doping_type}\"\n", " value = f\"{np.mean(eigs)} {unit}\"\n", "\n", - " if key == 'cond_eff_mass':\n", + " if key == \"cond_eff_mass\":\n", " cdata[k] = {eigs_keys[-1]: value}\n", " for neig, eig in enumerate(eigs):\n", " cdata[k][eigs_keys[neig]] = f\"{eig} {unit}\"\n", " else:\n", " cdata[k] = value\n", - " if key == 'seebeck_doping':\n", - " S2 = np.dot(d['tensor'], d['tensor'])\n", - " elif key == 'cond_doping':\n", - " pf = np.mean(np.linalg.eigh(np.dot(S2, d['tensor']))[0]) * 1e-8\n", + " if key == \"seebeck_doping\":\n", + " S2 = np.dot(d[\"tensor\"], d[\"tensor\"])\n", + " elif key == \"cond_doping\":\n", + " pf = (\n", + " np.mean(np.linalg.eigh(np.dot(S2, d[\"tensor\"]))[0])\n", + " * 1e-8\n", + " )\n", " cdata[f\"PF.{doping_type}\"] = f\"{pf} µW/cm/K²/s\"\n", "\n", " if key != \"cond_eff_mass\":\n", - " prop_averages, dopings, cols = [], None, ['T [K]']\n", + " prop_averages, dopings, cols = [], None, [\"T [K]\"]\n", " pf_averages = []\n", " temps = sorted(map(int, prop.keys()))\n", "\n", @@ -245,28 +249,31 @@ " dopings = sorted(map(float, prop[str(temp)].keys()))\n", "\n", " for idop, doping in enumerate(dopings):\n", - " doping_str = f'{doping:.0e}'\n", + " doping_str = f\"{doping:.0e}\"\n", " if len(cols) <= len(dopings):\n", - " cols.append(f'{doping_str}'.replace(\"+\", \"\"))\n", + " cols.append(f\"{doping_str}\".replace(\"+\", \"\"))\n", "\n", " d = prop[str(temp)][doping_str]\n", " row.append(np.mean(d[\"eigs\"]))\n", - " tensor = d['tensor']\n", + " tensor = d[\"tensor\"]\n", "\n", - " if key == 'seebeck_doping':\n", + " if key == \"seebeck_doping\":\n", " S2arr.append(np.dot(tensor, tensor))\n", - " elif key == 'cond_doping': \n", + " elif key == \"cond_doping\":\n", " S2idx = it * len(dopings) + idop\n", - " pf = np.mean(np.linalg.eigh(\n", - " np.dot(S2arr[S2idx], tensor)\n", - " )[0]) * 1e-8\n", + " pf = (\n", + " np.mean(\n", + " np.linalg.eigh(np.dot(S2arr[S2idx], tensor))[0]\n", + " )\n", + " * 1e-8\n", + " )\n", " row_pf.append(pf)\n", "\n", " prop_averages.append(row)\n", " pf_averages.append(row_pf)\n", "\n", " df_data = [np.array(prop_averages)]\n", - " if key == 'cond_doping':\n", + " if key == \"cond_doping\":\n", " df_data.append(np.array(pf_averages))\n", "\n", " for ii, np_prop_averages in enumerate(df_data):\n", @@ -275,36 +282,42 @@ "\n", " df = DataFrame(np_prop_averages, columns=cols)\n", " df.set_index(\"T [K]\", inplace=True)\n", - " df.columns.name = columns_name # legend name\n", - " df.attrs[\"name\"] = f'{nm}({doping_type})' # -> used as title by default\n", - " df.attrs[\"title\"] = f'{title_prefix} of {doping_type}-type {titles[nm]}'\n", + " df.columns.name = columns_name # legend name\n", + " df.attrs[\"name\"] = (\n", + " f\"{nm}({doping_type})\" # -> used as title by default\n", + " )\n", + " df.attrs[\"title\"] = (\n", + " f\"{title_prefix} of {doping_type}-type {titles[nm]}\"\n", + " )\n", " df.attrs[\"labels\"] = {\n", - " \"value\": f'{nm}({doping_type}) [{u}]', # y-axis label\n", - " #\"variable\": columns_name # alternative for df.columns.name\n", + " \"value\": f\"{nm}({doping_type}) [{u}]\", # y-axis label\n", + " # \"variable\": columns_name # alternative for df.columns.name\n", " }\n", " tables.append(df)\n", "\n", - " arr_prop_avg = np_prop_averages[:,1:] #[:,[4,8,12]]\n", + " arr_prop_avg = np_prop_averages[:, 1:] # [:,[4,8,12]]\n", " max_v = np.max(arr_prop_avg)\n", "\n", - " if key[0] == 's' and doping_type == 'n':\n", + " if key[0] == \"s\" and doping_type == \"n\":\n", " max_v = np.min(arr_prop_avg)\n", - " if key[0] == 'k':\n", + " if key[0] == \"k\":\n", " max_v = np.min(arr_prop_avg)\n", "\n", - " arg_max = np.argwhere(arr_prop_avg==max_v)[0]\n", - " elabel = f'{nm}ᵉ'\n", - " cdata[f'{elabel}.{doping_type}'] = unflatten({\n", - " 'v': f\"{max_v} {u}\",\n", - " 'T': f\"{temps[arg_max[0]]} K\",\n", - " 'c': f\"{dopings[arg_max[1]]} cm⁻³\"\n", - " })\n", - "\n", - " contrib = {'project': name, 'identifier': identifier, 'is_public': True}\n", + " arg_max = np.argwhere(arr_prop_avg == max_v)[0]\n", + " elabel = f\"{nm}ᵉ\"\n", + " cdata[f\"{elabel}.{doping_type}\"] = unflatten(\n", + " {\n", + " \"v\": f\"{max_v} {u}\",\n", + " \"T\": f\"{temps[arg_max[0]]} K\",\n", + " \"c\": f\"{dopings[arg_max[1]]} cm⁻³\",\n", + " }\n", + " )\n", + "\n", + " contrib = {\"project\": name, \"identifier\": identifier, \"is_public\": True}\n", " contrib[\"data\"] = unflatten(cdata)\n", " contrib[\"tables\"] = tables\n", " contributions.append(contrib)\n", - " \n", + "\n", "len(contributions)" ] }, @@ -335,7 +348,7 @@ "\n", "with open(\"carrier_transport_p-type-update.json\", \"r\") as f:\n", " contributions = json.load(f)\n", - " \n", + "\n", "len(contributions)" ] }, @@ -350,7 +363,10 @@ "name = \"carrier_transport\"\n", "\n", "with Client() as client:\n", - " query = {\"project\": name, \"data__functional__exact\": \"\"} # data.functional not set after rename type -> functional\n", + " query = {\n", + " \"project\": name,\n", + " \"data__functional__exact\": \"\",\n", + " } # data.functional not set after rename type -> functional\n", " ids_map = client.get_all_ids(query, fmt=\"map\").get(name)\n", "\n", "len(ids_map) # = number of contributions to be updated" @@ -369,15 +385,17 @@ "for contrib in contributions:\n", " pk = ids_map.get(contrib[\"identifier\"], {}).get(\"id\")\n", " if pk:\n", - " submit.append({\"data\": {\n", - " k: {\n", - " kk: vv\n", - " for kk, vv in v.items()\n", - " if kk == \"p\"\n", - " } if isinstance(v, dict) else v\n", - " for k, v in contrib[\"data\"].items()\n", - " if k == \"functional\" or \"ᵉ\" in k\n", - " }})\n", + " submit.append(\n", + " {\n", + " \"data\": {\n", + " k: {kk: vv for kk, vv in v.items() if kk == \"p\"}\n", + " if isinstance(v, dict)\n", + " else v\n", + " for k, v in contrib[\"data\"].items()\n", + " if k == \"functional\" or \"ᵉ\" in k\n", + " }\n", + " }\n", + " )\n", " submit[-1][\"id\"] = pk\n", "\n", "len(submit)" @@ -393,8 +411,8 @@ "outputs": [], "source": [ "with Client() as client:\n", - " #client.delete_contributions(name)\n", - " #client.init_columns(name, columns)\n", + " # client.delete_contributions(name)\n", + " # client.init_columns(name, columns)\n", " client.submit_contributions(submit, ignore_dupes=True)" ] }, @@ -415,19 +433,19 @@ "\n", "query = {\n", " \"project\": \"carrier_transport\",\n", - "# \"formula_contains\": \"ZnS\",\n", - "# \"identifier__in\": [\"mp-10695\", \"mp-760381\"], # ZnS, CuS\n", + " # \"formula_contains\": \"ZnS\",\n", + " # \"identifier__in\": [\"mp-10695\", \"mp-760381\"], # ZnS, CuS\n", " \"data__functional__exact\": \"GGA+U\",\n", " \"data__metal__contains\": \"Y\",\n", " \"data__mₑᶜ__p__ε̄__value__gte\": 1000,\n", " \"_order_by\": \"data__mₑᶜ__p__ε̄__value\",\n", " \"order\": \"desc\",\n", - " \"_fields\": [\"id\", \"identifier\", \"formula\", \"data.mₑᶜ.p.ε̄.value\"]\n", + " \"_fields\": [\"id\", \"identifier\", \"formula\", \"data.mₑᶜ.p.ε̄.value\"],\n", "}\n", "\n", "with Client() as client:\n", " result = client.contributions.get_entries(**query).result()\n", - " \n", + "\n", "result" ] }, @@ -461,8 +479,8 @@ "}\n", "\n", "print(client.get_totals(query=query))\n", - "query[\"format\"] = \"json\" # \"csv\" or \"json\"\n", - "client.download_contributions(query) #, include=[\"tables\"])" + "query[\"format\"] = \"json\" # \"csv\" or \"json\"\n", + "client.download_contributions(query) # , include=[\"tables\"])" ] }, { diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/defect_genome_pcfc_materials.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/defect_genome_pcfc_materials.ipynb index eb10604712..2858dba84d 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/defect_genome_pcfc_materials.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/defect_genome_pcfc_materials.ipynb @@ -18,7 +18,7 @@ "metadata": {}, "outputs": [], "source": [ - "name = 'defect_genome_pcfc_materials'\n", + "name = \"defect_genome_pcfc_materials\"\n", "client = Client()\n", "mpr = MPRester()" ] @@ -45,9 +45,15 @@ "metadata": {}, "outputs": [], "source": [ - "client.projects.update_entry(pk=name, project={\n", - " \"references[0]\": {\"label\": \"ACS\", \"url\": \"https://doi.org/10.1021/acs.jpcc.7b08716\"}\n", - "}).result()" + "client.projects.update_entry(\n", + " pk=name,\n", + " project={\n", + " \"references[0]\": {\n", + " \"label\": \"ACS\",\n", + " \"url\": \"https://doi.org/10.1021/acs.jpcc.7b08716\",\n", + " }\n", + " },\n", + ").result()" ] }, { @@ -63,12 +69,16 @@ "metadata": {}, "outputs": [], "source": [ - "df = read_excel('/Users/patrick/gitrepos/mp/MPContribs/mpcontribs-data/DefectGenome_JPCC-data_MP.xlsx')\n", - "df.columns = MultiIndex.from_arrays([\n", - " ['', '', '', 'Eᶠ', 'Eᶠ', 'Eᶠ', 'Eᶠ', 'ΔEᵢ'],\n", - " ['A', 'B', 'a', 'ABO₃', 'Yᴮ', 'Vᴼ', 'Hᵢ', 'Yᴮ−Hᵢ']\n", - "])\n", - "units = {'A': '', 'B': '', 'a': 'Å'}\n", + "df = read_excel(\n", + " \"/Users/patrick/gitrepos/mp/MPContribs/mpcontribs-data/DefectGenome_JPCC-data_MP.xlsx\"\n", + ")\n", + "df.columns = MultiIndex.from_arrays(\n", + " [\n", + " [\"\", \"\", \"\", \"Eᶠ\", \"Eᶠ\", \"Eᶠ\", \"Eᶠ\", \"ΔEᵢ\"],\n", + " [\"A\", \"B\", \"a\", \"ABO₃\", \"Yᴮ\", \"Vᴼ\", \"Hᵢ\", \"Yᴮ−Hᵢ\"],\n", + " ]\n", + ")\n", + "units = {\"A\": \"\", \"B\": \"\", \"a\": \"Å\"}\n", "df" ] }, @@ -81,33 +91,35 @@ "contributions = []\n", "for idx, row in df.iterrows():\n", " A, B = row[df.columns[0]], row[df.columns[1]]\n", - " formula = f'{A}{B}O3'\n", + " formula = f\"{A}{B}O3\"\n", " data = mpr.get_data(formula, prop=\"volume\")\n", "\n", " if len(data) > 1:\n", - " volume = row[df.columns[2]]**3\n", + " volume = row[df.columns[2]] ** 3\n", " for d in data:\n", - " d['dV'] = abs(d['volume']-volume)\n", - " data = sorted(data, key=lambda item: item['dV'])\n", + " d[\"dV\"] = abs(d[\"volume\"] - volume)\n", + " data = sorted(data, key=lambda item: item[\"dV\"])\n", " elif not data:\n", - " print(formula, 'not found on MP')\n", + " print(formula, \"not found on MP\")\n", " continue\n", "\n", - " identifier = data[0]['material_id']\n", - " #print(idx, formula, identifier)\n", - " \n", + " identifier = data[0][\"material_id\"]\n", + " # print(idx, formula, identifier)\n", + "\n", " data = {}\n", " for col in df.columns:\n", " flat_col = \".\".join([c for c in col if c])\n", - " unit = units.get(flat_col, 'eV')\n", - " data[flat_col] = f'{row[col]} {unit}' if unit else row[col]\n", + " unit = units.get(flat_col, \"eV\")\n", + " data[flat_col] = f\"{row[col]} {unit}\" if unit else row[col]\n", "\n", " contrib = {\n", - " 'project': name, 'identifier': identifier, 'is_public': True,\n", - " 'data': unflatten(data)\n", + " \"project\": name,\n", + " \"identifier\": identifier,\n", + " \"is_public\": True,\n", + " \"data\": unflatten(data),\n", " }\n", " contributions.append(contrib)\n", - " \n", + "\n", "len(contributions)" ] }, @@ -143,16 +155,20 @@ "source": [ "query = {\n", " \"project\": name,\n", - "# \"formula__contains\": \"Mg\",\n", + " # \"formula__contains\": \"Mg\",\n", " \"data__A__contains\": \"Mg\",\n", " \"data__a__value__lte\": 4.1,\n", " \"data__Eᶠ__ABO₃__value__lte\": 3.2,\n", " \"_order_by\": \"data__a__value\",\n", " \"order\": \"desc\",\n", " \"_fields\": [\n", - " \"id\", \"identifier\", \"formula\",\n", - " \"data.A\", \"data.a.value\", \"data.Eᶠ.ABO₃.value\"\n", - " ] \n", + " \"id\",\n", + " \"identifier\",\n", + " \"formula\",\n", + " \"data.A\",\n", + " \"data.a.value\",\n", + " \"data.Eᶠ.ABO₃.value\",\n", + " ],\n", "}\n", "client.contributions.get_entries(**query).result()" ] diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/deltaHvacancy.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/deltaHvacancy.ipynb index 523de5837a..5688c7c429 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/deltaHvacancy.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/deltaHvacancy.ipynb @@ -37,7 +37,9 @@ "outputs": [], "source": [ "# allow non-unique identifiers (disables duplicate checking)\n", - "client.projects.updateProjectByName(pk=client.project, project={\"unique_identifiers\": False}).result()" + "client.projects.updateProjectByName(\n", + " pk=client.project, project={\"unique_identifiers\": False}\n", + ").result()" ] }, { @@ -50,12 +52,15 @@ "# set \"other\" field in project info to explain data columns\n", "# appears on hover in contribution section on materials details pages\n", "client.projects.updateProjectByName(\n", - " pk=client.project, project={\"other\": {\n", - " \"dH\": \"vacancy formation enthalpy in eV\",\n", - " \"dH|atom\": \"vacancy formation enthalpy in eV/atom\",\n", - " \"m\": \"electron effective mass in mₑ\"\n", - " # TODO add more as needed\n", - " }}\n", + " pk=client.project,\n", + " project={\n", + " \"other\": {\n", + " \"dH\": \"vacancy formation enthalpy in eV\",\n", + " \"dH|atom\": \"vacancy formation enthalpy in eV/atom\",\n", + " \"m\": \"electron effective mass in mₑ\",\n", + " # TODO add more as needed\n", + " }\n", + " },\n", ").result()" ] }, @@ -68,28 +73,33 @@ "source": [ "# load data\n", "drivedir = Path(\"/Users/patrick/GoogleDriveLBNL/My Drive/\")\n", - "datadir = drivedir / Path(\"MaterialsProject/gitrepos/mpcontribs-data/deltaHvacancy/nrel_matdb\")\n", + "datadir = drivedir / Path(\n", + " \"MaterialsProject/gitrepos/mpcontribs-data/deltaHvacancy/nrel_matdb\"\n", + ")\n", "\n", "columns_map = {\n", " \"formula\": {\"name\": \"formula\"},\n", - " \"defectname\": {\"name\": \"defect\"}, # string\n", - " \"site\": {\"name\": \"site\", \"unit\": \"\"}, # dimensionless\n", + " \"defectname\": {\"name\": \"defect\"}, # string\n", + " \"site\": {\"name\": \"site\", \"unit\": \"\"}, # dimensionless\n", " \"charge\": {\"name\": \"charge\", \"unit\": \"\"},\n", " \"dH_eV\": {\"name\": \"dH\", \"unit\": \"eV\"},\n", " \"dH_eV_per_atom\": {\"name\": \"dH|atom\", \"unit\": \"eV/atom\"},\n", " \"bandgap_eV\": {\"name\": \"bandgap\", \"unit\": \"eV\"},\n", " \"electron_effective_mass\": {\"name\": \"m\", \"unit\": \"mₑ\"},\n", - " \"level_theory\": {\"name\": \"theory\"}\n", + " \"level_theory\": {\"name\": \"theory\"},\n", "}\n", "new_column_names = {k: v[\"name\"] for k, v in columns_map.items()}\n", "\n", + "\n", "def apply_unit(cell, unit):\n", " return f\"{cell} {unit}\" if unit and cell else cell\n", "\n", + "\n", "def apply_units(column):\n", " unit = columns_map[column.name].get(\"unit\")\n", " return column.apply(apply_unit, args=(unit,))\n", "\n", + "\n", "contributions = []\n", "\n", "# NOTE make sure all `_oxstate` and `_POSCAR_wyck` files are gzipped\n", @@ -98,19 +108,27 @@ " prefix, nrel_matdb_id, _ = path.name.split(\".\")\n", " stem = f\"{path.parent}{os.sep}{prefix}.{nrel_matdb_id}\"\n", " poscar_file = f\"{stem}_POSCAR_wyck.gz\"\n", - " structure = Structure.from_file(poscar_file, 'POSCAR')\n", + " structure = Structure.from_file(poscar_file, \"POSCAR\")\n", " mpid = mpr.find_structure(structure)\n", " identifier = mpid if mpid else nrel_matdb_id\n", " attachments = [Path(poscar_file), Path(f\"{stem}_oxstate.gz\")]\n", - " df = read_csv(path).dropna(axis=1, how=\"all\").apply(apply_units).rename(columns=new_column_names)\n", - " \n", + " df = (\n", + " read_csv(path)\n", + " .dropna(axis=1, how=\"all\")\n", + " .apply(apply_units)\n", + " .rename(columns=new_column_names)\n", + " )\n", + "\n", " for record in df.to_dict(orient=\"records\"):\n", - " data = {k: v for k, v in record.items() if v} # clean record\n", - " contributions.append({\n", - " \"identifier\": identifier,\n", - " \"data\": unflatten(data, splitter=\"dot\"),\n", - " \"structures\": [structure], \"attachments\": attachments, # duplicates linked internally\n", - " })\n", + " data = {k: v for k, v in record.items() if v} # clean record\n", + " contributions.append(\n", + " {\n", + " \"identifier\": identifier,\n", + " \"data\": unflatten(data, splitter=\"dot\"),\n", + " \"structures\": [structure],\n", + " \"attachments\": attachments, # duplicates linked internally\n", + " }\n", + " )\n", " contributions[-1][\"data\"][\"nrel|id\"] = nrel_matdb_id\n", "\n", "contributions[0]" @@ -137,11 +155,11 @@ "metadata": {}, "outputs": [], "source": [ - "client.delete_contributions() # easier to delete everything for small projects\n", + "client.delete_contributions() # easier to delete everything for small projects\n", "client.init_columns(columns)\n", "client.submit_contributions(contributions, ignore_dupes=True)\n", "# this shouldn't be necessary but need to re-init columns likely due to bug in API server\n", - "client.init_columns(columns) " + "client.init_columns(columns)" ] } ], diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/dilute_solute_diffusion.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/dilute_solute_diffusion.ipynb index 3ce892c236..e3b6065de2 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/dilute_solute_diffusion.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/dilute_solute_diffusion.ipynb @@ -33,7 +33,9 @@ "from mp_api.client import MPRester\n", "from pathlib import Path\n", "\n", - "data_dir = Path(\"/Users/patrick/GoogleDriveLBNL/My Drive/MaterialsProject/gitrepos/mpcontribs-data/\")\n", + "data_dir = Path(\n", + " \"/Users/patrick/GoogleDriveLBNL/My Drive/MaterialsProject/gitrepos/mpcontribs-data/\"\n", + ")\n", "zfile = data_dir / name / \"z.json\"\n", "z = json.load(zfile.open())\n", "mpr = MPRester(\"bmdNL4cV6Ei0CqhUAhK6JwFSZ6XMH0Gz\")\n", @@ -61,7 +63,7 @@ " for sheet, df in df_dct.items():\n", " df.to_excel(writer, sheet)\n", " else:\n", - " print(\"no excel sheet found on figshare\") \n", + " print(\"no excel sheet found on figshare\")\n", "else:\n", " df_dct = read_excel(fpath, sheet_name=None, engine=\"openpyxl\")\n", "\n", @@ -78,8 +80,10 @@ "# function to search MP via its summary API endpoint\n", "def search(formula=None, spacegroup_number=None, chemsys=None):\n", " return mpr.summary.search(\n", - " formula=formula, chemsys=chemsys, spacegroup_number=spacegroup_number,\n", - " fields=[\"material_id\"]#, sort_fields=\"energy_above_hull\"\n", + " formula=formula,\n", + " chemsys=chemsys,\n", + " spacegroup_number=spacegroup_number,\n", + " fields=[\"material_id\"], # , sort_fields=\"energy_above_hull\"\n", " )" ] }, @@ -90,7 +94,12 @@ "metadata": {}, "outputs": [], "source": [ - "host_info = df_dct[\"Host Information\"].set_index(\"Host element name\").dropna().drop(\"Unnamed: 0\", axis=1)\n", + "host_info = (\n", + " df_dct[\"Host Information\"]\n", + " .set_index(\"Host element name\")\n", + " .dropna()\n", + " .drop(\"Unnamed: 0\", axis=1)\n", + ")\n", "hosts = None\n", "host_info" ] @@ -145,7 +154,7 @@ " df = df.drop(rows)\n", "\n", " contrib[\"data\"] = hdata\n", - " \n", + "\n", " print(\"add table for D₀/Q data for {}\".format(mpid))\n", " df = df.set_index(df[\"Solute element number\"])\n", " df = df.drop(\"Solute element number\", axis=1)\n", @@ -182,8 +191,8 @@ " \"title\": \"D₀/Q by Solute\",\n", " \"labels\": {\n", " \"value\": \"D₀/Q\",\n", - " #\"variable\": \"method\"\n", - " }\n", + " # \"variable\": \"method\"\n", + " },\n", " }\n", " contrib[\"tables\"] = [df_D0_Q]\n", "\n", @@ -231,11 +240,8 @@ " contrib[\"tables\"].append(df_v)\n", "\n", " elif hdata[\"Host\"][\"crystal_structure\"] == \"FCC\":\n", - "\n", " print(\"add table for hop activation barriers for {} (FCC)\".format(mpid))\n", - " columns_E = [\n", - " \"Hop activation barrier, E_{} [eV]\".format(i) for i in range(5)\n", - " ]\n", + " columns_E = [\"Hop activation barrier, E_{} [eV]\".format(i) for i in range(5)]\n", " df_E = df[[\"Solute element name\"] + columns_E]\n", " df_E.columns = [\"Solute\"] + [\n", " \"E{} [eV]\".format(i) for i in [\"₀\", \"₁\", \"₂\", \"₃\", \"₄\"]\n", @@ -247,9 +253,7 @@ " contrib[\"tables\"].append(df_E)\n", "\n", " print(\"add table for hop attempt frequencies for {} (FCC)\".format(mpid))\n", - " columns_v = [\n", - " \"Hop attempt frequency, v_{} [THz]\".format(i) for i in range(5)\n", - " ]\n", + " columns_v = [\"Hop attempt frequency, v_{} [THz]\".format(i) for i in range(5)]\n", " df_v = df[[\"Solute element name\"] + columns_v]\n", " df_v.columns = [\"Solute\"] + [\n", " \"v{} [THz]\".format(i) for i in [\"₀\", \"₁\", \"₂\", \"₃\", \"₄\"]\n", @@ -261,7 +265,6 @@ " contrib[\"tables\"].append(df_v)\n", "\n", " elif hdata[\"Host\"][\"crystal_structure\"] == \"HCP\":\n", - "\n", " print(\"add table for hop activation barriers for {} (HCP)\".format(mpid))\n", " columns_E = [\n", " \"Hop activation barrier, E_X [eV]\",\n", @@ -317,23 +320,55 @@ "from flatten_dict import flatten, unflatten\n", "\n", "columns_map = {\n", - " \"Host.crystal_structure\": {\"name\": \"host.symmetry\", \"description\": \"host crystal structure\"},\n", - " \"Host.melting_temperature\": {\"name\": \"host.temperature|melt\", \"unit\": \"K\", \"description\": \"host melting temperature\"},\n", - " \"Host.vacancy_formation_energy\": {\"name\": \"host.energy|formation\", \"unit\": \"eV\", \"description\": \"host vacancy formation energy\"},\n", - " \"Host.lattice_constant\": {\"name\": \"host.lattice\", \"unit\": \"Å\", \"description\": \"host lattice constant\"},\n", - " \"Host.self-diffusion_correction_shift\": {\"name\": \"host.shift\", \"unit\": \"eV\", \"description\": \"host self diffusion correction shift\"},\n", - " \"note\": {\"name\": \"excluded\", \"description\": \"solutes were calculated but either did not converge or relaxed into the neighboring vacancy, making it ineligible for the analytical multi-frequency formalism\"},\n", + " \"Host.crystal_structure\": {\n", + " \"name\": \"host.symmetry\",\n", + " \"description\": \"host crystal structure\",\n", + " },\n", + " \"Host.melting_temperature\": {\n", + " \"name\": \"host.temperature|melt\",\n", + " \"unit\": \"K\",\n", + " \"description\": \"host melting temperature\",\n", + " },\n", + " \"Host.vacancy_formation_energy\": {\n", + " \"name\": \"host.energy|formation\",\n", + " \"unit\": \"eV\",\n", + " \"description\": \"host vacancy formation energy\",\n", + " },\n", + " \"Host.lattice_constant\": {\n", + " \"name\": \"host.lattice\",\n", + " \"unit\": \"Å\",\n", + " \"description\": \"host lattice constant\",\n", + " },\n", + " \"Host.self-diffusion_correction_shift\": {\n", + " \"name\": \"host.shift\",\n", + " \"unit\": \"eV\",\n", + " \"description\": \"host self diffusion correction shift\",\n", + " },\n", + " \"note\": {\n", + " \"name\": \"excluded\",\n", + " \"description\": \"solutes were calculated but either did not converge or relaxed into the neighboring vacancy, making it ineligible for the analytical multi-frequency formalism\",\n", + " },\n", "}\n", "columns = {col[\"name\"]: col.get(\"unit\") for col in columns_map.values()}\n", "clean_contributions = []\n", "\n", "for contrib in contributions:\n", - " clean_contrib = {\"identifier\": contrib[\"identifier\"], \"formula\": contrib[\"formula\"], \"tables\": contrib[\"tables\"]}\n", + " clean_contrib = {\n", + " \"identifier\": contrib[\"identifier\"],\n", + " \"formula\": contrib[\"formula\"],\n", + " \"tables\": contrib[\"tables\"],\n", + " }\n", " data = {}\n", " for k, v in flatten(contrib[\"data\"], reducer=\"dot\").items():\n", - " data[columns_map[k][\"name\"]] = v.replace(\"The\", \"\").replace(columns_map[k][\"description\"], \"\").replace(\n", - " \"solutes were calculated but either did not converge or relaxed into the neighboring vacancy, making the solute ineligible for the analytical multi-frequency formalism\", \"\"\n", - " ).strip()\n", + " data[columns_map[k][\"name\"]] = (\n", + " v.replace(\"The\", \"\")\n", + " .replace(columns_map[k][\"description\"], \"\")\n", + " .replace(\n", + " \"solutes were calculated but either did not converge or relaxed into the neighboring vacancy, making the solute ineligible for the analytical multi-frequency formalism\",\n", + " \"\",\n", + " )\n", + " .strip()\n", + " )\n", "\n", " clean_contrib[\"data\"] = unflatten(data, splitter=\"dot\")\n", " clean_contributions.append(clean_contrib)\n", diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/download.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/download.ipynb index 0d17143395..a18a25b20b 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/download.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/download.ipynb @@ -28,17 +28,22 @@ "metadata": {}, "outputs": [], "source": [ - "fields = [\"id\", \"identifier\", \"formula\", \"data.mₑᶜ.p.ε̄.value\"] # which fields to retrieve\n", - "sort = \"-data__mₑᶜ__p__ε̄__value\" # field to sort by (NOTE `__value`!); use +/- for asc/desc\n", + "fields = [\n", + " \"id\",\n", + " \"identifier\",\n", + " \"formula\",\n", + " \"data.mₑᶜ.p.ε̄.value\",\n", + "] # which fields to retrieve\n", + "sort = \"-data__mₑᶜ__p__ε̄__value\" # field to sort by (NOTE `__value`!); use +/- for asc/desc\n", "# see https://contribs-api.materialsproject.org/#/contributions/get_entries for available query parameters\n", "query = {\n", - "# \"formula_contains\": \"ZnS\",\n", - "# \"identifier__in\": [\"mp-10695\", \"mp-760381\"], # ZnS, CuS\n", + " # \"formula_contains\": \"ZnS\",\n", + " # \"identifier__in\": [\"mp-10695\", \"mp-760381\"], # ZnS, CuS\n", " \"data__functional__exact\": \"GGA+U\",\n", " \"data__metal__contains\": \"Y\",\n", " \"data__mₑᶜ__p__ε̄__value__gte\": 1000,\n", "}\n", - "client.get_totals(query=query) # lightweight call to count results" + "client.get_totals(query=query) # lightweight call to count results" ] }, { @@ -62,11 +67,11 @@ "source": [ "query[\"_fields\"] = fields\n", "query[\"sort\"] = sort\n", - "query[\"format\"] = \"csv\" # \"csv\" or \"json\"\n", + "query[\"format\"] = \"csv\" # \"csv\" or \"json\"\n", "client.download_contributions(\n", " query=query,\n", - " outdir=\"mpcontribs-downloads/my-query\", # change outdir for different queries\n", - " #include=[\"tables\"] # include the tables in the download\n", + " outdir=\"mpcontribs-downloads/my-query\", # change outdir for different queries\n", + " # include=[\"tables\"] # include the tables in the download\n", ")" ] } diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/dtu.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/dtu.ipynb index a2322b1827..c1e375138f 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/dtu.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/dtu.ipynb @@ -19,9 +19,9 @@ "metadata": {}, "outputs": [], "source": [ - "name = 'dtu'\n", + "name = \"dtu\"\n", "client = Client()\n", - "db = 'https://cmr.fysik.dtu.dk/_downloads/mp_gllbsc.db'" + "db = \"https://cmr.fysik.dtu.dk/_downloads/mp_gllbsc.db\"" ] }, { @@ -62,13 +62,13 @@ "outputs": [], "source": [ "dbdir = \"/Users/patrick/gitrepos/mp/MPContribs/mpcontribs-data\"\n", - "dbfile = db.rsplit('/', 1)[-1]\n", + "dbfile = db.rsplit(\"/\", 1)[-1]\n", "dbpath = os.path.join(dbdir, dbfile)\n", "if not os.path.exists(dbpath):\n", - " urlretrieve(db, dbpath) \n", + " urlretrieve(db, dbpath)\n", "\n", "con = connect(dbpath)\n", - "nr_mpids = con.count(selection='mpid')\n", + "nr_mpids = con.count(selection=\"mpid\")\n", "print(nr_mpids)" ] }, @@ -81,23 +81,27 @@ "contributions = []\n", "\n", "with tqdm(total=nr_mpids) as pbar:\n", - " for row in con.select('mpid'):\n", - " contributions.append({\n", - " 'project': name, 'identifier': f'mp-{row.mpid}', 'is_public': True,\n", - " 'data': {\n", - " 'ΔE': {\n", - " 'KS': { # kohn-sham band gap\n", - " 'indirect': f'{row.gllbsc_ind_gap - row.gllbsc_disc} eV',\n", - " 'direct': f'{row.gllbsc_dir_gap - row.gllbsc_disc} eV' \n", + " for row in con.select(\"mpid\"):\n", + " contributions.append(\n", + " {\n", + " \"project\": name,\n", + " \"identifier\": f\"mp-{row.mpid}\",\n", + " \"is_public\": True,\n", + " \"data\": {\n", + " \"ΔE\": {\n", + " \"KS\": { # kohn-sham band gap\n", + " \"indirect\": f\"{row.gllbsc_ind_gap - row.gllbsc_disc} eV\",\n", + " \"direct\": f\"{row.gllbsc_dir_gap - row.gllbsc_disc} eV\",\n", + " },\n", + " \"QP\": { # quasi particle band gap\n", + " \"indirect\": f\"{row.gllbsc_ind_gap} eV\",\n", + " \"direct\": f\"{row.gllbsc_dir_gap} eV\",\n", + " },\n", " },\n", - " 'QP': { # quasi particle band gap\n", - " 'indirect': f'{row.gllbsc_ind_gap} eV',\n", - " 'direct': f'{row.gllbsc_dir_gap} eV' \n", - " }\n", + " \"C\": f\"{row.gllbsc_disc} eV\", # derivative discontinuity\n", " },\n", - " 'C': f'{row.gllbsc_disc} eV' # derivative discontinuity\n", " }\n", - " })\n", + " )\n", " pbar.update(1)" ] }, @@ -139,9 +143,12 @@ " \"_order_by\": \"data__C__value\",\n", " \"order\": \"desc\",\n", " \"_fields\": [\n", - " \"id\", \"identifier\", \"formula\",\n", - " \"data.C.value\", \"data.ΔE.QP.direct.value\"\n", - " ]\n", + " \"id\",\n", + " \"identifier\",\n", + " \"formula\",\n", + " \"data.C.value\",\n", + " \"data.ΔE.QP.direct.value\",\n", + " ],\n", "}\n", "client.contributions.get_entries(**query).result()" ] diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ediffcrystalprediction.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ediffcrystalprediction.ipynb index 9b0ad6bbb8..09c4ce91c7 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ediffcrystalprediction.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ediffcrystalprediction.ipynb @@ -59,10 +59,16 @@ "metadata": {}, "outputs": [], "source": [ - "df_red = pd.DataFrame([[t]+za for t, za in zip(\n", - " df_uniq[\"thickness\"].to_list(),\n", - " df_uniq[\"zone_axes\"].map(convert_zone_axes).to_list()\n", - ")], columns=[\"thickness [nm]\", \"a [Å]\", \"b [Å]\", \"c [Å]\"])" + "df_red = pd.DataFrame(\n", + " [\n", + " [t] + za\n", + " for t, za in zip(\n", + " df_uniq[\"thickness\"].to_list(),\n", + " df_uniq[\"zone_axes\"].map(convert_zone_axes).to_list(),\n", + " )\n", + " ],\n", + " columns=[\"thickness [nm]\", \"a [Å]\", \"b [Å]\", \"c [Å]\"],\n", + ")" ] }, { @@ -85,11 +91,16 @@ "# TODO think of any columns to add in the `data` component\n", "# e.g. direct link to output directory or file/object in OpenData Browser, or\n", "# \"things\" that might be interesting for a general MP user to search across contributions\n", - "contribs = [{\n", - " \"identifier\": \"mp-126\", \"formula\": \"Pt\",\n", - " \"data\": {\"url\": \"https://materialsproject-contribs.s3.amazonaws.com/index.html\"},\n", - " \"tables\": [df_red]\n", - "}]" + "contribs = [\n", + " {\n", + " \"identifier\": \"mp-126\",\n", + " \"formula\": \"Pt\",\n", + " \"data\": {\n", + " \"url\": \"https://materialsproject-contribs.s3.amazonaws.com/index.html\"\n", + " },\n", + " \"tables\": [df_red],\n", + " }\n", + "]" ] }, { diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/esters.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/esters.ipynb index 4328ceba83..b35396ff28 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/esters.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/esters.ipynb @@ -17,7 +17,7 @@ "metadata": {}, "outputs": [], "source": [ - "name = 'esters'\n", + "name = \"esters\"\n", "client = Client()\n", "mpr = MPRester()" ] @@ -36,7 +36,7 @@ "outputs": [], "source": [ "# client.projects.update_entry(pk=name, project={'long_title': 'Improved c-axis parameter for BiSe'}).result()\n", - "client.get_project(name)#.display()" + "client.get_project(name) # .display()" ] }, { @@ -52,13 +52,17 @@ "metadata": {}, "outputs": [], "source": [ - "path = '/Users/patrick/gitrepos/mp/MPContribs/mpcontribs-data/CONTCAR'\n", + "path = \"/Users/patrick/gitrepos/mp/MPContribs/mpcontribs-data/CONTCAR\"\n", "structure = Structure.from_file(path)\n", "mpids = mpr.find_structure(structure)\n", - "contributions = [{\n", - " 'project': name, 'identifier': mpids[0], 'is_public': True,\n", - " 'structures': [structure]\n", - "}]" + "contributions = [\n", + " {\n", + " \"project\": name,\n", + " \"identifier\": mpids[0],\n", + " \"is_public\": True,\n", + " \"structures\": [structure],\n", + " }\n", + "]" ] }, { @@ -91,9 +95,12 @@ "metadata": {}, "outputs": [], "source": [ - "structures = list(client.get_all_ids(\n", - " {\"project\": name}, include=[\"structures\"]\n", - ").get(name, {}).get(\"structures\", {}).get(\"ids\", set()))\n", + "structures = list(\n", + " client.get_all_ids({\"project\": name}, include=[\"structures\"])\n", + " .get(name, {})\n", + " .get(\"structures\", {})\n", + " .get(\"ids\", set())\n", + ")\n", "sid = structures[0]" ] }, diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/experimental_thermo.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/experimental_thermo.ipynb index a02e07d84a..2e92f6d283 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/experimental_thermo.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/experimental_thermo.ipynb @@ -27,7 +27,7 @@ "metadata": {}, "outputs": [], "source": [ - "PROJECT = 'Corrections'" + "PROJECT = \"Corrections\"" ] }, { @@ -69,9 +69,9 @@ "workdir = Path(re.sub(r\"(?<={})[\\w\\W]*\".format(PROJECT), \"\", str(Path.cwd())))\n", "os.chdir(workdir)\n", "\n", - "data_dir = workdir / '2_raw data'\n", - "pipeline_dir = workdir / '3_data analysis' / '2_pipeline'\n", - "output_dir = workdir / '3_data analysis' / '3_output'" + "data_dir = workdir / \"2_raw data\"\n", + "pipeline_dir = workdir / \"3_data analysis\" / \"2_pipeline\"\n", + "output_dir = workdir / \"3_data analysis\" / \"3_output\"" ] }, { @@ -96,8 +96,9 @@ "outputs": [], "source": [ "from mpcontribs.client import Client\n", - "name = 'experimental_thermo' # this should be your project, see from the project URL\n", - "client = Client() # uses MPCONTRIBS_API_KEY envvar" + "\n", + "name = \"experimental_thermo\" # this should be your project, see from the project URL\n", + "client = Client() # uses MPCONTRIBS_API_KEY envvar" ] }, { @@ -107,17 +108,19 @@ "outputs": [], "source": [ "client.projects.update_entry(\n", - " pk=\"experimental_thermo\", project={\"other\": \n", - " {\"ΔHᶠ\": \"Enthalpy of formation from the elements. Polynomial: H° − H°298.15= A*t + B*t^2/2 + C*t^3/3 + D*t^4/4 − E/t + F − H\",\n", - " \"ΔGᶠ\": \"Gibbs free energy of formation from the elements.\",\n", - " \"S\": \"Absolute entropy. Polynomial: S° = A*ln(t) + B*t + C*t^2/2 + D*t^3/3 − E/(2*t^2) + G\",\n", - " \"Cₚ\": \"Specific heat capacity. Polynomial: Cp° = A + B*t + C*t^2 + D*t^3 + E/t^2\",\n", - " \"polynomial\": \"Coefficients for polynomials used to calculate temperature-dependent values of ΔHᶠ, S, or Cₚ.\",\n", - " \"ΔT\": \"Range of temperatures over which polynomial coefficients are valid.\",\n", - " \"composition\": \"String representation of pymatgen Composition of the material.\",\n", - " \"phase\": \"Material phase, e.g. 'gas', 'liquid', 'solid', 'monoclinic', etc.\"\n", - " }\n", - " }\n", + " pk=\"experimental_thermo\",\n", + " project={\n", + " \"other\": {\n", + " \"ΔHᶠ\": \"Enthalpy of formation from the elements. Polynomial: H° − H°298.15= A*t + B*t^2/2 + C*t^3/3 + D*t^4/4 − E/t + F − H\",\n", + " \"ΔGᶠ\": \"Gibbs free energy of formation from the elements.\",\n", + " \"S\": \"Absolute entropy. Polynomial: S° = A*ln(t) + B*t + C*t^2/2 + D*t^3/3 − E/(2*t^2) + G\",\n", + " \"Cₚ\": \"Specific heat capacity. Polynomial: Cp° = A + B*t + C*t^2 + D*t^3 + E/t^2\",\n", + " \"polynomial\": \"Coefficients for polynomials used to calculate temperature-dependent values of ΔHᶠ, S, or Cₚ.\",\n", + " \"ΔT\": \"Range of temperatures over which polynomial coefficients are valid.\",\n", + " \"composition\": \"String representation of pymatgen Composition of the material.\",\n", + " \"phase\": \"Material phase, e.g. 'gas', 'liquid', 'solid', 'monoclinic', etc.\",\n", + " }\n", + " },\n", ").result()" ] }, @@ -128,8 +131,10 @@ "outputs": [], "source": [ "client.projects.update_entry(\n", - " pk=\"experimental_thermo\", project={\"authors\": \"Various authors (see references). Data compiled by the Materials Project team.\"\n", - " }\n", + " pk=\"experimental_thermo\",\n", + " project={\n", + " \"authors\": \"Various authors (see references). Data compiled by the Materials Project team.\"\n", + " },\n", ").result()" ] }, @@ -140,8 +145,7 @@ "outputs": [], "source": [ "client.projects.update_entry(\n", - " pk=\"experimental_thermo\", project={\"title\": \"Thermochemistry Data\"\n", - " }\n", + " pk=\"experimental_thermo\", project={\"title\": \"Thermochemistry Data\"}\n", ").result()" ] }, @@ -152,8 +156,7 @@ "outputs": [], "source": [ "client.projects.update_entry(\n", - " pk=\"experimental_thermo\", project={\"unique_identifiers\": True\n", - " }\n", + " pk=\"experimental_thermo\", project={\"unique_identifiers\": True}\n", ").result()" ] }, @@ -164,9 +167,16 @@ "outputs": [], "source": [ "client.projects.update_entry(\n", - " pk=\"experimental_thermo\", project={\"references\": [\n", - " {\"label\":\"Kubaschewski\", \"url\":\"https://www.worldcat.org/title/materials-thermochemistry/oclc/26724109\"},\n", - " {\"label\":\"NIST\", \"url\":\"https://janaf.nist.gov/\"},]}\n", + " pk=\"experimental_thermo\",\n", + " project={\n", + " \"references\": [\n", + " {\n", + " \"label\": \"Kubaschewski\",\n", + " \"url\": \"https://www.worldcat.org/title/materials-thermochemistry/oclc/26724109\",\n", + " },\n", + " {\"label\": \"NIST\", \"url\": \"https://janaf.nist.gov/\"},\n", + " ]\n", + " },\n", ").result()" ] }, @@ -221,11 +231,9 @@ " {\"path\": \"data.ΔT.G.max\", \"unit\": \"degK\"},\n", " {\"path\": \"data.ΔT.H.max\", \"unit\": \"degK\"},\n", " {\"path\": \"data.method\", \"unit\": \"kJ/mol\"},\n", - " {\"path\": \"data.reference\", \"unit\": \"kJ/mol\"}, \n", + " {\"path\": \"data.reference\", \"unit\": \"kJ/mol\"},\n", "]\n", - "client.projects.update_entry(\n", - " pk=name, project={\"columns\": columns}\n", - ").result()" + "client.projects.update_entry(pk=name, project={\"columns\": columns}).result()" ] }, { @@ -332,7 +340,7 @@ "metadata": {}, "outputs": [], "source": [ - "#all_thermo = []\n", + "# all_thermo = []\n", "with MPRester() as a:\n", " for f in tqdm(ternary_plus):\n", " all_thermo.extend(a.get_exp_thermo_data(f))" @@ -344,7 +352,7 @@ "metadata": {}, "outputs": [], "source": [ - "dumpfn(all_thermo, output_dir / '2020-08-07 all MP Thermo data.json')" + "dumpfn(all_thermo, output_dir / \"2020-08-07 all MP Thermo data.json\")" ] }, { @@ -353,7 +361,7 @@ "metadata": {}, "outputs": [], "source": [ - "all_thermo = loadfn(output_dir / '2020-08-07 all MP Thermo data.json')" + "all_thermo = loadfn(output_dir / \"2020-08-07 all MP Thermo data.json\")" ] }, { @@ -379,6 +387,7 @@ "outputs": [], "source": [ "import pandas as pd\n", + "\n", "mpthermo_df = pd.DataFrame([t.as_dict() for t in all_thermo])" ] }, @@ -389,8 +398,8 @@ "outputs": [], "source": [ "# drop the unneeded columns\n", - "mpthermo_df = mpthermo_df.drop('@module', axis=1)\n", - "mpthermo_df = mpthermo_df.drop('@class', axis=1)" + "mpthermo_df = mpthermo_df.drop(\"@module\", axis=1)\n", + "mpthermo_df = mpthermo_df.drop(\"@class\", axis=1)" ] }, { @@ -451,10 +460,11 @@ "source": [ "from pymatgen import Composition\n", "\n", + "\n", "def create_dict(data):\n", " ret = {}\n", " comp = Composition(data.formula.unique()[0])\n", - " \n", + "\n", " ret[\"project\"] = name\n", " ret[\"is_public\"] = False\n", " ret[\"identifier\"] = comp.reduced_formula\n", @@ -463,14 +473,13 @@ " ret[\"data\"][\"composition\"] = str(comp)\n", " ret[\"data\"][\"phase\"] = data.phaseinfo.unique()[0]\n", " ret[\"data\"][\"reference\"] = data.ref.unique()[0]\n", - " \n", + "\n", " for t in data.type.unique():\n", - " \n", " # set the base dictionary key\n", " if t in [\"A\", \"B\", \"C\", \"D\", \"E\", \"F\", \"G\", \"H\"]:\n", " if not ret[\"data\"].get(\"polynomial\"):\n", " ret[\"data\"][\"polynomial\"] = {}\n", - " \n", + "\n", " if not ret[\"data\"].get(\"ΔT\"):\n", " ret[\"data\"][\"ΔT\"] = {}\n", "\n", @@ -478,50 +487,61 @@ " col = t\n", " unit = \"dimensionless\"\n", " base_dict[col] = {}\n", - " ret[\"data\"][\"ΔT\"][col] = {\"min\": \"{} K\".format(data[data[\"type\"]==t][\"temp_range\"].values[0][0]),\n", - " \"max\": \"{} K\".format(data[data[\"type\"]==t][\"temp_range\"].values[0][1])}\n", - " \n", + " ret[\"data\"][\"ΔT\"][col] = {\n", + " \"min\": \"{} K\".format(\n", + " data[data[\"type\"] == t][\"temp_range\"].values[0][0]\n", + " ),\n", + " \"max\": \"{} K\".format(\n", + " data[data[\"type\"] == t][\"temp_range\"].values[0][1]\n", + " ),\n", + " }\n", + "\n", " else:\n", - " if data[data[\"type\"]==t][\"temp_range\"].values[0] == [298, 298]:\n", + " if data[data[\"type\"] == t][\"temp_range\"].values[0] == [298, 298]:\n", " if not ret[\"data\"].get(\"298K\"):\n", - " ret[\"data\"][\"298K\"]= {}\n", + " ret[\"data\"][\"298K\"] = {}\n", " base_dict = ret[\"data\"][\"298K\"]\n", " else:\n", - " print(\"Type: {}, T: {}\".format(t, data[data[\"type\"]==t][\"temp_range\"].values[0]))\n", - " \n", + " print(\n", + " \"Type: {}, T: {}\".format(\n", + " t, data[data[\"type\"] == t][\"temp_range\"].values[0]\n", + " )\n", + " )\n", + "\n", " if t == \"S\":\n", - " unit = 'kJ/degK/mol'\n", + " unit = \"kJ/degK/mol\"\n", " col = \"S\"\n", - " elif t ==\"fH\":\n", + " elif t == \"fH\":\n", " col = \"ΔHᶠ\"\n", " unit = \"kJ/mol\"\n", " else:\n", " col = t\n", " unit = \"dimensionless\"\n", - " \n", + "\n", " base_dict[col] = {}\n", "\n", " # find value, uncertainty, method, unit\n", - " base_dict[col]= \"{:0.5g} {}\".format(data[data[\"type\"]==t][\"value\"].values[0], unit)\n", - " \n", - " if data[data[\"type\"]==t][\"method\"].values[0] != \"\":\n", + " base_dict[col] = \"{:0.5g} {}\".format(\n", + " data[data[\"type\"] == t][\"value\"].values[0], unit\n", + " )\n", + "\n", + " if data[data[\"type\"] == t][\"method\"].values[0] != \"\":\n", " if not ret[\"data\"].get(\"method\"):\n", " ret[\"data\"][\"method\"] = {}\n", - " ret[\"data\"][\"method\"][col] = data[data[\"type\"]==t][\"method\"].values[0]\n", - " \n", - "# if not np.isnan(data[data[\"type\"]==t][\"uncertainty\"].values[0]):\n", - "# base_dict[col][\"uncertainty\"] = data[data[\"type\"]==t][\"uncertainty\"].values[0]\n", - " \n", - " \n", - " \n", - "# if t in [\"S\", \"fH\"]:\n", - "# base_dict[col][\"units\"] = unit\n", + " ret[\"data\"][\"method\"][col] = data[data[\"type\"] == t][\"method\"].values[0]\n", + "\n", + " # if not np.isnan(data[data[\"type\"]==t][\"uncertainty\"].values[0]):\n", + " # base_dict[col][\"uncertainty\"] = data[data[\"type\"]==t][\"uncertainty\"].values[0]\n", + "\n", + " # if t in [\"S\", \"fH\"]:\n", + " # base_dict[col][\"units\"] = unit\n", "\n", - " \n", " return ret\n", - " \n", "\n", - "new_df = mpthermo_df.groupby([\"formula\",\"compound_name\",\"phaseinfo\",\"ref\"]).apply(create_dict)\n", + "\n", + "new_df = mpthermo_df.groupby([\"formula\", \"compound_name\", \"phaseinfo\", \"ref\"]).apply(\n", + " create_dict\n", + ")\n", "mpthermo_contribs = list(new_df)" ] }, @@ -552,16 +572,16 @@ "from itertools import groupby\n", "\n", "for formula, group in groupby(mpthermo_contribs, key=lambda d: d[\"identifier\"]):\n", - " new_dict ={}\n", + " new_dict = {}\n", " new_dict[\"project\"] = name\n", " new_dict[\"is_public\"] = False\n", " new_dict[\"identifier\"] = formula\n", " new_dict[\"data\"] = {}\n", - " \n", + "\n", " for d in group:\n", " if not new_dict.get(\"composition\"):\n", " new_dict[\"composition\"] = d[\"data\"][\"composition\"]\n", - " \n", + "\n", " del d[\"data\"][\"composition\"]\n", "\n", " phase = d[\"data\"].get(\"phase\", \"n/a\")\n", @@ -582,6 +602,7 @@ "outputs": [], "source": [ "import pprint\n", + "\n", "pprint.pprint(reshaped[0])" ] }, @@ -606,7 +627,10 @@ "outputs": [], "source": [ "import pandas\n", - "janaf_df= pandas.read_csv(data_dir / \"2020-08-10 JANAF data from Ayush/mpcontribs_janaf_thermo.csv\")" + "\n", + "janaf_df = pandas.read_csv(\n", + " data_dir / \"2020-08-10 JANAF data from Ayush/mpcontribs_janaf_thermo.csv\"\n", + ")" ] }, { @@ -632,41 +656,43 @@ "outputs": [], "source": [ "def create_dict(data):\n", - " \n", + "\n", " ret = {}\n", " ret[\"project\"] = name\n", - " ret[\"is_public\"] = False \n", + " ret[\"is_public\"] = False\n", " ret[\"data\"] = {}\n", - " \n", + "\n", " try:\n", " comp = Composition(data.Formula.unique()[0])\n", " ret[\"identifier\"] = comp.reduced_formula\n", " ret[\"data\"][\"composition\"] = str(comp)\n", " except:\n", - " print('problem')\n", + " print(\"problem\")\n", " ret[\"identifier\"] = data.Formula.unique()[0]\n", " ret[\"data\"][\"composition\"] = data.Formula.unique()[0]\n", - " \n", + "\n", " ret[\"data\"][\"compound\"] = data.Name.unique()[0]\n", " ret[\"data\"][\"phase\"] = data.Phase.unique()[0]\n", - " ret[\"data\"][\"reference\"] = data.Link.unique()[0].replace('txt','html')\n", - " \n", - " ret[\"data\"][\"0K\"] = {\"ΔHᶠ\": \"{:0.6g} {}\".format(data[\"DeltaH_0\"].values[0]/1000, \"kJ/mol\"),\n", - " \"ΔGᶠ\": \"{:0.6g} {}\".format(data[\"DeltaG_0\"].values[0]/1000, \"kJ/mol\"),\n", - " \"S\": \"{:0.6g} {}\".format(data[\"S_0\"].values[0], \"J/degK/mol\"),\n", - " \"Cₚ\": \"{:0.6g} {}\".format(data[\"Cp_0\"].values[0], \"J/degK/mol\"),\n", - " }\n", - " \n", - " ret[\"data\"][\"298K\"] = {\"ΔHᶠ\": \"{:0.6g} {}\".format(data[\"DeltaH_298\"].values[0]/1000, \"kJ/mol\"),\n", - " \"ΔGᶠ\": \"{:0.6g} {}\".format(data[\"DeltaG_298\"].values[0]/1000, \"kJ/mol\"),\n", - " \"S\": \"{:0.6g} {}\".format(data[\"S_298\"].values[0], \"J/degK/mol\"),\n", - " \"Cₚ\": \"{:0.6g} {}\".format(data[\"Cp_298\"].values[0], \"J/degK/mol\"),\n", - " }\n", + " ret[\"data\"][\"reference\"] = data.Link.unique()[0].replace(\"txt\", \"html\")\n", + "\n", + " ret[\"data\"][\"0K\"] = {\n", + " \"ΔHᶠ\": \"{:0.6g} {}\".format(data[\"DeltaH_0\"].values[0] / 1000, \"kJ/mol\"),\n", + " \"ΔGᶠ\": \"{:0.6g} {}\".format(data[\"DeltaG_0\"].values[0] / 1000, \"kJ/mol\"),\n", + " \"S\": \"{:0.6g} {}\".format(data[\"S_0\"].values[0], \"J/degK/mol\"),\n", + " \"Cₚ\": \"{:0.6g} {}\".format(data[\"Cp_0\"].values[0], \"J/degK/mol\"),\n", + " }\n", + "\n", + " ret[\"data\"][\"298K\"] = {\n", + " \"ΔHᶠ\": \"{:0.6g} {}\".format(data[\"DeltaH_298\"].values[0] / 1000, \"kJ/mol\"),\n", + " \"ΔGᶠ\": \"{:0.6g} {}\".format(data[\"DeltaG_298\"].values[0] / 1000, \"kJ/mol\"),\n", + " \"S\": \"{:0.6g} {}\".format(data[\"S_298\"].values[0], \"J/degK/mol\"),\n", + " \"Cₚ\": \"{:0.6g} {}\".format(data[\"Cp_298\"].values[0], \"J/degK/mol\"),\n", + " }\n", "\n", " return ret\n", - " \n", "\n", - "new_df = janaf_df.groupby([\"Formula\",\"Name\",\"Phase\"]).apply(create_dict)\n", + "\n", + "new_df = janaf_df.groupby([\"Formula\", \"Name\", \"Phase\"]).apply(create_dict)\n", "janaf_contribs = list(new_df)" ] }, @@ -697,19 +723,18 @@ "from itertools import groupby\n", "\n", "for formula, group in groupby(janaf_contribs, key=lambda d: d[\"identifier\"]):\n", - " new_dict ={}\n", + " new_dict = {}\n", " new_dict[\"project\"] = name\n", " new_dict[\"is_public\"] = False\n", " new_dict[\"identifier\"] = formula\n", " new_dict[\"data\"] = {}\n", - " \n", + "\n", " for d in group:\n", " if not new_dict.get(\"composition\"):\n", " new_dict[\"composition\"] = d[\"data\"][\"composition\"]\n", - " \n", - " \n", + "\n", " del d[\"data\"][\"composition\"]\n", - " \n", + "\n", " phase = d[\"data\"].get(\"phase\", \"n/a\")\n", " if phase == \"\":\n", " phase = \"n/a\"\n", @@ -717,7 +742,7 @@ " new_dict[\"data\"][phase] = d[\"data\"]\n", " if phase != \"n/a\":\n", " del new_dict[\"data\"][phase][\"phase\"]\n", - " \n", + "\n", " reshaped_janaf.append(new_dict)" ] }, @@ -728,6 +753,7 @@ "outputs": [], "source": [ "import pprint\n", + "\n", "pprint.pprint(reshaped_janaf[0])" ] }, @@ -738,6 +764,7 @@ "outputs": [], "source": [ "import pprint\n", + "\n", "pprint.pprint(reshaped[0])" ] }, @@ -756,16 +783,20 @@ "source": [ "all_contribs = reshaped[:]\n", "\n", - "count=0\n", + "count = 0\n", "for d in reshaped_janaf:\n", " # is this identifier already in mp thermo?\n", " if d[\"identifier\"] in [e[\"identifier\"] for e in reshaped]:\n", " # add the new NIST phases\n", " target_entry = [e for e in reshaped if e[\"identifier\"] == d[\"identifier\"]][0]\n", - " for k,v in d[\"data\"].items():\n", + " for k, v in d[\"data\"].items():\n", " if target_entry[\"data\"].get(k):\n", - " print(\"Warning: phase {} already exists for id {} in MP Thermo data! Skipping.\".format(k, d[\"identifier\"]))\n", - " count+=1\n", + " print(\n", + " \"Warning: phase {} already exists for id {} in MP Thermo data! Skipping.\".format(\n", + " k, d[\"identifier\"]\n", + " )\n", + " )\n", + " count += 1\n", " continue\n", " target_entry[\"data\"][k] = v\n", " else:\n", @@ -808,18 +839,19 @@ "metadata": {}, "outputs": [], "source": [ - "replace = {\"#-qtz\":\"βqtz\",\n", - " \"a\": \"α\",\n", - " \"a -cris\":\"αcrys\",\n", - " \"a -qtz\":\"αqtz\",\n", - " \"nit.ba\": \"nitba\",\n", - " \"orth./1\":\"orth\",\n", - " \"ortho\":\"orth\",\n", - " \"r.tet\":\"rtet\",\n", - " \"tet/cu\":\"tetcu\",\n", - " \"n/a\":\"none\",\n", - " \"cr,l\":\"crl\"\n", - " }" + "replace = {\n", + " \"#-qtz\": \"βqtz\",\n", + " \"a\": \"α\",\n", + " \"a -cris\": \"αcrys\",\n", + " \"a -qtz\": \"αqtz\",\n", + " \"nit.ba\": \"nitba\",\n", + " \"orth./1\": \"orth\",\n", + " \"ortho\": \"orth\",\n", + " \"r.tet\": \"rtet\",\n", + " \"tet/cu\": \"tetcu\",\n", + " \"n/a\": \"none\",\n", + " \"cr,l\": \"crl\",\n", + "}" ] }, { @@ -859,20 +891,18 @@ "new_contribs = []\n", "for d in all_contribs:\n", " # unpack each identifier into unique identifiers with formula+phase\n", - " for k,v in d[\"data\"].items():\n", - " new_d={}\n", - " if k == 'composition':\n", + " for k, v in d[\"data\"].items():\n", + " new_d = {}\n", + " if k == \"composition\":\n", " continue\n", - " new_d[\"identifier\"] = str(d[\"identifier\"]+\"-\"+k)\n", + " new_d[\"identifier\"] = str(d[\"identifier\"] + \"-\" + k)\n", " new_d[\"formula\"] = d[\"identifier\"]\n", " new_d[\"is_public\"] = True\n", " new_d[\"project\"] = d[\"project\"]\n", " new_d[\"data\"] = v\n", " new_d[\"data\"][\"phase\"] = k\n", " new_d[\"data\"][\"composition\"] = d[\"data\"][\"composition\"]\n", - " new_contribs.append(new_d)\n", - "\n", - " " + " new_contribs.append(new_d)" ] }, { @@ -926,7 +956,7 @@ "source": [ "for d in new_contribs:\n", " if d[\"data\"].get(\"0K\"):\n", - " if all([\"nan\" in v for k,v in d[\"data\"][\"0K\"].items()]):\n", + " if all([\"nan\" in v for k, v in d[\"data\"][\"0K\"].items()]):\n", " del d[\"data\"][\"0K\"]\n", " print(\"deleted {}\".format(d[\"identifier\"]))" ] @@ -939,7 +969,7 @@ "source": [ "for d in new_contribs:\n", " if d[\"data\"].get(\"298K\"):\n", - " if all([\"nan\" in v for k,v in d[\"data\"][\"298K\"].items()]):\n", + " if all([\"nan\" in v for k, v in d[\"data\"][\"298K\"].items()]):\n", " del d[\"data\"][\"298K\"]\n", " print(\"deleted {}\".format(d[\"identifier\"]))" ] @@ -952,7 +982,7 @@ "source": [ "for d in new_contribs:\n", " if d[\"data\"].get(\"298K\"):\n", - " if all([\"nan\" in v or \"0 \" in v for k,v in d[\"data\"][\"298K\"].items()]):\n", + " if all([\"nan\" in v or \"0 \" in v for k, v in d[\"data\"][\"298K\"].items()]):\n", " del d[\"data\"][\"298K\"]\n", " print(\"deleted {}\".format(d[\"identifier\"]))" ] @@ -965,7 +995,7 @@ "source": [ "for d in new_contribs:\n", " if d[\"data\"].get(\"0K\"):\n", - " if all([\"nan\" in v or \"0 \" in v for k,v in d[\"data\"][\"0K\"].items()]):\n", + " if all([\"nan\" in v or \"0 \" in v for k, v in d[\"data\"][\"0K\"].items()]):\n", " del d[\"data\"][\"0K\"]\n", " print(\"deleted {}\".format(d[\"identifier\"]))" ] @@ -1005,7 +1035,7 @@ "source": [ "# need to delete contributions first due to unique_identifiers=False\n", "client.delete_contributions(name)\n", - "#client.submit_contributions(new_contribs, per_page=10)#, skip_dupe_check=True)" + "# client.submit_contributions(new_contribs, per_page=10)#, skip_dupe_check=True)" ] }, { @@ -1026,9 +1056,10 @@ "def chunks(lst, n):\n", " \"\"\"Yield successive n-sized chunks from lst.\"\"\"\n", " for i in range(0, len(lst), n):\n", - " yield lst[i:i + n]\n", + " yield lst[i : i + n]\n", + "\n", "\n", - "for chunk in tqdm(chunks(new_contribs, 10, total=len(new_contribs)/10)):\n", + "for chunk in tqdm(chunks(new_contribs, 10, total=len(new_contribs) / 10)):\n", " try:\n", " client.contributions.create_entries(contributions=chunk).result()\n", " except:\n", diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/experimental_thermoelectrics.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/experimental_thermoelectrics.ipynb index fc639fd76a..f06b9b04b4 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/experimental_thermoelectrics.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/experimental_thermoelectrics.ipynb @@ -69,7 +69,7 @@ " title=\"Experimental Thermoelectrics\",\n", " authors=\"R. Seshradi\",\n", " description=\"Data-Driven Review of Thermoelectric Materials: Performance and Resource Considerations.\",\n", - " url=\"https://pubs.acs.org/doi/10.1021/cm400893e\"\n", + " url=\"https://pubs.acs.org/doi/10.1021/cm400893e\",\n", " )" ] }, @@ -101,39 +101,124 @@ "outputs": [], "source": [ "columns_map = {\n", - " \"T (K)\": {\"name\": \"temperature\", \"unit\": \"K\", \"description\": \"Temperature in Kelvin\"},\n", - " \"Z*10^-4 reported\": {\"name\": \"Z\", \"unit\": \"\", \"description\": \"reported Z\", \"scale\": 1e4},\n", - " \"Resist. (Ohm.cm)\": {\"name\": \"resistivity.RT\", \"unit\": \"Ω·cm\", \"description\": \"Resistivity at room temperature in Ωcm\"},\n", - " \"Resist. (400K)\": {\"name\": \"resistivity.400K\", \"unit\": \"Ω·cm\", \"description\": \"Resistivity at 400K in Ωcm\"},\n", - " \"Seebeck (uV/K)\": {\"name\": \"seebeck.RT\", \"unit\": \"µV/K\", \"description\": \"Seebeck coefficient at room temperature in µV/K\"},\n", - " \"Seebeck (400K)\": {\"name\": \"seebeck.400K\", \"unit\": \"µV/K\", \"description\": \"Seebeck coefficient at 400K in µV/K\"},\n", + " \"T (K)\": {\n", + " \"name\": \"temperature\",\n", + " \"unit\": \"K\",\n", + " \"description\": \"Temperature in Kelvin\",\n", + " },\n", + " \"Z*10^-4 reported\": {\n", + " \"name\": \"Z\",\n", + " \"unit\": \"\",\n", + " \"description\": \"reported Z\",\n", + " \"scale\": 1e4,\n", + " },\n", + " \"Resist. (Ohm.cm)\": {\n", + " \"name\": \"resistivity.RT\",\n", + " \"unit\": \"Ω·cm\",\n", + " \"description\": \"Resistivity at room temperature in Ωcm\",\n", + " },\n", + " \"Resist. (400K)\": {\n", + " \"name\": \"resistivity.400K\",\n", + " \"unit\": \"Ω·cm\",\n", + " \"description\": \"Resistivity at 400K in Ωcm\",\n", + " },\n", + " \"Seebeck (uV/K)\": {\n", + " \"name\": \"seebeck.RT\",\n", + " \"unit\": \"µV/K\",\n", + " \"description\": \"Seebeck coefficient at room temperature in µV/K\",\n", + " },\n", + " \"Seebeck (400K)\": {\n", + " \"name\": \"seebeck.400K\",\n", + " \"unit\": \"µV/K\",\n", + " \"description\": \"Seebeck coefficient at 400K in µV/K\",\n", + " },\n", " \"kappa (W/mK)\": {\"name\": \"kappa.mean\", \"unit\": \"W/mK\", \"description\": \"TODO\"},\n", " \"kappaZT\": {\"name\": \"kappa.ZT\", \"unit\": \"\", \"description\": \"TODO\"},\n", - " \"Pf (W/K^2/m)\": {\"name\": \"Pf\", \"unit\": \"W/K²/m\", \"description\": \"Power Factor in W/K²/m\"},\n", - " \"Power Factor*T (W/mK)\": {\"name\": \"PfT\", \"unit\": \"W/K/m\", \"description\": \"Power Factor times Temperature in W/K/m\"},\n", + " \"Pf (W/K^2/m)\": {\n", + " \"name\": \"Pf\",\n", + " \"unit\": \"W/K²/m\",\n", + " \"description\": \"Power Factor in W/K²/m\",\n", + " },\n", + " \"Power Factor*T (W/mK)\": {\n", + " \"name\": \"PfT\",\n", + " \"unit\": \"W/K/m\",\n", + " \"description\": \"Power Factor times Temperature in W/K/m\",\n", + " },\n", " \"ZT\": {\"name\": \"ZT\", \"unit\": \"\", \"description\": \"ZT\"},\n", " \"x\": {\"name\": \"x\", \"unit\": \"\", \"description\": \"TODO\"},\n", " \"series\": {\"name\": \"series\", \"unit\": None, \"description\": \"TODO\"},\n", " \"T Max\": {\"name\": \"Tmax\", \"unit\": \"K\", \"description\": \"TODO\"},\n", " \"family\": {\"name\": \"family\", \"unit\": None, \"description\": \"TODO\"},\n", - " \"Conduct. (S/cm)\": {\"name\": \"conductivity\", \"unit\": \"S/cm\", \"description\": \"Conductivity in S/cm\"},\n", + " \"Conduct. (S/cm)\": {\n", + " \"name\": \"conductivity\",\n", + " \"unit\": \"S/cm\",\n", + " \"description\": \"Conductivity in S/cm\",\n", + " },\n", " \"S^2\": {\"name\": \"S2\", \"unit\": \"\", \"description\": \"S²\"},\n", " \"ke/ktotal\": {\"name\": \"ke|rel\", \"unit\": \"\", \"description\": \"ke/ktotal\"},\n", " \"space group\": {\"name\": \"spacegroup\", \"unit\": \"\", \"description\": \"space group\"},\n", - " \"# symmetry elements\": {\"name\": \"nsymelems\", \"unit\": \"\", \"description\": \"number of symmetry elements\"},\n", - " \"preparative route\": {\"name\": \"route\", \"unit\": None, \"description\": \"Preparative Route\"},\n", + " \"# symmetry elements\": {\n", + " \"name\": \"nsymelems\",\n", + " \"unit\": \"\",\n", + " \"description\": \"number of symmetry elements\",\n", + " },\n", + " \"preparative route\": {\n", + " \"name\": \"route\",\n", + " \"unit\": None,\n", + " \"description\": \"Preparative Route\",\n", + " },\n", " \"final form\": {\"name\": \"final\", \"unit\": None, \"description\": \"Final Form\"},\n", " \"Authors\": {\"name\": \"authors.main\", \"unit\": None, \"description\": \"Authors\"},\n", - " \"Author of Unit Cell\": {\"name\": \"authors.cell\", \"unit\": None, \"description\": \"Author of Unit Cell\"},\n", - " \"DOI\": {\"name\": \"dois.main\", \"unit\": None, \"description\": \"Digital Object Identifier (DOI)\"},\n", - " \"Unit Cell DOI\": {\"name\": \"dois.cell\", \"unit\": None, \"description\": \"Unit Cell DOI\"},\n", - " \"ICSD of structure\": {\"name\": \"icsd.number\", \"unit\": \"\", \"description\": \"ICSD of structure\"},\n", - " \"temp of ICSD (K)\": {\"name\": \"icsd.temperature\", \"unit\": \"K\", \"description\": \"temp of ICSD (K)\"},\n", - " \"Cell Volume (A^3)\": {\"name\": \"volume.cell\", \"unit\": \"ų\", \"description\": \"Cell Volume in ų\"},\n", - " \"average atomic volume\": {\"name\": \"volume.atomic\", \"unit\": \"\", \"description\": \"average atomic volume\"},\n", - " \"Formula Units per Cell\": {\"name\": \"units\", \"unit\": \"\", \"description\": \"Formula Units per Cell\"},\n", - " \"Atoms per formula unit\": {\"name\": \"natoms.formunit\", \"unit\": \"\", \"description\": \"Atoms per formula unit\"},\n", - " \"total atoms per unit cell\": {\"name\": \"natoms.total\", \"unit\": \"\", \"description\": \"total atoms per unit cell\"}\n", + " \"Author of Unit Cell\": {\n", + " \"name\": \"authors.cell\",\n", + " \"unit\": None,\n", + " \"description\": \"Author of Unit Cell\",\n", + " },\n", + " \"DOI\": {\n", + " \"name\": \"dois.main\",\n", + " \"unit\": None,\n", + " \"description\": \"Digital Object Identifier (DOI)\",\n", + " },\n", + " \"Unit Cell DOI\": {\n", + " \"name\": \"dois.cell\",\n", + " \"unit\": None,\n", + " \"description\": \"Unit Cell DOI\",\n", + " },\n", + " \"ICSD of structure\": {\n", + " \"name\": \"icsd.number\",\n", + " \"unit\": \"\",\n", + " \"description\": \"ICSD of structure\",\n", + " },\n", + " \"temp of ICSD (K)\": {\n", + " \"name\": \"icsd.temperature\",\n", + " \"unit\": \"K\",\n", + " \"description\": \"temp of ICSD (K)\",\n", + " },\n", + " \"Cell Volume (A^3)\": {\n", + " \"name\": \"volume.cell\",\n", + " \"unit\": \"ų\",\n", + " \"description\": \"Cell Volume in ų\",\n", + " },\n", + " \"average atomic volume\": {\n", + " \"name\": \"volume.atomic\",\n", + " \"unit\": \"\",\n", + " \"description\": \"average atomic volume\",\n", + " },\n", + " \"Formula Units per Cell\": {\n", + " \"name\": \"units\",\n", + " \"unit\": \"\",\n", + " \"description\": \"Formula Units per Cell\",\n", + " },\n", + " \"Atoms per formula unit\": {\n", + " \"name\": \"natoms.formunit\",\n", + " \"unit\": \"\",\n", + " \"description\": \"Atoms per formula unit\",\n", + " },\n", + " \"total atoms per unit cell\": {\n", + " \"name\": \"natoms.total\",\n", + " \"unit\": \"\",\n", + " \"description\": \"total atoms per unit cell\",\n", + " },\n", "}\n", "skip = (\"Unnamed:\", \"Comments\")\n", "# for col in df.columns:\n", @@ -151,14 +236,15 @@ "outputs": [], "source": [ "import csv\n", + "\n", "field_names = [\"column\", \"name\", \"unit\", \"scale\", \"description\"]\n", "csvlines = []\n", "for k, v in columns_map.items():\n", " line = {\"column\": k}\n", " line.update(v)\n", " csvlines.append(line)\n", - " \n", - "with open(f'{name}_columns.csv', 'w') as csvfile:\n", + "\n", + "with open(f\"{name}_columns.csv\", \"w\") as csvfile:\n", " writer = csv.DictWriter(csvfile, fieldnames=field_names)\n", " writer.writeheader()\n", " writer.writerows(csvlines)" @@ -171,9 +257,9 @@ "metadata": {}, "outputs": [], "source": [ - "other = unflatten({\n", - " col[\"name\"]: col[\"description\"] for col in columns_map.values()\n", - "}, splitter=\"dot\")\n", + "other = unflatten(\n", + " {col[\"name\"]: col[\"description\"] for col in columns_map.values()}, splitter=\"dot\"\n", + ")\n", "client.update_project({\"other\": other})" ] }, @@ -237,7 +323,7 @@ " formula = record.pop(\"Formula\")\n", " if not isinstance(formula, str) and isnan(formula):\n", " continue\n", - " \n", + "\n", " clean = {}\n", " for k, v in record.items():\n", " if k.startswith(skip) or k not in columns_map:\n", @@ -246,14 +332,14 @@ " # remove NaNs (tip: skip any unset/empty keys)\n", " if not isinstance(v, str) and isnan(v):\n", " continue\n", - " # convert boolean values to Yes/No, and append units \n", + " # convert boolean values to Yes/No, and append units\n", " key = columns_map[k][\"name\"]\n", " unit = columns_map[k].get(\"unit\")\n", " scale = columns_map[k].get(\"scale\")\n", " val = v\n", " if scale is not None and isinstance(scale, (float, int)):\n", " val *= scale\n", - " \n", + "\n", " if isinstance(v, bool):\n", " val = \"Yes\" if v else \"No\"\n", " elif isinstance(v, int) and not unit:\n", @@ -266,7 +352,7 @@ " icsd = clean.get(\"icsd.number\")\n", " if not icsd:\n", " continue\n", - " \n", + "\n", " identifier = icsd_lookup.get(icsd)\n", " if not identifier:\n", " continue\n", @@ -288,7 +374,7 @@ "client.delete_contributions() # remove all contributions from project\n", "client.init_columns(columns)\n", "client.submit_contributions(contributions)\n", - "client.init_columns(columns) # shouldn't be needed but ensures all columns appear\n", + "client.init_columns(columns) # shouldn't be needed but ensures all columns appear\n", "# client.make_public()" ] }, diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ferroelectrics.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ferroelectrics.ipynb index 458b629c00..d8dada5c99 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ferroelectrics.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ferroelectrics.ipynb @@ -64,7 +64,7 @@ "\n", "with distortions_file.open() as f:\n", " distortions = json.load(f)\n", - " \n", + "\n", "with workflow_data_file.open() as f:\n", " workflow_data = json.load(f)" ] @@ -82,30 +82,47 @@ " \"bilbao_nonpolar_spacegroup\": {\"name\": \"bilbao.spacegroup.nonpolar\", \"unit\": \"\"},\n", " \"bilbao_polar_spacegroup\": {\"name\": \"bilbao.spacegroup.polar\", \"unit\": \"\"},\n", " \"polarization_change_norm\": {\"name\": \"polarization.norm\", \"unit\": \"µC/cm²\"},\n", - " \"polarization_change\": {\"name\": \"polarization.vector\", \"unit\": \"µC/cm²\", \"fields\": [\"a\", \"b\", \"c\"]},\n", - " \"polarization_quanta\": {\"name\":\"polarization.quanta\", \"unit\":\"µC/cm²\", \"fields\": [\"a\", \"b\", \"c\"]},\n", - " \"energies\": {\"name\":\"energy|diff\", \"unit\":\"eV\"},\n", + " \"polarization_change\": {\n", + " \"name\": \"polarization.vector\",\n", + " \"unit\": \"µC/cm²\",\n", + " \"fields\": [\"a\", \"b\", \"c\"],\n", + " },\n", + " \"polarization_quanta\": {\n", + " \"name\": \"polarization.quanta\",\n", + " \"unit\": \"µC/cm²\",\n", + " \"fields\": [\"a\", \"b\", \"c\"],\n", + " },\n", + " \"energies\": {\"name\": \"energy|diff\", \"unit\": \"eV\"},\n", " \"search_id\": {\"name\": \"workflow.id|search\", \"unit\": \"\"},\n", - " \"workflow_status\": {\"name\": \"workflow.status\",\"unit\":None},\n", - " \"category\": {\"name\": \"workflow.category\", \"unit\": None}, # dynamic\n", + " \"workflow_status\": {\"name\": \"workflow.status\", \"unit\": None},\n", + " \"category\": {\"name\": \"workflow.category\", \"unit\": None}, # dynamic\n", " \"distortion.dmax\": {\"name\": \"distortion.dmax.before\", \"unit\": \"Å\"},\n", " \"calculated_max_distance\": {\"name\": \"distortion.dmax.after\", \"unit\": \"Å\"},\n", - "# \"distortion.delta\": {\"name\": \"distortion.delta\", \"unit\": \"\"},\n", - "# \"distortion.dav\": {\"name\": \"distortion.dav\", \"unit\": \"\"},\n", - "# \"distortion.s\": {\"name\": \"distortion.s\", \"unit\": \"\"},\n", + " # \"distortion.delta\": {\"name\": \"distortion.delta\", \"unit\": \"\"},\n", + " # \"distortion.dav\": {\"name\": \"distortion.dav\", \"unit\": \"\"},\n", + " # \"distortion.s\": {\"name\": \"distortion.s\", \"unit\": \"\"},\n", " \"bandgaps\": {\"name\": \"bandgap\", \"unit\": \"eV\"},\n", - "# \"nonpolar_band_gap\": {\"name\": \"nonpolar.bandgap\", \"unit\": \"eV\"},\n", + " # \"nonpolar_band_gap\": {\"name\": \"nonpolar.bandgap\", \"unit\": \"eV\"},\n", " \"nonpolar_icsd\": {\"name\": \"nonpolar.icsd\", \"unit\": \"\"},\n", " \"nonpolar_id\": {\"name\": \"nonpolar.mpid\", \"unit\": None},\n", " \"nonpolar_spacegroup\": {\"name\": \"nonpolar.spacegroup\", \"unit\": \"\"},\n", - "# \"polar_band_gap\": {\"name\": \"polar.bandgap\", \"unit\": \"eV\"},\n", + " # \"polar_band_gap\": {\"name\": \"polar.bandgap\", \"unit\": \"eV\"},\n", " \"polar_icsd\": {\"name\": \"polar.icsd\", \"unit\": \"\"},\n", " \"polar_id\": {\"name\": \"polar.mpid\", \"unit\": None},\n", - " \"polar_spacegroup\": {\"name\": \"polar.spacegroup\", \"unit\": \"\"}, \n", - " \"energies_per_atom_max_spline_jumps\": {\"name\": \"energies.jumps|max\", \"unit\": \"eV/atom\"},\n", + " \"polar_spacegroup\": {\"name\": \"polar.spacegroup\", \"unit\": \"\"},\n", + " \"energies_per_atom_max_spline_jumps\": {\n", + " \"name\": \"energies.jumps|max\",\n", + " \"unit\": \"eV/atom\",\n", + " },\n", " \"energies_per_atom_smoothness\": {\"name\": \"energies.smoothness\", \"unit\": \"eV/atom\"},\n", - " \"polarization_max_spline_jumps\": {\"name\": \"polarizations.jumps\", \"fields\": {\"max\": \"µC/cm²\", \"index\": \"\"}},\n", - " \"polarization_smoothness\": {\"name\": \"polarizations.smoothness\", \"fields\": {\"max\": \"µC/cm²\", \"index\": \"\"}},\n", + " \"polarization_max_spline_jumps\": {\n", + " \"name\": \"polarizations.jumps\",\n", + " \"fields\": {\"max\": \"µC/cm²\", \"index\": \"\"},\n", + " },\n", + " \"polarization_smoothness\": {\n", + " \"name\": \"polarizations.smoothness\",\n", + " \"fields\": {\"max\": \"µC/cm²\", \"index\": \"\"},\n", + " },\n", "}" ] }, @@ -117,27 +134,36 @@ "outputs": [], "source": [ "def get_category(wf):\n", - " if (wf['polarization_len'] == 10 and\n", - " 'polarization_max_spline_jumps' in wf and\n", - " np.all(np.array(wf['polarization_max_spline_jumps']) <= 1) and\n", - " wf['energies_per_atom_max_spline_jumps'] <= 1e-2):\n", + " if (\n", + " wf[\"polarization_len\"] == 10\n", + " and \"polarization_max_spline_jumps\" in wf\n", + " and np.all(np.array(wf[\"polarization_max_spline_jumps\"]) <= 1)\n", + " and wf[\"energies_per_atom_max_spline_jumps\"] <= 1e-2\n", + " ):\n", " return \"smooth\"\n", - " \n", - " elif (wf['polarization_len'] == 10 and\n", - " 'polarization_change_norm' in wf and\n", - " 'polarization_max_spline_jumps' in wf and\n", - " (wf['energies_per_atom_max_spline_jumps'] > 1e-2 or\n", - " np.any(np.array(wf['polarization_max_spline_jumps']) > 1))):\n", + "\n", + " elif (\n", + " wf[\"polarization_len\"] == 10\n", + " and \"polarization_change_norm\" in wf\n", + " and \"polarization_max_spline_jumps\" in wf\n", + " and (\n", + " wf[\"energies_per_atom_max_spline_jumps\"] > 1e-2\n", + " or np.any(np.array(wf[\"polarization_max_spline_jumps\"]) > 1)\n", + " )\n", + " ):\n", " return \"unsmooth\"\n", - " \n", - " elif (wf['static_len'] == 10 and\n", - " 'polarization_change_norm' not in wf and\n", - " wf['workflow_status'] in (\"COMPLETED\",\"DEFUSED\")):\n", + "\n", + " elif (\n", + " wf[\"static_len\"] == 10\n", + " and \"polarization_change_norm\" not in wf\n", + " and wf[\"workflow_status\"] in (\"COMPLETED\", \"DEFUSED\")\n", + " ):\n", " return \"static\"\n", - " \n", - " elif ((wf['polarization_len'] < 10 or 'polarization_change_norm' not in wf) and\n", - " ((wf['workflow_status'] == \"DEFUSED\" and wf['static_len'] < 10) or\n", - " wf['workflow_status'] in (\"FIZZLED\",\"RUNNING\"))):\n", + "\n", + " elif (wf[\"polarization_len\"] < 10 or \"polarization_change_norm\" not in wf) and (\n", + " (wf[\"workflow_status\"] == \"DEFUSED\" and wf[\"static_len\"] < 10)\n", + " or wf[\"workflow_status\"] in (\"FIZZLED\", \"RUNNING\")\n", + " ):\n", " return \"incomplete\"" ] }, @@ -155,22 +181,24 @@ "for distortion in distortions:\n", " k1, k2 = distortion[\"nonpolar_id\"], distortion[\"polar_id\"]\n", " key = f\"{k1}_{k2}\"\n", - " contribs_distortions[key] = {\"data\": {}}#, \"structures\": [], \"attachments\": []}\n", - " \n", + " contribs_distortions[key] = {\"data\": {}} # , \"structures\": [], \"attachments\": []}\n", + "\n", " for k, v in flatten(distortion, reducer=\"dot\", max_flatten_depth=2).items():\n", " if k.endswith(\"_pre\") or k.startswith(\"_id\"):\n", - " continue \n", + " continue\n", " elif not isinstance(v, (dict, list)):\n", " conf = columns.get(k)\n", " if conf:\n", " name, unit = conf[\"name\"], conf[\"unit\"]\n", - " dec = conf.get('dec', '')\n", - " contribs_distortions[key][\"data\"][name] = f\"{float(v):{dec}} {unit}\" if unit else v\n", + " dec = conf.get(\"dec\", \"\")\n", + " contribs_distortions[key][\"data\"][name] = (\n", + " f\"{float(v):{dec}} {unit}\" if unit else v\n", + " )\n", "# elif isinstance(v, dict) and \"@class\" in v and v[\"@class\"] == \"Structure\":\n", "# structure = Structure.from_dict(v)\n", "# structure.name = k\n", "# contribs_distortions[key][\"structures\"].append(structure)\n", - " \n", + "\n", "# attm = Attachment.from_data(\"distortion\", distortion)\n", "# contribs_distortions[key][\"attachments\"].append(attm)" ] @@ -201,49 +229,53 @@ "\n", "for wf in workflow_data:\n", " k1, k2 = wf[\"nonpolar_id\"], wf[\"polar_id\"]\n", - " key = f\"{k1}_{k2}\" # NOTE could also use search_id for this\n", + " key = f\"{k1}_{k2}\" # NOTE could also use search_id for this\n", " distortion = contribs_distortions[key]\n", " contrib = {\n", - " \"identifier\": wf[\"wfid\"], \"formula\": wf[\"pretty_formula\"],\n", + " \"identifier\": wf[\"wfid\"],\n", + " \"formula\": wf[\"pretty_formula\"],\n", " \"data\": contribs_distortions[key][\"data\"],\n", - "# \"structures\": contribs_distortions[key][\"structures\"],\n", - "# \"attachments\": contribs_distortions[key][\"attachments\"]\n", + " # \"structures\": contribs_distortions[key][\"structures\"],\n", + " # \"attachments\": contribs_distortions[key][\"attachments\"]\n", " }\n", - " contrib['data']['workflow.category'] = get_category(wf)\n", + " contrib[\"data\"][\"workflow.category\"] = get_category(wf)\n", " if ids and wf[\"wfid\"] in ids:\n", " contrib[\"id\"] = ids[wf[\"wfid\"]]\n", - " \n", - "# for k in structure_keys:\n", - "# if k in wf:\n", - "# structure = Structure.from_dict(wf[k])\n", - "# structure.name = k\n", - "# contrib[\"structures\"].append(structure)\n", - " \n", + "\n", + " # for k in structure_keys:\n", + " # if k in wf:\n", + " # structure = Structure.from_dict(wf[k])\n", + " # structure.name = k\n", + " # contrib[\"structures\"].append(structure)\n", + "\n", " for k, v in flatten(wf, reducer=\"dot\").items():\n", " conf = columns.get(k)\n", - " if conf and k.startswith('polarization') and isinstance(v, list):\n", + " if conf and k.startswith(\"polarization\") and isinstance(v, list):\n", " name, fields = conf[\"name\"], conf[\"fields\"]\n", " contrib[\"data\"].setdefault(name, {})\n", " if not \"unit\" in conf:\n", " vmax, unit = max(v), fields[\"max\"]\n", - " contrib[\"data\"][name]['max'] = f\"{round(vmax, 3)} {unit}\" if unit else v\n", - " contrib[\"data\"][name]['index'] = v.index(vmax)\n", + " contrib[\"data\"][name][\"max\"] = f\"{round(vmax, 3)} {unit}\" if unit else v\n", + " contrib[\"data\"][name][\"index\"] = v.index(vmax)\n", " else:\n", " unit = conf[\"unit\"]\n", " contrib[\"data\"][name] = {\n", - " i: f\"{j} {unit}\"\n", - " for i, j in zip(conf[\"fields\"], v[0])\n", + " i: f\"{j} {unit}\" for i, j in zip(conf[\"fields\"], v[0])\n", " }\n", - " elif conf and k == 'energies_per_atom':\n", + " elif conf and k == \"energies_per_atom\":\n", " name, unit = conf[\"name\"], conf[\"unit\"]\n", " ediff = v[0] - v[-1]\n", - " contrib[\"data\"][name] = f\"{ediff:.3g} {unit}\" \n", - " elif conf and k == 'bandgaps':\n", + " contrib[\"data\"][name] = f\"{ediff:.3g} {unit}\"\n", + " elif conf and k == \"bandgaps\":\n", " name, unit = conf[\"name\"], conf[\"unit\"]\n", " contrib[\"data\"].setdefault(name, {})\n", " contrib[\"data\"][name][\"nonpolar\"] = f\"{v[0]:.3g} {unit}\"\n", " contrib[\"data\"][name][\"polar\"] = f\"{v[-1]:.3g} {unit}\"\n", - " elif k.startswith((\"_id\", \"cid\")) or isinstance(v, list) or k.startswith(structure_keys):\n", + " elif (\n", + " k.startswith((\"_id\", \"cid\"))\n", + " or isinstance(v, list)\n", + " or k.startswith(structure_keys)\n", + " ):\n", " continue\n", " elif conf:\n", " name, unit = conf[\"name\"], conf[\"unit\"]\n", @@ -251,12 +283,12 @@ " contrib[\"data\"][name] = f\"{v:.1g} {unit}\" if unit else v\n", " else:\n", " contrib[\"data\"][name] = f\"{v:.3g} {unit}\" if unit else v\n", - " \n", - "# attm = Attachment.from_data(\"workflow\", wf)\n", - "# contrib[\"attachments\"].append(attm)\n", + "\n", + " # attm = Attachment.from_data(\"workflow\", wf)\n", + " # contrib[\"attachments\"].append(attm)\n", " contrib[\"data\"] = unflatten(contrib[\"data\"], splitter=\"dot\")\n", " contributions.append(contrib)\n", - " \n", + "\n", "len(contributions)" ] }, @@ -293,7 +325,7 @@ "metadata": {}, "outputs": [], "source": [ - "#client.delete_contributions()\n", + "# client.delete_contributions()\n", "client.init_columns({})\n", "client.init_columns(columns_map)" ] diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/gbdb.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/gbdb.ipynb index 315384b0ea..809d45d359 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/gbdb.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/gbdb.ipynb @@ -24,7 +24,7 @@ "metadata": {}, "outputs": [], "source": [ - "client = Client(project=\"gbdb\") # set your API key via the `apikey` keyword argument" + "client = Client(project=\"gbdb\") # set your API key via the `apikey` keyword argument" ] }, { @@ -53,7 +53,7 @@ " \"repetitions\": \"number of repetitions of the base structure in x/y direction\",\n", " \"temperature\": \"temperature of MD simulation in Kelvin\",\n", " \"steps\": \"number of steps of MD simulation\",\n", - " \"potential\": \"classical potential used\"\n", + " \"potential\": \"classical potential used\",\n", "}\n", "client.update_project({\"other\": other})" ] @@ -75,8 +75,8 @@ "source": [ "# initialize columns\n", "columns = {\n", - " \"element\": None, # string\n", - " \"indices.h\": \"\", # dimensionless\n", + " \"element\": None, # string\n", + " \"indices.h\": \"\", # dimensionless\n", " \"indices.k\": \"\",\n", " \"indices.l\": \"\",\n", " \"boundary\": None,\n", @@ -88,7 +88,7 @@ " \"repetitions.y\": \"\",\n", " \"temperature\": \"K\",\n", " \"steps\": \"\",\n", - " \"potential\": None\n", + " \"potential\": None,\n", "}\n", "client.init_columns(columns)" ] @@ -107,7 +107,7 @@ " spec = [elem for i in range(dump.natoms)]\n", " df = dump.data.copy()\n", " df.drop(df.tail(1).index, inplace=True)\n", - " pos = df[['x', 'y', 'z']].to_numpy()\n", + " pos = df[[\"x\", \"y\", \"z\"]].to_numpy()\n", " return Structure(lattice=lat, species=spec, coords=pos, coords_are_cartesian=True)" ] }, @@ -120,14 +120,16 @@ "source": [ "# prep contributions\n", "contributions = []\n", - "indir = Path(\"/Users/patrick/GoogleDriveLBNL/My Drive/MaterialsProject/gitrepos/mpcontribs-data/gbdb\")\n", + "indir = Path(\n", + " \"/Users/patrick/GoogleDriveLBNL/My Drive/MaterialsProject/gitrepos/mpcontribs-data/gbdb\"\n", + ")\n", "keys = list(k for k in columns.keys() if not k.startswith(\"indices\"))\n", "keys.insert(1, \"indices\")\n", "\n", "for path in indir.glob(\"lammps_*\"):\n", " identifier = hashlib.md5(path.name.encode(\"utf-8\")).hexdigest()\n", " contrib = {\"identifier\": identifier, \"data\": {}}\n", - " \n", + "\n", " for idx, part in enumerate(path.name.split(\"_\")[1:]):\n", " if idx == 1:\n", " contrib[\"data\"][\"indices\"] = {k: int(v) for k, v in zip(\"hkl\", part)}\n", @@ -135,7 +137,7 @@ " key = keys[idx]\n", " unit = columns[key]\n", " contrib[\"data\"][key] = f\"{part} {unit}\" if unit else part\n", - " \n", + "\n", " contrib[\"data\"] = unflatten(contrib[\"data\"], splitter=\"dot\")\n", " structure = get_structure(contrib[\"data\"][\"element\"], path)\n", " contrib[\"formula\"] = structure.composition.reduced_formula\n", @@ -168,7 +170,9 @@ "source": [ "# submit contributions\n", "client.submit_contributions(contributions)\n", - "client.init_columns(columns) # this should not be needed but doesn't hurt, possible API bug" + "client.init_columns(\n", + " columns\n", + ") # this should not be needed but doesn't hurt, possible API bug" ] }, { @@ -186,7 +190,7 @@ "metadata": {}, "outputs": [], "source": [ - "#client._reinit() # only needed if data just uploaded\n", + "# client._reinit() # only needed if data just uploaded\n", "ncontribs, _ = client.get_totals()\n", "ncontribs" ] @@ -211,10 +215,12 @@ "source": [ "query = {\"data__boundary__exact\": \"tilt\", \"data__n__value__gt\": 0}\n", "count, _ = client.get_totals(query=query)\n", - "print(f\"grain boundaries of type tilt and n>0: {count/ncontribs*100:.1f}%\")\n", + "print(f\"grain boundaries of type tilt and n>0: {count / ncontribs * 100:.1f}%\")\n", "fields = [\"identifier\", \"formula\", \"data.energy.value\", \"data.potential\"]\n", "sort = \"data.energy.value\"\n", - "contribs = client.query_contributions(query=query, fields=fields, sort=sort, paginate=True)\n", + "contribs = client.query_contributions(\n", + " query=query, fields=fields, sort=sort, paginate=True\n", + ")\n", "pd.json_normalize(contribs[\"data\"])" ] } diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/get_started.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/get_started.ipynb index 049498fcd0..b35a15ce45 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/get_started.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/get_started.ipynb @@ -60,7 +60,7 @@ "outputs": [], "source": [ "db = DB.Database(\"refractive.db\")\n", - "#db.create_database_from_url()" + "# db.create_database_from_url()" ] }, { @@ -149,11 +149,11 @@ " formula = info[\"book\"]\n", " mpid = mpr.get_materials_ids(formula)[0]\n", "\n", - " rmin, rmax = info['rangeMin']*1000, info['rangeMax']*1000\n", + " rmin, rmax = info[\"rangeMin\"] * 1000, info[\"rangeMax\"] * 1000\n", " mid = (rmin + rmax) / 2\n", " n = mat.get_refractiveindex(mid)\n", " k = mat.get_extinctioncoefficient(mid)\n", - " \n", + "\n", " x = \"wavelength λ [μm]\"\n", " refrac = DataFrame(mat.get_complete_refractive(), columns=[x, \"n\"])\n", " refrac.set_index(x, inplace=True)\n", @@ -164,9 +164,9 @@ " df.attrs[\"title\"] = f\"Complex refractive index (n+ik) for {formula}\"\n", " df.attrs[\"labels\"] = {\n", " \"value\": \"n, k\", # y-axis label\n", - " \"variable\": \"Re/Im\" # legend name (= df.columns.name)\n", + " \"variable\": \"Re/Im\", # legend name (= df.columns.name)\n", " }\n", - " df.plot(**df.attrs)#.show()\n", + " df.plot(**df.attrs) # .show()\n", " df.attrs[\"name\"] = \"n,k(λ)\"\n", " return {\n", " \"project\": name,\n", @@ -178,9 +178,9 @@ " \"range.mid\": f\"{mid} nm\",\n", " \"range.max\": f\"{rmax} nm\",\n", " \"points\": info[\"points\"],\n", - " \"page\": info[\"page\"]\n", + " \"page\": info[\"page\"],\n", " },\n", - " \"tables\": [df]\n", + " \"tables\": [df],\n", " }" ] }, @@ -208,10 +208,7 @@ "metadata": {}, "outputs": [], "source": [ - "client = Client(\n", - " host=\"workshop-contribs-api.materialsproject.org\",\n", - " apikey=apikey\n", - ")" + "client = Client(host=\"workshop-contribs-api.materialsproject.org\", apikey=apikey)" ] }, { @@ -230,18 +227,21 @@ "outputs": [], "source": [ "update = {\n", - " 'unique_identifiers': False,\n", - " 'references': [\n", - " {'label': 'website', 'url': 'https://refractiveindex.info'},\n", - " {'label': 'source', 'url': \"https://refractiveindex.info/download/database/rii-database-2019-02-11.zip\"}\n", + " \"unique_identifiers\": False,\n", + " \"references\": [\n", + " {\"label\": \"website\", \"url\": \"https://refractiveindex.info\"},\n", + " {\n", + " \"label\": \"source\",\n", + " \"url\": \"https://refractiveindex.info/download/database/rii-database-2019-02-11.zip\",\n", + " },\n", " ],\n", - " \"other\": { # describe the root fields here to automatically include tooltips on MP\n", + " \"other\": { # describe the root fields here to automatically include tooltips on MP\n", " \"n\": \"real part of complex refractive index\",\n", " \"k\": \"imaginary part of complex refractive index\",\n", " \"range\": \"wavelength range for n,k in nm\",\n", " \"points\": \"number of λ points in range\",\n", - " \"page\": \"reference to data source/publication\"\n", - " }\n", + " \"page\": \"reference to data source/publication\",\n", + " },\n", "}\n", "# could also update authors, title, long_title, description" ] @@ -280,15 +280,18 @@ "metadata": {}, "outputs": [], "source": [ - "client.init_columns(name, {\n", - " \"n\": \"\", # dimensionless\n", - " \"k\": \"\",\n", - " \"range.min\": \"nm\",\n", - " \"range.mid\": \"nm\",\n", - " \"range.max\": \"nm\",\n", - " \"points\": \"\",\n", - " \"page\": None # text \n", - "})" + "client.init_columns(\n", + " name,\n", + " {\n", + " \"n\": \"\", # dimensionless\n", + " \"k\": \"\",\n", + " \"range.min\": \"nm\",\n", + " \"range.mid\": \"nm\",\n", + " \"range.max\": \"nm\",\n", + " \"points\": \"\",\n", + " \"page\": None, # text\n", + " },\n", + ")" ] }, { @@ -391,10 +394,7 @@ "outputs": [], "source": [ "all_ids = client.get_all_ids(\n", - " {\"project\": name},\n", - " include=[\"tables\"],\n", - " data_id_fields={name: \"page\"},\n", - " fmt=\"map\"\n", + " {\"project\": name}, include=[\"tables\"], data_id_fields={name: \"page\"}, fmt=\"map\"\n", ")" ] }, @@ -439,18 +439,18 @@ "query = {\n", " \"project\": name,\n", " \"formula__contains\": \"Au\",\n", - " #\"identifier__in\": []\n", - "\n", + " # \"identifier__in\": []\n", " \"data__n__value__lt\": 200,\n", " \"data__k__value__gte\": 7,\n", - "\n", " \"_sort\": \"-data__range__mid__value\",\n", " \"_fields\": [\n", - " \"id\", \"identifier\", \"formula\",\n", + " \"id\",\n", + " \"identifier\",\n", + " \"formula\",\n", " \"data.range.mid.value\",\n", " \"data.n.value\",\n", - " \"data.k.value\"\n", - " ]\n", + " \"data.k.value\",\n", + " ],\n", "}\n", "\n", "print(client.get_totals(query))\n", diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/intermatch.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/intermatch.ipynb index 8eb5bfd12f..b1df676413 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/intermatch.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/intermatch.ipynb @@ -46,11 +46,14 @@ " \"identifier\": \"mp-48\",\n", " \"data\": {\n", " \"interface\": \"mp-22850\",\n", - " \"Δn\": 1.3, \"ε\": 3.6199, \"atoms\": 208, \"θ\": \"0 °\",\n", + " \"Δn\": 1.3,\n", + " \"ε\": 3.6199,\n", + " \"atoms\": 208,\n", + " \"θ\": \"0 °\",\n", " \"surface\": {\"N₁\": 40, \"N₂\": 6, \"ratio\": 6.666},\n", " \"v₁\": {\"i₁₁\": -8, \"i₁₂\": 8, \"i₂₁\": -3, \"i₂₂\": 3},\n", - " \"v₂\": {\"j₁₁\": -13, \"j₁₂\": 8, \"j₂₁\": -5, \"j₂₂\": 3}\n", - " }\n", + " \"v₂\": {\"j₁₁\": -13, \"j₁₂\": 8, \"j₂₁\": -5, \"j₂₂\": 3},\n", + " },\n", " }\n", "]" ] diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ion_ref_data.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ion_ref_data.ipynb index 4543e68cdb..89e280eb7b 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ion_ref_data.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ion_ref_data.ipynb @@ -87,13 +87,11 @@ " if e[\"Name\"] == \"HGaO2[2-]\":\n", " ion_ref_data[i] = {\n", " \"Energy\": -7.1099,\n", - " \"Major_Elements\": [\n", - " \"Ga\"\n", - " ],\n", + " \"Major_Elements\": [\"Ga\"],\n", " \"Name\": \"HGaO3[2-]\",\n", " \"Reference Solid\": \"Ga2O3\",\n", " \"Reference solid energy\": -10.347724703224722,\n", - " \"Source\": \"D. D. Wagman et al., Selected values for inorganic and C1 and C2 Organic substances in SI units, The NBS table of chemical thermodynamic properties, Washington (1982)\"\n", + " \"Source\": \"D. D. Wagman et al., Selected values for inorganic and C1 and C2 Organic substances in SI units, The NBS table of chemical thermodynamic properties, Washington (1982)\",\n", " }\n", " print(\"Replaced entry at index {}\".format(i))" ] @@ -121,7 +119,8 @@ "outputs": [], "source": [ "from mpcontribs.client import Client\n", - "name = 'ion_ref_data' # this should be your project, see from the project URL\n", + "\n", + "name = \"ion_ref_data\" # this should be your project, see from the project URL\n", "client = Client()" ] }, @@ -138,7 +137,7 @@ "metadata": {}, "outputs": [], "source": [ - "ion_contribs =[]\n", + "ion_contribs = []\n", "\n", "for d in ion_ref_data:\n", " ret = {}\n", @@ -147,12 +146,16 @@ " ret[\"identifier\"] = d[\"Name\"]\n", " ret[\"data\"] = {}\n", " ret[\"data\"][\"charge\"] = Ion.from_formula(d[\"Name\"]).charge\n", - " ret[\"data\"][\"ΔGᶠ\"] = \"{:.5g} kJ/mol\".format(d[\"Energy\"]*96.485) # convert from eV/f.u. to kJ/mol\n", + " ret[\"data\"][\"ΔGᶠ\"] = \"{:.5g} kJ/mol\".format(\n", + " d[\"Energy\"] * 96.485\n", + " ) # convert from eV/f.u. to kJ/mol\n", " ret[\"data\"][\"MajElements\"] = d[\"Major_Elements\"][0]\n", " ret[\"data\"][\"RefSolid\"] = d[\"Reference Solid\"]\n", - " ret[\"data\"][\"ΔGᶠRefSolid\"] = \"{:.4g} kJ/mol\".format(d[\"Reference solid energy\"]*96.485)# convert from eV/f.u. to kJ/mol\n", + " ret[\"data\"][\"ΔGᶠRefSolid\"] = \"{:.4g} kJ/mol\".format(\n", + " d[\"Reference solid energy\"] * 96.485\n", + " ) # convert from eV/f.u. to kJ/mol\n", " ret[\"data\"][\"reference\"] = d[\"Source\"]\n", - " \n", + "\n", " ion_contribs.append(ret)" ] }, @@ -189,18 +192,20 @@ "outputs": [], "source": [ "client.projects.update_entry(\n", - " pk=\"ion_ref_data\", project={\"other\": \n", - " {\"formula\": \"Chemical formula of the aqueous species\",\n", - " \"charge\": \"Charge on the aqueous species\",\n", - " \"ΔGᶠ\": \"Gibbs free energy of formation of the aqueous species from the elements\",\n", - " \"MajElementsᶠ\": None,\n", - " \"MajElements\": \"Elements contained in the aqueous species\",\n", - " \"RefSolid\": \"Solid compound to which the aqueous species energy is referenced\",\n", - " \"ΔGᶠRefSolid\": \"Gibbs free energy of formation of the reference solid compound\",\n", - " \"Ion\": None\n", - " },\n", - " \"description\": \"This project contains experimental ion dissolution energies that are used by pymatgen when constructing Pourbaix diagrams. See the Persson2012 reference for a detailed description of the thermodynamic framework used.\"\n", - " }\n", + " pk=\"ion_ref_data\",\n", + " project={\n", + " \"other\": {\n", + " \"formula\": \"Chemical formula of the aqueous species\",\n", + " \"charge\": \"Charge on the aqueous species\",\n", + " \"ΔGᶠ\": \"Gibbs free energy of formation of the aqueous species from the elements\",\n", + " \"MajElementsᶠ\": None,\n", + " \"MajElements\": \"Elements contained in the aqueous species\",\n", + " \"RefSolid\": \"Solid compound to which the aqueous species energy is referenced\",\n", + " \"ΔGᶠRefSolid\": \"Gibbs free energy of formation of the reference solid compound\",\n", + " \"Ion\": None,\n", + " },\n", + " \"description\": \"This project contains experimental ion dissolution energies that are used by pymatgen when constructing Pourbaix diagrams. See the Persson2012 reference for a detailed description of the thermodynamic framework used.\",\n", + " },\n", ").result()" ] }, @@ -211,8 +216,10 @@ "outputs": [], "source": [ "client.projects.update_entry(\n", - " pk=\"ion_ref_data\", project={\"authors\": \"Various authors (see references). Data compiled by the Materials Project team.\"\n", - " }\n", + " pk=\"ion_ref_data\",\n", + " project={\n", + " \"authors\": \"Various authors (see references). Data compiled by the Materials Project team.\"\n", + " },\n", ").result()" ] }, @@ -223,8 +230,7 @@ "outputs": [], "source": [ "client.projects.update_entry(\n", - " pk=\"ion_ref_data\", project={\"title\": \"Aqueous Ion Reference Data\"\n", - " }\n", + " pk=\"ion_ref_data\", project={\"title\": \"Aqueous Ion Reference Data\"}\n", ").result()" ] }, @@ -235,18 +241,51 @@ "outputs": [], "source": [ "client.projects.update_entry(\n", - " pk=\"ion_ref_data\", project={\"references\": [\n", - " {\"label\":\"Persson2012\", 'url':\"https://doi.org/10.1103/PhysRevB.85.235438\"},\n", - " {'label': 'NBS1', 'url': 'https://nvlpubs.nist.gov/nistpubs/Legacy/TN/nbstechnicalnote270-1.pdf'},\n", - " {'label': 'NBS2', 'url': 'https://nvlpubs.nist.gov/nistpubs/Legacy/TN/nbstechnicalnote270-2.pdf'},\n", - " {'label': 'NBS3', 'url': 'https://nvlpubs.nist.gov/nistpubs/Legacy/TN/nbstechnicalnote270-3.pdf'},\n", - " {'label': 'NBS4', 'url': 'https://nvlpubs.nist.gov/nistpubs/Legacy/TN/nbstechnicalnote270-4.pdf'},\n", - " {'label': 'NBS5', 'url': 'https://nvlpubs.nist.gov/nistpubs/Legacy/TN/nbstechnicalnote270-5.pdf'},\n", - " {'label': 'NBS6', 'url': 'https://nvlpubs.nist.gov/nistpubs/Legacy/TN/nbstechnicalnote270-6.pdf'},\n", - " {'label': 'NBS7', 'url': 'https://nvlpubs.nist.gov/nistpubs/Legacy/TN/nbstechnicalnote270-7.pdf'},\n", - " {'label': 'NBS8', 'url': 'https://nvlpubs.nist.gov/nistpubs/Legacy/TN/nbstechnicalnote270-8.pdf'},\n", - " {\"label\":\"Pourbaix\", 'url':\"https://www.worldcat.org/title/atlas-of-electrochemical-equilibria-in-aqueous-solutions/oclc/563921897\"}]\n", - " }\n", + " pk=\"ion_ref_data\",\n", + " project={\n", + " \"references\": [\n", + " {\n", + " \"label\": \"Persson2012\",\n", + " \"url\": \"https://doi.org/10.1103/PhysRevB.85.235438\",\n", + " },\n", + " {\n", + " \"label\": \"NBS1\",\n", + " \"url\": \"https://nvlpubs.nist.gov/nistpubs/Legacy/TN/nbstechnicalnote270-1.pdf\",\n", + " },\n", + " {\n", + " \"label\": \"NBS2\",\n", + " \"url\": \"https://nvlpubs.nist.gov/nistpubs/Legacy/TN/nbstechnicalnote270-2.pdf\",\n", + " },\n", + " {\n", + " \"label\": \"NBS3\",\n", + " \"url\": \"https://nvlpubs.nist.gov/nistpubs/Legacy/TN/nbstechnicalnote270-3.pdf\",\n", + " },\n", + " {\n", + " \"label\": \"NBS4\",\n", + " \"url\": \"https://nvlpubs.nist.gov/nistpubs/Legacy/TN/nbstechnicalnote270-4.pdf\",\n", + " },\n", + " {\n", + " \"label\": \"NBS5\",\n", + " \"url\": \"https://nvlpubs.nist.gov/nistpubs/Legacy/TN/nbstechnicalnote270-5.pdf\",\n", + " },\n", + " {\n", + " \"label\": \"NBS6\",\n", + " \"url\": \"https://nvlpubs.nist.gov/nistpubs/Legacy/TN/nbstechnicalnote270-6.pdf\",\n", + " },\n", + " {\n", + " \"label\": \"NBS7\",\n", + " \"url\": \"https://nvlpubs.nist.gov/nistpubs/Legacy/TN/nbstechnicalnote270-7.pdf\",\n", + " },\n", + " {\n", + " \"label\": \"NBS8\",\n", + " \"url\": \"https://nvlpubs.nist.gov/nistpubs/Legacy/TN/nbstechnicalnote270-8.pdf\",\n", + " },\n", + " {\n", + " \"label\": \"Pourbaix\",\n", + " \"url\": \"https://www.worldcat.org/title/atlas-of-electrochemical-equilibria-in-aqueous-solutions/oclc/563921897\",\n", + " },\n", + " ]\n", + " },\n", ").result()" ] }, @@ -282,7 +321,7 @@ "# need to delete contributions first due to unique_identifiers=False\n", "client.delete_contributions(name)\n", "client.submit_contributions(ion_contribs, per_page=10, skip_dupe_check=True)\n", - "#client.contributions.create_entries(contributions=ion_contribs[0:100]).result()" + "# client.contributions.create_entries(contributions=ion_contribs[0:100]).result()" ] }, { diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/jarvis_dft.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/jarvis_dft.ipynb index bb08b09503..d4cd3b7a82 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/jarvis_dft.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/jarvis_dft.ipynb @@ -20,7 +20,7 @@ "metadata": {}, "outputs": [], "source": [ - "name = 'jarvis_dft'\n", + "name = \"jarvis_dft\"\n", "client = Client()" ] }, @@ -57,22 +57,22 @@ "metadata": {}, "outputs": [], "source": [ - "dimensions = ['2d', '3d']\n", + "dimensions = [\"2d\", \"3d\"]\n", "tgz = \"jdft_{}.json.tgz\"\n", "config = {\n", " \"file\": f\"https://www.ctcms.nist.gov/~knc6/{tgz}\",\n", " \"details\": \"https://www.ctcms.nist.gov/~knc6/jsmol/{}.html\",\n", - " 'columns': { # 'mpid'\n", - " 'jid': {'name': 'details'},\n", - " 'fin_en': {'name': 'E', 'unit': 'meV'},\n", - " 'exfoliation_en': {'name': 'Eₓ', 'unit': 'eV'},\n", - " 'form_enp': {'name': 'ΔH', 'unit': 'eV'},\n", - " 'op_gap': {'name': 'ΔEⱽᴰᵂ', 'unit': 'meV'},\n", - " 'mbj_gap': {'name': 'ΔEᴹᴮᴶ', 'unit': 'meV'},\n", - " 'kv': {'name': 'Kᵥ', 'unit': 'GPa'},\n", - " 'gv': {'name': 'Gᵥ', 'unit': 'GPa'},\n", - " 'magmom': {'name': 'µ', 'unit': 'µᵇ'}\n", - " }\n", + " \"columns\": { # 'mpid'\n", + " \"jid\": {\"name\": \"details\"},\n", + " \"fin_en\": {\"name\": \"E\", \"unit\": \"meV\"},\n", + " \"exfoliation_en\": {\"name\": \"Eₓ\", \"unit\": \"eV\"},\n", + " \"form_enp\": {\"name\": \"ΔH\", \"unit\": \"eV\"},\n", + " \"op_gap\": {\"name\": \"ΔEⱽᴰᵂ\", \"unit\": \"meV\"},\n", + " \"mbj_gap\": {\"name\": \"ΔEᴹᴮᴶ\", \"unit\": \"meV\"},\n", + " \"kv\": {\"name\": \"Kᵥ\", \"unit\": \"GPa\"},\n", + " \"gv\": {\"name\": \"Gᵥ\", \"unit\": \"GPa\"},\n", + " \"magmom\": {\"name\": \"µ\", \"unit\": \"µᵇ\"},\n", + " },\n", "}" ] }, @@ -87,17 +87,17 @@ "\n", "for dim in dimensions:\n", " url = config[\"file\"].format(dim)\n", - " dbfile = url.rsplit('/')[-1]\n", + " dbfile = url.rsplit(\"/\")[-1]\n", " dbpath = os.path.join(dbdir, dbfile)\n", - " \n", + "\n", " if not os.path.exists(dbpath):\n", - " print('downloading', dbpath, '...')\n", + " print(\"downloading\", dbpath, \"...\")\n", " urlretrieve(url, dbpath)\n", "\n", " with tarfile.open(dbpath, \"r:gz\") as tar:\n", " member = tar.getmembers()[0]\n", " raw_data[dim] = json.load(tar.extractfile(member), cls=MontyDecoder)\n", - " \n", + "\n", " print(dim, len(raw_data[dim]))" ] }, @@ -121,15 +121,16 @@ " for dim in dimensions:\n", " for rd in raw_data[dim]:\n", " contrib = {\n", - " 'project': name, 'is_public': True,\n", - " 'identifier': rd[\"mpid\"],\n", - " 'data': {'type': dim.upper()}\n", + " \"project\": name,\n", + " \"is_public\": True,\n", + " \"identifier\": rd[\"mpid\"],\n", + " \"data\": {\"type\": dim.upper()},\n", " }\n", "\n", " dct = {}\n", - " for k, col in config['columns'].items():\n", - " hdr, unit = col['name'], col.get('unit')\n", - " if k == 'jid':\n", + " for k, col in config[\"columns\"].items():\n", + " hdr, unit = col[\"name\"], col.get(\"unit\")\n", + " if k == \"jid\":\n", " dct[hdr] = config[hdr].format(rd[k])\n", " elif k in rd:\n", " if unit and rd[k]:\n", @@ -137,18 +138,18 @@ " float(rd[k])\n", " except ValueError:\n", " continue\n", - " dct[hdr] = f'{rd[k]} {unit}' if unit else rd[k]\n", + " dct[hdr] = f\"{rd[k]} {unit}\" if unit else rd[k]\n", "\n", " contrib[\"data\"].update(unflatten(dct))\n", "\n", - " contrib[\"structures\"] = [rd['final_str']]\n", + " contrib[\"structures\"] = [rd[\"final_str\"]]\n", " contributions.append(contrib)\n", " pbar.update(1)\n", "\n", "# make sure that contributions with all columns come first\n", - "contributions = [d for d in sorted(\n", - " contributions, key=lambda x: len(x[\"data\"]), reverse=True\n", - ")]" + "contributions = [\n", + " d for d in sorted(contributions, key=lambda x: len(x[\"data\"]), reverse=True)\n", + "]" ] }, { @@ -190,13 +191,17 @@ " \"_order_by\": \"data__ΔEⱽᴰᵂ__value\",\n", " \"order\": \"desc\",\n", " \"_fields\": [\n", - " \"id\", \"identifier\", \"formula\",\n", - " \"data.type\", \"data.ΔEⱽᴰᵂ.value\",\n", - " \"data.ΔEᴹᴮᴶ.value\", \"data.Kᵥ.value\",\n", - " \"structures\"\n", + " \"id\",\n", + " \"identifier\",\n", + " \"formula\",\n", + " \"data.type\",\n", + " \"data.ΔEⱽᴰᵂ.value\",\n", + " \"data.ΔEᴹᴮᴶ.value\",\n", + " \"data.Kᵥ.value\",\n", + " \"structures\",\n", " ],\n", - " \"_limit\": 10\n", - "} \n", + " \"_limit\": 10,\n", + "}\n", "resp = client.contributions.get_entries(**query).result()" ] }, diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/jarvis_dft_2023.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/jarvis_dft_2023.ipynb index a5ca1fe7e0..152fddd11d 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/jarvis_dft_2023.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/jarvis_dft_2023.ipynb @@ -32,7 +32,7 @@ "metadata": {}, "outputs": [], "source": [ - "name = 'dft_3d' # TODO dft_2d\n", + "name = \"dft_3d\" # TODO dft_2d\n", "data = jarvis_db(name)" ] }, @@ -44,62 +44,68 @@ "outputs": [], "source": [ "columns = {\n", - " 'jid': {'name': 'jarvis.id', 'unit': None},\n", - " 'jid': {'name': 'jarvis.link', 'unit': None},\n", - " 'Tc_supercon': {'name': 'Tc', 'unit': 'K'},\n", - " 'avg_elec_mass': {'name': 'mass|avg.elec', 'unit': 'mₑ'},\n", - " 'avg_hole_mass': {'name': 'mass|avg.hole', 'unit': 'mₑ'},\n", - " 'bulk_modulus_kv': {'name': 'moduli.bulk|voigt', 'unit': 'GPa'},\n", - " 'shear_modulus_gv': {'name': 'moduli.shear', 'unit': 'GPa'},\n", - " 'crys': {'name': 'crystal', 'unit': None},\n", - " 'density': {'name': 'density', 'unit': 'g/cm³'},\n", - " 'dfpt_piezo_max_dielectric': {'name': 'piezo|max.dielectric.total', 'unit': 'C/m²'},\n", - " 'dfpt_piezo_max_dielectric_electronic': {'name': 'piezo|max.dielectric.electronic', 'unit': 'C/m²'},\n", - " 'dfpt_piezo_max_dielectric_ionic': {'name': 'piezo|max.dielectric.ionic', 'unit': 'C/m²'},\n", - " 'dfpt_piezo_max_dij': {'name': 'piezo|max.dij', 'unit': 'C/m²'},\n", - " 'dfpt_piezo_max_eij': {'name': 'piezo|max.eij', 'unit': 'C/m²'},\n", - " 'dimensionality': {'name': 'dimensionality', 'unit': None},\n", - " 'effective_masses_300K.n': {'name': 'mass|eff.n|300K', 'unit': ''},\n", - " 'effective_masses_300K.p': {'name': 'mass|eff.p|300K', 'unit': ''},\n", - " 'spg_number': {'name': 'spacegroup.number', 'unit': ''},\n", - " 'spg_symbol': {'name': 'spacegroup.symbol', 'unit': None},\n", - " 'hse_gap': {'name': 'bandgaps.HSE', 'unit': 'eV'},\n", - " 'mbj_bandgap': {'name': 'bandgaps.TBmBJ', 'unit': 'eV'},\n", - " 'optb88vdw_bandgap': {'name': 'bandgaps.OptB88vdW', 'unit': 'eV'},\n", - " 'n-powerfact': {'name': 'powerfactor.n', 'unit': 'µW/K²/m²'},\n", - " 'p-powerfact': {'name': 'powerfactor.p', 'unit': 'µW/K²/m²'},\n", - " 'slme': {'name': 'SLME', 'unit': '%'},\n", - " 'spillage': {'name': 'spillage', 'unit': ''},\n", - " 'encut': {'name': 'ENCUT', 'unit': 'eV'},\n", - " 'magmom_oszicar': {'name': 'magmoms.oszicar', 'unit': 'µB'},\n", - " 'magmom_outcar': {'name': 'magmoms.outcar', 'unit': 'µB'},\n", - " 'n-Seebeck': {'name': 'seebeck.n', 'unit': 'µV/K'},\n", - " 'p-Seebeck': {'name': 'seebeck.p', 'unit': 'µV/K'},\n", - " 'epsx': {'name': 'refractive.x', 'unit': ''},\n", - " 'epsy': {'name': 'refractive.y', 'unit': ''},\n", - " 'epsz': {'name': 'refractive.z', 'unit': ''},\n", - " 'max_ir_mode': {'name': 'IR.max', 'unit': 'cm⁻¹'},\n", - " 'min_ir_mode': {'name': 'IR.min', 'unit': 'cm⁻¹'},\n", - " 'ncond': {'name': 'Ncond', 'unit': ''},\n", - " 'nkappa': {'name': 'kappa.n', 'unit': ''},\n", - " 'pkappa': {'name': 'kappa.p', 'unit': ''},\n", - " 'exfoliation_energy': {'name': 'energies.exfoliation', 'unit': 'eV'},\n", - " 'formation_energy_peratom': {'name': 'energies.formation', 'unit': 'eV/atom'},\n", - " 'ehull': {'name': 'energies.hull', 'unit': 'eV'},\n", - " 'optb88vdw_total_energy': {'name': 'energies.OptB88vdW', 'unit': 'eV'}, \n", - " 'max_efg': {'name': 'EFG', 'unit': 'V/m²'},\n", - " 'func': {'name': 'functional', 'unit': None},\n", - " 'kpoint_length_unit': {'name': 'kpoints', 'unit': ''},\n", - " 'typ': {'name': 'type', 'unit': None},\n", - " 'nat': {'name': 'natoms', 'unit': ''}, \n", - " 'search': {'name': 'search', 'unit': None},\n", - " 'maxdiff_bz': {'name': 'maxdiff.bz', 'unit': ''},\n", - " 'maxdiff_mesh': {'name': 'maxdiff.mesh', 'unit': ''},\n", - " 'mepsx': {'name': 'meps.x', 'unit': ''},\n", - " 'mepsy': {'name': 'meps.y', 'unit': ''},\n", - " 'mepsz': {'name': 'meps.z', 'unit': ''},\n", - " 'pcond': {'name': 'pcond', 'unit': ''},\n", - " 'poisson': {'name': 'poisson', 'unit': ''},\n", + " \"jid\": {\"name\": \"jarvis.id\", \"unit\": None},\n", + " \"jid\": {\"name\": \"jarvis.link\", \"unit\": None},\n", + " \"Tc_supercon\": {\"name\": \"Tc\", \"unit\": \"K\"},\n", + " \"avg_elec_mass\": {\"name\": \"mass|avg.elec\", \"unit\": \"mₑ\"},\n", + " \"avg_hole_mass\": {\"name\": \"mass|avg.hole\", \"unit\": \"mₑ\"},\n", + " \"bulk_modulus_kv\": {\"name\": \"moduli.bulk|voigt\", \"unit\": \"GPa\"},\n", + " \"shear_modulus_gv\": {\"name\": \"moduli.shear\", \"unit\": \"GPa\"},\n", + " \"crys\": {\"name\": \"crystal\", \"unit\": None},\n", + " \"density\": {\"name\": \"density\", \"unit\": \"g/cm³\"},\n", + " \"dfpt_piezo_max_dielectric\": {\"name\": \"piezo|max.dielectric.total\", \"unit\": \"C/m²\"},\n", + " \"dfpt_piezo_max_dielectric_electronic\": {\n", + " \"name\": \"piezo|max.dielectric.electronic\",\n", + " \"unit\": \"C/m²\",\n", + " },\n", + " \"dfpt_piezo_max_dielectric_ionic\": {\n", + " \"name\": \"piezo|max.dielectric.ionic\",\n", + " \"unit\": \"C/m²\",\n", + " },\n", + " \"dfpt_piezo_max_dij\": {\"name\": \"piezo|max.dij\", \"unit\": \"C/m²\"},\n", + " \"dfpt_piezo_max_eij\": {\"name\": \"piezo|max.eij\", \"unit\": \"C/m²\"},\n", + " \"dimensionality\": {\"name\": \"dimensionality\", \"unit\": None},\n", + " \"effective_masses_300K.n\": {\"name\": \"mass|eff.n|300K\", \"unit\": \"\"},\n", + " \"effective_masses_300K.p\": {\"name\": \"mass|eff.p|300K\", \"unit\": \"\"},\n", + " \"spg_number\": {\"name\": \"spacegroup.number\", \"unit\": \"\"},\n", + " \"spg_symbol\": {\"name\": \"spacegroup.symbol\", \"unit\": None},\n", + " \"hse_gap\": {\"name\": \"bandgaps.HSE\", \"unit\": \"eV\"},\n", + " \"mbj_bandgap\": {\"name\": \"bandgaps.TBmBJ\", \"unit\": \"eV\"},\n", + " \"optb88vdw_bandgap\": {\"name\": \"bandgaps.OptB88vdW\", \"unit\": \"eV\"},\n", + " \"n-powerfact\": {\"name\": \"powerfactor.n\", \"unit\": \"µW/K²/m²\"},\n", + " \"p-powerfact\": {\"name\": \"powerfactor.p\", \"unit\": \"µW/K²/m²\"},\n", + " \"slme\": {\"name\": \"SLME\", \"unit\": \"%\"},\n", + " \"spillage\": {\"name\": \"spillage\", \"unit\": \"\"},\n", + " \"encut\": {\"name\": \"ENCUT\", \"unit\": \"eV\"},\n", + " \"magmom_oszicar\": {\"name\": \"magmoms.oszicar\", \"unit\": \"µB\"},\n", + " \"magmom_outcar\": {\"name\": \"magmoms.outcar\", \"unit\": \"µB\"},\n", + " \"n-Seebeck\": {\"name\": \"seebeck.n\", \"unit\": \"µV/K\"},\n", + " \"p-Seebeck\": {\"name\": \"seebeck.p\", \"unit\": \"µV/K\"},\n", + " \"epsx\": {\"name\": \"refractive.x\", \"unit\": \"\"},\n", + " \"epsy\": {\"name\": \"refractive.y\", \"unit\": \"\"},\n", + " \"epsz\": {\"name\": \"refractive.z\", \"unit\": \"\"},\n", + " \"max_ir_mode\": {\"name\": \"IR.max\", \"unit\": \"cm⁻¹\"},\n", + " \"min_ir_mode\": {\"name\": \"IR.min\", \"unit\": \"cm⁻¹\"},\n", + " \"ncond\": {\"name\": \"Ncond\", \"unit\": \"\"},\n", + " \"nkappa\": {\"name\": \"kappa.n\", \"unit\": \"\"},\n", + " \"pkappa\": {\"name\": \"kappa.p\", \"unit\": \"\"},\n", + " \"exfoliation_energy\": {\"name\": \"energies.exfoliation\", \"unit\": \"eV\"},\n", + " \"formation_energy_peratom\": {\"name\": \"energies.formation\", \"unit\": \"eV/atom\"},\n", + " \"ehull\": {\"name\": \"energies.hull\", \"unit\": \"eV\"},\n", + " \"optb88vdw_total_energy\": {\"name\": \"energies.OptB88vdW\", \"unit\": \"eV\"},\n", + " \"max_efg\": {\"name\": \"EFG\", \"unit\": \"V/m²\"},\n", + " \"func\": {\"name\": \"functional\", \"unit\": None},\n", + " \"kpoint_length_unit\": {\"name\": \"kpoints\", \"unit\": \"\"},\n", + " \"typ\": {\"name\": \"type\", \"unit\": None},\n", + " \"nat\": {\"name\": \"natoms\", \"unit\": \"\"},\n", + " \"search\": {\"name\": \"search\", \"unit\": None},\n", + " \"maxdiff_bz\": {\"name\": \"maxdiff.bz\", \"unit\": \"\"},\n", + " \"maxdiff_mesh\": {\"name\": \"maxdiff.mesh\", \"unit\": \"\"},\n", + " \"mepsx\": {\"name\": \"meps.x\", \"unit\": \"\"},\n", + " \"mepsy\": {\"name\": \"meps.y\", \"unit\": \"\"},\n", + " \"mepsz\": {\"name\": \"meps.z\", \"unit\": \"\"},\n", + " \"pcond\": {\"name\": \"pcond\", \"unit\": \"\"},\n", + " \"poisson\": {\"name\": \"poisson\", \"unit\": \"\"},\n", "}" ] }, @@ -113,22 +119,22 @@ "outputs": [], "source": [ "contributions = []\n", - "list_keys = ['efg', 'elastic_tensor', 'modes', 'icsd']\n", + "list_keys = [\"efg\", \"elastic_tensor\", \"modes\", \"icsd\"]\n", "identifier_key = \"reference\"\n", "formula_key = \"formula\"\n", "prefixes = (\"mp-\", \"mvc-\")\n", - "jarvis_url = 'https://www.ctcms.nist.gov/~knc6/static/JARVIS-DFT/'\n", + "jarvis_url = \"https://www.ctcms.nist.gov/~knc6/static/JARVIS-DFT/\"\n", "identifiers = set()\n", "\n", "for entry in data:\n", " identifier = entry[identifier_key]\n", " if not entry[identifier_key].startswith(prefixes) or identifier in identifiers:\n", " continue\n", - " \n", + "\n", " identifiers.add(identifier)\n", " contrib = {\"identifier\": identifier, \"formula\": entry[formula_key], \"data\": {}}\n", " attm_data = {}\n", - " \n", + "\n", " for k, v in entry.items():\n", " if not v or v == \"na\" or k == \"xml_data_link\":\n", " continue\n", @@ -154,7 +160,7 @@ " elif k in columns:\n", " name, unit = columns[k][\"name\"], columns[k][\"unit\"]\n", " contrib[\"data\"][name] = f\"{v} {unit}\" if unit else v\n", - " \n", + "\n", " if attm_data:\n", " contrib[\"attachments\"] = [Attachment.from_data(\"lists\", attm_data)]\n", "\n", @@ -178,7 +184,7 @@ " if \"files\" in contrib[\"data\"]:\n", " flat_files = flatten(contrib[\"data\"][\"files\"], reducer=\"dot\")\n", " files_columns.update(flat_files.keys())\n", - " \n", + "\n", "files_columns" ] }, @@ -394,10 +400,12 @@ "source": [ "query = {\"data__energies__hull__value__lte\": 0.05}\n", "count, _ = client.get_totals(query=query)\n", - "print(f\"materials with ehull <= 0.05 eV/atom: {count/ncontribs*100:.1f}%\")\n", + "print(f\"materials with ehull <= 0.05 eV/atom: {count / ncontribs * 100:.1f}%\")\n", "fields = [\"identifier\", \"formula\", \"data.energies.hull.value\"]\n", "sort = \"data.energies.hull.value\"\n", - "contribs = client.query_contributions(query=query, fields=fields, sort=sort, paginate=True)\n", + "contribs = client.query_contributions(\n", + " query=query, fields=fields, sort=sort, paginate=True\n", + ")\n", "pd.json_normalize(contribs[\"data\"])" ] }, @@ -471,13 +479,19 @@ " \"data__spillage__value__gte\": 0.5,\n", " \"data__bandgaps__OptB88vdW__value__gt\": 0.01,\n", " \"data__energies__hull__value__lt\": 0.1,\n", - " \"data__SLME__value__gt\": 5\n", + " \"data__SLME__value__gt\": 5,\n", "}\n", "fields = [\n", - " \"identifier\", \"formula\", \"data.spillage.value\", \"data.bandgaps.OptB88vdW.value\",\n", - " \"data.energies.hull.value\", \"data.SLME.value\",\n", + " \"identifier\",\n", + " \"formula\",\n", + " \"data.spillage.value\",\n", + " \"data.bandgaps.OptB88vdW.value\",\n", + " \"data.energies.hull.value\",\n", + " \"data.SLME.value\",\n", "]\n", - "contribs = client.query_contributions(query=query, fields=fields, sort=sort, paginate=True)\n", + "contribs = client.query_contributions(\n", + " query=query, fields=fields, sort=sort, paginate=True\n", + ")\n", "pd.json_normalize(contribs[\"data\"])" ] }, @@ -637,7 +651,9 @@ "# find all cubic materials\n", "query = {\"data__crystal__exact\": \"cubic\"}\n", "fields = [\"identifier\", \"formula\", \"data.crystal\", \"data.energies.hull.value\"]\n", - "contribs = client.query_contributions(query=query, fields=fields, sort=sort, paginate=True)\n", + "contribs = client.query_contributions(\n", + " query=query, fields=fields, sort=sort, paginate=True\n", + ")\n", "pd.json_normalize(contribs[\"data\"])" ] }, diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/matscholar.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/matscholar.ipynb index 31e5a2c243..d7a25425df 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/matscholar.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/matscholar.ipynb @@ -48,7 +48,7 @@ " \"symmetry.symbol\": None,\n", " \"symmetry.system\": None,\n", " \"symmetry.number\": \"\",\n", - " \"bandgap\": \"eV\"\n", + " \"bandgap\": \"eV\",\n", "}" ] }, @@ -62,24 +62,20 @@ "# generate list of contribution dictionaries\n", "contributions = [\n", " {\n", - " \"identifier\": \"custom_hash\", # or any string to uniquely identify entry/contribution\n", + " \"identifier\": \"custom_hash\", # or any string to uniquely identify entry/contribution\n", " \"formula\": \"Fe3S4\",\n", " \"data\": {\n", - " \"doi\": \"https://doi.org/10.17188/1196965\", # if saved as full URL, a link will be shown in the explorer\n", - " \"symmetry\": {\n", - " \"symbol\": \"Fd3̅m\",\n", - " \"system\": \"cubic\",\n", - " \"number\": 227\n", - " },\n", - " \"bandgap\": \"3.12 eV\"\n", + " \"doi\": \"https://doi.org/10.17188/1196965\", # if saved as full URL, a link will be shown in the explorer\n", + " \"symmetry\": {\"symbol\": \"Fd3̅m\", \"system\": \"cubic\", \"number\": 227},\n", + " \"bandgap\": \"3.12 eV\",\n", " },\n", - "# \"attachments\": [ # create from data, or load gzipped text or images from disk using Path\n", - "# Attachment.from_data(\"other\", {\"hello\": \"world\", \"test\": [1,2,4]})\n", - "# Path(\"2021-02-19_scan_mpids_changed.json.gz\"),\n", - "# Path(\"IMG-20210224-WA0010.jpg\")\n", - "# ],\n", - "# \"structures\": [pymatgen.Structure, ...],\n", - "# \"tables\": [pandas.DataFrame, ...]\n", + " # \"attachments\": [ # create from data, or load gzipped text or images from disk using Path\n", + " # Attachment.from_data(\"other\", {\"hello\": \"world\", \"test\": [1,2,4]})\n", + " # Path(\"2021-02-19_scan_mpids_changed.json.gz\"),\n", + " # Path(\"IMG-20210224-WA0010.jpg\")\n", + " # ],\n", + " # \"structures\": [pymatgen.Structure, ...],\n", + " # \"tables\": [pandas.DataFrame, ...]\n", " },\n", " # ...\n", "]" @@ -111,7 +107,7 @@ "query = {\n", " \"data__bandgap__value__gt\": 3,\n", " \"data__doi__endswith\": \"/1196965\",\n", - " \"data__symmetry__system__exact\": \"cubic\"\n", + " \"data__symmetry__system__exact\": \"cubic\",\n", "}\n", "fields = [\"identifier\", \"formula\", \"data.doi\"]\n", "client.query_contributions(query=query, fields=fields, paginate=True)" diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/melting_points.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/melting_points.ipynb index e3fcc9aadc..95b3ae9d3f 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/melting_points.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/melting_points.ipynb @@ -58,8 +58,12 @@ "metadata": {}, "outputs": [], "source": [ - "indir = \"/Users/patrick/GoogleDriveLBNL/My Drive/MaterialsProject/gitrepos/mpcontribs-data\"\n", - "melting_pts = pd.DataFrame(loadfn(f\"{indir}/melting_points_df_08_08_23.json.gz\")) # Note: temps in Kelvin" + "indir = (\n", + " \"/Users/patrick/GoogleDriveLBNL/My Drive/MaterialsProject/gitrepos/mpcontribs-data\"\n", + ")\n", + "melting_pts = pd.DataFrame(\n", + " loadfn(f\"{indir}/melting_points_df_08_08_23.json.gz\")\n", + ") # Note: temps in Kelvin" ] }, { @@ -104,14 +108,14 @@ "\n", "for d in data:\n", " val, err = d[\"melting_point\"], d[\"melting_point_uncertainty\"]\n", - " contributions.append({\n", - " \"identifier\": d[\"index\"],\n", - " \"formula\": d[\"reduced_formula\"],\n", - " \"data\": {\n", - " \"MeltingPoint\": f\"{val}+/-{err} K\"\n", + " contributions.append(\n", + " {\n", + " \"identifier\": d[\"index\"],\n", + " \"formula\": d[\"reduced_formula\"],\n", + " \"data\": {\"MeltingPoint\": f\"{val}+/-{err} K\"},\n", " }\n", - " })\n", - " \n", + " )\n", + "\n", "contributions[0]" ] }, diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/mg_cathode_screening_2022.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/mg_cathode_screening_2022.ipynb index 77de1868c8..b98cfb008d 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/mg_cathode_screening_2022.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/mg_cathode_screening_2022.ipynb @@ -21,7 +21,9 @@ "metadata": {}, "outputs": [], "source": [ - "client = Client(project=\"mg_cathode_screening_2022\") # provide API key via `apikey` argument" + "client = Client(\n", + " project=\"mg_cathode_screening_2022\"\n", + ") # provide API key via `apikey` argument" ] }, { @@ -50,7 +52,11 @@ "metadata": {}, "outputs": [], "source": [ - "client.update_project(update={\"description\":\"A computational screening approach to identify high-performance multivalent intercalation cathodes among materials that do not contain the working ion of interest has been developed, which greatly expands the search space that can be considered for material discovery (https://doi.org/10.1021/acsami.2c11733). This magnesium intercalation cathode data set of phase stability, energy density, & transport properties has been generated using these methods but applied to a larger set of materials than the original publication. 5,853 empty host materials of the 16,682 materials previously down selected based on their reducible species oxidation state were prioritized for Mg insertions based on excluding candidates which contained an extractable ion (H, Li, Na, K, Rb, Cs, Mg, Ca, Cs, Ag, Cu). Of these 5,863 attempted Mg insertion workflows, 83% resulted in at least one viable Mg site. This ultimately resulted in 4,872 Mg cathodes from which 229 ApproxNEB workflows were attempted. There were 193 unique structure types in these 229 candidates. All ApproxNEB images calculations successfully completed for 97 electrodes. This data set uses the following python objects: pymatgen.apps.battery.insertion_battery.InsertionElectrode and pymatgen.analysis.diffusion.neb.full_path_mapper.MigrationGraph\"})" + "client.update_project(\n", + " update={\n", + " \"description\": \"A computational screening approach to identify high-performance multivalent intercalation cathodes among materials that do not contain the working ion of interest has been developed, which greatly expands the search space that can be considered for material discovery (https://doi.org/10.1021/acsami.2c11733). This magnesium intercalation cathode data set of phase stability, energy density, & transport properties has been generated using these methods but applied to a larger set of materials than the original publication. 5,853 empty host materials of the 16,682 materials previously down selected based on their reducible species oxidation state were prioritized for Mg insertions based on excluding candidates which contained an extractable ion (H, Li, Na, K, Rb, Cs, Mg, Ca, Cs, Ag, Cu). Of these 5,863 attempted Mg insertion workflows, 83% resulted in at least one viable Mg site. This ultimately resulted in 4,872 Mg cathodes from which 229 ApproxNEB workflows were attempted. There were 193 unique structure types in these 229 candidates. All ApproxNEB images calculations successfully completed for 97 electrodes. This data set uses the following python objects: pymatgen.apps.battery.insertion_battery.InsertionElectrode and pymatgen.analysis.diffusion.neb.full_path_mapper.MigrationGraph\"\n", + " }\n", + ")" ] }, { @@ -61,31 +67,31 @@ "outputs": [], "source": [ "# add legend for project in `other`\n", - "client.update_project(update={\"other\": {\"identifier\": \"Material Project ID for empty host material\",\n", - " \"formula\": \"Empty host material chemical formula\",\n", - " \n", - " \"host.formulaAnonymous\": \"Empty host material anonumous chemical formula\",\n", - " \"host.nelements\": \"Number of distinct elements in empty host material\",\n", - " \"host.chemsys\": \"Empty host material chemical system of distinct elements sorted alphabetically and joined by dashes\",\n", - " \n", - " \"ICSD.exp\": \"Whether empty host material is an ICSD experimental structure\",\n", - " \"ICSD.ids\": \"Identifiers for the Inorganic Crystal Structure Database\",\n", - " \n", - " \"battery.id\": \"Unique identifier for electrode where 'js-' distinguishes calculations from the screening development phase\",\n", - " \"battery.formula\": \"Electrode chemical formula including the working ion fraction\",\n", - " \"battery.workingIon\": \"Battery system working ion\",\n", - " \"battery.voltage\": \"Average voltage in Volts across all voltage pairs\",\n", - " \"battery.capacity\": \"Total gravimetric capacity in mAh/g of cathode active material\",\n", - " \"battery.stability|charge\": \"Energy above hull in eV/atom, a metric of the phase stability of the charged (empty) state\",\n", - " \"battery.stability|discharge\": \"Energy above hull in eV/atom, a metric of the phase stability of the discharged (intercalated) state\",\n", - " \"battery.Δvolume\": \"Largest volume change in % across all voltage pairs\",\n", - " \n", - " \"MigrationGraph.found\": \"Whether a migration graph mapping out connections between working ion sites could be successfully generated\",\n", - " \"MigrationGraph.npaths\": \"The number of possible percolating pathways identified from the migration graph\",\n", - " \n", - " \"ApproxNEB.uuid\": \"If available, identifier for ApproxNEB calculations for migration graph pathway energetics\",\n", - " \"ApproxNEB.complete\": \"If ApproxNEB calculations are available, the fraction of calculations that were successfully completed\",\n", - "}})" + "client.update_project(\n", + " update={\n", + " \"other\": {\n", + " \"identifier\": \"Material Project ID for empty host material\",\n", + " \"formula\": \"Empty host material chemical formula\",\n", + " \"host.formulaAnonymous\": \"Empty host material anonumous chemical formula\",\n", + " \"host.nelements\": \"Number of distinct elements in empty host material\",\n", + " \"host.chemsys\": \"Empty host material chemical system of distinct elements sorted alphabetically and joined by dashes\",\n", + " \"ICSD.exp\": \"Whether empty host material is an ICSD experimental structure\",\n", + " \"ICSD.ids\": \"Identifiers for the Inorganic Crystal Structure Database\",\n", + " \"battery.id\": \"Unique identifier for electrode where 'js-' distinguishes calculations from the screening development phase\",\n", + " \"battery.formula\": \"Electrode chemical formula including the working ion fraction\",\n", + " \"battery.workingIon\": \"Battery system working ion\",\n", + " \"battery.voltage\": \"Average voltage in Volts across all voltage pairs\",\n", + " \"battery.capacity\": \"Total gravimetric capacity in mAh/g of cathode active material\",\n", + " \"battery.stability|charge\": \"Energy above hull in eV/atom, a metric of the phase stability of the charged (empty) state\",\n", + " \"battery.stability|discharge\": \"Energy above hull in eV/atom, a metric of the phase stability of the discharged (intercalated) state\",\n", + " \"battery.Δvolume\": \"Largest volume change in % across all voltage pairs\",\n", + " \"MigrationGraph.found\": \"Whether a migration graph mapping out connections between working ion sites could be successfully generated\",\n", + " \"MigrationGraph.npaths\": \"The number of possible percolating pathways identified from the migration graph\",\n", + " \"ApproxNEB.uuid\": \"If available, identifier for ApproxNEB calculations for migration graph pathway energetics\",\n", + " \"ApproxNEB.complete\": \"If ApproxNEB calculations are available, the fraction of calculations that were successfully completed\",\n", + " }\n", + " }\n", + ")" ] }, { @@ -113,7 +119,7 @@ "metadata": {}, "outputs": [], "source": [ - "#client.delete_contributions()" + "# client.delete_contributions()" ] }, { @@ -135,22 +141,24 @@ " \"formula_anonymous\": {\"name\": \"host.formulaAnonymous\", \"unit\": None},\n", " \"nelements\": {\"name\": \"host.nelements\", \"unit\": \"\"},\n", " \"chemsys\": {\"name\": \"host.chemsys\", \"unit\": None},\n", - " \n", - " \"icsd_experimental\": {\"name\": \"ICSD.exp\", \"unit\": None}, # convert bool to Yes/No string\n", + " \"icsd_experimental\": {\n", + " \"name\": \"ICSD.exp\",\n", + " \"unit\": None,\n", + " }, # convert bool to Yes/No string\n", " \"icsd_ids\": {\"name\": \"ICSD.ids\", \"unit\": None},\n", - " \n", " \"battery_id\": {\"name\": \"battery.id\", \"unit\": None},\n", " \"battery_formula\": {\"name\": \"battery.formula\", \"unit\": None},\n", " \"working_ion\": {\"name\": \"battery.workingIon\", \"unit\": None},\n", " \"average_voltage\": {\"name\": \"battery.voltage\", \"unit\": \"V\"},\n", - " \"capacity_grav\": {\"name\": \"battery.capacity\", \"unit\": \"mAh/g\"}, \n", + " \"capacity_grav\": {\"name\": \"battery.capacity\", \"unit\": \"mAh/g\"},\n", " \"stability_charge\": {\"name\": \"battery.stability|charge\", \"unit\": \"eV/atom\"},\n", " \"stability_discharge\": {\"name\": \"battery.stability|discharged\", \"unit\": \"eV/atom\"},\n", " \"max_delta_volume\": {\"name\": \"battery.Δvolume\", \"unit\": \"%\"},\n", - " \n", " \"migration_graph_found\": {\"name\": \"MigrationGraph.found\", \"unit\": None},\n", - " \"num_paths_found\": {\"name\": \"MigrationGraph.npaths\", \"unit\": \"\"},# emptry string indicates dimensionless number\n", - " \n", + " \"num_paths_found\": {\n", + " \"name\": \"MigrationGraph.npaths\",\n", + " \"unit\": \"\",\n", + " }, # emptry string indicates dimensionless number\n", " \"aneb_wf_uuid\": {\"name\": \"ApproxNEB.uuid\", \"unit\": None},\n", " \"aneb_wf_complete\": {\"name\": \"ApproxNEB.complete\", \"unit\": \"\"},\n", "}" @@ -196,17 +204,19 @@ "# Applies cost function based on voltage and stability (specific to Mg) for prioritizing electrodes\n", "# Created by custom MapBuilder: https://github.com/materialsproject/emmet/commit/692bdf5eff67fe1b0f48e1a13cee999af9136aae\n", "rank_store = MongograntStore(\n", - " \"ro:mongodb07-ext.nersc.gov/fw_acr_mv\",\"rank_electrodes_2022\",key=\"battery_id\"\n", + " \"ro:mongodb07-ext.nersc.gov/fw_acr_mv\", \"rank_electrodes_2022\", key=\"battery_id\"\n", ")\n", "rank_store.connect()\n", "print(rank_store.count())\n", "\n", "# Raw ApproxNEB workflow data (note 2 of the 229 ApproxNEB workflows had unsuccessful host calculations)\n", "aneb_store = MongograntStore(\n", - " \"ro:mongodb07-ext.nersc.gov/fw_acr_mv\",\"approx_neb\",key=\"wf_uuid\"\n", + " \"ro:mongodb07-ext.nersc.gov/fw_acr_mv\", \"approx_neb\", key=\"wf_uuid\"\n", ")\n", "aneb_store.connect()\n", - "print(aneb_store.count(),aneb_store.count({\"tags\":{\"$all\":[\"migration_graph_2022\"]}}))" + "print(\n", + " aneb_store.count(), aneb_store.count({\"tags\": {\"$all\": [\"migration_graph_2022\"]}})\n", + ")" ] }, { @@ -229,90 +239,94 @@ "source": [ "contrib_docs = []\n", "for bid in bids:\n", - " rank_doc = rank_store.query_one({\"battery_id\":bid})\n", - " aneb_doc = aneb_store.query_one({\"battery_id\":bid})\n", + " rank_doc = rank_store.query_one({\"battery_id\": bid})\n", + " aneb_doc = aneb_store.query_one({\"battery_id\": bid})\n", "\n", " contrib_doc = {\n", - " \"battery_id\":bid,\n", + " \"battery_id\": bid,\n", " # host structure properties\n", - " \"host_mp_ids\":rank_doc[\"host_mp_ids\"],\n", - " \"icsd_experimental\":rank_doc[\"icsd_experimental\"],\n", - " \"icsd_ids\":rank_doc[\"host_icsd_ids\"],\n", - " \"formula\":rank_doc[\"framework_formula\"],\n", - " \"formula_anonymous\":rank_doc[\"formula_anonymous\"],\n", - " \"nelements\":rank_doc[\"nelements\"],\n", - " \"chemsys\":rank_doc[\"chemsys\"],\n", - " \"composition\":rank_doc[\"framework\"],\n", - " \"structure\":rank_doc[\"host_structure\"],\n", + " \"host_mp_ids\": rank_doc[\"host_mp_ids\"],\n", + " \"icsd_experimental\": rank_doc[\"icsd_experimental\"],\n", + " \"icsd_ids\": rank_doc[\"host_icsd_ids\"],\n", + " \"formula\": rank_doc[\"framework_formula\"],\n", + " \"formula_anonymous\": rank_doc[\"formula_anonymous\"],\n", + " \"nelements\": rank_doc[\"nelements\"],\n", + " \"chemsys\": rank_doc[\"chemsys\"],\n", + " \"composition\": rank_doc[\"framework\"],\n", + " \"structure\": rank_doc[\"host_structure\"],\n", " # electrode properties\n", - " \"working_ion\":rank_doc[\"working_ion\"],\n", - " \"electrode_object\":rank_doc[\"electrode_object\"],\n", - " \"battery_formula\":rank_doc[\"battery_formula\"],\n", - " \"average_voltage\":rank_doc[\"average_voltage\"],\n", - " \"capacity_grav\":rank_doc[\"capacity_grav\"],\n", - " \"stability_charge\":rank_doc[\"stability_charge\"],\n", - " \"stability_discharge\":rank_doc[\"stability_discharge\"],\n", - " \"max_delta_volume\":100*rank_doc[\"max_delta_volume\"], #convert to percentage\n", + " \"working_ion\": rank_doc[\"working_ion\"],\n", + " \"electrode_object\": rank_doc[\"electrode_object\"],\n", + " \"battery_formula\": rank_doc[\"battery_formula\"],\n", + " \"average_voltage\": rank_doc[\"average_voltage\"],\n", + " \"capacity_grav\": rank_doc[\"capacity_grav\"],\n", + " \"stability_charge\": rank_doc[\"stability_charge\"],\n", + " \"stability_discharge\": rank_doc[\"stability_discharge\"],\n", + " \"max_delta_volume\": 100 * rank_doc[\"max_delta_volume\"], # convert to percentage\n", " # migration graph properties\n", - " \"migration_graph_found\":True if rank_doc[\"migration_graph\"] else False,\n", - " \"migration_graph\":{\"battery_id\":bid,\n", - " \"migration_graph\":rank_doc[\"migration_graph\"],\n", - " \"hop_cutoff\":rank_doc[\"hop_cutoff\"],\n", - " \"entries_for_generation\":rank_doc[\"entries_for_generation\"],\n", - " \"working_ion_entry\":rank_doc[\"working_ion_entry\"],\n", - " },\n", - " \"num_paths_found\":rank_doc[\"num_paths_found\"],\n", + " \"migration_graph_found\": True if rank_doc[\"migration_graph\"] else False,\n", + " \"migration_graph\": {\n", + " \"battery_id\": bid,\n", + " \"migration_graph\": rank_doc[\"migration_graph\"],\n", + " \"hop_cutoff\": rank_doc[\"hop_cutoff\"],\n", + " \"entries_for_generation\": rank_doc[\"entries_for_generation\"],\n", + " \"working_ion_entry\": rank_doc[\"working_ion_entry\"],\n", + " },\n", + " \"num_paths_found\": rank_doc[\"num_paths_found\"],\n", " }\n", - " \n", + "\n", " if aneb_doc is not None:\n", " # get aneb data for each hop\n", " aneb_wf_uuid = aneb_doc[\"wf_uuid\"]\n", " aneb_wf_data = {}\n", - " for aneb_hop_key,hop_key in aneb_doc[\"hop_combo_mapping\"].items():\n", + " for aneb_hop_key, hop_key in aneb_doc[\"hop_combo_mapping\"].items():\n", " combo = aneb_hop_key.split(\"+\")\n", " if len(combo) == 2:\n", " c = [int(combo[0]), int(combo[1])]\n", " data = [aneb_doc[\"end_points\"][c[0]]]\n", " if \"images\" not in aneb_doc.keys():\n", - " data.extend([{\"index\":i} for i in range(5)])\n", + " data.extend([{\"index\": i} for i in range(5)])\n", " else:\n", " if aneb_hop_key in aneb_doc[\"images\"]:\n", " data.extend(aneb_doc[\"images\"][aneb_hop_key])\n", " else:\n", - " data.extend([{\"index\":i} for i in range(5)])\n", + " data.extend([{\"index\": i} for i in range(5)])\n", " data.append(aneb_doc[\"end_points\"][c[1]])\n", - " aneb_wf_data.update({hop_key:data})\n", + " aneb_wf_data.update({hop_key: data})\n", " aneb_host = aneb_doc[\"host\"]\n", - " \n", + "\n", " # determine fraction of aneb data available\n", " total = 0\n", " complete = 0\n", - " for k,v in aneb_wf_data.items():\n", + " for k, v in aneb_wf_data.items():\n", " total += len(v)\n", " complete += len([i for i in v if \"output\" in i.keys()])\n", " aneb_wf_complete = complete / total\n", - " \n", + "\n", " else:\n", " aneb_wf_uuid = None\n", " aneb_host = None\n", " aneb_wf_data = None\n", " aneb_wf_complete = None\n", - " \n", + "\n", " # add aneb wf properties and data\n", - " contrib_doc.update({\n", - " \"aneb_wf_uuid\":aneb_wf_uuid,\n", - " \"aneb_wf_data\":{\"conversion_matrix\":rank_doc[\"conversion_matrix\"],\n", - " \"matrix_supercell_structure\":rank_doc[\"matrix_supercell_structure\"],\n", - " \"inserted_ion_coords\":rank_doc[\"inserted_ion_coords\"],\n", - " \"insert_coords_combo\":rank_doc[\"insert_coords_combo\"],\n", - " \"host_data\":aneb_host,\n", - " \"hop_data\":aneb_wf_data,\n", - " },\n", - " \"aneb_wf_complete\":aneb_wf_complete\n", - " })\n", - " \n", + " contrib_doc.update(\n", + " {\n", + " \"aneb_wf_uuid\": aneb_wf_uuid,\n", + " \"aneb_wf_data\": {\n", + " \"conversion_matrix\": rank_doc[\"conversion_matrix\"],\n", + " \"matrix_supercell_structure\": rank_doc[\"matrix_supercell_structure\"],\n", + " \"inserted_ion_coords\": rank_doc[\"inserted_ion_coords\"],\n", + " \"insert_coords_combo\": rank_doc[\"insert_coords_combo\"],\n", + " \"host_data\": aneb_host,\n", + " \"hop_data\": aneb_wf_data,\n", + " },\n", + " \"aneb_wf_complete\": aneb_wf_complete,\n", + " }\n", + " )\n", + "\n", " # clean-up formatting for MP Contribs\n", - " for k,v in contrib_doc.items():\n", + " for k, v in contrib_doc.items():\n", " if type(v) is bool:\n", " if v is True:\n", " contrib_doc[k] = \"yes\"\n", @@ -326,9 +340,9 @@ " contrib_doc[k] = str(v[0])\n", " elif len(v) > 1:\n", " contrib_doc[k] = \",\".join(str(i) for i in v)\n", - " \n", + "\n", " contrib_docs.append(contrib_doc)\n", - "print(len(contrib_docs),\"original\")" + "print(len(contrib_docs), \"original\")" ] }, { @@ -359,7 +373,7 @@ " else:\n", " docs.append(d)\n", "contrib_docs = docs\n", - "print(len(contrib_docs),\"split\")" + "print(len(contrib_docs), \"split\")" ] }, { @@ -384,15 +398,21 @@ "for doc in contrib_docs:\n", " identifier = doc[\"host_mp_ids\"][0] if doc[\"host_mp_ids\"] else doc[\"battery_id\"]\n", " formula = doc[\"formula\"]\n", - " contrib = {\"identifier\": identifier, \"formula\": formula, \"data\": {}, \"structures\": [], \"attachments\": []}\n", - " \n", + " contrib = {\n", + " \"identifier\": identifier,\n", + " \"formula\": formula,\n", + " \"data\": {},\n", + " \"structures\": [],\n", + " \"attachments\": [],\n", + " }\n", + "\n", " for k in structure_keys:\n", " sdct = doc.pop(k, None)\n", " if sdct:\n", " structure = Structure.from_dict(sdct)\n", " structure.name = k\n", " contrib[\"structures\"].append(structure)\n", - " \n", + "\n", " for k in attachment_keys:\n", " # skip attachments if not available\n", " if k == \"migration_graph\" and doc[\"migration_graph_found\"] == \"no\":\n", @@ -404,18 +424,20 @@ " if attm_dct:\n", " attm = Attachment.from_data(k, attm_dct)\n", " contrib[\"attachments\"].append(attm)\n", - " \n", - " clean = {k: v for k, v in doc.items() if k[0] != \"_\" and not isinstance(v, datetime)}\n", + "\n", + " clean = {\n", + " k: v for k, v in doc.items() if k[0] != \"_\" and not isinstance(v, datetime)\n", + " }\n", " raw = Attachment.from_data(\"raw\", clean)\n", " contrib[\"attachments\"].append(raw)\n", - " \n", + "\n", " flat_doc = flatten(clean, max_flatten_depth=2, reducer=\"dot\")\n", " for col, config in columns.items():\n", " value = flat_doc.get(col)\n", " if value:\n", " name, unit = config[\"name\"], config[\"unit\"]\n", " contrib[\"data\"][name] = f\"{value:.3g} {unit}\" if unit else value\n", - " \n", + "\n", " contrib[\"data\"] = unflatten(contrib[\"data\"], splitter=\"dot\")\n", " contributions.append({k: v for k, v in contrib.items() if v})\n", "\n", @@ -488,11 +510,11 @@ "metadata": {}, "outputs": [], "source": [ - "query = {\n", - " \"identifier\": \"mp-10093\"\n", - "}\n", - "fields = [\"identifier\",\"ICSD.ids\",\"attachments\"]\n", - "contribs = client.query_contributions(query=query, fields=fields, sort=\"identifier\", paginate=True)\n", + "query = {\"identifier\": \"mp-10093\"}\n", + "fields = [\"identifier\", \"ICSD.ids\", \"attachments\"]\n", + "contribs = client.query_contributions(\n", + " query=query, fields=fields, sort=\"identifier\", paginate=True\n", + ")\n", "pd.json_normalize(contribs[\"data\"])" ] }, @@ -541,10 +563,10 @@ "source": [ "# use migration graph to identify possible pathways\n", "mg.assign_cost_to_graph()\n", - "for n,path in mg.get_path():\n", - " print(\"path\",n)\n", + "for n, path in mg.get_path():\n", + " print(\"path\", n)\n", " for hop in path:\n", - " print(hop[\"ipos\"],hop[\"epos\"],hop[\"to_jimage\"])\n", + " print(hop[\"ipos\"], hop[\"epos\"], hop[\"to_jimage\"])\n", " print()" ] }, @@ -556,14 +578,18 @@ "outputs": [], "source": [ "# map ApproxNEB data onto migration graph\n", - "for k,v in aneb_data[\"hop_data\"].items():\n", + "for k, v in aneb_data[\"hop_data\"].items():\n", " sc_structs = [Structure.from_dict(i[\"input_structure\"]) for i in v]\n", " energies = [get(i, \"output.energy\") for i in v]\n", " add_edge_data_from_sc(\n", - " mg,i_sc=sc_structs[0],e_sc=sc_structs[-1],data_array=sc_structs,key=\"sc_structs\"\n", + " mg,\n", + " i_sc=sc_structs[0],\n", + " e_sc=sc_structs[-1],\n", + " data_array=sc_structs,\n", + " key=\"sc_structs\",\n", " )\n", " add_edge_data_from_sc(\n", - " mg,i_sc=sc_structs[0],e_sc=sc_structs[-1],data_array=energies,key=\"energies\"\n", + " mg, i_sc=sc_structs[0], e_sc=sc_structs[-1], data_array=energies, key=\"energies\"\n", " )" ] }, @@ -575,10 +601,10 @@ "outputs": [], "source": [ "# evaluate pathway energetics using ApproxNEB data\n", - "for n,path in mg.get_path():\n", - " #for hop in path:\n", - " #print(hop[\"ipos\"],hop[\"epos\"],hop[\"to_jimage\"])\n", - " energies = np.array([hop[\"energies\"] for hop in path],dtype=float)\n", + "for n, path in mg.get_path():\n", + " # for hop in path:\n", + " # print(hop[\"ipos\"],hop[\"epos\"],hop[\"to_jimage\"])\n", + " energies = np.array([hop[\"energies\"] for hop in path], dtype=float)\n", " path_barrier = 1000 * (energies.max() - energies.min())\n", " print(\"path\", n, \"ApproxNEB barrier\", round(path_barrier), \"meV\")" ] diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/mofexplorer.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/mofexplorer.ipynb index a9dc872a85..08413c8f15 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/mofexplorer.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/mofexplorer.ipynb @@ -87,7 +87,7 @@ "\n", " if value is None:\n", " raise ValueError(f\"failed parsing {v}\")\n", - " \n", + "\n", " return value, unit" ] }, @@ -108,7 +108,7 @@ "metadata": {}, "outputs": [], "source": [ - "client.init_columns({}) # force reset columns\n", + "client.init_columns({}) # force reset columns\n", "client.init_columns(columns)" ] }, @@ -130,14 +130,12 @@ "contributions = []\n", "\n", "for d in data:\n", - " contrib = {\n", - " \"identifier\": d[\"identifier\"], \"formula\": d[\"formula\"], \"data\": {}\n", - " }\n", - " \n", + " contrib = {\"identifier\": d[\"identifier\"], \"formula\": d[\"formula\"], \"data\": {}}\n", + "\n", " for k, v in flatten(d[\"data\"], reducer=\"dot\").items():\n", " value, unit = get_value_unit(v)\n", " contrib[f\"data.{k}\"] = f\"{value} {unit}\" if unit else value\n", - " \n", + "\n", " contributions.append(unflatten(contrib, splitter=\"dot\"))" ] }, diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ocp/ocp-update.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ocp/ocp-update.ipynb index a7bc713994..866af3cc99 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ocp/ocp-update.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ocp/ocp-update.ipynb @@ -28,7 +28,9 @@ "metadata": {}, "outputs": [], "source": [ - "df = read_pickle(\"/Users/patrick/GoogleDriveLBNL/MaterialsProject/gitrepos/mpcontribs-data/Actual_adsorption_Es.pkl\")" + "df = read_pickle(\n", + " \"/Users/patrick/GoogleDriveLBNL/MaterialsProject/gitrepos/mpcontribs-data/Actual_adsorption_Es.pkl\"\n", + ")" ] }, { @@ -73,7 +75,7 @@ "results = client.query_contributions(\n", " query=query,\n", " fields=[\"id\", \"identifier\", \"data.adsorptionEnergy.display\"],\n", - " paginate=True\n", + " paginate=True,\n", ")\n", "# TODO 3rd and 4th round of requests takes 30 min (totals & actual query)" ] @@ -98,7 +100,10 @@ "contributions = []\n", "\n", "for d in results[\"data\"]:\n", - " contrib = {\"id\": d[\"id\"], \"data.systemEnergy\": d[\"data\"][\"adsorptionEnergy\"][\"display\"]}\n", + " contrib = {\n", + " \"id\": d[\"id\"],\n", + " \"data.systemEnergy\": d[\"data\"][\"adsorptionEnergy\"][\"display\"],\n", + " }\n", " contrib[\"data.adsorptionEnergy\"] = adsorption[d[\"identifier\"]]\n", " contributions.append(contrib)" ] @@ -139,7 +144,7 @@ "\n", "# if path == \"adsorptionEnergy\":\n", "# new_columns[\"systemEnergy\"] = unit\n", - " \n", + "\n", "# new_columns" ] }, diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ocp/ocp-upload.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ocp/ocp-upload.ipynb index 7f82031902..c72041478e 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ocp/ocp-upload.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ocp/ocp-upload.ipynb @@ -48,24 +48,27 @@ "source": [ "decoder = MontyDecoder()\n", "\n", + "\n", "def get_contribution(path):\n", - " \n", + "\n", " if path.stat().st_size / 1024 / 1024 > 15:\n", " return None\n", - " \n", + "\n", " with gzip.open(path) as f:\n", " data = decoder.process_decoded(load(f))\n", - " \n", - " struct = data['trajectory'][-1]\n", - " struct.add_site_property('tags', [int(t) for t in data['tags']])\n", "\n", - " mol = Molecule.from_sites([site for site in struct if site.properties['tags'] == 2])\n", + " struct = data[\"trajectory\"][-1]\n", + " struct.add_site_property(\"tags\", [int(t) for t in data[\"tags\"]])\n", + "\n", + " mol = Molecule.from_sites([site for site in struct if site.properties[\"tags\"] == 2])\n", " iupac_formula = mol.composition.iupac_formula\n", - " bulk_struct = Structure.from_sites([site for site in struct if site.properties['tags'] != 2])\n", + " bulk_struct = Structure.from_sites(\n", + " [site for site in struct if site.properties[\"tags\"] != 2]\n", + " )\n", " bulk_formula = bulk_struct.composition.reduced_formula\n", "\n", " search_data = {\n", - " \"mpid\": data['bulk_id'],\n", + " \"mpid\": data[\"bulk_id\"],\n", " \"adsorptionEnergy\": data[\"adsorption_energy\"],\n", " # TODO systemEnergy?\n", " \"adsorbateSmiles\": data[\"adsorbate_smiles\"],\n", @@ -75,7 +78,7 @@ " \"k\": data[\"surface_miller_indices\"][1],\n", " \"l\": data[\"surface_miller_indices\"][2],\n", " \"surfaceTop\": data[\"surface_top\"],\n", - " \"surfaceShift\": data[\"surface_shift\"]\n", + " \"surfaceShift\": data[\"surface_shift\"],\n", " }\n", "\n", " return {\n", @@ -83,7 +86,7 @@ " \"identifier\": data[\"id\"],\n", " \"data\": search_data,\n", " \"structures\": [struct],\n", - " \"attachments\": [path]\n", + " \"attachments\": [path],\n", " }" ] }, @@ -140,14 +143,14 @@ " contrib = get_contribution(path)\n", " if not contrib:\n", " continue\n", - " \n", + "\n", " contributions.append(contrib)\n", " cnt += 1\n", - " \n", + "\n", " if not cnt % 2000:\n", " client.submit_contributions(contributions, **kwargs)\n", " contributions.clear()\n", - " \n", + "\n", "if contributions:\n", " client.submit_contributions(contributions, **kwargs)\n", "\n", diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/open_catalyst_project.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/open_catalyst_project.ipynb index 25f34580fc..8eb3de6f2c 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/open_catalyst_project.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/open_catalyst_project.ipynb @@ -56,17 +56,20 @@ "metadata": {}, "outputs": [], "source": [ - "client.init_columns(name, {\n", - " \"id\": None, # id\n", - " \"energy\": \"meV\", # adsorption_energy\n", - " \"smiles\": None, # adsorbate_smiles\n", - " \"formulas.IUPAC\": None,\n", - " \"formulas.bulk\": None,\n", - " \"formulas.trajectory\": None,\n", - " \"surface.miller\": None,\n", - " \"surface.top\": None,\n", - " \"surface.shift\": \"\"\n", - "})" + "client.init_columns(\n", + " name,\n", + " {\n", + " \"id\": None, # id\n", + " \"energy\": \"meV\", # adsorption_energy\n", + " \"smiles\": None, # adsorbate_smiles\n", + " \"formulas.IUPAC\": None,\n", + " \"formulas.bulk\": None,\n", + " \"formulas.trajectory\": None,\n", + " \"surface.miller\": None,\n", + " \"surface.top\": None,\n", + " \"surface.shift\": \"\",\n", + " },\n", + ")" ] }, { @@ -76,7 +79,9 @@ "metadata": {}, "outputs": [], "source": [ - "p = Path(\"/Users/patrick/GoogleDriveLBNL/MaterialsProject/gitrepos/mpcontribs-data/ocp-sample\")\n", + "p = Path(\n", + " \"/Users/patrick/GoogleDriveLBNL/MaterialsProject/gitrepos/mpcontribs-data/ocp-sample\"\n", + ")\n", "jsons = list(p.glob(\"*.json.gz\"))" ] }, @@ -90,29 +95,33 @@ "def get_miller(indices):\n", " return f\"[{indices[0]}{indices[1]}{indices[2]}]\"\n", "\n", + "\n", "def get_contribution(path):\n", - " \n", + "\n", " if path.stat().st_size / 1024 < 150:\n", - " \n", " data = loadfn(path)\n", - " struct = data['trajectory'][-1]\n", - " struct.add_site_property('tags', [int(t) for t in data['tags']])\n", + " struct = data[\"trajectory\"][-1]\n", + " struct.add_site_property(\"tags\", [int(t) for t in data[\"tags\"]])\n", "\n", - " mol = Molecule.from_sites([site for site in struct if site.properties['tags'] == 2])\n", + " mol = Molecule.from_sites(\n", + " [site for site in struct if site.properties[\"tags\"] == 2]\n", + " )\n", " iupac_formula = mol.composition.iupac_formula\n", - " bulk_struct = Structure.from_sites([site for site in struct if site.properties['tags'] != 2])\n", + " bulk_struct = Structure.from_sites(\n", + " [site for site in struct if site.properties[\"tags\"] != 2]\n", + " )\n", " bulk_formula = bulk_struct.composition.reduced_formula\n", "\n", " search_data = {\n", - " \"id\": data['id'],\n", - " \"energy\": f'{data[\"adsorption_energy\"]} meV',\n", + " \"id\": data[\"id\"],\n", + " \"energy\": f\"{data['adsorption_energy']} meV\",\n", " \"smiles\": data[\"adsorbate_smiles\"],\n", " \"formulas.IUPAC\": iupac_formula,\n", " \"formulas.bulk\": bulk_formula,\n", " \"formulas.trajectory\": struct.composition.reduced_formula,\n", " \"surface.miller\": get_miller(data[\"surface_miller_indices\"]),\n", " \"surface.top\": str(data[\"surface_top\"]),\n", - " \"surface.shift\": data[\"surface_shift\"]\n", + " \"surface.shift\": data[\"surface_shift\"],\n", " }\n", "\n", " contribution = {\n", @@ -120,7 +129,7 @@ " \"identifier\": data[\"bulk_id\"],\n", " \"data\": search_data,\n", " \"structures\": [struct],\n", - " \"attachments\": [path]\n", + " \"attachments\": [path],\n", " }\n", "\n", " return contribution" @@ -157,7 +166,7 @@ "all_ids = client.get_all_ids(\n", " {\"project\": name},\n", " include=[\"structures\", \"attachments\"],\n", - " data_id_fields={name: \"id\"}\n", + " data_id_fields={name: \"id\"},\n", ").get(name)" ] }, diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/perovskites_diffusion.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/perovskites_diffusion.ipynb index 026d09bec2..95d05e6214 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/perovskites_diffusion.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/perovskites_diffusion.ipynb @@ -110,7 +110,7 @@ " contcar_path = \"bulk_CONTCARs/{}_CONTCAR\".format(\n", " data[\"directory\"].replace(\"/\", \"_\")\n", " )\n", - " contcar = contcars.extractfile(contcar_path).read().decode(\"utf8\") \n", + " contcar = contcars.extractfile(contcar_path).read().decode(\"utf8\")\n", " structure = Structure.from_str(contcar, \"poscar\", sort=True)\n", "\n", " if identifier is None:\n", @@ -129,11 +129,16 @@ " data[key] = val\n", "\n", " if identifier:\n", - " contributions.append({\n", - " \"project\": name, \"identifier\": identifier, \"is_public\": True,\n", - " \"data\": data, \"structures\": [structure]\n", - " })\n", - " \n", + " contributions.append(\n", + " {\n", + " \"project\": name,\n", + " \"identifier\": identifier,\n", + " \"is_public\": True,\n", + " \"data\": data,\n", + " \"structures\": [structure],\n", + " }\n", + " )\n", + "\n", "len(contributions)" ] }, diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/pycroscopy.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/pycroscopy.ipynb index 99f10a538d..5e42a07812 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/pycroscopy.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/pycroscopy.ipynb @@ -13,6 +13,7 @@ "import matplotlib.pyplot as plt\n", "import torch\n", "from atomai.utils import graphx\n", + "\n", "%matplotlib inline" ] }, @@ -29,7 +30,7 @@ "model_path = f\"{data_dir}/G_MD.tar\"\n", "model = aoi.load_model(model_path)\n", "# model as dict\n", - "device = 'cuda' if torch.cuda.is_available() else 'cpu'\n", + "device = \"cuda\" if torch.cuda.is_available() else \"cpu\"\n", "model_dict = torch.load(model_path, map_location=device)" ] }, @@ -59,20 +60,22 @@ "# model.predict(imgdata, resize=(new_height, new_width))\n", "\n", "map_dict = {0: \"C\", 1: \"Si\"} # classes to chemical elements\n", - "px2ang = 0.104 # pixel-to-angstrom conversion\n", - "coord = coords[0] # take the first (and the only one) frame\n", - "clusters = graphx.find_cycle_clusters(coord, cycles=[5,7], map_dict=map_dict, px2ang=px2ang)\n", + "px2ang = 0.104 # pixel-to-angstrom conversion\n", + "coord = coords[0] # take the first (and the only one) frame\n", + "clusters = graphx.find_cycle_clusters(\n", + " coord, cycles=[5, 7], map_dict=map_dict, px2ang=px2ang\n", + ")\n", "fig, ax = plt.subplots(1, 1, figsize=figsize)\n", - "ax.imshow(imgdata, cmap='gray', origin='lower')\n", + "ax.imshow(imgdata, cmap=\"gray\", origin=\"lower\")\n", "\n", "for i, cl in enumerate(clusters):\n", - " ax.scatter(cl[:, 1], cl[:, 0], s=2, color='red')\n", + " ax.scatter(cl[:, 1], cl[:, 0], s=2, color=\"red\")\n", " xt = int(np.mean(cl[:, 1]))\n", " yt = int(np.mean(cl[:, 0]))\n", - " ax.annotate(str(i+1), (xt, yt), size=10, color='white')\n", - " \n", + " ax.annotate(str(i + 1), (xt, yt), size=10, color=\"white\")\n", + "\n", "img_path_clusters = imgdata_path.replace(\".npy\", \"_clusters.png\")\n", - "plt.savefig(img_path_clusters, bbox_inches='tight')" + "plt.savefig(img_path_clusters, bbox_inches=\"tight\")" ] }, { @@ -83,20 +86,20 @@ "outputs": [], "source": [ "clusters_mod = []\n", - "#adding a column for C atom as class 0\n", + "# adding a column for C atom as class 0\n", "pad_ = 1\n", "for i in range(len(clusters)):\n", - " clusters[i] = np.pad(clusters[i], (0, pad_), 'constant')\n", + " clusters[i] = np.pad(clusters[i], (0, pad_), \"constant\")\n", " clusters[i] = clusters[i][:-1]\n", " clusters_mod.append(clusters[i])\n", - " \n", - "#we can also save all the defects per image frame\n", + "\n", + "# we can also save all the defects per image frame\n", "defect_num = 15\n", "coords_def_15 = {0: clusters_mod[defect_num]}\n", - "plt.scatter(coords_def_15[0][:,1], coords_def_15[0][:,0])\n", + "plt.scatter(coords_def_15[0][:, 1], coords_def_15[0][:, 0])\n", "\n", "img_path_defects = imgdata_path.replace(\".npy\", \"_defects.png\")\n", - "plt.savefig(img_path_defects, bbox_inches='tight')" + "plt.savefig(img_path_defects, bbox_inches=\"tight\")" ] }, { @@ -134,10 +137,7 @@ "outputs": [], "source": [ "imgdata_list = list(imgdata.tolist())\n", - "model_dict[\"weights\"] = {\n", - " k: v.tolist()\n", - " for k, v in model_dict[\"weights\"].items()\n", - "}" + "model_dict[\"weights\"] = {k: v.tolist() for k, v in model_dict[\"weights\"].items()}" ] }, { @@ -147,13 +147,18 @@ "metadata": {}, "outputs": [], "source": [ - "contributions = [{\n", - " \"identifier\": \"mp-7576\", # CrSi on MP\n", - " \"data\": {\"clusters\": len(clusters)},\n", - " \"attachments\": Attachments.from_list([\n", - " img_path_clusters, img_path_defects, #imgdata_list, model_dict,\n", - " ])\n", - "}]" + "contributions = [\n", + " {\n", + " \"identifier\": \"mp-7576\", # CrSi on MP\n", + " \"data\": {\"clusters\": len(clusters)},\n", + " \"attachments\": Attachments.from_list(\n", + " [\n", + " img_path_clusters,\n", + " img_path_defects, # imgdata_list, model_dict,\n", + " ]\n", + " ),\n", + " }\n", + "]" ] }, { diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/pydatarecognition.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/pydatarecognition.ipynb index 4f1d69e8b4..22b459f9bb 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/pydatarecognition.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/pydatarecognition.ipynb @@ -65,23 +65,42 @@ "source": [ "# calculated cifs (NOTE make sure to gzip all CIFs)\n", "contributions = []\n", - "columns = {\"type\": None, \"date\": None, \"wavelength\": \"Å\"} # sets fields and their units\n", + "columns = {\"type\": None, \"date\": None, \"wavelength\": \"Å\"} # sets fields and their units\n", "\n", "for path in (cifs / \"calculated\").iterdir():\n", " for identifier, v in CifParser(path).as_dict().items():\n", " typ, date = v[\"_publcif_pd_cifplot\"].strip().split()\n", - " wavelength = f'{v[\"_diffrn_radiation_wavelength\"]} Å'\n", + " wavelength = f\"{v['_diffrn_radiation_wavelength']} Å\"\n", " intensities = v[\"_pd_calc_intensity_total\"]\n", " prefix, nbins = \"_pd_proc_2theta_range\", len(intensities)\n", - " inc, start, end = float(v[f\"{prefix}_inc\"]), float(v[f\"{prefix}_min\"]), float(v[f\"{prefix}_max\"])\n", - " two_theta = np.arange(0, end, inc) # BUG? getting 1999 bins for start=0.02 (converted to Q)\n", - " spectrum = DataFrame({\"2θ\": two_theta, \"intensity\": intensities}).set_index(\"2θ\")\n", - " spectrum.attrs = {\"name\": \"powder diffraction\", \"title\": \"Powder Diffraction Pattern\"}\n", - " contributions.append({\n", - " \"identifier\": identifier, \"formula\": v[\"_chemical_formula\"],\n", - " \"data\": {\"type\": typ, \"date\": date, \"wavelength\": wavelength, \"proc\": d[\"proc\"]},\n", - " #\"tables\": [spectrum], \"attachments\": [path]\n", - " })\n", + " inc, start, end = (\n", + " float(v[f\"{prefix}_inc\"]),\n", + " float(v[f\"{prefix}_min\"]),\n", + " float(v[f\"{prefix}_max\"]),\n", + " )\n", + " two_theta = np.arange(\n", + " 0, end, inc\n", + " ) # BUG? getting 1999 bins for start=0.02 (converted to Q)\n", + " spectrum = DataFrame({\"2θ\": two_theta, \"intensity\": intensities}).set_index(\n", + " \"2θ\"\n", + " )\n", + " spectrum.attrs = {\n", + " \"name\": \"powder diffraction\",\n", + " \"title\": \"Powder Diffraction Pattern\",\n", + " }\n", + " contributions.append(\n", + " {\n", + " \"identifier\": identifier,\n", + " \"formula\": v[\"_chemical_formula\"],\n", + " \"data\": {\n", + " \"type\": typ,\n", + " \"date\": date,\n", + " \"wavelength\": wavelength,\n", + " \"proc\": d[\"proc\"],\n", + " },\n", + " # \"tables\": [spectrum], \"attachments\": [path]\n", + " }\n", + " )\n", "\n", "len(contributions)" ] @@ -105,7 +124,7 @@ "client.init_columns(columns)\n", "client.submit_contributions(contributions, ignore_dupes=True, per_request=6)\n", "# this shouldn't be necessary but need to re-init columns likely due to bug in API server\n", - "client.init_columns(columns) \n", + "client.init_columns(columns)\n", "\n", "# NOTE submit_contributions can also be used to submit partial updates (can provide example in the future)" ] @@ -149,7 +168,9 @@ "metadata": {}, "outputs": [], "source": [ - "attm = client.get_attachment(result[\"data\"][0][\"attachments\"][0][\"id\"]) # use attm.unpack() to get file contents" + "attm = client.get_attachment(\n", + " result[\"data\"][0][\"attachments\"][0][\"id\"]\n", + ") # use attm.unpack() to get file contents" ] }, { @@ -159,7 +180,7 @@ "metadata": {}, "outputs": [], "source": [ - "table = client.get_table(result[\"data\"][0][\"tables\"][0][\"id\"]) # pandas Dataframe" + "table = client.get_table(result[\"data\"][0][\"tables\"][0][\"id\"]) # pandas Dataframe" ] }, { diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/qsgw_band_structures.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/qsgw_band_structures.ipynb index 33623c3aa5..d52783dd71 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/qsgw_band_structures.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/qsgw_band_structures.ipynb @@ -11,6 +11,7 @@ "# - set environment variable MPCONTRIBS_API_KEY to API key\n", "# - more info about client functions in according docstrings\n", "from mpcontribs.client import Client\n", + "\n", "name = \"qsgw_band_structures\"\n", "client = Client(project=name)" ] @@ -39,87 +40,68 @@ "source": [ "contributions = [\n", " {\n", - " 'identifier': 'mp-1020712', # ZnSiN2\n", - " 'data': {\n", - " 'reference': 'https://doi.org/10.1103/PhysRevB.84.165204',\n", - " 'Γ': {\n", - " 'ΔE': {\n", - " 'indirect': '5.70 eV',\n", - " 'direct': '5.92 eV'\n", - " },\n", - " 'VBM': {\n", - " 'b₁': '0',\n", - " 'a₂': '-20 meV',\n", - " 'b₂': '-40 meV',\n", - " 'a₁': '-180 meV'\n", - " }\n", - " }\n", - " }\n", - " }, {\n", - " 'identifier': 'mp-2979', # ZnGeN2\n", - " 'data': {\n", - " 'reference': 'https://doi.org/10.1103/PhysRevB.84.165204',\n", - " 'Γ': {\n", - " 'ΔE': {'direct': '3.60 eV'},\n", - " 'VBM': {\n", - " 'b₁': '0',\n", - " 'b₂': '-28 meV',\n", - " 'a₁': '-129 meV'\n", - " }\n", - " }\n", - " }\n", - " }, {\n", - " 'identifier': 'mp-1029469', # ZnSnN2\n", - " 'data': {\n", - " 'reference': 'https://doi.org/10.1103/PhysRevB.91.205207',\n", - " 'Γ': {\n", - " 'ΔE': {'direct': '1.82 eV'},\n", - " 'VBM': {\n", - " 'b₁': '0',\n", - " 'b₂': '-188 meV',\n", - " 'a₁': '-176 meV'\n", - " }\n", - " }\n", - " }\n", - " }, {\n", - " 'identifier': 'mp-3677', # MgSiN2\n", - " 'data': {\n", - " 'reference': 'https://doi.org/10.1103/PhysRevB.94.125201',\n", - " 'Γ': {\n", - " 'ΔE': {\n", - " 'indirect': '6.08 eV',\n", - " 'direct': '6.53 eV',\n", - " 'direct3x4x4': '6.30 eV'\n", - " }\n", - " }\n", - " }\n", - " }, {\n", - " 'identifier': 'mp-7798', # MgGeN2\n", - " 'data': {\n", - " 'reference': 'https://doi.org/10.1016/j.ssc.2019.113664',\n", - " 'Γ' : {\n", - " 'ΔE': {'direct': '4.11 eV'},\n", - " 'VBM': {\n", - " 'b₁': '0',\n", - " 'b₂': '-82 meV',\n", - " 'a₁': '-238 meV'\n", - " }\n", - " }\n", - " }\n", - " }, {\n", - " 'identifier': 'mp-1029791', # MgSnN2\n", - " 'data': {\n", - " 'reference': 'https://doi.org/10.1016/j.ssc.2019.113664',\n", - " 'Γ' : {\n", - " 'ΔE': {'direct': '2.28 eV'},\n", - " 'VBM': {\n", - " 'b₁': '0',\n", - " 'b₂': '-116 meV',\n", - " 'a₁': '-144 meV'\n", + " \"identifier\": \"mp-1020712\", # ZnSiN2\n", + " \"data\": {\n", + " \"reference\": \"https://doi.org/10.1103/PhysRevB.84.165204\",\n", + " \"Γ\": {\n", + " \"ΔE\": {\"indirect\": \"5.70 eV\", \"direct\": \"5.92 eV\"},\n", + " \"VBM\": {\"b₁\": \"0\", \"a₂\": \"-20 meV\", \"b₂\": \"-40 meV\", \"a₁\": \"-180 meV\"},\n", + " },\n", + " },\n", + " },\n", + " {\n", + " \"identifier\": \"mp-2979\", # ZnGeN2\n", + " \"data\": {\n", + " \"reference\": \"https://doi.org/10.1103/PhysRevB.84.165204\",\n", + " \"Γ\": {\n", + " \"ΔE\": {\"direct\": \"3.60 eV\"},\n", + " \"VBM\": {\"b₁\": \"0\", \"b₂\": \"-28 meV\", \"a₁\": \"-129 meV\"},\n", + " },\n", + " },\n", + " },\n", + " {\n", + " \"identifier\": \"mp-1029469\", # ZnSnN2\n", + " \"data\": {\n", + " \"reference\": \"https://doi.org/10.1103/PhysRevB.91.205207\",\n", + " \"Γ\": {\n", + " \"ΔE\": {\"direct\": \"1.82 eV\"},\n", + " \"VBM\": {\"b₁\": \"0\", \"b₂\": \"-188 meV\", \"a₁\": \"-176 meV\"},\n", + " },\n", + " },\n", + " },\n", + " {\n", + " \"identifier\": \"mp-3677\", # MgSiN2\n", + " \"data\": {\n", + " \"reference\": \"https://doi.org/10.1103/PhysRevB.94.125201\",\n", + " \"Γ\": {\n", + " \"ΔE\": {\n", + " \"indirect\": \"6.08 eV\",\n", + " \"direct\": \"6.53 eV\",\n", + " \"direct3x4x4\": \"6.30 eV\",\n", " }\n", - " }\n", - " }\n", - " }\n", + " },\n", + " },\n", + " },\n", + " {\n", + " \"identifier\": \"mp-7798\", # MgGeN2\n", + " \"data\": {\n", + " \"reference\": \"https://doi.org/10.1016/j.ssc.2019.113664\",\n", + " \"Γ\": {\n", + " \"ΔE\": {\"direct\": \"4.11 eV\"},\n", + " \"VBM\": {\"b₁\": \"0\", \"b₂\": \"-82 meV\", \"a₁\": \"-238 meV\"},\n", + " },\n", + " },\n", + " },\n", + " {\n", + " \"identifier\": \"mp-1029791\", # MgSnN2\n", + " \"data\": {\n", + " \"reference\": \"https://doi.org/10.1016/j.ssc.2019.113664\",\n", + " \"Γ\": {\n", + " \"ΔE\": {\"direct\": \"2.28 eV\"},\n", + " \"VBM\": {\"b₁\": \"0\", \"b₂\": \"-116 meV\", \"a₁\": \"-144 meV\"},\n", + " },\n", + " },\n", + " },\n", "]" ] }, @@ -147,16 +129,18 @@ "outputs": [], "source": [ "# [optional] initialize columns to explicitly set order, visibility and units\n", - "client.init_columns(columns={\n", - " \"reference\": None,\n", - " \"Γ.ΔE.direct\": \"eV\",\n", - " \"Γ.ΔE.direct3x4x4\": \"eV\",\n", - " \"Γ.ΔE.indirect\": \"eV\",\n", - " \"Γ.VBM.a₁\": \"meV\",\n", - " \"Γ.VBM.a₂\": \"meV\",\n", - " \"Γ.VBM.b₁\": \"\",\n", - " \"Γ.VBM.b₂\": \"meV\",\n", - "})" + "client.init_columns(\n", + " columns={\n", + " \"reference\": None,\n", + " \"Γ.ΔE.direct\": \"eV\",\n", + " \"Γ.ΔE.direct3x4x4\": \"eV\",\n", + " \"Γ.ΔE.indirect\": \"eV\",\n", + " \"Γ.VBM.a₁\": \"meV\",\n", + " \"Γ.VBM.a₂\": \"meV\",\n", + " \"Γ.VBM.b₁\": \"\",\n", + " \"Γ.VBM.b₂\": \"meV\",\n", + " }\n", + ")" ] } ], diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/screening_inorganic_pv.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/screening_inorganic_pv.ipynb index cb9e56014f..b41e2dc9ed 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/screening_inorganic_pv.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/screening_inorganic_pv.ipynb @@ -41,7 +41,7 @@ " \"summary\": \"SUMMARY.json\",\n", " \"absorption\": \"ABSORPTION-CLIPPED.json\",\n", " \"dos\": \"DOS.json\",\n", - " \"formulae\": \"FORMATTED-FORMULAE.json\"\n", + " \"formulae\": \"FORMATTED-FORMULAE.json\",\n", "}\n", "data = {}\n", "\n", @@ -49,7 +49,7 @@ " path = indir / v\n", " with path.open(mode=\"r\") as f:\n", " data[k] = json.load(f)\n", - " \n", + "\n", "for k, v in data.items():\n", " print(k, len(v))" ] @@ -74,7 +74,7 @@ " \"E_g_d\": {\"path\": \"ΔE.direct\", \"unit\": \"eV\"},\n", " \"E_g_da\": {\"path\": \"ΔE.dipole\", \"unit\": \"eV\"},\n", " \"m_e\": {\"path\": \"mᵉ\", \"unit\": \"mₑ\"},\n", - " \"m_h\": {\"path\": \"mʰ\", \"unit\": \"mₑ\"}\n", + " \"m_h\": {\"path\": \"mʰ\", \"unit\": \"mₑ\"},\n", "}\n", "columns = {c[\"path\"]: c[\"unit\"] for c in config.values()}\n", "contributions = []\n", @@ -82,28 +82,28 @@ "for mp_id, d in data[\"summary\"].items():\n", " formula = data[\"formulae\"][mp_id].replace(\"\", \"\").replace(\"\", \"\")\n", " contrib = {\"project\": name, \"identifier\": mp_id, \"data\": {\"formula\": formula}}\n", - " cdata = {v[\"path\"]: f'{d[k]} {v[\"unit\"]}' for k, v in config.items()}\n", + " cdata = {v[\"path\"]: f\"{d[k]} {v['unit']}\" for k, v in config.items()}\n", " contrib[\"data\"] = unflatten(cdata)\n", - " \n", + "\n", " df_abs = DataFrame(data=data[\"absorption\"][mp_id])\n", " df_abs.columns = [\"hν [eV]\", \"α [cm⁻¹]\"]\n", " df_abs.set_index(\"hν [eV]\", inplace=True)\n", - " df_abs.columns.name = \"\" # legend name\n", + " df_abs.columns.name = \"\" # legend name\n", " df_abs.attrs[\"name\"] = \"absorption\"\n", " df_abs.attrs[\"title\"] = \"optical absorption spectrum\"\n", " df_abs.attrs[\"labels\"] = {\"variable\": \"\", \"value\": \"α [cm⁻¹]\"}\n", "\n", " df_dos = DataFrame(data=data[\"dos\"][mp_id])\n", - " df_dos.columns = ['E [eV]', 'DOS [eV⁻¹]']\n", + " df_dos.columns = [\"E [eV]\", \"DOS [eV⁻¹]\"]\n", " df_dos.set_index(\"E [eV]\", inplace=True)\n", - " df_dos.columns.name = \"\" # legend name\n", + " df_dos.columns.name = \"\" # legend name\n", " df_dos.attrs[\"name\"] = \"DOS\"\n", " df_dos.attrs[\"title\"] = \"electronic density of states\"\n", " df_dos.attrs[\"labels\"] = {\"variable\": \"\", \"value\": \"DOS [eV⁻¹]\"}\n", "\n", " contrib[\"tables\"] = [df_abs, df_dos]\n", " contributions.append(contrib)\n", - " \n", + "\n", "len(contributions)" ] }, diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/silicon_defects.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/silicon_defects.ipynb index b03018e553..159beb7221 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/silicon_defects.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/silicon_defects.ipynb @@ -57,13 +57,13 @@ " \"mu\": {\"field\": \"mu\", \"unit\": \"\"},\n", " \"spin\": {\"field\": \"spin\", \"unit\": \"\"},\n", " \"ks_diff\": {\"field\": \"ks|diff\", \"unit\": \"\"},\n", - " \"hse0_ks_diff\": {\"field\": \"ks|diff\", \"unit\": \"\"}, # can map to same subkey\n", + " \"hse0_ks_diff\": {\"field\": \"ks|diff\", \"unit\": \"\"}, # can map to same subkey\n", " \"shuffle\": {\"field\": \"shuffle\", \"unit\": None},\n", " \"in_band_transition\": {\"field\": \"transition\", \"unit\": None},\n", " \"missing_vbm\": {\"field\": \"VBM|missing\", \"unit\": None},\n", " \"initial_band\": {\"field\": \"band.initial\", \"unit\": \"\"},\n", " \"final_band\": {\"field\": \"band.final\", \"unit\": \"\"},\n", - " \"inital_band_e\": {\"field\": \"band|e.initial\", \"unit\": \"\"}, # typo in data!\n", + " \"inital_band_e\": {\"field\": \"band|e.initial\", \"unit\": \"\"}, # typo in data!\n", " \"final_band_e\": {\"field\": \"band|e.final\", \"unit\": \"\"},\n", " \"initial_ipr\": {\"field\": \"ipr.initial\", \"unit\": \"\"},\n", " \"final_ipr\": {\"field\": \"ipr.final\", \"unit\": \"\"},\n", @@ -71,9 +71,9 @@ "}\n", "\n", "reorg = {\n", - " \"is_complex\": {\"field\": \"complex\", \"unit\": None}, # str\n", + " \"is_complex\": {\"field\": \"complex\", \"unit\": None}, # str\n", " \"dopant\": {\"field\": \"dopant\", \"unit\": None},\n", - " \"charge\": {\"field\": \"charge\", \"unit\": \"\"}, # dimensionless\n", + " \"charge\": {\"field\": \"charge\", \"unit\": \"\"}, # dimensionless\n", " \"uncorrected_energy\": {\"field\": \"energy|uncorrected\", \"unit\": \"eV\"},\n", " \"chemsys\": {\"field\": \"chemsys\", \"unit\": None},\n", " \"space_group\": {\"field\": \"spacegroup\", \"unit\": None},\n", @@ -97,12 +97,12 @@ "for k, v in list(reorg.items()):\n", " if not \"unit\" in v:\n", " root_field = reorg.pop(k).get(\"field\")\n", - " \n", + "\n", " for kk, vv in excitation_reorg.items():\n", " new_key = f\"{k}.{kk}\"\n", " new_field = f\"{root_field}.{vv['field']}\"\n", " reorg[new_key] = {\"field\": new_field, \"unit\": vv[\"unit\"]}\n", - " \n", + "\n", "columns = {v[\"field\"]: v[\"unit\"] for k, v in reorg.items()}\n", "client.init_columns(columns)" ] @@ -117,7 +117,7 @@ "def convert(x, unit=None):\n", " if isinstance(x, bool):\n", " return \"Yes\" if x else \"No\"\n", - " \n", + "\n", " return x if not unit else f\"{x} {unit}\"" ] }, @@ -131,8 +131,13 @@ "contributions = []\n", "structure_keys = [\"initial_defect_structure\", \"final_defect_structure\"]\n", "attm_keys = [\n", - " 'int_eigenvalues', 'raw_eigenvalues', 'ipr', 'defect_ipr', 'raw_tdm_entry',\n", - " 'hse0_raw_eigenvalues', 'hse0_int_eigenvalues'\n", + " \"int_eigenvalues\",\n", + " \"raw_eigenvalues\",\n", + " \"ipr\",\n", + " \"defect_ipr\",\n", + " \"raw_tdm_entry\",\n", + " \"hse0_raw_eigenvalues\",\n", + " \"hse0_int_eigenvalues\",\n", "]\n", "remove_keys = [\"_id\", \"defect_dir\"]\n", "id_key = \"entry_id\"\n", @@ -142,23 +147,26 @@ "\n", "for r in raw:\n", " contrib = {\n", - " \"identifier\": f\"entry-{r[id_key]}\", \"formula\": r[formula_key],\n", - " \"data\": {}, \"structures\": [], \"attachments\": []\n", + " \"identifier\": f\"entry-{r[id_key]}\",\n", + " \"formula\": r[formula_key],\n", + " \"data\": {},\n", + " \"structures\": [],\n", + " \"attachments\": [],\n", " }\n", - " \n", + "\n", " for k, v in flatten(r, reducer=\"dot\").items():\n", " if k.split(\".\", 1)[0] not in skip_keys:\n", " contrib[\"data\"][reorg[k][\"field\"]] = convert(v, unit=reorg[k][\"unit\"])\n", - " \n", + "\n", " for k in structure_keys:\n", " s = Structure.from_dict(r[k])\n", " s.name = k\n", " contrib[\"structures\"].append(s)\n", - " \n", + "\n", " for k in attm_keys:\n", " a = Attachment.from_data(k, json.loads(r[k]))\n", - " contrib[\"attachments\"].append(a) \n", - " \n", + " contrib[\"attachments\"].append(a)\n", + "\n", " contributions.append(contrib)\n", "\n", "len(contributions)" diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/simple_test.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/simple_test.ipynb index 08070737a4..d8e5f2db93 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/simple_test.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/simple_test.ipynb @@ -12,7 +12,7 @@ "\n", "client = Client(\n", " host=\"localhost.workshop-contribs-api.materialsproject.org\",\n", - " apikey=\"uZ0vulA09IBtqcGk9U5OYRNt6elCzETM\"\n", + " apikey=\"uZ0vulA09IBtqcGk9U5OYRNt6elCzETM\",\n", ")" ] }, @@ -28,13 +28,16 @@ " \"formula__contains\": \"Au\",\n", " \"data__PF__p__value__lt\": 10,\n", " \"data__PF__n__value__gt\": 1,\n", - "\n", - " \"_sort\": \"-data.S.n.value\", # descending order\n", - " \"_limit\": 170, # up to maximum 500 per request\n", + " \"_sort\": \"-data.S.n.value\", # descending order\n", + " \"_limit\": 170, # up to maximum 500 per request\n", " \"_fields\": [\n", - " \"identifier\", \"formula\", \"data.metal\",\n", - " \"data.S.n.value\", \"data.S.p.value\",\n", - " \"data.PF.n.value\", \"data.PF.p.value\"\n", + " \"identifier\",\n", + " \"formula\",\n", + " \"data.metal\",\n", + " \"data.S.n.value\",\n", + " \"data.S.p.value\",\n", + " \"data.PF.n.value\",\n", + " \"data.PF.p.value\",\n", " ],\n", "}" ] @@ -51,13 +54,11 @@ "\n", "while has_more:\n", " print(\"page\", page)\n", - " resp = client.contributions.get_entries(\n", - " page=page, **query\n", - " ).result()\n", + " resp = client.contributions.get_entries(page=page, **query).result()\n", " contributions += resp[\"data\"]\n", " has_more = resp[\"has_more\"]\n", " page += 1\n", - " \n", + "\n", "len(contributions)" ] }, @@ -79,15 +80,17 @@ "outputs": [], "source": [ "name = \"ws_phuck\"\n", - "client.projects.create_entry(project={\n", - " \"name\": name,\n", - " \"title\": \"Workshop Test\",\n", - " \"long_title\": \"Long Workshop Test Title\",\n", - " \"authors\": \"P. Huck, J. Huck\",\n", - " \"description\": \"This is temp. Can be removed anytime\",\n", - " \"references\": [{\"label\": \"google\", \"url\": \"https://google.com\"}],\n", - " \"owner\": \"google:phuck@lbl.gov\"\n", - "}).result()" + "client.projects.create_entry(\n", + " project={\n", + " \"name\": name,\n", + " \"title\": \"Workshop Test\",\n", + " \"long_title\": \"Long Workshop Test Title\",\n", + " \"authors\": \"P. Huck, J. Huck\",\n", + " \"description\": \"This is temp. Can be removed anytime\",\n", + " \"references\": [{\"label\": \"google\", \"url\": \"https://google.com\"}],\n", + " \"owner\": \"google:phuck@lbl.gov\",\n", + " }\n", + ").result()" ] }, { @@ -117,9 +120,10 @@ "metadata": {}, "outputs": [], "source": [ - "client.init_columns(name, {\n", - " \"a\": \"eV\", \"b.c\": None, \"b.d\": None, \"d.e.f\": None, \"x\": None, \"tables\": None\n", - "})" + "client.init_columns(\n", + " name,\n", + " {\"a\": \"eV\", \"b.c\": None, \"b.d\": None, \"d.e.f\": None, \"x\": None, \"tables\": None},\n", + ")" ] }, { @@ -129,8 +133,8 @@ "metadata": {}, "outputs": [], "source": [ - "data = [['tom', 10], ['nick', 15], ['juli', 14]]\n", - "df = DataFrame(data, columns=['Name', 'Age'])\n", + "data = [[\"tom\", 10], [\"nick\", 15], [\"juli\", 14]]\n", + "df = DataFrame(data, columns=[\"Name\", \"Age\"])\n", "df.set_index(\"Name\", inplace=True)\n", "df" ] @@ -142,26 +146,25 @@ "metadata": {}, "outputs": [], "source": [ - "contributions = [{\n", - " \"project\": name,\n", - " \"identifier\": \"mp-4\",\n", - " \"data\": {\n", - " \"a\": \"3 eV\",\n", - " \"b\": {\"c\": \"hello\", \"d\": 5},\n", - " \"d.e.f\": \"nest via dot-notation\",\n", - " \"x\": \"(101)\"\n", + "contributions = [\n", + " {\n", + " \"project\": name,\n", + " \"identifier\": \"mp-4\",\n", + " \"data\": {\n", + " \"a\": \"3 eV\",\n", + " \"b\": {\"c\": \"hello\", \"d\": 5},\n", + " \"d.e.f\": \"nest via dot-notation\",\n", + " \"x\": \"(101)\",\n", + " },\n", + " \"tables\": [df],\n", " },\n", - " \"tables\": [df]\n", - "}, {\n", - " \"project\": name,\n", - " \"identifier\": \"mp-6\",\n", - " \"data\": {\n", - " \"a\": \"4 eV\",\n", - " \"b\": {\"c\": \"what\", \"d\": 6},\n", - " \"d.e.f\": \"duh\"\n", + " {\n", + " \"project\": name,\n", + " \"identifier\": \"mp-6\",\n", + " \"data\": {\"a\": \"4 eV\", \"b\": {\"c\": \"what\", \"d\": 6}, \"d.e.f\": \"duh\"},\n", + " \"tables\": [df],\n", " },\n", - " \"tables\": [df]\n", - "}]\n", + "]\n", "client.submit_contributions(contributions, ignore_dupes=True)" ] }, @@ -192,7 +195,9 @@ "metadata": {}, "outputs": [], "source": [ - "client.contributions.get_entries(project=name, _fields=[\"identifier\", \"is_public\"]).result()" + "client.contributions.get_entries(\n", + " project=name, _fields=[\"identifier\", \"is_public\"]\n", + ").result()" ] }, { @@ -219,13 +224,14 @@ "\n", "query = {\n", " \"project\": \"carrier_transport\",\n", - " #\"id__not__in\": [\"5f8a3d9183a19cc44d02243e\", \"5f8a3d9283a19cc44d022447\"],\n", - " #\"data__functional__endswith\": \"+U\",\n", - " #\"data__mₑᶜ__p__ε₁__value__gte\": 0,\n", + " # \"id__not__in\": [\"5f8a3d9183a19cc44d02243e\", \"5f8a3d9283a19cc44d022447\"],\n", + " # \"data__functional__endswith\": \"+U\",\n", + " # \"data__mₑᶜ__p__ε₁__value__gte\": 0,\n", " \"last_modified__after\": after,\n", " \"last_modified__before\": before,\n", " \"_fields\": [\"id\", \"last_modified\"],\n", - " \"_limit\": 10, \"_sort\": \"last_modified\"\n", + " \"_limit\": 10,\n", + " \"_sort\": \"last_modified\",\n", "}\n", "client.contributions.get_entries(**query).result()" ] @@ -258,10 +264,10 @@ "outputs": [], "source": [ "client.tables.get_entries(\n", - " #attrs__title__icontains=\"xas\",\n", - " #attrs__labels__index__startswith=\"T\",\n", + " # attrs__title__icontains=\"xas\",\n", + " # attrs__labels__index__startswith=\"T\",\n", " attrs__labels__value__startswith=\"PF\",\n", - " _fields=[\"name\", \"attrs\", \"columns\", \"total_data_rows\"]\n", + " _fields=[\"name\", \"attrs\", \"columns\", \"total_data_rows\"],\n", ").result()" ] }, diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/springer_materials.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/springer_materials.ipynb index ce4e3b1dfd..88483a98ea 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/springer_materials.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/springer_materials.ipynb @@ -103,7 +103,7 @@ " # \"Status_of_Phase_Diagram\": {\"name\": \"phasediagram.status\"}\n", "}\n", "\n", - "keys - set(columns_map.keys()) # just making sure I didn't miss a key" + "keys - set(columns_map.keys()) # just making sure I didn't miss a key" ] }, { @@ -116,16 +116,19 @@ "# prep contributions\n", "contributions = []\n", "prop_set = set()\n", - "special_char_map = {ord('ä'): 'ae', ord('ü'): 'ue', ord('ö'): 'oe', ord('ß'): 'ss'}\n", - "CLEANR = re.compile('<.*?>') \n", + "special_char_map = {ord(\"ä\"): \"ae\", ord(\"ü\"): \"ue\", ord(\"ö\"): \"oe\", ord(\"ß\"): \"ss\"}\n", + "CLEANR = re.compile(\"<.*?>\")\n", + "\n", "\n", "def convert_prop(s):\n", " cleaned = \"\".join([c if c.isalnum() else \" \" for c in s])\n", " capitalized = \"\".join([w.capitalize() for w in cleaned.split()])\n", " return capitalized.translate(special_char_map)\n", "\n", + "\n", "def cleanhtml(raw_html):\n", - " return re.sub(CLEANR, '', raw_html)\n", + " return re.sub(CLEANR, \"\", raw_html)\n", + "\n", "\n", "for fn, docs in data.items():\n", " print(fn)\n", @@ -138,10 +141,11 @@ " # for prop in sorted(doc[\"List_of_Physical_Properties\"])\n", " # ] if category == \"physical-properties\" else []\n", " contrib = {\n", - " \"identifier\": identifier, \"formula\": formula,\n", + " \"identifier\": identifier,\n", + " \"formula\": formula,\n", " \"data\": {\"springer.category\": category},\n", " }\n", - " \n", + "\n", " # if properties:\n", " # prop_set |= set(properties)\n", " # for prop in properties:\n", @@ -158,11 +162,11 @@ " if unit is None and \"<\" in val:\n", " val = cleanhtml(val)\n", "\n", - " contrib[\"data\"][name] = f\"{val} {unit}\" if unit else val \n", - " \n", + " contrib[\"data\"][name] = f\"{val} {unit}\" if unit else val\n", + "\n", " contrib[\"data\"] = unflatten(contrib[\"data\"], splitter=\"dot\")\n", " contributions.append(contrib)\n", - " \n", + "\n", "len(contributions)" ] }, @@ -180,7 +184,7 @@ "# for prop in sorted(prop_set):\n", "# columns[f\"properties.available.{prop}\"] = None\n", "\n", - "#client.init_columns(columns)" + "# client.init_columns(columns)" ] }, { @@ -194,7 +198,9 @@ "client.delete_contributions() # need to delete first due to `unique_identifiers=False`\n", "client.init_columns(columns) # good practice :)\n", "client.submit_contributions(contributions)\n", - "client.init_columns(columns) # just to make sure that all columns show up in the intended order" + "client.init_columns(\n", + " columns\n", + ") # just to make sure that all columns show up in the intended order" ] }, { @@ -223,7 +229,7 @@ "query = {\n", " \"data__springer__category__exact\": \"physical-properties\",\n", " \"data__properties__main__exact\": \"elasticity\",\n", - " \"data__properties__stats__samples__value__gt\": 5\n", + " \"data__properties__stats__samples__value__gt\": 5,\n", "}\n", "client.count(query=query)" ] @@ -251,7 +257,7 @@ "springer_id = \"ppp_350781a8aa14dc0b19c6c879daff3be2\"\n", "client.query_contributions(\n", " query={\"data__springer__id__exact\": springer_id},\n", - " fields=[\"id\", \"identifier\", \"data.springer.id\", \"data.properties.pearson\"]\n", + " fields=[\"id\", \"identifier\", \"data.springer.id\", \"data.properties.pearson\"],\n", ")" ] }, @@ -263,9 +269,12 @@ "outputs": [], "source": [ "# count all entries for a list of formulas released before 2023\n", - "client.count(query={\n", - " \"formula__in\": [\"Fe2O3\", \"GaAS\"], \"data__springer__released__value__lt\": 2023\n", - "})" + "client.count(\n", + " query={\n", + " \"formula__in\": [\"Fe2O3\", \"GaAS\"],\n", + " \"data__springer__released__value__lt\": 2023,\n", + " }\n", + ")" ] }, { diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/swf.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/swf.ipynb index a9741147a6..03011858f9 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/swf.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/swf.ipynb @@ -40,7 +40,9 @@ "metadata": {}, "outputs": [], "source": [ - "datadir = Path(\"/Users/patrick/GoogleDriveLBNL/MaterialsProject/gitrepos/mpcontribs-data/swf\")\n", + "datadir = Path(\n", + " \"/Users/patrick/GoogleDriveLBNL/MaterialsProject/gitrepos/mpcontribs-data/swf\"\n", + ")\n", "identifier = \"mp-1216347\"" ] }, @@ -58,7 +60,7 @@ "kondorsky.attrs = {\n", " \"title\": \"Angular Dependence of Switching Field\",\n", " \"labels\": {\"value\": \"Switching Field [T]\"},\n", - " \"log_y\": True # TODO check if goes through\n", + " \"log_y\": True, # TODO check if goes through\n", "}\n", "kondorsky.plot(**kondorsky.attrs)" ] @@ -77,7 +79,7 @@ "ip.attrs = {\n", " \"title\": \"IP Energy Product\",\n", " \"labels\": {\"value\": \"Composition [at%]\"},\n", - " \"kind\": \"scatter\" # TODO check if goes through\n", + " \"kind\": \"scatter\", # TODO check if goes through\n", "}\n", "ip.plot(**ip.attrs)" ] @@ -101,7 +103,7 @@ "source": [ "# set table names\n", "kondorsky.attrs[\"name\"] = \"Kondorsky\"\n", - "#ip.attrs[\"name\"] = \"IP Energy Product\"" + "# ip.attrs[\"name\"] = \"IP Energy Product\"" ] }, { @@ -113,11 +115,15 @@ }, "outputs": [], "source": [ - "contributions = [{\n", - " \"project\": name, \"identifier\": identifier, \"is_public\": True,\n", - " \"data\": {\"kondorsky\": {\"Fe\": \"42.1707 %\", \"Co\": \"8.034 %\", \"V\": \"49.7953 %\"}},\n", - " \"tables\": [kondorsky, ip]#, moke, vsm, total˜]\n", - "}]\n", + "contributions = [\n", + " {\n", + " \"project\": name,\n", + " \"identifier\": identifier,\n", + " \"is_public\": True,\n", + " \"data\": {\"kondorsky\": {\"Fe\": \"42.1707 %\", \"Co\": \"8.034 %\", \"V\": \"49.7953 %\"}},\n", + " \"tables\": [kondorsky, ip], # , moke, vsm, total˜]\n", + " }\n", + "]\n", "len(contributions)" ] }, diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/transparent_conductors.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/transparent_conductors.ipynb index bc8a8feef7..2fc544b746 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/transparent_conductors.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/transparent_conductors.ipynb @@ -62,7 +62,7 @@ " for row in df.to_dict(orient=\"records\"):\n", " identifier = None\n", " data = {\"doping\": doping}\n", - " \n", + "\n", " for keys, value in row.items():\n", " key = \".\".join(\n", " [\n", @@ -71,10 +71,10 @@ " if not k.startswith(\"Unnamed:\")\n", " ]\n", " )\n", - " \n", + "\n", " if key.endswith(\"experimental doping type\"):\n", " key = key.replace(\"Transport.\", \"\")\n", - " \n", + "\n", " key_split = key.split(\".\")\n", " if len(key_split) > 2:\n", " key = \".\".join(key_split[1:])\n", @@ -100,7 +100,9 @@ " if key.endswith(\")\"):\n", " key, unit = key.rsplit(\" (\", 1)\n", " unit = unit[:-1].replace(\"^-3\", \"⁻³\").replace(\"^20\", \"²⁰\")\n", - " unit = unit.replace(\"V2/cms\", \"cm²/V/s\").replace(\"cm^2/Vs\", \"cm²/V/s\")\n", + " unit = unit.replace(\"V2/cms\", \"cm²/V/s\").replace(\n", + " \"cm^2/Vs\", \"cm²/V/s\"\n", + " )\n", " if \",\" in unit:\n", " extra_key = key.rsplit(\".\", 1)[0].lower() + \".conditions\"\n", " data[extra_key] = unit\n", @@ -115,12 +117,9 @@ "\n", " if done:\n", " break\n", - " \n", - " raw_contributions.append({\n", - " \"identifier\": identifier,\n", - " \"data\": data\n", - " })\n", - " \n", + "\n", + " raw_contributions.append({\"identifier\": identifier, \"data\": data})\n", + "\n", "len(raw_contributions)" ] }, @@ -142,48 +141,72 @@ "outputs": [], "source": [ "keys_map = {\n", - " 'doping': {}, # don't rename, no unit\n", - " 'number of studies': {'rename': 'studies', 'unit': ''}, # dimensionless\n", - " 'quality.good or ok': {'rename': 'quality'},\n", - " 'structure and composition.common dopants': {'rename': 'dopants'},\n", - " 'structure and composition.space group symbol': {'rename': 'spacegroup'},\n", - " \n", - " 'branch point energy.bpe min ratio': {'rename': 'BPE.ratio.min', 'unit': ''},\n", - " 'branch point energy.bpe max ratio': {'rename': 'BPE.ratio.max', 'unit': ''},\n", - " 'branch point energy.bpe ratio': {'rename': 'BPE.ratio.mean', 'unit': ''},\n", - " 'branch point energy.has degenerate bands': {'rename': 'BPE.degenerate'},\n", - " \n", - " 'computed gap.hse06 band gap': {'rename': 'computed.gap.HSE06.band', 'unit': 'eV'},\n", - " 'computed gap.hse06 direct gap': {'rename': 'computed.gap.HSE06.direct', 'unit': 'eV'},\n", - " 'computed gap.pbe band gap': {'rename': 'computed.gap.PBE.band', 'unit': 'eV'},\n", - " 'computed gap.pbe direct gap': {'rename': 'computed.gap.PBE.direct', 'unit': 'eV'},\n", - "\n", - " 'computed m*.conditions': {'rename': 'computed.m*.conditions'},\n", - " 'computed m*.m* avg': {'rename': 'computed.m*.average', 'unit': ''},\n", - " 'computed m*.m* planar': {'rename': 'computed.m*.planar', 'unit': ''},\n", - " 'computed stability.e_above_hull': {'rename': 'computed.stability.Eₕ', 'unit': 'eV'},\n", - " 'computed stability.e_above_pourbaix_hull': {'rename': 'computed.stability.Eₚₕ', 'unit': 'eV'},\n", - "\n", - " 'experimental doping type': {'rename': 'experimental.doping'},\n", - " 'experimental gap.max experimental gap': {'rename': 'experimental.gap.range.max', 'unit': 'eV'},\n", - " 'experimental gap.max gap reference': {'rename': 'experimental.gap.references.max'},\n", - " 'experimental gap.min experimental gap': {'rename': 'experimental.gap.range.min', 'unit': 'eV'},\n", - " 'experimental gap.min gap reference': {'rename': 'experimental.gap.references.min'},\n", - "\n", - " 'max experimental conductivity.associated carrier concentration': {\n", - " 'rename': 'experimental.conductivity.concentration', 'unit': 'cm⁻³'\n", + " \"doping\": {}, # don't rename, no unit\n", + " \"number of studies\": {\"rename\": \"studies\", \"unit\": \"\"}, # dimensionless\n", + " \"quality.good or ok\": {\"rename\": \"quality\"},\n", + " \"structure and composition.common dopants\": {\"rename\": \"dopants\"},\n", + " \"structure and composition.space group symbol\": {\"rename\": \"spacegroup\"},\n", + " \"branch point energy.bpe min ratio\": {\"rename\": \"BPE.ratio.min\", \"unit\": \"\"},\n", + " \"branch point energy.bpe max ratio\": {\"rename\": \"BPE.ratio.max\", \"unit\": \"\"},\n", + " \"branch point energy.bpe ratio\": {\"rename\": \"BPE.ratio.mean\", \"unit\": \"\"},\n", + " \"branch point energy.has degenerate bands\": {\"rename\": \"BPE.degenerate\"},\n", + " \"computed gap.hse06 band gap\": {\"rename\": \"computed.gap.HSE06.band\", \"unit\": \"eV\"},\n", + " \"computed gap.hse06 direct gap\": {\n", + " \"rename\": \"computed.gap.HSE06.direct\",\n", + " \"unit\": \"eV\",\n", " },\n", - " 'max experimental conductivity.dopant': {'rename': 'experimental.conductivity.dopant'},\n", - " 'max experimental conductivity.max conductivity': {\n", - " 'rename': 'experimental.conductivity.max', 'unit': 'S/cm'\n", + " \"computed gap.pbe band gap\": {\"rename\": \"computed.gap.PBE.band\", \"unit\": \"eV\"},\n", + " \"computed gap.pbe direct gap\": {\"rename\": \"computed.gap.PBE.direct\", \"unit\": \"eV\"},\n", + " \"computed m*.conditions\": {\"rename\": \"computed.m*.conditions\"},\n", + " \"computed m*.m* avg\": {\"rename\": \"computed.m*.average\", \"unit\": \"\"},\n", + " \"computed m*.m* planar\": {\"rename\": \"computed.m*.planar\", \"unit\": \"\"},\n", + " \"computed stability.e_above_hull\": {\n", + " \"rename\": \"computed.stability.Eₕ\",\n", + " \"unit\": \"eV\",\n", + " },\n", + " \"computed stability.e_above_pourbaix_hull\": {\n", + " \"rename\": \"computed.stability.Eₚₕ\",\n", + " \"unit\": \"eV\",\n", + " },\n", + " \"experimental doping type\": {\"rename\": \"experimental.doping\"},\n", + " \"experimental gap.max experimental gap\": {\n", + " \"rename\": \"experimental.gap.range.max\",\n", + " \"unit\": \"eV\",\n", + " },\n", + " \"experimental gap.max gap reference\": {\"rename\": \"experimental.gap.references.max\"},\n", + " \"experimental gap.min experimental gap\": {\n", + " \"rename\": \"experimental.gap.range.min\",\n", + " \"unit\": \"eV\",\n", + " },\n", + " \"experimental gap.min gap reference\": {\"rename\": \"experimental.gap.references.min\"},\n", + " \"max experimental conductivity.associated carrier concentration\": {\n", + " \"rename\": \"experimental.conductivity.concentration\",\n", + " \"unit\": \"cm⁻³\",\n", + " },\n", + " \"max experimental conductivity.dopant\": {\n", + " \"rename\": \"experimental.conductivity.dopant\"\n", + " },\n", + " \"max experimental conductivity.max conductivity\": {\n", + " \"rename\": \"experimental.conductivity.max\",\n", + " \"unit\": \"S/cm\",\n", + " },\n", + " \"max experimental conductivity.reference link\": {\n", + " \"rename\": \"experimental.conductivity.reference\"\n", + " },\n", + " \"max experimental conductivity.synthesis method\": {\n", + " \"rename\": \"experimental.conductivity.method\"\n", + " },\n", + " \"max experimental mobility.dopant\": {\"rename\": \"experimental.mobility.dopant\"},\n", + " \"max experimental mobility.max mobility\": {\n", + " \"rename\": \"experimental.mobility.max\",\n", + " \"unit\": \"cm²/V/s\",\n", + " },\n", + " \"max experimental mobility.reference link\": {\n", + " \"rename\": \"experimental.mobility.reference\"\n", + " },\n", + " \"max experimental mobility.synthesis method\": {\n", + " \"rename\": \"experimental.mobility.method\"\n", " },\n", - " 'max experimental conductivity.reference link': {'rename': 'experimental.conductivity.reference'},\n", - " 'max experimental conductivity.synthesis method': {'rename': 'experimental.conductivity.method'},\n", - "\n", - " 'max experimental mobility.dopant': {'rename': 'experimental.mobility.dopant'},\n", - " 'max experimental mobility.max mobility': {'rename': 'experimental.mobility.max', 'unit': 'cm²/V/s'},\n", - " 'max experimental mobility.reference link': {'rename': 'experimental.mobility.reference'},\n", - " 'max experimental mobility.synthesis method': {'rename': 'experimental.mobility.method'},\n", "}" ] }, @@ -194,10 +217,7 @@ "metadata": {}, "outputs": [], "source": [ - "columns = {\n", - " cfg.get(\"rename\", k): cfg.get(\"unit\")\n", - " for k, cfg in keys_map.items()\n", - "}" + "columns = {cfg.get(\"rename\", k): cfg.get(\"unit\") for k, cfg in keys_map.items()}" ] }, { @@ -210,11 +230,13 @@ "contributions = []\n", "\n", "for contrib in raw_contributions:\n", - " contributions.append({\n", - " \"project\": name,\n", - " \"identifier\": contrib[\"identifier\"],\n", - " \"is_public\": True,\n", - " })\n", + " contributions.append(\n", + " {\n", + " \"project\": name,\n", + " \"identifier\": contrib[\"identifier\"],\n", + " \"is_public\": True,\n", + " }\n", + " )\n", " contributions[-1][\"data\"] = {\n", " cfg.get(\"rename\", k): contrib[\"data\"][k]\n", " for k, cfg in keys_map.items()\n", diff --git a/mpcontribs-portal/notebooks/lightsources.materialsproject.org/genesis_efrc_minipipes.ipynb b/mpcontribs-portal/notebooks/lightsources.materialsproject.org/genesis_efrc_minipipes.ipynb index 429f4b81ae..20a1e071b1 100644 --- a/mpcontribs-portal/notebooks/lightsources.materialsproject.org/genesis_efrc_minipipes.ipynb +++ b/mpcontribs-portal/notebooks/lightsources.materialsproject.org/genesis_efrc_minipipes.ipynb @@ -35,7 +35,9 @@ "outputs": [], "source": [ "name = \"genesis_efrc_minipipes\" # MPContribs project name\n", - "indir = Path(f\"/Users/patrick/GoogleDriveLBNL/MaterialsProject/gitrepos/mpcontribs-data/{name}\")" + "indir = Path(\n", + " f\"/Users/patrick/GoogleDriveLBNL/MaterialsProject/gitrepos/mpcontribs-data/{name}\"\n", + ")" ] }, { @@ -50,7 +52,8 @@ "\n", "# adding project name and API key to config (TODO: set through minipipes UI)\n", "config[\"meta\"][\"mpcontribs\"] = {\n", - " \"project\": name, \"apikey\": os.environ[\"MPCONTRIBS_API_KEY\"]\n", + " \"project\": name,\n", + " \"apikey\": os.environ[\"MPCONTRIBS_API_KEY\"],\n", "}\n", "\n", "ped_path = indir / \"PED of BMG for PDF 1-29-20_0035-0070.gr\"\n", @@ -79,8 +82,7 @@ "mpcontribs_config = config[\"meta\"].pop(\"mpcontribs\")\n", "name = mpcontribs_config[\"project\"]\n", "client = Client(\n", - " host = \"lightsources-api.materialsproject.org\",\n", - " apikey = mpcontribs_config[\"apikey\"]\n", + " host=\"lightsources-api.materialsproject.org\", apikey=mpcontribs_config[\"apikey\"]\n", ")" ] }, @@ -142,7 +144,7 @@ "source": [ "contrib = {\n", " \"project\": name,\n", - " \"identifier\": \"TODO\", # usually mp-id, can be custom\n", + " \"identifier\": \"TODO\", # usually mp-id, can be custom\n", " \"formula\": formula,\n", " \"is_public\": True, # will make this contribution public automatically when project is set to public\n", " # data, tables and attachments added explicitly below\n", @@ -168,9 +170,9 @@ "names_map = {\n", " \"i_Reduce_Data.Mask_Images.Mask_f\": \"mask\",\n", " \"i_Reduce_Data.Image_to_IQ.Integrate_f\": \"integrate\",\n", - " \"i_Reduce_Data.IQ_to_PDF.Transform_f\": \"transform\"\n", + " \"i_Reduce_Data.IQ_to_PDF.Transform_f\": \"transform\",\n", "}\n", - "keys_maps = [ # len(runs_meta) = 3\n", + "keys_maps = [ # len(runs_meta) = 3\n", " {\n", " \"alpha\": \"α\",\n", " \"edge\": \"edge\",\n", @@ -178,12 +180,14 @@ " \"upper_threshold\": \"thresholds.upper\",\n", " \"smoothing function\": \"smoothing\",\n", " \"vmin\": \"v.min\",\n", - " \"vmax\": \"v.max\"\n", - " }, {\n", + " \"vmax\": \"v.max\",\n", + " },\n", + " {\n", " \"wavelength (A)\": \"λ\", # TODO unit Angstrom\n", " \"polarization\": \"polarization\",\n", - " \"detector\": \"detector\"\n", - " }, {\n", + " \"detector\": \"detector\",\n", + " },\n", + " {\n", " \"processor\": \"processor\",\n", " \"mode\": \"mode\",\n", " \"qmax\": \"q.max\",\n", @@ -192,8 +196,8 @@ " \"rmin\": \"r.min\",\n", " \"rmax\": \"r.max\",\n", " \"step\": \"step\",\n", - " \"shift\": \"shift\"\n", - " }\n", + " \"shift\": \"shift\",\n", + " },\n", "]\n", "\n", "flat_data = {}\n", @@ -232,7 +236,7 @@ "df.columns.name = \"spectral type\"\n", "df.attrs[\"name\"] = y\n", "df.attrs[\"title\"] = \"Radial Distribution Function\"\n", - "df.attrs[\"labels\"] = {\"value\": f\"{y} [Å⁻²]\"} \n", + "df.attrs[\"labels\"] = {\"value\": f\"{y} [Å⁻²]\"}\n", "# df.plot(**df.attrs)\n", "contrib[\"tables\"] = [df]" ] diff --git a/mpcontribs-portal/notebooks/lightsources.materialsproject.org/get_started.ipynb b/mpcontribs-portal/notebooks/lightsources.materialsproject.org/get_started.ipynb index c3162b1883..17ee152009 100644 --- a/mpcontribs-portal/notebooks/lightsources.materialsproject.org/get_started.ipynb +++ b/mpcontribs-portal/notebooks/lightsources.materialsproject.org/get_started.ipynb @@ -57,14 +57,16 @@ "elements = [\"Co\", \"Cu\", \"Ce\"]\n", "columns = {f\"position.{axis}\": \"mm\" for axis in [\"x\", \"y\"]}\n", "columns.update({f\"composition.{element}\": \"%\" for element in elements})\n", - "columns.update({\n", - " f\"{element}.{spectrum}.{m}\": \"\"\n", - " for element in elements\n", - " for spectrum in [\"XAS\", \"XMCD\"]\n", - " for m in [\"min\", \"max\"]\n", - "})\n", + "columns.update(\n", + " {\n", + " f\"{element}.{spectrum}.{m}\": \"\"\n", + " for element in elements\n", + " for spectrum in [\"XAS\", \"XMCD\"]\n", + " for m in [\"min\", \"max\"]\n", + " }\n", + ")\n", "columns.update({\"tables\": None, \"attachments\": None})\n", - "#columns" + "# columns" ] }, { @@ -85,7 +87,9 @@ "outputs": [], "source": [ "# composition/concentration table\n", - "ctable = read_csv(StringIO(\"\"\"\n", + "ctable = read_csv(\n", + " StringIO(\n", + " \"\"\"\n", "X,\t\tY,\t\tCo,\t\tCu,\t\tCe\n", "-8.5,\t37.6,\t46.2,\t5.3,\t39.3\n", "-8.5,\t107.8,\t70.0,\t8.9,\t15.5\n", @@ -99,9 +103,13 @@ "-5.7,\t104.8,\t54.9,\t19.1,\t15.5\n", "-5.0,\t37.1,\t48.8,\t8.7,\t43.7\n", "-5.0,\t107.1,\t64.8,\t16.9,\t19.2\n", - "\"\"\".replace('\\t', '')))\n", + "\"\"\".replace(\"\\t\", \"\")\n", + " )\n", + ")\n", "\n", - "ctable[\"x/y position [mm]\"] = ctable[\"X\"].astype('str') + '/' + ctable[\"Y\"].astype('str')\n", + "ctable[\"x/y position [mm]\"] = (\n", + " ctable[\"X\"].astype(\"str\") + \"/\" + ctable[\"Y\"].astype(\"str\")\n", + ")\n", "ctable.attrs[\"name\"] = \"Composition Table\"\n", "ctable.attrs[\"meta\"] = {\"X\": \"category\", \"Y\": \"continuous\"} # for plotly\n", "ctable.attrs[\"labels\"] = {\"value\": \"composition [%]\"}\n", @@ -142,6 +150,7 @@ "\n", " return functions\n", "\n", + "\n", "conc_funcs = get_concentration_functions(ctable)\n", "del ctable[\"X\"]\n", "del ctable[\"Y\"]\n", @@ -156,49 +165,52 @@ "source": [ "# paths to gzipped JSON files for attachments\n", "# global params attachment identical for every contribution / across project\n", - "global_params = Attachment.from_data(\"files/global-params\", {\n", - " \"transfer_fields\": [\n", - " \"I_Norm0\", \"Magnet Field\", \"Energy\", \"Y\", \"Z\", \"filename_scannumber\"\n", - " ],\n", - " \"labelcols\": [\"Y\", \"Z\"]\n", - "})\n", + "global_params = Attachment.from_data(\n", + " \"files/global-params\",\n", + " {\n", + " \"transfer_fields\": [\n", + " \"I_Norm0\",\n", + " \"Magnet Field\",\n", + " \"Energy\",\n", + " \"Y\",\n", + " \"Z\",\n", + " \"filename_scannumber\",\n", + " ],\n", + " \"labelcols\": [\"Y\", \"Z\"],\n", + " },\n", + ")\n", + "\n", "\n", "# separate attachment of analysis params for each contribution and element\n", "def analysis_params(identifier, element):\n", " name = f\"files/analysis-params__{identifier}__{element}\"\n", - " return Attachment.from_data(name, {\n", - " \"get_xas\": {\n", - " \"element\": element,\n", - " 'pre_edge': (695, 701),\n", - " 'post_edge': (730, 739),\n", - " },\n", - " \"get_xmcd\": {\n", - " 'L3_range': (705, 710),\n", - " 'L2_range': (718, 722),\n", - " },\n", - " \"Remove BG (polynomial)\": {\n", - " \"element\": element,\n", - " \"degree\": 1,\n", - " \"step\": 0,\n", - " \"xmcd_bg_subtract\": True,\n", - " \"scanindex_column\": \"XMCD Index\"\n", - " },\n", - " \"normalize_set\": {\n", - " \"element\": element,\n", - " \"scanindex_column\": \"XMCD Index\"\n", - " },\n", - " \"collapse_set\": {\n", - " \"columns_to_keep\": [\"Energy\",\"Y\",\"Z\"]\n", + " return Attachment.from_data(\n", + " name,\n", + " {\n", + " \"get_xas\": {\n", + " \"element\": element,\n", + " \"pre_edge\": (695, 701),\n", + " \"post_edge\": (730, 739),\n", + " },\n", + " \"get_xmcd\": {\n", + " \"L3_range\": (705, 710),\n", + " \"L2_range\": (718, 722),\n", + " },\n", + " \"Remove BG (polynomial)\": {\n", + " \"element\": element,\n", + " \"degree\": 1,\n", + " \"step\": 0,\n", + " \"xmcd_bg_subtract\": True,\n", + " \"scanindex_column\": \"XMCD Index\",\n", + " },\n", + " \"normalize_set\": {\"element\": element, \"scanindex_column\": \"XMCD Index\"},\n", + " \"collapse_set\": {\"columns_to_keep\": [\"Energy\", \"Y\", \"Z\"]},\n", + " \"plot_spectrum\": {\"element\": element, \"E_lower\": 695, \"E_upper\": 760},\n", + " \"gather_final_op_param_values\": {\n", + " \"identifier\": identifier # added for testing to ensure different attachment contents\n", + " },\n", " },\n", - " \"plot_spectrum\": {\n", - " \"element\": element,\n", - " 'E_lower': 695,\n", - " 'E_upper': 760\n", - " },\n", - " \"gather_final_op_param_values\": {\n", - " \"identifier\": identifier # added for testing to ensure different attachment contents\n", - " }\n", - " })" + " )" ] }, { @@ -215,7 +227,7 @@ " # randomly assign fake sample id for testing here\n", " fn = os.path.splitext(info.filename)[0]\n", " element, x, y = fn.rsplit(\"_\", 4)\n", - " sample = f\"CMSI-2-10_{idx%5}\"\n", + " sample = f\"CMSI-2-10_{idx % 5}\"\n", " identifier = f\"{sample}__{x}_{y}\"\n", "\n", " # tables and attachments for Co\n", @@ -228,7 +240,7 @@ " df.columns.name = \"spectral type\"\n", " df.attrs[\"name\"] = f\"{element}-XAS/XMCD\"\n", " df.attrs[\"title\"] = f\"XAS and XMCD Spectra for {element}\"\n", - " df.attrs[\"labels\"] = {\"value\": \"a.u.\"} \n", + " df.attrs[\"labels\"] = {\"value\": \"a.u.\"}\n", " params = analysis_params(identifier, element)\n", "\n", " # build contribution\n", @@ -236,38 +248,39 @@ " # TODO auto-convert data.timestamp field in API to enable sorting/filtering\n", " contrib[\"data\"][\"position\"] = {k: f\"{v} mm\" for k, v in zip([\"x\", \"y\"], [x, y])}\n", " contrib[\"data\"][\"composition\"] = {}\n", - " \n", + "\n", " for el, f in conc_funcs.items():\n", " try:\n", - " contrib[\"data\"][\"composition\"][el] = f\"{f(x, y) * 100.} %\"\n", + " contrib[\"data\"][\"composition\"][el] = f\"{f(x, y) * 100.0} %\"\n", " except KeyError:\n", " continue\n", "\n", " if not contrib[\"data\"][\"composition\"]:\n", " print(f\"Could not determine composition for {identifier}!\")\n", " continue\n", - " \n", - " contrib[\"formula\"] = \"\".join([\n", - " \"{}{}\".format(el, int(round(Decimal(comp.split()[0]))))\n", - " for el, comp in contrib[\"data\"][\"composition\"].items()\n", - " ])\n", + "\n", + " contrib[\"formula\"] = \"\".join(\n", + " [\n", + " \"{}{}\".format(el, int(round(Decimal(comp.split()[0]))))\n", + " for el, comp in contrib[\"data\"][\"composition\"].items()\n", + " ]\n", + " )\n", "\n", " contrib[\"data\"][element] = {\n", - " y: {\"min\": df[y].min(), \"max\": df[y].max()}\n", - " for y in [\"XAS\", \"XMCD\"]\n", + " y: {\"min\": df[y].min(), \"max\": df[y].max()} for y in [\"XAS\", \"XMCD\"]\n", " }\n", - " \n", + "\n", " # adding ctable and global_params to every contribution\n", " # ctable could be the same for different subsets of contributions\n", " contrib[\"tables\"] = [ctable, df]\n", " contrib[\"attachments\"] = [global_params, params]\n", " contributions.append(contrib)\n", - " \n", + "\n", "# if len(contributions) > 2:\n", "# break\n", - " \n", + "\n", "# len(contributions)\n", - "#contributions" + "# contributions" ] }, { @@ -287,9 +300,9 @@ "metadata": {}, "outputs": [], "source": [ - "client.contributions.queryContributions(project=name, _fields=[\n", - " \"id\", \"identifier\", \"tables\", \"attachments\", \"notebook\"\n", - "]).result()" + "client.contributions.queryContributions(\n", + " project=name, _fields=[\"id\", \"identifier\", \"tables\", \"attachments\", \"notebook\"]\n", + ").result()" ] }, { @@ -325,7 +338,7 @@ " fake_tables[identifier] = []\n", " for idx, element in enumerate(elements[1:]):\n", " df = contrib[\"tables\"][1].copy()\n", - " df.index = df.index.astype(\"float\") + (idx+1)*10\n", + " df.index = df.index.astype(\"float\") + (idx + 1) * 10\n", " df.attrs[\"name\"] = f\"{element}-XAS/XMCD\"\n", " df.attrs[\"title\"] = f\"XAS and XMCD Spectra for {element}\"\n", " fake_tables[identifier].append(df)" @@ -342,14 +355,10 @@ "identifiers = [c[\"identifier\"] for c in contributions]\n", "\n", "resp = client.contributions.queryContributions(\n", - " project=name, identifier__in=identifiers[:5],\n", - " _fields=[\"id\", \"identifier\"]\n", + " project=name, identifier__in=identifiers[:5], _fields=[\"id\", \"identifier\"]\n", ").result()\n", "\n", - "mapping = {\n", - " c[\"identifier\"]: c[\"id\"]\n", - " for c in resp[\"data\"]\n", - "}\n", + "mapping = {c[\"identifier\"]: c[\"id\"] for c in resp[\"data\"]}\n", "print(mapping)" ] }, @@ -363,7 +372,7 @@ "# example for a single identifier and element\n", "identifier = identifiers[0]\n", "element_index = 1\n", - "component_index = element_index + 1 # index in contribution's component list\n", + "component_index = element_index + 1 # index in contribution's component list\n", "element = elements[element_index]\n", "pk = mapping[identifier]\n", "df = fake_tables[identifier][element_index]\n", @@ -371,10 +380,9 @@ "\n", "contrib = {\n", " \"id\": pk,\n", - " \"data\": {element: {\n", - " y: {\"min\": df[y].min(), \"max\": df[y].max()}\n", - " for y in [\"XAS\", \"XMCD\"]\n", - " }}, \n", + " \"data\": {\n", + " element: {y: {\"min\": df[y].min(), \"max\": df[y].max()} for y in [\"XAS\", \"XMCD\"]}\n", + " },\n", " \"tables\": [None] * component_index + [df], # ensure correct index for update\n", " \"attachments\": [None] * component_index + [params],\n", "}" @@ -404,7 +412,7 @@ "metadata": {}, "outputs": [], "source": [ - "client.get_table('608a5a1ddce158e132083323').display()" + "client.get_table(\"608a5a1ddce158e132083323\").display()" ] }, { diff --git a/mpcontribs-portal/notebooks/ml.materialsproject.org/get_started.ipynb b/mpcontribs-portal/notebooks/ml.materialsproject.org/get_started.ipynb index a13eefdc69..ed4e3c02dd 100644 --- a/mpcontribs-portal/notebooks/ml.materialsproject.org/get_started.ipynb +++ b/mpcontribs-portal/notebooks/ml.materialsproject.org/get_started.ipynb @@ -41,91 +41,103 @@ " \"clf_pos_label\": None,\n", " \"unit\": None,\n", " \"has_structure\": True,\n", - " }, {\n", + " },\n", + " {\n", " \"name\": \"log_gvrh\",\n", " \"data_file\": \"matbench_log_gvrh.json.gz\",\n", " \"target\": \"log10(G_VRH)\",\n", " \"clf_pos_label\": None,\n", " \"unit\": None,\n", " \"has_structure\": True,\n", - " }, {\n", + " },\n", + " {\n", " \"name\": \"dielectric\",\n", " \"data_file\": \"matbench_dielectric.json.gz\",\n", " \"target\": \"n\",\n", " \"clf_pos_label\": None,\n", " \"unit\": None,\n", " \"has_structure\": True,\n", - " }, {\n", + " },\n", + " {\n", " \"name\": \"jdft2d\",\n", " \"data_file\": \"matbench_jdft2d.json.gz\",\n", " \"target\": \"exfoliation_en\",\n", " \"clf_pos_label\": None,\n", " \"unit\": \"meV/atom\",\n", " \"has_structure\": True,\n", - " }, {\n", + " },\n", + " {\n", " \"name\": \"mp_gap\",\n", " \"data_file\": \"matbench_mp_gap.json.gz\",\n", " \"target\": \"gap pbe\",\n", " \"clf_pos_label\": None,\n", " \"unit\": \"eV\",\n", " \"has_structure\": True,\n", - " }, {\n", + " },\n", + " {\n", " \"name\": \"mp_is_metal\",\n", " \"data_file\": \"matbench_mp_is_metal.json.gz\",\n", " \"target\": \"is_metal\",\n", " \"clf_pos_label\": True,\n", " \"unit\": None,\n", " \"has_structure\": True,\n", - " }, {\n", + " },\n", + " {\n", " \"name\": \"mp_e_form\",\n", " \"data_file\": \"matbench_mp_e_form.json.gz\",\n", " \"target\": \"e_form\",\n", " \"clf_pos_label\": None,\n", " \"unit\": \"eV/atom\",\n", " \"has_structure\": True,\n", - " }, {\n", + " },\n", + " {\n", " \"name\": \"perovskites\",\n", " \"data_file\": \"matbench_perovskites.json.gz\",\n", " \"target\": \"e_form\",\n", " \"clf_pos_label\": None,\n", " \"unit\": \"eV\",\n", " \"has_structure\": True,\n", - " }, {\n", + " },\n", + " {\n", " \"name\": \"glass\",\n", " \"data_file\": \"matbench_glass.json.gz\",\n", " \"target\": \"gfa\",\n", " \"clf_pos_label\": True,\n", " \"unit\": None,\n", " \"has_structure\": False,\n", - " }, {\n", + " },\n", + " {\n", " \"name\": \"expt_is_metal\",\n", " \"data_file\": \"matbench_expt_is_metal.json.gz\",\n", " \"target\": \"is_metal\",\n", " \"clf_pos_label\": True,\n", " \"unit\": None,\n", " \"has_structure\": False,\n", - " }, {\n", + " },\n", + " {\n", " \"name\": \"expt_gap\",\n", " \"data_file\": \"matbench_expt_gap.json.gz\",\n", " \"target\": \"gap expt\",\n", " \"clf_pos_label\": None,\n", " \"unit\": \"eV\",\n", " \"has_structure\": False,\n", - " }, {\n", + " },\n", + " {\n", " \"name\": \"phonons\",\n", " \"data_file\": \"matbench_phonons.json.gz\",\n", " \"target\": \"last phdos peak\",\n", " \"clf_pos_label\": None,\n", " \"unit\": \"cm^-1\",\n", " \"has_structure\": True,\n", - " }, {\n", + " },\n", + " {\n", " \"name\": \"steels\",\n", " \"data_file\": \"matbench_steels.json.gz\",\n", " \"target\": \"yield strength\",\n", " \"clf_pos_label\": None,\n", " \"unit\": \"MPa\",\n", " \"has_structure\": False,\n", - " }\n", + " },\n", "]" ] }, @@ -159,7 +171,7 @@ "source": [ "pybtex.errors.set_strict_mode(False)\n", "mprester = MPRester()\n", - "client = Client(host='ml-api.materialsproject.org')" + "client = Client(host=\"ml-api.materialsproject.org\")" ] }, { @@ -168,16 +180,16 @@ "metadata": {}, "outputs": [], "source": [ - "datadir = Path('/Users/patrick/gitrepos/mp/mpcontribs-data/')\n", - "fn = Path('dataset_metadata.json')\n", + "datadir = Path(\"/Users/patrick/gitrepos/mp/mpcontribs-data/\")\n", + "fn = Path(\"dataset_metadata.json\")\n", "fp = datadir / fn\n", "if not fp.exists():\n", " prefix = \"https://raw.githubusercontent.com/hackingmaterials/matminer\"\n", - " url = f'{prefix}/master/matminer/datasets/{fn}'\n", + " url = f\"{prefix}/master/matminer/datasets/{fn}\"\n", " wget.download(url)\n", " fn.rename(fp)\n", - " \n", - "metadata = json.load(open(fp, 'r'))" + "\n", + "metadata = json.load(open(fp, \"r\"))" ] }, { @@ -199,50 +211,47 @@ " target = ds[\"target\"]\n", " columns = {\n", " target_map[target]: metadata[name][\"columns\"][target],\n", - " primitive_key: metadata[name][\"columns\"][primitive_key]\n", + " primitive_key: metadata[name][\"columns\"][primitive_key],\n", " }\n", " project = {\n", - " 'name': name,\n", - " 'is_public': True,\n", - " 'owner': 'ardunn@lbl.gov',\n", - " 'title': name, # TODO update and set long_title\n", - " 'authors': 'A. Dunn, A. Jain',\n", - " 'description': metadata[name]['description'] + \\\n", - " \" If you are viewing this on MPContribs-ML interactively, please ensure the order of the\"\n", + " \"name\": name,\n", + " \"is_public\": True,\n", + " \"owner\": \"ardunn@lbl.gov\",\n", + " \"title\": name, # TODO update and set long_title\n", + " \"authors\": \"A. Dunn, A. Jain\",\n", + " \"description\": metadata[name][\"description\"]\n", + " + \" If you are viewing this on MPContribs-ML interactively, please ensure the order of the\"\n", " f\"identifiers is sequential (mb-{ds['name']}-0001, mb-{ds['name']}-0002, etc.) before benchmarking.\",\n", - " 'other': {\n", - " 'columns': columns,\n", - " 'entries': metadata[name]['num_entries']\n", - " },\n", - " 'references': [\n", - " {'label': 'RawData', 'url': metadata[\"name\"][\"url\"]}\n", - " ]\n", + " \"other\": {\"columns\": columns, \"entries\": metadata[name][\"num_entries\"]},\n", + " \"references\": [{\"label\": \"RawData\", \"url\": metadata[\"name\"][\"url\"]}],\n", " }\n", - " \n", - " for ref in metadata[name]['bibtex_refs']:\n", + "\n", + " for ref in metadata[name][\"bibtex_refs\"]:\n", " if name == \"matbench_phonons\":\n", " ref = ref.replace(\n", " \"petretto_dwaraknath_miranda_winston_giantomassi_rignanese_van setten_gonze_persson_hautier_2018\",\n", - " \"petretto2018\"\n", + " \"petretto2018\",\n", " )\n", - " \n", - " bib = parse_string(ref, 'bibtex')\n", + "\n", + " bib = parse_string(ref, \"bibtex\")\n", " for key, entry in bib.entries.items():\n", - " key_is_doi = key.startswith('doi:')\n", - " url = 'https://doi.org/' + key.split(':', 1)[-1] if key_is_doi else entry.fields.get('url')\n", - " k = 'Zhuo2018' if key_is_doi else capwords(key.replace('_', ''))\n", - " if k.startswith('C2'):\n", - " k = 'Castelli2012'\n", - " elif k.startswith('Landolt'):\n", - " k = 'LB1997'\n", - " elif k == 'Citrine':\n", - " url = 'https://www.citrination.com'\n", - " \n", + " key_is_doi = key.startswith(\"doi:\")\n", + " url = (\n", + " \"https://doi.org/\" + key.split(\":\", 1)[-1]\n", + " if key_is_doi\n", + " else entry.fields.get(\"url\")\n", + " )\n", + " k = \"Zhuo2018\" if key_is_doi else capwords(key.replace(\"_\", \"\"))\n", + " if k.startswith(\"C2\"):\n", + " k = \"Castelli2012\"\n", + " elif k.startswith(\"Landolt\"):\n", + " k = \"LB1997\"\n", + " elif k == \"Citrine\":\n", + " url = \"https://www.citrination.com\"\n", + "\n", " if len(k) > 8:\n", " k = k[:4] + k[-4:]\n", - " project['references'].append(\n", - " {'label': k, 'url': url}\n", - " )\n", + " project[\"references\"].append({\"label\": k, \"url\": url})\n", "\n", " try:\n", " client.projects.getProjectByName(pk=name, _fields=[\"name\"]).result()\n", @@ -285,7 +294,7 @@ "\n", " for i, row in tqdm(enumerate(df.iterrows()), total=df.shape[0]):\n", " entry = row[1]\n", - " contrib = {'project': name, 'is_public': True}\n", + " contrib = {\"project\": name, \"is_public\": True}\n", "\n", " if \"structure\" in entry.index:\n", " s = entry.loc[\"structure\"]\n", @@ -296,7 +305,7 @@ " else:\n", " c = entry[\"composition\"]\n", "\n", - " id_number = f\"{i+1:0{id_n_zeros}d}\"\n", + " id_number = f\"{i + 1:0{id_n_zeros}d}\"\n", " identifier = f\"mb-{ds['name']}-{id_number}\"\n", " contrib[\"identifier\"] = identifier\n", " contrib[\"data\"] = {target_map[target]: f\"{entry.loc[target]}{unit}\"}\n", @@ -305,7 +314,7 @@ "\n", " with open(fn, \"w\") as f:\n", " json.dump(contributions, f, cls=MontyEncoder)\n", - " \n", + "\n", " print(\"saved to\", fn)" ] }, diff --git a/mpcontribs-portal/supervisord/conf.py b/mpcontribs-portal/supervisord/conf.py index 4fb68a6d8e..7b2fd63336 100644 --- a/mpcontribs-portal/supervisord/conf.py +++ b/mpcontribs-portal/supervisord/conf.py @@ -15,7 +15,7 @@ "api_port": api_port, "portal_port": portal_port, "s3": s3, - "tm": tm.upper() + "tm": tm.upper(), } kwargs = { diff --git a/mpcontribs-serverless/make_download/app.py b/mpcontribs-serverless/make_download/app.py index 96f98401a7..8c97bce147 100644 --- a/mpcontribs-serverless/make_download/app.py +++ b/mpcontribs-serverless/make_download/app.py @@ -11,18 +11,19 @@ logger = logging.getLogger() logger.setLevel(os.environ["MPCONTRIBS_CLIENT_LOG_LEVEL"]) -s3_client = boto3.client('s3') +s3_client = boto3.client("s3") timeout = int(os.environ["LAMBDA_TIMEOUT"]) redis_address = os.environ["REDIS_ADDRESS"] store = Redis.from_url(f"redis://{redis_address}") store.ping() + def get_remaining(event, context): - remaining = context.get_remaining_time_in_millis() / 1000. - 0.5 + remaining = context.get_remaining_time_in_millis() / 1000.0 - 0.5 if remaining < 3: raise ValueError("TIMEOUT in 3s!") - elapsed_pct = (timeout - remaining) / timeout * 100. + elapsed_pct = (timeout - remaining) / timeout * 100.0 store.set(event["redis_key"], f"{elapsed_pct:.1f}") return remaining @@ -34,9 +35,7 @@ def lambda_handler(event, context): bucket, filename, fmt, version = event["redis_key"].split(":") try: - client = Client( - host=event["host"], headers=event["headers"], project=project - ) + client = Client(host=event["host"], headers=event["headers"], project=project) remaining = get_remaining(event, context) tmpdir = Path("/tmp") outdir = tmpdir / filename @@ -49,9 +48,11 @@ def lambda_handler(event, context): zipfile = outdir.with_suffix(".zip") resp = zipfile.read_bytes() s3_client.put_object( - Bucket=bucket, Key=f"{filename}_{fmt}.zip", + Bucket=bucket, + Key=f"{filename}_{fmt}.zip", Metadata={"version": version}, - Body=resp, ContentType="application/zip" + Body=resp, + ContentType="application/zip", ) get_remaining(event, context) rmtree(outdir) diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000000..7826c72ae1 --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,9 @@ +[project] +name = "fastapi-conversion" +version = "0.1.0" +description = "Add your description here" +readme = "README.md" +requires-python = ">=3.14" +dependencies = [ + "fastapi>=0.136.3", +] diff --git a/uv.lock b/uv.lock new file mode 100644 index 0000000000..1ea3d847d9 --- /dev/null +++ b/uv.lock @@ -0,0 +1,158 @@ +version = 1 +revision = 3 +requires-python = ">=3.14" + +[[package]] +name = "annotated-doc" +version = "0.0.4" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/57/ba/046ceea27344560984e26a590f90bc7f4a75b06701f653222458922b558c/annotated_doc-0.0.4.tar.gz", hash = "sha256:fbcda96e87e9c92ad167c2e53839e57503ecfda18804ea28102353485033faa4", size = 7288, upload-time = "2025-11-10T22:07:42.062Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/1e/d3/26bf1008eb3d2daa8ef4cacc7f3bfdc11818d111f7e2d0201bc6e3b49d45/annotated_doc-0.0.4-py3-none-any.whl", hash = "sha256:571ac1dc6991c450b25a9c2d84a3705e2ae7a53467b5d111c24fa8baabbed320", size = 5303, upload-time = "2025-11-10T22:07:40.673Z" }, +] + +[[package]] +name = "annotated-types" +version = "0.7.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/ee/67/531ea369ba64dcff5ec9c3402f9f51bf748cec26dde048a2f973a4eea7f5/annotated_types-0.7.0.tar.gz", hash = "sha256:aff07c09a53a08bc8cfccb9c85b05f1aa9a2a6f23728d790723543408344ce89", size = 16081, upload-time = "2024-05-20T21:33:25.928Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/78/b6/6307fbef88d9b5ee7421e68d78a9f162e0da4900bc5f5793f6d3d0e34fb8/annotated_types-0.7.0-py3-none-any.whl", hash = "sha256:1f02e8b43a8fbbc3f3e0d4f0f4bfc8131bcb4eebe8849b8e5c773f3a1c582a53", size = 13643, upload-time = "2024-05-20T21:33:24.1Z" }, +] + +[[package]] +name = "anyio" +version = "4.13.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "idna" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/19/14/2c5dd9f512b66549ae92767a9c7b330ae88e1932ca57876909410251fe13/anyio-4.13.0.tar.gz", hash = "sha256:334b70e641fd2221c1505b3890c69882fe4a2df910cba14d97019b90b24439dc", size = 231622, upload-time = "2026-03-24T12:59:09.671Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/da/42/e921fccf5015463e32a3cf6ee7f980a6ed0f395ceeaa45060b61d86486c2/anyio-4.13.0-py3-none-any.whl", hash = "sha256:08b310f9e24a9594186fd75b4f73f4a4152069e3853f1ed8bfbf58369f4ad708", size = 114353, upload-time = "2026-03-24T12:59:08.246Z" }, +] + +[[package]] +name = "fastapi" +version = "0.136.3" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "annotated-doc" }, + { name = "pydantic" }, + { name = "starlette" }, + { name = "typing-extensions" }, + { name = "typing-inspection" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/81/2d/ff8d91d7b564d464629a0fd50a4489c97fcb836ac230bf3a7269232a9b1f/fastapi-0.136.3.tar.gz", hash = "sha256:e487fae93ad408e6f47641ee4dfe389864fd7bec92e547ea8498fc13f43e83ab", size = 396410, upload-time = "2026-05-23T18:53:15.192Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/e0/82/45359b62a067409bd929ae8a56b8ed13e5a8c8a61194b3c236920999ab83/fastapi-0.136.3-py3-none-any.whl", hash = "sha256:3d2a69bdf04b7e9f3afa292c3bc7a98816bbfafa10bc9b45f3f3700d2f761620", size = 117481, upload-time = "2026-05-23T18:53:16.924Z" }, +] + +[[package]] +name = "fastapi-conversion" +version = "0.1.0" +source = { virtual = "." } +dependencies = [ + { name = "fastapi" }, +] + +[package.metadata] +requires-dist = [{ name = "fastapi", specifier = ">=0.136.3" }] + +[[package]] +name = "idna" +version = "3.16" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/1a/88/bcf9709822fe69d02c2a6a77956c98ce6ea8ca8767a9aadcedc7eb6a2390/idna-3.16.tar.gz", hash = "sha256:d7a6da03db833450fca25d2358ac9ff06cd624577a4aea3a596d5c0f77b8e03d", size = 203770, upload-time = "2026-05-22T00:16:18.781Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/94/16/70255075a9859a0e3adb789b68ceb0e210dec03934245fd98d248226572f/idna-3.16-py3-none-any.whl", hash = "sha256:cc246e3a3f89580c3a951b5ad298ca4638078b2cdd4f115654332b5c26daded5", size = 74165, upload-time = "2026-05-22T00:16:16.698Z" }, +] + +[[package]] +name = "pydantic" +version = "2.13.4" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "annotated-types" }, + { name = "pydantic-core" }, + { name = "typing-extensions" }, + { name = "typing-inspection" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/18/a5/b60d21ac674192f8ab0ba4e9fd860690f9b4a6e51ca5df118733b487d8d6/pydantic-2.13.4.tar.gz", hash = "sha256:c40756b57adaa8b1efeeced5c196f3f3b7c435f90e84ea7f443901bec8099ef6", size = 844775, upload-time = "2026-05-06T13:43:05.343Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/fd/7b/122376b1fd3c62c1ed9dc80c931ace4844b3c55407b6fb2d199377c9736f/pydantic-2.13.4-py3-none-any.whl", hash = "sha256:45a282cde31d808236fd7ea9d919b128653c8b38b393d1c4ab335c62924d9aba", size = 472262, upload-time = "2026-05-06T13:43:02.641Z" }, +] + +[[package]] +name = "pydantic-core" +version = "2.46.4" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "typing-extensions" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/9d/56/921726b776ace8d8f5db44c4ef961006580d91dc52b803c489fafd1aa249/pydantic_core-2.46.4.tar.gz", hash = "sha256:62f875393d7f270851f20523dd2e29f082bcc82292d66db2b64ea71f64b6e1c1", size = 471464, upload-time = "2026-05-06T13:37:06.98Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/8d/74/228a26ddad29c6672b805d9fd78e8d251cd04004fa7eed0e622096cd0250/pydantic_core-2.46.4-cp314-cp314-macosx_10_12_x86_64.whl", hash = "sha256:428e04521a40150c85216fc8b85e8d39fece235a9cf5e383761238c7fa9b96fb", size = 2102079, upload-time = "2026-05-06T13:38:41.019Z" }, + { url = "https://files.pythonhosted.org/packages/ad/1f/8970b150a4b4365623ae00fc88603491f763c627311ae8031e3111356d6e/pydantic_core-2.46.4-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:23ace664830ee0bfe014a0c7bc248b1f7f25ed7ad103852c317624a1083af462", size = 1952179, upload-time = "2026-05-06T13:36:59.812Z" }, + { url = "https://files.pythonhosted.org/packages/95/30/5211a831ae054928054b2f79731661087a2bc5c01e825c672b3a4a8f1b3e/pydantic_core-2.46.4-cp314-cp314-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ce5c1d2a8b27468f433ca974829c44060b8097eedc39933e3c206a90ee49c4a9", size = 1978926, upload-time = "2026-05-06T13:37:39.933Z" }, + { url = "https://files.pythonhosted.org/packages/57/e9/689668733b1eb67adeef047db3c2e8788fcf65a7fd9c9e2b46b7744fe245/pydantic_core-2.46.4-cp314-cp314-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:7283d57845ecf5a163403eb0702dfc220cc4fbdd18919cb5ccea4f95ee1cdab4", size = 2046785, upload-time = "2026-05-06T13:38:01.995Z" }, + { url = "https://files.pythonhosted.org/packages/60/d9/6715260422ff50a2109878fd24d948a6c3446bb2664f34ee78cd972b3acd/pydantic_core-2.46.4-cp314-cp314-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:8daafc69c93ee8a0204506a3b6b30f586ef54028f52aeeeb5c4cfc5184fd5914", size = 2228733, upload-time = "2026-05-06T13:40:50.371Z" }, + { url = "https://files.pythonhosted.org/packages/18/ae/fdb2f64316afca925640f8e70bb1a564b0ec2721c1389e25b8eb4bf9a299/pydantic_core-2.46.4-cp314-cp314-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:cd2213145bcc2ba85884d0ac63d222fece9209678f77b9b4d76f054c561adb28", size = 2307534, upload-time = "2026-05-06T13:37:21.531Z" }, + { url = "https://files.pythonhosted.org/packages/89/1d/8eff589b45bb8190a9d12c49cfad0f176a5cbd1534908a6b5125e2886239/pydantic_core-2.46.4-cp314-cp314-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7a5f930472650a82629163023e630d160863fce524c616f4e5186e5de9d9a49b", size = 2099732, upload-time = "2026-05-06T13:39:31.942Z" }, + { url = "https://files.pythonhosted.org/packages/06/d5/ee5a3366637fee41dee51a1fc91562dcf12ddbc68fda34e6b253da2324bb/pydantic_core-2.46.4-cp314-cp314-manylinux_2_31_riscv64.whl", hash = "sha256:c1b3f518abeca3aa13c712fd202306e145abf59a18b094a6bafb2d2bbf59192c", size = 2129627, upload-time = "2026-05-06T13:37:25.033Z" }, + { url = "https://files.pythonhosted.org/packages/94/33/2414be571d2c6a6c4d08be21f9292b6d3fdb08949a97b6dfe985017821db/pydantic_core-2.46.4-cp314-cp314-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:1a7dd0b3ee80d90150e3495a3a13ac34dbcbfd4f012996a6a1d8900e91b5c0fb", size = 2179141, upload-time = "2026-05-06T13:37:14.046Z" }, + { url = "https://files.pythonhosted.org/packages/7b/79/7daa95be995be0eecc4cf75064cb33f9bbbfe3fe0158caf2f0d4a996a5c7/pydantic_core-2.46.4-cp314-cp314-musllinux_1_1_aarch64.whl", hash = "sha256:3fb702cd90b0446a3a1c5e470bfa0dd23c0233b676a9099ddcc964fa6ca13898", size = 2184325, upload-time = "2026-05-06T13:36:53.615Z" }, + { url = "https://files.pythonhosted.org/packages/9f/cb/d0a382f5c0de8a222dc61c65348e0ce831b1f68e0a018450d31c2cace3a5/pydantic_core-2.46.4-cp314-cp314-musllinux_1_1_armv7l.whl", hash = "sha256:b8458003118a712e66286df6a707db01c52c0f52f7db8e4a38f0da1d3b94fc4e", size = 2323990, upload-time = "2026-05-06T13:40:29.971Z" }, + { url = "https://files.pythonhosted.org/packages/05/db/d9ba624cc4a5aced1598e88c04fdbd8310c8a69b9d38b9a3d39ce3a61ed7/pydantic_core-2.46.4-cp314-cp314-musllinux_1_1_x86_64.whl", hash = "sha256:372429a130e469c9cd698925ce5fc50940b7a1336b0d82038e63d5bbc4edc519", size = 2369978, upload-time = "2026-05-06T13:37:23.027Z" }, + { url = "https://files.pythonhosted.org/packages/f2/20/d15df15ba918c423461905802bfd2981c3af0bfa0e40d05e13edbfa48bc3/pydantic_core-2.46.4-cp314-cp314-win32.whl", hash = "sha256:85bb3611ff1802f3ee7fdd7dbff26b56f343fb432d57a4728fdd49b6ef35e2f4", size = 1966354, upload-time = "2026-05-06T13:38:03.499Z" }, + { url = "https://files.pythonhosted.org/packages/fc/b6/6b8de4c0a7d7ab3004c439c80c5c1e0a3e8d78bbae19379b01960383d9e5/pydantic_core-2.46.4-cp314-cp314-win_amd64.whl", hash = "sha256:811ff8e9c313ab425368bcbb36e5c4ebd7108c2bbf4e4089cfbb0b01eff63fac", size = 2072238, upload-time = "2026-05-06T13:39:40.807Z" }, + { url = "https://files.pythonhosted.org/packages/32/36/51eb763beec1f4cf59b1db243a7dcc39cbb41230f050a09b9d69faaf0a48/pydantic_core-2.46.4-cp314-cp314-win_arm64.whl", hash = "sha256:bfec22eab3c8cc2ceec0248aec886624116dc079afa027ecc8ad4a7e62010f8a", size = 2018251, upload-time = "2026-05-06T13:37:26.72Z" }, + { url = "https://files.pythonhosted.org/packages/e8/91/855af51d625b23aa987116a19e231d2aaef9c4a415273ddc189b79a45fee/pydantic_core-2.46.4-cp314-cp314t-macosx_10_12_x86_64.whl", hash = "sha256:af8244b2bef6aaad6d92cda81372de7f8c8d36c9f0c3ea36e827c60e7d9467a0", size = 2099593, upload-time = "2026-05-06T13:39:47.682Z" }, + { url = "https://files.pythonhosted.org/packages/fb/1b/8784a54c65edb5f49f0a14d6977cf1b209bba85a4c77445b255c2de58ab3/pydantic_core-2.46.4-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:5a4330cdbc57162e4b3aa303f588ba752257694c9c9be3e7ebb11b4aca659b5d", size = 1935226, upload-time = "2026-05-06T13:40:40.428Z" }, + { url = "https://files.pythonhosted.org/packages/e8/e7/1955d28d1afc56dd4b3ad7cc0cf39df1b9852964cf16e5d13912756d6d6b/pydantic_core-2.46.4-cp314-cp314t-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:29c61fc04a3d840155ff08e475a04809278972fe6aef51e2720554e96367e34b", size = 1974605, upload-time = "2026-05-06T13:37:32.029Z" }, + { url = "https://files.pythonhosted.org/packages/93/e2/3fedbf0ba7a22850e6e9fd78117f1c0f10f950182344d8a6c535d468fdd8/pydantic_core-2.46.4-cp314-cp314t-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:c50f2528cf200c5eed56faf3f4e22fcd5f38c157a8b78576e6ba3168ec35f000", size = 2030777, upload-time = "2026-05-06T13:38:55.239Z" }, + { url = "https://files.pythonhosted.org/packages/f8/61/46be275fcaaba0b4f5b9669dd852267ce1ff616592dccf7a7845588df091/pydantic_core-2.46.4-cp314-cp314t-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:0cbe8b01f948de4286c74cdd6c667aceb38f5c1e26f0693b3983d9d74887c65e", size = 2236641, upload-time = "2026-05-06T13:37:08.096Z" }, + { url = "https://files.pythonhosted.org/packages/60/db/12e93e46a8bac9988be3c016860f83293daea8c716c029c9ace279036f2f/pydantic_core-2.46.4-cp314-cp314t-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:617d7e2ca7dcb8c5cf6bcb8c59b8832c94b36196bbf1cbd1bfb56ed341905edd", size = 2286404, upload-time = "2026-05-06T13:40:20.221Z" }, + { url = "https://files.pythonhosted.org/packages/e2/4a/4d8b19008f38d31c53b8219cfedc2e3d5de5fe99d90076b7e767de29274f/pydantic_core-2.46.4-cp314-cp314t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7027560ee92211647d0d34e3f7cd6f50da56399d26a9c8ad0da286d3869a53f3", size = 2109219, upload-time = "2026-05-06T13:38:12.153Z" }, + { url = "https://files.pythonhosted.org/packages/88/70/3cbc40978fefb7bb09c6708d40d4ad1a5d70fd7213c3d17f971de868ec1f/pydantic_core-2.46.4-cp314-cp314t-manylinux_2_31_riscv64.whl", hash = "sha256:f99626688942fb746e545232e7726926f3be91b5975f8b55327665fafda991c7", size = 2110594, upload-time = "2026-05-06T13:40:02.971Z" }, + { url = "https://files.pythonhosted.org/packages/9d/20/b8d36736216e29491125531685b2f9e61aa5b4b2599893f8268551da3338/pydantic_core-2.46.4-cp314-cp314t-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:fc3e9034a63de20e15e8ade85358bc6efc614008cab72898b4b4952bea0509ff", size = 2159542, upload-time = "2026-05-06T13:39:27.506Z" }, + { url = "https://files.pythonhosted.org/packages/1d/a2/367df868eb584dacf6bf82a389272406d7178e301c4ac82545ab98bc2dd9/pydantic_core-2.46.4-cp314-cp314t-musllinux_1_1_aarch64.whl", hash = "sha256:97e7cf2be5c77b7d1a9713a05605d49460d02c6078d38d8bef3cbe323c548424", size = 2168146, upload-time = "2026-05-06T13:38:31.93Z" }, + { url = "https://files.pythonhosted.org/packages/c1/b8/4460f77f7e201893f649a29ab355dddd3beee8a97bcb1a320db414f9a06e/pydantic_core-2.46.4-cp314-cp314t-musllinux_1_1_armv7l.whl", hash = "sha256:3bf92c5d0e00fefaab325a4d27828fe6b6e2a21848686b5b60d2d9eeb09d76c6", size = 2306309, upload-time = "2026-05-06T13:37:44.717Z" }, + { url = "https://files.pythonhosted.org/packages/64/c4/be2639293acd87dc8ddbcec41a73cee9b2ebf996fe6d892a1a74e88ad3f7/pydantic_core-2.46.4-cp314-cp314t-musllinux_1_1_x86_64.whl", hash = "sha256:3ecbc122d18468d06ca279dc26a8c2e2d5acb10943bb35e36ae92096dc3b5565", size = 2369736, upload-time = "2026-05-06T13:37:05.645Z" }, + { url = "https://files.pythonhosted.org/packages/30/a6/9f9f380dbb301f67023bf8f707aaa75daadf84f7152d95c410fd7e81d994/pydantic_core-2.46.4-cp314-cp314t-win32.whl", hash = "sha256:e846ae7835bf0703ae43f534ab79a867146dadd59dc9ca5c8b53d5c8f7c9ef02", size = 1955575, upload-time = "2026-05-06T13:38:51.116Z" }, + { url = "https://files.pythonhosted.org/packages/40/1f/f1eb9eb350e795d1af8586289746f5c5677d16043040d63710e22abc43c9/pydantic_core-2.46.4-cp314-cp314t-win_amd64.whl", hash = "sha256:2108ba5c1c1eca18030634489dc544844144ee36357f2f9f780b93e7ddbb44b5", size = 2051624, upload-time = "2026-05-06T13:38:21.672Z" }, + { url = "https://files.pythonhosted.org/packages/f6/d2/42dd53d0a85c27606f316d3aa5d2869c4e8470a5ed6dec30e4a1abe19192/pydantic_core-2.46.4-cp314-cp314t-win_arm64.whl", hash = "sha256:4fcbe087dbc2068af7eda3aa87634eba216dbda64d1ae73c8684b621d33f6596", size = 2017325, upload-time = "2026-05-06T13:40:52.723Z" }, +] + +[[package]] +name = "starlette" +version = "1.1.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "anyio" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/95/66/4d20cdf39a8d6a51e663b7038e3b828ff211d3891a43a713fe7e4643f3a8/starlette-1.1.0.tar.gz", hash = "sha256:e83c7fe0ddecd8719c5b840080325aec0260acec86e9832899e377b91d65e90f", size = 2660060, upload-time = "2026-05-23T16:55:41.376Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/93/79/920b8e0a8b20f793e8d64855095cb8febabf6175b8550b6f7a547d813891/starlette-1.1.0-py3-none-any.whl", hash = "sha256:7f0dfd38e428aad5cb6f9f667f0ca1d2d8ca3f3385dccac8305f79ec98458382", size = 72899, upload-time = "2026-05-23T16:55:39.201Z" }, +] + +[[package]] +name = "typing-extensions" +version = "4.15.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/72/94/1a15dd82efb362ac84269196e94cf00f187f7ed21c242792a923cdb1c61f/typing_extensions-4.15.0.tar.gz", hash = "sha256:0cea48d173cc12fa28ecabc3b837ea3cf6f38c6d1136f85cbaaf598984861466", size = 109391, upload-time = "2025-08-25T13:49:26.313Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/18/67/36e9267722cc04a6b9f15c7f3441c2363321a3ea07da7ae0c0707beb2a9c/typing_extensions-4.15.0-py3-none-any.whl", hash = "sha256:f0fa19c6845758ab08074a0cfa8b7aecb71c999ca73d62883bc25cc018c4e548", size = 44614, upload-time = "2025-08-25T13:49:24.86Z" }, +] + +[[package]] +name = "typing-inspection" +version = "0.4.2" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "typing-extensions" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/55/e3/70399cb7dd41c10ac53367ae42139cf4b1ca5f36bb3dc6c9d33acdb43655/typing_inspection-0.4.2.tar.gz", hash = "sha256:ba561c48a67c5958007083d386c3295464928b01faa735ab8547c5692e87f464", size = 75949, upload-time = "2025-10-01T02:14:41.687Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/dc/9b/47798a6c91d8bdb567fe2698fe81e0c6b7cb7ef4d13da4114b41d239f65d/typing_inspection-0.4.2-py3-none-any.whl", hash = "sha256:4ed1cacbdc298c220f1bd249ed5287caa16f34d44ef4e9c3d0cbad5b521545e7", size = 14611, upload-time = "2025-10-01T02:14:40.154Z" }, +] From 3c79379a08618dd2e2023e4a5ad94cd1eff72b9c Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 28 May 2026 15:33:26 -0700 Subject: [PATCH 002/591] Added .venv and .env to gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 249cd86aa8..dea1ffa5db 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,5 @@ coverage.xml mpcontribs-api/supervisord.conf mpcontribs-portal/supervisord.conf **/.DS_Store +.venv/ +.env From 4d5c64fa593b4c324dce1d7f572c70c2e19ab408 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 28 May 2026 15:36:31 -0700 Subject: [PATCH 003/591] Moved dev optional-dependencies to a dependency group --- mpcontribs-api/pyproject.toml | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/mpcontribs-api/pyproject.toml b/mpcontribs-api/pyproject.toml index d64166fd3c..78464c7390 100644 --- a/mpcontribs-api/pyproject.toml +++ b/mpcontribs-api/pyproject.toml @@ -58,22 +58,28 @@ dependencies = [ "uncertainties", "websocket_client", "zstandard", + "fastapi>=0.136.3", + "pymongo>=4.17.0", + "pydantic-settings>=2.14.1", + "structlog>=25.5.0", + "opentelemetry-api>=1.42.1", + "opentelemetry-sdk>=1.42.1", + "opentelemetry-exporter-otlp-proto-grpc>=1.42.1", + "opentelemetry-instrumentation-fastapi>=0.63b1", + "opentelemetry-instrumentation-pymongo>=0.63b1", ] [project.urls] Homepage = "https://github.com/materialsproject/MPContribs" Documentation = "https://docs.materialsproject.org/services/mpcontribs" -[project.optional-dependencies] +[dependency-groups] dev = [ - "flake8", - "pytest", - "pytest-flake8", - "pytest-pycodestyle", - "pytest-xdist", -] -all = [ - "mpcontribs-api[dev]" + "flake8>=7.3.0", + "pytest>=9.0.3", + "pytest-flake8>=1.3.0", + "pytest-pycodestyle>=2.5.0", + "pytest-xdist>=3.8.0", ] [tool.pytest] From 8ebb3f61fbefb4d5528cbd131fc7b2a1d4c409de Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 28 May 2026 15:37:02 -0700 Subject: [PATCH 004/591] Synced lock file --- mpcontribs-api/uv.lock | 4821 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 4821 insertions(+) create mode 100644 mpcontribs-api/uv.lock diff --git a/mpcontribs-api/uv.lock b/mpcontribs-api/uv.lock new file mode 100644 index 0000000000..e98ba4cd0e --- /dev/null +++ b/mpcontribs-api/uv.lock @@ -0,0 +1,4821 @@ +version = 1 +revision = 3 +requires-python = ">=3.11" +resolution-markers = [ + "python_full_version >= '3.14' and sys_platform == 'win32'", + "python_full_version >= '3.14' and sys_platform != 'win32'", + "python_full_version == '3.13.*' and sys_platform == 'win32'", + "python_full_version == '3.13.*' and sys_platform != 'win32'", + "python_full_version == '3.12.*' and sys_platform == 'win32'", + "python_full_version == '3.12.*' and sys_platform != 'win32'", + "python_full_version < '3.12' and sys_platform == 'win32'", + "python_full_version < '3.12' and sys_platform != 'win32'", +] + +[[package]] +name = "annotated-doc" +version = "0.0.4" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/57/ba/046ceea27344560984e26a590f90bc7f4a75b06701f653222458922b558c/annotated_doc-0.0.4.tar.gz", hash = "sha256:fbcda96e87e9c92ad167c2e53839e57503ecfda18804ea28102353485033faa4", size = 7288, upload-time = "2025-11-10T22:07:42.062Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/1e/d3/26bf1008eb3d2daa8ef4cacc7f3bfdc11818d111f7e2d0201bc6e3b49d45/annotated_doc-0.0.4-py3-none-any.whl", hash = "sha256:571ac1dc6991c450b25a9c2d84a3705e2ae7a53467b5d111c24fa8baabbed320", size = 5303, upload-time = "2025-11-10T22:07:40.673Z" }, +] + +[[package]] +name = "annotated-types" +version = "0.7.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/ee/67/531ea369ba64dcff5ec9c3402f9f51bf748cec26dde048a2f973a4eea7f5/annotated_types-0.7.0.tar.gz", hash = "sha256:aff07c09a53a08bc8cfccb9c85b05f1aa9a2a6f23728d790723543408344ce89", size = 16081, upload-time = "2024-05-20T21:33:25.928Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/78/b6/6307fbef88d9b5ee7421e68d78a9f162e0da4900bc5f5793f6d3d0e34fb8/annotated_types-0.7.0-py3-none-any.whl", hash = "sha256:1f02e8b43a8fbbc3f3e0d4f0f4bfc8131bcb4eebe8849b8e5c773f3a1c582a53", size = 13643, upload-time = "2024-05-20T21:33:24.1Z" }, +] + +[[package]] +name = "anyio" +version = "4.13.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "idna" }, + { name = "typing-extensions", marker = "python_full_version < '3.13'" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/19/14/2c5dd9f512b66549ae92767a9c7b330ae88e1932ca57876909410251fe13/anyio-4.13.0.tar.gz", hash = "sha256:334b70e641fd2221c1505b3890c69882fe4a2df910cba14d97019b90b24439dc", size = 231622, upload-time = "2026-03-24T12:59:09.671Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/da/42/e921fccf5015463e32a3cf6ee7f980a6ed0f395ceeaa45060b61d86486c2/anyio-4.13.0-py3-none-any.whl", hash = "sha256:08b310f9e24a9594186fd75b4f73f4a4152069e3853f1ed8bfbf58369f4ad708", size = 114353, upload-time = "2026-03-24T12:59:08.246Z" }, +] + +[[package]] +name = "apispec" +version = "5.2.2" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/39/bb/2910f46ecba16334c19e4f02906b1fdb0e69f9c3fd9a21afcf86c45ba89e/apispec-5.2.2.tar.gz", hash = "sha256:6ea6542e1ebffe9fd95ba01ef3f51351eac6c200a974562c7473059b9cd20aa7", size = 75729, upload-time = "2022-05-12T22:18:20.648Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/7b/bf/8ab9b532c9a22e9cc4920ed7436fde5f207807346564b95d9782f1e2aa5e/apispec-5.2.2-py3-none-any.whl", hash = "sha256:f5f0d6b452c3e4a0e0922dce8815fac89dc4dbc758acef21fb9e01584d6602a5", size = 29618, upload-time = "2022-05-12T22:18:19.235Z" }, +] + +[[package]] +name = "appnope" +version = "0.1.4" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/35/5d/752690df9ef5b76e169e68d6a129fa6d08a7100ca7f754c89495db3c6019/appnope-0.1.4.tar.gz", hash = "sha256:1de3860566df9caf38f01f86f65e0e13e379af54f9e4bee1e66b48f2efffd1ee", size = 4170, upload-time = "2024-02-06T09:43:11.258Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/81/29/5ecc3a15d5a33e31b26c11426c45c501e439cb865d0bff96315d86443b78/appnope-0.1.4-py2.py3-none-any.whl", hash = "sha256:502575ee11cd7a28c0205f379b525beefebab9d161b7c964670864014ed7213c", size = 4321, upload-time = "2024-02-06T09:43:09.663Z" }, +] + +[[package]] +name = "argon2-cffi" +version = "25.1.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "argon2-cffi-bindings" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/0e/89/ce5af8a7d472a67cc819d5d998aa8c82c5d860608c4db9f46f1162d7dab9/argon2_cffi-25.1.0.tar.gz", hash = "sha256:694ae5cc8a42f4c4e2bf2ca0e64e51e23a040c6a517a85074683d3959e1346c1", size = 45706, upload-time = "2025-06-03T06:55:32.073Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/4f/d3/a8b22fa575b297cd6e3e3b0155c7e25db170edf1c74783d6a31a2490b8d9/argon2_cffi-25.1.0-py3-none-any.whl", hash = "sha256:fdc8b074db390fccb6eb4a3604ae7231f219aa669a2652e0f20e16ba513d5741", size = 14657, upload-time = "2025-06-03T06:55:30.804Z" }, +] + +[[package]] +name = "argon2-cffi-bindings" +version = "25.1.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "cffi" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/5c/2d/db8af0df73c1cf454f71b2bbe5e356b8c1f8041c979f505b3d3186e520a9/argon2_cffi_bindings-25.1.0.tar.gz", hash = "sha256:b957f3e6ea4d55d820e40ff76f450952807013d361a65d7f28acc0acbf29229d", size = 1783441, upload-time = "2025-07-30T10:02:05.147Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/60/97/3c0a35f46e52108d4707c44b95cfe2afcafc50800b5450c197454569b776/argon2_cffi_bindings-25.1.0-cp314-cp314t-macosx_10_13_universal2.whl", hash = "sha256:3d3f05610594151994ca9ccb3c771115bdb4daef161976a266f0dd8aa9996b8f", size = 54393, upload-time = "2025-07-30T10:01:40.97Z" }, + { url = "https://files.pythonhosted.org/packages/9d/f4/98bbd6ee89febd4f212696f13c03ca302b8552e7dbf9c8efa11ea4a388c3/argon2_cffi_bindings-25.1.0-cp314-cp314t-macosx_10_13_x86_64.whl", hash = "sha256:8b8efee945193e667a396cbc7b4fb7d357297d6234d30a489905d96caabde56b", size = 29328, upload-time = "2025-07-30T10:01:41.916Z" }, + { url = "https://files.pythonhosted.org/packages/43/24/90a01c0ef12ac91a6be05969f29944643bc1e5e461155ae6559befa8f00b/argon2_cffi_bindings-25.1.0-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:3c6702abc36bf3ccba3f802b799505def420a1b7039862014a65db3205967f5a", size = 31269, upload-time = "2025-07-30T10:01:42.716Z" }, + { url = "https://files.pythonhosted.org/packages/d4/d3/942aa10782b2697eee7af5e12eeff5ebb325ccfb86dd8abda54174e377e4/argon2_cffi_bindings-25.1.0-cp314-cp314t-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:a1c70058c6ab1e352304ac7e3b52554daadacd8d453c1752e547c76e9c99ac44", size = 86558, upload-time = "2025-07-30T10:01:43.943Z" }, + { url = "https://files.pythonhosted.org/packages/0d/82/b484f702fec5536e71836fc2dbc8c5267b3f6e78d2d539b4eaa6f0db8bf8/argon2_cffi_bindings-25.1.0-cp314-cp314t-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:e2fd3bfbff3c5d74fef31a722f729bf93500910db650c925c2d6ef879a7e51cb", size = 92364, upload-time = "2025-07-30T10:01:44.887Z" }, + { url = "https://files.pythonhosted.org/packages/c9/c1/a606ff83b3f1735f3759ad0f2cd9e038a0ad11a3de3b6c673aa41c24bb7b/argon2_cffi_bindings-25.1.0-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:c4f9665de60b1b0e99bcd6be4f17d90339698ce954cfd8d9cf4f91c995165a92", size = 85637, upload-time = "2025-07-30T10:01:46.225Z" }, + { url = "https://files.pythonhosted.org/packages/44/b4/678503f12aceb0262f84fa201f6027ed77d71c5019ae03b399b97caa2f19/argon2_cffi_bindings-25.1.0-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:ba92837e4a9aa6a508c8d2d7883ed5a8f6c308c89a4790e1e447a220deb79a85", size = 91934, upload-time = "2025-07-30T10:01:47.203Z" }, + { url = "https://files.pythonhosted.org/packages/f0/c7/f36bd08ef9bd9f0a9cff9428406651f5937ce27b6c5b07b92d41f91ae541/argon2_cffi_bindings-25.1.0-cp314-cp314t-win32.whl", hash = "sha256:84a461d4d84ae1295871329b346a97f68eade8c53b6ed9a7ca2d7467f3c8ff6f", size = 28158, upload-time = "2025-07-30T10:01:48.341Z" }, + { url = "https://files.pythonhosted.org/packages/b3/80/0106a7448abb24a2c467bf7d527fe5413b7fdfa4ad6d6a96a43a62ef3988/argon2_cffi_bindings-25.1.0-cp314-cp314t-win_amd64.whl", hash = "sha256:b55aec3565b65f56455eebc9b9f34130440404f27fe21c3b375bf1ea4d8fbae6", size = 32597, upload-time = "2025-07-30T10:01:49.112Z" }, + { url = "https://files.pythonhosted.org/packages/05/b8/d663c9caea07e9180b2cb662772865230715cbd573ba3b5e81793d580316/argon2_cffi_bindings-25.1.0-cp314-cp314t-win_arm64.whl", hash = "sha256:87c33a52407e4c41f3b70a9c2d3f6056d88b10dad7695be708c5021673f55623", size = 28231, upload-time = "2025-07-30T10:01:49.92Z" }, + { url = "https://files.pythonhosted.org/packages/1d/57/96b8b9f93166147826da5f90376e784a10582dd39a393c99bb62cfcf52f0/argon2_cffi_bindings-25.1.0-cp39-abi3-macosx_10_9_universal2.whl", hash = "sha256:aecba1723ae35330a008418a91ea6cfcedf6d31e5fbaa056a166462ff066d500", size = 54121, upload-time = "2025-07-30T10:01:50.815Z" }, + { url = "https://files.pythonhosted.org/packages/0a/08/a9bebdb2e0e602dde230bdde8021b29f71f7841bd54801bcfd514acb5dcf/argon2_cffi_bindings-25.1.0-cp39-abi3-macosx_10_9_x86_64.whl", hash = "sha256:2630b6240b495dfab90aebe159ff784d08ea999aa4b0d17efa734055a07d2f44", size = 29177, upload-time = "2025-07-30T10:01:51.681Z" }, + { url = "https://files.pythonhosted.org/packages/b6/02/d297943bcacf05e4f2a94ab6f462831dc20158614e5d067c35d4e63b9acb/argon2_cffi_bindings-25.1.0-cp39-abi3-macosx_11_0_arm64.whl", hash = "sha256:7aef0c91e2c0fbca6fc68e7555aa60ef7008a739cbe045541e438373bc54d2b0", size = 31090, upload-time = "2025-07-30T10:01:53.184Z" }, + { url = "https://files.pythonhosted.org/packages/c1/93/44365f3d75053e53893ec6d733e4a5e3147502663554b4d864587c7828a7/argon2_cffi_bindings-25.1.0-cp39-abi3-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:1e021e87faa76ae0d413b619fe2b65ab9a037f24c60a1e6cc43457ae20de6dc6", size = 81246, upload-time = "2025-07-30T10:01:54.145Z" }, + { url = "https://files.pythonhosted.org/packages/09/52/94108adfdd6e2ddf58be64f959a0b9c7d4ef2fa71086c38356d22dc501ea/argon2_cffi_bindings-25.1.0-cp39-abi3-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:d3e924cfc503018a714f94a49a149fdc0b644eaead5d1f089330399134fa028a", size = 87126, upload-time = "2025-07-30T10:01:55.074Z" }, + { url = "https://files.pythonhosted.org/packages/72/70/7a2993a12b0ffa2a9271259b79cc616e2389ed1a4d93842fac5a1f923ffd/argon2_cffi_bindings-25.1.0-cp39-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:c87b72589133f0346a1cb8d5ecca4b933e3c9b64656c9d175270a000e73b288d", size = 80343, upload-time = "2025-07-30T10:01:56.007Z" }, + { url = "https://files.pythonhosted.org/packages/78/9a/4e5157d893ffc712b74dbd868c7f62365618266982b64accab26bab01edc/argon2_cffi_bindings-25.1.0-cp39-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:1db89609c06afa1a214a69a462ea741cf735b29a57530478c06eb81dd403de99", size = 86777, upload-time = "2025-07-30T10:01:56.943Z" }, + { url = "https://files.pythonhosted.org/packages/74/cd/15777dfde1c29d96de7f18edf4cc94c385646852e7c7b0320aa91ccca583/argon2_cffi_bindings-25.1.0-cp39-abi3-win32.whl", hash = "sha256:473bcb5f82924b1becbb637b63303ec8d10e84c8d241119419897a26116515d2", size = 27180, upload-time = "2025-07-30T10:01:57.759Z" }, + { url = "https://files.pythonhosted.org/packages/e2/c6/a759ece8f1829d1f162261226fbfd2c6832b3ff7657384045286d2afa384/argon2_cffi_bindings-25.1.0-cp39-abi3-win_amd64.whl", hash = "sha256:a98cd7d17e9f7ce244c0803cad3c23a7d379c301ba618a5fa76a67d116618b98", size = 31715, upload-time = "2025-07-30T10:01:58.56Z" }, + { url = "https://files.pythonhosted.org/packages/42/b9/f8d6fa329ab25128b7e98fd83a3cb34d9db5b059a9847eddb840a0af45dd/argon2_cffi_bindings-25.1.0-cp39-abi3-win_arm64.whl", hash = "sha256:b0fdbcf513833809c882823f98dc2f931cf659d9a1429616ac3adebb49f5db94", size = 27149, upload-time = "2025-07-30T10:01:59.329Z" }, +] + +[[package]] +name = "arrow" +version = "1.4.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "python-dateutil" }, + { name = "tzdata" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/b9/33/032cdc44182491aa708d06a68b62434140d8c50820a087fac7af37703357/arrow-1.4.0.tar.gz", hash = "sha256:ed0cc050e98001b8779e84d461b0098c4ac597e88704a655582b21d116e526d7", size = 152931, upload-time = "2025-10-18T17:46:46.761Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/ed/c9/d7977eaacb9df673210491da99e6a247e93df98c715fc43fd136ce1d3d33/arrow-1.4.0-py3-none-any.whl", hash = "sha256:749f0769958ebdc79c173ff0b0670d59051a535fa26e8eba02953dc19eb43205", size = 68797, upload-time = "2025-10-18T17:46:45.663Z" }, +] + +[[package]] +name = "asgiref" +version = "3.11.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/63/40/f03da1264ae8f7cfdbf9146542e5e7e8100a4c66ab48e791df9a03d3f6c0/asgiref-3.11.1.tar.gz", hash = "sha256:5f184dc43b7e763efe848065441eac62229c9f7b0475f41f80e207a114eda4ce", size = 38550, upload-time = "2026-02-03T13:30:14.33Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/5c/0a/a72d10ed65068e115044937873362e6e32fab1b7dce0046aeb224682c989/asgiref-3.11.1-py3-none-any.whl", hash = "sha256:e8667a091e69529631969fd45dc268fa79b99c92c5fcdda727757e52146ec133", size = 24345, upload-time = "2026-02-03T13:30:13.039Z" }, +] + +[[package]] +name = "asn1crypto" +version = "1.5.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/de/cf/d547feed25b5244fcb9392e288ff9fdc3280b10260362fc45d37a798a6ee/asn1crypto-1.5.1.tar.gz", hash = "sha256:13ae38502be632115abf8a24cbe5f4da52e3b5231990aff31123c805306ccb9c", size = 121080, upload-time = "2022-03-15T14:46:52.889Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/c9/7f/09065fd9e27da0eda08b4d6897f1c13535066174cc023af248fc2a8d5e5a/asn1crypto-1.5.1-py2.py3-none-any.whl", hash = "sha256:db4e40728b728508912cbb3d44f19ce188f218e9eba635821bb4b68564f8fd67", size = 105045, upload-time = "2022-03-15T14:46:51.055Z" }, +] + +[[package]] +name = "asttokens" +version = "3.0.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/be/a5/8e3f9b6771b0b408517c82d97aed8f2036509bc247d46114925e32fe33f0/asttokens-3.0.1.tar.gz", hash = "sha256:71a4ee5de0bde6a31d64f6b13f2293ac190344478f081c3d1bccfcf5eacb0cb7", size = 62308, upload-time = "2025-11-15T16:43:48.578Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/d2/39/e7eaf1799466a4aef85b6a4fe7bd175ad2b1c6345066aa33f1f58d4b18d0/asttokens-3.0.1-py3-none-any.whl", hash = "sha256:15a3ebc0f43c2d0a50eeafea25e19046c68398e487b9f1f5b517f7c0f40f976a", size = 27047, upload-time = "2025-11-15T16:43:16.109Z" }, +] + +[[package]] +name = "async-timeout" +version = "5.0.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/a5/ae/136395dfbfe00dfc94da3f3e136d0b13f394cba8f4841120e34226265780/async_timeout-5.0.1.tar.gz", hash = "sha256:d9321a7a3d5a6a5e187e824d2fa0793ce379a202935782d555d6e9d2735677d3", size = 9274, upload-time = "2024-11-06T16:41:39.6Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/fe/ba/e2081de779ca30d473f21f5b30e0e737c438205440784c7dfc81efc2b029/async_timeout-5.0.1-py3-none-any.whl", hash = "sha256:39e3809566ff85354557ec2398b55e096c8364bacac9405a7a1fa429e77fe76c", size = 6233, upload-time = "2024-11-06T16:41:37.9Z" }, +] + +[[package]] +name = "atlasq-tschaume" +version = "0.11.1.dev2" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "mongoengine" }, + { name = "requests" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/8c/5f/91e3d9c1712c8e235c95c86eeb265bb106802f5bcbe334e28f605f55b018/atlasq-tschaume-0.11.1.dev2.tar.gz", hash = "sha256:9393356edebae037b1b47e16d73a7a04969451eaa3e38f1bdc20d1d9b08ece68", size = 38083, upload-time = "2023-04-14T21:06:57.344Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/a5/8c/83b96f52f5a5b8e418bf4cbf9089cfbea33fc0b809c28fd5a9b9393b67ba/atlasq_tschaume-0.11.1.dev2-py3-none-any.whl", hash = "sha256:f38813972c8c379964f09200fa89f9ae909ccbf5b3483bb6a77d5bf34720dde0", size = 15748, upload-time = "2023-04-14T21:06:54.943Z" }, +] + +[[package]] +name = "attrs" +version = "26.1.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/9a/8e/82a0fe20a541c03148528be8cac2408564a6c9a0cc7e9171802bc1d26985/attrs-26.1.0.tar.gz", hash = "sha256:d03ceb89cb322a8fd706d4fb91940737b6642aa36998fe130a9bc96c985eff32", size = 952055, upload-time = "2026-03-19T14:22:25.026Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/64/b4/17d4b0b2a2dc85a6df63d1157e028ed19f90d4cd97c36717afef2bc2f395/attrs-26.1.0-py3-none-any.whl", hash = "sha256:c647aa4a12dfbad9333ca4e71fe62ddc36f4e63b2d260a37a8b83d2f043ac309", size = 67548, upload-time = "2026-03-19T14:22:23.645Z" }, +] + +[[package]] +name = "backports-zstd" +version = "1.5.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/d4/05/480d439b482edf59b786bc19b474d990c61942e372f5de3dc14acac8154d/backports_zstd-1.5.0.tar.gz", hash = "sha256:a5e622a82eb183b4fbe18032755ce0a15fa9a82f2adb9b621620b91247aaedb7", size = 998556, upload-time = "2026-05-11T19:54:24.923Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/26/bc/083c0ebee316f4863ed288c4a5eaa1e98be115e82deb8855da8bab1c7701/backports_zstd-1.5.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:fbaa5502617dc4f04327c7a2951f0fcdca7aaef93ddf32c15dc8b620208174fa", size = 436838, upload-time = "2026-05-11T19:52:24.349Z" }, + { url = "https://files.pythonhosted.org/packages/cd/e5/bf778667fff6598dbd0791745123ed964aee94753ae8e4e92aa1e07417b6/backports_zstd-1.5.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:204f00d62e95aab987c7c019452b2373bdefb17252443765f2ede7f15b6e669a", size = 363215, upload-time = "2026-05-11T19:52:25.887Z" }, + { url = "https://files.pythonhosted.org/packages/63/a5/4fae78734dbefcb4b5386137c807e2107c4bc94e85c0d9eaae79206dde84/backports_zstd-1.5.0-cp311-cp311-manylinux2010_i686.manylinux_2_12_i686.manylinux_2_28_i686.whl", hash = "sha256:2c77c0d4c330afd26d2a98f3d689ab922ec3f046014a1614ddcaad437666ac05", size = 507161, upload-time = "2026-05-11T19:52:27.48Z" }, + { url = "https://files.pythonhosted.org/packages/d8/ec/b64409f0cf56fb65181d6f5d9130058f19d5c3c9f8c581a5e2bd62642630/backports_zstd-1.5.0-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:6bb2f2d2c07358edeaa251cf804b993e9f0d5d93af8a7ea2414d80ff3c105e95", size = 476728, upload-time = "2026-05-11T19:52:29.182Z" }, + { url = "https://files.pythonhosted.org/packages/4d/10/4c1693cb4e129585a6e4cb565106cad7347e61c43c8375b9e9cadb00eb06/backports_zstd-1.5.0-cp311-cp311-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:cb89f554abcebcb2c487024e63be8059083775c5fd351fec0cc2dc3e9f528714", size = 582388, upload-time = "2026-05-11T19:52:30.908Z" }, + { url = "https://files.pythonhosted.org/packages/45/b9/dc748a0e7d21ce2228241f6e8af96d297c80ab69c4c49429309b8fa3beb8/backports_zstd-1.5.0-cp311-cp311-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:ea969758af743000d822fc3a69dc9de059bbbb8d07d2f13e06ff49ac63cce74f", size = 642091, upload-time = "2026-05-11T19:52:32.397Z" }, + { url = "https://files.pythonhosted.org/packages/de/5f/02366ddae6e008d53df71605e4e3ca8dcea5d1dfcba29040b46883a23127/backports_zstd-1.5.0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:775ad82d268923639bc924013fc61561df376c148506b241f0f80718b5bb3a2f", size = 492256, upload-time = "2026-05-11T19:52:34.441Z" }, + { url = "https://files.pythonhosted.org/packages/c0/c7/c5e7824c17abc87dbb24c7c90dc43054d701533cf04d3531cb9b7105cdac/backports_zstd-1.5.0-cp311-cp311-manylinux_2_34_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:663128370bbc2ebcc436b8977bc434a7bf29919d92d91fee05ed6fb0fa807646", size = 566214, upload-time = "2026-05-11T19:52:35.962Z" }, + { url = "https://files.pythonhosted.org/packages/12/7b/ee7368c4ad8f5e00b3fd84fc566fb7714aa766c5672500793990e19efa00/backports_zstd-1.5.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:572c76832e9a24da4084befa52c23f4c03fede2aa250ae6250cbc5a11b980f69", size = 482666, upload-time = "2026-05-11T19:52:37.675Z" }, + { url = "https://files.pythonhosted.org/packages/77/36/2826f9f04b6c91d5f707f49188ac6f5ec7487b36d73caedfa20db3307826/backports_zstd-1.5.0-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:9410bcbcd3afd787a15a276d68f954d1703788c780faa421183a61d39da8b862", size = 510594, upload-time = "2026-05-11T19:52:39.501Z" }, + { url = "https://files.pythonhosted.org/packages/84/3b/95342baf0e301b7d06c6862389f8520a9d71f073a6c1a5b86182e7d89148/backports_zstd-1.5.0-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:0fab15e6895bef621041dd82d6306ffa24889257dd902c4b98b88e4260b3465d", size = 586713, upload-time = "2026-05-11T19:52:41.461Z" }, + { url = "https://files.pythonhosted.org/packages/bc/32/73d2b8f572960307406b084bb8932f4ebd9fcedb05d1502e04fecf25970a/backports_zstd-1.5.0-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:2ffde637b6d0082f1c3356657002469cf199c7c12d50d9822a55b13425c778d3", size = 564037, upload-time = "2026-05-11T19:52:43.15Z" }, + { url = "https://files.pythonhosted.org/packages/8f/a4/6e319fa7fa5851c3ca9701cbded9522c16018432a01a33a95cc0fccb6b4a/backports_zstd-1.5.0-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:c01d377c1489cb2230bf6a9ff01c73c42863cc96ee648c49923d4f6d4ea4e2d5", size = 632626, upload-time = "2026-05-11T19:52:45.017Z" }, + { url = "https://files.pythonhosted.org/packages/67/5c/10df0444db05f9276b286d230a3d6948ad47c593fc22925b8fe551d34b26/backports_zstd-1.5.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:4080bb9c8a51bb2bf8caf8018d78278cd49eb924cb06a54f56a411095e2ac912", size = 496270, upload-time = "2026-05-11T19:52:46.558Z" }, + { url = "https://files.pythonhosted.org/packages/f1/ad/6cd1de5cd858ac653833098f13a4643a4c9db484072350d3dbf299cc46f1/backports_zstd-1.5.0-cp311-cp311-win32.whl", hash = "sha256:9f4fe3fd82c8c6e8a9fdc5c71f92f9fe2442d02e7f59fddef25a955e189e3f38", size = 289754, upload-time = "2026-05-11T19:52:48.232Z" }, + { url = "https://files.pythonhosted.org/packages/1d/1b/df94ad1cb79705d717f7e1063da642c538a6d7ce6443c8e60355fa507ea4/backports_zstd-1.5.0-cp311-cp311-win_amd64.whl", hash = "sha256:e7c0372fa036751109604c70a8c87e59faaacc195d519c8cb9e0e527ee2b5478", size = 314829, upload-time = "2026-05-11T19:52:50.031Z" }, + { url = "https://files.pythonhosted.org/packages/e8/e7/24e60da7cc89b9ed1c5b474678e316dd0ddfe7cd1de39b23d04452ca5946/backports_zstd-1.5.0-cp311-cp311-win_arm64.whl", hash = "sha256:264a66137555bb4648f7e64cfc514d820758072684f373269fcdd2e8d4a90306", size = 291497, upload-time = "2026-05-11T19:52:51.729Z" }, + { url = "https://files.pythonhosted.org/packages/24/71/29ed213344f8f62b7520745d7df3752d88db456aff9d8b706bdf5eb99a3c/backports_zstd-1.5.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:1858cacdb3e50105a1b60acdc3dd5b18650077d12dce243e19d5c88e8172bd71", size = 437170, upload-time = "2026-05-11T19:52:53.204Z" }, + { url = "https://files.pythonhosted.org/packages/d0/e3/a58a3eb8fc54d4e3e4f684ed7b1f688da02e5bda5ae5e2809e94cf2ead2f/backports_zstd-1.5.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:ccffc0a1974ecc2cc42afa4c15f56d036a4b2bae0abc46e6ba9b3358d9b1c037", size = 363265, upload-time = "2026-05-11T19:52:55.153Z" }, + { url = "https://files.pythonhosted.org/packages/3f/03/9d13840d206dec1c4698c803f61c58379b3578cb9dc6140ba5fa4ce2f31d/backports_zstd-1.5.0-cp312-cp312-manylinux2010_i686.manylinux_2_12_i686.manylinux_2_28_i686.whl", hash = "sha256:ab3430ab4d4ac3fb1bc1e4174d137731e51363b6abd5e51a1599690fe9c7d61d", size = 507527, upload-time = "2026-05-11T19:52:57.256Z" }, + { url = "https://files.pythonhosted.org/packages/6a/8f/8dc4b5736dca218cbca9609549a8f6dc202990abdb49afdc6112442f5360/backports_zstd-1.5.0-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:c737c1cb4a10c2d0f6cba9a347522858094f0a737b4558c67a777bcaa4a795cd", size = 477352, upload-time = "2026-05-11T19:52:59.425Z" }, + { url = "https://files.pythonhosted.org/packages/96/2c/65a66976a761b5b62eacbaed5ed418c694b24b5c480399315d799751de62/backports_zstd-1.5.0-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:0379c66510681a6b2780d3f3ef2cff54d01204b52448d64bde1855d40f856a04", size = 582799, upload-time = "2026-05-11T19:53:01.303Z" }, + { url = "https://files.pythonhosted.org/packages/d3/e9/ee93a66cd28cb3ad7f3c04d1105325a5428671b18bd41ba9ed8b43bc44cf/backports_zstd-1.5.0-cp312-cp312-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:7c7474b291e264c9609358d3875cf539623f7a65339c2b533020992b1a4c095b", size = 641530, upload-time = "2026-05-11T19:53:03.082Z" }, + { url = "https://files.pythonhosted.org/packages/e4/4b/2cecd4d6679f175f28ae02022bd2050ff4023e38902fae104dbe2e231911/backports_zstd-1.5.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:bb73c22444617bc5a3abf32dd27b3f2085898cfe3b95e6855300e9189898a3bd", size = 495324, upload-time = "2026-05-11T19:53:05.005Z" }, + { url = "https://files.pythonhosted.org/packages/4d/20/ee21e4e791e31f38f7a70b3961eb64b350d9be802a335e7a04c02b41b197/backports_zstd-1.5.0-cp312-cp312-manylinux_2_34_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:6cd7f6c33afd89354f74469e315e72754e3040f91f7b685061e225d9e36e3e8e", size = 569796, upload-time = "2026-05-11T19:53:07.011Z" }, + { url = "https://files.pythonhosted.org/packages/76/da/86c9a2ea384885b60638b3e47113198449568d0e36ef3834d1f969623092/backports_zstd-1.5.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:2106309071f279b38d3663c55c7fed192733b4f332b50eb3fa707e54bad6967a", size = 483367, upload-time = "2026-05-11T19:53:08.674Z" }, + { url = "https://files.pythonhosted.org/packages/5d/f0/c95c6e4dd28fc314547782a482839e422283d62c2aaf45d30672109a4a1e/backports_zstd-1.5.0-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:56fffa80be74cb11ac843333bbdc56e466c87967706886b3efd6b16d83830d90", size = 510976, upload-time = "2026-05-11T19:53:10.339Z" }, + { url = "https://files.pythonhosted.org/packages/0e/a2/72777b7e1872228a13b09b0bf77ae6cf626008d462cc2e1a0ae64721fd55/backports_zstd-1.5.0-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:5e8b8251eec80e67e30ec79dfc5b3b1ada069b9ac48b56b102f3e2c6f8281062", size = 587190, upload-time = "2026-05-11T19:53:12.205Z" }, + { url = "https://files.pythonhosted.org/packages/f5/a1/db5d1aee59da308eadeaa189764a4ec68e98495c309a13dcb8da5718fef1/backports_zstd-1.5.0-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:f334dd17ffead361aa9090e40151bd123507ce213a62733121b7145c6711cbde", size = 567395, upload-time = "2026-05-11T19:53:14.245Z" }, + { url = "https://files.pythonhosted.org/packages/00/0f/39ca1a6e8c5c2dc81da9e06c44d1990cc464f4b16dae214e877afd7adfc0/backports_zstd-1.5.0-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:78cbfd061255fef6de5070a54e0f9c00e8aabad5c99dd2ad884a3a7d1acc09ae", size = 632048, upload-time = "2026-05-11T19:53:16.234Z" }, + { url = "https://files.pythonhosted.org/packages/73/fd/a438ee4fc615016dbe96112b709b6805ee19eb215f46e208c8fbce086d8d/backports_zstd-1.5.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:2f55d70df44f49d599e20033013bc1ae705202735c45d4bca8eb963b225e15fd", size = 499833, upload-time = "2026-05-11T19:53:17.85Z" }, + { url = "https://files.pythonhosted.org/packages/f7/42/f544fde4de32687e28c514288ae3c11106ba644e9dd580992cbd704bbb49/backports_zstd-1.5.0-cp312-cp312-win32.whl", hash = "sha256:a8b096e0383a3bcab34f8c97b79e1a52051189d11258bbc2bc1145997a15dd1d", size = 289876, upload-time = "2026-05-11T19:53:19.486Z" }, + { url = "https://files.pythonhosted.org/packages/ad/31/9c29cd3175892e5ee909f5e8d14707fa07815301ff24b5c697d1cea62a77/backports_zstd-1.5.0-cp312-cp312-win_amd64.whl", hash = "sha256:e2802899ba4ef1a062ffe4bb1292c5df32011a54b4c3004c54f46ec975f39554", size = 314933, upload-time = "2026-05-11T19:53:20.942Z" }, + { url = "https://files.pythonhosted.org/packages/11/ee/1a50acd6446c0d57c4f93ad6ce68e1a631ad920737a6b2d0bbbc47de7f42/backports_zstd-1.5.0-cp312-cp312-win_arm64.whl", hash = "sha256:3c0353e66942afbd45518788cfbd1e9e117828ceb390fa50517f46f291850d8e", size = 291665, upload-time = "2026-05-11T19:53:22.686Z" }, + { url = "https://files.pythonhosted.org/packages/c6/e6/252521e3a847eb200bc0a1d528542d651b9c8dc7953e231c39ed2890d5ff/backports_zstd-1.5.0-cp313-cp313-android_21_arm64_v8a.whl", hash = "sha256:02a57ee8598dd863c0b11c7af00042ce6bc045bf6f4249fa4c322c62614ca1fd", size = 400134, upload-time = "2026-05-11T19:53:24.28Z" }, + { url = "https://files.pythonhosted.org/packages/36/43/27ef105ffa2da3d52218d4a7b2e14037974283953b3ee790358af6e9b4df/backports_zstd-1.5.0-cp313-cp313-android_21_x86_64.whl", hash = "sha256:c56c11eb3173d540e1fb0216f7ab477cbd3a204eca41f5f329059ee8a5d2ad47", size = 454225, upload-time = "2026-05-11T19:53:25.874Z" }, + { url = "https://files.pythonhosted.org/packages/0e/c9/cdcba1244347500d00567ce2cd6bf04c92d1b0fb6405fb8e13c07715eb46/backports_zstd-1.5.0-cp313-cp313-ios_13_0_arm64_iphoneos.whl", hash = "sha256:ef98f632026aa8e6ce05d786977092798efbe78677aa71219f22d31787809c90", size = 357229, upload-time = "2026-05-11T19:53:27.661Z" }, + { url = "https://files.pythonhosted.org/packages/df/da/cea04dab3ffb940bde9a59866bde6f2594a7b3ef2948a63fb3898f73d311/backports_zstd-1.5.0-cp313-cp313-ios_13_0_arm64_iphonesimulator.whl", hash = "sha256:c3712300b18f9d07f788b03594b2f34dfad89d77df96938a640c5007522a6b69", size = 365907, upload-time = "2026-05-11T19:53:29.241Z" }, + { url = "https://files.pythonhosted.org/packages/da/c4/6a71df2e65033f9b7d8017d77ea2bb572fc2ebc814ea383fdcda4187597a/backports_zstd-1.5.0-cp313-cp313-ios_13_0_x86_64_iphonesimulator.whl", hash = "sha256:bdbc75d1f54df70b65bcfbc8aa0cac21475f79665bb045960af606dc07b56090", size = 446453, upload-time = "2026-05-11T19:53:30.888Z" }, + { url = "https://files.pythonhosted.org/packages/66/e7/f98ad1a6a249c27884df9d28cf6ebc3c368e0e3288a741c1d51a572bb3d7/backports_zstd-1.5.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:93d306300d25e59f1cbe98cda494bf295be03a20e8b2c5602ee5ddc03ded29f2", size = 436634, upload-time = "2026-05-11T19:53:32.484Z" }, + { url = "https://files.pythonhosted.org/packages/ba/42/d0393ecc64e2ab6ae1b5ca7edbe26e3fe5196885f15d6cc4bce7254e29cd/backports_zstd-1.5.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:305d2e4ae9a595d0fd9d5bea5a7a2163306c6c4dcc5eec35ecd5008219d4580e", size = 362867, upload-time = "2026-05-11T19:53:34.385Z" }, + { url = "https://files.pythonhosted.org/packages/41/fe/87aa9404763bada695d06e5cb9d0575bae033cbf3a2e4e3bd648760178f7/backports_zstd-1.5.0-cp313-cp313-manylinux2010_i686.manylinux_2_12_i686.manylinux_2_28_i686.whl", hash = "sha256:c8f0967bf8d806b250fb1e905a6b8190e7ae83656d5308989243f84e01fa3774", size = 506844, upload-time = "2026-05-11T19:53:36.023Z" }, + { url = "https://files.pythonhosted.org/packages/56/94/3af7ce637d148e0b0acb1298b61afe9a934ed425bad9ff05e87afbf6766d/backports_zstd-1.5.0-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:76b7314ca9a253171e3e9524960e9e6411997323cf10aecbbc330faa7a90278d", size = 476975, upload-time = "2026-05-11T19:53:37.885Z" }, + { url = "https://files.pythonhosted.org/packages/aa/6c/dc2aa1b48296ac6effc3bacb5a3061d40ed74bf73082dfe38eed2ba8362b/backports_zstd-1.5.0-cp313-cp313-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:b1d0bf16bba86b1071731ced389f184e8de61c1afcafa584244f7f726632f92f", size = 582496, upload-time = "2026-05-11T19:53:39.812Z" }, + { url = "https://files.pythonhosted.org/packages/f6/38/dd49d3dd27eda9b165ccd63d70538fea016a3e9e42923bbbc1d89fae8a43/backports_zstd-1.5.0-cp313-cp313-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:96709d27d406008575ef759405169d538040156704b457d8c0ac035127a46b67", size = 643257, upload-time = "2026-05-11T19:53:41.819Z" }, + { url = "https://files.pythonhosted.org/packages/59/75/78e819272450aec2462f97a1bceb90bde481f9dba435bf9e76d580b4dec4/backports_zstd-1.5.0-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:5737402c29b2bd5bc661d4cde08aed531ed326f2b59a7ad98dc07650dc99a2c9", size = 491958, upload-time = "2026-05-11T19:53:43.501Z" }, + { url = "https://files.pythonhosted.org/packages/62/ae/d860f9cf21cb59d583a12166353bf71a439538e2b669f4a7736e400ca596/backports_zstd-1.5.0-cp313-cp313-manylinux_2_34_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:2b65f37ddd375114dbf84658e7dd168e10f5a93394940bfefa7fafc2d3234450", size = 567198, upload-time = "2026-05-11T19:53:45.226Z" }, + { url = "https://files.pythonhosted.org/packages/38/7c/b175d4c9ff60f964c8f6dd43211de905227cfde5a41eb5f654df58483025/backports_zstd-1.5.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:4fae7825dde4f81c28b4c66b1e997f893e296c3f1668351952b3ed085eb9f8cd", size = 482792, upload-time = "2026-05-11T19:53:47.323Z" }, + { url = "https://files.pythonhosted.org/packages/eb/e3/f7b50cf891a10da5f9c412ed4a9c4a772df4d4186d98a41e75c9b462f148/backports_zstd-1.5.0-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:3aa10e77c0e712d2dfb950910b50591c2fb11f0f1328814e23acc0b4950766df", size = 510363, upload-time = "2026-05-11T19:53:49.523Z" }, + { url = "https://files.pythonhosted.org/packages/be/50/e7841fd4a65661d527697a0e2dab97295868965ccd4e3e12474472719a60/backports_zstd-1.5.0-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:518b2ef54ce0fee6d29379cfd64ef66e639456f1b18943466e929b19677f135f", size = 586917, upload-time = "2026-05-11T19:53:51.741Z" }, + { url = "https://files.pythonhosted.org/packages/c6/7c/57e985dbd621f0307b8c57cabb258eb976793f2aeaf8a5bc020e15b4a793/backports_zstd-1.5.0-cp313-cp313-musllinux_1_2_riscv64.whl", hash = "sha256:673a1e5fdaa6cb0c7a967eb33066b6dd564871b3498a93e11e2972998047d11f", size = 565004, upload-time = "2026-05-11T19:53:53.774Z" }, + { url = "https://files.pythonhosted.org/packages/2f/8f/855ffcd1ee0fcf44c3fe62e36db8e7362292d450cc7c4b3f43edccbcd37a/backports_zstd-1.5.0-cp313-cp313-musllinux_1_2_s390x.whl", hash = "sha256:1277c07ff2d731586aa05aebd946a1b30184620d886a735dd5d5bf94a4a1061e", size = 633737, upload-time = "2026-05-11T19:53:56.036Z" }, + { url = "https://files.pythonhosted.org/packages/20/39/c4129a03d268699200dfebe1ccab97c7c332d2794571afb372a62e4ed098/backports_zstd-1.5.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:aff334c7c38b4aea2a899f3138a99c1d58f0686ad7815c74bff506ecf4333296", size = 496309, upload-time = "2026-05-11T19:53:57.591Z" }, + { url = "https://files.pythonhosted.org/packages/8e/33/34152316dd244dcd43d5300ded3cf6e1b46d343e4e92620c23e533fa91df/backports_zstd-1.5.0-cp313-cp313-win32.whl", hash = "sha256:b932834c4d85360f46d1e7fbf3eee1e26ba594e0eb5c3ee1281e89bc1d48d06f", size = 289560, upload-time = "2026-05-11T19:53:59.274Z" }, + { url = "https://files.pythonhosted.org/packages/71/c5/f759bc87fd77c88f4fdad2d878535fb7e9537c6a05876d206e6690bf33c6/backports_zstd-1.5.0-cp313-cp313-win_amd64.whl", hash = "sha256:c71dfbeced720326a8917a6edf921c568dc2396228c6432205c6d7e7fe7f3707", size = 314812, upload-time = "2026-05-11T19:54:00.909Z" }, + { url = "https://files.pythonhosted.org/packages/47/96/d7970dbb2fef34b549b34146090f48f41903cc7268b1ed1c7542eaa1852e/backports_zstd-1.5.0-cp313-cp313-win_arm64.whl", hash = "sha256:7b5798b20ffff71ee4620a01f56fe0b50271724b4251db08c90a069446cc4752", size = 291411, upload-time = "2026-05-11T19:54:02.541Z" }, + { url = "https://files.pythonhosted.org/packages/89/92/8e8769e1e3ebec16d39f455e317a0f137a191b1f122853d0377c660666ce/backports_zstd-1.5.0-pp311-pypy311_pp73-macosx_10_15_x86_64.whl", hash = "sha256:0ca2d4ac4901eada2cfb86fda692e5d4a1e09485d9f2ec5777dc6cd3154b3b46", size = 410809, upload-time = "2026-05-11T19:54:14.117Z" }, + { url = "https://files.pythonhosted.org/packages/63/5c/741a2923020c45b85cad4dffffcb86dbfa2d4aaed27f18ee793428ef4c24/backports_zstd-1.5.0-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:20796211a623ec6e0061cef4d7cca760e9e0a0a951bb30dc9ba89ed4a3fea5e4", size = 340342, upload-time = "2026-05-11T19:54:16.165Z" }, + { url = "https://files.pythonhosted.org/packages/c8/3b/68c4fe8a551d3f47ed75ddcf15dc7c777bb9d869fc0e0f5b7cacc9f158f5/backports_zstd-1.5.0-pp311-pypy311_pp73-manylinux2010_i686.manylinux_2_12_i686.manylinux_2_28_i686.whl", hash = "sha256:5232cd2a58c60da4ceb0e09e42dbc579b92dda4a9301a756af0c738223a23487", size = 421476, upload-time = "2026-05-11T19:54:17.709Z" }, + { url = "https://files.pythonhosted.org/packages/a8/4d/ab5dcd6ab9a7ac02ec42c4507211da7dadb9498abb655115c296077e2b8b/backports_zstd-1.5.0-pp311-pypy311_pp73-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:012d88a9ae08f331e1adc03dfbda4ff2ae7f76ea62455975827b215677a11aec", size = 395020, upload-time = "2026-05-11T19:54:19.566Z" }, + { url = "https://files.pythonhosted.org/packages/55/aa/ec512a0d14552bbb4e75693f7065434b865956abd045ceb67f0574146241/backports_zstd-1.5.0-pp311-pypy311_pp73-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:cbb7d79f8e43b6e0e17616961e425b9f8b32d9933e1db69242baa6e21f44a978", size = 414985, upload-time = "2026-05-11T19:54:21.136Z" }, + { url = "https://files.pythonhosted.org/packages/aa/31/759d077aa680555e17c9d2bb09edf4c3428d895fe5d35a8df67684401b84/backports_zstd-1.5.0-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:6172dcdd664ef243e55a35e6b45f1c866767c61043f0ddcd908abd14df662065", size = 300853, upload-time = "2026-05-11T19:54:23.1Z" }, +] + +[[package]] +name = "beautifulsoup4" +version = "4.14.3" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "soupsieve" }, + { name = "typing-extensions" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/c3/b0/1c6a16426d389813b48d95e26898aff79abbde42ad353958ad95cc8c9b21/beautifulsoup4-4.14.3.tar.gz", hash = "sha256:6292b1c5186d356bba669ef9f7f051757099565ad9ada5dd630bd9de5fa7fb86", size = 627737, upload-time = "2025-11-30T15:08:26.084Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/1a/39/47f9197bdd44df24d67ac8893641e16f386c984a0619ef2ee4c51fbbc019/beautifulsoup4-4.14.3-py3-none-any.whl", hash = "sha256:0918bfe44902e6ad8d57732ba310582e98da931428d231a5ecb9e7c703a735bb", size = 107721, upload-time = "2025-11-30T15:08:24.087Z" }, +] + +[[package]] +name = "bibtexparser" +version = "1.4.4" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "pyparsing" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/44/1c/577d3ce406e88f370e80a6ebf76ae52a2866521e0b585e8ec612759894f1/bibtexparser-1.4.4.tar.gz", hash = "sha256:093b6c824f7a71d3a748867c4057b71f77c55b8dbc07efc993b781771520d8fb", size = 55594, upload-time = "2026-01-29T18:58:01.366Z" } + +[[package]] +name = "bleach" +version = "6.3.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "webencodings" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/07/18/3c8523962314be6bf4c8989c79ad9531c825210dd13a8669f6b84336e8bd/bleach-6.3.0.tar.gz", hash = "sha256:6f3b91b1c0a02bb9a78b5a454c92506aa0fdf197e1d5e114d2e00c6f64306d22", size = 203533, upload-time = "2025-10-27T17:57:39.211Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/cd/3a/577b549de0cc09d95f11087ee63c739bba856cd3952697eec4c4bb91350a/bleach-6.3.0-py3-none-any.whl", hash = "sha256:fe10ec77c93ddf3d13a73b035abaac7a9f5e436513864ccdad516693213c65d6", size = 164437, upload-time = "2025-10-27T17:57:37.538Z" }, +] + +[package.optional-dependencies] +css = [ + { name = "tinycss2" }, +] + +[[package]] +name = "blinker" +version = "1.9.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/21/28/9b3f50ce0e048515135495f198351908d99540d69bfdc8c1d15b73dc55ce/blinker-1.9.0.tar.gz", hash = "sha256:b4ce2265a7abece45e7cc896e98dbebe6cead56bcf805a3d23136d145f5445bf", size = 22460, upload-time = "2024-11-08T17:25:47.436Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/10/cb/f2ad4230dc2eb1a74edf38f1a38b9b52277f75bef262d8908e60d957e13c/blinker-1.9.0-py3-none-any.whl", hash = "sha256:ba0efaa9080b619ff2f3459d1d500c57bddea4a6b424b60a91141db6fd2f08bc", size = 8458, upload-time = "2024-11-08T17:25:46.184Z" }, +] + +[[package]] +name = "boltons" +version = "25.0.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/63/54/71a94d8e02da9a865587fb3fff100cb0fc7aa9f4d5ed9ed3a591216ddcc7/boltons-25.0.0.tar.gz", hash = "sha256:e110fbdc30b7b9868cb604e3f71d4722dd8f4dcb4a5ddd06028ba8f1ab0b5ace", size = 246294, upload-time = "2025-02-03T05:57:59.129Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/45/7f/0e961cf3908bc4c1c3e027de2794f867c6c89fb4916fc7dba295a0e80a2d/boltons-25.0.0-py3-none-any.whl", hash = "sha256:dc9fb38bf28985715497d1b54d00b62ea866eca3938938ea9043e254a3a6ca62", size = 194210, upload-time = "2025-02-03T05:57:56.705Z" }, +] + +[[package]] +name = "boto3" +version = "1.43.16" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "botocore" }, + { name = "jmespath" }, + { name = "s3transfer" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/48/4f/f13d80d377b54dd2973e243e4eb7ce748706cd53876361cc72506006fd8b/boto3-1.43.16.tar.gz", hash = "sha256:6c337bbe608aacc7d335c79e671f0c893870293b74d652f7a7af22ccd0dfef16", size = 113152, upload-time = "2026-05-27T19:31:39.899Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/af/c0/7d687e40f4b7046ede66026ecd1b0a93d47afe26d9170f5926a1605c8641/boto3-1.43.16-py3-none-any.whl", hash = "sha256:dffc8a3cd3edbc0ad95b9c6b983e873b76ede46d3aa0709f94db253f2ff2388f", size = 140537, upload-time = "2026-05-27T19:31:36.453Z" }, +] + +[[package]] +name = "botocore" +version = "1.43.16" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "jmespath" }, + { name = "python-dateutil" }, + { name = "urllib3" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/a1/74/140451a1fe027cb5e387cc7b1ec56224616ca742c330f1492f71c5cba3fb/botocore-1.43.16.tar.gz", hash = "sha256:813dae233d8b365c19aaf7865b32070e34d7e793654881bf86ecbbef3f4ad5c6", size = 15388648, upload-time = "2026-05-27T19:31:25.172Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/46/8f/25933240485c0662bb3fa430ed0c6b8b8124ab3bc136154c07ce12644cb0/botocore-1.43.16-py3-none-any.whl", hash = "sha256:8ab05b1346d26a3c6d69c7338051f07bd4739a090f414d2cff43c0dbc1e18ca7", size = 15067437, upload-time = "2026-05-27T19:31:19.212Z" }, +] + +[[package]] +name = "brotli" +version = "1.2.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/f7/16/c92ca344d646e71a43b8bb353f0a6490d7f6e06210f8554c8f874e454285/brotli-1.2.0.tar.gz", hash = "sha256:e310f77e41941c13340a95976fe66a8a95b01e783d430eeaf7a2f87e0a57dd0a", size = 7388632, upload-time = "2025-11-05T18:39:42.86Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/7a/ef/f285668811a9e1ddb47a18cb0b437d5fc2760d537a2fe8a57875ad6f8448/brotli-1.2.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:15b33fe93cedc4caaff8a0bd1eb7e3dab1c61bb22a0bf5bdfdfd97cd7da79744", size = 863110, upload-time = "2025-11-05T18:38:12.978Z" }, + { url = "https://files.pythonhosted.org/packages/50/62/a3b77593587010c789a9d6eaa527c79e0848b7b860402cc64bc0bc28a86c/brotli-1.2.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:898be2be399c221d2671d29eed26b6b2713a02c2119168ed914e7d00ceadb56f", size = 445438, upload-time = "2025-11-05T18:38:14.208Z" }, + { url = "https://files.pythonhosted.org/packages/cd/e1/7fadd47f40ce5549dc44493877db40292277db373da5053aff181656e16e/brotli-1.2.0-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:350c8348f0e76fff0a0fd6c26755d2653863279d086d3aa2c290a6a7251135dd", size = 1534420, upload-time = "2025-11-05T18:38:15.111Z" }, + { url = "https://files.pythonhosted.org/packages/12/8b/1ed2f64054a5a008a4ccd2f271dbba7a5fb1a3067a99f5ceadedd4c1d5a7/brotli-1.2.0-cp311-cp311-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:2e1ad3fda65ae0d93fec742a128d72e145c9c7a99ee2fcd667785d99eb25a7fe", size = 1632619, upload-time = "2025-11-05T18:38:16.094Z" }, + { url = "https://files.pythonhosted.org/packages/89/5a/7071a621eb2d052d64efd5da2ef55ecdac7c3b0c6e4f9d519e9c66d987ef/brotli-1.2.0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:40d918bce2b427a0c4ba189df7a006ac0c7277c180aee4617d99e9ccaaf59e6a", size = 1426014, upload-time = "2025-11-05T18:38:17.177Z" }, + { url = "https://files.pythonhosted.org/packages/26/6d/0971a8ea435af5156acaaccec1a505f981c9c80227633851f2810abd252a/brotli-1.2.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:2a7f1d03727130fc875448b65b127a9ec5d06d19d0148e7554384229706f9d1b", size = 1489661, upload-time = "2025-11-05T18:38:18.41Z" }, + { url = "https://files.pythonhosted.org/packages/f3/75/c1baca8b4ec6c96a03ef8230fab2a785e35297632f402ebb1e78a1e39116/brotli-1.2.0-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:9c79f57faa25d97900bfb119480806d783fba83cd09ee0b33c17623935b05fa3", size = 1599150, upload-time = "2025-11-05T18:38:19.792Z" }, + { url = "https://files.pythonhosted.org/packages/0d/1a/23fcfee1c324fd48a63d7ebf4bac3a4115bdb1b00e600f80f727d850b1ae/brotli-1.2.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:844a8ceb8483fefafc412f85c14f2aae2fb69567bf2a0de53cdb88b73e7c43ae", size = 1493505, upload-time = "2025-11-05T18:38:20.913Z" }, + { url = "https://files.pythonhosted.org/packages/36/e5/12904bbd36afeef53d45a84881a4810ae8810ad7e328a971ebbfd760a0b3/brotli-1.2.0-cp311-cp311-win32.whl", hash = "sha256:aa47441fa3026543513139cb8926a92a8e305ee9c71a6209ef7a97d91640ea03", size = 334451, upload-time = "2025-11-05T18:38:21.94Z" }, + { url = "https://files.pythonhosted.org/packages/02/8b/ecb5761b989629a4758c394b9301607a5880de61ee2ee5fe104b87149ebc/brotli-1.2.0-cp311-cp311-win_amd64.whl", hash = "sha256:022426c9e99fd65d9475dce5c195526f04bb8be8907607e27e747893f6ee3e24", size = 369035, upload-time = "2025-11-05T18:38:22.941Z" }, + { url = "https://files.pythonhosted.org/packages/11/ee/b0a11ab2315c69bb9b45a2aaed022499c9c24a205c3a49c3513b541a7967/brotli-1.2.0-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:35d382625778834a7f3061b15423919aa03e4f5da34ac8e02c074e4b75ab4f84", size = 861543, upload-time = "2025-11-05T18:38:24.183Z" }, + { url = "https://files.pythonhosted.org/packages/e1/2f/29c1459513cd35828e25531ebfcbf3e92a5e49f560b1777a9af7203eb46e/brotli-1.2.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:7a61c06b334bd99bc5ae84f1eeb36bfe01400264b3c352f968c6e30a10f9d08b", size = 444288, upload-time = "2025-11-05T18:38:25.139Z" }, + { url = "https://files.pythonhosted.org/packages/3d/6f/feba03130d5fceadfa3a1bb102cb14650798c848b1df2a808356f939bb16/brotli-1.2.0-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:acec55bb7c90f1dfc476126f9711a8e81c9af7fb617409a9ee2953115343f08d", size = 1528071, upload-time = "2025-11-05T18:38:26.081Z" }, + { url = "https://files.pythonhosted.org/packages/2b/38/f3abb554eee089bd15471057ba85f47e53a44a462cfce265d9bf7088eb09/brotli-1.2.0-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:260d3692396e1895c5034f204f0db022c056f9e2ac841593a4cf9426e2a3faca", size = 1626913, upload-time = "2025-11-05T18:38:27.284Z" }, + { url = "https://files.pythonhosted.org/packages/03/a7/03aa61fbc3c5cbf99b44d158665f9b0dd3d8059be16c460208d9e385c837/brotli-1.2.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:072e7624b1fc4d601036ab3f4f27942ef772887e876beff0301d261210bca97f", size = 1419762, upload-time = "2025-11-05T18:38:28.295Z" }, + { url = "https://files.pythonhosted.org/packages/21/1b/0374a89ee27d152a5069c356c96b93afd1b94eae83f1e004b57eb6ce2f10/brotli-1.2.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:adedc4a67e15327dfdd04884873c6d5a01d3e3b6f61406f99b1ed4865a2f6d28", size = 1484494, upload-time = "2025-11-05T18:38:29.29Z" }, + { url = "https://files.pythonhosted.org/packages/cf/57/69d4fe84a67aef4f524dcd075c6eee868d7850e85bf01d778a857d8dbe0a/brotli-1.2.0-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:7a47ce5c2288702e09dc22a44d0ee6152f2c7eda97b3c8482d826a1f3cfc7da7", size = 1593302, upload-time = "2025-11-05T18:38:30.639Z" }, + { url = "https://files.pythonhosted.org/packages/d5/3b/39e13ce78a8e9a621c5df3aeb5fd181fcc8caba8c48a194cd629771f6828/brotli-1.2.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:af43b8711a8264bb4e7d6d9a6d004c3a2019c04c01127a868709ec29962b6036", size = 1487913, upload-time = "2025-11-05T18:38:31.618Z" }, + { url = "https://files.pythonhosted.org/packages/62/28/4d00cb9bd76a6357a66fcd54b4b6d70288385584063f4b07884c1e7286ac/brotli-1.2.0-cp312-cp312-win32.whl", hash = "sha256:e99befa0b48f3cd293dafeacdd0d191804d105d279e0b387a32054c1180f3161", size = 334362, upload-time = "2025-11-05T18:38:32.939Z" }, + { url = "https://files.pythonhosted.org/packages/1c/4e/bc1dcac9498859d5e353c9b153627a3752868a9d5f05ce8dedd81a2354ab/brotli-1.2.0-cp312-cp312-win_amd64.whl", hash = "sha256:b35c13ce241abdd44cb8ca70683f20c0c079728a36a996297adb5334adfc1c44", size = 369115, upload-time = "2025-11-05T18:38:33.765Z" }, + { url = "https://files.pythonhosted.org/packages/6c/d4/4ad5432ac98c73096159d9ce7ffeb82d151c2ac84adcc6168e476bb54674/brotli-1.2.0-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:9e5825ba2c9998375530504578fd4d5d1059d09621a02065d1b6bfc41a8e05ab", size = 861523, upload-time = "2025-11-05T18:38:34.67Z" }, + { url = "https://files.pythonhosted.org/packages/91/9f/9cc5bd03ee68a85dc4bc89114f7067c056a3c14b3d95f171918c088bf88d/brotli-1.2.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:0cf8c3b8ba93d496b2fae778039e2f5ecc7cff99df84df337ca31d8f2252896c", size = 444289, upload-time = "2025-11-05T18:38:35.6Z" }, + { url = "https://files.pythonhosted.org/packages/2e/b6/fe84227c56a865d16a6614e2c4722864b380cb14b13f3e6bef441e73a85a/brotli-1.2.0-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:c8565e3cdc1808b1a34714b553b262c5de5fbda202285782173ec137fd13709f", size = 1528076, upload-time = "2025-11-05T18:38:36.639Z" }, + { url = "https://files.pythonhosted.org/packages/55/de/de4ae0aaca06c790371cf6e7ee93a024f6b4bb0568727da8c3de112e726c/brotli-1.2.0-cp313-cp313-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:26e8d3ecb0ee458a9804f47f21b74845cc823fd1bb19f02272be70774f56e2a6", size = 1626880, upload-time = "2025-11-05T18:38:37.623Z" }, + { url = "https://files.pythonhosted.org/packages/5f/16/a1b22cbea436642e071adcaf8d4b350a2ad02f5e0ad0da879a1be16188a0/brotli-1.2.0-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:67a91c5187e1eec76a61625c77a6c8c785650f5b576ca732bd33ef58b0dff49c", size = 1419737, upload-time = "2025-11-05T18:38:38.729Z" }, + { url = "https://files.pythonhosted.org/packages/46/63/c968a97cbb3bdbf7f974ef5a6ab467a2879b82afbc5ffb65b8acbb744f95/brotli-1.2.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:4ecdb3b6dc36e6d6e14d3a1bdc6c1057c8cbf80db04031d566eb6080ce283a48", size = 1484440, upload-time = "2025-11-05T18:38:39.916Z" }, + { url = "https://files.pythonhosted.org/packages/06/9d/102c67ea5c9fc171f423e8399e585dabea29b5bc79b05572891e70013cdd/brotli-1.2.0-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:3e1b35d56856f3ed326b140d3c6d9db91740f22e14b06e840fe4bb1923439a18", size = 1593313, upload-time = "2025-11-05T18:38:41.24Z" }, + { url = "https://files.pythonhosted.org/packages/9e/4a/9526d14fa6b87bc827ba1755a8440e214ff90de03095cacd78a64abe2b7d/brotli-1.2.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:54a50a9dad16b32136b2241ddea9e4df159b41247b2ce6aac0b3276a66a8f1e5", size = 1487945, upload-time = "2025-11-05T18:38:42.277Z" }, + { url = "https://files.pythonhosted.org/packages/5b/e8/3fe1ffed70cbef83c5236166acaed7bb9c766509b157854c80e2f766b38c/brotli-1.2.0-cp313-cp313-win32.whl", hash = "sha256:1b1d6a4efedd53671c793be6dd760fcf2107da3a52331ad9ea429edf0902f27a", size = 334368, upload-time = "2025-11-05T18:38:43.345Z" }, + { url = "https://files.pythonhosted.org/packages/ff/91/e739587be970a113b37b821eae8097aac5a48e5f0eca438c22e4c7dd8648/brotli-1.2.0-cp313-cp313-win_amd64.whl", hash = "sha256:b63daa43d82f0cdabf98dee215b375b4058cce72871fd07934f179885aad16e8", size = 369116, upload-time = "2025-11-05T18:38:44.609Z" }, + { url = "https://files.pythonhosted.org/packages/17/e1/298c2ddf786bb7347a1cd71d63a347a79e5712a7c0cba9e3c3458ebd976f/brotli-1.2.0-cp314-cp314-macosx_10_15_universal2.whl", hash = "sha256:6c12dad5cd04530323e723787ff762bac749a7b256a5bece32b2243dd5c27b21", size = 863080, upload-time = "2025-11-05T18:38:45.503Z" }, + { url = "https://files.pythonhosted.org/packages/84/0c/aac98e286ba66868b2b3b50338ffbd85a35c7122e9531a73a37a29763d38/brotli-1.2.0-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:3219bd9e69868e57183316ee19c84e03e8f8b5a1d1f2667e1aa8c2f91cb061ac", size = 445453, upload-time = "2025-11-05T18:38:46.433Z" }, + { url = "https://files.pythonhosted.org/packages/ec/f1/0ca1f3f99ae300372635ab3fe2f7a79fa335fee3d874fa7f9e68575e0e62/brotli-1.2.0-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:963a08f3bebd8b75ac57661045402da15991468a621f014be54e50f53a58d19e", size = 1528168, upload-time = "2025-11-05T18:38:47.371Z" }, + { url = "https://files.pythonhosted.org/packages/d6/a6/2ebfc8f766d46df8d3e65b880a2e220732395e6d7dc312c1e1244b0f074a/brotli-1.2.0-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:9322b9f8656782414b37e6af884146869d46ab85158201d82bab9abbcb971dc7", size = 1627098, upload-time = "2025-11-05T18:38:48.385Z" }, + { url = "https://files.pythonhosted.org/packages/f3/2f/0976d5b097ff8a22163b10617f76b2557f15f0f39d6a0fe1f02b1a53e92b/brotli-1.2.0-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:cf9cba6f5b78a2071ec6fb1e7bd39acf35071d90a81231d67e92d637776a6a63", size = 1419861, upload-time = "2025-11-05T18:38:49.372Z" }, + { url = "https://files.pythonhosted.org/packages/9c/97/d76df7176a2ce7616ff94c1fb72d307c9a30d2189fe877f3dd99af00ea5a/brotli-1.2.0-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:7547369c4392b47d30a3467fe8c3330b4f2e0f7730e45e3103d7d636678a808b", size = 1484594, upload-time = "2025-11-05T18:38:50.655Z" }, + { url = "https://files.pythonhosted.org/packages/d3/93/14cf0b1216f43df5609f5b272050b0abd219e0b54ea80b47cef9867b45e7/brotli-1.2.0-cp314-cp314-musllinux_1_2_ppc64le.whl", hash = "sha256:fc1530af5c3c275b8524f2e24841cbe2599d74462455e9bae5109e9ff42e9361", size = 1593455, upload-time = "2025-11-05T18:38:51.624Z" }, + { url = "https://files.pythonhosted.org/packages/b3/73/3183c9e41ca755713bdf2cc1d0810df742c09484e2e1ddd693bee53877c1/brotli-1.2.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:d2d085ded05278d1c7f65560aae97b3160aeb2ea2c0b3e26204856beccb60888", size = 1488164, upload-time = "2025-11-05T18:38:53.079Z" }, + { url = "https://files.pythonhosted.org/packages/64/6a/0c78d8f3a582859236482fd9fa86a65a60328a00983006bcf6d83b7b2253/brotli-1.2.0-cp314-cp314-win32.whl", hash = "sha256:832c115a020e463c2f67664560449a7bea26b0c1fdd690352addad6d0a08714d", size = 339280, upload-time = "2025-11-05T18:38:54.02Z" }, + { url = "https://files.pythonhosted.org/packages/f5/10/56978295c14794b2c12007b07f3e41ba26acda9257457d7085b0bb3bb90c/brotli-1.2.0-cp314-cp314-win_amd64.whl", hash = "sha256:e7c0af964e0b4e3412a0ebf341ea26ec767fa0b4cf81abb5e897c9338b5ad6a3", size = 375639, upload-time = "2025-11-05T18:38:55.67Z" }, +] + +[[package]] +name = "brotlicffi" +version = "1.2.0.1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "cffi" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/8a/b6/017dc5f852ed9b8735af77774509271acbf1de02d238377667145fcee01d/brotlicffi-1.2.0.1.tar.gz", hash = "sha256:c20d5c596278307ad06414a6d95a892377ea274a5c6b790c2548c009385d621c", size = 478156, upload-time = "2026-03-05T19:54:11.547Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/ef/f9/dfa56316837fa798eac19358351e974de8e1e2ca9475af4cb90293cd6576/brotlicffi-1.2.0.1-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:2c85e65913cf2b79c57a3fdd05b98d9731d9255dc0cb696b09376cc091b9cddd", size = 433046, upload-time = "2026-03-05T19:53:46.209Z" }, + { url = "https://files.pythonhosted.org/packages/4a/f5/f8f492158c76b0d940388801f04f747028971ad5774287bded5f1e53f08d/brotlicffi-1.2.0.1-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:535f2d05d0273408abc13fc0eebb467afac17b0ad85090c8913690d40207dac5", size = 1541126, upload-time = "2026-03-05T19:53:48.248Z" }, + { url = "https://files.pythonhosted.org/packages/3b/e1/ff87af10ac419600c63e9287a0649c673673ae6b4f2bcf48e96cb2f89f60/brotlicffi-1.2.0.1-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:ce17eb798ca59ecec67a9bb3fd7a4304e120d1cd02953ce522d959b9a84d58ac", size = 1541983, upload-time = "2026-03-05T19:53:50.317Z" }, + { url = "https://files.pythonhosted.org/packages/47/c0/80ecd9bd45776109fab14040e478bf63e456967c9ddee2353d8330ed8de1/brotlicffi-1.2.0.1-cp314-cp314t-win32.whl", hash = "sha256:3c9544f83cb715d95d7eab3af4adbbef8b2093ad6382288a83b3a25feb1a57ec", size = 349047, upload-time = "2026-03-05T19:53:52.215Z" }, + { url = "https://files.pythonhosted.org/packages/ab/98/13e5b250236a281b6cd9e92a01ee1ae231029fa78faee932ef3766e1cb24/brotlicffi-1.2.0.1-cp314-cp314t-win_amd64.whl", hash = "sha256:625f8115d32ae9c0740d01ea51518437c3fbaa3e78d41cb18459f6f7ac326000", size = 385652, upload-time = "2026-03-05T19:53:53.892Z" }, + { url = "https://files.pythonhosted.org/packages/9a/9f/b98dcd4af47994cee97aebac866996a006a2e5fc1fd1e2b82a8ad95cf09c/brotlicffi-1.2.0.1-cp38-abi3-macosx_11_0_arm64.whl", hash = "sha256:91ba5f0ccc040f6ff8f7efaf839f797723d03ed46acb8ae9408f99ffd2572cf4", size = 432608, upload-time = "2026-03-05T19:53:56.736Z" }, + { url = "https://files.pythonhosted.org/packages/b1/7a/ac4ee56595a061e3718a6d1ea7e921f4df156894acffb28ed88a1fd52022/brotlicffi-1.2.0.1-cp38-abi3-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:be9a670c6811af30a4bd42d7116dc5895d3b41beaa8ed8a89050447a0181f5ce", size = 1534257, upload-time = "2026-03-05T19:53:58.667Z" }, + { url = "https://files.pythonhosted.org/packages/99/39/e7410db7f6f56de57744ea52a115084ceb2735f4d44973f349bb92136586/brotlicffi-1.2.0.1-cp38-abi3-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:6f3314a3476f59e5443f9f72a6dff16edc0c3463c9b318feaef04ae3e4683f5a", size = 1536838, upload-time = "2026-03-05T19:54:00.705Z" }, + { url = "https://files.pythonhosted.org/packages/a6/75/6e7977d1935fc3fbb201cbd619be8f2c7aea25d40a096967132854b34708/brotlicffi-1.2.0.1-cp38-abi3-win32.whl", hash = "sha256:82ea52e2b5d3145b6c406ebd3efb0d55db718b7ad996bd70c62cec0439de1187", size = 343337, upload-time = "2026-03-05T19:54:02.446Z" }, + { url = "https://files.pythonhosted.org/packages/d8/ef/e7e485ce5e4ba3843a0a92feb767c7b6098fd6e65ce752918074d175ae71/brotlicffi-1.2.0.1-cp38-abi3-win_amd64.whl", hash = "sha256:da2e82a08e7778b8bc539d27ca03cdd684113e81394bfaaad8d0dfc6a17ddede", size = 379026, upload-time = "2026-03-05T19:54:04.322Z" }, + { url = "https://files.pythonhosted.org/packages/7f/53/6262c2256513e6f530d81642477cb19367270922063eaa2d7b781d8c723d/brotlicffi-1.2.0.1-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:e015af99584c6db1490a69a210c765953e473e63adc2d891ac3062a737c9e851", size = 402265, upload-time = "2026-03-05T19:54:05.858Z" }, + { url = "https://files.pythonhosted.org/packages/1f/d9/d5340b43cf5fbe7fe5a083d237e5338cc1caa73bea523be1c5e452c26290/brotlicffi-1.2.0.1-pp311-pypy311_pp73-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:37cb587d32bf7168e2218c455e22e409ad1f3157c6c71945879a311f3e6b6abf", size = 406710, upload-time = "2026-03-05T19:54:07.272Z" }, + { url = "https://files.pythonhosted.org/packages/a3/82/dbced4c1e0792efdf23fd90ff6d2a320c64ff4dfef7aacc85c04fde9ddd2/brotlicffi-1.2.0.1-pp311-pypy311_pp73-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:9d6ba65dd528892b4d9960beba2ae011a753620bcfc66cf6fa3cee18d7b0baa4", size = 402787, upload-time = "2026-03-05T19:54:08.73Z" }, + { url = "https://files.pythonhosted.org/packages/ef/6f/534205ba7590c9a8716a614f270c5c2ec419b5b7079b3f9cd31b7b5580de/brotlicffi-1.2.0.1-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:f2a5575653b0672638ba039b82fda56854934d7a6a24d4b8b5033f73ab43cbc1", size = 375108, upload-time = "2026-03-05T19:54:10.079Z" }, +] + +[[package]] +name = "bytecode" +version = "0.17.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/98/c4/4818b392104bd426171fc2ce9c79c8edb4019ba6505747626d0f7107766c/bytecode-0.17.0.tar.gz", hash = "sha256:0c37efa5bd158b1b873f530cceea2c645611d55bd2dc2a4758b09f185749b6fd", size = 105863, upload-time = "2025-09-03T19:55:45.703Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/ce/80/379e685099841f8501a19fb58b496512ef432331fed38276c3938ab09d8e/bytecode-0.17.0-py3-none-any.whl", hash = "sha256:64fb10cde1db7ef5cc39bd414ecebd54ba3b40e1c4cf8121ca5e72f170916ff8", size = 43045, upload-time = "2025-09-03T19:55:43.879Z" }, +] + +[[package]] +name = "certifi" +version = "2026.5.20" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/f3/ce/ee2ecad540810a79593028e88299baeae54d346cc7a0d94b6199988b89b1/certifi-2026.5.20.tar.gz", hash = "sha256:69dea482ab64caa7b9f6aba1c6bf48bb6a5448d1c0f1b17ab42ad8c763a5344d", size = 135422, upload-time = "2026-05-20T11:46:50.073Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/59/8c/57e832b7af6d7c5abe66eb3fbe3a3a32f4d11ea23a1aa7131371035be991/certifi-2026.5.20-py3-none-any.whl", hash = "sha256:3c52e209ba0a4ad7aebe60436a4ab349c39e1e602e8c134221e546902ad25897", size = 134134, upload-time = "2026-05-20T11:46:48.578Z" }, +] + +[[package]] +name = "cffi" +version = "2.0.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "pycparser", marker = "implementation_name != 'PyPy'" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/eb/56/b1ba7935a17738ae8453301356628e8147c79dbb825bcbc73dc7401f9846/cffi-2.0.0.tar.gz", hash = "sha256:44d1b5909021139fe36001ae048dbdde8214afa20200eda0f64c068cac5d5529", size = 523588, upload-time = "2025-09-08T23:24:04.541Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/12/4a/3dfd5f7850cbf0d06dc84ba9aa00db766b52ca38d8b86e3a38314d52498c/cffi-2.0.0-cp311-cp311-macosx_10_13_x86_64.whl", hash = "sha256:b4c854ef3adc177950a8dfc81a86f5115d2abd545751a304c5bcf2c2c7283cfe", size = 184344, upload-time = "2025-09-08T23:22:26.456Z" }, + { url = "https://files.pythonhosted.org/packages/4f/8b/f0e4c441227ba756aafbe78f117485b25bb26b1c059d01f137fa6d14896b/cffi-2.0.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:2de9a304e27f7596cd03d16f1b7c72219bd944e99cc52b84d0145aefb07cbd3c", size = 180560, upload-time = "2025-09-08T23:22:28.197Z" }, + { url = "https://files.pythonhosted.org/packages/b1/b7/1200d354378ef52ec227395d95c2576330fd22a869f7a70e88e1447eb234/cffi-2.0.0-cp311-cp311-manylinux1_i686.manylinux2014_i686.manylinux_2_17_i686.manylinux_2_5_i686.whl", hash = "sha256:baf5215e0ab74c16e2dd324e8ec067ef59e41125d3eade2b863d294fd5035c92", size = 209613, upload-time = "2025-09-08T23:22:29.475Z" }, + { url = "https://files.pythonhosted.org/packages/b8/56/6033f5e86e8cc9bb629f0077ba71679508bdf54a9a5e112a3c0b91870332/cffi-2.0.0-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:730cacb21e1bdff3ce90babf007d0a0917cc3e6492f336c2f0134101e0944f93", size = 216476, upload-time = "2025-09-08T23:22:31.063Z" }, + { url = "https://files.pythonhosted.org/packages/dc/7f/55fecd70f7ece178db2f26128ec41430d8720f2d12ca97bf8f0a628207d5/cffi-2.0.0-cp311-cp311-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:6824f87845e3396029f3820c206e459ccc91760e8fa24422f8b0c3d1731cbec5", size = 203374, upload-time = "2025-09-08T23:22:32.507Z" }, + { url = "https://files.pythonhosted.org/packages/84/ef/a7b77c8bdc0f77adc3b46888f1ad54be8f3b7821697a7b89126e829e676a/cffi-2.0.0-cp311-cp311-manylinux2014_s390x.manylinux_2_17_s390x.whl", hash = "sha256:9de40a7b0323d889cf8d23d1ef214f565ab154443c42737dfe52ff82cf857664", size = 202597, upload-time = "2025-09-08T23:22:34.132Z" }, + { url = "https://files.pythonhosted.org/packages/d7/91/500d892b2bf36529a75b77958edfcd5ad8e2ce4064ce2ecfeab2125d72d1/cffi-2.0.0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:8941aaadaf67246224cee8c3803777eed332a19d909b47e29c9842ef1e79ac26", size = 215574, upload-time = "2025-09-08T23:22:35.443Z" }, + { url = "https://files.pythonhosted.org/packages/44/64/58f6255b62b101093d5df22dcb752596066c7e89dd725e0afaed242a61be/cffi-2.0.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:a05d0c237b3349096d3981b727493e22147f934b20f6f125a3eba8f994bec4a9", size = 218971, upload-time = "2025-09-08T23:22:36.805Z" }, + { url = "https://files.pythonhosted.org/packages/ab/49/fa72cebe2fd8a55fbe14956f9970fe8eb1ac59e5df042f603ef7c8ba0adc/cffi-2.0.0-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:94698a9c5f91f9d138526b48fe26a199609544591f859c870d477351dc7b2414", size = 211972, upload-time = "2025-09-08T23:22:38.436Z" }, + { url = "https://files.pythonhosted.org/packages/0b/28/dd0967a76aab36731b6ebfe64dec4e981aff7e0608f60c2d46b46982607d/cffi-2.0.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:5fed36fccc0612a53f1d4d9a816b50a36702c28a2aa880cb8a122b3466638743", size = 217078, upload-time = "2025-09-08T23:22:39.776Z" }, + { url = "https://files.pythonhosted.org/packages/2b/c0/015b25184413d7ab0a410775fdb4a50fca20f5589b5dab1dbbfa3baad8ce/cffi-2.0.0-cp311-cp311-win32.whl", hash = "sha256:c649e3a33450ec82378822b3dad03cc228b8f5963c0c12fc3b1e0ab940f768a5", size = 172076, upload-time = "2025-09-08T23:22:40.95Z" }, + { url = "https://files.pythonhosted.org/packages/ae/8f/dc5531155e7070361eb1b7e4c1a9d896d0cb21c49f807a6c03fd63fc877e/cffi-2.0.0-cp311-cp311-win_amd64.whl", hash = "sha256:66f011380d0e49ed280c789fbd08ff0d40968ee7b665575489afa95c98196ab5", size = 182820, upload-time = "2025-09-08T23:22:42.463Z" }, + { url = "https://files.pythonhosted.org/packages/95/5c/1b493356429f9aecfd56bc171285a4c4ac8697f76e9bbbbb105e537853a1/cffi-2.0.0-cp311-cp311-win_arm64.whl", hash = "sha256:c6638687455baf640e37344fe26d37c404db8b80d037c3d29f58fe8d1c3b194d", size = 177635, upload-time = "2025-09-08T23:22:43.623Z" }, + { url = "https://files.pythonhosted.org/packages/ea/47/4f61023ea636104d4f16ab488e268b93008c3d0bb76893b1b31db1f96802/cffi-2.0.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:6d02d6655b0e54f54c4ef0b94eb6be0607b70853c45ce98bd278dc7de718be5d", size = 185271, upload-time = "2025-09-08T23:22:44.795Z" }, + { url = "https://files.pythonhosted.org/packages/df/a2/781b623f57358e360d62cdd7a8c681f074a71d445418a776eef0aadb4ab4/cffi-2.0.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:8eca2a813c1cb7ad4fb74d368c2ffbbb4789d377ee5bb8df98373c2cc0dee76c", size = 181048, upload-time = "2025-09-08T23:22:45.938Z" }, + { url = "https://files.pythonhosted.org/packages/ff/df/a4f0fbd47331ceeba3d37c2e51e9dfc9722498becbeec2bd8bc856c9538a/cffi-2.0.0-cp312-cp312-manylinux1_i686.manylinux2014_i686.manylinux_2_17_i686.manylinux_2_5_i686.whl", hash = "sha256:21d1152871b019407d8ac3985f6775c079416c282e431a4da6afe7aefd2bccbe", size = 212529, upload-time = "2025-09-08T23:22:47.349Z" }, + { url = "https://files.pythonhosted.org/packages/d5/72/12b5f8d3865bf0f87cf1404d8c374e7487dcf097a1c91c436e72e6badd83/cffi-2.0.0-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:b21e08af67b8a103c71a250401c78d5e0893beff75e28c53c98f4de42f774062", size = 220097, upload-time = "2025-09-08T23:22:48.677Z" }, + { url = "https://files.pythonhosted.org/packages/c2/95/7a135d52a50dfa7c882ab0ac17e8dc11cec9d55d2c18dda414c051c5e69e/cffi-2.0.0-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:1e3a615586f05fc4065a8b22b8152f0c1b00cdbc60596d187c2a74f9e3036e4e", size = 207983, upload-time = "2025-09-08T23:22:50.06Z" }, + { url = "https://files.pythonhosted.org/packages/3a/c8/15cb9ada8895957ea171c62dc78ff3e99159ee7adb13c0123c001a2546c1/cffi-2.0.0-cp312-cp312-manylinux2014_s390x.manylinux_2_17_s390x.whl", hash = "sha256:81afed14892743bbe14dacb9e36d9e0e504cd204e0b165062c488942b9718037", size = 206519, upload-time = "2025-09-08T23:22:51.364Z" }, + { url = "https://files.pythonhosted.org/packages/78/2d/7fa73dfa841b5ac06c7b8855cfc18622132e365f5b81d02230333ff26e9e/cffi-2.0.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:3e17ed538242334bf70832644a32a7aae3d83b57567f9fd60a26257e992b79ba", size = 219572, upload-time = "2025-09-08T23:22:52.902Z" }, + { url = "https://files.pythonhosted.org/packages/07/e0/267e57e387b4ca276b90f0434ff88b2c2241ad72b16d31836adddfd6031b/cffi-2.0.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:3925dd22fa2b7699ed2617149842d2e6adde22b262fcbfada50e3d195e4b3a94", size = 222963, upload-time = "2025-09-08T23:22:54.518Z" }, + { url = "https://files.pythonhosted.org/packages/b6/75/1f2747525e06f53efbd878f4d03bac5b859cbc11c633d0fb81432d98a795/cffi-2.0.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:2c8f814d84194c9ea681642fd164267891702542f028a15fc97d4674b6206187", size = 221361, upload-time = "2025-09-08T23:22:55.867Z" }, + { url = "https://files.pythonhosted.org/packages/7b/2b/2b6435f76bfeb6bbf055596976da087377ede68df465419d192acf00c437/cffi-2.0.0-cp312-cp312-win32.whl", hash = "sha256:da902562c3e9c550df360bfa53c035b2f241fed6d9aef119048073680ace4a18", size = 172932, upload-time = "2025-09-08T23:22:57.188Z" }, + { url = "https://files.pythonhosted.org/packages/f8/ed/13bd4418627013bec4ed6e54283b1959cf6db888048c7cf4b4c3b5b36002/cffi-2.0.0-cp312-cp312-win_amd64.whl", hash = "sha256:da68248800ad6320861f129cd9c1bf96ca849a2771a59e0344e88681905916f5", size = 183557, upload-time = "2025-09-08T23:22:58.351Z" }, + { url = "https://files.pythonhosted.org/packages/95/31/9f7f93ad2f8eff1dbc1c3656d7ca5bfd8fb52c9d786b4dcf19b2d02217fa/cffi-2.0.0-cp312-cp312-win_arm64.whl", hash = "sha256:4671d9dd5ec934cb9a73e7ee9676f9362aba54f7f34910956b84d727b0d73fb6", size = 177762, upload-time = "2025-09-08T23:22:59.668Z" }, + { url = "https://files.pythonhosted.org/packages/4b/8d/a0a47a0c9e413a658623d014e91e74a50cdd2c423f7ccfd44086ef767f90/cffi-2.0.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:00bdf7acc5f795150faa6957054fbbca2439db2f775ce831222b66f192f03beb", size = 185230, upload-time = "2025-09-08T23:23:00.879Z" }, + { url = "https://files.pythonhosted.org/packages/4a/d2/a6c0296814556c68ee32009d9c2ad4f85f2707cdecfd7727951ec228005d/cffi-2.0.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:45d5e886156860dc35862657e1494b9bae8dfa63bf56796f2fb56e1679fc0bca", size = 181043, upload-time = "2025-09-08T23:23:02.231Z" }, + { url = "https://files.pythonhosted.org/packages/b0/1e/d22cc63332bd59b06481ceaac49d6c507598642e2230f201649058a7e704/cffi-2.0.0-cp313-cp313-manylinux1_i686.manylinux2014_i686.manylinux_2_17_i686.manylinux_2_5_i686.whl", hash = "sha256:07b271772c100085dd28b74fa0cd81c8fb1a3ba18b21e03d7c27f3436a10606b", size = 212446, upload-time = "2025-09-08T23:23:03.472Z" }, + { url = "https://files.pythonhosted.org/packages/a9/f5/a2c23eb03b61a0b8747f211eb716446c826ad66818ddc7810cc2cc19b3f2/cffi-2.0.0-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:d48a880098c96020b02d5a1f7d9251308510ce8858940e6fa99ece33f610838b", size = 220101, upload-time = "2025-09-08T23:23:04.792Z" }, + { url = "https://files.pythonhosted.org/packages/f2/7f/e6647792fc5850d634695bc0e6ab4111ae88e89981d35ac269956605feba/cffi-2.0.0-cp313-cp313-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:f93fd8e5c8c0a4aa1f424d6173f14a892044054871c771f8566e4008eaa359d2", size = 207948, upload-time = "2025-09-08T23:23:06.127Z" }, + { url = "https://files.pythonhosted.org/packages/cb/1e/a5a1bd6f1fb30f22573f76533de12a00bf274abcdc55c8edab639078abb6/cffi-2.0.0-cp313-cp313-manylinux2014_s390x.manylinux_2_17_s390x.whl", hash = "sha256:dd4f05f54a52fb558f1ba9f528228066954fee3ebe629fc1660d874d040ae5a3", size = 206422, upload-time = "2025-09-08T23:23:07.753Z" }, + { url = "https://files.pythonhosted.org/packages/98/df/0a1755e750013a2081e863e7cd37e0cdd02664372c754e5560099eb7aa44/cffi-2.0.0-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:c8d3b5532fc71b7a77c09192b4a5a200ea992702734a2e9279a37f2478236f26", size = 219499, upload-time = "2025-09-08T23:23:09.648Z" }, + { url = "https://files.pythonhosted.org/packages/50/e1/a969e687fcf9ea58e6e2a928ad5e2dd88cc12f6f0ab477e9971f2309b57c/cffi-2.0.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:d9b29c1f0ae438d5ee9acb31cadee00a58c46cc9c0b2f9038c6b0b3470877a8c", size = 222928, upload-time = "2025-09-08T23:23:10.928Z" }, + { url = "https://files.pythonhosted.org/packages/36/54/0362578dd2c9e557a28ac77698ed67323ed5b9775ca9d3fe73fe191bb5d8/cffi-2.0.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:6d50360be4546678fc1b79ffe7a66265e28667840010348dd69a314145807a1b", size = 221302, upload-time = "2025-09-08T23:23:12.42Z" }, + { url = "https://files.pythonhosted.org/packages/eb/6d/bf9bda840d5f1dfdbf0feca87fbdb64a918a69bca42cfa0ba7b137c48cb8/cffi-2.0.0-cp313-cp313-win32.whl", hash = "sha256:74a03b9698e198d47562765773b4a8309919089150a0bb17d829ad7b44b60d27", size = 172909, upload-time = "2025-09-08T23:23:14.32Z" }, + { url = "https://files.pythonhosted.org/packages/37/18/6519e1ee6f5a1e579e04b9ddb6f1676c17368a7aba48299c3759bbc3c8b3/cffi-2.0.0-cp313-cp313-win_amd64.whl", hash = "sha256:19f705ada2530c1167abacb171925dd886168931e0a7b78f5bffcae5c6b5be75", size = 183402, upload-time = "2025-09-08T23:23:15.535Z" }, + { url = "https://files.pythonhosted.org/packages/cb/0e/02ceeec9a7d6ee63bb596121c2c8e9b3a9e150936f4fbef6ca1943e6137c/cffi-2.0.0-cp313-cp313-win_arm64.whl", hash = "sha256:256f80b80ca3853f90c21b23ee78cd008713787b1b1e93eae9f3d6a7134abd91", size = 177780, upload-time = "2025-09-08T23:23:16.761Z" }, + { url = "https://files.pythonhosted.org/packages/92/c4/3ce07396253a83250ee98564f8d7e9789fab8e58858f35d07a9a2c78de9f/cffi-2.0.0-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:fc33c5141b55ed366cfaad382df24fe7dcbc686de5be719b207bb248e3053dc5", size = 185320, upload-time = "2025-09-08T23:23:18.087Z" }, + { url = "https://files.pythonhosted.org/packages/59/dd/27e9fa567a23931c838c6b02d0764611c62290062a6d4e8ff7863daf9730/cffi-2.0.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:c654de545946e0db659b3400168c9ad31b5d29593291482c43e3564effbcee13", size = 181487, upload-time = "2025-09-08T23:23:19.622Z" }, + { url = "https://files.pythonhosted.org/packages/d6/43/0e822876f87ea8a4ef95442c3d766a06a51fc5298823f884ef87aaad168c/cffi-2.0.0-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:24b6f81f1983e6df8db3adc38562c83f7d4a0c36162885ec7f7b77c7dcbec97b", size = 220049, upload-time = "2025-09-08T23:23:20.853Z" }, + { url = "https://files.pythonhosted.org/packages/b4/89/76799151d9c2d2d1ead63c2429da9ea9d7aac304603de0c6e8764e6e8e70/cffi-2.0.0-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:12873ca6cb9b0f0d3a0da705d6086fe911591737a59f28b7936bdfed27c0d47c", size = 207793, upload-time = "2025-09-08T23:23:22.08Z" }, + { url = "https://files.pythonhosted.org/packages/bb/dd/3465b14bb9e24ee24cb88c9e3730f6de63111fffe513492bf8c808a3547e/cffi-2.0.0-cp314-cp314-manylinux2014_s390x.manylinux_2_17_s390x.whl", hash = "sha256:d9b97165e8aed9272a6bb17c01e3cc5871a594a446ebedc996e2397a1c1ea8ef", size = 206300, upload-time = "2025-09-08T23:23:23.314Z" }, + { url = "https://files.pythonhosted.org/packages/47/d9/d83e293854571c877a92da46fdec39158f8d7e68da75bf73581225d28e90/cffi-2.0.0-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:afb8db5439b81cf9c9d0c80404b60c3cc9c3add93e114dcae767f1477cb53775", size = 219244, upload-time = "2025-09-08T23:23:24.541Z" }, + { url = "https://files.pythonhosted.org/packages/2b/0f/1f177e3683aead2bb00f7679a16451d302c436b5cbf2505f0ea8146ef59e/cffi-2.0.0-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:737fe7d37e1a1bffe70bd5754ea763a62a066dc5913ca57e957824b72a85e205", size = 222828, upload-time = "2025-09-08T23:23:26.143Z" }, + { url = "https://files.pythonhosted.org/packages/c6/0f/cafacebd4b040e3119dcb32fed8bdef8dfe94da653155f9d0b9dc660166e/cffi-2.0.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:38100abb9d1b1435bc4cc340bb4489635dc2f0da7456590877030c9b3d40b0c1", size = 220926, upload-time = "2025-09-08T23:23:27.873Z" }, + { url = "https://files.pythonhosted.org/packages/3e/aa/df335faa45b395396fcbc03de2dfcab242cd61a9900e914fe682a59170b1/cffi-2.0.0-cp314-cp314-win32.whl", hash = "sha256:087067fa8953339c723661eda6b54bc98c5625757ea62e95eb4898ad5e776e9f", size = 175328, upload-time = "2025-09-08T23:23:44.61Z" }, + { url = "https://files.pythonhosted.org/packages/bb/92/882c2d30831744296ce713f0feb4c1cd30f346ef747b530b5318715cc367/cffi-2.0.0-cp314-cp314-win_amd64.whl", hash = "sha256:203a48d1fb583fc7d78a4c6655692963b860a417c0528492a6bc21f1aaefab25", size = 185650, upload-time = "2025-09-08T23:23:45.848Z" }, + { url = "https://files.pythonhosted.org/packages/9f/2c/98ece204b9d35a7366b5b2c6539c350313ca13932143e79dc133ba757104/cffi-2.0.0-cp314-cp314-win_arm64.whl", hash = "sha256:dbd5c7a25a7cb98f5ca55d258b103a2054f859a46ae11aaf23134f9cc0d356ad", size = 180687, upload-time = "2025-09-08T23:23:47.105Z" }, + { url = "https://files.pythonhosted.org/packages/3e/61/c768e4d548bfa607abcda77423448df8c471f25dbe64fb2ef6d555eae006/cffi-2.0.0-cp314-cp314t-macosx_10_13_x86_64.whl", hash = "sha256:9a67fc9e8eb39039280526379fb3a70023d77caec1852002b4da7e8b270c4dd9", size = 188773, upload-time = "2025-09-08T23:23:29.347Z" }, + { url = "https://files.pythonhosted.org/packages/2c/ea/5f76bce7cf6fcd0ab1a1058b5af899bfbef198bea4d5686da88471ea0336/cffi-2.0.0-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:7a66c7204d8869299919db4d5069a82f1561581af12b11b3c9f48c584eb8743d", size = 185013, upload-time = "2025-09-08T23:23:30.63Z" }, + { url = "https://files.pythonhosted.org/packages/be/b4/c56878d0d1755cf9caa54ba71e5d049479c52f9e4afc230f06822162ab2f/cffi-2.0.0-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:7cc09976e8b56f8cebd752f7113ad07752461f48a58cbba644139015ac24954c", size = 221593, upload-time = "2025-09-08T23:23:31.91Z" }, + { url = "https://files.pythonhosted.org/packages/e0/0d/eb704606dfe8033e7128df5e90fee946bbcb64a04fcdaa97321309004000/cffi-2.0.0-cp314-cp314t-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:92b68146a71df78564e4ef48af17551a5ddd142e5190cdf2c5624d0c3ff5b2e8", size = 209354, upload-time = "2025-09-08T23:23:33.214Z" }, + { url = "https://files.pythonhosted.org/packages/d8/19/3c435d727b368ca475fb8742ab97c9cb13a0de600ce86f62eab7fa3eea60/cffi-2.0.0-cp314-cp314t-manylinux2014_s390x.manylinux_2_17_s390x.whl", hash = "sha256:b1e74d11748e7e98e2f426ab176d4ed720a64412b6a15054378afdb71e0f37dc", size = 208480, upload-time = "2025-09-08T23:23:34.495Z" }, + { url = "https://files.pythonhosted.org/packages/d0/44/681604464ed9541673e486521497406fadcc15b5217c3e326b061696899a/cffi-2.0.0-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:28a3a209b96630bca57cce802da70c266eb08c6e97e5afd61a75611ee6c64592", size = 221584, upload-time = "2025-09-08T23:23:36.096Z" }, + { url = "https://files.pythonhosted.org/packages/25/8e/342a504ff018a2825d395d44d63a767dd8ebc927ebda557fecdaca3ac33a/cffi-2.0.0-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:7553fb2090d71822f02c629afe6042c299edf91ba1bf94951165613553984512", size = 224443, upload-time = "2025-09-08T23:23:37.328Z" }, + { url = "https://files.pythonhosted.org/packages/e1/5e/b666bacbbc60fbf415ba9988324a132c9a7a0448a9a8f125074671c0f2c3/cffi-2.0.0-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:6c6c373cfc5c83a975506110d17457138c8c63016b563cc9ed6e056a82f13ce4", size = 223437, upload-time = "2025-09-08T23:23:38.945Z" }, + { url = "https://files.pythonhosted.org/packages/a0/1d/ec1a60bd1a10daa292d3cd6bb0b359a81607154fb8165f3ec95fe003b85c/cffi-2.0.0-cp314-cp314t-win32.whl", hash = "sha256:1fc9ea04857caf665289b7a75923f2c6ed559b8298a1b8c49e59f7dd95c8481e", size = 180487, upload-time = "2025-09-08T23:23:40.423Z" }, + { url = "https://files.pythonhosted.org/packages/bf/41/4c1168c74fac325c0c8156f04b6749c8b6a8f405bbf91413ba088359f60d/cffi-2.0.0-cp314-cp314t-win_amd64.whl", hash = "sha256:d68b6cef7827e8641e8ef16f4494edda8b36104d79773a334beaa1e3521430f6", size = 191726, upload-time = "2025-09-08T23:23:41.742Z" }, + { url = "https://files.pythonhosted.org/packages/ae/3a/dbeec9d1ee0844c679f6bb5d6ad4e9f198b1224f4e7a32825f47f6192b0c/cffi-2.0.0-cp314-cp314t-win_arm64.whl", hash = "sha256:0a1527a803f0a659de1af2e1fd700213caba79377e27e4693648c2923da066f9", size = 184195, upload-time = "2025-09-08T23:23:43.004Z" }, +] + +[[package]] +name = "charset-normalizer" +version = "3.4.7" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/e7/a1/67fe25fac3c7642725500a3f6cfe5821ad557c3abb11c9d20d12c7008d3e/charset_normalizer-3.4.7.tar.gz", hash = "sha256:ae89db9e5f98a11a4bf50407d4363e7b09b31e55bc117b4f7d80aab97ba009e5", size = 144271, upload-time = "2026-04-02T09:28:39.342Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/c2/d7/b5b7020a0565c2e9fa8c09f4b5fa6232feb326b8c20081ccded47ea368fd/charset_normalizer-3.4.7-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:7641bb8895e77f921102f72833904dcd9901df5d6d72a2ab8f31d04b7e51e4e7", size = 309705, upload-time = "2026-04-02T09:26:02.191Z" }, + { url = "https://files.pythonhosted.org/packages/5a/53/58c29116c340e5456724ecd2fff4196d236b98f3da97b404bc5e51ac3493/charset_normalizer-3.4.7-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:202389074300232baeb53ae2569a60901f7efadd4245cf3a3bf0617d60b439d7", size = 206419, upload-time = "2026-04-02T09:26:03.583Z" }, + { url = "https://files.pythonhosted.org/packages/b2/02/e8146dc6591a37a00e5144c63f29fb7c97a734ea8a111190783c0e60ab63/charset_normalizer-3.4.7-cp311-cp311-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:30b8d1d8c52a48c2c5690e152c169b673487a2a58de1ec7393196753063fcd5e", size = 227901, upload-time = "2026-04-02T09:26:04.738Z" }, + { url = "https://files.pythonhosted.org/packages/fb/73/77486c4cd58f1267bf17db420e930c9afa1b3be3fe8c8b8ebbebc9624359/charset_normalizer-3.4.7-cp311-cp311-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:532bc9bf33a68613fd7d65e4b1c71a6a38d7d42604ecf239c77392e9b4e8998c", size = 222742, upload-time = "2026-04-02T09:26:06.36Z" }, + { url = "https://files.pythonhosted.org/packages/a1/fa/f74eb381a7d94ded44739e9d94de18dc5edc9c17fb8c11f0a6890696c0a9/charset_normalizer-3.4.7-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:2fe249cb4651fd12605b7288b24751d8bfd46d35f12a20b1ba33dea122e690df", size = 214061, upload-time = "2026-04-02T09:26:08.347Z" }, + { url = "https://files.pythonhosted.org/packages/dc/92/42bd3cefcf7687253fb86694b45f37b733c97f59af3724f356fa92b8c344/charset_normalizer-3.4.7-cp311-cp311-manylinux_2_31_armv7l.whl", hash = "sha256:65bcd23054beab4d166035cabbc868a09c1a49d1efe458fe8e4361215df40265", size = 199239, upload-time = "2026-04-02T09:26:09.823Z" }, + { url = "https://files.pythonhosted.org/packages/4c/3d/069e7184e2aa3b3cddc700e3dd267413dc259854adc3380421c805c6a17d/charset_normalizer-3.4.7-cp311-cp311-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:08e721811161356f97b4059a9ba7bafb23ea5ee2255402c42881c214e173c6b4", size = 210173, upload-time = "2026-04-02T09:26:10.953Z" }, + { url = "https://files.pythonhosted.org/packages/62/51/9d56feb5f2e7074c46f93e0ebdbe61f0848ee246e2f0d89f8e20b89ebb8f/charset_normalizer-3.4.7-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:e060d01aec0a910bdccb8be71faf34e7799ce36950f8294c8bf612cba65a2c9e", size = 209841, upload-time = "2026-04-02T09:26:12.142Z" }, + { url = "https://files.pythonhosted.org/packages/d2/59/893d8f99cc4c837dda1fe2f1139079703deb9f321aabcb032355de13b6c7/charset_normalizer-3.4.7-cp311-cp311-musllinux_1_2_armv7l.whl", hash = "sha256:38c0109396c4cfc574d502df99742a45c72c08eff0a36158b6f04000043dbf38", size = 200304, upload-time = "2026-04-02T09:26:13.711Z" }, + { url = "https://files.pythonhosted.org/packages/7d/1d/ee6f3be3464247578d1ed5c46de545ccc3d3ff933695395c402c21fa6b77/charset_normalizer-3.4.7-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:1c2a768fdd44ee4a9339a9b0b130049139b8ce3c01d2ce09f67f5a68048d477c", size = 229455, upload-time = "2026-04-02T09:26:14.941Z" }, + { url = "https://files.pythonhosted.org/packages/54/bb/8fb0a946296ea96a488928bdce8ef99023998c48e4713af533e9bb98ef07/charset_normalizer-3.4.7-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:1a87ca9d5df6fe460483d9a5bbf2b18f620cbed41b432e2bddb686228282d10b", size = 210036, upload-time = "2026-04-02T09:26:16.478Z" }, + { url = "https://files.pythonhosted.org/packages/9a/bc/015b2387f913749f82afd4fcba07846d05b6d784dd16123cb66860e0237d/charset_normalizer-3.4.7-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:d635aab80466bc95771bb78d5370e74d36d1fe31467b6b29b8b57b2a3cd7d22c", size = 224739, upload-time = "2026-04-02T09:26:17.751Z" }, + { url = "https://files.pythonhosted.org/packages/17/ab/63133691f56baae417493cba6b7c641571a2130eb7bceba6773367ab9ec5/charset_normalizer-3.4.7-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:ae196f021b5e7c78e918242d217db021ed2a6ace2bc6ae94c0fc596221c7f58d", size = 216277, upload-time = "2026-04-02T09:26:18.981Z" }, + { url = "https://files.pythonhosted.org/packages/06/6d/3be70e827977f20db77c12a97e6a9f973631a45b8d186c084527e53e77a4/charset_normalizer-3.4.7-cp311-cp311-win32.whl", hash = "sha256:adb2597b428735679446b46c8badf467b4ca5f5056aae4d51a19f9570301b1ad", size = 147819, upload-time = "2026-04-02T09:26:20.295Z" }, + { url = "https://files.pythonhosted.org/packages/20/d9/5f67790f06b735d7c7637171bbfd89882ad67201891b7275e51116ed8207/charset_normalizer-3.4.7-cp311-cp311-win_amd64.whl", hash = "sha256:8e385e4267ab76874ae30db04c627faaaf0b509e1ccc11a95b3fc3e83f855c00", size = 159281, upload-time = "2026-04-02T09:26:21.74Z" }, + { url = "https://files.pythonhosted.org/packages/ca/83/6413f36c5a34afead88ce6f66684d943d91f233d76dd083798f9602b75ae/charset_normalizer-3.4.7-cp311-cp311-win_arm64.whl", hash = "sha256:d4a48e5b3c2a489fae013b7589308a40146ee081f6f509e047e0e096084ceca1", size = 147843, upload-time = "2026-04-02T09:26:22.901Z" }, + { url = "https://files.pythonhosted.org/packages/0c/eb/4fc8d0a7110eb5fc9cc161723a34a8a6c200ce3b4fbf681bc86feee22308/charset_normalizer-3.4.7-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:eca9705049ad3c7345d574e3510665cb2cf844c2f2dcfe675332677f081cbd46", size = 311328, upload-time = "2026-04-02T09:26:24.331Z" }, + { url = "https://files.pythonhosted.org/packages/f8/e3/0fadc706008ac9d7b9b5be6dc767c05f9d3e5df51744ce4cc9605de7b9f4/charset_normalizer-3.4.7-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:6178f72c5508bfc5fd446a5905e698c6212932f25bcdd4b47a757a50605a90e2", size = 208061, upload-time = "2026-04-02T09:26:25.568Z" }, + { url = "https://files.pythonhosted.org/packages/42/f0/3dd1045c47f4a4604df85ec18ad093912ae1344ac706993aff91d38773a2/charset_normalizer-3.4.7-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:e1421b502d83040e6d7fb2fb18dff63957f720da3d77b2fbd3187ceb63755d7b", size = 229031, upload-time = "2026-04-02T09:26:26.865Z" }, + { url = "https://files.pythonhosted.org/packages/dc/67/675a46eb016118a2fbde5a277a5d15f4f69d5f3f5f338e5ee2f8948fcf43/charset_normalizer-3.4.7-cp312-cp312-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:edac0f1ab77644605be2cbba52e6b7f630731fc42b34cb0f634be1a6eface56a", size = 225239, upload-time = "2026-04-02T09:26:28.044Z" }, + { url = "https://files.pythonhosted.org/packages/4b/f8/d0118a2f5f23b02cd166fa385c60f9b0d4f9194f574e2b31cef350ad7223/charset_normalizer-3.4.7-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:5649fd1c7bade02f320a462fdefd0b4bd3ce036065836d4f42e0de958038e116", size = 216589, upload-time = "2026-04-02T09:26:29.239Z" }, + { url = "https://files.pythonhosted.org/packages/b1/f1/6d2b0b261b6c4ceef0fcb0d17a01cc5bc53586c2d4796fa04b5c540bc13d/charset_normalizer-3.4.7-cp312-cp312-manylinux_2_31_armv7l.whl", hash = "sha256:203104ed3e428044fd943bc4bf45fa73c0730391f9621e37fe39ecf477b128cb", size = 202733, upload-time = "2026-04-02T09:26:30.5Z" }, + { url = "https://files.pythonhosted.org/packages/6f/c0/7b1f943f7e87cc3db9626ba17807d042c38645f0a1d4415c7a14afb5591f/charset_normalizer-3.4.7-cp312-cp312-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:298930cec56029e05497a76988377cbd7457ba864beeea92ad7e844fe74cd1f1", size = 212652, upload-time = "2026-04-02T09:26:31.709Z" }, + { url = "https://files.pythonhosted.org/packages/38/dd/5a9ab159fe45c6e72079398f277b7d2b523e7f716acc489726115a910097/charset_normalizer-3.4.7-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:708838739abf24b2ceb208d0e22403dd018faeef86ddac04319a62ae884c4f15", size = 211229, upload-time = "2026-04-02T09:26:33.282Z" }, + { url = "https://files.pythonhosted.org/packages/d5/ff/531a1cad5ca855d1c1a8b69cb71abfd6d85c0291580146fda7c82857caa1/charset_normalizer-3.4.7-cp312-cp312-musllinux_1_2_armv7l.whl", hash = "sha256:0f7eb884681e3938906ed0434f20c63046eacd0111c4ba96f27b76084cd679f5", size = 203552, upload-time = "2026-04-02T09:26:34.845Z" }, + { url = "https://files.pythonhosted.org/packages/c1/4c/a5fb52d528a8ca41f7598cb619409ece30a169fbdf9cdce592e53b46c3a6/charset_normalizer-3.4.7-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:4dc1e73c36828f982bfe79fadf5919923f8a6f4df2860804db9a98c48824ce8d", size = 230806, upload-time = "2026-04-02T09:26:36.152Z" }, + { url = "https://files.pythonhosted.org/packages/59/7a/071feed8124111a32b316b33ae4de83d36923039ef8cf48120266844285b/charset_normalizer-3.4.7-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:aed52fea0513bac0ccde438c188c8a471c4e0f457c2dd20cdbf6ea7a450046c7", size = 212316, upload-time = "2026-04-02T09:26:37.672Z" }, + { url = "https://files.pythonhosted.org/packages/fd/35/f7dba3994312d7ba508e041eaac39a36b120f32d4c8662b8814dab876431/charset_normalizer-3.4.7-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:fea24543955a6a729c45a73fe90e08c743f0b3334bbf3201e6c4bc1b0c7fa464", size = 227274, upload-time = "2026-04-02T09:26:38.93Z" }, + { url = "https://files.pythonhosted.org/packages/8a/2d/a572df5c9204ab7688ec1edc895a73ebded3b023bb07364710b05dd1c9be/charset_normalizer-3.4.7-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:bb6d88045545b26da47aa879dd4a89a71d1dce0f0e549b1abcb31dfe4a8eac49", size = 218468, upload-time = "2026-04-02T09:26:40.17Z" }, + { url = "https://files.pythonhosted.org/packages/86/eb/890922a8b03a568ca2f336c36585a4713c55d4d67bf0f0c78924be6315ca/charset_normalizer-3.4.7-cp312-cp312-win32.whl", hash = "sha256:2257141f39fe65a3fdf38aeccae4b953e5f3b3324f4ff0daf9f15b8518666a2c", size = 148460, upload-time = "2026-04-02T09:26:41.416Z" }, + { url = "https://files.pythonhosted.org/packages/35/d9/0e7dffa06c5ab081f75b1b786f0aefc88365825dfcd0ac544bdb7b2b6853/charset_normalizer-3.4.7-cp312-cp312-win_amd64.whl", hash = "sha256:5ed6ab538499c8644b8a3e18debabcd7ce684f3fa91cf867521a7a0279cab2d6", size = 159330, upload-time = "2026-04-02T09:26:42.554Z" }, + { url = "https://files.pythonhosted.org/packages/9e/5d/481bcc2a7c88ea6b0878c299547843b2521ccbc40980cb406267088bc701/charset_normalizer-3.4.7-cp312-cp312-win_arm64.whl", hash = "sha256:56be790f86bfb2c98fb742ce566dfb4816e5a83384616ab59c49e0604d49c51d", size = 147828, upload-time = "2026-04-02T09:26:44.075Z" }, + { url = "https://files.pythonhosted.org/packages/c1/3b/66777e39d3ae1ddc77ee606be4ec6d8cbd4c801f65e5a1b6f2b11b8346dd/charset_normalizer-3.4.7-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:f496c9c3cc02230093d8330875c4c3cdfc3b73612a5fd921c65d39cbcef08063", size = 309627, upload-time = "2026-04-02T09:26:45.198Z" }, + { url = "https://files.pythonhosted.org/packages/2e/4e/b7f84e617b4854ade48a1b7915c8ccfadeba444d2a18c291f696e37f0d3b/charset_normalizer-3.4.7-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:0ea948db76d31190bf08bd371623927ee1339d5f2a0b4b1b4a4439a65298703c", size = 207008, upload-time = "2026-04-02T09:26:46.824Z" }, + { url = "https://files.pythonhosted.org/packages/c4/bb/ec73c0257c9e11b268f018f068f5d00aa0ef8c8b09f7753ebd5f2880e248/charset_normalizer-3.4.7-cp313-cp313-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:a277ab8928b9f299723bc1a2dabb1265911b1a76341f90a510368ca44ad9ab66", size = 228303, upload-time = "2026-04-02T09:26:48.397Z" }, + { url = "https://files.pythonhosted.org/packages/85/fb/32d1f5033484494619f701e719429c69b766bfc4dbc61aa9e9c8c166528b/charset_normalizer-3.4.7-cp313-cp313-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:3bec022aec2c514d9cf199522a802bd007cd588ab17ab2525f20f9c34d067c18", size = 224282, upload-time = "2026-04-02T09:26:49.684Z" }, + { url = "https://files.pythonhosted.org/packages/fa/07/330e3a0dda4c404d6da83b327270906e9654a24f6c546dc886a0eb0ffb23/charset_normalizer-3.4.7-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:e044c39e41b92c845bc815e5ae4230804e8e7bc29e399b0437d64222d92809dd", size = 215595, upload-time = "2026-04-02T09:26:50.915Z" }, + { url = "https://files.pythonhosted.org/packages/e3/7c/fc890655786e423f02556e0216d4b8c6bcb6bdfa890160dc66bf52dee468/charset_normalizer-3.4.7-cp313-cp313-manylinux_2_31_armv7l.whl", hash = "sha256:f495a1652cf3fbab2eb0639776dad966c2fb874d79d87ca07f9d5f059b8bd215", size = 201986, upload-time = "2026-04-02T09:26:52.197Z" }, + { url = "https://files.pythonhosted.org/packages/d8/97/bfb18b3db2aed3b90cf54dc292ad79fdd5ad65c4eae454099475cbeadd0d/charset_normalizer-3.4.7-cp313-cp313-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:e712b419df8ba5e42b226c510472b37bd57b38e897d3eca5e8cfd410a29fa859", size = 211711, upload-time = "2026-04-02T09:26:53.49Z" }, + { url = "https://files.pythonhosted.org/packages/6f/a5/a581c13798546a7fd557c82614a5c65a13df2157e9ad6373166d2a3e645d/charset_normalizer-3.4.7-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:7804338df6fcc08105c7745f1502ba68d900f45fd770d5bdd5288ddccb8a42d8", size = 210036, upload-time = "2026-04-02T09:26:54.975Z" }, + { url = "https://files.pythonhosted.org/packages/8c/bf/b3ab5bcb478e4193d517644b0fb2bf5497fbceeaa7a1bc0f4d5b50953861/charset_normalizer-3.4.7-cp313-cp313-musllinux_1_2_armv7l.whl", hash = "sha256:481551899c856c704d58119b5025793fa6730adda3571971af568f66d2424bb5", size = 202998, upload-time = "2026-04-02T09:26:56.303Z" }, + { url = "https://files.pythonhosted.org/packages/e7/4e/23efd79b65d314fa320ec6017b4b5834d5c12a58ba4610aa353af2e2f577/charset_normalizer-3.4.7-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:f59099f9b66f0d7145115e6f80dd8b1d847176df89b234a5a6b3f00437aa0832", size = 230056, upload-time = "2026-04-02T09:26:57.554Z" }, + { url = "https://files.pythonhosted.org/packages/b9/9f/1e1941bc3f0e01df116e68dc37a55c4d249df5e6fa77f008841aef68264f/charset_normalizer-3.4.7-cp313-cp313-musllinux_1_2_riscv64.whl", hash = "sha256:f59ad4c0e8f6bba240a9bb85504faa1ab438237199d4cce5f622761507b8f6a6", size = 211537, upload-time = "2026-04-02T09:26:58.843Z" }, + { url = "https://files.pythonhosted.org/packages/80/0f/088cbb3020d44428964a6c97fe1edfb1b9550396bf6d278330281e8b709c/charset_normalizer-3.4.7-cp313-cp313-musllinux_1_2_s390x.whl", hash = "sha256:3dedcc22d73ec993f42055eff4fcfed9318d1eeb9a6606c55892a26964964e48", size = 226176, upload-time = "2026-04-02T09:27:00.437Z" }, + { url = "https://files.pythonhosted.org/packages/6a/9f/130394f9bbe06f4f63e22641d32fc9b202b7e251c9aef4db044324dac493/charset_normalizer-3.4.7-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:64f02c6841d7d83f832cd97ccf8eb8a906d06eb95d5276069175c696b024b60a", size = 217723, upload-time = "2026-04-02T09:27:02.021Z" }, + { url = "https://files.pythonhosted.org/packages/73/55/c469897448a06e49f8fa03f6caae97074fde823f432a98f979cc42b90e69/charset_normalizer-3.4.7-cp313-cp313-win32.whl", hash = "sha256:4042d5c8f957e15221d423ba781e85d553722fc4113f523f2feb7b188cc34c5e", size = 148085, upload-time = "2026-04-02T09:27:03.192Z" }, + { url = "https://files.pythonhosted.org/packages/5d/78/1b74c5bbb3f99b77a1715c91b3e0b5bdb6fe302d95ace4f5b1bec37b0167/charset_normalizer-3.4.7-cp313-cp313-win_amd64.whl", hash = "sha256:3946fa46a0cf3e4c8cb1cc52f56bb536310d34f25f01ca9b6c16afa767dab110", size = 158819, upload-time = "2026-04-02T09:27:04.454Z" }, + { url = "https://files.pythonhosted.org/packages/68/86/46bd42279d323deb8687c4a5a811fd548cb7d1de10cf6535d099877a9a9f/charset_normalizer-3.4.7-cp313-cp313-win_arm64.whl", hash = "sha256:80d04837f55fc81da168b98de4f4b797ef007fc8a79ab71c6ec9bc4dd662b15b", size = 147915, upload-time = "2026-04-02T09:27:05.971Z" }, + { url = "https://files.pythonhosted.org/packages/97/c8/c67cb8c70e19ef1960b97b22ed2a1567711de46c4ddf19799923adc836c2/charset_normalizer-3.4.7-cp314-cp314-macosx_10_15_universal2.whl", hash = "sha256:c36c333c39be2dbca264d7803333c896ab8fa7d4d6f0ab7edb7dfd7aea6e98c0", size = 309234, upload-time = "2026-04-02T09:27:07.194Z" }, + { url = "https://files.pythonhosted.org/packages/99/85/c091fdee33f20de70d6c8b522743b6f831a2f1cd3ff86de4c6a827c48a76/charset_normalizer-3.4.7-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:1c2aed2e5e41f24ea8ef1590b8e848a79b56f3a5564a65ceec43c9d692dc7d8a", size = 208042, upload-time = "2026-04-02T09:27:08.749Z" }, + { url = "https://files.pythonhosted.org/packages/87/1c/ab2ce611b984d2fd5d86a5a8a19c1ae26acac6bad967da4967562c75114d/charset_normalizer-3.4.7-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:54523e136b8948060c0fa0bc7b1b50c32c186f2fceee897a495406bb6e311d2b", size = 228706, upload-time = "2026-04-02T09:27:09.951Z" }, + { url = "https://files.pythonhosted.org/packages/a8/29/2b1d2cb00bf085f59d29eb773ce58ec2d325430f8c216804a0a5cd83cbca/charset_normalizer-3.4.7-cp314-cp314-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:715479b9a2802ecac752a3b0efa2b0b60285cf962ee38414211abdfccc233b41", size = 224727, upload-time = "2026-04-02T09:27:11.175Z" }, + { url = "https://files.pythonhosted.org/packages/47/5c/032c2d5a07fe4d4855fea851209cca2b6f03ebeb6d4e3afdb3358386a684/charset_normalizer-3.4.7-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:bd6c2a1c7573c64738d716488d2cdd3c00e340e4835707d8fdb8dc1a66ef164e", size = 215882, upload-time = "2026-04-02T09:27:12.446Z" }, + { url = "https://files.pythonhosted.org/packages/2c/c2/356065d5a8b78ed04499cae5f339f091946a6a74f91e03476c33f0ab7100/charset_normalizer-3.4.7-cp314-cp314-manylinux_2_31_armv7l.whl", hash = "sha256:c45e9440fb78f8ddabcf714b68f936737a121355bf59f3907f4e17721b9d1aae", size = 200860, upload-time = "2026-04-02T09:27:13.721Z" }, + { url = "https://files.pythonhosted.org/packages/0c/cd/a32a84217ced5039f53b29f460962abb2d4420def55afabe45b1c3c7483d/charset_normalizer-3.4.7-cp314-cp314-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:3534e7dcbdcf757da6b85a0bbf5b6868786d5982dd959b065e65481644817a18", size = 211564, upload-time = "2026-04-02T09:27:15.272Z" }, + { url = "https://files.pythonhosted.org/packages/44/86/58e6f13ce26cc3b8f4a36b94a0f22ae2f00a72534520f4ae6857c4b81f89/charset_normalizer-3.4.7-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:e8ac484bf18ce6975760921bb6148041faa8fef0547200386ea0b52b5d27bf7b", size = 211276, upload-time = "2026-04-02T09:27:16.834Z" }, + { url = "https://files.pythonhosted.org/packages/8f/fe/d17c32dc72e17e155e06883efa84514ca375f8a528ba2546bee73fc4df81/charset_normalizer-3.4.7-cp314-cp314-musllinux_1_2_armv7l.whl", hash = "sha256:a5fe03b42827c13cdccd08e6c0247b6a6d4b5e3cdc53fd1749f5896adcdc2356", size = 201238, upload-time = "2026-04-02T09:27:18.229Z" }, + { url = "https://files.pythonhosted.org/packages/6a/29/f33daa50b06525a237451cdb6c69da366c381a3dadcd833fa5676bc468b3/charset_normalizer-3.4.7-cp314-cp314-musllinux_1_2_ppc64le.whl", hash = "sha256:2d6eb928e13016cea4f1f21d1e10c1cebd5a421bc57ddf5b1142ae3f86824fab", size = 230189, upload-time = "2026-04-02T09:27:19.445Z" }, + { url = "https://files.pythonhosted.org/packages/b6/6e/52c84015394a6a0bdcd435210a7e944c5f94ea1055f5cc5d56c5fe368e7b/charset_normalizer-3.4.7-cp314-cp314-musllinux_1_2_riscv64.whl", hash = "sha256:e74327fb75de8986940def6e8dee4f127cc9752bee7355bb323cc5b2659b6d46", size = 211352, upload-time = "2026-04-02T09:27:20.79Z" }, + { url = "https://files.pythonhosted.org/packages/8c/d7/4353be581b373033fb9198bf1da3cf8f09c1082561e8e922aa7b39bf9fe8/charset_normalizer-3.4.7-cp314-cp314-musllinux_1_2_s390x.whl", hash = "sha256:d6038d37043bced98a66e68d3aa2b6a35505dc01328cd65217cefe82f25def44", size = 227024, upload-time = "2026-04-02T09:27:22.063Z" }, + { url = "https://files.pythonhosted.org/packages/30/45/99d18aa925bd1740098ccd3060e238e21115fffbfdcb8f3ece837d0ace6c/charset_normalizer-3.4.7-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:7579e913a5339fb8fa133f6bbcfd8e6749696206cf05acdbdca71a1b436d8e72", size = 217869, upload-time = "2026-04-02T09:27:23.486Z" }, + { url = "https://files.pythonhosted.org/packages/5c/05/5ee478aa53f4bb7996482153d4bfe1b89e0f087f0ab6b294fcf92d595873/charset_normalizer-3.4.7-cp314-cp314-win32.whl", hash = "sha256:5b77459df20e08151cd6f8b9ef8ef1f961ef73d85c21a555c7eed5b79410ec10", size = 148541, upload-time = "2026-04-02T09:27:25.146Z" }, + { url = "https://files.pythonhosted.org/packages/48/77/72dcb0921b2ce86420b2d79d454c7022bf5be40202a2a07906b9f2a35c97/charset_normalizer-3.4.7-cp314-cp314-win_amd64.whl", hash = "sha256:92a0a01ead5e668468e952e4238cccd7c537364eb7d851ab144ab6627dbbe12f", size = 159634, upload-time = "2026-04-02T09:27:26.642Z" }, + { url = "https://files.pythonhosted.org/packages/c6/a3/c2369911cd72f02386e4e340770f6e158c7980267da16af8f668217abaa0/charset_normalizer-3.4.7-cp314-cp314-win_arm64.whl", hash = "sha256:67f6279d125ca0046a7fd386d01b311c6363844deac3e5b069b514ba3e63c246", size = 148384, upload-time = "2026-04-02T09:27:28.271Z" }, + { url = "https://files.pythonhosted.org/packages/94/09/7e8a7f73d24dba1f0035fbbf014d2c36828fc1bf9c88f84093e57d315935/charset_normalizer-3.4.7-cp314-cp314t-macosx_10_15_universal2.whl", hash = "sha256:effc3f449787117233702311a1b7d8f59cba9ced946ba727bdc329ec69028e24", size = 330133, upload-time = "2026-04-02T09:27:29.474Z" }, + { url = "https://files.pythonhosted.org/packages/8d/da/96975ddb11f8e977f706f45cddd8540fd8242f71ecdb5d18a80723dcf62c/charset_normalizer-3.4.7-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:fbccdc05410c9ee21bbf16a35f4c1d16123dcdeb8a1d38f33654fa21d0234f79", size = 216257, upload-time = "2026-04-02T09:27:30.793Z" }, + { url = "https://files.pythonhosted.org/packages/e5/e8/1d63bf8ef2d388e95c64b2098f45f84758f6d102a087552da1485912637b/charset_normalizer-3.4.7-cp314-cp314t-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:733784b6d6def852c814bce5f318d25da2ee65dd4839a0718641c696e09a2960", size = 234851, upload-time = "2026-04-02T09:27:32.44Z" }, + { url = "https://files.pythonhosted.org/packages/9b/40/e5ff04233e70da2681fa43969ad6f66ca5611d7e669be0246c4c7aaf6dc8/charset_normalizer-3.4.7-cp314-cp314t-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:a89c23ef8d2c6b27fd200a42aa4ac72786e7c60d40efdc76e6011260b6e949c4", size = 233393, upload-time = "2026-04-02T09:27:34.03Z" }, + { url = "https://files.pythonhosted.org/packages/be/c1/06c6c49d5a5450f76899992f1ee40b41d076aee9279b49cf9974d2f313d5/charset_normalizer-3.4.7-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:6c114670c45346afedc0d947faf3c7f701051d2518b943679c8ff88befe14f8e", size = 223251, upload-time = "2026-04-02T09:27:35.369Z" }, + { url = "https://files.pythonhosted.org/packages/2b/9f/f2ff16fb050946169e3e1f82134d107e5d4ae72647ec8a1b1446c148480f/charset_normalizer-3.4.7-cp314-cp314t-manylinux_2_31_armv7l.whl", hash = "sha256:a180c5e59792af262bf263b21a3c49353f25945d8d9f70628e73de370d55e1e1", size = 206609, upload-time = "2026-04-02T09:27:36.661Z" }, + { url = "https://files.pythonhosted.org/packages/69/d5/a527c0cd8d64d2eab7459784fb4169a0ac76e5a6fc5237337982fd61347e/charset_normalizer-3.4.7-cp314-cp314t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:3c9a494bc5ec77d43cea229c4f6db1e4d8fe7e1bbffa8b6f0f0032430ff8ab44", size = 220014, upload-time = "2026-04-02T09:27:38.019Z" }, + { url = "https://files.pythonhosted.org/packages/7e/80/8a7b8104a3e203074dc9aa2c613d4b726c0e136bad1cc734594b02867972/charset_normalizer-3.4.7-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:8d828b6667a32a728a1ad1d93957cdf37489c57b97ae6c4de2860fa749b8fc1e", size = 218979, upload-time = "2026-04-02T09:27:39.37Z" }, + { url = "https://files.pythonhosted.org/packages/02/9a/b759b503d507f375b2b5c153e4d2ee0a75aa215b7f2489cf314f4541f2c0/charset_normalizer-3.4.7-cp314-cp314t-musllinux_1_2_armv7l.whl", hash = "sha256:cf1493cd8607bec4d8a7b9b004e699fcf8f9103a9284cc94962cb73d20f9d4a3", size = 209238, upload-time = "2026-04-02T09:27:40.722Z" }, + { url = "https://files.pythonhosted.org/packages/c2/4e/0f3f5d47b86bdb79256e7290b26ac847a2832d9a4033f7eb2cd4bcf4bb5b/charset_normalizer-3.4.7-cp314-cp314t-musllinux_1_2_ppc64le.whl", hash = "sha256:0c96c3b819b5c3e9e165495db84d41914d6894d55181d2d108cc1a69bfc9cce0", size = 236110, upload-time = "2026-04-02T09:27:42.33Z" }, + { url = "https://files.pythonhosted.org/packages/96/23/bce28734eb3ed2c91dcf93abeb8a5cf393a7b2749725030bb630e554fdd8/charset_normalizer-3.4.7-cp314-cp314t-musllinux_1_2_riscv64.whl", hash = "sha256:752a45dc4a6934060b3b0dab47e04edc3326575f82be64bc4fc293914566503e", size = 219824, upload-time = "2026-04-02T09:27:43.924Z" }, + { url = "https://files.pythonhosted.org/packages/2c/6f/6e897c6984cc4d41af319b077f2f600fc8214eb2fe2d6bcb79141b882400/charset_normalizer-3.4.7-cp314-cp314t-musllinux_1_2_s390x.whl", hash = "sha256:8778f0c7a52e56f75d12dae53ae320fae900a8b9b4164b981b9c5ce059cd1fcb", size = 233103, upload-time = "2026-04-02T09:27:45.348Z" }, + { url = "https://files.pythonhosted.org/packages/76/22/ef7bd0fe480a0ae9b656189ec00744b60933f68b4f42a7bb06589f6f576a/charset_normalizer-3.4.7-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:ce3412fbe1e31eb81ea42f4169ed94861c56e643189e1e75f0041f3fe7020abe", size = 225194, upload-time = "2026-04-02T09:27:46.706Z" }, + { url = "https://files.pythonhosted.org/packages/c5/a7/0e0ab3e0b5bc1219bd80a6a0d4d72ca74d9250cb2382b7c699c147e06017/charset_normalizer-3.4.7-cp314-cp314t-win32.whl", hash = "sha256:c03a41a8784091e67a39648f70c5f97b5b6a37f216896d44d2cdcb82615339a0", size = 159827, upload-time = "2026-04-02T09:27:48.053Z" }, + { url = "https://files.pythonhosted.org/packages/7a/1d/29d32e0fb40864b1f878c7f5a0b343ae676c6e2b271a2d55cc3a152391da/charset_normalizer-3.4.7-cp314-cp314t-win_amd64.whl", hash = "sha256:03853ed82eeebbce3c2abfdbc98c96dc205f32a79627688ac9a27370ea61a49c", size = 174168, upload-time = "2026-04-02T09:27:49.795Z" }, + { url = "https://files.pythonhosted.org/packages/de/32/d92444ad05c7a6e41fb2036749777c163baf7a0301a040cb672d6b2b1ae9/charset_normalizer-3.4.7-cp314-cp314t-win_arm64.whl", hash = "sha256:c35abb8bfff0185efac5878da64c45dafd2b37fb0383add1be155a763c1f083d", size = 153018, upload-time = "2026-04-02T09:27:51.116Z" }, + { url = "https://files.pythonhosted.org/packages/db/8f/61959034484a4a7c527811f4721e75d02d653a35afb0b6054474d8185d4c/charset_normalizer-3.4.7-py3-none-any.whl", hash = "sha256:3dce51d0f5e7951f8bb4900c257dad282f49190fdbebecd4ba99bcc41fef404d", size = 61958, upload-time = "2026-04-02T09:28:37.794Z" }, +] + +[[package]] +name = "click" +version = "8.4.1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "colorama", marker = "sys_platform == 'win32'" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/9b/98/518d8e5081007684232226f475082b30087d0f585e8457db087298259f49/click-8.4.1.tar.gz", hash = "sha256:918b5633eddf6b41c32d4f454bf0de810065c74e3f7dbf8ee5452f8be88d3e96", size = 353007, upload-time = "2026-05-22T04:08:37.769Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/c7/0d/67e5b4109ea4a837e80daa87c2c696711955e40449a97e8926672534def2/click-8.4.1-py3-none-any.whl", hash = "sha256:482be17c6991b8c19c5429a1e995d9b0efdbb63172824c41f99965dc0ade8ec2", size = 116639, upload-time = "2026-05-22T04:08:35.26Z" }, +] + +[[package]] +name = "colorama" +version = "0.4.6" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/d8/53/6f443c9a4a8358a93a6792e2acffb9d9d5cb0a5cfd8802644b7b1c9a02e4/colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44", size = 27697, upload-time = "2022-10-25T02:36:22.414Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/d1/d6/3965ed04c63042e047cb6a3e6ed1a63a35087b6a609aa3a15ed8ac56c221/colorama-0.4.6-py2.py3-none-any.whl", hash = "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6", size = 25335, upload-time = "2022-10-25T02:36:20.889Z" }, +] + +[[package]] +name = "comm" +version = "0.2.3" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/4c/13/7d740c5849255756bc17888787313b61fd38a0a8304fc4f073dfc46122aa/comm-0.2.3.tar.gz", hash = "sha256:2dc8048c10962d55d7ad693be1e7045d891b7ce8d999c97963a5e3e99c055971", size = 6319, upload-time = "2025-07-25T14:02:04.452Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/60/97/891a0971e1e4a8c5d2b20bbe0e524dc04548d2307fee33cdeba148fd4fc7/comm-0.2.3-py3-none-any.whl", hash = "sha256:c615d91d75f7f04f095b30d1c1711babd43bdc6419c1be9886a85f2f4e489417", size = 7294, upload-time = "2025-07-25T14:02:02.896Z" }, +] + +[[package]] +name = "contourpy" +version = "1.3.3" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "numpy" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/58/01/1253e6698a07380cd31a736d248a3f2a50a7c88779a1813da27503cadc2a/contourpy-1.3.3.tar.gz", hash = "sha256:083e12155b210502d0bca491432bb04d56dc3432f95a979b429f2848c3dbe880", size = 13466174, upload-time = "2025-07-26T12:03:12.549Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/91/2e/c4390a31919d8a78b90e8ecf87cd4b4c4f05a5b48d05ec17db8e5404c6f4/contourpy-1.3.3-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:709a48ef9a690e1343202916450bc48b9e51c049b089c7f79a267b46cffcdaa1", size = 288773, upload-time = "2025-07-26T12:01:02.277Z" }, + { url = "https://files.pythonhosted.org/packages/0d/44/c4b0b6095fef4dc9c420e041799591e3b63e9619e3044f7f4f6c21c0ab24/contourpy-1.3.3-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:23416f38bfd74d5d28ab8429cc4d63fa67d5068bd711a85edb1c3fb0c3e2f381", size = 270149, upload-time = "2025-07-26T12:01:04.072Z" }, + { url = "https://files.pythonhosted.org/packages/30/2e/dd4ced42fefac8470661d7cb7e264808425e6c5d56d175291e93890cce09/contourpy-1.3.3-cp311-cp311-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:929ddf8c4c7f348e4c0a5a3a714b5c8542ffaa8c22954862a46ca1813b667ee7", size = 329222, upload-time = "2025-07-26T12:01:05.688Z" }, + { url = "https://files.pythonhosted.org/packages/f2/74/cc6ec2548e3d276c71389ea4802a774b7aa3558223b7bade3f25787fafc2/contourpy-1.3.3-cp311-cp311-manylinux_2_26_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:9e999574eddae35f1312c2b4b717b7885d4edd6cb46700e04f7f02db454e67c1", size = 377234, upload-time = "2025-07-26T12:01:07.054Z" }, + { url = "https://files.pythonhosted.org/packages/03/b3/64ef723029f917410f75c09da54254c5f9ea90ef89b143ccadb09df14c15/contourpy-1.3.3-cp311-cp311-manylinux_2_26_s390x.manylinux_2_28_s390x.whl", hash = "sha256:0bf67e0e3f482cb69779dd3061b534eb35ac9b17f163d851e2a547d56dba0a3a", size = 380555, upload-time = "2025-07-26T12:01:08.801Z" }, + { url = "https://files.pythonhosted.org/packages/5f/4b/6157f24ca425b89fe2eb7e7be642375711ab671135be21e6faa100f7448c/contourpy-1.3.3-cp311-cp311-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:51e79c1f7470158e838808d4a996fa9bac72c498e93d8ebe5119bc1e6becb0db", size = 355238, upload-time = "2025-07-26T12:01:10.319Z" }, + { url = "https://files.pythonhosted.org/packages/98/56/f914f0dd678480708a04cfd2206e7c382533249bc5001eb9f58aa693e200/contourpy-1.3.3-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:598c3aaece21c503615fd59c92a3598b428b2f01bfb4b8ca9c4edeecc2438620", size = 1326218, upload-time = "2025-07-26T12:01:12.659Z" }, + { url = "https://files.pythonhosted.org/packages/fb/d7/4a972334a0c971acd5172389671113ae82aa7527073980c38d5868ff1161/contourpy-1.3.3-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:322ab1c99b008dad206d406bb61d014cf0174df491ae9d9d0fac6a6fda4f977f", size = 1392867, upload-time = "2025-07-26T12:01:15.533Z" }, + { url = "https://files.pythonhosted.org/packages/75/3e/f2cc6cd56dc8cff46b1a56232eabc6feea52720083ea71ab15523daab796/contourpy-1.3.3-cp311-cp311-win32.whl", hash = "sha256:fd907ae12cd483cd83e414b12941c632a969171bf90fc937d0c9f268a31cafff", size = 183677, upload-time = "2025-07-26T12:01:17.088Z" }, + { url = "https://files.pythonhosted.org/packages/98/4b/9bd370b004b5c9d8045c6c33cf65bae018b27aca550a3f657cdc99acdbd8/contourpy-1.3.3-cp311-cp311-win_amd64.whl", hash = "sha256:3519428f6be58431c56581f1694ba8e50626f2dd550af225f82fb5f5814d2a42", size = 225234, upload-time = "2025-07-26T12:01:18.256Z" }, + { url = "https://files.pythonhosted.org/packages/d9/b6/71771e02c2e004450c12b1120a5f488cad2e4d5b590b1af8bad060360fe4/contourpy-1.3.3-cp311-cp311-win_arm64.whl", hash = "sha256:15ff10bfada4bf92ec8b31c62bf7c1834c244019b4a33095a68000d7075df470", size = 193123, upload-time = "2025-07-26T12:01:19.848Z" }, + { url = "https://files.pythonhosted.org/packages/be/45/adfee365d9ea3d853550b2e735f9d66366701c65db7855cd07621732ccfc/contourpy-1.3.3-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:b08a32ea2f8e42cf1d4be3169a98dd4be32bafe4f22b6c4cb4ba810fa9e5d2cb", size = 293419, upload-time = "2025-07-26T12:01:21.16Z" }, + { url = "https://files.pythonhosted.org/packages/53/3e/405b59cfa13021a56bba395a6b3aca8cec012b45bf177b0eaf7a202cde2c/contourpy-1.3.3-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:556dba8fb6f5d8742f2923fe9457dbdd51e1049c4a43fd3986a0b14a1d815fc6", size = 273979, upload-time = "2025-07-26T12:01:22.448Z" }, + { url = "https://files.pythonhosted.org/packages/d4/1c/a12359b9b2ca3a845e8f7f9ac08bdf776114eb931392fcad91743e2ea17b/contourpy-1.3.3-cp312-cp312-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:92d9abc807cf7d0e047b95ca5d957cf4792fcd04e920ca70d48add15c1a90ea7", size = 332653, upload-time = "2025-07-26T12:01:24.155Z" }, + { url = "https://files.pythonhosted.org/packages/63/12/897aeebfb475b7748ea67b61e045accdfcf0d971f8a588b67108ed7f5512/contourpy-1.3.3-cp312-cp312-manylinux_2_26_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:b2e8faa0ed68cb29af51edd8e24798bb661eac3bd9f65420c1887b6ca89987c8", size = 379536, upload-time = "2025-07-26T12:01:25.91Z" }, + { url = "https://files.pythonhosted.org/packages/43/8a/a8c584b82deb248930ce069e71576fc09bd7174bbd35183b7943fb1064fd/contourpy-1.3.3-cp312-cp312-manylinux_2_26_s390x.manylinux_2_28_s390x.whl", hash = "sha256:626d60935cf668e70a5ce6ff184fd713e9683fb458898e4249b63be9e28286ea", size = 384397, upload-time = "2025-07-26T12:01:27.152Z" }, + { url = "https://files.pythonhosted.org/packages/cc/8f/ec6289987824b29529d0dfda0d74a07cec60e54b9c92f3c9da4c0ac732de/contourpy-1.3.3-cp312-cp312-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:4d00e655fcef08aba35ec9610536bfe90267d7ab5ba944f7032549c55a146da1", size = 362601, upload-time = "2025-07-26T12:01:28.808Z" }, + { url = "https://files.pythonhosted.org/packages/05/0a/a3fe3be3ee2dceb3e615ebb4df97ae6f3828aa915d3e10549ce016302bd1/contourpy-1.3.3-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:451e71b5a7d597379ef572de31eeb909a87246974d960049a9848c3bc6c41bf7", size = 1331288, upload-time = "2025-07-26T12:01:31.198Z" }, + { url = "https://files.pythonhosted.org/packages/33/1d/acad9bd4e97f13f3e2b18a3977fe1b4a37ecf3d38d815333980c6c72e963/contourpy-1.3.3-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:459c1f020cd59fcfe6650180678a9993932d80d44ccde1fa1868977438f0b411", size = 1403386, upload-time = "2025-07-26T12:01:33.947Z" }, + { url = "https://files.pythonhosted.org/packages/cf/8f/5847f44a7fddf859704217a99a23a4f6417b10e5ab1256a179264561540e/contourpy-1.3.3-cp312-cp312-win32.whl", hash = "sha256:023b44101dfe49d7d53932be418477dba359649246075c996866106da069af69", size = 185018, upload-time = "2025-07-26T12:01:35.64Z" }, + { url = "https://files.pythonhosted.org/packages/19/e8/6026ed58a64563186a9ee3f29f41261fd1828f527dd93d33b60feca63352/contourpy-1.3.3-cp312-cp312-win_amd64.whl", hash = "sha256:8153b8bfc11e1e4d75bcb0bff1db232f9e10b274e0929de9d608027e0d34ff8b", size = 226567, upload-time = "2025-07-26T12:01:36.804Z" }, + { url = "https://files.pythonhosted.org/packages/d1/e2/f05240d2c39a1ed228d8328a78b6f44cd695f7ef47beb3e684cf93604f86/contourpy-1.3.3-cp312-cp312-win_arm64.whl", hash = "sha256:07ce5ed73ecdc4a03ffe3e1b3e3c1166db35ae7584be76f65dbbe28a7791b0cc", size = 193655, upload-time = "2025-07-26T12:01:37.999Z" }, + { url = "https://files.pythonhosted.org/packages/68/35/0167aad910bbdb9599272bd96d01a9ec6852f36b9455cf2ca67bd4cc2d23/contourpy-1.3.3-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:177fb367556747a686509d6fef71d221a4b198a3905fe824430e5ea0fda54eb5", size = 293257, upload-time = "2025-07-26T12:01:39.367Z" }, + { url = "https://files.pythonhosted.org/packages/96/e4/7adcd9c8362745b2210728f209bfbcf7d91ba868a2c5f40d8b58f54c509b/contourpy-1.3.3-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:d002b6f00d73d69333dac9d0b8d5e84d9724ff9ef044fd63c5986e62b7c9e1b1", size = 274034, upload-time = "2025-07-26T12:01:40.645Z" }, + { url = "https://files.pythonhosted.org/packages/73/23/90e31ceeed1de63058a02cb04b12f2de4b40e3bef5e082a7c18d9c8ae281/contourpy-1.3.3-cp313-cp313-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:348ac1f5d4f1d66d3322420f01d42e43122f43616e0f194fc1c9f5d830c5b286", size = 334672, upload-time = "2025-07-26T12:01:41.942Z" }, + { url = "https://files.pythonhosted.org/packages/ed/93/b43d8acbe67392e659e1d984700e79eb67e2acb2bd7f62012b583a7f1b55/contourpy-1.3.3-cp313-cp313-manylinux_2_26_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:655456777ff65c2c548b7c454af9c6f33f16c8884f11083244b5819cc214f1b5", size = 381234, upload-time = "2025-07-26T12:01:43.499Z" }, + { url = "https://files.pythonhosted.org/packages/46/3b/bec82a3ea06f66711520f75a40c8fc0b113b2a75edb36aa633eb11c4f50f/contourpy-1.3.3-cp313-cp313-manylinux_2_26_s390x.manylinux_2_28_s390x.whl", hash = "sha256:644a6853d15b2512d67881586bd03f462c7ab755db95f16f14d7e238f2852c67", size = 385169, upload-time = "2025-07-26T12:01:45.219Z" }, + { url = "https://files.pythonhosted.org/packages/4b/32/e0f13a1c5b0f8572d0ec6ae2f6c677b7991fafd95da523159c19eff0696a/contourpy-1.3.3-cp313-cp313-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:4debd64f124ca62069f313a9cb86656ff087786016d76927ae2cf37846b006c9", size = 362859, upload-time = "2025-07-26T12:01:46.519Z" }, + { url = "https://files.pythonhosted.org/packages/33/71/e2a7945b7de4e58af42d708a219f3b2f4cff7386e6b6ab0a0fa0033c49a9/contourpy-1.3.3-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:a15459b0f4615b00bbd1e91f1b9e19b7e63aea7483d03d804186f278c0af2659", size = 1332062, upload-time = "2025-07-26T12:01:48.964Z" }, + { url = "https://files.pythonhosted.org/packages/12/fc/4e87ac754220ccc0e807284f88e943d6d43b43843614f0a8afa469801db0/contourpy-1.3.3-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:ca0fdcd73925568ca027e0b17ab07aad764be4706d0a925b89227e447d9737b7", size = 1403932, upload-time = "2025-07-26T12:01:51.979Z" }, + { url = "https://files.pythonhosted.org/packages/a6/2e/adc197a37443f934594112222ac1aa7dc9a98faf9c3842884df9a9d8751d/contourpy-1.3.3-cp313-cp313-win32.whl", hash = "sha256:b20c7c9a3bf701366556e1b1984ed2d0cedf999903c51311417cf5f591d8c78d", size = 185024, upload-time = "2025-07-26T12:01:53.245Z" }, + { url = "https://files.pythonhosted.org/packages/18/0b/0098c214843213759692cc638fce7de5c289200a830e5035d1791d7a2338/contourpy-1.3.3-cp313-cp313-win_amd64.whl", hash = "sha256:1cadd8b8969f060ba45ed7c1b714fe69185812ab43bd6b86a9123fe8f99c3263", size = 226578, upload-time = "2025-07-26T12:01:54.422Z" }, + { url = "https://files.pythonhosted.org/packages/8a/9a/2f6024a0c5995243cd63afdeb3651c984f0d2bc727fd98066d40e141ad73/contourpy-1.3.3-cp313-cp313-win_arm64.whl", hash = "sha256:fd914713266421b7536de2bfa8181aa8c699432b6763a0ea64195ebe28bff6a9", size = 193524, upload-time = "2025-07-26T12:01:55.73Z" }, + { url = "https://files.pythonhosted.org/packages/c0/b3/f8a1a86bd3298513f500e5b1f5fd92b69896449f6cab6a146a5d52715479/contourpy-1.3.3-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:88df9880d507169449d434c293467418b9f6cbe82edd19284aa0409e7fdb933d", size = 306730, upload-time = "2025-07-26T12:01:57.051Z" }, + { url = "https://files.pythonhosted.org/packages/3f/11/4780db94ae62fc0c2053909b65dc3246bd7cecfc4f8a20d957ad43aa4ad8/contourpy-1.3.3-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:d06bb1f751ba5d417047db62bca3c8fde202b8c11fb50742ab3ab962c81e8216", size = 287897, upload-time = "2025-07-26T12:01:58.663Z" }, + { url = "https://files.pythonhosted.org/packages/ae/15/e59f5f3ffdd6f3d4daa3e47114c53daabcb18574a26c21f03dc9e4e42ff0/contourpy-1.3.3-cp313-cp313t-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:e4e6b05a45525357e382909a4c1600444e2a45b4795163d3b22669285591c1ae", size = 326751, upload-time = "2025-07-26T12:02:00.343Z" }, + { url = "https://files.pythonhosted.org/packages/0f/81/03b45cfad088e4770b1dcf72ea78d3802d04200009fb364d18a493857210/contourpy-1.3.3-cp313-cp313t-manylinux_2_26_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:ab3074b48c4e2cf1a960e6bbeb7f04566bf36b1861d5c9d4d8ac04b82e38ba20", size = 375486, upload-time = "2025-07-26T12:02:02.128Z" }, + { url = "https://files.pythonhosted.org/packages/0c/ba/49923366492ffbdd4486e970d421b289a670ae8cf539c1ea9a09822b371a/contourpy-1.3.3-cp313-cp313t-manylinux_2_26_s390x.manylinux_2_28_s390x.whl", hash = "sha256:6c3d53c796f8647d6deb1abe867daeb66dcc8a97e8455efa729516b997b8ed99", size = 388106, upload-time = "2025-07-26T12:02:03.615Z" }, + { url = "https://files.pythonhosted.org/packages/9f/52/5b00ea89525f8f143651f9f03a0df371d3cbd2fccd21ca9b768c7a6500c2/contourpy-1.3.3-cp313-cp313t-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:50ed930df7289ff2a8d7afeb9603f8289e5704755c7e5c3bbd929c90c817164b", size = 352548, upload-time = "2025-07-26T12:02:05.165Z" }, + { url = "https://files.pythonhosted.org/packages/32/1d/a209ec1a3a3452d490f6b14dd92e72280c99ae3d1e73da74f8277d4ee08f/contourpy-1.3.3-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:4feffb6537d64b84877da813a5c30f1422ea5739566abf0bd18065ac040e120a", size = 1322297, upload-time = "2025-07-26T12:02:07.379Z" }, + { url = "https://files.pythonhosted.org/packages/bc/9e/46f0e8ebdd884ca0e8877e46a3f4e633f6c9c8c4f3f6e72be3fe075994aa/contourpy-1.3.3-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:2b7e9480ffe2b0cd2e787e4df64270e3a0440d9db8dc823312e2c940c167df7e", size = 1391023, upload-time = "2025-07-26T12:02:10.171Z" }, + { url = "https://files.pythonhosted.org/packages/b9/70/f308384a3ae9cd2209e0849f33c913f658d3326900d0ff5d378d6a1422d2/contourpy-1.3.3-cp313-cp313t-win32.whl", hash = "sha256:283edd842a01e3dcd435b1c5116798d661378d83d36d337b8dde1d16a5fc9ba3", size = 196157, upload-time = "2025-07-26T12:02:11.488Z" }, + { url = "https://files.pythonhosted.org/packages/b2/dd/880f890a6663b84d9e34a6f88cded89d78f0091e0045a284427cb6b18521/contourpy-1.3.3-cp313-cp313t-win_amd64.whl", hash = "sha256:87acf5963fc2b34825e5b6b048f40e3635dd547f590b04d2ab317c2619ef7ae8", size = 240570, upload-time = "2025-07-26T12:02:12.754Z" }, + { url = "https://files.pythonhosted.org/packages/80/99/2adc7d8ffead633234817ef8e9a87115c8a11927a94478f6bb3d3f4d4f7d/contourpy-1.3.3-cp313-cp313t-win_arm64.whl", hash = "sha256:3c30273eb2a55024ff31ba7d052dde990d7d8e5450f4bbb6e913558b3d6c2301", size = 199713, upload-time = "2025-07-26T12:02:14.4Z" }, + { url = "https://files.pythonhosted.org/packages/72/8b/4546f3ab60f78c514ffb7d01a0bd743f90de36f0019d1be84d0a708a580a/contourpy-1.3.3-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:fde6c716d51c04b1c25d0b90364d0be954624a0ee9d60e23e850e8d48353d07a", size = 292189, upload-time = "2025-07-26T12:02:16.095Z" }, + { url = "https://files.pythonhosted.org/packages/fd/e1/3542a9cb596cadd76fcef413f19c79216e002623158befe6daa03dbfa88c/contourpy-1.3.3-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:cbedb772ed74ff5be440fa8eee9bd49f64f6e3fc09436d9c7d8f1c287b121d77", size = 273251, upload-time = "2025-07-26T12:02:17.524Z" }, + { url = "https://files.pythonhosted.org/packages/b1/71/f93e1e9471d189f79d0ce2497007731c1e6bf9ef6d1d61b911430c3db4e5/contourpy-1.3.3-cp314-cp314-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:22e9b1bd7a9b1d652cd77388465dc358dafcd2e217d35552424aa4f996f524f5", size = 335810, upload-time = "2025-07-26T12:02:18.9Z" }, + { url = "https://files.pythonhosted.org/packages/91/f9/e35f4c1c93f9275d4e38681a80506b5510e9327350c51f8d4a5a724d178c/contourpy-1.3.3-cp314-cp314-manylinux_2_26_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:a22738912262aa3e254e4f3cb079a95a67132fc5a063890e224393596902f5a4", size = 382871, upload-time = "2025-07-26T12:02:20.418Z" }, + { url = "https://files.pythonhosted.org/packages/b5/71/47b512f936f66a0a900d81c396a7e60d73419868fba959c61efed7a8ab46/contourpy-1.3.3-cp314-cp314-manylinux_2_26_s390x.manylinux_2_28_s390x.whl", hash = "sha256:afe5a512f31ee6bd7d0dda52ec9864c984ca3d66664444f2d72e0dc4eb832e36", size = 386264, upload-time = "2025-07-26T12:02:21.916Z" }, + { url = "https://files.pythonhosted.org/packages/04/5f/9ff93450ba96b09c7c2b3f81c94de31c89f92292f1380261bd7195bea4ea/contourpy-1.3.3-cp314-cp314-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:f64836de09927cba6f79dcd00fdd7d5329f3fccc633468507079c829ca4db4e3", size = 363819, upload-time = "2025-07-26T12:02:23.759Z" }, + { url = "https://files.pythonhosted.org/packages/3e/a6/0b185d4cc480ee494945cde102cb0149ae830b5fa17bf855b95f2e70ad13/contourpy-1.3.3-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:1fd43c3be4c8e5fd6e4f2baeae35ae18176cf2e5cced681cca908addf1cdd53b", size = 1333650, upload-time = "2025-07-26T12:02:26.181Z" }, + { url = "https://files.pythonhosted.org/packages/43/d7/afdc95580ca56f30fbcd3060250f66cedbde69b4547028863abd8aa3b47e/contourpy-1.3.3-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:6afc576f7b33cf00996e5c1102dc2a8f7cc89e39c0b55df93a0b78c1bd992b36", size = 1404833, upload-time = "2025-07-26T12:02:28.782Z" }, + { url = "https://files.pythonhosted.org/packages/e2/e2/366af18a6d386f41132a48f033cbd2102e9b0cf6345d35ff0826cd984566/contourpy-1.3.3-cp314-cp314-win32.whl", hash = "sha256:66c8a43a4f7b8df8b71ee1840e4211a3c8d93b214b213f590e18a1beca458f7d", size = 189692, upload-time = "2025-07-26T12:02:30.128Z" }, + { url = "https://files.pythonhosted.org/packages/7d/c2/57f54b03d0f22d4044b8afb9ca0e184f8b1afd57b4f735c2fa70883dc601/contourpy-1.3.3-cp314-cp314-win_amd64.whl", hash = "sha256:cf9022ef053f2694e31d630feaacb21ea24224be1c3ad0520b13d844274614fd", size = 232424, upload-time = "2025-07-26T12:02:31.395Z" }, + { url = "https://files.pythonhosted.org/packages/18/79/a9416650df9b525737ab521aa181ccc42d56016d2123ddcb7b58e926a42c/contourpy-1.3.3-cp314-cp314-win_arm64.whl", hash = "sha256:95b181891b4c71de4bb404c6621e7e2390745f887f2a026b2d99e92c17892339", size = 198300, upload-time = "2025-07-26T12:02:32.956Z" }, + { url = "https://files.pythonhosted.org/packages/1f/42/38c159a7d0f2b7b9c04c64ab317042bb6952b713ba875c1681529a2932fe/contourpy-1.3.3-cp314-cp314t-macosx_10_13_x86_64.whl", hash = "sha256:33c82d0138c0a062380332c861387650c82e4cf1747aaa6938b9b6516762e772", size = 306769, upload-time = "2025-07-26T12:02:34.2Z" }, + { url = "https://files.pythonhosted.org/packages/c3/6c/26a8205f24bca10974e77460de68d3d7c63e282e23782f1239f226fcae6f/contourpy-1.3.3-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:ea37e7b45949df430fe649e5de8351c423430046a2af20b1c1961cae3afcda77", size = 287892, upload-time = "2025-07-26T12:02:35.807Z" }, + { url = "https://files.pythonhosted.org/packages/66/06/8a475c8ab718ebfd7925661747dbb3c3ee9c82ac834ccb3570be49d129f4/contourpy-1.3.3-cp314-cp314t-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:d304906ecc71672e9c89e87c4675dc5c2645e1f4269a5063b99b0bb29f232d13", size = 326748, upload-time = "2025-07-26T12:02:37.193Z" }, + { url = "https://files.pythonhosted.org/packages/b4/a3/c5ca9f010a44c223f098fccd8b158bb1cb287378a31ac141f04730dc49be/contourpy-1.3.3-cp314-cp314t-manylinux_2_26_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:ca658cd1a680a5c9ea96dc61cdbae1e85c8f25849843aa799dfd3cb370ad4fbe", size = 375554, upload-time = "2025-07-26T12:02:38.894Z" }, + { url = "https://files.pythonhosted.org/packages/80/5b/68bd33ae63fac658a4145088c1e894405e07584a316738710b636c6d0333/contourpy-1.3.3-cp314-cp314t-manylinux_2_26_s390x.manylinux_2_28_s390x.whl", hash = "sha256:ab2fd90904c503739a75b7c8c5c01160130ba67944a7b77bbf36ef8054576e7f", size = 388118, upload-time = "2025-07-26T12:02:40.642Z" }, + { url = "https://files.pythonhosted.org/packages/40/52/4c285a6435940ae25d7410a6c36bda5145839bc3f0beb20c707cda18b9d2/contourpy-1.3.3-cp314-cp314t-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:b7301b89040075c30e5768810bc96a8e8d78085b47d8be6e4c3f5a0b4ed478a0", size = 352555, upload-time = "2025-07-26T12:02:42.25Z" }, + { url = "https://files.pythonhosted.org/packages/24/ee/3e81e1dd174f5c7fefe50e85d0892de05ca4e26ef1c9a59c2a57e43b865a/contourpy-1.3.3-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:2a2a8b627d5cc6b7c41a4beff6c5ad5eb848c88255fda4a8745f7e901b32d8e4", size = 1322295, upload-time = "2025-07-26T12:02:44.668Z" }, + { url = "https://files.pythonhosted.org/packages/3c/b2/6d913d4d04e14379de429057cd169e5e00f6c2af3bb13e1710bcbdb5da12/contourpy-1.3.3-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:fd6ec6be509c787f1caf6b247f0b1ca598bef13f4ddeaa126b7658215529ba0f", size = 1391027, upload-time = "2025-07-26T12:02:47.09Z" }, + { url = "https://files.pythonhosted.org/packages/93/8a/68a4ec5c55a2971213d29a9374913f7e9f18581945a7a31d1a39b5d2dfe5/contourpy-1.3.3-cp314-cp314t-win32.whl", hash = "sha256:e74a9a0f5e3fff48fb5a7f2fd2b9b70a3fe014a67522f79b7cca4c0c7e43c9ae", size = 202428, upload-time = "2025-07-26T12:02:48.691Z" }, + { url = "https://files.pythonhosted.org/packages/fa/96/fd9f641ffedc4fa3ace923af73b9d07e869496c9cc7a459103e6e978992f/contourpy-1.3.3-cp314-cp314t-win_amd64.whl", hash = "sha256:13b68d6a62db8eafaebb8039218921399baf6e47bf85006fd8529f2a08ef33fc", size = 250331, upload-time = "2025-07-26T12:02:50.137Z" }, + { url = "https://files.pythonhosted.org/packages/ae/8c/469afb6465b853afff216f9528ffda78a915ff880ed58813ba4faf4ba0b6/contourpy-1.3.3-cp314-cp314t-win_arm64.whl", hash = "sha256:b7448cb5a725bb1e35ce88771b86fba35ef418952474492cf7c764059933ff8b", size = 203831, upload-time = "2025-07-26T12:02:51.449Z" }, + { url = "https://files.pythonhosted.org/packages/a5/29/8dcfe16f0107943fa92388c23f6e05cff0ba58058c4c95b00280d4c75a14/contourpy-1.3.3-pp311-pypy311_pp73-macosx_10_15_x86_64.whl", hash = "sha256:cd5dfcaeb10f7b7f9dc8941717c6c2ade08f587be2226222c12b25f0483ed497", size = 278809, upload-time = "2025-07-26T12:02:52.74Z" }, + { url = "https://files.pythonhosted.org/packages/85/a9/8b37ef4f7dafeb335daee3c8254645ef5725be4d9c6aa70b50ec46ef2f7e/contourpy-1.3.3-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:0c1fc238306b35f246d61a1d416a627348b5cf0648648a031e14bb8705fcdfe8", size = 261593, upload-time = "2025-07-26T12:02:54.037Z" }, + { url = "https://files.pythonhosted.org/packages/0a/59/ebfb8c677c75605cc27f7122c90313fd2f375ff3c8d19a1694bda74aaa63/contourpy-1.3.3-pp311-pypy311_pp73-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:70f9aad7de812d6541d29d2bbf8feb22ff7e1c299523db288004e3157ff4674e", size = 302202, upload-time = "2025-07-26T12:02:55.947Z" }, + { url = "https://files.pythonhosted.org/packages/3c/37/21972a15834d90bfbfb009b9d004779bd5a07a0ec0234e5ba8f64d5736f4/contourpy-1.3.3-pp311-pypy311_pp73-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:5ed3657edf08512fc3fe81b510e35c2012fbd3081d2e26160f27ca28affec989", size = 329207, upload-time = "2025-07-26T12:02:57.468Z" }, + { url = "https://files.pythonhosted.org/packages/0c/58/bd257695f39d05594ca4ad60df5bcb7e32247f9951fd09a9b8edb82d1daa/contourpy-1.3.3-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:3d1a3799d62d45c18bafd41c5fa05120b96a28079f2393af559b843d1a966a77", size = 225315, upload-time = "2025-07-26T12:02:58.801Z" }, +] + +[[package]] +name = "cramjam" +version = "2.11.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/14/12/34bf6e840a79130dfd0da7badfb6f7810b8fcfd60e75b0539372667b41b6/cramjam-2.11.0.tar.gz", hash = "sha256:5c82500ed91605c2d9781380b378397012e25127e89d64f460fea6aeac4389b4", size = 99100, upload-time = "2025-07-27T21:25:07.559Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/d0/89/8001f6a9b6b6e9fa69bec5319789083475d6f26d52aaea209d3ebf939284/cramjam-2.11.0-cp311-cp311-macosx_10_12_x86_64.macosx_11_0_arm64.macosx_10_12_universal2.whl", hash = "sha256:04cfa39118570e70e920a9b75c733299784b6d269733dbc791d9aaed6edd2615", size = 3559272, upload-time = "2025-07-27T21:22:01.988Z" }, + { url = "https://files.pythonhosted.org/packages/0b/f3/001d00070ca92e5fbe6aacc768e455568b0cde46b0eb944561a4ea132300/cramjam-2.11.0-cp311-cp311-macosx_10_12_x86_64.whl", hash = "sha256:66a18f68506290349a256375d7aa2f645b9f7993c10fc4cc211db214e4e61d2b", size = 1861743, upload-time = "2025-07-27T21:22:03.754Z" }, + { url = "https://files.pythonhosted.org/packages/c9/35/041a3af01bf3f6158f120070f798546d4383b962b63c35cd91dcbf193e17/cramjam-2.11.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:50e7d65533857736cd56f6509cf2c4866f28ad84dd15b5bdbf2f8a81e77fa28a", size = 1699631, upload-time = "2025-07-27T21:22:05.192Z" }, + { url = "https://files.pythonhosted.org/packages/17/eb/5358b238808abebd0c949c42635c3751204ca7cf82b29b984abe9f5e33c8/cramjam-2.11.0-cp311-cp311-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:1f71989668458fc327ac15396db28d92df22f8024bb12963929798b2729d2df5", size = 2025603, upload-time = "2025-07-27T21:22:06.726Z" }, + { url = "https://files.pythonhosted.org/packages/0e/79/19dba7c03a27408d8d11b5a7a4a7908459cfd4e6f375b73264dc66517bf6/cramjam-2.11.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ee77ac543f1e2b22af1e8be3ae589f729491b6090582340aacd77d1d757d9569", size = 1766283, upload-time = "2025-07-27T21:22:08.568Z" }, + { url = "https://files.pythonhosted.org/packages/a4/ad/40e4b3408501d886d082db465c33971655fe82573c535428e52ab905f4d0/cramjam-2.11.0-cp311-cp311-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:ad52784120e7e4d8a0b5b0517d185b8bf7f74f5e17272857ddc8951a628d9be1", size = 1854407, upload-time = "2025-07-27T21:22:10.518Z" }, + { url = "https://files.pythonhosted.org/packages/36/6e/c1b60ceb6d7ea6ff8b0bf197520aefe23f878bf2bfb0de65f2b0c2f82cd1/cramjam-2.11.0-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:4b86f8e6d9c1b3f9a75b2af870c93ceee0f1b827cd2507387540e053b35d7459", size = 2035793, upload-time = "2025-07-27T21:22:12.504Z" }, + { url = "https://files.pythonhosted.org/packages/9c/ad/32a8d5f4b1e3717787945ec6d71bd1c6e6bccba4b7e903fc0d9d4e4b08c3/cramjam-2.11.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:320d61938950d95da2371b46c406ec433e7955fae9f396c8e1bf148ffc187d11", size = 2067499, upload-time = "2025-07-27T21:22:14.067Z" }, + { url = "https://files.pythonhosted.org/packages/ff/cd/3b5a662736ea62ff7fa4c4a10a85e050bfdaad375cc53dc80427e8afe41c/cramjam-2.11.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:41eafc8c1653a35a5c7e75ad48138f9f60085cc05cd99d592e5298552d944e9f", size = 1981853, upload-time = "2025-07-27T21:22:15.908Z" }, + { url = "https://files.pythonhosted.org/packages/26/8e/1dbcfaaa7a702ee82ee683ec3a81656934dd7e04a7bc4ee854033686f98a/cramjam-2.11.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:03a7316c6bf763dfa34279335b27702321da44c455a64de58112968c0818ec4a", size = 2034514, upload-time = "2025-07-27T21:22:17.352Z" }, + { url = "https://files.pythonhosted.org/packages/50/62/f11709bfdce74af79a88b410dcb76dedc97612166e759136931bf63cfd7b/cramjam-2.11.0-cp311-cp311-musllinux_1_1_armv7l.whl", hash = "sha256:244c2ed8bd7ccbb294a2abe7ca6498db7e89d7eb5e744691dc511a7dc82e65ca", size = 2155343, upload-time = "2025-07-27T21:22:18.854Z" }, + { url = "https://files.pythonhosted.org/packages/8a/6d/3b98b61841a5376d9a9b8468ae58753a8e6cf22be9534a0fa5af4d8621cc/cramjam-2.11.0-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:405f8790bad36ce0b4bbdb964ad51507bfc7942c78447f25cb828b870a1d86a0", size = 2169367, upload-time = "2025-07-27T21:22:20.389Z" }, + { url = "https://files.pythonhosted.org/packages/11/72/bd5db5c49dbebc8b002f1c4983101b28d2e7fc9419753db1c31ec22b03ef/cramjam-2.11.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:6b1b751a5411032b08fb3ac556160229ca01c6bbe4757bb3a9a40b951ebaac23", size = 2159334, upload-time = "2025-07-27T21:22:22.254Z" }, + { url = "https://files.pythonhosted.org/packages/34/32/203c57acdb6eea727e7078b2219984e64ed4ad043c996ed56321301ba167/cramjam-2.11.0-cp311-cp311-win32.whl", hash = "sha256:5251585608778b9ac8effed544933df7ad85b4ba21ee9738b551f17798b215ac", size = 1605313, upload-time = "2025-07-27T21:22:24.126Z" }, + { url = "https://files.pythonhosted.org/packages/a9/bd/102d6deb87a8524ac11cddcd31a7612b8f20bf9b473c3c645045e3b957c7/cramjam-2.11.0-cp311-cp311-win_amd64.whl", hash = "sha256:dca88bc8b68ce6d35dafd8c4d5d59a238a56c43fa02b74c2ce5f9dfb0d1ccb46", size = 1710991, upload-time = "2025-07-27T21:22:25.661Z" }, + { url = "https://files.pythonhosted.org/packages/0b/0d/7c84c913a5fae85b773a9dcf8874390f9d68ba0fcc6630efa7ff1541b950/cramjam-2.11.0-cp312-cp312-macosx_10_12_x86_64.macosx_11_0_arm64.macosx_10_12_universal2.whl", hash = "sha256:dba5c14b8b4f73ea1e65720f5a3fe4280c1d27761238378be8274135c60bbc6e", size = 3553368, upload-time = "2025-07-27T21:22:27.162Z" }, + { url = "https://files.pythonhosted.org/packages/2b/cc/4f6d185d8a744776f53035e72831ff8eefc2354f46ab836f4bd3c4f6c138/cramjam-2.11.0-cp312-cp312-macosx_10_12_x86_64.whl", hash = "sha256:11eb40722b3fcf3e6890fba46c711bf60f8dc26360a24876c85e52d76c33b25b", size = 1860014, upload-time = "2025-07-27T21:22:28.738Z" }, + { url = "https://files.pythonhosted.org/packages/1c/a8/626c76263085c6d5ded0e71823b411e9522bfc93ba6cc59855a5869296e7/cramjam-2.11.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:aeb26e2898994b6e8319f19a4d37c481512acdcc6d30e1b5ecc9d8ec57e835cb", size = 1693512, upload-time = "2025-07-27T21:22:30.999Z" }, + { url = "https://files.pythonhosted.org/packages/e9/52/0851a16a62447532e30ba95a80e638926fdea869a34b4b5b9d0a020083ba/cramjam-2.11.0-cp312-cp312-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:4f8d82081ed7d8fe52c982bd1f06e4c7631a73fe1fb6d4b3b3f2404f87dc40fe", size = 2025285, upload-time = "2025-07-27T21:22:32.954Z" }, + { url = "https://files.pythonhosted.org/packages/98/76/122e444f59dbc216451d8e3d8282c9665dc79eaf822f5f1470066be1b695/cramjam-2.11.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:092a3ec26e0a679305018380e4f652eae1b6dfe3fc3b154ee76aa6b92221a17c", size = 1761327, upload-time = "2025-07-27T21:22:34.484Z" }, + { url = "https://files.pythonhosted.org/packages/a3/bc/3a0189aef1af2b29632c039c19a7a1b752bc21a4053582a5464183a0ad3d/cramjam-2.11.0-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:529d6d667c65fd105d10bd83d1cd3f9869f8fd6c66efac9415c1812281196a92", size = 1854075, upload-time = "2025-07-27T21:22:36.157Z" }, + { url = "https://files.pythonhosted.org/packages/2e/80/8a6343b13778ce52d94bb8d5365a30c3aa951276b1857201fe79d7e2ad25/cramjam-2.11.0-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:555eb9c90c450e0f76e27d9ff064e64a8b8c6478ab1a5594c91b7bc5c82fd9f0", size = 2032710, upload-time = "2025-07-27T21:22:38.17Z" }, + { url = "https://files.pythonhosted.org/packages/df/6b/cd1778a207c29eda10791e3dfa018b588001928086e179fc71254793c625/cramjam-2.11.0-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:5edf4c9e32493035b514cf2ba0c969d81ccb31de63bd05490cc8bfe3b431674e", size = 2068353, upload-time = "2025-07-27T21:22:39.615Z" }, + { url = "https://files.pythonhosted.org/packages/dc/f0/5c2a5cd5711032f3b191ca50cb786c17689b4a9255f9f768866e6c9f04d9/cramjam-2.11.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2fa2fe41f48c4d58d923803383b0737f048918b5a0d10390de9628bb6272b107", size = 1978104, upload-time = "2025-07-27T21:22:41.106Z" }, + { url = "https://files.pythonhosted.org/packages/f9/8b/b363a5fb2c3347504fe9a64f8d0f1e276844f0e532aa7162c061cd1ffee4/cramjam-2.11.0-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:9ca14cf1cabdb0b77d606db1bb9e9ca593b1dbd421fcaf251ec9a5431ec449f3", size = 2030779, upload-time = "2025-07-27T21:22:42.969Z" }, + { url = "https://files.pythonhosted.org/packages/78/7b/d83dad46adb6c988a74361f81ad9c5c22642be53ad88616a19baedd06243/cramjam-2.11.0-cp312-cp312-musllinux_1_1_armv7l.whl", hash = "sha256:309e95bf898829476bccf4fd2c358ec00e7ff73a12f95a3cdeeba4bb1d3683d5", size = 2155297, upload-time = "2025-07-27T21:22:44.6Z" }, + { url = "https://files.pythonhosted.org/packages/1a/be/60d9be4cb33d8740a4aa94c7513f2ef3c4eba4fd13536f086facbafade71/cramjam-2.11.0-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:86dca35d2f15ef22922411496c220f3c9e315d5512f316fe417461971cc1648d", size = 2169255, upload-time = "2025-07-27T21:22:46.534Z" }, + { url = "https://files.pythonhosted.org/packages/11/b0/4a595f01a243aec8ad272b160b161c44351190c35d98d7787919d962e9e5/cramjam-2.11.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:193c6488bd2f514cbc0bef5c18fad61a5f9c8d059dd56edf773b3b37f0e85496", size = 2155651, upload-time = "2025-07-27T21:22:48.46Z" }, + { url = "https://files.pythonhosted.org/packages/38/47/7776659aaa677046b77f527106e53ddd47373416d8fcdb1e1a881ec5dc06/cramjam-2.11.0-cp312-cp312-win32.whl", hash = "sha256:514e2c008a8b4fa823122ca3ecab896eac41d9aa0f5fc881bd6264486c204e32", size = 1603568, upload-time = "2025-07-27T21:22:50.084Z" }, + { url = "https://files.pythonhosted.org/packages/75/b1/d53002729cfd94c5844ddfaf1233c86d29f2dbfc1b764a6562c41c044199/cramjam-2.11.0-cp312-cp312-win_amd64.whl", hash = "sha256:53fed080476d5f6ad7505883ec5d1ec28ba36c2273db3b3e92d7224fe5e463db", size = 1709287, upload-time = "2025-07-27T21:22:51.534Z" }, + { url = "https://files.pythonhosted.org/packages/0a/8b/406c5dc0f8e82385519d8c299c40fd6a56d97eca3fcd6f5da8dad48de75b/cramjam-2.11.0-cp313-cp313-macosx_10_12_x86_64.macosx_11_0_arm64.macosx_10_12_universal2.whl", hash = "sha256:2c289729cc1c04e88bafa48b51082fb462b0a57dbc96494eab2be9b14dca62af", size = 3553330, upload-time = "2025-07-27T21:22:53.124Z" }, + { url = "https://files.pythonhosted.org/packages/00/ad/4186884083d6e4125b285903e17841827ab0d6d0cffc86216d27ed91e91d/cramjam-2.11.0-cp313-cp313-macosx_10_12_x86_64.whl", hash = "sha256:045201ee17147e36cf43d8ae2fa4b4836944ac672df5874579b81cf6d40f1a1f", size = 1859756, upload-time = "2025-07-27T21:22:54.821Z" }, + { url = "https://files.pythonhosted.org/packages/54/01/91b485cf76a7efef638151e8a7d35784dae2c4ff221b1aec2c083e4b106d/cramjam-2.11.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:619cd195d74c9e1d2a3ad78d63451d35379c84bd851aec552811e30842e1c67a", size = 1693609, upload-time = "2025-07-27T21:22:56.331Z" }, + { url = "https://files.pythonhosted.org/packages/cd/84/d0c80d279b2976870fc7d10f15dcb90a3c10c06566c6964b37c152694974/cramjam-2.11.0-cp313-cp313-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:6eb3ae5ab72edb2ed68bdc0f5710f0a6cad7fd778a610ec2c31ee15e32d3921e", size = 2024912, upload-time = "2025-07-27T21:22:57.915Z" }, + { url = "https://files.pythonhosted.org/packages/d6/70/88f2a5cb904281ed5d3c111b8f7d5366639817a5470f059bcd26833fc870/cramjam-2.11.0-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:df7da3f4b19e3078f9635f132d31b0a8196accb2576e3213ddd7a77f93317c20", size = 1760715, upload-time = "2025-07-27T21:22:59.528Z" }, + { url = "https://files.pythonhosted.org/packages/b2/06/cf5b02081132537d28964fb385fcef9ed9f8a017dd7d8c59d317e53ba50d/cramjam-2.11.0-cp313-cp313-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:57286b289cd557ac76c24479d8ecfb6c3d5b854cce54ccc7671f9a2f5e2a2708", size = 1853782, upload-time = "2025-07-27T21:23:01.07Z" }, + { url = "https://files.pythonhosted.org/packages/57/27/63525087ed40a53d1867021b9c4858b80cc86274ffe7225deed067d88d92/cramjam-2.11.0-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:28952fbbf8b32c0cb7fa4be9bcccfca734bf0d0989f4b509dc7f2f70ba79ae06", size = 2032354, upload-time = "2025-07-27T21:23:03.021Z" }, + { url = "https://files.pythonhosted.org/packages/c3/ef/dbba082c6ebfb6410da4dd39a64e654d7194fcfd4567f85991a83fa4ec32/cramjam-2.11.0-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:78ed2e4099812a438b545dfbca1928ec825e743cd253bc820372d6ef8c3adff4", size = 2068007, upload-time = "2025-07-27T21:23:04.526Z" }, + { url = "https://files.pythonhosted.org/packages/35/ce/d902b9358a46a086938feae83b2251720e030f06e46006f4c1fc0ac9da20/cramjam-2.11.0-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7d9aecd5c3845d415bd6c9957c93de8d93097e269137c2ecb0e5a5256374bdc8", size = 1977485, upload-time = "2025-07-27T21:23:06.058Z" }, + { url = "https://files.pythonhosted.org/packages/e8/03/982f54553244b0afcbdb2ad2065d460f0ab05a72a96896a969a1ca136a1e/cramjam-2.11.0-cp313-cp313-musllinux_1_1_aarch64.whl", hash = "sha256:362fcf4d6f5e1242a4540812455f5a594949190f6fbc04f2ffbfd7ae0266d788", size = 2030447, upload-time = "2025-07-27T21:23:07.679Z" }, + { url = "https://files.pythonhosted.org/packages/74/5f/748e54cdb665ec098ec519e23caacc65fc5ae58718183b071e33fc1c45b4/cramjam-2.11.0-cp313-cp313-musllinux_1_1_armv7l.whl", hash = "sha256:13240b3dea41b1174456cb9426843b085dc1a2bdcecd9ee2d8f65ac5703374b0", size = 2154949, upload-time = "2025-07-27T21:23:09.366Z" }, + { url = "https://files.pythonhosted.org/packages/69/81/c4e6cb06ed69db0dc81f9a8b1dc74995ebd4351e7a1877143f7031ff2700/cramjam-2.11.0-cp313-cp313-musllinux_1_1_i686.whl", hash = "sha256:c54eed83726269594b9086d827decc7d2015696e31b99bf9b69b12d9063584fe", size = 2168925, upload-time = "2025-07-27T21:23:10.976Z" }, + { url = "https://files.pythonhosted.org/packages/13/5b/966365523ce8290a08e163e3b489626c5adacdff2b3da9da1b0823dfb14e/cramjam-2.11.0-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:f8195006fdd0fc0a85b19df3d64a3ef8a240e483ae1dfc7ac6a4316019eb5df2", size = 2154950, upload-time = "2025-07-27T21:23:12.514Z" }, + { url = "https://files.pythonhosted.org/packages/3a/7d/7f8eb5c534b72b32c6eb79d74585bfee44a9a5647a14040bb65c31c2572d/cramjam-2.11.0-cp313-cp313-win32.whl", hash = "sha256:ccf30e3fe6d770a803dcdf3bb863fa44ba5dc2664d4610ba2746a3c73599f2e4", size = 1603199, upload-time = "2025-07-27T21:23:14.38Z" }, + { url = "https://files.pythonhosted.org/packages/37/05/47b5e0bf7c41a3b1cdd3b7c2147f880c93226a6bef1f5d85183040cbdece/cramjam-2.11.0-cp313-cp313-win_amd64.whl", hash = "sha256:ee36348a204f0a68b03400f4736224e9f61d1c6a1582d7f875c1ca56f0254268", size = 1708924, upload-time = "2025-07-27T21:23:16.332Z" }, + { url = "https://files.pythonhosted.org/packages/de/07/a1051cdbbe6d723df16d756b97f09da7c1adb69e29695c58f0392bc12515/cramjam-2.11.0-cp314-cp314-macosx_10_12_x86_64.macosx_11_0_arm64.macosx_10_12_universal2.whl", hash = "sha256:7ba5e38c9fbd06f086f4a5a64a1a5b7b417cd3f8fc07a20e5c03651f72f36100", size = 3554141, upload-time = "2025-07-27T21:23:17.938Z" }, + { url = "https://files.pythonhosted.org/packages/74/66/58487d2e16ef3d04f51a7c7f0e69823e806744b4c21101e89da4873074bc/cramjam-2.11.0-cp314-cp314-macosx_10_12_x86_64.whl", hash = "sha256:b8adeee57b41fe08e4520698a4b0bd3cc76dbd81f99424b806d70a5256a391d3", size = 1860353, upload-time = "2025-07-27T21:23:19.593Z" }, + { url = "https://files.pythonhosted.org/packages/67/b4/67f6254d166ffbcc9d5fa1b56876eaa920c32ebc8e9d3d525b27296b693b/cramjam-2.11.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:b96a74fa03a636c8a7d76f700d50e9a8bc17a516d6a72d28711225d641e30968", size = 1693832, upload-time = "2025-07-27T21:23:21.185Z" }, + { url = "https://files.pythonhosted.org/packages/55/a3/4e0b31c0d454ae70c04684ed7c13d3c67b4c31790c278c1e788cb804fa4a/cramjam-2.11.0-cp314-cp314-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:c3811a56fa32e00b377ef79121c0193311fd7501f0fb378f254c7f083cc1fbe0", size = 2027080, upload-time = "2025-07-27T21:23:23.303Z" }, + { url = "https://files.pythonhosted.org/packages/d9/c7/5e8eed361d1d3b8be14f38a54852c5370cc0ceb2c2d543b8ba590c34f080/cramjam-2.11.0-cp314-cp314-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c5d927e87461f8a0d448e4ab5eb2bca9f31ca5d8ea86d70c6f470bb5bc666d7e", size = 1761543, upload-time = "2025-07-27T21:23:24.991Z" }, + { url = "https://files.pythonhosted.org/packages/09/0c/06b7f8b0ce9fde89470505116a01fc0b6cb92d406c4fb1e46f168b5d3fa5/cramjam-2.11.0-cp314-cp314-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:f1f5c450121430fd89cb5767e0a9728ecc65997768fd4027d069cb0368af62f9", size = 1854636, upload-time = "2025-07-27T21:23:26.987Z" }, + { url = "https://files.pythonhosted.org/packages/6f/c6/6ebc02c9d5acdf4e5f2b1ec6e1252bd5feee25762246798ae823b3347457/cramjam-2.11.0-cp314-cp314-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:724aa7490be50235d97f07e2ca10067927c5d7f336b786ddbc868470e822aa25", size = 2032715, upload-time = "2025-07-27T21:23:28.603Z" }, + { url = "https://files.pythonhosted.org/packages/a2/77/a122971c23f5ca4b53e4322c647ac7554626c95978f92d19419315dddd05/cramjam-2.11.0-cp314-cp314-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:54c4637122e7cfd7aac5c1d3d4c02364f446d6923ea34cf9d0e8816d6e7a4936", size = 2069039, upload-time = "2025-07-27T21:23:30.319Z" }, + { url = "https://files.pythonhosted.org/packages/19/0f/f6121b90b86b9093c066889274d26a1de3f29969d45c2ed1ecbe2033cb78/cramjam-2.11.0-cp314-cp314-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:17eb39b1696179fb471eea2de958fa21f40a2cd8bf6b40d428312d5541e19dc4", size = 1979566, upload-time = "2025-07-27T21:23:32.002Z" }, + { url = "https://files.pythonhosted.org/packages/e0/a3/f95bc57fd7f4166ce6da816cfa917fb7df4bb80e669eb459d85586498414/cramjam-2.11.0-cp314-cp314-musllinux_1_1_aarch64.whl", hash = "sha256:36aa5a798aa34e11813a80425a30d8e052d8de4a28f27bfc0368cfc454d1b403", size = 2030905, upload-time = "2025-07-27T21:23:33.696Z" }, + { url = "https://files.pythonhosted.org/packages/fc/52/e429de4e8bc86ee65e090dae0f87f45abd271742c63fb2d03c522ffde28a/cramjam-2.11.0-cp314-cp314-musllinux_1_1_armv7l.whl", hash = "sha256:449fca52774dc0199545fbf11f5128933e5a6833946707885cf7be8018017839", size = 2155592, upload-time = "2025-07-27T21:23:35.375Z" }, + { url = "https://files.pythonhosted.org/packages/6c/6c/65a7a0207787ad39ad804af4da7f06a60149de19481d73d270b540657234/cramjam-2.11.0-cp314-cp314-musllinux_1_1_i686.whl", hash = "sha256:d87d37b3d476f4f7623c56a232045d25bd9b988314702ea01bd9b4a94948a778", size = 2170839, upload-time = "2025-07-27T21:23:37.197Z" }, + { url = "https://files.pythonhosted.org/packages/b2/c5/5c5db505ba692bc844246b066e23901d5905a32baf2f33719c620e65887f/cramjam-2.11.0-cp314-cp314-musllinux_1_1_x86_64.whl", hash = "sha256:26cb45c47d71982d76282e303931c6dd4baee1753e5d48f9a89b3a63e690b3a3", size = 2157236, upload-time = "2025-07-27T21:23:38.854Z" }, + { url = "https://files.pythonhosted.org/packages/b0/22/88e6693e60afe98901e5bbe91b8dea193e3aa7f42e2770f9c3339f5c1065/cramjam-2.11.0-cp314-cp314-win32.whl", hash = "sha256:4efe919d443c2fd112fe25fe636a52f9628250c9a50d9bddb0488d8a6c09acc6", size = 1604136, upload-time = "2025-07-27T21:23:40.56Z" }, + { url = "https://files.pythonhosted.org/packages/cc/f8/01618801cd59ccedcc99f0f96d20be67d8cfc3497da9ccaaad6b481781dd/cramjam-2.11.0-cp314-cp314-win_amd64.whl", hash = "sha256:ccec3524ea41b9abd5600e3e27001fd774199dbb4f7b9cb248fcee37d4bda84c", size = 1710272, upload-time = "2025-07-27T21:23:42.236Z" }, + { url = "https://files.pythonhosted.org/packages/40/81/6cdb3ed222d13ae86bda77aafe8d50566e81a1169d49ed195b6263610704/cramjam-2.11.0-cp314-cp314t-macosx_10_12_x86_64.macosx_11_0_arm64.macosx_10_12_universal2.whl", hash = "sha256:966ac9358b23d21ecd895c418c048e806fd254e46d09b1ff0cdad2eba195ea3e", size = 3559671, upload-time = "2025-07-27T21:23:44.504Z" }, + { url = "https://files.pythonhosted.org/packages/cb/43/52b7e54fe5ba1ef0270d9fdc43dabd7971f70ea2d7179be918c997820247/cramjam-2.11.0-cp314-cp314t-macosx_10_12_x86_64.whl", hash = "sha256:387f09d647a0d38dcb4539f8a14281f8eb6bb1d3e023471eb18a5974b2121c86", size = 1867876, upload-time = "2025-07-27T21:23:46.987Z" }, + { url = "https://files.pythonhosted.org/packages/9d/28/30d5b8d10acd30db3193bc562a313bff722888eaa45cfe32aa09389f2b24/cramjam-2.11.0-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:665b0d8fbbb1a7f300265b43926457ec78385200133e41fef19d85790fc1e800", size = 1695562, upload-time = "2025-07-27T21:23:48.644Z" }, + { url = "https://files.pythonhosted.org/packages/d9/86/ec806f986e01b896a650655024ea52a13e25c3ac8a3a382f493089483cdc/cramjam-2.11.0-cp314-cp314t-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:ca905387c7a371531b9622d93471be4d745ef715f2890c3702479cd4fc85aa51", size = 2025056, upload-time = "2025-07-27T21:23:50.404Z" }, + { url = "https://files.pythonhosted.org/packages/09/43/c2c17586b90848d29d63181f7d14b8bd3a7d00975ad46e3edf2af8af7e1f/cramjam-2.11.0-cp314-cp314t-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3c1aa56aef2c8af55a21ed39040a94a12b53fb23beea290f94d19a76027e2ffb", size = 1764084, upload-time = "2025-07-27T21:23:52.265Z" }, + { url = "https://files.pythonhosted.org/packages/2b/a9/68bc334fadb434a61df10071dc8606702aa4f5b6cdb2df62474fc21d2845/cramjam-2.11.0-cp314-cp314t-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:e5db59c1cdfaa2ab85cc988e602d6919495f735ca8a5fd7603608eb1e23c26d5", size = 1854859, upload-time = "2025-07-27T21:23:54.085Z" }, + { url = "https://files.pythonhosted.org/packages/5b/4e/b48e67835b5811ec5e9cb2e2bcba9c3fd76dab3e732569fe801b542c6ca9/cramjam-2.11.0-cp314-cp314t-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:b1f893014f00fe5e89a660a032e813bf9f6d91de74cd1490cdb13b2b59d0c9a3", size = 2035970, upload-time = "2025-07-27T21:23:55.758Z" }, + { url = "https://files.pythonhosted.org/packages/c4/70/d2ac33d572b4d90f7f0f2c8a1d60fb48f06b128fdc2c05f9b49891bb0279/cramjam-2.11.0-cp314-cp314t-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c26a1eb487947010f5de24943bd7c422dad955b2b0f8650762539778c380ca89", size = 2069320, upload-time = "2025-07-27T21:23:57.494Z" }, + { url = "https://files.pythonhosted.org/packages/1d/4c/85cec77af4a74308ba5fca8e296c4e2f80ec465c537afc7ab1e0ca2f9a00/cramjam-2.11.0-cp314-cp314t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7d5c8bfb438d94e7b892d1426da5fc4b4a5370cc360df9b8d9d77c33b896c37e", size = 1982668, upload-time = "2025-07-27T21:23:59.126Z" }, + { url = "https://files.pythonhosted.org/packages/55/45/938546d1629e008cc3138df7c424ef892719b1796ff408a2ab8550032e5e/cramjam-2.11.0-cp314-cp314t-musllinux_1_1_aarch64.whl", hash = "sha256:cb1fb8c9337ab0da25a01c05d69a0463209c347f16512ac43be5986f3d1ebaf4", size = 2034028, upload-time = "2025-07-27T21:24:00.865Z" }, + { url = "https://files.pythonhosted.org/packages/01/76/b5a53e20505555f1640e66dcf70394bcf51a1a3a072aa18ea35135a0f9ed/cramjam-2.11.0-cp314-cp314t-musllinux_1_1_armv7l.whl", hash = "sha256:1f6449f6de52dde3e2f1038284910c8765a397a25e2d05083870f3f5e7fc682c", size = 2155513, upload-time = "2025-07-27T21:24:02.92Z" }, + { url = "https://files.pythonhosted.org/packages/84/12/8d3f6ceefae81bbe45a347fdfa2219d9f3ac75ebc304f92cd5fcb4fbddc5/cramjam-2.11.0-cp314-cp314t-musllinux_1_1_i686.whl", hash = "sha256:382dec4f996be48ed9c6958d4e30c2b89435d7c2c4dbf32480b3b8886293dd65", size = 2170035, upload-time = "2025-07-27T21:24:04.558Z" }, + { url = "https://files.pythonhosted.org/packages/4b/85/3be6f0a1398f976070672be64f61895f8839857618a2d8cc0d3ab529d3dc/cramjam-2.11.0-cp314-cp314t-musllinux_1_1_x86_64.whl", hash = "sha256:d388bd5723732c3afe1dd1d181e4213cc4e1be210b080572e7d5749f6e955656", size = 2160229, upload-time = "2025-07-27T21:24:06.729Z" }, + { url = "https://files.pythonhosted.org/packages/57/5e/66cfc3635511b20014bbb3f2ecf0095efb3049e9e96a4a9e478e4f3d7b78/cramjam-2.11.0-cp314-cp314t-win32.whl", hash = "sha256:0a70ff17f8e1d13f322df616505550f0f4c39eda62290acb56f069d4857037c8", size = 1610267, upload-time = "2025-07-27T21:24:08.428Z" }, + { url = "https://files.pythonhosted.org/packages/ce/c6/c71e82e041c95ffe6a92ac707785500aa2a515a4339c2c7dd67e3c449249/cramjam-2.11.0-cp314-cp314t-win_amd64.whl", hash = "sha256:028400d699442d40dbda02f74158c73d05cb76587a12490d0bfedd958fd49188", size = 1713108, upload-time = "2025-07-27T21:24:10.147Z" }, + { url = "https://files.pythonhosted.org/packages/81/da/b3301962ccd6fce9fefa1ecd8ea479edaeaa38fadb1f34d5391d2587216a/cramjam-2.11.0-pp311-pypy311_pp73-macosx_10_12_x86_64.macosx_11_0_arm64.macosx_10_12_universal2.whl", hash = "sha256:52d5db3369f95b27b9f3c14d067acb0b183333613363ed34268c9e04560f997f", size = 3573546, upload-time = "2025-07-27T21:24:52.944Z" }, + { url = "https://files.pythonhosted.org/packages/b6/c2/410ddb8ad4b9dfb129284666293cb6559479645da560f7077dc19d6bee9e/cramjam-2.11.0-pp311-pypy311_pp73-macosx_10_12_x86_64.whl", hash = "sha256:4820516366d455b549a44d0e2210ee7c4575882dda677564ce79092588321d54", size = 1873654, upload-time = "2025-07-27T21:24:54.958Z" }, + { url = "https://files.pythonhosted.org/packages/d5/99/f68a443c64f7ce7aff5bed369b0aa5b2fac668fa3dfd441837e316e97a1f/cramjam-2.11.0-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:d9e5db525dc0a950a825202f84ee68d89a072479e07da98795a3469df942d301", size = 1702846, upload-time = "2025-07-27T21:24:57.124Z" }, + { url = "https://files.pythonhosted.org/packages/6c/02/0ff358ab773def1ee3383587906c453d289953171e9c92db84fdd01bf172/cramjam-2.11.0-pp311-pypy311_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:62ab4971199b2270005359cdc379bc5736071dc7c9a228581c5122d9ffaac50c", size = 1773683, upload-time = "2025-07-27T21:24:59.28Z" }, + { url = "https://files.pythonhosted.org/packages/e9/31/3298e15f87c9cf2aabdbdd90b153d8644cf989cb42a45d68a1b71e1f7aaf/cramjam-2.11.0-pp311-pypy311_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:24758375cc5414d3035ca967ebb800e8f24604ececcba3c67d6f0218201ebf2d", size = 1994136, upload-time = "2025-07-27T21:25:01.565Z" }, + { url = "https://files.pythonhosted.org/packages/c7/90/20d1747255f1ee69a412e319da51ea594c18cca195e7a4d4c713f045eff5/cramjam-2.11.0-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:6c2eea545fef1065c7dd4eda991666fd9c783fbc1d226592ccca8d8891c02f23", size = 1714982, upload-time = "2025-07-27T21:25:05.79Z" }, +] + +[[package]] +name = "crontab" +version = "1.0.5" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/d6/36/a255b6f5a2e22df03fd2b2f3088974b44b8c9e9407e26b44742cb7cfbf5b/crontab-1.0.5.tar.gz", hash = "sha256:f80e01b4f07219763a9869f926dd17147278e7965a928089bca6d3dc80ae46d5", size = 21963, upload-time = "2025-07-09T17:09:38.264Z" } + +[[package]] +name = "cryptography" +version = "48.0.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "cffi", marker = "platform_python_implementation != 'PyPy'" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/9f/a9/db8f313fdcd85d767d4973515e1db101f9c71f95fced83233de224673757/cryptography-48.0.0.tar.gz", hash = "sha256:5c3932f4436d1cccb036cb0eaef46e6e2db91035166f1ad6505c3c9d5a635920", size = 832984, upload-time = "2026-05-04T22:59:38.133Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/df/3d/01f6dd9190170a5a241e0e98c2d04be3664a9e6f5b9b872cde63aff1c3dd/cryptography-48.0.0-cp311-abi3-macosx_10_9_universal2.whl", hash = "sha256:0c558d2cdffd8f4bbb30fc7134c74d2ca9a476f830bb053074498fbc86f41ed6", size = 8001587, upload-time = "2026-05-04T22:57:36.803Z" }, + { url = "https://files.pythonhosted.org/packages/b2/6e/e90527eef33f309beb811cf7c982c3aeffcce8e3edb178baa4ca3ae4a6fa/cryptography-48.0.0-cp311-abi3-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:f5333311663ea94f75dd408665686aaf426563556bb5283554a3539177e03b8c", size = 4690433, upload-time = "2026-05-04T22:57:40.373Z" }, + { url = "https://files.pythonhosted.org/packages/90/04/673510ed51ddff56575f306cf1617d80411ee76831ccd3097599140efdfe/cryptography-48.0.0-cp311-abi3-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:7995ef305d7165c3f11ae07f2517e5a4f1d5c18da1376a0a9ed496336b69e5f3", size = 4710620, upload-time = "2026-05-04T22:57:42.935Z" }, + { url = "https://files.pythonhosted.org/packages/14/d5/e9c4ef932c8d800490c34d8bd589d64a31d5890e27ec9e9ad532be893294/cryptography-48.0.0-cp311-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:40ba1f85eaa6959837b1d51c9767e230e14612eea4ef110ee8854ada22da1bf5", size = 4696283, upload-time = "2026-05-04T22:57:45.294Z" }, + { url = "https://files.pythonhosted.org/packages/0c/29/174b9dfb60b12d59ecfc6cfa04bc88c21b42a54f01b8aae09bb6e51e4c7f/cryptography-48.0.0-cp311-abi3-manylinux_2_28_ppc64le.whl", hash = "sha256:369a6348999f94bbd53435c894377b20ab95f25a9065c283570e70150d8abc3c", size = 5296573, upload-time = "2026-05-04T22:57:47.933Z" }, + { url = "https://files.pythonhosted.org/packages/95/38/0d29a6fd7d0d1373f0c0c88a04ba20e359b257753ac497564cd660fc1d55/cryptography-48.0.0-cp311-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:a0e692c683f4df67815a2d258b324e66f4738bd7a96a218c826dce4f4bd05d8f", size = 4743677, upload-time = "2026-05-04T22:57:50.067Z" }, + { url = "https://files.pythonhosted.org/packages/30/be/eef653013d5c63b6a490529e0316f9ac14a37602965d4903efed1399f32b/cryptography-48.0.0-cp311-abi3-manylinux_2_31_armv7l.whl", hash = "sha256:18349bbc56f4743c8b12dc32e2bccb2cf83ee8b69a3bba74ef8ae857e26b3d25", size = 4330808, upload-time = "2026-05-04T22:57:52.301Z" }, + { url = "https://files.pythonhosted.org/packages/84/9e/500463e87abb7a0a0f9f256ec21123ecde0a7b5541a15e840ea54551fd81/cryptography-48.0.0-cp311-abi3-manylinux_2_34_aarch64.whl", hash = "sha256:7e8eac43dfca5c4cccc6dad9a80504436fca53bb9bc3100a2386d730fbe6b602", size = 4695941, upload-time = "2026-05-04T22:57:54.603Z" }, + { url = "https://files.pythonhosted.org/packages/e3/dc/7303087450c2ec9e7fbb750e17c2abfbc658f23cbd0e54009509b7cc4091/cryptography-48.0.0-cp311-abi3-manylinux_2_34_ppc64le.whl", hash = "sha256:9ccdac7d40688ecb5a3b4a604b8a88c8002e3442d6c60aead1db2a89a041560c", size = 5252579, upload-time = "2026-05-04T22:57:57.207Z" }, + { url = "https://files.pythonhosted.org/packages/d0/c0/7101d3b7215edcdc90c45da544961fd8ed2d6448f77577460fa75a8443f7/cryptography-48.0.0-cp311-abi3-manylinux_2_34_x86_64.whl", hash = "sha256:bd72e68b06bb1e96913f97dd4901119bc17f39d4586a5adf2d3e47bc2b9d58b5", size = 4743326, upload-time = "2026-05-04T22:57:59.535Z" }, + { url = "https://files.pythonhosted.org/packages/ac/d8/5b833bad13016f562ab9d063d68199a4bd121d18458e439515601d3357ec/cryptography-48.0.0-cp311-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:59baa2cb386c4f0b9905bd6eb4c2a79a69a128408fd31d32ca4d7102d4156321", size = 4826672, upload-time = "2026-05-04T22:58:01.996Z" }, + { url = "https://files.pythonhosted.org/packages/98/e1/7074eb8bf3c135558c73fc2bcf0f5633f912e6fb87e868a55c454080ef09/cryptography-48.0.0-cp311-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:9249e3cd978541d665967ac2cb2787fd6a62bddf1e75b3e347a594d7dacf4f74", size = 4972574, upload-time = "2026-05-04T22:58:03.968Z" }, + { url = "https://files.pythonhosted.org/packages/04/70/e5a1b41d325f797f39427aa44ef8baf0be500065ab6d8e10369d850d4a4f/cryptography-48.0.0-cp311-abi3-win32.whl", hash = "sha256:9c459db21422be75e2809370b829a87eb37f74cd785fc4aa9ea1e5f43b47cda4", size = 3294868, upload-time = "2026-05-04T22:58:06.467Z" }, + { url = "https://files.pythonhosted.org/packages/f4/ac/8ac51b4a5fc5932eb7ee5c517ba7dc8cd834f0048962b6b352f00f41ebf9/cryptography-48.0.0-cp311-abi3-win_amd64.whl", hash = "sha256:5b012212e08b8dd5edc78ef54da83dd9892fd9105323b3993eff6bea65dc21d7", size = 3817107, upload-time = "2026-05-04T22:58:08.845Z" }, + { url = "https://files.pythonhosted.org/packages/6b/84/70e3feea9feea87fd7cbe77efb2712ae1e3e6edf10749dc6e95f4e60e455/cryptography-48.0.0-cp314-cp314t-macosx_10_9_universal2.whl", hash = "sha256:3cb07a3ed6431663cd321ea8a000a1314c74211f823e4177fefa2255e057d1ec", size = 7986556, upload-time = "2026-05-04T22:58:11.172Z" }, + { url = "https://files.pythonhosted.org/packages/89/6e/18e07a618bb5442ba10cf4df16e99c071365528aa570dfcb8c02e25a303b/cryptography-48.0.0-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:8c7378637d7d88016fa6791c159f698b3d3eed28ebf844ac36b9dc04a14dae18", size = 4684776, upload-time = "2026-05-04T22:58:13.712Z" }, + { url = "https://files.pythonhosted.org/packages/be/6a/4ea3b4c6c6759794d5ee2103c304a5076dc4b19ae1f9fe47dba439e159e9/cryptography-48.0.0-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:cc90c0b39b2e3c65ef52c804b72e3c58f8a04ab2a1871272798e5f9572c17d20", size = 4698121, upload-time = "2026-05-04T22:58:16.448Z" }, + { url = "https://files.pythonhosted.org/packages/2f/59/6ff6ad6cae03bb887da2a5860b2c9805f8dac969ef01ce563336c49bd1d1/cryptography-48.0.0-cp314-cp314t-manylinux_2_28_aarch64.whl", hash = "sha256:76341972e1eff8b4bea859f09c0d3e64b96ce931b084f9b9b7db8ef364c30eff", size = 4690042, upload-time = "2026-05-04T22:58:18.544Z" }, + { url = "https://files.pythonhosted.org/packages/ca/b4/fc334ed8cfd705aca282fe4d8f5ae64a8e0f74932e9feecb344610cf6e4d/cryptography-48.0.0-cp314-cp314t-manylinux_2_28_ppc64le.whl", hash = "sha256:55b7718303bf06a5753dcdccf2f3945cf18ad7bffde41b61226e4db31ab89a9c", size = 5282526, upload-time = "2026-05-04T22:58:20.75Z" }, + { url = "https://files.pythonhosted.org/packages/11/08/9f8c5386cc4cd90d8255c7cdd0f5baf459a08502a09de30dc51f553d38dc/cryptography-48.0.0-cp314-cp314t-manylinux_2_28_x86_64.whl", hash = "sha256:a64697c641c7b1b2178e573cbc31c7c6684cd56883a478d75143dbb7118036db", size = 4733116, upload-time = "2026-05-04T22:58:23.627Z" }, + { url = "https://files.pythonhosted.org/packages/b8/77/99307d7574045699f8805aa500fa0fb83422d115b5400a064ddd306d7750/cryptography-48.0.0-cp314-cp314t-manylinux_2_31_armv7l.whl", hash = "sha256:561215ea3879cb1cbbf272867e2efda62476f240fb58c64de6b393ae19246741", size = 4316030, upload-time = "2026-05-04T22:58:25.581Z" }, + { url = "https://files.pythonhosted.org/packages/fd/36/a608b98337af3cb2aff4818e406649d30572b7031918b04c87d979495348/cryptography-48.0.0-cp314-cp314t-manylinux_2_34_aarch64.whl", hash = "sha256:ad64688338ed4bc1a6618076ba75fd7194a5f1797ac60b47afe926285adb3166", size = 4689640, upload-time = "2026-05-04T22:58:27.747Z" }, + { url = "https://files.pythonhosted.org/packages/dd/a6/825010a291b4438aecc1f568bc428189fc1175515223632477c07dc0a6df/cryptography-48.0.0-cp314-cp314t-manylinux_2_34_ppc64le.whl", hash = "sha256:906cbf0670286c6e0044156bc7d4af9cbb0ef6db9f73e52c3ec56ba6bdde5336", size = 5237657, upload-time = "2026-05-04T22:58:29.848Z" }, + { url = "https://files.pythonhosted.org/packages/b9/09/4e76a09b4caa29aad535ddc806f5d4c5d01885bd978bd984fbc6ca032cae/cryptography-48.0.0-cp314-cp314t-manylinux_2_34_x86_64.whl", hash = "sha256:ea8990436d914540a40ab24b6a77c0969695ed52f4a4874c5137ccf7045a7057", size = 4732362, upload-time = "2026-05-04T22:58:32.009Z" }, + { url = "https://files.pythonhosted.org/packages/18/78/444fa04a77d0cb95f417dda20d450e13c56ba8e5220fc892a1658f44f882/cryptography-48.0.0-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:c18684a7f0cc9a3cb60328f496b8e3372def7c5d2df39ac267878b05565aaaae", size = 4819580, upload-time = "2026-05-04T22:58:34.254Z" }, + { url = "https://files.pythonhosted.org/packages/38/85/ea67067c70a1fd4be2c63d35eeed82658023021affccc7b17705f8527dd2/cryptography-48.0.0-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:9be5aafa5736574f8f15f262adc81b2a9869e2cfe9014d52a44633905b40d52c", size = 4963283, upload-time = "2026-05-04T22:58:36.376Z" }, + { url = "https://files.pythonhosted.org/packages/75/54/cc6d0f3deac3e81c7f847e8a189a12b6cdd65059b43dad25d4316abd849a/cryptography-48.0.0-cp314-cp314t-win32.whl", hash = "sha256:c17dfe85494deaeddc5ce251aebd1d60bbe6afc8b62071bb0b469431a000124f", size = 3270954, upload-time = "2026-05-04T22:58:38.791Z" }, + { url = "https://files.pythonhosted.org/packages/49/67/cc947e288c0758a4e5473d1dcb743037ab7785541265a969240b8885441a/cryptography-48.0.0-cp314-cp314t-win_amd64.whl", hash = "sha256:27241b1dc9962e056062a8eef1991d02c3a24569c95975bd2322a8a52c6e5e12", size = 3797313, upload-time = "2026-05-04T22:58:40.746Z" }, + { url = "https://files.pythonhosted.org/packages/f2/63/61d4a4e1c6b6bab6ce1e213cd36a24c415d90e76d78c5eb8577c5541d2e8/cryptography-48.0.0-cp39-abi3-macosx_10_9_universal2.whl", hash = "sha256:58d00498e8933e4a194f3076aee1b4a97dfec1a6da444535755822fe5d8b0b86", size = 7983482, upload-time = "2026-05-04T22:58:43.769Z" }, + { url = "https://files.pythonhosted.org/packages/d5/ac/f5b5995b87770c693e2596559ffafe195b4033a57f14a82268a2842953f3/cryptography-48.0.0-cp39-abi3-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:614d0949f4790582d2cc25553abd09dd723025f0c0e7c67376a1d77196743d6e", size = 4683266, upload-time = "2026-05-04T22:58:46.064Z" }, + { url = "https://files.pythonhosted.org/packages/ec/c6/8b14f67e18338fbc4adb76f66c001f5c3610b3e2d1837f268f47a347dbbb/cryptography-48.0.0-cp39-abi3-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:7ce4bfae76319a532a2dc68f82cc32f5676ee792a983187dac07183690e5c66f", size = 4696228, upload-time = "2026-05-04T22:58:48.22Z" }, + { url = "https://files.pythonhosted.org/packages/ea/73/f808fbae9514bd91b47875b003f13e284c8c6bdfd904b7944e803937eec1/cryptography-48.0.0-cp39-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:2eb992bbd4661238c5a397594c83f5b4dc2bc5b848c365c8f991b6780efcc5c7", size = 4689097, upload-time = "2026-05-04T22:58:50.9Z" }, + { url = "https://files.pythonhosted.org/packages/93/01/d86632d7d28db8ae83221995752eeb6639ffb374c2d22955648cf8d52797/cryptography-48.0.0-cp39-abi3-manylinux_2_28_ppc64le.whl", hash = "sha256:22a5cb272895dce158b2cacdfdc3debd299019659f42947dbdac6f32d68fe832", size = 5283582, upload-time = "2026-05-04T22:58:53.017Z" }, + { url = "https://files.pythonhosted.org/packages/02/e1/50edc7a50334807cc4791fc4a0ce7468b4a1416d9138eab358bfc9a3d70b/cryptography-48.0.0-cp39-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:2b4d59804e8408e2fea7d1fbaf218e5ec984325221db76e6a241a9abd6cdd95c", size = 4730479, upload-time = "2026-05-04T22:58:55.611Z" }, + { url = "https://files.pythonhosted.org/packages/6f/af/99a582b1b1641ff5911ac559beb45097cf79efd4ead4657f578ef1af2d47/cryptography-48.0.0-cp39-abi3-manylinux_2_31_armv7l.whl", hash = "sha256:984a20b0f62a26f48a3396c72e4bc34c66e356d356bf370053066b3b6d54634a", size = 4326481, upload-time = "2026-05-04T22:58:57.607Z" }, + { url = "https://files.pythonhosted.org/packages/90/ee/89aa26a06ef0a7d7611788ffd571a7c50e368cc6a4d5eef8b4884e866edb/cryptography-48.0.0-cp39-abi3-manylinux_2_34_aarch64.whl", hash = "sha256:5a5ed8fde7a1d09376ca0b40e68cd59c69fe23b1f9768bd5824f54681626032a", size = 4688713, upload-time = "2026-05-04T22:59:00.077Z" }, + { url = "https://files.pythonhosted.org/packages/70/ba/bcb1b0bb7a33d4c7c0c4d4c7874b4a62ae4f56113a5f4baefa362dfb1f0f/cryptography-48.0.0-cp39-abi3-manylinux_2_34_ppc64le.whl", hash = "sha256:8cd666227ef7af430aa5914a9910e0ddd703e75f039cef0825cd0da71b6b711a", size = 5238165, upload-time = "2026-05-04T22:59:02.317Z" }, + { url = "https://files.pythonhosted.org/packages/c9/70/ca4003b1ce5ca3dc3186ada51908c8a9b9ff7d5cab83cc0d43ee14ec144f/cryptography-48.0.0-cp39-abi3-manylinux_2_34_x86_64.whl", hash = "sha256:9071196d81abc88b3516ac8cdfad32e2b66dd4a5393a8e68a961e9161ddc6239", size = 4729947, upload-time = "2026-05-04T22:59:05.255Z" }, + { url = "https://files.pythonhosted.org/packages/44/a0/4ec7cf774207905aef1a8d11c3750d5a1db805eb380ee4e16df317870128/cryptography-48.0.0-cp39-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:1e2d54c8be6152856a36f0882ab231e70f8ec7f14e93cf87db8a2ed056bf160c", size = 4822059, upload-time = "2026-05-04T22:59:07.802Z" }, + { url = "https://files.pythonhosted.org/packages/1e/75/a2e55f99c16fcac7b5d6c1eb19ad8e00799854d6be5ca845f9259eae1681/cryptography-48.0.0-cp39-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:a5da777e32ffed6f85a7b2b3f7c5cbc88c146bfcd0a1d7baf5fcc6c52ee35dd4", size = 4960575, upload-time = "2026-05-04T22:59:09.851Z" }, + { url = "https://files.pythonhosted.org/packages/b8/23/6e6f32143ab5d8b36ca848a502c4bcd477ae75b9e1677e3530d669062578/cryptography-48.0.0-cp39-abi3-win32.whl", hash = "sha256:77a2ccbbe917f6710e05ba9adaa25fb5075620bf3ea6fb751997875aff4ae4bd", size = 3279117, upload-time = "2026-05-04T22:59:12.019Z" }, + { url = "https://files.pythonhosted.org/packages/9d/9a/0fea98a70cf1749d41d738836f6349d97945f7c89433a259a6c2642eefeb/cryptography-48.0.0-cp39-abi3-win_amd64.whl", hash = "sha256:16cd65b9330583e4619939b3a3843eec1e6e789744bb01e7c7e2e62e33c239c8", size = 3792100, upload-time = "2026-05-04T22:59:14.884Z" }, + { url = "https://files.pythonhosted.org/packages/be/d2/024b5e06be9d44cb021fb0e1a03d34d63989cf56a0fe62f3dfbab695b9b4/cryptography-48.0.0-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:84cf79f0dc8b36ac5da873481716e87aef31fcfa0444f9e1d8b4b2cece142855", size = 3950391, upload-time = "2026-05-04T22:59:17.415Z" }, + { url = "https://files.pythonhosted.org/packages/bc/17/3861e17c56fa0fd37491a14a8673fdb77c57fc5693cafe745ea8b06dba75/cryptography-48.0.0-pp311-pypy311_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:fdfef35d751d510fcef5252703621574364fec16418c4a1e5e1055248401054b", size = 4637126, upload-time = "2026-05-04T22:59:20.197Z" }, + { url = "https://files.pythonhosted.org/packages/f0/0a/7e226dbff530f21480727eb764973a7bff2b912f8e15cd4f129e71b56d1d/cryptography-48.0.0-pp311-pypy311_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:0890f502ddf7d9c6426129c3f49f5c0a39278ed7cd6322c8755ffca6ee675a13", size = 4667270, upload-time = "2026-05-04T22:59:22.647Z" }, + { url = "https://files.pythonhosted.org/packages/3b/f2/5a72274ca9f1b2a8b44a662ee0bf1b435909deb473d6f97bcd035bcdbc71/cryptography-48.0.0-pp311-pypy311_pp73-manylinux_2_34_aarch64.whl", hash = "sha256:ecde28a596bead48b0cfd2a1b4416c3d43074c2d785e3a398d7ec1fc4d0f7fbb", size = 4636797, upload-time = "2026-05-04T22:59:24.912Z" }, + { url = "https://files.pythonhosted.org/packages/b4/e1/48cedb2fe63626e91ded1edad159e2a4fb8b6906c4425eb7749673077ce7/cryptography-48.0.0-pp311-pypy311_pp73-manylinux_2_34_x86_64.whl", hash = "sha256:4defde8685ae324a9eb9d818717e93b4638ef67070ac9bc15b8ca85f63048355", size = 4666800, upload-time = "2026-05-04T22:59:27.474Z" }, + { url = "https://files.pythonhosted.org/packages/a2/ca/7e8365deec19afb2b2c7be7c1c0aa8f99633b54e90c570999acda93260fc/cryptography-48.0.0-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:db63bf618e5dea46c07de12e900fe1cdd2541e6dc9dbae772a70b7d4d4765f6a", size = 3739536, upload-time = "2026-05-04T22:59:29.61Z" }, +] + +[[package]] +name = "css-html-js-minify" +version = "2.5.5" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/75/61/f52e5225abe8e36ed5396e5ae3074df5f4ef994b540e9b4fd55a39b03cfd/css-html-js-minify-2.5.5.zip", hash = "sha256:4a9f11f7e0496f5284d12111f3ba4ff5ff2023d12f15d195c9c48bd97013746c", size = 33156, upload-time = "2018-04-14T15:10:29.53Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/e8/21/1260081a2c67105a3bd0f8692ff3c80b5f0cb5fe9f3f8fd4a990f17b8a39/css_html_js_minify-2.5.5-py2.py3-none-any.whl", hash = "sha256:3da9d35ac0db8ca648c1b543e0e801d7ca0bab9e6bfd8418fee59d5ae001727a", size = 40527, upload-time = "2018-04-14T15:10:26.667Z" }, +] + +[[package]] +name = "cycler" +version = "0.12.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/a9/95/a3dbbb5028f35eafb79008e7522a75244477d2838f38cbb722248dabc2a8/cycler-0.12.1.tar.gz", hash = "sha256:88bb128f02ba341da8ef447245a9e138fae777f6a23943da4540077d3601eb1c", size = 7615, upload-time = "2023-10-07T05:32:18.335Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/e7/05/c19819d5e3d95294a6f5947fb9b9629efb316b96de511b418c53d245aae6/cycler-0.12.1-py3-none-any.whl", hash = "sha256:85cef7cff222d8644161529808465972e51340599459b8ac3ccbac5a854e0d30", size = 8321, upload-time = "2023-10-07T05:32:16.783Z" }, +] + +[[package]] +name = "dateparser" +version = "1.4.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "python-dateutil" }, + { name = "pytz" }, + { name = "regex" }, + { name = "tzlocal" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/46/2d/a0ccdb78788064fa0dc901b8524e50615c42be1d78b78d646d0b28d09180/dateparser-1.4.0.tar.gz", hash = "sha256:97a21840d5ecdf7630c584f673338a5afac5dfe84f647baf4d7e8df98f9354a4", size = 321512, upload-time = "2026-03-26T09:56:10.292Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/b4/0b/3c3bb7cbe757279e693a0be6049048012f794d01f81099609ecd53b899f0/dateparser-1.4.0-py3-none-any.whl", hash = "sha256:7902b8e85d603494bf70a5a0b1decdddb2270b9c6e6b2bc8a57b93476c0df378", size = 300379, upload-time = "2026-03-26T09:56:08.409Z" }, +] + +[[package]] +name = "ddtrace" +version = "4.3.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "bytecode" }, + { name = "envier" }, + { name = "opentelemetry-api" }, + { name = "wrapt" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/bc/d0/0690d1b88b936ab31219ca9078859316185989be0d186ff33896f3191d39/ddtrace-4.3.0.tar.gz", hash = "sha256:366bc941a20137e6f5bff22aefd6a221ca15f1b087c31bf28fce448619f443b4", size = 7085760, upload-time = "2026-01-27T20:55:27.878Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/62/92/a4335be1b8ccebca11c2fc30dbd38e7c31f20025ac5fa29c781fcf7e839f/ddtrace-4.3.0-cp311-cp311-macosx_14_0_arm64.whl", hash = "sha256:c41f5598ec26fc75a12f88131f14cf8728fbef3a5077ab3092b66f65a56f0cfd", size = 6646276, upload-time = "2026-01-27T20:53:26.621Z" }, + { url = "https://files.pythonhosted.org/packages/79/04/c82807bfe651fb2fe04cb3a097a8988638a8ffe31f38a34f7a9cdd8ed227/ddtrace-4.3.0-cp311-cp311-macosx_14_0_x86_64.whl", hash = "sha256:0971a52d0474a1a5c417aa628ccb81a3f530acc7b054cd2040740bc200193068", size = 7046186, upload-time = "2026-01-27T20:53:28.498Z" }, + { url = "https://files.pythonhosted.org/packages/fc/d6/5091e3dcb0e3b15f11165faab3c0cfff91d1fe69b1adf34843246e04c891/ddtrace-4.3.0-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:2a5e2903d6634adf685939ca7ede2aa900a1315911f14e3081399e3dcad32b15", size = 7728637, upload-time = "2026-01-27T20:53:30.407Z" }, + { url = "https://files.pythonhosted.org/packages/d6/e0/c5438aca0281bd511260d55d361fca9904d988896baee2e09eb456ca3c42/ddtrace-4.3.0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:ce7adf94dc12edff5ddecd9a0ec751f99148578798142bb228f7b3713505d1f7", size = 8008249, upload-time = "2026-01-27T20:53:32.623Z" }, + { url = "https://files.pythonhosted.org/packages/0a/49/aa3452696bed00632ca9dd4a99bf1fca9342c0a386b2ff4e3fbc683cd9f6/ddtrace-4.3.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:6bb56dfda0b69e324d8b90efdff6b506cd86cadbb336d7e265deb11886eb1322", size = 8736182, upload-time = "2026-01-27T20:53:35.08Z" }, + { url = "https://files.pythonhosted.org/packages/48/bf/7d1da3d02b7ff0d10fea86494a60cc0720e33d4f1a85e5fa1274e9b03a64/ddtrace-4.3.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:a9ba79cb934286d43ad4314269af5c63057d63aadcf1a9d201feb2a02077e98c", size = 9066094, upload-time = "2026-01-27T20:53:37.646Z" }, + { url = "https://files.pythonhosted.org/packages/df/81/e814aedec968a43c6408054eef53b5a5d2ff54d80db2199b60478aa671d9/ddtrace-4.3.0-cp311-cp311-win32.whl", hash = "sha256:557775da26e9cb3d4b5e742028a566a6910f85cfc23b111d265e44358dd32860", size = 5114320, upload-time = "2026-01-27T20:53:39.924Z" }, + { url = "https://files.pythonhosted.org/packages/a3/7d/c891543ff0f581e6ae63a5c12b9b521ee2485ff9837a7bbe5aa13e534f9c/ddtrace-4.3.0-cp311-cp311-win_amd64.whl", hash = "sha256:456cc48ac86736452a803f914ebe7f73e32504c2490ef0ae4973e84b6a9571fc", size = 5652238, upload-time = "2026-01-27T20:53:42.351Z" }, + { url = "https://files.pythonhosted.org/packages/66/cb/71f7f34a63ebbfb86fd7511d900d2b4f3b94e4d1a6fb81b2e0f41e84918b/ddtrace-4.3.0-cp311-cp311-win_arm64.whl", hash = "sha256:f7d606f5510ef0ffcc1d42ecc5ecb8700060d6e456148d46d079b47e7f55f863", size = 5368001, upload-time = "2026-01-27T20:53:44.443Z" }, + { url = "https://files.pythonhosted.org/packages/65/21/7ad3a13b5cb21b951d399995e587c04ae72bd7e09741a535221b31aa943a/ddtrace-4.3.0-cp312-cp312-macosx_14_0_arm64.whl", hash = "sha256:ef5ae88f516654b37fcc8fc7154ffa9d1e8eb8b3be6d6f08f87f681e35937ef7", size = 6903861, upload-time = "2026-01-27T20:53:46.975Z" }, + { url = "https://files.pythonhosted.org/packages/fa/f2/837756c6ca7f45a6e7f9bcea31ae31df8707604a7aec09b4fec810abf01b/ddtrace-4.3.0-cp312-cp312-macosx_14_0_x86_64.whl", hash = "sha256:7c4ca32b1a92a1ef116711e20bbd1cdf65056be9a64585fc41354dacf4c7ca33", size = 7327605, upload-time = "2026-01-27T20:53:49.077Z" }, + { url = "https://files.pythonhosted.org/packages/c8/8f/01a89d5e5495fd804af898e6d7d867dd7345fc6303c4e78e556a8345f34a/ddtrace-4.3.0-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:feaf7921c3795ae1dd0f12640d3f8ec5f9ac19697b55a54876e90ec4330c628a", size = 7722066, upload-time = "2026-01-27T20:53:51.752Z" }, + { url = "https://files.pythonhosted.org/packages/a6/21/4999eebbbfd3d36edaeaafa270b8f3cf592417d92a5ea7b752e61af4b869/ddtrace-4.3.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:0b527de8ff70105909e2d99dd81374162158a280f562dea244a1c36939ea0d8a", size = 8009324, upload-time = "2026-01-27T20:53:53.968Z" }, + { url = "https://files.pythonhosted.org/packages/8d/f8/b4c2c844912c9ce54ec3d78efcc83186a39f80a9145d008fd7323eefea96/ddtrace-4.3.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:4c35c3b42cd304056c65d95f4b63a0580aa4ff29efb18965f7ed2fa3ad8e4374", size = 8733732, upload-time = "2026-01-27T20:53:56.607Z" }, + { url = "https://files.pythonhosted.org/packages/10/ec/0a756896dd47098178e96b43ce198b90def45ff5b94c4166bbb6b8795c60/ddtrace-4.3.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:9aa6e2014ad16a5a7c28cc0ff3eb4f4cd2396dc7d9e811db7f778b9d75a09268", size = 9073645, upload-time = "2026-01-27T20:53:59.498Z" }, + { url = "https://files.pythonhosted.org/packages/42/89/4bc918d8f5792d58e5eaa3c67fe18b22cfd9c5bc5eeb334c5c3c6d9e44b7/ddtrace-4.3.0-cp312-cp312-win32.whl", hash = "sha256:cd64c7cebcb58c32e5e8e6bfda11ba50b7f0e2c74d54ecdd8c945eaa2a92f6f8", size = 5110045, upload-time = "2026-01-27T20:54:01.898Z" }, + { url = "https://files.pythonhosted.org/packages/2c/9b/cfbb354d991b9be5fea026ad2fee918bb8da1ff649635e7de05e64458460/ddtrace-4.3.0-cp312-cp312-win_amd64.whl", hash = "sha256:4bf62878d3a0f20dc2645aff7698bbe8f57a6f39008279601f2af95f4f3d0ee4", size = 5645713, upload-time = "2026-01-27T20:54:04.305Z" }, + { url = "https://files.pythonhosted.org/packages/cb/f5/e44a66e21f0bb5ba3cdc34a22e244badc7ad92ef01e60410a22794b92ebf/ddtrace-4.3.0-cp312-cp312-win_arm64.whl", hash = "sha256:418ce112d1c85786e589ecd22a6f2dedf1ecb8efb21a703b18dfb5d2b6182a34", size = 5360067, upload-time = "2026-01-27T20:54:06.458Z" }, + { url = "https://files.pythonhosted.org/packages/bb/79/92140484e68bf202431b2644616c97e726180e396f2818889ce22d9ec7a7/ddtrace-4.3.0-cp313-cp313-macosx_14_0_arm64.whl", hash = "sha256:8c84bd599d661ed6424460e3c6111065c5a7c978d28f5d47cb06369ea58e6a07", size = 6639422, upload-time = "2026-01-27T20:54:09.134Z" }, + { url = "https://files.pythonhosted.org/packages/b9/c7/d95dbc4953ad5d4c1d424547e5df397098429bf0e147968e943d6e0f3623/ddtrace-4.3.0-cp313-cp313-macosx_14_0_x86_64.whl", hash = "sha256:e1a8227d354d044b737def7711c275085e9b765c4d93f84e522d93675e03c318", size = 7045829, upload-time = "2026-01-27T20:54:12.636Z" }, + { url = "https://files.pythonhosted.org/packages/23/3d/714a0875ade37153da0450b07a2bd0eb810ad0f2078c8876ea4af75881cf/ddtrace-4.3.0-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:c4cd4d89339adf4a9c114282d03f4db498b0092d56bee145ddb99033fb51be18", size = 7714579, upload-time = "2026-01-27T20:54:14.812Z" }, + { url = "https://files.pythonhosted.org/packages/2a/1c/f89d6c7de4640239618cae7df96c46099e5ba53168ce5641b40cd302092b/ddtrace-4.3.0-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:6c9ec118e2a41da593ec2d2f6365ba104aaf3b46296e0a4c30556aed26615ac5", size = 7998564, upload-time = "2026-01-27T20:54:18.854Z" }, + { url = "https://files.pythonhosted.org/packages/b7/43/f22586a3851b674c4e61cd630682fa47f5a724fb7686f87a415d93f355fd/ddtrace-4.3.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:aa168e581431a3b3ee9c04d76922cae2f3fdfb4520927add5a844e7e2ebb807e", size = 8729607, upload-time = "2026-01-27T20:54:21.319Z" }, + { url = "https://files.pythonhosted.org/packages/02/9d/b1a92066fc2668f715ca77292d73ae1554290edb5ffac710dbc84aa1777a/ddtrace-4.3.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:eed721dcd5cf1f4f4309a28efa5e1cb7d7da129fd51a3e093422fe064bd451f1", size = 9065926, upload-time = "2026-01-27T20:54:24.447Z" }, + { url = "https://files.pythonhosted.org/packages/72/92/6bf49559d2fe06589d7cc967085fc878ec652172a8d203ed22f8c6ab71e0/ddtrace-4.3.0-cp313-cp313-win32.whl", hash = "sha256:9917c49b33f32c524f74813cb03461c207324711b0a2d359e3a3822181cb5643", size = 5107720, upload-time = "2026-01-27T20:54:27.614Z" }, + { url = "https://files.pythonhosted.org/packages/2d/94/37a07b2576dfbbef5034e595be385ab325eebfd735e0eda80cf5ae0facd1/ddtrace-4.3.0-cp313-cp313-win_amd64.whl", hash = "sha256:ea86989b93af5d415ba1457d3c363a59665a907807a51072b43abf5901872078", size = 5643119, upload-time = "2026-01-27T20:54:31.537Z" }, + { url = "https://files.pythonhosted.org/packages/c6/1d/d4466708a5ace94a655f3af804c1a666bc05b6463c5892e561eca0497922/ddtrace-4.3.0-cp313-cp313-win_arm64.whl", hash = "sha256:e983bc15b5eabd9e25b02617702e8621c014c71dc123a117079d3ced29446433", size = 5357966, upload-time = "2026-01-27T20:54:35.411Z" }, + { url = "https://files.pythonhosted.org/packages/82/75/10b07479800a5a8947fd0e79001b009bded2a17ea5af96865d677eb91a98/ddtrace-4.3.0-cp314-cp314-macosx_14_0_arm64.whl", hash = "sha256:e26eb6de7eda425d75f5a1f55e55ad2d13e56f51b43c4b656478367a6692e0bd", size = 6904866, upload-time = "2026-01-27T20:54:38.633Z" }, + { url = "https://files.pythonhosted.org/packages/0e/b2/37f8cf8f57d17f350d2ab86ee814fc5b6c600d0ea2ee2ea8f96be1178cd0/ddtrace-4.3.0-cp314-cp314-macosx_14_0_x86_64.whl", hash = "sha256:f7ce739a6ef9b4d210a746327d377234b1996080028eddbe9c6a1f35193c348e", size = 7329967, upload-time = "2026-01-27T20:54:41.296Z" }, + { url = "https://files.pythonhosted.org/packages/19/c7/61b9a857f7b43234b896fd5e80d994f9efa007b0980887bf6d4d48ab6c20/ddtrace-4.3.0-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:0dff123cc9e39ff393c164198bb166270bcc826a87009af9b4f1431653aef531", size = 7721410, upload-time = "2026-01-27T20:54:43.85Z" }, + { url = "https://files.pythonhosted.org/packages/e1/38/c2e18f707ec222aa33af297dba967b2423559b058b92bfd0e6fd00c74a14/ddtrace-4.3.0-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:80a75fdf1d1717ea6e9d32d33019d0e76c2a38ea55b03dcbb45ad1af5f19079a", size = 8001195, upload-time = "2026-01-27T20:54:46.63Z" }, + { url = "https://files.pythonhosted.org/packages/32/2c/5912ad2ec39f8fa9250fa3f862156de00dbce86a702bf6e78f95f6ef1de7/ddtrace-4.3.0-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:074ac2d7a5f7dfa719b36a442b9b08842e698aa50061812a917c92141e020e1c", size = 8738876, upload-time = "2026-01-27T20:54:49.294Z" }, + { url = "https://files.pythonhosted.org/packages/af/0c/5a4098c258da2cc97160fb1735f57bad6048c6c980d24ecf8e58232fb15d/ddtrace-4.3.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:7c2a15dd28081ab305f9b7463446fa1bb4d3339744b8bff044837039726b1115", size = 9070879, upload-time = "2026-01-27T20:54:52.155Z" }, + { url = "https://files.pythonhosted.org/packages/a1/0b/60ab4556ef979a2d8b48328d778c2f521648f9ebf0518175d6cb61ae60ea/ddtrace-4.3.0-cp314-cp314-win32.whl", hash = "sha256:ce347b54d57686a90f36fb419f778379a00ce5d5ba6aacb79ccfde6c5f3e05b4", size = 5199611, upload-time = "2026-01-27T20:54:55.326Z" }, + { url = "https://files.pythonhosted.org/packages/0b/9d/dd17ae53fa30abc5ec0d4e53fd78768fef745acd3c2cc5067b75eb49af69/ddtrace-4.3.0-cp314-cp314-win_amd64.whl", hash = "sha256:cbeb4e4d2ec5eab248e34432f24e7d318f55031d3a6d39b540ebdebf51e55080", size = 5774168, upload-time = "2026-01-27T20:54:58.196Z" }, + { url = "https://files.pythonhosted.org/packages/3a/29/85c3372abf028f4c8da9f485bc814100e04c6e1b1b92db49bcb497ef0023/ddtrace-4.3.0-cp314-cp314-win_arm64.whl", hash = "sha256:d4b1c98336fd7b096b0b3a7baa095efba67919e6b4cafafe2cae16b17306dc30", size = 5500574, upload-time = "2026-01-27T20:55:00.865Z" }, +] + +[[package]] +name = "debugpy" +version = "1.8.20" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/e0/b7/cd8080344452e4874aae67c40d8940e2b4d47b01601a8fd9f44786c757c7/debugpy-1.8.20.tar.gz", hash = "sha256:55bc8701714969f1ab89a6d5f2f3d40c36f91b2cbe2f65d98bf8196f6a6a2c33", size = 1645207, upload-time = "2026-01-29T23:03:28.199Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/51/56/c3baf5cbe4dd77427fd9aef99fcdade259ad128feeb8a786c246adb838e5/debugpy-1.8.20-cp311-cp311-macosx_15_0_universal2.whl", hash = "sha256:eada6042ad88fa1571b74bd5402ee8b86eded7a8f7b827849761700aff171f1b", size = 2208318, upload-time = "2026-01-29T23:03:36.481Z" }, + { url = "https://files.pythonhosted.org/packages/9a/7d/4fa79a57a8e69fe0d9763e98d1110320f9ecd7f1f362572e3aafd7417c9d/debugpy-1.8.20-cp311-cp311-manylinux_2_34_x86_64.whl", hash = "sha256:7de0b7dfeedc504421032afba845ae2a7bcc32ddfb07dae2c3ca5442f821c344", size = 3171493, upload-time = "2026-01-29T23:03:37.775Z" }, + { url = "https://files.pythonhosted.org/packages/7d/f2/1e8f8affe51e12a26f3a8a8a4277d6e60aa89d0a66512f63b1e799d424a4/debugpy-1.8.20-cp311-cp311-win32.whl", hash = "sha256:773e839380cf459caf73cc533ea45ec2737a5cc184cf1b3b796cd4fd98504fec", size = 5209240, upload-time = "2026-01-29T23:03:39.109Z" }, + { url = "https://files.pythonhosted.org/packages/d5/92/1cb532e88560cbee973396254b21bece8c5d7c2ece958a67afa08c9f10dc/debugpy-1.8.20-cp311-cp311-win_amd64.whl", hash = "sha256:1f7650546e0eded1902d0f6af28f787fa1f1dbdbc97ddabaf1cd963a405930cb", size = 5233481, upload-time = "2026-01-29T23:03:40.659Z" }, + { url = "https://files.pythonhosted.org/packages/14/57/7f34f4736bfb6e00f2e4c96351b07805d83c9a7b33d28580ae01374430f7/debugpy-1.8.20-cp312-cp312-macosx_15_0_universal2.whl", hash = "sha256:4ae3135e2089905a916909ef31922b2d733d756f66d87345b3e5e52b7a55f13d", size = 2550686, upload-time = "2026-01-29T23:03:42.023Z" }, + { url = "https://files.pythonhosted.org/packages/ab/78/b193a3975ca34458f6f0e24aaf5c3e3da72f5401f6054c0dfd004b41726f/debugpy-1.8.20-cp312-cp312-manylinux_2_34_x86_64.whl", hash = "sha256:88f47850a4284b88bd2bfee1f26132147d5d504e4e86c22485dfa44b97e19b4b", size = 4310588, upload-time = "2026-01-29T23:03:43.314Z" }, + { url = "https://files.pythonhosted.org/packages/c1/55/f14deb95eaf4f30f07ef4b90a8590fc05d9e04df85ee379712f6fb6736d7/debugpy-1.8.20-cp312-cp312-win32.whl", hash = "sha256:4057ac68f892064e5f98209ab582abfee3b543fb55d2e87610ddc133a954d390", size = 5331372, upload-time = "2026-01-29T23:03:45.526Z" }, + { url = "https://files.pythonhosted.org/packages/a1/39/2bef246368bd42f9bd7cba99844542b74b84dacbdbea0833e610f384fee8/debugpy-1.8.20-cp312-cp312-win_amd64.whl", hash = "sha256:a1a8f851e7cf171330679ef6997e9c579ef6dd33c9098458bd9986a0f4ca52e3", size = 5372835, upload-time = "2026-01-29T23:03:47.245Z" }, + { url = "https://files.pythonhosted.org/packages/15/e2/fc500524cc6f104a9d049abc85a0a8b3f0d14c0a39b9c140511c61e5b40b/debugpy-1.8.20-cp313-cp313-macosx_15_0_universal2.whl", hash = "sha256:5dff4bb27027821fdfcc9e8f87309a28988231165147c31730128b1c983e282a", size = 2539560, upload-time = "2026-01-29T23:03:48.738Z" }, + { url = "https://files.pythonhosted.org/packages/90/83/fb33dcea789ed6018f8da20c5a9bc9d82adc65c0c990faed43f7c955da46/debugpy-1.8.20-cp313-cp313-manylinux_2_34_x86_64.whl", hash = "sha256:84562982dd7cf5ebebfdea667ca20a064e096099997b175fe204e86817f64eaf", size = 4293272, upload-time = "2026-01-29T23:03:50.169Z" }, + { url = "https://files.pythonhosted.org/packages/a6/25/b1e4a01bfb824d79a6af24b99ef291e24189080c93576dfd9b1a2815cd0f/debugpy-1.8.20-cp313-cp313-win32.whl", hash = "sha256:da11dea6447b2cadbf8ce2bec59ecea87cc18d2c574980f643f2d2dfe4862393", size = 5331208, upload-time = "2026-01-29T23:03:51.547Z" }, + { url = "https://files.pythonhosted.org/packages/13/f7/a0b368ce54ffff9e9028c098bd2d28cfc5b54f9f6c186929083d4c60ba58/debugpy-1.8.20-cp313-cp313-win_amd64.whl", hash = "sha256:eb506e45943cab2efb7c6eafdd65b842f3ae779f020c82221f55aca9de135ed7", size = 5372930, upload-time = "2026-01-29T23:03:53.585Z" }, + { url = "https://files.pythonhosted.org/packages/33/2e/f6cb9a8a13f5058f0a20fe09711a7b726232cd5a78c6a7c05b2ec726cff9/debugpy-1.8.20-cp314-cp314-macosx_15_0_universal2.whl", hash = "sha256:9c74df62fc064cd5e5eaca1353a3ef5a5d50da5eb8058fcef63106f7bebe6173", size = 2538066, upload-time = "2026-01-29T23:03:54.999Z" }, + { url = "https://files.pythonhosted.org/packages/c5/56/6ddca50b53624e1ca3ce1d1e49ff22db46c47ea5fb4c0cc5c9b90a616364/debugpy-1.8.20-cp314-cp314-manylinux_2_34_x86_64.whl", hash = "sha256:077a7447589ee9bc1ff0cdf443566d0ecf540ac8aa7333b775ebcb8ce9f4ecad", size = 4269425, upload-time = "2026-01-29T23:03:56.518Z" }, + { url = "https://files.pythonhosted.org/packages/c5/d9/d64199c14a0d4c476df46c82470a3ce45c8d183a6796cfb5e66533b3663c/debugpy-1.8.20-cp314-cp314-win32.whl", hash = "sha256:352036a99dd35053b37b7803f748efc456076f929c6a895556932eaf2d23b07f", size = 5331407, upload-time = "2026-01-29T23:03:58.481Z" }, + { url = "https://files.pythonhosted.org/packages/e0/d9/1f07395b54413432624d61524dfd98c1a7c7827d2abfdb8829ac92638205/debugpy-1.8.20-cp314-cp314-win_amd64.whl", hash = "sha256:a98eec61135465b062846112e5ecf2eebb855305acc1dfbae43b72903b8ab5be", size = 5372521, upload-time = "2026-01-29T23:03:59.864Z" }, + { url = "https://files.pythonhosted.org/packages/e0/c3/7f67dea8ccf8fdcb9c99033bbe3e90b9e7395415843accb81428c441be2d/debugpy-1.8.20-py2.py3-none-any.whl", hash = "sha256:5be9bed9ae3be00665a06acaa48f8329d2b9632f15fd09f6a9a8c8d9907e54d7", size = 5337658, upload-time = "2026-01-29T23:04:17.404Z" }, +] + +[[package]] +name = "decorator" +version = "5.3.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/60/8b/32f9823da46cde7df2087faa08cd98d01b908f8dcab982cdba9c84e85355/decorator-5.3.1.tar.gz", hash = "sha256:4cbcdd55a6efadb9dbea26b858f4fb3264567b52d69ca0d25b721b553f60ea82", size = 58084, upload-time = "2026-05-18T06:03:28.057Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/05/7f/798705f5296a58ca505d600456748d1be48078eac8a7050d8a98bc9edb89/decorator-5.3.1-py3-none-any.whl", hash = "sha256:f47fe6fdbd2edd623ecfe36875d37aba411624e2670dd395dddae1358689bb3c", size = 10365, upload-time = "2026-05-18T06:03:26.517Z" }, +] + +[[package]] +name = "defusedxml" +version = "0.7.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/0f/d5/c66da9b79e5bdb124974bfe172b4daf3c984ebd9c2a06e2b8a4dc7331c72/defusedxml-0.7.1.tar.gz", hash = "sha256:1bb3032db185915b62d7c6209c5a8792be6a32ab2fedacc84e01b52c51aa3e69", size = 75520, upload-time = "2021-03-08T10:59:26.269Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/07/6c/aa3f2f849e01cb6a001cd8554a88d4c77c5c1a31c95bdf1cf9301e6d9ef4/defusedxml-0.7.1-py2.py3-none-any.whl", hash = "sha256:a352e7e428770286cc899e2542b6cdaedb2b4953ff269a210103ec58f6198a61", size = 25604, upload-time = "2021-03-08T10:59:24.45Z" }, +] + +[[package]] +name = "dnspython" +version = "2.8.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/8c/8b/57666417c0f90f08bcafa776861060426765fdb422eb10212086fb811d26/dnspython-2.8.0.tar.gz", hash = "sha256:181d3c6996452cb1189c4046c61599b84a5a86e099562ffde77d26984ff26d0f", size = 368251, upload-time = "2025-09-07T18:58:00.022Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/ba/5a/18ad964b0086c6e62e2e7500f7edc89e3faa45033c71c1893d34eed2b2de/dnspython-2.8.0-py3-none-any.whl", hash = "sha256:01d9bbc4a2d76bf0db7c1f729812ded6d912bd318d3b1cf81d30c0f845dbf3af", size = 331094, upload-time = "2025-09-07T18:57:58.071Z" }, +] + +[[package]] +name = "entrypoints" +version = "0.4" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/ea/8d/a7121ffe5f402dc015277d2d31eb82d2187334503a011c18f2e78ecbb9b2/entrypoints-0.4.tar.gz", hash = "sha256:b706eddaa9218a19ebcd67b56818f05bb27589b1ca9e8d797b74affad4ccacd4", size = 13974, upload-time = "2022-02-02T21:30:28.172Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/35/a8/365059bbcd4572cbc41de17fd5b682be5868b218c3c5479071865cab9078/entrypoints-0.4-py3-none-any.whl", hash = "sha256:f174b5ff827504fd3cd97cc3f8649f3693f51538c7e4bdf3ef002c8429d42f9f", size = 5294, upload-time = "2022-02-02T21:30:26.024Z" }, +] + +[[package]] +name = "envier" +version = "0.6.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/19/e7/4fe4d3f6e21213cea9bcddc36ba60e6ae4003035f9ce8055e6a9f0322ddb/envier-0.6.1.tar.gz", hash = "sha256:3309a01bb3d8850c9e7a31a5166d5a836846db2faecb79b9cb32654dd50ca9f9", size = 10063, upload-time = "2024-10-22T09:56:47.226Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/56/e9/30493b1cc967f7c07869de4b2ab3929151a58e6bb04495015554d24b61db/envier-0.6.1-py3-none-any.whl", hash = "sha256:73609040a76be48bbcb97074d9969666484aa0de706183a6e9ef773156a8a6a9", size = 10638, upload-time = "2024-10-22T09:56:45.968Z" }, +] + +[[package]] +name = "execnet" +version = "2.1.2" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/bf/89/780e11f9588d9e7128a3f87788354c7946a9cbb1401ad38a48c4db9a4f07/execnet-2.1.2.tar.gz", hash = "sha256:63d83bfdd9a23e35b9c6a3261412324f964c2ec8dcd8d3c6916ee9373e0befcd", size = 166622, upload-time = "2025-11-12T09:56:37.75Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/ab/84/02fc1827e8cdded4aa65baef11296a9bbe595c474f0d6d758af082d849fd/execnet-2.1.2-py3-none-any.whl", hash = "sha256:67fba928dd5a544b783f6056f449e5e3931a5c378b128bc18501f7ea79e296ec", size = 40708, upload-time = "2025-11-12T09:56:36.333Z" }, +] + +[[package]] +name = "executing" +version = "2.2.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/cc/28/c14e053b6762b1044f34a13aab6859bbf40456d37d23aa286ac24cfd9a5d/executing-2.2.1.tar.gz", hash = "sha256:3632cc370565f6648cc328b32435bd120a1e4ebb20c77e3fdde9a13cd1e533c4", size = 1129488, upload-time = "2025-09-01T09:48:10.866Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/c1/ea/53f2148663b321f21b5a606bd5f191517cf40b7072c0497d3c92c4a13b1e/executing-2.2.1-py2.py3-none-any.whl", hash = "sha256:760643d3452b4d777d295bb167ccc74c64a81df23fb5e08eff250c425a4b2017", size = 28317, upload-time = "2025-09-01T09:48:08.5Z" }, +] + +[[package]] +name = "fastapi" +version = "0.136.3" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "annotated-doc" }, + { name = "pydantic" }, + { name = "starlette" }, + { name = "typing-extensions" }, + { name = "typing-inspection" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/81/2d/ff8d91d7b564d464629a0fd50a4489c97fcb836ac230bf3a7269232a9b1f/fastapi-0.136.3.tar.gz", hash = "sha256:e487fae93ad408e6f47641ee4dfe389864fd7bec92e547ea8498fc13f43e83ab", size = 396410, upload-time = "2026-05-23T18:53:15.192Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/e0/82/45359b62a067409bd929ae8a56b8ed13e5a8c8a61194b3c236920999ab83/fastapi-0.136.3-py3-none-any.whl", hash = "sha256:3d2a69bdf04b7e9f3afa292c3bc7a98816bbfafa10bc9b45f3f3700d2f761620", size = 117481, upload-time = "2026-05-23T18:53:16.924Z" }, +] + +[[package]] +name = "fastjsonschema" +version = "2.21.2" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/20/b5/23b216d9d985a956623b6bd12d4086b60f0059b27799f23016af04a74ea1/fastjsonschema-2.21.2.tar.gz", hash = "sha256:b1eb43748041c880796cd077f1a07c3d94e93ae84bba5ed36800a33554ae05de", size = 374130, upload-time = "2025-08-14T18:49:36.666Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/cb/a8/20d0723294217e47de6d9e2e40fd4a9d2f7c4b6ef974babd482a59743694/fastjsonschema-2.21.2-py3-none-any.whl", hash = "sha256:1c797122d0a86c5cace2e54bf4e819c36223b552017172f32c5c024a6b77e463", size = 24024, upload-time = "2025-08-14T18:49:34.776Z" }, +] + +[[package]] +name = "fastnumbers" +version = "5.1.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/75/bf/c69642300a98e8b61047fa17ee7c925a8e65a12e194e98dda7ec1eefaf4b/fastnumbers-5.1.1.tar.gz", hash = "sha256:183fa021cdc052edaeede5c23e3086461deb7562b567614edf71b29515f5fa4b", size = 193827, upload-time = "2024-12-15T07:28:51.124Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/f9/2d/79b651d72295541d06f9f413767a901726e7de7748f908db6d5962f2afbe/fastnumbers-5.1.1-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:ac49a019283a737b887f5fa50e8d1670cfd2f685256a7f31a8da33b70df701e1", size = 304396, upload-time = "2024-12-15T07:26:49.733Z" }, + { url = "https://files.pythonhosted.org/packages/ee/41/b41ca8b75a0760b81b9a5e859ea1c366f644e119615fe3feb1e30ade1652/fastnumbers-5.1.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:a00d105ba2484360d39cf514a16e97e1f66cf053fcc7afd16f95dbbb6de8ed9d", size = 171738, upload-time = "2024-12-15T07:26:52.336Z" }, + { url = "https://files.pythonhosted.org/packages/ff/c3/bdc36067cf111cd2f84e7877e0cbdf3bed5fb179fc2f6c969e79ff9fa693/fastnumbers-5.1.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:216cb1e3f600ff91164c85379241a4f77ed7d1f8e65ffae4ccf3ef34662b9d8a", size = 170015, upload-time = "2024-12-15T07:26:55.003Z" }, + { url = "https://files.pythonhosted.org/packages/b5/6e/7235825baa8b60286c5b0ae605f778db9047be14529f44cc31159014806d/fastnumbers-5.1.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:feb3f3114a3a847f0896ca3d563bf61e3a95ebf51d2308170aed5a7aad88fec3", size = 1664356, upload-time = "2024-12-15T07:26:56.893Z" }, + { url = "https://files.pythonhosted.org/packages/de/6e/fe8c4bde25d38862e98843b50c891068865d75113b2701436a7a4f950231/fastnumbers-5.1.1-cp311-cp311-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b65dfb82b3a5cdd0ac53227b5caae47d98034ae4a8966de89e2ac58639ba14a4", size = 1686830, upload-time = "2024-12-15T07:26:59.857Z" }, + { url = "https://files.pythonhosted.org/packages/f2/37/47727d28780978ba8969524ee2e0545f74080383497574e7df17ff41a19a/fastnumbers-5.1.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:cf7e72ea226a8a1289045f5dfc86d685c2890322f754f8f8eabcb30cf2bef9f2", size = 1675741, upload-time = "2024-12-15T07:27:02.966Z" }, + { url = "https://files.pythonhosted.org/packages/11/fc/0e8da8c4692ba6a4f7d91e62bf6579fcd0fa8a72fe6f768d5244cf70f3fb/fastnumbers-5.1.1-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:18160ce6b574e230204774d12a8a00bb5868dc22bf28e445117ca26a8b9a6fff", size = 2424526, upload-time = "2024-12-15T07:27:04.638Z" }, + { url = "https://files.pythonhosted.org/packages/9c/a4/48f03bca7f8c3d326d8b1c6b1d0fc94630f12a1be414d25049272dfb62e9/fastnumbers-5.1.1-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:1681e2b37628ea5a3dc43dfc0a4e3f6eebf388d76c91f69b48e9fe1431c2d9ea", size = 2575006, upload-time = "2024-12-15T07:27:07.765Z" }, + { url = "https://files.pythonhosted.org/packages/6b/38/c5361fdf085a78d934e6d503e94fed183db436aa9958816783b0b7a2d192/fastnumbers-5.1.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:1ab4faa10b35dc3ea53d83a4107a3b338a39cf500d2f6e0a44f930ad694fa0a9", size = 2516000, upload-time = "2024-12-15T07:27:09.443Z" }, + { url = "https://files.pythonhosted.org/packages/46/16/34109c8a27e016799b2538a03184d4d59a66787432b8d5bf5d1fbc403ac5/fastnumbers-5.1.1-cp311-cp311-win32.whl", hash = "sha256:98b9da1a3565f939800b99471e1cb678744e3dd761571bc0b2b03794dd884039", size = 117636, upload-time = "2024-12-15T07:27:12.234Z" }, + { url = "https://files.pythonhosted.org/packages/a1/3a/899bf5fe59aaee646b453b106c1d0cf978574732f0650b99ba004c261059/fastnumbers-5.1.1-cp311-cp311-win_amd64.whl", hash = "sha256:62c97b9141b052ecbebee1e9fbdfa7db67685602cf847bb7620eb71e5afe18b5", size = 126010, upload-time = "2024-12-15T07:27:14.667Z" }, + { url = "https://files.pythonhosted.org/packages/bf/8c/69a7884c3584bd92daac3b923fb49a10b2ee018d7259e8f0be03ea301f96/fastnumbers-5.1.1-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:e57b377419c89c23cd411abe19b911fea3879db71733751f4dd0f4504d623325", size = 305660, upload-time = "2024-12-15T07:27:16.025Z" }, + { url = "https://files.pythonhosted.org/packages/51/27/207a1b9298380e971abd7640021b71b72fda844e5d5931e85031bc6db6b2/fastnumbers-5.1.1-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:d80ecd57144c20140383ada74c7ee0f8464940d8931c04d4bdd73917200e82ef", size = 172460, upload-time = "2024-12-15T07:27:17.431Z" }, + { url = "https://files.pythonhosted.org/packages/bf/91/8601841ee9cad8628a5386131c53891777836cc6ad678bcff90d8210bd40/fastnumbers-5.1.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:12270ace75facc55426e81e94ab81e8ac0449b78775c2255af3d4a901e90b6f3", size = 170666, upload-time = "2024-12-15T07:27:19.148Z" }, + { url = "https://files.pythonhosted.org/packages/ac/00/4a3e50b1bdf6aa3b48d78ac111b9ddf61401087b1d00249f9b16ba181eb1/fastnumbers-5.1.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:68e8e2da55134e6f3680ced0799eaad00db2ed7e31b7b12e412c7af834927d15", size = 1667289, upload-time = "2024-12-15T07:27:20.501Z" }, + { url = "https://files.pythonhosted.org/packages/fc/53/d0ecbb31cd60c0bf9ef4ba4de1f56d9665bea4a142a649aa6d9316afdc40/fastnumbers-5.1.1-cp312-cp312-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3898a65a4658c9f94e4765d0a9403e9dc2b84ce707fd464b6457c809f4ca0379", size = 1690950, upload-time = "2024-12-15T07:27:22.323Z" }, + { url = "https://files.pythonhosted.org/packages/ea/0b/a7b94e4317e18939807615e7c14072f0e307fc0ba83d1548df8e4f8f07da/fastnumbers-5.1.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:95289b099deb8b3d7083866648865d542abeee722ede0dea188809ddfb0942d1", size = 1679465, upload-time = "2024-12-15T07:27:24.42Z" }, + { url = "https://files.pythonhosted.org/packages/2b/33/efe5b3a25cb35dd6da48a06c44b22b164bd5d245ade0e85423b03cc574d7/fastnumbers-5.1.1-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:95682f60228f035ea83cb3ba102e5ca1e980cccedc7532b39e05fff93ea0ec64", size = 2435702, upload-time = "2024-12-15T07:27:27.334Z" }, + { url = "https://files.pythonhosted.org/packages/6a/43/ebf6f98789108a507b28bc1c88e0328ba6ab4f46331ffae1704141909643/fastnumbers-5.1.1-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:e9683a12e357034fb0d4cfb291bb799b16c791bb224b9c05a39dfefcfc2e673d", size = 2590379, upload-time = "2024-12-15T07:27:29.033Z" }, + { url = "https://files.pythonhosted.org/packages/a1/09/02723ada3b2e4aec94bd7f48bc6f1053a5a4157d872e4279a3fbd078219e/fastnumbers-5.1.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:c092c186d36e8d27aee8e864e03aaaf219a51ee940d4a6356964d89ce8f34058", size = 2521780, upload-time = "2024-12-15T07:27:31.227Z" }, + { url = "https://files.pythonhosted.org/packages/fd/e6/2604e241c405db3540e3e7c35d025275b560e1b6eec6f78e72cc2d220351/fastnumbers-5.1.1-cp312-cp312-win32.whl", hash = "sha256:60e9d5515dfc2898a1a6f93dac7ef3406a2b122ff37eaa732b57df3bc7c93862", size = 117125, upload-time = "2024-12-15T07:27:33.751Z" }, + { url = "https://files.pythonhosted.org/packages/53/02/f3b4ce4f9c7ae2b88a825a52dcb0a9b8b13b70bdcf5066c8598252a04acd/fastnumbers-5.1.1-cp312-cp312-win_amd64.whl", hash = "sha256:070b81b10207b2f7c3bd98c1825f3c0adb6c7e18238f851572d51c882877bc02", size = 127192, upload-time = "2024-12-15T07:27:35.454Z" }, + { url = "https://files.pythonhosted.org/packages/3d/82/c37be55714cc97d68f8430726cd4880cf8d82da316fc4cad820480a274c8/fastnumbers-5.1.1-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:7109d06161000a75d8e4a2f4eb6ed3cb19d3472f5497e64b9df70f4e8ea22090", size = 305660, upload-time = "2024-12-15T07:27:38.306Z" }, + { url = "https://files.pythonhosted.org/packages/93/00/480be84bfc962ceb3cf39058acd09cd5011de6f0496bfc5fd112455d6804/fastnumbers-5.1.1-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:544e905de42679e3e80cdfb5f0f8185b498a206d33a9365f896d8842b9544550", size = 172457, upload-time = "2024-12-15T07:27:39.764Z" }, + { url = "https://files.pythonhosted.org/packages/89/16/de7c3e2b9a604bfdb0f3a905152e64c53064022e432b46f4626c931698a0/fastnumbers-5.1.1-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:e8e40437eafef22aa5ebc80f44d0f9cdf984538b3c05f57500b24695ed63b8b2", size = 170661, upload-time = "2024-12-15T07:27:41.526Z" }, + { url = "https://files.pythonhosted.org/packages/3b/62/247856faac56f08094be27db152604c10c1419feeb8d998495d2929a8fea/fastnumbers-5.1.1-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2b1831fe49d44a91e2803db231696979e6ae1d30e67679c201b7c69cfb815a19", size = 1667006, upload-time = "2024-12-15T07:27:47.52Z" }, + { url = "https://files.pythonhosted.org/packages/4b/a7/1071c2a49c1079f57c9a647352e819e08679f6187b10ad395c1c02885587/fastnumbers-5.1.1-cp313-cp313-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:9421b79e788cc9ec9266c6cfa8306d1e17f4abf0d1c1fb173d4328cc57955b61", size = 1690719, upload-time = "2024-12-15T07:27:49.222Z" }, + { url = "https://files.pythonhosted.org/packages/2f/72/bd9e62e5b0303e1c0a9682b4de3e65b0c1a8eec2ef721fe0b26829a9879e/fastnumbers-5.1.1-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:517e91bd9fd0e664eb8a81759c79e38675a94bfac8892dbc274f7430ae5be451", size = 1679059, upload-time = "2024-12-15T07:27:51.186Z" }, + { url = "https://files.pythonhosted.org/packages/92/b1/8218c61638873d74eb7518cf4bac2d7192a328efbdc780fd8a05d91008aa/fastnumbers-5.1.1-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:4479d85f246728ea5737b28ed3730cc4dbc1002bcf788ce32f9ffcb730150fa3", size = 2436131, upload-time = "2024-12-15T07:27:54.837Z" }, + { url = "https://files.pythonhosted.org/packages/f6/2b/06e947b27ca76b4ebf30363500719f27d8cdbf4b286760e3ef941b3d1308/fastnumbers-5.1.1-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:c738099125cbb0a559a59c14165090a545a892f16db102aa1f5fb930fa1a2b13", size = 2590343, upload-time = "2024-12-15T07:27:57.974Z" }, + { url = "https://files.pythonhosted.org/packages/58/41/cf5333d1013ba5afb21b40565d1c1ed0114d97b7e0ef230659ead17b870e/fastnumbers-5.1.1-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:ca0a72d750d5d78857fa5c7f9ff4645c86793b7a63ae0b6b32ef1a27af9ae398", size = 2521775, upload-time = "2024-12-15T07:27:59.694Z" }, + { url = "https://files.pythonhosted.org/packages/2c/14/fb3e0c1b92dc633da708c7438c564bdfb8c4757ad0ce1f4bf80f3fa7d0b9/fastnumbers-5.1.1-cp313-cp313-win32.whl", hash = "sha256:dc2442ceb236f4680c87aa54d1f94bd8fc4b6db8dc9ac94e602da0924aac279f", size = 117134, upload-time = "2024-12-15T07:28:01.359Z" }, + { url = "https://files.pythonhosted.org/packages/5d/af/47ce3856e5d6a10aae37dbf903c295c36702bf78d1f30c7c213460f46453/fastnumbers-5.1.1-cp313-cp313-win_amd64.whl", hash = "sha256:91a69ce09fb5079bd680464b2d850be82f5516ed67360381c9d9935431c31bc4", size = 127195, upload-time = "2024-12-15T07:28:02.617Z" }, +] + +[[package]] +name = "filetype" +version = "1.2.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/bb/29/745f7d30d47fe0f251d3ad3dc2978a23141917661998763bebb6da007eb1/filetype-1.2.0.tar.gz", hash = "sha256:66b56cd6474bf41d8c54660347d37afcc3f7d1970648de365c102ef77548aadb", size = 998020, upload-time = "2022-11-02T17:34:04.141Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/18/79/1b8fa1bb3568781e84c9200f951c735f3f157429f44be0495da55894d620/filetype-1.2.0-py2.py3-none-any.whl", hash = "sha256:7ce71b6880181241cf7ac8697a2f1eb6a8bd9b429f7ad6d27b8db9ba5f1c2d25", size = 19970, upload-time = "2022-11-02T17:34:01.425Z" }, +] + +[[package]] +name = "flake8" +version = "7.3.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "mccabe" }, + { name = "pycodestyle" }, + { name = "pyflakes" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/9b/af/fbfe3c4b5a657d79e5c47a2827a362f9e1b763336a52f926126aa6dc7123/flake8-7.3.0.tar.gz", hash = "sha256:fe044858146b9fc69b551a4b490d69cf960fcb78ad1edcb84e7fbb1b4a8e3872", size = 48326, upload-time = "2025-06-20T19:31:35.838Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/9f/56/13ab06b4f93ca7cac71078fbe37fcea175d3216f31f85c3168a6bbd0bb9a/flake8-7.3.0-py2.py3-none-any.whl", hash = "sha256:b9696257b9ce8beb888cdbe31cf885c90d31928fe202be0889a7cdafad32f01e", size = 57922, upload-time = "2025-06-20T19:31:34.425Z" }, +] + +[[package]] +name = "flasgger-tschaume" +version = "0.9.7" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "flask" }, + { name = "jsonschema" }, + { name = "mistune" }, + { name = "pyyaml" }, + { name = "six" }, + { name = "werkzeug" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/ad/9a/94f78b4865f30402dd56f343d0d7487b2d6fce3137a3579a18aa49981bd8/flasgger-tschaume-0.9.7.tar.gz", hash = "sha256:139bd4686387e69019af2a86c0eacbd00bf30df0c7470ea55120646cab2ae446", size = 4227116, upload-time = "2022-10-21T23:24:14.25Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/97/a7/f6b8b0d622449b0e63869d64c3ad19d67b5e86e1bad60e3c34cbb9dc2ca6/flasgger_tschaume-0.9.7-py2.py3-none-any.whl", hash = "sha256:ee0c55f76c5884704649d139f042050af5d6f1d5a60cae167e3123735720302c", size = 3864468, upload-time = "2022-10-21T23:24:11.541Z" }, +] + +[[package]] +name = "flask" +version = "2.2.5" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "click" }, + { name = "itsdangerous" }, + { name = "jinja2" }, + { name = "werkzeug" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/5f/76/a4d2c4436dda4b0a12c71e075c508ea7988a1066b06a575f6afe4fecc023/Flask-2.2.5.tar.gz", hash = "sha256:edee9b0a7ff26621bd5a8c10ff484ae28737a2410d99b0bb9a6850c7fb977aa0", size = 697814, upload-time = "2023-05-02T14:42:36.742Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/9f/1a/8b6d48162861009d1e017a9740431c78d860809773b66cac220a11aa3310/Flask-2.2.5-py3-none-any.whl", hash = "sha256:58107ed83443e86067e41eff4631b058178191a355886f8e479e347fa1285fdf", size = 101817, upload-time = "2023-05-02T14:42:34.858Z" }, +] + +[[package]] +name = "flask-compress" +version = "1.24" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "backports-zstd", marker = "python_full_version < '3.14'" }, + { name = "brotli", marker = "platform_python_implementation != 'PyPy'" }, + { name = "brotlicffi", marker = "platform_python_implementation == 'PyPy'" }, + { name = "flask" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/c2/de/2ae0118051b38ab53437328074a696f3ee7d61e15bf7454b78a3088e5bc3/flask_compress-1.24.tar.gz", hash = "sha256:14097cefe59ecb3e466d52a6aeb62f34f125a9f7dadf1f33a53e430ce4a50f31", size = 21089, upload-time = "2026-03-31T15:01:39.005Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/4c/0f/fe51e0b2301bbd429af44273a923ff92127b18d13abba5ae5a1d60e8e497/flask_compress-1.24-py3-none-any.whl", hash = "sha256:1e63668eb6e3242bd4f6ad98825a924e3984409be90c125477893d586007d00c", size = 11033, upload-time = "2026-03-31T15:01:37.302Z" }, +] + +[[package]] +name = "flask-marshmallow" +version = "1.4.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "flask" }, + { name = "marshmallow" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/09/43/6e5c19e8abc01f5daf1d3c8ad169c495335390572b8bead3f7e7302131c6/flask_marshmallow-1.4.0.tar.gz", hash = "sha256:98c90a253052c72d2ddddc925539ac33bbd780c6fba86478ffe18e3b89d8b471", size = 40970, upload-time = "2026-02-04T16:07:59.916Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/70/9b/7d0605c6f90d640547c3c9a0b95bc3bb17e252ae0f46f1dbfa90d2e06518/flask_marshmallow-1.4.0-py3-none-any.whl", hash = "sha256:b758fc2c428d0cbee6fd0ccf0d55524fe9e426a86a177dcc0fc8cd71ad4b7c59", size = 12254, upload-time = "2026-02-04T16:07:58.878Z" }, +] + +[[package]] +name = "flask-mongoengine-tschaume" +version = "1.1.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "flask" }, + { name = "mongoengine" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/46/e9/224508e946b975dab42f185ecca6c044a465ebd6fdc23bdc27a85330ea0c/flask-mongoengine-tschaume-1.1.0.tar.gz", hash = "sha256:0c020feb12bb0317a4848e7b191489f89ad0589c9728d4907f5e9635474dd055", size = 235159, upload-time = "2022-10-25T00:40:12.334Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/9f/5b/d947b061b81b25ee061f1eae068c98d0491f990d24d3ad9f16de9c05cd56/flask_mongoengine_tschaume-1.1.0-py3-none-any.whl", hash = "sha256:01fcb556bb616bc4b4bbe83fb019787dc58e565790226182bf9a60ed9fada65d", size = 33610, upload-time = "2022-10-25T00:40:10.809Z" }, +] + +[[package]] +name = "flask-mongorest-mpcontribs" +version = "3.3.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "atlasq-tschaume" }, + { name = "boto3" }, + { name = "fastnumbers" }, + { name = "flask-mongoengine-tschaume" }, + { name = "flask-sse" }, + { name = "flatten-dict" }, + { name = "marshmallow-mongoengine" }, + { name = "mimerender-pr36" }, + { name = "orjson" }, + { name = "pymongo" }, + { name = "python-dateutil" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/73/57/9eafaa2bfe95d9a4b05e8d505cc17e89fbdfcc14feeddc4a2a13eac9a710/flask-mongorest-mpcontribs-3.3.0.tar.gz", hash = "sha256:2db7fc6f341b2cea6c302ed5557941a1d89531e1cd92a8235eba3ac9e1cc6ea2", size = 46223, upload-time = "2023-04-14T21:22:32.787Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/b6/a4/95bbdee9e63c2bed78bb77f98f1fbb4971964383a3b6aa4c526da2852229/flask_mongorest_mpcontribs-3.3.0-py3-none-any.whl", hash = "sha256:f76dc8ef915f1b4ee896110ecbcc4a75a8cb7f33f4ce4387f4b4e2a0b646fa83", size = 26389, upload-time = "2023-04-14T21:22:31.273Z" }, +] + +[[package]] +name = "flask-rq2" +version = "18.3" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "flask" }, + { name = "redis" }, + { name = "rq" }, + { name = "rq-scheduler" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/3a/73/edea2742650daa2b1589e8cb592abe7da5d8ce530642e62f047b205580b7/Flask-RQ2-18.3.tar.gz", hash = "sha256:3ef6395065255447f8e1516ccca24858ba87da1d71a6975e0e3b55256bf04967", size = 29105, upload-time = "2018-12-20T10:53:32.738Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/61/47/341667d55567995f6a54096e4156edaaad645dd7c90133e646ed9ba56968/Flask_RQ2-18.3-py2.py3-none-any.whl", hash = "sha256:abe1e52d3b98abe37e85830a614ba6af864516f1b6cf2229f352f8500eafc5fd", size = 12999, upload-time = "2018-12-20T10:53:31.409Z" }, +] + +[[package]] +name = "flask-sse" +version = "1.0.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "flask" }, + { name = "redis" }, + { name = "six" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/38/31/82586853cb1c0fcc2b8b533891606a779acc0da7d4cda5c8d7f2c2b05a29/Flask-SSE-1.0.0.tar.gz", hash = "sha256:4f84714c2549a45e4f17bfc5f68ee8a9f298b22740a6844404d1c74551f2090d", size = 16190, upload-time = "2021-01-10T18:01:46.269Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/71/83/f9fe86f554a153fdd300fb8027121d508a2177605bd158d967ddd7325948/Flask_SSE-1.0.0-py2.py3-none-any.whl", hash = "sha256:f86d7ecff0607333755c444130c395e7a133fb7ae6cf76fbd29b1da36d34776b", size = 4952, upload-time = "2021-01-10T18:01:44.985Z" }, +] + +[[package]] +name = "flatten-dict" +version = "0.5.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/0b/d0/34bf1bafa4d54e4ec20ca40856e991ffe7fdfd53831a2a36a7eb356508c8/flatten_dict-0.5.0.tar.gz", hash = "sha256:ca89664d0bc9552d525ee756726b5a755c17f65b5bf23d0a1f07841f181428b7", size = 9476, upload-time = "2026-04-28T14:23:44.979Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/72/9f/485516087cd8c44183aaf9ab850247a28e2e4a42a4d62eab77c21f673450/flatten_dict-0.5.0-py3-none-any.whl", hash = "sha256:c4bd2010052e4d33241433720d054322403fa7ad914fdc5cb1b31a713d4c561e", size = 9869, upload-time = "2026-04-28T14:23:45.695Z" }, +] + +[[package]] +name = "flexcache" +version = "0.3" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "typing-extensions" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/55/b0/8a21e330561c65653d010ef112bf38f60890051d244ede197ddaa08e50c1/flexcache-0.3.tar.gz", hash = "sha256:18743bd5a0621bfe2cf8d519e4c3bfdf57a269c15d1ced3fb4b64e0ff4600656", size = 15816, upload-time = "2024-03-09T03:21:07.555Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/27/cd/c883e1a7c447479d6e13985565080e3fea88ab5a107c21684c813dba1875/flexcache-0.3-py3-none-any.whl", hash = "sha256:d43c9fea82336af6e0115e308d9d33a185390b8346a017564611f1466dcd2e32", size = 13263, upload-time = "2024-03-09T03:21:05.635Z" }, +] + +[[package]] +name = "flexparser" +version = "0.4" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "typing-extensions" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/82/99/b4de7e39e8eaf8207ba1a8fa2241dd98b2ba72ae6e16960d8351736d8702/flexparser-0.4.tar.gz", hash = "sha256:266d98905595be2ccc5da964fe0a2c3526fbbffdc45b65b3146d75db992ef6b2", size = 31799, upload-time = "2024-11-07T02:00:56.249Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/fe/5e/3be305568fe5f34448807976dc82fc151d76c3e0e03958f34770286278c1/flexparser-0.4-py3-none-any.whl", hash = "sha256:3738b456192dcb3e15620f324c447721023c0293f6af9955b481e91d00179846", size = 27625, upload-time = "2024-11-07T02:00:54.523Z" }, +] + +[[package]] +name = "fonttools" +version = "4.63.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/84/69/c97f2c18e0db87d2c7b15da1974dace76ae938f1cfa22e2727a648b7ed43/fonttools-4.63.0.tar.gz", hash = "sha256:caeb583deeb5168e694b65cda8b4ee62abedfa66cf88488734466f2366b9c4e0", size = 3597189, upload-time = "2026-05-14T12:04:30.958Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/75/2b/a7f1545bdf5da69c4bda0cea2a5781f0ad2a6623e0277267672db43c5fe6/fonttools-4.63.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:2b8ae05d9eacf6081414d759c0a352769ac28ce31280d6bb8e77b03f9e3c449f", size = 2881793, upload-time = "2026-05-14T12:02:56.645Z" }, + { url = "https://files.pythonhosted.org/packages/49/50/965308c703f085f225db2886813b27e015b8b3438c350b22dd65b52c2a2c/fonttools-4.63.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:79cdc9f567aec74a72918fd060283911406750cbc9fd28c1316023deb6ce31a9", size = 2428130, upload-time = "2026-05-14T12:02:58.891Z" }, + { url = "https://files.pythonhosted.org/packages/d8/38/6937fbd7f2dc3a6b48725851bc2c15ec949b9af14d9bbcb5fe83cdf9bdf9/fonttools-4.63.0-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:2c14b4fd138c4bafcca294765c547914e1aa431ae1ca94ab99d8db08c958bd3b", size = 5111952, upload-time = "2026-05-14T12:03:01.263Z" }, + { url = "https://files.pythonhosted.org/packages/0b/43/a81f20050a3115b57d62c8e781446949512eac36690dc384ccea65ff4cc1/fonttools-4.63.0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:d76ac49f929aecaf82d83250b8347e099d7aecba0f4726c1d9b6df3b8bb5fe18", size = 5082308, upload-time = "2026-05-14T12:03:03.211Z" }, + { url = "https://files.pythonhosted.org/packages/67/00/cdd9d4944ca6ae280d01e69cc37bde3bf663630b837a6fc6d2cd65d80e0e/fonttools-4.63.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:dcf076a4474fe0d7367e5bbf5b052c7284fa1feca729c04176ce513521afd8a0", size = 5087932, upload-time = "2026-05-14T12:03:05.147Z" }, + { url = "https://files.pythonhosted.org/packages/f5/f1/0aa0dbea778c75adbef223c42019fd47d22262b905974d62d829545d485f/fonttools-4.63.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:7dd683fef0663e9f0f45cf541d788d24caa3ec9db50796b588e1757d8b3bc007", size = 5213271, upload-time = "2026-05-14T12:03:07.238Z" }, + { url = "https://files.pythonhosted.org/packages/a8/99/253e4056e1f0e67b9390125a154b73b5eb73ad521bece95c004858fdeec2/fonttools-4.63.0-cp311-cp311-win32.whl", hash = "sha256:afefc1ed0a59785a7fb06ea7e1678e849c193e1e387db783579bc7b3056fcfcb", size = 2304473, upload-time = "2026-05-14T12:03:09.271Z" }, + { url = "https://files.pythonhosted.org/packages/08/60/defa5e69641db890a63be281f41345f4c33b157824eaf0b9fad3e08b0dcb/fonttools-4.63.0-cp311-cp311-win_amd64.whl", hash = "sha256:063e08bd17bd5a90127a14123de0d6a952dbc847695fd98b63c043d58057f90c", size = 2356389, upload-time = "2026-05-14T12:03:11.53Z" }, + { url = "https://files.pythonhosted.org/packages/08/ef/b3c6b9b5be2f82416d73fe2ed2e96e2793cd80e7510bd6a17ca79cdd88ec/fonttools-4.63.0-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:37dd23e621e3b0aef1baa70a303b80aaf38449632cfc8fd2a55fb285bbccfc02", size = 2881131, upload-time = "2026-05-14T12:03:13.386Z" }, + { url = "https://files.pythonhosted.org/packages/44/a0/c815bea63117fa63e4e1c01f8a1110d2112fa003f838e6467094ec2432ce/fonttools-4.63.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:a9faff9e0c1f76f9fd55899d2ce785832efebab37eb8ae13995853aef178bef0", size = 2426704, upload-time = "2026-05-14T12:03:15.801Z" }, + { url = "https://files.pythonhosted.org/packages/44/04/0b91d8e916e92ad1fac9e4624760baf0fd5ff2ead614c2f68fb21373f03f/fonttools-4.63.0-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:ef3048ef05dbb552b89817713d9cac912e00d0fde4a3105c00d29e52e10c89af", size = 5044298, upload-time = "2026-05-14T12:03:18.085Z" }, + { url = "https://files.pythonhosted.org/packages/77/c7/2342da9830e3e9d4870305ca5d2091d2a83284f2953079b7bdd3b5e029d8/fonttools-4.63.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:58dc6bb86a78d782f00f9190ca02c119cf5bbe2807536e361e18d42019f877d8", size = 4999800, upload-time = "2026-05-14T12:03:20.161Z" }, + { url = "https://files.pythonhosted.org/packages/e6/6d/67fe16c48d7ce050979b33f47e0d28a318f02da030602e944c34f7a16ef3/fonttools-4.63.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:ee08ebfa58f6e1aeff5697ab9582105bb620008c1caafb681e4c557e7483027b", size = 4982666, upload-time = "2026-05-14T12:03:22.87Z" }, + { url = "https://files.pythonhosted.org/packages/f2/00/3bbab338c07c71fa56269953845e92c951a61457bbbb0f1022551ea266d9/fonttools-4.63.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:27fdc65af8da6f88b9c6121c47a464cbe359fcfff7ff6fc2d37a1f395d755b78", size = 5133598, upload-time = "2026-05-14T12:03:25.168Z" }, + { url = "https://files.pythonhosted.org/packages/62/f2/aa27c7f98db5b064883dadcc5283947e81e034de42e22a33675878d98b54/fonttools-4.63.0-cp312-cp312-win32.whl", hash = "sha256:af2fd1664d00a397d75f806985ddb36282091c2131a73a6485c23b4a34722263", size = 2292575, upload-time = "2026-05-14T12:03:27.496Z" }, + { url = "https://files.pythonhosted.org/packages/87/36/cccb9bc2a6ab63d1b2980374f0dca72ce95ae267c9b4cfe77455bb70d0d4/fonttools-4.63.0-cp312-cp312-win_amd64.whl", hash = "sha256:59ac449f8cca9b4ffa08d2e7bbadad87ce710d69d1eda5c3c1ce579baa987272", size = 2343211, upload-time = "2026-05-14T12:03:30.057Z" }, + { url = "https://files.pythonhosted.org/packages/0f/8d/d8fec3dcde2963f8c908fb315e5ff2cd0ac34f82394bbbf73a2aa5145ce3/fonttools-4.63.0-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:cd7e9857e5e63738b9d9fd707bc1f59c8b09e5177726d23664db393c59bb08bd", size = 2876062, upload-time = "2026-05-14T12:03:32.554Z" }, + { url = "https://files.pythonhosted.org/packages/ef/71/d935dc54e4ff121bfdd11e08702db63a7e6f25af21d8a3d7b7212df53641/fonttools-4.63.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:c2a2a42198b696a6f48fad91709afb55176e66a5e566131219dba372fb7f8c59", size = 2424594, upload-time = "2026-05-14T12:03:34.86Z" }, + { url = "https://files.pythonhosted.org/packages/8e/40/e76320afa1df918e146155ef239b1719ee266092e96f5423bfd075affba1/fonttools-4.63.0-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:1e874792a8212b44583ea02189d9e693906b2f78b261f372f95d6c563210ac1d", size = 5024840, upload-time = "2026-05-14T12:03:36.745Z" }, + { url = "https://files.pythonhosted.org/packages/ce/36/0b805d8c485f872f65a509cbe3b58a5d0d17bee855333b54a150c79d3061/fonttools-4.63.0-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:22135da48a348785c5e2d5d2d9d6bec5ed44adacbaeb9db12d9493bf6c6bfa68", size = 4975801, upload-time = "2026-05-14T12:03:38.833Z" }, + { url = "https://files.pythonhosted.org/packages/c8/26/2cee03d0aa083ab022da5c07aff9ed3f689da1defb81ad6917c9627896da/fonttools-4.63.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:ccf41f2efdf56994d22d73bef4ced1052161958169428d06ba9724ea9e9a64be", size = 4965009, upload-time = "2026-05-14T12:03:41.494Z" }, + { url = "https://files.pythonhosted.org/packages/7e/48/cc4b66d9058c0d0982c833fad10127c4b0e9324606aafa41382295ca4102/fonttools-4.63.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:9ced0bd02ac751dd6319b0da88aaef24414e3b0dbc32bb4f24944821a3741a27", size = 5105892, upload-time = "2026-05-14T12:03:43.525Z" }, + { url = "https://files.pythonhosted.org/packages/d8/1f/a98a30a814b9ddef3a2e706025f90b9e0bc94890e6cb15254bc86547d11a/fonttools-4.63.0-cp313-cp313-win32.whl", hash = "sha256:85be818f5506e8a7753153def2c9550178f0ecae6a47b5e0e8dbb23f7cc90380", size = 2291313, upload-time = "2026-05-14T12:03:45.594Z" }, + { url = "https://files.pythonhosted.org/packages/92/46/5177b01f3b4abfdd4409f31cca4ab279c9343a26efbe9ec78c97fc612e02/fonttools-4.63.0-cp313-cp313-win_amd64.whl", hash = "sha256:ba04cb5891d4c0c21b6da95eda8d7b090021508a294fff33464fc7d241e0856b", size = 2342299, upload-time = "2026-05-14T12:03:47.414Z" }, + { url = "https://files.pythonhosted.org/packages/27/d2/23d25e3f247b328be58d04a4c9f894178a0d1eda7d42867cfb388adaf416/fonttools-4.63.0-cp314-cp314-macosx_10_15_universal2.whl", hash = "sha256:fd1e3094f42d806d3d7c79162fc59e5910fcbe3a7360c385b8da969bc4493745", size = 2875338, upload-time = "2026-05-14T12:03:50.052Z" }, + { url = "https://files.pythonhosted.org/packages/cd/58/7dfa0c761cb3b2964e2a84c4dc986c926a87de0cb9fb60d5b28ded3f2914/fonttools-4.63.0-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:6e528da43bc3791085f8cb6141b1d13e459226790240340fcbb4625649238b03", size = 2422661, upload-time = "2026-05-14T12:03:52.154Z" }, + { url = "https://files.pythonhosted.org/packages/dd/87/64cfa18a7a1621d17b7f4502b2b0ed8a135a90c3db51ea590ee99043e76b/fonttools-4.63.0-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:6b2248c5decb223562f7902ff6325077a073f608ee8e33e88ad88db734eb9f49", size = 5010526, upload-time = "2026-05-14T12:03:54.647Z" }, + { url = "https://files.pythonhosted.org/packages/36/e1/a8933a72c45a87177fbde2696e0d0755c8c9062f8c077a961c6215fa27b1/fonttools-4.63.0-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:308f957cdeaf8abe4e5f2f124902ef405448af92c90f80e302a3b771c2e6116b", size = 4923946, upload-time = "2026-05-14T12:03:56.984Z" }, + { url = "https://files.pythonhosted.org/packages/27/60/872e6e233b8c5e8b41413796ff18b7fe479661bd40147e071b450dfad7a1/fonttools-4.63.0-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:bf00f21eb5fb721dbaf73d1e9da6d02a1af7768f2ebcf9798be98beab8ba90f6", size = 4962489, upload-time = "2026-05-14T12:03:59.443Z" }, + { url = "https://files.pythonhosted.org/packages/30/c4/83c24f2ec38b90cfda84bf4b1a1f49df80e84a1db4e7ac6e0d41bf23bc39/fonttools-4.63.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:c1aaa4b9c75798400ac043ce04d74e7830376c85095a5a6ed7cba2f17a266bf4", size = 5071870, upload-time = "2026-05-14T12:04:02.122Z" }, + { url = "https://files.pythonhosted.org/packages/de/40/3ae22b60ff1d41ce0bd044b31238cdc72cef99f28b976f1e128ebd618c9b/fonttools-4.63.0-cp314-cp314-win32.whl", hash = "sha256:22693918177bd9ceabec4736d338045f357769416fc6b0b2508eefef75b08616", size = 2295026, upload-time = "2026-05-14T12:04:04.47Z" }, + { url = "https://files.pythonhosted.org/packages/c3/d4/98078064ccc76b45cb0f6c002452011e93c4bd26f6850344f0951cc1fe89/fonttools-4.63.0-cp314-cp314-win_amd64.whl", hash = "sha256:7d782fac32985914c351556f68ac0855391572bcd87de50e05970d3cd4c96fc5", size = 2347454, upload-time = "2026-05-14T12:04:06.752Z" }, + { url = "https://files.pythonhosted.org/packages/49/4e/652d1580c5f4e39f7d103b0c793e4773129ad633dce4addd0cf4dfebde02/fonttools-4.63.0-cp314-cp314t-macosx_10_15_universal2.whl", hash = "sha256:6db5140a60a5d731d21ec076745b40a310607731b0a565b50776393188649001", size = 2958152, upload-time = "2026-05-14T12:04:08.706Z" }, + { url = "https://files.pythonhosted.org/packages/0e/55/ad864c9a9b219f552eb46b32cd7906c466e5a578ba0c3abfcc0fe7413eb6/fonttools-4.63.0-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:7d76edbff9014094dbf03bd2d074709dfa6ec7aba13d838c937a2b33d2d6a86e", size = 2460809, upload-time = "2026-05-14T12:04:10.783Z" }, + { url = "https://files.pythonhosted.org/packages/ea/2b/0aa8db70f18cf52e49b4ed5ecec68547f981160bf5ded3b5aed6faa0a6f9/fonttools-4.63.0-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:0eac00b9118c3c2f87d272e45341871c5b3066baa3c86897fa634a7c3fb59096", size = 5148649, upload-time = "2026-05-14T12:04:12.747Z" }, + { url = "https://files.pythonhosted.org/packages/7f/63/18e4369c25043096f1048e0c9915951adc4f842bd81c6b18155824d6fa99/fonttools-4.63.0-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:51394295f1a51de8b5f30bdb1e1b9a4231536c7064ef5c6e211eec19fa36036f", size = 4932147, upload-time = "2026-05-14T12:04:14.806Z" }, + { url = "https://files.pythonhosted.org/packages/a1/3f/67f3eac2ffd8a98446c5022f8ed3864eac878a5ff7af8df4c8286dba16cc/fonttools-4.63.0-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:9e12f105d2b6342c559c298afb674006bb2893afc7102dcf8a1b55b0486b4e40", size = 5027237, upload-time = "2026-05-14T12:04:17.675Z" }, + { url = "https://files.pythonhosted.org/packages/1a/ba/4e6214cb38a7b04779e97bb7636de9a5c7f20af7018d03dee0b64c08510a/fonttools-4.63.0-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:796f27556dbe094c4824f75ca85267e4df776c79036c8441469a4df37038c196", size = 5053933, upload-time = "2026-05-14T12:04:20.818Z" }, + { url = "https://files.pythonhosted.org/packages/34/3b/214dcc19ee31d3d38fb5ad2755c11ef0514e5dc300bbaf41c0b69f393799/fonttools-4.63.0-cp314-cp314t-win32.whl", hash = "sha256:948428a275741f0b64b113c955425a953314f4b9ab9997f73a72c83e68e569c8", size = 2359326, upload-time = "2026-05-14T12:04:24.22Z" }, + { url = "https://files.pythonhosted.org/packages/dd/1e/3ff1a9b523058c2eeb6a9d50f5574e2a738200d0d94107d5bc4105e8da3f/fonttools-4.63.0-cp314-cp314t-win_amd64.whl", hash = "sha256:6d4741eb179121cab9eea4cb2393d24492373a260d7945006358c08cfbf45419", size = 2425829, upload-time = "2026-05-14T12:04:26.829Z" }, + { url = "https://files.pythonhosted.org/packages/2c/47/c99d5268f354002ce80f8d029cd9d7d872969da1de8b93d32de4dc56d6f4/fonttools-4.63.0-py3-none-any.whl", hash = "sha256:445af2eab030a16b9171ea8bdda7ebf7d96bda2df88ee182a464252f6e05e20d", size = 1164562, upload-time = "2026-05-14T12:04:29.092Z" }, +] + +[[package]] +name = "fqdn" +version = "1.5.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/30/3e/a80a8c077fd798951169626cde3e239adeba7dab75deb3555716415bd9b0/fqdn-1.5.1.tar.gz", hash = "sha256:105ed3677e767fb5ca086a0c1f4bb66ebc3c100be518f0e0d755d9eae164d89f", size = 6015, upload-time = "2021-03-11T07:16:29.08Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/cf/58/8acf1b3e91c58313ce5cb67df61001fc9dcd21be4fadb76c1a2d540e09ed/fqdn-1.5.1-py3-none-any.whl", hash = "sha256:3a179af3761e4df6eb2e026ff9e1a3033d3587bf980a0b1b2e1e5d08d7358014", size = 9121, upload-time = "2021-03-11T07:16:28.351Z" }, +] + +[[package]] +name = "freezegun" +version = "1.5.5" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "python-dateutil" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/95/dd/23e2f4e357f8fd3bdff613c1fe4466d21bfb00a6177f238079b17f7b1c84/freezegun-1.5.5.tar.gz", hash = "sha256:ac7742a6cc6c25a2c35e9292dfd554b897b517d2dec26891a2e8debf205cb94a", size = 35914, upload-time = "2025-08-09T10:39:08.338Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/5e/2e/b41d8a1a917d6581fc27a35d05561037b048e47df50f27f8ac9c7e27a710/freezegun-1.5.5-py3-none-any.whl", hash = "sha256:cd557f4a75cf074e84bc374249b9dd491eaeacd61376b9eb3c423282211619d2", size = 19266, upload-time = "2025-08-09T10:39:06.636Z" }, +] + +[[package]] +name = "gevent" +version = "26.5.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "cffi", marker = "platform_python_implementation == 'CPython' and sys_platform == 'win32'" }, + { name = "greenlet", marker = "platform_python_implementation == 'CPython'" }, + { name = "zope-event" }, + { name = "zope-interface" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/c4/cb/98aa3a299e2fc4a2372b5d124863e02965b64579ffc29fe54d0641e65b2f/gevent-26.5.0.tar.gz", hash = "sha256:1655eb04c1e20d71b2aa4a3c7528162dd58ff6cc46a037af1f01f534c80fefba", size = 6712354, upload-time = "2026-05-20T21:22:45.132Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/2a/ea/ea87c08931c9e4c6c40bb05a2cb19c2d6f93fe6e0052f9152ea5ade6d037/gevent-26.5.0-cp311-cp311-manylinux_2_28_aarch64.whl", hash = "sha256:cd3dc60581687e2618286108f8e2f820d8446be4b34131065011c066e911d39c", size = 1768295, upload-time = "2026-05-20T21:17:29.438Z" }, + { url = "https://files.pythonhosted.org/packages/da/92/1d0e7287ae55700a8d25153ac736896bd9bcc3f85a12d374ef398db4b33c/gevent-26.5.0-cp311-cp311-manylinux_2_28_ppc64le.whl", hash = "sha256:dc7fa28b2d627f8e87595f39043b6dec71e8e7fb97e685e5506c47cf3ff8cb2e", size = 1862627, upload-time = "2026-05-20T21:15:59.365Z" }, + { url = "https://files.pythonhosted.org/packages/3a/4c/7f5ed67e52dfdef4ff91ae1a6fb28186d52e2496962edc8f17bdea9ab2c0/gevent-26.5.0-cp311-cp311-manylinux_2_28_s390x.whl", hash = "sha256:68c5fc21cef80268cdff88a4ae6c025fabb019b071f6f8ee4d20a7bccbddb873", size = 1804690, upload-time = "2026-05-20T21:30:51.713Z" }, + { url = "https://files.pythonhosted.org/packages/4c/75/0f5da6ca045f8a052203e1810058029f4b682507a789b413cac7d28bae28/gevent-26.5.0-cp311-cp311-manylinux_2_28_x86_64.whl", hash = "sha256:d325502eb0695708ef8c899f605573ed6847f3961f8159627dba267fbf3ce457", size = 2119054, upload-time = "2026-05-20T20:35:22.678Z" }, + { url = "https://files.pythonhosted.org/packages/6e/f1/fcff7f7fad2bb33f3742db6b2145825a2191c0cd31d75789b0741fd28faf/gevent-26.5.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:a11daf3a588b932c8bf965fb18444c69aff48badec88435e988cf8d67137075a", size = 1778784, upload-time = "2026-05-20T21:16:38.182Z" }, + { url = "https://files.pythonhosted.org/packages/98/57/151314f00bdc6ba77333febb3e9dc97fdf94d79426559b4fa8332f0c2b6e/gevent-26.5.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:1101b5ef82a3fb178550cfd80f32293dc8dd2f3d0828292223ebba29d6f76e33", size = 2145373, upload-time = "2026-05-20T20:43:27.255Z" }, + { url = "https://files.pythonhosted.org/packages/1a/b5/7a02f711db62cbed1c1a00e1f9ff50eef95ccc78d4c04a0f93636655d1b7/gevent-26.5.0-cp311-cp311-win_amd64.whl", hash = "sha256:5233109ad4f3af16393ba9888f238919a05ce15ce68d6831ac8a0da8dfb750ae", size = 1696576, upload-time = "2026-05-20T20:15:49.62Z" }, + { url = "https://files.pythonhosted.org/packages/f8/9b/5022adc310697ef25c6fb22eb9bf0ebcad3427b51776e882709de9a8b6d7/gevent-26.5.0-cp311-cp311-win_arm64.whl", hash = "sha256:3be804565168ffacebeb21af9f1cd689831a89f0f12fc0c3f423c730c3c9eb31", size = 1552095, upload-time = "2026-05-20T20:16:54.81Z" }, + { url = "https://files.pythonhosted.org/packages/37/0b/1a530b2db55c97cc0cf44116201f538f3033c04c1d2aca143979b412f4be/gevent-26.5.0-cp312-cp312-macosx_11_0_universal2.whl", hash = "sha256:e80ad2a8a1e8bdaa5605e3bf4929e0cebf9ea7b8237c83362f7257698bb14280", size = 2929714, upload-time = "2026-05-20T20:13:24.656Z" }, + { url = "https://files.pythonhosted.org/packages/b9/df/32fe851ed5f68493f354e09b19bdebae0de1185be4db0b2988e71e737fd3/gevent-26.5.0-cp312-cp312-manylinux_2_28_aarch64.whl", hash = "sha256:fe42c037253580a3386fce275f8a2a845e540f5a729916934a732f13d42e72cc", size = 1784838, upload-time = "2026-05-20T21:17:31.063Z" }, + { url = "https://files.pythonhosted.org/packages/e5/9a/21332674f9a10e8cdf13b41b52e9d663647a1c6e1dc3c62b07c0aeefd360/gevent-26.5.0-cp312-cp312-manylinux_2_28_ppc64le.whl", hash = "sha256:9f463c7d6f69d13b6fe8e3b832a6175a6e95328a940f38495d25496d1ae8ad88", size = 1880440, upload-time = "2026-05-20T21:16:00.881Z" }, + { url = "https://files.pythonhosted.org/packages/9f/b1/5f8a4196113cf7f3fdd987b483f7e6b10c28ea3930c4727e31ba8cce51b6/gevent-26.5.0-cp312-cp312-manylinux_2_28_s390x.whl", hash = "sha256:96d5e96b1b14a4c1023dcfcc114533217f13febc3b6169254f23fc18d19fee29", size = 1831592, upload-time = "2026-05-20T21:30:53.832Z" }, + { url = "https://files.pythonhosted.org/packages/4e/69/1559b1f6b5107a9118fccd300240879bd581b6d87b03d568d0d155ea702c/gevent-26.5.0-cp312-cp312-manylinux_2_28_x86_64.whl", hash = "sha256:bccff69c462e3650a0fd1d4e9cfc8b6effe15f3e9b1cad20a7bb5ce14b057efd", size = 2114915, upload-time = "2026-05-20T20:35:25.041Z" }, + { url = "https://files.pythonhosted.org/packages/e4/32/602c499d54472f64e5cdf6013aeab5ce6aa6fed005387e8b4f2d22f5dc8d/gevent-26.5.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:f519139354d5ca7625df9ddb1b2ffada885c14abc5b4dbae3682e967ddf79669", size = 1796906, upload-time = "2026-05-20T21:16:39.65Z" }, + { url = "https://files.pythonhosted.org/packages/f9/3c/2fe77ee6e3d381b3c50c0b7d6c4c08c08b8ff5e8c0d9dd51a3b426d61eec/gevent-26.5.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:0bf57df54f1c66273bf3601c2a1e41b12138fe848933718369663bc54f177ca2", size = 2140806, upload-time = "2026-05-20T20:43:28.895Z" }, + { url = "https://files.pythonhosted.org/packages/22/d5/4620797bbd9c88f4541188efc138b0d615f9834db540da36a2249ee929c5/gevent-26.5.0-cp312-cp312-win_amd64.whl", hash = "sha256:e49ce0de007dfd7412edbc2b5d41cce33b049bb1b7086f50be5a09e601bde603", size = 1699995, upload-time = "2026-05-20T20:15:39.311Z" }, + { url = "https://files.pythonhosted.org/packages/cb/83/ac3477dfc0f9fd80c88110102c73cefc35dcded2b248544f45a8fa5412df/gevent-26.5.0-cp312-cp312-win_arm64.whl", hash = "sha256:5c5ff29495a2eed2a244de8150f21893d6c1b15d8b4b5719ab4bbfa06db1e28f", size = 1547433, upload-time = "2026-05-20T20:15:51.656Z" }, + { url = "https://files.pythonhosted.org/packages/7d/47/5b992ab9c8037633cfd0fe698a97a878f59d8eb53c381e91e9a1a76fd215/gevent-26.5.0-cp313-cp313-macosx_11_0_universal2.whl", hash = "sha256:9b4d3f34c913d1a6bec6d030365a517f3b527a9773b12e58cf56c3339bbe96e6", size = 2952523, upload-time = "2026-05-20T20:13:04.698Z" }, + { url = "https://files.pythonhosted.org/packages/74/11/c7dfc773eb43331a682efed610b49df6e976331f1b0e1c592a0c35d29872/gevent-26.5.0-cp313-cp313-manylinux_2_28_aarch64.whl", hash = "sha256:1d8da4e799431feeb4c9e441ac7431f0baabb9106976790d884289d08ac08359", size = 1787044, upload-time = "2026-05-20T21:17:32.845Z" }, + { url = "https://files.pythonhosted.org/packages/ae/28/9812933dac93560f46910a9e834805fe76f822c408bd1c20cdf299d7c311/gevent-26.5.0-cp313-cp313-manylinux_2_28_ppc64le.whl", hash = "sha256:51becdb4c30a8f45c1c028ad7a97bf5a1ed141f74b159a31aa9cc6aa1e6263a6", size = 1882342, upload-time = "2026-05-20T21:16:02.645Z" }, + { url = "https://files.pythonhosted.org/packages/96/4b/514f248f69b2230b69b0bb17f4158b0b05dd4b2cb469a60ab206e9fe7496/gevent-26.5.0-cp313-cp313-manylinux_2_28_s390x.whl", hash = "sha256:c42bbcd3d453b08ad8915fd3feaf3d44a3562cdf1c7b208f9837149711e16d9d", size = 1834136, upload-time = "2026-05-20T21:30:55.739Z" }, + { url = "https://files.pythonhosted.org/packages/53/67/f5f30716efca99b6200ae89a9303a7e94dae085b7de6f6d0033c52a37f4b/gevent-26.5.0-cp313-cp313-manylinux_2_28_x86_64.whl", hash = "sha256:bd3445e4fbeeb46690ed8efe94b8d1d46b14aa04af8866ae7a8da5997828d1c6", size = 2115349, upload-time = "2026-05-20T20:35:28.132Z" }, + { url = "https://files.pythonhosted.org/packages/09/d8/60e8809bde7986e6c4e6d106080b3603fa09b3bb0255fed1a4d8282e3ca2/gevent-26.5.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:b573d5b2826edc705f31f07da6889ad483a6a0d64944ebd8d32205f7c5bf46fb", size = 1799443, upload-time = "2026-05-20T21:16:41.928Z" }, + { url = "https://files.pythonhosted.org/packages/f8/41/b388b2b1f0a026ea30687e51ddf81dbb783dfb55fac0a16708d2821d99e5/gevent-26.5.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:4d53b1b28f2082a151bded2850b53f6baed02f742d2a1584029e8bd42d457fb4", size = 2141117, upload-time = "2026-05-20T20:43:30.694Z" }, + { url = "https://files.pythonhosted.org/packages/b1/f3/ac9a4b0de487e390c5d53a908a9347c0df0102de2bbf3e8603087769191d/gevent-26.5.0-cp313-cp313-win_amd64.whl", hash = "sha256:23569ce0c254eb821fc3dcfe250843dde8b3180b09bae9e222e41aa3fa4885b7", size = 1699862, upload-time = "2026-05-20T20:15:33.642Z" }, + { url = "https://files.pythonhosted.org/packages/2a/cf/1ef1fc9b390563c0f97702f94a557d1649b7bbb5724f9b86c2122747e92f/gevent-26.5.0-cp313-cp313-win_arm64.whl", hash = "sha256:40cdcdb2e404b6c82b82a4576bdb33958f23fc2deb0d933e9e022b362001e647", size = 1545341, upload-time = "2026-05-20T20:16:26.229Z" }, + { url = "https://files.pythonhosted.org/packages/17/55/7d98d3888e7bb9ad4656420dec69232ecbbea48792aff9295d0ad7cf8435/gevent-26.5.0-cp314-cp314-macosx_11_0_universal2.whl", hash = "sha256:75a0050e4b87f08ddee7e56f59e6014cd7fcdc3153046c09a847940515d12c85", size = 2968223, upload-time = "2026-05-20T20:13:17.223Z" }, + { url = "https://files.pythonhosted.org/packages/f8/b4/e8e116fcbcb9dc0bf3acc50037f86e1204c217c8ed5defde68be11b3aab6/gevent-26.5.0-cp314-cp314-manylinux_2_28_aarch64.whl", hash = "sha256:fd1a0b83a04e19378d9466ae0ee2b5937cf1d7fbfdcb916b2aea82179a208574", size = 1793926, upload-time = "2026-05-20T21:17:34.321Z" }, + { url = "https://files.pythonhosted.org/packages/28/07/7b267e9754b661defb93542e97731a4df21f8a40dc0f6c853faa717cf124/gevent-26.5.0-cp314-cp314-manylinux_2_28_ppc64le.whl", hash = "sha256:4c964c15076e76391d523ec24202f579a2535f7e301a40efb1656ae046d3eb69", size = 1887632, upload-time = "2026-05-20T21:16:04.158Z" }, + { url = "https://files.pythonhosted.org/packages/5c/50/b47d29e99449bd13b557ffa451401dc13d397a9923f562ef90a4e8514502/gevent-26.5.0-cp314-cp314-manylinux_2_28_s390x.whl", hash = "sha256:45d5438d1c84da5df7e832434627624709543630977332bb4e2d05ecca362cc9", size = 1838688, upload-time = "2026-05-20T21:30:57.979Z" }, + { url = "https://files.pythonhosted.org/packages/8b/eb/5b54ccff11bc7d7bebd40a24571ccc115d5cdae4f6c32ab457b43b436e42/gevent-26.5.0-cp314-cp314-manylinux_2_28_x86_64.whl", hash = "sha256:354f35924113abc954819216c2a6ee16751958c615681e0490946e31b437bd2f", size = 2120351, upload-time = "2026-05-20T20:35:32.699Z" }, + { url = "https://files.pythonhosted.org/packages/9c/70/30fd325c30e04b1e5174c61945e17421d53ddb2450366cc52cef234f8c4b/gevent-26.5.0-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:a47cd2d32f6404212d374ad8014a3491d7477dcf0cc09c5a2308ad6d325fd663", size = 1806684, upload-time = "2026-05-20T21:16:43.87Z" }, + { url = "https://files.pythonhosted.org/packages/cd/e8/fbf911ac3f9524ecfaed174d100fde671904ab8db92ceaf07faaebd13386/gevent-26.5.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:032157cebdedb84f2f52cdd980f2f5f2623eed6a8f083aadf44b44c47f628642", size = 2146606, upload-time = "2026-05-20T20:43:32.216Z" }, + { url = "https://files.pythonhosted.org/packages/9e/4d/284fcbbfde66fd978c2980c1fbe0eabd586af6e4b728649e9cf459e8b38f/gevent-26.5.0-cp314-cp314-win_amd64.whl", hash = "sha256:9c414935ba5fc88359110968851d3616f119082c937390d00a1c0f4f59be814f", size = 1722497, upload-time = "2026-05-20T20:16:44.274Z" }, + { url = "https://files.pythonhosted.org/packages/15/d2/9f66eb53434704402be0ba733bf3320bf589671a4b76fac52a7d6077e972/gevent-26.5.0-cp314-cp314-win_arm64.whl", hash = "sha256:2a0f5993a04b95a35b3a118b1a58ba272833f9b547b774001dea29f90620882f", size = 1574249, upload-time = "2026-05-20T20:15:50.873Z" }, + { url = "https://files.pythonhosted.org/packages/dc/d5/b4c50adb761878e3c96642b9f79bf44cee3120f3df55cd40876f51d89866/gevent-26.5.0-cp315-cp315-macosx_11_0_universal2.whl", hash = "sha256:2e117df896a2660c9ebd4e2b5afc02dfd6e2ddf9b495e787e67c72d105432b09", size = 2971993, upload-time = "2026-05-20T20:12:50.845Z" }, + { url = "https://files.pythonhosted.org/packages/03/83/71c2a945e80198422d1d93dbe67355f249fb456b451bf9201199d3ef6a1a/gevent-26.5.0-cp315-cp315-manylinux_2_28_aarch64.whl", hash = "sha256:af5ffe9c11ffb8a39b6bef2e8b722aa2043ae4980977915c6aa8c68b4bc26e46", size = 1796658, upload-time = "2026-05-20T21:17:35.968Z" }, + { url = "https://files.pythonhosted.org/packages/42/96/548ca77aed5cb9a44e855a6c23ebceeb3554a0ea9ca0c01c311878899a3e/gevent-26.5.0-cp315-cp315-manylinux_2_28_ppc64le.whl", hash = "sha256:7da34aef7e87c43dd3662e5785e79ed505c01399a7cb42876d2d8925969fd75f", size = 1891473, upload-time = "2026-05-20T21:16:05.657Z" }, + { url = "https://files.pythonhosted.org/packages/f6/4f/f48bd47d5287afb0fbcc56165f3ed47583f1803bad401653fe27e71ade2d/gevent-26.5.0-cp315-cp315-manylinux_2_28_s390x.whl", hash = "sha256:1c6293a7046bcc6f3d8972a74b19cd7a4cfd02d3881edf0fcf827aa514bd247b", size = 1841429, upload-time = "2026-05-20T21:30:59.907Z" }, + { url = "https://files.pythonhosted.org/packages/a0/72/1925215fc720d2561fa3ec8d4af5f098f8d0cbfa76a45fafed6e5ade7718/gevent-26.5.0-cp315-cp315-manylinux_2_28_x86_64.whl", hash = "sha256:d3bde0f140a275b2fa88e4b6516bda85551930e10bc2fd95e18c1b7d11cb780c", size = 2123895, upload-time = "2026-05-20T20:35:34.964Z" }, + { url = "https://files.pythonhosted.org/packages/83/59/0f584f6b1170c9a6abd9b70ccf5e9cc5ead34eabafabc0e21876ef0fe6f7/gevent-26.5.0-cp315-cp315-musllinux_1_2_aarch64.whl", hash = "sha256:e29fb4b17d9958ec8cb7f6339a111b29bc23f2c2efbef86189d1248bb4862d17", size = 1809047, upload-time = "2026-05-20T21:16:45.977Z" }, + { url = "https://files.pythonhosted.org/packages/82/88/61e854bfd98ac22eac78a97fc6db10de0f9ace46514072b435c217168729/gevent-26.5.0-cp315-cp315-musllinux_1_2_x86_64.whl", hash = "sha256:b2239df2f7570efa03736678f3f053bb1bdd22a8a16cd28a2feb7d32ea5f533f", size = 2150764, upload-time = "2026-05-20T20:43:33.781Z" }, + { url = "https://files.pythonhosted.org/packages/b9/f5/af048b97433d7f9a7df7f5510b2c46918b7d073dcfb3bf6d0ef0e5a83dcc/gevent-26.5.0-cp315-cp315-win_amd64.whl", hash = "sha256:aae214952fd38d27a42dc416bb70193962ec932384b63445d29bbb5817a1c042", size = 1722600, upload-time = "2026-05-20T20:19:56.81Z" }, + { url = "https://files.pythonhosted.org/packages/11/95/fb74a2299c6a2d78d9de12deaaac640ab5d2ef96a8e0f97a3ff84b9ca84b/gevent-26.5.0-cp315-cp315-win_arm64.whl", hash = "sha256:f7067564f139e33bf26a31ee3b13d168d76eb99a44b85ced626652b158baa80c", size = 1574406, upload-time = "2026-05-20T20:17:12.125Z" }, +] + +[[package]] +name = "googleapis-common-protos" +version = "1.75.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "protobuf" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/b5/c8/f439cffde755cffa462bfbb156278fa6f9d09119719af9814b858fd4f81f/googleapis_common_protos-1.75.0.tar.gz", hash = "sha256:53a062ff3c32552fbd62c11fe23768b78e4ddf0494d5e5fd97d3f4689c75fbbd", size = 151035, upload-time = "2026-05-07T08:04:49.423Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/e7/c8/e2645aa8ed02fd4c7a2f59d68783b65b1f3cbdfe39a6308e156509d1fee8/googleapis_common_protos-1.75.0-py3-none-any.whl", hash = "sha256:961ed60399c457ceb0ee8f285a84c870aabc9c6a832b9d37bb281b5bebde43ed", size = 300631, upload-time = "2026-05-07T08:03:30.345Z" }, +] + +[[package]] +name = "greenlet" +version = "3.5.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/6d/6e/802acd792aebb2256fbbee8cacf2727faaeb6f240ac11008f09eae4414bc/greenlet-3.5.1.tar.gz", hash = "sha256:5a56aeb7d5d9cc4b3a735efb5095bd4b4f6f0e4f93e5ca876d0e2315137b7829", size = 197356, upload-time = "2026-05-20T15:05:03.917Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/42/3c/ff890b466eaba2b0f5e6bdfff025f8c75f41b8ffdc3dbc3d24ad261e764a/greenlet-3.5.1-cp311-cp311-macosx_11_0_universal2.whl", hash = "sha256:73f78f9b9f0a5c06e5c946ba1e8e36f5114923b6be109ee618c54f079c3ea14f", size = 284764, upload-time = "2026-05-20T13:09:10.204Z" }, + { url = "https://files.pythonhosted.org/packages/81/0e/5e5457be3d256918f6a4756f073548a3f0190836e2cc94aa6d0d617a940b/greenlet-3.5.1-cp311-cp311-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:a0cbed8bb44e23c5b199f888f4e4ce096b45ad9f25ff74a7ad0213875e936bb2", size = 603479, upload-time = "2026-05-20T14:00:04.757Z" }, + { url = "https://files.pythonhosted.org/packages/6d/e1/f89a21d58d308298e6f275f13a1b472ed96c680b601a371b08be6a725989/greenlet-3.5.1-cp311-cp311-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:a203a8bd0acb0701653d3bbb26e404854a68674139ed5cbb778830f42b09bb33", size = 615495, upload-time = "2026-05-20T14:05:40.87Z" }, + { url = "https://files.pythonhosted.org/packages/2c/f2/8fd452fd81adb9ec79c8275c1375702ab0fd6bee4952da12eaa09b9508d8/greenlet-3.5.1-cp311-cp311-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:6ebeb75c81211f5c702576cf81f315e77e23cfdb2c7c6fcb9dd143e6de35c360", size = 623515, upload-time = "2026-05-20T14:09:07.853Z" }, + { url = "https://files.pythonhosted.org/packages/75/de/af6cef182862d2ccd6975440d21c9058a77c3f9b469abf94e322dfd2e0e3/greenlet-3.5.1-cp311-cp311-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:8a271fcd66c74615cda6a964fda3f304267a12e50a084472218a39bb0376f563", size = 614754, upload-time = "2026-05-20T13:14:24.947Z" }, + { url = "https://files.pythonhosted.org/packages/ec/bc/c318aa9f3ffc77320fddcee3d892be957b42e2ff947198d9450b004f3a38/greenlet-3.5.1-cp311-cp311-manylinux_2_39_riscv64.whl", hash = "sha256:017a544f0385d441e88714160d089d6900ef46c9eff9d99b6715a5ef2d127747", size = 418439, upload-time = "2026-05-20T14:01:38.446Z" }, + { url = "https://files.pythonhosted.org/packages/1a/c6/50e520283a9f19388a7326b05f9e8637e566003475eacaadad04f558c68d/greenlet-3.5.1-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:ded7b068c7c31c1a8657d4fd42d886b3e051ae29f88b80c5ff9d502257b0f071", size = 1574097, upload-time = "2026-05-20T14:02:24.003Z" }, + { url = "https://files.pythonhosted.org/packages/21/1c/13abd1f4860d987fa5e1170a01930d6e6cd40d328de487a3c9fdaff0ffd0/greenlet-3.5.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:d0932b81d72f552ded9d810d00021b64d89f2195a91ce115b893f943b7a4ab3c", size = 1641058, upload-time = "2026-05-20T13:14:31.83Z" }, + { url = "https://files.pythonhosted.org/packages/f5/56/5f332b7705545eac2dc01b4e9254d24a793f2656d55d5cc6b94ee59d22ae/greenlet-3.5.1-cp311-cp311-win_amd64.whl", hash = "sha256:88e300d136eac057b2397aa1cfd7328b4c87c7eb66a09c7bc6a1292234db474e", size = 238089, upload-time = "2026-05-20T13:14:03.229Z" }, + { url = "https://files.pythonhosted.org/packages/d9/a9/a3c2fa886c5b94863fb0e61b3bc14610b7aa94cf4f17f8741b11708305fc/greenlet-3.5.1-cp311-cp311-win_arm64.whl", hash = "sha256:cc6ab7e555c8a112ad3a76e368e86e12a2754bcae1652a5602e133ec7b635523", size = 234989, upload-time = "2026-05-20T13:08:27.715Z" }, + { url = "https://files.pythonhosted.org/packages/c4/37/4549f149c9797c21b32c2683c33522af22522099de128b2406672526d005/greenlet-3.5.1-cp312-cp312-macosx_11_0_universal2.whl", hash = "sha256:fa4f98af3a528f0c3fd592a26df7f376f93329c8f4d987f6bb979057af8bf5e2", size = 286220, upload-time = "2026-05-20T13:07:28.463Z" }, + { url = "https://files.pythonhosted.org/packages/38/ff/a4f436709716965eaab9f36ea7b906c8a927fbe32fb1372a2071d964f6b1/greenlet-3.5.1-cp312-cp312-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:ffea73584b216150eab159b6d12348fb253e68757974de1e2c40d8a318ac89ed", size = 601585, upload-time = "2026-05-20T14:00:06.141Z" }, + { url = "https://files.pythonhosted.org/packages/65/ad/54bc3fcee3ad368a61b19b67d88117f7a8c29727bf71fffdeda81fbd946e/greenlet-3.5.1-cp312-cp312-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:1072b4f9edcc1e192d9283a66a3e68d6b84c561de33a83d7858beb9ba1effe10", size = 614215, upload-time = "2026-05-20T14:05:42.675Z" }, + { url = "https://files.pythonhosted.org/packages/7c/6c/de5b1b388cd2d9fbdfeab324863daba37d54e6e233ddbefd70b385a8c591/greenlet-3.5.1-cp312-cp312-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:89101bfd5011e069be974903cb3a4e4523845e4ece2d62dcd8d358933c0ef249", size = 620094, upload-time = "2026-05-20T14:09:09.18Z" }, + { url = "https://files.pythonhosted.org/packages/40/69/b91cda0647df839483201545913514c2827ebea5e5ccdf931842763bc127/greenlet-3.5.1-cp312-cp312-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:add5217d68b31130f0beca584d7fef4878327d2e31642b66618a14eef312b63b", size = 611358, upload-time = "2026-05-20T13:14:26.37Z" }, + { url = "https://files.pythonhosted.org/packages/4a/43/1204baffab8a6476464795a7ccf394a3248d4f22c9f87173a15b36b6d971/greenlet-3.5.1-cp312-cp312-manylinux_2_39_riscv64.whl", hash = "sha256:e6cd99ea59dd5d89f0c956606571d79bfe6f68c9eb7f4a4083a41a7f1587edee", size = 422782, upload-time = "2026-05-20T14:01:39.597Z" }, + { url = "https://files.pythonhosted.org/packages/59/90/3cf77e080350cd02fa307bb2abf05df48f4482c240275bbd2c203ba8bb1c/greenlet-3.5.1-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:a5ea42a752d47a145eae922b605cd1634665ac3d5ec1e72402d5048e8d60d207", size = 1570475, upload-time = "2026-05-20T14:02:25.29Z" }, + { url = "https://files.pythonhosted.org/packages/65/2c/18cece62045e74598c3c393f70dce4a63f56222015ba29a5d4eeb04f764c/greenlet-3.5.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:c5551170cf4f5ff5623e9af81323751979fee2c731e2287b61f73cd27257b823", size = 1635625, upload-time = "2026-05-20T13:14:34.027Z" }, + { url = "https://files.pythonhosted.org/packages/30/f5/310d104ddf41eb5a70f4c268d22508dfb0c3c8e86fec152be34d0d2ed819/greenlet-3.5.1-cp312-cp312-win_amd64.whl", hash = "sha256:3c8bb982ad117d29478ef8f5533e97df21f1e2befd17a299257b0c96d1371c0b", size = 238791, upload-time = "2026-05-20T13:10:39.018Z" }, + { url = "https://files.pythonhosted.org/packages/62/90/ceca11f504cd23a8047a3dea31919adc48df9b626dd0c13f0d858734fdfd/greenlet-3.5.1-cp312-cp312-win_arm64.whl", hash = "sha256:80eb4b04dadc4e67df3fae179a32c4706a3f495bc7f22fc8a81115d5f5512188", size = 235580, upload-time = "2026-05-20T13:08:45.056Z" }, + { url = "https://files.pythonhosted.org/packages/27/69/7f7e5372d998b81001899b1c0823c957aa413ba0f2662e65821611cc31e4/greenlet-3.5.1-cp313-cp313-macosx_11_0_universal2.whl", hash = "sha256:51518ff74664078fc51bffcc6fc529b0df5ae58da192691cee765d45ce944a2b", size = 285060, upload-time = "2026-05-20T13:08:51.899Z" }, + { url = "https://files.pythonhosted.org/packages/b1/bf/387f9b6b865fd2ae0d0be09e0004827295a01b71be76ed350dd1e28a91a4/greenlet-3.5.1-cp313-cp313-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:1ffdb3c0bb002c99cd8f298957e046c3dbf6006b5b7cdf11a4e19194624a0a0a", size = 604370, upload-time = "2026-05-20T14:00:07.492Z" }, + { url = "https://files.pythonhosted.org/packages/32/f5/169ce3d4e4c67291bd18f8cbe0299c9f3e45102c7f1fb3c14780c93e4532/greenlet-3.5.1-cp313-cp313-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:7715a5a2c3378ba602c3a440558261e13a820bb53a82693aacd7b7f6d964e283", size = 616987, upload-time = "2026-05-20T14:05:44.237Z" }, + { url = "https://files.pythonhosted.org/packages/19/ba/c24110c55dffa55aa6e1d98b45310da33801aeba7686ff0190fe5d46fd32/greenlet-3.5.1-cp313-cp313-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:d40a890035c0058cadbdc4af7569800fd28a0e527a0fdbb7b5f9418f176846ce", size = 622911, upload-time = "2026-05-20T14:09:10.598Z" }, + { url = "https://files.pythonhosted.org/packages/ee/e5/7f2e41d5273be07e77560d61ea4e56485b4d6c316d2a84518c62d1364061/greenlet-3.5.1-cp313-cp313-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:dc71ff466927a201b08305acac451ebe1aedfcea002f62f1f2f2ac2ac1e6a135", size = 613911, upload-time = "2026-05-20T13:14:27.539Z" }, + { url = "https://files.pythonhosted.org/packages/ec/7b/d20db2e8a5ad6c038702f3179b136f93f0a3d1a21a0c0777f3e470cdf4b2/greenlet-3.5.1-cp313-cp313-manylinux_2_39_riscv64.whl", hash = "sha256:67821bb03e4e98664490edb787ff6af501194c29bbee0f5c1dfdcf1dc3d9d436", size = 425228, upload-time = "2026-05-20T14:01:40.837Z" }, + { url = "https://files.pythonhosted.org/packages/c5/a4/fbdc67579b73615a1f91615e814303cc71e06128f7baaba87be79b8fb90c/greenlet-3.5.1-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:cd443683db272ebaaca03af98c0b063ab30db70ea8a31a1559f35e3f7b744ccd", size = 1570689, upload-time = "2026-05-20T14:02:27.225Z" }, + { url = "https://files.pythonhosted.org/packages/e6/b4/77abbe35078be39718a46cd49caf16bceb35662f97a34101dca28aa98e47/greenlet-3.5.1-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:089fff7a6ce8d9316d1f65ebc00273a56be258c1725b32b94de90a3a979557e1", size = 1635602, upload-time = "2026-05-20T13:14:36.344Z" }, + { url = "https://files.pythonhosted.org/packages/37/f7/129f27ca700845b8ee8ca88ce7f43435a1239c2eddb7677fc938822762cf/greenlet-3.5.1-cp313-cp313-win_amd64.whl", hash = "sha256:110a1ca7b49b014b097f6078272c3f4ed31af45b254de5228b79adba879f6af9", size = 238683, upload-time = "2026-05-20T13:11:50.57Z" }, + { url = "https://files.pythonhosted.org/packages/6d/5c/a485a36e87df8d8fd0632ee01511244f5156a20ed3746cc6599340326395/greenlet-3.5.1-cp313-cp313-win_arm64.whl", hash = "sha256:f16ba1efc0715b680a18b8123d90dad887c6112ae3555b4b5c32c149540c6b4e", size = 235499, upload-time = "2026-05-20T13:12:42.028Z" }, + { url = "https://files.pythonhosted.org/packages/8a/cb/c62454606daf5640369c94d8a9dd540599b1bfc090e2d2180cb77f4038d2/greenlet-3.5.1-cp314-cp314-macosx_11_0_universal2.whl", hash = "sha256:d8ab31c9de8651a2facdd5c5bb0011f2380dd1a7af78ce2adf4b56095294fc07", size = 285579, upload-time = "2026-05-20T13:08:56.396Z" }, + { url = "https://files.pythonhosted.org/packages/ec/71/c4270398c2eba968a6071af1dfbdcaeee6ec1c24bc8b435b8cc452700da6/greenlet-3.5.1-cp314-cp314-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:5e300185139abc337ade480c327183adf42a875ac7181bfe66d7d4efea31fbea", size = 651106, upload-time = "2026-05-20T14:00:09.448Z" }, + { url = "https://files.pythonhosted.org/packages/1a/ab/71e34b78a44ec271fb5f550c17bc46d301ddc5953890d935f270b0dcdb5a/greenlet-3.5.1-cp314-cp314-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:7ffdb990dcaa0234cf9845aead5df2e3c3a8b6507d409274dd87e0d5ab05ffc2", size = 663478, upload-time = "2026-05-20T14:05:45.88Z" }, + { url = "https://files.pythonhosted.org/packages/c6/2d/2d80842910da44f78c286532d084b8a5c3717c844ae80ceb3858738ae89a/greenlet-3.5.1-cp314-cp314-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:6c09df69dc1712d131332054a858a3e5cca400967fa3a672e2324fbb0971448c", size = 667767, upload-time = "2026-05-20T14:09:12.15Z" }, + { url = "https://files.pythonhosted.org/packages/77/96/4efd6fa5c62c85426a0c19077a586258ebc3a2a146ff2493e4312a697a22/greenlet-3.5.1-cp314-cp314-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:2f82b3597e9d83b63408affed0b48fd0f54935edac4302237b9a837be0dae33c", size = 660800, upload-time = "2026-05-20T13:14:29.129Z" }, + { url = "https://files.pythonhosted.org/packages/e9/d3/dad2eecedfbb1ed7050a20dcfae40c1442b74bc7423608be2c7e03ee7133/greenlet-3.5.1-cp314-cp314-manylinux_2_39_riscv64.whl", hash = "sha256:a4764e0bfc6a4d114c865b32520805c16a990ef5f286a514413b05d5ecd6a23d", size = 470786, upload-time = "2026-05-20T14:01:42.064Z" }, + { url = "https://files.pythonhosted.org/packages/7a/e0/6c71401a25cac7000261304e866a2f2cc04dc74810d40e2f118aa4799495/greenlet-3.5.1-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:c0141e37414c10164e702b8fb1473304221ad98f71600850c6ef7ff4880feba0", size = 1617518, upload-time = "2026-05-20T14:02:28.662Z" }, + { url = "https://files.pythonhosted.org/packages/41/26/c5c06643e8c0af9e7bf18e16cb51d0ab7625155f0392e1c9015d66d556cd/greenlet-3.5.1-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:50ae25a67bea74ea41fb14b960bc532df73eb713417b2d61892dced82fe8d3bc", size = 1681593, upload-time = "2026-05-20T13:14:39.417Z" }, + { url = "https://files.pythonhosted.org/packages/8a/bd/e11a108317485075e68af9d23039619b86b28130c3b50d227d42edece64b/greenlet-3.5.1-cp314-cp314-win_amd64.whl", hash = "sha256:8a17c42330e261299766b75ac1ea32caa437a9453c8f65d16a13140db378ecd3", size = 239800, upload-time = "2026-05-20T13:09:30.128Z" }, + { url = "https://files.pythonhosted.org/packages/47/f8/8e8e8417b7bf28639a5a56356ef934d0375e1d0c70a57e04d7701e870ffe/greenlet-3.5.1-cp314-cp314-win_arm64.whl", hash = "sha256:7b5f5fae05b8ac6d176a61b60c394a8cbdc2b5b91b81793066e68745cf165e54", size = 236862, upload-time = "2026-05-20T13:09:10.498Z" }, + { url = "https://files.pythonhosted.org/packages/90/12/41bf27fde4d3605d3773ae57751eda182b8be2f5398011c041173b1d9534/greenlet-3.5.1-cp314-cp314t-macosx_11_0_universal2.whl", hash = "sha256:ea8da1e900d758d078810d4255d8c6aa572181896a31ec79d779eb79c3adc9ad", size = 293637, upload-time = "2026-05-20T13:12:35.529Z" }, + { url = "https://files.pythonhosted.org/packages/44/44/ba14b23e9757707050c2f397d305bbcae62e5d7cad122f8b6baec5ae4a1f/greenlet-3.5.1-cp314-cp314t-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:a19570c52a21420dcbc94e661994bc325c0b5b11304540fed514586da5dc8f2e", size = 650840, upload-time = "2026-05-20T14:00:11.079Z" }, + { url = "https://files.pythonhosted.org/packages/a8/37/5ddc2b686a6844f91abecef43411842426da2e1573f60b49ecf2547f4ae1/greenlet-3.5.1-cp314-cp314t-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:3d955c89b75eeca4723d7cc14135f393cd47c32e2a6cb4a8e4c6e760a26b0986", size = 656416, upload-time = "2026-05-20T14:05:47.118Z" }, + { url = "https://files.pythonhosted.org/packages/8c/46/5987dcd1a2570ba84f3b187536b2ca3ae97613387e57f5cfa99df068fe5e/greenlet-3.5.1-cp314-cp314t-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:ea37d5a157eb9493820d3792ac4ece28619a394391d2b9f2f78057d396ff0f0f", size = 656607, upload-time = "2026-05-20T14:09:13.949Z" }, + { url = "https://files.pythonhosted.org/packages/e1/f0/d17510297c35a2992712f0bf84de3779749999f7d3d63aa1f09db7c62dbe/greenlet-3.5.1-cp314-cp314t-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:de2daaaebd1a5aa88c49045b6baf9310b3263796bd88db713edf37cf53e7bb4e", size = 654397, upload-time = "2026-05-20T13:14:30.696Z" }, + { url = "https://files.pythonhosted.org/packages/2c/c1/6da0a9ddcc29d7e51ef14883fa3dc1e53b3f4ffba00582106c7bf55da1d8/greenlet-3.5.1-cp314-cp314t-manylinux_2_39_riscv64.whl", hash = "sha256:8d8a23250ea3ec7b36de8fa4b541e9e2db3ee82915cc060ab0631609ad8b28de", size = 488287, upload-time = "2026-05-20T14:01:43.143Z" }, + { url = "https://files.pythonhosted.org/packages/37/eb/147387705bb89092645b012586e7273cb5ed3c90ef7eaf3a69173eaf0209/greenlet-3.5.1-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:3bfbd69cc349e43bf3a8ae1c85548ff0718efc887615c2db16c3833d7b0b072d", size = 1614469, upload-time = "2026-05-20T14:02:30.192Z" }, + { url = "https://files.pythonhosted.org/packages/a6/4e/37ee0da7732b7aa9896f17e15579a9df34b9fcb9dd494f0adfa749af6623/greenlet-3.5.1-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:4378720dd888136c27215a0214d32a4d37c3852765d45bc37aad0623423cfd78", size = 1675115, upload-time = "2026-05-20T13:14:40.972Z" }, + { url = "https://files.pythonhosted.org/packages/57/f3/97dfcf4a6eb5077f8a672234216fb5923eb89f2cab7081cb10b2cf75b605/greenlet-3.5.1-cp314-cp314t-win_amd64.whl", hash = "sha256:45718441607f9325d948db98cbc691276059316d0358c188c246da4e1d4d23d2", size = 245246, upload-time = "2026-05-20T13:12:22.646Z" }, + { url = "https://files.pythonhosted.org/packages/5d/73/d7f72e34b582f694f4a9b248162db7b09cc458a259ba8f0c0bfa1a34ea7d/greenlet-3.5.1-cp315-cp315-macosx_11_0_universal2.whl", hash = "sha256:2baee5ca02031757ffe8cc3d69f0cc0aec7065ce362622da74f32d3bcab1c541", size = 285575, upload-time = "2026-05-20T13:12:07.043Z" }, + { url = "https://files.pythonhosted.org/packages/df/59/fa9c6e87dc8ad27a95dabe2f29f372b733d05a8a67470f6c901ed9975655/greenlet-3.5.1-cp315-cp315-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:9b1ec3274918a81d3ea778b9e75b56b72b33f300edb6cf7f3a7fe1dae56683de", size = 656428, upload-time = "2026-05-20T14:00:12.556Z" }, + { url = "https://files.pythonhosted.org/packages/f6/f9/e753408871eaa61dfe35e619cfc67512b036fde99893685d50eea9e07146/greenlet-3.5.1-cp315-cp315-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:111e2390ffffc47d5840b01711dd7fac07d4c09283d0283e7f3264b14e284c64", size = 667064, upload-time = "2026-05-20T14:05:48.662Z" }, + { url = "https://files.pythonhosted.org/packages/dc/74/807a047255bf1e09303627c46dc043dca596b6958a354d904f32ab382005/greenlet-3.5.1-cp315-cp315-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:10a9a1c0bfbc93d41156ffcb90c75fbc05544054faf15dcc1fdf9765f8b607f0", size = 672962, upload-time = "2026-05-20T14:09:15.532Z" }, + { url = "https://files.pythonhosted.org/packages/96/27/5565b5b40389f1c7753003a07e21892fda8660926787036d5bc0308b8113/greenlet-3.5.1-cp315-cp315-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:e630136e905fe5ff43e86945ae41220b6d1470956a39220e708110ac48d01ea5", size = 665697, upload-time = "2026-05-20T13:14:32.943Z" }, + { url = "https://files.pythonhosted.org/packages/76/32/19d4e13225193c29b13e308015223f7d75fd3d8623d49dd19040d2ce8ec1/greenlet-3.5.1-cp315-cp315-manylinux_2_39_riscv64.whl", hash = "sha256:ef08c1567c78074b22d1a200183d52d04a14df447bf70bcbb6a3507a48e776fc", size = 476047, upload-time = "2026-05-20T14:01:44.39Z" }, + { url = "https://files.pythonhosted.org/packages/cf/82/e7de4178c0c2d1c9a5a3be3cc0b33e46a85b3ee4a77c071bf7ad8600e079/greenlet-3.5.1-cp315-cp315-musllinux_1_2_aarch64.whl", hash = "sha256:975eac34b44a7077ca4d421348455b94f0f518246a7f14bc6d2fdcfe5b584368", size = 1621256, upload-time = "2026-05-20T14:02:31.91Z" }, + { url = "https://files.pythonhosted.org/packages/00/10/f2dddcf7dacac17dfc68691809589adad06135eb28930429cf58a6467a2f/greenlet-3.5.1-cp315-cp315-musllinux_1_2_x86_64.whl", hash = "sha256:9ab3c3a0b2ae6198e67c898dad5215a49f9ae0d0081b3c3ec59f333e39eeca26", size = 1685956, upload-time = "2026-05-20T13:14:42.55Z" }, + { url = "https://files.pythonhosted.org/packages/22/17/4a232b32133230ada52f70e9d7f5b65b0caef8772f01849bd8d149e7e4ca/greenlet-3.5.1-cp315-cp315-win_amd64.whl", hash = "sha256:cbfc69be86e10dcfef5b1e6269d1d6926552aa89ee39e1de3353360c1b6989ab", size = 239802, upload-time = "2026-05-20T13:13:15.481Z" }, + { url = "https://files.pythonhosted.org/packages/c2/ae/4e623a7e6d4d2a5f4cb8e4c82de4169fc637942caae68d6e676b8a128ac5/greenlet-3.5.1-cp315-cp315-win_arm64.whl", hash = "sha256:92fd6d44ac5e5a887c8a5dc4a8ba0ba908527c31c12f78c6bc7dcfe8aab279f6", size = 236853, upload-time = "2026-05-20T13:15:37.301Z" }, + { url = "https://files.pythonhosted.org/packages/7a/57/816d9cff29119da3505b3d6a5e14a8af89006ac36f47f891ff293ee05af1/greenlet-3.5.1-cp315-cp315t-macosx_11_0_universal2.whl", hash = "sha256:a6fdf2433a5441ef9a95464f7c3e674775da1c8c1177fff311cee1acad4626ed", size = 293877, upload-time = "2026-05-20T13:10:19.078Z" }, + { url = "https://files.pythonhosted.org/packages/23/a1/59b0a7c7d140ff1a75626680b9a9899b79a9176cab298b394968fb023295/greenlet-3.5.1-cp315-cp315t-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:7546556f0d649f99f6a361098a55f761181bb2ea12ff150bb16d26092ad88244", size = 655333, upload-time = "2026-05-20T14:00:14.758Z" }, + { url = "https://files.pythonhosted.org/packages/72/1b/5efe127597625042218939d01855109f352779050768b670b52edcc16a6c/greenlet-3.5.1-cp315-cp315t-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:d5ee3ea898009fa898f85f9982255d35278c477bebe185beca249cab42d4526c", size = 659443, upload-time = "2026-05-20T14:05:50.159Z" }, + { url = "https://files.pythonhosted.org/packages/c9/9d/1dcdf7b95ab3cf8c7b6d7277c18a5e167312f2b362ddfcc5d5e6d8d84b43/greenlet-3.5.1-cp315-cp315t-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:a57b0d05a0448eed231d59c0ceb287dde984551e54cbc51ac2d4865712838e9c", size = 659998, upload-time = "2026-05-20T14:09:16.912Z" }, + { url = "https://files.pythonhosted.org/packages/6c/6d/c404246ea4d22d097a7426d0efb5b781bd7eb67715f09e79001bd552ab18/greenlet-3.5.1-cp315-cp315t-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:a5c81f74d204d3edd136ebfd50dce53acbb776995d721a0fe801626cfc93b8cd", size = 658356, upload-time = "2026-05-20T13:14:35.091Z" }, + { url = "https://files.pythonhosted.org/packages/05/7e/c4959664fc231d587d66d8e81f2095e98056ba1954beafdcbe635e251052/greenlet-3.5.1-cp315-cp315t-manylinux_2_39_riscv64.whl", hash = "sha256:b0703c2cef53e01baec47f7a3868009913ad71ec678bbecb42a6f40895e4ce62", size = 494470, upload-time = "2026-05-20T14:01:45.611Z" }, + { url = "https://files.pythonhosted.org/packages/51/02/f8ee37fb6d2219329f350af241c27fcf12df57e723d11f6fc6d3bacdadaa/greenlet-3.5.1-cp315-cp315t-musllinux_1_2_aarch64.whl", hash = "sha256:2c18ef16bf6d4dd410e4dd52996888ea1497be26892fe5bbc73580aba4287b8e", size = 1619216, upload-time = "2026-05-20T14:02:33.403Z" }, + { url = "https://files.pythonhosted.org/packages/93/c5/3dc9475ace2c7a3680da12372cddd7f1ac874eb410a1ac48d3e9dab83782/greenlet-3.5.1-cp315-cp315t-musllinux_1_2_x86_64.whl", hash = "sha256:17d86354f0ae6b61bf9be5148d0dd34e06c3cb7c602c671f79f29ac3b150e659", size = 1678427, upload-time = "2026-05-20T13:14:43.71Z" }, + { url = "https://files.pythonhosted.org/packages/df/4e/750c15c317a41ffb36f0bf40b933e3d744a7dede61889f74443ea69690cf/greenlet-3.5.1-cp315-cp315t-win_amd64.whl", hash = "sha256:e7516cf6ae6b8a582c2770a0caed47b8a48373ed732c33d69a72913ae6ac923e", size = 245225, upload-time = "2026-05-20T13:13:59.366Z" }, + { url = "https://files.pythonhosted.org/packages/4f/fd/d3baea2eeb7b617efd47e87ca06e2ec2c6118d303aa9e918e0ce16eadc10/greenlet-3.5.1-cp315-cp315t-win_arm64.whl", hash = "sha256:5028648bf2253ec4745add746129d3904121fa7fe871a76bed23c5720573ce0a", size = 239590, upload-time = "2026-05-20T13:13:37.382Z" }, +] + +[[package]] +name = "grpcio" +version = "1.80.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "typing-extensions" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/b7/48/af6173dbca4454f4637a4678b67f52ca7e0c1ed7d5894d89d434fecede05/grpcio-1.80.0.tar.gz", hash = "sha256:29aca15edd0688c22ba01d7cc01cb000d72b2033f4a3c72a81a19b56fd143257", size = 12978905, upload-time = "2026-03-30T08:49:10.502Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/5d/db/1d56e5f5823257b291962d6c0ce106146c6447f405b60b234c4f222a7cde/grpcio-1.80.0-cp311-cp311-linux_armv7l.whl", hash = "sha256:dfab85db094068ff42e2a3563f60ab3dddcc9d6488a35abf0132daec13209c8a", size = 6055009, upload-time = "2026-03-30T08:46:46.265Z" }, + { url = "https://files.pythonhosted.org/packages/6e/18/c83f3cad64c5ca63bca7e91e5e46b0d026afc5af9d0a9972472ceba294b3/grpcio-1.80.0-cp311-cp311-macosx_11_0_universal2.whl", hash = "sha256:5c07e82e822e1161354e32da2662f741a4944ea955f9f580ec8fb409dd6f6060", size = 12035295, upload-time = "2026-03-30T08:46:49.099Z" }, + { url = "https://files.pythonhosted.org/packages/0f/8e/e14966b435be2dda99fbe89db9525ea436edc79780431a1c2875a3582644/grpcio-1.80.0-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:ba0915d51fd4ced2db5ff719f84e270afe0e2d4c45a7bdb1e8d036e4502928c2", size = 6610297, upload-time = "2026-03-30T08:46:52.123Z" }, + { url = "https://files.pythonhosted.org/packages/cc/26/d5eb38f42ce0e3fdc8174ea4d52036ef8d58cc4426cb800f2610f625dd75/grpcio-1.80.0-cp311-cp311-manylinux2014_i686.manylinux_2_17_i686.whl", hash = "sha256:3cb8130ba457d2aa09fa6b7c3ed6b6e4e6a2685fce63cb803d479576c4d80e21", size = 7300208, upload-time = "2026-03-30T08:46:54.859Z" }, + { url = "https://files.pythonhosted.org/packages/25/51/bd267c989f85a17a5b3eea65a6feb4ff672af41ca614e5a0279cc0ea381c/grpcio-1.80.0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:09e5e478b3d14afd23f12e49e8b44c8684ac3c5f08561c43a5b9691c54d136ab", size = 6813442, upload-time = "2026-03-30T08:46:57.056Z" }, + { url = "https://files.pythonhosted.org/packages/9e/d9/d80eef735b19e9169e30164bbf889b46f9df9127598a83d174eb13a48b26/grpcio-1.80.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:00168469238b022500e486c1c33916acf2f2a9b2c022202cf8a1885d2e3073c1", size = 7414743, upload-time = "2026-03-30T08:46:59.682Z" }, + { url = "https://files.pythonhosted.org/packages/de/f2/567f5bd5054398ed6b0509b9a30900376dcf2786bd936812098808b49d8d/grpcio-1.80.0-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:8502122a3cc1714038e39a0b071acb1207ca7844208d5ea0d091317555ee7106", size = 8426046, upload-time = "2026-03-30T08:47:02.474Z" }, + { url = "https://files.pythonhosted.org/packages/62/29/73ef0141b4732ff5eacd68430ff2512a65c004696997f70476a83e548e7e/grpcio-1.80.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:ce1794f4ea6cc3ca29463f42d665c32ba1b964b48958a66497917fe9069f26e6", size = 7851641, upload-time = "2026-03-30T08:47:05.462Z" }, + { url = "https://files.pythonhosted.org/packages/46/69/abbfa360eb229a8623bab5f5a4f8105e445bd38ce81a89514ba55d281ad0/grpcio-1.80.0-cp311-cp311-win32.whl", hash = "sha256:51b4a7189b0bef2aa30adce3c78f09c83526cf3dddb24c6a96555e3b97340440", size = 4154368, upload-time = "2026-03-30T08:47:08.027Z" }, + { url = "https://files.pythonhosted.org/packages/6f/d4/ae92206d01183b08613e846076115f5ac5991bae358d2a749fa864da5699/grpcio-1.80.0-cp311-cp311-win_amd64.whl", hash = "sha256:02e64bb0bb2da14d947a49e6f120a75e947250aebe65f9629b62bb1f5c14e6e9", size = 4894235, upload-time = "2026-03-30T08:47:10.839Z" }, + { url = "https://files.pythonhosted.org/packages/5c/e8/a2b749265eb3415abc94f2e619bbd9e9707bebdda787e61c593004ec927a/grpcio-1.80.0-cp312-cp312-linux_armv7l.whl", hash = "sha256:c624cc9f1008361014378c9d776de7182b11fe8b2e5a81bc69f23a295f2a1ad0", size = 6015616, upload-time = "2026-03-30T08:47:13.428Z" }, + { url = "https://files.pythonhosted.org/packages/3e/97/b1282161a15d699d1e90c360df18d19165a045ce1c343c7f313f5e8a0b77/grpcio-1.80.0-cp312-cp312-macosx_11_0_universal2.whl", hash = "sha256:f49eddcac43c3bf350c0385366a58f36bed8cc2c0ec35ef7b74b49e56552c0c2", size = 12014204, upload-time = "2026-03-30T08:47:15.873Z" }, + { url = "https://files.pythonhosted.org/packages/6e/5e/d319c6e997b50c155ac5a8cb12f5173d5b42677510e886d250d50264949d/grpcio-1.80.0-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:d334591df610ab94714048e0d5b4f3dd5ad1bee74dfec11eee344220077a79de", size = 6563866, upload-time = "2026-03-30T08:47:18.588Z" }, + { url = "https://files.pythonhosted.org/packages/ae/f6/fdd975a2cb4d78eb67769a7b3b3830970bfa2e919f1decf724ae4445f42c/grpcio-1.80.0-cp312-cp312-manylinux2014_i686.manylinux_2_17_i686.whl", hash = "sha256:0cb517eb1d0d0aaf1d87af7cc5b801d686557c1d88b2619f5e31fab3c2315921", size = 7273060, upload-time = "2026-03-30T08:47:21.113Z" }, + { url = "https://files.pythonhosted.org/packages/db/f0/a3deb5feba60d9538a962913e37bd2e69a195f1c3376a3dd44fe0427e996/grpcio-1.80.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:4e78c4ac0d97dc2e569b2f4bcbbb447491167cb358d1a389fc4af71ab6f70411", size = 6782121, upload-time = "2026-03-30T08:47:23.827Z" }, + { url = "https://files.pythonhosted.org/packages/ca/84/36c6dcfddc093e108141f757c407902a05085e0c328007cb090d56646cdf/grpcio-1.80.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:2ed770b4c06984f3b47eb0517b1c69ad0b84ef3f40128f51448433be904634cd", size = 7383811, upload-time = "2026-03-30T08:47:26.517Z" }, + { url = "https://files.pythonhosted.org/packages/7c/ef/f3a77e3dc5b471a0ec86c564c98d6adfa3510d38f8ee99010410858d591e/grpcio-1.80.0-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:256507e2f524092f1473071a05e65a5b10d84b82e3ff24c5b571513cfaa61e2f", size = 8393860, upload-time = "2026-03-30T08:47:29.439Z" }, + { url = "https://files.pythonhosted.org/packages/9b/8d/9d4d27ed7f33d109c50d6b5ce578a9914aa68edab75d65869a17e630a8d1/grpcio-1.80.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:9a6284a5d907c37db53350645567c522be314bac859a64a7a5ca63b77bb7958f", size = 7830132, upload-time = "2026-03-30T08:47:33.254Z" }, + { url = "https://files.pythonhosted.org/packages/14/e4/9990b41c6d7a44e1e9dee8ac11d7a9802ba1378b40d77468a7761d1ad288/grpcio-1.80.0-cp312-cp312-win32.whl", hash = "sha256:c71309cfce2f22be26aa4a847357c502db6c621f1a49825ae98aa0907595b193", size = 4140904, upload-time = "2026-03-30T08:47:35.319Z" }, + { url = "https://files.pythonhosted.org/packages/2f/2c/296f6138caca1f4b92a31ace4ae1b87dab692fc16a7a3417af3bb3c805bf/grpcio-1.80.0-cp312-cp312-win_amd64.whl", hash = "sha256:9fe648599c0e37594c4809d81a9e77bd138cc82eb8baa71b6a86af65426723ff", size = 4880944, upload-time = "2026-03-30T08:47:37.831Z" }, + { url = "https://files.pythonhosted.org/packages/2f/3a/7c3c25789e3f069e581dc342e03613c5b1cb012c4e8c7d9d5cf960a75856/grpcio-1.80.0-cp313-cp313-linux_armv7l.whl", hash = "sha256:e9e408fc016dffd20661f0126c53d8a31c2821b5c13c5d67a0f5ed5de93319ad", size = 6017243, upload-time = "2026-03-30T08:47:40.075Z" }, + { url = "https://files.pythonhosted.org/packages/04/19/21a9806eb8240e174fd1ab0cd5b9aa948bb0e05c2f2f55f9d5d7405e6d08/grpcio-1.80.0-cp313-cp313-macosx_11_0_universal2.whl", hash = "sha256:92d787312e613754d4d8b9ca6d3297e69994a7912a32fa38c4c4e01c272974b0", size = 12010840, upload-time = "2026-03-30T08:47:43.11Z" }, + { url = "https://files.pythonhosted.org/packages/18/3a/23347d35f76f639e807fb7a36fad3068aed100996849a33809591f26eca6/grpcio-1.80.0-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:8ac393b58aa16991a2f1144ec578084d544038c12242da3a215966b512904d0f", size = 6567644, upload-time = "2026-03-30T08:47:46.806Z" }, + { url = "https://files.pythonhosted.org/packages/ff/40/96e07ecb604a6a67ae6ab151e3e35b132875d98bc68ec65f3e5ab3e781d7/grpcio-1.80.0-cp313-cp313-manylinux2014_i686.manylinux_2_17_i686.whl", hash = "sha256:68e5851ac4b9afe07e7f84483803ad167852570d65326b34d54ca560bfa53fb6", size = 7277830, upload-time = "2026-03-30T08:47:49.643Z" }, + { url = "https://files.pythonhosted.org/packages/9b/e2/da1506ecea1f34a5e365964644b35edef53803052b763ca214ba3870c856/grpcio-1.80.0-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:873ff5d17d68992ef6605330127425d2fc4e77e612fa3c3e0ed4e668685e3140", size = 6783216, upload-time = "2026-03-30T08:47:52.817Z" }, + { url = "https://files.pythonhosted.org/packages/44/83/3b20ff58d0c3b7f6caaa3af9a4174d4023701df40a3f39f7f1c8e7c48f9d/grpcio-1.80.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:2bea16af2750fd0a899bf1abd9022244418b55d1f37da2202249ba4ba673838d", size = 7385866, upload-time = "2026-03-30T08:47:55.687Z" }, + { url = "https://files.pythonhosted.org/packages/47/45/55c507599c5520416de5eefecc927d6a0d7af55e91cfffb2e410607e5744/grpcio-1.80.0-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:ba0db34f7e1d803a878284cd70e4c63cb6ae2510ba51937bf8f45ba997cefcf7", size = 8391602, upload-time = "2026-03-30T08:47:58.303Z" }, + { url = "https://files.pythonhosted.org/packages/10/bb/dd06f4c24c01db9cf11341b547d0a016b2c90ed7dbbb086a5710df7dd1d7/grpcio-1.80.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:8eb613f02d34721f1acf3626dfdb3545bd3c8505b0e52bf8b5710a28d02e8aa7", size = 7826752, upload-time = "2026-03-30T08:48:01.311Z" }, + { url = "https://files.pythonhosted.org/packages/f9/1e/9d67992ba23371fd63d4527096eb8c6b76d74d52b500df992a3343fd7251/grpcio-1.80.0-cp313-cp313-win32.whl", hash = "sha256:93b6f823810720912fd131f561f91f5fed0fda372b6b7028a2681b8194d5d294", size = 4142310, upload-time = "2026-03-30T08:48:04.594Z" }, + { url = "https://files.pythonhosted.org/packages/cf/e6/283326a27da9e2c3038bc93eeea36fb118ce0b2d03922a9cda6688f53c5b/grpcio-1.80.0-cp313-cp313-win_amd64.whl", hash = "sha256:e172cf795a3ba5246d3529e4d34c53db70e888fa582a8ffebd2e6e48bc0cba50", size = 4882833, upload-time = "2026-03-30T08:48:07.363Z" }, + { url = "https://files.pythonhosted.org/packages/c5/6d/e65307ce20f5a09244ba9e9d8476e99fb039de7154f37fb85f26978b59c3/grpcio-1.80.0-cp314-cp314-linux_armv7l.whl", hash = "sha256:3d4147a97c8344d065d01bbf8b6acec2cf86fb0400d40696c8bdad34a64ffc0e", size = 6017376, upload-time = "2026-03-30T08:48:10.005Z" }, + { url = "https://files.pythonhosted.org/packages/69/10/9cef5d9650c72625a699c549940f0abb3c4bfdb5ed45a5ce431f92f31806/grpcio-1.80.0-cp314-cp314-macosx_11_0_universal2.whl", hash = "sha256:d8e11f167935b3eb089ac9038e1a063e6d7dbe995c0bb4a661e614583352e76f", size = 12018133, upload-time = "2026-03-30T08:48:12.927Z" }, + { url = "https://files.pythonhosted.org/packages/04/82/983aabaad82ba26113caceeb9091706a0696b25da004fe3defb5b346e15b/grpcio-1.80.0-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:f14b618fc30de822681ee986cfdcc2d9327229dc4c98aed16896761cacd468b9", size = 6574748, upload-time = "2026-03-30T08:48:16.386Z" }, + { url = "https://files.pythonhosted.org/packages/07/d7/031666ef155aa0bf399ed7e19439656c38bbd143779ae0861b038ce82abd/grpcio-1.80.0-cp314-cp314-manylinux2014_i686.manylinux_2_17_i686.whl", hash = "sha256:4ed39fbdcf9b87370f6e8df4e39ca7b38b3e5e9d1b0013c7b6be9639d6578d14", size = 7277711, upload-time = "2026-03-30T08:48:19.627Z" }, + { url = "https://files.pythonhosted.org/packages/e8/43/f437a78f7f4f1d311804189e8f11fb311a01049b2e08557c1068d470cb2e/grpcio-1.80.0-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:2dcc70e9f0ba987526e8e8603a610fb4f460e42899e74e7a518bf3c68fe1bf05", size = 6785372, upload-time = "2026-03-30T08:48:22.373Z" }, + { url = "https://files.pythonhosted.org/packages/93/3d/f6558e9c6296cb4227faa5c43c54a34c68d32654b829f53288313d16a86e/grpcio-1.80.0-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:448c884b668b868562b1bda833c5fce6272d26e1926ec46747cda05741d302c1", size = 7395268, upload-time = "2026-03-30T08:48:25.638Z" }, + { url = "https://files.pythonhosted.org/packages/06/21/0fdd77e84720b08843c371a2efa6f2e19dbebf56adc72df73d891f5506f0/grpcio-1.80.0-cp314-cp314-musllinux_1_2_i686.whl", hash = "sha256:a1dc80fe55685b4a543555e6eef975303b36c8db1023b1599b094b92aa77965f", size = 8392000, upload-time = "2026-03-30T08:48:28.974Z" }, + { url = "https://files.pythonhosted.org/packages/f5/68/67f4947ed55d2e69f2cc199ab9fd85e0a0034d813bbeef84df6d2ba4d4b7/grpcio-1.80.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:31b9ac4ad1aa28ffee5503821fafd09e4da0a261ce1c1281c6c8da0423c83b6e", size = 7828477, upload-time = "2026-03-30T08:48:32.054Z" }, + { url = "https://files.pythonhosted.org/packages/44/b6/8d4096691b2e385e8271911a0de4f35f0a6c7d05aff7098e296c3de86939/grpcio-1.80.0-cp314-cp314-win32.whl", hash = "sha256:367ce30ba67d05e0592470428f0ec1c31714cab9ef19b8f2e37be1f4c7d32fae", size = 4218563, upload-time = "2026-03-30T08:48:34.538Z" }, + { url = "https://files.pythonhosted.org/packages/e5/8c/bbe6baf2557262834f2070cf668515fa308b2d38a4bbf771f8f7872a7036/grpcio-1.80.0-cp314-cp314-win_amd64.whl", hash = "sha256:3b01e1f5464c583d2f567b2e46ff0d516ef979978f72091fd81f5ab7fa6e2e7f", size = 5019457, upload-time = "2026-03-30T08:48:37.308Z" }, +] + +[[package]] +name = "gunicorn" +version = "24.1.1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "packaging" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/78/0a/10739c03537ec5b131a867bf94df2e412b437696c7e5d26970e2198a80d2/gunicorn-24.1.1.tar.gz", hash = "sha256:f006d110e5cb3102859b4f5cd48335dbd9cc28d0d27cd24ddbdafa6c60929408", size = 287567, upload-time = "2026-01-24T01:15:31.359Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/96/90/cfe637677916fc6f53cd2b05d5746e249f683e1fa14c9e745a88c66f7290/gunicorn-24.1.1-py3-none-any.whl", hash = "sha256:757f6b621fc4f7581a90600b2cd9df593461f06a41d7259cb9b94499dc4095a8", size = 114920, upload-time = "2026-01-24T01:15:29.656Z" }, +] + +[package.optional-dependencies] +gevent = [ + { name = "gevent" }, +] + +[[package]] +name = "idna" +version = "3.17" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/b9/28/99c51f664567218d824af024c0251650fb27e4ca066df188dab0769c5b91/idna-3.17.tar.gz", hash = "sha256:5eb0cb53bc467c12eadcf6de83163ad8527cec9416f44b9b61b19caedad2b87f", size = 196048, upload-time = "2026-05-28T14:32:38.55Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/de/a7/f76514cc40ad6234098ecdebda08732d75964776c51a42845b7da10649e2/idna-3.17-py3-none-any.whl", hash = "sha256:466e48829084efe2548012b855df21540b96f2e20e51bd124c851536556a592c", size = 65316, upload-time = "2026-05-28T14:32:37.035Z" }, +] + +[[package]] +name = "iniconfig" +version = "2.3.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/72/34/14ca021ce8e5dfedc35312d08ba8bf51fdd999c576889fc2c24cb97f4f10/iniconfig-2.3.0.tar.gz", hash = "sha256:c76315c77db068650d49c5b56314774a7804df16fee4402c1f19d6d15d8c4730", size = 20503, upload-time = "2025-10-18T21:55:43.219Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/cb/b1/3846dd7f199d53cb17f49cba7e651e9ce294d8497c8c150530ed11865bb8/iniconfig-2.3.0-py3-none-any.whl", hash = "sha256:f631c04d2c48c52b84d0d0549c99ff3859c98df65b3101406327ecc7d53fbf12", size = 7484, upload-time = "2025-10-18T21:55:41.639Z" }, +] + +[[package]] +name = "ipykernel" +version = "6.29.5" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "appnope", marker = "sys_platform == 'darwin'" }, + { name = "comm" }, + { name = "debugpy" }, + { name = "ipython" }, + { name = "jupyter-client" }, + { name = "jupyter-core" }, + { name = "matplotlib-inline" }, + { name = "nest-asyncio" }, + { name = "packaging" }, + { name = "psutil" }, + { name = "pyzmq" }, + { name = "tornado" }, + { name = "traitlets" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/e9/5c/67594cb0c7055dc50814b21731c22a601101ea3b1b50a9a1b090e11f5d0f/ipykernel-6.29.5.tar.gz", hash = "sha256:f093a22c4a40f8828f8e330a9c297cb93dcab13bd9678ded6de8e5cf81c56215", size = 163367, upload-time = "2024-07-01T14:07:22.543Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/94/5c/368ae6c01c7628438358e6d337c19b05425727fbb221d2a3c4303c372f42/ipykernel-6.29.5-py3-none-any.whl", hash = "sha256:afdb66ba5aa354b09b91379bac28ae4afebbb30e8b39510c9690afb7a10421b5", size = 117173, upload-time = "2024-07-01T14:07:19.603Z" }, +] + +[[package]] +name = "ipython" +version = "9.13.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "colorama", marker = "sys_platform == 'win32'" }, + { name = "decorator" }, + { name = "ipython-pygments-lexers" }, + { name = "jedi" }, + { name = "matplotlib-inline" }, + { name = "pexpect", marker = "sys_platform != 'emscripten' and sys_platform != 'win32'" }, + { name = "prompt-toolkit" }, + { name = "psutil" }, + { name = "pygments" }, + { name = "stack-data" }, + { name = "traitlets" }, + { name = "typing-extensions", marker = "python_full_version < '3.12'" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/cd/c4/87cda5842cf5c31837c06ddb588e11c3c35d8ece89b7a0108c06b8c9b00a/ipython-9.13.0.tar.gz", hash = "sha256:7e834b6afc99f020e3f05966ced34792f40267d64cb1ea9043886dab0dde5967", size = 4430549, upload-time = "2026-04-24T12:24:55.221Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/b9/86/3060e8029b7cc505cce9a0137431dda81d0a3fde93a8f0f50ee0bf37a795/ipython-9.13.0-py3-none-any.whl", hash = "sha256:57f9d4639e20818d328d287c7b549af3d05f12486ea8f2e7f73e52a36ec4d201", size = 627274, upload-time = "2026-04-24T12:24:53.038Z" }, +] + +[[package]] +name = "ipython-genutils" +version = "0.2.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/e8/69/fbeffffc05236398ebfcfb512b6d2511c622871dca1746361006da310399/ipython_genutils-0.2.0.tar.gz", hash = "sha256:eb2e116e75ecef9d4d228fdc66af54269afa26ab4463042e33785b887c628ba8", size = 22208, upload-time = "2017-03-13T22:12:26.393Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/fa/bc/9bd3b5c2b4774d5f33b2d544f1460be9df7df2fe42f352135381c347c69a/ipython_genutils-0.2.0-py2.py3-none-any.whl", hash = "sha256:72dd37233799e619666c9f639a9da83c34013a73e8bbc79a7a6348d93c61fab8", size = 26343, upload-time = "2017-03-13T22:12:25.412Z" }, +] + +[[package]] +name = "ipython-pygments-lexers" +version = "1.1.1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "pygments" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/ef/4c/5dd1d8af08107f88c7f741ead7a40854b8ac24ddf9ae850afbcf698aa552/ipython_pygments_lexers-1.1.1.tar.gz", hash = "sha256:09c0138009e56b6854f9535736f4171d855c8c08a563a0dcd8022f78355c7e81", size = 8393, upload-time = "2025-01-17T11:24:34.505Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/d9/33/1f075bf72b0b747cb3288d011319aaf64083cf2efef8354174e3ed4540e2/ipython_pygments_lexers-1.1.1-py3-none-any.whl", hash = "sha256:a9462224a505ade19a605f71f8fa63c2048833ce50abc86768a0d81d876dc81c", size = 8074, upload-time = "2025-01-17T11:24:33.271Z" }, +] + +[[package]] +name = "isoduration" +version = "20.11.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "arrow" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/7c/1a/3c8edc664e06e6bd06cce40c6b22da5f1429aa4224d0c590f3be21c91ead/isoduration-20.11.0.tar.gz", hash = "sha256:ac2f9015137935279eac671f94f89eb00584f940f5dc49462a0c4ee692ba1bd9", size = 11649, upload-time = "2020-11-01T11:00:00.312Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/7b/55/e5326141505c5d5e34c5e0935d2908a74e4561eca44108fbfb9c13d2911a/isoduration-20.11.0-py3-none-any.whl", hash = "sha256:b2904c2a4228c3d44f409c8ae8e2370eb21a26f7ac2ec5446df141dde3452042", size = 11321, upload-time = "2020-11-01T10:59:58.02Z" }, +] + +[[package]] +name = "itsdangerous" +version = "2.2.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/9c/cb/8ac0172223afbccb63986cc25049b154ecfb5e85932587206f42317be31d/itsdangerous-2.2.0.tar.gz", hash = "sha256:e0050c0b7da1eea53ffaf149c0cfbb5c6e2e2b69c4bef22c81fa6eb73e5f6173", size = 54410, upload-time = "2024-04-16T21:28:15.614Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/04/96/92447566d16df59b2a776c0fb82dbc4d9e07cd95062562af01e408583fc4/itsdangerous-2.2.0-py3-none-any.whl", hash = "sha256:c6242fc49e35958c8b15141343aa660db5fc54d4f13a1db01a3f5891b98700ef", size = 16234, upload-time = "2024-04-16T21:28:14.499Z" }, +] + +[[package]] +name = "jedi" +version = "0.20.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "parso" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/46/b7/a3635f6a2d7cf5b5dd98064fc1d5fbbafcb25477bcea204a3a92145d158b/jedi-0.20.0.tar.gz", hash = "sha256:c3f4ccbd276696f4b19c54618d4fb18f9fc24b0aef02acf704b23f487daa1011", size = 3119416, upload-time = "2026-05-01T23:38:47.814Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/9a/93/242e2eab5fe682ffcb8b0084bde703a41d51e17ee0f3a31ff0d9d813620a/jedi-0.20.0-py2.py3-none-any.whl", hash = "sha256:7bdd9c2634f56713299976f4cbd59cb3fa92165cc5e05ea811fb253480728b67", size = 4884812, upload-time = "2026-05-01T23:38:43.919Z" }, +] + +[[package]] +name = "jinja2" +version = "3.1.6" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "markupsafe" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/df/bf/f7da0350254c0ed7c72f3e33cef02e048281fec7ecec5f032d4aac52226b/jinja2-3.1.6.tar.gz", hash = "sha256:0137fb05990d35f1275a587e9aee6d56da821fc83491a0fb838183be43f66d6d", size = 245115, upload-time = "2025-03-05T20:05:02.478Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/62/a1/3d680cbfd5f4b8f15abc1d571870c5fc3e594bb582bc3b64ea099db13e56/jinja2-3.1.6-py3-none-any.whl", hash = "sha256:85ece4451f492d0c13c5dd7c13a64681a86afae63a5f347908daf103ce6d2f67", size = 134899, upload-time = "2025-03-05T20:05:00.369Z" }, +] + +[[package]] +name = "jmespath" +version = "1.1.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/d3/59/322338183ecda247fb5d1763a6cbe46eff7222eaeebafd9fa65d4bf5cb11/jmespath-1.1.0.tar.gz", hash = "sha256:472c87d80f36026ae83c6ddd0f1d05d4e510134ed462851fd5f754c8c3cbb88d", size = 27377, upload-time = "2026-01-22T16:35:26.279Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/14/2f/967ba146e6d58cf6a652da73885f52fc68001525b4197effc174321d70b4/jmespath-1.1.0-py3-none-any.whl", hash = "sha256:a5663118de4908c91729bea0acadca56526eb2698e83de10cd116ae0f4e97c64", size = 20419, upload-time = "2026-01-22T16:35:24.919Z" }, +] + +[[package]] +name = "joblib" +version = "1.5.3" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/41/f2/d34e8b3a08a9cc79a50b2208a93dce981fe615b64d5a4d4abee421d898df/joblib-1.5.3.tar.gz", hash = "sha256:8561a3269e6801106863fd0d6d84bb737be9e7631e33aaed3fb9ce5953688da3", size = 331603, upload-time = "2025-12-15T08:41:46.427Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/7b/91/984aca2ec129e2757d1e4e3c81c3fcda9d0f85b74670a094cc443d9ee949/joblib-1.5.3-py3-none-any.whl", hash = "sha256:5fc3c5039fc5ca8c0276333a188bbd59d6b7ab37fe6632daa76bc7f9ec18e713", size = 309071, upload-time = "2025-12-15T08:41:44.973Z" }, +] + +[[package]] +name = "json2html" +version = "1.3.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/01/d5/40b617ee19d2d79f606ed37f8a81e51158f126d2af67270c68f2b47ae0d5/json2html-1.3.0.tar.gz", hash = "sha256:8951a53662ae9cfd812685facdba693fc950ffc1c1fd1a8a2d3cf4c34600689c", size = 6977, upload-time = "2019-07-03T20:50:03.023Z" } + +[[package]] +name = "jsonpointer" +version = "3.1.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/18/c7/af399a2e7a67fd18d63c40c5e62d3af4e67b836a2107468b6a5ea24c4304/jsonpointer-3.1.1.tar.gz", hash = "sha256:0b801c7db33a904024f6004d526dcc53bbb8a4a0f4e32bfd10beadf60adf1900", size = 9068, upload-time = "2026-03-23T22:32:32.458Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/9e/6a/a83720e953b1682d2d109d3c2dbb0bc9bf28cc1cbc205be4ef4be5da709d/jsonpointer-3.1.1-py3-none-any.whl", hash = "sha256:8ff8b95779d071ba472cf5bc913028df06031797532f08a7d5b602d8b2a488ca", size = 7659, upload-time = "2026-03-23T22:32:31.568Z" }, +] + +[[package]] +name = "jsonschema" +version = "4.26.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "attrs" }, + { name = "jsonschema-specifications" }, + { name = "referencing" }, + { name = "rpds-py" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/b3/fc/e067678238fa451312d4c62bf6e6cf5ec56375422aee02f9cb5f909b3047/jsonschema-4.26.0.tar.gz", hash = "sha256:0c26707e2efad8aa1bfc5b7ce170f3fccc2e4918ff85989ba9ffa9facb2be326", size = 366583, upload-time = "2026-01-07T13:41:07.246Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/69/90/f63fb5873511e014207a475e2bb4e8b2e570d655b00ac19a9a0ca0a385ee/jsonschema-4.26.0-py3-none-any.whl", hash = "sha256:d489f15263b8d200f8387e64b4c3a75f06629559fb73deb8fdfb525f2dab50ce", size = 90630, upload-time = "2026-01-07T13:41:05.306Z" }, +] + +[package.optional-dependencies] +format-nongpl = [ + { name = "fqdn" }, + { name = "idna" }, + { name = "isoduration" }, + { name = "jsonpointer" }, + { name = "rfc3339-validator" }, + { name = "rfc3986-validator" }, + { name = "rfc3987-syntax" }, + { name = "uri-template" }, + { name = "webcolors" }, +] + +[[package]] +name = "jsonschema-specifications" +version = "2025.9.1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "referencing" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/19/74/a633ee74eb36c44aa6d1095e7cc5569bebf04342ee146178e2d36600708b/jsonschema_specifications-2025.9.1.tar.gz", hash = "sha256:b540987f239e745613c7a9176f3edb72b832a4ac465cf02712288397832b5e8d", size = 32855, upload-time = "2025-09-08T01:34:59.186Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/41/45/1a4ed80516f02155c51f51e8cedb3c1902296743db0bbc66608a0db2814f/jsonschema_specifications-2025.9.1-py3-none-any.whl", hash = "sha256:98802fee3a11ee76ecaca44429fda8a41bff98b00a0f2838151b113f210cc6fe", size = 18437, upload-time = "2025-09-08T01:34:57.871Z" }, +] + +[[package]] +name = "jupyter-client" +version = "7.4.9" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "entrypoints" }, + { name = "jupyter-core" }, + { name = "nest-asyncio" }, + { name = "python-dateutil" }, + { name = "pyzmq" }, + { name = "tornado" }, + { name = "traitlets" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/1e/33/71778cdd2c69445bcd3bb6029da2e43cc9b5cbbeef4f4982ef3aaf396650/jupyter_client-7.4.9.tar.gz", hash = "sha256:52be28e04171f07aed8f20e1616a5a552ab9fee9cbbe6c1896ae170c3880d392", size = 329115, upload-time = "2023-01-12T20:05:10.58Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/fd/a7/ef3b7c8b9d6730a21febdd0809084e4cea6d2a7e43892436adecdd0acbd4/jupyter_client-7.4.9-py3-none-any.whl", hash = "sha256:214668aaea208195f4c13d28eb272ba79f945fc0cf3f11c7092c20b2ca1980e7", size = 133492, upload-time = "2023-01-12T20:05:08.044Z" }, +] + +[[package]] +name = "jupyter-core" +version = "5.9.1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "platformdirs" }, + { name = "traitlets" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/02/49/9d1284d0dc65e2c757b74c6687b6d319b02f822ad039e5c512df9194d9dd/jupyter_core-5.9.1.tar.gz", hash = "sha256:4d09aaff303b9566c3ce657f580bd089ff5c91f5f89cf7d8846c3cdf465b5508", size = 89814, upload-time = "2025-10-16T19:19:18.444Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/e7/e7/80988e32bf6f73919a113473a604f5a8f09094de312b9d52b79c2df7612b/jupyter_core-5.9.1-py3-none-any.whl", hash = "sha256:ebf87fdc6073d142e114c72c9e29a9d7ca03fad818c5d300ce2adc1fb0743407", size = 29032, upload-time = "2025-10-16T19:19:16.783Z" }, +] + +[[package]] +name = "jupyter-events" +version = "0.12.1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "jsonschema", extra = ["format-nongpl"] }, + { name = "packaging" }, + { name = "python-json-logger" }, + { name = "pyyaml" }, + { name = "referencing" }, + { name = "rfc3339-validator" }, + { name = "rfc3986-validator" }, + { name = "traitlets" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/18/f8/475c4241b2b75af0deaae453ed003c6c851766dbc44d332d8baf245dc931/jupyter_events-0.12.1.tar.gz", hash = "sha256:faff25f77218335752f35f23c5fe6e4a392a7bd99a5939ccb9b8fbf594636cf3", size = 62854, upload-time = "2026-04-20T23:17:50.66Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/eb/6c/6fcde0c8f616ed360ffd3587f7db9e225a7e62b583a04494d2f069cf64ea/jupyter_events-0.12.1-py3-none-any.whl", hash = "sha256:c366585253f537a627da52fa7ca7410c5b5301fe893f511e7b077c2d93ec8bcf", size = 19512, upload-time = "2026-04-20T23:17:48.927Z" }, +] + +[[package]] +name = "jupyter-server" +version = "2.18.2" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "anyio" }, + { name = "argon2-cffi" }, + { name = "jinja2" }, + { name = "jupyter-client" }, + { name = "jupyter-core" }, + { name = "jupyter-events" }, + { name = "jupyter-server-terminals" }, + { name = "nbconvert" }, + { name = "nbformat" }, + { name = "overrides", marker = "python_full_version < '3.12'" }, + { name = "packaging" }, + { name = "prometheus-client" }, + { name = "pywinpty", marker = "os_name == 'nt'" }, + { name = "pyzmq" }, + { name = "send2trash" }, + { name = "terminado" }, + { name = "tornado" }, + { name = "traitlets" }, + { name = "websocket-client" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/ca/15/1eacb0fcb79ef86e8a0a79a708e6ad7435f6f223097dd29a4ce861fabc44/jupyter_server-2.18.2.tar.gz", hash = "sha256:06b4f40d8a7a00bb39d5216859c81374a0e7cfefe6d8a5a7facc5a5c37c679a7", size = 753177, upload-time = "2026-05-06T07:04:36.274Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/e2/50/ecf4f70d65bdb7519b28a33d1b2fee8a4b4ba1ae1a92f15d97e877c5de21/jupyter_server-2.18.2-py3-none-any.whl", hash = "sha256:fa5e46539ded65791838035a2b6001f13e54d5f64b8b3752eb1e91fdd641a5b8", size = 391907, upload-time = "2026-05-06T07:04:34.014Z" }, +] + +[[package]] +name = "jupyter-server-terminals" +version = "0.5.4" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "pywinpty", marker = "os_name == 'nt'" }, + { name = "terminado" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/f4/a7/bcd0a9b0cbba88986fe944aaaf91bfda603e5a50bda8ed15123f381a3b2f/jupyter_server_terminals-0.5.4.tar.gz", hash = "sha256:bbda128ed41d0be9020349f9f1f2a4ab9952a73ed5f5ac9f1419794761fb87f5", size = 31770, upload-time = "2026-01-14T16:53:20.213Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/d1/2d/6674563f71c6320841fc300911a55143925112a72a883e2ca71fba4c618d/jupyter_server_terminals-0.5.4-py3-none-any.whl", hash = "sha256:55be353fc74a80bc7f3b20e6be50a55a61cd525626f578dcb66a5708e2007d14", size = 13704, upload-time = "2026-01-14T16:53:18.738Z" }, +] + +[[package]] +name = "jupyterlab-pygments" +version = "0.3.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/90/51/9187be60d989df97f5f0aba133fa54e7300f17616e065d1ada7d7646b6d6/jupyterlab_pygments-0.3.0.tar.gz", hash = "sha256:721aca4d9029252b11cfa9d185e5b5af4d54772bb8072f9b7036f4170054d35d", size = 512900, upload-time = "2023-11-23T09:26:37.44Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/b1/dd/ead9d8ea85bf202d90cc513b533f9c363121c7792674f78e0d8a854b63b4/jupyterlab_pygments-0.3.0-py3-none-any.whl", hash = "sha256:841a89020971da1d8693f1a99997aefc5dc424bb1b251fd6322462a1b8842780", size = 15884, upload-time = "2023-11-23T09:26:34.325Z" }, +] + +[[package]] +name = "kiwisolver" +version = "1.5.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/d0/67/9c61eccb13f0bdca9307614e782fec49ffdde0f7a2314935d489fa93cd9c/kiwisolver-1.5.0.tar.gz", hash = "sha256:d4193f3d9dc3f6f79aaed0e5637f45d98850ebf01f7ca20e69457f3e8946b66a", size = 103482, upload-time = "2026-03-09T13:15:53.382Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/12/dd/a495a9c104be1c476f0386e714252caf2b7eca883915422a64c50b88c6f5/kiwisolver-1.5.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:9eed0f7edbb274413b6ee781cca50541c8c0facd3d6fd289779e494340a2b85c", size = 122798, upload-time = "2026-03-09T13:12:58.963Z" }, + { url = "https://files.pythonhosted.org/packages/11/60/37b4047a2af0cf5ef6d8b4b26e91829ae6fc6a2d1f74524bcb0e7cd28a32/kiwisolver-1.5.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:3c4923e404d6bcd91b6779c009542e5647fef32e4a5d75e115e3bbac6f2335eb", size = 66216, upload-time = "2026-03-09T13:13:00.155Z" }, + { url = "https://files.pythonhosted.org/packages/0a/aa/510dc933d87767584abfe03efa445889996c70c2990f6f87c3ebaa0a18c5/kiwisolver-1.5.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:0df54df7e686afa55e6f21fb86195224a6d9beb71d637e8d7920c95cf0f89aac", size = 63911, upload-time = "2026-03-09T13:13:01.671Z" }, + { url = "https://files.pythonhosted.org/packages/80/46/bddc13df6c2a40741e0cc7865bb1c9ed4796b6760bd04ce5fae3928ef917/kiwisolver-1.5.0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:2517e24d7315eb51c10664cdb865195df38ab74456c677df67bb47f12d088a27", size = 1438209, upload-time = "2026-03-09T13:13:03.385Z" }, + { url = "https://files.pythonhosted.org/packages/fd/d6/76621246f5165e5372f02f5e6f3f48ea336a8f9e96e43997d45b240ed8cd/kiwisolver-1.5.0-cp311-cp311-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:ff710414307fefa903e0d9bdf300972f892c23477829f49504e59834f4195398", size = 1248888, upload-time = "2026-03-09T13:13:05.231Z" }, + { url = "https://files.pythonhosted.org/packages/b2/c1/31559ec6fb39a5b48035ce29bb63ade628f321785f38c384dee3e2c08bc1/kiwisolver-1.5.0-cp311-cp311-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:6176c1811d9d5a04fa391c490cc44f451e240697a16977f11c6f722efb9041db", size = 1266304, upload-time = "2026-03-09T13:13:06.743Z" }, + { url = "https://files.pythonhosted.org/packages/5e/ef/1cb8276f2d29cc6a41e0a042f27946ca347d3a4a75acf85d0a16aa6dcc82/kiwisolver-1.5.0-cp311-cp311-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:50847dca5d197fcbd389c805aa1a1cf32f25d2e7273dc47ab181a517666b68cc", size = 1319650, upload-time = "2026-03-09T13:13:08.607Z" }, + { url = "https://files.pythonhosted.org/packages/4c/e4/5ba3cecd7ce6236ae4a80f67e5d5531287337d0e1f076ca87a5abe4cd5d0/kiwisolver-1.5.0-cp311-cp311-manylinux_2_39_riscv64.whl", hash = "sha256:01808c6d15f4c3e8559595d6d1fe6411c68e4a3822b4b9972b44473b24f4e679", size = 970949, upload-time = "2026-03-09T13:13:10.299Z" }, + { url = "https://files.pythonhosted.org/packages/5a/69/dc61f7ae9a2f071f26004ced87f078235b5507ab6e5acd78f40365655034/kiwisolver-1.5.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:f1f9f4121ec58628c96baa3de1a55a4e3a333c5102c8e94b64e23bf7b2083309", size = 2199125, upload-time = "2026-03-09T13:13:11.841Z" }, + { url = "https://files.pythonhosted.org/packages/e5/7b/abbe0f1b5afa85f8d084b73e90e5f801c0939eba16ac2e49af7c61a6c28d/kiwisolver-1.5.0-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:b7d335370ae48a780c6e6a6bbfa97342f563744c39c35562f3f367665f5c1de2", size = 2293783, upload-time = "2026-03-09T13:13:14.399Z" }, + { url = "https://files.pythonhosted.org/packages/8a/80/5908ae149d96d81580d604c7f8aefd0e98f4fd728cf172f477e9f2a81744/kiwisolver-1.5.0-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:800ee55980c18545af444d93fdd60c56b580db5cc54867d8cbf8a1dc0829938c", size = 1960726, upload-time = "2026-03-09T13:13:16.047Z" }, + { url = "https://files.pythonhosted.org/packages/84/08/a78cb776f8c085b7143142ce479859cfec086bd09ee638a317040b6ef420/kiwisolver-1.5.0-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:c438f6ca858697c9ab67eb28246c92508af972e114cac34e57a6d4ba17a3ac08", size = 2464738, upload-time = "2026-03-09T13:13:17.897Z" }, + { url = "https://files.pythonhosted.org/packages/b1/e1/65584da5356ed6cb12c63791a10b208860ac40a83de165cb6a6751a686e3/kiwisolver-1.5.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:8c63c91f95173f9c2a67c7c526b2cea976828a0e7fced9cdcead2802dc10f8a4", size = 2270718, upload-time = "2026-03-09T13:13:19.421Z" }, + { url = "https://files.pythonhosted.org/packages/be/6c/28f17390b62b8f2f520e2915095b3c94d88681ecf0041e75389d9667f202/kiwisolver-1.5.0-cp311-cp311-win_amd64.whl", hash = "sha256:beb7f344487cdcb9e1efe4b7a29681b74d34c08f0043a327a74da852a6749e7b", size = 73480, upload-time = "2026-03-09T13:13:20.818Z" }, + { url = "https://files.pythonhosted.org/packages/d8/0e/2ee5debc4f77a625778fec5501ff3e8036fe361b7ee28ae402a485bb9694/kiwisolver-1.5.0-cp311-cp311-win_arm64.whl", hash = "sha256:ad4ae4ffd1ee9cd11357b4c66b612da9888f4f4daf2f36995eda64bd45370cac", size = 64930, upload-time = "2026-03-09T13:13:21.997Z" }, + { url = "https://files.pythonhosted.org/packages/4d/b2/818b74ebea34dabe6d0c51cb1c572e046730e64844da6ed646d5298c40ce/kiwisolver-1.5.0-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:4e9750bc21b886308024f8a54ccb9a2cc38ac9fa813bf4348434e3d54f337ff9", size = 123158, upload-time = "2026-03-09T13:13:23.127Z" }, + { url = "https://files.pythonhosted.org/packages/bf/d9/405320f8077e8e1c5c4bd6adc45e1e6edf6d727b6da7f2e2533cf58bff71/kiwisolver-1.5.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:72ec46b7eba5b395e0a7b63025490d3214c11013f4aacb4f5e8d6c3041829588", size = 66388, upload-time = "2026-03-09T13:13:24.765Z" }, + { url = "https://files.pythonhosted.org/packages/99/9f/795fedf35634f746151ca8839d05681ceb6287fbed6cc1c9bf235f7887c2/kiwisolver-1.5.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:ed3a984b31da7481b103f68776f7128a89ef26ed40f4dc41a2223cda7fb24819", size = 64068, upload-time = "2026-03-09T13:13:25.878Z" }, + { url = "https://files.pythonhosted.org/packages/c4/13/680c54afe3e65767bed7ec1a15571e1a2f1257128733851ade24abcefbcc/kiwisolver-1.5.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:bb5136fb5352d3f422df33f0c879a1b0c204004324150cc3b5e3c4f310c9049f", size = 1477934, upload-time = "2026-03-09T13:13:27.166Z" }, + { url = "https://files.pythonhosted.org/packages/c8/2f/cebfcdb60fd6a9b0f6b47a9337198bcbad6fbe15e68189b7011fd914911f/kiwisolver-1.5.0-cp312-cp312-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:b2af221f268f5af85e776a73d62b0845fc8baf8ef0abfae79d29c77d0e776aaf", size = 1278537, upload-time = "2026-03-09T13:13:28.707Z" }, + { url = "https://files.pythonhosted.org/packages/f2/0d/9b782923aada3fafb1d6b84e13121954515c669b18af0c26e7d21f579855/kiwisolver-1.5.0-cp312-cp312-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:b0f172dc8ffaccb8522d7c5d899de00133f2f1ca7b0a49b7da98e901de87bf2d", size = 1296685, upload-time = "2026-03-09T13:13:30.528Z" }, + { url = "https://files.pythonhosted.org/packages/27/70/83241b6634b04fe44e892688d5208332bde130f38e610c0418f9ede47ded/kiwisolver-1.5.0-cp312-cp312-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:6ab8ba9152203feec73758dad83af9a0bbe05001eb4639e547207c40cfb52083", size = 1346024, upload-time = "2026-03-09T13:13:32.818Z" }, + { url = "https://files.pythonhosted.org/packages/e4/db/30ed226fb271ae1a6431fc0fe0edffb2efe23cadb01e798caeb9f2ceae8f/kiwisolver-1.5.0-cp312-cp312-manylinux_2_39_riscv64.whl", hash = "sha256:cdee07c4d7f6d72008d3f73b9bf027f4e11550224c7c50d8df1ae4a37c1402a6", size = 987241, upload-time = "2026-03-09T13:13:34.435Z" }, + { url = "https://files.pythonhosted.org/packages/ec/bd/c314595208e4c9587652d50959ead9e461995389664e490f4dce7ff0f782/kiwisolver-1.5.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:7c60d3c9b06fb23bd9c6139281ccbdc384297579ae037f08ae90c69f6845c0b1", size = 2227742, upload-time = "2026-03-09T13:13:36.4Z" }, + { url = "https://files.pythonhosted.org/packages/c1/43/0499cec932d935229b5543d073c2b87c9c22846aab48881e9d8d6e742a2d/kiwisolver-1.5.0-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:e315e5ec90d88e140f57696ff85b484ff68bb311e36f2c414aa4286293e6dee0", size = 2323966, upload-time = "2026-03-09T13:13:38.204Z" }, + { url = "https://files.pythonhosted.org/packages/3d/6f/79b0d760907965acfd9d61826a3d41f8f093c538f55cd2633d3f0db269f6/kiwisolver-1.5.0-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:1465387ac63576c3e125e5337a6892b9e99e0627d52317f3ca79e6930d889d15", size = 1977417, upload-time = "2026-03-09T13:13:39.966Z" }, + { url = "https://files.pythonhosted.org/packages/ab/31/01d0537c41cb75a551a438c3c7a80d0c60d60b81f694dac83dd436aec0d0/kiwisolver-1.5.0-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:530a3fd64c87cffa844d4b6b9768774763d9caa299e9b75d8eca6a4423b31314", size = 2491238, upload-time = "2026-03-09T13:13:41.698Z" }, + { url = "https://files.pythonhosted.org/packages/e4/34/8aefdd0be9cfd00a44509251ba864f5caf2991e36772e61c408007e7f417/kiwisolver-1.5.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:1d9daea4ea6b9be74fe2f01f7fbade8d6ffab263e781274cffca0dba9be9eec9", size = 2294947, upload-time = "2026-03-09T13:13:43.343Z" }, + { url = "https://files.pythonhosted.org/packages/ad/cf/0348374369ca588f8fe9c338fae49fa4e16eeb10ffb3d012f23a54578a9e/kiwisolver-1.5.0-cp312-cp312-win_amd64.whl", hash = "sha256:f18c2d9782259a6dc132fdc7a63c168cbc74b35284b6d75c673958982a378384", size = 73569, upload-time = "2026-03-09T13:13:45.792Z" }, + { url = "https://files.pythonhosted.org/packages/28/26/192b26196e2316e2bd29deef67e37cdf9870d9af8e085e521afff0fed526/kiwisolver-1.5.0-cp312-cp312-win_arm64.whl", hash = "sha256:f7c7553b13f69c1b29a5bde08ddc6d9d0c8bfb84f9ed01c30db25944aeb852a7", size = 64997, upload-time = "2026-03-09T13:13:46.878Z" }, + { url = "https://files.pythonhosted.org/packages/9d/69/024d6711d5ba575aa65d5538042e99964104e97fa153a9f10bc369182bc2/kiwisolver-1.5.0-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:fd40bb9cd0891c4c3cb1ddf83f8bbfa15731a248fdc8162669405451e2724b09", size = 123166, upload-time = "2026-03-09T13:13:48.032Z" }, + { url = "https://files.pythonhosted.org/packages/ce/48/adbb40df306f587054a348831220812b9b1d787aff714cfbc8556e38fccd/kiwisolver-1.5.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:c0e1403fd7c26d77c1f03e096dc58a5c726503fa0db0456678b8668f76f521e3", size = 66395, upload-time = "2026-03-09T13:13:49.365Z" }, + { url = "https://files.pythonhosted.org/packages/a8/3a/d0a972b34e1c63e2409413104216cd1caa02c5a37cb668d1687d466c1c45/kiwisolver-1.5.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:dda366d548e89a90d88a86c692377d18d8bd64b39c1fb2b92cb31370e2896bbd", size = 64065, upload-time = "2026-03-09T13:13:50.562Z" }, + { url = "https://files.pythonhosted.org/packages/2b/0a/7b98e1e119878a27ba8618ca1e18b14f992ff1eda40f47bccccf4de44121/kiwisolver-1.5.0-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:332b4f0145c30b5f5ad9374881133e5aa64320428a57c2c2b61e9d891a51c2f3", size = 1477903, upload-time = "2026-03-09T13:13:52.084Z" }, + { url = "https://files.pythonhosted.org/packages/18/d8/55638d89ffd27799d5cc3d8aa28e12f4ce7a64d67b285114dbedc8ea4136/kiwisolver-1.5.0-cp313-cp313-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:0c50b89ffd3e1a911c69a1dd3de7173c0cd10b130f56222e57898683841e4f96", size = 1278751, upload-time = "2026-03-09T13:13:54.673Z" }, + { url = "https://files.pythonhosted.org/packages/b8/97/b4c8d0d18421ecceba20ad8701358453b88e32414e6f6950b5a4bad54e65/kiwisolver-1.5.0-cp313-cp313-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:4db576bb8c3ef9365f8b40fe0f671644de6736ae2c27a2c62d7d8a1b4329f099", size = 1296793, upload-time = "2026-03-09T13:13:56.287Z" }, + { url = "https://files.pythonhosted.org/packages/c4/10/f862f94b6389d8957448ec9df59450b81bec4abb318805375c401a1e6892/kiwisolver-1.5.0-cp313-cp313-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:0b85aad90cea8ac6797a53b5d5f2e967334fa4d1149f031c4537569972596cb8", size = 1346041, upload-time = "2026-03-09T13:13:58.269Z" }, + { url = "https://files.pythonhosted.org/packages/a3/6a/f1650af35821eaf09de398ec0bc2aefc8f211f0cda50204c9f1673741ba9/kiwisolver-1.5.0-cp313-cp313-manylinux_2_39_riscv64.whl", hash = "sha256:d36ca54cb4c6c4686f7cbb7b817f66f5911c12ddb519450bbe86707155028f87", size = 987292, upload-time = "2026-03-09T13:13:59.871Z" }, + { url = "https://files.pythonhosted.org/packages/de/19/d7fb82984b9238115fe629c915007be608ebd23dc8629703d917dbfaffd4/kiwisolver-1.5.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:38f4a703656f493b0ad185211ccfca7f0386120f022066b018eb5296d8613e23", size = 2227865, upload-time = "2026-03-09T13:14:01.401Z" }, + { url = "https://files.pythonhosted.org/packages/7f/b9/46b7f386589fd222dac9e9de9c956ce5bcefe2ee73b4e79891381dda8654/kiwisolver-1.5.0-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:3ac2360e93cb41be81121755c6462cff3beaa9967188c866e5fce5cf13170859", size = 2324369, upload-time = "2026-03-09T13:14:02.972Z" }, + { url = "https://files.pythonhosted.org/packages/92/8b/95e237cf3d9c642960153c769ddcbe278f182c8affb20cecc1cc983e7cc5/kiwisolver-1.5.0-cp313-cp313-musllinux_1_2_riscv64.whl", hash = "sha256:c95cab08d1965db3d84a121f1c7ce7479bdd4072c9b3dafd8fecce48a2e6b902", size = 1977989, upload-time = "2026-03-09T13:14:04.503Z" }, + { url = "https://files.pythonhosted.org/packages/1b/95/980c9df53501892784997820136c01f62bc1865e31b82b9560f980c0e649/kiwisolver-1.5.0-cp313-cp313-musllinux_1_2_s390x.whl", hash = "sha256:fc20894c3d21194d8041a28b65622d5b86db786da6e3cfe73f0c762951a61167", size = 2491645, upload-time = "2026-03-09T13:14:06.106Z" }, + { url = "https://files.pythonhosted.org/packages/cb/32/900647fd0840abebe1561792c6b31e6a7c0e278fc3973d30572a965ca14c/kiwisolver-1.5.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:7a32f72973f0f950c1920475d5c5ea3d971b81b6f0ec53b8d0a956cc965f22e0", size = 2295237, upload-time = "2026-03-09T13:14:08.891Z" }, + { url = "https://files.pythonhosted.org/packages/be/8a/be60e3bbcf513cc5a50f4a3e88e1dcecebb79c1ad607a7222877becaa101/kiwisolver-1.5.0-cp313-cp313-win_amd64.whl", hash = "sha256:0bf3acf1419fa93064a4c2189ac0b58e3be7872bf6ee6177b0d4c63dc4cea276", size = 73573, upload-time = "2026-03-09T13:14:12.327Z" }, + { url = "https://files.pythonhosted.org/packages/4d/d2/64be2e429eb4fca7f7e1c52a91b12663aeaf25de3895e5cca0f47ef2a8d0/kiwisolver-1.5.0-cp313-cp313-win_arm64.whl", hash = "sha256:fa8eb9ecdb7efb0b226acec134e0d709e87a909fa4971a54c0c4f6e88635484c", size = 64998, upload-time = "2026-03-09T13:14:13.469Z" }, + { url = "https://files.pythonhosted.org/packages/b0/69/ce68dd0c85755ae2de490bf015b62f2cea5f6b14ff00a463f9d0774449ff/kiwisolver-1.5.0-cp313-cp313t-macosx_10_13_universal2.whl", hash = "sha256:db485b3847d182b908b483b2ed133c66d88d49cacf98fd278fadafe11b4478d1", size = 125700, upload-time = "2026-03-09T13:14:14.636Z" }, + { url = "https://files.pythonhosted.org/packages/74/aa/937aac021cf9d4349990d47eb319309a51355ed1dbdc9c077cdc9224cb11/kiwisolver-1.5.0-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:be12f931839a3bdfe28b584db0e640a65a8bcbc24560ae3fdb025a449b3d754e", size = 67537, upload-time = "2026-03-09T13:14:15.808Z" }, + { url = "https://files.pythonhosted.org/packages/ee/20/3a87fbece2c40ad0f6f0aefa93542559159c5f99831d596050e8afae7a9f/kiwisolver-1.5.0-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:16b85d37c2cbb3253226d26e64663f755d88a03439a9c47df6246b35defbdfb7", size = 65514, upload-time = "2026-03-09T13:14:18.035Z" }, + { url = "https://files.pythonhosted.org/packages/f0/7f/f943879cda9007c45e1f7dba216d705c3a18d6b35830e488b6c6a4e7cdf0/kiwisolver-1.5.0-cp313-cp313t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:4432b835675f0ea7414aab3d37d119f7226d24869b7a829caeab49ebda407b0c", size = 1584848, upload-time = "2026-03-09T13:14:19.745Z" }, + { url = "https://files.pythonhosted.org/packages/37/f8/4d4f85cc1870c127c88d950913370dd76138482161cd07eabbc450deff01/kiwisolver-1.5.0-cp313-cp313t-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:1b0feb50971481a2cc44d94e88bdb02cdd497618252ae226b8eb1201b957e368", size = 1391542, upload-time = "2026-03-09T13:14:21.54Z" }, + { url = "https://files.pythonhosted.org/packages/04/0b/65dd2916c84d252b244bd405303220f729e7c17c9d7d33dca6feeff9ffc4/kiwisolver-1.5.0-cp313-cp313t-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:56fa888f10d0f367155e76ce849fa1166fc9730d13bd2d65a2aa13b6f5424489", size = 1404447, upload-time = "2026-03-09T13:14:23.205Z" }, + { url = "https://files.pythonhosted.org/packages/39/5c/2606a373247babce9b1d056c03a04b65f3cf5290a8eac5d7bdead0a17e21/kiwisolver-1.5.0-cp313-cp313t-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:940dda65d5e764406b9fb92761cbf462e4e63f712ab60ed98f70552e496f3bf1", size = 1455918, upload-time = "2026-03-09T13:14:24.74Z" }, + { url = "https://files.pythonhosted.org/packages/d5/d1/c6078b5756670658e9192a2ef11e939c92918833d2745f85cd14a6004bdf/kiwisolver-1.5.0-cp313-cp313t-manylinux_2_39_riscv64.whl", hash = "sha256:89fc958c702ee9a745e4700378f5d23fddbc46ff89e8fdbf5395c24d5c1452a3", size = 1072856, upload-time = "2026-03-09T13:14:26.597Z" }, + { url = "https://files.pythonhosted.org/packages/cb/c8/7def6ddf16eb2b3741d8b172bdaa9af882b03c78e9b0772975408801fa63/kiwisolver-1.5.0-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:9027d773c4ff81487181a925945743413f6069634d0b122d0b37684ccf4f1e18", size = 2333580, upload-time = "2026-03-09T13:14:28.237Z" }, + { url = "https://files.pythonhosted.org/packages/9e/87/2ac1fce0eb1e616fcd3c35caa23e665e9b1948bb984f4764790924594128/kiwisolver-1.5.0-cp313-cp313t-musllinux_1_2_ppc64le.whl", hash = "sha256:5b233ea3e165e43e35dba1d2b8ecc21cf070b45b65ae17dd2747d2713d942021", size = 2423018, upload-time = "2026-03-09T13:14:30.018Z" }, + { url = "https://files.pythonhosted.org/packages/67/13/c6700ccc6cc218716bfcda4935e4b2997039869b4ad8a94f364c5a3b8e63/kiwisolver-1.5.0-cp313-cp313t-musllinux_1_2_riscv64.whl", hash = "sha256:ce9bf03dad3b46408c08649c6fbd6ca28a9fce0eb32fdfffa6775a13103b5310", size = 2062804, upload-time = "2026-03-09T13:14:32.888Z" }, + { url = "https://files.pythonhosted.org/packages/1b/bd/877056304626943ff0f1f44c08f584300c199b887cb3176cd7e34f1515f1/kiwisolver-1.5.0-cp313-cp313t-musllinux_1_2_s390x.whl", hash = "sha256:fc4d3f1fb9ca0ae9f97b095963bc6326f1dbfd3779d6679a1e016b9baaa153d3", size = 2597482, upload-time = "2026-03-09T13:14:34.971Z" }, + { url = "https://files.pythonhosted.org/packages/75/19/c60626c47bf0f8ac5dcf72c6c98e266d714f2fbbfd50cf6dab5ede3aaa50/kiwisolver-1.5.0-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:f443b4825c50a51ee68585522ab4a1d1257fac65896f282b4c6763337ac9f5d2", size = 2394328, upload-time = "2026-03-09T13:14:36.816Z" }, + { url = "https://files.pythonhosted.org/packages/47/84/6a6d5e5bb8273756c27b7d810d47f7ef2f1f9b9fd23c9ee9a3f8c75c9cef/kiwisolver-1.5.0-cp313-cp313t-win_arm64.whl", hash = "sha256:893ff3a711d1b515ba9da14ee090519bad4610ed1962fbe298a434e8c5f8db53", size = 68410, upload-time = "2026-03-09T13:14:38.695Z" }, + { url = "https://files.pythonhosted.org/packages/e4/d7/060f45052f2a01ad5762c8fdecd6d7a752b43400dc29ff75cd47225a40fd/kiwisolver-1.5.0-cp314-cp314-macosx_10_15_universal2.whl", hash = "sha256:8df31fe574b8b3993cc61764f40941111b25c2d9fea13d3ce24a49907cd2d615", size = 123231, upload-time = "2026-03-09T13:14:41.323Z" }, + { url = "https://files.pythonhosted.org/packages/c2/a7/78da680eadd06ff35edef6ef68a1ad273bad3e2a0936c9a885103230aece/kiwisolver-1.5.0-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:1d49a49ac4cbfb7c1375301cd1ec90169dfeae55ff84710d782260ce77a75a02", size = 66489, upload-time = "2026-03-09T13:14:42.534Z" }, + { url = "https://files.pythonhosted.org/packages/49/b2/97980f3ad4fae37dd7fe31626e2bf75fbf8bdf5d303950ec1fab39a12da8/kiwisolver-1.5.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:0cbe94b69b819209a62cb27bdfa5dc2a8977d8de2f89dfd97ba4f53ed3af754e", size = 64063, upload-time = "2026-03-09T13:14:44.759Z" }, + { url = "https://files.pythonhosted.org/packages/e7/f9/b06c934a6aa8bc91f566bd2a214fd04c30506c2d9e2b6b171953216a65b6/kiwisolver-1.5.0-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:80aa065ffd378ff784822a6d7c3212f2d5f5e9c3589614b5c228b311fd3063ac", size = 1475913, upload-time = "2026-03-09T13:14:46.247Z" }, + { url = "https://files.pythonhosted.org/packages/6b/f0/f768ae564a710135630672981231320bc403cf9152b5596ec5289de0f106/kiwisolver-1.5.0-cp314-cp314-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:4e7f886f47ab881692f278ae901039a234e4025a68e6dfab514263a0b1c4ae05", size = 1282782, upload-time = "2026-03-09T13:14:48.458Z" }, + { url = "https://files.pythonhosted.org/packages/e2/9f/1de7aad00697325f05238a5f2eafbd487fb637cc27a558b5367a5f37fb7f/kiwisolver-1.5.0-cp314-cp314-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:5060731cc3ed12ca3a8b57acd4aeca5bbc2f49216dd0bec1650a1acd89486bcd", size = 1300815, upload-time = "2026-03-09T13:14:50.721Z" }, + { url = "https://files.pythonhosted.org/packages/5a/c2/297f25141d2e468e0ce7f7a7b92e0cf8918143a0cbd3422c1ad627e85a06/kiwisolver-1.5.0-cp314-cp314-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:7a4aa69609f40fce3cbc3f87b2061f042eee32f94b8f11db707b66a26461591a", size = 1347925, upload-time = "2026-03-09T13:14:52.304Z" }, + { url = "https://files.pythonhosted.org/packages/b9/d3/f4c73a02eb41520c47610207b21afa8cdd18fdbf64ffd94674ae21c4812d/kiwisolver-1.5.0-cp314-cp314-manylinux_2_39_riscv64.whl", hash = "sha256:d168fda2dbff7b9b5f38e693182d792a938c31db4dac3a80a4888de603c99554", size = 991322, upload-time = "2026-03-09T13:14:54.637Z" }, + { url = "https://files.pythonhosted.org/packages/7b/46/d3f2efef7732fcda98d22bf4ad5d3d71d545167a852ca710a494f4c15343/kiwisolver-1.5.0-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:413b820229730d358efd838ecbab79902fe97094565fdc80ddb6b0a18c18a581", size = 2232857, upload-time = "2026-03-09T13:14:56.471Z" }, + { url = "https://files.pythonhosted.org/packages/3f/ec/2d9756bf2b6d26ae4349b8d3662fb3993f16d80c1f971c179ce862b9dbae/kiwisolver-1.5.0-cp314-cp314-musllinux_1_2_ppc64le.whl", hash = "sha256:5124d1ea754509b09e53738ec185584cc609aae4a3b510aaf4ed6aa047ef9303", size = 2329376, upload-time = "2026-03-09T13:14:58.072Z" }, + { url = "https://files.pythonhosted.org/packages/8f/9f/876a0a0f2260f1bde92e002b3019a5fabc35e0939c7d945e0fa66185eb20/kiwisolver-1.5.0-cp314-cp314-musllinux_1_2_riscv64.whl", hash = "sha256:e4415a8db000bf49a6dd1c478bf70062eaacff0f462b92b0ba68791a905861f9", size = 1982549, upload-time = "2026-03-09T13:14:59.668Z" }, + { url = "https://files.pythonhosted.org/packages/6c/4f/ba3624dfac23a64d54ac4179832860cb537c1b0af06024936e82ca4154a0/kiwisolver-1.5.0-cp314-cp314-musllinux_1_2_s390x.whl", hash = "sha256:d618fd27420381a4f6044faa71f46d8bfd911bd077c555f7138ed88729bfbe79", size = 2494680, upload-time = "2026-03-09T13:15:01.364Z" }, + { url = "https://files.pythonhosted.org/packages/39/b7/97716b190ab98911b20d10bf92eca469121ec483b8ce0edd314f51bc85af/kiwisolver-1.5.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:5092eb5b1172947f57d6ea7d89b2f29650414e4293c47707eb499ec07a0ac796", size = 2297905, upload-time = "2026-03-09T13:15:03.925Z" }, + { url = "https://files.pythonhosted.org/packages/a3/36/4e551e8aa55c9188bca9abb5096805edbf7431072b76e2298e34fd3a3008/kiwisolver-1.5.0-cp314-cp314-win_amd64.whl", hash = "sha256:d76e2d8c75051d58177e762164d2e9ab92886534e3a12e795f103524f221dd8e", size = 75086, upload-time = "2026-03-09T13:15:07.775Z" }, + { url = "https://files.pythonhosted.org/packages/70/15/9b90f7df0e31a003c71649cf66ef61c3c1b862f48c81007fa2383c8bd8d7/kiwisolver-1.5.0-cp314-cp314-win_arm64.whl", hash = "sha256:fa6248cd194edff41d7ea9425ced8ca3a6f838bfb295f6f1d6e6bb694a8518df", size = 66577, upload-time = "2026-03-09T13:15:09.139Z" }, + { url = "https://files.pythonhosted.org/packages/17/01/7dc8c5443ff42b38e72731643ed7cf1ed9bf01691ae5cdca98501999ed83/kiwisolver-1.5.0-cp314-cp314t-macosx_10_15_universal2.whl", hash = "sha256:d1ffeb80b5676463d7a7d56acbe8e37a20ce725570e09549fe738e02ca6b7e1e", size = 125794, upload-time = "2026-03-09T13:15:10.525Z" }, + { url = "https://files.pythonhosted.org/packages/46/8a/b4ebe46ebaac6a303417fab10c2e165c557ddaff558f9699d302b256bc53/kiwisolver-1.5.0-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:bc4d8e252f532ab46a1de9349e2d27b91fce46736a9eedaa37beaca66f574ed4", size = 67646, upload-time = "2026-03-09T13:15:12.016Z" }, + { url = "https://files.pythonhosted.org/packages/60/35/10a844afc5f19d6f567359bf4789e26661755a2f36200d5d1ed8ad0126e5/kiwisolver-1.5.0-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:6783e069732715ad0c3ce96dbf21dbc2235ab0593f2baf6338101f70371f4028", size = 65511, upload-time = "2026-03-09T13:15:13.311Z" }, + { url = "https://files.pythonhosted.org/packages/f8/8a/685b297052dd041dcebce8e8787b58923b6e78acc6115a0dc9189011c44b/kiwisolver-1.5.0-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:e7c4c09a490dc4d4a7f8cbee56c606a320f9dc28cf92a7157a39d1ce7676a657", size = 1584858, upload-time = "2026-03-09T13:15:15.103Z" }, + { url = "https://files.pythonhosted.org/packages/9e/80/04865e3d4638ac5bddec28908916df4a3075b8c6cc101786a96803188b96/kiwisolver-1.5.0-cp314-cp314t-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:2a075bd7bd19c70cf67c8badfa36cf7c5d8de3c9ddb8420c51e10d9c50e94920", size = 1392539, upload-time = "2026-03-09T13:15:16.661Z" }, + { url = "https://files.pythonhosted.org/packages/ba/01/77a19cacc0893fa13fafa46d1bba06fb4dc2360b3292baf4b56d8e067b24/kiwisolver-1.5.0-cp314-cp314t-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:bdd3e53429ff02aa319ba59dfe4ceeec345bf46cf180ec2cf6fd5b942e7975e9", size = 1405310, upload-time = "2026-03-09T13:15:18.229Z" }, + { url = "https://files.pythonhosted.org/packages/53/39/bcaf5d0cca50e604cfa9b4e3ae1d64b50ca1ae5b754122396084599ef903/kiwisolver-1.5.0-cp314-cp314t-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:3cdcb35dc9d807259c981a85531048ede628eabcffb3239adf3d17463518992d", size = 1456244, upload-time = "2026-03-09T13:15:20.444Z" }, + { url = "https://files.pythonhosted.org/packages/d0/7a/72c187abc6975f6978c3e39b7cf67aeb8b3c0a8f9790aa7fd412855e9e1f/kiwisolver-1.5.0-cp314-cp314t-manylinux_2_39_riscv64.whl", hash = "sha256:70d593af6a6ca332d1df73d519fddb5148edb15cd90d5f0155e3746a6d4fcc65", size = 1073154, upload-time = "2026-03-09T13:15:22.039Z" }, + { url = "https://files.pythonhosted.org/packages/c7/ca/cf5b25783ebbd59143b4371ed0c8428a278abe68d6d0104b01865b1bbd0f/kiwisolver-1.5.0-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:377815a8616074cabbf3f53354e1d040c35815a134e01d7614b7692e4bf8acfa", size = 2334377, upload-time = "2026-03-09T13:15:23.741Z" }, + { url = "https://files.pythonhosted.org/packages/4a/e5/b1f492adc516796e88751282276745340e2a72dcd0d36cf7173e0daf3210/kiwisolver-1.5.0-cp314-cp314t-musllinux_1_2_ppc64le.whl", hash = "sha256:0255a027391d52944eae1dbb5d4cc5903f57092f3674e8e544cdd2622826b3f0", size = 2425288, upload-time = "2026-03-09T13:15:25.789Z" }, + { url = "https://files.pythonhosted.org/packages/e6/e5/9b21fbe91a61b8f409d74a26498706e97a48008bfcd1864373d32a6ba31c/kiwisolver-1.5.0-cp314-cp314t-musllinux_1_2_riscv64.whl", hash = "sha256:012b1eb16e28718fa782b5e61dc6f2da1f0792ca73bd05d54de6cb9561665fc9", size = 2063158, upload-time = "2026-03-09T13:15:27.63Z" }, + { url = "https://files.pythonhosted.org/packages/b1/02/83f47986138310f95ea95531f851b2a62227c11cbc3e690ae1374fe49f0f/kiwisolver-1.5.0-cp314-cp314t-musllinux_1_2_s390x.whl", hash = "sha256:0e3aafb33aed7479377e5e9a82e9d4bf87063741fc99fc7ae48b0f16e32bdd6f", size = 2597260, upload-time = "2026-03-09T13:15:29.421Z" }, + { url = "https://files.pythonhosted.org/packages/07/18/43a5f24608d8c313dd189cf838c8e68d75b115567c6279de7796197cfb6a/kiwisolver-1.5.0-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:e7a116ae737f0000343218c4edf5bd45893bfeaff0993c0b215d7124c9f77646", size = 2394403, upload-time = "2026-03-09T13:15:31.517Z" }, + { url = "https://files.pythonhosted.org/packages/3b/b5/98222136d839b8afabcaa943b09bd05888c2d36355b7e448550211d1fca4/kiwisolver-1.5.0-cp314-cp314t-win_amd64.whl", hash = "sha256:1dd9b0b119a350976a6d781e7278ec7aca0b201e1a9e2d23d9804afecb6ca681", size = 79687, upload-time = "2026-03-09T13:15:33.204Z" }, + { url = "https://files.pythonhosted.org/packages/99/a2/ca7dc962848040befed12732dff6acae7fb3c4f6fc4272b3f6c9a30b8713/kiwisolver-1.5.0-cp314-cp314t-win_arm64.whl", hash = "sha256:58f812017cd2985c21fbffb4864d59174d4903dd66fa23815e74bbc7a0e2dd57", size = 70032, upload-time = "2026-03-09T13:15:34.411Z" }, + { url = "https://files.pythonhosted.org/packages/1c/fa/2910df836372d8761bb6eff7d8bdcb1613b5c2e03f260efe7abe34d388a7/kiwisolver-1.5.0-graalpy312-graalpy250_312_native-macosx_10_13_x86_64.whl", hash = "sha256:5ae8e62c147495b01a0f4765c878e9bfdf843412446a247e28df59936e99e797", size = 130262, upload-time = "2026-03-09T13:15:35.629Z" }, + { url = "https://files.pythonhosted.org/packages/0f/41/c5f71f9f00aabcc71fee8b7475e3f64747282580c2fe748961ba29b18385/kiwisolver-1.5.0-graalpy312-graalpy250_312_native-macosx_11_0_arm64.whl", hash = "sha256:f6764a4ccab3078db14a632420930f6186058750df066b8ea2a7106df91d3203", size = 138036, upload-time = "2026-03-09T13:15:36.894Z" }, + { url = "https://files.pythonhosted.org/packages/fa/06/7399a607f434119c6e1fdc8ec89a8d51ccccadf3341dee4ead6bd14caaf5/kiwisolver-1.5.0-graalpy312-graalpy250_312_native-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:c31c13da98624f957b0fb1b5bae5383b2333c2c3f6793d9825dd5ce79b525cb7", size = 194295, upload-time = "2026-03-09T13:15:38.22Z" }, + { url = "https://files.pythonhosted.org/packages/b5/91/53255615acd2a1eaca307ede3c90eb550bae9c94581f8c00081b6b1c8f44/kiwisolver-1.5.0-graalpy312-graalpy250_312_native-win_amd64.whl", hash = "sha256:1f1489f769582498610e015a8ef2d36f28f505ab3096d0e16b4858a9ec214f57", size = 75987, upload-time = "2026-03-09T13:15:39.65Z" }, + { url = "https://files.pythonhosted.org/packages/e9/eb/5fcbbbf9a0e2c3a35effb88831a483345326bbc3a030a3b5b69aee647f84/kiwisolver-1.5.0-pp311-pypy311_pp73-macosx_10_15_x86_64.whl", hash = "sha256:ec4c85dc4b687c7f7f15f553ff26a98bfe8c58f5f7f0ac8905f0ba4c7be60232", size = 59532, upload-time = "2026-03-09T13:15:47.047Z" }, + { url = "https://files.pythonhosted.org/packages/c3/9b/e17104555bb4db148fd52327feea1e96be4b88e8e008b029002c281a21ab/kiwisolver-1.5.0-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:12e91c215a96e39f57989c8912ae761286ac5a9584d04030ceb3368a357f017a", size = 57420, upload-time = "2026-03-09T13:15:48.199Z" }, + { url = "https://files.pythonhosted.org/packages/48/44/2b5b95b7aa39fb2d8d9d956e0f3d5d45aef2ae1d942d4c3ffac2f9cfed1a/kiwisolver-1.5.0-pp311-pypy311_pp73-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:be4a51a55833dc29ab5d7503e7bcb3b3af3402d266018137127450005cdfe737", size = 79892, upload-time = "2026-03-09T13:15:49.694Z" }, + { url = "https://files.pythonhosted.org/packages/52/7d/7157f9bba6b455cfb4632ed411e199fc8b8977642c2b12082e1bd9e6d173/kiwisolver-1.5.0-pp311-pypy311_pp73-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:daae526907e262de627d8f70058a0f64acc9e2641c164c99c8f594b34a799a16", size = 77603, upload-time = "2026-03-09T13:15:50.945Z" }, + { url = "https://files.pythonhosted.org/packages/0a/dd/8050c947d435c8d4bc94e3252f4d8bb8a76cfb424f043a8680be637a57f1/kiwisolver-1.5.0-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:59cd8683f575d96df5bb48f6add94afc055012c29e28124fcae2b63661b9efb1", size = 73558, upload-time = "2026-03-09T13:15:52.112Z" }, +] + +[[package]] +name = "lark" +version = "1.3.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/da/34/28fff3ab31ccff1fd4f6c7c7b0ceb2b6968d8ea4950663eadcb5720591a0/lark-1.3.1.tar.gz", hash = "sha256:b426a7a6d6d53189d318f2b6236ab5d6429eaf09259f1ca33eb716eed10d2905", size = 382732, upload-time = "2025-10-27T18:25:56.653Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/82/3d/14ce75ef66813643812f3093ab17e46d3a206942ce7376d31ec2d36229e7/lark-1.3.1-py3-none-any.whl", hash = "sha256:c629b661023a014c37da873b4ff58a817398d12635d3bbb2c5a03be7fe5d1e12", size = 113151, upload-time = "2025-10-27T18:25:54.882Z" }, +] + +[[package]] +name = "lxml" +version = "6.1.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/05/3b/aab6728cae887456f409b4d75e8a01856e4f04bd510de38052a47768b680/lxml-6.1.1.tar.gz", hash = "sha256:ba96ae44888e0185281e937633a743ea90d5a196c6000f82565ebb0580012d40", size = 4197430, upload-time = "2026-05-18T19:19:06.424Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/62/b0/83f481780d1548750b8ce2ec824073deef2f452d9cd1a6faff8507e3d16d/lxml-6.1.1-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:53b7d2b7a10b1c35c0a5e21e9224accf60c1bbfba523990732e521b2b73adef2", size = 8526461, upload-time = "2026-05-18T19:17:25.862Z" }, + { url = "https://files.pythonhosted.org/packages/b9/d5/30fa0f808002c7329397bfbb24e306789c0b29f04aa5842c07b174b4216f/lxml-6.1.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:ff3f333630ab480244a1bff72043e511a91eb22e7595dead8653ee5612dd8f3d", size = 4595375, upload-time = "2026-05-18T19:17:34.555Z" }, + { url = "https://files.pythonhosted.org/packages/4f/d2/edb71cf0e561581a7c5eb2626244320eb04e9f8ce6d563184fd668b45073/lxml-6.1.1-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:a4bbea04c97f6d78a48e3fbc1cb9116d2780b1b39e03a23f6eb9b603fd61f510", size = 4923654, upload-time = "2026-05-18T19:17:42.917Z" }, + { url = "https://files.pythonhosted.org/packages/4c/77/1bc7eeb0de4577d783fb625aa092cc9357883bba35845a3666bf1259f3dc/lxml-6.1.1-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:db1d75f6617a49c1c01bc7023713e0ff59ab32c9579ae62a7674c0e34f3b0b0a", size = 5067921, upload-time = "2026-05-18T19:17:49.175Z" }, + { url = "https://files.pythonhosted.org/packages/1b/3c/c0690d74bd2bc17bc03b5b0d093569ead597dd0bfa088bf99eef8c24e19c/lxml-6.1.1-cp311-cp311-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:3a12689be69a28ddaa0ab99a5a1137da2afd5f8f16df7b5680b66f616d3eda1d", size = 5002456, upload-time = "2026-05-18T19:17:59.715Z" }, + { url = "https://files.pythonhosted.org/packages/66/8d/d1b3271af0c0f1e27e8472a849e4d2c65bc7766884b9ad2da9e76e145c88/lxml-6.1.1-cp311-cp311-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:18b73c339ae29b90fd2d06e58ebd555a751bde9cd6bbd36cc0281b9a2c94e9d8", size = 5202776, upload-time = "2026-05-18T19:18:08.924Z" }, + { url = "https://files.pythonhosted.org/packages/7a/45/689824ffb237fd10125ad273f32b28ff04dc6203c2822c85ff65a93df65e/lxml-6.1.1-cp311-cp311-manylinux_2_28_i686.whl", hash = "sha256:752d3bbfe874715ccd0aec7f88d7fc623c0f1fd7aa7b3238a084e017bad2a009", size = 5329945, upload-time = "2026-05-18T19:18:13.673Z" }, + { url = "https://files.pythonhosted.org/packages/5d/c0/ef73af53767e958fd87d437c170f272e2f6e6c0f854939f133a895f1e711/lxml-6.1.1-cp311-cp311-manylinux_2_31_armv7l.whl", hash = "sha256:6b1761fbf9ec984e2e9d9c589ef5f5fd684b7c19f92aadd567a26c5224958db6", size = 4659237, upload-time = "2026-05-18T19:18:18.657Z" }, + { url = "https://files.pythonhosted.org/packages/a0/5e/e1158e40397585e91cb0472374a1f63d0926a1ddeaa92f13d1a1ffe306d5/lxml-6.1.1-cp311-cp311-manylinux_2_38_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:d680fbcb768404c601ecb43519ecd8461f6954cb11c06a78962f666832ccfca8", size = 5265904, upload-time = "2026-05-18T19:18:24.883Z" }, + { url = "https://files.pythonhosted.org/packages/a0/16/8687e5d1400ed1c0bc41dace232ebb7553952b618ea1f2e5fb6e2cfbbe23/lxml-6.1.1-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:162af1091cd785f2f27e62d3547ae9bc58ec5c86dd314d67021fd02463708d83", size = 5045225, upload-time = "2026-05-18T19:17:20.073Z" }, + { url = "https://files.pythonhosted.org/packages/ca/18/d877bd1ae2e5ffdfd4836565aba350db31feb2f2656d6ce70316ed66a05e/lxml-6.1.1-cp311-cp311-musllinux_1_2_armv7l.whl", hash = "sha256:e9308ff8241c532df3f3e570f9a5aeed6c853f888512ba4b75638d7c11c95ef6", size = 4712721, upload-time = "2026-05-18T19:17:40.512Z" }, + { url = "https://files.pythonhosted.org/packages/44/4d/1f44fd1d770b10dacbf6b5c6e520f4d6e0708744930f719dc04e67cab981/lxml-6.1.1-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:5f6994074ebae6ffb04447268e37dc16edc304f9859cf91acb86e0af6c1b395c", size = 5252549, upload-time = "2026-05-18T19:17:51.236Z" }, + { url = "https://files.pythonhosted.org/packages/64/5d/1d66b84f850089254c230ef6ea6b267a5a54e2e179a5d960036a05d501d7/lxml-6.1.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:80c2dfadb855da477cf73373ad29a333535dedb9b12bad02c9814c8e2b43bf08", size = 5226877, upload-time = "2026-05-18T19:18:00.875Z" }, + { url = "https://files.pythonhosted.org/packages/ad/00/84c4b5302d42a2d0184f38d538c8a197f33b52a50bd4f7bcfe990bce3036/lxml-6.1.1-cp311-cp311-win32.whl", hash = "sha256:30a89d3ac8faec007453fb541f3f46807eeec88edd5826f6e3fe001752a2c621", size = 3594072, upload-time = "2026-05-18T19:17:12.714Z" }, + { url = "https://files.pythonhosted.org/packages/61/9d/2e2f7d876349f45e0f3e29f72da311668853d59b58d473a2dea4f0160135/lxml-6.1.1-cp311-cp311-win_amd64.whl", hash = "sha256:abbefa31eee84842140f67acef1c828e28bba8bbf0c3bc6e5492a9af88152c28", size = 4025469, upload-time = "2026-05-18T19:17:50.566Z" }, + { url = "https://files.pythonhosted.org/packages/b0/d5/570e6390e4110331e6208b2ba83d1482cc9146808ee118b22824a34c1070/lxml-6.1.1-cp311-cp311-win_arm64.whl", hash = "sha256:dcb292aa7fe485ceff7af4f92e46c5af397daec5dff64871a528f0fc47a3cc5b", size = 3667640, upload-time = "2026-05-19T19:22:48.293Z" }, + { url = "https://files.pythonhosted.org/packages/6a/6e/c4add832b6fc1e887125b96f880d7b9b70aae5248718e046b1704bcac4b9/lxml-6.1.1-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:104c09bda8d2a562824c0e319d0768ce26a779b7601e0931d33b09b53c392ef7", size = 8570821, upload-time = "2026-05-18T19:17:42.068Z" }, + { url = "https://files.pythonhosted.org/packages/22/00/ff3009c88e65de8011630acf8ab5a09cb2becd2aaf47fba2f3449f6224e9/lxml-6.1.1-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:25c6997a9a534e016695a0ba06b2f07945de682731ff01065b6d5a4474179da1", size = 4624252, upload-time = "2026-05-18T19:17:47.897Z" }, + { url = "https://files.pythonhosted.org/packages/42/95/bb63f0fd62e554fe078e1fb3c8fe9083c14ddc7ad7fa178d10e57e071ac7/lxml-6.1.1-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:c921ba5c51e4e9f63b8b00267d06566e1f63407408a0496da2d1d0bfc819c7fc", size = 4930746, upload-time = "2026-05-18T19:18:29.637Z" }, + { url = "https://files.pythonhosted.org/packages/eb/99/0013e8d9b5960f4f041cf0b73e2f80c23eb5205b1f7bfb20203243651359/lxml-6.1.1-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:54a7f95e4de5fb94e2f9f4b9055c6ba33bf3d628fd77a1d647c5923caa2cdcdc", size = 5093723, upload-time = "2026-05-18T19:18:34.168Z" }, + { url = "https://files.pythonhosted.org/packages/29/91/317b332636bfc7bddcff828d41b3307f50043f4b237e40849c333d80fa1a/lxml-6.1.1-cp312-cp312-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:96f2ec43df44b1f76249ee0a615334f9b5b060e1c8bd90e706dad2d14d02f383", size = 5005557, upload-time = "2026-05-18T19:18:39.798Z" }, + { url = "https://files.pythonhosted.org/packages/42/2f/cc9bf06afe70f9c9093ae60855d9759da9db601ec4080f7473319666ffd7/lxml-6.1.1-cp312-cp312-manylinux_2_26_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:70ef8a7e102a1508f8121aae5b0867abd663f72c14f0a9c937e6554cb4587b7b", size = 5631036, upload-time = "2026-05-18T19:18:44.858Z" }, + { url = "https://files.pythonhosted.org/packages/08/f6/af32e23e563971ffb0fb86be52bc5be5c2c118858ffc119bf6a9039b173d/lxml-6.1.1-cp312-cp312-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:ebe6af670449830d6d9b752c256a983291c766a1365ba5d5460048f9e33a7818", size = 5240367, upload-time = "2026-05-18T19:18:49.217Z" }, + { url = "https://files.pythonhosted.org/packages/78/83/8555d40948b09ce86f1bd0c68a7ac31d07b1929f92cc1b074006c97ef2d2/lxml-6.1.1-cp312-cp312-manylinux_2_28_i686.whl", hash = "sha256:27acc820660aaffa4f7c087f29120e12980f7779d56d8492d263170111284740", size = 5350171, upload-time = "2026-05-18T19:18:52.779Z" }, + { url = "https://files.pythonhosted.org/packages/63/75/5d92da93729b7bad783689e6496049fa40927b45bec7bf183c981de3ca70/lxml-6.1.1-cp312-cp312-manylinux_2_31_armv7l.whl", hash = "sha256:1db753c9115ec7100d073b744d17e25e88a8f90f5c39b2f5dd878149af59671f", size = 4694874, upload-time = "2026-05-18T19:18:55.139Z" }, + { url = "https://files.pythonhosted.org/packages/c5/b5/3aad415a9a25b822e783f15deeb4dffccf5113030f1afa2222dd929313d9/lxml-6.1.1-cp312-cp312-manylinux_2_38_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:c4f469aebd783bb741c2ecb2a681008fd26bfe5c16a9a72ed5467f834e810df2", size = 5244492, upload-time = "2026-05-18T19:19:01.28Z" }, + { url = "https://files.pythonhosted.org/packages/f1/a1/5fcf7eb9904b80086aa47dcf0027de07b1bb990afad2e6823144c368ae04/lxml-6.1.1-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:766b010012d59470072c1816b5b6c69f1d243e5db36ea5968e94accf430a4635", size = 5048232, upload-time = "2026-05-18T19:18:12.67Z" }, + { url = "https://files.pythonhosted.org/packages/77/74/1f601b63c7a69fcdf10fa9b148c81da8442204194f6c55509cc485c786b9/lxml-6.1.1-cp312-cp312-musllinux_1_2_armv7l.whl", hash = "sha256:b8d812c6011c08b8111a15e54dd990b8923692d80adf35488bee34026c35accf", size = 4777023, upload-time = "2026-05-18T19:18:15.928Z" }, + { url = "https://files.pythonhosted.org/packages/a2/b9/7a78f51aec95b1bf780d78e12705a9f6533284f8693dc5c0e6724fa53d3f/lxml-6.1.1-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:fe0306bd29505a9177aac19f1877174b0e7422c222a59f70b2cd41633448c3dc", size = 5645773, upload-time = "2026-05-18T19:18:23.223Z" }, + { url = "https://files.pythonhosted.org/packages/a5/6e/98a7b7ad54e4e74fa1f20fff776913980619d0ebe5558232d7da6580bdd8/lxml-6.1.1-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:5ba186ad207446c65d3bb3d3e0412b032b1d9f595e59861e2354798c5703d955", size = 5233088, upload-time = "2026-05-18T19:18:31.433Z" }, + { url = "https://files.pythonhosted.org/packages/65/d1/bc0ed2427bf609f2ee10da303a6a226f9c8bce94f945dc29a32ce55de6e4/lxml-6.1.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:aa366a1e55b8ebfe8ca8ddc3cfe75c8ebade181aeb0f661d0cb05986b647f72a", size = 5260995, upload-time = "2026-05-18T19:18:37.091Z" }, + { url = "https://files.pythonhosted.org/packages/69/8b/6772e1a4b513fc50a8d931f19edde0e13ae6918510a1e13ff67864f3e5ed/lxml-6.1.1-cp312-cp312-win32.whl", hash = "sha256:126c93f7f56f0eda92f6d8c619edc463a4f23d9252f1c9d0405a76f25fa9f11a", size = 3596382, upload-time = "2026-05-18T19:17:18.37Z" }, + { url = "https://files.pythonhosted.org/packages/1b/89/45198e9624762af2dfd2cb8782598477ceb29f6e59caab560388ae1f4ec1/lxml-6.1.1-cp312-cp312-win_amd64.whl", hash = "sha256:26e6eda8d38c1fcab1090dd196ee87cbd13788e531937610e2589085de074e77", size = 3997255, upload-time = "2026-05-18T19:17:56.781Z" }, + { url = "https://files.pythonhosted.org/packages/90/a9/7a54b6834088d9ae528a7b780584ba6a39a9457b0ac330479f20ffbc9449/lxml-6.1.1-cp312-cp312-win_arm64.whl", hash = "sha256:6540377fbd53fe1b629172288c464fb18db11ce1fa7dc15891da10aa9dcc3e7f", size = 3659610, upload-time = "2026-05-19T19:22:50.843Z" }, + { url = "https://files.pythonhosted.org/packages/a5/eb/7e6f37c5584ccbb2ff267f56fd0339016938c1c8684cfefab9b33ffc2f36/lxml-6.1.1-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:68a9198d0fc122d14bb76837de9aa80cf84caed990b5b237f532ed87d3706736", size = 8559780, upload-time = "2026-05-18T19:17:57.661Z" }, + { url = "https://files.pythonhosted.org/packages/a1/36/587c2521cf23a2cd6c9c22108aa7528f683a1f195ed7ccd23a4b1786ad36/lxml-6.1.1-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:7d47866cb32fb503450b6edc9df355d10dc49836af2e89901bd6ac6b0896d9d9", size = 4618006, upload-time = "2026-05-18T19:18:04.452Z" }, + { url = "https://files.pythonhosted.org/packages/6e/ca/ab7bfe2bf4c972af5e7878262845ead3a24a929a9b04bc11c7c1ece6c82a/lxml-6.1.1-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:eb7c9811bfaa8b1ed5ed319f5d370dfbcaa59d52ea64be2a5a85e18195930354", size = 4924139, upload-time = "2026-05-18T19:19:04.873Z" }, + { url = "https://files.pythonhosted.org/packages/6b/55/a0c72851dfee5ecc689f949723a73dea457758912542cb955b108eaf0d8f/lxml-6.1.1-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:762ff394d5bd56da0cf034a23dcce4e13923f15321a2adfa2ac00201dc6d3fca", size = 5082329, upload-time = "2026-05-18T19:19:09.728Z" }, + { url = "https://files.pythonhosted.org/packages/f0/b6/0608f7d61a3b96cc67e5648a3d906e31a5082093e10e7be65b3886289938/lxml-6.1.1-cp313-cp313-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:a088f287f7d8275a33c07f2cac6c50b9319309a0200a39e7e75d80c707723099", size = 4993564, upload-time = "2026-05-18T19:19:13.608Z" }, + { url = "https://files.pythonhosted.org/packages/4c/66/ae227524b066d29d55bf0b453d93d2d793c40218657d643dcbbca13b8faf/lxml-6.1.1-cp313-cp313-manylinux_2_26_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:e902da4b04e6b52e5893900d4b8ab46068f75f3561f01bf1080957f9fd932ed6", size = 5613467, upload-time = "2026-05-18T19:19:16.228Z" }, + { url = "https://files.pythonhosted.org/packages/a6/76/dbe4a00b50385e40194231dcfe5a12c059de7cf90e89c83407d2b085b719/lxml-6.1.1-cp313-cp313-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:1d4962d4c66bf830a7e59ed6cfc17d148149898a3aefa8ec6e59763e6e3ed085", size = 5228304, upload-time = "2026-05-18T19:19:19.354Z" }, + { url = "https://files.pythonhosted.org/packages/1c/01/00b1b8442ed2041793336868ba0b9ea4b13d7da7c085c6404c207a63bf79/lxml-6.1.1-cp313-cp313-manylinux_2_28_i686.whl", hash = "sha256:581d4c8ae690a6609e64862dd6b7c2489635c2d13907fc2b20f2bc200ff1d21e", size = 5341607, upload-time = "2026-05-18T19:19:22.297Z" }, + { url = "https://files.pythonhosted.org/packages/63/36/1ad29931e9a4638bb707869f01d423a6c815f82152138d1a40dfcfde2b95/lxml-6.1.1-cp313-cp313-manylinux_2_31_armv7l.whl", hash = "sha256:876e1ff5930ed8bf295ec5ef9a8155e9b6b1876bbf1deed8b3a8069311875a8f", size = 4700168, upload-time = "2026-05-18T19:19:25.133Z" }, + { url = "https://files.pythonhosted.org/packages/3c/d1/a9536cecf9be18a0dc72d32bead283a2332d1ffebd2dd3ac70ce444686e5/lxml-6.1.1-cp313-cp313-manylinux_2_38_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:9eb9b5a968f6e0f6d640092a567e14529ff8cea2e29d00da6f78a79fa49f013c", size = 5232487, upload-time = "2026-05-18T19:19:28.603Z" }, + { url = "https://files.pythonhosted.org/packages/0e/77/b4fb1e03bf5d130e879214d3100092e386418807fb74dd0adc4b0a48f351/lxml-6.1.1-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:aa49e06d94aba782c6a02eecb7e507969e7e7a41b267f1b359bb35585f295d5b", size = 5044231, upload-time = "2026-05-18T19:18:42.246Z" }, + { url = "https://files.pythonhosted.org/packages/26/4c/d00daeeb0a5530c4028a9232aa1b93db3ef4ed2158c116ea73c79a9765b3/lxml-6.1.1-cp313-cp313-musllinux_1_2_armv7l.whl", hash = "sha256:70cdfd80589d59e43e18005dd7244e8895e93db8ab6a620b7e23df5445a4e3d2", size = 4769450, upload-time = "2026-05-18T19:18:48.013Z" }, + { url = "https://files.pythonhosted.org/packages/ed/6a/715a3a8d156ce42f29cf014706f5410c2ff3b02267774110fc23266409fe/lxml-6.1.1-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:aad9aa39483ed8ec44d6d2e59e5b98a0d80676ef0d92f44bfc374836111f62f5", size = 5635874, upload-time = "2026-05-18T19:18:51.914Z" }, + { url = "https://files.pythonhosted.org/packages/45/37/0544bc21dde2a88f3a17b504e6fc79c0e01d25a33c2f6079724e9e72b9c7/lxml-6.1.1-cp313-cp313-musllinux_1_2_riscv64.whl", hash = "sha256:d49514be2f28d895c38cf9d2b72d7b9a07d00314519f456c0b50b53cfcf4c785", size = 5223987, upload-time = "2026-05-18T19:18:59.715Z" }, + { url = "https://files.pythonhosted.org/packages/4d/f8/f6a5e8185bcb28c2befae3d31f8e3df3b811cb0f47746517a81279fcafe1/lxml-6.1.1-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:47402e62c52ff5988c1e8c6c63177f5708bccf48e366dea4e3dcf1e645e04947", size = 5250276, upload-time = "2026-05-18T19:19:03.834Z" }, + { url = "https://files.pythonhosted.org/packages/c7/f2/1a2b9f1b7a49d45495369be7ef9ad05b262930f2eab3e3145706fca8083f/lxml-6.1.1-cp313-cp313-win32.whl", hash = "sha256:3483644525531e1d5762b0c44a8e18b6efba321b6dcf8a8952de10b037618bca", size = 3596903, upload-time = "2026-05-18T19:17:29.863Z" }, + { url = "https://files.pythonhosted.org/packages/e6/99/f4ffb024f238eec2131aaa09f3278fb6129cf892741bf68e1fc1afb8c100/lxml-6.1.1-cp313-cp313-win_amd64.whl", hash = "sha256:a10bd2fd62e8ce916ececb342f348f190724a098c1faa056fdfb2a22ad5e8660", size = 3995869, upload-time = "2026-05-18T19:18:02.596Z" }, + { url = "https://files.pythonhosted.org/packages/d1/53/70eb8c5c6037f27448f1e3c54ebede9545a801ae63f0a7254afca4fe8e45/lxml-6.1.1-cp313-cp313-win_arm64.whl", hash = "sha256:424aa57aca0897eb922aef34395bd1289b3b6f04e6bae20ea123c0c7e333cffc", size = 3658490, upload-time = "2026-05-19T19:22:53.846Z" }, + { url = "https://files.pythonhosted.org/packages/13/e2/2e325795566de01d0d7c3bb57d3c370616b2d07b01214e84eec5d3b10963/lxml-6.1.1-cp314-cp314-macosx_10_15_universal2.whl", hash = "sha256:19b7ab10b210b0b3ad7985d9ac4eb66ab09a90b20fe6e2f7ba55d01a234345d0", size = 8577146, upload-time = "2026-05-18T19:18:17.765Z" }, + { url = "https://files.pythonhosted.org/packages/93/cf/5630b5e4be7d2e6bee8efe83865c925221103cf0221303b104ce134b01e2/lxml-6.1.1-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:c08e5c694306507275f2290073350c4f32e383db15213b2c69e7ff39c1193840", size = 4623866, upload-time = "2026-05-18T19:18:30.669Z" }, + { url = "https://files.pythonhosted.org/packages/d2/51/3904907c063451cf8d4a5c9fe0cad95fa1f4ec57f4e3884fa0731bd7a305/lxml-6.1.1-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:74a9717fd0d82effef5c2854f0d917231d5324b5a3eb7275c43ac9fa32f97a14", size = 4950022, upload-time = "2026-05-18T19:19:31.958Z" }, + { url = "https://files.pythonhosted.org/packages/94/cd/9c7611a51c37a2830928405817cc5d56a97f64fab83cc3f628748b135749/lxml-6.1.1-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:efe0374196335f93b53269acd811b944f2e6bdc88e8894f214bd636455484909", size = 5086695, upload-time = "2026-05-18T19:19:34.764Z" }, + { url = "https://files.pythonhosted.org/packages/da/d6/24e3b5906abb0b674ff2ae195bc3ce59708df2bcd17cf17703b2d7dd643a/lxml-6.1.1-cp314-cp314-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:ac931cdc9442c1763b8a8f6cd62c0c938737eafc5be75eff88df55fc73bc0d00", size = 5031642, upload-time = "2026-05-18T19:19:37.771Z" }, + { url = "https://files.pythonhosted.org/packages/2d/db/6ec54f99019838bff54785c51da07f189eb4676861c5f2730962b0d8d665/lxml-6.1.1-cp314-cp314-manylinux_2_26_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:aee395f5d0927f947758b4ec119fd5fc8ec71f07a1c5c52077b30b04c0fa6955", size = 5647338, upload-time = "2026-05-18T19:19:40.553Z" }, + { url = "https://files.pythonhosted.org/packages/42/3d/ef4dcfffd22d27a61805d8ed9f7fb888495bc6aa88648fa07c1eaa5586b6/lxml-6.1.1-cp314-cp314-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:9395002973c827b3ed67db77e6ec09f092919a587022174554096a269378fb13", size = 5239528, upload-time = "2026-05-18T19:19:43.657Z" }, + { url = "https://files.pythonhosted.org/packages/62/bb/37fb3f0dff146bdcfa78eec47879273820b2a0bf350ec236ce14bd0b1c26/lxml-6.1.1-cp314-cp314-manylinux_2_28_i686.whl", hash = "sha256:73bc2086f141224ebddb7fc5c6a36ca58b31b94b561e1dfe8e073e3270fad1e7", size = 5350730, upload-time = "2026-05-18T19:19:46.307Z" }, + { url = "https://files.pythonhosted.org/packages/90/42/43253f168388df4fae1f38c01df36ddb9bee39e2048167b54cdcbae85ea3/lxml-6.1.1-cp314-cp314-manylinux_2_31_armv7l.whl", hash = "sha256:3779def59032b81e44a5f70096ef6bf2082f8d901937dca354474ba09782e245", size = 4697530, upload-time = "2026-05-18T19:19:49.889Z" }, + { url = "https://files.pythonhosted.org/packages/eb/a8/c5a8504f81bbdfc8e7094c2c850cdb4ed6777fc4d5ddd9e5ab819f3b0d54/lxml-6.1.1-cp314-cp314-manylinux_2_38_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:86c89b9d55ebf820ad7c90bc533410f0d098054f293351f10603c0c46ff598f5", size = 5250670, upload-time = "2026-05-18T19:19:53.199Z" }, + { url = "https://files.pythonhosted.org/packages/77/b7/c7e76ab18744d75e21f320ebf9ff9d1ceae2b54dd431ea5a64caf26c9672/lxml-6.1.1-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:19607c6bbff2a44cf3fe8250abccd20942d3462473e0a721d01d379ed017e462", size = 5084485, upload-time = "2026-05-18T19:19:08.422Z" }, + { url = "https://files.pythonhosted.org/packages/31/31/b35c53f8ef7b7c31cacd23d3638652fff7bcd1deb6eedb709ab43b685908/lxml-6.1.1-cp314-cp314-musllinux_1_2_armv7l.whl", hash = "sha256:c6ed5141a5c7507cf3ee76bd363b0d6f801e3321adc35b5d825a23115faa5465", size = 4737635, upload-time = "2026-05-18T19:19:12.321Z" }, + { url = "https://files.pythonhosted.org/packages/d9/06/31f23c813a7fe8e0cb1b175e915b08c9bf4e86d225b210feadbdbe519667/lxml-6.1.1-cp314-cp314-musllinux_1_2_ppc64le.whl", hash = "sha256:62aeb7e85b5d60320b9d77eef2e773994e2c0ce10121b277e0a19804e1654a5a", size = 5670681, upload-time = "2026-05-18T19:19:15.001Z" }, + { url = "https://files.pythonhosted.org/packages/1a/bc/ce619bccc89b1fd9ad8a8e1330ee3f3beff9f2ff95b712d7bbcdd6e22fc3/lxml-6.1.1-cp314-cp314-musllinux_1_2_riscv64.whl", hash = "sha256:b1b963fd8f5caa68e99dfae060d54de1fe9cba899b8718b44a00cdca53c3e590", size = 5238229, upload-time = "2026-05-18T19:19:18.131Z" }, + { url = "https://files.pythonhosted.org/packages/2f/5d/b329acbbedc0b619ebc2be6cf7ee9ed07e80892c88d4dfd612c33805789a/lxml-6.1.1-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:63876be28efefa04a1df615b46770e82042cce445cfdce55160522f57b231ccb", size = 5264191, upload-time = "2026-05-18T19:19:21.118Z" }, + { url = "https://files.pythonhosted.org/packages/d6/85/be36fb1425b30db3c3f9df75fe86343ebffb79e6320bd7f588e25bfeac39/lxml-6.1.1-cp314-cp314-win32.whl", hash = "sha256:7f7a92e8583f06b1fd49d01158143b8461cfcd135dcb10ec807270a3051bd603", size = 3657202, upload-time = "2026-05-18T19:17:39.509Z" }, + { url = "https://files.pythonhosted.org/packages/b8/ce/3cf9a827342269f54d405a6202397de63f07c69cbd6ce7d183a3f0cba1e9/lxml-6.1.1-cp314-cp314-win_amd64.whl", hash = "sha256:b2d444f2e66624d68e9c6b211e28a76e22fff5fcabcfff4deac18b529b7d4137", size = 4064497, upload-time = "2026-05-18T19:18:14.662Z" }, + { url = "https://files.pythonhosted.org/packages/d9/3e/1a957bde8f0760039e627f94699f82caa782c9d838d86c3d28245ee67212/lxml-6.1.1-cp314-cp314-win_arm64.whl", hash = "sha256:3fd9728a2735fda14f4e8235830c86b539e9661e849665bf926d3f867943b4bf", size = 3741991, upload-time = "2026-05-19T19:22:59.111Z" }, + { url = "https://files.pythonhosted.org/packages/78/b2/00ed55b3a2efa4658fb795c38d1090ec9b3e8a6c3683d4441fa517f09c3b/lxml-6.1.1-cp314-cp314t-macosx_10_15_universal2.whl", hash = "sha256:787b2496d0dbe8cd180984e8d29e3a6f76e7ea34db781cb3bd55e4ba1ef8b4ee", size = 8827545, upload-time = "2026-05-18T19:18:41.193Z" }, + { url = "https://files.pythonhosted.org/packages/c0/73/74573db19baa618d5f266f2407898b087ff6927115b00b71e5fc1b700847/lxml-6.1.1-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:2c8daa471358dc2d6fcf02165e80ec68f77871a286df95bc5cc3816153b0fd2c", size = 4735736, upload-time = "2026-05-18T19:18:46.761Z" }, + { url = "https://files.pythonhosted.org/packages/16/02/6f7061f4f95f51e545d48e87647c54791d204a4e881be4156e7a26ba5338/lxml-6.1.1-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:acd7d70b64c0aae0c7922cca83d288a16f5f6da523637697872253415269baef", size = 4970291, upload-time = "2026-05-18T19:19:56.215Z" }, + { url = "https://files.pythonhosted.org/packages/b0/02/55fc057d8283427dea7d6edb102e7a840239c77a64a983d92f62a304c0e9/lxml-6.1.1-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:4f0dd2f01f9f8a89f565d000e03abcf0a13d692a346c8d22f628d49af098777a", size = 5102822, upload-time = "2026-05-18T19:19:59.223Z" }, + { url = "https://files.pythonhosted.org/packages/e4/48/8e1cf78d89d66850121d9255a2a24414c98f775da93b90cf976956c24b14/lxml-6.1.1-cp314-cp314t-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:0b7e8a14c8634bf6f7a568634cb395305a6d964aeb5b7ee32248094bed3a7e2c", size = 5027923, upload-time = "2026-05-18T19:20:01.549Z" }, + { url = "https://files.pythonhosted.org/packages/ed/00/0632a0647612c8af24d26997b3b961397daa9d5b2581444805933629a4cb/lxml-6.1.1-cp314-cp314t-manylinux_2_26_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:86281fbdd6a8162756f8d603f37e3435bfa38043adb79c6dc6a2dfee065e7525", size = 5595843, upload-time = "2026-05-18T19:20:03.93Z" }, + { url = "https://files.pythonhosted.org/packages/bc/86/ab008a7dc360711b66858d61c80a5979a70a09f2aa2b05d9698df80b803d/lxml-6.1.1-cp314-cp314t-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:c5d7152ec39ca7c402d8fb9bad86140a15b9503bd0c54484e3f1bbe3dd37ceca", size = 5224515, upload-time = "2026-05-18T19:20:06.381Z" }, + { url = "https://files.pythonhosted.org/packages/75/c6/2702ff375e728e34f56d9a45339a9cf7e4427e917f542225242d63a05afa/lxml-6.1.1-cp314-cp314t-manylinux_2_28_i686.whl", hash = "sha256:88d8cb75b9d82858497a5393e3c63cfbf03035225e4b35a49ed7ccb151e4dc0e", size = 5312511, upload-time = "2026-05-18T19:20:09.308Z" }, + { url = "https://files.pythonhosted.org/packages/b7/57/a5807c98f87a86f10ef9ffab35516df7c0f0c4b6d5d33e9f608ab9c04a31/lxml-6.1.1-cp314-cp314t-manylinux_2_31_armv7l.whl", hash = "sha256:f64ec5397ea6a41fc1b4af0380d79b44a755b5531dcaccd9940fb260dca93038", size = 4639206, upload-time = "2026-05-18T19:20:11.704Z" }, + { url = "https://files.pythonhosted.org/packages/1f/e1/8a0a2c35734812395f4da4eaf33748a7e5705bfb2a58b128da764339d5ec/lxml-6.1.1-cp314-cp314t-manylinux_2_38_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:d34bbf07dbc7ca5970671b1512e928991fb5e9d95365636c9b2d8b4f53af405e", size = 5232404, upload-time = "2026-05-18T19:20:14.064Z" }, + { url = "https://files.pythonhosted.org/packages/c2/e2/0e6a4dd5ad84d01d99aa7bae7cfefd4a760a0e0f8176818241de17d9b6c0/lxml-6.1.1-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:17e0e18d4ad8adbd0399291bc44845b69d9dd68439a3cdebdf35ff902ec05072", size = 5083769, upload-time = "2026-05-18T19:19:23.758Z" }, + { url = "https://files.pythonhosted.org/packages/a0/7e/161f33d463f6ffc1c7679104b65086dea120080d49dde4d238f015aaee2f/lxml-6.1.1-cp314-cp314t-musllinux_1_2_armv7l.whl", hash = "sha256:3ab541146f1f6968c462d6c2ac495148e8cdba2f8347700b2141b6ec5a75bf52", size = 4758936, upload-time = "2026-05-18T19:19:27.256Z" }, + { url = "https://files.pythonhosted.org/packages/f1/fb/2369825e3f6ca99305bf9f7b7085fda91c8b0922a89e54d900974aa3ef85/lxml-6.1.1-cp314-cp314t-musllinux_1_2_ppc64le.whl", hash = "sha256:2a0217714657e023ef4293500f65aa20fce6164c8fd6b08fa5bd4a859fb14b9b", size = 5620296, upload-time = "2026-05-18T19:19:29.993Z" }, + { url = "https://files.pythonhosted.org/packages/30/90/d61e383146f74c5ab683947ea14dc7b82778838ab9b95ea73a23b60d0191/lxml-6.1.1-cp314-cp314t-musllinux_1_2_riscv64.whl", hash = "sha256:05a82eb6e1530a64f26225b55cbd178113bd0b5af1c2b625f25e5296742c26d2", size = 5228598, upload-time = "2026-05-18T19:19:33.523Z" }, + { url = "https://files.pythonhosted.org/packages/76/2d/2dafd8149e94b05bb070690efd5bb2680720681e03ff03fc57d2b70a1105/lxml-6.1.1-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:9e36f163528fc50cbef305f02a5fd66d404edf7049cdaff211dbc2cba5a7013e", size = 5247845, upload-time = "2026-05-18T19:19:36.649Z" }, + { url = "https://files.pythonhosted.org/packages/ce/68/b30e913340c380ddac9580c6e6230991fc37240ec4f64704833e4f3e2769/lxml-6.1.1-cp314-cp314t-win32.whl", hash = "sha256:649dda677cf3bd6ac9ae14007ba0c824ded8ce5808b53fc7431d9140399118c1", size = 3897345, upload-time = "2026-05-18T19:17:33.562Z" }, + { url = "https://files.pythonhosted.org/packages/3c/4e/9eb2af5335545f9fbcd7af57bcf87c6025d31eaa31b14ec184a6c8675328/lxml-6.1.1-cp314-cp314t-win_amd64.whl", hash = "sha256:793033d6c5cdf33a573f910d9bea14ef8f5771820411d118da8e1182edb53d5e", size = 4393350, upload-time = "2026-05-18T19:18:10.076Z" }, + { url = "https://files.pythonhosted.org/packages/7f/2c/0f1e93c636720e8a3eb59af2bfda99d98b55891e1c53bc30c2e0e865f01b/lxml-6.1.1-cp314-cp314t-win_arm64.whl", hash = "sha256:58bb955caba94e467d2a96da17660d2d704e0675894cba21ab8a775b8621fd1c", size = 3817223, upload-time = "2026-05-19T19:22:56.823Z" }, + { url = "https://files.pythonhosted.org/packages/b5/32/86a3f0f724a3a402d4627937a7fc27b160e45e7012b4adf47f6e1e844511/lxml-6.1.1-pp311-pypy311_pp73-macosx_10_15_x86_64.whl", hash = "sha256:31033dc34636ea6b7d5cc11b1ddbda78a14de858ba9d3e1ed4b69a3085bc521e", size = 3930127, upload-time = "2026-05-18T19:19:02.27Z" }, + { url = "https://files.pythonhosted.org/packages/40/44/d832e82af08723761556d004b1d04d281c09f9a8cecd7d3148548c9941a3/lxml-6.1.1-pp311-pypy311_pp73-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:3893c14c4b6ac5b2d54ba8cf03e99fe5104e592de491f19bd6b82756c09f8004", size = 4210769, upload-time = "2026-05-18T19:20:41.427Z" }, + { url = "https://files.pythonhosted.org/packages/6d/39/0dc5949f759ed7d951e0bb8c2f2d9d7aca1908d22352fa84a8afd2ea54af/lxml-6.1.1-pp311-pypy311_pp73-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:c07da4cebf6889f03ebac8d238f62318e29f495de0aa18a51ea14e61ae907e2e", size = 4318163, upload-time = "2026-05-18T19:20:44.702Z" }, + { url = "https://files.pythonhosted.org/packages/e6/fb/8ab3845fe046ba4cbf74536bcf6801a774b7caf4350de1c5d37f1f0a9e90/lxml-6.1.1-pp311-pypy311_pp73-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:f6f0ce10945fab9c4c06ce14e22af9059d1a87493a9af4501a5b0b9187e21cf2", size = 4250945, upload-time = "2026-05-18T19:20:47.385Z" }, + { url = "https://files.pythonhosted.org/packages/68/1b/7553ab136894374ffae8851ec06f98f511cd8e66246e41b6be059d0a7289/lxml-6.1.1-pp311-pypy311_pp73-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:f8844cd288697c6425c9beba919302241e3278871dc6519515e72b04e987abcf", size = 4401664, upload-time = "2026-05-18T19:20:50.489Z" }, + { url = "https://files.pythonhosted.org/packages/db/a4/441aee36c6f6b249823d20fd91f9be9ab89d7c5a8ae542a4a4ca6d342d56/lxml-6.1.1-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:ed21202aec73cda4d55d1ce57b389aadb90ffb044e6cd1080b8347efe1b1ec84", size = 3508989, upload-time = "2026-05-18T19:18:38.158Z" }, +] + +[[package]] +name = "markupsafe" +version = "3.0.3" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/7e/99/7690b6d4034fffd95959cbe0c02de8deb3098cc577c67bb6a24fe5d7caa7/markupsafe-3.0.3.tar.gz", hash = "sha256:722695808f4b6457b320fdc131280796bdceb04ab50fe1795cd540799ebe1698", size = 80313, upload-time = "2025-09-27T18:37:40.426Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/08/db/fefacb2136439fc8dd20e797950e749aa1f4997ed584c62cfb8ef7c2be0e/markupsafe-3.0.3-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:1cc7ea17a6824959616c525620e387f6dd30fec8cb44f649e31712db02123dad", size = 11631, upload-time = "2025-09-27T18:36:18.185Z" }, + { url = "https://files.pythonhosted.org/packages/e1/2e/5898933336b61975ce9dc04decbc0a7f2fee78c30353c5efba7f2d6ff27a/markupsafe-3.0.3-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:4bd4cd07944443f5a265608cc6aab442e4f74dff8088b0dfc8238647b8f6ae9a", size = 12058, upload-time = "2025-09-27T18:36:19.444Z" }, + { url = "https://files.pythonhosted.org/packages/1d/09/adf2df3699d87d1d8184038df46a9c80d78c0148492323f4693df54e17bb/markupsafe-3.0.3-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:6b5420a1d9450023228968e7e6a9ce57f65d148ab56d2313fcd589eee96a7a50", size = 24287, upload-time = "2025-09-27T18:36:20.768Z" }, + { url = "https://files.pythonhosted.org/packages/30/ac/0273f6fcb5f42e314c6d8cd99effae6a5354604d461b8d392b5ec9530a54/markupsafe-3.0.3-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:0bf2a864d67e76e5c9a34dc26ec616a66b9888e25e7b9460e1c76d3293bd9dbf", size = 22940, upload-time = "2025-09-27T18:36:22.249Z" }, + { url = "https://files.pythonhosted.org/packages/19/ae/31c1be199ef767124c042c6c3e904da327a2f7f0cd63a0337e1eca2967a8/markupsafe-3.0.3-cp311-cp311-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:bc51efed119bc9cfdf792cdeaa4d67e8f6fcccab66ed4bfdd6bde3e59bfcbb2f", size = 21887, upload-time = "2025-09-27T18:36:23.535Z" }, + { url = "https://files.pythonhosted.org/packages/b2/76/7edcab99d5349a4532a459e1fe64f0b0467a3365056ae550d3bcf3f79e1e/markupsafe-3.0.3-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:068f375c472b3e7acbe2d5318dea141359e6900156b5b2ba06a30b169086b91a", size = 23692, upload-time = "2025-09-27T18:36:24.823Z" }, + { url = "https://files.pythonhosted.org/packages/a4/28/6e74cdd26d7514849143d69f0bf2399f929c37dc2b31e6829fd2045b2765/markupsafe-3.0.3-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:7be7b61bb172e1ed687f1754f8e7484f1c8019780f6f6b0786e76bb01c2ae115", size = 21471, upload-time = "2025-09-27T18:36:25.95Z" }, + { url = "https://files.pythonhosted.org/packages/62/7e/a145f36a5c2945673e590850a6f8014318d5577ed7e5920a4b3448e0865d/markupsafe-3.0.3-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:f9e130248f4462aaa8e2552d547f36ddadbeaa573879158d721bbd33dfe4743a", size = 22923, upload-time = "2025-09-27T18:36:27.109Z" }, + { url = "https://files.pythonhosted.org/packages/0f/62/d9c46a7f5c9adbeeeda52f5b8d802e1094e9717705a645efc71b0913a0a8/markupsafe-3.0.3-cp311-cp311-win32.whl", hash = "sha256:0db14f5dafddbb6d9208827849fad01f1a2609380add406671a26386cdf15a19", size = 14572, upload-time = "2025-09-27T18:36:28.045Z" }, + { url = "https://files.pythonhosted.org/packages/83/8a/4414c03d3f891739326e1783338e48fb49781cc915b2e0ee052aa490d586/markupsafe-3.0.3-cp311-cp311-win_amd64.whl", hash = "sha256:de8a88e63464af587c950061a5e6a67d3632e36df62b986892331d4620a35c01", size = 15077, upload-time = "2025-09-27T18:36:29.025Z" }, + { url = "https://files.pythonhosted.org/packages/35/73/893072b42e6862f319b5207adc9ae06070f095b358655f077f69a35601f0/markupsafe-3.0.3-cp311-cp311-win_arm64.whl", hash = "sha256:3b562dd9e9ea93f13d53989d23a7e775fdfd1066c33494ff43f5418bc8c58a5c", size = 13876, upload-time = "2025-09-27T18:36:29.954Z" }, + { url = "https://files.pythonhosted.org/packages/5a/72/147da192e38635ada20e0a2e1a51cf8823d2119ce8883f7053879c2199b5/markupsafe-3.0.3-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:d53197da72cc091b024dd97249dfc7794d6a56530370992a5e1a08983ad9230e", size = 11615, upload-time = "2025-09-27T18:36:30.854Z" }, + { url = "https://files.pythonhosted.org/packages/9a/81/7e4e08678a1f98521201c3079f77db69fb552acd56067661f8c2f534a718/markupsafe-3.0.3-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:1872df69a4de6aead3491198eaf13810b565bdbeec3ae2dc8780f14458ec73ce", size = 12020, upload-time = "2025-09-27T18:36:31.971Z" }, + { url = "https://files.pythonhosted.org/packages/1e/2c/799f4742efc39633a1b54a92eec4082e4f815314869865d876824c257c1e/markupsafe-3.0.3-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:3a7e8ae81ae39e62a41ec302f972ba6ae23a5c5396c8e60113e9066ef893da0d", size = 24332, upload-time = "2025-09-27T18:36:32.813Z" }, + { url = "https://files.pythonhosted.org/packages/3c/2e/8d0c2ab90a8c1d9a24f0399058ab8519a3279d1bd4289511d74e909f060e/markupsafe-3.0.3-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:d6dd0be5b5b189d31db7cda48b91d7e0a9795f31430b7f271219ab30f1d3ac9d", size = 22947, upload-time = "2025-09-27T18:36:33.86Z" }, + { url = "https://files.pythonhosted.org/packages/2c/54/887f3092a85238093a0b2154bd629c89444f395618842e8b0c41783898ea/markupsafe-3.0.3-cp312-cp312-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:94c6f0bb423f739146aec64595853541634bde58b2135f27f61c1ffd1cd4d16a", size = 21962, upload-time = "2025-09-27T18:36:35.099Z" }, + { url = "https://files.pythonhosted.org/packages/c9/2f/336b8c7b6f4a4d95e91119dc8521402461b74a485558d8f238a68312f11c/markupsafe-3.0.3-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:be8813b57049a7dc738189df53d69395eba14fb99345e0a5994914a3864c8a4b", size = 23760, upload-time = "2025-09-27T18:36:36.001Z" }, + { url = "https://files.pythonhosted.org/packages/32/43/67935f2b7e4982ffb50a4d169b724d74b62a3964bc1a9a527f5ac4f1ee2b/markupsafe-3.0.3-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:83891d0e9fb81a825d9a6d61e3f07550ca70a076484292a70fde82c4b807286f", size = 21529, upload-time = "2025-09-27T18:36:36.906Z" }, + { url = "https://files.pythonhosted.org/packages/89/e0/4486f11e51bbba8b0c041098859e869e304d1c261e59244baa3d295d47b7/markupsafe-3.0.3-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:77f0643abe7495da77fb436f50f8dab76dbc6e5fd25d39589a0f1fe6548bfa2b", size = 23015, upload-time = "2025-09-27T18:36:37.868Z" }, + { url = "https://files.pythonhosted.org/packages/2f/e1/78ee7a023dac597a5825441ebd17170785a9dab23de95d2c7508ade94e0e/markupsafe-3.0.3-cp312-cp312-win32.whl", hash = "sha256:d88b440e37a16e651bda4c7c2b930eb586fd15ca7406cb39e211fcff3bf3017d", size = 14540, upload-time = "2025-09-27T18:36:38.761Z" }, + { url = "https://files.pythonhosted.org/packages/aa/5b/bec5aa9bbbb2c946ca2733ef9c4ca91c91b6a24580193e891b5f7dbe8e1e/markupsafe-3.0.3-cp312-cp312-win_amd64.whl", hash = "sha256:26a5784ded40c9e318cfc2bdb30fe164bdb8665ded9cd64d500a34fb42067b1c", size = 15105, upload-time = "2025-09-27T18:36:39.701Z" }, + { url = "https://files.pythonhosted.org/packages/e5/f1/216fc1bbfd74011693a4fd837e7026152e89c4bcf3e77b6692fba9923123/markupsafe-3.0.3-cp312-cp312-win_arm64.whl", hash = "sha256:35add3b638a5d900e807944a078b51922212fb3dedb01633a8defc4b01a3c85f", size = 13906, upload-time = "2025-09-27T18:36:40.689Z" }, + { url = "https://files.pythonhosted.org/packages/38/2f/907b9c7bbba283e68f20259574b13d005c121a0fa4c175f9bed27c4597ff/markupsafe-3.0.3-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:e1cf1972137e83c5d4c136c43ced9ac51d0e124706ee1c8aa8532c1287fa8795", size = 11622, upload-time = "2025-09-27T18:36:41.777Z" }, + { url = "https://files.pythonhosted.org/packages/9c/d9/5f7756922cdd676869eca1c4e3c0cd0df60ed30199ffd775e319089cb3ed/markupsafe-3.0.3-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:116bb52f642a37c115f517494ea5feb03889e04df47eeff5b130b1808ce7c219", size = 12029, upload-time = "2025-09-27T18:36:43.257Z" }, + { url = "https://files.pythonhosted.org/packages/00/07/575a68c754943058c78f30db02ee03a64b3c638586fba6a6dd56830b30a3/markupsafe-3.0.3-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:133a43e73a802c5562be9bbcd03d090aa5a1fe899db609c29e8c8d815c5f6de6", size = 24374, upload-time = "2025-09-27T18:36:44.508Z" }, + { url = "https://files.pythonhosted.org/packages/a9/21/9b05698b46f218fc0e118e1f8168395c65c8a2c750ae2bab54fc4bd4e0e8/markupsafe-3.0.3-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:ccfcd093f13f0f0b7fdd0f198b90053bf7b2f02a3927a30e63f3ccc9df56b676", size = 22980, upload-time = "2025-09-27T18:36:45.385Z" }, + { url = "https://files.pythonhosted.org/packages/7f/71/544260864f893f18b6827315b988c146b559391e6e7e8f7252839b1b846a/markupsafe-3.0.3-cp313-cp313-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:509fa21c6deb7a7a273d629cf5ec029bc209d1a51178615ddf718f5918992ab9", size = 21990, upload-time = "2025-09-27T18:36:46.916Z" }, + { url = "https://files.pythonhosted.org/packages/c2/28/b50fc2f74d1ad761af2f5dcce7492648b983d00a65b8c0e0cb457c82ebbe/markupsafe-3.0.3-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:a4afe79fb3de0b7097d81da19090f4df4f8d3a2b3adaa8764138aac2e44f3af1", size = 23784, upload-time = "2025-09-27T18:36:47.884Z" }, + { url = "https://files.pythonhosted.org/packages/ed/76/104b2aa106a208da8b17a2fb72e033a5a9d7073c68f7e508b94916ed47a9/markupsafe-3.0.3-cp313-cp313-musllinux_1_2_riscv64.whl", hash = "sha256:795e7751525cae078558e679d646ae45574b47ed6e7771863fcc079a6171a0fc", size = 21588, upload-time = "2025-09-27T18:36:48.82Z" }, + { url = "https://files.pythonhosted.org/packages/b5/99/16a5eb2d140087ebd97180d95249b00a03aa87e29cc224056274f2e45fd6/markupsafe-3.0.3-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:8485f406a96febb5140bfeca44a73e3ce5116b2501ac54fe953e488fb1d03b12", size = 23041, upload-time = "2025-09-27T18:36:49.797Z" }, + { url = "https://files.pythonhosted.org/packages/19/bc/e7140ed90c5d61d77cea142eed9f9c303f4c4806f60a1044c13e3f1471d0/markupsafe-3.0.3-cp313-cp313-win32.whl", hash = "sha256:bdd37121970bfd8be76c5fb069c7751683bdf373db1ed6c010162b2a130248ed", size = 14543, upload-time = "2025-09-27T18:36:51.584Z" }, + { url = "https://files.pythonhosted.org/packages/05/73/c4abe620b841b6b791f2edc248f556900667a5a1cf023a6646967ae98335/markupsafe-3.0.3-cp313-cp313-win_amd64.whl", hash = "sha256:9a1abfdc021a164803f4d485104931fb8f8c1efd55bc6b748d2f5774e78b62c5", size = 15113, upload-time = "2025-09-27T18:36:52.537Z" }, + { url = "https://files.pythonhosted.org/packages/f0/3a/fa34a0f7cfef23cf9500d68cb7c32dd64ffd58a12b09225fb03dd37d5b80/markupsafe-3.0.3-cp313-cp313-win_arm64.whl", hash = "sha256:7e68f88e5b8799aa49c85cd116c932a1ac15caaa3f5db09087854d218359e485", size = 13911, upload-time = "2025-09-27T18:36:53.513Z" }, + { url = "https://files.pythonhosted.org/packages/e4/d7/e05cd7efe43a88a17a37b3ae96e79a19e846f3f456fe79c57ca61356ef01/markupsafe-3.0.3-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:218551f6df4868a8d527e3062d0fb968682fe92054e89978594c28e642c43a73", size = 11658, upload-time = "2025-09-27T18:36:54.819Z" }, + { url = "https://files.pythonhosted.org/packages/99/9e/e412117548182ce2148bdeacdda3bb494260c0b0184360fe0d56389b523b/markupsafe-3.0.3-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:3524b778fe5cfb3452a09d31e7b5adefeea8c5be1d43c4f810ba09f2ceb29d37", size = 12066, upload-time = "2025-09-27T18:36:55.714Z" }, + { url = "https://files.pythonhosted.org/packages/bc/e6/fa0ffcda717ef64a5108eaa7b4f5ed28d56122c9a6d70ab8b72f9f715c80/markupsafe-3.0.3-cp313-cp313t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:4e885a3d1efa2eadc93c894a21770e4bc67899e3543680313b09f139e149ab19", size = 25639, upload-time = "2025-09-27T18:36:56.908Z" }, + { url = "https://files.pythonhosted.org/packages/96/ec/2102e881fe9d25fc16cb4b25d5f5cde50970967ffa5dddafdb771237062d/markupsafe-3.0.3-cp313-cp313t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:8709b08f4a89aa7586de0aadc8da56180242ee0ada3999749b183aa23df95025", size = 23569, upload-time = "2025-09-27T18:36:57.913Z" }, + { url = "https://files.pythonhosted.org/packages/4b/30/6f2fce1f1f205fc9323255b216ca8a235b15860c34b6798f810f05828e32/markupsafe-3.0.3-cp313-cp313t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:b8512a91625c9b3da6f127803b166b629725e68af71f8184ae7e7d54686a56d6", size = 23284, upload-time = "2025-09-27T18:36:58.833Z" }, + { url = "https://files.pythonhosted.org/packages/58/47/4a0ccea4ab9f5dcb6f79c0236d954acb382202721e704223a8aafa38b5c8/markupsafe-3.0.3-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:9b79b7a16f7fedff2495d684f2b59b0457c3b493778c9eed31111be64d58279f", size = 24801, upload-time = "2025-09-27T18:36:59.739Z" }, + { url = "https://files.pythonhosted.org/packages/6a/70/3780e9b72180b6fecb83a4814d84c3bf4b4ae4bf0b19c27196104149734c/markupsafe-3.0.3-cp313-cp313t-musllinux_1_2_riscv64.whl", hash = "sha256:12c63dfb4a98206f045aa9563db46507995f7ef6d83b2f68eda65c307c6829eb", size = 22769, upload-time = "2025-09-27T18:37:00.719Z" }, + { url = "https://files.pythonhosted.org/packages/98/c5/c03c7f4125180fc215220c035beac6b9cb684bc7a067c84fc69414d315f5/markupsafe-3.0.3-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:8f71bc33915be5186016f675cd83a1e08523649b0e33efdb898db577ef5bb009", size = 23642, upload-time = "2025-09-27T18:37:01.673Z" }, + { url = "https://files.pythonhosted.org/packages/80/d6/2d1b89f6ca4bff1036499b1e29a1d02d282259f3681540e16563f27ebc23/markupsafe-3.0.3-cp313-cp313t-win32.whl", hash = "sha256:69c0b73548bc525c8cb9a251cddf1931d1db4d2258e9599c28c07ef3580ef354", size = 14612, upload-time = "2025-09-27T18:37:02.639Z" }, + { url = "https://files.pythonhosted.org/packages/2b/98/e48a4bfba0a0ffcf9925fe2d69240bfaa19c6f7507b8cd09c70684a53c1e/markupsafe-3.0.3-cp313-cp313t-win_amd64.whl", hash = "sha256:1b4b79e8ebf6b55351f0d91fe80f893b4743f104bff22e90697db1590e47a218", size = 15200, upload-time = "2025-09-27T18:37:03.582Z" }, + { url = "https://files.pythonhosted.org/packages/0e/72/e3cc540f351f316e9ed0f092757459afbc595824ca724cbc5a5d4263713f/markupsafe-3.0.3-cp313-cp313t-win_arm64.whl", hash = "sha256:ad2cf8aa28b8c020ab2fc8287b0f823d0a7d8630784c31e9ee5edea20f406287", size = 13973, upload-time = "2025-09-27T18:37:04.929Z" }, + { url = "https://files.pythonhosted.org/packages/33/8a/8e42d4838cd89b7dde187011e97fe6c3af66d8c044997d2183fbd6d31352/markupsafe-3.0.3-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:eaa9599de571d72e2daf60164784109f19978b327a3910d3e9de8c97b5b70cfe", size = 11619, upload-time = "2025-09-27T18:37:06.342Z" }, + { url = "https://files.pythonhosted.org/packages/b5/64/7660f8a4a8e53c924d0fa05dc3a55c9cee10bbd82b11c5afb27d44b096ce/markupsafe-3.0.3-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:c47a551199eb8eb2121d4f0f15ae0f923d31350ab9280078d1e5f12b249e0026", size = 12029, upload-time = "2025-09-27T18:37:07.213Z" }, + { url = "https://files.pythonhosted.org/packages/da/ef/e648bfd021127bef5fa12e1720ffed0c6cbb8310c8d9bea7266337ff06de/markupsafe-3.0.3-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:f34c41761022dd093b4b6896d4810782ffbabe30f2d443ff5f083e0cbbb8c737", size = 24408, upload-time = "2025-09-27T18:37:09.572Z" }, + { url = "https://files.pythonhosted.org/packages/41/3c/a36c2450754618e62008bf7435ccb0f88053e07592e6028a34776213d877/markupsafe-3.0.3-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:457a69a9577064c05a97c41f4e65148652db078a3a509039e64d3467b9e7ef97", size = 23005, upload-time = "2025-09-27T18:37:10.58Z" }, + { url = "https://files.pythonhosted.org/packages/bc/20/b7fdf89a8456b099837cd1dc21974632a02a999ec9bf7ca3e490aacd98e7/markupsafe-3.0.3-cp314-cp314-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:e8afc3f2ccfa24215f8cb28dcf43f0113ac3c37c2f0f0806d8c70e4228c5cf4d", size = 22048, upload-time = "2025-09-27T18:37:11.547Z" }, + { url = "https://files.pythonhosted.org/packages/9a/a7/591f592afdc734f47db08a75793a55d7fbcc6902a723ae4cfbab61010cc5/markupsafe-3.0.3-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:ec15a59cf5af7be74194f7ab02d0f59a62bdcf1a537677ce67a2537c9b87fcda", size = 23821, upload-time = "2025-09-27T18:37:12.48Z" }, + { url = "https://files.pythonhosted.org/packages/7d/33/45b24e4f44195b26521bc6f1a82197118f74df348556594bd2262bda1038/markupsafe-3.0.3-cp314-cp314-musllinux_1_2_riscv64.whl", hash = "sha256:0eb9ff8191e8498cca014656ae6b8d61f39da5f95b488805da4bb029cccbfbaf", size = 21606, upload-time = "2025-09-27T18:37:13.485Z" }, + { url = "https://files.pythonhosted.org/packages/ff/0e/53dfaca23a69fbfbbf17a4b64072090e70717344c52eaaaa9c5ddff1e5f0/markupsafe-3.0.3-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:2713baf880df847f2bece4230d4d094280f4e67b1e813eec43b4c0e144a34ffe", size = 23043, upload-time = "2025-09-27T18:37:14.408Z" }, + { url = "https://files.pythonhosted.org/packages/46/11/f333a06fc16236d5238bfe74daccbca41459dcd8d1fa952e8fbd5dccfb70/markupsafe-3.0.3-cp314-cp314-win32.whl", hash = "sha256:729586769a26dbceff69f7a7dbbf59ab6572b99d94576a5592625d5b411576b9", size = 14747, upload-time = "2025-09-27T18:37:15.36Z" }, + { url = "https://files.pythonhosted.org/packages/28/52/182836104b33b444e400b14f797212f720cbc9ed6ba34c800639d154e821/markupsafe-3.0.3-cp314-cp314-win_amd64.whl", hash = "sha256:bdc919ead48f234740ad807933cdf545180bfbe9342c2bb451556db2ed958581", size = 15341, upload-time = "2025-09-27T18:37:16.496Z" }, + { url = "https://files.pythonhosted.org/packages/6f/18/acf23e91bd94fd7b3031558b1f013adfa21a8e407a3fdb32745538730382/markupsafe-3.0.3-cp314-cp314-win_arm64.whl", hash = "sha256:5a7d5dc5140555cf21a6fefbdbf8723f06fcd2f63ef108f2854de715e4422cb4", size = 14073, upload-time = "2025-09-27T18:37:17.476Z" }, + { url = "https://files.pythonhosted.org/packages/3c/f0/57689aa4076e1b43b15fdfa646b04653969d50cf30c32a102762be2485da/markupsafe-3.0.3-cp314-cp314t-macosx_10_13_x86_64.whl", hash = "sha256:1353ef0c1b138e1907ae78e2f6c63ff67501122006b0f9abad68fda5f4ffc6ab", size = 11661, upload-time = "2025-09-27T18:37:18.453Z" }, + { url = "https://files.pythonhosted.org/packages/89/c3/2e67a7ca217c6912985ec766c6393b636fb0c2344443ff9d91404dc4c79f/markupsafe-3.0.3-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:1085e7fbddd3be5f89cc898938f42c0b3c711fdcb37d75221de2666af647c175", size = 12069, upload-time = "2025-09-27T18:37:19.332Z" }, + { url = "https://files.pythonhosted.org/packages/f0/00/be561dce4e6ca66b15276e184ce4b8aec61fe83662cce2f7d72bd3249d28/markupsafe-3.0.3-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:1b52b4fb9df4eb9ae465f8d0c228a00624de2334f216f178a995ccdcf82c4634", size = 25670, upload-time = "2025-09-27T18:37:20.245Z" }, + { url = "https://files.pythonhosted.org/packages/50/09/c419f6f5a92e5fadde27efd190eca90f05e1261b10dbd8cbcb39cd8ea1dc/markupsafe-3.0.3-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:fed51ac40f757d41b7c48425901843666a6677e3e8eb0abcff09e4ba6e664f50", size = 23598, upload-time = "2025-09-27T18:37:21.177Z" }, + { url = "https://files.pythonhosted.org/packages/22/44/a0681611106e0b2921b3033fc19bc53323e0b50bc70cffdd19f7d679bb66/markupsafe-3.0.3-cp314-cp314t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:f190daf01f13c72eac4efd5c430a8de82489d9cff23c364c3ea822545032993e", size = 23261, upload-time = "2025-09-27T18:37:22.167Z" }, + { url = "https://files.pythonhosted.org/packages/5f/57/1b0b3f100259dc9fffe780cfb60d4be71375510e435efec3d116b6436d43/markupsafe-3.0.3-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:e56b7d45a839a697b5eb268c82a71bd8c7f6c94d6fd50c3d577fa39a9f1409f5", size = 24835, upload-time = "2025-09-27T18:37:23.296Z" }, + { url = "https://files.pythonhosted.org/packages/26/6a/4bf6d0c97c4920f1597cc14dd720705eca0bf7c787aebc6bb4d1bead5388/markupsafe-3.0.3-cp314-cp314t-musllinux_1_2_riscv64.whl", hash = "sha256:f3e98bb3798ead92273dc0e5fd0f31ade220f59a266ffd8a4f6065e0a3ce0523", size = 22733, upload-time = "2025-09-27T18:37:24.237Z" }, + { url = "https://files.pythonhosted.org/packages/14/c7/ca723101509b518797fedc2fdf79ba57f886b4aca8a7d31857ba3ee8281f/markupsafe-3.0.3-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:5678211cb9333a6468fb8d8be0305520aa073f50d17f089b5b4b477ea6e67fdc", size = 23672, upload-time = "2025-09-27T18:37:25.271Z" }, + { url = "https://files.pythonhosted.org/packages/fb/df/5bd7a48c256faecd1d36edc13133e51397e41b73bb77e1a69deab746ebac/markupsafe-3.0.3-cp314-cp314t-win32.whl", hash = "sha256:915c04ba3851909ce68ccc2b8e2cd691618c4dc4c4232fb7982bca3f41fd8c3d", size = 14819, upload-time = "2025-09-27T18:37:26.285Z" }, + { url = "https://files.pythonhosted.org/packages/1a/8a/0402ba61a2f16038b48b39bccca271134be00c5c9f0f623208399333c448/markupsafe-3.0.3-cp314-cp314t-win_amd64.whl", hash = "sha256:4faffd047e07c38848ce017e8725090413cd80cbc23d86e55c587bf979e579c9", size = 15426, upload-time = "2025-09-27T18:37:27.316Z" }, + { url = "https://files.pythonhosted.org/packages/70/bc/6f1c2f612465f5fa89b95bead1f44dcb607670fd42891d8fdcd5d039f4f4/markupsafe-3.0.3-cp314-cp314t-win_arm64.whl", hash = "sha256:32001d6a8fc98c8cb5c947787c5d08b0a50663d139f1305bac5885d98d9b40fa", size = 14146, upload-time = "2025-09-27T18:37:28.327Z" }, +] + +[[package]] +name = "marshmallow" +version = "3.26.2" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "packaging" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/55/79/de6c16cc902f4fc372236926b0ce2ab7845268dcc30fb2fbb7f71b418631/marshmallow-3.26.2.tar.gz", hash = "sha256:bbe2adb5a03e6e3571b573f42527c6fe926e17467833660bebd11593ab8dfd57", size = 222095, upload-time = "2025-12-22T06:53:53.309Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/be/2f/5108cb3ee4ba6501748c4908b908e55f42a5b66245b4cfe0c99326e1ef6e/marshmallow-3.26.2-py3-none-any.whl", hash = "sha256:013fa8a3c4c276c24d26d84ce934dc964e2aa794345a0f8c7e5a7191482c8a73", size = 50964, upload-time = "2025-12-22T06:53:51.801Z" }, +] + +[[package]] +name = "marshmallow-mongoengine" +version = "0.31.2" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "marshmallow" }, + { name = "mongoengine" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/63/72/5cabacd62c5b4f81a1e955e0c54bb86d1289621e384f522552806f9ee101/marshmallow-mongoengine-0.31.2.tar.gz", hash = "sha256:a708732456e1a36139c6ce52910b57cf2a54e7206c5c635a48dba9e3e157d6db", size = 11377, upload-time = "2023-03-14T05:42:51.825Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/c4/ef/ec8be29d7f6dec0bae9391e8fae352a3d5b2ddb9be84a7d611a5b0e5c1de/marshmallow_mongoengine-0.31.2-py2.py3-none-any.whl", hash = "sha256:51de7614ce9002f9f679aebb6df7488297e791fbd07d9f14b963e9c7bce604ca", size = 12237, upload-time = "2023-03-14T05:42:50.515Z" }, +] + +[[package]] +name = "matplotlib" +version = "3.10.9" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "contourpy" }, + { name = "cycler" }, + { name = "fonttools" }, + { name = "kiwisolver" }, + { name = "numpy" }, + { name = "packaging" }, + { name = "pillow" }, + { name = "pyparsing" }, + { name = "python-dateutil" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/63/1b/4be5be87d43d327a0cf4de1a56e86f7f84c89312452406cf122efe2839e6/matplotlib-3.10.9.tar.gz", hash = "sha256:fd66508e8c6877d98e586654b608a0456db8d7e8a546eb1e2600efd957302358", size = 34811233, upload-time = "2026-04-24T00:14:13.539Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/4c/8c/290f021104741fea63769c31494f5324c0cd249bf536a65a4350767b1f22/matplotlib-3.10.9-cp311-cp311-macosx_10_12_x86_64.whl", hash = "sha256:68cfdcede415f7c8f5577b03303dd94526cdb6d11036cecdc205e08733b2d2bb", size = 8306860, upload-time = "2026-04-24T00:12:01.207Z" }, + { url = "https://files.pythonhosted.org/packages/51/18/325cd32ece1120d1da51cc4e4294c6580190699490183fc2fe8cb6d61ec5/matplotlib-3.10.9-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:dfca0129678bd56379db26c52b5d77ed7de314c047492fbdc763aa7501710cfb", size = 8199254, upload-time = "2026-04-24T00:12:04.239Z" }, + { url = "https://files.pythonhosted.org/packages/79/db/e28c1b83e3680740aa78925f5fb2ae4d16207207419ad75ea9fe604f8676/matplotlib-3.10.9-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:8e436d155fa8a3399dc62683f8f5d0e2e50d25d0144a73edd73f82eec8f4abfb", size = 8777092, upload-time = "2026-04-24T00:12:06.793Z" }, + { url = "https://files.pythonhosted.org/packages/55/fa/3ce7adfe9ba101748f465211660d9c6374c876b671bdb8c2bb6d347e8b94/matplotlib-3.10.9-cp311-cp311-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:56fc0bd271b00025c6edfdc7c2dcd247372c8e1544971d62e1dc7c17367e8bf9", size = 9595691, upload-time = "2026-04-24T00:12:09.706Z" }, + { url = "https://files.pythonhosted.org/packages/36/c4/6960a76686ed668f2c60f84e9799ba4c0d56abdb36b1577b60c1d061d1ec/matplotlib-3.10.9-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:a5a6104ed666402ba5106d7f36e0e0cdca4e8d7fa4d39708ca88019e2835a2eb", size = 9659771, upload-time = "2026-04-24T00:12:12.766Z" }, + { url = "https://files.pythonhosted.org/packages/7e/0d/271aace3342157c64700c9ff4c59c7b392f3dbab393692e8db6fbe7ab96c/matplotlib-3.10.9-cp311-cp311-win_amd64.whl", hash = "sha256:d730e984eddf56974c3e72b6129c7ca462ac38dc624338f4b0b23eb23ecba00f", size = 8205112, upload-time = "2026-04-24T00:12:15.773Z" }, + { url = "https://files.pythonhosted.org/packages/e2/ee/cb57ad4754f3e7b9174ce6ce66d9205fb827067e48a9f58ac09d7e7d6b77/matplotlib-3.10.9-cp311-cp311-win_arm64.whl", hash = "sha256:51bf0ddbdc598e060d46c16b5590708f81a1624cefbaaf62f6a81bf9285b8c80", size = 8132310, upload-time = "2026-04-24T00:12:18.645Z" }, + { url = "https://files.pythonhosted.org/packages/35/c6/5581e26c72233ebb2a2a6fed2d24fb7c66b4700120b813f51b0555acf0b6/matplotlib-3.10.9-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:f0c3c28d9fbcc1fe7a03be236d73430cf6409c41fb2383a7ac52fe932b072cb1", size = 8319908, upload-time = "2026-04-24T00:12:21.323Z" }, + { url = "https://files.pythonhosted.org/packages/b7/18/4880dd762e40cd360c1bf06e890c5a97b997e91cb324602b1a19950ad5ce/matplotlib-3.10.9-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:41cb28c2bd769aa3e98322c6ab09854cbcc52ab69d2759d681bba3e327b2b320", size = 8216016, upload-time = "2026-04-24T00:12:23.4Z" }, + { url = "https://files.pythonhosted.org/packages/32/91/d024616abdba99e83120e07a20658976f6a343646710760c4a51df126029/matplotlib-3.10.9-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:ae20801130378b82d647ff5047c07316295b68dc054ca6b3c13519d0ea624285", size = 8789336, upload-time = "2026-04-24T00:12:26.096Z" }, + { url = "https://files.pythonhosted.org/packages/5c/04/030a2f61ef2158f5e4c259487a92ac877732499fb33d871585d89e03c42d/matplotlib-3.10.9-cp312-cp312-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:6c63ebcd8b4b169eb2f5c200552ae6b8be8999a005b6b507ed76fb8d7d674fe2", size = 9604602, upload-time = "2026-04-24T00:12:29.052Z" }, + { url = "https://files.pythonhosted.org/packages/fc/c2/541e4d09d87bb6b5830fc28b4c887a9a8cf4e1c6cee698a8c05552ae2003/matplotlib-3.10.9-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:d75d11c949914165976c621b2324f9ef162af7ebf4b057ddf95dd1dba7e5edcf", size = 9670966, upload-time = "2026-04-24T00:12:32.131Z" }, + { url = "https://files.pythonhosted.org/packages/04/a1/4571fc46e7702de8d0c2dc54ad1b2f8e29328dea3ee90831181f7353d93c/matplotlib-3.10.9-cp312-cp312-win_amd64.whl", hash = "sha256:d091f9d758b34aaaaa6331d13574bf01891d903b3dec59bfff458ef7551de5d6", size = 8217462, upload-time = "2026-04-24T00:12:35.226Z" }, + { url = "https://files.pythonhosted.org/packages/4b/d0/2269edb12aa30c13c8bcc9382892e39943ce1d28aab4ec296e0381798e81/matplotlib-3.10.9-cp312-cp312-win_arm64.whl", hash = "sha256:10cc5ce06d10231c36f40e875f3c7e8050362a4ee8f0ee5d29a6b3277d57bb42", size = 8136688, upload-time = "2026-04-24T00:12:37.442Z" }, + { url = "https://files.pythonhosted.org/packages/aa/d3/8d4f6afbecb49fc04e060a57c0fce39ea51cc163a6bd87303ccd698e4fa6/matplotlib-3.10.9-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:b580440f1ff81a0e34122051a3dfabb7e4b7f9e380629929bde0eff9af72165f", size = 8320331, upload-time = "2026-04-24T00:12:39.688Z" }, + { url = "https://files.pythonhosted.org/packages/63/d9/9e14bc7564bf92d5ffa801ae5fac819ce74b925dfb55e3ebde61a3bbad3e/matplotlib-3.10.9-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:b1b745c489cd1a77a0dc1120a05dc87af9798faebc913601feb8c73d89bf2d1e", size = 8216461, upload-time = "2026-04-24T00:12:42.494Z" }, + { url = "https://files.pythonhosted.org/packages/8a/17/4402d0d14ccf1dfc70932600b68097fbbf9c898a4871d2cbbe79c7801a32/matplotlib-3.10.9-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:8f3bcac1ca5ed000a6f4337d47ba67dfddf37ed6a46c15fd7f014997f7bf865f", size = 8790091, upload-time = "2026-04-24T00:12:44.789Z" }, + { url = "https://files.pythonhosted.org/packages/3e/0b/322aeec06dd9b91411f92028b37d447342770a24392aa4813e317064dad5/matplotlib-3.10.9-cp313-cp313-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:7a8d66a55def891c33147ba3ba9bfcabf0b526a43764c818acbb4525e5ed0838", size = 9605027, upload-time = "2026-04-24T00:12:47.583Z" }, + { url = "https://files.pythonhosted.org/packages/74/88/5f13482f55e7b00bcfc09838b093c2456e1379978d2a146844aae05350ad/matplotlib-3.10.9-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:d843374407c4017a6403b59c6c81606773d136f3259d5b6da3131bc814542cc2", size = 9671269, upload-time = "2026-04-24T00:12:50.878Z" }, + { url = "https://files.pythonhosted.org/packages/c5/e0/0840fd2f93da988ec660b8ad1984abe9f25d2aed22a5e394ff1c68c88307/matplotlib-3.10.9-cp313-cp313-win_amd64.whl", hash = "sha256:f4399f64b3e94cd500195490972ae1ee81170df1636fa15364d157d5bdd7b921", size = 8217588, upload-time = "2026-04-24T00:12:53.784Z" }, + { url = "https://files.pythonhosted.org/packages/47/b9/d706d06dd605c49b9f83a2aed8c13e3e5db70697d7a80b7e3d7915de6b17/matplotlib-3.10.9-cp313-cp313-win_arm64.whl", hash = "sha256:ba7b3b8ef09eab7df0e86e9ae086faa433efbfbdb46afcb3aa16aabf779469a8", size = 8136913, upload-time = "2026-04-24T00:12:56.501Z" }, + { url = "https://files.pythonhosted.org/packages/9b/45/6e32d96978264c8ca8c4b1010adb955a1a49cfaf314e212bbc8908f04a61/matplotlib-3.10.9-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:09218df8a93712bd6ea133e83a153c755448cf7868316c531cffcc43f69d1cc9", size = 8368019, upload-time = "2026-04-24T00:12:58.896Z" }, + { url = "https://files.pythonhosted.org/packages/86/0a/c8e3d3bba245f0f7fc424937f8ff7ef77291a36af3edb97ccd78aa93d84f/matplotlib-3.10.9-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:82368699727bfb7b0182e1aa13082e3c08e092fa1a25d3e1fd92405bff96f6d4", size = 8264645, upload-time = "2026-04-24T00:13:01.406Z" }, + { url = "https://files.pythonhosted.org/packages/3d/aa/5bf5a14fe4fed73a4209a155606f8096ff797aad89c6c35179026571133e/matplotlib-3.10.9-cp313-cp313t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:3225f4e1edcb8c86c884ddf79ebe20ecd0a67d30188f279897554ccd8fded4dc", size = 8802194, upload-time = "2026-04-24T00:13:03.702Z" }, + { url = "https://files.pythonhosted.org/packages/dd/5e/b4be852d6bba6fd15893fadf91ff26ae49cb91aac789e95dde9d342e664f/matplotlib-3.10.9-cp313-cp313t-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:de2445a0c6690d21b7eb6ce071cebad6d40a2e9bdf10d039074a96ba19797b99", size = 9622684, upload-time = "2026-04-24T00:13:06.647Z" }, + { url = "https://files.pythonhosted.org/packages/4c/3d/ed428c971139112ef730f62770654d609467346d09d4b62617e1afd68a5a/matplotlib-3.10.9-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:b2b9516251cb89ff618d757daec0e2ed1bf21248013844a853d87ef85ab3081d", size = 9680790, upload-time = "2026-04-24T00:13:10.009Z" }, + { url = "https://files.pythonhosted.org/packages/e7/09/052e884aaf2b985c63cb79f715f1d5b6a3eaa7de78f6a52b9dbc077d5b53/matplotlib-3.10.9-cp313-cp313t-win_amd64.whl", hash = "sha256:e9fae004b941b23ff2edcf1567a857ed77bafc8086ffa258190462328434faf8", size = 8287571, upload-time = "2026-04-24T00:13:13.087Z" }, + { url = "https://files.pythonhosted.org/packages/f4/38/ae27288e788c35a4250491422f3db7750366fc8c97d6f36fbdecfc1f5518/matplotlib-3.10.9-cp313-cp313t-win_arm64.whl", hash = "sha256:6b63d9c7c769b88ab81e10dc86e4e0607cf56817b9f9e6cf24b2a5f1693b8e38", size = 8188292, upload-time = "2026-04-24T00:13:15.546Z" }, + { url = "https://files.pythonhosted.org/packages/d6/e6/3bd8afd04949f02eabc1c17115ea5255e19cacd4d06fc5abdde4eeb0052c/matplotlib-3.10.9-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:172db52c9e683f5d12eaf57f0f54834190e12581fe1cc2a19595a8f5acb4e77d", size = 8321276, upload-time = "2026-04-24T00:13:18.318Z" }, + { url = "https://files.pythonhosted.org/packages/41/86/86231232fff41c9f8e4a1a7d7a597d349a02527109c3af7d618366122139/matplotlib-3.10.9-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:97e35e8d39ccc85859095e01a53847432ba9a53ddf7986f7a54a11b73d0e143f", size = 8218218, upload-time = "2026-04-24T00:13:20.974Z" }, + { url = "https://files.pythonhosted.org/packages/85/8f/becc9722cafc64f5d2eb0b7c1bf5f585271c618a45dbd8fabeb021f898b6/matplotlib-3.10.9-cp314-cp314-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:aba1615dabe83188e19d4f75a253c6a08423e04c1425e64039f800050a69de6b", size = 9608145, upload-time = "2026-04-24T00:13:23.228Z" }, + { url = "https://files.pythonhosted.org/packages/32/5d/f7e914f7d9325abff4057cee62c0fa70263683189f774473cbfb534cd13b/matplotlib-3.10.9-cp314-cp314-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:34cf8167e023ad956c15f36302911d5406bd99a9862c1a8499ea6f7c0e015dc2", size = 9885085, upload-time = "2026-04-24T00:13:25.849Z" }, + { url = "https://files.pythonhosted.org/packages/a5/fd/fa69f2221534e80cc5772ac2b7d222011a2acafc2ec7216d5dd174c864ae/matplotlib-3.10.9-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:59476c6d29d612b8e9bb6ce8c5b631be6ba8f9e3a2421f22a02b192c7dd28716", size = 9672358, upload-time = "2026-04-24T00:13:28.906Z" }, + { url = "https://files.pythonhosted.org/packages/ab/1a/5a4f747a8b271cbb024946d2dd3c913ab5032ba430626f8c3528ada96b4b/matplotlib-3.10.9-cp314-cp314-win_amd64.whl", hash = "sha256:336b9acc64d309063126edcdaca00db9373af3c476bb94388fe9c5a53ad13e6f", size = 8349970, upload-time = "2026-04-24T00:13:31.904Z" }, + { url = "https://files.pythonhosted.org/packages/64/dc/95d60ecaefe30680a154b52ea96ab4b0dab547f1fd6aa12f5fb655e89cae/matplotlib-3.10.9-cp314-cp314-win_arm64.whl", hash = "sha256:2dc9477819ffd78ad12a20df1d9d6a6bd4fec6aaa9072681465fddca052f1456", size = 8272785, upload-time = "2026-04-24T00:13:34.511Z" }, + { url = "https://files.pythonhosted.org/packages/70/a0/005d68bc8b8418300ce6591f18586910a8526806e2ab663933d9f20a41e9/matplotlib-3.10.9-cp314-cp314t-macosx_10_13_x86_64.whl", hash = "sha256:da4e09638420548f31c354032a6250e473c68e5a4e96899b4844cf39ddea23fe", size = 8367999, upload-time = "2026-04-24T00:13:36.962Z" }, + { url = "https://files.pythonhosted.org/packages/22/05/1236cc9290be70b2498af20ca348add76e3fffe7f67b477db5133a84f3ea/matplotlib-3.10.9-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:345f6f68ecc8da0ca56fad2ea08fde1a115eda530079eca185d50a7bc3e146c6", size = 8264543, upload-time = "2026-04-24T00:13:39.851Z" }, + { url = "https://files.pythonhosted.org/packages/cd/c2/071f5a5ff6c5bd63aaaf2f45c811d9bf2ced94bde188d9e1a519e21d0cba/matplotlib-3.10.9-cp314-cp314t-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:4edcfbd8565339aa62f1cd4012f7180926fdbe71850f7b0d3c379c175cd6b66c", size = 9622800, upload-time = "2026-04-24T00:13:42.296Z" }, + { url = "https://files.pythonhosted.org/packages/95/57/da7d1f10a85624b9e7db68e069dd94e58dc41dbf9463c5921632ecbe3661/matplotlib-3.10.9-cp314-cp314t-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:6be157fe17fc37cb95ac1d7374cf717ce9259616edec911a78d9d26dae8522d4", size = 9888561, upload-time = "2026-04-24T00:13:45.026Z" }, + { url = "https://files.pythonhosted.org/packages/67/b2/ef8d6bb59b0edb6c16c968b70f548aa13b54348972def5aa6ac85df67145/matplotlib-3.10.9-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:4e42042d54db34fda4e95a7bd3e5789c2a995d2dad3eb8850232ee534092fbbf", size = 9680884, upload-time = "2026-04-24T00:13:48.066Z" }, + { url = "https://files.pythonhosted.org/packages/61/1c/d21bfeb9931881ebe96bcfcff27c7ae4b160ae0ec291a714c42641a56d75/matplotlib-3.10.9-cp314-cp314t-win_amd64.whl", hash = "sha256:c27df8b3848f32a83d1767566595e43cfaa4460380974da06f4279a7ec143c39", size = 8432333, upload-time = "2026-04-24T00:13:51.008Z" }, + { url = "https://files.pythonhosted.org/packages/78/23/92493c3e6e1b635ccfff146f7b99e674808787915420373ac399283764c2/matplotlib-3.10.9-cp314-cp314t-win_arm64.whl", hash = "sha256:a49f1eadc84ca85fd72fa4e89e70e61bf86452df6f971af04b12c60761a0772c", size = 8324785, upload-time = "2026-04-24T00:13:53.633Z" }, + { url = "https://files.pythonhosted.org/packages/63/e2/9f66ca6a651a52abfe0d4964ce01439ed34f3f1e119de10ff3a07f403043/matplotlib-3.10.9-pp311-pypy311_pp73-macosx_10_15_x86_64.whl", hash = "sha256:42fb814efabe95c06c1994d8ab5a8385f43a249e23badd3ba931d4308e5bca20", size = 8304420, upload-time = "2026-04-24T00:14:04.57Z" }, + { url = "https://files.pythonhosted.org/packages/e8/e8/467c03568218792906aa87b5e7bb379b605e056ed0c74fe00c051786d925/matplotlib-3.10.9-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:f76e640a5268850bfda54b5131b1b1941cc685e42c5fa98ed9f2d64038308cba", size = 8197981, upload-time = "2026-04-24T00:14:07.233Z" }, + { url = "https://files.pythonhosted.org/packages/6f/87/afead29192170917537934c6aff4b008c805fff7b1ccea0c79120d96beda/matplotlib-3.10.9-pp311-pypy311_pp73-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:3fc0364dfbe1d07f6d15c5ebd0c5bf89e126916e5a8667dd4a7a6e84c36653d4", size = 8774002, upload-time = "2026-04-24T00:14:09.816Z" }, +] + +[[package]] +name = "matplotlib-inline" +version = "0.2.2" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "traitlets" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/bd/c0/9f7c9a46090390368a4d7bcb76bb87a4a36c421e4c0792cdb53486ffac7a/matplotlib_inline-0.2.2.tar.gz", hash = "sha256:72f3fe8fce36b70d4a5b612f899090cd0401deddc4ea90e1572b9f4bfb058c79", size = 8150, upload-time = "2026-05-08T17:33:33.49Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/41/09/5b161152e2d90f7b87f781c2e1267494aef9c32498df793f73ad0a0a494a/matplotlib_inline-0.2.2-py3-none-any.whl", hash = "sha256:3c821cf1c209f59fb2d2d64abbf5b23b67bcb2210d663f9918dd851c6da1fcf6", size = 9534, upload-time = "2026-05-08T17:33:32.055Z" }, +] + +[[package]] +name = "mccabe" +version = "0.7.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/e7/ff/0ffefdcac38932a54d2b5eed4e0ba8a408f215002cd178ad1df0f2806ff8/mccabe-0.7.0.tar.gz", hash = "sha256:348e0240c33b60bbdf4e523192ef919f28cb2c3d7d5c7794f74009290f236325", size = 9658, upload-time = "2022-01-24T01:14:51.113Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/27/1a/1f68f9ba0c207934b35b86a8ca3aad8395a3d6dd7921c0686e23853ff5a9/mccabe-0.7.0-py2.py3-none-any.whl", hash = "sha256:6c2d30ab6be0e4a46919781807b4f0d834ebdd6c6e3dca0bda5a15f863427b6e", size = 7350, upload-time = "2022-01-24T01:14:49.62Z" }, +] + +[[package]] +name = "mimerender-pr36" +version = "0.0.2" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "python-mimeparse" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/23/39/25559ff5440e17aad0191e3034afa6e023150bc1e79edacb9268c22131f6/mimerender-pr36-0.0.2.tar.gz", hash = "sha256:2d1f7bc4080132da7040518b2d613eb5e49b583231a9b2be3ac040860c233d80", size = 19309, upload-time = "2021-08-07T05:53:35.754Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/48/d5/4f84e7b14f115d49bde75babd13e67ec3b19d077bffc937cab2fc524eac5/mimerender_pr36-0.0.2-py3-none-any.whl", hash = "sha256:260eceeca204d11a4b43cc5d1fe60d757048e6b3dd51b87b64c68c153faadacc", size = 6621, upload-time = "2021-08-07T05:53:33.338Z" }, +] + +[[package]] +name = "mistune" +version = "3.2.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/ca/84/620cc3f7e3adf6f5067e10f4dbae71295d8f9e16d5d3f9ef97c40f2f592c/mistune-3.2.1.tar.gz", hash = "sha256:7c8e5501d38bac1582e067e46c8343f17d57ea1aaa735823f3aba1fd59c88a28", size = 98003, upload-time = "2026-05-03T14:33:22.312Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/2a/7f/a946aa4f8752b37102b41e64dca18a1976ac705c3a0d1dfe74d820a02552/mistune-3.2.1-py3-none-any.whl", hash = "sha256:78cdb0ba5e938053ccf63651b352508d2efa9411dc8810bfb05f2dc5140c0048", size = 53749, upload-time = "2026-05-03T14:33:20.551Z" }, +] + +[[package]] +name = "mongoengine" +version = "0.29.3" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "pymongo" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/b4/76/160e35d90a671913146b884b1ca586909036dd56070600035821870b1aad/mongoengine-0.29.3.tar.gz", hash = "sha256:4267702aea433012845cb12b6334bff86a0a3084b5d141c1e4553ea20374a9b4", size = 188213, upload-time = "2026-03-10T15:19:17.946Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/c7/b5/214ea32710fa3ad7c13820cbb9f9a457d4809a5d54995e0d081f33c75116/mongoengine-0.29.3-py3-none-any.whl", hash = "sha256:2d5a216cf2368867d43e5321b13044ecc3e72c3f19ace21b1c5e7403951ca685", size = 112513, upload-time = "2026-03-10T15:19:16.619Z" }, +] + +[[package]] +name = "monty" +version = "2026.5.18" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "numpy" }, + { name = "ruamel-yaml" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/f4/d7/bd34aafa34d3cddd93c440e7cfb3371328079e864279708f64a871806eb7/monty-2026.5.18.tar.gz", hash = "sha256:b2d8d5c78030e889f6407fa9d8c8c4e3df05fc380251cdf85a119cd1e49c3fdd", size = 211830, upload-time = "2026-05-18T03:21:02.254Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/f3/63/86120977f920798494c522c26899ffacde6d848e1eb018403f1d08044d0d/monty-2026.5.18-py3-none-any.whl", hash = "sha256:dd108b5c3cceb1f61de1a854db8ffda3dc7c2a2d4025b24cf397ade1121e7904", size = 59998, upload-time = "2026-05-18T03:21:00.059Z" }, +] + +[[package]] +name = "more-itertools" +version = "11.1.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/de/1d/f4da6f02cdffe04d6362210b807146a26044c88d839208aec273bb0d9184/more_itertools-11.1.0.tar.gz", hash = "sha256:48e8f4d9e7e5878571ecf6f2b4e57634f93cd474cc8cfbd2376f2d11b396e30d", size = 145772, upload-time = "2026-05-22T14:14:29.909Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/e8/3d/1087453384dbde46a8c7f9356eead2c58be8a7bf156bca40243377c85715/more_itertools-11.1.0-py3-none-any.whl", hash = "sha256:4b65538ae22f6fed0ce4874efd317463a7489796a0939fa66824dd542125a192", size = 72226, upload-time = "2026-05-22T14:14:28.824Z" }, +] + +[[package]] +name = "mpcontribs-api" +source = { editable = "." } +dependencies = [ + { name = "apispec" }, + { name = "asn1crypto" }, + { name = "blinker" }, + { name = "boltons" }, + { name = "css-html-js-minify" }, + { name = "dateparser" }, + { name = "ddtrace" }, + { name = "dnspython" }, + { name = "fastapi" }, + { name = "filetype" }, + { name = "flasgger-tschaume" }, + { name = "flask-compress" }, + { name = "flask-marshmallow" }, + { name = "flask-mongorest-mpcontribs" }, + { name = "flask-rq2" }, + { name = "gunicorn", extra = ["gevent"] }, + { name = "jinja2" }, + { name = "json2html" }, + { name = "marshmallow" }, + { name = "more-itertools" }, + { name = "nbformat" }, + { name = "notebook" }, + { name = "numpy" }, + { name = "opentelemetry-api" }, + { name = "opentelemetry-exporter-otlp-proto-grpc" }, + { name = "opentelemetry-instrumentation-fastapi" }, + { name = "opentelemetry-instrumentation-pymongo" }, + { name = "opentelemetry-sdk" }, + { name = "pint" }, + { name = "psycopg2-binary" }, + { name = "pydantic-settings" }, + { name = "pymatgen" }, + { name = "pymongo" }, + { name = "pyopenssl" }, + { name = "python-snappy" }, + { name = "rq" }, + { name = "setproctitle" }, + { name = "structlog" }, + { name = "supervisor" }, + { name = "uncertainties" }, + { name = "websocket-client" }, + { name = "zstandard" }, +] + +[package.dev-dependencies] +dev = [ + { name = "flake8" }, + { name = "pytest" }, + { name = "pytest-flake8" }, + { name = "pytest-pycodestyle" }, + { name = "pytest-xdist" }, +] + +[package.metadata] +requires-dist = [ + { name = "apispec", specifier = "<6" }, + { name = "asn1crypto" }, + { name = "blinker" }, + { name = "boltons" }, + { name = "css-html-js-minify" }, + { name = "dateparser" }, + { name = "ddtrace", specifier = "==4.3.0" }, + { name = "dnspython" }, + { name = "fastapi", specifier = ">=0.136.3" }, + { name = "filetype" }, + { name = "flasgger-tschaume", specifier = ">=0.9.7" }, + { name = "flask-compress" }, + { name = "flask-marshmallow" }, + { name = "flask-mongorest-mpcontribs", specifier = ">=3.2.1" }, + { name = "flask-rq2" }, + { name = "gunicorn", extras = ["gevent"], specifier = "==24.1.1" }, + { name = "jinja2" }, + { name = "json2html" }, + { name = "marshmallow", specifier = "<4" }, + { name = "more-itertools" }, + { name = "nbformat" }, + { name = "notebook", specifier = "<7" }, + { name = "numpy" }, + { name = "opentelemetry-api", specifier = ">=1.42.1" }, + { name = "opentelemetry-exporter-otlp-proto-grpc", specifier = ">=1.42.1" }, + { name = "opentelemetry-instrumentation-fastapi", specifier = ">=0.63b1" }, + { name = "opentelemetry-instrumentation-pymongo", specifier = ">=0.63b1" }, + { name = "opentelemetry-sdk", specifier = ">=1.42.1" }, + { name = "pint", specifier = ">=0.24" }, + { name = "psycopg2-binary" }, + { name = "pydantic-settings", specifier = ">=2.14.1" }, + { name = "pymatgen" }, + { name = "pymongo", specifier = ">=4.17.0" }, + { name = "pyopenssl" }, + { name = "python-snappy" }, + { name = "rq", specifier = "<=2.3.2" }, + { name = "setproctitle" }, + { name = "structlog", specifier = ">=25.5.0" }, + { name = "supervisor" }, + { name = "uncertainties" }, + { name = "websocket-client" }, + { name = "zstandard" }, +] + +[package.metadata.requires-dev] +dev = [ + { name = "flake8", specifier = ">=7.3.0" }, + { name = "pytest", specifier = ">=9.0.3" }, + { name = "pytest-flake8", specifier = ">=1.3.0" }, + { name = "pytest-pycodestyle", specifier = ">=2.5.0" }, + { name = "pytest-xdist", specifier = ">=3.8.0" }, +] + +[[package]] +name = "mpmath" +version = "1.3.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/e0/47/dd32fa426cc72114383ac549964eecb20ecfd886d1e5ccf5340b55b02f57/mpmath-1.3.0.tar.gz", hash = "sha256:7a28eb2a9774d00c7bc92411c19a89209d5da7c4c9a9e227be8330a23a25b91f", size = 508106, upload-time = "2023-03-07T16:47:11.061Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/43/e3/7d92a15f894aa0c9c4b49b8ee9ac9850d6e63b03c9c32c0367a13ae62209/mpmath-1.3.0-py3-none-any.whl", hash = "sha256:a0b2b9fe80bbcd81a6647ff13108738cfb482d481d826cc0e02f5b35e5c88d2c", size = 536198, upload-time = "2023-03-07T16:47:09.197Z" }, +] + +[[package]] +name = "narwhals" +version = "2.21.2" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/cf/a0/6198c56d42ef2f3c6ed0c42ba30dbcefdc86a91262d7d449010770ae085b/narwhals-2.21.2.tar.gz", hash = "sha256:5c5b2d0b47aef7c73ea412cfcbcd467f2f2d5be73e3c2ab19d78f4a97718790a", size = 632176, upload-time = "2026-05-16T08:49:08.314Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/1d/77/928ea2e70641ca177a11140062cc5840d421795f2e82749d408d0cce900a/narwhals-2.21.2-py3-none-any.whl", hash = "sha256:7bb57c3700486039215455b9bf2d64261915cc0fd845cc30272d631df696b251", size = 451201, upload-time = "2026-05-16T08:49:05.536Z" }, +] + +[[package]] +name = "nbclassic" +version = "1.3.3" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "ipykernel" }, + { name = "ipython-genutils" }, + { name = "nest-asyncio" }, + { name = "notebook-shim" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/ec/cc/a495b5eb9a964b70c6ae8c861168b78386d2520fd89c68390932f96400b2/nbclassic-1.3.3.tar.gz", hash = "sha256:434228763f8cee754318cd6dfa42370db191af630dabab8e30bafc8c1aa3eee6", size = 64116062, upload-time = "2025-09-16T20:33:15.967Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/3d/fd/dfb6db427bb4e0a50c9802b11df0b69d9364192f3db999849cde9209c8d0/nbclassic-1.3.3-py3-none-any.whl", hash = "sha256:dcee5149aa6aa01846c7458d6394b29b325213b5e118ee14c80d689122e0e4f2", size = 11527229, upload-time = "2025-09-16T20:33:08.625Z" }, +] + +[[package]] +name = "nbclient" +version = "0.10.4" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "jupyter-client" }, + { name = "jupyter-core" }, + { name = "nbformat" }, + { name = "traitlets" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/56/91/1c1d5a4b9a9ebba2b4e32b8c852c2975c872aec1fe42ab5e516b2cecd193/nbclient-0.10.4.tar.gz", hash = "sha256:1e54091b16e6da39e297b0ece3e10f6f29f4ac4e8ee515d29f8a7099bd6553c9", size = 62554, upload-time = "2025-12-23T07:45:46.369Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/83/a0/5b0c2f11142ed1dddec842457d3f65eaf71a0080894eb6f018755b319c3a/nbclient-0.10.4-py3-none-any.whl", hash = "sha256:9162df5a7373d70d606527300a95a975a47c137776cd942e52d9c7e29ff83440", size = 25465, upload-time = "2025-12-23T07:45:44.51Z" }, +] + +[[package]] +name = "nbconvert" +version = "7.17.1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "beautifulsoup4" }, + { name = "bleach", extra = ["css"] }, + { name = "defusedxml" }, + { name = "jinja2" }, + { name = "jupyter-core" }, + { name = "jupyterlab-pygments" }, + { name = "markupsafe" }, + { name = "mistune" }, + { name = "nbclient" }, + { name = "nbformat" }, + { name = "packaging" }, + { name = "pandocfilters" }, + { name = "pygments" }, + { name = "traitlets" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/01/b1/708e53fe2e429c103c6e6e159106bcf0357ac41aa4c28772bd8402339051/nbconvert-7.17.1.tar.gz", hash = "sha256:34d0d0a7e73ce3cbab6c5aae8f4f468797280b01fd8bd2ca746da8569eddd7d2", size = 865311, upload-time = "2026-04-08T00:44:14.914Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/67/f8/bb0a9d5f46819c821dc1f004aa2cc29b1d91453297dbf5ff20470f00f193/nbconvert-7.17.1-py3-none-any.whl", hash = "sha256:aa85c087b435e7bf1ffd03319f658e285f2b89eccab33bc1ba7025495ab3e7c8", size = 261927, upload-time = "2026-04-08T00:44:12.845Z" }, +] + +[[package]] +name = "nbformat" +version = "5.10.4" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "fastjsonschema" }, + { name = "jsonschema" }, + { name = "jupyter-core" }, + { name = "traitlets" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/6d/fd/91545e604bc3dad7dca9ed03284086039b294c6b3d75c0d2fa45f9e9caf3/nbformat-5.10.4.tar.gz", hash = "sha256:322168b14f937a5d11362988ecac2a4952d3d8e3a2cbeb2319584631226d5b3a", size = 142749, upload-time = "2024-04-04T11:20:37.371Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/a9/82/0340caa499416c78e5d8f5f05947ae4bc3cba53c9f038ab6e9ed964e22f1/nbformat-5.10.4-py3-none-any.whl", hash = "sha256:3b48d6c8fbca4b299bf3982ea7db1af21580e4fec269ad087b9e81588891200b", size = 78454, upload-time = "2024-04-04T11:20:34.895Z" }, +] + +[[package]] +name = "nest-asyncio" +version = "1.6.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/83/f8/51569ac65d696c8ecbee95938f89d4abf00f47d58d48f6fbabfe8f0baefe/nest_asyncio-1.6.0.tar.gz", hash = "sha256:6f172d5449aca15afd6c646851f4e31e02c598d553a667e38cafa997cfec55fe", size = 7418, upload-time = "2024-01-21T14:25:19.227Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/a0/c4/c2971a3ba4c6103a3d10c4b0f24f461ddc027f0f09763220cf35ca1401b3/nest_asyncio-1.6.0-py3-none-any.whl", hash = "sha256:87af6efd6b5e897c81050477ef65c62e2b2f35d51703cae01aff2905b1852e1c", size = 5195, upload-time = "2024-01-21T14:25:17.223Z" }, +] + +[[package]] +name = "networkx" +version = "3.6.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/6a/51/63fe664f3908c97be9d2e4f1158eb633317598cfa6e1fc14af5383f17512/networkx-3.6.1.tar.gz", hash = "sha256:26b7c357accc0c8cde558ad486283728b65b6a95d85ee1cd66bafab4c8168509", size = 2517025, upload-time = "2025-12-08T17:02:39.908Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/9e/c9/b2622292ea83fbb4ec318f5b9ab867d0a28ab43c5717bb85b0a5f6b3b0a4/networkx-3.6.1-py3-none-any.whl", hash = "sha256:d47fbf302e7d9cbbb9e2555a0d267983d2aa476bac30e90dfbe5669bd57f3762", size = 2068504, upload-time = "2025-12-08T17:02:38.159Z" }, +] + +[[package]] +name = "notebook" +version = "6.5.7" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "argon2-cffi" }, + { name = "ipykernel" }, + { name = "ipython-genutils" }, + { name = "jinja2" }, + { name = "jupyter-client" }, + { name = "jupyter-core" }, + { name = "nbclassic" }, + { name = "nbconvert" }, + { name = "nbformat" }, + { name = "nest-asyncio" }, + { name = "prometheus-client" }, + { name = "pyzmq" }, + { name = "send2trash" }, + { name = "terminado" }, + { name = "tornado" }, + { name = "traitlets" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/05/bc/b025bac523640c13b0c1150466475eac3d79acbf187ef6c1967596c41c43/notebook-6.5.7.tar.gz", hash = "sha256:04eb9011dfac634fbd4442adaf0a8c27cd26beef831fe1d19faf930c327768e4", size = 5786526, upload-time = "2024-05-01T17:42:26.956Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/af/9c/0620631da9d7013e95a8f985043cad229a0d8fb537a7e3f8ff8467565a8c/notebook-6.5.7-py3-none-any.whl", hash = "sha256:a6afa9a4ff4d149a0771ff8b8c881a7a73b3835f9add0606696d6e9d98ac1cd0", size = 529829, upload-time = "2024-05-01T17:42:22.403Z" }, +] + +[[package]] +name = "notebook-shim" +version = "0.2.4" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "jupyter-server" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/54/d2/92fa3243712b9a3e8bafaf60aac366da1cada3639ca767ff4b5b3654ec28/notebook_shim-0.2.4.tar.gz", hash = "sha256:b4b2cfa1b65d98307ca24361f5b30fe785b53c3fd07b7a47e89acb5e6ac638cb", size = 13167, upload-time = "2024-02-14T23:35:18.353Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/f9/33/bd5b9137445ea4b680023eb0469b2bb969d61303dedb2aac6560ff3d14a1/notebook_shim-0.2.4-py3-none-any.whl", hash = "sha256:411a5be4e9dc882a074ccbcae671eda64cceb068767e9a3419096986560e1cef", size = 13307, upload-time = "2024-02-14T23:35:16.286Z" }, +] + +[[package]] +name = "numpy" +version = "2.4.6" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/d0/ad/fed0499ce6a338d2a03ebae59cd15093910c8875328855781952abf6c2fe/numpy-2.4.6.tar.gz", hash = "sha256:f3a3570c4a2a16746ac2c31a7c7c7b0c186b95ce902e33db6f28094ed7387dda", size = 20735807, upload-time = "2026-05-18T23:37:14.07Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/b3/49/ec46835a70be8fa6446c495126ac84fdb28cb2558e1620ffb87a10c8b64c/numpy-2.4.6-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:0280e0356c0829a18d9de1cb7eee50ec22ca639878d7240307ca0943d73cd2c4", size = 16969194, upload-time = "2026-05-18T23:33:13.503Z" }, + { url = "https://files.pythonhosted.org/packages/0e/0d/f5957185c0ee2f3e12f78715aa9e3b353fd83633316c8532b38faa37e3f6/numpy-2.4.6-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:110f8b71aacb688ec69062bb7f6938a0f8acb01b7c1c4beb453c65b6d234584d", size = 14964111, upload-time = "2026-05-18T23:33:17.795Z" }, + { url = "https://files.pythonhosted.org/packages/ad/40/40a40ee0ddf7ceb782c49af278894b686e586d65d8c1889c8b5da01a3d7d/numpy-2.4.6-cp311-cp311-macosx_14_0_arm64.whl", hash = "sha256:4cfe66903cc32a9921a6733d96b19bb6abf310397581bbad89c228f5abaf0ee8", size = 5469159, upload-time = "2026-05-18T23:33:20.654Z" }, + { url = "https://files.pythonhosted.org/packages/63/13/f9a8046535cb21deae82f8d03de9617e08882d274fad2539630761888228/numpy-2.4.6-cp311-cp311-macosx_14_0_x86_64.whl", hash = "sha256:8155154c7c691289fe18f510b5d4657c68c67989f293f0535a91360392ff6538", size = 6798936, upload-time = "2026-05-18T23:33:22.987Z" }, + { url = "https://files.pythonhosted.org/packages/33/a8/6fa8c1a345a8c85dbb21932c447bee07c30a2c2a3f31e369c0a84b300147/numpy-2.4.6-cp311-cp311-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:0ab0a9c4ffb1a6d95ef519fe4247dba8eb6b18ad93999f76b7f657039acabd47", size = 15966692, upload-time = "2026-05-18T23:33:26.62Z" }, + { url = "https://files.pythonhosted.org/packages/02/03/74fe2a4cb3817d94d86402f2506554130a2f01414e299b5a843e5a8a957f/numpy-2.4.6-cp311-cp311-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:89cd468399cfd2504718f0ba50e410dca55a170b61a02ad92bb18c8a65186e93", size = 16918164, upload-time = "2026-05-18T23:33:29.955Z" }, + { url = "https://files.pythonhosted.org/packages/c5/80/3615be3313f7e7696609bc194b9f0101da809df79e859bdb84e0cd043f46/numpy-2.4.6-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:c2d37ab77531417474168eb79d6d80b14f821a966818505d03013d0833edb7a8", size = 17322877, upload-time = "2026-05-18T23:33:34.724Z" }, + { url = "https://files.pythonhosted.org/packages/ca/ac/a691e0fe2675e370d0e08ff905adc49a1c8830e8cae03efe4477e92cd55d/numpy-2.4.6-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:f407cb6b8e9d6d8c626bc73c945db1706035af8fd632295547bf1c9e46d092d6", size = 18651487, upload-time = "2026-05-18T23:33:38.217Z" }, + { url = "https://files.pythonhosted.org/packages/15/a7/9bc1cd626d7bf6869bfedf27b91b6ab5dd607758bf8e959d6fa80c6a59cb/numpy-2.4.6-cp311-cp311-win32.whl", hash = "sha256:ddea102b48f9e339f3948bf22040944184627a30fdf7f858667673b9c5f033c8", size = 6233945, upload-time = "2026-05-18T23:33:41.331Z" }, + { url = "https://files.pythonhosted.org/packages/c5/31/7fc6239c12bce7e931463251cca4426c465e1876ba3cc785402ef4dd8f4e/numpy-2.4.6-cp311-cp311-win_amd64.whl", hash = "sha256:1e254a00cdf42b1e4d5b3d68d33af63268d41340d8885df2ab6470f2e1500147", size = 12608406, upload-time = "2026-05-18T23:33:44.131Z" }, + { url = "https://files.pythonhosted.org/packages/27/83/140f85a466595a16382996a1bf06b2b54bcd597488921b0c9daaeeda72af/numpy-2.4.6-cp311-cp311-win_arm64.whl", hash = "sha256:ed9749eef4cbd126da3dc1d6bcb3a57f5eb7ac6a6484146bdbf743f552dfc577", size = 10479528, upload-time = "2026-05-18T23:33:50.725Z" }, + { url = "https://files.pythonhosted.org/packages/95/2a/3d7b5ac8aac24feaf9ad7ed58f45b0bbc06d37e4338ae84c9f2298b570f9/numpy-2.4.6-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:001fbb8e08d942dd57599e781f2472269ee7f2755fae407b4f67b2f0b17da3f1", size = 16689119, upload-time = "2026-05-18T23:33:54.065Z" }, + { url = "https://files.pythonhosted.org/packages/ea/12/92c4c131527599e8288d6918e888d88726f84d805d784b771f32408aeaef/numpy-2.4.6-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:ebfb099f8dcf083deef3ac1ca4c1503f387cf76296fcb3816b66f5ecb5f54fdb", size = 14699246, upload-time = "2026-05-18T23:33:57.621Z" }, + { url = "https://files.pythonhosted.org/packages/ad/fe/c0a6b7b2ca128a8fb228575147073b660656734b8ebe4d76c8fd748dcc79/numpy-2.4.6-cp312-cp312-macosx_14_0_arm64.whl", hash = "sha256:3213d622a0283a39a93d188f3cf72b26862df52fbb4ca3697f51705016523d41", size = 5204410, upload-time = "2026-05-18T23:34:00.302Z" }, + { url = "https://files.pythonhosted.org/packages/f3/d4/9770d14ba719432bb90a421bfd443872ed0f70f7264b64bec12ea363d5fd/numpy-2.4.6-cp312-cp312-macosx_14_0_x86_64.whl", hash = "sha256:357cc07a6d7b0b182ff02249616a03742827ebb1277546b5c7cd7f7620a45698", size = 6551240, upload-time = "2026-05-18T23:34:02.852Z" }, + { url = "https://files.pythonhosted.org/packages/c9/c6/50a46a6205feba2343f1d6d17438107c5dc491ed1c736e6ea68689fd906b/numpy-2.4.6-cp312-cp312-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:5f9fb9157b4ce2971008323afe46053787b526ef624fea915b261468a8421a0f", size = 15671012, upload-time = "2026-05-18T23:34:05.485Z" }, + { url = "https://files.pythonhosted.org/packages/99/60/14115e6364fa676c5397c2ad3004e527e9aa487abf5d0706ec81bbd08529/numpy-2.4.6-cp312-cp312-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:90f9849678c75fe7afa2d348ac842c168b0a4d3d61919687216dfc547976d853", size = 16645538, upload-time = "2026-05-18T23:34:09.265Z" }, + { url = "https://files.pythonhosted.org/packages/ae/c5/693cbe59e57db94d2231fa519ca3978dc9e19da5a8f088588f5c6e947ff2/numpy-2.4.6-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:c1a2af6c6ef86344a6b0db6b97834208bf598db514f2b155042439b62605601a", size = 17020706, upload-time = "2026-05-18T23:34:13.053Z" }, + { url = "https://files.pythonhosted.org/packages/ef/fc/85b7c4eff9b4966ade25c2273cf7e7012e92366c032058653934b37de044/numpy-2.4.6-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:e5805d5a22fd19c8ccff10a9561f9df94436b0545619ea579db2d3c35294bce2", size = 18368541, upload-time = "2026-05-18T23:34:17.024Z" }, + { url = "https://files.pythonhosted.org/packages/f6/81/e1b27545deedce7f4a0b348618c6b62d74e36a4dc9ccd42f3eb2f85eee32/numpy-2.4.6-cp312-cp312-win32.whl", hash = "sha256:e3eeb0aabd6bd5ce64faae67e9935203a6991b4bc2a485a767fbafb2c5125f45", size = 5962825, upload-time = "2026-05-18T23:34:20.3Z" }, + { url = "https://files.pythonhosted.org/packages/ab/ca/feab00bd44aa5fe1ad2c18f08b4d3bb92e26484b0b1d1443897809ed528c/numpy-2.4.6-cp312-cp312-win_amd64.whl", hash = "sha256:d8e8286dd7cea7895157318d1b91cdacac64c479f3cbc8dce548331728484751", size = 12321687, upload-time = "2026-05-18T23:34:23.095Z" }, + { url = "https://files.pythonhosted.org/packages/63/cf/5a6d34850a39d1093558564f77ee8e8e0bee5061151b8f05a55711001ec7/numpy-2.4.6-cp312-cp312-win_arm64.whl", hash = "sha256:4081eb135ac24158bd51cdfbef16f1c64df7063b1143f24731387137c092bec8", size = 10221482, upload-time = "2026-05-18T23:34:25.876Z" }, + { url = "https://files.pythonhosted.org/packages/fb/82/bdab26d7438c6791ca31b7c024ca37c1eab8b726ba236129005cd4a06e45/numpy-2.4.6-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:511dbaf848decaaaf4b4ca48032619fb3138710c4bf7da7617765edad1ef96b0", size = 16684648, upload-time = "2026-05-18T23:34:29.41Z" }, + { url = "https://files.pythonhosted.org/packages/1b/30/a80189bcc7f5e4258b3fbc3968d909d1756f54d023299ecc39ad6fdb9ef8/numpy-2.4.6-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:bf162abab1c1a736333192707cef898e735a5ca00f38f27eeedf44b39d9e85eb", size = 14693902, upload-time = "2026-05-18T23:34:33.013Z" }, + { url = "https://files.pythonhosted.org/packages/97/12/70b5d0d7c15e1ebb8a6a84a8caa1d19e181d84fb58bb6d70aca29099dec1/numpy-2.4.6-cp313-cp313-macosx_14_0_arm64.whl", hash = "sha256:043191bfa8eab18c776647b62723ac9dddece59743b13f49b2016094129c2b3f", size = 5198992, upload-time = "2026-05-18T23:34:36.132Z" }, + { url = "https://files.pythonhosted.org/packages/ba/8c/ebd2a8f8a83541f8d38cc5667e8c2b69cecfd30da6e45693e8158857d44b/numpy-2.4.6-cp313-cp313-macosx_14_0_x86_64.whl", hash = "sha256:6180d8b35af935aed8ece3a85e0a43f87393ae0ac87c8d2c8bd2c993f7270ef3", size = 6546944, upload-time = "2026-05-18T23:34:38.484Z" }, + { url = "https://files.pythonhosted.org/packages/bb/c5/7b863a97a91671a0338f4253bd3b5a3d3852f0692dae91711c9f4a10e787/numpy-2.4.6-cp313-cp313-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:72fbe16c6fac95aedf5937fa873445cec2110be35d8a4e9433d7501fd98dae6b", size = 15669392, upload-time = "2026-05-18T23:34:41.257Z" }, + { url = "https://files.pythonhosted.org/packages/a5/9d/3584b9984ca4c047aea75214ce1a4c4c73d849bd71b604264b7f5653f8a8/numpy-2.4.6-cp313-cp313-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:a7830bab239b79cda9c08c2da014761cafb48da6150e1da17ac06283f43b6089", size = 16633220, upload-time = "2026-05-18T23:34:45.075Z" }, + { url = "https://files.pythonhosted.org/packages/05/ae/7c67fba23bd98caec7c99261f3a16072ade14813486b0282cb29846de832/numpy-2.4.6-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:ef4aea96ce4d3b074422cb4f2f64e216bf9e213004bb58ecfdf50ea02ea8eb9a", size = 17020800, upload-time = "2026-05-18T23:34:49.065Z" }, + { url = "https://files.pythonhosted.org/packages/d9/5d/3b6725cb31d983c5e66916f5d36f6d7e5521129e4c4404d64f918292a5b6/numpy-2.4.6-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:dfa20cc6ca228e6b155b11da03825975ce66aea520985dbbddf0f2a5a495c605", size = 18357600, upload-time = "2026-05-18T23:34:52.709Z" }, + { url = "https://files.pythonhosted.org/packages/f7/da/2ccc6c2fe8898dee01d90c75c5f5f914a23daf99e3e0f59516a08760c8b5/numpy-2.4.6-cp313-cp313-win32.whl", hash = "sha256:56b39e5e0622a09a25bf5baf62f4bcf0cb8a41ae6e2819cf49bbc5a74c083f91", size = 5961134, upload-time = "2026-05-18T23:34:55.618Z" }, + { url = "https://files.pythonhosted.org/packages/b5/cd/9cc4dc876fb065d5c220aae4d5e14826b2715331bb7618ce1fb07a679d99/numpy-2.4.6-cp313-cp313-win_amd64.whl", hash = "sha256:c4fc99836233ea196540b17ab0983aff60ed07941751930f5f4d05bc3b3b7359", size = 12318598, upload-time = "2026-05-18T23:34:58.928Z" }, + { url = "https://files.pythonhosted.org/packages/39/1e/c0bcba1f8694116485fe28fd1be698c278fcda4141c5b0e53a2aed8b12a8/numpy-2.4.6-cp313-cp313-win_arm64.whl", hash = "sha256:a7c711e21628b52034bb5ab8d1bce291f752fcc5e92accc615778acee1ff4778", size = 10222272, upload-time = "2026-05-18T23:35:02.167Z" }, + { url = "https://files.pythonhosted.org/packages/63/6d/cc5619247c8f4204e507f5883528372e4ac4bb189e579fb859a12e480b1f/numpy-2.4.6-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:112b06a867b235ef466ed3508ddf0238050df9c727cafb5301ac385b899189a1", size = 14821197, upload-time = "2026-05-18T23:35:05.468Z" }, + { url = "https://files.pythonhosted.org/packages/00/58/f1c39161c87d9e9bed660f1ed4bafc0e403d5ec9650b6dd77aead07d489b/numpy-2.4.6-cp313-cp313t-macosx_14_0_arm64.whl", hash = "sha256:eaf7fa2de5c0be8ae6ff8e9bea2ccd725e980541244521d8d4b5f3354a27babe", size = 5326287, upload-time = "2026-05-18T23:35:08.693Z" }, + { url = "https://files.pythonhosted.org/packages/af/57/3917ab0fd97f271a8694513581b8a36c655f111c446852c302f04ccdb6fc/numpy-2.4.6-cp313-cp313t-macosx_14_0_x86_64.whl", hash = "sha256:7265a2f3d436e54ef9f2b52b5c937e6be778781bd97a590319d7348f1c1ca997", size = 6646763, upload-time = "2026-05-18T23:35:11.459Z" }, + { url = "https://files.pythonhosted.org/packages/eb/0f/037e64c494b67581ae18193d770adef354c41f3f2c8ebf865602d949bf8f/numpy-2.4.6-cp313-cp313t-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:f74a575920ab21fe304421a3fc28793d82e299cae9eccb37084e9fc7f3617c20", size = 15728070, upload-time = "2026-05-18T23:35:14.79Z" }, + { url = "https://files.pythonhosted.org/packages/21/a6/5d2bae9c9542eb4df16dc9c46dc79c186e9bad53805dfa5399a6023c6db0/numpy-2.4.6-cp313-cp313t-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:ede83e07a75dd06bc501566c1eca2afc0d61677c1472ac9ad93fdee6e638a48d", size = 16681752, upload-time = "2026-05-18T23:35:18.836Z" }, + { url = "https://files.pythonhosted.org/packages/92/14/23d1dfb410ae362cd59ce53e936b1513d545eb40db3949ced632e19a459e/numpy-2.4.6-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:68bb27509ac1b9a3443094260f6326150663b06abe40b73a2f81160623da5b67", size = 17086024, upload-time = "2026-05-18T23:35:22.52Z" }, + { url = "https://files.pythonhosted.org/packages/4b/6e/23595a2c642cdf3bc567877064bdd7f91c8b0038a4453cf2daf7248eafe9/numpy-2.4.6-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:a0df0043bdb289bde1f62da130d20df23d58b45429f752bc7a8fc5325a225ecd", size = 18403398, upload-time = "2026-05-18T23:35:26.398Z" }, + { url = "https://files.pythonhosted.org/packages/8a/90/0ac3bc947217e66dec77e7cbc6a1979d1af70b6461b82f620d3bccd5e4c8/numpy-2.4.6-cp313-cp313t-win32.whl", hash = "sha256:29a287e0cf63ff528da061de6b9f64a4618da591ca1046aafc54062e40ca7eab", size = 6084971, upload-time = "2026-05-18T23:35:29.387Z" }, + { url = "https://files.pythonhosted.org/packages/77/71/5673e351671a1d2bd6063b91b44f70c0affea7d1516fa7a6572941ba4aa1/numpy-2.4.6-cp313-cp313t-win_amd64.whl", hash = "sha256:25c692919ac5a01f170a3bfcd62d745b24fd095c353d50812637d6fcab442e75", size = 12458532, upload-time = "2026-05-18T23:35:32.175Z" }, + { url = "https://files.pythonhosted.org/packages/3f/88/19d3503c5046e688f049274b27a3ef3d771152fa80d3ba3d01a3dff61abe/numpy-2.4.6-cp313-cp313t-win_arm64.whl", hash = "sha256:1e978ec1e8bd0e0e4de6bb75de9d30cbb74db6b6a2bb727618613703ca0167dd", size = 10291881, upload-time = "2026-05-18T23:35:35.465Z" }, + { url = "https://files.pythonhosted.org/packages/f8/91/3ab2044d05fd16d343c5ac2e69b127f1b2854040dd20b193257c78028bd3/numpy-2.4.6-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:06ca2f61ec4385a07a6977c55ba998a4466c123642b4a32694d3128fce18c079", size = 16683458, upload-time = "2026-05-18T23:35:38.353Z" }, + { url = "https://files.pythonhosted.org/packages/8e/62/764ce66fa4147ae6d73071a3abf804ffe606f174618697c571acdf26a7c9/numpy-2.4.6-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:38efbc8de75c7a0fc1ac190162d892787f3f47b57cc291231aafee36b80982b7", size = 14704559, upload-time = "2026-05-18T23:35:42.14Z" }, + { url = "https://files.pythonhosted.org/packages/60/61/23f27c172f022e04025b7dc2367f4d63c1a398120607ec896228649a6f48/numpy-2.4.6-cp314-cp314-macosx_14_0_arm64.whl", hash = "sha256:d581b735e177fdcdce6fed8e7e8880a3fb6ee4e3653a3ac6af01c6f4c03effc5", size = 5209716, upload-time = "2026-05-18T23:35:45.377Z" }, + { url = "https://files.pythonhosted.org/packages/03/71/21cf70dc6ea3e3acb95fc53a265b2fc248b981f0194ceb5b475271b8809d/numpy-2.4.6-cp314-cp314-macosx_14_0_x86_64.whl", hash = "sha256:0a041d3d761dc3c35cc56ce0351506a02bcbc25f7b169f652435141a17db9096", size = 6543947, upload-time = "2026-05-18T23:35:47.926Z" }, + { url = "https://files.pythonhosted.org/packages/d5/91/64288395ee1799bd2e0b04a305dce9666da90c961e1f3fe982a05ee1c036/numpy-2.4.6-cp314-cp314-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:40fdc1ae7125e518ea98e53e69a4ebc27e1fd50510c47b7ea130cf21e5e1d42b", size = 15685197, upload-time = "2026-05-18T23:35:50.863Z" }, + { url = "https://files.pythonhosted.org/packages/f3/eb/ebffaa97dc55502df69584a8f0dcf07f69a3e0b3e2323670a2722db9aa39/numpy-2.4.6-cp314-cp314-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:a2c306dea656c12c68f51f4cea133cbe78ca7435eb28c735eac1d3ebe73be6e8", size = 16638245, upload-time = "2026-05-18T23:35:54.752Z" }, + { url = "https://files.pythonhosted.org/packages/b8/0b/54f9da33128d7e350fab89c7455902eeae70349ee52bddb448dc4a576f45/numpy-2.4.6-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:33111801a01c12a8a1e3721f0a9232f8cfc8ae2c6b7098167e6f623c6073f402", size = 17036587, upload-time = "2026-05-18T23:35:58.355Z" }, + { url = "https://files.pythonhosted.org/packages/b6/f0/fdebc1052db1cc37c64beb22072d67cd6d1c71adca1299f53dec2b5e20d3/numpy-2.4.6-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:ae506e6902902557576a26ff33eda8695e7ecb3cb36c3b573a0765dee114ebdb", size = 18363226, upload-time = "2026-05-18T23:36:02.845Z" }, + { url = "https://files.pythonhosted.org/packages/aa/b4/298628d98c72b57e57f7165ae6a481a1deaf6f3c28262a6e4c739c275930/numpy-2.4.6-cp314-cp314-win32.whl", hash = "sha256:aaf159caa35993cb1f56fb9b8e4610d35758e7ca005412eb1daa856a78c9c4b1", size = 6010196, upload-time = "2026-05-18T23:36:05.92Z" }, + { url = "https://files.pythonhosted.org/packages/df/ac/46de6dda46478f7942f839e094970be2d4a861e005c4b3bf07c92e291a09/numpy-2.4.6-cp314-cp314-win_amd64.whl", hash = "sha256:b507f5c4c1d508876d1819b6bf9a49d365b96320b5d4993426b33a23ca4b8261", size = 12450334, upload-time = "2026-05-18T23:36:09.107Z" }, + { url = "https://files.pythonhosted.org/packages/78/92/b8b798ac784102c0da830d2257d59358e3d3d90d1e2b3f2575dad976c5cf/numpy-2.4.6-cp314-cp314-win_arm64.whl", hash = "sha256:6f41ae150c4e32db4f3310cdaf64b1593a03dbabe29eec77fc9b50fe64061df6", size = 10495678, upload-time = "2026-05-18T23:36:12.766Z" }, + { url = "https://files.pythonhosted.org/packages/30/34/ec28d1aa8115971537c01469ab2011ee96827930f0a124de1000cc2a7ed7/numpy-2.4.6-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:ece3d2cfe132e7d51f44a832b303895e6f2d499c5e74dfbdb06ee246147a304a", size = 14823672, upload-time = "2026-05-18T23:36:16.473Z" }, + { url = "https://files.pythonhosted.org/packages/16/bd/f6d1fede4e54e8042a7ff97bb495510f3c220f94bcd9e8b228e87c92cc0d/numpy-2.4.6-cp314-cp314t-macosx_14_0_arm64.whl", hash = "sha256:e3e5193ef5a3dc73bceee50f7fdc2c90dbb76c42df8d8fae3d1067a583df579e", size = 5328731, upload-time = "2026-05-18T23:36:19.767Z" }, + { url = "https://files.pythonhosted.org/packages/f4/f0/e105b9e2fd728a9910103884decd6951d9dd73896b914a98d9a231de02ee/numpy-2.4.6-cp314-cp314t-macosx_14_0_x86_64.whl", hash = "sha256:17f9ade344e7d9b464a084d69bcf18fc691cb1db67c62ed80820bf4926d78f0e", size = 6649805, upload-time = "2026-05-18T23:36:22.266Z" }, + { url = "https://files.pythonhosted.org/packages/82/dd/1206a7ca6ab15e3f02069707ca96222e202af681bb73756da7527f3cb837/numpy-2.4.6-cp314-cp314t-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:9cd5ffd25db4e7ba6a375693b3fc0fc1791ec636c17db3720da19bde7180ec43", size = 15730496, upload-time = "2026-05-18T23:36:25.713Z" }, + { url = "https://files.pythonhosted.org/packages/51/e7/38d3ea825dcab85a591734decb2f6c67caa7c8367d374df1a1c3842f9b07/numpy-2.4.6-cp314-cp314t-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:7d92c3819208a60205a12a245c91ad70cb0a85336659b19b834205573ac8456e", size = 16679616, upload-time = "2026-05-18T23:36:29.652Z" }, + { url = "https://files.pythonhosted.org/packages/93/b7/caabfdf53edf663e0b4eb74d7d405d83baef09eb5e83bcd32d601d72b93e/numpy-2.4.6-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:e85b752a1e912b70eaad4fafbd4d1238007ab221de2009b9a2f5ae7461239895", size = 17085145, upload-time = "2026-05-18T23:36:33.449Z" }, + { url = "https://files.pythonhosted.org/packages/f9/45/68d7c33a6bcf3e5aa3bdbd57a367e6f615286dfd6482f97e8ffeb734306e/numpy-2.4.6-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:29cb7f67d10b479ff07c17d33e39f78c07f71c40ef30d63c153d340e96cd3fb4", size = 18403813, upload-time = "2026-05-18T23:36:37.369Z" }, + { url = "https://files.pythonhosted.org/packages/9c/50/0753655aa844c99cd9e018aacf76f130f1bd81d881bb74bc0aef5d73a8ba/numpy-2.4.6-cp314-cp314t-win32.whl", hash = "sha256:260a5d70215b61ab4fadf5c7baacd64821842975eea312125ed3c39a6391b063", size = 6156982, upload-time = "2026-05-18T23:36:40.817Z" }, + { url = "https://files.pythonhosted.org/packages/b2/d4/7c67becf668f973cb490cec3e98dfd799d866f9c989a54d355672cfa0db6/numpy-2.4.6-cp314-cp314t-win_amd64.whl", hash = "sha256:81a1cca95ed5bb92aa8b10dd2cdc9a0d3853a50fad926c28b5d7e8ea54389627", size = 12638908, upload-time = "2026-05-18T23:36:43.996Z" }, + { url = "https://files.pythonhosted.org/packages/43/bb/e1c71a4295b1b1d1393d50dbb4f2a36283c6859d9d3892e84f00ec5a91d5/numpy-2.4.6-cp314-cp314t-win_arm64.whl", hash = "sha256:0c9136e14ed34a9e343a31c533d78a9813a69a3148332bce5e9821cb2f996e66", size = 10565867, upload-time = "2026-05-18T23:36:47.114Z" }, + { url = "https://files.pythonhosted.org/packages/de/12/b422cc84439adc0d00de605bf4a308890ae5c26f2c71fbd73e5d08fbb0dd/numpy-2.4.6-pp311-pypy311_pp73-macosx_10_15_x86_64.whl", hash = "sha256:55cced7c52e981362f708ad635198e97a752dfba412cc03c23bbf3bd8d5cd662", size = 16847511, upload-time = "2026-05-18T23:36:50.673Z" }, + { url = "https://files.pythonhosted.org/packages/44/53/f481bef68011740f8849418d82db07230e825013f31f4eef5ba5b805316a/numpy-2.4.6-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:d6da64deb6b8ed903e7560180a92f2d804ee1ba5eeb849ac2748b8c1aba1f6d7", size = 14889064, upload-time = "2026-05-18T23:36:53.879Z" }, + { url = "https://files.pythonhosted.org/packages/7f/57/42ed575c10ced8af951d426bc4e1f8aff16fd851db33f067036215a7f860/numpy-2.4.6-pp311-pypy311_pp73-macosx_14_0_arm64.whl", hash = "sha256:68a5124b13fa6cc2086764a20005d30bc0548146f7f5322f02fce212ca14317f", size = 5394157, upload-time = "2026-05-18T23:36:57.194Z" }, + { url = "https://files.pythonhosted.org/packages/6a/ef/f66cc724fcc36c1e364c67f51ae9146090b8b584f27d58b97fdae3edd737/numpy-2.4.6-pp311-pypy311_pp73-macosx_14_0_x86_64.whl", hash = "sha256:948424b06129ce883307e8cff868c31396d8dc7630a59c61d70d98dbe70f222c", size = 6708728, upload-time = "2026-05-18T23:36:59.575Z" }, + { url = "https://files.pythonhosted.org/packages/1a/9c/c531f2293b91265d8b48e9b329f54fdd7ffae73cb4134ea10cca4237e9cc/numpy-2.4.6-pp311-pypy311_pp73-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:5dbbdb29840ca3d91ee0fece42fc29278886d908280bfec0a5846c6f901a3eb0", size = 15798374, upload-time = "2026-05-18T23:37:02.674Z" }, + { url = "https://files.pythonhosted.org/packages/1a/b0/413077f6b1153ed3cba361401c6783bbad6114804a000cc22eb71c13e190/numpy-2.4.6-pp311-pypy311_pp73-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:8ad03c0965fb3c692200e74d458ca28c1dbb4ce96f9a479a8aa041ad5fabca02", size = 16747286, upload-time = "2026-05-18T23:37:06.327Z" }, + { url = "https://files.pythonhosted.org/packages/15/ce/e5ec180bc41812edcd8daeb8639d205622c0e8c02259d8ab25a0201b3c2a/numpy-2.4.6-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:2803abfebfc990042cd494d8ce2d5f82e9d847af6d35ec486923aa19dbad5e73", size = 12504263, upload-time = "2026-05-18T23:37:09.715Z" }, +] + +[[package]] +name = "opentelemetry-api" +version = "1.42.1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "typing-extensions" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/b4/1c/125e1c936c0873796771b7f04f6c93b9f1bf5d424cea90fda94a99f61da8/opentelemetry_api-1.42.1.tar.gz", hash = "sha256:56c63bea9f77b62856be8c47600474acad853b2924b99b1687c4cb6297166716", size = 72296, upload-time = "2026-05-21T16:32:49.335Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/a3/ca/9520cc1f3dfbbd03ac5903bbf55833e257bc64b1cf30fa8b0d6df374d821/opentelemetry_api-1.42.1-py3-none-any.whl", hash = "sha256:51a69edacadbc03a8950ace1c4c21099cacc538820ac2c9e36277e78cebba714", size = 61311, upload-time = "2026-05-21T16:32:28.822Z" }, +] + +[[package]] +name = "opentelemetry-exporter-otlp-proto-common" +version = "1.42.1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "opentelemetry-proto" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/0e/9c/216acfeaedadf2e1937f4373929b20f73197c5c4a2546d4f584b7fa63813/opentelemetry_exporter_otlp_proto_common-1.42.1.tar.gz", hash = "sha256:04f1f01fb597c4249dfcd7f8b861c902c2102369d376d9d346ff38de4469a2ee", size = 21433, upload-time = "2026-05-21T16:32:55.526Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/d6/43/2375e7612e1121a4518c17603b6e0b03ad94f565aafad53f464dc5be2bf6/opentelemetry_exporter_otlp_proto_common-1.42.1-py3-none-any.whl", hash = "sha256:f48d395ab815b444da118868977e9798ea354c25737d5cf39578ae894011c140", size = 17327, upload-time = "2026-05-21T16:32:33.387Z" }, +] + +[[package]] +name = "opentelemetry-exporter-otlp-proto-grpc" +version = "1.42.1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "googleapis-common-protos" }, + { name = "grpcio" }, + { name = "opentelemetry-api" }, + { name = "opentelemetry-exporter-otlp-proto-common" }, + { name = "opentelemetry-proto" }, + { name = "opentelemetry-sdk" }, + { name = "typing-extensions" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/87/87/ca7fc790dfdbcf4f9e9aab14a39ef1b7508ead13707e283de0b3131478d2/opentelemetry_exporter_otlp_proto_grpc-1.42.1.tar.gz", hash = "sha256:975c4461f167dd8ed8857d68d3b6b25f3d272eab896f6a9470d0f5b90e2faf15", size = 27140, upload-time = "2026-05-21T16:32:56.162Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/89/2b/28ba5b128f47fe8c3bab541000d6feb4b5a9bd26623ca013406f01c0fb60/opentelemetry_exporter_otlp_proto_grpc-1.42.1-py3-none-any.whl", hash = "sha256:0ae1177e2038b18a929b3098215243631ef91136cba26b7e2b12790ceb7e87cc", size = 19617, upload-time = "2026-05-21T16:32:34.278Z" }, +] + +[[package]] +name = "opentelemetry-instrumentation" +version = "0.63b1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "opentelemetry-api" }, + { name = "opentelemetry-semantic-conventions" }, + { name = "packaging" }, + { name = "wrapt" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/da/6d/4de72d97ff54db1ed270c7a59c9b904b917c0ac7af429c086c388b824ddb/opentelemetry_instrumentation-0.63b1.tar.gz", hash = "sha256:32368d6ae52c8de20aa790a6ad86b10a76f09956092337ae37d675773990e541", size = 41081, upload-time = "2026-05-21T16:36:14.206Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/35/a1/9314e621c143e4d82a5bf7a43c2ff7a745d31023506336857607c8c543cc/opentelemetry_instrumentation-0.63b1-py3-none-any.whl", hash = "sha256:f1986716d52cc316ea5f60189098726a9071d8ecc0eee96c9ed110be08bade9c", size = 35577, upload-time = "2026-05-21T16:34:56.818Z" }, +] + +[[package]] +name = "opentelemetry-instrumentation-asgi" +version = "0.63b1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "asgiref" }, + { name = "opentelemetry-api" }, + { name = "opentelemetry-instrumentation" }, + { name = "opentelemetry-semantic-conventions" }, + { name = "opentelemetry-util-http" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/a0/b5/7ea3a9fd1b80e89786c14250bfaecf32a753c3fd08232690f4da8dc16e29/opentelemetry_instrumentation_asgi-0.63b1.tar.gz", hash = "sha256:267b422416d768f3c7f4054883b41d9c3a7c943d86d20032b738c99a3dbb5862", size = 26151, upload-time = "2026-05-21T16:36:18.368Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/57/7e/83986f27b421de04fab1e1a84e892621dac42e6432a9c66779505f4d1381/opentelemetry_instrumentation_asgi-0.63b1-py3-none-any.whl", hash = "sha256:1a22453dfa965f14799b10a674b8acbcb897a8a75c79136060af54214cc7886e", size = 15906, upload-time = "2026-05-21T16:35:04.162Z" }, +] + +[[package]] +name = "opentelemetry-instrumentation-fastapi" +version = "0.63b1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "opentelemetry-api" }, + { name = "opentelemetry-instrumentation" }, + { name = "opentelemetry-instrumentation-asgi" }, + { name = "opentelemetry-semantic-conventions" }, + { name = "opentelemetry-util-http" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/32/d6/0c128fac2e34b7d526a8d3c6edc45b875a97f8a987861b00511151b6337d/opentelemetry_instrumentation_fastapi-0.63b1.tar.gz", hash = "sha256:cc42dff56c96d0a2921510c4abab2a4c2e27fe64b26dc1254727fb550df100ba", size = 25387, upload-time = "2026-05-21T16:36:32.071Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/b1/3d/2eae63f13f36d7a8ab5bf03d06ecaf169c2069b524547f24947be6d92094/opentelemetry_instrumentation_fastapi-0.63b1-py3-none-any.whl", hash = "sha256:52ee2cde9a2ac094bdd45d79f85860e03a972928a2553006071fe61d94cf7281", size = 12795, upload-time = "2026-05-21T16:35:28.68Z" }, +] + +[[package]] +name = "opentelemetry-instrumentation-pymongo" +version = "0.63b1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "opentelemetry-api" }, + { name = "opentelemetry-instrumentation" }, + { name = "opentelemetry-semantic-conventions" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/06/b2/94c180359165abe62e829250bc6ac6b7daa2334b3c505bad64f1c64f18ab/opentelemetry_instrumentation_pymongo-0.63b1.tar.gz", hash = "sha256:8c0ae185b59dcb45c80bf90d4ffda5fcc6337dbba11de40306ffd69459e476fa", size = 10208, upload-time = "2026-05-21T16:36:41.961Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/04/b9/47b8d0f52d81d7661debebb11f4fdd1ab869d694089711c1ac8988456364/opentelemetry_instrumentation_pymongo-0.63b1-py3-none-any.whl", hash = "sha256:0d8dd55b2522eda4a7093da8b5f47fae9a3235fb2786bc14c161d5999a66320d", size = 10290, upload-time = "2026-05-21T16:35:44.634Z" }, +] + +[[package]] +name = "opentelemetry-proto" +version = "1.42.1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "protobuf" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/b4/55/63eac3e1089b768ba014091fdd2ae8a9a440c821ef5e2b786909c94c8836/opentelemetry_proto-1.42.1.tar.gz", hash = "sha256:c6a51e6b4f05ae63565f3a113217f3d2bfaec68f78c02d7a6c85f9010d1cfca6", size = 45839, upload-time = "2026-05-21T16:33:03.937Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/41/9d/171c02c84a76940b7e601805b3bb536985aded9168fbcc9ba52f0a730fa2/opentelemetry_proto-1.42.1-py3-none-any.whl", hash = "sha256:dedb74cba2886c59c7789b227a7a670613025a07489040050aedff6e5c0fb43c", size = 71782, upload-time = "2026-05-21T16:32:44.867Z" }, +] + +[[package]] +name = "opentelemetry-sdk" +version = "1.42.1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "opentelemetry-api" }, + { name = "opentelemetry-semantic-conventions" }, + { name = "typing-extensions" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/40/f7/b390bd9bfd703bf98a68fea1f27786c6872331fd617164a54b8a59bdc008/opentelemetry_sdk-1.42.1.tar.gz", hash = "sha256:8c834e8f8c9ba4171d4ec843d0cb8a67e4c7394d3f9e9297e582cbd9456ddbf7", size = 239262, upload-time = "2026-05-21T16:33:04.641Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/8f/6b/4287766cfbde577ae2272e8884abac325aeaac0d64f41c61d5b8cc595105/opentelemetry_sdk-1.42.1-py3-none-any.whl", hash = "sha256:083cd4bbfaa5aa7b5a9e552430d9951219967cfb27aa61feb13a77aba1fc839d", size = 170907, upload-time = "2026-05-21T16:32:45.894Z" }, +] + +[[package]] +name = "opentelemetry-semantic-conventions" +version = "0.63b1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "opentelemetry-api" }, + { name = "typing-extensions" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/93/99/4d7dd6df64795951413ce6e815f8cf1eb191daf7196ae86574589643d5f3/opentelemetry_semantic_conventions-0.63b1.tar.gz", hash = "sha256:3daf963611334b365e98a57438183eb012d3bfb40b2d931a9af613476b8701a9", size = 148340, upload-time = "2026-05-21T16:33:05.455Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/cb/7a/7fe66f5f3682b1dd47d88cc4e11f1c6c0966b737de2d16671146e23c39a5/opentelemetry_semantic_conventions-0.63b1-py3-none-any.whl", hash = "sha256:dfe5ef4dee82586b746f522b818ceb298d00b3d59f660042bd79404bff8d0682", size = 203713, upload-time = "2026-05-21T16:32:47.016Z" }, +] + +[[package]] +name = "opentelemetry-util-http" +version = "0.63b1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/6c/d8/7bf5e4cec0578ac3c28c18eb7b88f34279139cbc8c568d6aa02b9c5ae53e/opentelemetry_util_http-0.63b1.tar.gz", hash = "sha256:ba1268f00922ee522dba2ae38458060f99486e7385a8056985901ca9685adfff", size = 11102, upload-time = "2026-05-21T16:36:56.675Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/e5/f1/34e047e8f6a3c67e5220acf1af7b9f62868c25d77791bca74457bd2180a6/opentelemetry_util_http-0.63b1-py3-none-any.whl", hash = "sha256:6284194028c59cd439f8acfe388145069a6127f11dc077e1344a2094adacc3f8", size = 8205, upload-time = "2026-05-21T16:36:09.736Z" }, +] + +[[package]] +name = "orjson" +version = "3.11.9" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/7e/0c/964746fcafbd16f8ff53219ad9f6b412b34f345c75f384ad434ceaadb538/orjson-3.11.9.tar.gz", hash = "sha256:4fef17e1f8722c11587a6ef18e35902450221da0028e65dbaaa543619e68e48f", size = 5599163, upload-time = "2026-05-06T15:11:08.309Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/1e/51/3fb9e65ae76ee97bd611869a503fa3fc0a6e81dd8b737cf3003f682df7ff/orjson-3.11.9-cp311-cp311-macosx_10_15_x86_64.macosx_11_0_arm64.macosx_10_15_universal2.whl", hash = "sha256:f01c4818b3fc9b0da8e096722a84318071eaa118df35f6ed2344da0e73a5444f", size = 228522, upload-time = "2026-05-06T15:09:35.362Z" }, + { url = "https://files.pythonhosted.org/packages/16/fa/9d54b07cb3f3b0bfd57841478e42d7a0ece4a9f49f9907eecf5a45461687/orjson-3.11.9-cp311-cp311-macosx_15_0_arm64.whl", hash = "sha256:3ebca4179031ee716ed076ffadc29428e900512f6fccee8614c9983157fcf19c", size = 128463, upload-time = "2026-05-06T15:09:37.063Z" }, + { url = "https://files.pythonhosted.org/packages/88/b1/6ceafc2eefd0a553e3be77ce6c49d107e772485d9568629376171c50e634/orjson-3.11.9-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:48ee05097750de0ff69ed5b7bbcf0732182fd57a24043dcc2a1da780a5ead3a5", size = 132306, upload-time = "2026-05-06T15:09:38.299Z" }, + { url = "https://files.pythonhosted.org/packages/ea/76/f11311285324a40aab1e3031385c50b635a7cd0734fdaf60c7e89a696f60/orjson-3.11.9-cp311-cp311-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:a6082706765a95a6680d812e1daf1c0cfe8adec7831b3ff3b625693f3b461b1c", size = 127988, upload-time = "2026-05-06T15:09:39.597Z" }, + { url = "https://files.pythonhosted.org/packages/9e/85/0ef63bcf1337f44031ce9b91b1919563f62a37527b3ea4368bb15a22e5d7/orjson-3.11.9-cp311-cp311-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:277fefe9d76ee17eb14debf399e3533d4d63b5f677a4d3719eb763536af1f4bd", size = 135188, upload-time = "2026-05-06T15:09:40.957Z" }, + { url = "https://files.pythonhosted.org/packages/05/94/b0d27090ea8a2095db3c2bd1b1c96f96f19bbb494d7fef33130e846e613d/orjson-3.11.9-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:03db380e3780fa0015ed776a90f20e8e20bb11dde13b216ce19e5718e3dfba62", size = 145937, upload-time = "2026-05-06T15:09:42.249Z" }, + { url = "https://files.pythonhosted.org/packages/09/eb/75d50c29c05b8054013e221e598820a365c8e64065312e75e202ed880709/orjson-3.11.9-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:33d7d766701847dc6729846362dc27895d2f2d2251264f9d10e7cb9878194877", size = 132758, upload-time = "2026-05-06T15:09:43.945Z" }, + { url = "https://files.pythonhosted.org/packages/49/bd/360686f39348aa88827cb6fbf7dc606fd41c831a35235e1abf1db8e3a9e6/orjson-3.11.9-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:147302878da387104b66bb4a8b0227d1d487e976ce41a8501916161072ed87b1", size = 133971, upload-time = "2026-05-06T15:09:45.239Z" }, + { url = "https://files.pythonhosted.org/packages/0e/30/3178eb16f3221aeef068b6f1f1ebe05f656ea5c6dffe9f6c917329fe17a3/orjson-3.11.9-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:3513550321f8c8c811a7c3297b8a630e82dc08e4c10216d07703c997776236cd", size = 141685, upload-time = "2026-05-06T15:09:46.858Z" }, + { url = "https://files.pythonhosted.org/packages/5f/f1/ff2f19ed0225f9680fafa42febca3570dd59444ebf190980738d376214c2/orjson-3.11.9-cp311-cp311-musllinux_1_2_armv7l.whl", hash = "sha256:c5d001196b89fa9cf0a4ab79766cd835b991a166e4b621ba95089edc50c429ff", size = 415167, upload-time = "2026-05-06T15:09:48.312Z" }, + { url = "https://files.pythonhosted.org/packages/9b/61/863bddf0da6e9e586765414debd54b4e58db05f560902b6d00658cb88636/orjson-3.11.9-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:16969c9d369c98eb084889c6e4d2d39b77c7eb38ceccf8da2a9fff62ae908980", size = 147913, upload-time = "2026-05-06T15:09:49.733Z" }, + { url = "https://files.pythonhosted.org/packages/b6/8a/4081492586d75b073d60c5271a8d0f05a0955cabf1e34c8473f6fcd84235/orjson-3.11.9-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:63e0efbc991250c0b3143488fa57d95affcabbfc63c99c48d625dd37779aafe2", size = 136959, upload-time = "2026-05-06T15:09:51.311Z" }, + { url = "https://files.pythonhosted.org/packages/0d/bd/70b6ab193594d7abb875320c0a7c8335e846f28968c432c31042409c3c8d/orjson-3.11.9-cp311-cp311-win32.whl", hash = "sha256:14ed654580c1ed2bc217352ec82f91b047aef82951aa71c7f64e0dcb03c0e180", size = 131533, upload-time = "2026-05-06T15:09:52.637Z" }, + { url = "https://files.pythonhosted.org/packages/3f/17/1a1a228183d62d1b77e2c30d210f47dd4768b310ebe1607c63e3c0e3a71e/orjson-3.11.9-cp311-cp311-win_amd64.whl", hash = "sha256:57ea77fb70a448ce87d18fca050193202a3da5e54598f6501ca5476fb66cfe02", size = 127106, upload-time = "2026-05-06T15:09:54.204Z" }, + { url = "https://files.pythonhosted.org/packages/b8/95/285de5fa296d09681ee9c546cd4a8aeb773b701cf343dc125994f4d52953/orjson-3.11.9-cp311-cp311-win_arm64.whl", hash = "sha256:19b72ed11572a2ee51a67a903afbe5af504f84ed6f529c0fe44b0ab3fb5cc697", size = 126848, upload-time = "2026-05-06T15:09:55.551Z" }, + { url = "https://files.pythonhosted.org/packages/16/6d/11867a3ffa3a3608d84a4de51ef4dd0896d6b5cc9132fbe1daf593e677bc/orjson-3.11.9-cp312-cp312-macosx_10_15_x86_64.macosx_11_0_arm64.macosx_10_15_universal2.whl", hash = "sha256:9ef6fe90aadef185c7b128859f40beb24720b4ecea95379fc9000931179c3a49", size = 228515, upload-time = "2026-05-06T15:09:57.265Z" }, + { url = "https://files.pythonhosted.org/packages/24/75/05912954c8b288f34fcf5cd4b9b071cb4f6e77b9961e175e56ebb258089f/orjson-3.11.9-cp312-cp312-macosx_15_0_arm64.whl", hash = "sha256:e5c9b8f28e726e97d97696c826bc7bea5d71cecd63576dba92924a32c1961291", size = 128409, upload-time = "2026-05-06T15:09:59.063Z" }, + { url = "https://files.pythonhosted.org/packages/ab/86/1c3a47df3bc8191ea9ac51603bbb872a95167a364320c269f2557911f406/orjson-3.11.9-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:26a473dbb4162108b27901492546f83c76fdcea3d0eadff00ae7a07e18dcce09", size = 132106, upload-time = "2026-05-06T15:10:00.798Z" }, + { url = "https://files.pythonhosted.org/packages/d7/cf/b33b5f3e695ae7d63feef9d915c37cc3b8f465493dcd4f8e0b4c697a2366/orjson-3.11.9-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:011382e2a60fda9d46f1cdee31068cfc52ffe952b587d683ec0463002802a0f4", size = 127864, upload-time = "2026-05-06T15:10:02.15Z" }, + { url = "https://files.pythonhosted.org/packages/31/6a/6cf69385a58208024fcb8c014e2141b8ce838aba6492b589f8acfff97fab/orjson-3.11.9-cp312-cp312-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c2d3dc759490128c5c1711a53eeaa8ee1d437fd0038ffd2b6008abf46db3f882", size = 135213, upload-time = "2026-05-06T15:10:03.515Z" }, + { url = "https://files.pythonhosted.org/packages/e8/f8/0b1bd3e8f2efcdd376af5c8cfd79eaf13f018080c0089c80ebd724e3c7fb/orjson-3.11.9-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:d8ea516b3726d190e1b4297e6f4e7a8650347ae053868a18163b4dd3641d1fff", size = 145994, upload-time = "2026-05-06T15:10:05.083Z" }, + { url = "https://files.pythonhosted.org/packages/f3/59/dab79f61044c529d2c81aecdc589b1f833a1c8dec11ba3b1c2498a02ca7e/orjson-3.11.9-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:380cdce7ba24989af81d0a7013d0aaec5d0e2a21734c0e2681b1bc4f141957fe", size = 132744, upload-time = "2026-05-06T15:10:06.853Z" }, + { url = "https://files.pythonhosted.org/packages/0e/a4/82b7a2fe5d8a67a59ed831b24d59a3d46ea7d207b66e1602d376541d94a6/orjson-3.11.9-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:be4fa4f0af7fa18951f7ab3fc2148e223af211bf03f59e1c6034ec3f97f21d61", size = 134014, upload-time = "2026-05-06T15:10:08.213Z" }, + { url = "https://files.pythonhosted.org/packages/50/c7/375e83a76851b73b2e39f3bcf0e5a19e2b89bad13e5bca97d0b293d27f24/orjson-3.11.9-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:a8f5f8bc7ce7d59f08d9f99fa510c06496164a24cb5f3d34537dbd9ca30132e2", size = 141509, upload-time = "2026-05-06T15:10:09.595Z" }, + { url = "https://files.pythonhosted.org/packages/7f/7c/49d5d82a3d3097f641f094f552131f1e2723b0b8cb0fa2874ab65ecfffa6/orjson-3.11.9-cp312-cp312-musllinux_1_2_armv7l.whl", hash = "sha256:4d7fde5501b944f83b3e665e1b31343ff6e154b15560a16b7130ea1e594a4206", size = 415127, upload-time = "2026-05-06T15:10:11.049Z" }, + { url = "https://files.pythonhosted.org/packages/3a/dc/7446c538590d55f455647e5f3c61fc33f7108714e7afcffa6a2a033f8350/orjson-3.11.9-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:cde1a448023ba7d5bb4c01c5afb48894380b5e4956e0627266526587ef4e535f", size = 148025, upload-time = "2026-05-06T15:10:12.842Z" }, + { url = "https://files.pythonhosted.org/packages/df/e5/4d2d8af06f788329b4f78f8cc3679bb395392fcaa1e4d8d3c33e85308fa4/orjson-3.11.9-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:71e63adb0e1f1ed5d9e168f50a91ceb93ae6420731d222dc7da5c69409aa47aa", size = 136943, upload-time = "2026-05-06T15:10:14.405Z" }, + { url = "https://files.pythonhosted.org/packages/06/69/850264ccf6d80f6b174620d30a87f65c9b1490aba33fe6b62798e618cad3/orjson-3.11.9-cp312-cp312-win32.whl", hash = "sha256:2d057a602cdd19a0ad680417527c45b6961a095081c0f46fe0e03e304aac6470", size = 131606, upload-time = "2026-05-06T15:10:15.791Z" }, + { url = "https://files.pythonhosted.org/packages/b9/d5/973a43fc9c55e20f2051e9830997649f669be0cb3ca52192087c0143f118/orjson-3.11.9-cp312-cp312-win_amd64.whl", hash = "sha256:59e403b1cc5a676da8eaf31f6254801b7341b3e29efa85f92b48d272637e77be", size = 127101, upload-time = "2026-05-06T15:10:17.129Z" }, + { url = "https://files.pythonhosted.org/packages/fe/ae/495470f0e4a18f73fa10b7f6b84b464ec4cc5291c4e0c7c2a6c400bef006/orjson-3.11.9-cp312-cp312-win_arm64.whl", hash = "sha256:9af678d6488357948f1f84c6cd1c1d397c014e1ae2f98ae082a44eb48f602624", size = 126736, upload-time = "2026-05-06T15:10:18.645Z" }, + { url = "https://files.pythonhosted.org/packages/32/33/93fcc25907235c344ae73122f8a4e01d2d393ef062b4af7d2e2487a32c37/orjson-3.11.9-cp313-cp313-macosx_10_15_x86_64.macosx_11_0_arm64.macosx_10_15_universal2.whl", hash = "sha256:4bab1b2d6141fe7b32ae71dac905666ece4f94936efbfb13d55bb7739a3a6021", size = 228458, upload-time = "2026-05-06T15:10:20.079Z" }, + { url = "https://files.pythonhosted.org/packages/8f/27/b1e6dadb3c080313c03fdd8067b85e6a0460c7d8d6a1c3984ef77b904e4d/orjson-3.11.9-cp313-cp313-macosx_15_0_arm64.whl", hash = "sha256:844417969855fc7a41be124aafe83dc424592a7f77cd4501900c67307122b92c", size = 128368, upload-time = "2026-05-06T15:10:21.549Z" }, + { url = "https://files.pythonhosted.org/packages/21/0f/c9ede0bf052f6b4051e64a7d4fa91b725cccf8321a6a786e86eb03519f00/orjson-3.11.9-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ffe02797b5e9f3a9d8292ddcd289b474ad13e81ad83cd1891a240811f1d2cb81", size = 132070, upload-time = "2026-05-06T15:10:23.371Z" }, + { url = "https://files.pythonhosted.org/packages/fd/26/d398e28048dc18205bbe812f2c88cb9b40313db2470778e25964796458fe/orjson-3.11.9-cp313-cp313-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:0e4eed3b200023042814d2fc8a5d2e880f13b52e1ed2485e83da4f3962f7dc1a", size = 127892, upload-time = "2026-05-06T15:10:24.714Z" }, + { url = "https://files.pythonhosted.org/packages/66/60/52b0054c4c700d5aa7fc5b7ca96917400d8f061307778578e67a10e25852/orjson-3.11.9-cp313-cp313-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:8aff7da9952a5ad1cef8e68017724d96c7b9a66e99e91d6252e1b133d67a7b10", size = 135217, upload-time = "2026-05-06T15:10:26.084Z" }, + { url = "https://files.pythonhosted.org/packages/d5/97/1e3dc2b2a28b7b2528f403d2fc1d79ec5f39af3bc143ab65d3ec26426385/orjson-3.11.9-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:4d4e98d6f3b8afed8bc8cd9718ec0cdf46661826beefb53fe8eafb37f2bf0362", size = 145980, upload-time = "2026-05-06T15:10:28.062Z" }, + { url = "https://files.pythonhosted.org/packages/fc/39/31fbfe7850f2de32dee7e7e5c09f26d403ab01e440ac96001c6b01ad3c99/orjson-3.11.9-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:3a81d52442a7c99b3662333235b3adf96a1715864658b35bb797212be7bddb97", size = 132738, upload-time = "2026-05-06T15:10:29.727Z" }, + { url = "https://files.pythonhosted.org/packages/a1/08/dca0082dd2a194acb93e5457e73455388e2e2ca464a2672449a9ddbb679d/orjson-3.11.9-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4e39364e726a8fff737309aff059ff67d8a8c8d5b677be7bb49a8b3e84b7e218", size = 134033, upload-time = "2026-05-06T15:10:31.152Z" }, + { url = "https://files.pythonhosted.org/packages/11/d4/5bdb0626801230139987385554c5d4c42255218ac906525bf4347f22cd95/orjson-3.11.9-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:4fd66214623f1b17501df9f0543bef0b833979ab5b6ded1e1d123222866aa8c9", size = 141492, upload-time = "2026-05-06T15:10:32.641Z" }, + { url = "https://files.pythonhosted.org/packages/fa/88/a21fb53b3ede6703aede6dce4710ed4111e5b201cfa6bbff5e544f9d47d7/orjson-3.11.9-cp313-cp313-musllinux_1_2_armv7l.whl", hash = "sha256:8ecc30f10465fa1e0ce13fd01d9e22c316e5053a719a8d915d4545a09a5ff677", size = 415087, upload-time = "2026-05-06T15:10:34.438Z" }, + { url = "https://files.pythonhosted.org/packages/3d/57/1b30daf70f0d8180e9a73cefbfbdd99e4bf19eb020466502b01fba7e0e50/orjson-3.11.9-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:97db4c94a7db398a5bd636273324f0b3fd58b350bbbac8bb380ceb825a9b40f4", size = 148031, upload-time = "2026-05-06T15:10:36.358Z" }, + { url = "https://files.pythonhosted.org/packages/04/83/45fbb6d962e260807f99441db9613cee868ceda4baceda59b3720a563f97/orjson-3.11.9-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:9f78cf8fec5bd627f4082b8dfeac7871b43d7f3274904492a43dab39f18a19a0", size = 136915, upload-time = "2026-05-06T15:10:38.013Z" }, + { url = "https://files.pythonhosted.org/packages/5f/cc/2d10025f9056d376e4127ec05a5808b218d46f035fdc08178a5411b34250/orjson-3.11.9-cp313-cp313-win32.whl", hash = "sha256:d4087e5c0209a0a8efe4de3303c234b9c44d1174161dcd851e8eea07c7560b32", size = 131613, upload-time = "2026-05-06T15:10:39.569Z" }, + { url = "https://files.pythonhosted.org/packages/67/bd/2775ff28bfe883b9aa1ff348300542eb2ef1ee18d8ae0e3a49846817a865/orjson-3.11.9-cp313-cp313-win_amd64.whl", hash = "sha256:051b102c93b4f634e89f3866b07b9a9a98915ada541f4ec30f177067b2694979", size = 127086, upload-time = "2026-05-06T15:10:41.262Z" }, + { url = "https://files.pythonhosted.org/packages/91/2b/d26799e580939e32a7da9a39531bc9e58e15ca32ffaa6a8cb3e9bb0d22cd/orjson-3.11.9-cp313-cp313-win_arm64.whl", hash = "sha256:cce9127885941bd28f080cecf1f1d288336b7e0d812c345b08be88b572796254", size = 126696, upload-time = "2026-05-06T15:10:42.651Z" }, + { url = "https://files.pythonhosted.org/packages/8e/eb/5da01e356015aee6ecfa1187ced87aef51364e306f5e695dd52719bf0e78/orjson-3.11.9-cp314-cp314-macosx_10_15_x86_64.macosx_11_0_arm64.macosx_10_15_universal2.whl", hash = "sha256:b6ef1979adc4bc243523f1a2ba91418030a8e29b0a99cbe7e0e2d6807d4dce6e", size = 228465, upload-time = "2026-05-06T15:10:44.097Z" }, + { url = "https://files.pythonhosted.org/packages/64/62/3e0e0c14c957133bcd855395c62b55ed4e3b0af23ffea11b032cb1dcbdb1/orjson-3.11.9-cp314-cp314-macosx_15_0_arm64.whl", hash = "sha256:f36b7f32c7c0db4a719f1fc5824db4a9c6f8bd1a354debb91faf26ebf3a4c71e", size = 128364, upload-time = "2026-05-06T15:10:45.839Z" }, + { url = "https://files.pythonhosted.org/packages/5a/5a/07d8aa117211a8ed7630bda80c8c0b14d04e0f8dcf99bcf49656e4a710eb/orjson-3.11.9-cp314-cp314-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:08f4d8ebb44925c794e535b2bebc507cebf32209df81de22ae285fb0d8d66de0", size = 132063, upload-time = "2026-05-06T15:10:47.267Z" }, + { url = "https://files.pythonhosted.org/packages/d6/ec/4acaf21483e18aa945be74a474c74b434f284b549f275a0a39b9f98956e9/orjson-3.11.9-cp314-cp314-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:6cc7923789694fd58f001cbcac7e47abc13af4d560ebbfcf3b41a8b1a0748124", size = 122356, upload-time = "2026-05-06T15:10:48.765Z" }, + { url = "https://files.pythonhosted.org/packages/13/d8/5f0555e7638801323b7a75850f92e7dfa891bc84fe27a1ba4449170d1200/orjson-3.11.9-cp314-cp314-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ea5c46eb2d3af39e806b986f4b09d5c2706a1f5afde3cbf7544ce6616127173c", size = 129592, upload-time = "2026-05-06T15:10:50.13Z" }, + { url = "https://files.pythonhosted.org/packages/b6/30/ed9860412a3603ceb3c5955bfd72d28b9d0e7ba6ed81add14f83d7114236/orjson-3.11.9-cp314-cp314-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:f5d89a2ed90731df3be64bab0aa44f78bff39fdc9d71c291f4a8023aa46425b7", size = 140491, upload-time = "2026-05-06T15:10:51.582Z" }, + { url = "https://files.pythonhosted.org/packages/d0/17/adc514dea7ac7c505527febf884934b815d34f0c7b8693c1a8b39c5c4a57/orjson-3.11.9-cp314-cp314-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:25e4aed0312d292c09f61af25bba34e0b2c88546041472b09088c39a4d828af1", size = 127309, upload-time = "2026-05-06T15:10:53.329Z" }, + { url = "https://files.pythonhosted.org/packages/76/3e/c0b690253f0b82d86e99949af13533363acfb5432ecb5d53dd5b3bce9c34/orjson-3.11.9-cp314-cp314-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:aaea64f3f467d22e70eeed68bdccb3bc4f83f650446c4a03c59f2cba28a108db", size = 134030, upload-time = "2026-05-06T15:10:54.988Z" }, + { url = "https://files.pythonhosted.org/packages/c1/7a/bc82a0bb25e9faaf92dc4d9ef002732efc09737706af83e346788641d4a7/orjson-3.11.9-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:a028425d1b440c5d92a6be1e1a020739dfe67ea87d96c6dbe828c1b30041728b", size = 141482, upload-time = "2026-05-06T15:10:56.663Z" }, + { url = "https://files.pythonhosted.org/packages/01/55/e69188b939f77d5d32a9833745ace31ea5ccae3ab613a1ec185d3cd2c4fb/orjson-3.11.9-cp314-cp314-musllinux_1_2_armv7l.whl", hash = "sha256:5b192c6cf397e4455b11523c5cf2b18ed084c1bbd61b6c0926344d2129481972", size = 415178, upload-time = "2026-05-06T15:10:58.446Z" }, + { url = "https://files.pythonhosted.org/packages/2e/1a/b8a5a7ac527e80b9cb11d51e3f6689b709279183264b9ec5c7bc680bb8b5/orjson-3.11.9-cp314-cp314-musllinux_1_2_i686.whl", hash = "sha256:ea407d4ccf5891d667d045fecae97a7a1e5e87b3b97f97ae1803c2e741130be0", size = 148089, upload-time = "2026-05-06T15:11:00.441Z" }, + { url = "https://files.pythonhosted.org/packages/97/4e/00503f64204bf859b37213a63927028f30fb6268cd8677fb0a5ad48155e1/orjson-3.11.9-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:5f63aaf97afd9f6dec5b1a68e1b8da12bfccb4cb9a9a65c3e0b6c847849e7586", size = 136921, upload-time = "2026-05-06T15:11:02.176Z" }, + { url = "https://files.pythonhosted.org/packages/0d/ba/a23b82a0a8d0ed7bed4e5f5035aae751cad4ff6a1e8d2ecd14d8860f5929/orjson-3.11.9-cp314-cp314-win32.whl", hash = "sha256:e30ab17845bb9fa54ccf67fa4f9f5282652d54faa6d17452f47d0f369d038673", size = 131638, upload-time = "2026-05-06T15:11:03.696Z" }, + { url = "https://files.pythonhosted.org/packages/f3/c3/0c6798456bade745c75c452342dabacce5798196483e77e643be1f53877d/orjson-3.11.9-cp314-cp314-win_amd64.whl", hash = "sha256:32ef5f4283a3be81913947d19608eacb7c6608026851123790cd9cc8982af34b", size = 127078, upload-time = "2026-05-06T15:11:05.123Z" }, + { url = "https://files.pythonhosted.org/packages/16/21/5a3f1e8913103b703a436a5664238e5b965ec392b555fe68943ea3691e6b/orjson-3.11.9-cp314-cp314-win_arm64.whl", hash = "sha256:eebdbdeef0094e4f5aefa20dcd4eb2368ab5e7a3b4edea27f1e7b2892e009cf9", size = 126687, upload-time = "2026-05-06T15:11:06.602Z" }, +] + +[[package]] +name = "overrides" +version = "7.7.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/36/86/b585f53236dec60aba864e050778b25045f857e17f6e5ea0ae95fe80edd2/overrides-7.7.0.tar.gz", hash = "sha256:55158fa3d93b98cc75299b1e67078ad9003ca27945c76162c1c0766d6f91820a", size = 22812, upload-time = "2024-01-27T21:01:33.423Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/2c/ab/fc8290c6a4c722e5514d80f62b2dc4c4df1a68a41d1364e625c35990fcf3/overrides-7.7.0-py3-none-any.whl", hash = "sha256:c7ed9d062f78b8e4c1a7b70bd8796b35ead4d9f510227ef9c5dc7626c60d7e49", size = 17832, upload-time = "2024-01-27T21:01:31.393Z" }, +] + +[[package]] +name = "packaging" +version = "26.2" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/d7/f1/e7a6dd94a8d4a5626c03e4e99c87f241ba9e350cd9e6d75123f992427270/packaging-26.2.tar.gz", hash = "sha256:ff452ff5a3e828ce110190feff1178bb1f2ea2281fa2075aadb987c2fb221661", size = 228134, upload-time = "2026-04-24T20:15:23.917Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/df/b2/87e62e8c3e2f4b32e5fe99e0b86d576da1312593b39f47d8ceef365e95ed/packaging-26.2-py3-none-any.whl", hash = "sha256:5fc45236b9446107ff2415ce77c807cee2862cb6fac22b8a73826d0693b0980e", size = 100195, upload-time = "2026-04-24T20:15:22.081Z" }, +] + +[[package]] +name = "palettable" +version = "3.3.3" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/dc/3d/a5854d60850485bff12f28abfe0e17f503e866763bed61aed4990b604530/palettable-3.3.3.tar.gz", hash = "sha256:094dd7d9a5fc1cca4854773e5c1fc6a315b33bd5b3a8f47064928facaf0490a8", size = 106639, upload-time = "2023-04-19T23:13:35.864Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/cf/f7/3367feadd4ab56783b0971c9b7edfbdd68e0c70ce877949a5dd2117ed4a0/palettable-3.3.3-py2.py3-none-any.whl", hash = "sha256:74e9e7d7fe5a9be065e02397558ed1777b2df0b793a6f4ce1a5ee74f74fb0caa", size = 332251, upload-time = "2023-04-19T23:13:33.996Z" }, +] + +[[package]] +name = "pandas" +version = "3.0.3" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "numpy" }, + { name = "python-dateutil" }, + { name = "tzdata", marker = "sys_platform == 'emscripten' or sys_platform == 'win32'" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/f8/87/4341c6252d1c47b08768c3d25ac487362bf403f0313ddae4a2a26c9b1b4c/pandas-3.0.3.tar.gz", hash = "sha256:696a4a00a2a2a35d4e5deb3fc946641b96c944f02230e4f76137fe35d806c4fc", size = 4651414, upload-time = "2026-05-11T18:54:29.21Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/42/16/b5c76b838fd9bf6ce84d3a53346b8874ec05c5f0040d75ef2c320100cd2a/pandas-3.0.3-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:455f6f8139d4282188f526868dbc3c828470e88a3d9d59a891bd46a455f21b98", size = 10338495, upload-time = "2026-05-11T18:52:11.558Z" }, + { url = "https://files.pythonhosted.org/packages/5a/b0/a4ffc4ae74d2d822200dcc46898987d8eb6032d1e2b219cae39da6f5cbcc/pandas-3.0.3-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:4e15135e2ee5df1063313e2425ceef8ac0f4ae775893815b0923651b806a5639", size = 9938250, upload-time = "2026-05-11T18:52:17.005Z" }, + { url = "https://files.pythonhosted.org/packages/2e/b2/3323601a52caee42c019e370090ca4544b241437240ca04f786cce82b0cf/pandas-3.0.3-cp311-cp311-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:05f1f1752b8533ea03f7f39a9c15b1a058d067bb48f4748948e7a8691e0510f2", size = 10770558, upload-time = "2026-05-11T18:52:19.865Z" }, + { url = "https://files.pythonhosted.org/packages/32/f1/bbecd2f867b97abebe0f9b53d750f862251b40337e061b36676ded3d920f/pandas-3.0.3-cp311-cp311-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:8a1e45c80cceb3b4a21bc5939d52e8cbd8d9b7305309219d59e9754d9ce09e27", size = 11274611, upload-time = "2026-05-11T18:52:22.622Z" }, + { url = "https://files.pythonhosted.org/packages/7f/4f/eafabf2d5fae5adf143b4d18d3706c5efdc368a7c4eb1ee8a3eddabbd0f6/pandas-3.0.3-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:14da8316da4d0c5a77618425996bfb1248ca87fc2c1486e6fde4652bd18b5824", size = 11784670, upload-time = "2026-05-11T18:52:25.4Z" }, + { url = "https://files.pythonhosted.org/packages/49/44/1eb20389301b57b19cc099a1c2f662501f72f08a65f912d05822613c1532/pandas-3.0.3-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:a55066a0505dae0ba2b50a46637db34b46f9094c65c5d4800794ef6335010938", size = 12353708, upload-time = "2026-05-11T18:52:28.139Z" }, + { url = "https://files.pythonhosted.org/packages/eb/62/c321f13b5ba1819fc8dca456c7fce578da2dcfecff1abbf0eaddf8406c0f/pandas-3.0.3-cp311-cp311-win_amd64.whl", hash = "sha256:6674ab18ad8c57802867264b00e15e7bb904700cdd9046e3b2fa1fce237439ea", size = 9907609, upload-time = "2026-05-11T18:52:30.982Z" }, + { url = "https://files.pythonhosted.org/packages/53/85/1b7f563ebc6357c27233a02a96b589bcce1fa9c6eb89fb4f0e56421d277e/pandas-3.0.3-cp311-cp311-win_arm64.whl", hash = "sha256:5cc09a68b3120e0f54870dede8287a7bb1fa463907e4fcec1ea77cab6179bf7a", size = 9165596, upload-time = "2026-05-11T18:52:33.334Z" }, + { url = "https://files.pythonhosted.org/packages/24/f1/392f8c5bfc16f66a0d2d41561c01627c228fe7ed2a0d056ef11315042570/pandas-3.0.3-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:fed2ff7fd9779120e388e285fc029bd5cf9490cdd2e4166a9ee22c0e49a9ab09", size = 10357846, upload-time = "2026-05-11T18:52:36.143Z" }, + { url = "https://files.pythonhosted.org/packages/cf/3d/b16412745651e855f357e5e66930248688378853a6e2698a214e331fba1f/pandas-3.0.3-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:b168fc218fd80a6cbdbdbc1a97ddc7889ed057d7eb45f50d866ceab5f39904c4", size = 9899550, upload-time = "2026-05-11T18:52:38.976Z" }, + { url = "https://files.pythonhosted.org/packages/31/a8/fa2535168fffcedf67f4f6de28d2dd903a747ca7c8ea6989451aaeb3a92f/pandas-3.0.3-cp312-cp312-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:0383c72c75cdcca61a9e116e611143902dbfd08bff356829c2f6d1cf40a9ca8c", size = 10412965, upload-time = "2026-05-11T18:52:41.915Z" }, + { url = "https://files.pythonhosted.org/packages/65/b6/09b01cdbc15224e2850365192d17b7bdebb8bdbd8780ed221fcdf0d9a515/pandas-3.0.3-cp312-cp312-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:6dc0b3fd2169c9157deed50b4d519553a3655c8c6a96027136d654592be973a9", size = 10894600, upload-time = "2026-05-11T18:52:45.02Z" }, + { url = "https://files.pythonhosted.org/packages/c9/a4/2eb28f2fccb4ced4a2c79ab2a5dee9ade1ebf44922ebad6fea158c9f95d4/pandas-3.0.3-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:7e65d5407dc0b394f509699650e4a2ec01c0514f21850f453fa60f3be79a5dbf", size = 11422824, upload-time = "2026-05-11T18:52:48.058Z" }, + { url = "https://files.pythonhosted.org/packages/f8/45/830bb57f533a4604b355e07edcb8ea18cf88b5f94e5fca92f27052d7c597/pandas-3.0.3-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:f8894dc474d648fe7b6ff0ca9b0bd73950d19952bc1a6534540762c5d79d305c", size = 11950889, upload-time = "2026-05-11T18:52:50.905Z" }, + { url = "https://files.pythonhosted.org/packages/b9/c5/fc1b368f303087d20e8c9bf3d6ceb186263cfac0ade735cd938538bea839/pandas-3.0.3-cp312-cp312-win_amd64.whl", hash = "sha256:c7be265b62cef88e253a941e4698604973736dcfe242fdb5198f0f7bc473cdcc", size = 9755463, upload-time = "2026-05-11T18:52:53.386Z" }, + { url = "https://files.pythonhosted.org/packages/86/bd/fda8f9705b1b09c6ebe14bfc0fa0e4ec8584d54ea673628f157ff55131af/pandas-3.0.3-cp312-cp312-win_arm64.whl", hash = "sha256:557409bc4178e70ee8d9ddb494798e51ebf6ea59330f6be22c51bab2a7db6c49", size = 9066158, upload-time = "2026-05-11T18:52:56.038Z" }, + { url = "https://files.pythonhosted.org/packages/c5/90/62d8302883c44308c477e222c3daf7c813a34c8e96985882fbd53d964352/pandas-3.0.3-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:67b3b64c11910cfa29f4e94a14d3bff9ee693b6fc76055e7cad549cee0aec5fa", size = 10331071, upload-time = "2026-05-11T18:52:58.838Z" }, + { url = "https://files.pythonhosted.org/packages/7f/ae/6a6493c783a101f165e4356953ba3c74d6f77f0042fa7d753da9dfbb640c/pandas-3.0.3-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:39436b377d56d2a2e52d0395bdbee171f01068e99af5250509aceeb929f765c7", size = 9875690, upload-time = "2026-05-11T18:53:01.431Z" }, + { url = "https://files.pythonhosted.org/packages/62/7c/5df8e9f56c69a2769fbe9382a5ef8f2658c007e376434e1e2cbb57ad895f/pandas-3.0.3-cp313-cp313-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:d4be06d68f9ddcfc645b87534911da79a8fbffc7573c80e0edcf42a5020624d8", size = 10381634, upload-time = "2026-05-11T18:53:04.393Z" }, + { url = "https://files.pythonhosted.org/packages/99/68/1237369725aa617bb358263d535803e3053fdbc593513ec5ed9c9896b5b6/pandas-3.0.3-cp313-cp313-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:a4eeb6830daf35a71cc09649bd823e2b542dac246cdee9614c6e4bd65028cd6a", size = 10891243, upload-time = "2026-05-11T18:53:07.643Z" }, + { url = "https://files.pythonhosted.org/packages/25/93/77d108e8af7222b4a503ebde0e30215b1c2e4f8e53a526431890f22d5586/pandas-3.0.3-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:1928e07221f82db493cd4af1e23c1bfca524a19a4699887975bff68f49a72bfb", size = 11388659, upload-time = "2026-05-11T18:53:10.634Z" }, + { url = "https://files.pythonhosted.org/packages/d0/bd/eff5b4399f332ac386c853f6cd2bd3fa2ca0061b9f36ecd9c4d7c4265649/pandas-3.0.3-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:51b1fe551acb77dac643c6fda86084d8d446c10fe64b06a9cc29c4cc8540e7f2", size = 11942880, upload-time = "2026-05-11T18:53:13.536Z" }, + { url = "https://files.pythonhosted.org/packages/2c/20/559ace4200982c3887d0b86bfd0d856a2143ef8ddab63cc07934951a964c/pandas-3.0.3-cp313-cp313-win_amd64.whl", hash = "sha256:a82d532a3351d435432cd913edbccaf8b8e01d4dd0e5ced5a8d2e8ecd94c7e44", size = 9757091, upload-time = "2026-05-11T18:53:16.306Z" }, + { url = "https://files.pythonhosted.org/packages/3a/66/69055a09fe200f29f922a3eeec4804611900b95f52d932ece3393c3c0c19/pandas-3.0.3-cp313-cp313-win_arm64.whl", hash = "sha256:275c14e0fce14a2ec20eee474aecd305478ea3c1e6f6a9d8fe219a165542717e", size = 9057282, upload-time = "2026-05-11T18:53:18.768Z" }, + { url = "https://files.pythonhosted.org/packages/57/0e/efe801b0e6811e8e650cd21b7f2608e30f08a7067e2bf6e8752b0d56ee3c/pandas-3.0.3-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:46997386d528eb40376ecd6b033cf4a8a1e5282580f68f43de875b78cba2199d", size = 10767016, upload-time = "2026-05-11T18:53:21.227Z" }, + { url = "https://files.pythonhosted.org/packages/ea/dc/eb55135a1d5f0f0519f28da1f609a206d2cad1f9c35c32d51e38dd7261ae/pandas-3.0.3-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:261e308dfb22448384b7580cf719d2f998fe2966c92893c3e77d14008af1f066", size = 10420210, upload-time = "2026-05-11T18:53:23.982Z" }, + { url = "https://files.pythonhosted.org/packages/c6/3e/b1d5d955ce33ffecb407465a60bc32769d74fcf68224b7ae67ae11d4dea4/pandas-3.0.3-cp313-cp313t-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:dd1a5d1def6a46002e964510bdc67c368aa0951df5d1d9f8365336f5a1f490cd", size = 10336126, upload-time = "2026-05-11T18:53:26.731Z" }, + { url = "https://files.pythonhosted.org/packages/f5/76/a01261711ab60a22d71b862f0de20e4c504bf80457270ad8cb42110f6abc/pandas-3.0.3-cp313-cp313t-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:d72828c20c6d6e83e1e22a6a3b47b326b71664112fa9705dcbccfd7a39b62085", size = 10728051, upload-time = "2026-05-11T18:53:29.125Z" }, + { url = "https://files.pythonhosted.org/packages/e9/21/ea191195e587b18cf682e97f433f81b2d0fbe341380e80a3e0d6e4403c8e/pandas-3.0.3-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:d26cbe1fcfc12e8fd900e2454163e466b2d3af84f7c75481df7683ffc073d870", size = 11350796, upload-time = "2026-05-11T18:53:32.056Z" }, + { url = "https://files.pythonhosted.org/packages/64/69/f0eaaf54939f0e8c6768fd06be9af2cef9b36048b96dfb9e1b2c685a807e/pandas-3.0.3-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:3e91cec1879ada0624fc3dc9953c5cbd60208e59c0db28f540c5d6d47502422f", size = 11799741, upload-time = "2026-05-11T18:53:34.985Z" }, + { url = "https://files.pythonhosted.org/packages/45/a4/865e0e510cae5fc2194de4db28be638952de942571ba9125934fd9c01d47/pandas-3.0.3-cp313-cp313t-win_amd64.whl", hash = "sha256:08d789b41f87e0905880e293cedf6197ce71fe67cc081358b1e148a491b9bd13", size = 10499958, upload-time = "2026-05-11T18:53:37.857Z" }, + { url = "https://files.pythonhosted.org/packages/86/54/effdcc3c0ff7a08037889200e148ebe94c16c4f653be078c7b3675955df1/pandas-3.0.3-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:3650109c0f22879df8bd6179ab9ee3d7f1d1d4e7e0094a3f0032d9f51e2e64ac", size = 10336065, upload-time = "2026-05-11T18:53:41.099Z" }, + { url = "https://files.pythonhosted.org/packages/68/10/bf2d6738d72748b961a3751ab89522d58c54efc36a8e1a12161216cd45cf/pandas-3.0.3-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:bab900348131a7db1f69a7309ef141fd5680f1487094193bcbbb61791573bf8f", size = 9926101, upload-time = "2026-05-11T18:53:43.515Z" }, + { url = "https://files.pythonhosted.org/packages/ae/e9/e35cf11c8a136e757b956f5f0efdcaa50aecde85ea055f1898dfc68262f3/pandas-3.0.3-cp314-cp314-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:ba7e08b9ac1d54569cd1e256e3668975ed624d6826f7b68df0342b012007bddb", size = 10457553, upload-time = "2026-05-11T18:53:46.394Z" }, + { url = "https://files.pythonhosted.org/packages/58/3b/1cdec6772bdbaf7b25dab360c59f03cadf05492dd724c6540af905389b07/pandas-3.0.3-cp314-cp314-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:9d71c63ae4ebdbf70209742096f1fc46a83a0613c99d4b23766cced9ff8cd62a", size = 10914065, upload-time = "2026-05-11T18:53:49.134Z" }, + { url = "https://files.pythonhosted.org/packages/c4/c2/1ef644445fcd72e3627bceec77e3560636f87ddce4ed841afe76b83b5bf9/pandas-3.0.3-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:e3a2ec42c98ffa2565a67e08e218d06d72576d758d90facb7c00805194d8f360", size = 11459188, upload-time = "2026-05-11T18:53:52.527Z" }, + { url = "https://files.pythonhosted.org/packages/7e/49/4d8d4f42cbc9c4adc7a1870f269c02cbd6cd40d059622c06fb298addcbad/pandas-3.0.3-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:335f62418ed562cfc3c49e9e196375c28b729dcef8543abf4f9438e381bf3c76", size = 11982966, upload-time = "2026-05-11T18:53:55.043Z" }, + { url = "https://files.pythonhosted.org/packages/38/55/792619469bab9882d8bbd5865d45a72f6478762d04a9af4bf0d08c503e95/pandas-3.0.3-cp314-cp314-win_amd64.whl", hash = "sha256:3c20a521bbb85902f79f7270c80a59e1b5452d96d170c034f207181870f97ac5", size = 9876755, upload-time = "2026-05-11T18:53:58.067Z" }, + { url = "https://files.pythonhosted.org/packages/2a/af/33c469653b0ba03b50c3a98192d4c07f0c75c66b263ceb097fce0ee97d31/pandas-3.0.3-cp314-cp314-win_arm64.whl", hash = "sha256:a2d2dff8a04f3917b55ab3910c32990f8ddf7eceba114947838cefa976a68977", size = 9198658, upload-time = "2026-05-11T18:54:00.733Z" }, + { url = "https://files.pythonhosted.org/packages/a2/fa/b8c257bd76b8bd060c3a9151c1fca05e9b9c5e3af5d0f549c0356f6d143d/pandas-3.0.3-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:0d589105b3c14645af1738ff279b2995102d8f7a03b0a66dc8d95550eb513e04", size = 10787242, upload-time = "2026-05-11T18:54:03.564Z" }, + { url = "https://files.pythonhosted.org/packages/54/eb/f19206ffb0bf1919002969aa448b4702c6594845156a6f8050674855aac3/pandas-3.0.3-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:13fc1e853d9e04743d11ba75a985ccbc2a317fe07d8af61e445a6fd24dacd6a6", size = 10436369, upload-time = "2026-05-11T18:54:06.311Z" }, + { url = "https://files.pythonhosted.org/packages/fd/24/c7c39fb4fe22b71a0c2d78bf0c585c600092d85f94f086d2b3b2f6ca27e2/pandas-3.0.3-cp314-cp314t-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:819959dab7bbd0049c15623fbac4e29a191b9528160a61fb1032242d8ced2d9c", size = 10358306, upload-time = "2026-05-11T18:54:09.085Z" }, + { url = "https://files.pythonhosted.org/packages/16/ec/dd2a9eb7fa1204df88c0864164e35b228ac581062ac612ba0a67fd812e4c/pandas-3.0.3-cp314-cp314t-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:60ae316d3fd75d1858d450d0db0103ea2be3e7d4a95ec2f064f7e2ae63f7b028", size = 10758394, upload-time = "2026-05-11T18:54:11.956Z" }, + { url = "https://files.pythonhosted.org/packages/95/6e/00c61ea8e85b4f6d8d35e11852a1a4998fc7fafc91c6a602d1cc9c972d64/pandas-3.0.3-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:bd3a518890b400d32f9023722dc9a9a5c969f00b415419a3c06c043f09bb5d7d", size = 11375717, upload-time = "2026-05-11T18:54:14.539Z" }, + { url = "https://files.pythonhosted.org/packages/31/89/8fc1c268969fac43688d65fd92e67df24bd128d53cb4d2eee534cd307399/pandas-3.0.3-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:9c39be2d709d01fa972a0cabc522389fceca4f3969332ba25a7d6c5802cf976a", size = 11828897, upload-time = "2026-05-11T18:54:17.146Z" }, + { url = "https://files.pythonhosted.org/packages/56/3b/e7d20dea247a3e6dc0bd8a6953854afbedc03951def4e7371e05e7263e25/pandas-3.0.3-cp314-cp314t-win_amd64.whl", hash = "sha256:4db8c527972a821cf5286b40ccc57642a39bc62e62022b42f99f8a67fca8c3a1", size = 10900855, upload-time = "2026-05-11T18:54:19.72Z" }, + { url = "https://files.pythonhosted.org/packages/0f/54/68a0978d1ef8502b8492099beaa6e7a0c1b32e3b5d4f677f5810cb08711c/pandas-3.0.3-cp314-cp314t-win_arm64.whl", hash = "sha256:b2c95f8bfc1ee412bf482605d7bfd30c12d1d26bd59fdd91efeef1d4718decb1", size = 9466464, upload-time = "2026-05-11T18:54:22.754Z" }, +] + +[[package]] +name = "pandocfilters" +version = "1.5.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/70/6f/3dd4940bbe001c06a65f88e36bad298bc7a0de5036115639926b0c5c0458/pandocfilters-1.5.1.tar.gz", hash = "sha256:002b4a555ee4ebc03f8b66307e287fa492e4a77b4ea14d3f934328297bb4939e", size = 8454, upload-time = "2024-01-18T20:08:13.726Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/ef/af/4fbc8cab944db5d21b7e2a5b8e9211a03a79852b1157e2c102fcc61ac440/pandocfilters-1.5.1-py2.py3-none-any.whl", hash = "sha256:93be382804a9cdb0a7267585f157e5d1731bbe5545a85b268d6f5fe6232de2bc", size = 8663, upload-time = "2024-01-18T20:08:11.28Z" }, +] + +[[package]] +name = "parso" +version = "0.8.7" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/30/4b/90c937815137d43ce71ba043cd3566221e9df6b9c805f24b5d138c9d40a7/parso-0.8.7.tar.gz", hash = "sha256:eaaac4c9fdd5e9e8852dc778d2d7405897ec510f2a298071453e5e3a07914bb1", size = 401824, upload-time = "2026-05-01T23:13:02.138Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/99/5d/8268b644392ee874ee82a635cd0df1773de230bde356c38de28e298392cc/parso-0.8.7-py2.py3-none-any.whl", hash = "sha256:a8926eb2a1b915486941fdbd31e86a4baf88fe8c210f25f2f35ecec5b574ca1c", size = 107025, upload-time = "2026-05-01T23:12:58.867Z" }, +] + +[[package]] +name = "pexpect" +version = "4.9.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "ptyprocess", marker = "sys_platform != 'win32'" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/42/92/cc564bf6381ff43ce1f4d06852fc19a2f11d180f23dc32d9588bee2f149d/pexpect-4.9.0.tar.gz", hash = "sha256:ee7d41123f3c9911050ea2c2dac107568dc43b2d3b0c7557a33212c398ead30f", size = 166450, upload-time = "2023-11-25T09:07:26.339Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/9e/c3/059298687310d527a58bb01f3b1965787ee3b40dce76752eda8b44e9a2c5/pexpect-4.9.0-py2.py3-none-any.whl", hash = "sha256:7236d1e080e4936be2dc3e326cec0af72acf9212a7e1d060210e70a47e253523", size = 63772, upload-time = "2023-11-25T06:56:14.81Z" }, +] + +[[package]] +name = "pillow" +version = "12.2.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/8c/21/c2bcdd5906101a30244eaffc1b6e6ce71a31bd0742a01eb89e660ebfac2d/pillow-12.2.0.tar.gz", hash = "sha256:a830b1a40919539d07806aa58e1b114df53ddd43213d9c8b75847eee6c0182b5", size = 46987819, upload-time = "2026-04-01T14:46:17.687Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/68/e1/748f5663efe6edcfc4e74b2b93edfb9b8b99b67f21a854c3ae416500a2d9/pillow-12.2.0-cp311-cp311-macosx_10_10_x86_64.whl", hash = "sha256:8be29e59487a79f173507c30ddf57e733a357f67881430449bb32614075a40ab", size = 5354347, upload-time = "2026-04-01T14:42:44.255Z" }, + { url = "https://files.pythonhosted.org/packages/47/a1/d5ff69e747374c33a3b53b9f98cca7889fce1fd03d79cdc4e1bccc6c5a87/pillow-12.2.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:71cde9a1e1551df7d34a25462fc60325e8a11a82cc2e2f54578e5e9a1e153d65", size = 4695873, upload-time = "2026-04-01T14:42:46.452Z" }, + { url = "https://files.pythonhosted.org/packages/df/21/e3fbdf54408a973c7f7f89a23b2cb97a7ef30c61ab4142af31eee6aebc88/pillow-12.2.0-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:f490f9368b6fc026f021db16d7ec2fbf7d89e2edb42e8ec09d2c60505f5729c7", size = 6280168, upload-time = "2026-04-01T14:42:49.228Z" }, + { url = "https://files.pythonhosted.org/packages/d3/f1/00b7278c7dd52b17ad4329153748f87b6756ec195ff786c2bdf12518337d/pillow-12.2.0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:8bd7903a5f2a4545f6fd5935c90058b89d30045568985a71c79f5fd6edf9b91e", size = 8088188, upload-time = "2026-04-01T14:42:51.735Z" }, + { url = "https://files.pythonhosted.org/packages/ad/cf/220a5994ef1b10e70e85748b75649d77d506499352be135a4989c957b701/pillow-12.2.0-cp311-cp311-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:3997232e10d2920a68d25191392e3a4487d8183039e1c74c2297f00ed1c50705", size = 6394401, upload-time = "2026-04-01T14:42:54.343Z" }, + { url = "https://files.pythonhosted.org/packages/e9/bd/e51a61b1054f09437acfbc2ff9106c30d1eb76bc1453d428399946781253/pillow-12.2.0-cp311-cp311-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:e74473c875d78b8e9d5da2a70f7099549f9eb37ded4e2f6a463e60125bccd176", size = 7079655, upload-time = "2026-04-01T14:42:56.954Z" }, + { url = "https://files.pythonhosted.org/packages/6b/3d/45132c57d5fb4b5744567c3817026480ac7fc3ce5d4c47902bc0e7f6f853/pillow-12.2.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:56a3f9c60a13133a98ecff6197af34d7824de9b7b38c3654861a725c970c197b", size = 6503105, upload-time = "2026-04-01T14:42:59.847Z" }, + { url = "https://files.pythonhosted.org/packages/7d/2e/9df2fc1e82097b1df3dce58dc43286aa01068e918c07574711fcc53e6fb4/pillow-12.2.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:90e6f81de50ad6b534cab6e5aef77ff6e37722b2f5d908686f4a5c9eba17a909", size = 7203402, upload-time = "2026-04-01T14:43:02.664Z" }, + { url = "https://files.pythonhosted.org/packages/bd/2e/2941e42858ebb67e50ae741473de81c2984e6eff7b397017623c676e2e8d/pillow-12.2.0-cp311-cp311-win32.whl", hash = "sha256:8c984051042858021a54926eb597d6ee3012393ce9c181814115df4c60b9a808", size = 6378149, upload-time = "2026-04-01T14:43:05.274Z" }, + { url = "https://files.pythonhosted.org/packages/69/42/836b6f3cd7f3e5fa10a1f1a5420447c17966044c8fbf589cc0452d5502db/pillow-12.2.0-cp311-cp311-win_amd64.whl", hash = "sha256:6e6b2a0c538fc200b38ff9eb6628228b77908c319a005815f2dde585a0664b60", size = 7082626, upload-time = "2026-04-01T14:43:08.557Z" }, + { url = "https://files.pythonhosted.org/packages/c2/88/549194b5d6f1f494b485e493edc6693c0a16f4ada488e5bd974ed1f42fad/pillow-12.2.0-cp311-cp311-win_arm64.whl", hash = "sha256:9a8a34cc89c67a65ea7437ce257cea81a9dad65b29805f3ecee8c8fe8ff25ffe", size = 2463531, upload-time = "2026-04-01T14:43:10.743Z" }, + { url = "https://files.pythonhosted.org/packages/58/be/7482c8a5ebebbc6470b3eb791812fff7d5e0216c2be3827b30b8bb6603ed/pillow-12.2.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:2d192a155bbcec180f8564f693e6fd9bccff5a7af9b32e2e4bf8c9c69dbad6b5", size = 5308279, upload-time = "2026-04-01T14:43:13.246Z" }, + { url = "https://files.pythonhosted.org/packages/d8/95/0a351b9289c2b5cbde0bacd4a83ebc44023e835490a727b2a3bd60ddc0f4/pillow-12.2.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:f3f40b3c5a968281fd507d519e444c35f0ff171237f4fdde090dd60699458421", size = 4695490, upload-time = "2026-04-01T14:43:15.584Z" }, + { url = "https://files.pythonhosted.org/packages/de/af/4e8e6869cbed569d43c416fad3dc4ecb944cb5d9492defaed89ddd6fe871/pillow-12.2.0-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:03e7e372d5240cc23e9f07deca4d775c0817bffc641b01e9c3af208dbd300987", size = 6284462, upload-time = "2026-04-01T14:43:18.268Z" }, + { url = "https://files.pythonhosted.org/packages/e9/9e/c05e19657fd57841e476be1ab46c4d501bffbadbafdc31a6d665f8b737b6/pillow-12.2.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:b86024e52a1b269467a802258c25521e6d742349d760728092e1bc2d135b4d76", size = 8094744, upload-time = "2026-04-01T14:43:20.716Z" }, + { url = "https://files.pythonhosted.org/packages/2b/54/1789c455ed10176066b6e7e6da1b01e50e36f94ba584dc68d9eebfe9156d/pillow-12.2.0-cp312-cp312-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:7371b48c4fa448d20d2714c9a1f775a81155050d383333e0a6c15b1123dda005", size = 6398371, upload-time = "2026-04-01T14:43:23.443Z" }, + { url = "https://files.pythonhosted.org/packages/43/e3/fdc657359e919462369869f1c9f0e973f353f9a9ee295a39b1fea8ee1a77/pillow-12.2.0-cp312-cp312-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:62f5409336adb0663b7caa0da5c7d9e7bdbaae9ce761d34669420c2a801b2780", size = 7087215, upload-time = "2026-04-01T14:43:26.758Z" }, + { url = "https://files.pythonhosted.org/packages/8b/f8/2f6825e441d5b1959d2ca5adec984210f1ec086435b0ed5f52c19b3b8a6e/pillow-12.2.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:01afa7cf67f74f09523699b4e88c73fb55c13346d212a59a2db1f86b0a63e8c5", size = 6509783, upload-time = "2026-04-01T14:43:29.56Z" }, + { url = "https://files.pythonhosted.org/packages/67/f9/029a27095ad20f854f9dba026b3ea6428548316e057e6fc3545409e86651/pillow-12.2.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:fc3d34d4a8fbec3e88a79b92e5465e0f9b842b628675850d860b8bd300b159f5", size = 7212112, upload-time = "2026-04-01T14:43:32.091Z" }, + { url = "https://files.pythonhosted.org/packages/be/42/025cfe05d1be22dbfdb4f264fe9de1ccda83f66e4fc3aac94748e784af04/pillow-12.2.0-cp312-cp312-win32.whl", hash = "sha256:58f62cc0f00fd29e64b29f4fd923ffdb3859c9f9e6105bfc37ba1d08994e8940", size = 6378489, upload-time = "2026-04-01T14:43:34.601Z" }, + { url = "https://files.pythonhosted.org/packages/5d/7b/25a221d2c761c6a8ae21bfa3874988ff2583e19cf8a27bf2fee358df7942/pillow-12.2.0-cp312-cp312-win_amd64.whl", hash = "sha256:7f84204dee22a783350679a0333981df803dac21a0190d706a50475e361c93f5", size = 7084129, upload-time = "2026-04-01T14:43:37.213Z" }, + { url = "https://files.pythonhosted.org/packages/10/e1/542a474affab20fd4a0f1836cb234e8493519da6b76899e30bcc5d990b8b/pillow-12.2.0-cp312-cp312-win_arm64.whl", hash = "sha256:af73337013e0b3b46f175e79492d96845b16126ddf79c438d7ea7ff27783a414", size = 2463612, upload-time = "2026-04-01T14:43:39.421Z" }, + { url = "https://files.pythonhosted.org/packages/4a/01/53d10cf0dbad820a8db274d259a37ba50b88b24768ddccec07355382d5ad/pillow-12.2.0-cp313-cp313-ios_13_0_arm64_iphoneos.whl", hash = "sha256:8297651f5b5679c19968abefd6bb84d95fe30ef712eb1b2d9b2d31ca61267f4c", size = 4100837, upload-time = "2026-04-01T14:43:41.506Z" }, + { url = "https://files.pythonhosted.org/packages/0f/98/f3a6657ecb698c937f6c76ee564882945f29b79bad496abcba0e84659ec5/pillow-12.2.0-cp313-cp313-ios_13_0_arm64_iphonesimulator.whl", hash = "sha256:50d8520da2a6ce0af445fa6d648c4273c3eeefbc32d7ce049f22e8b5c3daecc2", size = 4176528, upload-time = "2026-04-01T14:43:43.773Z" }, + { url = "https://files.pythonhosted.org/packages/69/bc/8986948f05e3ea490b8442ea1c1d4d990b24a7e43d8a51b2c7d8b1dced36/pillow-12.2.0-cp313-cp313-ios_13_0_x86_64_iphonesimulator.whl", hash = "sha256:766cef22385fa1091258ad7e6216792b156dc16d8d3fa607e7545b2b72061f1c", size = 3640401, upload-time = "2026-04-01T14:43:45.87Z" }, + { url = "https://files.pythonhosted.org/packages/34/46/6c717baadcd62bc8ed51d238d521ab651eaa74838291bda1f86fe1f864c9/pillow-12.2.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:5d2fd0fa6b5d9d1de415060363433f28da8b1526c1c129020435e186794b3795", size = 5308094, upload-time = "2026-04-01T14:43:48.438Z" }, + { url = "https://files.pythonhosted.org/packages/71/43/905a14a8b17fdb1ccb58d282454490662d2cb89a6bfec26af6d3520da5ec/pillow-12.2.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:56b25336f502b6ed02e889f4ece894a72612fe885889a6e8c4c80239ff6e5f5f", size = 4695402, upload-time = "2026-04-01T14:43:51.292Z" }, + { url = "https://files.pythonhosted.org/packages/73/dd/42107efcb777b16fa0393317eac58f5b5cf30e8392e266e76e51cff28c3d/pillow-12.2.0-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:f1c943e96e85df3d3478f7b691f229887e143f81fedab9b20205349ab04d73ed", size = 6280005, upload-time = "2026-04-01T14:43:54.242Z" }, + { url = "https://files.pythonhosted.org/packages/a8/68/b93e09e5e8549019e61acf49f65b1a8530765a7f812c77a7461bca7e4494/pillow-12.2.0-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:03f6fab9219220f041c74aeaa2939ff0062bd5c364ba9ce037197f4c6d498cd9", size = 8090669, upload-time = "2026-04-01T14:43:57.335Z" }, + { url = "https://files.pythonhosted.org/packages/4b/6e/3ccb54ce8ec4ddd1accd2d89004308b7b0b21c4ac3d20fa70af4760a4330/pillow-12.2.0-cp313-cp313-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:5cdfebd752ec52bf5bb4e35d9c64b40826bc5b40a13df7c3cda20a2c03a0f5ed", size = 6395194, upload-time = "2026-04-01T14:43:59.864Z" }, + { url = "https://files.pythonhosted.org/packages/67/ee/21d4e8536afd1a328f01b359b4d3997b291ffd35a237c877b331c1c3b71c/pillow-12.2.0-cp313-cp313-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:eedf4b74eda2b5a4b2b2fb4c006d6295df3bf29e459e198c90ea48e130dc75c3", size = 7082423, upload-time = "2026-04-01T14:44:02.74Z" }, + { url = "https://files.pythonhosted.org/packages/78/5f/e9f86ab0146464e8c133fe85df987ed9e77e08b29d8d35f9f9f4d6f917ba/pillow-12.2.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:00a2865911330191c0b818c59103b58a5e697cae67042366970a6b6f1b20b7f9", size = 6505667, upload-time = "2026-04-01T14:44:05.381Z" }, + { url = "https://files.pythonhosted.org/packages/ed/1e/409007f56a2fdce61584fd3acbc2bbc259857d555196cedcadc68c015c82/pillow-12.2.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:1e1757442ed87f4912397c6d35a0db6a7b52592156014706f17658ff58bbf795", size = 7208580, upload-time = "2026-04-01T14:44:08.39Z" }, + { url = "https://files.pythonhosted.org/packages/23/c4/7349421080b12fb35414607b8871e9534546c128a11965fd4a7002ccfbee/pillow-12.2.0-cp313-cp313-win32.whl", hash = "sha256:144748b3af2d1b358d41286056d0003f47cb339b8c43a9ea42f5fea4d8c66b6e", size = 6375896, upload-time = "2026-04-01T14:44:11.197Z" }, + { url = "https://files.pythonhosted.org/packages/3f/82/8a3739a5e470b3c6cbb1d21d315800d8e16bff503d1f16b03a4ec3212786/pillow-12.2.0-cp313-cp313-win_amd64.whl", hash = "sha256:390ede346628ccc626e5730107cde16c42d3836b89662a115a921f28440e6a3b", size = 7081266, upload-time = "2026-04-01T14:44:13.947Z" }, + { url = "https://files.pythonhosted.org/packages/c3/25/f968f618a062574294592f668218f8af564830ccebdd1fa6200f598e65c5/pillow-12.2.0-cp313-cp313-win_arm64.whl", hash = "sha256:8023abc91fba39036dbce14a7d6535632f99c0b857807cbbbf21ecc9f4717f06", size = 2463508, upload-time = "2026-04-01T14:44:16.312Z" }, + { url = "https://files.pythonhosted.org/packages/4d/a4/b342930964e3cb4dce5038ae34b0eab4653334995336cd486c5a8c25a00c/pillow-12.2.0-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:042db20a421b9bafecc4b84a8b6e444686bd9d836c7fd24542db3e7df7baad9b", size = 5309927, upload-time = "2026-04-01T14:44:18.89Z" }, + { url = "https://files.pythonhosted.org/packages/9f/de/23198e0a65a9cf06123f5435a5d95cea62a635697f8f03d134d3f3a96151/pillow-12.2.0-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:dd025009355c926a84a612fecf58bb315a3f6814b17ead51a8e48d3823d9087f", size = 4698624, upload-time = "2026-04-01T14:44:21.115Z" }, + { url = "https://files.pythonhosted.org/packages/01/a6/1265e977f17d93ea37aa28aa81bad4fa597933879fac2520d24e021c8da3/pillow-12.2.0-cp313-cp313t-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:88ddbc66737e277852913bd1e07c150cc7bb124539f94c4e2df5344494e0a612", size = 6321252, upload-time = "2026-04-01T14:44:23.663Z" }, + { url = "https://files.pythonhosted.org/packages/3c/83/5982eb4a285967baa70340320be9f88e57665a387e3a53a7f0db8231a0cd/pillow-12.2.0-cp313-cp313t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:d362d1878f00c142b7e1a16e6e5e780f02be8195123f164edf7eddd911eefe7c", size = 8126550, upload-time = "2026-04-01T14:44:26.772Z" }, + { url = "https://files.pythonhosted.org/packages/4e/48/6ffc514adce69f6050d0753b1a18fd920fce8cac87620d5a31231b04bfc5/pillow-12.2.0-cp313-cp313t-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:2c727a6d53cb0018aadd8018c2b938376af27914a68a492f59dfcaca650d5eea", size = 6433114, upload-time = "2026-04-01T14:44:29.615Z" }, + { url = "https://files.pythonhosted.org/packages/36/a3/f9a77144231fb8d40ee27107b4463e205fa4677e2ca2548e14da5cf18dce/pillow-12.2.0-cp313-cp313t-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:efd8c21c98c5cc60653bcb311bef2ce0401642b7ce9d09e03a7da87c878289d4", size = 7115667, upload-time = "2026-04-01T14:44:32.773Z" }, + { url = "https://files.pythonhosted.org/packages/c1/fc/ac4ee3041e7d5a565e1c4fd72a113f03b6394cc72ab7089d27608f8aaccb/pillow-12.2.0-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:9f08483a632889536b8139663db60f6724bfcb443c96f1b18855860d7d5c0fd4", size = 6538966, upload-time = "2026-04-01T14:44:35.252Z" }, + { url = "https://files.pythonhosted.org/packages/c0/a8/27fb307055087f3668f6d0a8ccb636e7431d56ed0750e07a60547b1e083e/pillow-12.2.0-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:dac8d77255a37e81a2efcbd1fc05f1c15ee82200e6c240d7e127e25e365c39ea", size = 7238241, upload-time = "2026-04-01T14:44:37.875Z" }, + { url = "https://files.pythonhosted.org/packages/ad/4b/926ab182c07fccae9fcb120043464e1ff1564775ec8864f21a0ebce6ac25/pillow-12.2.0-cp313-cp313t-win32.whl", hash = "sha256:ee3120ae9dff32f121610bb08e4313be87e03efeadfc6c0d18f89127e24d0c24", size = 6379592, upload-time = "2026-04-01T14:44:40.336Z" }, + { url = "https://files.pythonhosted.org/packages/c2/c4/f9e476451a098181b30050cc4c9a3556b64c02cf6497ea421ac047e89e4b/pillow-12.2.0-cp313-cp313t-win_amd64.whl", hash = "sha256:325ca0528c6788d2a6c3d40e3568639398137346c3d6e66bb61db96b96511c98", size = 7085542, upload-time = "2026-04-01T14:44:43.251Z" }, + { url = "https://files.pythonhosted.org/packages/00/a4/285f12aeacbe2d6dc36c407dfbbe9e96d4a80b0fb710a337f6d2ad978c75/pillow-12.2.0-cp313-cp313t-win_arm64.whl", hash = "sha256:2e5a76d03a6c6dcef67edabda7a52494afa4035021a79c8558e14af25313d453", size = 2465765, upload-time = "2026-04-01T14:44:45.996Z" }, + { url = "https://files.pythonhosted.org/packages/bf/98/4595daa2365416a86cb0d495248a393dfc84e96d62ad080c8546256cb9c0/pillow-12.2.0-cp314-cp314-ios_13_0_arm64_iphoneos.whl", hash = "sha256:3adc9215e8be0448ed6e814966ecf3d9952f0ea40eb14e89a102b87f450660d8", size = 4100848, upload-time = "2026-04-01T14:44:48.48Z" }, + { url = "https://files.pythonhosted.org/packages/0b/79/40184d464cf89f6663e18dfcf7ca21aae2491fff1a16127681bf1fa9b8cf/pillow-12.2.0-cp314-cp314-ios_13_0_arm64_iphonesimulator.whl", hash = "sha256:6a9adfc6d24b10f89588096364cc726174118c62130c817c2837c60cf08a392b", size = 4176515, upload-time = "2026-04-01T14:44:51.353Z" }, + { url = "https://files.pythonhosted.org/packages/b0/63/703f86fd4c422a9cf722833670f4f71418fb116b2853ff7da722ea43f184/pillow-12.2.0-cp314-cp314-ios_13_0_x86_64_iphonesimulator.whl", hash = "sha256:6a6e67ea2e6feda684ed370f9a1c52e7a243631c025ba42149a2cc5934dec295", size = 3640159, upload-time = "2026-04-01T14:44:53.588Z" }, + { url = "https://files.pythonhosted.org/packages/71/e0/fb22f797187d0be2270f83500aab851536101b254bfa1eae10795709d283/pillow-12.2.0-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:2bb4a8d594eacdfc59d9e5ad972aa8afdd48d584ffd5f13a937a664c3e7db0ed", size = 5312185, upload-time = "2026-04-01T14:44:56.039Z" }, + { url = "https://files.pythonhosted.org/packages/ba/8c/1a9e46228571de18f8e28f16fabdfc20212a5d019f3e3303452b3f0a580d/pillow-12.2.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:80b2da48193b2f33ed0c32c38140f9d3186583ce7d516526d462645fd98660ae", size = 4695386, upload-time = "2026-04-01T14:44:58.663Z" }, + { url = "https://files.pythonhosted.org/packages/70/62/98f6b7f0c88b9addd0e87c217ded307b36be024d4ff8869a812b241d1345/pillow-12.2.0-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:22db17c68434de69d8ecfc2fe821569195c0c373b25cccb9cbdacf2c6e53c601", size = 6280384, upload-time = "2026-04-01T14:45:01.5Z" }, + { url = "https://files.pythonhosted.org/packages/5e/03/688747d2e91cfbe0e64f316cd2e8005698f76ada3130d0194664174fa5de/pillow-12.2.0-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:7b14cc0106cd9aecda615dd6903840a058b4700fcb817687d0ee4fc8b6e389be", size = 8091599, upload-time = "2026-04-01T14:45:04.5Z" }, + { url = "https://files.pythonhosted.org/packages/f6/35/577e22b936fcdd66537329b33af0b4ccfefaeabd8aec04b266528cddb33c/pillow-12.2.0-cp314-cp314-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:8cbeb542b2ebc6fcdacabf8aca8c1a97c9b3ad3927d46b8723f9d4f033288a0f", size = 6396021, upload-time = "2026-04-01T14:45:07.117Z" }, + { url = "https://files.pythonhosted.org/packages/11/8d/d2532ad2a603ca2b93ad9f5135732124e57811d0168155852f37fbce2458/pillow-12.2.0-cp314-cp314-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:4bfd07bc812fbd20395212969e41931001fd59eb55a60658b0e5710872e95286", size = 7083360, upload-time = "2026-04-01T14:45:09.763Z" }, + { url = "https://files.pythonhosted.org/packages/5e/26/d325f9f56c7e039034897e7380e9cc202b1e368bfd04d4cbe6a441f02885/pillow-12.2.0-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:9aba9a17b623ef750a4d11b742cbafffeb48a869821252b30ee21b5e91392c50", size = 6507628, upload-time = "2026-04-01T14:45:12.378Z" }, + { url = "https://files.pythonhosted.org/packages/5f/f7/769d5632ffb0988f1c5e7660b3e731e30f7f8ec4318e94d0a5d674eb65a4/pillow-12.2.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:deede7c263feb25dba4e82ea23058a235dcc2fe1f6021025dc71f2b618e26104", size = 7209321, upload-time = "2026-04-01T14:45:15.122Z" }, + { url = "https://files.pythonhosted.org/packages/6a/7a/c253e3c645cd47f1aceea6a8bacdba9991bf45bb7dfe927f7c893e89c93c/pillow-12.2.0-cp314-cp314-win32.whl", hash = "sha256:632ff19b2778e43162304d50da0181ce24ac5bb8180122cbe1bf4673428328c7", size = 6479723, upload-time = "2026-04-01T14:45:17.797Z" }, + { url = "https://files.pythonhosted.org/packages/cd/8b/601e6566b957ca50e28725cb6c355c59c2c8609751efbecd980db44e0349/pillow-12.2.0-cp314-cp314-win_amd64.whl", hash = "sha256:4e6c62e9d237e9b65fac06857d511e90d8461a32adcc1b9065ea0c0fa3a28150", size = 7217400, upload-time = "2026-04-01T14:45:20.529Z" }, + { url = "https://files.pythonhosted.org/packages/d6/94/220e46c73065c3e2951bb91c11a1fb636c8c9ad427ac3ce7d7f3359b9b2f/pillow-12.2.0-cp314-cp314-win_arm64.whl", hash = "sha256:b1c1fbd8a5a1af3412a0810d060a78b5136ec0836c8a4ef9aa11807f2a22f4e1", size = 2554835, upload-time = "2026-04-01T14:45:23.162Z" }, + { url = "https://files.pythonhosted.org/packages/b6/ab/1b426a3974cb0e7da5c29ccff4807871d48110933a57207b5a676cccc155/pillow-12.2.0-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:57850958fe9c751670e49b2cecf6294acc99e562531f4bd317fa5ddee2068463", size = 5314225, upload-time = "2026-04-01T14:45:25.637Z" }, + { url = "https://files.pythonhosted.org/packages/19/1e/dce46f371be2438eecfee2a1960ee2a243bbe5e961890146d2dee1ff0f12/pillow-12.2.0-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:d5d38f1411c0ed9f97bcb49b7bd59b6b7c314e0e27420e34d99d844b9ce3b6f3", size = 4698541, upload-time = "2026-04-01T14:45:28.355Z" }, + { url = "https://files.pythonhosted.org/packages/55/c3/7fbecf70adb3a0c33b77a300dc52e424dc22ad8cdc06557a2e49523b703d/pillow-12.2.0-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:5c0a9f29ca8e79f09de89293f82fc9b0270bb4af1d58bc98f540cc4aedf03166", size = 6322251, upload-time = "2026-04-01T14:45:30.924Z" }, + { url = "https://files.pythonhosted.org/packages/1c/3c/7fbc17cfb7e4fe0ef1642e0abc17fc6c94c9f7a16be41498e12e2ba60408/pillow-12.2.0-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:1610dd6c61621ae1cf811bef44d77e149ce3f7b95afe66a4512f8c59f25d9ebe", size = 8127807, upload-time = "2026-04-01T14:45:33.908Z" }, + { url = "https://files.pythonhosted.org/packages/ff/c3/a8ae14d6defd2e448493ff512fae903b1e9bd40b72efb6ec55ce0048c8ce/pillow-12.2.0-cp314-cp314t-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:0a34329707af4f73cf1782a36cd2289c0368880654a2c11f027bcee9052d35dd", size = 6433935, upload-time = "2026-04-01T14:45:36.623Z" }, + { url = "https://files.pythonhosted.org/packages/6e/32/2880fb3a074847ac159d8f902cb43278a61e85f681661e7419e6596803ed/pillow-12.2.0-cp314-cp314t-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:8e9c4f5b3c546fa3458a29ab22646c1c6c787ea8f5ef51300e5a60300736905e", size = 7116720, upload-time = "2026-04-01T14:45:39.258Z" }, + { url = "https://files.pythonhosted.org/packages/46/87/495cc9c30e0129501643f24d320076f4cc54f718341df18cc70ec94c44e1/pillow-12.2.0-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:fb043ee2f06b41473269765c2feae53fc2e2fbf96e5e22ca94fb5ad677856f06", size = 6540498, upload-time = "2026-04-01T14:45:41.879Z" }, + { url = "https://files.pythonhosted.org/packages/18/53/773f5edca692009d883a72211b60fdaf8871cbef075eaa9d577f0a2f989e/pillow-12.2.0-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:f278f034eb75b4e8a13a54a876cc4a5ab39173d2cdd93a638e1b467fc545ac43", size = 7239413, upload-time = "2026-04-01T14:45:44.705Z" }, + { url = "https://files.pythonhosted.org/packages/c9/e4/4b64a97d71b2a83158134abbb2f5bd3f8a2ea691361282f010998f339ec7/pillow-12.2.0-cp314-cp314t-win32.whl", hash = "sha256:6bb77b2dcb06b20f9f4b4a8454caa581cd4dd0643a08bacf821216a16d9c8354", size = 6482084, upload-time = "2026-04-01T14:45:47.568Z" }, + { url = "https://files.pythonhosted.org/packages/ba/13/306d275efd3a3453f72114b7431c877d10b1154014c1ebbedd067770d629/pillow-12.2.0-cp314-cp314t-win_amd64.whl", hash = "sha256:6562ace0d3fb5f20ed7290f1f929cae41b25ae29528f2af1722966a0a02e2aa1", size = 7225152, upload-time = "2026-04-01T14:45:50.032Z" }, + { url = "https://files.pythonhosted.org/packages/ff/6e/cf826fae916b8658848d7b9f38d88da6396895c676e8086fc0988073aaf8/pillow-12.2.0-cp314-cp314t-win_arm64.whl", hash = "sha256:aa88ccfe4e32d362816319ed727a004423aab09c5cea43c01a4b435643fa34eb", size = 2556579, upload-time = "2026-04-01T14:45:52.529Z" }, + { url = "https://files.pythonhosted.org/packages/4e/b7/2437044fb910f499610356d1352e3423753c98e34f915252aafecc64889f/pillow-12.2.0-pp311-pypy311_pp73-macosx_10_15_x86_64.whl", hash = "sha256:0538bd5e05efec03ae613fd89c4ce0368ecd2ba239cc25b9f9be7ed426b0af1f", size = 5273969, upload-time = "2026-04-01T14:45:55.538Z" }, + { url = "https://files.pythonhosted.org/packages/f6/f4/8316e31de11b780f4ac08ef3654a75555e624a98db1056ecb2122d008d5a/pillow-12.2.0-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:394167b21da716608eac917c60aa9b969421b5dcbbe02ae7f013e7b85811c69d", size = 4659674, upload-time = "2026-04-01T14:45:58.093Z" }, + { url = "https://files.pythonhosted.org/packages/d4/37/664fca7201f8bb2aa1d20e2c3d5564a62e6ae5111741966c8319ca802361/pillow-12.2.0-pp311-pypy311_pp73-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:5d04bfa02cc2d23b497d1e90a0f927070043f6cbf303e738300532379a4b4e0f", size = 5288479, upload-time = "2026-04-01T14:46:01.141Z" }, + { url = "https://files.pythonhosted.org/packages/49/62/5b0ed78fce87346be7a5cfcfaaad91f6a1f98c26f86bdbafa2066c647ef6/pillow-12.2.0-pp311-pypy311_pp73-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:0c838a5125cee37e68edec915651521191cef1e6aa336b855f495766e77a366e", size = 7032230, upload-time = "2026-04-01T14:46:03.874Z" }, + { url = "https://files.pythonhosted.org/packages/c3/28/ec0fc38107fc32536908034e990c47914c57cd7c5a3ece4d8d8f7ffd7e27/pillow-12.2.0-pp311-pypy311_pp73-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:4a6c9fa44005fa37a91ebfc95d081e8079757d2e904b27103f4f5fa6f0bf78c0", size = 5355404, upload-time = "2026-04-01T14:46:06.33Z" }, + { url = "https://files.pythonhosted.org/packages/5e/8b/51b0eddcfa2180d60e41f06bd6d0a62202b20b59c68f5a132e615b75aecf/pillow-12.2.0-pp311-pypy311_pp73-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:25373b66e0dd5905ed63fa3cae13c82fbddf3079f2c8bf15c6fb6a35586324c1", size = 6002215, upload-time = "2026-04-01T14:46:08.83Z" }, + { url = "https://files.pythonhosted.org/packages/bc/60/5382c03e1970de634027cee8e1b7d39776b778b81812aaf45b694dfe9e28/pillow-12.2.0-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:bfa9c230d2fe991bed5318a5f119bd6780cda2915cca595393649fc118ab895e", size = 7080946, upload-time = "2026-04-01T14:46:11.734Z" }, +] + +[[package]] +name = "pint" +version = "0.25.3" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "flexcache" }, + { name = "flexparser" }, + { name = "platformdirs" }, + { name = "typing-extensions" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/52/9d/b1379cdbd33a49d17d627bc24e2b63cca06a1c5343b38072d2889499e82e/pint-0.25.3.tar.gz", hash = "sha256:f8f5df6cf65314d74da1ade1bf96f8e3e4d0c41b51577ac53c49e7d44ca5acee", size = 255106, upload-time = "2026-03-19T21:57:08.72Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/1b/dd/a9fe6a0a09512da23951c68bf36466aeecd89def3183dc095edbc807ddc5/pint-0.25.3-py3-none-any.whl", hash = "sha256:27eb25143bd5de9fcc4d5a4b484f16faf6b4615aa93ece6b3373a8c1a3c1b97d", size = 307488, upload-time = "2026-03-19T21:57:07.022Z" }, +] + +[[package]] +name = "platformdirs" +version = "4.10.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/d7/47/e4501f49c178ae1d9f4a75073fda4204f52647993f075a9db4d14930e0c5/platformdirs-4.10.0.tar.gz", hash = "sha256:31e761a6a0ca04faf7353ea759bdba55652be214725111e5aac52dfa29d4bef7", size = 31224, upload-time = "2026-05-28T03:32:53.587Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/81/e6/cd9575ac904136b3cbf7aa7ee819ef86eedb7274e46f230e94ea4342e729/platformdirs-4.10.0-py3-none-any.whl", hash = "sha256:fb516cdb12eb0d857d0cd85a7c57cea4d060bee4578d6cf5a14dfdf8cbf8784a", size = 22743, upload-time = "2026-05-28T03:32:52.175Z" }, +] + +[[package]] +name = "plotly" +version = "6.7.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "narwhals" }, + { name = "packaging" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/3a/7f/0f100df1172aadf88a929a9dbb902656b0880ba4b960fe5224867159d8f4/plotly-6.7.0.tar.gz", hash = "sha256:45eea0ff27e2a23ccd62776f77eb43aa1ca03df4192b76036e380bb479b892c6", size = 6911286, upload-time = "2026-04-09T20:36:45.738Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/90/ad/cba91b3bcf04073e4d1655a5c1710ef3f457f56f7d1b79dcc3d72f4dd912/plotly-6.7.0-py3-none-any.whl", hash = "sha256:ac8aca1c25c663a59b5b9140a549264a5badde2e057d79b8c772ae2920e32ff0", size = 9898444, upload-time = "2026-04-09T20:36:39.812Z" }, +] + +[[package]] +name = "pluggy" +version = "1.6.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/f9/e2/3e91f31a7d2b083fe6ef3fa267035b518369d9511ffab804f839851d2779/pluggy-1.6.0.tar.gz", hash = "sha256:7dcc130b76258d33b90f61b658791dede3486c3e6bfb003ee5c9bfb396dd22f3", size = 69412, upload-time = "2025-05-15T12:30:07.975Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/54/20/4d324d65cc6d9205fabedc306948156824eb9f0ee1633355a8f7ec5c66bf/pluggy-1.6.0-py3-none-any.whl", hash = "sha256:e920276dd6813095e9377c0bc5566d94c932c33b27a3e3945d8389c374dd4746", size = 20538, upload-time = "2025-05-15T12:30:06.134Z" }, +] + +[[package]] +name = "prometheus-client" +version = "0.25.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/1b/fb/d9aa83ffe43ce1f19e557c0971d04b90561b0cfd50762aafb01968285553/prometheus_client-0.25.0.tar.gz", hash = "sha256:5e373b75c31afb3c86f1a52fa1ad470c9aace18082d39ec0d2f918d11cc9ba28", size = 86035, upload-time = "2026-04-09T19:53:42.359Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/8d/9b/d4b1e644385499c8346fa9b622a3f030dce14cd6ef8a1871c221a17a67e7/prometheus_client-0.25.0-py3-none-any.whl", hash = "sha256:d5aec89e349a6ec230805d0df882f3807f74fd6c1a2fa86864e3c2279059fed1", size = 64154, upload-time = "2026-04-09T19:53:41.324Z" }, +] + +[[package]] +name = "prompt-toolkit" +version = "3.0.52" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "wcwidth" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/a1/96/06e01a7b38dce6fe1db213e061a4602dd6032a8a97ef6c1a862537732421/prompt_toolkit-3.0.52.tar.gz", hash = "sha256:28cde192929c8e7321de85de1ddbe736f1375148b02f2e17edd840042b1be855", size = 434198, upload-time = "2025-08-27T15:24:02.057Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/84/03/0d3ce49e2505ae70cf43bc5bb3033955d2fc9f932163e84dc0779cc47f48/prompt_toolkit-3.0.52-py3-none-any.whl", hash = "sha256:9aac639a3bbd33284347de5ad8d68ecc044b91a762dc39b7c21095fcd6a19955", size = 391431, upload-time = "2025-08-27T15:23:59.498Z" }, +] + +[[package]] +name = "protobuf" +version = "6.33.6" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/66/70/e908e9c5e52ef7c3a6c7902c9dfbb34c7e29c25d2f81ade3856445fd5c94/protobuf-6.33.6.tar.gz", hash = "sha256:a6768d25248312c297558af96a9f9c929e8c4cee0659cb07e780731095f38135", size = 444531, upload-time = "2026-03-18T19:05:00.988Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/fc/9f/2f509339e89cfa6f6a4c4ff50438db9ca488dec341f7e454adad60150b00/protobuf-6.33.6-cp310-abi3-win32.whl", hash = "sha256:7d29d9b65f8afef196f8334e80d6bc1d5d4adedb449971fefd3723824e6e77d3", size = 425739, upload-time = "2026-03-18T19:04:48.373Z" }, + { url = "https://files.pythonhosted.org/packages/76/5d/683efcd4798e0030c1bab27374fd13a89f7c2515fb1f3123efdfaa5eab57/protobuf-6.33.6-cp310-abi3-win_amd64.whl", hash = "sha256:0cd27b587afca21b7cfa59a74dcbd48a50f0a6400cfb59391340ad729d91d326", size = 437089, upload-time = "2026-03-18T19:04:50.381Z" }, + { url = "https://files.pythonhosted.org/packages/5c/01/a3c3ed5cd186f39e7880f8303cc51385a198a81469d53d0fdecf1f64d929/protobuf-6.33.6-cp39-abi3-macosx_10_9_universal2.whl", hash = "sha256:9720e6961b251bde64edfdab7d500725a2af5280f3f4c87e57c0208376aa8c3a", size = 427737, upload-time = "2026-03-18T19:04:51.866Z" }, + { url = "https://files.pythonhosted.org/packages/ee/90/b3c01fdec7d2f627b3a6884243ba328c1217ed2d978def5c12dc50d328a3/protobuf-6.33.6-cp39-abi3-manylinux2014_aarch64.whl", hash = "sha256:e2afbae9b8e1825e3529f88d514754e094278bb95eadc0e199751cdd9a2e82a2", size = 324610, upload-time = "2026-03-18T19:04:53.096Z" }, + { url = "https://files.pythonhosted.org/packages/9b/ca/25afc144934014700c52e05103c2421997482d561f3101ff352e1292fb81/protobuf-6.33.6-cp39-abi3-manylinux2014_s390x.whl", hash = "sha256:c96c37eec15086b79762ed265d59ab204dabc53056e3443e702d2681f4b39ce3", size = 339381, upload-time = "2026-03-18T19:04:54.616Z" }, + { url = "https://files.pythonhosted.org/packages/16/92/d1e32e3e0d894fe00b15ce28ad4944ab692713f2e7f0a99787405e43533a/protobuf-6.33.6-cp39-abi3-manylinux2014_x86_64.whl", hash = "sha256:e9db7e292e0ab79dd108d7f1a94fe31601ce1ee3f7b79e0692043423020b0593", size = 323436, upload-time = "2026-03-18T19:04:55.768Z" }, + { url = "https://files.pythonhosted.org/packages/c4/72/02445137af02769918a93807b2b7890047c32bfb9f90371cbc12688819eb/protobuf-6.33.6-py3-none-any.whl", hash = "sha256:77179e006c476e69bf8e8ce866640091ec42e1beb80b213c3900006ecfba6901", size = 170656, upload-time = "2026-03-18T19:04:59.826Z" }, +] + +[[package]] +name = "psutil" +version = "7.2.2" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/aa/c6/d1ddf4abb55e93cebc4f2ed8b5d6dbad109ecb8d63748dd2b20ab5e57ebe/psutil-7.2.2.tar.gz", hash = "sha256:0746f5f8d406af344fd547f1c8daa5f5c33dbc293bb8d6a16d80b4bb88f59372", size = 493740, upload-time = "2026-01-28T18:14:54.428Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/51/08/510cbdb69c25a96f4ae523f733cdc963ae654904e8db864c07585ef99875/psutil-7.2.2-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:2edccc433cbfa046b980b0df0171cd25bcaeb3a68fe9022db0979e7aa74a826b", size = 130595, upload-time = "2026-01-28T18:14:57.293Z" }, + { url = "https://files.pythonhosted.org/packages/d6/f5/97baea3fe7a5a9af7436301f85490905379b1c6f2dd51fe3ecf24b4c5fbf/psutil-7.2.2-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:e78c8603dcd9a04c7364f1a3e670cea95d51ee865e4efb3556a3a63adef958ea", size = 131082, upload-time = "2026-01-28T18:14:59.732Z" }, + { url = "https://files.pythonhosted.org/packages/37/d6/246513fbf9fa174af531f28412297dd05241d97a75911ac8febefa1a53c6/psutil-7.2.2-cp313-cp313t-manylinux2010_x86_64.manylinux_2_12_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:1a571f2330c966c62aeda00dd24620425d4b0cc86881c89861fbc04549e5dc63", size = 181476, upload-time = "2026-01-28T18:15:01.884Z" }, + { url = "https://files.pythonhosted.org/packages/b8/b5/9182c9af3836cca61696dabe4fd1304e17bc56cb62f17439e1154f225dd3/psutil-7.2.2-cp313-cp313t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:917e891983ca3c1887b4ef36447b1e0873e70c933afc831c6b6da078ba474312", size = 184062, upload-time = "2026-01-28T18:15:04.436Z" }, + { url = "https://files.pythonhosted.org/packages/16/ba/0756dca669f5a9300d0cbcbfae9a4c30e446dfc7440ffe43ded5724bfd93/psutil-7.2.2-cp313-cp313t-win_amd64.whl", hash = "sha256:ab486563df44c17f5173621c7b198955bd6b613fb87c71c161f827d3fb149a9b", size = 139893, upload-time = "2026-01-28T18:15:06.378Z" }, + { url = "https://files.pythonhosted.org/packages/1c/61/8fa0e26f33623b49949346de05ec1ddaad02ed8ba64af45f40a147dbfa97/psutil-7.2.2-cp313-cp313t-win_arm64.whl", hash = "sha256:ae0aefdd8796a7737eccea863f80f81e468a1e4cf14d926bd9b6f5f2d5f90ca9", size = 135589, upload-time = "2026-01-28T18:15:08.03Z" }, + { url = "https://files.pythonhosted.org/packages/81/69/ef179ab5ca24f32acc1dac0c247fd6a13b501fd5534dbae0e05a1c48b66d/psutil-7.2.2-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:eed63d3b4d62449571547b60578c5b2c4bcccc5387148db46e0c2313dad0ee00", size = 130664, upload-time = "2026-01-28T18:15:09.469Z" }, + { url = "https://files.pythonhosted.org/packages/7b/64/665248b557a236d3fa9efc378d60d95ef56dd0a490c2cd37dafc7660d4a9/psutil-7.2.2-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:7b6d09433a10592ce39b13d7be5a54fbac1d1228ed29abc880fb23df7cb694c9", size = 131087, upload-time = "2026-01-28T18:15:11.724Z" }, + { url = "https://files.pythonhosted.org/packages/d5/2e/e6782744700d6759ebce3043dcfa661fb61e2fb752b91cdeae9af12c2178/psutil-7.2.2-cp314-cp314t-manylinux2010_x86_64.manylinux_2_12_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:1fa4ecf83bcdf6e6c8f4449aff98eefb5d0604bf88cb883d7da3d8d2d909546a", size = 182383, upload-time = "2026-01-28T18:15:13.445Z" }, + { url = "https://files.pythonhosted.org/packages/57/49/0a41cefd10cb7505cdc04dab3eacf24c0c2cb158a998b8c7b1d27ee2c1f5/psutil-7.2.2-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:e452c464a02e7dc7822a05d25db4cde564444a67e58539a00f929c51eddda0cf", size = 185210, upload-time = "2026-01-28T18:15:16.002Z" }, + { url = "https://files.pythonhosted.org/packages/dd/2c/ff9bfb544f283ba5f83ba725a3c5fec6d6b10b8f27ac1dc641c473dc390d/psutil-7.2.2-cp314-cp314t-win_amd64.whl", hash = "sha256:c7663d4e37f13e884d13994247449e9f8f574bc4655d509c3b95e9ec9e2b9dc1", size = 141228, upload-time = "2026-01-28T18:15:18.385Z" }, + { url = "https://files.pythonhosted.org/packages/f2/fc/f8d9c31db14fcec13748d373e668bc3bed94d9077dbc17fb0eebc073233c/psutil-7.2.2-cp314-cp314t-win_arm64.whl", hash = "sha256:11fe5a4f613759764e79c65cf11ebdf26e33d6dd34336f8a337aa2996d71c841", size = 136284, upload-time = "2026-01-28T18:15:19.912Z" }, + { url = "https://files.pythonhosted.org/packages/e7/36/5ee6e05c9bd427237b11b3937ad82bb8ad2752d72c6969314590dd0c2f6e/psutil-7.2.2-cp36-abi3-macosx_10_9_x86_64.whl", hash = "sha256:ed0cace939114f62738d808fdcecd4c869222507e266e574799e9c0faa17d486", size = 129090, upload-time = "2026-01-28T18:15:22.168Z" }, + { url = "https://files.pythonhosted.org/packages/80/c4/f5af4c1ca8c1eeb2e92ccca14ce8effdeec651d5ab6053c589b074eda6e1/psutil-7.2.2-cp36-abi3-macosx_11_0_arm64.whl", hash = "sha256:1a7b04c10f32cc88ab39cbf606e117fd74721c831c98a27dc04578deb0c16979", size = 129859, upload-time = "2026-01-28T18:15:23.795Z" }, + { url = "https://files.pythonhosted.org/packages/b5/70/5d8df3b09e25bce090399cf48e452d25c935ab72dad19406c77f4e828045/psutil-7.2.2-cp36-abi3-manylinux2010_x86_64.manylinux_2_12_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:076a2d2f923fd4821644f5ba89f059523da90dc9014e85f8e45a5774ca5bc6f9", size = 155560, upload-time = "2026-01-28T18:15:25.976Z" }, + { url = "https://files.pythonhosted.org/packages/63/65/37648c0c158dc222aba51c089eb3bdfa238e621674dc42d48706e639204f/psutil-7.2.2-cp36-abi3-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:b0726cecd84f9474419d67252add4ac0cd9811b04d61123054b9fb6f57df6e9e", size = 156997, upload-time = "2026-01-28T18:15:27.794Z" }, + { url = "https://files.pythonhosted.org/packages/8e/13/125093eadae863ce03c6ffdbae9929430d116a246ef69866dad94da3bfbc/psutil-7.2.2-cp36-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:fd04ef36b4a6d599bbdb225dd1d3f51e00105f6d48a28f006da7f9822f2606d8", size = 148972, upload-time = "2026-01-28T18:15:29.342Z" }, + { url = "https://files.pythonhosted.org/packages/04/78/0acd37ca84ce3ddffaa92ef0f571e073faa6d8ff1f0559ab1272188ea2be/psutil-7.2.2-cp36-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:b58fabe35e80b264a4e3bb23e6b96f9e45a3df7fb7eed419ac0e5947c61e47cc", size = 148266, upload-time = "2026-01-28T18:15:31.597Z" }, + { url = "https://files.pythonhosted.org/packages/b4/90/e2159492b5426be0c1fef7acba807a03511f97c5f86b3caeda6ad92351a7/psutil-7.2.2-cp37-abi3-win_amd64.whl", hash = "sha256:eb7e81434c8d223ec4a219b5fc1c47d0417b12be7ea866e24fb5ad6e84b3d988", size = 137737, upload-time = "2026-01-28T18:15:33.849Z" }, + { url = "https://files.pythonhosted.org/packages/8c/c7/7bb2e321574b10df20cbde462a94e2b71d05f9bbda251ef27d104668306a/psutil-7.2.2-cp37-abi3-win_arm64.whl", hash = "sha256:8c233660f575a5a89e6d4cb65d9f938126312bca76d8fe087b947b3a1aaac9ee", size = 134617, upload-time = "2026-01-28T18:15:36.514Z" }, +] + +[[package]] +name = "psycopg2-binary" +version = "2.9.12" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/2a/60/a3624f79acea344c16fbef3a94d28b89a8042ddfb8f3e4ca83f538671409/psycopg2_binary-2.9.12.tar.gz", hash = "sha256:5ac9444edc768c02a6b6a591f070b8aae28ff3a99be57560ac996001580f294c", size = 379686, upload-time = "2026-04-21T09:40:34.304Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/d5/19/d4ce60954f3bb9d8e3bc5e5c4d1f2487de2d3851bf2391d54954c9df12a6/psycopg2_binary-2.9.12-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:5c8ce6c61bd1b1f6b9c24ee32211599f6166af2c55abb19456090a21fd16554b", size = 3712338, upload-time = "2026-04-20T23:34:03.961Z" }, + { url = "https://files.pythonhosted.org/packages/53/71/c85409ee0d78890f0660eff262e815e7dd2bb741a17611d82e9e8cd9dc5e/psycopg2_binary-2.9.12-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:b4a9eaa6e7f4ff91bec10aa3fb296878e75187bced5cc4bafe17dc40915e1326", size = 3822407, upload-time = "2026-04-20T23:34:05.977Z" }, + { url = "https://files.pythonhosted.org/packages/3c/ed/60486c2c7f0d4d1ede2bfb1ed27e2498477ce646bc7f6b2759906303117e/psycopg2_binary-2.9.12-cp311-cp311-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:c6528cefc8e50fcc6f4a107e27a672058b36cc5736d665476aeb413ba88dbb06", size = 4578425, upload-time = "2026-04-20T23:34:08.246Z" }, + { url = "https://files.pythonhosted.org/packages/0b/b9/656cb03fad9f4f49f2145c334b1126ee75189929ca4e6187d485a2d59951/psycopg2_binary-2.9.12-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:e4e184b1fb6072bf05388aa41c697e1b2d01b3473f107e7ec44f186a32cfd0b8", size = 4273709, upload-time = "2026-04-20T23:34:10.974Z" }, + { url = "https://files.pythonhosted.org/packages/99/66/08cf0da0e25cc6fb142c89be45fc8418792858f0c4cbff5e24530ff02cd6/psycopg2_binary-2.9.12-cp311-cp311-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:4766ab678563054d3f1d064a4db19cc4b5f9e3a8d9018592a8285cf200c248f3", size = 5893779, upload-time = "2026-04-20T23:34:13.905Z" }, + { url = "https://files.pythonhosted.org/packages/17/d7/eecd9ce8e146d3721115d82d3836efdbb712187e4590325df549989d18f4/psycopg2_binary-2.9.12-cp311-cp311-manylinux_2_38_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:5a0253224780c978746cb9be55a946bcdaf40fe3519c0f622924cdabdafe2c39", size = 4109308, upload-time = "2026-04-20T23:34:16.761Z" }, + { url = "https://files.pythonhosted.org/packages/b6/2e/b1dc289b362cc8d45697b57eefbd673186f49a4ea0906928988e3affcc98/psycopg2_binary-2.9.12-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:0dc9228d47c46bda253d2ecd6bb93b56a9f2d7ad33b684a1fa3622bf74ffe30c", size = 3654405, upload-time = "2026-04-20T23:34:19.303Z" }, + { url = "https://files.pythonhosted.org/packages/eb/e4/4c4aea6473214dbdbd0fbba11aa4691e76dc01722c55724c5951719865ff/psycopg2_binary-2.9.12-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:f921f3cd87035ef7df233383011d7a53ea1d346224752c1385f1edfd790ceb6a", size = 3299187, upload-time = "2026-04-20T23:34:21.206Z" }, + { url = "https://files.pythonhosted.org/packages/ba/5d/b03b99986446a4f57b170ed9a2579fb7ff9783ca0fa5226b19db99737fee/psycopg2_binary-2.9.12-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:3d999bd982a723113c1a45b55a7a6a90d64d0ed2278020ed625c490ff7bef96c", size = 3047716, upload-time = "2026-04-20T23:34:23.077Z" }, + { url = "https://files.pythonhosted.org/packages/14/86/382ee4afbd1d97500c9d2862b20c2fdeddf4b7335e984df3fb4309f64108/psycopg2_binary-2.9.12-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:29d4d134bd0ab46ffb04e94aa3c5fa3ef582e9026609165e2f758ff76fc3a3be", size = 3349237, upload-time = "2026-04-20T23:34:25.211Z" }, + { url = "https://files.pythonhosted.org/packages/a8/16/9a57c75ba1eda7165c017342f526810d5f5a12647dde749c99ae9a7141d7/psycopg2_binary-2.9.12-cp311-cp311-win_amd64.whl", hash = "sha256:cb4a1dacdd48077150dc762a9e5ddbf32c256d66cb46f80839391aa458774936", size = 2757036, upload-time = "2026-04-20T23:34:27.77Z" }, + { url = "https://files.pythonhosted.org/packages/e2/9f/ef4ef3c8e15083df90ca35265cfd1a081a2f0cc07bb229c6314c6af817f4/psycopg2_binary-2.9.12-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:5cdc05117180c5fa9c40eea8ea559ce64d73824c39d928b7da9fb5f6a9392433", size = 3712459, upload-time = "2026-04-20T23:34:30.549Z" }, + { url = "https://files.pythonhosted.org/packages/b5/01/3dd14e46ba48c1e1a6ec58ee599fa1b5efa00c246d5046cd903d0eeb1af1/psycopg2_binary-2.9.12-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:d3227a3bc228c10d21011a99245edca923e4e8bf461857e869a507d9a41fe9f6", size = 3822936, upload-time = "2026-04-20T23:34:32.77Z" }, + { url = "https://files.pythonhosted.org/packages/a6/f7/0640e4901119d8a9f7a1784b927f494e2198e213ceb593753d1f2c8b1b30/psycopg2_binary-2.9.12-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:995ce929eede89db6254b50827e2b7fd61e50d11f0b116b29fffe4a2e53c4580", size = 4578676, upload-time = "2026-04-20T23:34:35.18Z" }, + { url = "https://files.pythonhosted.org/packages/b0/55/44df3965b5f297c50cc0b1b594a31c67d6127a9d133045b8a66611b14dfb/psycopg2_binary-2.9.12-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:9fe06d93e72f1c048e731a2e3e7854a5bfaa58fc736068df90b352cefe66f03f", size = 4274917, upload-time = "2026-04-20T23:34:37.982Z" }, + { url = "https://files.pythonhosted.org/packages/b0/4b/74535248b1eac0c9336862e8617c765ac94dac76f9e25d7c4a79588c8907/psycopg2_binary-2.9.12-cp312-cp312-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:40e7b28b63aaf737cb3a1edc3a9bbc9a9f4ad3dcb7152e8c1130e4050eddcb7d", size = 5894843, upload-time = "2026-04-20T23:34:40.856Z" }, + { url = "https://files.pythonhosted.org/packages/f2/ba/f1bf8d2ae71868ad800b661099086ee52bc0f8d9f05be1acd8ebb06757cc/psycopg2_binary-2.9.12-cp312-cp312-manylinux_2_38_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:89d19a9f7899e8eb0656a2b3a08e0da04c720a06db6e0033eab5928aabe60fa9", size = 4110556, upload-time = "2026-04-20T23:34:44.016Z" }, + { url = "https://files.pythonhosted.org/packages/45/46/c15706c338403b7c420bcc0c2905aad116cc064545686d8bf85f1999ea00/psycopg2_binary-2.9.12-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:612b965daee295ae2da8f8218ce1d274645dc76ef3f1abf6a0a94fd57eff876d", size = 3655714, upload-time = "2026-04-20T23:34:46.233Z" }, + { url = "https://files.pythonhosted.org/packages/b3/7c/a2d5dc09b64a4564db242a0fe418fde7d33f6f8259dd2c5b9d7def00fb5a/psycopg2_binary-2.9.12-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:b9a339b79d37c1b45f3235265f07cdeb0cb5ad7acd2ac7720a5920989c17c24e", size = 3301154, upload-time = "2026-04-20T23:34:49.528Z" }, + { url = "https://files.pythonhosted.org/packages/c0/e8/cc8c9a4ce71461f9ec548d38cadc41dc184b34c73e6455450775a9334ccd/psycopg2_binary-2.9.12-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:3471336e1acfd9c7fe507b8bad5af9317b6a89294f9eb37bd9a030bb7bebcdc6", size = 3048882, upload-time = "2026-04-20T23:34:51.86Z" }, + { url = "https://files.pythonhosted.org/packages/19/6a/31e2296bc0787c5ab75d3d118e40b239db8151b5192b90b77c72bc9256e9/psycopg2_binary-2.9.12-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:7af18183109e23502c8b2ae7f6926c0882766f35b5175a4cd737ad825e4d7a1b", size = 3351298, upload-time = "2026-04-20T23:34:54.124Z" }, + { url = "https://files.pythonhosted.org/packages/5f/a8/75f4e3e11203b590150abed2cf7794b9c9c9f7eceddae955191138b44dde/psycopg2_binary-2.9.12-cp312-cp312-win_amd64.whl", hash = "sha256:398fcd4db988c7d7d3713e2b8e18939776fd3fb447052daae4f24fa39daede4c", size = 2757230, upload-time = "2026-04-20T23:34:56.242Z" }, + { url = "https://files.pythonhosted.org/packages/91/bb/4608c96f970f6e0c56572e87027ef4404f709382a3503e9934526d7ba051/psycopg2_binary-2.9.12-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:7c729a73c7b1b84de3582f73cdd27d905121dc2c531f3d9a3c32a3011033b965", size = 3712419, upload-time = "2026-04-20T23:34:58.754Z" }, + { url = "https://files.pythonhosted.org/packages/5e/af/48f76af9d50d61cf390f8cd657b503168b089e2e9298e48465d029fcc713/psycopg2_binary-2.9.12-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:4413d0caef93c5cf50b96863df4c2efe8c269bf2267df353225595e7e15e8df7", size = 3822990, upload-time = "2026-04-20T23:35:00.821Z" }, + { url = "https://files.pythonhosted.org/packages/7a/df/aba0f99397cd811d32e06fc0cc781f1f3ce98bc0e729cb423925085d781a/psycopg2_binary-2.9.12-cp313-cp313-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:4dfcf8e45ebb0c663be34a3442f65e17311f3367089cd4e5e3a3e8e62c978777", size = 4578696, upload-time = "2026-04-20T23:35:03.409Z" }, + { url = "https://files.pythonhosted.org/packages/95/9c/eaa74021ac4e4d5c2f83d82fc6615a63f4fe6c94dc4e94c3990427053f67/psycopg2_binary-2.9.12-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:c41321a14dd74aceb6a9a643b9253a334521babfa763fa873e33d89cfa122fb5", size = 4274982, upload-time = "2026-04-20T23:35:05.583Z" }, + { url = "https://files.pythonhosted.org/packages/35/ed/c25deff98bd26187ba48b3b250a3ffc3037c46c5b89362534a15d200e0db/psycopg2_binary-2.9.12-cp313-cp313-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:83946ba43979ebfdc99a3cd0ee775c89f221df026984ba19d46133d8d75d3cd9", size = 5894867, upload-time = "2026-04-20T23:35:07.902Z" }, + { url = "https://files.pythonhosted.org/packages/9a/81/8d0e21ca77373c6c9589e5c4528f6e8f0c08c62cafc76fb0bddb7a2cee22/psycopg2_binary-2.9.12-cp313-cp313-manylinux_2_38_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:411e85815652d13560fbe731878daa5d92378c4995a22302071890ec3397d019", size = 4110578, upload-time = "2026-04-20T23:35:10.149Z" }, + { url = "https://files.pythonhosted.org/packages/00/fc/f481e2435bd8f742d0123309174aae4165160ad3ef17c1b99c3622c241d2/psycopg2_binary-2.9.12-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:1c8ad4c08e00f7679559eaed7aff1edfffc60c086b976f93972f686384a95e2c", size = 3655816, upload-time = "2026-04-20T23:35:12.56Z" }, + { url = "https://files.pythonhosted.org/packages/53/79/b9f46466bdbe9f239c96cde8be33c1aace4842f06013b47b730dc9759187/psycopg2_binary-2.9.12-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:00814e40fa23c2b37ef0a1e3c749d89982c73a9cb5046137f0752a22d432e82f", size = 3301307, upload-time = "2026-04-20T23:35:15.029Z" }, + { url = "https://files.pythonhosted.org/packages/3f/19/7dc003b32fe35024df89b658104f7c8538a8b2dcbde7a4e746ce929742e7/psycopg2_binary-2.9.12-cp313-cp313-musllinux_1_2_riscv64.whl", hash = "sha256:98062447aebc20ed20add1f547a364fd0ef8933640d5372ff1873f8deb9b61be", size = 3048968, upload-time = "2026-04-20T23:35:16.757Z" }, + { url = "https://files.pythonhosted.org/packages/91/58/2dbd7db5c604d45f4950d988506aae672a14126ec22998ced5021cbb76bb/psycopg2_binary-2.9.12-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:66a7685d7e548f10fb4ce32fb01a7b7f4aa702134de92a292c7bd9e0d3dbd290", size = 3351369, upload-time = "2026-04-20T23:35:18.933Z" }, + { url = "https://files.pythonhosted.org/packages/42/ee/dee8dcaad07f735824de3d6563bc67119fa6c28257b17977a8d624f02fab/psycopg2_binary-2.9.12-cp313-cp313-win_amd64.whl", hash = "sha256:b6937f5fe4e180aeee87de907a2fa982ded6f7f15d7218f78a083e4e1d68f2a0", size = 2757347, upload-time = "2026-04-20T23:35:21.283Z" }, + { url = "https://files.pythonhosted.org/packages/13/1b/708c0dca874acfad6d65314271859899a79007686f3a1f74e82a2ed4b645/psycopg2_binary-2.9.12-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:6f3b3de8a74ef8db215f22edffb19e32dc6fa41340456de7ec99efdc8a7b3ec2", size = 3712428, upload-time = "2026-04-20T23:35:23.453Z" }, + { url = "https://files.pythonhosted.org/packages/d6/39/ddbea9d4b4de6aca9431b6ed253f530f8a02d3b8f9bcfd0dbfe2b3de6fe4/psycopg2_binary-2.9.12-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:1006fb62f0f0bc5ce256a832356c6262e91be43f5e4eb15b5eaf38079464caf2", size = 3823184, upload-time = "2026-04-20T23:35:25.92Z" }, + { url = "https://files.pythonhosted.org/packages/bf/a0/bc2fef74b106fa345567122a0659e6d94512ed7dc0131ec44c9e5aba3725/psycopg2_binary-2.9.12-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:840066105706cd2eb29b9a1c2329620056582a4bf3e8169dec5c447042d0869f", size = 4579157, upload-time = "2026-04-20T23:35:28.542Z" }, + { url = "https://files.pythonhosted.org/packages/57/d7/d4e3b2005d3de607ca4fbb0e8742e248056e52184a6b94ebda3c1c2c329b/psycopg2_binary-2.9.12-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:863f5d12241ebe1c76a72a04c2113b6dc905f90b9cef0e9be0efd994affd9354", size = 4274970, upload-time = "2026-04-20T23:35:30.418Z" }, + { url = "https://files.pythonhosted.org/packages/2e/42/c9853f8db3967fe08bcde11f53d53b85d351750cae726ce001cb68afa9c1/psycopg2_binary-2.9.12-cp314-cp314-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:a99eaab34a9010f1a086b126de467466620a750634d114d20455f3a824aae033", size = 5895175, upload-time = "2026-04-20T23:35:33.584Z" }, + { url = "https://files.pythonhosted.org/packages/eb/fd/b82b5601a97630308bef079f545ffec481bbbc795c2ba5ec416a01d03f60/psycopg2_binary-2.9.12-cp314-cp314-manylinux_2_38_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:ffdd7dc5463ccd61845ac37b7012d0f35a1548df9febe14f8dd549be4a0bc81e", size = 4110658, upload-time = "2026-04-20T23:35:35.638Z" }, + { url = "https://files.pythonhosted.org/packages/62/8c/32ca69b0389ef25dd22937bf9e8fbe2ce27aea20b05ded48c4ce4cb42475/psycopg2_binary-2.9.12-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:54a0dfecab1b48731f934e06139dfe11e24219fb6d0ceb32177cf0375f14c7b5", size = 3656251, upload-time = "2026-04-20T23:35:37.854Z" }, + { url = "https://files.pythonhosted.org/packages/c4/29/96992a2b59e3b9d730fcf9612d0a387305025dc867a9fc490a9e496e074e/psycopg2_binary-2.9.12-cp314-cp314-musllinux_1_2_ppc64le.whl", hash = "sha256:96937c9c5d891f772430f418a7a8b4691a90c3e6b93cf72b5bd7cad8cbca32a5", size = 3301810, upload-time = "2026-04-20T23:35:39.927Z" }, + { url = "https://files.pythonhosted.org/packages/56/ad/44b06659949b243ae10112cd3b20a197f9bf3e81d5651379b9eb889bfaad/psycopg2_binary-2.9.12-cp314-cp314-musllinux_1_2_riscv64.whl", hash = "sha256:77b348775efd4cdab410ec6609d81ccecd1139c90265fa583a7255c8064bc03d", size = 3048977, upload-time = "2026-04-20T23:35:41.806Z" }, + { url = "https://files.pythonhosted.org/packages/1d/f2/10a1bcebadb6aa55e280e1f58975c36a7b560ea525184c7aa4064c466633/psycopg2_binary-2.9.12-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:527e6342b3e44c2f0544f6b8e927d60de7f163f5723b8f1dfa7d2a84298738cd", size = 3351466, upload-time = "2026-04-20T23:35:43.993Z" }, + { url = "https://files.pythonhosted.org/packages/20/be/b732c8418ffa5bcfda002890f5dc4c869fc17db66ff11f53b17cfe44afc0/psycopg2_binary-2.9.12-cp314-cp314-win_amd64.whl", hash = "sha256:f12ae41fcafadb39b2785e64a40f9db05d6de2ac114077457e0e7c597f3af980", size = 2848762, upload-time = "2026-04-20T23:35:46.421Z" }, +] + +[[package]] +name = "ptyprocess" +version = "0.7.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/20/e5/16ff212c1e452235a90aeb09066144d0c5a6a8c0834397e03f5224495c4e/ptyprocess-0.7.0.tar.gz", hash = "sha256:5c5d0a3b48ceee0b48485e0c26037c0acd7d29765ca3fbb5cb3831d347423220", size = 70762, upload-time = "2020-12-28T15:15:30.155Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/22/a6/858897256d0deac81a172289110f31629fc4cee19b6f01283303e18c8db3/ptyprocess-0.7.0-py2.py3-none-any.whl", hash = "sha256:4b41f3967fce3af57cc7e94b888626c18bf37a083e3651ca8feeb66d492fef35", size = 13993, upload-time = "2020-12-28T15:15:28.35Z" }, +] + +[[package]] +name = "pure-eval" +version = "0.2.3" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/cd/05/0a34433a064256a578f1783a10da6df098ceaa4a57bbeaa96a6c0352786b/pure_eval-0.2.3.tar.gz", hash = "sha256:5f4e983f40564c576c7c8635ae88db5956bb2229d7e9237d03b3c0b0190eaf42", size = 19752, upload-time = "2024-07-21T12:58:21.801Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/8e/37/efad0257dc6e593a18957422533ff0f87ede7c9c6ea010a2177d738fb82f/pure_eval-0.2.3-py3-none-any.whl", hash = "sha256:1db8e35b67b3d218d818ae653e27f06c3aa420901fa7b081ca98cbedc874e0d0", size = 11842, upload-time = "2024-07-21T12:58:20.04Z" }, +] + +[[package]] +name = "pycodestyle" +version = "2.14.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/11/e0/abfd2a0d2efe47670df87f3e3a0e2edda42f055053c85361f19c0e2c1ca8/pycodestyle-2.14.0.tar.gz", hash = "sha256:c4b5b517d278089ff9d0abdec919cd97262a3367449ea1c8b49b91529167b783", size = 39472, upload-time = "2025-06-20T18:49:48.75Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/d7/27/a58ddaf8c588a3ef080db9d0b7e0b97215cee3a45df74f3a94dbbf5c893a/pycodestyle-2.14.0-py2.py3-none-any.whl", hash = "sha256:dd6bf7cb4ee77f8e016f9c8e74a35ddd9f67e1d5fd4184d86c3b98e07099f42d", size = 31594, upload-time = "2025-06-20T18:49:47.491Z" }, +] + +[[package]] +name = "pycparser" +version = "3.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/1b/7d/92392ff7815c21062bea51aa7b87d45576f649f16458d78b7cf94b9ab2e6/pycparser-3.0.tar.gz", hash = "sha256:600f49d217304a5902ac3c37e1281c9fe94e4d0489de643a9504c5cdfdfc6b29", size = 103492, upload-time = "2026-01-21T14:26:51.89Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/0c/c3/44f3fbbfa403ea2a7c779186dc20772604442dde72947e7d01069cbe98e3/pycparser-3.0-py3-none-any.whl", hash = "sha256:b727414169a36b7d524c1c3e31839a521725078d7b2ff038656844266160a992", size = 48172, upload-time = "2026-01-21T14:26:50.693Z" }, +] + +[[package]] +name = "pydantic" +version = "2.13.4" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "annotated-types" }, + { name = "pydantic-core" }, + { name = "typing-extensions" }, + { name = "typing-inspection" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/18/a5/b60d21ac674192f8ab0ba4e9fd860690f9b4a6e51ca5df118733b487d8d6/pydantic-2.13.4.tar.gz", hash = "sha256:c40756b57adaa8b1efeeced5c196f3f3b7c435f90e84ea7f443901bec8099ef6", size = 844775, upload-time = "2026-05-06T13:43:05.343Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/fd/7b/122376b1fd3c62c1ed9dc80c931ace4844b3c55407b6fb2d199377c9736f/pydantic-2.13.4-py3-none-any.whl", hash = "sha256:45a282cde31d808236fd7ea9d919b128653c8b38b393d1c4ab335c62924d9aba", size = 472262, upload-time = "2026-05-06T13:43:02.641Z" }, +] + +[[package]] +name = "pydantic-core" +version = "2.46.4" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "typing-extensions" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/9d/56/921726b776ace8d8f5db44c4ef961006580d91dc52b803c489fafd1aa249/pydantic_core-2.46.4.tar.gz", hash = "sha256:62f875393d7f270851f20523dd2e29f082bcc82292d66db2b64ea71f64b6e1c1", size = 471464, upload-time = "2026-05-06T13:37:06.98Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/5c/fa/6d7708d2cfc1a832acb6aeb0cd16e801902df8a0f583bb3b4b527fde022e/pydantic_core-2.46.4-cp311-cp311-macosx_10_12_x86_64.whl", hash = "sha256:0e96592440881c74a213e5ad528e2b24d3d4f940de2766bed9010ab1d9e51594", size = 2111872, upload-time = "2026-05-06T13:40:27.596Z" }, + { url = "https://files.pythonhosted.org/packages/ae/6f/aa064a3e74b5745afbdf250594f38e7ead05e2d651bcb35994b9417a0d4d/pydantic_core-2.46.4-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:e0d65b8c354be7fb5f720c3caa8bc940bc2d20ce749c8e06135f07f8ed95dd7c", size = 1948255, upload-time = "2026-05-06T13:39:12.574Z" }, + { url = "https://files.pythonhosted.org/packages/43/3a/41114a9f7569b84b4d84e7a018c57c56347dac30c0d4a872946ec4e36c46/pydantic_core-2.46.4-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7bfb192b3f4b9e8a89b6277b6ce787564f62cfd272055f6e685726b111dc7826", size = 1972827, upload-time = "2026-05-06T13:38:19.841Z" }, + { url = "https://files.pythonhosted.org/packages/ef/25/1ab42e8048fe551934d9884e8d64daa7e990ad386f310a15981aeb6a5b08/pydantic_core-2.46.4-cp311-cp311-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:9037063db01f09b09e237c282b6792bd4da634b5402c4e7f0c61effed7701a04", size = 2041051, upload-time = "2026-05-06T13:38:10.447Z" }, + { url = "https://files.pythonhosted.org/packages/94/c2/1a934597ddf08da410385b3b7aae91956a5a76c635effef456074fad7e88/pydantic_core-2.46.4-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:fc010ab034c8c7452522748bf937df58020d256ccae0874463d1f4d01758af8e", size = 2221314, upload-time = "2026-05-06T13:40:13.089Z" }, + { url = "https://files.pythonhosted.org/packages/02/6d/9e8ad178c9c4df27ad3c8f25d1fe2a7ab0d2ba0559fad4aee5d3d1f16771/pydantic_core-2.46.4-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:8c5dac79fa1614d1e06ca695109c6105923bd9c7d1d6c918d4e637b7e6b32fd3", size = 2285146, upload-time = "2026-05-06T13:38:59.224Z" }, + { url = "https://files.pythonhosted.org/packages/80/50/540cd3aeefc041beb111125c4bff779831a2111fc6b15a9138cda277d32c/pydantic_core-2.46.4-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f9fa868638bf362d3d138ea55829cefb3d5f4b0d7f142234382a15e2485dbec4", size = 2089685, upload-time = "2026-05-06T13:38:17.762Z" }, + { url = "https://files.pythonhosted.org/packages/6b/a4/b440ad35f05f6a38f89fa0f149accb3f0e02be94ca5e15f3c449a61b4bc9/pydantic_core-2.46.4-cp311-cp311-manylinux_2_31_riscv64.whl", hash = "sha256:17299feefe090f2caa5b8e37222bb5f663e4935a8bfa6931d4102e5df1a9f398", size = 2115420, upload-time = "2026-05-06T13:37:58.195Z" }, + { url = "https://files.pythonhosted.org/packages/99/61/de4f55db8dfd57bfdfa9a12ec90fe1b57c4f41062f7ca86f08586b3e0ac0/pydantic_core-2.46.4-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:4c63ebc82684aa89d9a3bcbd13d515b3be44250dc68dd3bd81526c1cb31286c3", size = 2165122, upload-time = "2026-05-06T13:37:01.167Z" }, + { url = "https://files.pythonhosted.org/packages/f7/52/7c529d7bdb2d1068bd52f51fe32572c8301f9a4febf1948f10639f1436f5/pydantic_core-2.46.4-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:aaa2a54443eff1950ba5ddc6b6ccda0d9c84a364276a62f969bdf2a390650848", size = 2182573, upload-time = "2026-05-06T13:38:45.04Z" }, + { url = "https://files.pythonhosted.org/packages/37/b3/7c40325848ba78247f2812dcf9c7274e38cd801820ca6dd9fe63bcfb0eb4/pydantic_core-2.46.4-cp311-cp311-musllinux_1_1_armv7l.whl", hash = "sha256:18e5ceec2ab67e6d5f1a9085e5a24c9c4e2ac4545730bfe668680bca05e555f3", size = 2317139, upload-time = "2026-05-06T13:37:15.539Z" }, + { url = "https://files.pythonhosted.org/packages/d9/37/f913f81a657c865b75da6c0dbed79876073c2a43b5bd9edbe8da785e4d49/pydantic_core-2.46.4-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:a0f62d0a58f4e7da165457e995725421e0064f2255d8eccebc49f41bbc23b109", size = 2360433, upload-time = "2026-05-06T13:37:30.099Z" }, + { url = "https://files.pythonhosted.org/packages/c4/67/6acaa1be2567f9256b056d8477158cac7240813956ce86e49deae8e173b4/pydantic_core-2.46.4-cp311-cp311-win32.whl", hash = "sha256:041bde0a48fd37cf71cab1c9d56d3e8625a3793fef1f7dd232b3ff37e978ecda", size = 1985513, upload-time = "2026-05-06T13:38:15.669Z" }, + { url = "https://files.pythonhosted.org/packages/aa/e6/c505f83dfeda9a2e5c995cfd872949e4d05e12f7feb3dca72f633daefa94/pydantic_core-2.46.4-cp311-cp311-win_amd64.whl", hash = "sha256:6f2eeda33a839975441c86a4119e1383c50b47faf0cbb5176985565c6bb02c33", size = 2071114, upload-time = "2026-05-06T13:40:35.416Z" }, + { url = "https://files.pythonhosted.org/packages/0f/da/7a263a96d965d9d0df5e8de8a475f33495451117035b09acb110288c381f/pydantic_core-2.46.4-cp311-cp311-win_arm64.whl", hash = "sha256:14f4c5d6db102bd796a627bbb3a17b4cf4574b9ae861d8b7c9a9661c6dd3362d", size = 2044298, upload-time = "2026-05-06T13:38:29.754Z" }, + { url = "https://files.pythonhosted.org/packages/ce/8c/af022f0af448d7747c5154288d46b5f2bc5f17366eaa0e23e9aa04d59f3b/pydantic_core-2.46.4-cp312-cp312-macosx_10_12_x86_64.whl", hash = "sha256:3245406455a5d98187ec35530fd772b1d799b26667980872c8d4614991e2c4a2", size = 2106158, upload-time = "2026-05-06T13:38:57.215Z" }, + { url = "https://files.pythonhosted.org/packages/19/95/6195171e385007300f0f5574592e467c568becce2d937a0b6804f218bc49/pydantic_core-2.46.4-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:962ccbab7b642487b1d8b7df90ef677e03134cf1fd8880bf698649b22a69371f", size = 1951724, upload-time = "2026-05-06T13:37:02.697Z" }, + { url = "https://files.pythonhosted.org/packages/8e/bc/f47d1ff9cbb1620e1b5b697eef06010035735f07820180e74178226b27b3/pydantic_core-2.46.4-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8233f2947cf85404441fd7e0085f53b10c93e0ee78611099b5c7237e36aacbf7", size = 1975742, upload-time = "2026-05-06T13:37:09.448Z" }, + { url = "https://files.pythonhosted.org/packages/5b/11/9b9a5b0306345664a2da6410877af6e8082481b5884b3ddd78d47c6013ce/pydantic_core-2.46.4-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:3a233125ac121aa3ffba9a2b59edfc4a985a76092dc8279586ab4b71390875e7", size = 2052418, upload-time = "2026-05-06T13:37:38.234Z" }, + { url = "https://files.pythonhosted.org/packages/f1/b7/a65fec226f5d78fc39f4a13c4cc0c768c22b113438f60c14adc9d2865038/pydantic_core-2.46.4-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:5b712b53160b79a5850310b912a5ef8e57e56947c8ad690c227f5c9d7e561712", size = 2232274, upload-time = "2026-05-06T13:38:27.753Z" }, + { url = "https://files.pythonhosted.org/packages/68/f0/92039db98b907ef49269a8271f67db9cb78ae2fc68062ef7e4e77adb5f61/pydantic_core-2.46.4-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9401557acd873c3a7f3eb9383edef8ac4968f9510e340f4808d427e75667e7b4", size = 2309940, upload-time = "2026-05-06T13:38:05.353Z" }, + { url = "https://files.pythonhosted.org/packages/5f/97/2aab507d3d00ca626e8e57c1eac6a79e4e5fbcc63eb99733ff55d1717f65/pydantic_core-2.46.4-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:926c9541b14b12b1681dca8a0b75feb510b06c6341b70a8e500c2fdcff837cce", size = 2094516, upload-time = "2026-05-06T13:39:10.577Z" }, + { url = "https://files.pythonhosted.org/packages/22/37/a8aca44d40d737dde2bc05b3c6c07dff0de07ce6f82e9f3167aeaf4d5dea/pydantic_core-2.46.4-cp312-cp312-manylinux_2_31_riscv64.whl", hash = "sha256:56cb4851bcaf3d117eddcef4fe66afd750a50274b0da8e22be256d10e5611987", size = 2136854, upload-time = "2026-05-06T13:40:22.59Z" }, + { url = "https://files.pythonhosted.org/packages/24/99/fcef1b79238c06a8cbec70819ac722ba76e02bc8ada9b0fd66eba40da01b/pydantic_core-2.46.4-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:c68fcd102d71ea85c5b2dfac3f4f8476eff42a9e078fd5faefff6d145063536b", size = 2180306, upload-time = "2026-05-06T13:40:10.666Z" }, + { url = "https://files.pythonhosted.org/packages/ae/6c/fc44000918855b42779d007ae63b0532794739027b2f417321cddbc44f6a/pydantic_core-2.46.4-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:b2f69dec1725e79a012d920df1707de5caf7ed5e08f3be4435e25803efc47458", size = 2190044, upload-time = "2026-05-06T13:40:43.231Z" }, + { url = "https://files.pythonhosted.org/packages/6b/65/d9cadc9f1920d7a127ad2edba16c1db7916e59719285cd6c94600b0080ba/pydantic_core-2.46.4-cp312-cp312-musllinux_1_1_armv7l.whl", hash = "sha256:8d0820e8192167f80d88d64038e609c31452eeca865b4e1d9950a27a4609b00b", size = 2329133, upload-time = "2026-05-06T13:39:57.365Z" }, + { url = "https://files.pythonhosted.org/packages/d0/cf/c873d91679f3a30bcf5e7ac280ce5573483e72295307685120d0d5ad3416/pydantic_core-2.46.4-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:fbdb89b3e1c94a30cc5edfce477c6e6a5dc4d8f84665b455c27582f211a1c72c", size = 2374464, upload-time = "2026-05-06T13:38:06.976Z" }, + { url = "https://files.pythonhosted.org/packages/47/bd/6f2fc8188f31bf10590f1e98e7b306336161fac930a8c514cd7bd828c7dc/pydantic_core-2.46.4-cp312-cp312-win32.whl", hash = "sha256:9aa768456404a8bf48a4406685ac2bec8e72b62c69313734fa3b73cf33b3a894", size = 1974823, upload-time = "2026-05-06T13:40:47.985Z" }, + { url = "https://files.pythonhosted.org/packages/40/8c/985c1d41ea1107c2534abd9870e4ed5c8e7669b5c308297835c001e7a1c4/pydantic_core-2.46.4-cp312-cp312-win_amd64.whl", hash = "sha256:e9c26f834c65f5752f3f06cb08cb86a913ceb7274d0db6e267808a708b46bc89", size = 2072919, upload-time = "2026-05-06T13:39:21.153Z" }, + { url = "https://files.pythonhosted.org/packages/c4/ba/f463d006e0c47373ca7ec5e1a261c59dc01ef4d62b2657af925fb0deee3a/pydantic_core-2.46.4-cp312-cp312-win_arm64.whl", hash = "sha256:4fc73cb559bdb54b1134a706a2802a4cddd27a0633f5abb7e53056268751ac6a", size = 2027604, upload-time = "2026-05-06T13:39:03.753Z" }, + { url = "https://files.pythonhosted.org/packages/51/a2/5d30b469c5267a17b39dec53208222f76a8d351dfac4af661888c5aee77d/pydantic_core-2.46.4-cp313-cp313-macosx_10_12_x86_64.whl", hash = "sha256:5d5902252db0d3cedf8d4a1bc68f70eeb430f7e4c7104c8c476753519b423008", size = 2106306, upload-time = "2026-05-06T13:37:48.029Z" }, + { url = "https://files.pythonhosted.org/packages/c1/81/4fa520eaffa8bd7d1525e644cd6d39e7d60b1592bc5b516693c7340b50f1/pydantic_core-2.46.4-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:c94f0688e7b8d0a67abf40e57a7eaaecd17cc9586706a31b76c031f63df052b4", size = 1951906, upload-time = "2026-05-06T13:37:17.012Z" }, + { url = "https://files.pythonhosted.org/packages/03/d5/fd02da45b659668b05923b17ba3a0100a0a3d5541e3bd8fcc4ecb711309e/pydantic_core-2.46.4-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f027324c56cd5406ca49c124b0db10e56c69064fec039acc571c29020cc87c76", size = 1976802, upload-time = "2026-05-06T13:37:35.113Z" }, + { url = "https://files.pythonhosted.org/packages/21/f2/95727e1368be3d3ed485eaab7adbd7dda408f33f7a36e8b48e0144002b91/pydantic_core-2.46.4-cp313-cp313-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:e739fee756ba1010f8bcccb534252e85a35fe45ae92c295a06059ce58b74ccd3", size = 2052446, upload-time = "2026-05-06T13:37:12.313Z" }, + { url = "https://files.pythonhosted.org/packages/9c/86/5d99feea3f77c7234b8718075b23db11532773c1a0dbd9b9490215dc2eeb/pydantic_core-2.46.4-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:9d56801be94b86a9da183e5f3766e6310752b99ff647e38b09a9500d88e46e76", size = 2232757, upload-time = "2026-05-06T13:39:01.149Z" }, + { url = "https://files.pythonhosted.org/packages/d2/3a/508ac615935ef7588cf6d9e9b91309fdc2da751af865e02a9098de88258c/pydantic_core-2.46.4-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2412e734dcb48da14d4e4006b82b46b74f2518b8a26ee7e58c6844a6cd6d03c4", size = 2309275, upload-time = "2026-05-06T13:37:41.406Z" }, + { url = "https://files.pythonhosted.org/packages/07/f8/41db9de19d7987d6b04715a02b3b40aea467000275d9d758ffaa31af7d50/pydantic_core-2.46.4-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9551187363ffc0de2a00b2e47c25aeaeb1020b69b668762966df15fc5659dd5a", size = 2094467, upload-time = "2026-05-06T13:39:18.847Z" }, + { url = "https://files.pythonhosted.org/packages/2c/e2/f35033184cb11d0052daf4416e8e10a502ea2ac006fc4f459aee872727d1/pydantic_core-2.46.4-cp313-cp313-manylinux_2_31_riscv64.whl", hash = "sha256:0186750b482eefa11d7f435892b09c5c606193ef3375bcf94aa00ae6bfb66262", size = 2134417, upload-time = "2026-05-06T13:40:17.944Z" }, + { url = "https://files.pythonhosted.org/packages/7e/7b/6ceeb1cc90e193862f444ebe373d8fdf613f0a82572dde03fb10734c6c71/pydantic_core-2.46.4-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:5855698a4856556d86e8e6cd8434bc3ac0314ee8e12089ae0e143f64c6256e4e", size = 2179782, upload-time = "2026-05-06T13:40:32.618Z" }, + { url = "https://files.pythonhosted.org/packages/5a/f2/c8d7773ede6af08036423a00ae0ceffce266c3c52a096c435d68c896083f/pydantic_core-2.46.4-cp313-cp313-musllinux_1_1_aarch64.whl", hash = "sha256:cbaf13819775b7f769bf4a1f066cb6df7a28d4480081a589828ef190226881cd", size = 2188782, upload-time = "2026-05-06T13:36:51.018Z" }, + { url = "https://files.pythonhosted.org/packages/59/31/0c864784e31f09f05cdd87606f08923b9c9e7f6e51dd27f20f62f975ce9f/pydantic_core-2.46.4-cp313-cp313-musllinux_1_1_armv7l.whl", hash = "sha256:633147d34cf4550417f12e2b1a0383973bdf5cdfde212cb09e9a581cf10820be", size = 2328334, upload-time = "2026-05-06T13:40:37.764Z" }, + { url = "https://files.pythonhosted.org/packages/c2/eb/4f6c8a41efa30baa755590f4141abf3a8c370fab610915733e74134a7270/pydantic_core-2.46.4-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:82cf5301172168103724d49a1444d3378cb20cdee30b116a1bd6031236298a5d", size = 2372986, upload-time = "2026-05-06T13:39:34.152Z" }, + { url = "https://files.pythonhosted.org/packages/5b/24/b375a480d53113860c299764bfe9f349a3dc9108b3adc0d7f0d786492ebf/pydantic_core-2.46.4-cp313-cp313-win32.whl", hash = "sha256:9fa8ae11da9e2b3126c6426f147e0fba88d96d65921799bb30c6abd1cb2c97fb", size = 1973693, upload-time = "2026-05-06T13:37:55.072Z" }, + { url = "https://files.pythonhosted.org/packages/7e/e8/cff247591966f2d22ec8c003cd7587e27b7ba7b81ab2fb888e3ab75dc285/pydantic_core-2.46.4-cp313-cp313-win_amd64.whl", hash = "sha256:6b3ace8194b0e5204818c92802dcdca7fc6d88aabbb799d7c795540d9cd6d292", size = 2071819, upload-time = "2026-05-06T13:38:49.139Z" }, + { url = "https://files.pythonhosted.org/packages/c6/1a/f4aee670d5670e9e148e0c82c7db98d780be566c6e6a97ee8035528ca0b3/pydantic_core-2.46.4-cp313-cp313-win_arm64.whl", hash = "sha256:184c081504d17f1c1066e430e117142b2c77d9448a97f7b65c6ac9fd9aee238d", size = 2027411, upload-time = "2026-05-06T13:40:45.796Z" }, + { url = "https://files.pythonhosted.org/packages/8d/74/228a26ddad29c6672b805d9fd78e8d251cd04004fa7eed0e622096cd0250/pydantic_core-2.46.4-cp314-cp314-macosx_10_12_x86_64.whl", hash = "sha256:428e04521a40150c85216fc8b85e8d39fece235a9cf5e383761238c7fa9b96fb", size = 2102079, upload-time = "2026-05-06T13:38:41.019Z" }, + { url = "https://files.pythonhosted.org/packages/ad/1f/8970b150a4b4365623ae00fc88603491f763c627311ae8031e3111356d6e/pydantic_core-2.46.4-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:23ace664830ee0bfe014a0c7bc248b1f7f25ed7ad103852c317624a1083af462", size = 1952179, upload-time = "2026-05-06T13:36:59.812Z" }, + { url = "https://files.pythonhosted.org/packages/95/30/5211a831ae054928054b2f79731661087a2bc5c01e825c672b3a4a8f1b3e/pydantic_core-2.46.4-cp314-cp314-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ce5c1d2a8b27468f433ca974829c44060b8097eedc39933e3c206a90ee49c4a9", size = 1978926, upload-time = "2026-05-06T13:37:39.933Z" }, + { url = "https://files.pythonhosted.org/packages/57/e9/689668733b1eb67adeef047db3c2e8788fcf65a7fd9c9e2b46b7744fe245/pydantic_core-2.46.4-cp314-cp314-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:7283d57845ecf5a163403eb0702dfc220cc4fbdd18919cb5ccea4f95ee1cdab4", size = 2046785, upload-time = "2026-05-06T13:38:01.995Z" }, + { url = "https://files.pythonhosted.org/packages/60/d9/6715260422ff50a2109878fd24d948a6c3446bb2664f34ee78cd972b3acd/pydantic_core-2.46.4-cp314-cp314-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:8daafc69c93ee8a0204506a3b6b30f586ef54028f52aeeeb5c4cfc5184fd5914", size = 2228733, upload-time = "2026-05-06T13:40:50.371Z" }, + { url = "https://files.pythonhosted.org/packages/18/ae/fdb2f64316afca925640f8e70bb1a564b0ec2721c1389e25b8eb4bf9a299/pydantic_core-2.46.4-cp314-cp314-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:cd2213145bcc2ba85884d0ac63d222fece9209678f77b9b4d76f054c561adb28", size = 2307534, upload-time = "2026-05-06T13:37:21.531Z" }, + { url = "https://files.pythonhosted.org/packages/89/1d/8eff589b45bb8190a9d12c49cfad0f176a5cbd1534908a6b5125e2886239/pydantic_core-2.46.4-cp314-cp314-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7a5f930472650a82629163023e630d160863fce524c616f4e5186e5de9d9a49b", size = 2099732, upload-time = "2026-05-06T13:39:31.942Z" }, + { url = "https://files.pythonhosted.org/packages/06/d5/ee5a3366637fee41dee51a1fc91562dcf12ddbc68fda34e6b253da2324bb/pydantic_core-2.46.4-cp314-cp314-manylinux_2_31_riscv64.whl", hash = "sha256:c1b3f518abeca3aa13c712fd202306e145abf59a18b094a6bafb2d2bbf59192c", size = 2129627, upload-time = "2026-05-06T13:37:25.033Z" }, + { url = "https://files.pythonhosted.org/packages/94/33/2414be571d2c6a6c4d08be21f9292b6d3fdb08949a97b6dfe985017821db/pydantic_core-2.46.4-cp314-cp314-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:1a7dd0b3ee80d90150e3495a3a13ac34dbcbfd4f012996a6a1d8900e91b5c0fb", size = 2179141, upload-time = "2026-05-06T13:37:14.046Z" }, + { url = "https://files.pythonhosted.org/packages/7b/79/7daa95be995be0eecc4cf75064cb33f9bbbfe3fe0158caf2f0d4a996a5c7/pydantic_core-2.46.4-cp314-cp314-musllinux_1_1_aarch64.whl", hash = "sha256:3fb702cd90b0446a3a1c5e470bfa0dd23c0233b676a9099ddcc964fa6ca13898", size = 2184325, upload-time = "2026-05-06T13:36:53.615Z" }, + { url = "https://files.pythonhosted.org/packages/9f/cb/d0a382f5c0de8a222dc61c65348e0ce831b1f68e0a018450d31c2cace3a5/pydantic_core-2.46.4-cp314-cp314-musllinux_1_1_armv7l.whl", hash = "sha256:b8458003118a712e66286df6a707db01c52c0f52f7db8e4a38f0da1d3b94fc4e", size = 2323990, upload-time = "2026-05-06T13:40:29.971Z" }, + { url = "https://files.pythonhosted.org/packages/05/db/d9ba624cc4a5aced1598e88c04fdbd8310c8a69b9d38b9a3d39ce3a61ed7/pydantic_core-2.46.4-cp314-cp314-musllinux_1_1_x86_64.whl", hash = "sha256:372429a130e469c9cd698925ce5fc50940b7a1336b0d82038e63d5bbc4edc519", size = 2369978, upload-time = "2026-05-06T13:37:23.027Z" }, + { url = "https://files.pythonhosted.org/packages/f2/20/d15df15ba918c423461905802bfd2981c3af0bfa0e40d05e13edbfa48bc3/pydantic_core-2.46.4-cp314-cp314-win32.whl", hash = "sha256:85bb3611ff1802f3ee7fdd7dbff26b56f343fb432d57a4728fdd49b6ef35e2f4", size = 1966354, upload-time = "2026-05-06T13:38:03.499Z" }, + { url = "https://files.pythonhosted.org/packages/fc/b6/6b8de4c0a7d7ab3004c439c80c5c1e0a3e8d78bbae19379b01960383d9e5/pydantic_core-2.46.4-cp314-cp314-win_amd64.whl", hash = "sha256:811ff8e9c313ab425368bcbb36e5c4ebd7108c2bbf4e4089cfbb0b01eff63fac", size = 2072238, upload-time = "2026-05-06T13:39:40.807Z" }, + { url = "https://files.pythonhosted.org/packages/32/36/51eb763beec1f4cf59b1db243a7dcc39cbb41230f050a09b9d69faaf0a48/pydantic_core-2.46.4-cp314-cp314-win_arm64.whl", hash = "sha256:bfec22eab3c8cc2ceec0248aec886624116dc079afa027ecc8ad4a7e62010f8a", size = 2018251, upload-time = "2026-05-06T13:37:26.72Z" }, + { url = "https://files.pythonhosted.org/packages/e8/91/855af51d625b23aa987116a19e231d2aaef9c4a415273ddc189b79a45fee/pydantic_core-2.46.4-cp314-cp314t-macosx_10_12_x86_64.whl", hash = "sha256:af8244b2bef6aaad6d92cda81372de7f8c8d36c9f0c3ea36e827c60e7d9467a0", size = 2099593, upload-time = "2026-05-06T13:39:47.682Z" }, + { url = "https://files.pythonhosted.org/packages/fb/1b/8784a54c65edb5f49f0a14d6977cf1b209bba85a4c77445b255c2de58ab3/pydantic_core-2.46.4-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:5a4330cdbc57162e4b3aa303f588ba752257694c9c9be3e7ebb11b4aca659b5d", size = 1935226, upload-time = "2026-05-06T13:40:40.428Z" }, + { url = "https://files.pythonhosted.org/packages/e8/e7/1955d28d1afc56dd4b3ad7cc0cf39df1b9852964cf16e5d13912756d6d6b/pydantic_core-2.46.4-cp314-cp314t-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:29c61fc04a3d840155ff08e475a04809278972fe6aef51e2720554e96367e34b", size = 1974605, upload-time = "2026-05-06T13:37:32.029Z" }, + { url = "https://files.pythonhosted.org/packages/93/e2/3fedbf0ba7a22850e6e9fd78117f1c0f10f950182344d8a6c535d468fdd8/pydantic_core-2.46.4-cp314-cp314t-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:c50f2528cf200c5eed56faf3f4e22fcd5f38c157a8b78576e6ba3168ec35f000", size = 2030777, upload-time = "2026-05-06T13:38:55.239Z" }, + { url = "https://files.pythonhosted.org/packages/f8/61/46be275fcaaba0b4f5b9669dd852267ce1ff616592dccf7a7845588df091/pydantic_core-2.46.4-cp314-cp314t-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:0cbe8b01f948de4286c74cdd6c667aceb38f5c1e26f0693b3983d9d74887c65e", size = 2236641, upload-time = "2026-05-06T13:37:08.096Z" }, + { url = "https://files.pythonhosted.org/packages/60/db/12e93e46a8bac9988be3c016860f83293daea8c716c029c9ace279036f2f/pydantic_core-2.46.4-cp314-cp314t-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:617d7e2ca7dcb8c5cf6bcb8c59b8832c94b36196bbf1cbd1bfb56ed341905edd", size = 2286404, upload-time = "2026-05-06T13:40:20.221Z" }, + { url = "https://files.pythonhosted.org/packages/e2/4a/4d8b19008f38d31c53b8219cfedc2e3d5de5fe99d90076b7e767de29274f/pydantic_core-2.46.4-cp314-cp314t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7027560ee92211647d0d34e3f7cd6f50da56399d26a9c8ad0da286d3869a53f3", size = 2109219, upload-time = "2026-05-06T13:38:12.153Z" }, + { url = "https://files.pythonhosted.org/packages/88/70/3cbc40978fefb7bb09c6708d40d4ad1a5d70fd7213c3d17f971de868ec1f/pydantic_core-2.46.4-cp314-cp314t-manylinux_2_31_riscv64.whl", hash = "sha256:f99626688942fb746e545232e7726926f3be91b5975f8b55327665fafda991c7", size = 2110594, upload-time = "2026-05-06T13:40:02.971Z" }, + { url = "https://files.pythonhosted.org/packages/9d/20/b8d36736216e29491125531685b2f9e61aa5b4b2599893f8268551da3338/pydantic_core-2.46.4-cp314-cp314t-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:fc3e9034a63de20e15e8ade85358bc6efc614008cab72898b4b4952bea0509ff", size = 2159542, upload-time = "2026-05-06T13:39:27.506Z" }, + { url = "https://files.pythonhosted.org/packages/1d/a2/367df868eb584dacf6bf82a389272406d7178e301c4ac82545ab98bc2dd9/pydantic_core-2.46.4-cp314-cp314t-musllinux_1_1_aarch64.whl", hash = "sha256:97e7cf2be5c77b7d1a9713a05605d49460d02c6078d38d8bef3cbe323c548424", size = 2168146, upload-time = "2026-05-06T13:38:31.93Z" }, + { url = "https://files.pythonhosted.org/packages/c1/b8/4460f77f7e201893f649a29ab355dddd3beee8a97bcb1a320db414f9a06e/pydantic_core-2.46.4-cp314-cp314t-musllinux_1_1_armv7l.whl", hash = "sha256:3bf92c5d0e00fefaab325a4d27828fe6b6e2a21848686b5b60d2d9eeb09d76c6", size = 2306309, upload-time = "2026-05-06T13:37:44.717Z" }, + { url = "https://files.pythonhosted.org/packages/64/c4/be2639293acd87dc8ddbcec41a73cee9b2ebf996fe6d892a1a74e88ad3f7/pydantic_core-2.46.4-cp314-cp314t-musllinux_1_1_x86_64.whl", hash = "sha256:3ecbc122d18468d06ca279dc26a8c2e2d5acb10943bb35e36ae92096dc3b5565", size = 2369736, upload-time = "2026-05-06T13:37:05.645Z" }, + { url = "https://files.pythonhosted.org/packages/30/a6/9f9f380dbb301f67023bf8f707aaa75daadf84f7152d95c410fd7e81d994/pydantic_core-2.46.4-cp314-cp314t-win32.whl", hash = "sha256:e846ae7835bf0703ae43f534ab79a867146dadd59dc9ca5c8b53d5c8f7c9ef02", size = 1955575, upload-time = "2026-05-06T13:38:51.116Z" }, + { url = "https://files.pythonhosted.org/packages/40/1f/f1eb9eb350e795d1af8586289746f5c5677d16043040d63710e22abc43c9/pydantic_core-2.46.4-cp314-cp314t-win_amd64.whl", hash = "sha256:2108ba5c1c1eca18030634489dc544844144ee36357f2f9f780b93e7ddbb44b5", size = 2051624, upload-time = "2026-05-06T13:38:21.672Z" }, + { url = "https://files.pythonhosted.org/packages/f6/d2/42dd53d0a85c27606f316d3aa5d2869c4e8470a5ed6dec30e4a1abe19192/pydantic_core-2.46.4-cp314-cp314t-win_arm64.whl", hash = "sha256:4fcbe087dbc2068af7eda3aa87634eba216dbda64d1ae73c8684b621d33f6596", size = 2017325, upload-time = "2026-05-06T13:40:52.723Z" }, + { url = "https://files.pythonhosted.org/packages/ee/a4/73995fd4ebbb46ba0ee51e6fa049b8f02c40daebb762208feda8a6b7894d/pydantic_core-2.46.4-graalpy311-graalpy242_311_native-macosx_10_12_x86_64.whl", hash = "sha256:14d4edf427bdcf950a8a02d7cb44a08614388dd6e1bdcbf4f67504fa7887da9c", size = 2111589, upload-time = "2026-05-06T13:37:10.817Z" }, + { url = "https://files.pythonhosted.org/packages/fb/7f/f37d3a5e8bfcc2e403f5c57a730f2d815693fb42119e8ea48b3789335af1/pydantic_core-2.46.4-graalpy311-graalpy242_311_native-macosx_11_0_arm64.whl", hash = "sha256:0ce40cd7b21210e99342afafbd4d0f76d784eb5b1d60f3bdc566be4983c6c73b", size = 1944552, upload-time = "2026-05-06T13:36:56.717Z" }, + { url = "https://files.pythonhosted.org/packages/15/3c/d7eb777b3ff43e8433a4efb39a17aa8fd98a4ee8561a24a67ef5db07b2d6/pydantic_core-2.46.4-graalpy311-graalpy242_311_native-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:90884113d8b48f760e9587002789ddd741e76ab9f89518cd1e43b1f1a52ec44b", size = 1982984, upload-time = "2026-05-06T13:39:06.207Z" }, + { url = "https://files.pythonhosted.org/packages/63/87/70b9f40170a81afd55ca26c9b2acb25c20d64bcfbf888fafecb3ba077d4c/pydantic_core-2.46.4-graalpy311-graalpy242_311_native-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:66ce7632c22d837c95301830e111ad0128a32b8207533b60896a96c4915192ea", size = 2138417, upload-time = "2026-05-06T13:39:45.476Z" }, + { url = "https://files.pythonhosted.org/packages/9d/1d/8987ad40f65ae1432753072f214fb5c74fe47ffbd0698bb9cbbb585664f8/pydantic_core-2.46.4-graalpy312-graalpy250_312_native-macosx_10_12_x86_64.whl", hash = "sha256:1d8ba486450b14f3b1d63bc521d410ec7565e52f887b9fb671791886436a42f7", size = 2095527, upload-time = "2026-05-06T13:39:52.283Z" }, + { url = "https://files.pythonhosted.org/packages/64/d3/84c282a7eee1d3ac4c0377546ef5a1ea436ce26840d9ac3b7ed54a377507/pydantic_core-2.46.4-graalpy312-graalpy250_312_native-macosx_11_0_arm64.whl", hash = "sha256:3009f12e4e90b7f88b4f9adb1b0c4a3d58fe7820f3238c190047209d148026df", size = 1936024, upload-time = "2026-05-06T13:40:15.671Z" }, + { url = "https://files.pythonhosted.org/packages/d7/ca/eac61596cdeb4d7e174d3dc0bd8a6238f14f75f97a24e7b7db4c7e7340a0/pydantic_core-2.46.4-graalpy312-graalpy250_312_native-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ad785e92e6dc634c21555edc8bd6b64957ab844541bcb96a1366c202951ae526", size = 1990696, upload-time = "2026-05-06T13:38:34.717Z" }, + { url = "https://files.pythonhosted.org/packages/fa/c3/7c8b240552251faf6b3a957db200fcfbbcec36763c050428b601e0c9b83b/pydantic_core-2.46.4-graalpy312-graalpy250_312_native-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:00c603d540afdd6b80eb39f078f33ebd46211f02f33e34a32d9f053bba711de0", size = 2147590, upload-time = "2026-05-06T13:39:29.883Z" }, + { url = "https://files.pythonhosted.org/packages/11/cb/428de0385b6c8d44b716feba566abfacfbd23ee3c4439faa789a1456242f/pydantic_core-2.46.4-pp311-pypy311_pp73-macosx_10_12_x86_64.whl", hash = "sha256:0c563b08bca408dc7f65f700633d8442fffb2421fc47b8101377e9fd65051ff0", size = 2112782, upload-time = "2026-05-06T13:37:04.016Z" }, + { url = "https://files.pythonhosted.org/packages/0b/b5/6a17bdadd0fc1f170adfd05a20d37c832f52b117b4d9131da1f41bb097ce/pydantic_core-2.46.4-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:db06ffe51636ffe9ca531fe9023dd64bdd794be8754cb5df57c5498ae5b518a7", size = 1952146, upload-time = "2026-05-06T13:39:43.092Z" }, + { url = "https://files.pythonhosted.org/packages/2a/dc/03734d80e362cd43ef65428e9de77c730ce7f2f11c60d2b1e1b39f0fbf99/pydantic_core-2.46.4-pp311-pypy311_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:133878133d271ade3d41d1bfb2a45ec38dbdbda40bc065921c6b04e4630127e2", size = 2134492, upload-time = "2026-05-06T13:36:58.124Z" }, + { url = "https://files.pythonhosted.org/packages/de/df/5e5ffc085ed07cc22d298134d3d911c63e91f6a0eb91fe646750a3209910/pydantic_core-2.46.4-pp311-pypy311_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:9bc519fbf2b7578398853d815009ae5e4d4603d12f4e3f91da8c06852d3da3e9", size = 2156604, upload-time = "2026-05-06T13:37:49.88Z" }, + { url = "https://files.pythonhosted.org/packages/81/44/6e112a4253e56f5705467cbab7ab5e91ee7398ba3d56d358635958893d3e/pydantic_core-2.46.4-pp311-pypy311_pp73-musllinux_1_1_aarch64.whl", hash = "sha256:c7a7bd4e39e8e4c12c39cd480356842b6a8a06e41b23a55a5e3e191718838ddf", size = 2183828, upload-time = "2026-05-06T13:37:43.053Z" }, + { url = "https://files.pythonhosted.org/packages/ac/ad/5565071e937d8e752842ac241463944c9eb14c87e2d269f2658a5bd05e98/pydantic_core-2.46.4-pp311-pypy311_pp73-musllinux_1_1_armv7l.whl", hash = "sha256:d396ec2b979760aaf3218e76c24e65bd0aca24983298653b3a9d7a45f9e47b30", size = 2310000, upload-time = "2026-05-06T13:37:56.694Z" }, + { url = "https://files.pythonhosted.org/packages/4f/c3/66883a5cec183e7fba4d024b4cbbe61851a63750ef606b0afecc46d1f2bf/pydantic_core-2.46.4-pp311-pypy311_pp73-musllinux_1_1_x86_64.whl", hash = "sha256:86e1a4418c6cd97d60c95c71164158eaf7324fae7b0923264016baa993eba6fc", size = 2361286, upload-time = "2026-05-06T13:40:05.667Z" }, + { url = "https://files.pythonhosted.org/packages/4b/2d/69abac8f838090bbecd5df894befb2c2619e7996a98ddb949db9f3b93225/pydantic_core-2.46.4-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:d51026d73fcfd93610abc7b27789c26b313920fcfb20e27462d74a7f8b06e983", size = 2193071, upload-time = "2026-05-06T13:38:08.682Z" }, +] + +[[package]] +name = "pydantic-settings" +version = "2.14.1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "pydantic" }, + { name = "python-dotenv" }, + { name = "typing-inspection" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/07/60/1d1e59c9c90d54591469ada7d268251f71c24bdb765f1a8a832cee8c6653/pydantic_settings-2.14.1.tar.gz", hash = "sha256:e874d3bec7e787b0c9958277956ed9b4dd5de6a80e162188fdaff7c5e26fd5fa", size = 235551, upload-time = "2026-05-08T13:40:06.542Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/ae/8d/f1af3832f5e6eb13ba94ee809e72b8ecb5eef226d27ee0bef7d963d943c7/pydantic_settings-2.14.1-py3-none-any.whl", hash = "sha256:6e3c7edfd8277687cdc598f56e5cff0e9bfff0910a3749deaa8d4401c3a2b9de", size = 60964, upload-time = "2026-05-08T13:40:04.958Z" }, +] + +[[package]] +name = "pyflakes" +version = "3.4.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/45/dc/fd034dc20b4b264b3d015808458391acbf9df40b1e54750ef175d39180b1/pyflakes-3.4.0.tar.gz", hash = "sha256:b24f96fafb7d2ab0ec5075b7350b3d2d2218eab42003821c06344973d3ea2f58", size = 64669, upload-time = "2025-06-20T18:45:27.834Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/c2/2f/81d580a0fb83baeb066698975cb14a618bdbed7720678566f1b046a95fe8/pyflakes-3.4.0-py2.py3-none-any.whl", hash = "sha256:f742a7dbd0d9cb9ea41e9a24a918996e8170c799fa528688d40dd582c8265f4f", size = 63551, upload-time = "2025-06-20T18:45:26.937Z" }, +] + +[[package]] +name = "pygments" +version = "2.20.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/c3/b2/bc9c9196916376152d655522fdcebac55e66de6603a76a02bca1b6414f6c/pygments-2.20.0.tar.gz", hash = "sha256:6757cd03768053ff99f3039c1a36d6c0aa0b263438fcab17520b30a303a82b5f", size = 4955991, upload-time = "2026-03-29T13:29:33.898Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/f4/7e/a72dd26f3b0f4f2bf1dd8923c85f7ceb43172af56d63c7383eb62b332364/pygments-2.20.0-py3-none-any.whl", hash = "sha256:81a9e26dd42fd28a23a2d169d86d7ac03b46e2f8b59ed4698fb4785f946d0176", size = 1231151, upload-time = "2026-03-29T13:29:30.038Z" }, +] + +[[package]] +name = "pymatgen" +version = "2026.5.4" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "pymatgen-core" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/0c/a1/727feae7083bb3b10ba9d43ccbbe83317d4654957a08cee52096ef86bfde/pymatgen-2026.5.4.tar.gz", hash = "sha256:4998d6084da72224c8025dc1e9645b2aab73896109a7ef1e05bd479a25a55b79", size = 743199, upload-time = "2026-05-04T22:03:24.675Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/a2/3a/de29b0b6c1740098c3ccdd3fa69336dc39b5efc6840a55e30dcaea01a19b/pymatgen-2026.5.4-py3-none-any.whl", hash = "sha256:7815cd4310c6d5a465b0da14a1633479cf61366676e62764db17f7e2a20d1974", size = 829056, upload-time = "2026-05-04T22:03:22.327Z" }, +] + +[[package]] +name = "pymatgen-core" +version = "2026.5.18" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "bibtexparser" }, + { name = "joblib" }, + { name = "lxml" }, + { name = "matplotlib" }, + { name = "monty" }, + { name = "networkx" }, + { name = "numpy" }, + { name = "orjson" }, + { name = "palettable" }, + { name = "pandas" }, + { name = "plotly" }, + { name = "requests" }, + { name = "scipy" }, + { name = "spglib" }, + { name = "sympy" }, + { name = "tabulate" }, + { name = "tqdm" }, + { name = "uncertainties" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/74/ed/b52bb7ab2b9ca0e69ea54b919ddba13c5636b960f7b9f4fab0d0aa0a502b/pymatgen_core-2026.5.18.tar.gz", hash = "sha256:bdbe8c591bbac7ed65922d710e94b661bb540baae27217ceadd59e31e9c3ff07", size = 2860012, upload-time = "2026-05-18T23:39:30.786Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/9d/14/1f02bea594033a000c68980a362ae670be7832e72281c8acbad35fbfb218/pymatgen_core-2026.5.18-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:d712b5098a281f6f499f039b079d9c45d8d45d83d378de42261c5aa9333e3ce1", size = 2923247, upload-time = "2026-05-18T23:39:28.443Z" }, + { url = "https://files.pythonhosted.org/packages/0d/bd/fc63c1c6be5bf0aeb810f12374f14ad3a0bad7b14736649e2ebe960f51d0/pymatgen_core-2026.5.18-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:69a51c5332bc9666f05f07d3e0a5f9eef28c44681bfe05781628b9e2846df07b", size = 4434150, upload-time = "2026-05-19T02:15:06.754Z" }, + { url = "https://files.pythonhosted.org/packages/f5/c0/9a6668d441d51f87eebd3263cd49399179f980764d3ab0d3b9d1faa1e0fe/pymatgen_core-2026.5.18-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:f31bbf0821eeb5570defaa511e2152480cc39e1127d78551f01343a961e165f6", size = 4462716, upload-time = "2026-05-19T02:15:08.724Z" }, + { url = "https://files.pythonhosted.org/packages/c9/a2/6671b3059d1e87964cd8589ec622958ecd4755b84078b092d2e679999e4e/pymatgen_core-2026.5.18-cp311-cp311-win32.whl", hash = "sha256:f0956528c54ced5bbf648f947f05935ab8159656a8df24cf22cb251ec9d74a5d", size = 2858798, upload-time = "2026-05-19T02:15:10.602Z" }, + { url = "https://files.pythonhosted.org/packages/75/26/86520647872bdae9669009beaa01250d37ad6e1b3942a9c88c6610c757c0/pymatgen_core-2026.5.18-cp311-cp311-win_amd64.whl", hash = "sha256:d0b5991048433a0cfd153eb0bb5920740042ea67521d78a04de5390f70461b2a", size = 2900587, upload-time = "2026-05-19T02:15:12.385Z" }, + { url = "https://files.pythonhosted.org/packages/23/00/35ccf35580d6caa1a88ea427df9e23628d64aef53b5752d377581f013098/pymatgen_core-2026.5.18-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:26709975fb33070fdf1b1bde301694ef5774d39b91d6dc7b27876bf30fb068ad", size = 2927363, upload-time = "2026-05-19T02:15:14.143Z" }, + { url = "https://files.pythonhosted.org/packages/23/06/2931ca449754e2b7d895d2185c99515b0d12a3c44a2e05142cc756e2d137/pymatgen_core-2026.5.18-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:938688b6d897183f9612122cdeee7613967e189932842eaf40008210d257e5aa", size = 4434814, upload-time = "2026-05-19T02:15:15.673Z" }, + { url = "https://files.pythonhosted.org/packages/ca/21/a54cf445b00d6bdf71fafc35079f4e810755947d0f4758447dfe12ac44b6/pymatgen_core-2026.5.18-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:070230f3ecaec435f5896d9579f614e14020cc079e6443c15b9ea971841812c0", size = 4481429, upload-time = "2026-05-19T02:15:17.313Z" }, + { url = "https://files.pythonhosted.org/packages/4d/22/5c8c8abd8367e387ec97c32c8504c1f1ef821fc41e8bd325fe40c6aa866f/pymatgen_core-2026.5.18-cp312-cp312-win32.whl", hash = "sha256:21615334c07d2211f2c9420181cab3f1aace66a7a3673f8cdbbeb27741681ed0", size = 2857740, upload-time = "2026-05-19T02:15:19.333Z" }, + { url = "https://files.pythonhosted.org/packages/26/6e/c0502db344f707469683c26bb685f918b6bdfb79211a2fa9fafe63636d3c/pymatgen_core-2026.5.18-cp312-cp312-win_amd64.whl", hash = "sha256:46e87242e881b44034cf9a9480c0bbc39f566c2918126689aa6898b3538e18ec", size = 2900927, upload-time = "2026-05-19T02:15:21.179Z" }, + { url = "https://files.pythonhosted.org/packages/7d/93/bb20fe038df5c36214fcded3c1b23623fdc00465bf300a1e3603dadf42c2/pymatgen_core-2026.5.18-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:531ab9284e48890bd29a537f6183c52fd9e5488cb86d125ac2c7ebe0a2bfd239", size = 2925181, upload-time = "2026-05-19T02:15:23.288Z" }, + { url = "https://files.pythonhosted.org/packages/81/d8/7a6eab09b88ca5a4997e19f080cb43eccbda1f70fcd213b14df36db14616/pymatgen_core-2026.5.18-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:1f5eced053f989fb5818ced84cc26dc88a06522740c24a0b410674b386ad331d", size = 4416899, upload-time = "2026-05-19T02:15:25.216Z" }, + { url = "https://files.pythonhosted.org/packages/9d/5b/17bdac8864553080fe076cd511052dc031bf7f422ebf14d3bc801a1f0874/pymatgen_core-2026.5.18-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:123be72bb2df4f22534f0926c2ffc188594251f2998ab7d9df6f76db81ae466b", size = 4462454, upload-time = "2026-05-19T02:15:27.151Z" }, + { url = "https://files.pythonhosted.org/packages/08/cd/a8850adb8ba26fe77ac0b4efa77f4c03ebfa1e673c388c8cd0dac8d752b1/pymatgen_core-2026.5.18-cp313-cp313-win32.whl", hash = "sha256:12391b53f98c6bae5a4875c1efc558f303857e06347580f31e3d79c2353c86e8", size = 2857426, upload-time = "2026-05-19T02:15:29.062Z" }, + { url = "https://files.pythonhosted.org/packages/cd/41/57d429a2a8f7a9599735823580da304e30066ac9029f78a8af88ae041990/pymatgen_core-2026.5.18-cp313-cp313-win_amd64.whl", hash = "sha256:417a4410537b49cd7d4970518ece69182ba7cae0c71e7f7fb9bd15b896e059f4", size = 2900292, upload-time = "2026-05-19T02:15:30.528Z" }, + { url = "https://files.pythonhosted.org/packages/24/cf/c075084fc03fbb11ccc9a5d07d37163eb2dfaf6b6981cbec7c1f7955bd6b/pymatgen_core-2026.5.18-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:41f390215a28ba9c5fba5ccf414a0dca6824a4d463d09008eacc59dfe89c5f45", size = 2927369, upload-time = "2026-05-19T02:15:32.055Z" }, + { url = "https://files.pythonhosted.org/packages/b7/30/45cb3d86a9b9ff20fee497e5fe3a10e922785fa269d597a76c19066d4207/pymatgen_core-2026.5.18-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:31833fa81a264842e782039f4cf46a9ceaacb485639ea3d4606f3d06e1d1d6d6", size = 4413086, upload-time = "2026-05-19T02:15:34.007Z" }, + { url = "https://files.pythonhosted.org/packages/19/b8/548cf1d1b78e03535fa2b2fe90860946ed45c1b29befd3d1fe43fc87a005/pymatgen_core-2026.5.18-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:7199b2f7ae7e0ba5ae3af23f5d16e13ae69a37d4015d94d4f62d5ada544fb4eb", size = 4448826, upload-time = "2026-05-19T02:15:35.761Z" }, + { url = "https://files.pythonhosted.org/packages/39/09/2d8e42942421d35e2f0c4db92d7fd9eb52f2f03d688999592a9f758afd4f/pymatgen_core-2026.5.18-cp314-cp314-win32.whl", hash = "sha256:845a4337c84bfbd1e48e9c3200ae6b1868d1486a0e8e277e16d3dc64c46e4f17", size = 2843984, upload-time = "2026-05-19T02:15:37.379Z" }, + { url = "https://files.pythonhosted.org/packages/d3/6a/8233be4b903bd3ff6e04556b025e1b476cc1918675c2d6b4383db868f9ce/pymatgen_core-2026.5.18-cp314-cp314-win_amd64.whl", hash = "sha256:f4d1a2f2f37b25ff3ce33dd6ff06303b2d1d735c8a525ba2a970e25803afc4b0", size = 2887831, upload-time = "2026-05-19T02:15:38.902Z" }, +] + +[[package]] +name = "pymongo" +version = "4.17.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "dnspython" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/ca/64/50be6fbac9c79fe2e4c17401a467da2d8764d82833d83cec325afe5cab32/pymongo-4.17.0.tar.gz", hash = "sha256:70ffa08ba641468cc068cf46c06b34f01a8ce3489f6411309fcb5ceabe6b2fc0", size = 2523370, upload-time = "2026-04-20T16:39:53.524Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/c4/e2/336d86f221cf1b56b2ed9330d4a3b98f9f38f0b37829ae9a9184617d5419/pymongo-4.17.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:4141e6c6a339789b2974efa00ecd9409101672d77a0e3ee2cc3839eedf8ec4df", size = 874668, upload-time = "2026-04-20T16:37:41.39Z" }, + { url = "https://files.pythonhosted.org/packages/34/8e/75d3c6c935d187ab59c61e9c15d9aab3f274b563eaf1706e8cae5f508dec/pymongo-4.17.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:e68c76b84e0c132d9dbf9307f12ff8185702328187a87b9aca8c941303873433", size = 875294, upload-time = "2026-04-20T16:37:43.432Z" }, + { url = "https://files.pythonhosted.org/packages/5f/ec/62e855744489dbcd54fd778aae4d80fa4c4819e8fb228ca0cf6f21a03997/pymongo-4.17.0-cp311-cp311-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:ba2195d4f386f839a52a23ea1cfd60ffaaba78a3d7841db51b7e433001139918", size = 1496233, upload-time = "2026-04-20T16:37:45.518Z" }, + { url = "https://files.pythonhosted.org/packages/82/e8/93e4e5e5ce8fdf8929dabeefe24aafa5ce046028eed0dfa8eeb936e72c49/pymongo-4.17.0-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:8446ff4bfcb6ec2a2e50998c860986a1e992136f998b7f53e7a717fb8aa5a0b9", size = 1522927, upload-time = "2026-04-20T16:37:47.492Z" }, + { url = "https://files.pythonhosted.org/packages/f7/ca/425dc1d21e0f17bdea0072fc463f662f7fa06d2852af52975c9eced3c07c/pymongo-4.17.0-cp311-cp311-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:2a0d5ac205728c86e0a02192f1aa5f865b0d7d51f8df6101c01a69a7fc620d72", size = 1583468, upload-time = "2026-04-20T16:37:49.221Z" }, + { url = "https://files.pythonhosted.org/packages/b3/9d/f08b07eeffda1a43c1759f0fa625e88ae12360996eb56d42aad832fa7dff/pymongo-4.17.0-cp311-cp311-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:485c8a8eaa4c739f00a331fc73757898ee7c092c214a79e63866ff76aaf282ff", size = 1572787, upload-time = "2026-04-20T16:37:51.061Z" }, + { url = "https://files.pythonhosted.org/packages/e9/c2/6855a07aafa7b894929af23675b6fb9634800ce43122b76a62f6eeb8da2a/pymongo-4.17.0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:b2dfcc795f5b9fedbe179a11fdf6051581479d196582a3fe819a92a00e9b9969", size = 1526184, upload-time = "2026-04-20T16:37:53.358Z" }, + { url = "https://files.pythonhosted.org/packages/4e/05/c952bac7db71c1942ea3559fcd308b49754cc5004b455935fb4000d1f37b/pymongo-4.17.0-cp311-cp311-win32.whl", hash = "sha256:c2292144505fb12156b981bd440f3dc994a883da06ac726c0c8692ccdbc1c510", size = 852621, upload-time = "2026-04-20T16:37:55.28Z" }, + { url = "https://files.pythonhosted.org/packages/11/c0/c04da9f4c0c6252404598f4e394b862a58a9e866822a70ae261c8a018fdf/pymongo-4.17.0-cp311-cp311-win_amd64.whl", hash = "sha256:2e190827834fce70ecdf9d46796c6dbc0ce08ea87dc2ff5bc6f3f5579b605cb9", size = 867852, upload-time = "2026-04-20T16:37:57.233Z" }, + { url = "https://files.pythonhosted.org/packages/1d/b2/c7b4870fbeef471e947d3e014676f5910d02e0197074d692ebcf24ec049a/pymongo-4.17.0-cp311-cp311-win_arm64.whl", hash = "sha256:a8f9c40a09bb7d4b9fc8b1da65ecf6efa79bda5cb2756f39d9b6940fac1d19ae", size = 855019, upload-time = "2026-04-20T16:37:58.983Z" }, + { url = "https://files.pythonhosted.org/packages/98/90/60bcb508840135d5ee46b51b1a950f548338aa8145a8366dbe6639ae51ac/pymongo-4.17.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:d53ffa94b2340dbf6b055e09a0090618c60482c158ecfc9565642fc996bf0944", size = 930529, upload-time = "2026-04-20T16:38:00.936Z" }, + { url = "https://files.pythonhosted.org/packages/a6/e9/313840f1e52c6dfac47f704428cbfbce59956ebe7633bffc92b03f74f0ad/pymongo-4.17.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:6fe0de9d0f6791abce3471230b32b4817bf89d27b1182b6a550e1ec0fa72aa9a", size = 930665, upload-time = "2026-04-20T16:38:02.915Z" }, + { url = "https://files.pythonhosted.org/packages/78/35/9d3565ea45b1606f635c1e2cd2563c28d66caafdc50f7ad7d979fcd1b363/pymongo-4.17.0-cp312-cp312-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:e537e95514dae1aaa718f481ec03151a0f0394bcd05f1322896d8fc1330cb729", size = 1762369, upload-time = "2026-04-20T16:38:05.375Z" }, + { url = "https://files.pythonhosted.org/packages/95/ee/149b0d4b1a11c38bff6f14c23d5814c9b0843fd6dc38ad40596bdb1a62d2/pymongo-4.17.0-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:37a8385c29881b43eab31f584100fa0eaddedd5607adf010147ba1810118be90", size = 1798044, upload-time = "2026-04-20T16:38:07.195Z" }, + { url = "https://files.pythonhosted.org/packages/7b/d4/4cee4a7b8d8f6f0550ef6cd2fea42455c5ed619a220cb6ba4fb40d6a5bc8/pymongo-4.17.0-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:f3ee3d241ed77a4fc99ce3cff3b289c3ebce37f61fdd7349d3592c23b82c8784", size = 1878567, upload-time = "2026-04-20T16:38:09.121Z" }, + { url = "https://files.pythonhosted.org/packages/45/ef/7fe366c84952619ee2f69973566c214775e083dd4df465751912153e4b72/pymongo-4.17.0-cp312-cp312-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:9eb5d63a3c518cb0804ed678f5e2b875af032d89a7cf57a57360322cf6a4d222", size = 1864881, upload-time = "2026-04-20T16:38:10.896Z" }, + { url = "https://files.pythonhosted.org/packages/2f/35/b577d82c6d1be7aee7ac7e249bc86f7847998345042e5f8360de238e177b/pymongo-4.17.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:8e97e03fa13327c87e3fdc5656acd01e71817f0c1dc3221cd8f30de136bf4ec3", size = 1800349, upload-time = "2026-04-20T16:38:13.589Z" }, + { url = "https://files.pythonhosted.org/packages/b8/69/dafcf04f66e130ddd91aeb92e7a692480eda46dcd04ec1dbe82c06619e10/pymongo-4.17.0-cp312-cp312-win32.whl", hash = "sha256:6877214bff5f06f6884a9fc8d9016a4a7a5f51f537f5c51ac3a576f93e7dfb32", size = 900518, upload-time = "2026-04-20T16:38:15.541Z" }, + { url = "https://files.pythonhosted.org/packages/11/35/5c9262a459f988b4eb2605f70815240b77a0d4131136c4326d18f1822b89/pymongo-4.17.0-cp312-cp312-win_amd64.whl", hash = "sha256:9828485f72f63c7d802e0ec41f71906f633c2692621ab3af55ca990186b091b1", size = 920335, upload-time = "2026-04-20T16:38:17.665Z" }, + { url = "https://files.pythonhosted.org/packages/8d/da/e9c7265ee176faccf4e52c4797837e794d93569a1046f6b19a4acc36e5ad/pymongo-4.17.0-cp312-cp312-win_arm64.whl", hash = "sha256:1195370a77baf003b59b10e91ecc4706297197f0dd9d29c840cc556dc08f7cee", size = 903289, upload-time = "2026-04-20T16:38:19.33Z" }, + { url = "https://files.pythonhosted.org/packages/2a/6b/c1206879708b94e82fcd8b9653440ec271f79a3674d122192df383047f5a/pymongo-4.17.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:809ec74de3b9148ae43fa8df9faf53470f511c8d384f13b99d6f671f2a379f15", size = 985829, upload-time = "2026-04-20T16:38:21.031Z" }, + { url = "https://files.pythonhosted.org/packages/cb/cf/bb044ed85160e5c40f568c7c4f4e8ea16f40764ff5d302e5befbe8f6f814/pymongo-4.17.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:a431b737816bf4cddd4fa0fcef04e424ad36b7692734a64150f872fb8f3208be", size = 985899, upload-time = "2026-04-20T16:38:23.409Z" }, + { url = "https://files.pythonhosted.org/packages/74/0a/f6dfd5ea3901e5d6888da8de8ba728971a1d447debab681cfc56f90d1208/pymongo-4.17.0-cp313-cp313-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:e4fab10f8403169ce92f3cea921609d9ee81107306caae06c08f592d4b8ad2b5", size = 2028569, upload-time = "2026-04-20T16:38:25.343Z" }, + { url = "https://files.pythonhosted.org/packages/4a/c5/081f59a1c02ae8c0dc73ae58e563838c44eec81aeafa7d0b93a637841c9b/pymongo-4.17.0-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:20323b0b1c1d33770ad1fc68d429c757734ce9ad3594421c3d6618f10572b1b9", size = 2072916, upload-time = "2026-04-20T16:38:27.291Z" }, + { url = "https://files.pythonhosted.org/packages/31/42/6e41d434297ffe8b30d9c3717916591a4a7be9075a0dcc2fafdfaaaa62ed/pymongo-4.17.0-cp313-cp313-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:5a5de048e6da5c18e27cc2437e8c15b3b0cdc8385c15b41178b0caa3322a09c2", size = 2173234, upload-time = "2026-04-20T16:38:29.474Z" }, + { url = "https://files.pythonhosted.org/packages/3d/cf/1e4a7db352ef9485831c7268dfe8402f0117b32a9ad54b16e810699e3617/pymongo-4.17.0-cp313-cp313-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:dff3de1294fbbc1db0ba6b511f77b8e540601d092538a31312e99c8a91a78b1e", size = 2156784, upload-time = "2026-04-20T16:38:32.134Z" }, + { url = "https://files.pythonhosted.org/packages/12/10/6195be29962a61ebb5f4bd9e4c7519890b172f7968a0a0d880398c6ddb02/pymongo-4.17.0-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:faf03e4c2aafd6de626dbd30ba246d369ae33f47f10629d1bbe40f72115027a6", size = 2074446, upload-time = "2026-04-20T16:38:34.004Z" }, + { url = "https://files.pythonhosted.org/packages/37/48/33410b8819837ed370c738587306bdf060b59cef11823be212f4a07703c5/pymongo-4.17.0-cp313-cp313-win32.whl", hash = "sha256:c9786665926a09630c5d420c79762cfadbff35a9438bcbc4c81a9fb5ab9228b7", size = 948435, upload-time = "2026-04-20T16:38:35.922Z" }, + { url = "https://files.pythonhosted.org/packages/6f/77/c0ed522f798a286b99acaa7914ed8d9c80ab091f97f57c59ffed72906e5e/pymongo-4.17.0-cp313-cp313-win_amd64.whl", hash = "sha256:5960519b4d7168f1ecdd3ea10c81b2aedeb9423651aca953cfbc8e76705d3b38", size = 972847, upload-time = "2026-04-20T16:38:37.888Z" }, + { url = "https://files.pythonhosted.org/packages/97/f0/c39480a2db385fde23861d0c8acda41cdaf1d43e46579db72c5c013a2e81/pymongo-4.17.0-cp313-cp313-win_arm64.whl", hash = "sha256:0ff6bd2f735ab5356541e3e57d5b7dbfbc3f2ee1ccb10b6b0f82d58af69d1d8e", size = 951575, upload-time = "2026-04-20T16:38:40.544Z" }, + { url = "https://files.pythonhosted.org/packages/da/49/2b0250762a89737ed6f9cea238331baca061b89a8ddd10dd17fee52c3970/pymongo-4.17.0-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:ff5aa3f1c7e3f08eb0e7a016c91ba468b1850ccfd63d9b1f12f56350f4974cef", size = 1040945, upload-time = "2026-04-20T16:38:42.783Z" }, + { url = "https://files.pythonhosted.org/packages/89/1c/7a9b5447a08be20e84b6e5b17330917e8d6d9507daa3cd099a9309f11ad7/pymongo-4.17.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:e816db649ba5d7de0568cf3a9f287a9dc9aad21cf0ca667ab156a7ef47fca0b0", size = 1041187, upload-time = "2026-04-20T16:38:45.358Z" }, + { url = "https://files.pythonhosted.org/packages/78/a1/71704f61632dfc90407a5834fe5f6132854937c4a3648f6c05c351d85a45/pymongo-4.17.0-cp314-cp314-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:12c4fded3a9f1d6a687e36ebd384ac6d00b9b00de1969aa74048e7051ec2a713", size = 2294806, upload-time = "2026-04-20T16:38:47.734Z" }, + { url = "https://files.pythonhosted.org/packages/ad/b9/aff42be75108b96c2469b1d9329b912c15108f3e7ef32fdc86da8423c330/pymongo-4.17.0-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:2db66aa8dd253a0fc1fad3b0d23d5b3993f7ebde02fbbd7727128debf2853675", size = 2348231, upload-time = "2026-04-20T16:38:50.371Z" }, + { url = "https://files.pythonhosted.org/packages/f2/30/44c115b8ba1479942c15fd9480eb29a7da0ba68acd56983423ba0deb4a94/pymongo-4.17.0-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:3987e96e7c7be4083d42e8ac2cc6c0d5b78db9973c90fce42ae800b616ca6b20", size = 2467614, upload-time = "2026-04-20T16:38:52.665Z" }, + { url = "https://files.pythonhosted.org/packages/d2/84/21ee95c8bf0ca7acae7ec7eb365d740bf8fc0156c194baf2c3bdfcb85ec0/pymongo-4.17.0-cp314-cp314-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:cee36b3c0d0354f880fa7a7fdcdaf2bb5e542c2281e25c1bfadf8cfe21eba7d2", size = 2445970, upload-time = "2026-04-20T16:38:55.175Z" }, + { url = "https://files.pythonhosted.org/packages/06/89/081d7f1809d5ca09d1e47e49f2111b245f5694de3a7af32cd3a353a6f43f/pymongo-4.17.0-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:320b34457b20bbcc79997801f95d25ce00472915ca5241167242b42c4359e027", size = 2348605, upload-time = "2026-04-20T16:38:57.557Z" }, + { url = "https://files.pythonhosted.org/packages/ea/c3/0d949f9d3f2a341c1f635c398c16615e96f89f51ff424ed81e914cf1a4de/pymongo-4.17.0-cp314-cp314-win32.whl", hash = "sha256:df4a644af9ae132d4bfdb2e9516ea51a615fd881caddfbfbd071cf1354844479", size = 1004119, upload-time = "2026-04-20T16:39:00.309Z" }, + { url = "https://files.pythonhosted.org/packages/f7/55/5c3a3db1048054c695c75c5964cc8bedc2247fdb5a75ef6fab4ec8bb013e/pymongo-4.17.0-cp314-cp314-win_amd64.whl", hash = "sha256:c797f8a80957134f6dd9690367a0f8f5906d672119af2c6aa55f0c527b656bed", size = 1032314, upload-time = "2026-04-20T16:39:02.665Z" }, + { url = "https://files.pythonhosted.org/packages/e0/19/e235f39906134cb0ffd5574c5a59c355ef5380f0499644ab94994afbb109/pymongo-4.17.0-cp314-cp314-win_arm64.whl", hash = "sha256:68fca71e05ee5da23a8d73cee8379dfb3d26e609a377cae731d742771ed96946", size = 1007627, upload-time = "2026-04-20T16:39:04.678Z" }, + { url = "https://files.pythonhosted.org/packages/1e/e0/c4c1a86791415b14c684fa0908f9da96de91594a3fd1fa1b8dc689fbb800/pymongo-4.17.0-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:b4384700cffc3f1dd98e088bc0072dedf6d7d68a230bb4b972665cf69c071c1e", size = 1099151, upload-time = "2026-04-20T16:39:06.969Z" }, + { url = "https://files.pythonhosted.org/packages/81/4b/69c67f3e23fd9b23b9bedc7ebd23754881cc9d5c5d5b2a9811e96b07f475/pymongo-4.17.0-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:93641192644fa1ee0f34030e774fd31022a27ad11ba22cb1716142231524f8bd", size = 1099346, upload-time = "2026-04-20T16:39:08.996Z" }, + { url = "https://files.pythonhosted.org/packages/a2/19/a5208f62f9508a26d73acc69bd3821b8c8adae253679a3c26d2f9652f0d5/pymongo-4.17.0-cp314-cp314t-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:75bc3aa5b94fdb7138d357ec6ca61cd97e0c79f4f7f0bd3efe9639b15cc50942", size = 2619034, upload-time = "2026-04-20T16:39:11.049Z" }, + { url = "https://files.pythonhosted.org/packages/77/27/426cba1ec5973082a56d4150798529bfdf4151c31391ed1fbbecb23ef2ac/pymongo-4.17.0-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:50e8f8e23c6df7c6d6929f5e734980b227706e73ee847517c9ba5af90f7fc466", size = 2689939, upload-time = "2026-04-20T16:39:13.617Z" }, + { url = "https://files.pythonhosted.org/packages/ef/2e/f70993d1255e33f6ee59a4ec4371cc65bff7a7e3fda7d55c3386f25287e8/pymongo-4.17.0-cp314-cp314t-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:15d3f3d732aecac1f8d481bde4029755615639bd3076f258a2147210aec8515a", size = 2824994, upload-time = "2026-04-20T16:39:16.057Z" }, + { url = "https://files.pythonhosted.org/packages/b3/eb/87b0e988ba889e1fcc3430c2cfc166b251872c813e92b43174298bee17ff/pymongo-4.17.0-cp314-cp314t-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:6c5f62862d0f87be481fa1fe8cb811994486773c94a2b61e509285e3f2890763", size = 2801745, upload-time = "2026-04-20T16:39:18.476Z" }, + { url = "https://files.pythonhosted.org/packages/67/4c/3f83412d086f682d4d468761d66ddc49cf161e786ea74073045eb4491c60/pymongo-4.17.0-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:64837adbbd72073301af51bb0fc80e3d7707fe5527cea1033ba0320f0b2f881b", size = 2684636, upload-time = "2026-04-20T16:39:20.878Z" }, + { url = "https://files.pythonhosted.org/packages/9e/d8/b75f6f4ab6c8beb50b0270a4f1e2530b5774f5e116563440e1677ca1820f/pymongo-4.17.0-cp314-cp314t-win32.whl", hash = "sha256:b93b22eedc62598cf5ee9d8c8007a8e9121c50fd88137012d8985500e9dc3151", size = 1056356, upload-time = "2026-04-20T16:39:22.996Z" }, + { url = "https://files.pythonhosted.org/packages/e4/5e/648c8a238eef18a25ed8a169ea6542d4a860bbec3e95b3d9badac2935c71/pymongo-4.17.0-cp314-cp314t-win_amd64.whl", hash = "sha256:3689ea34f6b647c7d1e7bdc60fcfb214b2789ed1359a7fb96569c69f50e5f18f", size = 1090964, upload-time = "2026-04-20T16:39:24.989Z" }, + { url = "https://files.pythonhosted.org/packages/dc/cb/d9780b66939c4fc1f024bcc7be23a2abcfe06a9745ca8fa76dc73395482e/pymongo-4.17.0-cp314-cp314t-win_arm64.whl", hash = "sha256:9543d8f84c2e5608565c08ac679774811e6730770d8a645439b073422a4276fb", size = 1058526, upload-time = "2026-04-20T16:39:27.924Z" }, +] + +[[package]] +name = "pyopenssl" +version = "26.2.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "cryptography" }, + { name = "typing-extensions", marker = "python_full_version < '3.13'" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/1a/51/27a5ad5f939d08f690a326ef9582cda7140555180db71695f6fb747d6a36/pyopenssl-26.2.0.tar.gz", hash = "sha256:8c6fcecd1183a7fc897548dfe388b0cdb7f37e018200d8409cf33959dbe35387", size = 182195, upload-time = "2026-05-04T23:06:09.72Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/73/b8/a0e2790ae249d6f38c9f66de7a211621a7ab2650217bcd04e1262f578a56/pyopenssl-26.2.0-py3-none-any.whl", hash = "sha256:4f9d971bc5298b8bc1fab282803da04bf000c755d4ad9d99b52de2569ca19a70", size = 55823, upload-time = "2026-05-04T23:06:08.395Z" }, +] + +[[package]] +name = "pyparsing" +version = "3.3.2" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/f3/91/9c6ee907786a473bf81c5f53cf703ba0957b23ab84c264080fb5a450416f/pyparsing-3.3.2.tar.gz", hash = "sha256:c777f4d763f140633dcb6d8a3eda953bf7a214dc4eff598413c070bcdc117cbc", size = 6851574, upload-time = "2026-01-21T03:57:59.36Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/10/bd/c038d7cc38edc1aa5bf91ab8068b63d4308c66c4c8bb3cbba7dfbc049f9c/pyparsing-3.3.2-py3-none-any.whl", hash = "sha256:850ba148bd908d7e2411587e247a1e4f0327839c40e2e5e6d05a007ecc69911d", size = 122781, upload-time = "2026-01-21T03:57:55.912Z" }, +] + +[[package]] +name = "pytest" +version = "9.0.3" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "colorama", marker = "sys_platform == 'win32'" }, + { name = "iniconfig" }, + { name = "packaging" }, + { name = "pluggy" }, + { name = "pygments" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/7d/0d/549bd94f1a0a402dc8cf64563a117c0f3765662e2e668477624baeec44d5/pytest-9.0.3.tar.gz", hash = "sha256:b86ada508af81d19edeb213c681b1d48246c1a91d304c6c81a427674c17eb91c", size = 1572165, upload-time = "2026-04-07T17:16:18.027Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/d4/24/a372aaf5c9b7208e7112038812994107bc65a84cd00e0354a88c2c77a617/pytest-9.0.3-py3-none-any.whl", hash = "sha256:2c5efc453d45394fdd706ade797c0a81091eccd1d6e4bccfcd476e2b8e0ab5d9", size = 375249, upload-time = "2026-04-07T17:16:16.13Z" }, +] + +[[package]] +name = "pytest-flake8" +version = "1.3.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "flake8" }, + { name = "pytest" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/4f/83/3b0154ccd60191e24b75c99c5e7c6dcfb1d2fd81dd47528523b38fed6ac6/pytest_flake8-1.3.0.tar.gz", hash = "sha256:88fb35562ce32d915c6ba41ef0d5e1cfcdd8ff884a32b7d46aa99fc77a3d1fe6", size = 13340, upload-time = "2024-11-09T00:09:09.249Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/7d/ca/163e24b6d92ba3e92245a6a23e88b946c29ff5294b2f4bc24c7a6171a13d/pytest_flake8-1.3.0-py3-none-any.whl", hash = "sha256:de10517c59fce25c0a7abb2a2b2a9d0b0ceb59ff0add7fa8e654d613bb25e218", size = 5966, upload-time = "2024-11-09T00:09:08.227Z" }, +] + +[[package]] +name = "pytest-pycodestyle" +version = "2.5.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "pycodestyle" }, + { name = "pytest" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/0f/60/634e069a52137207b988359319c7030b25195f014822724f259325fa3af5/pytest_pycodestyle-2.5.0.tar.gz", hash = "sha256:dd0060039e12a59b521da8e57e17133c965566dd8d17631e589e7545238829ac", size = 5859, upload-time = "2025-07-20T03:18:12.504Z" } + +[[package]] +name = "pytest-xdist" +version = "3.8.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "execnet" }, + { name = "pytest" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/78/b4/439b179d1ff526791eb921115fca8e44e596a13efeda518b9d845a619450/pytest_xdist-3.8.0.tar.gz", hash = "sha256:7e578125ec9bc6050861aa93f2d59f1d8d085595d6551c2c90b6f4fad8d3a9f1", size = 88069, upload-time = "2025-07-01T13:30:59.346Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/ca/31/d4e37e9e550c2b92a9cbc2e4d0b7420a27224968580b5a447f420847c975/pytest_xdist-3.8.0-py3-none-any.whl", hash = "sha256:202ca578cfeb7370784a8c33d6d05bc6e13b4f25b5053c30a152269fd10f0b88", size = 46396, upload-time = "2025-07-01T13:30:56.632Z" }, +] + +[[package]] +name = "python-dateutil" +version = "2.9.0.post0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "six" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/66/c0/0c8b6ad9f17a802ee498c46e004a0eb49bc148f2fd230864601a86dcf6db/python-dateutil-2.9.0.post0.tar.gz", hash = "sha256:37dd54208da7e1cd875388217d5e00ebd4179249f90fb72437e91a35459a0ad3", size = 342432, upload-time = "2024-03-01T18:36:20.211Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/ec/57/56b9bcc3c9c6a792fcbaf139543cee77261f3651ca9da0c93f5c1221264b/python_dateutil-2.9.0.post0-py2.py3-none-any.whl", hash = "sha256:a8b2bc7bffae282281c8140a97d3aa9c14da0b136dfe83f850eea9a5f7470427", size = 229892, upload-time = "2024-03-01T18:36:18.57Z" }, +] + +[[package]] +name = "python-dotenv" +version = "1.2.2" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/82/ed/0301aeeac3e5353ef3d94b6ec08bbcabd04a72018415dcb29e588514bba8/python_dotenv-1.2.2.tar.gz", hash = "sha256:2c371a91fbd7ba082c2c1dc1f8bf89ca22564a087c2c287cd9b662adde799cf3", size = 50135, upload-time = "2026-03-01T16:00:26.196Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/0b/d7/1959b9648791274998a9c3526f6d0ec8fd2233e4d4acce81bbae76b44b2a/python_dotenv-1.2.2-py3-none-any.whl", hash = "sha256:1d8214789a24de455a8b8bd8ae6fe3c6b69a5e3d64aa8a8e5d68e694bbcb285a", size = 22101, upload-time = "2026-03-01T16:00:25.09Z" }, +] + +[[package]] +name = "python-json-logger" +version = "4.1.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/f7/ff/3cc9165fd44106973cd7ac9facb674a65ed853494592541d339bdc9a30eb/python_json_logger-4.1.0.tar.gz", hash = "sha256:b396b9e3ed782b09ff9d6e4f1683d46c83ad0d35d2e407c09a9ebbf038f88195", size = 17573, upload-time = "2026-03-29T04:39:56.805Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/27/be/0631a861af4d1c875f096c07d34e9a63639560a717130e7a87cbc82b7e3f/python_json_logger-4.1.0-py3-none-any.whl", hash = "sha256:132994765cf75bf44554be9aa49b06ef2345d23661a96720262716438141b6b2", size = 15021, upload-time = "2026-03-29T04:39:55.266Z" }, +] + +[[package]] +name = "python-mimeparse" +version = "2.0.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/cd/85/c40f2e0b2128905f6c34894be01803c114f2b2efab0e8b4c3dca5e56b999/python_mimeparse-2.0.0.tar.gz", hash = "sha256:5b9a9dcf7aa82465e31bd667f5cb7000604811dce83554f1c8a43693a32cb303", size = 7162, upload-time = "2024-08-25T13:38:14.966Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/65/d9/1093a9d6d22d04d433003c96b9b1d46741b43fee5b11ece5098297737fce/python_mimeparse-2.0.0-py3-none-any.whl", hash = "sha256:574062a06f2e1d416535c8d3b83ccc6ebe95941e74e2c5939fc010a12e37cc09", size = 5576, upload-time = "2024-08-25T13:38:13.372Z" }, +] + +[[package]] +name = "python-snappy" +version = "0.7.3" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "cramjam" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/39/66/9185fbb6605ba92716d9f77fbb13c97eb671cd13c3ad56bd154016fbf08b/python_snappy-0.7.3.tar.gz", hash = "sha256:40216c1badfb2d38ac781ecb162a1d0ec40f8ee9747e610bcfefdfa79486cee3", size = 9337, upload-time = "2024-08-29T13:16:05.705Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/86/c1/0ee413ddd639aebf22c85d6db39f136ccc10e6a4b4dd275a92b5c839de8d/python_snappy-0.7.3-py3-none-any.whl", hash = "sha256:074c0636cfcd97e7251330f428064050ac81a52c62ed884fc2ddebbb60ed7f50", size = 9155, upload-time = "2024-08-29T13:16:04.773Z" }, +] + +[[package]] +name = "pytz" +version = "2026.2" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/ff/46/dd499ec9038423421951e4fad73051febaa13d2df82b4064f87af8b8c0c3/pytz-2026.2.tar.gz", hash = "sha256:0e60b47b29f21574376f218fe21abc009894a2321ea16c6754f3cad6eb7cdd6a", size = 320861, upload-time = "2026-05-04T01:35:29.667Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/ec/dd/96da98f892250475bdf2328112d7468abdd4acc7b902b6af23f4ed958ea0/pytz-2026.2-py2.py3-none-any.whl", hash = "sha256:04156e608bee23d3792fd45c94ae47fae1036688e75032eea2e3bf0323d1f126", size = 510141, upload-time = "2026-05-04T01:35:27.408Z" }, +] + +[[package]] +name = "pywinpty" +version = "3.0.3" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/f7/54/37c7370ba91f579235049dc26cd2c5e657d2a943e01820844ffc81f32176/pywinpty-3.0.3.tar.gz", hash = "sha256:523441dc34d231fb361b4b00f8c99d3f16de02f5005fd544a0183112bcc22412", size = 31309, upload-time = "2026-02-04T21:51:09.524Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/79/c3/3e75075c7f71735f22b66fab0481f2c98e3a4d58cba55cb50ba29114bcf6/pywinpty-3.0.3-cp311-cp311-win_amd64.whl", hash = "sha256:dff25a9a6435f527d7c65608a7e62783fc12076e7d44487a4911ee91be5a8ac8", size = 2114430, upload-time = "2026-02-04T21:54:19.485Z" }, + { url = "https://files.pythonhosted.org/packages/8d/1e/8a54166a8c5e4f5cb516514bdf4090be4d51a71e8d9f6d98c0aa00fe45d4/pywinpty-3.0.3-cp311-cp311-win_arm64.whl", hash = "sha256:fbc1e230e5b193eef4431cba3f39996a288f9958f9c9f092c8a961d930ee8f68", size = 236191, upload-time = "2026-02-04T21:50:36.239Z" }, + { url = "https://files.pythonhosted.org/packages/7c/d4/aeb5e1784d2c5bff6e189138a9ca91a090117459cea0c30378e1f2db3d54/pywinpty-3.0.3-cp312-cp312-win_amd64.whl", hash = "sha256:c9081df0e49ffa86d15db4a6ba61530630e48707f987df42c9d3313537e81fc0", size = 2113098, upload-time = "2026-02-04T21:54:37.711Z" }, + { url = "https://files.pythonhosted.org/packages/b9/53/7278223c493ccfe4883239cf06c823c56460a8010e0fc778eef67858dc14/pywinpty-3.0.3-cp312-cp312-win_arm64.whl", hash = "sha256:15e79d870e18b678fb8a5a6105fd38496b55697c66e6fc0378236026bc4d59e9", size = 234901, upload-time = "2026-02-04T21:53:31.35Z" }, + { url = "https://files.pythonhosted.org/packages/e5/cb/58d6ed3fd429c96a90ef01ac9a617af10a6d41469219c25e7dc162abbb71/pywinpty-3.0.3-cp313-cp313-win_amd64.whl", hash = "sha256:9c91dbb026050c77bdcef964e63a4f10f01a639113c4d3658332614544c467ab", size = 2112686, upload-time = "2026-02-04T21:52:03.035Z" }, + { url = "https://files.pythonhosted.org/packages/fd/50/724ed5c38c504d4e58a88a072776a1e880d970789deaeb2b9f7bd9a5141a/pywinpty-3.0.3-cp313-cp313-win_arm64.whl", hash = "sha256:fe1f7911805127c94cf51f89ab14096c6f91ffdcacf993d2da6082b2142a2523", size = 234591, upload-time = "2026-02-04T21:52:29.821Z" }, + { url = "https://files.pythonhosted.org/packages/f7/ad/90a110538696b12b39fd8758a06d70ded899308198ad2305ac68e361126e/pywinpty-3.0.3-cp313-cp313t-win_amd64.whl", hash = "sha256:3f07a6cf1c1d470d284e614733c3d0f726d2c85e78508ea10a403140c3c0c18a", size = 2112360, upload-time = "2026-02-04T21:55:33.397Z" }, + { url = "https://files.pythonhosted.org/packages/44/0f/7ffa221757a220402bc79fda44044c3f2cc57338d878ab7d622add6f4581/pywinpty-3.0.3-cp313-cp313t-win_arm64.whl", hash = "sha256:15c7c0b6f8e9d87aabbaff76468dabf6e6121332c40fc1d83548d02a9d6a3759", size = 233107, upload-time = "2026-02-04T21:51:45.455Z" }, + { url = "https://files.pythonhosted.org/packages/28/88/2ff917caff61e55f38bcdb27de06ee30597881b2cae44fbba7627be015c4/pywinpty-3.0.3-cp314-cp314-win_amd64.whl", hash = "sha256:d4b6b7b0fe0cdcd02e956bd57cfe9f4e5a06514eecf3b5ae174da4f951b58be9", size = 2113282, upload-time = "2026-02-04T21:52:08.188Z" }, + { url = "https://files.pythonhosted.org/packages/63/32/40a775343ace542cc43ece3f1d1fce454021521ecac41c4c4573081c2336/pywinpty-3.0.3-cp314-cp314-win_arm64.whl", hash = "sha256:34789d685fc0d547ce0c8a65e5a70e56f77d732fa6e03c8f74fefb8cbb252019", size = 234207, upload-time = "2026-02-04T21:51:58.687Z" }, + { url = "https://files.pythonhosted.org/packages/8d/54/5d5e52f4cb75028104ca6faf36c10f9692389b1986d34471663b4ebebd6d/pywinpty-3.0.3-cp314-cp314t-win_amd64.whl", hash = "sha256:0c37e224a47a971d1a6e08649a1714dac4f63c11920780977829ed5c8cadead1", size = 2112910, upload-time = "2026-02-04T21:52:30.976Z" }, + { url = "https://files.pythonhosted.org/packages/0a/44/dcd184824e21d4620b06c7db9fbb15c3ad0a0f1fa2e6de79969fb82647ec/pywinpty-3.0.3-cp314-cp314t-win_arm64.whl", hash = "sha256:c4e9c3dff7d86ba81937438d5819f19f385a39d8f592d4e8af67148ceb4f6ab5", size = 233425, upload-time = "2026-02-04T21:51:56.754Z" }, +] + +[[package]] +name = "pyyaml" +version = "6.0.3" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/05/8e/961c0007c59b8dd7729d542c61a4d537767a59645b82a0b521206e1e25c2/pyyaml-6.0.3.tar.gz", hash = "sha256:d76623373421df22fb4cf8817020cbb7ef15c725b9d5e45f17e189bfc384190f", size = 130960, upload-time = "2025-09-25T21:33:16.546Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/6d/16/a95b6757765b7b031c9374925bb718d55e0a9ba8a1b6a12d25962ea44347/pyyaml-6.0.3-cp311-cp311-macosx_10_13_x86_64.whl", hash = "sha256:44edc647873928551a01e7a563d7452ccdebee747728c1080d881d68af7b997e", size = 185826, upload-time = "2025-09-25T21:31:58.655Z" }, + { url = "https://files.pythonhosted.org/packages/16/19/13de8e4377ed53079ee996e1ab0a9c33ec2faf808a4647b7b4c0d46dd239/pyyaml-6.0.3-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:652cb6edd41e718550aad172851962662ff2681490a8a711af6a4d288dd96824", size = 175577, upload-time = "2025-09-25T21:32:00.088Z" }, + { url = "https://files.pythonhosted.org/packages/0c/62/d2eb46264d4b157dae1275b573017abec435397aa59cbcdab6fc978a8af4/pyyaml-6.0.3-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:10892704fc220243f5305762e276552a0395f7beb4dbf9b14ec8fd43b57f126c", size = 775556, upload-time = "2025-09-25T21:32:01.31Z" }, + { url = "https://files.pythonhosted.org/packages/10/cb/16c3f2cf3266edd25aaa00d6c4350381c8b012ed6f5276675b9eba8d9ff4/pyyaml-6.0.3-cp311-cp311-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:850774a7879607d3a6f50d36d04f00ee69e7fc816450e5f7e58d7f17f1ae5c00", size = 882114, upload-time = "2025-09-25T21:32:03.376Z" }, + { url = "https://files.pythonhosted.org/packages/71/60/917329f640924b18ff085ab889a11c763e0b573da888e8404ff486657602/pyyaml-6.0.3-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:b8bb0864c5a28024fac8a632c443c87c5aa6f215c0b126c449ae1a150412f31d", size = 806638, upload-time = "2025-09-25T21:32:04.553Z" }, + { url = "https://files.pythonhosted.org/packages/dd/6f/529b0f316a9fd167281a6c3826b5583e6192dba792dd55e3203d3f8e655a/pyyaml-6.0.3-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:1d37d57ad971609cf3c53ba6a7e365e40660e3be0e5175fa9f2365a379d6095a", size = 767463, upload-time = "2025-09-25T21:32:06.152Z" }, + { url = "https://files.pythonhosted.org/packages/f2/6a/b627b4e0c1dd03718543519ffb2f1deea4a1e6d42fbab8021936a4d22589/pyyaml-6.0.3-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:37503bfbfc9d2c40b344d06b2199cf0e96e97957ab1c1b546fd4f87e53e5d3e4", size = 794986, upload-time = "2025-09-25T21:32:07.367Z" }, + { url = "https://files.pythonhosted.org/packages/45/91/47a6e1c42d9ee337c4839208f30d9f09caa9f720ec7582917b264defc875/pyyaml-6.0.3-cp311-cp311-win32.whl", hash = "sha256:8098f252adfa6c80ab48096053f512f2321f0b998f98150cea9bd23d83e1467b", size = 142543, upload-time = "2025-09-25T21:32:08.95Z" }, + { url = "https://files.pythonhosted.org/packages/da/e3/ea007450a105ae919a72393cb06f122f288ef60bba2dc64b26e2646fa315/pyyaml-6.0.3-cp311-cp311-win_amd64.whl", hash = "sha256:9f3bfb4965eb874431221a3ff3fdcddc7e74e3b07799e0e84ca4a0f867d449bf", size = 158763, upload-time = "2025-09-25T21:32:09.96Z" }, + { url = "https://files.pythonhosted.org/packages/d1/33/422b98d2195232ca1826284a76852ad5a86fe23e31b009c9886b2d0fb8b2/pyyaml-6.0.3-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:7f047e29dcae44602496db43be01ad42fc6f1cc0d8cd6c83d342306c32270196", size = 182063, upload-time = "2025-09-25T21:32:11.445Z" }, + { url = "https://files.pythonhosted.org/packages/89/a0/6cf41a19a1f2f3feab0e9c0b74134aa2ce6849093d5517a0c550fe37a648/pyyaml-6.0.3-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:fc09d0aa354569bc501d4e787133afc08552722d3ab34836a80547331bb5d4a0", size = 173973, upload-time = "2025-09-25T21:32:12.492Z" }, + { url = "https://files.pythonhosted.org/packages/ed/23/7a778b6bd0b9a8039df8b1b1d80e2e2ad78aa04171592c8a5c43a56a6af4/pyyaml-6.0.3-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:9149cad251584d5fb4981be1ecde53a1ca46c891a79788c0df828d2f166bda28", size = 775116, upload-time = "2025-09-25T21:32:13.652Z" }, + { url = "https://files.pythonhosted.org/packages/65/30/d7353c338e12baef4ecc1b09e877c1970bd3382789c159b4f89d6a70dc09/pyyaml-6.0.3-cp312-cp312-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:5fdec68f91a0c6739b380c83b951e2c72ac0197ace422360e6d5a959d8d97b2c", size = 844011, upload-time = "2025-09-25T21:32:15.21Z" }, + { url = "https://files.pythonhosted.org/packages/8b/9d/b3589d3877982d4f2329302ef98a8026e7f4443c765c46cfecc8858c6b4b/pyyaml-6.0.3-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:ba1cc08a7ccde2d2ec775841541641e4548226580ab850948cbfda66a1befcdc", size = 807870, upload-time = "2025-09-25T21:32:16.431Z" }, + { url = "https://files.pythonhosted.org/packages/05/c0/b3be26a015601b822b97d9149ff8cb5ead58c66f981e04fedf4e762f4bd4/pyyaml-6.0.3-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:8dc52c23056b9ddd46818a57b78404882310fb473d63f17b07d5c40421e47f8e", size = 761089, upload-time = "2025-09-25T21:32:17.56Z" }, + { url = "https://files.pythonhosted.org/packages/be/8e/98435a21d1d4b46590d5459a22d88128103f8da4c2d4cb8f14f2a96504e1/pyyaml-6.0.3-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:41715c910c881bc081f1e8872880d3c650acf13dfa8214bad49ed4cede7c34ea", size = 790181, upload-time = "2025-09-25T21:32:18.834Z" }, + { url = "https://files.pythonhosted.org/packages/74/93/7baea19427dcfbe1e5a372d81473250b379f04b1bd3c4c5ff825e2327202/pyyaml-6.0.3-cp312-cp312-win32.whl", hash = "sha256:96b533f0e99f6579b3d4d4995707cf36df9100d67e0c8303a0c55b27b5f99bc5", size = 137658, upload-time = "2025-09-25T21:32:20.209Z" }, + { url = "https://files.pythonhosted.org/packages/86/bf/899e81e4cce32febab4fb42bb97dcdf66bc135272882d1987881a4b519e9/pyyaml-6.0.3-cp312-cp312-win_amd64.whl", hash = "sha256:5fcd34e47f6e0b794d17de1b4ff496c00986e1c83f7ab2fb8fcfe9616ff7477b", size = 154003, upload-time = "2025-09-25T21:32:21.167Z" }, + { url = "https://files.pythonhosted.org/packages/1a/08/67bd04656199bbb51dbed1439b7f27601dfb576fb864099c7ef0c3e55531/pyyaml-6.0.3-cp312-cp312-win_arm64.whl", hash = "sha256:64386e5e707d03a7e172c0701abfb7e10f0fb753ee1d773128192742712a98fd", size = 140344, upload-time = "2025-09-25T21:32:22.617Z" }, + { url = "https://files.pythonhosted.org/packages/d1/11/0fd08f8192109f7169db964b5707a2f1e8b745d4e239b784a5a1dd80d1db/pyyaml-6.0.3-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:8da9669d359f02c0b91ccc01cac4a67f16afec0dac22c2ad09f46bee0697eba8", size = 181669, upload-time = "2025-09-25T21:32:23.673Z" }, + { url = "https://files.pythonhosted.org/packages/b1/16/95309993f1d3748cd644e02e38b75d50cbc0d9561d21f390a76242ce073f/pyyaml-6.0.3-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:2283a07e2c21a2aa78d9c4442724ec1eb15f5e42a723b99cb3d822d48f5f7ad1", size = 173252, upload-time = "2025-09-25T21:32:25.149Z" }, + { url = "https://files.pythonhosted.org/packages/50/31/b20f376d3f810b9b2371e72ef5adb33879b25edb7a6d072cb7ca0c486398/pyyaml-6.0.3-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:ee2922902c45ae8ccada2c5b501ab86c36525b883eff4255313a253a3160861c", size = 767081, upload-time = "2025-09-25T21:32:26.575Z" }, + { url = "https://files.pythonhosted.org/packages/49/1e/a55ca81e949270d5d4432fbbd19dfea5321eda7c41a849d443dc92fd1ff7/pyyaml-6.0.3-cp313-cp313-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:a33284e20b78bd4a18c8c2282d549d10bc8408a2a7ff57653c0cf0b9be0afce5", size = 841159, upload-time = "2025-09-25T21:32:27.727Z" }, + { url = "https://files.pythonhosted.org/packages/74/27/e5b8f34d02d9995b80abcef563ea1f8b56d20134d8f4e5e81733b1feceb2/pyyaml-6.0.3-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:0f29edc409a6392443abf94b9cf89ce99889a1dd5376d94316ae5145dfedd5d6", size = 801626, upload-time = "2025-09-25T21:32:28.878Z" }, + { url = "https://files.pythonhosted.org/packages/f9/11/ba845c23988798f40e52ba45f34849aa8a1f2d4af4b798588010792ebad6/pyyaml-6.0.3-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:f7057c9a337546edc7973c0d3ba84ddcdf0daa14533c2065749c9075001090e6", size = 753613, upload-time = "2025-09-25T21:32:30.178Z" }, + { url = "https://files.pythonhosted.org/packages/3d/e0/7966e1a7bfc0a45bf0a7fb6b98ea03fc9b8d84fa7f2229e9659680b69ee3/pyyaml-6.0.3-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:eda16858a3cab07b80edaf74336ece1f986ba330fdb8ee0d6c0d68fe82bc96be", size = 794115, upload-time = "2025-09-25T21:32:31.353Z" }, + { url = "https://files.pythonhosted.org/packages/de/94/980b50a6531b3019e45ddeada0626d45fa85cbe22300844a7983285bed3b/pyyaml-6.0.3-cp313-cp313-win32.whl", hash = "sha256:d0eae10f8159e8fdad514efdc92d74fd8d682c933a6dd088030f3834bc8e6b26", size = 137427, upload-time = "2025-09-25T21:32:32.58Z" }, + { url = "https://files.pythonhosted.org/packages/97/c9/39d5b874e8b28845e4ec2202b5da735d0199dbe5b8fb85f91398814a9a46/pyyaml-6.0.3-cp313-cp313-win_amd64.whl", hash = "sha256:79005a0d97d5ddabfeeea4cf676af11e647e41d81c9a7722a193022accdb6b7c", size = 154090, upload-time = "2025-09-25T21:32:33.659Z" }, + { url = "https://files.pythonhosted.org/packages/73/e8/2bdf3ca2090f68bb3d75b44da7bbc71843b19c9f2b9cb9b0f4ab7a5a4329/pyyaml-6.0.3-cp313-cp313-win_arm64.whl", hash = "sha256:5498cd1645aa724a7c71c8f378eb29ebe23da2fc0d7a08071d89469bf1d2defb", size = 140246, upload-time = "2025-09-25T21:32:34.663Z" }, + { url = "https://files.pythonhosted.org/packages/9d/8c/f4bd7f6465179953d3ac9bc44ac1a8a3e6122cf8ada906b4f96c60172d43/pyyaml-6.0.3-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:8d1fab6bb153a416f9aeb4b8763bc0f22a5586065f86f7664fc23339fc1c1fac", size = 181814, upload-time = "2025-09-25T21:32:35.712Z" }, + { url = "https://files.pythonhosted.org/packages/bd/9c/4d95bb87eb2063d20db7b60faa3840c1b18025517ae857371c4dd55a6b3a/pyyaml-6.0.3-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:34d5fcd24b8445fadc33f9cf348c1047101756fd760b4dacb5c3e99755703310", size = 173809, upload-time = "2025-09-25T21:32:36.789Z" }, + { url = "https://files.pythonhosted.org/packages/92/b5/47e807c2623074914e29dabd16cbbdd4bf5e9b2db9f8090fa64411fc5382/pyyaml-6.0.3-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:501a031947e3a9025ed4405a168e6ef5ae3126c59f90ce0cd6f2bfc477be31b7", size = 766454, upload-time = "2025-09-25T21:32:37.966Z" }, + { url = "https://files.pythonhosted.org/packages/02/9e/e5e9b168be58564121efb3de6859c452fccde0ab093d8438905899a3a483/pyyaml-6.0.3-cp314-cp314-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:b3bc83488de33889877a0f2543ade9f70c67d66d9ebb4ac959502e12de895788", size = 836355, upload-time = "2025-09-25T21:32:39.178Z" }, + { url = "https://files.pythonhosted.org/packages/88/f9/16491d7ed2a919954993e48aa941b200f38040928474c9e85ea9e64222c3/pyyaml-6.0.3-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:c458b6d084f9b935061bc36216e8a69a7e293a2f1e68bf956dcd9e6cbcd143f5", size = 794175, upload-time = "2025-09-25T21:32:40.865Z" }, + { url = "https://files.pythonhosted.org/packages/dd/3f/5989debef34dc6397317802b527dbbafb2b4760878a53d4166579111411e/pyyaml-6.0.3-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:7c6610def4f163542a622a73fb39f534f8c101d690126992300bf3207eab9764", size = 755228, upload-time = "2025-09-25T21:32:42.084Z" }, + { url = "https://files.pythonhosted.org/packages/d7/ce/af88a49043cd2e265be63d083fc75b27b6ed062f5f9fd6cdc223ad62f03e/pyyaml-6.0.3-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:5190d403f121660ce8d1d2c1bb2ef1bd05b5f68533fc5c2ea899bd15f4399b35", size = 789194, upload-time = "2025-09-25T21:32:43.362Z" }, + { url = "https://files.pythonhosted.org/packages/23/20/bb6982b26a40bb43951265ba29d4c246ef0ff59c9fdcdf0ed04e0687de4d/pyyaml-6.0.3-cp314-cp314-win_amd64.whl", hash = "sha256:4a2e8cebe2ff6ab7d1050ecd59c25d4c8bd7e6f400f5f82b96557ac0abafd0ac", size = 156429, upload-time = "2025-09-25T21:32:57.844Z" }, + { url = "https://files.pythonhosted.org/packages/f4/f4/a4541072bb9422c8a883ab55255f918fa378ecf083f5b85e87fc2b4eda1b/pyyaml-6.0.3-cp314-cp314-win_arm64.whl", hash = "sha256:93dda82c9c22deb0a405ea4dc5f2d0cda384168e466364dec6255b293923b2f3", size = 143912, upload-time = "2025-09-25T21:32:59.247Z" }, + { url = "https://files.pythonhosted.org/packages/7c/f9/07dd09ae774e4616edf6cda684ee78f97777bdd15847253637a6f052a62f/pyyaml-6.0.3-cp314-cp314t-macosx_10_13_x86_64.whl", hash = "sha256:02893d100e99e03eda1c8fd5c441d8c60103fd175728e23e431db1b589cf5ab3", size = 189108, upload-time = "2025-09-25T21:32:44.377Z" }, + { url = "https://files.pythonhosted.org/packages/4e/78/8d08c9fb7ce09ad8c38ad533c1191cf27f7ae1effe5bb9400a46d9437fcf/pyyaml-6.0.3-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:c1ff362665ae507275af2853520967820d9124984e0f7466736aea23d8611fba", size = 183641, upload-time = "2025-09-25T21:32:45.407Z" }, + { url = "https://files.pythonhosted.org/packages/7b/5b/3babb19104a46945cf816d047db2788bcaf8c94527a805610b0289a01c6b/pyyaml-6.0.3-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:6adc77889b628398debc7b65c073bcb99c4a0237b248cacaf3fe8a557563ef6c", size = 831901, upload-time = "2025-09-25T21:32:48.83Z" }, + { url = "https://files.pythonhosted.org/packages/8b/cc/dff0684d8dc44da4d22a13f35f073d558c268780ce3c6ba1b87055bb0b87/pyyaml-6.0.3-cp314-cp314t-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:a80cb027f6b349846a3bf6d73b5e95e782175e52f22108cfa17876aaeff93702", size = 861132, upload-time = "2025-09-25T21:32:50.149Z" }, + { url = "https://files.pythonhosted.org/packages/b1/5e/f77dc6b9036943e285ba76b49e118d9ea929885becb0a29ba8a7c75e29fe/pyyaml-6.0.3-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:00c4bdeba853cc34e7dd471f16b4114f4162dc03e6b7afcc2128711f0eca823c", size = 839261, upload-time = "2025-09-25T21:32:51.808Z" }, + { url = "https://files.pythonhosted.org/packages/ce/88/a9db1376aa2a228197c58b37302f284b5617f56a5d959fd1763fb1675ce6/pyyaml-6.0.3-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:66e1674c3ef6f541c35191caae2d429b967b99e02040f5ba928632d9a7f0f065", size = 805272, upload-time = "2025-09-25T21:32:52.941Z" }, + { url = "https://files.pythonhosted.org/packages/da/92/1446574745d74df0c92e6aa4a7b0b3130706a4142b2d1a5869f2eaa423c6/pyyaml-6.0.3-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:16249ee61e95f858e83976573de0f5b2893b3677ba71c9dd36b9cf8be9ac6d65", size = 829923, upload-time = "2025-09-25T21:32:54.537Z" }, + { url = "https://files.pythonhosted.org/packages/f0/7a/1c7270340330e575b92f397352af856a8c06f230aa3e76f86b39d01b416a/pyyaml-6.0.3-cp314-cp314t-win_amd64.whl", hash = "sha256:4ad1906908f2f5ae4e5a8ddfce73c320c2a1429ec52eafd27138b7f1cbe341c9", size = 174062, upload-time = "2025-09-25T21:32:55.767Z" }, + { url = "https://files.pythonhosted.org/packages/f1/12/de94a39c2ef588c7e6455cfbe7343d3b2dc9d6b6b2f40c4c6565744c873d/pyyaml-6.0.3-cp314-cp314t-win_arm64.whl", hash = "sha256:ebc55a14a21cb14062aa4162f906cd962b28e2e9ea38f9b4391244cd8de4ae0b", size = 149341, upload-time = "2025-09-25T21:32:56.828Z" }, +] + +[[package]] +name = "pyzmq" +version = "27.1.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "cffi", marker = "implementation_name == 'pypy'" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/04/0b/3c9baedbdf613ecaa7aa07027780b8867f57b6293b6ee50de316c9f3222b/pyzmq-27.1.0.tar.gz", hash = "sha256:ac0765e3d44455adb6ddbf4417dcce460fc40a05978c08efdf2948072f6db540", size = 281750, upload-time = "2025-09-08T23:10:18.157Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/06/5d/305323ba86b284e6fcb0d842d6adaa2999035f70f8c38a9b6d21ad28c3d4/pyzmq-27.1.0-cp311-cp311-macosx_10_15_universal2.whl", hash = "sha256:226b091818d461a3bef763805e75685e478ac17e9008f49fce2d3e52b3d58b86", size = 1333328, upload-time = "2025-09-08T23:07:45.946Z" }, + { url = "https://files.pythonhosted.org/packages/bd/a0/fc7e78a23748ad5443ac3275943457e8452da67fda347e05260261108cbc/pyzmq-27.1.0-cp311-cp311-manylinux2014_i686.manylinux_2_17_i686.whl", hash = "sha256:0790a0161c281ca9723f804871b4027f2e8b5a528d357c8952d08cd1a9c15581", size = 908803, upload-time = "2025-09-08T23:07:47.551Z" }, + { url = "https://files.pythonhosted.org/packages/7e/22/37d15eb05f3bdfa4abea6f6d96eb3bb58585fbd3e4e0ded4e743bc650c97/pyzmq-27.1.0-cp311-cp311-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:c895a6f35476b0c3a54e3eb6ccf41bf3018de937016e6e18748317f25d4e925f", size = 668836, upload-time = "2025-09-08T23:07:49.436Z" }, + { url = "https://files.pythonhosted.org/packages/b1/c4/2a6fe5111a01005fc7af3878259ce17684fabb8852815eda6225620f3c59/pyzmq-27.1.0-cp311-cp311-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:5bbf8d3630bf96550b3be8e1fc0fea5cbdc8d5466c1192887bd94869da17a63e", size = 857038, upload-time = "2025-09-08T23:07:51.234Z" }, + { url = "https://files.pythonhosted.org/packages/cb/eb/bfdcb41d0db9cd233d6fb22dc131583774135505ada800ebf14dfb0a7c40/pyzmq-27.1.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:15c8bd0fe0dabf808e2d7a681398c4e5ded70a551ab47482067a572c054c8e2e", size = 1657531, upload-time = "2025-09-08T23:07:52.795Z" }, + { url = "https://files.pythonhosted.org/packages/ab/21/e3180ca269ed4a0de5c34417dfe71a8ae80421198be83ee619a8a485b0c7/pyzmq-27.1.0-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:bafcb3dd171b4ae9f19ee6380dfc71ce0390fefaf26b504c0e5f628d7c8c54f2", size = 2034786, upload-time = "2025-09-08T23:07:55.047Z" }, + { url = "https://files.pythonhosted.org/packages/3b/b1/5e21d0b517434b7f33588ff76c177c5a167858cc38ef740608898cd329f2/pyzmq-27.1.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:e829529fcaa09937189178115c49c504e69289abd39967cd8a4c215761373394", size = 1894220, upload-time = "2025-09-08T23:07:57.172Z" }, + { url = "https://files.pythonhosted.org/packages/03/f2/44913a6ff6941905efc24a1acf3d3cb6146b636c546c7406c38c49c403d4/pyzmq-27.1.0-cp311-cp311-win32.whl", hash = "sha256:6df079c47d5902af6db298ec92151db82ecb557af663098b92f2508c398bb54f", size = 567155, upload-time = "2025-09-08T23:07:59.05Z" }, + { url = "https://files.pythonhosted.org/packages/23/6d/d8d92a0eb270a925c9b4dd039c0b4dc10abc2fcbc48331788824ef113935/pyzmq-27.1.0-cp311-cp311-win_amd64.whl", hash = "sha256:190cbf120fbc0fc4957b56866830def56628934a9d112aec0e2507aa6a032b97", size = 633428, upload-time = "2025-09-08T23:08:00.663Z" }, + { url = "https://files.pythonhosted.org/packages/ae/14/01afebc96c5abbbd713ecfc7469cfb1bc801c819a74ed5c9fad9a48801cb/pyzmq-27.1.0-cp311-cp311-win_arm64.whl", hash = "sha256:eca6b47df11a132d1745eb3b5b5e557a7dae2c303277aa0e69c6ba91b8736e07", size = 559497, upload-time = "2025-09-08T23:08:02.15Z" }, + { url = "https://files.pythonhosted.org/packages/92/e7/038aab64a946d535901103da16b953c8c9cc9c961dadcbf3609ed6428d23/pyzmq-27.1.0-cp312-abi3-macosx_10_15_universal2.whl", hash = "sha256:452631b640340c928fa343801b0d07eb0c3789a5ffa843f6e1a9cee0ba4eb4fc", size = 1306279, upload-time = "2025-09-08T23:08:03.807Z" }, + { url = "https://files.pythonhosted.org/packages/e8/5e/c3c49fdd0f535ef45eefcc16934648e9e59dace4a37ee88fc53f6cd8e641/pyzmq-27.1.0-cp312-abi3-manylinux2014_i686.manylinux_2_17_i686.whl", hash = "sha256:1c179799b118e554b66da67d88ed66cd37a169f1f23b5d9f0a231b4e8d44a113", size = 895645, upload-time = "2025-09-08T23:08:05.301Z" }, + { url = "https://files.pythonhosted.org/packages/f8/e5/b0b2504cb4e903a74dcf1ebae157f9e20ebb6ea76095f6cfffea28c42ecd/pyzmq-27.1.0-cp312-abi3-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:3837439b7f99e60312f0c926a6ad437b067356dc2bc2ec96eb395fd0fe804233", size = 652574, upload-time = "2025-09-08T23:08:06.828Z" }, + { url = "https://files.pythonhosted.org/packages/f8/9b/c108cdb55560eaf253f0cbdb61b29971e9fb34d9c3499b0e96e4e60ed8a5/pyzmq-27.1.0-cp312-abi3-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:43ad9a73e3da1fab5b0e7e13402f0b2fb934ae1c876c51d0afff0e7c052eca31", size = 840995, upload-time = "2025-09-08T23:08:08.396Z" }, + { url = "https://files.pythonhosted.org/packages/c2/bb/b79798ca177b9eb0825b4c9998c6af8cd2a7f15a6a1a4272c1d1a21d382f/pyzmq-27.1.0-cp312-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:0de3028d69d4cdc475bfe47a6128eb38d8bc0e8f4d69646adfbcd840facbac28", size = 1642070, upload-time = "2025-09-08T23:08:09.989Z" }, + { url = "https://files.pythonhosted.org/packages/9c/80/2df2e7977c4ede24c79ae39dcef3899bfc5f34d1ca7a5b24f182c9b7a9ca/pyzmq-27.1.0-cp312-abi3-musllinux_1_2_i686.whl", hash = "sha256:cf44a7763aea9298c0aa7dbf859f87ed7012de8bda0f3977b6fb1d96745df856", size = 2021121, upload-time = "2025-09-08T23:08:11.907Z" }, + { url = "https://files.pythonhosted.org/packages/46/bd/2d45ad24f5f5ae7e8d01525eb76786fa7557136555cac7d929880519e33a/pyzmq-27.1.0-cp312-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:f30f395a9e6fbca195400ce833c731e7b64c3919aa481af4d88c3759e0cb7496", size = 1878550, upload-time = "2025-09-08T23:08:13.513Z" }, + { url = "https://files.pythonhosted.org/packages/e6/2f/104c0a3c778d7c2ab8190e9db4f62f0b6957b53c9d87db77c284b69f33ea/pyzmq-27.1.0-cp312-abi3-win32.whl", hash = "sha256:250e5436a4ba13885494412b3da5d518cd0d3a278a1ae640e113c073a5f88edd", size = 559184, upload-time = "2025-09-08T23:08:15.163Z" }, + { url = "https://files.pythonhosted.org/packages/fc/7f/a21b20d577e4100c6a41795842028235998a643b1ad406a6d4163ea8f53e/pyzmq-27.1.0-cp312-abi3-win_amd64.whl", hash = "sha256:9ce490cf1d2ca2ad84733aa1d69ce6855372cb5ce9223802450c9b2a7cba0ccf", size = 619480, upload-time = "2025-09-08T23:08:17.192Z" }, + { url = "https://files.pythonhosted.org/packages/78/c2/c012beae5f76b72f007a9e91ee9401cb88c51d0f83c6257a03e785c81cc2/pyzmq-27.1.0-cp312-abi3-win_arm64.whl", hash = "sha256:75a2f36223f0d535a0c919e23615fc85a1e23b71f40c7eb43d7b1dedb4d8f15f", size = 552993, upload-time = "2025-09-08T23:08:18.926Z" }, + { url = "https://files.pythonhosted.org/packages/60/cb/84a13459c51da6cec1b7b1dc1a47e6db6da50b77ad7fd9c145842750a011/pyzmq-27.1.0-cp313-cp313-android_24_arm64_v8a.whl", hash = "sha256:93ad4b0855a664229559e45c8d23797ceac03183c7b6f5b4428152a6b06684a5", size = 1122436, upload-time = "2025-09-08T23:08:20.801Z" }, + { url = "https://files.pythonhosted.org/packages/dc/b6/94414759a69a26c3dd674570a81813c46a078767d931a6c70ad29fc585cb/pyzmq-27.1.0-cp313-cp313-android_24_x86_64.whl", hash = "sha256:fbb4f2400bfda24f12f009cba62ad5734148569ff4949b1b6ec3b519444342e6", size = 1156301, upload-time = "2025-09-08T23:08:22.47Z" }, + { url = "https://files.pythonhosted.org/packages/a5/ad/15906493fd40c316377fd8a8f6b1f93104f97a752667763c9b9c1b71d42d/pyzmq-27.1.0-cp313-cp313t-macosx_10_15_universal2.whl", hash = "sha256:e343d067f7b151cfe4eb3bb796a7752c9d369eed007b91231e817071d2c2fec7", size = 1341197, upload-time = "2025-09-08T23:08:24.286Z" }, + { url = "https://files.pythonhosted.org/packages/14/1d/d343f3ce13db53a54cb8946594e567410b2125394dafcc0268d8dda027e0/pyzmq-27.1.0-cp313-cp313t-manylinux2014_i686.manylinux_2_17_i686.whl", hash = "sha256:08363b2011dec81c354d694bdecaef4770e0ae96b9afea70b3f47b973655cc05", size = 897275, upload-time = "2025-09-08T23:08:26.063Z" }, + { url = "https://files.pythonhosted.org/packages/69/2d/d83dd6d7ca929a2fc67d2c3005415cdf322af7751d773524809f9e585129/pyzmq-27.1.0-cp313-cp313t-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:d54530c8c8b5b8ddb3318f481297441af102517602b569146185fa10b63f4fa9", size = 660469, upload-time = "2025-09-08T23:08:27.623Z" }, + { url = "https://files.pythonhosted.org/packages/3e/cd/9822a7af117f4bc0f1952dbe9ef8358eb50a24928efd5edf54210b850259/pyzmq-27.1.0-cp313-cp313t-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:6f3afa12c392f0a44a2414056d730eebc33ec0926aae92b5ad5cf26ebb6cc128", size = 847961, upload-time = "2025-09-08T23:08:29.672Z" }, + { url = "https://files.pythonhosted.org/packages/9a/12/f003e824a19ed73be15542f172fd0ec4ad0b60cf37436652c93b9df7c585/pyzmq-27.1.0-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:c65047adafe573ff023b3187bb93faa583151627bc9c51fc4fb2c561ed689d39", size = 1650282, upload-time = "2025-09-08T23:08:31.349Z" }, + { url = "https://files.pythonhosted.org/packages/d5/4a/e82d788ed58e9a23995cee70dbc20c9aded3d13a92d30d57ec2291f1e8a3/pyzmq-27.1.0-cp313-cp313t-musllinux_1_2_i686.whl", hash = "sha256:90e6e9441c946a8b0a667356f7078d96411391a3b8f80980315455574177ec97", size = 2024468, upload-time = "2025-09-08T23:08:33.543Z" }, + { url = "https://files.pythonhosted.org/packages/d9/94/2da0a60841f757481e402b34bf4c8bf57fa54a5466b965de791b1e6f747d/pyzmq-27.1.0-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:add071b2d25f84e8189aaf0882d39a285b42fa3853016ebab234a5e78c7a43db", size = 1885394, upload-time = "2025-09-08T23:08:35.51Z" }, + { url = "https://files.pythonhosted.org/packages/4f/6f/55c10e2e49ad52d080dc24e37adb215e5b0d64990b57598abc2e3f01725b/pyzmq-27.1.0-cp313-cp313t-win32.whl", hash = "sha256:7ccc0700cfdf7bd487bea8d850ec38f204478681ea02a582a8da8171b7f90a1c", size = 574964, upload-time = "2025-09-08T23:08:37.178Z" }, + { url = "https://files.pythonhosted.org/packages/87/4d/2534970ba63dd7c522d8ca80fb92777f362c0f321900667c615e2067cb29/pyzmq-27.1.0-cp313-cp313t-win_amd64.whl", hash = "sha256:8085a9fba668216b9b4323be338ee5437a235fe275b9d1610e422ccc279733e2", size = 641029, upload-time = "2025-09-08T23:08:40.595Z" }, + { url = "https://files.pythonhosted.org/packages/f6/fa/f8aea7a28b0641f31d40dea42d7ef003fded31e184ef47db696bc74cd610/pyzmq-27.1.0-cp313-cp313t-win_arm64.whl", hash = "sha256:6bb54ca21bcfe361e445256c15eedf083f153811c37be87e0514934d6913061e", size = 561541, upload-time = "2025-09-08T23:08:42.668Z" }, + { url = "https://files.pythonhosted.org/packages/87/45/19efbb3000956e82d0331bafca5d9ac19ea2857722fa2caacefb6042f39d/pyzmq-27.1.0-cp314-cp314t-macosx_10_15_universal2.whl", hash = "sha256:ce980af330231615756acd5154f29813d553ea555485ae712c491cd483df6b7a", size = 1341197, upload-time = "2025-09-08T23:08:44.973Z" }, + { url = "https://files.pythonhosted.org/packages/48/43/d72ccdbf0d73d1343936296665826350cb1e825f92f2db9db3e61c2162a2/pyzmq-27.1.0-cp314-cp314t-manylinux2014_i686.manylinux_2_17_i686.whl", hash = "sha256:1779be8c549e54a1c38f805e56d2a2e5c009d26de10921d7d51cfd1c8d4632ea", size = 897175, upload-time = "2025-09-08T23:08:46.601Z" }, + { url = "https://files.pythonhosted.org/packages/2f/2e/a483f73a10b65a9ef0161e817321d39a770b2acf8bcf3004a28d90d14a94/pyzmq-27.1.0-cp314-cp314t-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:7200bb0f03345515df50d99d3db206a0a6bee1955fbb8c453c76f5bf0e08fb96", size = 660427, upload-time = "2025-09-08T23:08:48.187Z" }, + { url = "https://files.pythonhosted.org/packages/f5/d2/5f36552c2d3e5685abe60dfa56f91169f7a2d99bbaf67c5271022ab40863/pyzmq-27.1.0-cp314-cp314t-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:01c0e07d558b06a60773744ea6251f769cd79a41a97d11b8bf4ab8f034b0424d", size = 847929, upload-time = "2025-09-08T23:08:49.76Z" }, + { url = "https://files.pythonhosted.org/packages/c4/2a/404b331f2b7bf3198e9945f75c4c521f0c6a3a23b51f7a4a401b94a13833/pyzmq-27.1.0-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:80d834abee71f65253c91540445d37c4c561e293ba6e741b992f20a105d69146", size = 1650193, upload-time = "2025-09-08T23:08:51.7Z" }, + { url = "https://files.pythonhosted.org/packages/1c/0b/f4107e33f62a5acf60e3ded67ed33d79b4ce18de432625ce2fc5093d6388/pyzmq-27.1.0-cp314-cp314t-musllinux_1_2_i686.whl", hash = "sha256:544b4e3b7198dde4a62b8ff6685e9802a9a1ebf47e77478a5eb88eca2a82f2fd", size = 2024388, upload-time = "2025-09-08T23:08:53.393Z" }, + { url = "https://files.pythonhosted.org/packages/0d/01/add31fe76512642fd6e40e3a3bd21f4b47e242c8ba33efb6809e37076d9b/pyzmq-27.1.0-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:cedc4c68178e59a4046f97eca31b148ddcf51e88677de1ef4e78cf06c5376c9a", size = 1885316, upload-time = "2025-09-08T23:08:55.702Z" }, + { url = "https://files.pythonhosted.org/packages/c4/59/a5f38970f9bf07cee96128de79590bb354917914a9be11272cfc7ff26af0/pyzmq-27.1.0-cp314-cp314t-win32.whl", hash = "sha256:1f0b2a577fd770aa6f053211a55d1c47901f4d537389a034c690291485e5fe92", size = 587472, upload-time = "2025-09-08T23:08:58.18Z" }, + { url = "https://files.pythonhosted.org/packages/70/d8/78b1bad170f93fcf5e3536e70e8fadac55030002275c9a29e8f5719185de/pyzmq-27.1.0-cp314-cp314t-win_amd64.whl", hash = "sha256:19c9468ae0437f8074af379e986c5d3d7d7bfe033506af442e8c879732bedbe0", size = 661401, upload-time = "2025-09-08T23:08:59.802Z" }, + { url = "https://files.pythonhosted.org/packages/81/d6/4bfbb40c9a0b42fc53c7cf442f6385db70b40f74a783130c5d0a5aa62228/pyzmq-27.1.0-cp314-cp314t-win_arm64.whl", hash = "sha256:dc5dbf68a7857b59473f7df42650c621d7e8923fb03fa74a526890f4d33cc4d7", size = 575170, upload-time = "2025-09-08T23:09:01.418Z" }, + { url = "https://files.pythonhosted.org/packages/4c/c6/c4dcdecdbaa70969ee1fdced6d7b8f60cfabe64d25361f27ac4665a70620/pyzmq-27.1.0-pp311-pypy311_pp73-macosx_10_15_x86_64.whl", hash = "sha256:18770c8d3563715387139060d37859c02ce40718d1faf299abddcdcc6a649066", size = 836265, upload-time = "2025-09-08T23:09:49.376Z" }, + { url = "https://files.pythonhosted.org/packages/3e/79/f38c92eeaeb03a2ccc2ba9866f0439593bb08c5e3b714ac1d553e5c96e25/pyzmq-27.1.0-pp311-pypy311_pp73-manylinux2014_i686.manylinux_2_17_i686.whl", hash = "sha256:ac25465d42f92e990f8d8b0546b01c391ad431c3bf447683fdc40565941d0604", size = 800208, upload-time = "2025-09-08T23:09:51.073Z" }, + { url = "https://files.pythonhosted.org/packages/49/0e/3f0d0d335c6b3abb9b7b723776d0b21fa7f3a6c819a0db6097059aada160/pyzmq-27.1.0-pp311-pypy311_pp73-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:53b40f8ae006f2734ee7608d59ed661419f087521edbfc2149c3932e9c14808c", size = 567747, upload-time = "2025-09-08T23:09:52.698Z" }, + { url = "https://files.pythonhosted.org/packages/a1/cf/f2b3784d536250ffd4be70e049f3b60981235d70c6e8ce7e3ef21e1adb25/pyzmq-27.1.0-pp311-pypy311_pp73-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:f605d884e7c8be8fe1aa94e0a783bf3f591b84c24e4bc4f3e7564c82ac25e271", size = 747371, upload-time = "2025-09-08T23:09:54.563Z" }, + { url = "https://files.pythonhosted.org/packages/01/1b/5dbe84eefc86f48473947e2f41711aded97eecef1231f4558f1f02713c12/pyzmq-27.1.0-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:c9f7f6e13dff2e44a6afeaf2cf54cee5929ad64afaf4d40b50f93c58fc687355", size = 544862, upload-time = "2025-09-08T23:09:56.509Z" }, +] + +[[package]] +name = "redis" +version = "8.0.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "async-timeout", marker = "python_full_version < '3.11.3'" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/53/ae/ed461cca5780b5fc8b9fe8ca0ed98d89508645fb9d880c24cc42c087678f/redis-8.0.0.tar.gz", hash = "sha256:a00c5355432051ac14e593b8b197fc76c887ee12d55a0984f69328a1115fdc49", size = 5101591, upload-time = "2026-05-28T12:45:13.5Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/27/e3/b519734372d305bd547534a9f32e4ce9f98552af753dce72cf3483a0ff0b/redis-8.0.0-py3-none-any.whl", hash = "sha256:c938c18338585009f0bc310f4c7e4e4b4d37639356c4ac072cedf3af570c8dc7", size = 499870, upload-time = "2026-05-28T12:45:11.697Z" }, +] + +[[package]] +name = "referencing" +version = "0.37.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "attrs" }, + { name = "rpds-py" }, + { name = "typing-extensions", marker = "python_full_version < '3.13'" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/22/f5/df4e9027acead3ecc63e50fe1e36aca1523e1719559c499951bb4b53188f/referencing-0.37.0.tar.gz", hash = "sha256:44aefc3142c5b842538163acb373e24cce6632bd54bdb01b21ad5863489f50d8", size = 78036, upload-time = "2025-10-13T15:30:48.871Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/2c/58/ca301544e1fa93ed4f80d724bf5b194f6e4b945841c5bfd555878eea9fcb/referencing-0.37.0-py3-none-any.whl", hash = "sha256:381329a9f99628c9069361716891d34ad94af76e461dcb0335825aecc7692231", size = 26766, upload-time = "2025-10-13T15:30:47.625Z" }, +] + +[[package]] +name = "regex" +version = "2026.5.9" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/dc/0e/49aee608ad09480e7fd276898c99ec6192985fa331abe4eb3a986094490b/regex-2026.5.9.tar.gz", hash = "sha256:a8234aa23ec39894bfe4a3f1b85616a7032481964a13ac6fc9f10de4f6fca270", size = 416074, upload-time = "2026-05-09T23:15:19.37Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/c2/dc/c1f2df4027e82fc54b5a473e4b250f5139faca49a0fbe29a48668d228f34/regex-2026.5.9-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:ccf5249114cc3e772ecdd88a98a86eca0fd74c61ce32a94743758c083fc05d48", size = 489445, upload-time = "2026-05-09T23:12:06.111Z" }, + { url = "https://files.pythonhosted.org/packages/03/d2/59f01110660081cce9c0bc30ebd0b5ee250dacf658e3248ed92f01e0e8ee/regex-2026.5.9-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:46f1326ca6e65b0879d23ca302c0f2415aad42ff0309b9c818e7949fe19a41d8", size = 291271, upload-time = "2026-05-09T23:12:07.731Z" }, + { url = "https://files.pythonhosted.org/packages/58/b6/14b2c84ff90ddb370c81d27503f4a0fcf071496416f4855f6cc8c5d81c35/regex-2026.5.9-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:ef31cbfe458e21c6122ba8150ff060e0c7789ed0d26eb423f25472584920b555", size = 289212, upload-time = "2026-05-09T23:12:09.266Z" }, + { url = "https://files.pythonhosted.org/packages/03/d0/4db86529117320de0c84afd90e70bb47434625875e34fcef9d8c127c5b16/regex-2026.5.9-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:992604d02e6d9c6d786c24a706a71ecffe1020fc1ef264044474cd81fa2c3919", size = 792310, upload-time = "2026-05-09T23:12:11.416Z" }, + { url = "https://files.pythonhosted.org/packages/07/78/fe4800cd322f862ecffd2d553409b20d80650e5ed71b9d178f853d020b82/regex-2026.5.9-cp311-cp311-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:c9411dd64ca95477225734a93dfc8583b51916b8d5942f99d6cac21e09965451", size = 861721, upload-time = "2026-05-09T23:12:13.681Z" }, + { url = "https://files.pythonhosted.org/packages/b5/d0/b3618a895dd8feb897c61bb2954edd265e1767d82a01d53065d5871127a3/regex-2026.5.9-cp311-cp311-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:3dd4a3ff360dfb836fecdb93a4598f9d6e2ac81e3e397125145c6221bf58cf4c", size = 906460, upload-time = "2026-05-09T23:12:15.443Z" }, + { url = "https://files.pythonhosted.org/packages/33/6f/1481597e859ef19508b345eec4afd1416ed6e6b459c75a64026ef193aecf/regex-2026.5.9-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:2a661a7d270a61f7cf460caee8b9fa2d5ef9e5c681234bcb9e0fe14f488e7dfc", size = 799843, upload-time = "2026-05-09T23:12:16.892Z" }, + { url = "https://files.pythonhosted.org/packages/73/59/955734c803f59108deccba3597ae440c76b62a652733c0006e6243758420/regex-2026.5.9-cp311-cp311-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:f079e50a0d3cc3cd5091fa9ff45869a2e6b2cd35895731edafb0327901a8d86d", size = 773610, upload-time = "2026-05-09T23:12:19.127Z" }, + { url = "https://files.pythonhosted.org/packages/68/8f/70c04a236d651c81881dac42ef8538bddda6121434509d0a22d9e601503b/regex-2026.5.9-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:4ebe8f0b5ec5a5024dc4a4c59f444c4e9afc5f2abdbb8962065b75d27fb971f9", size = 781645, upload-time = "2026-05-09T23:12:20.806Z" }, + { url = "https://files.pythonhosted.org/packages/1d/96/05c7434d88185e5d27fe54aeb74df86bd77cd79f52f0b4eae54faa8fea70/regex-2026.5.9-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:97cf3bc1b7d7d2306772ec07366c80d9df00ff79e79cea32898883a646d2fae2", size = 854473, upload-time = "2026-05-09T23:12:22.465Z" }, + { url = "https://files.pythonhosted.org/packages/4e/c1/6e3d8202d981f3117004bf341ee74893ba4ba8a9fbaf4b94615846550a08/regex-2026.5.9-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:0f9eede6a5cbdc02d4978090186390936e1776a7d1359b21e41014c609880bcf", size = 763311, upload-time = "2026-05-09T23:12:24.351Z" }, + { url = "https://files.pythonhosted.org/packages/93/c7/e7737f1526b3fb32bd4c337fd6c71c3ebb5c8296fc34d11197e0955d2e35/regex-2026.5.9-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:01f0f5f55f4b64dacec85dc116d3c05fd23ad3ff037bbc73a2085775953c2611", size = 844593, upload-time = "2026-05-09T23:12:26.341Z" }, + { url = "https://files.pythonhosted.org/packages/a5/27/0daffb1a535bb39f422c3d200f4ab023c71110ad66a32b366bee708baba0/regex-2026.5.9-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:1268eddd8486dc561d08eee1156e40aa3a8fe10f4bdec8fa653b455fcbffd12c", size = 789167, upload-time = "2026-05-09T23:12:27.975Z" }, + { url = "https://files.pythonhosted.org/packages/ce/fc/294fe4fac4f2ed67207b17471815870c1c45b3a489e08e0ac96daea16ef6/regex-2026.5.9-cp311-cp311-win32.whl", hash = "sha256:8676474c07469d6f33dd1085ca2cd45f65785f32518f2b20e36d9953ca07f994", size = 266249, upload-time = "2026-05-09T23:12:30.141Z" }, + { url = "https://files.pythonhosted.org/packages/d0/b0/8dce459f6245bcf8f6e9f23ac9569f1a0f15c131cc0745e82b43226204cf/regex-2026.5.9-cp311-cp311-win_amd64.whl", hash = "sha256:246de9d60aa3f8538b519834dd95cbf276ea263d6a7bd5a3666dc3fa0230505b", size = 278423, upload-time = "2026-05-09T23:12:31.676Z" }, + { url = "https://files.pythonhosted.org/packages/db/8d/f9aeff6ad63a3ef720386f2907e6d34a35a510a6e498ebad28b0fb3f6ab6/regex-2026.5.9-cp311-cp311-win_arm64.whl", hash = "sha256:d726ca3f0d76969bf1e8e477d160d3d666bbf999f6860bd314889e5345782046", size = 270420, upload-time = "2026-05-09T23:12:33.194Z" }, + { url = "https://files.pythonhosted.org/packages/50/9b/6550044bc44e17c84d312c031c2ec42fbdb6a4ec4e29093be3a172d08772/regex-2026.5.9-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:57eeeb05db7979413dec5438f2db21d7ecbba787cde7a711df1a6f6df672aa06", size = 490451, upload-time = "2026-05-09T23:12:34.72Z" }, + { url = "https://files.pythonhosted.org/packages/1e/95/fc7ba4303b5a0f92446a12ee6778ef2c6c799233f5060042a31bf390cfe9/regex-2026.5.9-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:398c521292f4c7fb807001dcd54694d3a1fcafc179a36ad9cc56f98df85930b6", size = 292112, upload-time = "2026-05-09T23:12:36.285Z" }, + { url = "https://files.pythonhosted.org/packages/54/4b/ee27938d1b2c443e89a9a10e00d2d19aa5ee300cd3d61140644e93bb083e/regex-2026.5.9-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:f7a7c26137296beba7784de6eba69c6a93a63ccebc385e4962fe67e267a91225", size = 289599, upload-time = "2026-05-09T23:12:38.089Z" }, + { url = "https://files.pythonhosted.org/packages/d8/dd/ba103dc19614e25f3880800ca67ce093d6e21b325d72b8383c7bf906e9fa/regex-2026.5.9-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:6441cc660d76107934a09c22167200839a0e89604a6297f78a974e66e931d2c0", size = 796732, upload-time = "2026-05-09T23:12:40.062Z" }, + { url = "https://files.pythonhosted.org/packages/cf/e7/f035b4fd858b050b0080bf302968dc0f59ba34e391872d54936758e6844e/regex-2026.5.9-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:91328f1c23d47595ca3ef0a7557fa129c5a23404b775c770697d2f35b33e0107", size = 865440, upload-time = "2026-05-09T23:12:42.059Z" }, + { url = "https://files.pythonhosted.org/packages/0a/51/8cd301ecc899aea28124357f729f4272f44de7806fc7ca02490bfbe253e8/regex-2026.5.9-cp312-cp312-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:93a7860539414dddaefba2b40f8771765ae17949d4c7182b876ce429e11a8309", size = 912329, upload-time = "2026-05-09T23:12:44.373Z" }, + { url = "https://files.pythonhosted.org/packages/cc/1e/3fbe2fa1e8cebd62f3bb7d3321cff1640aca2e240b51d9bd624aad949260/regex-2026.5.9-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:dd2810d22146b6d838acc5ec15602cb6b47920aa4e33015df3868eedfd20bab8", size = 801239, upload-time = "2026-05-09T23:12:46.268Z" }, + { url = "https://files.pythonhosted.org/packages/17/2f/6f6008682bf2cf98040a0d3153a8e557b6ab728d7713d045cee4ce544ab8/regex-2026.5.9-cp312-cp312-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:daff2bdbaf1d23e52fdff7c0b7bc2048b68f978df6a4d107ac981f94caef2e66", size = 777054, upload-time = "2026-05-09T23:12:48.051Z" }, + { url = "https://files.pythonhosted.org/packages/19/2b/eee0d20a6842ba04df4b8847a920b57ef56853f14ef85405473e586b605a/regex-2026.5.9-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:4eeb011098fcb77af513dcef521a3dbecbf8849b1e38940759d293b7a93f5026", size = 785098, upload-time = "2026-05-09T23:12:49.851Z" }, + { url = "https://files.pythonhosted.org/packages/4a/98/6fc1e6410feefb92159edaed5041992bfe390e8d26c721865434acbca558/regex-2026.5.9-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:ea9c8ecfa1b73c73b626534d6626e5340d429630943672b8480724f44e84b962", size = 860095, upload-time = "2026-05-09T23:12:51.666Z" }, + { url = "https://files.pythonhosted.org/packages/18/a3/bd855e0f2cb1a978ecf6fa6bb69632dd9c3f6ea3b81cde62fde14c9daec7/regex-2026.5.9-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:cd2846168eb9ee3c513902bc8225409cb1caab31d04728b145171fa1625d9621", size = 765762, upload-time = "2026-05-09T23:12:53.413Z" }, + { url = "https://files.pythonhosted.org/packages/dc/66/0ae8c092e60b14c79d24f8e0b7f0aea5bfbffdcab00b5483d13404d3c3a5/regex-2026.5.9-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:39617fb0cde9c0e6306dc70e3bfc096f3da793219879f7ae7aa341a69fbdcf6d", size = 852100, upload-time = "2026-05-09T23:12:55.256Z" }, + { url = "https://files.pythonhosted.org/packages/21/de/8dfde60fc1b21c946a893ba273403b72617edb261370cb1087099a83f088/regex-2026.5.9-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:fd03c4f0e33280d15cae17159b899245d6b7c53d21def19b263b39655061f5ce", size = 789479, upload-time = "2026-05-09T23:12:57.573Z" }, + { url = "https://files.pythonhosted.org/packages/c3/1c/bdcc98f9a4af4fdd166c74941174619ccff4726d3ce32faa8e9a2ecd38dd/regex-2026.5.9-cp312-cp312-win32.whl", hash = "sha256:164eba9b755ea6f244b0d881196fbc1fac09714e9782c9e2732b813142033c8e", size = 266699, upload-time = "2026-05-09T23:12:59.14Z" }, + { url = "https://files.pythonhosted.org/packages/78/87/240d36864f9e48ace85f72e79ced97ceb7f27ce87739a947dcb834b4e6bc/regex-2026.5.9-cp312-cp312-win_amd64.whl", hash = "sha256:86f40a5d6444db30a125c9c9177e6b25dad981cbc37451fd838f145e6edac92e", size = 277783, upload-time = "2026-05-09T23:13:00.789Z" }, + { url = "https://files.pythonhosted.org/packages/4f/b5/7b30f312b0669dff5beebe5b0989dc2d1a312b1a44fab852199c387a5b96/regex-2026.5.9-cp312-cp312-win_arm64.whl", hash = "sha256:96f5f58b54a063d7ea9dca08e1cf57bfe10499c4d579ee672da284f57f5f0070", size = 270513, upload-time = "2026-05-09T23:13:02.426Z" }, + { url = "https://files.pythonhosted.org/packages/aa/da/797e91ecec6f84135da778ddce78c20e0af5d2a15c26f87a81bc3eadb6db/regex-2026.5.9-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:d626b84406444b165fc0ba981604edea39f0588ff1f92baa23fe50799ea9afdb", size = 490303, upload-time = "2026-05-09T23:13:04.382Z" }, + { url = "https://files.pythonhosted.org/packages/44/da/bf30abaaa737b58f4a4b8c4a03659e02fd92092c822e0197ed9e0daab917/regex-2026.5.9-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:d7bdc0ab8f3dd7e1b4f9ab88634e13374669db86bb3c72e8292f07ae313f539f", size = 292019, upload-time = "2026-05-09T23:13:06.022Z" }, + { url = "https://files.pythonhosted.org/packages/2d/e7/d0eaf5713828417b9e5648cf81fa9bacd4961f6ab98c380c2034f8716e35/regex-2026.5.9-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:a8820737949116ffff55fe18f9fc644530063ba6ebfcb8314239416e78f1347c", size = 289468, upload-time = "2026-05-09T23:13:08.214Z" }, + { url = "https://files.pythonhosted.org/packages/d3/9b/b3fdd62b003baa1a9b593cd8c8699c9651c2e80cc21a5c715707983c42d7/regex-2026.5.9-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:aa0fbdbac82cb3e4450d0ccde7d7a35607f4cb2dd9fba4b8b69bfaf8c9fa6aed", size = 796749, upload-time = "2026-05-09T23:13:10.573Z" }, + { url = "https://files.pythonhosted.org/packages/d4/30/66ab84588765f5b4b271a9ca09ef7ce2b87caa95176ec3d2ad65d7bc4902/regex-2026.5.9-cp313-cp313-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:57e8915c7986aa33d25e4d3629cef711cd2863f2961b10409f0c04cb8b7d9020", size = 865445, upload-time = "2026-05-09T23:13:12.523Z" }, + { url = "https://files.pythonhosted.org/packages/1a/89/f05169e8588aac365f35ffc7f3bc3184f095ef4cfded7cfaa3c7fd5dbd89/regex-2026.5.9-cp313-cp313-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:508f56a89ba9cb26e4168cbc37dbd60a28d82430a9e18ad1d25fe0883c314ca2", size = 912322, upload-time = "2026-05-09T23:13:14.281Z" }, + { url = "https://files.pythonhosted.org/packages/30/e1/c93444052cf41581f3c884ab3fb5823daf0992f11cd4388d4275ca610558/regex-2026.5.9-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:b6d189041f15691cfa2b6c4290448ec221244d225b3f5fe9e7771b34ffcdf6e2", size = 801269, upload-time = "2026-05-09T23:13:16.569Z" }, + { url = "https://files.pythonhosted.org/packages/50/fe/0cf96b882f540e62e8b9956599798203d599c44cf4c77917ca27400ff69b/regex-2026.5.9-cp313-cp313-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:e82db382b44d0111b22601c509c89f64434816c9e0eef9d1989cda8cc6ff1c04", size = 777085, upload-time = "2026-05-09T23:13:18.675Z" }, + { url = "https://files.pythonhosted.org/packages/23/5c/d78d4924e7fc875557b9e9b768423925fdfaac5549d06da7810019a9bd26/regex-2026.5.9-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:2acfb48634f64996b57f90f39afa692ff362162722581921fe92239a59960f3c", size = 785153, upload-time = "2026-05-09T23:13:20.525Z" }, + { url = "https://files.pythonhosted.org/packages/bf/e0/5214774090e7b4524dcea3e3c4aa74141d43043f8beb49c1599db1c8b53a/regex-2026.5.9-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:d29eebfc9525db68cad3c97eedd7f754fa265aa5cd0cf4f863b2421e1b48fc9f", size = 860164, upload-time = "2026-05-09T23:13:22.263Z" }, + { url = "https://files.pythonhosted.org/packages/6e/e1/4a57a83350319b1271f0d7a249b8672513ed928b237a741631270de6caea/regex-2026.5.9-cp313-cp313-musllinux_1_2_riscv64.whl", hash = "sha256:debb893095e944091c16e641a6e33c1b0f4cb61ab945ec5afbf53ce7068834d8", size = 765731, upload-time = "2026-05-09T23:13:24.277Z" }, + { url = "https://files.pythonhosted.org/packages/12/f4/499e74a20c156fc75836ee04a72a38d1a063978f600937f9760467beb1b0/regex-2026.5.9-cp313-cp313-musllinux_1_2_s390x.whl", hash = "sha256:d659eee77986549c9ea45b861c7567e44d6287c3dc9a4565478853f7b9fe2ff6", size = 852062, upload-time = "2026-05-09T23:13:26.125Z" }, + { url = "https://files.pythonhosted.org/packages/5b/92/7eebc0d0a01e78629695f342ba17e0deaff8fb45e79cc0d7b98287da6e3e/regex-2026.5.9-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:2efa205e6d98b24d1f3ab395c11aa15cdf10935bca283d0285e0499c284fba21", size = 789577, upload-time = "2026-05-09T23:13:27.814Z" }, + { url = "https://files.pythonhosted.org/packages/05/a4/018e71f7d2ad48c1ebe6d3ae0026f9b7cb4802fd15c7cc02fdf724355102/regex-2026.5.9-cp313-cp313-win32.whl", hash = "sha256:f3844f134e834076677dd369976e9f5068679fcb8e50102fdf6b7ac96a3ec127", size = 266691, upload-time = "2026-05-09T23:13:29.549Z" }, + { url = "https://files.pythonhosted.org/packages/e6/1d/861a93719fb9ee7dbfc3761b3797b7a3e112a5d42c6129459d2d741be9b5/regex-2026.5.9-cp313-cp313-win_amd64.whl", hash = "sha256:3527bb4942d2c14552155406cdedd906567456821848aed1cb4933a391bf5eca", size = 277747, upload-time = "2026-05-09T23:13:31.859Z" }, + { url = "https://files.pythonhosted.org/packages/d9/c6/0a2436ae4da1ba76e51cb98943c6838a9a721faa40ebe2dce07694ae34e3/regex-2026.5.9-cp313-cp313-win_arm64.whl", hash = "sha256:56a33f191f17d8c417f99945ebdc1e691d3af9605d86ec68c7e54a57e3e17af6", size = 270500, upload-time = "2026-05-09T23:13:33.525Z" }, + { url = "https://files.pythonhosted.org/packages/e8/e9/d21346f7b60ed58789371358ed66b09d00f832e1bd7c06e55d9da5679882/regex-2026.5.9-cp313-cp313t-macosx_10_13_universal2.whl", hash = "sha256:01f28d868834624c934b8d2e0aa1c8341337e37831f4a012f18a5afcba4cbaf3", size = 494172, upload-time = "2026-05-09T23:13:35.935Z" }, + { url = "https://files.pythonhosted.org/packages/c4/43/fd1177a2032037c681baecdb3422ee4e1424aec4e4f470ef47793d325274/regex-2026.5.9-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:48036f6374aaa79eb3b754ec29c61d1c6b1606749d705a13f8854fa2539671f6", size = 293952, upload-time = "2026-05-09T23:13:38.307Z" }, + { url = "https://files.pythonhosted.org/packages/f2/7d/9fbf919768368d3f8a4f6c692cf2aa61e482b2b81ec6a298ace4cbf02480/regex-2026.5.9-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:b96350aa424e79d4fd6b567b344dcbe2b2d6bfc48dfe7717587e1fa6d43da6ff", size = 292314, upload-time = "2026-05-09T23:13:40.353Z" }, + { url = "https://files.pythonhosted.org/packages/e2/6c/e41bfeecb589716843e7c4df09ba46ff2a42961457afece19059d85caeef/regex-2026.5.9-cp313-cp313t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:8f3af7a4903c5c04a11a196a5aa75cdd7dd3f8508132f9fb3259d9f5908e3b88", size = 811681, upload-time = "2026-05-09T23:13:42.543Z" }, + { url = "https://files.pythonhosted.org/packages/87/83/a5c1c525fba0aa656e88ad0face0b1829788ef4c2fb6b26df58aa1151b84/regex-2026.5.9-cp313-cp313t-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:7e87577720152d2caae19fe2baaf1f8d5ca12091e9e229f03915c37d1e4b9178", size = 871135, upload-time = "2026-05-09T23:13:44.326Z" }, + { url = "https://files.pythonhosted.org/packages/18/d4/80882e799e440dd878b0979cbebf8fa4d54624a332c83037c7a701649e3f/regex-2026.5.9-cp313-cp313t-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:c8b9b9d294cfea3cd19c718ade7cc93492b2c4991abd9a68d0b3477ae6d8e100", size = 917265, upload-time = "2026-05-09T23:13:47.295Z" }, + { url = "https://files.pythonhosted.org/packages/ae/ff/8db60211e2286e396aad7dc7725356c502bff0901ea05bd6cdc2e1a042b9/regex-2026.5.9-cp313-cp313t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:728d8bfd28a8845c8b6bc5dc7ce010453d206396786c0765c2740cb65f37791e", size = 816311, upload-time = "2026-05-09T23:13:49.885Z" }, + { url = "https://files.pythonhosted.org/packages/4c/47/742ef579c61730f8d268e5cf1f9ce0e37e2ea041ad0f5644724f2378e463/regex-2026.5.9-cp313-cp313t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:7e30b874d341fac767d7df5a0870540541c2c054b80cfaac116e8d367a8a7ff2", size = 785498, upload-time = "2026-05-09T23:13:52.25Z" }, + { url = "https://files.pythonhosted.org/packages/7f/ab/cb0999802dcb0fb95b1ab005e8d4163d8afdd67efc2cb6b6630ac13f8cb1/regex-2026.5.9-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:fd190e88a895a8901325fad284a3f74ea52b1da8525b76cc811fa9b1edf0ce2b", size = 801348, upload-time = "2026-05-09T23:13:54.127Z" }, + { url = "https://files.pythonhosted.org/packages/7d/62/8ca59a24c55bc34d166eefaf3717bd77772f329fdbf984d86581e0a3571c/regex-2026.5.9-cp313-cp313t-musllinux_1_2_ppc64le.whl", hash = "sha256:8e76e8161ad00694cfce6767d5dea860c6391ac5b83e5c3a39661e696f11fc7e", size = 866493, upload-time = "2026-05-09T23:13:56.067Z" }, + { url = "https://files.pythonhosted.org/packages/8d/3d/30f2ae62cef3278bb5bb821f467277a55fb73f01032cf85997e15e8289a8/regex-2026.5.9-cp313-cp313t-musllinux_1_2_riscv64.whl", hash = "sha256:ddda5340e6c01a293027dd46232fa79eaff1b48058ce7a98f572b6445b088041", size = 772811, upload-time = "2026-05-09T23:13:57.867Z" }, + { url = "https://files.pythonhosted.org/packages/d8/ae/7d2089bcd78ad0c0161bc684339df50032acb438a7bd3305e7ddb1193cec/regex-2026.5.9-cp313-cp313t-musllinux_1_2_s390x.whl", hash = "sha256:205109e96b3cf5adf8f4cd62bedde9487feb282b9497a3535451e5a24cd706a0", size = 856584, upload-time = "2026-05-09T23:13:59.679Z" }, + { url = "https://files.pythonhosted.org/packages/a9/29/92ff47f75990131ea4f24ba17819e5a9d141e10819807e09addd73409af6/regex-2026.5.9-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:dfbe4579b9f08036aa7d101d1835437a20783574ac66327e6b29b4018a138081", size = 803453, upload-time = "2026-05-09T23:14:01.978Z" }, + { url = "https://files.pythonhosted.org/packages/04/99/eff29f1037dcab36702c9ee5d6858cf1ce2336ea8ea2987f64245b99ea5e/regex-2026.5.9-cp313-cp313t-win32.whl", hash = "sha256:ed2c9e8068b614c574d8d30e543d617cf5379b0535d46f97ef00e904745a08b5", size = 269951, upload-time = "2026-05-09T23:14:03.661Z" }, + { url = "https://files.pythonhosted.org/packages/0e/9d/8870b8981d27b22cda77bb26a5ac7ebfa9c7d9e0dea195a834a82380e748/regex-2026.5.9-cp313-cp313t-win_amd64.whl", hash = "sha256:b46b0f094dc1d3b90356c85a0bd2c9bafc4a6a190b9d6f8ddd5a033b6e088ed4", size = 281240, upload-time = "2026-05-09T23:14:05.56Z" }, + { url = "https://files.pythonhosted.org/packages/72/b1/3379415e8f135c13ac551353397cc4fe97b4978f3cac73c5fcbcded548b8/regex-2026.5.9-cp313-cp313t-win_arm64.whl", hash = "sha256:872acc074bd29ffc9913ecdfedf6ea77502312ca44a4aa0d3779089c6069d8de", size = 272383, upload-time = "2026-05-09T23:14:07.843Z" }, + { url = "https://files.pythonhosted.org/packages/13/3e/9c3cd292d8808b3645a2ce517e200179b6d0e903f176300bd8b542e14de5/regex-2026.5.9-cp314-cp314-macosx_10_13_universal2.whl", hash = "sha256:1bd7587a2948b4085195d5a3374eaf4a425dc3e55784c038175355ecf3bbbf8a", size = 490376, upload-time = "2026-05-09T23:14:09.64Z" }, + { url = "https://files.pythonhosted.org/packages/60/70/d43ee8a2ca0a8b68d167f21658b85520ac0574617c7f320367c5047f7556/regex-2026.5.9-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:dea2e88e1cce4522496cce630e11e67b98b7076620bc4336c3f674bc21a375f4", size = 291964, upload-time = "2026-05-09T23:14:11.424Z" }, + { url = "https://files.pythonhosted.org/packages/21/91/9d50b433828d8e74196904e168a43abf1e6e88b2a15d47ed742456720c37/regex-2026.5.9-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:2099f7e7ff7b6aa3192312650a56e91cc091e49d50b04e4f6f8b6e28b3b27f1c", size = 289682, upload-time = "2026-05-09T23:14:13.123Z" }, + { url = "https://files.pythonhosted.org/packages/3e/d2/b835e3cafbb9d977736912436259ff551d60919f7d7b3d37d46659c63564/regex-2026.5.9-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:ecd353045824e4477562a2ac718c25799cdaaa41f7aa925a806a8a3e6848a5b9", size = 796996, upload-time = "2026-05-09T23:14:14.923Z" }, + { url = "https://files.pythonhosted.org/packages/2c/a6/9f992d00019166b9de01c546dd4549bc679f2a68df11b877740b0760b7c2/regex-2026.5.9-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:65c8c8c37377794bd5b2f3ebe51919042bf17aec802e23c833d89782ed0c78af", size = 866089, upload-time = "2026-05-09T23:14:17.757Z" }, + { url = "https://files.pythonhosted.org/packages/e0/08/4d32af657e049b19cb62b02e46e38fe1518797bfb2203ee93a510b21b0dc/regex-2026.5.9-cp314-cp314-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:5b73ab8afcf66c622db143d1c6fda4e58e4d537ee4f125229ad47b1ab80f34c0", size = 911530, upload-time = "2026-05-09T23:14:20.353Z" }, + { url = "https://files.pythonhosted.org/packages/d9/27/2af43dd1dc201d1fecefda64a45f4ad0995855b92724f795a777b402ee69/regex-2026.5.9-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:0de5cf193997384ed2ca6f1cd4f78055b255d93d82d5a8cd6ba0d11c10b167e4", size = 800643, upload-time = "2026-05-09T23:14:22.265Z" }, + { url = "https://files.pythonhosted.org/packages/a4/dd/23a249047013b5321d4a60c4d2437462086f601b061776a525e5fba2a59f/regex-2026.5.9-cp314-cp314-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:d641a8c9a61618047796d572a39a79b26167b0411d2c3031937b2fe2d081e2cf", size = 777223, upload-time = "2026-05-09T23:14:24.179Z" }, + { url = "https://files.pythonhosted.org/packages/94/6a/e85ed9538cd19586d0465076a4578a12e093ce776d15f3f8ce92733a8dd6/regex-2026.5.9-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:24b2355ef5cc9aa5b8f07d17704face1c166fdcc2290fa7bd6e6c925655a8346", size = 785760, upload-time = "2026-05-09T23:14:26.065Z" }, + { url = "https://files.pythonhosted.org/packages/2a/c4/f25473209438638e947c55f9156fd8f236f74169229028cc99116380868e/regex-2026.5.9-cp314-cp314-musllinux_1_2_ppc64le.whl", hash = "sha256:a24852d3c29ad9e47593593d8a247c44ccc3d0548ef12c822d6ed0810affe676", size = 860891, upload-time = "2026-05-09T23:14:28.17Z" }, + { url = "https://files.pythonhosted.org/packages/f9/f7/f4f86e3c74419c37370e91f150ae0c2ef7d34b2e0e4cdd5da046a02e4022/regex-2026.5.9-cp314-cp314-musllinux_1_2_riscv64.whl", hash = "sha256:916714069da19329ef7de197dcbc77bb3104145c7c2c864dbfbe318f46b88b14", size = 765891, upload-time = "2026-05-09T23:14:30.06Z" }, + { url = "https://files.pythonhosted.org/packages/26/70/704d8e13765939146b1cd0ef4e2feb71d7929727d2290f026eed10095955/regex-2026.5.9-cp314-cp314-musllinux_1_2_s390x.whl", hash = "sha256:fa411799ca8da32a8d38d020a88faa5b6f91657d284761352940ecf9f7c3bbdd", size = 851380, upload-time = "2026-05-09T23:14:32.123Z" }, + { url = "https://files.pythonhosted.org/packages/26/29/1a13582a8460038edc38e49f64ceb0dd7c60f5caba77571f4bf6601965d9/regex-2026.5.9-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:1e6da47d679b7010ef27556b6e0f99771b744936db1792a10ceac6547ae1503e", size = 789350, upload-time = "2026-05-09T23:14:34.799Z" }, + { url = "https://files.pythonhosted.org/packages/73/56/3dcafe34fc72e271d62ad9a291801e88a1457bb251c132f15fcc2e5aad1a/regex-2026.5.9-cp314-cp314-win32.whl", hash = "sha256:98bd73080e8756255137e1bd3f3f00295bbc5aa383c0e0f973920e9134d7c4ad", size = 272130, upload-time = "2026-05-09T23:14:36.729Z" }, + { url = "https://files.pythonhosted.org/packages/d0/9c/02eebf0be95efe416c664db7fb8b6b05b7a0b06a7544f2884f2558b0526f/regex-2026.5.9-cp314-cp314-win_amd64.whl", hash = "sha256:ff8d372ac2acdc048d1c19916f27ee61bc5722728458ba6ca5052f2c72d51763", size = 280999, upload-time = "2026-05-09T23:14:39.126Z" }, + { url = "https://files.pythonhosted.org/packages/70/5a/1dd1abee76cb7a846a0bcf42fdc87e5720c3c33c24f3e37814310a513d9f/regex-2026.5.9-cp314-cp314-win_arm64.whl", hash = "sha256:e1d93bf647916292e8edcec150c07ddf3dc50179ccaf770c04a7f9e452155372", size = 273500, upload-time = "2026-05-09T23:14:41.059Z" }, + { url = "https://files.pythonhosted.org/packages/86/c1/c5f619b0057a7965cb78ec559c1d7a45ce8c99a35bea95483d64959a93d9/regex-2026.5.9-cp314-cp314t-macosx_10_13_universal2.whl", hash = "sha256:83d0ee4a57d1c87cb549e195ec300b8f0ec3a82eba66d835e4e2ed8634fe4499", size = 494269, upload-time = "2026-05-09T23:14:42.869Z" }, + { url = "https://files.pythonhosted.org/packages/05/2c/5d01f1aee33de4bbe60c8452945bfc8477ca7c5ae4450f6bfe711036cb36/regex-2026.5.9-cp314-cp314t-macosx_10_13_x86_64.whl", hash = "sha256:d3d7eb5c9a7f6df82ed3cfac9beb93882a5cbcb5b8b157b56cb2b3b276574ac1", size = 293954, upload-time = "2026-05-09T23:14:44.822Z" }, + { url = "https://files.pythonhosted.org/packages/7a/fe/e8988b2ae2108c6ef71bd4aa8d87fbe257976dd0810e826cd75f701c68b6/regex-2026.5.9-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:075160bf16658e16d35233300b8453aac25de4cbea808d22348b6979668e924d", size = 292405, upload-time = "2026-05-09T23:14:47.211Z" }, + { url = "https://files.pythonhosted.org/packages/79/34/d2b0937faa7859263f7f0a3c6b103a1296306be6952dc173d0154e9a2f49/regex-2026.5.9-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:45375819235558a4ff1c4971dc32881f022613abdb180128f5cb4768c1765a1c", size = 811855, upload-time = "2026-05-09T23:14:49.21Z" }, + { url = "https://files.pythonhosted.org/packages/80/fe/daf53a47457a8486db66c66c01ceb9c2303eecee3f87197f1e77eb1a736d/regex-2026.5.9-cp314-cp314t-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:ead4b163ac30a29574510cd4b3e2e985ac5290c05fc7095557d6a5f403fc31b5", size = 871189, upload-time = "2026-05-09T23:14:51.555Z" }, + { url = "https://files.pythonhosted.org/packages/1c/75/058fc4470cbfbf57d800aff1a0022b929a3f9fa553ee10a0cdf2070eb31f/regex-2026.5.9-cp314-cp314t-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:8c6e4218fbdfbcd4f6c19efca40930d24a621bf4b48cb76bc6640543bd28ef20", size = 917485, upload-time = "2026-05-09T23:14:53.633Z" }, + { url = "https://files.pythonhosted.org/packages/88/e7/179cfda3a28bc843b5c6cfe7f79f23489c791ed95f151083803660878432/regex-2026.5.9-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:6351571c8a42b505eb555c0dc47d740d0fb66977dc142919eea6f4325b7c56a0", size = 816369, upload-time = "2026-05-09T23:14:56.198Z" }, + { url = "https://files.pythonhosted.org/packages/41/90/6f0cc422071688266d344fca8462d787cba0a2c144acb25721f9a61ec265/regex-2026.5.9-cp314-cp314t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:002205cafd2a9e78c6290c7d1df277bf3277b3b7a30e0b4bb0dac2e2e3f7cb2d", size = 785869, upload-time = "2026-05-09T23:14:58.602Z" }, + { url = "https://files.pythonhosted.org/packages/02/67/a31f1760f09c27b251ef39e9beb541f462cf977381d067faa764c2c0e393/regex-2026.5.9-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:8abd33fef90b2a9efac5557d6033ca82d1195ed3a15fea5af15ba7b463c6a63b", size = 801427, upload-time = "2026-05-09T23:15:00.642Z" }, + { url = "https://files.pythonhosted.org/packages/e3/c4/1a80654597b6bc1e1ea0494824c31200e8a956abe290afae9b19a166a148/regex-2026.5.9-cp314-cp314t-musllinux_1_2_ppc64le.whl", hash = "sha256:31037c82eccb44b7ea2e9e221d7c01429430e989a1f4b91ea5a855f6017b509a", size = 866482, upload-time = "2026-05-09T23:15:03.384Z" }, + { url = "https://files.pythonhosted.org/packages/d1/11/960724e06482c08466ff5611e242e86f80062949cdf6b4b9cc317b9dd93d/regex-2026.5.9-cp314-cp314t-musllinux_1_2_riscv64.whl", hash = "sha256:5604dfd046dc37eca90250fc3be938b076c8059fa772ac0ed6f499b0f0fb0415", size = 773022, upload-time = "2026-05-09T23:15:05.625Z" }, + { url = "https://files.pythonhosted.org/packages/50/a8/a9979c3e7918280e93159ebcab5ef1a65116dd4f3bd6091be0eae4a126e8/regex-2026.5.9-cp314-cp314t-musllinux_1_2_s390x.whl", hash = "sha256:0e1b1b4e496afbb24f4a62aba855ee4f88f25578927697b340702e48c9ee6bc2", size = 856642, upload-time = "2026-05-09T23:15:07.966Z" }, + { url = "https://files.pythonhosted.org/packages/fe/d4/a9b732f2f0072c0ab12227483abb24fffcb9f73f8a2b203df0a6d0434735/regex-2026.5.9-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:be3372b9df6ddecff6486d37e19095a7b4973137caf5512407a89f4455361f41", size = 803552, upload-time = "2026-05-09T23:15:10.215Z" }, + { url = "https://files.pythonhosted.org/packages/d5/fe/1b3113817447a1d4155e4ac76d2e072f42c0bcba2f43fa8a0e756ea2cd91/regex-2026.5.9-cp314-cp314t-win32.whl", hash = "sha256:3ddd90103f9e5c471c49c7852ecc1fe27c7e45eb99e977aefe7caa4e779f4f58", size = 275746, upload-time = "2026-05-09T23:15:12.609Z" }, + { url = "https://files.pythonhosted.org/packages/92/73/93d42045302636c91f2e5ef588b65b84b01428f28ec77de256b1dfdfbe5c/regex-2026.5.9-cp314-cp314t-win_amd64.whl", hash = "sha256:ca518ed29c46eecba6010b15f1b9a479314d2de409536e71b6a13aa04e3b8a77", size = 285685, upload-time = "2026-05-09T23:15:15.086Z" }, + { url = "https://files.pythonhosted.org/packages/da/80/35b4c33c804a165a7f55289afda3ea9e3eb6d15800341a2d66455c0f1f30/regex-2026.5.9-cp314-cp314t-win_arm64.whl", hash = "sha256:5e41809d2683fcde7d5a8c87a6567ba1fb1ce0de9f31bff578de00a4b2d76daa", size = 275713, upload-time = "2026-05-09T23:15:16.98Z" }, +] + +[[package]] +name = "requests" +version = "2.34.2" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "certifi" }, + { name = "charset-normalizer" }, + { name = "idna" }, + { name = "urllib3" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/ac/c3/e2a2b89f2d3e2179abd6d00ebd70bff6273f37fb3e0cc209f48b39d00cbf/requests-2.34.2.tar.gz", hash = "sha256:f288924cae4e29463698d6d60bc6a4da69c89185ad1e0bcc4104f584e960b9ed", size = 142856, upload-time = "2026-05-14T19:25:27.735Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/a0/f4/c67b0b3f1b9245e8d266f0f112c500d50e5b4e83cb6f3b71b6528104182a/requests-2.34.2-py3-none-any.whl", hash = "sha256:2a0d60c172f83ac6ab31e4554906c0f3b3588d37b5cb939b1c061f4907e278e0", size = 73075, upload-time = "2026-05-14T19:25:26.443Z" }, +] + +[[package]] +name = "rfc3339-validator" +version = "0.1.4" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "six" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/28/ea/a9387748e2d111c3c2b275ba970b735e04e15cdb1eb30693b6b5708c4dbd/rfc3339_validator-0.1.4.tar.gz", hash = "sha256:138a2abdf93304ad60530167e51d2dfb9549521a836871b88d7f4695d0022f6b", size = 5513, upload-time = "2021-05-12T16:37:54.178Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/7b/44/4e421b96b67b2daff264473f7465db72fbdf36a07e05494f50300cc7b0c6/rfc3339_validator-0.1.4-py2.py3-none-any.whl", hash = "sha256:24f6ec1eda14ef823da9e36ec7113124b39c04d50a4d3d3a3c2859577e7791fa", size = 3490, upload-time = "2021-05-12T16:37:52.536Z" }, +] + +[[package]] +name = "rfc3986-validator" +version = "0.1.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/da/88/f270de456dd7d11dcc808abfa291ecdd3f45ff44e3b549ffa01b126464d0/rfc3986_validator-0.1.1.tar.gz", hash = "sha256:3d44bde7921b3b9ec3ae4e3adca370438eccebc676456449b145d533b240d055", size = 6760, upload-time = "2019-10-28T16:00:19.144Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/9e/51/17023c0f8f1869d8806b979a2bffa3f861f26a3f1a66b094288323fba52f/rfc3986_validator-0.1.1-py2.py3-none-any.whl", hash = "sha256:2f235c432ef459970b4306369336b9d5dbdda31b510ca1e327636e01f528bfa9", size = 4242, upload-time = "2019-10-28T16:00:13.976Z" }, +] + +[[package]] +name = "rfc3987-syntax" +version = "1.1.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "lark" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/2c/06/37c1a5557acf449e8e406a830a05bf885ac47d33270aec454ef78675008d/rfc3987_syntax-1.1.0.tar.gz", hash = "sha256:717a62cbf33cffdd16dfa3a497d81ce48a660ea691b1ddd7be710c22f00b4a0d", size = 14239, upload-time = "2025-07-18T01:05:05.015Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/7e/71/44ce230e1b7fadd372515a97e32a83011f906ddded8d03e3c6aafbdedbb7/rfc3987_syntax-1.1.0-py3-none-any.whl", hash = "sha256:6c3d97604e4c5ce9f714898e05401a0445a641cfa276432b0a648c80856f6a3f", size = 8046, upload-time = "2025-07-18T01:05:03.843Z" }, +] + +[[package]] +name = "rpds-py" +version = "2026.5.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/2e/43/25a8dcd3feedd735039a8f0b5b7e3b118232b5eae288c4fd9ab200d41094/rpds_py-2026.5.1.tar.gz", hash = "sha256:07b24fea40541e28570e5b795a4a38fbdcd12550c06bd0748005ecc8116ca256", size = 64459, upload-time = "2026-05-28T12:02:13.232Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/4f/a0/acf8b6fc20bfdcd3a45bd3f57680fb198e157b7e997b9123b10763798bd2/rpds_py-2026.5.1-cp311-cp311-macosx_10_12_x86_64.whl", hash = "sha256:3397a5ed7174dc2786bb214030232fc36fe8e5584fec43a9952cc542b1a12036", size = 355609, upload-time = "2026-05-28T11:58:50.78Z" }, + { url = "https://files.pythonhosted.org/packages/b6/95/f8203fd997484b1690a6869cd0e503b6c3c6be55b0ecc36d1a491fe742f0/rpds_py-2026.5.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:99ab6ba7bfa2cb0f96a04e3652355bf04e3f51aceb1e943b8541dab7ba4828cc", size = 348460, upload-time = "2026-05-28T11:58:52.374Z" }, + { url = "https://files.pythonhosted.org/packages/33/8c/b47326ad2f0be545a5e5c1a55937a12afaea7d392ba2837bb9680f57e6c9/rpds_py-2026.5.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d0efbe45632665e53e3db8fe1e5692db58fc5cb9bab4459d570b83efefe11164", size = 381031, upload-time = "2026-05-28T11:58:53.775Z" }, + { url = "https://files.pythonhosted.org/packages/22/0b/e83bbd97ffac6f6389b605cd4e1c8ac5761dc7e977769c9255d8c5adb7bd/rpds_py-2026.5.1-cp311-cp311-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:01d17b29c0c23d82b1f4751147ec49cf451f1fc2554eb9ef5f957e55d2656ead", size = 387121, upload-time = "2026-05-28T11:58:55.243Z" }, + { url = "https://files.pythonhosted.org/packages/fd/0e/d285d1bc8864245919c61e1ca82263e4a66d337759c3a4cef72766ff9afc/rpds_py-2026.5.1-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:7559f72b94ae52659086c595dfa017cde03155f7832071d30959049052cb3ece", size = 501026, upload-time = "2026-05-28T11:58:56.788Z" }, + { url = "https://files.pythonhosted.org/packages/86/06/ccb2109a1e543437b5e43816f2b43b9554cc6783145528a4e3711e05c011/rpds_py-2026.5.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9e25b7088f9ccbfc0dfcaa52bf969300ca229e10ecf758974ebcbb080a4b37bb", size = 391865, upload-time = "2026-05-28T11:58:58.298Z" }, + { url = "https://files.pythonhosted.org/packages/3d/33/237173db1cfef10105b3839a24de00eb8d2a523711add4632447cdf0aedd/rpds_py-2026.5.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:613fc4ee9eaef26dc5840666214dd6fbcebcf32f46e76f4abc473059f4e13dda", size = 378012, upload-time = "2026-05-28T11:58:59.589Z" }, + { url = "https://files.pythonhosted.org/packages/97/64/1eae54e34d5161f9969295e80bd6b62a55f2b6ac5f2a5b60d02c2140e758/rpds_py-2026.5.1-cp311-cp311-manylinux_2_31_riscv64.whl", hash = "sha256:85264a90ff4c05c1568dd65f5921c837614b67c60358fb4c17df3b7f2e90690a", size = 391111, upload-time = "2026-05-28T11:59:01.104Z" }, + { url = "https://files.pythonhosted.org/packages/d8/34/5bb334a5a0f65d77869217c4654f34c78a7d11b93938a3c076a2edeafc52/rpds_py-2026.5.1-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:fe71bca7d547acb17027c7fd1624ff8aae623499c498d3e7011182c4de5c25e0", size = 409225, upload-time = "2026-05-28T11:59:02.433Z" }, + { url = "https://files.pythonhosted.org/packages/16/0f/007ec21283b5b040b4ec3bd95e0402591e22bfa7d5c93dfe01c465c2d2d7/rpds_py-2026.5.1-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:a05fa4f41f37ec97c9c260441a940450a192f78d774d2b097eee1379f1e1246a", size = 556487, upload-time = "2026-05-28T11:59:04.012Z" }, + { url = "https://files.pythonhosted.org/packages/ff/10/5437c94508169b6b22d8418fef7a66e9ffb5f3b9e9c94460f2eedafe06ff/rpds_py-2026.5.1-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:df1d2a1996755b24b9ecee92cb4d36c28f86f464a6a173349c26bab41e94b8c2", size = 620798, upload-time = "2026-05-28T11:59:05.485Z" }, + { url = "https://files.pythonhosted.org/packages/e0/d5/9937dce4d6bda74157b954e7d1460db05a22f5929dccfeeba1ed27a93df0/rpds_py-2026.5.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:8895840ac4809e5f60c88fd07617cd71326e73d6e5a8aa783c5c0f7c24985de2", size = 584053, upload-time = "2026-05-28T11:59:06.837Z" }, + { url = "https://files.pythonhosted.org/packages/6c/31/750617dd0ae1752471bf43f9e41d263398fae7cde7849d23b8574a70e617/rpds_py-2026.5.1-cp311-cp311-win32.whl", hash = "sha256:3684a59b158a7683aaeb8e25352e9a9dd2122cec78f2d8530266e4f91b4c7b3f", size = 214390, upload-time = "2026-05-28T11:59:08.402Z" }, + { url = "https://files.pythonhosted.org/packages/3c/bb/3dcab0e1d9516303f2eb672a5d6f62eca5a69e2886301e9c8c54b520c39b/rpds_py-2026.5.1-cp311-cp311-win_amd64.whl", hash = "sha256:7bd530e6a530bb3ea892f194fafa455f3516ac25ecf7143fd33c09be62b0470a", size = 231097, upload-time = "2026-05-28T11:59:09.786Z" }, + { url = "https://files.pythonhosted.org/packages/49/d6/c6bbf5cb1cf12b9732df8074b57f6ef8341ba884c95d40632ae8bddb44e4/rpds_py-2026.5.1-cp311-cp311-win_arm64.whl", hash = "sha256:0a5ae4dbe43c1076983b72616496919872ae7bbe7a1e21cc48336bc3154d130b", size = 226361, upload-time = "2026-05-28T11:59:11.079Z" }, + { url = "https://files.pythonhosted.org/packages/d4/e7/a78582dc57caa592dcc7d4fb69b61390561e908eb3d2f5df5928a8e354c0/rpds_py-2026.5.1-cp312-cp312-macosx_10_12_x86_64.whl", hash = "sha256:3abe24a66e57adcfa645d718063a5fa5103ecc71ddbf26d78af8f9368018ff1d", size = 353040, upload-time = "2026-05-28T11:59:12.531Z" }, + { url = "https://files.pythonhosted.org/packages/a3/43/35e3f136343aef451e545ce8c38d36c2f93c0ed88703db8b64ba2b205c68/rpds_py-2026.5.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:58b1d94308ddf0b1982f61f2eb54bf92997c9ece8a8093ef014250f4a517906c", size = 345775, upload-time = "2026-05-28T11:59:13.827Z" }, + { url = "https://files.pythonhosted.org/packages/20/e1/0f2160c5982d3157734d5cb3ed63d8b2d583a73c9864f77b666449f32cf8/rpds_py-2026.5.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0fa92420128dadce7f54bd73ba1825a273e9268fe9e35dbf7e6362890efa4e08", size = 376329, upload-time = "2026-05-28T11:59:15.271Z" }, + { url = "https://files.pythonhosted.org/packages/d0/11/ee0ba42aff83bf4effdbc576673c6be64c5e173978c3f6d537e94482f77d/rpds_py-2026.5.1-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:ca653c6546386227cd9800d1bef6a348099acf8db4250341da6d90f663d6dfcb", size = 383539, upload-time = "2026-05-28T11:59:16.665Z" }, + { url = "https://files.pythonhosted.org/packages/11/df/d94aa6a499d4ac40afe2d7620f2c597fd3c0f182e854ad7cf3f596a81cb6/rpds_py-2026.5.1-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:66c93681c4729e4e3ecba31b8179fae083ff3118841672835140338b4b9867c1", size = 494674, upload-time = "2026-05-28T11:59:17.991Z" }, + { url = "https://files.pythonhosted.org/packages/1f/75/33d30f43bb2f458de11979486a591b1bf6e5651765ed1704c6197c2dc773/rpds_py-2026.5.1-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:40ff257542e04796880e011e15cd4dc21c2599975df2aaa8f2c8495ca574e1a5", size = 389268, upload-time = "2026-05-28T11:59:19.434Z" }, + { url = "https://files.pythonhosted.org/packages/f4/1e/2c9096fc19d5fd084b0184ca2b651e659aa0a37e6fdbecf6ece47f147fe1/rpds_py-2026.5.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b6825cc329b290e93c5f6a9be2393118a763f6ccf6abd83704e0c102ca583644", size = 376280, upload-time = "2026-05-28T11:59:21Z" }, + { url = "https://files.pythonhosted.org/packages/b9/e5/61ec9f8be8211ea7f48448195549e4aaf02004083475493b0e137702ecb2/rpds_py-2026.5.1-cp312-cp312-manylinux_2_31_riscv64.whl", hash = "sha256:de42116e69cb53b911cc34aee5ab98f36c597b822545045d49e938818b99e5e4", size = 387233, upload-time = "2026-05-28T11:59:22.454Z" }, + { url = "https://files.pythonhosted.org/packages/0d/ca/bcec1005c4f4a234f92a29078631fee49206c7265ccae966f18fd332e80e/rpds_py-2026.5.1-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:c0f920015df2a504bebaba6d4c31ccf3fcf942f92655c086da30b671aad19aa6", size = 405009, upload-time = "2026-05-28T11:59:23.845Z" }, + { url = "https://files.pythonhosted.org/packages/72/e6/4d5718c5cf26c522dc7c9999e238da1e77380b81d0c5d1df11e271ddfeb1/rpds_py-2026.5.1-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:0408a24e44feb919423dc6d9da677cb5cddb894d2ca9e763967d156d9c60fab4", size = 553113, upload-time = "2026-05-28T11:59:25.184Z" }, + { url = "https://files.pythonhosted.org/packages/d4/25/2ee807bdb3e1f0b7eddf7782acd5665a8b5205a331a7d7244a52c4812fd9/rpds_py-2026.5.1-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:cea68bcd53467561ae2f96a6bdad1544299ba97b5b0ddcd5ac3d376e5c781c24", size = 618838, upload-time = "2026-05-28T11:59:26.749Z" }, + { url = "https://files.pythonhosted.org/packages/6a/c1/7d4c26f167f8c41501cc073d30ee22082b16ce358cf5b00ec97cbc7804ea/rpds_py-2026.5.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:4be8b1d2a705cc37d08256004e1d07de143fa0075c8e85a3df020b776f62b732", size = 582436, upload-time = "2026-05-28T11:59:28.11Z" }, + { url = "https://files.pythonhosted.org/packages/04/1d/9d12b0a337bab46f4769f8857f4007e3b2d639e14f9a44a0efe157696e64/rpds_py-2026.5.1-cp312-cp312-win32.whl", hash = "sha256:6736718bd4fc49cbcb538ba30516fdbef161522acefb739657d48b97bd864fed", size = 212734, upload-time = "2026-05-28T11:59:29.689Z" }, + { url = "https://files.pythonhosted.org/packages/c5/93/e4116f2de7f56bc7406a76033dc501811ddeb22b7f056b92d632871ebb0c/rpds_py-2026.5.1-cp312-cp312-win_amd64.whl", hash = "sha256:0a7d1eec967df0e9b22614a5e177622e0c89611d03727fa0cb48e45028907870", size = 229045, upload-time = "2026-05-28T11:59:31.033Z" }, + { url = "https://files.pythonhosted.org/packages/cb/53/6c3419d85eb2ec5938a37627c585b42d76a63bb731d6e42ed4b079ebf486/rpds_py-2026.5.1-cp312-cp312-win_arm64.whl", hash = "sha256:1841d067089e117142d79b98aa0df2f08b52f2ecc1819dd2700636c0db74a473", size = 223967, upload-time = "2026-05-28T11:59:32.318Z" }, + { url = "https://files.pythonhosted.org/packages/6c/32/14c961ad295f490eb0849ada8b79683e93a59b9de3afdd983eaf55fa6867/rpds_py-2026.5.1-cp313-cp313-macosx_10_12_x86_64.whl", hash = "sha256:efef4ac29c6ff495531eb17ee705b62841ecaa291b7c7077e848ea03e237164d", size = 352787, upload-time = "2026-05-28T11:59:33.655Z" }, + { url = "https://files.pythonhosted.org/packages/ca/bb/d1b85117967c11191441a7274ae616c65d93901d082c588f89a50a8da5ae/rpds_py-2026.5.1-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:c39f5b67a8a2e67179ada2a954227d670fe65fa9098457f698f56ddf248709b3", size = 345179, upload-time = "2026-05-28T11:59:35Z" }, + { url = "https://files.pythonhosted.org/packages/7c/46/d84105f062e626a1b233f863907288a4708c2d833b8b4c6fb2764bc080c0/rpds_py-2026.5.1-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b5c30f3f04eef4fbd362226a6f31d7c8895ca4fbb6e0b790f6890a98d8da8559", size = 376173, upload-time = "2026-05-28T11:59:36.43Z" }, + { url = "https://files.pythonhosted.org/packages/e2/ae/469d7959ce5b1201e1de135dc735b86db3b35dd0d1734f6a44246d5f061c/rpds_py-2026.5.1-cp313-cp313-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:277f6c82f0580848796c7ecc8a7173aa3bfb928e4ff831261c2f60a81dc270db", size = 383162, upload-time = "2026-05-28T11:59:37.995Z" }, + { url = "https://files.pythonhosted.org/packages/dc/a2/57853d31a1116a561aa072794602ad3f6341e18d70a8523f1bd5b9fc1e5a/rpds_py-2026.5.1-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:63c2c4c213f1a4e3f3de28ecab029dbdee976324e729c0d7a55211be72576b02", size = 495093, upload-time = "2026-05-28T11:59:39.453Z" }, + { url = "https://files.pythonhosted.org/packages/99/63/3a8eabcad9314b7daf5c65f451d2c33d989235cd8a5762186cf2c3f5a4f8/rpds_py-2026.5.1-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:3350ec808fb538fe71a1f94dfaa0e29c598dfad805ce49f0caec5ae3183c652b", size = 389829, upload-time = "2026-05-28T11:59:40.896Z" }, + { url = "https://files.pythonhosted.org/packages/4b/25/05678d97fc25e2622df14dc530fb82023174ecfff6733991ed0d78f167bd/rpds_py-2026.5.1-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b1b964e3ab599e718dc46c018d104b1ebc007cbc6567d827c94a687fca56d77e", size = 374786, upload-time = "2026-05-28T11:59:42.626Z" }, + { url = "https://files.pythonhosted.org/packages/88/d1/8c90b6431e80a3b91b284a5c7c8c0c4f9c006444d90477a740d6e0f9c694/rpds_py-2026.5.1-cp313-cp313-manylinux_2_31_riscv64.whl", hash = "sha256:19cb09fab7b7fc96b2a6e28f2e34b72a3705ff27b37edb77455316e5d3f3dc9b", size = 386920, upload-time = "2026-05-28T11:59:44.124Z" }, + { url = "https://files.pythonhosted.org/packages/ff/99/4638f672ab356682d633ee0da9255f5b67ce6efd0b85eb94ad3e255e65a5/rpds_py-2026.5.1-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:abe76bcdba31e576cb83eeb8797aa0d882b738fef6dc65d0601fc753806a5b46", size = 405059, upload-time = "2026-05-28T11:59:47.177Z" }, + { url = "https://files.pythonhosted.org/packages/66/3f/3546524b6eb4cc2e1f363a3d638fa52f6c24faae3500c25fb488b02f1740/rpds_py-2026.5.1-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:8bff7073db3899158fff55ebf57b113a67030af26f80a18978f9f0aa60250ddf", size = 553030, upload-time = "2026-05-28T11:59:48.603Z" }, + { url = "https://files.pythonhosted.org/packages/c6/c3/7b3388c796fcf471bd17194242d4dc1a7608567c0fa422bcc1c5e79f9c1e/rpds_py-2026.5.1-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:8ba264fa49be666cd9cc56bf34ec7002fb3d27a4aee5bcb4d43d0d18feb1bb6f", size = 618975, upload-time = "2026-05-28T11:59:50.314Z" }, + { url = "https://files.pythonhosted.org/packages/61/1e/a3cb07f2795075d1d88efddae2f541359fde5f08c81ee114c29c2949c90a/rpds_py-2026.5.1-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:4860b603ddda0475a8885499b3729e90229d480105b42651962a5397d995fa89", size = 581178, upload-time = "2026-05-28T11:59:51.673Z" }, + { url = "https://files.pythonhosted.org/packages/a1/74/e758c03a5ef46f04c37f2651a2893db846d569ba8a7bca469d4b58939bcd/rpds_py-2026.5.1-cp313-cp313-win32.whl", hash = "sha256:7944270ae71383f6e2657dd7d5ce4eeb4ac2d0059a6738f0510583d462ab4842", size = 212481, upload-time = "2026-05-28T11:59:53.148Z" }, + { url = "https://files.pythonhosted.org/packages/70/ec/a2aca432db9c7359b40fa393eeeaa0d166c2f70175be956e75fa24197c44/rpds_py-2026.5.1-cp313-cp313-win_amd64.whl", hash = "sha256:88647f43a73c4e01be19b04ceef0c8d3a1958153604d13c773becd8016f2a0cf", size = 228519, upload-time = "2026-05-28T11:59:54.505Z" }, + { url = "https://files.pythonhosted.org/packages/29/60/a73bfdd45b096574556acf303bbd9fa9eed36ca8a818b514e2a5d5fe2b9d/rpds_py-2026.5.1-cp313-cp313-win_arm64.whl", hash = "sha256:453895624ecf7db7063b1004e44037522bbaef9ff6a945e59bc71662d7a03abd", size = 223446, upload-time = "2026-05-28T11:59:56.081Z" }, + { url = "https://files.pythonhosted.org/packages/18/e2/408105fd611823f00882aea810f3989a30d26b1bab8b6beb20f98c724e0e/rpds_py-2026.5.1-cp313-cp313t-macosx_10_12_x86_64.whl", hash = "sha256:b4e4bc98639ec915f512fde3aa7a95e0041d95d9c3cc86eea841fa63cb1e8600", size = 355287, upload-time = "2026-05-28T11:59:57.448Z" }, + { url = "https://files.pythonhosted.org/packages/8d/58/5c4a43436843c90d0f6d19f82c200c80e3843ca9fa07b237623327f6d384/rpds_py-2026.5.1-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:cacedb7a6e167680acba45ad5716e89067d225dc80da0d7040cae8c81d4572fa", size = 347033, upload-time = "2026-05-28T11:59:58.881Z" }, + { url = "https://files.pythonhosted.org/packages/fb/c2/1a71acdacaf4e259b10278fb87b039ded3cf80041bcd89dd8a3ea702ded6/rpds_py-2026.5.1-cp313-cp313t-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:68700371c5d7ae1412862ddfa719090925c93ecf351c566d66f09d04b136ea00", size = 376891, upload-time = "2026-05-28T12:00:00.516Z" }, + { url = "https://files.pythonhosted.org/packages/c2/c8/535f3d9b65addd8e28aa87b83c6e526799c3717a88273db8ea795beeef7a/rpds_py-2026.5.1-cp313-cp313t-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:296c799becfa849c779c8725494fe9ed94959ed886787df4364b058465bad7f0", size = 385646, upload-time = "2026-05-28T12:00:02.394Z" }, + { url = "https://files.pythonhosted.org/packages/1c/91/dc033f313345c354ade914dbe73cdb90b615a4409ea02430d5356794f3d8/rpds_py-2026.5.1-cp313-cp313t-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:d3858b908218ee108d0bbfb2095ccc237648053c9bf98affad7cb079acaf1d97", size = 498830, upload-time = "2026-05-28T12:00:04.189Z" }, + { url = "https://files.pythonhosted.org/packages/27/fc/90fcbea459dbb8ddc18a2e0fd1de9412b48bc84ffff2db771cf714bacfd6/rpds_py-2026.5.1-cp313-cp313t-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:4fb8d2e7cb2f850b169806d61d1b991738acec96500a75c30f49caf064ce7cef", size = 392830, upload-time = "2026-05-28T12:00:05.797Z" }, + { url = "https://files.pythonhosted.org/packages/b2/1d/46cd11a228c9750684a798d98f878be6f614aa762438da7378f035e79e35/rpds_py-2026.5.1-cp313-cp313t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:27b74c10ed6a8f190f4287f53bcfea348b92a84a9c9f70d30183d1e6172d580d", size = 379613, upload-time = "2026-05-28T12:00:07.433Z" }, + { url = "https://files.pythonhosted.org/packages/24/4a/d9b0c6af3a1de03eb93741bbe8be2bdce84d8fda8224f3005451d86df389/rpds_py-2026.5.1-cp313-cp313t-manylinux_2_31_riscv64.whl", hash = "sha256:b9a6528956191c48c52294a592dbd4a8386d7048bdb25c0efcb6b966466c6d83", size = 388183, upload-time = "2026-05-28T12:00:09.227Z" }, + { url = "https://files.pythonhosted.org/packages/c5/b4/db7aaabdda6d020afc87d981bcc2f57a434c7dec60ecfc2ab3dd50b20351/rpds_py-2026.5.1-cp313-cp313t-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:af03e34e860047bc7a352b842856fcf78798fbb81132cc98bd2f907ab4eb9cd2", size = 408578, upload-time = "2026-05-28T12:00:10.779Z" }, + { url = "https://files.pythonhosted.org/packages/08/d6/070f6a41cbb343e2ac4171859bf3f3623e0ab002f72619d6d505313ec2de/rpds_py-2026.5.1-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:fea6e836d10abbe191d557d33bd58bd5987725fe63aa1eefe557d230209855bd", size = 553573, upload-time = "2026-05-28T12:00:12.443Z" }, + { url = "https://files.pythonhosted.org/packages/75/ab/1a71ea3589c4345dac0a0518f0e6a031cb42689277851b683c46d27463a5/rpds_py-2026.5.1-cp313-cp313t-musllinux_1_2_i686.whl", hash = "sha256:fc0c0f878ea770a0a8a462456c5ad36fc9fe6358e6b76fdadc7f17575e0b8bf1", size = 620861, upload-time = "2026-05-28T12:00:14.09Z" }, + { url = "https://files.pythonhosted.org/packages/8a/22/9bf80a56069c0c443fcfefac639a86a744550a2898817a6dfd3e26654924/rpds_py-2026.5.1-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:e0b360f316d966b048b085857630b3cc51f3db2f07b06f440eac8f695374d1e3", size = 585633, upload-time = "2026-05-28T12:00:15.66Z" }, + { url = "https://files.pythonhosted.org/packages/da/68/3b2c0a75c9e04125696f84ebdbbf304acf5a40b58ba4481cdb98a922c3ba/rpds_py-2026.5.1-cp313-cp313t-win32.whl", hash = "sha256:a2999883eedf72fdfb7520b92c7d4ec2572a71ff40239377aa604cc529eecafc", size = 210074, upload-time = "2026-05-28T12:00:17.291Z" }, + { url = "https://files.pythonhosted.org/packages/e7/8b/609157d5a25d37d4f29f92840ba531f416907c34ae5c5739dd21fc2bef98/rpds_py-2026.5.1-cp313-cp313t-win_amd64.whl", hash = "sha256:e07be2a9d7122bd6e82dea89814ef8dc893feb1aae97fec1630f3263bbb30e55", size = 228635, upload-time = "2026-05-28T12:00:18.73Z" }, + { url = "https://files.pythonhosted.org/packages/d4/6f/19c1918a4b590d8de87e712e4abe4b3875771eff60216fb6153cf6665c68/rpds_py-2026.5.1-cp314-cp314-macosx_10_12_x86_64.whl", hash = "sha256:1f2c391c3059798093b65df23aca2cac150460ae9c630d99dec83d703d9485b9", size = 349756, upload-time = "2026-05-28T12:00:20.217Z" }, + { url = "https://files.pythonhosted.org/packages/e5/60/a06fe7da34eca79dacbf958a2ba0c6eea85bc2b29de20080bf40f72f66fa/rpds_py-2026.5.1-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:413b424f7c4ee65ab5e5be91f5731be0f8b41a1ee2b12dfe810d716312e95a78", size = 343831, upload-time = "2026-05-28T12:00:21.711Z" }, + { url = "https://files.pythonhosted.org/packages/bf/ec/b2333b97b90e2a6ef6ca8ad386ee284968e74bcfe113b3f1a8d9036429a9/rpds_py-2026.5.1-cp314-cp314-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2c595a1d9255dce0599e13130d1440ab2506654f2b50294226ee06402f8fef63", size = 375127, upload-time = "2026-05-28T12:00:23.326Z" }, + { url = "https://files.pythonhosted.org/packages/14/7f/e00aae54067f2b488c4637961d5f58204d470795fc791085fa3f15060d2e/rpds_py-2026.5.1-cp314-cp314-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:1c27c5f6102eac8c03e7595a00827a53b271ba40a53b59ff8709170e0855ea4a", size = 379034, upload-time = "2026-05-28T12:00:24.89Z" }, + { url = "https://files.pythonhosted.org/packages/be/cc/423999bbb8ae8dc93c77fc1d5e984ade5eb89d237d3bb884ccfa72ae2890/rpds_py-2026.5.1-cp314-cp314-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:6c7fcf61d44cacecaf3aea542b0e053db77972a4573e7ceda16fb2b399161195", size = 490823, upload-time = "2026-05-28T12:00:26.676Z" }, + { url = "https://files.pythonhosted.org/packages/0f/aa/c671bf660f12e68d3c52ff86c7066ed1372df5a0f4f2ff584e419b8207e7/rpds_py-2026.5.1-cp314-cp314-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2c817a189d4ee14290420e5ff051e4dd6baa13f3edf84685071dee07a6d538ee", size = 388144, upload-time = "2026-05-28T12:00:28.577Z" }, + { url = "https://files.pythonhosted.org/packages/19/c8/d63bb75b68afe77b229e3021c6031bcaf01da5db5b0e69d0d10f9ba679a7/rpds_py-2026.5.1-cp314-cp314-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:21846aac0ed2e0589f38c12dc44e77bb64e494b771eadbcf169cba00566ba7ba", size = 371959, upload-time = "2026-05-28T12:00:30.304Z" }, + { url = "https://files.pythonhosted.org/packages/82/35/c51122014d8274ff37dc606d60049c3db7d83da02b5b282511e5a906a9a6/rpds_py-2026.5.1-cp314-cp314-manylinux_2_31_riscv64.whl", hash = "sha256:b317c87a13f769a4e787819bd508aaa5d69aa09b0880de9af6d3a8a54571cdec", size = 383558, upload-time = "2026-05-28T12:00:31.764Z" }, + { url = "https://files.pythonhosted.org/packages/e3/f9/2790cb99c136a5363acdeacf5c27c56f3de0d4118a1f48fca83404c99c89/rpds_py-2026.5.1-cp314-cp314-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:ce87129d9f2c14fa6c4a8601fb80eb4488c80d38a20cd13758ef11123e14995d", size = 402789, upload-time = "2026-05-28T12:00:33.247Z" }, + { url = "https://files.pythonhosted.org/packages/e5/1b/e4fb584f8c75d35c38150ff6a332cda949e6f97acba1f4fd123b14ab56fe/rpds_py-2026.5.1-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:9cdddb6c1207d284d94fd1530adf57fbd797fe7c4b8704ba85f49414f2557e7d", size = 551405, upload-time = "2026-05-28T12:00:34.819Z" }, + { url = "https://files.pythonhosted.org/packages/d8/f7/a6731b4216cb3793ea1af5391da240f5683dacc0d13e034fe5fc3503f240/rpds_py-2026.5.1-cp314-cp314-musllinux_1_2_i686.whl", hash = "sha256:4e237e139f94d3c036fd28eb9f564c99055476ff4ff05cd42be55ce349b5aa02", size = 616975, upload-time = "2026-05-28T12:00:36.268Z" }, + { url = "https://files.pythonhosted.org/packages/2c/ea/2e051a81d95d8e63f4b35a1c463a87e8766bc3d083c067c5dfb6bf220747/rpds_py-2026.5.1-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:ed0954b524873214369184a9c82b0eaa45a3fbb9a798cd95b17e0d98499e7ea0", size = 578701, upload-time = "2026-05-28T12:00:37.82Z" }, + { url = "https://files.pythonhosted.org/packages/65/56/b5f6fdb2083e32bca8a8993d89e70db114b4756c9e2c38421328126689d2/rpds_py-2026.5.1-cp314-cp314-win32.whl", hash = "sha256:2d88621d6a7d4dfa633d21abe90f280bb205274e16b1d1e61c6ad4640b2453b7", size = 209806, upload-time = "2026-05-28T12:00:39.492Z" }, + { url = "https://files.pythonhosted.org/packages/fb/80/65a5aa96c155e611d1ed844e4e1f57f3e36b021f396d9f8585d756e6b90d/rpds_py-2026.5.1-cp314-cp314-win_amd64.whl", hash = "sha256:cef8ac28d26f4dda3533060c20fbf80a325458fa9fd23ea72a73cdfa8e978838", size = 225985, upload-time = "2026-05-28T12:00:40.94Z" }, + { url = "https://files.pythonhosted.org/packages/27/7c/ad185212e87b05f196daef92bc5f3caf07298eb47c295b5585c3dd3093ac/rpds_py-2026.5.1-cp314-cp314-win_arm64.whl", hash = "sha256:eaaea962c68cdc68d4a533ba985ab8e9484277910bbfaa2ab3ef7732667bfed8", size = 221219, upload-time = "2026-05-28T12:00:43.15Z" }, + { url = "https://files.pythonhosted.org/packages/23/58/e14ae18759020334646b031e708ab4158d653a938822bfb7b95ef2e93aa3/rpds_py-2026.5.1-cp314-cp314t-macosx_10_12_x86_64.whl", hash = "sha256:21942f52dbbd5f8758bf021213d28bd45c39e873e65e2407faf5f1846f5761ad", size = 352148, upload-time = "2026-05-28T12:00:44.638Z" }, + { url = "https://files.pythonhosted.org/packages/31/9b/5f4a1e2f960bca3ac5d052b139dd31eed97b259f9d909173821760d542e8/rpds_py-2026.5.1-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:f414556f6e3958300ff941e40c9f97e3dc9774ddd1b3434c475d73dd354bbed3", size = 345196, upload-time = "2026-05-28T12:00:46.14Z" }, + { url = "https://files.pythonhosted.org/packages/1a/71/1d9574d6a2fa20ab60eaa55c7467f5aa20cbc770f341a05f09c0876f59e2/rpds_py-2026.5.1-cp314-cp314t-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ef1013a8625c74043210190b246f5b1551e09757c1f356c6e4160ef96c5bc081", size = 374981, upload-time = "2026-05-28T12:00:47.531Z" }, + { url = "https://files.pythonhosted.org/packages/0c/9a/37e99f4915a80aa71670263c1267f7ae0af95f53a3f61e6c3bdc016d4515/rpds_py-2026.5.1-cp314-cp314t-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:cc68e231a77a5f0d774ae278a1f8e55c0456501820847c1e4efb3829f3441df6", size = 379961, upload-time = "2026-05-28T12:00:49.216Z" }, + { url = "https://files.pythonhosted.org/packages/a8/ff/6e73f74b89d2e0715e0fc86b7dde893f9a61ae2f9b256ff3bdfe41ac4e94/rpds_py-2026.5.1-cp314-cp314t-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:9baffb505aff33acc69b422a19f77806680f3c8632227d79f48de8a810d1c2c5", size = 495965, upload-time = "2026-05-28T12:00:51.111Z" }, + { url = "https://files.pythonhosted.org/packages/ea/e0/425faba25f59d74d4638b267f7c7a80e8649d2ef4db10a19b0c4a71e6e6f/rpds_py-2026.5.1-cp314-cp314t-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b8d2f912928d426e8cfa396f7f3f8d29a59e6689c86dcca3c420730c1096322b", size = 389526, upload-time = "2026-05-28T12:00:52.77Z" }, + { url = "https://files.pythonhosted.org/packages/c6/76/7a41960e3fddae47fab43a28684d5da981401dffd88253de0944148654cb/rpds_py-2026.5.1-cp314-cp314t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:90f628283be835db980c941767d41c9a27b5239e54ba0a9c1335247e82406964", size = 376190, upload-time = "2026-05-28T12:00:54.215Z" }, + { url = "https://files.pythonhosted.org/packages/27/60/5f38dc70824fc6951b51d35377e577a3a3a4c81a6769cc5a2de25ebe0ad1/rpds_py-2026.5.1-cp314-cp314t-manylinux_2_31_riscv64.whl", hash = "sha256:1ebb2f0ab7e16132995a72de805170e0203df0c3dd22e1ef1cd1fdd90bd7a131", size = 383921, upload-time = "2026-05-28T12:00:55.673Z" }, + { url = "https://files.pythonhosted.org/packages/60/1a/d60a38caa1505f4b9483c3fbbde12c94e1079154f4f401a6da96f7e77621/rpds_py-2026.5.1-cp314-cp314t-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:f3df3d16ded76f1f8c9cdebd0e1ea55fdf4c23b812de189814da7cf229c22a81", size = 404766, upload-time = "2026-05-28T12:00:57.518Z" }, + { url = "https://files.pythonhosted.org/packages/87/ff/602fd3f174d6425f0bce05ad0dfbec0e96b38d0f7d08a79af5aa20083885/rpds_py-2026.5.1-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:9af8905b8f854990e40d5206aa5ac58d9b0fe0b7f351ff2bb086c20f6c8c6a47", size = 551343, upload-time = "2026-05-28T12:00:58.978Z" }, + { url = "https://files.pythonhosted.org/packages/b8/c1/1be13327acdbead3eca1fde03b6a34dbb011f1e864e217f0d32cc1779a7f/rpds_py-2026.5.1-cp314-cp314t-musllinux_1_2_i686.whl", hash = "sha256:036a36a87fb1cd3b214d11c4b3c4f7d2ddad933625dca1c900b56a057c07740a", size = 618502, upload-time = "2026-05-28T12:01:00.656Z" }, + { url = "https://files.pythonhosted.org/packages/f3/d7/afb49b49d7f2be8b7ba1a9f0977fa5168003437b93086726f066544e8351/rpds_py-2026.5.1-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:62ae3853454fe9ef283a03c96c2d835d39e84b14643a9d62c82ef0fb87d702ca", size = 581916, upload-time = "2026-05-28T12:01:02.22Z" }, + { url = "https://files.pythonhosted.org/packages/25/d1/dbef8c1f8a10f07beb62b5f054e20099fd9924b3ec001b8f0b6ac7813a85/rpds_py-2026.5.1-cp314-cp314t-win32.whl", hash = "sha256:6c3d771a46ec18b12af06ce36243a9a80b07a5d0515236332d90863ca8bb326a", size = 207855, upload-time = "2026-05-28T12:01:03.821Z" }, + { url = "https://files.pythonhosted.org/packages/2a/72/bfa4e61ab8e7dc1c8adf397e05e6cbdd4239357bd72b248d3de662f23915/rpds_py-2026.5.1-cp314-cp314t-win_amd64.whl", hash = "sha256:c93c629be4636cf54337bd5f06c104d55e42ced54d681f6fe21ae510a65116f6", size = 225422, upload-time = "2026-05-28T12:01:05.194Z" }, + { url = "https://files.pythonhosted.org/packages/27/3a/7b5da92b640f67b6717ccafc83cdd06bfa7ff2395c3685c68922bb54d703/rpds_py-2026.5.1-cp315-cp315-macosx_10_12_x86_64.whl", hash = "sha256:3574b55c604b8f75dacb007136508bbc0db406e626301778096a133327e7f2fb", size = 349576, upload-time = "2026-05-28T12:01:06.722Z" }, + { url = "https://files.pythonhosted.org/packages/d7/8a/2aafd7ad355a1bd48ca76e2262b74b15e6432b5a1efe150efd4d779cd55d/rpds_py-2026.5.1-cp315-cp315-macosx_11_0_arm64.whl", hash = "sha256:94068eb3ae6d43f5a786b7db96a406a34e6d5c24489feef32fd6e8946ea7b291", size = 343640, upload-time = "2026-05-28T12:01:08.441Z" }, + { url = "https://files.pythonhosted.org/packages/f7/7d/6c9523c1abbe840a1b7fba3c516d48e1d3487cc80fea4366c4071cf56784/rpds_py-2026.5.1-cp315-cp315-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f3a5b10e8ce894825f380a8f1b6444cf73c294dfea62afbb2d13e3a9e630cec1", size = 375322, upload-time = "2026-05-28T12:01:09.934Z" }, + { url = "https://files.pythonhosted.org/packages/5a/5d/0b7b03fb1dc509321f01de3149784ab773e34c8573022029af8076afcb9c/rpds_py-2026.5.1-cp315-cp315-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:fc09f82e63d4bcd58149572f857a431bae851dc747e313c3b5bdf7abb907fda8", size = 379066, upload-time = "2026-05-28T12:01:11.48Z" }, + { url = "https://files.pythonhosted.org/packages/d7/e2/8ef6012999ebf1cb1c22f876d9ce5e63d960fd4631d2af3202d3f480aa25/rpds_py-2026.5.1-cp315-cp315-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:e10464d17df3b582745c25cec695cb9558bca2cb6ddb631aee1787fc72c767b2", size = 494586, upload-time = "2026-05-28T12:01:13.051Z" }, + { url = "https://files.pythonhosted.org/packages/80/af/1eeb029bec67582c226b7809172207cd005073af4ebd906e65ff494f4983/rpds_py-2026.5.1-cp315-cp315-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:ba05adbf15d994c38ec0b7ab32e858e5110c21e9009a00a86545fd220f84e038", size = 388415, upload-time = "2026-05-28T12:01:14.631Z" }, + { url = "https://files.pythonhosted.org/packages/18/23/ffbe10711c4d766c1cab0557d6906c074f795814863c67b351355d29354a/rpds_py-2026.5.1-cp315-cp315-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:77c004fdc7b891967106f78ddfd7b076bfe6813c6139c6fff6aed3bcaa960b26", size = 372427, upload-time = "2026-05-28T12:01:16.153Z" }, + { url = "https://files.pythonhosted.org/packages/bd/3a/30ba4a6ad457e5b070c18d742a33fb77d8d922b565cc881f8a5313d63bfe/rpds_py-2026.5.1-cp315-cp315-manylinux_2_31_riscv64.whl", hash = "sha256:83bcf894486c9d78dd290d3c0124ff6dd8875d3025e2090a8ec49fcc37c55fdd", size = 383615, upload-time = "2026-05-28T12:01:17.809Z" }, + { url = "https://files.pythonhosted.org/packages/d3/69/62e242b53ce39c0814bd24e1a6e6eba6c92be716277745f317f9540a2e7b/rpds_py-2026.5.1-cp315-cp315-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:c3df104083952a0e0c6f10de33e440eabe98fb6317d23e1a58c68f6df08d01b9", size = 402786, upload-time = "2026-05-28T12:01:19.419Z" }, + { url = "https://files.pythonhosted.org/packages/38/c1/a770b9c186928a1ed0f7e6d7ae50e7f3950ed23e3f9e366dbc8e38cb55de/rpds_py-2026.5.1-cp315-cp315-musllinux_1_2_aarch64.whl", hash = "sha256:980450826cf22e133c57e0835070bdd0dd3f73b9b708c3ce223def2cb9469e14", size = 551583, upload-time = "2026-05-28T12:01:21.013Z" }, + { url = "https://files.pythonhosted.org/packages/21/7c/68e8579b95375b70d2a963103c42e705856cdb98569258bd807f4423891c/rpds_py-2026.5.1-cp315-cp315-musllinux_1_2_i686.whl", hash = "sha256:205dde846f24332ab0c1188699a043b8d165b79bb84529ce272c45048ff6be01", size = 616941, upload-time = "2026-05-28T12:01:22.548Z" }, + { url = "https://files.pythonhosted.org/packages/70/a1/a6135aed5730ff03ab957182259987ac11e55fb392a28dc6f0592048a280/rpds_py-2026.5.1-cp315-cp315-musllinux_1_2_x86_64.whl", hash = "sha256:3966b82dd563176396df030f3dd52a6e54cb69b718e95e78bd555ed3d1e0185d", size = 578349, upload-time = "2026-05-28T12:01:24.118Z" }, + { url = "https://files.pythonhosted.org/packages/09/6e/f24201a76a84e6c49d0bdfdfcb735210e21701e9b21c5bfc0ba497dd62f6/rpds_py-2026.5.1-cp315-cp315-win32.whl", hash = "sha256:7818f8d0a415be74d2be3590b0a1c1f463a642f4d0217e7d10602dceef5b79aa", size = 209922, upload-time = "2026-05-28T12:01:25.522Z" }, + { url = "https://files.pythonhosted.org/packages/9e/e4/966bc240bb0485fc265278f6de44d05834bf0b3618886e0b22e33d54c49a/rpds_py-2026.5.1-cp315-cp315-win_amd64.whl", hash = "sha256:b3cc20c0d800af78fd0fac68086e28c1856cec51ea528bb81ea851aa40d39325", size = 226003, upload-time = "2026-05-28T12:01:27.062Z" }, + { url = "https://files.pythonhosted.org/packages/5c/5c/a15a59269cd5e74472734516c73795c15eccfc841b3d4b0228c3f53f19d0/rpds_py-2026.5.1-cp315-cp315-win_arm64.whl", hash = "sha256:3609e9939a8a76cd904cf98a3f1f13b5dc7e150adeaee89e0ea09652ea213e16", size = 221245, upload-time = "2026-05-28T12:01:28.51Z" }, + { url = "https://files.pythonhosted.org/packages/e0/22/135ce03804e179a71ceb13be095deda4a279bc88f7a6b8fa161c5ad44e12/rpds_py-2026.5.1-cp315-cp315t-macosx_10_12_x86_64.whl", hash = "sha256:5d333a7127d4b307601ac37792bee01bb95c867cbfacf21b6375b804d6bbd723", size = 352015, upload-time = "2026-05-28T12:01:30.214Z" }, + { url = "https://files.pythonhosted.org/packages/3b/5f/f1f6d2652eb9d848f6eb369d8db83a2da6249bb49ad2c2a48f45d54538d3/rpds_py-2026.5.1-cp315-cp315t-macosx_11_0_arm64.whl", hash = "sha256:b5f077b44a4f7808520f66dae234988d867deb9aed9be5da057ce9ba831b2a41", size = 345016, upload-time = "2026-05-28T12:01:31.656Z" }, + { url = "https://files.pythonhosted.org/packages/88/66/b74182775691ea2290c99e52ac8d5db844e56fbec90ce421f107658c8314/rpds_py-2026.5.1-cp315-cp315t-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:55d8f9b7b78c9538fc9e04e82ec0e888ff0c3cffcfad152c77e57cd09351a98a", size = 374775, upload-time = "2026-05-28T12:01:33.136Z" }, + { url = "https://files.pythonhosted.org/packages/ff/8f/15e5a61d9f0a43902d36561d4f07cae6ae9f4716be825159fd72717f33af/rpds_py-2026.5.1-cp315-cp315t-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:e3a8ae58895ac107ed934a6bf51e5846f95c53b9b940c2c6d310838fd5846358", size = 380270, upload-time = "2026-05-28T12:01:34.574Z" }, + { url = "https://files.pythonhosted.org/packages/02/c3/f859b12763a80540cdf2af0f15b19904cf756a71d7bdd3f82ff3e5b1bbf9/rpds_py-2026.5.1-cp315-cp315t-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:0957cf3c2b8632ec7aaebffebea8005b353cc2a237b6e2ae3c2cac0820704cfb", size = 495285, upload-time = "2026-05-28T12:01:36.127Z" }, + { url = "https://files.pythonhosted.org/packages/1c/c7/ff27c2ac8411d30b03b1829fd88cae8dad1a4d0da48dd25e57c4038042e6/rpds_py-2026.5.1-cp315-cp315t-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c396c1304de421050b3681ea70f371874b54d41b0151e96109758144c231e30b", size = 389581, upload-time = "2026-05-28T12:01:37.635Z" }, + { url = "https://files.pythonhosted.org/packages/6e/67/fe92ee32a6cc05c77228a2f8b1762e7124f386ec20ff83d0757b762d58d0/rpds_py-2026.5.1-cp315-cp315t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:aad1bff7f666b9598e573815affd666aac6a13a585dde336f843e33350c7fadc", size = 376041, upload-time = "2026-05-28T12:01:39.307Z" }, + { url = "https://files.pythonhosted.org/packages/f8/91/b4d6685c27aba55bd82f25b278be8237038117d05f9659a6213ad3408130/rpds_py-2026.5.1-cp315-cp315t-manylinux_2_31_riscv64.whl", hash = "sha256:656a042550878f12d45752452d47094b7cfe5ad1e9d7b87b5a22ad3ae5ff8015", size = 383946, upload-time = "2026-05-28T12:01:41.043Z" }, + { url = "https://files.pythonhosted.org/packages/bd/79/2c1d832a53c8e0f8e98fc970ec257b950fecd4f62be2ab7182b500a0cbc8/rpds_py-2026.5.1-cp315-cp315t-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:73c4bd4f70294737b5206a3e8e30ccadbf8a60301831c8ea23eec5dbeea1ecfa", size = 405526, upload-time = "2026-05-28T12:01:43.032Z" }, + { url = "https://files.pythonhosted.org/packages/78/c4/c98117b03c6a8581ab2c2dfccfe9a5ad82bd8128a3c28b46a6ad2d97c393/rpds_py-2026.5.1-cp315-cp315t-musllinux_1_2_aarch64.whl", hash = "sha256:43bca78665423cabae77146f2fe7ce55272b6c8d55d82cca83effd42c7e13972", size = 551165, upload-time = "2026-05-28T12:01:44.648Z" }, + { url = "https://files.pythonhosted.org/packages/3b/c1/bc479ca069200af730881b1bd525e3114b2b391a351509fcb1b772f28086/rpds_py-2026.5.1-cp315-cp315t-musllinux_1_2_i686.whl", hash = "sha256:42d0f20e85e549c870749d0e247f0c10d318a45b7e9676d575d2dcb04a1b2e66", size = 618778, upload-time = "2026-05-28T12:01:46.337Z" }, + { url = "https://files.pythonhosted.org/packages/77/65/38ab2f90df44c2febfb63cc10ced40763d9b4bc94d173e734528663fe7f5/rpds_py-2026.5.1-cp315-cp315t-musllinux_1_2_x86_64.whl", hash = "sha256:b1be5c35683684d5331b93600c210e8367c254683d8a6df6bd21bd2da3a334fb", size = 581839, upload-time = "2026-05-28T12:01:48.109Z" }, + { url = "https://files.pythonhosted.org/packages/15/2d/ce1f605fe036aadd460e5822e578c6c7ec3a860936cca37d6e0f299daa77/rpds_py-2026.5.1-cp315-cp315t-win32.whl", hash = "sha256:75808f6c38ce7749bb68cc2770161aae5045e6c6f6781a9782e74b93304399df", size = 207866, upload-time = "2026-05-28T12:01:49.648Z" }, + { url = "https://files.pythonhosted.org/packages/79/cb/966040123eb102371559746908ef2c9471f4d43e17ec9a645a2258dab64b/rpds_py-2026.5.1-cp315-cp315t-win_amd64.whl", hash = "sha256:90bd6630002a1c7f09e7843dd79f0d24f3d2897cc25a753480917865d14f15b3", size = 225441, upload-time = "2026-05-28T12:01:51.408Z" }, + { url = "https://files.pythonhosted.org/packages/42/56/3fe0fb34820ff667be791b3a3c22b85e8bcba54e9c832f47438c191fa7be/rpds_py-2026.5.1-pp311-pypy311_pp73-macosx_10_12_x86_64.whl", hash = "sha256:edf2765d84e42447f112ad877af8fe1db0089aaec5b28e88d6eab45e7fe99cea", size = 357151, upload-time = "2026-05-28T12:01:53.43Z" }, + { url = "https://files.pythonhosted.org/packages/8b/f2/3eb9ccdb9f143b8c9b003978898cb497f942a324c077401e6b8834238e63/rpds_py-2026.5.1-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:ad3773236e95f7f33991eb125224b7da66f206504d032a253a02da7e134519fb", size = 350195, upload-time = "2026-05-28T12:01:54.901Z" }, + { url = "https://files.pythonhosted.org/packages/a7/24/dbda232bc4f3ed732120692ab0d2c8402cb020516556d8bee622dcef2413/rpds_py-2026.5.1-pp311-pypy311_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a04df86b3f0fade39ec8fd0e0aab089b1da9fbd2b48df778a57ef96f5e7d38df", size = 381850, upload-time = "2026-05-28T12:01:56.601Z" }, + { url = "https://files.pythonhosted.org/packages/40/30/32e769839a358f78810c234f160f2cc21d1e4e47e1c0e0e0d535be5a0219/rpds_py-2026.5.1-pp311-pypy311_pp73-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:6142dbd80c4df62a5d899f0d616d417f84e0bc8d32526c8e5589019d75d028a7", size = 387899, upload-time = "2026-05-28T12:01:58.212Z" }, + { url = "https://files.pythonhosted.org/packages/ab/86/ec84d243aadb3b34b71dd26a010d0930b2d284ff5fc9a69fec53810ee6fd/rpds_py-2026.5.1-pp311-pypy311_pp73-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:0b35217adefe87f2fe4db7e9766cabe84744bfe9616d9667be18988928c7f2dc", size = 501618, upload-time = "2026-05-28T12:01:59.888Z" }, + { url = "https://files.pythonhosted.org/packages/74/25/b60e52686bbff777a64f9e4f4d3dd57980dc846913777177a2c92e4937aa/rpds_py-2026.5.1-pp311-pypy311_pp73-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b95d5e11fc712b752081183a55a244c03cd00570489edd7014d8899f8ceb8162", size = 394003, upload-time = "2026-05-28T12:02:01.482Z" }, + { url = "https://files.pythonhosted.org/packages/9b/c7/b3a6a588cc2219510ef3f42e207483a93950bedd1e3a0fd4015c95cff9e5/rpds_py-2026.5.1-pp311-pypy311_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:141c9498daf2ace9eda35d2b0e376f9ea8b058d84f2aef4f96fccfd449a2f251", size = 379778, upload-time = "2026-05-28T12:02:03.197Z" }, + { url = "https://files.pythonhosted.org/packages/31/00/c7dba3fc8a3da8cb3f6db1eb3386be4d79c2e97c6890d20eb9ac66ae8c43/rpds_py-2026.5.1-pp311-pypy311_pp73-manylinux_2_31_riscv64.whl", hash = "sha256:6f249f8b860a200ad35193af961183ebe9132710484e6f6ce0cf89fd83c63a9a", size = 392359, upload-time = "2026-05-28T12:02:04.817Z" }, + { url = "https://files.pythonhosted.org/packages/93/dd/472ba494c70753f93745992c99855bee0636daf74e6984e5e003f150316f/rpds_py-2026.5.1-pp311-pypy311_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:e4abbf391a70be864920858bf360f4fb380577c9a0f732438a1996726e2c195b", size = 412820, upload-time = "2026-05-28T12:02:06.401Z" }, + { url = "https://files.pythonhosted.org/packages/1d/6f/93831a3bfe789542ed0c1d0d74b78b440f055d6dc3ea4640eba2d95e6e23/rpds_py-2026.5.1-pp311-pypy311_pp73-musllinux_1_2_aarch64.whl", hash = "sha256:c74005a7bb87752acf351c93897ec63ad77a07a0da7ecad9c050e32e7286ba34", size = 557243, upload-time = "2026-05-28T12:02:08.013Z" }, + { url = "https://files.pythonhosted.org/packages/1f/ff/0b3d604614ffc77522c6b288fdbce68957eb583da1002aa65ba38ac0ee40/rpds_py-2026.5.1-pp311-pypy311_pp73-musllinux_1_2_i686.whl", hash = "sha256:8213afbe8a3a906fb9acb2014423fe3359ee783d0bf90995f70623a3217bfa6c", size = 623541, upload-time = "2026-05-28T12:02:09.661Z" }, + { url = "https://files.pythonhosted.org/packages/ea/ea/e7b0251441da9adfeaebcf29601d10f2a1455fcf0772fae9e7e19032bd96/rpds_py-2026.5.1-pp311-pypy311_pp73-musllinux_1_2_x86_64.whl", hash = "sha256:8c43a8a973270fd173bf48cdf80bbe66312421cba68d40845034f174f2389049", size = 586326, upload-time = "2026-05-28T12:02:11.47Z" }, +] + +[[package]] +name = "rq" +version = "2.3.2" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "click" }, + { name = "redis" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/43/8d/bb57bca979f48869aea0b7b9752b0887848a7098352753021fdcbdaf0efb/rq-2.3.2.tar.gz", hash = "sha256:5bd212992724428ec1689736abde783d245e7856bca39d89845884f5d580f5f1", size = 649216, upload-time = "2025-04-13T10:07:41.383Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/3f/bf/08d99660c138354a83105efa64988ee4adc8ddc6c74866f29508aaff00f7/rq-2.3.2-py3-none-any.whl", hash = "sha256:bf4dc622a7b9d5f7d4a39444f26d89ce6de8a1d6db61b21060612114dbf8d5ff", size = 100389, upload-time = "2025-04-13T10:07:38.965Z" }, +] + +[[package]] +name = "rq-scheduler" +version = "0.14.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "crontab" }, + { name = "freezegun" }, + { name = "python-dateutil" }, + { name = "rq" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/a0/4e/977bbcc1f3b25ed9ea60ec968b13f7147661defe5b2f9272b44fdb1c5549/rq-scheduler-0.14.0.tar.gz", hash = "sha256:2d5a14a1ab217f8693184ebaa1fe03838edcbc70b4f76572721c0b33058cd023", size = 16582, upload-time = "2024-10-29T13:30:32.641Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/bb/d0/28cedca9f3b321f30e69d644c2dcd7097ec21570ec9606fde56750621300/rq_scheduler-0.14.0-py2.py3-none-any.whl", hash = "sha256:d4ec221a3d8c11b3ff55e041f09d9af1e17f3253db737b6b97e86ab20fc3dc0d", size = 13874, upload-time = "2024-10-29T13:30:30.449Z" }, +] + +[[package]] +name = "ruamel-yaml" +version = "0.19.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/c7/3b/ebda527b56beb90cb7652cb1c7e4f91f48649fbcd8d2eb2fb6e77cd3329b/ruamel_yaml-0.19.1.tar.gz", hash = "sha256:53eb66cd27849eff968ebf8f0bf61f46cdac2da1d1f3576dd4ccee9b25c31993", size = 142709, upload-time = "2026-01-02T16:50:31.84Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/b8/0c/51f6841f1d84f404f92463fc2b1ba0da357ca1e3db6b7fbda26956c3b82a/ruamel_yaml-0.19.1-py3-none-any.whl", hash = "sha256:27592957fedf6e0b62f281e96effd28043345e0e66001f97683aa9a40c667c93", size = 118102, upload-time = "2026-01-02T16:50:29.201Z" }, +] + +[[package]] +name = "s3transfer" +version = "0.17.1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "botocore" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/11/b3/bcdc2f58fa92592db511beda154c2c08d28f21f6c4637f06a42a24b10c21/s3transfer-0.17.1.tar.gz", hash = "sha256:042dd5e3b1b512355e35a23f0223e426b7042e80b97830ea2680ddce327fc45e", size = 159439, upload-time = "2026-05-26T19:45:01.714Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/85/dd/904873250a6554fbae40cddbf9198e3cc37a2f1319d5e1a5ce82fe269c17/s3transfer-0.17.1-py3-none-any.whl", hash = "sha256:5b9827d1044159bbb01b86ef8902760ea39281927f5de31de75e1d657177bf4c", size = 88264, upload-time = "2026-05-26T19:45:00.452Z" }, +] + +[[package]] +name = "scipy" +version = "1.17.1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "numpy" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/7a/97/5a3609c4f8d58b039179648e62dd220f89864f56f7357f5d4f45c29eb2cc/scipy-1.17.1.tar.gz", hash = "sha256:95d8e012d8cb8816c226aef832200b1d45109ed4464303e997c5b13122b297c0", size = 30573822, upload-time = "2026-02-23T00:26:24.851Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/df/75/b4ce781849931fef6fd529afa6b63711d5a733065722d0c3e2724af9e40a/scipy-1.17.1-cp311-cp311-macosx_10_14_x86_64.whl", hash = "sha256:1f95b894f13729334fb990162e911c9e5dc1ab390c58aa6cbecb389c5b5e28ec", size = 31613675, upload-time = "2026-02-23T00:16:00.13Z" }, + { url = "https://files.pythonhosted.org/packages/f7/58/bccc2861b305abdd1b8663d6130c0b3d7cc22e8d86663edbc8401bfd40d4/scipy-1.17.1-cp311-cp311-macosx_12_0_arm64.whl", hash = "sha256:e18f12c6b0bc5a592ed23d3f7b891f68fd7f8241d69b7883769eb5d5dfb52696", size = 28162057, upload-time = "2026-02-23T00:16:09.456Z" }, + { url = "https://files.pythonhosted.org/packages/6d/ee/18146b7757ed4976276b9c9819108adbc73c5aad636e5353e20746b73069/scipy-1.17.1-cp311-cp311-macosx_14_0_arm64.whl", hash = "sha256:a3472cfbca0a54177d0faa68f697d8ba4c80bbdc19908c3465556d9f7efce9ee", size = 20334032, upload-time = "2026-02-23T00:16:17.358Z" }, + { url = "https://files.pythonhosted.org/packages/ec/e6/cef1cf3557f0c54954198554a10016b6a03b2ec9e22a4e1df734936bd99c/scipy-1.17.1-cp311-cp311-macosx_14_0_x86_64.whl", hash = "sha256:766e0dc5a616d026a3a1cffa379af959671729083882f50307e18175797b3dfd", size = 22709533, upload-time = "2026-02-23T00:16:25.791Z" }, + { url = "https://files.pythonhosted.org/packages/4d/60/8804678875fc59362b0fb759ab3ecce1f09c10a735680318ac30da8cd76b/scipy-1.17.1-cp311-cp311-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:744b2bf3640d907b79f3fd7874efe432d1cf171ee721243e350f55234b4cec4c", size = 33062057, upload-time = "2026-02-23T00:16:36.931Z" }, + { url = "https://files.pythonhosted.org/packages/09/7d/af933f0f6e0767995b4e2d705a0665e454d1c19402aa7e895de3951ebb04/scipy-1.17.1-cp311-cp311-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:43af8d1f3bea642559019edfe64e9b11192a8978efbd1539d7bc2aaa23d92de4", size = 35349300, upload-time = "2026-02-23T00:16:49.108Z" }, + { url = "https://files.pythonhosted.org/packages/b4/3d/7ccbbdcbb54c8fdc20d3b6930137c782a163fa626f0aef920349873421ba/scipy-1.17.1-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:cd96a1898c0a47be4520327e01f874acfd61fb48a9420f8aa9f6483412ffa444", size = 35127333, upload-time = "2026-02-23T00:17:01.293Z" }, + { url = "https://files.pythonhosted.org/packages/e8/19/f926cb11c42b15ba08e3a71e376d816ac08614f769b4f47e06c3580c836a/scipy-1.17.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:4eb6c25dd62ee8d5edf68a8e1c171dd71c292fdae95d8aeb3dd7d7de4c364082", size = 37741314, upload-time = "2026-02-23T00:17:12.576Z" }, + { url = "https://files.pythonhosted.org/packages/95/da/0d1df507cf574b3f224ccc3d45244c9a1d732c81dcb26b1e8a766ae271a8/scipy-1.17.1-cp311-cp311-win_amd64.whl", hash = "sha256:d30e57c72013c2a4fe441c2fcb8e77b14e152ad48b5464858e07e2ad9fbfceff", size = 36607512, upload-time = "2026-02-23T00:17:23.424Z" }, + { url = "https://files.pythonhosted.org/packages/68/7f/bdd79ceaad24b671543ffe0ef61ed8e659440eb683b66f033454dcee90eb/scipy-1.17.1-cp311-cp311-win_arm64.whl", hash = "sha256:9ecb4efb1cd6e8c4afea0daa91a87fbddbce1b99d2895d151596716c0b2e859d", size = 24599248, upload-time = "2026-02-23T00:17:34.561Z" }, + { url = "https://files.pythonhosted.org/packages/35/48/b992b488d6f299dbe3f11a20b24d3dda3d46f1a635ede1c46b5b17a7b163/scipy-1.17.1-cp312-cp312-macosx_10_14_x86_64.whl", hash = "sha256:35c3a56d2ef83efc372eaec584314bd0ef2e2f0d2adb21c55e6ad5b344c0dcb8", size = 31610954, upload-time = "2026-02-23T00:17:49.855Z" }, + { url = "https://files.pythonhosted.org/packages/b2/02/cf107b01494c19dc100f1d0b7ac3cc08666e96ba2d64db7626066cee895e/scipy-1.17.1-cp312-cp312-macosx_12_0_arm64.whl", hash = "sha256:fcb310ddb270a06114bb64bbe53c94926b943f5b7f0842194d585c65eb4edd76", size = 28172662, upload-time = "2026-02-23T00:18:01.64Z" }, + { url = "https://files.pythonhosted.org/packages/cf/a9/599c28631bad314d219cf9ffd40e985b24d603fc8a2f4ccc5ae8419a535b/scipy-1.17.1-cp312-cp312-macosx_14_0_arm64.whl", hash = "sha256:cc90d2e9c7e5c7f1a482c9875007c095c3194b1cfedca3c2f3291cdc2bc7c086", size = 20344366, upload-time = "2026-02-23T00:18:12.015Z" }, + { url = "https://files.pythonhosted.org/packages/35/f5/906eda513271c8deb5af284e5ef0206d17a96239af79f9fa0aebfe0e36b4/scipy-1.17.1-cp312-cp312-macosx_14_0_x86_64.whl", hash = "sha256:c80be5ede8f3f8eded4eff73cc99a25c388ce98e555b17d31da05287015ffa5b", size = 22704017, upload-time = "2026-02-23T00:18:21.502Z" }, + { url = "https://files.pythonhosted.org/packages/da/34/16f10e3042d2f1d6b66e0428308ab52224b6a23049cb2f5c1756f713815f/scipy-1.17.1-cp312-cp312-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:e19ebea31758fac5893a2ac360fedd00116cbb7628e650842a6691ba7ca28a21", size = 32927842, upload-time = "2026-02-23T00:18:35.367Z" }, + { url = "https://files.pythonhosted.org/packages/01/8e/1e35281b8ab6d5d72ebe9911edcdffa3f36b04ed9d51dec6dd140396e220/scipy-1.17.1-cp312-cp312-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:02ae3b274fde71c5e92ac4d54bc06c42d80e399fec704383dcd99b301df37458", size = 35235890, upload-time = "2026-02-23T00:18:49.188Z" }, + { url = "https://files.pythonhosted.org/packages/c5/5c/9d7f4c88bea6e0d5a4f1bc0506a53a00e9fcb198de372bfe4d3652cef482/scipy-1.17.1-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:8a604bae87c6195d8b1045eddece0514d041604b14f2727bbc2b3020172045eb", size = 35003557, upload-time = "2026-02-23T00:18:54.74Z" }, + { url = "https://files.pythonhosted.org/packages/65/94/7698add8f276dbab7a9de9fb6b0e02fc13ee61d51c7c3f85ac28b65e1239/scipy-1.17.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:f590cd684941912d10becc07325a3eeb77886fe981415660d9265c4c418d0bea", size = 37625856, upload-time = "2026-02-23T00:19:00.307Z" }, + { url = "https://files.pythonhosted.org/packages/a2/84/dc08d77fbf3d87d3ee27f6a0c6dcce1de5829a64f2eae85a0ecc1f0daa73/scipy-1.17.1-cp312-cp312-win_amd64.whl", hash = "sha256:41b71f4a3a4cab9d366cd9065b288efc4d4f3c0b37a91a8e0947fb5bd7f31d87", size = 36549682, upload-time = "2026-02-23T00:19:07.67Z" }, + { url = "https://files.pythonhosted.org/packages/bc/98/fe9ae9ffb3b54b62559f52dedaebe204b408db8109a8c66fdd04869e6424/scipy-1.17.1-cp312-cp312-win_arm64.whl", hash = "sha256:f4115102802df98b2b0db3cce5cb9b92572633a1197c77b7553e5203f284a5b3", size = 24547340, upload-time = "2026-02-23T00:19:12.024Z" }, + { url = "https://files.pythonhosted.org/packages/76/27/07ee1b57b65e92645f219b37148a7e7928b82e2b5dbeccecb4dff7c64f0b/scipy-1.17.1-cp313-cp313-macosx_10_14_x86_64.whl", hash = "sha256:5e3c5c011904115f88a39308379c17f91546f77c1667cea98739fe0fccea804c", size = 31590199, upload-time = "2026-02-23T00:19:17.192Z" }, + { url = "https://files.pythonhosted.org/packages/ec/ae/db19f8ab842e9b724bf5dbb7db29302a91f1e55bc4d04b1025d6d605a2c5/scipy-1.17.1-cp313-cp313-macosx_12_0_arm64.whl", hash = "sha256:6fac755ca3d2c3edcb22f479fceaa241704111414831ddd3bc6056e18516892f", size = 28154001, upload-time = "2026-02-23T00:19:22.241Z" }, + { url = "https://files.pythonhosted.org/packages/5b/58/3ce96251560107b381cbd6e8413c483bbb1228a6b919fa8652b0d4090e7f/scipy-1.17.1-cp313-cp313-macosx_14_0_arm64.whl", hash = "sha256:7ff200bf9d24f2e4d5dc6ee8c3ac64d739d3a89e2326ba68aaf6c4a2b838fd7d", size = 20325719, upload-time = "2026-02-23T00:19:26.329Z" }, + { url = "https://files.pythonhosted.org/packages/b2/83/15087d945e0e4d48ce2377498abf5ad171ae013232ae31d06f336e64c999/scipy-1.17.1-cp313-cp313-macosx_14_0_x86_64.whl", hash = "sha256:4b400bdc6f79fa02a4d86640310dde87a21fba0c979efff5248908c6f15fad1b", size = 22683595, upload-time = "2026-02-23T00:19:30.304Z" }, + { url = "https://files.pythonhosted.org/packages/b4/e0/e58fbde4a1a594c8be8114eb4aac1a55bcd6587047efc18a61eb1f5c0d30/scipy-1.17.1-cp313-cp313-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:2b64ca7d4aee0102a97f3ba22124052b4bd2152522355073580bf4845e2550b6", size = 32896429, upload-time = "2026-02-23T00:19:35.536Z" }, + { url = "https://files.pythonhosted.org/packages/f5/5f/f17563f28ff03c7b6799c50d01d5d856a1d55f2676f537ca8d28c7f627cd/scipy-1.17.1-cp313-cp313-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:581b2264fc0aa555f3f435a5944da7504ea3a065d7029ad60e7c3d1ae09c5464", size = 35203952, upload-time = "2026-02-23T00:19:42.259Z" }, + { url = "https://files.pythonhosted.org/packages/8d/a5/9afd17de24f657fdfe4df9a3f1ea049b39aef7c06000c13db1530d81ccca/scipy-1.17.1-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:beeda3d4ae615106d7094f7e7cef6218392e4465cc95d25f900bebabfded0950", size = 34979063, upload-time = "2026-02-23T00:19:47.547Z" }, + { url = "https://files.pythonhosted.org/packages/8b/13/88b1d2384b424bf7c924f2038c1c409f8d88bb2a8d49d097861dd64a57b2/scipy-1.17.1-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:6609bc224e9568f65064cfa72edc0f24ee6655b47575954ec6339534b2798369", size = 37598449, upload-time = "2026-02-23T00:19:53.238Z" }, + { url = "https://files.pythonhosted.org/packages/35/e5/d6d0e51fc888f692a35134336866341c08655d92614f492c6860dc45bb2c/scipy-1.17.1-cp313-cp313-win_amd64.whl", hash = "sha256:37425bc9175607b0268f493d79a292c39f9d001a357bebb6b88fdfaff13f6448", size = 36510943, upload-time = "2026-02-23T00:20:50.89Z" }, + { url = "https://files.pythonhosted.org/packages/2a/fd/3be73c564e2a01e690e19cc618811540ba5354c67c8680dce3281123fb79/scipy-1.17.1-cp313-cp313-win_arm64.whl", hash = "sha256:5cf36e801231b6a2059bf354720274b7558746f3b1a4efb43fcf557ccd484a87", size = 24545621, upload-time = "2026-02-23T00:20:55.871Z" }, + { url = "https://files.pythonhosted.org/packages/6f/6b/17787db8b8114933a66f9dcc479a8272e4b4da75fe03b0c282f7b0ade8cd/scipy-1.17.1-cp313-cp313t-macosx_10_14_x86_64.whl", hash = "sha256:d59c30000a16d8edc7e64152e30220bfbd724c9bbb08368c054e24c651314f0a", size = 31936708, upload-time = "2026-02-23T00:19:58.694Z" }, + { url = "https://files.pythonhosted.org/packages/38/2e/524405c2b6392765ab1e2b722a41d5da33dc5c7b7278184a8ad29b6cb206/scipy-1.17.1-cp313-cp313t-macosx_12_0_arm64.whl", hash = "sha256:010f4333c96c9bb1a4516269e33cb5917b08ef2166d5556ca2fd9f082a9e6ea0", size = 28570135, upload-time = "2026-02-23T00:20:03.934Z" }, + { url = "https://files.pythonhosted.org/packages/fd/c3/5bd7199f4ea8556c0c8e39f04ccb014ac37d1468e6cfa6a95c6b3562b76e/scipy-1.17.1-cp313-cp313t-macosx_14_0_arm64.whl", hash = "sha256:2ceb2d3e01c5f1d83c4189737a42d9cb2fc38a6eeed225e7515eef71ad301dce", size = 20741977, upload-time = "2026-02-23T00:20:07.935Z" }, + { url = "https://files.pythonhosted.org/packages/d9/b8/8ccd9b766ad14c78386599708eb745f6b44f08400a5fd0ade7cf89b6fc93/scipy-1.17.1-cp313-cp313t-macosx_14_0_x86_64.whl", hash = "sha256:844e165636711ef41f80b4103ed234181646b98a53c8f05da12ca5ca289134f6", size = 23029601, upload-time = "2026-02-23T00:20:12.161Z" }, + { url = "https://files.pythonhosted.org/packages/6d/a0/3cb6f4d2fb3e17428ad2880333cac878909ad1a89f678527b5328b93c1d4/scipy-1.17.1-cp313-cp313t-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:158dd96d2207e21c966063e1635b1063cd7787b627b6f07305315dd73d9c679e", size = 33019667, upload-time = "2026-02-23T00:20:17.208Z" }, + { url = "https://files.pythonhosted.org/packages/f3/c3/2d834a5ac7bf3a0c806ad1508efc02dda3c8c61472a56132d7894c312dea/scipy-1.17.1-cp313-cp313t-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:74cbb80d93260fe2ffa334efa24cb8f2f0f622a9b9febf8b483c0b865bfb3475", size = 35264159, upload-time = "2026-02-23T00:20:23.087Z" }, + { url = "https://files.pythonhosted.org/packages/4d/77/d3ed4becfdbd217c52062fafe35a72388d1bd82c2d0ba5ca19d6fcc93e11/scipy-1.17.1-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:dbc12c9f3d185f5c737d801da555fb74b3dcfa1a50b66a1a93e09190f41fab50", size = 35102771, upload-time = "2026-02-23T00:20:28.636Z" }, + { url = "https://files.pythonhosted.org/packages/bd/12/d19da97efde68ca1ee5538bb261d5d2c062f0c055575128f11a2730e3ac1/scipy-1.17.1-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:94055a11dfebe37c656e70317e1996dc197e1a15bbcc351bcdd4610e128fe1ca", size = 37665910, upload-time = "2026-02-23T00:20:34.743Z" }, + { url = "https://files.pythonhosted.org/packages/06/1c/1172a88d507a4baaf72c5a09bb6c018fe2ae0ab622e5830b703a46cc9e44/scipy-1.17.1-cp313-cp313t-win_amd64.whl", hash = "sha256:e30bdeaa5deed6bc27b4cc490823cd0347d7dae09119b8803ae576ea0ce52e4c", size = 36562980, upload-time = "2026-02-23T00:20:40.575Z" }, + { url = "https://files.pythonhosted.org/packages/70/b0/eb757336e5a76dfa7911f63252e3b7d1de00935d7705cf772db5b45ec238/scipy-1.17.1-cp313-cp313t-win_arm64.whl", hash = "sha256:a720477885a9d2411f94a93d16f9d89bad0f28ca23c3f8daa521e2dcc3f44d49", size = 24856543, upload-time = "2026-02-23T00:20:45.313Z" }, + { url = "https://files.pythonhosted.org/packages/cf/83/333afb452af6f0fd70414dc04f898647ee1423979ce02efa75c3b0f2c28e/scipy-1.17.1-cp314-cp314-macosx_10_14_x86_64.whl", hash = "sha256:a48a72c77a310327f6a3a920092fa2b8fd03d7deaa60f093038f22d98e096717", size = 31584510, upload-time = "2026-02-23T00:21:01.015Z" }, + { url = "https://files.pythonhosted.org/packages/ed/a6/d05a85fd51daeb2e4ea71d102f15b34fedca8e931af02594193ae4fd25f7/scipy-1.17.1-cp314-cp314-macosx_12_0_arm64.whl", hash = "sha256:45abad819184f07240d8a696117a7aacd39787af9e0b719d00285549ed19a1e9", size = 28170131, upload-time = "2026-02-23T00:21:05.888Z" }, + { url = "https://files.pythonhosted.org/packages/db/7b/8624a203326675d7746a254083a187398090a179335b2e4a20e2ddc46e83/scipy-1.17.1-cp314-cp314-macosx_14_0_arm64.whl", hash = "sha256:3fd1fcdab3ea951b610dc4cef356d416d5802991e7e32b5254828d342f7b7e0b", size = 20342032, upload-time = "2026-02-23T00:21:09.904Z" }, + { url = "https://files.pythonhosted.org/packages/c9/35/2c342897c00775d688d8ff3987aced3426858fd89d5a0e26e020b660b301/scipy-1.17.1-cp314-cp314-macosx_14_0_x86_64.whl", hash = "sha256:7bdf2da170b67fdf10bca777614b1c7d96ae3ca5794fd9587dce41eb2966e866", size = 22678766, upload-time = "2026-02-23T00:21:14.313Z" }, + { url = "https://files.pythonhosted.org/packages/ef/f2/7cdb8eb308a1a6ae1e19f945913c82c23c0c442a462a46480ce487fdc0ac/scipy-1.17.1-cp314-cp314-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:adb2642e060a6549c343603a3851ba76ef0b74cc8c079a9a58121c7ec9fe2350", size = 32957007, upload-time = "2026-02-23T00:21:19.663Z" }, + { url = "https://files.pythonhosted.org/packages/0b/2e/7eea398450457ecb54e18e9d10110993fa65561c4f3add5e8eccd2b9cd41/scipy-1.17.1-cp314-cp314-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:eee2cfda04c00a857206a4330f0c5e3e56535494e30ca445eb19ec624ae75118", size = 35221333, upload-time = "2026-02-23T00:21:25.278Z" }, + { url = "https://files.pythonhosted.org/packages/d9/77/5b8509d03b77f093a0d52e606d3c4f79e8b06d1d38c441dacb1e26cacf46/scipy-1.17.1-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:d2650c1fb97e184d12d8ba010493ee7b322864f7d3d00d3f9bb97d9c21de4068", size = 35042066, upload-time = "2026-02-23T00:21:31.358Z" }, + { url = "https://files.pythonhosted.org/packages/f9/df/18f80fb99df40b4070328d5ae5c596f2f00fffb50167e31439e932f29e7d/scipy-1.17.1-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:08b900519463543aa604a06bec02461558a6e1cef8fdbb8098f77a48a83c8118", size = 37612763, upload-time = "2026-02-23T00:21:37.247Z" }, + { url = "https://files.pythonhosted.org/packages/4b/39/f0e8ea762a764a9dc52aa7dabcfad51a354819de1f0d4652b6a1122424d6/scipy-1.17.1-cp314-cp314-win_amd64.whl", hash = "sha256:3877ac408e14da24a6196de0ddcace62092bfc12a83823e92e49e40747e52c19", size = 37290984, upload-time = "2026-02-23T00:22:35.023Z" }, + { url = "https://files.pythonhosted.org/packages/7c/56/fe201e3b0f93d1a8bcf75d3379affd228a63d7e2d80ab45467a74b494947/scipy-1.17.1-cp314-cp314-win_arm64.whl", hash = "sha256:f8885db0bc2bffa59d5c1b72fad7a6a92d3e80e7257f967dd81abb553a90d293", size = 25192877, upload-time = "2026-02-23T00:22:39.798Z" }, + { url = "https://files.pythonhosted.org/packages/96/ad/f8c414e121f82e02d76f310f16db9899c4fcde36710329502a6b2a3c0392/scipy-1.17.1-cp314-cp314t-macosx_10_14_x86_64.whl", hash = "sha256:1cc682cea2ae55524432f3cdff9e9a3be743d52a7443d0cba9017c23c87ae2f6", size = 31949750, upload-time = "2026-02-23T00:21:42.289Z" }, + { url = "https://files.pythonhosted.org/packages/7c/b0/c741e8865d61b67c81e255f4f0a832846c064e426636cd7de84e74d209be/scipy-1.17.1-cp314-cp314t-macosx_12_0_arm64.whl", hash = "sha256:2040ad4d1795a0ae89bfc7e8429677f365d45aa9fd5e4587cf1ea737f927b4a1", size = 28585858, upload-time = "2026-02-23T00:21:47.706Z" }, + { url = "https://files.pythonhosted.org/packages/ed/1b/3985219c6177866628fa7c2595bfd23f193ceebbe472c98a08824b9466ff/scipy-1.17.1-cp314-cp314t-macosx_14_0_arm64.whl", hash = "sha256:131f5aaea57602008f9822e2115029b55d4b5f7c070287699fe45c661d051e39", size = 20757723, upload-time = "2026-02-23T00:21:52.039Z" }, + { url = "https://files.pythonhosted.org/packages/c0/19/2a04aa25050d656d6f7b9e7b685cc83d6957fb101665bfd9369ca6534563/scipy-1.17.1-cp314-cp314t-macosx_14_0_x86_64.whl", hash = "sha256:9cdc1a2fcfd5c52cfb3045feb399f7b3ce822abdde3a193a6b9a60b3cb5854ca", size = 23043098, upload-time = "2026-02-23T00:21:56.185Z" }, + { url = "https://files.pythonhosted.org/packages/86/f1/3383beb9b5d0dbddd030335bf8a8b32d4317185efe495374f134d8be6cce/scipy-1.17.1-cp314-cp314t-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:6e3dcd57ab780c741fde8dc68619de988b966db759a3c3152e8e9142c26295ad", size = 33030397, upload-time = "2026-02-23T00:22:01.404Z" }, + { url = "https://files.pythonhosted.org/packages/41/68/8f21e8a65a5a03f25a79165ec9d2b28c00e66dc80546cf5eb803aeeff35b/scipy-1.17.1-cp314-cp314t-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:a9956e4d4f4a301ebf6cde39850333a6b6110799d470dbbb1e25326ac447f52a", size = 35281163, upload-time = "2026-02-23T00:22:07.024Z" }, + { url = "https://files.pythonhosted.org/packages/84/8d/c8a5e19479554007a5632ed7529e665c315ae7492b4f946b0deb39870e39/scipy-1.17.1-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:a4328d245944d09fd639771de275701ccadf5f781ba0ff092ad141e017eccda4", size = 35116291, upload-time = "2026-02-23T00:22:12.585Z" }, + { url = "https://files.pythonhosted.org/packages/52/52/e57eceff0e342a1f50e274264ed47497b59e6a4e3118808ee58ddda7b74a/scipy-1.17.1-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:a77cbd07b940d326d39a1d1b37817e2ee4d79cb30e7338f3d0cddffae70fcaa2", size = 37682317, upload-time = "2026-02-23T00:22:18.513Z" }, + { url = "https://files.pythonhosted.org/packages/11/2f/b29eafe4a3fbc3d6de9662b36e028d5f039e72d345e05c250e121a230dd4/scipy-1.17.1-cp314-cp314t-win_amd64.whl", hash = "sha256:eb092099205ef62cd1782b006658db09e2fed75bffcae7cc0d44052d8aa0f484", size = 37345327, upload-time = "2026-02-23T00:22:24.442Z" }, + { url = "https://files.pythonhosted.org/packages/07/39/338d9219c4e87f3e708f18857ecd24d22a0c3094752393319553096b98af/scipy-1.17.1-cp314-cp314t-win_arm64.whl", hash = "sha256:200e1050faffacc162be6a486a984a0497866ec54149a01270adc8a59b7c7d21", size = 25489165, upload-time = "2026-02-23T00:22:29.563Z" }, +] + +[[package]] +name = "send2trash" +version = "2.1.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/c5/f0/184b4b5f8d00f2a92cf96eec8967a3d550b52cf94362dad1100df9e48d57/send2trash-2.1.0.tar.gz", hash = "sha256:1c72b39f09457db3c05ce1d19158c2cbef4c32b8bedd02c155e49282b7ea7459", size = 17255, upload-time = "2026-01-14T06:27:36.056Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/1c/78/504fdd027da3b84ff1aecd9f6957e65f35134534ccc6da8628eb71e76d3f/send2trash-2.1.0-py3-none-any.whl", hash = "sha256:0da2f112e6d6bb22de6aa6daa7e144831a4febf2a87261451c4ad849fe9a873c", size = 17610, upload-time = "2026-01-14T06:27:35.218Z" }, +] + +[[package]] +name = "setproctitle" +version = "1.3.7" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/8d/48/49393a96a2eef1ab418b17475fb92b8fcfad83d099e678751b05472e69de/setproctitle-1.3.7.tar.gz", hash = "sha256:bc2bc917691c1537d5b9bca1468437176809c7e11e5694ca79a9ca12345dcb9e", size = 27002, upload-time = "2025-09-05T12:51:25.278Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/04/cd/1b7ba5cad635510720ce19d7122154df96a2387d2a74217be552887c93e5/setproctitle-1.3.7-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:a600eeb4145fb0ee6c287cb82a2884bd4ec5bbb076921e287039dcc7b7cc6dd0", size = 18085, upload-time = "2025-09-05T12:49:22.183Z" }, + { url = "https://files.pythonhosted.org/packages/8f/1a/b2da0a620490aae355f9d72072ac13e901a9fec809a6a24fc6493a8f3c35/setproctitle-1.3.7-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:97a090fed480471bb175689859532709e28c085087e344bca45cf318034f70c4", size = 13097, upload-time = "2025-09-05T12:49:23.322Z" }, + { url = "https://files.pythonhosted.org/packages/18/2e/bd03ff02432a181c1787f6fc2a678f53b7dacdd5ded69c318fe1619556e8/setproctitle-1.3.7-cp311-cp311-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:1607b963e7b53e24ec8a2cb4e0ab3ae591d7c6bf0a160feef0551da63452b37f", size = 32191, upload-time = "2025-09-05T12:49:24.567Z" }, + { url = "https://files.pythonhosted.org/packages/28/78/1e62fc0937a8549f2220445ed2175daacee9b6764c7963b16148119b016d/setproctitle-1.3.7-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:a20fb1a3974e2dab857870cf874b325b8705605cb7e7e8bcbb915bca896f52a9", size = 33203, upload-time = "2025-09-05T12:49:25.871Z" }, + { url = "https://files.pythonhosted.org/packages/a0/3c/65edc65db3fa3df400cf13b05e9d41a3c77517b4839ce873aa6b4043184f/setproctitle-1.3.7-cp311-cp311-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:f8d961bba676e07d77665204f36cffaa260f526e7b32d07ab3df6a2c1dfb44ba", size = 34963, upload-time = "2025-09-05T12:49:27.044Z" }, + { url = "https://files.pythonhosted.org/packages/a1/32/89157e3de997973e306e44152522385f428e16f92f3cf113461489e1e2ee/setproctitle-1.3.7-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:db0fd964fbd3a9f8999b502f65bd2e20883fdb5b1fae3a424e66db9a793ed307", size = 32398, upload-time = "2025-09-05T12:49:28.909Z" }, + { url = "https://files.pythonhosted.org/packages/4a/18/77a765a339ddf046844cb4513353d8e9dcd8183da9cdba6e078713e6b0b2/setproctitle-1.3.7-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:db116850fcf7cca19492030f8d3b4b6e231278e8fe097a043957d22ce1bdf3ee", size = 33657, upload-time = "2025-09-05T12:49:30.323Z" }, + { url = "https://files.pythonhosted.org/packages/6b/63/f0b6205c64d74d2a24a58644a38ec77bdbaa6afc13747e75973bf8904932/setproctitle-1.3.7-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:316664d8b24a5c91ee244460bdaf7a74a707adaa9e14fbe0dc0a53168bb9aba1", size = 31836, upload-time = "2025-09-05T12:49:32.309Z" }, + { url = "https://files.pythonhosted.org/packages/ba/51/e1277f9ba302f1a250bbd3eedbbee747a244b3cc682eb58fb9733968f6d8/setproctitle-1.3.7-cp311-cp311-win32.whl", hash = "sha256:b74774ca471c86c09b9d5037c8451fff06bb82cd320d26ae5a01c758088c0d5d", size = 12556, upload-time = "2025-09-05T12:49:33.529Z" }, + { url = "https://files.pythonhosted.org/packages/b6/7b/822a23f17e9003dfdee92cd72758441ca2a3680388da813a371b716fb07f/setproctitle-1.3.7-cp311-cp311-win_amd64.whl", hash = "sha256:acb9097213a8dd3410ed9f0dc147840e45ca9797785272928d4be3f0e69e3be4", size = 13243, upload-time = "2025-09-05T12:49:34.553Z" }, + { url = "https://files.pythonhosted.org/packages/fb/f0/2dc88e842077719d7384d86cc47403e5102810492b33680e7dadcee64cd8/setproctitle-1.3.7-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:2dc99aec591ab6126e636b11035a70991bc1ab7a261da428491a40b84376654e", size = 18049, upload-time = "2025-09-05T12:49:36.241Z" }, + { url = "https://files.pythonhosted.org/packages/f0/b4/50940504466689cda65680c9e9a1e518e5750c10490639fa687489ac7013/setproctitle-1.3.7-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:cdd8aa571b7aa39840fdbea620e308a19691ff595c3a10231e9ee830339dd798", size = 13079, upload-time = "2025-09-05T12:49:38.088Z" }, + { url = "https://files.pythonhosted.org/packages/d0/99/71630546b9395b095f4082be41165d1078204d1696c2d9baade3de3202d0/setproctitle-1.3.7-cp312-cp312-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:2906b6c7959cdb75f46159bf0acd8cc9906cf1361c9e1ded0d065fe8f9039629", size = 32932, upload-time = "2025-09-05T12:49:39.271Z" }, + { url = "https://files.pythonhosted.org/packages/50/22/cee06af4ffcfb0e8aba047bd44f5262e644199ae7527ae2c1f672b86495c/setproctitle-1.3.7-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:6915964a6dda07920a1159321dcd6d94fc7fc526f815ca08a8063aeca3c204f1", size = 33736, upload-time = "2025-09-05T12:49:40.565Z" }, + { url = "https://files.pythonhosted.org/packages/5c/00/a5949a8bb06ef5e7df214fc393bb2fb6aedf0479b17214e57750dfdd0f24/setproctitle-1.3.7-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:cff72899861c765bd4021d1ff1c68d60edc129711a2fdba77f9cb69ef726a8b6", size = 35605, upload-time = "2025-09-05T12:49:42.362Z" }, + { url = "https://files.pythonhosted.org/packages/b0/3a/50caca532a9343828e3bf5778c7a84d6c737a249b1796d50dd680290594d/setproctitle-1.3.7-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:b7cb05bd446687ff816a3aaaf831047fc4c364feff7ada94a66024f1367b448c", size = 33143, upload-time = "2025-09-05T12:49:43.515Z" }, + { url = "https://files.pythonhosted.org/packages/ca/14/b843a251296ce55e2e17c017d6b9f11ce0d3d070e9265de4ecad948b913d/setproctitle-1.3.7-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:3a57b9a00de8cae7e2a1f7b9f0c2ac7b69372159e16a7708aa2f38f9e5cc987a", size = 34434, upload-time = "2025-09-05T12:49:45.31Z" }, + { url = "https://files.pythonhosted.org/packages/c8/b7/06145c238c0a6d2c4bc881f8be230bb9f36d2bf51aff7bddcb796d5eed67/setproctitle-1.3.7-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:d8828b356114f6b308b04afe398ed93803d7fca4a955dd3abe84430e28d33739", size = 32795, upload-time = "2025-09-05T12:49:46.419Z" }, + { url = "https://files.pythonhosted.org/packages/ef/dc/ef76a81fac9bf27b84ed23df19c1f67391a753eed6e3c2254ebcb5133f56/setproctitle-1.3.7-cp312-cp312-win32.whl", hash = "sha256:b0304f905efc845829ac2bc791ddebb976db2885f6171f4a3de678d7ee3f7c9f", size = 12552, upload-time = "2025-09-05T12:49:47.635Z" }, + { url = "https://files.pythonhosted.org/packages/e2/5b/a9fe517912cd6e28cf43a212b80cb679ff179a91b623138a99796d7d18a0/setproctitle-1.3.7-cp312-cp312-win_amd64.whl", hash = "sha256:9888ceb4faea3116cf02a920ff00bfbc8cc899743e4b4ac914b03625bdc3c300", size = 13247, upload-time = "2025-09-05T12:49:49.16Z" }, + { url = "https://files.pythonhosted.org/packages/5d/2f/fcedcade3b307a391b6e17c774c6261a7166aed641aee00ed2aad96c63ce/setproctitle-1.3.7-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:c3736b2a423146b5e62230502e47e08e68282ff3b69bcfe08a322bee73407922", size = 18047, upload-time = "2025-09-05T12:49:50.271Z" }, + { url = "https://files.pythonhosted.org/packages/23/ae/afc141ca9631350d0a80b8f287aac79a76f26b6af28fd8bf92dae70dc2c5/setproctitle-1.3.7-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:3384e682b158d569e85a51cfbde2afd1ab57ecf93ea6651fe198d0ba451196ee", size = 13073, upload-time = "2025-09-05T12:49:51.46Z" }, + { url = "https://files.pythonhosted.org/packages/87/ed/0a4f00315bc02510395b95eec3d4aa77c07192ee79f0baae77ea7b9603d8/setproctitle-1.3.7-cp313-cp313-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:0564a936ea687cd24dffcea35903e2a20962aa6ac20e61dd3a207652401492dd", size = 33284, upload-time = "2025-09-05T12:49:52.741Z" }, + { url = "https://files.pythonhosted.org/packages/fc/e4/adf3c4c0a2173cb7920dc9df710bcc67e9bcdbf377e243b7a962dc31a51a/setproctitle-1.3.7-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:a5d1cb3f81531f0eb40e13246b679a1bdb58762b170303463cb06ecc296f26d0", size = 34104, upload-time = "2025-09-05T12:49:54.416Z" }, + { url = "https://files.pythonhosted.org/packages/52/4f/6daf66394152756664257180439d37047aa9a1cfaa5e4f5ed35e93d1dc06/setproctitle-1.3.7-cp313-cp313-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:a7d159e7345f343b44330cbba9194169b8590cb13dae940da47aa36a72aa9929", size = 35982, upload-time = "2025-09-05T12:49:56.295Z" }, + { url = "https://files.pythonhosted.org/packages/1b/62/f2c0595403cf915db031f346b0e3b2c0096050e90e0be658a64f44f4278a/setproctitle-1.3.7-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:0b5074649797fd07c72ca1f6bff0406f4a42e1194faac03ecaab765ce605866f", size = 33150, upload-time = "2025-09-05T12:49:58.025Z" }, + { url = "https://files.pythonhosted.org/packages/a0/29/10dd41cde849fb2f9b626c846b7ea30c99c81a18a5037a45cc4ba33c19a7/setproctitle-1.3.7-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:61e96febced3f61b766115381d97a21a6265a0f29188a791f6df7ed777aef698", size = 34463, upload-time = "2025-09-05T12:49:59.424Z" }, + { url = "https://files.pythonhosted.org/packages/71/3c/cedd8eccfaf15fb73a2c20525b68c9477518917c9437737fa0fda91e378f/setproctitle-1.3.7-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:047138279f9463f06b858e579cc79580fbf7a04554d24e6bddf8fe5dddbe3d4c", size = 32848, upload-time = "2025-09-05T12:50:01.107Z" }, + { url = "https://files.pythonhosted.org/packages/d1/3e/0a0e27d1c9926fecccfd1f91796c244416c70bf6bca448d988638faea81d/setproctitle-1.3.7-cp313-cp313-win32.whl", hash = "sha256:7f47accafac7fe6535ba8ba9efd59df9d84a6214565108d0ebb1199119c9cbbd", size = 12544, upload-time = "2025-09-05T12:50:15.81Z" }, + { url = "https://files.pythonhosted.org/packages/36/1b/6bf4cb7acbbd5c846ede1c3f4d6b4ee52744d402e43546826da065ff2ab7/setproctitle-1.3.7-cp313-cp313-win_amd64.whl", hash = "sha256:fe5ca35aeec6dc50cabab9bf2d12fbc9067eede7ff4fe92b8f5b99d92e21263f", size = 13235, upload-time = "2025-09-05T12:50:16.89Z" }, + { url = "https://files.pythonhosted.org/packages/e6/a4/d588d3497d4714750e3eaf269e9e8985449203d82b16b933c39bd3fc52a1/setproctitle-1.3.7-cp313-cp313t-macosx_10_13_universal2.whl", hash = "sha256:10e92915c4b3086b1586933a36faf4f92f903c5554f3c34102d18c7d3f5378e9", size = 18058, upload-time = "2025-09-05T12:50:02.501Z" }, + { url = "https://files.pythonhosted.org/packages/05/77/7637f7682322a7244e07c373881c7e982567e2cb1dd2f31bd31481e45500/setproctitle-1.3.7-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:de879e9c2eab637f34b1a14c4da1e030c12658cdc69ee1b3e5be81b380163ce5", size = 13072, upload-time = "2025-09-05T12:50:03.601Z" }, + { url = "https://files.pythonhosted.org/packages/52/09/f366eca0973cfbac1470068d1313fa3fe3de4a594683385204ec7f1c4101/setproctitle-1.3.7-cp313-cp313t-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:c18246d88e227a5b16248687514f95642505000442165f4b7db354d39d0e4c29", size = 34490, upload-time = "2025-09-05T12:50:04.948Z" }, + { url = "https://files.pythonhosted.org/packages/71/36/611fc2ed149fdea17c3677e1d0df30d8186eef9562acc248682b91312706/setproctitle-1.3.7-cp313-cp313t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:7081f193dab22df2c36f9fc6d113f3793f83c27891af8fe30c64d89d9a37e152", size = 35267, upload-time = "2025-09-05T12:50:06.015Z" }, + { url = "https://files.pythonhosted.org/packages/88/a4/64e77d0671446bd5a5554387b69e1efd915274686844bea733714c828813/setproctitle-1.3.7-cp313-cp313t-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:9cc9b901ce129350637426a89cfd650066a4adc6899e47822e2478a74023ff7c", size = 37376, upload-time = "2025-09-05T12:50:07.484Z" }, + { url = "https://files.pythonhosted.org/packages/89/bc/ad9c664fe524fb4a4b2d3663661a5c63453ce851736171e454fa2cdec35c/setproctitle-1.3.7-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:80e177eff2d1ec172188d0d7fd9694f8e43d3aab76a6f5f929bee7bf7894e98b", size = 33963, upload-time = "2025-09-05T12:50:09.056Z" }, + { url = "https://files.pythonhosted.org/packages/ab/01/a36de7caf2d90c4c28678da1466b47495cbbad43badb4e982d8db8167ed4/setproctitle-1.3.7-cp313-cp313t-musllinux_1_2_ppc64le.whl", hash = "sha256:23e520776c445478a67ee71b2a3c1ffdafbe1f9f677239e03d7e2cc635954e18", size = 35550, upload-time = "2025-09-05T12:50:10.791Z" }, + { url = "https://files.pythonhosted.org/packages/dd/68/17e8aea0ed5ebc17fbf03ed2562bfab277c280e3625850c38d92a7b5fcd9/setproctitle-1.3.7-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:5fa1953126a3b9bd47049d58c51b9dac72e78ed120459bd3aceb1bacee72357c", size = 33727, upload-time = "2025-09-05T12:50:12.032Z" }, + { url = "https://files.pythonhosted.org/packages/b2/33/90a3bf43fe3a2242b4618aa799c672270250b5780667898f30663fd94993/setproctitle-1.3.7-cp313-cp313t-win32.whl", hash = "sha256:4a5e212bf438a4dbeece763f4962ad472c6008ff6702e230b4f16a037e2f6f29", size = 12549, upload-time = "2025-09-05T12:50:13.074Z" }, + { url = "https://files.pythonhosted.org/packages/0b/0e/50d1f07f3032e1f23d814ad6462bc0a138f369967c72494286b8a5228e40/setproctitle-1.3.7-cp313-cp313t-win_amd64.whl", hash = "sha256:cf2727b733e90b4f874bac53e3092aa0413fe1ea6d4f153f01207e6ce65034d9", size = 13243, upload-time = "2025-09-05T12:50:14.146Z" }, + { url = "https://files.pythonhosted.org/packages/89/c7/43ac3a98414f91d1b86a276bc2f799ad0b4b010e08497a95750d5bc42803/setproctitle-1.3.7-cp314-cp314-macosx_10_13_universal2.whl", hash = "sha256:80c36c6a87ff72eabf621d0c79b66f3bdd0ecc79e873c1e9f0651ee8bf215c63", size = 18052, upload-time = "2025-09-05T12:50:17.928Z" }, + { url = "https://files.pythonhosted.org/packages/cd/2c/dc258600a25e1a1f04948073826bebc55e18dbd99dc65a576277a82146fa/setproctitle-1.3.7-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:b53602371a52b91c80aaf578b5ada29d311d12b8a69c0c17fbc35b76a1fd4f2e", size = 13071, upload-time = "2025-09-05T12:50:19.061Z" }, + { url = "https://files.pythonhosted.org/packages/ab/26/8e3bb082992f19823d831f3d62a89409deb6092e72fc6940962983ffc94f/setproctitle-1.3.7-cp314-cp314-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:fcb966a6c57cf07cc9448321a08f3be6b11b7635be502669bc1d8745115d7e7f", size = 33180, upload-time = "2025-09-05T12:50:20.395Z" }, + { url = "https://files.pythonhosted.org/packages/f1/af/ae692a20276d1159dd0cf77b0bcf92cbb954b965655eb4a69672099bb214/setproctitle-1.3.7-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:46178672599b940368d769474fe13ecef1b587d58bb438ea72b9987f74c56ea5", size = 34043, upload-time = "2025-09-05T12:50:22.454Z" }, + { url = "https://files.pythonhosted.org/packages/34/b2/6a092076324dd4dac1a6d38482bedebbff5cf34ef29f58585ec76e47bc9d/setproctitle-1.3.7-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:7f9e9e3ff135cbcc3edd2f4cf29b139f4aca040d931573102742db70ff428c17", size = 35892, upload-time = "2025-09-05T12:50:23.937Z" }, + { url = "https://files.pythonhosted.org/packages/1c/1a/8836b9f28cee32859ac36c3df85aa03e1ff4598d23ea17ca2e96b5845a8f/setproctitle-1.3.7-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:14c7eba8d90c93b0e79c01f0bd92a37b61983c27d6d7d5a3b5defd599113d60e", size = 32898, upload-time = "2025-09-05T12:50:25.617Z" }, + { url = "https://files.pythonhosted.org/packages/ef/22/8fabdc24baf42defb599714799d8445fe3ae987ec425a26ec8e80ea38f8e/setproctitle-1.3.7-cp314-cp314-musllinux_1_2_ppc64le.whl", hash = "sha256:9e64e98077fb30b6cf98073d6c439cd91deb8ebbf8fc62d9dbf52bd38b0c6ac0", size = 34308, upload-time = "2025-09-05T12:50:26.827Z" }, + { url = "https://files.pythonhosted.org/packages/15/1b/b9bee9de6c8cdcb3b3a6cb0b3e773afdb86bbbc1665a3bfa424a4294fda2/setproctitle-1.3.7-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:b91387cc0f02a00ac95dcd93f066242d3cca10ff9e6153de7ee07069c6f0f7c8", size = 32536, upload-time = "2025-09-05T12:50:28.5Z" }, + { url = "https://files.pythonhosted.org/packages/37/0c/75e5f2685a5e3eda0b39a8b158d6d8895d6daf3ba86dec9e3ba021510272/setproctitle-1.3.7-cp314-cp314-win32.whl", hash = "sha256:52b054a61c99d1b72fba58b7f5486e04b20fefc6961cd76722b424c187f362ed", size = 12731, upload-time = "2025-09-05T12:50:43.955Z" }, + { url = "https://files.pythonhosted.org/packages/d2/ae/acddbce90d1361e1786e1fb421bc25baeb0c22ef244ee5d0176511769ec8/setproctitle-1.3.7-cp314-cp314-win_amd64.whl", hash = "sha256:5818e4080ac04da1851b3ec71e8a0f64e3748bf9849045180566d8b736702416", size = 13464, upload-time = "2025-09-05T12:50:45.057Z" }, + { url = "https://files.pythonhosted.org/packages/01/6d/20886c8ff2e6d85e3cabadab6aab9bb90acaf1a5cfcb04d633f8d61b2626/setproctitle-1.3.7-cp314-cp314t-macosx_10_13_universal2.whl", hash = "sha256:6fc87caf9e323ac426910306c3e5d3205cd9f8dcac06d233fcafe9337f0928a3", size = 18062, upload-time = "2025-09-05T12:50:29.78Z" }, + { url = "https://files.pythonhosted.org/packages/9a/60/26dfc5f198715f1343b95c2f7a1c16ae9ffa45bd89ffd45a60ed258d24ea/setproctitle-1.3.7-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:6134c63853d87a4897ba7d5cc0e16abfa687f6c66fc09f262bb70d67718f2309", size = 13075, upload-time = "2025-09-05T12:50:31.604Z" }, + { url = "https://files.pythonhosted.org/packages/21/9c/980b01f50d51345dd513047e3ba9e96468134b9181319093e61db1c47188/setproctitle-1.3.7-cp314-cp314t-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:1403d2abfd32790b6369916e2313dffbe87d6b11dca5bbd898981bcde48e7a2b", size = 34744, upload-time = "2025-09-05T12:50:32.777Z" }, + { url = "https://files.pythonhosted.org/packages/86/b4/82cd0c86e6d1c4538e1a7eb908c7517721513b801dff4ba3f98ef816a240/setproctitle-1.3.7-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:e7c5bfe4228ea22373e3025965d1a4116097e555ee3436044f5c954a5e63ac45", size = 35589, upload-time = "2025-09-05T12:50:34.13Z" }, + { url = "https://files.pythonhosted.org/packages/8a/4f/9f6b2a7417fd45673037554021c888b31247f7594ff4bd2239918c5cd6d0/setproctitle-1.3.7-cp314-cp314t-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:585edf25e54e21a94ccb0fe81ad32b9196b69ebc4fc25f81da81fb8a50cca9e4", size = 37698, upload-time = "2025-09-05T12:50:35.524Z" }, + { url = "https://files.pythonhosted.org/packages/20/92/927b7d4744aac214d149c892cb5fa6dc6f49cfa040cb2b0a844acd63dcaf/setproctitle-1.3.7-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:96c38cdeef9036eb2724c2210e8d0b93224e709af68c435d46a4733a3675fee1", size = 34201, upload-time = "2025-09-05T12:50:36.697Z" }, + { url = "https://files.pythonhosted.org/packages/0a/0c/fd4901db5ba4b9d9013e62f61d9c18d52290497f956745cd3e91b0d80f90/setproctitle-1.3.7-cp314-cp314t-musllinux_1_2_ppc64le.whl", hash = "sha256:45e3ef48350abb49cf937d0a8ba15e42cee1e5ae13ca41a77c66d1abc27a5070", size = 35801, upload-time = "2025-09-05T12:50:38.314Z" }, + { url = "https://files.pythonhosted.org/packages/e7/e3/54b496ac724e60e61cc3447f02690105901ca6d90da0377dffe49ff99fc7/setproctitle-1.3.7-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:1fae595d032b30dab4d659bece20debd202229fce12b55abab978b7f30783d73", size = 33958, upload-time = "2025-09-05T12:50:39.841Z" }, + { url = "https://files.pythonhosted.org/packages/ea/a8/c84bb045ebf8c6fdc7f7532319e86f8380d14bbd3084e6348df56bdfe6fd/setproctitle-1.3.7-cp314-cp314t-win32.whl", hash = "sha256:02432f26f5d1329ab22279ff863c83589894977063f59e6c4b4845804a08f8c2", size = 12745, upload-time = "2025-09-05T12:50:41.377Z" }, + { url = "https://files.pythonhosted.org/packages/08/b6/3a5a4f9952972791a9114ac01dfc123f0df79903577a3e0a7a404a695586/setproctitle-1.3.7-cp314-cp314t-win_amd64.whl", hash = "sha256:cbc388e3d86da1f766d8fc2e12682e446064c01cea9f88a88647cfe7c011de6a", size = 13469, upload-time = "2025-09-05T12:50:42.67Z" }, + { url = "https://files.pythonhosted.org/packages/c3/5b/5e1c117ac84e3cefcf8d7a7f6b2461795a87e20869da065a5c087149060b/setproctitle-1.3.7-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:b1cac6a4b0252b8811d60b6d8d0f157c0fdfed379ac89c25a914e6346cf355a1", size = 12587, upload-time = "2025-09-05T12:51:21.195Z" }, + { url = "https://files.pythonhosted.org/packages/73/02/b9eadc226195dcfa90eed37afe56b5dd6fa2f0e5220ab8b7867b8862b926/setproctitle-1.3.7-pp311-pypy311_pp73-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:f1704c9e041f2b1dc38f5be4552e141e1432fba3dd52c72eeffd5bc2db04dc65", size = 14286, upload-time = "2025-09-05T12:51:22.61Z" }, + { url = "https://files.pythonhosted.org/packages/28/26/1be1d2a53c2a91ec48fa2ff4a409b395f836798adf194d99de9c059419ea/setproctitle-1.3.7-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:b08b61976ffa548bd5349ce54404bf6b2d51bd74d4f1b241ed1b0f25bce09c3a", size = 13282, upload-time = "2025-09-05T12:51:24.094Z" }, +] + +[[package]] +name = "six" +version = "1.17.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/94/e7/b2c673351809dca68a0e064b6af791aa332cf192da575fd474ed7d6f16a2/six-1.17.0.tar.gz", hash = "sha256:ff70335d468e7eb6ec65b95b99d3a2836546063f63acc5171de367e834932a81", size = 34031, upload-time = "2024-12-04T17:35:28.174Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/b7/ce/149a00dd41f10bc29e5921b496af8b574d8413afcd5e30dfa0ed46c2cc5e/six-1.17.0-py2.py3-none-any.whl", hash = "sha256:4721f391ed90541fddacab5acf947aa0d3dc7d27b2e1e8eda2be8970586c3274", size = 11050, upload-time = "2024-12-04T17:35:26.475Z" }, +] + +[[package]] +name = "soupsieve" +version = "2.8.4" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/47/2c/0a5f6f8ee0d5589e48c7640213ed5175d52cf540a06725b628cc1a45d6ce/soupsieve-2.8.4.tar.gz", hash = "sha256:e121fd02e975c695e4e9e8774a5ee35d74714b59307868dcc5319ad2d9e3328e", size = 121110, upload-time = "2026-05-24T13:55:57.154Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/5e/f5/0c41cb68dcae6b7de4fac4188a3a9589e21fb31df21ea3a2e888db95e6c9/soupsieve-2.8.4-py3-none-any.whl", hash = "sha256:e7e6b0769c8f51ed59acab6e994b00621096cfb1c640a7509295987388fbaf65", size = 37304, upload-time = "2026-05-24T13:55:55.406Z" }, +] + +[[package]] +name = "spglib" +version = "2.7.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "numpy" }, + { name = "typing-extensions", marker = "python_full_version < '3.13'" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/a9/06/7964acb4c444191376bd87f91579475fbe7623ca943cce40cee8fb7f2c36/spglib-2.7.0.tar.gz", hash = "sha256:c40907a42c9dc45572f46740bf95412f84fb0eda30267e31665d104a4bde6627", size = 2366134, upload-time = "2025-12-29T09:48:26.42Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/44/a8/d841ae7743c58227af277f7f16aa844376fa11c426090d6ae35e7e93af76/spglib-2.7.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:3cf0ff80c01d8631ef4b9f1b78da79ff2044834e6e2d870f7f20c8579c921136", size = 910793, upload-time = "2025-12-29T09:47:32.063Z" }, + { url = "https://files.pythonhosted.org/packages/e8/02/11baf94cf682cdaafa046b72d4b2adcf944e19e2b2741454e329dedb2fc2/spglib-2.7.0-cp311-cp311-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:a7b29d2cfca6ac53e927686ca0b91257126e47f6abfa26451723a5cd40070352", size = 944977, upload-time = "2025-12-29T09:47:33.638Z" }, + { url = "https://files.pythonhosted.org/packages/ce/fa/6d1bc8f8cb08945ca8c37c95b42bf336b6b9a8a737eced1ce64f0cebe9ce/spglib-2.7.0-cp311-cp311-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:f892ecce2dd1bc636b14a4e5bc13aabb73b008bd37a4d23636882c8971c432a0", size = 960531, upload-time = "2025-12-29T09:47:36.932Z" }, + { url = "https://files.pythonhosted.org/packages/b0/79/2fd5e33b431cd0afcdd441bd10704c11cdf74c09b721249297284e5bf0b2/spglib-2.7.0-cp311-cp311-win_amd64.whl", hash = "sha256:468879702577124dcde0607a75396576e256f1cfa2d8fe48da4a928fbb27abc6", size = 669827, upload-time = "2025-12-29T09:47:38.47Z" }, + { url = "https://files.pythonhosted.org/packages/f7/e9/4e07c9c1bda40df54e09bd686eae0dc13d46e76a5ef4d43582971a86eb32/spglib-2.7.0-cp311-cp311-win_arm64.whl", hash = "sha256:ceb6730a2324d0c83579c803f3782e28bd41e79bbfe0c3dfdbf30e3d3a6320e5", size = 649076, upload-time = "2025-12-29T09:47:40.367Z" }, + { url = "https://files.pythonhosted.org/packages/68/0e/36720beeca8452530e50ab8a16b91e8721e34c0f97fd25e9c4ddd8b9324b/spglib-2.7.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:ef70132e23dfcc7ab6813742e0edab3f9906e61cd11c857f014bd5610a8bc88c", size = 911009, upload-time = "2025-12-29T09:47:42.238Z" }, + { url = "https://files.pythonhosted.org/packages/47/a0/24df91cbde6a3237d54cfb21602cc8ebb4102cd4e3ec9497c66135c2b190/spglib-2.7.0-cp312-cp312-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:59f134e74f7f488de4bf5579ee6a35af25cb2c478c138de664fea1e14f3efbaf", size = 946821, upload-time = "2025-12-29T09:47:44.548Z" }, + { url = "https://files.pythonhosted.org/packages/67/4c/75ac6f7ade28019b216c7333322f2886e1c0105202cd74506f530664bf26/spglib-2.7.0-cp312-cp312-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:6913906fd9108e7bb2ce06a810513a95a82d801530f10230979bf3427bb7e771", size = 962531, upload-time = "2025-12-29T09:47:46.3Z" }, + { url = "https://files.pythonhosted.org/packages/a7/5f/4e283139af178bb445eedff281a90e66ceff1b814ace70a9d90a2197acc3/spglib-2.7.0-cp312-cp312-win_amd64.whl", hash = "sha256:d5729ff0040baae764c17249302cd99f0eb4e73449612a8c69d3e60a215f062e", size = 671111, upload-time = "2025-12-29T09:47:48.14Z" }, + { url = "https://files.pythonhosted.org/packages/a5/b9/20e52d46e33bf69ceba4fc86602f006c06ce4ab10e3c930f4722fb270b02/spglib-2.7.0-cp312-cp312-win_arm64.whl", hash = "sha256:54f4b6e789475384c62e759c618172707f261c0eae8017949fe4994b6b8cc779", size = 646679, upload-time = "2025-12-29T09:47:49.376Z" }, + { url = "https://files.pythonhosted.org/packages/2c/1c/a0fe8c0523a0e7d608f49f09895e5c599329265c9bfacd269a21458b7564/spglib-2.7.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:ab061ea6a3c3c25a1d0018b09c333c0458792036d3f45d892bd52793ed1f1bda", size = 911085, upload-time = "2025-12-29T09:47:51.606Z" }, + { url = "https://files.pythonhosted.org/packages/2a/34/cb3c522c4aaf6ce319b37bbec71d373b9e2cf0bcfe7d42c365cd6c113b4b/spglib-2.7.0-cp313-cp313-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:be28673e90f7a6c7770f73c57e529d2bdbb373d06d26ee5e90991b548e9238aa", size = 946857, upload-time = "2025-12-29T09:47:53.059Z" }, + { url = "https://files.pythonhosted.org/packages/9e/64/3b1213f2f655ff143ed142292b47ec3f1f9bda8641e659a7e33c4cf0e8a9/spglib-2.7.0-cp313-cp313-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:f627a4ed6f2396ed6e3e8eaf33a53ad143c8ffb8756a84a640f4569ac5ffa2a7", size = 962470, upload-time = "2025-12-29T09:47:54.878Z" }, + { url = "https://files.pythonhosted.org/packages/5c/3a/c51883ce739a00f9f60196f3dcb4ed91b690299a4ec64defd8ec5b2c5899/spglib-2.7.0-cp313-cp313-win_amd64.whl", hash = "sha256:c76411bc1b96cd87c8733994747c7692512b583bb4ef89a65463ff4255221c11", size = 671073, upload-time = "2025-12-29T09:47:56.887Z" }, + { url = "https://files.pythonhosted.org/packages/35/78/3f9ec6ae93a48527dce0eceb6eeab74e6ad1fb2977adb5cbdfc03d43193c/spglib-2.7.0-cp313-cp313-win_arm64.whl", hash = "sha256:0d8ecf030d13d67c4cc272423e5652b74eda57f86a0b118e007f6d12974cc256", size = 646711, upload-time = "2025-12-29T09:47:58.697Z" }, + { url = "https://files.pythonhosted.org/packages/1b/47/86e3c15c3e1c252bde40a794eea4742c142f23fc5f9c3d7551f083c1fa20/spglib-2.7.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:95e3dd7ef992ff8a88f6ef2e5909aaa60ecb479004cc1f73c1e6285d54227960", size = 911712, upload-time = "2025-12-29T09:48:01.14Z" }, + { url = "https://files.pythonhosted.org/packages/05/61/ab2447bb47fa69934adc2fc2d13f771dedd3b2fd3171c95307446c948f01/spglib-2.7.0-cp314-cp314-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:97e0fcea2db3915bd973fdd2cc0a757b1f99bda71ce815da333d75ad1ffc3eb1", size = 947528, upload-time = "2025-12-29T09:48:03.258Z" }, + { url = "https://files.pythonhosted.org/packages/9d/69/898d9e005131b0b1c7e5dce2b79f36aeb20ec4d3a88cca596b522a0fa4df/spglib-2.7.0-cp314-cp314-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:39b978c08ef2ebc0eaba833c488fc4c0f9b1fc0f50d4a8584f176741eea69376", size = 962474, upload-time = "2025-12-29T09:48:05.617Z" }, + { url = "https://files.pythonhosted.org/packages/c8/56/7b25ee5348722dc93ca245ed950f1a89f8a944906140629055f394c072a4/spglib-2.7.0-cp314-cp314-win_amd64.whl", hash = "sha256:5f334b4b66c8aafd583fafab5b15a56e27efdd2dc6cb1064dfcd0fe59ae130f4", size = 679679, upload-time = "2025-12-29T09:48:15.393Z" }, + { url = "https://files.pythonhosted.org/packages/20/37/eda9a34f25b13e47298fa1b94cc4dfd8b0fcfc46c7d63ea046aa1bf91fe7/spglib-2.7.0-cp314-cp314-win_arm64.whl", hash = "sha256:b032842fc223de46d2ef7d220459e1a61ed90329ac2e72818c605f1fc87451b8", size = 656403, upload-time = "2025-12-29T09:48:17.027Z" }, + { url = "https://files.pythonhosted.org/packages/39/af/1c8d0f98d07969b7fa7323d522732124d88caf4ee3b680ef59120bd7b229/spglib-2.7.0-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:b7e29c796cfdadcc3857aef330acc19b9bc50c83e9911fb23b28390e7c80bae5", size = 920791, upload-time = "2025-12-29T09:48:07.085Z" }, + { url = "https://files.pythonhosted.org/packages/b5/c6/89a3f31f831efc4108a19f110873559990b72186745cd3e151de28b256cc/spglib-2.7.0-cp314-cp314t-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:9b6ca88bb6e604bc8f63efe87b3b2470c2e25f56988b775bd332cefa8866f5c5", size = 946881, upload-time = "2025-12-29T09:48:09.154Z" }, + { url = "https://files.pythonhosted.org/packages/7e/e9/1ca63db2cebd381bd6b27ae309f25d270e70928359a6f0360db09b77894e/spglib-2.7.0-cp314-cp314t-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:50629939a9cd6fa3df5a12f6f025ceb3c78534284f875371574c360e4ccaf5e1", size = 963803, upload-time = "2025-12-29T09:48:12.478Z" }, + { url = "https://files.pythonhosted.org/packages/28/97/459b37c3802633f77c883883c75f5d4429b601ae8d930410b999c4e1dafb/spglib-2.7.0-cp314-cp314t-win_amd64.whl", hash = "sha256:cb77daaf9dd5d48d523a888f37cebd47fa63ff28dfcf1aac2b031b914f9ed55a", size = 696536, upload-time = "2025-12-29T09:48:13.885Z" }, +] + +[[package]] +name = "stack-data" +version = "0.6.3" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "asttokens" }, + { name = "executing" }, + { name = "pure-eval" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/28/e3/55dcc2cfbc3ca9c29519eb6884dd1415ecb53b0e934862d3559ddcb7e20b/stack_data-0.6.3.tar.gz", hash = "sha256:836a778de4fec4dcd1dcd89ed8abff8a221f58308462e1c4aa2a3cf30148f0b9", size = 44707, upload-time = "2023-09-30T13:58:05.479Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/f1/7b/ce1eafaf1a76852e2ec9b22edecf1daa58175c090266e9f6c64afcd81d91/stack_data-0.6.3-py3-none-any.whl", hash = "sha256:d5558e0c25a4cb0853cddad3d77da9891a08cb85dd9f9f91b9f8cd66e511e695", size = 24521, upload-time = "2023-09-30T13:58:03.53Z" }, +] + +[[package]] +name = "starlette" +version = "1.2.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "anyio" }, + { name = "typing-extensions", marker = "python_full_version < '3.13'" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/c5/bf/616a066c2760f6c2b1ae3437cc28149734d069fbb46511712beae118a68c/starlette-1.2.0.tar.gz", hash = "sha256:3c5a6b23fff42492914e93890bb80cbfea72dbf37de268eec06185d62a4ca553", size = 2668923, upload-time = "2026-05-28T11:42:50.568Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/9f/85/492183764d5d01d4514be3730fdb8e228a80605783099551c51627578b5d/starlette-1.2.0-py3-none-any.whl", hash = "sha256:36e0c76ac59157e75dc4b3bdeafba97fb04eaf1878045f15dbef666a6f092ed7", size = 73213, upload-time = "2026-05-28T11:42:48.801Z" }, +] + +[[package]] +name = "structlog" +version = "25.5.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/ef/52/9ba0f43b686e7f3ddfeaa78ac3af750292662284b3661e91ad5494f21dbc/structlog-25.5.0.tar.gz", hash = "sha256:098522a3bebed9153d4570c6d0288abf80a031dfdb2048d59a49e9dc2190fc98", size = 1460830, upload-time = "2025-10-27T08:28:23.028Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/a8/45/a132b9074aa18e799b891b91ad72133c98d8042c70f6240e4c5f9dabee2f/structlog-25.5.0-py3-none-any.whl", hash = "sha256:a8453e9b9e636ec59bd9e79bbd4a72f025981b3ba0f5837aebf48f02f37a7f9f", size = 72510, upload-time = "2025-10-27T08:28:21.535Z" }, +] + +[[package]] +name = "supervisor" +version = "4.3.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/a9/b5/37e7a3706de436a8a2d75334711dad1afb4ddffab09f25e31d89e467542f/supervisor-4.3.0.tar.gz", hash = "sha256:4a2bf149adf42997e1bb44b70c43b613275ec9852c3edacca86a9166b27e945e", size = 468912, upload-time = "2025-08-23T18:25:02.418Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/0e/65/5e726c372da8a5e35022a94388b12252710aad0c2351699c3d76ae8dba78/supervisor-4.3.0-py2.py3-none-any.whl", hash = "sha256:0bcb763fddafba410f35cbde226aa7f8514b9fb82eb05a0c85f6588d1c13f8db", size = 320736, upload-time = "2025-08-23T18:25:00.767Z" }, +] + +[[package]] +name = "sympy" +version = "1.14.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "mpmath" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/83/d3/803453b36afefb7c2bb238361cd4ae6125a569b4db67cd9e79846ba2d68c/sympy-1.14.0.tar.gz", hash = "sha256:d3d3fe8df1e5a0b42f0e7bdf50541697dbe7d23746e894990c030e2b05e72517", size = 7793921, upload-time = "2025-04-27T18:05:01.611Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/a2/09/77d55d46fd61b4a135c444fc97158ef34a095e5681d0a6c10b75bf356191/sympy-1.14.0-py3-none-any.whl", hash = "sha256:e091cc3e99d2141a0ba2847328f5479b05d94a6635cb96148ccb3f34671bd8f5", size = 6299353, upload-time = "2025-04-27T18:04:59.103Z" }, +] + +[[package]] +name = "tabulate" +version = "0.10.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/46/58/8c37dea7bbf769b20d58e7ace7e5edfe65b849442b00ffcdd56be88697c6/tabulate-0.10.0.tar.gz", hash = "sha256:e2cfde8f79420f6deeffdeda9aaec3b6bc5abce947655d17ac662b126e48a60d", size = 91754, upload-time = "2026-03-04T18:55:34.402Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/99/55/db07de81b5c630da5cbf5c7df646580ca26dfaefa593667fc6f2fe016d2e/tabulate-0.10.0-py3-none-any.whl", hash = "sha256:f0b0622e567335c8fabaaa659f1b33bcb6ddfe2e496071b743aa113f8774f2d3", size = 39814, upload-time = "2026-03-04T18:55:31.284Z" }, +] + +[[package]] +name = "terminado" +version = "0.18.1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "ptyprocess", marker = "os_name != 'nt'" }, + { name = "pywinpty", marker = "os_name == 'nt'" }, + { name = "tornado" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/8a/11/965c6fd8e5cc254f1fe142d547387da17a8ebfd75a3455f637c663fb38a0/terminado-0.18.1.tar.gz", hash = "sha256:de09f2c4b85de4765f7714688fff57d3e75bad1f909b589fde880460c753fd2e", size = 32701, upload-time = "2024-03-12T14:34:39.026Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/6a/9e/2064975477fdc887e47ad42157e214526dcad8f317a948dee17e1659a62f/terminado-0.18.1-py3-none-any.whl", hash = "sha256:a4468e1b37bb318f8a86514f65814e1afc977cf29b3992a4500d9dd305dcceb0", size = 14154, upload-time = "2024-03-12T14:34:36.569Z" }, +] + +[[package]] +name = "tinycss2" +version = "1.4.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "webencodings" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/7a/fd/7a5ee21fd08ff70d3d33a5781c255cbe779659bd03278feb98b19ee550f4/tinycss2-1.4.0.tar.gz", hash = "sha256:10c0972f6fc0fbee87c3edb76549357415e94548c1ae10ebccdea16fb404a9b7", size = 87085, upload-time = "2024-10-24T14:58:29.895Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/e6/34/ebdc18bae6aa14fbee1a08b63c015c72b64868ff7dae68808ab500c492e2/tinycss2-1.4.0-py3-none-any.whl", hash = "sha256:3a49cf47b7675da0b15d0c6e1df8df4ebd96e9394bb905a5775adb0d884c5289", size = 26610, upload-time = "2024-10-24T14:58:28.029Z" }, +] + +[[package]] +name = "tornado" +version = "6.5.6" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/50/57/6d7303a77ae439d9189108f76c0c4fd89ee5e2cc8387bffb55232565c4ed/tornado-6.5.6.tar.gz", hash = "sha256:9a365179fe8ff6b8766f602c0f67c185d778193e9bdd828b19f0b6ed7764177d", size = 518139, upload-time = "2026-05-27T15:35:54.646Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/1b/0d/b4f481e18c5a51864e6d12b9a05ecf72919696680b747c958c3fc1f4fbae/tornado-6.5.6-cp39-abi3-macosx_10_9_universal2.whl", hash = "sha256:65fcfaafb079435c2c19dc9e07c0f1cf0fa9051759ed0a7d0a3ba7ea7f64919c", size = 447737, upload-time = "2026-05-27T15:35:38.122Z" }, + { url = "https://files.pythonhosted.org/packages/9e/9c/5430c39fcab1144d35860f457b15e9c08b4bc7ac86764354204e983d6183/tornado-6.5.6-cp39-abi3-macosx_10_9_x86_64.whl", hash = "sha256:38bc01b4acacded2de63ae78023548e41ebe6fbed3ec05a796d7ae3ad893887e", size = 445899, upload-time = "2026-05-27T15:35:40.519Z" }, + { url = "https://files.pythonhosted.org/packages/8b/79/fa7e14a2f939c807a8d30619b4eb604eab219601b78792516ebe22d40cf9/tornado-6.5.6-cp39-abi3-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:b942e6a137fda31ff54bf8e6e2c8d1c37f1f50583f3ed53fb840b53b9601d104", size = 448964, upload-time = "2026-05-27T15:35:42.106Z" }, + { url = "https://files.pythonhosted.org/packages/a7/71/bd67d5f5199f937dafe03a49a37989f60f600ff6fef34c79412a829d97bd/tornado-6.5.6-cp39-abi3-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:8666946e70171b8c3f1fc9b7876fac492e84822c4c7f3746f4e8f8bc9ac92a79", size = 449935, upload-time = "2026-05-27T15:35:43.906Z" }, + { url = "https://files.pythonhosted.org/packages/cc/a4/c24388c9cf5b3c3a513b56a158af9f23092c9a2810d789e294310797df21/tornado-6.5.6-cp39-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:1c34cfab7ad6d104f052f55de06d39bbafc5885cfeb4da688803308dbcfa90b7", size = 449767, upload-time = "2026-05-27T15:35:45.793Z" }, + { url = "https://files.pythonhosted.org/packages/a5/eb/6a07ad550c3f7b37244bd0becdf293ec3d3e961783d8b720a97df50de1b2/tornado-6.5.6-cp39-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:385f35e4e22fb52551dfcda4cdc8c30c61c2c001aef5ddad99cdfe116952efd3", size = 449174, upload-time = "2026-05-27T15:35:47.485Z" }, + { url = "https://files.pythonhosted.org/packages/bb/84/3469e098dccdb6763130e06aacd786bb4363fca7b590a55c101ddf34ed30/tornado-6.5.6-cp39-abi3-win32.whl", hash = "sha256:db475f1b67b2809b10bb16264829087724ca8d24fe4ed47f7b8675cae453ef86", size = 450230, upload-time = "2026-05-27T15:35:49.322Z" }, + { url = "https://files.pythonhosted.org/packages/d2/3c/273a04e0b9dd9016f1685cca0c1c8795a71ac88a34a8c889a0b443483226/tornado-6.5.6-cp39-abi3-win_amd64.whl", hash = "sha256:6739bf1e8eb09230f1280ddbd3236f0309db70f2c551a8dbc40f62babdf82f79", size = 450667, upload-time = "2026-05-27T15:35:51.194Z" }, + { url = "https://files.pythonhosted.org/packages/02/98/0cffe22a224f60c5fb1e3aa0b76f9da2e1ca78b0e9545e3d077c68ce60a7/tornado-6.5.6-cp39-abi3-win_arm64.whl", hash = "sha256:2543597b24a695d72338a9a77818362d72387c03ae173f1f169eadc5c91466ac", size = 449690, upload-time = "2026-05-27T15:35:52.902Z" }, +] + +[[package]] +name = "tqdm" +version = "4.67.3" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "colorama", marker = "sys_platform == 'win32'" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/09/a9/6ba95a270c6f1fbcd8dac228323f2777d886cb206987444e4bce66338dd4/tqdm-4.67.3.tar.gz", hash = "sha256:7d825f03f89244ef73f1d4ce193cb1774a8179fd96f31d7e1dcde62092b960bb", size = 169598, upload-time = "2026-02-03T17:35:53.048Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/16/e1/3079a9ff9b8e11b846c6ac5c8b5bfb7ff225eee721825310c91b3b50304f/tqdm-4.67.3-py3-none-any.whl", hash = "sha256:ee1e4c0e59148062281c49d80b25b67771a127c85fc9676d3be5f243206826bf", size = 78374, upload-time = "2026-02-03T17:35:50.982Z" }, +] + +[[package]] +name = "traitlets" +version = "5.15.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/1b/22/40f55b26baeab80c2d7b3f1db0682f8954e4617fee7d90ce634022ef05c6/traitlets-5.15.0.tar.gz", hash = "sha256:4fead733f81cf1c4c938e06f8ca4633896833c9d89eff878159457f4d4392971", size = 163197, upload-time = "2026-05-06T08:05:58.016Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/da/98/a9937a969d018a23badfea0b381f66783649d48e0ea6c41923265c3cbeb3/traitlets-5.15.0-py3-none-any.whl", hash = "sha256:fb36a18867a6803deab09f3c5e0fa81bb7b26a5c9e82501c9933f759166eff40", size = 85877, upload-time = "2026-05-06T08:05:55.853Z" }, +] + +[[package]] +name = "typing-extensions" +version = "4.15.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/72/94/1a15dd82efb362ac84269196e94cf00f187f7ed21c242792a923cdb1c61f/typing_extensions-4.15.0.tar.gz", hash = "sha256:0cea48d173cc12fa28ecabc3b837ea3cf6f38c6d1136f85cbaaf598984861466", size = 109391, upload-time = "2025-08-25T13:49:26.313Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/18/67/36e9267722cc04a6b9f15c7f3441c2363321a3ea07da7ae0c0707beb2a9c/typing_extensions-4.15.0-py3-none-any.whl", hash = "sha256:f0fa19c6845758ab08074a0cfa8b7aecb71c999ca73d62883bc25cc018c4e548", size = 44614, upload-time = "2025-08-25T13:49:24.86Z" }, +] + +[[package]] +name = "typing-inspection" +version = "0.4.2" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "typing-extensions" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/55/e3/70399cb7dd41c10ac53367ae42139cf4b1ca5f36bb3dc6c9d33acdb43655/typing_inspection-0.4.2.tar.gz", hash = "sha256:ba561c48a67c5958007083d386c3295464928b01faa735ab8547c5692e87f464", size = 75949, upload-time = "2025-10-01T02:14:41.687Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/dc/9b/47798a6c91d8bdb567fe2698fe81e0c6b7cb7ef4d13da4114b41d239f65d/typing_inspection-0.4.2-py3-none-any.whl", hash = "sha256:4ed1cacbdc298c220f1bd249ed5287caa16f34d44ef4e9c3d0cbad5b521545e7", size = 14611, upload-time = "2025-10-01T02:14:40.154Z" }, +] + +[[package]] +name = "tzdata" +version = "2026.2" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/ba/19/1b9b0e29f30c6d35cb345486df41110984ea67ae69dddbc0e8a100999493/tzdata-2026.2.tar.gz", hash = "sha256:9173fde7d80d9018e02a662e168e5a2d04f87c41ea174b139fbef642eda62d10", size = 198254, upload-time = "2026-04-24T15:22:08.651Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/ce/e4/dccd7f47c4b64213ac01ef921a1337ee6e30e8c6466046018326977efd95/tzdata-2026.2-py2.py3-none-any.whl", hash = "sha256:bbe9af844f658da81a5f95019480da3a89415801f6cc966806612cc7169bffe7", size = 349321, upload-time = "2026-04-24T15:22:05.876Z" }, +] + +[[package]] +name = "tzlocal" +version = "5.3.1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "tzdata", marker = "sys_platform == 'win32'" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/8b/2e/c14812d3d4d9cd1773c6be938f89e5735a1f11a9f184ac3639b93cef35d5/tzlocal-5.3.1.tar.gz", hash = "sha256:cceffc7edecefea1f595541dbd6e990cb1ea3d19bf01b2809f362a03dd7921fd", size = 30761, upload-time = "2025-03-05T21:17:41.549Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/c2/14/e2a54fabd4f08cd7af1c07030603c3356b74da07f7cc056e600436edfa17/tzlocal-5.3.1-py3-none-any.whl", hash = "sha256:eb1a66c3ef5847adf7a834f1be0800581b683b5608e74f86ecbcef8ab91bb85d", size = 18026, upload-time = "2025-03-05T21:17:39.857Z" }, +] + +[[package]] +name = "uncertainties" +version = "3.2.3" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/fe/0c/cb09f33b26955399c675ab378e4063ed7e48422d3d49f96219ab0be5eba9/uncertainties-3.2.3.tar.gz", hash = "sha256:76a5653e686f617a42922d546a239e9efce72e6b35411b7750a1d12dcba03031", size = 160492, upload-time = "2025-04-21T19:58:28.63Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/8f/5e/f1e1dd319e35e962a4e00b33150a8868b6329cc1d19fd533436ba5488f09/uncertainties-3.2.3-py3-none-any.whl", hash = "sha256:313353900d8f88b283c9bad81e7d2b2d3d4bcc330cbace35403faaed7e78890a", size = 60118, upload-time = "2025-04-21T19:58:26.864Z" }, +] + +[[package]] +name = "uri-template" +version = "1.3.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/31/c7/0336f2bd0bcbada6ccef7aaa25e443c118a704f828a0620c6fa0207c1b64/uri-template-1.3.0.tar.gz", hash = "sha256:0e00f8eb65e18c7de20d595a14336e9f337ead580c70934141624b6d1ffdacc7", size = 21678, upload-time = "2023-06-21T01:49:05.374Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/e7/00/3fca040d7cf8a32776d3d81a00c8ee7457e00f80c649f1e4a863c8321ae9/uri_template-1.3.0-py3-none-any.whl", hash = "sha256:a44a133ea12d44a0c0f06d7d42a52d71282e77e2f937d8abd5655b8d56fc1363", size = 11140, upload-time = "2023-06-21T01:49:03.467Z" }, +] + +[[package]] +name = "urllib3" +version = "2.7.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/53/0c/06f8b233b8fd13b9e5ee11424ef85419ba0d8ba0b3138bf360be2ff56953/urllib3-2.7.0.tar.gz", hash = "sha256:231e0ec3b63ceb14667c67be60f2f2c40a518cb38b03af60abc813da26505f4c", size = 433602, upload-time = "2026-05-07T16:13:18.596Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/7f/3e/5db95bcf282c52709639744ca2a8b149baccf648e39c8cc87553df9eae0c/urllib3-2.7.0-py3-none-any.whl", hash = "sha256:9fb4c81ebbb1ce9531cce37674bbc6f1360472bc18ca9a553ede278ef7276897", size = 131087, upload-time = "2026-05-07T16:13:17.151Z" }, +] + +[[package]] +name = "wcwidth" +version = "0.7.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/2c/ee/afaf0f85a9a18fe47a67f1e4422ed6cf1fe642f0ae0a2f81166231303c52/wcwidth-0.7.0.tar.gz", hash = "sha256:90e3a7ea092341c44b99562e75d09e4d5160fe7a3974c6fb842a101a95e7eed0", size = 182132, upload-time = "2026-05-02T16:04:12.653Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/41/52/e465037f5375f43533d1a80b6923955201596a99142ed524d77b571a1418/wcwidth-0.7.0-py3-none-any.whl", hash = "sha256:5d69154c429a82910e241c738cd0e2976fac8a2dd47a1a805f4afed1c0f136f2", size = 110825, upload-time = "2026-05-02T16:04:11.033Z" }, +] + +[[package]] +name = "webcolors" +version = "25.10.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/1d/7a/eb316761ec35664ea5174709a68bbd3389de60d4a1ebab8808bfc264ed67/webcolors-25.10.0.tar.gz", hash = "sha256:62abae86504f66d0f6364c2a8520de4a0c47b80c03fc3a5f1815fedbef7c19bf", size = 53491, upload-time = "2025-10-31T07:51:03.977Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/e2/cc/e097523dd85c9cf5d354f78310927f1656c422bd7b2613b2db3e3f9a0f2c/webcolors-25.10.0-py3-none-any.whl", hash = "sha256:032c727334856fc0b968f63daa252a1ac93d33db2f5267756623c210e57a4f1d", size = 14905, upload-time = "2025-10-31T07:51:01.778Z" }, +] + +[[package]] +name = "webencodings" +version = "0.5.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/0b/02/ae6ceac1baeda530866a85075641cec12989bd8d31af6d5ab4a3e8c92f47/webencodings-0.5.1.tar.gz", hash = "sha256:b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923", size = 9721, upload-time = "2017-04-05T20:21:34.189Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/f4/24/2a3e3df732393fed8b3ebf2ec078f05546de641fe1b667ee316ec1dcf3b7/webencodings-0.5.1-py2.py3-none-any.whl", hash = "sha256:a0af1213f3c2226497a97e2b3aa01a7e4bee4f403f95be16fc9acd2947514a78", size = 11774, upload-time = "2017-04-05T20:21:32.581Z" }, +] + +[[package]] +name = "websocket-client" +version = "1.9.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/2c/41/aa4bf9664e4cda14c3b39865b12251e8e7d239f4cd0e3cc1b6c2ccde25c1/websocket_client-1.9.0.tar.gz", hash = "sha256:9e813624b6eb619999a97dc7958469217c3176312b3a16a4bd1bc7e08a46ec98", size = 70576, upload-time = "2025-10-07T21:16:36.495Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/34/db/b10e48aa8fff7407e67470363eac595018441cf32d5e1001567a7aeba5d2/websocket_client-1.9.0-py3-none-any.whl", hash = "sha256:af248a825037ef591efbf6ed20cc5faa03d3b47b9e5a2230a529eeee1c1fc3ef", size = 82616, upload-time = "2025-10-07T21:16:34.951Z" }, +] + +[[package]] +name = "werkzeug" +version = "3.1.8" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "markupsafe" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/dd/b2/381be8cfdee792dd117872481b6e378f85c957dd7c5bca38897b08f765fd/werkzeug-3.1.8.tar.gz", hash = "sha256:9bad61a4268dac112f1c5cd4630a56ede601b6ed420300677a869083d70a4c44", size = 875852, upload-time = "2026-04-02T18:49:14.268Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/93/8c/2e650f2afeb7ee576912636c23ddb621c91ac6a98e66dc8d29c3c69446e1/werkzeug-3.1.8-py3-none-any.whl", hash = "sha256:63a77fb8892bf28ebc3178683445222aa500e48ebad5ec77b0ad80f8726b1f50", size = 226459, upload-time = "2026-04-02T18:49:12.72Z" }, +] + +[[package]] +name = "wrapt" +version = "2.2.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/2d/9f/06263fcd8ad6c405f05a3905fd7a84dd3176eb5ad46e44bccc0cd16348bb/wrapt-2.2.1.tar.gz", hash = "sha256:6744f504375775d7609c82c8d3d94af1c9a6f05586984536905908ba905277b9", size = 127620, upload-time = "2026-05-22T14:49:43.056Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/5f/ac/4370bde262c0e633e6c4f0e56d55095710024cf9a5cecc20c59a10de483c/wrapt-2.2.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:dd57607acc85678925940bd5df0385ff8332083a32fa8d7a43f8767f4997263c", size = 80321, upload-time = "2026-05-22T14:47:43.996Z" }, + { url = "https://files.pythonhosted.org/packages/eb/79/b8ff3a61e71babf58a8cf4c0d63358e8bad383e15bf7f35e62d2f6b6e4a4/wrapt-2.2.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:1ae574d65c9fa8e86f64f6a7c2668f9fcd507b183e0e577619f504b883cb0a6c", size = 81216, upload-time = "2026-05-22T14:47:45.243Z" }, + { url = "https://files.pythonhosted.org/packages/6e/fd/c0cac1f77c9c4f6fe58a920ca632ce379bb8be928720e11e8d73de28a5e9/wrapt-2.2.1-cp311-cp311-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:9a04c28c10ba7fd12842b109d2edb0678872a2fe65277ca4ff06a0d61edee245", size = 159208, upload-time = "2026-05-22T14:47:47.176Z" }, + { url = "https://files.pythonhosted.org/packages/d9/4f/744132a7b2fbefa6b81118ec5942eca5fc2e9a129f9055a0c5e46885a549/wrapt-2.2.1-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:3e2f02472a1cbbf3884b365714a810b5947134a95ad6952b554cb8cce9d492b0", size = 160322, upload-time = "2026-05-22T14:47:49.04Z" }, + { url = "https://files.pythonhosted.org/packages/d6/95/b7cd9a22a06cf93e6482904ee6afc956248983553593fd1009296d1b3b31/wrapt-2.2.1-cp311-cp311-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:ac2745950b2bff80219c15ebf2fa9d8427eba7e249739f97e55c9d169e47e9e1", size = 153243, upload-time = "2026-05-22T14:47:50.386Z" }, + { url = "https://files.pythonhosted.org/packages/4c/4a/eb79423192015f46f0db2872e7e04a3dde8d359b83411e8959e7c9287eaa/wrapt-2.2.1-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:67a97e5b6c457f0cd3cfc19ebb2d84463e60c3ece754cc831e4281a3ca29bb18", size = 159231, upload-time = "2026-05-22T14:47:51.753Z" }, + { url = "https://files.pythonhosted.org/packages/ec/dc/435015b58ce33c6fc4104158fa91ddb0e809ab03a5751fb7465d1d461456/wrapt-2.2.1-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:c803a3d331796255af51ba2c79ed0ac8275865b516c09e61f248d1e7aff31ce9", size = 152351, upload-time = "2026-05-22T14:47:53.214Z" }, + { url = "https://files.pythonhosted.org/packages/77/ac/5d203f98df8fd136b95c5227139aea02d34505e18baf812d0c005df61963/wrapt-2.2.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:9b984d1eb252145d6302c1dbd5e87fc6d404d45531447c84eadec04bf1fcb027", size = 158347, upload-time = "2026-05-22T14:47:54.982Z" }, + { url = "https://files.pythonhosted.org/packages/52/2f/a92427dbdc74e54c1674abbed27e61b2cb5e7a94441b8c1270c70671d928/wrapt-2.2.1-cp311-cp311-win32.whl", hash = "sha256:8a983a603a18c8708f024f7f6991b2e66159219abbf894634c5056243c55f3cd", size = 77562, upload-time = "2026-05-22T14:47:56.275Z" }, + { url = "https://files.pythonhosted.org/packages/c8/56/987b9c13b3e1c1a3c6de71284076f996b79caec90e75a87c044a40c23db9/wrapt-2.2.1-cp311-cp311-win_amd64.whl", hash = "sha256:9c210a6994b21aa9b29e81c8d11560e8fdab54c117e9cff37870d0a27bde1343", size = 80616, upload-time = "2026-05-22T14:47:57.854Z" }, + { url = "https://files.pythonhosted.org/packages/7e/25/d01f560888d99d94a959c85533de349ce68d71ace3f2591d6ea8f632cfed/wrapt-2.2.1-cp311-cp311-win_arm64.whl", hash = "sha256:401229e9d63ca09f9b8891ecf83798d26c11bbb445d11ed9f1836b6d4585b38a", size = 79025, upload-time = "2026-05-22T14:47:59.089Z" }, + { url = "https://files.pythonhosted.org/packages/89/0c/bfae7b9401583b6d05938cd16dedc43857d96da2f8a3d50d78cc515bf6ff/wrapt-2.2.1-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:3ffad790d9d11d8ecf9f17c4bb671a5b4089e4d8b575c46c5129597f41f836b0", size = 81021, upload-time = "2026-05-22T14:48:00.313Z" }, + { url = "https://files.pythonhosted.org/packages/26/58/80f6a6599f933f4caecc1cb3ee88a04faf81e8b9bddbd6109c688dd63e0f/wrapt-2.2.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:628f5220c7a904d5fc78f7075c8d7871433eb6d035c94728a22fdf85f193d2a8", size = 81692, upload-time = "2026-05-22T14:48:01.49Z" }, + { url = "https://files.pythonhosted.org/packages/17/93/fb357cc7847c58a8ae790be718903afa81a28d23e642c843dc4129e8a0b2/wrapt-2.2.1-cp312-cp312-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:61acce4257a9883669703c525447c5b4c392edf0f987ae77ec32668440158f0e", size = 169364, upload-time = "2026-05-22T14:48:02.791Z" }, + { url = "https://files.pythonhosted.org/packages/aa/0b/76b601ee309a8bd556af0eecb184394c20b3c49aa9c8e085aa1ffacc2568/wrapt-2.2.1-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:727ab4244622cd6ad2390f322642090c877d2e83a608d2653a7643ae5368d926", size = 171079, upload-time = "2026-05-22T14:48:04.22Z" }, + { url = "https://files.pythonhosted.org/packages/cd/87/ee3f32d5658e3e26d3e0e457922b47a36dd3bfbdfee7f97bb3e802344a66/wrapt-2.2.1-cp312-cp312-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:03df9ebed4c73ab93fa8c07e3d41d818dfca1852b15731a3de59457b27814624", size = 160205, upload-time = "2026-05-22T14:48:05.553Z" }, + { url = "https://files.pythonhosted.org/packages/b1/d0/ae2fd64277a67f5d7bffcf2d05eea1e476263fb2a072baf0b0129ab85984/wrapt-2.2.1-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:0d9ff006f420b2ec8296aa56ade43ea7da3e997e85769f0aafc5e0661aacb710", size = 168922, upload-time = "2026-05-22T14:48:07.132Z" }, + { url = "https://files.pythonhosted.org/packages/b1/f3/2d541a060c5bbafb9400bca4917e4d78bfd1f239f404782c86831a8f6b29/wrapt-2.2.1-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:844c858fc3bb7eacc0ba8efa904935d16aac6a4470948ad1e7e55c9f5a2a665f", size = 158388, upload-time = "2026-05-22T14:48:08.629Z" }, + { url = "https://files.pythonhosted.org/packages/1d/68/8d92c8800c57e93cb116ae9e9d6cbafc34fade5ee9f9107b6f203fb4dc35/wrapt-2.2.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:87bacdaf225117a342a20d9c03438d701c02112f6e3f351ce9b7f32354f14797", size = 167682, upload-time = "2026-05-22T14:48:10.042Z" }, + { url = "https://files.pythonhosted.org/packages/30/72/83ea3790ea352439442349388e29ff07b76e0686265f9088bbb505d1608d/wrapt-2.2.1-cp312-cp312-win32.whl", hash = "sha256:2f8c90c8afde51969487be4e1343ae049b268854877d415c2510baf833775052", size = 77857, upload-time = "2026-05-22T14:48:11.782Z" }, + { url = "https://files.pythonhosted.org/packages/ef/cb/99450668dd3502d62a54a1c8aa56e44f34cb8c1261b381cfe2e7926c3b75/wrapt-2.2.1-cp312-cp312-win_amd64.whl", hash = "sha256:6ce32763ac31ce94fe9aada947e479b1975012bff166da409b4b9e4e376cf7e5", size = 80825, upload-time = "2026-05-22T14:48:13.046Z" }, + { url = "https://files.pythonhosted.org/packages/e6/3a/87512881be64e743f9ee4c66f4cbe8e884974bef2a5989af71f999653ac7/wrapt-2.2.1-cp312-cp312-win_arm64.whl", hash = "sha256:8d1b4d0e0c2119587a31f5c029abd547e0c81d93b89d394566fe1588659eb579", size = 79087, upload-time = "2026-05-22T14:48:14.323Z" }, + { url = "https://files.pythonhosted.org/packages/88/d1/a1b08f8f4fac8cbb156fa51cf64ee2c7f7f74f9875ba3cf70b3c58368694/wrapt-2.2.1-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:d2beb1c7cab10603aecdc42f8edd6ff013f9a32e4543474e38e6b77ce9975aeb", size = 80831, upload-time = "2026-05-22T14:48:15.598Z" }, + { url = "https://files.pythonhosted.org/packages/54/ce/57890814991446a845e09b3445ce8b694f27eb0577004f2c2a36a9772ed4/wrapt-2.2.1-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:e0cb7e4dd71f4c32e5e84843cd3c4cd65dda034314004bbe1d7f99af2426ab80", size = 81375, upload-time = "2026-05-22T14:48:17.071Z" }, + { url = "https://files.pythonhosted.org/packages/38/65/08d7a6c76ac4493bdb668205ee9c1de1bd5daca61717c3e9aa49b4c01499/wrapt-2.2.1-cp313-cp313-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:95821352042722cd9f1108874579a47989d0a7e12a37d87d2fc4af20fd99ab8a", size = 167417, upload-time = "2026-05-22T14:48:18.303Z" }, + { url = "https://files.pythonhosted.org/packages/62/ce/f1ccbee7a1bfe5cdc6b3da6bab4b45713d628b9294da32a39f563d648140/wrapt-2.2.1-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:abd621552ede77c4c69be7fac44ba911225b0c812b6ba604e5964cf98085b474", size = 166948, upload-time = "2026-05-22T14:48:19.768Z" }, + { url = "https://files.pythonhosted.org/packages/86/2a/f85d48d1cd4869aee6704028d257d740a47c1c467b457ce396b4b5b55d07/wrapt-2.2.1-cp313-cp313-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:e3677c7146ce694874941ba82b57092cc4875445aadf29d72807351023105143", size = 158148, upload-time = "2026-05-22T14:48:21.96Z" }, + { url = "https://files.pythonhosted.org/packages/fe/5c/93939ad11d4a12358ab1aab219a2ef5efa5612e0db6b9fc65af8af1a891b/wrapt-2.2.1-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:9a5934eaea872e17936b5f45501eba5ab0bce9a74122e172b663d7c28c459c4a", size = 165905, upload-time = "2026-05-22T14:48:23.373Z" }, + { url = "https://files.pythonhosted.org/packages/e0/22/b8c2aa89862ff58605934d7abf4b70e6a5a1c33df96656f49035ccdf1c8a/wrapt-2.2.1-cp313-cp313-musllinux_1_2_riscv64.whl", hash = "sha256:f5b9daf6b629fce418e0cc3dd0436eac045188fa35deadb7a7f3941d5b8203f9", size = 156712, upload-time = "2026-05-22T14:48:24.767Z" }, + { url = "https://files.pythonhosted.org/packages/5d/78/bf00a7b02239c12bb02ddcc3c0b971bfcc36e578c5a44f1ccfef5b458545/wrapt-2.2.1-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:f53ac9f3ef573326d009ed809beff4efcac6451931c2b8132586da4b9e53ff31", size = 166560, upload-time = "2026-05-22T14:48:26.83Z" }, + { url = "https://files.pythonhosted.org/packages/fe/93/6390ca9c5b787683cef588d04f57c8d41b9a2323b5597a65f18638c90ef2/wrapt-2.2.1-cp313-cp313-win32.whl", hash = "sha256:1ffa9cfd4bdb581539951b14ae661ff20ed0c3599b3e911a131ee0ec5ac11337", size = 77817, upload-time = "2026-05-22T14:48:28.221Z" }, + { url = "https://files.pythonhosted.org/packages/97/73/ce10f0e71c0cfaa1a65faadb8efd4852028b3bb9ba28932b8889df769d38/wrapt-2.2.1-cp313-cp313-win_amd64.whl", hash = "sha256:368eac1e20fd0bb03dd3cc42bf9887154c3861b60989389ccb5fac032617d215", size = 80736, upload-time = "2026-05-22T14:48:30.139Z" }, + { url = "https://files.pythonhosted.org/packages/c7/4c/89f4a6818fafbbd840330e4fa3873073e1bfc166133a64cac7f8fde7a5e3/wrapt-2.2.1-cp313-cp313-win_arm64.whl", hash = "sha256:c754dafdf5aaf0b401b644a90a30046929a0dd1a536e0ff0ec959a59155d9c7f", size = 79099, upload-time = "2026-05-22T14:48:31.405Z" }, + { url = "https://files.pythonhosted.org/packages/bf/f2/9a8741c46f8c208ac0a45b25ba170bcb4fb72a2781d5fb97dbd7b6be73cb/wrapt-2.2.1-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:ed928d0fda15fc0adc8d13305c8b3c0f2fba5b0669950c9e6d019d9162a3b3e8", size = 82802, upload-time = "2026-05-22T14:48:33.307Z" }, + { url = "https://files.pythonhosted.org/packages/9c/0d/e9c855716a3705eef1416456bdf062b60620726fdc59428ff670fc3c60dc/wrapt-2.2.1-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:fafb4e739e43544d12cb4abd1605fd4683b6ca6a9ad682b7fd8f4d21973eafa8", size = 83329, upload-time = "2026-05-22T14:48:34.593Z" }, + { url = "https://files.pythonhosted.org/packages/3b/d6/a88f1c13112b7831adac75cea65d8310e0d696d570c8961844c90a57b865/wrapt-2.2.1-cp313-cp313t-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:74d6a0c31472fe5d814917266b9f46495d7c61ed890af08b468acea92fb89a8d", size = 202937, upload-time = "2026-05-22T14:48:35.859Z" }, + { url = "https://files.pythonhosted.org/packages/42/65/e29d54aef06a4d898a5b8a25589a0b3769bde454f922fad8f6f89fbfb650/wrapt-2.2.1-cp313-cp313t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:ab5be648d5a0b86b7438864f8df3c705a65cef35a2fd3e5561e3e203167e0f27", size = 209997, upload-time = "2026-05-22T14:48:38.153Z" }, + { url = "https://files.pythonhosted.org/packages/2a/91/e4454263516cf0e12640912fbca9a83654e424f0a6ddb79f5cd7ce14bf33/wrapt-2.2.1-cp313-cp313t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:9d8f204c8e3a8bf9ece17e0a83d137fd807440977f8a5e762d59306795011440", size = 194856, upload-time = "2026-05-22T14:48:39.69Z" }, + { url = "https://files.pythonhosted.org/packages/de/d0/fe0ee202286afdf4a7f77dd29f195703145764d572aec209c5086e57d924/wrapt-2.2.1-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:d047f6498c973874ba08ac3f97c69a2c4b2211c8de6f4c205f75cb1c9522596e", size = 205654, upload-time = "2026-05-22T14:48:43.456Z" }, + { url = "https://files.pythonhosted.org/packages/23/b6/87d860dfc6460c246af70b1fd5c8b76df77571b42a493459423ded94fd7d/wrapt-2.2.1-cp313-cp313t-musllinux_1_2_riscv64.whl", hash = "sha256:7a4fdb9326aab4a5a477a1640e5ad786a8495901009d7e7b038371edd23a9d2b", size = 192206, upload-time = "2026-05-22T14:48:44.858Z" }, + { url = "https://files.pythonhosted.org/packages/df/46/3eea8cde077d985f239a38c0257087b8064fd9ee9b1a99e282d2c86da4ef/wrapt-2.2.1-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:c8cc5094b08abeae52da9c73c8a32003623be691a5193df2f4e3eac3d557c394", size = 198428, upload-time = "2026-05-22T14:48:46.319Z" }, + { url = "https://files.pythonhosted.org/packages/18/dc/b927ee9c7fc67adc3a5658f246a0d275425eb840ba36e7b702e70f18bde8/wrapt-2.2.1-cp313-cp313t-win32.whl", hash = "sha256:9907a4402ab6db12b7077a0ea5d7a4d028ecb22c8eee2b53527080d347cd1562", size = 79448, upload-time = "2026-05-22T14:48:47.901Z" }, + { url = "https://files.pythonhosted.org/packages/ec/b3/fd30b473fe498c70e6b9a5f328b8d3fbaf1b8c3c481465f59724bba8eb70/wrapt-2.2.1-cp313-cp313t-win_amd64.whl", hash = "sha256:5590d63f5243251641cf543009b4c9314a79d0598fdb8a8e4cfc918494536c53", size = 83021, upload-time = "2026-05-22T14:48:49.201Z" }, + { url = "https://files.pythonhosted.org/packages/ee/f3/96c39153a8737a6e9aa85adef254ac4195bea3f2d24efc60472ccc3c9e2e/wrapt-2.2.1-cp313-cp313t-win_arm64.whl", hash = "sha256:c318a64b53d97b841d7b5e637517e50a27be64bc695128422953d4b21710954e", size = 80295, upload-time = "2026-05-22T14:48:50.479Z" }, + { url = "https://files.pythonhosted.org/packages/0a/a3/11d7f34ebbf3231bc907a3e6d5ee051b14d034c1bc7b65a97d5cc00516df/wrapt-2.2.1-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:6f56a647e4eaf5f0ca40330fb070f566bdf9f7b0db89a1af20d71c28dcd7a0ab", size = 80879, upload-time = "2026-05-22T14:48:51.802Z" }, + { url = "https://files.pythonhosted.org/packages/13/3c/b74cfd984cef560b900fb1a727af20352d89e1f06bf2e1114dd3f00f5f5a/wrapt-2.2.1-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:64b7deeda4b70408e382328d8bbe52a256fe9bc63ae3db86d804608367e5422c", size = 81462, upload-time = "2026-05-22T14:48:53.18Z" }, + { url = "https://files.pythonhosted.org/packages/15/a3/7c8f704b8dc07dfe0a5d01c2edbfd88317aa8e5e3fa7c743eb7a085ae767/wrapt-2.2.1-cp314-cp314-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:b9cf53ba90717db2e292401de290776c498d4bbfb0d4a559ca2895db8b9dcb5c", size = 167251, upload-time = "2026-05-22T14:48:54.562Z" }, + { url = "https://files.pythonhosted.org/packages/80/85/a34d1888d97247da6c2ff6118c3a721c73ed8cc4dd198c00208bb73b6f80/wrapt-2.2.1-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:cf3638274ab9d9b724c9baa0b4c04e132cd6faefb78b4dd3dd1a02a4bdaad41e", size = 166316, upload-time = "2026-05-22T14:48:56.065Z" }, + { url = "https://files.pythonhosted.org/packages/e9/d7/72ffaeb01eebc704afe3fb99e840480f4bda45f0fa66e3381b6a39251c8f/wrapt-2.2.1-cp314-cp314-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:aed9658797d0b45d6c49adcfc6b41f66e6f2d0c6de3ec79e16cf4b1855df240f", size = 157952, upload-time = "2026-05-22T14:48:57.924Z" }, + { url = "https://files.pythonhosted.org/packages/24/5b/36f5d6b024e4edfdd90b140742d11ebcf7836daf5c9daf326c55c24db412/wrapt-2.2.1-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:1d676ee388bc42a04d56dd7deb5605244dac2e35cc2fadbb43c9fa25bbd93508", size = 166130, upload-time = "2026-05-22T14:48:59.384Z" }, + { url = "https://files.pythonhosted.org/packages/81/06/9296d9e97bfdef5483dfcc859d57b095b257144b2bc5300ab521e06f4bc7/wrapt-2.2.1-cp314-cp314-musllinux_1_2_riscv64.whl", hash = "sha256:e395f7bc31851ef9b612050368cb446e9bc14cd7454b025018980349caf25ae5", size = 156604, upload-time = "2026-05-22T14:49:00.921Z" }, + { url = "https://files.pythonhosted.org/packages/53/37/16953929ed6776175720e58fc966e779926d8d71e2c7b2273230590ca71f/wrapt-2.2.1-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:5f1845c2a8cc1180ccccfa45785dd06f562730d19ef75be180334254012b6283", size = 166007, upload-time = "2026-05-22T14:49:02.332Z" }, + { url = "https://files.pythonhosted.org/packages/b9/73/20ee58c0612dae7c31131a7095345812ed2c7b389019e175f68cde34e5b4/wrapt-2.2.1-cp314-cp314-win32.whl", hash = "sha256:436addbc4bb4fc0a88c702577f51195d7d73683a7f3e0e5b253d8404d7847243", size = 78327, upload-time = "2026-05-22T14:49:03.722Z" }, + { url = "https://files.pythonhosted.org/packages/22/b3/ef7c3295d02e0448a71c639a36a057f46d524d057c9486291a7a3039e65c/wrapt-2.2.1-cp314-cp314-win_amd64.whl", hash = "sha256:50972a1d974ea07725a7f6b1cec5f8759008afd030a0024843ebe7d52de47f2b", size = 81144, upload-time = "2026-05-22T14:49:05.093Z" }, + { url = "https://files.pythonhosted.org/packages/ac/dc/7bdf336953f99f4ceb0a584bb8870e42c8f26f93ea10c87834dad62f1668/wrapt-2.2.1-cp314-cp314-win_arm64.whl", hash = "sha256:1c9934ea5d92957e3cd0adbc0845539dccfd62710ebe16195a8c66c53954db36", size = 79569, upload-time = "2026-05-22T14:49:06.413Z" }, + { url = "https://files.pythonhosted.org/packages/6a/6d/6dfae80150ff1919c356d1dd528f049bcdfaae29b4d284bc957e022caef4/wrapt-2.2.1-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:17de18fc12cea55b8a9587314cb830573e37fb33b247a7515696350863714188", size = 82892, upload-time = "2026-05-22T14:49:07.925Z" }, + { url = "https://files.pythonhosted.org/packages/82/7b/4e34766a7d7804ffce9e71befe47e9b3225dc350c49c94493c4ab39fd3a5/wrapt-2.2.1-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:a9dec1aca52dddde7df94818310fa2fe79739c8f385b2014c4cb1035f5508199", size = 83333, upload-time = "2026-05-22T14:49:09.257Z" }, + { url = "https://files.pythonhosted.org/packages/9d/57/0b34db3e8de44ccfece62d7b337abd1631dd810f5adc5f3db571727836b5/wrapt-2.2.1-cp314-cp314t-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:69f2e9244542cb34dd59c7f073445b9e54ad9f3fce8d93606c368a1b499fc413", size = 202899, upload-time = "2026-05-22T14:49:10.572Z" }, + { url = "https://files.pythonhosted.org/packages/e5/45/ac0c459f154b99d92789a6cba7ca727185b83513b986f8ec7fe2aacddcbf/wrapt-2.2.1-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:2d83966dc7f4f45e8b97b5933685ac2e6e67fc0e19246ea314bceb9a8970c956", size = 209986, upload-time = "2026-05-22T14:49:12.229Z" }, + { url = "https://files.pythonhosted.org/packages/b7/e4/77e37ff33ad018fa81ade52c25fa327b80b56f81d734279a63614fcb4cbc/wrapt-2.2.1-cp314-cp314t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:78b0aa6bfb7be8deed0ab23e7aa028cc5210c29bc2d32a04d52b50e517a7307e", size = 194893, upload-time = "2026-05-22T14:49:14.139Z" }, + { url = "https://files.pythonhosted.org/packages/dd/9d/7ea651d1ab032fc5fa222fbec91d0f8a1397f6ae04ebb93fa7219aa921d7/wrapt-2.2.1-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:05d5cb74d1b232ec8cfa130a8f900708699ff2491d97b8f85a4cdc5996294b85", size = 205636, upload-time = "2026-05-22T14:49:15.714Z" }, + { url = "https://files.pythonhosted.org/packages/09/af/8e88031a701275b9085c54e64bc88c0b1cd55c77eadd400691c371cd76c4/wrapt-2.2.1-cp314-cp314t-musllinux_1_2_riscv64.whl", hash = "sha256:f6518b94edb9150452e9aba08027d4cc293433753ec1fbefb4629a21cbc74181", size = 192267, upload-time = "2026-05-22T14:49:17.283Z" }, + { url = "https://files.pythonhosted.org/packages/bf/a8/e657ca876b06710194f243d81c4b0896ade646e244bdbec2d87c8c56a8bd/wrapt-2.2.1-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:ed55af48b3eb28f43228ca2306788892bcb629eb2b5c4876e2a3659872c2f17a", size = 198378, upload-time = "2026-05-22T14:49:18.785Z" }, + { url = "https://files.pythonhosted.org/packages/c8/59/822efe4ea722a3961331bfa35b7d90937790d2c20f0616de1997ccc3aebd/wrapt-2.2.1-cp314-cp314t-win32.whl", hash = "sha256:2e08688ab16525897da6589d56d0aebaf417bbe91c2d8e3b96203b1efa596e85", size = 80226, upload-time = "2026-05-22T14:49:20.264Z" }, + { url = "https://files.pythonhosted.org/packages/ab/31/2a7dc5f6abb2fca0b6e1610e120419f603650aceb4f1d3ac4cae0354e162/wrapt-2.2.1-cp314-cp314t-win_amd64.whl", hash = "sha256:fd0135d34387f5fd087d9be368ea77ea89cf2451dc1cd1c622d35021bcb3ab50", size = 83835, upload-time = "2026-05-22T14:49:21.634Z" }, + { url = "https://files.pythonhosted.org/packages/9f/c0/782b86e28d1ceebeb74cccea12d2cd3d2ba0bd68e3dec20b1bc5873f6127/wrapt-2.2.1-cp314-cp314t-win_arm64.whl", hash = "sha256:f70db64e8266d7c45d3b735f2e08eeb434b5e03da9a479ae42b2e2e486a21a00", size = 80722, upload-time = "2026-05-22T14:49:23.59Z" }, + { url = "https://files.pythonhosted.org/packages/53/46/29ac9daf11a86c22a8c38cd9236c62928ccae83f7ceb06bd3b0467cf9d05/wrapt-2.2.1-py3-none-any.whl", hash = "sha256:3aafea2975caef8ca49400640dde02cc7426e798f24870ed01f490bc3cffd32f", size = 61000, upload-time = "2026-05-22T14:49:41.593Z" }, +] + +[[package]] +name = "zope-event" +version = "6.2" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/93/41/faa10af34d48d9cd6fa0249a1162943ad84a9590bd1a06939981e6640416/zope_event-6.2.tar.gz", hash = "sha256:b97d5d6327067ee6b9dfcbdf606ade9ade70991e19c162e808ea39e5fcf0f8d3", size = 18958, upload-time = "2026-04-28T06:24:10.578Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/9e/33/848922889e946d4befc415c219fe516af75c49555d8e736e183bfd30db42/zope_event-6.2-py3-none-any.whl", hash = "sha256:5e755153ac4faf64c10a4b6dd3307680166a3edf65b38df22df592610f8fa874", size = 6525, upload-time = "2026-04-28T06:24:09.176Z" }, +] + +[[package]] +name = "zope-interface" +version = "8.5" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/08/dc/50550cfcbb2ea3cbca5f1d7ed05c8aa840f831a0f2d63aec0a953f7c590e/zope_interface-8.5.tar.gz", hash = "sha256:7a3ba1c5877f0f3e3906b02ddf793abed2becc2948116414ce0e1dd820b68d6d", size = 257957, upload-time = "2026-05-26T06:50:14.574Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/ce/f1/83ad110fb847413affe71609bb50e59e1aa082e1236030122227c7c283d3/zope_interface-8.5-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:afc66ccaef2a3c0bef6ca02aad40d29a39276389dad16a8eac36f9f385e4d057", size = 211426, upload-time = "2026-05-26T06:49:12.595Z" }, + { url = "https://files.pythonhosted.org/packages/bb/a7/6b6e0c31ac240cb9fc015ae9ed45ca54be886c18fcf7bfa2377a4d7a8785/zope_interface-8.5-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:c28044972187245d7a309e4699319bfdbd2ffcbf7176d1d4ddf5adffb2dea80f", size = 211850, upload-time = "2026-05-26T06:49:14.474Z" }, + { url = "https://files.pythonhosted.org/packages/37/36/7599ecabcf80ce4fef2e1ef3c5ac0d4696b61f03f724cc44022f4d226af9/zope_interface-8.5-cp311-cp311-manylinux1_i686.manylinux2014_i686.manylinux_2_17_i686.manylinux_2_5_i686.whl", hash = "sha256:03bbecc7982af713d7499d4084bc03916413d17ffd45f89009348cc0c1d9e376", size = 260711, upload-time = "2026-05-26T06:49:16.568Z" }, + { url = "https://files.pythonhosted.org/packages/03/3e/1774b0ee46ccbb5498ee3c33ece40315b6ef58bc71957be94bd345340bc1/zope_interface-8.5-cp311-cp311-manylinux1_x86_64.manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:bf917009a4a7457c7290225a019f4a0aa706d96accd2cfdba2418d3bc1fcde2f", size = 265277, upload-time = "2026-05-26T06:49:18.656Z" }, + { url = "https://files.pythonhosted.org/packages/b6/09/e533b2ffabaae4e5d5730d6768a591cf335defe8e37bec2ad905d09be656/zope_interface-8.5-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:31cff25b2aaedb5267e6e77b1e9be6b0ec4f622032de8a069202b8ffacda7dc2", size = 266369, upload-time = "2026-05-26T06:49:20.174Z" }, + { url = "https://files.pythonhosted.org/packages/49/4a/3ebe6a4c122b2d5340db45cbe7e490663d3228b172710ec71060cd5d541e/zope_interface-8.5-cp311-cp311-win_amd64.whl", hash = "sha256:17a3114bbdddb5e75e5784cdf318944636190cbbc72d357ef9fb1a8b0351f955", size = 215161, upload-time = "2026-05-26T06:49:21.799Z" }, + { url = "https://files.pythonhosted.org/packages/d2/59/056ad97af5b16db1975ee98ec7ab03d2ce3f3355efad904ced1dbce0e39f/zope_interface-8.5-cp311-cp311-win_arm64.whl", hash = "sha256:aab6bb5bee10f38ea688b95ba054396b67f613552d2c8378be7fcb2d2fba7646", size = 213481, upload-time = "2026-05-26T06:49:25.085Z" }, + { url = "https://files.pythonhosted.org/packages/97/cc/b84123a948f3162a34623e188922827cd845244fdd043ed20f8d02228caa/zope_interface-8.5-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:8e6ee90c2e6de7c37058d5fa41f123c8b13a312db8d1e0fb5840d7f4bcdff9c9", size = 212165, upload-time = "2026-05-26T06:49:26.566Z" }, + { url = "https://files.pythonhosted.org/packages/4e/78/cbceec44f1b27208a76c1a688c131302685852406a23df5aab68324109cc/zope_interface-8.5-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:c1adc90d3576b3b4c4de4953e6002c37bef28b78d7fa54c1bbfd0c50f022fe7c", size = 212341, upload-time = "2026-05-26T06:49:28.182Z" }, + { url = "https://files.pythonhosted.org/packages/e1/c3/005032195ff3b210c139b7c560ed5c534e844b0907d8e44d2b3d8919305e/zope_interface-8.5-cp312-cp312-manylinux1_i686.manylinux2014_i686.manylinux_2_17_i686.manylinux_2_5_i686.whl", hash = "sha256:e6347b8d8d12c5eca6502450a92be30079b7acfade2c4f693efa0deb8871b06e", size = 265296, upload-time = "2026-05-26T06:49:29.741Z" }, + { url = "https://files.pythonhosted.org/packages/c5/66/1036543d6a66bc04c19df3cf650f3ad938a002ab0a443c24e23e8de5e8b9/zope_interface-8.5-cp312-cp312-manylinux1_x86_64.manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:5e970dabea777a24b0b0bbf9dae3ab75ce8b2d8e948edf4875627034b21f3560", size = 270689, upload-time = "2026-05-26T06:49:31.767Z" }, + { url = "https://files.pythonhosted.org/packages/30/4c/8b56259558cace4414e753ca6740396a1f59d4a95ddb55b4658600408670/zope_interface-8.5-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:f0b48ccadaa9839e09ff81e969703cecb3f402c813bfe8b958652e699bea69f5", size = 270280, upload-time = "2026-05-26T06:49:33.489Z" }, + { url = "https://files.pythonhosted.org/packages/f9/ea/649908c83aa8fdb7faf2ddca4d3cf6fb8f2157121267dc56e8f72681e26c/zope_interface-8.5-cp312-cp312-win_amd64.whl", hash = "sha256:e0e311f1277468c08fd59a2b41f71b43d25dff639789d364747acd1705c0df6e", size = 215019, upload-time = "2026-05-26T06:49:35.607Z" }, + { url = "https://files.pythonhosted.org/packages/9f/97/da13037b4c563e4df32eedbc819f8c00b754af494f68211e3dffd48d52da/zope_interface-8.5-cp312-cp312-win_arm64.whl", hash = "sha256:652b73107a04159ec6c020db6c1543d4f1e8f4d069bd2aac88a947820923517b", size = 213569, upload-time = "2026-05-26T06:49:37.317Z" }, + { url = "https://files.pythonhosted.org/packages/f4/8c/4c15755d701f2ec0e80d64a18e1ebaf5be2c584c0ec153fd516f5d13eada/zope_interface-8.5-cp313-cp313-macosx_10_9_x86_64.whl", hash = "sha256:28e80457c134d1fa57a7d758004dece348654e1b1467ac22dcdc20fc1d127c52", size = 212512, upload-time = "2026-05-26T06:49:38.996Z" }, + { url = "https://files.pythonhosted.org/packages/9a/2e/4360c54c465db042cc8fbeeec92abac28b4cedbf6ba63c1f092fd08a190f/zope_interface-8.5-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:09495ce9d559c06b70f2d4855b3e4f48a822a9ddc8be1d30c5b4e5be14ae1ace", size = 212541, upload-time = "2026-05-26T06:49:41.186Z" }, + { url = "https://files.pythonhosted.org/packages/aa/a5/692a2b8d70f78e848793231d5fae5fecbf8d0cccd73430fdc34802a6d3c1/zope_interface-8.5-cp313-cp313-manylinux1_i686.manylinux2014_i686.manylinux_2_17_i686.manylinux_2_5_i686.whl", hash = "sha256:7849ad8fa90763cc1087f4dda78ca3a233e950b3e08fac7079297c9cafbbd7bb", size = 265191, upload-time = "2026-05-26T06:49:43.449Z" }, + { url = "https://files.pythonhosted.org/packages/70/8d/454a9cfc7a050c394ab4f11b3371f7897828b7415e096afff724637e65e0/zope_interface-8.5-cp313-cp313-manylinux1_x86_64.manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:5578c9421ca409a1f39f153d6f7803e4cde01da592ec75a9ac5e1b777d18d33b", size = 270626, upload-time = "2026-05-26T06:49:45.425Z" }, + { url = "https://files.pythonhosted.org/packages/51/8c/db8409cfa3575b8e9b4800babd7d49f8228433cd1f0c56814bd0ada49c33/zope_interface-8.5-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:e1bd7d96b4ca5fa311f54c9eac16dce4886b428c1531dbe06067763ccdf123b4", size = 270444, upload-time = "2026-05-26T06:49:47.025Z" }, + { url = "https://files.pythonhosted.org/packages/4a/df/a386940e41469ef615e100a216d8b386521e9e598817147f87932ca203c4/zope_interface-8.5-cp313-cp313-win_amd64.whl", hash = "sha256:0c8123d2a4dfde2a613c7cb772605477724782c20bc2e0ad1d9435376a6a44a3", size = 215021, upload-time = "2026-05-26T06:49:48.478Z" }, + { url = "https://files.pythonhosted.org/packages/89/75/477eb5669b6b2a7a843decd1a075e9b1971a8720017654143a7183abd3d9/zope_interface-8.5-cp313-cp313-win_arm64.whl", hash = "sha256:6d02be14f3173c6c7288bc2fdf530090c01c3cf8764ad46c68024686f364278e", size = 213610, upload-time = "2026-05-26T06:49:50.01Z" }, + { url = "https://files.pythonhosted.org/packages/d4/19/5032e954827fdf02db2d2f49737ac4378bb9cfc2cd95a8f2e2a5ae2ec01a/zope_interface-8.5-cp314-cp314-macosx_10_9_x86_64.whl", hash = "sha256:ffaecf013251a89d0de6feb49a46eba48ad8cbbf8a40aeb6045e459e7bec6784", size = 212597, upload-time = "2026-05-26T06:49:51.63Z" }, + { url = "https://files.pythonhosted.org/packages/f1/53/3ef644012cf8a6a234a2d6134aab5a5c65ac5467c86296865501d4fbc406/zope_interface-8.5-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:126fa9d1c52295ae076d4cf968634f0a1826afa408a20808b57ff72877b8f69f", size = 212626, upload-time = "2026-05-26T06:49:53.236Z" }, + { url = "https://files.pythonhosted.org/packages/32/67/bc8b4f465d388039255003e230c284a175cedf1203c692f23cb7bff64efe/zope_interface-8.5-cp314-cp314-manylinux1_i686.manylinux2014_i686.manylinux_2_17_i686.manylinux_2_5_i686.whl", hash = "sha256:3090e3a663d20194756a59a272e0c8508b889341e31d5894223331fe6b4f9b21", size = 266827, upload-time = "2026-05-26T06:49:54.873Z" }, + { url = "https://files.pythonhosted.org/packages/a7/eb/37d05b935ede53d79690fecc8d201440084418e590bcfc05f384451c7593/zope_interface-8.5-cp314-cp314-manylinux1_x86_64.manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:9342fb74e2afefdb081bf1df727d209ea56995c6e13f5a0540e6d7aff4beafb8", size = 270139, upload-time = "2026-05-26T06:49:57.116Z" }, + { url = "https://files.pythonhosted.org/packages/8b/0b/fd0c54579e2ce8dc6cf1a757903f3374bc6fbda929a46af9e0f53cb0e5f0/zope_interface-8.5-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:6c54725d818f1b57a7efb8b16528326e1f3c257b602b32393fd255c45af8799d", size = 270338, upload-time = "2026-05-26T06:49:58.698Z" }, + { url = "https://files.pythonhosted.org/packages/c1/1d/c420dcd777bb761067ea92879ac766694a5ca78608185f1aecea64cbfc11/zope_interface-8.5-cp314-cp314-win_amd64.whl", hash = "sha256:29d74febbae1afeb6834c4ccbf42e242a673c860060f09e53142825270456140", size = 215789, upload-time = "2026-05-26T06:50:00.405Z" }, + { url = "https://files.pythonhosted.org/packages/62/94/50b5eb8f94e527edceac14f9955e58917424ea79bb572ddc18548561cbc2/zope_interface-8.5-cp314-cp314-win_arm64.whl", hash = "sha256:633c8c49396f38df030340797c533e9fe460d1b5d1e42d88e55e938e525f548c", size = 213757, upload-time = "2026-05-26T06:50:01.973Z" }, + { url = "https://files.pythonhosted.org/packages/17/6f/5d5f32c4dfcdb16ce2ec5363da686840f13c13e1a1214cb70b49e1cd6d9f/zope_interface-8.5-cp314-cp314t-macosx_10_9_x86_64.whl", hash = "sha256:133999820fdbae513c36c03d6f29ef87317aaa3edef39112222b155083664714", size = 213591, upload-time = "2026-05-26T06:50:03.529Z" }, + { url = "https://files.pythonhosted.org/packages/f3/55/de0c3459ff717fce3342f9a29464c281fdeb0d36c3171ee88d119d5f0650/zope_interface-8.5-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:8bd75c96966e573232f0599deaff717564828031c7f05563ccc1ac35c5ee0304", size = 213733, upload-time = "2026-05-26T06:50:05.101Z" }, + { url = "https://files.pythonhosted.org/packages/c2/95/d97430abd5ae9677e8b9295b58720c0064a5b557dbb6b8bf5928484cf0d8/zope_interface-8.5-cp314-cp314t-manylinux1_i686.manylinux2014_i686.manylinux_2_17_i686.manylinux_2_5_i686.whl", hash = "sha256:14b0e9799351d4c34fe99afd67f0cdd76e55ba15c66a98699d5fc22ea8241e08", size = 294905, upload-time = "2026-05-26T06:50:07.384Z" }, + { url = "https://files.pythonhosted.org/packages/41/ec/a0f8f3dad6e74992f4654bdd94802be0929eabca7b871cac3b6fbb5e961b/zope_interface-8.5-cp314-cp314t-manylinux1_x86_64.manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:0cd6a732ac84b94eb1ef9222a117347a27efd294ee16810ffdf7ecd307677ed5", size = 300885, upload-time = "2026-05-26T06:50:08.997Z" }, + { url = "https://files.pythonhosted.org/packages/0f/da/6881b48803a0ee8d23eb5efa30fce3ed218a2bd9de5758ce489d224fee81/zope_interface-8.5-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:798b7c87d0e59a7d5d086d642208d0d8700ff0d55c4029134b3c479c3bfb110f", size = 304672, upload-time = "2026-05-26T06:50:10.563Z" }, + { url = "https://files.pythonhosted.org/packages/2e/0e/b4c01320859ff1d585438bc231fd60bd258d096359bccf6654fecdf0cffb/zope_interface-8.5-cp314-cp314t-win_amd64.whl", hash = "sha256:0fc3a9d45f114d27eaa1e53beeb144533689edca8a9f66505b1e8e8b3f075e42", size = 217241, upload-time = "2026-05-26T06:50:12.171Z" }, +] + +[[package]] +name = "zstandard" +version = "0.25.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/fd/aa/3e0508d5a5dd96529cdc5a97011299056e14c6505b678fd58938792794b1/zstandard-0.25.0.tar.gz", hash = "sha256:7713e1179d162cf5c7906da876ec2ccb9c3a9dcbdffef0cc7f70c3667a205f0b", size = 711513, upload-time = "2025-09-14T22:15:54.002Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/2a/83/c3ca27c363d104980f1c9cee1101cc8ba724ac8c28a033ede6aab89585b1/zstandard-0.25.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:933b65d7680ea337180733cf9e87293cc5500cc0eb3fc8769f4d3c88d724ec5c", size = 795254, upload-time = "2025-09-14T22:16:26.137Z" }, + { url = "https://files.pythonhosted.org/packages/ac/4d/e66465c5411a7cf4866aeadc7d108081d8ceba9bc7abe6b14aa21c671ec3/zstandard-0.25.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:a3f79487c687b1fc69f19e487cd949bf3aae653d181dfb5fde3bf6d18894706f", size = 640559, upload-time = "2025-09-14T22:16:27.973Z" }, + { url = "https://files.pythonhosted.org/packages/12/56/354fe655905f290d3b147b33fe946b0f27e791e4b50a5f004c802cb3eb7b/zstandard-0.25.0-cp311-cp311-manylinux2010_i686.manylinux2014_i686.manylinux_2_12_i686.manylinux_2_17_i686.whl", hash = "sha256:0bbc9a0c65ce0eea3c34a691e3c4b6889f5f3909ba4822ab385fab9057099431", size = 5348020, upload-time = "2025-09-14T22:16:29.523Z" }, + { url = "https://files.pythonhosted.org/packages/3b/13/2b7ed68bd85e69a2069bcc72141d378f22cae5a0f3b353a2c8f50ef30c1b/zstandard-0.25.0-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:01582723b3ccd6939ab7b3a78622c573799d5d8737b534b86d0e06ac18dbde4a", size = 5058126, upload-time = "2025-09-14T22:16:31.811Z" }, + { url = "https://files.pythonhosted.org/packages/c9/dd/fdaf0674f4b10d92cb120ccff58bbb6626bf8368f00ebfd2a41ba4a0dc99/zstandard-0.25.0-cp311-cp311-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:5f1ad7bf88535edcf30038f6919abe087f606f62c00a87d7e33e7fc57cb69fcc", size = 5405390, upload-time = "2025-09-14T22:16:33.486Z" }, + { url = "https://files.pythonhosted.org/packages/0f/67/354d1555575bc2490435f90d67ca4dd65238ff2f119f30f72d5cde09c2ad/zstandard-0.25.0-cp311-cp311-manylinux2014_s390x.manylinux_2_17_s390x.whl", hash = "sha256:06acb75eebeedb77b69048031282737717a63e71e4ae3f77cc0c3b9508320df6", size = 5452914, upload-time = "2025-09-14T22:16:35.277Z" }, + { url = "https://files.pythonhosted.org/packages/bb/1f/e9cfd801a3f9190bf3e759c422bbfd2247db9d7f3d54a56ecde70137791a/zstandard-0.25.0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:9300d02ea7c6506f00e627e287e0492a5eb0371ec1670ae852fefffa6164b072", size = 5559635, upload-time = "2025-09-14T22:16:37.141Z" }, + { url = "https://files.pythonhosted.org/packages/21/88/5ba550f797ca953a52d708c8e4f380959e7e3280af029e38fbf47b55916e/zstandard-0.25.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:bfd06b1c5584b657a2892a6014c2f4c20e0db0208c159148fa78c65f7e0b0277", size = 5048277, upload-time = "2025-09-14T22:16:38.807Z" }, + { url = "https://files.pythonhosted.org/packages/46/c0/ca3e533b4fa03112facbe7fbe7779cb1ebec215688e5df576fe5429172e0/zstandard-0.25.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:f373da2c1757bb7f1acaf09369cdc1d51d84131e50d5fa9863982fd626466313", size = 5574377, upload-time = "2025-09-14T22:16:40.523Z" }, + { url = "https://files.pythonhosted.org/packages/12/9b/3fb626390113f272abd0799fd677ea33d5fc3ec185e62e6be534493c4b60/zstandard-0.25.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:6c0e5a65158a7946e7a7affa6418878ef97ab66636f13353b8502d7ea03c8097", size = 4961493, upload-time = "2025-09-14T22:16:43.3Z" }, + { url = "https://files.pythonhosted.org/packages/cb/d3/23094a6b6a4b1343b27ae68249daa17ae0651fcfec9ed4de09d14b940285/zstandard-0.25.0-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:c8e167d5adf59476fa3e37bee730890e389410c354771a62e3c076c86f9f7778", size = 5269018, upload-time = "2025-09-14T22:16:45.292Z" }, + { url = "https://files.pythonhosted.org/packages/8c/a7/bb5a0c1c0f3f4b5e9d5b55198e39de91e04ba7c205cc46fcb0f95f0383c1/zstandard-0.25.0-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:98750a309eb2f020da61e727de7d7ba3c57c97cf6213f6f6277bb7fb42a8e065", size = 5443672, upload-time = "2025-09-14T22:16:47.076Z" }, + { url = "https://files.pythonhosted.org/packages/27/22/503347aa08d073993f25109c36c8d9f029c7d5949198050962cb568dfa5e/zstandard-0.25.0-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:22a086cff1b6ceca18a8dd6096ec631e430e93a8e70a9ca5efa7561a00f826fa", size = 5822753, upload-time = "2025-09-14T22:16:49.316Z" }, + { url = "https://files.pythonhosted.org/packages/e2/be/94267dc6ee64f0f8ba2b2ae7c7a2df934a816baaa7291db9e1aa77394c3c/zstandard-0.25.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:72d35d7aa0bba323965da807a462b0966c91608ef3a48ba761678cb20ce5d8b7", size = 5366047, upload-time = "2025-09-14T22:16:51.328Z" }, + { url = "https://files.pythonhosted.org/packages/7b/a3/732893eab0a3a7aecff8b99052fecf9f605cf0fb5fb6d0290e36beee47a4/zstandard-0.25.0-cp311-cp311-win32.whl", hash = "sha256:f5aeea11ded7320a84dcdd62a3d95b5186834224a9e55b92ccae35d21a8b63d4", size = 436484, upload-time = "2025-09-14T22:16:55.005Z" }, + { url = "https://files.pythonhosted.org/packages/43/a3/c6155f5c1cce691cb80dfd38627046e50af3ee9ddc5d0b45b9b063bfb8c9/zstandard-0.25.0-cp311-cp311-win_amd64.whl", hash = "sha256:daab68faadb847063d0c56f361a289c4f268706b598afbf9ad113cbe5c38b6b2", size = 506183, upload-time = "2025-09-14T22:16:52.753Z" }, + { url = "https://files.pythonhosted.org/packages/8c/3e/8945ab86a0820cc0e0cdbf38086a92868a9172020fdab8a03ac19662b0e5/zstandard-0.25.0-cp311-cp311-win_arm64.whl", hash = "sha256:22a06c5df3751bb7dc67406f5374734ccee8ed37fc5981bf1ad7041831fa1137", size = 462533, upload-time = "2025-09-14T22:16:53.878Z" }, + { url = "https://files.pythonhosted.org/packages/82/fc/f26eb6ef91ae723a03e16eddb198abcfce2bc5a42e224d44cc8b6765e57e/zstandard-0.25.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:7b3c3a3ab9daa3eed242d6ecceead93aebbb8f5f84318d82cee643e019c4b73b", size = 795738, upload-time = "2025-09-14T22:16:56.237Z" }, + { url = "https://files.pythonhosted.org/packages/aa/1c/d920d64b22f8dd028a8b90e2d756e431a5d86194caa78e3819c7bf53b4b3/zstandard-0.25.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:913cbd31a400febff93b564a23e17c3ed2d56c064006f54efec210d586171c00", size = 640436, upload-time = "2025-09-14T22:16:57.774Z" }, + { url = "https://files.pythonhosted.org/packages/53/6c/288c3f0bd9fcfe9ca41e2c2fbfd17b2097f6af57b62a81161941f09afa76/zstandard-0.25.0-cp312-cp312-manylinux2010_i686.manylinux2014_i686.manylinux_2_12_i686.manylinux_2_17_i686.whl", hash = "sha256:011d388c76b11a0c165374ce660ce2c8efa8e5d87f34996aa80f9c0816698b64", size = 5343019, upload-time = "2025-09-14T22:16:59.302Z" }, + { url = "https://files.pythonhosted.org/packages/1e/15/efef5a2f204a64bdb5571e6161d49f7ef0fffdbca953a615efbec045f60f/zstandard-0.25.0-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:6dffecc361d079bb48d7caef5d673c88c8988d3d33fb74ab95b7ee6da42652ea", size = 5063012, upload-time = "2025-09-14T22:17:01.156Z" }, + { url = "https://files.pythonhosted.org/packages/b7/37/a6ce629ffdb43959e92e87ebdaeebb5ac81c944b6a75c9c47e300f85abdf/zstandard-0.25.0-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:7149623bba7fdf7e7f24312953bcf73cae103db8cae49f8154dd1eadc8a29ecb", size = 5394148, upload-time = "2025-09-14T22:17:03.091Z" }, + { url = "https://files.pythonhosted.org/packages/e3/79/2bf870b3abeb5c070fe2d670a5a8d1057a8270f125ef7676d29ea900f496/zstandard-0.25.0-cp312-cp312-manylinux2014_s390x.manylinux_2_17_s390x.whl", hash = "sha256:6a573a35693e03cf1d67799fd01b50ff578515a8aeadd4595d2a7fa9f3ec002a", size = 5451652, upload-time = "2025-09-14T22:17:04.979Z" }, + { url = "https://files.pythonhosted.org/packages/53/60/7be26e610767316c028a2cbedb9a3beabdbe33e2182c373f71a1c0b88f36/zstandard-0.25.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:5a56ba0db2d244117ed744dfa8f6f5b366e14148e00de44723413b2f3938a902", size = 5546993, upload-time = "2025-09-14T22:17:06.781Z" }, + { url = "https://files.pythonhosted.org/packages/85/c7/3483ad9ff0662623f3648479b0380d2de5510abf00990468c286c6b04017/zstandard-0.25.0-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:10ef2a79ab8e2974e2075fb984e5b9806c64134810fac21576f0668e7ea19f8f", size = 5046806, upload-time = "2025-09-14T22:17:08.415Z" }, + { url = "https://files.pythonhosted.org/packages/08/b3/206883dd25b8d1591a1caa44b54c2aad84badccf2f1de9e2d60a446f9a25/zstandard-0.25.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:aaf21ba8fb76d102b696781bddaa0954b782536446083ae3fdaa6f16b25a1c4b", size = 5576659, upload-time = "2025-09-14T22:17:10.164Z" }, + { url = "https://files.pythonhosted.org/packages/9d/31/76c0779101453e6c117b0ff22565865c54f48f8bd807df2b00c2c404b8e0/zstandard-0.25.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:1869da9571d5e94a85a5e8d57e4e8807b175c9e4a6294e3b66fa4efb074d90f6", size = 4953933, upload-time = "2025-09-14T22:17:11.857Z" }, + { url = "https://files.pythonhosted.org/packages/18/e1/97680c664a1bf9a247a280a053d98e251424af51f1b196c6d52f117c9720/zstandard-0.25.0-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:809c5bcb2c67cd0ed81e9229d227d4ca28f82d0f778fc5fea624a9def3963f91", size = 5268008, upload-time = "2025-09-14T22:17:13.627Z" }, + { url = "https://files.pythonhosted.org/packages/1e/73/316e4010de585ac798e154e88fd81bb16afc5c5cb1a72eeb16dd37e8024a/zstandard-0.25.0-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:f27662e4f7dbf9f9c12391cb37b4c4c3cb90ffbd3b1fb9284dadbbb8935fa708", size = 5433517, upload-time = "2025-09-14T22:17:16.103Z" }, + { url = "https://files.pythonhosted.org/packages/5b/60/dd0f8cfa8129c5a0ce3ea6b7f70be5b33d2618013a161e1ff26c2b39787c/zstandard-0.25.0-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:99c0c846e6e61718715a3c9437ccc625de26593fea60189567f0118dc9db7512", size = 5814292, upload-time = "2025-09-14T22:17:17.827Z" }, + { url = "https://files.pythonhosted.org/packages/fc/5f/75aafd4b9d11b5407b641b8e41a57864097663699f23e9ad4dbb91dc6bfe/zstandard-0.25.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:474d2596a2dbc241a556e965fb76002c1ce655445e4e3bf38e5477d413165ffa", size = 5360237, upload-time = "2025-09-14T22:17:19.954Z" }, + { url = "https://files.pythonhosted.org/packages/ff/8d/0309daffea4fcac7981021dbf21cdb2e3427a9e76bafbcdbdf5392ff99a4/zstandard-0.25.0-cp312-cp312-win32.whl", hash = "sha256:23ebc8f17a03133b4426bcc04aabd68f8236eb78c3760f12783385171b0fd8bd", size = 436922, upload-time = "2025-09-14T22:17:24.398Z" }, + { url = "https://files.pythonhosted.org/packages/79/3b/fa54d9015f945330510cb5d0b0501e8253c127cca7ebe8ba46a965df18c5/zstandard-0.25.0-cp312-cp312-win_amd64.whl", hash = "sha256:ffef5a74088f1e09947aecf91011136665152e0b4b359c42be3373897fb39b01", size = 506276, upload-time = "2025-09-14T22:17:21.429Z" }, + { url = "https://files.pythonhosted.org/packages/ea/6b/8b51697e5319b1f9ac71087b0af9a40d8a6288ff8025c36486e0c12abcc4/zstandard-0.25.0-cp312-cp312-win_arm64.whl", hash = "sha256:181eb40e0b6a29b3cd2849f825e0fa34397f649170673d385f3598ae17cca2e9", size = 462679, upload-time = "2025-09-14T22:17:23.147Z" }, + { url = "https://files.pythonhosted.org/packages/35/0b/8df9c4ad06af91d39e94fa96cc010a24ac4ef1378d3efab9223cc8593d40/zstandard-0.25.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:ec996f12524f88e151c339688c3897194821d7f03081ab35d31d1e12ec975e94", size = 795735, upload-time = "2025-09-14T22:17:26.042Z" }, + { url = "https://files.pythonhosted.org/packages/3f/06/9ae96a3e5dcfd119377ba33d4c42a7d89da1efabd5cb3e366b156c45ff4d/zstandard-0.25.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:a1a4ae2dec3993a32247995bdfe367fc3266da832d82f8438c8570f989753de1", size = 640440, upload-time = "2025-09-14T22:17:27.366Z" }, + { url = "https://files.pythonhosted.org/packages/d9/14/933d27204c2bd404229c69f445862454dcc101cd69ef8c6068f15aaec12c/zstandard-0.25.0-cp313-cp313-manylinux2010_i686.manylinux2014_i686.manylinux_2_12_i686.manylinux_2_17_i686.whl", hash = "sha256:e96594a5537722fdfb79951672a2a63aec5ebfb823e7560586f7484819f2a08f", size = 5343070, upload-time = "2025-09-14T22:17:28.896Z" }, + { url = "https://files.pythonhosted.org/packages/6d/db/ddb11011826ed7db9d0e485d13df79b58586bfdec56e5c84a928a9a78c1c/zstandard-0.25.0-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:bfc4e20784722098822e3eee42b8e576b379ed72cca4a7cb856ae733e62192ea", size = 5063001, upload-time = "2025-09-14T22:17:31.044Z" }, + { url = "https://files.pythonhosted.org/packages/db/00/87466ea3f99599d02a5238498b87bf84a6348290c19571051839ca943777/zstandard-0.25.0-cp313-cp313-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:457ed498fc58cdc12fc48f7950e02740d4f7ae9493dd4ab2168a47c93c31298e", size = 5394120, upload-time = "2025-09-14T22:17:32.711Z" }, + { url = "https://files.pythonhosted.org/packages/2b/95/fc5531d9c618a679a20ff6c29e2b3ef1d1f4ad66c5e161ae6ff847d102a9/zstandard-0.25.0-cp313-cp313-manylinux2014_s390x.manylinux_2_17_s390x.whl", hash = "sha256:fd7a5004eb1980d3cefe26b2685bcb0b17989901a70a1040d1ac86f1d898c551", size = 5451230, upload-time = "2025-09-14T22:17:34.41Z" }, + { url = "https://files.pythonhosted.org/packages/63/4b/e3678b4e776db00f9f7b2fe58e547e8928ef32727d7a1ff01dea010f3f13/zstandard-0.25.0-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:8e735494da3db08694d26480f1493ad2cf86e99bdd53e8e9771b2752a5c0246a", size = 5547173, upload-time = "2025-09-14T22:17:36.084Z" }, + { url = "https://files.pythonhosted.org/packages/4e/d5/ba05ed95c6b8ec30bd468dfeab20589f2cf709b5c940483e31d991f2ca58/zstandard-0.25.0-cp313-cp313-musllinux_1_1_aarch64.whl", hash = "sha256:3a39c94ad7866160a4a46d772e43311a743c316942037671beb264e395bdd611", size = 5046736, upload-time = "2025-09-14T22:17:37.891Z" }, + { url = "https://files.pythonhosted.org/packages/50/d5/870aa06b3a76c73eced65c044b92286a3c4e00554005ff51962deef28e28/zstandard-0.25.0-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:172de1f06947577d3a3005416977cce6168f2261284c02080e7ad0185faeced3", size = 5576368, upload-time = "2025-09-14T22:17:40.206Z" }, + { url = "https://files.pythonhosted.org/packages/5d/35/398dc2ffc89d304d59bc12f0fdd931b4ce455bddf7038a0a67733a25f550/zstandard-0.25.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:3c83b0188c852a47cd13ef3bf9209fb0a77fa5374958b8c53aaa699398c6bd7b", size = 4954022, upload-time = "2025-09-14T22:17:41.879Z" }, + { url = "https://files.pythonhosted.org/packages/9a/5c/36ba1e5507d56d2213202ec2b05e8541734af5f2ce378c5d1ceaf4d88dc4/zstandard-0.25.0-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:1673b7199bbe763365b81a4f3252b8e80f44c9e323fc42940dc8843bfeaf9851", size = 5267889, upload-time = "2025-09-14T22:17:43.577Z" }, + { url = "https://files.pythonhosted.org/packages/70/e8/2ec6b6fb7358b2ec0113ae202647ca7c0e9d15b61c005ae5225ad0995df5/zstandard-0.25.0-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:0be7622c37c183406f3dbf0cba104118eb16a4ea7359eeb5752f0794882fc250", size = 5433952, upload-time = "2025-09-14T22:17:45.271Z" }, + { url = "https://files.pythonhosted.org/packages/7b/01/b5f4d4dbc59ef193e870495c6f1275f5b2928e01ff5a81fecb22a06e22fb/zstandard-0.25.0-cp313-cp313-musllinux_1_2_s390x.whl", hash = "sha256:5f5e4c2a23ca271c218ac025bd7d635597048b366d6f31f420aaeb715239fc98", size = 5814054, upload-time = "2025-09-14T22:17:47.08Z" }, + { url = "https://files.pythonhosted.org/packages/b2/e5/fbd822d5c6f427cf158316d012c5a12f233473c2f9c5fe5ab1ae5d21f3d8/zstandard-0.25.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:4f187a0bb61b35119d1926aee039524d1f93aaf38a9916b8c4b78ac8514a0aaf", size = 5360113, upload-time = "2025-09-14T22:17:48.893Z" }, + { url = "https://files.pythonhosted.org/packages/8e/e0/69a553d2047f9a2c7347caa225bb3a63b6d7704ad74610cb7823baa08ed7/zstandard-0.25.0-cp313-cp313-win32.whl", hash = "sha256:7030defa83eef3e51ff26f0b7bfb229f0204b66fe18e04359ce3474ac33cbc09", size = 436936, upload-time = "2025-09-14T22:17:52.658Z" }, + { url = "https://files.pythonhosted.org/packages/d9/82/b9c06c870f3bd8767c201f1edbdf9e8dc34be5b0fbc5682c4f80fe948475/zstandard-0.25.0-cp313-cp313-win_amd64.whl", hash = "sha256:1f830a0dac88719af0ae43b8b2d6aef487d437036468ef3c2ea59c51f9d55fd5", size = 506232, upload-time = "2025-09-14T22:17:50.402Z" }, + { url = "https://files.pythonhosted.org/packages/d4/57/60c3c01243bb81d381c9916e2a6d9e149ab8627c0c7d7abb2d73384b3c0c/zstandard-0.25.0-cp313-cp313-win_arm64.whl", hash = "sha256:85304a43f4d513f5464ceb938aa02c1e78c2943b29f44a750b48b25ac999a049", size = 462671, upload-time = "2025-09-14T22:17:51.533Z" }, + { url = "https://files.pythonhosted.org/packages/3d/5c/f8923b595b55fe49e30612987ad8bf053aef555c14f05bb659dd5dbe3e8a/zstandard-0.25.0-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:e29f0cf06974c899b2c188ef7f783607dbef36da4c242eb6c82dcd8b512855e3", size = 795887, upload-time = "2025-09-14T22:17:54.198Z" }, + { url = "https://files.pythonhosted.org/packages/8d/09/d0a2a14fc3439c5f874042dca72a79c70a532090b7ba0003be73fee37ae2/zstandard-0.25.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:05df5136bc5a011f33cd25bc9f506e7426c0c9b3f9954f056831ce68f3b6689f", size = 640658, upload-time = "2025-09-14T22:17:55.423Z" }, + { url = "https://files.pythonhosted.org/packages/5d/7c/8b6b71b1ddd517f68ffb55e10834388d4f793c49c6b83effaaa05785b0b4/zstandard-0.25.0-cp314-cp314-manylinux2010_i686.manylinux_2_12_i686.manylinux_2_28_i686.whl", hash = "sha256:f604efd28f239cc21b3adb53eb061e2a205dc164be408e553b41ba2ffe0ca15c", size = 5379849, upload-time = "2025-09-14T22:17:57.372Z" }, + { url = "https://files.pythonhosted.org/packages/a4/86/a48e56320d0a17189ab7a42645387334fba2200e904ee47fc5a26c1fd8ca/zstandard-0.25.0-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:223415140608d0f0da010499eaa8ccdb9af210a543fac54bce15babbcfc78439", size = 5058095, upload-time = "2025-09-14T22:17:59.498Z" }, + { url = "https://files.pythonhosted.org/packages/f8/ad/eb659984ee2c0a779f9d06dbfe45e2dc39d99ff40a319895df2d3d9a48e5/zstandard-0.25.0-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:2e54296a283f3ab5a26fc9b8b5d4978ea0532f37b231644f367aa588930aa043", size = 5551751, upload-time = "2025-09-14T22:18:01.618Z" }, + { url = "https://files.pythonhosted.org/packages/61/b3/b637faea43677eb7bd42ab204dfb7053bd5c4582bfe6b1baefa80ac0c47b/zstandard-0.25.0-cp314-cp314-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:ca54090275939dc8ec5dea2d2afb400e0f83444b2fc24e07df7fdef677110859", size = 6364818, upload-time = "2025-09-14T22:18:03.769Z" }, + { url = "https://files.pythonhosted.org/packages/31/dc/cc50210e11e465c975462439a492516a73300ab8caa8f5e0902544fd748b/zstandard-0.25.0-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:e09bb6252b6476d8d56100e8147b803befa9a12cea144bbe629dd508800d1ad0", size = 5560402, upload-time = "2025-09-14T22:18:05.954Z" }, + { url = "https://files.pythonhosted.org/packages/c9/ae/56523ae9c142f0c08efd5e868a6da613ae76614eca1305259c3bf6a0ed43/zstandard-0.25.0-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:a9ec8c642d1ec73287ae3e726792dd86c96f5681eb8df274a757bf62b750eae7", size = 4955108, upload-time = "2025-09-14T22:18:07.68Z" }, + { url = "https://files.pythonhosted.org/packages/98/cf/c899f2d6df0840d5e384cf4c4121458c72802e8bda19691f3b16619f51e9/zstandard-0.25.0-cp314-cp314-musllinux_1_2_i686.whl", hash = "sha256:a4089a10e598eae6393756b036e0f419e8c1d60f44a831520f9af41c14216cf2", size = 5269248, upload-time = "2025-09-14T22:18:09.753Z" }, + { url = "https://files.pythonhosted.org/packages/1b/c0/59e912a531d91e1c192d3085fc0f6fb2852753c301a812d856d857ea03c6/zstandard-0.25.0-cp314-cp314-musllinux_1_2_ppc64le.whl", hash = "sha256:f67e8f1a324a900e75b5e28ffb152bcac9fbed1cc7b43f99cd90f395c4375344", size = 5430330, upload-time = "2025-09-14T22:18:11.966Z" }, + { url = "https://files.pythonhosted.org/packages/a0/1d/7e31db1240de2df22a58e2ea9a93fc6e38cc29353e660c0272b6735d6669/zstandard-0.25.0-cp314-cp314-musllinux_1_2_s390x.whl", hash = "sha256:9654dbc012d8b06fc3d19cc825af3f7bf8ae242226df5f83936cb39f5fdc846c", size = 5811123, upload-time = "2025-09-14T22:18:13.907Z" }, + { url = "https://files.pythonhosted.org/packages/f6/49/fac46df5ad353d50535e118d6983069df68ca5908d4d65b8c466150a4ff1/zstandard-0.25.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:4203ce3b31aec23012d3a4cf4a2ed64d12fea5269c49aed5e4c3611b938e4088", size = 5359591, upload-time = "2025-09-14T22:18:16.465Z" }, + { url = "https://files.pythonhosted.org/packages/c2/38/f249a2050ad1eea0bb364046153942e34abba95dd5520af199aed86fbb49/zstandard-0.25.0-cp314-cp314-win32.whl", hash = "sha256:da469dc041701583e34de852d8634703550348d5822e66a0c827d39b05365b12", size = 444513, upload-time = "2025-09-14T22:18:20.61Z" }, + { url = "https://files.pythonhosted.org/packages/3a/43/241f9615bcf8ba8903b3f0432da069e857fc4fd1783bd26183db53c4804b/zstandard-0.25.0-cp314-cp314-win_amd64.whl", hash = "sha256:c19bcdd826e95671065f8692b5a4aa95c52dc7a02a4c5a0cac46deb879a017a2", size = 516118, upload-time = "2025-09-14T22:18:17.849Z" }, + { url = "https://files.pythonhosted.org/packages/f0/ef/da163ce2450ed4febf6467d77ccb4cd52c4c30ab45624bad26ca0a27260c/zstandard-0.25.0-cp314-cp314-win_arm64.whl", hash = "sha256:d7541afd73985c630bafcd6338d2518ae96060075f9463d7dc14cfb33514383d", size = 476940, upload-time = "2025-09-14T22:18:19.088Z" }, +] From 98d867f3500bb385455f80a53dd7dade3434b790 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 28 May 2026 15:42:31 -0700 Subject: [PATCH 005/591] Example env vars --- mpcontribs-api/.env.example | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 mpcontribs-api/.env.example diff --git a/mpcontribs-api/.env.example b/mpcontribs-api/.env.example new file mode 100644 index 0000000000..f560aed0dd --- /dev/null +++ b/mpcontribs-api/.env.example @@ -0,0 +1,11 @@ +MPCONTRIBS_ENVIRONMENT=dev + +MPCONTRIBS_MONGO__URI=mongodb+srv://:@host.hash.mongodb.net/?appName=database-name +MPCONTRIBS_MONGO__DB_NAME=database-name + +MPCONTRIBS_REDIS_ADDRESS=redis-address +MPCONTRIBS_REDIS_URL=redis-url + +MPCONTRIBS_MAIL_DEFAULT_SENDER=mail-default-sender + +MPCONTRIBS_VERSION=version From 6558bc7d538c85fd581f278a7728d1862d5bc1de Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 28 May 2026 15:43:11 -0700 Subject: [PATCH 006/591] Moved to a src/proj style repo. Began creating fastapi server --- .../mpcontribs_api}/__init__.py | 0 .../mpcontribs_api/api/v1}/__init__.py | 0 .../src/mpcontribs_api/api/v1/router.py | 5 + mpcontribs-api/src/mpcontribs_api/app.py | 71 +++++++++++ mpcontribs-api/src/mpcontribs_api/config.py | 66 +++++++++++ mpcontribs-api/src/mpcontribs_api/db.py | 11 ++ .../mpcontribs_api/dependencies.py} | 0 .../domains/contributions/models.py | 0 .../domains/contributions/repository.py | 0 .../domains/contributions/router.py | 0 .../domains/contributions/service.py | 0 .../mpcontribs_api/domains/projects/models.py | 0 .../domains/projects/repository.py | 0 .../mpcontribs_api/domains/projects/router.py | 0 .../domains/projects/service.py | 0 .../src/mpcontribs_api/exceptions.py | 111 ++++++++++++++++++ mpcontribs-api/src/mpcontribs_api/logging.py | 77 ++++++++++++ .../src/mpcontribs_api/middleware.py | 14 +++ mpcontribs-api/src/mpcontribs_api/models.py | 0 .../mpcontribs_api/old}/__init__.py | 25 ++-- .../old}/attachments/__init__.py | 0 .../old}/attachments/document.py | 0 .../mpcontribs_api/old}/attachments/views.py | 0 .../api => src/mpcontribs_api/old}/config.py | 0 .../old/contributions/__init__.py | 0 .../old}/contributions/document.py | 0 .../old}/contributions/formulae.json.gz | 0 .../old}/contributions/generate_formulae.py | 0 .../old}/contributions/views.py | 0 .../api => src/mpcontribs_api/old}/core.py | 0 .../mpcontribs_api/old}/dashboard.cfg | 0 .../mpcontribs_api/old}/notebooks/__init__.py | 0 .../mpcontribs_api/old}/notebooks/document.py | 0 .../mpcontribs_api/old}/notebooks/views.py | 0 .../mpcontribs_api/old/projects/__init__.py | 0 .../mpcontribs_api/old}/projects/document.py | 0 .../mpcontribs_api/old}/projects/views.py | 0 .../mpcontribs_api/old/structures/__init__.py | 0 .../old}/structures/document.py | 0 .../mpcontribs_api/old}/structures/views.py | 0 .../mpcontribs_api/old}/tables/__init__.py | 0 .../mpcontribs_api/old}/tables/document.py | 0 .../mpcontribs_api/old}/tables/views.py | 0 .../old}/templates/admin_email.html | 0 .../old}/templates/card_bootstrap.html | 0 .../old}/templates/card_bulma.html | 0 .../old}/templates/owner_email.html | 0 mpcontribs-api/src/mpcontribs_api/types.py | 0 48 files changed, 367 insertions(+), 13 deletions(-) rename mpcontribs-api/{mpcontribs/api/contributions => src/mpcontribs_api}/__init__.py (100%) rename mpcontribs-api/{mpcontribs/api/projects => src/mpcontribs_api/api/v1}/__init__.py (100%) create mode 100644 mpcontribs-api/src/mpcontribs_api/api/v1/router.py create mode 100644 mpcontribs-api/src/mpcontribs_api/app.py create mode 100644 mpcontribs-api/src/mpcontribs_api/config.py create mode 100644 mpcontribs-api/src/mpcontribs_api/db.py rename mpcontribs-api/{mpcontribs/api/structures/__init__.py => src/mpcontribs_api/dependencies.py} (100%) create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/projects/models.py create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/projects/router.py create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/projects/service.py create mode 100644 mpcontribs-api/src/mpcontribs_api/exceptions.py create mode 100644 mpcontribs-api/src/mpcontribs_api/logging.py create mode 100644 mpcontribs-api/src/mpcontribs_api/middleware.py create mode 100644 mpcontribs-api/src/mpcontribs_api/models.py rename mpcontribs-api/{mpcontribs/api => src/mpcontribs_api/old}/__init__.py (98%) rename mpcontribs-api/{mpcontribs/api => src/mpcontribs_api/old}/attachments/__init__.py (100%) rename mpcontribs-api/{mpcontribs/api => src/mpcontribs_api/old}/attachments/document.py (100%) rename mpcontribs-api/{mpcontribs/api => src/mpcontribs_api/old}/attachments/views.py (100%) rename mpcontribs-api/{mpcontribs/api => src/mpcontribs_api/old}/config.py (100%) create mode 100644 mpcontribs-api/src/mpcontribs_api/old/contributions/__init__.py rename mpcontribs-api/{mpcontribs/api => src/mpcontribs_api/old}/contributions/document.py (100%) rename mpcontribs-api/{mpcontribs/api => src/mpcontribs_api/old}/contributions/formulae.json.gz (100%) rename mpcontribs-api/{mpcontribs/api => src/mpcontribs_api/old}/contributions/generate_formulae.py (100%) rename mpcontribs-api/{mpcontribs/api => src/mpcontribs_api/old}/contributions/views.py (100%) rename mpcontribs-api/{mpcontribs/api => src/mpcontribs_api/old}/core.py (100%) rename mpcontribs-api/{mpcontribs/api => src/mpcontribs_api/old}/dashboard.cfg (100%) rename mpcontribs-api/{mpcontribs/api => src/mpcontribs_api/old}/notebooks/__init__.py (100%) rename mpcontribs-api/{mpcontribs/api => src/mpcontribs_api/old}/notebooks/document.py (100%) rename mpcontribs-api/{mpcontribs/api => src/mpcontribs_api/old}/notebooks/views.py (100%) create mode 100644 mpcontribs-api/src/mpcontribs_api/old/projects/__init__.py rename mpcontribs-api/{mpcontribs/api => src/mpcontribs_api/old}/projects/document.py (100%) rename mpcontribs-api/{mpcontribs/api => src/mpcontribs_api/old}/projects/views.py (100%) create mode 100644 mpcontribs-api/src/mpcontribs_api/old/structures/__init__.py rename mpcontribs-api/{mpcontribs/api => src/mpcontribs_api/old}/structures/document.py (100%) rename mpcontribs-api/{mpcontribs/api => src/mpcontribs_api/old}/structures/views.py (100%) rename mpcontribs-api/{mpcontribs/api => src/mpcontribs_api/old}/tables/__init__.py (100%) rename mpcontribs-api/{mpcontribs/api => src/mpcontribs_api/old}/tables/document.py (100%) rename mpcontribs-api/{mpcontribs/api => src/mpcontribs_api/old}/tables/views.py (100%) rename mpcontribs-api/{mpcontribs/api => src/mpcontribs_api/old}/templates/admin_email.html (100%) rename mpcontribs-api/{mpcontribs/api => src/mpcontribs_api/old}/templates/card_bootstrap.html (100%) rename mpcontribs-api/{mpcontribs/api => src/mpcontribs_api/old}/templates/card_bulma.html (100%) rename mpcontribs-api/{mpcontribs/api => src/mpcontribs_api/old}/templates/owner_email.html (100%) create mode 100644 mpcontribs-api/src/mpcontribs_api/types.py diff --git a/mpcontribs-api/mpcontribs/api/contributions/__init__.py b/mpcontribs-api/src/mpcontribs_api/__init__.py similarity index 100% rename from mpcontribs-api/mpcontribs/api/contributions/__init__.py rename to mpcontribs-api/src/mpcontribs_api/__init__.py diff --git a/mpcontribs-api/mpcontribs/api/projects/__init__.py b/mpcontribs-api/src/mpcontribs_api/api/v1/__init__.py similarity index 100% rename from mpcontribs-api/mpcontribs/api/projects/__init__.py rename to mpcontribs-api/src/mpcontribs_api/api/v1/__init__.py diff --git a/mpcontribs-api/src/mpcontribs_api/api/v1/router.py b/mpcontribs-api/src/mpcontribs_api/api/v1/router.py new file mode 100644 index 0000000000..456aa8f29d --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/api/v1/router.py @@ -0,0 +1,5 @@ +from fastapi import APIRouter + +router = APIRouter(prefix="api/v1") + +router. diff --git a/mpcontribs-api/src/mpcontribs_api/app.py b/mpcontribs-api/src/mpcontribs_api/app.py new file mode 100644 index 0000000000..6994b6cb23 --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/app.py @@ -0,0 +1,71 @@ +from __future__ import annotations + +import logging +from contextlib import asynccontextmanager +from typing import AsyncGenerator + +from fastapi import FastAPI +from pymongo import AsyncMongoClient +from starlette.middleware.base import BaseHTTPMiddleware + +from mpcontribs_api.api.v1.router import router as v1_router +from mpcontribs_api.config import Settings, get_settings +from mpcontribs_api.exceptions import register_exception_handlers +from mpcontribs_api.logging import configure_logging +from src.mpcontribs_api.middleware import bind_request_context + +logger = logging.getLogger(__name__) + + +def _build_lifespan(settings: Settings): + @asynccontextmanager + async def lifespan(app: FastAPI) -> AsyncGenerator[None]: + # --- startup --- + client = AsyncMongoClient( + str(settings.mongo.uri), + maxPoolSize=settings.mongo.max_pool_size, + minPoolSize=settings.mongo.min_pool_size, + serverSelectionTimeoutMS=settings.mongo.server_selection_timeout_ms, + uuidRepresentation="standard", + ) + # Fail fast in prod if the DB is unreachable. Cheap, one round-trip. + await client.admin.command("ping") + logger.info("connected to mongo", extra={"db": settings.mongo.db_name}) + + app.state.mongo_client = client + app.state.db = client[settings.mongo.db_name] + + try: + yield + finally: + # --- shutdown --- + await client.close() + logger.info("mongo client closed") + + return lifespan + + +def create_app(settings: Settings | None = None) -> FastAPI: + settings = settings or get_settings() + configure_logging(settings) + + app = FastAPI( + title="mpcontribs-api", + version=settings.version, + debug=False if settings.environment == "prod" else True, + # Would be nice to implement eventually + # default_response_class=DefaultResponse, + lifespan=_build_lifespan(settings), + ) + + # Add request context to logs + app.add_middleware(BaseHTTPMiddleware, dispatch=bind_request_context) + # Bind exception handlers + register_exception_handlers(app) + app.include_router(v1_router, prefix="/api/v1") + + return app + + +# For `uvicorn mpcontribs_api.app:app`. Tests use create_app() directly. +app = create_app() diff --git a/mpcontribs-api/src/mpcontribs_api/config.py b/mpcontribs-api/src/mpcontribs_api/config.py new file mode 100644 index 0000000000..81171037aa --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/config.py @@ -0,0 +1,66 @@ +from functools import lru_cache +from typing import Literal + +from pydantic import BaseModel, Field, SecretStr +from pydantic_settings import BaseSettings, SettingsConfigDict + + +class MongoSettings(BaseModel): + """MongoDB settings. + + Provided defaults are the defaults of AsyncMongoClient + """ + + uri: SecretStr = Field( + description="The full uri from MongoDB (username and password included)" + ) + db_name: str + max_pool_size: int = Field( + default=100, + description="Maximum number of allowed concurrent connection to each server. Can be '0' or 'None', both of which allow any number of connections", + ) + min_pool_size: int = Field( + default=0, + description="Minimum number of concurent connections that the pool will maintain connected to each server", + ) + datetime_conversion: Literal[ + "datetime_ms", "datetime", "datetime_auto", "datetime_clamp" + ] = Field( + default="datetime", + description="Specifies how UTC datetimes should be decoded within BSON", + ) + server_selection_timeout_ms: int = Field( + default=30000, + description="Controls how long (in milliseconds) the driver will wait to find an available, appropriate server to carry out a database operation;" + "while it is waiting, multiple server monitoring operations may be carried out", + ) + + +class Settings(BaseSettings): + model_config = SettingsConfigDict( + env_file=".env", + env_nested_delimiter="__", + env_prefix="MPCONTRIBS_", + ) + + environment: Literal["dev", "prod"] + + mongo: MongoSettings + + # Redis settings + redis_address: SecretStr + redis_url: SecretStr + + # SMTP Settings + mail_default_sender: str = Field( + description="SMTP Server to send out notifications on new projects and other important moments" + ) + + # General/Informative settings + version: str + + +@lru_cache +def get_settings() -> Settings: + # Fields are populated from env vars at runtime, not from arguments - pyright can't see that + return Settings() # pyright: ignore[reportCallIssue] diff --git a/mpcontribs-api/src/mpcontribs_api/db.py b/mpcontribs-api/src/mpcontribs_api/db.py new file mode 100644 index 0000000000..afd11748c4 --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/db.py @@ -0,0 +1,11 @@ +from typing import Annotated + +from fastapi import Depends, Request +from pymongo.asynchronous.database import AsyncDatabase + + +def get_db(request: Request) -> AsyncDatabase: + return request.app.state.db + + +DbDep = Annotated[AsyncDatabase, Depends(get_db)] diff --git a/mpcontribs-api/mpcontribs/api/structures/__init__.py b/mpcontribs-api/src/mpcontribs_api/dependencies.py similarity index 100% rename from mpcontribs-api/mpcontribs/api/structures/__init__.py rename to mpcontribs-api/src/mpcontribs_api/dependencies.py diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/service.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/service.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/mpcontribs-api/src/mpcontribs_api/exceptions.py b/mpcontribs-api/src/mpcontribs_api/exceptions.py new file mode 100644 index 0000000000..6d62085443 --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/exceptions.py @@ -0,0 +1,111 @@ +from __future__ import annotations + +from typing import Any + +import structlog +from fastapi import FastAPI, Request +from fastapi.exceptions import RequestValidationError +from fastapi.responses import JSONResponse +from starlette.exceptions import HTTPException as StarletteHTTPException + +logger = structlog.get_logger(__name__) + + +class AppError(Exception): + """Base for all application-level domain errors. + + Carries enough structured context for a handler to build an HTTP + response without the raising code knowing anything about HTTP. + """ + + # Subclasses override these. Kept as class attrs so a handler can read + # them off the type without instantiating special-casing. + status_code: int = 500 + error_code: str = "internal_error" # stable, machine-readable + + def __init__(self, message: str | None = None, **context): + self.message = message or self.__class__.__name__ + self.context = context # extra fields for logging / response + super().__init__(self.message) + + +class NotFoundError(AppError): + status_code = 404 + error_code = "not_found" + + +class ConflictError(AppError): + status_code = 409 + + error_code = "conflict" + + +class ValidationError(AppError): + status_code = 422 + error_code = "validation_error" + + +class PermissionError(AppError): + status_code = 403 + error_code = "permission_denied" + + +def _error_body(error_code: str, message: str, **public_context) -> dict: + body: dict[str, Any] = {"error": {"code": error_code, "message": message}} + if public_context: + body["error"]["detail"] = public_context + return body + + +def register_exception_handlers(app: FastAPI) -> None: + """Register all exception handlers to the app. + + Args: + app (FastAPI): the fastapi app to register the exception handlers to + """ + + @app.exception_handler(AppError) + async def _handle_app_error(request: Request, exc: AppError) -> JSONResponse: + log = logger.error if exc.status_code >= 500 else logger.info + log( + exc.error_code, + status_code=exc.status_code, + **exc.context, # full context to logs + ) + return JSONResponse( + status_code=exc.status_code, + content=_error_body( + exc.error_code, + exc.message, + # NOTE: not leaking context to client yet + # - need to make client-safe (no leakage of secrets) on a per-exception type basis + # **exc.contrxt + ), + ) + + # Catch-all for anything that isn't an AppError - bugs, unexpected failures. + @app.exception_handler(Exception) + async def _handle_unexpected(request: Request, exc: Exception) -> JSONResponse: + logger.exception("unhandled_exception") # full traceback + return JSONResponse( + status_code=500, + content=_error_body("internal_error", "An unexpected error occurred."), + ) + + # Unify validation errors from pydantic with our exception format + @app.exception_handler(RequestValidationError) + async def _handle_validation(request, exc): + return JSONResponse( + status_code=422, + content=_error_body( + "validation_error", "Request validation failed", errors=exc.errors() + ), + ) + + # Unify http exceptions from starlette with our exception format + @app.exception_handler(StarletteHTTPException) + async def _handle_http(request, exc): + return JSONResponse( + status_code=exc.status_code, + content=_error_body("http_error", str(exc.detail)), + ) diff --git a/mpcontribs-api/src/mpcontribs_api/logging.py b/mpcontribs-api/src/mpcontribs_api/logging.py new file mode 100644 index 0000000000..6f28d284ba --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/logging.py @@ -0,0 +1,77 @@ +import logging +import sys + +import structlog +from opentelemetry import trace + +from src.mpcontribs_api.config import Settings + + +def add_otel_trace_context(_, __, event_dict): + span = trace.get_current_span() + ctx = span.get_span_context() + # If context is not the sentinel span (ie. we have an active span) + if ctx.is_valid: + # Convert to OTel-expected ids + # ctx ids are formatted as 128-bit (trace_id) and 64-bit (span_id) long numbers. OTel expects them as 0-padded hex numbers + event_dict["trace_id"] = format(ctx.trace_id, "032x") # 32 digits + event_dict["span_id"] = format(ctx.span_id, "016x") # 16 digits + return event_dict + + +def configure_logging(settings: Settings) -> None: + is_prod = settings.environment == "prod" + log_level = logging.INFO if is_prod else logging.DEBUG + + # Run on both structlog events and foreign (stdlib) records. + shared_processors = [ + structlog.contextvars.merge_contextvars, + structlog.processors.add_log_level, + structlog.processors.TimeStamper(fmt="iso", utc=True), + add_otel_trace_context, + ] + + # Exception handling is paired with the renderer, not shared. + if is_prod: + render_chain = [ + structlog.processors.dict_tracebacks, + structlog.processors.EventRenamer("message"), + structlog.processors.JSONRenderer(), + ] + else: + render_chain = [structlog.dev.ConsoleRenderer()] + + # Handles internal logs emitted by structlog logger + structlog.configure( + processors=shared_processors + + [structlog.stdlib.ProcessorFormatter.wrap_for_formatter], + logger_factory=structlog.stdlib.LoggerFactory(), + wrapper_class=structlog.make_filtering_bound_logger(log_level), + cache_logger_on_first_use=True, + ) + + # Handles logs emitted by stdlib logging in external libraries + formatter = structlog.stdlib.ProcessorFormatter( + foreign_pre_chain=shared_processors, + processors=[ + structlog.stdlib.ProcessorFormatter.remove_processors_meta, + *render_chain, + ], + ) + + handler = logging.StreamHandler(sys.stdout) + handler.setFormatter(formatter) + + root = logging.getLogger() + root.handlers = [handler] + root.setLevel(log_level) + + # Let uvicorn's loggers flow through the root handler instead of their own. + for name in ("uvicorn", "uvicorn.error", "uvicorn.access"): + lg = logging.getLogger(name) + lg.handlers = [] + lg.propagate = True + + +def get_logger(name: str | None = None): + return structlog.get_logger(name) diff --git a/mpcontribs-api/src/mpcontribs_api/middleware.py b/mpcontribs-api/src/mpcontribs_api/middleware.py new file mode 100644 index 0000000000..3955b91366 --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/middleware.py @@ -0,0 +1,14 @@ +import uuid + +import structlog + + +# middleware.py +async def bind_request_context(request, call_next): + structlog.contextvars.clear_contextvars() + structlog.contextvars.bind_contextvars( + request_id=request.headers.get("x-request-id", str(uuid.uuid4())), + method=request.method, + path=request.url.path, + ) + return await call_next(request) diff --git a/mpcontribs-api/src/mpcontribs_api/models.py b/mpcontribs-api/src/mpcontribs_api/models.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/mpcontribs-api/mpcontribs/api/__init__.py b/mpcontribs-api/src/mpcontribs_api/old/__init__.py similarity index 98% rename from mpcontribs-api/mpcontribs/api/__init__.py rename to mpcontribs-api/src/mpcontribs_api/old/__init__.py index 6885d1d65e..753302b759 100644 --- a/mpcontribs-api/mpcontribs/api/__init__.py +++ b/mpcontribs-api/src/mpcontribs_api/old/__init__.py @@ -1,32 +1,31 @@ # -*- coding: utf-8 -*- """Flask App for MPContribs API""" +import logging import os import smtplib -import logging -import requests -import flask_mongorest.operators as ops - from email.message import EmailMessage from importlib import import_module from importlib.metadata import version -from websocket import create_connection -from flask import Flask, current_app, request, jsonify +from string import punctuation, whitespace + +import flask_mongorest.operators as ops +import requests +from boltons.iterutils import default_enter, remap +from flasgger.base import Swagger +from flask import Flask, current_app, jsonify, request +from flask_compress import Compress from flask_marshmallow import Marshmallow from flask_mongoengine import MongoEngine from flask_mongorest import register_class from flask_sse import sse -from flask_compress import Compress -from flasgger.base import Swagger - +from itsdangerous import URLSafeTimedSerializer from mongoengine import ValidationError from mongoengine.base.datastructures import BaseDict -from itsdangerous import URLSafeTimedSerializer -from string import punctuation, whitespace -from boltons.iterutils import remap, default_enter -from notebook.utils import url_path_join from notebook.gateway.managers import GatewayClient +from notebook.utils import url_path_join from requests.exceptions import ConnectionError, Timeout +from websocket import create_connection try: __version__ = version("mpcontribs-api") diff --git a/mpcontribs-api/mpcontribs/api/attachments/__init__.py b/mpcontribs-api/src/mpcontribs_api/old/attachments/__init__.py similarity index 100% rename from mpcontribs-api/mpcontribs/api/attachments/__init__.py rename to mpcontribs-api/src/mpcontribs_api/old/attachments/__init__.py diff --git a/mpcontribs-api/mpcontribs/api/attachments/document.py b/mpcontribs-api/src/mpcontribs_api/old/attachments/document.py similarity index 100% rename from mpcontribs-api/mpcontribs/api/attachments/document.py rename to mpcontribs-api/src/mpcontribs_api/old/attachments/document.py diff --git a/mpcontribs-api/mpcontribs/api/attachments/views.py b/mpcontribs-api/src/mpcontribs_api/old/attachments/views.py similarity index 100% rename from mpcontribs-api/mpcontribs/api/attachments/views.py rename to mpcontribs-api/src/mpcontribs_api/old/attachments/views.py diff --git a/mpcontribs-api/mpcontribs/api/config.py b/mpcontribs-api/src/mpcontribs_api/old/config.py similarity index 100% rename from mpcontribs-api/mpcontribs/api/config.py rename to mpcontribs-api/src/mpcontribs_api/old/config.py diff --git a/mpcontribs-api/src/mpcontribs_api/old/contributions/__init__.py b/mpcontribs-api/src/mpcontribs_api/old/contributions/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/mpcontribs-api/mpcontribs/api/contributions/document.py b/mpcontribs-api/src/mpcontribs_api/old/contributions/document.py similarity index 100% rename from mpcontribs-api/mpcontribs/api/contributions/document.py rename to mpcontribs-api/src/mpcontribs_api/old/contributions/document.py diff --git a/mpcontribs-api/mpcontribs/api/contributions/formulae.json.gz b/mpcontribs-api/src/mpcontribs_api/old/contributions/formulae.json.gz similarity index 100% rename from mpcontribs-api/mpcontribs/api/contributions/formulae.json.gz rename to mpcontribs-api/src/mpcontribs_api/old/contributions/formulae.json.gz diff --git a/mpcontribs-api/mpcontribs/api/contributions/generate_formulae.py b/mpcontribs-api/src/mpcontribs_api/old/contributions/generate_formulae.py similarity index 100% rename from mpcontribs-api/mpcontribs/api/contributions/generate_formulae.py rename to mpcontribs-api/src/mpcontribs_api/old/contributions/generate_formulae.py diff --git a/mpcontribs-api/mpcontribs/api/contributions/views.py b/mpcontribs-api/src/mpcontribs_api/old/contributions/views.py similarity index 100% rename from mpcontribs-api/mpcontribs/api/contributions/views.py rename to mpcontribs-api/src/mpcontribs_api/old/contributions/views.py diff --git a/mpcontribs-api/mpcontribs/api/core.py b/mpcontribs-api/src/mpcontribs_api/old/core.py similarity index 100% rename from mpcontribs-api/mpcontribs/api/core.py rename to mpcontribs-api/src/mpcontribs_api/old/core.py diff --git a/mpcontribs-api/mpcontribs/api/dashboard.cfg b/mpcontribs-api/src/mpcontribs_api/old/dashboard.cfg similarity index 100% rename from mpcontribs-api/mpcontribs/api/dashboard.cfg rename to mpcontribs-api/src/mpcontribs_api/old/dashboard.cfg diff --git a/mpcontribs-api/mpcontribs/api/notebooks/__init__.py b/mpcontribs-api/src/mpcontribs_api/old/notebooks/__init__.py similarity index 100% rename from mpcontribs-api/mpcontribs/api/notebooks/__init__.py rename to mpcontribs-api/src/mpcontribs_api/old/notebooks/__init__.py diff --git a/mpcontribs-api/mpcontribs/api/notebooks/document.py b/mpcontribs-api/src/mpcontribs_api/old/notebooks/document.py similarity index 100% rename from mpcontribs-api/mpcontribs/api/notebooks/document.py rename to mpcontribs-api/src/mpcontribs_api/old/notebooks/document.py diff --git a/mpcontribs-api/mpcontribs/api/notebooks/views.py b/mpcontribs-api/src/mpcontribs_api/old/notebooks/views.py similarity index 100% rename from mpcontribs-api/mpcontribs/api/notebooks/views.py rename to mpcontribs-api/src/mpcontribs_api/old/notebooks/views.py diff --git a/mpcontribs-api/src/mpcontribs_api/old/projects/__init__.py b/mpcontribs-api/src/mpcontribs_api/old/projects/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/mpcontribs-api/mpcontribs/api/projects/document.py b/mpcontribs-api/src/mpcontribs_api/old/projects/document.py similarity index 100% rename from mpcontribs-api/mpcontribs/api/projects/document.py rename to mpcontribs-api/src/mpcontribs_api/old/projects/document.py diff --git a/mpcontribs-api/mpcontribs/api/projects/views.py b/mpcontribs-api/src/mpcontribs_api/old/projects/views.py similarity index 100% rename from mpcontribs-api/mpcontribs/api/projects/views.py rename to mpcontribs-api/src/mpcontribs_api/old/projects/views.py diff --git a/mpcontribs-api/src/mpcontribs_api/old/structures/__init__.py b/mpcontribs-api/src/mpcontribs_api/old/structures/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/mpcontribs-api/mpcontribs/api/structures/document.py b/mpcontribs-api/src/mpcontribs_api/old/structures/document.py similarity index 100% rename from mpcontribs-api/mpcontribs/api/structures/document.py rename to mpcontribs-api/src/mpcontribs_api/old/structures/document.py diff --git a/mpcontribs-api/mpcontribs/api/structures/views.py b/mpcontribs-api/src/mpcontribs_api/old/structures/views.py similarity index 100% rename from mpcontribs-api/mpcontribs/api/structures/views.py rename to mpcontribs-api/src/mpcontribs_api/old/structures/views.py diff --git a/mpcontribs-api/mpcontribs/api/tables/__init__.py b/mpcontribs-api/src/mpcontribs_api/old/tables/__init__.py similarity index 100% rename from mpcontribs-api/mpcontribs/api/tables/__init__.py rename to mpcontribs-api/src/mpcontribs_api/old/tables/__init__.py diff --git a/mpcontribs-api/mpcontribs/api/tables/document.py b/mpcontribs-api/src/mpcontribs_api/old/tables/document.py similarity index 100% rename from mpcontribs-api/mpcontribs/api/tables/document.py rename to mpcontribs-api/src/mpcontribs_api/old/tables/document.py diff --git a/mpcontribs-api/mpcontribs/api/tables/views.py b/mpcontribs-api/src/mpcontribs_api/old/tables/views.py similarity index 100% rename from mpcontribs-api/mpcontribs/api/tables/views.py rename to mpcontribs-api/src/mpcontribs_api/old/tables/views.py diff --git a/mpcontribs-api/mpcontribs/api/templates/admin_email.html b/mpcontribs-api/src/mpcontribs_api/old/templates/admin_email.html similarity index 100% rename from mpcontribs-api/mpcontribs/api/templates/admin_email.html rename to mpcontribs-api/src/mpcontribs_api/old/templates/admin_email.html diff --git a/mpcontribs-api/mpcontribs/api/templates/card_bootstrap.html b/mpcontribs-api/src/mpcontribs_api/old/templates/card_bootstrap.html similarity index 100% rename from mpcontribs-api/mpcontribs/api/templates/card_bootstrap.html rename to mpcontribs-api/src/mpcontribs_api/old/templates/card_bootstrap.html diff --git a/mpcontribs-api/mpcontribs/api/templates/card_bulma.html b/mpcontribs-api/src/mpcontribs_api/old/templates/card_bulma.html similarity index 100% rename from mpcontribs-api/mpcontribs/api/templates/card_bulma.html rename to mpcontribs-api/src/mpcontribs_api/old/templates/card_bulma.html diff --git a/mpcontribs-api/mpcontribs/api/templates/owner_email.html b/mpcontribs-api/src/mpcontribs_api/old/templates/owner_email.html similarity index 100% rename from mpcontribs-api/mpcontribs/api/templates/owner_email.html rename to mpcontribs-api/src/mpcontribs_api/old/templates/owner_email.html diff --git a/mpcontribs-api/src/mpcontribs_api/types.py b/mpcontribs-api/src/mpcontribs_api/types.py new file mode 100644 index 0000000000..e69de29bb2 From 04da6627525271d21a50f5d187b6bff83fa51a97 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 28 May 2026 15:43:57 -0700 Subject: [PATCH 007/591] Removed project-level uv ennvironment --- .python-version | 1 - main.py | 6 -- pyproject.toml | 9 --- uv.lock | 158 ------------------------------------------------ 4 files changed, 174 deletions(-) delete mode 100644 .python-version delete mode 100644 main.py delete mode 100644 pyproject.toml delete mode 100644 uv.lock diff --git a/.python-version b/.python-version deleted file mode 100644 index 6324d401a0..0000000000 --- a/.python-version +++ /dev/null @@ -1 +0,0 @@ -3.14 diff --git a/main.py b/main.py deleted file mode 100644 index bf67570ae8..0000000000 --- a/main.py +++ /dev/null @@ -1,6 +0,0 @@ -def main(): - print("Hello from fastapi-conversion!") - - -if __name__ == "__main__": - main() diff --git a/pyproject.toml b/pyproject.toml deleted file mode 100644 index 7826c72ae1..0000000000 --- a/pyproject.toml +++ /dev/null @@ -1,9 +0,0 @@ -[project] -name = "fastapi-conversion" -version = "0.1.0" -description = "Add your description here" -readme = "README.md" -requires-python = ">=3.14" -dependencies = [ - "fastapi>=0.136.3", -] diff --git a/uv.lock b/uv.lock deleted file mode 100644 index 1ea3d847d9..0000000000 --- a/uv.lock +++ /dev/null @@ -1,158 +0,0 @@ -version = 1 -revision = 3 -requires-python = ">=3.14" - -[[package]] -name = "annotated-doc" -version = "0.0.4" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/57/ba/046ceea27344560984e26a590f90bc7f4a75b06701f653222458922b558c/annotated_doc-0.0.4.tar.gz", hash = "sha256:fbcda96e87e9c92ad167c2e53839e57503ecfda18804ea28102353485033faa4", size = 7288, upload-time = "2025-11-10T22:07:42.062Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/1e/d3/26bf1008eb3d2daa8ef4cacc7f3bfdc11818d111f7e2d0201bc6e3b49d45/annotated_doc-0.0.4-py3-none-any.whl", hash = "sha256:571ac1dc6991c450b25a9c2d84a3705e2ae7a53467b5d111c24fa8baabbed320", size = 5303, upload-time = "2025-11-10T22:07:40.673Z" }, -] - -[[package]] -name = "annotated-types" -version = "0.7.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/ee/67/531ea369ba64dcff5ec9c3402f9f51bf748cec26dde048a2f973a4eea7f5/annotated_types-0.7.0.tar.gz", hash = "sha256:aff07c09a53a08bc8cfccb9c85b05f1aa9a2a6f23728d790723543408344ce89", size = 16081, upload-time = "2024-05-20T21:33:25.928Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/78/b6/6307fbef88d9b5ee7421e68d78a9f162e0da4900bc5f5793f6d3d0e34fb8/annotated_types-0.7.0-py3-none-any.whl", hash = "sha256:1f02e8b43a8fbbc3f3e0d4f0f4bfc8131bcb4eebe8849b8e5c773f3a1c582a53", size = 13643, upload-time = "2024-05-20T21:33:24.1Z" }, -] - -[[package]] -name = "anyio" -version = "4.13.0" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "idna" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/19/14/2c5dd9f512b66549ae92767a9c7b330ae88e1932ca57876909410251fe13/anyio-4.13.0.tar.gz", hash = "sha256:334b70e641fd2221c1505b3890c69882fe4a2df910cba14d97019b90b24439dc", size = 231622, upload-time = "2026-03-24T12:59:09.671Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/da/42/e921fccf5015463e32a3cf6ee7f980a6ed0f395ceeaa45060b61d86486c2/anyio-4.13.0-py3-none-any.whl", hash = "sha256:08b310f9e24a9594186fd75b4f73f4a4152069e3853f1ed8bfbf58369f4ad708", size = 114353, upload-time = "2026-03-24T12:59:08.246Z" }, -] - -[[package]] -name = "fastapi" -version = "0.136.3" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "annotated-doc" }, - { name = "pydantic" }, - { name = "starlette" }, - { name = "typing-extensions" }, - { name = "typing-inspection" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/81/2d/ff8d91d7b564d464629a0fd50a4489c97fcb836ac230bf3a7269232a9b1f/fastapi-0.136.3.tar.gz", hash = "sha256:e487fae93ad408e6f47641ee4dfe389864fd7bec92e547ea8498fc13f43e83ab", size = 396410, upload-time = "2026-05-23T18:53:15.192Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/e0/82/45359b62a067409bd929ae8a56b8ed13e5a8c8a61194b3c236920999ab83/fastapi-0.136.3-py3-none-any.whl", hash = "sha256:3d2a69bdf04b7e9f3afa292c3bc7a98816bbfafa10bc9b45f3f3700d2f761620", size = 117481, upload-time = "2026-05-23T18:53:16.924Z" }, -] - -[[package]] -name = "fastapi-conversion" -version = "0.1.0" -source = { virtual = "." } -dependencies = [ - { name = "fastapi" }, -] - -[package.metadata] -requires-dist = [{ name = "fastapi", specifier = ">=0.136.3" }] - -[[package]] -name = "idna" -version = "3.16" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/1a/88/bcf9709822fe69d02c2a6a77956c98ce6ea8ca8767a9aadcedc7eb6a2390/idna-3.16.tar.gz", hash = "sha256:d7a6da03db833450fca25d2358ac9ff06cd624577a4aea3a596d5c0f77b8e03d", size = 203770, upload-time = "2026-05-22T00:16:18.781Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/94/16/70255075a9859a0e3adb789b68ceb0e210dec03934245fd98d248226572f/idna-3.16-py3-none-any.whl", hash = "sha256:cc246e3a3f89580c3a951b5ad298ca4638078b2cdd4f115654332b5c26daded5", size = 74165, upload-time = "2026-05-22T00:16:16.698Z" }, -] - -[[package]] -name = "pydantic" -version = "2.13.4" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "annotated-types" }, - { name = "pydantic-core" }, - { name = "typing-extensions" }, - { name = "typing-inspection" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/18/a5/b60d21ac674192f8ab0ba4e9fd860690f9b4a6e51ca5df118733b487d8d6/pydantic-2.13.4.tar.gz", hash = "sha256:c40756b57adaa8b1efeeced5c196f3f3b7c435f90e84ea7f443901bec8099ef6", size = 844775, upload-time = "2026-05-06T13:43:05.343Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/fd/7b/122376b1fd3c62c1ed9dc80c931ace4844b3c55407b6fb2d199377c9736f/pydantic-2.13.4-py3-none-any.whl", hash = "sha256:45a282cde31d808236fd7ea9d919b128653c8b38b393d1c4ab335c62924d9aba", size = 472262, upload-time = "2026-05-06T13:43:02.641Z" }, -] - -[[package]] -name = "pydantic-core" -version = "2.46.4" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "typing-extensions" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/9d/56/921726b776ace8d8f5db44c4ef961006580d91dc52b803c489fafd1aa249/pydantic_core-2.46.4.tar.gz", hash = "sha256:62f875393d7f270851f20523dd2e29f082bcc82292d66db2b64ea71f64b6e1c1", size = 471464, upload-time = "2026-05-06T13:37:06.98Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/8d/74/228a26ddad29c6672b805d9fd78e8d251cd04004fa7eed0e622096cd0250/pydantic_core-2.46.4-cp314-cp314-macosx_10_12_x86_64.whl", hash = "sha256:428e04521a40150c85216fc8b85e8d39fece235a9cf5e383761238c7fa9b96fb", size = 2102079, upload-time = "2026-05-06T13:38:41.019Z" }, - { url = "https://files.pythonhosted.org/packages/ad/1f/8970b150a4b4365623ae00fc88603491f763c627311ae8031e3111356d6e/pydantic_core-2.46.4-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:23ace664830ee0bfe014a0c7bc248b1f7f25ed7ad103852c317624a1083af462", size = 1952179, upload-time = "2026-05-06T13:36:59.812Z" }, - { url = "https://files.pythonhosted.org/packages/95/30/5211a831ae054928054b2f79731661087a2bc5c01e825c672b3a4a8f1b3e/pydantic_core-2.46.4-cp314-cp314-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ce5c1d2a8b27468f433ca974829c44060b8097eedc39933e3c206a90ee49c4a9", size = 1978926, upload-time = "2026-05-06T13:37:39.933Z" }, - { url = "https://files.pythonhosted.org/packages/57/e9/689668733b1eb67adeef047db3c2e8788fcf65a7fd9c9e2b46b7744fe245/pydantic_core-2.46.4-cp314-cp314-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:7283d57845ecf5a163403eb0702dfc220cc4fbdd18919cb5ccea4f95ee1cdab4", size = 2046785, upload-time = "2026-05-06T13:38:01.995Z" }, - { url = "https://files.pythonhosted.org/packages/60/d9/6715260422ff50a2109878fd24d948a6c3446bb2664f34ee78cd972b3acd/pydantic_core-2.46.4-cp314-cp314-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:8daafc69c93ee8a0204506a3b6b30f586ef54028f52aeeeb5c4cfc5184fd5914", size = 2228733, upload-time = "2026-05-06T13:40:50.371Z" }, - { url = "https://files.pythonhosted.org/packages/18/ae/fdb2f64316afca925640f8e70bb1a564b0ec2721c1389e25b8eb4bf9a299/pydantic_core-2.46.4-cp314-cp314-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:cd2213145bcc2ba85884d0ac63d222fece9209678f77b9b4d76f054c561adb28", size = 2307534, upload-time = "2026-05-06T13:37:21.531Z" }, - { url = "https://files.pythonhosted.org/packages/89/1d/8eff589b45bb8190a9d12c49cfad0f176a5cbd1534908a6b5125e2886239/pydantic_core-2.46.4-cp314-cp314-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7a5f930472650a82629163023e630d160863fce524c616f4e5186e5de9d9a49b", size = 2099732, upload-time = "2026-05-06T13:39:31.942Z" }, - { url = "https://files.pythonhosted.org/packages/06/d5/ee5a3366637fee41dee51a1fc91562dcf12ddbc68fda34e6b253da2324bb/pydantic_core-2.46.4-cp314-cp314-manylinux_2_31_riscv64.whl", hash = "sha256:c1b3f518abeca3aa13c712fd202306e145abf59a18b094a6bafb2d2bbf59192c", size = 2129627, upload-time = "2026-05-06T13:37:25.033Z" }, - { url = "https://files.pythonhosted.org/packages/94/33/2414be571d2c6a6c4d08be21f9292b6d3fdb08949a97b6dfe985017821db/pydantic_core-2.46.4-cp314-cp314-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:1a7dd0b3ee80d90150e3495a3a13ac34dbcbfd4f012996a6a1d8900e91b5c0fb", size = 2179141, upload-time = "2026-05-06T13:37:14.046Z" }, - { url = "https://files.pythonhosted.org/packages/7b/79/7daa95be995be0eecc4cf75064cb33f9bbbfe3fe0158caf2f0d4a996a5c7/pydantic_core-2.46.4-cp314-cp314-musllinux_1_1_aarch64.whl", hash = "sha256:3fb702cd90b0446a3a1c5e470bfa0dd23c0233b676a9099ddcc964fa6ca13898", size = 2184325, upload-time = "2026-05-06T13:36:53.615Z" }, - { url = "https://files.pythonhosted.org/packages/9f/cb/d0a382f5c0de8a222dc61c65348e0ce831b1f68e0a018450d31c2cace3a5/pydantic_core-2.46.4-cp314-cp314-musllinux_1_1_armv7l.whl", hash = "sha256:b8458003118a712e66286df6a707db01c52c0f52f7db8e4a38f0da1d3b94fc4e", size = 2323990, upload-time = "2026-05-06T13:40:29.971Z" }, - { url = "https://files.pythonhosted.org/packages/05/db/d9ba624cc4a5aced1598e88c04fdbd8310c8a69b9d38b9a3d39ce3a61ed7/pydantic_core-2.46.4-cp314-cp314-musllinux_1_1_x86_64.whl", hash = "sha256:372429a130e469c9cd698925ce5fc50940b7a1336b0d82038e63d5bbc4edc519", size = 2369978, upload-time = "2026-05-06T13:37:23.027Z" }, - { url = "https://files.pythonhosted.org/packages/f2/20/d15df15ba918c423461905802bfd2981c3af0bfa0e40d05e13edbfa48bc3/pydantic_core-2.46.4-cp314-cp314-win32.whl", hash = "sha256:85bb3611ff1802f3ee7fdd7dbff26b56f343fb432d57a4728fdd49b6ef35e2f4", size = 1966354, upload-time = "2026-05-06T13:38:03.499Z" }, - { url = "https://files.pythonhosted.org/packages/fc/b6/6b8de4c0a7d7ab3004c439c80c5c1e0a3e8d78bbae19379b01960383d9e5/pydantic_core-2.46.4-cp314-cp314-win_amd64.whl", hash = "sha256:811ff8e9c313ab425368bcbb36e5c4ebd7108c2bbf4e4089cfbb0b01eff63fac", size = 2072238, upload-time = "2026-05-06T13:39:40.807Z" }, - { url = "https://files.pythonhosted.org/packages/32/36/51eb763beec1f4cf59b1db243a7dcc39cbb41230f050a09b9d69faaf0a48/pydantic_core-2.46.4-cp314-cp314-win_arm64.whl", hash = "sha256:bfec22eab3c8cc2ceec0248aec886624116dc079afa027ecc8ad4a7e62010f8a", size = 2018251, upload-time = "2026-05-06T13:37:26.72Z" }, - { url = "https://files.pythonhosted.org/packages/e8/91/855af51d625b23aa987116a19e231d2aaef9c4a415273ddc189b79a45fee/pydantic_core-2.46.4-cp314-cp314t-macosx_10_12_x86_64.whl", hash = "sha256:af8244b2bef6aaad6d92cda81372de7f8c8d36c9f0c3ea36e827c60e7d9467a0", size = 2099593, upload-time = "2026-05-06T13:39:47.682Z" }, - { url = "https://files.pythonhosted.org/packages/fb/1b/8784a54c65edb5f49f0a14d6977cf1b209bba85a4c77445b255c2de58ab3/pydantic_core-2.46.4-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:5a4330cdbc57162e4b3aa303f588ba752257694c9c9be3e7ebb11b4aca659b5d", size = 1935226, upload-time = "2026-05-06T13:40:40.428Z" }, - { url = "https://files.pythonhosted.org/packages/e8/e7/1955d28d1afc56dd4b3ad7cc0cf39df1b9852964cf16e5d13912756d6d6b/pydantic_core-2.46.4-cp314-cp314t-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:29c61fc04a3d840155ff08e475a04809278972fe6aef51e2720554e96367e34b", size = 1974605, upload-time = "2026-05-06T13:37:32.029Z" }, - { url = "https://files.pythonhosted.org/packages/93/e2/3fedbf0ba7a22850e6e9fd78117f1c0f10f950182344d8a6c535d468fdd8/pydantic_core-2.46.4-cp314-cp314t-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:c50f2528cf200c5eed56faf3f4e22fcd5f38c157a8b78576e6ba3168ec35f000", size = 2030777, upload-time = "2026-05-06T13:38:55.239Z" }, - { url = "https://files.pythonhosted.org/packages/f8/61/46be275fcaaba0b4f5b9669dd852267ce1ff616592dccf7a7845588df091/pydantic_core-2.46.4-cp314-cp314t-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:0cbe8b01f948de4286c74cdd6c667aceb38f5c1e26f0693b3983d9d74887c65e", size = 2236641, upload-time = "2026-05-06T13:37:08.096Z" }, - { url = "https://files.pythonhosted.org/packages/60/db/12e93e46a8bac9988be3c016860f83293daea8c716c029c9ace279036f2f/pydantic_core-2.46.4-cp314-cp314t-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:617d7e2ca7dcb8c5cf6bcb8c59b8832c94b36196bbf1cbd1bfb56ed341905edd", size = 2286404, upload-time = "2026-05-06T13:40:20.221Z" }, - { url = "https://files.pythonhosted.org/packages/e2/4a/4d8b19008f38d31c53b8219cfedc2e3d5de5fe99d90076b7e767de29274f/pydantic_core-2.46.4-cp314-cp314t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7027560ee92211647d0d34e3f7cd6f50da56399d26a9c8ad0da286d3869a53f3", size = 2109219, upload-time = "2026-05-06T13:38:12.153Z" }, - { url = "https://files.pythonhosted.org/packages/88/70/3cbc40978fefb7bb09c6708d40d4ad1a5d70fd7213c3d17f971de868ec1f/pydantic_core-2.46.4-cp314-cp314t-manylinux_2_31_riscv64.whl", hash = "sha256:f99626688942fb746e545232e7726926f3be91b5975f8b55327665fafda991c7", size = 2110594, upload-time = "2026-05-06T13:40:02.971Z" }, - { url = "https://files.pythonhosted.org/packages/9d/20/b8d36736216e29491125531685b2f9e61aa5b4b2599893f8268551da3338/pydantic_core-2.46.4-cp314-cp314t-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:fc3e9034a63de20e15e8ade85358bc6efc614008cab72898b4b4952bea0509ff", size = 2159542, upload-time = "2026-05-06T13:39:27.506Z" }, - { url = "https://files.pythonhosted.org/packages/1d/a2/367df868eb584dacf6bf82a389272406d7178e301c4ac82545ab98bc2dd9/pydantic_core-2.46.4-cp314-cp314t-musllinux_1_1_aarch64.whl", hash = "sha256:97e7cf2be5c77b7d1a9713a05605d49460d02c6078d38d8bef3cbe323c548424", size = 2168146, upload-time = "2026-05-06T13:38:31.93Z" }, - { url = "https://files.pythonhosted.org/packages/c1/b8/4460f77f7e201893f649a29ab355dddd3beee8a97bcb1a320db414f9a06e/pydantic_core-2.46.4-cp314-cp314t-musllinux_1_1_armv7l.whl", hash = "sha256:3bf92c5d0e00fefaab325a4d27828fe6b6e2a21848686b5b60d2d9eeb09d76c6", size = 2306309, upload-time = "2026-05-06T13:37:44.717Z" }, - { url = "https://files.pythonhosted.org/packages/64/c4/be2639293acd87dc8ddbcec41a73cee9b2ebf996fe6d892a1a74e88ad3f7/pydantic_core-2.46.4-cp314-cp314t-musllinux_1_1_x86_64.whl", hash = "sha256:3ecbc122d18468d06ca279dc26a8c2e2d5acb10943bb35e36ae92096dc3b5565", size = 2369736, upload-time = "2026-05-06T13:37:05.645Z" }, - { url = "https://files.pythonhosted.org/packages/30/a6/9f9f380dbb301f67023bf8f707aaa75daadf84f7152d95c410fd7e81d994/pydantic_core-2.46.4-cp314-cp314t-win32.whl", hash = "sha256:e846ae7835bf0703ae43f534ab79a867146dadd59dc9ca5c8b53d5c8f7c9ef02", size = 1955575, upload-time = "2026-05-06T13:38:51.116Z" }, - { url = "https://files.pythonhosted.org/packages/40/1f/f1eb9eb350e795d1af8586289746f5c5677d16043040d63710e22abc43c9/pydantic_core-2.46.4-cp314-cp314t-win_amd64.whl", hash = "sha256:2108ba5c1c1eca18030634489dc544844144ee36357f2f9f780b93e7ddbb44b5", size = 2051624, upload-time = "2026-05-06T13:38:21.672Z" }, - { url = "https://files.pythonhosted.org/packages/f6/d2/42dd53d0a85c27606f316d3aa5d2869c4e8470a5ed6dec30e4a1abe19192/pydantic_core-2.46.4-cp314-cp314t-win_arm64.whl", hash = "sha256:4fcbe087dbc2068af7eda3aa87634eba216dbda64d1ae73c8684b621d33f6596", size = 2017325, upload-time = "2026-05-06T13:40:52.723Z" }, -] - -[[package]] -name = "starlette" -version = "1.1.0" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "anyio" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/95/66/4d20cdf39a8d6a51e663b7038e3b828ff211d3891a43a713fe7e4643f3a8/starlette-1.1.0.tar.gz", hash = "sha256:e83c7fe0ddecd8719c5b840080325aec0260acec86e9832899e377b91d65e90f", size = 2660060, upload-time = "2026-05-23T16:55:41.376Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/93/79/920b8e0a8b20f793e8d64855095cb8febabf6175b8550b6f7a547d813891/starlette-1.1.0-py3-none-any.whl", hash = "sha256:7f0dfd38e428aad5cb6f9f667f0ca1d2d8ca3f3385dccac8305f79ec98458382", size = 72899, upload-time = "2026-05-23T16:55:39.201Z" }, -] - -[[package]] -name = "typing-extensions" -version = "4.15.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/72/94/1a15dd82efb362ac84269196e94cf00f187f7ed21c242792a923cdb1c61f/typing_extensions-4.15.0.tar.gz", hash = "sha256:0cea48d173cc12fa28ecabc3b837ea3cf6f38c6d1136f85cbaaf598984861466", size = 109391, upload-time = "2025-08-25T13:49:26.313Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/18/67/36e9267722cc04a6b9f15c7f3441c2363321a3ea07da7ae0c0707beb2a9c/typing_extensions-4.15.0-py3-none-any.whl", hash = "sha256:f0fa19c6845758ab08074a0cfa8b7aecb71c999ca73d62883bc25cc018c4e548", size = 44614, upload-time = "2025-08-25T13:49:24.86Z" }, -] - -[[package]] -name = "typing-inspection" -version = "0.4.2" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "typing-extensions" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/55/e3/70399cb7dd41c10ac53367ae42139cf4b1ca5f36bb3dc6c9d33acdb43655/typing_inspection-0.4.2.tar.gz", hash = "sha256:ba561c48a67c5958007083d386c3295464928b01faa735ab8547c5692e87f464", size = 75949, upload-time = "2025-10-01T02:14:41.687Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/dc/9b/47798a6c91d8bdb567fe2698fe81e0c6b7cb7ef4d13da4114b41d239f65d/typing_inspection-0.4.2-py3-none-any.whl", hash = "sha256:4ed1cacbdc298c220f1bd249ed5287caa16f34d44ef4e9c3d0cbad5b521545e7", size = 14611, upload-time = "2025-10-01T02:14:40.154Z" }, -] From b84f81fc3d65407271de86f012035942e4092f26 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 1 Jun 2026 16:03:17 -0700 Subject: [PATCH 008/591] Updated python version to 3.14 --- mpcontribs-api/pyproject.toml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mpcontribs-api/pyproject.toml b/mpcontribs-api/pyproject.toml index 78464c7390..3db7b16a0a 100644 --- a/mpcontribs-api/pyproject.toml +++ b/mpcontribs-api/pyproject.toml @@ -17,7 +17,7 @@ include = ["mpcontribs.api"] [project] name = "mpcontribs-api" dynamic = ["version"] -requires-python = ">=3.11" +requires-python = ">=3.14" description="API for community-contributed Materials Project data" license = "BSD-3-Clause-LBNL" authors = [ @@ -67,6 +67,8 @@ dependencies = [ "opentelemetry-exporter-otlp-proto-grpc>=1.42.1", "opentelemetry-instrumentation-fastapi>=0.63b1", "opentelemetry-instrumentation-pymongo>=0.63b1", + "beanie>=2.1.0", + "fastapi-filter>=2.0.1", ] [project.urls] @@ -106,4 +108,4 @@ ignore = ["D105","D2","D4"] [tool.mypy] ignore_missing_imports = true namespace_packages = true -python_version = 3.11 +python_version = 3.14 From a3624ded4b72788672f9c92e881e0e011ee14dd3 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 1 Jun 2026 16:03:56 -0700 Subject: [PATCH 009/591] Added projects router and reintroduced prefix --- mpcontribs-api/src/mpcontribs_api/api/v1/router.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/api/v1/router.py b/mpcontribs-api/src/mpcontribs_api/api/v1/router.py index 456aa8f29d..289b2159df 100644 --- a/mpcontribs-api/src/mpcontribs_api/api/v1/router.py +++ b/mpcontribs-api/src/mpcontribs_api/api/v1/router.py @@ -1,5 +1,7 @@ from fastapi import APIRouter -router = APIRouter(prefix="api/v1") +from mpcontribs_api.domains.projects.router import router as projects_router -router. +router = APIRouter(prefix="/api/v1") + +router.include_router(projects_router, prefix="/projects") From f31519b5e7f1160c86cdeecb43ba0ccfe99daa9a Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 1 Jun 2026 16:04:30 -0700 Subject: [PATCH 010/591] Added Beanie init --- mpcontribs-api/src/mpcontribs_api/app.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/app.py b/mpcontribs-api/src/mpcontribs_api/app.py index 6994b6cb23..3a5aed8f29 100644 --- a/mpcontribs-api/src/mpcontribs_api/app.py +++ b/mpcontribs-api/src/mpcontribs_api/app.py @@ -4,7 +4,8 @@ from contextlib import asynccontextmanager from typing import AsyncGenerator -from fastapi import FastAPI +from beanie import init_beanie +from fastapi import Depends, FastAPI from pymongo import AsyncMongoClient from starlette.middleware.base import BaseHTTPMiddleware @@ -12,12 +13,14 @@ from mpcontribs_api.config import Settings, get_settings from mpcontribs_api.exceptions import register_exception_handlers from mpcontribs_api.logging import configure_logging +from src.mpcontribs_api.dependencies import verify_gateway +from src.mpcontribs_api.domains.projects.models import Project from src.mpcontribs_api.middleware import bind_request_context logger = logging.getLogger(__name__) -def _build_lifespan(settings: Settings): +async def _build_lifespan(settings: Settings): @asynccontextmanager async def lifespan(app: FastAPI) -> AsyncGenerator[None]: # --- startup --- @@ -35,6 +38,9 @@ async def lifespan(app: FastAPI) -> AsyncGenerator[None]: app.state.mongo_client = client app.state.db = client[settings.mongo.db_name] + # Initialize beanie with document classes and a database + await init_beanie(database=client.db_name, document_models=[Project]) + try: yield finally: @@ -45,7 +51,7 @@ async def lifespan(app: FastAPI) -> AsyncGenerator[None]: return lifespan -def create_app(settings: Settings | None = None) -> FastAPI: +async def create_app(settings: Settings | None = None) -> FastAPI: settings = settings or get_settings() configure_logging(settings) @@ -55,7 +61,8 @@ def create_app(settings: Settings | None = None) -> FastAPI: debug=False if settings.environment == "prod" else True, # Would be nice to implement eventually # default_response_class=DefaultResponse, - lifespan=_build_lifespan(settings), + lifespan=await _build_lifespan(settings), + dependencies=[Depends(verify_gateway)], ) # Add request context to logs From 4de7efddabaef76c0cd9963cecf77649b7a4161d Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 1 Jun 2026 16:05:14 -0700 Subject: [PATCH 011/591] Broke redis and kong settings into their own classes for modularity --- mpcontribs-api/src/mpcontribs_api/config.py | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/config.py b/mpcontribs-api/src/mpcontribs_api/config.py index 81171037aa..7308337823 100644 --- a/mpcontribs-api/src/mpcontribs_api/config.py +++ b/mpcontribs-api/src/mpcontribs_api/config.py @@ -5,6 +5,15 @@ from pydantic_settings import BaseSettings, SettingsConfigDict +class RedisSettings(BaseModel): + address: SecretStr + url: SecretStr + + +class KongSettings(BaseModel): + gateway_secret: SecretStr + + class MongoSettings(BaseModel): """MongoDB settings. @@ -35,6 +44,11 @@ class MongoSettings(BaseModel): "while it is waiting, multiple server monitoring operations may be carried out", ) + admin_group: str = Field( + default="admin", + description="Name of admin group to consider in requests to MongoDB. Not directly passed to Mongo, but consumed by auth.", + ) + class Settings(BaseSettings): model_config = SettingsConfigDict( @@ -47,9 +61,9 @@ class Settings(BaseSettings): mongo: MongoSettings - # Redis settings - redis_address: SecretStr - redis_url: SecretStr + kong: KongSettings + + redis: RedisSettings # SMTP Settings mail_default_sender: str = Field( From 48f19a60e48810cbda86c23767f1a1314179503e Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 1 Jun 2026 16:06:26 -0700 Subject: [PATCH 012/591] Added shared types --- mpcontribs-api/src/mpcontribs_api/types.py | 35 ++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/mpcontribs-api/src/mpcontribs_api/types.py b/mpcontribs-api/src/mpcontribs_api/types.py index e69de29bb2..9607ef6980 100644 --- a/mpcontribs-api/src/mpcontribs_api/types.py +++ b/mpcontribs-api/src/mpcontribs_api/types.py @@ -0,0 +1,35 @@ +from typing import Annotated + +from pandas.core.arrays.string_arrow import re +from pydantic import BeforeValidator, Field + +ShortStr = Annotated[str, Field(min_length=3, max_length=30)] + + +_EMAIL_RE = re.compile(r"^[^:@\s]+:[^:@\s]+@[^@\s]+\.[^@\s]+$") + + +def _validate_prefixed_email(v: str) -> str: + v = v.strip() + if not _EMAIL_RE.match(v): + raise ValueError( + "must match ':@', e.g. 'google:name@gmail.com'" + ) + return v + + +PrefixedEmail = Annotated[str, BeforeValidator(_validate_prefixed_email)] + + +def _parse_sort_entry(v: str) -> tuple[str, int]: + v = v.strip() + if not v: + raise ValueError("empty sort field") + if v[0] == "-": + return v[1:], -1 + if v[0] == "+": + return v[1:], 1 + return v, 1 + + +SortEntry = Annotated[tuple[str, int], BeforeValidator(_parse_sort_entry)] From 4e44d0381154d75d32a52f86b69eb2f63942c818 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 1 Jun 2026 16:08:02 -0700 Subject: [PATCH 013/591] Removed unnecessary files --- mpcontribs-api/src/mpcontribs_api/db.py | 11 ----------- .../mpcontribs_api/domains/contributions/service.py | 0 .../src/mpcontribs_api/domains/projects/service.py | 0 3 files changed, 11 deletions(-) delete mode 100644 mpcontribs-api/src/mpcontribs_api/db.py delete mode 100644 mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py delete mode 100644 mpcontribs-api/src/mpcontribs_api/domains/projects/service.py diff --git a/mpcontribs-api/src/mpcontribs_api/db.py b/mpcontribs-api/src/mpcontribs_api/db.py deleted file mode 100644 index afd11748c4..0000000000 --- a/mpcontribs-api/src/mpcontribs_api/db.py +++ /dev/null @@ -1,11 +0,0 @@ -from typing import Annotated - -from fastapi import Depends, Request -from pymongo.asynchronous.database import AsyncDatabase - - -def get_db(request: Request) -> AsyncDatabase: - return request.app.state.db - - -DbDep = Annotated[AsyncDatabase, Depends(get_db)] diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/service.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/service.py deleted file mode 100644 index e69de29bb2..0000000000 From c44dc0e74e652c05bcd089aa640bbb430a36cb6f Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 1 Jun 2026 16:08:28 -0700 Subject: [PATCH 014/591] Added packages to uv --- mpcontribs-api/uv.lock | 45 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/mpcontribs-api/uv.lock b/mpcontribs-api/uv.lock index e98ba4cd0e..8bc0ab7fde 100644 --- a/mpcontribs-api/uv.lock +++ b/mpcontribs-api/uv.lock @@ -245,6 +245,22 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/aa/31/759d077aa680555e17c9d2bb09edf4c3428d895fe5d35a8df67684401b84/backports_zstd-1.5.0-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:6172dcdd664ef243e55a35e6b45f1c866767c61043f0ddcd908abd14df662065", size = 300853, upload-time = "2026-05-11T19:54:23.1Z" }, ] +[[package]] +name = "beanie" +version = "2.1.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "click" }, + { name = "lazy-model" }, + { name = "pydantic" }, + { name = "pymongo" }, + { name = "typing-extensions" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/53/9c/f3037fff9ea059d7b0c72b6c6e4f3dcfeb28bf544fe0fc5420335d7c49d0/beanie-2.1.0.tar.gz", hash = "sha256:44f3c50710aa90daa9c9c40f9bf9c8954968fe16d7e5398c1f2fd462daf94fe1", size = 185979, upload-time = "2026-03-26T01:27:03.63Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/00/b5/1c6c404bcce8fa53d3f422dce6e58bff99c3e3cb2a3c49d519e3e5822125/beanie-2.1.0-py3-none-any.whl", hash = "sha256:077381dad0e0129fd4dc38cdaa3d85cb517da7338e3d893a689314884df4379b", size = 92697, upload-time = "2026-03-26T01:27:02.191Z" }, +] + [[package]] name = "beautifulsoup4" version = "4.14.3" @@ -1033,6 +1049,19 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/e0/82/45359b62a067409bd929ae8a56b8ed13e5a8c8a61194b3c236920999ab83/fastapi-0.136.3-py3-none-any.whl", hash = "sha256:3d2a69bdf04b7e9f3afa292c3bc7a98816bbfafa10bc9b45f3f3700d2f761620", size = 117481, upload-time = "2026-05-23T18:53:16.924Z" }, ] +[[package]] +name = "fastapi-filter" +version = "2.0.1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "fastapi" }, + { name = "pydantic" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/43/ed/c36cfcd849519fd2d23051ad81a91fc5e8cfa7109496fc8a10ad565a5fe9/fastapi_filter-2.0.1.tar.gz", hash = "sha256:cffda370097af7e404f1eb188aca58b199084bfaf7cec881e40b404adf12566e", size = 9857, upload-time = "2024-12-07T17:30:06.343Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/5e/88/afc022ad64d12f730141fc50758ecf9d60de5fed11335dc16e3127617f05/fastapi_filter-2.0.1-py3-none-any.whl", hash = "sha256:711d48707ec62f7c9e12a7713fc0f6a99858a9e3741b4d108102d5599e77197d", size = 11586, upload-time = "2024-12-07T17:30:05.375Z" }, +] + [[package]] name = "fastjsonschema" version = "2.21.2" @@ -1969,6 +1998,18 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/82/3d/14ce75ef66813643812f3093ab17e46d3a206942ce7376d31ec2d36229e7/lark-1.3.1-py3-none-any.whl", hash = "sha256:c629b661023a014c37da873b4ff58a817398d12635d3bbb2c5a03be7fe5d1e12", size = 113151, upload-time = "2025-10-27T18:25:54.882Z" }, ] +[[package]] +name = "lazy-model" +version = "0.4.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "pydantic" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/72/85/e25dc36dee49cf0726c03a1558b5c311a17095bc9361bcbf47226cb3075a/lazy-model-0.4.0.tar.gz", hash = "sha256:a851d85d0b518b0b9c8e626bbee0feb0494c0e0cb5636550637f032dbbf9c55f", size = 8256, upload-time = "2025-08-07T20:05:34.737Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/5c/54/653ea0d7c578741e9867ccf0cbf47b7eac09ff22e4238f311ac20671a911/lazy_model-0.4.0-py3-none-any.whl", hash = "sha256:95ea59551c1ac557a2c299f75803c56cc973923ef78c67ea4839a238142f7927", size = 13749, upload-time = "2025-08-07T20:05:36.303Z" }, +] + [[package]] name = "lxml" version = "6.1.1" @@ -2316,6 +2357,7 @@ source = { editable = "." } dependencies = [ { name = "apispec" }, { name = "asn1crypto" }, + { name = "beanie" }, { name = "blinker" }, { name = "boltons" }, { name = "css-html-js-minify" }, @@ -2323,6 +2365,7 @@ dependencies = [ { name = "ddtrace" }, { name = "dnspython" }, { name = "fastapi" }, + { name = "fastapi-filter" }, { name = "filetype" }, { name = "flasgger-tschaume" }, { name = "flask-compress" }, @@ -2371,6 +2414,7 @@ dev = [ requires-dist = [ { name = "apispec", specifier = "<6" }, { name = "asn1crypto" }, + { name = "beanie", specifier = ">=2.1.0" }, { name = "blinker" }, { name = "boltons" }, { name = "css-html-js-minify" }, @@ -2378,6 +2422,7 @@ requires-dist = [ { name = "ddtrace", specifier = "==4.3.0" }, { name = "dnspython" }, { name = "fastapi", specifier = ">=0.136.3" }, + { name = "fastapi-filter", specifier = ">=2.0.1" }, { name = "filetype" }, { name = "flasgger-tschaume", specifier = ">=0.9.7" }, { name = "flask-compress" }, From da8d2e5a2d40450484649fc58db8e7f8c440214d Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 1 Jun 2026 16:09:08 -0700 Subject: [PATCH 015/591] Built out project domain for getting data --- .../domains/projects/dependencies.py | 15 ++ .../mpcontribs_api/domains/projects/models.py | 131 ++++++++++++++++++ .../domains/projects/repository.py | 120 ++++++++++++++++ .../mpcontribs_api/domains/projects/router.py | 44 ++++++ 4 files changed, 310 insertions(+) create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/projects/dependencies.py diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/dependencies.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/dependencies.py new file mode 100644 index 0000000000..94535cc67d --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/dependencies.py @@ -0,0 +1,15 @@ +from typing import Annotated + +from fastapi import Depends + +from mpcontribs_api.dependencies import UserDep +from mpcontribs_api.domains.projects.repository import ( + MongoDbProjectRepository, +) + + +def get_scoped_projects(user: UserDep) -> MongoDbProjectRepository: + return MongoDbProjectRepository(user) + + +ProjectDep = Annotated[MongoDbProjectRepository, Depends(get_scoped_projects)] diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py index e69de29bb2..07c624c95d 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py @@ -0,0 +1,131 @@ +from enum import Enum +from typing import Annotated, Any, Literal + +from beanie import DocumentWithSoftDelete +from fastapi_filter.contrib.beanie import Filter +from pydantic import BaseModel, ConfigDict, Field, HttpUrl + +from src.mpcontribs_api.types import PrefixedEmail, ShortStr + + +class Column(BaseModel): + path: str + min: float | None = None + max: float | None = None + unit: str | None = None + + @property + def segments(self) -> tuple[str, ...]: + return tuple(self.path.split(".")) + + +class Stats(BaseModel): + columns: int + contributions: int + tables: int + structures: int + attachments: int + size: float + + +class Reference(BaseModel): + # TODO: Labels have some restrictions, not sure exactly what yet + label: str + url: HttpUrl + + +class Project(DocumentWithSoftDelete): + """Document model of what is actually stored.""" + + # meaningful string id, always supplied + id: ShortStr = Field(alias="_id") # pyright: ignore[reportGeneralTypeIssues, reportIncompatibleVariableOverride] + title: ShortStr + authors: str + description: str + owner: PrefixedEmail + other: dict[str, Any] + is_public: bool = False + is_approved: bool = False + long_title: str + unique_identifiers: bool + references: list[Reference] + stats: Stats + columns: list[Column] + license: Literal["CCA4", "CCPD"] | None = None + + +# Project Responses +class ProjectSummary(BaseModel): + """Subset of fields to return when not all info is desired.""" + + id: Annotated[ShortStr, Field(alias="_id")] + owner: PrefixedEmail + unique_identifiers: bool + is_public: bool = False + is_approved: bool = False + title: ShortStr + + +class ProjectResponse(BaseModel): + """Full response of all public-facing fields.""" + + model_config = ConfigDict(extra="ignore") + id: Annotated[ShortStr | None, Field(alias="_id")] = None + authors: str | None = None + description: str | None = None + title: ShortStr | None = None + owner: PrefixedEmail | None = None + other: dict[str, Any] | None = None + is_public: bool | None = None + is_approved: bool | None = None + long_title: str | None = None + unique_identifiers: bool | None = None + references: list[Reference] | None = None + stats: Stats | None = None + columns: list[Column] | None = None + license: Literal["CCA4", "CCPD"] | None = None + + +# Filter to use for Projects +class ProjectFilter(Filter): + id: ShortStr | None = None + id__in: list[ShortStr] | None = None + id__neq: ShortStr | None = None + + title: ShortStr | None = None + title__in: list[ShortStr] | None = None + title__neq: ShortStr | None = None + title__ilike: str | None = None + + owner: PrefixedEmail | None = None + owner__in: list[PrefixedEmail] | None = None + owner__neq: PrefixedEmail | None = None + owner__ilike: str | None = None + + # fuzzy only + long_title__ilike: str | None = None + + is_public: bool | None = None + is_approved: bool | None = None + unique_identifiers: bool | None = None + + license: Literal["CCA4", "CCPD"] | None = None + license__in: list[Literal["CCA4", "CCPD"]] | None = None + + # sorting + order_by: list[str] | None = None + + class Constants(Filter.Constants): + model = Project + + +# Enum to determine which response model to use +class ProjectView(str, Enum): + full = "full" + summary = "summary" + + +_VIEW_MODELS: dict[ProjectView, type[BaseModel]] = { + ProjectView.full: ProjectResponse, + ProjectView.summary: ProjectSummary, +} diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py index e69de29bb2..31d36e138d 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py @@ -0,0 +1,120 @@ +from typing import Any, TypeVar, runtime_checkable + +from pydantic import BaseModel + +from src.mpcontribs_api.auth import User +from src.mpcontribs_api.domains.projects.models import ( + Project, + ProjectFilter, + ProjectResponse, +) +from src.mpcontribs_api.pagination import ( + CursorParams, + Page, + decode_cursor, + encode_cursor, +) + + +# Type checking to get around pyright issues +@runtime_checkable +class HasId(BaseModel): + id: str + + +V = TypeVar("V", bound=HasId) +M = TypeVar("M", bound=BaseModel) + +# class IScopedProjectRepository(Protocol): +# @overload +# async def get_project(self, query: dict[str, Any]) -> ProjectResponse | None: ... +# @overload +# async def get_project( +# self, query: dict[str, Any], *, view: type[BaseModel] +# ) -> BaseModel | None: ... +# async def get_project( +# self, +# query: dict[str, Any], +# *, +# view: type[BaseModel] = ProjectResponse, +# ) -> BaseModel | None: ... + +# @overload +# async def get_project_by_id(self, id: str) -> ProjectResponse | None: ... +# @overload +# async def get_project_by_id(self, id: str, *, view: type[M]) -> M | None: ... +# async def get_project_by_id( +# self, +# id: str, +# *, +# view: type[M] | None = None, +# ) -> M | ProjectResponse | None: ... + + +class MongoDbProjectRepository: + def __init__(self, user: User) -> None: + self._scope = self._build_scope(user) + + @staticmethod + def _build_scope(user: User) -> dict[str, Any]: + if user.is_admin: + return {} + ors: list[dict[str, Any]] = [{"is_public": True, "is_approved": True}] + if not user.is_anonymous: + ors.append({"owner": user.username}) + if user.groups: + ors.append({"_id": {"$in": sorted(user.groups)}}) + return {"$or": ors} + + def _scoped(self, *clauses: Any) -> dict[str, Any]: + parts = [c for c in (self._scope, *clauses) if c] + if not parts: + return {} + return parts[0] if len(parts) == 1 else {"$and": parts} + + async def get_project_by_id(self, id: str, *, view: type[M] | None = None): + # TODO: Verify that self._scope and Project.id == id get combined properly + return await Project.find_one( + self._scope, Project.id == id, projection_model=view + ) + + # Brendan TODO: Does not handle compound pagination/sorting (can only paginate on _id, so passing sort arguments does nothing) + async def get_project( + self, + filter: ProjectFilter, + pagination: CursorParams, + *, + view: type[V] | None = None, + ) -> Page[V | ProjectResponse]: + """Query the Project collection using filtering. + + Only considers the Projects that the User has access to. + + Args: + filter (ProjectFilter): the query to filter the collection by + pagination (CursorParams): parameters for pagination using a cursor + view (type[M]): The type of resposne we should return within the Page + """ + model = view or ProjectResponse + + # Filter projects to just the ones within the user scope + query = filter.filter(Project.find(self._scope)) + # If cursor was provided + if pagination.cursor is not None: + query = query.find( + Project.id > decode_cursor(pagination.cursor) + ) # seek past last-seen + + # Get Projects sorted by id (for pagination), project to requested model + docs = await ( + query.sort(Project.id) + .limit(pagination.limit + 1) # +1 probe to detect if there is a next page + .project(model) + .to_list() + ) + + # Check if we have more docs, return a Page containing just the number of docs requested and the encoded id for the next cursor + has_more = len(docs) > pagination.limit + items = docs[: pagination.limit] + next_cursor = encode_cursor(str(items[-1].id)) if has_more and items else None + return Page(items=items, next_cursor=next_cursor) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py index e69de29bb2..59c463a4c6 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py @@ -0,0 +1,44 @@ +from typing import Annotated + +from fastapi import APIRouter, Query +from fastapi_filter import FilterDepends +from pydantic import BaseModel + +from src.mpcontribs_api.domains.projects.dependencies import ProjectDep +from src.mpcontribs_api.domains.projects.models import ( + _VIEW_MODELS, + ProjectFilter, + ProjectResponse, + ProjectSummary, + ProjectView, +) +from src.mpcontribs_api.pagination import CursorParams + +router = APIRouter() + + +@router.get("", response_model=list[ProjectSummary]) +async def get_project( + repo: ProjectDep, + pagination: Annotated[CursorParams, Query()], + filter: ProjectFilter = FilterDepends(ProjectFilter), +): + return await repo.get_project(filter=filter, pagination=pagination) + + +@router.get("/{id}", response_model=ProjectResponse | ProjectSummary) +async def get_project_by_id( + id: str, + repo: ProjectDep, + *, + view: ProjectView = ProjectView.full, +): + return await repo.get_project_by_id(id=id, view=_VIEW_MODELS[view]) + + +@router.post("", response_model=ProjectResponse) +async def post_project( + repo: ProjectDep, + project: ProjectPost = Depends(authorize_resource), +): + return await repo.post(project=project) From b130b331b792149a19112374606f239040d31d53 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 1 Jun 2026 16:09:34 -0700 Subject: [PATCH 016/591] Added shared dependencies for injection --- .../src/mpcontribs_api/dependencies.py | 74 +++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/mpcontribs-api/src/mpcontribs_api/dependencies.py b/mpcontribs-api/src/mpcontribs_api/dependencies.py index e69de29bb2..10f2112324 100644 --- a/mpcontribs-api/src/mpcontribs_api/dependencies.py +++ b/mpcontribs-api/src/mpcontribs_api/dependencies.py @@ -0,0 +1,74 @@ +import hmac +from typing import Annotated + +import structlog +from fastapi import Depends, Header, Request +from pymongo.asynchronous.database import AsyncDatabase + +from mpcontribs_api.auth import User +from src.mpcontribs_api.config import get_settings +from src.mpcontribs_api.exceptions import ( + AuthenticationError, + GatewayError, + PermissionError, +) + +settings = get_settings() + + +def verify_gateway(x_gateway_secret: Annotated[str | None, Header()] = None) -> None: + if x_gateway_secret is None or not hmac.compare_digest( + x_gateway_secret, str(settings.kong.gateway_secret) + ): + raise GatewayError("direct access not permitted") + + +def get_db(request: Request) -> AsyncDatabase: + return request.app.state.db + + +DbDep = Annotated[AsyncDatabase, Depends(get_db)] + + +def _split(raw: str | None) -> set[str]: + return {g.strip() for g in (raw or "").split(",") if g.strip()} + + +def get_user(request: Request) -> User: + h = request.headers + explicit_anon = h.get("x-anonymous-consumer", "").lower() == "true" + username = h.get("x-consumer-username") or None + if explicit_anon or username is None: + user = User() # anonymous = all defaults + else: + groups = _split(h.get("x-authenticated-groups")) | _split( + h.get("x-consumer-groups") + ) + user = User( + consumer_id=h.get("x-consumer-id"), + username=username, + groups=frozenset(groups), + ) + structlog.contextvars.bind_contextvars(consumer_id=user.consumer_id or "anonymous") + return user + + +UserDep = Annotated[User, Depends(get_user)] + + +def require_user(user: UserDep) -> User: + if user.is_anonymous: + raise AuthenticationError("authentication required") + return user + + +AuthedDep = Annotated[User, Depends(require_user)] + + +def require_role(role: str): + def checker(user: AuthedDep) -> User: + if not user.has_role(role): + raise PermissionError(required_role=role) + return user + + return Annotated[User, Depends(checker)] From c3004a06ef9116499d4c14f1de86377a39c6dcae Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 1 Jun 2026 16:09:58 -0700 Subject: [PATCH 017/591] Added AuthenticationError and GatewayError for more control over thrown errors --- mpcontribs-api/src/mpcontribs_api/auth.py | 25 +++++++++++++++++ .../mpcontribs_api/domains/shared/models.py | 20 ++++++++++++++ .../src/mpcontribs_api/exceptions.py | 10 +++++++ .../src/mpcontribs_api/pagination.py | 27 +++++++++++++++++++ 4 files changed, 82 insertions(+) create mode 100644 mpcontribs-api/src/mpcontribs_api/auth.py create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/shared/models.py create mode 100644 mpcontribs-api/src/mpcontribs_api/pagination.py diff --git a/mpcontribs-api/src/mpcontribs_api/auth.py b/mpcontribs-api/src/mpcontribs_api/auth.py new file mode 100644 index 0000000000..6f82eb7e9f --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/auth.py @@ -0,0 +1,25 @@ +from pydantic import BaseModel, ConfigDict + +from src.mpcontribs_api.config import get_settings + +settings = get_settings() + +ADMIN_GROUP = settings.mongo.admin_group + + +class User(BaseModel): + model_config = ConfigDict(frozen=True) + consumer_id: str | None = None # opaque Kong id — logging/audit only + username: str | None = None + groups: frozenset[str] = frozenset() + + @property + def is_anonymous(self) -> bool: + return self.username is None + + @property + def is_admin(self) -> bool: + return ADMIN_GROUP in self.groups + + def has_role(self, role: str) -> bool: + return role in self.groups diff --git a/mpcontribs-api/src/mpcontribs_api/domains/shared/models.py b/mpcontribs-api/src/mpcontribs_api/domains/shared/models.py new file mode 100644 index 0000000000..dc0674f9e8 --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/domains/shared/models.py @@ -0,0 +1,20 @@ +from typing import Annotated + +from pydantic import BaseModel, Field + + +class PaginationParams(BaseModel): + skip: Annotated[int, Field(description="number of items to skip")] + limit: Annotated[int, Field(description="maximum number of items to return")] = 100 + page: Annotated[ + int, + Field( + description="page number to return (in batches of 'per_page'/'_limit'; alternative to _skip" + ), + ] + per_page: Annotated[ + int, + Field( + description="maximum number of items to return per page (same as '_limit')" + ), + ] diff --git a/mpcontribs-api/src/mpcontribs_api/exceptions.py b/mpcontribs-api/src/mpcontribs_api/exceptions.py index 6d62085443..b263c058c3 100644 --- a/mpcontribs-api/src/mpcontribs_api/exceptions.py +++ b/mpcontribs-api/src/mpcontribs_api/exceptions.py @@ -50,6 +50,16 @@ class PermissionError(AppError): error_code = "permission_denied" +class AuthenticationError(AppError): + status_code = 401 + error_code = "authentication_error" + + +class GatewayError(AppError): + status_code = 403 + error_code = "gateway_error" + + def _error_body(error_code: str, message: str, **public_context) -> dict: body: dict[str, Any] = {"error": {"code": error_code, "message": message}} if public_context: diff --git a/mpcontribs-api/src/mpcontribs_api/pagination.py b/mpcontribs-api/src/mpcontribs_api/pagination.py new file mode 100644 index 0000000000..9f543e5b53 --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/pagination.py @@ -0,0 +1,27 @@ +import base64 + +from pydantic import BaseModel, Field + + +class CursorParams(BaseModel): + # None == First page + cursor: str | None = None + # Per-page limit + limit: int = Field(default=20, ge=1, le=100) + + +class Page[T](BaseModel): + items: list[T] + # None == last page + next_cursor: str | None = None + + +def encode_cursor(last_id: str) -> str: + return base64.urlsafe_b64encode(last_id.encode()).decode() + + +def decode_cursor(cursor: str) -> str: + try: + return base64.urlsafe_b64decode(cursor.encode()).decode() + except (ValueError, UnicodeDecodeError): + raise ValueError("malformed cursor") From a5b5849d16e0d0e265d40923c7e47a8601f6cca4 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 1 Jun 2026 16:14:24 -0700 Subject: [PATCH 018/591] Ruff formatting and checking --- .../src/mpcontribs_api/domains/projects/router.py | 1 - mpcontribs-api/src/mpcontribs_api/old/core.py | 1 + mpcontribs-ingester/mpcontribs/ingester/cli.py | 4 +++- mpcontribs-ingester/mpcontribs/ingester/webui.py | 11 +++++++++-- mpcontribs-kernel-gateway/make_seed.py | 1 - mpcontribs-lux/mpcontribs/lux/autogen.py | 2 +- .../tests/projects/esoteric_ephemera/test_schemas.py | 1 - mpcontribs-portal/mpcontribs/portal/views.py | 2 -- .../mpcontribs/users/als_beamline/scripts/__main__.py | 3 ++- .../users/als_beamline/scripts/translate_PyPt.py | 3 --- .../users/dilute_solute_diffusion/pre_submission.py | 6 ++++-- .../mpcontribs/users/qmcdb/main/views.py | 5 +---- .../mpcontribs/users/qmcdb/records/views.py | 7 +------ .../users/redox_thermo_csp/pre_submission.py | 9 +++++---- .../users/redox_thermo_csp/update_energy_data.py | 3 +-- .../users/screening_inorganic_pv/pre_submission.py | 7 ++++--- .../mpcontribs/users/swf/pre_submission.py | 2 -- mpcontribs-portal/mpcontribs/users/utils.py | 3 ++- .../contribs.materialsproject.org/2dmatpedia.ipynb | 5 +++-- .../contribs.materialsproject.org/ExpXAS.ipynb | 3 +-- .../contribs.materialsproject.org/HFP2023.ipynb | 3 --- .../MnO2_phase_selection.ipynb | 3 ++- .../carrier_transport.ipynb | 6 +++--- .../dilute_solute_diffusion.ipynb | 6 ++++-- .../experimental_thermo.ipynb | 2 -- .../experimental_thermoelectrics.ipynb | 2 +- .../ferroelectrics.ipynb | 7 +++---- .../contribs.materialsproject.org/ion_ref_data.ipynb | 2 +- .../contribs.materialsproject.org/jarvis_dft.ipynb | 4 +++- .../contribs.materialsproject.org/matscholar.ipynb | 3 +-- .../contribs.materialsproject.org/mofexplorer.ipynb | 2 +- .../ocp/ocp-upload.ipynb | 1 - .../open_catalyst_project.ipynb | 4 +--- .../perovskites_diffusion.ipynb | 4 ++-- .../pydatarecognition.ipynb | 4 +--- .../screening_inorganic_pv.ipynb | 2 +- .../silicon_defects.ipynb | 4 ++-- .../springer_materials.ipynb | 2 +- .../transparent_conductors.ipynb | 1 - .../get_started.ipynb | 5 +---- .../ml.materialsproject.org/get_started.ipynb | 4 +++- mpcontribs-portal/wsgi.py | 1 - mpcontribs-serverless/make_download/app.py | 1 - 43 files changed, 69 insertions(+), 83 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py index 59c463a4c6..162c656aec 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py @@ -2,7 +2,6 @@ from fastapi import APIRouter, Query from fastapi_filter import FilterDepends -from pydantic import BaseModel from src.mpcontribs_api.domains.projects.dependencies import ProjectDep from src.mpcontribs_api.domains.projects.models import ( diff --git a/mpcontribs-api/src/mpcontribs_api/old/core.py b/mpcontribs-api/src/mpcontribs_api/old/core.py index 39da673ac3..a4a600db19 100644 --- a/mpcontribs-api/src/mpcontribs_api/old/core.py +++ b/mpcontribs-api/src/mpcontribs_api/old/core.py @@ -594,6 +594,7 @@ def has_read_permission(self, request, qs): from mpcontribs.api.contributions.document import get_resource resource = get_resource(component) + def qfilter(qs): return qs.clone() diff --git a/mpcontribs-ingester/mpcontribs/ingester/cli.py b/mpcontribs-ingester/mpcontribs/ingester/cli.py index 53965cc507..53267ef457 100644 --- a/mpcontribs-ingester/mpcontribs/ingester/cli.py +++ b/mpcontribs-ingester/mpcontribs/ingester/cli.py @@ -1,6 +1,8 @@ # -*- coding: utf-8 -*- # http://flask.pocoo.org/docs/0.10/patterns/appdispatch/ -import os, argparse, string +import os +import argparse +import string from werkzeug.serving import run_simple from werkzeug.wsgi import DispatcherMiddleware, SharedDataMiddleware from flask import Flask diff --git a/mpcontribs-ingester/mpcontribs/ingester/webui.py b/mpcontribs-ingester/mpcontribs/ingester/webui.py index 5d4f711563..c0b4debe56 100644 --- a/mpcontribs-ingester/mpcontribs/ingester/webui.py +++ b/mpcontribs-ingester/mpcontribs/ingester/webui.py @@ -1,7 +1,14 @@ from __future__ import unicode_literals, print_function, absolute_import -import json, os, socket, codecs, time, psutil -import sys, warnings, multiprocessing +import json +import os +import socket +import codecs +import time +import psutil +import sys +import warnings +import multiprocessing from tempfile import gettempdir from flask import render_template, request, Response, Blueprint, current_app from flask import url_for, redirect, make_response, stream_with_context, jsonify diff --git a/mpcontribs-kernel-gateway/make_seed.py b/mpcontribs-kernel-gateway/make_seed.py index f92a5df7c9..28aa21e0d1 100644 --- a/mpcontribs-kernel-gateway/make_seed.py +++ b/mpcontribs-kernel-gateway/make_seed.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -import ddtrace.auto import nbformat as nbf nb = nbf.v4.new_notebook() diff --git a/mpcontribs-lux/mpcontribs/lux/autogen.py b/mpcontribs-lux/mpcontribs/lux/autogen.py index a193ca9bbe..727e72f37f 100644 --- a/mpcontribs-lux/mpcontribs/lux/autogen.py +++ b/mpcontribs-lux/mpcontribs/lux/autogen.py @@ -100,7 +100,7 @@ def pydantic_model(self) -> Type[BaseModel]: self.file_name, orient=orient, lines=self.fmt == "jsonl" ) break - except Exception as exc: + except Exception: continue else: raise ValueError( diff --git a/mpcontribs-lux/tests/projects/esoteric_ephemera/test_schemas.py b/mpcontribs-lux/tests/projects/esoteric_ephemera/test_schemas.py index 70b6ec8019..0d74c5213c 100644 --- a/mpcontribs-lux/tests/projects/esoteric_ephemera/test_schemas.py +++ b/mpcontribs-lux/tests/projects/esoteric_ephemera/test_schemas.py @@ -2,7 +2,6 @@ import gzip import json -from pathlib import Path import numpy as np import pytest diff --git a/mpcontribs-portal/mpcontribs/portal/views.py b/mpcontribs-portal/mpcontribs/portal/views.py index 879ca4de14..f8aa3d9762 100644 --- a/mpcontribs-portal/mpcontribs/portal/views.py +++ b/mpcontribs-portal/mpcontribs/portal/views.py @@ -12,8 +12,6 @@ from redis import Redis from io import BytesIO from copy import deepcopy -from pathlib import Path -from shutil import make_archive, rmtree from nbconvert import HTMLExporter from bravado.exception import HTTPNotFound from json2html import Json2Html diff --git a/mpcontribs-portal/mpcontribs/users/als_beamline/scripts/__main__.py b/mpcontribs-portal/mpcontribs/users/als_beamline/scripts/__main__.py index bcd0122bda..4fc72ada4a 100644 --- a/mpcontribs-portal/mpcontribs/users/als_beamline/scripts/__main__.py +++ b/mpcontribs-portal/mpcontribs/users/als_beamline/scripts/__main__.py @@ -1,4 +1,5 @@ -import argparse, os +import argparse +import os from mpcontribs.io.archieml.mpfile import MPFile from pre_submission import * diff --git a/mpcontribs-portal/mpcontribs/users/als_beamline/scripts/translate_PyPt.py b/mpcontribs-portal/mpcontribs/users/als_beamline/scripts/translate_PyPt.py index 995f5d045d..232914ab86 100644 --- a/mpcontribs-portal/mpcontribs/users/als_beamline/scripts/translate_PyPt.py +++ b/mpcontribs-portal/mpcontribs/users/als_beamline/scripts/translate_PyPt.py @@ -1,6 +1,3 @@ -import pandas as pd -import os -from scipy.interpolate import interp2d def get_translate(workdir=None): diff --git a/mpcontribs-portal/mpcontribs/users/dilute_solute_diffusion/pre_submission.py b/mpcontribs-portal/mpcontribs/users/dilute_solute_diffusion/pre_submission.py index ed983aaf7e..daaac921db 100644 --- a/mpcontribs-portal/mpcontribs/users/dilute_solute_diffusion/pre_submission.py +++ b/mpcontribs-portal/mpcontribs/users/dilute_solute_diffusion/pre_submission.py @@ -1,4 +1,6 @@ -import os, json, requests, sys +import os +import json +import requests from pandas import read_excel, isnull, ExcelWriter, Series from mpcontribs.io.core.recdict import RecursiveDict from mpcontribs.io.core.utils import clean_value, nest_dict @@ -59,7 +61,7 @@ def run(mpfile, hosts=None, download=False): if hosts is not None: if isinstance(hosts, int) and idx + 1 > hosts: break - elif isinstance(hosts, list) and not host in hosts: + elif isinstance(hosts, list) and host not in hosts: continue print("get mp-id for {}".format(host)) diff --git a/mpcontribs-portal/mpcontribs/users/qmcdb/main/views.py b/mpcontribs-portal/mpcontribs/users/qmcdb/main/views.py index 4e4c20ac48..cd80073db9 100644 --- a/mpcontribs-portal/mpcontribs/users/qmcdb/main/views.py +++ b/mpcontribs-portal/mpcontribs/users/qmcdb/main/views.py @@ -1,8 +1,5 @@ from django.shortcuts import render -from django.http import HttpResponseRedirect -from django.contrib.auth.decorators import login_required -from records.forms import MaterialQueryForm, MaterialSubmissionForm -from records.tables import QMCDBSetTable +from records.forms import MaterialQueryForm from records.models import QMCDBSet from django.utils.safestring import mark_safe from django.utils.html import escape diff --git a/mpcontribs-portal/mpcontribs/users/qmcdb/records/views.py b/mpcontribs-portal/mpcontribs/users/qmcdb/records/views.py index c0f0cc1372..589ef8e3e7 100644 --- a/mpcontribs-portal/mpcontribs/users/qmcdb/records/views.py +++ b/mpcontribs-portal/mpcontribs/users/qmcdb/records/views.py @@ -1,18 +1,13 @@ from __future__ import division from django.shortcuts import render from django.http import HttpResponseRedirect, HttpResponse -from django.contrib.auth.decorators import login_required from rest_framework import status from rest_framework.decorators import api_view from rest_framework.response import Response -from records.forms import MaterialQueryForm, MaterialSubmissionForm +from records.forms import MaterialSubmissionForm from records.models import QMCDBSet from records.serializers import QMCDBSetSerializer -from rest_framework.renderers import JSONRenderer -from rest_framework.parsers import JSONParser -from django.utils.six import BytesIO from django.utils.safestring import mark_safe -import numpy as np def manual_qmc_record_submission(request): diff --git a/mpcontribs-portal/mpcontribs/users/redox_thermo_csp/pre_submission.py b/mpcontribs-portal/mpcontribs/users/redox_thermo_csp/pre_submission.py index 15cfaf4de7..e95fd1f18c 100644 --- a/mpcontribs-portal/mpcontribs/users/redox_thermo_csp/pre_submission.py +++ b/mpcontribs-portal/mpcontribs/users/redox_thermo_csp/pre_submission.py @@ -1,16 +1,17 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -import os, json, re, sys +import os +import json +import re +import sys from glob import glob from datetime import datetime from itertools import groupby import pandas as pd -from mpcontribs.io.core.utils import get_composition_from_string from mpcontribs.io.core.recdict import RecursiveDict -from mpcontribs.io.core.utils import clean_value, read_csv, nest_dict +from mpcontribs.io.core.utils import clean_value, read_csv from mpcontribs.io.core.components import Table from mpcontribs.users.utils import duplicate_check -from mpcontribs.users.redox_thermo_csp.utils import redenth_act, get_debye_temp def get_fit_pars(sample_number): diff --git a/mpcontribs-portal/mpcontribs/users/redox_thermo_csp/update_energy_data.py b/mpcontribs-portal/mpcontribs/users/redox_thermo_csp/update_energy_data.py index b2eed60d99..3701993937 100644 --- a/mpcontribs-portal/mpcontribs/users/redox_thermo_csp/update_energy_data.py +++ b/mpcontribs-portal/mpcontribs/users/redox_thermo_csp/update_energy_data.py @@ -2,7 +2,6 @@ import datetime import os import shutil -import numpy as np from energy_analysis import EnergyAnalysis as enera from views import unstable_phases as unst @@ -21,7 +20,7 @@ new_energy_data = old_energy_data for db_id in paramlist: - if not "Exp" in db_id: + if "Exp" not in db_id: print(db_id) data_source = "Theo" # updates only theoretical data celsius = "True" # always True, parameter input in K currently disabled diff --git a/mpcontribs-portal/mpcontribs/users/screening_inorganic_pv/pre_submission.py b/mpcontribs-portal/mpcontribs/users/screening_inorganic_pv/pre_submission.py index b9eb3cfa4b..610f864cc7 100644 --- a/mpcontribs-portal/mpcontribs/users/screening_inorganic_pv/pre_submission.py +++ b/mpcontribs-portal/mpcontribs/users/screening_inorganic_pv/pre_submission.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- -import os, json +import os +import json from pandas import DataFrame from mpcontribs.io.core.recdict import RecursiveDict from mpcontribs.io.core.utils import clean_value @@ -47,11 +48,11 @@ def run(mpfile, **kwargs): rd = RecursiveDict({"formula": formula}) for k, v in config.items(): value = clean_value(d[k], v[1], max_dgts=4) - if not "." in v[0]: + if "." not in v[0]: rd[v[0]] = value else: keys = v[0].split(".") - if not keys[0] in rd: + if keys[0] not in rd: rd[keys[0]] = RecursiveDict({keys[1]: value}) else: rd[keys[0]][keys[1]] = value diff --git a/mpcontribs-portal/mpcontribs/users/swf/pre_submission.py b/mpcontribs-portal/mpcontribs/users/swf/pre_submission.py index 98b38034fd..705329fbe8 100644 --- a/mpcontribs-portal/mpcontribs/users/swf/pre_submission.py +++ b/mpcontribs-portal/mpcontribs/users/swf/pre_submission.py @@ -1,5 +1,4 @@ from mpcontribs.config import mp_level01_titles -from mpcontribs.io.core.recdict import RecursiveDict from mpcontribs.io.core.utils import clean_value, get_composition_from_string from mpcontribs.users.utils import duplicate_check @@ -26,7 +25,6 @@ def round_to_100_percent(number_set, digit_after_decimal=1): def run(mpfile, **kwargs): import pymatgen import pandas as pd - from mpcontribs.users.swf.rest.rester import SwfRester # load data from google sheet google_sheet = mpfile.document[mp_level01_titles[0]].pop("google_sheet") diff --git a/mpcontribs-portal/mpcontribs/users/utils.py b/mpcontribs-portal/mpcontribs/users/utils.py index 487f9af679..86f141c1bd 100644 --- a/mpcontribs-portal/mpcontribs/users/utils.py +++ b/mpcontribs-portal/mpcontribs/users/utils.py @@ -1,4 +1,5 @@ -import inspect, os +import inspect +import os from typing import Any, Dict diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/2dmatpedia.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/2dmatpedia.ipynb index 69f3d106fe..7f82cf7085 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/2dmatpedia.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/2dmatpedia.ipynb @@ -6,9 +6,10 @@ "metadata": {}, "outputs": [], "source": [ - "import os, gzip, json\n", + "import os\n", + "import gzip\n", + "import json\n", "from mpcontribs.client import Client\n", - "from pymatgen.core import Structure\n", "from pymatgen.ext.matproj import MPRester\n", "from urllib.request import urlretrieve\n", "from monty.json import MontyDecoder" diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ExpXAS.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ExpXAS.ipynb index cd83f60e0d..abe2f054f3 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ExpXAS.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ExpXAS.ipynb @@ -10,8 +10,7 @@ "from mpcontribs.client import Client\n", "from pathlib import Path\n", "from pandas import read_csv\n", - "import pandas as pd\n", - "import numpy as np" + "import pandas as pd" ] }, { diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/HFP2023.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/HFP2023.ipynb index 586cdc419f..d4b05adf45 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/HFP2023.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/HFP2023.ipynb @@ -9,15 +9,12 @@ "source": [ "%env MPRESTER_MUTE_PROGRESS_BARS 1\n", "# pip install mpcontribs-client mp_api pandas flatten_dict\n", - "import os\n", "import gzip\n", "import json\n", "\n", "from pathlib import Path\n", "from mpcontribs.client import Client\n", - "from mp_api.client import MPRester\n", "from pymatgen.core import Structure\n", - "from pandas import read_csv\n", "from flatten_dict import flatten, unflatten" ] }, diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/MnO2_phase_selection.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/MnO2_phase_selection.ipynb index 8a2c617383..613e73e740 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/MnO2_phase_selection.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/MnO2_phase_selection.ipynb @@ -6,7 +6,8 @@ "metadata": {}, "outputs": [], "source": [ - "import json, os\n", + "import json\n", + "import os\n", "from mpcontribs.client import Client\n", "from pymatgen.core import Composition, Structure\n", "from pymatgen.ext.matproj import MPRester\n", diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/carrier_transport.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/carrier_transport.ipynb index 2ec37c22e1..fb0a3b5397 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/carrier_transport.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/carrier_transport.ipynb @@ -7,13 +7,13 @@ "outputs": [], "source": [ "from mpcontribs.client import Client\n", - "import gzip, json, os\n", + "import gzip\n", + "import json\n", + "import os\n", "import numpy as np\n", "from pandas import DataFrame\n", - "from collections import defaultdict\n", "from tqdm.notebook import tqdm\n", "from unflatten import unflatten\n", - "from pathlib import Path\n", "\n", "name = \"carrier_transport\"" ] diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/dilute_solute_diffusion.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/dilute_solute_diffusion.ipynb index e3b6065de2..b03877f2ea 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/dilute_solute_diffusion.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/dilute_solute_diffusion.ipynb @@ -28,7 +28,9 @@ "metadata": {}, "outputs": [], "source": [ - "import os, json, requests, sys\n", + "import os\n", + "import json\n", + "import requests\n", "from pandas import read_excel, isnull, ExcelWriter, Series\n", "from mp_api.client import MPRester\n", "from pathlib import Path\n", @@ -117,7 +119,7 @@ " if hosts is not None:\n", " if isinstance(hosts, int) and idx + 1 > hosts:\n", " break\n", - " elif isinstance(hosts, list) and not host in hosts:\n", + " elif isinstance(hosts, list) and host not in hosts:\n", " continue\n", "\n", " print(\"get mp-id for {}\".format(host))\n", diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/experimental_thermo.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/experimental_thermo.ipynb index 2e92f6d283..8353c4de4b 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/experimental_thermo.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/experimental_thermo.ipynb @@ -48,8 +48,6 @@ "from pathlib import Path\n", "import re\n", "from tqdm import tqdm\n", - "import numpy as np\n", - "import xlrd\n", "from monty.serialization import loadfn, dumpfn" ] }, diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/experimental_thermoelectrics.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/experimental_thermoelectrics.ipynb index f06b9b04b4..7526af6ba1 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/experimental_thermoelectrics.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/experimental_thermoelectrics.ipynb @@ -11,7 +11,7 @@ "from mp_api.client import MPRester\n", "import pandas as pd\n", "import os\n", - "from flatten_dict import unflatten, flatten\n", + "from flatten_dict import unflatten\n", "from math import isnan" ] }, diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ferroelectrics.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ferroelectrics.ipynb index d8dada5c99..813671be85 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ferroelectrics.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ferroelectrics.ipynb @@ -11,10 +11,9 @@ "source": [ "import json\n", "import numpy as np\n", - "from mpcontribs.client import Client, Attachment\n", + "from mpcontribs.client import Client\n", "from pathlib import Path\n", - "from flatten_dict import flatten, unflatten\n", - "from pymatgen.core import Structure" + "from flatten_dict import flatten, unflatten" ] }, { @@ -253,7 +252,7 @@ " if conf and k.startswith(\"polarization\") and isinstance(v, list):\n", " name, fields = conf[\"name\"], conf[\"fields\"]\n", " contrib[\"data\"].setdefault(name, {})\n", - " if not \"unit\" in conf:\n", + " if \"unit\" not in conf:\n", " vmax, unit = max(v), fields[\"max\"]\n", " contrib[\"data\"][name][\"max\"] = f\"{round(vmax, 3)} {unit}\" if unit else v\n", " contrib[\"data\"][name][\"index\"] = v.index(vmax)\n", diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ion_ref_data.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ion_ref_data.ipynb index 89e280eb7b..ca14d3f31a 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ion_ref_data.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ion_ref_data.ipynb @@ -29,7 +29,7 @@ "outputs": [], "source": [ "from pprint import pprint\n", - "from monty.serialization import loadfn, dumpfn\n", + "from monty.serialization import loadfn\n", "from pymatgen.core.ion import Ion" ] }, diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/jarvis_dft.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/jarvis_dft.ipynb index d4cd3b7a82..3de2a4beaf 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/jarvis_dft.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/jarvis_dft.ipynb @@ -6,7 +6,9 @@ "metadata": {}, "outputs": [], "source": [ - "import os, json, tarfile\n", + "import os\n", + "import json\n", + "import tarfile\n", "from mpcontribs.client import Client\n", "from urllib.request import urlretrieve\n", "from monty.json import MontyDecoder\n", diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/matscholar.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/matscholar.ipynb index d7a25425df..979b0aaa7f 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/matscholar.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/matscholar.ipynb @@ -7,8 +7,7 @@ "metadata": {}, "outputs": [], "source": [ - "from pathlib import Path\n", - "from mpcontribs.client import Client, Attachment" + "from mpcontribs.client import Client" ] }, { diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/mofexplorer.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/mofexplorer.ipynb index 08413c8f15..2ef808fd49 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/mofexplorer.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/mofexplorer.ipynb @@ -76,7 +76,7 @@ " raw = vs[-1].replace(\"^3\", \"³\")\n", " if raw in ureg:\n", " value, unit = vs[0], raw\n", - " except Exception as e:\n", + " except Exception:\n", " value, unit = v, None\n", " else:\n", " value, unit = vs[0], None\n", diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ocp/ocp-upload.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ocp/ocp-upload.ipynb index c72041478e..712452dfbf 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ocp/ocp-upload.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ocp/ocp-upload.ipynb @@ -12,7 +12,6 @@ "from ujson import load\n", "from pymatgen.core.structure import Molecule, Structure\n", "from pathlib import Path\n", - "from time import time\n", "from mpcontribs.client import Client\n", "from tqdm.auto import tqdm" ] diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/open_catalyst_project.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/open_catalyst_project.ipynb index 8eb3de6f2c..a25ff13d05 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/open_catalyst_project.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/open_catalyst_project.ipynb @@ -9,10 +9,8 @@ "source": [ "from mpcontribs.client import Client\n", "from monty.serialization import loadfn\n", - "from json import loads\n", "from pymatgen.core.structure import Molecule, Structure\n", - "from pathlib import Path\n", - "from time import time" + "from pathlib import Path" ] }, { diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/perovskites_diffusion.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/perovskites_diffusion.ipynb index 95d05e6214..a702178910 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/perovskites_diffusion.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/perovskites_diffusion.ipynb @@ -53,7 +53,7 @@ "metadata": {}, "outputs": [], "source": [ - "import tarfile, os\n", + "import tarfile\n", "from pandas import read_excel\n", "\n", "units = {\n", @@ -97,7 +97,7 @@ " key = keys[col]\n", " if isinstance(key, str):\n", " key = key.strip()\n", - " if not key in abbreviations:\n", + " if key not in abbreviations:\n", " abbreviations[key] = col\n", " else:\n", " key = col.strip().lower()\n", diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/pydatarecognition.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/pydatarecognition.ipynb index 22b459f9bb..cc12f86a43 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/pydatarecognition.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/pydatarecognition.ipynb @@ -8,11 +8,9 @@ "outputs": [], "source": [ "%env MPRESTER_MUTE_PROGRESS_BARS 1\n", - "import os\n", "from pathlib import Path\n", "from mpcontribs.client import Client\n", - "from mp_api.client import MPRester\n", - "from flatten_dict import unflatten, flatten\n", + "from flatten_dict import unflatten\n", "from pymatgen.io.cif import CifParser\n", "from pandas import DataFrame\n", "import numpy as np" diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/screening_inorganic_pv.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/screening_inorganic_pv.ipynb index b41e2dc9ed..07d2043bee 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/screening_inorganic_pv.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/screening_inorganic_pv.ipynb @@ -6,7 +6,7 @@ "metadata": {}, "outputs": [], "source": [ - "import os, json\n", + "import json\n", "from pathlib import Path\n", "from pandas import DataFrame\n", "from mpcontribs.client import Client\n", diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/silicon_defects.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/silicon_defects.ipynb index 159beb7221..ab3ab1d059 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/silicon_defects.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/silicon_defects.ipynb @@ -11,7 +11,7 @@ "from mpcontribs.client import Client, Attachment\n", "from pymatgen.core import Structure\n", "from pathlib import Path\n", - "from flatten_dict import flatten, unflatten" + "from flatten_dict import flatten" ] }, { @@ -95,7 +95,7 @@ "}\n", "\n", "for k, v in list(reorg.items()):\n", - " if not \"unit\" in v:\n", + " if \"unit\" not in v:\n", " root_field = reorg.pop(k).get(\"field\")\n", "\n", " for kk, vv in excitation_reorg.items():\n", diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/springer_materials.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/springer_materials.ipynb index 88483a98ea..0ec1ad6dc4 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/springer_materials.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/springer_materials.ipynb @@ -11,7 +11,7 @@ "import re\n", "from glob import glob\n", "from mpcontribs.client import Client\n", - "from flatten_dict import unflatten, flatten" + "from flatten_dict import unflatten" ] }, { diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/transparent_conductors.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/transparent_conductors.ipynb index 2fc544b746..bd48684926 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/transparent_conductors.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/transparent_conductors.ipynb @@ -7,7 +7,6 @@ "metadata": {}, "outputs": [], "source": [ - "import tarfile, os\n", "import numpy as np\n", "from pandas import read_excel\n", "from mpcontribs.client import Client" diff --git a/mpcontribs-portal/notebooks/lightsources.materialsproject.org/get_started.ipynb b/mpcontribs-portal/notebooks/lightsources.materialsproject.org/get_started.ipynb index 17ee152009..5edfa98091 100644 --- a/mpcontribs-portal/notebooks/lightsources.materialsproject.org/get_started.ipynb +++ b/mpcontribs-portal/notebooks/lightsources.materialsproject.org/get_started.ipynb @@ -7,8 +7,6 @@ "outputs": [], "source": [ "import os\n", - "import json\n", - "import gzip\n", "from zipfile import ZipFile\n", "from io import StringIO, BytesIO\n", "from numpy import where\n", @@ -16,8 +14,7 @@ "from pandas import to_numeric, read_csv\n", "from mpcontribs.client import Client, Attachment\n", "from tqdm.notebook import tqdm\n", - "from decimal import Decimal\n", - "from pathlib import Path" + "from decimal import Decimal" ] }, { diff --git a/mpcontribs-portal/notebooks/ml.materialsproject.org/get_started.ipynb b/mpcontribs-portal/notebooks/ml.materialsproject.org/get_started.ipynb index ed4e3c02dd..c43784529b 100644 --- a/mpcontribs-portal/notebooks/ml.materialsproject.org/get_started.ipynb +++ b/mpcontribs-portal/notebooks/ml.materialsproject.org/get_started.ipynb @@ -6,7 +6,9 @@ "metadata": {}, "outputs": [], "source": [ - "import wget, json, os, math\n", + "import wget\n", + "import json\n", + "import math\n", "from pathlib import Path\n", "from string import capwords\n", "from pybtex.database import parse_string\n", diff --git a/mpcontribs-portal/wsgi.py b/mpcontribs-portal/wsgi.py index e314b76514..96ebc59a28 100644 --- a/mpcontribs-portal/wsgi.py +++ b/mpcontribs-portal/wsgi.py @@ -1,7 +1,6 @@ # -*- coding: utf-8 -*- import re import os -import ddtrace.auto import django_settings_file from django.core.wsgi import get_wsgi_application from whitenoise import WhiteNoise diff --git a/mpcontribs-serverless/make_download/app.py b/mpcontribs-serverless/make_download/app.py index 8c97bce147..f7031828a6 100644 --- a/mpcontribs-serverless/make_download/app.py +++ b/mpcontribs-serverless/make_download/app.py @@ -1,6 +1,5 @@ # TODO ddtrace import os -import json import logging import boto3 From 74ac09f52a656d4da8e86e73189b9ae806d5fae6 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 1 Jun 2026 16:19:51 -0700 Subject: [PATCH 019/591] PrefixedEmail now throws ValidationError instead of ValueError --- mpcontribs-api/src/mpcontribs_api/types.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mpcontribs-api/src/mpcontribs_api/types.py b/mpcontribs-api/src/mpcontribs_api/types.py index 9607ef6980..3420b70ebb 100644 --- a/mpcontribs-api/src/mpcontribs_api/types.py +++ b/mpcontribs-api/src/mpcontribs_api/types.py @@ -3,6 +3,8 @@ from pandas.core.arrays.string_arrow import re from pydantic import BeforeValidator, Field +from src.mpcontribs_api.exceptions import ValidationError + ShortStr = Annotated[str, Field(min_length=3, max_length=30)] @@ -12,7 +14,7 @@ def _validate_prefixed_email(v: str) -> str: v = v.strip() if not _EMAIL_RE.match(v): - raise ValueError( + raise ValidationError( "must match ':@', e.g. 'google:name@gmail.com'" ) return v From 6baffad182339b78b5e8172c8cac688351824d6f Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 1 Jun 2026 16:44:23 -0700 Subject: [PATCH 020/591] Changed ProjectResource for ProjectOut for consistency with ProjectIn. Added create_project --- .../mpcontribs_api/domains/projects/models.py | 35 +++++++++++++----- .../domains/projects/repository.py | 37 +++++-------------- .../mpcontribs_api/domains/projects/router.py | 11 +++--- 3 files changed, 41 insertions(+), 42 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py index 07c624c95d..357fcbb75f 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py @@ -1,3 +1,5 @@ +from __future__ import annotations + from enum import Enum from typing import Annotated, Any, Literal @@ -37,22 +39,30 @@ class Reference(BaseModel): class Project(DocumentWithSoftDelete): """Document model of what is actually stored.""" + # Required # meaningful string id, always supplied id: ShortStr = Field(alias="_id") # pyright: ignore[reportGeneralTypeIssues, reportIncompatibleVariableOverride] title: ShortStr authors: str description: str owner: PrefixedEmail - other: dict[str, Any] - is_public: bool = False - is_approved: bool = False - long_title: str unique_identifiers: bool - references: list[Reference] stats: Stats - columns: list[Column] + + # Optional + references: list[Reference] = Field(default_factory=list) + long_title: str | None = None + other: dict[str, Any] = Field(default_factory=dict) + columns: list[Column] = Field(default_factory=list) + is_public: bool = False + is_approved: bool = False license: Literal["CCA4", "CCPD"] | None = None + # Empty method for now. Keeping for business logic later + @classmethod + def from_project_in(cls, data: ProjectIn) -> Project: + return cls(**data.model_dump()) + # Project Responses class ProjectSummary(BaseModel): @@ -66,11 +76,13 @@ class ProjectSummary(BaseModel): title: ShortStr -class ProjectResponse(BaseModel): +class ProjectOut(BaseModel): """Full response of all public-facing fields.""" model_config = ConfigDict(extra="ignore") - id: Annotated[ShortStr | None, Field(alias="_id")] = None + id: Annotated[ + ShortStr | None, Field(validation_alias="_id", serialization_alias="id") + ] = None authors: str | None = None description: str | None = None title: ShortStr | None = None @@ -119,6 +131,11 @@ class Constants(Filter.Constants): model = Project +# Keeping for business logic separation. May have specific implementation later +class ProjectIn(Project): + pass + + # Enum to determine which response model to use class ProjectView(str, Enum): full = "full" @@ -126,6 +143,6 @@ class ProjectView(str, Enum): _VIEW_MODELS: dict[ProjectView, type[BaseModel]] = { - ProjectView.full: ProjectResponse, + ProjectView.full: ProjectOut, ProjectView.summary: ProjectSummary, } diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py index 31d36e138d..553195f77b 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py @@ -6,7 +6,8 @@ from src.mpcontribs_api.domains.projects.models import ( Project, ProjectFilter, - ProjectResponse, + ProjectIn, + ProjectOut, ) from src.mpcontribs_api.pagination import ( CursorParams, @@ -25,31 +26,6 @@ class HasId(BaseModel): V = TypeVar("V", bound=HasId) M = TypeVar("M", bound=BaseModel) -# class IScopedProjectRepository(Protocol): -# @overload -# async def get_project(self, query: dict[str, Any]) -> ProjectResponse | None: ... -# @overload -# async def get_project( -# self, query: dict[str, Any], *, view: type[BaseModel] -# ) -> BaseModel | None: ... -# async def get_project( -# self, -# query: dict[str, Any], -# *, -# view: type[BaseModel] = ProjectResponse, -# ) -> BaseModel | None: ... - -# @overload -# async def get_project_by_id(self, id: str) -> ProjectResponse | None: ... -# @overload -# async def get_project_by_id(self, id: str, *, view: type[M]) -> M | None: ... -# async def get_project_by_id( -# self, -# id: str, -# *, -# view: type[M] | None = None, -# ) -> M | ProjectResponse | None: ... - class MongoDbProjectRepository: def __init__(self, user: User) -> None: @@ -85,7 +61,7 @@ async def get_project( pagination: CursorParams, *, view: type[V] | None = None, - ) -> Page[V | ProjectResponse]: + ) -> Page[V | ProjectOut]: """Query the Project collection using filtering. Only considers the Projects that the User has access to. @@ -95,7 +71,7 @@ async def get_project( pagination (CursorParams): parameters for pagination using a cursor view (type[M]): The type of resposne we should return within the Page """ - model = view or ProjectResponse + model = view or ProjectOut # Filter projects to just the ones within the user scope query = filter.filter(Project.find(self._scope)) @@ -118,3 +94,8 @@ async def get_project( items = docs[: pagination.limit] next_cursor = encode_cursor(str(items[-1].id)) if has_more and items else None return Page(items=items, next_cursor=next_cursor) + + async def create_project(self, project: ProjectIn) -> ProjectOut: + full_project = Project.from_project_in(project) + await full_project.insert() + return ProjectOut.model_validate(full_project) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py index 162c656aec..140e04d0c2 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py @@ -7,7 +7,8 @@ from src.mpcontribs_api.domains.projects.models import ( _VIEW_MODELS, ProjectFilter, - ProjectResponse, + ProjectIn, + ProjectOut, ProjectSummary, ProjectView, ) @@ -25,7 +26,7 @@ async def get_project( return await repo.get_project(filter=filter, pagination=pagination) -@router.get("/{id}", response_model=ProjectResponse | ProjectSummary) +@router.get("/{id}", response_model=ProjectOut | ProjectSummary) async def get_project_by_id( id: str, repo: ProjectDep, @@ -35,9 +36,9 @@ async def get_project_by_id( return await repo.get_project_by_id(id=id, view=_VIEW_MODELS[view]) -@router.post("", response_model=ProjectResponse) +@router.post("", response_model=ProjectOut) async def post_project( repo: ProjectDep, - project: ProjectPost = Depends(authorize_resource), + project: ProjectIn, ): - return await repo.post(project=project) + return await repo.create_project(project=project) From d761d3a9e3a89a78b23eb0bb2c3e86db7408e24e Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 1 Jun 2026 16:44:56 -0700 Subject: [PATCH 021/591] Changed create_project to insert_project --- .../src/mpcontribs_api/domains/projects/repository.py | 2 +- mpcontribs-api/src/mpcontribs_api/domains/projects/router.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py index 553195f77b..fc5ae1b283 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py @@ -95,7 +95,7 @@ async def get_project( next_cursor = encode_cursor(str(items[-1].id)) if has_more and items else None return Page(items=items, next_cursor=next_cursor) - async def create_project(self, project: ProjectIn) -> ProjectOut: + async def insert_project(self, project: ProjectIn) -> ProjectOut: full_project = Project.from_project_in(project) await full_project.insert() return ProjectOut.model_validate(full_project) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py index 140e04d0c2..cd73869d05 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py @@ -37,8 +37,8 @@ async def get_project_by_id( @router.post("", response_model=ProjectOut) -async def post_project( +async def insert_project( repo: ProjectDep, project: ProjectIn, ): - return await repo.create_project(project=project) + return await repo.insert_project(project=project) From bd2dbbb4848ae017e2c5ba0707586f4cea0243f1 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 1 Jun 2026 17:21:54 -0700 Subject: [PATCH 022/591] Added Project patch for partial udpates --- .../mpcontribs_api/domains/projects/models.py | 17 +++++++++ .../domains/projects/repository.py | 37 +++++++++++++++++++ .../mpcontribs_api/domains/projects/router.py | 22 +++++++++++ 3 files changed, 76 insertions(+) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py index 357fcbb75f..03614d1a3f 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py @@ -136,6 +136,23 @@ class ProjectIn(Project): pass +class ProjectPatch(BaseModel): + id: ShortStr | None = Field(default=None, alias="_id") + title: ShortStr | None = None + authors: str | None = None + description: str | None = None + owner: PrefixedEmail | None = None + unique_identifiers: bool | None = None + stats: Stats | None = None + references: list[Reference] = Field(default_factory=list) + long_title: str | None = None + other: dict[str, Any] = Field(default_factory=dict) + columns: list[Column] = Field(default_factory=list) + is_public: bool = False + is_approved: bool = False + license: Literal["CCA4", "CCPD"] | None = None + + # Enum to determine which response model to use class ProjectView(str, Enum): full = "full" diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py index fc5ae1b283..8d170fb6d8 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py @@ -1,5 +1,7 @@ from typing import Any, TypeVar, runtime_checkable +from beanie import UpdateResponse +from beanie.operators import Set from pydantic import BaseModel from src.mpcontribs_api.auth import User @@ -8,7 +10,9 @@ ProjectFilter, ProjectIn, ProjectOut, + ProjectPatch, ) +from src.mpcontribs_api.exceptions import NotFoundError from src.mpcontribs_api.pagination import ( CursorParams, Page, @@ -99,3 +103,36 @@ async def insert_project(self, project: ProjectIn) -> ProjectOut: full_project = Project.from_project_in(project) await full_project.insert() return ProjectOut.model_validate(full_project) + + async def patch_project(self, id: str, update: ProjectPatch) -> ProjectOut: + """Partial update to project identified with 'id'. + + Note: overwrites fields with given values - arrays are not appended to. + + Args: + id (str): the id of the project to update + update (ProjectPatch): the partial update to apply - unset fields are dropped + - Note: If fields are intentionally set to None, None is applied to the field. + + Returns: + The Project with updates applied + """ + # Only retain set fields (patch) + update_data = update.model_dump(exclude_unset=True) + # If update is empty, return the model anyways (consistent behavior) + if not update_data: + existing = await Project.get(Project.id == id) + if existing is None: + raise NotFoundError(f"Project with id {id} not found") + return ProjectOut.model_validate(existing, from_attributes=True) + + # Otherwise, update the fields fully (set) + # Brendan TODO: Set will replace an entire field + # - if we want to append to a list (ie. add a reference) we ned Push/AddToSet + updated = Project.find_one(Project.id == id).update( + Set(update_data), + response_type=UpdateResponse.NEW_DOCUMENT, + ) + if updated is None: + raise NotFoundError(f"Project with id {id} not found") + return ProjectOut.model_validate(updated, from_attributes=True) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py index cd73869d05..2db7ff1dfa 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py @@ -9,6 +9,7 @@ ProjectFilter, ProjectIn, ProjectOut, + ProjectPatch, ProjectSummary, ProjectView, ) @@ -42,3 +43,24 @@ async def insert_project( project: ProjectIn, ): return await repo.insert_project(project=project) + + +@router.patch(f"{id}", response_model=ProjectOut) +async def patch_project( + repo: ProjectDep, + id: str, + update: ProjectPatch, +): + """Partial update to project identified with 'id'. + + Note: overwrites fields with given values - arrays are not appended to. + + Args: + id (str): the id of the project to update + update (ProjectPatch): the partial update to apply - unset fields are dropped + - Note: If fields are intentionally set to None, None is applied to the field. + + Returns: + The Project with updates applied + """ + return await repo.patch_project(id=id, update=update) From 9271c5b19d8ac97f430a4af4d1f772919be51469 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 1 Jun 2026 17:27:21 -0700 Subject: [PATCH 023/591] Added Project delete --- .../mpcontribs_api/domains/projects/repository.py | 8 ++++++++ .../src/mpcontribs_api/domains/projects/router.py | 14 ++++++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py index 8d170fb6d8..44ce44d673 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py @@ -136,3 +136,11 @@ async def patch_project(self, id: str, update: ProjectPatch) -> ProjectOut: if updated is None: raise NotFoundError(f"Project with id {id} not found") return ProjectOut.model_validate(updated, from_attributes=True) + + async def delete_project(self, id: str): + """Delete project by id. + + Args: + id (str): the id of the project to delete + """ + await Project.find_one(Project.id == id).delete() diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py index 2db7ff1dfa..9e18f0bac3 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py @@ -1,7 +1,8 @@ from typing import Annotated -from fastapi import APIRouter, Query +from fastapi import APIRouter, Query, Response, status from fastapi_filter import FilterDepends +from starlette.status import HTTP_204_NO_CONTENT from src.mpcontribs_api.domains.projects.dependencies import ProjectDep from src.mpcontribs_api.domains.projects.models import ( @@ -45,7 +46,7 @@ async def insert_project( return await repo.insert_project(project=project) -@router.patch(f"{id}", response_model=ProjectOut) +@router.patch("{id}", response_model=ProjectOut) async def patch_project( repo: ProjectDep, id: str, @@ -64,3 +65,12 @@ async def patch_project( The Project with updates applied """ return await repo.patch_project(id=id, update=update) + + +@router.delete("{id}", status_code=status.HTTP_204_NO_CONTENT) +async def delete_project( + repo: ProjectDep, + id: str, +): + await repo.delete_project(id=id) + return Response(status_code=HTTP_204_NO_CONTENT) From 0ac82040a979109957319997abc85061903a99d4 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Tue, 2 Jun 2026 09:03:05 -0700 Subject: [PATCH 024/591] Added Projet Upsert (put) --- .../src/mpcontribs_api/domains/projects/repository.py | 5 +++++ .../src/mpcontribs_api/domains/projects/router.py | 11 ++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py index 44ce44d673..d780f9a94f 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py @@ -144,3 +144,8 @@ async def delete_project(self, id: str): id (str): the id of the project to delete """ await Project.find_one(Project.id == id).delete() + + async def upsert_project(self, id: str, data: ProjectIn) -> Project: + project = Project.from_project_in(data) + project.id = id + return await project.save() diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py index 9e18f0bac3..83f25afc13 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py @@ -38,15 +38,16 @@ async def get_project_by_id( return await repo.get_project_by_id(id=id, view=_VIEW_MODELS[view]) -@router.post("", response_model=ProjectOut) -async def insert_project( +@router.put("/{id}", response_model=ProjectOut) +async def upsert_project( repo: ProjectDep, + id: str, project: ProjectIn, ): - return await repo.insert_project(project=project) + return await repo.upsert_project(id=id, data=project) -@router.patch("{id}", response_model=ProjectOut) +@router.patch("/{id}", response_model=ProjectOut) async def patch_project( repo: ProjectDep, id: str, @@ -67,7 +68,7 @@ async def patch_project( return await repo.patch_project(id=id, update=update) -@router.delete("{id}", status_code=status.HTTP_204_NO_CONTENT) +@router.delete("/{id}", status_code=status.HTTP_204_NO_CONTENT) async def delete_project( repo: ProjectDep, id: str, From b8bbb4d665a3485f2268e49a753a2749c2ba54c0 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Tue, 2 Jun 2026 12:51:36 -0700 Subject: [PATCH 025/591] Added docstrings and removed dead code --- mpcontribs-api/src/mpcontribs_api/app.py | 2 +- mpcontribs-api/src/mpcontribs_api/auth.py | 10 ++- .../src/mpcontribs_api/dependencies.py | 2 + .../mpcontribs_api/domains/projects/models.py | 12 ++- .../domains/projects/repository.py | 75 +++++++++++++++---- .../mpcontribs_api/domains/projects/router.py | 45 ++++++++++- .../mpcontribs_api/domains/shared/models.py | 20 ----- .../src/mpcontribs_api/middleware.py | 1 - mpcontribs-api/src/mpcontribs_api/models.py | 0 .../src/mpcontribs_api/pagination.py | 11 ++- mpcontribs-api/src/mpcontribs_api/types.py | 14 ---- 11 files changed, 136 insertions(+), 56 deletions(-) delete mode 100644 mpcontribs-api/src/mpcontribs_api/domains/shared/models.py delete mode 100644 mpcontribs-api/src/mpcontribs_api/models.py diff --git a/mpcontribs-api/src/mpcontribs_api/app.py b/mpcontribs-api/src/mpcontribs_api/app.py index 3a5aed8f29..292395b94f 100644 --- a/mpcontribs-api/src/mpcontribs_api/app.py +++ b/mpcontribs-api/src/mpcontribs_api/app.py @@ -67,7 +67,7 @@ async def create_app(settings: Settings | None = None) -> FastAPI: # Add request context to logs app.add_middleware(BaseHTTPMiddleware, dispatch=bind_request_context) - # Bind exception handlers + # Bind exception handlers so the app understands how to handle them register_exception_handlers(app) app.include_router(v1_router, prefix="/api/v1") diff --git a/mpcontribs-api/src/mpcontribs_api/auth.py b/mpcontribs-api/src/mpcontribs_api/auth.py index 6f82eb7e9f..2e59670686 100644 --- a/mpcontribs-api/src/mpcontribs_api/auth.py +++ b/mpcontribs-api/src/mpcontribs_api/auth.py @@ -8,8 +8,16 @@ class User(BaseModel): + """User definition derived from request headers. + + Attributes: + consumer_id (str | None): Kong id, for logging only + username (str | None): the username of the active user - if None, the user is anonymous + groups (frozenset[str]): the groups the user is part of - used for access control + """ + model_config = ConfigDict(frozen=True) - consumer_id: str | None = None # opaque Kong id — logging/audit only + consumer_id: str | None = None username: str | None = None groups: frozenset[str] = frozenset() diff --git a/mpcontribs-api/src/mpcontribs_api/dependencies.py b/mpcontribs-api/src/mpcontribs_api/dependencies.py index 10f2112324..ad120b8201 100644 --- a/mpcontribs-api/src/mpcontribs_api/dependencies.py +++ b/mpcontribs-api/src/mpcontribs_api/dependencies.py @@ -17,6 +17,7 @@ def verify_gateway(x_gateway_secret: Annotated[str | None, Header()] = None) -> None: + """Ensures the current access attempt is coming through Kong""" if x_gateway_secret is None or not hmac.compare_digest( x_gateway_secret, str(settings.kong.gateway_secret) ): @@ -35,6 +36,7 @@ def _split(raw: str | None) -> set[str]: def get_user(request: Request) -> User: + """Dissects request headers for user-related keys.""" h = request.headers explicit_anon = h.get("x-anonymous-consumer", "").lower() == "true" username = h.get("x-consumer-username") or None diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py index 03614d1a3f..7429822318 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py @@ -98,8 +98,9 @@ class ProjectOut(BaseModel): license: Literal["CCA4", "CCPD"] | None = None -# Filter to use for Projects class ProjectFilter(Filter): + """Filter fields allowed in requests.""" + id: ShortStr | None = None id__in: list[ShortStr] | None = None id__neq: ShortStr | None = None @@ -133,17 +134,19 @@ class Constants(Filter.Constants): # Keeping for business logic separation. May have specific implementation later class ProjectIn(Project): + """Representation of user-supplied input.""" + pass class ProjectPatch(BaseModel): - id: ShortStr | None = Field(default=None, alias="_id") + """Nullable Project representation of user-supplied data for partial update (patch)""" + title: ShortStr | None = None authors: str | None = None description: str | None = None owner: PrefixedEmail | None = None unique_identifiers: bool | None = None - stats: Stats | None = None references: list[Reference] = Field(default_factory=list) long_title: str | None = None other: dict[str, Any] = Field(default_factory=dict) @@ -155,6 +158,8 @@ class ProjectPatch(BaseModel): # Enum to determine which response model to use class ProjectView(str, Enum): + """An enum for selecting output models via strings.""" + full = "full" summary = "summary" @@ -163,3 +168,4 @@ class ProjectView(str, Enum): ProjectView.full: ProjectOut, ProjectView.summary: ProjectSummary, } +"""Convert from ProjectView string to the corresponding model.""" diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py index d780f9a94f..bfe81e37f3 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py @@ -12,7 +12,7 @@ ProjectOut, ProjectPatch, ) -from src.mpcontribs_api.exceptions import NotFoundError +from src.mpcontribs_api.exceptions import ConflictError, NotFoundError from src.mpcontribs_api.pagination import ( CursorParams, Page, @@ -32,11 +32,25 @@ class HasId(BaseModel): class MongoDbProjectRepository: + """A repository layer for access to MongoDB + + This is the layer that directly interacts with database operations + + Attributes: + _scope (dict[str, Any]): additional terms to inject into mongo queries to enforce user authorization on resources + """ + def __init__(self, user: User) -> None: + """Initializes an instance based on the current user + + Args: + user (User): the current user requesting resources + """ self._scope = self._build_scope(user) @staticmethod def _build_scope(user: User) -> dict[str, Any]: + """Provides scope based on current user's permitted groups and publicly released data.""" if user.is_admin: return {} ors: list[dict[str, Any]] = [{"is_public": True, "is_approved": True}] @@ -46,13 +60,17 @@ def _build_scope(user: User) -> dict[str, Any]: ors.append({"_id": {"$in": sorted(user.groups)}}) return {"$or": ors} - def _scoped(self, *clauses: Any) -> dict[str, Any]: - parts = [c for c in (self._scope, *clauses) if c] - if not parts: - return {} - return parts[0] if len(parts) == 1 else {"$and": parts} - + # Brendan TODO: figure out return type async def get_project_by_id(self, id: str, *, view: type[M] | None = None): + """Finds a single project by ID + + Args: + id (str): the id of the project to find + view (type[M] | None): a BaseModel to use for projection. If none, the document is returned without projection + + Returns: + BaseModel: a typed document with the requested id + """ # TODO: Verify that self._scope and Project.id == id get combined properly return await Project.find_one( self._scope, Project.id == id, projection_model=view @@ -74,6 +92,9 @@ async def get_project( filter (ProjectFilter): the query to filter the collection by pagination (CursorParams): parameters for pagination using a cursor view (type[M]): The type of resposne we should return within the Page + + Returns: + Page[V | ProjectOut]: a page containing a set number of documents in requested format with a flag for knowing if there are more pages """ model = view or ProjectOut @@ -99,12 +120,26 @@ async def get_project( next_cursor = encode_cursor(str(items[-1].id)) if has_more and items else None return Page(items=items, next_cursor=next_cursor) - async def insert_project(self, project: ProjectIn) -> ProjectOut: + async def insert_project(self, project: ProjectIn) -> Project: + """Inserst a new project. + + Args: + project (ProjectIn): the project to be inserted + + Returns: + Project: the project after succesful insertion + """ + id_exists = Project.find_one(Project.id == project.id) + # Brendan TODO: + if id_exists: + raise ConflictError( + f"Cannot insert project.\n Project with ID {project.id} exists" + ) full_project = Project.from_project_in(project) await full_project.insert() - return ProjectOut.model_validate(full_project) + return full_project - async def patch_project(self, id: str, update: ProjectPatch) -> ProjectOut: + async def patch_project(self, id: str, update: ProjectPatch) -> Project: """Partial update to project identified with 'id'. Note: overwrites fields with given values - arrays are not appended to. @@ -124,18 +159,19 @@ async def patch_project(self, id: str, update: ProjectPatch) -> ProjectOut: existing = await Project.get(Project.id == id) if existing is None: raise NotFoundError(f"Project with id {id} not found") - return ProjectOut.model_validate(existing, from_attributes=True) + return existing # Otherwise, update the fields fully (set) # Brendan TODO: Set will replace an entire field # - if we want to append to a list (ie. add a reference) we ned Push/AddToSet - updated = Project.find_one(Project.id == id).update( + query = Project.find_one(Project.id == id).update( Set(update_data), response_type=UpdateResponse.NEW_DOCUMENT, ) + updated = await query # pyright: ignore[reportGeneralTypeIssues] # beanie UpdateQuery is awaitable, but pyright doesn't see it if updated is None: raise NotFoundError(f"Project with id {id} not found") - return ProjectOut.model_validate(updated, from_attributes=True) + return updated async def delete_project(self, id: str): """Delete project by id. @@ -146,6 +182,19 @@ async def delete_project(self, id: str): await Project.find_one(Project.id == id).delete() async def upsert_project(self, id: str, data: ProjectIn) -> Project: + """Upsert a project by provided id. + + Upsert: Update document if id is found, otherwise insert new document using id. + Note: Relies on the path param 'id' for finding, rather than the body's id. + + Args: + repo (ProjectDep): the project repo we depend on + id (str): the id of the project to retrieve + project (ProjectIn): the data of the project to upsert + + Returns: + Project: the full document that either replaced an old one or was inserted + """ project = Project.from_project_in(data) project.id = id return await project.save() diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py index 83f25afc13..9a95f1be48 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py @@ -19,12 +19,22 @@ router = APIRouter() +# Brendan TODO: Add in option to select ProjectSummary or ProjectOut @router.get("", response_model=list[ProjectSummary]) async def get_project( repo: ProjectDep, pagination: Annotated[CursorParams, Query()], filter: ProjectFilter = FilterDepends(ProjectFilter), ): + """Return paginated projects matching a filter. + + Args: + repo (ProjectDep): the project repo we depend on + pagination (CursorParams): arguments for cursor-based pagination + filter (ProjectFilter): arguments for filtering projects + + Returns: + list[ProjectSummary]: a list of smaller project payloads""" return await repo.get_project(filter=filter, pagination=pagination) @@ -32,9 +42,18 @@ async def get_project( async def get_project_by_id( id: str, repo: ProjectDep, - *, view: ProjectView = ProjectView.full, ): + """Gets a single project by its ID. + + Args: + id (str): the id of the project to retrieve + repo (ProjectDep): the project repo we depend on + view (ProjectView): user selection for which type of return is desired (smaller summary or the complete project) + + Returns: + ProjectOut | ProjectSummary: the requested project, actual data returned is determined by the view the user requested + """ return await repo.get_project_by_id(id=id, view=_VIEW_MODELS[view]) @@ -44,6 +63,19 @@ async def upsert_project( id: str, project: ProjectIn, ): + """Upsert a project by provided id. + + Upsert: Update document if id is found, otherwise insert new document using id. + Note: Relies on the path param 'id' for finding, rather than the body's id. + + Args: + repo (ProjectDep): the project repo we depend on + id (str): the id of the project to retrieve + project (ProjectIn): the data of the project to upsert + + Returns: + ProjectOut: the full document that either replaced an old one or was inserted + """ return await repo.upsert_project(id=id, data=project) @@ -58,12 +90,13 @@ async def patch_project( Note: overwrites fields with given values - arrays are not appended to. Args: + repo (ProjectDep): the project repo we depend on id (str): the id of the project to update update (ProjectPatch): the partial update to apply - unset fields are dropped - Note: If fields are intentionally set to None, None is applied to the field. Returns: - The Project with updates applied + ProjectOut: the full Project with updates applied """ return await repo.patch_project(id=id, update=update) @@ -73,5 +106,13 @@ async def delete_project( repo: ProjectDep, id: str, ): + """Deletes a project matching id. + + Args: + repo (ProjectDep): the project repo we depend on + id (str): the id of the project to be deleted + Returns: + Response: a response with the 204 response code (rather than FastAPIs default 200) + """ await repo.delete_project(id=id) return Response(status_code=HTTP_204_NO_CONTENT) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/shared/models.py b/mpcontribs-api/src/mpcontribs_api/domains/shared/models.py deleted file mode 100644 index dc0674f9e8..0000000000 --- a/mpcontribs-api/src/mpcontribs_api/domains/shared/models.py +++ /dev/null @@ -1,20 +0,0 @@ -from typing import Annotated - -from pydantic import BaseModel, Field - - -class PaginationParams(BaseModel): - skip: Annotated[int, Field(description="number of items to skip")] - limit: Annotated[int, Field(description="maximum number of items to return")] = 100 - page: Annotated[ - int, - Field( - description="page number to return (in batches of 'per_page'/'_limit'; alternative to _skip" - ), - ] - per_page: Annotated[ - int, - Field( - description="maximum number of items to return per page (same as '_limit')" - ), - ] diff --git a/mpcontribs-api/src/mpcontribs_api/middleware.py b/mpcontribs-api/src/mpcontribs_api/middleware.py index 3955b91366..d4e0bf8e45 100644 --- a/mpcontribs-api/src/mpcontribs_api/middleware.py +++ b/mpcontribs-api/src/mpcontribs_api/middleware.py @@ -3,7 +3,6 @@ import structlog -# middleware.py async def bind_request_context(request, call_next): structlog.contextvars.clear_contextvars() structlog.contextvars.bind_contextvars( diff --git a/mpcontribs-api/src/mpcontribs_api/models.py b/mpcontribs-api/src/mpcontribs_api/models.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/mpcontribs-api/src/mpcontribs_api/pagination.py b/mpcontribs-api/src/mpcontribs_api/pagination.py index 9f543e5b53..2d7cd85580 100644 --- a/mpcontribs-api/src/mpcontribs_api/pagination.py +++ b/mpcontribs-api/src/mpcontribs_api/pagination.py @@ -4,6 +4,8 @@ class CursorParams(BaseModel): + """Models parameters used in cursor-based pagination""" + # None == First page cursor: str | None = None # Per-page limit @@ -11,6 +13,13 @@ class CursorParams(BaseModel): class Page[T](BaseModel): + """Model to be returned for a single page of cursor-based paginated results. + + Attributes: + items (list[T]): the items returned for the given page + next_cursor (str): the base64-encoded value of the first id on the next page. If None, then no more pages are available + """ + items: list[T] # None == last page next_cursor: str | None = None @@ -23,5 +32,5 @@ def encode_cursor(last_id: str) -> str: def decode_cursor(cursor: str) -> str: try: return base64.urlsafe_b64decode(cursor.encode()).decode() - except (ValueError, UnicodeDecodeError): + except ValueError, UnicodeDecodeError: raise ValueError("malformed cursor") diff --git a/mpcontribs-api/src/mpcontribs_api/types.py b/mpcontribs-api/src/mpcontribs_api/types.py index 3420b70ebb..8d3b6a11fb 100644 --- a/mpcontribs-api/src/mpcontribs_api/types.py +++ b/mpcontribs-api/src/mpcontribs_api/types.py @@ -21,17 +21,3 @@ def _validate_prefixed_email(v: str) -> str: PrefixedEmail = Annotated[str, BeforeValidator(_validate_prefixed_email)] - - -def _parse_sort_entry(v: str) -> tuple[str, int]: - v = v.strip() - if not v: - raise ValueError("empty sort field") - if v[0] == "-": - return v[1:], -1 - if v[0] == "+": - return v[1:], 1 - return v, 1 - - -SortEntry = Annotated[tuple[str, int], BeforeValidator(_parse_sort_entry)] From 617afadc3f0223ea2cd71bca5e6620a7f8e9023e Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Tue, 2 Jun 2026 13:01:14 -0700 Subject: [PATCH 026/591] Removed outdated runtime_checkable and awaited async function to get returned value --- .../src/mpcontribs_api/domains/projects/repository.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py index bfe81e37f3..2854574be2 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py @@ -1,4 +1,4 @@ -from typing import Any, TypeVar, runtime_checkable +from typing import Any, TypeVar from beanie import UpdateResponse from beanie.operators import Set @@ -22,7 +22,6 @@ # Type checking to get around pyright issues -@runtime_checkable class HasId(BaseModel): id: str @@ -129,7 +128,7 @@ async def insert_project(self, project: ProjectIn) -> Project: Returns: Project: the project after succesful insertion """ - id_exists = Project.find_one(Project.id == project.id) + id_exists = await Project.find_one(Project.id == project.id) # Brendan TODO: if id_exists: raise ConflictError( From 22ad07dc3f734517f60479b700a7973a000ade1f Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Tue, 2 Jun 2026 14:07:25 -0700 Subject: [PATCH 027/591] Created a parent class to abstract the handling of fields requested from query. Users can now request partial documents with _fields --- .../mpcontribs_api/domains/projects/models.py | 11 ++-- .../domains/projects/repository.py | 37 +++++-------- .../mpcontribs_api/domains/projects/router.py | 20 ++++--- .../src/mpcontribs_api/exceptions.py | 1 - .../src/mpcontribs_api/projection.py | 55 +++++++++++++++++++ 5 files changed, 85 insertions(+), 39 deletions(-) create mode 100644 mpcontribs-api/src/mpcontribs_api/projection.py diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py index 7429822318..fea73f8e9e 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py @@ -1,12 +1,13 @@ from __future__ import annotations from enum import Enum -from typing import Annotated, Any, Literal +from typing import Annotated, Any, ClassVar, Literal from beanie import DocumentWithSoftDelete from fastapi_filter.contrib.beanie import Filter from pydantic import BaseModel, ConfigDict, Field, HttpUrl +from src.mpcontribs_api.projection import SparseFieldsModel from src.mpcontribs_api.types import PrefixedEmail, ShortStr @@ -76,13 +77,11 @@ class ProjectSummary(BaseModel): title: ShortStr -class ProjectOut(BaseModel): +class ProjectOut(SparseFieldsModel): """Full response of all public-facing fields.""" model_config = ConfigDict(extra="ignore") - id: Annotated[ - ShortStr | None, Field(validation_alias="_id", serialization_alias="id") - ] = None + id: Annotated[ShortStr | None, Field(alias="_id", serialization_alias="id")] = None authors: str | None = None description: str | None = None title: ShortStr | None = None @@ -97,6 +96,8 @@ class ProjectOut(BaseModel): columns: list[Column] | None = None license: Literal["CCA4", "CCPD"] | None = None + sparse_always: ClassVar[frozenset[str]] = frozenset({"id"}) # cursor needs it + class ProjectFilter(Filter): """Filter fields allowed in requests.""" diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py index 2854574be2..07d4215532 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py @@ -60,7 +60,7 @@ def _build_scope(user: User) -> dict[str, Any]: return {"$or": ors} # Brendan TODO: figure out return type - async def get_project_by_id(self, id: str, *, view: type[M] | None = None): + async def get_project_by_id(self, id: str, fields: frozenset[str] | None): """Finds a single project by ID Args: @@ -72,7 +72,9 @@ async def get_project_by_id(self, id: str, *, view: type[M] | None = None): """ # TODO: Verify that self._scope and Project.id == id get combined properly return await Project.find_one( - self._scope, Project.id == id, projection_model=view + self._scope, + Project.id == id, + projection_model=ProjectOut.projection(fields), ) # Brendan TODO: Does not handle compound pagination/sorting (can only paginate on _id, so passing sort arguments does nothing) @@ -80,9 +82,8 @@ async def get_project( self, filter: ProjectFilter, pagination: CursorParams, - *, - view: type[V] | None = None, - ) -> Page[V | ProjectOut]: + fields: frozenset[str] | None, + ): """Query the Project collection using filtering. Only considers the Projects that the User has access to. @@ -90,30 +91,18 @@ async def get_project( Args: filter (ProjectFilter): the query to filter the collection by pagination (CursorParams): parameters for pagination using a cursor - view (type[M]): The type of resposne we should return within the Page - - Returns: - Page[V | ProjectOut]: a page containing a set number of documents in requested format with a flag for knowing if there are more pages + fields (frozenset[str]): the fields to use for projection """ - model = view or ProjectOut - - # Filter projects to just the ones within the user scope + proj = ProjectOut.projection(fields) query = filter.filter(Project.find(self._scope)) - # If cursor was provided if pagination.cursor is not None: - query = query.find( - Project.id > decode_cursor(pagination.cursor) - ) # seek past last-seen - - # Get Projects sorted by id (for pagination), project to requested model - docs = await ( - query.sort(Project.id) - .limit(pagination.limit + 1) # +1 probe to detect if there is a next page - .project(model) + query = query.find(Project.id > decode_cursor(pagination.cursor)) + docs = ( + await query.sort(Project.id) + .limit(pagination.limit + 1) + .project(proj) .to_list() ) - - # Check if we have more docs, return a Page containing just the number of docs requested and the encoded id for the next cursor has_more = len(docs) > pagination.limit items = docs[: pagination.limit] next_cursor = encode_cursor(str(items[-1].id)) if has_more and items else None diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py index 9a95f1be48..fce6caf6cd 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py @@ -6,13 +6,11 @@ from src.mpcontribs_api.domains.projects.dependencies import ProjectDep from src.mpcontribs_api.domains.projects.models import ( - _VIEW_MODELS, ProjectFilter, ProjectIn, ProjectOut, ProjectPatch, ProjectSummary, - ProjectView, ) from src.mpcontribs_api.pagination import CursorParams @@ -20,41 +18,45 @@ # Brendan TODO: Add in option to select ProjectSummary or ProjectOut -@router.get("", response_model=list[ProjectSummary]) +@router.get("", response_model=None) async def get_project( repo: ProjectDep, pagination: Annotated[CursorParams, Query()], filter: ProjectFilter = FilterDepends(ProjectFilter), + fields: Annotated[str | None, Query(alias="_fields")] = None, ): """Return paginated projects matching a filter. Args: repo (ProjectDep): the project repo we depend on pagination (CursorParams): arguments for cursor-based pagination - filter (ProjectFilter): arguments for filtering projects + fields (str | None): optional fields to include in return. If None supplied, all fields are returned Returns: - list[ProjectSummary]: a list of smaller project payloads""" - return await repo.get_project(filter=filter, pagination=pagination) + list[ProjectSummary]: a list of smaller project payloads + """ + selected = ProjectOut.parse_fields(fields) + return await repo.get_project(filter=filter, pagination=pagination, fields=selected) @router.get("/{id}", response_model=ProjectOut | ProjectSummary) async def get_project_by_id( id: str, repo: ProjectDep, - view: ProjectView = ProjectView.full, + fields: Annotated[str | None, Query(alias="_fields")] = None, ): """Gets a single project by its ID. Args: id (str): the id of the project to retrieve repo (ProjectDep): the project repo we depend on - view (ProjectView): user selection for which type of return is desired (smaller summary or the complete project) + fields (str | None): optional fields to include in return. If None supplied, all fields are returned Returns: ProjectOut | ProjectSummary: the requested project, actual data returned is determined by the view the user requested """ - return await repo.get_project_by_id(id=id, view=_VIEW_MODELS[view]) + selected = ProjectOut.parse_fields(fields) + return await repo.get_project_by_id(id=id, fields=selected) @router.put("/{id}", response_model=ProjectOut) diff --git a/mpcontribs-api/src/mpcontribs_api/exceptions.py b/mpcontribs-api/src/mpcontribs_api/exceptions.py index b263c058c3..e495708aba 100644 --- a/mpcontribs-api/src/mpcontribs_api/exceptions.py +++ b/mpcontribs-api/src/mpcontribs_api/exceptions.py @@ -36,7 +36,6 @@ class NotFoundError(AppError): class ConflictError(AppError): status_code = 409 - error_code = "conflict" diff --git a/mpcontribs-api/src/mpcontribs_api/projection.py b/mpcontribs-api/src/mpcontribs_api/projection.py new file mode 100644 index 0000000000..9729d1d7af --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/projection.py @@ -0,0 +1,55 @@ +from __future__ import annotations + +from functools import lru_cache +from typing import Any, ClassVar, Self, TypeVar, cast + +from pydantic import BaseModel, create_model + +from src.mpcontribs_api.exceptions import ValidationError + +ModelT = TypeVar("ModelT", bound=BaseModel) + + +class SparseFieldsModel(BaseModel): + """Mixin for response models that support `_fields` projection. + + The subclass is the public projectable surface (e.g. ProjectOut); its + field names *are* the valid `_fields` vocabulary. Any field backing Mongo + `_id` must be declared `Field(alias="_id", serialization_alias=...)`. + """ + + # Forced into every projection (identity / cursor keys). + sparse_always: ClassVar[frozenset[str]] = frozenset() + + @classmethod + def field_names(cls) -> frozenset[str]: + return frozenset(cls.model_fields) + + @classmethod + def parse_fields(cls, raw: str | None) -> frozenset[str] | None: + """None/empty -> all fields. Otherwise validate the requested subset.""" + if not raw: + return None + requested = {f.strip() for f in raw.split(",") if f.strip()} + if unknown := requested - cls.field_names(): + raise ValidationError( + f"Unknown field(s) in _fields.\nUnknown: {sorted(unknown)}\nValid: {sorted(cls.field_names())}" + ) + return frozenset(requested) | cls.sparse_always + + @classmethod + def projection(cls, fields: frozenset[str] | None) -> type[Self]: + if fields is None: + return cls + return cast("type[Self]", _build_projection(cls, fields)) + + +@lru_cache(maxsize=128) +def _build_projection(model: type[ModelT], fields: frozenset[str]) -> type[ModelT]: + selected: dict[str, Any] = { + n: (model.model_fields[n].annotation, model.model_fields[n]) for n in fields + } + built = create_model( + f"{model.__name__}Projection", __config__=model.model_config, **selected + ) + return cast("type[ModelT]", built) From a4d2330b2caa127cbbd7adb153e73d61d8802a97 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Tue, 2 Jun 2026 14:12:15 -0700 Subject: [PATCH 028/591] modified docstrings to match function definition --- .../src/mpcontribs_api/domains/projects/repository.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py index 07d4215532..4a223fdda8 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py @@ -65,10 +65,10 @@ async def get_project_by_id(self, id: str, fields: frozenset[str] | None): Args: id (str): the id of the project to find - view (type[M] | None): a BaseModel to use for projection. If none, the document is returned without projection + fields (frozenset[str] | None): a BaseModel to use for projection. If none, the document is returned without projection Returns: - BaseModel: a typed document with the requested id + ProjectOut: a projection of ProjectOut containing 'fields' from requested id """ # TODO: Verify that self._scope and Project.id == id get combined properly return await Project.find_one( @@ -91,7 +91,7 @@ async def get_project( Args: filter (ProjectFilter): the query to filter the collection by pagination (CursorParams): parameters for pagination using a cursor - fields (frozenset[str]): the fields to use for projection + fields (frozenset[str] | None): the fields to use for projection. If none, the document is returned without projection """ proj = ProjectOut.projection(fields) query = filter.filter(Project.find(self._scope)) From 5808483787cfe8817cef6816498f764a1a9853bc Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Tue, 2 Jun 2026 14:16:06 -0700 Subject: [PATCH 029/591] Fixed issue where find_one syntax was used with get --- .../src/mpcontribs_api/domains/projects/repository.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py index 4a223fdda8..e91dfc5450 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py @@ -144,7 +144,7 @@ async def patch_project(self, id: str, update: ProjectPatch) -> Project: update_data = update.model_dump(exclude_unset=True) # If update is empty, return the model anyways (consistent behavior) if not update_data: - existing = await Project.get(Project.id == id) + existing = await Project.get(id) if existing is None: raise NotFoundError(f"Project with id {id} not found") return existing From 2998c02ca97e45857e46b8843c7fce3fb212fc71 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Tue, 2 Jun 2026 14:39:46 -0700 Subject: [PATCH 030/591] Removed dead ProjectSummary usages --- .../mpcontribs_api/domains/projects/models.py | 28 ------------------- .../mpcontribs_api/domains/projects/router.py | 5 ++-- 2 files changed, 2 insertions(+), 31 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py index fea73f8e9e..755b10c573 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py @@ -1,6 +1,5 @@ from __future__ import annotations -from enum import Enum from typing import Annotated, Any, ClassVar, Literal from beanie import DocumentWithSoftDelete @@ -65,18 +64,6 @@ def from_project_in(cls, data: ProjectIn) -> Project: return cls(**data.model_dump()) -# Project Responses -class ProjectSummary(BaseModel): - """Subset of fields to return when not all info is desired.""" - - id: Annotated[ShortStr, Field(alias="_id")] - owner: PrefixedEmail - unique_identifiers: bool - is_public: bool = False - is_approved: bool = False - title: ShortStr - - class ProjectOut(SparseFieldsModel): """Full response of all public-facing fields.""" @@ -155,18 +142,3 @@ class ProjectPatch(BaseModel): is_public: bool = False is_approved: bool = False license: Literal["CCA4", "CCPD"] | None = None - - -# Enum to determine which response model to use -class ProjectView(str, Enum): - """An enum for selecting output models via strings.""" - - full = "full" - summary = "summary" - - -_VIEW_MODELS: dict[ProjectView, type[BaseModel]] = { - ProjectView.full: ProjectOut, - ProjectView.summary: ProjectSummary, -} -"""Convert from ProjectView string to the corresponding model.""" diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py index fce6caf6cd..b059c69747 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py @@ -10,7 +10,6 @@ ProjectIn, ProjectOut, ProjectPatch, - ProjectSummary, ) from src.mpcontribs_api.pagination import CursorParams @@ -39,7 +38,7 @@ async def get_project( return await repo.get_project(filter=filter, pagination=pagination, fields=selected) -@router.get("/{id}", response_model=ProjectOut | ProjectSummary) +@router.get("/{id}", response_model=ProjectOut) async def get_project_by_id( id: str, repo: ProjectDep, @@ -53,7 +52,7 @@ async def get_project_by_id( fields (str | None): optional fields to include in return. If None supplied, all fields are returned Returns: - ProjectOut | ProjectSummary: the requested project, actual data returned is determined by the view the user requested + ProjectOut: the requested project, actual data returned is determined by the view the user requested """ selected = ProjectOut.parse_fields(fields) return await repo.get_project_by_id(id=id, fields=selected) From 41dd24b4ca6768333a28957796c00702471da190 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Tue, 2 Jun 2026 15:38:34 -0700 Subject: [PATCH 031/591] Automatic projection processing now hanldes dot-paths and validates existence against the Document, unless field is a dict --- .../mpcontribs_api/domains/projects/models.py | 4 +- .../src/mpcontribs_api/projection.py | 256 ++++++++++++++++-- 2 files changed, 232 insertions(+), 28 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py index 755b10c573..c8bafda1a2 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py @@ -1,6 +1,6 @@ from __future__ import annotations -from typing import Annotated, Any, ClassVar, Literal +from typing import Annotated, Any, Literal from beanie import DocumentWithSoftDelete from fastapi_filter.contrib.beanie import Filter @@ -83,8 +83,6 @@ class ProjectOut(SparseFieldsModel): columns: list[Column] | None = None license: Literal["CCA4", "CCPD"] | None = None - sparse_always: ClassVar[frozenset[str]] = frozenset({"id"}) # cursor needs it - class ProjectFilter(Filter): """Filter fields allowed in requests.""" diff --git a/mpcontribs-api/src/mpcontribs_api/projection.py b/mpcontribs-api/src/mpcontribs_api/projection.py index 9729d1d7af..b1a5d47f15 100644 --- a/mpcontribs-api/src/mpcontribs_api/projection.py +++ b/mpcontribs-api/src/mpcontribs_api/projection.py @@ -1,55 +1,261 @@ +"""Handles the projection of '_fields' from query params. + +This includes arbitrarily specifying nested structures with '.' +Ie. data.band_gap.something will be properly retrieved and populated into the response model that subclasses SparseFieldsModel +""" + from __future__ import annotations +from collections.abc import Iterator from functools import lru_cache -from typing import Any, ClassVar, Self, TypeVar, cast +from typing import ( + Any, + ClassVar, + Literal, + NamedTuple, + Self, + TypeVar, + cast, + get_args, + get_origin, +) from pydantic import BaseModel, create_model +from pydantic.fields import FieldInfo from src.mpcontribs_api.exceptions import ValidationError ModelT = TypeVar("ModelT", bound=BaseModel) +# How a model field's annotation is categorised for projection. +FieldKind = Literal["model", "dict", "list", "scalar"] +# A path step may also land on a dict key ("opaque") or a name absent from a model ("unknown"). +StepKind = Literal["model", "dict", "list", "scalar", "opaque", "unknown"] + + +class PathStep(NamedTuple): + """One resolved segment of a dotted field path.""" + + segment: str + field: FieldInfo | None + kind: StepKind + is_last: bool + + +def _unwrap_optional(annotation: object) -> object: + """Strip a single ``T | None`` wrapper, returning the inner annotation.""" + arguments = get_args(annotation) + if type(None) in arguments: + non_none = [arg for arg in arguments if arg is not type(None)] + if len(non_none) == 1: + return non_none[0] + return annotation + + +def _classify(annotation: object) -> tuple[FieldKind, type[BaseModel] | None]: + """Categorise an annotation as model / dict / list / scalar.""" + annotation = _unwrap_optional(annotation) + origin = get_origin(annotation) + if annotation is Any or annotation is dict or origin is dict: + return "dict", None + if origin in (list, set, tuple, frozenset): + return "list", None + if isinstance(annotation, type) and issubclass(annotation, BaseModel): + return "model", annotation + return "scalar", None + + +def _walk_path(model: type[BaseModel], path: str) -> Iterator[PathStep]: + """Yield one step per segment, descending into models and going opaque past a dict.""" + current_model: type[BaseModel] | None = model + segments = path.split(".") + for index, segment in enumerate(segments): + is_last = index == len(segments) - 1 + if current_model is None: # inside a dict's arbitrary contents + yield PathStep(segment, None, "opaque", is_last) + continue + field = current_model.model_fields.get(segment) + if field is None: + yield PathStep(segment, None, "unknown", is_last) + current_model = None + continue + kind, nested_model = _classify(field.annotation) + yield PathStep(segment, field, kind, is_last) + current_model = nested_model if kind == "model" else None + + +def _validate_path(model: type[BaseModel], path: str) -> None: + """Raise if the dotted path is not a selectable field path on the model.""" + for step in _walk_path(model, path): + if step.kind == "unknown": + raise ValidationError( + f"unknown field in _fields: {path!r} (no field {step.segment!r})" + ) + if step.kind in ("scalar", "list") and not step.is_last: + raise ValidationError( + f"cannot select subfields of {step.kind} field " + f"{step.segment!r} in _fields: {path!r}" + ) + + +def _collapse(paths: frozenset[str]) -> frozenset[str]: + """Drop any path whose segment-prefix is also requested (a whole field subsumes its parts). + + ie. {stats, stats.count} => {stats} + """ + segments_by_path = {path: tuple(path.split(".")) for path in paths} + return frozenset( + path + for path, segments in segments_by_path.items() + if not any( + other_path != path and segments[: len(other_segments)] == other_segments + for other_path, other_segments in segments_by_path.items() + ) + ) + + +def _mongo_key(model: type[BaseModel], path: str) -> str: + """Translate a dotted field-name path into its alias-resolved Mongo-key path.""" + mongo_segments: list[str] = [] + for step in _walk_path(model, path): + alias = step.field.validation_alias if step.field is not None else None + mongo_segments.append(alias if isinstance(alias, str) else step.segment) + return ".".join(mongo_segments) + + +def _backs_mongo_id(field: FieldInfo) -> bool: + """Whether a field maps to Mongo ``_id`` (by alias), regardless of its name or type.""" + return field.validation_alias == "_id" or field.alias == "_id" + + +def _optional_field(source_field: FieldInfo, annotation: Any) -> tuple[Any, FieldInfo]: + """Build an optional create_model field definition, preserving the source field's aliases.""" + validation_alias = ( + source_field.validation_alias + if isinstance(source_field.validation_alias, str) + else None + ) + serialization_alias = ( + source_field.serialization_alias + if isinstance(source_field.serialization_alias, str) + else None + ) + optional_annotation: Any = annotation | None + return optional_annotation, FieldInfo( + default=None, + validation_alias=validation_alias, + serialization_alias=serialization_alias, + ) + + +@lru_cache(maxsize=128) +def _build_model(model: type[ModelT], paths: frozenset[str]) -> type[ModelT]: + """Recursively build the partial response model covering the requested paths.""" + nested_paths_by_root: dict[str, set[str]] = {} + for path in paths: + root, _, remainder = path.partition(".") + nested_paths = nested_paths_by_root.setdefault(root, set()) + if remainder: + nested_paths.add(remainder) + + field_definitions: dict[str, Any] = {} + for root, nested_paths in nested_paths_by_root.items(): + source_field = model.model_fields[root] + kind, nested_model = _classify(source_field.annotation) + if not nested_paths: + field_definitions[root] = _optional_field( + source_field, source_field.annotation + ) + elif kind == "model" and nested_model is not None: + partial_nested = _build_model(nested_model, frozenset(nested_paths)) + field_definitions[root] = _optional_field(source_field, partial_nested) + elif kind == "dict": + field_definitions[root] = _optional_field(source_field, dict[str, Any]) + else: + raise ValidationError(f"cannot project subfields of {kind} field {root!r}") + + partial_model = create_model( + f"{model.__name__}Projection", + __config__=model.model_config, + **field_definitions, + ) + return cast("type[ModelT]", partial_model) + + +@lru_cache(maxsize=128) +def _build_projection(model: type[ModelT], paths: frozenset[str]) -> type[ModelT]: + """Build the partial model and attach its explicit dotted Mongo projection.""" + projection: dict[str, int] = {"_id": 1} + for path in paths: + projection[_mongo_key(model, path)] = 1 + partial_model = _build_model(model, paths) + setattr(partial_model, "Settings", type("Settings", (), {"projection": projection})) + return partial_model + class SparseFieldsModel(BaseModel): - """Mixin for response models that support `_fields` projection. + """Mixin for response models that support ``_fields`` projection. - The subclass is the public projectable surface (e.g. ProjectOut); its - field names *are* the valid `_fields` vocabulary. Any field backing Mongo - `_id` must be declared `Field(alias="_id", serialization_alias=...)`. + The subclass is the public projectable surface (e.g. ``ProjectOut``); its + field names are the valid ``_fields`` vocabulary, and dotted paths descend + into nested models (``stats.size``) or into arbitrary dict fields + (``data.var.x``). Any field backing Mongo ``_id`` must be declared + ``Field(alias="_id", serialization_alias="id")`` so the projection targets + the right key while the response serialises to the public name. """ - # Forced into every projection (identity / cursor keys). + # Field names forced into every projection (identity / cursor keys). sparse_always: ClassVar[frozenset[str]] = frozenset() + @classmethod + def _identity_fields(cls) -> frozenset[str]: + """Field names backing Mongo ``_id``, always forced into a projection.""" + return frozenset( + name for name, field in cls.model_fields.items() if _backs_mongo_id(field) + ) + @classmethod def field_names(cls) -> frozenset[str]: + """Return the top-level field names that may appear in ``_fields``.""" return frozenset(cls.model_fields) @classmethod def parse_fields(cls, raw: str | None) -> frozenset[str] | None: - """None/empty -> all fields. Otherwise validate the requested subset.""" + """Validate and normalise a raw ``_fields`` value into a set of paths. + + Args: + raw: The comma-separated ``_fields`` value, or None when the query + parameter was omitted. + + Returns: + None when every field should be returned (parameter omitted), + otherwise the validated, collapsed set of dotted paths, always + including this model's ``sparse_always`` fields. + + Raises: + ValidationError: If a requested path names an unknown field or + selects subfields of a scalar or list field. + """ if not raw: - return None - requested = {f.strip() for f in raw.split(",") if f.strip()} - if unknown := requested - cls.field_names(): - raise ValidationError( - f"Unknown field(s) in _fields.\nUnknown: {sorted(unknown)}\nValid: {sorted(cls.field_names())}" - ) - return frozenset(requested) | cls.sparse_always + return None # None == all fields + requested = frozenset(name.strip() for name in raw.split(",") if name.strip()) + for path in requested: + _validate_path(cls, path) + return _collapse(requested | cls.sparse_always | cls._identity_fields()) @classmethod def projection(cls, fields: frozenset[str] | None) -> type[Self]: + """Return a projection model exposing only the requested fields. + + Args: + fields: The collapsed path set from ``parse_fields``, or None to + project every field. + + Returns: + This model unchanged when ``fields`` is None, otherwise a cached + partial model carrying an explicit dotted Mongo projection in its + ``Settings``. + """ if fields is None: return cls return cast("type[Self]", _build_projection(cls, fields)) - - -@lru_cache(maxsize=128) -def _build_projection(model: type[ModelT], fields: frozenset[str]) -> type[ModelT]: - selected: dict[str, Any] = { - n: (model.model_fields[n].annotation, model.model_fields[n]) for n in fields - } - built = create_model( - f"{model.__name__}Projection", __config__=model.model_config, **selected - ) - return cast("type[ModelT]", built) From 95d3398b5e4d018b552def61d8122b3b93a29c14 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Tue, 2 Jun 2026 15:39:06 -0700 Subject: [PATCH 032/591] Initial Contributions route setup --- .../domains/contributions/dependencies.py | 17 +++++ .../domains/contributions/models.py | 63 +++++++++++++++++++ .../domains/contributions/repository.py | 24 +++++++ .../domains/contributions/router.py | 20 ++++++ 4 files changed, 124 insertions(+) create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/contributions/dependencies.py diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/dependencies.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/dependencies.py new file mode 100644 index 0000000000..6296439f7b --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/dependencies.py @@ -0,0 +1,17 @@ +from typing import Annotated + +from fastapi import Depends + +from mpcontribs_api.dependencies import UserDep +from mpcontribs_api.domains.contributions.repository import ( + MongoDbContributionRepository, +) + + +def get_scoped_contributions(user: UserDep) -> MongoDbContributionRepository: + return MongoDbContributionRepository(user) + + +ContributionDep = Annotated[ + MongoDbContributionRepository, Depends(get_scoped_contributions) +] diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py index e69de29bb2..2f3839c951 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py @@ -0,0 +1,63 @@ +from datetime import datetime +from typing import Any + +from beanie import Document, Link +from fastapi_filter.contrib.beanie import Filter + +from src.mpcontribs_api.domains.attachments.models import Attachment +from src.mpcontribs_api.domains.structures.models import Structure +from src.mpcontribs_api.domains.tables.models import Table +from src.mpcontribs_api.projection import SparseFieldsModel +from src.mpcontribs_api.types import ShortStr + + +class Contribution(Document): + project: str + identifier: str + formula: str + is_public: bool = False + last_modified: datetime + needs_build: bool = True + data: dict[str, Any] + structures: list[Link[Structure]] | None = None + tables: list[Link[Table]] | None = None + attachments: list[Link[Attachment]] | None = None + + +class ContributionOut(SparseFieldsModel): + project: str | None = None + identifier: str | None = None + formula: str | None = None + is_public: bool | None = None + last_modified: datetime | None = None + needs_build: bool | None = None + data: dict[str, Any] | None = None + structures: list[Link[Structure]] | None = None + tables: list[Link[Table]] | None = None + attachments: list[Link[Attachment]] | None = None + + +class ContributionFilter(Filter): + id: str | None = None + id__in: list[str] | None = None + id__neq: str | None = None + + identifier: str | None = None + identifier__in: list[ShortStr] | None = None + identifier__neq: ShortStr | None = None + identifier__ilike: str | None = None + + formula: str | None = None + formula__in: list[ShortStr] | None = None + formula__neq: ShortStr | None = None + formula__ilike: str | None = None + + is_public: bool | None = None + + needs_build: bool | None = None + + # sorting + order_by: list[str] | None = None + + class Constants(Filter.Constants): + model = Contribution diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py index e69de29bb2..452b2977ab 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py @@ -0,0 +1,24 @@ +from typing import Any + +from src.mpcontribs_api.auth import User + + +class MongoDbContributionRepository: + def __init__(self, user: User) -> None: + """Initializes an instance based on the current user + + Args: + user (User): the current user requesting resources + """ + self._scope = self._build_scope(user) + + @staticmethod + def _build_scope(user: User) -> dict[str, Any]: + """Provides scope based on current user's permitted groups and publicly released data.""" + if user.is_admin: + return {} + ors: list[dict[str, Any]] = [{"is_public": True}] + if not user.is_anonymous: + if user.groups: + ors.append({"_id": {"$in": sorted(user.groups)}}) + return {"$or": ors} diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py index e69de29bb2..2b1f988675 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py @@ -0,0 +1,20 @@ +from typing import Annotated + +from fastapi import APIRouter, Query +from fastapi_filter import FilterDepends + +from src.mpcontribs_api.domains.contributions.dependencies import ContributionDep +from src.mpcontribs_api.domains.contributions.models import ContributionFilter +from src.mpcontribs_api.pagination import CursorParams + +router = APIRouter() + + +@router.get("") +async def get_contribution( + repo: ContributionDep, + pagination: Annotated[CursorParams, Query()], + filter: ContributionFilter = FilterDepends(ContributionFilter), + fields: Annotated[str | None, Query(alias="_fields")] = None, +): + pass From 8053215bc4d29017d036c6e878b87dd221d1db71 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Tue, 2 Jun 2026 16:28:36 -0700 Subject: [PATCH 033/591] Added stub methods --- .../domains/contributions/router.py | 76 ++++++++++++++++++- 1 file changed, 73 insertions(+), 3 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py index 2b1f988675..fc89c610b6 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py @@ -1,20 +1,90 @@ -from typing import Annotated +from typing import Annotated, Literal from fastapi import APIRouter, Query from fastapi_filter import FilterDepends from src.mpcontribs_api.domains.contributions.dependencies import ContributionDep -from src.mpcontribs_api.domains.contributions.models import ContributionFilter +from src.mpcontribs_api.domains.contributions.models import ( + ContributionFilter, + ContributionIn, + ContributionPatch, +) from src.mpcontribs_api.pagination import CursorParams router = APIRouter() @router.get("") -async def get_contribution( +async def get_contributions( repo: ContributionDep, pagination: Annotated[CursorParams, Query()], filter: ContributionFilter = FilterDepends(ContributionFilter), fields: Annotated[str | None, Query(alias="_fields")] = None, ): pass + + +@router.delete("") +async def delete_contributions( + repo: ContributionDep, + filter: ContributionFilter = FilterDepends(ContributionFilter), +): + pass + + +@router.post("") +async def insert_contributions( + repo: ContributionDep, + contributions: list[ContributionIn], +): + pass + + +@router.put("") +async def upsert_contributions( + repo: ContributionDep, + contributions: list[ContributionIn], + filter: ContributionFilter = FilterDepends(ContributionFilter), +): + pass + + +@router.get("download/{mime}") +async def download_contributions( + repo: ContributionDep, + format: Literal["json", "csv", "parquet"] = "parquet", + filter: ContributionFilter = FilterDepends(ContributionFilter), + fields: Annotated[str | None, Query(alias="_fields")] = None, +): + pass + + +@router.delete("{id}") +async def delete_contribtion_by_id( + repo: ContributionDep, + id: str, +): + pass + + +@router.get("{id}") +async def get_contribution_by_id( + repo: ContributionDep, + id: str, + fields: Annotated[str | None, Query(alias="_fields")] = None, +): + pass + + +@router.put("{id}") +async def upsert_contribution_by_id( + repo: ContributionDep, id: str, contribution: ContributionIn +): + pass + + +@router.patch("{id}") +async def update_contribution_by_id( + repo: ContributionDep, id: str, update: ContributionPatch +): + pass From 1d3053356647329d84a2868288525b2053305dd2 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Tue, 2 Jun 2026 16:29:47 -0700 Subject: [PATCH 034/591] Added base contributions class and ContributionPatch. Contribution now sets last_modified on any modification result --- .../domains/contributions/models.py | 60 +++++++++++++++++-- 1 file changed, 54 insertions(+), 6 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py index 2f3839c951..2a88d69007 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py @@ -1,8 +1,18 @@ -from datetime import datetime +from datetime import UTC, datetime from typing import Any -from beanie import Document, Link +from beanie import ( + Document, + Insert, + Link, + Replace, + Save, + SaveChanges, + Update, + before_event, +) from fastapi_filter.contrib.beanie import Filter +from pydantic import Field from src.mpcontribs_api.domains.attachments.models import Attachment from src.mpcontribs_api.domains.structures.models import Structure @@ -11,18 +21,45 @@ from src.mpcontribs_api.types import ShortStr -class Contribution(Document): +class ContributionBase(Document): project: str identifier: str formula: str - is_public: bool = False - last_modified: datetime - needs_build: bool = True data: dict[str, Any] + + # TODO: Verify that this should default to True and be passed by users + needs_build: bool = True + last_modified: datetime = Field(default_factory=lambda: datetime.now(UTC)) structures: list[Link[Structure]] | None = None tables: list[Link[Table]] | None = None attachments: list[Link[Attachment]] | None = None + class Settings: + name = "contributions" + keep_nulls = False + + +class Contribution(ContributionBase): + is_public: bool + # needs_build: bool = True + + @classmethod + def from_contribution_in(cls, data: ContributionIn) -> Contribution: + return cls.model_validate( + { + **data.model_dump(exclude={"is_public"}), + "is_public": False, + } + ) + + @before_event(Insert, Replace, Update, Save, SaveChanges) + def set_last_modified(self): + self.last_modified = datetime.now(UTC) + + +class ContributionIn(ContributionBase): + pass + class ContributionOut(SparseFieldsModel): project: str | None = None @@ -37,6 +74,17 @@ class ContributionOut(SparseFieldsModel): attachments: list[Link[Attachment]] | None = None +class ContributionPatch(SparseFieldsModel): + project: str | None = None + identifier: str | None = None + formula: str | None = None + needs_build: bool | None = None + data: dict[str, Any] | None = None + structures: list[Link[Structure]] | None = None + tables: list[Link[Table]] | None = None + attachments: list[Link[Attachment]] | None = None + + class ContributionFilter(Filter): id: str | None = None id__in: list[str] | None = None From 97f01bd3341cc9fa7788e59f6edbe11afa5a6b02 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Tue, 2 Jun 2026 16:30:28 -0700 Subject: [PATCH 035/591] Added settings to Project to name proper collection and prevent nulls from populating --- mpcontribs-api/src/mpcontribs_api/domains/projects/models.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py index c8bafda1a2..7a3af99e10 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py @@ -63,6 +63,10 @@ class Project(DocumentWithSoftDelete): def from_project_in(cls, data: ProjectIn) -> Project: return cls(**data.model_dump()) + class Settings: + name = "projects" + keep_nulls = False + class ProjectOut(SparseFieldsModel): """Full response of all public-facing fields.""" From a2d31fba22cc41f2331896fba3a467144850eb68 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Tue, 2 Jun 2026 16:30:52 -0700 Subject: [PATCH 036/591] Added contributions router --- mpcontribs-api/src/mpcontribs_api/api/v1/router.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mpcontribs-api/src/mpcontribs_api/api/v1/router.py b/mpcontribs-api/src/mpcontribs_api/api/v1/router.py index 289b2159df..6b946e1e73 100644 --- a/mpcontribs-api/src/mpcontribs_api/api/v1/router.py +++ b/mpcontribs-api/src/mpcontribs_api/api/v1/router.py @@ -1,7 +1,9 @@ from fastapi import APIRouter +from mpcontribs_api.domains.contributions.router import router as contributions_router from mpcontribs_api.domains.projects.router import router as projects_router router = APIRouter(prefix="/api/v1") router.include_router(projects_router, prefix="/projects") +router.include_router(contributions_router, prefix="/contributions") From 191c4c0be5e71c5374890d7eecdf5bc579919a98 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Tue, 2 Jun 2026 16:50:24 -0700 Subject: [PATCH 037/591] Sketched out endpoints and repo methods --- .../domains/contributions/repository.py | 42 ++++++++++++++++++- .../domains/contributions/router.py | 23 +++++----- 2 files changed, 54 insertions(+), 11 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py index 452b2977ab..397aeef1fb 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py @@ -1,6 +1,12 @@ -from typing import Any +from typing import Any, Literal from src.mpcontribs_api.auth import User +from src.mpcontribs_api.domains.contributions.models import ( + ContributionFilter, + ContributionIn, + ContributionPatch, +) +from src.mpcontribs_api.pagination import CursorParams class MongoDbContributionRepository: @@ -22,3 +28,37 @@ def _build_scope(user: User) -> dict[str, Any]: if user.groups: ors.append({"_id": {"$in": sorted(user.groups)}}) return {"$or": ors} + + async def get_contributions( + self, pagination: CursorParams, filter: ContributionFilter, fields: str | None + ): + pass + + async def delete_contributions(self, filter: ContributionFilter): + pass + + async def insert_contributions(self, contributions: list[ContributionIn]): + pass + + async def upsert_contributions(self, contributions: list[ContributionIn]): + pass + + async def download_contributions( + self, + format: Literal["json", "csv", "parquet"], + filter: ContributionFilter, + fields: str | None, + ): + pass + + async def delete_contribution_by_id(self, id: str): + pass + + async def get_contribution_by_id(self, id: str, fields: str | None): + pass + + async def upsert_contribution_by_id(self, id: str, contribution: ContributionIn): + pass + + async def update_contribution_by_id(self, id: str, update: ContributionPatch): + pass diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py index fc89c610b6..51a3a760a0 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py @@ -21,7 +21,9 @@ async def get_contributions( filter: ContributionFilter = FilterDepends(ContributionFilter), fields: Annotated[str | None, Query(alias="_fields")] = None, ): - pass + return await repo.get_contributions( + pagination=pagination, filter=filter, fields=fields + ) @router.delete("") @@ -29,7 +31,7 @@ async def delete_contributions( repo: ContributionDep, filter: ContributionFilter = FilterDepends(ContributionFilter), ): - pass + return await repo.delete_contributions(filter=filter) @router.post("") @@ -37,16 +39,15 @@ async def insert_contributions( repo: ContributionDep, contributions: list[ContributionIn], ): - pass + return await repo.insert_contributions(contributions=contributions) @router.put("") async def upsert_contributions( repo: ContributionDep, contributions: list[ContributionIn], - filter: ContributionFilter = FilterDepends(ContributionFilter), ): - pass + return await repo.upsert_contributions(contributions=contributions) @router.get("download/{mime}") @@ -56,7 +57,9 @@ async def download_contributions( filter: ContributionFilter = FilterDepends(ContributionFilter), fields: Annotated[str | None, Query(alias="_fields")] = None, ): - pass + return await repo.download_contributions( + format=format, filter=filter, fields=fields + ) @router.delete("{id}") @@ -64,7 +67,7 @@ async def delete_contribtion_by_id( repo: ContributionDep, id: str, ): - pass + return await repo.delete_contribution_by_id(id=id) @router.get("{id}") @@ -73,18 +76,18 @@ async def get_contribution_by_id( id: str, fields: Annotated[str | None, Query(alias="_fields")] = None, ): - pass + return await repo.get_contribution_by_id(id=id, fields=fields) @router.put("{id}") async def upsert_contribution_by_id( repo: ContributionDep, id: str, contribution: ContributionIn ): - pass + return await repo.upsert_contribution_by_id(id=id, contribution=contribution) @router.patch("{id}") async def update_contribution_by_id( repo: ContributionDep, id: str, update: ContributionPatch ): - pass + return await repo.update_contribution_by_id(id=id, update=update) From 96832e8532ea077dcb66486e3f92ac9ed5de4e26 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 3 Jun 2026 10:11:10 -0700 Subject: [PATCH 038/591] Mostly formatting and type checking changes. Added stub files for component attachments. Added project-level claude.md. Added just file for development ease. --- mpcontribs-api/.gitignore | 1 + mpcontribs-api/CLAUDE.md | 85 + mpcontribs-api/gunicorn.conf.py | 9 +- mpcontribs-api/justfile | 5 + mpcontribs-api/main.py | 6 +- mpcontribs-api/maintenance.py | 3 +- mpcontribs-api/pyproject.toml | 35 +- mpcontribs-api/scripts/healthchecks.py | 1 + mpcontribs-api/src/mpcontribs_api/app.py | 2 +- mpcontribs-api/src/mpcontribs_api/config.py | 17 +- .../src/mpcontribs_api/dependencies.py | 10 +- .../domains/attachments/models.py | 5 + .../domains/contributions/dependencies.py | 4 +- .../domains/contributions/repository.py | 6 +- .../domains/contributions/router.py | 16 +- .../mpcontribs_api/domains/projects/models.py | 2 +- .../domains/projects/repository.py | 29 +- .../domains/structures/models.py | 5 + .../mpcontribs_api/domains/tables/models.py | 5 + .../src/mpcontribs_api/exceptions.py | 4 +- mpcontribs-api/src/mpcontribs_api/logging.py | 6 +- .../src/mpcontribs_api/old/__init__.py | 17 +- .../old/attachments/__init__.py | 3 +- .../old/attachments/document.py | 36 +- .../mpcontribs_api/old/attachments/views.py | 11 +- .../src/mpcontribs_api/old/config.py | 11 +- .../old/contributions/document.py | 66 +- .../old/contributions/generate_formulae.py | 8 +- .../mpcontribs_api/old/contributions/views.py | 41 +- mpcontribs-api/src/mpcontribs_api/old/core.py | 52 +- .../mpcontribs_api/old/notebooks/__init__.py | 4 +- .../mpcontribs_api/old/notebooks/document.py | 29 +- .../src/mpcontribs_api/old/notebooks/views.py | 57 +- .../mpcontribs_api/old/projects/document.py | 76 +- .../src/mpcontribs_api/old/projects/views.py | 20 +- .../mpcontribs_api/old/structures/document.py | 8 +- .../mpcontribs_api/old/structures/views.py | 9 +- .../src/mpcontribs_api/old/tables/__init__.py | 3 +- .../src/mpcontribs_api/old/tables/document.py | 10 +- .../src/mpcontribs_api/old/tables/views.py | 11 +- .../src/mpcontribs_api/pagination.py | 7 +- .../src/mpcontribs_api/projection.py | 36 +- mpcontribs-api/src/mpcontribs_api/types.py | 4 +- mpcontribs-api/supervisord/conf.py | 5 +- mpcontribs-api/uv.lock | 1579 +---------------- 45 files changed, 425 insertions(+), 1934 deletions(-) create mode 100644 mpcontribs-api/.gitignore create mode 100644 mpcontribs-api/CLAUDE.md create mode 100644 mpcontribs-api/justfile create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/structures/models.py create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/tables/models.py diff --git a/mpcontribs-api/.gitignore b/mpcontribs-api/.gitignore new file mode 100644 index 0000000000..ce7322d6e6 --- /dev/null +++ b/mpcontribs-api/.gitignore @@ -0,0 +1 @@ +src/mpcontribs_api/old diff --git a/mpcontribs-api/CLAUDE.md b/mpcontribs-api/CLAUDE.md new file mode 100644 index 0000000000..61a9534f67 --- /dev/null +++ b/mpcontribs-api/CLAUDE.md @@ -0,0 +1,85 @@ +# CLAUDE.md + +This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository. + +This is a complete rewrite of the MPContribs API server. +The core of the package is FastAPI, Pydantic, and Beanie. +Developer experience and process efficiency are top priorities. + +## Commands + +```bash +# Format, fix, and lint (preferred) +just fmt + +# Run tests +uv run pytest + +# Run tests by marker +uv run pytest -m base +uv run pytest -m extra + +# Run tests in parallel +uv run pytest -n auto + +# Type check +uv run basedpyright +``` + +## Environment + +Copy `.env.example` to `.env`. Key variables (all prefixed `MPCONTRIBS_`): + +- `MONGO__URI` — MongoDB Atlas URI +- `MONGO__DB_NAME` — database name +- `KONG__GATEWAY_SECRET` — shared secret for verifying requests came through Kong +- `ENVIRONMENT` — `dev` or `prod` (controls log format and debug mode) + +## Architecture + +### Domain structure + +Each resource lives in `src/mpcontribs_api/domains//` with four files: + +- `models.py` — Beanie `Document` subclass (DB model) + Pydantic output/input/patch/filter models +- `repository.py` — `MongoDbRepository` encapsulating all database access +- `router.py` — `APIRouter` with CRUD endpoint handlers +- `dependencies.py` — `Dep` type alias (`Annotated[MongoDbRepository, Depends(...)]`) + +Routers are registered in `src/mpcontribs_api/api/v1/router.py`. + +### Authentication and authorization + +Kong injects user identity via headers; `auth.py` parses them into a frozen `User` model. The dependency chain is: + +- `UserDep` — any caller (anonymous or authenticated) +- `AuthedDep` — requires authenticated user (raises 401 otherwise) +- `require_role(role)` — factory returning a dependency that requires a specific group membership + +All database access goes through a repository instantiated with the current `User`. The repository's `_scope` dict is injected into every MongoDB query automatically: + +- **Admins** (members of `mongo.admin_group`): no filter applied +- **Authenticated users**: see public+approved data, own resources (`owner == username`), and group resources +- **Anonymous**: public + approved only + +`verify_gateway()` in `dependencies.py` validates the `x-gateway-secret` header to ensure Kong was the actual caller. + +### Repository pattern + +Repositories take a `User` at construction time and expose typed async methods (`get_*`, `insert_*`, `patch_*`, `upsert_*`, `delete_*`). They never leak the scope logic to routers — routers only call repository methods. + +### Sparse field selection + +The `_fields` query parameter (handled in `projection.py`) lets callers request specific fields (comma-separated, dotted for nesting). `SparseFieldsModel` dynamically creates a trimmed Pydantic model via `create_model()` and converts field paths to MongoDB projection syntax. Results are cached with `@lru_cache`. + +### Cursor-based pagination + +`Page[T]` in `pagination.py` contains `items` and a `next_cursor` (base64-encoded last item ID). Pagination is forward-only and stateless. Default page size is 20; max is 100. + +### Exception hierarchy + +`exceptions.py` defines `AppError` subclasses (`NotFoundError`, `ConflictError`, `ValidationError`, `AuthenticationError`, `PermissionError`, `GatewayError`). All carry `status_code`, `error_code`, `message`, and a `context` dict. Handlers in `app.py` convert them to a uniform JSON shape; internal context is logged but not sent to clients. + +### Observability + +`logging.py` configures structlog with per-request context vars (request_id, method, path, consumer_id) bound by the middleware in `middleware.py`. OpenTelemetry traces are exported via OTLP/gRPC and trace/span IDs are injected into every log line. diff --git a/mpcontribs-api/gunicorn.conf.py b/mpcontribs-api/gunicorn.conf.py index d6d1693c1c..548ba7f767 100644 --- a/mpcontribs-api/gunicorn.conf.py +++ b/mpcontribs-api/gunicorn.conf.py @@ -1,14 +1,17 @@ -import ddtrace.auto # noqa: F401 import os +import ddtrace.auto # noqa: F401 + bind = "0.0.0.0:{}".format(os.getenv("API_PORT")) worker_class = "gevent" workers = os.getenv("NWORKERS") statsd_host = "{}:8125".format(os.getenv("DD_AGENT_HOST")) accesslog = "-" errorlog = "-" -access_log_format = '{}/{}: %(h)s %(t)s %(m)s %(U)s?%(q)s %(H)s %(s)s %(b)s "%(f)s" "%(a)s" %(D)s %(p)s %({{x-consumer-id}}i)s'.format( - os.getenv("SUPERVISOR_GROUP_NAME"), os.getenv("SUPERVISOR_PROCESS_NAME") +access_log_format = ( + '{}/{}: %(h)s %(t)s %(m)s %(U)s?%(q)s %(H)s %(s)s %(b)s "%(f)s" "%(a)s" %(D)s %(p)s %({{x-consumer-id}}i)s'.format( + os.getenv("SUPERVISOR_GROUP_NAME"), os.getenv("SUPERVISOR_PROCESS_NAME") + ) ) max_requests = os.getenv("MAX_REQUESTS") max_requests_jitter = os.getenv("MAX_REQUESTS_JITTER") diff --git a/mpcontribs-api/justfile b/mpcontribs-api/justfile new file mode 100644 index 0000000000..fa1e0c572d --- /dev/null +++ b/mpcontribs-api/justfile @@ -0,0 +1,5 @@ +# Format, fix, and lint all source code +fmt: + uv run ruff format src/ + -uv run ruff check --fix --unsafe-fixes src/ + -uv run pydocstringformatter --write src/ diff --git a/mpcontribs-api/main.py b/mpcontribs-api/main.py index a4c111b228..d9d5a740c0 100755 --- a/mpcontribs-api/main.py +++ b/mpcontribs-api/main.py @@ -1,9 +1,9 @@ #!/usr/bin/env python -import os -import requests -import boto3 import logging +import os +import boto3 +import requests from supervisor.options import ClientOptions from supervisor.supervisorctl import Controller diff --git a/mpcontribs-api/maintenance.py b/mpcontribs-api/maintenance.py index 6ff4b5f8aa..10d84a8d35 100644 --- a/mpcontribs-api/maintenance.py +++ b/mpcontribs-api/maintenance.py @@ -1,9 +1,8 @@ from boltons.iterutils import remap from mongoengine.queryset.visitor import Q - from mpcontribs.api import enter -from mpcontribs.api.projects.document import Projects from mpcontribs.api.contributions.document import Contributions +from mpcontribs.api.projects.document import Projects def visit(path, key, value): diff --git a/mpcontribs-api/pyproject.toml b/mpcontribs-api/pyproject.toml index 3db7b16a0a..66062c39a5 100644 --- a/mpcontribs-api/pyproject.toml +++ b/mpcontribs-api/pyproject.toml @@ -77,10 +77,10 @@ Documentation = "https://docs.materialsproject.org/services/mpcontribs" [dependency-groups] dev = [ - "flake8>=7.3.0", + "ruff>=0.9.0", + "basedpyright>=1.29.0", + "pydocstringformatter>=0.7.0", "pytest>=9.0.3", - "pytest-flake8>=1.3.0", - "pytest-pycodestyle>=2.5.0", "pytest-xdist>=3.8.0", ] @@ -90,22 +90,19 @@ markers = [ "extra: all extra views", ] -[tool.pycodestyle] -count = true -ignore = ["E121","E123","E126","E133","E226","E241","E242","E704","W503","W504","W505","E741","W605"] -max-line-length = 120 -statistics = true -exclude = ["flasgger","flask-mongorest"] +[tool.ruff] +line-length = 120 +exclude = ["src/mpcontribs_api/old"] -[tool.flake8] -exclude = [".git","__pycache__","tests","flasgger","flask-mongorest"] -extend-ignore = ["E741",] -max-line-length = 120 +[tool.ruff.lint] +select = ["E", "F", "W", "I", "B", "UP"] +ignore = ["E741", "B008"] -[tool.pydocstyle] -ignore = ["D105","D2","D4"] +[tool.pydocstringformatter] +max-line-length = 120 +exclude = ["src/mpcontribs_api/old"] -[tool.mypy] -ignore_missing_imports = true -namespace_packages = true -python_version = 3.14 +[tool.basedpyright] +pythonVersion = "3.14" +typeCheckingMode = "standard" +ignore = ["src/mpcontribs_api/old"] diff --git a/mpcontribs-api/scripts/healthchecks.py b/mpcontribs-api/scripts/healthchecks.py index e0b3396162..ff30095730 100644 --- a/mpcontribs-api/scripts/healthchecks.py +++ b/mpcontribs-api/scripts/healthchecks.py @@ -1,5 +1,6 @@ import os import sys + import requests for deployment in os.environ.get("DEPLOYMENTS", "ml:10002").split(","): diff --git a/mpcontribs-api/src/mpcontribs_api/app.py b/mpcontribs-api/src/mpcontribs_api/app.py index 292395b94f..3830a3d582 100644 --- a/mpcontribs-api/src/mpcontribs_api/app.py +++ b/mpcontribs-api/src/mpcontribs_api/app.py @@ -1,8 +1,8 @@ from __future__ import annotations import logging +from collections.abc import AsyncGenerator from contextlib import asynccontextmanager -from typing import AsyncGenerator from beanie import init_beanie from fastapi import Depends, FastAPI diff --git a/mpcontribs-api/src/mpcontribs_api/config.py b/mpcontribs-api/src/mpcontribs_api/config.py index 7308337823..824ede959c 100644 --- a/mpcontribs-api/src/mpcontribs_api/config.py +++ b/mpcontribs-api/src/mpcontribs_api/config.py @@ -20,33 +20,32 @@ class MongoSettings(BaseModel): Provided defaults are the defaults of AsyncMongoClient """ - uri: SecretStr = Field( - description="The full uri from MongoDB (username and password included)" - ) + uri: SecretStr = Field(description="The full uri from MongoDB (username and password included)") db_name: str max_pool_size: int = Field( default=100, - description="Maximum number of allowed concurrent connection to each server. Can be '0' or 'None', both of which allow any number of connections", + description="Maximum number of allowed concurrent connection to each server. Can be '0' or 'None', both of " + "which allow any number of connections", ) min_pool_size: int = Field( default=0, description="Minimum number of concurent connections that the pool will maintain connected to each server", ) - datetime_conversion: Literal[ - "datetime_ms", "datetime", "datetime_auto", "datetime_clamp" - ] = Field( + datetime_conversion: Literal["datetime_ms", "datetime", "datetime_auto", "datetime_clamp"] = Field( default="datetime", description="Specifies how UTC datetimes should be decoded within BSON", ) server_selection_timeout_ms: int = Field( default=30000, - description="Controls how long (in milliseconds) the driver will wait to find an available, appropriate server to carry out a database operation;" + description="Controls how long (in milliseconds) the driver will wait to find an available, appropriate server" + "to carry out a database operation;" "while it is waiting, multiple server monitoring operations may be carried out", ) admin_group: str = Field( default="admin", - description="Name of admin group to consider in requests to MongoDB. Not directly passed to Mongo, but consumed by auth.", + description="Name of admin group to consider in requests to MongoDB. Not directly passed to Mongo, but consumed" + "by auth.", ) diff --git a/mpcontribs-api/src/mpcontribs_api/dependencies.py b/mpcontribs-api/src/mpcontribs_api/dependencies.py index ad120b8201..41a67d5f4c 100644 --- a/mpcontribs-api/src/mpcontribs_api/dependencies.py +++ b/mpcontribs-api/src/mpcontribs_api/dependencies.py @@ -17,10 +17,8 @@ def verify_gateway(x_gateway_secret: Annotated[str | None, Header()] = None) -> None: - """Ensures the current access attempt is coming through Kong""" - if x_gateway_secret is None or not hmac.compare_digest( - x_gateway_secret, str(settings.kong.gateway_secret) - ): + """Ensures the current access attempt is coming through Kong.""" + if x_gateway_secret is None or not hmac.compare_digest(x_gateway_secret, str(settings.kong.gateway_secret)): raise GatewayError("direct access not permitted") @@ -43,9 +41,7 @@ def get_user(request: Request) -> User: if explicit_anon or username is None: user = User() # anonymous = all defaults else: - groups = _split(h.get("x-authenticated-groups")) | _split( - h.get("x-consumer-groups") - ) + groups = _split(h.get("x-authenticated-groups")) | _split(h.get("x-consumer-groups")) user = User( consumer_id=h.get("x-consumer-id"), username=username, diff --git a/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py b/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py new file mode 100644 index 0000000000..ef24f2ad42 --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py @@ -0,0 +1,5 @@ +from beanie import Document + + +class Attachment(Document): + pass diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/dependencies.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/dependencies.py index 6296439f7b..3227039e95 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/dependencies.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/dependencies.py @@ -12,6 +12,4 @@ def get_scoped_contributions(user: UserDep) -> MongoDbContributionRepository: return MongoDbContributionRepository(user) -ContributionDep = Annotated[ - MongoDbContributionRepository, Depends(get_scoped_contributions) -] +ContributionDep = Annotated[MongoDbContributionRepository, Depends(get_scoped_contributions)] diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py index 397aeef1fb..4cfa191b3a 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py @@ -11,7 +11,7 @@ class MongoDbContributionRepository: def __init__(self, user: User) -> None: - """Initializes an instance based on the current user + """Initializes an instance based on the current user. Args: user (User): the current user requesting resources @@ -29,9 +29,7 @@ def _build_scope(user: User) -> dict[str, Any]: ors.append({"_id": {"$in": sorted(user.groups)}}) return {"$or": ors} - async def get_contributions( - self, pagination: CursorParams, filter: ContributionFilter, fields: str | None - ): + async def get_contributions(self, pagination: CursorParams, filter: ContributionFilter, fields: str | None): pass async def delete_contributions(self, filter: ContributionFilter): diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py index 51a3a760a0..cbd5837505 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py @@ -21,9 +21,7 @@ async def get_contributions( filter: ContributionFilter = FilterDepends(ContributionFilter), fields: Annotated[str | None, Query(alias="_fields")] = None, ): - return await repo.get_contributions( - pagination=pagination, filter=filter, fields=fields - ) + return await repo.get_contributions(pagination=pagination, filter=filter, fields=fields) @router.delete("") @@ -57,9 +55,7 @@ async def download_contributions( filter: ContributionFilter = FilterDepends(ContributionFilter), fields: Annotated[str | None, Query(alias="_fields")] = None, ): - return await repo.download_contributions( - format=format, filter=filter, fields=fields - ) + return await repo.download_contributions(format=format, filter=filter, fields=fields) @router.delete("{id}") @@ -80,14 +76,10 @@ async def get_contribution_by_id( @router.put("{id}") -async def upsert_contribution_by_id( - repo: ContributionDep, id: str, contribution: ContributionIn -): +async def upsert_contribution_by_id(repo: ContributionDep, id: str, contribution: ContributionIn): return await repo.upsert_contribution_by_id(id=id, contribution=contribution) @router.patch("{id}") -async def update_contribution_by_id( - repo: ContributionDep, id: str, update: ContributionPatch -): +async def update_contribution_by_id(repo: ContributionDep, id: str, update: ContributionPatch): return await repo.update_contribution_by_id(id=id, update=update) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py index 7a3af99e10..9f78c568f9 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py @@ -130,7 +130,7 @@ class ProjectIn(Project): class ProjectPatch(BaseModel): - """Nullable Project representation of user-supplied data for partial update (patch)""" + """Nullable Project representation of user-supplied data for partial update (patch).""" title: ShortStr | None = None authors: str | None = None diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py index e91dfc5450..2a13f3c2ec 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py @@ -31,16 +31,17 @@ class HasId(BaseModel): class MongoDbProjectRepository: - """A repository layer for access to MongoDB + """A repository layer for access to MongoDB. This is the layer that directly interacts with database operations Attributes: - _scope (dict[str, Any]): additional terms to inject into mongo queries to enforce user authorization on resources + _scope (dict[str, Any]): additional terms to inject into mongo queries to enforce user authorization on + resources """ def __init__(self, user: User) -> None: - """Initializes an instance based on the current user + """Initializes an instance based on the current user. Args: user (User): the current user requesting resources @@ -61,11 +62,12 @@ def _build_scope(user: User) -> dict[str, Any]: # Brendan TODO: figure out return type async def get_project_by_id(self, id: str, fields: frozenset[str] | None): - """Finds a single project by ID + """Finds a single project by ID. Args: id (str): the id of the project to find - fields (frozenset[str] | None): a BaseModel to use for projection. If none, the document is returned without projection + fields (frozenset[str] | None): a BaseModel to use for projection. If none, the document is returned without + projection Returns: ProjectOut: a projection of ProjectOut containing 'fields' from requested id @@ -77,7 +79,8 @@ async def get_project_by_id(self, id: str, fields: frozenset[str] | None): projection_model=ProjectOut.projection(fields), ) - # Brendan TODO: Does not handle compound pagination/sorting (can only paginate on _id, so passing sort arguments does nothing) + # Brendan TODO: Does not handle compound pagination/sorting + # can only paginate on _id, so passing sort arguments does nothing async def get_project( self, filter: ProjectFilter, @@ -91,18 +94,14 @@ async def get_project( Args: filter (ProjectFilter): the query to filter the collection by pagination (CursorParams): parameters for pagination using a cursor - fields (frozenset[str] | None): the fields to use for projection. If none, the document is returned without projection + fields (frozenset[str] | None): the fields to use for projection. If none, the document is returned without + projection """ proj = ProjectOut.projection(fields) query = filter.filter(Project.find(self._scope)) if pagination.cursor is not None: query = query.find(Project.id > decode_cursor(pagination.cursor)) - docs = ( - await query.sort(Project.id) - .limit(pagination.limit + 1) - .project(proj) - .to_list() - ) + docs = await query.sort(Project.id).limit(pagination.limit + 1).project(proj).to_list() has_more = len(docs) > pagination.limit items = docs[: pagination.limit] next_cursor = encode_cursor(str(items[-1].id)) if has_more and items else None @@ -120,9 +119,7 @@ async def insert_project(self, project: ProjectIn) -> Project: id_exists = await Project.find_one(Project.id == project.id) # Brendan TODO: if id_exists: - raise ConflictError( - f"Cannot insert project.\n Project with ID {project.id} exists" - ) + raise ConflictError(f"Cannot insert project.\n Project with ID {project.id} exists") full_project = Project.from_project_in(project) await full_project.insert() return full_project diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py new file mode 100644 index 0000000000..c42ae0436d --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py @@ -0,0 +1,5 @@ +from beanie import Document + + +class Structure(Document): + pass diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py new file mode 100644 index 0000000000..b58aede0a9 --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py @@ -0,0 +1,5 @@ +from beanie import Document + + +class Table(Document): + pass diff --git a/mpcontribs-api/src/mpcontribs_api/exceptions.py b/mpcontribs-api/src/mpcontribs_api/exceptions.py index e495708aba..ab157afd2b 100644 --- a/mpcontribs-api/src/mpcontribs_api/exceptions.py +++ b/mpcontribs-api/src/mpcontribs_api/exceptions.py @@ -106,9 +106,7 @@ async def _handle_unexpected(request: Request, exc: Exception) -> JSONResponse: async def _handle_validation(request, exc): return JSONResponse( status_code=422, - content=_error_body( - "validation_error", "Request validation failed", errors=exc.errors() - ), + content=_error_body("validation_error", "Request validation failed", errors=exc.errors()), ) # Unify http exceptions from starlette with our exception format diff --git a/mpcontribs-api/src/mpcontribs_api/logging.py b/mpcontribs-api/src/mpcontribs_api/logging.py index 6f28d284ba..e33fc30dd0 100644 --- a/mpcontribs-api/src/mpcontribs_api/logging.py +++ b/mpcontribs-api/src/mpcontribs_api/logging.py @@ -13,7 +13,8 @@ def add_otel_trace_context(_, __, event_dict): # If context is not the sentinel span (ie. we have an active span) if ctx.is_valid: # Convert to OTel-expected ids - # ctx ids are formatted as 128-bit (trace_id) and 64-bit (span_id) long numbers. OTel expects them as 0-padded hex numbers + # ctx ids are formatted as 128-bit (trace_id) and 64-bit (span_id) long numbers. + # OTel expects them as 0-padded hex numbers event_dict["trace_id"] = format(ctx.trace_id, "032x") # 32 digits event_dict["span_id"] = format(ctx.span_id, "016x") # 16 digits return event_dict @@ -43,8 +44,7 @@ def configure_logging(settings: Settings) -> None: # Handles internal logs emitted by structlog logger structlog.configure( - processors=shared_processors - + [structlog.stdlib.ProcessorFormatter.wrap_for_formatter], + processors=shared_processors + [structlog.stdlib.ProcessorFormatter.wrap_for_formatter], logger_factory=structlog.stdlib.LoggerFactory(), wrapper_class=structlog.make_filtering_bound_logger(log_level), cache_logger_on_first_use=True, diff --git a/mpcontribs-api/src/mpcontribs_api/old/__init__.py b/mpcontribs-api/src/mpcontribs_api/old/__init__.py index 753302b759..937d821e9b 100644 --- a/mpcontribs-api/src/mpcontribs_api/old/__init__.py +++ b/mpcontribs-api/src/mpcontribs_api/old/__init__.py @@ -1,5 +1,4 @@ -# -*- coding: utf-8 -*- -"""Flask App for MPContribs API""" +"""Flask App for MPContribs API.""" import logging import os @@ -53,9 +52,7 @@ "OTHERS": [ops.Boolean, ops.Exists], } FILTERS["STRINGS"] = [ops.In, ops.Exact, ops.IExact, ops.Ne] + FILTERS["LONG_STRINGS"] -FILTERS["ALL"] = ( - FILTERS["STRINGS"] + FILTERS["NUMBERS"] + FILTERS["DATES"] + FILTERS["OTHERS"] -) +FILTERS["ALL"] = FILTERS["STRINGS"] + FILTERS["NUMBERS"] + FILTERS["DATES"] + FILTERS["OTHERS"] class CustomLoggerAdapter(logging.LoggerAdapter): @@ -129,14 +126,14 @@ def send_email(to, subject, html): def get_collections(db): - """get list of collections in DB""" + """Get list of collections in DB.""" conn = db.app.extensions["mongoengine"][db]["conn"] dbname = db.app.config.get("MPCONTRIBS_DB") return conn[dbname].list_collection_names() def get_resource_as_string(name, charset="utf-8"): - """http://flask.pocoo.org/snippets/77/""" + """Http://flask.pocoo.org/snippets/77/.""" with current_app.open_resource(name) as f: return f.read().decode(charset) @@ -162,7 +159,7 @@ def create_kernel_connection(kernel_id): def get_kernels(): - """retrieve list of kernels from KernelGateway service""" + """Retrieve list of kernels from KernelGateway service.""" try: r = requests.get(get_kernel_endpoint(), timeout=2) except ConnectionError, Timeout: @@ -191,7 +188,7 @@ def get_consumer(): def create_app(): - """create flask app""" + """Create flask app.""" app = Flask(__name__) app.config.from_pyfile("config.py", silent=True) app.config["USTS"] = URLSafeTimedSerializer(app.secret_key) @@ -206,7 +203,7 @@ def create_app(): Marshmallow(app) MongoEngine(app) Swagger(app, template=app.config.get("TEMPLATE")) - setattr(app, "kernels", get_kernels()) + app.kernels = get_kernels() # NOTE: hard-code to avoid pre-generating for new deployment # collections = get_collections(db) diff --git a/mpcontribs-api/src/mpcontribs_api/old/attachments/__init__.py b/mpcontribs-api/src/mpcontribs_api/old/attachments/__init__.py index 4d321d0bf1..dc0093eef0 100644 --- a/mpcontribs-api/src/mpcontribs_api/old/attachments/__init__.py +++ b/mpcontribs-api/src/mpcontribs_api/old/attachments/__init__.py @@ -1,2 +1 @@ -# -*- coding: utf-8 -*- -"""document and views for attachments collection""" +"""Document and views for attachments collection.""" diff --git a/mpcontribs-api/src/mpcontribs_api/old/attachments/document.py b/mpcontribs-api/src/mpcontribs_api/old/attachments/document.py index 52e91702e3..6e4c8e89e4 100644 --- a/mpcontribs-api/src/mpcontribs_api/old/attachments/document.py +++ b/mpcontribs-api/src/mpcontribs_api/old/attachments/document.py @@ -1,18 +1,16 @@ -# -*- coding: utf-8 -*- -import os -import boto3 import binascii +import os +from base64 import b64decode, b64encode +import boto3 +from filetype.types.archive import Gz +from filetype.types.image import Gif, Jpeg, Png, Tiff from flask import request -from base64 import b64decode, b64encode from flask_mongoengine.documents import DynamicDocument -from mongoengine import signals, ValidationError +from mongoengine import ValidationError, signals from mongoengine.fields import StringField from mongoengine.queryset.manager import queryset_manager -from filetype.types.archive import Gz -from filetype.types.image import Jpeg, Png, Gif, Tiff - -from mpcontribs.api.contributions.document import get_resource, get_md5, COMPONENTS +from mpcontribs.api.contributions.document import COMPONENTS, get_md5, get_resource MAX_BYTES = 2.4 * 1024 * 1024 BUCKET = os.environ.get("S3_ATTACHMENTS_BUCKET", "mpcontribs-attachments") @@ -26,9 +24,7 @@ class Attachments(DynamicDocument): name = StringField(required=True, help_text="file name") md5 = StringField(regex=r"^[a-z0-9]{32}$", unique=True, help_text="md5 sum") - mime = StringField( - required=True, choices=SUPPORTED_MIMES, help_text="attachment mime type" - ) + mime = StringField(required=True, choices=SUPPORTED_MIMES, help_text="attachment mime type") content = StringField(required=True, help_text="base64-encoded attachment content") meta = {"collection": "attachments", "indexes": ["name", "mime", "md5"]} @@ -45,9 +41,7 @@ def post_init(cls, sender, document, **kwargs): if "content" in requested_fields: if not document.md5: # document.reload("md5") # TODO AttributeError: _changed_fields - raise ValueError( - "Please also request md5 field to retrieve attachment content!" - ) + raise ValueError("Please also request md5 field to retrieve attachment content!") retr = s3_client.get_object(Bucket=BUCKET, Key=document.md5) document.content = b64encode(retr["Body"].read()).decode("utf-8") @@ -71,9 +65,7 @@ def pre_save_post_validation(cls, sender, document, **kwargs): size = len(content) if size > MAX_BYTES: - raise ValidationError( - f"Attachment {document.name} too large ({size} > {MAX_BYTES})!" - ) + raise ValidationError(f"Attachment {document.name} too large ({size} > {MAX_BYTES})!") # md5 resource = get_resource("attachments") @@ -87,13 +79,9 @@ def pre_save_post_validation(cls, sender, document, **kwargs): Metadata={"name": document.name}, Body=content, ) - document.content = str( - size - ) # set to something useful to distinguish in post_init + document.content = str(size) # set to something useful to distinguish in post_init signals.post_init.connect(Attachments.post_init, sender=Attachments) signals.pre_delete.connect(Attachments.pre_delete, sender=Attachments) -signals.pre_save_post_validation.connect( - Attachments.pre_save_post_validation, sender=Attachments -) +signals.pre_save_post_validation.connect(Attachments.pre_save_post_validation, sender=Attachments) diff --git a/mpcontribs-api/src/mpcontribs_api/old/attachments/views.py b/mpcontribs-api/src/mpcontribs_api/old/attachments/views.py index ae1e8c16a9..bf4f8e20f6 100644 --- a/mpcontribs-api/src/mpcontribs_api/old/attachments/views.py +++ b/mpcontribs-api/src/mpcontribs_api/old/attachments/views.py @@ -1,14 +1,13 @@ -# -*- coding: utf-8 -*- import os + import flask_mongorest -from flask_mongorest.resources import Resource -from flask_mongorest import operators as ops -from flask_mongorest.methods import Fetch, BulkFetch, Download from flask import Blueprint - +from flask_mongorest import operators as ops +from flask_mongorest.methods import BulkFetch, Download, Fetch +from flask_mongorest.resources import Resource from mpcontribs.api import FILTERS -from mpcontribs.api.core import SwaggerView from mpcontribs.api.attachments.document import Attachments +from mpcontribs.api.core import SwaggerView templates = os.path.join(os.path.dirname(flask_mongorest.__file__), "templates") attachments = Blueprint("attachments", __name__, template_folder=templates) diff --git a/mpcontribs-api/src/mpcontribs_api/old/config.py b/mpcontribs-api/src/mpcontribs_api/old/config.py index e9539ed081..52a569ce94 100644 --- a/mpcontribs-api/src/mpcontribs_api/old/config.py +++ b/mpcontribs-api/src/mpcontribs_api/old/config.py @@ -1,15 +1,12 @@ -# -*- coding: utf-8 -*- -"""configuration module for MPContribs Flask API""" +"""Configuration module for MPContribs Flask API.""" -import os -import json import gzip +import json +import os from mpcontribs.api import __version__ -formulae_path = os.path.join( - os.path.dirname(__file__), "contributions", "formulae.json.gz" -) +formulae_path = os.path.join(os.path.dirname(__file__), "contributions", "formulae.json.gz") with gzip.open(formulae_path) as f: FORMULAE = json.load(f) diff --git a/mpcontribs-api/src/mpcontribs_api/old/contributions/document.py b/mpcontribs-api/src/mpcontribs_api/old/contributions/document.py index db434cdf89..0f3c3870fb 100644 --- a/mpcontribs-api/src/mpcontribs_api/old/contributions/document.py +++ b/mpcontribs-api/src/mpcontribs_api/old/contributions/document.py @@ -1,29 +1,33 @@ -# -*- coding: utf-8 -*- -import json import itertools - +import json +from datetime import datetime +from decimal import Decimal from hashlib import md5 +from importlib import import_module +from itertools import permutations from math import isnan -from bson.dbref import DBRef -from datetime import datetime -from flask import current_app + from atlasq import AtlasManager, AtlasQ -from itertools import permutations -from importlib import import_module +from boltons.iterutils import remap +from bson.dbref import DBRef from fastnumbers import isfloat -from mongoengine import CASCADE, signals, DynamicDocument +from flask import current_app +from mongoengine import CASCADE, DynamicDocument, signals +from mongoengine.fields import ( + BooleanField, + DateTimeField, + DictField, + LazyReferenceField, + ListField, + ReferenceField, + StringField, +) from mongoengine.queryset.manager import queryset_manager -from mongoengine.fields import StringField, BooleanField, DictField -from mongoengine.fields import LazyReferenceField, ReferenceField -from mongoengine.fields import DateTimeField, ListField -from boltons.iterutils import remap -from decimal import Decimal +from mpcontribs.api import delimiter, enter, valid_dict from pint import UnitRegistry from pint.errors import DimensionalityError -from uncertainties import ufloat_fromstr from pymatgen.core import Composition, Element - -from mpcontribs.api import enter, valid_dict, delimiter +from uncertainties import ufloat_fromstr quantity_keys = {"display", "value", "error", "unit"} max_dgts = 6 @@ -142,17 +146,11 @@ def get_md5(resource, obj, fields): class Contributions(DynamicDocument): - project = LazyReferenceField( - "Projects", required=True, passthrough=True, reverse_delete_rule=CASCADE - ) + project = LazyReferenceField("Projects", required=True, passthrough=True, reverse_delete_rule=CASCADE) identifier = StringField(required=True, help_text="material/composition identifier") formula = StringField(help_text="formula (set dynamically if not provided)") - is_public = BooleanField( - required=True, default=True, help_text="public/private contribution" - ) - last_modified = DateTimeField( - required=True, default=datetime.utcnow, help_text="time of last modification" - ) + is_public = BooleanField(required=True, default=True, help_text="public/private contribution") + last_modified = DateTimeField(required=True, default=datetime.utcnow, help_text="time of last modification") needs_build = BooleanField(default=True, help_text="needs notebook build?") data = DictField( default=dict, @@ -160,13 +158,9 @@ class Contributions(DynamicDocument): pullout_key="display", help_text="simple free-form data", ) - structures = ListField( - ReferenceField("Structures", null=True), default=list, max_length=10 - ) + structures = ListField(ReferenceField("Structures", null=True), default=list, max_length=10) tables = ListField(ReferenceField("Tables", null=True), default=list, max_length=10) - attachments = ListField( - ReferenceField("Attachments", null=True), default=list, max_length=10 - ) + attachments = ListField(ReferenceField("Attachments", null=True), default=list, max_length=10) notebook = ReferenceField("Notebooks") atlas = AtlasManager("formula_autocomplete") meta = { @@ -282,9 +276,7 @@ def make_quantities(path, key, value): qq = q.value.to(column.unit) q = new_error_units(q, qq) except DimensionalityError: - raise ValueError( - f"Can't convert [{q.units}] to [{column.unit}] for {field}!" - ) + raise ValueError(f"Can't convert [{q.units}] to [{column.unit}] for {field}!") else: # try compact representation qq = q.value.to_compact() @@ -327,7 +319,5 @@ def pre_delete(cls, sender, document, **kwargs): signals.post_init.connect(Contributions.post_init, sender=Contributions) -signals.pre_save_post_validation.connect( - Contributions.pre_save_post_validation, sender=Contributions -) +signals.pre_save_post_validation.connect(Contributions.pre_save_post_validation, sender=Contributions) signals.pre_delete.connect(Contributions.pre_delete, sender=Contributions) diff --git a/mpcontribs-api/src/mpcontribs_api/old/contributions/generate_formulae.py b/mpcontribs-api/src/mpcontribs_api/old/contributions/generate_formulae.py index f625ff27be..8ddd8c04d2 100644 --- a/mpcontribs-api/src/mpcontribs_api/old/contributions/generate_formulae.py +++ b/mpcontribs-api/src/mpcontribs_api/old/contributions/generate_formulae.py @@ -1,14 +1,12 @@ -# -*- coding: utf-8 -*- -import os import json +import os + from pymatgen.ext.matproj import MPRester data = {} with MPRester() as mpr: - for i, d in enumerate( - mpr.query(criteria={}, properties=["task_ids", "pretty_formula"]) - ): + for _i, d in enumerate(mpr.query(criteria={}, properties=["task_ids", "pretty_formula"])): for task_id in d["task_ids"]: data[task_id] = d["pretty_formula"] diff --git a/mpcontribs-api/src/mpcontribs_api/old/contributions/views.py b/mpcontribs-api/src/mpcontribs_api/old/contributions/views.py index f78af3d671..4b99248f00 100644 --- a/mpcontribs-api/src/mpcontribs_api/old/contributions/views.py +++ b/mpcontribs-api/src/mpcontribs_api/old/contributions/views.py @@ -1,37 +1,34 @@ -# -*- coding: utf-8 -*- -import re import os -import flask_mongorest - +import re from itertools import permutations -from css_html_js_minify import html_minify -from json2html import Json2Html -from boltons.iterutils import remap -from werkzeug.exceptions import Unauthorized -from pymatgen.core.composition import Composition, CompositionError -from flask import Blueprint, render_template, jsonify, abort, request -from flask_mongorest.resources import Resource +import flask_mongorest +from boltons.iterutils import remap +from css_html_js_minify import html_minify +from flask import Blueprint, abort, jsonify, render_template, request from flask_mongorest import operators as ops +from flask_mongorest.exceptions import UnknownFieldError from flask_mongorest.methods import ( - Fetch, - Delete, - Update, - BulkFetch, BulkCreate, - BulkUpdate, BulkDelete, + BulkFetch, + BulkUpdate, + Delete, Download, + Fetch, + Update, ) -from flask_mongorest.exceptions import UnknownFieldError - -from mpcontribs.api import enter, FILTERS -from mpcontribs.api.core import SwaggerView +from flask_mongorest.resources import Resource +from json2html import Json2Html +from mpcontribs.api import FILTERS, enter +from mpcontribs.api.attachments.views import AttachmentsResource from mpcontribs.api.contributions.document import Contributions +from mpcontribs.api.core import SwaggerView +from mpcontribs.api.notebooks.views import NotebooksResource from mpcontribs.api.structures.views import StructuresResource from mpcontribs.api.tables.views import TablesResource -from mpcontribs.api.attachments.views import AttachmentsResource -from mpcontribs.api.notebooks.views import NotebooksResource +from pymatgen.core.composition import Composition, CompositionError +from werkzeug.exceptions import Unauthorized templates = os.path.join(os.path.dirname(flask_mongorest.__file__), "templates") contributions = Blueprint("contributions", __name__, template_folder=templates) diff --git a/mpcontribs-api/src/mpcontribs_api/old/core.py b/mpcontribs-api/src/mpcontribs_api/old/core.py index a4a600db19..289fd80363 100644 --- a/mpcontribs-api/src/mpcontribs_api/old/core.py +++ b/mpcontribs-api/src/mpcontribs_api/old/core.py @@ -1,18 +1,18 @@ import os -import yaml - from copy import deepcopy -from re import Pattern from importlib import import_module +from re import Pattern + +import yaml from flasgger.marshmallow_apispec import SwaggerView as OriginalSwaggerView from flasgger.marshmallow_apispec import schema2jsonschema -from marshmallow_mongoengine import ModelSchema from flask_mongorest.views import ResourceView +from marshmallow_mongoengine import ModelSchema from mongoengine.queryset import DoesNotExist from mongoengine.queryset.visitor import Q -from werkzeug.exceptions import Unauthorized +from mpcontribs.api import get_logger, is_gunicorn from mpcontribs.api.config import DOC_DIR -from mpcontribs.api import is_gunicorn, get_logger +from werkzeug.exceptions import Unauthorized logger = get_logger(__name__) @@ -102,9 +102,7 @@ def get_specs(klass, method, collection): doc_name = collection[:-1].capitalize() fields_param = None if klass.resource.fields is not None: - fields_avail = ( - klass.resource.fields + klass.resource.get_optional_fields() + ["_all"] - ) + fields_avail = klass.resource.fields + klass.resource.get_optional_fields() + ["_all"] description = f"List of fields to include in response ({fields_avail})." description += " Use dot-notation for nested subfields." fields_param = { @@ -145,10 +143,7 @@ def get_specs(klass, method, collection): order_params = [] if klass.resource.allowed_ordering: - allowed_ordering = [ - o.pattern if isinstance(o, Pattern) else o - for o in klass.resource.allowed_ordering - ] + allowed_ordering = [o.pattern if isinstance(o, Pattern) else o for o in klass.resource.allowed_ordering] order_params = [ { "name": "_sort", @@ -405,10 +400,10 @@ def get_specs(klass, method, collection): class SwaggerView(OriginalSwaggerView, ResourceView): - """A class-based view defining additional methods""" + """A class-based view defining additional methods.""" def __init_subclass__(cls, **kwargs): - """initialize Schema, decorators, definitions, and tags""" + """Initialize Schema, decorators, definitions, and tags.""" super().__init_subclass__(**kwargs) if not __name__ == cls.__module__: @@ -447,9 +442,7 @@ def __init_subclass__(cls, **kwargs): if is_gunicorn: with open(file_path, "w") as f: yaml.dump(spec, f) - logger.debug( - f"{cls.tags[0]}.{method.__name__} written to {file_path}" - ) + logger.debug(f"{cls.tags[0]}.{method.__name__} written to {file_path}") def get_groups(self, request): groups = request.headers.get("X-Authenticated-Groups", "").split(",") @@ -467,9 +460,7 @@ def is_anonymous(self, request): return is_anonymous def is_external(self, request): - return request.headers.get( - "X-Forwarded-Host" - ) is not None and not request.headers.get("Origin") + return request.headers.get("X-Forwarded-Host") is not None and not request.headers.get("Origin") def is_admin(self, request): groups = self.get_groups(request) @@ -502,7 +493,7 @@ def is_admin_or_project_user(self, request, obj): def get_projects(self): # project is LazyReferenceFields (multiple queries) module = import_module("mpcontribs.api.projects.document") - Projects = getattr(module, "Projects") + Projects = module.Projects exclude = list(Projects._fields.keys()) only = ["name", "owner", "is_public", "is_approved"] return Projects.objects.exclude(*exclude).only(*only) @@ -584,9 +575,7 @@ def has_read_permission(self, request, qs): if q and "project" in q and "$in" in q["project"]: names = q.pop("project").pop("$in") - qfilter = self.get_projects_filter( - username, groups, filter_names=names - ) + qfilter = self.get_projects_filter(username, groups, filter_names=names) return qs.filter(qfilter) else: # get component Object IDs for queryset @@ -608,23 +597,16 @@ def qfilter(qs): # get list of readable contributions and their component Object IDs module = import_module("mpcontribs.api.contributions.document") - Contributions = getattr(module, "Contributions") + Contributions = module.Contributions qfilter = self.get_projects_filter(username, groups) component = component[:-1] if component == "notebooks" else component qfilter &= Q(**{f"{component}__in": ids}) - contribs = ( - Contributions.objects(qfilter).only(component).limit(len(ids)) - ) + contribs = Contributions.objects(qfilter).only(component).limit(len(ids)) # return new queryset using "ids__in" readable_ids = ( [getattr(contrib, component).id for contrib in contribs] if component == "notebook" - else [ - dbref.id - for contrib in contribs - for dbref in getattr(contrib, component) - if dbref.id in ids - ] + else [dbref.id for contrib in contribs for dbref in getattr(contrib, component) if dbref.id in ids] ) if not readable_ids: return qs.none() diff --git a/mpcontribs-api/src/mpcontribs_api/old/notebooks/__init__.py b/mpcontribs-api/src/mpcontribs_api/old/notebooks/__init__.py index 2db2955a69..85f493d150 100644 --- a/mpcontribs-api/src/mpcontribs_api/old/notebooks/__init__.py +++ b/mpcontribs-api/src/mpcontribs_api/old/notebooks/__init__.py @@ -1,8 +1,8 @@ -# -*- coding: utf-8 -*- from uuid import uuid1 + from flask import current_app -from tornado.escape import json_encode, json_decode from mpcontribs.api import create_kernel_connection, get_logger +from tornado.escape import json_decode, json_encode logger = get_logger(__name__) diff --git a/mpcontribs-api/src/mpcontribs_api/old/notebooks/document.py b/mpcontribs-api/src/mpcontribs_api/old/notebooks/document.py index 37615c7862..dd112f19f2 100644 --- a/mpcontribs-api/src/mpcontribs_api/old/notebooks/document.py +++ b/mpcontribs-api/src/mpcontribs_api/old/notebooks/document.py @@ -1,13 +1,12 @@ -# -*- coding: utf-8 -*- -import os -import boto3 import hashlib - -from io import BytesIO -from mongoengine import signals +import os from base64 import b64decode, b64encode +from io import BytesIO + +import boto3 from flask_mongoengine.documents import Document -from mongoengine.fields import DictField, StringField, IntField, ListField +from mongoengine import signals +from mongoengine.fields import DictField, IntField, ListField, StringField from mongoengine.queryset.manager import queryset_manager BUCKET = os.environ.get("S3_IMAGES_BUCKET", "mpcontribs-images") @@ -33,27 +32,19 @@ class LanguageInfo(DictField): nbconvert_exporter = StringField() pygments_lexer = StringField() version = StringField() - codemirror_mode = DictField( - CodemirrorMode(), default=CodemirrorMode, help_text="codemirror" - ) + codemirror_mode = DictField(CodemirrorMode(), default=CodemirrorMode, help_text="codemirror") class Metadata(DictField): - kernelspec = DictField( - Kernelspec(), required=True, help_text="kernelspec", default=Kernelspec - ) - language_info = DictField( - LanguageInfo(), required=True, help_text="language info", default=LanguageInfo - ) + kernelspec = DictField(Kernelspec(), required=True, help_text="kernelspec", default=Kernelspec) + language_info = DictField(LanguageInfo(), required=True, help_text="language info", default=LanguageInfo) class Cell(DictField): cell_type = StringField(required=True, default="code", help_text="cell type") metadata = DictField(help_text="cell metadata") source = StringField(required=True, default="print('hello')", help_text="source") - outputs = ListField( - DictField(), required=True, help_text="outputs", default=lambda: [DictField()] - ) + outputs = ListField(DictField(), required=True, help_text="outputs", default=lambda: [DictField()]) execution_count = IntField(help_text="exec count") diff --git a/mpcontribs-api/src/mpcontribs_api/old/notebooks/views.py b/mpcontribs-api/src/mpcontribs_api/old/notebooks/views.py index 93ea20e6b9..a0d7ec2749 100644 --- a/mpcontribs-api/src/mpcontribs_api/old/notebooks/views.py +++ b/mpcontribs-api/src/mpcontribs_api/old/notebooks/views.py @@ -1,27 +1,24 @@ -# -*- coding: utf-8 -*- import os import time -import requests -import flask_mongorest -from rq import get_current_job -from rq.job import Job -from gevent import sleep -from nbformat import v4 as nbf -from flask_rq2 import RQ -from flask import Blueprint, request, abort, jsonify, current_app +import flask_mongorest +import requests +from flask import Blueprint, abort, current_app, jsonify, request from flask_mongorest import operators as ops -from flask_mongorest.methods import Fetch, BulkFetch +from flask_mongorest.methods import BulkFetch, Fetch from flask_mongorest.resources import Resource +from flask_rq2 import RQ +from gevent import sleep from mongoengine.errors import DoesNotExist from mongoengine.queryset.visitor import Q - from mpcontribs.api import get_kernel_endpoint, get_logger -from mpcontribs.api.core import SwaggerView from mpcontribs.api.contributions.document import Contributions -from mpcontribs.api.notebooks.document import Notebooks +from mpcontribs.api.core import SwaggerView from mpcontribs.api.notebooks import run_cells - +from mpcontribs.api.notebooks.document import Notebooks +from nbformat import v4 as nbf +from rq import get_current_job +from rq.job import Job logger = get_logger(__name__) templates = os.path.join(os.path.dirname(flask_mongorest.__file__), "templates") @@ -99,19 +96,13 @@ def build(): def restart_kernels(): - """use to avoid run-away memory""" + """Use to avoid run-away memory.""" kernel_ids = [k for k, v in current_app.kernels.items() if v is None] for kernel_id in kernel_ids: kernel_url = get_kernel_endpoint(kernel_id) + "/restart" requests.post(kernel_url, json={}) - cells = [ - nbf.new_code_cell( - "\n".join( - ["from mpcontribs.client import Client", "print('client imported')"] - ) - ) - ] + cells = [nbf.new_code_cell("\n".join(["from mpcontribs.client import Client", "print('client imported')"]))] run_cells(kernel_id, "import_client", cells) @@ -140,7 +131,7 @@ def result(job_id): @rq.job() def make(projects=None, cids=None, force=False): - """build the notebook / details page""" + """Build the notebook / details page.""" start = time.perf_counter() remaining_time = rq.default_timeout - 5 mask = ["id", "needs_build", "notebook"] @@ -180,11 +171,7 @@ def make(projects=None, cids=None, force=False): start = time.perf_counter() - if ( - not force - and document.notebook - and not getattr(document, "needs_build", True) - ): + if not force and document.notebook and not getattr(document, "needs_build", True): continue if document.notebook: @@ -216,23 +203,13 @@ def make(projects=None, cids=None, force=False): ] ) ), - nbf.new_code_cell( - "\n".join( - [f'c = client.get_contribution("{document.id}")', "c.display()"] - ) - ), + nbf.new_code_cell("\n".join([f'c = client.get_contribution("{document.id}")', "c.display()"])), ] if document.tables: cells.append(nbf.new_markdown_cell("## Tables")) for table in document.tables: - cells.append( - nbf.new_code_cell( - "\n".join( - [f't = client.get_table("{table.id}")', "t.display()"] - ) - ) - ) + cells.append(nbf.new_code_cell("\n".join([f't = client.get_table("{table.id}")', "t.display()"]))) if document.structures: cells.append(nbf.new_markdown_cell("## Structures")) diff --git a/mpcontribs-api/src/mpcontribs_api/old/projects/document.py b/mpcontribs-api/src/mpcontribs_api/old/projects/document.py index e172e924b1..45c3319d50 100644 --- a/mpcontribs-api/src/mpcontribs_api/old/projects/document.py +++ b/mpcontribs-api/src/mpcontribs_api/old/projects/document.py @@ -1,33 +1,31 @@ -# -*- coding: utf-8 -*- import urllib - +from collections import ChainMap from math import isnan + from atlasq import AtlasManager, AtlasQ -from flatten_dict import flatten from boltons.iterutils import remap -from collections import ChainMap -from flask import current_app, render_template, url_for, request -from mongoengine import Document +from flask import current_app, render_template, request, url_for +from flatten_dict import flatten from marshmallow import ValidationError from marshmallow.fields import String from marshmallow.validate import Email as EmailValidator from marshmallow_mongoengine.conversion import params from marshmallow_mongoengine.conversion.fields import register_field -from mongoengine import EmbeddedDocument, signals -from mongoengine.queryset.manager import queryset_manager +from mongoengine import Document, EmbeddedDocument, signals from mongoengine.fields import ( - StringField, BooleanField, + DecimalField, DictField, - URLField, EmailField, - DecimalField, + EmbeddedDocumentField, + EmbeddedDocumentListField, FloatField, IntField, - EmbeddedDocumentListField, - EmbeddedDocumentField, + StringField, + URLField, ) -from mpcontribs.api import send_email, valid_key, valid_dict, delimiter, enter +from mongoengine.queryset.manager import queryset_manager +from mpcontribs.api import delimiter, enter, send_email, valid_dict, valid_key PROVIDERS = {"github", "google", "facebook", "microsoft", "amazon", "portier"} MAX_COLUMNS = 160 @@ -46,7 +44,7 @@ def visit(path, key, value): class ProviderEmailField(EmailField): - """Field to validate usernames of format :""" + """Field to validate usernames of format :.""" def validate(self, value): if value.count(":") != 1: @@ -128,9 +126,7 @@ class Projects(Document): primary_key=True, help_text=f"project name/slug (valid format: `{__project_regex__}`)", ) - is_public = BooleanField( - required=True, default=False, help_text="public/private project" - ) + is_public = BooleanField(required=True, default=False, help_text="public/private project") title = StringField( min_length=5, max_length=30, @@ -168,15 +164,9 @@ class Projects(Document): help_text="license (see https://materialsproject.org/about/terms)", ) other = DictField(validation=valid_dict, null=True, help_text="other information") - owner = ProviderEmailField( - unique_with="name", help_text="owner / corresponding email" - ) - is_approved = BooleanField( - required=True, default=False, help_text="project approved?" - ) - unique_identifiers = BooleanField( - required=True, default=True, help_text="identifiers unique?" - ) + owner = ProviderEmailField(unique_with="name", help_text="owner / corresponding email") + is_approved = BooleanField(required=True, default=False, help_text="project approved?") + unique_identifiers = BooleanField(required=True, default=True, help_text="identifiers unique?") columns = EmbeddedDocumentListField(Column, max_length=MAX_COLUMNS) stats = EmbeddedDocumentField(Stats, required=True, default=Stats) atlas = AtlasManager("mpcontribs-dev-project-search") @@ -187,9 +177,7 @@ class Projects(Document): @queryset_manager def objects(doc_cls, queryset): - return queryset.only( - "name", "is_public", "title", "owner", "is_approved", "unique_identifiers" - ) + return queryset.only("name", "is_public", "title", "owner", "is_approved", "unique_identifiers") @classmethod def atlas_filter(cls, term): @@ -205,12 +193,8 @@ def post_save(cls, sender, document, **kwargs): ts = current_app.config["USTS"] email_project = [document.owner, document.name] token = ts.dumps(email_project) - link = url_for( - "projects.applications", token=token, _scheme=scheme, _external=True - ) - url = url_for( - "projectsFetch", pk=document.name, _scheme=scheme, _external=True - ) + link = url_for("projects.applications", token=token, _scheme=scheme, _external=True) + url = url_for("projectsFetch", pk=document.name, _scheme=scheme, _external=True) url += "?_fields=_all" html = render_template("admin_email.html", url=url, link=link) send_email(admin_email, f'New project "{document.name}"', html) @@ -231,14 +215,10 @@ def post_save(cls, sender, document, **kwargs): owner_email = document.owner.split(":", 1)[1] send_email(owner_email, subject, html) - if ( - "columns" in delta_set - or "columns" in delta_unset - or (not delta_set and not delta_unset) - ): + if "columns" in delta_set or "columns" in delta_unset or (not delta_set and not delta_unset): from mpcontribs.api.contributions.document import ( - Contributions, COMPONENTS, + Contributions, ) columns = {} @@ -258,9 +238,7 @@ def post_save(cls, sender, document, **kwargs): ] result = Contributions.objects.aggregate(pipeline) merged = ChainMap(*result) - flat = flatten( - remap(merged, visit=visit, enter=enter), reducer="dot" - ) + flat = flatten(remap(merged, visit=visit, enter=enter), reducer="dot") for k, v in flat.items(): if k.startswith("data."): @@ -303,9 +281,7 @@ def post_save(cls, sender, document, **kwargs): project_stage[component] = {"$size": f"${component}"} # filter/forward number columns - min_max_paths = [ - path for path, col in columns.items() if col["unit"] != "NaN" - ] + min_max_paths = [path for path, col in columns.items() if col["unit"] != "NaN"] for path in min_max_paths: field = f"{path}{delimiter}value" project_stage[field] = { @@ -379,9 +355,7 @@ def post_delete(cls, sender, document, **kwargs): send_email(owner_email, subject, html) -register_field( - ProviderEmailField, ProviderEmail, available_params=(params.LengthParam,) -) +register_field(ProviderEmailField, ProviderEmail, available_params=(params.LengthParam,)) signals.post_save.connect(Projects.post_save, sender=Projects) signals.post_delete.connect(Projects.post_delete, sender=Projects) Projects.atlas.index._set_indexed_fields({"type": "document", "dynamic": True}) diff --git a/mpcontribs-api/src/mpcontribs_api/old/projects/views.py b/mpcontribs-api/src/mpcontribs_api/old/projects/views.py index 3b2dfa1110..4bba5c4b01 100644 --- a/mpcontribs-api/src/mpcontribs_api/old/projects/views.py +++ b/mpcontribs-api/src/mpcontribs_api/old/projects/views.py @@ -1,17 +1,15 @@ -# -*- coding: utf-8 -*- import os -import flask_mongorest -from mongoengine.queryset import DoesNotExist -from flask import Blueprint, current_app, url_for, jsonify, abort, request -from flask_mongorest.resources import Resource +import flask_mongorest +from flask import Blueprint, abort, current_app, jsonify, request, url_for from flask_mongorest import operators as ops -from flask_mongorest.methods import Fetch, Create, Delete, Update, BulkFetch -from werkzeug.exceptions import Unauthorized - +from flask_mongorest.methods import BulkFetch, Create, Delete, Fetch, Update +from flask_mongorest.resources import Resource +from mongoengine.queryset import DoesNotExist from mpcontribs.api import FILTERS from mpcontribs.api.core import SwaggerView -from mpcontribs.api.projects.document import Projects, Column, Reference, Stats +from mpcontribs.api.projects.document import Column, Projects, Reference, Stats +from werkzeug.exceptions import Unauthorized templates = os.path.join(os.path.dirname(flask_mongorest.__file__), "templates") projects = Blueprint("projects", __name__, template_folder=templates) @@ -114,9 +112,7 @@ def has_change_permission(self, request, obj): return True if not self.is_project_user(request, obj): - raise Unauthorized( - "Only project owners and collaborators can edit projects." - ) + raise Unauthorized("Only project owners and collaborators can edit projects.") update = request.json if "is_approved" in update: diff --git a/mpcontribs-api/src/mpcontribs_api/old/structures/document.py b/mpcontribs-api/src/mpcontribs_api/old/structures/document.py index 29b8a333d3..c28c9458f5 100644 --- a/mpcontribs-api/src/mpcontribs_api/old/structures/document.py +++ b/mpcontribs-api/src/mpcontribs_api/old/structures/document.py @@ -1,9 +1,9 @@ -# -*- coding: utf-8 -*- import json from hashlib import md5 + from flask_mongoengine.documents import Document from mongoengine import signals -from mongoengine.fields import StringField, FloatField, ListField, DictField +from mongoengine.fields import DictField, FloatField, ListField, StringField from mongoengine.queryset.manager import queryset_manager from pymatgen.core import Structure from pymatgen.io.cif import CifWriter @@ -48,6 +48,4 @@ def pre_save_post_validation(cls, sender, document, **kwargs): document.cif = writer.__str__() -signals.pre_save_post_validation.connect( - Structures.pre_save_post_validation, sender=Structures -) +signals.pre_save_post_validation.connect(Structures.pre_save_post_validation, sender=Structures) diff --git a/mpcontribs-api/src/mpcontribs_api/old/structures/views.py b/mpcontribs-api/src/mpcontribs_api/old/structures/views.py index e30996dd59..00fa873568 100644 --- a/mpcontribs-api/src/mpcontribs_api/old/structures/views.py +++ b/mpcontribs-api/src/mpcontribs_api/old/structures/views.py @@ -1,11 +1,10 @@ -# -*- coding: utf-8 -*- import os + import flask_mongorest -from flask_mongorest.resources import Resource -from flask_mongorest import operators as ops -from flask_mongorest.methods import Fetch, BulkFetch, Download from flask import Blueprint - +from flask_mongorest import operators as ops +from flask_mongorest.methods import BulkFetch, Download, Fetch +from flask_mongorest.resources import Resource from mpcontribs.api import FILTERS from mpcontribs.api.core import SwaggerView from mpcontribs.api.structures.document import Structures diff --git a/mpcontribs-api/src/mpcontribs_api/old/tables/__init__.py b/mpcontribs-api/src/mpcontribs_api/old/tables/__init__.py index e809e59329..b6d53222f4 100644 --- a/mpcontribs-api/src/mpcontribs_api/old/tables/__init__.py +++ b/mpcontribs-api/src/mpcontribs_api/old/tables/__init__.py @@ -1,2 +1 @@ -# -*- coding: utf-8 -*- -"""document and views for tables collection""" +"""Document and views for tables collection.""" diff --git a/mpcontribs-api/src/mpcontribs_api/old/tables/document.py b/mpcontribs-api/src/mpcontribs_api/old/tables/document.py index c73aee76fb..1bbeb86084 100644 --- a/mpcontribs-api/src/mpcontribs_api/old/tables/document.py +++ b/mpcontribs-api/src/mpcontribs_api/old/tables/document.py @@ -1,14 +1,12 @@ -# -*- coding: utf-8 -*- from flask_mongoengine.documents import DynamicDocument -from mongoengine import signals, EmbeddedDocument -from mongoengine.fields import StringField, ListField, IntField, EmbeddedDocumentField +from mongoengine import EmbeddedDocument, signals +from mongoengine.fields import EmbeddedDocumentField, IntField, ListField, StringField from mongoengine.queryset.manager import queryset_manager - from mpcontribs.api.contributions.document import ( + COMPONENTS, format_cell, - get_resource, get_md5, - COMPONENTS, + get_resource, ) diff --git a/mpcontribs-api/src/mpcontribs_api/old/tables/views.py b/mpcontribs-api/src/mpcontribs_api/old/tables/views.py index 0e7f4a6d83..5306003d06 100644 --- a/mpcontribs-api/src/mpcontribs_api/old/tables/views.py +++ b/mpcontribs-api/src/mpcontribs_api/old/tables/views.py @@ -1,15 +1,14 @@ -# -*- coding: utf-8 -*- import os + import flask_mongorest -from flask_mongorest.resources import Resource +from flask import Blueprint from flask_mongorest import operators as ops -from flask_mongorest.methods import Fetch, BulkFetch, Download from flask_mongorest.exceptions import UnknownFieldError -from flask import Blueprint - +from flask_mongorest.methods import BulkFetch, Download, Fetch +from flask_mongorest.resources import Resource from mpcontribs.api import FILTERS from mpcontribs.api.core import SwaggerView -from mpcontribs.api.tables.document import Tables, Attributes, Labels +from mpcontribs.api.tables.document import Attributes, Labels, Tables templates = os.path.join(os.path.dirname(flask_mongorest.__file__), "templates") tables = Blueprint("tables", __name__, template_folder=templates) diff --git a/mpcontribs-api/src/mpcontribs_api/pagination.py b/mpcontribs-api/src/mpcontribs_api/pagination.py index 2d7cd85580..2e7929d7d8 100644 --- a/mpcontribs-api/src/mpcontribs_api/pagination.py +++ b/mpcontribs-api/src/mpcontribs_api/pagination.py @@ -4,7 +4,7 @@ class CursorParams(BaseModel): - """Models parameters used in cursor-based pagination""" + """Models parameters used in cursor-based pagination.""" # None == First page cursor: str | None = None @@ -17,7 +17,8 @@ class Page[T](BaseModel): Attributes: items (list[T]): the items returned for the given page - next_cursor (str): the base64-encoded value of the first id on the next page. If None, then no more pages are available + next_cursor (str): the base64-encoded value of the first id on the next page. If None, then no more pages are + available """ items: list[T] @@ -33,4 +34,4 @@ def decode_cursor(cursor: str) -> str: try: return base64.urlsafe_b64decode(cursor.encode()).decode() except ValueError, UnicodeDecodeError: - raise ValueError("malformed cursor") + raise ValueError("malformed cursor") from None diff --git a/mpcontribs-api/src/mpcontribs_api/projection.py b/mpcontribs-api/src/mpcontribs_api/projection.py index b1a5d47f15..f09875b9c4 100644 --- a/mpcontribs-api/src/mpcontribs_api/projection.py +++ b/mpcontribs-api/src/mpcontribs_api/projection.py @@ -1,7 +1,8 @@ """Handles the projection of '_fields' from query params. This includes arbitrarily specifying nested structures with '.' -Ie. data.band_gap.something will be properly retrieved and populated into the response model that subclasses SparseFieldsModel +Ie. data.band_gap.something will be properly retrieved and populated into the response model that subclasses + SparseFieldsModel """ from __future__ import annotations @@ -88,14 +89,9 @@ def _validate_path(model: type[BaseModel], path: str) -> None: """Raise if the dotted path is not a selectable field path on the model.""" for step in _walk_path(model, path): if step.kind == "unknown": - raise ValidationError( - f"unknown field in _fields: {path!r} (no field {step.segment!r})" - ) + raise ValidationError(f"unknown field in _fields: {path!r} (no field {step.segment!r})") if step.kind in ("scalar", "list") and not step.is_last: - raise ValidationError( - f"cannot select subfields of {step.kind} field " - f"{step.segment!r} in _fields: {path!r}" - ) + raise ValidationError(f"cannot select subfields of {step.kind} field {step.segment!r} in _fields: {path!r}") def _collapse(paths: frozenset[str]) -> frozenset[str]: @@ -130,15 +126,9 @@ def _backs_mongo_id(field: FieldInfo) -> bool: def _optional_field(source_field: FieldInfo, annotation: Any) -> tuple[Any, FieldInfo]: """Build an optional create_model field definition, preserving the source field's aliases.""" - validation_alias = ( - source_field.validation_alias - if isinstance(source_field.validation_alias, str) - else None - ) + validation_alias = source_field.validation_alias if isinstance(source_field.validation_alias, str) else None serialization_alias = ( - source_field.serialization_alias - if isinstance(source_field.serialization_alias, str) - else None + source_field.serialization_alias if isinstance(source_field.serialization_alias, str) else None ) optional_annotation: Any = annotation | None return optional_annotation, FieldInfo( @@ -149,7 +139,7 @@ def _optional_field(source_field: FieldInfo, annotation: Any) -> tuple[Any, Fiel @lru_cache(maxsize=128) -def _build_model(model: type[ModelT], paths: frozenset[str]) -> type[ModelT]: +def _build_model[ModelT: BaseModel](model: type[ModelT], paths: frozenset[str]) -> type[ModelT]: """Recursively build the partial response model covering the requested paths.""" nested_paths_by_root: dict[str, set[str]] = {} for path in paths: @@ -163,9 +153,7 @@ def _build_model(model: type[ModelT], paths: frozenset[str]) -> type[ModelT]: source_field = model.model_fields[root] kind, nested_model = _classify(source_field.annotation) if not nested_paths: - field_definitions[root] = _optional_field( - source_field, source_field.annotation - ) + field_definitions[root] = _optional_field(source_field, source_field.annotation) elif kind == "model" and nested_model is not None: partial_nested = _build_model(nested_model, frozenset(nested_paths)) field_definitions[root] = _optional_field(source_field, partial_nested) @@ -183,13 +171,13 @@ def _build_model(model: type[ModelT], paths: frozenset[str]) -> type[ModelT]: @lru_cache(maxsize=128) -def _build_projection(model: type[ModelT], paths: frozenset[str]) -> type[ModelT]: +def _build_projection[ModelT: BaseModel](model: type[ModelT], paths: frozenset[str]) -> type[ModelT]: """Build the partial model and attach its explicit dotted Mongo projection.""" projection: dict[str, int] = {"_id": 1} for path in paths: projection[_mongo_key(model, path)] = 1 partial_model = _build_model(model, paths) - setattr(partial_model, "Settings", type("Settings", (), {"projection": projection})) + partial_model.Settings = type("Settings", (), {"projection": projection}) return partial_model @@ -210,9 +198,7 @@ class SparseFieldsModel(BaseModel): @classmethod def _identity_fields(cls) -> frozenset[str]: """Field names backing Mongo ``_id``, always forced into a projection.""" - return frozenset( - name for name, field in cls.model_fields.items() if _backs_mongo_id(field) - ) + return frozenset(name for name, field in cls.model_fields.items() if _backs_mongo_id(field)) @classmethod def field_names(cls) -> frozenset[str]: diff --git a/mpcontribs-api/src/mpcontribs_api/types.py b/mpcontribs-api/src/mpcontribs_api/types.py index 8d3b6a11fb..933b4bfbc4 100644 --- a/mpcontribs-api/src/mpcontribs_api/types.py +++ b/mpcontribs-api/src/mpcontribs_api/types.py @@ -14,9 +14,7 @@ def _validate_prefixed_email(v: str) -> str: v = v.strip() if not _EMAIL_RE.match(v): - raise ValidationError( - "must match ':@', e.g. 'google:name@gmail.com'" - ) + raise ValidationError("must match ':@', e.g. 'google:name@gmail.com'") return v diff --git a/mpcontribs-api/supervisord/conf.py b/mpcontribs-api/supervisord/conf.py index 321c06a52f..3e1c5d128f 100644 --- a/mpcontribs-api/supervisord/conf.py +++ b/mpcontribs-api/supervisord/conf.py @@ -1,4 +1,5 @@ import os + from jinja2 import Environment, FileSystemLoader DIR = os.path.abspath(os.path.dirname(__file__)) @@ -28,9 +29,7 @@ "reload": int(not PRODUCTION), "node_env": "production" if PRODUCTION else "development", "flask_log_level": "INFO" if PRODUCTION else "DEBUG", - "jupyter_gateway_host": f"localhost:{KG_PORT}" - if PRODUCTION - else f"kernel-gateway:{KG_PORT}", + "jupyter_gateway_host": f"localhost:{KG_PORT}" if PRODUCTION else f"kernel-gateway:{KG_PORT}", "dd_agent_host": "localhost" if PRODUCTION else "datadog", "mpcontribs_api_host": "localhost" if PRODUCTION else "contribs-apis", } diff --git a/mpcontribs-api/uv.lock b/mpcontribs-api/uv.lock index 8bc0ab7fde..4d386f1cc8 100644 --- a/mpcontribs-api/uv.lock +++ b/mpcontribs-api/uv.lock @@ -1,15 +1,9 @@ version = 1 revision = 3 -requires-python = ">=3.11" +requires-python = ">=3.14" resolution-markers = [ - "python_full_version >= '3.14' and sys_platform == 'win32'", - "python_full_version >= '3.14' and sys_platform != 'win32'", - "python_full_version == '3.13.*' and sys_platform == 'win32'", - "python_full_version == '3.13.*' and sys_platform != 'win32'", - "python_full_version == '3.12.*' and sys_platform == 'win32'", - "python_full_version == '3.12.*' and sys_platform != 'win32'", - "python_full_version < '3.12' and sys_platform == 'win32'", - "python_full_version < '3.12' and sys_platform != 'win32'", + "sys_platform == 'win32'", + "sys_platform != 'win32'", ] [[package]] @@ -36,7 +30,6 @@ version = "4.13.0" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "idna" }, - { name = "typing-extensions", marker = "python_full_version < '3.13'" }, ] sdist = { url = "https://files.pythonhosted.org/packages/19/14/2c5dd9f512b66549ae92767a9c7b330ae88e1932ca57876909410251fe13/anyio-4.13.0.tar.gz", hash = "sha256:334b70e641fd2221c1505b3890c69882fe4a2df910cba14d97019b90b24439dc", size = 231622, upload-time = "2026-03-24T12:59:09.671Z" } wheels = [ @@ -144,15 +137,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/d2/39/e7eaf1799466a4aef85b6a4fe7bd175ad2b1c6345066aa33f1f58d4b18d0/asttokens-3.0.1-py3-none-any.whl", hash = "sha256:15a3ebc0f43c2d0a50eeafea25e19046c68398e487b9f1f5b517f7c0f40f976a", size = 27047, upload-time = "2025-11-15T16:43:16.109Z" }, ] -[[package]] -name = "async-timeout" -version = "5.0.1" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/a5/ae/136395dfbfe00dfc94da3f3e136d0b13f394cba8f4841120e34226265780/async_timeout-5.0.1.tar.gz", hash = "sha256:d9321a7a3d5a6a5e187e824d2fa0793ce379a202935782d555d6e9d2735677d3", size = 9274, upload-time = "2024-11-06T16:41:39.6Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/fe/ba/e2081de779ca30d473f21f5b30e0e737c438205440784c7dfc81efc2b029/async_timeout-5.0.1-py3-none-any.whl", hash = "sha256:39e3809566ff85354557ec2398b55e096c8364bacac9405a7a1fa429e77fe76c", size = 6233, upload-time = "2024-11-06T16:41:37.9Z" }, -] - [[package]] name = "atlasq-tschaume" version = "0.11.1.dev2" @@ -176,73 +160,15 @@ wheels = [ ] [[package]] -name = "backports-zstd" -version = "1.5.0" +name = "basedpyright" +version = "1.39.6" source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/d4/05/480d439b482edf59b786bc19b474d990c61942e372f5de3dc14acac8154d/backports_zstd-1.5.0.tar.gz", hash = "sha256:a5e622a82eb183b4fbe18032755ce0a15fa9a82f2adb9b621620b91247aaedb7", size = 998556, upload-time = "2026-05-11T19:54:24.923Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/26/bc/083c0ebee316f4863ed288c4a5eaa1e98be115e82deb8855da8bab1c7701/backports_zstd-1.5.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:fbaa5502617dc4f04327c7a2951f0fcdca7aaef93ddf32c15dc8b620208174fa", size = 436838, upload-time = "2026-05-11T19:52:24.349Z" }, - { url = "https://files.pythonhosted.org/packages/cd/e5/bf778667fff6598dbd0791745123ed964aee94753ae8e4e92aa1e07417b6/backports_zstd-1.5.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:204f00d62e95aab987c7c019452b2373bdefb17252443765f2ede7f15b6e669a", size = 363215, upload-time = "2026-05-11T19:52:25.887Z" }, - { url = "https://files.pythonhosted.org/packages/63/a5/4fae78734dbefcb4b5386137c807e2107c4bc94e85c0d9eaae79206dde84/backports_zstd-1.5.0-cp311-cp311-manylinux2010_i686.manylinux_2_12_i686.manylinux_2_28_i686.whl", hash = "sha256:2c77c0d4c330afd26d2a98f3d689ab922ec3f046014a1614ddcaad437666ac05", size = 507161, upload-time = "2026-05-11T19:52:27.48Z" }, - { url = "https://files.pythonhosted.org/packages/d8/ec/b64409f0cf56fb65181d6f5d9130058f19d5c3c9f8c581a5e2bd62642630/backports_zstd-1.5.0-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:6bb2f2d2c07358edeaa251cf804b993e9f0d5d93af8a7ea2414d80ff3c105e95", size = 476728, upload-time = "2026-05-11T19:52:29.182Z" }, - { url = "https://files.pythonhosted.org/packages/4d/10/4c1693cb4e129585a6e4cb565106cad7347e61c43c8375b9e9cadb00eb06/backports_zstd-1.5.0-cp311-cp311-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:cb89f554abcebcb2c487024e63be8059083775c5fd351fec0cc2dc3e9f528714", size = 582388, upload-time = "2026-05-11T19:52:30.908Z" }, - { url = "https://files.pythonhosted.org/packages/45/b9/dc748a0e7d21ce2228241f6e8af96d297c80ab69c4c49429309b8fa3beb8/backports_zstd-1.5.0-cp311-cp311-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:ea969758af743000d822fc3a69dc9de059bbbb8d07d2f13e06ff49ac63cce74f", size = 642091, upload-time = "2026-05-11T19:52:32.397Z" }, - { url = "https://files.pythonhosted.org/packages/de/5f/02366ddae6e008d53df71605e4e3ca8dcea5d1dfcba29040b46883a23127/backports_zstd-1.5.0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:775ad82d268923639bc924013fc61561df376c148506b241f0f80718b5bb3a2f", size = 492256, upload-time = "2026-05-11T19:52:34.441Z" }, - { url = "https://files.pythonhosted.org/packages/c0/c7/c5e7824c17abc87dbb24c7c90dc43054d701533cf04d3531cb9b7105cdac/backports_zstd-1.5.0-cp311-cp311-manylinux_2_34_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:663128370bbc2ebcc436b8977bc434a7bf29919d92d91fee05ed6fb0fa807646", size = 566214, upload-time = "2026-05-11T19:52:35.962Z" }, - { url = "https://files.pythonhosted.org/packages/12/7b/ee7368c4ad8f5e00b3fd84fc566fb7714aa766c5672500793990e19efa00/backports_zstd-1.5.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:572c76832e9a24da4084befa52c23f4c03fede2aa250ae6250cbc5a11b980f69", size = 482666, upload-time = "2026-05-11T19:52:37.675Z" }, - { url = "https://files.pythonhosted.org/packages/77/36/2826f9f04b6c91d5f707f49188ac6f5ec7487b36d73caedfa20db3307826/backports_zstd-1.5.0-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:9410bcbcd3afd787a15a276d68f954d1703788c780faa421183a61d39da8b862", size = 510594, upload-time = "2026-05-11T19:52:39.501Z" }, - { url = "https://files.pythonhosted.org/packages/84/3b/95342baf0e301b7d06c6862389f8520a9d71f073a6c1a5b86182e7d89148/backports_zstd-1.5.0-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:0fab15e6895bef621041dd82d6306ffa24889257dd902c4b98b88e4260b3465d", size = 586713, upload-time = "2026-05-11T19:52:41.461Z" }, - { url = "https://files.pythonhosted.org/packages/bc/32/73d2b8f572960307406b084bb8932f4ebd9fcedb05d1502e04fecf25970a/backports_zstd-1.5.0-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:2ffde637b6d0082f1c3356657002469cf199c7c12d50d9822a55b13425c778d3", size = 564037, upload-time = "2026-05-11T19:52:43.15Z" }, - { url = "https://files.pythonhosted.org/packages/8f/a4/6e319fa7fa5851c3ca9701cbded9522c16018432a01a33a95cc0fccb6b4a/backports_zstd-1.5.0-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:c01d377c1489cb2230bf6a9ff01c73c42863cc96ee648c49923d4f6d4ea4e2d5", size = 632626, upload-time = "2026-05-11T19:52:45.017Z" }, - { url = "https://files.pythonhosted.org/packages/67/5c/10df0444db05f9276b286d230a3d6948ad47c593fc22925b8fe551d34b26/backports_zstd-1.5.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:4080bb9c8a51bb2bf8caf8018d78278cd49eb924cb06a54f56a411095e2ac912", size = 496270, upload-time = "2026-05-11T19:52:46.558Z" }, - { url = "https://files.pythonhosted.org/packages/f1/ad/6cd1de5cd858ac653833098f13a4643a4c9db484072350d3dbf299cc46f1/backports_zstd-1.5.0-cp311-cp311-win32.whl", hash = "sha256:9f4fe3fd82c8c6e8a9fdc5c71f92f9fe2442d02e7f59fddef25a955e189e3f38", size = 289754, upload-time = "2026-05-11T19:52:48.232Z" }, - { url = "https://files.pythonhosted.org/packages/1d/1b/df94ad1cb79705d717f7e1063da642c538a6d7ce6443c8e60355fa507ea4/backports_zstd-1.5.0-cp311-cp311-win_amd64.whl", hash = "sha256:e7c0372fa036751109604c70a8c87e59faaacc195d519c8cb9e0e527ee2b5478", size = 314829, upload-time = "2026-05-11T19:52:50.031Z" }, - { url = "https://files.pythonhosted.org/packages/e8/e7/24e60da7cc89b9ed1c5b474678e316dd0ddfe7cd1de39b23d04452ca5946/backports_zstd-1.5.0-cp311-cp311-win_arm64.whl", hash = "sha256:264a66137555bb4648f7e64cfc514d820758072684f373269fcdd2e8d4a90306", size = 291497, upload-time = "2026-05-11T19:52:51.729Z" }, - { url = "https://files.pythonhosted.org/packages/24/71/29ed213344f8f62b7520745d7df3752d88db456aff9d8b706bdf5eb99a3c/backports_zstd-1.5.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:1858cacdb3e50105a1b60acdc3dd5b18650077d12dce243e19d5c88e8172bd71", size = 437170, upload-time = "2026-05-11T19:52:53.204Z" }, - { url = "https://files.pythonhosted.org/packages/d0/e3/a58a3eb8fc54d4e3e4f684ed7b1f688da02e5bda5ae5e2809e94cf2ead2f/backports_zstd-1.5.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:ccffc0a1974ecc2cc42afa4c15f56d036a4b2bae0abc46e6ba9b3358d9b1c037", size = 363265, upload-time = "2026-05-11T19:52:55.153Z" }, - { url = "https://files.pythonhosted.org/packages/3f/03/9d13840d206dec1c4698c803f61c58379b3578cb9dc6140ba5fa4ce2f31d/backports_zstd-1.5.0-cp312-cp312-manylinux2010_i686.manylinux_2_12_i686.manylinux_2_28_i686.whl", hash = "sha256:ab3430ab4d4ac3fb1bc1e4174d137731e51363b6abd5e51a1599690fe9c7d61d", size = 507527, upload-time = "2026-05-11T19:52:57.256Z" }, - { url = "https://files.pythonhosted.org/packages/6a/8f/8dc4b5736dca218cbca9609549a8f6dc202990abdb49afdc6112442f5360/backports_zstd-1.5.0-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:c737c1cb4a10c2d0f6cba9a347522858094f0a737b4558c67a777bcaa4a795cd", size = 477352, upload-time = "2026-05-11T19:52:59.425Z" }, - { url = "https://files.pythonhosted.org/packages/96/2c/65a66976a761b5b62eacbaed5ed418c694b24b5c480399315d799751de62/backports_zstd-1.5.0-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:0379c66510681a6b2780d3f3ef2cff54d01204b52448d64bde1855d40f856a04", size = 582799, upload-time = "2026-05-11T19:53:01.303Z" }, - { url = "https://files.pythonhosted.org/packages/d3/e9/ee93a66cd28cb3ad7f3c04d1105325a5428671b18bd41ba9ed8b43bc44cf/backports_zstd-1.5.0-cp312-cp312-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:7c7474b291e264c9609358d3875cf539623f7a65339c2b533020992b1a4c095b", size = 641530, upload-time = "2026-05-11T19:53:03.082Z" }, - { url = "https://files.pythonhosted.org/packages/e4/4b/2cecd4d6679f175f28ae02022bd2050ff4023e38902fae104dbe2e231911/backports_zstd-1.5.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:bb73c22444617bc5a3abf32dd27b3f2085898cfe3b95e6855300e9189898a3bd", size = 495324, upload-time = "2026-05-11T19:53:05.005Z" }, - { url = "https://files.pythonhosted.org/packages/4d/20/ee21e4e791e31f38f7a70b3961eb64b350d9be802a335e7a04c02b41b197/backports_zstd-1.5.0-cp312-cp312-manylinux_2_34_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:6cd7f6c33afd89354f74469e315e72754e3040f91f7b685061e225d9e36e3e8e", size = 569796, upload-time = "2026-05-11T19:53:07.011Z" }, - { url = "https://files.pythonhosted.org/packages/76/da/86c9a2ea384885b60638b3e47113198449568d0e36ef3834d1f969623092/backports_zstd-1.5.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:2106309071f279b38d3663c55c7fed192733b4f332b50eb3fa707e54bad6967a", size = 483367, upload-time = "2026-05-11T19:53:08.674Z" }, - { url = "https://files.pythonhosted.org/packages/5d/f0/c95c6e4dd28fc314547782a482839e422283d62c2aaf45d30672109a4a1e/backports_zstd-1.5.0-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:56fffa80be74cb11ac843333bbdc56e466c87967706886b3efd6b16d83830d90", size = 510976, upload-time = "2026-05-11T19:53:10.339Z" }, - { url = "https://files.pythonhosted.org/packages/0e/a2/72777b7e1872228a13b09b0bf77ae6cf626008d462cc2e1a0ae64721fd55/backports_zstd-1.5.0-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:5e8b8251eec80e67e30ec79dfc5b3b1ada069b9ac48b56b102f3e2c6f8281062", size = 587190, upload-time = "2026-05-11T19:53:12.205Z" }, - { url = "https://files.pythonhosted.org/packages/f5/a1/db5d1aee59da308eadeaa189764a4ec68e98495c309a13dcb8da5718fef1/backports_zstd-1.5.0-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:f334dd17ffead361aa9090e40151bd123507ce213a62733121b7145c6711cbde", size = 567395, upload-time = "2026-05-11T19:53:14.245Z" }, - { url = "https://files.pythonhosted.org/packages/00/0f/39ca1a6e8c5c2dc81da9e06c44d1990cc464f4b16dae214e877afd7adfc0/backports_zstd-1.5.0-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:78cbfd061255fef6de5070a54e0f9c00e8aabad5c99dd2ad884a3a7d1acc09ae", size = 632048, upload-time = "2026-05-11T19:53:16.234Z" }, - { url = "https://files.pythonhosted.org/packages/73/fd/a438ee4fc615016dbe96112b709b6805ee19eb215f46e208c8fbce086d8d/backports_zstd-1.5.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:2f55d70df44f49d599e20033013bc1ae705202735c45d4bca8eb963b225e15fd", size = 499833, upload-time = "2026-05-11T19:53:17.85Z" }, - { url = "https://files.pythonhosted.org/packages/f7/42/f544fde4de32687e28c514288ae3c11106ba644e9dd580992cbd704bbb49/backports_zstd-1.5.0-cp312-cp312-win32.whl", hash = "sha256:a8b096e0383a3bcab34f8c97b79e1a52051189d11258bbc2bc1145997a15dd1d", size = 289876, upload-time = "2026-05-11T19:53:19.486Z" }, - { url = "https://files.pythonhosted.org/packages/ad/31/9c29cd3175892e5ee909f5e8d14707fa07815301ff24b5c697d1cea62a77/backports_zstd-1.5.0-cp312-cp312-win_amd64.whl", hash = "sha256:e2802899ba4ef1a062ffe4bb1292c5df32011a54b4c3004c54f46ec975f39554", size = 314933, upload-time = "2026-05-11T19:53:20.942Z" }, - { url = "https://files.pythonhosted.org/packages/11/ee/1a50acd6446c0d57c4f93ad6ce68e1a631ad920737a6b2d0bbbc47de7f42/backports_zstd-1.5.0-cp312-cp312-win_arm64.whl", hash = "sha256:3c0353e66942afbd45518788cfbd1e9e117828ceb390fa50517f46f291850d8e", size = 291665, upload-time = "2026-05-11T19:53:22.686Z" }, - { url = "https://files.pythonhosted.org/packages/c6/e6/252521e3a847eb200bc0a1d528542d651b9c8dc7953e231c39ed2890d5ff/backports_zstd-1.5.0-cp313-cp313-android_21_arm64_v8a.whl", hash = "sha256:02a57ee8598dd863c0b11c7af00042ce6bc045bf6f4249fa4c322c62614ca1fd", size = 400134, upload-time = "2026-05-11T19:53:24.28Z" }, - { url = "https://files.pythonhosted.org/packages/36/43/27ef105ffa2da3d52218d4a7b2e14037974283953b3ee790358af6e9b4df/backports_zstd-1.5.0-cp313-cp313-android_21_x86_64.whl", hash = "sha256:c56c11eb3173d540e1fb0216f7ab477cbd3a204eca41f5f329059ee8a5d2ad47", size = 454225, upload-time = "2026-05-11T19:53:25.874Z" }, - { url = "https://files.pythonhosted.org/packages/0e/c9/cdcba1244347500d00567ce2cd6bf04c92d1b0fb6405fb8e13c07715eb46/backports_zstd-1.5.0-cp313-cp313-ios_13_0_arm64_iphoneos.whl", hash = "sha256:ef98f632026aa8e6ce05d786977092798efbe78677aa71219f22d31787809c90", size = 357229, upload-time = "2026-05-11T19:53:27.661Z" }, - { url = "https://files.pythonhosted.org/packages/df/da/cea04dab3ffb940bde9a59866bde6f2594a7b3ef2948a63fb3898f73d311/backports_zstd-1.5.0-cp313-cp313-ios_13_0_arm64_iphonesimulator.whl", hash = "sha256:c3712300b18f9d07f788b03594b2f34dfad89d77df96938a640c5007522a6b69", size = 365907, upload-time = "2026-05-11T19:53:29.241Z" }, - { url = "https://files.pythonhosted.org/packages/da/c4/6a71df2e65033f9b7d8017d77ea2bb572fc2ebc814ea383fdcda4187597a/backports_zstd-1.5.0-cp313-cp313-ios_13_0_x86_64_iphonesimulator.whl", hash = "sha256:bdbc75d1f54df70b65bcfbc8aa0cac21475f79665bb045960af606dc07b56090", size = 446453, upload-time = "2026-05-11T19:53:30.888Z" }, - { url = "https://files.pythonhosted.org/packages/66/e7/f98ad1a6a249c27884df9d28cf6ebc3c368e0e3288a741c1d51a572bb3d7/backports_zstd-1.5.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:93d306300d25e59f1cbe98cda494bf295be03a20e8b2c5602ee5ddc03ded29f2", size = 436634, upload-time = "2026-05-11T19:53:32.484Z" }, - { url = "https://files.pythonhosted.org/packages/ba/42/d0393ecc64e2ab6ae1b5ca7edbe26e3fe5196885f15d6cc4bce7254e29cd/backports_zstd-1.5.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:305d2e4ae9a595d0fd9d5bea5a7a2163306c6c4dcc5eec35ecd5008219d4580e", size = 362867, upload-time = "2026-05-11T19:53:34.385Z" }, - { url = "https://files.pythonhosted.org/packages/41/fe/87aa9404763bada695d06e5cb9d0575bae033cbf3a2e4e3bd648760178f7/backports_zstd-1.5.0-cp313-cp313-manylinux2010_i686.manylinux_2_12_i686.manylinux_2_28_i686.whl", hash = "sha256:c8f0967bf8d806b250fb1e905a6b8190e7ae83656d5308989243f84e01fa3774", size = 506844, upload-time = "2026-05-11T19:53:36.023Z" }, - { url = "https://files.pythonhosted.org/packages/56/94/3af7ce637d148e0b0acb1298b61afe9a934ed425bad9ff05e87afbf6766d/backports_zstd-1.5.0-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:76b7314ca9a253171e3e9524960e9e6411997323cf10aecbbc330faa7a90278d", size = 476975, upload-time = "2026-05-11T19:53:37.885Z" }, - { url = "https://files.pythonhosted.org/packages/aa/6c/dc2aa1b48296ac6effc3bacb5a3061d40ed74bf73082dfe38eed2ba8362b/backports_zstd-1.5.0-cp313-cp313-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:b1d0bf16bba86b1071731ced389f184e8de61c1afcafa584244f7f726632f92f", size = 582496, upload-time = "2026-05-11T19:53:39.812Z" }, - { url = "https://files.pythonhosted.org/packages/f6/38/dd49d3dd27eda9b165ccd63d70538fea016a3e9e42923bbbc1d89fae8a43/backports_zstd-1.5.0-cp313-cp313-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:96709d27d406008575ef759405169d538040156704b457d8c0ac035127a46b67", size = 643257, upload-time = "2026-05-11T19:53:41.819Z" }, - { url = "https://files.pythonhosted.org/packages/59/75/78e819272450aec2462f97a1bceb90bde481f9dba435bf9e76d580b4dec4/backports_zstd-1.5.0-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:5737402c29b2bd5bc661d4cde08aed531ed326f2b59a7ad98dc07650dc99a2c9", size = 491958, upload-time = "2026-05-11T19:53:43.501Z" }, - { url = "https://files.pythonhosted.org/packages/62/ae/d860f9cf21cb59d583a12166353bf71a439538e2b669f4a7736e400ca596/backports_zstd-1.5.0-cp313-cp313-manylinux_2_34_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:2b65f37ddd375114dbf84658e7dd168e10f5a93394940bfefa7fafc2d3234450", size = 567198, upload-time = "2026-05-11T19:53:45.226Z" }, - { url = "https://files.pythonhosted.org/packages/38/7c/b175d4c9ff60f964c8f6dd43211de905227cfde5a41eb5f654df58483025/backports_zstd-1.5.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:4fae7825dde4f81c28b4c66b1e997f893e296c3f1668351952b3ed085eb9f8cd", size = 482792, upload-time = "2026-05-11T19:53:47.323Z" }, - { url = "https://files.pythonhosted.org/packages/eb/e3/f7b50cf891a10da5f9c412ed4a9c4a772df4d4186d98a41e75c9b462f148/backports_zstd-1.5.0-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:3aa10e77c0e712d2dfb950910b50591c2fb11f0f1328814e23acc0b4950766df", size = 510363, upload-time = "2026-05-11T19:53:49.523Z" }, - { url = "https://files.pythonhosted.org/packages/be/50/e7841fd4a65661d527697a0e2dab97295868965ccd4e3e12474472719a60/backports_zstd-1.5.0-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:518b2ef54ce0fee6d29379cfd64ef66e639456f1b18943466e929b19677f135f", size = 586917, upload-time = "2026-05-11T19:53:51.741Z" }, - { url = "https://files.pythonhosted.org/packages/c6/7c/57e985dbd621f0307b8c57cabb258eb976793f2aeaf8a5bc020e15b4a793/backports_zstd-1.5.0-cp313-cp313-musllinux_1_2_riscv64.whl", hash = "sha256:673a1e5fdaa6cb0c7a967eb33066b6dd564871b3498a93e11e2972998047d11f", size = 565004, upload-time = "2026-05-11T19:53:53.774Z" }, - { url = "https://files.pythonhosted.org/packages/2f/8f/855ffcd1ee0fcf44c3fe62e36db8e7362292d450cc7c4b3f43edccbcd37a/backports_zstd-1.5.0-cp313-cp313-musllinux_1_2_s390x.whl", hash = "sha256:1277c07ff2d731586aa05aebd946a1b30184620d886a735dd5d5bf94a4a1061e", size = 633737, upload-time = "2026-05-11T19:53:56.036Z" }, - { url = "https://files.pythonhosted.org/packages/20/39/c4129a03d268699200dfebe1ccab97c7c332d2794571afb372a62e4ed098/backports_zstd-1.5.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:aff334c7c38b4aea2a899f3138a99c1d58f0686ad7815c74bff506ecf4333296", size = 496309, upload-time = "2026-05-11T19:53:57.591Z" }, - { url = "https://files.pythonhosted.org/packages/8e/33/34152316dd244dcd43d5300ded3cf6e1b46d343e4e92620c23e533fa91df/backports_zstd-1.5.0-cp313-cp313-win32.whl", hash = "sha256:b932834c4d85360f46d1e7fbf3eee1e26ba594e0eb5c3ee1281e89bc1d48d06f", size = 289560, upload-time = "2026-05-11T19:53:59.274Z" }, - { url = "https://files.pythonhosted.org/packages/71/c5/f759bc87fd77c88f4fdad2d878535fb7e9537c6a05876d206e6690bf33c6/backports_zstd-1.5.0-cp313-cp313-win_amd64.whl", hash = "sha256:c71dfbeced720326a8917a6edf921c568dc2396228c6432205c6d7e7fe7f3707", size = 314812, upload-time = "2026-05-11T19:54:00.909Z" }, - { url = "https://files.pythonhosted.org/packages/47/96/d7970dbb2fef34b549b34146090f48f41903cc7268b1ed1c7542eaa1852e/backports_zstd-1.5.0-cp313-cp313-win_arm64.whl", hash = "sha256:7b5798b20ffff71ee4620a01f56fe0b50271724b4251db08c90a069446cc4752", size = 291411, upload-time = "2026-05-11T19:54:02.541Z" }, - { url = "https://files.pythonhosted.org/packages/89/92/8e8769e1e3ebec16d39f455e317a0f137a191b1f122853d0377c660666ce/backports_zstd-1.5.0-pp311-pypy311_pp73-macosx_10_15_x86_64.whl", hash = "sha256:0ca2d4ac4901eada2cfb86fda692e5d4a1e09485d9f2ec5777dc6cd3154b3b46", size = 410809, upload-time = "2026-05-11T19:54:14.117Z" }, - { url = "https://files.pythonhosted.org/packages/63/5c/741a2923020c45b85cad4dffffcb86dbfa2d4aaed27f18ee793428ef4c24/backports_zstd-1.5.0-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:20796211a623ec6e0061cef4d7cca760e9e0a0a951bb30dc9ba89ed4a3fea5e4", size = 340342, upload-time = "2026-05-11T19:54:16.165Z" }, - { url = "https://files.pythonhosted.org/packages/c8/3b/68c4fe8a551d3f47ed75ddcf15dc7c777bb9d869fc0e0f5b7cacc9f158f5/backports_zstd-1.5.0-pp311-pypy311_pp73-manylinux2010_i686.manylinux_2_12_i686.manylinux_2_28_i686.whl", hash = "sha256:5232cd2a58c60da4ceb0e09e42dbc579b92dda4a9301a756af0c738223a23487", size = 421476, upload-time = "2026-05-11T19:54:17.709Z" }, - { url = "https://files.pythonhosted.org/packages/a8/4d/ab5dcd6ab9a7ac02ec42c4507211da7dadb9498abb655115c296077e2b8b/backports_zstd-1.5.0-pp311-pypy311_pp73-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:012d88a9ae08f331e1adc03dfbda4ff2ae7f76ea62455975827b215677a11aec", size = 395020, upload-time = "2026-05-11T19:54:19.566Z" }, - { url = "https://files.pythonhosted.org/packages/55/aa/ec512a0d14552bbb4e75693f7065434b865956abd045ceb67f0574146241/backports_zstd-1.5.0-pp311-pypy311_pp73-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:cbb7d79f8e43b6e0e17616961e425b9f8b32d9933e1db69242baa6e21f44a978", size = 414985, upload-time = "2026-05-11T19:54:21.136Z" }, - { url = "https://files.pythonhosted.org/packages/aa/31/759d077aa680555e17c9d2bb09edf4c3428d895fe5d35a8df67684401b84/backports_zstd-1.5.0-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:6172dcdd664ef243e55a35e6b45f1c866767c61043f0ddcd908abd14df662065", size = 300853, upload-time = "2026-05-11T19:54:23.1Z" }, +dependencies = [ + { name = "nodejs-wheel-binaries" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/7a/1a/48296b4479ccc9051eb9617a6507a69a68f5b68693fb6a118cfe08199270/basedpyright-1.39.6.tar.gz", hash = "sha256:d00ec5f8ba4e1a67dfc2fa3a9474229c89f61f207d14c02d320db78f57aa16ef", size = 25504244, upload-time = "2026-05-24T07:44:41.864Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/d4/07/6d1b3192715d42e8c9887876684a941eff28ec5d79c23a0f3758377e2182/basedpyright-1.39.6-py3-none-any.whl", hash = "sha256:5e0b9befbae6b26d0fbcc6645ac26923725e749d1224539e24f05ab07f9365ad", size = 13182122, upload-time = "2026-05-24T07:44:47.086Z" }, ] [[package]] @@ -352,36 +278,6 @@ version = "1.2.0" source = { registry = "https://pypi.org/simple" } sdist = { url = "https://files.pythonhosted.org/packages/f7/16/c92ca344d646e71a43b8bb353f0a6490d7f6e06210f8554c8f874e454285/brotli-1.2.0.tar.gz", hash = "sha256:e310f77e41941c13340a95976fe66a8a95b01e783d430eeaf7a2f87e0a57dd0a", size = 7388632, upload-time = "2025-11-05T18:39:42.86Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/7a/ef/f285668811a9e1ddb47a18cb0b437d5fc2760d537a2fe8a57875ad6f8448/brotli-1.2.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:15b33fe93cedc4caaff8a0bd1eb7e3dab1c61bb22a0bf5bdfdfd97cd7da79744", size = 863110, upload-time = "2025-11-05T18:38:12.978Z" }, - { url = "https://files.pythonhosted.org/packages/50/62/a3b77593587010c789a9d6eaa527c79e0848b7b860402cc64bc0bc28a86c/brotli-1.2.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:898be2be399c221d2671d29eed26b6b2713a02c2119168ed914e7d00ceadb56f", size = 445438, upload-time = "2025-11-05T18:38:14.208Z" }, - { url = "https://files.pythonhosted.org/packages/cd/e1/7fadd47f40ce5549dc44493877db40292277db373da5053aff181656e16e/brotli-1.2.0-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:350c8348f0e76fff0a0fd6c26755d2653863279d086d3aa2c290a6a7251135dd", size = 1534420, upload-time = "2025-11-05T18:38:15.111Z" }, - { url = "https://files.pythonhosted.org/packages/12/8b/1ed2f64054a5a008a4ccd2f271dbba7a5fb1a3067a99f5ceadedd4c1d5a7/brotli-1.2.0-cp311-cp311-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:2e1ad3fda65ae0d93fec742a128d72e145c9c7a99ee2fcd667785d99eb25a7fe", size = 1632619, upload-time = "2025-11-05T18:38:16.094Z" }, - { url = "https://files.pythonhosted.org/packages/89/5a/7071a621eb2d052d64efd5da2ef55ecdac7c3b0c6e4f9d519e9c66d987ef/brotli-1.2.0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:40d918bce2b427a0c4ba189df7a006ac0c7277c180aee4617d99e9ccaaf59e6a", size = 1426014, upload-time = "2025-11-05T18:38:17.177Z" }, - { url = "https://files.pythonhosted.org/packages/26/6d/0971a8ea435af5156acaaccec1a505f981c9c80227633851f2810abd252a/brotli-1.2.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:2a7f1d03727130fc875448b65b127a9ec5d06d19d0148e7554384229706f9d1b", size = 1489661, upload-time = "2025-11-05T18:38:18.41Z" }, - { url = "https://files.pythonhosted.org/packages/f3/75/c1baca8b4ec6c96a03ef8230fab2a785e35297632f402ebb1e78a1e39116/brotli-1.2.0-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:9c79f57faa25d97900bfb119480806d783fba83cd09ee0b33c17623935b05fa3", size = 1599150, upload-time = "2025-11-05T18:38:19.792Z" }, - { url = "https://files.pythonhosted.org/packages/0d/1a/23fcfee1c324fd48a63d7ebf4bac3a4115bdb1b00e600f80f727d850b1ae/brotli-1.2.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:844a8ceb8483fefafc412f85c14f2aae2fb69567bf2a0de53cdb88b73e7c43ae", size = 1493505, upload-time = "2025-11-05T18:38:20.913Z" }, - { url = "https://files.pythonhosted.org/packages/36/e5/12904bbd36afeef53d45a84881a4810ae8810ad7e328a971ebbfd760a0b3/brotli-1.2.0-cp311-cp311-win32.whl", hash = "sha256:aa47441fa3026543513139cb8926a92a8e305ee9c71a6209ef7a97d91640ea03", size = 334451, upload-time = "2025-11-05T18:38:21.94Z" }, - { url = "https://files.pythonhosted.org/packages/02/8b/ecb5761b989629a4758c394b9301607a5880de61ee2ee5fe104b87149ebc/brotli-1.2.0-cp311-cp311-win_amd64.whl", hash = "sha256:022426c9e99fd65d9475dce5c195526f04bb8be8907607e27e747893f6ee3e24", size = 369035, upload-time = "2025-11-05T18:38:22.941Z" }, - { url = "https://files.pythonhosted.org/packages/11/ee/b0a11ab2315c69bb9b45a2aaed022499c9c24a205c3a49c3513b541a7967/brotli-1.2.0-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:35d382625778834a7f3061b15423919aa03e4f5da34ac8e02c074e4b75ab4f84", size = 861543, upload-time = "2025-11-05T18:38:24.183Z" }, - { url = "https://files.pythonhosted.org/packages/e1/2f/29c1459513cd35828e25531ebfcbf3e92a5e49f560b1777a9af7203eb46e/brotli-1.2.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:7a61c06b334bd99bc5ae84f1eeb36bfe01400264b3c352f968c6e30a10f9d08b", size = 444288, upload-time = "2025-11-05T18:38:25.139Z" }, - { url = "https://files.pythonhosted.org/packages/3d/6f/feba03130d5fceadfa3a1bb102cb14650798c848b1df2a808356f939bb16/brotli-1.2.0-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:acec55bb7c90f1dfc476126f9711a8e81c9af7fb617409a9ee2953115343f08d", size = 1528071, upload-time = "2025-11-05T18:38:26.081Z" }, - { url = "https://files.pythonhosted.org/packages/2b/38/f3abb554eee089bd15471057ba85f47e53a44a462cfce265d9bf7088eb09/brotli-1.2.0-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:260d3692396e1895c5034f204f0db022c056f9e2ac841593a4cf9426e2a3faca", size = 1626913, upload-time = "2025-11-05T18:38:27.284Z" }, - { url = "https://files.pythonhosted.org/packages/03/a7/03aa61fbc3c5cbf99b44d158665f9b0dd3d8059be16c460208d9e385c837/brotli-1.2.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:072e7624b1fc4d601036ab3f4f27942ef772887e876beff0301d261210bca97f", size = 1419762, upload-time = "2025-11-05T18:38:28.295Z" }, - { url = "https://files.pythonhosted.org/packages/21/1b/0374a89ee27d152a5069c356c96b93afd1b94eae83f1e004b57eb6ce2f10/brotli-1.2.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:adedc4a67e15327dfdd04884873c6d5a01d3e3b6f61406f99b1ed4865a2f6d28", size = 1484494, upload-time = "2025-11-05T18:38:29.29Z" }, - { url = "https://files.pythonhosted.org/packages/cf/57/69d4fe84a67aef4f524dcd075c6eee868d7850e85bf01d778a857d8dbe0a/brotli-1.2.0-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:7a47ce5c2288702e09dc22a44d0ee6152f2c7eda97b3c8482d826a1f3cfc7da7", size = 1593302, upload-time = "2025-11-05T18:38:30.639Z" }, - { url = "https://files.pythonhosted.org/packages/d5/3b/39e13ce78a8e9a621c5df3aeb5fd181fcc8caba8c48a194cd629771f6828/brotli-1.2.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:af43b8711a8264bb4e7d6d9a6d004c3a2019c04c01127a868709ec29962b6036", size = 1487913, upload-time = "2025-11-05T18:38:31.618Z" }, - { url = "https://files.pythonhosted.org/packages/62/28/4d00cb9bd76a6357a66fcd54b4b6d70288385584063f4b07884c1e7286ac/brotli-1.2.0-cp312-cp312-win32.whl", hash = "sha256:e99befa0b48f3cd293dafeacdd0d191804d105d279e0b387a32054c1180f3161", size = 334362, upload-time = "2025-11-05T18:38:32.939Z" }, - { url = "https://files.pythonhosted.org/packages/1c/4e/bc1dcac9498859d5e353c9b153627a3752868a9d5f05ce8dedd81a2354ab/brotli-1.2.0-cp312-cp312-win_amd64.whl", hash = "sha256:b35c13ce241abdd44cb8ca70683f20c0c079728a36a996297adb5334adfc1c44", size = 369115, upload-time = "2025-11-05T18:38:33.765Z" }, - { url = "https://files.pythonhosted.org/packages/6c/d4/4ad5432ac98c73096159d9ce7ffeb82d151c2ac84adcc6168e476bb54674/brotli-1.2.0-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:9e5825ba2c9998375530504578fd4d5d1059d09621a02065d1b6bfc41a8e05ab", size = 861523, upload-time = "2025-11-05T18:38:34.67Z" }, - { url = "https://files.pythonhosted.org/packages/91/9f/9cc5bd03ee68a85dc4bc89114f7067c056a3c14b3d95f171918c088bf88d/brotli-1.2.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:0cf8c3b8ba93d496b2fae778039e2f5ecc7cff99df84df337ca31d8f2252896c", size = 444289, upload-time = "2025-11-05T18:38:35.6Z" }, - { url = "https://files.pythonhosted.org/packages/2e/b6/fe84227c56a865d16a6614e2c4722864b380cb14b13f3e6bef441e73a85a/brotli-1.2.0-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:c8565e3cdc1808b1a34714b553b262c5de5fbda202285782173ec137fd13709f", size = 1528076, upload-time = "2025-11-05T18:38:36.639Z" }, - { url = "https://files.pythonhosted.org/packages/55/de/de4ae0aaca06c790371cf6e7ee93a024f6b4bb0568727da8c3de112e726c/brotli-1.2.0-cp313-cp313-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:26e8d3ecb0ee458a9804f47f21b74845cc823fd1bb19f02272be70774f56e2a6", size = 1626880, upload-time = "2025-11-05T18:38:37.623Z" }, - { url = "https://files.pythonhosted.org/packages/5f/16/a1b22cbea436642e071adcaf8d4b350a2ad02f5e0ad0da879a1be16188a0/brotli-1.2.0-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:67a91c5187e1eec76a61625c77a6c8c785650f5b576ca732bd33ef58b0dff49c", size = 1419737, upload-time = "2025-11-05T18:38:38.729Z" }, - { url = "https://files.pythonhosted.org/packages/46/63/c968a97cbb3bdbf7f974ef5a6ab467a2879b82afbc5ffb65b8acbb744f95/brotli-1.2.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:4ecdb3b6dc36e6d6e14d3a1bdc6c1057c8cbf80db04031d566eb6080ce283a48", size = 1484440, upload-time = "2025-11-05T18:38:39.916Z" }, - { url = "https://files.pythonhosted.org/packages/06/9d/102c67ea5c9fc171f423e8399e585dabea29b5bc79b05572891e70013cdd/brotli-1.2.0-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:3e1b35d56856f3ed326b140d3c6d9db91740f22e14b06e840fe4bb1923439a18", size = 1593313, upload-time = "2025-11-05T18:38:41.24Z" }, - { url = "https://files.pythonhosted.org/packages/9e/4a/9526d14fa6b87bc827ba1755a8440e214ff90de03095cacd78a64abe2b7d/brotli-1.2.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:54a50a9dad16b32136b2241ddea9e4df159b41247b2ce6aac0b3276a66a8f1e5", size = 1487945, upload-time = "2025-11-05T18:38:42.277Z" }, - { url = "https://files.pythonhosted.org/packages/5b/e8/3fe1ffed70cbef83c5236166acaed7bb9c766509b157854c80e2f766b38c/brotli-1.2.0-cp313-cp313-win32.whl", hash = "sha256:1b1d6a4efedd53671c793be6dd760fcf2107da3a52331ad9ea429edf0902f27a", size = 334368, upload-time = "2025-11-05T18:38:43.345Z" }, - { url = "https://files.pythonhosted.org/packages/ff/91/e739587be970a113b37b821eae8097aac5a48e5f0eca438c22e4c7dd8648/brotli-1.2.0-cp313-cp313-win_amd64.whl", hash = "sha256:b63daa43d82f0cdabf98dee215b375b4058cce72871fd07934f179885aad16e8", size = 369116, upload-time = "2025-11-05T18:38:44.609Z" }, { url = "https://files.pythonhosted.org/packages/17/e1/298c2ddf786bb7347a1cd71d63a347a79e5712a7c0cba9e3c3458ebd976f/brotli-1.2.0-cp314-cp314-macosx_10_15_universal2.whl", hash = "sha256:6c12dad5cd04530323e723787ff762bac749a7b256a5bece32b2243dd5c27b21", size = 863080, upload-time = "2025-11-05T18:38:45.503Z" }, { url = "https://files.pythonhosted.org/packages/84/0c/aac98e286ba66868b2b3b50338ffbd85a35c7122e9531a73a37a29763d38/brotli-1.2.0-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:3219bd9e69868e57183316ee19c84e03e8f8b5a1d1f2667e1aa8c2f91cb061ac", size = 445453, upload-time = "2025-11-05T18:38:46.433Z" }, { url = "https://files.pythonhosted.org/packages/ec/f1/0ca1f3f99ae300372635ab3fe2f7a79fa335fee3d874fa7f9e68575e0e62/brotli-1.2.0-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:963a08f3bebd8b75ac57661045402da15991468a621f014be54e50f53a58d19e", size = 1528168, upload-time = "2025-11-05T18:38:47.371Z" }, @@ -413,10 +309,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/99/39/e7410db7f6f56de57744ea52a115084ceb2735f4d44973f349bb92136586/brotlicffi-1.2.0.1-cp38-abi3-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:6f3314a3476f59e5443f9f72a6dff16edc0c3463c9b318feaef04ae3e4683f5a", size = 1536838, upload-time = "2026-03-05T19:54:00.705Z" }, { url = "https://files.pythonhosted.org/packages/a6/75/6e7977d1935fc3fbb201cbd619be8f2c7aea25d40a096967132854b34708/brotlicffi-1.2.0.1-cp38-abi3-win32.whl", hash = "sha256:82ea52e2b5d3145b6c406ebd3efb0d55db718b7ad996bd70c62cec0439de1187", size = 343337, upload-time = "2026-03-05T19:54:02.446Z" }, { url = "https://files.pythonhosted.org/packages/d8/ef/e7e485ce5e4ba3843a0a92feb767c7b6098fd6e65ce752918074d175ae71/brotlicffi-1.2.0.1-cp38-abi3-win_amd64.whl", hash = "sha256:da2e82a08e7778b8bc539d27ca03cdd684113e81394bfaaad8d0dfc6a17ddede", size = 379026, upload-time = "2026-03-05T19:54:04.322Z" }, - { url = "https://files.pythonhosted.org/packages/7f/53/6262c2256513e6f530d81642477cb19367270922063eaa2d7b781d8c723d/brotlicffi-1.2.0.1-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:e015af99584c6db1490a69a210c765953e473e63adc2d891ac3062a737c9e851", size = 402265, upload-time = "2026-03-05T19:54:05.858Z" }, - { url = "https://files.pythonhosted.org/packages/1f/d9/d5340b43cf5fbe7fe5a083d237e5338cc1caa73bea523be1c5e452c26290/brotlicffi-1.2.0.1-pp311-pypy311_pp73-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:37cb587d32bf7168e2218c455e22e409ad1f3157c6c71945879a311f3e6b6abf", size = 406710, upload-time = "2026-03-05T19:54:07.272Z" }, - { url = "https://files.pythonhosted.org/packages/a3/82/dbced4c1e0792efdf23fd90ff6d2a320c64ff4dfef7aacc85c04fde9ddd2/brotlicffi-1.2.0.1-pp311-pypy311_pp73-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:9d6ba65dd528892b4d9960beba2ae011a753620bcfc66cf6fa3cee18d7b0baa4", size = 402787, upload-time = "2026-03-05T19:54:08.73Z" }, - { url = "https://files.pythonhosted.org/packages/ef/6f/534205ba7590c9a8716a614f270c5c2ec419b5b7079b3f9cd31b7b5580de/brotlicffi-1.2.0.1-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:f2a5575653b0672638ba039b82fda56854934d7a6a24d4b8b5033f73ab43cbc1", size = 375108, upload-time = "2026-03-05T19:54:10.079Z" }, ] [[package]] @@ -446,43 +338,6 @@ dependencies = [ ] sdist = { url = "https://files.pythonhosted.org/packages/eb/56/b1ba7935a17738ae8453301356628e8147c79dbb825bcbc73dc7401f9846/cffi-2.0.0.tar.gz", hash = "sha256:44d1b5909021139fe36001ae048dbdde8214afa20200eda0f64c068cac5d5529", size = 523588, upload-time = "2025-09-08T23:24:04.541Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/12/4a/3dfd5f7850cbf0d06dc84ba9aa00db766b52ca38d8b86e3a38314d52498c/cffi-2.0.0-cp311-cp311-macosx_10_13_x86_64.whl", hash = "sha256:b4c854ef3adc177950a8dfc81a86f5115d2abd545751a304c5bcf2c2c7283cfe", size = 184344, upload-time = "2025-09-08T23:22:26.456Z" }, - { url = "https://files.pythonhosted.org/packages/4f/8b/f0e4c441227ba756aafbe78f117485b25bb26b1c059d01f137fa6d14896b/cffi-2.0.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:2de9a304e27f7596cd03d16f1b7c72219bd944e99cc52b84d0145aefb07cbd3c", size = 180560, upload-time = "2025-09-08T23:22:28.197Z" }, - { url = "https://files.pythonhosted.org/packages/b1/b7/1200d354378ef52ec227395d95c2576330fd22a869f7a70e88e1447eb234/cffi-2.0.0-cp311-cp311-manylinux1_i686.manylinux2014_i686.manylinux_2_17_i686.manylinux_2_5_i686.whl", hash = "sha256:baf5215e0ab74c16e2dd324e8ec067ef59e41125d3eade2b863d294fd5035c92", size = 209613, upload-time = "2025-09-08T23:22:29.475Z" }, - { url = "https://files.pythonhosted.org/packages/b8/56/6033f5e86e8cc9bb629f0077ba71679508bdf54a9a5e112a3c0b91870332/cffi-2.0.0-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:730cacb21e1bdff3ce90babf007d0a0917cc3e6492f336c2f0134101e0944f93", size = 216476, upload-time = "2025-09-08T23:22:31.063Z" }, - { url = "https://files.pythonhosted.org/packages/dc/7f/55fecd70f7ece178db2f26128ec41430d8720f2d12ca97bf8f0a628207d5/cffi-2.0.0-cp311-cp311-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:6824f87845e3396029f3820c206e459ccc91760e8fa24422f8b0c3d1731cbec5", size = 203374, upload-time = "2025-09-08T23:22:32.507Z" }, - { url = "https://files.pythonhosted.org/packages/84/ef/a7b77c8bdc0f77adc3b46888f1ad54be8f3b7821697a7b89126e829e676a/cffi-2.0.0-cp311-cp311-manylinux2014_s390x.manylinux_2_17_s390x.whl", hash = "sha256:9de40a7b0323d889cf8d23d1ef214f565ab154443c42737dfe52ff82cf857664", size = 202597, upload-time = "2025-09-08T23:22:34.132Z" }, - { url = "https://files.pythonhosted.org/packages/d7/91/500d892b2bf36529a75b77958edfcd5ad8e2ce4064ce2ecfeab2125d72d1/cffi-2.0.0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:8941aaadaf67246224cee8c3803777eed332a19d909b47e29c9842ef1e79ac26", size = 215574, upload-time = "2025-09-08T23:22:35.443Z" }, - { url = "https://files.pythonhosted.org/packages/44/64/58f6255b62b101093d5df22dcb752596066c7e89dd725e0afaed242a61be/cffi-2.0.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:a05d0c237b3349096d3981b727493e22147f934b20f6f125a3eba8f994bec4a9", size = 218971, upload-time = "2025-09-08T23:22:36.805Z" }, - { url = "https://files.pythonhosted.org/packages/ab/49/fa72cebe2fd8a55fbe14956f9970fe8eb1ac59e5df042f603ef7c8ba0adc/cffi-2.0.0-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:94698a9c5f91f9d138526b48fe26a199609544591f859c870d477351dc7b2414", size = 211972, upload-time = "2025-09-08T23:22:38.436Z" }, - { url = "https://files.pythonhosted.org/packages/0b/28/dd0967a76aab36731b6ebfe64dec4e981aff7e0608f60c2d46b46982607d/cffi-2.0.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:5fed36fccc0612a53f1d4d9a816b50a36702c28a2aa880cb8a122b3466638743", size = 217078, upload-time = "2025-09-08T23:22:39.776Z" }, - { url = "https://files.pythonhosted.org/packages/2b/c0/015b25184413d7ab0a410775fdb4a50fca20f5589b5dab1dbbfa3baad8ce/cffi-2.0.0-cp311-cp311-win32.whl", hash = "sha256:c649e3a33450ec82378822b3dad03cc228b8f5963c0c12fc3b1e0ab940f768a5", size = 172076, upload-time = "2025-09-08T23:22:40.95Z" }, - { url = "https://files.pythonhosted.org/packages/ae/8f/dc5531155e7070361eb1b7e4c1a9d896d0cb21c49f807a6c03fd63fc877e/cffi-2.0.0-cp311-cp311-win_amd64.whl", hash = "sha256:66f011380d0e49ed280c789fbd08ff0d40968ee7b665575489afa95c98196ab5", size = 182820, upload-time = "2025-09-08T23:22:42.463Z" }, - { url = "https://files.pythonhosted.org/packages/95/5c/1b493356429f9aecfd56bc171285a4c4ac8697f76e9bbbbb105e537853a1/cffi-2.0.0-cp311-cp311-win_arm64.whl", hash = "sha256:c6638687455baf640e37344fe26d37c404db8b80d037c3d29f58fe8d1c3b194d", size = 177635, upload-time = "2025-09-08T23:22:43.623Z" }, - { url = "https://files.pythonhosted.org/packages/ea/47/4f61023ea636104d4f16ab488e268b93008c3d0bb76893b1b31db1f96802/cffi-2.0.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:6d02d6655b0e54f54c4ef0b94eb6be0607b70853c45ce98bd278dc7de718be5d", size = 185271, upload-time = "2025-09-08T23:22:44.795Z" }, - { url = "https://files.pythonhosted.org/packages/df/a2/781b623f57358e360d62cdd7a8c681f074a71d445418a776eef0aadb4ab4/cffi-2.0.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:8eca2a813c1cb7ad4fb74d368c2ffbbb4789d377ee5bb8df98373c2cc0dee76c", size = 181048, upload-time = "2025-09-08T23:22:45.938Z" }, - { url = "https://files.pythonhosted.org/packages/ff/df/a4f0fbd47331ceeba3d37c2e51e9dfc9722498becbeec2bd8bc856c9538a/cffi-2.0.0-cp312-cp312-manylinux1_i686.manylinux2014_i686.manylinux_2_17_i686.manylinux_2_5_i686.whl", hash = "sha256:21d1152871b019407d8ac3985f6775c079416c282e431a4da6afe7aefd2bccbe", size = 212529, upload-time = "2025-09-08T23:22:47.349Z" }, - { url = "https://files.pythonhosted.org/packages/d5/72/12b5f8d3865bf0f87cf1404d8c374e7487dcf097a1c91c436e72e6badd83/cffi-2.0.0-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:b21e08af67b8a103c71a250401c78d5e0893beff75e28c53c98f4de42f774062", size = 220097, upload-time = "2025-09-08T23:22:48.677Z" }, - { url = "https://files.pythonhosted.org/packages/c2/95/7a135d52a50dfa7c882ab0ac17e8dc11cec9d55d2c18dda414c051c5e69e/cffi-2.0.0-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:1e3a615586f05fc4065a8b22b8152f0c1b00cdbc60596d187c2a74f9e3036e4e", size = 207983, upload-time = "2025-09-08T23:22:50.06Z" }, - { url = "https://files.pythonhosted.org/packages/3a/c8/15cb9ada8895957ea171c62dc78ff3e99159ee7adb13c0123c001a2546c1/cffi-2.0.0-cp312-cp312-manylinux2014_s390x.manylinux_2_17_s390x.whl", hash = "sha256:81afed14892743bbe14dacb9e36d9e0e504cd204e0b165062c488942b9718037", size = 206519, upload-time = "2025-09-08T23:22:51.364Z" }, - { url = "https://files.pythonhosted.org/packages/78/2d/7fa73dfa841b5ac06c7b8855cfc18622132e365f5b81d02230333ff26e9e/cffi-2.0.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:3e17ed538242334bf70832644a32a7aae3d83b57567f9fd60a26257e992b79ba", size = 219572, upload-time = "2025-09-08T23:22:52.902Z" }, - { url = "https://files.pythonhosted.org/packages/07/e0/267e57e387b4ca276b90f0434ff88b2c2241ad72b16d31836adddfd6031b/cffi-2.0.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:3925dd22fa2b7699ed2617149842d2e6adde22b262fcbfada50e3d195e4b3a94", size = 222963, upload-time = "2025-09-08T23:22:54.518Z" }, - { url = "https://files.pythonhosted.org/packages/b6/75/1f2747525e06f53efbd878f4d03bac5b859cbc11c633d0fb81432d98a795/cffi-2.0.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:2c8f814d84194c9ea681642fd164267891702542f028a15fc97d4674b6206187", size = 221361, upload-time = "2025-09-08T23:22:55.867Z" }, - { url = "https://files.pythonhosted.org/packages/7b/2b/2b6435f76bfeb6bbf055596976da087377ede68df465419d192acf00c437/cffi-2.0.0-cp312-cp312-win32.whl", hash = "sha256:da902562c3e9c550df360bfa53c035b2f241fed6d9aef119048073680ace4a18", size = 172932, upload-time = "2025-09-08T23:22:57.188Z" }, - { url = "https://files.pythonhosted.org/packages/f8/ed/13bd4418627013bec4ed6e54283b1959cf6db888048c7cf4b4c3b5b36002/cffi-2.0.0-cp312-cp312-win_amd64.whl", hash = "sha256:da68248800ad6320861f129cd9c1bf96ca849a2771a59e0344e88681905916f5", size = 183557, upload-time = "2025-09-08T23:22:58.351Z" }, - { url = "https://files.pythonhosted.org/packages/95/31/9f7f93ad2f8eff1dbc1c3656d7ca5bfd8fb52c9d786b4dcf19b2d02217fa/cffi-2.0.0-cp312-cp312-win_arm64.whl", hash = "sha256:4671d9dd5ec934cb9a73e7ee9676f9362aba54f7f34910956b84d727b0d73fb6", size = 177762, upload-time = "2025-09-08T23:22:59.668Z" }, - { url = "https://files.pythonhosted.org/packages/4b/8d/a0a47a0c9e413a658623d014e91e74a50cdd2c423f7ccfd44086ef767f90/cffi-2.0.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:00bdf7acc5f795150faa6957054fbbca2439db2f775ce831222b66f192f03beb", size = 185230, upload-time = "2025-09-08T23:23:00.879Z" }, - { url = "https://files.pythonhosted.org/packages/4a/d2/a6c0296814556c68ee32009d9c2ad4f85f2707cdecfd7727951ec228005d/cffi-2.0.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:45d5e886156860dc35862657e1494b9bae8dfa63bf56796f2fb56e1679fc0bca", size = 181043, upload-time = "2025-09-08T23:23:02.231Z" }, - { url = "https://files.pythonhosted.org/packages/b0/1e/d22cc63332bd59b06481ceaac49d6c507598642e2230f201649058a7e704/cffi-2.0.0-cp313-cp313-manylinux1_i686.manylinux2014_i686.manylinux_2_17_i686.manylinux_2_5_i686.whl", hash = "sha256:07b271772c100085dd28b74fa0cd81c8fb1a3ba18b21e03d7c27f3436a10606b", size = 212446, upload-time = "2025-09-08T23:23:03.472Z" }, - { url = "https://files.pythonhosted.org/packages/a9/f5/a2c23eb03b61a0b8747f211eb716446c826ad66818ddc7810cc2cc19b3f2/cffi-2.0.0-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:d48a880098c96020b02d5a1f7d9251308510ce8858940e6fa99ece33f610838b", size = 220101, upload-time = "2025-09-08T23:23:04.792Z" }, - { url = "https://files.pythonhosted.org/packages/f2/7f/e6647792fc5850d634695bc0e6ab4111ae88e89981d35ac269956605feba/cffi-2.0.0-cp313-cp313-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:f93fd8e5c8c0a4aa1f424d6173f14a892044054871c771f8566e4008eaa359d2", size = 207948, upload-time = "2025-09-08T23:23:06.127Z" }, - { url = "https://files.pythonhosted.org/packages/cb/1e/a5a1bd6f1fb30f22573f76533de12a00bf274abcdc55c8edab639078abb6/cffi-2.0.0-cp313-cp313-manylinux2014_s390x.manylinux_2_17_s390x.whl", hash = "sha256:dd4f05f54a52fb558f1ba9f528228066954fee3ebe629fc1660d874d040ae5a3", size = 206422, upload-time = "2025-09-08T23:23:07.753Z" }, - { url = "https://files.pythonhosted.org/packages/98/df/0a1755e750013a2081e863e7cd37e0cdd02664372c754e5560099eb7aa44/cffi-2.0.0-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:c8d3b5532fc71b7a77c09192b4a5a200ea992702734a2e9279a37f2478236f26", size = 219499, upload-time = "2025-09-08T23:23:09.648Z" }, - { url = "https://files.pythonhosted.org/packages/50/e1/a969e687fcf9ea58e6e2a928ad5e2dd88cc12f6f0ab477e9971f2309b57c/cffi-2.0.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:d9b29c1f0ae438d5ee9acb31cadee00a58c46cc9c0b2f9038c6b0b3470877a8c", size = 222928, upload-time = "2025-09-08T23:23:10.928Z" }, - { url = "https://files.pythonhosted.org/packages/36/54/0362578dd2c9e557a28ac77698ed67323ed5b9775ca9d3fe73fe191bb5d8/cffi-2.0.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:6d50360be4546678fc1b79ffe7a66265e28667840010348dd69a314145807a1b", size = 221302, upload-time = "2025-09-08T23:23:12.42Z" }, - { url = "https://files.pythonhosted.org/packages/eb/6d/bf9bda840d5f1dfdbf0feca87fbdb64a918a69bca42cfa0ba7b137c48cb8/cffi-2.0.0-cp313-cp313-win32.whl", hash = "sha256:74a03b9698e198d47562765773b4a8309919089150a0bb17d829ad7b44b60d27", size = 172909, upload-time = "2025-09-08T23:23:14.32Z" }, - { url = "https://files.pythonhosted.org/packages/37/18/6519e1ee6f5a1e579e04b9ddb6f1676c17368a7aba48299c3759bbc3c8b3/cffi-2.0.0-cp313-cp313-win_amd64.whl", hash = "sha256:19f705ada2530c1167abacb171925dd886168931e0a7b78f5bffcae5c6b5be75", size = 183402, upload-time = "2025-09-08T23:23:15.535Z" }, - { url = "https://files.pythonhosted.org/packages/cb/0e/02ceeec9a7d6ee63bb596121c2c8e9b3a9e150936f4fbef6ca1943e6137c/cffi-2.0.0-cp313-cp313-win_arm64.whl", hash = "sha256:256f80b80ca3853f90c21b23ee78cd008713787b1b1e93eae9f3d6a7134abd91", size = 177780, upload-time = "2025-09-08T23:23:16.761Z" }, { url = "https://files.pythonhosted.org/packages/92/c4/3ce07396253a83250ee98564f8d7e9789fab8e58858f35d07a9a2c78de9f/cffi-2.0.0-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:fc33c5141b55ed366cfaad382df24fe7dcbc686de5be719b207bb248e3053dc5", size = 185320, upload-time = "2025-09-08T23:23:18.087Z" }, { url = "https://files.pythonhosted.org/packages/59/dd/27e9fa567a23931c838c6b02d0764611c62290062a6d4e8ff7863daf9730/cffi-2.0.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:c654de545946e0db659b3400168c9ad31b5d29593291482c43e3564effbcee13", size = 181487, upload-time = "2025-09-08T23:23:19.622Z" }, { url = "https://files.pythonhosted.org/packages/d6/43/0e822876f87ea8a4ef95442c3d766a06a51fc5298823f884ef87aaad168c/cffi-2.0.0-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:24b6f81f1983e6df8db3adc38562c83f7d4a0c36162885ec7f7b77c7dcbec97b", size = 220049, upload-time = "2025-09-08T23:23:20.853Z" }, @@ -513,54 +368,6 @@ version = "3.4.7" source = { registry = "https://pypi.org/simple" } sdist = { url = "https://files.pythonhosted.org/packages/e7/a1/67fe25fac3c7642725500a3f6cfe5821ad557c3abb11c9d20d12c7008d3e/charset_normalizer-3.4.7.tar.gz", hash = "sha256:ae89db9e5f98a11a4bf50407d4363e7b09b31e55bc117b4f7d80aab97ba009e5", size = 144271, upload-time = "2026-04-02T09:28:39.342Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/c2/d7/b5b7020a0565c2e9fa8c09f4b5fa6232feb326b8c20081ccded47ea368fd/charset_normalizer-3.4.7-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:7641bb8895e77f921102f72833904dcd9901df5d6d72a2ab8f31d04b7e51e4e7", size = 309705, upload-time = "2026-04-02T09:26:02.191Z" }, - { url = "https://files.pythonhosted.org/packages/5a/53/58c29116c340e5456724ecd2fff4196d236b98f3da97b404bc5e51ac3493/charset_normalizer-3.4.7-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:202389074300232baeb53ae2569a60901f7efadd4245cf3a3bf0617d60b439d7", size = 206419, upload-time = "2026-04-02T09:26:03.583Z" }, - { url = "https://files.pythonhosted.org/packages/b2/02/e8146dc6591a37a00e5144c63f29fb7c97a734ea8a111190783c0e60ab63/charset_normalizer-3.4.7-cp311-cp311-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:30b8d1d8c52a48c2c5690e152c169b673487a2a58de1ec7393196753063fcd5e", size = 227901, upload-time = "2026-04-02T09:26:04.738Z" }, - { url = "https://files.pythonhosted.org/packages/fb/73/77486c4cd58f1267bf17db420e930c9afa1b3be3fe8c8b8ebbebc9624359/charset_normalizer-3.4.7-cp311-cp311-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:532bc9bf33a68613fd7d65e4b1c71a6a38d7d42604ecf239c77392e9b4e8998c", size = 222742, upload-time = "2026-04-02T09:26:06.36Z" }, - { url = "https://files.pythonhosted.org/packages/a1/fa/f74eb381a7d94ded44739e9d94de18dc5edc9c17fb8c11f0a6890696c0a9/charset_normalizer-3.4.7-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:2fe249cb4651fd12605b7288b24751d8bfd46d35f12a20b1ba33dea122e690df", size = 214061, upload-time = "2026-04-02T09:26:08.347Z" }, - { url = "https://files.pythonhosted.org/packages/dc/92/42bd3cefcf7687253fb86694b45f37b733c97f59af3724f356fa92b8c344/charset_normalizer-3.4.7-cp311-cp311-manylinux_2_31_armv7l.whl", hash = "sha256:65bcd23054beab4d166035cabbc868a09c1a49d1efe458fe8e4361215df40265", size = 199239, upload-time = "2026-04-02T09:26:09.823Z" }, - { url = "https://files.pythonhosted.org/packages/4c/3d/069e7184e2aa3b3cddc700e3dd267413dc259854adc3380421c805c6a17d/charset_normalizer-3.4.7-cp311-cp311-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:08e721811161356f97b4059a9ba7bafb23ea5ee2255402c42881c214e173c6b4", size = 210173, upload-time = "2026-04-02T09:26:10.953Z" }, - { url = "https://files.pythonhosted.org/packages/62/51/9d56feb5f2e7074c46f93e0ebdbe61f0848ee246e2f0d89f8e20b89ebb8f/charset_normalizer-3.4.7-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:e060d01aec0a910bdccb8be71faf34e7799ce36950f8294c8bf612cba65a2c9e", size = 209841, upload-time = "2026-04-02T09:26:12.142Z" }, - { url = "https://files.pythonhosted.org/packages/d2/59/893d8f99cc4c837dda1fe2f1139079703deb9f321aabcb032355de13b6c7/charset_normalizer-3.4.7-cp311-cp311-musllinux_1_2_armv7l.whl", hash = "sha256:38c0109396c4cfc574d502df99742a45c72c08eff0a36158b6f04000043dbf38", size = 200304, upload-time = "2026-04-02T09:26:13.711Z" }, - { url = "https://files.pythonhosted.org/packages/7d/1d/ee6f3be3464247578d1ed5c46de545ccc3d3ff933695395c402c21fa6b77/charset_normalizer-3.4.7-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:1c2a768fdd44ee4a9339a9b0b130049139b8ce3c01d2ce09f67f5a68048d477c", size = 229455, upload-time = "2026-04-02T09:26:14.941Z" }, - { url = "https://files.pythonhosted.org/packages/54/bb/8fb0a946296ea96a488928bdce8ef99023998c48e4713af533e9bb98ef07/charset_normalizer-3.4.7-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:1a87ca9d5df6fe460483d9a5bbf2b18f620cbed41b432e2bddb686228282d10b", size = 210036, upload-time = "2026-04-02T09:26:16.478Z" }, - { url = "https://files.pythonhosted.org/packages/9a/bc/015b2387f913749f82afd4fcba07846d05b6d784dd16123cb66860e0237d/charset_normalizer-3.4.7-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:d635aab80466bc95771bb78d5370e74d36d1fe31467b6b29b8b57b2a3cd7d22c", size = 224739, upload-time = "2026-04-02T09:26:17.751Z" }, - { url = "https://files.pythonhosted.org/packages/17/ab/63133691f56baae417493cba6b7c641571a2130eb7bceba6773367ab9ec5/charset_normalizer-3.4.7-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:ae196f021b5e7c78e918242d217db021ed2a6ace2bc6ae94c0fc596221c7f58d", size = 216277, upload-time = "2026-04-02T09:26:18.981Z" }, - { url = "https://files.pythonhosted.org/packages/06/6d/3be70e827977f20db77c12a97e6a9f973631a45b8d186c084527e53e77a4/charset_normalizer-3.4.7-cp311-cp311-win32.whl", hash = "sha256:adb2597b428735679446b46c8badf467b4ca5f5056aae4d51a19f9570301b1ad", size = 147819, upload-time = "2026-04-02T09:26:20.295Z" }, - { url = "https://files.pythonhosted.org/packages/20/d9/5f67790f06b735d7c7637171bbfd89882ad67201891b7275e51116ed8207/charset_normalizer-3.4.7-cp311-cp311-win_amd64.whl", hash = "sha256:8e385e4267ab76874ae30db04c627faaaf0b509e1ccc11a95b3fc3e83f855c00", size = 159281, upload-time = "2026-04-02T09:26:21.74Z" }, - { url = "https://files.pythonhosted.org/packages/ca/83/6413f36c5a34afead88ce6f66684d943d91f233d76dd083798f9602b75ae/charset_normalizer-3.4.7-cp311-cp311-win_arm64.whl", hash = "sha256:d4a48e5b3c2a489fae013b7589308a40146ee081f6f509e047e0e096084ceca1", size = 147843, upload-time = "2026-04-02T09:26:22.901Z" }, - { url = "https://files.pythonhosted.org/packages/0c/eb/4fc8d0a7110eb5fc9cc161723a34a8a6c200ce3b4fbf681bc86feee22308/charset_normalizer-3.4.7-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:eca9705049ad3c7345d574e3510665cb2cf844c2f2dcfe675332677f081cbd46", size = 311328, upload-time = "2026-04-02T09:26:24.331Z" }, - { url = "https://files.pythonhosted.org/packages/f8/e3/0fadc706008ac9d7b9b5be6dc767c05f9d3e5df51744ce4cc9605de7b9f4/charset_normalizer-3.4.7-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:6178f72c5508bfc5fd446a5905e698c6212932f25bcdd4b47a757a50605a90e2", size = 208061, upload-time = "2026-04-02T09:26:25.568Z" }, - { url = "https://files.pythonhosted.org/packages/42/f0/3dd1045c47f4a4604df85ec18ad093912ae1344ac706993aff91d38773a2/charset_normalizer-3.4.7-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:e1421b502d83040e6d7fb2fb18dff63957f720da3d77b2fbd3187ceb63755d7b", size = 229031, upload-time = "2026-04-02T09:26:26.865Z" }, - { url = "https://files.pythonhosted.org/packages/dc/67/675a46eb016118a2fbde5a277a5d15f4f69d5f3f5f338e5ee2f8948fcf43/charset_normalizer-3.4.7-cp312-cp312-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:edac0f1ab77644605be2cbba52e6b7f630731fc42b34cb0f634be1a6eface56a", size = 225239, upload-time = "2026-04-02T09:26:28.044Z" }, - { url = "https://files.pythonhosted.org/packages/4b/f8/d0118a2f5f23b02cd166fa385c60f9b0d4f9194f574e2b31cef350ad7223/charset_normalizer-3.4.7-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:5649fd1c7bade02f320a462fdefd0b4bd3ce036065836d4f42e0de958038e116", size = 216589, upload-time = "2026-04-02T09:26:29.239Z" }, - { url = "https://files.pythonhosted.org/packages/b1/f1/6d2b0b261b6c4ceef0fcb0d17a01cc5bc53586c2d4796fa04b5c540bc13d/charset_normalizer-3.4.7-cp312-cp312-manylinux_2_31_armv7l.whl", hash = "sha256:203104ed3e428044fd943bc4bf45fa73c0730391f9621e37fe39ecf477b128cb", size = 202733, upload-time = "2026-04-02T09:26:30.5Z" }, - { url = "https://files.pythonhosted.org/packages/6f/c0/7b1f943f7e87cc3db9626ba17807d042c38645f0a1d4415c7a14afb5591f/charset_normalizer-3.4.7-cp312-cp312-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:298930cec56029e05497a76988377cbd7457ba864beeea92ad7e844fe74cd1f1", size = 212652, upload-time = "2026-04-02T09:26:31.709Z" }, - { url = "https://files.pythonhosted.org/packages/38/dd/5a9ab159fe45c6e72079398f277b7d2b523e7f716acc489726115a910097/charset_normalizer-3.4.7-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:708838739abf24b2ceb208d0e22403dd018faeef86ddac04319a62ae884c4f15", size = 211229, upload-time = "2026-04-02T09:26:33.282Z" }, - { url = "https://files.pythonhosted.org/packages/d5/ff/531a1cad5ca855d1c1a8b69cb71abfd6d85c0291580146fda7c82857caa1/charset_normalizer-3.4.7-cp312-cp312-musllinux_1_2_armv7l.whl", hash = "sha256:0f7eb884681e3938906ed0434f20c63046eacd0111c4ba96f27b76084cd679f5", size = 203552, upload-time = "2026-04-02T09:26:34.845Z" }, - { url = "https://files.pythonhosted.org/packages/c1/4c/a5fb52d528a8ca41f7598cb619409ece30a169fbdf9cdce592e53b46c3a6/charset_normalizer-3.4.7-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:4dc1e73c36828f982bfe79fadf5919923f8a6f4df2860804db9a98c48824ce8d", size = 230806, upload-time = "2026-04-02T09:26:36.152Z" }, - { url = "https://files.pythonhosted.org/packages/59/7a/071feed8124111a32b316b33ae4de83d36923039ef8cf48120266844285b/charset_normalizer-3.4.7-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:aed52fea0513bac0ccde438c188c8a471c4e0f457c2dd20cdbf6ea7a450046c7", size = 212316, upload-time = "2026-04-02T09:26:37.672Z" }, - { url = "https://files.pythonhosted.org/packages/fd/35/f7dba3994312d7ba508e041eaac39a36b120f32d4c8662b8814dab876431/charset_normalizer-3.4.7-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:fea24543955a6a729c45a73fe90e08c743f0b3334bbf3201e6c4bc1b0c7fa464", size = 227274, upload-time = "2026-04-02T09:26:38.93Z" }, - { url = "https://files.pythonhosted.org/packages/8a/2d/a572df5c9204ab7688ec1edc895a73ebded3b023bb07364710b05dd1c9be/charset_normalizer-3.4.7-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:bb6d88045545b26da47aa879dd4a89a71d1dce0f0e549b1abcb31dfe4a8eac49", size = 218468, upload-time = "2026-04-02T09:26:40.17Z" }, - { url = "https://files.pythonhosted.org/packages/86/eb/890922a8b03a568ca2f336c36585a4713c55d4d67bf0f0c78924be6315ca/charset_normalizer-3.4.7-cp312-cp312-win32.whl", hash = "sha256:2257141f39fe65a3fdf38aeccae4b953e5f3b3324f4ff0daf9f15b8518666a2c", size = 148460, upload-time = "2026-04-02T09:26:41.416Z" }, - { url = "https://files.pythonhosted.org/packages/35/d9/0e7dffa06c5ab081f75b1b786f0aefc88365825dfcd0ac544bdb7b2b6853/charset_normalizer-3.4.7-cp312-cp312-win_amd64.whl", hash = "sha256:5ed6ab538499c8644b8a3e18debabcd7ce684f3fa91cf867521a7a0279cab2d6", size = 159330, upload-time = "2026-04-02T09:26:42.554Z" }, - { url = "https://files.pythonhosted.org/packages/9e/5d/481bcc2a7c88ea6b0878c299547843b2521ccbc40980cb406267088bc701/charset_normalizer-3.4.7-cp312-cp312-win_arm64.whl", hash = "sha256:56be790f86bfb2c98fb742ce566dfb4816e5a83384616ab59c49e0604d49c51d", size = 147828, upload-time = "2026-04-02T09:26:44.075Z" }, - { url = "https://files.pythonhosted.org/packages/c1/3b/66777e39d3ae1ddc77ee606be4ec6d8cbd4c801f65e5a1b6f2b11b8346dd/charset_normalizer-3.4.7-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:f496c9c3cc02230093d8330875c4c3cdfc3b73612a5fd921c65d39cbcef08063", size = 309627, upload-time = "2026-04-02T09:26:45.198Z" }, - { url = "https://files.pythonhosted.org/packages/2e/4e/b7f84e617b4854ade48a1b7915c8ccfadeba444d2a18c291f696e37f0d3b/charset_normalizer-3.4.7-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:0ea948db76d31190bf08bd371623927ee1339d5f2a0b4b1b4a4439a65298703c", size = 207008, upload-time = "2026-04-02T09:26:46.824Z" }, - { url = "https://files.pythonhosted.org/packages/c4/bb/ec73c0257c9e11b268f018f068f5d00aa0ef8c8b09f7753ebd5f2880e248/charset_normalizer-3.4.7-cp313-cp313-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:a277ab8928b9f299723bc1a2dabb1265911b1a76341f90a510368ca44ad9ab66", size = 228303, upload-time = "2026-04-02T09:26:48.397Z" }, - { url = "https://files.pythonhosted.org/packages/85/fb/32d1f5033484494619f701e719429c69b766bfc4dbc61aa9e9c8c166528b/charset_normalizer-3.4.7-cp313-cp313-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:3bec022aec2c514d9cf199522a802bd007cd588ab17ab2525f20f9c34d067c18", size = 224282, upload-time = "2026-04-02T09:26:49.684Z" }, - { url = "https://files.pythonhosted.org/packages/fa/07/330e3a0dda4c404d6da83b327270906e9654a24f6c546dc886a0eb0ffb23/charset_normalizer-3.4.7-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:e044c39e41b92c845bc815e5ae4230804e8e7bc29e399b0437d64222d92809dd", size = 215595, upload-time = "2026-04-02T09:26:50.915Z" }, - { url = "https://files.pythonhosted.org/packages/e3/7c/fc890655786e423f02556e0216d4b8c6bcb6bdfa890160dc66bf52dee468/charset_normalizer-3.4.7-cp313-cp313-manylinux_2_31_armv7l.whl", hash = "sha256:f495a1652cf3fbab2eb0639776dad966c2fb874d79d87ca07f9d5f059b8bd215", size = 201986, upload-time = "2026-04-02T09:26:52.197Z" }, - { url = "https://files.pythonhosted.org/packages/d8/97/bfb18b3db2aed3b90cf54dc292ad79fdd5ad65c4eae454099475cbeadd0d/charset_normalizer-3.4.7-cp313-cp313-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:e712b419df8ba5e42b226c510472b37bd57b38e897d3eca5e8cfd410a29fa859", size = 211711, upload-time = "2026-04-02T09:26:53.49Z" }, - { url = "https://files.pythonhosted.org/packages/6f/a5/a581c13798546a7fd557c82614a5c65a13df2157e9ad6373166d2a3e645d/charset_normalizer-3.4.7-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:7804338df6fcc08105c7745f1502ba68d900f45fd770d5bdd5288ddccb8a42d8", size = 210036, upload-time = "2026-04-02T09:26:54.975Z" }, - { url = "https://files.pythonhosted.org/packages/8c/bf/b3ab5bcb478e4193d517644b0fb2bf5497fbceeaa7a1bc0f4d5b50953861/charset_normalizer-3.4.7-cp313-cp313-musllinux_1_2_armv7l.whl", hash = "sha256:481551899c856c704d58119b5025793fa6730adda3571971af568f66d2424bb5", size = 202998, upload-time = "2026-04-02T09:26:56.303Z" }, - { url = "https://files.pythonhosted.org/packages/e7/4e/23efd79b65d314fa320ec6017b4b5834d5c12a58ba4610aa353af2e2f577/charset_normalizer-3.4.7-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:f59099f9b66f0d7145115e6f80dd8b1d847176df89b234a5a6b3f00437aa0832", size = 230056, upload-time = "2026-04-02T09:26:57.554Z" }, - { url = "https://files.pythonhosted.org/packages/b9/9f/1e1941bc3f0e01df116e68dc37a55c4d249df5e6fa77f008841aef68264f/charset_normalizer-3.4.7-cp313-cp313-musllinux_1_2_riscv64.whl", hash = "sha256:f59ad4c0e8f6bba240a9bb85504faa1ab438237199d4cce5f622761507b8f6a6", size = 211537, upload-time = "2026-04-02T09:26:58.843Z" }, - { url = "https://files.pythonhosted.org/packages/80/0f/088cbb3020d44428964a6c97fe1edfb1b9550396bf6d278330281e8b709c/charset_normalizer-3.4.7-cp313-cp313-musllinux_1_2_s390x.whl", hash = "sha256:3dedcc22d73ec993f42055eff4fcfed9318d1eeb9a6606c55892a26964964e48", size = 226176, upload-time = "2026-04-02T09:27:00.437Z" }, - { url = "https://files.pythonhosted.org/packages/6a/9f/130394f9bbe06f4f63e22641d32fc9b202b7e251c9aef4db044324dac493/charset_normalizer-3.4.7-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:64f02c6841d7d83f832cd97ccf8eb8a906d06eb95d5276069175c696b024b60a", size = 217723, upload-time = "2026-04-02T09:27:02.021Z" }, - { url = "https://files.pythonhosted.org/packages/73/55/c469897448a06e49f8fa03f6caae97074fde823f432a98f979cc42b90e69/charset_normalizer-3.4.7-cp313-cp313-win32.whl", hash = "sha256:4042d5c8f957e15221d423ba781e85d553722fc4113f523f2feb7b188cc34c5e", size = 148085, upload-time = "2026-04-02T09:27:03.192Z" }, - { url = "https://files.pythonhosted.org/packages/5d/78/1b74c5bbb3f99b77a1715c91b3e0b5bdb6fe302d95ace4f5b1bec37b0167/charset_normalizer-3.4.7-cp313-cp313-win_amd64.whl", hash = "sha256:3946fa46a0cf3e4c8cb1cc52f56bb536310d34f25f01ca9b6c16afa767dab110", size = 158819, upload-time = "2026-04-02T09:27:04.454Z" }, - { url = "https://files.pythonhosted.org/packages/68/86/46bd42279d323deb8687c4a5a811fd548cb7d1de10cf6535d099877a9a9f/charset_normalizer-3.4.7-cp313-cp313-win_arm64.whl", hash = "sha256:80d04837f55fc81da168b98de4f4b797ef007fc8a79ab71c6ec9bc4dd662b15b", size = 147915, upload-time = "2026-04-02T09:27:05.971Z" }, { url = "https://files.pythonhosted.org/packages/97/c8/c67cb8c70e19ef1960b97b22ed2a1567711de46c4ddf19799923adc836c2/charset_normalizer-3.4.7-cp314-cp314-macosx_10_15_universal2.whl", hash = "sha256:c36c333c39be2dbca264d7803333c896ab8fa7d4d6f0ab7edb7dfd7aea6e98c0", size = 309234, upload-time = "2026-04-02T09:27:07.194Z" }, { url = "https://files.pythonhosted.org/packages/99/85/c091fdee33f20de70d6c8b522743b6f831a2f1cd3ff86de4c6a827c48a76/charset_normalizer-3.4.7-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:1c2aed2e5e41f24ea8ef1590b8e848a79b56f3a5564a65ceec43c9d692dc7d8a", size = 208042, upload-time = "2026-04-02T09:27:08.749Z" }, { url = "https://files.pythonhosted.org/packages/87/1c/ab2ce611b984d2fd5d86a5a8a19c1ae26acac6bad967da4967562c75114d/charset_normalizer-3.4.7-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:54523e136b8948060c0fa0bc7b1b50c32c186f2fceee897a495406bb6e311d2b", size = 228706, upload-time = "2026-04-02T09:27:09.951Z" }, @@ -635,50 +442,6 @@ dependencies = [ ] sdist = { url = "https://files.pythonhosted.org/packages/58/01/1253e6698a07380cd31a736d248a3f2a50a7c88779a1813da27503cadc2a/contourpy-1.3.3.tar.gz", hash = "sha256:083e12155b210502d0bca491432bb04d56dc3432f95a979b429f2848c3dbe880", size = 13466174, upload-time = "2025-07-26T12:03:12.549Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/91/2e/c4390a31919d8a78b90e8ecf87cd4b4c4f05a5b48d05ec17db8e5404c6f4/contourpy-1.3.3-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:709a48ef9a690e1343202916450bc48b9e51c049b089c7f79a267b46cffcdaa1", size = 288773, upload-time = "2025-07-26T12:01:02.277Z" }, - { url = "https://files.pythonhosted.org/packages/0d/44/c4b0b6095fef4dc9c420e041799591e3b63e9619e3044f7f4f6c21c0ab24/contourpy-1.3.3-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:23416f38bfd74d5d28ab8429cc4d63fa67d5068bd711a85edb1c3fb0c3e2f381", size = 270149, upload-time = "2025-07-26T12:01:04.072Z" }, - { url = "https://files.pythonhosted.org/packages/30/2e/dd4ced42fefac8470661d7cb7e264808425e6c5d56d175291e93890cce09/contourpy-1.3.3-cp311-cp311-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:929ddf8c4c7f348e4c0a5a3a714b5c8542ffaa8c22954862a46ca1813b667ee7", size = 329222, upload-time = "2025-07-26T12:01:05.688Z" }, - { url = "https://files.pythonhosted.org/packages/f2/74/cc6ec2548e3d276c71389ea4802a774b7aa3558223b7bade3f25787fafc2/contourpy-1.3.3-cp311-cp311-manylinux_2_26_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:9e999574eddae35f1312c2b4b717b7885d4edd6cb46700e04f7f02db454e67c1", size = 377234, upload-time = "2025-07-26T12:01:07.054Z" }, - { url = "https://files.pythonhosted.org/packages/03/b3/64ef723029f917410f75c09da54254c5f9ea90ef89b143ccadb09df14c15/contourpy-1.3.3-cp311-cp311-manylinux_2_26_s390x.manylinux_2_28_s390x.whl", hash = "sha256:0bf67e0e3f482cb69779dd3061b534eb35ac9b17f163d851e2a547d56dba0a3a", size = 380555, upload-time = "2025-07-26T12:01:08.801Z" }, - { url = "https://files.pythonhosted.org/packages/5f/4b/6157f24ca425b89fe2eb7e7be642375711ab671135be21e6faa100f7448c/contourpy-1.3.3-cp311-cp311-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:51e79c1f7470158e838808d4a996fa9bac72c498e93d8ebe5119bc1e6becb0db", size = 355238, upload-time = "2025-07-26T12:01:10.319Z" }, - { url = "https://files.pythonhosted.org/packages/98/56/f914f0dd678480708a04cfd2206e7c382533249bc5001eb9f58aa693e200/contourpy-1.3.3-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:598c3aaece21c503615fd59c92a3598b428b2f01bfb4b8ca9c4edeecc2438620", size = 1326218, upload-time = "2025-07-26T12:01:12.659Z" }, - { url = "https://files.pythonhosted.org/packages/fb/d7/4a972334a0c971acd5172389671113ae82aa7527073980c38d5868ff1161/contourpy-1.3.3-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:322ab1c99b008dad206d406bb61d014cf0174df491ae9d9d0fac6a6fda4f977f", size = 1392867, upload-time = "2025-07-26T12:01:15.533Z" }, - { url = "https://files.pythonhosted.org/packages/75/3e/f2cc6cd56dc8cff46b1a56232eabc6feea52720083ea71ab15523daab796/contourpy-1.3.3-cp311-cp311-win32.whl", hash = "sha256:fd907ae12cd483cd83e414b12941c632a969171bf90fc937d0c9f268a31cafff", size = 183677, upload-time = "2025-07-26T12:01:17.088Z" }, - { url = "https://files.pythonhosted.org/packages/98/4b/9bd370b004b5c9d8045c6c33cf65bae018b27aca550a3f657cdc99acdbd8/contourpy-1.3.3-cp311-cp311-win_amd64.whl", hash = "sha256:3519428f6be58431c56581f1694ba8e50626f2dd550af225f82fb5f5814d2a42", size = 225234, upload-time = "2025-07-26T12:01:18.256Z" }, - { url = "https://files.pythonhosted.org/packages/d9/b6/71771e02c2e004450c12b1120a5f488cad2e4d5b590b1af8bad060360fe4/contourpy-1.3.3-cp311-cp311-win_arm64.whl", hash = "sha256:15ff10bfada4bf92ec8b31c62bf7c1834c244019b4a33095a68000d7075df470", size = 193123, upload-time = "2025-07-26T12:01:19.848Z" }, - { url = "https://files.pythonhosted.org/packages/be/45/adfee365d9ea3d853550b2e735f9d66366701c65db7855cd07621732ccfc/contourpy-1.3.3-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:b08a32ea2f8e42cf1d4be3169a98dd4be32bafe4f22b6c4cb4ba810fa9e5d2cb", size = 293419, upload-time = "2025-07-26T12:01:21.16Z" }, - { url = "https://files.pythonhosted.org/packages/53/3e/405b59cfa13021a56bba395a6b3aca8cec012b45bf177b0eaf7a202cde2c/contourpy-1.3.3-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:556dba8fb6f5d8742f2923fe9457dbdd51e1049c4a43fd3986a0b14a1d815fc6", size = 273979, upload-time = "2025-07-26T12:01:22.448Z" }, - { url = "https://files.pythonhosted.org/packages/d4/1c/a12359b9b2ca3a845e8f7f9ac08bdf776114eb931392fcad91743e2ea17b/contourpy-1.3.3-cp312-cp312-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:92d9abc807cf7d0e047b95ca5d957cf4792fcd04e920ca70d48add15c1a90ea7", size = 332653, upload-time = "2025-07-26T12:01:24.155Z" }, - { url = "https://files.pythonhosted.org/packages/63/12/897aeebfb475b7748ea67b61e045accdfcf0d971f8a588b67108ed7f5512/contourpy-1.3.3-cp312-cp312-manylinux_2_26_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:b2e8faa0ed68cb29af51edd8e24798bb661eac3bd9f65420c1887b6ca89987c8", size = 379536, upload-time = "2025-07-26T12:01:25.91Z" }, - { url = "https://files.pythonhosted.org/packages/43/8a/a8c584b82deb248930ce069e71576fc09bd7174bbd35183b7943fb1064fd/contourpy-1.3.3-cp312-cp312-manylinux_2_26_s390x.manylinux_2_28_s390x.whl", hash = "sha256:626d60935cf668e70a5ce6ff184fd713e9683fb458898e4249b63be9e28286ea", size = 384397, upload-time = "2025-07-26T12:01:27.152Z" }, - { url = "https://files.pythonhosted.org/packages/cc/8f/ec6289987824b29529d0dfda0d74a07cec60e54b9c92f3c9da4c0ac732de/contourpy-1.3.3-cp312-cp312-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:4d00e655fcef08aba35ec9610536bfe90267d7ab5ba944f7032549c55a146da1", size = 362601, upload-time = "2025-07-26T12:01:28.808Z" }, - { url = "https://files.pythonhosted.org/packages/05/0a/a3fe3be3ee2dceb3e615ebb4df97ae6f3828aa915d3e10549ce016302bd1/contourpy-1.3.3-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:451e71b5a7d597379ef572de31eeb909a87246974d960049a9848c3bc6c41bf7", size = 1331288, upload-time = "2025-07-26T12:01:31.198Z" }, - { url = "https://files.pythonhosted.org/packages/33/1d/acad9bd4e97f13f3e2b18a3977fe1b4a37ecf3d38d815333980c6c72e963/contourpy-1.3.3-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:459c1f020cd59fcfe6650180678a9993932d80d44ccde1fa1868977438f0b411", size = 1403386, upload-time = "2025-07-26T12:01:33.947Z" }, - { url = "https://files.pythonhosted.org/packages/cf/8f/5847f44a7fddf859704217a99a23a4f6417b10e5ab1256a179264561540e/contourpy-1.3.3-cp312-cp312-win32.whl", hash = "sha256:023b44101dfe49d7d53932be418477dba359649246075c996866106da069af69", size = 185018, upload-time = "2025-07-26T12:01:35.64Z" }, - { url = "https://files.pythonhosted.org/packages/19/e8/6026ed58a64563186a9ee3f29f41261fd1828f527dd93d33b60feca63352/contourpy-1.3.3-cp312-cp312-win_amd64.whl", hash = "sha256:8153b8bfc11e1e4d75bcb0bff1db232f9e10b274e0929de9d608027e0d34ff8b", size = 226567, upload-time = "2025-07-26T12:01:36.804Z" }, - { url = "https://files.pythonhosted.org/packages/d1/e2/f05240d2c39a1ed228d8328a78b6f44cd695f7ef47beb3e684cf93604f86/contourpy-1.3.3-cp312-cp312-win_arm64.whl", hash = "sha256:07ce5ed73ecdc4a03ffe3e1b3e3c1166db35ae7584be76f65dbbe28a7791b0cc", size = 193655, upload-time = "2025-07-26T12:01:37.999Z" }, - { url = "https://files.pythonhosted.org/packages/68/35/0167aad910bbdb9599272bd96d01a9ec6852f36b9455cf2ca67bd4cc2d23/contourpy-1.3.3-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:177fb367556747a686509d6fef71d221a4b198a3905fe824430e5ea0fda54eb5", size = 293257, upload-time = "2025-07-26T12:01:39.367Z" }, - { url = "https://files.pythonhosted.org/packages/96/e4/7adcd9c8362745b2210728f209bfbcf7d91ba868a2c5f40d8b58f54c509b/contourpy-1.3.3-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:d002b6f00d73d69333dac9d0b8d5e84d9724ff9ef044fd63c5986e62b7c9e1b1", size = 274034, upload-time = "2025-07-26T12:01:40.645Z" }, - { url = "https://files.pythonhosted.org/packages/73/23/90e31ceeed1de63058a02cb04b12f2de4b40e3bef5e082a7c18d9c8ae281/contourpy-1.3.3-cp313-cp313-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:348ac1f5d4f1d66d3322420f01d42e43122f43616e0f194fc1c9f5d830c5b286", size = 334672, upload-time = "2025-07-26T12:01:41.942Z" }, - { url = "https://files.pythonhosted.org/packages/ed/93/b43d8acbe67392e659e1d984700e79eb67e2acb2bd7f62012b583a7f1b55/contourpy-1.3.3-cp313-cp313-manylinux_2_26_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:655456777ff65c2c548b7c454af9c6f33f16c8884f11083244b5819cc214f1b5", size = 381234, upload-time = "2025-07-26T12:01:43.499Z" }, - { url = "https://files.pythonhosted.org/packages/46/3b/bec82a3ea06f66711520f75a40c8fc0b113b2a75edb36aa633eb11c4f50f/contourpy-1.3.3-cp313-cp313-manylinux_2_26_s390x.manylinux_2_28_s390x.whl", hash = "sha256:644a6853d15b2512d67881586bd03f462c7ab755db95f16f14d7e238f2852c67", size = 385169, upload-time = "2025-07-26T12:01:45.219Z" }, - { url = "https://files.pythonhosted.org/packages/4b/32/e0f13a1c5b0f8572d0ec6ae2f6c677b7991fafd95da523159c19eff0696a/contourpy-1.3.3-cp313-cp313-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:4debd64f124ca62069f313a9cb86656ff087786016d76927ae2cf37846b006c9", size = 362859, upload-time = "2025-07-26T12:01:46.519Z" }, - { url = "https://files.pythonhosted.org/packages/33/71/e2a7945b7de4e58af42d708a219f3b2f4cff7386e6b6ab0a0fa0033c49a9/contourpy-1.3.3-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:a15459b0f4615b00bbd1e91f1b9e19b7e63aea7483d03d804186f278c0af2659", size = 1332062, upload-time = "2025-07-26T12:01:48.964Z" }, - { url = "https://files.pythonhosted.org/packages/12/fc/4e87ac754220ccc0e807284f88e943d6d43b43843614f0a8afa469801db0/contourpy-1.3.3-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:ca0fdcd73925568ca027e0b17ab07aad764be4706d0a925b89227e447d9737b7", size = 1403932, upload-time = "2025-07-26T12:01:51.979Z" }, - { url = "https://files.pythonhosted.org/packages/a6/2e/adc197a37443f934594112222ac1aa7dc9a98faf9c3842884df9a9d8751d/contourpy-1.3.3-cp313-cp313-win32.whl", hash = "sha256:b20c7c9a3bf701366556e1b1984ed2d0cedf999903c51311417cf5f591d8c78d", size = 185024, upload-time = "2025-07-26T12:01:53.245Z" }, - { url = "https://files.pythonhosted.org/packages/18/0b/0098c214843213759692cc638fce7de5c289200a830e5035d1791d7a2338/contourpy-1.3.3-cp313-cp313-win_amd64.whl", hash = "sha256:1cadd8b8969f060ba45ed7c1b714fe69185812ab43bd6b86a9123fe8f99c3263", size = 226578, upload-time = "2025-07-26T12:01:54.422Z" }, - { url = "https://files.pythonhosted.org/packages/8a/9a/2f6024a0c5995243cd63afdeb3651c984f0d2bc727fd98066d40e141ad73/contourpy-1.3.3-cp313-cp313-win_arm64.whl", hash = "sha256:fd914713266421b7536de2bfa8181aa8c699432b6763a0ea64195ebe28bff6a9", size = 193524, upload-time = "2025-07-26T12:01:55.73Z" }, - { url = "https://files.pythonhosted.org/packages/c0/b3/f8a1a86bd3298513f500e5b1f5fd92b69896449f6cab6a146a5d52715479/contourpy-1.3.3-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:88df9880d507169449d434c293467418b9f6cbe82edd19284aa0409e7fdb933d", size = 306730, upload-time = "2025-07-26T12:01:57.051Z" }, - { url = "https://files.pythonhosted.org/packages/3f/11/4780db94ae62fc0c2053909b65dc3246bd7cecfc4f8a20d957ad43aa4ad8/contourpy-1.3.3-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:d06bb1f751ba5d417047db62bca3c8fde202b8c11fb50742ab3ab962c81e8216", size = 287897, upload-time = "2025-07-26T12:01:58.663Z" }, - { url = "https://files.pythonhosted.org/packages/ae/15/e59f5f3ffdd6f3d4daa3e47114c53daabcb18574a26c21f03dc9e4e42ff0/contourpy-1.3.3-cp313-cp313t-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:e4e6b05a45525357e382909a4c1600444e2a45b4795163d3b22669285591c1ae", size = 326751, upload-time = "2025-07-26T12:02:00.343Z" }, - { url = "https://files.pythonhosted.org/packages/0f/81/03b45cfad088e4770b1dcf72ea78d3802d04200009fb364d18a493857210/contourpy-1.3.3-cp313-cp313t-manylinux_2_26_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:ab3074b48c4e2cf1a960e6bbeb7f04566bf36b1861d5c9d4d8ac04b82e38ba20", size = 375486, upload-time = "2025-07-26T12:02:02.128Z" }, - { url = "https://files.pythonhosted.org/packages/0c/ba/49923366492ffbdd4486e970d421b289a670ae8cf539c1ea9a09822b371a/contourpy-1.3.3-cp313-cp313t-manylinux_2_26_s390x.manylinux_2_28_s390x.whl", hash = "sha256:6c3d53c796f8647d6deb1abe867daeb66dcc8a97e8455efa729516b997b8ed99", size = 388106, upload-time = "2025-07-26T12:02:03.615Z" }, - { url = "https://files.pythonhosted.org/packages/9f/52/5b00ea89525f8f143651f9f03a0df371d3cbd2fccd21ca9b768c7a6500c2/contourpy-1.3.3-cp313-cp313t-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:50ed930df7289ff2a8d7afeb9603f8289e5704755c7e5c3bbd929c90c817164b", size = 352548, upload-time = "2025-07-26T12:02:05.165Z" }, - { url = "https://files.pythonhosted.org/packages/32/1d/a209ec1a3a3452d490f6b14dd92e72280c99ae3d1e73da74f8277d4ee08f/contourpy-1.3.3-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:4feffb6537d64b84877da813a5c30f1422ea5739566abf0bd18065ac040e120a", size = 1322297, upload-time = "2025-07-26T12:02:07.379Z" }, - { url = "https://files.pythonhosted.org/packages/bc/9e/46f0e8ebdd884ca0e8877e46a3f4e633f6c9c8c4f3f6e72be3fe075994aa/contourpy-1.3.3-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:2b7e9480ffe2b0cd2e787e4df64270e3a0440d9db8dc823312e2c940c167df7e", size = 1391023, upload-time = "2025-07-26T12:02:10.171Z" }, - { url = "https://files.pythonhosted.org/packages/b9/70/f308384a3ae9cd2209e0849f33c913f658d3326900d0ff5d378d6a1422d2/contourpy-1.3.3-cp313-cp313t-win32.whl", hash = "sha256:283edd842a01e3dcd435b1c5116798d661378d83d36d337b8dde1d16a5fc9ba3", size = 196157, upload-time = "2025-07-26T12:02:11.488Z" }, - { url = "https://files.pythonhosted.org/packages/b2/dd/880f890a6663b84d9e34a6f88cded89d78f0091e0045a284427cb6b18521/contourpy-1.3.3-cp313-cp313t-win_amd64.whl", hash = "sha256:87acf5963fc2b34825e5b6b048f40e3635dd547f590b04d2ab317c2619ef7ae8", size = 240570, upload-time = "2025-07-26T12:02:12.754Z" }, - { url = "https://files.pythonhosted.org/packages/80/99/2adc7d8ffead633234817ef8e9a87115c8a11927a94478f6bb3d3f4d4f7d/contourpy-1.3.3-cp313-cp313t-win_arm64.whl", hash = "sha256:3c30273eb2a55024ff31ba7d052dde990d7d8e5450f4bbb6e913558b3d6c2301", size = 199713, upload-time = "2025-07-26T12:02:14.4Z" }, { url = "https://files.pythonhosted.org/packages/72/8b/4546f3ab60f78c514ffb7d01a0bd743f90de36f0019d1be84d0a708a580a/contourpy-1.3.3-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:fde6c716d51c04b1c25d0b90364d0be954624a0ee9d60e23e850e8d48353d07a", size = 292189, upload-time = "2025-07-26T12:02:16.095Z" }, { url = "https://files.pythonhosted.org/packages/fd/e1/3542a9cb596cadd76fcef413f19c79216e002623158befe6daa03dbfa88c/contourpy-1.3.3-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:cbedb772ed74ff5be440fa8eee9bd49f64f6e3fc09436d9c7d8f1c287b121d77", size = 273251, upload-time = "2025-07-26T12:02:17.524Z" }, { url = "https://files.pythonhosted.org/packages/b1/71/f93e1e9471d189f79d0ce2497007731c1e6bf9ef6d1d61b911430c3db4e5/contourpy-1.3.3-cp314-cp314-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:22e9b1bd7a9b1d652cd77388465dc358dafcd2e217d35552424aa4f996f524f5", size = 335810, upload-time = "2025-07-26T12:02:18.9Z" }, @@ -701,11 +464,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/93/8a/68a4ec5c55a2971213d29a9374913f7e9f18581945a7a31d1a39b5d2dfe5/contourpy-1.3.3-cp314-cp314t-win32.whl", hash = "sha256:e74a9a0f5e3fff48fb5a7f2fd2b9b70a3fe014a67522f79b7cca4c0c7e43c9ae", size = 202428, upload-time = "2025-07-26T12:02:48.691Z" }, { url = "https://files.pythonhosted.org/packages/fa/96/fd9f641ffedc4fa3ace923af73b9d07e869496c9cc7a459103e6e978992f/contourpy-1.3.3-cp314-cp314t-win_amd64.whl", hash = "sha256:13b68d6a62db8eafaebb8039218921399baf6e47bf85006fd8529f2a08ef33fc", size = 250331, upload-time = "2025-07-26T12:02:50.137Z" }, { url = "https://files.pythonhosted.org/packages/ae/8c/469afb6465b853afff216f9528ffda78a915ff880ed58813ba4faf4ba0b6/contourpy-1.3.3-cp314-cp314t-win_arm64.whl", hash = "sha256:b7448cb5a725bb1e35ce88771b86fba35ef418952474492cf7c764059933ff8b", size = 203831, upload-time = "2025-07-26T12:02:51.449Z" }, - { url = "https://files.pythonhosted.org/packages/a5/29/8dcfe16f0107943fa92388c23f6e05cff0ba58058c4c95b00280d4c75a14/contourpy-1.3.3-pp311-pypy311_pp73-macosx_10_15_x86_64.whl", hash = "sha256:cd5dfcaeb10f7b7f9dc8941717c6c2ade08f587be2226222c12b25f0483ed497", size = 278809, upload-time = "2025-07-26T12:02:52.74Z" }, - { url = "https://files.pythonhosted.org/packages/85/a9/8b37ef4f7dafeb335daee3c8254645ef5725be4d9c6aa70b50ec46ef2f7e/contourpy-1.3.3-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:0c1fc238306b35f246d61a1d416a627348b5cf0648648a031e14bb8705fcdfe8", size = 261593, upload-time = "2025-07-26T12:02:54.037Z" }, - { url = "https://files.pythonhosted.org/packages/0a/59/ebfb8c677c75605cc27f7122c90313fd2f375ff3c8d19a1694bda74aaa63/contourpy-1.3.3-pp311-pypy311_pp73-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:70f9aad7de812d6541d29d2bbf8feb22ff7e1c299523db288004e3157ff4674e", size = 302202, upload-time = "2025-07-26T12:02:55.947Z" }, - { url = "https://files.pythonhosted.org/packages/3c/37/21972a15834d90bfbfb009b9d004779bd5a07a0ec0234e5ba8f64d5736f4/contourpy-1.3.3-pp311-pypy311_pp73-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:5ed3657edf08512fc3fe81b510e35c2012fbd3081d2e26160f27ca28affec989", size = 329207, upload-time = "2025-07-26T12:02:57.468Z" }, - { url = "https://files.pythonhosted.org/packages/0c/58/bd257695f39d05594ca4ad60df5bcb7e32247f9951fd09a9b8edb82d1daa/contourpy-1.3.3-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:3d1a3799d62d45c18bafd41c5fa05120b96a28079f2393af559b843d1a966a77", size = 225315, upload-time = "2025-07-26T12:02:58.801Z" }, ] [[package]] @@ -714,51 +472,6 @@ version = "2.11.0" source = { registry = "https://pypi.org/simple" } sdist = { url = "https://files.pythonhosted.org/packages/14/12/34bf6e840a79130dfd0da7badfb6f7810b8fcfd60e75b0539372667b41b6/cramjam-2.11.0.tar.gz", hash = "sha256:5c82500ed91605c2d9781380b378397012e25127e89d64f460fea6aeac4389b4", size = 99100, upload-time = "2025-07-27T21:25:07.559Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/d0/89/8001f6a9b6b6e9fa69bec5319789083475d6f26d52aaea209d3ebf939284/cramjam-2.11.0-cp311-cp311-macosx_10_12_x86_64.macosx_11_0_arm64.macosx_10_12_universal2.whl", hash = "sha256:04cfa39118570e70e920a9b75c733299784b6d269733dbc791d9aaed6edd2615", size = 3559272, upload-time = "2025-07-27T21:22:01.988Z" }, - { url = "https://files.pythonhosted.org/packages/0b/f3/001d00070ca92e5fbe6aacc768e455568b0cde46b0eb944561a4ea132300/cramjam-2.11.0-cp311-cp311-macosx_10_12_x86_64.whl", hash = "sha256:66a18f68506290349a256375d7aa2f645b9f7993c10fc4cc211db214e4e61d2b", size = 1861743, upload-time = "2025-07-27T21:22:03.754Z" }, - { url = "https://files.pythonhosted.org/packages/c9/35/041a3af01bf3f6158f120070f798546d4383b962b63c35cd91dcbf193e17/cramjam-2.11.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:50e7d65533857736cd56f6509cf2c4866f28ad84dd15b5bdbf2f8a81e77fa28a", size = 1699631, upload-time = "2025-07-27T21:22:05.192Z" }, - { url = "https://files.pythonhosted.org/packages/17/eb/5358b238808abebd0c949c42635c3751204ca7cf82b29b984abe9f5e33c8/cramjam-2.11.0-cp311-cp311-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:1f71989668458fc327ac15396db28d92df22f8024bb12963929798b2729d2df5", size = 2025603, upload-time = "2025-07-27T21:22:06.726Z" }, - { url = "https://files.pythonhosted.org/packages/0e/79/19dba7c03a27408d8d11b5a7a4a7908459cfd4e6f375b73264dc66517bf6/cramjam-2.11.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ee77ac543f1e2b22af1e8be3ae589f729491b6090582340aacd77d1d757d9569", size = 1766283, upload-time = "2025-07-27T21:22:08.568Z" }, - { url = "https://files.pythonhosted.org/packages/a4/ad/40e4b3408501d886d082db465c33971655fe82573c535428e52ab905f4d0/cramjam-2.11.0-cp311-cp311-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:ad52784120e7e4d8a0b5b0517d185b8bf7f74f5e17272857ddc8951a628d9be1", size = 1854407, upload-time = "2025-07-27T21:22:10.518Z" }, - { url = "https://files.pythonhosted.org/packages/36/6e/c1b60ceb6d7ea6ff8b0bf197520aefe23f878bf2bfb0de65f2b0c2f82cd1/cramjam-2.11.0-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:4b86f8e6d9c1b3f9a75b2af870c93ceee0f1b827cd2507387540e053b35d7459", size = 2035793, upload-time = "2025-07-27T21:22:12.504Z" }, - { url = "https://files.pythonhosted.org/packages/9c/ad/32a8d5f4b1e3717787945ec6d71bd1c6e6bccba4b7e903fc0d9d4e4b08c3/cramjam-2.11.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:320d61938950d95da2371b46c406ec433e7955fae9f396c8e1bf148ffc187d11", size = 2067499, upload-time = "2025-07-27T21:22:14.067Z" }, - { url = "https://files.pythonhosted.org/packages/ff/cd/3b5a662736ea62ff7fa4c4a10a85e050bfdaad375cc53dc80427e8afe41c/cramjam-2.11.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:41eafc8c1653a35a5c7e75ad48138f9f60085cc05cd99d592e5298552d944e9f", size = 1981853, upload-time = "2025-07-27T21:22:15.908Z" }, - { url = "https://files.pythonhosted.org/packages/26/8e/1dbcfaaa7a702ee82ee683ec3a81656934dd7e04a7bc4ee854033686f98a/cramjam-2.11.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:03a7316c6bf763dfa34279335b27702321da44c455a64de58112968c0818ec4a", size = 2034514, upload-time = "2025-07-27T21:22:17.352Z" }, - { url = "https://files.pythonhosted.org/packages/50/62/f11709bfdce74af79a88b410dcb76dedc97612166e759136931bf63cfd7b/cramjam-2.11.0-cp311-cp311-musllinux_1_1_armv7l.whl", hash = "sha256:244c2ed8bd7ccbb294a2abe7ca6498db7e89d7eb5e744691dc511a7dc82e65ca", size = 2155343, upload-time = "2025-07-27T21:22:18.854Z" }, - { url = "https://files.pythonhosted.org/packages/8a/6d/3b98b61841a5376d9a9b8468ae58753a8e6cf22be9534a0fa5af4d8621cc/cramjam-2.11.0-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:405f8790bad36ce0b4bbdb964ad51507bfc7942c78447f25cb828b870a1d86a0", size = 2169367, upload-time = "2025-07-27T21:22:20.389Z" }, - { url = "https://files.pythonhosted.org/packages/11/72/bd5db5c49dbebc8b002f1c4983101b28d2e7fc9419753db1c31ec22b03ef/cramjam-2.11.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:6b1b751a5411032b08fb3ac556160229ca01c6bbe4757bb3a9a40b951ebaac23", size = 2159334, upload-time = "2025-07-27T21:22:22.254Z" }, - { url = "https://files.pythonhosted.org/packages/34/32/203c57acdb6eea727e7078b2219984e64ed4ad043c996ed56321301ba167/cramjam-2.11.0-cp311-cp311-win32.whl", hash = "sha256:5251585608778b9ac8effed544933df7ad85b4ba21ee9738b551f17798b215ac", size = 1605313, upload-time = "2025-07-27T21:22:24.126Z" }, - { url = "https://files.pythonhosted.org/packages/a9/bd/102d6deb87a8524ac11cddcd31a7612b8f20bf9b473c3c645045e3b957c7/cramjam-2.11.0-cp311-cp311-win_amd64.whl", hash = "sha256:dca88bc8b68ce6d35dafd8c4d5d59a238a56c43fa02b74c2ce5f9dfb0d1ccb46", size = 1710991, upload-time = "2025-07-27T21:22:25.661Z" }, - { url = "https://files.pythonhosted.org/packages/0b/0d/7c84c913a5fae85b773a9dcf8874390f9d68ba0fcc6630efa7ff1541b950/cramjam-2.11.0-cp312-cp312-macosx_10_12_x86_64.macosx_11_0_arm64.macosx_10_12_universal2.whl", hash = "sha256:dba5c14b8b4f73ea1e65720f5a3fe4280c1d27761238378be8274135c60bbc6e", size = 3553368, upload-time = "2025-07-27T21:22:27.162Z" }, - { url = "https://files.pythonhosted.org/packages/2b/cc/4f6d185d8a744776f53035e72831ff8eefc2354f46ab836f4bd3c4f6c138/cramjam-2.11.0-cp312-cp312-macosx_10_12_x86_64.whl", hash = "sha256:11eb40722b3fcf3e6890fba46c711bf60f8dc26360a24876c85e52d76c33b25b", size = 1860014, upload-time = "2025-07-27T21:22:28.738Z" }, - { url = "https://files.pythonhosted.org/packages/1c/a8/626c76263085c6d5ded0e71823b411e9522bfc93ba6cc59855a5869296e7/cramjam-2.11.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:aeb26e2898994b6e8319f19a4d37c481512acdcc6d30e1b5ecc9d8ec57e835cb", size = 1693512, upload-time = "2025-07-27T21:22:30.999Z" }, - { url = "https://files.pythonhosted.org/packages/e9/52/0851a16a62447532e30ba95a80e638926fdea869a34b4b5b9d0a020083ba/cramjam-2.11.0-cp312-cp312-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:4f8d82081ed7d8fe52c982bd1f06e4c7631a73fe1fb6d4b3b3f2404f87dc40fe", size = 2025285, upload-time = "2025-07-27T21:22:32.954Z" }, - { url = "https://files.pythonhosted.org/packages/98/76/122e444f59dbc216451d8e3d8282c9665dc79eaf822f5f1470066be1b695/cramjam-2.11.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:092a3ec26e0a679305018380e4f652eae1b6dfe3fc3b154ee76aa6b92221a17c", size = 1761327, upload-time = "2025-07-27T21:22:34.484Z" }, - { url = "https://files.pythonhosted.org/packages/a3/bc/3a0189aef1af2b29632c039c19a7a1b752bc21a4053582a5464183a0ad3d/cramjam-2.11.0-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:529d6d667c65fd105d10bd83d1cd3f9869f8fd6c66efac9415c1812281196a92", size = 1854075, upload-time = "2025-07-27T21:22:36.157Z" }, - { url = "https://files.pythonhosted.org/packages/2e/80/8a6343b13778ce52d94bb8d5365a30c3aa951276b1857201fe79d7e2ad25/cramjam-2.11.0-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:555eb9c90c450e0f76e27d9ff064e64a8b8c6478ab1a5594c91b7bc5c82fd9f0", size = 2032710, upload-time = "2025-07-27T21:22:38.17Z" }, - { url = "https://files.pythonhosted.org/packages/df/6b/cd1778a207c29eda10791e3dfa018b588001928086e179fc71254793c625/cramjam-2.11.0-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:5edf4c9e32493035b514cf2ba0c969d81ccb31de63bd05490cc8bfe3b431674e", size = 2068353, upload-time = "2025-07-27T21:22:39.615Z" }, - { url = "https://files.pythonhosted.org/packages/dc/f0/5c2a5cd5711032f3b191ca50cb786c17689b4a9255f9f768866e6c9f04d9/cramjam-2.11.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2fa2fe41f48c4d58d923803383b0737f048918b5a0d10390de9628bb6272b107", size = 1978104, upload-time = "2025-07-27T21:22:41.106Z" }, - { url = "https://files.pythonhosted.org/packages/f9/8b/b363a5fb2c3347504fe9a64f8d0f1e276844f0e532aa7162c061cd1ffee4/cramjam-2.11.0-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:9ca14cf1cabdb0b77d606db1bb9e9ca593b1dbd421fcaf251ec9a5431ec449f3", size = 2030779, upload-time = "2025-07-27T21:22:42.969Z" }, - { url = "https://files.pythonhosted.org/packages/78/7b/d83dad46adb6c988a74361f81ad9c5c22642be53ad88616a19baedd06243/cramjam-2.11.0-cp312-cp312-musllinux_1_1_armv7l.whl", hash = "sha256:309e95bf898829476bccf4fd2c358ec00e7ff73a12f95a3cdeeba4bb1d3683d5", size = 2155297, upload-time = "2025-07-27T21:22:44.6Z" }, - { url = "https://files.pythonhosted.org/packages/1a/be/60d9be4cb33d8740a4aa94c7513f2ef3c4eba4fd13536f086facbafade71/cramjam-2.11.0-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:86dca35d2f15ef22922411496c220f3c9e315d5512f316fe417461971cc1648d", size = 2169255, upload-time = "2025-07-27T21:22:46.534Z" }, - { url = "https://files.pythonhosted.org/packages/11/b0/4a595f01a243aec8ad272b160b161c44351190c35d98d7787919d962e9e5/cramjam-2.11.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:193c6488bd2f514cbc0bef5c18fad61a5f9c8d059dd56edf773b3b37f0e85496", size = 2155651, upload-time = "2025-07-27T21:22:48.46Z" }, - { url = "https://files.pythonhosted.org/packages/38/47/7776659aaa677046b77f527106e53ddd47373416d8fcdb1e1a881ec5dc06/cramjam-2.11.0-cp312-cp312-win32.whl", hash = "sha256:514e2c008a8b4fa823122ca3ecab896eac41d9aa0f5fc881bd6264486c204e32", size = 1603568, upload-time = "2025-07-27T21:22:50.084Z" }, - { url = "https://files.pythonhosted.org/packages/75/b1/d53002729cfd94c5844ddfaf1233c86d29f2dbfc1b764a6562c41c044199/cramjam-2.11.0-cp312-cp312-win_amd64.whl", hash = "sha256:53fed080476d5f6ad7505883ec5d1ec28ba36c2273db3b3e92d7224fe5e463db", size = 1709287, upload-time = "2025-07-27T21:22:51.534Z" }, - { url = "https://files.pythonhosted.org/packages/0a/8b/406c5dc0f8e82385519d8c299c40fd6a56d97eca3fcd6f5da8dad48de75b/cramjam-2.11.0-cp313-cp313-macosx_10_12_x86_64.macosx_11_0_arm64.macosx_10_12_universal2.whl", hash = "sha256:2c289729cc1c04e88bafa48b51082fb462b0a57dbc96494eab2be9b14dca62af", size = 3553330, upload-time = "2025-07-27T21:22:53.124Z" }, - { url = "https://files.pythonhosted.org/packages/00/ad/4186884083d6e4125b285903e17841827ab0d6d0cffc86216d27ed91e91d/cramjam-2.11.0-cp313-cp313-macosx_10_12_x86_64.whl", hash = "sha256:045201ee17147e36cf43d8ae2fa4b4836944ac672df5874579b81cf6d40f1a1f", size = 1859756, upload-time = "2025-07-27T21:22:54.821Z" }, - { url = "https://files.pythonhosted.org/packages/54/01/91b485cf76a7efef638151e8a7d35784dae2c4ff221b1aec2c083e4b106d/cramjam-2.11.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:619cd195d74c9e1d2a3ad78d63451d35379c84bd851aec552811e30842e1c67a", size = 1693609, upload-time = "2025-07-27T21:22:56.331Z" }, - { url = "https://files.pythonhosted.org/packages/cd/84/d0c80d279b2976870fc7d10f15dcb90a3c10c06566c6964b37c152694974/cramjam-2.11.0-cp313-cp313-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:6eb3ae5ab72edb2ed68bdc0f5710f0a6cad7fd778a610ec2c31ee15e32d3921e", size = 2024912, upload-time = "2025-07-27T21:22:57.915Z" }, - { url = "https://files.pythonhosted.org/packages/d6/70/88f2a5cb904281ed5d3c111b8f7d5366639817a5470f059bcd26833fc870/cramjam-2.11.0-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:df7da3f4b19e3078f9635f132d31b0a8196accb2576e3213ddd7a77f93317c20", size = 1760715, upload-time = "2025-07-27T21:22:59.528Z" }, - { url = "https://files.pythonhosted.org/packages/b2/06/cf5b02081132537d28964fb385fcef9ed9f8a017dd7d8c59d317e53ba50d/cramjam-2.11.0-cp313-cp313-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:57286b289cd557ac76c24479d8ecfb6c3d5b854cce54ccc7671f9a2f5e2a2708", size = 1853782, upload-time = "2025-07-27T21:23:01.07Z" }, - { url = "https://files.pythonhosted.org/packages/57/27/63525087ed40a53d1867021b9c4858b80cc86274ffe7225deed067d88d92/cramjam-2.11.0-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:28952fbbf8b32c0cb7fa4be9bcccfca734bf0d0989f4b509dc7f2f70ba79ae06", size = 2032354, upload-time = "2025-07-27T21:23:03.021Z" }, - { url = "https://files.pythonhosted.org/packages/c3/ef/dbba082c6ebfb6410da4dd39a64e654d7194fcfd4567f85991a83fa4ec32/cramjam-2.11.0-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:78ed2e4099812a438b545dfbca1928ec825e743cd253bc820372d6ef8c3adff4", size = 2068007, upload-time = "2025-07-27T21:23:04.526Z" }, - { url = "https://files.pythonhosted.org/packages/35/ce/d902b9358a46a086938feae83b2251720e030f06e46006f4c1fc0ac9da20/cramjam-2.11.0-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7d9aecd5c3845d415bd6c9957c93de8d93097e269137c2ecb0e5a5256374bdc8", size = 1977485, upload-time = "2025-07-27T21:23:06.058Z" }, - { url = "https://files.pythonhosted.org/packages/e8/03/982f54553244b0afcbdb2ad2065d460f0ab05a72a96896a969a1ca136a1e/cramjam-2.11.0-cp313-cp313-musllinux_1_1_aarch64.whl", hash = "sha256:362fcf4d6f5e1242a4540812455f5a594949190f6fbc04f2ffbfd7ae0266d788", size = 2030447, upload-time = "2025-07-27T21:23:07.679Z" }, - { url = "https://files.pythonhosted.org/packages/74/5f/748e54cdb665ec098ec519e23caacc65fc5ae58718183b071e33fc1c45b4/cramjam-2.11.0-cp313-cp313-musllinux_1_1_armv7l.whl", hash = "sha256:13240b3dea41b1174456cb9426843b085dc1a2bdcecd9ee2d8f65ac5703374b0", size = 2154949, upload-time = "2025-07-27T21:23:09.366Z" }, - { url = "https://files.pythonhosted.org/packages/69/81/c4e6cb06ed69db0dc81f9a8b1dc74995ebd4351e7a1877143f7031ff2700/cramjam-2.11.0-cp313-cp313-musllinux_1_1_i686.whl", hash = "sha256:c54eed83726269594b9086d827decc7d2015696e31b99bf9b69b12d9063584fe", size = 2168925, upload-time = "2025-07-27T21:23:10.976Z" }, - { url = "https://files.pythonhosted.org/packages/13/5b/966365523ce8290a08e163e3b489626c5adacdff2b3da9da1b0823dfb14e/cramjam-2.11.0-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:f8195006fdd0fc0a85b19df3d64a3ef8a240e483ae1dfc7ac6a4316019eb5df2", size = 2154950, upload-time = "2025-07-27T21:23:12.514Z" }, - { url = "https://files.pythonhosted.org/packages/3a/7d/7f8eb5c534b72b32c6eb79d74585bfee44a9a5647a14040bb65c31c2572d/cramjam-2.11.0-cp313-cp313-win32.whl", hash = "sha256:ccf30e3fe6d770a803dcdf3bb863fa44ba5dc2664d4610ba2746a3c73599f2e4", size = 1603199, upload-time = "2025-07-27T21:23:14.38Z" }, - { url = "https://files.pythonhosted.org/packages/37/05/47b5e0bf7c41a3b1cdd3b7c2147f880c93226a6bef1f5d85183040cbdece/cramjam-2.11.0-cp313-cp313-win_amd64.whl", hash = "sha256:ee36348a204f0a68b03400f4736224e9f61d1c6a1582d7f875c1ca56f0254268", size = 1708924, upload-time = "2025-07-27T21:23:16.332Z" }, { url = "https://files.pythonhosted.org/packages/de/07/a1051cdbbe6d723df16d756b97f09da7c1adb69e29695c58f0392bc12515/cramjam-2.11.0-cp314-cp314-macosx_10_12_x86_64.macosx_11_0_arm64.macosx_10_12_universal2.whl", hash = "sha256:7ba5e38c9fbd06f086f4a5a64a1a5b7b417cd3f8fc07a20e5c03651f72f36100", size = 3554141, upload-time = "2025-07-27T21:23:17.938Z" }, { url = "https://files.pythonhosted.org/packages/74/66/58487d2e16ef3d04f51a7c7f0e69823e806744b4c21101e89da4873074bc/cramjam-2.11.0-cp314-cp314-macosx_10_12_x86_64.whl", hash = "sha256:b8adeee57b41fe08e4520698a4b0bd3cc76dbd81f99424b806d70a5256a391d3", size = 1860353, upload-time = "2025-07-27T21:23:19.593Z" }, { url = "https://files.pythonhosted.org/packages/67/b4/67f6254d166ffbcc9d5fa1b56876eaa920c32ebc8e9d3d525b27296b693b/cramjam-2.11.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:b96a74fa03a636c8a7d76f700d50e9a8bc17a516d6a72d28711225d641e30968", size = 1693832, upload-time = "2025-07-27T21:23:21.185Z" }, @@ -789,12 +502,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/4b/85/3be6f0a1398f976070672be64f61895f8839857618a2d8cc0d3ab529d3dc/cramjam-2.11.0-cp314-cp314t-musllinux_1_1_x86_64.whl", hash = "sha256:d388bd5723732c3afe1dd1d181e4213cc4e1be210b080572e7d5749f6e955656", size = 2160229, upload-time = "2025-07-27T21:24:06.729Z" }, { url = "https://files.pythonhosted.org/packages/57/5e/66cfc3635511b20014bbb3f2ecf0095efb3049e9e96a4a9e478e4f3d7b78/cramjam-2.11.0-cp314-cp314t-win32.whl", hash = "sha256:0a70ff17f8e1d13f322df616505550f0f4c39eda62290acb56f069d4857037c8", size = 1610267, upload-time = "2025-07-27T21:24:08.428Z" }, { url = "https://files.pythonhosted.org/packages/ce/c6/c71e82e041c95ffe6a92ac707785500aa2a515a4339c2c7dd67e3c449249/cramjam-2.11.0-cp314-cp314t-win_amd64.whl", hash = "sha256:028400d699442d40dbda02f74158c73d05cb76587a12490d0bfedd958fd49188", size = 1713108, upload-time = "2025-07-27T21:24:10.147Z" }, - { url = "https://files.pythonhosted.org/packages/81/da/b3301962ccd6fce9fefa1ecd8ea479edaeaa38fadb1f34d5391d2587216a/cramjam-2.11.0-pp311-pypy311_pp73-macosx_10_12_x86_64.macosx_11_0_arm64.macosx_10_12_universal2.whl", hash = "sha256:52d5db3369f95b27b9f3c14d067acb0b183333613363ed34268c9e04560f997f", size = 3573546, upload-time = "2025-07-27T21:24:52.944Z" }, - { url = "https://files.pythonhosted.org/packages/b6/c2/410ddb8ad4b9dfb129284666293cb6559479645da560f7077dc19d6bee9e/cramjam-2.11.0-pp311-pypy311_pp73-macosx_10_12_x86_64.whl", hash = "sha256:4820516366d455b549a44d0e2210ee7c4575882dda677564ce79092588321d54", size = 1873654, upload-time = "2025-07-27T21:24:54.958Z" }, - { url = "https://files.pythonhosted.org/packages/d5/99/f68a443c64f7ce7aff5bed369b0aa5b2fac668fa3dfd441837e316e97a1f/cramjam-2.11.0-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:d9e5db525dc0a950a825202f84ee68d89a072479e07da98795a3469df942d301", size = 1702846, upload-time = "2025-07-27T21:24:57.124Z" }, - { url = "https://files.pythonhosted.org/packages/6c/02/0ff358ab773def1ee3383587906c453d289953171e9c92db84fdd01bf172/cramjam-2.11.0-pp311-pypy311_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:62ab4971199b2270005359cdc379bc5736071dc7c9a228581c5122d9ffaac50c", size = 1773683, upload-time = "2025-07-27T21:24:59.28Z" }, - { url = "https://files.pythonhosted.org/packages/e9/31/3298e15f87c9cf2aabdbdd90b153d8644cf989cb42a45d68a1b71e1f7aaf/cramjam-2.11.0-pp311-pypy311_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:24758375cc5414d3035ca967ebb800e8f24604ececcba3c67d6f0218201ebf2d", size = 1994136, upload-time = "2025-07-27T21:25:01.565Z" }, - { url = "https://files.pythonhosted.org/packages/c7/90/20d1747255f1ee69a412e319da51ea594c18cca195e7a4d4c713f045eff5/cramjam-2.11.0-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:6c2eea545fef1065c7dd4eda991666fd9c783fbc1d226592ccca8d8891c02f23", size = 1714982, upload-time = "2025-07-27T21:25:05.79Z" }, ] [[package]] @@ -854,12 +561,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/1e/75/a2e55f99c16fcac7b5d6c1eb19ad8e00799854d6be5ca845f9259eae1681/cryptography-48.0.0-cp39-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:a5da777e32ffed6f85a7b2b3f7c5cbc88c146bfcd0a1d7baf5fcc6c52ee35dd4", size = 4960575, upload-time = "2026-05-04T22:59:09.851Z" }, { url = "https://files.pythonhosted.org/packages/b8/23/6e6f32143ab5d8b36ca848a502c4bcd477ae75b9e1677e3530d669062578/cryptography-48.0.0-cp39-abi3-win32.whl", hash = "sha256:77a2ccbbe917f6710e05ba9adaa25fb5075620bf3ea6fb751997875aff4ae4bd", size = 3279117, upload-time = "2026-05-04T22:59:12.019Z" }, { url = "https://files.pythonhosted.org/packages/9d/9a/0fea98a70cf1749d41d738836f6349d97945f7c89433a259a6c2642eefeb/cryptography-48.0.0-cp39-abi3-win_amd64.whl", hash = "sha256:16cd65b9330583e4619939b3a3843eec1e6e789744bb01e7c7e2e62e33c239c8", size = 3792100, upload-time = "2026-05-04T22:59:14.884Z" }, - { url = "https://files.pythonhosted.org/packages/be/d2/024b5e06be9d44cb021fb0e1a03d34d63989cf56a0fe62f3dfbab695b9b4/cryptography-48.0.0-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:84cf79f0dc8b36ac5da873481716e87aef31fcfa0444f9e1d8b4b2cece142855", size = 3950391, upload-time = "2026-05-04T22:59:17.415Z" }, - { url = "https://files.pythonhosted.org/packages/bc/17/3861e17c56fa0fd37491a14a8673fdb77c57fc5693cafe745ea8b06dba75/cryptography-48.0.0-pp311-pypy311_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:fdfef35d751d510fcef5252703621574364fec16418c4a1e5e1055248401054b", size = 4637126, upload-time = "2026-05-04T22:59:20.197Z" }, - { url = "https://files.pythonhosted.org/packages/f0/0a/7e226dbff530f21480727eb764973a7bff2b912f8e15cd4f129e71b56d1d/cryptography-48.0.0-pp311-pypy311_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:0890f502ddf7d9c6426129c3f49f5c0a39278ed7cd6322c8755ffca6ee675a13", size = 4667270, upload-time = "2026-05-04T22:59:22.647Z" }, - { url = "https://files.pythonhosted.org/packages/3b/f2/5a72274ca9f1b2a8b44a662ee0bf1b435909deb473d6f97bcd035bcdbc71/cryptography-48.0.0-pp311-pypy311_pp73-manylinux_2_34_aarch64.whl", hash = "sha256:ecde28a596bead48b0cfd2a1b4416c3d43074c2d785e3a398d7ec1fc4d0f7fbb", size = 4636797, upload-time = "2026-05-04T22:59:24.912Z" }, - { url = "https://files.pythonhosted.org/packages/b4/e1/48cedb2fe63626e91ded1edad159e2a4fb8b6906c4425eb7749673077ce7/cryptography-48.0.0-pp311-pypy311_pp73-manylinux_2_34_x86_64.whl", hash = "sha256:4defde8685ae324a9eb9d818717e93b4638ef67070ac9bc15b8ca85f63048355", size = 4666800, upload-time = "2026-05-04T22:59:27.474Z" }, - { url = "https://files.pythonhosted.org/packages/a2/ca/7e8365deec19afb2b2c7be7c1c0aa8f99633b54e90c570999acda93260fc/cryptography-48.0.0-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:db63bf618e5dea46c07de12e900fe1cdd2541e6dc9dbae772a70b7d4d4765f6a", size = 3739536, upload-time = "2026-05-04T22:59:29.61Z" }, ] [[package]] @@ -907,33 +608,6 @@ dependencies = [ ] sdist = { url = "https://files.pythonhosted.org/packages/bc/d0/0690d1b88b936ab31219ca9078859316185989be0d186ff33896f3191d39/ddtrace-4.3.0.tar.gz", hash = "sha256:366bc941a20137e6f5bff22aefd6a221ca15f1b087c31bf28fce448619f443b4", size = 7085760, upload-time = "2026-01-27T20:55:27.878Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/62/92/a4335be1b8ccebca11c2fc30dbd38e7c31f20025ac5fa29c781fcf7e839f/ddtrace-4.3.0-cp311-cp311-macosx_14_0_arm64.whl", hash = "sha256:c41f5598ec26fc75a12f88131f14cf8728fbef3a5077ab3092b66f65a56f0cfd", size = 6646276, upload-time = "2026-01-27T20:53:26.621Z" }, - { url = "https://files.pythonhosted.org/packages/79/04/c82807bfe651fb2fe04cb3a097a8988638a8ffe31f38a34f7a9cdd8ed227/ddtrace-4.3.0-cp311-cp311-macosx_14_0_x86_64.whl", hash = "sha256:0971a52d0474a1a5c417aa628ccb81a3f530acc7b054cd2040740bc200193068", size = 7046186, upload-time = "2026-01-27T20:53:28.498Z" }, - { url = "https://files.pythonhosted.org/packages/fc/d6/5091e3dcb0e3b15f11165faab3c0cfff91d1fe69b1adf34843246e04c891/ddtrace-4.3.0-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:2a5e2903d6634adf685939ca7ede2aa900a1315911f14e3081399e3dcad32b15", size = 7728637, upload-time = "2026-01-27T20:53:30.407Z" }, - { url = "https://files.pythonhosted.org/packages/d6/e0/c5438aca0281bd511260d55d361fca9904d988896baee2e09eb456ca3c42/ddtrace-4.3.0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:ce7adf94dc12edff5ddecd9a0ec751f99148578798142bb228f7b3713505d1f7", size = 8008249, upload-time = "2026-01-27T20:53:32.623Z" }, - { url = "https://files.pythonhosted.org/packages/0a/49/aa3452696bed00632ca9dd4a99bf1fca9342c0a386b2ff4e3fbc683cd9f6/ddtrace-4.3.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:6bb56dfda0b69e324d8b90efdff6b506cd86cadbb336d7e265deb11886eb1322", size = 8736182, upload-time = "2026-01-27T20:53:35.08Z" }, - { url = "https://files.pythonhosted.org/packages/48/bf/7d1da3d02b7ff0d10fea86494a60cc0720e33d4f1a85e5fa1274e9b03a64/ddtrace-4.3.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:a9ba79cb934286d43ad4314269af5c63057d63aadcf1a9d201feb2a02077e98c", size = 9066094, upload-time = "2026-01-27T20:53:37.646Z" }, - { url = "https://files.pythonhosted.org/packages/df/81/e814aedec968a43c6408054eef53b5a5d2ff54d80db2199b60478aa671d9/ddtrace-4.3.0-cp311-cp311-win32.whl", hash = "sha256:557775da26e9cb3d4b5e742028a566a6910f85cfc23b111d265e44358dd32860", size = 5114320, upload-time = "2026-01-27T20:53:39.924Z" }, - { url = "https://files.pythonhosted.org/packages/a3/7d/c891543ff0f581e6ae63a5c12b9b521ee2485ff9837a7bbe5aa13e534f9c/ddtrace-4.3.0-cp311-cp311-win_amd64.whl", hash = "sha256:456cc48ac86736452a803f914ebe7f73e32504c2490ef0ae4973e84b6a9571fc", size = 5652238, upload-time = "2026-01-27T20:53:42.351Z" }, - { url = "https://files.pythonhosted.org/packages/66/cb/71f7f34a63ebbfb86fd7511d900d2b4f3b94e4d1a6fb81b2e0f41e84918b/ddtrace-4.3.0-cp311-cp311-win_arm64.whl", hash = "sha256:f7d606f5510ef0ffcc1d42ecc5ecb8700060d6e456148d46d079b47e7f55f863", size = 5368001, upload-time = "2026-01-27T20:53:44.443Z" }, - { url = "https://files.pythonhosted.org/packages/65/21/7ad3a13b5cb21b951d399995e587c04ae72bd7e09741a535221b31aa943a/ddtrace-4.3.0-cp312-cp312-macosx_14_0_arm64.whl", hash = "sha256:ef5ae88f516654b37fcc8fc7154ffa9d1e8eb8b3be6d6f08f87f681e35937ef7", size = 6903861, upload-time = "2026-01-27T20:53:46.975Z" }, - { url = "https://files.pythonhosted.org/packages/fa/f2/837756c6ca7f45a6e7f9bcea31ae31df8707604a7aec09b4fec810abf01b/ddtrace-4.3.0-cp312-cp312-macosx_14_0_x86_64.whl", hash = "sha256:7c4ca32b1a92a1ef116711e20bbd1cdf65056be9a64585fc41354dacf4c7ca33", size = 7327605, upload-time = "2026-01-27T20:53:49.077Z" }, - { url = "https://files.pythonhosted.org/packages/c8/8f/01a89d5e5495fd804af898e6d7d867dd7345fc6303c4e78e556a8345f34a/ddtrace-4.3.0-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:feaf7921c3795ae1dd0f12640d3f8ec5f9ac19697b55a54876e90ec4330c628a", size = 7722066, upload-time = "2026-01-27T20:53:51.752Z" }, - { url = "https://files.pythonhosted.org/packages/a6/21/4999eebbbfd3d36edaeaafa270b8f3cf592417d92a5ea7b752e61af4b869/ddtrace-4.3.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:0b527de8ff70105909e2d99dd81374162158a280f562dea244a1c36939ea0d8a", size = 8009324, upload-time = "2026-01-27T20:53:53.968Z" }, - { url = "https://files.pythonhosted.org/packages/8d/f8/b4c2c844912c9ce54ec3d78efcc83186a39f80a9145d008fd7323eefea96/ddtrace-4.3.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:4c35c3b42cd304056c65d95f4b63a0580aa4ff29efb18965f7ed2fa3ad8e4374", size = 8733732, upload-time = "2026-01-27T20:53:56.607Z" }, - { url = "https://files.pythonhosted.org/packages/10/ec/0a756896dd47098178e96b43ce198b90def45ff5b94c4166bbb6b8795c60/ddtrace-4.3.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:9aa6e2014ad16a5a7c28cc0ff3eb4f4cd2396dc7d9e811db7f778b9d75a09268", size = 9073645, upload-time = "2026-01-27T20:53:59.498Z" }, - { url = "https://files.pythonhosted.org/packages/42/89/4bc918d8f5792d58e5eaa3c67fe18b22cfd9c5bc5eeb334c5c3c6d9e44b7/ddtrace-4.3.0-cp312-cp312-win32.whl", hash = "sha256:cd64c7cebcb58c32e5e8e6bfda11ba50b7f0e2c74d54ecdd8c945eaa2a92f6f8", size = 5110045, upload-time = "2026-01-27T20:54:01.898Z" }, - { url = "https://files.pythonhosted.org/packages/2c/9b/cfbb354d991b9be5fea026ad2fee918bb8da1ff649635e7de05e64458460/ddtrace-4.3.0-cp312-cp312-win_amd64.whl", hash = "sha256:4bf62878d3a0f20dc2645aff7698bbe8f57a6f39008279601f2af95f4f3d0ee4", size = 5645713, upload-time = "2026-01-27T20:54:04.305Z" }, - { url = "https://files.pythonhosted.org/packages/cb/f5/e44a66e21f0bb5ba3cdc34a22e244badc7ad92ef01e60410a22794b92ebf/ddtrace-4.3.0-cp312-cp312-win_arm64.whl", hash = "sha256:418ce112d1c85786e589ecd22a6f2dedf1ecb8efb21a703b18dfb5d2b6182a34", size = 5360067, upload-time = "2026-01-27T20:54:06.458Z" }, - { url = "https://files.pythonhosted.org/packages/bb/79/92140484e68bf202431b2644616c97e726180e396f2818889ce22d9ec7a7/ddtrace-4.3.0-cp313-cp313-macosx_14_0_arm64.whl", hash = "sha256:8c84bd599d661ed6424460e3c6111065c5a7c978d28f5d47cb06369ea58e6a07", size = 6639422, upload-time = "2026-01-27T20:54:09.134Z" }, - { url = "https://files.pythonhosted.org/packages/b9/c7/d95dbc4953ad5d4c1d424547e5df397098429bf0e147968e943d6e0f3623/ddtrace-4.3.0-cp313-cp313-macosx_14_0_x86_64.whl", hash = "sha256:e1a8227d354d044b737def7711c275085e9b765c4d93f84e522d93675e03c318", size = 7045829, upload-time = "2026-01-27T20:54:12.636Z" }, - { url = "https://files.pythonhosted.org/packages/23/3d/714a0875ade37153da0450b07a2bd0eb810ad0f2078c8876ea4af75881cf/ddtrace-4.3.0-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:c4cd4d89339adf4a9c114282d03f4db498b0092d56bee145ddb99033fb51be18", size = 7714579, upload-time = "2026-01-27T20:54:14.812Z" }, - { url = "https://files.pythonhosted.org/packages/2a/1c/f89d6c7de4640239618cae7df96c46099e5ba53168ce5641b40cd302092b/ddtrace-4.3.0-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:6c9ec118e2a41da593ec2d2f6365ba104aaf3b46296e0a4c30556aed26615ac5", size = 7998564, upload-time = "2026-01-27T20:54:18.854Z" }, - { url = "https://files.pythonhosted.org/packages/b7/43/f22586a3851b674c4e61cd630682fa47f5a724fb7686f87a415d93f355fd/ddtrace-4.3.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:aa168e581431a3b3ee9c04d76922cae2f3fdfb4520927add5a844e7e2ebb807e", size = 8729607, upload-time = "2026-01-27T20:54:21.319Z" }, - { url = "https://files.pythonhosted.org/packages/02/9d/b1a92066fc2668f715ca77292d73ae1554290edb5ffac710dbc84aa1777a/ddtrace-4.3.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:eed721dcd5cf1f4f4309a28efa5e1cb7d7da129fd51a3e093422fe064bd451f1", size = 9065926, upload-time = "2026-01-27T20:54:24.447Z" }, - { url = "https://files.pythonhosted.org/packages/72/92/6bf49559d2fe06589d7cc967085fc878ec652172a8d203ed22f8c6ab71e0/ddtrace-4.3.0-cp313-cp313-win32.whl", hash = "sha256:9917c49b33f32c524f74813cb03461c207324711b0a2d359e3a3822181cb5643", size = 5107720, upload-time = "2026-01-27T20:54:27.614Z" }, - { url = "https://files.pythonhosted.org/packages/2d/94/37a07b2576dfbbef5034e595be385ab325eebfd735e0eda80cf5ae0facd1/ddtrace-4.3.0-cp313-cp313-win_amd64.whl", hash = "sha256:ea86989b93af5d415ba1457d3c363a59665a907807a51072b43abf5901872078", size = 5643119, upload-time = "2026-01-27T20:54:31.537Z" }, - { url = "https://files.pythonhosted.org/packages/c6/1d/d4466708a5ace94a655f3af804c1a666bc05b6463c5892e561eca0497922/ddtrace-4.3.0-cp313-cp313-win_arm64.whl", hash = "sha256:e983bc15b5eabd9e25b02617702e8621c014c71dc123a117079d3ced29446433", size = 5357966, upload-time = "2026-01-27T20:54:35.411Z" }, { url = "https://files.pythonhosted.org/packages/82/75/10b07479800a5a8947fd0e79001b009bded2a17ea5af96865d677eb91a98/ddtrace-4.3.0-cp314-cp314-macosx_14_0_arm64.whl", hash = "sha256:e26eb6de7eda425d75f5a1f55e55ad2d13e56f51b43c4b656478367a6692e0bd", size = 6904866, upload-time = "2026-01-27T20:54:38.633Z" }, { url = "https://files.pythonhosted.org/packages/0e/b2/37f8cf8f57d17f350d2ab86ee814fc5b6c600d0ea2ee2ea8f96be1178cd0/ddtrace-4.3.0-cp314-cp314-macosx_14_0_x86_64.whl", hash = "sha256:f7ce739a6ef9b4d210a746327d377234b1996080028eddbe9c6a1f35193c348e", size = 7329967, upload-time = "2026-01-27T20:54:41.296Z" }, { url = "https://files.pythonhosted.org/packages/19/c7/61b9a857f7b43234b896fd5e80d994f9efa007b0980887bf6d4d48ab6c20/ddtrace-4.3.0-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:0dff123cc9e39ff393c164198bb166270bcc826a87009af9b4f1431653aef531", size = 7721410, upload-time = "2026-01-27T20:54:43.85Z" }, @@ -951,18 +625,6 @@ version = "1.8.20" source = { registry = "https://pypi.org/simple" } sdist = { url = "https://files.pythonhosted.org/packages/e0/b7/cd8080344452e4874aae67c40d8940e2b4d47b01601a8fd9f44786c757c7/debugpy-1.8.20.tar.gz", hash = "sha256:55bc8701714969f1ab89a6d5f2f3d40c36f91b2cbe2f65d98bf8196f6a6a2c33", size = 1645207, upload-time = "2026-01-29T23:03:28.199Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/51/56/c3baf5cbe4dd77427fd9aef99fcdade259ad128feeb8a786c246adb838e5/debugpy-1.8.20-cp311-cp311-macosx_15_0_universal2.whl", hash = "sha256:eada6042ad88fa1571b74bd5402ee8b86eded7a8f7b827849761700aff171f1b", size = 2208318, upload-time = "2026-01-29T23:03:36.481Z" }, - { url = "https://files.pythonhosted.org/packages/9a/7d/4fa79a57a8e69fe0d9763e98d1110320f9ecd7f1f362572e3aafd7417c9d/debugpy-1.8.20-cp311-cp311-manylinux_2_34_x86_64.whl", hash = "sha256:7de0b7dfeedc504421032afba845ae2a7bcc32ddfb07dae2c3ca5442f821c344", size = 3171493, upload-time = "2026-01-29T23:03:37.775Z" }, - { url = "https://files.pythonhosted.org/packages/7d/f2/1e8f8affe51e12a26f3a8a8a4277d6e60aa89d0a66512f63b1e799d424a4/debugpy-1.8.20-cp311-cp311-win32.whl", hash = "sha256:773e839380cf459caf73cc533ea45ec2737a5cc184cf1b3b796cd4fd98504fec", size = 5209240, upload-time = "2026-01-29T23:03:39.109Z" }, - { url = "https://files.pythonhosted.org/packages/d5/92/1cb532e88560cbee973396254b21bece8c5d7c2ece958a67afa08c9f10dc/debugpy-1.8.20-cp311-cp311-win_amd64.whl", hash = "sha256:1f7650546e0eded1902d0f6af28f787fa1f1dbdbc97ddabaf1cd963a405930cb", size = 5233481, upload-time = "2026-01-29T23:03:40.659Z" }, - { url = "https://files.pythonhosted.org/packages/14/57/7f34f4736bfb6e00f2e4c96351b07805d83c9a7b33d28580ae01374430f7/debugpy-1.8.20-cp312-cp312-macosx_15_0_universal2.whl", hash = "sha256:4ae3135e2089905a916909ef31922b2d733d756f66d87345b3e5e52b7a55f13d", size = 2550686, upload-time = "2026-01-29T23:03:42.023Z" }, - { url = "https://files.pythonhosted.org/packages/ab/78/b193a3975ca34458f6f0e24aaf5c3e3da72f5401f6054c0dfd004b41726f/debugpy-1.8.20-cp312-cp312-manylinux_2_34_x86_64.whl", hash = "sha256:88f47850a4284b88bd2bfee1f26132147d5d504e4e86c22485dfa44b97e19b4b", size = 4310588, upload-time = "2026-01-29T23:03:43.314Z" }, - { url = "https://files.pythonhosted.org/packages/c1/55/f14deb95eaf4f30f07ef4b90a8590fc05d9e04df85ee379712f6fb6736d7/debugpy-1.8.20-cp312-cp312-win32.whl", hash = "sha256:4057ac68f892064e5f98209ab582abfee3b543fb55d2e87610ddc133a954d390", size = 5331372, upload-time = "2026-01-29T23:03:45.526Z" }, - { url = "https://files.pythonhosted.org/packages/a1/39/2bef246368bd42f9bd7cba99844542b74b84dacbdbea0833e610f384fee8/debugpy-1.8.20-cp312-cp312-win_amd64.whl", hash = "sha256:a1a8f851e7cf171330679ef6997e9c579ef6dd33c9098458bd9986a0f4ca52e3", size = 5372835, upload-time = "2026-01-29T23:03:47.245Z" }, - { url = "https://files.pythonhosted.org/packages/15/e2/fc500524cc6f104a9d049abc85a0a8b3f0d14c0a39b9c140511c61e5b40b/debugpy-1.8.20-cp313-cp313-macosx_15_0_universal2.whl", hash = "sha256:5dff4bb27027821fdfcc9e8f87309a28988231165147c31730128b1c983e282a", size = 2539560, upload-time = "2026-01-29T23:03:48.738Z" }, - { url = "https://files.pythonhosted.org/packages/90/83/fb33dcea789ed6018f8da20c5a9bc9d82adc65c0c990faed43f7c955da46/debugpy-1.8.20-cp313-cp313-manylinux_2_34_x86_64.whl", hash = "sha256:84562982dd7cf5ebebfdea667ca20a064e096099997b175fe204e86817f64eaf", size = 4293272, upload-time = "2026-01-29T23:03:50.169Z" }, - { url = "https://files.pythonhosted.org/packages/a6/25/b1e4a01bfb824d79a6af24b99ef291e24189080c93576dfd9b1a2815cd0f/debugpy-1.8.20-cp313-cp313-win32.whl", hash = "sha256:da11dea6447b2cadbf8ce2bec59ecea87cc18d2c574980f643f2d2dfe4862393", size = 5331208, upload-time = "2026-01-29T23:03:51.547Z" }, - { url = "https://files.pythonhosted.org/packages/13/f7/a0b368ce54ffff9e9028c098bd2d28cfc5b54f9f6c186929083d4c60ba58/debugpy-1.8.20-cp313-cp313-win_amd64.whl", hash = "sha256:eb506e45943cab2efb7c6eafdd65b842f3ae779f020c82221f55aca9de135ed7", size = 5372930, upload-time = "2026-01-29T23:03:53.585Z" }, { url = "https://files.pythonhosted.org/packages/33/2e/f6cb9a8a13f5058f0a20fe09711a7b726232cd5a78c6a7c05b2ec726cff9/debugpy-1.8.20-cp314-cp314-macosx_15_0_universal2.whl", hash = "sha256:9c74df62fc064cd5e5eaca1353a3ef5a5d50da5eb8058fcef63106f7bebe6173", size = 2538066, upload-time = "2026-01-29T23:03:54.999Z" }, { url = "https://files.pythonhosted.org/packages/c5/56/6ddca50b53624e1ca3ce1d1e49ff22db46c47ea5fb4c0cc5c9b90a616364/debugpy-1.8.20-cp314-cp314-manylinux_2_34_x86_64.whl", hash = "sha256:077a7447589ee9bc1ff0cdf443566d0ecf540ac8aa7333b775ebcb8ce9f4ecad", size = 4269425, upload-time = "2026-01-29T23:03:56.518Z" }, { url = "https://files.pythonhosted.org/packages/c5/d9/d64199c14a0d4c476df46c82470a3ce45c8d183a6796cfb5e66533b3663c/debugpy-1.8.20-cp314-cp314-win32.whl", hash = "sha256:352036a99dd35053b37b7803f748efc456076f929c6a895556932eaf2d23b07f", size = 5331407, upload-time = "2026-01-29T23:03:58.481Z" }, @@ -1076,41 +738,6 @@ name = "fastnumbers" version = "5.1.1" source = { registry = "https://pypi.org/simple" } sdist = { url = "https://files.pythonhosted.org/packages/75/bf/c69642300a98e8b61047fa17ee7c925a8e65a12e194e98dda7ec1eefaf4b/fastnumbers-5.1.1.tar.gz", hash = "sha256:183fa021cdc052edaeede5c23e3086461deb7562b567614edf71b29515f5fa4b", size = 193827, upload-time = "2024-12-15T07:28:51.124Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/f9/2d/79b651d72295541d06f9f413767a901726e7de7748f908db6d5962f2afbe/fastnumbers-5.1.1-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:ac49a019283a737b887f5fa50e8d1670cfd2f685256a7f31a8da33b70df701e1", size = 304396, upload-time = "2024-12-15T07:26:49.733Z" }, - { url = "https://files.pythonhosted.org/packages/ee/41/b41ca8b75a0760b81b9a5e859ea1c366f644e119615fe3feb1e30ade1652/fastnumbers-5.1.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:a00d105ba2484360d39cf514a16e97e1f66cf053fcc7afd16f95dbbb6de8ed9d", size = 171738, upload-time = "2024-12-15T07:26:52.336Z" }, - { url = "https://files.pythonhosted.org/packages/ff/c3/bdc36067cf111cd2f84e7877e0cbdf3bed5fb179fc2f6c969e79ff9fa693/fastnumbers-5.1.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:216cb1e3f600ff91164c85379241a4f77ed7d1f8e65ffae4ccf3ef34662b9d8a", size = 170015, upload-time = "2024-12-15T07:26:55.003Z" }, - { url = "https://files.pythonhosted.org/packages/b5/6e/7235825baa8b60286c5b0ae605f778db9047be14529f44cc31159014806d/fastnumbers-5.1.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:feb3f3114a3a847f0896ca3d563bf61e3a95ebf51d2308170aed5a7aad88fec3", size = 1664356, upload-time = "2024-12-15T07:26:56.893Z" }, - { url = "https://files.pythonhosted.org/packages/de/6e/fe8c4bde25d38862e98843b50c891068865d75113b2701436a7a4f950231/fastnumbers-5.1.1-cp311-cp311-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b65dfb82b3a5cdd0ac53227b5caae47d98034ae4a8966de89e2ac58639ba14a4", size = 1686830, upload-time = "2024-12-15T07:26:59.857Z" }, - { url = "https://files.pythonhosted.org/packages/f2/37/47727d28780978ba8969524ee2e0545f74080383497574e7df17ff41a19a/fastnumbers-5.1.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:cf7e72ea226a8a1289045f5dfc86d685c2890322f754f8f8eabcb30cf2bef9f2", size = 1675741, upload-time = "2024-12-15T07:27:02.966Z" }, - { url = "https://files.pythonhosted.org/packages/11/fc/0e8da8c4692ba6a4f7d91e62bf6579fcd0fa8a72fe6f768d5244cf70f3fb/fastnumbers-5.1.1-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:18160ce6b574e230204774d12a8a00bb5868dc22bf28e445117ca26a8b9a6fff", size = 2424526, upload-time = "2024-12-15T07:27:04.638Z" }, - { url = "https://files.pythonhosted.org/packages/9c/a4/48f03bca7f8c3d326d8b1c6b1d0fc94630f12a1be414d25049272dfb62e9/fastnumbers-5.1.1-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:1681e2b37628ea5a3dc43dfc0a4e3f6eebf388d76c91f69b48e9fe1431c2d9ea", size = 2575006, upload-time = "2024-12-15T07:27:07.765Z" }, - { url = "https://files.pythonhosted.org/packages/6b/38/c5361fdf085a78d934e6d503e94fed183db436aa9958816783b0b7a2d192/fastnumbers-5.1.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:1ab4faa10b35dc3ea53d83a4107a3b338a39cf500d2f6e0a44f930ad694fa0a9", size = 2516000, upload-time = "2024-12-15T07:27:09.443Z" }, - { url = "https://files.pythonhosted.org/packages/46/16/34109c8a27e016799b2538a03184d4d59a66787432b8d5bf5d1fbc403ac5/fastnumbers-5.1.1-cp311-cp311-win32.whl", hash = "sha256:98b9da1a3565f939800b99471e1cb678744e3dd761571bc0b2b03794dd884039", size = 117636, upload-time = "2024-12-15T07:27:12.234Z" }, - { url = "https://files.pythonhosted.org/packages/a1/3a/899bf5fe59aaee646b453b106c1d0cf978574732f0650b99ba004c261059/fastnumbers-5.1.1-cp311-cp311-win_amd64.whl", hash = "sha256:62c97b9141b052ecbebee1e9fbdfa7db67685602cf847bb7620eb71e5afe18b5", size = 126010, upload-time = "2024-12-15T07:27:14.667Z" }, - { url = "https://files.pythonhosted.org/packages/bf/8c/69a7884c3584bd92daac3b923fb49a10b2ee018d7259e8f0be03ea301f96/fastnumbers-5.1.1-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:e57b377419c89c23cd411abe19b911fea3879db71733751f4dd0f4504d623325", size = 305660, upload-time = "2024-12-15T07:27:16.025Z" }, - { url = "https://files.pythonhosted.org/packages/51/27/207a1b9298380e971abd7640021b71b72fda844e5d5931e85031bc6db6b2/fastnumbers-5.1.1-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:d80ecd57144c20140383ada74c7ee0f8464940d8931c04d4bdd73917200e82ef", size = 172460, upload-time = "2024-12-15T07:27:17.431Z" }, - { url = "https://files.pythonhosted.org/packages/bf/91/8601841ee9cad8628a5386131c53891777836cc6ad678bcff90d8210bd40/fastnumbers-5.1.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:12270ace75facc55426e81e94ab81e8ac0449b78775c2255af3d4a901e90b6f3", size = 170666, upload-time = "2024-12-15T07:27:19.148Z" }, - { url = "https://files.pythonhosted.org/packages/ac/00/4a3e50b1bdf6aa3b48d78ac111b9ddf61401087b1d00249f9b16ba181eb1/fastnumbers-5.1.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:68e8e2da55134e6f3680ced0799eaad00db2ed7e31b7b12e412c7af834927d15", size = 1667289, upload-time = "2024-12-15T07:27:20.501Z" }, - { url = "https://files.pythonhosted.org/packages/fc/53/d0ecbb31cd60c0bf9ef4ba4de1f56d9665bea4a142a649aa6d9316afdc40/fastnumbers-5.1.1-cp312-cp312-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3898a65a4658c9f94e4765d0a9403e9dc2b84ce707fd464b6457c809f4ca0379", size = 1690950, upload-time = "2024-12-15T07:27:22.323Z" }, - { url = "https://files.pythonhosted.org/packages/ea/0b/a7b94e4317e18939807615e7c14072f0e307fc0ba83d1548df8e4f8f07da/fastnumbers-5.1.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:95289b099deb8b3d7083866648865d542abeee722ede0dea188809ddfb0942d1", size = 1679465, upload-time = "2024-12-15T07:27:24.42Z" }, - { url = "https://files.pythonhosted.org/packages/2b/33/efe5b3a25cb35dd6da48a06c44b22b164bd5d245ade0e85423b03cc574d7/fastnumbers-5.1.1-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:95682f60228f035ea83cb3ba102e5ca1e980cccedc7532b39e05fff93ea0ec64", size = 2435702, upload-time = "2024-12-15T07:27:27.334Z" }, - { url = "https://files.pythonhosted.org/packages/6a/43/ebf6f98789108a507b28bc1c88e0328ba6ab4f46331ffae1704141909643/fastnumbers-5.1.1-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:e9683a12e357034fb0d4cfb291bb799b16c791bb224b9c05a39dfefcfc2e673d", size = 2590379, upload-time = "2024-12-15T07:27:29.033Z" }, - { url = "https://files.pythonhosted.org/packages/a1/09/02723ada3b2e4aec94bd7f48bc6f1053a5a4157d872e4279a3fbd078219e/fastnumbers-5.1.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:c092c186d36e8d27aee8e864e03aaaf219a51ee940d4a6356964d89ce8f34058", size = 2521780, upload-time = "2024-12-15T07:27:31.227Z" }, - { url = "https://files.pythonhosted.org/packages/fd/e6/2604e241c405db3540e3e7c35d025275b560e1b6eec6f78e72cc2d220351/fastnumbers-5.1.1-cp312-cp312-win32.whl", hash = "sha256:60e9d5515dfc2898a1a6f93dac7ef3406a2b122ff37eaa732b57df3bc7c93862", size = 117125, upload-time = "2024-12-15T07:27:33.751Z" }, - { url = "https://files.pythonhosted.org/packages/53/02/f3b4ce4f9c7ae2b88a825a52dcb0a9b8b13b70bdcf5066c8598252a04acd/fastnumbers-5.1.1-cp312-cp312-win_amd64.whl", hash = "sha256:070b81b10207b2f7c3bd98c1825f3c0adb6c7e18238f851572d51c882877bc02", size = 127192, upload-time = "2024-12-15T07:27:35.454Z" }, - { url = "https://files.pythonhosted.org/packages/3d/82/c37be55714cc97d68f8430726cd4880cf8d82da316fc4cad820480a274c8/fastnumbers-5.1.1-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:7109d06161000a75d8e4a2f4eb6ed3cb19d3472f5497e64b9df70f4e8ea22090", size = 305660, upload-time = "2024-12-15T07:27:38.306Z" }, - { url = "https://files.pythonhosted.org/packages/93/00/480be84bfc962ceb3cf39058acd09cd5011de6f0496bfc5fd112455d6804/fastnumbers-5.1.1-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:544e905de42679e3e80cdfb5f0f8185b498a206d33a9365f896d8842b9544550", size = 172457, upload-time = "2024-12-15T07:27:39.764Z" }, - { url = "https://files.pythonhosted.org/packages/89/16/de7c3e2b9a604bfdb0f3a905152e64c53064022e432b46f4626c931698a0/fastnumbers-5.1.1-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:e8e40437eafef22aa5ebc80f44d0f9cdf984538b3c05f57500b24695ed63b8b2", size = 170661, upload-time = "2024-12-15T07:27:41.526Z" }, - { url = "https://files.pythonhosted.org/packages/3b/62/247856faac56f08094be27db152604c10c1419feeb8d998495d2929a8fea/fastnumbers-5.1.1-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2b1831fe49d44a91e2803db231696979e6ae1d30e67679c201b7c69cfb815a19", size = 1667006, upload-time = "2024-12-15T07:27:47.52Z" }, - { url = "https://files.pythonhosted.org/packages/4b/a7/1071c2a49c1079f57c9a647352e819e08679f6187b10ad395c1c02885587/fastnumbers-5.1.1-cp313-cp313-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:9421b79e788cc9ec9266c6cfa8306d1e17f4abf0d1c1fb173d4328cc57955b61", size = 1690719, upload-time = "2024-12-15T07:27:49.222Z" }, - { url = "https://files.pythonhosted.org/packages/2f/72/bd9e62e5b0303e1c0a9682b4de3e65b0c1a8eec2ef721fe0b26829a9879e/fastnumbers-5.1.1-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:517e91bd9fd0e664eb8a81759c79e38675a94bfac8892dbc274f7430ae5be451", size = 1679059, upload-time = "2024-12-15T07:27:51.186Z" }, - { url = "https://files.pythonhosted.org/packages/92/b1/8218c61638873d74eb7518cf4bac2d7192a328efbdc780fd8a05d91008aa/fastnumbers-5.1.1-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:4479d85f246728ea5737b28ed3730cc4dbc1002bcf788ce32f9ffcb730150fa3", size = 2436131, upload-time = "2024-12-15T07:27:54.837Z" }, - { url = "https://files.pythonhosted.org/packages/f6/2b/06e947b27ca76b4ebf30363500719f27d8cdbf4b286760e3ef941b3d1308/fastnumbers-5.1.1-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:c738099125cbb0a559a59c14165090a545a892f16db102aa1f5fb930fa1a2b13", size = 2590343, upload-time = "2024-12-15T07:27:57.974Z" }, - { url = "https://files.pythonhosted.org/packages/58/41/cf5333d1013ba5afb21b40565d1c1ed0114d97b7e0ef230659ead17b870e/fastnumbers-5.1.1-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:ca0a72d750d5d78857fa5c7f9ff4645c86793b7a63ae0b6b32ef1a27af9ae398", size = 2521775, upload-time = "2024-12-15T07:27:59.694Z" }, - { url = "https://files.pythonhosted.org/packages/2c/14/fb3e0c1b92dc633da708c7438c564bdfb8c4757ad0ce1f4bf80f3fa7d0b9/fastnumbers-5.1.1-cp313-cp313-win32.whl", hash = "sha256:dc2442ceb236f4680c87aa54d1f94bd8fc4b6db8dc9ac94e602da0924aac279f", size = 117134, upload-time = "2024-12-15T07:28:01.359Z" }, - { url = "https://files.pythonhosted.org/packages/5d/af/47ce3856e5d6a10aae37dbf903c295c36702bf78d1f30c7c213460f46453/fastnumbers-5.1.1-cp313-cp313-win_amd64.whl", hash = "sha256:91a69ce09fb5079bd680464b2d850be82f5516ed67360381c9d9935431c31bc4", size = 127195, upload-time = "2024-12-15T07:28:02.617Z" }, -] [[package]] name = "filetype" @@ -1121,20 +748,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/18/79/1b8fa1bb3568781e84c9200f951c735f3f157429f44be0495da55894d620/filetype-1.2.0-py2.py3-none-any.whl", hash = "sha256:7ce71b6880181241cf7ac8697a2f1eb6a8bd9b429f7ad6d27b8db9ba5f1c2d25", size = 19970, upload-time = "2022-11-02T17:34:01.425Z" }, ] -[[package]] -name = "flake8" -version = "7.3.0" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "mccabe" }, - { name = "pycodestyle" }, - { name = "pyflakes" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/9b/af/fbfe3c4b5a657d79e5c47a2827a362f9e1b763336a52f926126aa6dc7123/flake8-7.3.0.tar.gz", hash = "sha256:fe044858146b9fc69b551a4b490d69cf960fcb78ad1edcb84e7fbb1b4a8e3872", size = 48326, upload-time = "2025-06-20T19:31:35.838Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/9f/56/13ab06b4f93ca7cac71078fbe37fcea175d3216f31f85c3168a6bbd0bb9a/flake8-7.3.0-py2.py3-none-any.whl", hash = "sha256:b9696257b9ce8beb888cdbe31cf885c90d31928fe202be0889a7cdafad32f01e", size = 57922, upload-time = "2025-06-20T19:31:34.425Z" }, -] - [[package]] name = "flasgger-tschaume" version = "0.9.7" @@ -1172,7 +785,6 @@ name = "flask-compress" version = "1.24" source = { registry = "https://pypi.org/simple" } dependencies = [ - { name = "backports-zstd", marker = "python_full_version < '3.14'" }, { name = "brotli", marker = "platform_python_implementation != 'PyPy'" }, { name = "brotlicffi", marker = "platform_python_implementation == 'PyPy'" }, { name = "flask" }, @@ -1298,30 +910,6 @@ version = "4.63.0" source = { registry = "https://pypi.org/simple" } sdist = { url = "https://files.pythonhosted.org/packages/84/69/c97f2c18e0db87d2c7b15da1974dace76ae938f1cfa22e2727a648b7ed43/fonttools-4.63.0.tar.gz", hash = "sha256:caeb583deeb5168e694b65cda8b4ee62abedfa66cf88488734466f2366b9c4e0", size = 3597189, upload-time = "2026-05-14T12:04:30.958Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/75/2b/a7f1545bdf5da69c4bda0cea2a5781f0ad2a6623e0277267672db43c5fe6/fonttools-4.63.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:2b8ae05d9eacf6081414d759c0a352769ac28ce31280d6bb8e77b03f9e3c449f", size = 2881793, upload-time = "2026-05-14T12:02:56.645Z" }, - { url = "https://files.pythonhosted.org/packages/49/50/965308c703f085f225db2886813b27e015b8b3438c350b22dd65b52c2a2c/fonttools-4.63.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:79cdc9f567aec74a72918fd060283911406750cbc9fd28c1316023deb6ce31a9", size = 2428130, upload-time = "2026-05-14T12:02:58.891Z" }, - { url = "https://files.pythonhosted.org/packages/d8/38/6937fbd7f2dc3a6b48725851bc2c15ec949b9af14d9bbcb5fe83cdf9bdf9/fonttools-4.63.0-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:2c14b4fd138c4bafcca294765c547914e1aa431ae1ca94ab99d8db08c958bd3b", size = 5111952, upload-time = "2026-05-14T12:03:01.263Z" }, - { url = "https://files.pythonhosted.org/packages/0b/43/a81f20050a3115b57d62c8e781446949512eac36690dc384ccea65ff4cc1/fonttools-4.63.0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:d76ac49f929aecaf82d83250b8347e099d7aecba0f4726c1d9b6df3b8bb5fe18", size = 5082308, upload-time = "2026-05-14T12:03:03.211Z" }, - { url = "https://files.pythonhosted.org/packages/67/00/cdd9d4944ca6ae280d01e69cc37bde3bf663630b837a6fc6d2cd65d80e0e/fonttools-4.63.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:dcf076a4474fe0d7367e5bbf5b052c7284fa1feca729c04176ce513521afd8a0", size = 5087932, upload-time = "2026-05-14T12:03:05.147Z" }, - { url = "https://files.pythonhosted.org/packages/f5/f1/0aa0dbea778c75adbef223c42019fd47d22262b905974d62d829545d485f/fonttools-4.63.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:7dd683fef0663e9f0f45cf541d788d24caa3ec9db50796b588e1757d8b3bc007", size = 5213271, upload-time = "2026-05-14T12:03:07.238Z" }, - { url = "https://files.pythonhosted.org/packages/a8/99/253e4056e1f0e67b9390125a154b73b5eb73ad521bece95c004858fdeec2/fonttools-4.63.0-cp311-cp311-win32.whl", hash = "sha256:afefc1ed0a59785a7fb06ea7e1678e849c193e1e387db783579bc7b3056fcfcb", size = 2304473, upload-time = "2026-05-14T12:03:09.271Z" }, - { url = "https://files.pythonhosted.org/packages/08/60/defa5e69641db890a63be281f41345f4c33b157824eaf0b9fad3e08b0dcb/fonttools-4.63.0-cp311-cp311-win_amd64.whl", hash = "sha256:063e08bd17bd5a90127a14123de0d6a952dbc847695fd98b63c043d58057f90c", size = 2356389, upload-time = "2026-05-14T12:03:11.53Z" }, - { url = "https://files.pythonhosted.org/packages/08/ef/b3c6b9b5be2f82416d73fe2ed2e96e2793cd80e7510bd6a17ca79cdd88ec/fonttools-4.63.0-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:37dd23e621e3b0aef1baa70a303b80aaf38449632cfc8fd2a55fb285bbccfc02", size = 2881131, upload-time = "2026-05-14T12:03:13.386Z" }, - { url = "https://files.pythonhosted.org/packages/44/a0/c815bea63117fa63e4e1c01f8a1110d2112fa003f838e6467094ec2432ce/fonttools-4.63.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:a9faff9e0c1f76f9fd55899d2ce785832efebab37eb8ae13995853aef178bef0", size = 2426704, upload-time = "2026-05-14T12:03:15.801Z" }, - { url = "https://files.pythonhosted.org/packages/44/04/0b91d8e916e92ad1fac9e4624760baf0fd5ff2ead614c2f68fb21373f03f/fonttools-4.63.0-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:ef3048ef05dbb552b89817713d9cac912e00d0fde4a3105c00d29e52e10c89af", size = 5044298, upload-time = "2026-05-14T12:03:18.085Z" }, - { url = "https://files.pythonhosted.org/packages/77/c7/2342da9830e3e9d4870305ca5d2091d2a83284f2953079b7bdd3b5e029d8/fonttools-4.63.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:58dc6bb86a78d782f00f9190ca02c119cf5bbe2807536e361e18d42019f877d8", size = 4999800, upload-time = "2026-05-14T12:03:20.161Z" }, - { url = "https://files.pythonhosted.org/packages/e6/6d/67fe16c48d7ce050979b33f47e0d28a318f02da030602e944c34f7a16ef3/fonttools-4.63.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:ee08ebfa58f6e1aeff5697ab9582105bb620008c1caafb681e4c557e7483027b", size = 4982666, upload-time = "2026-05-14T12:03:22.87Z" }, - { url = "https://files.pythonhosted.org/packages/f2/00/3bbab338c07c71fa56269953845e92c951a61457bbbb0f1022551ea266d9/fonttools-4.63.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:27fdc65af8da6f88b9c6121c47a464cbe359fcfff7ff6fc2d37a1f395d755b78", size = 5133598, upload-time = "2026-05-14T12:03:25.168Z" }, - { url = "https://files.pythonhosted.org/packages/62/f2/aa27c7f98db5b064883dadcc5283947e81e034de42e22a33675878d98b54/fonttools-4.63.0-cp312-cp312-win32.whl", hash = "sha256:af2fd1664d00a397d75f806985ddb36282091c2131a73a6485c23b4a34722263", size = 2292575, upload-time = "2026-05-14T12:03:27.496Z" }, - { url = "https://files.pythonhosted.org/packages/87/36/cccb9bc2a6ab63d1b2980374f0dca72ce95ae267c9b4cfe77455bb70d0d4/fonttools-4.63.0-cp312-cp312-win_amd64.whl", hash = "sha256:59ac449f8cca9b4ffa08d2e7bbadad87ce710d69d1eda5c3c1ce579baa987272", size = 2343211, upload-time = "2026-05-14T12:03:30.057Z" }, - { url = "https://files.pythonhosted.org/packages/0f/8d/d8fec3dcde2963f8c908fb315e5ff2cd0ac34f82394bbbf73a2aa5145ce3/fonttools-4.63.0-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:cd7e9857e5e63738b9d9fd707bc1f59c8b09e5177726d23664db393c59bb08bd", size = 2876062, upload-time = "2026-05-14T12:03:32.554Z" }, - { url = "https://files.pythonhosted.org/packages/ef/71/d935dc54e4ff121bfdd11e08702db63a7e6f25af21d8a3d7b7212df53641/fonttools-4.63.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:c2a2a42198b696a6f48fad91709afb55176e66a5e566131219dba372fb7f8c59", size = 2424594, upload-time = "2026-05-14T12:03:34.86Z" }, - { url = "https://files.pythonhosted.org/packages/8e/40/e76320afa1df918e146155ef239b1719ee266092e96f5423bfd075affba1/fonttools-4.63.0-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:1e874792a8212b44583ea02189d9e693906b2f78b261f372f95d6c563210ac1d", size = 5024840, upload-time = "2026-05-14T12:03:36.745Z" }, - { url = "https://files.pythonhosted.org/packages/ce/36/0b805d8c485f872f65a509cbe3b58a5d0d17bee855333b54a150c79d3061/fonttools-4.63.0-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:22135da48a348785c5e2d5d2d9d6bec5ed44adacbaeb9db12d9493bf6c6bfa68", size = 4975801, upload-time = "2026-05-14T12:03:38.833Z" }, - { url = "https://files.pythonhosted.org/packages/c8/26/2cee03d0aa083ab022da5c07aff9ed3f689da1defb81ad6917c9627896da/fonttools-4.63.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:ccf41f2efdf56994d22d73bef4ced1052161958169428d06ba9724ea9e9a64be", size = 4965009, upload-time = "2026-05-14T12:03:41.494Z" }, - { url = "https://files.pythonhosted.org/packages/7e/48/cc4b66d9058c0d0982c833fad10127c4b0e9324606aafa41382295ca4102/fonttools-4.63.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:9ced0bd02ac751dd6319b0da88aaef24414e3b0dbc32bb4f24944821a3741a27", size = 5105892, upload-time = "2026-05-14T12:03:43.525Z" }, - { url = "https://files.pythonhosted.org/packages/d8/1f/a98a30a814b9ddef3a2e706025f90b9e0bc94890e6cb15254bc86547d11a/fonttools-4.63.0-cp313-cp313-win32.whl", hash = "sha256:85be818f5506e8a7753153def2c9550178f0ecae6a47b5e0e8dbb23f7cc90380", size = 2291313, upload-time = "2026-05-14T12:03:45.594Z" }, - { url = "https://files.pythonhosted.org/packages/92/46/5177b01f3b4abfdd4409f31cca4ab279c9343a26efbe9ec78c97fc612e02/fonttools-4.63.0-cp313-cp313-win_amd64.whl", hash = "sha256:ba04cb5891d4c0c21b6da95eda8d7b090021508a294fff33464fc7d241e0856b", size = 2342299, upload-time = "2026-05-14T12:03:47.414Z" }, { url = "https://files.pythonhosted.org/packages/27/d2/23d25e3f247b328be58d04a4c9f894178a0d1eda7d42867cfb388adaf416/fonttools-4.63.0-cp314-cp314-macosx_10_15_universal2.whl", hash = "sha256:fd1e3094f42d806d3d7c79162fc59e5910fcbe3a7360c385b8da969bc4493745", size = 2875338, upload-time = "2026-05-14T12:03:50.052Z" }, { url = "https://files.pythonhosted.org/packages/cd/58/7dfa0c761cb3b2964e2a84c4dc986c926a87de0cb9fb60d5b28ded3f2914/fonttools-4.63.0-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:6e528da43bc3791085f8cb6141b1d13e459226790240340fcbb4625649238b03", size = 2422661, upload-time = "2026-05-14T12:03:52.154Z" }, { url = "https://files.pythonhosted.org/packages/dd/87/64cfa18a7a1621d17b7f4502b2b0ed8a135a90c3db51ea590ee99043e76b/fonttools-4.63.0-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:6b2248c5decb223562f7902ff6325077a073f608ee8e33e88ad88db734eb9f49", size = 5010526, upload-time = "2026-05-14T12:03:54.647Z" }, @@ -1374,32 +962,6 @@ dependencies = [ ] sdist = { url = "https://files.pythonhosted.org/packages/c4/cb/98aa3a299e2fc4a2372b5d124863e02965b64579ffc29fe54d0641e65b2f/gevent-26.5.0.tar.gz", hash = "sha256:1655eb04c1e20d71b2aa4a3c7528162dd58ff6cc46a037af1f01f534c80fefba", size = 6712354, upload-time = "2026-05-20T21:22:45.132Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/2a/ea/ea87c08931c9e4c6c40bb05a2cb19c2d6f93fe6e0052f9152ea5ade6d037/gevent-26.5.0-cp311-cp311-manylinux_2_28_aarch64.whl", hash = "sha256:cd3dc60581687e2618286108f8e2f820d8446be4b34131065011c066e911d39c", size = 1768295, upload-time = "2026-05-20T21:17:29.438Z" }, - { url = "https://files.pythonhosted.org/packages/da/92/1d0e7287ae55700a8d25153ac736896bd9bcc3f85a12d374ef398db4b33c/gevent-26.5.0-cp311-cp311-manylinux_2_28_ppc64le.whl", hash = "sha256:dc7fa28b2d627f8e87595f39043b6dec71e8e7fb97e685e5506c47cf3ff8cb2e", size = 1862627, upload-time = "2026-05-20T21:15:59.365Z" }, - { url = "https://files.pythonhosted.org/packages/3a/4c/7f5ed67e52dfdef4ff91ae1a6fb28186d52e2496962edc8f17bdea9ab2c0/gevent-26.5.0-cp311-cp311-manylinux_2_28_s390x.whl", hash = "sha256:68c5fc21cef80268cdff88a4ae6c025fabb019b071f6f8ee4d20a7bccbddb873", size = 1804690, upload-time = "2026-05-20T21:30:51.713Z" }, - { url = "https://files.pythonhosted.org/packages/4c/75/0f5da6ca045f8a052203e1810058029f4b682507a789b413cac7d28bae28/gevent-26.5.0-cp311-cp311-manylinux_2_28_x86_64.whl", hash = "sha256:d325502eb0695708ef8c899f605573ed6847f3961f8159627dba267fbf3ce457", size = 2119054, upload-time = "2026-05-20T20:35:22.678Z" }, - { url = "https://files.pythonhosted.org/packages/6e/f1/fcff7f7fad2bb33f3742db6b2145825a2191c0cd31d75789b0741fd28faf/gevent-26.5.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:a11daf3a588b932c8bf965fb18444c69aff48badec88435e988cf8d67137075a", size = 1778784, upload-time = "2026-05-20T21:16:38.182Z" }, - { url = "https://files.pythonhosted.org/packages/98/57/151314f00bdc6ba77333febb3e9dc97fdf94d79426559b4fa8332f0c2b6e/gevent-26.5.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:1101b5ef82a3fb178550cfd80f32293dc8dd2f3d0828292223ebba29d6f76e33", size = 2145373, upload-time = "2026-05-20T20:43:27.255Z" }, - { url = "https://files.pythonhosted.org/packages/1a/b5/7a02f711db62cbed1c1a00e1f9ff50eef95ccc78d4c04a0f93636655d1b7/gevent-26.5.0-cp311-cp311-win_amd64.whl", hash = "sha256:5233109ad4f3af16393ba9888f238919a05ce15ce68d6831ac8a0da8dfb750ae", size = 1696576, upload-time = "2026-05-20T20:15:49.62Z" }, - { url = "https://files.pythonhosted.org/packages/f8/9b/5022adc310697ef25c6fb22eb9bf0ebcad3427b51776e882709de9a8b6d7/gevent-26.5.0-cp311-cp311-win_arm64.whl", hash = "sha256:3be804565168ffacebeb21af9f1cd689831a89f0f12fc0c3f423c730c3c9eb31", size = 1552095, upload-time = "2026-05-20T20:16:54.81Z" }, - { url = "https://files.pythonhosted.org/packages/37/0b/1a530b2db55c97cc0cf44116201f538f3033c04c1d2aca143979b412f4be/gevent-26.5.0-cp312-cp312-macosx_11_0_universal2.whl", hash = "sha256:e80ad2a8a1e8bdaa5605e3bf4929e0cebf9ea7b8237c83362f7257698bb14280", size = 2929714, upload-time = "2026-05-20T20:13:24.656Z" }, - { url = "https://files.pythonhosted.org/packages/b9/df/32fe851ed5f68493f354e09b19bdebae0de1185be4db0b2988e71e737fd3/gevent-26.5.0-cp312-cp312-manylinux_2_28_aarch64.whl", hash = "sha256:fe42c037253580a3386fce275f8a2a845e540f5a729916934a732f13d42e72cc", size = 1784838, upload-time = "2026-05-20T21:17:31.063Z" }, - { url = "https://files.pythonhosted.org/packages/e5/9a/21332674f9a10e8cdf13b41b52e9d663647a1c6e1dc3c62b07c0aeefd360/gevent-26.5.0-cp312-cp312-manylinux_2_28_ppc64le.whl", hash = "sha256:9f463c7d6f69d13b6fe8e3b832a6175a6e95328a940f38495d25496d1ae8ad88", size = 1880440, upload-time = "2026-05-20T21:16:00.881Z" }, - { url = "https://files.pythonhosted.org/packages/9f/b1/5f8a4196113cf7f3fdd987b483f7e6b10c28ea3930c4727e31ba8cce51b6/gevent-26.5.0-cp312-cp312-manylinux_2_28_s390x.whl", hash = "sha256:96d5e96b1b14a4c1023dcfcc114533217f13febc3b6169254f23fc18d19fee29", size = 1831592, upload-time = "2026-05-20T21:30:53.832Z" }, - { url = "https://files.pythonhosted.org/packages/4e/69/1559b1f6b5107a9118fccd300240879bd581b6d87b03d568d0d155ea702c/gevent-26.5.0-cp312-cp312-manylinux_2_28_x86_64.whl", hash = "sha256:bccff69c462e3650a0fd1d4e9cfc8b6effe15f3e9b1cad20a7bb5ce14b057efd", size = 2114915, upload-time = "2026-05-20T20:35:25.041Z" }, - { url = "https://files.pythonhosted.org/packages/e4/32/602c499d54472f64e5cdf6013aeab5ce6aa6fed005387e8b4f2d22f5dc8d/gevent-26.5.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:f519139354d5ca7625df9ddb1b2ffada885c14abc5b4dbae3682e967ddf79669", size = 1796906, upload-time = "2026-05-20T21:16:39.65Z" }, - { url = "https://files.pythonhosted.org/packages/f9/3c/2fe77ee6e3d381b3c50c0b7d6c4c08c08b8ff5e8c0d9dd51a3b426d61eec/gevent-26.5.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:0bf57df54f1c66273bf3601c2a1e41b12138fe848933718369663bc54f177ca2", size = 2140806, upload-time = "2026-05-20T20:43:28.895Z" }, - { url = "https://files.pythonhosted.org/packages/22/d5/4620797bbd9c88f4541188efc138b0d615f9834db540da36a2249ee929c5/gevent-26.5.0-cp312-cp312-win_amd64.whl", hash = "sha256:e49ce0de007dfd7412edbc2b5d41cce33b049bb1b7086f50be5a09e601bde603", size = 1699995, upload-time = "2026-05-20T20:15:39.311Z" }, - { url = "https://files.pythonhosted.org/packages/cb/83/ac3477dfc0f9fd80c88110102c73cefc35dcded2b248544f45a8fa5412df/gevent-26.5.0-cp312-cp312-win_arm64.whl", hash = "sha256:5c5ff29495a2eed2a244de8150f21893d6c1b15d8b4b5719ab4bbfa06db1e28f", size = 1547433, upload-time = "2026-05-20T20:15:51.656Z" }, - { url = "https://files.pythonhosted.org/packages/7d/47/5b992ab9c8037633cfd0fe698a97a878f59d8eb53c381e91e9a1a76fd215/gevent-26.5.0-cp313-cp313-macosx_11_0_universal2.whl", hash = "sha256:9b4d3f34c913d1a6bec6d030365a517f3b527a9773b12e58cf56c3339bbe96e6", size = 2952523, upload-time = "2026-05-20T20:13:04.698Z" }, - { url = "https://files.pythonhosted.org/packages/74/11/c7dfc773eb43331a682efed610b49df6e976331f1b0e1c592a0c35d29872/gevent-26.5.0-cp313-cp313-manylinux_2_28_aarch64.whl", hash = "sha256:1d8da4e799431feeb4c9e441ac7431f0baabb9106976790d884289d08ac08359", size = 1787044, upload-time = "2026-05-20T21:17:32.845Z" }, - { url = "https://files.pythonhosted.org/packages/ae/28/9812933dac93560f46910a9e834805fe76f822c408bd1c20cdf299d7c311/gevent-26.5.0-cp313-cp313-manylinux_2_28_ppc64le.whl", hash = "sha256:51becdb4c30a8f45c1c028ad7a97bf5a1ed141f74b159a31aa9cc6aa1e6263a6", size = 1882342, upload-time = "2026-05-20T21:16:02.645Z" }, - { url = "https://files.pythonhosted.org/packages/96/4b/514f248f69b2230b69b0bb17f4158b0b05dd4b2cb469a60ab206e9fe7496/gevent-26.5.0-cp313-cp313-manylinux_2_28_s390x.whl", hash = "sha256:c42bbcd3d453b08ad8915fd3feaf3d44a3562cdf1c7b208f9837149711e16d9d", size = 1834136, upload-time = "2026-05-20T21:30:55.739Z" }, - { url = "https://files.pythonhosted.org/packages/53/67/f5f30716efca99b6200ae89a9303a7e94dae085b7de6f6d0033c52a37f4b/gevent-26.5.0-cp313-cp313-manylinux_2_28_x86_64.whl", hash = "sha256:bd3445e4fbeeb46690ed8efe94b8d1d46b14aa04af8866ae7a8da5997828d1c6", size = 2115349, upload-time = "2026-05-20T20:35:28.132Z" }, - { url = "https://files.pythonhosted.org/packages/09/d8/60e8809bde7986e6c4e6d106080b3603fa09b3bb0255fed1a4d8282e3ca2/gevent-26.5.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:b573d5b2826edc705f31f07da6889ad483a6a0d64944ebd8d32205f7c5bf46fb", size = 1799443, upload-time = "2026-05-20T21:16:41.928Z" }, - { url = "https://files.pythonhosted.org/packages/f8/41/b388b2b1f0a026ea30687e51ddf81dbb783dfb55fac0a16708d2821d99e5/gevent-26.5.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:4d53b1b28f2082a151bded2850b53f6baed02f742d2a1584029e8bd42d457fb4", size = 2141117, upload-time = "2026-05-20T20:43:30.694Z" }, - { url = "https://files.pythonhosted.org/packages/b1/f3/ac9a4b0de487e390c5d53a908a9347c0df0102de2bbf3e8603087769191d/gevent-26.5.0-cp313-cp313-win_amd64.whl", hash = "sha256:23569ce0c254eb821fc3dcfe250843dde8b3180b09bae9e222e41aa3fa4885b7", size = 1699862, upload-time = "2026-05-20T20:15:33.642Z" }, - { url = "https://files.pythonhosted.org/packages/2a/cf/1ef1fc9b390563c0f97702f94a557d1649b7bbb5724f9b86c2122747e92f/gevent-26.5.0-cp313-cp313-win_arm64.whl", hash = "sha256:40cdcdb2e404b6c82b82a4576bdb33958f23fc2deb0d933e9e022b362001e647", size = 1545341, upload-time = "2026-05-20T20:16:26.229Z" }, { url = "https://files.pythonhosted.org/packages/17/55/7d98d3888e7bb9ad4656420dec69232ecbbea48792aff9295d0ad7cf8435/gevent-26.5.0-cp314-cp314-macosx_11_0_universal2.whl", hash = "sha256:75a0050e4b87f08ddee7e56f59e6014cd7fcdc3153046c09a847940515d12c85", size = 2968223, upload-time = "2026-05-20T20:13:17.223Z" }, { url = "https://files.pythonhosted.org/packages/f8/b4/e8e116fcbcb9dc0bf3acc50037f86e1204c217c8ed5defde68be11b3aab6/gevent-26.5.0-cp314-cp314-manylinux_2_28_aarch64.whl", hash = "sha256:fd1a0b83a04e19378d9466ae0ee2b5937cf1d7fbfdcb916b2aea82179a208574", size = 1793926, upload-time = "2026-05-20T21:17:34.321Z" }, { url = "https://files.pythonhosted.org/packages/28/07/7b267e9754b661defb93542e97731a4df21f8a40dc0f6c853faa717cf124/gevent-26.5.0-cp314-cp314-manylinux_2_28_ppc64le.whl", hash = "sha256:4c964c15076e76391d523ec24202f579a2535f7e301a40efb1656ae046d3eb69", size = 1887632, upload-time = "2026-05-20T21:16:04.158Z" }, @@ -1438,36 +1000,6 @@ version = "3.5.1" source = { registry = "https://pypi.org/simple" } sdist = { url = "https://files.pythonhosted.org/packages/6d/6e/802acd792aebb2256fbbee8cacf2727faaeb6f240ac11008f09eae4414bc/greenlet-3.5.1.tar.gz", hash = "sha256:5a56aeb7d5d9cc4b3a735efb5095bd4b4f6f0e4f93e5ca876d0e2315137b7829", size = 197356, upload-time = "2026-05-20T15:05:03.917Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/42/3c/ff890b466eaba2b0f5e6bdfff025f8c75f41b8ffdc3dbc3d24ad261e764a/greenlet-3.5.1-cp311-cp311-macosx_11_0_universal2.whl", hash = "sha256:73f78f9b9f0a5c06e5c946ba1e8e36f5114923b6be109ee618c54f079c3ea14f", size = 284764, upload-time = "2026-05-20T13:09:10.204Z" }, - { url = "https://files.pythonhosted.org/packages/81/0e/5e5457be3d256918f6a4756f073548a3f0190836e2cc94aa6d0d617a940b/greenlet-3.5.1-cp311-cp311-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:a0cbed8bb44e23c5b199f888f4e4ce096b45ad9f25ff74a7ad0213875e936bb2", size = 603479, upload-time = "2026-05-20T14:00:04.757Z" }, - { url = "https://files.pythonhosted.org/packages/6d/e1/f89a21d58d308298e6f275f13a1b472ed96c680b601a371b08be6a725989/greenlet-3.5.1-cp311-cp311-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:a203a8bd0acb0701653d3bbb26e404854a68674139ed5cbb778830f42b09bb33", size = 615495, upload-time = "2026-05-20T14:05:40.87Z" }, - { url = "https://files.pythonhosted.org/packages/2c/f2/8fd452fd81adb9ec79c8275c1375702ab0fd6bee4952da12eaa09b9508d8/greenlet-3.5.1-cp311-cp311-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:6ebeb75c81211f5c702576cf81f315e77e23cfdb2c7c6fcb9dd143e6de35c360", size = 623515, upload-time = "2026-05-20T14:09:07.853Z" }, - { url = "https://files.pythonhosted.org/packages/75/de/af6cef182862d2ccd6975440d21c9058a77c3f9b469abf94e322dfd2e0e3/greenlet-3.5.1-cp311-cp311-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:8a271fcd66c74615cda6a964fda3f304267a12e50a084472218a39bb0376f563", size = 614754, upload-time = "2026-05-20T13:14:24.947Z" }, - { url = "https://files.pythonhosted.org/packages/ec/bc/c318aa9f3ffc77320fddcee3d892be957b42e2ff947198d9450b004f3a38/greenlet-3.5.1-cp311-cp311-manylinux_2_39_riscv64.whl", hash = "sha256:017a544f0385d441e88714160d089d6900ef46c9eff9d99b6715a5ef2d127747", size = 418439, upload-time = "2026-05-20T14:01:38.446Z" }, - { url = "https://files.pythonhosted.org/packages/1a/c6/50e520283a9f19388a7326b05f9e8637e566003475eacaadad04f558c68d/greenlet-3.5.1-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:ded7b068c7c31c1a8657d4fd42d886b3e051ae29f88b80c5ff9d502257b0f071", size = 1574097, upload-time = "2026-05-20T14:02:24.003Z" }, - { url = "https://files.pythonhosted.org/packages/21/1c/13abd1f4860d987fa5e1170a01930d6e6cd40d328de487a3c9fdaff0ffd0/greenlet-3.5.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:d0932b81d72f552ded9d810d00021b64d89f2195a91ce115b893f943b7a4ab3c", size = 1641058, upload-time = "2026-05-20T13:14:31.83Z" }, - { url = "https://files.pythonhosted.org/packages/f5/56/5f332b7705545eac2dc01b4e9254d24a793f2656d55d5cc6b94ee59d22ae/greenlet-3.5.1-cp311-cp311-win_amd64.whl", hash = "sha256:88e300d136eac057b2397aa1cfd7328b4c87c7eb66a09c7bc6a1292234db474e", size = 238089, upload-time = "2026-05-20T13:14:03.229Z" }, - { url = "https://files.pythonhosted.org/packages/d9/a9/a3c2fa886c5b94863fb0e61b3bc14610b7aa94cf4f17f8741b11708305fc/greenlet-3.5.1-cp311-cp311-win_arm64.whl", hash = "sha256:cc6ab7e555c8a112ad3a76e368e86e12a2754bcae1652a5602e133ec7b635523", size = 234989, upload-time = "2026-05-20T13:08:27.715Z" }, - { url = "https://files.pythonhosted.org/packages/c4/37/4549f149c9797c21b32c2683c33522af22522099de128b2406672526d005/greenlet-3.5.1-cp312-cp312-macosx_11_0_universal2.whl", hash = "sha256:fa4f98af3a528f0c3fd592a26df7f376f93329c8f4d987f6bb979057af8bf5e2", size = 286220, upload-time = "2026-05-20T13:07:28.463Z" }, - { url = "https://files.pythonhosted.org/packages/38/ff/a4f436709716965eaab9f36ea7b906c8a927fbe32fb1372a2071d964f6b1/greenlet-3.5.1-cp312-cp312-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:ffea73584b216150eab159b6d12348fb253e68757974de1e2c40d8a318ac89ed", size = 601585, upload-time = "2026-05-20T14:00:06.141Z" }, - { url = "https://files.pythonhosted.org/packages/65/ad/54bc3fcee3ad368a61b19b67d88117f7a8c29727bf71fffdeda81fbd946e/greenlet-3.5.1-cp312-cp312-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:1072b4f9edcc1e192d9283a66a3e68d6b84c561de33a83d7858beb9ba1effe10", size = 614215, upload-time = "2026-05-20T14:05:42.675Z" }, - { url = "https://files.pythonhosted.org/packages/7c/6c/de5b1b388cd2d9fbdfeab324863daba37d54e6e233ddbefd70b385a8c591/greenlet-3.5.1-cp312-cp312-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:89101bfd5011e069be974903cb3a4e4523845e4ece2d62dcd8d358933c0ef249", size = 620094, upload-time = "2026-05-20T14:09:09.18Z" }, - { url = "https://files.pythonhosted.org/packages/40/69/b91cda0647df839483201545913514c2827ebea5e5ccdf931842763bc127/greenlet-3.5.1-cp312-cp312-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:add5217d68b31130f0beca584d7fef4878327d2e31642b66618a14eef312b63b", size = 611358, upload-time = "2026-05-20T13:14:26.37Z" }, - { url = "https://files.pythonhosted.org/packages/4a/43/1204baffab8a6476464795a7ccf394a3248d4f22c9f87173a15b36b6d971/greenlet-3.5.1-cp312-cp312-manylinux_2_39_riscv64.whl", hash = "sha256:e6cd99ea59dd5d89f0c956606571d79bfe6f68c9eb7f4a4083a41a7f1587edee", size = 422782, upload-time = "2026-05-20T14:01:39.597Z" }, - { url = "https://files.pythonhosted.org/packages/59/90/3cf77e080350cd02fa307bb2abf05df48f4482c240275bbd2c203ba8bb1c/greenlet-3.5.1-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:a5ea42a752d47a145eae922b605cd1634665ac3d5ec1e72402d5048e8d60d207", size = 1570475, upload-time = "2026-05-20T14:02:25.29Z" }, - { url = "https://files.pythonhosted.org/packages/65/2c/18cece62045e74598c3c393f70dce4a63f56222015ba29a5d4eeb04f764c/greenlet-3.5.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:c5551170cf4f5ff5623e9af81323751979fee2c731e2287b61f73cd27257b823", size = 1635625, upload-time = "2026-05-20T13:14:34.027Z" }, - { url = "https://files.pythonhosted.org/packages/30/f5/310d104ddf41eb5a70f4c268d22508dfb0c3c8e86fec152be34d0d2ed819/greenlet-3.5.1-cp312-cp312-win_amd64.whl", hash = "sha256:3c8bb982ad117d29478ef8f5533e97df21f1e2befd17a299257b0c96d1371c0b", size = 238791, upload-time = "2026-05-20T13:10:39.018Z" }, - { url = "https://files.pythonhosted.org/packages/62/90/ceca11f504cd23a8047a3dea31919adc48df9b626dd0c13f0d858734fdfd/greenlet-3.5.1-cp312-cp312-win_arm64.whl", hash = "sha256:80eb4b04dadc4e67df3fae179a32c4706a3f495bc7f22fc8a81115d5f5512188", size = 235580, upload-time = "2026-05-20T13:08:45.056Z" }, - { url = "https://files.pythonhosted.org/packages/27/69/7f7e5372d998b81001899b1c0823c957aa413ba0f2662e65821611cc31e4/greenlet-3.5.1-cp313-cp313-macosx_11_0_universal2.whl", hash = "sha256:51518ff74664078fc51bffcc6fc529b0df5ae58da192691cee765d45ce944a2b", size = 285060, upload-time = "2026-05-20T13:08:51.899Z" }, - { url = "https://files.pythonhosted.org/packages/b1/bf/387f9b6b865fd2ae0d0be09e0004827295a01b71be76ed350dd1e28a91a4/greenlet-3.5.1-cp313-cp313-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:1ffdb3c0bb002c99cd8f298957e046c3dbf6006b5b7cdf11a4e19194624a0a0a", size = 604370, upload-time = "2026-05-20T14:00:07.492Z" }, - { url = "https://files.pythonhosted.org/packages/32/f5/169ce3d4e4c67291bd18f8cbe0299c9f3e45102c7f1fb3c14780c93e4532/greenlet-3.5.1-cp313-cp313-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:7715a5a2c3378ba602c3a440558261e13a820bb53a82693aacd7b7f6d964e283", size = 616987, upload-time = "2026-05-20T14:05:44.237Z" }, - { url = "https://files.pythonhosted.org/packages/19/ba/c24110c55dffa55aa6e1d98b45310da33801aeba7686ff0190fe5d46fd32/greenlet-3.5.1-cp313-cp313-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:d40a890035c0058cadbdc4af7569800fd28a0e527a0fdbb7b5f9418f176846ce", size = 622911, upload-time = "2026-05-20T14:09:10.598Z" }, - { url = "https://files.pythonhosted.org/packages/ee/e5/7f2e41d5273be07e77560d61ea4e56485b4d6c316d2a84518c62d1364061/greenlet-3.5.1-cp313-cp313-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:dc71ff466927a201b08305acac451ebe1aedfcea002f62f1f2f2ac2ac1e6a135", size = 613911, upload-time = "2026-05-20T13:14:27.539Z" }, - { url = "https://files.pythonhosted.org/packages/ec/7b/d20db2e8a5ad6c038702f3179b136f93f0a3d1a21a0c0777f3e470cdf4b2/greenlet-3.5.1-cp313-cp313-manylinux_2_39_riscv64.whl", hash = "sha256:67821bb03e4e98664490edb787ff6af501194c29bbee0f5c1dfdcf1dc3d9d436", size = 425228, upload-time = "2026-05-20T14:01:40.837Z" }, - { url = "https://files.pythonhosted.org/packages/c5/a4/fbdc67579b73615a1f91615e814303cc71e06128f7baaba87be79b8fb90c/greenlet-3.5.1-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:cd443683db272ebaaca03af98c0b063ab30db70ea8a31a1559f35e3f7b744ccd", size = 1570689, upload-time = "2026-05-20T14:02:27.225Z" }, - { url = "https://files.pythonhosted.org/packages/e6/b4/77abbe35078be39718a46cd49caf16bceb35662f97a34101dca28aa98e47/greenlet-3.5.1-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:089fff7a6ce8d9316d1f65ebc00273a56be258c1725b32b94de90a3a979557e1", size = 1635602, upload-time = "2026-05-20T13:14:36.344Z" }, - { url = "https://files.pythonhosted.org/packages/37/f7/129f27ca700845b8ee8ca88ce7f43435a1239c2eddb7677fc938822762cf/greenlet-3.5.1-cp313-cp313-win_amd64.whl", hash = "sha256:110a1ca7b49b014b097f6078272c3f4ed31af45b254de5228b79adba879f6af9", size = 238683, upload-time = "2026-05-20T13:11:50.57Z" }, - { url = "https://files.pythonhosted.org/packages/6d/5c/a485a36e87df8d8fd0632ee01511244f5156a20ed3746cc6599340326395/greenlet-3.5.1-cp313-cp313-win_arm64.whl", hash = "sha256:f16ba1efc0715b680a18b8123d90dad887c6112ae3555b4b5c32c149540c6b4e", size = 235499, upload-time = "2026-05-20T13:12:42.028Z" }, { url = "https://files.pythonhosted.org/packages/8a/cb/c62454606daf5640369c94d8a9dd540599b1bfc090e2d2180cb77f4038d2/greenlet-3.5.1-cp314-cp314-macosx_11_0_universal2.whl", hash = "sha256:d8ab31c9de8651a2facdd5c5bb0011f2380dd1a7af78ce2adf4b56095294fc07", size = 285579, upload-time = "2026-05-20T13:08:56.396Z" }, { url = "https://files.pythonhosted.org/packages/ec/71/c4270398c2eba968a6071af1dfbdcaeee6ec1c24bc8b435b8cc452700da6/greenlet-3.5.1-cp314-cp314-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:5e300185139abc337ade480c327183adf42a875ac7181bfe66d7d4efea31fbea", size = 651106, upload-time = "2026-05-20T14:00:09.448Z" }, { url = "https://files.pythonhosted.org/packages/1a/ab/71e34b78a44ec271fb5f550c17bc46d301ddc5953890d935f270b0dcdb5a/greenlet-3.5.1-cp314-cp314-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:7ffdb990dcaa0234cf9845aead5df2e3c3a8b6507d409274dd87e0d5ab05ffc2", size = 663478, upload-time = "2026-05-20T14:05:45.88Z" }, @@ -1518,36 +1050,6 @@ dependencies = [ ] sdist = { url = "https://files.pythonhosted.org/packages/b7/48/af6173dbca4454f4637a4678b67f52ca7e0c1ed7d5894d89d434fecede05/grpcio-1.80.0.tar.gz", hash = "sha256:29aca15edd0688c22ba01d7cc01cb000d72b2033f4a3c72a81a19b56fd143257", size = 12978905, upload-time = "2026-03-30T08:49:10.502Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/5d/db/1d56e5f5823257b291962d6c0ce106146c6447f405b60b234c4f222a7cde/grpcio-1.80.0-cp311-cp311-linux_armv7l.whl", hash = "sha256:dfab85db094068ff42e2a3563f60ab3dddcc9d6488a35abf0132daec13209c8a", size = 6055009, upload-time = "2026-03-30T08:46:46.265Z" }, - { url = "https://files.pythonhosted.org/packages/6e/18/c83f3cad64c5ca63bca7e91e5e46b0d026afc5af9d0a9972472ceba294b3/grpcio-1.80.0-cp311-cp311-macosx_11_0_universal2.whl", hash = "sha256:5c07e82e822e1161354e32da2662f741a4944ea955f9f580ec8fb409dd6f6060", size = 12035295, upload-time = "2026-03-30T08:46:49.099Z" }, - { url = "https://files.pythonhosted.org/packages/0f/8e/e14966b435be2dda99fbe89db9525ea436edc79780431a1c2875a3582644/grpcio-1.80.0-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:ba0915d51fd4ced2db5ff719f84e270afe0e2d4c45a7bdb1e8d036e4502928c2", size = 6610297, upload-time = "2026-03-30T08:46:52.123Z" }, - { url = "https://files.pythonhosted.org/packages/cc/26/d5eb38f42ce0e3fdc8174ea4d52036ef8d58cc4426cb800f2610f625dd75/grpcio-1.80.0-cp311-cp311-manylinux2014_i686.manylinux_2_17_i686.whl", hash = "sha256:3cb8130ba457d2aa09fa6b7c3ed6b6e4e6a2685fce63cb803d479576c4d80e21", size = 7300208, upload-time = "2026-03-30T08:46:54.859Z" }, - { url = "https://files.pythonhosted.org/packages/25/51/bd267c989f85a17a5b3eea65a6feb4ff672af41ca614e5a0279cc0ea381c/grpcio-1.80.0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:09e5e478b3d14afd23f12e49e8b44c8684ac3c5f08561c43a5b9691c54d136ab", size = 6813442, upload-time = "2026-03-30T08:46:57.056Z" }, - { url = "https://files.pythonhosted.org/packages/9e/d9/d80eef735b19e9169e30164bbf889b46f9df9127598a83d174eb13a48b26/grpcio-1.80.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:00168469238b022500e486c1c33916acf2f2a9b2c022202cf8a1885d2e3073c1", size = 7414743, upload-time = "2026-03-30T08:46:59.682Z" }, - { url = "https://files.pythonhosted.org/packages/de/f2/567f5bd5054398ed6b0509b9a30900376dcf2786bd936812098808b49d8d/grpcio-1.80.0-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:8502122a3cc1714038e39a0b071acb1207ca7844208d5ea0d091317555ee7106", size = 8426046, upload-time = "2026-03-30T08:47:02.474Z" }, - { url = "https://files.pythonhosted.org/packages/62/29/73ef0141b4732ff5eacd68430ff2512a65c004696997f70476a83e548e7e/grpcio-1.80.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:ce1794f4ea6cc3ca29463f42d665c32ba1b964b48958a66497917fe9069f26e6", size = 7851641, upload-time = "2026-03-30T08:47:05.462Z" }, - { url = "https://files.pythonhosted.org/packages/46/69/abbfa360eb229a8623bab5f5a4f8105e445bd38ce81a89514ba55d281ad0/grpcio-1.80.0-cp311-cp311-win32.whl", hash = "sha256:51b4a7189b0bef2aa30adce3c78f09c83526cf3dddb24c6a96555e3b97340440", size = 4154368, upload-time = "2026-03-30T08:47:08.027Z" }, - { url = "https://files.pythonhosted.org/packages/6f/d4/ae92206d01183b08613e846076115f5ac5991bae358d2a749fa864da5699/grpcio-1.80.0-cp311-cp311-win_amd64.whl", hash = "sha256:02e64bb0bb2da14d947a49e6f120a75e947250aebe65f9629b62bb1f5c14e6e9", size = 4894235, upload-time = "2026-03-30T08:47:10.839Z" }, - { url = "https://files.pythonhosted.org/packages/5c/e8/a2b749265eb3415abc94f2e619bbd9e9707bebdda787e61c593004ec927a/grpcio-1.80.0-cp312-cp312-linux_armv7l.whl", hash = "sha256:c624cc9f1008361014378c9d776de7182b11fe8b2e5a81bc69f23a295f2a1ad0", size = 6015616, upload-time = "2026-03-30T08:47:13.428Z" }, - { url = "https://files.pythonhosted.org/packages/3e/97/b1282161a15d699d1e90c360df18d19165a045ce1c343c7f313f5e8a0b77/grpcio-1.80.0-cp312-cp312-macosx_11_0_universal2.whl", hash = "sha256:f49eddcac43c3bf350c0385366a58f36bed8cc2c0ec35ef7b74b49e56552c0c2", size = 12014204, upload-time = "2026-03-30T08:47:15.873Z" }, - { url = "https://files.pythonhosted.org/packages/6e/5e/d319c6e997b50c155ac5a8cb12f5173d5b42677510e886d250d50264949d/grpcio-1.80.0-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:d334591df610ab94714048e0d5b4f3dd5ad1bee74dfec11eee344220077a79de", size = 6563866, upload-time = "2026-03-30T08:47:18.588Z" }, - { url = "https://files.pythonhosted.org/packages/ae/f6/fdd975a2cb4d78eb67769a7b3b3830970bfa2e919f1decf724ae4445f42c/grpcio-1.80.0-cp312-cp312-manylinux2014_i686.manylinux_2_17_i686.whl", hash = "sha256:0cb517eb1d0d0aaf1d87af7cc5b801d686557c1d88b2619f5e31fab3c2315921", size = 7273060, upload-time = "2026-03-30T08:47:21.113Z" }, - { url = "https://files.pythonhosted.org/packages/db/f0/a3deb5feba60d9538a962913e37bd2e69a195f1c3376a3dd44fe0427e996/grpcio-1.80.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:4e78c4ac0d97dc2e569b2f4bcbbb447491167cb358d1a389fc4af71ab6f70411", size = 6782121, upload-time = "2026-03-30T08:47:23.827Z" }, - { url = "https://files.pythonhosted.org/packages/ca/84/36c6dcfddc093e108141f757c407902a05085e0c328007cb090d56646cdf/grpcio-1.80.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:2ed770b4c06984f3b47eb0517b1c69ad0b84ef3f40128f51448433be904634cd", size = 7383811, upload-time = "2026-03-30T08:47:26.517Z" }, - { url = "https://files.pythonhosted.org/packages/7c/ef/f3a77e3dc5b471a0ec86c564c98d6adfa3510d38f8ee99010410858d591e/grpcio-1.80.0-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:256507e2f524092f1473071a05e65a5b10d84b82e3ff24c5b571513cfaa61e2f", size = 8393860, upload-time = "2026-03-30T08:47:29.439Z" }, - { url = "https://files.pythonhosted.org/packages/9b/8d/9d4d27ed7f33d109c50d6b5ce578a9914aa68edab75d65869a17e630a8d1/grpcio-1.80.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:9a6284a5d907c37db53350645567c522be314bac859a64a7a5ca63b77bb7958f", size = 7830132, upload-time = "2026-03-30T08:47:33.254Z" }, - { url = "https://files.pythonhosted.org/packages/14/e4/9990b41c6d7a44e1e9dee8ac11d7a9802ba1378b40d77468a7761d1ad288/grpcio-1.80.0-cp312-cp312-win32.whl", hash = "sha256:c71309cfce2f22be26aa4a847357c502db6c621f1a49825ae98aa0907595b193", size = 4140904, upload-time = "2026-03-30T08:47:35.319Z" }, - { url = "https://files.pythonhosted.org/packages/2f/2c/296f6138caca1f4b92a31ace4ae1b87dab692fc16a7a3417af3bb3c805bf/grpcio-1.80.0-cp312-cp312-win_amd64.whl", hash = "sha256:9fe648599c0e37594c4809d81a9e77bd138cc82eb8baa71b6a86af65426723ff", size = 4880944, upload-time = "2026-03-30T08:47:37.831Z" }, - { url = "https://files.pythonhosted.org/packages/2f/3a/7c3c25789e3f069e581dc342e03613c5b1cb012c4e8c7d9d5cf960a75856/grpcio-1.80.0-cp313-cp313-linux_armv7l.whl", hash = "sha256:e9e408fc016dffd20661f0126c53d8a31c2821b5c13c5d67a0f5ed5de93319ad", size = 6017243, upload-time = "2026-03-30T08:47:40.075Z" }, - { url = "https://files.pythonhosted.org/packages/04/19/21a9806eb8240e174fd1ab0cd5b9aa948bb0e05c2f2f55f9d5d7405e6d08/grpcio-1.80.0-cp313-cp313-macosx_11_0_universal2.whl", hash = "sha256:92d787312e613754d4d8b9ca6d3297e69994a7912a32fa38c4c4e01c272974b0", size = 12010840, upload-time = "2026-03-30T08:47:43.11Z" }, - { url = "https://files.pythonhosted.org/packages/18/3a/23347d35f76f639e807fb7a36fad3068aed100996849a33809591f26eca6/grpcio-1.80.0-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:8ac393b58aa16991a2f1144ec578084d544038c12242da3a215966b512904d0f", size = 6567644, upload-time = "2026-03-30T08:47:46.806Z" }, - { url = "https://files.pythonhosted.org/packages/ff/40/96e07ecb604a6a67ae6ab151e3e35b132875d98bc68ec65f3e5ab3e781d7/grpcio-1.80.0-cp313-cp313-manylinux2014_i686.manylinux_2_17_i686.whl", hash = "sha256:68e5851ac4b9afe07e7f84483803ad167852570d65326b34d54ca560bfa53fb6", size = 7277830, upload-time = "2026-03-30T08:47:49.643Z" }, - { url = "https://files.pythonhosted.org/packages/9b/e2/da1506ecea1f34a5e365964644b35edef53803052b763ca214ba3870c856/grpcio-1.80.0-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:873ff5d17d68992ef6605330127425d2fc4e77e612fa3c3e0ed4e668685e3140", size = 6783216, upload-time = "2026-03-30T08:47:52.817Z" }, - { url = "https://files.pythonhosted.org/packages/44/83/3b20ff58d0c3b7f6caaa3af9a4174d4023701df40a3f39f7f1c8e7c48f9d/grpcio-1.80.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:2bea16af2750fd0a899bf1abd9022244418b55d1f37da2202249ba4ba673838d", size = 7385866, upload-time = "2026-03-30T08:47:55.687Z" }, - { url = "https://files.pythonhosted.org/packages/47/45/55c507599c5520416de5eefecc927d6a0d7af55e91cfffb2e410607e5744/grpcio-1.80.0-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:ba0db34f7e1d803a878284cd70e4c63cb6ae2510ba51937bf8f45ba997cefcf7", size = 8391602, upload-time = "2026-03-30T08:47:58.303Z" }, - { url = "https://files.pythonhosted.org/packages/10/bb/dd06f4c24c01db9cf11341b547d0a016b2c90ed7dbbb086a5710df7dd1d7/grpcio-1.80.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:8eb613f02d34721f1acf3626dfdb3545bd3c8505b0e52bf8b5710a28d02e8aa7", size = 7826752, upload-time = "2026-03-30T08:48:01.311Z" }, - { url = "https://files.pythonhosted.org/packages/f9/1e/9d67992ba23371fd63d4527096eb8c6b76d74d52b500df992a3343fd7251/grpcio-1.80.0-cp313-cp313-win32.whl", hash = "sha256:93b6f823810720912fd131f561f91f5fed0fda372b6b7028a2681b8194d5d294", size = 4142310, upload-time = "2026-03-30T08:48:04.594Z" }, - { url = "https://files.pythonhosted.org/packages/cf/e6/283326a27da9e2c3038bc93eeea36fb118ce0b2d03922a9cda6688f53c5b/grpcio-1.80.0-cp313-cp313-win_amd64.whl", hash = "sha256:e172cf795a3ba5246d3529e4d34c53db70e888fa582a8ffebd2e6e48bc0cba50", size = 4882833, upload-time = "2026-03-30T08:48:07.363Z" }, { url = "https://files.pythonhosted.org/packages/c5/6d/e65307ce20f5a09244ba9e9d8476e99fb039de7154f37fb85f26978b59c3/grpcio-1.80.0-cp314-cp314-linux_armv7l.whl", hash = "sha256:3d4147a97c8344d065d01bbf8b6acec2cf86fb0400d40696c8bdad34a64ffc0e", size = 6017376, upload-time = "2026-03-30T08:48:10.005Z" }, { url = "https://files.pythonhosted.org/packages/69/10/9cef5d9650c72625a699c549940f0abb3c4bfdb5ed45a5ce431f92f31806/grpcio-1.80.0-cp314-cp314-macosx_11_0_universal2.whl", hash = "sha256:d8e11f167935b3eb089ac9038e1a063e6d7dbe995c0bb4a661e614583352e76f", size = 12018133, upload-time = "2026-03-30T08:48:12.927Z" }, { url = "https://files.pythonhosted.org/packages/04/82/983aabaad82ba26113caceeb9091706a0696b25da004fe3defb5b346e15b/grpcio-1.80.0-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:f14b618fc30de822681ee986cfdcc2d9327229dc4c98aed16896761cacd468b9", size = 6574748, upload-time = "2026-03-30T08:48:16.386Z" }, @@ -1635,7 +1137,6 @@ dependencies = [ { name = "pygments" }, { name = "stack-data" }, { name = "traitlets" }, - { name = "typing-extensions", marker = "python_full_version < '3.12'" }, ] sdist = { url = "https://files.pythonhosted.org/packages/cd/c4/87cda5842cf5c31837c06ddb588e11c3c35d8ece89b7a0108c06b8c9b00a/ipython-9.13.0.tar.gz", hash = "sha256:7e834b6afc99f020e3f05966ced34792f40267d64cb1ea9043886dab0dde5967", size = 4430549, upload-time = "2026-04-24T12:24:55.221Z" } wheels = [ @@ -1845,7 +1346,6 @@ dependencies = [ { name = "jupyter-server-terminals" }, { name = "nbconvert" }, { name = "nbformat" }, - { name = "overrides", marker = "python_full_version < '3.12'" }, { name = "packaging" }, { name = "prometheus-client" }, { name = "pywinpty", marker = "os_name == 'nt'" }, @@ -1889,65 +1389,6 @@ version = "1.5.0" source = { registry = "https://pypi.org/simple" } sdist = { url = "https://files.pythonhosted.org/packages/d0/67/9c61eccb13f0bdca9307614e782fec49ffdde0f7a2314935d489fa93cd9c/kiwisolver-1.5.0.tar.gz", hash = "sha256:d4193f3d9dc3f6f79aaed0e5637f45d98850ebf01f7ca20e69457f3e8946b66a", size = 103482, upload-time = "2026-03-09T13:15:53.382Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/12/dd/a495a9c104be1c476f0386e714252caf2b7eca883915422a64c50b88c6f5/kiwisolver-1.5.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:9eed0f7edbb274413b6ee781cca50541c8c0facd3d6fd289779e494340a2b85c", size = 122798, upload-time = "2026-03-09T13:12:58.963Z" }, - { url = "https://files.pythonhosted.org/packages/11/60/37b4047a2af0cf5ef6d8b4b26e91829ae6fc6a2d1f74524bcb0e7cd28a32/kiwisolver-1.5.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:3c4923e404d6bcd91b6779c009542e5647fef32e4a5d75e115e3bbac6f2335eb", size = 66216, upload-time = "2026-03-09T13:13:00.155Z" }, - { url = "https://files.pythonhosted.org/packages/0a/aa/510dc933d87767584abfe03efa445889996c70c2990f6f87c3ebaa0a18c5/kiwisolver-1.5.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:0df54df7e686afa55e6f21fb86195224a6d9beb71d637e8d7920c95cf0f89aac", size = 63911, upload-time = "2026-03-09T13:13:01.671Z" }, - { url = "https://files.pythonhosted.org/packages/80/46/bddc13df6c2a40741e0cc7865bb1c9ed4796b6760bd04ce5fae3928ef917/kiwisolver-1.5.0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:2517e24d7315eb51c10664cdb865195df38ab74456c677df67bb47f12d088a27", size = 1438209, upload-time = "2026-03-09T13:13:03.385Z" }, - { url = "https://files.pythonhosted.org/packages/fd/d6/76621246f5165e5372f02f5e6f3f48ea336a8f9e96e43997d45b240ed8cd/kiwisolver-1.5.0-cp311-cp311-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:ff710414307fefa903e0d9bdf300972f892c23477829f49504e59834f4195398", size = 1248888, upload-time = "2026-03-09T13:13:05.231Z" }, - { url = "https://files.pythonhosted.org/packages/b2/c1/31559ec6fb39a5b48035ce29bb63ade628f321785f38c384dee3e2c08bc1/kiwisolver-1.5.0-cp311-cp311-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:6176c1811d9d5a04fa391c490cc44f451e240697a16977f11c6f722efb9041db", size = 1266304, upload-time = "2026-03-09T13:13:06.743Z" }, - { url = "https://files.pythonhosted.org/packages/5e/ef/1cb8276f2d29cc6a41e0a042f27946ca347d3a4a75acf85d0a16aa6dcc82/kiwisolver-1.5.0-cp311-cp311-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:50847dca5d197fcbd389c805aa1a1cf32f25d2e7273dc47ab181a517666b68cc", size = 1319650, upload-time = "2026-03-09T13:13:08.607Z" }, - { url = "https://files.pythonhosted.org/packages/4c/e4/5ba3cecd7ce6236ae4a80f67e5d5531287337d0e1f076ca87a5abe4cd5d0/kiwisolver-1.5.0-cp311-cp311-manylinux_2_39_riscv64.whl", hash = "sha256:01808c6d15f4c3e8559595d6d1fe6411c68e4a3822b4b9972b44473b24f4e679", size = 970949, upload-time = "2026-03-09T13:13:10.299Z" }, - { url = "https://files.pythonhosted.org/packages/5a/69/dc61f7ae9a2f071f26004ced87f078235b5507ab6e5acd78f40365655034/kiwisolver-1.5.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:f1f9f4121ec58628c96baa3de1a55a4e3a333c5102c8e94b64e23bf7b2083309", size = 2199125, upload-time = "2026-03-09T13:13:11.841Z" }, - { url = "https://files.pythonhosted.org/packages/e5/7b/abbe0f1b5afa85f8d084b73e90e5f801c0939eba16ac2e49af7c61a6c28d/kiwisolver-1.5.0-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:b7d335370ae48a780c6e6a6bbfa97342f563744c39c35562f3f367665f5c1de2", size = 2293783, upload-time = "2026-03-09T13:13:14.399Z" }, - { url = "https://files.pythonhosted.org/packages/8a/80/5908ae149d96d81580d604c7f8aefd0e98f4fd728cf172f477e9f2a81744/kiwisolver-1.5.0-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:800ee55980c18545af444d93fdd60c56b580db5cc54867d8cbf8a1dc0829938c", size = 1960726, upload-time = "2026-03-09T13:13:16.047Z" }, - { url = "https://files.pythonhosted.org/packages/84/08/a78cb776f8c085b7143142ce479859cfec086bd09ee638a317040b6ef420/kiwisolver-1.5.0-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:c438f6ca858697c9ab67eb28246c92508af972e114cac34e57a6d4ba17a3ac08", size = 2464738, upload-time = "2026-03-09T13:13:17.897Z" }, - { url = "https://files.pythonhosted.org/packages/b1/e1/65584da5356ed6cb12c63791a10b208860ac40a83de165cb6a6751a686e3/kiwisolver-1.5.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:8c63c91f95173f9c2a67c7c526b2cea976828a0e7fced9cdcead2802dc10f8a4", size = 2270718, upload-time = "2026-03-09T13:13:19.421Z" }, - { url = "https://files.pythonhosted.org/packages/be/6c/28f17390b62b8f2f520e2915095b3c94d88681ecf0041e75389d9667f202/kiwisolver-1.5.0-cp311-cp311-win_amd64.whl", hash = "sha256:beb7f344487cdcb9e1efe4b7a29681b74d34c08f0043a327a74da852a6749e7b", size = 73480, upload-time = "2026-03-09T13:13:20.818Z" }, - { url = "https://files.pythonhosted.org/packages/d8/0e/2ee5debc4f77a625778fec5501ff3e8036fe361b7ee28ae402a485bb9694/kiwisolver-1.5.0-cp311-cp311-win_arm64.whl", hash = "sha256:ad4ae4ffd1ee9cd11357b4c66b612da9888f4f4daf2f36995eda64bd45370cac", size = 64930, upload-time = "2026-03-09T13:13:21.997Z" }, - { url = "https://files.pythonhosted.org/packages/4d/b2/818b74ebea34dabe6d0c51cb1c572e046730e64844da6ed646d5298c40ce/kiwisolver-1.5.0-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:4e9750bc21b886308024f8a54ccb9a2cc38ac9fa813bf4348434e3d54f337ff9", size = 123158, upload-time = "2026-03-09T13:13:23.127Z" }, - { url = "https://files.pythonhosted.org/packages/bf/d9/405320f8077e8e1c5c4bd6adc45e1e6edf6d727b6da7f2e2533cf58bff71/kiwisolver-1.5.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:72ec46b7eba5b395e0a7b63025490d3214c11013f4aacb4f5e8d6c3041829588", size = 66388, upload-time = "2026-03-09T13:13:24.765Z" }, - { url = "https://files.pythonhosted.org/packages/99/9f/795fedf35634f746151ca8839d05681ceb6287fbed6cc1c9bf235f7887c2/kiwisolver-1.5.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:ed3a984b31da7481b103f68776f7128a89ef26ed40f4dc41a2223cda7fb24819", size = 64068, upload-time = "2026-03-09T13:13:25.878Z" }, - { url = "https://files.pythonhosted.org/packages/c4/13/680c54afe3e65767bed7ec1a15571e1a2f1257128733851ade24abcefbcc/kiwisolver-1.5.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:bb5136fb5352d3f422df33f0c879a1b0c204004324150cc3b5e3c4f310c9049f", size = 1477934, upload-time = "2026-03-09T13:13:27.166Z" }, - { url = "https://files.pythonhosted.org/packages/c8/2f/cebfcdb60fd6a9b0f6b47a9337198bcbad6fbe15e68189b7011fd914911f/kiwisolver-1.5.0-cp312-cp312-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:b2af221f268f5af85e776a73d62b0845fc8baf8ef0abfae79d29c77d0e776aaf", size = 1278537, upload-time = "2026-03-09T13:13:28.707Z" }, - { url = "https://files.pythonhosted.org/packages/f2/0d/9b782923aada3fafb1d6b84e13121954515c669b18af0c26e7d21f579855/kiwisolver-1.5.0-cp312-cp312-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:b0f172dc8ffaccb8522d7c5d899de00133f2f1ca7b0a49b7da98e901de87bf2d", size = 1296685, upload-time = "2026-03-09T13:13:30.528Z" }, - { url = "https://files.pythonhosted.org/packages/27/70/83241b6634b04fe44e892688d5208332bde130f38e610c0418f9ede47ded/kiwisolver-1.5.0-cp312-cp312-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:6ab8ba9152203feec73758dad83af9a0bbe05001eb4639e547207c40cfb52083", size = 1346024, upload-time = "2026-03-09T13:13:32.818Z" }, - { url = "https://files.pythonhosted.org/packages/e4/db/30ed226fb271ae1a6431fc0fe0edffb2efe23cadb01e798caeb9f2ceae8f/kiwisolver-1.5.0-cp312-cp312-manylinux_2_39_riscv64.whl", hash = "sha256:cdee07c4d7f6d72008d3f73b9bf027f4e11550224c7c50d8df1ae4a37c1402a6", size = 987241, upload-time = "2026-03-09T13:13:34.435Z" }, - { url = "https://files.pythonhosted.org/packages/ec/bd/c314595208e4c9587652d50959ead9e461995389664e490f4dce7ff0f782/kiwisolver-1.5.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:7c60d3c9b06fb23bd9c6139281ccbdc384297579ae037f08ae90c69f6845c0b1", size = 2227742, upload-time = "2026-03-09T13:13:36.4Z" }, - { url = "https://files.pythonhosted.org/packages/c1/43/0499cec932d935229b5543d073c2b87c9c22846aab48881e9d8d6e742a2d/kiwisolver-1.5.0-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:e315e5ec90d88e140f57696ff85b484ff68bb311e36f2c414aa4286293e6dee0", size = 2323966, upload-time = "2026-03-09T13:13:38.204Z" }, - { url = "https://files.pythonhosted.org/packages/3d/6f/79b0d760907965acfd9d61826a3d41f8f093c538f55cd2633d3f0db269f6/kiwisolver-1.5.0-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:1465387ac63576c3e125e5337a6892b9e99e0627d52317f3ca79e6930d889d15", size = 1977417, upload-time = "2026-03-09T13:13:39.966Z" }, - { url = "https://files.pythonhosted.org/packages/ab/31/01d0537c41cb75a551a438c3c7a80d0c60d60b81f694dac83dd436aec0d0/kiwisolver-1.5.0-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:530a3fd64c87cffa844d4b6b9768774763d9caa299e9b75d8eca6a4423b31314", size = 2491238, upload-time = "2026-03-09T13:13:41.698Z" }, - { url = "https://files.pythonhosted.org/packages/e4/34/8aefdd0be9cfd00a44509251ba864f5caf2991e36772e61c408007e7f417/kiwisolver-1.5.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:1d9daea4ea6b9be74fe2f01f7fbade8d6ffab263e781274cffca0dba9be9eec9", size = 2294947, upload-time = "2026-03-09T13:13:43.343Z" }, - { url = "https://files.pythonhosted.org/packages/ad/cf/0348374369ca588f8fe9c338fae49fa4e16eeb10ffb3d012f23a54578a9e/kiwisolver-1.5.0-cp312-cp312-win_amd64.whl", hash = "sha256:f18c2d9782259a6dc132fdc7a63c168cbc74b35284b6d75c673958982a378384", size = 73569, upload-time = "2026-03-09T13:13:45.792Z" }, - { url = "https://files.pythonhosted.org/packages/28/26/192b26196e2316e2bd29deef67e37cdf9870d9af8e085e521afff0fed526/kiwisolver-1.5.0-cp312-cp312-win_arm64.whl", hash = "sha256:f7c7553b13f69c1b29a5bde08ddc6d9d0c8bfb84f9ed01c30db25944aeb852a7", size = 64997, upload-time = "2026-03-09T13:13:46.878Z" }, - { url = "https://files.pythonhosted.org/packages/9d/69/024d6711d5ba575aa65d5538042e99964104e97fa153a9f10bc369182bc2/kiwisolver-1.5.0-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:fd40bb9cd0891c4c3cb1ddf83f8bbfa15731a248fdc8162669405451e2724b09", size = 123166, upload-time = "2026-03-09T13:13:48.032Z" }, - { url = "https://files.pythonhosted.org/packages/ce/48/adbb40df306f587054a348831220812b9b1d787aff714cfbc8556e38fccd/kiwisolver-1.5.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:c0e1403fd7c26d77c1f03e096dc58a5c726503fa0db0456678b8668f76f521e3", size = 66395, upload-time = "2026-03-09T13:13:49.365Z" }, - { url = "https://files.pythonhosted.org/packages/a8/3a/d0a972b34e1c63e2409413104216cd1caa02c5a37cb668d1687d466c1c45/kiwisolver-1.5.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:dda366d548e89a90d88a86c692377d18d8bd64b39c1fb2b92cb31370e2896bbd", size = 64065, upload-time = "2026-03-09T13:13:50.562Z" }, - { url = "https://files.pythonhosted.org/packages/2b/0a/7b98e1e119878a27ba8618ca1e18b14f992ff1eda40f47bccccf4de44121/kiwisolver-1.5.0-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:332b4f0145c30b5f5ad9374881133e5aa64320428a57c2c2b61e9d891a51c2f3", size = 1477903, upload-time = "2026-03-09T13:13:52.084Z" }, - { url = "https://files.pythonhosted.org/packages/18/d8/55638d89ffd27799d5cc3d8aa28e12f4ce7a64d67b285114dbedc8ea4136/kiwisolver-1.5.0-cp313-cp313-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:0c50b89ffd3e1a911c69a1dd3de7173c0cd10b130f56222e57898683841e4f96", size = 1278751, upload-time = "2026-03-09T13:13:54.673Z" }, - { url = "https://files.pythonhosted.org/packages/b8/97/b4c8d0d18421ecceba20ad8701358453b88e32414e6f6950b5a4bad54e65/kiwisolver-1.5.0-cp313-cp313-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:4db576bb8c3ef9365f8b40fe0f671644de6736ae2c27a2c62d7d8a1b4329f099", size = 1296793, upload-time = "2026-03-09T13:13:56.287Z" }, - { url = "https://files.pythonhosted.org/packages/c4/10/f862f94b6389d8957448ec9df59450b81bec4abb318805375c401a1e6892/kiwisolver-1.5.0-cp313-cp313-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:0b85aad90cea8ac6797a53b5d5f2e967334fa4d1149f031c4537569972596cb8", size = 1346041, upload-time = "2026-03-09T13:13:58.269Z" }, - { url = "https://files.pythonhosted.org/packages/a3/6a/f1650af35821eaf09de398ec0bc2aefc8f211f0cda50204c9f1673741ba9/kiwisolver-1.5.0-cp313-cp313-manylinux_2_39_riscv64.whl", hash = "sha256:d36ca54cb4c6c4686f7cbb7b817f66f5911c12ddb519450bbe86707155028f87", size = 987292, upload-time = "2026-03-09T13:13:59.871Z" }, - { url = "https://files.pythonhosted.org/packages/de/19/d7fb82984b9238115fe629c915007be608ebd23dc8629703d917dbfaffd4/kiwisolver-1.5.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:38f4a703656f493b0ad185211ccfca7f0386120f022066b018eb5296d8613e23", size = 2227865, upload-time = "2026-03-09T13:14:01.401Z" }, - { url = "https://files.pythonhosted.org/packages/7f/b9/46b7f386589fd222dac9e9de9c956ce5bcefe2ee73b4e79891381dda8654/kiwisolver-1.5.0-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:3ac2360e93cb41be81121755c6462cff3beaa9967188c866e5fce5cf13170859", size = 2324369, upload-time = "2026-03-09T13:14:02.972Z" }, - { url = "https://files.pythonhosted.org/packages/92/8b/95e237cf3d9c642960153c769ddcbe278f182c8affb20cecc1cc983e7cc5/kiwisolver-1.5.0-cp313-cp313-musllinux_1_2_riscv64.whl", hash = "sha256:c95cab08d1965db3d84a121f1c7ce7479bdd4072c9b3dafd8fecce48a2e6b902", size = 1977989, upload-time = "2026-03-09T13:14:04.503Z" }, - { url = "https://files.pythonhosted.org/packages/1b/95/980c9df53501892784997820136c01f62bc1865e31b82b9560f980c0e649/kiwisolver-1.5.0-cp313-cp313-musllinux_1_2_s390x.whl", hash = "sha256:fc20894c3d21194d8041a28b65622d5b86db786da6e3cfe73f0c762951a61167", size = 2491645, upload-time = "2026-03-09T13:14:06.106Z" }, - { url = "https://files.pythonhosted.org/packages/cb/32/900647fd0840abebe1561792c6b31e6a7c0e278fc3973d30572a965ca14c/kiwisolver-1.5.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:7a32f72973f0f950c1920475d5c5ea3d971b81b6f0ec53b8d0a956cc965f22e0", size = 2295237, upload-time = "2026-03-09T13:14:08.891Z" }, - { url = "https://files.pythonhosted.org/packages/be/8a/be60e3bbcf513cc5a50f4a3e88e1dcecebb79c1ad607a7222877becaa101/kiwisolver-1.5.0-cp313-cp313-win_amd64.whl", hash = "sha256:0bf3acf1419fa93064a4c2189ac0b58e3be7872bf6ee6177b0d4c63dc4cea276", size = 73573, upload-time = "2026-03-09T13:14:12.327Z" }, - { url = "https://files.pythonhosted.org/packages/4d/d2/64be2e429eb4fca7f7e1c52a91b12663aeaf25de3895e5cca0f47ef2a8d0/kiwisolver-1.5.0-cp313-cp313-win_arm64.whl", hash = "sha256:fa8eb9ecdb7efb0b226acec134e0d709e87a909fa4971a54c0c4f6e88635484c", size = 64998, upload-time = "2026-03-09T13:14:13.469Z" }, - { url = "https://files.pythonhosted.org/packages/b0/69/ce68dd0c85755ae2de490bf015b62f2cea5f6b14ff00a463f9d0774449ff/kiwisolver-1.5.0-cp313-cp313t-macosx_10_13_universal2.whl", hash = "sha256:db485b3847d182b908b483b2ed133c66d88d49cacf98fd278fadafe11b4478d1", size = 125700, upload-time = "2026-03-09T13:14:14.636Z" }, - { url = "https://files.pythonhosted.org/packages/74/aa/937aac021cf9d4349990d47eb319309a51355ed1dbdc9c077cdc9224cb11/kiwisolver-1.5.0-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:be12f931839a3bdfe28b584db0e640a65a8bcbc24560ae3fdb025a449b3d754e", size = 67537, upload-time = "2026-03-09T13:14:15.808Z" }, - { url = "https://files.pythonhosted.org/packages/ee/20/3a87fbece2c40ad0f6f0aefa93542559159c5f99831d596050e8afae7a9f/kiwisolver-1.5.0-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:16b85d37c2cbb3253226d26e64663f755d88a03439a9c47df6246b35defbdfb7", size = 65514, upload-time = "2026-03-09T13:14:18.035Z" }, - { url = "https://files.pythonhosted.org/packages/f0/7f/f943879cda9007c45e1f7dba216d705c3a18d6b35830e488b6c6a4e7cdf0/kiwisolver-1.5.0-cp313-cp313t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:4432b835675f0ea7414aab3d37d119f7226d24869b7a829caeab49ebda407b0c", size = 1584848, upload-time = "2026-03-09T13:14:19.745Z" }, - { url = "https://files.pythonhosted.org/packages/37/f8/4d4f85cc1870c127c88d950913370dd76138482161cd07eabbc450deff01/kiwisolver-1.5.0-cp313-cp313t-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:1b0feb50971481a2cc44d94e88bdb02cdd497618252ae226b8eb1201b957e368", size = 1391542, upload-time = "2026-03-09T13:14:21.54Z" }, - { url = "https://files.pythonhosted.org/packages/04/0b/65dd2916c84d252b244bd405303220f729e7c17c9d7d33dca6feeff9ffc4/kiwisolver-1.5.0-cp313-cp313t-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:56fa888f10d0f367155e76ce849fa1166fc9730d13bd2d65a2aa13b6f5424489", size = 1404447, upload-time = "2026-03-09T13:14:23.205Z" }, - { url = "https://files.pythonhosted.org/packages/39/5c/2606a373247babce9b1d056c03a04b65f3cf5290a8eac5d7bdead0a17e21/kiwisolver-1.5.0-cp313-cp313t-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:940dda65d5e764406b9fb92761cbf462e4e63f712ab60ed98f70552e496f3bf1", size = 1455918, upload-time = "2026-03-09T13:14:24.74Z" }, - { url = "https://files.pythonhosted.org/packages/d5/d1/c6078b5756670658e9192a2ef11e939c92918833d2745f85cd14a6004bdf/kiwisolver-1.5.0-cp313-cp313t-manylinux_2_39_riscv64.whl", hash = "sha256:89fc958c702ee9a745e4700378f5d23fddbc46ff89e8fdbf5395c24d5c1452a3", size = 1072856, upload-time = "2026-03-09T13:14:26.597Z" }, - { url = "https://files.pythonhosted.org/packages/cb/c8/7def6ddf16eb2b3741d8b172bdaa9af882b03c78e9b0772975408801fa63/kiwisolver-1.5.0-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:9027d773c4ff81487181a925945743413f6069634d0b122d0b37684ccf4f1e18", size = 2333580, upload-time = "2026-03-09T13:14:28.237Z" }, - { url = "https://files.pythonhosted.org/packages/9e/87/2ac1fce0eb1e616fcd3c35caa23e665e9b1948bb984f4764790924594128/kiwisolver-1.5.0-cp313-cp313t-musllinux_1_2_ppc64le.whl", hash = "sha256:5b233ea3e165e43e35dba1d2b8ecc21cf070b45b65ae17dd2747d2713d942021", size = 2423018, upload-time = "2026-03-09T13:14:30.018Z" }, - { url = "https://files.pythonhosted.org/packages/67/13/c6700ccc6cc218716bfcda4935e4b2997039869b4ad8a94f364c5a3b8e63/kiwisolver-1.5.0-cp313-cp313t-musllinux_1_2_riscv64.whl", hash = "sha256:ce9bf03dad3b46408c08649c6fbd6ca28a9fce0eb32fdfffa6775a13103b5310", size = 2062804, upload-time = "2026-03-09T13:14:32.888Z" }, - { url = "https://files.pythonhosted.org/packages/1b/bd/877056304626943ff0f1f44c08f584300c199b887cb3176cd7e34f1515f1/kiwisolver-1.5.0-cp313-cp313t-musllinux_1_2_s390x.whl", hash = "sha256:fc4d3f1fb9ca0ae9f97b095963bc6326f1dbfd3779d6679a1e016b9baaa153d3", size = 2597482, upload-time = "2026-03-09T13:14:34.971Z" }, - { url = "https://files.pythonhosted.org/packages/75/19/c60626c47bf0f8ac5dcf72c6c98e266d714f2fbbfd50cf6dab5ede3aaa50/kiwisolver-1.5.0-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:f443b4825c50a51ee68585522ab4a1d1257fac65896f282b4c6763337ac9f5d2", size = 2394328, upload-time = "2026-03-09T13:14:36.816Z" }, - { url = "https://files.pythonhosted.org/packages/47/84/6a6d5e5bb8273756c27b7d810d47f7ef2f1f9b9fd23c9ee9a3f8c75c9cef/kiwisolver-1.5.0-cp313-cp313t-win_arm64.whl", hash = "sha256:893ff3a711d1b515ba9da14ee090519bad4610ed1962fbe298a434e8c5f8db53", size = 68410, upload-time = "2026-03-09T13:14:38.695Z" }, { url = "https://files.pythonhosted.org/packages/e4/d7/060f45052f2a01ad5762c8fdecd6d7a752b43400dc29ff75cd47225a40fd/kiwisolver-1.5.0-cp314-cp314-macosx_10_15_universal2.whl", hash = "sha256:8df31fe574b8b3993cc61764f40941111b25c2d9fea13d3ce24a49907cd2d615", size = 123231, upload-time = "2026-03-09T13:14:41.323Z" }, { url = "https://files.pythonhosted.org/packages/c2/a7/78da680eadd06ff35edef6ef68a1ad273bad3e2a0936c9a885103230aece/kiwisolver-1.5.0-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:1d49a49ac4cbfb7c1375301cd1ec90169dfeae55ff84710d782260ce77a75a02", size = 66489, upload-time = "2026-03-09T13:14:42.534Z" }, { url = "https://files.pythonhosted.org/packages/49/b2/97980f3ad4fae37dd7fe31626e2bf75fbf8bdf5d303950ec1fab39a12da8/kiwisolver-1.5.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:0cbe94b69b819209a62cb27bdfa5dc2a8977d8de2f89dfd97ba4f53ed3af754e", size = 64063, upload-time = "2026-03-09T13:14:44.759Z" }, @@ -1978,15 +1419,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/07/18/43a5f24608d8c313dd189cf838c8e68d75b115567c6279de7796197cfb6a/kiwisolver-1.5.0-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:e7a116ae737f0000343218c4edf5bd45893bfeaff0993c0b215d7124c9f77646", size = 2394403, upload-time = "2026-03-09T13:15:31.517Z" }, { url = "https://files.pythonhosted.org/packages/3b/b5/98222136d839b8afabcaa943b09bd05888c2d36355b7e448550211d1fca4/kiwisolver-1.5.0-cp314-cp314t-win_amd64.whl", hash = "sha256:1dd9b0b119a350976a6d781e7278ec7aca0b201e1a9e2d23d9804afecb6ca681", size = 79687, upload-time = "2026-03-09T13:15:33.204Z" }, { url = "https://files.pythonhosted.org/packages/99/a2/ca7dc962848040befed12732dff6acae7fb3c4f6fc4272b3f6c9a30b8713/kiwisolver-1.5.0-cp314-cp314t-win_arm64.whl", hash = "sha256:58f812017cd2985c21fbffb4864d59174d4903dd66fa23815e74bbc7a0e2dd57", size = 70032, upload-time = "2026-03-09T13:15:34.411Z" }, - { url = "https://files.pythonhosted.org/packages/1c/fa/2910df836372d8761bb6eff7d8bdcb1613b5c2e03f260efe7abe34d388a7/kiwisolver-1.5.0-graalpy312-graalpy250_312_native-macosx_10_13_x86_64.whl", hash = "sha256:5ae8e62c147495b01a0f4765c878e9bfdf843412446a247e28df59936e99e797", size = 130262, upload-time = "2026-03-09T13:15:35.629Z" }, - { url = "https://files.pythonhosted.org/packages/0f/41/c5f71f9f00aabcc71fee8b7475e3f64747282580c2fe748961ba29b18385/kiwisolver-1.5.0-graalpy312-graalpy250_312_native-macosx_11_0_arm64.whl", hash = "sha256:f6764a4ccab3078db14a632420930f6186058750df066b8ea2a7106df91d3203", size = 138036, upload-time = "2026-03-09T13:15:36.894Z" }, - { url = "https://files.pythonhosted.org/packages/fa/06/7399a607f434119c6e1fdc8ec89a8d51ccccadf3341dee4ead6bd14caaf5/kiwisolver-1.5.0-graalpy312-graalpy250_312_native-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:c31c13da98624f957b0fb1b5bae5383b2333c2c3f6793d9825dd5ce79b525cb7", size = 194295, upload-time = "2026-03-09T13:15:38.22Z" }, - { url = "https://files.pythonhosted.org/packages/b5/91/53255615acd2a1eaca307ede3c90eb550bae9c94581f8c00081b6b1c8f44/kiwisolver-1.5.0-graalpy312-graalpy250_312_native-win_amd64.whl", hash = "sha256:1f1489f769582498610e015a8ef2d36f28f505ab3096d0e16b4858a9ec214f57", size = 75987, upload-time = "2026-03-09T13:15:39.65Z" }, - { url = "https://files.pythonhosted.org/packages/e9/eb/5fcbbbf9a0e2c3a35effb88831a483345326bbc3a030a3b5b69aee647f84/kiwisolver-1.5.0-pp311-pypy311_pp73-macosx_10_15_x86_64.whl", hash = "sha256:ec4c85dc4b687c7f7f15f553ff26a98bfe8c58f5f7f0ac8905f0ba4c7be60232", size = 59532, upload-time = "2026-03-09T13:15:47.047Z" }, - { url = "https://files.pythonhosted.org/packages/c3/9b/e17104555bb4db148fd52327feea1e96be4b88e8e008b029002c281a21ab/kiwisolver-1.5.0-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:12e91c215a96e39f57989c8912ae761286ac5a9584d04030ceb3368a357f017a", size = 57420, upload-time = "2026-03-09T13:15:48.199Z" }, - { url = "https://files.pythonhosted.org/packages/48/44/2b5b95b7aa39fb2d8d9d956e0f3d5d45aef2ae1d942d4c3ffac2f9cfed1a/kiwisolver-1.5.0-pp311-pypy311_pp73-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:be4a51a55833dc29ab5d7503e7bcb3b3af3402d266018137127450005cdfe737", size = 79892, upload-time = "2026-03-09T13:15:49.694Z" }, - { url = "https://files.pythonhosted.org/packages/52/7d/7157f9bba6b455cfb4632ed411e199fc8b8977642c2b12082e1bd9e6d173/kiwisolver-1.5.0-pp311-pypy311_pp73-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:daae526907e262de627d8f70058a0f64acc9e2641c164c99c8f594b34a799a16", size = 77603, upload-time = "2026-03-09T13:15:50.945Z" }, - { url = "https://files.pythonhosted.org/packages/0a/dd/8050c947d435c8d4bc94e3252f4d8bb8a76cfb424f043a8680be637a57f1/kiwisolver-1.5.0-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:59cd8683f575d96df5bb48f6add94afc055012c29e28124fcae2b63661b9efb1", size = 73558, upload-time = "2026-03-09T13:15:52.112Z" }, ] [[package]] @@ -2016,58 +1448,6 @@ version = "6.1.1" source = { registry = "https://pypi.org/simple" } sdist = { url = "https://files.pythonhosted.org/packages/05/3b/aab6728cae887456f409b4d75e8a01856e4f04bd510de38052a47768b680/lxml-6.1.1.tar.gz", hash = "sha256:ba96ae44888e0185281e937633a743ea90d5a196c6000f82565ebb0580012d40", size = 4197430, upload-time = "2026-05-18T19:19:06.424Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/62/b0/83f481780d1548750b8ce2ec824073deef2f452d9cd1a6faff8507e3d16d/lxml-6.1.1-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:53b7d2b7a10b1c35c0a5e21e9224accf60c1bbfba523990732e521b2b73adef2", size = 8526461, upload-time = "2026-05-18T19:17:25.862Z" }, - { url = "https://files.pythonhosted.org/packages/b9/d5/30fa0f808002c7329397bfbb24e306789c0b29f04aa5842c07b174b4216f/lxml-6.1.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:ff3f333630ab480244a1bff72043e511a91eb22e7595dead8653ee5612dd8f3d", size = 4595375, upload-time = "2026-05-18T19:17:34.555Z" }, - { url = "https://files.pythonhosted.org/packages/4f/d2/edb71cf0e561581a7c5eb2626244320eb04e9f8ce6d563184fd668b45073/lxml-6.1.1-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:a4bbea04c97f6d78a48e3fbc1cb9116d2780b1b39e03a23f6eb9b603fd61f510", size = 4923654, upload-time = "2026-05-18T19:17:42.917Z" }, - { url = "https://files.pythonhosted.org/packages/4c/77/1bc7eeb0de4577d783fb625aa092cc9357883bba35845a3666bf1259f3dc/lxml-6.1.1-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:db1d75f6617a49c1c01bc7023713e0ff59ab32c9579ae62a7674c0e34f3b0b0a", size = 5067921, upload-time = "2026-05-18T19:17:49.175Z" }, - { url = "https://files.pythonhosted.org/packages/1b/3c/c0690d74bd2bc17bc03b5b0d093569ead597dd0bfa088bf99eef8c24e19c/lxml-6.1.1-cp311-cp311-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:3a12689be69a28ddaa0ab99a5a1137da2afd5f8f16df7b5680b66f616d3eda1d", size = 5002456, upload-time = "2026-05-18T19:17:59.715Z" }, - { url = "https://files.pythonhosted.org/packages/66/8d/d1b3271af0c0f1e27e8472a849e4d2c65bc7766884b9ad2da9e76e145c88/lxml-6.1.1-cp311-cp311-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:18b73c339ae29b90fd2d06e58ebd555a751bde9cd6bbd36cc0281b9a2c94e9d8", size = 5202776, upload-time = "2026-05-18T19:18:08.924Z" }, - { url = "https://files.pythonhosted.org/packages/7a/45/689824ffb237fd10125ad273f32b28ff04dc6203c2822c85ff65a93df65e/lxml-6.1.1-cp311-cp311-manylinux_2_28_i686.whl", hash = "sha256:752d3bbfe874715ccd0aec7f88d7fc623c0f1fd7aa7b3238a084e017bad2a009", size = 5329945, upload-time = "2026-05-18T19:18:13.673Z" }, - { url = "https://files.pythonhosted.org/packages/5d/c0/ef73af53767e958fd87d437c170f272e2f6e6c0f854939f133a895f1e711/lxml-6.1.1-cp311-cp311-manylinux_2_31_armv7l.whl", hash = "sha256:6b1761fbf9ec984e2e9d9c589ef5f5fd684b7c19f92aadd567a26c5224958db6", size = 4659237, upload-time = "2026-05-18T19:18:18.657Z" }, - { url = "https://files.pythonhosted.org/packages/a0/5e/e1158e40397585e91cb0472374a1f63d0926a1ddeaa92f13d1a1ffe306d5/lxml-6.1.1-cp311-cp311-manylinux_2_38_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:d680fbcb768404c601ecb43519ecd8461f6954cb11c06a78962f666832ccfca8", size = 5265904, upload-time = "2026-05-18T19:18:24.883Z" }, - { url = "https://files.pythonhosted.org/packages/a0/16/8687e5d1400ed1c0bc41dace232ebb7553952b618ea1f2e5fb6e2cfbbe23/lxml-6.1.1-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:162af1091cd785f2f27e62d3547ae9bc58ec5c86dd314d67021fd02463708d83", size = 5045225, upload-time = "2026-05-18T19:17:20.073Z" }, - { url = "https://files.pythonhosted.org/packages/ca/18/d877bd1ae2e5ffdfd4836565aba350db31feb2f2656d6ce70316ed66a05e/lxml-6.1.1-cp311-cp311-musllinux_1_2_armv7l.whl", hash = "sha256:e9308ff8241c532df3f3e570f9a5aeed6c853f888512ba4b75638d7c11c95ef6", size = 4712721, upload-time = "2026-05-18T19:17:40.512Z" }, - { url = "https://files.pythonhosted.org/packages/44/4d/1f44fd1d770b10dacbf6b5c6e520f4d6e0708744930f719dc04e67cab981/lxml-6.1.1-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:5f6994074ebae6ffb04447268e37dc16edc304f9859cf91acb86e0af6c1b395c", size = 5252549, upload-time = "2026-05-18T19:17:51.236Z" }, - { url = "https://files.pythonhosted.org/packages/64/5d/1d66b84f850089254c230ef6ea6b267a5a54e2e179a5d960036a05d501d7/lxml-6.1.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:80c2dfadb855da477cf73373ad29a333535dedb9b12bad02c9814c8e2b43bf08", size = 5226877, upload-time = "2026-05-18T19:18:00.875Z" }, - { url = "https://files.pythonhosted.org/packages/ad/00/84c4b5302d42a2d0184f38d538c8a197f33b52a50bd4f7bcfe990bce3036/lxml-6.1.1-cp311-cp311-win32.whl", hash = "sha256:30a89d3ac8faec007453fb541f3f46807eeec88edd5826f6e3fe001752a2c621", size = 3594072, upload-time = "2026-05-18T19:17:12.714Z" }, - { url = "https://files.pythonhosted.org/packages/61/9d/2e2f7d876349f45e0f3e29f72da311668853d59b58d473a2dea4f0160135/lxml-6.1.1-cp311-cp311-win_amd64.whl", hash = "sha256:abbefa31eee84842140f67acef1c828e28bba8bbf0c3bc6e5492a9af88152c28", size = 4025469, upload-time = "2026-05-18T19:17:50.566Z" }, - { url = "https://files.pythonhosted.org/packages/b0/d5/570e6390e4110331e6208b2ba83d1482cc9146808ee118b22824a34c1070/lxml-6.1.1-cp311-cp311-win_arm64.whl", hash = "sha256:dcb292aa7fe485ceff7af4f92e46c5af397daec5dff64871a528f0fc47a3cc5b", size = 3667640, upload-time = "2026-05-19T19:22:48.293Z" }, - { url = "https://files.pythonhosted.org/packages/6a/6e/c4add832b6fc1e887125b96f880d7b9b70aae5248718e046b1704bcac4b9/lxml-6.1.1-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:104c09bda8d2a562824c0e319d0768ce26a779b7601e0931d33b09b53c392ef7", size = 8570821, upload-time = "2026-05-18T19:17:42.068Z" }, - { url = "https://files.pythonhosted.org/packages/22/00/ff3009c88e65de8011630acf8ab5a09cb2becd2aaf47fba2f3449f6224e9/lxml-6.1.1-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:25c6997a9a534e016695a0ba06b2f07945de682731ff01065b6d5a4474179da1", size = 4624252, upload-time = "2026-05-18T19:17:47.897Z" }, - { url = "https://files.pythonhosted.org/packages/42/95/bb63f0fd62e554fe078e1fb3c8fe9083c14ddc7ad7fa178d10e57e071ac7/lxml-6.1.1-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:c921ba5c51e4e9f63b8b00267d06566e1f63407408a0496da2d1d0bfc819c7fc", size = 4930746, upload-time = "2026-05-18T19:18:29.637Z" }, - { url = "https://files.pythonhosted.org/packages/eb/99/0013e8d9b5960f4f041cf0b73e2f80c23eb5205b1f7bfb20203243651359/lxml-6.1.1-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:54a7f95e4de5fb94e2f9f4b9055c6ba33bf3d628fd77a1d647c5923caa2cdcdc", size = 5093723, upload-time = "2026-05-18T19:18:34.168Z" }, - { url = "https://files.pythonhosted.org/packages/29/91/317b332636bfc7bddcff828d41b3307f50043f4b237e40849c333d80fa1a/lxml-6.1.1-cp312-cp312-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:96f2ec43df44b1f76249ee0a615334f9b5b060e1c8bd90e706dad2d14d02f383", size = 5005557, upload-time = "2026-05-18T19:18:39.798Z" }, - { url = "https://files.pythonhosted.org/packages/42/2f/cc9bf06afe70f9c9093ae60855d9759da9db601ec4080f7473319666ffd7/lxml-6.1.1-cp312-cp312-manylinux_2_26_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:70ef8a7e102a1508f8121aae5b0867abd663f72c14f0a9c937e6554cb4587b7b", size = 5631036, upload-time = "2026-05-18T19:18:44.858Z" }, - { url = "https://files.pythonhosted.org/packages/08/f6/af32e23e563971ffb0fb86be52bc5be5c2c118858ffc119bf6a9039b173d/lxml-6.1.1-cp312-cp312-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:ebe6af670449830d6d9b752c256a983291c766a1365ba5d5460048f9e33a7818", size = 5240367, upload-time = "2026-05-18T19:18:49.217Z" }, - { url = "https://files.pythonhosted.org/packages/78/83/8555d40948b09ce86f1bd0c68a7ac31d07b1929f92cc1b074006c97ef2d2/lxml-6.1.1-cp312-cp312-manylinux_2_28_i686.whl", hash = "sha256:27acc820660aaffa4f7c087f29120e12980f7779d56d8492d263170111284740", size = 5350171, upload-time = "2026-05-18T19:18:52.779Z" }, - { url = "https://files.pythonhosted.org/packages/63/75/5d92da93729b7bad783689e6496049fa40927b45bec7bf183c981de3ca70/lxml-6.1.1-cp312-cp312-manylinux_2_31_armv7l.whl", hash = "sha256:1db753c9115ec7100d073b744d17e25e88a8f90f5c39b2f5dd878149af59671f", size = 4694874, upload-time = "2026-05-18T19:18:55.139Z" }, - { url = "https://files.pythonhosted.org/packages/c5/b5/3aad415a9a25b822e783f15deeb4dffccf5113030f1afa2222dd929313d9/lxml-6.1.1-cp312-cp312-manylinux_2_38_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:c4f469aebd783bb741c2ecb2a681008fd26bfe5c16a9a72ed5467f834e810df2", size = 5244492, upload-time = "2026-05-18T19:19:01.28Z" }, - { url = "https://files.pythonhosted.org/packages/f1/a1/5fcf7eb9904b80086aa47dcf0027de07b1bb990afad2e6823144c368ae04/lxml-6.1.1-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:766b010012d59470072c1816b5b6c69f1d243e5db36ea5968e94accf430a4635", size = 5048232, upload-time = "2026-05-18T19:18:12.67Z" }, - { url = "https://files.pythonhosted.org/packages/77/74/1f601b63c7a69fcdf10fa9b148c81da8442204194f6c55509cc485c786b9/lxml-6.1.1-cp312-cp312-musllinux_1_2_armv7l.whl", hash = "sha256:b8d812c6011c08b8111a15e54dd990b8923692d80adf35488bee34026c35accf", size = 4777023, upload-time = "2026-05-18T19:18:15.928Z" }, - { url = "https://files.pythonhosted.org/packages/a2/b9/7a78f51aec95b1bf780d78e12705a9f6533284f8693dc5c0e6724fa53d3f/lxml-6.1.1-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:fe0306bd29505a9177aac19f1877174b0e7422c222a59f70b2cd41633448c3dc", size = 5645773, upload-time = "2026-05-18T19:18:23.223Z" }, - { url = "https://files.pythonhosted.org/packages/a5/6e/98a7b7ad54e4e74fa1f20fff776913980619d0ebe5558232d7da6580bdd8/lxml-6.1.1-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:5ba186ad207446c65d3bb3d3e0412b032b1d9f595e59861e2354798c5703d955", size = 5233088, upload-time = "2026-05-18T19:18:31.433Z" }, - { url = "https://files.pythonhosted.org/packages/65/d1/bc0ed2427bf609f2ee10da303a6a226f9c8bce94f945dc29a32ce55de6e4/lxml-6.1.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:aa366a1e55b8ebfe8ca8ddc3cfe75c8ebade181aeb0f661d0cb05986b647f72a", size = 5260995, upload-time = "2026-05-18T19:18:37.091Z" }, - { url = "https://files.pythonhosted.org/packages/69/8b/6772e1a4b513fc50a8d931f19edde0e13ae6918510a1e13ff67864f3e5ed/lxml-6.1.1-cp312-cp312-win32.whl", hash = "sha256:126c93f7f56f0eda92f6d8c619edc463a4f23d9252f1c9d0405a76f25fa9f11a", size = 3596382, upload-time = "2026-05-18T19:17:18.37Z" }, - { url = "https://files.pythonhosted.org/packages/1b/89/45198e9624762af2dfd2cb8782598477ceb29f6e59caab560388ae1f4ec1/lxml-6.1.1-cp312-cp312-win_amd64.whl", hash = "sha256:26e6eda8d38c1fcab1090dd196ee87cbd13788e531937610e2589085de074e77", size = 3997255, upload-time = "2026-05-18T19:17:56.781Z" }, - { url = "https://files.pythonhosted.org/packages/90/a9/7a54b6834088d9ae528a7b780584ba6a39a9457b0ac330479f20ffbc9449/lxml-6.1.1-cp312-cp312-win_arm64.whl", hash = "sha256:6540377fbd53fe1b629172288c464fb18db11ce1fa7dc15891da10aa9dcc3e7f", size = 3659610, upload-time = "2026-05-19T19:22:50.843Z" }, - { url = "https://files.pythonhosted.org/packages/a5/eb/7e6f37c5584ccbb2ff267f56fd0339016938c1c8684cfefab9b33ffc2f36/lxml-6.1.1-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:68a9198d0fc122d14bb76837de9aa80cf84caed990b5b237f532ed87d3706736", size = 8559780, upload-time = "2026-05-18T19:17:57.661Z" }, - { url = "https://files.pythonhosted.org/packages/a1/36/587c2521cf23a2cd6c9c22108aa7528f683a1f195ed7ccd23a4b1786ad36/lxml-6.1.1-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:7d47866cb32fb503450b6edc9df355d10dc49836af2e89901bd6ac6b0896d9d9", size = 4618006, upload-time = "2026-05-18T19:18:04.452Z" }, - { url = "https://files.pythonhosted.org/packages/6e/ca/ab7bfe2bf4c972af5e7878262845ead3a24a929a9b04bc11c7c1ece6c82a/lxml-6.1.1-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:eb7c9811bfaa8b1ed5ed319f5d370dfbcaa59d52ea64be2a5a85e18195930354", size = 4924139, upload-time = "2026-05-18T19:19:04.873Z" }, - { url = "https://files.pythonhosted.org/packages/6b/55/a0c72851dfee5ecc689f949723a73dea457758912542cb955b108eaf0d8f/lxml-6.1.1-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:762ff394d5bd56da0cf034a23dcce4e13923f15321a2adfa2ac00201dc6d3fca", size = 5082329, upload-time = "2026-05-18T19:19:09.728Z" }, - { url = "https://files.pythonhosted.org/packages/f0/b6/0608f7d61a3b96cc67e5648a3d906e31a5082093e10e7be65b3886289938/lxml-6.1.1-cp313-cp313-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:a088f287f7d8275a33c07f2cac6c50b9319309a0200a39e7e75d80c707723099", size = 4993564, upload-time = "2026-05-18T19:19:13.608Z" }, - { url = "https://files.pythonhosted.org/packages/4c/66/ae227524b066d29d55bf0b453d93d2d793c40218657d643dcbbca13b8faf/lxml-6.1.1-cp313-cp313-manylinux_2_26_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:e902da4b04e6b52e5893900d4b8ab46068f75f3561f01bf1080957f9fd932ed6", size = 5613467, upload-time = "2026-05-18T19:19:16.228Z" }, - { url = "https://files.pythonhosted.org/packages/a6/76/dbe4a00b50385e40194231dcfe5a12c059de7cf90e89c83407d2b085b719/lxml-6.1.1-cp313-cp313-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:1d4962d4c66bf830a7e59ed6cfc17d148149898a3aefa8ec6e59763e6e3ed085", size = 5228304, upload-time = "2026-05-18T19:19:19.354Z" }, - { url = "https://files.pythonhosted.org/packages/1c/01/00b1b8442ed2041793336868ba0b9ea4b13d7da7c085c6404c207a63bf79/lxml-6.1.1-cp313-cp313-manylinux_2_28_i686.whl", hash = "sha256:581d4c8ae690a6609e64862dd6b7c2489635c2d13907fc2b20f2bc200ff1d21e", size = 5341607, upload-time = "2026-05-18T19:19:22.297Z" }, - { url = "https://files.pythonhosted.org/packages/63/36/1ad29931e9a4638bb707869f01d423a6c815f82152138d1a40dfcfde2b95/lxml-6.1.1-cp313-cp313-manylinux_2_31_armv7l.whl", hash = "sha256:876e1ff5930ed8bf295ec5ef9a8155e9b6b1876bbf1deed8b3a8069311875a8f", size = 4700168, upload-time = "2026-05-18T19:19:25.133Z" }, - { url = "https://files.pythonhosted.org/packages/3c/d1/a9536cecf9be18a0dc72d32bead283a2332d1ffebd2dd3ac70ce444686e5/lxml-6.1.1-cp313-cp313-manylinux_2_38_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:9eb9b5a968f6e0f6d640092a567e14529ff8cea2e29d00da6f78a79fa49f013c", size = 5232487, upload-time = "2026-05-18T19:19:28.603Z" }, - { url = "https://files.pythonhosted.org/packages/0e/77/b4fb1e03bf5d130e879214d3100092e386418807fb74dd0adc4b0a48f351/lxml-6.1.1-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:aa49e06d94aba782c6a02eecb7e507969e7e7a41b267f1b359bb35585f295d5b", size = 5044231, upload-time = "2026-05-18T19:18:42.246Z" }, - { url = "https://files.pythonhosted.org/packages/26/4c/d00daeeb0a5530c4028a9232aa1b93db3ef4ed2158c116ea73c79a9765b3/lxml-6.1.1-cp313-cp313-musllinux_1_2_armv7l.whl", hash = "sha256:70cdfd80589d59e43e18005dd7244e8895e93db8ab6a620b7e23df5445a4e3d2", size = 4769450, upload-time = "2026-05-18T19:18:48.013Z" }, - { url = "https://files.pythonhosted.org/packages/ed/6a/715a3a8d156ce42f29cf014706f5410c2ff3b02267774110fc23266409fe/lxml-6.1.1-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:aad9aa39483ed8ec44d6d2e59e5b98a0d80676ef0d92f44bfc374836111f62f5", size = 5635874, upload-time = "2026-05-18T19:18:51.914Z" }, - { url = "https://files.pythonhosted.org/packages/45/37/0544bc21dde2a88f3a17b504e6fc79c0e01d25a33c2f6079724e9e72b9c7/lxml-6.1.1-cp313-cp313-musllinux_1_2_riscv64.whl", hash = "sha256:d49514be2f28d895c38cf9d2b72d7b9a07d00314519f456c0b50b53cfcf4c785", size = 5223987, upload-time = "2026-05-18T19:18:59.715Z" }, - { url = "https://files.pythonhosted.org/packages/4d/f8/f6a5e8185bcb28c2befae3d31f8e3df3b811cb0f47746517a81279fcafe1/lxml-6.1.1-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:47402e62c52ff5988c1e8c6c63177f5708bccf48e366dea4e3dcf1e645e04947", size = 5250276, upload-time = "2026-05-18T19:19:03.834Z" }, - { url = "https://files.pythonhosted.org/packages/c7/f2/1a2b9f1b7a49d45495369be7ef9ad05b262930f2eab3e3145706fca8083f/lxml-6.1.1-cp313-cp313-win32.whl", hash = "sha256:3483644525531e1d5762b0c44a8e18b6efba321b6dcf8a8952de10b037618bca", size = 3596903, upload-time = "2026-05-18T19:17:29.863Z" }, - { url = "https://files.pythonhosted.org/packages/e6/99/f4ffb024f238eec2131aaa09f3278fb6129cf892741bf68e1fc1afb8c100/lxml-6.1.1-cp313-cp313-win_amd64.whl", hash = "sha256:a10bd2fd62e8ce916ececb342f348f190724a098c1faa056fdfb2a22ad5e8660", size = 3995869, upload-time = "2026-05-18T19:18:02.596Z" }, - { url = "https://files.pythonhosted.org/packages/d1/53/70eb8c5c6037f27448f1e3c54ebede9545a801ae63f0a7254afca4fe8e45/lxml-6.1.1-cp313-cp313-win_arm64.whl", hash = "sha256:424aa57aca0897eb922aef34395bd1289b3b6f04e6bae20ea123c0c7e333cffc", size = 3658490, upload-time = "2026-05-19T19:22:53.846Z" }, { url = "https://files.pythonhosted.org/packages/13/e2/2e325795566de01d0d7c3bb57d3c370616b2d07b01214e84eec5d3b10963/lxml-6.1.1-cp314-cp314-macosx_10_15_universal2.whl", hash = "sha256:19b7ab10b210b0b3ad7985d9ac4eb66ab09a90b20fe6e2f7ba55d01a234345d0", size = 8577146, upload-time = "2026-05-18T19:18:17.765Z" }, { url = "https://files.pythonhosted.org/packages/93/cf/5630b5e4be7d2e6bee8efe83865c925221103cf0221303b104ce134b01e2/lxml-6.1.1-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:c08e5c694306507275f2290073350c4f32e383db15213b2c69e7ff39c1193840", size = 4623866, upload-time = "2026-05-18T19:18:30.669Z" }, { url = "https://files.pythonhosted.org/packages/d2/51/3904907c063451cf8d4a5c9fe0cad95fa1f4ec57f4e3884fa0731bd7a305/lxml-6.1.1-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:74a9717fd0d82effef5c2854f0d917231d5324b5a3eb7275c43ac9fa32f97a14", size = 4950022, upload-time = "2026-05-18T19:19:31.958Z" }, @@ -2104,12 +1484,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/ce/68/b30e913340c380ddac9580c6e6230991fc37240ec4f64704833e4f3e2769/lxml-6.1.1-cp314-cp314t-win32.whl", hash = "sha256:649dda677cf3bd6ac9ae14007ba0c824ded8ce5808b53fc7431d9140399118c1", size = 3897345, upload-time = "2026-05-18T19:17:33.562Z" }, { url = "https://files.pythonhosted.org/packages/3c/4e/9eb2af5335545f9fbcd7af57bcf87c6025d31eaa31b14ec184a6c8675328/lxml-6.1.1-cp314-cp314t-win_amd64.whl", hash = "sha256:793033d6c5cdf33a573f910d9bea14ef8f5771820411d118da8e1182edb53d5e", size = 4393350, upload-time = "2026-05-18T19:18:10.076Z" }, { url = "https://files.pythonhosted.org/packages/7f/2c/0f1e93c636720e8a3eb59af2bfda99d98b55891e1c53bc30c2e0e865f01b/lxml-6.1.1-cp314-cp314t-win_arm64.whl", hash = "sha256:58bb955caba94e467d2a96da17660d2d704e0675894cba21ab8a775b8621fd1c", size = 3817223, upload-time = "2026-05-19T19:22:56.823Z" }, - { url = "https://files.pythonhosted.org/packages/b5/32/86a3f0f724a3a402d4627937a7fc27b160e45e7012b4adf47f6e1e844511/lxml-6.1.1-pp311-pypy311_pp73-macosx_10_15_x86_64.whl", hash = "sha256:31033dc34636ea6b7d5cc11b1ddbda78a14de858ba9d3e1ed4b69a3085bc521e", size = 3930127, upload-time = "2026-05-18T19:19:02.27Z" }, - { url = "https://files.pythonhosted.org/packages/40/44/d832e82af08723761556d004b1d04d281c09f9a8cecd7d3148548c9941a3/lxml-6.1.1-pp311-pypy311_pp73-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:3893c14c4b6ac5b2d54ba8cf03e99fe5104e592de491f19bd6b82756c09f8004", size = 4210769, upload-time = "2026-05-18T19:20:41.427Z" }, - { url = "https://files.pythonhosted.org/packages/6d/39/0dc5949f759ed7d951e0bb8c2f2d9d7aca1908d22352fa84a8afd2ea54af/lxml-6.1.1-pp311-pypy311_pp73-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:c07da4cebf6889f03ebac8d238f62318e29f495de0aa18a51ea14e61ae907e2e", size = 4318163, upload-time = "2026-05-18T19:20:44.702Z" }, - { url = "https://files.pythonhosted.org/packages/e6/fb/8ab3845fe046ba4cbf74536bcf6801a774b7caf4350de1c5d37f1f0a9e90/lxml-6.1.1-pp311-pypy311_pp73-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:f6f0ce10945fab9c4c06ce14e22af9059d1a87493a9af4501a5b0b9187e21cf2", size = 4250945, upload-time = "2026-05-18T19:20:47.385Z" }, - { url = "https://files.pythonhosted.org/packages/68/1b/7553ab136894374ffae8851ec06f98f511cd8e66246e41b6be059d0a7289/lxml-6.1.1-pp311-pypy311_pp73-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:f8844cd288697c6425c9beba919302241e3278871dc6519515e72b04e987abcf", size = 4401664, upload-time = "2026-05-18T19:20:50.489Z" }, - { url = "https://files.pythonhosted.org/packages/db/a4/441aee36c6f6b249823d20fd91f9be9ab89d7c5a8ae542a4a4ca6d342d56/lxml-6.1.1-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:ed21202aec73cda4d55d1ce57b389aadb90ffb044e6cd1080b8347efe1b1ec84", size = 3508989, upload-time = "2026-05-18T19:18:38.158Z" }, ] [[package]] @@ -2118,50 +1492,6 @@ version = "3.0.3" source = { registry = "https://pypi.org/simple" } sdist = { url = "https://files.pythonhosted.org/packages/7e/99/7690b6d4034fffd95959cbe0c02de8deb3098cc577c67bb6a24fe5d7caa7/markupsafe-3.0.3.tar.gz", hash = "sha256:722695808f4b6457b320fdc131280796bdceb04ab50fe1795cd540799ebe1698", size = 80313, upload-time = "2025-09-27T18:37:40.426Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/08/db/fefacb2136439fc8dd20e797950e749aa1f4997ed584c62cfb8ef7c2be0e/markupsafe-3.0.3-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:1cc7ea17a6824959616c525620e387f6dd30fec8cb44f649e31712db02123dad", size = 11631, upload-time = "2025-09-27T18:36:18.185Z" }, - { url = "https://files.pythonhosted.org/packages/e1/2e/5898933336b61975ce9dc04decbc0a7f2fee78c30353c5efba7f2d6ff27a/markupsafe-3.0.3-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:4bd4cd07944443f5a265608cc6aab442e4f74dff8088b0dfc8238647b8f6ae9a", size = 12058, upload-time = "2025-09-27T18:36:19.444Z" }, - { url = "https://files.pythonhosted.org/packages/1d/09/adf2df3699d87d1d8184038df46a9c80d78c0148492323f4693df54e17bb/markupsafe-3.0.3-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:6b5420a1d9450023228968e7e6a9ce57f65d148ab56d2313fcd589eee96a7a50", size = 24287, upload-time = "2025-09-27T18:36:20.768Z" }, - { url = "https://files.pythonhosted.org/packages/30/ac/0273f6fcb5f42e314c6d8cd99effae6a5354604d461b8d392b5ec9530a54/markupsafe-3.0.3-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:0bf2a864d67e76e5c9a34dc26ec616a66b9888e25e7b9460e1c76d3293bd9dbf", size = 22940, upload-time = "2025-09-27T18:36:22.249Z" }, - { url = "https://files.pythonhosted.org/packages/19/ae/31c1be199ef767124c042c6c3e904da327a2f7f0cd63a0337e1eca2967a8/markupsafe-3.0.3-cp311-cp311-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:bc51efed119bc9cfdf792cdeaa4d67e8f6fcccab66ed4bfdd6bde3e59bfcbb2f", size = 21887, upload-time = "2025-09-27T18:36:23.535Z" }, - { url = "https://files.pythonhosted.org/packages/b2/76/7edcab99d5349a4532a459e1fe64f0b0467a3365056ae550d3bcf3f79e1e/markupsafe-3.0.3-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:068f375c472b3e7acbe2d5318dea141359e6900156b5b2ba06a30b169086b91a", size = 23692, upload-time = "2025-09-27T18:36:24.823Z" }, - { url = "https://files.pythonhosted.org/packages/a4/28/6e74cdd26d7514849143d69f0bf2399f929c37dc2b31e6829fd2045b2765/markupsafe-3.0.3-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:7be7b61bb172e1ed687f1754f8e7484f1c8019780f6f6b0786e76bb01c2ae115", size = 21471, upload-time = "2025-09-27T18:36:25.95Z" }, - { url = "https://files.pythonhosted.org/packages/62/7e/a145f36a5c2945673e590850a6f8014318d5577ed7e5920a4b3448e0865d/markupsafe-3.0.3-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:f9e130248f4462aaa8e2552d547f36ddadbeaa573879158d721bbd33dfe4743a", size = 22923, upload-time = "2025-09-27T18:36:27.109Z" }, - { url = "https://files.pythonhosted.org/packages/0f/62/d9c46a7f5c9adbeeeda52f5b8d802e1094e9717705a645efc71b0913a0a8/markupsafe-3.0.3-cp311-cp311-win32.whl", hash = "sha256:0db14f5dafddbb6d9208827849fad01f1a2609380add406671a26386cdf15a19", size = 14572, upload-time = "2025-09-27T18:36:28.045Z" }, - { url = "https://files.pythonhosted.org/packages/83/8a/4414c03d3f891739326e1783338e48fb49781cc915b2e0ee052aa490d586/markupsafe-3.0.3-cp311-cp311-win_amd64.whl", hash = "sha256:de8a88e63464af587c950061a5e6a67d3632e36df62b986892331d4620a35c01", size = 15077, upload-time = "2025-09-27T18:36:29.025Z" }, - { url = "https://files.pythonhosted.org/packages/35/73/893072b42e6862f319b5207adc9ae06070f095b358655f077f69a35601f0/markupsafe-3.0.3-cp311-cp311-win_arm64.whl", hash = "sha256:3b562dd9e9ea93f13d53989d23a7e775fdfd1066c33494ff43f5418bc8c58a5c", size = 13876, upload-time = "2025-09-27T18:36:29.954Z" }, - { url = "https://files.pythonhosted.org/packages/5a/72/147da192e38635ada20e0a2e1a51cf8823d2119ce8883f7053879c2199b5/markupsafe-3.0.3-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:d53197da72cc091b024dd97249dfc7794d6a56530370992a5e1a08983ad9230e", size = 11615, upload-time = "2025-09-27T18:36:30.854Z" }, - { url = "https://files.pythonhosted.org/packages/9a/81/7e4e08678a1f98521201c3079f77db69fb552acd56067661f8c2f534a718/markupsafe-3.0.3-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:1872df69a4de6aead3491198eaf13810b565bdbeec3ae2dc8780f14458ec73ce", size = 12020, upload-time = "2025-09-27T18:36:31.971Z" }, - { url = "https://files.pythonhosted.org/packages/1e/2c/799f4742efc39633a1b54a92eec4082e4f815314869865d876824c257c1e/markupsafe-3.0.3-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:3a7e8ae81ae39e62a41ec302f972ba6ae23a5c5396c8e60113e9066ef893da0d", size = 24332, upload-time = "2025-09-27T18:36:32.813Z" }, - { url = "https://files.pythonhosted.org/packages/3c/2e/8d0c2ab90a8c1d9a24f0399058ab8519a3279d1bd4289511d74e909f060e/markupsafe-3.0.3-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:d6dd0be5b5b189d31db7cda48b91d7e0a9795f31430b7f271219ab30f1d3ac9d", size = 22947, upload-time = "2025-09-27T18:36:33.86Z" }, - { url = "https://files.pythonhosted.org/packages/2c/54/887f3092a85238093a0b2154bd629c89444f395618842e8b0c41783898ea/markupsafe-3.0.3-cp312-cp312-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:94c6f0bb423f739146aec64595853541634bde58b2135f27f61c1ffd1cd4d16a", size = 21962, upload-time = "2025-09-27T18:36:35.099Z" }, - { url = "https://files.pythonhosted.org/packages/c9/2f/336b8c7b6f4a4d95e91119dc8521402461b74a485558d8f238a68312f11c/markupsafe-3.0.3-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:be8813b57049a7dc738189df53d69395eba14fb99345e0a5994914a3864c8a4b", size = 23760, upload-time = "2025-09-27T18:36:36.001Z" }, - { url = "https://files.pythonhosted.org/packages/32/43/67935f2b7e4982ffb50a4d169b724d74b62a3964bc1a9a527f5ac4f1ee2b/markupsafe-3.0.3-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:83891d0e9fb81a825d9a6d61e3f07550ca70a076484292a70fde82c4b807286f", size = 21529, upload-time = "2025-09-27T18:36:36.906Z" }, - { url = "https://files.pythonhosted.org/packages/89/e0/4486f11e51bbba8b0c041098859e869e304d1c261e59244baa3d295d47b7/markupsafe-3.0.3-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:77f0643abe7495da77fb436f50f8dab76dbc6e5fd25d39589a0f1fe6548bfa2b", size = 23015, upload-time = "2025-09-27T18:36:37.868Z" }, - { url = "https://files.pythonhosted.org/packages/2f/e1/78ee7a023dac597a5825441ebd17170785a9dab23de95d2c7508ade94e0e/markupsafe-3.0.3-cp312-cp312-win32.whl", hash = "sha256:d88b440e37a16e651bda4c7c2b930eb586fd15ca7406cb39e211fcff3bf3017d", size = 14540, upload-time = "2025-09-27T18:36:38.761Z" }, - { url = "https://files.pythonhosted.org/packages/aa/5b/bec5aa9bbbb2c946ca2733ef9c4ca91c91b6a24580193e891b5f7dbe8e1e/markupsafe-3.0.3-cp312-cp312-win_amd64.whl", hash = "sha256:26a5784ded40c9e318cfc2bdb30fe164bdb8665ded9cd64d500a34fb42067b1c", size = 15105, upload-time = "2025-09-27T18:36:39.701Z" }, - { url = "https://files.pythonhosted.org/packages/e5/f1/216fc1bbfd74011693a4fd837e7026152e89c4bcf3e77b6692fba9923123/markupsafe-3.0.3-cp312-cp312-win_arm64.whl", hash = "sha256:35add3b638a5d900e807944a078b51922212fb3dedb01633a8defc4b01a3c85f", size = 13906, upload-time = "2025-09-27T18:36:40.689Z" }, - { url = "https://files.pythonhosted.org/packages/38/2f/907b9c7bbba283e68f20259574b13d005c121a0fa4c175f9bed27c4597ff/markupsafe-3.0.3-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:e1cf1972137e83c5d4c136c43ced9ac51d0e124706ee1c8aa8532c1287fa8795", size = 11622, upload-time = "2025-09-27T18:36:41.777Z" }, - { url = "https://files.pythonhosted.org/packages/9c/d9/5f7756922cdd676869eca1c4e3c0cd0df60ed30199ffd775e319089cb3ed/markupsafe-3.0.3-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:116bb52f642a37c115f517494ea5feb03889e04df47eeff5b130b1808ce7c219", size = 12029, upload-time = "2025-09-27T18:36:43.257Z" }, - { url = "https://files.pythonhosted.org/packages/00/07/575a68c754943058c78f30db02ee03a64b3c638586fba6a6dd56830b30a3/markupsafe-3.0.3-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:133a43e73a802c5562be9bbcd03d090aa5a1fe899db609c29e8c8d815c5f6de6", size = 24374, upload-time = "2025-09-27T18:36:44.508Z" }, - { url = "https://files.pythonhosted.org/packages/a9/21/9b05698b46f218fc0e118e1f8168395c65c8a2c750ae2bab54fc4bd4e0e8/markupsafe-3.0.3-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:ccfcd093f13f0f0b7fdd0f198b90053bf7b2f02a3927a30e63f3ccc9df56b676", size = 22980, upload-time = "2025-09-27T18:36:45.385Z" }, - { url = "https://files.pythonhosted.org/packages/7f/71/544260864f893f18b6827315b988c146b559391e6e7e8f7252839b1b846a/markupsafe-3.0.3-cp313-cp313-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:509fa21c6deb7a7a273d629cf5ec029bc209d1a51178615ddf718f5918992ab9", size = 21990, upload-time = "2025-09-27T18:36:46.916Z" }, - { url = "https://files.pythonhosted.org/packages/c2/28/b50fc2f74d1ad761af2f5dcce7492648b983d00a65b8c0e0cb457c82ebbe/markupsafe-3.0.3-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:a4afe79fb3de0b7097d81da19090f4df4f8d3a2b3adaa8764138aac2e44f3af1", size = 23784, upload-time = "2025-09-27T18:36:47.884Z" }, - { url = "https://files.pythonhosted.org/packages/ed/76/104b2aa106a208da8b17a2fb72e033a5a9d7073c68f7e508b94916ed47a9/markupsafe-3.0.3-cp313-cp313-musllinux_1_2_riscv64.whl", hash = "sha256:795e7751525cae078558e679d646ae45574b47ed6e7771863fcc079a6171a0fc", size = 21588, upload-time = "2025-09-27T18:36:48.82Z" }, - { url = "https://files.pythonhosted.org/packages/b5/99/16a5eb2d140087ebd97180d95249b00a03aa87e29cc224056274f2e45fd6/markupsafe-3.0.3-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:8485f406a96febb5140bfeca44a73e3ce5116b2501ac54fe953e488fb1d03b12", size = 23041, upload-time = "2025-09-27T18:36:49.797Z" }, - { url = "https://files.pythonhosted.org/packages/19/bc/e7140ed90c5d61d77cea142eed9f9c303f4c4806f60a1044c13e3f1471d0/markupsafe-3.0.3-cp313-cp313-win32.whl", hash = "sha256:bdd37121970bfd8be76c5fb069c7751683bdf373db1ed6c010162b2a130248ed", size = 14543, upload-time = "2025-09-27T18:36:51.584Z" }, - { url = "https://files.pythonhosted.org/packages/05/73/c4abe620b841b6b791f2edc248f556900667a5a1cf023a6646967ae98335/markupsafe-3.0.3-cp313-cp313-win_amd64.whl", hash = "sha256:9a1abfdc021a164803f4d485104931fb8f8c1efd55bc6b748d2f5774e78b62c5", size = 15113, upload-time = "2025-09-27T18:36:52.537Z" }, - { url = "https://files.pythonhosted.org/packages/f0/3a/fa34a0f7cfef23cf9500d68cb7c32dd64ffd58a12b09225fb03dd37d5b80/markupsafe-3.0.3-cp313-cp313-win_arm64.whl", hash = "sha256:7e68f88e5b8799aa49c85cd116c932a1ac15caaa3f5db09087854d218359e485", size = 13911, upload-time = "2025-09-27T18:36:53.513Z" }, - { url = "https://files.pythonhosted.org/packages/e4/d7/e05cd7efe43a88a17a37b3ae96e79a19e846f3f456fe79c57ca61356ef01/markupsafe-3.0.3-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:218551f6df4868a8d527e3062d0fb968682fe92054e89978594c28e642c43a73", size = 11658, upload-time = "2025-09-27T18:36:54.819Z" }, - { url = "https://files.pythonhosted.org/packages/99/9e/e412117548182ce2148bdeacdda3bb494260c0b0184360fe0d56389b523b/markupsafe-3.0.3-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:3524b778fe5cfb3452a09d31e7b5adefeea8c5be1d43c4f810ba09f2ceb29d37", size = 12066, upload-time = "2025-09-27T18:36:55.714Z" }, - { url = "https://files.pythonhosted.org/packages/bc/e6/fa0ffcda717ef64a5108eaa7b4f5ed28d56122c9a6d70ab8b72f9f715c80/markupsafe-3.0.3-cp313-cp313t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:4e885a3d1efa2eadc93c894a21770e4bc67899e3543680313b09f139e149ab19", size = 25639, upload-time = "2025-09-27T18:36:56.908Z" }, - { url = "https://files.pythonhosted.org/packages/96/ec/2102e881fe9d25fc16cb4b25d5f5cde50970967ffa5dddafdb771237062d/markupsafe-3.0.3-cp313-cp313t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:8709b08f4a89aa7586de0aadc8da56180242ee0ada3999749b183aa23df95025", size = 23569, upload-time = "2025-09-27T18:36:57.913Z" }, - { url = "https://files.pythonhosted.org/packages/4b/30/6f2fce1f1f205fc9323255b216ca8a235b15860c34b6798f810f05828e32/markupsafe-3.0.3-cp313-cp313t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:b8512a91625c9b3da6f127803b166b629725e68af71f8184ae7e7d54686a56d6", size = 23284, upload-time = "2025-09-27T18:36:58.833Z" }, - { url = "https://files.pythonhosted.org/packages/58/47/4a0ccea4ab9f5dcb6f79c0236d954acb382202721e704223a8aafa38b5c8/markupsafe-3.0.3-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:9b79b7a16f7fedff2495d684f2b59b0457c3b493778c9eed31111be64d58279f", size = 24801, upload-time = "2025-09-27T18:36:59.739Z" }, - { url = "https://files.pythonhosted.org/packages/6a/70/3780e9b72180b6fecb83a4814d84c3bf4b4ae4bf0b19c27196104149734c/markupsafe-3.0.3-cp313-cp313t-musllinux_1_2_riscv64.whl", hash = "sha256:12c63dfb4a98206f045aa9563db46507995f7ef6d83b2f68eda65c307c6829eb", size = 22769, upload-time = "2025-09-27T18:37:00.719Z" }, - { url = "https://files.pythonhosted.org/packages/98/c5/c03c7f4125180fc215220c035beac6b9cb684bc7a067c84fc69414d315f5/markupsafe-3.0.3-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:8f71bc33915be5186016f675cd83a1e08523649b0e33efdb898db577ef5bb009", size = 23642, upload-time = "2025-09-27T18:37:01.673Z" }, - { url = "https://files.pythonhosted.org/packages/80/d6/2d1b89f6ca4bff1036499b1e29a1d02d282259f3681540e16563f27ebc23/markupsafe-3.0.3-cp313-cp313t-win32.whl", hash = "sha256:69c0b73548bc525c8cb9a251cddf1931d1db4d2258e9599c28c07ef3580ef354", size = 14612, upload-time = "2025-09-27T18:37:02.639Z" }, - { url = "https://files.pythonhosted.org/packages/2b/98/e48a4bfba0a0ffcf9925fe2d69240bfaa19c6f7507b8cd09c70684a53c1e/markupsafe-3.0.3-cp313-cp313t-win_amd64.whl", hash = "sha256:1b4b79e8ebf6b55351f0d91fe80f893b4743f104bff22e90697db1590e47a218", size = 15200, upload-time = "2025-09-27T18:37:03.582Z" }, - { url = "https://files.pythonhosted.org/packages/0e/72/e3cc540f351f316e9ed0f092757459afbc595824ca724cbc5a5d4263713f/markupsafe-3.0.3-cp313-cp313t-win_arm64.whl", hash = "sha256:ad2cf8aa28b8c020ab2fc8287b0f823d0a7d8630784c31e9ee5edea20f406287", size = 13973, upload-time = "2025-09-27T18:37:04.929Z" }, { url = "https://files.pythonhosted.org/packages/33/8a/8e42d4838cd89b7dde187011e97fe6c3af66d8c044997d2183fbd6d31352/markupsafe-3.0.3-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:eaa9599de571d72e2daf60164784109f19978b327a3910d3e9de8c97b5b70cfe", size = 11619, upload-time = "2025-09-27T18:37:06.342Z" }, { url = "https://files.pythonhosted.org/packages/b5/64/7660f8a4a8e53c924d0fa05dc3a55c9cee10bbd82b11c5afb27d44b096ce/markupsafe-3.0.3-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:c47a551199eb8eb2121d4f0f15ae0f923d31350ab9280078d1e5f12b249e0026", size = 12029, upload-time = "2025-09-27T18:37:07.213Z" }, { url = "https://files.pythonhosted.org/packages/da/ef/e648bfd021127bef5fa12e1720ffed0c6cbb8310c8d9bea7266337ff06de/markupsafe-3.0.3-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:f34c41761022dd093b4b6896d4810782ffbabe30f2d443ff5f083e0cbbb8c737", size = 24408, upload-time = "2025-09-27T18:37:09.572Z" }, @@ -2228,34 +1558,6 @@ dependencies = [ ] sdist = { url = "https://files.pythonhosted.org/packages/63/1b/4be5be87d43d327a0cf4de1a56e86f7f84c89312452406cf122efe2839e6/matplotlib-3.10.9.tar.gz", hash = "sha256:fd66508e8c6877d98e586654b608a0456db8d7e8a546eb1e2600efd957302358", size = 34811233, upload-time = "2026-04-24T00:14:13.539Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/4c/8c/290f021104741fea63769c31494f5324c0cd249bf536a65a4350767b1f22/matplotlib-3.10.9-cp311-cp311-macosx_10_12_x86_64.whl", hash = "sha256:68cfdcede415f7c8f5577b03303dd94526cdb6d11036cecdc205e08733b2d2bb", size = 8306860, upload-time = "2026-04-24T00:12:01.207Z" }, - { url = "https://files.pythonhosted.org/packages/51/18/325cd32ece1120d1da51cc4e4294c6580190699490183fc2fe8cb6d61ec5/matplotlib-3.10.9-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:dfca0129678bd56379db26c52b5d77ed7de314c047492fbdc763aa7501710cfb", size = 8199254, upload-time = "2026-04-24T00:12:04.239Z" }, - { url = "https://files.pythonhosted.org/packages/79/db/e28c1b83e3680740aa78925f5fb2ae4d16207207419ad75ea9fe604f8676/matplotlib-3.10.9-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:8e436d155fa8a3399dc62683f8f5d0e2e50d25d0144a73edd73f82eec8f4abfb", size = 8777092, upload-time = "2026-04-24T00:12:06.793Z" }, - { url = "https://files.pythonhosted.org/packages/55/fa/3ce7adfe9ba101748f465211660d9c6374c876b671bdb8c2bb6d347e8b94/matplotlib-3.10.9-cp311-cp311-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:56fc0bd271b00025c6edfdc7c2dcd247372c8e1544971d62e1dc7c17367e8bf9", size = 9595691, upload-time = "2026-04-24T00:12:09.706Z" }, - { url = "https://files.pythonhosted.org/packages/36/c4/6960a76686ed668f2c60f84e9799ba4c0d56abdb36b1577b60c1d061d1ec/matplotlib-3.10.9-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:a5a6104ed666402ba5106d7f36e0e0cdca4e8d7fa4d39708ca88019e2835a2eb", size = 9659771, upload-time = "2026-04-24T00:12:12.766Z" }, - { url = "https://files.pythonhosted.org/packages/7e/0d/271aace3342157c64700c9ff4c59c7b392f3dbab393692e8db6fbe7ab96c/matplotlib-3.10.9-cp311-cp311-win_amd64.whl", hash = "sha256:d730e984eddf56974c3e72b6129c7ca462ac38dc624338f4b0b23eb23ecba00f", size = 8205112, upload-time = "2026-04-24T00:12:15.773Z" }, - { url = "https://files.pythonhosted.org/packages/e2/ee/cb57ad4754f3e7b9174ce6ce66d9205fb827067e48a9f58ac09d7e7d6b77/matplotlib-3.10.9-cp311-cp311-win_arm64.whl", hash = "sha256:51bf0ddbdc598e060d46c16b5590708f81a1624cefbaaf62f6a81bf9285b8c80", size = 8132310, upload-time = "2026-04-24T00:12:18.645Z" }, - { url = "https://files.pythonhosted.org/packages/35/c6/5581e26c72233ebb2a2a6fed2d24fb7c66b4700120b813f51b0555acf0b6/matplotlib-3.10.9-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:f0c3c28d9fbcc1fe7a03be236d73430cf6409c41fb2383a7ac52fe932b072cb1", size = 8319908, upload-time = "2026-04-24T00:12:21.323Z" }, - { url = "https://files.pythonhosted.org/packages/b7/18/4880dd762e40cd360c1bf06e890c5a97b997e91cb324602b1a19950ad5ce/matplotlib-3.10.9-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:41cb28c2bd769aa3e98322c6ab09854cbcc52ab69d2759d681bba3e327b2b320", size = 8216016, upload-time = "2026-04-24T00:12:23.4Z" }, - { url = "https://files.pythonhosted.org/packages/32/91/d024616abdba99e83120e07a20658976f6a343646710760c4a51df126029/matplotlib-3.10.9-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:ae20801130378b82d647ff5047c07316295b68dc054ca6b3c13519d0ea624285", size = 8789336, upload-time = "2026-04-24T00:12:26.096Z" }, - { url = "https://files.pythonhosted.org/packages/5c/04/030a2f61ef2158f5e4c259487a92ac877732499fb33d871585d89e03c42d/matplotlib-3.10.9-cp312-cp312-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:6c63ebcd8b4b169eb2f5c200552ae6b8be8999a005b6b507ed76fb8d7d674fe2", size = 9604602, upload-time = "2026-04-24T00:12:29.052Z" }, - { url = "https://files.pythonhosted.org/packages/fc/c2/541e4d09d87bb6b5830fc28b4c887a9a8cf4e1c6cee698a8c05552ae2003/matplotlib-3.10.9-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:d75d11c949914165976c621b2324f9ef162af7ebf4b057ddf95dd1dba7e5edcf", size = 9670966, upload-time = "2026-04-24T00:12:32.131Z" }, - { url = "https://files.pythonhosted.org/packages/04/a1/4571fc46e7702de8d0c2dc54ad1b2f8e29328dea3ee90831181f7353d93c/matplotlib-3.10.9-cp312-cp312-win_amd64.whl", hash = "sha256:d091f9d758b34aaaaa6331d13574bf01891d903b3dec59bfff458ef7551de5d6", size = 8217462, upload-time = "2026-04-24T00:12:35.226Z" }, - { url = "https://files.pythonhosted.org/packages/4b/d0/2269edb12aa30c13c8bcc9382892e39943ce1d28aab4ec296e0381798e81/matplotlib-3.10.9-cp312-cp312-win_arm64.whl", hash = "sha256:10cc5ce06d10231c36f40e875f3c7e8050362a4ee8f0ee5d29a6b3277d57bb42", size = 8136688, upload-time = "2026-04-24T00:12:37.442Z" }, - { url = "https://files.pythonhosted.org/packages/aa/d3/8d4f6afbecb49fc04e060a57c0fce39ea51cc163a6bd87303ccd698e4fa6/matplotlib-3.10.9-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:b580440f1ff81a0e34122051a3dfabb7e4b7f9e380629929bde0eff9af72165f", size = 8320331, upload-time = "2026-04-24T00:12:39.688Z" }, - { url = "https://files.pythonhosted.org/packages/63/d9/9e14bc7564bf92d5ffa801ae5fac819ce74b925dfb55e3ebde61a3bbad3e/matplotlib-3.10.9-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:b1b745c489cd1a77a0dc1120a05dc87af9798faebc913601feb8c73d89bf2d1e", size = 8216461, upload-time = "2026-04-24T00:12:42.494Z" }, - { url = "https://files.pythonhosted.org/packages/8a/17/4402d0d14ccf1dfc70932600b68097fbbf9c898a4871d2cbbe79c7801a32/matplotlib-3.10.9-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:8f3bcac1ca5ed000a6f4337d47ba67dfddf37ed6a46c15fd7f014997f7bf865f", size = 8790091, upload-time = "2026-04-24T00:12:44.789Z" }, - { url = "https://files.pythonhosted.org/packages/3e/0b/322aeec06dd9b91411f92028b37d447342770a24392aa4813e317064dad5/matplotlib-3.10.9-cp313-cp313-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:7a8d66a55def891c33147ba3ba9bfcabf0b526a43764c818acbb4525e5ed0838", size = 9605027, upload-time = "2026-04-24T00:12:47.583Z" }, - { url = "https://files.pythonhosted.org/packages/74/88/5f13482f55e7b00bcfc09838b093c2456e1379978d2a146844aae05350ad/matplotlib-3.10.9-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:d843374407c4017a6403b59c6c81606773d136f3259d5b6da3131bc814542cc2", size = 9671269, upload-time = "2026-04-24T00:12:50.878Z" }, - { url = "https://files.pythonhosted.org/packages/c5/e0/0840fd2f93da988ec660b8ad1984abe9f25d2aed22a5e394ff1c68c88307/matplotlib-3.10.9-cp313-cp313-win_amd64.whl", hash = "sha256:f4399f64b3e94cd500195490972ae1ee81170df1636fa15364d157d5bdd7b921", size = 8217588, upload-time = "2026-04-24T00:12:53.784Z" }, - { url = "https://files.pythonhosted.org/packages/47/b9/d706d06dd605c49b9f83a2aed8c13e3e5db70697d7a80b7e3d7915de6b17/matplotlib-3.10.9-cp313-cp313-win_arm64.whl", hash = "sha256:ba7b3b8ef09eab7df0e86e9ae086faa433efbfbdb46afcb3aa16aabf779469a8", size = 8136913, upload-time = "2026-04-24T00:12:56.501Z" }, - { url = "https://files.pythonhosted.org/packages/9b/45/6e32d96978264c8ca8c4b1010adb955a1a49cfaf314e212bbc8908f04a61/matplotlib-3.10.9-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:09218df8a93712bd6ea133e83a153c755448cf7868316c531cffcc43f69d1cc9", size = 8368019, upload-time = "2026-04-24T00:12:58.896Z" }, - { url = "https://files.pythonhosted.org/packages/86/0a/c8e3d3bba245f0f7fc424937f8ff7ef77291a36af3edb97ccd78aa93d84f/matplotlib-3.10.9-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:82368699727bfb7b0182e1aa13082e3c08e092fa1a25d3e1fd92405bff96f6d4", size = 8264645, upload-time = "2026-04-24T00:13:01.406Z" }, - { url = "https://files.pythonhosted.org/packages/3d/aa/5bf5a14fe4fed73a4209a155606f8096ff797aad89c6c35179026571133e/matplotlib-3.10.9-cp313-cp313t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:3225f4e1edcb8c86c884ddf79ebe20ecd0a67d30188f279897554ccd8fded4dc", size = 8802194, upload-time = "2026-04-24T00:13:03.702Z" }, - { url = "https://files.pythonhosted.org/packages/dd/5e/b4be852d6bba6fd15893fadf91ff26ae49cb91aac789e95dde9d342e664f/matplotlib-3.10.9-cp313-cp313t-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:de2445a0c6690d21b7eb6ce071cebad6d40a2e9bdf10d039074a96ba19797b99", size = 9622684, upload-time = "2026-04-24T00:13:06.647Z" }, - { url = "https://files.pythonhosted.org/packages/4c/3d/ed428c971139112ef730f62770654d609467346d09d4b62617e1afd68a5a/matplotlib-3.10.9-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:b2b9516251cb89ff618d757daec0e2ed1bf21248013844a853d87ef85ab3081d", size = 9680790, upload-time = "2026-04-24T00:13:10.009Z" }, - { url = "https://files.pythonhosted.org/packages/e7/09/052e884aaf2b985c63cb79f715f1d5b6a3eaa7de78f6a52b9dbc077d5b53/matplotlib-3.10.9-cp313-cp313t-win_amd64.whl", hash = "sha256:e9fae004b941b23ff2edcf1567a857ed77bafc8086ffa258190462328434faf8", size = 8287571, upload-time = "2026-04-24T00:13:13.087Z" }, - { url = "https://files.pythonhosted.org/packages/f4/38/ae27288e788c35a4250491422f3db7750366fc8c97d6f36fbdecfc1f5518/matplotlib-3.10.9-cp313-cp313t-win_arm64.whl", hash = "sha256:6b63d9c7c769b88ab81e10dc86e4e0607cf56817b9f9e6cf24b2a5f1693b8e38", size = 8188292, upload-time = "2026-04-24T00:13:15.546Z" }, { url = "https://files.pythonhosted.org/packages/d6/e6/3bd8afd04949f02eabc1c17115ea5255e19cacd4d06fc5abdde4eeb0052c/matplotlib-3.10.9-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:172db52c9e683f5d12eaf57f0f54834190e12581fe1cc2a19595a8f5acb4e77d", size = 8321276, upload-time = "2026-04-24T00:13:18.318Z" }, { url = "https://files.pythonhosted.org/packages/41/86/86231232fff41c9f8e4a1a7d7a597d349a02527109c3af7d618366122139/matplotlib-3.10.9-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:97e35e8d39ccc85859095e01a53847432ba9a53ddf7986f7a54a11b73d0e143f", size = 8218218, upload-time = "2026-04-24T00:13:20.974Z" }, { url = "https://files.pythonhosted.org/packages/85/8f/becc9722cafc64f5d2eb0b7c1bf5f585271c618a45dbd8fabeb021f898b6/matplotlib-3.10.9-cp314-cp314-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:aba1615dabe83188e19d4f75a253c6a08423e04c1425e64039f800050a69de6b", size = 9608145, upload-time = "2026-04-24T00:13:23.228Z" }, @@ -2270,9 +1572,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/67/b2/ef8d6bb59b0edb6c16c968b70f548aa13b54348972def5aa6ac85df67145/matplotlib-3.10.9-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:4e42042d54db34fda4e95a7bd3e5789c2a995d2dad3eb8850232ee534092fbbf", size = 9680884, upload-time = "2026-04-24T00:13:48.066Z" }, { url = "https://files.pythonhosted.org/packages/61/1c/d21bfeb9931881ebe96bcfcff27c7ae4b160ae0ec291a714c42641a56d75/matplotlib-3.10.9-cp314-cp314t-win_amd64.whl", hash = "sha256:c27df8b3848f32a83d1767566595e43cfaa4460380974da06f4279a7ec143c39", size = 8432333, upload-time = "2026-04-24T00:13:51.008Z" }, { url = "https://files.pythonhosted.org/packages/78/23/92493c3e6e1b635ccfff146f7b99e674808787915420373ac399283764c2/matplotlib-3.10.9-cp314-cp314t-win_arm64.whl", hash = "sha256:a49f1eadc84ca85fd72fa4e89e70e61bf86452df6f971af04b12c60761a0772c", size = 8324785, upload-time = "2026-04-24T00:13:53.633Z" }, - { url = "https://files.pythonhosted.org/packages/63/e2/9f66ca6a651a52abfe0d4964ce01439ed34f3f1e119de10ff3a07f403043/matplotlib-3.10.9-pp311-pypy311_pp73-macosx_10_15_x86_64.whl", hash = "sha256:42fb814efabe95c06c1994d8ab5a8385f43a249e23badd3ba931d4308e5bca20", size = 8304420, upload-time = "2026-04-24T00:14:04.57Z" }, - { url = "https://files.pythonhosted.org/packages/e8/e8/467c03568218792906aa87b5e7bb379b605e056ed0c74fe00c051786d925/matplotlib-3.10.9-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:f76e640a5268850bfda54b5131b1b1941cc685e42c5fa98ed9f2d64038308cba", size = 8197981, upload-time = "2026-04-24T00:14:07.233Z" }, - { url = "https://files.pythonhosted.org/packages/6f/87/afead29192170917537934c6aff4b008c805fff7b1ccea0c79120d96beda/matplotlib-3.10.9-pp311-pypy311_pp73-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:3fc0364dfbe1d07f6d15c5ebd0c5bf89e126916e5a8667dd4a7a6e84c36653d4", size = 8774002, upload-time = "2026-04-24T00:14:09.816Z" }, ] [[package]] @@ -2287,15 +1586,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/41/09/5b161152e2d90f7b87f781c2e1267494aef9c32498df793f73ad0a0a494a/matplotlib_inline-0.2.2-py3-none-any.whl", hash = "sha256:3c821cf1c209f59fb2d2d64abbf5b23b67bcb2210d663f9918dd851c6da1fcf6", size = 9534, upload-time = "2026-05-08T17:33:32.055Z" }, ] -[[package]] -name = "mccabe" -version = "0.7.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/e7/ff/0ffefdcac38932a54d2b5eed4e0ba8a408f215002cd178ad1df0f2806ff8/mccabe-0.7.0.tar.gz", hash = "sha256:348e0240c33b60bbdf4e523192ef919f28cb2c3d7d5c7794f74009290f236325", size = 9658, upload-time = "2022-01-24T01:14:51.113Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/27/1a/1f68f9ba0c207934b35b86a8ca3aad8395a3d6dd7921c0686e23853ff5a9/mccabe-0.7.0-py2.py3-none-any.whl", hash = "sha256:6c2d30ab6be0e4a46919781807b4f0d834ebdd6c6e3dca0bda5a15f863427b6e", size = 7350, upload-time = "2022-01-24T01:14:49.62Z" }, -] - [[package]] name = "mimerender-pr36" version = "0.0.2" @@ -2403,11 +1693,11 @@ dependencies = [ [package.dev-dependencies] dev = [ - { name = "flake8" }, + { name = "basedpyright" }, + { name = "pydocstringformatter" }, { name = "pytest" }, - { name = "pytest-flake8" }, - { name = "pytest-pycodestyle" }, { name = "pytest-xdist" }, + { name = "ruff" }, ] [package.metadata] @@ -2460,11 +1750,11 @@ requires-dist = [ [package.metadata.requires-dev] dev = [ - { name = "flake8", specifier = ">=7.3.0" }, + { name = "basedpyright", specifier = ">=1.29.0" }, + { name = "pydocstringformatter", specifier = ">=0.7.0" }, { name = "pytest", specifier = ">=9.0.3" }, - { name = "pytest-flake8", specifier = ">=1.3.0" }, - { name = "pytest-pycodestyle", specifier = ">=2.5.0" }, { name = "pytest-xdist", specifier = ">=3.8.0" }, + { name = "ruff", specifier = ">=0.9.0" }, ] [[package]] @@ -2573,6 +1863,22 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/9e/c9/b2622292ea83fbb4ec318f5b9ab867d0a28ab43c5717bb85b0a5f6b3b0a4/networkx-3.6.1-py3-none-any.whl", hash = "sha256:d47fbf302e7d9cbbb9e2555a0d267983d2aa476bac30e90dfbe5669bd57f3762", size = 2068504, upload-time = "2025-12-08T17:02:38.159Z" }, ] +[[package]] +name = "nodejs-wheel-binaries" +version = "24.16.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/a3/22/2a5beb4e21417c73233d9f65cf6f3e96e891b80d2f550a8f630ebc6b88c6/nodejs_wheel_binaries-24.16.0.tar.gz", hash = "sha256:c973cb69dc5fd16e6f6dc6e579e2c3d5534e2a1f57619dddf5ba070efa7dde37", size = 8056, upload-time = "2026-05-30T16:52:09.807Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/83/d1/68b43b53cd0fa83ae6fd406705023ca988d9e0ca41c724d82e66fbeb2ef6/nodejs_wheel_binaries-24.16.0-py2.py3-none-macosx_13_0_arm64.whl", hash = "sha256:d9f8f677dcf30e37ac244f07869726abe043f01eb0f45722b1df31cc2af7093c", size = 55666374, upload-time = "2026-05-30T16:51:39.588Z" }, + { url = "https://files.pythonhosted.org/packages/e9/b2/40a989159599080da485de966c4c2d207e852ac7aa7864702626d96c8bf5/nodejs_wheel_binaries-24.16.0-py2.py3-none-macosx_13_0_x86_64.whl", hash = "sha256:3d0370fe7120ce9697a4f60d40480d2bd8808d9f30131458d5afc0040d4e5a51", size = 55838487, upload-time = "2026-05-30T16:51:43.383Z" }, + { url = "https://files.pythonhosted.org/packages/d7/a7/cd42174fb5ff6faff7fa8d326a18914d8f232098ab5de055b57c16fa13ca/nodejs_wheel_binaries-24.16.0-py2.py3-none-manylinux_2_28_aarch64.whl", hash = "sha256:85dc92bbb79c851569c5925dcc2a4c915a034efab375f99e4e7e6bbe9cca8342", size = 60179540, upload-time = "2026-05-30T16:51:47.036Z" }, + { url = "https://files.pythonhosted.org/packages/2b/95/c8a1f9ae140aa28df8744d984d01d4b3af7cdd6555af12127f40ceb45a7d/nodejs_wheel_binaries-24.16.0-py2.py3-none-manylinux_2_28_x86_64.whl", hash = "sha256:2f3036292811514ba847b3708492644764f88a833ac425c5f55007014308ddfd", size = 60716262, upload-time = "2026-05-30T16:51:50.711Z" }, + { url = "https://files.pythonhosted.org/packages/64/c9/7c35b3737f59e36d0249c265397b7bff570519b95301d6e16ea361e904ad/nodejs_wheel_binaries-24.16.0-py2.py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:db8a8a76ebd2b28ecbfc9ad464baa3707241b9e050a30e2efdf6f60c0f886502", size = 62230592, upload-time = "2026-05-30T16:51:55Z" }, + { url = "https://files.pythonhosted.org/packages/04/96/d931255cf9d11a84d6b54d882dba7434646467d568ccf070ea3418638df3/nodejs_wheel_binaries-24.16.0-py2.py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:f1a3d8f7b4491cbbd023ba3fc4e901fcca2d9fb80d57f24ba3890de8b1dbac03", size = 62841759, upload-time = "2026-05-30T16:51:59.407Z" }, + { url = "https://files.pythonhosted.org/packages/a2/7b/8b7a3f41bc255411be30b6d7d288aab8ffd9ea2055db8555ced3548007b9/nodejs_wheel_binaries-24.16.0-py2.py3-none-win_amd64.whl", hash = "sha256:bb136be9944f0662dcf1120f45193a6b75b13fac378971a95cc42c9f879a81aa", size = 42027734, upload-time = "2026-05-30T16:52:03.348Z" }, + { url = "https://files.pythonhosted.org/packages/17/66/1ed71f1f529b8ca727d42c7ceb9db0bef145ce4a13dfc86fb50aa44f3be6/nodejs_wheel_binaries-24.16.0-py2.py3-none-win_arm64.whl", hash = "sha256:8308940b5edd0a50dc5267ea36ba21c9f668e83fe0d9f293937174d3a7e31c36", size = 39714528, upload-time = "2026-05-30T16:52:06.421Z" }, +] + [[package]] name = "notebook" version = "6.5.7" @@ -2618,49 +1924,6 @@ version = "2.4.6" source = { registry = "https://pypi.org/simple" } sdist = { url = "https://files.pythonhosted.org/packages/d0/ad/fed0499ce6a338d2a03ebae59cd15093910c8875328855781952abf6c2fe/numpy-2.4.6.tar.gz", hash = "sha256:f3a3570c4a2a16746ac2c31a7c7c7b0c186b95ce902e33db6f28094ed7387dda", size = 20735807, upload-time = "2026-05-18T23:37:14.07Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/b3/49/ec46835a70be8fa6446c495126ac84fdb28cb2558e1620ffb87a10c8b64c/numpy-2.4.6-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:0280e0356c0829a18d9de1cb7eee50ec22ca639878d7240307ca0943d73cd2c4", size = 16969194, upload-time = "2026-05-18T23:33:13.503Z" }, - { url = "https://files.pythonhosted.org/packages/0e/0d/f5957185c0ee2f3e12f78715aa9e3b353fd83633316c8532b38faa37e3f6/numpy-2.4.6-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:110f8b71aacb688ec69062bb7f6938a0f8acb01b7c1c4beb453c65b6d234584d", size = 14964111, upload-time = "2026-05-18T23:33:17.795Z" }, - { url = "https://files.pythonhosted.org/packages/ad/40/40a40ee0ddf7ceb782c49af278894b686e586d65d8c1889c8b5da01a3d7d/numpy-2.4.6-cp311-cp311-macosx_14_0_arm64.whl", hash = "sha256:4cfe66903cc32a9921a6733d96b19bb6abf310397581bbad89c228f5abaf0ee8", size = 5469159, upload-time = "2026-05-18T23:33:20.654Z" }, - { url = "https://files.pythonhosted.org/packages/63/13/f9a8046535cb21deae82f8d03de9617e08882d274fad2539630761888228/numpy-2.4.6-cp311-cp311-macosx_14_0_x86_64.whl", hash = "sha256:8155154c7c691289fe18f510b5d4657c68c67989f293f0535a91360392ff6538", size = 6798936, upload-time = "2026-05-18T23:33:22.987Z" }, - { url = "https://files.pythonhosted.org/packages/33/a8/6fa8c1a345a8c85dbb21932c447bee07c30a2c2a3f31e369c0a84b300147/numpy-2.4.6-cp311-cp311-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:0ab0a9c4ffb1a6d95ef519fe4247dba8eb6b18ad93999f76b7f657039acabd47", size = 15966692, upload-time = "2026-05-18T23:33:26.62Z" }, - { url = "https://files.pythonhosted.org/packages/02/03/74fe2a4cb3817d94d86402f2506554130a2f01414e299b5a843e5a8a957f/numpy-2.4.6-cp311-cp311-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:89cd468399cfd2504718f0ba50e410dca55a170b61a02ad92bb18c8a65186e93", size = 16918164, upload-time = "2026-05-18T23:33:29.955Z" }, - { url = "https://files.pythonhosted.org/packages/c5/80/3615be3313f7e7696609bc194b9f0101da809df79e859bdb84e0cd043f46/numpy-2.4.6-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:c2d37ab77531417474168eb79d6d80b14f821a966818505d03013d0833edb7a8", size = 17322877, upload-time = "2026-05-18T23:33:34.724Z" }, - { url = "https://files.pythonhosted.org/packages/ca/ac/a691e0fe2675e370d0e08ff905adc49a1c8830e8cae03efe4477e92cd55d/numpy-2.4.6-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:f407cb6b8e9d6d8c626bc73c945db1706035af8fd632295547bf1c9e46d092d6", size = 18651487, upload-time = "2026-05-18T23:33:38.217Z" }, - { url = "https://files.pythonhosted.org/packages/15/a7/9bc1cd626d7bf6869bfedf27b91b6ab5dd607758bf8e959d6fa80c6a59cb/numpy-2.4.6-cp311-cp311-win32.whl", hash = "sha256:ddea102b48f9e339f3948bf22040944184627a30fdf7f858667673b9c5f033c8", size = 6233945, upload-time = "2026-05-18T23:33:41.331Z" }, - { url = "https://files.pythonhosted.org/packages/c5/31/7fc6239c12bce7e931463251cca4426c465e1876ba3cc785402ef4dd8f4e/numpy-2.4.6-cp311-cp311-win_amd64.whl", hash = "sha256:1e254a00cdf42b1e4d5b3d68d33af63268d41340d8885df2ab6470f2e1500147", size = 12608406, upload-time = "2026-05-18T23:33:44.131Z" }, - { url = "https://files.pythonhosted.org/packages/27/83/140f85a466595a16382996a1bf06b2b54bcd597488921b0c9daaeeda72af/numpy-2.4.6-cp311-cp311-win_arm64.whl", hash = "sha256:ed9749eef4cbd126da3dc1d6bcb3a57f5eb7ac6a6484146bdbf743f552dfc577", size = 10479528, upload-time = "2026-05-18T23:33:50.725Z" }, - { url = "https://files.pythonhosted.org/packages/95/2a/3d7b5ac8aac24feaf9ad7ed58f45b0bbc06d37e4338ae84c9f2298b570f9/numpy-2.4.6-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:001fbb8e08d942dd57599e781f2472269ee7f2755fae407b4f67b2f0b17da3f1", size = 16689119, upload-time = "2026-05-18T23:33:54.065Z" }, - { url = "https://files.pythonhosted.org/packages/ea/12/92c4c131527599e8288d6918e888d88726f84d805d784b771f32408aeaef/numpy-2.4.6-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:ebfb099f8dcf083deef3ac1ca4c1503f387cf76296fcb3816b66f5ecb5f54fdb", size = 14699246, upload-time = "2026-05-18T23:33:57.621Z" }, - { url = "https://files.pythonhosted.org/packages/ad/fe/c0a6b7b2ca128a8fb228575147073b660656734b8ebe4d76c8fd748dcc79/numpy-2.4.6-cp312-cp312-macosx_14_0_arm64.whl", hash = "sha256:3213d622a0283a39a93d188f3cf72b26862df52fbb4ca3697f51705016523d41", size = 5204410, upload-time = "2026-05-18T23:34:00.302Z" }, - { url = "https://files.pythonhosted.org/packages/f3/d4/9770d14ba719432bb90a421bfd443872ed0f70f7264b64bec12ea363d5fd/numpy-2.4.6-cp312-cp312-macosx_14_0_x86_64.whl", hash = "sha256:357cc07a6d7b0b182ff02249616a03742827ebb1277546b5c7cd7f7620a45698", size = 6551240, upload-time = "2026-05-18T23:34:02.852Z" }, - { url = "https://files.pythonhosted.org/packages/c9/c6/50a46a6205feba2343f1d6d17438107c5dc491ed1c736e6ea68689fd906b/numpy-2.4.6-cp312-cp312-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:5f9fb9157b4ce2971008323afe46053787b526ef624fea915b261468a8421a0f", size = 15671012, upload-time = "2026-05-18T23:34:05.485Z" }, - { url = "https://files.pythonhosted.org/packages/99/60/14115e6364fa676c5397c2ad3004e527e9aa487abf5d0706ec81bbd08529/numpy-2.4.6-cp312-cp312-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:90f9849678c75fe7afa2d348ac842c168b0a4d3d61919687216dfc547976d853", size = 16645538, upload-time = "2026-05-18T23:34:09.265Z" }, - { url = "https://files.pythonhosted.org/packages/ae/c5/693cbe59e57db94d2231fa519ca3978dc9e19da5a8f088588f5c6e947ff2/numpy-2.4.6-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:c1a2af6c6ef86344a6b0db6b97834208bf598db514f2b155042439b62605601a", size = 17020706, upload-time = "2026-05-18T23:34:13.053Z" }, - { url = "https://files.pythonhosted.org/packages/ef/fc/85b7c4eff9b4966ade25c2273cf7e7012e92366c032058653934b37de044/numpy-2.4.6-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:e5805d5a22fd19c8ccff10a9561f9df94436b0545619ea579db2d3c35294bce2", size = 18368541, upload-time = "2026-05-18T23:34:17.024Z" }, - { url = "https://files.pythonhosted.org/packages/f6/81/e1b27545deedce7f4a0b348618c6b62d74e36a4dc9ccd42f3eb2f85eee32/numpy-2.4.6-cp312-cp312-win32.whl", hash = "sha256:e3eeb0aabd6bd5ce64faae67e9935203a6991b4bc2a485a767fbafb2c5125f45", size = 5962825, upload-time = "2026-05-18T23:34:20.3Z" }, - { url = "https://files.pythonhosted.org/packages/ab/ca/feab00bd44aa5fe1ad2c18f08b4d3bb92e26484b0b1d1443897809ed528c/numpy-2.4.6-cp312-cp312-win_amd64.whl", hash = "sha256:d8e8286dd7cea7895157318d1b91cdacac64c479f3cbc8dce548331728484751", size = 12321687, upload-time = "2026-05-18T23:34:23.095Z" }, - { url = "https://files.pythonhosted.org/packages/63/cf/5a6d34850a39d1093558564f77ee8e8e0bee5061151b8f05a55711001ec7/numpy-2.4.6-cp312-cp312-win_arm64.whl", hash = "sha256:4081eb135ac24158bd51cdfbef16f1c64df7063b1143f24731387137c092bec8", size = 10221482, upload-time = "2026-05-18T23:34:25.876Z" }, - { url = "https://files.pythonhosted.org/packages/fb/82/bdab26d7438c6791ca31b7c024ca37c1eab8b726ba236129005cd4a06e45/numpy-2.4.6-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:511dbaf848decaaaf4b4ca48032619fb3138710c4bf7da7617765edad1ef96b0", size = 16684648, upload-time = "2026-05-18T23:34:29.41Z" }, - { url = "https://files.pythonhosted.org/packages/1b/30/a80189bcc7f5e4258b3fbc3968d909d1756f54d023299ecc39ad6fdb9ef8/numpy-2.4.6-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:bf162abab1c1a736333192707cef898e735a5ca00f38f27eeedf44b39d9e85eb", size = 14693902, upload-time = "2026-05-18T23:34:33.013Z" }, - { url = "https://files.pythonhosted.org/packages/97/12/70b5d0d7c15e1ebb8a6a84a8caa1d19e181d84fb58bb6d70aca29099dec1/numpy-2.4.6-cp313-cp313-macosx_14_0_arm64.whl", hash = "sha256:043191bfa8eab18c776647b62723ac9dddece59743b13f49b2016094129c2b3f", size = 5198992, upload-time = "2026-05-18T23:34:36.132Z" }, - { url = "https://files.pythonhosted.org/packages/ba/8c/ebd2a8f8a83541f8d38cc5667e8c2b69cecfd30da6e45693e8158857d44b/numpy-2.4.6-cp313-cp313-macosx_14_0_x86_64.whl", hash = "sha256:6180d8b35af935aed8ece3a85e0a43f87393ae0ac87c8d2c8bd2c993f7270ef3", size = 6546944, upload-time = "2026-05-18T23:34:38.484Z" }, - { url = "https://files.pythonhosted.org/packages/bb/c5/7b863a97a91671a0338f4253bd3b5a3d3852f0692dae91711c9f4a10e787/numpy-2.4.6-cp313-cp313-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:72fbe16c6fac95aedf5937fa873445cec2110be35d8a4e9433d7501fd98dae6b", size = 15669392, upload-time = "2026-05-18T23:34:41.257Z" }, - { url = "https://files.pythonhosted.org/packages/a5/9d/3584b9984ca4c047aea75214ce1a4c4c73d849bd71b604264b7f5653f8a8/numpy-2.4.6-cp313-cp313-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:a7830bab239b79cda9c08c2da014761cafb48da6150e1da17ac06283f43b6089", size = 16633220, upload-time = "2026-05-18T23:34:45.075Z" }, - { url = "https://files.pythonhosted.org/packages/05/ae/7c67fba23bd98caec7c99261f3a16072ade14813486b0282cb29846de832/numpy-2.4.6-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:ef4aea96ce4d3b074422cb4f2f64e216bf9e213004bb58ecfdf50ea02ea8eb9a", size = 17020800, upload-time = "2026-05-18T23:34:49.065Z" }, - { url = "https://files.pythonhosted.org/packages/d9/5d/3b6725cb31d983c5e66916f5d36f6d7e5521129e4c4404d64f918292a5b6/numpy-2.4.6-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:dfa20cc6ca228e6b155b11da03825975ce66aea520985dbbddf0f2a5a495c605", size = 18357600, upload-time = "2026-05-18T23:34:52.709Z" }, - { url = "https://files.pythonhosted.org/packages/f7/da/2ccc6c2fe8898dee01d90c75c5f5f914a23daf99e3e0f59516a08760c8b5/numpy-2.4.6-cp313-cp313-win32.whl", hash = "sha256:56b39e5e0622a09a25bf5baf62f4bcf0cb8a41ae6e2819cf49bbc5a74c083f91", size = 5961134, upload-time = "2026-05-18T23:34:55.618Z" }, - { url = "https://files.pythonhosted.org/packages/b5/cd/9cc4dc876fb065d5c220aae4d5e14826b2715331bb7618ce1fb07a679d99/numpy-2.4.6-cp313-cp313-win_amd64.whl", hash = "sha256:c4fc99836233ea196540b17ab0983aff60ed07941751930f5f4d05bc3b3b7359", size = 12318598, upload-time = "2026-05-18T23:34:58.928Z" }, - { url = "https://files.pythonhosted.org/packages/39/1e/c0bcba1f8694116485fe28fd1be698c278fcda4141c5b0e53a2aed8b12a8/numpy-2.4.6-cp313-cp313-win_arm64.whl", hash = "sha256:a7c711e21628b52034bb5ab8d1bce291f752fcc5e92accc615778acee1ff4778", size = 10222272, upload-time = "2026-05-18T23:35:02.167Z" }, - { url = "https://files.pythonhosted.org/packages/63/6d/cc5619247c8f4204e507f5883528372e4ac4bb189e579fb859a12e480b1f/numpy-2.4.6-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:112b06a867b235ef466ed3508ddf0238050df9c727cafb5301ac385b899189a1", size = 14821197, upload-time = "2026-05-18T23:35:05.468Z" }, - { url = "https://files.pythonhosted.org/packages/00/58/f1c39161c87d9e9bed660f1ed4bafc0e403d5ec9650b6dd77aead07d489b/numpy-2.4.6-cp313-cp313t-macosx_14_0_arm64.whl", hash = "sha256:eaf7fa2de5c0be8ae6ff8e9bea2ccd725e980541244521d8d4b5f3354a27babe", size = 5326287, upload-time = "2026-05-18T23:35:08.693Z" }, - { url = "https://files.pythonhosted.org/packages/af/57/3917ab0fd97f271a8694513581b8a36c655f111c446852c302f04ccdb6fc/numpy-2.4.6-cp313-cp313t-macosx_14_0_x86_64.whl", hash = "sha256:7265a2f3d436e54ef9f2b52b5c937e6be778781bd97a590319d7348f1c1ca997", size = 6646763, upload-time = "2026-05-18T23:35:11.459Z" }, - { url = "https://files.pythonhosted.org/packages/eb/0f/037e64c494b67581ae18193d770adef354c41f3f2c8ebf865602d949bf8f/numpy-2.4.6-cp313-cp313t-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:f74a575920ab21fe304421a3fc28793d82e299cae9eccb37084e9fc7f3617c20", size = 15728070, upload-time = "2026-05-18T23:35:14.79Z" }, - { url = "https://files.pythonhosted.org/packages/21/a6/5d2bae9c9542eb4df16dc9c46dc79c186e9bad53805dfa5399a6023c6db0/numpy-2.4.6-cp313-cp313t-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:ede83e07a75dd06bc501566c1eca2afc0d61677c1472ac9ad93fdee6e638a48d", size = 16681752, upload-time = "2026-05-18T23:35:18.836Z" }, - { url = "https://files.pythonhosted.org/packages/92/14/23d1dfb410ae362cd59ce53e936b1513d545eb40db3949ced632e19a459e/numpy-2.4.6-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:68bb27509ac1b9a3443094260f6326150663b06abe40b73a2f81160623da5b67", size = 17086024, upload-time = "2026-05-18T23:35:22.52Z" }, - { url = "https://files.pythonhosted.org/packages/4b/6e/23595a2c642cdf3bc567877064bdd7f91c8b0038a4453cf2daf7248eafe9/numpy-2.4.6-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:a0df0043bdb289bde1f62da130d20df23d58b45429f752bc7a8fc5325a225ecd", size = 18403398, upload-time = "2026-05-18T23:35:26.398Z" }, - { url = "https://files.pythonhosted.org/packages/8a/90/0ac3bc947217e66dec77e7cbc6a1979d1af70b6461b82f620d3bccd5e4c8/numpy-2.4.6-cp313-cp313t-win32.whl", hash = "sha256:29a287e0cf63ff528da061de6b9f64a4618da591ca1046aafc54062e40ca7eab", size = 6084971, upload-time = "2026-05-18T23:35:29.387Z" }, - { url = "https://files.pythonhosted.org/packages/77/71/5673e351671a1d2bd6063b91b44f70c0affea7d1516fa7a6572941ba4aa1/numpy-2.4.6-cp313-cp313t-win_amd64.whl", hash = "sha256:25c692919ac5a01f170a3bfcd62d745b24fd095c353d50812637d6fcab442e75", size = 12458532, upload-time = "2026-05-18T23:35:32.175Z" }, - { url = "https://files.pythonhosted.org/packages/3f/88/19d3503c5046e688f049274b27a3ef3d771152fa80d3ba3d01a3dff61abe/numpy-2.4.6-cp313-cp313t-win_arm64.whl", hash = "sha256:1e978ec1e8bd0e0e4de6bb75de9d30cbb74db6b6a2bb727618613703ca0167dd", size = 10291881, upload-time = "2026-05-18T23:35:35.465Z" }, { url = "https://files.pythonhosted.org/packages/f8/91/3ab2044d05fd16d343c5ac2e69b127f1b2854040dd20b193257c78028bd3/numpy-2.4.6-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:06ca2f61ec4385a07a6977c55ba998a4466c123642b4a32694d3128fce18c079", size = 16683458, upload-time = "2026-05-18T23:35:38.353Z" }, { url = "https://files.pythonhosted.org/packages/8e/62/764ce66fa4147ae6d73071a3abf804ffe606f174618697c571acdf26a7c9/numpy-2.4.6-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:38efbc8de75c7a0fc1ac190162d892787f3f47b57cc291231aafee36b80982b7", size = 14704559, upload-time = "2026-05-18T23:35:42.14Z" }, { url = "https://files.pythonhosted.org/packages/60/61/23f27c172f022e04025b7dc2367f4d63c1a398120607ec896228649a6f48/numpy-2.4.6-cp314-cp314-macosx_14_0_arm64.whl", hash = "sha256:d581b735e177fdcdce6fed8e7e8880a3fb6ee4e3653a3ac6af01c6f4c03effc5", size = 5209716, upload-time = "2026-05-18T23:35:45.377Z" }, @@ -2682,13 +1945,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/9c/50/0753655aa844c99cd9e018aacf76f130f1bd81d881bb74bc0aef5d73a8ba/numpy-2.4.6-cp314-cp314t-win32.whl", hash = "sha256:260a5d70215b61ab4fadf5c7baacd64821842975eea312125ed3c39a6391b063", size = 6156982, upload-time = "2026-05-18T23:36:40.817Z" }, { url = "https://files.pythonhosted.org/packages/b2/d4/7c67becf668f973cb490cec3e98dfd799d866f9c989a54d355672cfa0db6/numpy-2.4.6-cp314-cp314t-win_amd64.whl", hash = "sha256:81a1cca95ed5bb92aa8b10dd2cdc9a0d3853a50fad926c28b5d7e8ea54389627", size = 12638908, upload-time = "2026-05-18T23:36:43.996Z" }, { url = "https://files.pythonhosted.org/packages/43/bb/e1c71a4295b1b1d1393d50dbb4f2a36283c6859d9d3892e84f00ec5a91d5/numpy-2.4.6-cp314-cp314t-win_arm64.whl", hash = "sha256:0c9136e14ed34a9e343a31c533d78a9813a69a3148332bce5e9821cb2f996e66", size = 10565867, upload-time = "2026-05-18T23:36:47.114Z" }, - { url = "https://files.pythonhosted.org/packages/de/12/b422cc84439adc0d00de605bf4a308890ae5c26f2c71fbd73e5d08fbb0dd/numpy-2.4.6-pp311-pypy311_pp73-macosx_10_15_x86_64.whl", hash = "sha256:55cced7c52e981362f708ad635198e97a752dfba412cc03c23bbf3bd8d5cd662", size = 16847511, upload-time = "2026-05-18T23:36:50.673Z" }, - { url = "https://files.pythonhosted.org/packages/44/53/f481bef68011740f8849418d82db07230e825013f31f4eef5ba5b805316a/numpy-2.4.6-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:d6da64deb6b8ed903e7560180a92f2d804ee1ba5eeb849ac2748b8c1aba1f6d7", size = 14889064, upload-time = "2026-05-18T23:36:53.879Z" }, - { url = "https://files.pythonhosted.org/packages/7f/57/42ed575c10ced8af951d426bc4e1f8aff16fd851db33f067036215a7f860/numpy-2.4.6-pp311-pypy311_pp73-macosx_14_0_arm64.whl", hash = "sha256:68a5124b13fa6cc2086764a20005d30bc0548146f7f5322f02fce212ca14317f", size = 5394157, upload-time = "2026-05-18T23:36:57.194Z" }, - { url = "https://files.pythonhosted.org/packages/6a/ef/f66cc724fcc36c1e364c67f51ae9146090b8b584f27d58b97fdae3edd737/numpy-2.4.6-pp311-pypy311_pp73-macosx_14_0_x86_64.whl", hash = "sha256:948424b06129ce883307e8cff868c31396d8dc7630a59c61d70d98dbe70f222c", size = 6708728, upload-time = "2026-05-18T23:36:59.575Z" }, - { url = "https://files.pythonhosted.org/packages/1a/9c/c531f2293b91265d8b48e9b329f54fdd7ffae73cb4134ea10cca4237e9cc/numpy-2.4.6-pp311-pypy311_pp73-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:5dbbdb29840ca3d91ee0fece42fc29278886d908280bfec0a5846c6f901a3eb0", size = 15798374, upload-time = "2026-05-18T23:37:02.674Z" }, - { url = "https://files.pythonhosted.org/packages/1a/b0/413077f6b1153ed3cba361401c6783bbad6114804a000cc22eb71c13e190/numpy-2.4.6-pp311-pypy311_pp73-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:8ad03c0965fb3c692200e74d458ca28c1dbb4ce96f9a479a8aa041ad5fabca02", size = 16747286, upload-time = "2026-05-18T23:37:06.327Z" }, - { url = "https://files.pythonhosted.org/packages/15/ce/e5ec180bc41812edcd8daeb8639d205622c0e8c02259d8ab25a0201b3c2a/numpy-2.4.6-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:2803abfebfc990042cd494d8ce2d5f82e9d847af6d35ec486923aa19dbad5e73", size = 12504263, upload-time = "2026-05-18T23:37:09.715Z" }, ] [[package]] @@ -2848,51 +2104,6 @@ version = "3.11.9" source = { registry = "https://pypi.org/simple" } sdist = { url = "https://files.pythonhosted.org/packages/7e/0c/964746fcafbd16f8ff53219ad9f6b412b34f345c75f384ad434ceaadb538/orjson-3.11.9.tar.gz", hash = "sha256:4fef17e1f8722c11587a6ef18e35902450221da0028e65dbaaa543619e68e48f", size = 5599163, upload-time = "2026-05-06T15:11:08.309Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/1e/51/3fb9e65ae76ee97bd611869a503fa3fc0a6e81dd8b737cf3003f682df7ff/orjson-3.11.9-cp311-cp311-macosx_10_15_x86_64.macosx_11_0_arm64.macosx_10_15_universal2.whl", hash = "sha256:f01c4818b3fc9b0da8e096722a84318071eaa118df35f6ed2344da0e73a5444f", size = 228522, upload-time = "2026-05-06T15:09:35.362Z" }, - { url = "https://files.pythonhosted.org/packages/16/fa/9d54b07cb3f3b0bfd57841478e42d7a0ece4a9f49f9907eecf5a45461687/orjson-3.11.9-cp311-cp311-macosx_15_0_arm64.whl", hash = "sha256:3ebca4179031ee716ed076ffadc29428e900512f6fccee8614c9983157fcf19c", size = 128463, upload-time = "2026-05-06T15:09:37.063Z" }, - { url = "https://files.pythonhosted.org/packages/88/b1/6ceafc2eefd0a553e3be77ce6c49d107e772485d9568629376171c50e634/orjson-3.11.9-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:48ee05097750de0ff69ed5b7bbcf0732182fd57a24043dcc2a1da780a5ead3a5", size = 132306, upload-time = "2026-05-06T15:09:38.299Z" }, - { url = "https://files.pythonhosted.org/packages/ea/76/f11311285324a40aab1e3031385c50b635a7cd0734fdaf60c7e89a696f60/orjson-3.11.9-cp311-cp311-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:a6082706765a95a6680d812e1daf1c0cfe8adec7831b3ff3b625693f3b461b1c", size = 127988, upload-time = "2026-05-06T15:09:39.597Z" }, - { url = "https://files.pythonhosted.org/packages/9e/85/0ef63bcf1337f44031ce9b91b1919563f62a37527b3ea4368bb15a22e5d7/orjson-3.11.9-cp311-cp311-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:277fefe9d76ee17eb14debf399e3533d4d63b5f677a4d3719eb763536af1f4bd", size = 135188, upload-time = "2026-05-06T15:09:40.957Z" }, - { url = "https://files.pythonhosted.org/packages/05/94/b0d27090ea8a2095db3c2bd1b1c96f96f19bbb494d7fef33130e846e613d/orjson-3.11.9-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:03db380e3780fa0015ed776a90f20e8e20bb11dde13b216ce19e5718e3dfba62", size = 145937, upload-time = "2026-05-06T15:09:42.249Z" }, - { url = "https://files.pythonhosted.org/packages/09/eb/75d50c29c05b8054013e221e598820a365c8e64065312e75e202ed880709/orjson-3.11.9-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:33d7d766701847dc6729846362dc27895d2f2d2251264f9d10e7cb9878194877", size = 132758, upload-time = "2026-05-06T15:09:43.945Z" }, - { url = "https://files.pythonhosted.org/packages/49/bd/360686f39348aa88827cb6fbf7dc606fd41c831a35235e1abf1db8e3a9e6/orjson-3.11.9-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:147302878da387104b66bb4a8b0227d1d487e976ce41a8501916161072ed87b1", size = 133971, upload-time = "2026-05-06T15:09:45.239Z" }, - { url = "https://files.pythonhosted.org/packages/0e/30/3178eb16f3221aeef068b6f1f1ebe05f656ea5c6dffe9f6c917329fe17a3/orjson-3.11.9-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:3513550321f8c8c811a7c3297b8a630e82dc08e4c10216d07703c997776236cd", size = 141685, upload-time = "2026-05-06T15:09:46.858Z" }, - { url = "https://files.pythonhosted.org/packages/5f/f1/ff2f19ed0225f9680fafa42febca3570dd59444ebf190980738d376214c2/orjson-3.11.9-cp311-cp311-musllinux_1_2_armv7l.whl", hash = "sha256:c5d001196b89fa9cf0a4ab79766cd835b991a166e4b621ba95089edc50c429ff", size = 415167, upload-time = "2026-05-06T15:09:48.312Z" }, - { url = "https://files.pythonhosted.org/packages/9b/61/863bddf0da6e9e586765414debd54b4e58db05f560902b6d00658cb88636/orjson-3.11.9-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:16969c9d369c98eb084889c6e4d2d39b77c7eb38ceccf8da2a9fff62ae908980", size = 147913, upload-time = "2026-05-06T15:09:49.733Z" }, - { url = "https://files.pythonhosted.org/packages/b6/8a/4081492586d75b073d60c5271a8d0f05a0955cabf1e34c8473f6fcd84235/orjson-3.11.9-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:63e0efbc991250c0b3143488fa57d95affcabbfc63c99c48d625dd37779aafe2", size = 136959, upload-time = "2026-05-06T15:09:51.311Z" }, - { url = "https://files.pythonhosted.org/packages/0d/bd/70b6ab193594d7abb875320c0a7c8335e846f28968c432c31042409c3c8d/orjson-3.11.9-cp311-cp311-win32.whl", hash = "sha256:14ed654580c1ed2bc217352ec82f91b047aef82951aa71c7f64e0dcb03c0e180", size = 131533, upload-time = "2026-05-06T15:09:52.637Z" }, - { url = "https://files.pythonhosted.org/packages/3f/17/1a1a228183d62d1b77e2c30d210f47dd4768b310ebe1607c63e3c0e3a71e/orjson-3.11.9-cp311-cp311-win_amd64.whl", hash = "sha256:57ea77fb70a448ce87d18fca050193202a3da5e54598f6501ca5476fb66cfe02", size = 127106, upload-time = "2026-05-06T15:09:54.204Z" }, - { url = "https://files.pythonhosted.org/packages/b8/95/285de5fa296d09681ee9c546cd4a8aeb773b701cf343dc125994f4d52953/orjson-3.11.9-cp311-cp311-win_arm64.whl", hash = "sha256:19b72ed11572a2ee51a67a903afbe5af504f84ed6f529c0fe44b0ab3fb5cc697", size = 126848, upload-time = "2026-05-06T15:09:55.551Z" }, - { url = "https://files.pythonhosted.org/packages/16/6d/11867a3ffa3a3608d84a4de51ef4dd0896d6b5cc9132fbe1daf593e677bc/orjson-3.11.9-cp312-cp312-macosx_10_15_x86_64.macosx_11_0_arm64.macosx_10_15_universal2.whl", hash = "sha256:9ef6fe90aadef185c7b128859f40beb24720b4ecea95379fc9000931179c3a49", size = 228515, upload-time = "2026-05-06T15:09:57.265Z" }, - { url = "https://files.pythonhosted.org/packages/24/75/05912954c8b288f34fcf5cd4b9b071cb4f6e77b9961e175e56ebb258089f/orjson-3.11.9-cp312-cp312-macosx_15_0_arm64.whl", hash = "sha256:e5c9b8f28e726e97d97696c826bc7bea5d71cecd63576dba92924a32c1961291", size = 128409, upload-time = "2026-05-06T15:09:59.063Z" }, - { url = "https://files.pythonhosted.org/packages/ab/86/1c3a47df3bc8191ea9ac51603bbb872a95167a364320c269f2557911f406/orjson-3.11.9-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:26a473dbb4162108b27901492546f83c76fdcea3d0eadff00ae7a07e18dcce09", size = 132106, upload-time = "2026-05-06T15:10:00.798Z" }, - { url = "https://files.pythonhosted.org/packages/d7/cf/b33b5f3e695ae7d63feef9d915c37cc3b8f465493dcd4f8e0b4c697a2366/orjson-3.11.9-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:011382e2a60fda9d46f1cdee31068cfc52ffe952b587d683ec0463002802a0f4", size = 127864, upload-time = "2026-05-06T15:10:02.15Z" }, - { url = "https://files.pythonhosted.org/packages/31/6a/6cf69385a58208024fcb8c014e2141b8ce838aba6492b589f8acfff97fab/orjson-3.11.9-cp312-cp312-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c2d3dc759490128c5c1711a53eeaa8ee1d437fd0038ffd2b6008abf46db3f882", size = 135213, upload-time = "2026-05-06T15:10:03.515Z" }, - { url = "https://files.pythonhosted.org/packages/e8/f8/0b1bd3e8f2efcdd376af5c8cfd79eaf13f018080c0089c80ebd724e3c7fb/orjson-3.11.9-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:d8ea516b3726d190e1b4297e6f4e7a8650347ae053868a18163b4dd3641d1fff", size = 145994, upload-time = "2026-05-06T15:10:05.083Z" }, - { url = "https://files.pythonhosted.org/packages/f3/59/dab79f61044c529d2c81aecdc589b1f833a1c8dec11ba3b1c2498a02ca7e/orjson-3.11.9-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:380cdce7ba24989af81d0a7013d0aaec5d0e2a21734c0e2681b1bc4f141957fe", size = 132744, upload-time = "2026-05-06T15:10:06.853Z" }, - { url = "https://files.pythonhosted.org/packages/0e/a4/82b7a2fe5d8a67a59ed831b24d59a3d46ea7d207b66e1602d376541d94a6/orjson-3.11.9-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:be4fa4f0af7fa18951f7ab3fc2148e223af211bf03f59e1c6034ec3f97f21d61", size = 134014, upload-time = "2026-05-06T15:10:08.213Z" }, - { url = "https://files.pythonhosted.org/packages/50/c7/375e83a76851b73b2e39f3bcf0e5a19e2b89bad13e5bca97d0b293d27f24/orjson-3.11.9-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:a8f5f8bc7ce7d59f08d9f99fa510c06496164a24cb5f3d34537dbd9ca30132e2", size = 141509, upload-time = "2026-05-06T15:10:09.595Z" }, - { url = "https://files.pythonhosted.org/packages/7f/7c/49d5d82a3d3097f641f094f552131f1e2723b0b8cb0fa2874ab65ecfffa6/orjson-3.11.9-cp312-cp312-musllinux_1_2_armv7l.whl", hash = "sha256:4d7fde5501b944f83b3e665e1b31343ff6e154b15560a16b7130ea1e594a4206", size = 415127, upload-time = "2026-05-06T15:10:11.049Z" }, - { url = "https://files.pythonhosted.org/packages/3a/dc/7446c538590d55f455647e5f3c61fc33f7108714e7afcffa6a2a033f8350/orjson-3.11.9-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:cde1a448023ba7d5bb4c01c5afb48894380b5e4956e0627266526587ef4e535f", size = 148025, upload-time = "2026-05-06T15:10:12.842Z" }, - { url = "https://files.pythonhosted.org/packages/df/e5/4d2d8af06f788329b4f78f8cc3679bb395392fcaa1e4d8d3c33e85308fa4/orjson-3.11.9-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:71e63adb0e1f1ed5d9e168f50a91ceb93ae6420731d222dc7da5c69409aa47aa", size = 136943, upload-time = "2026-05-06T15:10:14.405Z" }, - { url = "https://files.pythonhosted.org/packages/06/69/850264ccf6d80f6b174620d30a87f65c9b1490aba33fe6b62798e618cad3/orjson-3.11.9-cp312-cp312-win32.whl", hash = "sha256:2d057a602cdd19a0ad680417527c45b6961a095081c0f46fe0e03e304aac6470", size = 131606, upload-time = "2026-05-06T15:10:15.791Z" }, - { url = "https://files.pythonhosted.org/packages/b9/d5/973a43fc9c55e20f2051e9830997649f669be0cb3ca52192087c0143f118/orjson-3.11.9-cp312-cp312-win_amd64.whl", hash = "sha256:59e403b1cc5a676da8eaf31f6254801b7341b3e29efa85f92b48d272637e77be", size = 127101, upload-time = "2026-05-06T15:10:17.129Z" }, - { url = "https://files.pythonhosted.org/packages/fe/ae/495470f0e4a18f73fa10b7f6b84b464ec4cc5291c4e0c7c2a6c400bef006/orjson-3.11.9-cp312-cp312-win_arm64.whl", hash = "sha256:9af678d6488357948f1f84c6cd1c1d397c014e1ae2f98ae082a44eb48f602624", size = 126736, upload-time = "2026-05-06T15:10:18.645Z" }, - { url = "https://files.pythonhosted.org/packages/32/33/93fcc25907235c344ae73122f8a4e01d2d393ef062b4af7d2e2487a32c37/orjson-3.11.9-cp313-cp313-macosx_10_15_x86_64.macosx_11_0_arm64.macosx_10_15_universal2.whl", hash = "sha256:4bab1b2d6141fe7b32ae71dac905666ece4f94936efbfb13d55bb7739a3a6021", size = 228458, upload-time = "2026-05-06T15:10:20.079Z" }, - { url = "https://files.pythonhosted.org/packages/8f/27/b1e6dadb3c080313c03fdd8067b85e6a0460c7d8d6a1c3984ef77b904e4d/orjson-3.11.9-cp313-cp313-macosx_15_0_arm64.whl", hash = "sha256:844417969855fc7a41be124aafe83dc424592a7f77cd4501900c67307122b92c", size = 128368, upload-time = "2026-05-06T15:10:21.549Z" }, - { url = "https://files.pythonhosted.org/packages/21/0f/c9ede0bf052f6b4051e64a7d4fa91b725cccf8321a6a786e86eb03519f00/orjson-3.11.9-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ffe02797b5e9f3a9d8292ddcd289b474ad13e81ad83cd1891a240811f1d2cb81", size = 132070, upload-time = "2026-05-06T15:10:23.371Z" }, - { url = "https://files.pythonhosted.org/packages/fd/26/d398e28048dc18205bbe812f2c88cb9b40313db2470778e25964796458fe/orjson-3.11.9-cp313-cp313-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:0e4eed3b200023042814d2fc8a5d2e880f13b52e1ed2485e83da4f3962f7dc1a", size = 127892, upload-time = "2026-05-06T15:10:24.714Z" }, - { url = "https://files.pythonhosted.org/packages/66/60/52b0054c4c700d5aa7fc5b7ca96917400d8f061307778578e67a10e25852/orjson-3.11.9-cp313-cp313-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:8aff7da9952a5ad1cef8e68017724d96c7b9a66e99e91d6252e1b133d67a7b10", size = 135217, upload-time = "2026-05-06T15:10:26.084Z" }, - { url = "https://files.pythonhosted.org/packages/d5/97/1e3dc2b2a28b7b2528f403d2fc1d79ec5f39af3bc143ab65d3ec26426385/orjson-3.11.9-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:4d4e98d6f3b8afed8bc8cd9718ec0cdf46661826beefb53fe8eafb37f2bf0362", size = 145980, upload-time = "2026-05-06T15:10:28.062Z" }, - { url = "https://files.pythonhosted.org/packages/fc/39/31fbfe7850f2de32dee7e7e5c09f26d403ab01e440ac96001c6b01ad3c99/orjson-3.11.9-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:3a81d52442a7c99b3662333235b3adf96a1715864658b35bb797212be7bddb97", size = 132738, upload-time = "2026-05-06T15:10:29.727Z" }, - { url = "https://files.pythonhosted.org/packages/a1/08/dca0082dd2a194acb93e5457e73455388e2e2ca464a2672449a9ddbb679d/orjson-3.11.9-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4e39364e726a8fff737309aff059ff67d8a8c8d5b677be7bb49a8b3e84b7e218", size = 134033, upload-time = "2026-05-06T15:10:31.152Z" }, - { url = "https://files.pythonhosted.org/packages/11/d4/5bdb0626801230139987385554c5d4c42255218ac906525bf4347f22cd95/orjson-3.11.9-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:4fd66214623f1b17501df9f0543bef0b833979ab5b6ded1e1d123222866aa8c9", size = 141492, upload-time = "2026-05-06T15:10:32.641Z" }, - { url = "https://files.pythonhosted.org/packages/fa/88/a21fb53b3ede6703aede6dce4710ed4111e5b201cfa6bbff5e544f9d47d7/orjson-3.11.9-cp313-cp313-musllinux_1_2_armv7l.whl", hash = "sha256:8ecc30f10465fa1e0ce13fd01d9e22c316e5053a719a8d915d4545a09a5ff677", size = 415087, upload-time = "2026-05-06T15:10:34.438Z" }, - { url = "https://files.pythonhosted.org/packages/3d/57/1b30daf70f0d8180e9a73cefbfbdd99e4bf19eb020466502b01fba7e0e50/orjson-3.11.9-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:97db4c94a7db398a5bd636273324f0b3fd58b350bbbac8bb380ceb825a9b40f4", size = 148031, upload-time = "2026-05-06T15:10:36.358Z" }, - { url = "https://files.pythonhosted.org/packages/04/83/45fbb6d962e260807f99441db9613cee868ceda4baceda59b3720a563f97/orjson-3.11.9-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:9f78cf8fec5bd627f4082b8dfeac7871b43d7f3274904492a43dab39f18a19a0", size = 136915, upload-time = "2026-05-06T15:10:38.013Z" }, - { url = "https://files.pythonhosted.org/packages/5f/cc/2d10025f9056d376e4127ec05a5808b218d46f035fdc08178a5411b34250/orjson-3.11.9-cp313-cp313-win32.whl", hash = "sha256:d4087e5c0209a0a8efe4de3303c234b9c44d1174161dcd851e8eea07c7560b32", size = 131613, upload-time = "2026-05-06T15:10:39.569Z" }, - { url = "https://files.pythonhosted.org/packages/67/bd/2775ff28bfe883b9aa1ff348300542eb2ef1ee18d8ae0e3a49846817a865/orjson-3.11.9-cp313-cp313-win_amd64.whl", hash = "sha256:051b102c93b4f634e89f3866b07b9a9a98915ada541f4ec30f177067b2694979", size = 127086, upload-time = "2026-05-06T15:10:41.262Z" }, - { url = "https://files.pythonhosted.org/packages/91/2b/d26799e580939e32a7da9a39531bc9e58e15ca32ffaa6a8cb3e9bb0d22cd/orjson-3.11.9-cp313-cp313-win_arm64.whl", hash = "sha256:cce9127885941bd28f080cecf1f1d288336b7e0d812c345b08be88b572796254", size = 126696, upload-time = "2026-05-06T15:10:42.651Z" }, { url = "https://files.pythonhosted.org/packages/8e/eb/5da01e356015aee6ecfa1187ced87aef51364e306f5e695dd52719bf0e78/orjson-3.11.9-cp314-cp314-macosx_10_15_x86_64.macosx_11_0_arm64.macosx_10_15_universal2.whl", hash = "sha256:b6ef1979adc4bc243523f1a2ba91418030a8e29b0a99cbe7e0e2d6807d4dce6e", size = 228465, upload-time = "2026-05-06T15:10:44.097Z" }, { url = "https://files.pythonhosted.org/packages/64/62/3e0e0c14c957133bcd855395c62b55ed4e3b0af23ffea11b032cb1dcbdb1/orjson-3.11.9-cp314-cp314-macosx_15_0_arm64.whl", hash = "sha256:f36b7f32c7c0db4a719f1fc5824db4a9c6f8bd1a354debb91faf26ebf3a4c71e", size = 128364, upload-time = "2026-05-06T15:10:45.839Z" }, { url = "https://files.pythonhosted.org/packages/5a/5a/07d8aa117211a8ed7630bda80c8c0b14d04e0f8dcf99bcf49656e4a710eb/orjson-3.11.9-cp314-cp314-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:08f4d8ebb44925c794e535b2bebc507cebf32209df81de22ae285fb0d8d66de0", size = 132063, upload-time = "2026-05-06T15:10:47.267Z" }, @@ -2910,15 +2121,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/16/21/5a3f1e8913103b703a436a5664238e5b965ec392b555fe68943ea3691e6b/orjson-3.11.9-cp314-cp314-win_arm64.whl", hash = "sha256:eebdbdeef0094e4f5aefa20dcd4eb2368ab5e7a3b4edea27f1e7b2892e009cf9", size = 126687, upload-time = "2026-05-06T15:11:06.602Z" }, ] -[[package]] -name = "overrides" -version = "7.7.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/36/86/b585f53236dec60aba864e050778b25045f857e17f6e5ea0ae95fe80edd2/overrides-7.7.0.tar.gz", hash = "sha256:55158fa3d93b98cc75299b1e67078ad9003ca27945c76162c1c0766d6f91820a", size = 22812, upload-time = "2024-01-27T21:01:33.423Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/2c/ab/fc8290c6a4c722e5514d80f62b2dc4c4df1a68a41d1364e625c35990fcf3/overrides-7.7.0-py3-none-any.whl", hash = "sha256:c7ed9d062f78b8e4c1a7b70bd8796b35ead4d9f510227ef9c5dc7626c60d7e49", size = 17832, upload-time = "2024-01-27T21:01:31.393Z" }, -] - [[package]] name = "packaging" version = "26.2" @@ -2948,37 +2150,6 @@ dependencies = [ ] sdist = { url = "https://files.pythonhosted.org/packages/f8/87/4341c6252d1c47b08768c3d25ac487362bf403f0313ddae4a2a26c9b1b4c/pandas-3.0.3.tar.gz", hash = "sha256:696a4a00a2a2a35d4e5deb3fc946641b96c944f02230e4f76137fe35d806c4fc", size = 4651414, upload-time = "2026-05-11T18:54:29.21Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/42/16/b5c76b838fd9bf6ce84d3a53346b8874ec05c5f0040d75ef2c320100cd2a/pandas-3.0.3-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:455f6f8139d4282188f526868dbc3c828470e88a3d9d59a891bd46a455f21b98", size = 10338495, upload-time = "2026-05-11T18:52:11.558Z" }, - { url = "https://files.pythonhosted.org/packages/5a/b0/a4ffc4ae74d2d822200dcc46898987d8eb6032d1e2b219cae39da6f5cbcc/pandas-3.0.3-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:4e15135e2ee5df1063313e2425ceef8ac0f4ae775893815b0923651b806a5639", size = 9938250, upload-time = "2026-05-11T18:52:17.005Z" }, - { url = "https://files.pythonhosted.org/packages/2e/b2/3323601a52caee42c019e370090ca4544b241437240ca04f786cce82b0cf/pandas-3.0.3-cp311-cp311-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:05f1f1752b8533ea03f7f39a9c15b1a058d067bb48f4748948e7a8691e0510f2", size = 10770558, upload-time = "2026-05-11T18:52:19.865Z" }, - { url = "https://files.pythonhosted.org/packages/32/f1/bbecd2f867b97abebe0f9b53d750f862251b40337e061b36676ded3d920f/pandas-3.0.3-cp311-cp311-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:8a1e45c80cceb3b4a21bc5939d52e8cbd8d9b7305309219d59e9754d9ce09e27", size = 11274611, upload-time = "2026-05-11T18:52:22.622Z" }, - { url = "https://files.pythonhosted.org/packages/7f/4f/eafabf2d5fae5adf143b4d18d3706c5efdc368a7c4eb1ee8a3eddabbd0f6/pandas-3.0.3-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:14da8316da4d0c5a77618425996bfb1248ca87fc2c1486e6fde4652bd18b5824", size = 11784670, upload-time = "2026-05-11T18:52:25.4Z" }, - { url = "https://files.pythonhosted.org/packages/49/44/1eb20389301b57b19cc099a1c2f662501f72f08a65f912d05822613c1532/pandas-3.0.3-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:a55066a0505dae0ba2b50a46637db34b46f9094c65c5d4800794ef6335010938", size = 12353708, upload-time = "2026-05-11T18:52:28.139Z" }, - { url = "https://files.pythonhosted.org/packages/eb/62/c321f13b5ba1819fc8dca456c7fce578da2dcfecff1abbf0eaddf8406c0f/pandas-3.0.3-cp311-cp311-win_amd64.whl", hash = "sha256:6674ab18ad8c57802867264b00e15e7bb904700cdd9046e3b2fa1fce237439ea", size = 9907609, upload-time = "2026-05-11T18:52:30.982Z" }, - { url = "https://files.pythonhosted.org/packages/53/85/1b7f563ebc6357c27233a02a96b589bcce1fa9c6eb89fb4f0e56421d277e/pandas-3.0.3-cp311-cp311-win_arm64.whl", hash = "sha256:5cc09a68b3120e0f54870dede8287a7bb1fa463907e4fcec1ea77cab6179bf7a", size = 9165596, upload-time = "2026-05-11T18:52:33.334Z" }, - { url = "https://files.pythonhosted.org/packages/24/f1/392f8c5bfc16f66a0d2d41561c01627c228fe7ed2a0d056ef11315042570/pandas-3.0.3-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:fed2ff7fd9779120e388e285fc029bd5cf9490cdd2e4166a9ee22c0e49a9ab09", size = 10357846, upload-time = "2026-05-11T18:52:36.143Z" }, - { url = "https://files.pythonhosted.org/packages/cf/3d/b16412745651e855f357e5e66930248688378853a6e2698a214e331fba1f/pandas-3.0.3-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:b168fc218fd80a6cbdbdbc1a97ddc7889ed057d7eb45f50d866ceab5f39904c4", size = 9899550, upload-time = "2026-05-11T18:52:38.976Z" }, - { url = "https://files.pythonhosted.org/packages/31/a8/fa2535168fffcedf67f4f6de28d2dd903a747ca7c8ea6989451aaeb3a92f/pandas-3.0.3-cp312-cp312-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:0383c72c75cdcca61a9e116e611143902dbfd08bff356829c2f6d1cf40a9ca8c", size = 10412965, upload-time = "2026-05-11T18:52:41.915Z" }, - { url = "https://files.pythonhosted.org/packages/65/b6/09b01cdbc15224e2850365192d17b7bdebb8bdbd8780ed221fcdf0d9a515/pandas-3.0.3-cp312-cp312-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:6dc0b3fd2169c9157deed50b4d519553a3655c8c6a96027136d654592be973a9", size = 10894600, upload-time = "2026-05-11T18:52:45.02Z" }, - { url = "https://files.pythonhosted.org/packages/c9/a4/2eb28f2fccb4ced4a2c79ab2a5dee9ade1ebf44922ebad6fea158c9f95d4/pandas-3.0.3-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:7e65d5407dc0b394f509699650e4a2ec01c0514f21850f453fa60f3be79a5dbf", size = 11422824, upload-time = "2026-05-11T18:52:48.058Z" }, - { url = "https://files.pythonhosted.org/packages/f8/45/830bb57f533a4604b355e07edcb8ea18cf88b5f94e5fca92f27052d7c597/pandas-3.0.3-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:f8894dc474d648fe7b6ff0ca9b0bd73950d19952bc1a6534540762c5d79d305c", size = 11950889, upload-time = "2026-05-11T18:52:50.905Z" }, - { url = "https://files.pythonhosted.org/packages/b9/c5/fc1b368f303087d20e8c9bf3d6ceb186263cfac0ade735cd938538bea839/pandas-3.0.3-cp312-cp312-win_amd64.whl", hash = "sha256:c7be265b62cef88e253a941e4698604973736dcfe242fdb5198f0f7bc473cdcc", size = 9755463, upload-time = "2026-05-11T18:52:53.386Z" }, - { url = "https://files.pythonhosted.org/packages/86/bd/fda8f9705b1b09c6ebe14bfc0fa0e4ec8584d54ea673628f157ff55131af/pandas-3.0.3-cp312-cp312-win_arm64.whl", hash = "sha256:557409bc4178e70ee8d9ddb494798e51ebf6ea59330f6be22c51bab2a7db6c49", size = 9066158, upload-time = "2026-05-11T18:52:56.038Z" }, - { url = "https://files.pythonhosted.org/packages/c5/90/62d8302883c44308c477e222c3daf7c813a34c8e96985882fbd53d964352/pandas-3.0.3-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:67b3b64c11910cfa29f4e94a14d3bff9ee693b6fc76055e7cad549cee0aec5fa", size = 10331071, upload-time = "2026-05-11T18:52:58.838Z" }, - { url = "https://files.pythonhosted.org/packages/7f/ae/6a6493c783a101f165e4356953ba3c74d6f77f0042fa7d753da9dfbb640c/pandas-3.0.3-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:39436b377d56d2a2e52d0395bdbee171f01068e99af5250509aceeb929f765c7", size = 9875690, upload-time = "2026-05-11T18:53:01.431Z" }, - { url = "https://files.pythonhosted.org/packages/62/7c/5df8e9f56c69a2769fbe9382a5ef8f2658c007e376434e1e2cbb57ad895f/pandas-3.0.3-cp313-cp313-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:d4be06d68f9ddcfc645b87534911da79a8fbffc7573c80e0edcf42a5020624d8", size = 10381634, upload-time = "2026-05-11T18:53:04.393Z" }, - { url = "https://files.pythonhosted.org/packages/99/68/1237369725aa617bb358263d535803e3053fdbc593513ec5ed9c9896b5b6/pandas-3.0.3-cp313-cp313-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:a4eeb6830daf35a71cc09649bd823e2b542dac246cdee9614c6e4bd65028cd6a", size = 10891243, upload-time = "2026-05-11T18:53:07.643Z" }, - { url = "https://files.pythonhosted.org/packages/25/93/77d108e8af7222b4a503ebde0e30215b1c2e4f8e53a526431890f22d5586/pandas-3.0.3-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:1928e07221f82db493cd4af1e23c1bfca524a19a4699887975bff68f49a72bfb", size = 11388659, upload-time = "2026-05-11T18:53:10.634Z" }, - { url = "https://files.pythonhosted.org/packages/d0/bd/eff5b4399f332ac386c853f6cd2bd3fa2ca0061b9f36ecd9c4d7c4265649/pandas-3.0.3-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:51b1fe551acb77dac643c6fda86084d8d446c10fe64b06a9cc29c4cc8540e7f2", size = 11942880, upload-time = "2026-05-11T18:53:13.536Z" }, - { url = "https://files.pythonhosted.org/packages/2c/20/559ace4200982c3887d0b86bfd0d856a2143ef8ddab63cc07934951a964c/pandas-3.0.3-cp313-cp313-win_amd64.whl", hash = "sha256:a82d532a3351d435432cd913edbccaf8b8e01d4dd0e5ced5a8d2e8ecd94c7e44", size = 9757091, upload-time = "2026-05-11T18:53:16.306Z" }, - { url = "https://files.pythonhosted.org/packages/3a/66/69055a09fe200f29f922a3eeec4804611900b95f52d932ece3393c3c0c19/pandas-3.0.3-cp313-cp313-win_arm64.whl", hash = "sha256:275c14e0fce14a2ec20eee474aecd305478ea3c1e6f6a9d8fe219a165542717e", size = 9057282, upload-time = "2026-05-11T18:53:18.768Z" }, - { url = "https://files.pythonhosted.org/packages/57/0e/efe801b0e6811e8e650cd21b7f2608e30f08a7067e2bf6e8752b0d56ee3c/pandas-3.0.3-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:46997386d528eb40376ecd6b033cf4a8a1e5282580f68f43de875b78cba2199d", size = 10767016, upload-time = "2026-05-11T18:53:21.227Z" }, - { url = "https://files.pythonhosted.org/packages/ea/dc/eb55135a1d5f0f0519f28da1f609a206d2cad1f9c35c32d51e38dd7261ae/pandas-3.0.3-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:261e308dfb22448384b7580cf719d2f998fe2966c92893c3e77d14008af1f066", size = 10420210, upload-time = "2026-05-11T18:53:23.982Z" }, - { url = "https://files.pythonhosted.org/packages/c6/3e/b1d5d955ce33ffecb407465a60bc32769d74fcf68224b7ae67ae11d4dea4/pandas-3.0.3-cp313-cp313t-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:dd1a5d1def6a46002e964510bdc67c368aa0951df5d1d9f8365336f5a1f490cd", size = 10336126, upload-time = "2026-05-11T18:53:26.731Z" }, - { url = "https://files.pythonhosted.org/packages/f5/76/a01261711ab60a22d71b862f0de20e4c504bf80457270ad8cb42110f6abc/pandas-3.0.3-cp313-cp313t-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:d72828c20c6d6e83e1e22a6a3b47b326b71664112fa9705dcbccfd7a39b62085", size = 10728051, upload-time = "2026-05-11T18:53:29.125Z" }, - { url = "https://files.pythonhosted.org/packages/e9/21/ea191195e587b18cf682e97f433f81b2d0fbe341380e80a3e0d6e4403c8e/pandas-3.0.3-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:d26cbe1fcfc12e8fd900e2454163e466b2d3af84f7c75481df7683ffc073d870", size = 11350796, upload-time = "2026-05-11T18:53:32.056Z" }, - { url = "https://files.pythonhosted.org/packages/64/69/f0eaaf54939f0e8c6768fd06be9af2cef9b36048b96dfb9e1b2c685a807e/pandas-3.0.3-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:3e91cec1879ada0624fc3dc9953c5cbd60208e59c0db28f540c5d6d47502422f", size = 11799741, upload-time = "2026-05-11T18:53:34.985Z" }, - { url = "https://files.pythonhosted.org/packages/45/a4/865e0e510cae5fc2194de4db28be638952de942571ba9125934fd9c01d47/pandas-3.0.3-cp313-cp313t-win_amd64.whl", hash = "sha256:08d789b41f87e0905880e293cedf6197ce71fe67cc081358b1e148a491b9bd13", size = 10499958, upload-time = "2026-05-11T18:53:37.857Z" }, { url = "https://files.pythonhosted.org/packages/86/54/effdcc3c0ff7a08037889200e148ebe94c16c4f653be078c7b3675955df1/pandas-3.0.3-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:3650109c0f22879df8bd6179ab9ee3d7f1d1d4e7e0094a3f0032d9f51e2e64ac", size = 10336065, upload-time = "2026-05-11T18:53:41.099Z" }, { url = "https://files.pythonhosted.org/packages/68/10/bf2d6738d72748b961a3751ab89522d58c54efc36a8e1a12161216cd45cf/pandas-3.0.3-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:bab900348131a7db1f69a7309ef141fd5680f1487094193bcbbb61791573bf8f", size = 9926101, upload-time = "2026-05-11T18:53:43.515Z" }, { url = "https://files.pythonhosted.org/packages/ae/e9/e35cf11c8a136e757b956f5f0efdcaa50aecde85ea055f1898dfc68262f3/pandas-3.0.3-cp314-cp314-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:ba7e08b9ac1d54569cd1e256e3668975ed624d6826f7b68df0342b012007bddb", size = 10457553, upload-time = "2026-05-11T18:53:46.394Z" }, @@ -3033,53 +2204,6 @@ version = "12.2.0" source = { registry = "https://pypi.org/simple" } sdist = { url = "https://files.pythonhosted.org/packages/8c/21/c2bcdd5906101a30244eaffc1b6e6ce71a31bd0742a01eb89e660ebfac2d/pillow-12.2.0.tar.gz", hash = "sha256:a830b1a40919539d07806aa58e1b114df53ddd43213d9c8b75847eee6c0182b5", size = 46987819, upload-time = "2026-04-01T14:46:17.687Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/68/e1/748f5663efe6edcfc4e74b2b93edfb9b8b99b67f21a854c3ae416500a2d9/pillow-12.2.0-cp311-cp311-macosx_10_10_x86_64.whl", hash = "sha256:8be29e59487a79f173507c30ddf57e733a357f67881430449bb32614075a40ab", size = 5354347, upload-time = "2026-04-01T14:42:44.255Z" }, - { url = "https://files.pythonhosted.org/packages/47/a1/d5ff69e747374c33a3b53b9f98cca7889fce1fd03d79cdc4e1bccc6c5a87/pillow-12.2.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:71cde9a1e1551df7d34a25462fc60325e8a11a82cc2e2f54578e5e9a1e153d65", size = 4695873, upload-time = "2026-04-01T14:42:46.452Z" }, - { url = "https://files.pythonhosted.org/packages/df/21/e3fbdf54408a973c7f7f89a23b2cb97a7ef30c61ab4142af31eee6aebc88/pillow-12.2.0-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:f490f9368b6fc026f021db16d7ec2fbf7d89e2edb42e8ec09d2c60505f5729c7", size = 6280168, upload-time = "2026-04-01T14:42:49.228Z" }, - { url = "https://files.pythonhosted.org/packages/d3/f1/00b7278c7dd52b17ad4329153748f87b6756ec195ff786c2bdf12518337d/pillow-12.2.0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:8bd7903a5f2a4545f6fd5935c90058b89d30045568985a71c79f5fd6edf9b91e", size = 8088188, upload-time = "2026-04-01T14:42:51.735Z" }, - { url = "https://files.pythonhosted.org/packages/ad/cf/220a5994ef1b10e70e85748b75649d77d506499352be135a4989c957b701/pillow-12.2.0-cp311-cp311-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:3997232e10d2920a68d25191392e3a4487d8183039e1c74c2297f00ed1c50705", size = 6394401, upload-time = "2026-04-01T14:42:54.343Z" }, - { url = "https://files.pythonhosted.org/packages/e9/bd/e51a61b1054f09437acfbc2ff9106c30d1eb76bc1453d428399946781253/pillow-12.2.0-cp311-cp311-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:e74473c875d78b8e9d5da2a70f7099549f9eb37ded4e2f6a463e60125bccd176", size = 7079655, upload-time = "2026-04-01T14:42:56.954Z" }, - { url = "https://files.pythonhosted.org/packages/6b/3d/45132c57d5fb4b5744567c3817026480ac7fc3ce5d4c47902bc0e7f6f853/pillow-12.2.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:56a3f9c60a13133a98ecff6197af34d7824de9b7b38c3654861a725c970c197b", size = 6503105, upload-time = "2026-04-01T14:42:59.847Z" }, - { url = "https://files.pythonhosted.org/packages/7d/2e/9df2fc1e82097b1df3dce58dc43286aa01068e918c07574711fcc53e6fb4/pillow-12.2.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:90e6f81de50ad6b534cab6e5aef77ff6e37722b2f5d908686f4a5c9eba17a909", size = 7203402, upload-time = "2026-04-01T14:43:02.664Z" }, - { url = "https://files.pythonhosted.org/packages/bd/2e/2941e42858ebb67e50ae741473de81c2984e6eff7b397017623c676e2e8d/pillow-12.2.0-cp311-cp311-win32.whl", hash = "sha256:8c984051042858021a54926eb597d6ee3012393ce9c181814115df4c60b9a808", size = 6378149, upload-time = "2026-04-01T14:43:05.274Z" }, - { url = "https://files.pythonhosted.org/packages/69/42/836b6f3cd7f3e5fa10a1f1a5420447c17966044c8fbf589cc0452d5502db/pillow-12.2.0-cp311-cp311-win_amd64.whl", hash = "sha256:6e6b2a0c538fc200b38ff9eb6628228b77908c319a005815f2dde585a0664b60", size = 7082626, upload-time = "2026-04-01T14:43:08.557Z" }, - { url = "https://files.pythonhosted.org/packages/c2/88/549194b5d6f1f494b485e493edc6693c0a16f4ada488e5bd974ed1f42fad/pillow-12.2.0-cp311-cp311-win_arm64.whl", hash = "sha256:9a8a34cc89c67a65ea7437ce257cea81a9dad65b29805f3ecee8c8fe8ff25ffe", size = 2463531, upload-time = "2026-04-01T14:43:10.743Z" }, - { url = "https://files.pythonhosted.org/packages/58/be/7482c8a5ebebbc6470b3eb791812fff7d5e0216c2be3827b30b8bb6603ed/pillow-12.2.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:2d192a155bbcec180f8564f693e6fd9bccff5a7af9b32e2e4bf8c9c69dbad6b5", size = 5308279, upload-time = "2026-04-01T14:43:13.246Z" }, - { url = "https://files.pythonhosted.org/packages/d8/95/0a351b9289c2b5cbde0bacd4a83ebc44023e835490a727b2a3bd60ddc0f4/pillow-12.2.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:f3f40b3c5a968281fd507d519e444c35f0ff171237f4fdde090dd60699458421", size = 4695490, upload-time = "2026-04-01T14:43:15.584Z" }, - { url = "https://files.pythonhosted.org/packages/de/af/4e8e6869cbed569d43c416fad3dc4ecb944cb5d9492defaed89ddd6fe871/pillow-12.2.0-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:03e7e372d5240cc23e9f07deca4d775c0817bffc641b01e9c3af208dbd300987", size = 6284462, upload-time = "2026-04-01T14:43:18.268Z" }, - { url = "https://files.pythonhosted.org/packages/e9/9e/c05e19657fd57841e476be1ab46c4d501bffbadbafdc31a6d665f8b737b6/pillow-12.2.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:b86024e52a1b269467a802258c25521e6d742349d760728092e1bc2d135b4d76", size = 8094744, upload-time = "2026-04-01T14:43:20.716Z" }, - { url = "https://files.pythonhosted.org/packages/2b/54/1789c455ed10176066b6e7e6da1b01e50e36f94ba584dc68d9eebfe9156d/pillow-12.2.0-cp312-cp312-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:7371b48c4fa448d20d2714c9a1f775a81155050d383333e0a6c15b1123dda005", size = 6398371, upload-time = "2026-04-01T14:43:23.443Z" }, - { url = "https://files.pythonhosted.org/packages/43/e3/fdc657359e919462369869f1c9f0e973f353f9a9ee295a39b1fea8ee1a77/pillow-12.2.0-cp312-cp312-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:62f5409336adb0663b7caa0da5c7d9e7bdbaae9ce761d34669420c2a801b2780", size = 7087215, upload-time = "2026-04-01T14:43:26.758Z" }, - { url = "https://files.pythonhosted.org/packages/8b/f8/2f6825e441d5b1959d2ca5adec984210f1ec086435b0ed5f52c19b3b8a6e/pillow-12.2.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:01afa7cf67f74f09523699b4e88c73fb55c13346d212a59a2db1f86b0a63e8c5", size = 6509783, upload-time = "2026-04-01T14:43:29.56Z" }, - { url = "https://files.pythonhosted.org/packages/67/f9/029a27095ad20f854f9dba026b3ea6428548316e057e6fc3545409e86651/pillow-12.2.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:fc3d34d4a8fbec3e88a79b92e5465e0f9b842b628675850d860b8bd300b159f5", size = 7212112, upload-time = "2026-04-01T14:43:32.091Z" }, - { url = "https://files.pythonhosted.org/packages/be/42/025cfe05d1be22dbfdb4f264fe9de1ccda83f66e4fc3aac94748e784af04/pillow-12.2.0-cp312-cp312-win32.whl", hash = "sha256:58f62cc0f00fd29e64b29f4fd923ffdb3859c9f9e6105bfc37ba1d08994e8940", size = 6378489, upload-time = "2026-04-01T14:43:34.601Z" }, - { url = "https://files.pythonhosted.org/packages/5d/7b/25a221d2c761c6a8ae21bfa3874988ff2583e19cf8a27bf2fee358df7942/pillow-12.2.0-cp312-cp312-win_amd64.whl", hash = "sha256:7f84204dee22a783350679a0333981df803dac21a0190d706a50475e361c93f5", size = 7084129, upload-time = "2026-04-01T14:43:37.213Z" }, - { url = "https://files.pythonhosted.org/packages/10/e1/542a474affab20fd4a0f1836cb234e8493519da6b76899e30bcc5d990b8b/pillow-12.2.0-cp312-cp312-win_arm64.whl", hash = "sha256:af73337013e0b3b46f175e79492d96845b16126ddf79c438d7ea7ff27783a414", size = 2463612, upload-time = "2026-04-01T14:43:39.421Z" }, - { url = "https://files.pythonhosted.org/packages/4a/01/53d10cf0dbad820a8db274d259a37ba50b88b24768ddccec07355382d5ad/pillow-12.2.0-cp313-cp313-ios_13_0_arm64_iphoneos.whl", hash = "sha256:8297651f5b5679c19968abefd6bb84d95fe30ef712eb1b2d9b2d31ca61267f4c", size = 4100837, upload-time = "2026-04-01T14:43:41.506Z" }, - { url = "https://files.pythonhosted.org/packages/0f/98/f3a6657ecb698c937f6c76ee564882945f29b79bad496abcba0e84659ec5/pillow-12.2.0-cp313-cp313-ios_13_0_arm64_iphonesimulator.whl", hash = "sha256:50d8520da2a6ce0af445fa6d648c4273c3eeefbc32d7ce049f22e8b5c3daecc2", size = 4176528, upload-time = "2026-04-01T14:43:43.773Z" }, - { url = "https://files.pythonhosted.org/packages/69/bc/8986948f05e3ea490b8442ea1c1d4d990b24a7e43d8a51b2c7d8b1dced36/pillow-12.2.0-cp313-cp313-ios_13_0_x86_64_iphonesimulator.whl", hash = "sha256:766cef22385fa1091258ad7e6216792b156dc16d8d3fa607e7545b2b72061f1c", size = 3640401, upload-time = "2026-04-01T14:43:45.87Z" }, - { url = "https://files.pythonhosted.org/packages/34/46/6c717baadcd62bc8ed51d238d521ab651eaa74838291bda1f86fe1f864c9/pillow-12.2.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:5d2fd0fa6b5d9d1de415060363433f28da8b1526c1c129020435e186794b3795", size = 5308094, upload-time = "2026-04-01T14:43:48.438Z" }, - { url = "https://files.pythonhosted.org/packages/71/43/905a14a8b17fdb1ccb58d282454490662d2cb89a6bfec26af6d3520da5ec/pillow-12.2.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:56b25336f502b6ed02e889f4ece894a72612fe885889a6e8c4c80239ff6e5f5f", size = 4695402, upload-time = "2026-04-01T14:43:51.292Z" }, - { url = "https://files.pythonhosted.org/packages/73/dd/42107efcb777b16fa0393317eac58f5b5cf30e8392e266e76e51cff28c3d/pillow-12.2.0-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:f1c943e96e85df3d3478f7b691f229887e143f81fedab9b20205349ab04d73ed", size = 6280005, upload-time = "2026-04-01T14:43:54.242Z" }, - { url = "https://files.pythonhosted.org/packages/a8/68/b93e09e5e8549019e61acf49f65b1a8530765a7f812c77a7461bca7e4494/pillow-12.2.0-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:03f6fab9219220f041c74aeaa2939ff0062bd5c364ba9ce037197f4c6d498cd9", size = 8090669, upload-time = "2026-04-01T14:43:57.335Z" }, - { url = "https://files.pythonhosted.org/packages/4b/6e/3ccb54ce8ec4ddd1accd2d89004308b7b0b21c4ac3d20fa70af4760a4330/pillow-12.2.0-cp313-cp313-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:5cdfebd752ec52bf5bb4e35d9c64b40826bc5b40a13df7c3cda20a2c03a0f5ed", size = 6395194, upload-time = "2026-04-01T14:43:59.864Z" }, - { url = "https://files.pythonhosted.org/packages/67/ee/21d4e8536afd1a328f01b359b4d3997b291ffd35a237c877b331c1c3b71c/pillow-12.2.0-cp313-cp313-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:eedf4b74eda2b5a4b2b2fb4c006d6295df3bf29e459e198c90ea48e130dc75c3", size = 7082423, upload-time = "2026-04-01T14:44:02.74Z" }, - { url = "https://files.pythonhosted.org/packages/78/5f/e9f86ab0146464e8c133fe85df987ed9e77e08b29d8d35f9f9f4d6f917ba/pillow-12.2.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:00a2865911330191c0b818c59103b58a5e697cae67042366970a6b6f1b20b7f9", size = 6505667, upload-time = "2026-04-01T14:44:05.381Z" }, - { url = "https://files.pythonhosted.org/packages/ed/1e/409007f56a2fdce61584fd3acbc2bbc259857d555196cedcadc68c015c82/pillow-12.2.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:1e1757442ed87f4912397c6d35a0db6a7b52592156014706f17658ff58bbf795", size = 7208580, upload-time = "2026-04-01T14:44:08.39Z" }, - { url = "https://files.pythonhosted.org/packages/23/c4/7349421080b12fb35414607b8871e9534546c128a11965fd4a7002ccfbee/pillow-12.2.0-cp313-cp313-win32.whl", hash = "sha256:144748b3af2d1b358d41286056d0003f47cb339b8c43a9ea42f5fea4d8c66b6e", size = 6375896, upload-time = "2026-04-01T14:44:11.197Z" }, - { url = "https://files.pythonhosted.org/packages/3f/82/8a3739a5e470b3c6cbb1d21d315800d8e16bff503d1f16b03a4ec3212786/pillow-12.2.0-cp313-cp313-win_amd64.whl", hash = "sha256:390ede346628ccc626e5730107cde16c42d3836b89662a115a921f28440e6a3b", size = 7081266, upload-time = "2026-04-01T14:44:13.947Z" }, - { url = "https://files.pythonhosted.org/packages/c3/25/f968f618a062574294592f668218f8af564830ccebdd1fa6200f598e65c5/pillow-12.2.0-cp313-cp313-win_arm64.whl", hash = "sha256:8023abc91fba39036dbce14a7d6535632f99c0b857807cbbbf21ecc9f4717f06", size = 2463508, upload-time = "2026-04-01T14:44:16.312Z" }, - { url = "https://files.pythonhosted.org/packages/4d/a4/b342930964e3cb4dce5038ae34b0eab4653334995336cd486c5a8c25a00c/pillow-12.2.0-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:042db20a421b9bafecc4b84a8b6e444686bd9d836c7fd24542db3e7df7baad9b", size = 5309927, upload-time = "2026-04-01T14:44:18.89Z" }, - { url = "https://files.pythonhosted.org/packages/9f/de/23198e0a65a9cf06123f5435a5d95cea62a635697f8f03d134d3f3a96151/pillow-12.2.0-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:dd025009355c926a84a612fecf58bb315a3f6814b17ead51a8e48d3823d9087f", size = 4698624, upload-time = "2026-04-01T14:44:21.115Z" }, - { url = "https://files.pythonhosted.org/packages/01/a6/1265e977f17d93ea37aa28aa81bad4fa597933879fac2520d24e021c8da3/pillow-12.2.0-cp313-cp313t-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:88ddbc66737e277852913bd1e07c150cc7bb124539f94c4e2df5344494e0a612", size = 6321252, upload-time = "2026-04-01T14:44:23.663Z" }, - { url = "https://files.pythonhosted.org/packages/3c/83/5982eb4a285967baa70340320be9f88e57665a387e3a53a7f0db8231a0cd/pillow-12.2.0-cp313-cp313t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:d362d1878f00c142b7e1a16e6e5e780f02be8195123f164edf7eddd911eefe7c", size = 8126550, upload-time = "2026-04-01T14:44:26.772Z" }, - { url = "https://files.pythonhosted.org/packages/4e/48/6ffc514adce69f6050d0753b1a18fd920fce8cac87620d5a31231b04bfc5/pillow-12.2.0-cp313-cp313t-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:2c727a6d53cb0018aadd8018c2b938376af27914a68a492f59dfcaca650d5eea", size = 6433114, upload-time = "2026-04-01T14:44:29.615Z" }, - { url = "https://files.pythonhosted.org/packages/36/a3/f9a77144231fb8d40ee27107b4463e205fa4677e2ca2548e14da5cf18dce/pillow-12.2.0-cp313-cp313t-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:efd8c21c98c5cc60653bcb311bef2ce0401642b7ce9d09e03a7da87c878289d4", size = 7115667, upload-time = "2026-04-01T14:44:32.773Z" }, - { url = "https://files.pythonhosted.org/packages/c1/fc/ac4ee3041e7d5a565e1c4fd72a113f03b6394cc72ab7089d27608f8aaccb/pillow-12.2.0-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:9f08483a632889536b8139663db60f6724bfcb443c96f1b18855860d7d5c0fd4", size = 6538966, upload-time = "2026-04-01T14:44:35.252Z" }, - { url = "https://files.pythonhosted.org/packages/c0/a8/27fb307055087f3668f6d0a8ccb636e7431d56ed0750e07a60547b1e083e/pillow-12.2.0-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:dac8d77255a37e81a2efcbd1fc05f1c15ee82200e6c240d7e127e25e365c39ea", size = 7238241, upload-time = "2026-04-01T14:44:37.875Z" }, - { url = "https://files.pythonhosted.org/packages/ad/4b/926ab182c07fccae9fcb120043464e1ff1564775ec8864f21a0ebce6ac25/pillow-12.2.0-cp313-cp313t-win32.whl", hash = "sha256:ee3120ae9dff32f121610bb08e4313be87e03efeadfc6c0d18f89127e24d0c24", size = 6379592, upload-time = "2026-04-01T14:44:40.336Z" }, - { url = "https://files.pythonhosted.org/packages/c2/c4/f9e476451a098181b30050cc4c9a3556b64c02cf6497ea421ac047e89e4b/pillow-12.2.0-cp313-cp313t-win_amd64.whl", hash = "sha256:325ca0528c6788d2a6c3d40e3568639398137346c3d6e66bb61db96b96511c98", size = 7085542, upload-time = "2026-04-01T14:44:43.251Z" }, - { url = "https://files.pythonhosted.org/packages/00/a4/285f12aeacbe2d6dc36c407dfbbe9e96d4a80b0fb710a337f6d2ad978c75/pillow-12.2.0-cp313-cp313t-win_arm64.whl", hash = "sha256:2e5a76d03a6c6dcef67edabda7a52494afa4035021a79c8558e14af25313d453", size = 2465765, upload-time = "2026-04-01T14:44:45.996Z" }, { url = "https://files.pythonhosted.org/packages/bf/98/4595daa2365416a86cb0d495248a393dfc84e96d62ad080c8546256cb9c0/pillow-12.2.0-cp314-cp314-ios_13_0_arm64_iphoneos.whl", hash = "sha256:3adc9215e8be0448ed6e814966ecf3d9952f0ea40eb14e89a102b87f450660d8", size = 4100848, upload-time = "2026-04-01T14:44:48.48Z" }, { url = "https://files.pythonhosted.org/packages/0b/79/40184d464cf89f6663e18dfcf7ca21aae2491fff1a16127681bf1fa9b8cf/pillow-12.2.0-cp314-cp314-ios_13_0_arm64_iphonesimulator.whl", hash = "sha256:6a9adfc6d24b10f89588096364cc726174118c62130c817c2837c60cf08a392b", size = 4176515, upload-time = "2026-04-01T14:44:51.353Z" }, { url = "https://files.pythonhosted.org/packages/b0/63/703f86fd4c422a9cf722833670f4f71418fb116b2853ff7da722ea43f184/pillow-12.2.0-cp314-cp314-ios_13_0_x86_64_iphonesimulator.whl", hash = "sha256:6a6e67ea2e6feda684ed370f9a1c52e7a243631c025ba42149a2cc5934dec295", size = 3640159, upload-time = "2026-04-01T14:44:53.588Z" }, @@ -3105,13 +2229,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/c9/e4/4b64a97d71b2a83158134abbb2f5bd3f8a2ea691361282f010998f339ec7/pillow-12.2.0-cp314-cp314t-win32.whl", hash = "sha256:6bb77b2dcb06b20f9f4b4a8454caa581cd4dd0643a08bacf821216a16d9c8354", size = 6482084, upload-time = "2026-04-01T14:45:47.568Z" }, { url = "https://files.pythonhosted.org/packages/ba/13/306d275efd3a3453f72114b7431c877d10b1154014c1ebbedd067770d629/pillow-12.2.0-cp314-cp314t-win_amd64.whl", hash = "sha256:6562ace0d3fb5f20ed7290f1f929cae41b25ae29528f2af1722966a0a02e2aa1", size = 7225152, upload-time = "2026-04-01T14:45:50.032Z" }, { url = "https://files.pythonhosted.org/packages/ff/6e/cf826fae916b8658848d7b9f38d88da6396895c676e8086fc0988073aaf8/pillow-12.2.0-cp314-cp314t-win_arm64.whl", hash = "sha256:aa88ccfe4e32d362816319ed727a004423aab09c5cea43c01a4b435643fa34eb", size = 2556579, upload-time = "2026-04-01T14:45:52.529Z" }, - { url = "https://files.pythonhosted.org/packages/4e/b7/2437044fb910f499610356d1352e3423753c98e34f915252aafecc64889f/pillow-12.2.0-pp311-pypy311_pp73-macosx_10_15_x86_64.whl", hash = "sha256:0538bd5e05efec03ae613fd89c4ce0368ecd2ba239cc25b9f9be7ed426b0af1f", size = 5273969, upload-time = "2026-04-01T14:45:55.538Z" }, - { url = "https://files.pythonhosted.org/packages/f6/f4/8316e31de11b780f4ac08ef3654a75555e624a98db1056ecb2122d008d5a/pillow-12.2.0-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:394167b21da716608eac917c60aa9b969421b5dcbbe02ae7f013e7b85811c69d", size = 4659674, upload-time = "2026-04-01T14:45:58.093Z" }, - { url = "https://files.pythonhosted.org/packages/d4/37/664fca7201f8bb2aa1d20e2c3d5564a62e6ae5111741966c8319ca802361/pillow-12.2.0-pp311-pypy311_pp73-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:5d04bfa02cc2d23b497d1e90a0f927070043f6cbf303e738300532379a4b4e0f", size = 5288479, upload-time = "2026-04-01T14:46:01.141Z" }, - { url = "https://files.pythonhosted.org/packages/49/62/5b0ed78fce87346be7a5cfcfaaad91f6a1f98c26f86bdbafa2066c647ef6/pillow-12.2.0-pp311-pypy311_pp73-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:0c838a5125cee37e68edec915651521191cef1e6aa336b855f495766e77a366e", size = 7032230, upload-time = "2026-04-01T14:46:03.874Z" }, - { url = "https://files.pythonhosted.org/packages/c3/28/ec0fc38107fc32536908034e990c47914c57cd7c5a3ece4d8d8f7ffd7e27/pillow-12.2.0-pp311-pypy311_pp73-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:4a6c9fa44005fa37a91ebfc95d081e8079757d2e904b27103f4f5fa6f0bf78c0", size = 5355404, upload-time = "2026-04-01T14:46:06.33Z" }, - { url = "https://files.pythonhosted.org/packages/5e/8b/51b0eddcfa2180d60e41f06bd6d0a62202b20b59c68f5a132e615b75aecf/pillow-12.2.0-pp311-pypy311_pp73-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:25373b66e0dd5905ed63fa3cae13c82fbddf3079f2c8bf15c6fb6a35586324c1", size = 6002215, upload-time = "2026-04-01T14:46:08.83Z" }, - { url = "https://files.pythonhosted.org/packages/bc/60/5382c03e1970de634027cee8e1b7d39776b778b81812aaf45b694dfe9e28/pillow-12.2.0-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:bfa9c230d2fe991bed5318a5f119bd6780cda2915cca595393649fc118ab895e", size = 7080946, upload-time = "2026-04-01T14:46:11.734Z" }, ] [[package]] @@ -3202,12 +2319,6 @@ version = "7.2.2" source = { registry = "https://pypi.org/simple" } sdist = { url = "https://files.pythonhosted.org/packages/aa/c6/d1ddf4abb55e93cebc4f2ed8b5d6dbad109ecb8d63748dd2b20ab5e57ebe/psutil-7.2.2.tar.gz", hash = "sha256:0746f5f8d406af344fd547f1c8daa5f5c33dbc293bb8d6a16d80b4bb88f59372", size = 493740, upload-time = "2026-01-28T18:14:54.428Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/51/08/510cbdb69c25a96f4ae523f733cdc963ae654904e8db864c07585ef99875/psutil-7.2.2-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:2edccc433cbfa046b980b0df0171cd25bcaeb3a68fe9022db0979e7aa74a826b", size = 130595, upload-time = "2026-01-28T18:14:57.293Z" }, - { url = "https://files.pythonhosted.org/packages/d6/f5/97baea3fe7a5a9af7436301f85490905379b1c6f2dd51fe3ecf24b4c5fbf/psutil-7.2.2-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:e78c8603dcd9a04c7364f1a3e670cea95d51ee865e4efb3556a3a63adef958ea", size = 131082, upload-time = "2026-01-28T18:14:59.732Z" }, - { url = "https://files.pythonhosted.org/packages/37/d6/246513fbf9fa174af531f28412297dd05241d97a75911ac8febefa1a53c6/psutil-7.2.2-cp313-cp313t-manylinux2010_x86_64.manylinux_2_12_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:1a571f2330c966c62aeda00dd24620425d4b0cc86881c89861fbc04549e5dc63", size = 181476, upload-time = "2026-01-28T18:15:01.884Z" }, - { url = "https://files.pythonhosted.org/packages/b8/b5/9182c9af3836cca61696dabe4fd1304e17bc56cb62f17439e1154f225dd3/psutil-7.2.2-cp313-cp313t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:917e891983ca3c1887b4ef36447b1e0873e70c933afc831c6b6da078ba474312", size = 184062, upload-time = "2026-01-28T18:15:04.436Z" }, - { url = "https://files.pythonhosted.org/packages/16/ba/0756dca669f5a9300d0cbcbfae9a4c30e446dfc7440ffe43ded5724bfd93/psutil-7.2.2-cp313-cp313t-win_amd64.whl", hash = "sha256:ab486563df44c17f5173621c7b198955bd6b613fb87c71c161f827d3fb149a9b", size = 139893, upload-time = "2026-01-28T18:15:06.378Z" }, - { url = "https://files.pythonhosted.org/packages/1c/61/8fa0e26f33623b49949346de05ec1ddaad02ed8ba64af45f40a147dbfa97/psutil-7.2.2-cp313-cp313t-win_arm64.whl", hash = "sha256:ae0aefdd8796a7737eccea863f80f81e468a1e4cf14d926bd9b6f5f2d5f90ca9", size = 135589, upload-time = "2026-01-28T18:15:08.03Z" }, { url = "https://files.pythonhosted.org/packages/81/69/ef179ab5ca24f32acc1dac0c247fd6a13b501fd5534dbae0e05a1c48b66d/psutil-7.2.2-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:eed63d3b4d62449571547b60578c5b2c4bcccc5387148db46e0c2313dad0ee00", size = 130664, upload-time = "2026-01-28T18:15:09.469Z" }, { url = "https://files.pythonhosted.org/packages/7b/64/665248b557a236d3fa9efc378d60d95ef56dd0a490c2cd37dafc7660d4a9/psutil-7.2.2-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:7b6d09433a10592ce39b13d7be5a54fbac1d1228ed29abc880fb23df7cb694c9", size = 131087, upload-time = "2026-01-28T18:15:11.724Z" }, { url = "https://files.pythonhosted.org/packages/d5/2e/e6782744700d6759ebce3043dcfa661fb61e2fb752b91cdeae9af12c2178/psutil-7.2.2-cp314-cp314t-manylinux2010_x86_64.manylinux_2_12_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:1fa4ecf83bcdf6e6c8f4449aff98eefb5d0604bf88cb883d7da3d8d2d909546a", size = 182383, upload-time = "2026-01-28T18:15:13.445Z" }, @@ -3230,39 +2341,6 @@ version = "2.9.12" source = { registry = "https://pypi.org/simple" } sdist = { url = "https://files.pythonhosted.org/packages/2a/60/a3624f79acea344c16fbef3a94d28b89a8042ddfb8f3e4ca83f538671409/psycopg2_binary-2.9.12.tar.gz", hash = "sha256:5ac9444edc768c02a6b6a591f070b8aae28ff3a99be57560ac996001580f294c", size = 379686, upload-time = "2026-04-21T09:40:34.304Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/d5/19/d4ce60954f3bb9d8e3bc5e5c4d1f2487de2d3851bf2391d54954c9df12a6/psycopg2_binary-2.9.12-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:5c8ce6c61bd1b1f6b9c24ee32211599f6166af2c55abb19456090a21fd16554b", size = 3712338, upload-time = "2026-04-20T23:34:03.961Z" }, - { url = "https://files.pythonhosted.org/packages/53/71/c85409ee0d78890f0660eff262e815e7dd2bb741a17611d82e9e8cd9dc5e/psycopg2_binary-2.9.12-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:b4a9eaa6e7f4ff91bec10aa3fb296878e75187bced5cc4bafe17dc40915e1326", size = 3822407, upload-time = "2026-04-20T23:34:05.977Z" }, - { url = "https://files.pythonhosted.org/packages/3c/ed/60486c2c7f0d4d1ede2bfb1ed27e2498477ce646bc7f6b2759906303117e/psycopg2_binary-2.9.12-cp311-cp311-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:c6528cefc8e50fcc6f4a107e27a672058b36cc5736d665476aeb413ba88dbb06", size = 4578425, upload-time = "2026-04-20T23:34:08.246Z" }, - { url = "https://files.pythonhosted.org/packages/0b/b9/656cb03fad9f4f49f2145c334b1126ee75189929ca4e6187d485a2d59951/psycopg2_binary-2.9.12-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:e4e184b1fb6072bf05388aa41c697e1b2d01b3473f107e7ec44f186a32cfd0b8", size = 4273709, upload-time = "2026-04-20T23:34:10.974Z" }, - { url = "https://files.pythonhosted.org/packages/99/66/08cf0da0e25cc6fb142c89be45fc8418792858f0c4cbff5e24530ff02cd6/psycopg2_binary-2.9.12-cp311-cp311-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:4766ab678563054d3f1d064a4db19cc4b5f9e3a8d9018592a8285cf200c248f3", size = 5893779, upload-time = "2026-04-20T23:34:13.905Z" }, - { url = "https://files.pythonhosted.org/packages/17/d7/eecd9ce8e146d3721115d82d3836efdbb712187e4590325df549989d18f4/psycopg2_binary-2.9.12-cp311-cp311-manylinux_2_38_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:5a0253224780c978746cb9be55a946bcdaf40fe3519c0f622924cdabdafe2c39", size = 4109308, upload-time = "2026-04-20T23:34:16.761Z" }, - { url = "https://files.pythonhosted.org/packages/b6/2e/b1dc289b362cc8d45697b57eefbd673186f49a4ea0906928988e3affcc98/psycopg2_binary-2.9.12-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:0dc9228d47c46bda253d2ecd6bb93b56a9f2d7ad33b684a1fa3622bf74ffe30c", size = 3654405, upload-time = "2026-04-20T23:34:19.303Z" }, - { url = "https://files.pythonhosted.org/packages/eb/e4/4c4aea6473214dbdbd0fbba11aa4691e76dc01722c55724c5951719865ff/psycopg2_binary-2.9.12-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:f921f3cd87035ef7df233383011d7a53ea1d346224752c1385f1edfd790ceb6a", size = 3299187, upload-time = "2026-04-20T23:34:21.206Z" }, - { url = "https://files.pythonhosted.org/packages/ba/5d/b03b99986446a4f57b170ed9a2579fb7ff9783ca0fa5226b19db99737fee/psycopg2_binary-2.9.12-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:3d999bd982a723113c1a45b55a7a6a90d64d0ed2278020ed625c490ff7bef96c", size = 3047716, upload-time = "2026-04-20T23:34:23.077Z" }, - { url = "https://files.pythonhosted.org/packages/14/86/382ee4afbd1d97500c9d2862b20c2fdeddf4b7335e984df3fb4309f64108/psycopg2_binary-2.9.12-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:29d4d134bd0ab46ffb04e94aa3c5fa3ef582e9026609165e2f758ff76fc3a3be", size = 3349237, upload-time = "2026-04-20T23:34:25.211Z" }, - { url = "https://files.pythonhosted.org/packages/a8/16/9a57c75ba1eda7165c017342f526810d5f5a12647dde749c99ae9a7141d7/psycopg2_binary-2.9.12-cp311-cp311-win_amd64.whl", hash = "sha256:cb4a1dacdd48077150dc762a9e5ddbf32c256d66cb46f80839391aa458774936", size = 2757036, upload-time = "2026-04-20T23:34:27.77Z" }, - { url = "https://files.pythonhosted.org/packages/e2/9f/ef4ef3c8e15083df90ca35265cfd1a081a2f0cc07bb229c6314c6af817f4/psycopg2_binary-2.9.12-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:5cdc05117180c5fa9c40eea8ea559ce64d73824c39d928b7da9fb5f6a9392433", size = 3712459, upload-time = "2026-04-20T23:34:30.549Z" }, - { url = "https://files.pythonhosted.org/packages/b5/01/3dd14e46ba48c1e1a6ec58ee599fa1b5efa00c246d5046cd903d0eeb1af1/psycopg2_binary-2.9.12-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:d3227a3bc228c10d21011a99245edca923e4e8bf461857e869a507d9a41fe9f6", size = 3822936, upload-time = "2026-04-20T23:34:32.77Z" }, - { url = "https://files.pythonhosted.org/packages/a6/f7/0640e4901119d8a9f7a1784b927f494e2198e213ceb593753d1f2c8b1b30/psycopg2_binary-2.9.12-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:995ce929eede89db6254b50827e2b7fd61e50d11f0b116b29fffe4a2e53c4580", size = 4578676, upload-time = "2026-04-20T23:34:35.18Z" }, - { url = "https://files.pythonhosted.org/packages/b0/55/44df3965b5f297c50cc0b1b594a31c67d6127a9d133045b8a66611b14dfb/psycopg2_binary-2.9.12-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:9fe06d93e72f1c048e731a2e3e7854a5bfaa58fc736068df90b352cefe66f03f", size = 4274917, upload-time = "2026-04-20T23:34:37.982Z" }, - { url = "https://files.pythonhosted.org/packages/b0/4b/74535248b1eac0c9336862e8617c765ac94dac76f9e25d7c4a79588c8907/psycopg2_binary-2.9.12-cp312-cp312-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:40e7b28b63aaf737cb3a1edc3a9bbc9a9f4ad3dcb7152e8c1130e4050eddcb7d", size = 5894843, upload-time = "2026-04-20T23:34:40.856Z" }, - { url = "https://files.pythonhosted.org/packages/f2/ba/f1bf8d2ae71868ad800b661099086ee52bc0f8d9f05be1acd8ebb06757cc/psycopg2_binary-2.9.12-cp312-cp312-manylinux_2_38_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:89d19a9f7899e8eb0656a2b3a08e0da04c720a06db6e0033eab5928aabe60fa9", size = 4110556, upload-time = "2026-04-20T23:34:44.016Z" }, - { url = "https://files.pythonhosted.org/packages/45/46/c15706c338403b7c420bcc0c2905aad116cc064545686d8bf85f1999ea00/psycopg2_binary-2.9.12-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:612b965daee295ae2da8f8218ce1d274645dc76ef3f1abf6a0a94fd57eff876d", size = 3655714, upload-time = "2026-04-20T23:34:46.233Z" }, - { url = "https://files.pythonhosted.org/packages/b3/7c/a2d5dc09b64a4564db242a0fe418fde7d33f6f8259dd2c5b9d7def00fb5a/psycopg2_binary-2.9.12-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:b9a339b79d37c1b45f3235265f07cdeb0cb5ad7acd2ac7720a5920989c17c24e", size = 3301154, upload-time = "2026-04-20T23:34:49.528Z" }, - { url = "https://files.pythonhosted.org/packages/c0/e8/cc8c9a4ce71461f9ec548d38cadc41dc184b34c73e6455450775a9334ccd/psycopg2_binary-2.9.12-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:3471336e1acfd9c7fe507b8bad5af9317b6a89294f9eb37bd9a030bb7bebcdc6", size = 3048882, upload-time = "2026-04-20T23:34:51.86Z" }, - { url = "https://files.pythonhosted.org/packages/19/6a/31e2296bc0787c5ab75d3d118e40b239db8151b5192b90b77c72bc9256e9/psycopg2_binary-2.9.12-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:7af18183109e23502c8b2ae7f6926c0882766f35b5175a4cd737ad825e4d7a1b", size = 3351298, upload-time = "2026-04-20T23:34:54.124Z" }, - { url = "https://files.pythonhosted.org/packages/5f/a8/75f4e3e11203b590150abed2cf7794b9c9c9f7eceddae955191138b44dde/psycopg2_binary-2.9.12-cp312-cp312-win_amd64.whl", hash = "sha256:398fcd4db988c7d7d3713e2b8e18939776fd3fb447052daae4f24fa39daede4c", size = 2757230, upload-time = "2026-04-20T23:34:56.242Z" }, - { url = "https://files.pythonhosted.org/packages/91/bb/4608c96f970f6e0c56572e87027ef4404f709382a3503e9934526d7ba051/psycopg2_binary-2.9.12-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:7c729a73c7b1b84de3582f73cdd27d905121dc2c531f3d9a3c32a3011033b965", size = 3712419, upload-time = "2026-04-20T23:34:58.754Z" }, - { url = "https://files.pythonhosted.org/packages/5e/af/48f76af9d50d61cf390f8cd657b503168b089e2e9298e48465d029fcc713/psycopg2_binary-2.9.12-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:4413d0caef93c5cf50b96863df4c2efe8c269bf2267df353225595e7e15e8df7", size = 3822990, upload-time = "2026-04-20T23:35:00.821Z" }, - { url = "https://files.pythonhosted.org/packages/7a/df/aba0f99397cd811d32e06fc0cc781f1f3ce98bc0e729cb423925085d781a/psycopg2_binary-2.9.12-cp313-cp313-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:4dfcf8e45ebb0c663be34a3442f65e17311f3367089cd4e5e3a3e8e62c978777", size = 4578696, upload-time = "2026-04-20T23:35:03.409Z" }, - { url = "https://files.pythonhosted.org/packages/95/9c/eaa74021ac4e4d5c2f83d82fc6615a63f4fe6c94dc4e94c3990427053f67/psycopg2_binary-2.9.12-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:c41321a14dd74aceb6a9a643b9253a334521babfa763fa873e33d89cfa122fb5", size = 4274982, upload-time = "2026-04-20T23:35:05.583Z" }, - { url = "https://files.pythonhosted.org/packages/35/ed/c25deff98bd26187ba48b3b250a3ffc3037c46c5b89362534a15d200e0db/psycopg2_binary-2.9.12-cp313-cp313-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:83946ba43979ebfdc99a3cd0ee775c89f221df026984ba19d46133d8d75d3cd9", size = 5894867, upload-time = "2026-04-20T23:35:07.902Z" }, - { url = "https://files.pythonhosted.org/packages/9a/81/8d0e21ca77373c6c9589e5c4528f6e8f0c08c62cafc76fb0bddb7a2cee22/psycopg2_binary-2.9.12-cp313-cp313-manylinux_2_38_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:411e85815652d13560fbe731878daa5d92378c4995a22302071890ec3397d019", size = 4110578, upload-time = "2026-04-20T23:35:10.149Z" }, - { url = "https://files.pythonhosted.org/packages/00/fc/f481e2435bd8f742d0123309174aae4165160ad3ef17c1b99c3622c241d2/psycopg2_binary-2.9.12-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:1c8ad4c08e00f7679559eaed7aff1edfffc60c086b976f93972f686384a95e2c", size = 3655816, upload-time = "2026-04-20T23:35:12.56Z" }, - { url = "https://files.pythonhosted.org/packages/53/79/b9f46466bdbe9f239c96cde8be33c1aace4842f06013b47b730dc9759187/psycopg2_binary-2.9.12-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:00814e40fa23c2b37ef0a1e3c749d89982c73a9cb5046137f0752a22d432e82f", size = 3301307, upload-time = "2026-04-20T23:35:15.029Z" }, - { url = "https://files.pythonhosted.org/packages/3f/19/7dc003b32fe35024df89b658104f7c8538a8b2dcbde7a4e746ce929742e7/psycopg2_binary-2.9.12-cp313-cp313-musllinux_1_2_riscv64.whl", hash = "sha256:98062447aebc20ed20add1f547a364fd0ef8933640d5372ff1873f8deb9b61be", size = 3048968, upload-time = "2026-04-20T23:35:16.757Z" }, - { url = "https://files.pythonhosted.org/packages/91/58/2dbd7db5c604d45f4950d988506aae672a14126ec22998ced5021cbb76bb/psycopg2_binary-2.9.12-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:66a7685d7e548f10fb4ce32fb01a7b7f4aa702134de92a292c7bd9e0d3dbd290", size = 3351369, upload-time = "2026-04-20T23:35:18.933Z" }, - { url = "https://files.pythonhosted.org/packages/42/ee/dee8dcaad07f735824de3d6563bc67119fa6c28257b17977a8d624f02fab/psycopg2_binary-2.9.12-cp313-cp313-win_amd64.whl", hash = "sha256:b6937f5fe4e180aeee87de907a2fa982ded6f7f15d7218f78a083e4e1d68f2a0", size = 2757347, upload-time = "2026-04-20T23:35:21.283Z" }, { url = "https://files.pythonhosted.org/packages/13/1b/708c0dca874acfad6d65314271859899a79007686f3a1f74e82a2ed4b645/psycopg2_binary-2.9.12-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:6f3b3de8a74ef8db215f22edffb19e32dc6fa41340456de7ec99efdc8a7b3ec2", size = 3712428, upload-time = "2026-04-20T23:35:23.453Z" }, { url = "https://files.pythonhosted.org/packages/d6/39/ddbea9d4b4de6aca9431b6ed253f530f8a02d3b8f9bcfd0dbfe2b3de6fe4/psycopg2_binary-2.9.12-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:1006fb62f0f0bc5ce256a832356c6262e91be43f5e4eb15b5eaf38079464caf2", size = 3823184, upload-time = "2026-04-20T23:35:25.92Z" }, { url = "https://files.pythonhosted.org/packages/bf/a0/bc2fef74b106fa345567122a0659e6d94512ed7dc0131ec44c9e5aba3725/psycopg2_binary-2.9.12-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:840066105706cd2eb29b9a1c2329620056582a4bf3e8169dec5c447042d0869f", size = 4579157, upload-time = "2026-04-20T23:35:28.542Z" }, @@ -3294,15 +2372,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/8e/37/efad0257dc6e593a18957422533ff0f87ede7c9c6ea010a2177d738fb82f/pure_eval-0.2.3-py3-none-any.whl", hash = "sha256:1db8e35b67b3d218d818ae653e27f06c3aa420901fa7b081ca98cbedc874e0d0", size = 11842, upload-time = "2024-07-21T12:58:20.04Z" }, ] -[[package]] -name = "pycodestyle" -version = "2.14.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/11/e0/abfd2a0d2efe47670df87f3e3a0e2edda42f055053c85361f19c0e2c1ca8/pycodestyle-2.14.0.tar.gz", hash = "sha256:c4b5b517d278089ff9d0abdec919cd97262a3367449ea1c8b49b91529167b783", size = 39472, upload-time = "2025-06-20T18:49:48.75Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/d7/27/a58ddaf8c588a3ef080db9d0b7e0b97215cee3a45df74f3a94dbbf5c893a/pycodestyle-2.14.0-py2.py3-none-any.whl", hash = "sha256:dd6bf7cb4ee77f8e016f9c8e74a35ddd9f67e1d5fd4184d86c3b98e07099f42d", size = 31594, upload-time = "2025-06-20T18:49:47.491Z" }, -] - [[package]] name = "pycparser" version = "3.0" @@ -3336,51 +2405,6 @@ dependencies = [ ] sdist = { url = "https://files.pythonhosted.org/packages/9d/56/921726b776ace8d8f5db44c4ef961006580d91dc52b803c489fafd1aa249/pydantic_core-2.46.4.tar.gz", hash = "sha256:62f875393d7f270851f20523dd2e29f082bcc82292d66db2b64ea71f64b6e1c1", size = 471464, upload-time = "2026-05-06T13:37:06.98Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/5c/fa/6d7708d2cfc1a832acb6aeb0cd16e801902df8a0f583bb3b4b527fde022e/pydantic_core-2.46.4-cp311-cp311-macosx_10_12_x86_64.whl", hash = "sha256:0e96592440881c74a213e5ad528e2b24d3d4f940de2766bed9010ab1d9e51594", size = 2111872, upload-time = "2026-05-06T13:40:27.596Z" }, - { url = "https://files.pythonhosted.org/packages/ae/6f/aa064a3e74b5745afbdf250594f38e7ead05e2d651bcb35994b9417a0d4d/pydantic_core-2.46.4-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:e0d65b8c354be7fb5f720c3caa8bc940bc2d20ce749c8e06135f07f8ed95dd7c", size = 1948255, upload-time = "2026-05-06T13:39:12.574Z" }, - { url = "https://files.pythonhosted.org/packages/43/3a/41114a9f7569b84b4d84e7a018c57c56347dac30c0d4a872946ec4e36c46/pydantic_core-2.46.4-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7bfb192b3f4b9e8a89b6277b6ce787564f62cfd272055f6e685726b111dc7826", size = 1972827, upload-time = "2026-05-06T13:38:19.841Z" }, - { url = "https://files.pythonhosted.org/packages/ef/25/1ab42e8048fe551934d9884e8d64daa7e990ad386f310a15981aeb6a5b08/pydantic_core-2.46.4-cp311-cp311-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:9037063db01f09b09e237c282b6792bd4da634b5402c4e7f0c61effed7701a04", size = 2041051, upload-time = "2026-05-06T13:38:10.447Z" }, - { url = "https://files.pythonhosted.org/packages/94/c2/1a934597ddf08da410385b3b7aae91956a5a76c635effef456074fad7e88/pydantic_core-2.46.4-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:fc010ab034c8c7452522748bf937df58020d256ccae0874463d1f4d01758af8e", size = 2221314, upload-time = "2026-05-06T13:40:13.089Z" }, - { url = "https://files.pythonhosted.org/packages/02/6d/9e8ad178c9c4df27ad3c8f25d1fe2a7ab0d2ba0559fad4aee5d3d1f16771/pydantic_core-2.46.4-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:8c5dac79fa1614d1e06ca695109c6105923bd9c7d1d6c918d4e637b7e6b32fd3", size = 2285146, upload-time = "2026-05-06T13:38:59.224Z" }, - { url = "https://files.pythonhosted.org/packages/80/50/540cd3aeefc041beb111125c4bff779831a2111fc6b15a9138cda277d32c/pydantic_core-2.46.4-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f9fa868638bf362d3d138ea55829cefb3d5f4b0d7f142234382a15e2485dbec4", size = 2089685, upload-time = "2026-05-06T13:38:17.762Z" }, - { url = "https://files.pythonhosted.org/packages/6b/a4/b440ad35f05f6a38f89fa0f149accb3f0e02be94ca5e15f3c449a61b4bc9/pydantic_core-2.46.4-cp311-cp311-manylinux_2_31_riscv64.whl", hash = "sha256:17299feefe090f2caa5b8e37222bb5f663e4935a8bfa6931d4102e5df1a9f398", size = 2115420, upload-time = "2026-05-06T13:37:58.195Z" }, - { url = "https://files.pythonhosted.org/packages/99/61/de4f55db8dfd57bfdfa9a12ec90fe1b57c4f41062f7ca86f08586b3e0ac0/pydantic_core-2.46.4-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:4c63ebc82684aa89d9a3bcbd13d515b3be44250dc68dd3bd81526c1cb31286c3", size = 2165122, upload-time = "2026-05-06T13:37:01.167Z" }, - { url = "https://files.pythonhosted.org/packages/f7/52/7c529d7bdb2d1068bd52f51fe32572c8301f9a4febf1948f10639f1436f5/pydantic_core-2.46.4-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:aaa2a54443eff1950ba5ddc6b6ccda0d9c84a364276a62f969bdf2a390650848", size = 2182573, upload-time = "2026-05-06T13:38:45.04Z" }, - { url = "https://files.pythonhosted.org/packages/37/b3/7c40325848ba78247f2812dcf9c7274e38cd801820ca6dd9fe63bcfb0eb4/pydantic_core-2.46.4-cp311-cp311-musllinux_1_1_armv7l.whl", hash = "sha256:18e5ceec2ab67e6d5f1a9085e5a24c9c4e2ac4545730bfe668680bca05e555f3", size = 2317139, upload-time = "2026-05-06T13:37:15.539Z" }, - { url = "https://files.pythonhosted.org/packages/d9/37/f913f81a657c865b75da6c0dbed79876073c2a43b5bd9edbe8da785e4d49/pydantic_core-2.46.4-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:a0f62d0a58f4e7da165457e995725421e0064f2255d8eccebc49f41bbc23b109", size = 2360433, upload-time = "2026-05-06T13:37:30.099Z" }, - { url = "https://files.pythonhosted.org/packages/c4/67/6acaa1be2567f9256b056d8477158cac7240813956ce86e49deae8e173b4/pydantic_core-2.46.4-cp311-cp311-win32.whl", hash = "sha256:041bde0a48fd37cf71cab1c9d56d3e8625a3793fef1f7dd232b3ff37e978ecda", size = 1985513, upload-time = "2026-05-06T13:38:15.669Z" }, - { url = "https://files.pythonhosted.org/packages/aa/e6/c505f83dfeda9a2e5c995cfd872949e4d05e12f7feb3dca72f633daefa94/pydantic_core-2.46.4-cp311-cp311-win_amd64.whl", hash = "sha256:6f2eeda33a839975441c86a4119e1383c50b47faf0cbb5176985565c6bb02c33", size = 2071114, upload-time = "2026-05-06T13:40:35.416Z" }, - { url = "https://files.pythonhosted.org/packages/0f/da/7a263a96d965d9d0df5e8de8a475f33495451117035b09acb110288c381f/pydantic_core-2.46.4-cp311-cp311-win_arm64.whl", hash = "sha256:14f4c5d6db102bd796a627bbb3a17b4cf4574b9ae861d8b7c9a9661c6dd3362d", size = 2044298, upload-time = "2026-05-06T13:38:29.754Z" }, - { url = "https://files.pythonhosted.org/packages/ce/8c/af022f0af448d7747c5154288d46b5f2bc5f17366eaa0e23e9aa04d59f3b/pydantic_core-2.46.4-cp312-cp312-macosx_10_12_x86_64.whl", hash = "sha256:3245406455a5d98187ec35530fd772b1d799b26667980872c8d4614991e2c4a2", size = 2106158, upload-time = "2026-05-06T13:38:57.215Z" }, - { url = "https://files.pythonhosted.org/packages/19/95/6195171e385007300f0f5574592e467c568becce2d937a0b6804f218bc49/pydantic_core-2.46.4-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:962ccbab7b642487b1d8b7df90ef677e03134cf1fd8880bf698649b22a69371f", size = 1951724, upload-time = "2026-05-06T13:37:02.697Z" }, - { url = "https://files.pythonhosted.org/packages/8e/bc/f47d1ff9cbb1620e1b5b697eef06010035735f07820180e74178226b27b3/pydantic_core-2.46.4-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8233f2947cf85404441fd7e0085f53b10c93e0ee78611099b5c7237e36aacbf7", size = 1975742, upload-time = "2026-05-06T13:37:09.448Z" }, - { url = "https://files.pythonhosted.org/packages/5b/11/9b9a5b0306345664a2da6410877af6e8082481b5884b3ddd78d47c6013ce/pydantic_core-2.46.4-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:3a233125ac121aa3ffba9a2b59edfc4a985a76092dc8279586ab4b71390875e7", size = 2052418, upload-time = "2026-05-06T13:37:38.234Z" }, - { url = "https://files.pythonhosted.org/packages/f1/b7/a65fec226f5d78fc39f4a13c4cc0c768c22b113438f60c14adc9d2865038/pydantic_core-2.46.4-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:5b712b53160b79a5850310b912a5ef8e57e56947c8ad690c227f5c9d7e561712", size = 2232274, upload-time = "2026-05-06T13:38:27.753Z" }, - { url = "https://files.pythonhosted.org/packages/68/f0/92039db98b907ef49269a8271f67db9cb78ae2fc68062ef7e4e77adb5f61/pydantic_core-2.46.4-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9401557acd873c3a7f3eb9383edef8ac4968f9510e340f4808d427e75667e7b4", size = 2309940, upload-time = "2026-05-06T13:38:05.353Z" }, - { url = "https://files.pythonhosted.org/packages/5f/97/2aab507d3d00ca626e8e57c1eac6a79e4e5fbcc63eb99733ff55d1717f65/pydantic_core-2.46.4-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:926c9541b14b12b1681dca8a0b75feb510b06c6341b70a8e500c2fdcff837cce", size = 2094516, upload-time = "2026-05-06T13:39:10.577Z" }, - { url = "https://files.pythonhosted.org/packages/22/37/a8aca44d40d737dde2bc05b3c6c07dff0de07ce6f82e9f3167aeaf4d5dea/pydantic_core-2.46.4-cp312-cp312-manylinux_2_31_riscv64.whl", hash = "sha256:56cb4851bcaf3d117eddcef4fe66afd750a50274b0da8e22be256d10e5611987", size = 2136854, upload-time = "2026-05-06T13:40:22.59Z" }, - { url = "https://files.pythonhosted.org/packages/24/99/fcef1b79238c06a8cbec70819ac722ba76e02bc8ada9b0fd66eba40da01b/pydantic_core-2.46.4-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:c68fcd102d71ea85c5b2dfac3f4f8476eff42a9e078fd5faefff6d145063536b", size = 2180306, upload-time = "2026-05-06T13:40:10.666Z" }, - { url = "https://files.pythonhosted.org/packages/ae/6c/fc44000918855b42779d007ae63b0532794739027b2f417321cddbc44f6a/pydantic_core-2.46.4-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:b2f69dec1725e79a012d920df1707de5caf7ed5e08f3be4435e25803efc47458", size = 2190044, upload-time = "2026-05-06T13:40:43.231Z" }, - { url = "https://files.pythonhosted.org/packages/6b/65/d9cadc9f1920d7a127ad2edba16c1db7916e59719285cd6c94600b0080ba/pydantic_core-2.46.4-cp312-cp312-musllinux_1_1_armv7l.whl", hash = "sha256:8d0820e8192167f80d88d64038e609c31452eeca865b4e1d9950a27a4609b00b", size = 2329133, upload-time = "2026-05-06T13:39:57.365Z" }, - { url = "https://files.pythonhosted.org/packages/d0/cf/c873d91679f3a30bcf5e7ac280ce5573483e72295307685120d0d5ad3416/pydantic_core-2.46.4-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:fbdb89b3e1c94a30cc5edfce477c6e6a5dc4d8f84665b455c27582f211a1c72c", size = 2374464, upload-time = "2026-05-06T13:38:06.976Z" }, - { url = "https://files.pythonhosted.org/packages/47/bd/6f2fc8188f31bf10590f1e98e7b306336161fac930a8c514cd7bd828c7dc/pydantic_core-2.46.4-cp312-cp312-win32.whl", hash = "sha256:9aa768456404a8bf48a4406685ac2bec8e72b62c69313734fa3b73cf33b3a894", size = 1974823, upload-time = "2026-05-06T13:40:47.985Z" }, - { url = "https://files.pythonhosted.org/packages/40/8c/985c1d41ea1107c2534abd9870e4ed5c8e7669b5c308297835c001e7a1c4/pydantic_core-2.46.4-cp312-cp312-win_amd64.whl", hash = "sha256:e9c26f834c65f5752f3f06cb08cb86a913ceb7274d0db6e267808a708b46bc89", size = 2072919, upload-time = "2026-05-06T13:39:21.153Z" }, - { url = "https://files.pythonhosted.org/packages/c4/ba/f463d006e0c47373ca7ec5e1a261c59dc01ef4d62b2657af925fb0deee3a/pydantic_core-2.46.4-cp312-cp312-win_arm64.whl", hash = "sha256:4fc73cb559bdb54b1134a706a2802a4cddd27a0633f5abb7e53056268751ac6a", size = 2027604, upload-time = "2026-05-06T13:39:03.753Z" }, - { url = "https://files.pythonhosted.org/packages/51/a2/5d30b469c5267a17b39dec53208222f76a8d351dfac4af661888c5aee77d/pydantic_core-2.46.4-cp313-cp313-macosx_10_12_x86_64.whl", hash = "sha256:5d5902252db0d3cedf8d4a1bc68f70eeb430f7e4c7104c8c476753519b423008", size = 2106306, upload-time = "2026-05-06T13:37:48.029Z" }, - { url = "https://files.pythonhosted.org/packages/c1/81/4fa520eaffa8bd7d1525e644cd6d39e7d60b1592bc5b516693c7340b50f1/pydantic_core-2.46.4-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:c94f0688e7b8d0a67abf40e57a7eaaecd17cc9586706a31b76c031f63df052b4", size = 1951906, upload-time = "2026-05-06T13:37:17.012Z" }, - { url = "https://files.pythonhosted.org/packages/03/d5/fd02da45b659668b05923b17ba3a0100a0a3d5541e3bd8fcc4ecb711309e/pydantic_core-2.46.4-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f027324c56cd5406ca49c124b0db10e56c69064fec039acc571c29020cc87c76", size = 1976802, upload-time = "2026-05-06T13:37:35.113Z" }, - { url = "https://files.pythonhosted.org/packages/21/f2/95727e1368be3d3ed485eaab7adbd7dda408f33f7a36e8b48e0144002b91/pydantic_core-2.46.4-cp313-cp313-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:e739fee756ba1010f8bcccb534252e85a35fe45ae92c295a06059ce58b74ccd3", size = 2052446, upload-time = "2026-05-06T13:37:12.313Z" }, - { url = "https://files.pythonhosted.org/packages/9c/86/5d99feea3f77c7234b8718075b23db11532773c1a0dbd9b9490215dc2eeb/pydantic_core-2.46.4-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:9d56801be94b86a9da183e5f3766e6310752b99ff647e38b09a9500d88e46e76", size = 2232757, upload-time = "2026-05-06T13:39:01.149Z" }, - { url = "https://files.pythonhosted.org/packages/d2/3a/508ac615935ef7588cf6d9e9b91309fdc2da751af865e02a9098de88258c/pydantic_core-2.46.4-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2412e734dcb48da14d4e4006b82b46b74f2518b8a26ee7e58c6844a6cd6d03c4", size = 2309275, upload-time = "2026-05-06T13:37:41.406Z" }, - { url = "https://files.pythonhosted.org/packages/07/f8/41db9de19d7987d6b04715a02b3b40aea467000275d9d758ffaa31af7d50/pydantic_core-2.46.4-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9551187363ffc0de2a00b2e47c25aeaeb1020b69b668762966df15fc5659dd5a", size = 2094467, upload-time = "2026-05-06T13:39:18.847Z" }, - { url = "https://files.pythonhosted.org/packages/2c/e2/f35033184cb11d0052daf4416e8e10a502ea2ac006fc4f459aee872727d1/pydantic_core-2.46.4-cp313-cp313-manylinux_2_31_riscv64.whl", hash = "sha256:0186750b482eefa11d7f435892b09c5c606193ef3375bcf94aa00ae6bfb66262", size = 2134417, upload-time = "2026-05-06T13:40:17.944Z" }, - { url = "https://files.pythonhosted.org/packages/7e/7b/6ceeb1cc90e193862f444ebe373d8fdf613f0a82572dde03fb10734c6c71/pydantic_core-2.46.4-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:5855698a4856556d86e8e6cd8434bc3ac0314ee8e12089ae0e143f64c6256e4e", size = 2179782, upload-time = "2026-05-06T13:40:32.618Z" }, - { url = "https://files.pythonhosted.org/packages/5a/f2/c8d7773ede6af08036423a00ae0ceffce266c3c52a096c435d68c896083f/pydantic_core-2.46.4-cp313-cp313-musllinux_1_1_aarch64.whl", hash = "sha256:cbaf13819775b7f769bf4a1f066cb6df7a28d4480081a589828ef190226881cd", size = 2188782, upload-time = "2026-05-06T13:36:51.018Z" }, - { url = "https://files.pythonhosted.org/packages/59/31/0c864784e31f09f05cdd87606f08923b9c9e7f6e51dd27f20f62f975ce9f/pydantic_core-2.46.4-cp313-cp313-musllinux_1_1_armv7l.whl", hash = "sha256:633147d34cf4550417f12e2b1a0383973bdf5cdfde212cb09e9a581cf10820be", size = 2328334, upload-time = "2026-05-06T13:40:37.764Z" }, - { url = "https://files.pythonhosted.org/packages/c2/eb/4f6c8a41efa30baa755590f4141abf3a8c370fab610915733e74134a7270/pydantic_core-2.46.4-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:82cf5301172168103724d49a1444d3378cb20cdee30b116a1bd6031236298a5d", size = 2372986, upload-time = "2026-05-06T13:39:34.152Z" }, - { url = "https://files.pythonhosted.org/packages/5b/24/b375a480d53113860c299764bfe9f349a3dc9108b3adc0d7f0d786492ebf/pydantic_core-2.46.4-cp313-cp313-win32.whl", hash = "sha256:9fa8ae11da9e2b3126c6426f147e0fba88d96d65921799bb30c6abd1cb2c97fb", size = 1973693, upload-time = "2026-05-06T13:37:55.072Z" }, - { url = "https://files.pythonhosted.org/packages/7e/e8/cff247591966f2d22ec8c003cd7587e27b7ba7b81ab2fb888e3ab75dc285/pydantic_core-2.46.4-cp313-cp313-win_amd64.whl", hash = "sha256:6b3ace8194b0e5204818c92802dcdca7fc6d88aabbb799d7c795540d9cd6d292", size = 2071819, upload-time = "2026-05-06T13:38:49.139Z" }, - { url = "https://files.pythonhosted.org/packages/c6/1a/f4aee670d5670e9e148e0c82c7db98d780be566c6e6a97ee8035528ca0b3/pydantic_core-2.46.4-cp313-cp313-win_arm64.whl", hash = "sha256:184c081504d17f1c1066e430e117142b2c77d9448a97f7b65c6ac9fd9aee238d", size = 2027411, upload-time = "2026-05-06T13:40:45.796Z" }, { url = "https://files.pythonhosted.org/packages/8d/74/228a26ddad29c6672b805d9fd78e8d251cd04004fa7eed0e622096cd0250/pydantic_core-2.46.4-cp314-cp314-macosx_10_12_x86_64.whl", hash = "sha256:428e04521a40150c85216fc8b85e8d39fece235a9cf5e383761238c7fa9b96fb", size = 2102079, upload-time = "2026-05-06T13:38:41.019Z" }, { url = "https://files.pythonhosted.org/packages/ad/1f/8970b150a4b4365623ae00fc88603491f763c627311ae8031e3111356d6e/pydantic_core-2.46.4-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:23ace664830ee0bfe014a0c7bc248b1f7f25ed7ad103852c317624a1083af462", size = 1952179, upload-time = "2026-05-06T13:36:59.812Z" }, { url = "https://files.pythonhosted.org/packages/95/30/5211a831ae054928054b2f79731661087a2bc5c01e825c672b3a4a8f1b3e/pydantic_core-2.46.4-cp314-cp314-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ce5c1d2a8b27468f433ca974829c44060b8097eedc39933e3c206a90ee49c4a9", size = 1978926, upload-time = "2026-05-06T13:37:39.933Z" }, @@ -3411,22 +2435,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/30/a6/9f9f380dbb301f67023bf8f707aaa75daadf84f7152d95c410fd7e81d994/pydantic_core-2.46.4-cp314-cp314t-win32.whl", hash = "sha256:e846ae7835bf0703ae43f534ab79a867146dadd59dc9ca5c8b53d5c8f7c9ef02", size = 1955575, upload-time = "2026-05-06T13:38:51.116Z" }, { url = "https://files.pythonhosted.org/packages/40/1f/f1eb9eb350e795d1af8586289746f5c5677d16043040d63710e22abc43c9/pydantic_core-2.46.4-cp314-cp314t-win_amd64.whl", hash = "sha256:2108ba5c1c1eca18030634489dc544844144ee36357f2f9f780b93e7ddbb44b5", size = 2051624, upload-time = "2026-05-06T13:38:21.672Z" }, { url = "https://files.pythonhosted.org/packages/f6/d2/42dd53d0a85c27606f316d3aa5d2869c4e8470a5ed6dec30e4a1abe19192/pydantic_core-2.46.4-cp314-cp314t-win_arm64.whl", hash = "sha256:4fcbe087dbc2068af7eda3aa87634eba216dbda64d1ae73c8684b621d33f6596", size = 2017325, upload-time = "2026-05-06T13:40:52.723Z" }, - { url = "https://files.pythonhosted.org/packages/ee/a4/73995fd4ebbb46ba0ee51e6fa049b8f02c40daebb762208feda8a6b7894d/pydantic_core-2.46.4-graalpy311-graalpy242_311_native-macosx_10_12_x86_64.whl", hash = "sha256:14d4edf427bdcf950a8a02d7cb44a08614388dd6e1bdcbf4f67504fa7887da9c", size = 2111589, upload-time = "2026-05-06T13:37:10.817Z" }, - { url = "https://files.pythonhosted.org/packages/fb/7f/f37d3a5e8bfcc2e403f5c57a730f2d815693fb42119e8ea48b3789335af1/pydantic_core-2.46.4-graalpy311-graalpy242_311_native-macosx_11_0_arm64.whl", hash = "sha256:0ce40cd7b21210e99342afafbd4d0f76d784eb5b1d60f3bdc566be4983c6c73b", size = 1944552, upload-time = "2026-05-06T13:36:56.717Z" }, - { url = "https://files.pythonhosted.org/packages/15/3c/d7eb777b3ff43e8433a4efb39a17aa8fd98a4ee8561a24a67ef5db07b2d6/pydantic_core-2.46.4-graalpy311-graalpy242_311_native-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:90884113d8b48f760e9587002789ddd741e76ab9f89518cd1e43b1f1a52ec44b", size = 1982984, upload-time = "2026-05-06T13:39:06.207Z" }, - { url = "https://files.pythonhosted.org/packages/63/87/70b9f40170a81afd55ca26c9b2acb25c20d64bcfbf888fafecb3ba077d4c/pydantic_core-2.46.4-graalpy311-graalpy242_311_native-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:66ce7632c22d837c95301830e111ad0128a32b8207533b60896a96c4915192ea", size = 2138417, upload-time = "2026-05-06T13:39:45.476Z" }, - { url = "https://files.pythonhosted.org/packages/9d/1d/8987ad40f65ae1432753072f214fb5c74fe47ffbd0698bb9cbbb585664f8/pydantic_core-2.46.4-graalpy312-graalpy250_312_native-macosx_10_12_x86_64.whl", hash = "sha256:1d8ba486450b14f3b1d63bc521d410ec7565e52f887b9fb671791886436a42f7", size = 2095527, upload-time = "2026-05-06T13:39:52.283Z" }, - { url = "https://files.pythonhosted.org/packages/64/d3/84c282a7eee1d3ac4c0377546ef5a1ea436ce26840d9ac3b7ed54a377507/pydantic_core-2.46.4-graalpy312-graalpy250_312_native-macosx_11_0_arm64.whl", hash = "sha256:3009f12e4e90b7f88b4f9adb1b0c4a3d58fe7820f3238c190047209d148026df", size = 1936024, upload-time = "2026-05-06T13:40:15.671Z" }, - { url = "https://files.pythonhosted.org/packages/d7/ca/eac61596cdeb4d7e174d3dc0bd8a6238f14f75f97a24e7b7db4c7e7340a0/pydantic_core-2.46.4-graalpy312-graalpy250_312_native-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ad785e92e6dc634c21555edc8bd6b64957ab844541bcb96a1366c202951ae526", size = 1990696, upload-time = "2026-05-06T13:38:34.717Z" }, - { url = "https://files.pythonhosted.org/packages/fa/c3/7c8b240552251faf6b3a957db200fcfbbcec36763c050428b601e0c9b83b/pydantic_core-2.46.4-graalpy312-graalpy250_312_native-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:00c603d540afdd6b80eb39f078f33ebd46211f02f33e34a32d9f053bba711de0", size = 2147590, upload-time = "2026-05-06T13:39:29.883Z" }, - { url = "https://files.pythonhosted.org/packages/11/cb/428de0385b6c8d44b716feba566abfacfbd23ee3c4439faa789a1456242f/pydantic_core-2.46.4-pp311-pypy311_pp73-macosx_10_12_x86_64.whl", hash = "sha256:0c563b08bca408dc7f65f700633d8442fffb2421fc47b8101377e9fd65051ff0", size = 2112782, upload-time = "2026-05-06T13:37:04.016Z" }, - { url = "https://files.pythonhosted.org/packages/0b/b5/6a17bdadd0fc1f170adfd05a20d37c832f52b117b4d9131da1f41bb097ce/pydantic_core-2.46.4-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:db06ffe51636ffe9ca531fe9023dd64bdd794be8754cb5df57c5498ae5b518a7", size = 1952146, upload-time = "2026-05-06T13:39:43.092Z" }, - { url = "https://files.pythonhosted.org/packages/2a/dc/03734d80e362cd43ef65428e9de77c730ce7f2f11c60d2b1e1b39f0fbf99/pydantic_core-2.46.4-pp311-pypy311_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:133878133d271ade3d41d1bfb2a45ec38dbdbda40bc065921c6b04e4630127e2", size = 2134492, upload-time = "2026-05-06T13:36:58.124Z" }, - { url = "https://files.pythonhosted.org/packages/de/df/5e5ffc085ed07cc22d298134d3d911c63e91f6a0eb91fe646750a3209910/pydantic_core-2.46.4-pp311-pypy311_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:9bc519fbf2b7578398853d815009ae5e4d4603d12f4e3f91da8c06852d3da3e9", size = 2156604, upload-time = "2026-05-06T13:37:49.88Z" }, - { url = "https://files.pythonhosted.org/packages/81/44/6e112a4253e56f5705467cbab7ab5e91ee7398ba3d56d358635958893d3e/pydantic_core-2.46.4-pp311-pypy311_pp73-musllinux_1_1_aarch64.whl", hash = "sha256:c7a7bd4e39e8e4c12c39cd480356842b6a8a06e41b23a55a5e3e191718838ddf", size = 2183828, upload-time = "2026-05-06T13:37:43.053Z" }, - { url = "https://files.pythonhosted.org/packages/ac/ad/5565071e937d8e752842ac241463944c9eb14c87e2d269f2658a5bd05e98/pydantic_core-2.46.4-pp311-pypy311_pp73-musllinux_1_1_armv7l.whl", hash = "sha256:d396ec2b979760aaf3218e76c24e65bd0aca24983298653b3a9d7a45f9e47b30", size = 2310000, upload-time = "2026-05-06T13:37:56.694Z" }, - { url = "https://files.pythonhosted.org/packages/4f/c3/66883a5cec183e7fba4d024b4cbbe61851a63750ef606b0afecc46d1f2bf/pydantic_core-2.46.4-pp311-pypy311_pp73-musllinux_1_1_x86_64.whl", hash = "sha256:86e1a4418c6cd97d60c95c71164158eaf7324fae7b0923264016baa993eba6fc", size = 2361286, upload-time = "2026-05-06T13:40:05.667Z" }, - { url = "https://files.pythonhosted.org/packages/4b/2d/69abac8f838090bbecd5df894befb2c2619e7996a98ddb949db9f3b93225/pydantic_core-2.46.4-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:d51026d73fcfd93610abc7b27789c26b313920fcfb20e27462d74a7f8b06e983", size = 2193071, upload-time = "2026-05-06T13:38:08.682Z" }, ] [[package]] @@ -3444,12 +2452,12 @@ wheels = [ ] [[package]] -name = "pyflakes" -version = "3.4.0" +name = "pydocstringformatter" +version = "0.7.5" source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/45/dc/fd034dc20b4b264b3d015808458391acbf9df40b1e54750ef175d39180b1/pyflakes-3.4.0.tar.gz", hash = "sha256:b24f96fafb7d2ab0ec5075b7350b3d2d2218eab42003821c06344973d3ea2f58", size = 64669, upload-time = "2025-06-20T18:45:27.834Z" } +sdist = { url = "https://files.pythonhosted.org/packages/b0/37/f6d5ff68893c8b4ae194d6dd9df31be2cceacfae5256c840b9e216fd20de/pydocstringformatter-0.7.5.tar.gz", hash = "sha256:e9cbd134d6279360fd2bcaad94680cec02aa20a22560375c5ffd495fcfbcf92d", size = 30474, upload-time = "2025-07-12T10:12:46.089Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/c2/2f/81d580a0fb83baeb066698975cb14a618bdbed7720678566f1b046a95fe8/pyflakes-3.4.0-py2.py3-none-any.whl", hash = "sha256:f742a7dbd0d9cb9ea41e9a24a918996e8170c799fa528688d40dd582c8265f4f", size = 63551, upload-time = "2025-06-20T18:45:26.937Z" }, + { url = "https://files.pythonhosted.org/packages/81/ed/e70e413b537b7809badcd275a5f050301dafbe54efd1ae9d392ed2943c40/pydocstringformatter-0.7.5-py3-none-any.whl", hash = "sha256:7daed355f11244f64571d119e49e7328365ea9b545f88256a47b550f213d23eb", size = 31433, upload-time = "2025-07-12T10:12:44.619Z" }, ] [[package]] @@ -3499,21 +2507,6 @@ dependencies = [ ] sdist = { url = "https://files.pythonhosted.org/packages/74/ed/b52bb7ab2b9ca0e69ea54b919ddba13c5636b960f7b9f4fab0d0aa0a502b/pymatgen_core-2026.5.18.tar.gz", hash = "sha256:bdbe8c591bbac7ed65922d710e94b661bb540baae27217ceadd59e31e9c3ff07", size = 2860012, upload-time = "2026-05-18T23:39:30.786Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/9d/14/1f02bea594033a000c68980a362ae670be7832e72281c8acbad35fbfb218/pymatgen_core-2026.5.18-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:d712b5098a281f6f499f039b079d9c45d8d45d83d378de42261c5aa9333e3ce1", size = 2923247, upload-time = "2026-05-18T23:39:28.443Z" }, - { url = "https://files.pythonhosted.org/packages/0d/bd/fc63c1c6be5bf0aeb810f12374f14ad3a0bad7b14736649e2ebe960f51d0/pymatgen_core-2026.5.18-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:69a51c5332bc9666f05f07d3e0a5f9eef28c44681bfe05781628b9e2846df07b", size = 4434150, upload-time = "2026-05-19T02:15:06.754Z" }, - { url = "https://files.pythonhosted.org/packages/f5/c0/9a6668d441d51f87eebd3263cd49399179f980764d3ab0d3b9d1faa1e0fe/pymatgen_core-2026.5.18-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:f31bbf0821eeb5570defaa511e2152480cc39e1127d78551f01343a961e165f6", size = 4462716, upload-time = "2026-05-19T02:15:08.724Z" }, - { url = "https://files.pythonhosted.org/packages/c9/a2/6671b3059d1e87964cd8589ec622958ecd4755b84078b092d2e679999e4e/pymatgen_core-2026.5.18-cp311-cp311-win32.whl", hash = "sha256:f0956528c54ced5bbf648f947f05935ab8159656a8df24cf22cb251ec9d74a5d", size = 2858798, upload-time = "2026-05-19T02:15:10.602Z" }, - { url = "https://files.pythonhosted.org/packages/75/26/86520647872bdae9669009beaa01250d37ad6e1b3942a9c88c6610c757c0/pymatgen_core-2026.5.18-cp311-cp311-win_amd64.whl", hash = "sha256:d0b5991048433a0cfd153eb0bb5920740042ea67521d78a04de5390f70461b2a", size = 2900587, upload-time = "2026-05-19T02:15:12.385Z" }, - { url = "https://files.pythonhosted.org/packages/23/00/35ccf35580d6caa1a88ea427df9e23628d64aef53b5752d377581f013098/pymatgen_core-2026.5.18-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:26709975fb33070fdf1b1bde301694ef5774d39b91d6dc7b27876bf30fb068ad", size = 2927363, upload-time = "2026-05-19T02:15:14.143Z" }, - { url = "https://files.pythonhosted.org/packages/23/06/2931ca449754e2b7d895d2185c99515b0d12a3c44a2e05142cc756e2d137/pymatgen_core-2026.5.18-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:938688b6d897183f9612122cdeee7613967e189932842eaf40008210d257e5aa", size = 4434814, upload-time = "2026-05-19T02:15:15.673Z" }, - { url = "https://files.pythonhosted.org/packages/ca/21/a54cf445b00d6bdf71fafc35079f4e810755947d0f4758447dfe12ac44b6/pymatgen_core-2026.5.18-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:070230f3ecaec435f5896d9579f614e14020cc079e6443c15b9ea971841812c0", size = 4481429, upload-time = "2026-05-19T02:15:17.313Z" }, - { url = "https://files.pythonhosted.org/packages/4d/22/5c8c8abd8367e387ec97c32c8504c1f1ef821fc41e8bd325fe40c6aa866f/pymatgen_core-2026.5.18-cp312-cp312-win32.whl", hash = "sha256:21615334c07d2211f2c9420181cab3f1aace66a7a3673f8cdbbeb27741681ed0", size = 2857740, upload-time = "2026-05-19T02:15:19.333Z" }, - { url = "https://files.pythonhosted.org/packages/26/6e/c0502db344f707469683c26bb685f918b6bdfb79211a2fa9fafe63636d3c/pymatgen_core-2026.5.18-cp312-cp312-win_amd64.whl", hash = "sha256:46e87242e881b44034cf9a9480c0bbc39f566c2918126689aa6898b3538e18ec", size = 2900927, upload-time = "2026-05-19T02:15:21.179Z" }, - { url = "https://files.pythonhosted.org/packages/7d/93/bb20fe038df5c36214fcded3c1b23623fdc00465bf300a1e3603dadf42c2/pymatgen_core-2026.5.18-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:531ab9284e48890bd29a537f6183c52fd9e5488cb86d125ac2c7ebe0a2bfd239", size = 2925181, upload-time = "2026-05-19T02:15:23.288Z" }, - { url = "https://files.pythonhosted.org/packages/81/d8/7a6eab09b88ca5a4997e19f080cb43eccbda1f70fcd213b14df36db14616/pymatgen_core-2026.5.18-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:1f5eced053f989fb5818ced84cc26dc88a06522740c24a0b410674b386ad331d", size = 4416899, upload-time = "2026-05-19T02:15:25.216Z" }, - { url = "https://files.pythonhosted.org/packages/9d/5b/17bdac8864553080fe076cd511052dc031bf7f422ebf14d3bc801a1f0874/pymatgen_core-2026.5.18-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:123be72bb2df4f22534f0926c2ffc188594251f2998ab7d9df6f76db81ae466b", size = 4462454, upload-time = "2026-05-19T02:15:27.151Z" }, - { url = "https://files.pythonhosted.org/packages/08/cd/a8850adb8ba26fe77ac0b4efa77f4c03ebfa1e673c388c8cd0dac8d752b1/pymatgen_core-2026.5.18-cp313-cp313-win32.whl", hash = "sha256:12391b53f98c6bae5a4875c1efc558f303857e06347580f31e3d79c2353c86e8", size = 2857426, upload-time = "2026-05-19T02:15:29.062Z" }, - { url = "https://files.pythonhosted.org/packages/cd/41/57d429a2a8f7a9599735823580da304e30066ac9029f78a8af88ae041990/pymatgen_core-2026.5.18-cp313-cp313-win_amd64.whl", hash = "sha256:417a4410537b49cd7d4970518ece69182ba7cae0c71e7f7fb9bd15b896e059f4", size = 2900292, upload-time = "2026-05-19T02:15:30.528Z" }, { url = "https://files.pythonhosted.org/packages/24/cf/c075084fc03fbb11ccc9a5d07d37163eb2dfaf6b6981cbec7c1f7955bd6b/pymatgen_core-2026.5.18-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:41f390215a28ba9c5fba5ccf414a0dca6824a4d463d09008eacc59dfe89c5f45", size = 2927369, upload-time = "2026-05-19T02:15:32.055Z" }, { url = "https://files.pythonhosted.org/packages/b7/30/45cb3d86a9b9ff20fee497e5fe3a10e922785fa269d597a76c19066d4207/pymatgen_core-2026.5.18-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:31833fa81a264842e782039f4cf46a9ceaacb485639ea3d4606f3d06e1d1d6d6", size = 4413086, upload-time = "2026-05-19T02:15:34.007Z" }, { url = "https://files.pythonhosted.org/packages/19/b8/548cf1d1b78e03535fa2b2fe90860946ed45c1b29befd3d1fe43fc87a005/pymatgen_core-2026.5.18-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:7199b2f7ae7e0ba5ae3af23f5d16e13ae69a37d4015d94d4f62d5ada544fb4eb", size = 4448826, upload-time = "2026-05-19T02:15:35.761Z" }, @@ -3530,36 +2523,6 @@ dependencies = [ ] sdist = { url = "https://files.pythonhosted.org/packages/ca/64/50be6fbac9c79fe2e4c17401a467da2d8764d82833d83cec325afe5cab32/pymongo-4.17.0.tar.gz", hash = "sha256:70ffa08ba641468cc068cf46c06b34f01a8ce3489f6411309fcb5ceabe6b2fc0", size = 2523370, upload-time = "2026-04-20T16:39:53.524Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/c4/e2/336d86f221cf1b56b2ed9330d4a3b98f9f38f0b37829ae9a9184617d5419/pymongo-4.17.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:4141e6c6a339789b2974efa00ecd9409101672d77a0e3ee2cc3839eedf8ec4df", size = 874668, upload-time = "2026-04-20T16:37:41.39Z" }, - { url = "https://files.pythonhosted.org/packages/34/8e/75d3c6c935d187ab59c61e9c15d9aab3f274b563eaf1706e8cae5f508dec/pymongo-4.17.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:e68c76b84e0c132d9dbf9307f12ff8185702328187a87b9aca8c941303873433", size = 875294, upload-time = "2026-04-20T16:37:43.432Z" }, - { url = "https://files.pythonhosted.org/packages/5f/ec/62e855744489dbcd54fd778aae4d80fa4c4819e8fb228ca0cf6f21a03997/pymongo-4.17.0-cp311-cp311-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:ba2195d4f386f839a52a23ea1cfd60ffaaba78a3d7841db51b7e433001139918", size = 1496233, upload-time = "2026-04-20T16:37:45.518Z" }, - { url = "https://files.pythonhosted.org/packages/82/e8/93e4e5e5ce8fdf8929dabeefe24aafa5ce046028eed0dfa8eeb936e72c49/pymongo-4.17.0-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:8446ff4bfcb6ec2a2e50998c860986a1e992136f998b7f53e7a717fb8aa5a0b9", size = 1522927, upload-time = "2026-04-20T16:37:47.492Z" }, - { url = "https://files.pythonhosted.org/packages/f7/ca/425dc1d21e0f17bdea0072fc463f662f7fa06d2852af52975c9eced3c07c/pymongo-4.17.0-cp311-cp311-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:2a0d5ac205728c86e0a02192f1aa5f865b0d7d51f8df6101c01a69a7fc620d72", size = 1583468, upload-time = "2026-04-20T16:37:49.221Z" }, - { url = "https://files.pythonhosted.org/packages/b3/9d/f08b07eeffda1a43c1759f0fa625e88ae12360996eb56d42aad832fa7dff/pymongo-4.17.0-cp311-cp311-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:485c8a8eaa4c739f00a331fc73757898ee7c092c214a79e63866ff76aaf282ff", size = 1572787, upload-time = "2026-04-20T16:37:51.061Z" }, - { url = "https://files.pythonhosted.org/packages/e9/c2/6855a07aafa7b894929af23675b6fb9634800ce43122b76a62f6eeb8da2a/pymongo-4.17.0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:b2dfcc795f5b9fedbe179a11fdf6051581479d196582a3fe819a92a00e9b9969", size = 1526184, upload-time = "2026-04-20T16:37:53.358Z" }, - { url = "https://files.pythonhosted.org/packages/4e/05/c952bac7db71c1942ea3559fcd308b49754cc5004b455935fb4000d1f37b/pymongo-4.17.0-cp311-cp311-win32.whl", hash = "sha256:c2292144505fb12156b981bd440f3dc994a883da06ac726c0c8692ccdbc1c510", size = 852621, upload-time = "2026-04-20T16:37:55.28Z" }, - { url = "https://files.pythonhosted.org/packages/11/c0/c04da9f4c0c6252404598f4e394b862a58a9e866822a70ae261c8a018fdf/pymongo-4.17.0-cp311-cp311-win_amd64.whl", hash = "sha256:2e190827834fce70ecdf9d46796c6dbc0ce08ea87dc2ff5bc6f3f5579b605cb9", size = 867852, upload-time = "2026-04-20T16:37:57.233Z" }, - { url = "https://files.pythonhosted.org/packages/1d/b2/c7b4870fbeef471e947d3e014676f5910d02e0197074d692ebcf24ec049a/pymongo-4.17.0-cp311-cp311-win_arm64.whl", hash = "sha256:a8f9c40a09bb7d4b9fc8b1da65ecf6efa79bda5cb2756f39d9b6940fac1d19ae", size = 855019, upload-time = "2026-04-20T16:37:58.983Z" }, - { url = "https://files.pythonhosted.org/packages/98/90/60bcb508840135d5ee46b51b1a950f548338aa8145a8366dbe6639ae51ac/pymongo-4.17.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:d53ffa94b2340dbf6b055e09a0090618c60482c158ecfc9565642fc996bf0944", size = 930529, upload-time = "2026-04-20T16:38:00.936Z" }, - { url = "https://files.pythonhosted.org/packages/a6/e9/313840f1e52c6dfac47f704428cbfbce59956ebe7633bffc92b03f74f0ad/pymongo-4.17.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:6fe0de9d0f6791abce3471230b32b4817bf89d27b1182b6a550e1ec0fa72aa9a", size = 930665, upload-time = "2026-04-20T16:38:02.915Z" }, - { url = "https://files.pythonhosted.org/packages/78/35/9d3565ea45b1606f635c1e2cd2563c28d66caafdc50f7ad7d979fcd1b363/pymongo-4.17.0-cp312-cp312-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:e537e95514dae1aaa718f481ec03151a0f0394bcd05f1322896d8fc1330cb729", size = 1762369, upload-time = "2026-04-20T16:38:05.375Z" }, - { url = "https://files.pythonhosted.org/packages/95/ee/149b0d4b1a11c38bff6f14c23d5814c9b0843fd6dc38ad40596bdb1a62d2/pymongo-4.17.0-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:37a8385c29881b43eab31f584100fa0eaddedd5607adf010147ba1810118be90", size = 1798044, upload-time = "2026-04-20T16:38:07.195Z" }, - { url = "https://files.pythonhosted.org/packages/7b/d4/4cee4a7b8d8f6f0550ef6cd2fea42455c5ed619a220cb6ba4fb40d6a5bc8/pymongo-4.17.0-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:f3ee3d241ed77a4fc99ce3cff3b289c3ebce37f61fdd7349d3592c23b82c8784", size = 1878567, upload-time = "2026-04-20T16:38:09.121Z" }, - { url = "https://files.pythonhosted.org/packages/45/ef/7fe366c84952619ee2f69973566c214775e083dd4df465751912153e4b72/pymongo-4.17.0-cp312-cp312-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:9eb5d63a3c518cb0804ed678f5e2b875af032d89a7cf57a57360322cf6a4d222", size = 1864881, upload-time = "2026-04-20T16:38:10.896Z" }, - { url = "https://files.pythonhosted.org/packages/2f/35/b577d82c6d1be7aee7ac7e249bc86f7847998345042e5f8360de238e177b/pymongo-4.17.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:8e97e03fa13327c87e3fdc5656acd01e71817f0c1dc3221cd8f30de136bf4ec3", size = 1800349, upload-time = "2026-04-20T16:38:13.589Z" }, - { url = "https://files.pythonhosted.org/packages/b8/69/dafcf04f66e130ddd91aeb92e7a692480eda46dcd04ec1dbe82c06619e10/pymongo-4.17.0-cp312-cp312-win32.whl", hash = "sha256:6877214bff5f06f6884a9fc8d9016a4a7a5f51f537f5c51ac3a576f93e7dfb32", size = 900518, upload-time = "2026-04-20T16:38:15.541Z" }, - { url = "https://files.pythonhosted.org/packages/11/35/5c9262a459f988b4eb2605f70815240b77a0d4131136c4326d18f1822b89/pymongo-4.17.0-cp312-cp312-win_amd64.whl", hash = "sha256:9828485f72f63c7d802e0ec41f71906f633c2692621ab3af55ca990186b091b1", size = 920335, upload-time = "2026-04-20T16:38:17.665Z" }, - { url = "https://files.pythonhosted.org/packages/8d/da/e9c7265ee176faccf4e52c4797837e794d93569a1046f6b19a4acc36e5ad/pymongo-4.17.0-cp312-cp312-win_arm64.whl", hash = "sha256:1195370a77baf003b59b10e91ecc4706297197f0dd9d29c840cc556dc08f7cee", size = 903289, upload-time = "2026-04-20T16:38:19.33Z" }, - { url = "https://files.pythonhosted.org/packages/2a/6b/c1206879708b94e82fcd8b9653440ec271f79a3674d122192df383047f5a/pymongo-4.17.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:809ec74de3b9148ae43fa8df9faf53470f511c8d384f13b99d6f671f2a379f15", size = 985829, upload-time = "2026-04-20T16:38:21.031Z" }, - { url = "https://files.pythonhosted.org/packages/cb/cf/bb044ed85160e5c40f568c7c4f4e8ea16f40764ff5d302e5befbe8f6f814/pymongo-4.17.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:a431b737816bf4cddd4fa0fcef04e424ad36b7692734a64150f872fb8f3208be", size = 985899, upload-time = "2026-04-20T16:38:23.409Z" }, - { url = "https://files.pythonhosted.org/packages/74/0a/f6dfd5ea3901e5d6888da8de8ba728971a1d447debab681cfc56f90d1208/pymongo-4.17.0-cp313-cp313-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:e4fab10f8403169ce92f3cea921609d9ee81107306caae06c08f592d4b8ad2b5", size = 2028569, upload-time = "2026-04-20T16:38:25.343Z" }, - { url = "https://files.pythonhosted.org/packages/4a/c5/081f59a1c02ae8c0dc73ae58e563838c44eec81aeafa7d0b93a637841c9b/pymongo-4.17.0-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:20323b0b1c1d33770ad1fc68d429c757734ce9ad3594421c3d6618f10572b1b9", size = 2072916, upload-time = "2026-04-20T16:38:27.291Z" }, - { url = "https://files.pythonhosted.org/packages/31/42/6e41d434297ffe8b30d9c3717916591a4a7be9075a0dcc2fafdfaaaa62ed/pymongo-4.17.0-cp313-cp313-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:5a5de048e6da5c18e27cc2437e8c15b3b0cdc8385c15b41178b0caa3322a09c2", size = 2173234, upload-time = "2026-04-20T16:38:29.474Z" }, - { url = "https://files.pythonhosted.org/packages/3d/cf/1e4a7db352ef9485831c7268dfe8402f0117b32a9ad54b16e810699e3617/pymongo-4.17.0-cp313-cp313-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:dff3de1294fbbc1db0ba6b511f77b8e540601d092538a31312e99c8a91a78b1e", size = 2156784, upload-time = "2026-04-20T16:38:32.134Z" }, - { url = "https://files.pythonhosted.org/packages/12/10/6195be29962a61ebb5f4bd9e4c7519890b172f7968a0a0d880398c6ddb02/pymongo-4.17.0-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:faf03e4c2aafd6de626dbd30ba246d369ae33f47f10629d1bbe40f72115027a6", size = 2074446, upload-time = "2026-04-20T16:38:34.004Z" }, - { url = "https://files.pythonhosted.org/packages/37/48/33410b8819837ed370c738587306bdf060b59cef11823be212f4a07703c5/pymongo-4.17.0-cp313-cp313-win32.whl", hash = "sha256:c9786665926a09630c5d420c79762cfadbff35a9438bcbc4c81a9fb5ab9228b7", size = 948435, upload-time = "2026-04-20T16:38:35.922Z" }, - { url = "https://files.pythonhosted.org/packages/6f/77/c0ed522f798a286b99acaa7914ed8d9c80ab091f97f57c59ffed72906e5e/pymongo-4.17.0-cp313-cp313-win_amd64.whl", hash = "sha256:5960519b4d7168f1ecdd3ea10c81b2aedeb9423651aca953cfbc8e76705d3b38", size = 972847, upload-time = "2026-04-20T16:38:37.888Z" }, - { url = "https://files.pythonhosted.org/packages/97/f0/c39480a2db385fde23861d0c8acda41cdaf1d43e46579db72c5c013a2e81/pymongo-4.17.0-cp313-cp313-win_arm64.whl", hash = "sha256:0ff6bd2f735ab5356541e3e57d5b7dbfbc3f2ee1ccb10b6b0f82d58af69d1d8e", size = 951575, upload-time = "2026-04-20T16:38:40.544Z" }, { url = "https://files.pythonhosted.org/packages/da/49/2b0250762a89737ed6f9cea238331baca061b89a8ddd10dd17fee52c3970/pymongo-4.17.0-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:ff5aa3f1c7e3f08eb0e7a016c91ba468b1850ccfd63d9b1f12f56350f4974cef", size = 1040945, upload-time = "2026-04-20T16:38:42.783Z" }, { url = "https://files.pythonhosted.org/packages/89/1c/7a9b5447a08be20e84b6e5b17330917e8d6d9507daa3cd099a9309f11ad7/pymongo-4.17.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:e816db649ba5d7de0568cf3a9f287a9dc9aad21cf0ca667ab156a7ef47fca0b0", size = 1041187, upload-time = "2026-04-20T16:38:45.358Z" }, { url = "https://files.pythonhosted.org/packages/78/a1/71704f61632dfc90407a5834fe5f6132854937c4a3648f6c05c351d85a45/pymongo-4.17.0-cp314-cp314-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:12c4fded3a9f1d6a687e36ebd384ac6d00b9b00de1969aa74048e7051ec2a713", size = 2294806, upload-time = "2026-04-20T16:38:47.734Z" }, @@ -3588,7 +2551,6 @@ version = "26.2.0" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "cryptography" }, - { name = "typing-extensions", marker = "python_full_version < '3.13'" }, ] sdist = { url = "https://files.pythonhosted.org/packages/1a/51/27a5ad5f939d08f690a326ef9582cda7140555180db71695f6fb747d6a36/pyopenssl-26.2.0.tar.gz", hash = "sha256:8c6fcecd1183a7fc897548dfe388b0cdb7f37e018200d8409cf33959dbe35387", size = 182195, upload-time = "2026-05-04T23:06:09.72Z" } wheels = [ @@ -3620,29 +2582,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/d4/24/a372aaf5c9b7208e7112038812994107bc65a84cd00e0354a88c2c77a617/pytest-9.0.3-py3-none-any.whl", hash = "sha256:2c5efc453d45394fdd706ade797c0a81091eccd1d6e4bccfcd476e2b8e0ab5d9", size = 375249, upload-time = "2026-04-07T17:16:16.13Z" }, ] -[[package]] -name = "pytest-flake8" -version = "1.3.0" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "flake8" }, - { name = "pytest" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/4f/83/3b0154ccd60191e24b75c99c5e7c6dcfb1d2fd81dd47528523b38fed6ac6/pytest_flake8-1.3.0.tar.gz", hash = "sha256:88fb35562ce32d915c6ba41ef0d5e1cfcdd8ff884a32b7d46aa99fc77a3d1fe6", size = 13340, upload-time = "2024-11-09T00:09:09.249Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/7d/ca/163e24b6d92ba3e92245a6a23e88b946c29ff5294b2f4bc24c7a6171a13d/pytest_flake8-1.3.0-py3-none-any.whl", hash = "sha256:de10517c59fce25c0a7abb2a2b2a9d0b0ceb59ff0add7fa8e654d613bb25e218", size = 5966, upload-time = "2024-11-09T00:09:08.227Z" }, -] - -[[package]] -name = "pytest-pycodestyle" -version = "2.5.0" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "pycodestyle" }, - { name = "pytest" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/0f/60/634e069a52137207b988359319c7030b25195f014822724f259325fa3af5/pytest_pycodestyle-2.5.0.tar.gz", hash = "sha256:dd0060039e12a59b521da8e57e17133c965566dd8d17631e589e7545238829ac", size = 5859, upload-time = "2025-07-20T03:18:12.504Z" } - [[package]] name = "pytest-xdist" version = "3.8.0" @@ -3722,14 +2661,6 @@ version = "3.0.3" source = { registry = "https://pypi.org/simple" } sdist = { url = "https://files.pythonhosted.org/packages/f7/54/37c7370ba91f579235049dc26cd2c5e657d2a943e01820844ffc81f32176/pywinpty-3.0.3.tar.gz", hash = "sha256:523441dc34d231fb361b4b00f8c99d3f16de02f5005fd544a0183112bcc22412", size = 31309, upload-time = "2026-02-04T21:51:09.524Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/79/c3/3e75075c7f71735f22b66fab0481f2c98e3a4d58cba55cb50ba29114bcf6/pywinpty-3.0.3-cp311-cp311-win_amd64.whl", hash = "sha256:dff25a9a6435f527d7c65608a7e62783fc12076e7d44487a4911ee91be5a8ac8", size = 2114430, upload-time = "2026-02-04T21:54:19.485Z" }, - { url = "https://files.pythonhosted.org/packages/8d/1e/8a54166a8c5e4f5cb516514bdf4090be4d51a71e8d9f6d98c0aa00fe45d4/pywinpty-3.0.3-cp311-cp311-win_arm64.whl", hash = "sha256:fbc1e230e5b193eef4431cba3f39996a288f9958f9c9f092c8a961d930ee8f68", size = 236191, upload-time = "2026-02-04T21:50:36.239Z" }, - { url = "https://files.pythonhosted.org/packages/7c/d4/aeb5e1784d2c5bff6e189138a9ca91a090117459cea0c30378e1f2db3d54/pywinpty-3.0.3-cp312-cp312-win_amd64.whl", hash = "sha256:c9081df0e49ffa86d15db4a6ba61530630e48707f987df42c9d3313537e81fc0", size = 2113098, upload-time = "2026-02-04T21:54:37.711Z" }, - { url = "https://files.pythonhosted.org/packages/b9/53/7278223c493ccfe4883239cf06c823c56460a8010e0fc778eef67858dc14/pywinpty-3.0.3-cp312-cp312-win_arm64.whl", hash = "sha256:15e79d870e18b678fb8a5a6105fd38496b55697c66e6fc0378236026bc4d59e9", size = 234901, upload-time = "2026-02-04T21:53:31.35Z" }, - { url = "https://files.pythonhosted.org/packages/e5/cb/58d6ed3fd429c96a90ef01ac9a617af10a6d41469219c25e7dc162abbb71/pywinpty-3.0.3-cp313-cp313-win_amd64.whl", hash = "sha256:9c91dbb026050c77bdcef964e63a4f10f01a639113c4d3658332614544c467ab", size = 2112686, upload-time = "2026-02-04T21:52:03.035Z" }, - { url = "https://files.pythonhosted.org/packages/fd/50/724ed5c38c504d4e58a88a072776a1e880d970789deaeb2b9f7bd9a5141a/pywinpty-3.0.3-cp313-cp313-win_arm64.whl", hash = "sha256:fe1f7911805127c94cf51f89ab14096c6f91ffdcacf993d2da6082b2142a2523", size = 234591, upload-time = "2026-02-04T21:52:29.821Z" }, - { url = "https://files.pythonhosted.org/packages/f7/ad/90a110538696b12b39fd8758a06d70ded899308198ad2305ac68e361126e/pywinpty-3.0.3-cp313-cp313t-win_amd64.whl", hash = "sha256:3f07a6cf1c1d470d284e614733c3d0f726d2c85e78508ea10a403140c3c0c18a", size = 2112360, upload-time = "2026-02-04T21:55:33.397Z" }, - { url = "https://files.pythonhosted.org/packages/44/0f/7ffa221757a220402bc79fda44044c3f2cc57338d878ab7d622add6f4581/pywinpty-3.0.3-cp313-cp313t-win_arm64.whl", hash = "sha256:15c7c0b6f8e9d87aabbaff76468dabf6e6121332c40fc1d83548d02a9d6a3759", size = 233107, upload-time = "2026-02-04T21:51:45.455Z" }, { url = "https://files.pythonhosted.org/packages/28/88/2ff917caff61e55f38bcdb27de06ee30597881b2cae44fbba7627be015c4/pywinpty-3.0.3-cp314-cp314-win_amd64.whl", hash = "sha256:d4b6b7b0fe0cdcd02e956bd57cfe9f4e5a06514eecf3b5ae174da4f951b58be9", size = 2113282, upload-time = "2026-02-04T21:52:08.188Z" }, { url = "https://files.pythonhosted.org/packages/63/32/40a775343ace542cc43ece3f1d1fce454021521ecac41c4c4573081c2336/pywinpty-3.0.3-cp314-cp314-win_arm64.whl", hash = "sha256:34789d685fc0d547ce0c8a65e5a70e56f77d732fa6e03c8f74fefb8cbb252019", size = 234207, upload-time = "2026-02-04T21:51:58.687Z" }, { url = "https://files.pythonhosted.org/packages/8d/54/5d5e52f4cb75028104ca6faf36c10f9692389b1986d34471663b4ebebd6d/pywinpty-3.0.3-cp314-cp314t-win_amd64.whl", hash = "sha256:0c37e224a47a971d1a6e08649a1714dac4f63c11920780977829ed5c8cadead1", size = 2112910, upload-time = "2026-02-04T21:52:30.976Z" }, @@ -3742,35 +2673,6 @@ version = "6.0.3" source = { registry = "https://pypi.org/simple" } sdist = { url = "https://files.pythonhosted.org/packages/05/8e/961c0007c59b8dd7729d542c61a4d537767a59645b82a0b521206e1e25c2/pyyaml-6.0.3.tar.gz", hash = "sha256:d76623373421df22fb4cf8817020cbb7ef15c725b9d5e45f17e189bfc384190f", size = 130960, upload-time = "2025-09-25T21:33:16.546Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/6d/16/a95b6757765b7b031c9374925bb718d55e0a9ba8a1b6a12d25962ea44347/pyyaml-6.0.3-cp311-cp311-macosx_10_13_x86_64.whl", hash = "sha256:44edc647873928551a01e7a563d7452ccdebee747728c1080d881d68af7b997e", size = 185826, upload-time = "2025-09-25T21:31:58.655Z" }, - { url = "https://files.pythonhosted.org/packages/16/19/13de8e4377ed53079ee996e1ab0a9c33ec2faf808a4647b7b4c0d46dd239/pyyaml-6.0.3-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:652cb6edd41e718550aad172851962662ff2681490a8a711af6a4d288dd96824", size = 175577, upload-time = "2025-09-25T21:32:00.088Z" }, - { url = "https://files.pythonhosted.org/packages/0c/62/d2eb46264d4b157dae1275b573017abec435397aa59cbcdab6fc978a8af4/pyyaml-6.0.3-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:10892704fc220243f5305762e276552a0395f7beb4dbf9b14ec8fd43b57f126c", size = 775556, upload-time = "2025-09-25T21:32:01.31Z" }, - { url = "https://files.pythonhosted.org/packages/10/cb/16c3f2cf3266edd25aaa00d6c4350381c8b012ed6f5276675b9eba8d9ff4/pyyaml-6.0.3-cp311-cp311-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:850774a7879607d3a6f50d36d04f00ee69e7fc816450e5f7e58d7f17f1ae5c00", size = 882114, upload-time = "2025-09-25T21:32:03.376Z" }, - { url = "https://files.pythonhosted.org/packages/71/60/917329f640924b18ff085ab889a11c763e0b573da888e8404ff486657602/pyyaml-6.0.3-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:b8bb0864c5a28024fac8a632c443c87c5aa6f215c0b126c449ae1a150412f31d", size = 806638, upload-time = "2025-09-25T21:32:04.553Z" }, - { url = "https://files.pythonhosted.org/packages/dd/6f/529b0f316a9fd167281a6c3826b5583e6192dba792dd55e3203d3f8e655a/pyyaml-6.0.3-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:1d37d57ad971609cf3c53ba6a7e365e40660e3be0e5175fa9f2365a379d6095a", size = 767463, upload-time = "2025-09-25T21:32:06.152Z" }, - { url = "https://files.pythonhosted.org/packages/f2/6a/b627b4e0c1dd03718543519ffb2f1deea4a1e6d42fbab8021936a4d22589/pyyaml-6.0.3-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:37503bfbfc9d2c40b344d06b2199cf0e96e97957ab1c1b546fd4f87e53e5d3e4", size = 794986, upload-time = "2025-09-25T21:32:07.367Z" }, - { url = "https://files.pythonhosted.org/packages/45/91/47a6e1c42d9ee337c4839208f30d9f09caa9f720ec7582917b264defc875/pyyaml-6.0.3-cp311-cp311-win32.whl", hash = "sha256:8098f252adfa6c80ab48096053f512f2321f0b998f98150cea9bd23d83e1467b", size = 142543, upload-time = "2025-09-25T21:32:08.95Z" }, - { url = "https://files.pythonhosted.org/packages/da/e3/ea007450a105ae919a72393cb06f122f288ef60bba2dc64b26e2646fa315/pyyaml-6.0.3-cp311-cp311-win_amd64.whl", hash = "sha256:9f3bfb4965eb874431221a3ff3fdcddc7e74e3b07799e0e84ca4a0f867d449bf", size = 158763, upload-time = "2025-09-25T21:32:09.96Z" }, - { url = "https://files.pythonhosted.org/packages/d1/33/422b98d2195232ca1826284a76852ad5a86fe23e31b009c9886b2d0fb8b2/pyyaml-6.0.3-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:7f047e29dcae44602496db43be01ad42fc6f1cc0d8cd6c83d342306c32270196", size = 182063, upload-time = "2025-09-25T21:32:11.445Z" }, - { url = "https://files.pythonhosted.org/packages/89/a0/6cf41a19a1f2f3feab0e9c0b74134aa2ce6849093d5517a0c550fe37a648/pyyaml-6.0.3-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:fc09d0aa354569bc501d4e787133afc08552722d3ab34836a80547331bb5d4a0", size = 173973, upload-time = "2025-09-25T21:32:12.492Z" }, - { url = "https://files.pythonhosted.org/packages/ed/23/7a778b6bd0b9a8039df8b1b1d80e2e2ad78aa04171592c8a5c43a56a6af4/pyyaml-6.0.3-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:9149cad251584d5fb4981be1ecde53a1ca46c891a79788c0df828d2f166bda28", size = 775116, upload-time = "2025-09-25T21:32:13.652Z" }, - { url = "https://files.pythonhosted.org/packages/65/30/d7353c338e12baef4ecc1b09e877c1970bd3382789c159b4f89d6a70dc09/pyyaml-6.0.3-cp312-cp312-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:5fdec68f91a0c6739b380c83b951e2c72ac0197ace422360e6d5a959d8d97b2c", size = 844011, upload-time = "2025-09-25T21:32:15.21Z" }, - { url = "https://files.pythonhosted.org/packages/8b/9d/b3589d3877982d4f2329302ef98a8026e7f4443c765c46cfecc8858c6b4b/pyyaml-6.0.3-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:ba1cc08a7ccde2d2ec775841541641e4548226580ab850948cbfda66a1befcdc", size = 807870, upload-time = "2025-09-25T21:32:16.431Z" }, - { url = "https://files.pythonhosted.org/packages/05/c0/b3be26a015601b822b97d9149ff8cb5ead58c66f981e04fedf4e762f4bd4/pyyaml-6.0.3-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:8dc52c23056b9ddd46818a57b78404882310fb473d63f17b07d5c40421e47f8e", size = 761089, upload-time = "2025-09-25T21:32:17.56Z" }, - { url = "https://files.pythonhosted.org/packages/be/8e/98435a21d1d4b46590d5459a22d88128103f8da4c2d4cb8f14f2a96504e1/pyyaml-6.0.3-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:41715c910c881bc081f1e8872880d3c650acf13dfa8214bad49ed4cede7c34ea", size = 790181, upload-time = "2025-09-25T21:32:18.834Z" }, - { url = "https://files.pythonhosted.org/packages/74/93/7baea19427dcfbe1e5a372d81473250b379f04b1bd3c4c5ff825e2327202/pyyaml-6.0.3-cp312-cp312-win32.whl", hash = "sha256:96b533f0e99f6579b3d4d4995707cf36df9100d67e0c8303a0c55b27b5f99bc5", size = 137658, upload-time = "2025-09-25T21:32:20.209Z" }, - { url = "https://files.pythonhosted.org/packages/86/bf/899e81e4cce32febab4fb42bb97dcdf66bc135272882d1987881a4b519e9/pyyaml-6.0.3-cp312-cp312-win_amd64.whl", hash = "sha256:5fcd34e47f6e0b794d17de1b4ff496c00986e1c83f7ab2fb8fcfe9616ff7477b", size = 154003, upload-time = "2025-09-25T21:32:21.167Z" }, - { url = "https://files.pythonhosted.org/packages/1a/08/67bd04656199bbb51dbed1439b7f27601dfb576fb864099c7ef0c3e55531/pyyaml-6.0.3-cp312-cp312-win_arm64.whl", hash = "sha256:64386e5e707d03a7e172c0701abfb7e10f0fb753ee1d773128192742712a98fd", size = 140344, upload-time = "2025-09-25T21:32:22.617Z" }, - { url = "https://files.pythonhosted.org/packages/d1/11/0fd08f8192109f7169db964b5707a2f1e8b745d4e239b784a5a1dd80d1db/pyyaml-6.0.3-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:8da9669d359f02c0b91ccc01cac4a67f16afec0dac22c2ad09f46bee0697eba8", size = 181669, upload-time = "2025-09-25T21:32:23.673Z" }, - { url = "https://files.pythonhosted.org/packages/b1/16/95309993f1d3748cd644e02e38b75d50cbc0d9561d21f390a76242ce073f/pyyaml-6.0.3-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:2283a07e2c21a2aa78d9c4442724ec1eb15f5e42a723b99cb3d822d48f5f7ad1", size = 173252, upload-time = "2025-09-25T21:32:25.149Z" }, - { url = "https://files.pythonhosted.org/packages/50/31/b20f376d3f810b9b2371e72ef5adb33879b25edb7a6d072cb7ca0c486398/pyyaml-6.0.3-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:ee2922902c45ae8ccada2c5b501ab86c36525b883eff4255313a253a3160861c", size = 767081, upload-time = "2025-09-25T21:32:26.575Z" }, - { url = "https://files.pythonhosted.org/packages/49/1e/a55ca81e949270d5d4432fbbd19dfea5321eda7c41a849d443dc92fd1ff7/pyyaml-6.0.3-cp313-cp313-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:a33284e20b78bd4a18c8c2282d549d10bc8408a2a7ff57653c0cf0b9be0afce5", size = 841159, upload-time = "2025-09-25T21:32:27.727Z" }, - { url = "https://files.pythonhosted.org/packages/74/27/e5b8f34d02d9995b80abcef563ea1f8b56d20134d8f4e5e81733b1feceb2/pyyaml-6.0.3-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:0f29edc409a6392443abf94b9cf89ce99889a1dd5376d94316ae5145dfedd5d6", size = 801626, upload-time = "2025-09-25T21:32:28.878Z" }, - { url = "https://files.pythonhosted.org/packages/f9/11/ba845c23988798f40e52ba45f34849aa8a1f2d4af4b798588010792ebad6/pyyaml-6.0.3-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:f7057c9a337546edc7973c0d3ba84ddcdf0daa14533c2065749c9075001090e6", size = 753613, upload-time = "2025-09-25T21:32:30.178Z" }, - { url = "https://files.pythonhosted.org/packages/3d/e0/7966e1a7bfc0a45bf0a7fb6b98ea03fc9b8d84fa7f2229e9659680b69ee3/pyyaml-6.0.3-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:eda16858a3cab07b80edaf74336ece1f986ba330fdb8ee0d6c0d68fe82bc96be", size = 794115, upload-time = "2025-09-25T21:32:31.353Z" }, - { url = "https://files.pythonhosted.org/packages/de/94/980b50a6531b3019e45ddeada0626d45fa85cbe22300844a7983285bed3b/pyyaml-6.0.3-cp313-cp313-win32.whl", hash = "sha256:d0eae10f8159e8fdad514efdc92d74fd8d682c933a6dd088030f3834bc8e6b26", size = 137427, upload-time = "2025-09-25T21:32:32.58Z" }, - { url = "https://files.pythonhosted.org/packages/97/c9/39d5b874e8b28845e4ec2202b5da735d0199dbe5b8fb85f91398814a9a46/pyyaml-6.0.3-cp313-cp313-win_amd64.whl", hash = "sha256:79005a0d97d5ddabfeeea4cf676af11e647e41d81c9a7722a193022accdb6b7c", size = 154090, upload-time = "2025-09-25T21:32:33.659Z" }, - { url = "https://files.pythonhosted.org/packages/73/e8/2bdf3ca2090f68bb3d75b44da7bbc71843b19c9f2b9cb9b0f4ab7a5a4329/pyyaml-6.0.3-cp313-cp313-win_arm64.whl", hash = "sha256:5498cd1645aa724a7c71c8f378eb29ebe23da2fc0d7a08071d89469bf1d2defb", size = 140246, upload-time = "2025-09-25T21:32:34.663Z" }, { url = "https://files.pythonhosted.org/packages/9d/8c/f4bd7f6465179953d3ac9bc44ac1a8a3e6122cf8ada906b4f96c60172d43/pyyaml-6.0.3-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:8d1fab6bb153a416f9aeb4b8763bc0f22a5586065f86f7664fc23339fc1c1fac", size = 181814, upload-time = "2025-09-25T21:32:35.712Z" }, { url = "https://files.pythonhosted.org/packages/bd/9c/4d95bb87eb2063d20db7b60faa3840c1b18025517ae857371c4dd55a6b3a/pyyaml-6.0.3-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:34d5fcd24b8445fadc33f9cf348c1047101756fd760b4dacb5c3e99755703310", size = 173809, upload-time = "2025-09-25T21:32:36.789Z" }, { url = "https://files.pythonhosted.org/packages/92/b5/47e807c2623074914e29dabd16cbbdd4bf5e9b2db9f8090fa64411fc5382/pyyaml-6.0.3-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:501a031947e3a9025ed4405a168e6ef5ae3126c59f90ce0cd6f2bfc477be31b7", size = 766454, upload-time = "2025-09-25T21:32:37.966Z" }, @@ -3800,16 +2702,6 @@ dependencies = [ ] sdist = { url = "https://files.pythonhosted.org/packages/04/0b/3c9baedbdf613ecaa7aa07027780b8867f57b6293b6ee50de316c9f3222b/pyzmq-27.1.0.tar.gz", hash = "sha256:ac0765e3d44455adb6ddbf4417dcce460fc40a05978c08efdf2948072f6db540", size = 281750, upload-time = "2025-09-08T23:10:18.157Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/06/5d/305323ba86b284e6fcb0d842d6adaa2999035f70f8c38a9b6d21ad28c3d4/pyzmq-27.1.0-cp311-cp311-macosx_10_15_universal2.whl", hash = "sha256:226b091818d461a3bef763805e75685e478ac17e9008f49fce2d3e52b3d58b86", size = 1333328, upload-time = "2025-09-08T23:07:45.946Z" }, - { url = "https://files.pythonhosted.org/packages/bd/a0/fc7e78a23748ad5443ac3275943457e8452da67fda347e05260261108cbc/pyzmq-27.1.0-cp311-cp311-manylinux2014_i686.manylinux_2_17_i686.whl", hash = "sha256:0790a0161c281ca9723f804871b4027f2e8b5a528d357c8952d08cd1a9c15581", size = 908803, upload-time = "2025-09-08T23:07:47.551Z" }, - { url = "https://files.pythonhosted.org/packages/7e/22/37d15eb05f3bdfa4abea6f6d96eb3bb58585fbd3e4e0ded4e743bc650c97/pyzmq-27.1.0-cp311-cp311-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:c895a6f35476b0c3a54e3eb6ccf41bf3018de937016e6e18748317f25d4e925f", size = 668836, upload-time = "2025-09-08T23:07:49.436Z" }, - { url = "https://files.pythonhosted.org/packages/b1/c4/2a6fe5111a01005fc7af3878259ce17684fabb8852815eda6225620f3c59/pyzmq-27.1.0-cp311-cp311-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:5bbf8d3630bf96550b3be8e1fc0fea5cbdc8d5466c1192887bd94869da17a63e", size = 857038, upload-time = "2025-09-08T23:07:51.234Z" }, - { url = "https://files.pythonhosted.org/packages/cb/eb/bfdcb41d0db9cd233d6fb22dc131583774135505ada800ebf14dfb0a7c40/pyzmq-27.1.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:15c8bd0fe0dabf808e2d7a681398c4e5ded70a551ab47482067a572c054c8e2e", size = 1657531, upload-time = "2025-09-08T23:07:52.795Z" }, - { url = "https://files.pythonhosted.org/packages/ab/21/e3180ca269ed4a0de5c34417dfe71a8ae80421198be83ee619a8a485b0c7/pyzmq-27.1.0-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:bafcb3dd171b4ae9f19ee6380dfc71ce0390fefaf26b504c0e5f628d7c8c54f2", size = 2034786, upload-time = "2025-09-08T23:07:55.047Z" }, - { url = "https://files.pythonhosted.org/packages/3b/b1/5e21d0b517434b7f33588ff76c177c5a167858cc38ef740608898cd329f2/pyzmq-27.1.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:e829529fcaa09937189178115c49c504e69289abd39967cd8a4c215761373394", size = 1894220, upload-time = "2025-09-08T23:07:57.172Z" }, - { url = "https://files.pythonhosted.org/packages/03/f2/44913a6ff6941905efc24a1acf3d3cb6146b636c546c7406c38c49c403d4/pyzmq-27.1.0-cp311-cp311-win32.whl", hash = "sha256:6df079c47d5902af6db298ec92151db82ecb557af663098b92f2508c398bb54f", size = 567155, upload-time = "2025-09-08T23:07:59.05Z" }, - { url = "https://files.pythonhosted.org/packages/23/6d/d8d92a0eb270a925c9b4dd039c0b4dc10abc2fcbc48331788824ef113935/pyzmq-27.1.0-cp311-cp311-win_amd64.whl", hash = "sha256:190cbf120fbc0fc4957b56866830def56628934a9d112aec0e2507aa6a032b97", size = 633428, upload-time = "2025-09-08T23:08:00.663Z" }, - { url = "https://files.pythonhosted.org/packages/ae/14/01afebc96c5abbbd713ecfc7469cfb1bc801c819a74ed5c9fad9a48801cb/pyzmq-27.1.0-cp311-cp311-win_arm64.whl", hash = "sha256:eca6b47df11a132d1745eb3b5b5e557a7dae2c303277aa0e69c6ba91b8736e07", size = 559497, upload-time = "2025-09-08T23:08:02.15Z" }, { url = "https://files.pythonhosted.org/packages/92/e7/038aab64a946d535901103da16b953c8c9cc9c961dadcbf3609ed6428d23/pyzmq-27.1.0-cp312-abi3-macosx_10_15_universal2.whl", hash = "sha256:452631b640340c928fa343801b0d07eb0c3789a5ffa843f6e1a9cee0ba4eb4fc", size = 1306279, upload-time = "2025-09-08T23:08:03.807Z" }, { url = "https://files.pythonhosted.org/packages/e8/5e/c3c49fdd0f535ef45eefcc16934648e9e59dace4a37ee88fc53f6cd8e641/pyzmq-27.1.0-cp312-abi3-manylinux2014_i686.manylinux_2_17_i686.whl", hash = "sha256:1c179799b118e554b66da67d88ed66cd37a169f1f23b5d9f0a231b4e8d44a113", size = 895645, upload-time = "2025-09-08T23:08:05.301Z" }, { url = "https://files.pythonhosted.org/packages/f8/e5/b0b2504cb4e903a74dcf1ebae157f9e20ebb6ea76095f6cfffea28c42ecd/pyzmq-27.1.0-cp312-abi3-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:3837439b7f99e60312f0c926a6ad437b067356dc2bc2ec96eb395fd0fe804233", size = 652574, upload-time = "2025-09-08T23:08:06.828Z" }, @@ -3820,18 +2712,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/e6/2f/104c0a3c778d7c2ab8190e9db4f62f0b6957b53c9d87db77c284b69f33ea/pyzmq-27.1.0-cp312-abi3-win32.whl", hash = "sha256:250e5436a4ba13885494412b3da5d518cd0d3a278a1ae640e113c073a5f88edd", size = 559184, upload-time = "2025-09-08T23:08:15.163Z" }, { url = "https://files.pythonhosted.org/packages/fc/7f/a21b20d577e4100c6a41795842028235998a643b1ad406a6d4163ea8f53e/pyzmq-27.1.0-cp312-abi3-win_amd64.whl", hash = "sha256:9ce490cf1d2ca2ad84733aa1d69ce6855372cb5ce9223802450c9b2a7cba0ccf", size = 619480, upload-time = "2025-09-08T23:08:17.192Z" }, { url = "https://files.pythonhosted.org/packages/78/c2/c012beae5f76b72f007a9e91ee9401cb88c51d0f83c6257a03e785c81cc2/pyzmq-27.1.0-cp312-abi3-win_arm64.whl", hash = "sha256:75a2f36223f0d535a0c919e23615fc85a1e23b71f40c7eb43d7b1dedb4d8f15f", size = 552993, upload-time = "2025-09-08T23:08:18.926Z" }, - { url = "https://files.pythonhosted.org/packages/60/cb/84a13459c51da6cec1b7b1dc1a47e6db6da50b77ad7fd9c145842750a011/pyzmq-27.1.0-cp313-cp313-android_24_arm64_v8a.whl", hash = "sha256:93ad4b0855a664229559e45c8d23797ceac03183c7b6f5b4428152a6b06684a5", size = 1122436, upload-time = "2025-09-08T23:08:20.801Z" }, - { url = "https://files.pythonhosted.org/packages/dc/b6/94414759a69a26c3dd674570a81813c46a078767d931a6c70ad29fc585cb/pyzmq-27.1.0-cp313-cp313-android_24_x86_64.whl", hash = "sha256:fbb4f2400bfda24f12f009cba62ad5734148569ff4949b1b6ec3b519444342e6", size = 1156301, upload-time = "2025-09-08T23:08:22.47Z" }, - { url = "https://files.pythonhosted.org/packages/a5/ad/15906493fd40c316377fd8a8f6b1f93104f97a752667763c9b9c1b71d42d/pyzmq-27.1.0-cp313-cp313t-macosx_10_15_universal2.whl", hash = "sha256:e343d067f7b151cfe4eb3bb796a7752c9d369eed007b91231e817071d2c2fec7", size = 1341197, upload-time = "2025-09-08T23:08:24.286Z" }, - { url = "https://files.pythonhosted.org/packages/14/1d/d343f3ce13db53a54cb8946594e567410b2125394dafcc0268d8dda027e0/pyzmq-27.1.0-cp313-cp313t-manylinux2014_i686.manylinux_2_17_i686.whl", hash = "sha256:08363b2011dec81c354d694bdecaef4770e0ae96b9afea70b3f47b973655cc05", size = 897275, upload-time = "2025-09-08T23:08:26.063Z" }, - { url = "https://files.pythonhosted.org/packages/69/2d/d83dd6d7ca929a2fc67d2c3005415cdf322af7751d773524809f9e585129/pyzmq-27.1.0-cp313-cp313t-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:d54530c8c8b5b8ddb3318f481297441af102517602b569146185fa10b63f4fa9", size = 660469, upload-time = "2025-09-08T23:08:27.623Z" }, - { url = "https://files.pythonhosted.org/packages/3e/cd/9822a7af117f4bc0f1952dbe9ef8358eb50a24928efd5edf54210b850259/pyzmq-27.1.0-cp313-cp313t-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:6f3afa12c392f0a44a2414056d730eebc33ec0926aae92b5ad5cf26ebb6cc128", size = 847961, upload-time = "2025-09-08T23:08:29.672Z" }, - { url = "https://files.pythonhosted.org/packages/9a/12/f003e824a19ed73be15542f172fd0ec4ad0b60cf37436652c93b9df7c585/pyzmq-27.1.0-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:c65047adafe573ff023b3187bb93faa583151627bc9c51fc4fb2c561ed689d39", size = 1650282, upload-time = "2025-09-08T23:08:31.349Z" }, - { url = "https://files.pythonhosted.org/packages/d5/4a/e82d788ed58e9a23995cee70dbc20c9aded3d13a92d30d57ec2291f1e8a3/pyzmq-27.1.0-cp313-cp313t-musllinux_1_2_i686.whl", hash = "sha256:90e6e9441c946a8b0a667356f7078d96411391a3b8f80980315455574177ec97", size = 2024468, upload-time = "2025-09-08T23:08:33.543Z" }, - { url = "https://files.pythonhosted.org/packages/d9/94/2da0a60841f757481e402b34bf4c8bf57fa54a5466b965de791b1e6f747d/pyzmq-27.1.0-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:add071b2d25f84e8189aaf0882d39a285b42fa3853016ebab234a5e78c7a43db", size = 1885394, upload-time = "2025-09-08T23:08:35.51Z" }, - { url = "https://files.pythonhosted.org/packages/4f/6f/55c10e2e49ad52d080dc24e37adb215e5b0d64990b57598abc2e3f01725b/pyzmq-27.1.0-cp313-cp313t-win32.whl", hash = "sha256:7ccc0700cfdf7bd487bea8d850ec38f204478681ea02a582a8da8171b7f90a1c", size = 574964, upload-time = "2025-09-08T23:08:37.178Z" }, - { url = "https://files.pythonhosted.org/packages/87/4d/2534970ba63dd7c522d8ca80fb92777f362c0f321900667c615e2067cb29/pyzmq-27.1.0-cp313-cp313t-win_amd64.whl", hash = "sha256:8085a9fba668216b9b4323be338ee5437a235fe275b9d1610e422ccc279733e2", size = 641029, upload-time = "2025-09-08T23:08:40.595Z" }, - { url = "https://files.pythonhosted.org/packages/f6/fa/f8aea7a28b0641f31d40dea42d7ef003fded31e184ef47db696bc74cd610/pyzmq-27.1.0-cp313-cp313t-win_arm64.whl", hash = "sha256:6bb54ca21bcfe361e445256c15eedf083f153811c37be87e0514934d6913061e", size = 561541, upload-time = "2025-09-08T23:08:42.668Z" }, { url = "https://files.pythonhosted.org/packages/87/45/19efbb3000956e82d0331bafca5d9ac19ea2857722fa2caacefb6042f39d/pyzmq-27.1.0-cp314-cp314t-macosx_10_15_universal2.whl", hash = "sha256:ce980af330231615756acd5154f29813d553ea555485ae712c491cd483df6b7a", size = 1341197, upload-time = "2025-09-08T23:08:44.973Z" }, { url = "https://files.pythonhosted.org/packages/48/43/d72ccdbf0d73d1343936296665826350cb1e825f92f2db9db3e61c2162a2/pyzmq-27.1.0-cp314-cp314t-manylinux2014_i686.manylinux_2_17_i686.whl", hash = "sha256:1779be8c549e54a1c38f805e56d2a2e5c009d26de10921d7d51cfd1c8d4632ea", size = 897175, upload-time = "2025-09-08T23:08:46.601Z" }, { url = "https://files.pythonhosted.org/packages/2f/2e/a483f73a10b65a9ef0161e817321d39a770b2acf8bcf3004a28d90d14a94/pyzmq-27.1.0-cp314-cp314t-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:7200bb0f03345515df50d99d3db206a0a6bee1955fbb8c453c76f5bf0e08fb96", size = 660427, upload-time = "2025-09-08T23:08:48.187Z" }, @@ -3842,20 +2722,12 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/c4/59/a5f38970f9bf07cee96128de79590bb354917914a9be11272cfc7ff26af0/pyzmq-27.1.0-cp314-cp314t-win32.whl", hash = "sha256:1f0b2a577fd770aa6f053211a55d1c47901f4d537389a034c690291485e5fe92", size = 587472, upload-time = "2025-09-08T23:08:58.18Z" }, { url = "https://files.pythonhosted.org/packages/70/d8/78b1bad170f93fcf5e3536e70e8fadac55030002275c9a29e8f5719185de/pyzmq-27.1.0-cp314-cp314t-win_amd64.whl", hash = "sha256:19c9468ae0437f8074af379e986c5d3d7d7bfe033506af442e8c879732bedbe0", size = 661401, upload-time = "2025-09-08T23:08:59.802Z" }, { url = "https://files.pythonhosted.org/packages/81/d6/4bfbb40c9a0b42fc53c7cf442f6385db70b40f74a783130c5d0a5aa62228/pyzmq-27.1.0-cp314-cp314t-win_arm64.whl", hash = "sha256:dc5dbf68a7857b59473f7df42650c621d7e8923fb03fa74a526890f4d33cc4d7", size = 575170, upload-time = "2025-09-08T23:09:01.418Z" }, - { url = "https://files.pythonhosted.org/packages/4c/c6/c4dcdecdbaa70969ee1fdced6d7b8f60cfabe64d25361f27ac4665a70620/pyzmq-27.1.0-pp311-pypy311_pp73-macosx_10_15_x86_64.whl", hash = "sha256:18770c8d3563715387139060d37859c02ce40718d1faf299abddcdcc6a649066", size = 836265, upload-time = "2025-09-08T23:09:49.376Z" }, - { url = "https://files.pythonhosted.org/packages/3e/79/f38c92eeaeb03a2ccc2ba9866f0439593bb08c5e3b714ac1d553e5c96e25/pyzmq-27.1.0-pp311-pypy311_pp73-manylinux2014_i686.manylinux_2_17_i686.whl", hash = "sha256:ac25465d42f92e990f8d8b0546b01c391ad431c3bf447683fdc40565941d0604", size = 800208, upload-time = "2025-09-08T23:09:51.073Z" }, - { url = "https://files.pythonhosted.org/packages/49/0e/3f0d0d335c6b3abb9b7b723776d0b21fa7f3a6c819a0db6097059aada160/pyzmq-27.1.0-pp311-pypy311_pp73-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:53b40f8ae006f2734ee7608d59ed661419f087521edbfc2149c3932e9c14808c", size = 567747, upload-time = "2025-09-08T23:09:52.698Z" }, - { url = "https://files.pythonhosted.org/packages/a1/cf/f2b3784d536250ffd4be70e049f3b60981235d70c6e8ce7e3ef21e1adb25/pyzmq-27.1.0-pp311-pypy311_pp73-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:f605d884e7c8be8fe1aa94e0a783bf3f591b84c24e4bc4f3e7564c82ac25e271", size = 747371, upload-time = "2025-09-08T23:09:54.563Z" }, - { url = "https://files.pythonhosted.org/packages/01/1b/5dbe84eefc86f48473947e2f41711aded97eecef1231f4558f1f02713c12/pyzmq-27.1.0-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:c9f7f6e13dff2e44a6afeaf2cf54cee5929ad64afaf4d40b50f93c58fc687355", size = 544862, upload-time = "2025-09-08T23:09:56.509Z" }, ] [[package]] name = "redis" version = "8.0.0" source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "async-timeout", marker = "python_full_version < '3.11.3'" }, -] sdist = { url = "https://files.pythonhosted.org/packages/53/ae/ed461cca5780b5fc8b9fe8ca0ed98d89508645fb9d880c24cc42c087678f/redis-8.0.0.tar.gz", hash = "sha256:a00c5355432051ac14e593b8b197fc76c887ee12d55a0984f69328a1115fdc49", size = 5101591, upload-time = "2026-05-28T12:45:13.5Z" } wheels = [ { url = "https://files.pythonhosted.org/packages/27/e3/b519734372d305bd547534a9f32e4ce9f98552af753dce72cf3483a0ff0b/redis-8.0.0-py3-none-any.whl", hash = "sha256:c938c18338585009f0bc310f4c7e4e4b4d37639356c4ac072cedf3af570c8dc7", size = 499870, upload-time = "2026-05-28T12:45:11.697Z" }, @@ -3868,7 +2740,6 @@ source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "attrs" }, { name = "rpds-py" }, - { name = "typing-extensions", marker = "python_full_version < '3.13'" }, ] sdist = { url = "https://files.pythonhosted.org/packages/22/f5/df4e9027acead3ecc63e50fe1e36aca1523e1719559c499951bb4b53188f/referencing-0.37.0.tar.gz", hash = "sha256:44aefc3142c5b842538163acb373e24cce6632bd54bdb01b21ad5863489f50d8", size = 78036, upload-time = "2025-10-13T15:30:48.871Z" } wheels = [ @@ -3881,70 +2752,6 @@ version = "2026.5.9" source = { registry = "https://pypi.org/simple" } sdist = { url = "https://files.pythonhosted.org/packages/dc/0e/49aee608ad09480e7fd276898c99ec6192985fa331abe4eb3a986094490b/regex-2026.5.9.tar.gz", hash = "sha256:a8234aa23ec39894bfe4a3f1b85616a7032481964a13ac6fc9f10de4f6fca270", size = 416074, upload-time = "2026-05-09T23:15:19.37Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/c2/dc/c1f2df4027e82fc54b5a473e4b250f5139faca49a0fbe29a48668d228f34/regex-2026.5.9-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:ccf5249114cc3e772ecdd88a98a86eca0fd74c61ce32a94743758c083fc05d48", size = 489445, upload-time = "2026-05-09T23:12:06.111Z" }, - { url = "https://files.pythonhosted.org/packages/03/d2/59f01110660081cce9c0bc30ebd0b5ee250dacf658e3248ed92f01e0e8ee/regex-2026.5.9-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:46f1326ca6e65b0879d23ca302c0f2415aad42ff0309b9c818e7949fe19a41d8", size = 291271, upload-time = "2026-05-09T23:12:07.731Z" }, - { url = "https://files.pythonhosted.org/packages/58/b6/14b2c84ff90ddb370c81d27503f4a0fcf071496416f4855f6cc8c5d81c35/regex-2026.5.9-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:ef31cbfe458e21c6122ba8150ff060e0c7789ed0d26eb423f25472584920b555", size = 289212, upload-time = "2026-05-09T23:12:09.266Z" }, - { url = "https://files.pythonhosted.org/packages/03/d0/4db86529117320de0c84afd90e70bb47434625875e34fcef9d8c127c5b16/regex-2026.5.9-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:992604d02e6d9c6d786c24a706a71ecffe1020fc1ef264044474cd81fa2c3919", size = 792310, upload-time = "2026-05-09T23:12:11.416Z" }, - { url = "https://files.pythonhosted.org/packages/07/78/fe4800cd322f862ecffd2d553409b20d80650e5ed71b9d178f853d020b82/regex-2026.5.9-cp311-cp311-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:c9411dd64ca95477225734a93dfc8583b51916b8d5942f99d6cac21e09965451", size = 861721, upload-time = "2026-05-09T23:12:13.681Z" }, - { url = "https://files.pythonhosted.org/packages/b5/d0/b3618a895dd8feb897c61bb2954edd265e1767d82a01d53065d5871127a3/regex-2026.5.9-cp311-cp311-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:3dd4a3ff360dfb836fecdb93a4598f9d6e2ac81e3e397125145c6221bf58cf4c", size = 906460, upload-time = "2026-05-09T23:12:15.443Z" }, - { url = "https://files.pythonhosted.org/packages/33/6f/1481597e859ef19508b345eec4afd1416ed6e6b459c75a64026ef193aecf/regex-2026.5.9-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:2a661a7d270a61f7cf460caee8b9fa2d5ef9e5c681234bcb9e0fe14f488e7dfc", size = 799843, upload-time = "2026-05-09T23:12:16.892Z" }, - { url = "https://files.pythonhosted.org/packages/73/59/955734c803f59108deccba3597ae440c76b62a652733c0006e6243758420/regex-2026.5.9-cp311-cp311-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:f079e50a0d3cc3cd5091fa9ff45869a2e6b2cd35895731edafb0327901a8d86d", size = 773610, upload-time = "2026-05-09T23:12:19.127Z" }, - { url = "https://files.pythonhosted.org/packages/68/8f/70c04a236d651c81881dac42ef8538bddda6121434509d0a22d9e601503b/regex-2026.5.9-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:4ebe8f0b5ec5a5024dc4a4c59f444c4e9afc5f2abdbb8962065b75d27fb971f9", size = 781645, upload-time = "2026-05-09T23:12:20.806Z" }, - { url = "https://files.pythonhosted.org/packages/1d/96/05c7434d88185e5d27fe54aeb74df86bd77cd79f52f0b4eae54faa8fea70/regex-2026.5.9-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:97cf3bc1b7d7d2306772ec07366c80d9df00ff79e79cea32898883a646d2fae2", size = 854473, upload-time = "2026-05-09T23:12:22.465Z" }, - { url = "https://files.pythonhosted.org/packages/4e/c1/6e3d8202d981f3117004bf341ee74893ba4ba8a9fbaf4b94615846550a08/regex-2026.5.9-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:0f9eede6a5cbdc02d4978090186390936e1776a7d1359b21e41014c609880bcf", size = 763311, upload-time = "2026-05-09T23:12:24.351Z" }, - { url = "https://files.pythonhosted.org/packages/93/c7/e7737f1526b3fb32bd4c337fd6c71c3ebb5c8296fc34d11197e0955d2e35/regex-2026.5.9-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:01f0f5f55f4b64dacec85dc116d3c05fd23ad3ff037bbc73a2085775953c2611", size = 844593, upload-time = "2026-05-09T23:12:26.341Z" }, - { url = "https://files.pythonhosted.org/packages/a5/27/0daffb1a535bb39f422c3d200f4ab023c71110ad66a32b366bee708baba0/regex-2026.5.9-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:1268eddd8486dc561d08eee1156e40aa3a8fe10f4bdec8fa653b455fcbffd12c", size = 789167, upload-time = "2026-05-09T23:12:27.975Z" }, - { url = "https://files.pythonhosted.org/packages/ce/fc/294fe4fac4f2ed67207b17471815870c1c45b3a489e08e0ac96daea16ef6/regex-2026.5.9-cp311-cp311-win32.whl", hash = "sha256:8676474c07469d6f33dd1085ca2cd45f65785f32518f2b20e36d9953ca07f994", size = 266249, upload-time = "2026-05-09T23:12:30.141Z" }, - { url = "https://files.pythonhosted.org/packages/d0/b0/8dce459f6245bcf8f6e9f23ac9569f1a0f15c131cc0745e82b43226204cf/regex-2026.5.9-cp311-cp311-win_amd64.whl", hash = "sha256:246de9d60aa3f8538b519834dd95cbf276ea263d6a7bd5a3666dc3fa0230505b", size = 278423, upload-time = "2026-05-09T23:12:31.676Z" }, - { url = "https://files.pythonhosted.org/packages/db/8d/f9aeff6ad63a3ef720386f2907e6d34a35a510a6e498ebad28b0fb3f6ab6/regex-2026.5.9-cp311-cp311-win_arm64.whl", hash = "sha256:d726ca3f0d76969bf1e8e477d160d3d666bbf999f6860bd314889e5345782046", size = 270420, upload-time = "2026-05-09T23:12:33.194Z" }, - { url = "https://files.pythonhosted.org/packages/50/9b/6550044bc44e17c84d312c031c2ec42fbdb6a4ec4e29093be3a172d08772/regex-2026.5.9-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:57eeeb05db7979413dec5438f2db21d7ecbba787cde7a711df1a6f6df672aa06", size = 490451, upload-time = "2026-05-09T23:12:34.72Z" }, - { url = "https://files.pythonhosted.org/packages/1e/95/fc7ba4303b5a0f92446a12ee6778ef2c6c799233f5060042a31bf390cfe9/regex-2026.5.9-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:398c521292f4c7fb807001dcd54694d3a1fcafc179a36ad9cc56f98df85930b6", size = 292112, upload-time = "2026-05-09T23:12:36.285Z" }, - { url = "https://files.pythonhosted.org/packages/54/4b/ee27938d1b2c443e89a9a10e00d2d19aa5ee300cd3d61140644e93bb083e/regex-2026.5.9-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:f7a7c26137296beba7784de6eba69c6a93a63ccebc385e4962fe67e267a91225", size = 289599, upload-time = "2026-05-09T23:12:38.089Z" }, - { url = "https://files.pythonhosted.org/packages/d8/dd/ba103dc19614e25f3880800ca67ce093d6e21b325d72b8383c7bf906e9fa/regex-2026.5.9-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:6441cc660d76107934a09c22167200839a0e89604a6297f78a974e66e931d2c0", size = 796732, upload-time = "2026-05-09T23:12:40.062Z" }, - { url = "https://files.pythonhosted.org/packages/cf/e7/f035b4fd858b050b0080bf302968dc0f59ba34e391872d54936758e6844e/regex-2026.5.9-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:91328f1c23d47595ca3ef0a7557fa129c5a23404b775c770697d2f35b33e0107", size = 865440, upload-time = "2026-05-09T23:12:42.059Z" }, - { url = "https://files.pythonhosted.org/packages/0a/51/8cd301ecc899aea28124357f729f4272f44de7806fc7ca02490bfbe253e8/regex-2026.5.9-cp312-cp312-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:93a7860539414dddaefba2b40f8771765ae17949d4c7182b876ce429e11a8309", size = 912329, upload-time = "2026-05-09T23:12:44.373Z" }, - { url = "https://files.pythonhosted.org/packages/cc/1e/3fbe2fa1e8cebd62f3bb7d3321cff1640aca2e240b51d9bd624aad949260/regex-2026.5.9-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:dd2810d22146b6d838acc5ec15602cb6b47920aa4e33015df3868eedfd20bab8", size = 801239, upload-time = "2026-05-09T23:12:46.268Z" }, - { url = "https://files.pythonhosted.org/packages/17/2f/6f6008682bf2cf98040a0d3153a8e557b6ab728d7713d045cee4ce544ab8/regex-2026.5.9-cp312-cp312-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:daff2bdbaf1d23e52fdff7c0b7bc2048b68f978df6a4d107ac981f94caef2e66", size = 777054, upload-time = "2026-05-09T23:12:48.051Z" }, - { url = "https://files.pythonhosted.org/packages/19/2b/eee0d20a6842ba04df4b8847a920b57ef56853f14ef85405473e586b605a/regex-2026.5.9-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:4eeb011098fcb77af513dcef521a3dbecbf8849b1e38940759d293b7a93f5026", size = 785098, upload-time = "2026-05-09T23:12:49.851Z" }, - { url = "https://files.pythonhosted.org/packages/4a/98/6fc1e6410feefb92159edaed5041992bfe390e8d26c721865434acbca558/regex-2026.5.9-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:ea9c8ecfa1b73c73b626534d6626e5340d429630943672b8480724f44e84b962", size = 860095, upload-time = "2026-05-09T23:12:51.666Z" }, - { url = "https://files.pythonhosted.org/packages/18/a3/bd855e0f2cb1a978ecf6fa6bb69632dd9c3f6ea3b81cde62fde14c9daec7/regex-2026.5.9-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:cd2846168eb9ee3c513902bc8225409cb1caab31d04728b145171fa1625d9621", size = 765762, upload-time = "2026-05-09T23:12:53.413Z" }, - { url = "https://files.pythonhosted.org/packages/dc/66/0ae8c092e60b14c79d24f8e0b7f0aea5bfbffdcab00b5483d13404d3c3a5/regex-2026.5.9-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:39617fb0cde9c0e6306dc70e3bfc096f3da793219879f7ae7aa341a69fbdcf6d", size = 852100, upload-time = "2026-05-09T23:12:55.256Z" }, - { url = "https://files.pythonhosted.org/packages/21/de/8dfde60fc1b21c946a893ba273403b72617edb261370cb1087099a83f088/regex-2026.5.9-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:fd03c4f0e33280d15cae17159b899245d6b7c53d21def19b263b39655061f5ce", size = 789479, upload-time = "2026-05-09T23:12:57.573Z" }, - { url = "https://files.pythonhosted.org/packages/c3/1c/bdcc98f9a4af4fdd166c74941174619ccff4726d3ce32faa8e9a2ecd38dd/regex-2026.5.9-cp312-cp312-win32.whl", hash = "sha256:164eba9b755ea6f244b0d881196fbc1fac09714e9782c9e2732b813142033c8e", size = 266699, upload-time = "2026-05-09T23:12:59.14Z" }, - { url = "https://files.pythonhosted.org/packages/78/87/240d36864f9e48ace85f72e79ced97ceb7f27ce87739a947dcb834b4e6bc/regex-2026.5.9-cp312-cp312-win_amd64.whl", hash = "sha256:86f40a5d6444db30a125c9c9177e6b25dad981cbc37451fd838f145e6edac92e", size = 277783, upload-time = "2026-05-09T23:13:00.789Z" }, - { url = "https://files.pythonhosted.org/packages/4f/b5/7b30f312b0669dff5beebe5b0989dc2d1a312b1a44fab852199c387a5b96/regex-2026.5.9-cp312-cp312-win_arm64.whl", hash = "sha256:96f5f58b54a063d7ea9dca08e1cf57bfe10499c4d579ee672da284f57f5f0070", size = 270513, upload-time = "2026-05-09T23:13:02.426Z" }, - { url = "https://files.pythonhosted.org/packages/aa/da/797e91ecec6f84135da778ddce78c20e0af5d2a15c26f87a81bc3eadb6db/regex-2026.5.9-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:d626b84406444b165fc0ba981604edea39f0588ff1f92baa23fe50799ea9afdb", size = 490303, upload-time = "2026-05-09T23:13:04.382Z" }, - { url = "https://files.pythonhosted.org/packages/44/da/bf30abaaa737b58f4a4b8c4a03659e02fd92092c822e0197ed9e0daab917/regex-2026.5.9-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:d7bdc0ab8f3dd7e1b4f9ab88634e13374669db86bb3c72e8292f07ae313f539f", size = 292019, upload-time = "2026-05-09T23:13:06.022Z" }, - { url = "https://files.pythonhosted.org/packages/2d/e7/d0eaf5713828417b9e5648cf81fa9bacd4961f6ab98c380c2034f8716e35/regex-2026.5.9-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:a8820737949116ffff55fe18f9fc644530063ba6ebfcb8314239416e78f1347c", size = 289468, upload-time = "2026-05-09T23:13:08.214Z" }, - { url = "https://files.pythonhosted.org/packages/d3/9b/b3fdd62b003baa1a9b593cd8c8699c9651c2e80cc21a5c715707983c42d7/regex-2026.5.9-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:aa0fbdbac82cb3e4450d0ccde7d7a35607f4cb2dd9fba4b8b69bfaf8c9fa6aed", size = 796749, upload-time = "2026-05-09T23:13:10.573Z" }, - { url = "https://files.pythonhosted.org/packages/d4/30/66ab84588765f5b4b271a9ca09ef7ce2b87caa95176ec3d2ad65d7bc4902/regex-2026.5.9-cp313-cp313-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:57e8915c7986aa33d25e4d3629cef711cd2863f2961b10409f0c04cb8b7d9020", size = 865445, upload-time = "2026-05-09T23:13:12.523Z" }, - { url = "https://files.pythonhosted.org/packages/1a/89/f05169e8588aac365f35ffc7f3bc3184f095ef4cfded7cfaa3c7fd5dbd89/regex-2026.5.9-cp313-cp313-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:508f56a89ba9cb26e4168cbc37dbd60a28d82430a9e18ad1d25fe0883c314ca2", size = 912322, upload-time = "2026-05-09T23:13:14.281Z" }, - { url = "https://files.pythonhosted.org/packages/30/e1/c93444052cf41581f3c884ab3fb5823daf0992f11cd4388d4275ca610558/regex-2026.5.9-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:b6d189041f15691cfa2b6c4290448ec221244d225b3f5fe9e7771b34ffcdf6e2", size = 801269, upload-time = "2026-05-09T23:13:16.569Z" }, - { url = "https://files.pythonhosted.org/packages/50/fe/0cf96b882f540e62e8b9956599798203d599c44cf4c77917ca27400ff69b/regex-2026.5.9-cp313-cp313-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:e82db382b44d0111b22601c509c89f64434816c9e0eef9d1989cda8cc6ff1c04", size = 777085, upload-time = "2026-05-09T23:13:18.675Z" }, - { url = "https://files.pythonhosted.org/packages/23/5c/d78d4924e7fc875557b9e9b768423925fdfaac5549d06da7810019a9bd26/regex-2026.5.9-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:2acfb48634f64996b57f90f39afa692ff362162722581921fe92239a59960f3c", size = 785153, upload-time = "2026-05-09T23:13:20.525Z" }, - { url = "https://files.pythonhosted.org/packages/bf/e0/5214774090e7b4524dcea3e3c4aa74141d43043f8beb49c1599db1c8b53a/regex-2026.5.9-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:d29eebfc9525db68cad3c97eedd7f754fa265aa5cd0cf4f863b2421e1b48fc9f", size = 860164, upload-time = "2026-05-09T23:13:22.263Z" }, - { url = "https://files.pythonhosted.org/packages/6e/e1/4a57a83350319b1271f0d7a249b8672513ed928b237a741631270de6caea/regex-2026.5.9-cp313-cp313-musllinux_1_2_riscv64.whl", hash = "sha256:debb893095e944091c16e641a6e33c1b0f4cb61ab945ec5afbf53ce7068834d8", size = 765731, upload-time = "2026-05-09T23:13:24.277Z" }, - { url = "https://files.pythonhosted.org/packages/12/f4/499e74a20c156fc75836ee04a72a38d1a063978f600937f9760467beb1b0/regex-2026.5.9-cp313-cp313-musllinux_1_2_s390x.whl", hash = "sha256:d659eee77986549c9ea45b861c7567e44d6287c3dc9a4565478853f7b9fe2ff6", size = 852062, upload-time = "2026-05-09T23:13:26.125Z" }, - { url = "https://files.pythonhosted.org/packages/5b/92/7eebc0d0a01e78629695f342ba17e0deaff8fb45e79cc0d7b98287da6e3e/regex-2026.5.9-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:2efa205e6d98b24d1f3ab395c11aa15cdf10935bca283d0285e0499c284fba21", size = 789577, upload-time = "2026-05-09T23:13:27.814Z" }, - { url = "https://files.pythonhosted.org/packages/05/a4/018e71f7d2ad48c1ebe6d3ae0026f9b7cb4802fd15c7cc02fdf724355102/regex-2026.5.9-cp313-cp313-win32.whl", hash = "sha256:f3844f134e834076677dd369976e9f5068679fcb8e50102fdf6b7ac96a3ec127", size = 266691, upload-time = "2026-05-09T23:13:29.549Z" }, - { url = "https://files.pythonhosted.org/packages/e6/1d/861a93719fb9ee7dbfc3761b3797b7a3e112a5d42c6129459d2d741be9b5/regex-2026.5.9-cp313-cp313-win_amd64.whl", hash = "sha256:3527bb4942d2c14552155406cdedd906567456821848aed1cb4933a391bf5eca", size = 277747, upload-time = "2026-05-09T23:13:31.859Z" }, - { url = "https://files.pythonhosted.org/packages/d9/c6/0a2436ae4da1ba76e51cb98943c6838a9a721faa40ebe2dce07694ae34e3/regex-2026.5.9-cp313-cp313-win_arm64.whl", hash = "sha256:56a33f191f17d8c417f99945ebdc1e691d3af9605d86ec68c7e54a57e3e17af6", size = 270500, upload-time = "2026-05-09T23:13:33.525Z" }, - { url = "https://files.pythonhosted.org/packages/e8/e9/d21346f7b60ed58789371358ed66b09d00f832e1bd7c06e55d9da5679882/regex-2026.5.9-cp313-cp313t-macosx_10_13_universal2.whl", hash = "sha256:01f28d868834624c934b8d2e0aa1c8341337e37831f4a012f18a5afcba4cbaf3", size = 494172, upload-time = "2026-05-09T23:13:35.935Z" }, - { url = "https://files.pythonhosted.org/packages/c4/43/fd1177a2032037c681baecdb3422ee4e1424aec4e4f470ef47793d325274/regex-2026.5.9-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:48036f6374aaa79eb3b754ec29c61d1c6b1606749d705a13f8854fa2539671f6", size = 293952, upload-time = "2026-05-09T23:13:38.307Z" }, - { url = "https://files.pythonhosted.org/packages/f2/7d/9fbf919768368d3f8a4f6c692cf2aa61e482b2b81ec6a298ace4cbf02480/regex-2026.5.9-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:b96350aa424e79d4fd6b567b344dcbe2b2d6bfc48dfe7717587e1fa6d43da6ff", size = 292314, upload-time = "2026-05-09T23:13:40.353Z" }, - { url = "https://files.pythonhosted.org/packages/e2/6c/e41bfeecb589716843e7c4df09ba46ff2a42961457afece19059d85caeef/regex-2026.5.9-cp313-cp313t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:8f3af7a4903c5c04a11a196a5aa75cdd7dd3f8508132f9fb3259d9f5908e3b88", size = 811681, upload-time = "2026-05-09T23:13:42.543Z" }, - { url = "https://files.pythonhosted.org/packages/87/83/a5c1c525fba0aa656e88ad0face0b1829788ef4c2fb6b26df58aa1151b84/regex-2026.5.9-cp313-cp313t-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:7e87577720152d2caae19fe2baaf1f8d5ca12091e9e229f03915c37d1e4b9178", size = 871135, upload-time = "2026-05-09T23:13:44.326Z" }, - { url = "https://files.pythonhosted.org/packages/18/d4/80882e799e440dd878b0979cbebf8fa4d54624a332c83037c7a701649e3f/regex-2026.5.9-cp313-cp313t-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:c8b9b9d294cfea3cd19c718ade7cc93492b2c4991abd9a68d0b3477ae6d8e100", size = 917265, upload-time = "2026-05-09T23:13:47.295Z" }, - { url = "https://files.pythonhosted.org/packages/ae/ff/8db60211e2286e396aad7dc7725356c502bff0901ea05bd6cdc2e1a042b9/regex-2026.5.9-cp313-cp313t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:728d8bfd28a8845c8b6bc5dc7ce010453d206396786c0765c2740cb65f37791e", size = 816311, upload-time = "2026-05-09T23:13:49.885Z" }, - { url = "https://files.pythonhosted.org/packages/4c/47/742ef579c61730f8d268e5cf1f9ce0e37e2ea041ad0f5644724f2378e463/regex-2026.5.9-cp313-cp313t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:7e30b874d341fac767d7df5a0870540541c2c054b80cfaac116e8d367a8a7ff2", size = 785498, upload-time = "2026-05-09T23:13:52.25Z" }, - { url = "https://files.pythonhosted.org/packages/7f/ab/cb0999802dcb0fb95b1ab005e8d4163d8afdd67efc2cb6b6630ac13f8cb1/regex-2026.5.9-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:fd190e88a895a8901325fad284a3f74ea52b1da8525b76cc811fa9b1edf0ce2b", size = 801348, upload-time = "2026-05-09T23:13:54.127Z" }, - { url = "https://files.pythonhosted.org/packages/7d/62/8ca59a24c55bc34d166eefaf3717bd77772f329fdbf984d86581e0a3571c/regex-2026.5.9-cp313-cp313t-musllinux_1_2_ppc64le.whl", hash = "sha256:8e76e8161ad00694cfce6767d5dea860c6391ac5b83e5c3a39661e696f11fc7e", size = 866493, upload-time = "2026-05-09T23:13:56.067Z" }, - { url = "https://files.pythonhosted.org/packages/8d/3d/30f2ae62cef3278bb5bb821f467277a55fb73f01032cf85997e15e8289a8/regex-2026.5.9-cp313-cp313t-musllinux_1_2_riscv64.whl", hash = "sha256:ddda5340e6c01a293027dd46232fa79eaff1b48058ce7a98f572b6445b088041", size = 772811, upload-time = "2026-05-09T23:13:57.867Z" }, - { url = "https://files.pythonhosted.org/packages/d8/ae/7d2089bcd78ad0c0161bc684339df50032acb438a7bd3305e7ddb1193cec/regex-2026.5.9-cp313-cp313t-musllinux_1_2_s390x.whl", hash = "sha256:205109e96b3cf5adf8f4cd62bedde9487feb282b9497a3535451e5a24cd706a0", size = 856584, upload-time = "2026-05-09T23:13:59.679Z" }, - { url = "https://files.pythonhosted.org/packages/a9/29/92ff47f75990131ea4f24ba17819e5a9d141e10819807e09addd73409af6/regex-2026.5.9-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:dfbe4579b9f08036aa7d101d1835437a20783574ac66327e6b29b4018a138081", size = 803453, upload-time = "2026-05-09T23:14:01.978Z" }, - { url = "https://files.pythonhosted.org/packages/04/99/eff29f1037dcab36702c9ee5d6858cf1ce2336ea8ea2987f64245b99ea5e/regex-2026.5.9-cp313-cp313t-win32.whl", hash = "sha256:ed2c9e8068b614c574d8d30e543d617cf5379b0535d46f97ef00e904745a08b5", size = 269951, upload-time = "2026-05-09T23:14:03.661Z" }, - { url = "https://files.pythonhosted.org/packages/0e/9d/8870b8981d27b22cda77bb26a5ac7ebfa9c7d9e0dea195a834a82380e748/regex-2026.5.9-cp313-cp313t-win_amd64.whl", hash = "sha256:b46b0f094dc1d3b90356c85a0bd2c9bafc4a6a190b9d6f8ddd5a033b6e088ed4", size = 281240, upload-time = "2026-05-09T23:14:05.56Z" }, - { url = "https://files.pythonhosted.org/packages/72/b1/3379415e8f135c13ac551353397cc4fe97b4978f3cac73c5fcbcded548b8/regex-2026.5.9-cp313-cp313t-win_arm64.whl", hash = "sha256:872acc074bd29ffc9913ecdfedf6ea77502312ca44a4aa0d3779089c6069d8de", size = 272383, upload-time = "2026-05-09T23:14:07.843Z" }, { url = "https://files.pythonhosted.org/packages/13/3e/9c3cd292d8808b3645a2ce517e200179b6d0e903f176300bd8b542e14de5/regex-2026.5.9-cp314-cp314-macosx_10_13_universal2.whl", hash = "sha256:1bd7587a2948b4085195d5a3374eaf4a425dc3e55784c038175355ecf3bbbf8a", size = 490376, upload-time = "2026-05-09T23:14:09.64Z" }, { url = "https://files.pythonhosted.org/packages/60/70/d43ee8a2ca0a8b68d167f21658b85520ac0574617c7f320367c5047f7556/regex-2026.5.9-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:dea2e88e1cce4522496cce630e11e67b98b7076620bc4336c3f674bc21a375f4", size = 291964, upload-time = "2026-05-09T23:14:11.424Z" }, { url = "https://files.pythonhosted.org/packages/21/91/9d50b433828d8e74196904e168a43abf1e6e88b2a15d47ed742456720c37/regex-2026.5.9-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:2099f7e7ff7b6aa3192312650a56e91cc091e49d50b04e4f6f8b6e28b3b27f1c", size = 289682, upload-time = "2026-05-09T23:14:13.123Z" }, @@ -4033,65 +2840,6 @@ version = "2026.5.1" source = { registry = "https://pypi.org/simple" } sdist = { url = "https://files.pythonhosted.org/packages/2e/43/25a8dcd3feedd735039a8f0b5b7e3b118232b5eae288c4fd9ab200d41094/rpds_py-2026.5.1.tar.gz", hash = "sha256:07b24fea40541e28570e5b795a4a38fbdcd12550c06bd0748005ecc8116ca256", size = 64459, upload-time = "2026-05-28T12:02:13.232Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/4f/a0/acf8b6fc20bfdcd3a45bd3f57680fb198e157b7e997b9123b10763798bd2/rpds_py-2026.5.1-cp311-cp311-macosx_10_12_x86_64.whl", hash = "sha256:3397a5ed7174dc2786bb214030232fc36fe8e5584fec43a9952cc542b1a12036", size = 355609, upload-time = "2026-05-28T11:58:50.78Z" }, - { url = "https://files.pythonhosted.org/packages/b6/95/f8203fd997484b1690a6869cd0e503b6c3c6be55b0ecc36d1a491fe742f0/rpds_py-2026.5.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:99ab6ba7bfa2cb0f96a04e3652355bf04e3f51aceb1e943b8541dab7ba4828cc", size = 348460, upload-time = "2026-05-28T11:58:52.374Z" }, - { url = "https://files.pythonhosted.org/packages/33/8c/b47326ad2f0be545a5e5c1a55937a12afaea7d392ba2837bb9680f57e6c9/rpds_py-2026.5.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d0efbe45632665e53e3db8fe1e5692db58fc5cb9bab4459d570b83efefe11164", size = 381031, upload-time = "2026-05-28T11:58:53.775Z" }, - { url = "https://files.pythonhosted.org/packages/22/0b/e83bbd97ffac6f6389b605cd4e1c8ac5761dc7e977769c9255d8c5adb7bd/rpds_py-2026.5.1-cp311-cp311-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:01d17b29c0c23d82b1f4751147ec49cf451f1fc2554eb9ef5f957e55d2656ead", size = 387121, upload-time = "2026-05-28T11:58:55.243Z" }, - { url = "https://files.pythonhosted.org/packages/fd/0e/d285d1bc8864245919c61e1ca82263e4a66d337759c3a4cef72766ff9afc/rpds_py-2026.5.1-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:7559f72b94ae52659086c595dfa017cde03155f7832071d30959049052cb3ece", size = 501026, upload-time = "2026-05-28T11:58:56.788Z" }, - { url = "https://files.pythonhosted.org/packages/86/06/ccb2109a1e543437b5e43816f2b43b9554cc6783145528a4e3711e05c011/rpds_py-2026.5.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9e25b7088f9ccbfc0dfcaa52bf969300ca229e10ecf758974ebcbb080a4b37bb", size = 391865, upload-time = "2026-05-28T11:58:58.298Z" }, - { url = "https://files.pythonhosted.org/packages/3d/33/237173db1cfef10105b3839a24de00eb8d2a523711add4632447cdf0aedd/rpds_py-2026.5.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:613fc4ee9eaef26dc5840666214dd6fbcebcf32f46e76f4abc473059f4e13dda", size = 378012, upload-time = "2026-05-28T11:58:59.589Z" }, - { url = "https://files.pythonhosted.org/packages/97/64/1eae54e34d5161f9969295e80bd6b62a55f2b6ac5f2a5b60d02c2140e758/rpds_py-2026.5.1-cp311-cp311-manylinux_2_31_riscv64.whl", hash = "sha256:85264a90ff4c05c1568dd65f5921c837614b67c60358fb4c17df3b7f2e90690a", size = 391111, upload-time = "2026-05-28T11:59:01.104Z" }, - { url = "https://files.pythonhosted.org/packages/d8/34/5bb334a5a0f65d77869217c4654f34c78a7d11b93938a3c076a2edeafc52/rpds_py-2026.5.1-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:fe71bca7d547acb17027c7fd1624ff8aae623499c498d3e7011182c4de5c25e0", size = 409225, upload-time = "2026-05-28T11:59:02.433Z" }, - { url = "https://files.pythonhosted.org/packages/16/0f/007ec21283b5b040b4ec3bd95e0402591e22bfa7d5c93dfe01c465c2d2d7/rpds_py-2026.5.1-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:a05fa4f41f37ec97c9c260441a940450a192f78d774d2b097eee1379f1e1246a", size = 556487, upload-time = "2026-05-28T11:59:04.012Z" }, - { url = "https://files.pythonhosted.org/packages/ff/10/5437c94508169b6b22d8418fef7a66e9ffb5f3b9e9c94460f2eedafe06ff/rpds_py-2026.5.1-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:df1d2a1996755b24b9ecee92cb4d36c28f86f464a6a173349c26bab41e94b8c2", size = 620798, upload-time = "2026-05-28T11:59:05.485Z" }, - { url = "https://files.pythonhosted.org/packages/e0/d5/9937dce4d6bda74157b954e7d1460db05a22f5929dccfeeba1ed27a93df0/rpds_py-2026.5.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:8895840ac4809e5f60c88fd07617cd71326e73d6e5a8aa783c5c0f7c24985de2", size = 584053, upload-time = "2026-05-28T11:59:06.837Z" }, - { url = "https://files.pythonhosted.org/packages/6c/31/750617dd0ae1752471bf43f9e41d263398fae7cde7849d23b8574a70e617/rpds_py-2026.5.1-cp311-cp311-win32.whl", hash = "sha256:3684a59b158a7683aaeb8e25352e9a9dd2122cec78f2d8530266e4f91b4c7b3f", size = 214390, upload-time = "2026-05-28T11:59:08.402Z" }, - { url = "https://files.pythonhosted.org/packages/3c/bb/3dcab0e1d9516303f2eb672a5d6f62eca5a69e2886301e9c8c54b520c39b/rpds_py-2026.5.1-cp311-cp311-win_amd64.whl", hash = "sha256:7bd530e6a530bb3ea892f194fafa455f3516ac25ecf7143fd33c09be62b0470a", size = 231097, upload-time = "2026-05-28T11:59:09.786Z" }, - { url = "https://files.pythonhosted.org/packages/49/d6/c6bbf5cb1cf12b9732df8074b57f6ef8341ba884c95d40632ae8bddb44e4/rpds_py-2026.5.1-cp311-cp311-win_arm64.whl", hash = "sha256:0a5ae4dbe43c1076983b72616496919872ae7bbe7a1e21cc48336bc3154d130b", size = 226361, upload-time = "2026-05-28T11:59:11.079Z" }, - { url = "https://files.pythonhosted.org/packages/d4/e7/a78582dc57caa592dcc7d4fb69b61390561e908eb3d2f5df5928a8e354c0/rpds_py-2026.5.1-cp312-cp312-macosx_10_12_x86_64.whl", hash = "sha256:3abe24a66e57adcfa645d718063a5fa5103ecc71ddbf26d78af8f9368018ff1d", size = 353040, upload-time = "2026-05-28T11:59:12.531Z" }, - { url = "https://files.pythonhosted.org/packages/a3/43/35e3f136343aef451e545ce8c38d36c2f93c0ed88703db8b64ba2b205c68/rpds_py-2026.5.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:58b1d94308ddf0b1982f61f2eb54bf92997c9ece8a8093ef014250f4a517906c", size = 345775, upload-time = "2026-05-28T11:59:13.827Z" }, - { url = "https://files.pythonhosted.org/packages/20/e1/0f2160c5982d3157734d5cb3ed63d8b2d583a73c9864f77b666449f32cf8/rpds_py-2026.5.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0fa92420128dadce7f54bd73ba1825a273e9268fe9e35dbf7e6362890efa4e08", size = 376329, upload-time = "2026-05-28T11:59:15.271Z" }, - { url = "https://files.pythonhosted.org/packages/d0/11/ee0ba42aff83bf4effdbc576673c6be64c5e173978c3f6d537e94482f77d/rpds_py-2026.5.1-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:ca653c6546386227cd9800d1bef6a348099acf8db4250341da6d90f663d6dfcb", size = 383539, upload-time = "2026-05-28T11:59:16.665Z" }, - { url = "https://files.pythonhosted.org/packages/11/df/d94aa6a499d4ac40afe2d7620f2c597fd3c0f182e854ad7cf3f596a81cb6/rpds_py-2026.5.1-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:66c93681c4729e4e3ecba31b8179fae083ff3118841672835140338b4b9867c1", size = 494674, upload-time = "2026-05-28T11:59:17.991Z" }, - { url = "https://files.pythonhosted.org/packages/1f/75/33d30f43bb2f458de11979486a591b1bf6e5651765ed1704c6197c2dc773/rpds_py-2026.5.1-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:40ff257542e04796880e011e15cd4dc21c2599975df2aaa8f2c8495ca574e1a5", size = 389268, upload-time = "2026-05-28T11:59:19.434Z" }, - { url = "https://files.pythonhosted.org/packages/f4/1e/2c9096fc19d5fd084b0184ca2b651e659aa0a37e6fdbecf6ece47f147fe1/rpds_py-2026.5.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b6825cc329b290e93c5f6a9be2393118a763f6ccf6abd83704e0c102ca583644", size = 376280, upload-time = "2026-05-28T11:59:21Z" }, - { url = "https://files.pythonhosted.org/packages/b9/e5/61ec9f8be8211ea7f48448195549e4aaf02004083475493b0e137702ecb2/rpds_py-2026.5.1-cp312-cp312-manylinux_2_31_riscv64.whl", hash = "sha256:de42116e69cb53b911cc34aee5ab98f36c597b822545045d49e938818b99e5e4", size = 387233, upload-time = "2026-05-28T11:59:22.454Z" }, - { url = "https://files.pythonhosted.org/packages/0d/ca/bcec1005c4f4a234f92a29078631fee49206c7265ccae966f18fd332e80e/rpds_py-2026.5.1-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:c0f920015df2a504bebaba6d4c31ccf3fcf942f92655c086da30b671aad19aa6", size = 405009, upload-time = "2026-05-28T11:59:23.845Z" }, - { url = "https://files.pythonhosted.org/packages/72/e6/4d5718c5cf26c522dc7c9999e238da1e77380b81d0c5d1df11e271ddfeb1/rpds_py-2026.5.1-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:0408a24e44feb919423dc6d9da677cb5cddb894d2ca9e763967d156d9c60fab4", size = 553113, upload-time = "2026-05-28T11:59:25.184Z" }, - { url = "https://files.pythonhosted.org/packages/d4/25/2ee807bdb3e1f0b7eddf7782acd5665a8b5205a331a7d7244a52c4812fd9/rpds_py-2026.5.1-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:cea68bcd53467561ae2f96a6bdad1544299ba97b5b0ddcd5ac3d376e5c781c24", size = 618838, upload-time = "2026-05-28T11:59:26.749Z" }, - { url = "https://files.pythonhosted.org/packages/6a/c1/7d4c26f167f8c41501cc073d30ee22082b16ce358cf5b00ec97cbc7804ea/rpds_py-2026.5.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:4be8b1d2a705cc37d08256004e1d07de143fa0075c8e85a3df020b776f62b732", size = 582436, upload-time = "2026-05-28T11:59:28.11Z" }, - { url = "https://files.pythonhosted.org/packages/04/1d/9d12b0a337bab46f4769f8857f4007e3b2d639e14f9a44a0efe157696e64/rpds_py-2026.5.1-cp312-cp312-win32.whl", hash = "sha256:6736718bd4fc49cbcb538ba30516fdbef161522acefb739657d48b97bd864fed", size = 212734, upload-time = "2026-05-28T11:59:29.689Z" }, - { url = "https://files.pythonhosted.org/packages/c5/93/e4116f2de7f56bc7406a76033dc501811ddeb22b7f056b92d632871ebb0c/rpds_py-2026.5.1-cp312-cp312-win_amd64.whl", hash = "sha256:0a7d1eec967df0e9b22614a5e177622e0c89611d03727fa0cb48e45028907870", size = 229045, upload-time = "2026-05-28T11:59:31.033Z" }, - { url = "https://files.pythonhosted.org/packages/cb/53/6c3419d85eb2ec5938a37627c585b42d76a63bb731d6e42ed4b079ebf486/rpds_py-2026.5.1-cp312-cp312-win_arm64.whl", hash = "sha256:1841d067089e117142d79b98aa0df2f08b52f2ecc1819dd2700636c0db74a473", size = 223967, upload-time = "2026-05-28T11:59:32.318Z" }, - { url = "https://files.pythonhosted.org/packages/6c/32/14c961ad295f490eb0849ada8b79683e93a59b9de3afdd983eaf55fa6867/rpds_py-2026.5.1-cp313-cp313-macosx_10_12_x86_64.whl", hash = "sha256:efef4ac29c6ff495531eb17ee705b62841ecaa291b7c7077e848ea03e237164d", size = 352787, upload-time = "2026-05-28T11:59:33.655Z" }, - { url = "https://files.pythonhosted.org/packages/ca/bb/d1b85117967c11191441a7274ae616c65d93901d082c588f89a50a8da5ae/rpds_py-2026.5.1-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:c39f5b67a8a2e67179ada2a954227d670fe65fa9098457f698f56ddf248709b3", size = 345179, upload-time = "2026-05-28T11:59:35Z" }, - { url = "https://files.pythonhosted.org/packages/7c/46/d84105f062e626a1b233f863907288a4708c2d833b8b4c6fb2764bc080c0/rpds_py-2026.5.1-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b5c30f3f04eef4fbd362226a6f31d7c8895ca4fbb6e0b790f6890a98d8da8559", size = 376173, upload-time = "2026-05-28T11:59:36.43Z" }, - { url = "https://files.pythonhosted.org/packages/e2/ae/469d7959ce5b1201e1de135dc735b86db3b35dd0d1734f6a44246d5f061c/rpds_py-2026.5.1-cp313-cp313-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:277f6c82f0580848796c7ecc8a7173aa3bfb928e4ff831261c2f60a81dc270db", size = 383162, upload-time = "2026-05-28T11:59:37.995Z" }, - { url = "https://files.pythonhosted.org/packages/dc/a2/57853d31a1116a561aa072794602ad3f6341e18d70a8523f1bd5b9fc1e5a/rpds_py-2026.5.1-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:63c2c4c213f1a4e3f3de28ecab029dbdee976324e729c0d7a55211be72576b02", size = 495093, upload-time = "2026-05-28T11:59:39.453Z" }, - { url = "https://files.pythonhosted.org/packages/99/63/3a8eabcad9314b7daf5c65f451d2c33d989235cd8a5762186cf2c3f5a4f8/rpds_py-2026.5.1-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:3350ec808fb538fe71a1f94dfaa0e29c598dfad805ce49f0caec5ae3183c652b", size = 389829, upload-time = "2026-05-28T11:59:40.896Z" }, - { url = "https://files.pythonhosted.org/packages/4b/25/05678d97fc25e2622df14dc530fb82023174ecfff6733991ed0d78f167bd/rpds_py-2026.5.1-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b1b964e3ab599e718dc46c018d104b1ebc007cbc6567d827c94a687fca56d77e", size = 374786, upload-time = "2026-05-28T11:59:42.626Z" }, - { url = "https://files.pythonhosted.org/packages/88/d1/8c90b6431e80a3b91b284a5c7c8c0c4f9c006444d90477a740d6e0f9c694/rpds_py-2026.5.1-cp313-cp313-manylinux_2_31_riscv64.whl", hash = "sha256:19cb09fab7b7fc96b2a6e28f2e34b72a3705ff27b37edb77455316e5d3f3dc9b", size = 386920, upload-time = "2026-05-28T11:59:44.124Z" }, - { url = "https://files.pythonhosted.org/packages/ff/99/4638f672ab356682d633ee0da9255f5b67ce6efd0b85eb94ad3e255e65a5/rpds_py-2026.5.1-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:abe76bcdba31e576cb83eeb8797aa0d882b738fef6dc65d0601fc753806a5b46", size = 405059, upload-time = "2026-05-28T11:59:47.177Z" }, - { url = "https://files.pythonhosted.org/packages/66/3f/3546524b6eb4cc2e1f363a3d638fa52f6c24faae3500c25fb488b02f1740/rpds_py-2026.5.1-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:8bff7073db3899158fff55ebf57b113a67030af26f80a18978f9f0aa60250ddf", size = 553030, upload-time = "2026-05-28T11:59:48.603Z" }, - { url = "https://files.pythonhosted.org/packages/c6/c3/7b3388c796fcf471bd17194242d4dc1a7608567c0fa422bcc1c5e79f9c1e/rpds_py-2026.5.1-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:8ba264fa49be666cd9cc56bf34ec7002fb3d27a4aee5bcb4d43d0d18feb1bb6f", size = 618975, upload-time = "2026-05-28T11:59:50.314Z" }, - { url = "https://files.pythonhosted.org/packages/61/1e/a3cb07f2795075d1d88efddae2f541359fde5f08c81ee114c29c2949c90a/rpds_py-2026.5.1-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:4860b603ddda0475a8885499b3729e90229d480105b42651962a5397d995fa89", size = 581178, upload-time = "2026-05-28T11:59:51.673Z" }, - { url = "https://files.pythonhosted.org/packages/a1/74/e758c03a5ef46f04c37f2651a2893db846d569ba8a7bca469d4b58939bcd/rpds_py-2026.5.1-cp313-cp313-win32.whl", hash = "sha256:7944270ae71383f6e2657dd7d5ce4eeb4ac2d0059a6738f0510583d462ab4842", size = 212481, upload-time = "2026-05-28T11:59:53.148Z" }, - { url = "https://files.pythonhosted.org/packages/70/ec/a2aca432db9c7359b40fa393eeeaa0d166c2f70175be956e75fa24197c44/rpds_py-2026.5.1-cp313-cp313-win_amd64.whl", hash = "sha256:88647f43a73c4e01be19b04ceef0c8d3a1958153604d13c773becd8016f2a0cf", size = 228519, upload-time = "2026-05-28T11:59:54.505Z" }, - { url = "https://files.pythonhosted.org/packages/29/60/a73bfdd45b096574556acf303bbd9fa9eed36ca8a818b514e2a5d5fe2b9d/rpds_py-2026.5.1-cp313-cp313-win_arm64.whl", hash = "sha256:453895624ecf7db7063b1004e44037522bbaef9ff6a945e59bc71662d7a03abd", size = 223446, upload-time = "2026-05-28T11:59:56.081Z" }, - { url = "https://files.pythonhosted.org/packages/18/e2/408105fd611823f00882aea810f3989a30d26b1bab8b6beb20f98c724e0e/rpds_py-2026.5.1-cp313-cp313t-macosx_10_12_x86_64.whl", hash = "sha256:b4e4bc98639ec915f512fde3aa7a95e0041d95d9c3cc86eea841fa63cb1e8600", size = 355287, upload-time = "2026-05-28T11:59:57.448Z" }, - { url = "https://files.pythonhosted.org/packages/8d/58/5c4a43436843c90d0f6d19f82c200c80e3843ca9fa07b237623327f6d384/rpds_py-2026.5.1-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:cacedb7a6e167680acba45ad5716e89067d225dc80da0d7040cae8c81d4572fa", size = 347033, upload-time = "2026-05-28T11:59:58.881Z" }, - { url = "https://files.pythonhosted.org/packages/fb/c2/1a71acdacaf4e259b10278fb87b039ded3cf80041bcd89dd8a3ea702ded6/rpds_py-2026.5.1-cp313-cp313t-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:68700371c5d7ae1412862ddfa719090925c93ecf351c566d66f09d04b136ea00", size = 376891, upload-time = "2026-05-28T12:00:00.516Z" }, - { url = "https://files.pythonhosted.org/packages/c2/c8/535f3d9b65addd8e28aa87b83c6e526799c3717a88273db8ea795beeef7a/rpds_py-2026.5.1-cp313-cp313t-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:296c799becfa849c779c8725494fe9ed94959ed886787df4364b058465bad7f0", size = 385646, upload-time = "2026-05-28T12:00:02.394Z" }, - { url = "https://files.pythonhosted.org/packages/1c/91/dc033f313345c354ade914dbe73cdb90b615a4409ea02430d5356794f3d8/rpds_py-2026.5.1-cp313-cp313t-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:d3858b908218ee108d0bbfb2095ccc237648053c9bf98affad7cb079acaf1d97", size = 498830, upload-time = "2026-05-28T12:00:04.189Z" }, - { url = "https://files.pythonhosted.org/packages/27/fc/90fcbea459dbb8ddc18a2e0fd1de9412b48bc84ffff2db771cf714bacfd6/rpds_py-2026.5.1-cp313-cp313t-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:4fb8d2e7cb2f850b169806d61d1b991738acec96500a75c30f49caf064ce7cef", size = 392830, upload-time = "2026-05-28T12:00:05.797Z" }, - { url = "https://files.pythonhosted.org/packages/b2/1d/46cd11a228c9750684a798d98f878be6f614aa762438da7378f035e79e35/rpds_py-2026.5.1-cp313-cp313t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:27b74c10ed6a8f190f4287f53bcfea348b92a84a9c9f70d30183d1e6172d580d", size = 379613, upload-time = "2026-05-28T12:00:07.433Z" }, - { url = "https://files.pythonhosted.org/packages/24/4a/d9b0c6af3a1de03eb93741bbe8be2bdce84d8fda8224f3005451d86df389/rpds_py-2026.5.1-cp313-cp313t-manylinux_2_31_riscv64.whl", hash = "sha256:b9a6528956191c48c52294a592dbd4a8386d7048bdb25c0efcb6b966466c6d83", size = 388183, upload-time = "2026-05-28T12:00:09.227Z" }, - { url = "https://files.pythonhosted.org/packages/c5/b4/db7aaabdda6d020afc87d981bcc2f57a434c7dec60ecfc2ab3dd50b20351/rpds_py-2026.5.1-cp313-cp313t-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:af03e34e860047bc7a352b842856fcf78798fbb81132cc98bd2f907ab4eb9cd2", size = 408578, upload-time = "2026-05-28T12:00:10.779Z" }, - { url = "https://files.pythonhosted.org/packages/08/d6/070f6a41cbb343e2ac4171859bf3f3623e0ab002f72619d6d505313ec2de/rpds_py-2026.5.1-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:fea6e836d10abbe191d557d33bd58bd5987725fe63aa1eefe557d230209855bd", size = 553573, upload-time = "2026-05-28T12:00:12.443Z" }, - { url = "https://files.pythonhosted.org/packages/75/ab/1a71ea3589c4345dac0a0518f0e6a031cb42689277851b683c46d27463a5/rpds_py-2026.5.1-cp313-cp313t-musllinux_1_2_i686.whl", hash = "sha256:fc0c0f878ea770a0a8a462456c5ad36fc9fe6358e6b76fdadc7f17575e0b8bf1", size = 620861, upload-time = "2026-05-28T12:00:14.09Z" }, - { url = "https://files.pythonhosted.org/packages/8a/22/9bf80a56069c0c443fcfefac639a86a744550a2898817a6dfd3e26654924/rpds_py-2026.5.1-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:e0b360f316d966b048b085857630b3cc51f3db2f07b06f440eac8f695374d1e3", size = 585633, upload-time = "2026-05-28T12:00:15.66Z" }, - { url = "https://files.pythonhosted.org/packages/da/68/3b2c0a75c9e04125696f84ebdbbf304acf5a40b58ba4481cdb98a922c3ba/rpds_py-2026.5.1-cp313-cp313t-win32.whl", hash = "sha256:a2999883eedf72fdfb7520b92c7d4ec2572a71ff40239377aa604cc529eecafc", size = 210074, upload-time = "2026-05-28T12:00:17.291Z" }, - { url = "https://files.pythonhosted.org/packages/e7/8b/609157d5a25d37d4f29f92840ba531f416907c34ae5c5739dd21fc2bef98/rpds_py-2026.5.1-cp313-cp313t-win_amd64.whl", hash = "sha256:e07be2a9d7122bd6e82dea89814ef8dc893feb1aae97fec1630f3263bbb30e55", size = 228635, upload-time = "2026-05-28T12:00:18.73Z" }, { url = "https://files.pythonhosted.org/packages/d4/6f/19c1918a4b590d8de87e712e4abe4b3875771eff60216fb6153cf6665c68/rpds_py-2026.5.1-cp314-cp314-macosx_10_12_x86_64.whl", hash = "sha256:1f2c391c3059798093b65df23aca2cac150460ae9c630d99dec83d703d9485b9", size = 349756, upload-time = "2026-05-28T12:00:20.217Z" }, { url = "https://files.pythonhosted.org/packages/e5/60/a06fe7da34eca79dacbf958a2ba0c6eea85bc2b29de20080bf40f72f66fa/rpds_py-2026.5.1-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:413b424f7c4ee65ab5e5be91f5731be0f8b41a1ee2b12dfe810d716312e95a78", size = 343831, upload-time = "2026-05-28T12:00:21.711Z" }, { url = "https://files.pythonhosted.org/packages/bf/ec/b2333b97b90e2a6ef6ca8ad386ee284968e74bcfe113b3f1a8d9036429a9/rpds_py-2026.5.1-cp314-cp314-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2c595a1d9255dce0599e13130d1440ab2506654f2b50294226ee06402f8fef63", size = 375127, upload-time = "2026-05-28T12:00:23.326Z" }, @@ -4150,18 +2898,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/77/65/38ab2f90df44c2febfb63cc10ced40763d9b4bc94d173e734528663fe7f5/rpds_py-2026.5.1-cp315-cp315t-musllinux_1_2_x86_64.whl", hash = "sha256:b1be5c35683684d5331b93600c210e8367c254683d8a6df6bd21bd2da3a334fb", size = 581839, upload-time = "2026-05-28T12:01:48.109Z" }, { url = "https://files.pythonhosted.org/packages/15/2d/ce1f605fe036aadd460e5822e578c6c7ec3a860936cca37d6e0f299daa77/rpds_py-2026.5.1-cp315-cp315t-win32.whl", hash = "sha256:75808f6c38ce7749bb68cc2770161aae5045e6c6f6781a9782e74b93304399df", size = 207866, upload-time = "2026-05-28T12:01:49.648Z" }, { url = "https://files.pythonhosted.org/packages/79/cb/966040123eb102371559746908ef2c9471f4d43e17ec9a645a2258dab64b/rpds_py-2026.5.1-cp315-cp315t-win_amd64.whl", hash = "sha256:90bd6630002a1c7f09e7843dd79f0d24f3d2897cc25a753480917865d14f15b3", size = 225441, upload-time = "2026-05-28T12:01:51.408Z" }, - { url = "https://files.pythonhosted.org/packages/42/56/3fe0fb34820ff667be791b3a3c22b85e8bcba54e9c832f47438c191fa7be/rpds_py-2026.5.1-pp311-pypy311_pp73-macosx_10_12_x86_64.whl", hash = "sha256:edf2765d84e42447f112ad877af8fe1db0089aaec5b28e88d6eab45e7fe99cea", size = 357151, upload-time = "2026-05-28T12:01:53.43Z" }, - { url = "https://files.pythonhosted.org/packages/8b/f2/3eb9ccdb9f143b8c9b003978898cb497f942a324c077401e6b8834238e63/rpds_py-2026.5.1-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:ad3773236e95f7f33991eb125224b7da66f206504d032a253a02da7e134519fb", size = 350195, upload-time = "2026-05-28T12:01:54.901Z" }, - { url = "https://files.pythonhosted.org/packages/a7/24/dbda232bc4f3ed732120692ab0d2c8402cb020516556d8bee622dcef2413/rpds_py-2026.5.1-pp311-pypy311_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a04df86b3f0fade39ec8fd0e0aab089b1da9fbd2b48df778a57ef96f5e7d38df", size = 381850, upload-time = "2026-05-28T12:01:56.601Z" }, - { url = "https://files.pythonhosted.org/packages/40/30/32e769839a358f78810c234f160f2cc21d1e4e47e1c0e0e0d535be5a0219/rpds_py-2026.5.1-pp311-pypy311_pp73-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:6142dbd80c4df62a5d899f0d616d417f84e0bc8d32526c8e5589019d75d028a7", size = 387899, upload-time = "2026-05-28T12:01:58.212Z" }, - { url = "https://files.pythonhosted.org/packages/ab/86/ec84d243aadb3b34b71dd26a010d0930b2d284ff5fc9a69fec53810ee6fd/rpds_py-2026.5.1-pp311-pypy311_pp73-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:0b35217adefe87f2fe4db7e9766cabe84744bfe9616d9667be18988928c7f2dc", size = 501618, upload-time = "2026-05-28T12:01:59.888Z" }, - { url = "https://files.pythonhosted.org/packages/74/25/b60e52686bbff777a64f9e4f4d3dd57980dc846913777177a2c92e4937aa/rpds_py-2026.5.1-pp311-pypy311_pp73-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b95d5e11fc712b752081183a55a244c03cd00570489edd7014d8899f8ceb8162", size = 394003, upload-time = "2026-05-28T12:02:01.482Z" }, - { url = "https://files.pythonhosted.org/packages/9b/c7/b3a6a588cc2219510ef3f42e207483a93950bedd1e3a0fd4015c95cff9e5/rpds_py-2026.5.1-pp311-pypy311_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:141c9498daf2ace9eda35d2b0e376f9ea8b058d84f2aef4f96fccfd449a2f251", size = 379778, upload-time = "2026-05-28T12:02:03.197Z" }, - { url = "https://files.pythonhosted.org/packages/31/00/c7dba3fc8a3da8cb3f6db1eb3386be4d79c2e97c6890d20eb9ac66ae8c43/rpds_py-2026.5.1-pp311-pypy311_pp73-manylinux_2_31_riscv64.whl", hash = "sha256:6f249f8b860a200ad35193af961183ebe9132710484e6f6ce0cf89fd83c63a9a", size = 392359, upload-time = "2026-05-28T12:02:04.817Z" }, - { url = "https://files.pythonhosted.org/packages/93/dd/472ba494c70753f93745992c99855bee0636daf74e6984e5e003f150316f/rpds_py-2026.5.1-pp311-pypy311_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:e4abbf391a70be864920858bf360f4fb380577c9a0f732438a1996726e2c195b", size = 412820, upload-time = "2026-05-28T12:02:06.401Z" }, - { url = "https://files.pythonhosted.org/packages/1d/6f/93831a3bfe789542ed0c1d0d74b78b440f055d6dc3ea4640eba2d95e6e23/rpds_py-2026.5.1-pp311-pypy311_pp73-musllinux_1_2_aarch64.whl", hash = "sha256:c74005a7bb87752acf351c93897ec63ad77a07a0da7ecad9c050e32e7286ba34", size = 557243, upload-time = "2026-05-28T12:02:08.013Z" }, - { url = "https://files.pythonhosted.org/packages/1f/ff/0b3d604614ffc77522c6b288fdbce68957eb583da1002aa65ba38ac0ee40/rpds_py-2026.5.1-pp311-pypy311_pp73-musllinux_1_2_i686.whl", hash = "sha256:8213afbe8a3a906fb9acb2014423fe3359ee783d0bf90995f70623a3217bfa6c", size = 623541, upload-time = "2026-05-28T12:02:09.661Z" }, - { url = "https://files.pythonhosted.org/packages/ea/ea/e7b0251441da9adfeaebcf29601d10f2a1455fcf0772fae9e7e19032bd96/rpds_py-2026.5.1-pp311-pypy311_pp73-musllinux_1_2_x86_64.whl", hash = "sha256:8c43a8a973270fd173bf48cdf80bbe66312421cba68d40845034f174f2389049", size = 586326, upload-time = "2026-05-28T12:02:11.47Z" }, ] [[package]] @@ -4201,6 +2937,31 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/b8/0c/51f6841f1d84f404f92463fc2b1ba0da357ca1e3db6b7fbda26956c3b82a/ruamel_yaml-0.19.1-py3-none-any.whl", hash = "sha256:27592957fedf6e0b62f281e96effd28043345e0e66001f97683aa9a40c667c93", size = 118102, upload-time = "2026-01-02T16:50:29.201Z" }, ] +[[package]] +name = "ruff" +version = "0.15.15" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/84/6f/a76f7d96e5c962f5b69cee865e49c15c1116897c01990faa8a57edb62e7f/ruff-0.15.15.tar.gz", hash = "sha256:b8dff018130b46d8e5bf0f926ef6b60cf871d6d5ae45fc9334e09632daa741d6", size = 4706985, upload-time = "2026-05-28T14:16:57.784Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/fa/9d/3a45c05b8ab04b4705989de70a79008e27c8003296a0feaee9edc18dd7e9/ruff-0.15.15-py3-none-linux_armv6l.whl", hash = "sha256:cf93e5388f412e1b108b1f8b34a6e036b70fe8aff89393befad96fe48670311b", size = 10710652, upload-time = "2026-05-28T14:16:06.701Z" }, + { url = "https://files.pythonhosted.org/packages/05/66/da974431624bf3b49f6ee1f9543c02d929ff1cba78b0d5a79c38cf21f744/ruff-0.15.15-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:ac5a646d1f6a7dadd5d50842dae2c1f9862ac887ef5d1b1375e02def791fde6e", size = 11096615, upload-time = "2026-05-28T14:16:23.313Z" }, + { url = "https://files.pythonhosted.org/packages/8c/09/7443452e5d290230a712103f2fdceeef7184f3ec99a2bd01c8be78aaceb5/ruff-0.15.15-py3-none-macosx_11_0_arm64.whl", hash = "sha256:77d955a431430c66f72dd94e379ad38a16daea3d25094872ac4edf9e797be530", size = 10436683, upload-time = "2026-05-28T14:16:40.974Z" }, + { url = "https://files.pythonhosted.org/packages/53/01/d330c26a57fa4f3943a14424904027428315b700fe4d14a84bb123a649e5/ruff-0.15.15-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7614ee79c69788cf6cedd568069ade9cecc22a1ad20494efe8d0c9ebb4b622d4", size = 10769064, upload-time = "2026-05-28T14:16:28.905Z" }, + { url = "https://files.pythonhosted.org/packages/1d/85/cc8770f8bdff541b1da8392d1634141fe4a0e3f4ee596605959b7906c27f/ruff-0.15.15-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:3cdb1679e06a1f6b47bc384714ae96f6e2fb65ca441eb78c43d2ca554176ce1f", size = 10511987, upload-time = "2026-05-28T14:16:43.732Z" }, + { url = "https://files.pythonhosted.org/packages/7c/29/8c190c1472b63013583ba391f3342036e02010544c1270455ed8e519bdf3/ruff-0.15.15-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2728b93d7b23a603ea2c0ac6eb73d760bd38ec9de35f35fb41e18f7a3fee7622", size = 11275100, upload-time = "2026-05-28T14:16:55.244Z" }, + { url = "https://files.pythonhosted.org/packages/9f/6b/7e145ce2cc8e63d6834eca03d83a0e18d121def5c69f91b4cf4011ed4879/ruff-0.15.15-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:be582fcc0db438902c7792b08d6ddf6c9b9e21addaa10092c2c741cfb09e5a45", size = 12176903, upload-time = "2026-05-28T14:16:14.368Z" }, + { url = "https://files.pythonhosted.org/packages/80/a3/d5974637f68e451f7fadf015cf3101d1cd7d8ba5027cffe0b9e3826ebe6b/ruff-0.15.15-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:7aa77465b8ecaf1a27bea098d696f7fed5e1eccbd10b321b682d6de586ae5627", size = 11404550, upload-time = "2026-05-28T14:16:20.138Z" }, + { url = "https://files.pythonhosted.org/packages/fe/1c/e6e5e568f22be4fb05d6244234aba384c06b451252453b821e1a529263cf/ruff-0.15.15-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:48decfa11d740de4889de623be1463308346312f2409a56e24aa280c86162dc4", size = 11382027, upload-time = "2026-05-28T14:16:46.615Z" }, + { url = "https://files.pythonhosted.org/packages/1d/01/170921b49fcd2e8858825593f91cf7146c3e40a5c3e6df763e4bb0484dde/ruff-0.15.15-py3-none-manylinux_2_31_riscv64.whl", hash = "sha256:a5015088452ca0081387063649ec67f06d3d1d6b8b936a1f836b5e9657ecd48c", size = 11366041, upload-time = "2026-05-28T14:16:26.247Z" }, + { url = "https://files.pythonhosted.org/packages/87/54/a7bad711d7de93254e15e06a4c375b89a03d18de45d3e5dcc86a4472fb1a/ruff-0.15.15-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:f5294aab6356c81600fcdea3a62bb1b924dfd5e91767c12318d3f68f86af57cd", size = 10741795, upload-time = "2026-05-28T14:16:17.11Z" }, + { url = "https://files.pythonhosted.org/packages/c9/31/38c075963668f8b41c6914ee0f6f318727fbe30ab9145cb29e6df464c5fa/ruff-0.15.15-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:db5bd4d802415cca656dc1616070b725952d6ae95eb5d4831e49fbd94a38f75f", size = 10511117, upload-time = "2026-05-28T14:16:31.767Z" }, + { url = "https://files.pythonhosted.org/packages/9d/96/6ff689e1f7e375d1d97075eca022f74c2bab59554a432fe4d2e6f091986a/ruff-0.15.15-py3-none-musllinux_1_2_i686.whl", hash = "sha256:587a6278ed42059191c1a466e490bd7930fb50bd2e255398bc29616c895a61cb", size = 10994867, upload-time = "2026-05-28T14:16:35.149Z" }, + { url = "https://files.pythonhosted.org/packages/c3/c2/5dce0ab9f92a8d534fa62b9bf9caca3eddb8c1a81b616f5e195ada4f0d6e/ruff-0.15.15-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:df0c1c084f5f4be9812f61518a45c440d3c30d69ce4bf6c5270e66d38338f02a", size = 11482101, upload-time = "2026-05-28T14:16:49.598Z" }, + { url = "https://files.pythonhosted.org/packages/b1/c0/1003b60edd697c649faf61f1a34094b1abb38fb3d1181e3f895781250a08/ruff-0.15.15-py3-none-win32.whl", hash = "sha256:29428ea79694afbe756d45fd59b36f22b6b020dc0443cf7de0173046236964b9", size = 10716774, upload-time = "2026-05-28T14:16:52.337Z" }, + { url = "https://files.pythonhosted.org/packages/02/a8/1269eddd6945a06c23f055ef7848886e37cf9d6a8bebb386a3115f01470c/ruff-0.15.15-py3-none-win_amd64.whl", hash = "sha256:8df0323902e15e24bc4bf246da830573d3cf3352bd0b9a164eab335d111ff4a4", size = 11868463, upload-time = "2026-05-28T14:16:11.333Z" }, + { url = "https://files.pythonhosted.org/packages/4e/b2/920464c907b191e37469d477a1aa8bc048b8f36c4c1610dfa4ab87b39e18/ruff-0.15.15-py3-none-win_arm64.whl", hash = "sha256:3c8ceca6792f38196b8f589bc92eccd03eef286602da92e5dc05cc42ef6441b7", size = 11138498, upload-time = "2026-05-28T14:16:38.425Z" }, +] + [[package]] name = "s3transfer" version = "0.17.1" @@ -4222,46 +2983,6 @@ dependencies = [ ] sdist = { url = "https://files.pythonhosted.org/packages/7a/97/5a3609c4f8d58b039179648e62dd220f89864f56f7357f5d4f45c29eb2cc/scipy-1.17.1.tar.gz", hash = "sha256:95d8e012d8cb8816c226aef832200b1d45109ed4464303e997c5b13122b297c0", size = 30573822, upload-time = "2026-02-23T00:26:24.851Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/df/75/b4ce781849931fef6fd529afa6b63711d5a733065722d0c3e2724af9e40a/scipy-1.17.1-cp311-cp311-macosx_10_14_x86_64.whl", hash = "sha256:1f95b894f13729334fb990162e911c9e5dc1ab390c58aa6cbecb389c5b5e28ec", size = 31613675, upload-time = "2026-02-23T00:16:00.13Z" }, - { url = "https://files.pythonhosted.org/packages/f7/58/bccc2861b305abdd1b8663d6130c0b3d7cc22e8d86663edbc8401bfd40d4/scipy-1.17.1-cp311-cp311-macosx_12_0_arm64.whl", hash = "sha256:e18f12c6b0bc5a592ed23d3f7b891f68fd7f8241d69b7883769eb5d5dfb52696", size = 28162057, upload-time = "2026-02-23T00:16:09.456Z" }, - { url = "https://files.pythonhosted.org/packages/6d/ee/18146b7757ed4976276b9c9819108adbc73c5aad636e5353e20746b73069/scipy-1.17.1-cp311-cp311-macosx_14_0_arm64.whl", hash = "sha256:a3472cfbca0a54177d0faa68f697d8ba4c80bbdc19908c3465556d9f7efce9ee", size = 20334032, upload-time = "2026-02-23T00:16:17.358Z" }, - { url = "https://files.pythonhosted.org/packages/ec/e6/cef1cf3557f0c54954198554a10016b6a03b2ec9e22a4e1df734936bd99c/scipy-1.17.1-cp311-cp311-macosx_14_0_x86_64.whl", hash = "sha256:766e0dc5a616d026a3a1cffa379af959671729083882f50307e18175797b3dfd", size = 22709533, upload-time = "2026-02-23T00:16:25.791Z" }, - { url = "https://files.pythonhosted.org/packages/4d/60/8804678875fc59362b0fb759ab3ecce1f09c10a735680318ac30da8cd76b/scipy-1.17.1-cp311-cp311-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:744b2bf3640d907b79f3fd7874efe432d1cf171ee721243e350f55234b4cec4c", size = 33062057, upload-time = "2026-02-23T00:16:36.931Z" }, - { url = "https://files.pythonhosted.org/packages/09/7d/af933f0f6e0767995b4e2d705a0665e454d1c19402aa7e895de3951ebb04/scipy-1.17.1-cp311-cp311-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:43af8d1f3bea642559019edfe64e9b11192a8978efbd1539d7bc2aaa23d92de4", size = 35349300, upload-time = "2026-02-23T00:16:49.108Z" }, - { url = "https://files.pythonhosted.org/packages/b4/3d/7ccbbdcbb54c8fdc20d3b6930137c782a163fa626f0aef920349873421ba/scipy-1.17.1-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:cd96a1898c0a47be4520327e01f874acfd61fb48a9420f8aa9f6483412ffa444", size = 35127333, upload-time = "2026-02-23T00:17:01.293Z" }, - { url = "https://files.pythonhosted.org/packages/e8/19/f926cb11c42b15ba08e3a71e376d816ac08614f769b4f47e06c3580c836a/scipy-1.17.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:4eb6c25dd62ee8d5edf68a8e1c171dd71c292fdae95d8aeb3dd7d7de4c364082", size = 37741314, upload-time = "2026-02-23T00:17:12.576Z" }, - { url = "https://files.pythonhosted.org/packages/95/da/0d1df507cf574b3f224ccc3d45244c9a1d732c81dcb26b1e8a766ae271a8/scipy-1.17.1-cp311-cp311-win_amd64.whl", hash = "sha256:d30e57c72013c2a4fe441c2fcb8e77b14e152ad48b5464858e07e2ad9fbfceff", size = 36607512, upload-time = "2026-02-23T00:17:23.424Z" }, - { url = "https://files.pythonhosted.org/packages/68/7f/bdd79ceaad24b671543ffe0ef61ed8e659440eb683b66f033454dcee90eb/scipy-1.17.1-cp311-cp311-win_arm64.whl", hash = "sha256:9ecb4efb1cd6e8c4afea0daa91a87fbddbce1b99d2895d151596716c0b2e859d", size = 24599248, upload-time = "2026-02-23T00:17:34.561Z" }, - { url = "https://files.pythonhosted.org/packages/35/48/b992b488d6f299dbe3f11a20b24d3dda3d46f1a635ede1c46b5b17a7b163/scipy-1.17.1-cp312-cp312-macosx_10_14_x86_64.whl", hash = "sha256:35c3a56d2ef83efc372eaec584314bd0ef2e2f0d2adb21c55e6ad5b344c0dcb8", size = 31610954, upload-time = "2026-02-23T00:17:49.855Z" }, - { url = "https://files.pythonhosted.org/packages/b2/02/cf107b01494c19dc100f1d0b7ac3cc08666e96ba2d64db7626066cee895e/scipy-1.17.1-cp312-cp312-macosx_12_0_arm64.whl", hash = "sha256:fcb310ddb270a06114bb64bbe53c94926b943f5b7f0842194d585c65eb4edd76", size = 28172662, upload-time = "2026-02-23T00:18:01.64Z" }, - { url = "https://files.pythonhosted.org/packages/cf/a9/599c28631bad314d219cf9ffd40e985b24d603fc8a2f4ccc5ae8419a535b/scipy-1.17.1-cp312-cp312-macosx_14_0_arm64.whl", hash = "sha256:cc90d2e9c7e5c7f1a482c9875007c095c3194b1cfedca3c2f3291cdc2bc7c086", size = 20344366, upload-time = "2026-02-23T00:18:12.015Z" }, - { url = "https://files.pythonhosted.org/packages/35/f5/906eda513271c8deb5af284e5ef0206d17a96239af79f9fa0aebfe0e36b4/scipy-1.17.1-cp312-cp312-macosx_14_0_x86_64.whl", hash = "sha256:c80be5ede8f3f8eded4eff73cc99a25c388ce98e555b17d31da05287015ffa5b", size = 22704017, upload-time = "2026-02-23T00:18:21.502Z" }, - { url = "https://files.pythonhosted.org/packages/da/34/16f10e3042d2f1d6b66e0428308ab52224b6a23049cb2f5c1756f713815f/scipy-1.17.1-cp312-cp312-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:e19ebea31758fac5893a2ac360fedd00116cbb7628e650842a6691ba7ca28a21", size = 32927842, upload-time = "2026-02-23T00:18:35.367Z" }, - { url = "https://files.pythonhosted.org/packages/01/8e/1e35281b8ab6d5d72ebe9911edcdffa3f36b04ed9d51dec6dd140396e220/scipy-1.17.1-cp312-cp312-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:02ae3b274fde71c5e92ac4d54bc06c42d80e399fec704383dcd99b301df37458", size = 35235890, upload-time = "2026-02-23T00:18:49.188Z" }, - { url = "https://files.pythonhosted.org/packages/c5/5c/9d7f4c88bea6e0d5a4f1bc0506a53a00e9fcb198de372bfe4d3652cef482/scipy-1.17.1-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:8a604bae87c6195d8b1045eddece0514d041604b14f2727bbc2b3020172045eb", size = 35003557, upload-time = "2026-02-23T00:18:54.74Z" }, - { url = "https://files.pythonhosted.org/packages/65/94/7698add8f276dbab7a9de9fb6b0e02fc13ee61d51c7c3f85ac28b65e1239/scipy-1.17.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:f590cd684941912d10becc07325a3eeb77886fe981415660d9265c4c418d0bea", size = 37625856, upload-time = "2026-02-23T00:19:00.307Z" }, - { url = "https://files.pythonhosted.org/packages/a2/84/dc08d77fbf3d87d3ee27f6a0c6dcce1de5829a64f2eae85a0ecc1f0daa73/scipy-1.17.1-cp312-cp312-win_amd64.whl", hash = "sha256:41b71f4a3a4cab9d366cd9065b288efc4d4f3c0b37a91a8e0947fb5bd7f31d87", size = 36549682, upload-time = "2026-02-23T00:19:07.67Z" }, - { url = "https://files.pythonhosted.org/packages/bc/98/fe9ae9ffb3b54b62559f52dedaebe204b408db8109a8c66fdd04869e6424/scipy-1.17.1-cp312-cp312-win_arm64.whl", hash = "sha256:f4115102802df98b2b0db3cce5cb9b92572633a1197c77b7553e5203f284a5b3", size = 24547340, upload-time = "2026-02-23T00:19:12.024Z" }, - { url = "https://files.pythonhosted.org/packages/76/27/07ee1b57b65e92645f219b37148a7e7928b82e2b5dbeccecb4dff7c64f0b/scipy-1.17.1-cp313-cp313-macosx_10_14_x86_64.whl", hash = "sha256:5e3c5c011904115f88a39308379c17f91546f77c1667cea98739fe0fccea804c", size = 31590199, upload-time = "2026-02-23T00:19:17.192Z" }, - { url = "https://files.pythonhosted.org/packages/ec/ae/db19f8ab842e9b724bf5dbb7db29302a91f1e55bc4d04b1025d6d605a2c5/scipy-1.17.1-cp313-cp313-macosx_12_0_arm64.whl", hash = "sha256:6fac755ca3d2c3edcb22f479fceaa241704111414831ddd3bc6056e18516892f", size = 28154001, upload-time = "2026-02-23T00:19:22.241Z" }, - { url = "https://files.pythonhosted.org/packages/5b/58/3ce96251560107b381cbd6e8413c483bbb1228a6b919fa8652b0d4090e7f/scipy-1.17.1-cp313-cp313-macosx_14_0_arm64.whl", hash = "sha256:7ff200bf9d24f2e4d5dc6ee8c3ac64d739d3a89e2326ba68aaf6c4a2b838fd7d", size = 20325719, upload-time = "2026-02-23T00:19:26.329Z" }, - { url = "https://files.pythonhosted.org/packages/b2/83/15087d945e0e4d48ce2377498abf5ad171ae013232ae31d06f336e64c999/scipy-1.17.1-cp313-cp313-macosx_14_0_x86_64.whl", hash = "sha256:4b400bdc6f79fa02a4d86640310dde87a21fba0c979efff5248908c6f15fad1b", size = 22683595, upload-time = "2026-02-23T00:19:30.304Z" }, - { url = "https://files.pythonhosted.org/packages/b4/e0/e58fbde4a1a594c8be8114eb4aac1a55bcd6587047efc18a61eb1f5c0d30/scipy-1.17.1-cp313-cp313-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:2b64ca7d4aee0102a97f3ba22124052b4bd2152522355073580bf4845e2550b6", size = 32896429, upload-time = "2026-02-23T00:19:35.536Z" }, - { url = "https://files.pythonhosted.org/packages/f5/5f/f17563f28ff03c7b6799c50d01d5d856a1d55f2676f537ca8d28c7f627cd/scipy-1.17.1-cp313-cp313-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:581b2264fc0aa555f3f435a5944da7504ea3a065d7029ad60e7c3d1ae09c5464", size = 35203952, upload-time = "2026-02-23T00:19:42.259Z" }, - { url = "https://files.pythonhosted.org/packages/8d/a5/9afd17de24f657fdfe4df9a3f1ea049b39aef7c06000c13db1530d81ccca/scipy-1.17.1-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:beeda3d4ae615106d7094f7e7cef6218392e4465cc95d25f900bebabfded0950", size = 34979063, upload-time = "2026-02-23T00:19:47.547Z" }, - { url = "https://files.pythonhosted.org/packages/8b/13/88b1d2384b424bf7c924f2038c1c409f8d88bb2a8d49d097861dd64a57b2/scipy-1.17.1-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:6609bc224e9568f65064cfa72edc0f24ee6655b47575954ec6339534b2798369", size = 37598449, upload-time = "2026-02-23T00:19:53.238Z" }, - { url = "https://files.pythonhosted.org/packages/35/e5/d6d0e51fc888f692a35134336866341c08655d92614f492c6860dc45bb2c/scipy-1.17.1-cp313-cp313-win_amd64.whl", hash = "sha256:37425bc9175607b0268f493d79a292c39f9d001a357bebb6b88fdfaff13f6448", size = 36510943, upload-time = "2026-02-23T00:20:50.89Z" }, - { url = "https://files.pythonhosted.org/packages/2a/fd/3be73c564e2a01e690e19cc618811540ba5354c67c8680dce3281123fb79/scipy-1.17.1-cp313-cp313-win_arm64.whl", hash = "sha256:5cf36e801231b6a2059bf354720274b7558746f3b1a4efb43fcf557ccd484a87", size = 24545621, upload-time = "2026-02-23T00:20:55.871Z" }, - { url = "https://files.pythonhosted.org/packages/6f/6b/17787db8b8114933a66f9dcc479a8272e4b4da75fe03b0c282f7b0ade8cd/scipy-1.17.1-cp313-cp313t-macosx_10_14_x86_64.whl", hash = "sha256:d59c30000a16d8edc7e64152e30220bfbd724c9bbb08368c054e24c651314f0a", size = 31936708, upload-time = "2026-02-23T00:19:58.694Z" }, - { url = "https://files.pythonhosted.org/packages/38/2e/524405c2b6392765ab1e2b722a41d5da33dc5c7b7278184a8ad29b6cb206/scipy-1.17.1-cp313-cp313t-macosx_12_0_arm64.whl", hash = "sha256:010f4333c96c9bb1a4516269e33cb5917b08ef2166d5556ca2fd9f082a9e6ea0", size = 28570135, upload-time = "2026-02-23T00:20:03.934Z" }, - { url = "https://files.pythonhosted.org/packages/fd/c3/5bd7199f4ea8556c0c8e39f04ccb014ac37d1468e6cfa6a95c6b3562b76e/scipy-1.17.1-cp313-cp313t-macosx_14_0_arm64.whl", hash = "sha256:2ceb2d3e01c5f1d83c4189737a42d9cb2fc38a6eeed225e7515eef71ad301dce", size = 20741977, upload-time = "2026-02-23T00:20:07.935Z" }, - { url = "https://files.pythonhosted.org/packages/d9/b8/8ccd9b766ad14c78386599708eb745f6b44f08400a5fd0ade7cf89b6fc93/scipy-1.17.1-cp313-cp313t-macosx_14_0_x86_64.whl", hash = "sha256:844e165636711ef41f80b4103ed234181646b98a53c8f05da12ca5ca289134f6", size = 23029601, upload-time = "2026-02-23T00:20:12.161Z" }, - { url = "https://files.pythonhosted.org/packages/6d/a0/3cb6f4d2fb3e17428ad2880333cac878909ad1a89f678527b5328b93c1d4/scipy-1.17.1-cp313-cp313t-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:158dd96d2207e21c966063e1635b1063cd7787b627b6f07305315dd73d9c679e", size = 33019667, upload-time = "2026-02-23T00:20:17.208Z" }, - { url = "https://files.pythonhosted.org/packages/f3/c3/2d834a5ac7bf3a0c806ad1508efc02dda3c8c61472a56132d7894c312dea/scipy-1.17.1-cp313-cp313t-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:74cbb80d93260fe2ffa334efa24cb8f2f0f622a9b9febf8b483c0b865bfb3475", size = 35264159, upload-time = "2026-02-23T00:20:23.087Z" }, - { url = "https://files.pythonhosted.org/packages/4d/77/d3ed4becfdbd217c52062fafe35a72388d1bd82c2d0ba5ca19d6fcc93e11/scipy-1.17.1-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:dbc12c9f3d185f5c737d801da555fb74b3dcfa1a50b66a1a93e09190f41fab50", size = 35102771, upload-time = "2026-02-23T00:20:28.636Z" }, - { url = "https://files.pythonhosted.org/packages/bd/12/d19da97efde68ca1ee5538bb261d5d2c062f0c055575128f11a2730e3ac1/scipy-1.17.1-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:94055a11dfebe37c656e70317e1996dc197e1a15bbcc351bcdd4610e128fe1ca", size = 37665910, upload-time = "2026-02-23T00:20:34.743Z" }, - { url = "https://files.pythonhosted.org/packages/06/1c/1172a88d507a4baaf72c5a09bb6c018fe2ae0ab622e5830b703a46cc9e44/scipy-1.17.1-cp313-cp313t-win_amd64.whl", hash = "sha256:e30bdeaa5deed6bc27b4cc490823cd0347d7dae09119b8803ae576ea0ce52e4c", size = 36562980, upload-time = "2026-02-23T00:20:40.575Z" }, - { url = "https://files.pythonhosted.org/packages/70/b0/eb757336e5a76dfa7911f63252e3b7d1de00935d7705cf772db5b45ec238/scipy-1.17.1-cp313-cp313t-win_arm64.whl", hash = "sha256:a720477885a9d2411f94a93d16f9d89bad0f28ca23c3f8daa521e2dcc3f44d49", size = 24856543, upload-time = "2026-02-23T00:20:45.313Z" }, { url = "https://files.pythonhosted.org/packages/cf/83/333afb452af6f0fd70414dc04f898647ee1423979ce02efa75c3b0f2c28e/scipy-1.17.1-cp314-cp314-macosx_10_14_x86_64.whl", hash = "sha256:a48a72c77a310327f6a3a920092fa2b8fd03d7deaa60f093038f22d98e096717", size = 31584510, upload-time = "2026-02-23T00:21:01.015Z" }, { url = "https://files.pythonhosted.org/packages/ed/a6/d05a85fd51daeb2e4ea71d102f15b34fedca8e931af02594193ae4fd25f7/scipy-1.17.1-cp314-cp314-macosx_12_0_arm64.whl", hash = "sha256:45abad819184f07240d8a696117a7aacd39787af9e0b719d00285549ed19a1e9", size = 28170131, upload-time = "2026-02-23T00:21:05.888Z" }, { url = "https://files.pythonhosted.org/packages/db/7b/8624a203326675d7746a254083a187398090a179335b2e4a20e2ddc46e83/scipy-1.17.1-cp314-cp314-macosx_14_0_arm64.whl", hash = "sha256:3fd1fcdab3ea951b610dc4cef356d416d5802991e7e32b5254828d342f7b7e0b", size = 20342032, upload-time = "2026-02-23T00:21:09.904Z" }, @@ -4299,46 +3020,6 @@ version = "1.3.7" source = { registry = "https://pypi.org/simple" } sdist = { url = "https://files.pythonhosted.org/packages/8d/48/49393a96a2eef1ab418b17475fb92b8fcfad83d099e678751b05472e69de/setproctitle-1.3.7.tar.gz", hash = "sha256:bc2bc917691c1537d5b9bca1468437176809c7e11e5694ca79a9ca12345dcb9e", size = 27002, upload-time = "2025-09-05T12:51:25.278Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/04/cd/1b7ba5cad635510720ce19d7122154df96a2387d2a74217be552887c93e5/setproctitle-1.3.7-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:a600eeb4145fb0ee6c287cb82a2884bd4ec5bbb076921e287039dcc7b7cc6dd0", size = 18085, upload-time = "2025-09-05T12:49:22.183Z" }, - { url = "https://files.pythonhosted.org/packages/8f/1a/b2da0a620490aae355f9d72072ac13e901a9fec809a6a24fc6493a8f3c35/setproctitle-1.3.7-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:97a090fed480471bb175689859532709e28c085087e344bca45cf318034f70c4", size = 13097, upload-time = "2025-09-05T12:49:23.322Z" }, - { url = "https://files.pythonhosted.org/packages/18/2e/bd03ff02432a181c1787f6fc2a678f53b7dacdd5ded69c318fe1619556e8/setproctitle-1.3.7-cp311-cp311-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:1607b963e7b53e24ec8a2cb4e0ab3ae591d7c6bf0a160feef0551da63452b37f", size = 32191, upload-time = "2025-09-05T12:49:24.567Z" }, - { url = "https://files.pythonhosted.org/packages/28/78/1e62fc0937a8549f2220445ed2175daacee9b6764c7963b16148119b016d/setproctitle-1.3.7-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:a20fb1a3974e2dab857870cf874b325b8705605cb7e7e8bcbb915bca896f52a9", size = 33203, upload-time = "2025-09-05T12:49:25.871Z" }, - { url = "https://files.pythonhosted.org/packages/a0/3c/65edc65db3fa3df400cf13b05e9d41a3c77517b4839ce873aa6b4043184f/setproctitle-1.3.7-cp311-cp311-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:f8d961bba676e07d77665204f36cffaa260f526e7b32d07ab3df6a2c1dfb44ba", size = 34963, upload-time = "2025-09-05T12:49:27.044Z" }, - { url = "https://files.pythonhosted.org/packages/a1/32/89157e3de997973e306e44152522385f428e16f92f3cf113461489e1e2ee/setproctitle-1.3.7-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:db0fd964fbd3a9f8999b502f65bd2e20883fdb5b1fae3a424e66db9a793ed307", size = 32398, upload-time = "2025-09-05T12:49:28.909Z" }, - { url = "https://files.pythonhosted.org/packages/4a/18/77a765a339ddf046844cb4513353d8e9dcd8183da9cdba6e078713e6b0b2/setproctitle-1.3.7-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:db116850fcf7cca19492030f8d3b4b6e231278e8fe097a043957d22ce1bdf3ee", size = 33657, upload-time = "2025-09-05T12:49:30.323Z" }, - { url = "https://files.pythonhosted.org/packages/6b/63/f0b6205c64d74d2a24a58644a38ec77bdbaa6afc13747e75973bf8904932/setproctitle-1.3.7-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:316664d8b24a5c91ee244460bdaf7a74a707adaa9e14fbe0dc0a53168bb9aba1", size = 31836, upload-time = "2025-09-05T12:49:32.309Z" }, - { url = "https://files.pythonhosted.org/packages/ba/51/e1277f9ba302f1a250bbd3eedbbee747a244b3cc682eb58fb9733968f6d8/setproctitle-1.3.7-cp311-cp311-win32.whl", hash = "sha256:b74774ca471c86c09b9d5037c8451fff06bb82cd320d26ae5a01c758088c0d5d", size = 12556, upload-time = "2025-09-05T12:49:33.529Z" }, - { url = "https://files.pythonhosted.org/packages/b6/7b/822a23f17e9003dfdee92cd72758441ca2a3680388da813a371b716fb07f/setproctitle-1.3.7-cp311-cp311-win_amd64.whl", hash = "sha256:acb9097213a8dd3410ed9f0dc147840e45ca9797785272928d4be3f0e69e3be4", size = 13243, upload-time = "2025-09-05T12:49:34.553Z" }, - { url = "https://files.pythonhosted.org/packages/fb/f0/2dc88e842077719d7384d86cc47403e5102810492b33680e7dadcee64cd8/setproctitle-1.3.7-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:2dc99aec591ab6126e636b11035a70991bc1ab7a261da428491a40b84376654e", size = 18049, upload-time = "2025-09-05T12:49:36.241Z" }, - { url = "https://files.pythonhosted.org/packages/f0/b4/50940504466689cda65680c9e9a1e518e5750c10490639fa687489ac7013/setproctitle-1.3.7-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:cdd8aa571b7aa39840fdbea620e308a19691ff595c3a10231e9ee830339dd798", size = 13079, upload-time = "2025-09-05T12:49:38.088Z" }, - { url = "https://files.pythonhosted.org/packages/d0/99/71630546b9395b095f4082be41165d1078204d1696c2d9baade3de3202d0/setproctitle-1.3.7-cp312-cp312-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:2906b6c7959cdb75f46159bf0acd8cc9906cf1361c9e1ded0d065fe8f9039629", size = 32932, upload-time = "2025-09-05T12:49:39.271Z" }, - { url = "https://files.pythonhosted.org/packages/50/22/cee06af4ffcfb0e8aba047bd44f5262e644199ae7527ae2c1f672b86495c/setproctitle-1.3.7-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:6915964a6dda07920a1159321dcd6d94fc7fc526f815ca08a8063aeca3c204f1", size = 33736, upload-time = "2025-09-05T12:49:40.565Z" }, - { url = "https://files.pythonhosted.org/packages/5c/00/a5949a8bb06ef5e7df214fc393bb2fb6aedf0479b17214e57750dfdd0f24/setproctitle-1.3.7-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:cff72899861c765bd4021d1ff1c68d60edc129711a2fdba77f9cb69ef726a8b6", size = 35605, upload-time = "2025-09-05T12:49:42.362Z" }, - { url = "https://files.pythonhosted.org/packages/b0/3a/50caca532a9343828e3bf5778c7a84d6c737a249b1796d50dd680290594d/setproctitle-1.3.7-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:b7cb05bd446687ff816a3aaaf831047fc4c364feff7ada94a66024f1367b448c", size = 33143, upload-time = "2025-09-05T12:49:43.515Z" }, - { url = "https://files.pythonhosted.org/packages/ca/14/b843a251296ce55e2e17c017d6b9f11ce0d3d070e9265de4ecad948b913d/setproctitle-1.3.7-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:3a57b9a00de8cae7e2a1f7b9f0c2ac7b69372159e16a7708aa2f38f9e5cc987a", size = 34434, upload-time = "2025-09-05T12:49:45.31Z" }, - { url = "https://files.pythonhosted.org/packages/c8/b7/06145c238c0a6d2c4bc881f8be230bb9f36d2bf51aff7bddcb796d5eed67/setproctitle-1.3.7-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:d8828b356114f6b308b04afe398ed93803d7fca4a955dd3abe84430e28d33739", size = 32795, upload-time = "2025-09-05T12:49:46.419Z" }, - { url = "https://files.pythonhosted.org/packages/ef/dc/ef76a81fac9bf27b84ed23df19c1f67391a753eed6e3c2254ebcb5133f56/setproctitle-1.3.7-cp312-cp312-win32.whl", hash = "sha256:b0304f905efc845829ac2bc791ddebb976db2885f6171f4a3de678d7ee3f7c9f", size = 12552, upload-time = "2025-09-05T12:49:47.635Z" }, - { url = "https://files.pythonhosted.org/packages/e2/5b/a9fe517912cd6e28cf43a212b80cb679ff179a91b623138a99796d7d18a0/setproctitle-1.3.7-cp312-cp312-win_amd64.whl", hash = "sha256:9888ceb4faea3116cf02a920ff00bfbc8cc899743e4b4ac914b03625bdc3c300", size = 13247, upload-time = "2025-09-05T12:49:49.16Z" }, - { url = "https://files.pythonhosted.org/packages/5d/2f/fcedcade3b307a391b6e17c774c6261a7166aed641aee00ed2aad96c63ce/setproctitle-1.3.7-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:c3736b2a423146b5e62230502e47e08e68282ff3b69bcfe08a322bee73407922", size = 18047, upload-time = "2025-09-05T12:49:50.271Z" }, - { url = "https://files.pythonhosted.org/packages/23/ae/afc141ca9631350d0a80b8f287aac79a76f26b6af28fd8bf92dae70dc2c5/setproctitle-1.3.7-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:3384e682b158d569e85a51cfbde2afd1ab57ecf93ea6651fe198d0ba451196ee", size = 13073, upload-time = "2025-09-05T12:49:51.46Z" }, - { url = "https://files.pythonhosted.org/packages/87/ed/0a4f00315bc02510395b95eec3d4aa77c07192ee79f0baae77ea7b9603d8/setproctitle-1.3.7-cp313-cp313-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:0564a936ea687cd24dffcea35903e2a20962aa6ac20e61dd3a207652401492dd", size = 33284, upload-time = "2025-09-05T12:49:52.741Z" }, - { url = "https://files.pythonhosted.org/packages/fc/e4/adf3c4c0a2173cb7920dc9df710bcc67e9bcdbf377e243b7a962dc31a51a/setproctitle-1.3.7-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:a5d1cb3f81531f0eb40e13246b679a1bdb58762b170303463cb06ecc296f26d0", size = 34104, upload-time = "2025-09-05T12:49:54.416Z" }, - { url = "https://files.pythonhosted.org/packages/52/4f/6daf66394152756664257180439d37047aa9a1cfaa5e4f5ed35e93d1dc06/setproctitle-1.3.7-cp313-cp313-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:a7d159e7345f343b44330cbba9194169b8590cb13dae940da47aa36a72aa9929", size = 35982, upload-time = "2025-09-05T12:49:56.295Z" }, - { url = "https://files.pythonhosted.org/packages/1b/62/f2c0595403cf915db031f346b0e3b2c0096050e90e0be658a64f44f4278a/setproctitle-1.3.7-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:0b5074649797fd07c72ca1f6bff0406f4a42e1194faac03ecaab765ce605866f", size = 33150, upload-time = "2025-09-05T12:49:58.025Z" }, - { url = "https://files.pythonhosted.org/packages/a0/29/10dd41cde849fb2f9b626c846b7ea30c99c81a18a5037a45cc4ba33c19a7/setproctitle-1.3.7-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:61e96febced3f61b766115381d97a21a6265a0f29188a791f6df7ed777aef698", size = 34463, upload-time = "2025-09-05T12:49:59.424Z" }, - { url = "https://files.pythonhosted.org/packages/71/3c/cedd8eccfaf15fb73a2c20525b68c9477518917c9437737fa0fda91e378f/setproctitle-1.3.7-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:047138279f9463f06b858e579cc79580fbf7a04554d24e6bddf8fe5dddbe3d4c", size = 32848, upload-time = "2025-09-05T12:50:01.107Z" }, - { url = "https://files.pythonhosted.org/packages/d1/3e/0a0e27d1c9926fecccfd1f91796c244416c70bf6bca448d988638faea81d/setproctitle-1.3.7-cp313-cp313-win32.whl", hash = "sha256:7f47accafac7fe6535ba8ba9efd59df9d84a6214565108d0ebb1199119c9cbbd", size = 12544, upload-time = "2025-09-05T12:50:15.81Z" }, - { url = "https://files.pythonhosted.org/packages/36/1b/6bf4cb7acbbd5c846ede1c3f4d6b4ee52744d402e43546826da065ff2ab7/setproctitle-1.3.7-cp313-cp313-win_amd64.whl", hash = "sha256:fe5ca35aeec6dc50cabab9bf2d12fbc9067eede7ff4fe92b8f5b99d92e21263f", size = 13235, upload-time = "2025-09-05T12:50:16.89Z" }, - { url = "https://files.pythonhosted.org/packages/e6/a4/d588d3497d4714750e3eaf269e9e8985449203d82b16b933c39bd3fc52a1/setproctitle-1.3.7-cp313-cp313t-macosx_10_13_universal2.whl", hash = "sha256:10e92915c4b3086b1586933a36faf4f92f903c5554f3c34102d18c7d3f5378e9", size = 18058, upload-time = "2025-09-05T12:50:02.501Z" }, - { url = "https://files.pythonhosted.org/packages/05/77/7637f7682322a7244e07c373881c7e982567e2cb1dd2f31bd31481e45500/setproctitle-1.3.7-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:de879e9c2eab637f34b1a14c4da1e030c12658cdc69ee1b3e5be81b380163ce5", size = 13072, upload-time = "2025-09-05T12:50:03.601Z" }, - { url = "https://files.pythonhosted.org/packages/52/09/f366eca0973cfbac1470068d1313fa3fe3de4a594683385204ec7f1c4101/setproctitle-1.3.7-cp313-cp313t-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:c18246d88e227a5b16248687514f95642505000442165f4b7db354d39d0e4c29", size = 34490, upload-time = "2025-09-05T12:50:04.948Z" }, - { url = "https://files.pythonhosted.org/packages/71/36/611fc2ed149fdea17c3677e1d0df30d8186eef9562acc248682b91312706/setproctitle-1.3.7-cp313-cp313t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:7081f193dab22df2c36f9fc6d113f3793f83c27891af8fe30c64d89d9a37e152", size = 35267, upload-time = "2025-09-05T12:50:06.015Z" }, - { url = "https://files.pythonhosted.org/packages/88/a4/64e77d0671446bd5a5554387b69e1efd915274686844bea733714c828813/setproctitle-1.3.7-cp313-cp313t-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:9cc9b901ce129350637426a89cfd650066a4adc6899e47822e2478a74023ff7c", size = 37376, upload-time = "2025-09-05T12:50:07.484Z" }, - { url = "https://files.pythonhosted.org/packages/89/bc/ad9c664fe524fb4a4b2d3663661a5c63453ce851736171e454fa2cdec35c/setproctitle-1.3.7-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:80e177eff2d1ec172188d0d7fd9694f8e43d3aab76a6f5f929bee7bf7894e98b", size = 33963, upload-time = "2025-09-05T12:50:09.056Z" }, - { url = "https://files.pythonhosted.org/packages/ab/01/a36de7caf2d90c4c28678da1466b47495cbbad43badb4e982d8db8167ed4/setproctitle-1.3.7-cp313-cp313t-musllinux_1_2_ppc64le.whl", hash = "sha256:23e520776c445478a67ee71b2a3c1ffdafbe1f9f677239e03d7e2cc635954e18", size = 35550, upload-time = "2025-09-05T12:50:10.791Z" }, - { url = "https://files.pythonhosted.org/packages/dd/68/17e8aea0ed5ebc17fbf03ed2562bfab277c280e3625850c38d92a7b5fcd9/setproctitle-1.3.7-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:5fa1953126a3b9bd47049d58c51b9dac72e78ed120459bd3aceb1bacee72357c", size = 33727, upload-time = "2025-09-05T12:50:12.032Z" }, - { url = "https://files.pythonhosted.org/packages/b2/33/90a3bf43fe3a2242b4618aa799c672270250b5780667898f30663fd94993/setproctitle-1.3.7-cp313-cp313t-win32.whl", hash = "sha256:4a5e212bf438a4dbeece763f4962ad472c6008ff6702e230b4f16a037e2f6f29", size = 12549, upload-time = "2025-09-05T12:50:13.074Z" }, - { url = "https://files.pythonhosted.org/packages/0b/0e/50d1f07f3032e1f23d814ad6462bc0a138f369967c72494286b8a5228e40/setproctitle-1.3.7-cp313-cp313t-win_amd64.whl", hash = "sha256:cf2727b733e90b4f874bac53e3092aa0413fe1ea6d4f153f01207e6ce65034d9", size = 13243, upload-time = "2025-09-05T12:50:14.146Z" }, { url = "https://files.pythonhosted.org/packages/89/c7/43ac3a98414f91d1b86a276bc2f799ad0b4b010e08497a95750d5bc42803/setproctitle-1.3.7-cp314-cp314-macosx_10_13_universal2.whl", hash = "sha256:80c36c6a87ff72eabf621d0c79b66f3bdd0ecc79e873c1e9f0651ee8bf215c63", size = 18052, upload-time = "2025-09-05T12:50:17.928Z" }, { url = "https://files.pythonhosted.org/packages/cd/2c/dc258600a25e1a1f04948073826bebc55e18dbd99dc65a576277a82146fa/setproctitle-1.3.7-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:b53602371a52b91c80aaf578b5ada29d311d12b8a69c0c17fbc35b76a1fd4f2e", size = 13071, upload-time = "2025-09-05T12:50:19.061Z" }, { url = "https://files.pythonhosted.org/packages/ab/26/8e3bb082992f19823d831f3d62a89409deb6092e72fc6940962983ffc94f/setproctitle-1.3.7-cp314-cp314-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:fcb966a6c57cf07cc9448321a08f3be6b11b7635be502669bc1d8745115d7e7f", size = 33180, upload-time = "2025-09-05T12:50:20.395Z" }, @@ -4359,9 +3040,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/e7/e3/54b496ac724e60e61cc3447f02690105901ca6d90da0377dffe49ff99fc7/setproctitle-1.3.7-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:1fae595d032b30dab4d659bece20debd202229fce12b55abab978b7f30783d73", size = 33958, upload-time = "2025-09-05T12:50:39.841Z" }, { url = "https://files.pythonhosted.org/packages/ea/a8/c84bb045ebf8c6fdc7f7532319e86f8380d14bbd3084e6348df56bdfe6fd/setproctitle-1.3.7-cp314-cp314t-win32.whl", hash = "sha256:02432f26f5d1329ab22279ff863c83589894977063f59e6c4b4845804a08f8c2", size = 12745, upload-time = "2025-09-05T12:50:41.377Z" }, { url = "https://files.pythonhosted.org/packages/08/b6/3a5a4f9952972791a9114ac01dfc123f0df79903577a3e0a7a404a695586/setproctitle-1.3.7-cp314-cp314t-win_amd64.whl", hash = "sha256:cbc388e3d86da1f766d8fc2e12682e446064c01cea9f88a88647cfe7c011de6a", size = 13469, upload-time = "2025-09-05T12:50:42.67Z" }, - { url = "https://files.pythonhosted.org/packages/c3/5b/5e1c117ac84e3cefcf8d7a7f6b2461795a87e20869da065a5c087149060b/setproctitle-1.3.7-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:b1cac6a4b0252b8811d60b6d8d0f157c0fdfed379ac89c25a914e6346cf355a1", size = 12587, upload-time = "2025-09-05T12:51:21.195Z" }, - { url = "https://files.pythonhosted.org/packages/73/02/b9eadc226195dcfa90eed37afe56b5dd6fa2f0e5220ab8b7867b8862b926/setproctitle-1.3.7-pp311-pypy311_pp73-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:f1704c9e041f2b1dc38f5be4552e141e1432fba3dd52c72eeffd5bc2db04dc65", size = 14286, upload-time = "2025-09-05T12:51:22.61Z" }, - { url = "https://files.pythonhosted.org/packages/28/26/1be1d2a53c2a91ec48fa2ff4a409b395f836798adf194d99de9c059419ea/setproctitle-1.3.7-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:b08b61976ffa548bd5349ce54404bf6b2d51bd74d4f1b241ed1b0f25bce09c3a", size = 13282, upload-time = "2025-09-05T12:51:24.094Z" }, ] [[package]] @@ -4388,25 +3066,9 @@ version = "2.7.0" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "numpy" }, - { name = "typing-extensions", marker = "python_full_version < '3.13'" }, ] sdist = { url = "https://files.pythonhosted.org/packages/a9/06/7964acb4c444191376bd87f91579475fbe7623ca943cce40cee8fb7f2c36/spglib-2.7.0.tar.gz", hash = "sha256:c40907a42c9dc45572f46740bf95412f84fb0eda30267e31665d104a4bde6627", size = 2366134, upload-time = "2025-12-29T09:48:26.42Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/44/a8/d841ae7743c58227af277f7f16aa844376fa11c426090d6ae35e7e93af76/spglib-2.7.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:3cf0ff80c01d8631ef4b9f1b78da79ff2044834e6e2d870f7f20c8579c921136", size = 910793, upload-time = "2025-12-29T09:47:32.063Z" }, - { url = "https://files.pythonhosted.org/packages/e8/02/11baf94cf682cdaafa046b72d4b2adcf944e19e2b2741454e329dedb2fc2/spglib-2.7.0-cp311-cp311-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:a7b29d2cfca6ac53e927686ca0b91257126e47f6abfa26451723a5cd40070352", size = 944977, upload-time = "2025-12-29T09:47:33.638Z" }, - { url = "https://files.pythonhosted.org/packages/ce/fa/6d1bc8f8cb08945ca8c37c95b42bf336b6b9a8a737eced1ce64f0cebe9ce/spglib-2.7.0-cp311-cp311-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:f892ecce2dd1bc636b14a4e5bc13aabb73b008bd37a4d23636882c8971c432a0", size = 960531, upload-time = "2025-12-29T09:47:36.932Z" }, - { url = "https://files.pythonhosted.org/packages/b0/79/2fd5e33b431cd0afcdd441bd10704c11cdf74c09b721249297284e5bf0b2/spglib-2.7.0-cp311-cp311-win_amd64.whl", hash = "sha256:468879702577124dcde0607a75396576e256f1cfa2d8fe48da4a928fbb27abc6", size = 669827, upload-time = "2025-12-29T09:47:38.47Z" }, - { url = "https://files.pythonhosted.org/packages/f7/e9/4e07c9c1bda40df54e09bd686eae0dc13d46e76a5ef4d43582971a86eb32/spglib-2.7.0-cp311-cp311-win_arm64.whl", hash = "sha256:ceb6730a2324d0c83579c803f3782e28bd41e79bbfe0c3dfdbf30e3d3a6320e5", size = 649076, upload-time = "2025-12-29T09:47:40.367Z" }, - { url = "https://files.pythonhosted.org/packages/68/0e/36720beeca8452530e50ab8a16b91e8721e34c0f97fd25e9c4ddd8b9324b/spglib-2.7.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:ef70132e23dfcc7ab6813742e0edab3f9906e61cd11c857f014bd5610a8bc88c", size = 911009, upload-time = "2025-12-29T09:47:42.238Z" }, - { url = "https://files.pythonhosted.org/packages/47/a0/24df91cbde6a3237d54cfb21602cc8ebb4102cd4e3ec9497c66135c2b190/spglib-2.7.0-cp312-cp312-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:59f134e74f7f488de4bf5579ee6a35af25cb2c478c138de664fea1e14f3efbaf", size = 946821, upload-time = "2025-12-29T09:47:44.548Z" }, - { url = "https://files.pythonhosted.org/packages/67/4c/75ac6f7ade28019b216c7333322f2886e1c0105202cd74506f530664bf26/spglib-2.7.0-cp312-cp312-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:6913906fd9108e7bb2ce06a810513a95a82d801530f10230979bf3427bb7e771", size = 962531, upload-time = "2025-12-29T09:47:46.3Z" }, - { url = "https://files.pythonhosted.org/packages/a7/5f/4e283139af178bb445eedff281a90e66ceff1b814ace70a9d90a2197acc3/spglib-2.7.0-cp312-cp312-win_amd64.whl", hash = "sha256:d5729ff0040baae764c17249302cd99f0eb4e73449612a8c69d3e60a215f062e", size = 671111, upload-time = "2025-12-29T09:47:48.14Z" }, - { url = "https://files.pythonhosted.org/packages/a5/b9/20e52d46e33bf69ceba4fc86602f006c06ce4ab10e3c930f4722fb270b02/spglib-2.7.0-cp312-cp312-win_arm64.whl", hash = "sha256:54f4b6e789475384c62e759c618172707f261c0eae8017949fe4994b6b8cc779", size = 646679, upload-time = "2025-12-29T09:47:49.376Z" }, - { url = "https://files.pythonhosted.org/packages/2c/1c/a0fe8c0523a0e7d608f49f09895e5c599329265c9bfacd269a21458b7564/spglib-2.7.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:ab061ea6a3c3c25a1d0018b09c333c0458792036d3f45d892bd52793ed1f1bda", size = 911085, upload-time = "2025-12-29T09:47:51.606Z" }, - { url = "https://files.pythonhosted.org/packages/2a/34/cb3c522c4aaf6ce319b37bbec71d373b9e2cf0bcfe7d42c365cd6c113b4b/spglib-2.7.0-cp313-cp313-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:be28673e90f7a6c7770f73c57e529d2bdbb373d06d26ee5e90991b548e9238aa", size = 946857, upload-time = "2025-12-29T09:47:53.059Z" }, - { url = "https://files.pythonhosted.org/packages/9e/64/3b1213f2f655ff143ed142292b47ec3f1f9bda8641e659a7e33c4cf0e8a9/spglib-2.7.0-cp313-cp313-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:f627a4ed6f2396ed6e3e8eaf33a53ad143c8ffb8756a84a640f4569ac5ffa2a7", size = 962470, upload-time = "2025-12-29T09:47:54.878Z" }, - { url = "https://files.pythonhosted.org/packages/5c/3a/c51883ce739a00f9f60196f3dcb4ed91b690299a4ec64defd8ec5b2c5899/spglib-2.7.0-cp313-cp313-win_amd64.whl", hash = "sha256:c76411bc1b96cd87c8733994747c7692512b583bb4ef89a65463ff4255221c11", size = 671073, upload-time = "2025-12-29T09:47:56.887Z" }, - { url = "https://files.pythonhosted.org/packages/35/78/3f9ec6ae93a48527dce0eceb6eeab74e6ad1fb2977adb5cbdfc03d43193c/spglib-2.7.0-cp313-cp313-win_arm64.whl", hash = "sha256:0d8ecf030d13d67c4cc272423e5652b74eda57f86a0b118e007f6d12974cc256", size = 646711, upload-time = "2025-12-29T09:47:58.697Z" }, { url = "https://files.pythonhosted.org/packages/1b/47/86e3c15c3e1c252bde40a794eea4742c142f23fc5f9c3d7551f083c1fa20/spglib-2.7.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:95e3dd7ef992ff8a88f6ef2e5909aaa60ecb479004cc1f73c1e6285d54227960", size = 911712, upload-time = "2025-12-29T09:48:01.14Z" }, { url = "https://files.pythonhosted.org/packages/05/61/ab2447bb47fa69934adc2fc2d13f771dedd3b2fd3171c95307446c948f01/spglib-2.7.0-cp314-cp314-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:97e0fcea2db3915bd973fdd2cc0a757b1f99bda71ce815da333d75ad1ffc3eb1", size = 947528, upload-time = "2025-12-29T09:48:03.258Z" }, { url = "https://files.pythonhosted.org/packages/9d/69/898d9e005131b0b1c7e5dce2b79f36aeb20ec4d3a88cca596b522a0fa4df/spglib-2.7.0-cp314-cp314-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:39b978c08ef2ebc0eaba833c488fc4c0f9b1fc0f50d4a8584f176741eea69376", size = 962474, upload-time = "2025-12-29T09:48:05.617Z" }, @@ -4438,7 +3100,6 @@ version = "1.2.0" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "anyio" }, - { name = "typing-extensions", marker = "python_full_version < '3.13'" }, ] sdist = { url = "https://files.pythonhosted.org/packages/c5/bf/616a066c2760f6c2b1ae3437cc28149734d069fbb46511712beae118a68c/starlette-1.2.0.tar.gz", hash = "sha256:3c5a6b23fff42492914e93890bb80cbfea72dbf37de268eec06185d62a4ca553", size = 2668923, upload-time = "2026-05-28T11:42:50.568Z" } wheels = [ @@ -4671,50 +3332,6 @@ version = "2.2.1" source = { registry = "https://pypi.org/simple" } sdist = { url = "https://files.pythonhosted.org/packages/2d/9f/06263fcd8ad6c405f05a3905fd7a84dd3176eb5ad46e44bccc0cd16348bb/wrapt-2.2.1.tar.gz", hash = "sha256:6744f504375775d7609c82c8d3d94af1c9a6f05586984536905908ba905277b9", size = 127620, upload-time = "2026-05-22T14:49:43.056Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/5f/ac/4370bde262c0e633e6c4f0e56d55095710024cf9a5cecc20c59a10de483c/wrapt-2.2.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:dd57607acc85678925940bd5df0385ff8332083a32fa8d7a43f8767f4997263c", size = 80321, upload-time = "2026-05-22T14:47:43.996Z" }, - { url = "https://files.pythonhosted.org/packages/eb/79/b8ff3a61e71babf58a8cf4c0d63358e8bad383e15bf7f35e62d2f6b6e4a4/wrapt-2.2.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:1ae574d65c9fa8e86f64f6a7c2668f9fcd507b183e0e577619f504b883cb0a6c", size = 81216, upload-time = "2026-05-22T14:47:45.243Z" }, - { url = "https://files.pythonhosted.org/packages/6e/fd/c0cac1f77c9c4f6fe58a920ca632ce379bb8be928720e11e8d73de28a5e9/wrapt-2.2.1-cp311-cp311-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:9a04c28c10ba7fd12842b109d2edb0678872a2fe65277ca4ff06a0d61edee245", size = 159208, upload-time = "2026-05-22T14:47:47.176Z" }, - { url = "https://files.pythonhosted.org/packages/d9/4f/744132a7b2fbefa6b81118ec5942eca5fc2e9a129f9055a0c5e46885a549/wrapt-2.2.1-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:3e2f02472a1cbbf3884b365714a810b5947134a95ad6952b554cb8cce9d492b0", size = 160322, upload-time = "2026-05-22T14:47:49.04Z" }, - { url = "https://files.pythonhosted.org/packages/d6/95/b7cd9a22a06cf93e6482904ee6afc956248983553593fd1009296d1b3b31/wrapt-2.2.1-cp311-cp311-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:ac2745950b2bff80219c15ebf2fa9d8427eba7e249739f97e55c9d169e47e9e1", size = 153243, upload-time = "2026-05-22T14:47:50.386Z" }, - { url = "https://files.pythonhosted.org/packages/4c/4a/eb79423192015f46f0db2872e7e04a3dde8d359b83411e8959e7c9287eaa/wrapt-2.2.1-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:67a97e5b6c457f0cd3cfc19ebb2d84463e60c3ece754cc831e4281a3ca29bb18", size = 159231, upload-time = "2026-05-22T14:47:51.753Z" }, - { url = "https://files.pythonhosted.org/packages/ec/dc/435015b58ce33c6fc4104158fa91ddb0e809ab03a5751fb7465d1d461456/wrapt-2.2.1-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:c803a3d331796255af51ba2c79ed0ac8275865b516c09e61f248d1e7aff31ce9", size = 152351, upload-time = "2026-05-22T14:47:53.214Z" }, - { url = "https://files.pythonhosted.org/packages/77/ac/5d203f98df8fd136b95c5227139aea02d34505e18baf812d0c005df61963/wrapt-2.2.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:9b984d1eb252145d6302c1dbd5e87fc6d404d45531447c84eadec04bf1fcb027", size = 158347, upload-time = "2026-05-22T14:47:54.982Z" }, - { url = "https://files.pythonhosted.org/packages/52/2f/a92427dbdc74e54c1674abbed27e61b2cb5e7a94441b8c1270c70671d928/wrapt-2.2.1-cp311-cp311-win32.whl", hash = "sha256:8a983a603a18c8708f024f7f6991b2e66159219abbf894634c5056243c55f3cd", size = 77562, upload-time = "2026-05-22T14:47:56.275Z" }, - { url = "https://files.pythonhosted.org/packages/c8/56/987b9c13b3e1c1a3c6de71284076f996b79caec90e75a87c044a40c23db9/wrapt-2.2.1-cp311-cp311-win_amd64.whl", hash = "sha256:9c210a6994b21aa9b29e81c8d11560e8fdab54c117e9cff37870d0a27bde1343", size = 80616, upload-time = "2026-05-22T14:47:57.854Z" }, - { url = "https://files.pythonhosted.org/packages/7e/25/d01f560888d99d94a959c85533de349ce68d71ace3f2591d6ea8f632cfed/wrapt-2.2.1-cp311-cp311-win_arm64.whl", hash = "sha256:401229e9d63ca09f9b8891ecf83798d26c11bbb445d11ed9f1836b6d4585b38a", size = 79025, upload-time = "2026-05-22T14:47:59.089Z" }, - { url = "https://files.pythonhosted.org/packages/89/0c/bfae7b9401583b6d05938cd16dedc43857d96da2f8a3d50d78cc515bf6ff/wrapt-2.2.1-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:3ffad790d9d11d8ecf9f17c4bb671a5b4089e4d8b575c46c5129597f41f836b0", size = 81021, upload-time = "2026-05-22T14:48:00.313Z" }, - { url = "https://files.pythonhosted.org/packages/26/58/80f6a6599f933f4caecc1cb3ee88a04faf81e8b9bddbd6109c688dd63e0f/wrapt-2.2.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:628f5220c7a904d5fc78f7075c8d7871433eb6d035c94728a22fdf85f193d2a8", size = 81692, upload-time = "2026-05-22T14:48:01.49Z" }, - { url = "https://files.pythonhosted.org/packages/17/93/fb357cc7847c58a8ae790be718903afa81a28d23e642c843dc4129e8a0b2/wrapt-2.2.1-cp312-cp312-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:61acce4257a9883669703c525447c5b4c392edf0f987ae77ec32668440158f0e", size = 169364, upload-time = "2026-05-22T14:48:02.791Z" }, - { url = "https://files.pythonhosted.org/packages/aa/0b/76b601ee309a8bd556af0eecb184394c20b3c49aa9c8e085aa1ffacc2568/wrapt-2.2.1-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:727ab4244622cd6ad2390f322642090c877d2e83a608d2653a7643ae5368d926", size = 171079, upload-time = "2026-05-22T14:48:04.22Z" }, - { url = "https://files.pythonhosted.org/packages/cd/87/ee3f32d5658e3e26d3e0e457922b47a36dd3bfbdfee7f97bb3e802344a66/wrapt-2.2.1-cp312-cp312-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:03df9ebed4c73ab93fa8c07e3d41d818dfca1852b15731a3de59457b27814624", size = 160205, upload-time = "2026-05-22T14:48:05.553Z" }, - { url = "https://files.pythonhosted.org/packages/b1/d0/ae2fd64277a67f5d7bffcf2d05eea1e476263fb2a072baf0b0129ab85984/wrapt-2.2.1-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:0d9ff006f420b2ec8296aa56ade43ea7da3e997e85769f0aafc5e0661aacb710", size = 168922, upload-time = "2026-05-22T14:48:07.132Z" }, - { url = "https://files.pythonhosted.org/packages/b1/f3/2d541a060c5bbafb9400bca4917e4d78bfd1f239f404782c86831a8f6b29/wrapt-2.2.1-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:844c858fc3bb7eacc0ba8efa904935d16aac6a4470948ad1e7e55c9f5a2a665f", size = 158388, upload-time = "2026-05-22T14:48:08.629Z" }, - { url = "https://files.pythonhosted.org/packages/1d/68/8d92c8800c57e93cb116ae9e9d6cbafc34fade5ee9f9107b6f203fb4dc35/wrapt-2.2.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:87bacdaf225117a342a20d9c03438d701c02112f6e3f351ce9b7f32354f14797", size = 167682, upload-time = "2026-05-22T14:48:10.042Z" }, - { url = "https://files.pythonhosted.org/packages/30/72/83ea3790ea352439442349388e29ff07b76e0686265f9088bbb505d1608d/wrapt-2.2.1-cp312-cp312-win32.whl", hash = "sha256:2f8c90c8afde51969487be4e1343ae049b268854877d415c2510baf833775052", size = 77857, upload-time = "2026-05-22T14:48:11.782Z" }, - { url = "https://files.pythonhosted.org/packages/ef/cb/99450668dd3502d62a54a1c8aa56e44f34cb8c1261b381cfe2e7926c3b75/wrapt-2.2.1-cp312-cp312-win_amd64.whl", hash = "sha256:6ce32763ac31ce94fe9aada947e479b1975012bff166da409b4b9e4e376cf7e5", size = 80825, upload-time = "2026-05-22T14:48:13.046Z" }, - { url = "https://files.pythonhosted.org/packages/e6/3a/87512881be64e743f9ee4c66f4cbe8e884974bef2a5989af71f999653ac7/wrapt-2.2.1-cp312-cp312-win_arm64.whl", hash = "sha256:8d1b4d0e0c2119587a31f5c029abd547e0c81d93b89d394566fe1588659eb579", size = 79087, upload-time = "2026-05-22T14:48:14.323Z" }, - { url = "https://files.pythonhosted.org/packages/88/d1/a1b08f8f4fac8cbb156fa51cf64ee2c7f7f74f9875ba3cf70b3c58368694/wrapt-2.2.1-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:d2beb1c7cab10603aecdc42f8edd6ff013f9a32e4543474e38e6b77ce9975aeb", size = 80831, upload-time = "2026-05-22T14:48:15.598Z" }, - { url = "https://files.pythonhosted.org/packages/54/ce/57890814991446a845e09b3445ce8b694f27eb0577004f2c2a36a9772ed4/wrapt-2.2.1-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:e0cb7e4dd71f4c32e5e84843cd3c4cd65dda034314004bbe1d7f99af2426ab80", size = 81375, upload-time = "2026-05-22T14:48:17.071Z" }, - { url = "https://files.pythonhosted.org/packages/38/65/08d7a6c76ac4493bdb668205ee9c1de1bd5daca61717c3e9aa49b4c01499/wrapt-2.2.1-cp313-cp313-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:95821352042722cd9f1108874579a47989d0a7e12a37d87d2fc4af20fd99ab8a", size = 167417, upload-time = "2026-05-22T14:48:18.303Z" }, - { url = "https://files.pythonhosted.org/packages/62/ce/f1ccbee7a1bfe5cdc6b3da6bab4b45713d628b9294da32a39f563d648140/wrapt-2.2.1-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:abd621552ede77c4c69be7fac44ba911225b0c812b6ba604e5964cf98085b474", size = 166948, upload-time = "2026-05-22T14:48:19.768Z" }, - { url = "https://files.pythonhosted.org/packages/86/2a/f85d48d1cd4869aee6704028d257d740a47c1c467b457ce396b4b5b55d07/wrapt-2.2.1-cp313-cp313-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:e3677c7146ce694874941ba82b57092cc4875445aadf29d72807351023105143", size = 158148, upload-time = "2026-05-22T14:48:21.96Z" }, - { url = "https://files.pythonhosted.org/packages/fe/5c/93939ad11d4a12358ab1aab219a2ef5efa5612e0db6b9fc65af8af1a891b/wrapt-2.2.1-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:9a5934eaea872e17936b5f45501eba5ab0bce9a74122e172b663d7c28c459c4a", size = 165905, upload-time = "2026-05-22T14:48:23.373Z" }, - { url = "https://files.pythonhosted.org/packages/e0/22/b8c2aa89862ff58605934d7abf4b70e6a5a1c33df96656f49035ccdf1c8a/wrapt-2.2.1-cp313-cp313-musllinux_1_2_riscv64.whl", hash = "sha256:f5b9daf6b629fce418e0cc3dd0436eac045188fa35deadb7a7f3941d5b8203f9", size = 156712, upload-time = "2026-05-22T14:48:24.767Z" }, - { url = "https://files.pythonhosted.org/packages/5d/78/bf00a7b02239c12bb02ddcc3c0b971bfcc36e578c5a44f1ccfef5b458545/wrapt-2.2.1-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:f53ac9f3ef573326d009ed809beff4efcac6451931c2b8132586da4b9e53ff31", size = 166560, upload-time = "2026-05-22T14:48:26.83Z" }, - { url = "https://files.pythonhosted.org/packages/fe/93/6390ca9c5b787683cef588d04f57c8d41b9a2323b5597a65f18638c90ef2/wrapt-2.2.1-cp313-cp313-win32.whl", hash = "sha256:1ffa9cfd4bdb581539951b14ae661ff20ed0c3599b3e911a131ee0ec5ac11337", size = 77817, upload-time = "2026-05-22T14:48:28.221Z" }, - { url = "https://files.pythonhosted.org/packages/97/73/ce10f0e71c0cfaa1a65faadb8efd4852028b3bb9ba28932b8889df769d38/wrapt-2.2.1-cp313-cp313-win_amd64.whl", hash = "sha256:368eac1e20fd0bb03dd3cc42bf9887154c3861b60989389ccb5fac032617d215", size = 80736, upload-time = "2026-05-22T14:48:30.139Z" }, - { url = "https://files.pythonhosted.org/packages/c7/4c/89f4a6818fafbbd840330e4fa3873073e1bfc166133a64cac7f8fde7a5e3/wrapt-2.2.1-cp313-cp313-win_arm64.whl", hash = "sha256:c754dafdf5aaf0b401b644a90a30046929a0dd1a536e0ff0ec959a59155d9c7f", size = 79099, upload-time = "2026-05-22T14:48:31.405Z" }, - { url = "https://files.pythonhosted.org/packages/bf/f2/9a8741c46f8c208ac0a45b25ba170bcb4fb72a2781d5fb97dbd7b6be73cb/wrapt-2.2.1-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:ed928d0fda15fc0adc8d13305c8b3c0f2fba5b0669950c9e6d019d9162a3b3e8", size = 82802, upload-time = "2026-05-22T14:48:33.307Z" }, - { url = "https://files.pythonhosted.org/packages/9c/0d/e9c855716a3705eef1416456bdf062b60620726fdc59428ff670fc3c60dc/wrapt-2.2.1-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:fafb4e739e43544d12cb4abd1605fd4683b6ca6a9ad682b7fd8f4d21973eafa8", size = 83329, upload-time = "2026-05-22T14:48:34.593Z" }, - { url = "https://files.pythonhosted.org/packages/3b/d6/a88f1c13112b7831adac75cea65d8310e0d696d570c8961844c90a57b865/wrapt-2.2.1-cp313-cp313t-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:74d6a0c31472fe5d814917266b9f46495d7c61ed890af08b468acea92fb89a8d", size = 202937, upload-time = "2026-05-22T14:48:35.859Z" }, - { url = "https://files.pythonhosted.org/packages/42/65/e29d54aef06a4d898a5b8a25589a0b3769bde454f922fad8f6f89fbfb650/wrapt-2.2.1-cp313-cp313t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:ab5be648d5a0b86b7438864f8df3c705a65cef35a2fd3e5561e3e203167e0f27", size = 209997, upload-time = "2026-05-22T14:48:38.153Z" }, - { url = "https://files.pythonhosted.org/packages/2a/91/e4454263516cf0e12640912fbca9a83654e424f0a6ddb79f5cd7ce14bf33/wrapt-2.2.1-cp313-cp313t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:9d8f204c8e3a8bf9ece17e0a83d137fd807440977f8a5e762d59306795011440", size = 194856, upload-time = "2026-05-22T14:48:39.69Z" }, - { url = "https://files.pythonhosted.org/packages/de/d0/fe0ee202286afdf4a7f77dd29f195703145764d572aec209c5086e57d924/wrapt-2.2.1-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:d047f6498c973874ba08ac3f97c69a2c4b2211c8de6f4c205f75cb1c9522596e", size = 205654, upload-time = "2026-05-22T14:48:43.456Z" }, - { url = "https://files.pythonhosted.org/packages/23/b6/87d860dfc6460c246af70b1fd5c8b76df77571b42a493459423ded94fd7d/wrapt-2.2.1-cp313-cp313t-musllinux_1_2_riscv64.whl", hash = "sha256:7a4fdb9326aab4a5a477a1640e5ad786a8495901009d7e7b038371edd23a9d2b", size = 192206, upload-time = "2026-05-22T14:48:44.858Z" }, - { url = "https://files.pythonhosted.org/packages/df/46/3eea8cde077d985f239a38c0257087b8064fd9ee9b1a99e282d2c86da4ef/wrapt-2.2.1-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:c8cc5094b08abeae52da9c73c8a32003623be691a5193df2f4e3eac3d557c394", size = 198428, upload-time = "2026-05-22T14:48:46.319Z" }, - { url = "https://files.pythonhosted.org/packages/18/dc/b927ee9c7fc67adc3a5658f246a0d275425eb840ba36e7b702e70f18bde8/wrapt-2.2.1-cp313-cp313t-win32.whl", hash = "sha256:9907a4402ab6db12b7077a0ea5d7a4d028ecb22c8eee2b53527080d347cd1562", size = 79448, upload-time = "2026-05-22T14:48:47.901Z" }, - { url = "https://files.pythonhosted.org/packages/ec/b3/fd30b473fe498c70e6b9a5f328b8d3fbaf1b8c3c481465f59724bba8eb70/wrapt-2.2.1-cp313-cp313t-win_amd64.whl", hash = "sha256:5590d63f5243251641cf543009b4c9314a79d0598fdb8a8e4cfc918494536c53", size = 83021, upload-time = "2026-05-22T14:48:49.201Z" }, - { url = "https://files.pythonhosted.org/packages/ee/f3/96c39153a8737a6e9aa85adef254ac4195bea3f2d24efc60472ccc3c9e2e/wrapt-2.2.1-cp313-cp313t-win_arm64.whl", hash = "sha256:c318a64b53d97b841d7b5e637517e50a27be64bc695128422953d4b21710954e", size = 80295, upload-time = "2026-05-22T14:48:50.479Z" }, { url = "https://files.pythonhosted.org/packages/0a/a3/11d7f34ebbf3231bc907a3e6d5ee051b14d034c1bc7b65a97d5cc00516df/wrapt-2.2.1-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:6f56a647e4eaf5f0ca40330fb070f566bdf9f7b0db89a1af20d71c28dcd7a0ab", size = 80879, upload-time = "2026-05-22T14:48:51.802Z" }, { url = "https://files.pythonhosted.org/packages/13/3c/b74cfd984cef560b900fb1a727af20352d89e1f06bf2e1114dd3f00f5f5a/wrapt-2.2.1-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:64b7deeda4b70408e382328d8bbe52a256fe9bc63ae3db86d804608367e5422c", size = 81462, upload-time = "2026-05-22T14:48:53.18Z" }, { url = "https://files.pythonhosted.org/packages/15/a3/7c8f704b8dc07dfe0a5d01c2edbfd88317aa8e5e3fa7c743eb7a085ae767/wrapt-2.2.1-cp314-cp314-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:b9cf53ba90717db2e292401de290776c498d4bbfb0d4a559ca2895db8b9dcb5c", size = 167251, upload-time = "2026-05-22T14:48:54.562Z" }, @@ -4755,27 +3372,6 @@ version = "8.5" source = { registry = "https://pypi.org/simple" } sdist = { url = "https://files.pythonhosted.org/packages/08/dc/50550cfcbb2ea3cbca5f1d7ed05c8aa840f831a0f2d63aec0a953f7c590e/zope_interface-8.5.tar.gz", hash = "sha256:7a3ba1c5877f0f3e3906b02ddf793abed2becc2948116414ce0e1dd820b68d6d", size = 257957, upload-time = "2026-05-26T06:50:14.574Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/ce/f1/83ad110fb847413affe71609bb50e59e1aa082e1236030122227c7c283d3/zope_interface-8.5-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:afc66ccaef2a3c0bef6ca02aad40d29a39276389dad16a8eac36f9f385e4d057", size = 211426, upload-time = "2026-05-26T06:49:12.595Z" }, - { url = "https://files.pythonhosted.org/packages/bb/a7/6b6e0c31ac240cb9fc015ae9ed45ca54be886c18fcf7bfa2377a4d7a8785/zope_interface-8.5-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:c28044972187245d7a309e4699319bfdbd2ffcbf7176d1d4ddf5adffb2dea80f", size = 211850, upload-time = "2026-05-26T06:49:14.474Z" }, - { url = "https://files.pythonhosted.org/packages/37/36/7599ecabcf80ce4fef2e1ef3c5ac0d4696b61f03f724cc44022f4d226af9/zope_interface-8.5-cp311-cp311-manylinux1_i686.manylinux2014_i686.manylinux_2_17_i686.manylinux_2_5_i686.whl", hash = "sha256:03bbecc7982af713d7499d4084bc03916413d17ffd45f89009348cc0c1d9e376", size = 260711, upload-time = "2026-05-26T06:49:16.568Z" }, - { url = "https://files.pythonhosted.org/packages/03/3e/1774b0ee46ccbb5498ee3c33ece40315b6ef58bc71957be94bd345340bc1/zope_interface-8.5-cp311-cp311-manylinux1_x86_64.manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:bf917009a4a7457c7290225a019f4a0aa706d96accd2cfdba2418d3bc1fcde2f", size = 265277, upload-time = "2026-05-26T06:49:18.656Z" }, - { url = "https://files.pythonhosted.org/packages/b6/09/e533b2ffabaae4e5d5730d6768a591cf335defe8e37bec2ad905d09be656/zope_interface-8.5-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:31cff25b2aaedb5267e6e77b1e9be6b0ec4f622032de8a069202b8ffacda7dc2", size = 266369, upload-time = "2026-05-26T06:49:20.174Z" }, - { url = "https://files.pythonhosted.org/packages/49/4a/3ebe6a4c122b2d5340db45cbe7e490663d3228b172710ec71060cd5d541e/zope_interface-8.5-cp311-cp311-win_amd64.whl", hash = "sha256:17a3114bbdddb5e75e5784cdf318944636190cbbc72d357ef9fb1a8b0351f955", size = 215161, upload-time = "2026-05-26T06:49:21.799Z" }, - { url = "https://files.pythonhosted.org/packages/d2/59/056ad97af5b16db1975ee98ec7ab03d2ce3f3355efad904ced1dbce0e39f/zope_interface-8.5-cp311-cp311-win_arm64.whl", hash = "sha256:aab6bb5bee10f38ea688b95ba054396b67f613552d2c8378be7fcb2d2fba7646", size = 213481, upload-time = "2026-05-26T06:49:25.085Z" }, - { url = "https://files.pythonhosted.org/packages/97/cc/b84123a948f3162a34623e188922827cd845244fdd043ed20f8d02228caa/zope_interface-8.5-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:8e6ee90c2e6de7c37058d5fa41f123c8b13a312db8d1e0fb5840d7f4bcdff9c9", size = 212165, upload-time = "2026-05-26T06:49:26.566Z" }, - { url = "https://files.pythonhosted.org/packages/4e/78/cbceec44f1b27208a76c1a688c131302685852406a23df5aab68324109cc/zope_interface-8.5-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:c1adc90d3576b3b4c4de4953e6002c37bef28b78d7fa54c1bbfd0c50f022fe7c", size = 212341, upload-time = "2026-05-26T06:49:28.182Z" }, - { url = "https://files.pythonhosted.org/packages/e1/c3/005032195ff3b210c139b7c560ed5c534e844b0907d8e44d2b3d8919305e/zope_interface-8.5-cp312-cp312-manylinux1_i686.manylinux2014_i686.manylinux_2_17_i686.manylinux_2_5_i686.whl", hash = "sha256:e6347b8d8d12c5eca6502450a92be30079b7acfade2c4f693efa0deb8871b06e", size = 265296, upload-time = "2026-05-26T06:49:29.741Z" }, - { url = "https://files.pythonhosted.org/packages/c5/66/1036543d6a66bc04c19df3cf650f3ad938a002ab0a443c24e23e8de5e8b9/zope_interface-8.5-cp312-cp312-manylinux1_x86_64.manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:5e970dabea777a24b0b0bbf9dae3ab75ce8b2d8e948edf4875627034b21f3560", size = 270689, upload-time = "2026-05-26T06:49:31.767Z" }, - { url = "https://files.pythonhosted.org/packages/30/4c/8b56259558cace4414e753ca6740396a1f59d4a95ddb55b4658600408670/zope_interface-8.5-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:f0b48ccadaa9839e09ff81e969703cecb3f402c813bfe8b958652e699bea69f5", size = 270280, upload-time = "2026-05-26T06:49:33.489Z" }, - { url = "https://files.pythonhosted.org/packages/f9/ea/649908c83aa8fdb7faf2ddca4d3cf6fb8f2157121267dc56e8f72681e26c/zope_interface-8.5-cp312-cp312-win_amd64.whl", hash = "sha256:e0e311f1277468c08fd59a2b41f71b43d25dff639789d364747acd1705c0df6e", size = 215019, upload-time = "2026-05-26T06:49:35.607Z" }, - { url = "https://files.pythonhosted.org/packages/9f/97/da13037b4c563e4df32eedbc819f8c00b754af494f68211e3dffd48d52da/zope_interface-8.5-cp312-cp312-win_arm64.whl", hash = "sha256:652b73107a04159ec6c020db6c1543d4f1e8f4d069bd2aac88a947820923517b", size = 213569, upload-time = "2026-05-26T06:49:37.317Z" }, - { url = "https://files.pythonhosted.org/packages/f4/8c/4c15755d701f2ec0e80d64a18e1ebaf5be2c584c0ec153fd516f5d13eada/zope_interface-8.5-cp313-cp313-macosx_10_9_x86_64.whl", hash = "sha256:28e80457c134d1fa57a7d758004dece348654e1b1467ac22dcdc20fc1d127c52", size = 212512, upload-time = "2026-05-26T06:49:38.996Z" }, - { url = "https://files.pythonhosted.org/packages/9a/2e/4360c54c465db042cc8fbeeec92abac28b4cedbf6ba63c1f092fd08a190f/zope_interface-8.5-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:09495ce9d559c06b70f2d4855b3e4f48a822a9ddc8be1d30c5b4e5be14ae1ace", size = 212541, upload-time = "2026-05-26T06:49:41.186Z" }, - { url = "https://files.pythonhosted.org/packages/aa/a5/692a2b8d70f78e848793231d5fae5fecbf8d0cccd73430fdc34802a6d3c1/zope_interface-8.5-cp313-cp313-manylinux1_i686.manylinux2014_i686.manylinux_2_17_i686.manylinux_2_5_i686.whl", hash = "sha256:7849ad8fa90763cc1087f4dda78ca3a233e950b3e08fac7079297c9cafbbd7bb", size = 265191, upload-time = "2026-05-26T06:49:43.449Z" }, - { url = "https://files.pythonhosted.org/packages/70/8d/454a9cfc7a050c394ab4f11b3371f7897828b7415e096afff724637e65e0/zope_interface-8.5-cp313-cp313-manylinux1_x86_64.manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:5578c9421ca409a1f39f153d6f7803e4cde01da592ec75a9ac5e1b777d18d33b", size = 270626, upload-time = "2026-05-26T06:49:45.425Z" }, - { url = "https://files.pythonhosted.org/packages/51/8c/db8409cfa3575b8e9b4800babd7d49f8228433cd1f0c56814bd0ada49c33/zope_interface-8.5-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:e1bd7d96b4ca5fa311f54c9eac16dce4886b428c1531dbe06067763ccdf123b4", size = 270444, upload-time = "2026-05-26T06:49:47.025Z" }, - { url = "https://files.pythonhosted.org/packages/4a/df/a386940e41469ef615e100a216d8b386521e9e598817147f87932ca203c4/zope_interface-8.5-cp313-cp313-win_amd64.whl", hash = "sha256:0c8123d2a4dfde2a613c7cb772605477724782c20bc2e0ad1d9435376a6a44a3", size = 215021, upload-time = "2026-05-26T06:49:48.478Z" }, - { url = "https://files.pythonhosted.org/packages/89/75/477eb5669b6b2a7a843decd1a075e9b1971a8720017654143a7183abd3d9/zope_interface-8.5-cp313-cp313-win_arm64.whl", hash = "sha256:6d02be14f3173c6c7288bc2fdf530090c01c3cf8764ad46c68024686f364278e", size = 213610, upload-time = "2026-05-26T06:49:50.01Z" }, { url = "https://files.pythonhosted.org/packages/d4/19/5032e954827fdf02db2d2f49737ac4378bb9cfc2cd95a8f2e2a5ae2ec01a/zope_interface-8.5-cp314-cp314-macosx_10_9_x86_64.whl", hash = "sha256:ffaecf013251a89d0de6feb49a46eba48ad8cbbf8a40aeb6045e459e7bec6784", size = 212597, upload-time = "2026-05-26T06:49:51.63Z" }, { url = "https://files.pythonhosted.org/packages/f1/53/3ef644012cf8a6a234a2d6134aab5a5c65ac5467c86296865501d4fbc406/zope_interface-8.5-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:126fa9d1c52295ae076d4cf968634f0a1826afa408a20808b57ff72877b8f69f", size = 212626, upload-time = "2026-05-26T06:49:53.236Z" }, { url = "https://files.pythonhosted.org/packages/32/67/bc8b4f465d388039255003e230c284a175cedf1203c692f23cb7bff64efe/zope_interface-8.5-cp314-cp314-manylinux1_i686.manylinux2014_i686.manylinux_2_17_i686.manylinux_2_5_i686.whl", hash = "sha256:3090e3a663d20194756a59a272e0c8508b889341e31d5894223331fe6b4f9b21", size = 266827, upload-time = "2026-05-26T06:49:54.873Z" }, @@ -4797,57 +3393,6 @@ version = "0.25.0" source = { registry = "https://pypi.org/simple" } sdist = { url = "https://files.pythonhosted.org/packages/fd/aa/3e0508d5a5dd96529cdc5a97011299056e14c6505b678fd58938792794b1/zstandard-0.25.0.tar.gz", hash = "sha256:7713e1179d162cf5c7906da876ec2ccb9c3a9dcbdffef0cc7f70c3667a205f0b", size = 711513, upload-time = "2025-09-14T22:15:54.002Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/2a/83/c3ca27c363d104980f1c9cee1101cc8ba724ac8c28a033ede6aab89585b1/zstandard-0.25.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:933b65d7680ea337180733cf9e87293cc5500cc0eb3fc8769f4d3c88d724ec5c", size = 795254, upload-time = "2025-09-14T22:16:26.137Z" }, - { url = "https://files.pythonhosted.org/packages/ac/4d/e66465c5411a7cf4866aeadc7d108081d8ceba9bc7abe6b14aa21c671ec3/zstandard-0.25.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:a3f79487c687b1fc69f19e487cd949bf3aae653d181dfb5fde3bf6d18894706f", size = 640559, upload-time = "2025-09-14T22:16:27.973Z" }, - { url = "https://files.pythonhosted.org/packages/12/56/354fe655905f290d3b147b33fe946b0f27e791e4b50a5f004c802cb3eb7b/zstandard-0.25.0-cp311-cp311-manylinux2010_i686.manylinux2014_i686.manylinux_2_12_i686.manylinux_2_17_i686.whl", hash = "sha256:0bbc9a0c65ce0eea3c34a691e3c4b6889f5f3909ba4822ab385fab9057099431", size = 5348020, upload-time = "2025-09-14T22:16:29.523Z" }, - { url = "https://files.pythonhosted.org/packages/3b/13/2b7ed68bd85e69a2069bcc72141d378f22cae5a0f3b353a2c8f50ef30c1b/zstandard-0.25.0-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:01582723b3ccd6939ab7b3a78622c573799d5d8737b534b86d0e06ac18dbde4a", size = 5058126, upload-time = "2025-09-14T22:16:31.811Z" }, - { url = "https://files.pythonhosted.org/packages/c9/dd/fdaf0674f4b10d92cb120ccff58bbb6626bf8368f00ebfd2a41ba4a0dc99/zstandard-0.25.0-cp311-cp311-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:5f1ad7bf88535edcf30038f6919abe087f606f62c00a87d7e33e7fc57cb69fcc", size = 5405390, upload-time = "2025-09-14T22:16:33.486Z" }, - { url = "https://files.pythonhosted.org/packages/0f/67/354d1555575bc2490435f90d67ca4dd65238ff2f119f30f72d5cde09c2ad/zstandard-0.25.0-cp311-cp311-manylinux2014_s390x.manylinux_2_17_s390x.whl", hash = "sha256:06acb75eebeedb77b69048031282737717a63e71e4ae3f77cc0c3b9508320df6", size = 5452914, upload-time = "2025-09-14T22:16:35.277Z" }, - { url = "https://files.pythonhosted.org/packages/bb/1f/e9cfd801a3f9190bf3e759c422bbfd2247db9d7f3d54a56ecde70137791a/zstandard-0.25.0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:9300d02ea7c6506f00e627e287e0492a5eb0371ec1670ae852fefffa6164b072", size = 5559635, upload-time = "2025-09-14T22:16:37.141Z" }, - { url = "https://files.pythonhosted.org/packages/21/88/5ba550f797ca953a52d708c8e4f380959e7e3280af029e38fbf47b55916e/zstandard-0.25.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:bfd06b1c5584b657a2892a6014c2f4c20e0db0208c159148fa78c65f7e0b0277", size = 5048277, upload-time = "2025-09-14T22:16:38.807Z" }, - { url = "https://files.pythonhosted.org/packages/46/c0/ca3e533b4fa03112facbe7fbe7779cb1ebec215688e5df576fe5429172e0/zstandard-0.25.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:f373da2c1757bb7f1acaf09369cdc1d51d84131e50d5fa9863982fd626466313", size = 5574377, upload-time = "2025-09-14T22:16:40.523Z" }, - { url = "https://files.pythonhosted.org/packages/12/9b/3fb626390113f272abd0799fd677ea33d5fc3ec185e62e6be534493c4b60/zstandard-0.25.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:6c0e5a65158a7946e7a7affa6418878ef97ab66636f13353b8502d7ea03c8097", size = 4961493, upload-time = "2025-09-14T22:16:43.3Z" }, - { url = "https://files.pythonhosted.org/packages/cb/d3/23094a6b6a4b1343b27ae68249daa17ae0651fcfec9ed4de09d14b940285/zstandard-0.25.0-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:c8e167d5adf59476fa3e37bee730890e389410c354771a62e3c076c86f9f7778", size = 5269018, upload-time = "2025-09-14T22:16:45.292Z" }, - { url = "https://files.pythonhosted.org/packages/8c/a7/bb5a0c1c0f3f4b5e9d5b55198e39de91e04ba7c205cc46fcb0f95f0383c1/zstandard-0.25.0-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:98750a309eb2f020da61e727de7d7ba3c57c97cf6213f6f6277bb7fb42a8e065", size = 5443672, upload-time = "2025-09-14T22:16:47.076Z" }, - { url = "https://files.pythonhosted.org/packages/27/22/503347aa08d073993f25109c36c8d9f029c7d5949198050962cb568dfa5e/zstandard-0.25.0-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:22a086cff1b6ceca18a8dd6096ec631e430e93a8e70a9ca5efa7561a00f826fa", size = 5822753, upload-time = "2025-09-14T22:16:49.316Z" }, - { url = "https://files.pythonhosted.org/packages/e2/be/94267dc6ee64f0f8ba2b2ae7c7a2df934a816baaa7291db9e1aa77394c3c/zstandard-0.25.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:72d35d7aa0bba323965da807a462b0966c91608ef3a48ba761678cb20ce5d8b7", size = 5366047, upload-time = "2025-09-14T22:16:51.328Z" }, - { url = "https://files.pythonhosted.org/packages/7b/a3/732893eab0a3a7aecff8b99052fecf9f605cf0fb5fb6d0290e36beee47a4/zstandard-0.25.0-cp311-cp311-win32.whl", hash = "sha256:f5aeea11ded7320a84dcdd62a3d95b5186834224a9e55b92ccae35d21a8b63d4", size = 436484, upload-time = "2025-09-14T22:16:55.005Z" }, - { url = "https://files.pythonhosted.org/packages/43/a3/c6155f5c1cce691cb80dfd38627046e50af3ee9ddc5d0b45b9b063bfb8c9/zstandard-0.25.0-cp311-cp311-win_amd64.whl", hash = "sha256:daab68faadb847063d0c56f361a289c4f268706b598afbf9ad113cbe5c38b6b2", size = 506183, upload-time = "2025-09-14T22:16:52.753Z" }, - { url = "https://files.pythonhosted.org/packages/8c/3e/8945ab86a0820cc0e0cdbf38086a92868a9172020fdab8a03ac19662b0e5/zstandard-0.25.0-cp311-cp311-win_arm64.whl", hash = "sha256:22a06c5df3751bb7dc67406f5374734ccee8ed37fc5981bf1ad7041831fa1137", size = 462533, upload-time = "2025-09-14T22:16:53.878Z" }, - { url = "https://files.pythonhosted.org/packages/82/fc/f26eb6ef91ae723a03e16eddb198abcfce2bc5a42e224d44cc8b6765e57e/zstandard-0.25.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:7b3c3a3ab9daa3eed242d6ecceead93aebbb8f5f84318d82cee643e019c4b73b", size = 795738, upload-time = "2025-09-14T22:16:56.237Z" }, - { url = "https://files.pythonhosted.org/packages/aa/1c/d920d64b22f8dd028a8b90e2d756e431a5d86194caa78e3819c7bf53b4b3/zstandard-0.25.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:913cbd31a400febff93b564a23e17c3ed2d56c064006f54efec210d586171c00", size = 640436, upload-time = "2025-09-14T22:16:57.774Z" }, - { url = "https://files.pythonhosted.org/packages/53/6c/288c3f0bd9fcfe9ca41e2c2fbfd17b2097f6af57b62a81161941f09afa76/zstandard-0.25.0-cp312-cp312-manylinux2010_i686.manylinux2014_i686.manylinux_2_12_i686.manylinux_2_17_i686.whl", hash = "sha256:011d388c76b11a0c165374ce660ce2c8efa8e5d87f34996aa80f9c0816698b64", size = 5343019, upload-time = "2025-09-14T22:16:59.302Z" }, - { url = "https://files.pythonhosted.org/packages/1e/15/efef5a2f204a64bdb5571e6161d49f7ef0fffdbca953a615efbec045f60f/zstandard-0.25.0-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:6dffecc361d079bb48d7caef5d673c88c8988d3d33fb74ab95b7ee6da42652ea", size = 5063012, upload-time = "2025-09-14T22:17:01.156Z" }, - { url = "https://files.pythonhosted.org/packages/b7/37/a6ce629ffdb43959e92e87ebdaeebb5ac81c944b6a75c9c47e300f85abdf/zstandard-0.25.0-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:7149623bba7fdf7e7f24312953bcf73cae103db8cae49f8154dd1eadc8a29ecb", size = 5394148, upload-time = "2025-09-14T22:17:03.091Z" }, - { url = "https://files.pythonhosted.org/packages/e3/79/2bf870b3abeb5c070fe2d670a5a8d1057a8270f125ef7676d29ea900f496/zstandard-0.25.0-cp312-cp312-manylinux2014_s390x.manylinux_2_17_s390x.whl", hash = "sha256:6a573a35693e03cf1d67799fd01b50ff578515a8aeadd4595d2a7fa9f3ec002a", size = 5451652, upload-time = "2025-09-14T22:17:04.979Z" }, - { url = "https://files.pythonhosted.org/packages/53/60/7be26e610767316c028a2cbedb9a3beabdbe33e2182c373f71a1c0b88f36/zstandard-0.25.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:5a56ba0db2d244117ed744dfa8f6f5b366e14148e00de44723413b2f3938a902", size = 5546993, upload-time = "2025-09-14T22:17:06.781Z" }, - { url = "https://files.pythonhosted.org/packages/85/c7/3483ad9ff0662623f3648479b0380d2de5510abf00990468c286c6b04017/zstandard-0.25.0-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:10ef2a79ab8e2974e2075fb984e5b9806c64134810fac21576f0668e7ea19f8f", size = 5046806, upload-time = "2025-09-14T22:17:08.415Z" }, - { url = "https://files.pythonhosted.org/packages/08/b3/206883dd25b8d1591a1caa44b54c2aad84badccf2f1de9e2d60a446f9a25/zstandard-0.25.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:aaf21ba8fb76d102b696781bddaa0954b782536446083ae3fdaa6f16b25a1c4b", size = 5576659, upload-time = "2025-09-14T22:17:10.164Z" }, - { url = "https://files.pythonhosted.org/packages/9d/31/76c0779101453e6c117b0ff22565865c54f48f8bd807df2b00c2c404b8e0/zstandard-0.25.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:1869da9571d5e94a85a5e8d57e4e8807b175c9e4a6294e3b66fa4efb074d90f6", size = 4953933, upload-time = "2025-09-14T22:17:11.857Z" }, - { url = "https://files.pythonhosted.org/packages/18/e1/97680c664a1bf9a247a280a053d98e251424af51f1b196c6d52f117c9720/zstandard-0.25.0-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:809c5bcb2c67cd0ed81e9229d227d4ca28f82d0f778fc5fea624a9def3963f91", size = 5268008, upload-time = "2025-09-14T22:17:13.627Z" }, - { url = "https://files.pythonhosted.org/packages/1e/73/316e4010de585ac798e154e88fd81bb16afc5c5cb1a72eeb16dd37e8024a/zstandard-0.25.0-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:f27662e4f7dbf9f9c12391cb37b4c4c3cb90ffbd3b1fb9284dadbbb8935fa708", size = 5433517, upload-time = "2025-09-14T22:17:16.103Z" }, - { url = "https://files.pythonhosted.org/packages/5b/60/dd0f8cfa8129c5a0ce3ea6b7f70be5b33d2618013a161e1ff26c2b39787c/zstandard-0.25.0-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:99c0c846e6e61718715a3c9437ccc625de26593fea60189567f0118dc9db7512", size = 5814292, upload-time = "2025-09-14T22:17:17.827Z" }, - { url = "https://files.pythonhosted.org/packages/fc/5f/75aafd4b9d11b5407b641b8e41a57864097663699f23e9ad4dbb91dc6bfe/zstandard-0.25.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:474d2596a2dbc241a556e965fb76002c1ce655445e4e3bf38e5477d413165ffa", size = 5360237, upload-time = "2025-09-14T22:17:19.954Z" }, - { url = "https://files.pythonhosted.org/packages/ff/8d/0309daffea4fcac7981021dbf21cdb2e3427a9e76bafbcdbdf5392ff99a4/zstandard-0.25.0-cp312-cp312-win32.whl", hash = "sha256:23ebc8f17a03133b4426bcc04aabd68f8236eb78c3760f12783385171b0fd8bd", size = 436922, upload-time = "2025-09-14T22:17:24.398Z" }, - { url = "https://files.pythonhosted.org/packages/79/3b/fa54d9015f945330510cb5d0b0501e8253c127cca7ebe8ba46a965df18c5/zstandard-0.25.0-cp312-cp312-win_amd64.whl", hash = "sha256:ffef5a74088f1e09947aecf91011136665152e0b4b359c42be3373897fb39b01", size = 506276, upload-time = "2025-09-14T22:17:21.429Z" }, - { url = "https://files.pythonhosted.org/packages/ea/6b/8b51697e5319b1f9ac71087b0af9a40d8a6288ff8025c36486e0c12abcc4/zstandard-0.25.0-cp312-cp312-win_arm64.whl", hash = "sha256:181eb40e0b6a29b3cd2849f825e0fa34397f649170673d385f3598ae17cca2e9", size = 462679, upload-time = "2025-09-14T22:17:23.147Z" }, - { url = "https://files.pythonhosted.org/packages/35/0b/8df9c4ad06af91d39e94fa96cc010a24ac4ef1378d3efab9223cc8593d40/zstandard-0.25.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:ec996f12524f88e151c339688c3897194821d7f03081ab35d31d1e12ec975e94", size = 795735, upload-time = "2025-09-14T22:17:26.042Z" }, - { url = "https://files.pythonhosted.org/packages/3f/06/9ae96a3e5dcfd119377ba33d4c42a7d89da1efabd5cb3e366b156c45ff4d/zstandard-0.25.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:a1a4ae2dec3993a32247995bdfe367fc3266da832d82f8438c8570f989753de1", size = 640440, upload-time = "2025-09-14T22:17:27.366Z" }, - { url = "https://files.pythonhosted.org/packages/d9/14/933d27204c2bd404229c69f445862454dcc101cd69ef8c6068f15aaec12c/zstandard-0.25.0-cp313-cp313-manylinux2010_i686.manylinux2014_i686.manylinux_2_12_i686.manylinux_2_17_i686.whl", hash = "sha256:e96594a5537722fdfb79951672a2a63aec5ebfb823e7560586f7484819f2a08f", size = 5343070, upload-time = "2025-09-14T22:17:28.896Z" }, - { url = "https://files.pythonhosted.org/packages/6d/db/ddb11011826ed7db9d0e485d13df79b58586bfdec56e5c84a928a9a78c1c/zstandard-0.25.0-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:bfc4e20784722098822e3eee42b8e576b379ed72cca4a7cb856ae733e62192ea", size = 5063001, upload-time = "2025-09-14T22:17:31.044Z" }, - { url = "https://files.pythonhosted.org/packages/db/00/87466ea3f99599d02a5238498b87bf84a6348290c19571051839ca943777/zstandard-0.25.0-cp313-cp313-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:457ed498fc58cdc12fc48f7950e02740d4f7ae9493dd4ab2168a47c93c31298e", size = 5394120, upload-time = "2025-09-14T22:17:32.711Z" }, - { url = "https://files.pythonhosted.org/packages/2b/95/fc5531d9c618a679a20ff6c29e2b3ef1d1f4ad66c5e161ae6ff847d102a9/zstandard-0.25.0-cp313-cp313-manylinux2014_s390x.manylinux_2_17_s390x.whl", hash = "sha256:fd7a5004eb1980d3cefe26b2685bcb0b17989901a70a1040d1ac86f1d898c551", size = 5451230, upload-time = "2025-09-14T22:17:34.41Z" }, - { url = "https://files.pythonhosted.org/packages/63/4b/e3678b4e776db00f9f7b2fe58e547e8928ef32727d7a1ff01dea010f3f13/zstandard-0.25.0-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:8e735494da3db08694d26480f1493ad2cf86e99bdd53e8e9771b2752a5c0246a", size = 5547173, upload-time = "2025-09-14T22:17:36.084Z" }, - { url = "https://files.pythonhosted.org/packages/4e/d5/ba05ed95c6b8ec30bd468dfeab20589f2cf709b5c940483e31d991f2ca58/zstandard-0.25.0-cp313-cp313-musllinux_1_1_aarch64.whl", hash = "sha256:3a39c94ad7866160a4a46d772e43311a743c316942037671beb264e395bdd611", size = 5046736, upload-time = "2025-09-14T22:17:37.891Z" }, - { url = "https://files.pythonhosted.org/packages/50/d5/870aa06b3a76c73eced65c044b92286a3c4e00554005ff51962deef28e28/zstandard-0.25.0-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:172de1f06947577d3a3005416977cce6168f2261284c02080e7ad0185faeced3", size = 5576368, upload-time = "2025-09-14T22:17:40.206Z" }, - { url = "https://files.pythonhosted.org/packages/5d/35/398dc2ffc89d304d59bc12f0fdd931b4ce455bddf7038a0a67733a25f550/zstandard-0.25.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:3c83b0188c852a47cd13ef3bf9209fb0a77fa5374958b8c53aaa699398c6bd7b", size = 4954022, upload-time = "2025-09-14T22:17:41.879Z" }, - { url = "https://files.pythonhosted.org/packages/9a/5c/36ba1e5507d56d2213202ec2b05e8541734af5f2ce378c5d1ceaf4d88dc4/zstandard-0.25.0-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:1673b7199bbe763365b81a4f3252b8e80f44c9e323fc42940dc8843bfeaf9851", size = 5267889, upload-time = "2025-09-14T22:17:43.577Z" }, - { url = "https://files.pythonhosted.org/packages/70/e8/2ec6b6fb7358b2ec0113ae202647ca7c0e9d15b61c005ae5225ad0995df5/zstandard-0.25.0-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:0be7622c37c183406f3dbf0cba104118eb16a4ea7359eeb5752f0794882fc250", size = 5433952, upload-time = "2025-09-14T22:17:45.271Z" }, - { url = "https://files.pythonhosted.org/packages/7b/01/b5f4d4dbc59ef193e870495c6f1275f5b2928e01ff5a81fecb22a06e22fb/zstandard-0.25.0-cp313-cp313-musllinux_1_2_s390x.whl", hash = "sha256:5f5e4c2a23ca271c218ac025bd7d635597048b366d6f31f420aaeb715239fc98", size = 5814054, upload-time = "2025-09-14T22:17:47.08Z" }, - { url = "https://files.pythonhosted.org/packages/b2/e5/fbd822d5c6f427cf158316d012c5a12f233473c2f9c5fe5ab1ae5d21f3d8/zstandard-0.25.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:4f187a0bb61b35119d1926aee039524d1f93aaf38a9916b8c4b78ac8514a0aaf", size = 5360113, upload-time = "2025-09-14T22:17:48.893Z" }, - { url = "https://files.pythonhosted.org/packages/8e/e0/69a553d2047f9a2c7347caa225bb3a63b6d7704ad74610cb7823baa08ed7/zstandard-0.25.0-cp313-cp313-win32.whl", hash = "sha256:7030defa83eef3e51ff26f0b7bfb229f0204b66fe18e04359ce3474ac33cbc09", size = 436936, upload-time = "2025-09-14T22:17:52.658Z" }, - { url = "https://files.pythonhosted.org/packages/d9/82/b9c06c870f3bd8767c201f1edbdf9e8dc34be5b0fbc5682c4f80fe948475/zstandard-0.25.0-cp313-cp313-win_amd64.whl", hash = "sha256:1f830a0dac88719af0ae43b8b2d6aef487d437036468ef3c2ea59c51f9d55fd5", size = 506232, upload-time = "2025-09-14T22:17:50.402Z" }, - { url = "https://files.pythonhosted.org/packages/d4/57/60c3c01243bb81d381c9916e2a6d9e149ab8627c0c7d7abb2d73384b3c0c/zstandard-0.25.0-cp313-cp313-win_arm64.whl", hash = "sha256:85304a43f4d513f5464ceb938aa02c1e78c2943b29f44a750b48b25ac999a049", size = 462671, upload-time = "2025-09-14T22:17:51.533Z" }, { url = "https://files.pythonhosted.org/packages/3d/5c/f8923b595b55fe49e30612987ad8bf053aef555c14f05bb659dd5dbe3e8a/zstandard-0.25.0-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:e29f0cf06974c899b2c188ef7f783607dbef36da4c242eb6c82dcd8b512855e3", size = 795887, upload-time = "2025-09-14T22:17:54.198Z" }, { url = "https://files.pythonhosted.org/packages/8d/09/d0a2a14fc3439c5f874042dca72a79c70a532090b7ba0003be73fee37ae2/zstandard-0.25.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:05df5136bc5a011f33cd25bc9f506e7426c0c9b3f9954f056831ce68f3b6689f", size = 640658, upload-time = "2025-09-14T22:17:55.423Z" }, { url = "https://files.pythonhosted.org/packages/5d/7c/8b6b71b1ddd517f68ffb55e10834388d4f793c49c6b83effaaa05785b0b4/zstandard-0.25.0-cp314-cp314-manylinux2010_i686.manylinux_2_12_i686.manylinux_2_28_i686.whl", hash = "sha256:f604efd28f239cc21b3adb53eb061e2a205dc164be408e553b41ba2ffe0ca15c", size = 5379849, upload-time = "2025-09-14T22:17:57.372Z" }, From 25bdc3041d813f13302ecb0e7842e8b4e9176838 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 3 Jun 2026 13:23:27 -0700 Subject: [PATCH 039/591] Abstracted repository and models --- .../mpcontribs_api/domains/_shared/models.py | 38 +++++++++ .../domains/_shared/repository.py | 79 +++++++++++++++++++ 2 files changed, 117 insertions(+) create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py new file mode 100644 index 0000000000..1fec00611b --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py @@ -0,0 +1,38 @@ +from typing import Annotated, Any, Self + +from beanie import DocumentWithSoftDelete +from pydantic import Field + +from src.mpcontribs_api.projection import SparseFieldsModel + + +class BaseDocumentWithInput[TId](DocumentWithSoftDelete): + """A stored resource document with a required ``id`` and an input counterpart. + + Subclasses bind their id type as ``TId``. The ``id`` is declared here as required and non-null so + the repository can always read and key on it, while ``TId`` lets each resource pick its own id + type (``ShortStr`` for projects, ``PydanticObjectId`` for contributions). ``from_input_model`` + translates a validated input payload into a full document; the base param is intentionally ``Any`` + so each resource's override can declare its concrete input model without violating LSP (input + models subclass their document, so they can't be bound as a class type parameter). Soft-delete + behavior is inherited from ``DocumentWithSoftDelete``. + """ + + # Required, non-null, resource-specific id. Overrides Document's optional ``PydanticObjectId`` id. + id: TId = Field(alias="_id") # pyright: ignore[reportGeneralTypeIssues, reportIncompatibleVariableOverride] + + @classmethod + def from_input_model(cls, data: Any) -> Self: + """Translate a validated input payload into a full stored document.""" + return cls(**data.model_dump()) + + +class DocumentOut[TId](SparseFieldsModel): + """Base output model for resources addressed by an ``_id``. + + Mirrors :class:`BaseDocumentWithInput`: subclasses bind their id type as ``TId`` so each resource + owns its id type, while the field (optional, since projections may omit it) and its alias wiring + are declared once here for the repository to read off any resource's output model. + """ + + id: Annotated[TId | None, Field(alias="_id", serialization_alias="id")] = None diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py new file mode 100644 index 0000000000..c5c6395a73 --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py @@ -0,0 +1,79 @@ +from abc import ABC, abstractmethod +from typing import Any + +from fastapi_filter.contrib.beanie import Filter +from pydantic import BaseModel + +from src.mpcontribs_api.auth import User +from src.mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut +from src.mpcontribs_api.exceptions import ConflictError +from src.mpcontribs_api.pagination import CursorParams, Page, decode_cursor, encode_cursor + + +class MongoDbRepository[TDoc: BaseDocumentWithInput, TIn: BaseModel, TOut: DocumentOut](ABC): + """Base repository encapsulating shared MongoDB access patterns. + + Subclasses bind the document, input, and output types as type parameters, set the matching + ``document_model`` / ``out_model`` class attributes, and implement ``_build_scope`` to enforce + per-user authorization. Shared query logic (scoping, projection, cursor pagination, insertion) + lives here; resource-specific operations stay on the concrete subclasses where they keep their + precise types. + + Attributes: + document_model: the ``BaseDocumentWithInput`` subclass this repository operates on + out_model: the ``SparseFieldsModel`` subclass used to build projections for reads + _scope (dict[str, Any]): terms injected into every query to enforce user authorization + """ + + document_model: type[TDoc] + out_model: type[TOut] + + def __init__(self, user: User) -> None: + """Initializes an instance based on the current user. + + Args: + user (User): the current user requesting resources + """ + self._scope = self._build_scope(user) + + @staticmethod + @abstractmethod + def _build_scope(user: User) -> dict[str, Any]: + """Provides scope based on current user's permitted groups and publicly released data.""" + ... + + async def get_many( + self, + pagination: CursorParams, + filter: Filter, + fields: frozenset[str] | None, + ) -> Page[TOut]: + """Return a scoped, filtered, cursor-paginated page of projected documents. + + Args: + pagination (CursorParams): forward-only cursor parameters + filter (Filter): the fastapi-filter query to apply on top of the user scope + fields (frozenset[str] | None): fields to project; if None the full document is returned + """ + projection = self.out_model.projection(fields) + query = filter.filter(self.document_model.find(self._scope)) + if pagination.cursor is not None: + query = query.find(self.document_model.id > decode_cursor(pagination.cursor)) # pyright: ignore[reportOptionalOperand] + docs = await query.sort(self.document_model.id).limit(pagination.limit + 1).project(projection).to_list() # pyright: ignore[reportArgumentType] + has_more = len(docs) > pagination.limit + items = docs[: pagination.limit] + next_cursor = encode_cursor(str(items[-1].id)) if has_more and items else None + return Page(items=items, next_cursor=next_cursor) + + async def insert_one(self, in_resource: TIn) -> TDoc: + """Insert a new document built from its input model, rejecting duplicate ids. + + Args: + in_resource (TIn): the validated input payload to translate and store + """ + document = self.document_model.from_input_model(in_resource) + existing = await self.document_model.find_one(self.document_model.id == document.id) + if existing: + raise ConflictError(f"Cannot insert document.\n Document with ID {document.id} exists") + await document.insert() + return document From 6392fb2a48b645cded1c0a512d09d39f72483340 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 3 Jun 2026 13:23:51 -0700 Subject: [PATCH 040/591] Implemented classes and methods with new abstractions --- .../domains/contributions/models.py | 15 ++++--- .../domains/contributions/repository.py | 23 +++++----- .../domains/contributions/router.py | 4 +- .../mpcontribs_api/domains/projects/models.py | 19 ++++---- .../domains/projects/repository.py | 43 ++++++------------- 5 files changed, 47 insertions(+), 57 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py index 2a88d69007..ba5015b142 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py @@ -2,9 +2,9 @@ from typing import Any from beanie import ( - Document, Insert, Link, + PydanticObjectId, Replace, Save, SaveChanges, @@ -14,6 +14,7 @@ from fastapi_filter.contrib.beanie import Filter from pydantic import Field +from src.mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut from src.mpcontribs_api.domains.attachments.models import Attachment from src.mpcontribs_api.domains.structures.models import Structure from src.mpcontribs_api.domains.tables.models import Table @@ -21,7 +22,7 @@ from src.mpcontribs_api.types import ShortStr -class ContributionBase(Document): +class ContributionBase(BaseDocumentWithInput[PydanticObjectId]): project: str identifier: str formula: str @@ -44,7 +45,7 @@ class Contribution(ContributionBase): # needs_build: bool = True @classmethod - def from_contribution_in(cls, data: ContributionIn) -> Contribution: + def from_input_model(cls, data: ContributionIn) -> Contribution: return cls.model_validate( { **data.model_dump(exclude={"is_public"}), @@ -61,7 +62,7 @@ class ContributionIn(ContributionBase): pass -class ContributionOut(SparseFieldsModel): +class ContributionOut(DocumentOut[PydanticObjectId]): project: str | None = None identifier: str | None = None formula: str | None = None @@ -86,9 +87,9 @@ class ContributionPatch(SparseFieldsModel): class ContributionFilter(Filter): - id: str | None = None - id__in: list[str] | None = None - id__neq: str | None = None + id: PydanticObjectId | None = None + id__in: list[PydanticObjectId] | None = None + id__neq: PydanticObjectId | None = None identifier: str | None = None identifier__in: list[ShortStr] | None = None diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py index 4cfa191b3a..8819c4ffb2 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py @@ -1,22 +1,20 @@ from typing import Any, Literal from src.mpcontribs_api.auth import User +from src.mpcontribs_api.domains._shared.repository import MongoDbRepository from src.mpcontribs_api.domains.contributions.models import ( + Contribution, ContributionFilter, ContributionIn, + ContributionOut, ContributionPatch, ) from src.mpcontribs_api.pagination import CursorParams -class MongoDbContributionRepository: - def __init__(self, user: User) -> None: - """Initializes an instance based on the current user. - - Args: - user (User): the current user requesting resources - """ - self._scope = self._build_scope(user) +class MongoDbContributionRepository(MongoDbRepository[Contribution, ContributionIn, ContributionOut]): + document_model = Contribution + out_model = ContributionOut @staticmethod def _build_scope(user: User) -> dict[str, Any]: @@ -29,8 +27,13 @@ def _build_scope(user: User) -> dict[str, Any]: ors.append({"_id": {"$in": sorted(user.groups)}}) return {"$or": ors} - async def get_contributions(self, pagination: CursorParams, filter: ContributionFilter, fields: str | None): - pass + async def get_contributions( + self, + pagination: CursorParams, + filter: ContributionFilter, + fields: frozenset[str] | None, + ): + return await self.get_many(pagination=pagination, filter=filter, fields=fields) async def delete_contributions(self, filter: ContributionFilter): pass diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py index cbd5837505..f2923c40ff 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py @@ -7,6 +7,7 @@ from src.mpcontribs_api.domains.contributions.models import ( ContributionFilter, ContributionIn, + ContributionOut, ContributionPatch, ) from src.mpcontribs_api.pagination import CursorParams @@ -21,7 +22,8 @@ async def get_contributions( filter: ContributionFilter = FilterDepends(ContributionFilter), fields: Annotated[str | None, Query(alias="_fields")] = None, ): - return await repo.get_contributions(pagination=pagination, filter=filter, fields=fields) + field_set = ContributionOut.parse_fields(fields) + return await repo.get_contributions(pagination=pagination, filter=filter, fields=field_set) @router.delete("") diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py index 9f78c568f9..0a1bca7479 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py @@ -1,12 +1,11 @@ from __future__ import annotations -from typing import Annotated, Any, Literal +from typing import Any, Literal -from beanie import DocumentWithSoftDelete from fastapi_filter.contrib.beanie import Filter from pydantic import BaseModel, ConfigDict, Field, HttpUrl -from src.mpcontribs_api.projection import SparseFieldsModel +from src.mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut from src.mpcontribs_api.types import PrefixedEmail, ShortStr @@ -36,12 +35,13 @@ class Reference(BaseModel): url: HttpUrl -class Project(DocumentWithSoftDelete): - """Document model of what is actually stored.""" +class Project(BaseDocumentWithInput[ShortStr]): + """Document model of what is actually stored. + + Binds ``id`` to ``ShortStr`` (a meaningful string id, always supplied) via the generic base. + """ # Required - # meaningful string id, always supplied - id: ShortStr = Field(alias="_id") # pyright: ignore[reportGeneralTypeIssues, reportIncompatibleVariableOverride] title: ShortStr authors: str description: str @@ -60,7 +60,7 @@ class Project(DocumentWithSoftDelete): # Empty method for now. Keeping for business logic later @classmethod - def from_project_in(cls, data: ProjectIn) -> Project: + def from_input_model(cls, data: ProjectIn) -> Project: return cls(**data.model_dump()) class Settings: @@ -68,11 +68,10 @@ class Settings: keep_nulls = False -class ProjectOut(SparseFieldsModel): +class ProjectOut(DocumentOut[ShortStr]): """Full response of all public-facing fields.""" model_config = ConfigDict(extra="ignore") - id: Annotated[ShortStr | None, Field(alias="_id", serialization_alias="id")] = None authors: str | None = None description: str | None = None title: ShortStr | None = None diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py index 2a13f3c2ec..4da3a634a0 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py @@ -5,6 +5,7 @@ from pydantic import BaseModel from src.mpcontribs_api.auth import User +from src.mpcontribs_api.domains._shared.repository import MongoDbRepository from src.mpcontribs_api.domains.projects.models import ( Project, ProjectFilter, @@ -15,9 +16,6 @@ from src.mpcontribs_api.exceptions import ConflictError, NotFoundError from src.mpcontribs_api.pagination import ( CursorParams, - Page, - decode_cursor, - encode_cursor, ) @@ -30,7 +28,7 @@ class HasId(BaseModel): M = TypeVar("M", bound=BaseModel) -class MongoDbProjectRepository: +class MongoDbProjectRepository(MongoDbRepository[Project, ProjectIn, ProjectOut]): """A repository layer for access to MongoDB. This is the layer that directly interacts with database operations @@ -40,13 +38,8 @@ class MongoDbProjectRepository: resources """ - def __init__(self, user: User) -> None: - """Initializes an instance based on the current user. - - Args: - user (User): the current user requesting resources - """ - self._scope = self._build_scope(user) + document_model = Project + out_model = ProjectOut @staticmethod def _build_scope(user: User) -> dict[str, Any]: @@ -73,10 +66,10 @@ async def get_project_by_id(self, id: str, fields: frozenset[str] | None): ProjectOut: a projection of ProjectOut containing 'fields' from requested id """ # TODO: Verify that self._scope and Project.id == id get combined properly - return await Project.find_one( + return await self.document_model.find_one( self._scope, - Project.id == id, - projection_model=ProjectOut.projection(fields), + self.document_model.id == id, + projection_model=self.out_model.projection(fields), ) # Brendan TODO: Does not handle compound pagination/sorting @@ -97,15 +90,7 @@ async def get_project( fields (frozenset[str] | None): the fields to use for projection. If none, the document is returned without projection """ - proj = ProjectOut.projection(fields) - query = filter.filter(Project.find(self._scope)) - if pagination.cursor is not None: - query = query.find(Project.id > decode_cursor(pagination.cursor)) - docs = await query.sort(Project.id).limit(pagination.limit + 1).project(proj).to_list() - has_more = len(docs) > pagination.limit - items = docs[: pagination.limit] - next_cursor = encode_cursor(str(items[-1].id)) if has_more and items else None - return Page(items=items, next_cursor=next_cursor) + return await self.get_many(pagination=pagination, filter=filter, fields=fields) async def insert_project(self, project: ProjectIn) -> Project: """Inserst a new project. @@ -116,11 +101,11 @@ async def insert_project(self, project: ProjectIn) -> Project: Returns: Project: the project after succesful insertion """ - id_exists = await Project.find_one(Project.id == project.id) + id_exists = await self.document_model.find_one(self.document_model.id == project.id) # Brendan TODO: if id_exists: raise ConflictError(f"Cannot insert project.\n Project with ID {project.id} exists") - full_project = Project.from_project_in(project) + full_project = self.document_model.from_input_model(project) await full_project.insert() return full_project @@ -141,7 +126,7 @@ async def patch_project(self, id: str, update: ProjectPatch) -> Project: update_data = update.model_dump(exclude_unset=True) # If update is empty, return the model anyways (consistent behavior) if not update_data: - existing = await Project.get(id) + existing = await self.document_model.get(id) if existing is None: raise NotFoundError(f"Project with id {id} not found") return existing @@ -149,7 +134,7 @@ async def patch_project(self, id: str, update: ProjectPatch) -> Project: # Otherwise, update the fields fully (set) # Brendan TODO: Set will replace an entire field # - if we want to append to a list (ie. add a reference) we ned Push/AddToSet - query = Project.find_one(Project.id == id).update( + query = self.document_model.find_one(self.document_model.id == id).update( Set(update_data), response_type=UpdateResponse.NEW_DOCUMENT, ) @@ -164,7 +149,7 @@ async def delete_project(self, id: str): Args: id (str): the id of the project to delete """ - await Project.find_one(Project.id == id).delete() + await self.document_model.find_one(self.document_model.id == id).delete() async def upsert_project(self, id: str, data: ProjectIn) -> Project: """Upsert a project by provided id. @@ -180,6 +165,6 @@ async def upsert_project(self, id: str, data: ProjectIn) -> Project: Returns: Project: the full document that either replaced an old one or was inserted """ - project = Project.from_project_in(data) + project = self.document_model.from_input_model(data) project.id = id return await project.save() From 960ab66066424c3c320e2005ee54dbf9bba98ce3 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 3 Jun 2026 13:34:47 -0700 Subject: [PATCH 041/591] Implemented delete_contributions --- .../src/mpcontribs_api/domains/contributions/repository.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py index 8819c4ffb2..29306b3e4e 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py @@ -36,7 +36,8 @@ async def get_contributions( return await self.get_many(pagination=pagination, filter=filter, fields=fields) async def delete_contributions(self, filter: ContributionFilter): - pass + docs = filter.filter(self.document_model.find(self._scope)) + await docs.delete() async def insert_contributions(self, contributions: list[ContributionIn]): pass From de54f477900a839260ecb69680fd6a5067a83dd9 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 3 Jun 2026 13:43:14 -0700 Subject: [PATCH 042/591] Added linked-document filtering for contributions --- .../src/mpcontribs_api/domains/attachments/models.py | 5 +++++ .../mpcontribs_api/domains/contributions/models.py | 11 ++++++++--- .../src/mpcontribs_api/domains/structures/models.py | 5 +++++ .../src/mpcontribs_api/domains/tables/models.py | 5 +++++ 4 files changed, 23 insertions(+), 3 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py b/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py index ef24f2ad42..91f5081983 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py @@ -1,5 +1,10 @@ from beanie import Document +from fastapi_filter.contrib.beanie import Filter class Attachment(Document): pass + + +class AttachmentFilter(Filter): + pass diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py index ba5015b142..9da39c1f4f 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py @@ -11,13 +11,14 @@ Update, before_event, ) +from fastapi_filter import FilterDepends, with_prefix from fastapi_filter.contrib.beanie import Filter from pydantic import Field from src.mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut -from src.mpcontribs_api.domains.attachments.models import Attachment -from src.mpcontribs_api.domains.structures.models import Structure -from src.mpcontribs_api.domains.tables.models import Table +from src.mpcontribs_api.domains.attachments.models import Attachment, AttachmentFilter +from src.mpcontribs_api.domains.structures.models import Structure, StructureFilter +from src.mpcontribs_api.domains.tables.models import Table, TableFilter from src.mpcontribs_api.projection import SparseFieldsModel from src.mpcontribs_api.types import ShortStr @@ -105,6 +106,10 @@ class ContributionFilter(Filter): needs_build: bool | None = None + table: TableFilter | None = FilterDepends(with_prefix("tables", TableFilter)) + attachment: AttachmentFilter | None = FilterDepends(with_prefix("attachments", AttachmentFilter)) + structure: StructureFilter | None = FilterDepends(with_prefix("structures", StructureFilter)) + # sorting order_by: list[str] | None = None diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py index c42ae0436d..e31eff9eaf 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py @@ -1,5 +1,10 @@ from beanie import Document +from fastapi_filter.contrib.beanie import Filter class Structure(Document): pass + + +class StructureFilter(Filter): + pass diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py index b58aede0a9..803693afff 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py @@ -1,5 +1,10 @@ from beanie import Document +from fastapi_filter.contrib.beanie import Filter class Table(Document): pass + + +class TableFilter(Filter): + pass From 78f32b2413da9cff1f302a6c0db1dff2e60ed642 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 3 Jun 2026 14:28:54 -0700 Subject: [PATCH 043/591] Anyonymous users can no longer be admin. Fixed imports --- mpcontribs-api/src/mpcontribs_api/auth.py | 14 ++++++++++++-- mpcontribs-api/src/mpcontribs_api/dependencies.py | 2 +- mpcontribs-api/src/mpcontribs_api/types.py | 2 +- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/auth.py b/mpcontribs-api/src/mpcontribs_api/auth.py index 2e59670686..e12b45c75a 100644 --- a/mpcontribs-api/src/mpcontribs_api/auth.py +++ b/mpcontribs-api/src/mpcontribs_api/auth.py @@ -1,4 +1,6 @@ -from pydantic import BaseModel, ConfigDict +from typing import Any + +from pydantic import BaseModel, ConfigDict, model_validator from src.mpcontribs_api.config import get_settings @@ -21,13 +23,21 @@ class User(BaseModel): username: str | None = None groups: frozenset[str] = frozenset() + @model_validator(mode="before") + @classmethod + def drop_admin_on_anonymous(cls, config: dict[str, Any]) -> dict[str, Any]: + if not config.get("username"): + groups = config.get("groups", frozenset()) + config["groups"] = frozenset(g for g in groups if g != ADMIN_GROUP) + return config + @property def is_anonymous(self) -> bool: return self.username is None @property def is_admin(self) -> bool: - return ADMIN_GROUP in self.groups + return (not self.is_anonymous) and (ADMIN_GROUP in self.groups) def has_role(self, role: str) -> bool: return role in self.groups diff --git a/mpcontribs-api/src/mpcontribs_api/dependencies.py b/mpcontribs-api/src/mpcontribs_api/dependencies.py index 41a67d5f4c..a0738c7b6d 100644 --- a/mpcontribs-api/src/mpcontribs_api/dependencies.py +++ b/mpcontribs-api/src/mpcontribs_api/dependencies.py @@ -5,7 +5,7 @@ from fastapi import Depends, Header, Request from pymongo.asynchronous.database import AsyncDatabase -from mpcontribs_api.auth import User +from src.mpcontribs_api.auth import User from src.mpcontribs_api.config import get_settings from src.mpcontribs_api.exceptions import ( AuthenticationError, diff --git a/mpcontribs-api/src/mpcontribs_api/types.py b/mpcontribs-api/src/mpcontribs_api/types.py index 933b4bfbc4..ab5b81af90 100644 --- a/mpcontribs-api/src/mpcontribs_api/types.py +++ b/mpcontribs-api/src/mpcontribs_api/types.py @@ -1,6 +1,6 @@ +import re from typing import Annotated -from pandas.core.arrays.string_arrow import re from pydantic import BeforeValidator, Field from src.mpcontribs_api.exceptions import ValidationError From ee75871f7ed74301d119c3b66727e5d349534a03 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 3 Jun 2026 14:30:19 -0700 Subject: [PATCH 044/591] Added unit tests --- mpcontribs-api/pyproject.toml | 3 +- mpcontribs-api/tests/__init__.py | 0 mpcontribs-api/tests/conftest.py | 35 ++ mpcontribs-api/tests/unit/__init__.py | 0 mpcontribs-api/tests/unit/domains/__init__.py | 0 .../unit/domains/test_contributions_models.py | 180 ++++++++++ .../unit/domains/test_projects_models.py | 234 +++++++++++++ mpcontribs-api/tests/unit/test_auth.py | 91 +++++ .../tests/unit/test_dependencies.py | 121 +++++++ mpcontribs-api/tests/unit/test_exceptions.py | 154 ++++++++ mpcontribs-api/tests/unit/test_pagination.py | 102 ++++++ mpcontribs-api/tests/unit/test_projection.py | 328 ++++++++++++++++++ mpcontribs-api/tests/unit/test_types.py | 101 ++++++ 13 files changed, 1348 insertions(+), 1 deletion(-) create mode 100644 mpcontribs-api/tests/__init__.py create mode 100644 mpcontribs-api/tests/conftest.py create mode 100644 mpcontribs-api/tests/unit/__init__.py create mode 100644 mpcontribs-api/tests/unit/domains/__init__.py create mode 100644 mpcontribs-api/tests/unit/domains/test_contributions_models.py create mode 100644 mpcontribs-api/tests/unit/domains/test_projects_models.py create mode 100644 mpcontribs-api/tests/unit/test_auth.py create mode 100644 mpcontribs-api/tests/unit/test_dependencies.py create mode 100644 mpcontribs-api/tests/unit/test_exceptions.py create mode 100644 mpcontribs-api/tests/unit/test_pagination.py create mode 100644 mpcontribs-api/tests/unit/test_projection.py create mode 100644 mpcontribs-api/tests/unit/test_types.py diff --git a/mpcontribs-api/pyproject.toml b/mpcontribs-api/pyproject.toml index 66062c39a5..a081905744 100644 --- a/mpcontribs-api/pyproject.toml +++ b/mpcontribs-api/pyproject.toml @@ -84,7 +84,8 @@ dev = [ "pytest-xdist>=3.8.0", ] -[tool.pytest] +[tool.pytest.ini_options] +pythonpath = ["."] markers = [ "base: basic resource testing", "extra: all extra views", diff --git a/mpcontribs-api/tests/__init__.py b/mpcontribs-api/tests/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/mpcontribs-api/tests/conftest.py b/mpcontribs-api/tests/conftest.py new file mode 100644 index 0000000000..b8ae1606bf --- /dev/null +++ b/mpcontribs-api/tests/conftest.py @@ -0,0 +1,35 @@ +"""Shared pytest configuration and fixtures. + +Environment variables for Settings are set at module level (before any source +imports) so that auth.py and config.py can load successfully without a real +.env file. +""" + +import os +from unittest.mock import MagicMock, patch + +import pytest + +# Must be set before any source import that calls get_settings(). +os.environ.setdefault("MPCONTRIBS_ENVIRONMENT", "dev") +os.environ.setdefault("MPCONTRIBS_MONGO__URI", "mongodb://localhost:27017") +os.environ.setdefault("MPCONTRIBS_MONGO__DB_NAME", "testdb") +os.environ.setdefault("MPCONTRIBS_KONG__GATEWAY_SECRET", "test-gateway-secret") +os.environ.setdefault("MPCONTRIBS_REDIS__ADDRESS", "redis://localhost:6379") +os.environ.setdefault("MPCONTRIBS_REDIS__URL", "redis://localhost:6379") +os.environ.setdefault("MPCONTRIBS_MAIL_DEFAULT_SENDER", "test@example.com") +os.environ.setdefault("MPCONTRIBS_VERSION", "0.0.0-test") + + +@pytest.fixture(autouse=True, scope="session") +def _mock_beanie_collection(): + """Prevent CollectionWasNotInitialized for unit tests. + + Beanie Documents call get_pymongo_collection() in __init__ to assert the + collection has been set up via init_beanie(). Unit tests don't need a real + DB, so we stub that check out for the entire session. + """ + import beanie + + with patch.object(beanie.Document, "get_pymongo_collection", return_value=MagicMock()): + yield diff --git a/mpcontribs-api/tests/unit/__init__.py b/mpcontribs-api/tests/unit/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/mpcontribs-api/tests/unit/domains/__init__.py b/mpcontribs-api/tests/unit/domains/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/mpcontribs-api/tests/unit/domains/test_contributions_models.py b/mpcontribs-api/tests/unit/domains/test_contributions_models.py new file mode 100644 index 0000000000..c00c7fe8d1 --- /dev/null +++ b/mpcontribs-api/tests/unit/domains/test_contributions_models.py @@ -0,0 +1,180 @@ +from datetime import UTC, datetime + +import pytest +from beanie import PydanticObjectId +from pydantic import ValidationError as PydanticValidationError + +from src.mpcontribs_api.domains.contributions.models import ( + Contribution, + ContributionIn, + ContributionOut, + ContributionPatch, +) + +# --------------------------------------------------------------------------- +# Helpers +# --------------------------------------------------------------------------- + + +def _make_contribution_in(**overrides) -> ContributionIn: + """Build a minimal valid ContributionIn for testing.""" + defaults: dict = { + "_id": PydanticObjectId(), + "project": "test-project", + "identifier": "mp-1234", + "formula": "Fe2O3", + "data": {"band_gap": {"value": 2.1, "unit": "eV"}}, + } + defaults.update(overrides) + return ContributionIn(**defaults) + + +# --------------------------------------------------------------------------- +# ContributionBase field validation +# --------------------------------------------------------------------------- + + +class TestContributionBase: + def test_required_fields_set_correctly(self): + contrib = ContributionIn( + **{ + "_id": PydanticObjectId(), + "project": "mp-project", + "identifier": "mp-001", + "formula": "Fe2O3", + "data": {}, + } + ) + assert contrib.project == "mp-project" + assert contrib.identifier == "mp-001" + assert contrib.formula == "Fe2O3" + assert contrib.data == {} + + def test_defaults(self): + contrib = _make_contribution_in() + assert contrib.needs_build is True + assert contrib.structures is None + assert contrib.tables is None + assert contrib.attachments is None + + def test_last_modified_defaults_to_now(self): + before = datetime.now(UTC) + contrib = _make_contribution_in() + after = datetime.now(UTC) + assert before <= contrib.last_modified <= after + + def test_missing_project_raises(self): + with pytest.raises(PydanticValidationError): + ContributionIn( + **{ + "_id": PydanticObjectId(), + "identifier": "mp-001", + "formula": "Fe", + "data": {}, + } + ) + + def test_missing_formula_raises(self): + with pytest.raises(PydanticValidationError): + ContributionIn( + **{ + "_id": PydanticObjectId(), + "project": "proj", + "identifier": "mp-001", + "data": {}, + } + ) + + def test_data_can_be_empty_dict(self): + contrib = _make_contribution_in(data={}) + assert contrib.data == {} + + def test_data_accepts_nested_structure(self): + nested = {"band_gap": {"value": 1.5, "unit": "eV"}, "volume": 42.3} + contrib = _make_contribution_in(data=nested) + assert contrib.data["band_gap"]["value"] == 1.5 + + +# --------------------------------------------------------------------------- +# Contribution.from_input_model +# --------------------------------------------------------------------------- + + +class TestContributionFromInputModel: + def test_is_public_forced_to_false(self): + contrib_in = _make_contribution_in() + contribution = Contribution.from_input_model(contrib_in) + assert contribution.is_public is False + + def test_is_public_false_even_if_input_had_is_public(self): + # ContributionIn (ContributionBase) has no is_public field, but we ensure + # from_input_model always sets it to False on the resulting Contribution. + contrib_in = _make_contribution_in() + contribution = Contribution.from_input_model(contrib_in) + assert contribution.is_public is False + + def test_fields_carried_over(self): + contrib_in = _make_contribution_in(project="my-project", formula="SiO2") + contribution = Contribution.from_input_model(contrib_in) + assert contribution.project == "my-project" + assert contribution.formula == "SiO2" + + def test_data_carried_over(self): + data = {"key": "value"} + contrib_in = _make_contribution_in(data=data) + contribution = Contribution.from_input_model(contrib_in) + assert contribution.data == data + + +# --------------------------------------------------------------------------- +# ContributionOut — optional fields +# --------------------------------------------------------------------------- + + +class TestContributionOut: + def test_all_fields_optional(self): + out = ContributionOut() + assert out.id is None + assert out.project is None + assert out.formula is None + assert out.is_public is None + assert out.data is None + + def test_partial_population(self): + out = ContributionOut(project="mp-proj", formula="Li2O") + assert out.project == "mp-proj" + assert out.formula == "Li2O" + assert out.identifier is None + + def test_is_public_field(self): + out = ContributionOut(is_public=True) + assert out.is_public is True + + def test_data_field(self): + data = {"energy": -3.5} + out = ContributionOut(data=data) + assert out.data == data + + +# --------------------------------------------------------------------------- +# ContributionPatch — sparse update model +# --------------------------------------------------------------------------- + + +class TestContributionPatch: + def test_all_fields_optional(self): + patch = ContributionPatch() + assert patch.project is None + assert patch.identifier is None + assert patch.formula is None + assert patch.data is None + + def test_partial_patch(self): + patch = ContributionPatch(formula="Li2O", needs_build=False) + assert patch.formula == "Li2O" + assert patch.needs_build is False + assert patch.project is None + + def test_data_can_be_set(self): + patch = ContributionPatch(data={"new_key": 42}) + assert patch.data == {"new_key": 42} diff --git a/mpcontribs-api/tests/unit/domains/test_projects_models.py b/mpcontribs-api/tests/unit/domains/test_projects_models.py new file mode 100644 index 0000000000..63d5252925 --- /dev/null +++ b/mpcontribs-api/tests/unit/domains/test_projects_models.py @@ -0,0 +1,234 @@ +import pytest +from pydantic import ValidationError as PydanticValidationError + +from src.mpcontribs_api.domains.projects.models import ( + Column, + Project, + ProjectIn, + ProjectOut, + ProjectPatch, + Reference, + Stats, +) + +# --------------------------------------------------------------------------- +# Column +# --------------------------------------------------------------------------- + + +class TestColumn: + def test_path_only(self): + col = Column(path="data.band_gap") + assert col.path == "data.band_gap" + assert col.min is None + assert col.max is None + assert col.unit is None + + def test_full_column(self): + col = Column(path="data.band_gap", min=0.0, max=10.0, unit="eV") + assert col.min == 0.0 + assert col.max == 10.0 + assert col.unit == "eV" + + def test_segments_single(self): + col = Column(path="energy") + assert col.segments == ("energy",) + + def test_segments_dotted(self): + col = Column(path="data.band_gap.value") + assert col.segments == ("data", "band_gap", "value") + + def test_segments_two_level(self): + col = Column(path="data.volume") + assert col.segments == ("data", "volume") + + +# --------------------------------------------------------------------------- +# Stats +# --------------------------------------------------------------------------- + + +class TestStats: + def test_valid_stats(self): + stats = Stats(columns=3, contributions=100, tables=5, structures=10, attachments=2, size=1024.5) + assert stats.columns == 3 + assert stats.contributions == 100 + assert stats.size == 1024.5 + + def test_zero_values_allowed(self): + stats = Stats(columns=0, contributions=0, tables=0, structures=0, attachments=0, size=0.0) + assert stats.contributions == 0 + + def test_missing_field_raises(self): + with pytest.raises(PydanticValidationError): + Stats(columns=1, contributions=2, tables=3, structures=4, attachments=5) # missing size + + +# --------------------------------------------------------------------------- +# Reference +# --------------------------------------------------------------------------- + + +class TestReference: + def test_valid_reference(self): + ref = Reference(label="Paper", url="https://doi.org/10.1000/xyz") + assert ref.label == "Paper" + assert str(ref.url).startswith("https://doi.org") + + def test_invalid_url_raises(self): + with pytest.raises(PydanticValidationError): + Reference(label="Paper", url="not-a-url") + + def test_missing_label_raises(self): + with pytest.raises(PydanticValidationError): + Reference(url="https://example.com") # type: ignore[call-arg] + + +# --------------------------------------------------------------------------- +# ProjectOut — optional fields, extra ignored +# --------------------------------------------------------------------------- + + +class TestProjectOut: + def test_all_fields_optional(self): + out = ProjectOut() + assert out.id is None + assert out.title is None + assert out.authors is None + assert out.stats is None + + def test_extra_fields_ignored(self): + out = ProjectOut(title="My Project", _unknown_field="ignored") # type: ignore[call-arg] + assert out.title == "My Project" + + def test_with_stats(self): + stats = Stats(columns=1, contributions=2, tables=0, structures=0, attachments=0, size=512.0) + out = ProjectOut(title="My Project", stats=stats) + assert out.stats is not None + assert out.stats.contributions == 2 + + def test_boolean_fields(self): + out = ProjectOut(is_public=True, is_approved=False) + assert out.is_public is True + assert out.is_approved is False + + def test_license_values(self): + out_cca4 = ProjectOut(license="CCA4") + out_ccpd = ProjectOut(license="CCPD") + assert out_cca4.license == "CCA4" + assert out_ccpd.license == "CCPD" + + def test_invalid_license_raises(self): + with pytest.raises(PydanticValidationError): + ProjectOut(license="MIT") + + +# --------------------------------------------------------------------------- +# ProjectOut — field projection helpers (inherited from SparseFieldsModel) +# --------------------------------------------------------------------------- + + +class TestProjectOutProjection: + def test_parse_fields_none_returns_none(self): + assert ProjectOut.parse_fields(None) is None + + def test_parse_fields_valid_field(self): + result = ProjectOut.parse_fields("title") + assert result is not None + assert "title" in result + + def test_parse_fields_multiple_fields(self): + result = ProjectOut.parse_fields("title,authors,is_public") + assert result is not None + assert "title" in result + assert "authors" in result + assert "is_public" in result + + def test_parse_fields_unknown_raises(self): + from src.mpcontribs_api.exceptions import ValidationError as AppValidationError + + with pytest.raises(AppValidationError): + ProjectOut.parse_fields("nonexistent_field") + + def test_projection_none_returns_self(self): + assert ProjectOut.projection(None) is ProjectOut + + def test_projection_with_fields(self): + fields = ProjectOut.parse_fields("title,authors") + projected = ProjectOut.projection(fields) + assert projected is not ProjectOut + assert hasattr(projected.Settings, "projection") + + +# --------------------------------------------------------------------------- +# ProjectPatch +# --------------------------------------------------------------------------- + + +class TestProjectPatch: + def test_all_optional(self): + patch = ProjectPatch() + assert patch.title is None + assert patch.authors is None + assert patch.owner is None + + def test_partial_update(self): + patch = ProjectPatch(title="Updated Title", is_public=True) + assert patch.title == "Updated Title" + assert patch.is_public is True + + def test_invalid_short_str_for_title_raises(self): + with pytest.raises(PydanticValidationError): + ProjectPatch(title="ab") # too short + + def test_default_lists_are_empty(self): + patch = ProjectPatch() + assert patch.references == [] + assert patch.columns == [] + + def test_invalid_license_raises(self): + with pytest.raises(PydanticValidationError): + ProjectPatch(license="GPL") + + +# --------------------------------------------------------------------------- +# Project.from_input_model (smoke-test via ProjectIn) +# --------------------------------------------------------------------------- + + +VALID_STATS = Stats(columns=0, contributions=0, tables=0, structures=0, attachments=0, size=0.0) + + +class TestProjectFromInputModel: + def _make_input(self, **overrides): + defaults = { + "_id": "test-proj", + "title": "Test Project", + "authors": "Alice, Bob", + "description": "A test project", + "owner": "google:alice@example.com", + "unique_identifiers": True, + "stats": VALID_STATS, + } + defaults.update(overrides) + return ProjectIn(**defaults) + + def test_from_input_model_creates_project(self): + project_in = self._make_input() + project = Project.from_input_model(project_in) + assert isinstance(project, Project) + assert project.id == "test-proj" + assert project.title == "Test Project" + + def test_from_input_model_preserves_owner(self): + project_in = self._make_input(owner="github:bob@github.com") + project = Project.from_input_model(project_in) + assert project.owner == "github:bob@github.com" + + def test_from_input_model_defaults(self): + project_in = self._make_input() + project = Project.from_input_model(project_in) + assert project.is_public is False + assert project.is_approved is False + assert project.references == [] + assert project.columns == [] diff --git a/mpcontribs-api/tests/unit/test_auth.py b/mpcontribs-api/tests/unit/test_auth.py new file mode 100644 index 0000000000..99cdbdb008 --- /dev/null +++ b/mpcontribs-api/tests/unit/test_auth.py @@ -0,0 +1,91 @@ +import pytest + +from src.mpcontribs_api.auth import ADMIN_GROUP, User + + +class TestUserIsAnonymous: + def test_no_username_is_anonymous(self): + user = User() + assert user.is_anonymous is True + + def test_username_none_is_anonymous(self): + user = User(username=None) + assert user.is_anonymous is True + + def test_with_username_not_anonymous(self): + user = User(username="google:alice@example.com") + assert user.is_anonymous is False + + +class TestUserIsAdmin: + def test_no_groups_not_admin(self): + user = User(username="google:alice@example.com") + assert user.is_admin is False + + def test_admin_group_is_admin(self): + user = User(username="google:alice@example.com", groups=frozenset({ADMIN_GROUP})) + assert user.is_admin is True + + def test_other_group_not_admin(self): + user = User(username="google:alice@example.com", groups=frozenset({"editors"})) + assert user.is_admin is False + + def test_admin_group_among_many_is_admin(self): + user = User(username="google:alice@example.com", groups=frozenset({"editors", ADMIN_GROUP, "viewers"})) + assert user.is_admin is True + + def test_anonymous_cannot_be_admin(self): + # Even if groups include admin, anonymous user (no username) is still anonymous + user = User(groups=frozenset({ADMIN_GROUP})) + assert user.is_anonymous is True + # But is_admin only checks groups, not username + assert user.is_admin is False + + +class TestUserHasRole: + def test_has_role_in_groups(self): + user = User(username="google:alice@example.com", groups=frozenset({"editors", "viewers"})) + assert user.has_role("editors") is True + + def test_has_role_not_in_groups(self): + user = User(username="google:alice@example.com", groups=frozenset({"editors"})) + assert user.has_role("viewers") is False + + def test_has_role_empty_groups(self): + user = User(username="google:alice@example.com") + assert user.has_role("editors") is False + + def test_has_role_case_sensitive(self): + user = User(username="google:alice@example.com", groups=frozenset({"Editors"})) + assert user.has_role("editors") is False + assert user.has_role("Editors") is True + + +class TestUserImmutability: + def test_user_is_frozen(self): + user = User(username="google:alice@example.com") + with pytest.raises(Exception): + user.username = "google:bob@example.com" # type: ignore[misc] + + def test_groups_default_empty_frozenset(self): + user = User() + assert user.groups == frozenset() + + def test_consumer_id_default_none(self): + user = User() + assert user.consumer_id is None + + +class TestUserConstruction: + def test_full_user(self): + user = User( + consumer_id="kong-consumer-123", + username="google:alice@example.com", + groups=frozenset({"editors", "mp-team"}), + ) + assert user.consumer_id == "kong-consumer-123" + assert user.username == "google:alice@example.com" + assert "editors" in user.groups + assert "admin" not in user.groups + assert user.is_admin is False + assert user.is_anonymous is False diff --git a/mpcontribs-api/tests/unit/test_dependencies.py b/mpcontribs-api/tests/unit/test_dependencies.py new file mode 100644 index 0000000000..93eb0b27ad --- /dev/null +++ b/mpcontribs-api/tests/unit/test_dependencies.py @@ -0,0 +1,121 @@ +from unittest.mock import MagicMock + +import pytest + +from src.mpcontribs_api.auth import User +from src.mpcontribs_api.dependencies import _split, get_user, require_user +from src.mpcontribs_api.exceptions import AuthenticationError + +# --------------------------------------------------------------------------- +# _split +# --------------------------------------------------------------------------- + + +class TestSplit: + def test_none_returns_empty_set(self): + assert _split(None) == set() + + def test_empty_string_returns_empty_set(self): + assert _split("") == set() + + def test_whitespace_only_returns_empty_set(self): + assert _split(" ") == set() + + def test_single_value(self): + assert _split("editors") == {"editors"} + + def test_multiple_values(self): + assert _split("editors,viewers,admins") == {"editors", "viewers", "admins"} + + def test_strips_whitespace(self): + assert _split(" editors , viewers ") == {"editors", "viewers"} + + def test_skips_empty_parts(self): + assert _split("editors,,viewers") == {"editors", "viewers"} + + def test_single_space_comma_separated(self): + assert _split("a, b, c") == {"a", "b", "c"} + + +# --------------------------------------------------------------------------- +# get_user — builds User from request headers +# --------------------------------------------------------------------------- + + +def _make_request(**headers: str) -> MagicMock: + """Build a mock Request whose .headers dict returns the given values.""" + request = MagicMock() + request.headers = headers + return request + + +class TestGetUser: + def test_no_headers_returns_anonymous(self): + request = _make_request() + user = get_user(request) + assert user.is_anonymous is True + + def test_explicit_anon_header_returns_anonymous(self): + request = _make_request(**{"x-anonymous-consumer": "true", "x-consumer-username": "alice"}) + user = get_user(request) + assert user.is_anonymous is True + + def test_explicit_anon_case_insensitive(self): + request = _make_request(**{"x-anonymous-consumer": "True", "x-consumer-username": "alice"}) + user = get_user(request) + assert user.is_anonymous is True + + def test_authenticated_user(self): + request = _make_request( + **{ + "x-consumer-username": "google:alice@example.com", + "x-consumer-id": "kong-123", + "x-authenticated-groups": "editors", + "x-consumer-groups": "mp-team", + } + ) + user = get_user(request) + assert user.is_anonymous is False + assert user.username == "google:alice@example.com" + assert user.consumer_id == "kong-123" + assert "editors" in user.groups + assert "mp-team" in user.groups + + def test_authenticated_user_no_groups(self): + request = _make_request(**{"x-consumer-username": "google:alice@example.com"}) + user = get_user(request) + assert user.is_anonymous is False + assert user.groups == frozenset() + + def test_groups_merged_from_both_headers(self): + request = _make_request( + **{ + "x-consumer-username": "google:alice@example.com", + "x-authenticated-groups": "a,b", + "x-consumer-groups": "c,d", + } + ) + user = get_user(request) + assert user.groups == frozenset({"a", "b", "c", "d"}) + + def test_missing_username_returns_anonymous(self): + request = _make_request(**{"x-consumer-id": "kong-123"}) + user = get_user(request) + assert user.is_anonymous is True + + +# --------------------------------------------------------------------------- +# require_user +# --------------------------------------------------------------------------- + + +class TestRequireUser: + def test_authenticated_user_passes_through(self): + authed = User(username="google:alice@example.com", groups=frozenset()) + result = require_user(authed) + assert result is authed + + def test_anonymous_raises_authentication_error(self): + anon = User() + with pytest.raises(AuthenticationError): + require_user(anon) diff --git a/mpcontribs-api/tests/unit/test_exceptions.py b/mpcontribs-api/tests/unit/test_exceptions.py new file mode 100644 index 0000000000..552bf7778e --- /dev/null +++ b/mpcontribs-api/tests/unit/test_exceptions.py @@ -0,0 +1,154 @@ +import pytest + +from src.mpcontribs_api.exceptions import ( + AppError, + AuthenticationError, + ConflictError, + GatewayError, + NotFoundError, + PermissionError, + ValidationError, + _error_body, +) + + +class TestErrorBody: + def test_minimal_body(self): + body = _error_body("not_found", "Resource not found") + assert body == {"error": {"code": "not_found", "message": "Resource not found"}} + + def test_body_with_context(self): + body = _error_body("not_found", "Resource not found", resource_id="abc", resource_type="project") + assert body["error"]["code"] == "not_found" + assert body["error"]["message"] == "Resource not found" + assert body["error"]["detail"] == {"resource_id": "abc", "resource_type": "project"} + + def test_no_detail_key_without_context(self): + body = _error_body("conflict", "Duplicate id") + assert "detail" not in body["error"] + + def test_detail_present_with_context(self): + body = _error_body("conflict", "Duplicate id", existing_id="xyz") + assert "detail" in body["error"] + + +class TestAppError: + def test_default_status_and_code(self): + err = AppError() + assert err.status_code == 500 + assert err.error_code == "internal_error" + + def test_default_message_is_class_name(self): + err = AppError() + assert err.message == "AppError" + + def test_custom_message(self): + err = AppError("something went wrong") + assert err.message == "something went wrong" + + def test_context_stored(self): + err = AppError("msg", user="alice", action="delete") + assert err.context == {"user": "alice", "action": "delete"} + + def test_is_exception(self): + err = AppError("oops") + assert isinstance(err, Exception) + + def test_str_is_message(self): + err = AppError("oops") + assert str(err) == "oops" + + +class TestNotFoundError: + def test_status_code(self): + assert NotFoundError.status_code == 404 + + def test_error_code(self): + assert NotFoundError.error_code == "not_found" + + def test_message_defaults_to_class_name(self): + err = NotFoundError() + assert err.message == "NotFoundError" + + def test_custom_message(self): + err = NotFoundError("project 'foo' not found") + assert err.message == "project 'foo' not found" + + def test_is_app_error(self): + assert issubclass(NotFoundError, AppError) + + +class TestConflictError: + def test_status_code(self): + assert ConflictError.status_code == 409 + + def test_error_code(self): + assert ConflictError.error_code == "conflict" + + def test_is_app_error(self): + assert issubclass(ConflictError, AppError) + + +class TestValidationError: + def test_status_code(self): + assert ValidationError.status_code == 422 + + def test_error_code(self): + assert ValidationError.error_code == "validation_error" + + def test_is_app_error(self): + assert issubclass(ValidationError, AppError) + + +class TestPermissionError: + def test_status_code(self): + assert PermissionError.status_code == 403 + + def test_error_code(self): + assert PermissionError.error_code == "permission_denied" + + def test_context_kwargs(self): + err = PermissionError(required_role="admin") + assert err.context == {"required_role": "admin"} + + def test_is_app_error(self): + assert issubclass(PermissionError, AppError) + + +class TestAuthenticationError: + def test_status_code(self): + assert AuthenticationError.status_code == 401 + + def test_error_code(self): + assert AuthenticationError.error_code == "authentication_error" + + def test_is_app_error(self): + assert issubclass(AuthenticationError, AppError) + + +class TestGatewayError: + def test_status_code(self): + assert GatewayError.status_code == 403 + + def test_error_code(self): + assert GatewayError.error_code == "gateway_error" + + def test_is_app_error(self): + assert issubclass(GatewayError, AppError) + + +class TestExceptionRaising: + def test_not_found_can_be_raised_and_caught(self): + with pytest.raises(NotFoundError) as exc_info: + raise NotFoundError("project not found") + assert exc_info.value.message == "project not found" + assert exc_info.value.status_code == 404 + + def test_app_error_catches_subclasses(self): + with pytest.raises(AppError): + raise ConflictError("duplicate") + + def test_context_available_after_raise(self): + with pytest.raises(ValidationError) as exc_info: + raise ValidationError("bad field", field="email", value="oops") + assert exc_info.value.context == {"field": "email", "value": "oops"} diff --git a/mpcontribs-api/tests/unit/test_pagination.py b/mpcontribs-api/tests/unit/test_pagination.py new file mode 100644 index 0000000000..78dc41f732 --- /dev/null +++ b/mpcontribs-api/tests/unit/test_pagination.py @@ -0,0 +1,102 @@ +import base64 + +import pytest +from pydantic import ValidationError as PydanticValidationError + +from src.mpcontribs_api.pagination import ( + CursorParams, + Page, + decode_cursor, + encode_cursor, +) + + +class TestEncodeCursor: + def test_roundtrip(self): + original = "some-mongo-id-abc123" + assert decode_cursor(encode_cursor(original)) == original + + def test_returns_string(self): + result = encode_cursor("abc") + assert isinstance(result, str) + + def test_uses_urlsafe_base64(self): + # urlsafe_b64encode uses - and _ instead of + and / + result = encode_cursor("test-id") + decoded_bytes = base64.urlsafe_b64decode(result.encode()) + assert decoded_bytes.decode() == "test-id" + + def test_empty_string(self): + assert decode_cursor(encode_cursor("")) == "" + + def test_encodes_unicode(self): + original = "projet-données" + assert decode_cursor(encode_cursor(original)) == original + + +class TestDecodeCursor: + def test_valid_cursor(self): + encoded = base64.urlsafe_b64encode(b"abc123").decode() + assert decode_cursor(encoded) == "abc123" + + def test_invalid_base64_raises_value_error(self): + with pytest.raises(ValueError, match="malformed cursor"): + decode_cursor("!!!not-valid-base64!!!") + + def test_non_utf8_bytes_raises_value_error(self): + # Encode raw bytes that aren't valid UTF-8 + bad = base64.urlsafe_b64encode(b"\xff\xfe").decode() + with pytest.raises(ValueError, match="malformed cursor"): + decode_cursor(bad) + + +class TestCursorParams: + def test_defaults(self): + params = CursorParams() + assert params.cursor is None + assert params.limit == 20 + + def test_cursor_set(self): + params = CursorParams(cursor="abc123") + assert params.cursor == "abc123" + + def test_limit_minimum(self): + params = CursorParams(limit=1) + assert params.limit == 1 + + def test_limit_maximum(self): + params = CursorParams(limit=100) + assert params.limit == 100 + + def test_limit_below_minimum_raises(self): + with pytest.raises(PydanticValidationError): + CursorParams(limit=0) + + def test_limit_above_maximum_raises(self): + with pytest.raises(PydanticValidationError): + CursorParams(limit=101) + + def test_custom_limit(self): + params = CursorParams(limit=50) + assert params.limit == 50 + + +class TestPage: + def test_items_and_no_next_cursor(self): + page: Page[str] = Page(items=["a", "b", "c"]) + assert page.items == ["a", "b", "c"] + assert page.next_cursor is None + + def test_with_next_cursor(self): + cursor = encode_cursor("last-id") + page: Page[str] = Page(items=["a"], next_cursor=cursor) + assert page.next_cursor == cursor + + def test_empty_items(self): + page: Page[str] = Page(items=[]) + assert page.items == [] + assert page.next_cursor is None + + def test_generic_item_types(self): + page: Page[int] = Page(items=[1, 2, 3]) + assert page.items == [1, 2, 3] diff --git a/mpcontribs-api/tests/unit/test_projection.py b/mpcontribs-api/tests/unit/test_projection.py new file mode 100644 index 0000000000..3889ce682f --- /dev/null +++ b/mpcontribs-api/tests/unit/test_projection.py @@ -0,0 +1,328 @@ +from typing import Any + +import pytest +from pydantic import BaseModel, Field + +from src.mpcontribs_api.exceptions import ValidationError as AppValidationError +from src.mpcontribs_api.projection import ( + SparseFieldsModel, + _classify, + _collapse, + _unwrap_optional, + _validate_path, + _walk_path, +) + +# --------------------------------------------------------------------------- +# Helpers — simple models used across tests +# --------------------------------------------------------------------------- + + +class Address(BaseModel): + street: str + city: str + country: str | None = None + + +class Simple(SparseFieldsModel): + name: str + age: int + score: float | None = None + tags: list[str] = Field(default_factory=list) + metadata: dict[str, Any] = Field(default_factory=dict) + address: Address | None = None + + +# --------------------------------------------------------------------------- +# _unwrap_optional +# --------------------------------------------------------------------------- + + +class TestUnwrapOptional: + def test_strips_none(self): + result = _unwrap_optional(str | None) + assert result is str + + def test_plain_annotation_unchanged(self): + result = _unwrap_optional(str) + assert result is str + + def test_optional_model(self): + result = _unwrap_optional(Address | None) + assert result is Address + + def test_union_without_none_unchanged(self): + # int | str has no None — returned as-is + result = _unwrap_optional(int | str) + assert result == (int | str) + + +# --------------------------------------------------------------------------- +# _classify +# --------------------------------------------------------------------------- + + +class TestClassify: + def test_base_model_subclass(self): + kind, model = _classify(Address) + assert kind == "model" + assert model is Address + + def test_optional_model(self): + kind, model = _classify(Address | None) + assert kind == "model" + assert model is Address + + def test_dict_annotation(self): + kind, model = _classify(dict) + assert kind == "dict" + assert model is None + + def test_dict_generic(self): + kind, model = _classify(dict[str, Any]) + assert kind == "dict" + assert model is None + + def test_list_annotation(self): + kind, model = _classify(list[str]) + assert kind == "list" + assert model is None + + def test_scalar_str(self): + kind, model = _classify(str) + assert kind == "scalar" + assert model is None + + def test_scalar_int(self): + kind, model = _classify(int) + assert kind == "scalar" + assert model is None + + def test_any(self): + kind, model = _classify(Any) + assert kind == "dict" + assert model is None + + +# --------------------------------------------------------------------------- +# _collapse +# --------------------------------------------------------------------------- + + +class TestCollapse: + def test_no_overlap(self): + paths = frozenset({"name", "age"}) + assert _collapse(paths) == paths + + def test_parent_subsumes_child(self): + paths = frozenset({"address", "address.city"}) + assert _collapse(paths) == frozenset({"address"}) + + def test_child_without_parent_kept(self): + paths = frozenset({"address.city"}) + assert _collapse(paths) == paths + + def test_multiple_children_of_same_parent(self): + paths = frozenset({"address", "address.city", "address.street"}) + assert _collapse(paths) == frozenset({"address"}) + + def test_disjoint_nested_paths(self): + paths = frozenset({"address.city", "name"}) + assert _collapse(paths) == paths + + def test_single_path(self): + paths = frozenset({"name"}) + assert _collapse(paths) == paths + + def test_empty(self): + assert _collapse(frozenset()) == frozenset() + + +# --------------------------------------------------------------------------- +# _walk_path +# --------------------------------------------------------------------------- + + +class TestWalkPath: + def test_scalar_field(self): + steps = list(_walk_path(Simple, "name")) + assert len(steps) == 1 + assert steps[0].segment == "name" + assert steps[0].kind == "scalar" + assert steps[0].is_last is True + + def test_nested_model_field(self): + steps = list(_walk_path(Simple, "address.city")) + assert steps[0].segment == "address" + assert steps[0].kind == "model" + assert steps[0].is_last is False + assert steps[1].segment == "city" + assert steps[1].kind == "scalar" + assert steps[1].is_last is True + + def test_unknown_field(self): + steps = list(_walk_path(Simple, "nonexistent")) + assert steps[0].kind == "unknown" + + def test_dict_field_goes_opaque(self): + steps = list(_walk_path(Simple, "metadata.arbitrary_key")) + assert steps[0].kind == "dict" + assert steps[1].kind == "opaque" + + +# --------------------------------------------------------------------------- +# _validate_path +# --------------------------------------------------------------------------- + + +class TestValidatePath: + def test_valid_scalar_path(self): + _validate_path(Simple, "name") # should not raise + + def test_valid_nested_path(self): + _validate_path(Simple, "address.city") # should not raise + + def test_valid_dict_path(self): + _validate_path(Simple, "metadata.anything") # opaque — allowed + + def test_unknown_top_level_raises(self): + with pytest.raises(AppValidationError, match="unknown field"): + _validate_path(Simple, "nonexistent") + + def test_subfield_of_scalar_raises(self): + with pytest.raises(AppValidationError, match="cannot select subfields"): + _validate_path(Simple, "name.sub") + + def test_subfield_of_list_raises(self): + with pytest.raises(AppValidationError, match="cannot select subfields"): + _validate_path(Simple, "tags.sub") + + +# --------------------------------------------------------------------------- +# SparseFieldsModel.field_names +# --------------------------------------------------------------------------- + + +class TestFieldNames: + def test_returns_top_level_fields(self): + names = Simple.field_names() + assert "name" in names + assert "age" in names + assert "address" in names + assert "metadata" in names + + def test_does_not_include_nested(self): + names = Simple.field_names() + assert "city" not in names + assert "street" not in names + + +# --------------------------------------------------------------------------- +# SparseFieldsModel.parse_fields +# --------------------------------------------------------------------------- + + +class TestParseFields: + def test_none_returns_none(self): + assert Simple.parse_fields(None) is None + + def test_empty_string_returns_none(self): + assert Simple.parse_fields("") is None + + def test_single_valid_field(self): + result = Simple.parse_fields("name") + assert result is not None + assert "name" in result + + def test_multiple_fields(self): + result = Simple.parse_fields("name,age") + assert result is not None + assert "name" in result + assert "age" in result + + def test_whitespace_stripped(self): + result = Simple.parse_fields(" name , age ") + assert result is not None + assert "name" in result + assert "age" in result + + def test_nested_field(self): + result = Simple.parse_fields("address.city") + assert result is not None + assert "address.city" in result + + def test_parent_collapses_child(self): + result = Simple.parse_fields("address,address.city") + assert result is not None + assert "address" in result + assert "address.city" not in result + + def test_unknown_field_raises(self): + with pytest.raises(AppValidationError, match="unknown field"): + Simple.parse_fields("nonexistent") + + def test_scalar_subfield_raises(self): + with pytest.raises(AppValidationError, match="cannot select subfields"): + Simple.parse_fields("name.sub") + + def test_sparse_always_always_included(self): + class WithAlways(SparseFieldsModel): + id: str | None = None + name: str | None = None + sparse_always = frozenset({"id"}) + + result = WithAlways.parse_fields("name") + assert result is not None + assert "id" in result + assert "name" in result + + +# --------------------------------------------------------------------------- +# SparseFieldsModel.projection +# --------------------------------------------------------------------------- + + +class TestProjection: + def test_none_fields_returns_self(self): + assert Simple.projection(None) is Simple + + def test_with_fields_returns_different_model(self): + fields = Simple.parse_fields("name") + result = Simple.projection(fields) + assert result is not Simple + + def test_projected_model_has_settings_with_projection(self): + fields = Simple.parse_fields("name") + projected = Simple.projection(fields) + assert hasattr(projected, "Settings") + assert hasattr(projected.Settings, "projection") + + def test_projection_includes_id(self): + fields = Simple.parse_fields("name") + projected = Simple.projection(fields) + assert "_id" in projected.Settings.projection + + def test_projection_caching(self): + fields = Simple.parse_fields("name") + first = Simple.projection(fields) + second = Simple.projection(fields) + assert first is second + + +# --------------------------------------------------------------------------- +# SparseFieldsModel._identity_fields +# --------------------------------------------------------------------------- + + +class TestIdentityFields: + def test_field_with_id_alias_detected(self): + class WithId(SparseFieldsModel): + id: str | None = Field(default=None, alias="_id", serialization_alias="id") + name: str | None = None + + identity = WithId._identity_fields() + assert "id" in identity + + def test_no_id_field_returns_empty(self): + identity = Simple._identity_fields() + assert identity == frozenset() diff --git a/mpcontribs-api/tests/unit/test_types.py b/mpcontribs-api/tests/unit/test_types.py new file mode 100644 index 0000000000..3925b9af29 --- /dev/null +++ b/mpcontribs-api/tests/unit/test_types.py @@ -0,0 +1,101 @@ +import pytest +from pydantic import BaseModel +from pydantic import ValidationError as PydanticValidationError + +from src.mpcontribs_api.exceptions import ValidationError as AppValidationError +from src.mpcontribs_api.types import PrefixedEmail, ShortStr, _validate_prefixed_email + + +class ShortStrModel(BaseModel): + value: ShortStr + + +class PrefixedEmailModel(BaseModel): + email: PrefixedEmail + + +class TestShortStr: + def test_valid_3_chars(self): + m = ShortStrModel(value="abc") + assert m.value == "abc" + + def test_valid_30_chars(self): + m = ShortStrModel(value="a" * 30) + assert m.value == "a" * 30 + + def test_valid_mid_length(self): + m = ShortStrModel(value="test-project") + assert m.value == "test-project" + + def test_too_short_raises(self): + with pytest.raises(PydanticValidationError): + ShortStrModel(value="ab") + + def test_empty_raises(self): + with pytest.raises(PydanticValidationError): + ShortStrModel(value="") + + def test_too_long_raises(self): + with pytest.raises(PydanticValidationError): + ShortStrModel(value="a" * 31) + + def test_exactly_31_chars_raises(self): + with pytest.raises(PydanticValidationError): + ShortStrModel(value="a" * 31) + + +class TestValidatePrefixedEmail: + def test_valid_format(self): + assert _validate_prefixed_email("google:alice@example.com") == "google:alice@example.com" + + def test_strips_surrounding_whitespace(self): + assert _validate_prefixed_email(" google:alice@example.com ") == "google:alice@example.com" + + def test_no_colon_raises(self): + with pytest.raises(AppValidationError): + _validate_prefixed_email("googlealice@example.com") + + def test_no_at_sign_raises(self): + with pytest.raises(AppValidationError): + _validate_prefixed_email("google:aliceexample.com") + + def test_no_domain_raises(self): + with pytest.raises(AppValidationError): + _validate_prefixed_email("google:alice@") + + def test_no_tld_raises(self): + with pytest.raises(AppValidationError): + _validate_prefixed_email("google:alice@example") + + def test_empty_provider_raises(self): + with pytest.raises(AppValidationError): + _validate_prefixed_email(":alice@example.com") + + def test_empty_name_raises(self): + with pytest.raises(AppValidationError): + _validate_prefixed_email("google:@example.com") + + def test_multiple_at_signs_raises(self): + with pytest.raises(AppValidationError): + _validate_prefixed_email("google:alice@@example.com") + + def test_multiple_colons_raises(self): + # The regex requires no colon in provider or local part + with pytest.raises(AppValidationError): + _validate_prefixed_email("goo:gle:alice@example.com") + + +class TestPrefixedEmailModel: + def test_valid_email(self): + m = PrefixedEmailModel(email="github:bob@github.com") + assert m.email == "github:bob@github.com" + + def test_invalid_email_raises_app_validation_error(self): + # BeforeValidator raises AppValidationError; Pydantic does not wrap + # non-standard exceptions (ValueError/TypeError/AssertionError) from validators. + with pytest.raises(AppValidationError): + PrefixedEmailModel(email="not-an-email") + + def test_whitespace_stripped(self): + m = PrefixedEmailModel(email=" orcid:12345@orcid.org ") + assert m.email == "orcid:12345@orcid.org" From dbd664d40cb4018984c734a2b23afcbed8a62bd1 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 3 Jun 2026 15:13:22 -0700 Subject: [PATCH 045/591] added check fix for normal fixes --- mpcontribs-api/justfile | 1 + 1 file changed, 1 insertion(+) diff --git a/mpcontribs-api/justfile b/mpcontribs-api/justfile index fa1e0c572d..20950b1243 100644 --- a/mpcontribs-api/justfile +++ b/mpcontribs-api/justfile @@ -1,5 +1,6 @@ # Format, fix, and lint all source code fmt: uv run ruff format src/ + -uv run ruff check --fix src/ -uv run ruff check --fix --unsafe-fixes src/ -uv run pydocstringformatter --write src/ From 71aaf9d1e419117f4b0d2f92bb185765b2e50119 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 3 Jun 2026 15:18:38 -0700 Subject: [PATCH 046/591] Various small fixes in function signatures and usages --- mpcontribs-api/src/mpcontribs_api/api/v1/router.py | 6 +++--- mpcontribs-api/src/mpcontribs_api/app.py | 8 ++++---- mpcontribs-api/src/mpcontribs_api/dependencies.py | 4 +++- .../mpcontribs_api/domains/contributions/dependencies.py | 4 ++-- .../src/mpcontribs_api/domains/contributions/router.py | 4 ++-- .../src/mpcontribs_api/domains/projects/dependencies.py | 4 ++-- .../src/mpcontribs_api/domains/projects/router.py | 4 ++-- 7 files changed, 18 insertions(+), 16 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/api/v1/router.py b/mpcontribs-api/src/mpcontribs_api/api/v1/router.py index 6b946e1e73..0204a7ff14 100644 --- a/mpcontribs-api/src/mpcontribs_api/api/v1/router.py +++ b/mpcontribs-api/src/mpcontribs_api/api/v1/router.py @@ -1,9 +1,9 @@ from fastapi import APIRouter -from mpcontribs_api.domains.contributions.router import router as contributions_router -from mpcontribs_api.domains.projects.router import router as projects_router +from src.mpcontribs_api.domains.contributions.router import router as contributions_router +from src.mpcontribs_api.domains.projects.router import router as projects_router -router = APIRouter(prefix="/api/v1") +router = APIRouter() router.include_router(projects_router, prefix="/projects") router.include_router(contributions_router, prefix="/contributions") diff --git a/mpcontribs-api/src/mpcontribs_api/app.py b/mpcontribs-api/src/mpcontribs_api/app.py index 3830a3d582..5f9ac141e2 100644 --- a/mpcontribs-api/src/mpcontribs_api/app.py +++ b/mpcontribs-api/src/mpcontribs_api/app.py @@ -9,12 +9,12 @@ from pymongo import AsyncMongoClient from starlette.middleware.base import BaseHTTPMiddleware -from mpcontribs_api.api.v1.router import router as v1_router -from mpcontribs_api.config import Settings, get_settings -from mpcontribs_api.exceptions import register_exception_handlers -from mpcontribs_api.logging import configure_logging +from src.mpcontribs_api.api.v1.router import router as v1_router +from src.mpcontribs_api.config import Settings, get_settings from src.mpcontribs_api.dependencies import verify_gateway from src.mpcontribs_api.domains.projects.models import Project +from src.mpcontribs_api.exceptions import register_exception_handlers +from src.mpcontribs_api.logging import configure_logging from src.mpcontribs_api.middleware import bind_request_context logger = logging.getLogger(__name__) diff --git a/mpcontribs-api/src/mpcontribs_api/dependencies.py b/mpcontribs-api/src/mpcontribs_api/dependencies.py index a0738c7b6d..ea68181859 100644 --- a/mpcontribs-api/src/mpcontribs_api/dependencies.py +++ b/mpcontribs-api/src/mpcontribs_api/dependencies.py @@ -18,7 +18,9 @@ def verify_gateway(x_gateway_secret: Annotated[str | None, Header()] = None) -> None: """Ensures the current access attempt is coming through Kong.""" - if x_gateway_secret is None or not hmac.compare_digest(x_gateway_secret, str(settings.kong.gateway_secret)): + if x_gateway_secret is None or not hmac.compare_digest( + x_gateway_secret, settings.kong.gateway_secret.get_secret_value() + ): raise GatewayError("direct access not permitted") diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/dependencies.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/dependencies.py index 3227039e95..e02de68368 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/dependencies.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/dependencies.py @@ -2,8 +2,8 @@ from fastapi import Depends -from mpcontribs_api.dependencies import UserDep -from mpcontribs_api.domains.contributions.repository import ( +from src.mpcontribs_api.dependencies import UserDep +from src.mpcontribs_api.domains.contributions.repository import ( MongoDbContributionRepository, ) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py index f2923c40ff..d2b89b6241 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py @@ -1,6 +1,6 @@ from typing import Annotated, Literal -from fastapi import APIRouter, Query +from fastapi import APIRouter, Depends, Query from fastapi_filter import FilterDepends from src.mpcontribs_api.domains.contributions.dependencies import ContributionDep @@ -18,7 +18,7 @@ @router.get("") async def get_contributions( repo: ContributionDep, - pagination: Annotated[CursorParams, Query()], + pagination: Annotated[CursorParams, Depends()], filter: ContributionFilter = FilterDepends(ContributionFilter), fields: Annotated[str | None, Query(alias="_fields")] = None, ): diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/dependencies.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/dependencies.py index 94535cc67d..48e257df60 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/dependencies.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/dependencies.py @@ -2,8 +2,8 @@ from fastapi import Depends -from mpcontribs_api.dependencies import UserDep -from mpcontribs_api.domains.projects.repository import ( +from src.mpcontribs_api.dependencies import UserDep +from src.mpcontribs_api.domains.projects.repository import ( MongoDbProjectRepository, ) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py index b059c69747..cc2a24483c 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py @@ -1,6 +1,6 @@ from typing import Annotated -from fastapi import APIRouter, Query, Response, status +from fastapi import APIRouter, Depends, Query, Response, status from fastapi_filter import FilterDepends from starlette.status import HTTP_204_NO_CONTENT @@ -20,7 +20,7 @@ @router.get("", response_model=None) async def get_project( repo: ProjectDep, - pagination: Annotated[CursorParams, Query()], + pagination: Annotated[CursorParams, Depends()], filter: ProjectFilter = FilterDepends(ProjectFilter), fields: Annotated[str | None, Query(alias="_fields")] = None, ): From 573aeb5d6ea40eda235795f175d11490e2222628 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 3 Jun 2026 15:39:07 -0700 Subject: [PATCH 047/591] Added integration tests --- mpcontribs-api/pyproject.toml | 1 + mpcontribs-api/tests/integration/__init__.py | 0 mpcontribs-api/tests/integration/conftest.py | 149 ++++++++++ .../tests/integration/test_contributions.py | 131 +++++++++ .../tests/integration/test_error_handlers.py | 184 ++++++++++++ .../tests/integration/test_gateway.py | 67 +++++ .../tests/integration/test_projects.py | 271 ++++++++++++++++++ mpcontribs-api/uv.lock | 48 ++++ 8 files changed, 851 insertions(+) create mode 100644 mpcontribs-api/tests/integration/__init__.py create mode 100644 mpcontribs-api/tests/integration/conftest.py create mode 100644 mpcontribs-api/tests/integration/test_contributions.py create mode 100644 mpcontribs-api/tests/integration/test_error_handlers.py create mode 100644 mpcontribs-api/tests/integration/test_gateway.py create mode 100644 mpcontribs-api/tests/integration/test_projects.py diff --git a/mpcontribs-api/pyproject.toml b/mpcontribs-api/pyproject.toml index a081905744..bc30e6b02b 100644 --- a/mpcontribs-api/pyproject.toml +++ b/mpcontribs-api/pyproject.toml @@ -82,6 +82,7 @@ dev = [ "pydocstringformatter>=0.7.0", "pytest>=9.0.3", "pytest-xdist>=3.8.0", + "httpx2>=0.28.0", ] [tool.pytest.ini_options] diff --git a/mpcontribs-api/tests/integration/__init__.py b/mpcontribs-api/tests/integration/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/mpcontribs-api/tests/integration/conftest.py b/mpcontribs-api/tests/integration/conftest.py new file mode 100644 index 0000000000..e699ca5663 --- /dev/null +++ b/mpcontribs-api/tests/integration/conftest.py @@ -0,0 +1,149 @@ +"""Integration test infrastructure. + +make_test_app() builds a real FastAPI application (routers, middleware, +exception handlers) but with: + - A no-op lifespan so no MongoDB connection is attempted. + - The verify_gateway dependency absent at the app level; tests that want to + check gateway enforcement use the gateway_app fixture instead. + +Fixtures follow the pattern: + test_app (session) — base app, no dependency overrides + client (function) — TestClient wrapping test_app; overrides are set per-test + and cleared on teardown to avoid bleed between tests. +""" + +from contextlib import asynccontextmanager +from unittest.mock import AsyncMock, MagicMock + +import pytest +from fastapi import FastAPI +from fastapi.testclient import TestClient +from starlette.middleware.base import BaseHTTPMiddleware + +from src.mpcontribs_api.exceptions import register_exception_handlers +from src.mpcontribs_api.middleware import bind_request_context + +# --------------------------------------------------------------------------- +# Header constants used across test modules +# --------------------------------------------------------------------------- + +GATEWAY_SECRET = "test-gateway-secret" +GATEWAY_HEADERS = {"x-gateway-secret": GATEWAY_SECRET} + +ANON_HEADERS: dict[str, str] = {} + +AUTHED_HEADERS = { + "x-consumer-username": "google:alice@example.com", + "x-consumer-id": "test-consumer-id", + "x-authenticated-groups": "mp-team", +} + +ADMIN_HEADERS = { + "x-consumer-username": "google:admin@example.com", + "x-consumer-id": "test-admin-id", + "x-authenticated-groups": "admin", +} + + +# --------------------------------------------------------------------------- +# App factories +# --------------------------------------------------------------------------- + + +def make_test_app() -> FastAPI: + """Build a fully-wired FastAPI app suitable for integration tests. + + Uses a no-op lifespan so no MongoDB connection is required. The + verify_gateway dependency is NOT added at the app level here — tests that + need gateway enforcement should use make_gateway_app() instead. + """ + + @asynccontextmanager + async def _noop_lifespan(app: FastAPI): + app.state.db = MagicMock() + yield + + app = FastAPI(title="mpcontribs-test", lifespan=_noop_lifespan) + app.add_middleware(BaseHTTPMiddleware, dispatch=bind_request_context) + register_exception_handlers(app) + + from src.mpcontribs_api.api.v1.router import router as v1_router + + app.include_router(v1_router, prefix="/api/v1") + return app + + +def make_gateway_app() -> FastAPI: + """Like make_test_app() but with real gateway enforcement. + + Used by gateway-specific tests to exercise the actual x-gateway-secret + header validation through the full HTTP cycle. + """ + from fastapi import Depends + + from src.mpcontribs_api.dependencies import verify_gateway + + @asynccontextmanager + async def _noop_lifespan(app: FastAPI): + app.state.db = MagicMock() + yield + + app = FastAPI( + title="mpcontribs-gateway-test", + lifespan=_noop_lifespan, + dependencies=[Depends(verify_gateway)], + ) + app.add_middleware(BaseHTTPMiddleware, dispatch=bind_request_context) + register_exception_handlers(app) + + from src.mpcontribs_api.api.v1.router import router as v1_router + + app.include_router(v1_router, prefix="/api/v1") + return app + + +# --------------------------------------------------------------------------- +# Shared fixtures +# --------------------------------------------------------------------------- + + +@pytest.fixture(scope="session") +def test_app() -> FastAPI: + return make_test_app() + + +@pytest.fixture(scope="session") +def gateway_app() -> FastAPI: + return make_gateway_app() + + +@pytest.fixture +def client(test_app: FastAPI): + """Function-scoped client; dependency overrides are cleared after each test.""" + with TestClient(test_app, raise_server_exceptions=False) as c: + yield c + test_app.dependency_overrides.clear() + + +@pytest.fixture +def gateway_client(gateway_app: FastAPI): + with TestClient(gateway_app, raise_server_exceptions=False) as c: + yield c + gateway_app.dependency_overrides.clear() + + +# --------------------------------------------------------------------------- +# Mock repository factories +# --------------------------------------------------------------------------- + + +@pytest.fixture +def mock_project_repo() -> AsyncMock: + """Fully async mock of MongoDbProjectRepository.""" + return AsyncMock() + + +@pytest.fixture +def mock_contribution_repo() -> AsyncMock: + """Fully async mock of MongoDbContributionRepository.""" + return AsyncMock() diff --git a/mpcontribs-api/tests/integration/test_contributions.py b/mpcontribs-api/tests/integration/test_contributions.py new file mode 100644 index 0000000000..c1efc24aee --- /dev/null +++ b/mpcontribs-api/tests/integration/test_contributions.py @@ -0,0 +1,131 @@ +"""Integration tests for /api/v1/contributions routes. + +Uses an AsyncMock repository override so no database is required. Tests cover +the implemented GET and DELETE batch endpoints; stub endpoints (POST, PUT, +single-resource) are verified to exist and wire through to the repo. +""" + +import pytest + +from src.mpcontribs_api.domains.contributions.dependencies import get_scoped_contributions +from src.mpcontribs_api.domains.contributions.models import ContributionOut +from src.mpcontribs_api.pagination import Page +from tests.integration.conftest import ANON_HEADERS, AUTHED_HEADERS + +# --------------------------------------------------------------------------- +# Fixture: inject mock repo for each test +# --------------------------------------------------------------------------- + + +@pytest.fixture +def contribution_repo(test_app, mock_contribution_repo): + test_app.dependency_overrides[get_scoped_contributions] = lambda: mock_contribution_repo + yield mock_contribution_repo + test_app.dependency_overrides.pop(get_scoped_contributions, None) + + +SAMPLE_CONTRIBUTION = ContributionOut( + project="mp-project", + identifier="mp-001", + formula="Fe2O3", + is_public=True, + data={"band_gap": 2.1}, +) + + +# --------------------------------------------------------------------------- +# GET /api/v1/contributions +# --------------------------------------------------------------------------- + + +class TestListContributions: + def test_empty_page_returns_200(self, client, contribution_repo): + contribution_repo.get_contributions.return_value = Page(items=[], next_cursor=None) + r = client.get("/api/v1/contributions", headers=AUTHED_HEADERS) + assert r.status_code == 200 + + def test_response_has_page_shape(self, client, contribution_repo): + contribution_repo.get_contributions.return_value = Page(items=[], next_cursor=None) + body = client.get("/api/v1/contributions", headers=AUTHED_HEADERS).json() + assert "items" in body + assert "next_cursor" in body + + def test_items_in_response(self, client, contribution_repo): + contribution_repo.get_contributions.return_value = Page( + items=[SAMPLE_CONTRIBUTION], next_cursor=None + ) + body = client.get("/api/v1/contributions", headers=AUTHED_HEADERS).json() + assert len(body["items"]) == 1 + + def test_repo_called_with_pagination(self, client, contribution_repo): + contribution_repo.get_contributions.return_value = Page(items=[], next_cursor=None) + client.get("/api/v1/contributions", params={"limit": 10}, headers=AUTHED_HEADERS) + _, kwargs = contribution_repo.get_contributions.call_args + assert kwargs["pagination"].limit == 10 + + def test_fields_forwarded(self, client, contribution_repo): + contribution_repo.get_contributions.return_value = Page(items=[], next_cursor=None) + client.get("/api/v1/contributions", params={"_fields": "formula"}, headers=AUTHED_HEADERS) + _, kwargs = contribution_repo.get_contributions.call_args + assert kwargs["fields"] is not None + assert "formula" in kwargs["fields"] + + def test_invalid_fields_returns_422(self, client, contribution_repo): + contribution_repo.get_contributions.return_value = Page(items=[], next_cursor=None) + r = client.get("/api/v1/contributions", params={"_fields": "bad_field"}, headers=AUTHED_HEADERS) + assert r.status_code == 422 + + def test_anonymous_can_list(self, client, contribution_repo): + contribution_repo.get_contributions.return_value = Page(items=[], next_cursor=None) + r = client.get("/api/v1/contributions", headers=ANON_HEADERS) + assert r.status_code == 200 + + def test_filter_param_forwarded_to_repo(self, client, contribution_repo): + contribution_repo.get_contributions.return_value = Page(items=[], next_cursor=None) + client.get("/api/v1/contributions", params={"formula": "Fe2O3"}, headers=AUTHED_HEADERS) + contribution_repo.get_contributions.assert_called_once() + + +# --------------------------------------------------------------------------- +# DELETE /api/v1/contributions (batch) +# --------------------------------------------------------------------------- + + +class TestDeleteContributions: + def test_batch_delete_returns_200(self, client, contribution_repo): + contribution_repo.delete_contributions.return_value = None + r = client.delete("/api/v1/contributions", headers=AUTHED_HEADERS) + assert r.status_code == 200 + + def test_repo_delete_called(self, client, contribution_repo): + contribution_repo.delete_contributions.return_value = None + client.delete("/api/v1/contributions", headers=AUTHED_HEADERS) + contribution_repo.delete_contributions.assert_called_once() + + def test_filter_forwarded_to_repo(self, client, contribution_repo): + contribution_repo.delete_contributions.return_value = None + client.delete("/api/v1/contributions", params={"is_public": "true"}, headers=AUTHED_HEADERS) + _, kwargs = contribution_repo.delete_contributions.call_args + assert kwargs["filter"] is not None + + +# --------------------------------------------------------------------------- +# Stub endpoints — verify they exist and wire to the repo +# --------------------------------------------------------------------------- + + +class TestStubEndpoints: + """These endpoints are stubs in the repo but the routes must be wired.""" + + def test_post_contributions_route_exists(self, client, contribution_repo): + contribution_repo.insert_contributions.return_value = None + r = client.post("/api/v1/contributions", json=[], headers=AUTHED_HEADERS) + # Should reach the route (not 404/405) even if the handler is a stub + assert r.status_code != 404 + assert r.status_code != 405 + + def test_put_contributions_route_exists(self, client, contribution_repo): + contribution_repo.upsert_contributions.return_value = None + r = client.put("/api/v1/contributions", json=[], headers=AUTHED_HEADERS) + assert r.status_code != 404 + assert r.status_code != 405 diff --git a/mpcontribs-api/tests/integration/test_error_handlers.py b/mpcontribs-api/tests/integration/test_error_handlers.py new file mode 100644 index 0000000000..246452a23b --- /dev/null +++ b/mpcontribs-api/tests/integration/test_error_handlers.py @@ -0,0 +1,184 @@ +"""Integration tests for exception handlers registered in app.py. + +Tests exercise the full HTTP cycle to verify that AppError subclasses and +framework errors (RequestValidationError, HTTPException) all produce the +uniform JSON envelope: {"error": {"code": "...", "message": "..."}}. +""" + +import pytest +from fastapi import FastAPI +from fastapi.testclient import TestClient + +from src.mpcontribs_api.exceptions import ( + AuthenticationError, + ConflictError, + NotFoundError, + PermissionError, + ValidationError, +) +from tests.integration.conftest import AUTHED_HEADERS, make_test_app + +# --------------------------------------------------------------------------- +# Helper: mount a /probe route that raises a specific AppError +# --------------------------------------------------------------------------- + + +def _app_with_probe(exc: Exception) -> FastAPI: + """Create a test app with a GET /probe route that raises `exc`.""" + app = make_test_app() + + @app.get("/probe") + async def _probe(): + raise exc + + return app + + +def _client(app: FastAPI) -> TestClient: + return TestClient(app, raise_server_exceptions=False) + + +# --------------------------------------------------------------------------- +# Unknown route — Starlette HTTPException(404) → {"error": {"code": "http_error"}} +# --------------------------------------------------------------------------- + + +class TestUnknownRoute: + def test_status_404(self, client): + r = client.get("/no/such/route", headers=AUTHED_HEADERS) + assert r.status_code == 404 + + def test_error_envelope(self, client): + r = client.get("/no/such/route", headers=AUTHED_HEADERS) + body = r.json() + assert "error" in body + assert body["error"]["code"] == "http_error" + assert "message" in body["error"] + + +# --------------------------------------------------------------------------- +# Request body validation — FastAPI RequestValidationError → 422 +# --------------------------------------------------------------------------- + + +class TestRequestValidation: + def test_missing_required_body_field(self, client): + # PUT /api/v1/projects/{id} requires a ProjectIn body + r = client.put( + "/api/v1/projects/my-proj", + json={"title": "Missing required fields"}, + headers=AUTHED_HEADERS, + ) + assert r.status_code == 422 + + def test_validation_error_envelope(self, client): + r = client.put( + "/api/v1/projects/my-proj", + json={"title": "Missing required fields"}, + headers=AUTHED_HEADERS, + ) + body = r.json() + assert body["error"]["code"] == "validation_error" + assert "errors" in body["error"]["detail"] + + def test_non_json_body(self, client): + r = client.put( + "/api/v1/projects/my-proj", + content=b"not json at all", + headers={**AUTHED_HEADERS, "content-type": "application/json"}, + ) + assert r.status_code == 422 + + +# --------------------------------------------------------------------------- +# AppError subclasses — verify status codes and envelope shapes +# --------------------------------------------------------------------------- + + +class TestNotFoundError: + def setup_method(self): + self._app = _app_with_probe(NotFoundError("project 'foo' not found")) + self._client = _client(self._app) + + def test_status_404(self): + assert self._client.get("/probe").status_code == 404 + + def test_error_code(self): + assert self._client.get("/probe").json()["error"]["code"] == "not_found" + + def test_message(self): + assert "foo" in self._client.get("/probe").json()["error"]["message"] + + +class TestConflictError: + def setup_method(self): + self._app = _app_with_probe(ConflictError("duplicate id")) + self._client = _client(self._app) + + def test_status_409(self): + assert self._client.get("/probe").status_code == 409 + + def test_error_code(self): + assert self._client.get("/probe").json()["error"]["code"] == "conflict" + + +class TestValidationErrorHandler: + def setup_method(self): + self._app = _app_with_probe(ValidationError("bad field value")) + self._client = _client(self._app) + + def test_status_422(self): + assert self._client.get("/probe").status_code == 422 + + def test_error_code(self): + assert self._client.get("/probe").json()["error"]["code"] == "validation_error" + + +class TestPermissionErrorHandler: + def setup_method(self): + self._app = _app_with_probe(PermissionError(required_role="admin")) + self._client = _client(self._app) + + def test_status_403(self): + assert self._client.get("/probe").status_code == 403 + + def test_error_code(self): + assert self._client.get("/probe").json()["error"]["code"] == "permission_denied" + + +class TestAuthenticationErrorHandler: + def setup_method(self): + self._app = _app_with_probe(AuthenticationError("login required")) + self._client = _client(self._app) + + def test_status_401(self): + assert self._client.get("/probe").status_code == 401 + + def test_error_code(self): + assert self._client.get("/probe").json()["error"]["code"] == "authentication_error" + + +# --------------------------------------------------------------------------- +# Envelope shape invariants — all error responses share the same top-level key +# --------------------------------------------------------------------------- + + +class TestEnvelopeShape: + @pytest.mark.parametrize( + "exc, expected_status", + [ + (NotFoundError("x"), 404), + (ConflictError("x"), 409), + (ValidationError("x"), 422), + (PermissionError(), 403), + (AuthenticationError("x"), 401), + ], + ) + def test_always_has_error_key(self, exc, expected_status): + app = _app_with_probe(exc) + r = _client(app).get("/probe") + assert r.status_code == expected_status + body = r.json() + assert "error" in body + assert "code" in body["error"] + assert "message" in body["error"] diff --git a/mpcontribs-api/tests/integration/test_gateway.py b/mpcontribs-api/tests/integration/test_gateway.py new file mode 100644 index 0000000000..0a8a4ce16e --- /dev/null +++ b/mpcontribs-api/tests/integration/test_gateway.py @@ -0,0 +1,67 @@ +"""Integration tests for the Kong gateway secret verification. + +verify_gateway() is applied as an app-level dependency in production. The +gateway_app fixture (from conftest) keeps that dependency active so we can +test enforcement through the full HTTP cycle without a real database. + +The correct header value is the plain secret configured in settings +(MPCONTRIBS_KONG__GATEWAY_SECRET=test-gateway-secret, set in the root +conftest.py). The mock project/contribution repos are also overridden here so +that a passing gateway request reaches a route and returns a non-gateway error. +""" + +from unittest.mock import AsyncMock + +import pytest + +from src.mpcontribs_api.domains.contributions.dependencies import get_scoped_contributions +from src.mpcontribs_api.domains.projects.dependencies import get_scoped_projects +from src.mpcontribs_api.pagination import Page +from tests.integration.conftest import GATEWAY_SECRET + + +@pytest.fixture(autouse=True) +def _stub_repos(gateway_app): + """Inject no-op mock repos so gateway-passing requests don't hit Beanie.""" + proj_repo = AsyncMock() + proj_repo.get_project.return_value = Page(items=[], next_cursor=None) + contrib_repo = AsyncMock() + contrib_repo.get_contributions.return_value = Page(items=[], next_cursor=None) + + gateway_app.dependency_overrides[get_scoped_projects] = lambda: proj_repo + gateway_app.dependency_overrides[get_scoped_contributions] = lambda: contrib_repo + yield + gateway_app.dependency_overrides.clear() + + +class TestGatewayEnforcement: + def test_missing_header_returns_403(self, gateway_client): + r = gateway_client.get("/api/v1/projects") + assert r.status_code == 403 + + def test_wrong_secret_returns_403(self, gateway_client): + r = gateway_client.get("/api/v1/projects", headers={"x-gateway-secret": "wrong-secret"}) + assert r.status_code == 403 + + def test_missing_header_error_code(self, gateway_client): + r = gateway_client.get("/api/v1/projects") + assert r.json()["error"]["code"] == "gateway_error" + + def test_correct_secret_passes_gateway(self, gateway_client): + r = gateway_client.get( + "/api/v1/projects", + headers={"x-gateway-secret": GATEWAY_SECRET}, + ) + # Request reached the route — not 403 + assert r.status_code != 403 + + def test_correct_secret_on_contributions(self, gateway_client): + r = gateway_client.get( + "/api/v1/contributions", + headers={"x-gateway-secret": GATEWAY_SECRET}, + ) + assert r.status_code != 403 + + def test_empty_string_secret_returns_403(self, gateway_client): + r = gateway_client.get("/api/v1/projects", headers={"x-gateway-secret": ""}) + assert r.status_code == 403 diff --git a/mpcontribs-api/tests/integration/test_projects.py b/mpcontribs-api/tests/integration/test_projects.py new file mode 100644 index 0000000000..57feeba04f --- /dev/null +++ b/mpcontribs-api/tests/integration/test_projects.py @@ -0,0 +1,271 @@ +"""Integration tests for /api/v1/projects routes. + +The project repository is overridden with an AsyncMock for each test so no +MongoDB connection is needed. Tests verify: + - HTTP status codes + - Response JSON shapes (Page envelope, ProjectOut fields) + - That the correct repository method is called + - That query parameters (_fields, pagination, filters) are forwarded + - Error handling (NotFoundError → 404, etc.) +""" + + +import pytest + +from src.mpcontribs_api.domains.projects.dependencies import get_scoped_projects +from src.mpcontribs_api.domains.projects.models import ProjectOut, Stats +from src.mpcontribs_api.exceptions import ConflictError, NotFoundError +from src.mpcontribs_api.pagination import Page +from tests.integration.conftest import ANON_HEADERS, AUTHED_HEADERS + +# --------------------------------------------------------------------------- +# Shared sample data +# --------------------------------------------------------------------------- + +SAMPLE_STATS = Stats(columns=1, contributions=5, tables=0, structures=0, attachments=0, size=128.0) + +SAMPLE_PROJECT = ProjectOut.model_validate( + { + "_id": "mp-sample", + "title": "Sample Project", + "authors": "Alice, Bob", + "description": "A sample", + "is_public": True, + "is_approved": True, + "stats": SAMPLE_STATS, + } +) + + +# --------------------------------------------------------------------------- +# Fixture: inject mock repo into the test_app for the duration of each test +# --------------------------------------------------------------------------- + + +@pytest.fixture +def project_repo(test_app, mock_project_repo): + test_app.dependency_overrides[get_scoped_projects] = lambda: mock_project_repo + yield mock_project_repo + test_app.dependency_overrides.pop(get_scoped_projects, None) + + +# --------------------------------------------------------------------------- +# GET /api/v1/projects +# --------------------------------------------------------------------------- + + +class TestListProjects: + def test_empty_page_returns_200(self, client, project_repo): + project_repo.get_project.return_value = Page(items=[], next_cursor=None) + r = client.get("/api/v1/projects", headers=AUTHED_HEADERS) + assert r.status_code == 200 + + def test_response_has_items_and_cursor(self, client, project_repo): + project_repo.get_project.return_value = Page(items=[], next_cursor=None) + body = client.get("/api/v1/projects", headers=AUTHED_HEADERS).json() + assert "items" in body + assert "next_cursor" in body + + def test_items_returned_in_response(self, client, project_repo): + project_repo.get_project.return_value = Page(items=[SAMPLE_PROJECT], next_cursor=None) + body = client.get("/api/v1/projects", headers=AUTHED_HEADERS).json() + assert len(body["items"]) == 1 + + def test_next_cursor_set_when_more_pages(self, client, project_repo): + from src.mpcontribs_api.pagination import encode_cursor + cursor = encode_cursor("mp-sample") + project_repo.get_project.return_value = Page(items=[SAMPLE_PROJECT], next_cursor=cursor) + body = client.get("/api/v1/projects", headers=AUTHED_HEADERS).json() + assert body["next_cursor"] == cursor + + def test_repo_get_project_called(self, client, project_repo): + project_repo.get_project.return_value = Page(items=[], next_cursor=None) + client.get("/api/v1/projects", headers=AUTHED_HEADERS) + project_repo.get_project.assert_called_once() + + def test_anonymous_user_reaches_route(self, client, project_repo): + project_repo.get_project.return_value = Page(items=[], next_cursor=None) + r = client.get("/api/v1/projects", headers=ANON_HEADERS) + assert r.status_code == 200 + + def test_invalid_fields_param_returns_422(self, client, project_repo): + project_repo.get_project.return_value = Page(items=[], next_cursor=None) + r = client.get("/api/v1/projects", params={"_fields": "nonexistent_field"}, headers=AUTHED_HEADERS) + assert r.status_code == 422 + + def test_limit_param_forwarded(self, client, project_repo): + project_repo.get_project.return_value = Page(items=[], next_cursor=None) + client.get("/api/v1/projects", params={"limit": 5}, headers=AUTHED_HEADERS) + _, kwargs = project_repo.get_project.call_args + assert kwargs["pagination"].limit == 5 + + def test_limit_above_max_returns_422(self, client, project_repo): + r = client.get("/api/v1/projects", params={"limit": 999}, headers=AUTHED_HEADERS) + assert r.status_code == 422 + + def test_valid_fields_param_forwarded(self, client, project_repo): + project_repo.get_project.return_value = Page(items=[], next_cursor=None) + client.get("/api/v1/projects", params={"_fields": "title,authors"}, headers=AUTHED_HEADERS) + _, kwargs = project_repo.get_project.call_args + assert kwargs["fields"] is not None + assert "title" in kwargs["fields"] + + +# --------------------------------------------------------------------------- +# GET /api/v1/projects/{id} +# --------------------------------------------------------------------------- + + +class TestGetProjectById: + def test_found_returns_200(self, client, project_repo): + project_repo.get_project_by_id.return_value = SAMPLE_PROJECT + r = client.get("/api/v1/projects/mp-sample", headers=AUTHED_HEADERS) + assert r.status_code == 200 + + def test_response_contains_project_data(self, client, project_repo): + project_repo.get_project_by_id.return_value = SAMPLE_PROJECT + body = client.get("/api/v1/projects/mp-sample", headers=AUTHED_HEADERS).json() + assert body["id"] == "mp-sample" + assert body["title"] == "Sample Project" + + def test_not_found_returns_404(self, client, project_repo): + project_repo.get_project_by_id.side_effect = NotFoundError("project not found") + r = client.get("/api/v1/projects/nonexistent", headers=AUTHED_HEADERS) + assert r.status_code == 404 + + def test_not_found_error_code(self, client, project_repo): + project_repo.get_project_by_id.side_effect = NotFoundError("project not found") + body = client.get("/api/v1/projects/nonexistent", headers=AUTHED_HEADERS).json() + assert body["error"]["code"] == "not_found" + + def test_id_forwarded_to_repo(self, client, project_repo): + project_repo.get_project_by_id.return_value = SAMPLE_PROJECT + client.get("/api/v1/projects/my-specific-id", headers=AUTHED_HEADERS) + _, kwargs = project_repo.get_project_by_id.call_args + assert kwargs["id"] == "my-specific-id" + + def test_fields_param_forwarded(self, client, project_repo): + project_repo.get_project_by_id.return_value = SAMPLE_PROJECT + client.get("/api/v1/projects/mp-sample", params={"_fields": "title"}, headers=AUTHED_HEADERS) + _, kwargs = project_repo.get_project_by_id.call_args + assert kwargs["fields"] is not None + assert "title" in kwargs["fields"] + + def test_no_fields_param_passes_none(self, client, project_repo): + project_repo.get_project_by_id.return_value = SAMPLE_PROJECT + client.get("/api/v1/projects/mp-sample", headers=AUTHED_HEADERS) + _, kwargs = project_repo.get_project_by_id.call_args + assert kwargs["fields"] is None + + +# --------------------------------------------------------------------------- +# PATCH /api/v1/projects/{id} +# --------------------------------------------------------------------------- + + +class TestPatchProject: + def test_valid_patch_returns_200(self, client, project_repo): + project_repo.patch_project.return_value = SAMPLE_PROJECT + r = client.patch( + "/api/v1/projects/mp-sample", + json={"title": "Updated Title"}, + headers=AUTHED_HEADERS, + ) + assert r.status_code == 200 + + def test_patch_response_is_project_out(self, client, project_repo): + updated = ProjectOut(id="mp-sample", title="Updated Title") + project_repo.patch_project.return_value = updated + body = client.patch( + "/api/v1/projects/mp-sample", + json={"title": "Updated Title"}, + headers=AUTHED_HEADERS, + ).json() + assert body["title"] == "Updated Title" + + def test_not_found_returns_404(self, client, project_repo): + project_repo.patch_project.side_effect = NotFoundError("not found") + r = client.patch( + "/api/v1/projects/missing", + json={"title": "x" * 5}, + headers=AUTHED_HEADERS, + ) + assert r.status_code == 404 + + def test_invalid_title_too_short_returns_422(self, client, project_repo): + r = client.patch( + "/api/v1/projects/mp-sample", + json={"title": "ab"}, + headers=AUTHED_HEADERS, + ) + assert r.status_code == 422 + + def test_id_and_update_forwarded_to_repo(self, client, project_repo): + project_repo.patch_project.return_value = SAMPLE_PROJECT + client.patch( + "/api/v1/projects/mp-sample", + json={"title": "New Name"}, + headers=AUTHED_HEADERS, + ) + _, kwargs = project_repo.patch_project.call_args + assert kwargs["id"] == "mp-sample" + assert kwargs["update"].title == "New Name" + + +# --------------------------------------------------------------------------- +# DELETE /api/v1/projects/{id} +# --------------------------------------------------------------------------- + + +class TestDeleteProject: + def test_delete_returns_204(self, client, project_repo): + project_repo.delete_project.return_value = None + r = client.delete("/api/v1/projects/mp-sample", headers=AUTHED_HEADERS) + assert r.status_code == 204 + + def test_delete_response_has_no_body(self, client, project_repo): + project_repo.delete_project.return_value = None + r = client.delete("/api/v1/projects/mp-sample", headers=AUTHED_HEADERS) + assert r.content == b"" + + def test_id_forwarded_to_repo(self, client, project_repo): + project_repo.delete_project.return_value = None + client.delete("/api/v1/projects/mp-sample", headers=AUTHED_HEADERS) + _, kwargs = project_repo.delete_project.call_args + assert kwargs["id"] == "mp-sample" + + +# --------------------------------------------------------------------------- +# PUT /api/v1/projects/{id} +# --------------------------------------------------------------------------- + + +class TestUpsertProject: + def _valid_body(self, **overrides): + body = { + "_id": "mp-sample", + "title": "Test Project", + "authors": "Alice", + "description": "A project", + "owner": "google:alice@example.com", + "unique_identifiers": True, + "stats": {"columns": 0, "contributions": 0, "tables": 0, "structures": 0, "attachments": 0, "size": 0.0}, + } + body.update(overrides) + return body + + def test_valid_upsert_returns_200(self, client, project_repo): + project_repo.upsert_project.return_value = SAMPLE_PROJECT + r = client.put("/api/v1/projects/mp-sample", json=self._valid_body(), headers=AUTHED_HEADERS) + assert r.status_code == 200 + + def test_conflict_returns_409(self, client, project_repo): + project_repo.upsert_project.side_effect = ConflictError("already exists") + r = client.put("/api/v1/projects/mp-sample", json=self._valid_body(), headers=AUTHED_HEADERS) + assert r.status_code == 409 + + def test_missing_required_field_returns_422(self, client, project_repo): + body = self._valid_body() + del body["title"] + r = client.put("/api/v1/projects/mp-sample", json=body, headers=AUTHED_HEADERS) + assert r.status_code == 422 diff --git a/mpcontribs-api/uv.lock b/mpcontribs-api/uv.lock index 4d386f1cc8..70edad087f 100644 --- a/mpcontribs-api/uv.lock +++ b/mpcontribs-api/uv.lock @@ -1079,6 +1079,43 @@ gevent = [ { name = "gevent" }, ] +[[package]] +name = "h11" +version = "0.16.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/01/ee/02a2c011bdab74c6fb3c75474d40b3052059d95df7e73351460c8588d963/h11-0.16.0.tar.gz", hash = "sha256:4e35b956cf45792e4caa5885e69fba00bdbc6ffafbfa020300e549b208ee5ff1", size = 101250, upload-time = "2025-04-24T03:35:25.427Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/04/4b/29cac41a4d98d144bf5f6d33995617b185d14b22401f75ca86f384e87ff1/h11-0.16.0-py3-none-any.whl", hash = "sha256:63cf8bbe7522de3bf65932fda1d9c2772064ffb3dae62d55932da54b31cb6c86", size = 37515, upload-time = "2025-04-24T03:35:24.344Z" }, +] + +[[package]] +name = "httpcore2" +version = "2.3.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "h11" }, + { name = "truststore" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/e6/34/18f1c596e677962f040284246f393b10a1f8ce440b3a7e69c637d0f1c7ad/httpcore2-2.3.0.tar.gz", hash = "sha256:07327e251560960eea8e969d92d4c6a325feb13cca39e25340731336c3baf924", size = 64300, upload-time = "2026-06-01T13:15:02.998Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/c2/dd/3357218c69360d1cecc196c230c9a1d5c9afd5dba362056e23e60a5e64e5/httpcore2-2.3.0-py3-none-any.whl", hash = "sha256:477e9e334f74e5240dcac002e890580f36a57d40ff0fb14cc9655731d23b8415", size = 80024, upload-time = "2026-06-01T13:15:00.001Z" }, +] + +[[package]] +name = "httpx2" +version = "2.3.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "anyio" }, + { name = "httpcore2" }, + { name = "idna" }, + { name = "truststore" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/9f/9a/cca0b9145f13d8ae34b885ae28d403a1469a433abc78e0f94f4ce94e650b/httpx2-2.3.0.tar.gz", hash = "sha256:227e7c41d95a76d4077a52640564132777215fc3394e07b66a3116c33d668fa9", size = 81115, upload-time = "2026-06-01T13:15:04.324Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/87/ce/ae2911859847f9ba1d6b23027e53481cbeb50b93234f355a968d300ca2cb/httpx2-2.3.0-py3-none-any.whl", hash = "sha256:6f393663bdf6dbe7fe90118e3eb5b2bd024a675cae0390ac08cec9198812d8b7", size = 74538, upload-time = "2026-06-01T13:15:01.566Z" }, +] + [[package]] name = "idna" version = "3.17" @@ -1694,6 +1731,7 @@ dependencies = [ [package.dev-dependencies] dev = [ { name = "basedpyright" }, + { name = "httpx2" }, { name = "pydocstringformatter" }, { name = "pytest" }, { name = "pytest-xdist" }, @@ -1751,6 +1789,7 @@ requires-dist = [ [package.metadata.requires-dev] dev = [ { name = "basedpyright", specifier = ">=1.29.0" }, + { name = "httpx2", specifier = ">=0.28.0" }, { name = "pydocstringformatter", specifier = ">=0.7.0" }, { name = "pytest", specifier = ">=9.0.3" }, { name = "pytest-xdist", specifier = ">=3.8.0" }, @@ -3209,6 +3248,15 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/da/98/a9937a969d018a23badfea0b381f66783649d48e0ea6c41923265c3cbeb3/traitlets-5.15.0-py3-none-any.whl", hash = "sha256:fb36a18867a6803deab09f3c5e0fa81bb7b26a5c9e82501c9933f759166eff40", size = 85877, upload-time = "2026-05-06T08:05:55.853Z" }, ] +[[package]] +name = "truststore" +version = "0.10.4" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/53/a3/1585216310e344e8102c22482f6060c7a6ea0322b63e026372e6dcefcfd6/truststore-0.10.4.tar.gz", hash = "sha256:9d91bd436463ad5e4ee4aba766628dd6cd7010cf3e2461756b3303710eebc301", size = 26169, upload-time = "2025-08-12T18:49:02.73Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/19/97/56608b2249fe206a67cd573bc93cd9896e1efb9e98bce9c163bcdc704b88/truststore-0.10.4-py3-none-any.whl", hash = "sha256:adaeaecf1cbb5f4de3b1959b42d41f6fab57b2b1666adb59e89cb0b53361d981", size = 18660, upload-time = "2025-08-12T18:49:01.46Z" }, +] + [[package]] name = "typing-extensions" version = "4.15.0" From 0f84dd47a394a6951ac7fe0e7b0882a29621bf72 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 3 Jun 2026 15:39:26 -0700 Subject: [PATCH 048/591] Added test commands to justfile --- mpcontribs-api/justfile | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/mpcontribs-api/justfile b/mpcontribs-api/justfile index 20950b1243..8c5f82188d 100644 --- a/mpcontribs-api/justfile +++ b/mpcontribs-api/justfile @@ -4,3 +4,12 @@ fmt: -uv run ruff check --fix src/ -uv run ruff check --fix --unsafe-fixes src/ -uv run pydocstringformatter --write src/ + +test suite="all": + #!/usr/bin/env bash + case "{{suite}}" in + all|a) uv run pytest tests/ ;; + integration|i) uv run pytest tests/integration/ ;; + unit|u) uv run pytest tests/unit/ ;; + *) echo "unknown suite '{{suite}}' — use: all/a, integration/i, unit/u" && exit 1 ;; + esac From 8c0060bc45e70f64e6cc21d2f123c37fbdd986d5 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 3 Jun 2026 16:02:30 -0700 Subject: [PATCH 049/591] Added tests to live dev db --- mpcontribs-api/justfile | 13 +- mpcontribs-api/pyproject.toml | 6 +- mpcontribs-api/tests/conftest.py | 23 +- .../tests/integration/db/__init__.py | 0 .../tests/integration/db/conftest.py | 90 ++++++ .../db/test_projects_repository.py | 306 ++++++++++++++++++ .../tests/integration/test_contributions.py | 4 +- .../tests/integration/test_projects.py | 2 +- mpcontribs-api/tests/unit/conftest.py | 18 ++ mpcontribs-api/uv.lock | 14 + 10 files changed, 448 insertions(+), 28 deletions(-) create mode 100644 mpcontribs-api/tests/integration/db/__init__.py create mode 100644 mpcontribs-api/tests/integration/db/conftest.py create mode 100644 mpcontribs-api/tests/integration/db/test_projects_repository.py create mode 100644 mpcontribs-api/tests/unit/conftest.py diff --git a/mpcontribs-api/justfile b/mpcontribs-api/justfile index 8c5f82188d..929f75df5f 100644 --- a/mpcontribs-api/justfile +++ b/mpcontribs-api/justfile @@ -1,15 +1,16 @@ # Format, fix, and lint all source code fmt: - uv run ruff format src/ - -uv run ruff check --fix src/ - -uv run ruff check --fix --unsafe-fixes src/ - -uv run pydocstringformatter --write src/ + uv run ruff format + -uv run ruff check --fix + -uv run ruff check --fix --unsafe-fixes + -uv run pydocstringformatter --write test suite="all": #!/usr/bin/env bash case "{{suite}}" in all|a) uv run pytest tests/ ;; - integration|i) uv run pytest tests/integration/ ;; + integration|i) uv run pytest tests/integration/ -m "not db" ;; unit|u) uv run pytest tests/unit/ ;; - *) echo "unknown suite '{{suite}}' — use: all/a, integration/i, unit/u" && exit 1 ;; + db|d) uv run pytest tests/integration/db/ -m db ;; + *) echo "unknown suite '{{suite}}' — use: all/a, integration/i, unit/u, db/d" && exit 1 ;; esac diff --git a/mpcontribs-api/pyproject.toml b/mpcontribs-api/pyproject.toml index bc30e6b02b..49480c94b3 100644 --- a/mpcontribs-api/pyproject.toml +++ b/mpcontribs-api/pyproject.toml @@ -83,18 +83,22 @@ dev = [ "pytest>=9.0.3", "pytest-xdist>=3.8.0", "httpx2>=0.28.0", + "pytest-asyncio>=1.4.0", ] [tool.pytest.ini_options] pythonpath = ["."] +asyncio_mode = "auto" +asyncio_default_fixture_loop_scope = "session" markers = [ "base: basic resource testing", "extra: all extra views", + "db: requires a live MongoDB connection (set MPCONTRIBS_MONGO__URI)", ] [tool.ruff] line-length = 120 -exclude = ["src/mpcontribs_api/old"] +exclude = ["src/mpcontribs_api/old", "tests/"] [tool.ruff.lint] select = ["E", "F", "W", "I", "B", "UP"] diff --git a/mpcontribs-api/tests/conftest.py b/mpcontribs-api/tests/conftest.py index b8ae1606bf..42f8eef4ed 100644 --- a/mpcontribs-api/tests/conftest.py +++ b/mpcontribs-api/tests/conftest.py @@ -6,11 +6,14 @@ """ import os -from unittest.mock import MagicMock, patch -import pytest +from dotenv import load_dotenv -# Must be set before any source import that calls get_settings(). +# Load .env *before* setdefault calls so real credentials take precedence. +# load_dotenv is a no-op when .env doesn't exist (CI / pure unit-test runs). +load_dotenv() + +# Fallbacks for any value not supplied by .env (CI, unit-only runs, etc.) os.environ.setdefault("MPCONTRIBS_ENVIRONMENT", "dev") os.environ.setdefault("MPCONTRIBS_MONGO__URI", "mongodb://localhost:27017") os.environ.setdefault("MPCONTRIBS_MONGO__DB_NAME", "testdb") @@ -19,17 +22,3 @@ os.environ.setdefault("MPCONTRIBS_REDIS__URL", "redis://localhost:6379") os.environ.setdefault("MPCONTRIBS_MAIL_DEFAULT_SENDER", "test@example.com") os.environ.setdefault("MPCONTRIBS_VERSION", "0.0.0-test") - - -@pytest.fixture(autouse=True, scope="session") -def _mock_beanie_collection(): - """Prevent CollectionWasNotInitialized for unit tests. - - Beanie Documents call get_pymongo_collection() in __init__ to assert the - collection has been set up via init_beanie(). Unit tests don't need a real - DB, so we stub that check out for the entire session. - """ - import beanie - - with patch.object(beanie.Document, "get_pymongo_collection", return_value=MagicMock()): - yield diff --git a/mpcontribs-api/tests/integration/db/__init__.py b/mpcontribs-api/tests/integration/db/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/mpcontribs-api/tests/integration/db/conftest.py b/mpcontribs-api/tests/integration/db/conftest.py new file mode 100644 index 0000000000..d471c60315 --- /dev/null +++ b/mpcontribs-api/tests/integration/db/conftest.py @@ -0,0 +1,90 @@ +"""Fixtures for tests that require a live MongoDB connection. + +Connection settings come from the .env file (MPCONTRIBS_MONGO__URI and +MPCONTRIBS_MONGO__DB_NAME). All tests in this directory are marked `db` +automatically; run them with `just test db` or skip them with `-m "not db"`. + +Data isolation: the `clean_projects` and `clean_contributions` fixtures +(autouse) delete all documents from the test collections before each test. +This is intentionally destructive — point MPCONTRIBS_MONGO__DB_NAME at a +dedicated test database, not a shared or production one. +""" + +import pytest +import pytest_asyncio +from beanie import init_beanie +from pymongo import AsyncMongoClient + +from src.mpcontribs_api.config import get_settings +from src.mpcontribs_api.domains.contributions.models import Contribution +from src.mpcontribs_api.domains.projects.models import Project + +# --------------------------------------------------------------------------- +# Auto-mark all tests in this directory as @pytest.mark.db +# --------------------------------------------------------------------------- + +pytestmark = [ + pytest.mark.db, + pytest.mark.asyncio(loop_scope="session"), +] + + +def pytest_collection_modifyitems(items): + for item in items: + if "integration/db" in str(item.fspath): + item.add_marker(pytest.mark.db) + item.add_marker(pytest.mark.asyncio(loop_scope="session")) + + +# --------------------------------------------------------------------------- +# Session-scoped MongoDB connection + Beanie initialization +# --------------------------------------------------------------------------- + + +@pytest_asyncio.fixture(scope="session") +async def mongo_client(): + """Connect to the Atlas dev instance; skip if unreachable.""" + settings = get_settings() + client = AsyncMongoClient( + settings.mongo.uri.get_secret_value(), + serverSelectionTimeoutMS=5_000, + ) + try: + await client.admin.command("ping") + except Exception as exc: + pytest.skip(f"MongoDB not reachable: {exc}") + yield client + await client.close() + + +@pytest_asyncio.fixture(scope="session") +async def db(mongo_client): + """Database handle with Beanie initialised against the test database.""" + settings = get_settings() + database = mongo_client[settings.mongo.db_name] + # Only initialise concrete documents (stubs like Structure/Table/Attachment + # have no Settings.name yet and cause Beanie to fall back to the base class). + await init_beanie( + database=database, + document_models=[Project, Contribution], + ) + yield database + + +# --------------------------------------------------------------------------- +# Per-test collection cleanup (autouse so every test starts clean) +# --------------------------------------------------------------------------- + + +@pytest_asyncio.fixture(autouse=True) +async def clean_projects(db): + await db["projects"].delete_many({}) + yield + await db["projects"].delete_many({}) + + +@pytest_asyncio.fixture(autouse=True) +async def clean_contributions(db): + await db["contributions"].delete_many({}) + yield + await db["contributions"].delete_many({}) diff --git a/mpcontribs-api/tests/integration/db/test_projects_repository.py b/mpcontribs-api/tests/integration/db/test_projects_repository.py new file mode 100644 index 0000000000..2d68568804 --- /dev/null +++ b/mpcontribs-api/tests/integration/db/test_projects_repository.py @@ -0,0 +1,306 @@ +import pytest + +from src.mpcontribs_api.auth import User +from src.mpcontribs_api.domains.projects.models import Project, ProjectIn, ProjectOut, ProjectPatch, Stats +from src.mpcontribs_api.domains.projects.repository import MongoDbProjectRepository +from src.mpcontribs_api.exceptions import ConflictError, NotFoundError +from src.mpcontribs_api.pagination import CursorParams + +"""Database integration tests for MongoDbProjectRepository. + +These tests require a live MongoDB connection (see conftest.py). They exercise +the real Beanie/MongoDB layer — query scoping, field projection, cursor +pagination, soft-delete, conflict detection, patch, and upsert — none of which +can be verified with mock repositories. + +Run with: just test db +Skip with: uv run pytest -m "not db" +""" + + +# All tests in this module share the session event loop so they can reuse the +# session-scoped AsyncMongoClient initialised in conftest. Beanie's internal +# collection references are loop-bound, so mixing loops causes errors. +pytestmark = [pytest.mark.db, pytest.mark.asyncio(loop_scope="session")] + + +# --------------------------------------------------------------------------- +# Helpers +# --------------------------------------------------------------------------- + +STATS = Stats(columns=0, contributions=0, tables=0, structures=0, attachments=0, size=0.0) + +ADMIN = User(username="google:admin@example.com", groups=frozenset({"admin"})) +ALICE = User(username="google:alice@example.com", groups=frozenset({"mp-team"})) +ANON = User() + + +def _repo(user: User) -> MongoDbProjectRepository: + return MongoDbProjectRepository(user) + + +def _project_in(id: str, **overrides) -> ProjectIn: + defaults = { + "_id": id, + "title": id[:30], + "authors": "Test Author", + "description": "Test description", + "owner": "google:alice@example.com", + "unique_identifiers": True, + "stats": STATS, + } + defaults.update(overrides) + return ProjectIn(**defaults) + + +async def _insert(id: str, **overrides) -> Project: + project_in = _project_in(id, **overrides) + return await _repo(ADMIN).insert_project(project_in) + + +# --------------------------------------------------------------------------- +# insert_project +# --------------------------------------------------------------------------- + + +class TestInsertProject: + async def test_inserted_project_is_retrievable(self, db): + await _insert("ins-basic") + found = await Project.find_one(Project.id == "ins-basic") + assert found is not None + assert found.id == "ins-basic" + + async def test_duplicate_id_raises_conflict(self, db): + await _insert("ins-dup") + with pytest.raises(ConflictError): + await _insert("ins-dup") + + async def test_default_not_public(self, db): + await _insert("ins-priv") + found = await Project.find_one(Project.id == "ins-priv") + assert found.is_public is False + + async def test_explicit_public(self, db): + await _insert("ins-pub", is_public=True, is_approved=True) + found = await Project.find_one(Project.id == "ins-pub") + assert found.is_public is True + + +# --------------------------------------------------------------------------- +# Authorization scoping (_build_scope) +# --------------------------------------------------------------------------- + + +class TestAuthorizationScope: + async def test_admin_sees_all(self, db): + await _insert("scope-priv", is_public=False) + await _insert("scope-pub", is_public=True, is_approved=True) + page = await _repo(ADMIN).get_project(filter=_noop_filter(), pagination=CursorParams(), fields=None) + ids = {p.id for p in page.items} + assert "scope-priv" in ids + assert "scope-pub" in ids + + async def test_anonymous_only_sees_public_approved(self, db): + await _insert("anon-priv", is_public=False) + await _insert("anon-pub", is_public=True, is_approved=True) + await _insert("anon-pub-unapproved", is_public=True, is_approved=False) + page = await _repo(ANON).get_project(filter=_noop_filter(), pagination=CursorParams(), fields=None) + ids = {p.id for p in page.items} + assert "anon-pub" in ids + assert "anon-priv" not in ids + assert "anon-pub-unapproved" not in ids + + async def test_authenticated_sees_own_and_public(self, db): + await _insert("auth-alice-priv", owner="google:alice@example.com", is_public=False) + await _insert("auth-bob-priv", owner="google:bob@example.com", is_public=False) + await _insert("auth-pub", is_public=True, is_approved=True) + page = await _repo(ALICE).get_project(filter=_noop_filter(), pagination=CursorParams(), fields=None) + ids = {p.id for p in page.items} + assert "auth-alice-priv" in ids + assert "auth-pub" in ids + assert "auth-bob-priv" not in ids + + +def _noop_filter(): + from src.mpcontribs_api.domains.projects.models import ProjectFilter + + return ProjectFilter() + + +# --------------------------------------------------------------------------- +# get_project_by_id +# --------------------------------------------------------------------------- + + +class TestGetProjectById: + async def test_returns_project_for_valid_id(self, db): + await _insert("get-by-id") + result = await _repo(ADMIN).get_project_by_id(id="get-by-id", fields=None) + assert result is not None + assert result.id == "get-by-id" + + async def test_returns_none_for_missing_id(self, db): + result = await _repo(ADMIN).get_project_by_id(id="does-not-exist", fields=None) + assert result is None + + async def test_admin_can_get_private_project(self, db): + await _insert("get-priv", is_public=False) + result = await _repo(ADMIN).get_project_by_id(id="get-priv", fields=None) + assert result is not None + + async def test_anon_cannot_get_private_project(self, db): + await _insert("get-priv-anon", is_public=False) + result = await _repo(ANON).get_project_by_id(id="get-priv-anon", fields=None) + assert result is None + + +# --------------------------------------------------------------------------- +# Field projection +# --------------------------------------------------------------------------- + + +class TestFieldProjection: + async def test_projection_returns_only_requested_fields(self, db): + await _insert("proj-fields", is_public=True, is_approved=True) + fields = ProjectOut.parse_fields("title") + page = await _repo(ADMIN).get_project(filter=_noop_filter(), pagination=CursorParams(), fields=fields) + assert len(page.items) == 1 + item = page.items[0] + assert item.title == "proj-fields" + # authors was not requested — absent from the projected model entirely + assert not hasattr(item, "authors") + + async def test_no_projection_returns_all_fields(self, db): + await _insert("proj-all", is_public=True, is_approved=True) + page = await _repo(ADMIN).get_project(filter=_noop_filter(), pagination=CursorParams(), fields=None) + item = page.items[0] + assert item.title is not None + assert item.authors is not None + + +# --------------------------------------------------------------------------- +# Cursor-based pagination +# --------------------------------------------------------------------------- + + +class TestPagination: + async def test_limit_is_respected(self, db): + for i in range(5): + await _insert(f"pag-limit-{i:02d}", is_public=True, is_approved=True) + page = await _repo(ADMIN).get_project(filter=_noop_filter(), pagination=CursorParams(limit=3), fields=None) + assert len(page.items) == 3 + + async def test_next_cursor_set_when_more_items(self, db): + for i in range(4): + await _insert(f"pag-cursor-{i:02d}", is_public=True, is_approved=True) + page = await _repo(ADMIN).get_project(filter=_noop_filter(), pagination=CursorParams(limit=2), fields=None) + assert page.next_cursor is not None + + async def test_next_cursor_none_on_last_page(self, db): + for i in range(3): + await _insert(f"pag-last-{i:02d}", is_public=True, is_approved=True) + page = await _repo(ADMIN).get_project(filter=_noop_filter(), pagination=CursorParams(limit=10), fields=None) + assert page.next_cursor is None + + async def test_cursor_fetches_next_page(self, db): + for i in range(4): + await _insert(f"pag-next-{i:02d}", is_public=True, is_approved=True) + page1 = await _repo(ADMIN).get_project(filter=_noop_filter(), pagination=CursorParams(limit=2), fields=None) + assert page1.next_cursor is not None + page2 = await _repo(ADMIN).get_project( + filter=_noop_filter(), pagination=CursorParams(limit=2, cursor=page1.next_cursor), fields=None + ) + ids1 = {p.id for p in page1.items} + ids2 = {p.id for p in page2.items} + assert ids1.isdisjoint(ids2), "pages must not overlap" + + async def test_all_items_covered_across_pages(self, db): + for i in range(5): + await _insert(f"pag-all-{i:02d}", is_public=True, is_approved=True) + all_ids: set[str] = set() + cursor = None + while True: + page = await _repo(ADMIN).get_project( + filter=_noop_filter(), pagination=CursorParams(limit=2, cursor=cursor), fields=None + ) + all_ids.update(p.id for p in page.items) + cursor = page.next_cursor + if cursor is None: + break + assert all(f"pag-all-{i:02d}" in all_ids for i in range(5)) + + +# --------------------------------------------------------------------------- +# patch_project +# --------------------------------------------------------------------------- + + +class TestPatchProject: + async def test_updates_single_field(self, db): + await _insert("patch-me") + patch = ProjectPatch(title="Updated Title") + await _repo(ADMIN).patch_project(id="patch-me", update=patch) + found = await Project.find_one(Project.id == "patch-me") + assert found.title == "Updated Title" + + async def test_unset_fields_not_overwritten(self, db): + await _insert("patch-preserve") + original = await Project.find_one(Project.id == "patch-preserve") + patch = ProjectPatch(title="New Title") + await _repo(ADMIN).patch_project(id="patch-preserve", update=patch) + found = await Project.find_one(Project.id == "patch-preserve") + assert found.authors == original.authors + + async def test_not_found_raises(self, db): + patch = ProjectPatch(title="Won't work") + with pytest.raises(NotFoundError): + await _repo(ADMIN).patch_project(id="no-such-id", update=patch) + + async def test_empty_patch_returns_existing(self, db): + await _insert("patch-empty") + result = await _repo(ADMIN).patch_project(id="patch-empty", update=ProjectPatch()) + assert result.id == "patch-empty" + + +# --------------------------------------------------------------------------- +# delete_project (soft-delete via DocumentWithSoftDelete) +# --------------------------------------------------------------------------- + + +class TestDeleteProject: + async def test_deleted_project_not_in_default_query(self, db): + await _insert("del-me", is_public=True, is_approved=True) + await _repo(ADMIN).delete_project(id="del-me") + page = await _repo(ADMIN).get_project(filter=_noop_filter(), pagination=CursorParams(), fields=None) + ids = {p.id for p in page.items} + assert "del-me" not in ids + + async def test_delete_nonexistent_is_silent(self, db): + # delete_project does find_one().delete() — no error if not found + await _repo(ADMIN).delete_project(id="ghost-id") + + +# --------------------------------------------------------------------------- +# upsert_project +# --------------------------------------------------------------------------- + + +class TestUpsertProject: + async def test_upsert_creates_new_project(self, db): + data = _project_in("upsert-new") + await _repo(ADMIN).upsert_project(id="upsert-new", data=data) + found = await Project.find_one(Project.id == "upsert-new") + assert found is not None + + async def test_upsert_updates_existing_project(self, db): + await _insert("upsert-existing") + data = _project_in("upsert-existing", title="Replaced Title") + await _repo(ADMIN).upsert_project(id="upsert-existing", data=data) + found = await Project.find_one(Project.id == "upsert-existing") + assert found.title == "Replaced Title" + + async def test_upsert_uses_path_id_not_body_id(self, db): + data = _project_in("body-id") + await _repo(ADMIN).upsert_project(id="path-id", data=data) + found = await Project.find_one(Project.id == "path-id") + assert found is not None diff --git a/mpcontribs-api/tests/integration/test_contributions.py b/mpcontribs-api/tests/integration/test_contributions.py index c1efc24aee..9d5074e7ab 100644 --- a/mpcontribs-api/tests/integration/test_contributions.py +++ b/mpcontribs-api/tests/integration/test_contributions.py @@ -51,9 +51,7 @@ def test_response_has_page_shape(self, client, contribution_repo): assert "next_cursor" in body def test_items_in_response(self, client, contribution_repo): - contribution_repo.get_contributions.return_value = Page( - items=[SAMPLE_CONTRIBUTION], next_cursor=None - ) + contribution_repo.get_contributions.return_value = Page(items=[SAMPLE_CONTRIBUTION], next_cursor=None) body = client.get("/api/v1/contributions", headers=AUTHED_HEADERS).json() assert len(body["items"]) == 1 diff --git a/mpcontribs-api/tests/integration/test_projects.py b/mpcontribs-api/tests/integration/test_projects.py index 57feeba04f..7042ca82bb 100644 --- a/mpcontribs-api/tests/integration/test_projects.py +++ b/mpcontribs-api/tests/integration/test_projects.py @@ -9,7 +9,6 @@ - Error handling (NotFoundError → 404, etc.) """ - import pytest from src.mpcontribs_api.domains.projects.dependencies import get_scoped_projects @@ -73,6 +72,7 @@ def test_items_returned_in_response(self, client, project_repo): def test_next_cursor_set_when_more_pages(self, client, project_repo): from src.mpcontribs_api.pagination import encode_cursor + cursor = encode_cursor("mp-sample") project_repo.get_project.return_value = Page(items=[SAMPLE_PROJECT], next_cursor=cursor) body = client.get("/api/v1/projects", headers=AUTHED_HEADERS).json() diff --git a/mpcontribs-api/tests/unit/conftest.py b/mpcontribs-api/tests/unit/conftest.py new file mode 100644 index 0000000000..ab2b86c434 --- /dev/null +++ b/mpcontribs-api/tests/unit/conftest.py @@ -0,0 +1,18 @@ +"""Unit-test-only fixtures. + +The Beanie collection mock lives here (not the root conftest) so it is +applied only to unit tests and does not interfere with DB integration tests +that need real Beanie initialization. +""" + +from unittest.mock import MagicMock, patch + +import pytest + + +@pytest.fixture(autouse=True, scope="session") +def _mock_beanie_collection(): + import beanie + + with patch.object(beanie.Document, "get_pymongo_collection", return_value=MagicMock()): + yield diff --git a/mpcontribs-api/uv.lock b/mpcontribs-api/uv.lock index 70edad087f..f5cba271a7 100644 --- a/mpcontribs-api/uv.lock +++ b/mpcontribs-api/uv.lock @@ -1734,6 +1734,7 @@ dev = [ { name = "httpx2" }, { name = "pydocstringformatter" }, { name = "pytest" }, + { name = "pytest-asyncio" }, { name = "pytest-xdist" }, { name = "ruff" }, ] @@ -1792,6 +1793,7 @@ dev = [ { name = "httpx2", specifier = ">=0.28.0" }, { name = "pydocstringformatter", specifier = ">=0.7.0" }, { name = "pytest", specifier = ">=9.0.3" }, + { name = "pytest-asyncio", specifier = ">=1.4.0" }, { name = "pytest-xdist", specifier = ">=3.8.0" }, { name = "ruff", specifier = ">=0.9.0" }, ] @@ -2621,6 +2623,18 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/d4/24/a372aaf5c9b7208e7112038812994107bc65a84cd00e0354a88c2c77a617/pytest-9.0.3-py3-none-any.whl", hash = "sha256:2c5efc453d45394fdd706ade797c0a81091eccd1d6e4bccfcd476e2b8e0ab5d9", size = 375249, upload-time = "2026-04-07T17:16:16.13Z" }, ] +[[package]] +name = "pytest-asyncio" +version = "1.4.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "pytest" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/43/7c/d36d04db312ecf4298932ef77e6e4a9e8ad017906e24e34f0b0c361a2473/pytest_asyncio-1.4.0.tar.gz", hash = "sha256:c6c0d2259945122819f171a32ecea2c349ead889ee28176caaf492143424be42", size = 58514, upload-time = "2026-05-26T09:56:04.083Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/03/e2/08a497ef684b88559c9cc5f4ad53a37e7b99e727094a86d6ea32536d5d3c/pytest_asyncio-1.4.0-py3-none-any.whl", hash = "sha256:933ca923a23075a87fb7070c0ec272a6848489824d887c85c812670932835aa1", size = 16930, upload-time = "2026-05-26T09:56:02.576Z" }, +] + [[package]] name = "pytest-xdist" version = "3.8.0" From d7b5b8b511b3abdbec53cba76f626cbaccd988a8 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 3 Jun 2026 16:17:59 -0700 Subject: [PATCH 050/591] Fixed importing from src --- .../src/mpcontribs_api/api/v1/router.py | 4 +-- mpcontribs-api/src/mpcontribs_api/app.py | 36 +++++++++---------- mpcontribs-api/src/mpcontribs_api/auth.py | 2 +- .../src/mpcontribs_api/dependencies.py | 6 ++-- .../mpcontribs_api/domains/_shared/models.py | 2 +- .../domains/_shared/repository.py | 8 ++--- .../domains/contributions/dependencies.py | 4 +-- .../domains/contributions/models.py | 12 +++---- .../domains/contributions/repository.py | 8 ++--- .../domains/contributions/router.py | 6 ++-- .../domains/projects/dependencies.py | 4 +-- .../mpcontribs_api/domains/projects/models.py | 4 +-- .../domains/projects/repository.py | 10 +++--- .../mpcontribs_api/domains/projects/router.py | 6 ++-- mpcontribs-api/src/mpcontribs_api/logging.py | 2 +- .../src/mpcontribs_api/projection.py | 2 +- mpcontribs-api/src/mpcontribs_api/types.py | 2 +- 17 files changed, 57 insertions(+), 61 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/api/v1/router.py b/mpcontribs-api/src/mpcontribs_api/api/v1/router.py index 0204a7ff14..c8cb430867 100644 --- a/mpcontribs-api/src/mpcontribs_api/api/v1/router.py +++ b/mpcontribs-api/src/mpcontribs_api/api/v1/router.py @@ -1,7 +1,7 @@ from fastapi import APIRouter -from src.mpcontribs_api.domains.contributions.router import router as contributions_router -from src.mpcontribs_api.domains.projects.router import router as projects_router +from mpcontribs_api.domains.contributions.router import router as contributions_router +from mpcontribs_api.domains.projects.router import router as projects_router router = APIRouter() diff --git a/mpcontribs-api/src/mpcontribs_api/app.py b/mpcontribs-api/src/mpcontribs_api/app.py index 5f9ac141e2..a0d9fe091d 100644 --- a/mpcontribs-api/src/mpcontribs_api/app.py +++ b/mpcontribs-api/src/mpcontribs_api/app.py @@ -9,37 +9,37 @@ from pymongo import AsyncMongoClient from starlette.middleware.base import BaseHTTPMiddleware -from src.mpcontribs_api.api.v1.router import router as v1_router -from src.mpcontribs_api.config import Settings, get_settings -from src.mpcontribs_api.dependencies import verify_gateway -from src.mpcontribs_api.domains.projects.models import Project -from src.mpcontribs_api.exceptions import register_exception_handlers -from src.mpcontribs_api.logging import configure_logging -from src.mpcontribs_api.middleware import bind_request_context +from mpcontribs_api.api.v1.router import router as v1_router +from mpcontribs_api.config import Settings, get_settings +from mpcontribs_api.dependencies import verify_gateway +from mpcontribs_api.domains.contributions.models import Contribution +from mpcontribs_api.domains.projects.models import Project +from mpcontribs_api.exceptions import register_exception_handlers +from mpcontribs_api.logging import configure_logging +from mpcontribs_api.middleware import bind_request_context logger = logging.getLogger(__name__) -async def _build_lifespan(settings: Settings): +def _build_lifespan(settings: Settings): @asynccontextmanager async def lifespan(app: FastAPI) -> AsyncGenerator[None]: # --- startup --- client = AsyncMongoClient( - str(settings.mongo.uri), + settings.mongo.uri.get_secret_value(), maxPoolSize=settings.mongo.max_pool_size, minPoolSize=settings.mongo.min_pool_size, serverSelectionTimeoutMS=settings.mongo.server_selection_timeout_ms, uuidRepresentation="standard", ) - # Fail fast in prod if the DB is unreachable. Cheap, one round-trip. + # Fail fast if the DB is unreachable. Cheap, one round-trip. await client.admin.command("ping") logger.info("connected to mongo", extra={"db": settings.mongo.db_name}) app.state.mongo_client = client app.state.db = client[settings.mongo.db_name] - # Initialize beanie with document classes and a database - await init_beanie(database=client.db_name, document_models=[Project]) + await init_beanie(database=client[settings.mongo.db_name], document_models=[Project, Contribution]) try: yield @@ -51,28 +51,24 @@ async def lifespan(app: FastAPI) -> AsyncGenerator[None]: return lifespan -async def create_app(settings: Settings | None = None) -> FastAPI: +def create_app(settings: Settings | None = None) -> FastAPI: settings = settings or get_settings() configure_logging(settings) app = FastAPI( title="mpcontribs-api", version=settings.version, - debug=False if settings.environment == "prod" else True, - # Would be nice to implement eventually - # default_response_class=DefaultResponse, - lifespan=await _build_lifespan(settings), + debug=settings.environment != "prod", + lifespan=_build_lifespan(settings), dependencies=[Depends(verify_gateway)], ) - # Add request context to logs app.add_middleware(BaseHTTPMiddleware, dispatch=bind_request_context) - # Bind exception handlers so the app understands how to handle them register_exception_handlers(app) app.include_router(v1_router, prefix="/api/v1") return app -# For `uvicorn mpcontribs_api.app:app`. Tests use create_app() directly. +# For `uvicorn src.mpcontribs_api.app:app` app = create_app() diff --git a/mpcontribs-api/src/mpcontribs_api/auth.py b/mpcontribs-api/src/mpcontribs_api/auth.py index e12b45c75a..bab11f1bb4 100644 --- a/mpcontribs-api/src/mpcontribs_api/auth.py +++ b/mpcontribs-api/src/mpcontribs_api/auth.py @@ -2,7 +2,7 @@ from pydantic import BaseModel, ConfigDict, model_validator -from src.mpcontribs_api.config import get_settings +from mpcontribs_api.config import get_settings settings = get_settings() diff --git a/mpcontribs-api/src/mpcontribs_api/dependencies.py b/mpcontribs-api/src/mpcontribs_api/dependencies.py index ea68181859..9ee67828fd 100644 --- a/mpcontribs-api/src/mpcontribs_api/dependencies.py +++ b/mpcontribs-api/src/mpcontribs_api/dependencies.py @@ -5,9 +5,9 @@ from fastapi import Depends, Header, Request from pymongo.asynchronous.database import AsyncDatabase -from src.mpcontribs_api.auth import User -from src.mpcontribs_api.config import get_settings -from src.mpcontribs_api.exceptions import ( +from mpcontribs_api.auth import User +from mpcontribs_api.config import get_settings +from mpcontribs_api.exceptions import ( AuthenticationError, GatewayError, PermissionError, diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py index 1fec00611b..f3bac721f9 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py @@ -3,7 +3,7 @@ from beanie import DocumentWithSoftDelete from pydantic import Field -from src.mpcontribs_api.projection import SparseFieldsModel +from mpcontribs_api.projection import SparseFieldsModel class BaseDocumentWithInput[TId](DocumentWithSoftDelete): diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py index c5c6395a73..846874f326 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py @@ -4,10 +4,10 @@ from fastapi_filter.contrib.beanie import Filter from pydantic import BaseModel -from src.mpcontribs_api.auth import User -from src.mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut -from src.mpcontribs_api.exceptions import ConflictError -from src.mpcontribs_api.pagination import CursorParams, Page, decode_cursor, encode_cursor +from mpcontribs_api.auth import User +from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut +from mpcontribs_api.exceptions import ConflictError +from mpcontribs_api.pagination import CursorParams, Page, decode_cursor, encode_cursor class MongoDbRepository[TDoc: BaseDocumentWithInput, TIn: BaseModel, TOut: DocumentOut](ABC): diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/dependencies.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/dependencies.py index e02de68368..3227039e95 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/dependencies.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/dependencies.py @@ -2,8 +2,8 @@ from fastapi import Depends -from src.mpcontribs_api.dependencies import UserDep -from src.mpcontribs_api.domains.contributions.repository import ( +from mpcontribs_api.dependencies import UserDep +from mpcontribs_api.domains.contributions.repository import ( MongoDbContributionRepository, ) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py index 9da39c1f4f..1763589c5e 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py @@ -15,12 +15,12 @@ from fastapi_filter.contrib.beanie import Filter from pydantic import Field -from src.mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut -from src.mpcontribs_api.domains.attachments.models import Attachment, AttachmentFilter -from src.mpcontribs_api.domains.structures.models import Structure, StructureFilter -from src.mpcontribs_api.domains.tables.models import Table, TableFilter -from src.mpcontribs_api.projection import SparseFieldsModel -from src.mpcontribs_api.types import ShortStr +from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut +from mpcontribs_api.domains.attachments.models import Attachment, AttachmentFilter +from mpcontribs_api.domains.structures.models import Structure, StructureFilter +from mpcontribs_api.domains.tables.models import Table, TableFilter +from mpcontribs_api.projection import SparseFieldsModel +from mpcontribs_api.types import ShortStr class ContributionBase(BaseDocumentWithInput[PydanticObjectId]): diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py index 29306b3e4e..bff75ebd21 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py @@ -1,15 +1,15 @@ from typing import Any, Literal -from src.mpcontribs_api.auth import User -from src.mpcontribs_api.domains._shared.repository import MongoDbRepository -from src.mpcontribs_api.domains.contributions.models import ( +from mpcontribs_api.auth import User +from mpcontribs_api.domains._shared.repository import MongoDbRepository +from mpcontribs_api.domains.contributions.models import ( Contribution, ContributionFilter, ContributionIn, ContributionOut, ContributionPatch, ) -from src.mpcontribs_api.pagination import CursorParams +from mpcontribs_api.pagination import CursorParams class MongoDbContributionRepository(MongoDbRepository[Contribution, ContributionIn, ContributionOut]): diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py index d2b89b6241..86eab65f98 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py @@ -3,14 +3,14 @@ from fastapi import APIRouter, Depends, Query from fastapi_filter import FilterDepends -from src.mpcontribs_api.domains.contributions.dependencies import ContributionDep -from src.mpcontribs_api.domains.contributions.models import ( +from mpcontribs_api.domains.contributions.dependencies import ContributionDep +from mpcontribs_api.domains.contributions.models import ( ContributionFilter, ContributionIn, ContributionOut, ContributionPatch, ) -from src.mpcontribs_api.pagination import CursorParams +from mpcontribs_api.pagination import CursorParams router = APIRouter() diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/dependencies.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/dependencies.py index 48e257df60..94535cc67d 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/dependencies.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/dependencies.py @@ -2,8 +2,8 @@ from fastapi import Depends -from src.mpcontribs_api.dependencies import UserDep -from src.mpcontribs_api.domains.projects.repository import ( +from mpcontribs_api.dependencies import UserDep +from mpcontribs_api.domains.projects.repository import ( MongoDbProjectRepository, ) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py index 0a1bca7479..90748d400c 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py @@ -5,8 +5,8 @@ from fastapi_filter.contrib.beanie import Filter from pydantic import BaseModel, ConfigDict, Field, HttpUrl -from src.mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut -from src.mpcontribs_api.types import PrefixedEmail, ShortStr +from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut +from mpcontribs_api.types import PrefixedEmail, ShortStr class Column(BaseModel): diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py index 4da3a634a0..7fbdcd91bd 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py @@ -4,17 +4,17 @@ from beanie.operators import Set from pydantic import BaseModel -from src.mpcontribs_api.auth import User -from src.mpcontribs_api.domains._shared.repository import MongoDbRepository -from src.mpcontribs_api.domains.projects.models import ( +from mpcontribs_api.auth import User +from mpcontribs_api.domains._shared.repository import MongoDbRepository +from mpcontribs_api.domains.projects.models import ( Project, ProjectFilter, ProjectIn, ProjectOut, ProjectPatch, ) -from src.mpcontribs_api.exceptions import ConflictError, NotFoundError -from src.mpcontribs_api.pagination import ( +from mpcontribs_api.exceptions import ConflictError, NotFoundError +from mpcontribs_api.pagination import ( CursorParams, ) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py index cc2a24483c..0fd1f4064f 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py @@ -4,14 +4,14 @@ from fastapi_filter import FilterDepends from starlette.status import HTTP_204_NO_CONTENT -from src.mpcontribs_api.domains.projects.dependencies import ProjectDep -from src.mpcontribs_api.domains.projects.models import ( +from mpcontribs_api.domains.projects.dependencies import ProjectDep +from mpcontribs_api.domains.projects.models import ( ProjectFilter, ProjectIn, ProjectOut, ProjectPatch, ) -from src.mpcontribs_api.pagination import CursorParams +from mpcontribs_api.pagination import CursorParams router = APIRouter() diff --git a/mpcontribs-api/src/mpcontribs_api/logging.py b/mpcontribs-api/src/mpcontribs_api/logging.py index e33fc30dd0..ef7f6e6fb8 100644 --- a/mpcontribs-api/src/mpcontribs_api/logging.py +++ b/mpcontribs-api/src/mpcontribs_api/logging.py @@ -4,7 +4,7 @@ import structlog from opentelemetry import trace -from src.mpcontribs_api.config import Settings +from mpcontribs_api.config import Settings def add_otel_trace_context(_, __, event_dict): diff --git a/mpcontribs-api/src/mpcontribs_api/projection.py b/mpcontribs-api/src/mpcontribs_api/projection.py index f09875b9c4..0c24a147da 100644 --- a/mpcontribs-api/src/mpcontribs_api/projection.py +++ b/mpcontribs-api/src/mpcontribs_api/projection.py @@ -24,7 +24,7 @@ from pydantic import BaseModel, create_model from pydantic.fields import FieldInfo -from src.mpcontribs_api.exceptions import ValidationError +from mpcontribs_api.exceptions import ValidationError ModelT = TypeVar("ModelT", bound=BaseModel) diff --git a/mpcontribs-api/src/mpcontribs_api/types.py b/mpcontribs-api/src/mpcontribs_api/types.py index ab5b81af90..e1e189b535 100644 --- a/mpcontribs-api/src/mpcontribs_api/types.py +++ b/mpcontribs-api/src/mpcontribs_api/types.py @@ -3,7 +3,7 @@ from pydantic import BeforeValidator, Field -from src.mpcontribs_api.exceptions import ValidationError +from mpcontribs_api.exceptions import ValidationError ShortStr = Annotated[str, Field(min_length=3, max_length=30)] From d3496abf24cea5d049e1b3c667cbb31d9dd90b4f Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 3 Jun 2026 16:40:26 -0700 Subject: [PATCH 051/591] OpenAPI UI improvement. Added app info and tags to routers --- mpcontribs-api/src/mpcontribs_api/_openapi.py | 44 +++++++++++++++++++ mpcontribs-api/src/mpcontribs_api/app.py | 9 ++++ .../domains/contributions/router.py | 2 +- .../mpcontribs_api/domains/projects/router.py | 2 +- 4 files changed, 55 insertions(+), 2 deletions(-) create mode 100644 mpcontribs-api/src/mpcontribs_api/_openapi.py diff --git a/mpcontribs-api/src/mpcontribs_api/_openapi.py b/mpcontribs-api/src/mpcontribs_api/_openapi.py new file mode 100644 index 0000000000..8a19e24d44 --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/_openapi.py @@ -0,0 +1,44 @@ +openapi_tags = [ + { + "name": "projects", + "description": "contain provenance information about contributed datasets. Deleting projects will also delete" + "all contributions including tables, structures, attachments, notebooks and cards for the project. Only users" + "who have been added to a project can update its contents. While unpublished, only users on the project can" + "retrieve its data or view it on the Portal. Making a project public does not automatically publish all its" + "contributions, tables, attachments, and structures. These are separately set to public individually or in" + "bulk.", + }, + { + "name": "contributions", + "description": "contain simple hierarchical data which will show up as cards on the MP details page for MP" + "material(s). Tables (rows and columns), structures, and attachments can be added to a contribution." + "Each contribution uses `mp-id` or composition as identifier to associate its data with the according entries" + "on MP. Only admins or users on the project can create, update or delete contributions, and while unpublished," + "retrieve its data or view it on the Portal. Contribution components (tables, structures, and attachments) are" + "deleted along with a contribution.", + }, + # TODO: Check that this is the right link + { + "name": "structures", + "description": "are [pymatgen structures](https://pymatgen.org/pymatgen.electronic_structure.html) which can be" + "added to a contribution.", + }, + { + "name": "tables", + "description": "are simple spreadsheet-type tables with columns and rows saved as" + "[Polars DataFrames](https://docs.pola.rs/api/python/stable/reference/dataframe/index.html) which can be added" + "to a contribution.", + }, + { + "name": "attachments", + "description": "are files saved as objects in AWS S3 and not accessible for querying (only retrieval) which can" + "be added to a contribution.", + }, + { + "name": "notebooks", + "description": "are" + "[Jupyter notebook](https://jupyter-notebook.readthedocs.io/en/stable/notebook.html#notebook-documents)" + "documents generated and saved when a contribution is saved. They form the basis for Contribution Details Pages" + "on the Portal.", + }, +] diff --git a/mpcontribs-api/src/mpcontribs_api/app.py b/mpcontribs-api/src/mpcontribs_api/app.py index a0d9fe091d..31b2818215 100644 --- a/mpcontribs-api/src/mpcontribs_api/app.py +++ b/mpcontribs-api/src/mpcontribs_api/app.py @@ -17,6 +17,7 @@ from mpcontribs_api.exceptions import register_exception_handlers from mpcontribs_api.logging import configure_logging from mpcontribs_api.middleware import bind_request_context +from src.mpcontribs_api._openapi import openapi_tags logger = logging.getLogger(__name__) @@ -61,6 +62,14 @@ def create_app(settings: Settings | None = None) -> FastAPI: debug=settings.environment != "prod", lifespan=_build_lifespan(settings), dependencies=[Depends(verify_gateway)], + terms_of_service="https://materialsproject.org/terms", + contact={ + "name": "MPContribs", + "url": "https://mpcontribs.org/", + "email": "contribs@materialsproject.org", + }, + # openapi_url="/api/v1/openapi.json", + openapi_tags=openapi_tags, ) app.add_middleware(BaseHTTPMiddleware, dispatch=bind_request_context) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py index 86eab65f98..9485c7868e 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py @@ -12,7 +12,7 @@ ) from mpcontribs_api.pagination import CursorParams -router = APIRouter() +router = APIRouter(tags=["contributions"]) @router.get("") diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py index 0fd1f4064f..284bec3e30 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py @@ -13,7 +13,7 @@ ) from mpcontribs_api.pagination import CursorParams -router = APIRouter() +router = APIRouter(tags=["projects"]) # Brendan TODO: Add in option to select ProjectSummary or ProjectOut From 4333511f798e7e1e3da988ae139325cc0a24f9a6 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 4 Jun 2026 09:33:50 -0700 Subject: [PATCH 052/591] Moved more openapi info dicts to _openapi --- mpcontribs-api/src/mpcontribs_api/_openapi.py | 11 +++++++++++ mpcontribs-api/src/mpcontribs_api/app.py | 11 ++++------- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/_openapi.py b/mpcontribs-api/src/mpcontribs_api/_openapi.py index 8a19e24d44..4c3c99b5c6 100644 --- a/mpcontribs-api/src/mpcontribs_api/_openapi.py +++ b/mpcontribs-api/src/mpcontribs_api/_openapi.py @@ -42,3 +42,14 @@ "on the Portal.", }, ] + +contact_info = { + "name": "MPContribs", + "url": "https://mpcontribs.org/", + "email": "contribs@materialsproject.org", +} + +license_info = { + "name": "Creative Commons Attribution 4.0 International License", + "url": "https://creativecommons.org/licenses/by/4.0/", +} diff --git a/mpcontribs-api/src/mpcontribs_api/app.py b/mpcontribs-api/src/mpcontribs_api/app.py index 31b2818215..e4edc07444 100644 --- a/mpcontribs-api/src/mpcontribs_api/app.py +++ b/mpcontribs-api/src/mpcontribs_api/app.py @@ -9,6 +9,7 @@ from pymongo import AsyncMongoClient from starlette.middleware.base import BaseHTTPMiddleware +from mpcontribs_api._openapi import contact_info, license_info, openapi_tags from mpcontribs_api.api.v1.router import router as v1_router from mpcontribs_api.config import Settings, get_settings from mpcontribs_api.dependencies import verify_gateway @@ -17,7 +18,6 @@ from mpcontribs_api.exceptions import register_exception_handlers from mpcontribs_api.logging import configure_logging from mpcontribs_api.middleware import bind_request_context -from src.mpcontribs_api._openapi import openapi_tags logger = logging.getLogger(__name__) @@ -58,16 +58,14 @@ def create_app(settings: Settings | None = None) -> FastAPI: app = FastAPI( title="mpcontribs-api", + description="Operations to contribute, update and retrieve materials data on Materials Project", version=settings.version, debug=settings.environment != "prod", lifespan=_build_lifespan(settings), dependencies=[Depends(verify_gateway)], terms_of_service="https://materialsproject.org/terms", - contact={ - "name": "MPContribs", - "url": "https://mpcontribs.org/", - "email": "contribs@materialsproject.org", - }, + license_info=license_info, + contact=contact_info, # openapi_url="/api/v1/openapi.json", openapi_tags=openapi_tags, ) @@ -79,5 +77,4 @@ def create_app(settings: Settings | None = None) -> FastAPI: return app -# For `uvicorn src.mpcontribs_api.app:app` app = create_app() From 2a2d03e8e3bd84372af942f5c5965ff183600834 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 4 Jun 2026 09:34:14 -0700 Subject: [PATCH 053/591] Changed imports so they resolve --- mpcontribs-api/justfile | 4 + mpcontribs-api/pyproject.toml | 4 +- mpcontribs-api/tests/integration/conftest.py | 35 +- .../tests/integration/db/conftest.py | 17 +- .../db/test_projects_repository.py | 12 +- .../tests/integration/test_contributions.py | 6 +- .../tests/integration/test_error_handlers.py | 2 +- .../tests/integration/test_gateway.py | 6 +- .../tests/integration/test_projects.py | 10 +- .../unit/domains/test_contributions_models.py | 2 +- .../unit/domains/test_projects_models.py | 4 +- mpcontribs-api/tests/unit/test_auth.py | 2 +- .../tests/unit/test_dependencies.py | 6 +- mpcontribs-api/tests/unit/test_exceptions.py | 2 +- mpcontribs-api/tests/unit/test_pagination.py | 2 +- mpcontribs-api/tests/unit/test_projection.py | 4 +- mpcontribs-api/tests/unit/test_types.py | 4 +- mpcontribs-api/uv.lock | 437 +++++++++++++++++- 18 files changed, 514 insertions(+), 45 deletions(-) diff --git a/mpcontribs-api/justfile b/mpcontribs-api/justfile index 929f75df5f..afb9e566c1 100644 --- a/mpcontribs-api/justfile +++ b/mpcontribs-api/justfile @@ -1,3 +1,7 @@ +# Run the dev server (auto-reloads on file changes) +dev: + uv run fastapi dev src/mpcontribs_api/app.py + # Format, fix, and lint all source code fmt: uv run ruff format diff --git a/mpcontribs-api/pyproject.toml b/mpcontribs-api/pyproject.toml index 49480c94b3..25417e864f 100644 --- a/mpcontribs-api/pyproject.toml +++ b/mpcontribs-api/pyproject.toml @@ -58,7 +58,7 @@ dependencies = [ "uncertainties", "websocket_client", "zstandard", - "fastapi>=0.136.3", + "fastapi[standard]>=0.136.3", "pymongo>=4.17.0", "pydantic-settings>=2.14.1", "structlog>=25.5.0", @@ -87,7 +87,7 @@ dev = [ ] [tool.pytest.ini_options] -pythonpath = ["."] +pythonpath = ["src"] asyncio_mode = "auto" asyncio_default_fixture_loop_scope = "session" markers = [ diff --git a/mpcontribs-api/tests/integration/conftest.py b/mpcontribs-api/tests/integration/conftest.py index e699ca5663..3404c9d28a 100644 --- a/mpcontribs-api/tests/integration/conftest.py +++ b/mpcontribs-api/tests/integration/conftest.py @@ -13,21 +13,42 @@ """ from contextlib import asynccontextmanager -from unittest.mock import AsyncMock, MagicMock +from unittest.mock import AsyncMock, MagicMock, patch import pytest from fastapi import FastAPI from fastapi.testclient import TestClient from starlette.middleware.base import BaseHTTPMiddleware -from src.mpcontribs_api.exceptions import register_exception_handlers -from src.mpcontribs_api.middleware import bind_request_context +from mpcontribs_api.exceptions import register_exception_handlers +from mpcontribs_api.middleware import bind_request_context + + +@pytest.fixture(autouse=True, scope="session") +def _mock_beanie_collection(): + """Stub Beanie's collection check for mock-based integration tests. + + FastAPI parses request bodies into Beanie Document subclasses (e.g. + ProjectIn), which calls get_pymongo_collection() in __init__. Without a + real init_beanie() these raise CollectionWasNotInitialized. + + The tests/integration/db/ conftest overrides this fixture with a no-op so + DB tests still get the real Beanie collection after init_beanie(). + """ + import beanie + + with patch.object(beanie.Document, "get_pymongo_collection", return_value=MagicMock()): + yield # --------------------------------------------------------------------------- # Header constants used across test modules # --------------------------------------------------------------------------- -GATEWAY_SECRET = "test-gateway-secret" +from mpcontribs_api.config import get_settings + +# Read the real secret from settings (from .env or the root conftest fallback) +# so gateway tests always use whatever the live server will accept. +GATEWAY_SECRET = get_settings().kong.gateway_secret.get_secret_value() GATEWAY_HEADERS = {"x-gateway-secret": GATEWAY_SECRET} ANON_HEADERS: dict[str, str] = {} @@ -67,7 +88,7 @@ async def _noop_lifespan(app: FastAPI): app.add_middleware(BaseHTTPMiddleware, dispatch=bind_request_context) register_exception_handlers(app) - from src.mpcontribs_api.api.v1.router import router as v1_router + from mpcontribs_api.api.v1.router import router as v1_router app.include_router(v1_router, prefix="/api/v1") return app @@ -81,7 +102,7 @@ def make_gateway_app() -> FastAPI: """ from fastapi import Depends - from src.mpcontribs_api.dependencies import verify_gateway + from mpcontribs_api.dependencies import verify_gateway @asynccontextmanager async def _noop_lifespan(app: FastAPI): @@ -96,7 +117,7 @@ async def _noop_lifespan(app: FastAPI): app.add_middleware(BaseHTTPMiddleware, dispatch=bind_request_context) register_exception_handlers(app) - from src.mpcontribs_api.api.v1.router import router as v1_router + from mpcontribs_api.api.v1.router import router as v1_router app.include_router(v1_router, prefix="/api/v1") return app diff --git a/mpcontribs-api/tests/integration/db/conftest.py b/mpcontribs-api/tests/integration/db/conftest.py index d471c60315..419cbd7876 100644 --- a/mpcontribs-api/tests/integration/db/conftest.py +++ b/mpcontribs-api/tests/integration/db/conftest.py @@ -15,9 +15,9 @@ from beanie import init_beanie from pymongo import AsyncMongoClient -from src.mpcontribs_api.config import get_settings -from src.mpcontribs_api.domains.contributions.models import Contribution -from src.mpcontribs_api.domains.projects.models import Project +from mpcontribs_api.config import get_settings +from mpcontribs_api.domains.contributions.models import Contribution +from mpcontribs_api.domains.projects.models import Project # --------------------------------------------------------------------------- # Auto-mark all tests in this directory as @pytest.mark.db @@ -29,6 +29,17 @@ ] +@pytest.fixture(scope="session") +def _mock_beanie_collection(): + """Override the parent integration conftest's Beanie mock. + + DB tests initialise Beanie for real via init_beanie(), so the mock must not + intercept get_pymongo_collection(). Defining this fixture here (same name, + no patch) causes pytest to use this no-op instead of the parent's version. + """ + yield + + def pytest_collection_modifyitems(items): for item in items: if "integration/db" in str(item.fspath): diff --git a/mpcontribs-api/tests/integration/db/test_projects_repository.py b/mpcontribs-api/tests/integration/db/test_projects_repository.py index 2d68568804..a37877621b 100644 --- a/mpcontribs-api/tests/integration/db/test_projects_repository.py +++ b/mpcontribs-api/tests/integration/db/test_projects_repository.py @@ -1,10 +1,10 @@ import pytest -from src.mpcontribs_api.auth import User -from src.mpcontribs_api.domains.projects.models import Project, ProjectIn, ProjectOut, ProjectPatch, Stats -from src.mpcontribs_api.domains.projects.repository import MongoDbProjectRepository -from src.mpcontribs_api.exceptions import ConflictError, NotFoundError -from src.mpcontribs_api.pagination import CursorParams +from mpcontribs_api.auth import User +from mpcontribs_api.domains.projects.models import Project, ProjectIn, ProjectOut, ProjectPatch, Stats +from mpcontribs_api.domains.projects.repository import MongoDbProjectRepository +from mpcontribs_api.exceptions import ConflictError, NotFoundError +from mpcontribs_api.pagination import CursorParams """Database integration tests for MongoDbProjectRepository. @@ -122,7 +122,7 @@ async def test_authenticated_sees_own_and_public(self, db): def _noop_filter(): - from src.mpcontribs_api.domains.projects.models import ProjectFilter + from mpcontribs_api.domains.projects.models import ProjectFilter return ProjectFilter() diff --git a/mpcontribs-api/tests/integration/test_contributions.py b/mpcontribs-api/tests/integration/test_contributions.py index 9d5074e7ab..8deb915059 100644 --- a/mpcontribs-api/tests/integration/test_contributions.py +++ b/mpcontribs-api/tests/integration/test_contributions.py @@ -7,9 +7,9 @@ import pytest -from src.mpcontribs_api.domains.contributions.dependencies import get_scoped_contributions -from src.mpcontribs_api.domains.contributions.models import ContributionOut -from src.mpcontribs_api.pagination import Page +from mpcontribs_api.domains.contributions.dependencies import get_scoped_contributions +from mpcontribs_api.domains.contributions.models import ContributionOut +from mpcontribs_api.pagination import Page from tests.integration.conftest import ANON_HEADERS, AUTHED_HEADERS # --------------------------------------------------------------------------- diff --git a/mpcontribs-api/tests/integration/test_error_handlers.py b/mpcontribs-api/tests/integration/test_error_handlers.py index 246452a23b..63d83f09be 100644 --- a/mpcontribs-api/tests/integration/test_error_handlers.py +++ b/mpcontribs-api/tests/integration/test_error_handlers.py @@ -9,7 +9,7 @@ from fastapi import FastAPI from fastapi.testclient import TestClient -from src.mpcontribs_api.exceptions import ( +from mpcontribs_api.exceptions import ( AuthenticationError, ConflictError, NotFoundError, diff --git a/mpcontribs-api/tests/integration/test_gateway.py b/mpcontribs-api/tests/integration/test_gateway.py index 0a8a4ce16e..b43b372268 100644 --- a/mpcontribs-api/tests/integration/test_gateway.py +++ b/mpcontribs-api/tests/integration/test_gateway.py @@ -14,9 +14,9 @@ import pytest -from src.mpcontribs_api.domains.contributions.dependencies import get_scoped_contributions -from src.mpcontribs_api.domains.projects.dependencies import get_scoped_projects -from src.mpcontribs_api.pagination import Page +from mpcontribs_api.domains.contributions.dependencies import get_scoped_contributions +from mpcontribs_api.domains.projects.dependencies import get_scoped_projects +from mpcontribs_api.pagination import Page from tests.integration.conftest import GATEWAY_SECRET diff --git a/mpcontribs-api/tests/integration/test_projects.py b/mpcontribs-api/tests/integration/test_projects.py index 7042ca82bb..c40ef19b2f 100644 --- a/mpcontribs-api/tests/integration/test_projects.py +++ b/mpcontribs-api/tests/integration/test_projects.py @@ -11,10 +11,10 @@ import pytest -from src.mpcontribs_api.domains.projects.dependencies import get_scoped_projects -from src.mpcontribs_api.domains.projects.models import ProjectOut, Stats -from src.mpcontribs_api.exceptions import ConflictError, NotFoundError -from src.mpcontribs_api.pagination import Page +from mpcontribs_api.domains.projects.dependencies import get_scoped_projects +from mpcontribs_api.domains.projects.models import ProjectOut, Stats +from mpcontribs_api.exceptions import ConflictError, NotFoundError +from mpcontribs_api.pagination import Page from tests.integration.conftest import ANON_HEADERS, AUTHED_HEADERS # --------------------------------------------------------------------------- @@ -71,7 +71,7 @@ def test_items_returned_in_response(self, client, project_repo): assert len(body["items"]) == 1 def test_next_cursor_set_when_more_pages(self, client, project_repo): - from src.mpcontribs_api.pagination import encode_cursor + from mpcontribs_api.pagination import encode_cursor cursor = encode_cursor("mp-sample") project_repo.get_project.return_value = Page(items=[SAMPLE_PROJECT], next_cursor=cursor) diff --git a/mpcontribs-api/tests/unit/domains/test_contributions_models.py b/mpcontribs-api/tests/unit/domains/test_contributions_models.py index c00c7fe8d1..9b08da5121 100644 --- a/mpcontribs-api/tests/unit/domains/test_contributions_models.py +++ b/mpcontribs-api/tests/unit/domains/test_contributions_models.py @@ -4,7 +4,7 @@ from beanie import PydanticObjectId from pydantic import ValidationError as PydanticValidationError -from src.mpcontribs_api.domains.contributions.models import ( +from mpcontribs_api.domains.contributions.models import ( Contribution, ContributionIn, ContributionOut, diff --git a/mpcontribs-api/tests/unit/domains/test_projects_models.py b/mpcontribs-api/tests/unit/domains/test_projects_models.py index 63d5252925..66984c0067 100644 --- a/mpcontribs-api/tests/unit/domains/test_projects_models.py +++ b/mpcontribs-api/tests/unit/domains/test_projects_models.py @@ -1,7 +1,7 @@ import pytest from pydantic import ValidationError as PydanticValidationError -from src.mpcontribs_api.domains.projects.models import ( +from mpcontribs_api.domains.projects.models import ( Column, Project, ProjectIn, @@ -145,7 +145,7 @@ def test_parse_fields_multiple_fields(self): assert "is_public" in result def test_parse_fields_unknown_raises(self): - from src.mpcontribs_api.exceptions import ValidationError as AppValidationError + from mpcontribs_api.exceptions import ValidationError as AppValidationError with pytest.raises(AppValidationError): ProjectOut.parse_fields("nonexistent_field") diff --git a/mpcontribs-api/tests/unit/test_auth.py b/mpcontribs-api/tests/unit/test_auth.py index 99cdbdb008..ee14b1a6be 100644 --- a/mpcontribs-api/tests/unit/test_auth.py +++ b/mpcontribs-api/tests/unit/test_auth.py @@ -1,6 +1,6 @@ import pytest -from src.mpcontribs_api.auth import ADMIN_GROUP, User +from mpcontribs_api.auth import ADMIN_GROUP, User class TestUserIsAnonymous: diff --git a/mpcontribs-api/tests/unit/test_dependencies.py b/mpcontribs-api/tests/unit/test_dependencies.py index 93eb0b27ad..af8c03bf13 100644 --- a/mpcontribs-api/tests/unit/test_dependencies.py +++ b/mpcontribs-api/tests/unit/test_dependencies.py @@ -2,9 +2,9 @@ import pytest -from src.mpcontribs_api.auth import User -from src.mpcontribs_api.dependencies import _split, get_user, require_user -from src.mpcontribs_api.exceptions import AuthenticationError +from mpcontribs_api.auth import User +from mpcontribs_api.dependencies import _split, get_user, require_user +from mpcontribs_api.exceptions import AuthenticationError # --------------------------------------------------------------------------- # _split diff --git a/mpcontribs-api/tests/unit/test_exceptions.py b/mpcontribs-api/tests/unit/test_exceptions.py index 552bf7778e..77d085f102 100644 --- a/mpcontribs-api/tests/unit/test_exceptions.py +++ b/mpcontribs-api/tests/unit/test_exceptions.py @@ -1,6 +1,6 @@ import pytest -from src.mpcontribs_api.exceptions import ( +from mpcontribs_api.exceptions import ( AppError, AuthenticationError, ConflictError, diff --git a/mpcontribs-api/tests/unit/test_pagination.py b/mpcontribs-api/tests/unit/test_pagination.py index 78dc41f732..f3456e82ae 100644 --- a/mpcontribs-api/tests/unit/test_pagination.py +++ b/mpcontribs-api/tests/unit/test_pagination.py @@ -3,7 +3,7 @@ import pytest from pydantic import ValidationError as PydanticValidationError -from src.mpcontribs_api.pagination import ( +from mpcontribs_api.pagination import ( CursorParams, Page, decode_cursor, diff --git a/mpcontribs-api/tests/unit/test_projection.py b/mpcontribs-api/tests/unit/test_projection.py index 3889ce682f..c003af591f 100644 --- a/mpcontribs-api/tests/unit/test_projection.py +++ b/mpcontribs-api/tests/unit/test_projection.py @@ -3,8 +3,8 @@ import pytest from pydantic import BaseModel, Field -from src.mpcontribs_api.exceptions import ValidationError as AppValidationError -from src.mpcontribs_api.projection import ( +from mpcontribs_api.exceptions import ValidationError as AppValidationError +from mpcontribs_api.projection import ( SparseFieldsModel, _classify, _collapse, diff --git a/mpcontribs-api/tests/unit/test_types.py b/mpcontribs-api/tests/unit/test_types.py index 3925b9af29..64b0102cdd 100644 --- a/mpcontribs-api/tests/unit/test_types.py +++ b/mpcontribs-api/tests/unit/test_types.py @@ -2,8 +2,8 @@ from pydantic import BaseModel from pydantic import ValidationError as PydanticValidationError -from src.mpcontribs_api.exceptions import ValidationError as AppValidationError -from src.mpcontribs_api.types import PrefixedEmail, ShortStr, _validate_prefixed_email +from mpcontribs_api.exceptions import ValidationError as AppValidationError +from mpcontribs_api.types import PrefixedEmail, ShortStr, _validate_prefixed_email class ShortStrModel(BaseModel): diff --git a/mpcontribs-api/uv.lock b/mpcontribs-api/uv.lock index f5cba271a7..32a4220bac 100644 --- a/mpcontribs-api/uv.lock +++ b/mpcontribs-api/uv.lock @@ -650,6 +650,15 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/07/6c/aa3f2f849e01cb6a001cd8554a88d4c77c5c1a31c95bdf1cf9301e6d9ef4/defusedxml-0.7.1-py2.py3-none-any.whl", hash = "sha256:a352e7e428770286cc899e2542b6cdaedb2b4953ff269a210103ec58f6198a61", size = 25604, upload-time = "2021-03-08T10:59:24.45Z" }, ] +[[package]] +name = "detect-installer" +version = "0.1.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/5f/ce/6897d812825e9d4c53e3c7112726e800cc5231b013b2223bf64f653ff362/detect_installer-0.1.0.tar.gz", hash = "sha256:00ad7ba0a36e3cf7d08a40d3643011746dbc112597c7d475cc91c416710ca4e7", size = 3049, upload-time = "2026-02-23T10:40:22.567Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/cc/34/8cc73273414405086c58852916e4031812a6a30fe04c057e37ad99397b7f/detect_installer-0.1.0-py3-none-any.whl", hash = "sha256:034fb20fd665c36e6ba52b8821525ea07fb4f7f938cac459df889fb33801528a", size = 4539, upload-time = "2026-02-23T10:40:23.807Z" }, +] + [[package]] name = "dnspython" version = "2.8.0" @@ -659,6 +668,19 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/ba/5a/18ad964b0086c6e62e2e7500f7edc89e3faa45033c71c1893d34eed2b2de/dnspython-2.8.0-py3-none-any.whl", hash = "sha256:01d9bbc4a2d76bf0db7c1f729812ded6d912bd318d3b1cf81d30c0f845dbf3af", size = 331094, upload-time = "2025-09-07T18:57:58.071Z" }, ] +[[package]] +name = "email-validator" +version = "2.3.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "dnspython" }, + { name = "idna" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/f5/22/900cb125c76b7aaa450ce02fd727f452243f2e91a61af068b40adba60ea9/email_validator-2.3.0.tar.gz", hash = "sha256:9fc05c37f2f6cf439ff414f8fc46d917929974a82244c20eb10231ba60c54426", size = 51238, upload-time = "2025-08-26T13:09:06.831Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/de/15/545e2b6cf2e3be84bc1ed85613edd75b8aea69807a71c26f4ca6a9258e82/email_validator-2.3.0-py3-none-any.whl", hash = "sha256:80f13f623413e6b197ae73bb10bf4eb0908faf509ad8362c5edeb0be7fd450b4", size = 35604, upload-time = "2025-08-26T13:09:05.858Z" }, +] + [[package]] name = "entrypoints" version = "0.4" @@ -711,6 +733,59 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/e0/82/45359b62a067409bd929ae8a56b8ed13e5a8c8a61194b3c236920999ab83/fastapi-0.136.3-py3-none-any.whl", hash = "sha256:3d2a69bdf04b7e9f3afa292c3bc7a98816bbfafa10bc9b45f3f3700d2f761620", size = 117481, upload-time = "2026-05-23T18:53:16.924Z" }, ] +[package.optional-dependencies] +standard = [ + { name = "email-validator" }, + { name = "fastapi-cli", extra = ["standard"] }, + { name = "fastar" }, + { name = "httpx" }, + { name = "jinja2" }, + { name = "pydantic-extra-types" }, + { name = "pydantic-settings" }, + { name = "python-multipart" }, + { name = "uvicorn", extra = ["standard"] }, +] + +[[package]] +name = "fastapi-cli" +version = "0.0.24" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "rich-toolkit" }, + { name = "typer" }, + { name = "uvicorn", extra = ["standard"] }, +] +sdist = { url = "https://files.pythonhosted.org/packages/6e/58/74797ae9e4610cfa0c6b34c8309096d3b20bb29be3b8b5fbf1004d10fa5f/fastapi_cli-0.0.24.tar.gz", hash = "sha256:1afc9c9e21d7ebc8a3ca5e31790cd8d837742be7e4f8b9236e99cb3451f0de00", size = 19043, upload-time = "2026-02-24T10:45:10.476Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/c7/4b/68f9fe268e535d79c76910519530026a4f994ce07189ac0dded45c6af825/fastapi_cli-0.0.24-py3-none-any.whl", hash = "sha256:4a1f78ed798f106b4fee85ca93b85d8fe33c0a3570f775964d37edb80b8f0edc", size = 12304, upload-time = "2026-02-24T10:45:09.552Z" }, +] + +[package.optional-dependencies] +standard = [ + { name = "fastapi-cloud-cli" }, + { name = "uvicorn", extra = ["standard"] }, +] + +[[package]] +name = "fastapi-cloud-cli" +version = "0.19.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "detect-installer" }, + { name = "fastar" }, + { name = "httpx" }, + { name = "pydantic", extra = ["email"] }, + { name = "rich-toolkit" }, + { name = "rignore" }, + { name = "sentry-sdk" }, + { name = "typer" }, + { name = "uvicorn", extra = ["standard"] }, +] +sdist = { url = "https://files.pythonhosted.org/packages/a7/7c/f194925af8fabdb0b7a886a1b89087c0b7f327f99e79497a882aa94c1e34/fastapi_cloud_cli-0.19.0.tar.gz", hash = "sha256:f97b31c2ad6af3832eb4065870bdca3365b6e827a0ccf6eeb15e477bc1662b13", size = 57476, upload-time = "2026-06-01T08:24:03.407Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/bf/e6/1a2ec890fc273b9da2b173ca45f692a2e24a369bdd39ea7812c1d8a799e5/fastapi_cloud_cli-0.19.0-py3-none-any.whl", hash = "sha256:a2dfc4074c321e63ec88589cc1f90573d4b5bf980ddc44a7033e6f3cd8e96628", size = 38239, upload-time = "2026-06-01T08:24:02.437Z" }, +] + [[package]] name = "fastapi-filter" version = "2.0.1" @@ -724,6 +799,46 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/5e/88/afc022ad64d12f730141fc50758ecf9d60de5fed11335dc16e3127617f05/fastapi_filter-2.0.1-py3-none-any.whl", hash = "sha256:711d48707ec62f7c9e12a7713fc0f6a99858a9e3741b4d108102d5599e77197d", size = 11586, upload-time = "2024-12-07T17:30:05.375Z" }, ] +[[package]] +name = "fastar" +version = "0.11.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/03/0f/0aeb3fc50046617702acc0078b277b58367fd62eb727b9ec733ae0e8bbcc/fastar-0.11.0.tar.gz", hash = "sha256:aa7f100f7313c03fdb20f1385927ba95671071ba308ad0c1763fef295e1895ce", size = 70238, upload-time = "2026-04-13T17:11:17.143Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/7a/cd/3644c48ecac456f928c12d47ec3bed36c36555b17c3859856f1ff860265d/fastar-0.11.0-cp314-cp314-macosx_10_12_x86_64.whl", hash = "sha256:71375bd6f03c2a43eb47bd949ea38ff45434917f9cdac79675c5b9f60de4fa73", size = 707860, upload-time = "2026-04-13T17:10:00.371Z" }, + { url = "https://files.pythonhosted.org/packages/69/ca/dee04476ae3626b2b040a60ad84628f77e1ffd8444232f2426b0ca1e0d7e/fastar-0.11.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:eddfd9cab16e19ae247fe44bf992cb403ccfe27d3931d6de29a4695d95ad386c", size = 628216, upload-time = "2026-04-13T17:09:45.355Z" }, + { url = "https://files.pythonhosted.org/packages/dc/5e/9395c7353d079cb4f5be0f7982ce0dc9f2e7dec5fd175eef466729d6023a/fastar-0.11.0-cp314-cp314-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:7c371f1d4386c699018bb64eb2fa785feacf32785559049d2bb72fe4af023f53", size = 864378, upload-time = "2026-04-13T17:09:14.611Z" }, + { url = "https://files.pythonhosted.org/packages/fa/ba/1e4f67148223ff219612b6281a6000357abbcc2417964fa5c83f11d68fce/fastar-0.11.0-cp314-cp314-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cad7fa41e3e66554387481c1a09365e4638becd322904932674159d5f4046728", size = 760921, upload-time = "2026-04-13T17:07:59.138Z" }, + { url = "https://files.pythonhosted.org/packages/0f/82/09d11fb6d12f17993ffaf32ffd30c3c121a11e2966e84f19fb6f66430118/fastar-0.11.0-cp314-cp314-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:cf36652fa71b83761717c9899b98732498f8a2cb6327ff16bbf07f6be85c3437", size = 757012, upload-time = "2026-04-13T17:08:14.186Z" }, + { url = "https://files.pythonhosted.org/packages/52/1f/5aeeacc4cb65615e2c9292cd9c5b0cd6fb6d2e6ee472ca6adc6c1b1b22ef/fastar-0.11.0-cp314-cp314-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:f68ff8c17833053da4841720e95edde80ce45bb994b6b7d51418dddaac70ee47", size = 924510, upload-time = "2026-04-13T17:08:28.741Z" }, + { url = "https://files.pythonhosted.org/packages/bb/1a/1e5bdabbeaf2e856928956292609f2ff6a650f94480fb8afaca30229e483/fastar-0.11.0-cp314-cp314-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:4563ed37a12ea1cdc398af8571258d24b988bf342b7b3bf5451bd5891243280c", size = 816602, upload-time = "2026-04-13T17:08:59.461Z" }, + { url = "https://files.pythonhosted.org/packages/87/24/f960147910da3bed41a3adfcb026e17d5f50f4cf467a3324237a7088f61a/fastar-0.11.0-cp314-cp314-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:cee63c9875cba3b70dc44338c560facc5d6e763047dcc4a30501f9a68cf5f890", size = 819452, upload-time = "2026-04-13T17:09:29.926Z" }, + { url = "https://files.pythonhosted.org/packages/cc/f4/3e77d7901d5707fd7f8a352e153c8ae09ea974e6fabad0b7c4eb9944b8d4/fastar-0.11.0-cp314-cp314-manylinux_2_31_riscv64.whl", hash = "sha256:bd76bfffae6d0a91f4ac4a612f721e7aec108db97dccdd120ae063cd66959f27", size = 885254, upload-time = "2026-04-13T17:08:44.285Z" }, + { url = "https://files.pythonhosted.org/packages/47/01/1585edd5ec47782ae93cd94edf05828e0ab02ef00aec00aea4194a600464/fastar-0.11.0-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:8f5b707501ec01c1bc0518f741f01d322e50c9adc19a451aa24f67a2316e9397", size = 971496, upload-time = "2026-04-13T17:10:17.024Z" }, + { url = "https://files.pythonhosted.org/packages/f1/e9/6874c9d1236ded565a0bed54b320ac9f165f287b1d89490fb70f9f323c81/fastar-0.11.0-cp314-cp314-musllinux_1_2_armv7l.whl", hash = "sha256:37c0b5a88a657839aad98b0a6c9e4ac4c2c15d6b49c44ee3935c6b08e9d3e479", size = 1034685, upload-time = "2026-04-13T17:10:34.063Z" }, + { url = "https://files.pythonhosted.org/packages/14/d8/4ab20613ce2983427aee958e39be878dba874aa227c530a845e32429c4f6/fastar-0.11.0-cp314-cp314-musllinux_1_2_i686.whl", hash = "sha256:6c55f536c62a6efb180c1af0d5182948bff576bbfe6276e8e1359c9c7d2215d8", size = 1072675, upload-time = "2026-04-13T17:10:50.53Z" }, + { url = "https://files.pythonhosted.org/packages/1f/ae/5ac3b7c20ce4b08f011dd2b979f96caabe64f9b10b157f211ea91bdfadca/fastar-0.11.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:3082eeca59e189b9039335862f4c2780c0c8871d656bfdf559db4414a105b251", size = 1029330, upload-time = "2026-04-13T17:11:08.138Z" }, + { url = "https://files.pythonhosted.org/packages/8a/e7/37cd6a1d4e288292170b64e19d79ecce2a7de8bb76790323399a2abc4619/fastar-0.11.0-cp314-cp314-win32.whl", hash = "sha256:b201a0a4e29f9fec2a177e13154b8725ec65ab9f83bd6415483efaa2aa18344b", size = 453940, upload-time = "2026-04-13T17:11:48.713Z" }, + { url = "https://files.pythonhosted.org/packages/ff/1c/795c878b1ee29d79021cf8ed81f18f2b25ccde58453b0d34b9bdc7e025ea/fastar-0.11.0-cp314-cp314-win_amd64.whl", hash = "sha256:868fddb26072a43e870a8819134b9f80ee602931be5a76e6fb873e04da343637", size = 486334, upload-time = "2026-04-13T17:11:34.882Z" }, + { url = "https://files.pythonhosted.org/packages/ff/a4/113f104301df8bddcc0b3775b611a30cb7610baa3add933c7ccac9386467/fastar-0.11.0-cp314-cp314-win_arm64.whl", hash = "sha256:3db39c9cc42abb0c780a26b299f24dfbc8be455985e969e15336d70d7b2f833b", size = 461534, upload-time = "2026-04-13T17:11:24.329Z" }, + { url = "https://files.pythonhosted.org/packages/5a/a6/5c5f2c2c8e0c63e56a5636ebc7721589c889e94c0092cec7eb28ae7207e6/fastar-0.11.0-cp314-cp314t-macosx_10_12_x86_64.whl", hash = "sha256:49c3299dec5e125e7ebaa27545714da9c7391777366015427e0ae62d548b442b", size = 707156, upload-time = "2026-04-13T17:10:02.176Z" }, + { url = "https://files.pythonhosted.org/packages/df/f7/982c01b61f0fc135ad2b16d01e6d0ee53cf8791e68827f5f7c5a65b2e5b1/fastar-0.11.0-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:3328ed1ed56d31f5198350b17dd60449b8d6b9d47abb4688bab6aef4450a165b", size = 627032, upload-time = "2026-04-13T17:09:46.978Z" }, + { url = "https://files.pythonhosted.org/packages/2b/c3/38f1dac77ae0c71c37b176277c96d830796b8ce2fe69705f917829b53829/fastar-0.11.0-cp314-cp314t-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:bd3eca3bbfec84a614bcb4143b4ad4f784d0895babc26cfc88436af88ca23c7a", size = 864403, upload-time = "2026-04-13T17:09:16.58Z" }, + { url = "https://files.pythonhosted.org/packages/6e/f0/e69c363bdb3e5a5848e937b662b5469581ee6682c51bc1c0556494773929/fastar-0.11.0-cp314-cp314t-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ff86a967acb0d621dd24063dda090daa67bf4993b9570e97fe156de88a9006ca", size = 759480, upload-time = "2026-04-13T17:08:00.599Z" }, + { url = "https://files.pythonhosted.org/packages/3b/29/4d8737590c2a6357d614d7cc7288e8f68e7e449680b8922997cc4349e65e/fastar-0.11.0-cp314-cp314t-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:86eaf7c0e985d93a7734168be2fb232b2a8cca53e41431c2782d7c12b12c03b1", size = 756219, upload-time = "2026-04-13T17:08:15.699Z" }, + { url = "https://files.pythonhosted.org/packages/bb/ec/400de7b3b7d48801908f19cf5462177104395799472671b3e8152b2b04ca/fastar-0.11.0-cp314-cp314t-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:91f07b0b8eb67e2f177733a1f884edad7dfb9f8977ffef15927b20cb9604027d", size = 923669, upload-time = "2026-04-13T17:08:30.574Z" }, + { url = "https://files.pythonhosted.org/packages/5d/01/8926c53da923fed7ab4b96e7fbf7f73b663beb4f02095b654d6fab46f9ad/fastar-0.11.0-cp314-cp314t-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f85c896885eb4abf1a635d54dea22cac6ae48d04fc2ea26ae652fcf1febe1220", size = 815729, upload-time = "2026-04-13T17:09:01.204Z" }, + { url = "https://files.pythonhosted.org/packages/89/f0/5fef4c7946e352651b504b1a4235dac3505e7cfd24020788ab50552e84bf/fastar-0.11.0-cp314-cp314t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:075c07095c8de4b774ba8f28b9c0a02b1a2cd254da50cbe464dd3bb2432e9158", size = 819812, upload-time = "2026-04-13T17:09:31.907Z" }, + { url = "https://files.pythonhosted.org/packages/b3/c8/0ebc3298b4a45e7bddc50b169ae6a6f5b80c939394d4befe6e60de535ee7/fastar-0.11.0-cp314-cp314t-manylinux_2_31_riscv64.whl", hash = "sha256:07f028933820c65750baf3383b807ecce1cd9385cf00ce192b79d263ad6b856c", size = 884074, upload-time = "2026-04-13T17:08:45.802Z" }, + { url = "https://files.pythonhosted.org/packages/ae/9f/7baa4cdff8d6fbca41fa5c764b48a941fed8a9ec6c4cc92de65895a28299/fastar-0.11.0-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:039f875efa0f01fa43c20bf4e2fc7305489c61d0ac76eda991acfba7820a0e63", size = 969450, upload-time = "2026-04-13T17:10:18.667Z" }, + { url = "https://files.pythonhosted.org/packages/d4/dc/1ebbfb58a47056ba866494f19efbcdd2ba2897096b94f36e796594b4d05b/fastar-0.11.0-cp314-cp314t-musllinux_1_2_armv7l.whl", hash = "sha256:fff12452a9a5c6814a012445f26365541cc3d99dcca61f09762e6a389f7a32ea", size = 1033775, upload-time = "2026-04-13T17:10:36.165Z" }, + { url = "https://files.pythonhosted.org/packages/c2/5f/ce4e3914066f08c99eb8c32952cc07c1a013e81b1db1b0f598130bf6b974/fastar-0.11.0-cp314-cp314t-musllinux_1_2_i686.whl", hash = "sha256:2bf733e09f942b6fa876efe30a90508d1f4caef5630c00fb2a84fba355873712", size = 1072158, upload-time = "2026-04-13T17:10:52.497Z" }, + { url = "https://files.pythonhosted.org/packages/03/2a/6bca72992c84151c387cc6558f3867f5ebe5fb3684ee6fa9b76280ba4b8e/fastar-0.11.0-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:d1531fa848fdd3677d2dce0a4b436ea64d9ae38fb8babe2ddbc180dd153cb7a3", size = 1028577, upload-time = "2026-04-13T17:11:09.934Z" }, + { url = "https://files.pythonhosted.org/packages/83/18/7a7c15657a3da5569b26fc51cde6a80f8d84cb54b3b1aea6d74a103db4ad/fastar-0.11.0-cp314-cp314t-win32.whl", hash = "sha256:5744551bc67c6fc6581cbd0e34a0fd6e2cd0bd30b43e94b1c3119cf35064b162", size = 453601, upload-time = "2026-04-13T17:11:53.726Z" }, + { url = "https://files.pythonhosted.org/packages/6d/d8/331b59a6de279f3ad75c10c02c40a12f21d64a437d9c3d6f1af2dcbd7a76/fastar-0.11.0-cp314-cp314t-win_amd64.whl", hash = "sha256:f4ce44e3b56c47cf38244b98d29f269b259740a580c47a2552efa5b96a5458fb", size = 486436, upload-time = "2026-04-13T17:11:40.089Z" }, + { url = "https://files.pythonhosted.org/packages/6b/fd/5390ec4f49100f3ecb9968a392f9e6d039f1e3fe0ecd28443716ff01e589/fastar-0.11.0-cp314-cp314t-win_arm64.whl", hash = "sha256:76c1359314355eafbc6989f20fb1ad565a3d10200117923b9da765a17e2f6f11", size = 461049, upload-time = "2026-04-13T17:11:25.918Z" }, +] + [[package]] name = "fastjsonschema" version = "2.21.2" @@ -1088,6 +1203,19 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/04/4b/29cac41a4d98d144bf5f6d33995617b185d14b22401f75ca86f384e87ff1/h11-0.16.0-py3-none-any.whl", hash = "sha256:63cf8bbe7522de3bf65932fda1d9c2772064ffb3dae62d55932da54b31cb6c86", size = 37515, upload-time = "2025-04-24T03:35:24.344Z" }, ] +[[package]] +name = "httpcore" +version = "1.0.9" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "certifi" }, + { name = "h11" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/06/94/82699a10bca87a5556c9c59b5963f2d039dbd239f25bc2a63907a05a14cb/httpcore-1.0.9.tar.gz", hash = "sha256:6e34463af53fd2ab5d807f399a9b45ea31c3dfa2276f15a2c3f00afff6e176e8", size = 85484, upload-time = "2025-04-24T22:06:22.219Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/7e/f5/f66802a942d491edb555dd61e3a9961140fd64c90bce1eafd741609d334d/httpcore-1.0.9-py3-none-any.whl", hash = "sha256:2d400746a40668fc9dec9810239072b40b4484b640a8c38fd654a024c7a1bf55", size = 78784, upload-time = "2025-04-24T22:06:20.566Z" }, +] + [[package]] name = "httpcore2" version = "2.3.0" @@ -1101,6 +1229,43 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/c2/dd/3357218c69360d1cecc196c230c9a1d5c9afd5dba362056e23e60a5e64e5/httpcore2-2.3.0-py3-none-any.whl", hash = "sha256:477e9e334f74e5240dcac002e890580f36a57d40ff0fb14cc9655731d23b8415", size = 80024, upload-time = "2026-06-01T13:15:00.001Z" }, ] +[[package]] +name = "httptools" +version = "0.8.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/43/e5/d471fcb0e14523fe1c3f4ba58ca52480e7bd70ad7109a3846bc75892f7fb/httptools-0.8.0.tar.gz", hash = "sha256:6b2a32f18d97e16e90827d7a819ffa8dbd8cc245fc4e1fa9d1095b54ef4bd999", size = 271342, upload-time = "2026-05-25T22:17:48.841Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/1a/12/fa3fbf5f9517b273edea2dc982aa82a8c634091e67c590792b729017bc6f/httptools-0.8.0-cp314-cp314-macosx_10_13_universal2.whl", hash = "sha256:de242a49b5d18e0a8776e654e9f6bf6d89f3875a5c35b425a0e7ce940feb3fd6", size = 206183, upload-time = "2026-05-25T22:17:24.004Z" }, + { url = "https://files.pythonhosted.org/packages/30/fc/5e7c4cb443370f2090a3aba0453a07384d29ff66b7435bb90e77e1037599/httptools-0.8.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:159e9ab5f701ccd42e555a12f1ad8ff69702910fc1c996cf2bb66e5fcb7a231b", size = 112079, upload-time = "2026-05-25T22:17:25.216Z" }, + { url = "https://files.pythonhosted.org/packages/ba/53/771bd891eb0f236f32145d6a1775777ec85745f3cc983a1f23d1a3b8ddfe/httptools-0.8.0-cp314-cp314-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:c4a9f1707e4823d54dfec6c33fa3697d302aed536ed352a7ebb5a061ddb869d0", size = 481596, upload-time = "2026-05-25T22:17:26.186Z" }, + { url = "https://files.pythonhosted.org/packages/62/42/94e15bc68ce3d423243c45d7f1b0c7561f13844f97dc52ae23182fb65628/httptools-0.8.0-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:d76ad7b951387e3632c8716a9bb03ac5b45c5f16119aa409db0459520887944e", size = 480865, upload-time = "2026-05-25T22:17:27.542Z" }, + { url = "https://files.pythonhosted.org/packages/1c/7c/fe2980fc03723272e30f135b62360b075f513dfe7cc73aef36c7f04012bd/httptools-0.8.0-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:a3b7387147361c3fd47a0bde763c5c91b5b4cd4dc9989b8ece84ff436c99843b", size = 463189, upload-time = "2026-05-25T22:17:28.546Z" }, + { url = "https://files.pythonhosted.org/packages/15/1b/47fc5fff68acd1bfa20b4734059c9a06cadb88119dcd5258b5b0d21d91c8/httptools-0.8.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:f256d6ce930c52ca1cb2a960b7da03548c454e7d28b06059ad41bfe789036ce0", size = 466610, upload-time = "2026-05-25T22:17:29.816Z" }, + { url = "https://files.pythonhosted.org/packages/60/bd/07b13c93ffd9bec9546e0d43f8e19378dd696dbd278511406bc07371ef1f/httptools-0.8.0-cp314-cp314-win_amd64.whl", hash = "sha256:19d1ee275bb59ba2643ba9a3a1e51cc0c788caf2b8df506368e03f56fdd08527", size = 92705, upload-time = "2026-05-25T22:17:31.133Z" }, + { url = "https://files.pythonhosted.org/packages/fd/c4/121648f68ce066d7bd762d6b6d97e620847642d38d54f3d90ff11d947629/httptools-0.8.0-cp314-cp314t-macosx_10_13_universal2.whl", hash = "sha256:de1ed58a974e75d56560acc7e7fed01a454994429456f65209789992e41f2568", size = 215023, upload-time = "2026-05-25T22:17:32.401Z" }, + { url = "https://files.pythonhosted.org/packages/b9/b0/312a062ae741ae3e8baa8c8bf20be81b2e67337b259ab4349bebc7b6142e/httptools-0.8.0-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:e93c227b595c6926c1acee96891dd9da4be338cfbe82e5cd3bb9d8dd7dc4ac0b", size = 117405, upload-time = "2026-05-25T22:17:33.742Z" }, + { url = "https://files.pythonhosted.org/packages/fc/37/fccd705f795386bb05bf413012fecff2a33e5aa8c2f069096de3e9fd8702/httptools-0.8.0-cp314-cp314t-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:2a021c3a8e65cc125390d72f59b968afca3bdcaff25bd67965e0a055a14946ca", size = 558497, upload-time = "2026-05-25T22:17:34.732Z" }, + { url = "https://files.pythonhosted.org/packages/bd/39/f172e8003576de35f5ba77ff417cf0e34429d35dc014deef15afa337a72c/httptools-0.8.0-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:48774d39cbb70e2b1f71f88852a3087ae1d3a1eb80482bb48c13067ab080c14f", size = 571585, upload-time = "2026-05-25T22:17:35.813Z" }, + { url = "https://files.pythonhosted.org/packages/3e/b9/f5564760af99f3dbbf3f9104dc00e5da27e96cf433c6bdcf77617f70bf3f/httptools-0.8.0-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:88eead8ec8680a9f146c655bc88445a325bd7921cfd8194c7337e9467282427d", size = 543297, upload-time = "2026-05-25T22:17:37.08Z" }, + { url = "https://files.pythonhosted.org/packages/99/67/8d9f2c313618e161b82f3873188e7196126da1d6e29688df40eb3997c77a/httptools-0.8.0-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:2c032fa028f46871ec7e1fc59fc15e8023eab3e6bbe6ece786a1611719a5d081", size = 539535, upload-time = "2026-05-25T22:17:38.032Z" }, + { url = "https://files.pythonhosted.org/packages/48/63/b906c01e53f50d432c0defe43ce52764a111dc1bdd028bafbeb54dcfd008/httptools-0.8.0-cp314-cp314t-win_amd64.whl", hash = "sha256:384c17174464c8e873398b7af24f0b1f44d992c820328413951a625323155d77", size = 108209, upload-time = "2026-05-25T22:17:39.473Z" }, +] + +[[package]] +name = "httpx" +version = "0.28.1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "anyio" }, + { name = "certifi" }, + { name = "httpcore" }, + { name = "idna" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/b1/df/48c586a5fe32a0f01324ee087459e112ebb7224f646c0b5023f5e79e9956/httpx-0.28.1.tar.gz", hash = "sha256:75e98c5f16b0f35b567856f597f06ff2270a374470a5c2392242528e3e3e42fc", size = 141406, upload-time = "2024-12-06T15:37:23.222Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/2a/39/e50c7c3a983047577ee07d2a9e53faf5a69493943ec3f6a384bdc792deb2/httpx-0.28.1-py3-none-any.whl", hash = "sha256:d909fcccc110f8c7faf814ca82a9a4d816bc5a6dbfea25d6591d6985b8ba59ad", size = 73517, upload-time = "2024-12-06T15:37:21.509Z" }, +] + [[package]] name = "httpx2" version = "2.3.0" @@ -1523,6 +1688,18 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/7f/2c/0f1e93c636720e8a3eb59af2bfda99d98b55891e1c53bc30c2e0e865f01b/lxml-6.1.1-cp314-cp314t-win_arm64.whl", hash = "sha256:58bb955caba94e467d2a96da17660d2d704e0675894cba21ab8a775b8621fd1c", size = 3817223, upload-time = "2026-05-19T19:22:56.823Z" }, ] +[[package]] +name = "markdown-it-py" +version = "4.2.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "mdurl" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/06/ff/7841249c247aa650a76b9ee4bbaeae59370dc8bfd2f6c01f3630c35eb134/markdown_it_py-4.2.0.tar.gz", hash = "sha256:04a21681d6fbb623de53f6f364d352309d4094dd4194040a10fd51833e418d49", size = 82454, upload-time = "2026-05-07T12:08:28.36Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/b3/81/4da04ced5a082363ecfa159c010d200ecbd959ae410c10c0264a38cac0f5/markdown_it_py-4.2.0-py3-none-any.whl", hash = "sha256:9f7ebbcd14fe59494226453aed97c1070d83f8d24b6fc3a3bcf9a38092641c4a", size = 91687, upload-time = "2026-05-07T12:08:27.182Z" }, +] + [[package]] name = "markupsafe" version = "3.0.3" @@ -1623,6 +1800,15 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/41/09/5b161152e2d90f7b87f781c2e1267494aef9c32498df793f73ad0a0a494a/matplotlib_inline-0.2.2-py3-none-any.whl", hash = "sha256:3c821cf1c209f59fb2d2d64abbf5b23b67bcb2210d663f9918dd851c6da1fcf6", size = 9534, upload-time = "2026-05-08T17:33:32.055Z" }, ] +[[package]] +name = "mdurl" +version = "0.1.2" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/d6/54/cfe61301667036ec958cb99bd3efefba235e65cdeb9c84d24a8293ba1d90/mdurl-0.1.2.tar.gz", hash = "sha256:bb413d29f5eea38f31dd4754dd7377d4465116fb207585f97bf925588687c1ba", size = 8729, upload-time = "2022-08-14T12:40:10.846Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/b3/38/89ba8ad64ae25be8de66a6d463314cf1eb366222074cfda9ee839c56a4b4/mdurl-0.1.2-py3-none-any.whl", hash = "sha256:84008a41e51615a49fc9966191ff91509e3c40b939176e643fd50a5c2196b8f8", size = 9979, upload-time = "2022-08-14T12:40:09.779Z" }, +] + [[package]] name = "mimerender-pr36" version = "0.0.2" @@ -1691,7 +1877,7 @@ dependencies = [ { name = "dateparser" }, { name = "ddtrace" }, { name = "dnspython" }, - { name = "fastapi" }, + { name = "fastapi", extra = ["standard"] }, { name = "fastapi-filter" }, { name = "filetype" }, { name = "flasgger-tschaume" }, @@ -1750,7 +1936,7 @@ requires-dist = [ { name = "dateparser" }, { name = "ddtrace", specifier = "==4.3.0" }, { name = "dnspython" }, - { name = "fastapi", specifier = ">=0.136.3" }, + { name = "fastapi", extras = ["standard"], specifier = ">=0.136.3" }, { name = "fastapi-filter", specifier = ">=2.0.1" }, { name = "filetype" }, { name = "flasgger-tschaume", specifier = ">=0.9.7" }, @@ -2437,6 +2623,11 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/fd/7b/122376b1fd3c62c1ed9dc80c931ace4844b3c55407b6fb2d199377c9736f/pydantic-2.13.4-py3-none-any.whl", hash = "sha256:45a282cde31d808236fd7ea9d919b128653c8b38b393d1c4ab335c62924d9aba", size = 472262, upload-time = "2026-05-06T13:43:02.641Z" }, ] +[package.optional-dependencies] +email = [ + { name = "email-validator" }, +] + [[package]] name = "pydantic-core" version = "2.46.4" @@ -2478,6 +2669,19 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/f6/d2/42dd53d0a85c27606f316d3aa5d2869c4e8470a5ed6dec30e4a1abe19192/pydantic_core-2.46.4-cp314-cp314t-win_arm64.whl", hash = "sha256:4fcbe087dbc2068af7eda3aa87634eba216dbda64d1ae73c8684b621d33f6596", size = 2017325, upload-time = "2026-05-06T13:40:52.723Z" }, ] +[[package]] +name = "pydantic-extra-types" +version = "2.11.1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "pydantic" }, + { name = "typing-extensions" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/66/71/dba38ee2651f84f7842206adbd2233d8bbdb59fb85e9fa14232486a8c471/pydantic_extra_types-2.11.1.tar.gz", hash = "sha256:46792d2307383859e923d8fcefa82108b1a141f8a9c0198982b3832ab5ef1049", size = 172002, upload-time = "2026-03-16T08:08:03.92Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/17/c1/3226e6d7f5a4f736f38ac11a6fbb262d701889802595cdb0f53a885ac2e0/pydantic_extra_types-2.11.1-py3-none-any.whl", hash = "sha256:1722ea2bddae5628ace25f2aa685b69978ef533123e5638cfbddb999e0100ec1", size = 79526, upload-time = "2026-03-16T08:08:02.533Z" }, +] + [[package]] name = "pydantic-settings" version = "2.14.1" @@ -2687,6 +2891,15 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/65/d9/1093a9d6d22d04d433003c96b9b1d46741b43fee5b11ece5098297737fce/python_mimeparse-2.0.0-py3-none-any.whl", hash = "sha256:574062a06f2e1d416535c8d3b83ccc6ebe95941e74e2c5939fc010a12e37cc09", size = 5576, upload-time = "2024-08-25T13:38:13.372Z" }, ] +[[package]] +name = "python-multipart" +version = "0.0.30" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/4b/82/c8cd43a6e0719bf5a3b034f6726dd701f75829c08944c83d4b95d02ed0e8/python_multipart-0.0.30.tar.gz", hash = "sha256:0edfe0475c1f46ddd3ff7785a626f6118af32bdcf359bb21260367313bb32118", size = 46316, upload-time = "2026-05-31T19:24:55.198Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/1c/fd/0318007beb234790993d3ec5afd051d1dbceb733e81e3afe2b981ece3f37/python_multipart-0.0.30-py3-none-any.whl", hash = "sha256:830964def8c90607ac5daa00514e3987815865713ade8d20febc9177ac0c3c5b", size = 29730, upload-time = "2026-05-31T19:24:53.814Z" }, +] + [[package]] name = "python-snappy" version = "0.7.3" @@ -2887,6 +3100,71 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/7e/71/44ce230e1b7fadd372515a97e32a83011f906ddded8d03e3c6aafbdedbb7/rfc3987_syntax-1.1.0-py3-none-any.whl", hash = "sha256:6c3d97604e4c5ce9f714898e05401a0445a641cfa276432b0a648c80856f6a3f", size = 8046, upload-time = "2025-07-18T01:05:03.843Z" }, ] +[[package]] +name = "rich" +version = "15.0.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "markdown-it-py" }, + { name = "pygments" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/c0/8f/0722ca900cc807c13a6a0c696dacf35430f72e0ec571c4275d2371fca3e9/rich-15.0.0.tar.gz", hash = "sha256:edd07a4824c6b40189fb7ac9bc4c52536e9780fbbfbddf6f1e2502c31b068c36", size = 230680, upload-time = "2026-04-12T08:24:00.75Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/82/3b/64d4899d73f91ba49a8c18a8ff3f0ea8f1c1d75481760df8c68ef5235bf5/rich-15.0.0-py3-none-any.whl", hash = "sha256:33bd4ef74232fb73fe9279a257718407f169c09b78a87ad3d296f548e27de0bb", size = 310654, upload-time = "2026-04-12T08:24:02.83Z" }, +] + +[[package]] +name = "rich-toolkit" +version = "0.20.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "click" }, + { name = "rich" }, + { name = "typing-extensions" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/c3/49/d7a4fd4f39c195b73f78694af3e812943a4181a8d48a11035425d0f6d71f/rich_toolkit-0.20.0.tar.gz", hash = "sha256:bb05382554d4f46865dfca2fccccf30768ef37e0347207d00f034d9b36b25021", size = 203144, upload-time = "2026-06-02T21:11:38.48Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/67/b5/6b6efd9e305653fae68ed0b712bc659cd3c5541ec54416e6bb14af52acca/rich_toolkit-0.20.0-py3-none-any.whl", hash = "sha256:906e5b8741fafc46159c5f719fd30fd3c9dd8f2c31b8161dc8c612f98b8da01a", size = 35379, upload-time = "2026-06-02T21:11:37.564Z" }, +] + +[[package]] +name = "rignore" +version = "0.7.6" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/e5/f5/8bed2310abe4ae04b67a38374a4d311dd85220f5d8da56f47ae9361be0b0/rignore-0.7.6.tar.gz", hash = "sha256:00d3546cd793c30cb17921ce674d2c8f3a4b00501cb0e3dd0e82217dbeba2671", size = 57140, upload-time = "2025-11-05T21:41:21.968Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/9a/b9/1f5bd82b87e5550cd843ceb3768b4a8ef274eb63f29333cf2f29644b3d75/rignore-0.7.6-cp314-cp314-macosx_10_12_x86_64.whl", hash = "sha256:8e41be9fa8f2f47239ded8920cc283699a052ac4c371f77f5ac017ebeed75732", size = 882632, upload-time = "2025-11-05T20:42:44.063Z" }, + { url = "https://files.pythonhosted.org/packages/e9/6b/07714a3efe4a8048864e8a5b7db311ba51b921e15268b17defaebf56d3db/rignore-0.7.6-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:6dc1e171e52cefa6c20e60c05394a71165663b48bca6c7666dee4f778f2a7d90", size = 820760, upload-time = "2025-11-05T20:42:27.885Z" }, + { url = "https://files.pythonhosted.org/packages/ac/0f/348c829ea2d8d596e856371b14b9092f8a5dfbb62674ec9b3f67e4939a9d/rignore-0.7.6-cp314-cp314-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0ce2268837c3600f82ab8db58f5834009dc638ee17103582960da668963bebc5", size = 899044, upload-time = "2025-11-05T20:40:55.336Z" }, + { url = "https://files.pythonhosted.org/packages/f0/30/2e1841a19b4dd23878d73edd5d82e998a83d5ed9570a89675f140ca8b2ad/rignore-0.7.6-cp314-cp314-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:690a3e1b54bfe77e89c4bacb13f046e642f8baadafc61d68f5a726f324a76ab6", size = 874144, upload-time = "2025-11-05T20:41:10.195Z" }, + { url = "https://files.pythonhosted.org/packages/c2/bf/0ce9beb2e5f64c30e3580bef09f5829236889f01511a125f98b83169b993/rignore-0.7.6-cp314-cp314-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:09d12ac7a0b6210c07bcd145007117ebd8abe99c8eeb383e9e4673910c2754b2", size = 1168062, upload-time = "2025-11-05T20:41:26.511Z" }, + { url = "https://files.pythonhosted.org/packages/b9/8b/571c178414eb4014969865317da8a02ce4cf5241a41676ef91a59aab24de/rignore-0.7.6-cp314-cp314-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2a2b2b74a8c60203b08452479b90e5ce3dbe96a916214bc9eb2e5af0b6a9beb0", size = 942542, upload-time = "2025-11-05T20:41:41.838Z" }, + { url = "https://files.pythonhosted.org/packages/19/62/7a3cf601d5a45137a7e2b89d10c05b5b86499190c4b7ca5c3c47d79ee519/rignore-0.7.6-cp314-cp314-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8fc5a531ef02131e44359419a366bfac57f773ea58f5278c2cdd915f7d10ea94", size = 958739, upload-time = "2025-11-05T20:42:12.463Z" }, + { url = "https://files.pythonhosted.org/packages/5f/1f/4261f6a0d7caf2058a5cde2f5045f565ab91aa7badc972b57d19ce58b14e/rignore-0.7.6-cp314-cp314-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:b7a1f77d9c4cd7e76229e252614d963442686bfe12c787a49f4fe481df49e7a9", size = 984138, upload-time = "2025-11-05T20:41:56.775Z" }, + { url = "https://files.pythonhosted.org/packages/2b/bf/628dfe19c75e8ce1f45f7c248f5148b17dfa89a817f8e3552ab74c3ae812/rignore-0.7.6-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:ead81f728682ba72b5b1c3d5846b011d3e0174da978de87c61645f2ed36659a7", size = 1079299, upload-time = "2025-11-05T21:40:16.639Z" }, + { url = "https://files.pythonhosted.org/packages/af/a5/be29c50f5c0c25c637ed32db8758fdf5b901a99e08b608971cda8afb293b/rignore-0.7.6-cp314-cp314-musllinux_1_2_armv7l.whl", hash = "sha256:12ffd50f520c22ffdabed8cd8bfb567d9ac165b2b854d3e679f4bcaef11a9441", size = 1139618, upload-time = "2025-11-05T21:40:34.507Z" }, + { url = "https://files.pythonhosted.org/packages/2a/40/3c46cd7ce4fa05c20b525fd60f599165e820af66e66f2c371cd50644558f/rignore-0.7.6-cp314-cp314-musllinux_1_2_i686.whl", hash = "sha256:e5a16890fbe3c894f8ca34b0fcacc2c200398d4d46ae654e03bc9b3dbf2a0a72", size = 1117626, upload-time = "2025-11-05T21:40:51.494Z" }, + { url = "https://files.pythonhosted.org/packages/8c/b9/aea926f263b8a29a23c75c2e0d8447965eb1879d3feb53cfcf84db67ed58/rignore-0.7.6-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:3abab3bf99e8a77488ef6c7c9a799fac22224c28fe9f25cc21aa7cc2b72bfc0b", size = 1128144, upload-time = "2025-11-05T21:41:09.169Z" }, + { url = "https://files.pythonhosted.org/packages/a4/f6/0d6242f8d0df7f2ecbe91679fefc1f75e7cd2072cb4f497abaab3f0f8523/rignore-0.7.6-cp314-cp314-win32.whl", hash = "sha256:eeef421c1782953c4375aa32f06ecae470c1285c6381eee2a30d2e02a5633001", size = 646385, upload-time = "2025-11-05T21:41:55.105Z" }, + { url = "https://files.pythonhosted.org/packages/d5/38/c0dcd7b10064f084343d6af26fe9414e46e9619c5f3224b5272e8e5d9956/rignore-0.7.6-cp314-cp314-win_amd64.whl", hash = "sha256:6aeed503b3b3d5af939b21d72a82521701a4bd3b89cd761da1e7dc78621af304", size = 725738, upload-time = "2025-11-05T21:41:39.736Z" }, + { url = "https://files.pythonhosted.org/packages/d9/7a/290f868296c1ece914d565757ab363b04730a728b544beb567ceb3b2d96f/rignore-0.7.6-cp314-cp314-win_arm64.whl", hash = "sha256:104f215b60b3c984c386c3e747d6ab4376d5656478694e22c7bd2f788ddd8304", size = 656008, upload-time = "2025-11-05T21:41:29.028Z" }, + { url = "https://files.pythonhosted.org/packages/ca/d2/3c74e3cd81fe8ea08a8dcd2d755c09ac2e8ad8fe409508904557b58383d3/rignore-0.7.6-cp314-cp314t-macosx_10_12_x86_64.whl", hash = "sha256:bb24a5b947656dd94cb9e41c4bc8b23cec0c435b58be0d74a874f63c259549e8", size = 882835, upload-time = "2025-11-05T20:42:45.443Z" }, + { url = "https://files.pythonhosted.org/packages/77/61/a772a34b6b63154877433ac2d048364815b24c2dd308f76b212c408101a2/rignore-0.7.6-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:5b1e33c9501cefe24b70a1eafd9821acfd0ebf0b35c3a379430a14df089993e3", size = 820301, upload-time = "2025-11-05T20:42:29.226Z" }, + { url = "https://files.pythonhosted.org/packages/71/30/054880b09c0b1b61d17eeb15279d8bf729c0ba52b36c3ada52fb827cbb3c/rignore-0.7.6-cp314-cp314t-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:bec3994665a44454df86deb762061e05cd4b61e3772f5b07d1882a8a0d2748d5", size = 897611, upload-time = "2025-11-05T20:40:56.475Z" }, + { url = "https://files.pythonhosted.org/packages/1e/40/b2d1c169f833d69931bf232600eaa3c7998ba4f9a402e43a822dad2ea9f2/rignore-0.7.6-cp314-cp314t-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:26cba2edfe3cff1dfa72bddf65d316ddebf182f011f2f61538705d6dbaf54986", size = 873875, upload-time = "2025-11-05T20:41:11.561Z" }, + { url = "https://files.pythonhosted.org/packages/55/59/ca5ae93d83a1a60e44b21d87deb48b177a8db1b85e82fc8a9abb24a8986d/rignore-0.7.6-cp314-cp314t-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ffa86694fec604c613696cb91e43892aa22e1fec5f9870e48f111c603e5ec4e9", size = 1167245, upload-time = "2025-11-05T20:41:28.29Z" }, + { url = "https://files.pythonhosted.org/packages/a5/52/cf3dce392ba2af806cba265aad6bcd9c48bb2a6cb5eee448d3319f6e505b/rignore-0.7.6-cp314-cp314t-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:48efe2ed95aa8104145004afb15cdfa02bea5cdde8b0344afeb0434f0d989aa2", size = 941750, upload-time = "2025-11-05T20:41:43.111Z" }, + { url = "https://files.pythonhosted.org/packages/ec/be/3f344c6218d779395e785091d05396dfd8b625f6aafbe502746fcd880af2/rignore-0.7.6-cp314-cp314t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8dcae43eb44b7f2457fef7cc87f103f9a0013017a6f4e62182c565e924948f21", size = 958896, upload-time = "2025-11-05T20:42:13.784Z" }, + { url = "https://files.pythonhosted.org/packages/c9/34/d3fa71938aed7d00dcad87f0f9bcb02ad66c85d6ffc83ba31078ce53646a/rignore-0.7.6-cp314-cp314t-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:2cd649a7091c0dad2f11ef65630d30c698d505cbe8660dd395268e7c099cc99f", size = 983992, upload-time = "2025-11-05T20:41:58.022Z" }, + { url = "https://files.pythonhosted.org/packages/24/a4/52a697158e9920705bdbd0748d59fa63e0f3233fb92e9df9a71afbead6ca/rignore-0.7.6-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:42de84b0289d478d30ceb7ae59023f7b0527786a9a5b490830e080f0e4ea5aeb", size = 1078181, upload-time = "2025-11-05T21:40:18.151Z" }, + { url = "https://files.pythonhosted.org/packages/ac/65/aa76dbcdabf3787a6f0fd61b5cc8ed1e88580590556d6c0207960d2384bb/rignore-0.7.6-cp314-cp314t-musllinux_1_2_armv7l.whl", hash = "sha256:875a617e57b53b4acbc5a91de418233849711c02e29cc1f4f9febb2f928af013", size = 1139232, upload-time = "2025-11-05T21:40:35.966Z" }, + { url = "https://files.pythonhosted.org/packages/08/44/31b31a49b3233c6842acc1c0731aa1e7fb322a7170612acf30327f700b44/rignore-0.7.6-cp314-cp314t-musllinux_1_2_i686.whl", hash = "sha256:8703998902771e96e49968105207719f22926e4431b108450f3f430b4e268b7c", size = 1117349, upload-time = "2025-11-05T21:40:53.013Z" }, + { url = "https://files.pythonhosted.org/packages/e9/ae/1b199a2302c19c658cf74e5ee1427605234e8c91787cfba0015f2ace145b/rignore-0.7.6-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:602ef33f3e1b04c1e9a10a3c03f8bc3cef2d2383dcc250d309be42b49923cabc", size = 1127702, upload-time = "2025-11-05T21:41:10.881Z" }, + { url = "https://files.pythonhosted.org/packages/fc/d3/18210222b37e87e36357f7b300b7d98c6dd62b133771e71ae27acba83a4f/rignore-0.7.6-cp314-cp314t-win32.whl", hash = "sha256:c1d8f117f7da0a4a96a8daef3da75bc090e3792d30b8b12cfadc240c631353f9", size = 647033, upload-time = "2025-11-05T21:42:00.095Z" }, + { url = "https://files.pythonhosted.org/packages/3e/87/033eebfbee3ec7d92b3bb1717d8f68c88e6fc7de54537040f3b3a405726f/rignore-0.7.6-cp314-cp314t-win_amd64.whl", hash = "sha256:ca36e59408bec81de75d307c568c2d0d410fb880b1769be43611472c61e85c96", size = 725647, upload-time = "2025-11-05T21:41:44.449Z" }, + { url = "https://files.pythonhosted.org/packages/79/62/b88e5879512c55b8ee979c666ee6902adc4ed05007226de266410ae27965/rignore-0.7.6-cp314-cp314t-win_arm64.whl", hash = "sha256:b83adabeb3e8cf662cabe1931b83e165b88c526fa6af6b3aa90429686e474896", size = 656035, upload-time = "2025-11-05T21:41:31.13Z" }, +] + [[package]] name = "rpds-py" version = "2026.5.1" @@ -3067,6 +3345,19 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/1c/78/504fdd027da3b84ff1aecd9f6957e65f35134534ccc6da8628eb71e76d3f/send2trash-2.1.0-py3-none-any.whl", hash = "sha256:0da2f112e6d6bb22de6aa6daa7e144831a4febf2a87261451c4ad849fe9a873c", size = 17610, upload-time = "2026-01-14T06:27:35.218Z" }, ] +[[package]] +name = "sentry-sdk" +version = "2.61.1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "certifi" }, + { name = "urllib3" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/63/3b/4bc6b348bbd331daa14d4babe9f2b99bc854f4da41560eefb9488d78481d/sentry_sdk-2.61.1.tar.gz", hash = "sha256:9c6adccb3feefa9ba032c8d295ca477575c2f11896046a2b0ad686c47c4af555", size = 459429, upload-time = "2026-06-01T07:24:18.875Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/df/54/c9218db183846e08efaf68534889ef42e499dde432778881104a42f7071b/sentry_sdk-2.61.1-py3-none-any.whl", hash = "sha256:fa36eaf4b8ad708f718500d4bdcc1532637526a22beb874d88cbc0a46458b5ae", size = 483735, upload-time = "2026-06-01T07:24:17.027Z" }, +] + [[package]] name = "setproctitle" version = "1.3.7" @@ -3095,6 +3386,15 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/08/b6/3a5a4f9952972791a9114ac01dfc123f0df79903577a3e0a7a404a695586/setproctitle-1.3.7-cp314-cp314t-win_amd64.whl", hash = "sha256:cbc388e3d86da1f766d8fc2e12682e446064c01cea9f88a88647cfe7c011de6a", size = 13469, upload-time = "2025-09-05T12:50:42.67Z" }, ] +[[package]] +name = "shellingham" +version = "1.5.4" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/58/15/8b3609fd3830ef7b27b655beb4b4e9c62313a4e8da8c676e142cc210d58e/shellingham-1.5.4.tar.gz", hash = "sha256:8dbca0739d487e5bd35ab3ca4b36e11c4078f3a234bfce294b0a0291363404de", size = 10310, upload-time = "2023-10-24T04:13:40.426Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/e0/f9/0595336914c5619e5f28a1fb793285925a8cd4b432c9da0a987836c7f822/shellingham-1.5.4-py2.py3-none-any.whl", hash = "sha256:7ecfff8f2fd72616f7481040475a65b2bf8af90a56c89140852d1120324e8686", size = 9755, upload-time = "2023-10-24T04:13:38.866Z" }, +] + [[package]] name = "six" version = "1.17.0" @@ -3271,6 +3571,21 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/19/97/56608b2249fe206a67cd573bc93cd9896e1efb9e98bce9c163bcdc704b88/truststore-0.10.4-py3-none-any.whl", hash = "sha256:adaeaecf1cbb5f4de3b1959b42d41f6fab57b2b1666adb59e89cb0b53361d981", size = 18660, upload-time = "2025-08-12T18:49:01.46Z" }, ] +[[package]] +name = "typer" +version = "0.26.7" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "annotated-doc" }, + { name = "colorama", marker = "sys_platform == 'win32'" }, + { name = "rich" }, + { name = "shellingham" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/5e/ed/ef06584ccdd5c410df0837951ecd7e15d9a6144ea1bd4c73cecab1a89891/typer-0.26.7.tar.gz", hash = "sha256:e314a34c617e419c091b2830dda3ea1f257134ff593061a8f5b9717ab8dddb3a", size = 201709, upload-time = "2026-06-03T07:18:06.843Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/24/25/2201973529af2c954de0bb725323c3aaed6d7f0ceee8f550dec9185df013/typer-0.26.7-py3-none-any.whl", hash = "sha256:5c87cfbc5d34491c5346ebf49c23e18d56ccb863268d3a8d592b26087c2f5e58", size = 122456, upload-time = "2026-06-03T07:18:05.732Z" }, +] + [[package]] name = "typing-extensions" version = "4.15.0" @@ -3340,6 +3655,97 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/7f/3e/5db95bcf282c52709639744ca2a8b149baccf648e39c8cc87553df9eae0c/urllib3-2.7.0-py3-none-any.whl", hash = "sha256:9fb4c81ebbb1ce9531cce37674bbc6f1360472bc18ca9a553ede278ef7276897", size = 131087, upload-time = "2026-05-07T16:13:17.151Z" }, ] +[[package]] +name = "uvicorn" +version = "0.49.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "click" }, + { name = "h11" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/c4/1f/fa18009dea8469069cca78a4e877a008ab78f08b064bfc9ab891579077ff/uvicorn-0.49.0.tar.gz", hash = "sha256:ebf4271aa580d9de97f93192d4595176df6e91f9aae919ca73e4fc07df1e66a3", size = 91284, upload-time = "2026-06-03T22:01:30.448Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/88/fa/e1388bbcf24ef3274f45c0c1c7b501fd14971037c1b6ee23610553307497/uvicorn-0.49.0-py3-none-any.whl", hash = "sha256:ba3d14c3ee7e41c6c654c46c9eb489d33213cdd30aa1696eab1374337c13f68f", size = 71376, upload-time = "2026-06-03T22:01:29.037Z" }, +] + +[package.optional-dependencies] +standard = [ + { name = "colorama", marker = "sys_platform == 'win32'" }, + { name = "httptools" }, + { name = "python-dotenv" }, + { name = "pyyaml" }, + { name = "uvloop", marker = "platform_python_implementation != 'PyPy' and sys_platform != 'cygwin' and sys_platform != 'win32'" }, + { name = "watchfiles" }, + { name = "websockets" }, +] + +[[package]] +name = "uvloop" +version = "0.22.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/06/f0/18d39dbd1971d6d62c4629cc7fa67f74821b0dc1f5a77af43719de7936a7/uvloop-0.22.1.tar.gz", hash = "sha256:6c84bae345b9147082b17371e3dd5d42775bddce91f885499017f4607fdaf39f", size = 2443250, upload-time = "2025-10-16T22:17:19.342Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/90/cd/b62bdeaa429758aee8de8b00ac0dd26593a9de93d302bff3d21439e9791d/uvloop-0.22.1-cp314-cp314-macosx_10_13_universal2.whl", hash = "sha256:3879b88423ec7e97cd4eba2a443aa26ed4e59b45e6b76aabf13fe2f27023a142", size = 1362067, upload-time = "2025-10-16T22:16:44.503Z" }, + { url = "https://files.pythonhosted.org/packages/0d/f8/a132124dfda0777e489ca86732e85e69afcd1ff7686647000050ba670689/uvloop-0.22.1-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:4baa86acedf1d62115c1dc6ad1e17134476688f08c6efd8a2ab076e815665c74", size = 752423, upload-time = "2025-10-16T22:16:45.968Z" }, + { url = "https://files.pythonhosted.org/packages/a3/94/94af78c156f88da4b3a733773ad5ba0b164393e357cc4bd0ab2e2677a7d6/uvloop-0.22.1-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:297c27d8003520596236bdb2335e6b3f649480bd09e00d1e3a99144b691d2a35", size = 4272437, upload-time = "2025-10-16T22:16:47.451Z" }, + { url = "https://files.pythonhosted.org/packages/b5/35/60249e9fd07b32c665192cec7af29e06c7cd96fa1d08b84f012a56a0b38e/uvloop-0.22.1-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:c1955d5a1dd43198244d47664a5858082a3239766a839b2102a269aaff7a4e25", size = 4292101, upload-time = "2025-10-16T22:16:49.318Z" }, + { url = "https://files.pythonhosted.org/packages/02/62/67d382dfcb25d0a98ce73c11ed1a6fba5037a1a1d533dcbb7cab033a2636/uvloop-0.22.1-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:b31dc2fccbd42adc73bc4e7cdbae4fc5086cf378979e53ca5d0301838c5682c6", size = 4114158, upload-time = "2025-10-16T22:16:50.517Z" }, + { url = "https://files.pythonhosted.org/packages/f0/7a/f1171b4a882a5d13c8b7576f348acfe6074d72eaf52cccef752f748d4a9f/uvloop-0.22.1-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:93f617675b2d03af4e72a5333ef89450dfaa5321303ede6e67ba9c9d26878079", size = 4177360, upload-time = "2025-10-16T22:16:52.646Z" }, + { url = "https://files.pythonhosted.org/packages/79/7b/b01414f31546caf0919da80ad57cbfe24c56b151d12af68cee1b04922ca8/uvloop-0.22.1-cp314-cp314t-macosx_10_13_universal2.whl", hash = "sha256:37554f70528f60cad66945b885eb01f1bb514f132d92b6eeed1c90fd54ed6289", size = 1454790, upload-time = "2025-10-16T22:16:54.355Z" }, + { url = "https://files.pythonhosted.org/packages/d4/31/0bb232318dd838cad3fa8fb0c68c8b40e1145b32025581975e18b11fab40/uvloop-0.22.1-cp314-cp314t-macosx_10_13_x86_64.whl", hash = "sha256:b76324e2dc033a0b2f435f33eb88ff9913c156ef78e153fb210e03c13da746b3", size = 796783, upload-time = "2025-10-16T22:16:55.906Z" }, + { url = "https://files.pythonhosted.org/packages/42/38/c9b09f3271a7a723a5de69f8e237ab8e7803183131bc57c890db0b6bb872/uvloop-0.22.1-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:badb4d8e58ee08dad957002027830d5c3b06aea446a6a3744483c2b3b745345c", size = 4647548, upload-time = "2025-10-16T22:16:57.008Z" }, + { url = "https://files.pythonhosted.org/packages/c1/37/945b4ca0ac27e3dc4952642d4c900edd030b3da6c9634875af6e13ae80e5/uvloop-0.22.1-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:b91328c72635f6f9e0282e4a57da7470c7350ab1c9f48546c0f2866205349d21", size = 4467065, upload-time = "2025-10-16T22:16:58.206Z" }, + { url = "https://files.pythonhosted.org/packages/97/cc/48d232f33d60e2e2e0b42f4e73455b146b76ebe216487e862700457fbf3c/uvloop-0.22.1-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:daf620c2995d193449393d6c62131b3fbd40a63bf7b307a1527856ace637fe88", size = 4328384, upload-time = "2025-10-16T22:16:59.36Z" }, + { url = "https://files.pythonhosted.org/packages/e4/16/c1fd27e9549f3c4baf1dc9c20c456cd2f822dbf8de9f463824b0c0357e06/uvloop-0.22.1-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:6cde23eeda1a25c75b2e07d39970f3374105d5eafbaab2a4482be82f272d5a5e", size = 4296730, upload-time = "2025-10-16T22:17:00.744Z" }, +] + +[[package]] +name = "watchfiles" +version = "1.2.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "anyio" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/cd/41/5e1a4bb12aac5f1493fa1bdc11154eca3b258ca4eba65d39c473fe19d8e9/watchfiles-1.2.0.tar.gz", hash = "sha256:c995fba777f1ea992f090f9236e9284cf7a5d1a0130dd5a3d82c598cacd76838", size = 108252, upload-time = "2026-05-18T04:32:04.251Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/e7/54/a9c7ea9a82a4ac65e7004c0a03920b5cdd2f9c3b678757d9cd425aa51d53/watchfiles-1.2.0-cp314-cp314-macosx_10_12_x86_64.whl", hash = "sha256:b8c8358484d5fa12ef34f05b7f4168eaf1932f408725ff6d023c33ec17bd79d4", size = 400205, upload-time = "2026-05-18T04:32:05.153Z" }, + { url = "https://files.pythonhosted.org/packages/aa/5d/c9ab3534374a4a67450696905d6ef16a04405448b8dc52bd752ae50423d4/watchfiles-1.2.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:9f04b092229ad2c50126dd3c922c8822e51e605993764a33058d4a791ab42281", size = 392508, upload-time = "2026-05-18T04:30:54.849Z" }, + { url = "https://files.pythonhosted.org/packages/26/ca/1ad30103535cf0cecd7b993e8d50edc5351b1820e38f2d22e3df58962feb/watchfiles-1.2.0-cp314-cp314-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7a7ce236284f002a156f70add88efe5c70879cccbb658be0822c54b1306fc09d", size = 452448, upload-time = "2026-05-18T04:30:53.727Z" }, + { url = "https://files.pythonhosted.org/packages/37/a1/ceee2cdf2afbd715fa07758d39c9859513eae411b23196f7fd039e5feedd/watchfiles-1.2.0-cp314-cp314-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:b9909cc2b48468b575eefa944919e1fe8a36c5849d5c7c168f80a8c1db69398e", size = 459605, upload-time = "2026-05-18T04:30:23.312Z" }, + { url = "https://files.pythonhosted.org/packages/e8/f6/421e30fd1cb3907a84ed92ab3f1983e37ba2dca015e9a894a048418417a2/watchfiles-1.2.0-cp314-cp314-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:0a37faaed405c67e28e6be45a1fa4f206ef5a2860f27c237db9fa30704c38242", size = 490757, upload-time = "2026-05-18T04:30:47.358Z" }, + { url = "https://files.pythonhosted.org/packages/41/b0/55ed1b97ed08be7bba6f9a541cac15f2a858e1d74d2b07b6da70a82aab00/watchfiles-1.2.0-cp314-cp314-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:9649193aa27bd9ff2e80ff29bfaa93085496c7a3a377592823cc58b77ee88add", size = 568672, upload-time = "2026-05-18T04:30:38.915Z" }, + { url = "https://files.pythonhosted.org/packages/d1/cf/d8ae8a80dd7bafab395ea7681c10237311bbf34d37704a8c744e7cf31fc7/watchfiles-1.2.0-cp314-cp314-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:4e4ff8e37f99cf1da89e255e07c9c4b37c214038c4283707bdec308cb1b0ea1f", size = 464197, upload-time = "2026-05-18T04:30:09.914Z" }, + { url = "https://files.pythonhosted.org/packages/7c/8a/3076c496ca8dafe0e8cd03fcebdfc47be4b1174b4e5b24ff6e396e6b3af2/watchfiles-1.2.0-cp314-cp314-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:054dc20fd2e3132b4c3883b4a00d72fd6e1f56fdaf89fccd12e8057d74cd74d7", size = 453181, upload-time = "2026-05-18T04:30:14.829Z" }, + { url = "https://files.pythonhosted.org/packages/e5/10/9745e17c98e7b8a86454df0a3c7b5686bd650383f1e9f26e4ebcbd6cc0c0/watchfiles-1.2.0-cp314-cp314-manylinux_2_31_riscv64.whl", hash = "sha256:e140ed30ebde76796b686e67c182cff10ea2fbab186fafd1560f74bb5a473a6e", size = 465109, upload-time = "2026-05-18T04:30:28.123Z" }, + { url = "https://files.pythonhosted.org/packages/8f/95/8ef4a95481d3e0cb52d62a06fa6e972e81424be2d9698b91a2fecca9904c/watchfiles-1.2.0-cp314-cp314-musllinux_1_1_aarch64.whl", hash = "sha256:bb7e52ecf68ba46d22df23467b87cffeb2146908aa523ebfe803019618cfda06", size = 630653, upload-time = "2026-05-18T04:31:49.304Z" }, + { url = "https://files.pythonhosted.org/packages/fd/e4/3b3bf36b0f829b50c6ebcb8d031583863c59f923d6a6af3d485e470d0fac/watchfiles-1.2.0-cp314-cp314-musllinux_1_1_x86_64.whl", hash = "sha256:23282a321c8baf9b3a3c4afff673f9fe65eb7fdc2338d765ccad9d3d1916a5ba", size = 657838, upload-time = "2026-05-18T04:31:06.497Z" }, + { url = "https://files.pythonhosted.org/packages/21/b1/6cbbb50c1f3002ab568777d44aa21206dfb8807a840990c4037523b51812/watchfiles-1.2.0-cp314-cp314-win32.whl", hash = "sha256:c0db965c5f79aa49fe672d297cf1febc5ad149b658594944f49a54a2b96270a7", size = 275108, upload-time = "2026-05-18T04:30:06.891Z" }, + { url = "https://files.pythonhosted.org/packages/92/45/190ce6db8dcb4536682cf75d3889ff1a27182a58cb519d343cb6d9ea63d8/watchfiles-1.2.0-cp314-cp314-win_amd64.whl", hash = "sha256:71283b39fd17e5408eb123bd37aeecfd9d54c81fc184421943208aadb879d103", size = 288441, upload-time = "2026-05-18T04:32:12.901Z" }, + { url = "https://files.pythonhosted.org/packages/74/0d/3eae1c2313ab08378431d907c3f8095ecca00f3eda33111cf4f0f2591799/watchfiles-1.2.0-cp314-cp314-win_arm64.whl", hash = "sha256:c5c19526f4e54a00f2666a6c0e9e40d582c09e865055ea7378bf0009aab857b3", size = 280684, upload-time = "2026-05-18T04:31:26.902Z" }, + { url = "https://files.pythonhosted.org/packages/b1/75/fb64e6c25d6b5ca636d03df34ffb1c6e9873303e76d27967e045f8df088f/watchfiles-1.2.0-cp314-cp314t-macosx_10_12_x86_64.whl", hash = "sha256:d73a585accffa5ae39c17264c36ec3166d2fad7000c780f5ef83b2722afb9dd2", size = 398857, upload-time = "2026-05-18T04:32:17.108Z" }, + { url = "https://files.pythonhosted.org/packages/73/4e/9f7adf01754cbf81843722ccfec169d8f26c69778281a302855cecd2ee08/watchfiles-1.2.0-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:ae99b14c5f21e026e0e9d96f40e07d8570ebee6cafd9d8fc318354606daa7a28", size = 392413, upload-time = "2026-05-18T04:31:07.911Z" }, + { url = "https://files.pythonhosted.org/packages/47/c8/bec626bcc2d69f44b9acb24ce7d60ed7b16b73628eea747fcbd169d8edda/watchfiles-1.2.0-cp314-cp314t-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4429f3b105524a10b72c3a819b091c495d2811d419c1e1e8df773a5a5974f831", size = 452409, upload-time = "2026-05-18T04:31:20.142Z" }, + { url = "https://files.pythonhosted.org/packages/00/b7/b6362068e81e7c556d155a34c35d40ac3ef42d747b06d7f6e5bf58e359c2/watchfiles-1.2.0-cp314-cp314t-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:43d818978d06062d9b22c4fab2ebe44cf5213d42dc8e62bda8c2760cfa2eeb33", size = 458827, upload-time = "2026-05-18T04:32:06.219Z" }, + { url = "https://files.pythonhosted.org/packages/67/f8/9a813fa42afb1e0b4625e75f0479826644d3ee8dc287e093799bc01f390c/watchfiles-1.2.0-cp314-cp314t-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b9f732dc58b2dbe69e464ccf8fff7a03b0dd0be439da4c0720d3558527d3d6b4", size = 490104, upload-time = "2026-05-18T04:31:56.034Z" }, + { url = "https://files.pythonhosted.org/packages/2f/bf/27dfb6094ca4c9aad21298b5525b6c53cb36121ee454331d05161e58d130/watchfiles-1.2.0-cp314-cp314t-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:8f200104103feb097de4cab8fe4f5dd18a2026934c7dea98c55a2f5fd6d5a33b", size = 571360, upload-time = "2026-05-18T04:31:57.133Z" }, + { url = "https://files.pythonhosted.org/packages/fb/39/44a096d67270ea93df91d33877dbe91fbda3aa4f8ec2edf799d93eda8736/watchfiles-1.2.0-cp314-cp314t-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:63ac26eefbf4af1741247d6fb68b11c49a25b2f7413fbd318a83a12aaa9cf666", size = 464644, upload-time = "2026-05-18T04:30:57.33Z" }, + { url = "https://files.pythonhosted.org/packages/0e/80/c7472203bad6268e3ef1ad260739704847898938ad7ea8b63a5131f46b50/watchfiles-1.2.0-cp314-cp314t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0c4997d4e4a55f0d02b6cde327322daf3a0400e5df6c6b15948994bf72497925", size = 454771, upload-time = "2026-05-18T04:30:48.736Z" }, + { url = "https://files.pythonhosted.org/packages/51/cf/3b10b268b4b7f0fc26e9debb5eef1998b515887840f444cd3ec80c688755/watchfiles-1.2.0-cp314-cp314t-manylinux_2_31_riscv64.whl", hash = "sha256:4c887eba18b7945ac73067a8b4a66f21cd46c2539b2bc68588f7be6c7eb6d26b", size = 463494, upload-time = "2026-05-18T04:31:33.826Z" }, + { url = "https://files.pythonhosted.org/packages/3d/3e/a4302545cd589262a0dc7d140e86f7688eba3f9c72776c27f7e23b8864c4/watchfiles-1.2.0-cp314-cp314t-musllinux_1_1_aarch64.whl", hash = "sha256:3416ff151bb6b5a8d8d11664974fbef4d9305b9b2957839ab5a270468fd8df30", size = 629383, upload-time = "2026-05-18T04:31:15.596Z" }, + { url = "https://files.pythonhosted.org/packages/db/99/d5649df0a9a410d45b7c882304d0b790903ac9b6e8f2cfd12114e0c6b9f2/watchfiles-1.2.0-cp314-cp314t-musllinux_1_1_x86_64.whl", hash = "sha256:0e831a271c035d89789cffc386b6aa1375f39f1cd25eb7ca0997e4970d152fc5", size = 656093, upload-time = "2026-05-18T04:31:58.707Z" }, + { url = "https://files.pythonhosted.org/packages/92/b9/362702539275019a54dd2e94511b31a9b89c5f9e6a21966de7eb692549fc/watchfiles-1.2.0-cp315-cp315-macosx_10_12_x86_64.whl", hash = "sha256:37a6721cdf3f65dbb13aa9503510ccb4451603ac837e44d265d7992a597e1374", size = 400109, upload-time = "2026-05-18T04:31:16.879Z" }, + { url = "https://files.pythonhosted.org/packages/8f/75/71d5ba62db781e5587bded1d944c675374bc4aa37ff33d5018d98e8b6538/watchfiles-1.2.0-cp315-cp315-macosx_11_0_arm64.whl", hash = "sha256:2b37d10b5a63bd4d87e18472d80fa525bd670586fae62e5dd580452764879b65", size = 392167, upload-time = "2026-05-18T04:31:28.058Z" }, + { url = "https://files.pythonhosted.org/packages/3c/01/c66dd95d0423fe30d31820e2d1d5bda773764131bbb6ac0cb1cf303ac328/watchfiles-1.2.0-cp315-cp315-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0a105bc2283f67e8fbec74253ec2d94925de92ed72c0393f1206bf326b7b7b69", size = 452372, upload-time = "2026-05-18T04:31:00.836Z" }, + { url = "https://files.pythonhosted.org/packages/91/15/2fe99557e72f85627c6a8eed50d889e8d101623e060a22ad75b875cb932d/watchfiles-1.2.0-cp315-cp315-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:5327989a465505f05cfe06f04fa9d0c2fd5432bb243e10e6f012b1bdca3c8579", size = 459596, upload-time = "2026-05-18T04:31:34.96Z" }, + { url = "https://files.pythonhosted.org/packages/ed/23/d4acfa0023367428ed48351b3b9b267893037b6cadae55620c61c24bcfd4/watchfiles-1.2.0-cp315-cp315-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ecb47f183a8025b2aa18b546725c3657e542112ae9c0613a2af79b4fa8d04ad7", size = 490869, upload-time = "2026-05-18T04:31:59.923Z" }, + { url = "https://files.pythonhosted.org/packages/a4/5f/3164cbdce06c9fb95c4f7b9e2f9760b5e2797af43a9ecc317ef42a23a278/watchfiles-1.2.0-cp315-cp315-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:8520a4ab0e37f770afc34459c4f8f7019e153f9124dc101c15538365875d1ab2", size = 571641, upload-time = "2026-05-18T04:32:00.948Z" }, + { url = "https://files.pythonhosted.org/packages/41/e6/85d3731c55e65cd7690f3f803d24c139588aaf863e4bf2148fe7a7fa1a19/watchfiles-1.2.0-cp315-cp315-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:71cd71740ed2c15211ebb237ced4e39a1cdf6f80566e5fe95428da1626f4fde6", size = 464444, upload-time = "2026-05-18T04:30:34.298Z" }, + { url = "https://files.pythonhosted.org/packages/f4/7d/562641012b8b09872742c3b8adf9629ec479fd78f8d68ae4a0c13da8add6/watchfiles-1.2.0-cp315-cp315-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f88af53d6ddaf72179ef613ddc905e6f4785f712b49b80b3bef9f3525e6194b4", size = 453593, upload-time = "2026-05-18T04:31:23.464Z" }, + { url = "https://files.pythonhosted.org/packages/56/fe/cb8ef3d6f929d14158fdaaad9925985b7310abc9384dcd4d82dd0016fb59/watchfiles-1.2.0-cp315-cp315-manylinux_2_31_riscv64.whl", hash = "sha256:cee9d5efd929efdac5f7e58f72b3376f676b64050a91c5b99a7094c5b2317488", size = 465096, upload-time = "2026-05-18T04:31:30.384Z" }, + { url = "https://files.pythonhosted.org/packages/25/91/80908e835e100527a9267147b08c0eee1fa6ab0ffec15edc04d1d44885f7/watchfiles-1.2.0-cp315-cp315-musllinux_1_1_aarch64.whl", hash = "sha256:b718bf356bbc15e559bd8ef41782b573b8ae0e3f177ab244b440568d7ea02cfb", size = 630638, upload-time = "2026-05-18T04:30:49.89Z" }, + { url = "https://files.pythonhosted.org/packages/46/4b/95ab2f256bb4af3cb2eb23b9317bda984ee6e0f11733a5c004a6c95b06e3/watchfiles-1.2.0-cp315-cp315-musllinux_1_1_x86_64.whl", hash = "sha256:922c0e019fe68b3ae392965a766b02a71ba1168c932cebc3733cd52c5fe5b377", size = 657684, upload-time = "2026-05-18T04:31:32.027Z" }, +] + [[package]] name = "wcwidth" version = "0.7.0" @@ -3376,6 +3782,33 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/34/db/b10e48aa8fff7407e67470363eac595018441cf32d5e1001567a7aeba5d2/websocket_client-1.9.0-py3-none-any.whl", hash = "sha256:af248a825037ef591efbf6ed20cc5faa03d3b47b9e5a2230a529eeee1c1fc3ef", size = 82616, upload-time = "2025-10-07T21:16:34.951Z" }, ] +[[package]] +name = "websockets" +version = "16.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/04/24/4b2031d72e840ce4c1ccb255f693b15c334757fc50023e4db9537080b8c4/websockets-16.0.tar.gz", hash = "sha256:5f6261a5e56e8d5c42a4497b364ea24d94d9563e8fbd44e78ac40879c60179b5", size = 179346, upload-time = "2026-01-10T09:23:47.181Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/f3/1d/e88022630271f5bd349ed82417136281931e558d628dd52c4d8621b4a0b2/websockets-16.0-cp314-cp314-macosx_10_15_universal2.whl", hash = "sha256:8cc451a50f2aee53042ac52d2d053d08bf89bcb31ae799cb4487587661c038a0", size = 177406, upload-time = "2026-01-10T09:23:12.178Z" }, + { url = "https://files.pythonhosted.org/packages/f2/78/e63be1bf0724eeb4616efb1ae1c9044f7c3953b7957799abb5915bffd38e/websockets-16.0-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:daa3b6ff70a9241cf6c7fc9e949d41232d9d7d26fd3522b1ad2b4d62487e9904", size = 175085, upload-time = "2026-01-10T09:23:13.511Z" }, + { url = "https://files.pythonhosted.org/packages/bb/f4/d3c9220d818ee955ae390cf319a7c7a467beceb24f05ee7aaaa2414345ba/websockets-16.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:fd3cb4adb94a2a6e2b7c0d8d05cb94e6f1c81a0cf9dc2694fb65c7e8d94c42e4", size = 175328, upload-time = "2026-01-10T09:23:14.727Z" }, + { url = "https://files.pythonhosted.org/packages/63/bc/d3e208028de777087e6fb2b122051a6ff7bbcca0d6df9d9c2bf1dd869ae9/websockets-16.0-cp314-cp314-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:781caf5e8eee67f663126490c2f96f40906594cb86b408a703630f95550a8c3e", size = 185044, upload-time = "2026-01-10T09:23:15.939Z" }, + { url = "https://files.pythonhosted.org/packages/ad/6e/9a0927ac24bd33a0a9af834d89e0abc7cfd8e13bed17a86407a66773cc0e/websockets-16.0-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:caab51a72c51973ca21fa8a18bd8165e1a0183f1ac7066a182ff27107b71e1a4", size = 186279, upload-time = "2026-01-10T09:23:17.148Z" }, + { url = "https://files.pythonhosted.org/packages/b9/ca/bf1c68440d7a868180e11be653c85959502efd3a709323230314fda6e0b3/websockets-16.0-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:19c4dc84098e523fd63711e563077d39e90ec6702aff4b5d9e344a60cb3c0cb1", size = 185711, upload-time = "2026-01-10T09:23:18.372Z" }, + { url = "https://files.pythonhosted.org/packages/c4/f8/fdc34643a989561f217bb477cbc47a3a07212cbda91c0e4389c43c296ebf/websockets-16.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:a5e18a238a2b2249c9a9235466b90e96ae4795672598a58772dd806edc7ac6d3", size = 184982, upload-time = "2026-01-10T09:23:19.652Z" }, + { url = "https://files.pythonhosted.org/packages/dd/d1/574fa27e233764dbac9c52730d63fcf2823b16f0856b3329fc6268d6ae4f/websockets-16.0-cp314-cp314-win32.whl", hash = "sha256:a069d734c4a043182729edd3e9f247c3b2a4035415a9172fd0f1b71658a320a8", size = 177915, upload-time = "2026-01-10T09:23:21.458Z" }, + { url = "https://files.pythonhosted.org/packages/8a/f1/ae6b937bf3126b5134ce1f482365fde31a357c784ac51852978768b5eff4/websockets-16.0-cp314-cp314-win_amd64.whl", hash = "sha256:c0ee0e63f23914732c6d7e0cce24915c48f3f1512ec1d079ed01fc629dab269d", size = 178381, upload-time = "2026-01-10T09:23:22.715Z" }, + { url = "https://files.pythonhosted.org/packages/06/9b/f791d1db48403e1f0a27577a6beb37afae94254a8c6f08be4a23e4930bc0/websockets-16.0-cp314-cp314t-macosx_10_15_universal2.whl", hash = "sha256:a35539cacc3febb22b8f4d4a99cc79b104226a756aa7400adc722e83b0d03244", size = 177737, upload-time = "2026-01-10T09:23:24.523Z" }, + { url = "https://files.pythonhosted.org/packages/bd/40/53ad02341fa33b3ce489023f635367a4ac98b73570102ad2cdd770dacc9a/websockets-16.0-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:b784ca5de850f4ce93ec85d3269d24d4c82f22b7212023c974c401d4980ebc5e", size = 175268, upload-time = "2026-01-10T09:23:25.781Z" }, + { url = "https://files.pythonhosted.org/packages/74/9b/6158d4e459b984f949dcbbb0c5d270154c7618e11c01029b9bbd1bb4c4f9/websockets-16.0-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:569d01a4e7fba956c5ae4fc988f0d4e187900f5497ce46339c996dbf24f17641", size = 175486, upload-time = "2026-01-10T09:23:27.033Z" }, + { url = "https://files.pythonhosted.org/packages/e5/2d/7583b30208b639c8090206f95073646c2c9ffd66f44df967981a64f849ad/websockets-16.0-cp314-cp314t-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:50f23cdd8343b984957e4077839841146f67a3d31ab0d00e6b824e74c5b2f6e8", size = 185331, upload-time = "2026-01-10T09:23:28.259Z" }, + { url = "https://files.pythonhosted.org/packages/45/b0/cce3784eb519b7b5ad680d14b9673a31ab8dcb7aad8b64d81709d2430aa8/websockets-16.0-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:152284a83a00c59b759697b7f9e9cddf4e3c7861dd0d964b472b70f78f89e80e", size = 186501, upload-time = "2026-01-10T09:23:29.449Z" }, + { url = "https://files.pythonhosted.org/packages/19/60/b8ebe4c7e89fb5f6cdf080623c9d92789a53636950f7abacfc33fe2b3135/websockets-16.0-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:bc59589ab64b0022385f429b94697348a6a234e8ce22544e3681b2e9331b5944", size = 186062, upload-time = "2026-01-10T09:23:31.368Z" }, + { url = "https://files.pythonhosted.org/packages/88/a8/a080593f89b0138b6cba1b28f8df5673b5506f72879322288b031337c0b8/websockets-16.0-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:32da954ffa2814258030e5a57bc73a3635463238e797c7375dc8091327434206", size = 185356, upload-time = "2026-01-10T09:23:32.627Z" }, + { url = "https://files.pythonhosted.org/packages/c2/b6/b9afed2afadddaf5ebb2afa801abf4b0868f42f8539bfe4b071b5266c9fe/websockets-16.0-cp314-cp314t-win32.whl", hash = "sha256:5a4b4cc550cb665dd8a47f868c8d04c8230f857363ad3c9caf7a0c3bf8c61ca6", size = 178085, upload-time = "2026-01-10T09:23:33.816Z" }, + { url = "https://files.pythonhosted.org/packages/9f/3e/28135a24e384493fa804216b79a6a6759a38cc4ff59118787b9fb693df93/websockets-16.0-cp314-cp314t-win_amd64.whl", hash = "sha256:b14dc141ed6d2dde437cddb216004bcac6a1df0935d79656387bd41632ba0bbd", size = 178531, upload-time = "2026-01-10T09:23:35.016Z" }, + { url = "https://files.pythonhosted.org/packages/6f/28/258ebab549c2bf3e64d2b0217b973467394a9cea8c42f70418ca2c5d0d2e/websockets-16.0-py3-none-any.whl", hash = "sha256:1637db62fad1dc833276dded54215f2c7fa46912301a24bd94d45d46a011ceec", size = 171598, upload-time = "2026-01-10T09:23:45.395Z" }, +] + [[package]] name = "werkzeug" version = "3.1.8" From 7a8181cc17091fcee36f07d17ab78fe27e33af44 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 4 Jun 2026 09:36:02 -0700 Subject: [PATCH 054/591] Removed old repo --- .../src/mpcontribs_api/old/__init__.py | 254 ------- .../old/attachments/__init__.py | 1 - .../old/attachments/document.py | 87 --- .../mpcontribs_api/old/attachments/views.py | 38 -- .../src/mpcontribs_api/old/config.py | 125 ---- .../old/contributions/__init__.py | 0 .../old/contributions/document.py | 323 --------- .../old/contributions/formulae.json.gz | 3 - .../old/contributions/generate_formulae.py | 15 - .../mpcontribs_api/old/contributions/views.py | 224 ------- mpcontribs-api/src/mpcontribs_api/old/core.py | 629 ------------------ .../src/mpcontribs_api/old/dashboard.cfg | 7 - .../mpcontribs_api/old/notebooks/__init__.py | 65 -- .../mpcontribs_api/old/notebooks/document.py | 106 --- .../src/mpcontribs_api/old/notebooks/views.py | 301 --------- .../mpcontribs_api/old/projects/__init__.py | 0 .../mpcontribs_api/old/projects/document.py | 361 ---------- .../src/mpcontribs_api/old/projects/views.py | 179 ----- .../mpcontribs_api/old/structures/__init__.py | 0 .../mpcontribs_api/old/structures/document.py | 51 -- .../mpcontribs_api/old/structures/views.py | 38 -- .../src/mpcontribs_api/old/tables/__init__.py | 1 - .../src/mpcontribs_api/old/tables/document.py | 62 -- .../src/mpcontribs_api/old/tables/views.py | 75 --- .../old/templates/admin_email.html | 1 - .../old/templates/card_bootstrap.html | 46 -- .../old/templates/card_bulma.html | 60 -- .../old/templates/owner_email.html | 1 - 28 files changed, 3053 deletions(-) delete mode 100644 mpcontribs-api/src/mpcontribs_api/old/__init__.py delete mode 100644 mpcontribs-api/src/mpcontribs_api/old/attachments/__init__.py delete mode 100644 mpcontribs-api/src/mpcontribs_api/old/attachments/document.py delete mode 100644 mpcontribs-api/src/mpcontribs_api/old/attachments/views.py delete mode 100644 mpcontribs-api/src/mpcontribs_api/old/config.py delete mode 100644 mpcontribs-api/src/mpcontribs_api/old/contributions/__init__.py delete mode 100644 mpcontribs-api/src/mpcontribs_api/old/contributions/document.py delete mode 100644 mpcontribs-api/src/mpcontribs_api/old/contributions/formulae.json.gz delete mode 100644 mpcontribs-api/src/mpcontribs_api/old/contributions/generate_formulae.py delete mode 100644 mpcontribs-api/src/mpcontribs_api/old/contributions/views.py delete mode 100644 mpcontribs-api/src/mpcontribs_api/old/core.py delete mode 100644 mpcontribs-api/src/mpcontribs_api/old/dashboard.cfg delete mode 100644 mpcontribs-api/src/mpcontribs_api/old/notebooks/__init__.py delete mode 100644 mpcontribs-api/src/mpcontribs_api/old/notebooks/document.py delete mode 100644 mpcontribs-api/src/mpcontribs_api/old/notebooks/views.py delete mode 100644 mpcontribs-api/src/mpcontribs_api/old/projects/__init__.py delete mode 100644 mpcontribs-api/src/mpcontribs_api/old/projects/document.py delete mode 100644 mpcontribs-api/src/mpcontribs_api/old/projects/views.py delete mode 100644 mpcontribs-api/src/mpcontribs_api/old/structures/__init__.py delete mode 100644 mpcontribs-api/src/mpcontribs_api/old/structures/document.py delete mode 100644 mpcontribs-api/src/mpcontribs_api/old/structures/views.py delete mode 100644 mpcontribs-api/src/mpcontribs_api/old/tables/__init__.py delete mode 100644 mpcontribs-api/src/mpcontribs_api/old/tables/document.py delete mode 100644 mpcontribs-api/src/mpcontribs_api/old/tables/views.py delete mode 100644 mpcontribs-api/src/mpcontribs_api/old/templates/admin_email.html delete mode 100644 mpcontribs-api/src/mpcontribs_api/old/templates/card_bootstrap.html delete mode 100644 mpcontribs-api/src/mpcontribs_api/old/templates/card_bulma.html delete mode 100644 mpcontribs-api/src/mpcontribs_api/old/templates/owner_email.html diff --git a/mpcontribs-api/src/mpcontribs_api/old/__init__.py b/mpcontribs-api/src/mpcontribs_api/old/__init__.py deleted file mode 100644 index 937d821e9b..0000000000 --- a/mpcontribs-api/src/mpcontribs_api/old/__init__.py +++ /dev/null @@ -1,254 +0,0 @@ -"""Flask App for MPContribs API.""" - -import logging -import os -import smtplib -from email.message import EmailMessage -from importlib import import_module -from importlib.metadata import version -from string import punctuation, whitespace - -import flask_mongorest.operators as ops -import requests -from boltons.iterutils import default_enter, remap -from flasgger.base import Swagger -from flask import Flask, current_app, jsonify, request -from flask_compress import Compress -from flask_marshmallow import Marshmallow -from flask_mongoengine import MongoEngine -from flask_mongorest import register_class -from flask_sse import sse -from itsdangerous import URLSafeTimedSerializer -from mongoengine import ValidationError -from mongoengine.base.datastructures import BaseDict -from notebook.gateway.managers import GatewayClient -from notebook.utils import url_path_join -from requests.exceptions import ConnectionError, Timeout -from websocket import create_connection - -try: - __version__ = version("mpcontribs-api") -except Exception: - # package is not installed - pass - -delimiter, max_depth = ".", 7 # = MAX_NESTING + 2 from client -invalidChars = set(punctuation.replace("*", "").replace("|", "") + whitespace) -is_gunicorn = "gunicorn" in os.environ.get("SERVER_SOFTWARE", "") -SMTP_HOST, SMTP_PORT = os.environ.get("SMTP_SERVER", "localhost:587").split(":") - -# NOTE not including Size below (special for arrays) -FILTERS = { - "LONG_STRINGS": [ - ops.Contains, - ops.IContains, - ops.Startswith, - ops.IStartswith, - ops.Endswith, - ops.IEndswith, - ], - "NUMBERS": [ops.Lt, ops.Lte, ops.Gt, ops.Gte, ops.Range], - "DATES": [ops.Before, ops.After], - "OTHERS": [ops.Boolean, ops.Exists], -} -FILTERS["STRINGS"] = [ops.In, ops.Exact, ops.IExact, ops.Ne] + FILTERS["LONG_STRINGS"] -FILTERS["ALL"] = FILTERS["STRINGS"] + FILTERS["NUMBERS"] + FILTERS["DATES"] + FILTERS["OTHERS"] - - -class CustomLoggerAdapter(logging.LoggerAdapter): - def process(self, msg, kwargs): - prefix = self.extra.get("prefix") - return f"[{prefix}] {msg}" if prefix else msg, kwargs - - -def get_logger(name): - logger = logging.getLogger(name) - process = os.environ.get("SUPERVISOR_PROCESS_NAME") - group = os.environ.get("SUPERVISOR_GROUP_NAME") - cfg = {"prefix": f"{group}/{process}"} if process and group else {} - logger.setLevel("DEBUG" if os.environ.get("FLASK_DEBUG") else "INFO") - return CustomLoggerAdapter(logger, cfg) - - -logger = get_logger(__name__) - - -def enter(path, key, value): - if isinstance(value, BaseDict): - return dict(), value.items() - elif isinstance(value, list): - dot_path = delimiter.join(list(path) + [key]) - raise ValidationError(f"lists not allowed ({dot_path})!") - - return default_enter(path, key, value) - - -def valid_key(key): - if not key.isascii(): - raise ValidationError(f"non-ascii character(s) in {key}") - - for char in key: - if char in invalidChars: - raise ValidationError(f"invalid character {char} in {key}") - - if key.count("|") > 1: - raise ValidationError(f"Only one `|` allowed in {key}. Consider nesting.") - - -def visit(path, key, value): - key = key.strip() - - if len(path) + 1 > max_depth: - dot_path = delimiter.join(list(path) + [key]) - raise ValidationError(f"max nesting ({max_depth}) exceeded for {dot_path}") - - valid_key(key) - return key, value - - -def valid_dict(dct): - remap(dct, visit=visit, enter=enter) - - -def send_email(to, subject, html): - msg = EmailMessage() - msg.set_content(html) - msg["Subject"] = subject - msg["From"] = current_app.config["MAIL_DEFAULT_SENDER"] - msg["To"] = to - - # NOTE boto3 SES client can't connect to VPC endpoint yet - with smtplib.SMTP(host=SMTP_HOST, port=int(SMTP_PORT)) as ses_client: - ses_client.starttls() - ses_client.login(os.environ["SMTP_USERNAME"], os.environ["SMTP_PASSWORD"]) - ses_client.send_message(msg) - logger.warning(f"Email with subject `{subject}` sent to `{to}`") - - -def get_collections(db): - """Get list of collections in DB.""" - conn = db.app.extensions["mongoengine"][db]["conn"] - dbname = db.app.config.get("MPCONTRIBS_DB") - return conn[dbname].list_collection_names() - - -def get_resource_as_string(name, charset="utf-8"): - """Http://flask.pocoo.org/snippets/77/.""" - with current_app.open_resource(name) as f: - return f.read().decode(charset) - - -def get_kernel_endpoint(kernel_id=None, ws=False): - gw_client = GatewayClient.instance() - base_url = gw_client.ws_url if ws else gw_client.url - - if not base_url: - raise ConnectionError("base URL for Kernel Gateway not set") - - base_endpoint = url_path_join(base_url, gw_client.kernels_endpoint) - - if isinstance(kernel_id, str) and kernel_id: - return url_path_join(base_endpoint, kernel_id) - - return base_endpoint - - -def create_kernel_connection(kernel_id): - url = get_kernel_endpoint(kernel_id, ws=True) + "/channels" - return create_connection(url, skip_utf8_validation=True) - - -def get_kernels(): - """Retrieve list of kernels from KernelGateway service.""" - try: - r = requests.get(get_kernel_endpoint(), timeout=2) - except ConnectionError, Timeout: - logger.warning("Kernel Gateway NOT AVAILABLE") - return None - - response = r.json() - nkernels = 3 # reserve 3 kernels for each deployment - idx = int(os.environ.get("DEPLOYMENT", 1)) - - if len(response) < nkernels * (idx + 1): - logger.error("NOT ENOUGH KERNELS AVAILABLE") - return None - - return {kernel["id"]: None for kernel in response[idx : idx + 3]} - - -def get_consumer(): - groups = request.headers.get("X-Authenticated-Groups", "").split(",") - groups += request.headers.get("X-Consumer-Groups", "").split(",") - return { - "username": request.headers.get("X-Consumer-Username"), - "apikey": request.headers.get("X-Consumer-Custom-Id"), - "groups": ",".join(set(groups)), - } - - -def create_app(): - """Create flask app.""" - app = Flask(__name__) - app.config.from_pyfile("config.py", silent=True) - app.config["USTS"] = URLSafeTimedSerializer(app.secret_key) - app.jinja_env.globals["get_resource_as_string"] = get_resource_as_string - app.jinja_env.lstrip_blocks = True - app.jinja_env.trim_blocks = True - app.json.sort_keys = False - MPCONTRIBS_API_HOST = app.config.get("MPCONTRIBS_API_HOST") - app.config["TEMPLATE"]["schemes"] = ["http"] if app.debug else ["https"] - logger.info("database: " + app.config["MPCONTRIBS_DB"]) - Compress(app) - Marshmallow(app) - MongoEngine(app) - Swagger(app, template=app.config.get("TEMPLATE")) - app.kernels = get_kernels() - - # NOTE: hard-code to avoid pre-generating for new deployment - # collections = get_collections(db) - collections = [ - "projects", - "contributions", - "tables", - "attachments", - "structures", - "notebooks", - ] - - for collection in collections: - module_path = ".".join(["mpcontribs", "api", collection, "views"]) - try: - module = import_module(module_path) - except ModuleNotFoundError as ex: - logger.error(f"API module {module_path}: {ex}") - continue - - try: - blueprint = getattr(module, collection) - app.register_blueprint(blueprint, url_prefix="/" + collection) - klass = getattr(module, collection.capitalize() + "View") - register_class(app, klass, name=collection) - logger.info(f"{collection} registered") - except AttributeError as ex: - logger.error(f"Failed to register {module_path}: {collection} {ex}") - - if getattr(app, "kernels", None): - from mpcontribs.api.notebooks.views import rq - - rq.init_app(app) - - def healthcheck(): - return jsonify({"version": app.config["VERSION"]}) - - if is_gunicorn and MPCONTRIBS_API_HOST: - app.register_blueprint(sse, url_prefix="/stream") - app.add_url_rule("/healthcheck", view_func=healthcheck) - - @app.after_request - def add_header(response): - response.headers["X-Consumer-Id"] = request.headers.get("X-Consumer-Id") - return response - - logger.info("app created.") - return app diff --git a/mpcontribs-api/src/mpcontribs_api/old/attachments/__init__.py b/mpcontribs-api/src/mpcontribs_api/old/attachments/__init__.py deleted file mode 100644 index dc0093eef0..0000000000 --- a/mpcontribs-api/src/mpcontribs_api/old/attachments/__init__.py +++ /dev/null @@ -1 +0,0 @@ -"""Document and views for attachments collection.""" diff --git a/mpcontribs-api/src/mpcontribs_api/old/attachments/document.py b/mpcontribs-api/src/mpcontribs_api/old/attachments/document.py deleted file mode 100644 index 6e4c8e89e4..0000000000 --- a/mpcontribs-api/src/mpcontribs_api/old/attachments/document.py +++ /dev/null @@ -1,87 +0,0 @@ -import binascii -import os -from base64 import b64decode, b64encode - -import boto3 -from filetype.types.archive import Gz -from filetype.types.image import Gif, Jpeg, Png, Tiff -from flask import request -from flask_mongoengine.documents import DynamicDocument -from mongoengine import ValidationError, signals -from mongoengine.fields import StringField -from mongoengine.queryset.manager import queryset_manager -from mpcontribs.api.contributions.document import COMPONENTS, get_md5, get_resource - -MAX_BYTES = 2.4 * 1024 * 1024 -BUCKET = os.environ.get("S3_ATTACHMENTS_BUCKET", "mpcontribs-attachments") -S3_ATTACHMENTS_URL = f"https://{BUCKET}.s3.amazonaws.com" -SUPPORTED_FILETYPES = (Gz, Jpeg, Png, Gif, Tiff) -SUPPORTED_MIMES = [t().mime for t in SUPPORTED_FILETYPES] - -s3_client = boto3.client("s3") - - -class Attachments(DynamicDocument): - name = StringField(required=True, help_text="file name") - md5 = StringField(regex=r"^[a-z0-9]{32}$", unique=True, help_text="md5 sum") - mime = StringField(required=True, choices=SUPPORTED_MIMES, help_text="attachment mime type") - content = StringField(required=True, help_text="base64-encoded attachment content") - meta = {"collection": "attachments", "indexes": ["name", "mime", "md5"]} - - @queryset_manager - def objects(doc_cls, queryset): - return queryset.only("name", "md5", "mime") - - @classmethod - def post_init(cls, sender, document, **kwargs): - if document.id and document._data.get("content"): - res = get_resource("attachments") - requested_fields = res.get_requested_fields(params=request.args) - - if "content" in requested_fields: - if not document.md5: - # document.reload("md5") # TODO AttributeError: _changed_fields - raise ValueError("Please also request md5 field to retrieve attachment content!") - - retr = s3_client.get_object(Bucket=BUCKET, Key=document.md5) - document.content = b64encode(retr["Body"].read()).decode("utf-8") - - @classmethod - def pre_delete(cls, sender, document, **kwargs): - s3_client.delete_object(Bucket=BUCKET, Key=document.md5) - - @classmethod - def pre_save_post_validation(cls, sender, document, **kwargs): - if document.md5: - return # attachment already cross-referenced to existing one - - # b64 decode - try: - content = b64decode(document.content, validate=True) - except binascii.Error: - raise ValidationError(f"Attachment {document.name} not base64 encoded!") - - # check size - size = len(content) - - if size > MAX_BYTES: - raise ValidationError(f"Attachment {document.name} too large ({size} > {MAX_BYTES})!") - - # md5 - resource = get_resource("attachments") - document.md5 = get_md5(resource, document, COMPONENTS["attachments"]) - - # save to S3 and unset content - s3_client.put_object( - Bucket=BUCKET, - Key=document.md5, - ContentType=document.mime, - Metadata={"name": document.name}, - Body=content, - ) - document.content = str(size) # set to something useful to distinguish in post_init - - -signals.post_init.connect(Attachments.post_init, sender=Attachments) -signals.pre_delete.connect(Attachments.pre_delete, sender=Attachments) -signals.pre_save_post_validation.connect(Attachments.pre_save_post_validation, sender=Attachments) diff --git a/mpcontribs-api/src/mpcontribs_api/old/attachments/views.py b/mpcontribs-api/src/mpcontribs_api/old/attachments/views.py deleted file mode 100644 index bf4f8e20f6..0000000000 --- a/mpcontribs-api/src/mpcontribs_api/old/attachments/views.py +++ /dev/null @@ -1,38 +0,0 @@ -import os - -import flask_mongorest -from flask import Blueprint -from flask_mongorest import operators as ops -from flask_mongorest.methods import BulkFetch, Download, Fetch -from flask_mongorest.resources import Resource -from mpcontribs.api import FILTERS -from mpcontribs.api.attachments.document import Attachments -from mpcontribs.api.core import SwaggerView - -templates = os.path.join(os.path.dirname(flask_mongorest.__file__), "templates") -attachments = Blueprint("attachments", __name__, template_folder=templates) - - -class AttachmentsResource(Resource): - document = Attachments - filters = { - "id": [ops.In, ops.Exact], - "md5": [ops.In, ops.Exact], - "name": FILTERS["STRINGS"], - "mime": FILTERS["STRINGS"], - } - fields = ["id", "name", "mime", "md5"] - allowed_ordering = ["name", "mime"] - paginate = True - default_limit = 10 - max_limit = 100 - download_formats = ["json", "csv"] - - @staticmethod - def get_optional_fields(): - return ["content"] - - -class AttachmentsView(SwaggerView): - resource = AttachmentsResource - methods = [Fetch, BulkFetch, Download] diff --git a/mpcontribs-api/src/mpcontribs_api/old/config.py b/mpcontribs-api/src/mpcontribs_api/old/config.py deleted file mode 100644 index 52a569ce94..0000000000 --- a/mpcontribs-api/src/mpcontribs_api/old/config.py +++ /dev/null @@ -1,125 +0,0 @@ -"""Configuration module for MPContribs Flask API.""" - -import gzip -import json -import os - -from mpcontribs.api import __version__ - -formulae_path = os.path.join(os.path.dirname(__file__), "contributions", "formulae.json.gz") - -with gzip.open(formulae_path) as f: - FORMULAE = json.load(f) - -VERSION = __version__ - -JSON_ADD_STATUS = False -SECRET_KEY = "super-secret" # TODO in local prod config - -MAIL_DEFAULT_SENDER = os.environ.get("MAIL_DEFAULT_SENDER") -MPCONTRIBS_DB = os.environ.get("MPCONTRIBS_DB_NAME", "mpcontribs") -MPCONTRIBS_MONGO_HOST = os.environ.get("MPCONTRIBS_MONGO_HOST") -MPCONTRIBS_API_HOST = os.environ.get("MPCONTRIBS_API_HOST") -MONGODB_SETTINGS = { - # Changed in version 3.9: retryWrites now defaults to True. - "host": f"mongodb+srv://{MPCONTRIBS_MONGO_HOST}/{MPCONTRIBS_DB}", - "connect": False, - "db": MPCONTRIBS_DB, - "compressors": ["snappy", "zstd", "zlib"], -} -REDIS_ADDRESS = os.environ.get("REDIS_ADDRESS", "redis") -REDIS_URL = RQ_REDIS_URL = RQ_DASHBOARD_REDIS_URL = f"redis://{REDIS_ADDRESS}" -DOC_DIR = os.path.join(os.path.dirname(__file__), f"swagger-{MPCONTRIBS_DB}") - -SWAGGER = { - "swagger_ui_bundle_js": "//unpkg.com/swagger-ui-dist@3/swagger-ui-bundle.js", - "swagger_ui_standalone_preset_js": "//unpkg.com/swagger-ui-dist@3/swagger-ui-standalone-preset.js", - "jquery_js": "//unpkg.com/jquery@2.2.4/dist/jquery.min.js", - "swagger_ui_css": "//unpkg.com/swagger-ui-dist@3/swagger-ui.css", - "uiversion": 3, - "hide_top_bar": True, - "doc_expansion": "none", - "doc_dir": DOC_DIR, - "specs": [ - { - "endpoint": "apispec", - "route": "/apispec.json", - "rule_filter": lambda rule: True, # all in - "model_filter": lambda tag: True, # all in - } - ], - "specs_route": "/", -} - -TEMPLATE = { - "swagger": "2.0", - "info": { - "title": "MPContribs API", - "description": "Operations to contribute, update and retrieve materials data on Materials Project", - "termsOfService": "https://materialsproject.org/terms", - "version": VERSION, - "contact": { - "name": "MPContribs", - "email": "contribs@materialsproject.org", - "url": "https://mpcontribs.org", - }, - "license": { - "name": "Creative Commons Attribution 4.0 International License", - "url": "https://creativecommons.org/licenses/by/4.0/", - }, - }, - "tags": [ - { - "name": "projects", - "description": "contain provenance information about contributed datasets. \ - Deleting projects will also delete all contributions including tables, structures, attachments, notebooks \ - and cards for the project. Only users who have been added to a project can update its contents. While \ - unpublished, only users on the project can retrieve its data or view it on the \ - Portal. Making a project public does not automatically publish all \ - its contributions, tables, attachments, and structures. These are separately set to public individually or in bulk." - "", - }, - { - "name": "contributions", - "description": "contain simple hierarchical data which will show up as cards on the MP details \ - page for MP material(s). Tables (rows and columns), structures, and attachments can be added to a \ - contribution. Each contribution uses `mp-id` or composition as identifier to associate its data with the \ - according entries on MP. Only admins or users on the project can create, update or delete contributions, and \ - while unpublished, retrieve its data or view it on the Portal. \ - Contribution components (tables, structures, and attachments) are deleted along with a contribution.", - }, - { - "name": "structures", - "description": 'are \ - pymatgen structures which \ - can be added to a contribution.', - }, - { - "name": "tables", - "description": 'are simple spreadsheet-type tables with columns and rows saved as Pandas \ - DataFrames \ - which can be added to a contribution.', - }, - { - "name": "attachments", - "description": "are files saved as objects in AWS S3 and not accessible for querying (only retrieval) \ - which can be added to a contribution.", - }, - { - "name": "notebooks", - "description": 'are Jupyter \ - notebook \ - documents generated and saved when a contribution is saved. They form the basis for Contribution \ - Details Pages on the Portal.', - }, - ], - "securityDefinitions": { - "ApiKeyAuth": { - "description": "MP API key to authorize requests", - "name": "X-API-KEY", - "in": "header", - "type": "apiKey", - } - }, - "security": [{"ApiKeyAuth": []}], -} diff --git a/mpcontribs-api/src/mpcontribs_api/old/contributions/__init__.py b/mpcontribs-api/src/mpcontribs_api/old/contributions/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/mpcontribs-api/src/mpcontribs_api/old/contributions/document.py b/mpcontribs-api/src/mpcontribs_api/old/contributions/document.py deleted file mode 100644 index 0f3c3870fb..0000000000 --- a/mpcontribs-api/src/mpcontribs_api/old/contributions/document.py +++ /dev/null @@ -1,323 +0,0 @@ -import itertools -import json -from datetime import datetime -from decimal import Decimal -from hashlib import md5 -from importlib import import_module -from itertools import permutations -from math import isnan - -from atlasq import AtlasManager, AtlasQ -from boltons.iterutils import remap -from bson.dbref import DBRef -from fastnumbers import isfloat -from flask import current_app -from mongoengine import CASCADE, DynamicDocument, signals -from mongoengine.fields import ( - BooleanField, - DateTimeField, - DictField, - LazyReferenceField, - ListField, - ReferenceField, - StringField, -) -from mongoengine.queryset.manager import queryset_manager -from mpcontribs.api import delimiter, enter, valid_dict -from pint import UnitRegistry -from pint.errors import DimensionalityError -from pymatgen.core import Composition, Element -from uncertainties import ufloat_fromstr - -quantity_keys = {"display", "value", "error", "unit"} -max_dgts = 6 -ureg = UnitRegistry( - autoconvert_offset_to_baseunit=True, - preprocessors=[ - lambda s: s.replace("%%", " permille "), - lambda s: s.replace("%", " percent "), - ], -) -ureg.formatter.default_format = "~,P" - -if "percent" not in ureg: - # percent is native in pint >= 0.21 - ureg.define("percent = 0.01 = %") -if "permille" not in ureg: - # permille is native in pint >= 0.24.2 - ureg.define("permille = 0.001 = ‰ = %%") -if "ppm" not in ureg: - # ppm is native in pint >= 0.21 - ureg.define("ppm = 1e-6") -ureg.define("ppb = 1e-9") -ureg.define("atom = 1") -ureg.define("bohr_magneton = e * hbar / (2 * m_e) = µᵇ = µ_B = mu_B") -ureg.define("electron_mass = 9.1093837015e-31 kg = mₑ = m_e") -ureg.define("sccm = cm³/min") - -COMPONENTS = { - "structures": ["lattice", "sites", "charge"], - "tables": ["index", "columns", "data"], - "attachments": ["mime", "content"], -} - - -def grouper(n, iterable): - it = iter(iterable) - while True: - chunk = tuple(itertools.islice(it, n)) - if not chunk: - return - yield chunk - - -def format_cell(cell): - cell = cell.strip() - if not cell or cell.count(" ") > 1: - return cell - - q = get_quantity(cell) - if not q or isnan(q.magnitude.nominal_value): - return cell - - q = truncate_digits(q) - try: - return str(q.magnitude.nominal_value) if isnan(q.magnitude.std_dev) else str(q) - except Exception: - return cell - - -def new_error_units(measurement, quantity): - if quantity.units == measurement.value.units: - return measurement - - error = measurement.error.to(quantity.units) - return ureg.Measurement(quantity, error) - - -def get_quantity(s): - # 5, 5 eV, 5+/-1 eV, 5(1) eV - # set uncertainty to nan if not provided - parts = s.split() - parts += [None] * (2 - len(parts)) - if isfloat(parts[0]): - parts[0] += "+/-nan" - - try: - parts[0] = ufloat_fromstr(parts[0]) - return ureg.Measurement(*parts) - except ValueError: - return None - - -def truncate_digits(q): - if isnan(q.magnitude.nominal_value): - return q - - v = Decimal(str(q.magnitude.nominal_value)) - vt = v.as_tuple() - - if vt.exponent >= 0: - return q - - dgts = len(vt.digits) - dgts = max_dgts if dgts > max_dgts else dgts - s = f"{v:.{dgts}g}" - if not isnan(q.magnitude.std_dev): - s += f"+/-{q.magnitude.std_dev:.{dgts}g}" - - if q.units: - s += f" {q.units}" - - return get_quantity(s) - - -def get_resource(component): - klass = component.capitalize() - vmodule = import_module(f"mpcontribs.api.{component}.views") - Resource = getattr(vmodule, f"{klass}Resource") - return Resource() - - -def get_md5(resource, obj, fields): - d = resource.serialize(obj, fields=fields) - s = json.dumps(d, sort_keys=True).encode("utf-8") - return md5(s).hexdigest() - - -class Contributions(DynamicDocument): - project = LazyReferenceField("Projects", required=True, passthrough=True, reverse_delete_rule=CASCADE) - identifier = StringField(required=True, help_text="material/composition identifier") - formula = StringField(help_text="formula (set dynamically if not provided)") - is_public = BooleanField(required=True, default=True, help_text="public/private contribution") - last_modified = DateTimeField(required=True, default=datetime.utcnow, help_text="time of last modification") - needs_build = BooleanField(default=True, help_text="needs notebook build?") - data = DictField( - default=dict, - validation=valid_dict, - pullout_key="display", - help_text="simple free-form data", - ) - structures = ListField(ReferenceField("Structures", null=True), default=list, max_length=10) - tables = ListField(ReferenceField("Tables", null=True), default=list, max_length=10) - attachments = ListField(ReferenceField("Attachments", null=True), default=list, max_length=10) - notebook = ReferenceField("Notebooks") - atlas = AtlasManager("formula_autocomplete") - meta = { - "collection": "contributions", - "indexes": [ - "project", - "identifier", - "formula", - "is_public", - "last_modified", - "needs_build", - "notebook", - {"fields": [(r"data.$**", 1)]}, - # can only use wildcardProjection option with wildcard index on all document fields - {"fields": [(r"$**", 1)], "wildcardProjection": {"project": 1}}, - ] - + list(COMPONENTS.keys()), - } - - @queryset_manager - def objects(doc_cls, queryset): - return queryset.no_dereference().only( - "project", - "identifier", - "formula", - "is_public", - "last_modified", - "needs_build", - ) - - @classmethod - def atlas_filter(cls, term): - try: - comp = Composition(term) - except Exception: - raise ValueError(f"{term} is not a valid composition") - - try: - for element in comp.elements: - Element(element) - except Exception: - raise ValueError(f"{element} not a valid element") - - ind_str = [] - - if len(comp) == 1: - d = comp.get_integer_formula_and_factor() - ind_str.append(d[0] + str(int(d[1])) if d[1] != 1 else d[0]) - else: - for i, j in comp.reduced_composition.items(): - ind_str.append(i.name + str(int(j)) if j != 1 else i.name) - - final_terms = ["".join(entry) for entry in permutations(ind_str)] - return AtlasQ(formula=final_terms[0]) # TODO formula__in=final_terms - - @classmethod - def post_init(cls, sender, document, **kwargs): - # replace existing components with according ObjectIds - for component, fields in COMPONENTS.items(): - lst = document._data.get(component) - if lst and lst[0].id is None: # id is None for incoming POST - resource = get_resource(component) - for i, o in enumerate(lst): - digest = get_md5(resource, o, fields) - objs = resource.document.objects(md5=digest) - exclude = list(resource.document._fields.keys()) - obj = objs.exclude(*exclude).only("id").first() - if obj: - lst[i] = obj.to_dbref() - - @classmethod - def pre_save_post_validation(cls, sender, document, **kwargs): - # set formula field - if hasattr(document, "formula") and not document.formula: - formulae = current_app.config["FORMULAE"] - document.formula = formulae.get(document.identifier, document.identifier) - - # project is LazyReferenceField & load columns due to custom queryset manager - project = document.project.fetch().reload("columns") - columns = {col.path: col for col in project.columns} - - # run data through Pint Quantities and save as dicts - def make_quantities(path, key, value): - key = key.strip() - if key in quantity_keys or not isinstance(value, (str, int, float)): - return key, value - - # can't be a quantity if contains 2+ spaces - str_value = str(value).strip() - if str_value.count(" ") > 1: - return key, value - - # don't parse if column.unit indicates string type - field = delimiter.join(["data"] + list(path) + [key]) - if field in columns: - if columns[field].unit == "NaN": - return key, str_value - - # parse as quantity - q = get_quantity(str_value) - if q is None or not q._magnitude: - return key, value - - # silently ignore "nan" - if isnan(q.magnitude.nominal_value): - return False - - # ensure that the same units are used across contributions - if field in columns: - column = columns[field] - if column.unit != str(q.value.units): - try: - qq = q.value.to(column.unit) - q = new_error_units(q, qq) - except DimensionalityError: - raise ValueError(f"Can't convert [{q.units}] to [{column.unit}] for {field}!") - else: - # try compact representation - qq = q.value.to_compact() - q = new_error_units(q, qq) - - # reduce dimensionality if possible - if not q.check(0): - qq = q.value.to_reduced_units() - q = new_error_units(q, qq) - - # significant digits - q = truncate_digits(q) - - # return new value dict - display = str(q.value) if isnan(q.magnitude.std_dev) else str(q) - value = { - "display": display, - "value": q.magnitude.nominal_value, - "error": q.magnitude.std_dev, - "unit": str(q.units), - } - return key, value - - document.data = remap(document.data, visit=make_quantities, enter=enter) - document.last_modified = datetime.utcnow() - document.needs_build = True - - @classmethod - def pre_delete(cls, sender, document, **kwargs): - args = list(COMPONENTS.keys()) - document.reload(*args) - - for component in COMPONENTS.keys(): - # check if other contributions exist before deletion - # and make sure component still exists (getattr converts ref to object) - for obj in getattr(document, component): - q = {component: obj.id} - if sender.objects(**q).count() < 2 and not isinstance(obj, DBRef): - obj.delete() - - -signals.post_init.connect(Contributions.post_init, sender=Contributions) -signals.pre_save_post_validation.connect(Contributions.pre_save_post_validation, sender=Contributions) -signals.pre_delete.connect(Contributions.pre_delete, sender=Contributions) diff --git a/mpcontribs-api/src/mpcontribs_api/old/contributions/formulae.json.gz b/mpcontribs-api/src/mpcontribs_api/old/contributions/formulae.json.gz deleted file mode 100644 index 5f6945aaa0..0000000000 --- a/mpcontribs-api/src/mpcontribs_api/old/contributions/formulae.json.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:358326e2613ac16500283f85c3cc3780567a568cc3efa5431bde7e50f1978135 -size 5418887 diff --git a/mpcontribs-api/src/mpcontribs_api/old/contributions/generate_formulae.py b/mpcontribs-api/src/mpcontribs_api/old/contributions/generate_formulae.py deleted file mode 100644 index 8ddd8c04d2..0000000000 --- a/mpcontribs-api/src/mpcontribs_api/old/contributions/generate_formulae.py +++ /dev/null @@ -1,15 +0,0 @@ -import json -import os - -from pymatgen.ext.matproj import MPRester - -data = {} - -with MPRester() as mpr: - for _i, d in enumerate(mpr.query(criteria={}, properties=["task_ids", "pretty_formula"])): - for task_id in d["task_ids"]: - data[task_id] = d["pretty_formula"] - -out = os.path.join(os.path.dirname(__file__), "formulae.json") -with open(out, "w") as f: - json.dump(data, f) diff --git a/mpcontribs-api/src/mpcontribs_api/old/contributions/views.py b/mpcontribs-api/src/mpcontribs_api/old/contributions/views.py deleted file mode 100644 index 4b99248f00..0000000000 --- a/mpcontribs-api/src/mpcontribs_api/old/contributions/views.py +++ /dev/null @@ -1,224 +0,0 @@ -import os -import re -from itertools import permutations - -import flask_mongorest -from boltons.iterutils import remap -from css_html_js_minify import html_minify -from flask import Blueprint, abort, jsonify, render_template, request -from flask_mongorest import operators as ops -from flask_mongorest.exceptions import UnknownFieldError -from flask_mongorest.methods import ( - BulkCreate, - BulkDelete, - BulkFetch, - BulkUpdate, - Delete, - Download, - Fetch, - Update, -) -from flask_mongorest.resources import Resource -from json2html import Json2Html -from mpcontribs.api import FILTERS, enter -from mpcontribs.api.attachments.views import AttachmentsResource -from mpcontribs.api.contributions.document import Contributions -from mpcontribs.api.core import SwaggerView -from mpcontribs.api.notebooks.views import NotebooksResource -from mpcontribs.api.structures.views import StructuresResource -from mpcontribs.api.tables.views import TablesResource -from pymatgen.core.composition import Composition, CompositionError -from werkzeug.exceptions import Unauthorized - -templates = os.path.join(os.path.dirname(flask_mongorest.__file__), "templates") -contributions = Blueprint("contributions", __name__, template_folder=templates) -exclude = r'[^$.\s_~`^&(){}[\]\\;\'"/]' -j2h = Json2Html() -MAX_UNAPPROVED_CONTRIBS = 500 - - -def visit(path, key, value): - if isinstance(value, dict) and "display" in value: - return key, value["display"] - return True - - -class ContributionsResource(Resource): - document = Contributions - related_resources = { - "structures": StructuresResource, - "tables": TablesResource, - "attachments": AttachmentsResource, - "notebook": NotebooksResource, - } - save_related_fields = ["structures", "tables", "attachments", "notebook"] - filters = { - "id": [ops.In, ops.Exact], - "project": FILTERS["STRINGS"], - "identifier": FILTERS["STRINGS"], - "formula": FILTERS["STRINGS"], - "is_public": [ops.Boolean], - "last_modified": FILTERS["DATES"], - "needs_build": [ops.Boolean], - re.compile(r"^data__((?!__).)*$"): FILTERS["ALL"], - "structures": [ops.Size], - "tables": [ops.Size], - "attachments": [ops.Size], - } - fields = [ - "id", - "project", - "identifier", - "formula", - "is_public", - "last_modified", - "needs_build", - ] - allowed_ordering = [ - "id", - "project", - "identifier", - "formula", - "is_public", - "last_modified", - "needs_build", - re.compile(r"^data(__(" + exclude + ")+){1,4}$"), - ] - paginate = True - default_limit = 200 - max_limit = 1500 - download_formats = ["json", "csv"] - - @staticmethod - def get_optional_fields(): - return [ - "data", - "structures", - "tables", - "attachments", - "notebook", - "card_bootstrap", - "card_bulma", - ] - - def value_for_field(self, obj, field): - if field.startswith("card_"): - _, fmt = field.rsplit("_", 1) - if fmt not in ["bootstrap", "bulma"]: - raise UnknownFieldError - - if obj.project is None or not obj.data: - # try data reload to account for custom queryset manager - obj.reload("id", "project", "data") - - # obj.project is LazyReference & Projects uses custom queryset manager - DocType = obj.project.document_type - exclude = list(DocType._fields.keys()) - only = ["title", "references", "description", "authors"] - pk = obj.project.pk - project = DocType.objects.exclude(*exclude).only(*only).with_id(pk) - ctx = { - "cid": str(obj.id), - "title": project.title, - "references": project.references[:5], - "landing_page": f"/projects/{project.id}/", - "more": f"/contributions/{obj.id}", - } - ctx["descriptions"] = project.description.strip().split(".", 1) - authors = [a.strip() for a in project.authors.split(",") if a] - ctx["authors"] = {"main": authors[0], "etal": authors[1:]} - ctx["data"] = j2h.convert( - json=remap(obj.data, visit=visit, enter=enter), - table_attributes='class="table is-narrow is-fullwidth has-background-light"', - ) - return html_minify(render_template(f"card_{fmt}.html", **ctx)) - else: - raise UnknownFieldError - - -class ContributionsView(SwaggerView): - resource = ContributionsResource - methods = [ - Fetch, - Delete, - Update, - BulkFetch, - BulkCreate, - BulkUpdate, - BulkDelete, - Download, - ] - - def has_add_permission(self, req, obj): - # limit the number of contributions for unapproved projects - if not self.is_admin_or_project_user(req, obj): - return False - - if not obj.project.is_approved: - nr_contribs = Contributions.objects(project=obj.project.id).count() - if nr_contribs > MAX_UNAPPROVED_CONTRIBS: - msg = f"Reached {MAX_UNAPPROVED_CONTRIBS} for unapproved project {obj.project.id}." - msg += " Please reach out to contribs@materialsproject.org." - raise Unauthorized(f"Can't add {obj.identifier}: {msg}") - - query = dict(project=obj.project.id, identifier=obj.identifier) - if obj.project.unique_identifiers and Contributions.objects(**query).count(): - raise Unauthorized(f"{obj.identifier} already added for {obj.project.id}") - - return True - - -@contributions.route("/search") -def search(): - formula = request.args.get("formula") - if not formula: - abort(404, description="Missing formula param.") - - try: - comp = Composition(formula) - except CompositionError, ValueError: - abort(400, description="Invalid formula provided.") - - ind_str = [] - - if len(comp) == 1: - d = comp.get_integer_formula_and_factor() - ind_str.append(d[0] + str(int(d[1])) if d[1] != 1 else d[0]) - else: - for i, j in comp.reduced_composition.items(): - ind_str.append(i.name + str(int(j)) if j != 1 else i.name) - - final_terms = ["".join(entry) for entry in permutations(ind_str)] - limit = request.args.get("limit", ContributionsResource.default_limit) - - pipeline = [ - { - "$search": { - "index": "formula_autocomplete", - "text": {"path": "formula", "query": final_terms}, - } - }, - {"$project": {"formula": 1, "length": {"$strLenCP": "$formula"}, "project": 1}}, - {"$match": {"length": {"$gte": len(final_terms[0])}}}, - {"$limit": limit}, - {"$sort": {"length": 1}}, - ] - - results = [] - - try: - for contrib in Contributions.objects().aggregate(pipeline, maxTimeMS=15000): - results.append( - { - "id": str(contrib["_id"]), - "formula": contrib["formula"], - "project": contrib["project"], - } - ) - except Exception: - abort( - 500, - description="Can't complete search. Please try a different formula or try again later.", - ) - - return jsonify(results) diff --git a/mpcontribs-api/src/mpcontribs_api/old/core.py b/mpcontribs-api/src/mpcontribs_api/old/core.py deleted file mode 100644 index 289fd80363..0000000000 --- a/mpcontribs-api/src/mpcontribs_api/old/core.py +++ /dev/null @@ -1,629 +0,0 @@ -import os -from copy import deepcopy -from importlib import import_module -from re import Pattern - -import yaml -from flasgger.marshmallow_apispec import SwaggerView as OriginalSwaggerView -from flasgger.marshmallow_apispec import schema2jsonschema -from flask_mongorest.views import ResourceView -from marshmallow_mongoengine import ModelSchema -from mongoengine.queryset import DoesNotExist -from mongoengine.queryset.visitor import Q -from mpcontribs.api import get_logger, is_gunicorn -from mpcontribs.api.config import DOC_DIR -from werkzeug.exceptions import Unauthorized - -logger = get_logger(__name__) - - -def get_limit_params(resource, method): - default = resource.default_limit - bulk = {"BulkUpdate", "BulkDelete"} - maximum = resource.bulk_update_limit if method in bulk else resource.max_limit - return [ - { - "name": "_skip", - "in": "query", - "type": "integer", - "description": "number of items to skip", - }, - { - "name": "_limit", - "in": "query", - "type": "integer", - "default": default, - "maximum": maximum, - "description": "maximum number of items to return", - }, - { - "name": "page", - "in": "query", - "type": "integer", - "description": "page number to return (in batches of `per_page/_limit`; alternative to `_skip`)", - }, - { - "name": "per_page", - "in": "query", - "type": "integer", - "default": default, - "maximum": maximum, - "description": "maximum number of items to return per page (same as `_limit`)", - }, - ] - - -def get_filter_params(name, filters): - filter_params = [] - is_pattern = isinstance(name, Pattern) - label = name.pattern if is_pattern else name - for op in filters: - if op.op == "exact" and not is_pattern: - name = label - description = f"filter {label}" - else: - suffix = op.suf if hasattr(op, "suf") else op.op - name = f"{label}__{suffix}" - description = f"filter {label} via ${op.op}" - - filter_params.append( - { - "name": name, - "in": "query", - "type": op.typ, - "description": description, - } - ) - if op.typ == "array": - filter_params[-1]["items"] = {"type": "string"} - if hasattr(op, "fmt"): - filter_params[-1]["format"] = op.fmt - - if op.allow_negation: - suffix = "not__" - suffix += op.suf if hasattr(op, "suf") else op.op - name = f"{label}__{suffix}" - description = f"filter {label} via ${op.op}" - param = deepcopy(filter_params[-1]) - param["name"] = name - param["description"] = description - filter_params.append(param) - - return filter_params - - -def get_specs(klass, method, collection): - method_name = method.__name__ if hasattr(method, "__name__") else method - default_response = { - "description": "Error", - "schema": {"type": "object", "properties": {"error": {"type": "string"}}}, - } - id_field = klass.resource.document._meta["id_field"].capitalize() - doc_name = collection[:-1].capitalize() - fields_param = None - if klass.resource.fields is not None: - fields_avail = klass.resource.fields + klass.resource.get_optional_fields() + ["_all"] - description = f"List of fields to include in response ({fields_avail})." - description += " Use dot-notation for nested subfields." - fields_param = { - "name": "_fields", - "in": "query", - "default": klass.resource.fields, - "type": "array", - "items": {"type": "string"}, - "description": description, - } - - field_pagination_params = [] - for field, limits in klass.resource.fields_to_paginate.items(): - field_pagination_params.append( - { - "name": f"{field}_page", - "in": "query", - "default": 1, - "type": "integer", - "description": f"page to retrieve for {field} field", - } - ) - field_pagination_params.append( - { - "name": f"{field}_per_page", - "in": "query", - "default": limits[0], - "maximum": limits[1], - "type": "integer", - "description": f"number of items to retrieve per page for {field} field", - } - ) - - filter_params = [] - if hasattr(klass.resource, "filters"): - for k, v in klass.resource.filters.items(): - filter_params += get_filter_params(k, v) - - order_params = [] - if klass.resource.allowed_ordering: - allowed_ordering = [o.pattern if isinstance(o, Pattern) else o for o in klass.resource.allowed_ordering] - order_params = [ - { - "name": "_sort", - "in": "query", - "type": "string", - "description": f"sort {collection} via {allowed_ordering}. Prepend +/- for asc/desc.", - } - ] - - spec = None - if method_name == "Fetch": - params = [ - { - "name": "pk", - "in": "path", - "type": "string", - "required": True, - "description": f"{collection[:-1]} (primary key)", - } - ] - if fields_param is not None: - params.append(fields_param) - params += field_pagination_params - spec = { - "summary": f"Retrieve a {collection[:-1]}.", - "operationId": f"get{doc_name}By{id_field}", - "parameters": params, - "responses": { - 200: { - "description": f"single {collection} entry", - "schema": {"$ref": f"#/definitions/{klass.schema_name}"}, - }, - "default": default_response, - }, - } - - elif method_name == "BulkFetch": - params = [fields_param] if fields_param is not None else [] - params += field_pagination_params - params += order_params - params += filter_params - schema_props = { - "data": { - "type": "array", - "items": {"$ref": f"#/definitions/{klass.schema_name}"}, - } - } - if klass.resource.paginate: - schema_props["has_more"] = {"type": "boolean"} - schema_props["total_count"] = {"type": "integer"} - schema_props["total_pages"] = {"type": "integer"} - params += get_limit_params(klass.resource, method_name) - spec = { - "summary": f"Filter and retrieve {collection}.", - "operationId": f"query{doc_name}s", - "parameters": params, - "responses": { - 200: { - "description": f"list of {collection}", - "schema": {"type": "object", "properties": schema_props}, - }, - "default": default_response, - }, - } - - elif method_name == "Download": - params = [ - { - "name": "short_mime", - "in": "path", - "type": "string", - "required": True, - "description": "MIME Download Type: gz", - "default": "gz", - }, - { - "name": "format", - "in": "query", - "type": "string", - "required": True, - "description": f"download {collection} in different formats: {klass.resource.download_formats}", - }, - ] - params += [fields_param] if fields_param is not None else [] - params += order_params - params += filter_params - if klass.resource.paginate: - params += get_limit_params(klass.resource, method_name) - spec = { - "summary": f"Filter and download {collection}.", - "operationId": f"download{doc_name}s", - "parameters": params, - "produces": ["application/gzip"], - "responses": { - 200: { - "description": f"{collection} download", - "schema": {"type": "file"}, - }, - "default": default_response, - }, - } - - elif method_name == "Create": - spec = { - "summary": f"Create a new {collection[:-1]}.", - "operationId": f"create{doc_name}", - "parameters": [ - { - "name": f"{collection[:-1]}", - "in": "body", - "description": f"The object to use for {collection[:-1]} creation", - "schema": {"$ref": f"#/definitions/{klass.schema_name}"}, - } - ], - "responses": { - 200: { - "description": f"{collection[:-1]} created", - "schema": {"$ref": f"#/definitions/{klass.schema_name}"}, - }, - "default": default_response, - }, - } - - elif method_name == "BulkCreate": - spec = { - "summary": f"Create new {collection[:-1]}(s).", - "operationId": f"create{doc_name}s", - "parameters": [ - { - "name": f"{collection}", - "in": "body", - "description": f"The objects to use for {collection[:-1]} creation", - "schema": { - "type": "array", - "items": {"$ref": f"#/definitions/{klass.schema_name}"}, - }, - } - ], - "responses": { - 200: { - "description": f"{collection} created", - "schema": { - "type": "object", - "properties": { - "count": {"type": "integer"}, - "data": { - "type": "array", - "items": {"$ref": f"#/definitions/{klass.schema_name}"}, - }, - }, - }, - }, - "default": default_response, - }, - } - - elif method_name == "Update": - spec = { - "summary": f"Update a {collection[:-1]}.", - "operationId": f"update{doc_name}By{id_field}", - "parameters": [ - { - "name": "pk", - "in": "path", - "type": "string", - "required": True, - "description": f"The {collection[:-1]} (primary key) to update", - }, - { - "name": f"{collection[:-1]}", - "in": "body", - "description": f"The object to use for {collection[:-1]} update", - "schema": {"type": "object"}, - }, - ], - "responses": { - 200: { - "description": f"{collection[:-1]} updated", - "schema": {"$ref": f"#/definitions/{klass.schema_name}"}, - }, - "default": default_response, - }, - } - elif method_name == "BulkUpdate": - params = filter_params - params.append( - { - "name": f"{collection}", - "in": "body", - "description": f"The object to use for {collection} bulk update", - "schema": {"type": "object"}, - } - ) - schema_props = {"count": {"type": "integer"}} - if klass.resource.paginate: - schema_props["has_more"] = {"type": "boolean"} - schema_props["total_count"] = {"type": "integer"} - schema_props["total_pages"] = {"type": "integer"} - params += get_limit_params(klass.resource, method_name) - spec = { - "summary": f"Filter and update {collection}.", - "operationId": f"update{doc_name}s", - "parameters": params, - "responses": { - 200: { - "description": f"Number of {collection} updated", - "schema": {"type": "object", "properties": schema_props}, - }, - "default": default_response, - }, - } - - elif method_name == "BulkDelete": - params = filter_params - schema_props = {"count": {"type": "integer"}} - if klass.resource.paginate: - schema_props["has_more"] = {"type": "boolean"} - schema_props["total_count"] = {"type": "integer"} - schema_props["total_pages"] = {"type": "integer"} - params += get_limit_params(klass.resource, method_name) - spec = { - "summary": f"Filter and delete {collection}.", - "operationId": f"delete{doc_name}s", - "parameters": params, - "responses": { - 200: { - "description": f"Number of {collection} deleted", - "schema": {"type": "object", "properties": schema_props}, - }, - "default": default_response, - }, - } - - elif method_name == "Delete": - spec = { - "summary": f"Delete a {collection[:-1]}.", - "operationId": f"delete{doc_name}By{id_field}", - "parameters": [ - { - "name": "pk", - "in": "path", - "type": "string", - "required": True, - "description": f"The {collection[:-1]} (primary key) to delete", - } - ], - "responses": { - 200: {"description": f"{collection[:-1]} deleted"}, - "default": default_response, - }, - } - - return spec - - -class SwaggerView(OriginalSwaggerView, ResourceView): - """A class-based view defining additional methods.""" - - def __init_subclass__(cls, **kwargs): - """Initialize Schema, decorators, definitions, and tags.""" - super().__init_subclass__(**kwargs) - - if not __name__ == cls.__module__: - # e.g.: cls.__module__ = mpcontribs.api.projects.views - views_path = cls.__module__.split(".") - doc_path = ".".join(views_path[:-1] + ["document"]) - cls.tags = [views_path[-2]] - doc_filepath = doc_path.replace(".", os.sep) + ".py" - if os.path.exists(doc_filepath): - cls.doc_name = cls.tags[0].capitalize() - Model = getattr(import_module(doc_path), cls.doc_name) - cls.schema_name = cls.doc_name + "Schema" - cls.Schema = type( - cls.schema_name, - (ModelSchema, object), - { - "Meta": type( - "Meta", - (object,), - dict(model=Model, ordered=True, model_build_obj=False), - ) - }, - ) - cls.definitions = {cls.schema_name: schema2jsonschema(cls.Schema)} - cls.resource.schema = cls.Schema - - # write flask-mongorest swagger specs - for method in cls.methods: - spec = get_specs(cls, method, cls.tags[0]) - if spec: - dir_path = os.path.join(DOC_DIR, cls.tags[0]) - file_path = os.path.join(dir_path, method.__name__ + ".yml") - if not os.path.exists(file_path): - os.makedirs(dir_path, exist_ok=True) - - if is_gunicorn: - with open(file_path, "w") as f: - yaml.dump(spec, f) - logger.debug(f"{cls.tags[0]}.{method.__name__} written to {file_path}") - - def get_groups(self, request): - groups = request.headers.get("X-Authenticated-Groups", "").split(",") - groups += request.headers.get("X-Consumer-Groups", "").split(",") - return set(grp.strip() for grp in groups if grp) - - def is_anonymous(self, request): - if not request.headers.get("X-Consumer-Username", ""): - return True - - is_anonymous = request.headers.get("X-Anonymous-Consumer", False) - if isinstance(is_anonymous, str): - is_anonymous = False if is_anonymous == "false" else True - - return is_anonymous - - def is_external(self, request): - return request.headers.get("X-Forwarded-Host") is not None and not request.headers.get("Origin") - - def is_admin(self, request): - groups = self.get_groups(request) - admin_group = os.environ.get("ADMIN_GROUP", "admin") - return admin_group in groups - - def is_project_user(self, request, obj): - if hasattr(obj, "owner"): - owner = obj.owner - project = obj.name - elif hasattr(obj, "project"): - owner = obj.project.owner - project = obj.project.name - else: - raise Unauthorized(f"Unable to authorize {obj}") - - groups = self.get_groups(request) - username = request.headers.get("X-Consumer-Username") - return project in groups or owner == username - - def is_admin_or_project_user(self, request, obj): - if self.is_anonymous(request): - return False - - if self.is_admin(request): - return True - - return self.is_project_user(request, obj) - - def get_projects(self): - # project is LazyReferenceFields (multiple queries) - module = import_module("mpcontribs.api.projects.document") - Projects = module.Projects - exclude = list(Projects._fields.keys()) - only = ["name", "owner", "is_public", "is_approved"] - return Projects.objects.exclude(*exclude).only(*only) - - def get_projects_filter(self, username, groups, filter_names=None): - projects = self.get_projects() - if filter_names: - projects = projects.filter(name__in=filter_names) - - q = {"private": [], "public": []} - - for project in projects: - if project.owner == username or project.name in groups: - q["private"].append(project.name) - elif project.is_public and project.is_approved: - q["public"].append(project.name) - - # reduced query - qfilter = Q() - if q["private"]: - qfilter |= Q(project__in=q["private"]) - if q["public"]: - qfilter |= Q(project__in=q["public"], is_public=True) - - return qfilter - - def has_read_permission(self, request, qs): - if self.is_admin(request): - return qs # admins can read all entries - - groups = self.get_groups(request) - is_anonymous = self.is_anonymous(request) - is_external = self.is_external(request) - username = request.headers.get("X-Consumer-Username") - approved_public_filter = Q(is_public=True, is_approved=True) - - if request.path.startswith("/projects/"): - # external or internal requests can both read full project info - # anonymous requests can only read public approved projects - if is_anonymous: - return qs.filter(approved_public_filter) - - # authenticated requests can read approved public or accessible non-public projects - qfilter = approved_public_filter | Q(owner=username) - if groups: - qfilter |= Q(name__in=list(groups)) - - return qs.filter(qfilter) - else: - # contributions are set private/public independent from projects - # anonymous requests: - # - external: only meta-data of public contributions in approved public projects - # - internal: full public contributions in approved public projects - # authenticated requests: - # - private contributions in a public project are only accessible to owner/group - # - any contributions in a private project are only accessible to owner/group - component = request.path.split("/")[1] - - if component == "contributions": - q = qs._query - if is_anonymous and is_external: - qs = qs.exclude("data") - - if q and "project" in q and isinstance(q["project"], str): - projects = self.get_projects() - try: - project = projects.get(name=q["project"]) - except DoesNotExist: - return qs.none() - - if project.owner == username or project.name in groups: - return qs - elif project.is_public and project.is_approved: - return qs.filter(is_public=True) - else: - return qs.none() - else: - names = None - if q and "project" in q and "$in" in q["project"]: - names = q.pop("project").pop("$in") - - qfilter = self.get_projects_filter(username, groups, filter_names=names) - return qs.filter(qfilter) - else: - # get component Object IDs for queryset - pk = request.view_args.get("pk") - from mpcontribs.api.contributions.document import get_resource - - resource = get_resource(component) - - def qfilter(qs): - return qs.clone() - - if pk: - ids = [resource.get_object(pk, qfilter=qfilter).id] - else: - ids = [o.id for o in resource.get_objects(qfilter=qfilter)[0]] - - if not ids: - return qs.none() - - # get list of readable contributions and their component Object IDs - module = import_module("mpcontribs.api.contributions.document") - Contributions = module.Contributions - qfilter = self.get_projects_filter(username, groups) - component = component[:-1] if component == "notebooks" else component - qfilter &= Q(**{f"{component}__in": ids}) - contribs = Contributions.objects(qfilter).only(component).limit(len(ids)) - # return new queryset using "ids__in" - readable_ids = ( - [getattr(contrib, component).id for contrib in contribs] - if component == "notebook" - else [dbref.id for contrib in contribs for dbref in getattr(contrib, component) if dbref.id in ids] - ) - if not readable_ids: - return qs.none() - - qs._query_obj = Q(id__in=readable_ids) - # exclude optional fields if anonymous external request - if is_anonymous and is_external: - exclude = resource.get_optional_fields() - qs = qs.exclude(*exclude) - - return qs - - def has_add_permission(self, request, obj): - return self.is_admin_or_project_user(request, obj) - - def has_change_permission(self, request, obj): - return self.is_admin_or_project_user(request, obj) - - def has_delete_permission(self, request, obj): - return self.is_admin_or_project_user(request, obj) diff --git a/mpcontribs-api/src/mpcontribs_api/old/dashboard.cfg b/mpcontribs-api/src/mpcontribs_api/old/dashboard.cfg deleted file mode 100644 index ef84c47162..0000000000 --- a/mpcontribs-api/src/mpcontribs_api/old/dashboard.cfg +++ /dev/null @@ -1,7 +0,0 @@ -[dashboard] -SAMPLING_PERIOD=20 -MONITOR_LEVEL=3 -ENABLE_LOGGING=True - -[visualization] -TIMEZONE=America/New_York diff --git a/mpcontribs-api/src/mpcontribs_api/old/notebooks/__init__.py b/mpcontribs-api/src/mpcontribs_api/old/notebooks/__init__.py deleted file mode 100644 index 85f493d150..0000000000 --- a/mpcontribs-api/src/mpcontribs_api/old/notebooks/__init__.py +++ /dev/null @@ -1,65 +0,0 @@ -from uuid import uuid1 - -from flask import current_app -from mpcontribs.api import create_kernel_connection, get_logger -from tornado.escape import json_decode, json_encode - -logger = get_logger(__name__) - - -def run_cells(kernel_id, cid, cells): - logger.debug(f"running {cid} on {kernel_id}") - ws = create_kernel_connection(kernel_id) - outputs = {} - - for idx, cell in enumerate(cells): - if cell["cell_type"] == "code": - ws.send( - json_encode( - { - "header": { - "username": cid, - "version": "5.3", - "session": "", - "msg_id": f"{cid}-{idx}-{uuid1()}", - "msg_type": "execute_request", - }, - "parent_header": {}, - "channel": "shell", - "content": { - "code": cell["source"], - "silent": False, - "store_history": False, - "user_expressions": {}, - "allow_stdin": False, - "stop_on_error": True, - }, - "metadata": {}, - "buffers": [], - } - ) - ) - - outputs[idx] = [] - status = None - while status is None or status == "busy" or not len(outputs[idx]): - msg = ws.recv() - msg = json_decode(msg) - msg_type = msg["msg_type"] - if msg_type == "status": - status = msg["content"]["execution_state"] - elif msg_type in ["stream", "display_data", "execute_result"]: - # display_data/execute_result required fields: - # "output_type", "data", "metadata" - # stream required fields: "output_type", "name", "text" - output = msg["content"] - output.pop("transient", None) - output["output_type"] = msg_type - msg_idx = msg["parent_header"]["msg_id"].split("-")[1] - outputs[int(msg_idx)].append(output) - elif msg_type == "error": - tb = msg["content"]["traceback"] - raise ValueError(tb) - - ws.close() - return outputs diff --git a/mpcontribs-api/src/mpcontribs_api/old/notebooks/document.py b/mpcontribs-api/src/mpcontribs_api/old/notebooks/document.py deleted file mode 100644 index dd112f19f2..0000000000 --- a/mpcontribs-api/src/mpcontribs_api/old/notebooks/document.py +++ /dev/null @@ -1,106 +0,0 @@ -import hashlib -import os -from base64 import b64decode, b64encode -from io import BytesIO - -import boto3 -from flask_mongoengine.documents import Document -from mongoengine import signals -from mongoengine.fields import DictField, IntField, ListField, StringField -from mongoengine.queryset.manager import queryset_manager - -BUCKET = os.environ.get("S3_IMAGES_BUCKET", "mpcontribs-images") -S3_DOWNLOAD_URL = f"https://{BUCKET}.s3.amazonaws.com" -s3_client = boto3.client("s3") - - -class Kernelspec(DictField): - name = StringField(required=True, default="python3") - display_name = StringField(required=True, default="Python 3") - language = StringField() - - -class CodemirrorMode(DictField): - name = StringField(required=True, default="ipython") - version = IntField(required=True, default=3) - - -class LanguageInfo(DictField): - name = StringField(required=True, default="python") - file_extension = StringField() - mimetype = StringField() - nbconvert_exporter = StringField() - pygments_lexer = StringField() - version = StringField() - codemirror_mode = DictField(CodemirrorMode(), default=CodemirrorMode, help_text="codemirror") - - -class Metadata(DictField): - kernelspec = DictField(Kernelspec(), required=True, help_text="kernelspec", default=Kernelspec) - language_info = DictField(LanguageInfo(), required=True, help_text="language info", default=LanguageInfo) - - -class Cell(DictField): - cell_type = StringField(required=True, default="code", help_text="cell type") - metadata = DictField(help_text="cell metadata") - source = StringField(required=True, default="print('hello')", help_text="source") - outputs = ListField(DictField(), required=True, help_text="outputs", default=lambda: [DictField()]) - execution_count = IntField(help_text="exec count") - - -class Notebooks(Document): - nbformat = IntField(default=4, help_text="nbformat version") - nbformat_minor = IntField(default=4, help_text="nbformat minor version") - metadata = DictField(Metadata(), help_text="notebook metadata") - cells = ListField(Cell(), max_length=30, help_text="cells") - meta = {"collection": "notebooks"} - - problem_key = "application/vnd.plotly.v1+json" - escaped_key = problem_key.replace(".", "~dot~") - - @queryset_manager - def objects(doc_cls, queryset): - return queryset.only("nbformat", "nbformat_minor") - - @classmethod - def post_init(cls, sender, document, **kwargs): - if document.id: - document.transform(incoming=False) - - def transform(self, incoming=True): - if incoming: - old_key = self.problem_key - new_key = self.escaped_key - else: - old_key = self.escaped_key - new_key = self.problem_key - - for cell in self.cells: - for output in cell.get("outputs", []): - data = output.get("data", {}) - if old_key in data: - output["data"][new_key] = output["data"].pop(old_key) - - if "image/png" in data: - if incoming: - contents = data.pop("image/png") # base64 encoded - key = hashlib.sha1(contents.encode("utf-8")).hexdigest() - s3_client.put_object( - Bucket=BUCKET, - Key=key, - ContentType="image/png", - Body=b64decode(contents), - ) - data["image/png"] = key - elif len(data["image/png"]) == 40: - key = data.pop("image/png") - # TODO catch key doesn't exist - retr = s3_client.get_object(Bucket=BUCKET, Key=key) - gzip_buffer = BytesIO(retr["Body"].read()) - data["image/png"] = b64encode(gzip_buffer.getvalue()).decode() - - def clean(self): - self.transform() - - -signals.post_init.connect(Notebooks.post_init, sender=Notebooks) diff --git a/mpcontribs-api/src/mpcontribs_api/old/notebooks/views.py b/mpcontribs-api/src/mpcontribs_api/old/notebooks/views.py deleted file mode 100644 index a0d7ec2749..0000000000 --- a/mpcontribs-api/src/mpcontribs_api/old/notebooks/views.py +++ /dev/null @@ -1,301 +0,0 @@ -import os -import time - -import flask_mongorest -import requests -from flask import Blueprint, abort, current_app, jsonify, request -from flask_mongorest import operators as ops -from flask_mongorest.methods import BulkFetch, Fetch -from flask_mongorest.resources import Resource -from flask_rq2 import RQ -from gevent import sleep -from mongoengine.errors import DoesNotExist -from mongoengine.queryset.visitor import Q -from mpcontribs.api import get_kernel_endpoint, get_logger -from mpcontribs.api.contributions.document import Contributions -from mpcontribs.api.core import SwaggerView -from mpcontribs.api.notebooks import run_cells -from mpcontribs.api.notebooks.document import Notebooks -from nbformat import v4 as nbf -from rq import get_current_job -from rq.job import Job - -logger = get_logger(__name__) -templates = os.path.join(os.path.dirname(flask_mongorest.__file__), "templates") -notebooks = Blueprint("notebooks", __name__, template_folder=templates) - -MPCONTRIBS_API_HOST = os.environ.get("MPCONTRIBS_API_HOST", "default") -ADMIN_GROUP = os.environ.get("ADMIN_GROUP", "admin") - -rq = RQ() -rq.default_queue = f"notebooks_{MPCONTRIBS_API_HOST}" -rq.queues = [rq.default_queue] - - -class NotebooksResource(Resource): - document = Notebooks - filters = {"id": [ops.In, ops.Exact]} - fields = ["id", "nbformat", "nbformat_minor"] - paginate = True - default_limit = 10 - max_limit = 100 - - @staticmethod - def get_optional_fields(): - return ["metadata", "cells"] - - -class NotebooksView(SwaggerView): - resource = NotebooksResource - methods = [Fetch, BulkFetch] - - -def execute_cells(cid, cells): - ntries = 0 - while ntries < 5: - for kernel_id, running_cid in current_app.kernels.items(): - if running_cid is None: - current_app.kernels[kernel_id] = cid - try: - outputs = run_cells(kernel_id, cid, cells) - except: - current_app.kernels[kernel_id] = None - raise - - current_app.kernels[kernel_id] = None - return outputs - else: - logger.warning(f"{kernel_id} busy with {running_cid}") - - logger.warning("WAITING for a kernel to become available") - sleep(5) - ntries += 1 - - -@notebooks.route("/build") -def build(): - if not getattr(current_app, "kernels", None): - abort(404, description="No kernels available.") - - cids = request.args.get("cids") - projects = request.args.get("projects") - force = bool(request.args.get("force", 0)) - kwargs = dict(force=force) - - if projects: - kwargs["projects"] = projects.split(",") - - if cids: - kwargs["cids"] = cids.split(",") - - if len(kwargs.get("cids", [])) == 1: - return jsonify(make(**kwargs)) - - job = make.queue(**kwargs) - return job.id - - -def restart_kernels(): - """Use to avoid run-away memory.""" - kernel_ids = [k for k, v in current_app.kernels.items() if v is None] - - for kernel_id in kernel_ids: - kernel_url = get_kernel_endpoint(kernel_id) + "/restart" - requests.post(kernel_url, json={}) - cells = [nbf.new_code_cell("\n".join(["from mpcontribs.client import Client", "print('client imported')"]))] - run_cells(kernel_id, "import_client", cells) - - -@notebooks.route("/result", defaults={"job_id": None}) -@notebooks.route("/result/") -def result(job_id): - if not current_app.kernels: - abort(404, description="No kernels available.") - - if not job_id: - job_id = f"cron-{current_app.cron_job_id}" - - try: - job = Job.fetch(job_id, connection=rq.connection) - except Exception as exception: - abort(404, description=exception) - - if not job.is_finished: - return job.get_status() - elif not job.result: - description = f"No result for job_id {job.id} (exc: {job.exc_info})." - abort(404, description=description) - - return jsonify(job.result) - - -@rq.job() -def make(projects=None, cids=None, force=False): - """Build the notebook / details page.""" - start = time.perf_counter() - remaining_time = rq.default_timeout - 5 - mask = ["id", "needs_build", "notebook"] - query = Q() - - if projects: - query &= Q(project__in=projects) - if cids: - query &= Q(id__in=cids) - if not force: - query &= Q(needs_build=True) | Q(needs_build__exists=False) - - job = get_current_job() - ret = {"input": {"projects": projects, "cids": cids, "force": force}} - if job: - ret["job"] = { - "id": job.id, - "enqueued_at": job.enqueued_at.isoformat(), - "started_at": job.started_at.isoformat(), - } - - exclude = list(Contributions._fields.keys()) - documents = Contributions.objects(query).exclude(*exclude).only(*mask) - total = documents.count() - count = 0 - - for idx, document in enumerate(documents): - stop = time.perf_counter() - remaining_time -= stop - start - - if remaining_time < 0: - if job: - restart_kernels() - - ret["result"] = {"status": "TIMEOUT", "count": count, "total": total} - return ret - - start = time.perf_counter() - - if not force and document.notebook and not getattr(document, "needs_build", True): - continue - - if document.notebook: - try: - nb = Notebooks.objects.get(id=document.notebook.id) - nb.delete() - document.update(unset__notebook="") - logger.debug(f"Notebook {document.notebook.id} deleted.") - except DoesNotExist: - pass - - cid = str(document.id) - logger.debug(f"prep notebook for {cid} ...") - document.reload("tables", "structures", "attachments") - - cells = [ - # define client only once in kernel - # avoids API calls for regex expansion for query parameters - nbf.new_code_cell( - "\n".join( - [ - "if 'client' not in locals():", - "\tclient = Client(", - f'\t\theaders={{"X-Authenticated-Groups": "{ADMIN_GROUP}"}},', - f'\t\thost="{MPCONTRIBS_API_HOST}"', - "\t)", - "print(client.get_totals())", - # return something. See while loop in `run_cells` - ] - ) - ), - nbf.new_code_cell("\n".join([f'c = client.get_contribution("{document.id}")', "c.display()"])), - ] - - if document.tables: - cells.append(nbf.new_markdown_cell("## Tables")) - for table in document.tables: - cells.append(nbf.new_code_cell("\n".join([f't = client.get_table("{table.id}")', "t.display()"]))) - - if document.structures: - cells.append(nbf.new_markdown_cell("## Structures")) - for structure in document.structures: - cells.append( - nbf.new_code_cell( - "\n".join( - [ - f's = client.get_structure("{structure.id}")', - "s.display()", - ] - ) - ) - ) - - if document.attachments: - cells.append(nbf.new_markdown_cell("## Attachments")) - for attachment in document.attachments: - cells.append( - nbf.new_code_cell( - "\n".join( - [ - f'a = client.get_attachment("{attachment.id}")', - "a.info()", - ] - ) - ) - ) - - try: - outputs = execute_cells(cid, cells) - except Exception as e: - if job: - restart_kernels() - - ret["result"] = { - "status": "ERROR", - "cid": cid, - "count": count, - "total": total, - "exc": str(e), - } - return ret - - if not outputs: - if job: - restart_kernels() - - ret["result"] = { - "status": "ERROR: NO OUTPUTS", - "cid": cid, - "count": count, - "total": total, - } - return ret - - for idx, output in outputs.items(): - cells[idx]["outputs"] = output - - doc = nbf.new_notebook() - doc["cells"] = [ - nbf.new_code_cell("from mpcontribs.client import Client"), - nbf.new_code_cell("client = Client()"), - ] - doc["cells"] += cells[1:] # skip localhost Client - - try: - nb = Notebooks(**doc).save() - document.update(notebook=nb, needs_build=False) - except Exception as e: - if job: - restart_kernels() - - ret["result"] = { - "status": "ERROR", - "cid": cid, - "count": count, - "total": total, - "exc": str(e), - } - return ret - - count += 1 - - if total and job: - restart_kernels() - - ret["result"] = {"status": "COMPLETED", "count": count, "total": total} - return ret diff --git a/mpcontribs-api/src/mpcontribs_api/old/projects/__init__.py b/mpcontribs-api/src/mpcontribs_api/old/projects/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/mpcontribs-api/src/mpcontribs_api/old/projects/document.py b/mpcontribs-api/src/mpcontribs_api/old/projects/document.py deleted file mode 100644 index 45c3319d50..0000000000 --- a/mpcontribs-api/src/mpcontribs_api/old/projects/document.py +++ /dev/null @@ -1,361 +0,0 @@ -import urllib -from collections import ChainMap -from math import isnan - -from atlasq import AtlasManager, AtlasQ -from boltons.iterutils import remap -from flask import current_app, render_template, request, url_for -from flatten_dict import flatten -from marshmallow import ValidationError -from marshmallow.fields import String -from marshmallow.validate import Email as EmailValidator -from marshmallow_mongoengine.conversion import params -from marshmallow_mongoengine.conversion.fields import register_field -from mongoengine import Document, EmbeddedDocument, signals -from mongoengine.fields import ( - BooleanField, - DecimalField, - DictField, - EmailField, - EmbeddedDocumentField, - EmbeddedDocumentListField, - FloatField, - IntField, - StringField, - URLField, -) -from mongoengine.queryset.manager import queryset_manager -from mpcontribs.api import delimiter, enter, send_email, valid_dict, valid_key - -PROVIDERS = {"github", "google", "facebook", "microsoft", "amazon", "portier"} -MAX_COLUMNS = 160 - - -def visit(path, key, value): - from mpcontribs.api.contributions.document import quantity_keys - - # pull out units - if isinstance(value, dict) and "unit" in value: - return key, value["unit"] - elif isinstance(value, (str, bool)) and key not in quantity_keys: - return key, None - - return True - - -class ProviderEmailField(EmailField): - """Field to validate usernames of format :.""" - - def validate(self, value): - if value.count(":") != 1: - self.error(self.error_msg % value) - - provider, email = value.split(":", 1) - - if provider not in PROVIDERS: - self.error("{} {}".format(self.error_msg % value, "(invalid provider)")) - - super().validate(email) - - -class ProviderEmailValidator(EmailValidator): - def __call__(self, value): - message = self._format_error(value) - - if value.count(":") != 1: - raise ValidationError(message) - - provider, email = value.split(":", 1) - - if provider not in PROVIDERS: - raise ValidationError(message) - - super().__call__(email) - return value - - -class ProviderEmail(String): - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - validator = ProviderEmailValidator(error="Not a valid MP username ({input}).") - self.validators.insert(0, validator) - - -def dict_wo_nans(d): - return {k: v for k, v in d.items() if k in ["min", "max"] and not isnan(v)} - - -class Column(EmbeddedDocument): - path = StringField(required=True, help_text="column path in dot-notation") - min = FloatField(required=True, default=float("nan"), help_text="column minimum") - max = FloatField(required=True, default=float("nan"), help_text="column maximum") - unit = StringField(required=True, default="NaN", help_text="column unit") - - def __eq__(self, other): - if isinstance(other, self.__class__): - return dict_wo_nans(self._data) == dict_wo_nans(other._data) - return False - - -class Reference(EmbeddedDocument): - label = StringField( - required=True, - min_length=3, - max_length=20, - help_text="label", - validation=valid_key, - ) - url = URLField(required=True, help_text="URL") - - -class Stats(EmbeddedDocument): - columns = IntField(required=True, default=0, help_text="#columns") - contributions = IntField(required=True, default=0, help_text="#contributions") - tables = IntField(required=True, default=0, help_text="#tables") - structures = IntField(required=True, default=0, help_text="#structures") - attachments = IntField(required=True, default=0, help_text="#attachments") - size = DecimalField(required=True, default=0, precision=1, help_text="size in MB") - - -class Projects(Document): - __project_regex__ = "^[a-zA-Z0-9_]{3,31}$" - name = StringField( - min_length=3, - max_length=30, - regex=__project_regex__, - primary_key=True, - help_text=f"project name/slug (valid format: `{__project_regex__}`)", - ) - is_public = BooleanField(required=True, default=False, help_text="public/private project") - title = StringField( - min_length=5, - max_length=30, - required=True, - unique=True, - help_text="short title for the project/dataset", - ) - long_title = StringField( - min_length=5, - max_length=55, - help_text="optional full title for the project/dataset", - ) - authors = StringField( - required=True, - help_text="comma-separated list of authors", - # TODO change to EmbeddedDocumentListField - ) - description = StringField( - min_length=5, - max_length=2000, - required=True, - help_text="brief description of the project", - ) - references = EmbeddedDocumentListField( - Reference, - required=True, - min_length=1, - max_length=20, - help_text="list of references", - ) - license = StringField( - choices=["CCA4", "CCPD"], - default="CCA4", - required=True, - help_text="license (see https://materialsproject.org/about/terms)", - ) - other = DictField(validation=valid_dict, null=True, help_text="other information") - owner = ProviderEmailField(unique_with="name", help_text="owner / corresponding email") - is_approved = BooleanField(required=True, default=False, help_text="project approved?") - unique_identifiers = BooleanField(required=True, default=True, help_text="identifiers unique?") - columns = EmbeddedDocumentListField(Column, max_length=MAX_COLUMNS) - stats = EmbeddedDocumentField(Stats, required=True, default=Stats) - atlas = AtlasManager("mpcontribs-dev-project-search") - meta = { - "collection": "projects", - "indexes": ["is_public", "title", "owner", "is_approved", "unique_identifiers"], - } - - @queryset_manager - def objects(doc_cls, queryset): - return queryset.only("name", "is_public", "title", "owner", "is_approved", "unique_identifiers") - - @classmethod - def atlas_filter(cls, term): - # NOTE dynamic index, use `name` as placeholder for wildcard path - return AtlasQ(name=term) - - @classmethod - def post_save(cls, sender, document, **kwargs): - admin_email = current_app.config["MAIL_DEFAULT_SENDER"] - scheme = "http" if current_app.config["DEBUG"] else "https" - - if kwargs.get("created"): - ts = current_app.config["USTS"] - email_project = [document.owner, document.name] - token = ts.dumps(email_project) - link = url_for("projects.applications", token=token, _scheme=scheme, _external=True) - url = url_for("projectsFetch", pk=document.name, _scheme=scheme, _external=True) - url += "?_fields=_all" - html = render_template("admin_email.html", url=url, link=link) - send_email(admin_email, f'New project "{document.name}"', html) - else: - delta_set, delta_unset = document._delta() - - if "is_approved" in delta_set and document.is_approved: - subject = f'Your project "{document.name}" has been approved' - netloc = urllib.parse.urlparse(request.url).netloc.replace("-api", "") - portal = f"{scheme}://{netloc}" - html = render_template( - "owner_email.html", - approved=True, - admin_email=admin_email, - host=portal, - project=document.name, - ) - owner_email = document.owner.split(":", 1)[1] - send_email(owner_email, subject, html) - - if "columns" in delta_set or "columns" in delta_unset or (not delta_set and not delta_unset): - from mpcontribs.api.contributions.document import ( - COMPONENTS, - Contributions, - ) - - columns = {} - ncontribs = Contributions.objects(project=document.id).count() - - if "columns" in delta_set: - # document.columns updated by the user as intended - for col in document.columns: - columns[col.path] = col - elif "columns" in delta_unset or ncontribs: - # document.columns unset by user to reinit all columns from DB - # -> get paths and units across all contributions from DB - pipeline = [ - {"$match": {"project": document.id}}, - {"$sample": {"size": 1000}}, - {"$project": {"data": 1}}, - ] - result = Contributions.objects.aggregate(pipeline) - merged = ChainMap(*result) - flat = flatten(remap(merged, visit=visit, enter=enter), reducer="dot") - - for k, v in flat.items(): - if k.startswith("data."): - columns[k] = Column(path=k) - if v is not None: - columns[k].unit = v - - # start pipeline for stats: match project - pipeline = [{"$match": {"project": document.id}}] - - # resolve/lookup component fields - # NOTE also includes dynamic document fields - # for component in COMPONENTS.keys(): - # pipeline.append( - # { - # "$lookup": { - # "from": component, - # "localField": component, - # "foreignField": "_id", - # "as": component, - # } - # } - # ) - - # document size and attachment content size - project_stage = { - # "_id": 0, - # "size": {"$bsonSize": "$$ROOT"}, - # "contents": { - # "$map": { # attachment sizes - # "input": "$attachments", - # "as": "attm", - # "in": {"$toInt": "$$attm.content"}, - # } - # }, - } - - # number of components - for component in COMPONENTS.keys(): - project_stage[component] = {"$size": f"${component}"} - - # filter/forward number columns - min_max_paths = [path for path, col in columns.items() if col["unit"] != "NaN"] - for path in min_max_paths: - field = f"{path}{delimiter}value" - project_stage[field] = { - "$cond": { - "if": {"$isNumber": f"${field}"}, - "then": f"${field}", - "else": "$$REMOVE", - } - } - - # add project stage to pipeline - pipeline.append({"$project": project_stage}) - - # forward fields and sum attachment contents - project_stage_2 = {k: 1 for k in project_stage.keys()} - # project_stage_2["contents"] = {"$sum": "$contents"} - pipeline.append({"$project": project_stage_2}) - - # total size and total number of components - group_stage = { - "_id": None, - # "size": {"$sum": {"$add": ["$size", "$contents"]}}, - } - for component in COMPONENTS.keys(): - group_stage[component] = {"$sum": f"${component}"} - - # determine min/max for columns - for path in min_max_paths: - field = f"{path}{delimiter}value" - for k in ["min", "max"]: - clean_path = path.replace(delimiter, "__") - key = f"{clean_path}__{k}" - group_stage[key] = {f"${k}": f"${field}"} - - # append group stage and run pipeline - pipeline.append({"$group": group_stage}) - result = list(Contributions.objects.aggregate(pipeline)) - - # set min/max for columns - min_max = {} if not result else result[0] - for clean_path in min_max_paths: - for k in ["min", "max"]: - path = clean_path.replace(delimiter, "__") - m = min_max.get(f"{path}__{k}") - if m is not None: - setattr(columns[clean_path], k, m) - - # prep and save stats - stats_kwargs = {"columns": len(columns), "contributions": ncontribs} - if result and result[0]: - # stats_kwargs["size"] = result[0]["size"] / 1024 / 1024 - for component in COMPONENTS.keys(): - stats_kwargs[component] = result[0].get(component, 0) - if stats_kwargs[component] > 0: - columns[component] = Column(path=component) - - stats = Stats(**stats_kwargs) - document.update(stats=stats, columns=columns.values()) - - @classmethod - def post_delete(cls, sender, document, **kwargs): - admin_email = current_app.config["MAIL_DEFAULT_SENDER"] - subject = f'Your project "{document.name}" has been deleted' - html = render_template( - "owner_email.html", - approved=False, - admin_email=admin_email, - project=document.name, - ) - owner_email = document.owner.split(":", 1)[1] - send_email(owner_email, subject, html) - - -register_field(ProviderEmailField, ProviderEmail, available_params=(params.LengthParam,)) -signals.post_save.connect(Projects.post_save, sender=Projects) -signals.post_delete.connect(Projects.post_delete, sender=Projects) -Projects.atlas.index._set_indexed_fields({"type": "document", "dynamic": True}) diff --git a/mpcontribs-api/src/mpcontribs_api/old/projects/views.py b/mpcontribs-api/src/mpcontribs_api/old/projects/views.py deleted file mode 100644 index 4bba5c4b01..0000000000 --- a/mpcontribs-api/src/mpcontribs_api/old/projects/views.py +++ /dev/null @@ -1,179 +0,0 @@ -import os - -import flask_mongorest -from flask import Blueprint, abort, current_app, jsonify, request, url_for -from flask_mongorest import operators as ops -from flask_mongorest.methods import BulkFetch, Create, Delete, Fetch, Update -from flask_mongorest.resources import Resource -from mongoengine.queryset import DoesNotExist -from mpcontribs.api import FILTERS -from mpcontribs.api.core import SwaggerView -from mpcontribs.api.projects.document import Column, Projects, Reference, Stats -from werkzeug.exceptions import Unauthorized - -templates = os.path.join(os.path.dirname(flask_mongorest.__file__), "templates") -projects = Blueprint("projects", __name__, template_folder=templates) -MAX_PROJECTS = int(os.environ.get("MAX_PROJECTS", 3)) - - -class ColumnResource(Resource): - document = Column - - -class ReferenceResource(Resource): - document = Reference - - -class StatsResource(Resource): - document = Stats - - -class ProjectsResource(Resource): - document = Projects - related_resources = { - "columns": ColumnResource, - "references": ReferenceResource, - "stats": StatsResource, - } - filters = { - "name": FILTERS["STRINGS"], - "is_public": [ops.Boolean], - "title": FILTERS["STRINGS"], - "long_title": FILTERS["LONG_STRINGS"], - "authors": FILTERS["LONG_STRINGS"], - "description": FILTERS["LONG_STRINGS"], - "owner": FILTERS["STRINGS"], - "license": FILTERS["STRINGS"], - "is_approved": [ops.Boolean], - "unique_identifiers": [ops.Boolean], - "columns": [ops.Size], - "stats__columns": FILTERS["NUMBERS"], - "stats__contributions": FILTERS["NUMBERS"], - "stats__tables": FILTERS["NUMBERS"], - "stats__structures": FILTERS["NUMBERS"], - "stats__attachments": FILTERS["NUMBERS"], - "stats__size": FILTERS["NUMBERS"], - } - fields = [ - "name", - "is_public", - "title", - "owner", - "is_approved", - "unique_identifiers", - ] - allowed_ordering = ["name", "is_public", "title"] - paginate = True - default_limit = 100 - max_limit = 500 - - @staticmethod - def get_optional_fields(): - return [ - "long_title", - "authors", - "description", - "references", - "license", - "other", - "columns", - "stats", - ] - - -class ProjectsView(SwaggerView): - resource = ProjectsResource - methods = [Fetch, Create, Delete, Update, BulkFetch] - - def has_add_permission(self, request, obj): - if self.is_anonymous(request): - return False - - obj.owner = request.headers.get("X-Consumer-Username") - if self.is_admin(request): - return True - - data = request.json - if "is_approved" in data or "is_public" in data: - raise Unauthorized("Projects cannot be approved or published on creation.") - - # limit the number of projects a user can own - nr_projects = Projects.objects(owner=obj.owner).count() - if nr_projects > MAX_PROJECTS: - raise Unauthorized(f"{obj.owner} already owns {nr_projects} projects.") - - return True - - def has_change_permission(self, request, obj): - if self.is_anonymous(request): - return False - - if self.is_admin(request): - return True - - if not self.is_project_user(request, obj): - raise Unauthorized("Only project owners and collaborators can edit projects.") - - update = request.json - if "is_approved" in update: - raise Unauthorized("Only admins can (un)approve projects.") - - if "is_public" in update and not obj.is_approved: - raise Unauthorized("Projects can only be published after admin approval.") - - return True - - -@projects.route("/applications/", defaults={"action": None}) -@projects.route("/applications//") -def applications(token, action): - ts = current_app.config["USTS"] - owner, project = ts.loads(token) - - try: - obj = Projects.objects.get(name=project, owner=owner, is_approved=False) - except DoesNotExist: - return f"{project} for {owner} already approved or denied." - - actions = ["approve", "deny"] - if action not in actions: - response = f"

{project}

    " - scheme = "http" if current_app.config["DEBUG"] else "https" - for a in actions: - u = url_for( - "projects.applications", - token=token, - action=a, - _scheme=scheme, - _external=True, - ) - response += f'
  • {a}
    • ' - return response + "
" - - if action == "approve": - obj.reload(*obj._fields.keys()) - obj.is_approved = True - obj.save() # post_save (created=False) sends notification when `is_approved` set - else: - obj.delete() # post_delete signal sends notification - - return f"{project} {action.replace('y', 'ie')}d and {owner} notified." - - -@projects.route("/search") -def search(): - term = request.args.get("term") - if not term: - abort(404, description="Missing search term.") - - pipeline = [ - { - "$search": { - "index": "mpcontribs-dev-project-search", - "text": {"path": {"wildcard": "*"}, "query": term}, - } - }, - {"$project": {"_id": 1}}, - ] - result = [p["_id"] for p in Projects.objects().aggregate(pipeline)] - return jsonify(result) diff --git a/mpcontribs-api/src/mpcontribs_api/old/structures/__init__.py b/mpcontribs-api/src/mpcontribs_api/old/structures/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/mpcontribs-api/src/mpcontribs_api/old/structures/document.py b/mpcontribs-api/src/mpcontribs_api/old/structures/document.py deleted file mode 100644 index c28c9458f5..0000000000 --- a/mpcontribs-api/src/mpcontribs_api/old/structures/document.py +++ /dev/null @@ -1,51 +0,0 @@ -import json -from hashlib import md5 - -from flask_mongoengine.documents import Document -from mongoengine import signals -from mongoengine.fields import DictField, FloatField, ListField, StringField -from mongoengine.queryset.manager import queryset_manager -from pymatgen.core import Structure -from pymatgen.io.cif import CifWriter -from pymatgen.symmetry.analyzer import SymmetryUndeterminedError - - -class Structures(Document): - name = StringField(required=True, help_text="name") - lattice = DictField(required=True, help_text="lattice") - sites = ListField(DictField(), required=True, help_text="sites") - charge = FloatField(null=True, help_text="charge") - md5 = StringField(regex=r"^[a-z0-9]{32}$", unique=True, help_text="md5 sum") - cif = StringField(help_text="CIF string") - meta = {"collection": "structures", "indexes": ["name", "md5"]} - - @queryset_manager - def objects(doc_cls, queryset): - return queryset.only("name", "md5") - - @classmethod - def pre_save_post_validation(cls, sender, document, **kwargs): - from mpcontribs.api.structures.views import StructuresResource - - resource = StructuresResource() - d = resource.serialize(document, fields=["lattice", "sites", "charge"]) - s = json.dumps(d, sort_keys=True).encode("utf-8") - document.md5 = md5(s).hexdigest() - structure = Structure.from_dict(d) - writer = None - - for symprec_log in range(-10, 0, 3): - try: - writer = CifWriter(structure, symprec=10**symprec_log) - break - except SymmetryUndeterminedError: - continue - - if not writer: - # save CIF string without symmetry information - writer = CifWriter(structure) - - document.cif = writer.__str__() - - -signals.pre_save_post_validation.connect(Structures.pre_save_post_validation, sender=Structures) diff --git a/mpcontribs-api/src/mpcontribs_api/old/structures/views.py b/mpcontribs-api/src/mpcontribs_api/old/structures/views.py deleted file mode 100644 index 00fa873568..0000000000 --- a/mpcontribs-api/src/mpcontribs_api/old/structures/views.py +++ /dev/null @@ -1,38 +0,0 @@ -import os - -import flask_mongorest -from flask import Blueprint -from flask_mongorest import operators as ops -from flask_mongorest.methods import BulkFetch, Download, Fetch -from flask_mongorest.resources import Resource -from mpcontribs.api import FILTERS -from mpcontribs.api.core import SwaggerView -from mpcontribs.api.structures.document import Structures - -templates = os.path.join(os.path.dirname(flask_mongorest.__file__), "templates") -structures = Blueprint("structures", __name__, template_folder=templates) - - -class StructuresResource(Resource): - document = Structures - filters = { - "id": [ops.In, ops.Exact], - "md5": [ops.In, ops.Exact], - "name": FILTERS["STRINGS"], - "sites": [ops.Size], - } - fields = ["id", "name", "md5"] - allowed_ordering = ["name"] - paginate = True - default_limit = 10 - max_limit = 100 - download_formats = ["json", "csv"] - - @staticmethod - def get_optional_fields(): - return ["lattice", "sites", "charge", "cif"] - - -class StructuresView(SwaggerView): - resource = StructuresResource - methods = [Fetch, BulkFetch, Download] diff --git a/mpcontribs-api/src/mpcontribs_api/old/tables/__init__.py b/mpcontribs-api/src/mpcontribs_api/old/tables/__init__.py deleted file mode 100644 index b6d53222f4..0000000000 --- a/mpcontribs-api/src/mpcontribs_api/old/tables/__init__.py +++ /dev/null @@ -1 +0,0 @@ -"""Document and views for tables collection.""" diff --git a/mpcontribs-api/src/mpcontribs_api/old/tables/document.py b/mpcontribs-api/src/mpcontribs_api/old/tables/document.py deleted file mode 100644 index 1bbeb86084..0000000000 --- a/mpcontribs-api/src/mpcontribs_api/old/tables/document.py +++ /dev/null @@ -1,62 +0,0 @@ -from flask_mongoengine.documents import DynamicDocument -from mongoengine import EmbeddedDocument, signals -from mongoengine.fields import EmbeddedDocumentField, IntField, ListField, StringField -from mongoengine.queryset.manager import queryset_manager -from mpcontribs.api.contributions.document import ( - COMPONENTS, - format_cell, - get_md5, - get_resource, -) - - -class Labels(EmbeddedDocument): - index = StringField(help_text="index name / x-axis label") - value = StringField(help_text="columns name / y-axis label") - variable = StringField(help_text="legend name") - - -class Attributes(EmbeddedDocument): - title = StringField(help_text="title") - labels = EmbeddedDocumentField(Labels) - - -class Tables(DynamicDocument): - name = StringField(required=True, help_text="name / title") - attrs = EmbeddedDocumentField(Attributes) - index = ListField(StringField(), required=True, help_text="index column") - columns = ListField(StringField(), required=True, help_text="column names/headers") - data = ListField(ListField(StringField()), required=True, help_text="table rows") - md5 = StringField(regex=r"^[a-z0-9]{32}$", unique=True, help_text="md5 sum") - total_data_rows = IntField(help_text="total number of rows") - meta = { - "collection": "tables", - "indexes": [ - "name", - "columns", - "md5", - "attrs.title", - "attrs.labels.index", - "attrs.labels.value", - "attrs.labels.variable", - ], - } - - @queryset_manager - def objects(doc_cls, queryset): - return queryset.only("name", "md5", "attrs", "columns", "total_data_rows") - - @classmethod - def post_init(cls, sender, document, **kwargs): - document.data = [[format_cell(cell) for cell in row] for row in document.data] - - @classmethod - def pre_save_post_validation(cls, sender, document, **kwargs): - # significant digits, md5 and total_data_rows - resource = get_resource("tables") - document.md5 = get_md5(resource, document, COMPONENTS["tables"]) - document.total_data_rows = len(document.data) - - -signals.post_init.connect(Tables.post_init, sender=Tables) -signals.pre_save_post_validation.connect(Tables.pre_save_post_validation, sender=Tables) diff --git a/mpcontribs-api/src/mpcontribs_api/old/tables/views.py b/mpcontribs-api/src/mpcontribs_api/old/tables/views.py deleted file mode 100644 index 5306003d06..0000000000 --- a/mpcontribs-api/src/mpcontribs_api/old/tables/views.py +++ /dev/null @@ -1,75 +0,0 @@ -import os - -import flask_mongorest -from flask import Blueprint -from flask_mongorest import operators as ops -from flask_mongorest.exceptions import UnknownFieldError -from flask_mongorest.methods import BulkFetch, Download, Fetch -from flask_mongorest.resources import Resource -from mpcontribs.api import FILTERS -from mpcontribs.api.core import SwaggerView -from mpcontribs.api.tables.document import Attributes, Labels, Tables - -templates = os.path.join(os.path.dirname(flask_mongorest.__file__), "templates") -tables = Blueprint("tables", __name__, template_folder=templates) - - -class LabelsResource(Resource): - document = Labels - - -class AttributesResource(Resource): - document = Attributes - related_resources = {"labels": LabelsResource} - - -class TablesResource(Resource): - document = Tables - related_resources = {"attrs": AttributesResource} - filters = { - "id": [ops.In, ops.Exact], - "md5": [ops.In, ops.Exact], - "name": FILTERS["STRINGS"], - "columns": [ops.Size], - "attrs__title": FILTERS["STRINGS"], - "attrs__labels__index": FILTERS["STRINGS"], - "attrs__labels__value": FILTERS["STRINGS"], - "attrs__labels__variable": FILTERS["STRINGS"], - } - fields = [ - "id", - "name", - "md5", - "attrs", - "columns", - "total_data_rows", - "total_data_pages", - ] - allowed_ordering = ["name", "total_data_rows"] - paginate = True - default_limit = 10 - max_limit = 100 - fields_to_paginate = {"data": [20, 1000]} - download_formats = ["json", "csv"] - - @staticmethod - def get_optional_fields(): - return ["index", "data"] - - def value_for_field(self, obj, field): - if field == "total_data_pages": - if obj.total_data_rows is None: - return None - - per_page_default = self.fields_to_paginate["data"][0] - per_page = int(self.params.get("data_per_page", per_page_default)) - total_data_pages = int(obj.total_data_rows / per_page) - total_data_pages += bool(obj.total_data_rows % per_page) - return total_data_pages - else: - raise UnknownFieldError - - -class TablesView(SwaggerView): - resource = TablesResource - methods = [Fetch, BulkFetch, Download] diff --git a/mpcontribs-api/src/mpcontribs_api/old/templates/admin_email.html b/mpcontribs-api/src/mpcontribs_api/old/templates/admin_email.html deleted file mode 100644 index 30267cf34c..0000000000 --- a/mpcontribs-api/src/mpcontribs_api/old/templates/admin_email.html +++ /dev/null @@ -1 +0,0 @@ -Go to {{url}} for more info about the project. Approve or deny this request: {{link}}. A notification email with your decision will automatically be sent to the user. diff --git a/mpcontribs-api/src/mpcontribs_api/old/templates/card_bootstrap.html b/mpcontribs-api/src/mpcontribs_api/old/templates/card_bootstrap.html deleted file mode 100644 index b8a9045604..0000000000 --- a/mpcontribs-api/src/mpcontribs_api/old/templates/card_bootstrap.html +++ /dev/null @@ -1,46 +0,0 @@ -
-
-
-

- {{ title }} - {% if references %} - - {% for ref in references %} - [{{ref.label}}] - {% endfor %} - - {% endif %} - Details -

- {{ authors.main }} - {% if authors.etal %} - et al. - - {% endif %} -
- -
-
-
- {{ descriptions.0 }}. - {% if descriptions.1 %} - More » - - {% endif %} -
-
{{ data|safe }}
-
-
- -
diff --git a/mpcontribs-api/src/mpcontribs_api/old/templates/card_bulma.html b/mpcontribs-api/src/mpcontribs_api/old/templates/card_bulma.html deleted file mode 100644 index ce4a01d929..0000000000 --- a/mpcontribs-api/src/mpcontribs_api/old/templates/card_bulma.html +++ /dev/null @@ -1,60 +0,0 @@ -
-
-
- {% if references %} - - {% endif %} -
- - {{ title }} - - - - - - -
-
- {{ authors.main }} - {% if authors.etal %} - et al. - - {% endif %} -
-
- {{ descriptions.0 }}. - {% if descriptions.1 %} - More » - - {% endif %} -
-
- {{ data|safe }} -
-
- -
- -
diff --git a/mpcontribs-api/src/mpcontribs_api/old/templates/owner_email.html b/mpcontribs-api/src/mpcontribs_api/old/templates/owner_email.html deleted file mode 100644 index 2eb526dce9..0000000000 --- a/mpcontribs-api/src/mpcontribs_api/old/templates/owner_email.html +++ /dev/null @@ -1 +0,0 @@ -Your project "{{project}}" has been {% if approved %}approved. You can now add all your contributions and publish the project.{% else %}denied and deleted.{% endif %} From 0c45e9d59b91f374d09fd23c6a603b4be2ea11c8 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 4 Jun 2026 09:39:45 -0700 Subject: [PATCH 055/591] Fixed basedpyright not knowing proper import path. Removed old ignores to 'old' folder. Added bfoley as author :) --- mpcontribs-api/pyproject.toml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mpcontribs-api/pyproject.toml b/mpcontribs-api/pyproject.toml index 25417e864f..89cf4d6f06 100644 --- a/mpcontribs-api/pyproject.toml +++ b/mpcontribs-api/pyproject.toml @@ -21,8 +21,9 @@ requires-python = ">=3.14" description="API for community-contributed Materials Project data" license = "BSD-3-Clause-LBNL" authors = [ - {name = "Patrick Huck", email = "phuck@lbl.gov"}, - {name = "The Materials Project", email="feedback@materialsproject.org"}, + {name="Patrick Huck", email="phuck@lbl.gov"}, + {name="Brendan Foley", email="bfoley@lbl.gov"}, + {name="The Materials Project", email="feedback@materialsproject.org"}, ] dependencies = [ "numpy", @@ -98,7 +99,7 @@ markers = [ [tool.ruff] line-length = 120 -exclude = ["src/mpcontribs_api/old", "tests/"] +exclude = ["tests/"] [tool.ruff.lint] select = ["E", "F", "W", "I", "B", "UP"] @@ -106,9 +107,8 @@ ignore = ["E741", "B008"] [tool.pydocstringformatter] max-line-length = 120 -exclude = ["src/mpcontribs_api/old"] [tool.basedpyright] pythonVersion = "3.14" typeCheckingMode = "standard" -ignore = ["src/mpcontribs_api/old"] +extraPaths = ["src"] From 38b2b1408d2fb1033af87e27591a5dd543445b0c Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 4 Jun 2026 10:33:32 -0700 Subject: [PATCH 056/591] Removed dependencies. Some temporarily --- mpcontribs-api/pyproject.toml | 41 +- mpcontribs-api/uv.lock | 2159 ++------------------------------- 2 files changed, 91 insertions(+), 2109 deletions(-) diff --git a/mpcontribs-api/pyproject.toml b/mpcontribs-api/pyproject.toml index 89cf4d6f06..f0e1650603 100644 --- a/mpcontribs-api/pyproject.toml +++ b/mpcontribs-api/pyproject.toml @@ -26,39 +26,16 @@ authors = [ {name="The Materials Project", email="feedback@materialsproject.org"}, ] dependencies = [ - "numpy", - "apispec<6", - "asn1crypto", - "blinker", - "boltons", - "css-html-js-minify", - "dateparser", - "ddtrace==4.3.0", - "dnspython", - "filetype", - "flasgger-tschaume>=0.9.7", - "flask-compress", - "flask-marshmallow", - "flask-mongorest-mpcontribs>=3.2.1", - "Flask-RQ2", - "gunicorn[gevent]==24.1.1", - "jinja2", - "json2html", - "marshmallow<4", - "more-itertools", - "nbformat", - "notebook<7", - "pint>=0.24", - "psycopg2-binary", + #"jinja2", + #"pint>=0.24", + # "psycopg2-binary", "pymatgen", - "pyopenssl", - "python-snappy", - "rq<=2.3.2", # see https://github.com/rq/Flask-RQ2/issues/620 - "supervisor", - "setproctitle", - "uncertainties", - "websocket_client", - "zstandard", + #"rq<=2.3.2", # see https://github.com/rq/Flask-RQ2/issues/620 + #"supervisor", + # "setproctitle", + # "uncertainties", + # "websocket_client", + # "zstandard", "fastapi[standard]>=0.136.3", "pymongo>=4.17.0", "pydantic-settings>=2.14.1", diff --git a/mpcontribs-api/uv.lock b/mpcontribs-api/uv.lock index 32a4220bac..328dc52913 100644 --- a/mpcontribs-api/uv.lock +++ b/mpcontribs-api/uv.lock @@ -36,80 +36,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/da/42/e921fccf5015463e32a3cf6ee7f980a6ed0f395ceeaa45060b61d86486c2/anyio-4.13.0-py3-none-any.whl", hash = "sha256:08b310f9e24a9594186fd75b4f73f4a4152069e3853f1ed8bfbf58369f4ad708", size = 114353, upload-time = "2026-03-24T12:59:08.246Z" }, ] -[[package]] -name = "apispec" -version = "5.2.2" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/39/bb/2910f46ecba16334c19e4f02906b1fdb0e69f9c3fd9a21afcf86c45ba89e/apispec-5.2.2.tar.gz", hash = "sha256:6ea6542e1ebffe9fd95ba01ef3f51351eac6c200a974562c7473059b9cd20aa7", size = 75729, upload-time = "2022-05-12T22:18:20.648Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/7b/bf/8ab9b532c9a22e9cc4920ed7436fde5f207807346564b95d9782f1e2aa5e/apispec-5.2.2-py3-none-any.whl", hash = "sha256:f5f0d6b452c3e4a0e0922dce8815fac89dc4dbc758acef21fb9e01584d6602a5", size = 29618, upload-time = "2022-05-12T22:18:19.235Z" }, -] - -[[package]] -name = "appnope" -version = "0.1.4" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/35/5d/752690df9ef5b76e169e68d6a129fa6d08a7100ca7f754c89495db3c6019/appnope-0.1.4.tar.gz", hash = "sha256:1de3860566df9caf38f01f86f65e0e13e379af54f9e4bee1e66b48f2efffd1ee", size = 4170, upload-time = "2024-02-06T09:43:11.258Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/81/29/5ecc3a15d5a33e31b26c11426c45c501e439cb865d0bff96315d86443b78/appnope-0.1.4-py2.py3-none-any.whl", hash = "sha256:502575ee11cd7a28c0205f379b525beefebab9d161b7c964670864014ed7213c", size = 4321, upload-time = "2024-02-06T09:43:09.663Z" }, -] - -[[package]] -name = "argon2-cffi" -version = "25.1.0" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "argon2-cffi-bindings" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/0e/89/ce5af8a7d472a67cc819d5d998aa8c82c5d860608c4db9f46f1162d7dab9/argon2_cffi-25.1.0.tar.gz", hash = "sha256:694ae5cc8a42f4c4e2bf2ca0e64e51e23a040c6a517a85074683d3959e1346c1", size = 45706, upload-time = "2025-06-03T06:55:32.073Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/4f/d3/a8b22fa575b297cd6e3e3b0155c7e25db170edf1c74783d6a31a2490b8d9/argon2_cffi-25.1.0-py3-none-any.whl", hash = "sha256:fdc8b074db390fccb6eb4a3604ae7231f219aa669a2652e0f20e16ba513d5741", size = 14657, upload-time = "2025-06-03T06:55:30.804Z" }, -] - -[[package]] -name = "argon2-cffi-bindings" -version = "25.1.0" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "cffi" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/5c/2d/db8af0df73c1cf454f71b2bbe5e356b8c1f8041c979f505b3d3186e520a9/argon2_cffi_bindings-25.1.0.tar.gz", hash = "sha256:b957f3e6ea4d55d820e40ff76f450952807013d361a65d7f28acc0acbf29229d", size = 1783441, upload-time = "2025-07-30T10:02:05.147Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/60/97/3c0a35f46e52108d4707c44b95cfe2afcafc50800b5450c197454569b776/argon2_cffi_bindings-25.1.0-cp314-cp314t-macosx_10_13_universal2.whl", hash = "sha256:3d3f05610594151994ca9ccb3c771115bdb4daef161976a266f0dd8aa9996b8f", size = 54393, upload-time = "2025-07-30T10:01:40.97Z" }, - { url = "https://files.pythonhosted.org/packages/9d/f4/98bbd6ee89febd4f212696f13c03ca302b8552e7dbf9c8efa11ea4a388c3/argon2_cffi_bindings-25.1.0-cp314-cp314t-macosx_10_13_x86_64.whl", hash = "sha256:8b8efee945193e667a396cbc7b4fb7d357297d6234d30a489905d96caabde56b", size = 29328, upload-time = "2025-07-30T10:01:41.916Z" }, - { url = "https://files.pythonhosted.org/packages/43/24/90a01c0ef12ac91a6be05969f29944643bc1e5e461155ae6559befa8f00b/argon2_cffi_bindings-25.1.0-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:3c6702abc36bf3ccba3f802b799505def420a1b7039862014a65db3205967f5a", size = 31269, upload-time = "2025-07-30T10:01:42.716Z" }, - { url = "https://files.pythonhosted.org/packages/d4/d3/942aa10782b2697eee7af5e12eeff5ebb325ccfb86dd8abda54174e377e4/argon2_cffi_bindings-25.1.0-cp314-cp314t-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:a1c70058c6ab1e352304ac7e3b52554daadacd8d453c1752e547c76e9c99ac44", size = 86558, upload-time = "2025-07-30T10:01:43.943Z" }, - { url = "https://files.pythonhosted.org/packages/0d/82/b484f702fec5536e71836fc2dbc8c5267b3f6e78d2d539b4eaa6f0db8bf8/argon2_cffi_bindings-25.1.0-cp314-cp314t-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:e2fd3bfbff3c5d74fef31a722f729bf93500910db650c925c2d6ef879a7e51cb", size = 92364, upload-time = "2025-07-30T10:01:44.887Z" }, - { url = "https://files.pythonhosted.org/packages/c9/c1/a606ff83b3f1735f3759ad0f2cd9e038a0ad11a3de3b6c673aa41c24bb7b/argon2_cffi_bindings-25.1.0-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:c4f9665de60b1b0e99bcd6be4f17d90339698ce954cfd8d9cf4f91c995165a92", size = 85637, upload-time = "2025-07-30T10:01:46.225Z" }, - { url = "https://files.pythonhosted.org/packages/44/b4/678503f12aceb0262f84fa201f6027ed77d71c5019ae03b399b97caa2f19/argon2_cffi_bindings-25.1.0-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:ba92837e4a9aa6a508c8d2d7883ed5a8f6c308c89a4790e1e447a220deb79a85", size = 91934, upload-time = "2025-07-30T10:01:47.203Z" }, - { url = "https://files.pythonhosted.org/packages/f0/c7/f36bd08ef9bd9f0a9cff9428406651f5937ce27b6c5b07b92d41f91ae541/argon2_cffi_bindings-25.1.0-cp314-cp314t-win32.whl", hash = "sha256:84a461d4d84ae1295871329b346a97f68eade8c53b6ed9a7ca2d7467f3c8ff6f", size = 28158, upload-time = "2025-07-30T10:01:48.341Z" }, - { url = "https://files.pythonhosted.org/packages/b3/80/0106a7448abb24a2c467bf7d527fe5413b7fdfa4ad6d6a96a43a62ef3988/argon2_cffi_bindings-25.1.0-cp314-cp314t-win_amd64.whl", hash = "sha256:b55aec3565b65f56455eebc9b9f34130440404f27fe21c3b375bf1ea4d8fbae6", size = 32597, upload-time = "2025-07-30T10:01:49.112Z" }, - { url = "https://files.pythonhosted.org/packages/05/b8/d663c9caea07e9180b2cb662772865230715cbd573ba3b5e81793d580316/argon2_cffi_bindings-25.1.0-cp314-cp314t-win_arm64.whl", hash = "sha256:87c33a52407e4c41f3b70a9c2d3f6056d88b10dad7695be708c5021673f55623", size = 28231, upload-time = "2025-07-30T10:01:49.92Z" }, - { url = "https://files.pythonhosted.org/packages/1d/57/96b8b9f93166147826da5f90376e784a10582dd39a393c99bb62cfcf52f0/argon2_cffi_bindings-25.1.0-cp39-abi3-macosx_10_9_universal2.whl", hash = "sha256:aecba1723ae35330a008418a91ea6cfcedf6d31e5fbaa056a166462ff066d500", size = 54121, upload-time = "2025-07-30T10:01:50.815Z" }, - { url = "https://files.pythonhosted.org/packages/0a/08/a9bebdb2e0e602dde230bdde8021b29f71f7841bd54801bcfd514acb5dcf/argon2_cffi_bindings-25.1.0-cp39-abi3-macosx_10_9_x86_64.whl", hash = "sha256:2630b6240b495dfab90aebe159ff784d08ea999aa4b0d17efa734055a07d2f44", size = 29177, upload-time = "2025-07-30T10:01:51.681Z" }, - { url = "https://files.pythonhosted.org/packages/b6/02/d297943bcacf05e4f2a94ab6f462831dc20158614e5d067c35d4e63b9acb/argon2_cffi_bindings-25.1.0-cp39-abi3-macosx_11_0_arm64.whl", hash = "sha256:7aef0c91e2c0fbca6fc68e7555aa60ef7008a739cbe045541e438373bc54d2b0", size = 31090, upload-time = "2025-07-30T10:01:53.184Z" }, - { url = "https://files.pythonhosted.org/packages/c1/93/44365f3d75053e53893ec6d733e4a5e3147502663554b4d864587c7828a7/argon2_cffi_bindings-25.1.0-cp39-abi3-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:1e021e87faa76ae0d413b619fe2b65ab9a037f24c60a1e6cc43457ae20de6dc6", size = 81246, upload-time = "2025-07-30T10:01:54.145Z" }, - { url = "https://files.pythonhosted.org/packages/09/52/94108adfdd6e2ddf58be64f959a0b9c7d4ef2fa71086c38356d22dc501ea/argon2_cffi_bindings-25.1.0-cp39-abi3-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:d3e924cfc503018a714f94a49a149fdc0b644eaead5d1f089330399134fa028a", size = 87126, upload-time = "2025-07-30T10:01:55.074Z" }, - { url = "https://files.pythonhosted.org/packages/72/70/7a2993a12b0ffa2a9271259b79cc616e2389ed1a4d93842fac5a1f923ffd/argon2_cffi_bindings-25.1.0-cp39-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:c87b72589133f0346a1cb8d5ecca4b933e3c9b64656c9d175270a000e73b288d", size = 80343, upload-time = "2025-07-30T10:01:56.007Z" }, - { url = "https://files.pythonhosted.org/packages/78/9a/4e5157d893ffc712b74dbd868c7f62365618266982b64accab26bab01edc/argon2_cffi_bindings-25.1.0-cp39-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:1db89609c06afa1a214a69a462ea741cf735b29a57530478c06eb81dd403de99", size = 86777, upload-time = "2025-07-30T10:01:56.943Z" }, - { url = "https://files.pythonhosted.org/packages/74/cd/15777dfde1c29d96de7f18edf4cc94c385646852e7c7b0320aa91ccca583/argon2_cffi_bindings-25.1.0-cp39-abi3-win32.whl", hash = "sha256:473bcb5f82924b1becbb637b63303ec8d10e84c8d241119419897a26116515d2", size = 27180, upload-time = "2025-07-30T10:01:57.759Z" }, - { url = "https://files.pythonhosted.org/packages/e2/c6/a759ece8f1829d1f162261226fbfd2c6832b3ff7657384045286d2afa384/argon2_cffi_bindings-25.1.0-cp39-abi3-win_amd64.whl", hash = "sha256:a98cd7d17e9f7ce244c0803cad3c23a7d379c301ba618a5fa76a67d116618b98", size = 31715, upload-time = "2025-07-30T10:01:58.56Z" }, - { url = "https://files.pythonhosted.org/packages/42/b9/f8d6fa329ab25128b7e98fd83a3cb34d9db5b059a9847eddb840a0af45dd/argon2_cffi_bindings-25.1.0-cp39-abi3-win_arm64.whl", hash = "sha256:b0fdbcf513833809c882823f98dc2f931cf659d9a1429616ac3adebb49f5db94", size = 27149, upload-time = "2025-07-30T10:01:59.329Z" }, -] - -[[package]] -name = "arrow" -version = "1.4.0" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "python-dateutil" }, - { name = "tzdata" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/b9/33/032cdc44182491aa708d06a68b62434140d8c50820a087fac7af37703357/arrow-1.4.0.tar.gz", hash = "sha256:ed0cc050e98001b8779e84d461b0098c4ac597e88704a655582b21d116e526d7", size = 152931, upload-time = "2025-10-18T17:46:46.761Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/ed/c9/d7977eaacb9df673210491da99e6a247e93df98c715fc43fd136ce1d3d33/arrow-1.4.0-py3-none-any.whl", hash = "sha256:749f0769958ebdc79c173ff0b0670d59051a535fa26e8eba02953dc19eb43205", size = 68797, upload-time = "2025-10-18T17:46:45.663Z" }, -] - [[package]] name = "asgiref" version = "3.11.1" @@ -119,46 +45,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/5c/0a/a72d10ed65068e115044937873362e6e32fab1b7dce0046aeb224682c989/asgiref-3.11.1-py3-none-any.whl", hash = "sha256:e8667a091e69529631969fd45dc268fa79b99c92c5fcdda727757e52146ec133", size = 24345, upload-time = "2026-02-03T13:30:13.039Z" }, ] -[[package]] -name = "asn1crypto" -version = "1.5.1" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/de/cf/d547feed25b5244fcb9392e288ff9fdc3280b10260362fc45d37a798a6ee/asn1crypto-1.5.1.tar.gz", hash = "sha256:13ae38502be632115abf8a24cbe5f4da52e3b5231990aff31123c805306ccb9c", size = 121080, upload-time = "2022-03-15T14:46:52.889Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/c9/7f/09065fd9e27da0eda08b4d6897f1c13535066174cc023af248fc2a8d5e5a/asn1crypto-1.5.1-py2.py3-none-any.whl", hash = "sha256:db4e40728b728508912cbb3d44f19ce188f218e9eba635821bb4b68564f8fd67", size = 105045, upload-time = "2022-03-15T14:46:51.055Z" }, -] - -[[package]] -name = "asttokens" -version = "3.0.1" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/be/a5/8e3f9b6771b0b408517c82d97aed8f2036509bc247d46114925e32fe33f0/asttokens-3.0.1.tar.gz", hash = "sha256:71a4ee5de0bde6a31d64f6b13f2293ac190344478f081c3d1bccfcf5eacb0cb7", size = 62308, upload-time = "2025-11-15T16:43:48.578Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/d2/39/e7eaf1799466a4aef85b6a4fe7bd175ad2b1c6345066aa33f1f58d4b18d0/asttokens-3.0.1-py3-none-any.whl", hash = "sha256:15a3ebc0f43c2d0a50eeafea25e19046c68398e487b9f1f5b517f7c0f40f976a", size = 27047, upload-time = "2025-11-15T16:43:16.109Z" }, -] - -[[package]] -name = "atlasq-tschaume" -version = "0.11.1.dev2" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "mongoengine" }, - { name = "requests" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/8c/5f/91e3d9c1712c8e235c95c86eeb265bb106802f5bcbe334e28f605f55b018/atlasq-tschaume-0.11.1.dev2.tar.gz", hash = "sha256:9393356edebae037b1b47e16d73a7a04969451eaa3e38f1bdc20d1d9b08ece68", size = 38083, upload-time = "2023-04-14T21:06:57.344Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/a5/8c/83b96f52f5a5b8e418bf4cbf9089cfbea33fc0b809c28fd5a9b9393b67ba/atlasq_tschaume-0.11.1.dev2-py3-none-any.whl", hash = "sha256:f38813972c8c379964f09200fa89f9ae909ccbf5b3483bb6a77d5bf34720dde0", size = 15748, upload-time = "2023-04-14T21:06:54.943Z" }, -] - -[[package]] -name = "attrs" -version = "26.1.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/9a/8e/82a0fe20a541c03148528be8cac2408564a6c9a0cc7e9171802bc1d26985/attrs-26.1.0.tar.gz", hash = "sha256:d03ceb89cb322a8fd706d4fb91940737b6642aa36998fe130a9bc96c985eff32", size = 952055, upload-time = "2026-03-19T14:22:25.026Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/64/b4/17d4b0b2a2dc85a6df63d1157e028ed19f90d4cd97c36717afef2bc2f395/attrs-26.1.0-py3-none-any.whl", hash = "sha256:c647aa4a12dfbad9333ca4e71fe62ddc36f4e63b2d260a37a8b83d2f043ac309", size = 67548, upload-time = "2026-03-19T14:22:23.645Z" }, -] - [[package]] name = "basedpyright" version = "1.39.6" @@ -187,19 +73,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/00/b5/1c6c404bcce8fa53d3f422dce6e58bff99c3e3cb2a3c49d519e3e5822125/beanie-2.1.0-py3-none-any.whl", hash = "sha256:077381dad0e0129fd4dc38cdaa3d85cb517da7338e3d893a689314884df4379b", size = 92697, upload-time = "2026-03-26T01:27:02.191Z" }, ] -[[package]] -name = "beautifulsoup4" -version = "4.14.3" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "soupsieve" }, - { name = "typing-extensions" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/c3/b0/1c6a16426d389813b48d95e26898aff79abbde42ad353958ad95cc8c9b21/beautifulsoup4-4.14.3.tar.gz", hash = "sha256:6292b1c5186d356bba669ef9f7f051757099565ad9ada5dd630bd9de5fa7fb86", size = 627737, upload-time = "2025-11-30T15:08:26.084Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/1a/39/47f9197bdd44df24d67ac8893641e16f386c984a0619ef2ee4c51fbbc019/beautifulsoup4-4.14.3-py3-none-any.whl", hash = "sha256:0918bfe44902e6ad8d57732ba310582e98da931428d231a5ecb9e7c703a735bb", size = 107721, upload-time = "2025-11-30T15:08:24.087Z" }, -] - [[package]] name = "bibtexparser" version = "1.4.4" @@ -209,117 +82,6 @@ dependencies = [ ] sdist = { url = "https://files.pythonhosted.org/packages/44/1c/577d3ce406e88f370e80a6ebf76ae52a2866521e0b585e8ec612759894f1/bibtexparser-1.4.4.tar.gz", hash = "sha256:093b6c824f7a71d3a748867c4057b71f77c55b8dbc07efc993b781771520d8fb", size = 55594, upload-time = "2026-01-29T18:58:01.366Z" } -[[package]] -name = "bleach" -version = "6.3.0" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "webencodings" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/07/18/3c8523962314be6bf4c8989c79ad9531c825210dd13a8669f6b84336e8bd/bleach-6.3.0.tar.gz", hash = "sha256:6f3b91b1c0a02bb9a78b5a454c92506aa0fdf197e1d5e114d2e00c6f64306d22", size = 203533, upload-time = "2025-10-27T17:57:39.211Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/cd/3a/577b549de0cc09d95f11087ee63c739bba856cd3952697eec4c4bb91350a/bleach-6.3.0-py3-none-any.whl", hash = "sha256:fe10ec77c93ddf3d13a73b035abaac7a9f5e436513864ccdad516693213c65d6", size = 164437, upload-time = "2025-10-27T17:57:37.538Z" }, -] - -[package.optional-dependencies] -css = [ - { name = "tinycss2" }, -] - -[[package]] -name = "blinker" -version = "1.9.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/21/28/9b3f50ce0e048515135495f198351908d99540d69bfdc8c1d15b73dc55ce/blinker-1.9.0.tar.gz", hash = "sha256:b4ce2265a7abece45e7cc896e98dbebe6cead56bcf805a3d23136d145f5445bf", size = 22460, upload-time = "2024-11-08T17:25:47.436Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/10/cb/f2ad4230dc2eb1a74edf38f1a38b9b52277f75bef262d8908e60d957e13c/blinker-1.9.0-py3-none-any.whl", hash = "sha256:ba0efaa9080b619ff2f3459d1d500c57bddea4a6b424b60a91141db6fd2f08bc", size = 8458, upload-time = "2024-11-08T17:25:46.184Z" }, -] - -[[package]] -name = "boltons" -version = "25.0.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/63/54/71a94d8e02da9a865587fb3fff100cb0fc7aa9f4d5ed9ed3a591216ddcc7/boltons-25.0.0.tar.gz", hash = "sha256:e110fbdc30b7b9868cb604e3f71d4722dd8f4dcb4a5ddd06028ba8f1ab0b5ace", size = 246294, upload-time = "2025-02-03T05:57:59.129Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/45/7f/0e961cf3908bc4c1c3e027de2794f867c6c89fb4916fc7dba295a0e80a2d/boltons-25.0.0-py3-none-any.whl", hash = "sha256:dc9fb38bf28985715497d1b54d00b62ea866eca3938938ea9043e254a3a6ca62", size = 194210, upload-time = "2025-02-03T05:57:56.705Z" }, -] - -[[package]] -name = "boto3" -version = "1.43.16" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "botocore" }, - { name = "jmespath" }, - { name = "s3transfer" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/48/4f/f13d80d377b54dd2973e243e4eb7ce748706cd53876361cc72506006fd8b/boto3-1.43.16.tar.gz", hash = "sha256:6c337bbe608aacc7d335c79e671f0c893870293b74d652f7a7af22ccd0dfef16", size = 113152, upload-time = "2026-05-27T19:31:39.899Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/af/c0/7d687e40f4b7046ede66026ecd1b0a93d47afe26d9170f5926a1605c8641/boto3-1.43.16-py3-none-any.whl", hash = "sha256:dffc8a3cd3edbc0ad95b9c6b983e873b76ede46d3aa0709f94db253f2ff2388f", size = 140537, upload-time = "2026-05-27T19:31:36.453Z" }, -] - -[[package]] -name = "botocore" -version = "1.43.16" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "jmespath" }, - { name = "python-dateutil" }, - { name = "urllib3" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/a1/74/140451a1fe027cb5e387cc7b1ec56224616ca742c330f1492f71c5cba3fb/botocore-1.43.16.tar.gz", hash = "sha256:813dae233d8b365c19aaf7865b32070e34d7e793654881bf86ecbbef3f4ad5c6", size = 15388648, upload-time = "2026-05-27T19:31:25.172Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/46/8f/25933240485c0662bb3fa430ed0c6b8b8124ab3bc136154c07ce12644cb0/botocore-1.43.16-py3-none-any.whl", hash = "sha256:8ab05b1346d26a3c6d69c7338051f07bd4739a090f414d2cff43c0dbc1e18ca7", size = 15067437, upload-time = "2026-05-27T19:31:19.212Z" }, -] - -[[package]] -name = "brotli" -version = "1.2.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/f7/16/c92ca344d646e71a43b8bb353f0a6490d7f6e06210f8554c8f874e454285/brotli-1.2.0.tar.gz", hash = "sha256:e310f77e41941c13340a95976fe66a8a95b01e783d430eeaf7a2f87e0a57dd0a", size = 7388632, upload-time = "2025-11-05T18:39:42.86Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/17/e1/298c2ddf786bb7347a1cd71d63a347a79e5712a7c0cba9e3c3458ebd976f/brotli-1.2.0-cp314-cp314-macosx_10_15_universal2.whl", hash = "sha256:6c12dad5cd04530323e723787ff762bac749a7b256a5bece32b2243dd5c27b21", size = 863080, upload-time = "2025-11-05T18:38:45.503Z" }, - { url = "https://files.pythonhosted.org/packages/84/0c/aac98e286ba66868b2b3b50338ffbd85a35c7122e9531a73a37a29763d38/brotli-1.2.0-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:3219bd9e69868e57183316ee19c84e03e8f8b5a1d1f2667e1aa8c2f91cb061ac", size = 445453, upload-time = "2025-11-05T18:38:46.433Z" }, - { url = "https://files.pythonhosted.org/packages/ec/f1/0ca1f3f99ae300372635ab3fe2f7a79fa335fee3d874fa7f9e68575e0e62/brotli-1.2.0-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:963a08f3bebd8b75ac57661045402da15991468a621f014be54e50f53a58d19e", size = 1528168, upload-time = "2025-11-05T18:38:47.371Z" }, - { url = "https://files.pythonhosted.org/packages/d6/a6/2ebfc8f766d46df8d3e65b880a2e220732395e6d7dc312c1e1244b0f074a/brotli-1.2.0-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:9322b9f8656782414b37e6af884146869d46ab85158201d82bab9abbcb971dc7", size = 1627098, upload-time = "2025-11-05T18:38:48.385Z" }, - { url = "https://files.pythonhosted.org/packages/f3/2f/0976d5b097ff8a22163b10617f76b2557f15f0f39d6a0fe1f02b1a53e92b/brotli-1.2.0-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:cf9cba6f5b78a2071ec6fb1e7bd39acf35071d90a81231d67e92d637776a6a63", size = 1419861, upload-time = "2025-11-05T18:38:49.372Z" }, - { url = "https://files.pythonhosted.org/packages/9c/97/d76df7176a2ce7616ff94c1fb72d307c9a30d2189fe877f3dd99af00ea5a/brotli-1.2.0-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:7547369c4392b47d30a3467fe8c3330b4f2e0f7730e45e3103d7d636678a808b", size = 1484594, upload-time = "2025-11-05T18:38:50.655Z" }, - { url = "https://files.pythonhosted.org/packages/d3/93/14cf0b1216f43df5609f5b272050b0abd219e0b54ea80b47cef9867b45e7/brotli-1.2.0-cp314-cp314-musllinux_1_2_ppc64le.whl", hash = "sha256:fc1530af5c3c275b8524f2e24841cbe2599d74462455e9bae5109e9ff42e9361", size = 1593455, upload-time = "2025-11-05T18:38:51.624Z" }, - { url = "https://files.pythonhosted.org/packages/b3/73/3183c9e41ca755713bdf2cc1d0810df742c09484e2e1ddd693bee53877c1/brotli-1.2.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:d2d085ded05278d1c7f65560aae97b3160aeb2ea2c0b3e26204856beccb60888", size = 1488164, upload-time = "2025-11-05T18:38:53.079Z" }, - { url = "https://files.pythonhosted.org/packages/64/6a/0c78d8f3a582859236482fd9fa86a65a60328a00983006bcf6d83b7b2253/brotli-1.2.0-cp314-cp314-win32.whl", hash = "sha256:832c115a020e463c2f67664560449a7bea26b0c1fdd690352addad6d0a08714d", size = 339280, upload-time = "2025-11-05T18:38:54.02Z" }, - { url = "https://files.pythonhosted.org/packages/f5/10/56978295c14794b2c12007b07f3e41ba26acda9257457d7085b0bb3bb90c/brotli-1.2.0-cp314-cp314-win_amd64.whl", hash = "sha256:e7c0af964e0b4e3412a0ebf341ea26ec767fa0b4cf81abb5e897c9338b5ad6a3", size = 375639, upload-time = "2025-11-05T18:38:55.67Z" }, -] - -[[package]] -name = "brotlicffi" -version = "1.2.0.1" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "cffi" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/8a/b6/017dc5f852ed9b8735af77774509271acbf1de02d238377667145fcee01d/brotlicffi-1.2.0.1.tar.gz", hash = "sha256:c20d5c596278307ad06414a6d95a892377ea274a5c6b790c2548c009385d621c", size = 478156, upload-time = "2026-03-05T19:54:11.547Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/ef/f9/dfa56316837fa798eac19358351e974de8e1e2ca9475af4cb90293cd6576/brotlicffi-1.2.0.1-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:2c85e65913cf2b79c57a3fdd05b98d9731d9255dc0cb696b09376cc091b9cddd", size = 433046, upload-time = "2026-03-05T19:53:46.209Z" }, - { url = "https://files.pythonhosted.org/packages/4a/f5/f8f492158c76b0d940388801f04f747028971ad5774287bded5f1e53f08d/brotlicffi-1.2.0.1-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:535f2d05d0273408abc13fc0eebb467afac17b0ad85090c8913690d40207dac5", size = 1541126, upload-time = "2026-03-05T19:53:48.248Z" }, - { url = "https://files.pythonhosted.org/packages/3b/e1/ff87af10ac419600c63e9287a0649c673673ae6b4f2bcf48e96cb2f89f60/brotlicffi-1.2.0.1-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:ce17eb798ca59ecec67a9bb3fd7a4304e120d1cd02953ce522d959b9a84d58ac", size = 1541983, upload-time = "2026-03-05T19:53:50.317Z" }, - { url = "https://files.pythonhosted.org/packages/47/c0/80ecd9bd45776109fab14040e478bf63e456967c9ddee2353d8330ed8de1/brotlicffi-1.2.0.1-cp314-cp314t-win32.whl", hash = "sha256:3c9544f83cb715d95d7eab3af4adbbef8b2093ad6382288a83b3a25feb1a57ec", size = 349047, upload-time = "2026-03-05T19:53:52.215Z" }, - { url = "https://files.pythonhosted.org/packages/ab/98/13e5b250236a281b6cd9e92a01ee1ae231029fa78faee932ef3766e1cb24/brotlicffi-1.2.0.1-cp314-cp314t-win_amd64.whl", hash = "sha256:625f8115d32ae9c0740d01ea51518437c3fbaa3e78d41cb18459f6f7ac326000", size = 385652, upload-time = "2026-03-05T19:53:53.892Z" }, - { url = "https://files.pythonhosted.org/packages/9a/9f/b98dcd4af47994cee97aebac866996a006a2e5fc1fd1e2b82a8ad95cf09c/brotlicffi-1.2.0.1-cp38-abi3-macosx_11_0_arm64.whl", hash = "sha256:91ba5f0ccc040f6ff8f7efaf839f797723d03ed46acb8ae9408f99ffd2572cf4", size = 432608, upload-time = "2026-03-05T19:53:56.736Z" }, - { url = "https://files.pythonhosted.org/packages/b1/7a/ac4ee56595a061e3718a6d1ea7e921f4df156894acffb28ed88a1fd52022/brotlicffi-1.2.0.1-cp38-abi3-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:be9a670c6811af30a4bd42d7116dc5895d3b41beaa8ed8a89050447a0181f5ce", size = 1534257, upload-time = "2026-03-05T19:53:58.667Z" }, - { url = "https://files.pythonhosted.org/packages/99/39/e7410db7f6f56de57744ea52a115084ceb2735f4d44973f349bb92136586/brotlicffi-1.2.0.1-cp38-abi3-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:6f3314a3476f59e5443f9f72a6dff16edc0c3463c9b318feaef04ae3e4683f5a", size = 1536838, upload-time = "2026-03-05T19:54:00.705Z" }, - { url = "https://files.pythonhosted.org/packages/a6/75/6e7977d1935fc3fbb201cbd619be8f2c7aea25d40a096967132854b34708/brotlicffi-1.2.0.1-cp38-abi3-win32.whl", hash = "sha256:82ea52e2b5d3145b6c406ebd3efb0d55db718b7ad996bd70c62cec0439de1187", size = 343337, upload-time = "2026-03-05T19:54:02.446Z" }, - { url = "https://files.pythonhosted.org/packages/d8/ef/e7e485ce5e4ba3843a0a92feb767c7b6098fd6e65ce752918074d175ae71/brotlicffi-1.2.0.1-cp38-abi3-win_amd64.whl", hash = "sha256:da2e82a08e7778b8bc539d27ca03cdd684113e81394bfaaad8d0dfc6a17ddede", size = 379026, upload-time = "2026-03-05T19:54:04.322Z" }, -] - -[[package]] -name = "bytecode" -version = "0.17.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/98/c4/4818b392104bd426171fc2ce9c79c8edb4019ba6505747626d0f7107766c/bytecode-0.17.0.tar.gz", hash = "sha256:0c37efa5bd158b1b873f530cceea2c645611d55bd2dc2a4758b09f185749b6fd", size = 105863, upload-time = "2025-09-03T19:55:45.703Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/ce/80/379e685099841f8501a19fb58b496512ef432331fed38276c3938ab09d8e/bytecode-0.17.0-py3-none-any.whl", hash = "sha256:64fb10cde1db7ef5cc39bd414ecebd54ba3b40e1c4cf8121ca5e72f170916ff8", size = 43045, upload-time = "2025-09-03T19:55:43.879Z" }, -] - [[package]] name = "certifi" version = "2026.5.20" @@ -329,39 +91,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/59/8c/57e832b7af6d7c5abe66eb3fbe3a3a32f4d11ea23a1aa7131371035be991/certifi-2026.5.20-py3-none-any.whl", hash = "sha256:3c52e209ba0a4ad7aebe60436a4ab349c39e1e602e8c134221e546902ad25897", size = 134134, upload-time = "2026-05-20T11:46:48.578Z" }, ] -[[package]] -name = "cffi" -version = "2.0.0" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "pycparser", marker = "implementation_name != 'PyPy'" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/eb/56/b1ba7935a17738ae8453301356628e8147c79dbb825bcbc73dc7401f9846/cffi-2.0.0.tar.gz", hash = "sha256:44d1b5909021139fe36001ae048dbdde8214afa20200eda0f64c068cac5d5529", size = 523588, upload-time = "2025-09-08T23:24:04.541Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/92/c4/3ce07396253a83250ee98564f8d7e9789fab8e58858f35d07a9a2c78de9f/cffi-2.0.0-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:fc33c5141b55ed366cfaad382df24fe7dcbc686de5be719b207bb248e3053dc5", size = 185320, upload-time = "2025-09-08T23:23:18.087Z" }, - { url = "https://files.pythonhosted.org/packages/59/dd/27e9fa567a23931c838c6b02d0764611c62290062a6d4e8ff7863daf9730/cffi-2.0.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:c654de545946e0db659b3400168c9ad31b5d29593291482c43e3564effbcee13", size = 181487, upload-time = "2025-09-08T23:23:19.622Z" }, - { url = "https://files.pythonhosted.org/packages/d6/43/0e822876f87ea8a4ef95442c3d766a06a51fc5298823f884ef87aaad168c/cffi-2.0.0-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:24b6f81f1983e6df8db3adc38562c83f7d4a0c36162885ec7f7b77c7dcbec97b", size = 220049, upload-time = "2025-09-08T23:23:20.853Z" }, - { url = "https://files.pythonhosted.org/packages/b4/89/76799151d9c2d2d1ead63c2429da9ea9d7aac304603de0c6e8764e6e8e70/cffi-2.0.0-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:12873ca6cb9b0f0d3a0da705d6086fe911591737a59f28b7936bdfed27c0d47c", size = 207793, upload-time = "2025-09-08T23:23:22.08Z" }, - { url = "https://files.pythonhosted.org/packages/bb/dd/3465b14bb9e24ee24cb88c9e3730f6de63111fffe513492bf8c808a3547e/cffi-2.0.0-cp314-cp314-manylinux2014_s390x.manylinux_2_17_s390x.whl", hash = "sha256:d9b97165e8aed9272a6bb17c01e3cc5871a594a446ebedc996e2397a1c1ea8ef", size = 206300, upload-time = "2025-09-08T23:23:23.314Z" }, - { url = "https://files.pythonhosted.org/packages/47/d9/d83e293854571c877a92da46fdec39158f8d7e68da75bf73581225d28e90/cffi-2.0.0-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:afb8db5439b81cf9c9d0c80404b60c3cc9c3add93e114dcae767f1477cb53775", size = 219244, upload-time = "2025-09-08T23:23:24.541Z" }, - { url = "https://files.pythonhosted.org/packages/2b/0f/1f177e3683aead2bb00f7679a16451d302c436b5cbf2505f0ea8146ef59e/cffi-2.0.0-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:737fe7d37e1a1bffe70bd5754ea763a62a066dc5913ca57e957824b72a85e205", size = 222828, upload-time = "2025-09-08T23:23:26.143Z" }, - { url = "https://files.pythonhosted.org/packages/c6/0f/cafacebd4b040e3119dcb32fed8bdef8dfe94da653155f9d0b9dc660166e/cffi-2.0.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:38100abb9d1b1435bc4cc340bb4489635dc2f0da7456590877030c9b3d40b0c1", size = 220926, upload-time = "2025-09-08T23:23:27.873Z" }, - { url = "https://files.pythonhosted.org/packages/3e/aa/df335faa45b395396fcbc03de2dfcab242cd61a9900e914fe682a59170b1/cffi-2.0.0-cp314-cp314-win32.whl", hash = "sha256:087067fa8953339c723661eda6b54bc98c5625757ea62e95eb4898ad5e776e9f", size = 175328, upload-time = "2025-09-08T23:23:44.61Z" }, - { url = "https://files.pythonhosted.org/packages/bb/92/882c2d30831744296ce713f0feb4c1cd30f346ef747b530b5318715cc367/cffi-2.0.0-cp314-cp314-win_amd64.whl", hash = "sha256:203a48d1fb583fc7d78a4c6655692963b860a417c0528492a6bc21f1aaefab25", size = 185650, upload-time = "2025-09-08T23:23:45.848Z" }, - { url = "https://files.pythonhosted.org/packages/9f/2c/98ece204b9d35a7366b5b2c6539c350313ca13932143e79dc133ba757104/cffi-2.0.0-cp314-cp314-win_arm64.whl", hash = "sha256:dbd5c7a25a7cb98f5ca55d258b103a2054f859a46ae11aaf23134f9cc0d356ad", size = 180687, upload-time = "2025-09-08T23:23:47.105Z" }, - { url = "https://files.pythonhosted.org/packages/3e/61/c768e4d548bfa607abcda77423448df8c471f25dbe64fb2ef6d555eae006/cffi-2.0.0-cp314-cp314t-macosx_10_13_x86_64.whl", hash = "sha256:9a67fc9e8eb39039280526379fb3a70023d77caec1852002b4da7e8b270c4dd9", size = 188773, upload-time = "2025-09-08T23:23:29.347Z" }, - { url = "https://files.pythonhosted.org/packages/2c/ea/5f76bce7cf6fcd0ab1a1058b5af899bfbef198bea4d5686da88471ea0336/cffi-2.0.0-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:7a66c7204d8869299919db4d5069a82f1561581af12b11b3c9f48c584eb8743d", size = 185013, upload-time = "2025-09-08T23:23:30.63Z" }, - { url = "https://files.pythonhosted.org/packages/be/b4/c56878d0d1755cf9caa54ba71e5d049479c52f9e4afc230f06822162ab2f/cffi-2.0.0-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:7cc09976e8b56f8cebd752f7113ad07752461f48a58cbba644139015ac24954c", size = 221593, upload-time = "2025-09-08T23:23:31.91Z" }, - { url = "https://files.pythonhosted.org/packages/e0/0d/eb704606dfe8033e7128df5e90fee946bbcb64a04fcdaa97321309004000/cffi-2.0.0-cp314-cp314t-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:92b68146a71df78564e4ef48af17551a5ddd142e5190cdf2c5624d0c3ff5b2e8", size = 209354, upload-time = "2025-09-08T23:23:33.214Z" }, - { url = "https://files.pythonhosted.org/packages/d8/19/3c435d727b368ca475fb8742ab97c9cb13a0de600ce86f62eab7fa3eea60/cffi-2.0.0-cp314-cp314t-manylinux2014_s390x.manylinux_2_17_s390x.whl", hash = "sha256:b1e74d11748e7e98e2f426ab176d4ed720a64412b6a15054378afdb71e0f37dc", size = 208480, upload-time = "2025-09-08T23:23:34.495Z" }, - { url = "https://files.pythonhosted.org/packages/d0/44/681604464ed9541673e486521497406fadcc15b5217c3e326b061696899a/cffi-2.0.0-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:28a3a209b96630bca57cce802da70c266eb08c6e97e5afd61a75611ee6c64592", size = 221584, upload-time = "2025-09-08T23:23:36.096Z" }, - { url = "https://files.pythonhosted.org/packages/25/8e/342a504ff018a2825d395d44d63a767dd8ebc927ebda557fecdaca3ac33a/cffi-2.0.0-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:7553fb2090d71822f02c629afe6042c299edf91ba1bf94951165613553984512", size = 224443, upload-time = "2025-09-08T23:23:37.328Z" }, - { url = "https://files.pythonhosted.org/packages/e1/5e/b666bacbbc60fbf415ba9988324a132c9a7a0448a9a8f125074671c0f2c3/cffi-2.0.0-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:6c6c373cfc5c83a975506110d17457138c8c63016b563cc9ed6e056a82f13ce4", size = 223437, upload-time = "2025-09-08T23:23:38.945Z" }, - { url = "https://files.pythonhosted.org/packages/a0/1d/ec1a60bd1a10daa292d3cd6bb0b359a81607154fb8165f3ec95fe003b85c/cffi-2.0.0-cp314-cp314t-win32.whl", hash = "sha256:1fc9ea04857caf665289b7a75923f2c6ed559b8298a1b8c49e59f7dd95c8481e", size = 180487, upload-time = "2025-09-08T23:23:40.423Z" }, - { url = "https://files.pythonhosted.org/packages/bf/41/4c1168c74fac325c0c8156f04b6749c8b6a8f405bbf91413ba088359f60d/cffi-2.0.0-cp314-cp314t-win_amd64.whl", hash = "sha256:d68b6cef7827e8641e8ef16f4494edda8b36104d79773a334beaa1e3521430f6", size = 191726, upload-time = "2025-09-08T23:23:41.742Z" }, - { url = "https://files.pythonhosted.org/packages/ae/3a/dbeec9d1ee0844c679f6bb5d6ad4e9f198b1224f4e7a32825f47f6192b0c/cffi-2.0.0-cp314-cp314t-win_arm64.whl", hash = "sha256:0a1527a803f0a659de1af2e1fd700213caba79377e27e4693648c2923da066f9", size = 184195, upload-time = "2025-09-08T23:23:43.004Z" }, -] - [[package]] name = "charset-normalizer" version = "3.4.7" @@ -424,15 +153,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/d1/d6/3965ed04c63042e047cb6a3e6ed1a63a35087b6a609aa3a15ed8ac56c221/colorama-0.4.6-py2.py3-none-any.whl", hash = "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6", size = 25335, upload-time = "2022-10-25T02:36:20.889Z" }, ] -[[package]] -name = "comm" -version = "0.2.3" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/4c/13/7d740c5849255756bc17888787313b61fd38a0a8304fc4f073dfc46122aa/comm-0.2.3.tar.gz", hash = "sha256:2dc8048c10962d55d7ad693be1e7045d891b7ce8d999c97963a5e3e99c055971", size = 6319, upload-time = "2025-07-25T14:02:04.452Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/60/97/891a0971e1e4a8c5d2b20bbe0e524dc04548d2307fee33cdeba148fd4fc7/comm-0.2.3-py3-none-any.whl", hash = "sha256:c615d91d75f7f04f095b30d1c1711babd43bdc6419c1be9886a85f2f4e489417", size = 7294, upload-time = "2025-07-25T14:02:02.896Z" }, -] - [[package]] name = "contourpy" version = "1.3.3" @@ -466,112 +186,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/ae/8c/469afb6465b853afff216f9528ffda78a915ff880ed58813ba4faf4ba0b6/contourpy-1.3.3-cp314-cp314t-win_arm64.whl", hash = "sha256:b7448cb5a725bb1e35ce88771b86fba35ef418952474492cf7c764059933ff8b", size = 203831, upload-time = "2025-07-26T12:02:51.449Z" }, ] -[[package]] -name = "cramjam" -version = "2.11.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/14/12/34bf6e840a79130dfd0da7badfb6f7810b8fcfd60e75b0539372667b41b6/cramjam-2.11.0.tar.gz", hash = "sha256:5c82500ed91605c2d9781380b378397012e25127e89d64f460fea6aeac4389b4", size = 99100, upload-time = "2025-07-27T21:25:07.559Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/de/07/a1051cdbbe6d723df16d756b97f09da7c1adb69e29695c58f0392bc12515/cramjam-2.11.0-cp314-cp314-macosx_10_12_x86_64.macosx_11_0_arm64.macosx_10_12_universal2.whl", hash = "sha256:7ba5e38c9fbd06f086f4a5a64a1a5b7b417cd3f8fc07a20e5c03651f72f36100", size = 3554141, upload-time = "2025-07-27T21:23:17.938Z" }, - { url = "https://files.pythonhosted.org/packages/74/66/58487d2e16ef3d04f51a7c7f0e69823e806744b4c21101e89da4873074bc/cramjam-2.11.0-cp314-cp314-macosx_10_12_x86_64.whl", hash = "sha256:b8adeee57b41fe08e4520698a4b0bd3cc76dbd81f99424b806d70a5256a391d3", size = 1860353, upload-time = "2025-07-27T21:23:19.593Z" }, - { url = "https://files.pythonhosted.org/packages/67/b4/67f6254d166ffbcc9d5fa1b56876eaa920c32ebc8e9d3d525b27296b693b/cramjam-2.11.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:b96a74fa03a636c8a7d76f700d50e9a8bc17a516d6a72d28711225d641e30968", size = 1693832, upload-time = "2025-07-27T21:23:21.185Z" }, - { url = "https://files.pythonhosted.org/packages/55/a3/4e0b31c0d454ae70c04684ed7c13d3c67b4c31790c278c1e788cb804fa4a/cramjam-2.11.0-cp314-cp314-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:c3811a56fa32e00b377ef79121c0193311fd7501f0fb378f254c7f083cc1fbe0", size = 2027080, upload-time = "2025-07-27T21:23:23.303Z" }, - { url = "https://files.pythonhosted.org/packages/d9/c7/5e8eed361d1d3b8be14f38a54852c5370cc0ceb2c2d543b8ba590c34f080/cramjam-2.11.0-cp314-cp314-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c5d927e87461f8a0d448e4ab5eb2bca9f31ca5d8ea86d70c6f470bb5bc666d7e", size = 1761543, upload-time = "2025-07-27T21:23:24.991Z" }, - { url = "https://files.pythonhosted.org/packages/09/0c/06b7f8b0ce9fde89470505116a01fc0b6cb92d406c4fb1e46f168b5d3fa5/cramjam-2.11.0-cp314-cp314-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:f1f5c450121430fd89cb5767e0a9728ecc65997768fd4027d069cb0368af62f9", size = 1854636, upload-time = "2025-07-27T21:23:26.987Z" }, - { url = "https://files.pythonhosted.org/packages/6f/c6/6ebc02c9d5acdf4e5f2b1ec6e1252bd5feee25762246798ae823b3347457/cramjam-2.11.0-cp314-cp314-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:724aa7490be50235d97f07e2ca10067927c5d7f336b786ddbc868470e822aa25", size = 2032715, upload-time = "2025-07-27T21:23:28.603Z" }, - { url = "https://files.pythonhosted.org/packages/a2/77/a122971c23f5ca4b53e4322c647ac7554626c95978f92d19419315dddd05/cramjam-2.11.0-cp314-cp314-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:54c4637122e7cfd7aac5c1d3d4c02364f446d6923ea34cf9d0e8816d6e7a4936", size = 2069039, upload-time = "2025-07-27T21:23:30.319Z" }, - { url = "https://files.pythonhosted.org/packages/19/0f/f6121b90b86b9093c066889274d26a1de3f29969d45c2ed1ecbe2033cb78/cramjam-2.11.0-cp314-cp314-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:17eb39b1696179fb471eea2de958fa21f40a2cd8bf6b40d428312d5541e19dc4", size = 1979566, upload-time = "2025-07-27T21:23:32.002Z" }, - { url = "https://files.pythonhosted.org/packages/e0/a3/f95bc57fd7f4166ce6da816cfa917fb7df4bb80e669eb459d85586498414/cramjam-2.11.0-cp314-cp314-musllinux_1_1_aarch64.whl", hash = "sha256:36aa5a798aa34e11813a80425a30d8e052d8de4a28f27bfc0368cfc454d1b403", size = 2030905, upload-time = "2025-07-27T21:23:33.696Z" }, - { url = "https://files.pythonhosted.org/packages/fc/52/e429de4e8bc86ee65e090dae0f87f45abd271742c63fb2d03c522ffde28a/cramjam-2.11.0-cp314-cp314-musllinux_1_1_armv7l.whl", hash = "sha256:449fca52774dc0199545fbf11f5128933e5a6833946707885cf7be8018017839", size = 2155592, upload-time = "2025-07-27T21:23:35.375Z" }, - { url = "https://files.pythonhosted.org/packages/6c/6c/65a7a0207787ad39ad804af4da7f06a60149de19481d73d270b540657234/cramjam-2.11.0-cp314-cp314-musllinux_1_1_i686.whl", hash = "sha256:d87d37b3d476f4f7623c56a232045d25bd9b988314702ea01bd9b4a94948a778", size = 2170839, upload-time = "2025-07-27T21:23:37.197Z" }, - { url = "https://files.pythonhosted.org/packages/b2/c5/5c5db505ba692bc844246b066e23901d5905a32baf2f33719c620e65887f/cramjam-2.11.0-cp314-cp314-musllinux_1_1_x86_64.whl", hash = "sha256:26cb45c47d71982d76282e303931c6dd4baee1753e5d48f9a89b3a63e690b3a3", size = 2157236, upload-time = "2025-07-27T21:23:38.854Z" }, - { url = "https://files.pythonhosted.org/packages/b0/22/88e6693e60afe98901e5bbe91b8dea193e3aa7f42e2770f9c3339f5c1065/cramjam-2.11.0-cp314-cp314-win32.whl", hash = "sha256:4efe919d443c2fd112fe25fe636a52f9628250c9a50d9bddb0488d8a6c09acc6", size = 1604136, upload-time = "2025-07-27T21:23:40.56Z" }, - { url = "https://files.pythonhosted.org/packages/cc/f8/01618801cd59ccedcc99f0f96d20be67d8cfc3497da9ccaaad6b481781dd/cramjam-2.11.0-cp314-cp314-win_amd64.whl", hash = "sha256:ccec3524ea41b9abd5600e3e27001fd774199dbb4f7b9cb248fcee37d4bda84c", size = 1710272, upload-time = "2025-07-27T21:23:42.236Z" }, - { url = "https://files.pythonhosted.org/packages/40/81/6cdb3ed222d13ae86bda77aafe8d50566e81a1169d49ed195b6263610704/cramjam-2.11.0-cp314-cp314t-macosx_10_12_x86_64.macosx_11_0_arm64.macosx_10_12_universal2.whl", hash = "sha256:966ac9358b23d21ecd895c418c048e806fd254e46d09b1ff0cdad2eba195ea3e", size = 3559671, upload-time = "2025-07-27T21:23:44.504Z" }, - { url = "https://files.pythonhosted.org/packages/cb/43/52b7e54fe5ba1ef0270d9fdc43dabd7971f70ea2d7179be918c997820247/cramjam-2.11.0-cp314-cp314t-macosx_10_12_x86_64.whl", hash = "sha256:387f09d647a0d38dcb4539f8a14281f8eb6bb1d3e023471eb18a5974b2121c86", size = 1867876, upload-time = "2025-07-27T21:23:46.987Z" }, - { url = "https://files.pythonhosted.org/packages/9d/28/30d5b8d10acd30db3193bc562a313bff722888eaa45cfe32aa09389f2b24/cramjam-2.11.0-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:665b0d8fbbb1a7f300265b43926457ec78385200133e41fef19d85790fc1e800", size = 1695562, upload-time = "2025-07-27T21:23:48.644Z" }, - { url = "https://files.pythonhosted.org/packages/d9/86/ec806f986e01b896a650655024ea52a13e25c3ac8a3a382f493089483cdc/cramjam-2.11.0-cp314-cp314t-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:ca905387c7a371531b9622d93471be4d745ef715f2890c3702479cd4fc85aa51", size = 2025056, upload-time = "2025-07-27T21:23:50.404Z" }, - { url = "https://files.pythonhosted.org/packages/09/43/c2c17586b90848d29d63181f7d14b8bd3a7d00975ad46e3edf2af8af7e1f/cramjam-2.11.0-cp314-cp314t-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3c1aa56aef2c8af55a21ed39040a94a12b53fb23beea290f94d19a76027e2ffb", size = 1764084, upload-time = "2025-07-27T21:23:52.265Z" }, - { url = "https://files.pythonhosted.org/packages/2b/a9/68bc334fadb434a61df10071dc8606702aa4f5b6cdb2df62474fc21d2845/cramjam-2.11.0-cp314-cp314t-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:e5db59c1cdfaa2ab85cc988e602d6919495f735ca8a5fd7603608eb1e23c26d5", size = 1854859, upload-time = "2025-07-27T21:23:54.085Z" }, - { url = "https://files.pythonhosted.org/packages/5b/4e/b48e67835b5811ec5e9cb2e2bcba9c3fd76dab3e732569fe801b542c6ca9/cramjam-2.11.0-cp314-cp314t-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:b1f893014f00fe5e89a660a032e813bf9f6d91de74cd1490cdb13b2b59d0c9a3", size = 2035970, upload-time = "2025-07-27T21:23:55.758Z" }, - { url = "https://files.pythonhosted.org/packages/c4/70/d2ac33d572b4d90f7f0f2c8a1d60fb48f06b128fdc2c05f9b49891bb0279/cramjam-2.11.0-cp314-cp314t-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c26a1eb487947010f5de24943bd7c422dad955b2b0f8650762539778c380ca89", size = 2069320, upload-time = "2025-07-27T21:23:57.494Z" }, - { url = "https://files.pythonhosted.org/packages/1d/4c/85cec77af4a74308ba5fca8e296c4e2f80ec465c537afc7ab1e0ca2f9a00/cramjam-2.11.0-cp314-cp314t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7d5c8bfb438d94e7b892d1426da5fc4b4a5370cc360df9b8d9d77c33b896c37e", size = 1982668, upload-time = "2025-07-27T21:23:59.126Z" }, - { url = "https://files.pythonhosted.org/packages/55/45/938546d1629e008cc3138df7c424ef892719b1796ff408a2ab8550032e5e/cramjam-2.11.0-cp314-cp314t-musllinux_1_1_aarch64.whl", hash = "sha256:cb1fb8c9337ab0da25a01c05d69a0463209c347f16512ac43be5986f3d1ebaf4", size = 2034028, upload-time = "2025-07-27T21:24:00.865Z" }, - { url = "https://files.pythonhosted.org/packages/01/76/b5a53e20505555f1640e66dcf70394bcf51a1a3a072aa18ea35135a0f9ed/cramjam-2.11.0-cp314-cp314t-musllinux_1_1_armv7l.whl", hash = "sha256:1f6449f6de52dde3e2f1038284910c8765a397a25e2d05083870f3f5e7fc682c", size = 2155513, upload-time = "2025-07-27T21:24:02.92Z" }, - { url = "https://files.pythonhosted.org/packages/84/12/8d3f6ceefae81bbe45a347fdfa2219d9f3ac75ebc304f92cd5fcb4fbddc5/cramjam-2.11.0-cp314-cp314t-musllinux_1_1_i686.whl", hash = "sha256:382dec4f996be48ed9c6958d4e30c2b89435d7c2c4dbf32480b3b8886293dd65", size = 2170035, upload-time = "2025-07-27T21:24:04.558Z" }, - { url = "https://files.pythonhosted.org/packages/4b/85/3be6f0a1398f976070672be64f61895f8839857618a2d8cc0d3ab529d3dc/cramjam-2.11.0-cp314-cp314t-musllinux_1_1_x86_64.whl", hash = "sha256:d388bd5723732c3afe1dd1d181e4213cc4e1be210b080572e7d5749f6e955656", size = 2160229, upload-time = "2025-07-27T21:24:06.729Z" }, - { url = "https://files.pythonhosted.org/packages/57/5e/66cfc3635511b20014bbb3f2ecf0095efb3049e9e96a4a9e478e4f3d7b78/cramjam-2.11.0-cp314-cp314t-win32.whl", hash = "sha256:0a70ff17f8e1d13f322df616505550f0f4c39eda62290acb56f069d4857037c8", size = 1610267, upload-time = "2025-07-27T21:24:08.428Z" }, - { url = "https://files.pythonhosted.org/packages/ce/c6/c71e82e041c95ffe6a92ac707785500aa2a515a4339c2c7dd67e3c449249/cramjam-2.11.0-cp314-cp314t-win_amd64.whl", hash = "sha256:028400d699442d40dbda02f74158c73d05cb76587a12490d0bfedd958fd49188", size = 1713108, upload-time = "2025-07-27T21:24:10.147Z" }, -] - -[[package]] -name = "crontab" -version = "1.0.5" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/d6/36/a255b6f5a2e22df03fd2b2f3088974b44b8c9e9407e26b44742cb7cfbf5b/crontab-1.0.5.tar.gz", hash = "sha256:f80e01b4f07219763a9869f926dd17147278e7965a928089bca6d3dc80ae46d5", size = 21963, upload-time = "2025-07-09T17:09:38.264Z" } - -[[package]] -name = "cryptography" -version = "48.0.0" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "cffi", marker = "platform_python_implementation != 'PyPy'" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/9f/a9/db8f313fdcd85d767d4973515e1db101f9c71f95fced83233de224673757/cryptography-48.0.0.tar.gz", hash = "sha256:5c3932f4436d1cccb036cb0eaef46e6e2db91035166f1ad6505c3c9d5a635920", size = 832984, upload-time = "2026-05-04T22:59:38.133Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/df/3d/01f6dd9190170a5a241e0e98c2d04be3664a9e6f5b9b872cde63aff1c3dd/cryptography-48.0.0-cp311-abi3-macosx_10_9_universal2.whl", hash = "sha256:0c558d2cdffd8f4bbb30fc7134c74d2ca9a476f830bb053074498fbc86f41ed6", size = 8001587, upload-time = "2026-05-04T22:57:36.803Z" }, - { url = "https://files.pythonhosted.org/packages/b2/6e/e90527eef33f309beb811cf7c982c3aeffcce8e3edb178baa4ca3ae4a6fa/cryptography-48.0.0-cp311-abi3-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:f5333311663ea94f75dd408665686aaf426563556bb5283554a3539177e03b8c", size = 4690433, upload-time = "2026-05-04T22:57:40.373Z" }, - { url = "https://files.pythonhosted.org/packages/90/04/673510ed51ddff56575f306cf1617d80411ee76831ccd3097599140efdfe/cryptography-48.0.0-cp311-abi3-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:7995ef305d7165c3f11ae07f2517e5a4f1d5c18da1376a0a9ed496336b69e5f3", size = 4710620, upload-time = "2026-05-04T22:57:42.935Z" }, - { url = "https://files.pythonhosted.org/packages/14/d5/e9c4ef932c8d800490c34d8bd589d64a31d5890e27ec9e9ad532be893294/cryptography-48.0.0-cp311-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:40ba1f85eaa6959837b1d51c9767e230e14612eea4ef110ee8854ada22da1bf5", size = 4696283, upload-time = "2026-05-04T22:57:45.294Z" }, - { url = "https://files.pythonhosted.org/packages/0c/29/174b9dfb60b12d59ecfc6cfa04bc88c21b42a54f01b8aae09bb6e51e4c7f/cryptography-48.0.0-cp311-abi3-manylinux_2_28_ppc64le.whl", hash = "sha256:369a6348999f94bbd53435c894377b20ab95f25a9065c283570e70150d8abc3c", size = 5296573, upload-time = "2026-05-04T22:57:47.933Z" }, - { url = "https://files.pythonhosted.org/packages/95/38/0d29a6fd7d0d1373f0c0c88a04ba20e359b257753ac497564cd660fc1d55/cryptography-48.0.0-cp311-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:a0e692c683f4df67815a2d258b324e66f4738bd7a96a218c826dce4f4bd05d8f", size = 4743677, upload-time = "2026-05-04T22:57:50.067Z" }, - { url = "https://files.pythonhosted.org/packages/30/be/eef653013d5c63b6a490529e0316f9ac14a37602965d4903efed1399f32b/cryptography-48.0.0-cp311-abi3-manylinux_2_31_armv7l.whl", hash = "sha256:18349bbc56f4743c8b12dc32e2bccb2cf83ee8b69a3bba74ef8ae857e26b3d25", size = 4330808, upload-time = "2026-05-04T22:57:52.301Z" }, - { url = "https://files.pythonhosted.org/packages/84/9e/500463e87abb7a0a0f9f256ec21123ecde0a7b5541a15e840ea54551fd81/cryptography-48.0.0-cp311-abi3-manylinux_2_34_aarch64.whl", hash = "sha256:7e8eac43dfca5c4cccc6dad9a80504436fca53bb9bc3100a2386d730fbe6b602", size = 4695941, upload-time = "2026-05-04T22:57:54.603Z" }, - { url = "https://files.pythonhosted.org/packages/e3/dc/7303087450c2ec9e7fbb750e17c2abfbc658f23cbd0e54009509b7cc4091/cryptography-48.0.0-cp311-abi3-manylinux_2_34_ppc64le.whl", hash = "sha256:9ccdac7d40688ecb5a3b4a604b8a88c8002e3442d6c60aead1db2a89a041560c", size = 5252579, upload-time = "2026-05-04T22:57:57.207Z" }, - { url = "https://files.pythonhosted.org/packages/d0/c0/7101d3b7215edcdc90c45da544961fd8ed2d6448f77577460fa75a8443f7/cryptography-48.0.0-cp311-abi3-manylinux_2_34_x86_64.whl", hash = "sha256:bd72e68b06bb1e96913f97dd4901119bc17f39d4586a5adf2d3e47bc2b9d58b5", size = 4743326, upload-time = "2026-05-04T22:57:59.535Z" }, - { url = "https://files.pythonhosted.org/packages/ac/d8/5b833bad13016f562ab9d063d68199a4bd121d18458e439515601d3357ec/cryptography-48.0.0-cp311-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:59baa2cb386c4f0b9905bd6eb4c2a79a69a128408fd31d32ca4d7102d4156321", size = 4826672, upload-time = "2026-05-04T22:58:01.996Z" }, - { url = "https://files.pythonhosted.org/packages/98/e1/7074eb8bf3c135558c73fc2bcf0f5633f912e6fb87e868a55c454080ef09/cryptography-48.0.0-cp311-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:9249e3cd978541d665967ac2cb2787fd6a62bddf1e75b3e347a594d7dacf4f74", size = 4972574, upload-time = "2026-05-04T22:58:03.968Z" }, - { url = "https://files.pythonhosted.org/packages/04/70/e5a1b41d325f797f39427aa44ef8baf0be500065ab6d8e10369d850d4a4f/cryptography-48.0.0-cp311-abi3-win32.whl", hash = "sha256:9c459db21422be75e2809370b829a87eb37f74cd785fc4aa9ea1e5f43b47cda4", size = 3294868, upload-time = "2026-05-04T22:58:06.467Z" }, - { url = "https://files.pythonhosted.org/packages/f4/ac/8ac51b4a5fc5932eb7ee5c517ba7dc8cd834f0048962b6b352f00f41ebf9/cryptography-48.0.0-cp311-abi3-win_amd64.whl", hash = "sha256:5b012212e08b8dd5edc78ef54da83dd9892fd9105323b3993eff6bea65dc21d7", size = 3817107, upload-time = "2026-05-04T22:58:08.845Z" }, - { url = "https://files.pythonhosted.org/packages/6b/84/70e3feea9feea87fd7cbe77efb2712ae1e3e6edf10749dc6e95f4e60e455/cryptography-48.0.0-cp314-cp314t-macosx_10_9_universal2.whl", hash = "sha256:3cb07a3ed6431663cd321ea8a000a1314c74211f823e4177fefa2255e057d1ec", size = 7986556, upload-time = "2026-05-04T22:58:11.172Z" }, - { url = "https://files.pythonhosted.org/packages/89/6e/18e07a618bb5442ba10cf4df16e99c071365528aa570dfcb8c02e25a303b/cryptography-48.0.0-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:8c7378637d7d88016fa6791c159f698b3d3eed28ebf844ac36b9dc04a14dae18", size = 4684776, upload-time = "2026-05-04T22:58:13.712Z" }, - { url = "https://files.pythonhosted.org/packages/be/6a/4ea3b4c6c6759794d5ee2103c304a5076dc4b19ae1f9fe47dba439e159e9/cryptography-48.0.0-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:cc90c0b39b2e3c65ef52c804b72e3c58f8a04ab2a1871272798e5f9572c17d20", size = 4698121, upload-time = "2026-05-04T22:58:16.448Z" }, - { url = "https://files.pythonhosted.org/packages/2f/59/6ff6ad6cae03bb887da2a5860b2c9805f8dac969ef01ce563336c49bd1d1/cryptography-48.0.0-cp314-cp314t-manylinux_2_28_aarch64.whl", hash = "sha256:76341972e1eff8b4bea859f09c0d3e64b96ce931b084f9b9b7db8ef364c30eff", size = 4690042, upload-time = "2026-05-04T22:58:18.544Z" }, - { url = "https://files.pythonhosted.org/packages/ca/b4/fc334ed8cfd705aca282fe4d8f5ae64a8e0f74932e9feecb344610cf6e4d/cryptography-48.0.0-cp314-cp314t-manylinux_2_28_ppc64le.whl", hash = "sha256:55b7718303bf06a5753dcdccf2f3945cf18ad7bffde41b61226e4db31ab89a9c", size = 5282526, upload-time = "2026-05-04T22:58:20.75Z" }, - { url = "https://files.pythonhosted.org/packages/11/08/9f8c5386cc4cd90d8255c7cdd0f5baf459a08502a09de30dc51f553d38dc/cryptography-48.0.0-cp314-cp314t-manylinux_2_28_x86_64.whl", hash = "sha256:a64697c641c7b1b2178e573cbc31c7c6684cd56883a478d75143dbb7118036db", size = 4733116, upload-time = "2026-05-04T22:58:23.627Z" }, - { url = "https://files.pythonhosted.org/packages/b8/77/99307d7574045699f8805aa500fa0fb83422d115b5400a064ddd306d7750/cryptography-48.0.0-cp314-cp314t-manylinux_2_31_armv7l.whl", hash = "sha256:561215ea3879cb1cbbf272867e2efda62476f240fb58c64de6b393ae19246741", size = 4316030, upload-time = "2026-05-04T22:58:25.581Z" }, - { url = "https://files.pythonhosted.org/packages/fd/36/a608b98337af3cb2aff4818e406649d30572b7031918b04c87d979495348/cryptography-48.0.0-cp314-cp314t-manylinux_2_34_aarch64.whl", hash = "sha256:ad64688338ed4bc1a6618076ba75fd7194a5f1797ac60b47afe926285adb3166", size = 4689640, upload-time = "2026-05-04T22:58:27.747Z" }, - { url = "https://files.pythonhosted.org/packages/dd/a6/825010a291b4438aecc1f568bc428189fc1175515223632477c07dc0a6df/cryptography-48.0.0-cp314-cp314t-manylinux_2_34_ppc64le.whl", hash = "sha256:906cbf0670286c6e0044156bc7d4af9cbb0ef6db9f73e52c3ec56ba6bdde5336", size = 5237657, upload-time = "2026-05-04T22:58:29.848Z" }, - { url = "https://files.pythonhosted.org/packages/b9/09/4e76a09b4caa29aad535ddc806f5d4c5d01885bd978bd984fbc6ca032cae/cryptography-48.0.0-cp314-cp314t-manylinux_2_34_x86_64.whl", hash = "sha256:ea8990436d914540a40ab24b6a77c0969695ed52f4a4874c5137ccf7045a7057", size = 4732362, upload-time = "2026-05-04T22:58:32.009Z" }, - { url = "https://files.pythonhosted.org/packages/18/78/444fa04a77d0cb95f417dda20d450e13c56ba8e5220fc892a1658f44f882/cryptography-48.0.0-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:c18684a7f0cc9a3cb60328f496b8e3372def7c5d2df39ac267878b05565aaaae", size = 4819580, upload-time = "2026-05-04T22:58:34.254Z" }, - { url = "https://files.pythonhosted.org/packages/38/85/ea67067c70a1fd4be2c63d35eeed82658023021affccc7b17705f8527dd2/cryptography-48.0.0-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:9be5aafa5736574f8f15f262adc81b2a9869e2cfe9014d52a44633905b40d52c", size = 4963283, upload-time = "2026-05-04T22:58:36.376Z" }, - { url = "https://files.pythonhosted.org/packages/75/54/cc6d0f3deac3e81c7f847e8a189a12b6cdd65059b43dad25d4316abd849a/cryptography-48.0.0-cp314-cp314t-win32.whl", hash = "sha256:c17dfe85494deaeddc5ce251aebd1d60bbe6afc8b62071bb0b469431a000124f", size = 3270954, upload-time = "2026-05-04T22:58:38.791Z" }, - { url = "https://files.pythonhosted.org/packages/49/67/cc947e288c0758a4e5473d1dcb743037ab7785541265a969240b8885441a/cryptography-48.0.0-cp314-cp314t-win_amd64.whl", hash = "sha256:27241b1dc9962e056062a8eef1991d02c3a24569c95975bd2322a8a52c6e5e12", size = 3797313, upload-time = "2026-05-04T22:58:40.746Z" }, - { url = "https://files.pythonhosted.org/packages/f2/63/61d4a4e1c6b6bab6ce1e213cd36a24c415d90e76d78c5eb8577c5541d2e8/cryptography-48.0.0-cp39-abi3-macosx_10_9_universal2.whl", hash = "sha256:58d00498e8933e4a194f3076aee1b4a97dfec1a6da444535755822fe5d8b0b86", size = 7983482, upload-time = "2026-05-04T22:58:43.769Z" }, - { url = "https://files.pythonhosted.org/packages/d5/ac/f5b5995b87770c693e2596559ffafe195b4033a57f14a82268a2842953f3/cryptography-48.0.0-cp39-abi3-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:614d0949f4790582d2cc25553abd09dd723025f0c0e7c67376a1d77196743d6e", size = 4683266, upload-time = "2026-05-04T22:58:46.064Z" }, - { url = "https://files.pythonhosted.org/packages/ec/c6/8b14f67e18338fbc4adb76f66c001f5c3610b3e2d1837f268f47a347dbbb/cryptography-48.0.0-cp39-abi3-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:7ce4bfae76319a532a2dc68f82cc32f5676ee792a983187dac07183690e5c66f", size = 4696228, upload-time = "2026-05-04T22:58:48.22Z" }, - { url = "https://files.pythonhosted.org/packages/ea/73/f808fbae9514bd91b47875b003f13e284c8c6bdfd904b7944e803937eec1/cryptography-48.0.0-cp39-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:2eb992bbd4661238c5a397594c83f5b4dc2bc5b848c365c8f991b6780efcc5c7", size = 4689097, upload-time = "2026-05-04T22:58:50.9Z" }, - { url = "https://files.pythonhosted.org/packages/93/01/d86632d7d28db8ae83221995752eeb6639ffb374c2d22955648cf8d52797/cryptography-48.0.0-cp39-abi3-manylinux_2_28_ppc64le.whl", hash = "sha256:22a5cb272895dce158b2cacdfdc3debd299019659f42947dbdac6f32d68fe832", size = 5283582, upload-time = "2026-05-04T22:58:53.017Z" }, - { url = "https://files.pythonhosted.org/packages/02/e1/50edc7a50334807cc4791fc4a0ce7468b4a1416d9138eab358bfc9a3d70b/cryptography-48.0.0-cp39-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:2b4d59804e8408e2fea7d1fbaf218e5ec984325221db76e6a241a9abd6cdd95c", size = 4730479, upload-time = "2026-05-04T22:58:55.611Z" }, - { url = "https://files.pythonhosted.org/packages/6f/af/99a582b1b1641ff5911ac559beb45097cf79efd4ead4657f578ef1af2d47/cryptography-48.0.0-cp39-abi3-manylinux_2_31_armv7l.whl", hash = "sha256:984a20b0f62a26f48a3396c72e4bc34c66e356d356bf370053066b3b6d54634a", size = 4326481, upload-time = "2026-05-04T22:58:57.607Z" }, - { url = "https://files.pythonhosted.org/packages/90/ee/89aa26a06ef0a7d7611788ffd571a7c50e368cc6a4d5eef8b4884e866edb/cryptography-48.0.0-cp39-abi3-manylinux_2_34_aarch64.whl", hash = "sha256:5a5ed8fde7a1d09376ca0b40e68cd59c69fe23b1f9768bd5824f54681626032a", size = 4688713, upload-time = "2026-05-04T22:59:00.077Z" }, - { url = "https://files.pythonhosted.org/packages/70/ba/bcb1b0bb7a33d4c7c0c4d4c7874b4a62ae4f56113a5f4baefa362dfb1f0f/cryptography-48.0.0-cp39-abi3-manylinux_2_34_ppc64le.whl", hash = "sha256:8cd666227ef7af430aa5914a9910e0ddd703e75f039cef0825cd0da71b6b711a", size = 5238165, upload-time = "2026-05-04T22:59:02.317Z" }, - { url = "https://files.pythonhosted.org/packages/c9/70/ca4003b1ce5ca3dc3186ada51908c8a9b9ff7d5cab83cc0d43ee14ec144f/cryptography-48.0.0-cp39-abi3-manylinux_2_34_x86_64.whl", hash = "sha256:9071196d81abc88b3516ac8cdfad32e2b66dd4a5393a8e68a961e9161ddc6239", size = 4729947, upload-time = "2026-05-04T22:59:05.255Z" }, - { url = "https://files.pythonhosted.org/packages/44/a0/4ec7cf774207905aef1a8d11c3750d5a1db805eb380ee4e16df317870128/cryptography-48.0.0-cp39-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:1e2d54c8be6152856a36f0882ab231e70f8ec7f14e93cf87db8a2ed056bf160c", size = 4822059, upload-time = "2026-05-04T22:59:07.802Z" }, - { url = "https://files.pythonhosted.org/packages/1e/75/a2e55f99c16fcac7b5d6c1eb19ad8e00799854d6be5ca845f9259eae1681/cryptography-48.0.0-cp39-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:a5da777e32ffed6f85a7b2b3f7c5cbc88c146bfcd0a1d7baf5fcc6c52ee35dd4", size = 4960575, upload-time = "2026-05-04T22:59:09.851Z" }, - { url = "https://files.pythonhosted.org/packages/b8/23/6e6f32143ab5d8b36ca848a502c4bcd477ae75b9e1677e3530d669062578/cryptography-48.0.0-cp39-abi3-win32.whl", hash = "sha256:77a2ccbbe917f6710e05ba9adaa25fb5075620bf3ea6fb751997875aff4ae4bd", size = 3279117, upload-time = "2026-05-04T22:59:12.019Z" }, - { url = "https://files.pythonhosted.org/packages/9d/9a/0fea98a70cf1749d41d738836f6349d97945f7c89433a259a6c2642eefeb/cryptography-48.0.0-cp39-abi3-win_amd64.whl", hash = "sha256:16cd65b9330583e4619939b3a3843eec1e6e789744bb01e7c7e2e62e33c239c8", size = 3792100, upload-time = "2026-05-04T22:59:14.884Z" }, -] - -[[package]] -name = "css-html-js-minify" -version = "2.5.5" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/75/61/f52e5225abe8e36ed5396e5ae3074df5f4ef994b540e9b4fd55a39b03cfd/css-html-js-minify-2.5.5.zip", hash = "sha256:4a9f11f7e0496f5284d12111f3ba4ff5ff2023d12f15d195c9c48bd97013746c", size = 33156, upload-time = "2018-04-14T15:10:29.53Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/e8/21/1260081a2c67105a3bd0f8692ff3c80b5f0cb5fe9f3f8fd4a990f17b8a39/css_html_js_minify-2.5.5-py2.py3-none-any.whl", hash = "sha256:3da9d35ac0db8ca648c1b543e0e801d7ca0bab9e6bfd8418fee59d5ae001727a", size = 40527, upload-time = "2018-04-14T15:10:26.667Z" }, -] - [[package]] name = "cycler" version = "0.12.1" @@ -581,75 +195,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/e7/05/c19819d5e3d95294a6f5947fb9b9629efb316b96de511b418c53d245aae6/cycler-0.12.1-py3-none-any.whl", hash = "sha256:85cef7cff222d8644161529808465972e51340599459b8ac3ccbac5a854e0d30", size = 8321, upload-time = "2023-10-07T05:32:16.783Z" }, ] -[[package]] -name = "dateparser" -version = "1.4.0" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "python-dateutil" }, - { name = "pytz" }, - { name = "regex" }, - { name = "tzlocal" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/46/2d/a0ccdb78788064fa0dc901b8524e50615c42be1d78b78d646d0b28d09180/dateparser-1.4.0.tar.gz", hash = "sha256:97a21840d5ecdf7630c584f673338a5afac5dfe84f647baf4d7e8df98f9354a4", size = 321512, upload-time = "2026-03-26T09:56:10.292Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/b4/0b/3c3bb7cbe757279e693a0be6049048012f794d01f81099609ecd53b899f0/dateparser-1.4.0-py3-none-any.whl", hash = "sha256:7902b8e85d603494bf70a5a0b1decdddb2270b9c6e6b2bc8a57b93476c0df378", size = 300379, upload-time = "2026-03-26T09:56:08.409Z" }, -] - -[[package]] -name = "ddtrace" -version = "4.3.0" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "bytecode" }, - { name = "envier" }, - { name = "opentelemetry-api" }, - { name = "wrapt" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/bc/d0/0690d1b88b936ab31219ca9078859316185989be0d186ff33896f3191d39/ddtrace-4.3.0.tar.gz", hash = "sha256:366bc941a20137e6f5bff22aefd6a221ca15f1b087c31bf28fce448619f443b4", size = 7085760, upload-time = "2026-01-27T20:55:27.878Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/82/75/10b07479800a5a8947fd0e79001b009bded2a17ea5af96865d677eb91a98/ddtrace-4.3.0-cp314-cp314-macosx_14_0_arm64.whl", hash = "sha256:e26eb6de7eda425d75f5a1f55e55ad2d13e56f51b43c4b656478367a6692e0bd", size = 6904866, upload-time = "2026-01-27T20:54:38.633Z" }, - { url = "https://files.pythonhosted.org/packages/0e/b2/37f8cf8f57d17f350d2ab86ee814fc5b6c600d0ea2ee2ea8f96be1178cd0/ddtrace-4.3.0-cp314-cp314-macosx_14_0_x86_64.whl", hash = "sha256:f7ce739a6ef9b4d210a746327d377234b1996080028eddbe9c6a1f35193c348e", size = 7329967, upload-time = "2026-01-27T20:54:41.296Z" }, - { url = "https://files.pythonhosted.org/packages/19/c7/61b9a857f7b43234b896fd5e80d994f9efa007b0980887bf6d4d48ab6c20/ddtrace-4.3.0-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:0dff123cc9e39ff393c164198bb166270bcc826a87009af9b4f1431653aef531", size = 7721410, upload-time = "2026-01-27T20:54:43.85Z" }, - { url = "https://files.pythonhosted.org/packages/e1/38/c2e18f707ec222aa33af297dba967b2423559b058b92bfd0e6fd00c74a14/ddtrace-4.3.0-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:80a75fdf1d1717ea6e9d32d33019d0e76c2a38ea55b03dcbb45ad1af5f19079a", size = 8001195, upload-time = "2026-01-27T20:54:46.63Z" }, - { url = "https://files.pythonhosted.org/packages/32/2c/5912ad2ec39f8fa9250fa3f862156de00dbce86a702bf6e78f95f6ef1de7/ddtrace-4.3.0-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:074ac2d7a5f7dfa719b36a442b9b08842e698aa50061812a917c92141e020e1c", size = 8738876, upload-time = "2026-01-27T20:54:49.294Z" }, - { url = "https://files.pythonhosted.org/packages/af/0c/5a4098c258da2cc97160fb1735f57bad6048c6c980d24ecf8e58232fb15d/ddtrace-4.3.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:7c2a15dd28081ab305f9b7463446fa1bb4d3339744b8bff044837039726b1115", size = 9070879, upload-time = "2026-01-27T20:54:52.155Z" }, - { url = "https://files.pythonhosted.org/packages/a1/0b/60ab4556ef979a2d8b48328d778c2f521648f9ebf0518175d6cb61ae60ea/ddtrace-4.3.0-cp314-cp314-win32.whl", hash = "sha256:ce347b54d57686a90f36fb419f778379a00ce5d5ba6aacb79ccfde6c5f3e05b4", size = 5199611, upload-time = "2026-01-27T20:54:55.326Z" }, - { url = "https://files.pythonhosted.org/packages/0b/9d/dd17ae53fa30abc5ec0d4e53fd78768fef745acd3c2cc5067b75eb49af69/ddtrace-4.3.0-cp314-cp314-win_amd64.whl", hash = "sha256:cbeb4e4d2ec5eab248e34432f24e7d318f55031d3a6d39b540ebdebf51e55080", size = 5774168, upload-time = "2026-01-27T20:54:58.196Z" }, - { url = "https://files.pythonhosted.org/packages/3a/29/85c3372abf028f4c8da9f485bc814100e04c6e1b1b92db49bcb497ef0023/ddtrace-4.3.0-cp314-cp314-win_arm64.whl", hash = "sha256:d4b1c98336fd7b096b0b3a7baa095efba67919e6b4cafafe2cae16b17306dc30", size = 5500574, upload-time = "2026-01-27T20:55:00.865Z" }, -] - -[[package]] -name = "debugpy" -version = "1.8.20" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/e0/b7/cd8080344452e4874aae67c40d8940e2b4d47b01601a8fd9f44786c757c7/debugpy-1.8.20.tar.gz", hash = "sha256:55bc8701714969f1ab89a6d5f2f3d40c36f91b2cbe2f65d98bf8196f6a6a2c33", size = 1645207, upload-time = "2026-01-29T23:03:28.199Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/33/2e/f6cb9a8a13f5058f0a20fe09711a7b726232cd5a78c6a7c05b2ec726cff9/debugpy-1.8.20-cp314-cp314-macosx_15_0_universal2.whl", hash = "sha256:9c74df62fc064cd5e5eaca1353a3ef5a5d50da5eb8058fcef63106f7bebe6173", size = 2538066, upload-time = "2026-01-29T23:03:54.999Z" }, - { url = "https://files.pythonhosted.org/packages/c5/56/6ddca50b53624e1ca3ce1d1e49ff22db46c47ea5fb4c0cc5c9b90a616364/debugpy-1.8.20-cp314-cp314-manylinux_2_34_x86_64.whl", hash = "sha256:077a7447589ee9bc1ff0cdf443566d0ecf540ac8aa7333b775ebcb8ce9f4ecad", size = 4269425, upload-time = "2026-01-29T23:03:56.518Z" }, - { url = "https://files.pythonhosted.org/packages/c5/d9/d64199c14a0d4c476df46c82470a3ce45c8d183a6796cfb5e66533b3663c/debugpy-1.8.20-cp314-cp314-win32.whl", hash = "sha256:352036a99dd35053b37b7803f748efc456076f929c6a895556932eaf2d23b07f", size = 5331407, upload-time = "2026-01-29T23:03:58.481Z" }, - { url = "https://files.pythonhosted.org/packages/e0/d9/1f07395b54413432624d61524dfd98c1a7c7827d2abfdb8829ac92638205/debugpy-1.8.20-cp314-cp314-win_amd64.whl", hash = "sha256:a98eec61135465b062846112e5ecf2eebb855305acc1dfbae43b72903b8ab5be", size = 5372521, upload-time = "2026-01-29T23:03:59.864Z" }, - { url = "https://files.pythonhosted.org/packages/e0/c3/7f67dea8ccf8fdcb9c99033bbe3e90b9e7395415843accb81428c441be2d/debugpy-1.8.20-py2.py3-none-any.whl", hash = "sha256:5be9bed9ae3be00665a06acaa48f8329d2b9632f15fd09f6a9a8c8d9907e54d7", size = 5337658, upload-time = "2026-01-29T23:04:17.404Z" }, -] - -[[package]] -name = "decorator" -version = "5.3.1" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/60/8b/32f9823da46cde7df2087faa08cd98d01b908f8dcab982cdba9c84e85355/decorator-5.3.1.tar.gz", hash = "sha256:4cbcdd55a6efadb9dbea26b858f4fb3264567b52d69ca0d25b721b553f60ea82", size = 58084, upload-time = "2026-05-18T06:03:28.057Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/05/7f/798705f5296a58ca505d600456748d1be48078eac8a7050d8a98bc9edb89/decorator-5.3.1-py3-none-any.whl", hash = "sha256:f47fe6fdbd2edd623ecfe36875d37aba411624e2670dd395dddae1358689bb3c", size = 10365, upload-time = "2026-05-18T06:03:26.517Z" }, -] - -[[package]] -name = "defusedxml" -version = "0.7.1" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/0f/d5/c66da9b79e5bdb124974bfe172b4daf3c984ebd9c2a06e2b8a4dc7331c72/defusedxml-0.7.1.tar.gz", hash = "sha256:1bb3032db185915b62d7c6209c5a8792be6a32ab2fedacc84e01b52c51aa3e69", size = 75520, upload-time = "2021-03-08T10:59:26.269Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/07/6c/aa3f2f849e01cb6a001cd8554a88d4c77c5c1a31c95bdf1cf9301e6d9ef4/defusedxml-0.7.1-py2.py3-none-any.whl", hash = "sha256:a352e7e428770286cc899e2542b6cdaedb2b4953ff269a210103ec58f6198a61", size = 25604, upload-time = "2021-03-08T10:59:24.45Z" }, -] - [[package]] name = "detect-installer" version = "0.1.0" @@ -681,24 +226,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/de/15/545e2b6cf2e3be84bc1ed85613edd75b8aea69807a71c26f4ca6a9258e82/email_validator-2.3.0-py3-none-any.whl", hash = "sha256:80f13f623413e6b197ae73bb10bf4eb0908faf509ad8362c5edeb0be7fd450b4", size = 35604, upload-time = "2025-08-26T13:09:05.858Z" }, ] -[[package]] -name = "entrypoints" -version = "0.4" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/ea/8d/a7121ffe5f402dc015277d2d31eb82d2187334503a011c18f2e78ecbb9b2/entrypoints-0.4.tar.gz", hash = "sha256:b706eddaa9218a19ebcd67b56818f05bb27589b1ca9e8d797b74affad4ccacd4", size = 13974, upload-time = "2022-02-02T21:30:28.172Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/35/a8/365059bbcd4572cbc41de17fd5b682be5868b218c3c5479071865cab9078/entrypoints-0.4-py3-none-any.whl", hash = "sha256:f174b5ff827504fd3cd97cc3f8649f3693f51538c7e4bdf3ef002c8429d42f9f", size = 5294, upload-time = "2022-02-02T21:30:26.024Z" }, -] - -[[package]] -name = "envier" -version = "0.6.1" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/19/e7/4fe4d3f6e21213cea9bcddc36ba60e6ae4003035f9ce8055e6a9f0322ddb/envier-0.6.1.tar.gz", hash = "sha256:3309a01bb3d8850c9e7a31a5166d5a836846db2faecb79b9cb32654dd50ca9f9", size = 10063, upload-time = "2024-10-22T09:56:47.226Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/56/e9/30493b1cc967f7c07869de4b2ab3929151a58e6bb04495015554d24b61db/envier-0.6.1-py3-none-any.whl", hash = "sha256:73609040a76be48bbcb97074d9969666484aa0de706183a6e9ef773156a8a6a9", size = 10638, upload-time = "2024-10-22T09:56:45.968Z" }, -] - [[package]] name = "execnet" version = "2.1.2" @@ -708,15 +235,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/ab/84/02fc1827e8cdded4aa65baef11296a9bbe595c474f0d6d758af082d849fd/execnet-2.1.2-py3-none-any.whl", hash = "sha256:67fba928dd5a544b783f6056f449e5e3931a5c378b128bc18501f7ea79e296ec", size = 40708, upload-time = "2025-11-12T09:56:36.333Z" }, ] -[[package]] -name = "executing" -version = "2.2.1" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/cc/28/c14e053b6762b1044f34a13aab6859bbf40456d37d23aa286ac24cfd9a5d/executing-2.2.1.tar.gz", hash = "sha256:3632cc370565f6648cc328b32435bd120a1e4ebb20c77e3fdde9a13cd1e533c4", size = 1129488, upload-time = "2025-09-01T09:48:10.866Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/c1/ea/53f2148663b321f21b5a606bd5f191517cf40b7072c0497d3c92c4a13b1e/executing-2.2.1-py2.py3-none-any.whl", hash = "sha256:760643d3452b4d777d295bb167ccc74c64a81df23fb5e08eff250c425a4b2017", size = 28317, upload-time = "2025-09-01T09:48:08.5Z" }, -] - [[package]] name = "fastapi" version = "0.136.3" @@ -839,186 +357,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/6b/fd/5390ec4f49100f3ecb9968a392f9e6d039f1e3fe0ecd28443716ff01e589/fastar-0.11.0-cp314-cp314t-win_arm64.whl", hash = "sha256:76c1359314355eafbc6989f20fb1ad565a3d10200117923b9da765a17e2f6f11", size = 461049, upload-time = "2026-04-13T17:11:25.918Z" }, ] -[[package]] -name = "fastjsonschema" -version = "2.21.2" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/20/b5/23b216d9d985a956623b6bd12d4086b60f0059b27799f23016af04a74ea1/fastjsonschema-2.21.2.tar.gz", hash = "sha256:b1eb43748041c880796cd077f1a07c3d94e93ae84bba5ed36800a33554ae05de", size = 374130, upload-time = "2025-08-14T18:49:36.666Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/cb/a8/20d0723294217e47de6d9e2e40fd4a9d2f7c4b6ef974babd482a59743694/fastjsonschema-2.21.2-py3-none-any.whl", hash = "sha256:1c797122d0a86c5cace2e54bf4e819c36223b552017172f32c5c024a6b77e463", size = 24024, upload-time = "2025-08-14T18:49:34.776Z" }, -] - -[[package]] -name = "fastnumbers" -version = "5.1.1" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/75/bf/c69642300a98e8b61047fa17ee7c925a8e65a12e194e98dda7ec1eefaf4b/fastnumbers-5.1.1.tar.gz", hash = "sha256:183fa021cdc052edaeede5c23e3086461deb7562b567614edf71b29515f5fa4b", size = 193827, upload-time = "2024-12-15T07:28:51.124Z" } - -[[package]] -name = "filetype" -version = "1.2.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/bb/29/745f7d30d47fe0f251d3ad3dc2978a23141917661998763bebb6da007eb1/filetype-1.2.0.tar.gz", hash = "sha256:66b56cd6474bf41d8c54660347d37afcc3f7d1970648de365c102ef77548aadb", size = 998020, upload-time = "2022-11-02T17:34:04.141Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/18/79/1b8fa1bb3568781e84c9200f951c735f3f157429f44be0495da55894d620/filetype-1.2.0-py2.py3-none-any.whl", hash = "sha256:7ce71b6880181241cf7ac8697a2f1eb6a8bd9b429f7ad6d27b8db9ba5f1c2d25", size = 19970, upload-time = "2022-11-02T17:34:01.425Z" }, -] - -[[package]] -name = "flasgger-tschaume" -version = "0.9.7" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "flask" }, - { name = "jsonschema" }, - { name = "mistune" }, - { name = "pyyaml" }, - { name = "six" }, - { name = "werkzeug" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/ad/9a/94f78b4865f30402dd56f343d0d7487b2d6fce3137a3579a18aa49981bd8/flasgger-tschaume-0.9.7.tar.gz", hash = "sha256:139bd4686387e69019af2a86c0eacbd00bf30df0c7470ea55120646cab2ae446", size = 4227116, upload-time = "2022-10-21T23:24:14.25Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/97/a7/f6b8b0d622449b0e63869d64c3ad19d67b5e86e1bad60e3c34cbb9dc2ca6/flasgger_tschaume-0.9.7-py2.py3-none-any.whl", hash = "sha256:ee0c55f76c5884704649d139f042050af5d6f1d5a60cae167e3123735720302c", size = 3864468, upload-time = "2022-10-21T23:24:11.541Z" }, -] - -[[package]] -name = "flask" -version = "2.2.5" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "click" }, - { name = "itsdangerous" }, - { name = "jinja2" }, - { name = "werkzeug" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/5f/76/a4d2c4436dda4b0a12c71e075c508ea7988a1066b06a575f6afe4fecc023/Flask-2.2.5.tar.gz", hash = "sha256:edee9b0a7ff26621bd5a8c10ff484ae28737a2410d99b0bb9a6850c7fb977aa0", size = 697814, upload-time = "2023-05-02T14:42:36.742Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/9f/1a/8b6d48162861009d1e017a9740431c78d860809773b66cac220a11aa3310/Flask-2.2.5-py3-none-any.whl", hash = "sha256:58107ed83443e86067e41eff4631b058178191a355886f8e479e347fa1285fdf", size = 101817, upload-time = "2023-05-02T14:42:34.858Z" }, -] - -[[package]] -name = "flask-compress" -version = "1.24" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "brotli", marker = "platform_python_implementation != 'PyPy'" }, - { name = "brotlicffi", marker = "platform_python_implementation == 'PyPy'" }, - { name = "flask" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/c2/de/2ae0118051b38ab53437328074a696f3ee7d61e15bf7454b78a3088e5bc3/flask_compress-1.24.tar.gz", hash = "sha256:14097cefe59ecb3e466d52a6aeb62f34f125a9f7dadf1f33a53e430ce4a50f31", size = 21089, upload-time = "2026-03-31T15:01:39.005Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/4c/0f/fe51e0b2301bbd429af44273a923ff92127b18d13abba5ae5a1d60e8e497/flask_compress-1.24-py3-none-any.whl", hash = "sha256:1e63668eb6e3242bd4f6ad98825a924e3984409be90c125477893d586007d00c", size = 11033, upload-time = "2026-03-31T15:01:37.302Z" }, -] - -[[package]] -name = "flask-marshmallow" -version = "1.4.0" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "flask" }, - { name = "marshmallow" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/09/43/6e5c19e8abc01f5daf1d3c8ad169c495335390572b8bead3f7e7302131c6/flask_marshmallow-1.4.0.tar.gz", hash = "sha256:98c90a253052c72d2ddddc925539ac33bbd780c6fba86478ffe18e3b89d8b471", size = 40970, upload-time = "2026-02-04T16:07:59.916Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/70/9b/7d0605c6f90d640547c3c9a0b95bc3bb17e252ae0f46f1dbfa90d2e06518/flask_marshmallow-1.4.0-py3-none-any.whl", hash = "sha256:b758fc2c428d0cbee6fd0ccf0d55524fe9e426a86a177dcc0fc8cd71ad4b7c59", size = 12254, upload-time = "2026-02-04T16:07:58.878Z" }, -] - -[[package]] -name = "flask-mongoengine-tschaume" -version = "1.1.0" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "flask" }, - { name = "mongoengine" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/46/e9/224508e946b975dab42f185ecca6c044a465ebd6fdc23bdc27a85330ea0c/flask-mongoengine-tschaume-1.1.0.tar.gz", hash = "sha256:0c020feb12bb0317a4848e7b191489f89ad0589c9728d4907f5e9635474dd055", size = 235159, upload-time = "2022-10-25T00:40:12.334Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/9f/5b/d947b061b81b25ee061f1eae068c98d0491f990d24d3ad9f16de9c05cd56/flask_mongoengine_tschaume-1.1.0-py3-none-any.whl", hash = "sha256:01fcb556bb616bc4b4bbe83fb019787dc58e565790226182bf9a60ed9fada65d", size = 33610, upload-time = "2022-10-25T00:40:10.809Z" }, -] - -[[package]] -name = "flask-mongorest-mpcontribs" -version = "3.3.0" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "atlasq-tschaume" }, - { name = "boto3" }, - { name = "fastnumbers" }, - { name = "flask-mongoengine-tschaume" }, - { name = "flask-sse" }, - { name = "flatten-dict" }, - { name = "marshmallow-mongoengine" }, - { name = "mimerender-pr36" }, - { name = "orjson" }, - { name = "pymongo" }, - { name = "python-dateutil" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/73/57/9eafaa2bfe95d9a4b05e8d505cc17e89fbdfcc14feeddc4a2a13eac9a710/flask-mongorest-mpcontribs-3.3.0.tar.gz", hash = "sha256:2db7fc6f341b2cea6c302ed5557941a1d89531e1cd92a8235eba3ac9e1cc6ea2", size = 46223, upload-time = "2023-04-14T21:22:32.787Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/b6/a4/95bbdee9e63c2bed78bb77f98f1fbb4971964383a3b6aa4c526da2852229/flask_mongorest_mpcontribs-3.3.0-py3-none-any.whl", hash = "sha256:f76dc8ef915f1b4ee896110ecbcc4a75a8cb7f33f4ce4387f4b4e2a0b646fa83", size = 26389, upload-time = "2023-04-14T21:22:31.273Z" }, -] - -[[package]] -name = "flask-rq2" -version = "18.3" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "flask" }, - { name = "redis" }, - { name = "rq" }, - { name = "rq-scheduler" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/3a/73/edea2742650daa2b1589e8cb592abe7da5d8ce530642e62f047b205580b7/Flask-RQ2-18.3.tar.gz", hash = "sha256:3ef6395065255447f8e1516ccca24858ba87da1d71a6975e0e3b55256bf04967", size = 29105, upload-time = "2018-12-20T10:53:32.738Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/61/47/341667d55567995f6a54096e4156edaaad645dd7c90133e646ed9ba56968/Flask_RQ2-18.3-py2.py3-none-any.whl", hash = "sha256:abe1e52d3b98abe37e85830a614ba6af864516f1b6cf2229f352f8500eafc5fd", size = 12999, upload-time = "2018-12-20T10:53:31.409Z" }, -] - -[[package]] -name = "flask-sse" -version = "1.0.0" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "flask" }, - { name = "redis" }, - { name = "six" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/38/31/82586853cb1c0fcc2b8b533891606a779acc0da7d4cda5c8d7f2c2b05a29/Flask-SSE-1.0.0.tar.gz", hash = "sha256:4f84714c2549a45e4f17bfc5f68ee8a9f298b22740a6844404d1c74551f2090d", size = 16190, upload-time = "2021-01-10T18:01:46.269Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/71/83/f9fe86f554a153fdd300fb8027121d508a2177605bd158d967ddd7325948/Flask_SSE-1.0.0-py2.py3-none-any.whl", hash = "sha256:f86d7ecff0607333755c444130c395e7a133fb7ae6cf76fbd29b1da36d34776b", size = 4952, upload-time = "2021-01-10T18:01:44.985Z" }, -] - -[[package]] -name = "flatten-dict" -version = "0.5.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/0b/d0/34bf1bafa4d54e4ec20ca40856e991ffe7fdfd53831a2a36a7eb356508c8/flatten_dict-0.5.0.tar.gz", hash = "sha256:ca89664d0bc9552d525ee756726b5a755c17f65b5bf23d0a1f07841f181428b7", size = 9476, upload-time = "2026-04-28T14:23:44.979Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/72/9f/485516087cd8c44183aaf9ab850247a28e2e4a42a4d62eab77c21f673450/flatten_dict-0.5.0-py3-none-any.whl", hash = "sha256:c4bd2010052e4d33241433720d054322403fa7ad914fdc5cb1b31a713d4c561e", size = 9869, upload-time = "2026-04-28T14:23:45.695Z" }, -] - -[[package]] -name = "flexcache" -version = "0.3" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "typing-extensions" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/55/b0/8a21e330561c65653d010ef112bf38f60890051d244ede197ddaa08e50c1/flexcache-0.3.tar.gz", hash = "sha256:18743bd5a0621bfe2cf8d519e4c3bfdf57a269c15d1ced3fb4b64e0ff4600656", size = 15816, upload-time = "2024-03-09T03:21:07.555Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/27/cd/c883e1a7c447479d6e13985565080e3fea88ab5a107c21684c813dba1875/flexcache-0.3-py3-none-any.whl", hash = "sha256:d43c9fea82336af6e0115e308d9d33a185390b8346a017564611f1466dcd2e32", size = 13263, upload-time = "2024-03-09T03:21:05.635Z" }, -] - -[[package]] -name = "flexparser" -version = "0.4" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "typing-extensions" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/82/99/b4de7e39e8eaf8207ba1a8fa2241dd98b2ba72ae6e16960d8351736d8702/flexparser-0.4.tar.gz", hash = "sha256:266d98905595be2ccc5da964fe0a2c3526fbbffdc45b65b3146d75db992ef6b2", size = 31799, upload-time = "2024-11-07T02:00:56.249Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/fe/5e/3be305568fe5f34448807976dc82fc151d76c3e0e03958f34770286278c1/flexparser-0.4-py3-none-any.whl", hash = "sha256:3738b456192dcb3e15620f324c447721023c0293f6af9955b481e91d00179846", size = 27625, upload-time = "2024-11-07T02:00:54.523Z" }, -] - [[package]] name = "fonttools" version = "4.63.0" @@ -1044,59 +382,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/2c/47/c99d5268f354002ce80f8d029cd9d7d872969da1de8b93d32de4dc56d6f4/fonttools-4.63.0-py3-none-any.whl", hash = "sha256:445af2eab030a16b9171ea8bdda7ebf7d96bda2df88ee182a464252f6e05e20d", size = 1164562, upload-time = "2026-05-14T12:04:29.092Z" }, ] -[[package]] -name = "fqdn" -version = "1.5.1" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/30/3e/a80a8c077fd798951169626cde3e239adeba7dab75deb3555716415bd9b0/fqdn-1.5.1.tar.gz", hash = "sha256:105ed3677e767fb5ca086a0c1f4bb66ebc3c100be518f0e0d755d9eae164d89f", size = 6015, upload-time = "2021-03-11T07:16:29.08Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/cf/58/8acf1b3e91c58313ce5cb67df61001fc9dcd21be4fadb76c1a2d540e09ed/fqdn-1.5.1-py3-none-any.whl", hash = "sha256:3a179af3761e4df6eb2e026ff9e1a3033d3587bf980a0b1b2e1e5d08d7358014", size = 9121, upload-time = "2021-03-11T07:16:28.351Z" }, -] - -[[package]] -name = "freezegun" -version = "1.5.5" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "python-dateutil" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/95/dd/23e2f4e357f8fd3bdff613c1fe4466d21bfb00a6177f238079b17f7b1c84/freezegun-1.5.5.tar.gz", hash = "sha256:ac7742a6cc6c25a2c35e9292dfd554b897b517d2dec26891a2e8debf205cb94a", size = 35914, upload-time = "2025-08-09T10:39:08.338Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/5e/2e/b41d8a1a917d6581fc27a35d05561037b048e47df50f27f8ac9c7e27a710/freezegun-1.5.5-py3-none-any.whl", hash = "sha256:cd557f4a75cf074e84bc374249b9dd491eaeacd61376b9eb3c423282211619d2", size = 19266, upload-time = "2025-08-09T10:39:06.636Z" }, -] - -[[package]] -name = "gevent" -version = "26.5.0" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "cffi", marker = "platform_python_implementation == 'CPython' and sys_platform == 'win32'" }, - { name = "greenlet", marker = "platform_python_implementation == 'CPython'" }, - { name = "zope-event" }, - { name = "zope-interface" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/c4/cb/98aa3a299e2fc4a2372b5d124863e02965b64579ffc29fe54d0641e65b2f/gevent-26.5.0.tar.gz", hash = "sha256:1655eb04c1e20d71b2aa4a3c7528162dd58ff6cc46a037af1f01f534c80fefba", size = 6712354, upload-time = "2026-05-20T21:22:45.132Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/17/55/7d98d3888e7bb9ad4656420dec69232ecbbea48792aff9295d0ad7cf8435/gevent-26.5.0-cp314-cp314-macosx_11_0_universal2.whl", hash = "sha256:75a0050e4b87f08ddee7e56f59e6014cd7fcdc3153046c09a847940515d12c85", size = 2968223, upload-time = "2026-05-20T20:13:17.223Z" }, - { url = "https://files.pythonhosted.org/packages/f8/b4/e8e116fcbcb9dc0bf3acc50037f86e1204c217c8ed5defde68be11b3aab6/gevent-26.5.0-cp314-cp314-manylinux_2_28_aarch64.whl", hash = "sha256:fd1a0b83a04e19378d9466ae0ee2b5937cf1d7fbfdcb916b2aea82179a208574", size = 1793926, upload-time = "2026-05-20T21:17:34.321Z" }, - { url = "https://files.pythonhosted.org/packages/28/07/7b267e9754b661defb93542e97731a4df21f8a40dc0f6c853faa717cf124/gevent-26.5.0-cp314-cp314-manylinux_2_28_ppc64le.whl", hash = "sha256:4c964c15076e76391d523ec24202f579a2535f7e301a40efb1656ae046d3eb69", size = 1887632, upload-time = "2026-05-20T21:16:04.158Z" }, - { url = "https://files.pythonhosted.org/packages/5c/50/b47d29e99449bd13b557ffa451401dc13d397a9923f562ef90a4e8514502/gevent-26.5.0-cp314-cp314-manylinux_2_28_s390x.whl", hash = "sha256:45d5438d1c84da5df7e832434627624709543630977332bb4e2d05ecca362cc9", size = 1838688, upload-time = "2026-05-20T21:30:57.979Z" }, - { url = "https://files.pythonhosted.org/packages/8b/eb/5b54ccff11bc7d7bebd40a24571ccc115d5cdae4f6c32ab457b43b436e42/gevent-26.5.0-cp314-cp314-manylinux_2_28_x86_64.whl", hash = "sha256:354f35924113abc954819216c2a6ee16751958c615681e0490946e31b437bd2f", size = 2120351, upload-time = "2026-05-20T20:35:32.699Z" }, - { url = "https://files.pythonhosted.org/packages/9c/70/30fd325c30e04b1e5174c61945e17421d53ddb2450366cc52cef234f8c4b/gevent-26.5.0-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:a47cd2d32f6404212d374ad8014a3491d7477dcf0cc09c5a2308ad6d325fd663", size = 1806684, upload-time = "2026-05-20T21:16:43.87Z" }, - { url = "https://files.pythonhosted.org/packages/cd/e8/fbf911ac3f9524ecfaed174d100fde671904ab8db92ceaf07faaebd13386/gevent-26.5.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:032157cebdedb84f2f52cdd980f2f5f2623eed6a8f083aadf44b44c47f628642", size = 2146606, upload-time = "2026-05-20T20:43:32.216Z" }, - { url = "https://files.pythonhosted.org/packages/9e/4d/284fcbbfde66fd978c2980c1fbe0eabd586af6e4b728649e9cf459e8b38f/gevent-26.5.0-cp314-cp314-win_amd64.whl", hash = "sha256:9c414935ba5fc88359110968851d3616f119082c937390d00a1c0f4f59be814f", size = 1722497, upload-time = "2026-05-20T20:16:44.274Z" }, - { url = "https://files.pythonhosted.org/packages/15/d2/9f66eb53434704402be0ba733bf3320bf589671a4b76fac52a7d6077e972/gevent-26.5.0-cp314-cp314-win_arm64.whl", hash = "sha256:2a0f5993a04b95a35b3a118b1a58ba272833f9b547b774001dea29f90620882f", size = 1574249, upload-time = "2026-05-20T20:15:50.873Z" }, - { url = "https://files.pythonhosted.org/packages/dc/d5/b4c50adb761878e3c96642b9f79bf44cee3120f3df55cd40876f51d89866/gevent-26.5.0-cp315-cp315-macosx_11_0_universal2.whl", hash = "sha256:2e117df896a2660c9ebd4e2b5afc02dfd6e2ddf9b495e787e67c72d105432b09", size = 2971993, upload-time = "2026-05-20T20:12:50.845Z" }, - { url = "https://files.pythonhosted.org/packages/03/83/71c2a945e80198422d1d93dbe67355f249fb456b451bf9201199d3ef6a1a/gevent-26.5.0-cp315-cp315-manylinux_2_28_aarch64.whl", hash = "sha256:af5ffe9c11ffb8a39b6bef2e8b722aa2043ae4980977915c6aa8c68b4bc26e46", size = 1796658, upload-time = "2026-05-20T21:17:35.968Z" }, - { url = "https://files.pythonhosted.org/packages/42/96/548ca77aed5cb9a44e855a6c23ebceeb3554a0ea9ca0c01c311878899a3e/gevent-26.5.0-cp315-cp315-manylinux_2_28_ppc64le.whl", hash = "sha256:7da34aef7e87c43dd3662e5785e79ed505c01399a7cb42876d2d8925969fd75f", size = 1891473, upload-time = "2026-05-20T21:16:05.657Z" }, - { url = "https://files.pythonhosted.org/packages/f6/4f/f48bd47d5287afb0fbcc56165f3ed47583f1803bad401653fe27e71ade2d/gevent-26.5.0-cp315-cp315-manylinux_2_28_s390x.whl", hash = "sha256:1c6293a7046bcc6f3d8972a74b19cd7a4cfd02d3881edf0fcf827aa514bd247b", size = 1841429, upload-time = "2026-05-20T21:30:59.907Z" }, - { url = "https://files.pythonhosted.org/packages/a0/72/1925215fc720d2561fa3ec8d4af5f098f8d0cbfa76a45fafed6e5ade7718/gevent-26.5.0-cp315-cp315-manylinux_2_28_x86_64.whl", hash = "sha256:d3bde0f140a275b2fa88e4b6516bda85551930e10bc2fd95e18c1b7d11cb780c", size = 2123895, upload-time = "2026-05-20T20:35:34.964Z" }, - { url = "https://files.pythonhosted.org/packages/83/59/0f584f6b1170c9a6abd9b70ccf5e9cc5ead34eabafabc0e21876ef0fe6f7/gevent-26.5.0-cp315-cp315-musllinux_1_2_aarch64.whl", hash = "sha256:e29fb4b17d9958ec8cb7f6339a111b29bc23f2c2efbef86189d1248bb4862d17", size = 1809047, upload-time = "2026-05-20T21:16:45.977Z" }, - { url = "https://files.pythonhosted.org/packages/82/88/61e854bfd98ac22eac78a97fc6db10de0f9ace46514072b435c217168729/gevent-26.5.0-cp315-cp315-musllinux_1_2_x86_64.whl", hash = "sha256:b2239df2f7570efa03736678f3f053bb1bdd22a8a16cd28a2feb7d32ea5f533f", size = 2150764, upload-time = "2026-05-20T20:43:33.781Z" }, - { url = "https://files.pythonhosted.org/packages/b9/f5/af048b97433d7f9a7df7f5510b2c46918b7d073dcfb3bf6d0ef0e5a83dcc/gevent-26.5.0-cp315-cp315-win_amd64.whl", hash = "sha256:aae214952fd38d27a42dc416bb70193962ec932384b63445d29bbb5817a1c042", size = 1722600, upload-time = "2026-05-20T20:19:56.81Z" }, - { url = "https://files.pythonhosted.org/packages/11/95/fb74a2299c6a2d78d9de12deaaac640ab5d2ef96a8e0f97a3ff84b9ca84b/gevent-26.5.0-cp315-cp315-win_arm64.whl", hash = "sha256:f7067564f139e33bf26a31ee3b13d168d76eb99a44b85ced626652b158baa80c", size = 1574406, upload-time = "2026-05-20T20:17:12.125Z" }, -] - [[package]] name = "googleapis-common-protos" version = "1.75.0" @@ -1109,53 +394,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/e7/c8/e2645aa8ed02fd4c7a2f59d68783b65b1f3cbdfe39a6308e156509d1fee8/googleapis_common_protos-1.75.0-py3-none-any.whl", hash = "sha256:961ed60399c457ceb0ee8f285a84c870aabc9c6a832b9d37bb281b5bebde43ed", size = 300631, upload-time = "2026-05-07T08:03:30.345Z" }, ] -[[package]] -name = "greenlet" -version = "3.5.1" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/6d/6e/802acd792aebb2256fbbee8cacf2727faaeb6f240ac11008f09eae4414bc/greenlet-3.5.1.tar.gz", hash = "sha256:5a56aeb7d5d9cc4b3a735efb5095bd4b4f6f0e4f93e5ca876d0e2315137b7829", size = 197356, upload-time = "2026-05-20T15:05:03.917Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/8a/cb/c62454606daf5640369c94d8a9dd540599b1bfc090e2d2180cb77f4038d2/greenlet-3.5.1-cp314-cp314-macosx_11_0_universal2.whl", hash = "sha256:d8ab31c9de8651a2facdd5c5bb0011f2380dd1a7af78ce2adf4b56095294fc07", size = 285579, upload-time = "2026-05-20T13:08:56.396Z" }, - { url = "https://files.pythonhosted.org/packages/ec/71/c4270398c2eba968a6071af1dfbdcaeee6ec1c24bc8b435b8cc452700da6/greenlet-3.5.1-cp314-cp314-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:5e300185139abc337ade480c327183adf42a875ac7181bfe66d7d4efea31fbea", size = 651106, upload-time = "2026-05-20T14:00:09.448Z" }, - { url = "https://files.pythonhosted.org/packages/1a/ab/71e34b78a44ec271fb5f550c17bc46d301ddc5953890d935f270b0dcdb5a/greenlet-3.5.1-cp314-cp314-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:7ffdb990dcaa0234cf9845aead5df2e3c3a8b6507d409274dd87e0d5ab05ffc2", size = 663478, upload-time = "2026-05-20T14:05:45.88Z" }, - { url = "https://files.pythonhosted.org/packages/c6/2d/2d80842910da44f78c286532d084b8a5c3717c844ae80ceb3858738ae89a/greenlet-3.5.1-cp314-cp314-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:6c09df69dc1712d131332054a858a3e5cca400967fa3a672e2324fbb0971448c", size = 667767, upload-time = "2026-05-20T14:09:12.15Z" }, - { url = "https://files.pythonhosted.org/packages/77/96/4efd6fa5c62c85426a0c19077a586258ebc3a2a146ff2493e4312a697a22/greenlet-3.5.1-cp314-cp314-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:2f82b3597e9d83b63408affed0b48fd0f54935edac4302237b9a837be0dae33c", size = 660800, upload-time = "2026-05-20T13:14:29.129Z" }, - { url = "https://files.pythonhosted.org/packages/e9/d3/dad2eecedfbb1ed7050a20dcfae40c1442b74bc7423608be2c7e03ee7133/greenlet-3.5.1-cp314-cp314-manylinux_2_39_riscv64.whl", hash = "sha256:a4764e0bfc6a4d114c865b32520805c16a990ef5f286a514413b05d5ecd6a23d", size = 470786, upload-time = "2026-05-20T14:01:42.064Z" }, - { url = "https://files.pythonhosted.org/packages/7a/e0/6c71401a25cac7000261304e866a2f2cc04dc74810d40e2f118aa4799495/greenlet-3.5.1-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:c0141e37414c10164e702b8fb1473304221ad98f71600850c6ef7ff4880feba0", size = 1617518, upload-time = "2026-05-20T14:02:28.662Z" }, - { url = "https://files.pythonhosted.org/packages/41/26/c5c06643e8c0af9e7bf18e16cb51d0ab7625155f0392e1c9015d66d556cd/greenlet-3.5.1-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:50ae25a67bea74ea41fb14b960bc532df73eb713417b2d61892dced82fe8d3bc", size = 1681593, upload-time = "2026-05-20T13:14:39.417Z" }, - { url = "https://files.pythonhosted.org/packages/8a/bd/e11a108317485075e68af9d23039619b86b28130c3b50d227d42edece64b/greenlet-3.5.1-cp314-cp314-win_amd64.whl", hash = "sha256:8a17c42330e261299766b75ac1ea32caa437a9453c8f65d16a13140db378ecd3", size = 239800, upload-time = "2026-05-20T13:09:30.128Z" }, - { url = "https://files.pythonhosted.org/packages/47/f8/8e8e8417b7bf28639a5a56356ef934d0375e1d0c70a57e04d7701e870ffe/greenlet-3.5.1-cp314-cp314-win_arm64.whl", hash = "sha256:7b5f5fae05b8ac6d176a61b60c394a8cbdc2b5b91b81793066e68745cf165e54", size = 236862, upload-time = "2026-05-20T13:09:10.498Z" }, - { url = "https://files.pythonhosted.org/packages/90/12/41bf27fde4d3605d3773ae57751eda182b8be2f5398011c041173b1d9534/greenlet-3.5.1-cp314-cp314t-macosx_11_0_universal2.whl", hash = "sha256:ea8da1e900d758d078810d4255d8c6aa572181896a31ec79d779eb79c3adc9ad", size = 293637, upload-time = "2026-05-20T13:12:35.529Z" }, - { url = "https://files.pythonhosted.org/packages/44/44/ba14b23e9757707050c2f397d305bbcae62e5d7cad122f8b6baec5ae4a1f/greenlet-3.5.1-cp314-cp314t-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:a19570c52a21420dcbc94e661994bc325c0b5b11304540fed514586da5dc8f2e", size = 650840, upload-time = "2026-05-20T14:00:11.079Z" }, - { url = "https://files.pythonhosted.org/packages/a8/37/5ddc2b686a6844f91abecef43411842426da2e1573f60b49ecf2547f4ae1/greenlet-3.5.1-cp314-cp314t-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:3d955c89b75eeca4723d7cc14135f393cd47c32e2a6cb4a8e4c6e760a26b0986", size = 656416, upload-time = "2026-05-20T14:05:47.118Z" }, - { url = "https://files.pythonhosted.org/packages/8c/46/5987dcd1a2570ba84f3b187536b2ca3ae97613387e57f5cfa99df068fe5e/greenlet-3.5.1-cp314-cp314t-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:ea37d5a157eb9493820d3792ac4ece28619a394391d2b9f2f78057d396ff0f0f", size = 656607, upload-time = "2026-05-20T14:09:13.949Z" }, - { url = "https://files.pythonhosted.org/packages/e1/f0/d17510297c35a2992712f0bf84de3779749999f7d3d63aa1f09db7c62dbe/greenlet-3.5.1-cp314-cp314t-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:de2daaaebd1a5aa88c49045b6baf9310b3263796bd88db713edf37cf53e7bb4e", size = 654397, upload-time = "2026-05-20T13:14:30.696Z" }, - { url = "https://files.pythonhosted.org/packages/2c/c1/6da0a9ddcc29d7e51ef14883fa3dc1e53b3f4ffba00582106c7bf55da1d8/greenlet-3.5.1-cp314-cp314t-manylinux_2_39_riscv64.whl", hash = "sha256:8d8a23250ea3ec7b36de8fa4b541e9e2db3ee82915cc060ab0631609ad8b28de", size = 488287, upload-time = "2026-05-20T14:01:43.143Z" }, - { url = "https://files.pythonhosted.org/packages/37/eb/147387705bb89092645b012586e7273cb5ed3c90ef7eaf3a69173eaf0209/greenlet-3.5.1-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:3bfbd69cc349e43bf3a8ae1c85548ff0718efc887615c2db16c3833d7b0b072d", size = 1614469, upload-time = "2026-05-20T14:02:30.192Z" }, - { url = "https://files.pythonhosted.org/packages/a6/4e/37ee0da7732b7aa9896f17e15579a9df34b9fcb9dd494f0adfa749af6623/greenlet-3.5.1-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:4378720dd888136c27215a0214d32a4d37c3852765d45bc37aad0623423cfd78", size = 1675115, upload-time = "2026-05-20T13:14:40.972Z" }, - { url = "https://files.pythonhosted.org/packages/57/f3/97dfcf4a6eb5077f8a672234216fb5923eb89f2cab7081cb10b2cf75b605/greenlet-3.5.1-cp314-cp314t-win_amd64.whl", hash = "sha256:45718441607f9325d948db98cbc691276059316d0358c188c246da4e1d4d23d2", size = 245246, upload-time = "2026-05-20T13:12:22.646Z" }, - { url = "https://files.pythonhosted.org/packages/5d/73/d7f72e34b582f694f4a9b248162db7b09cc458a259ba8f0c0bfa1a34ea7d/greenlet-3.5.1-cp315-cp315-macosx_11_0_universal2.whl", hash = "sha256:2baee5ca02031757ffe8cc3d69f0cc0aec7065ce362622da74f32d3bcab1c541", size = 285575, upload-time = "2026-05-20T13:12:07.043Z" }, - { url = "https://files.pythonhosted.org/packages/df/59/fa9c6e87dc8ad27a95dabe2f29f372b733d05a8a67470f6c901ed9975655/greenlet-3.5.1-cp315-cp315-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:9b1ec3274918a81d3ea778b9e75b56b72b33f300edb6cf7f3a7fe1dae56683de", size = 656428, upload-time = "2026-05-20T14:00:12.556Z" }, - { url = "https://files.pythonhosted.org/packages/f6/f9/e753408871eaa61dfe35e619cfc67512b036fde99893685d50eea9e07146/greenlet-3.5.1-cp315-cp315-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:111e2390ffffc47d5840b01711dd7fac07d4c09283d0283e7f3264b14e284c64", size = 667064, upload-time = "2026-05-20T14:05:48.662Z" }, - { url = "https://files.pythonhosted.org/packages/dc/74/807a047255bf1e09303627c46dc043dca596b6958a354d904f32ab382005/greenlet-3.5.1-cp315-cp315-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:10a9a1c0bfbc93d41156ffcb90c75fbc05544054faf15dcc1fdf9765f8b607f0", size = 672962, upload-time = "2026-05-20T14:09:15.532Z" }, - { url = "https://files.pythonhosted.org/packages/96/27/5565b5b40389f1c7753003a07e21892fda8660926787036d5bc0308b8113/greenlet-3.5.1-cp315-cp315-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:e630136e905fe5ff43e86945ae41220b6d1470956a39220e708110ac48d01ea5", size = 665697, upload-time = "2026-05-20T13:14:32.943Z" }, - { url = "https://files.pythonhosted.org/packages/76/32/19d4e13225193c29b13e308015223f7d75fd3d8623d49dd19040d2ce8ec1/greenlet-3.5.1-cp315-cp315-manylinux_2_39_riscv64.whl", hash = "sha256:ef08c1567c78074b22d1a200183d52d04a14df447bf70bcbb6a3507a48e776fc", size = 476047, upload-time = "2026-05-20T14:01:44.39Z" }, - { url = "https://files.pythonhosted.org/packages/cf/82/e7de4178c0c2d1c9a5a3be3cc0b33e46a85b3ee4a77c071bf7ad8600e079/greenlet-3.5.1-cp315-cp315-musllinux_1_2_aarch64.whl", hash = "sha256:975eac34b44a7077ca4d421348455b94f0f518246a7f14bc6d2fdcfe5b584368", size = 1621256, upload-time = "2026-05-20T14:02:31.91Z" }, - { url = "https://files.pythonhosted.org/packages/00/10/f2dddcf7dacac17dfc68691809589adad06135eb28930429cf58a6467a2f/greenlet-3.5.1-cp315-cp315-musllinux_1_2_x86_64.whl", hash = "sha256:9ab3c3a0b2ae6198e67c898dad5215a49f9ae0d0081b3c3ec59f333e39eeca26", size = 1685956, upload-time = "2026-05-20T13:14:42.55Z" }, - { url = "https://files.pythonhosted.org/packages/22/17/4a232b32133230ada52f70e9d7f5b65b0caef8772f01849bd8d149e7e4ca/greenlet-3.5.1-cp315-cp315-win_amd64.whl", hash = "sha256:cbfc69be86e10dcfef5b1e6269d1d6926552aa89ee39e1de3353360c1b6989ab", size = 239802, upload-time = "2026-05-20T13:13:15.481Z" }, - { url = "https://files.pythonhosted.org/packages/c2/ae/4e623a7e6d4d2a5f4cb8e4c82de4169fc637942caae68d6e676b8a128ac5/greenlet-3.5.1-cp315-cp315-win_arm64.whl", hash = "sha256:92fd6d44ac5e5a887c8a5dc4a8ba0ba908527c31c12f78c6bc7dcfe8aab279f6", size = 236853, upload-time = "2026-05-20T13:15:37.301Z" }, - { url = "https://files.pythonhosted.org/packages/7a/57/816d9cff29119da3505b3d6a5e14a8af89006ac36f47f891ff293ee05af1/greenlet-3.5.1-cp315-cp315t-macosx_11_0_universal2.whl", hash = "sha256:a6fdf2433a5441ef9a95464f7c3e674775da1c8c1177fff311cee1acad4626ed", size = 293877, upload-time = "2026-05-20T13:10:19.078Z" }, - { url = "https://files.pythonhosted.org/packages/23/a1/59b0a7c7d140ff1a75626680b9a9899b79a9176cab298b394968fb023295/greenlet-3.5.1-cp315-cp315t-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:7546556f0d649f99f6a361098a55f761181bb2ea12ff150bb16d26092ad88244", size = 655333, upload-time = "2026-05-20T14:00:14.758Z" }, - { url = "https://files.pythonhosted.org/packages/72/1b/5efe127597625042218939d01855109f352779050768b670b52edcc16a6c/greenlet-3.5.1-cp315-cp315t-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:d5ee3ea898009fa898f85f9982255d35278c477bebe185beca249cab42d4526c", size = 659443, upload-time = "2026-05-20T14:05:50.159Z" }, - { url = "https://files.pythonhosted.org/packages/c9/9d/1dcdf7b95ab3cf8c7b6d7277c18a5e167312f2b362ddfcc5d5e6d8d84b43/greenlet-3.5.1-cp315-cp315t-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:a57b0d05a0448eed231d59c0ceb287dde984551e54cbc51ac2d4865712838e9c", size = 659998, upload-time = "2026-05-20T14:09:16.912Z" }, - { url = "https://files.pythonhosted.org/packages/6c/6d/c404246ea4d22d097a7426d0efb5b781bd7eb67715f09e79001bd552ab18/greenlet-3.5.1-cp315-cp315t-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:a5c81f74d204d3edd136ebfd50dce53acbb776995d721a0fe801626cfc93b8cd", size = 658356, upload-time = "2026-05-20T13:14:35.091Z" }, - { url = "https://files.pythonhosted.org/packages/05/7e/c4959664fc231d587d66d8e81f2095e98056ba1954beafdcbe635e251052/greenlet-3.5.1-cp315-cp315t-manylinux_2_39_riscv64.whl", hash = "sha256:b0703c2cef53e01baec47f7a3868009913ad71ec678bbecb42a6f40895e4ce62", size = 494470, upload-time = "2026-05-20T14:01:45.611Z" }, - { url = "https://files.pythonhosted.org/packages/51/02/f8ee37fb6d2219329f350af241c27fcf12df57e723d11f6fc6d3bacdadaa/greenlet-3.5.1-cp315-cp315t-musllinux_1_2_aarch64.whl", hash = "sha256:2c18ef16bf6d4dd410e4dd52996888ea1497be26892fe5bbc73580aba4287b8e", size = 1619216, upload-time = "2026-05-20T14:02:33.403Z" }, - { url = "https://files.pythonhosted.org/packages/93/c5/3dc9475ace2c7a3680da12372cddd7f1ac874eb410a1ac48d3e9dab83782/greenlet-3.5.1-cp315-cp315t-musllinux_1_2_x86_64.whl", hash = "sha256:17d86354f0ae6b61bf9be5148d0dd34e06c3cb7c602c671f79f29ac3b150e659", size = 1678427, upload-time = "2026-05-20T13:14:43.71Z" }, - { url = "https://files.pythonhosted.org/packages/df/4e/750c15c317a41ffb36f0bf40b933e3d744a7dede61889f74443ea69690cf/greenlet-3.5.1-cp315-cp315t-win_amd64.whl", hash = "sha256:e7516cf6ae6b8a582c2770a0caed47b8a48373ed732c33d69a72913ae6ac923e", size = 245225, upload-time = "2026-05-20T13:13:59.366Z" }, - { url = "https://files.pythonhosted.org/packages/4f/fd/d3baea2eeb7b617efd47e87ca06e2ec2c6118d303aa9e918e0ce16eadc10/greenlet-3.5.1-cp315-cp315t-win_arm64.whl", hash = "sha256:5028648bf2253ec4745add746129d3904121fa7fe871a76bed23c5720573ce0a", size = 239590, upload-time = "2026-05-20T13:13:37.382Z" }, -] - [[package]] name = "grpcio" version = "1.80.0" @@ -1172,417 +410,135 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/e8/43/f437a78f7f4f1d311804189e8f11fb311a01049b2e08557c1068d470cb2e/grpcio-1.80.0-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:2dcc70e9f0ba987526e8e8603a610fb4f460e42899e74e7a518bf3c68fe1bf05", size = 6785372, upload-time = "2026-03-30T08:48:22.373Z" }, { url = "https://files.pythonhosted.org/packages/93/3d/f6558e9c6296cb4227faa5c43c54a34c68d32654b829f53288313d16a86e/grpcio-1.80.0-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:448c884b668b868562b1bda833c5fce6272d26e1926ec46747cda05741d302c1", size = 7395268, upload-time = "2026-03-30T08:48:25.638Z" }, { url = "https://files.pythonhosted.org/packages/06/21/0fdd77e84720b08843c371a2efa6f2e19dbebf56adc72df73d891f5506f0/grpcio-1.80.0-cp314-cp314-musllinux_1_2_i686.whl", hash = "sha256:a1dc80fe55685b4a543555e6eef975303b36c8db1023b1599b094b92aa77965f", size = 8392000, upload-time = "2026-03-30T08:48:28.974Z" }, - { url = "https://files.pythonhosted.org/packages/f5/68/67f4947ed55d2e69f2cc199ab9fd85e0a0034d813bbeef84df6d2ba4d4b7/grpcio-1.80.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:31b9ac4ad1aa28ffee5503821fafd09e4da0a261ce1c1281c6c8da0423c83b6e", size = 7828477, upload-time = "2026-03-30T08:48:32.054Z" }, - { url = "https://files.pythonhosted.org/packages/44/b6/8d4096691b2e385e8271911a0de4f35f0a6c7d05aff7098e296c3de86939/grpcio-1.80.0-cp314-cp314-win32.whl", hash = "sha256:367ce30ba67d05e0592470428f0ec1c31714cab9ef19b8f2e37be1f4c7d32fae", size = 4218563, upload-time = "2026-03-30T08:48:34.538Z" }, - { url = "https://files.pythonhosted.org/packages/e5/8c/bbe6baf2557262834f2070cf668515fa308b2d38a4bbf771f8f7872a7036/grpcio-1.80.0-cp314-cp314-win_amd64.whl", hash = "sha256:3b01e1f5464c583d2f567b2e46ff0d516ef979978f72091fd81f5ab7fa6e2e7f", size = 5019457, upload-time = "2026-03-30T08:48:37.308Z" }, -] - -[[package]] -name = "gunicorn" -version = "24.1.1" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "packaging" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/78/0a/10739c03537ec5b131a867bf94df2e412b437696c7e5d26970e2198a80d2/gunicorn-24.1.1.tar.gz", hash = "sha256:f006d110e5cb3102859b4f5cd48335dbd9cc28d0d27cd24ddbdafa6c60929408", size = 287567, upload-time = "2026-01-24T01:15:31.359Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/96/90/cfe637677916fc6f53cd2b05d5746e249f683e1fa14c9e745a88c66f7290/gunicorn-24.1.1-py3-none-any.whl", hash = "sha256:757f6b621fc4f7581a90600b2cd9df593461f06a41d7259cb9b94499dc4095a8", size = 114920, upload-time = "2026-01-24T01:15:29.656Z" }, -] - -[package.optional-dependencies] -gevent = [ - { name = "gevent" }, -] - -[[package]] -name = "h11" -version = "0.16.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/01/ee/02a2c011bdab74c6fb3c75474d40b3052059d95df7e73351460c8588d963/h11-0.16.0.tar.gz", hash = "sha256:4e35b956cf45792e4caa5885e69fba00bdbc6ffafbfa020300e549b208ee5ff1", size = 101250, upload-time = "2025-04-24T03:35:25.427Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/04/4b/29cac41a4d98d144bf5f6d33995617b185d14b22401f75ca86f384e87ff1/h11-0.16.0-py3-none-any.whl", hash = "sha256:63cf8bbe7522de3bf65932fda1d9c2772064ffb3dae62d55932da54b31cb6c86", size = 37515, upload-time = "2025-04-24T03:35:24.344Z" }, -] - -[[package]] -name = "httpcore" -version = "1.0.9" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "certifi" }, - { name = "h11" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/06/94/82699a10bca87a5556c9c59b5963f2d039dbd239f25bc2a63907a05a14cb/httpcore-1.0.9.tar.gz", hash = "sha256:6e34463af53fd2ab5d807f399a9b45ea31c3dfa2276f15a2c3f00afff6e176e8", size = 85484, upload-time = "2025-04-24T22:06:22.219Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/7e/f5/f66802a942d491edb555dd61e3a9961140fd64c90bce1eafd741609d334d/httpcore-1.0.9-py3-none-any.whl", hash = "sha256:2d400746a40668fc9dec9810239072b40b4484b640a8c38fd654a024c7a1bf55", size = 78784, upload-time = "2025-04-24T22:06:20.566Z" }, -] - -[[package]] -name = "httpcore2" -version = "2.3.0" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "h11" }, - { name = "truststore" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/e6/34/18f1c596e677962f040284246f393b10a1f8ce440b3a7e69c637d0f1c7ad/httpcore2-2.3.0.tar.gz", hash = "sha256:07327e251560960eea8e969d92d4c6a325feb13cca39e25340731336c3baf924", size = 64300, upload-time = "2026-06-01T13:15:02.998Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/c2/dd/3357218c69360d1cecc196c230c9a1d5c9afd5dba362056e23e60a5e64e5/httpcore2-2.3.0-py3-none-any.whl", hash = "sha256:477e9e334f74e5240dcac002e890580f36a57d40ff0fb14cc9655731d23b8415", size = 80024, upload-time = "2026-06-01T13:15:00.001Z" }, -] - -[[package]] -name = "httptools" -version = "0.8.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/43/e5/d471fcb0e14523fe1c3f4ba58ca52480e7bd70ad7109a3846bc75892f7fb/httptools-0.8.0.tar.gz", hash = "sha256:6b2a32f18d97e16e90827d7a819ffa8dbd8cc245fc4e1fa9d1095b54ef4bd999", size = 271342, upload-time = "2026-05-25T22:17:48.841Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/1a/12/fa3fbf5f9517b273edea2dc982aa82a8c634091e67c590792b729017bc6f/httptools-0.8.0-cp314-cp314-macosx_10_13_universal2.whl", hash = "sha256:de242a49b5d18e0a8776e654e9f6bf6d89f3875a5c35b425a0e7ce940feb3fd6", size = 206183, upload-time = "2026-05-25T22:17:24.004Z" }, - { url = "https://files.pythonhosted.org/packages/30/fc/5e7c4cb443370f2090a3aba0453a07384d29ff66b7435bb90e77e1037599/httptools-0.8.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:159e9ab5f701ccd42e555a12f1ad8ff69702910fc1c996cf2bb66e5fcb7a231b", size = 112079, upload-time = "2026-05-25T22:17:25.216Z" }, - { url = "https://files.pythonhosted.org/packages/ba/53/771bd891eb0f236f32145d6a1775777ec85745f3cc983a1f23d1a3b8ddfe/httptools-0.8.0-cp314-cp314-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:c4a9f1707e4823d54dfec6c33fa3697d302aed536ed352a7ebb5a061ddb869d0", size = 481596, upload-time = "2026-05-25T22:17:26.186Z" }, - { url = "https://files.pythonhosted.org/packages/62/42/94e15bc68ce3d423243c45d7f1b0c7561f13844f97dc52ae23182fb65628/httptools-0.8.0-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:d76ad7b951387e3632c8716a9bb03ac5b45c5f16119aa409db0459520887944e", size = 480865, upload-time = "2026-05-25T22:17:27.542Z" }, - { url = "https://files.pythonhosted.org/packages/1c/7c/fe2980fc03723272e30f135b62360b075f513dfe7cc73aef36c7f04012bd/httptools-0.8.0-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:a3b7387147361c3fd47a0bde763c5c91b5b4cd4dc9989b8ece84ff436c99843b", size = 463189, upload-time = "2026-05-25T22:17:28.546Z" }, - { url = "https://files.pythonhosted.org/packages/15/1b/47fc5fff68acd1bfa20b4734059c9a06cadb88119dcd5258b5b0d21d91c8/httptools-0.8.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:f256d6ce930c52ca1cb2a960b7da03548c454e7d28b06059ad41bfe789036ce0", size = 466610, upload-time = "2026-05-25T22:17:29.816Z" }, - { url = "https://files.pythonhosted.org/packages/60/bd/07b13c93ffd9bec9546e0d43f8e19378dd696dbd278511406bc07371ef1f/httptools-0.8.0-cp314-cp314-win_amd64.whl", hash = "sha256:19d1ee275bb59ba2643ba9a3a1e51cc0c788caf2b8df506368e03f56fdd08527", size = 92705, upload-time = "2026-05-25T22:17:31.133Z" }, - { url = "https://files.pythonhosted.org/packages/fd/c4/121648f68ce066d7bd762d6b6d97e620847642d38d54f3d90ff11d947629/httptools-0.8.0-cp314-cp314t-macosx_10_13_universal2.whl", hash = "sha256:de1ed58a974e75d56560acc7e7fed01a454994429456f65209789992e41f2568", size = 215023, upload-time = "2026-05-25T22:17:32.401Z" }, - { url = "https://files.pythonhosted.org/packages/b9/b0/312a062ae741ae3e8baa8c8bf20be81b2e67337b259ab4349bebc7b6142e/httptools-0.8.0-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:e93c227b595c6926c1acee96891dd9da4be338cfbe82e5cd3bb9d8dd7dc4ac0b", size = 117405, upload-time = "2026-05-25T22:17:33.742Z" }, - { url = "https://files.pythonhosted.org/packages/fc/37/fccd705f795386bb05bf413012fecff2a33e5aa8c2f069096de3e9fd8702/httptools-0.8.0-cp314-cp314t-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:2a021c3a8e65cc125390d72f59b968afca3bdcaff25bd67965e0a055a14946ca", size = 558497, upload-time = "2026-05-25T22:17:34.732Z" }, - { url = "https://files.pythonhosted.org/packages/bd/39/f172e8003576de35f5ba77ff417cf0e34429d35dc014deef15afa337a72c/httptools-0.8.0-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:48774d39cbb70e2b1f71f88852a3087ae1d3a1eb80482bb48c13067ab080c14f", size = 571585, upload-time = "2026-05-25T22:17:35.813Z" }, - { url = "https://files.pythonhosted.org/packages/3e/b9/f5564760af99f3dbbf3f9104dc00e5da27e96cf433c6bdcf77617f70bf3f/httptools-0.8.0-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:88eead8ec8680a9f146c655bc88445a325bd7921cfd8194c7337e9467282427d", size = 543297, upload-time = "2026-05-25T22:17:37.08Z" }, - { url = "https://files.pythonhosted.org/packages/99/67/8d9f2c313618e161b82f3873188e7196126da1d6e29688df40eb3997c77a/httptools-0.8.0-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:2c032fa028f46871ec7e1fc59fc15e8023eab3e6bbe6ece786a1611719a5d081", size = 539535, upload-time = "2026-05-25T22:17:38.032Z" }, - { url = "https://files.pythonhosted.org/packages/48/63/b906c01e53f50d432c0defe43ce52764a111dc1bdd028bafbeb54dcfd008/httptools-0.8.0-cp314-cp314t-win_amd64.whl", hash = "sha256:384c17174464c8e873398b7af24f0b1f44d992c820328413951a625323155d77", size = 108209, upload-time = "2026-05-25T22:17:39.473Z" }, -] - -[[package]] -name = "httpx" -version = "0.28.1" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "anyio" }, - { name = "certifi" }, - { name = "httpcore" }, - { name = "idna" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/b1/df/48c586a5fe32a0f01324ee087459e112ebb7224f646c0b5023f5e79e9956/httpx-0.28.1.tar.gz", hash = "sha256:75e98c5f16b0f35b567856f597f06ff2270a374470a5c2392242528e3e3e42fc", size = 141406, upload-time = "2024-12-06T15:37:23.222Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/2a/39/e50c7c3a983047577ee07d2a9e53faf5a69493943ec3f6a384bdc792deb2/httpx-0.28.1-py3-none-any.whl", hash = "sha256:d909fcccc110f8c7faf814ca82a9a4d816bc5a6dbfea25d6591d6985b8ba59ad", size = 73517, upload-time = "2024-12-06T15:37:21.509Z" }, -] - -[[package]] -name = "httpx2" -version = "2.3.0" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "anyio" }, - { name = "httpcore2" }, - { name = "idna" }, - { name = "truststore" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/9f/9a/cca0b9145f13d8ae34b885ae28d403a1469a433abc78e0f94f4ce94e650b/httpx2-2.3.0.tar.gz", hash = "sha256:227e7c41d95a76d4077a52640564132777215fc3394e07b66a3116c33d668fa9", size = 81115, upload-time = "2026-06-01T13:15:04.324Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/87/ce/ae2911859847f9ba1d6b23027e53481cbeb50b93234f355a968d300ca2cb/httpx2-2.3.0-py3-none-any.whl", hash = "sha256:6f393663bdf6dbe7fe90118e3eb5b2bd024a675cae0390ac08cec9198812d8b7", size = 74538, upload-time = "2026-06-01T13:15:01.566Z" }, -] - -[[package]] -name = "idna" -version = "3.17" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/b9/28/99c51f664567218d824af024c0251650fb27e4ca066df188dab0769c5b91/idna-3.17.tar.gz", hash = "sha256:5eb0cb53bc467c12eadcf6de83163ad8527cec9416f44b9b61b19caedad2b87f", size = 196048, upload-time = "2026-05-28T14:32:38.55Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/de/a7/f76514cc40ad6234098ecdebda08732d75964776c51a42845b7da10649e2/idna-3.17-py3-none-any.whl", hash = "sha256:466e48829084efe2548012b855df21540b96f2e20e51bd124c851536556a592c", size = 65316, upload-time = "2026-05-28T14:32:37.035Z" }, -] - -[[package]] -name = "iniconfig" -version = "2.3.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/72/34/14ca021ce8e5dfedc35312d08ba8bf51fdd999c576889fc2c24cb97f4f10/iniconfig-2.3.0.tar.gz", hash = "sha256:c76315c77db068650d49c5b56314774a7804df16fee4402c1f19d6d15d8c4730", size = 20503, upload-time = "2025-10-18T21:55:43.219Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/cb/b1/3846dd7f199d53cb17f49cba7e651e9ce294d8497c8c150530ed11865bb8/iniconfig-2.3.0-py3-none-any.whl", hash = "sha256:f631c04d2c48c52b84d0d0549c99ff3859c98df65b3101406327ecc7d53fbf12", size = 7484, upload-time = "2025-10-18T21:55:41.639Z" }, -] - -[[package]] -name = "ipykernel" -version = "6.29.5" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "appnope", marker = "sys_platform == 'darwin'" }, - { name = "comm" }, - { name = "debugpy" }, - { name = "ipython" }, - { name = "jupyter-client" }, - { name = "jupyter-core" }, - { name = "matplotlib-inline" }, - { name = "nest-asyncio" }, - { name = "packaging" }, - { name = "psutil" }, - { name = "pyzmq" }, - { name = "tornado" }, - { name = "traitlets" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/e9/5c/67594cb0c7055dc50814b21731c22a601101ea3b1b50a9a1b090e11f5d0f/ipykernel-6.29.5.tar.gz", hash = "sha256:f093a22c4a40f8828f8e330a9c297cb93dcab13bd9678ded6de8e5cf81c56215", size = 163367, upload-time = "2024-07-01T14:07:22.543Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/94/5c/368ae6c01c7628438358e6d337c19b05425727fbb221d2a3c4303c372f42/ipykernel-6.29.5-py3-none-any.whl", hash = "sha256:afdb66ba5aa354b09b91379bac28ae4afebbb30e8b39510c9690afb7a10421b5", size = 117173, upload-time = "2024-07-01T14:07:19.603Z" }, -] - -[[package]] -name = "ipython" -version = "9.13.0" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "colorama", marker = "sys_platform == 'win32'" }, - { name = "decorator" }, - { name = "ipython-pygments-lexers" }, - { name = "jedi" }, - { name = "matplotlib-inline" }, - { name = "pexpect", marker = "sys_platform != 'emscripten' and sys_platform != 'win32'" }, - { name = "prompt-toolkit" }, - { name = "psutil" }, - { name = "pygments" }, - { name = "stack-data" }, - { name = "traitlets" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/cd/c4/87cda5842cf5c31837c06ddb588e11c3c35d8ece89b7a0108c06b8c9b00a/ipython-9.13.0.tar.gz", hash = "sha256:7e834b6afc99f020e3f05966ced34792f40267d64cb1ea9043886dab0dde5967", size = 4430549, upload-time = "2026-04-24T12:24:55.221Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/b9/86/3060e8029b7cc505cce9a0137431dda81d0a3fde93a8f0f50ee0bf37a795/ipython-9.13.0-py3-none-any.whl", hash = "sha256:57f9d4639e20818d328d287c7b549af3d05f12486ea8f2e7f73e52a36ec4d201", size = 627274, upload-time = "2026-04-24T12:24:53.038Z" }, -] - -[[package]] -name = "ipython-genutils" -version = "0.2.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/e8/69/fbeffffc05236398ebfcfb512b6d2511c622871dca1746361006da310399/ipython_genutils-0.2.0.tar.gz", hash = "sha256:eb2e116e75ecef9d4d228fdc66af54269afa26ab4463042e33785b887c628ba8", size = 22208, upload-time = "2017-03-13T22:12:26.393Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/fa/bc/9bd3b5c2b4774d5f33b2d544f1460be9df7df2fe42f352135381c347c69a/ipython_genutils-0.2.0-py2.py3-none-any.whl", hash = "sha256:72dd37233799e619666c9f639a9da83c34013a73e8bbc79a7a6348d93c61fab8", size = 26343, upload-time = "2017-03-13T22:12:25.412Z" }, -] - -[[package]] -name = "ipython-pygments-lexers" -version = "1.1.1" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "pygments" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/ef/4c/5dd1d8af08107f88c7f741ead7a40854b8ac24ddf9ae850afbcf698aa552/ipython_pygments_lexers-1.1.1.tar.gz", hash = "sha256:09c0138009e56b6854f9535736f4171d855c8c08a563a0dcd8022f78355c7e81", size = 8393, upload-time = "2025-01-17T11:24:34.505Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/d9/33/1f075bf72b0b747cb3288d011319aaf64083cf2efef8354174e3ed4540e2/ipython_pygments_lexers-1.1.1-py3-none-any.whl", hash = "sha256:a9462224a505ade19a605f71f8fa63c2048833ce50abc86768a0d81d876dc81c", size = 8074, upload-time = "2025-01-17T11:24:33.271Z" }, -] - -[[package]] -name = "isoduration" -version = "20.11.0" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "arrow" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/7c/1a/3c8edc664e06e6bd06cce40c6b22da5f1429aa4224d0c590f3be21c91ead/isoduration-20.11.0.tar.gz", hash = "sha256:ac2f9015137935279eac671f94f89eb00584f940f5dc49462a0c4ee692ba1bd9", size = 11649, upload-time = "2020-11-01T11:00:00.312Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/7b/55/e5326141505c5d5e34c5e0935d2908a74e4561eca44108fbfb9c13d2911a/isoduration-20.11.0-py3-none-any.whl", hash = "sha256:b2904c2a4228c3d44f409c8ae8e2370eb21a26f7ac2ec5446df141dde3452042", size = 11321, upload-time = "2020-11-01T10:59:58.02Z" }, -] - -[[package]] -name = "itsdangerous" -version = "2.2.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/9c/cb/8ac0172223afbccb63986cc25049b154ecfb5e85932587206f42317be31d/itsdangerous-2.2.0.tar.gz", hash = "sha256:e0050c0b7da1eea53ffaf149c0cfbb5c6e2e2b69c4bef22c81fa6eb73e5f6173", size = 54410, upload-time = "2024-04-16T21:28:15.614Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/04/96/92447566d16df59b2a776c0fb82dbc4d9e07cd95062562af01e408583fc4/itsdangerous-2.2.0-py3-none-any.whl", hash = "sha256:c6242fc49e35958c8b15141343aa660db5fc54d4f13a1db01a3f5891b98700ef", size = 16234, upload-time = "2024-04-16T21:28:14.499Z" }, -] - -[[package]] -name = "jedi" -version = "0.20.0" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "parso" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/46/b7/a3635f6a2d7cf5b5dd98064fc1d5fbbafcb25477bcea204a3a92145d158b/jedi-0.20.0.tar.gz", hash = "sha256:c3f4ccbd276696f4b19c54618d4fb18f9fc24b0aef02acf704b23f487daa1011", size = 3119416, upload-time = "2026-05-01T23:38:47.814Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/9a/93/242e2eab5fe682ffcb8b0084bde703a41d51e17ee0f3a31ff0d9d813620a/jedi-0.20.0-py2.py3-none-any.whl", hash = "sha256:7bdd9c2634f56713299976f4cbd59cb3fa92165cc5e05ea811fb253480728b67", size = 4884812, upload-time = "2026-05-01T23:38:43.919Z" }, -] - -[[package]] -name = "jinja2" -version = "3.1.6" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "markupsafe" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/df/bf/f7da0350254c0ed7c72f3e33cef02e048281fec7ecec5f032d4aac52226b/jinja2-3.1.6.tar.gz", hash = "sha256:0137fb05990d35f1275a587e9aee6d56da821fc83491a0fb838183be43f66d6d", size = 245115, upload-time = "2025-03-05T20:05:02.478Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/62/a1/3d680cbfd5f4b8f15abc1d571870c5fc3e594bb582bc3b64ea099db13e56/jinja2-3.1.6-py3-none-any.whl", hash = "sha256:85ece4451f492d0c13c5dd7c13a64681a86afae63a5f347908daf103ce6d2f67", size = 134899, upload-time = "2025-03-05T20:05:00.369Z" }, + { url = "https://files.pythonhosted.org/packages/f5/68/67f4947ed55d2e69f2cc199ab9fd85e0a0034d813bbeef84df6d2ba4d4b7/grpcio-1.80.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:31b9ac4ad1aa28ffee5503821fafd09e4da0a261ce1c1281c6c8da0423c83b6e", size = 7828477, upload-time = "2026-03-30T08:48:32.054Z" }, + { url = "https://files.pythonhosted.org/packages/44/b6/8d4096691b2e385e8271911a0de4f35f0a6c7d05aff7098e296c3de86939/grpcio-1.80.0-cp314-cp314-win32.whl", hash = "sha256:367ce30ba67d05e0592470428f0ec1c31714cab9ef19b8f2e37be1f4c7d32fae", size = 4218563, upload-time = "2026-03-30T08:48:34.538Z" }, + { url = "https://files.pythonhosted.org/packages/e5/8c/bbe6baf2557262834f2070cf668515fa308b2d38a4bbf771f8f7872a7036/grpcio-1.80.0-cp314-cp314-win_amd64.whl", hash = "sha256:3b01e1f5464c583d2f567b2e46ff0d516ef979978f72091fd81f5ab7fa6e2e7f", size = 5019457, upload-time = "2026-03-30T08:48:37.308Z" }, ] [[package]] -name = "jmespath" -version = "1.1.0" +name = "h11" +version = "0.16.0" source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/d3/59/322338183ecda247fb5d1763a6cbe46eff7222eaeebafd9fa65d4bf5cb11/jmespath-1.1.0.tar.gz", hash = "sha256:472c87d80f36026ae83c6ddd0f1d05d4e510134ed462851fd5f754c8c3cbb88d", size = 27377, upload-time = "2026-01-22T16:35:26.279Z" } +sdist = { url = "https://files.pythonhosted.org/packages/01/ee/02a2c011bdab74c6fb3c75474d40b3052059d95df7e73351460c8588d963/h11-0.16.0.tar.gz", hash = "sha256:4e35b956cf45792e4caa5885e69fba00bdbc6ffafbfa020300e549b208ee5ff1", size = 101250, upload-time = "2025-04-24T03:35:25.427Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/14/2f/967ba146e6d58cf6a652da73885f52fc68001525b4197effc174321d70b4/jmespath-1.1.0-py3-none-any.whl", hash = "sha256:a5663118de4908c91729bea0acadca56526eb2698e83de10cd116ae0f4e97c64", size = 20419, upload-time = "2026-01-22T16:35:24.919Z" }, + { url = "https://files.pythonhosted.org/packages/04/4b/29cac41a4d98d144bf5f6d33995617b185d14b22401f75ca86f384e87ff1/h11-0.16.0-py3-none-any.whl", hash = "sha256:63cf8bbe7522de3bf65932fda1d9c2772064ffb3dae62d55932da54b31cb6c86", size = 37515, upload-time = "2025-04-24T03:35:24.344Z" }, ] [[package]] -name = "joblib" -version = "1.5.3" +name = "httpcore" +version = "1.0.9" source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/41/f2/d34e8b3a08a9cc79a50b2208a93dce981fe615b64d5a4d4abee421d898df/joblib-1.5.3.tar.gz", hash = "sha256:8561a3269e6801106863fd0d6d84bb737be9e7631e33aaed3fb9ce5953688da3", size = 331603, upload-time = "2025-12-15T08:41:46.427Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/7b/91/984aca2ec129e2757d1e4e3c81c3fcda9d0f85b74670a094cc443d9ee949/joblib-1.5.3-py3-none-any.whl", hash = "sha256:5fc3c5039fc5ca8c0276333a188bbd59d6b7ab37fe6632daa76bc7f9ec18e713", size = 309071, upload-time = "2025-12-15T08:41:44.973Z" }, +dependencies = [ + { name = "certifi" }, + { name = "h11" }, ] - -[[package]] -name = "json2html" -version = "1.3.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/01/d5/40b617ee19d2d79f606ed37f8a81e51158f126d2af67270c68f2b47ae0d5/json2html-1.3.0.tar.gz", hash = "sha256:8951a53662ae9cfd812685facdba693fc950ffc1c1fd1a8a2d3cf4c34600689c", size = 6977, upload-time = "2019-07-03T20:50:03.023Z" } - -[[package]] -name = "jsonpointer" -version = "3.1.1" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/18/c7/af399a2e7a67fd18d63c40c5e62d3af4e67b836a2107468b6a5ea24c4304/jsonpointer-3.1.1.tar.gz", hash = "sha256:0b801c7db33a904024f6004d526dcc53bbb8a4a0f4e32bfd10beadf60adf1900", size = 9068, upload-time = "2026-03-23T22:32:32.458Z" } +sdist = { url = "https://files.pythonhosted.org/packages/06/94/82699a10bca87a5556c9c59b5963f2d039dbd239f25bc2a63907a05a14cb/httpcore-1.0.9.tar.gz", hash = "sha256:6e34463af53fd2ab5d807f399a9b45ea31c3dfa2276f15a2c3f00afff6e176e8", size = 85484, upload-time = "2025-04-24T22:06:22.219Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/9e/6a/a83720e953b1682d2d109d3c2dbb0bc9bf28cc1cbc205be4ef4be5da709d/jsonpointer-3.1.1-py3-none-any.whl", hash = "sha256:8ff8b95779d071ba472cf5bc913028df06031797532f08a7d5b602d8b2a488ca", size = 7659, upload-time = "2026-03-23T22:32:31.568Z" }, + { url = "https://files.pythonhosted.org/packages/7e/f5/f66802a942d491edb555dd61e3a9961140fd64c90bce1eafd741609d334d/httpcore-1.0.9-py3-none-any.whl", hash = "sha256:2d400746a40668fc9dec9810239072b40b4484b640a8c38fd654a024c7a1bf55", size = 78784, upload-time = "2025-04-24T22:06:20.566Z" }, ] [[package]] -name = "jsonschema" -version = "4.26.0" +name = "httpcore2" +version = "2.3.0" source = { registry = "https://pypi.org/simple" } dependencies = [ - { name = "attrs" }, - { name = "jsonschema-specifications" }, - { name = "referencing" }, - { name = "rpds-py" }, + { name = "h11" }, + { name = "truststore" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/b3/fc/e067678238fa451312d4c62bf6e6cf5ec56375422aee02f9cb5f909b3047/jsonschema-4.26.0.tar.gz", hash = "sha256:0c26707e2efad8aa1bfc5b7ce170f3fccc2e4918ff85989ba9ffa9facb2be326", size = 366583, upload-time = "2026-01-07T13:41:07.246Z" } +sdist = { url = "https://files.pythonhosted.org/packages/e6/34/18f1c596e677962f040284246f393b10a1f8ce440b3a7e69c637d0f1c7ad/httpcore2-2.3.0.tar.gz", hash = "sha256:07327e251560960eea8e969d92d4c6a325feb13cca39e25340731336c3baf924", size = 64300, upload-time = "2026-06-01T13:15:02.998Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/69/90/f63fb5873511e014207a475e2bb4e8b2e570d655b00ac19a9a0ca0a385ee/jsonschema-4.26.0-py3-none-any.whl", hash = "sha256:d489f15263b8d200f8387e64b4c3a75f06629559fb73deb8fdfb525f2dab50ce", size = 90630, upload-time = "2026-01-07T13:41:05.306Z" }, -] - -[package.optional-dependencies] -format-nongpl = [ - { name = "fqdn" }, - { name = "idna" }, - { name = "isoduration" }, - { name = "jsonpointer" }, - { name = "rfc3339-validator" }, - { name = "rfc3986-validator" }, - { name = "rfc3987-syntax" }, - { name = "uri-template" }, - { name = "webcolors" }, + { url = "https://files.pythonhosted.org/packages/c2/dd/3357218c69360d1cecc196c230c9a1d5c9afd5dba362056e23e60a5e64e5/httpcore2-2.3.0-py3-none-any.whl", hash = "sha256:477e9e334f74e5240dcac002e890580f36a57d40ff0fb14cc9655731d23b8415", size = 80024, upload-time = "2026-06-01T13:15:00.001Z" }, ] [[package]] -name = "jsonschema-specifications" -version = "2025.9.1" +name = "httptools" +version = "0.8.0" source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "referencing" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/19/74/a633ee74eb36c44aa6d1095e7cc5569bebf04342ee146178e2d36600708b/jsonschema_specifications-2025.9.1.tar.gz", hash = "sha256:b540987f239e745613c7a9176f3edb72b832a4ac465cf02712288397832b5e8d", size = 32855, upload-time = "2025-09-08T01:34:59.186Z" } +sdist = { url = "https://files.pythonhosted.org/packages/43/e5/d471fcb0e14523fe1c3f4ba58ca52480e7bd70ad7109a3846bc75892f7fb/httptools-0.8.0.tar.gz", hash = "sha256:6b2a32f18d97e16e90827d7a819ffa8dbd8cc245fc4e1fa9d1095b54ef4bd999", size = 271342, upload-time = "2026-05-25T22:17:48.841Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/41/45/1a4ed80516f02155c51f51e8cedb3c1902296743db0bbc66608a0db2814f/jsonschema_specifications-2025.9.1-py3-none-any.whl", hash = "sha256:98802fee3a11ee76ecaca44429fda8a41bff98b00a0f2838151b113f210cc6fe", size = 18437, upload-time = "2025-09-08T01:34:57.871Z" }, + { url = "https://files.pythonhosted.org/packages/1a/12/fa3fbf5f9517b273edea2dc982aa82a8c634091e67c590792b729017bc6f/httptools-0.8.0-cp314-cp314-macosx_10_13_universal2.whl", hash = "sha256:de242a49b5d18e0a8776e654e9f6bf6d89f3875a5c35b425a0e7ce940feb3fd6", size = 206183, upload-time = "2026-05-25T22:17:24.004Z" }, + { url = "https://files.pythonhosted.org/packages/30/fc/5e7c4cb443370f2090a3aba0453a07384d29ff66b7435bb90e77e1037599/httptools-0.8.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:159e9ab5f701ccd42e555a12f1ad8ff69702910fc1c996cf2bb66e5fcb7a231b", size = 112079, upload-time = "2026-05-25T22:17:25.216Z" }, + { url = "https://files.pythonhosted.org/packages/ba/53/771bd891eb0f236f32145d6a1775777ec85745f3cc983a1f23d1a3b8ddfe/httptools-0.8.0-cp314-cp314-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:c4a9f1707e4823d54dfec6c33fa3697d302aed536ed352a7ebb5a061ddb869d0", size = 481596, upload-time = "2026-05-25T22:17:26.186Z" }, + { url = "https://files.pythonhosted.org/packages/62/42/94e15bc68ce3d423243c45d7f1b0c7561f13844f97dc52ae23182fb65628/httptools-0.8.0-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:d76ad7b951387e3632c8716a9bb03ac5b45c5f16119aa409db0459520887944e", size = 480865, upload-time = "2026-05-25T22:17:27.542Z" }, + { url = "https://files.pythonhosted.org/packages/1c/7c/fe2980fc03723272e30f135b62360b075f513dfe7cc73aef36c7f04012bd/httptools-0.8.0-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:a3b7387147361c3fd47a0bde763c5c91b5b4cd4dc9989b8ece84ff436c99843b", size = 463189, upload-time = "2026-05-25T22:17:28.546Z" }, + { url = "https://files.pythonhosted.org/packages/15/1b/47fc5fff68acd1bfa20b4734059c9a06cadb88119dcd5258b5b0d21d91c8/httptools-0.8.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:f256d6ce930c52ca1cb2a960b7da03548c454e7d28b06059ad41bfe789036ce0", size = 466610, upload-time = "2026-05-25T22:17:29.816Z" }, + { url = "https://files.pythonhosted.org/packages/60/bd/07b13c93ffd9bec9546e0d43f8e19378dd696dbd278511406bc07371ef1f/httptools-0.8.0-cp314-cp314-win_amd64.whl", hash = "sha256:19d1ee275bb59ba2643ba9a3a1e51cc0c788caf2b8df506368e03f56fdd08527", size = 92705, upload-time = "2026-05-25T22:17:31.133Z" }, + { url = "https://files.pythonhosted.org/packages/fd/c4/121648f68ce066d7bd762d6b6d97e620847642d38d54f3d90ff11d947629/httptools-0.8.0-cp314-cp314t-macosx_10_13_universal2.whl", hash = "sha256:de1ed58a974e75d56560acc7e7fed01a454994429456f65209789992e41f2568", size = 215023, upload-time = "2026-05-25T22:17:32.401Z" }, + { url = "https://files.pythonhosted.org/packages/b9/b0/312a062ae741ae3e8baa8c8bf20be81b2e67337b259ab4349bebc7b6142e/httptools-0.8.0-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:e93c227b595c6926c1acee96891dd9da4be338cfbe82e5cd3bb9d8dd7dc4ac0b", size = 117405, upload-time = "2026-05-25T22:17:33.742Z" }, + { url = "https://files.pythonhosted.org/packages/fc/37/fccd705f795386bb05bf413012fecff2a33e5aa8c2f069096de3e9fd8702/httptools-0.8.0-cp314-cp314t-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:2a021c3a8e65cc125390d72f59b968afca3bdcaff25bd67965e0a055a14946ca", size = 558497, upload-time = "2026-05-25T22:17:34.732Z" }, + { url = "https://files.pythonhosted.org/packages/bd/39/f172e8003576de35f5ba77ff417cf0e34429d35dc014deef15afa337a72c/httptools-0.8.0-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:48774d39cbb70e2b1f71f88852a3087ae1d3a1eb80482bb48c13067ab080c14f", size = 571585, upload-time = "2026-05-25T22:17:35.813Z" }, + { url = "https://files.pythonhosted.org/packages/3e/b9/f5564760af99f3dbbf3f9104dc00e5da27e96cf433c6bdcf77617f70bf3f/httptools-0.8.0-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:88eead8ec8680a9f146c655bc88445a325bd7921cfd8194c7337e9467282427d", size = 543297, upload-time = "2026-05-25T22:17:37.08Z" }, + { url = "https://files.pythonhosted.org/packages/99/67/8d9f2c313618e161b82f3873188e7196126da1d6e29688df40eb3997c77a/httptools-0.8.0-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:2c032fa028f46871ec7e1fc59fc15e8023eab3e6bbe6ece786a1611719a5d081", size = 539535, upload-time = "2026-05-25T22:17:38.032Z" }, + { url = "https://files.pythonhosted.org/packages/48/63/b906c01e53f50d432c0defe43ce52764a111dc1bdd028bafbeb54dcfd008/httptools-0.8.0-cp314-cp314t-win_amd64.whl", hash = "sha256:384c17174464c8e873398b7af24f0b1f44d992c820328413951a625323155d77", size = 108209, upload-time = "2026-05-25T22:17:39.473Z" }, ] [[package]] -name = "jupyter-client" -version = "7.4.9" +name = "httpx" +version = "0.28.1" source = { registry = "https://pypi.org/simple" } dependencies = [ - { name = "entrypoints" }, - { name = "jupyter-core" }, - { name = "nest-asyncio" }, - { name = "python-dateutil" }, - { name = "pyzmq" }, - { name = "tornado" }, - { name = "traitlets" }, + { name = "anyio" }, + { name = "certifi" }, + { name = "httpcore" }, + { name = "idna" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/1e/33/71778cdd2c69445bcd3bb6029da2e43cc9b5cbbeef4f4982ef3aaf396650/jupyter_client-7.4.9.tar.gz", hash = "sha256:52be28e04171f07aed8f20e1616a5a552ab9fee9cbbe6c1896ae170c3880d392", size = 329115, upload-time = "2023-01-12T20:05:10.58Z" } +sdist = { url = "https://files.pythonhosted.org/packages/b1/df/48c586a5fe32a0f01324ee087459e112ebb7224f646c0b5023f5e79e9956/httpx-0.28.1.tar.gz", hash = "sha256:75e98c5f16b0f35b567856f597f06ff2270a374470a5c2392242528e3e3e42fc", size = 141406, upload-time = "2024-12-06T15:37:23.222Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/fd/a7/ef3b7c8b9d6730a21febdd0809084e4cea6d2a7e43892436adecdd0acbd4/jupyter_client-7.4.9-py3-none-any.whl", hash = "sha256:214668aaea208195f4c13d28eb272ba79f945fc0cf3f11c7092c20b2ca1980e7", size = 133492, upload-time = "2023-01-12T20:05:08.044Z" }, + { url = "https://files.pythonhosted.org/packages/2a/39/e50c7c3a983047577ee07d2a9e53faf5a69493943ec3f6a384bdc792deb2/httpx-0.28.1-py3-none-any.whl", hash = "sha256:d909fcccc110f8c7faf814ca82a9a4d816bc5a6dbfea25d6591d6985b8ba59ad", size = 73517, upload-time = "2024-12-06T15:37:21.509Z" }, ] [[package]] -name = "jupyter-core" -version = "5.9.1" +name = "httpx2" +version = "2.3.0" source = { registry = "https://pypi.org/simple" } dependencies = [ - { name = "platformdirs" }, - { name = "traitlets" }, + { name = "anyio" }, + { name = "httpcore2" }, + { name = "idna" }, + { name = "truststore" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/02/49/9d1284d0dc65e2c757b74c6687b6d319b02f822ad039e5c512df9194d9dd/jupyter_core-5.9.1.tar.gz", hash = "sha256:4d09aaff303b9566c3ce657f580bd089ff5c91f5f89cf7d8846c3cdf465b5508", size = 89814, upload-time = "2025-10-16T19:19:18.444Z" } +sdist = { url = "https://files.pythonhosted.org/packages/9f/9a/cca0b9145f13d8ae34b885ae28d403a1469a433abc78e0f94f4ce94e650b/httpx2-2.3.0.tar.gz", hash = "sha256:227e7c41d95a76d4077a52640564132777215fc3394e07b66a3116c33d668fa9", size = 81115, upload-time = "2026-06-01T13:15:04.324Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/e7/e7/80988e32bf6f73919a113473a604f5a8f09094de312b9d52b79c2df7612b/jupyter_core-5.9.1-py3-none-any.whl", hash = "sha256:ebf87fdc6073d142e114c72c9e29a9d7ca03fad818c5d300ce2adc1fb0743407", size = 29032, upload-time = "2025-10-16T19:19:16.783Z" }, + { url = "https://files.pythonhosted.org/packages/87/ce/ae2911859847f9ba1d6b23027e53481cbeb50b93234f355a968d300ca2cb/httpx2-2.3.0-py3-none-any.whl", hash = "sha256:6f393663bdf6dbe7fe90118e3eb5b2bd024a675cae0390ac08cec9198812d8b7", size = 74538, upload-time = "2026-06-01T13:15:01.566Z" }, ] [[package]] -name = "jupyter-events" -version = "0.12.1" +name = "idna" +version = "3.17" source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "jsonschema", extra = ["format-nongpl"] }, - { name = "packaging" }, - { name = "python-json-logger" }, - { name = "pyyaml" }, - { name = "referencing" }, - { name = "rfc3339-validator" }, - { name = "rfc3986-validator" }, - { name = "traitlets" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/18/f8/475c4241b2b75af0deaae453ed003c6c851766dbc44d332d8baf245dc931/jupyter_events-0.12.1.tar.gz", hash = "sha256:faff25f77218335752f35f23c5fe6e4a392a7bd99a5939ccb9b8fbf594636cf3", size = 62854, upload-time = "2026-04-20T23:17:50.66Z" } +sdist = { url = "https://files.pythonhosted.org/packages/b9/28/99c51f664567218d824af024c0251650fb27e4ca066df188dab0769c5b91/idna-3.17.tar.gz", hash = "sha256:5eb0cb53bc467c12eadcf6de83163ad8527cec9416f44b9b61b19caedad2b87f", size = 196048, upload-time = "2026-05-28T14:32:38.55Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/eb/6c/6fcde0c8f616ed360ffd3587f7db9e225a7e62b583a04494d2f069cf64ea/jupyter_events-0.12.1-py3-none-any.whl", hash = "sha256:c366585253f537a627da52fa7ca7410c5b5301fe893f511e7b077c2d93ec8bcf", size = 19512, upload-time = "2026-04-20T23:17:48.927Z" }, + { url = "https://files.pythonhosted.org/packages/de/a7/f76514cc40ad6234098ecdebda08732d75964776c51a42845b7da10649e2/idna-3.17-py3-none-any.whl", hash = "sha256:466e48829084efe2548012b855df21540b96f2e20e51bd124c851536556a592c", size = 65316, upload-time = "2026-05-28T14:32:37.035Z" }, ] [[package]] -name = "jupyter-server" -version = "2.18.2" +name = "iniconfig" +version = "2.3.0" source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "anyio" }, - { name = "argon2-cffi" }, - { name = "jinja2" }, - { name = "jupyter-client" }, - { name = "jupyter-core" }, - { name = "jupyter-events" }, - { name = "jupyter-server-terminals" }, - { name = "nbconvert" }, - { name = "nbformat" }, - { name = "packaging" }, - { name = "prometheus-client" }, - { name = "pywinpty", marker = "os_name == 'nt'" }, - { name = "pyzmq" }, - { name = "send2trash" }, - { name = "terminado" }, - { name = "tornado" }, - { name = "traitlets" }, - { name = "websocket-client" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/ca/15/1eacb0fcb79ef86e8a0a79a708e6ad7435f6f223097dd29a4ce861fabc44/jupyter_server-2.18.2.tar.gz", hash = "sha256:06b4f40d8a7a00bb39d5216859c81374a0e7cfefe6d8a5a7facc5a5c37c679a7", size = 753177, upload-time = "2026-05-06T07:04:36.274Z" } +sdist = { url = "https://files.pythonhosted.org/packages/72/34/14ca021ce8e5dfedc35312d08ba8bf51fdd999c576889fc2c24cb97f4f10/iniconfig-2.3.0.tar.gz", hash = "sha256:c76315c77db068650d49c5b56314774a7804df16fee4402c1f19d6d15d8c4730", size = 20503, upload-time = "2025-10-18T21:55:43.219Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/e2/50/ecf4f70d65bdb7519b28a33d1b2fee8a4b4ba1ae1a92f15d97e877c5de21/jupyter_server-2.18.2-py3-none-any.whl", hash = "sha256:fa5e46539ded65791838035a2b6001f13e54d5f64b8b3752eb1e91fdd641a5b8", size = 391907, upload-time = "2026-05-06T07:04:34.014Z" }, + { url = "https://files.pythonhosted.org/packages/cb/b1/3846dd7f199d53cb17f49cba7e651e9ce294d8497c8c150530ed11865bb8/iniconfig-2.3.0-py3-none-any.whl", hash = "sha256:f631c04d2c48c52b84d0d0549c99ff3859c98df65b3101406327ecc7d53fbf12", size = 7484, upload-time = "2025-10-18T21:55:41.639Z" }, ] [[package]] -name = "jupyter-server-terminals" -version = "0.5.4" +name = "jinja2" +version = "3.1.6" source = { registry = "https://pypi.org/simple" } dependencies = [ - { name = "pywinpty", marker = "os_name == 'nt'" }, - { name = "terminado" }, + { name = "markupsafe" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/f4/a7/bcd0a9b0cbba88986fe944aaaf91bfda603e5a50bda8ed15123f381a3b2f/jupyter_server_terminals-0.5.4.tar.gz", hash = "sha256:bbda128ed41d0be9020349f9f1f2a4ab9952a73ed5f5ac9f1419794761fb87f5", size = 31770, upload-time = "2026-01-14T16:53:20.213Z" } +sdist = { url = "https://files.pythonhosted.org/packages/df/bf/f7da0350254c0ed7c72f3e33cef02e048281fec7ecec5f032d4aac52226b/jinja2-3.1.6.tar.gz", hash = "sha256:0137fb05990d35f1275a587e9aee6d56da821fc83491a0fb838183be43f66d6d", size = 245115, upload-time = "2025-03-05T20:05:02.478Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/d1/2d/6674563f71c6320841fc300911a55143925112a72a883e2ca71fba4c618d/jupyter_server_terminals-0.5.4-py3-none-any.whl", hash = "sha256:55be353fc74a80bc7f3b20e6be50a55a61cd525626f578dcb66a5708e2007d14", size = 13704, upload-time = "2026-01-14T16:53:18.738Z" }, + { url = "https://files.pythonhosted.org/packages/62/a1/3d680cbfd5f4b8f15abc1d571870c5fc3e594bb582bc3b64ea099db13e56/jinja2-3.1.6-py3-none-any.whl", hash = "sha256:85ece4451f492d0c13c5dd7c13a64681a86afae63a5f347908daf103ce6d2f67", size = 134899, upload-time = "2025-03-05T20:05:00.369Z" }, ] [[package]] -name = "jupyterlab-pygments" -version = "0.3.0" +name = "joblib" +version = "1.5.3" source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/90/51/9187be60d989df97f5f0aba133fa54e7300f17616e065d1ada7d7646b6d6/jupyterlab_pygments-0.3.0.tar.gz", hash = "sha256:721aca4d9029252b11cfa9d185e5b5af4d54772bb8072f9b7036f4170054d35d", size = 512900, upload-time = "2023-11-23T09:26:37.44Z" } +sdist = { url = "https://files.pythonhosted.org/packages/41/f2/d34e8b3a08a9cc79a50b2208a93dce981fe615b64d5a4d4abee421d898df/joblib-1.5.3.tar.gz", hash = "sha256:8561a3269e6801106863fd0d6d84bb737be9e7631e33aaed3fb9ce5953688da3", size = 331603, upload-time = "2025-12-15T08:41:46.427Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/b1/dd/ead9d8ea85bf202d90cc513b533f9c363121c7792674f78e0d8a854b63b4/jupyterlab_pygments-0.3.0-py3-none-any.whl", hash = "sha256:841a89020971da1d8693f1a99997aefc5dc424bb1b251fd6322462a1b8842780", size = 15884, upload-time = "2023-11-23T09:26:34.325Z" }, + { url = "https://files.pythonhosted.org/packages/7b/91/984aca2ec129e2757d1e4e3c81c3fcda9d0f85b74670a094cc443d9ee949/joblib-1.5.3-py3-none-any.whl", hash = "sha256:5fc3c5039fc5ca8c0276333a188bbd59d6b7ab37fe6632daa76bc7f9ec18e713", size = 309071, upload-time = "2025-12-15T08:41:44.973Z" }, ] [[package]] @@ -1623,15 +579,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/99/a2/ca7dc962848040befed12732dff6acae7fb3c4f6fc4272b3f6c9a30b8713/kiwisolver-1.5.0-cp314-cp314t-win_arm64.whl", hash = "sha256:58f812017cd2985c21fbffb4864d59174d4903dd66fa23815e74bbc7a0e2dd57", size = 70032, upload-time = "2026-03-09T13:15:34.411Z" }, ] -[[package]] -name = "lark" -version = "1.3.1" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/da/34/28fff3ab31ccff1fd4f6c7c7b0ceb2b6968d8ea4950663eadcb5720591a0/lark-1.3.1.tar.gz", hash = "sha256:b426a7a6d6d53189d318f2b6236ab5d6429eaf09259f1ca33eb716eed10d2905", size = 382732, upload-time = "2025-10-27T18:25:56.653Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/82/3d/14ce75ef66813643812f3093ab17e46d3a206942ce7376d31ec2d36229e7/lark-1.3.1-py3-none-any.whl", hash = "sha256:c629b661023a014c37da873b4ff58a817398d12635d3bbb2c5a03be7fe5d1e12", size = 113151, upload-time = "2025-10-27T18:25:54.882Z" }, -] - [[package]] name = "lazy-model" version = "0.4.0" @@ -1730,31 +677,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/70/bc/6f1c2f612465f5fa89b95bead1f44dcb607670fd42891d8fdcd5d039f4f4/markupsafe-3.0.3-cp314-cp314t-win_arm64.whl", hash = "sha256:32001d6a8fc98c8cb5c947787c5d08b0a50663d139f1305bac5885d98d9b40fa", size = 14146, upload-time = "2025-09-27T18:37:28.327Z" }, ] -[[package]] -name = "marshmallow" -version = "3.26.2" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "packaging" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/55/79/de6c16cc902f4fc372236926b0ce2ab7845268dcc30fb2fbb7f71b418631/marshmallow-3.26.2.tar.gz", hash = "sha256:bbe2adb5a03e6e3571b573f42527c6fe926e17467833660bebd11593ab8dfd57", size = 222095, upload-time = "2025-12-22T06:53:53.309Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/be/2f/5108cb3ee4ba6501748c4908b908e55f42a5b66245b4cfe0c99326e1ef6e/marshmallow-3.26.2-py3-none-any.whl", hash = "sha256:013fa8a3c4c276c24d26d84ce934dc964e2aa794345a0f8c7e5a7191482c8a73", size = 50964, upload-time = "2025-12-22T06:53:51.801Z" }, -] - -[[package]] -name = "marshmallow-mongoengine" -version = "0.31.2" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "marshmallow" }, - { name = "mongoengine" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/63/72/5cabacd62c5b4f81a1e955e0c54bb86d1289621e384f522552806f9ee101/marshmallow-mongoengine-0.31.2.tar.gz", hash = "sha256:a708732456e1a36139c6ce52910b57cf2a54e7206c5c635a48dba9e3e157d6db", size = 11377, upload-time = "2023-03-14T05:42:51.825Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/c4/ef/ec8be29d7f6dec0bae9391e8fae352a3d5b2ddb9be84a7d611a5b0e5c1de/marshmallow_mongoengine-0.31.2-py2.py3-none-any.whl", hash = "sha256:51de7614ce9002f9f679aebb6df7488297e791fbd07d9f14b963e9c7bce604ca", size = 12237, upload-time = "2023-03-14T05:42:50.515Z" }, -] - [[package]] name = "matplotlib" version = "3.10.9" @@ -1788,18 +710,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/78/23/92493c3e6e1b635ccfff146f7b99e674808787915420373ac399283764c2/matplotlib-3.10.9-cp314-cp314t-win_arm64.whl", hash = "sha256:a49f1eadc84ca85fd72fa4e89e70e61bf86452df6f971af04b12c60761a0772c", size = 8324785, upload-time = "2026-04-24T00:13:53.633Z" }, ] -[[package]] -name = "matplotlib-inline" -version = "0.2.2" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "traitlets" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/bd/c0/9f7c9a46090390368a4d7bcb76bb87a4a36c421e4c0792cdb53486ffac7a/matplotlib_inline-0.2.2.tar.gz", hash = "sha256:72f3fe8fce36b70d4a5b612f899090cd0401deddc4ea90e1572b9f4bfb058c79", size = 8150, upload-time = "2026-05-08T17:33:33.49Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/41/09/5b161152e2d90f7b87f781c2e1267494aef9c32498df793f73ad0a0a494a/matplotlib_inline-0.2.2-py3-none-any.whl", hash = "sha256:3c821cf1c209f59fb2d2d64abbf5b23b67bcb2210d663f9918dd851c6da1fcf6", size = 9534, upload-time = "2026-05-08T17:33:32.055Z" }, -] - [[package]] name = "mdurl" version = "0.1.2" @@ -1809,39 +719,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/b3/38/89ba8ad64ae25be8de66a6d463314cf1eb366222074cfda9ee839c56a4b4/mdurl-0.1.2-py3-none-any.whl", hash = "sha256:84008a41e51615a49fc9966191ff91509e3c40b939176e643fd50a5c2196b8f8", size = 9979, upload-time = "2022-08-14T12:40:09.779Z" }, ] -[[package]] -name = "mimerender-pr36" -version = "0.0.2" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "python-mimeparse" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/23/39/25559ff5440e17aad0191e3034afa6e023150bc1e79edacb9268c22131f6/mimerender-pr36-0.0.2.tar.gz", hash = "sha256:2d1f7bc4080132da7040518b2d613eb5e49b583231a9b2be3ac040860c233d80", size = 19309, upload-time = "2021-08-07T05:53:35.754Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/48/d5/4f84e7b14f115d49bde75babd13e67ec3b19d077bffc937cab2fc524eac5/mimerender_pr36-0.0.2-py3-none-any.whl", hash = "sha256:260eceeca204d11a4b43cc5d1fe60d757048e6b3dd51b87b64c68c153faadacc", size = 6621, upload-time = "2021-08-07T05:53:33.338Z" }, -] - -[[package]] -name = "mistune" -version = "3.2.1" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/ca/84/620cc3f7e3adf6f5067e10f4dbae71295d8f9e16d5d3f9ef97c40f2f592c/mistune-3.2.1.tar.gz", hash = "sha256:7c8e5501d38bac1582e067e46c8343f17d57ea1aaa735823f3aba1fd59c88a28", size = 98003, upload-time = "2026-05-03T14:33:22.312Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/2a/7f/a946aa4f8752b37102b41e64dca18a1976ac705c3a0d1dfe74d820a02552/mistune-3.2.1-py3-none-any.whl", hash = "sha256:78cdb0ba5e938053ccf63651b352508d2efa9411dc8810bfb05f2dc5140c0048", size = 53749, upload-time = "2026-05-03T14:33:20.551Z" }, -] - -[[package]] -name = "mongoengine" -version = "0.29.3" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "pymongo" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/b4/76/160e35d90a671913146b884b1ca586909036dd56070600035821870b1aad/mongoengine-0.29.3.tar.gz", hash = "sha256:4267702aea433012845cb12b6334bff86a0a3084b5d141c1e4553ea20374a9b4", size = 188213, upload-time = "2026-03-10T15:19:17.946Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/c7/b5/214ea32710fa3ad7c13820cbb9f9a457d4809a5d54995e0d081f33c75116/mongoengine-0.29.3-py3-none-any.whl", hash = "sha256:2d5a216cf2368867d43e5321b13044ecc3e72c3f19ace21b1c5e7403951ca685", size = 112513, upload-time = "2026-03-10T15:19:16.619Z" }, -] - [[package]] name = "monty" version = "2026.5.18" @@ -1855,63 +732,22 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/f3/63/86120977f920798494c522c26899ffacde6d848e1eb018403f1d08044d0d/monty-2026.5.18-py3-none-any.whl", hash = "sha256:dd108b5c3cceb1f61de1a854db8ffda3dc7c2a2d4025b24cf397ade1121e7904", size = 59998, upload-time = "2026-05-18T03:21:00.059Z" }, ] -[[package]] -name = "more-itertools" -version = "11.1.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/de/1d/f4da6f02cdffe04d6362210b807146a26044c88d839208aec273bb0d9184/more_itertools-11.1.0.tar.gz", hash = "sha256:48e8f4d9e7e5878571ecf6f2b4e57634f93cd474cc8cfbd2376f2d11b396e30d", size = 145772, upload-time = "2026-05-22T14:14:29.909Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/e8/3d/1087453384dbde46a8c7f9356eead2c58be8a7bf156bca40243377c85715/more_itertools-11.1.0-py3-none-any.whl", hash = "sha256:4b65538ae22f6fed0ce4874efd317463a7489796a0939fa66824dd542125a192", size = 72226, upload-time = "2026-05-22T14:14:28.824Z" }, -] - [[package]] name = "mpcontribs-api" source = { editable = "." } dependencies = [ - { name = "apispec" }, - { name = "asn1crypto" }, { name = "beanie" }, - { name = "blinker" }, - { name = "boltons" }, - { name = "css-html-js-minify" }, - { name = "dateparser" }, - { name = "ddtrace" }, - { name = "dnspython" }, { name = "fastapi", extra = ["standard"] }, { name = "fastapi-filter" }, - { name = "filetype" }, - { name = "flasgger-tschaume" }, - { name = "flask-compress" }, - { name = "flask-marshmallow" }, - { name = "flask-mongorest-mpcontribs" }, - { name = "flask-rq2" }, - { name = "gunicorn", extra = ["gevent"] }, - { name = "jinja2" }, - { name = "json2html" }, - { name = "marshmallow" }, - { name = "more-itertools" }, - { name = "nbformat" }, - { name = "notebook" }, - { name = "numpy" }, { name = "opentelemetry-api" }, { name = "opentelemetry-exporter-otlp-proto-grpc" }, { name = "opentelemetry-instrumentation-fastapi" }, { name = "opentelemetry-instrumentation-pymongo" }, { name = "opentelemetry-sdk" }, - { name = "pint" }, - { name = "psycopg2-binary" }, { name = "pydantic-settings" }, { name = "pymatgen" }, { name = "pymongo" }, - { name = "pyopenssl" }, - { name = "python-snappy" }, - { name = "rq" }, - { name = "setproctitle" }, { name = "structlog" }, - { name = "supervisor" }, - { name = "uncertainties" }, - { name = "websocket-client" }, - { name = "zstandard" }, ] [package.dev-dependencies] @@ -1927,50 +763,18 @@ dev = [ [package.metadata] requires-dist = [ - { name = "apispec", specifier = "<6" }, - { name = "asn1crypto" }, { name = "beanie", specifier = ">=2.1.0" }, - { name = "blinker" }, - { name = "boltons" }, - { name = "css-html-js-minify" }, - { name = "dateparser" }, - { name = "ddtrace", specifier = "==4.3.0" }, - { name = "dnspython" }, { name = "fastapi", extras = ["standard"], specifier = ">=0.136.3" }, { name = "fastapi-filter", specifier = ">=2.0.1" }, - { name = "filetype" }, - { name = "flasgger-tschaume", specifier = ">=0.9.7" }, - { name = "flask-compress" }, - { name = "flask-marshmallow" }, - { name = "flask-mongorest-mpcontribs", specifier = ">=3.2.1" }, - { name = "flask-rq2" }, - { name = "gunicorn", extras = ["gevent"], specifier = "==24.1.1" }, - { name = "jinja2" }, - { name = "json2html" }, - { name = "marshmallow", specifier = "<4" }, - { name = "more-itertools" }, - { name = "nbformat" }, - { name = "notebook", specifier = "<7" }, - { name = "numpy" }, { name = "opentelemetry-api", specifier = ">=1.42.1" }, { name = "opentelemetry-exporter-otlp-proto-grpc", specifier = ">=1.42.1" }, { name = "opentelemetry-instrumentation-fastapi", specifier = ">=0.63b1" }, { name = "opentelemetry-instrumentation-pymongo", specifier = ">=0.63b1" }, { name = "opentelemetry-sdk", specifier = ">=1.42.1" }, - { name = "pint", specifier = ">=0.24" }, - { name = "psycopg2-binary" }, { name = "pydantic-settings", specifier = ">=2.14.1" }, { name = "pymatgen" }, { name = "pymongo", specifier = ">=4.17.0" }, - { name = "pyopenssl" }, - { name = "python-snappy" }, - { name = "rq", specifier = "<=2.3.2" }, - { name = "setproctitle" }, { name = "structlog", specifier = ">=25.5.0" }, - { name = "supervisor" }, - { name = "uncertainties" }, - { name = "websocket-client" }, - { name = "zstandard" }, ] [package.metadata.requires-dev] @@ -2002,85 +806,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/1d/77/928ea2e70641ca177a11140062cc5840d421795f2e82749d408d0cce900a/narwhals-2.21.2-py3-none-any.whl", hash = "sha256:7bb57c3700486039215455b9bf2d64261915cc0fd845cc30272d631df696b251", size = 451201, upload-time = "2026-05-16T08:49:05.536Z" }, ] -[[package]] -name = "nbclassic" -version = "1.3.3" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "ipykernel" }, - { name = "ipython-genutils" }, - { name = "nest-asyncio" }, - { name = "notebook-shim" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/ec/cc/a495b5eb9a964b70c6ae8c861168b78386d2520fd89c68390932f96400b2/nbclassic-1.3.3.tar.gz", hash = "sha256:434228763f8cee754318cd6dfa42370db191af630dabab8e30bafc8c1aa3eee6", size = 64116062, upload-time = "2025-09-16T20:33:15.967Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/3d/fd/dfb6db427bb4e0a50c9802b11df0b69d9364192f3db999849cde9209c8d0/nbclassic-1.3.3-py3-none-any.whl", hash = "sha256:dcee5149aa6aa01846c7458d6394b29b325213b5e118ee14c80d689122e0e4f2", size = 11527229, upload-time = "2025-09-16T20:33:08.625Z" }, -] - -[[package]] -name = "nbclient" -version = "0.10.4" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "jupyter-client" }, - { name = "jupyter-core" }, - { name = "nbformat" }, - { name = "traitlets" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/56/91/1c1d5a4b9a9ebba2b4e32b8c852c2975c872aec1fe42ab5e516b2cecd193/nbclient-0.10.4.tar.gz", hash = "sha256:1e54091b16e6da39e297b0ece3e10f6f29f4ac4e8ee515d29f8a7099bd6553c9", size = 62554, upload-time = "2025-12-23T07:45:46.369Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/83/a0/5b0c2f11142ed1dddec842457d3f65eaf71a0080894eb6f018755b319c3a/nbclient-0.10.4-py3-none-any.whl", hash = "sha256:9162df5a7373d70d606527300a95a975a47c137776cd942e52d9c7e29ff83440", size = 25465, upload-time = "2025-12-23T07:45:44.51Z" }, -] - -[[package]] -name = "nbconvert" -version = "7.17.1" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "beautifulsoup4" }, - { name = "bleach", extra = ["css"] }, - { name = "defusedxml" }, - { name = "jinja2" }, - { name = "jupyter-core" }, - { name = "jupyterlab-pygments" }, - { name = "markupsafe" }, - { name = "mistune" }, - { name = "nbclient" }, - { name = "nbformat" }, - { name = "packaging" }, - { name = "pandocfilters" }, - { name = "pygments" }, - { name = "traitlets" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/01/b1/708e53fe2e429c103c6e6e159106bcf0357ac41aa4c28772bd8402339051/nbconvert-7.17.1.tar.gz", hash = "sha256:34d0d0a7e73ce3cbab6c5aae8f4f468797280b01fd8bd2ca746da8569eddd7d2", size = 865311, upload-time = "2026-04-08T00:44:14.914Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/67/f8/bb0a9d5f46819c821dc1f004aa2cc29b1d91453297dbf5ff20470f00f193/nbconvert-7.17.1-py3-none-any.whl", hash = "sha256:aa85c087b435e7bf1ffd03319f658e285f2b89eccab33bc1ba7025495ab3e7c8", size = 261927, upload-time = "2026-04-08T00:44:12.845Z" }, -] - -[[package]] -name = "nbformat" -version = "5.10.4" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "fastjsonschema" }, - { name = "jsonschema" }, - { name = "jupyter-core" }, - { name = "traitlets" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/6d/fd/91545e604bc3dad7dca9ed03284086039b294c6b3d75c0d2fa45f9e9caf3/nbformat-5.10.4.tar.gz", hash = "sha256:322168b14f937a5d11362988ecac2a4952d3d8e3a2cbeb2319584631226d5b3a", size = 142749, upload-time = "2024-04-04T11:20:37.371Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/a9/82/0340caa499416c78e5d8f5f05947ae4bc3cba53c9f038ab6e9ed964e22f1/nbformat-5.10.4-py3-none-any.whl", hash = "sha256:3b48d6c8fbca4b299bf3982ea7db1af21580e4fec269ad087b9e81588891200b", size = 78454, upload-time = "2024-04-04T11:20:34.895Z" }, -] - -[[package]] -name = "nest-asyncio" -version = "1.6.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/83/f8/51569ac65d696c8ecbee95938f89d4abf00f47d58d48f6fbabfe8f0baefe/nest_asyncio-1.6.0.tar.gz", hash = "sha256:6f172d5449aca15afd6c646851f4e31e02c598d553a667e38cafa997cfec55fe", size = 7418, upload-time = "2024-01-21T14:25:19.227Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/a0/c4/c2971a3ba4c6103a3d10c4b0f24f461ddc027f0f09763220cf35ca1401b3/nest_asyncio-1.6.0-py3-none-any.whl", hash = "sha256:87af6efd6b5e897c81050477ef65c62e2b2f35d51703cae01aff2905b1852e1c", size = 5195, upload-time = "2024-01-21T14:25:17.223Z" }, -] - [[package]] name = "networkx" version = "3.6.1" @@ -2106,45 +831,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/17/66/1ed71f1f529b8ca727d42c7ceb9db0bef145ce4a13dfc86fb50aa44f3be6/nodejs_wheel_binaries-24.16.0-py2.py3-none-win_arm64.whl", hash = "sha256:8308940b5edd0a50dc5267ea36ba21c9f668e83fe0d9f293937174d3a7e31c36", size = 39714528, upload-time = "2026-05-30T16:52:06.421Z" }, ] -[[package]] -name = "notebook" -version = "6.5.7" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "argon2-cffi" }, - { name = "ipykernel" }, - { name = "ipython-genutils" }, - { name = "jinja2" }, - { name = "jupyter-client" }, - { name = "jupyter-core" }, - { name = "nbclassic" }, - { name = "nbconvert" }, - { name = "nbformat" }, - { name = "nest-asyncio" }, - { name = "prometheus-client" }, - { name = "pyzmq" }, - { name = "send2trash" }, - { name = "terminado" }, - { name = "tornado" }, - { name = "traitlets" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/05/bc/b025bac523640c13b0c1150466475eac3d79acbf187ef6c1967596c41c43/notebook-6.5.7.tar.gz", hash = "sha256:04eb9011dfac634fbd4442adaf0a8c27cd26beef831fe1d19faf930c327768e4", size = 5786526, upload-time = "2024-05-01T17:42:26.956Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/af/9c/0620631da9d7013e95a8f985043cad229a0d8fb537a7e3f8ff8467565a8c/notebook-6.5.7-py3-none-any.whl", hash = "sha256:a6afa9a4ff4d149a0771ff8b8c881a7a73b3835f9add0606696d6e9d98ac1cd0", size = 529829, upload-time = "2024-05-01T17:42:22.403Z" }, -] - -[[package]] -name = "notebook-shim" -version = "0.2.4" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "jupyter-server" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/54/d2/92fa3243712b9a3e8bafaf60aac366da1cada3639ca767ff4b5b3654ec28/notebook_shim-0.2.4.tar.gz", hash = "sha256:b4b2cfa1b65d98307ca24361f5b30fe785b53c3fd07b7a47e89acb5e6ac638cb", size = 13167, upload-time = "2024-02-14T23:35:18.353Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/f9/33/bd5b9137445ea4b680023eb0469b2bb969d61303dedb2aac6560ff3d14a1/notebook_shim-0.2.4-py3-none-any.whl", hash = "sha256:411a5be4e9dc882a074ccbcae671eda64cceb068767e9a3419096986560e1cef", size = 13307, upload-time = "2024-02-14T23:35:16.286Z" }, -] - [[package]] name = "numpy" version = "2.4.6" @@ -2395,36 +1081,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/0f/54/68a0978d1ef8502b8492099beaa6e7a0c1b32e3b5d4f677f5810cb08711c/pandas-3.0.3-cp314-cp314t-win_arm64.whl", hash = "sha256:b2c95f8bfc1ee412bf482605d7bfd30c12d1d26bd59fdd91efeef1d4718decb1", size = 9466464, upload-time = "2026-05-11T18:54:22.754Z" }, ] -[[package]] -name = "pandocfilters" -version = "1.5.1" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/70/6f/3dd4940bbe001c06a65f88e36bad298bc7a0de5036115639926b0c5c0458/pandocfilters-1.5.1.tar.gz", hash = "sha256:002b4a555ee4ebc03f8b66307e287fa492e4a77b4ea14d3f934328297bb4939e", size = 8454, upload-time = "2024-01-18T20:08:13.726Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/ef/af/4fbc8cab944db5d21b7e2a5b8e9211a03a79852b1157e2c102fcc61ac440/pandocfilters-1.5.1-py2.py3-none-any.whl", hash = "sha256:93be382804a9cdb0a7267585f157e5d1731bbe5545a85b268d6f5fe6232de2bc", size = 8663, upload-time = "2024-01-18T20:08:11.28Z" }, -] - -[[package]] -name = "parso" -version = "0.8.7" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/30/4b/90c937815137d43ce71ba043cd3566221e9df6b9c805f24b5d138c9d40a7/parso-0.8.7.tar.gz", hash = "sha256:eaaac4c9fdd5e9e8852dc778d2d7405897ec510f2a298071453e5e3a07914bb1", size = 401824, upload-time = "2026-05-01T23:13:02.138Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/99/5d/8268b644392ee874ee82a635cd0df1773de230bde356c38de28e298392cc/parso-0.8.7-py2.py3-none-any.whl", hash = "sha256:a8926eb2a1b915486941fdbd31e86a4baf88fe8c210f25f2f35ecec5b574ca1c", size = 107025, upload-time = "2026-05-01T23:12:58.867Z" }, -] - -[[package]] -name = "pexpect" -version = "4.9.0" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "ptyprocess", marker = "sys_platform != 'win32'" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/42/92/cc564bf6381ff43ce1f4d06852fc19a2f11d180f23dc32d9588bee2f149d/pexpect-4.9.0.tar.gz", hash = "sha256:ee7d41123f3c9911050ea2c2dac107568dc43b2d3b0c7557a33212c398ead30f", size = 166450, upload-time = "2023-11-25T09:07:26.339Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/9e/c3/059298687310d527a58bb01f3b1965787ee3b40dce76752eda8b44e9a2c5/pexpect-4.9.0-py2.py3-none-any.whl", hash = "sha256:7236d1e080e4936be2dc3e326cec0af72acf9212a7e1d060210e70a47e253523", size = 63772, upload-time = "2023-11-25T06:56:14.81Z" }, -] - [[package]] name = "pillow" version = "12.2.0" @@ -2444,42 +1100,18 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/5f/f7/769d5632ffb0988f1c5e7660b3e731e30f7f8ec4318e94d0a5d674eb65a4/pillow-12.2.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:deede7c263feb25dba4e82ea23058a235dcc2fe1f6021025dc71f2b618e26104", size = 7209321, upload-time = "2026-04-01T14:45:15.122Z" }, { url = "https://files.pythonhosted.org/packages/6a/7a/c253e3c645cd47f1aceea6a8bacdba9991bf45bb7dfe927f7c893e89c93c/pillow-12.2.0-cp314-cp314-win32.whl", hash = "sha256:632ff19b2778e43162304d50da0181ce24ac5bb8180122cbe1bf4673428328c7", size = 6479723, upload-time = "2026-04-01T14:45:17.797Z" }, { url = "https://files.pythonhosted.org/packages/cd/8b/601e6566b957ca50e28725cb6c355c59c2c8609751efbecd980db44e0349/pillow-12.2.0-cp314-cp314-win_amd64.whl", hash = "sha256:4e6c62e9d237e9b65fac06857d511e90d8461a32adcc1b9065ea0c0fa3a28150", size = 7217400, upload-time = "2026-04-01T14:45:20.529Z" }, - { url = "https://files.pythonhosted.org/packages/d6/94/220e46c73065c3e2951bb91c11a1fb636c8c9ad427ac3ce7d7f3359b9b2f/pillow-12.2.0-cp314-cp314-win_arm64.whl", hash = "sha256:b1c1fbd8a5a1af3412a0810d060a78b5136ec0836c8a4ef9aa11807f2a22f4e1", size = 2554835, upload-time = "2026-04-01T14:45:23.162Z" }, - { url = "https://files.pythonhosted.org/packages/b6/ab/1b426a3974cb0e7da5c29ccff4807871d48110933a57207b5a676cccc155/pillow-12.2.0-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:57850958fe9c751670e49b2cecf6294acc99e562531f4bd317fa5ddee2068463", size = 5314225, upload-time = "2026-04-01T14:45:25.637Z" }, - { url = "https://files.pythonhosted.org/packages/19/1e/dce46f371be2438eecfee2a1960ee2a243bbe5e961890146d2dee1ff0f12/pillow-12.2.0-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:d5d38f1411c0ed9f97bcb49b7bd59b6b7c314e0e27420e34d99d844b9ce3b6f3", size = 4698541, upload-time = "2026-04-01T14:45:28.355Z" }, - { url = "https://files.pythonhosted.org/packages/55/c3/7fbecf70adb3a0c33b77a300dc52e424dc22ad8cdc06557a2e49523b703d/pillow-12.2.0-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:5c0a9f29ca8e79f09de89293f82fc9b0270bb4af1d58bc98f540cc4aedf03166", size = 6322251, upload-time = "2026-04-01T14:45:30.924Z" }, - { url = "https://files.pythonhosted.org/packages/1c/3c/7fbc17cfb7e4fe0ef1642e0abc17fc6c94c9f7a16be41498e12e2ba60408/pillow-12.2.0-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:1610dd6c61621ae1cf811bef44d77e149ce3f7b95afe66a4512f8c59f25d9ebe", size = 8127807, upload-time = "2026-04-01T14:45:33.908Z" }, - { url = "https://files.pythonhosted.org/packages/ff/c3/a8ae14d6defd2e448493ff512fae903b1e9bd40b72efb6ec55ce0048c8ce/pillow-12.2.0-cp314-cp314t-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:0a34329707af4f73cf1782a36cd2289c0368880654a2c11f027bcee9052d35dd", size = 6433935, upload-time = "2026-04-01T14:45:36.623Z" }, - { url = "https://files.pythonhosted.org/packages/6e/32/2880fb3a074847ac159d8f902cb43278a61e85f681661e7419e6596803ed/pillow-12.2.0-cp314-cp314t-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:8e9c4f5b3c546fa3458a29ab22646c1c6c787ea8f5ef51300e5a60300736905e", size = 7116720, upload-time = "2026-04-01T14:45:39.258Z" }, - { url = "https://files.pythonhosted.org/packages/46/87/495cc9c30e0129501643f24d320076f4cc54f718341df18cc70ec94c44e1/pillow-12.2.0-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:fb043ee2f06b41473269765c2feae53fc2e2fbf96e5e22ca94fb5ad677856f06", size = 6540498, upload-time = "2026-04-01T14:45:41.879Z" }, - { url = "https://files.pythonhosted.org/packages/18/53/773f5edca692009d883a72211b60fdaf8871cbef075eaa9d577f0a2f989e/pillow-12.2.0-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:f278f034eb75b4e8a13a54a876cc4a5ab39173d2cdd93a638e1b467fc545ac43", size = 7239413, upload-time = "2026-04-01T14:45:44.705Z" }, - { url = "https://files.pythonhosted.org/packages/c9/e4/4b64a97d71b2a83158134abbb2f5bd3f8a2ea691361282f010998f339ec7/pillow-12.2.0-cp314-cp314t-win32.whl", hash = "sha256:6bb77b2dcb06b20f9f4b4a8454caa581cd4dd0643a08bacf821216a16d9c8354", size = 6482084, upload-time = "2026-04-01T14:45:47.568Z" }, - { url = "https://files.pythonhosted.org/packages/ba/13/306d275efd3a3453f72114b7431c877d10b1154014c1ebbedd067770d629/pillow-12.2.0-cp314-cp314t-win_amd64.whl", hash = "sha256:6562ace0d3fb5f20ed7290f1f929cae41b25ae29528f2af1722966a0a02e2aa1", size = 7225152, upload-time = "2026-04-01T14:45:50.032Z" }, - { url = "https://files.pythonhosted.org/packages/ff/6e/cf826fae916b8658848d7b9f38d88da6396895c676e8086fc0988073aaf8/pillow-12.2.0-cp314-cp314t-win_arm64.whl", hash = "sha256:aa88ccfe4e32d362816319ed727a004423aab09c5cea43c01a4b435643fa34eb", size = 2556579, upload-time = "2026-04-01T14:45:52.529Z" }, -] - -[[package]] -name = "pint" -version = "0.25.3" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "flexcache" }, - { name = "flexparser" }, - { name = "platformdirs" }, - { name = "typing-extensions" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/52/9d/b1379cdbd33a49d17d627bc24e2b63cca06a1c5343b38072d2889499e82e/pint-0.25.3.tar.gz", hash = "sha256:f8f5df6cf65314d74da1ade1bf96f8e3e4d0c41b51577ac53c49e7d44ca5acee", size = 255106, upload-time = "2026-03-19T21:57:08.72Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/1b/dd/a9fe6a0a09512da23951c68bf36466aeecd89def3183dc095edbc807ddc5/pint-0.25.3-py3-none-any.whl", hash = "sha256:27eb25143bd5de9fcc4d5a4b484f16faf6b4615aa93ece6b3373a8c1a3c1b97d", size = 307488, upload-time = "2026-03-19T21:57:07.022Z" }, -] - -[[package]] -name = "platformdirs" -version = "4.10.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/d7/47/e4501f49c178ae1d9f4a75073fda4204f52647993f075a9db4d14930e0c5/platformdirs-4.10.0.tar.gz", hash = "sha256:31e761a6a0ca04faf7353ea759bdba55652be214725111e5aac52dfa29d4bef7", size = 31224, upload-time = "2026-05-28T03:32:53.587Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/81/e6/cd9575ac904136b3cbf7aa7ee819ef86eedb7274e46f230e94ea4342e729/platformdirs-4.10.0-py3-none-any.whl", hash = "sha256:fb516cdb12eb0d857d0cd85a7c57cea4d060bee4578d6cf5a14dfdf8cbf8784a", size = 22743, upload-time = "2026-05-28T03:32:52.175Z" }, + { url = "https://files.pythonhosted.org/packages/d6/94/220e46c73065c3e2951bb91c11a1fb636c8c9ad427ac3ce7d7f3359b9b2f/pillow-12.2.0-cp314-cp314-win_arm64.whl", hash = "sha256:b1c1fbd8a5a1af3412a0810d060a78b5136ec0836c8a4ef9aa11807f2a22f4e1", size = 2554835, upload-time = "2026-04-01T14:45:23.162Z" }, + { url = "https://files.pythonhosted.org/packages/b6/ab/1b426a3974cb0e7da5c29ccff4807871d48110933a57207b5a676cccc155/pillow-12.2.0-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:57850958fe9c751670e49b2cecf6294acc99e562531f4bd317fa5ddee2068463", size = 5314225, upload-time = "2026-04-01T14:45:25.637Z" }, + { url = "https://files.pythonhosted.org/packages/19/1e/dce46f371be2438eecfee2a1960ee2a243bbe5e961890146d2dee1ff0f12/pillow-12.2.0-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:d5d38f1411c0ed9f97bcb49b7bd59b6b7c314e0e27420e34d99d844b9ce3b6f3", size = 4698541, upload-time = "2026-04-01T14:45:28.355Z" }, + { url = "https://files.pythonhosted.org/packages/55/c3/7fbecf70adb3a0c33b77a300dc52e424dc22ad8cdc06557a2e49523b703d/pillow-12.2.0-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:5c0a9f29ca8e79f09de89293f82fc9b0270bb4af1d58bc98f540cc4aedf03166", size = 6322251, upload-time = "2026-04-01T14:45:30.924Z" }, + { url = "https://files.pythonhosted.org/packages/1c/3c/7fbc17cfb7e4fe0ef1642e0abc17fc6c94c9f7a16be41498e12e2ba60408/pillow-12.2.0-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:1610dd6c61621ae1cf811bef44d77e149ce3f7b95afe66a4512f8c59f25d9ebe", size = 8127807, upload-time = "2026-04-01T14:45:33.908Z" }, + { url = "https://files.pythonhosted.org/packages/ff/c3/a8ae14d6defd2e448493ff512fae903b1e9bd40b72efb6ec55ce0048c8ce/pillow-12.2.0-cp314-cp314t-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:0a34329707af4f73cf1782a36cd2289c0368880654a2c11f027bcee9052d35dd", size = 6433935, upload-time = "2026-04-01T14:45:36.623Z" }, + { url = "https://files.pythonhosted.org/packages/6e/32/2880fb3a074847ac159d8f902cb43278a61e85f681661e7419e6596803ed/pillow-12.2.0-cp314-cp314t-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:8e9c4f5b3c546fa3458a29ab22646c1c6c787ea8f5ef51300e5a60300736905e", size = 7116720, upload-time = "2026-04-01T14:45:39.258Z" }, + { url = "https://files.pythonhosted.org/packages/46/87/495cc9c30e0129501643f24d320076f4cc54f718341df18cc70ec94c44e1/pillow-12.2.0-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:fb043ee2f06b41473269765c2feae53fc2e2fbf96e5e22ca94fb5ad677856f06", size = 6540498, upload-time = "2026-04-01T14:45:41.879Z" }, + { url = "https://files.pythonhosted.org/packages/18/53/773f5edca692009d883a72211b60fdaf8871cbef075eaa9d577f0a2f989e/pillow-12.2.0-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:f278f034eb75b4e8a13a54a876cc4a5ab39173d2cdd93a638e1b467fc545ac43", size = 7239413, upload-time = "2026-04-01T14:45:44.705Z" }, + { url = "https://files.pythonhosted.org/packages/c9/e4/4b64a97d71b2a83158134abbb2f5bd3f8a2ea691361282f010998f339ec7/pillow-12.2.0-cp314-cp314t-win32.whl", hash = "sha256:6bb77b2dcb06b20f9f4b4a8454caa581cd4dd0643a08bacf821216a16d9c8354", size = 6482084, upload-time = "2026-04-01T14:45:47.568Z" }, + { url = "https://files.pythonhosted.org/packages/ba/13/306d275efd3a3453f72114b7431c877d10b1154014c1ebbedd067770d629/pillow-12.2.0-cp314-cp314t-win_amd64.whl", hash = "sha256:6562ace0d3fb5f20ed7290f1f929cae41b25ae29528f2af1722966a0a02e2aa1", size = 7225152, upload-time = "2026-04-01T14:45:50.032Z" }, + { url = "https://files.pythonhosted.org/packages/ff/6e/cf826fae916b8658848d7b9f38d88da6396895c676e8086fc0988073aaf8/pillow-12.2.0-cp314-cp314t-win_arm64.whl", hash = "sha256:aa88ccfe4e32d362816319ed727a004423aab09c5cea43c01a4b435643fa34eb", size = 2556579, upload-time = "2026-04-01T14:45:52.529Z" }, ] [[package]] @@ -2504,27 +1136,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/54/20/4d324d65cc6d9205fabedc306948156824eb9f0ee1633355a8f7ec5c66bf/pluggy-1.6.0-py3-none-any.whl", hash = "sha256:e920276dd6813095e9377c0bc5566d94c932c33b27a3e3945d8389c374dd4746", size = 20538, upload-time = "2025-05-15T12:30:06.134Z" }, ] -[[package]] -name = "prometheus-client" -version = "0.25.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/1b/fb/d9aa83ffe43ce1f19e557c0971d04b90561b0cfd50762aafb01968285553/prometheus_client-0.25.0.tar.gz", hash = "sha256:5e373b75c31afb3c86f1a52fa1ad470c9aace18082d39ec0d2f918d11cc9ba28", size = 86035, upload-time = "2026-04-09T19:53:42.359Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/8d/9b/d4b1e644385499c8346fa9b622a3f030dce14cd6ef8a1871c221a17a67e7/prometheus_client-0.25.0-py3-none-any.whl", hash = "sha256:d5aec89e349a6ec230805d0df882f3807f74fd6c1a2fa86864e3c2279059fed1", size = 64154, upload-time = "2026-04-09T19:53:41.324Z" }, -] - -[[package]] -name = "prompt-toolkit" -version = "3.0.52" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "wcwidth" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/a1/96/06e01a7b38dce6fe1db213e061a4602dd6032a8a97ef6c1a862537732421/prompt_toolkit-3.0.52.tar.gz", hash = "sha256:28cde192929c8e7321de85de1ddbe736f1375148b02f2e17edd840042b1be855", size = 434198, upload-time = "2025-08-27T15:24:02.057Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/84/03/0d3ce49e2505ae70cf43bc5bb3033955d2fc9f932163e84dc0779cc47f48/prompt_toolkit-3.0.52-py3-none-any.whl", hash = "sha256:9aac639a3bbd33284347de5ad8d68ecc044b91a762dc39b7c21095fcd6a19955", size = 391431, upload-time = "2025-08-27T15:23:59.498Z" }, -] - [[package]] name = "protobuf" version = "6.33.6" @@ -2540,74 +1151,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/c4/72/02445137af02769918a93807b2b7890047c32bfb9f90371cbc12688819eb/protobuf-6.33.6-py3-none-any.whl", hash = "sha256:77179e006c476e69bf8e8ce866640091ec42e1beb80b213c3900006ecfba6901", size = 170656, upload-time = "2026-03-18T19:04:59.826Z" }, ] -[[package]] -name = "psutil" -version = "7.2.2" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/aa/c6/d1ddf4abb55e93cebc4f2ed8b5d6dbad109ecb8d63748dd2b20ab5e57ebe/psutil-7.2.2.tar.gz", hash = "sha256:0746f5f8d406af344fd547f1c8daa5f5c33dbc293bb8d6a16d80b4bb88f59372", size = 493740, upload-time = "2026-01-28T18:14:54.428Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/81/69/ef179ab5ca24f32acc1dac0c247fd6a13b501fd5534dbae0e05a1c48b66d/psutil-7.2.2-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:eed63d3b4d62449571547b60578c5b2c4bcccc5387148db46e0c2313dad0ee00", size = 130664, upload-time = "2026-01-28T18:15:09.469Z" }, - { url = "https://files.pythonhosted.org/packages/7b/64/665248b557a236d3fa9efc378d60d95ef56dd0a490c2cd37dafc7660d4a9/psutil-7.2.2-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:7b6d09433a10592ce39b13d7be5a54fbac1d1228ed29abc880fb23df7cb694c9", size = 131087, upload-time = "2026-01-28T18:15:11.724Z" }, - { url = "https://files.pythonhosted.org/packages/d5/2e/e6782744700d6759ebce3043dcfa661fb61e2fb752b91cdeae9af12c2178/psutil-7.2.2-cp314-cp314t-manylinux2010_x86_64.manylinux_2_12_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:1fa4ecf83bcdf6e6c8f4449aff98eefb5d0604bf88cb883d7da3d8d2d909546a", size = 182383, upload-time = "2026-01-28T18:15:13.445Z" }, - { url = "https://files.pythonhosted.org/packages/57/49/0a41cefd10cb7505cdc04dab3eacf24c0c2cb158a998b8c7b1d27ee2c1f5/psutil-7.2.2-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:e452c464a02e7dc7822a05d25db4cde564444a67e58539a00f929c51eddda0cf", size = 185210, upload-time = "2026-01-28T18:15:16.002Z" }, - { url = "https://files.pythonhosted.org/packages/dd/2c/ff9bfb544f283ba5f83ba725a3c5fec6d6b10b8f27ac1dc641c473dc390d/psutil-7.2.2-cp314-cp314t-win_amd64.whl", hash = "sha256:c7663d4e37f13e884d13994247449e9f8f574bc4655d509c3b95e9ec9e2b9dc1", size = 141228, upload-time = "2026-01-28T18:15:18.385Z" }, - { url = "https://files.pythonhosted.org/packages/f2/fc/f8d9c31db14fcec13748d373e668bc3bed94d9077dbc17fb0eebc073233c/psutil-7.2.2-cp314-cp314t-win_arm64.whl", hash = "sha256:11fe5a4f613759764e79c65cf11ebdf26e33d6dd34336f8a337aa2996d71c841", size = 136284, upload-time = "2026-01-28T18:15:19.912Z" }, - { url = "https://files.pythonhosted.org/packages/e7/36/5ee6e05c9bd427237b11b3937ad82bb8ad2752d72c6969314590dd0c2f6e/psutil-7.2.2-cp36-abi3-macosx_10_9_x86_64.whl", hash = "sha256:ed0cace939114f62738d808fdcecd4c869222507e266e574799e9c0faa17d486", size = 129090, upload-time = "2026-01-28T18:15:22.168Z" }, - { url = "https://files.pythonhosted.org/packages/80/c4/f5af4c1ca8c1eeb2e92ccca14ce8effdeec651d5ab6053c589b074eda6e1/psutil-7.2.2-cp36-abi3-macosx_11_0_arm64.whl", hash = "sha256:1a7b04c10f32cc88ab39cbf606e117fd74721c831c98a27dc04578deb0c16979", size = 129859, upload-time = "2026-01-28T18:15:23.795Z" }, - { url = "https://files.pythonhosted.org/packages/b5/70/5d8df3b09e25bce090399cf48e452d25c935ab72dad19406c77f4e828045/psutil-7.2.2-cp36-abi3-manylinux2010_x86_64.manylinux_2_12_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:076a2d2f923fd4821644f5ba89f059523da90dc9014e85f8e45a5774ca5bc6f9", size = 155560, upload-time = "2026-01-28T18:15:25.976Z" }, - { url = "https://files.pythonhosted.org/packages/63/65/37648c0c158dc222aba51c089eb3bdfa238e621674dc42d48706e639204f/psutil-7.2.2-cp36-abi3-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:b0726cecd84f9474419d67252add4ac0cd9811b04d61123054b9fb6f57df6e9e", size = 156997, upload-time = "2026-01-28T18:15:27.794Z" }, - { url = "https://files.pythonhosted.org/packages/8e/13/125093eadae863ce03c6ffdbae9929430d116a246ef69866dad94da3bfbc/psutil-7.2.2-cp36-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:fd04ef36b4a6d599bbdb225dd1d3f51e00105f6d48a28f006da7f9822f2606d8", size = 148972, upload-time = "2026-01-28T18:15:29.342Z" }, - { url = "https://files.pythonhosted.org/packages/04/78/0acd37ca84ce3ddffaa92ef0f571e073faa6d8ff1f0559ab1272188ea2be/psutil-7.2.2-cp36-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:b58fabe35e80b264a4e3bb23e6b96f9e45a3df7fb7eed419ac0e5947c61e47cc", size = 148266, upload-time = "2026-01-28T18:15:31.597Z" }, - { url = "https://files.pythonhosted.org/packages/b4/90/e2159492b5426be0c1fef7acba807a03511f97c5f86b3caeda6ad92351a7/psutil-7.2.2-cp37-abi3-win_amd64.whl", hash = "sha256:eb7e81434c8d223ec4a219b5fc1c47d0417b12be7ea866e24fb5ad6e84b3d988", size = 137737, upload-time = "2026-01-28T18:15:33.849Z" }, - { url = "https://files.pythonhosted.org/packages/8c/c7/7bb2e321574b10df20cbde462a94e2b71d05f9bbda251ef27d104668306a/psutil-7.2.2-cp37-abi3-win_arm64.whl", hash = "sha256:8c233660f575a5a89e6d4cb65d9f938126312bca76d8fe087b947b3a1aaac9ee", size = 134617, upload-time = "2026-01-28T18:15:36.514Z" }, -] - -[[package]] -name = "psycopg2-binary" -version = "2.9.12" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/2a/60/a3624f79acea344c16fbef3a94d28b89a8042ddfb8f3e4ca83f538671409/psycopg2_binary-2.9.12.tar.gz", hash = "sha256:5ac9444edc768c02a6b6a591f070b8aae28ff3a99be57560ac996001580f294c", size = 379686, upload-time = "2026-04-21T09:40:34.304Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/13/1b/708c0dca874acfad6d65314271859899a79007686f3a1f74e82a2ed4b645/psycopg2_binary-2.9.12-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:6f3b3de8a74ef8db215f22edffb19e32dc6fa41340456de7ec99efdc8a7b3ec2", size = 3712428, upload-time = "2026-04-20T23:35:23.453Z" }, - { url = "https://files.pythonhosted.org/packages/d6/39/ddbea9d4b4de6aca9431b6ed253f530f8a02d3b8f9bcfd0dbfe2b3de6fe4/psycopg2_binary-2.9.12-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:1006fb62f0f0bc5ce256a832356c6262e91be43f5e4eb15b5eaf38079464caf2", size = 3823184, upload-time = "2026-04-20T23:35:25.92Z" }, - { url = "https://files.pythonhosted.org/packages/bf/a0/bc2fef74b106fa345567122a0659e6d94512ed7dc0131ec44c9e5aba3725/psycopg2_binary-2.9.12-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:840066105706cd2eb29b9a1c2329620056582a4bf3e8169dec5c447042d0869f", size = 4579157, upload-time = "2026-04-20T23:35:28.542Z" }, - { url = "https://files.pythonhosted.org/packages/57/d7/d4e3b2005d3de607ca4fbb0e8742e248056e52184a6b94ebda3c1c2c329b/psycopg2_binary-2.9.12-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:863f5d12241ebe1c76a72a04c2113b6dc905f90b9cef0e9be0efd994affd9354", size = 4274970, upload-time = "2026-04-20T23:35:30.418Z" }, - { url = "https://files.pythonhosted.org/packages/2e/42/c9853f8db3967fe08bcde11f53d53b85d351750cae726ce001cb68afa9c1/psycopg2_binary-2.9.12-cp314-cp314-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:a99eaab34a9010f1a086b126de467466620a750634d114d20455f3a824aae033", size = 5895175, upload-time = "2026-04-20T23:35:33.584Z" }, - { url = "https://files.pythonhosted.org/packages/eb/fd/b82b5601a97630308bef079f545ffec481bbbc795c2ba5ec416a01d03f60/psycopg2_binary-2.9.12-cp314-cp314-manylinux_2_38_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:ffdd7dc5463ccd61845ac37b7012d0f35a1548df9febe14f8dd549be4a0bc81e", size = 4110658, upload-time = "2026-04-20T23:35:35.638Z" }, - { url = "https://files.pythonhosted.org/packages/62/8c/32ca69b0389ef25dd22937bf9e8fbe2ce27aea20b05ded48c4ce4cb42475/psycopg2_binary-2.9.12-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:54a0dfecab1b48731f934e06139dfe11e24219fb6d0ceb32177cf0375f14c7b5", size = 3656251, upload-time = "2026-04-20T23:35:37.854Z" }, - { url = "https://files.pythonhosted.org/packages/c4/29/96992a2b59e3b9d730fcf9612d0a387305025dc867a9fc490a9e496e074e/psycopg2_binary-2.9.12-cp314-cp314-musllinux_1_2_ppc64le.whl", hash = "sha256:96937c9c5d891f772430f418a7a8b4691a90c3e6b93cf72b5bd7cad8cbca32a5", size = 3301810, upload-time = "2026-04-20T23:35:39.927Z" }, - { url = "https://files.pythonhosted.org/packages/56/ad/44b06659949b243ae10112cd3b20a197f9bf3e81d5651379b9eb889bfaad/psycopg2_binary-2.9.12-cp314-cp314-musllinux_1_2_riscv64.whl", hash = "sha256:77b348775efd4cdab410ec6609d81ccecd1139c90265fa583a7255c8064bc03d", size = 3048977, upload-time = "2026-04-20T23:35:41.806Z" }, - { url = "https://files.pythonhosted.org/packages/1d/f2/10a1bcebadb6aa55e280e1f58975c36a7b560ea525184c7aa4064c466633/psycopg2_binary-2.9.12-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:527e6342b3e44c2f0544f6b8e927d60de7f163f5723b8f1dfa7d2a84298738cd", size = 3351466, upload-time = "2026-04-20T23:35:43.993Z" }, - { url = "https://files.pythonhosted.org/packages/20/be/b732c8418ffa5bcfda002890f5dc4c869fc17db66ff11f53b17cfe44afc0/psycopg2_binary-2.9.12-cp314-cp314-win_amd64.whl", hash = "sha256:f12ae41fcafadb39b2785e64a40f9db05d6de2ac114077457e0e7c597f3af980", size = 2848762, upload-time = "2026-04-20T23:35:46.421Z" }, -] - -[[package]] -name = "ptyprocess" -version = "0.7.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/20/e5/16ff212c1e452235a90aeb09066144d0c5a6a8c0834397e03f5224495c4e/ptyprocess-0.7.0.tar.gz", hash = "sha256:5c5d0a3b48ceee0b48485e0c26037c0acd7d29765ca3fbb5cb3831d347423220", size = 70762, upload-time = "2020-12-28T15:15:30.155Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/22/a6/858897256d0deac81a172289110f31629fc4cee19b6f01283303e18c8db3/ptyprocess-0.7.0-py2.py3-none-any.whl", hash = "sha256:4b41f3967fce3af57cc7e94b888626c18bf37a083e3651ca8feeb66d492fef35", size = 13993, upload-time = "2020-12-28T15:15:28.35Z" }, -] - -[[package]] -name = "pure-eval" -version = "0.2.3" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/cd/05/0a34433a064256a578f1783a10da6df098ceaa4a57bbeaa96a6c0352786b/pure_eval-0.2.3.tar.gz", hash = "sha256:5f4e983f40564c576c7c8635ae88db5956bb2229d7e9237d03b3c0b0190eaf42", size = 19752, upload-time = "2024-07-21T12:58:21.801Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/8e/37/efad0257dc6e593a18957422533ff0f87ede7c9c6ea010a2177d738fb82f/pure_eval-0.2.3-py3-none-any.whl", hash = "sha256:1db8e35b67b3d218d818ae653e27f06c3aa420901fa7b081ca98cbedc874e0d0", size = 11842, upload-time = "2024-07-21T12:58:20.04Z" }, -] - -[[package]] -name = "pycparser" -version = "3.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/1b/7d/92392ff7815c21062bea51aa7b87d45576f649f16458d78b7cf94b9ab2e6/pycparser-3.0.tar.gz", hash = "sha256:600f49d217304a5902ac3c37e1281c9fe94e4d0489de643a9504c5cdfdfc6b29", size = 103492, upload-time = "2026-01-21T14:26:51.89Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/0c/c3/44f3fbbfa403ea2a7c779186dc20772604442dde72947e7d01069cbe98e3/pycparser-3.0-py3-none-any.whl", hash = "sha256:b727414169a36b7d524c1c3e31839a521725078d7b2ff038656844266160a992", size = 48172, upload-time = "2026-01-21T14:26:50.693Z" }, -] - [[package]] name = "pydantic" version = "2.13.4" @@ -2790,18 +1333,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/dc/cb/d9780b66939c4fc1f024bcc7be23a2abcfe06a9745ca8fa76dc73395482e/pymongo-4.17.0-cp314-cp314t-win_arm64.whl", hash = "sha256:9543d8f84c2e5608565c08ac679774811e6730770d8a645439b073422a4276fb", size = 1058526, upload-time = "2026-04-20T16:39:27.924Z" }, ] -[[package]] -name = "pyopenssl" -version = "26.2.0" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "cryptography" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/1a/51/27a5ad5f939d08f690a326ef9582cda7140555180db71695f6fb747d6a36/pyopenssl-26.2.0.tar.gz", hash = "sha256:8c6fcecd1183a7fc897548dfe388b0cdb7f37e018200d8409cf33959dbe35387", size = 182195, upload-time = "2026-05-04T23:06:09.72Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/73/b8/a0e2790ae249d6f38c9f66de7a211621a7ab2650217bcd04e1262f578a56/pyopenssl-26.2.0-py3-none-any.whl", hash = "sha256:4f9d971bc5298b8bc1fab282803da04bf000c755d4ad9d99b52de2569ca19a70", size = 55823, upload-time = "2026-05-04T23:06:08.395Z" }, -] - [[package]] name = "pyparsing" version = "3.3.2" @@ -2873,24 +1404,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/0b/d7/1959b9648791274998a9c3526f6d0ec8fd2233e4d4acce81bbae76b44b2a/python_dotenv-1.2.2-py3-none-any.whl", hash = "sha256:1d8214789a24de455a8b8bd8ae6fe3c6b69a5e3d64aa8a8e5d68e694bbcb285a", size = 22101, upload-time = "2026-03-01T16:00:25.09Z" }, ] -[[package]] -name = "python-json-logger" -version = "4.1.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/f7/ff/3cc9165fd44106973cd7ac9facb674a65ed853494592541d339bdc9a30eb/python_json_logger-4.1.0.tar.gz", hash = "sha256:b396b9e3ed782b09ff9d6e4f1683d46c83ad0d35d2e407c09a9ebbf038f88195", size = 17573, upload-time = "2026-03-29T04:39:56.805Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/27/be/0631a861af4d1c875f096c07d34e9a63639560a717130e7a87cbc82b7e3f/python_json_logger-4.1.0-py3-none-any.whl", hash = "sha256:132994765cf75bf44554be9aa49b06ef2345d23661a96720262716438141b6b2", size = 15021, upload-time = "2026-03-29T04:39:55.266Z" }, -] - -[[package]] -name = "python-mimeparse" -version = "2.0.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/cd/85/c40f2e0b2128905f6c34894be01803c114f2b2efab0e8b4c3dca5e56b999/python_mimeparse-2.0.0.tar.gz", hash = "sha256:5b9a9dcf7aa82465e31bd667f5cb7000604811dce83554f1c8a43693a32cb303", size = 7162, upload-time = "2024-08-25T13:38:14.966Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/65/d9/1093a9d6d22d04d433003c96b9b1d46741b43fee5b11ece5098297737fce/python_mimeparse-2.0.0-py3-none-any.whl", hash = "sha256:574062a06f2e1d416535c8d3b83ccc6ebe95941e74e2c5939fc010a12e37cc09", size = 5576, upload-time = "2024-08-25T13:38:13.372Z" }, -] - [[package]] name = "python-multipart" version = "0.0.30" @@ -2900,39 +1413,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/1c/fd/0318007beb234790993d3ec5afd051d1dbceb733e81e3afe2b981ece3f37/python_multipart-0.0.30-py3-none-any.whl", hash = "sha256:830964def8c90607ac5daa00514e3987815865713ade8d20febc9177ac0c3c5b", size = 29730, upload-time = "2026-05-31T19:24:53.814Z" }, ] -[[package]] -name = "python-snappy" -version = "0.7.3" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "cramjam" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/39/66/9185fbb6605ba92716d9f77fbb13c97eb671cd13c3ad56bd154016fbf08b/python_snappy-0.7.3.tar.gz", hash = "sha256:40216c1badfb2d38ac781ecb162a1d0ec40f8ee9747e610bcfefdfa79486cee3", size = 9337, upload-time = "2024-08-29T13:16:05.705Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/86/c1/0ee413ddd639aebf22c85d6db39f136ccc10e6a4b4dd275a92b5c839de8d/python_snappy-0.7.3-py3-none-any.whl", hash = "sha256:074c0636cfcd97e7251330f428064050ac81a52c62ed884fc2ddebbb60ed7f50", size = 9155, upload-time = "2024-08-29T13:16:04.773Z" }, -] - -[[package]] -name = "pytz" -version = "2026.2" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/ff/46/dd499ec9038423421951e4fad73051febaa13d2df82b4064f87af8b8c0c3/pytz-2026.2.tar.gz", hash = "sha256:0e60b47b29f21574376f218fe21abc009894a2321ea16c6754f3cad6eb7cdd6a", size = 320861, upload-time = "2026-05-04T01:35:29.667Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/ec/dd/96da98f892250475bdf2328112d7468abdd4acc7b902b6af23f4ed958ea0/pytz-2026.2-py2.py3-none-any.whl", hash = "sha256:04156e608bee23d3792fd45c94ae47fae1036688e75032eea2e3bf0323d1f126", size = 510141, upload-time = "2026-05-04T01:35:27.408Z" }, -] - -[[package]] -name = "pywinpty" -version = "3.0.3" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/f7/54/37c7370ba91f579235049dc26cd2c5e657d2a943e01820844ffc81f32176/pywinpty-3.0.3.tar.gz", hash = "sha256:523441dc34d231fb361b4b00f8c99d3f16de02f5005fd544a0183112bcc22412", size = 31309, upload-time = "2026-02-04T21:51:09.524Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/28/88/2ff917caff61e55f38bcdb27de06ee30597881b2cae44fbba7627be015c4/pywinpty-3.0.3-cp314-cp314-win_amd64.whl", hash = "sha256:d4b6b7b0fe0cdcd02e956bd57cfe9f4e5a06514eecf3b5ae174da4f951b58be9", size = 2113282, upload-time = "2026-02-04T21:52:08.188Z" }, - { url = "https://files.pythonhosted.org/packages/63/32/40a775343ace542cc43ece3f1d1fce454021521ecac41c4c4573081c2336/pywinpty-3.0.3-cp314-cp314-win_arm64.whl", hash = "sha256:34789d685fc0d547ce0c8a65e5a70e56f77d732fa6e03c8f74fefb8cbb252019", size = 234207, upload-time = "2026-02-04T21:51:58.687Z" }, - { url = "https://files.pythonhosted.org/packages/8d/54/5d5e52f4cb75028104ca6faf36c10f9692389b1986d34471663b4ebebd6d/pywinpty-3.0.3-cp314-cp314t-win_amd64.whl", hash = "sha256:0c37e224a47a971d1a6e08649a1714dac4f63c11920780977829ed5c8cadead1", size = 2112910, upload-time = "2026-02-04T21:52:30.976Z" }, - { url = "https://files.pythonhosted.org/packages/0a/44/dcd184824e21d4620b06c7db9fbb15c3ad0a0f1fa2e6de79969fb82647ec/pywinpty-3.0.3-cp314-cp314t-win_arm64.whl", hash = "sha256:c4e9c3dff7d86ba81937438d5819f19f385a39d8f592d4e8af67148ceb4f6ab5", size = 233425, upload-time = "2026-02-04T21:51:56.754Z" }, -] - [[package]] name = "pyyaml" version = "6.0.3" @@ -2959,99 +1439,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/f1/12/de94a39c2ef588c7e6455cfbe7343d3b2dc9d6b6b2f40c4c6565744c873d/pyyaml-6.0.3-cp314-cp314t-win_arm64.whl", hash = "sha256:ebc55a14a21cb14062aa4162f906cd962b28e2e9ea38f9b4391244cd8de4ae0b", size = 149341, upload-time = "2025-09-25T21:32:56.828Z" }, ] -[[package]] -name = "pyzmq" -version = "27.1.0" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "cffi", marker = "implementation_name == 'pypy'" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/04/0b/3c9baedbdf613ecaa7aa07027780b8867f57b6293b6ee50de316c9f3222b/pyzmq-27.1.0.tar.gz", hash = "sha256:ac0765e3d44455adb6ddbf4417dcce460fc40a05978c08efdf2948072f6db540", size = 281750, upload-time = "2025-09-08T23:10:18.157Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/92/e7/038aab64a946d535901103da16b953c8c9cc9c961dadcbf3609ed6428d23/pyzmq-27.1.0-cp312-abi3-macosx_10_15_universal2.whl", hash = "sha256:452631b640340c928fa343801b0d07eb0c3789a5ffa843f6e1a9cee0ba4eb4fc", size = 1306279, upload-time = "2025-09-08T23:08:03.807Z" }, - { url = "https://files.pythonhosted.org/packages/e8/5e/c3c49fdd0f535ef45eefcc16934648e9e59dace4a37ee88fc53f6cd8e641/pyzmq-27.1.0-cp312-abi3-manylinux2014_i686.manylinux_2_17_i686.whl", hash = "sha256:1c179799b118e554b66da67d88ed66cd37a169f1f23b5d9f0a231b4e8d44a113", size = 895645, upload-time = "2025-09-08T23:08:05.301Z" }, - { url = "https://files.pythonhosted.org/packages/f8/e5/b0b2504cb4e903a74dcf1ebae157f9e20ebb6ea76095f6cfffea28c42ecd/pyzmq-27.1.0-cp312-abi3-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:3837439b7f99e60312f0c926a6ad437b067356dc2bc2ec96eb395fd0fe804233", size = 652574, upload-time = "2025-09-08T23:08:06.828Z" }, - { url = "https://files.pythonhosted.org/packages/f8/9b/c108cdb55560eaf253f0cbdb61b29971e9fb34d9c3499b0e96e4e60ed8a5/pyzmq-27.1.0-cp312-abi3-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:43ad9a73e3da1fab5b0e7e13402f0b2fb934ae1c876c51d0afff0e7c052eca31", size = 840995, upload-time = "2025-09-08T23:08:08.396Z" }, - { url = "https://files.pythonhosted.org/packages/c2/bb/b79798ca177b9eb0825b4c9998c6af8cd2a7f15a6a1a4272c1d1a21d382f/pyzmq-27.1.0-cp312-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:0de3028d69d4cdc475bfe47a6128eb38d8bc0e8f4d69646adfbcd840facbac28", size = 1642070, upload-time = "2025-09-08T23:08:09.989Z" }, - { url = "https://files.pythonhosted.org/packages/9c/80/2df2e7977c4ede24c79ae39dcef3899bfc5f34d1ca7a5b24f182c9b7a9ca/pyzmq-27.1.0-cp312-abi3-musllinux_1_2_i686.whl", hash = "sha256:cf44a7763aea9298c0aa7dbf859f87ed7012de8bda0f3977b6fb1d96745df856", size = 2021121, upload-time = "2025-09-08T23:08:11.907Z" }, - { url = "https://files.pythonhosted.org/packages/46/bd/2d45ad24f5f5ae7e8d01525eb76786fa7557136555cac7d929880519e33a/pyzmq-27.1.0-cp312-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:f30f395a9e6fbca195400ce833c731e7b64c3919aa481af4d88c3759e0cb7496", size = 1878550, upload-time = "2025-09-08T23:08:13.513Z" }, - { url = "https://files.pythonhosted.org/packages/e6/2f/104c0a3c778d7c2ab8190e9db4f62f0b6957b53c9d87db77c284b69f33ea/pyzmq-27.1.0-cp312-abi3-win32.whl", hash = "sha256:250e5436a4ba13885494412b3da5d518cd0d3a278a1ae640e113c073a5f88edd", size = 559184, upload-time = "2025-09-08T23:08:15.163Z" }, - { url = "https://files.pythonhosted.org/packages/fc/7f/a21b20d577e4100c6a41795842028235998a643b1ad406a6d4163ea8f53e/pyzmq-27.1.0-cp312-abi3-win_amd64.whl", hash = "sha256:9ce490cf1d2ca2ad84733aa1d69ce6855372cb5ce9223802450c9b2a7cba0ccf", size = 619480, upload-time = "2025-09-08T23:08:17.192Z" }, - { url = "https://files.pythonhosted.org/packages/78/c2/c012beae5f76b72f007a9e91ee9401cb88c51d0f83c6257a03e785c81cc2/pyzmq-27.1.0-cp312-abi3-win_arm64.whl", hash = "sha256:75a2f36223f0d535a0c919e23615fc85a1e23b71f40c7eb43d7b1dedb4d8f15f", size = 552993, upload-time = "2025-09-08T23:08:18.926Z" }, - { url = "https://files.pythonhosted.org/packages/87/45/19efbb3000956e82d0331bafca5d9ac19ea2857722fa2caacefb6042f39d/pyzmq-27.1.0-cp314-cp314t-macosx_10_15_universal2.whl", hash = "sha256:ce980af330231615756acd5154f29813d553ea555485ae712c491cd483df6b7a", size = 1341197, upload-time = "2025-09-08T23:08:44.973Z" }, - { url = "https://files.pythonhosted.org/packages/48/43/d72ccdbf0d73d1343936296665826350cb1e825f92f2db9db3e61c2162a2/pyzmq-27.1.0-cp314-cp314t-manylinux2014_i686.manylinux_2_17_i686.whl", hash = "sha256:1779be8c549e54a1c38f805e56d2a2e5c009d26de10921d7d51cfd1c8d4632ea", size = 897175, upload-time = "2025-09-08T23:08:46.601Z" }, - { url = "https://files.pythonhosted.org/packages/2f/2e/a483f73a10b65a9ef0161e817321d39a770b2acf8bcf3004a28d90d14a94/pyzmq-27.1.0-cp314-cp314t-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:7200bb0f03345515df50d99d3db206a0a6bee1955fbb8c453c76f5bf0e08fb96", size = 660427, upload-time = "2025-09-08T23:08:48.187Z" }, - { url = "https://files.pythonhosted.org/packages/f5/d2/5f36552c2d3e5685abe60dfa56f91169f7a2d99bbaf67c5271022ab40863/pyzmq-27.1.0-cp314-cp314t-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:01c0e07d558b06a60773744ea6251f769cd79a41a97d11b8bf4ab8f034b0424d", size = 847929, upload-time = "2025-09-08T23:08:49.76Z" }, - { url = "https://files.pythonhosted.org/packages/c4/2a/404b331f2b7bf3198e9945f75c4c521f0c6a3a23b51f7a4a401b94a13833/pyzmq-27.1.0-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:80d834abee71f65253c91540445d37c4c561e293ba6e741b992f20a105d69146", size = 1650193, upload-time = "2025-09-08T23:08:51.7Z" }, - { url = "https://files.pythonhosted.org/packages/1c/0b/f4107e33f62a5acf60e3ded67ed33d79b4ce18de432625ce2fc5093d6388/pyzmq-27.1.0-cp314-cp314t-musllinux_1_2_i686.whl", hash = "sha256:544b4e3b7198dde4a62b8ff6685e9802a9a1ebf47e77478a5eb88eca2a82f2fd", size = 2024388, upload-time = "2025-09-08T23:08:53.393Z" }, - { url = "https://files.pythonhosted.org/packages/0d/01/add31fe76512642fd6e40e3a3bd21f4b47e242c8ba33efb6809e37076d9b/pyzmq-27.1.0-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:cedc4c68178e59a4046f97eca31b148ddcf51e88677de1ef4e78cf06c5376c9a", size = 1885316, upload-time = "2025-09-08T23:08:55.702Z" }, - { url = "https://files.pythonhosted.org/packages/c4/59/a5f38970f9bf07cee96128de79590bb354917914a9be11272cfc7ff26af0/pyzmq-27.1.0-cp314-cp314t-win32.whl", hash = "sha256:1f0b2a577fd770aa6f053211a55d1c47901f4d537389a034c690291485e5fe92", size = 587472, upload-time = "2025-09-08T23:08:58.18Z" }, - { url = "https://files.pythonhosted.org/packages/70/d8/78b1bad170f93fcf5e3536e70e8fadac55030002275c9a29e8f5719185de/pyzmq-27.1.0-cp314-cp314t-win_amd64.whl", hash = "sha256:19c9468ae0437f8074af379e986c5d3d7d7bfe033506af442e8c879732bedbe0", size = 661401, upload-time = "2025-09-08T23:08:59.802Z" }, - { url = "https://files.pythonhosted.org/packages/81/d6/4bfbb40c9a0b42fc53c7cf442f6385db70b40f74a783130c5d0a5aa62228/pyzmq-27.1.0-cp314-cp314t-win_arm64.whl", hash = "sha256:dc5dbf68a7857b59473f7df42650c621d7e8923fb03fa74a526890f4d33cc4d7", size = 575170, upload-time = "2025-09-08T23:09:01.418Z" }, -] - -[[package]] -name = "redis" -version = "8.0.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/53/ae/ed461cca5780b5fc8b9fe8ca0ed98d89508645fb9d880c24cc42c087678f/redis-8.0.0.tar.gz", hash = "sha256:a00c5355432051ac14e593b8b197fc76c887ee12d55a0984f69328a1115fdc49", size = 5101591, upload-time = "2026-05-28T12:45:13.5Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/27/e3/b519734372d305bd547534a9f32e4ce9f98552af753dce72cf3483a0ff0b/redis-8.0.0-py3-none-any.whl", hash = "sha256:c938c18338585009f0bc310f4c7e4e4b4d37639356c4ac072cedf3af570c8dc7", size = 499870, upload-time = "2026-05-28T12:45:11.697Z" }, -] - -[[package]] -name = "referencing" -version = "0.37.0" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "attrs" }, - { name = "rpds-py" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/22/f5/df4e9027acead3ecc63e50fe1e36aca1523e1719559c499951bb4b53188f/referencing-0.37.0.tar.gz", hash = "sha256:44aefc3142c5b842538163acb373e24cce6632bd54bdb01b21ad5863489f50d8", size = 78036, upload-time = "2025-10-13T15:30:48.871Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/2c/58/ca301544e1fa93ed4f80d724bf5b194f6e4b945841c5bfd555878eea9fcb/referencing-0.37.0-py3-none-any.whl", hash = "sha256:381329a9f99628c9069361716891d34ad94af76e461dcb0335825aecc7692231", size = 26766, upload-time = "2025-10-13T15:30:47.625Z" }, -] - -[[package]] -name = "regex" -version = "2026.5.9" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/dc/0e/49aee608ad09480e7fd276898c99ec6192985fa331abe4eb3a986094490b/regex-2026.5.9.tar.gz", hash = "sha256:a8234aa23ec39894bfe4a3f1b85616a7032481964a13ac6fc9f10de4f6fca270", size = 416074, upload-time = "2026-05-09T23:15:19.37Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/13/3e/9c3cd292d8808b3645a2ce517e200179b6d0e903f176300bd8b542e14de5/regex-2026.5.9-cp314-cp314-macosx_10_13_universal2.whl", hash = "sha256:1bd7587a2948b4085195d5a3374eaf4a425dc3e55784c038175355ecf3bbbf8a", size = 490376, upload-time = "2026-05-09T23:14:09.64Z" }, - { url = "https://files.pythonhosted.org/packages/60/70/d43ee8a2ca0a8b68d167f21658b85520ac0574617c7f320367c5047f7556/regex-2026.5.9-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:dea2e88e1cce4522496cce630e11e67b98b7076620bc4336c3f674bc21a375f4", size = 291964, upload-time = "2026-05-09T23:14:11.424Z" }, - { url = "https://files.pythonhosted.org/packages/21/91/9d50b433828d8e74196904e168a43abf1e6e88b2a15d47ed742456720c37/regex-2026.5.9-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:2099f7e7ff7b6aa3192312650a56e91cc091e49d50b04e4f6f8b6e28b3b27f1c", size = 289682, upload-time = "2026-05-09T23:14:13.123Z" }, - { url = "https://files.pythonhosted.org/packages/3e/d2/b835e3cafbb9d977736912436259ff551d60919f7d7b3d37d46659c63564/regex-2026.5.9-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:ecd353045824e4477562a2ac718c25799cdaaa41f7aa925a806a8a3e6848a5b9", size = 796996, upload-time = "2026-05-09T23:14:14.923Z" }, - { url = "https://files.pythonhosted.org/packages/2c/a6/9f992d00019166b9de01c546dd4549bc679f2a68df11b877740b0760b7c2/regex-2026.5.9-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:65c8c8c37377794bd5b2f3ebe51919042bf17aec802e23c833d89782ed0c78af", size = 866089, upload-time = "2026-05-09T23:14:17.757Z" }, - { url = "https://files.pythonhosted.org/packages/e0/08/4d32af657e049b19cb62b02e46e38fe1518797bfb2203ee93a510b21b0dc/regex-2026.5.9-cp314-cp314-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:5b73ab8afcf66c622db143d1c6fda4e58e4d537ee4f125229ad47b1ab80f34c0", size = 911530, upload-time = "2026-05-09T23:14:20.353Z" }, - { url = "https://files.pythonhosted.org/packages/d9/27/2af43dd1dc201d1fecefda64a45f4ad0995855b92724f795a777b402ee69/regex-2026.5.9-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:0de5cf193997384ed2ca6f1cd4f78055b255d93d82d5a8cd6ba0d11c10b167e4", size = 800643, upload-time = "2026-05-09T23:14:22.265Z" }, - { url = "https://files.pythonhosted.org/packages/a4/dd/23a249047013b5321d4a60c4d2437462086f601b061776a525e5fba2a59f/regex-2026.5.9-cp314-cp314-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:d641a8c9a61618047796d572a39a79b26167b0411d2c3031937b2fe2d081e2cf", size = 777223, upload-time = "2026-05-09T23:14:24.179Z" }, - { url = "https://files.pythonhosted.org/packages/94/6a/e85ed9538cd19586d0465076a4578a12e093ce776d15f3f8ce92733a8dd6/regex-2026.5.9-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:24b2355ef5cc9aa5b8f07d17704face1c166fdcc2290fa7bd6e6c925655a8346", size = 785760, upload-time = "2026-05-09T23:14:26.065Z" }, - { url = "https://files.pythonhosted.org/packages/2a/c4/f25473209438638e947c55f9156fd8f236f74169229028cc99116380868e/regex-2026.5.9-cp314-cp314-musllinux_1_2_ppc64le.whl", hash = "sha256:a24852d3c29ad9e47593593d8a247c44ccc3d0548ef12c822d6ed0810affe676", size = 860891, upload-time = "2026-05-09T23:14:28.17Z" }, - { url = "https://files.pythonhosted.org/packages/f9/f7/f4f86e3c74419c37370e91f150ae0c2ef7d34b2e0e4cdd5da046a02e4022/regex-2026.5.9-cp314-cp314-musllinux_1_2_riscv64.whl", hash = "sha256:916714069da19329ef7de197dcbc77bb3104145c7c2c864dbfbe318f46b88b14", size = 765891, upload-time = "2026-05-09T23:14:30.06Z" }, - { url = "https://files.pythonhosted.org/packages/26/70/704d8e13765939146b1cd0ef4e2feb71d7929727d2290f026eed10095955/regex-2026.5.9-cp314-cp314-musllinux_1_2_s390x.whl", hash = "sha256:fa411799ca8da32a8d38d020a88faa5b6f91657d284761352940ecf9f7c3bbdd", size = 851380, upload-time = "2026-05-09T23:14:32.123Z" }, - { url = "https://files.pythonhosted.org/packages/26/29/1a13582a8460038edc38e49f64ceb0dd7c60f5caba77571f4bf6601965d9/regex-2026.5.9-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:1e6da47d679b7010ef27556b6e0f99771b744936db1792a10ceac6547ae1503e", size = 789350, upload-time = "2026-05-09T23:14:34.799Z" }, - { url = "https://files.pythonhosted.org/packages/73/56/3dcafe34fc72e271d62ad9a291801e88a1457bb251c132f15fcc2e5aad1a/regex-2026.5.9-cp314-cp314-win32.whl", hash = "sha256:98bd73080e8756255137e1bd3f3f00295bbc5aa383c0e0f973920e9134d7c4ad", size = 272130, upload-time = "2026-05-09T23:14:36.729Z" }, - { url = "https://files.pythonhosted.org/packages/d0/9c/02eebf0be95efe416c664db7fb8b6b05b7a0b06a7544f2884f2558b0526f/regex-2026.5.9-cp314-cp314-win_amd64.whl", hash = "sha256:ff8d372ac2acdc048d1c19916f27ee61bc5722728458ba6ca5052f2c72d51763", size = 280999, upload-time = "2026-05-09T23:14:39.126Z" }, - { url = "https://files.pythonhosted.org/packages/70/5a/1dd1abee76cb7a846a0bcf42fdc87e5720c3c33c24f3e37814310a513d9f/regex-2026.5.9-cp314-cp314-win_arm64.whl", hash = "sha256:e1d93bf647916292e8edcec150c07ddf3dc50179ccaf770c04a7f9e452155372", size = 273500, upload-time = "2026-05-09T23:14:41.059Z" }, - { url = "https://files.pythonhosted.org/packages/86/c1/c5f619b0057a7965cb78ec559c1d7a45ce8c99a35bea95483d64959a93d9/regex-2026.5.9-cp314-cp314t-macosx_10_13_universal2.whl", hash = "sha256:83d0ee4a57d1c87cb549e195ec300b8f0ec3a82eba66d835e4e2ed8634fe4499", size = 494269, upload-time = "2026-05-09T23:14:42.869Z" }, - { url = "https://files.pythonhosted.org/packages/05/2c/5d01f1aee33de4bbe60c8452945bfc8477ca7c5ae4450f6bfe711036cb36/regex-2026.5.9-cp314-cp314t-macosx_10_13_x86_64.whl", hash = "sha256:d3d7eb5c9a7f6df82ed3cfac9beb93882a5cbcb5b8b157b56cb2b3b276574ac1", size = 293954, upload-time = "2026-05-09T23:14:44.822Z" }, - { url = "https://files.pythonhosted.org/packages/7a/fe/e8988b2ae2108c6ef71bd4aa8d87fbe257976dd0810e826cd75f701c68b6/regex-2026.5.9-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:075160bf16658e16d35233300b8453aac25de4cbea808d22348b6979668e924d", size = 292405, upload-time = "2026-05-09T23:14:47.211Z" }, - { url = "https://files.pythonhosted.org/packages/79/34/d2b0937faa7859263f7f0a3c6b103a1296306be6952dc173d0154e9a2f49/regex-2026.5.9-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:45375819235558a4ff1c4971dc32881f022613abdb180128f5cb4768c1765a1c", size = 811855, upload-time = "2026-05-09T23:14:49.21Z" }, - { url = "https://files.pythonhosted.org/packages/80/fe/daf53a47457a8486db66c66c01ceb9c2303eecee3f87197f1e77eb1a736d/regex-2026.5.9-cp314-cp314t-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:ead4b163ac30a29574510cd4b3e2e985ac5290c05fc7095557d6a5f403fc31b5", size = 871189, upload-time = "2026-05-09T23:14:51.555Z" }, - { url = "https://files.pythonhosted.org/packages/1c/75/058fc4470cbfbf57d800aff1a0022b929a3f9fa553ee10a0cdf2070eb31f/regex-2026.5.9-cp314-cp314t-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:8c6e4218fbdfbcd4f6c19efca40930d24a621bf4b48cb76bc6640543bd28ef20", size = 917485, upload-time = "2026-05-09T23:14:53.633Z" }, - { url = "https://files.pythonhosted.org/packages/88/e7/179cfda3a28bc843b5c6cfe7f79f23489c791ed95f151083803660878432/regex-2026.5.9-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:6351571c8a42b505eb555c0dc47d740d0fb66977dc142919eea6f4325b7c56a0", size = 816369, upload-time = "2026-05-09T23:14:56.198Z" }, - { url = "https://files.pythonhosted.org/packages/41/90/6f0cc422071688266d344fca8462d787cba0a2c144acb25721f9a61ec265/regex-2026.5.9-cp314-cp314t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:002205cafd2a9e78c6290c7d1df277bf3277b3b7a30e0b4bb0dac2e2e3f7cb2d", size = 785869, upload-time = "2026-05-09T23:14:58.602Z" }, - { url = "https://files.pythonhosted.org/packages/02/67/a31f1760f09c27b251ef39e9beb541f462cf977381d067faa764c2c0e393/regex-2026.5.9-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:8abd33fef90b2a9efac5557d6033ca82d1195ed3a15fea5af15ba7b463c6a63b", size = 801427, upload-time = "2026-05-09T23:15:00.642Z" }, - { url = "https://files.pythonhosted.org/packages/e3/c4/1a80654597b6bc1e1ea0494824c31200e8a956abe290afae9b19a166a148/regex-2026.5.9-cp314-cp314t-musllinux_1_2_ppc64le.whl", hash = "sha256:31037c82eccb44b7ea2e9e221d7c01429430e989a1f4b91ea5a855f6017b509a", size = 866482, upload-time = "2026-05-09T23:15:03.384Z" }, - { url = "https://files.pythonhosted.org/packages/d1/11/960724e06482c08466ff5611e242e86f80062949cdf6b4b9cc317b9dd93d/regex-2026.5.9-cp314-cp314t-musllinux_1_2_riscv64.whl", hash = "sha256:5604dfd046dc37eca90250fc3be938b076c8059fa772ac0ed6f499b0f0fb0415", size = 773022, upload-time = "2026-05-09T23:15:05.625Z" }, - { url = "https://files.pythonhosted.org/packages/50/a8/a9979c3e7918280e93159ebcab5ef1a65116dd4f3bd6091be0eae4a126e8/regex-2026.5.9-cp314-cp314t-musllinux_1_2_s390x.whl", hash = "sha256:0e1b1b4e496afbb24f4a62aba855ee4f88f25578927697b340702e48c9ee6bc2", size = 856642, upload-time = "2026-05-09T23:15:07.966Z" }, - { url = "https://files.pythonhosted.org/packages/fe/d4/a9b732f2f0072c0ab12227483abb24fffcb9f73f8a2b203df0a6d0434735/regex-2026.5.9-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:be3372b9df6ddecff6486d37e19095a7b4973137caf5512407a89f4455361f41", size = 803552, upload-time = "2026-05-09T23:15:10.215Z" }, - { url = "https://files.pythonhosted.org/packages/d5/fe/1b3113817447a1d4155e4ac76d2e072f42c0bcba2f43fa8a0e756ea2cd91/regex-2026.5.9-cp314-cp314t-win32.whl", hash = "sha256:3ddd90103f9e5c471c49c7852ecc1fe27c7e45eb99e977aefe7caa4e779f4f58", size = 275746, upload-time = "2026-05-09T23:15:12.609Z" }, - { url = "https://files.pythonhosted.org/packages/92/73/93d42045302636c91f2e5ef588b65b84b01428f28ec77de256b1dfdfbe5c/regex-2026.5.9-cp314-cp314t-win_amd64.whl", hash = "sha256:ca518ed29c46eecba6010b15f1b9a479314d2de409536e71b6a13aa04e3b8a77", size = 285685, upload-time = "2026-05-09T23:15:15.086Z" }, - { url = "https://files.pythonhosted.org/packages/da/80/35b4c33c804a165a7f55289afda3ea9e3eb6d15800341a2d66455c0f1f30/regex-2026.5.9-cp314-cp314t-win_arm64.whl", hash = "sha256:5e41809d2683fcde7d5a8c87a6567ba1fb1ce0de9f31bff578de00a4b2d76daa", size = 275713, upload-time = "2026-05-09T23:15:16.98Z" }, -] - [[package]] name = "requests" version = "2.34.2" @@ -3067,39 +1454,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/a0/f4/c67b0b3f1b9245e8d266f0f112c500d50e5b4e83cb6f3b71b6528104182a/requests-2.34.2-py3-none-any.whl", hash = "sha256:2a0d60c172f83ac6ab31e4554906c0f3b3588d37b5cb939b1c061f4907e278e0", size = 73075, upload-time = "2026-05-14T19:25:26.443Z" }, ] -[[package]] -name = "rfc3339-validator" -version = "0.1.4" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "six" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/28/ea/a9387748e2d111c3c2b275ba970b735e04e15cdb1eb30693b6b5708c4dbd/rfc3339_validator-0.1.4.tar.gz", hash = "sha256:138a2abdf93304ad60530167e51d2dfb9549521a836871b88d7f4695d0022f6b", size = 5513, upload-time = "2021-05-12T16:37:54.178Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/7b/44/4e421b96b67b2daff264473f7465db72fbdf36a07e05494f50300cc7b0c6/rfc3339_validator-0.1.4-py2.py3-none-any.whl", hash = "sha256:24f6ec1eda14ef823da9e36ec7113124b39c04d50a4d3d3a3c2859577e7791fa", size = 3490, upload-time = "2021-05-12T16:37:52.536Z" }, -] - -[[package]] -name = "rfc3986-validator" -version = "0.1.1" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/da/88/f270de456dd7d11dcc808abfa291ecdd3f45ff44e3b549ffa01b126464d0/rfc3986_validator-0.1.1.tar.gz", hash = "sha256:3d44bde7921b3b9ec3ae4e3adca370438eccebc676456449b145d533b240d055", size = 6760, upload-time = "2019-10-28T16:00:19.144Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/9e/51/17023c0f8f1869d8806b979a2bffa3f861f26a3f1a66b094288323fba52f/rfc3986_validator-0.1.1-py2.py3-none-any.whl", hash = "sha256:2f235c432ef459970b4306369336b9d5dbdda31b510ca1e327636e01f528bfa9", size = 4242, upload-time = "2019-10-28T16:00:13.976Z" }, -] - -[[package]] -name = "rfc3987-syntax" -version = "1.1.0" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "lark" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/2c/06/37c1a5557acf449e8e406a830a05bf885ac47d33270aec454ef78675008d/rfc3987_syntax-1.1.0.tar.gz", hash = "sha256:717a62cbf33cffdd16dfa3a497d81ce48a660ea691b1ddd7be710c22f00b4a0d", size = 14239, upload-time = "2025-07-18T01:05:05.015Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/7e/71/44ce230e1b7fadd372515a97e32a83011f906ddded8d03e3c6aafbdedbb7/rfc3987_syntax-1.1.0-py3-none-any.whl", hash = "sha256:6c3d97604e4c5ce9f714898e05401a0445a641cfa276432b0a648c80856f6a3f", size = 8046, upload-time = "2025-07-18T01:05:03.843Z" }, -] - [[package]] name = "rich" version = "15.0.0" @@ -3165,100 +1519,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/79/62/b88e5879512c55b8ee979c666ee6902adc4ed05007226de266410ae27965/rignore-0.7.6-cp314-cp314t-win_arm64.whl", hash = "sha256:b83adabeb3e8cf662cabe1931b83e165b88c526fa6af6b3aa90429686e474896", size = 656035, upload-time = "2025-11-05T21:41:31.13Z" }, ] -[[package]] -name = "rpds-py" -version = "2026.5.1" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/2e/43/25a8dcd3feedd735039a8f0b5b7e3b118232b5eae288c4fd9ab200d41094/rpds_py-2026.5.1.tar.gz", hash = "sha256:07b24fea40541e28570e5b795a4a38fbdcd12550c06bd0748005ecc8116ca256", size = 64459, upload-time = "2026-05-28T12:02:13.232Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/d4/6f/19c1918a4b590d8de87e712e4abe4b3875771eff60216fb6153cf6665c68/rpds_py-2026.5.1-cp314-cp314-macosx_10_12_x86_64.whl", hash = "sha256:1f2c391c3059798093b65df23aca2cac150460ae9c630d99dec83d703d9485b9", size = 349756, upload-time = "2026-05-28T12:00:20.217Z" }, - { url = "https://files.pythonhosted.org/packages/e5/60/a06fe7da34eca79dacbf958a2ba0c6eea85bc2b29de20080bf40f72f66fa/rpds_py-2026.5.1-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:413b424f7c4ee65ab5e5be91f5731be0f8b41a1ee2b12dfe810d716312e95a78", size = 343831, upload-time = "2026-05-28T12:00:21.711Z" }, - { url = "https://files.pythonhosted.org/packages/bf/ec/b2333b97b90e2a6ef6ca8ad386ee284968e74bcfe113b3f1a8d9036429a9/rpds_py-2026.5.1-cp314-cp314-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2c595a1d9255dce0599e13130d1440ab2506654f2b50294226ee06402f8fef63", size = 375127, upload-time = "2026-05-28T12:00:23.326Z" }, - { url = "https://files.pythonhosted.org/packages/14/7f/e00aae54067f2b488c4637961d5f58204d470795fc791085fa3f15060d2e/rpds_py-2026.5.1-cp314-cp314-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:1c27c5f6102eac8c03e7595a00827a53b271ba40a53b59ff8709170e0855ea4a", size = 379034, upload-time = "2026-05-28T12:00:24.89Z" }, - { url = "https://files.pythonhosted.org/packages/be/cc/423999bbb8ae8dc93c77fc1d5e984ade5eb89d237d3bb884ccfa72ae2890/rpds_py-2026.5.1-cp314-cp314-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:6c7fcf61d44cacecaf3aea542b0e053db77972a4573e7ceda16fb2b399161195", size = 490823, upload-time = "2026-05-28T12:00:26.676Z" }, - { url = "https://files.pythonhosted.org/packages/0f/aa/c671bf660f12e68d3c52ff86c7066ed1372df5a0f4f2ff584e419b8207e7/rpds_py-2026.5.1-cp314-cp314-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2c817a189d4ee14290420e5ff051e4dd6baa13f3edf84685071dee07a6d538ee", size = 388144, upload-time = "2026-05-28T12:00:28.577Z" }, - { url = "https://files.pythonhosted.org/packages/19/c8/d63bb75b68afe77b229e3021c6031bcaf01da5db5b0e69d0d10f9ba679a7/rpds_py-2026.5.1-cp314-cp314-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:21846aac0ed2e0589f38c12dc44e77bb64e494b771eadbcf169cba00566ba7ba", size = 371959, upload-time = "2026-05-28T12:00:30.304Z" }, - { url = "https://files.pythonhosted.org/packages/82/35/c51122014d8274ff37dc606d60049c3db7d83da02b5b282511e5a906a9a6/rpds_py-2026.5.1-cp314-cp314-manylinux_2_31_riscv64.whl", hash = "sha256:b317c87a13f769a4e787819bd508aaa5d69aa09b0880de9af6d3a8a54571cdec", size = 383558, upload-time = "2026-05-28T12:00:31.764Z" }, - { url = "https://files.pythonhosted.org/packages/e3/f9/2790cb99c136a5363acdeacf5c27c56f3de0d4118a1f48fca83404c99c89/rpds_py-2026.5.1-cp314-cp314-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:ce87129d9f2c14fa6c4a8601fb80eb4488c80d38a20cd13758ef11123e14995d", size = 402789, upload-time = "2026-05-28T12:00:33.247Z" }, - { url = "https://files.pythonhosted.org/packages/e5/1b/e4fb584f8c75d35c38150ff6a332cda949e6f97acba1f4fd123b14ab56fe/rpds_py-2026.5.1-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:9cdddb6c1207d284d94fd1530adf57fbd797fe7c4b8704ba85f49414f2557e7d", size = 551405, upload-time = "2026-05-28T12:00:34.819Z" }, - { url = "https://files.pythonhosted.org/packages/d8/f7/a6731b4216cb3793ea1af5391da240f5683dacc0d13e034fe5fc3503f240/rpds_py-2026.5.1-cp314-cp314-musllinux_1_2_i686.whl", hash = "sha256:4e237e139f94d3c036fd28eb9f564c99055476ff4ff05cd42be55ce349b5aa02", size = 616975, upload-time = "2026-05-28T12:00:36.268Z" }, - { url = "https://files.pythonhosted.org/packages/2c/ea/2e051a81d95d8e63f4b35a1c463a87e8766bc3d083c067c5dfb6bf220747/rpds_py-2026.5.1-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:ed0954b524873214369184a9c82b0eaa45a3fbb9a798cd95b17e0d98499e7ea0", size = 578701, upload-time = "2026-05-28T12:00:37.82Z" }, - { url = "https://files.pythonhosted.org/packages/65/56/b5f6fdb2083e32bca8a8993d89e70db114b4756c9e2c38421328126689d2/rpds_py-2026.5.1-cp314-cp314-win32.whl", hash = "sha256:2d88621d6a7d4dfa633d21abe90f280bb205274e16b1d1e61c6ad4640b2453b7", size = 209806, upload-time = "2026-05-28T12:00:39.492Z" }, - { url = "https://files.pythonhosted.org/packages/fb/80/65a5aa96c155e611d1ed844e4e1f57f3e36b021f396d9f8585d756e6b90d/rpds_py-2026.5.1-cp314-cp314-win_amd64.whl", hash = "sha256:cef8ac28d26f4dda3533060c20fbf80a325458fa9fd23ea72a73cdfa8e978838", size = 225985, upload-time = "2026-05-28T12:00:40.94Z" }, - { url = "https://files.pythonhosted.org/packages/27/7c/ad185212e87b05f196daef92bc5f3caf07298eb47c295b5585c3dd3093ac/rpds_py-2026.5.1-cp314-cp314-win_arm64.whl", hash = "sha256:eaaea962c68cdc68d4a533ba985ab8e9484277910bbfaa2ab3ef7732667bfed8", size = 221219, upload-time = "2026-05-28T12:00:43.15Z" }, - { url = "https://files.pythonhosted.org/packages/23/58/e14ae18759020334646b031e708ab4158d653a938822bfb7b95ef2e93aa3/rpds_py-2026.5.1-cp314-cp314t-macosx_10_12_x86_64.whl", hash = "sha256:21942f52dbbd5f8758bf021213d28bd45c39e873e65e2407faf5f1846f5761ad", size = 352148, upload-time = "2026-05-28T12:00:44.638Z" }, - { url = "https://files.pythonhosted.org/packages/31/9b/5f4a1e2f960bca3ac5d052b139dd31eed97b259f9d909173821760d542e8/rpds_py-2026.5.1-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:f414556f6e3958300ff941e40c9f97e3dc9774ddd1b3434c475d73dd354bbed3", size = 345196, upload-time = "2026-05-28T12:00:46.14Z" }, - { url = "https://files.pythonhosted.org/packages/1a/71/1d9574d6a2fa20ab60eaa55c7467f5aa20cbc770f341a05f09c0876f59e2/rpds_py-2026.5.1-cp314-cp314t-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ef1013a8625c74043210190b246f5b1551e09757c1f356c6e4160ef96c5bc081", size = 374981, upload-time = "2026-05-28T12:00:47.531Z" }, - { url = "https://files.pythonhosted.org/packages/0c/9a/37e99f4915a80aa71670263c1267f7ae0af95f53a3f61e6c3bdc016d4515/rpds_py-2026.5.1-cp314-cp314t-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:cc68e231a77a5f0d774ae278a1f8e55c0456501820847c1e4efb3829f3441df6", size = 379961, upload-time = "2026-05-28T12:00:49.216Z" }, - { url = "https://files.pythonhosted.org/packages/a8/ff/6e73f74b89d2e0715e0fc86b7dde893f9a61ae2f9b256ff3bdfe41ac4e94/rpds_py-2026.5.1-cp314-cp314t-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:9baffb505aff33acc69b422a19f77806680f3c8632227d79f48de8a810d1c2c5", size = 495965, upload-time = "2026-05-28T12:00:51.111Z" }, - { url = "https://files.pythonhosted.org/packages/ea/e0/425faba25f59d74d4638b267f7c7a80e8649d2ef4db10a19b0c4a71e6e6f/rpds_py-2026.5.1-cp314-cp314t-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b8d2f912928d426e8cfa396f7f3f8d29a59e6689c86dcca3c420730c1096322b", size = 389526, upload-time = "2026-05-28T12:00:52.77Z" }, - { url = "https://files.pythonhosted.org/packages/c6/76/7a41960e3fddae47fab43a28684d5da981401dffd88253de0944148654cb/rpds_py-2026.5.1-cp314-cp314t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:90f628283be835db980c941767d41c9a27b5239e54ba0a9c1335247e82406964", size = 376190, upload-time = "2026-05-28T12:00:54.215Z" }, - { url = "https://files.pythonhosted.org/packages/27/60/5f38dc70824fc6951b51d35377e577a3a3a4c81a6769cc5a2de25ebe0ad1/rpds_py-2026.5.1-cp314-cp314t-manylinux_2_31_riscv64.whl", hash = "sha256:1ebb2f0ab7e16132995a72de805170e0203df0c3dd22e1ef1cd1fdd90bd7a131", size = 383921, upload-time = "2026-05-28T12:00:55.673Z" }, - { url = "https://files.pythonhosted.org/packages/60/1a/d60a38caa1505f4b9483c3fbbde12c94e1079154f4f401a6da96f7e77621/rpds_py-2026.5.1-cp314-cp314t-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:f3df3d16ded76f1f8c9cdebd0e1ea55fdf4c23b812de189814da7cf229c22a81", size = 404766, upload-time = "2026-05-28T12:00:57.518Z" }, - { url = "https://files.pythonhosted.org/packages/87/ff/602fd3f174d6425f0bce05ad0dfbec0e96b38d0f7d08a79af5aa20083885/rpds_py-2026.5.1-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:9af8905b8f854990e40d5206aa5ac58d9b0fe0b7f351ff2bb086c20f6c8c6a47", size = 551343, upload-time = "2026-05-28T12:00:58.978Z" }, - { url = "https://files.pythonhosted.org/packages/b8/c1/1be13327acdbead3eca1fde03b6a34dbb011f1e864e217f0d32cc1779a7f/rpds_py-2026.5.1-cp314-cp314t-musllinux_1_2_i686.whl", hash = "sha256:036a36a87fb1cd3b214d11c4b3c4f7d2ddad933625dca1c900b56a057c07740a", size = 618502, upload-time = "2026-05-28T12:01:00.656Z" }, - { url = "https://files.pythonhosted.org/packages/f3/d7/afb49b49d7f2be8b7ba1a9f0977fa5168003437b93086726f066544e8351/rpds_py-2026.5.1-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:62ae3853454fe9ef283a03c96c2d835d39e84b14643a9d62c82ef0fb87d702ca", size = 581916, upload-time = "2026-05-28T12:01:02.22Z" }, - { url = "https://files.pythonhosted.org/packages/25/d1/dbef8c1f8a10f07beb62b5f054e20099fd9924b3ec001b8f0b6ac7813a85/rpds_py-2026.5.1-cp314-cp314t-win32.whl", hash = "sha256:6c3d771a46ec18b12af06ce36243a9a80b07a5d0515236332d90863ca8bb326a", size = 207855, upload-time = "2026-05-28T12:01:03.821Z" }, - { url = "https://files.pythonhosted.org/packages/2a/72/bfa4e61ab8e7dc1c8adf397e05e6cbdd4239357bd72b248d3de662f23915/rpds_py-2026.5.1-cp314-cp314t-win_amd64.whl", hash = "sha256:c93c629be4636cf54337bd5f06c104d55e42ced54d681f6fe21ae510a65116f6", size = 225422, upload-time = "2026-05-28T12:01:05.194Z" }, - { url = "https://files.pythonhosted.org/packages/27/3a/7b5da92b640f67b6717ccafc83cdd06bfa7ff2395c3685c68922bb54d703/rpds_py-2026.5.1-cp315-cp315-macosx_10_12_x86_64.whl", hash = "sha256:3574b55c604b8f75dacb007136508bbc0db406e626301778096a133327e7f2fb", size = 349576, upload-time = "2026-05-28T12:01:06.722Z" }, - { url = "https://files.pythonhosted.org/packages/d7/8a/2aafd7ad355a1bd48ca76e2262b74b15e6432b5a1efe150efd4d779cd55d/rpds_py-2026.5.1-cp315-cp315-macosx_11_0_arm64.whl", hash = "sha256:94068eb3ae6d43f5a786b7db96a406a34e6d5c24489feef32fd6e8946ea7b291", size = 343640, upload-time = "2026-05-28T12:01:08.441Z" }, - { url = "https://files.pythonhosted.org/packages/f7/7d/6c9523c1abbe840a1b7fba3c516d48e1d3487cc80fea4366c4071cf56784/rpds_py-2026.5.1-cp315-cp315-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f3a5b10e8ce894825f380a8f1b6444cf73c294dfea62afbb2d13e3a9e630cec1", size = 375322, upload-time = "2026-05-28T12:01:09.934Z" }, - { url = "https://files.pythonhosted.org/packages/5a/5d/0b7b03fb1dc509321f01de3149784ab773e34c8573022029af8076afcb9c/rpds_py-2026.5.1-cp315-cp315-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:fc09f82e63d4bcd58149572f857a431bae851dc747e313c3b5bdf7abb907fda8", size = 379066, upload-time = "2026-05-28T12:01:11.48Z" }, - { url = "https://files.pythonhosted.org/packages/d7/e2/8ef6012999ebf1cb1c22f876d9ce5e63d960fd4631d2af3202d3f480aa25/rpds_py-2026.5.1-cp315-cp315-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:e10464d17df3b582745c25cec695cb9558bca2cb6ddb631aee1787fc72c767b2", size = 494586, upload-time = "2026-05-28T12:01:13.051Z" }, - { url = "https://files.pythonhosted.org/packages/80/af/1eeb029bec67582c226b7809172207cd005073af4ebd906e65ff494f4983/rpds_py-2026.5.1-cp315-cp315-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:ba05adbf15d994c38ec0b7ab32e858e5110c21e9009a00a86545fd220f84e038", size = 388415, upload-time = "2026-05-28T12:01:14.631Z" }, - { url = "https://files.pythonhosted.org/packages/18/23/ffbe10711c4d766c1cab0557d6906c074f795814863c67b351355d29354a/rpds_py-2026.5.1-cp315-cp315-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:77c004fdc7b891967106f78ddfd7b076bfe6813c6139c6fff6aed3bcaa960b26", size = 372427, upload-time = "2026-05-28T12:01:16.153Z" }, - { url = "https://files.pythonhosted.org/packages/bd/3a/30ba4a6ad457e5b070c18d742a33fb77d8d922b565cc881f8a5313d63bfe/rpds_py-2026.5.1-cp315-cp315-manylinux_2_31_riscv64.whl", hash = "sha256:83bcf894486c9d78dd290d3c0124ff6dd8875d3025e2090a8ec49fcc37c55fdd", size = 383615, upload-time = "2026-05-28T12:01:17.809Z" }, - { url = "https://files.pythonhosted.org/packages/d3/69/62e242b53ce39c0814bd24e1a6e6eba6c92be716277745f317f9540a2e7b/rpds_py-2026.5.1-cp315-cp315-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:c3df104083952a0e0c6f10de33e440eabe98fb6317d23e1a58c68f6df08d01b9", size = 402786, upload-time = "2026-05-28T12:01:19.419Z" }, - { url = "https://files.pythonhosted.org/packages/38/c1/a770b9c186928a1ed0f7e6d7ae50e7f3950ed23e3f9e366dbc8e38cb55de/rpds_py-2026.5.1-cp315-cp315-musllinux_1_2_aarch64.whl", hash = "sha256:980450826cf22e133c57e0835070bdd0dd3f73b9b708c3ce223def2cb9469e14", size = 551583, upload-time = "2026-05-28T12:01:21.013Z" }, - { url = "https://files.pythonhosted.org/packages/21/7c/68e8579b95375b70d2a963103c42e705856cdb98569258bd807f4423891c/rpds_py-2026.5.1-cp315-cp315-musllinux_1_2_i686.whl", hash = "sha256:205dde846f24332ab0c1188699a043b8d165b79bb84529ce272c45048ff6be01", size = 616941, upload-time = "2026-05-28T12:01:22.548Z" }, - { url = "https://files.pythonhosted.org/packages/70/a1/a6135aed5730ff03ab957182259987ac11e55fb392a28dc6f0592048a280/rpds_py-2026.5.1-cp315-cp315-musllinux_1_2_x86_64.whl", hash = "sha256:3966b82dd563176396df030f3dd52a6e54cb69b718e95e78bd555ed3d1e0185d", size = 578349, upload-time = "2026-05-28T12:01:24.118Z" }, - { url = "https://files.pythonhosted.org/packages/09/6e/f24201a76a84e6c49d0bdfdfcb735210e21701e9b21c5bfc0ba497dd62f6/rpds_py-2026.5.1-cp315-cp315-win32.whl", hash = "sha256:7818f8d0a415be74d2be3590b0a1c1f463a642f4d0217e7d10602dceef5b79aa", size = 209922, upload-time = "2026-05-28T12:01:25.522Z" }, - { url = "https://files.pythonhosted.org/packages/9e/e4/966bc240bb0485fc265278f6de44d05834bf0b3618886e0b22e33d54c49a/rpds_py-2026.5.1-cp315-cp315-win_amd64.whl", hash = "sha256:b3cc20c0d800af78fd0fac68086e28c1856cec51ea528bb81ea851aa40d39325", size = 226003, upload-time = "2026-05-28T12:01:27.062Z" }, - { url = "https://files.pythonhosted.org/packages/5c/5c/a15a59269cd5e74472734516c73795c15eccfc841b3d4b0228c3f53f19d0/rpds_py-2026.5.1-cp315-cp315-win_arm64.whl", hash = "sha256:3609e9939a8a76cd904cf98a3f1f13b5dc7e150adeaee89e0ea09652ea213e16", size = 221245, upload-time = "2026-05-28T12:01:28.51Z" }, - { url = "https://files.pythonhosted.org/packages/e0/22/135ce03804e179a71ceb13be095deda4a279bc88f7a6b8fa161c5ad44e12/rpds_py-2026.5.1-cp315-cp315t-macosx_10_12_x86_64.whl", hash = "sha256:5d333a7127d4b307601ac37792bee01bb95c867cbfacf21b6375b804d6bbd723", size = 352015, upload-time = "2026-05-28T12:01:30.214Z" }, - { url = "https://files.pythonhosted.org/packages/3b/5f/f1f6d2652eb9d848f6eb369d8db83a2da6249bb49ad2c2a48f45d54538d3/rpds_py-2026.5.1-cp315-cp315t-macosx_11_0_arm64.whl", hash = "sha256:b5f077b44a4f7808520f66dae234988d867deb9aed9be5da057ce9ba831b2a41", size = 345016, upload-time = "2026-05-28T12:01:31.656Z" }, - { url = "https://files.pythonhosted.org/packages/88/66/b74182775691ea2290c99e52ac8d5db844e56fbec90ce421f107658c8314/rpds_py-2026.5.1-cp315-cp315t-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:55d8f9b7b78c9538fc9e04e82ec0e888ff0c3cffcfad152c77e57cd09351a98a", size = 374775, upload-time = "2026-05-28T12:01:33.136Z" }, - { url = "https://files.pythonhosted.org/packages/ff/8f/15e5a61d9f0a43902d36561d4f07cae6ae9f4716be825159fd72717f33af/rpds_py-2026.5.1-cp315-cp315t-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:e3a8ae58895ac107ed934a6bf51e5846f95c53b9b940c2c6d310838fd5846358", size = 380270, upload-time = "2026-05-28T12:01:34.574Z" }, - { url = "https://files.pythonhosted.org/packages/02/c3/f859b12763a80540cdf2af0f15b19904cf756a71d7bdd3f82ff3e5b1bbf9/rpds_py-2026.5.1-cp315-cp315t-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:0957cf3c2b8632ec7aaebffebea8005b353cc2a237b6e2ae3c2cac0820704cfb", size = 495285, upload-time = "2026-05-28T12:01:36.127Z" }, - { url = "https://files.pythonhosted.org/packages/1c/c7/ff27c2ac8411d30b03b1829fd88cae8dad1a4d0da48dd25e57c4038042e6/rpds_py-2026.5.1-cp315-cp315t-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c396c1304de421050b3681ea70f371874b54d41b0151e96109758144c231e30b", size = 389581, upload-time = "2026-05-28T12:01:37.635Z" }, - { url = "https://files.pythonhosted.org/packages/6e/67/fe92ee32a6cc05c77228a2f8b1762e7124f386ec20ff83d0757b762d58d0/rpds_py-2026.5.1-cp315-cp315t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:aad1bff7f666b9598e573815affd666aac6a13a585dde336f843e33350c7fadc", size = 376041, upload-time = "2026-05-28T12:01:39.307Z" }, - { url = "https://files.pythonhosted.org/packages/f8/91/b4d6685c27aba55bd82f25b278be8237038117d05f9659a6213ad3408130/rpds_py-2026.5.1-cp315-cp315t-manylinux_2_31_riscv64.whl", hash = "sha256:656a042550878f12d45752452d47094b7cfe5ad1e9d7b87b5a22ad3ae5ff8015", size = 383946, upload-time = "2026-05-28T12:01:41.043Z" }, - { url = "https://files.pythonhosted.org/packages/bd/79/2c1d832a53c8e0f8e98fc970ec257b950fecd4f62be2ab7182b500a0cbc8/rpds_py-2026.5.1-cp315-cp315t-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:73c4bd4f70294737b5206a3e8e30ccadbf8a60301831c8ea23eec5dbeea1ecfa", size = 405526, upload-time = "2026-05-28T12:01:43.032Z" }, - { url = "https://files.pythonhosted.org/packages/78/c4/c98117b03c6a8581ab2c2dfccfe9a5ad82bd8128a3c28b46a6ad2d97c393/rpds_py-2026.5.1-cp315-cp315t-musllinux_1_2_aarch64.whl", hash = "sha256:43bca78665423cabae77146f2fe7ce55272b6c8d55d82cca83effd42c7e13972", size = 551165, upload-time = "2026-05-28T12:01:44.648Z" }, - { url = "https://files.pythonhosted.org/packages/3b/c1/bc479ca069200af730881b1bd525e3114b2b391a351509fcb1b772f28086/rpds_py-2026.5.1-cp315-cp315t-musllinux_1_2_i686.whl", hash = "sha256:42d0f20e85e549c870749d0e247f0c10d318a45b7e9676d575d2dcb04a1b2e66", size = 618778, upload-time = "2026-05-28T12:01:46.337Z" }, - { url = "https://files.pythonhosted.org/packages/77/65/38ab2f90df44c2febfb63cc10ced40763d9b4bc94d173e734528663fe7f5/rpds_py-2026.5.1-cp315-cp315t-musllinux_1_2_x86_64.whl", hash = "sha256:b1be5c35683684d5331b93600c210e8367c254683d8a6df6bd21bd2da3a334fb", size = 581839, upload-time = "2026-05-28T12:01:48.109Z" }, - { url = "https://files.pythonhosted.org/packages/15/2d/ce1f605fe036aadd460e5822e578c6c7ec3a860936cca37d6e0f299daa77/rpds_py-2026.5.1-cp315-cp315t-win32.whl", hash = "sha256:75808f6c38ce7749bb68cc2770161aae5045e6c6f6781a9782e74b93304399df", size = 207866, upload-time = "2026-05-28T12:01:49.648Z" }, - { url = "https://files.pythonhosted.org/packages/79/cb/966040123eb102371559746908ef2c9471f4d43e17ec9a645a2258dab64b/rpds_py-2026.5.1-cp315-cp315t-win_amd64.whl", hash = "sha256:90bd6630002a1c7f09e7843dd79f0d24f3d2897cc25a753480917865d14f15b3", size = 225441, upload-time = "2026-05-28T12:01:51.408Z" }, -] - -[[package]] -name = "rq" -version = "2.3.2" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "click" }, - { name = "redis" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/43/8d/bb57bca979f48869aea0b7b9752b0887848a7098352753021fdcbdaf0efb/rq-2.3.2.tar.gz", hash = "sha256:5bd212992724428ec1689736abde783d245e7856bca39d89845884f5d580f5f1", size = 649216, upload-time = "2025-04-13T10:07:41.383Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/3f/bf/08d99660c138354a83105efa64988ee4adc8ddc6c74866f29508aaff00f7/rq-2.3.2-py3-none-any.whl", hash = "sha256:bf4dc622a7b9d5f7d4a39444f26d89ce6de8a1d6db61b21060612114dbf8d5ff", size = 100389, upload-time = "2025-04-13T10:07:38.965Z" }, -] - -[[package]] -name = "rq-scheduler" -version = "0.14.0" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "crontab" }, - { name = "freezegun" }, - { name = "python-dateutil" }, - { name = "rq" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/a0/4e/977bbcc1f3b25ed9ea60ec968b13f7147661defe5b2f9272b44fdb1c5549/rq-scheduler-0.14.0.tar.gz", hash = "sha256:2d5a14a1ab217f8693184ebaa1fe03838edcbc70b4f76572721c0b33058cd023", size = 16582, upload-time = "2024-10-29T13:30:32.641Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/bb/d0/28cedca9f3b321f30e69d644c2dcd7097ec21570ec9606fde56750621300/rq_scheduler-0.14.0-py2.py3-none-any.whl", hash = "sha256:d4ec221a3d8c11b3ff55e041f09d9af1e17f3253db737b6b97e86ab20fc3dc0d", size = 13874, upload-time = "2024-10-29T13:30:30.449Z" }, -] - [[package]] name = "ruamel-yaml" version = "0.19.1" @@ -3293,18 +1553,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/4e/b2/920464c907b191e37469d477a1aa8bc048b8f36c4c1610dfa4ab87b39e18/ruff-0.15.15-py3-none-win_arm64.whl", hash = "sha256:3c8ceca6792f38196b8f589bc92eccd03eef286602da92e5dc05cc42ef6441b7", size = 11138498, upload-time = "2026-05-28T14:16:38.425Z" }, ] -[[package]] -name = "s3transfer" -version = "0.17.1" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "botocore" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/11/b3/bcdc2f58fa92592db511beda154c2c08d28f21f6c4637f06a42a24b10c21/s3transfer-0.17.1.tar.gz", hash = "sha256:042dd5e3b1b512355e35a23f0223e426b7042e80b97830ea2680ddce327fc45e", size = 159439, upload-time = "2026-05-26T19:45:01.714Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/85/dd/904873250a6554fbae40cddbf9198e3cc37a2f1319d5e1a5ce82fe269c17/s3transfer-0.17.1-py3-none-any.whl", hash = "sha256:5b9827d1044159bbb01b86ef8902760ea39281927f5de31de75e1d657177bf4c", size = 88264, upload-time = "2026-05-26T19:45:00.452Z" }, -] - [[package]] name = "scipy" version = "1.17.1" @@ -3336,15 +1584,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/07/39/338d9219c4e87f3e708f18857ecd24d22a0c3094752393319553096b98af/scipy-1.17.1-cp314-cp314t-win_arm64.whl", hash = "sha256:200e1050faffacc162be6a486a984a0497866ec54149a01270adc8a59b7c7d21", size = 25489165, upload-time = "2026-02-23T00:22:29.563Z" }, ] -[[package]] -name = "send2trash" -version = "2.1.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/c5/f0/184b4b5f8d00f2a92cf96eec8967a3d550b52cf94362dad1100df9e48d57/send2trash-2.1.0.tar.gz", hash = "sha256:1c72b39f09457db3c05ce1d19158c2cbef4c32b8bedd02c155e49282b7ea7459", size = 17255, upload-time = "2026-01-14T06:27:36.056Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/1c/78/504fdd027da3b84ff1aecd9f6957e65f35134534ccc6da8628eb71e76d3f/send2trash-2.1.0-py3-none-any.whl", hash = "sha256:0da2f112e6d6bb22de6aa6daa7e144831a4febf2a87261451c4ad849fe9a873c", size = 17610, upload-time = "2026-01-14T06:27:35.218Z" }, -] - [[package]] name = "sentry-sdk" version = "2.61.1" @@ -3358,34 +1597,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/df/54/c9218db183846e08efaf68534889ef42e499dde432778881104a42f7071b/sentry_sdk-2.61.1-py3-none-any.whl", hash = "sha256:fa36eaf4b8ad708f718500d4bdcc1532637526a22beb874d88cbc0a46458b5ae", size = 483735, upload-time = "2026-06-01T07:24:17.027Z" }, ] -[[package]] -name = "setproctitle" -version = "1.3.7" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/8d/48/49393a96a2eef1ab418b17475fb92b8fcfad83d099e678751b05472e69de/setproctitle-1.3.7.tar.gz", hash = "sha256:bc2bc917691c1537d5b9bca1468437176809c7e11e5694ca79a9ca12345dcb9e", size = 27002, upload-time = "2025-09-05T12:51:25.278Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/89/c7/43ac3a98414f91d1b86a276bc2f799ad0b4b010e08497a95750d5bc42803/setproctitle-1.3.7-cp314-cp314-macosx_10_13_universal2.whl", hash = "sha256:80c36c6a87ff72eabf621d0c79b66f3bdd0ecc79e873c1e9f0651ee8bf215c63", size = 18052, upload-time = "2025-09-05T12:50:17.928Z" }, - { url = "https://files.pythonhosted.org/packages/cd/2c/dc258600a25e1a1f04948073826bebc55e18dbd99dc65a576277a82146fa/setproctitle-1.3.7-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:b53602371a52b91c80aaf578b5ada29d311d12b8a69c0c17fbc35b76a1fd4f2e", size = 13071, upload-time = "2025-09-05T12:50:19.061Z" }, - { url = "https://files.pythonhosted.org/packages/ab/26/8e3bb082992f19823d831f3d62a89409deb6092e72fc6940962983ffc94f/setproctitle-1.3.7-cp314-cp314-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:fcb966a6c57cf07cc9448321a08f3be6b11b7635be502669bc1d8745115d7e7f", size = 33180, upload-time = "2025-09-05T12:50:20.395Z" }, - { url = "https://files.pythonhosted.org/packages/f1/af/ae692a20276d1159dd0cf77b0bcf92cbb954b965655eb4a69672099bb214/setproctitle-1.3.7-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:46178672599b940368d769474fe13ecef1b587d58bb438ea72b9987f74c56ea5", size = 34043, upload-time = "2025-09-05T12:50:22.454Z" }, - { url = "https://files.pythonhosted.org/packages/34/b2/6a092076324dd4dac1a6d38482bedebbff5cf34ef29f58585ec76e47bc9d/setproctitle-1.3.7-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:7f9e9e3ff135cbcc3edd2f4cf29b139f4aca040d931573102742db70ff428c17", size = 35892, upload-time = "2025-09-05T12:50:23.937Z" }, - { url = "https://files.pythonhosted.org/packages/1c/1a/8836b9f28cee32859ac36c3df85aa03e1ff4598d23ea17ca2e96b5845a8f/setproctitle-1.3.7-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:14c7eba8d90c93b0e79c01f0bd92a37b61983c27d6d7d5a3b5defd599113d60e", size = 32898, upload-time = "2025-09-05T12:50:25.617Z" }, - { url = "https://files.pythonhosted.org/packages/ef/22/8fabdc24baf42defb599714799d8445fe3ae987ec425a26ec8e80ea38f8e/setproctitle-1.3.7-cp314-cp314-musllinux_1_2_ppc64le.whl", hash = "sha256:9e64e98077fb30b6cf98073d6c439cd91deb8ebbf8fc62d9dbf52bd38b0c6ac0", size = 34308, upload-time = "2025-09-05T12:50:26.827Z" }, - { url = "https://files.pythonhosted.org/packages/15/1b/b9bee9de6c8cdcb3b3a6cb0b3e773afdb86bbbc1665a3bfa424a4294fda2/setproctitle-1.3.7-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:b91387cc0f02a00ac95dcd93f066242d3cca10ff9e6153de7ee07069c6f0f7c8", size = 32536, upload-time = "2025-09-05T12:50:28.5Z" }, - { url = "https://files.pythonhosted.org/packages/37/0c/75e5f2685a5e3eda0b39a8b158d6d8895d6daf3ba86dec9e3ba021510272/setproctitle-1.3.7-cp314-cp314-win32.whl", hash = "sha256:52b054a61c99d1b72fba58b7f5486e04b20fefc6961cd76722b424c187f362ed", size = 12731, upload-time = "2025-09-05T12:50:43.955Z" }, - { url = "https://files.pythonhosted.org/packages/d2/ae/acddbce90d1361e1786e1fb421bc25baeb0c22ef244ee5d0176511769ec8/setproctitle-1.3.7-cp314-cp314-win_amd64.whl", hash = "sha256:5818e4080ac04da1851b3ec71e8a0f64e3748bf9849045180566d8b736702416", size = 13464, upload-time = "2025-09-05T12:50:45.057Z" }, - { url = "https://files.pythonhosted.org/packages/01/6d/20886c8ff2e6d85e3cabadab6aab9bb90acaf1a5cfcb04d633f8d61b2626/setproctitle-1.3.7-cp314-cp314t-macosx_10_13_universal2.whl", hash = "sha256:6fc87caf9e323ac426910306c3e5d3205cd9f8dcac06d233fcafe9337f0928a3", size = 18062, upload-time = "2025-09-05T12:50:29.78Z" }, - { url = "https://files.pythonhosted.org/packages/9a/60/26dfc5f198715f1343b95c2f7a1c16ae9ffa45bd89ffd45a60ed258d24ea/setproctitle-1.3.7-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:6134c63853d87a4897ba7d5cc0e16abfa687f6c66fc09f262bb70d67718f2309", size = 13075, upload-time = "2025-09-05T12:50:31.604Z" }, - { url = "https://files.pythonhosted.org/packages/21/9c/980b01f50d51345dd513047e3ba9e96468134b9181319093e61db1c47188/setproctitle-1.3.7-cp314-cp314t-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:1403d2abfd32790b6369916e2313dffbe87d6b11dca5bbd898981bcde48e7a2b", size = 34744, upload-time = "2025-09-05T12:50:32.777Z" }, - { url = "https://files.pythonhosted.org/packages/86/b4/82cd0c86e6d1c4538e1a7eb908c7517721513b801dff4ba3f98ef816a240/setproctitle-1.3.7-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:e7c5bfe4228ea22373e3025965d1a4116097e555ee3436044f5c954a5e63ac45", size = 35589, upload-time = "2025-09-05T12:50:34.13Z" }, - { url = "https://files.pythonhosted.org/packages/8a/4f/9f6b2a7417fd45673037554021c888b31247f7594ff4bd2239918c5cd6d0/setproctitle-1.3.7-cp314-cp314t-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:585edf25e54e21a94ccb0fe81ad32b9196b69ebc4fc25f81da81fb8a50cca9e4", size = 37698, upload-time = "2025-09-05T12:50:35.524Z" }, - { url = "https://files.pythonhosted.org/packages/20/92/927b7d4744aac214d149c892cb5fa6dc6f49cfa040cb2b0a844acd63dcaf/setproctitle-1.3.7-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:96c38cdeef9036eb2724c2210e8d0b93224e709af68c435d46a4733a3675fee1", size = 34201, upload-time = "2025-09-05T12:50:36.697Z" }, - { url = "https://files.pythonhosted.org/packages/0a/0c/fd4901db5ba4b9d9013e62f61d9c18d52290497f956745cd3e91b0d80f90/setproctitle-1.3.7-cp314-cp314t-musllinux_1_2_ppc64le.whl", hash = "sha256:45e3ef48350abb49cf937d0a8ba15e42cee1e5ae13ca41a77c66d1abc27a5070", size = 35801, upload-time = "2025-09-05T12:50:38.314Z" }, - { url = "https://files.pythonhosted.org/packages/e7/e3/54b496ac724e60e61cc3447f02690105901ca6d90da0377dffe49ff99fc7/setproctitle-1.3.7-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:1fae595d032b30dab4d659bece20debd202229fce12b55abab978b7f30783d73", size = 33958, upload-time = "2025-09-05T12:50:39.841Z" }, - { url = "https://files.pythonhosted.org/packages/ea/a8/c84bb045ebf8c6fdc7f7532319e86f8380d14bbd3084e6348df56bdfe6fd/setproctitle-1.3.7-cp314-cp314t-win32.whl", hash = "sha256:02432f26f5d1329ab22279ff863c83589894977063f59e6c4b4845804a08f8c2", size = 12745, upload-time = "2025-09-05T12:50:41.377Z" }, - { url = "https://files.pythonhosted.org/packages/08/b6/3a5a4f9952972791a9114ac01dfc123f0df79903577a3e0a7a404a695586/setproctitle-1.3.7-cp314-cp314t-win_amd64.whl", hash = "sha256:cbc388e3d86da1f766d8fc2e12682e446064c01cea9f88a88647cfe7c011de6a", size = 13469, upload-time = "2025-09-05T12:50:42.67Z" }, -] - [[package]] name = "shellingham" version = "1.5.4" @@ -3404,15 +1615,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/b7/ce/149a00dd41f10bc29e5921b496af8b574d8413afcd5e30dfa0ed46c2cc5e/six-1.17.0-py2.py3-none-any.whl", hash = "sha256:4721f391ed90541fddacab5acf947aa0d3dc7d27b2e1e8eda2be8970586c3274", size = 11050, upload-time = "2024-12-04T17:35:26.475Z" }, ] -[[package]] -name = "soupsieve" -version = "2.8.4" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/47/2c/0a5f6f8ee0d5589e48c7640213ed5175d52cf540a06725b628cc1a45d6ce/soupsieve-2.8.4.tar.gz", hash = "sha256:e121fd02e975c695e4e9e8774a5ee35d74714b59307868dcc5319ad2d9e3328e", size = 121110, upload-time = "2026-05-24T13:55:57.154Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/5e/f5/0c41cb68dcae6b7de4fac4188a3a9589e21fb31df21ea3a2e888db95e6c9/soupsieve-2.8.4-py3-none-any.whl", hash = "sha256:e7e6b0769c8f51ed59acab6e994b00621096cfb1c640a7509295987388fbaf65", size = 37304, upload-time = "2026-05-24T13:55:55.406Z" }, -] - [[package]] name = "spglib" version = "2.7.0" @@ -3433,20 +1635,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/28/97/459b37c3802633f77c883883c75f5d4429b601ae8d930410b999c4e1dafb/spglib-2.7.0-cp314-cp314t-win_amd64.whl", hash = "sha256:cb77daaf9dd5d48d523a888f37cebd47fa63ff28dfcf1aac2b031b914f9ed55a", size = 696536, upload-time = "2025-12-29T09:48:13.885Z" }, ] -[[package]] -name = "stack-data" -version = "0.6.3" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "asttokens" }, - { name = "executing" }, - { name = "pure-eval" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/28/e3/55dcc2cfbc3ca9c29519eb6884dd1415ecb53b0e934862d3559ddcb7e20b/stack_data-0.6.3.tar.gz", hash = "sha256:836a778de4fec4dcd1dcd89ed8abff8a221f58308462e1c4aa2a3cf30148f0b9", size = 44707, upload-time = "2023-09-30T13:58:05.479Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/f1/7b/ce1eafaf1a76852e2ec9b22edecf1daa58175c090266e9f6c64afcd81d91/stack_data-0.6.3-py3-none-any.whl", hash = "sha256:d5558e0c25a4cb0853cddad3d77da9891a08cb85dd9f9f91b9f8cd66e511e695", size = 24521, upload-time = "2023-09-30T13:58:03.53Z" }, -] - [[package]] name = "starlette" version = "1.2.0" @@ -3468,15 +1656,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/a8/45/a132b9074aa18e799b891b91ad72133c98d8042c70f6240e4c5f9dabee2f/structlog-25.5.0-py3-none-any.whl", hash = "sha256:a8453e9b9e636ec59bd9e79bbd4a72f025981b3ba0f5837aebf48f02f37a7f9f", size = 72510, upload-time = "2025-10-27T08:28:21.535Z" }, ] -[[package]] -name = "supervisor" -version = "4.3.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/a9/b5/37e7a3706de436a8a2d75334711dad1afb4ddffab09f25e31d89e467542f/supervisor-4.3.0.tar.gz", hash = "sha256:4a2bf149adf42997e1bb44b70c43b613275ec9852c3edacca86a9166b27e945e", size = 468912, upload-time = "2025-08-23T18:25:02.418Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/0e/65/5e726c372da8a5e35022a94388b12252710aad0c2351699c3d76ae8dba78/supervisor-4.3.0-py2.py3-none-any.whl", hash = "sha256:0bcb763fddafba410f35cbde226aa7f8514b9fb82eb05a0c85f6588d1c13f8db", size = 320736, upload-time = "2025-08-23T18:25:00.767Z" }, -] - [[package]] name = "sympy" version = "1.14.0" @@ -3498,49 +1677,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/99/55/db07de81b5c630da5cbf5c7df646580ca26dfaefa593667fc6f2fe016d2e/tabulate-0.10.0-py3-none-any.whl", hash = "sha256:f0b0622e567335c8fabaaa659f1b33bcb6ddfe2e496071b743aa113f8774f2d3", size = 39814, upload-time = "2026-03-04T18:55:31.284Z" }, ] -[[package]] -name = "terminado" -version = "0.18.1" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "ptyprocess", marker = "os_name != 'nt'" }, - { name = "pywinpty", marker = "os_name == 'nt'" }, - { name = "tornado" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/8a/11/965c6fd8e5cc254f1fe142d547387da17a8ebfd75a3455f637c663fb38a0/terminado-0.18.1.tar.gz", hash = "sha256:de09f2c4b85de4765f7714688fff57d3e75bad1f909b589fde880460c753fd2e", size = 32701, upload-time = "2024-03-12T14:34:39.026Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/6a/9e/2064975477fdc887e47ad42157e214526dcad8f317a948dee17e1659a62f/terminado-0.18.1-py3-none-any.whl", hash = "sha256:a4468e1b37bb318f8a86514f65814e1afc977cf29b3992a4500d9dd305dcceb0", size = 14154, upload-time = "2024-03-12T14:34:36.569Z" }, -] - -[[package]] -name = "tinycss2" -version = "1.4.0" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "webencodings" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/7a/fd/7a5ee21fd08ff70d3d33a5781c255cbe779659bd03278feb98b19ee550f4/tinycss2-1.4.0.tar.gz", hash = "sha256:10c0972f6fc0fbee87c3edb76549357415e94548c1ae10ebccdea16fb404a9b7", size = 87085, upload-time = "2024-10-24T14:58:29.895Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/e6/34/ebdc18bae6aa14fbee1a08b63c015c72b64868ff7dae68808ab500c492e2/tinycss2-1.4.0-py3-none-any.whl", hash = "sha256:3a49cf47b7675da0b15d0c6e1df8df4ebd96e9394bb905a5775adb0d884c5289", size = 26610, upload-time = "2024-10-24T14:58:28.029Z" }, -] - -[[package]] -name = "tornado" -version = "6.5.6" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/50/57/6d7303a77ae439d9189108f76c0c4fd89ee5e2cc8387bffb55232565c4ed/tornado-6.5.6.tar.gz", hash = "sha256:9a365179fe8ff6b8766f602c0f67c185d778193e9bdd828b19f0b6ed7764177d", size = 518139, upload-time = "2026-05-27T15:35:54.646Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/1b/0d/b4f481e18c5a51864e6d12b9a05ecf72919696680b747c958c3fc1f4fbae/tornado-6.5.6-cp39-abi3-macosx_10_9_universal2.whl", hash = "sha256:65fcfaafb079435c2c19dc9e07c0f1cf0fa9051759ed0a7d0a3ba7ea7f64919c", size = 447737, upload-time = "2026-05-27T15:35:38.122Z" }, - { url = "https://files.pythonhosted.org/packages/9e/9c/5430c39fcab1144d35860f457b15e9c08b4bc7ac86764354204e983d6183/tornado-6.5.6-cp39-abi3-macosx_10_9_x86_64.whl", hash = "sha256:38bc01b4acacded2de63ae78023548e41ebe6fbed3ec05a796d7ae3ad893887e", size = 445899, upload-time = "2026-05-27T15:35:40.519Z" }, - { url = "https://files.pythonhosted.org/packages/8b/79/fa7e14a2f939c807a8d30619b4eb604eab219601b78792516ebe22d40cf9/tornado-6.5.6-cp39-abi3-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:b942e6a137fda31ff54bf8e6e2c8d1c37f1f50583f3ed53fb840b53b9601d104", size = 448964, upload-time = "2026-05-27T15:35:42.106Z" }, - { url = "https://files.pythonhosted.org/packages/a7/71/bd67d5f5199f937dafe03a49a37989f60f600ff6fef34c79412a829d97bd/tornado-6.5.6-cp39-abi3-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:8666946e70171b8c3f1fc9b7876fac492e84822c4c7f3746f4e8f8bc9ac92a79", size = 449935, upload-time = "2026-05-27T15:35:43.906Z" }, - { url = "https://files.pythonhosted.org/packages/cc/a4/c24388c9cf5b3c3a513b56a158af9f23092c9a2810d789e294310797df21/tornado-6.5.6-cp39-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:1c34cfab7ad6d104f052f55de06d39bbafc5885cfeb4da688803308dbcfa90b7", size = 449767, upload-time = "2026-05-27T15:35:45.793Z" }, - { url = "https://files.pythonhosted.org/packages/a5/eb/6a07ad550c3f7b37244bd0becdf293ec3d3e961783d8b720a97df50de1b2/tornado-6.5.6-cp39-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:385f35e4e22fb52551dfcda4cdc8c30c61c2c001aef5ddad99cdfe116952efd3", size = 449174, upload-time = "2026-05-27T15:35:47.485Z" }, - { url = "https://files.pythonhosted.org/packages/bb/84/3469e098dccdb6763130e06aacd786bb4363fca7b590a55c101ddf34ed30/tornado-6.5.6-cp39-abi3-win32.whl", hash = "sha256:db475f1b67b2809b10bb16264829087724ca8d24fe4ed47f7b8675cae453ef86", size = 450230, upload-time = "2026-05-27T15:35:49.322Z" }, - { url = "https://files.pythonhosted.org/packages/d2/3c/273a04e0b9dd9016f1685cca0c1c8795a71ac88a34a8c889a0b443483226/tornado-6.5.6-cp39-abi3-win_amd64.whl", hash = "sha256:6739bf1e8eb09230f1280ddbd3236f0309db70f2c551a8dbc40f62babdf82f79", size = 450667, upload-time = "2026-05-27T15:35:51.194Z" }, - { url = "https://files.pythonhosted.org/packages/02/98/0cffe22a224f60c5fb1e3aa0b76f9da2e1ca78b0e9545e3d077c68ce60a7/tornado-6.5.6-cp39-abi3-win_arm64.whl", hash = "sha256:2543597b24a695d72338a9a77818362d72387c03ae173f1f169eadc5c91466ac", size = 449690, upload-time = "2026-05-27T15:35:52.902Z" }, -] - [[package]] name = "tqdm" version = "4.67.3" @@ -3553,15 +1689,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/16/e1/3079a9ff9b8e11b846c6ac5c8b5bfb7ff225eee721825310c91b3b50304f/tqdm-4.67.3-py3-none-any.whl", hash = "sha256:ee1e4c0e59148062281c49d80b25b67771a127c85fc9676d3be5f243206826bf", size = 78374, upload-time = "2026-02-03T17:35:50.982Z" }, ] -[[package]] -name = "traitlets" -version = "5.15.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/1b/22/40f55b26baeab80c2d7b3f1db0682f8954e4617fee7d90ce634022ef05c6/traitlets-5.15.0.tar.gz", hash = "sha256:4fead733f81cf1c4c938e06f8ca4633896833c9d89eff878159457f4d4392971", size = 163197, upload-time = "2026-05-06T08:05:58.016Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/da/98/a9937a969d018a23badfea0b381f66783649d48e0ea6c41923265c3cbeb3/traitlets-5.15.0-py3-none-any.whl", hash = "sha256:fb36a18867a6803deab09f3c5e0fa81bb7b26a5c9e82501c9933f759166eff40", size = 85877, upload-time = "2026-05-06T08:05:55.853Z" }, -] - [[package]] name = "truststore" version = "0.10.4" @@ -3616,18 +1743,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/ce/e4/dccd7f47c4b64213ac01ef921a1337ee6e30e8c6466046018326977efd95/tzdata-2026.2-py2.py3-none-any.whl", hash = "sha256:bbe9af844f658da81a5f95019480da3a89415801f6cc966806612cc7169bffe7", size = 349321, upload-time = "2026-04-24T15:22:05.876Z" }, ] -[[package]] -name = "tzlocal" -version = "5.3.1" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "tzdata", marker = "sys_platform == 'win32'" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/8b/2e/c14812d3d4d9cd1773c6be938f89e5735a1f11a9f184ac3639b93cef35d5/tzlocal-5.3.1.tar.gz", hash = "sha256:cceffc7edecefea1f595541dbd6e990cb1ea3d19bf01b2809f362a03dd7921fd", size = 30761, upload-time = "2025-03-05T21:17:41.549Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/c2/14/e2a54fabd4f08cd7af1c07030603c3356b74da07f7cc056e600436edfa17/tzlocal-5.3.1-py3-none-any.whl", hash = "sha256:eb1a66c3ef5847adf7a834f1be0800581b683b5608e74f86ecbcef8ab91bb85d", size = 18026, upload-time = "2025-03-05T21:17:39.857Z" }, -] - [[package]] name = "uncertainties" version = "3.2.3" @@ -3637,15 +1752,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/8f/5e/f1e1dd319e35e962a4e00b33150a8868b6329cc1d19fd533436ba5488f09/uncertainties-3.2.3-py3-none-any.whl", hash = "sha256:313353900d8f88b283c9bad81e7d2b2d3d4bcc330cbace35403faaed7e78890a", size = 60118, upload-time = "2025-04-21T19:58:26.864Z" }, ] -[[package]] -name = "uri-template" -version = "1.3.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/31/c7/0336f2bd0bcbada6ccef7aaa25e443c118a704f828a0620c6fa0207c1b64/uri-template-1.3.0.tar.gz", hash = "sha256:0e00f8eb65e18c7de20d595a14336e9f337ead580c70934141624b6d1ffdacc7", size = 21678, upload-time = "2023-06-21T01:49:05.374Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/e7/00/3fca040d7cf8a32776d3d81a00c8ee7457e00f80c649f1e4a863c8321ae9/uri_template-1.3.0-py3-none-any.whl", hash = "sha256:a44a133ea12d44a0c0f06d7d42a52d71282e77e2f937d8abd5655b8d56fc1363", size = 11140, upload-time = "2023-06-21T01:49:03.467Z" }, -] - [[package]] name = "urllib3" version = "2.7.0" @@ -3746,42 +1852,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/46/4b/95ab2f256bb4af3cb2eb23b9317bda984ee6e0f11733a5c004a6c95b06e3/watchfiles-1.2.0-cp315-cp315-musllinux_1_1_x86_64.whl", hash = "sha256:922c0e019fe68b3ae392965a766b02a71ba1168c932cebc3733cd52c5fe5b377", size = 657684, upload-time = "2026-05-18T04:31:32.027Z" }, ] -[[package]] -name = "wcwidth" -version = "0.7.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/2c/ee/afaf0f85a9a18fe47a67f1e4422ed6cf1fe642f0ae0a2f81166231303c52/wcwidth-0.7.0.tar.gz", hash = "sha256:90e3a7ea092341c44b99562e75d09e4d5160fe7a3974c6fb842a101a95e7eed0", size = 182132, upload-time = "2026-05-02T16:04:12.653Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/41/52/e465037f5375f43533d1a80b6923955201596a99142ed524d77b571a1418/wcwidth-0.7.0-py3-none-any.whl", hash = "sha256:5d69154c429a82910e241c738cd0e2976fac8a2dd47a1a805f4afed1c0f136f2", size = 110825, upload-time = "2026-05-02T16:04:11.033Z" }, -] - -[[package]] -name = "webcolors" -version = "25.10.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/1d/7a/eb316761ec35664ea5174709a68bbd3389de60d4a1ebab8808bfc264ed67/webcolors-25.10.0.tar.gz", hash = "sha256:62abae86504f66d0f6364c2a8520de4a0c47b80c03fc3a5f1815fedbef7c19bf", size = 53491, upload-time = "2025-10-31T07:51:03.977Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/e2/cc/e097523dd85c9cf5d354f78310927f1656c422bd7b2613b2db3e3f9a0f2c/webcolors-25.10.0-py3-none-any.whl", hash = "sha256:032c727334856fc0b968f63daa252a1ac93d33db2f5267756623c210e57a4f1d", size = 14905, upload-time = "2025-10-31T07:51:01.778Z" }, -] - -[[package]] -name = "webencodings" -version = "0.5.1" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/0b/02/ae6ceac1baeda530866a85075641cec12989bd8d31af6d5ab4a3e8c92f47/webencodings-0.5.1.tar.gz", hash = "sha256:b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923", size = 9721, upload-time = "2017-04-05T20:21:34.189Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/f4/24/2a3e3df732393fed8b3ebf2ec078f05546de641fe1b667ee316ec1dcf3b7/webencodings-0.5.1-py2.py3-none-any.whl", hash = "sha256:a0af1213f3c2226497a97e2b3aa01a7e4bee4f403f95be16fc9acd2947514a78", size = 11774, upload-time = "2017-04-05T20:21:32.581Z" }, -] - -[[package]] -name = "websocket-client" -version = "1.9.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/2c/41/aa4bf9664e4cda14c3b39865b12251e8e7d239f4cd0e3cc1b6c2ccde25c1/websocket_client-1.9.0.tar.gz", hash = "sha256:9e813624b6eb619999a97dc7958469217c3176312b3a16a4bd1bc7e08a46ec98", size = 70576, upload-time = "2025-10-07T21:16:36.495Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/34/db/b10e48aa8fff7407e67470363eac595018441cf32d5e1001567a7aeba5d2/websocket_client-1.9.0-py3-none-any.whl", hash = "sha256:af248a825037ef591efbf6ed20cc5faa03d3b47b9e5a2230a529eeee1c1fc3ef", size = 82616, upload-time = "2025-10-07T21:16:34.951Z" }, -] - [[package]] name = "websockets" version = "16.0" @@ -3809,18 +1879,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/6f/28/258ebab549c2bf3e64d2b0217b973467394a9cea8c42f70418ca2c5d0d2e/websockets-16.0-py3-none-any.whl", hash = "sha256:1637db62fad1dc833276dded54215f2c7fa46912301a24bd94d45d46a011ceec", size = 171598, upload-time = "2026-01-10T09:23:45.395Z" }, ] -[[package]] -name = "werkzeug" -version = "3.1.8" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "markupsafe" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/dd/b2/381be8cfdee792dd117872481b6e378f85c957dd7c5bca38897b08f765fd/werkzeug-3.1.8.tar.gz", hash = "sha256:9bad61a4268dac112f1c5cd4630a56ede601b6ed420300677a869083d70a4c44", size = 875852, upload-time = "2026-04-02T18:49:14.268Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/93/8c/2e650f2afeb7ee576912636c23ddb621c91ac6a98e66dc8d29c3c69446e1/werkzeug-3.1.8-py3-none-any.whl", hash = "sha256:63a77fb8892bf28ebc3178683445222aa500e48ebad5ec77b0ad80f8726b1f50", size = 226459, upload-time = "2026-04-02T18:49:12.72Z" }, -] - [[package]] name = "wrapt" version = "2.2.1" @@ -3851,56 +1909,3 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/9f/c0/782b86e28d1ceebeb74cccea12d2cd3d2ba0bd68e3dec20b1bc5873f6127/wrapt-2.2.1-cp314-cp314t-win_arm64.whl", hash = "sha256:f70db64e8266d7c45d3b735f2e08eeb434b5e03da9a479ae42b2e2e486a21a00", size = 80722, upload-time = "2026-05-22T14:49:23.59Z" }, { url = "https://files.pythonhosted.org/packages/53/46/29ac9daf11a86c22a8c38cd9236c62928ccae83f7ceb06bd3b0467cf9d05/wrapt-2.2.1-py3-none-any.whl", hash = "sha256:3aafea2975caef8ca49400640dde02cc7426e798f24870ed01f490bc3cffd32f", size = 61000, upload-time = "2026-05-22T14:49:41.593Z" }, ] - -[[package]] -name = "zope-event" -version = "6.2" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/93/41/faa10af34d48d9cd6fa0249a1162943ad84a9590bd1a06939981e6640416/zope_event-6.2.tar.gz", hash = "sha256:b97d5d6327067ee6b9dfcbdf606ade9ade70991e19c162e808ea39e5fcf0f8d3", size = 18958, upload-time = "2026-04-28T06:24:10.578Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/9e/33/848922889e946d4befc415c219fe516af75c49555d8e736e183bfd30db42/zope_event-6.2-py3-none-any.whl", hash = "sha256:5e755153ac4faf64c10a4b6dd3307680166a3edf65b38df22df592610f8fa874", size = 6525, upload-time = "2026-04-28T06:24:09.176Z" }, -] - -[[package]] -name = "zope-interface" -version = "8.5" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/08/dc/50550cfcbb2ea3cbca5f1d7ed05c8aa840f831a0f2d63aec0a953f7c590e/zope_interface-8.5.tar.gz", hash = "sha256:7a3ba1c5877f0f3e3906b02ddf793abed2becc2948116414ce0e1dd820b68d6d", size = 257957, upload-time = "2026-05-26T06:50:14.574Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/d4/19/5032e954827fdf02db2d2f49737ac4378bb9cfc2cd95a8f2e2a5ae2ec01a/zope_interface-8.5-cp314-cp314-macosx_10_9_x86_64.whl", hash = "sha256:ffaecf013251a89d0de6feb49a46eba48ad8cbbf8a40aeb6045e459e7bec6784", size = 212597, upload-time = "2026-05-26T06:49:51.63Z" }, - { url = "https://files.pythonhosted.org/packages/f1/53/3ef644012cf8a6a234a2d6134aab5a5c65ac5467c86296865501d4fbc406/zope_interface-8.5-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:126fa9d1c52295ae076d4cf968634f0a1826afa408a20808b57ff72877b8f69f", size = 212626, upload-time = "2026-05-26T06:49:53.236Z" }, - { url = "https://files.pythonhosted.org/packages/32/67/bc8b4f465d388039255003e230c284a175cedf1203c692f23cb7bff64efe/zope_interface-8.5-cp314-cp314-manylinux1_i686.manylinux2014_i686.manylinux_2_17_i686.manylinux_2_5_i686.whl", hash = "sha256:3090e3a663d20194756a59a272e0c8508b889341e31d5894223331fe6b4f9b21", size = 266827, upload-time = "2026-05-26T06:49:54.873Z" }, - { url = "https://files.pythonhosted.org/packages/a7/eb/37d05b935ede53d79690fecc8d201440084418e590bcfc05f384451c7593/zope_interface-8.5-cp314-cp314-manylinux1_x86_64.manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:9342fb74e2afefdb081bf1df727d209ea56995c6e13f5a0540e6d7aff4beafb8", size = 270139, upload-time = "2026-05-26T06:49:57.116Z" }, - { url = "https://files.pythonhosted.org/packages/8b/0b/fd0c54579e2ce8dc6cf1a757903f3374bc6fbda929a46af9e0f53cb0e5f0/zope_interface-8.5-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:6c54725d818f1b57a7efb8b16528326e1f3c257b602b32393fd255c45af8799d", size = 270338, upload-time = "2026-05-26T06:49:58.698Z" }, - { url = "https://files.pythonhosted.org/packages/c1/1d/c420dcd777bb761067ea92879ac766694a5ca78608185f1aecea64cbfc11/zope_interface-8.5-cp314-cp314-win_amd64.whl", hash = "sha256:29d74febbae1afeb6834c4ccbf42e242a673c860060f09e53142825270456140", size = 215789, upload-time = "2026-05-26T06:50:00.405Z" }, - { url = "https://files.pythonhosted.org/packages/62/94/50b5eb8f94e527edceac14f9955e58917424ea79bb572ddc18548561cbc2/zope_interface-8.5-cp314-cp314-win_arm64.whl", hash = "sha256:633c8c49396f38df030340797c533e9fe460d1b5d1e42d88e55e938e525f548c", size = 213757, upload-time = "2026-05-26T06:50:01.973Z" }, - { url = "https://files.pythonhosted.org/packages/17/6f/5d5f32c4dfcdb16ce2ec5363da686840f13c13e1a1214cb70b49e1cd6d9f/zope_interface-8.5-cp314-cp314t-macosx_10_9_x86_64.whl", hash = "sha256:133999820fdbae513c36c03d6f29ef87317aaa3edef39112222b155083664714", size = 213591, upload-time = "2026-05-26T06:50:03.529Z" }, - { url = "https://files.pythonhosted.org/packages/f3/55/de0c3459ff717fce3342f9a29464c281fdeb0d36c3171ee88d119d5f0650/zope_interface-8.5-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:8bd75c96966e573232f0599deaff717564828031c7f05563ccc1ac35c5ee0304", size = 213733, upload-time = "2026-05-26T06:50:05.101Z" }, - { url = "https://files.pythonhosted.org/packages/c2/95/d97430abd5ae9677e8b9295b58720c0064a5b557dbb6b8bf5928484cf0d8/zope_interface-8.5-cp314-cp314t-manylinux1_i686.manylinux2014_i686.manylinux_2_17_i686.manylinux_2_5_i686.whl", hash = "sha256:14b0e9799351d4c34fe99afd67f0cdd76e55ba15c66a98699d5fc22ea8241e08", size = 294905, upload-time = "2026-05-26T06:50:07.384Z" }, - { url = "https://files.pythonhosted.org/packages/41/ec/a0f8f3dad6e74992f4654bdd94802be0929eabca7b871cac3b6fbb5e961b/zope_interface-8.5-cp314-cp314t-manylinux1_x86_64.manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:0cd6a732ac84b94eb1ef9222a117347a27efd294ee16810ffdf7ecd307677ed5", size = 300885, upload-time = "2026-05-26T06:50:08.997Z" }, - { url = "https://files.pythonhosted.org/packages/0f/da/6881b48803a0ee8d23eb5efa30fce3ed218a2bd9de5758ce489d224fee81/zope_interface-8.5-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:798b7c87d0e59a7d5d086d642208d0d8700ff0d55c4029134b3c479c3bfb110f", size = 304672, upload-time = "2026-05-26T06:50:10.563Z" }, - { url = "https://files.pythonhosted.org/packages/2e/0e/b4c01320859ff1d585438bc231fd60bd258d096359bccf6654fecdf0cffb/zope_interface-8.5-cp314-cp314t-win_amd64.whl", hash = "sha256:0fc3a9d45f114d27eaa1e53beeb144533689edca8a9f66505b1e8e8b3f075e42", size = 217241, upload-time = "2026-05-26T06:50:12.171Z" }, -] - -[[package]] -name = "zstandard" -version = "0.25.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/fd/aa/3e0508d5a5dd96529cdc5a97011299056e14c6505b678fd58938792794b1/zstandard-0.25.0.tar.gz", hash = "sha256:7713e1179d162cf5c7906da876ec2ccb9c3a9dcbdffef0cc7f70c3667a205f0b", size = 711513, upload-time = "2025-09-14T22:15:54.002Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/3d/5c/f8923b595b55fe49e30612987ad8bf053aef555c14f05bb659dd5dbe3e8a/zstandard-0.25.0-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:e29f0cf06974c899b2c188ef7f783607dbef36da4c242eb6c82dcd8b512855e3", size = 795887, upload-time = "2025-09-14T22:17:54.198Z" }, - { url = "https://files.pythonhosted.org/packages/8d/09/d0a2a14fc3439c5f874042dca72a79c70a532090b7ba0003be73fee37ae2/zstandard-0.25.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:05df5136bc5a011f33cd25bc9f506e7426c0c9b3f9954f056831ce68f3b6689f", size = 640658, upload-time = "2025-09-14T22:17:55.423Z" }, - { url = "https://files.pythonhosted.org/packages/5d/7c/8b6b71b1ddd517f68ffb55e10834388d4f793c49c6b83effaaa05785b0b4/zstandard-0.25.0-cp314-cp314-manylinux2010_i686.manylinux_2_12_i686.manylinux_2_28_i686.whl", hash = "sha256:f604efd28f239cc21b3adb53eb061e2a205dc164be408e553b41ba2ffe0ca15c", size = 5379849, upload-time = "2025-09-14T22:17:57.372Z" }, - { url = "https://files.pythonhosted.org/packages/a4/86/a48e56320d0a17189ab7a42645387334fba2200e904ee47fc5a26c1fd8ca/zstandard-0.25.0-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:223415140608d0f0da010499eaa8ccdb9af210a543fac54bce15babbcfc78439", size = 5058095, upload-time = "2025-09-14T22:17:59.498Z" }, - { url = "https://files.pythonhosted.org/packages/f8/ad/eb659984ee2c0a779f9d06dbfe45e2dc39d99ff40a319895df2d3d9a48e5/zstandard-0.25.0-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:2e54296a283f3ab5a26fc9b8b5d4978ea0532f37b231644f367aa588930aa043", size = 5551751, upload-time = "2025-09-14T22:18:01.618Z" }, - { url = "https://files.pythonhosted.org/packages/61/b3/b637faea43677eb7bd42ab204dfb7053bd5c4582bfe6b1baefa80ac0c47b/zstandard-0.25.0-cp314-cp314-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:ca54090275939dc8ec5dea2d2afb400e0f83444b2fc24e07df7fdef677110859", size = 6364818, upload-time = "2025-09-14T22:18:03.769Z" }, - { url = "https://files.pythonhosted.org/packages/31/dc/cc50210e11e465c975462439a492516a73300ab8caa8f5e0902544fd748b/zstandard-0.25.0-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:e09bb6252b6476d8d56100e8147b803befa9a12cea144bbe629dd508800d1ad0", size = 5560402, upload-time = "2025-09-14T22:18:05.954Z" }, - { url = "https://files.pythonhosted.org/packages/c9/ae/56523ae9c142f0c08efd5e868a6da613ae76614eca1305259c3bf6a0ed43/zstandard-0.25.0-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:a9ec8c642d1ec73287ae3e726792dd86c96f5681eb8df274a757bf62b750eae7", size = 4955108, upload-time = "2025-09-14T22:18:07.68Z" }, - { url = "https://files.pythonhosted.org/packages/98/cf/c899f2d6df0840d5e384cf4c4121458c72802e8bda19691f3b16619f51e9/zstandard-0.25.0-cp314-cp314-musllinux_1_2_i686.whl", hash = "sha256:a4089a10e598eae6393756b036e0f419e8c1d60f44a831520f9af41c14216cf2", size = 5269248, upload-time = "2025-09-14T22:18:09.753Z" }, - { url = "https://files.pythonhosted.org/packages/1b/c0/59e912a531d91e1c192d3085fc0f6fb2852753c301a812d856d857ea03c6/zstandard-0.25.0-cp314-cp314-musllinux_1_2_ppc64le.whl", hash = "sha256:f67e8f1a324a900e75b5e28ffb152bcac9fbed1cc7b43f99cd90f395c4375344", size = 5430330, upload-time = "2025-09-14T22:18:11.966Z" }, - { url = "https://files.pythonhosted.org/packages/a0/1d/7e31db1240de2df22a58e2ea9a93fc6e38cc29353e660c0272b6735d6669/zstandard-0.25.0-cp314-cp314-musllinux_1_2_s390x.whl", hash = "sha256:9654dbc012d8b06fc3d19cc825af3f7bf8ae242226df5f83936cb39f5fdc846c", size = 5811123, upload-time = "2025-09-14T22:18:13.907Z" }, - { url = "https://files.pythonhosted.org/packages/f6/49/fac46df5ad353d50535e118d6983069df68ca5908d4d65b8c466150a4ff1/zstandard-0.25.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:4203ce3b31aec23012d3a4cf4a2ed64d12fea5269c49aed5e4c3611b938e4088", size = 5359591, upload-time = "2025-09-14T22:18:16.465Z" }, - { url = "https://files.pythonhosted.org/packages/c2/38/f249a2050ad1eea0bb364046153942e34abba95dd5520af199aed86fbb49/zstandard-0.25.0-cp314-cp314-win32.whl", hash = "sha256:da469dc041701583e34de852d8634703550348d5822e66a0c827d39b05365b12", size = 444513, upload-time = "2025-09-14T22:18:20.61Z" }, - { url = "https://files.pythonhosted.org/packages/3a/43/241f9615bcf8ba8903b3f0432da069e857fc4fd1783bd26183db53c4804b/zstandard-0.25.0-cp314-cp314-win_amd64.whl", hash = "sha256:c19bcdd826e95671065f8692b5a4aa95c52dc7a02a4c5a0cac46deb879a017a2", size = 516118, upload-time = "2025-09-14T22:18:17.849Z" }, - { url = "https://files.pythonhosted.org/packages/f0/ef/da163ce2450ed4febf6467d77ccb4cd52c4c30ab45624bad26ca0a27260c/zstandard-0.25.0-cp314-cp314-win_arm64.whl", hash = "sha256:d7541afd73985c630bafcd6338d2518ae96060075f9463d7dc14cfb33514383d", size = 476940, upload-time = "2025-09-14T22:18:19.088Z" }, -] From f21e78173870b2d42fa70677ba4f1699567f9386 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 4 Jun 2026 10:34:10 -0700 Subject: [PATCH 057/591] Reordered deps --- mpcontribs-api/pyproject.toml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mpcontribs-api/pyproject.toml b/mpcontribs-api/pyproject.toml index f0e1650603..6305ba69e1 100644 --- a/mpcontribs-api/pyproject.toml +++ b/mpcontribs-api/pyproject.toml @@ -26,17 +26,17 @@ authors = [ {name="The Materials Project", email="feedback@materialsproject.org"}, ] dependencies = [ - #"jinja2", - #"pint>=0.24", + # "jinja2", + # "pint>=0.24", # "psycopg2-binary", - "pymatgen", - #"rq<=2.3.2", # see https://github.com/rq/Flask-RQ2/issues/620 - #"supervisor", + # "rq<=2.3.2", # see https://github.com/rq/Flask-RQ2/issues/620 + # "supervisor", # "setproctitle", # "uncertainties", # "websocket_client", # "zstandard", "fastapi[standard]>=0.136.3", + "pymatgen", "pymongo>=4.17.0", "pydantic-settings>=2.14.1", "structlog>=25.5.0", From eb2ddf9451eea129bfbd72bf7bfe27a47a192dbf Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 4 Jun 2026 11:11:08 -0700 Subject: [PATCH 058/591] fields argument in routers now expects a list instead of comma delimited string --- .../domains/contributions/models.py | 12 ++++++++ .../domains/contributions/router.py | 3 +- .../mpcontribs_api/domains/projects/models.py | 4 +++ .../mpcontribs_api/domains/projects/router.py | 7 +++-- .../src/mpcontribs_api/projection.py | 8 +++--- mpcontribs-api/src/mpcontribs_api/types.py | 2 ++ .../db/test_projects_repository.py | 2 +- .../tests/integration/test_contributions.py | 2 +- .../tests/integration/test_projects.py | 7 +++-- .../unit/domains/test_projects_models.py | 8 +++--- mpcontribs-api/tests/unit/test_projection.py | 28 +++++++++---------- 11 files changed, 52 insertions(+), 31 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py index 1763589c5e..fdf221c565 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py @@ -75,6 +75,18 @@ class ContributionOut(DocumentOut[PydanticObjectId]): tables: list[Link[Table]] | None = None attachments: list[Link[Attachment]] | None = None + @staticmethod + def default_fields() -> list[str]: + return [ + "id", + "project", + "identifier", + "formula", + "is_public", + "last_modified", + "needs_build", + ] + class ContributionPatch(SparseFieldsModel): project: str | None = None diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py index 9485c7868e..cd58d7c063 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py @@ -11,6 +11,7 @@ ContributionPatch, ) from mpcontribs_api.pagination import CursorParams +from mpcontribs_api.types import FieldSelector router = APIRouter(tags=["contributions"]) @@ -20,7 +21,7 @@ async def get_contributions( repo: ContributionDep, pagination: Annotated[CursorParams, Depends()], filter: ContributionFilter = FilterDepends(ContributionFilter), - fields: Annotated[str | None, Query(alias="_fields")] = None, + fields: FieldSelector = ContributionOut.default_fields(), ): field_set = ContributionOut.parse_fields(fields) return await repo.get_contributions(pagination=pagination, filter=filter, fields=field_set) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py index 90748d400c..c54c763e68 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py @@ -86,6 +86,10 @@ class ProjectOut(DocumentOut[ShortStr]): columns: list[Column] | None = None license: Literal["CCA4", "CCPD"] | None = None + @staticmethod + def default_fields() -> list[str]: + return ["id", "is_public", "title", "owner", "is_approved", "unique_identifiers"] + class ProjectFilter(Filter): """Filter fields allowed in requests.""" diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py index 284bec3e30..003e905a1d 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py @@ -1,6 +1,6 @@ from typing import Annotated -from fastapi import APIRouter, Depends, Query, Response, status +from fastapi import APIRouter, Depends, Response, status from fastapi_filter import FilterDepends from starlette.status import HTTP_204_NO_CONTENT @@ -12,6 +12,7 @@ ProjectPatch, ) from mpcontribs_api.pagination import CursorParams +from mpcontribs_api.types import FieldSelector router = APIRouter(tags=["projects"]) @@ -22,7 +23,7 @@ async def get_project( repo: ProjectDep, pagination: Annotated[CursorParams, Depends()], filter: ProjectFilter = FilterDepends(ProjectFilter), - fields: Annotated[str | None, Query(alias="_fields")] = None, + fields: FieldSelector = ProjectOut.default_fields(), ): """Return paginated projects matching a filter. @@ -42,7 +43,7 @@ async def get_project( async def get_project_by_id( id: str, repo: ProjectDep, - fields: Annotated[str | None, Query(alias="_fields")] = None, + fields: FieldSelector = ProjectOut.default_fields(), ): """Gets a single project by its ID. diff --git a/mpcontribs-api/src/mpcontribs_api/projection.py b/mpcontribs-api/src/mpcontribs_api/projection.py index 0c24a147da..0346a1f210 100644 --- a/mpcontribs-api/src/mpcontribs_api/projection.py +++ b/mpcontribs-api/src/mpcontribs_api/projection.py @@ -206,12 +206,12 @@ def field_names(cls) -> frozenset[str]: return frozenset(cls.model_fields) @classmethod - def parse_fields(cls, raw: str | None) -> frozenset[str] | None: + def parse_fields(cls, raw: list | None) -> frozenset[str] | None: """Validate and normalise a raw ``_fields`` value into a set of paths. Args: - raw: The comma-separated ``_fields`` value, or None when the query - parameter was omitted. + raw (list): The list of field paths from the ``_fields`` query parameter, + or None when the query parameter was omitted. Returns: None when every field should be returned (parameter omitted), @@ -224,7 +224,7 @@ def parse_fields(cls, raw: str | None) -> frozenset[str] | None: """ if not raw: return None # None == all fields - requested = frozenset(name.strip() for name in raw.split(",") if name.strip()) + requested = frozenset(name.strip() for name in raw if name.strip()) for path in requested: _validate_path(cls, path) return _collapse(requested | cls.sparse_always | cls._identity_fields()) diff --git a/mpcontribs-api/src/mpcontribs_api/types.py b/mpcontribs-api/src/mpcontribs_api/types.py index e1e189b535..8285acb265 100644 --- a/mpcontribs-api/src/mpcontribs_api/types.py +++ b/mpcontribs-api/src/mpcontribs_api/types.py @@ -1,12 +1,14 @@ import re from typing import Annotated +from fastapi import Query from pydantic import BeforeValidator, Field from mpcontribs_api.exceptions import ValidationError ShortStr = Annotated[str, Field(min_length=3, max_length=30)] +FieldSelector = Annotated[list[str] | None, Query(alias="_fields")] _EMAIL_RE = re.compile(r"^[^:@\s]+:[^:@\s]+@[^@\s]+\.[^@\s]+$") diff --git a/mpcontribs-api/tests/integration/db/test_projects_repository.py b/mpcontribs-api/tests/integration/db/test_projects_repository.py index a37877621b..e2b8c190ea 100644 --- a/mpcontribs-api/tests/integration/db/test_projects_repository.py +++ b/mpcontribs-api/tests/integration/db/test_projects_repository.py @@ -162,7 +162,7 @@ async def test_anon_cannot_get_private_project(self, db): class TestFieldProjection: async def test_projection_returns_only_requested_fields(self, db): await _insert("proj-fields", is_public=True, is_approved=True) - fields = ProjectOut.parse_fields("title") + fields = ProjectOut.parse_fields(["title"]) page = await _repo(ADMIN).get_project(filter=_noop_filter(), pagination=CursorParams(), fields=fields) assert len(page.items) == 1 item = page.items[0] diff --git a/mpcontribs-api/tests/integration/test_contributions.py b/mpcontribs-api/tests/integration/test_contributions.py index 8deb915059..06634a684b 100644 --- a/mpcontribs-api/tests/integration/test_contributions.py +++ b/mpcontribs-api/tests/integration/test_contributions.py @@ -63,7 +63,7 @@ def test_repo_called_with_pagination(self, client, contribution_repo): def test_fields_forwarded(self, client, contribution_repo): contribution_repo.get_contributions.return_value = Page(items=[], next_cursor=None) - client.get("/api/v1/contributions", params={"_fields": "formula"}, headers=AUTHED_HEADERS) + client.get("/api/v1/contributions", params={"_fields": ["formula"]}, headers=AUTHED_HEADERS) _, kwargs = contribution_repo.get_contributions.call_args assert kwargs["fields"] is not None assert "formula" in kwargs["fields"] diff --git a/mpcontribs-api/tests/integration/test_projects.py b/mpcontribs-api/tests/integration/test_projects.py index c40ef19b2f..858bdd0ac0 100644 --- a/mpcontribs-api/tests/integration/test_projects.py +++ b/mpcontribs-api/tests/integration/test_projects.py @@ -105,7 +105,7 @@ def test_limit_above_max_returns_422(self, client, project_repo): def test_valid_fields_param_forwarded(self, client, project_repo): project_repo.get_project.return_value = Page(items=[], next_cursor=None) - client.get("/api/v1/projects", params={"_fields": "title,authors"}, headers=AUTHED_HEADERS) + client.get("/api/v1/projects", params=[("_fields", "title"), ("_fields", "authors")], headers=AUTHED_HEADERS) _, kwargs = project_repo.get_project.call_args assert kwargs["fields"] is not None assert "title" in kwargs["fields"] @@ -151,11 +151,12 @@ def test_fields_param_forwarded(self, client, project_repo): assert kwargs["fields"] is not None assert "title" in kwargs["fields"] - def test_no_fields_param_passes_none(self, client, project_repo): + def test_no_fields_param_uses_default_fields(self, client, project_repo): project_repo.get_project_by_id.return_value = SAMPLE_PROJECT client.get("/api/v1/projects/mp-sample", headers=AUTHED_HEADERS) _, kwargs = project_repo.get_project_by_id.call_args - assert kwargs["fields"] is None + assert kwargs["fields"] is not None + assert "title" in kwargs["fields"] # --------------------------------------------------------------------------- diff --git a/mpcontribs-api/tests/unit/domains/test_projects_models.py b/mpcontribs-api/tests/unit/domains/test_projects_models.py index 66984c0067..56b062ba76 100644 --- a/mpcontribs-api/tests/unit/domains/test_projects_models.py +++ b/mpcontribs-api/tests/unit/domains/test_projects_models.py @@ -133,12 +133,12 @@ def test_parse_fields_none_returns_none(self): assert ProjectOut.parse_fields(None) is None def test_parse_fields_valid_field(self): - result = ProjectOut.parse_fields("title") + result = ProjectOut.parse_fields(["title"]) assert result is not None assert "title" in result def test_parse_fields_multiple_fields(self): - result = ProjectOut.parse_fields("title,authors,is_public") + result = ProjectOut.parse_fields(["title", "authors", "is_public"]) assert result is not None assert "title" in result assert "authors" in result @@ -148,13 +148,13 @@ def test_parse_fields_unknown_raises(self): from mpcontribs_api.exceptions import ValidationError as AppValidationError with pytest.raises(AppValidationError): - ProjectOut.parse_fields("nonexistent_field") + ProjectOut.parse_fields(["nonexistent_field"]) def test_projection_none_returns_self(self): assert ProjectOut.projection(None) is ProjectOut def test_projection_with_fields(self): - fields = ProjectOut.parse_fields("title,authors") + fields = ProjectOut.parse_fields(["title", "authors"]) projected = ProjectOut.projection(fields) assert projected is not ProjectOut assert hasattr(projected.Settings, "projection") diff --git a/mpcontribs-api/tests/unit/test_projection.py b/mpcontribs-api/tests/unit/test_projection.py index c003af591f..a8c627155a 100644 --- a/mpcontribs-api/tests/unit/test_projection.py +++ b/mpcontribs-api/tests/unit/test_projection.py @@ -226,44 +226,44 @@ class TestParseFields: def test_none_returns_none(self): assert Simple.parse_fields(None) is None - def test_empty_string_returns_none(self): - assert Simple.parse_fields("") is None + def test_empty_list_returns_none(self): + assert Simple.parse_fields([]) is None def test_single_valid_field(self): - result = Simple.parse_fields("name") + result = Simple.parse_fields(["name"]) assert result is not None assert "name" in result def test_multiple_fields(self): - result = Simple.parse_fields("name,age") + result = Simple.parse_fields(["name", "age"]) assert result is not None assert "name" in result assert "age" in result def test_whitespace_stripped(self): - result = Simple.parse_fields(" name , age ") + result = Simple.parse_fields([" name ", " age "]) assert result is not None assert "name" in result assert "age" in result def test_nested_field(self): - result = Simple.parse_fields("address.city") + result = Simple.parse_fields(["address.city"]) assert result is not None assert "address.city" in result def test_parent_collapses_child(self): - result = Simple.parse_fields("address,address.city") + result = Simple.parse_fields(["address", "address.city"]) assert result is not None assert "address" in result assert "address.city" not in result def test_unknown_field_raises(self): with pytest.raises(AppValidationError, match="unknown field"): - Simple.parse_fields("nonexistent") + Simple.parse_fields(["nonexistent"]) def test_scalar_subfield_raises(self): with pytest.raises(AppValidationError, match="cannot select subfields"): - Simple.parse_fields("name.sub") + Simple.parse_fields(["name.sub"]) def test_sparse_always_always_included(self): class WithAlways(SparseFieldsModel): @@ -271,7 +271,7 @@ class WithAlways(SparseFieldsModel): name: str | None = None sparse_always = frozenset({"id"}) - result = WithAlways.parse_fields("name") + result = WithAlways.parse_fields(["name"]) assert result is not None assert "id" in result assert "name" in result @@ -287,23 +287,23 @@ def test_none_fields_returns_self(self): assert Simple.projection(None) is Simple def test_with_fields_returns_different_model(self): - fields = Simple.parse_fields("name") + fields = Simple.parse_fields(["name"]) result = Simple.projection(fields) assert result is not Simple def test_projected_model_has_settings_with_projection(self): - fields = Simple.parse_fields("name") + fields = Simple.parse_fields(["name"]) projected = Simple.projection(fields) assert hasattr(projected, "Settings") assert hasattr(projected.Settings, "projection") def test_projection_includes_id(self): - fields = Simple.parse_fields("name") + fields = Simple.parse_fields(["name"]) projected = Simple.projection(fields) assert "_id" in projected.Settings.projection def test_projection_caching(self): - fields = Simple.parse_fields("name") + fields = Simple.parse_fields(["name"]) first = Simple.projection(fields) second = Simple.projection(fields) assert first is second From fb176b46050aeec1bae093330b8defea2d7e8a2a Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 4 Jun 2026 13:15:06 -0700 Subject: [PATCH 059/591] Fleshed out contribution repo methods --- .../domains/contributions/repository.py | 72 ++++++++++++++++--- .../domains/contributions/router.py | 12 ++-- 2 files changed, 71 insertions(+), 13 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py index bff75ebd21..ed3ded6f5a 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py @@ -1,5 +1,9 @@ +import asyncio from typing import Any, Literal +from beanie import UpdateResponse +from beanie.operators import Set + from mpcontribs_api.auth import User from mpcontribs_api.domains._shared.repository import MongoDbRepository from mpcontribs_api.domains.contributions.models import ( @@ -9,6 +13,7 @@ ContributionOut, ContributionPatch, ) +from mpcontribs_api.exceptions import NotFoundError from mpcontribs_api.pagination import CursorParams @@ -40,27 +45,78 @@ async def delete_contributions(self, filter: ContributionFilter): await docs.delete() async def insert_contributions(self, contributions: list[ContributionIn]): - pass + full_docs = [self.document_model.from_input_model(contrib) for contrib in contributions] + # ordered=False lets Mongo keep inserting if a document fails + return await self.document_model.insert_many(full_docs, ordered=False) async def upsert_contributions(self, contributions: list[ContributionIn]): - pass + # Handles upserting a document - no upsert_many command + async def _upsert(contrib: ContributionIn): + existing = await self.document_model.find_one( + self._scope, + self.document_model.project == contrib.project, + self.document_model.identifier == contrib.identifier, + ) + doc = self.document_model.from_input_model(contrib) + # Update + if existing is not None: + update_data = doc.model_dump(exclude={"id"}, exclude_none=True) + await existing.update(Set(update_data)) + return existing + # Insert + await doc.insert() + return doc + + # Asynchronously run upsert on each contribution + return await asyncio.gather(*[_upsert(c) for c in contributions]) async def download_contributions( self, format: Literal["json", "csv", "parquet"], filter: ContributionFilter, - fields: str | None, + fields: frozenset[str] | None, ): pass async def delete_contribution_by_id(self, id: str): - pass + await self.document_model.find_one(self._scope, self.document_model.id == id).delete() - async def get_contribution_by_id(self, id: str, fields: str | None): - pass + async def get_contribution_by_id(self, id: str, fields: frozenset[str] | None): + return await self.document_model.find_one( + self._scope, + self.document_model.id == id, + projection_model=self.out_model.projection(fields), + ) async def upsert_contribution_by_id(self, id: str, contribution: ContributionIn): - pass + doc = self.document_model.from_input_model(contribution) + return self.document_model.find_one( + self._scope, + self.document_model.id == id, + ).upsert( + Set(doc.model_dump(exclude={"id"}, exclude_none=True)), + on_insert=doc, + response_type=UpdateResponse.NEW_DOCUMENT, + ) async def update_contribution_by_id(self, id: str, update: ContributionPatch): - pass + # Only retain set fields (patch) + update_data = update.model_dump(exclude_unset=True) + # If update is empty, return the model anyways (consistent behavior) + if not update_data: + existing = await self.document_model.get(id) + if existing is None: + raise NotFoundError(f"Contribution with id {id} not found") + return existing + + # Otherwise, update the fields fully (set) + # Brendan TODO: Set will replace an entire field + # - if we want to append to a list (ie. add a reference) we ned Push/AddToSet + query = self.document_model.find_one(self.document_model.id == id).update( + Set(update_data), + response_type=UpdateResponse.NEW_DOCUMENT, + ) + updated = await query # pyright: ignore[reportGeneralTypeIssues] # beanie UpdateQuery is awaitable, but pyright doesn't see it + if updated is None: + raise NotFoundError(f"Contribution with id {id} not found") + return updated diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py index cd58d7c063..268cc5380f 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py @@ -1,6 +1,6 @@ from typing import Annotated, Literal -from fastapi import APIRouter, Depends, Query +from fastapi import APIRouter, Depends from fastapi_filter import FilterDepends from mpcontribs_api.domains.contributions.dependencies import ContributionDep @@ -56,9 +56,10 @@ async def download_contributions( repo: ContributionDep, format: Literal["json", "csv", "parquet"] = "parquet", filter: ContributionFilter = FilterDepends(ContributionFilter), - fields: Annotated[str | None, Query(alias="_fields")] = None, + fields: FieldSelector = ContributionOut.default_fields(), ): - return await repo.download_contributions(format=format, filter=filter, fields=fields) + selected = ContributionOut.parse_fields(fields) + return await repo.download_contributions(format=format, filter=filter, fields=selected) @router.delete("{id}") @@ -73,9 +74,10 @@ async def delete_contribtion_by_id( async def get_contribution_by_id( repo: ContributionDep, id: str, - fields: Annotated[str | None, Query(alias="_fields")] = None, + fields: FieldSelector = ContributionOut.default_fields(), ): - return await repo.get_contribution_by_id(id=id, fields=fields) + selected = ContributionOut.parse_fields(fields) + return await repo.get_contribution_by_id(id=id, fields=selected) @router.put("{id}") From 9d839708d2b5aaf786aecedca1f7d4094fb71a79 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 4 Jun 2026 13:59:52 -0700 Subject: [PATCH 060/591] Pulled repeated repo logic into parent class --- mpcontribs-api/src/mpcontribs_api/app.py | 5 +- .../domains/_shared/repository.py | 87 +++++++++-- .../domains/contributions/repository.py | 102 ++++++++----- .../domains/contributions/router.py | 4 +- .../domains/projects/repository.py | 139 ++++-------------- .../mpcontribs_api/domains/projects/router.py | 16 +- .../db/test_projects_repository.py | 50 +++---- .../tests/integration/test_gateway.py | 2 +- .../tests/integration/test_projects.py | 46 +++--- 9 files changed, 228 insertions(+), 223 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/app.py b/mpcontribs-api/src/mpcontribs_api/app.py index e4edc07444..9152c464f6 100644 --- a/mpcontribs-api/src/mpcontribs_api/app.py +++ b/mpcontribs-api/src/mpcontribs_api/app.py @@ -1,6 +1,5 @@ from __future__ import annotations -import logging from collections.abc import AsyncGenerator from contextlib import asynccontextmanager @@ -16,10 +15,10 @@ from mpcontribs_api.domains.contributions.models import Contribution from mpcontribs_api.domains.projects.models import Project from mpcontribs_api.exceptions import register_exception_handlers -from mpcontribs_api.logging import configure_logging +from mpcontribs_api.logging import configure_logging, get_logger from mpcontribs_api.middleware import bind_request_context -logger = logging.getLogger(__name__) +logger = get_logger(__name__) def _build_lifespan(settings: Settings): diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py index 846874f326..8595c65341 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py @@ -1,23 +1,33 @@ from abc import ABC, abstractmethod from typing import Any +from beanie import UpdateResponse +from beanie.operators import Set from fastapi_filter.contrib.beanie import Filter from pydantic import BaseModel from mpcontribs_api.auth import User from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut -from mpcontribs_api.exceptions import ConflictError +from mpcontribs_api.exceptions import ConflictError, NotFoundError from mpcontribs_api.pagination import CursorParams, Page, decode_cursor, encode_cursor -class MongoDbRepository[TDoc: BaseDocumentWithInput, TIn: BaseModel, TOut: DocumentOut](ABC): +class MongoDbRepository[ + TDoc: BaseDocumentWithInput, + TIn: BaseModel, + TOut: DocumentOut, + TFilter: Filter, + TPatch: BaseModel, +](ABC): """Base repository encapsulating shared MongoDB access patterns. - Subclasses bind the document, input, and output types as type parameters, set the matching - ``document_model`` / ``out_model`` class attributes, and implement ``_build_scope`` to enforce - per-user authorization. Shared query logic (scoping, projection, cursor pagination, insertion) - lives here; resource-specific operations stay on the concrete subclasses where they keep their - precise types. + Subclasses bind the document, input, output, filter, and patch types as type parameters, set + the matching ``document_model`` / ``out_model`` class attributes, and implement ``_build_scope`` + to enforce per-user authorization. Shared CRUD logic (scoping, projection, cursor pagination, + insertion, single-document read/patch/delete) lives here so it exists in exactly one place and + cannot drift between resources. Subclasses expose domain-named methods that either forward to a + base method (vocabulary + concrete types for routers, no logic) or implement a genuinely + different shape (bulk insert, compound-key upsert, download). Attributes: document_model: the ``BaseDocumentWithInput`` subclass this repository operates on @@ -42,17 +52,21 @@ def _build_scope(user: User) -> dict[str, Any]: """Provides scope based on current user's permitted groups and publicly released data.""" ... + def _not_found(self, id: str) -> str: + """Build a not-found message naming this repository's resource.""" + return f"{self.document_model.__name__} with id {id} not found" + async def get_many( self, pagination: CursorParams, - filter: Filter, + filter: TFilter, fields: frozenset[str] | None, ) -> Page[TOut]: """Return a scoped, filtered, cursor-paginated page of projected documents. Args: pagination (CursorParams): forward-only cursor parameters - filter (Filter): the fastapi-filter query to apply on top of the user scope + filter (TFilter): the fastapi-filter query to apply on top of the user scope fields (frozenset[str] | None): fields to project; if None the full document is returned """ projection = self.out_model.projection(fields) @@ -65,6 +79,19 @@ async def get_many( next_cursor = encode_cursor(str(items[-1].id)) if has_more and items else None return Page(items=items, next_cursor=next_cursor) + async def get_by_id(self, id: str, fields: frozenset[str] | None): + """Return a single scoped document by id, projected to the requested fields. + + Args: + id (str): the id of the document to find + fields (frozenset[str] | None): fields to project; if None the full document is returned + """ + return await self.document_model.find_one( + self._scope, + self.document_model.id == id, + projection_model=self.out_model.projection(fields), + ) + async def insert_one(self, in_resource: TIn) -> TDoc: """Insert a new document built from its input model, rejecting duplicate ids. @@ -77,3 +104,45 @@ async def insert_one(self, in_resource: TIn) -> TDoc: raise ConflictError(f"Cannot insert document.\n Document with ID {document.id} exists") await document.insert() return document + + async def delete_by_id(self, id: str) -> None: + """Delete a single scoped document by id. + + Scoping ensures callers cannot delete documents they are not permitted to see. + + Args: + id (str): the id of the document to delete + """ + await self.document_model.find_one(self._scope, self.document_model.id == id).delete() + + async def patch(self, id: str, update: TPatch) -> TDoc: + """Partially update a single scoped document by id. + + Only fields explicitly set on ``update`` are applied. An empty patch is a no-op that still + returns the existing document for consistent behavior. Scoping ensures callers cannot patch + documents they are not permitted to see. + + Args: + id (str): the id of the document to update + update (TPatch): the partial update to apply; unset fields are dropped + """ + # Only retain set fields (patch) + update_data = update.model_dump(exclude_unset=True) + # If update is empty, return the model anyways (consistent behavior) + if not update_data: + existing = await self.document_model.find_one(self._scope, self.document_model.id == id) + if existing is None: + raise NotFoundError(self._not_found(id)) + return existing + + # Otherwise, update the fields fully (set) + # Brendan TODO: Set will replace an entire field + # - if we want to append to a list (ie. add a reference) we ned Push/AddToSet + query = self.document_model.find_one(self._scope, self.document_model.id == id).update( + Set(update_data), + response_type=UpdateResponse.NEW_DOCUMENT, + ) + updated = await query # pyright: ignore[reportGeneralTypeIssues] # beanie UpdateQuery is awaitable, but pyright doesn't see it + if updated is None: + raise NotFoundError(self._not_found(id)) + return updated diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py index ed3ded6f5a..75527899d4 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py @@ -13,11 +13,20 @@ ContributionOut, ContributionPatch, ) -from mpcontribs_api.exceptions import NotFoundError from mpcontribs_api.pagination import CursorParams -class MongoDbContributionRepository(MongoDbRepository[Contribution, ContributionIn, ContributionOut]): +class MongoDbContributionRepository( + MongoDbRepository[Contribution, ContributionIn, ContributionOut, ContributionFilter, ContributionPatch] +): + """A repository layer for access to MongoDB. + + Shared CRUD logic lives on :class:`MongoDbRepository`; the methods here are domain-named + forwarders that give routers a consistent vocabulary and concrete types, plus the operations + whose shape is genuinely contribution-specific (filtered delete, bulk insert, compound-key and + id-keyed upsert, download). + """ + document_model = Contribution out_model = ContributionOut @@ -38,18 +47,55 @@ async def get_contributions( filter: ContributionFilter, fields: frozenset[str] | None, ): + """Query the Contribution collection, scoped to the current user. See ``get_many``.""" return await self.get_many(pagination=pagination, filter=filter, fields=fields) + async def get_contribution_by_id(self, id: str, fields: frozenset[str] | None): + """Find a single contribution by id, scoped to the current user. See ``get_by_id``.""" + return await self.get_by_id(id, fields) + + async def patch_contribution_by_id(self, id: str, update: ContributionPatch): + """Partially update a contribution by id, scoped to the current user. See ``patch``.""" + return await self.patch(id, update) + + async def delete_contribution_by_id(self, id: str) -> None: + """Delete a contribution by id, scoped to the current user. See ``delete_by_id``.""" + await self.delete_by_id(id) + async def delete_contributions(self, filter: ContributionFilter): + """Bulk deletion of Contributions described by the filter + + Args: + filter (ContribtionFilter): the filter to use to identify contributions to delete + """ docs = filter.filter(self.document_model.find(self._scope)) await docs.delete() async def insert_contributions(self, contributions: list[ContributionIn]): + """Bulk insertion of Contributions + + Args: + contributions (list[ContributionIn]): the list of contributions to be inserted + + Returns: + list[ContributionOut]: the inserted documents + """ full_docs = [self.document_model.from_input_model(contrib) for contrib in contributions] # ordered=False lets Mongo keep inserting if a document fails return await self.document_model.insert_many(full_docs, ordered=False) async def upsert_contributions(self, contributions: list[ContributionIn]): + """Upserts contributions. + + For each Contribution, if Contribution with identical identifiers exist, update, otherwise insert + + Args: + contributions (list[ContributionIn]): the list of contributions to be upserted + + Returns: + list[ContributionOut]: the list of upserted documents + """ + # Handles upserting a document - no upsert_many command async def _upsert(contrib: ContributionIn): existing = await self.document_model.find_one( @@ -70,25 +116,17 @@ async def _upsert(contrib: ContributionIn): # Asynchronously run upsert on each contribution return await asyncio.gather(*[_upsert(c) for c in contributions]) - async def download_contributions( - self, - format: Literal["json", "csv", "parquet"], - filter: ContributionFilter, - fields: frozenset[str] | None, - ): - pass + async def upsert_contribution_by_id(self, id: str, contribution: ContributionIn): + """Upserts a single Contribution. - async def delete_contribution_by_id(self, id: str): - await self.document_model.find_one(self._scope, self.document_model.id == id).delete() + If Contributions with identical identifiers exist, update, otherwise insert - async def get_contribution_by_id(self, id: str, fields: frozenset[str] | None): - return await self.document_model.find_one( - self._scope, - self.document_model.id == id, - projection_model=self.out_model.projection(fields), - ) + Args: + id (str): the id of the Contribution to upsert + contribution (ContributionIn): the Contribution to be upserted - async def upsert_contribution_by_id(self, id: str, contribution: ContributionIn): + Returns: + ContributionOut: the upserted document""" doc = self.document_model.from_input_model(contribution) return self.document_model.find_one( self._scope, @@ -99,24 +137,10 @@ async def upsert_contribution_by_id(self, id: str, contribution: ContributionIn) response_type=UpdateResponse.NEW_DOCUMENT, ) - async def update_contribution_by_id(self, id: str, update: ContributionPatch): - # Only retain set fields (patch) - update_data = update.model_dump(exclude_unset=True) - # If update is empty, return the model anyways (consistent behavior) - if not update_data: - existing = await self.document_model.get(id) - if existing is None: - raise NotFoundError(f"Contribution with id {id} not found") - return existing - - # Otherwise, update the fields fully (set) - # Brendan TODO: Set will replace an entire field - # - if we want to append to a list (ie. add a reference) we ned Push/AddToSet - query = self.document_model.find_one(self.document_model.id == id).update( - Set(update_data), - response_type=UpdateResponse.NEW_DOCUMENT, - ) - updated = await query # pyright: ignore[reportGeneralTypeIssues] # beanie UpdateQuery is awaitable, but pyright doesn't see it - if updated is None: - raise NotFoundError(f"Contribution with id {id} not found") - return updated + async def download_contributions( + self, + format: Literal["json", "csv", "parquet"], + filter: ContributionFilter, + fields: frozenset[str] | None, + ): + pass diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py index 268cc5380f..0af605ab51 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py @@ -86,5 +86,5 @@ async def upsert_contribution_by_id(repo: ContributionDep, id: str, contribution @router.patch("{id}") -async def update_contribution_by_id(repo: ContributionDep, id: str, update: ContributionPatch): - return await repo.update_contribution_by_id(id=id, update=update) +async def patch_contribution_by_id(repo: ContributionDep, id: str, update: ContributionPatch): + return await repo.patch_contribution_by_id(id=id, update=update) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py index 7fbdcd91bd..a29bd3ec3c 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py @@ -1,8 +1,4 @@ -from typing import Any, TypeVar - -from beanie import UpdateResponse -from beanie.operators import Set -from pydantic import BaseModel +from typing import Any from mpcontribs_api.auth import User from mpcontribs_api.domains._shared.repository import MongoDbRepository @@ -13,29 +9,20 @@ ProjectOut, ProjectPatch, ) -from mpcontribs_api.exceptions import ConflictError, NotFoundError -from mpcontribs_api.pagination import ( - CursorParams, -) - - -# Type checking to get around pyright issues -class HasId(BaseModel): - id: str +from mpcontribs_api.pagination import CursorParams -V = TypeVar("V", bound=HasId) -M = TypeVar("M", bound=BaseModel) - - -class MongoDbProjectRepository(MongoDbRepository[Project, ProjectIn, ProjectOut]): +class MongoDbProjectRepository(MongoDbRepository[Project, ProjectIn, ProjectOut, ProjectFilter, ProjectPatch]): """A repository layer for access to MongoDB. - This is the layer that directly interacts with database operations + This is the layer that directly interacts with database operations. Shared CRUD logic lives on + :class:`MongoDbRepository`; the methods here are domain-named forwarders that give routers a + consistent vocabulary and concrete types, plus the operations whose shape is genuinely + project-specific (id-keyed upsert). Attributes: - _scope (dict[str, Any]): additional terms to inject into mongo queries to enforce user authorization on - resources + _scope (dict[str, Any]): additional terms to inject into mongo queries to enforce user + authorization on resources """ document_model = Project @@ -53,114 +40,40 @@ def _build_scope(user: User) -> dict[str, Any]: ors.append({"_id": {"$in": sorted(user.groups)}}) return {"$or": ors} - # Brendan TODO: figure out return type - async def get_project_by_id(self, id: str, fields: frozenset[str] | None): - """Finds a single project by ID. - - Args: - id (str): the id of the project to find - fields (frozenset[str] | None): a BaseModel to use for projection. If none, the document is returned without - projection - - Returns: - ProjectOut: a projection of ProjectOut containing 'fields' from requested id - """ - # TODO: Verify that self._scope and Project.id == id get combined properly - return await self.document_model.find_one( - self._scope, - self.document_model.id == id, - projection_model=self.out_model.projection(fields), - ) - - # Brendan TODO: Does not handle compound pagination/sorting - # can only paginate on _id, so passing sort arguments does nothing - async def get_project( + async def get_projects( self, filter: ProjectFilter, pagination: CursorParams, fields: frozenset[str] | None, ): - """Query the Project collection using filtering. - - Only considers the Projects that the User has access to. - - Args: - filter (ProjectFilter): the query to filter the collection by - pagination (CursorParams): parameters for pagination using a cursor - fields (frozenset[str] | None): the fields to use for projection. If none, the document is returned without - projection - """ + """Query the Project collection, scoped to the current user. See ``get_many``.""" return await self.get_many(pagination=pagination, filter=filter, fields=fields) - async def insert_project(self, project: ProjectIn) -> Project: - """Inserst a new project. - - Args: - project (ProjectIn): the project to be inserted - - Returns: - Project: the project after succesful insertion - """ - id_exists = await self.document_model.find_one(self.document_model.id == project.id) - # Brendan TODO: - if id_exists: - raise ConflictError(f"Cannot insert project.\n Project with ID {project.id} exists") - full_project = self.document_model.from_input_model(project) - await full_project.insert() - return full_project - - async def patch_project(self, id: str, update: ProjectPatch) -> Project: - """Partial update to project identified with 'id'. - - Note: overwrites fields with given values - arrays are not appended to. + async def get_project_by_id(self, id: str, fields: frozenset[str] | None): + """Find a single project by id, scoped to the current user. See ``get_by_id``.""" + return await self.get_by_id(id, fields) - Args: - id (str): the id of the project to update - update (ProjectPatch): the partial update to apply - unset fields are dropped - - Note: If fields are intentionally set to None, None is applied to the field. + async def insert_project(self, project: ProjectIn) -> Project: + """Insert a new project, rejecting a duplicate id. See ``insert_one``.""" + return await self.insert_one(project) - Returns: - The Project with updates applied - """ - # Only retain set fields (patch) - update_data = update.model_dump(exclude_unset=True) - # If update is empty, return the model anyways (consistent behavior) - if not update_data: - existing = await self.document_model.get(id) - if existing is None: - raise NotFoundError(f"Project with id {id} not found") - return existing - - # Otherwise, update the fields fully (set) - # Brendan TODO: Set will replace an entire field - # - if we want to append to a list (ie. add a reference) we ned Push/AddToSet - query = self.document_model.find_one(self.document_model.id == id).update( - Set(update_data), - response_type=UpdateResponse.NEW_DOCUMENT, - ) - updated = await query # pyright: ignore[reportGeneralTypeIssues] # beanie UpdateQuery is awaitable, but pyright doesn't see it - if updated is None: - raise NotFoundError(f"Project with id {id} not found") - return updated - - async def delete_project(self, id: str): - """Delete project by id. + async def patch_project_by_id(self, id: str, update: ProjectPatch) -> Project: + """Partially update a project by id, scoped to the current user. See ``patch``.""" + return await self.patch(id, update) - Args: - id (str): the id of the project to delete - """ - await self.document_model.find_one(self.document_model.id == id).delete() + async def delete_project_by_id(self, id: str) -> None: + """Delete a project by id, scoped to the current user. See ``delete_by_id``.""" + await self.delete_by_id(id) - async def upsert_project(self, id: str, data: ProjectIn) -> Project: + async def upsert_project_by_id(self, id: str, data: ProjectIn) -> Project: """Upsert a project by provided id. Upsert: Update document if id is found, otherwise insert new document using id. Note: Relies on the path param 'id' for finding, rather than the body's id. Args: - repo (ProjectDep): the project repo we depend on - id (str): the id of the project to retrieve - project (ProjectIn): the data of the project to upsert + id (str): the id of the project to upsert + data (ProjectIn): the data of the project to upsert Returns: Project: the full document that either replaced an old one or was inserted diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py index 003e905a1d..9e16ff6568 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py @@ -19,7 +19,7 @@ # Brendan TODO: Add in option to select ProjectSummary or ProjectOut @router.get("", response_model=None) -async def get_project( +async def get_projects( repo: ProjectDep, pagination: Annotated[CursorParams, Depends()], filter: ProjectFilter = FilterDepends(ProjectFilter), @@ -36,7 +36,7 @@ async def get_project( list[ProjectSummary]: a list of smaller project payloads """ selected = ProjectOut.parse_fields(fields) - return await repo.get_project(filter=filter, pagination=pagination, fields=selected) + return await repo.get_projects(filter=filter, pagination=pagination, fields=selected) @router.get("/{id}", response_model=ProjectOut) @@ -60,7 +60,7 @@ async def get_project_by_id( @router.put("/{id}", response_model=ProjectOut) -async def upsert_project( +async def upsert_project_by_id( repo: ProjectDep, id: str, project: ProjectIn, @@ -78,11 +78,11 @@ async def upsert_project( Returns: ProjectOut: the full document that either replaced an old one or was inserted """ - return await repo.upsert_project(id=id, data=project) + return await repo.upsert_project_by_id(id=id, data=project) @router.patch("/{id}", response_model=ProjectOut) -async def patch_project( +async def patch_project_by_id( repo: ProjectDep, id: str, update: ProjectPatch, @@ -100,11 +100,11 @@ async def patch_project( Returns: ProjectOut: the full Project with updates applied """ - return await repo.patch_project(id=id, update=update) + return await repo.patch_project_by_id(id=id, update=update) @router.delete("/{id}", status_code=status.HTTP_204_NO_CONTENT) -async def delete_project( +async def delete_project_by_id( repo: ProjectDep, id: str, ): @@ -116,5 +116,5 @@ async def delete_project( Returns: Response: a response with the 204 response code (rather than FastAPIs default 200) """ - await repo.delete_project(id=id) + await repo.delete_project_by_id(id=id) return Response(status_code=HTTP_204_NO_CONTENT) diff --git a/mpcontribs-api/tests/integration/db/test_projects_repository.py b/mpcontribs-api/tests/integration/db/test_projects_repository.py index e2b8c190ea..e7dfdbf397 100644 --- a/mpcontribs-api/tests/integration/db/test_projects_repository.py +++ b/mpcontribs-api/tests/integration/db/test_projects_repository.py @@ -95,7 +95,7 @@ class TestAuthorizationScope: async def test_admin_sees_all(self, db): await _insert("scope-priv", is_public=False) await _insert("scope-pub", is_public=True, is_approved=True) - page = await _repo(ADMIN).get_project(filter=_noop_filter(), pagination=CursorParams(), fields=None) + page = await _repo(ADMIN).get_projects(filter=_noop_filter(), pagination=CursorParams(), fields=None) ids = {p.id for p in page.items} assert "scope-priv" in ids assert "scope-pub" in ids @@ -104,7 +104,7 @@ async def test_anonymous_only_sees_public_approved(self, db): await _insert("anon-priv", is_public=False) await _insert("anon-pub", is_public=True, is_approved=True) await _insert("anon-pub-unapproved", is_public=True, is_approved=False) - page = await _repo(ANON).get_project(filter=_noop_filter(), pagination=CursorParams(), fields=None) + page = await _repo(ANON).get_projects(filter=_noop_filter(), pagination=CursorParams(), fields=None) ids = {p.id for p in page.items} assert "anon-pub" in ids assert "anon-priv" not in ids @@ -114,7 +114,7 @@ async def test_authenticated_sees_own_and_public(self, db): await _insert("auth-alice-priv", owner="google:alice@example.com", is_public=False) await _insert("auth-bob-priv", owner="google:bob@example.com", is_public=False) await _insert("auth-pub", is_public=True, is_approved=True) - page = await _repo(ALICE).get_project(filter=_noop_filter(), pagination=CursorParams(), fields=None) + page = await _repo(ALICE).get_projects(filter=_noop_filter(), pagination=CursorParams(), fields=None) ids = {p.id for p in page.items} assert "auth-alice-priv" in ids assert "auth-pub" in ids @@ -163,7 +163,7 @@ class TestFieldProjection: async def test_projection_returns_only_requested_fields(self, db): await _insert("proj-fields", is_public=True, is_approved=True) fields = ProjectOut.parse_fields(["title"]) - page = await _repo(ADMIN).get_project(filter=_noop_filter(), pagination=CursorParams(), fields=fields) + page = await _repo(ADMIN).get_projects(filter=_noop_filter(), pagination=CursorParams(), fields=fields) assert len(page.items) == 1 item = page.items[0] assert item.title == "proj-fields" @@ -172,7 +172,7 @@ async def test_projection_returns_only_requested_fields(self, db): async def test_no_projection_returns_all_fields(self, db): await _insert("proj-all", is_public=True, is_approved=True) - page = await _repo(ADMIN).get_project(filter=_noop_filter(), pagination=CursorParams(), fields=None) + page = await _repo(ADMIN).get_projects(filter=_noop_filter(), pagination=CursorParams(), fields=None) item = page.items[0] assert item.title is not None assert item.authors is not None @@ -187,27 +187,27 @@ class TestPagination: async def test_limit_is_respected(self, db): for i in range(5): await _insert(f"pag-limit-{i:02d}", is_public=True, is_approved=True) - page = await _repo(ADMIN).get_project(filter=_noop_filter(), pagination=CursorParams(limit=3), fields=None) + page = await _repo(ADMIN).get_projects(filter=_noop_filter(), pagination=CursorParams(limit=3), fields=None) assert len(page.items) == 3 async def test_next_cursor_set_when_more_items(self, db): for i in range(4): await _insert(f"pag-cursor-{i:02d}", is_public=True, is_approved=True) - page = await _repo(ADMIN).get_project(filter=_noop_filter(), pagination=CursorParams(limit=2), fields=None) + page = await _repo(ADMIN).get_projects(filter=_noop_filter(), pagination=CursorParams(limit=2), fields=None) assert page.next_cursor is not None async def test_next_cursor_none_on_last_page(self, db): for i in range(3): await _insert(f"pag-last-{i:02d}", is_public=True, is_approved=True) - page = await _repo(ADMIN).get_project(filter=_noop_filter(), pagination=CursorParams(limit=10), fields=None) + page = await _repo(ADMIN).get_projects(filter=_noop_filter(), pagination=CursorParams(limit=10), fields=None) assert page.next_cursor is None async def test_cursor_fetches_next_page(self, db): for i in range(4): await _insert(f"pag-next-{i:02d}", is_public=True, is_approved=True) - page1 = await _repo(ADMIN).get_project(filter=_noop_filter(), pagination=CursorParams(limit=2), fields=None) + page1 = await _repo(ADMIN).get_projects(filter=_noop_filter(), pagination=CursorParams(limit=2), fields=None) assert page1.next_cursor is not None - page2 = await _repo(ADMIN).get_project( + page2 = await _repo(ADMIN).get_projects( filter=_noop_filter(), pagination=CursorParams(limit=2, cursor=page1.next_cursor), fields=None ) ids1 = {p.id for p in page1.items} @@ -220,7 +220,7 @@ async def test_all_items_covered_across_pages(self, db): all_ids: set[str] = set() cursor = None while True: - page = await _repo(ADMIN).get_project( + page = await _repo(ADMIN).get_projects( filter=_noop_filter(), pagination=CursorParams(limit=2, cursor=cursor), fields=None ) all_ids.update(p.id for p in page.items) @@ -231,7 +231,7 @@ async def test_all_items_covered_across_pages(self, db): # --------------------------------------------------------------------------- -# patch_project +# patch_project_by_id # --------------------------------------------------------------------------- @@ -239,7 +239,7 @@ class TestPatchProject: async def test_updates_single_field(self, db): await _insert("patch-me") patch = ProjectPatch(title="Updated Title") - await _repo(ADMIN).patch_project(id="patch-me", update=patch) + await _repo(ADMIN).patch_project_by_id(id="patch-me", update=patch) found = await Project.find_one(Project.id == "patch-me") assert found.title == "Updated Title" @@ -247,60 +247,60 @@ async def test_unset_fields_not_overwritten(self, db): await _insert("patch-preserve") original = await Project.find_one(Project.id == "patch-preserve") patch = ProjectPatch(title="New Title") - await _repo(ADMIN).patch_project(id="patch-preserve", update=patch) + await _repo(ADMIN).patch_project_by_id(id="patch-preserve", update=patch) found = await Project.find_one(Project.id == "patch-preserve") assert found.authors == original.authors async def test_not_found_raises(self, db): patch = ProjectPatch(title="Won't work") with pytest.raises(NotFoundError): - await _repo(ADMIN).patch_project(id="no-such-id", update=patch) + await _repo(ADMIN).patch_project_by_id(id="no-such-id", update=patch) async def test_empty_patch_returns_existing(self, db): await _insert("patch-empty") - result = await _repo(ADMIN).patch_project(id="patch-empty", update=ProjectPatch()) + result = await _repo(ADMIN).patch_project_by_id(id="patch-empty", update=ProjectPatch()) assert result.id == "patch-empty" # --------------------------------------------------------------------------- -# delete_project (soft-delete via DocumentWithSoftDelete) +# delete_project_by_id (soft-delete via DocumentWithSoftDelete) # --------------------------------------------------------------------------- class TestDeleteProject: async def test_deleted_project_not_in_default_query(self, db): await _insert("del-me", is_public=True, is_approved=True) - await _repo(ADMIN).delete_project(id="del-me") - page = await _repo(ADMIN).get_project(filter=_noop_filter(), pagination=CursorParams(), fields=None) + await _repo(ADMIN).delete_project_by_id(id="del-me") + page = await _repo(ADMIN).get_projects(filter=_noop_filter(), pagination=CursorParams(), fields=None) ids = {p.id for p in page.items} assert "del-me" not in ids async def test_delete_nonexistent_is_silent(self, db): - # delete_project does find_one().delete() — no error if not found - await _repo(ADMIN).delete_project(id="ghost-id") + # delete_project_by_id does find_one().delete() — no error if not found + await _repo(ADMIN).delete_project_by_id(id="ghost-id") # --------------------------------------------------------------------------- -# upsert_project +# upsert_project_by_id # --------------------------------------------------------------------------- class TestUpsertProject: async def test_upsert_creates_new_project(self, db): data = _project_in("upsert-new") - await _repo(ADMIN).upsert_project(id="upsert-new", data=data) + await _repo(ADMIN).upsert_project_by_id(id="upsert-new", data=data) found = await Project.find_one(Project.id == "upsert-new") assert found is not None async def test_upsert_updates_existing_project(self, db): await _insert("upsert-existing") data = _project_in("upsert-existing", title="Replaced Title") - await _repo(ADMIN).upsert_project(id="upsert-existing", data=data) + await _repo(ADMIN).upsert_project_by_id(id="upsert-existing", data=data) found = await Project.find_one(Project.id == "upsert-existing") assert found.title == "Replaced Title" async def test_upsert_uses_path_id_not_body_id(self, db): data = _project_in("body-id") - await _repo(ADMIN).upsert_project(id="path-id", data=data) + await _repo(ADMIN).upsert_project_by_id(id="path-id", data=data) found = await Project.find_one(Project.id == "path-id") assert found is not None diff --git a/mpcontribs-api/tests/integration/test_gateway.py b/mpcontribs-api/tests/integration/test_gateway.py index b43b372268..98540efbc6 100644 --- a/mpcontribs-api/tests/integration/test_gateway.py +++ b/mpcontribs-api/tests/integration/test_gateway.py @@ -24,7 +24,7 @@ def _stub_repos(gateway_app): """Inject no-op mock repos so gateway-passing requests don't hit Beanie.""" proj_repo = AsyncMock() - proj_repo.get_project.return_value = Page(items=[], next_cursor=None) + proj_repo.get_projects.return_value = Page(items=[], next_cursor=None) contrib_repo = AsyncMock() contrib_repo.get_contributions.return_value = Page(items=[], next_cursor=None) diff --git a/mpcontribs-api/tests/integration/test_projects.py b/mpcontribs-api/tests/integration/test_projects.py index 858bdd0ac0..571f91b81e 100644 --- a/mpcontribs-api/tests/integration/test_projects.py +++ b/mpcontribs-api/tests/integration/test_projects.py @@ -55,18 +55,18 @@ def project_repo(test_app, mock_project_repo): class TestListProjects: def test_empty_page_returns_200(self, client, project_repo): - project_repo.get_project.return_value = Page(items=[], next_cursor=None) + project_repo.get_projects.return_value = Page(items=[], next_cursor=None) r = client.get("/api/v1/projects", headers=AUTHED_HEADERS) assert r.status_code == 200 def test_response_has_items_and_cursor(self, client, project_repo): - project_repo.get_project.return_value = Page(items=[], next_cursor=None) + project_repo.get_projects.return_value = Page(items=[], next_cursor=None) body = client.get("/api/v1/projects", headers=AUTHED_HEADERS).json() assert "items" in body assert "next_cursor" in body def test_items_returned_in_response(self, client, project_repo): - project_repo.get_project.return_value = Page(items=[SAMPLE_PROJECT], next_cursor=None) + project_repo.get_projects.return_value = Page(items=[SAMPLE_PROJECT], next_cursor=None) body = client.get("/api/v1/projects", headers=AUTHED_HEADERS).json() assert len(body["items"]) == 1 @@ -74,29 +74,29 @@ def test_next_cursor_set_when_more_pages(self, client, project_repo): from mpcontribs_api.pagination import encode_cursor cursor = encode_cursor("mp-sample") - project_repo.get_project.return_value = Page(items=[SAMPLE_PROJECT], next_cursor=cursor) + project_repo.get_projects.return_value = Page(items=[SAMPLE_PROJECT], next_cursor=cursor) body = client.get("/api/v1/projects", headers=AUTHED_HEADERS).json() assert body["next_cursor"] == cursor def test_repo_get_project_called(self, client, project_repo): - project_repo.get_project.return_value = Page(items=[], next_cursor=None) + project_repo.get_projects.return_value = Page(items=[], next_cursor=None) client.get("/api/v1/projects", headers=AUTHED_HEADERS) - project_repo.get_project.assert_called_once() + project_repo.get_projects.assert_called_once() def test_anonymous_user_reaches_route(self, client, project_repo): - project_repo.get_project.return_value = Page(items=[], next_cursor=None) + project_repo.get_projects.return_value = Page(items=[], next_cursor=None) r = client.get("/api/v1/projects", headers=ANON_HEADERS) assert r.status_code == 200 def test_invalid_fields_param_returns_422(self, client, project_repo): - project_repo.get_project.return_value = Page(items=[], next_cursor=None) + project_repo.get_projects.return_value = Page(items=[], next_cursor=None) r = client.get("/api/v1/projects", params={"_fields": "nonexistent_field"}, headers=AUTHED_HEADERS) assert r.status_code == 422 def test_limit_param_forwarded(self, client, project_repo): - project_repo.get_project.return_value = Page(items=[], next_cursor=None) + project_repo.get_projects.return_value = Page(items=[], next_cursor=None) client.get("/api/v1/projects", params={"limit": 5}, headers=AUTHED_HEADERS) - _, kwargs = project_repo.get_project.call_args + _, kwargs = project_repo.get_projects.call_args assert kwargs["pagination"].limit == 5 def test_limit_above_max_returns_422(self, client, project_repo): @@ -104,9 +104,9 @@ def test_limit_above_max_returns_422(self, client, project_repo): assert r.status_code == 422 def test_valid_fields_param_forwarded(self, client, project_repo): - project_repo.get_project.return_value = Page(items=[], next_cursor=None) + project_repo.get_projects.return_value = Page(items=[], next_cursor=None) client.get("/api/v1/projects", params=[("_fields", "title"), ("_fields", "authors")], headers=AUTHED_HEADERS) - _, kwargs = project_repo.get_project.call_args + _, kwargs = project_repo.get_projects.call_args assert kwargs["fields"] is not None assert "title" in kwargs["fields"] @@ -166,7 +166,7 @@ def test_no_fields_param_uses_default_fields(self, client, project_repo): class TestPatchProject: def test_valid_patch_returns_200(self, client, project_repo): - project_repo.patch_project.return_value = SAMPLE_PROJECT + project_repo.patch_project_by_id.return_value = SAMPLE_PROJECT r = client.patch( "/api/v1/projects/mp-sample", json={"title": "Updated Title"}, @@ -176,7 +176,7 @@ def test_valid_patch_returns_200(self, client, project_repo): def test_patch_response_is_project_out(self, client, project_repo): updated = ProjectOut(id="mp-sample", title="Updated Title") - project_repo.patch_project.return_value = updated + project_repo.patch_project_by_id.return_value = updated body = client.patch( "/api/v1/projects/mp-sample", json={"title": "Updated Title"}, @@ -185,7 +185,7 @@ def test_patch_response_is_project_out(self, client, project_repo): assert body["title"] == "Updated Title" def test_not_found_returns_404(self, client, project_repo): - project_repo.patch_project.side_effect = NotFoundError("not found") + project_repo.patch_project_by_id.side_effect = NotFoundError("not found") r = client.patch( "/api/v1/projects/missing", json={"title": "x" * 5}, @@ -202,13 +202,13 @@ def test_invalid_title_too_short_returns_422(self, client, project_repo): assert r.status_code == 422 def test_id_and_update_forwarded_to_repo(self, client, project_repo): - project_repo.patch_project.return_value = SAMPLE_PROJECT + project_repo.patch_project_by_id.return_value = SAMPLE_PROJECT client.patch( "/api/v1/projects/mp-sample", json={"title": "New Name"}, headers=AUTHED_HEADERS, ) - _, kwargs = project_repo.patch_project.call_args + _, kwargs = project_repo.patch_project_by_id.call_args assert kwargs["id"] == "mp-sample" assert kwargs["update"].title == "New Name" @@ -220,19 +220,19 @@ def test_id_and_update_forwarded_to_repo(self, client, project_repo): class TestDeleteProject: def test_delete_returns_204(self, client, project_repo): - project_repo.delete_project.return_value = None + project_repo.delete_project_by_id.return_value = None r = client.delete("/api/v1/projects/mp-sample", headers=AUTHED_HEADERS) assert r.status_code == 204 def test_delete_response_has_no_body(self, client, project_repo): - project_repo.delete_project.return_value = None + project_repo.delete_project_by_id.return_value = None r = client.delete("/api/v1/projects/mp-sample", headers=AUTHED_HEADERS) assert r.content == b"" def test_id_forwarded_to_repo(self, client, project_repo): - project_repo.delete_project.return_value = None + project_repo.delete_project_by_id.return_value = None client.delete("/api/v1/projects/mp-sample", headers=AUTHED_HEADERS) - _, kwargs = project_repo.delete_project.call_args + _, kwargs = project_repo.delete_project_by_id.call_args assert kwargs["id"] == "mp-sample" @@ -256,12 +256,12 @@ def _valid_body(self, **overrides): return body def test_valid_upsert_returns_200(self, client, project_repo): - project_repo.upsert_project.return_value = SAMPLE_PROJECT + project_repo.upsert_project_by_id.return_value = SAMPLE_PROJECT r = client.put("/api/v1/projects/mp-sample", json=self._valid_body(), headers=AUTHED_HEADERS) assert r.status_code == 200 def test_conflict_returns_409(self, client, project_repo): - project_repo.upsert_project.side_effect = ConflictError("already exists") + project_repo.upsert_project_by_id.side_effect = ConflictError("already exists") r = client.put("/api/v1/projects/mp-sample", json=self._valid_body(), headers=AUTHED_HEADERS) assert r.status_code == 409 From 792f83acc82b647cf221af87b89cf326382877a6 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 4 Jun 2026 14:16:51 -0700 Subject: [PATCH 061/591] Changed logging middleware to allow contextvars being passed upwards --- mpcontribs-api/src/mpcontribs_api/app.py | 5 ++-- .../src/mpcontribs_api/middleware.py | 29 ++++++++++++++----- mpcontribs-api/tests/integration/conftest.py | 7 ++--- 3 files changed, 26 insertions(+), 15 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/app.py b/mpcontribs-api/src/mpcontribs_api/app.py index 9152c464f6..dcdf7af0de 100644 --- a/mpcontribs-api/src/mpcontribs_api/app.py +++ b/mpcontribs-api/src/mpcontribs_api/app.py @@ -6,7 +6,6 @@ from beanie import init_beanie from fastapi import Depends, FastAPI from pymongo import AsyncMongoClient -from starlette.middleware.base import BaseHTTPMiddleware from mpcontribs_api._openapi import contact_info, license_info, openapi_tags from mpcontribs_api.api.v1.router import router as v1_router @@ -16,7 +15,7 @@ from mpcontribs_api.domains.projects.models import Project from mpcontribs_api.exceptions import register_exception_handlers from mpcontribs_api.logging import configure_logging, get_logger -from mpcontribs_api.middleware import bind_request_context +from mpcontribs_api.middleware import RequestContextMiddleware logger = get_logger(__name__) @@ -69,7 +68,7 @@ def create_app(settings: Settings | None = None) -> FastAPI: openapi_tags=openapi_tags, ) - app.add_middleware(BaseHTTPMiddleware, dispatch=bind_request_context) + app.add_middleware(RequestContextMiddleware) register_exception_handlers(app) app.include_router(v1_router, prefix="/api/v1") diff --git a/mpcontribs-api/src/mpcontribs_api/middleware.py b/mpcontribs-api/src/mpcontribs_api/middleware.py index d4e0bf8e45..e68462ff8e 100644 --- a/mpcontribs-api/src/mpcontribs_api/middleware.py +++ b/mpcontribs-api/src/mpcontribs_api/middleware.py @@ -1,13 +1,26 @@ import uuid import structlog +from starlette.types import ASGIApp, Receive, Scope, Send -async def bind_request_context(request, call_next): - structlog.contextvars.clear_contextvars() - structlog.contextvars.bind_contextvars( - request_id=request.headers.get("x-request-id", str(uuid.uuid4())), - method=request.method, - path=request.url.path, - ) - return await call_next(request) +class RequestContextMiddleware: + def __init__(self, app: ASGIApp) -> None: + self.app = app + + async def __call__(self, scope: Scope, receive: Receive, send: Send) -> None: + if scope["type"] != "http": + await self.app(scope, receive, send) + return + + headers = dict(scope.get("headers", [])) + raw_request_id = headers.get(b"x-request-id", b"") + request_id = raw_request_id.decode() if raw_request_id else str(uuid.uuid4()) + + structlog.contextvars.clear_contextvars() + structlog.contextvars.bind_contextvars( + request_id=request_id, + method=scope["method"], + path=scope["path"], + ) + await self.app(scope, receive, send) diff --git a/mpcontribs-api/tests/integration/conftest.py b/mpcontribs-api/tests/integration/conftest.py index 3404c9d28a..38b7782765 100644 --- a/mpcontribs-api/tests/integration/conftest.py +++ b/mpcontribs-api/tests/integration/conftest.py @@ -18,10 +18,9 @@ import pytest from fastapi import FastAPI from fastapi.testclient import TestClient -from starlette.middleware.base import BaseHTTPMiddleware from mpcontribs_api.exceptions import register_exception_handlers -from mpcontribs_api.middleware import bind_request_context +from mpcontribs_api.middleware import RequestContextMiddleware @pytest.fixture(autouse=True, scope="session") @@ -85,7 +84,7 @@ async def _noop_lifespan(app: FastAPI): yield app = FastAPI(title="mpcontribs-test", lifespan=_noop_lifespan) - app.add_middleware(BaseHTTPMiddleware, dispatch=bind_request_context) + app.add_middleware(RequestContextMiddleware) register_exception_handlers(app) from mpcontribs_api.api.v1.router import router as v1_router @@ -114,7 +113,7 @@ async def _noop_lifespan(app: FastAPI): lifespan=_noop_lifespan, dependencies=[Depends(verify_gateway)], ) - app.add_middleware(BaseHTTPMiddleware, dispatch=bind_request_context) + app.add_middleware(RequestContextMiddleware) register_exception_handlers(app) from mpcontribs_api.api.v1.router import router as v1_router From 870456a4f05246eff4c3c920f6868330505816f6 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 4 Jun 2026 14:32:12 -0700 Subject: [PATCH 062/591] basedpyright ignores tests --- mpcontribs-api/pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/mpcontribs-api/pyproject.toml b/mpcontribs-api/pyproject.toml index 6305ba69e1..3ff97de127 100644 --- a/mpcontribs-api/pyproject.toml +++ b/mpcontribs-api/pyproject.toml @@ -89,3 +89,4 @@ max-line-length = 120 pythonVersion = "3.14" typeCheckingMode = "standard" extraPaths = ["src"] +ignore=["tests/"] From ba089932b30608f0e80e3a2b2f6c2fcf4b6c961c Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 4 Jun 2026 14:54:30 -0700 Subject: [PATCH 063/591] Infra changes for rewrite --- .claude/worktrees/unify-component-service | 1 + mpcontribs-api/Dockerfile | 44 +- mpcontribs-api/gunicorn.conf.py | 19 - mpcontribs-api/maintenance.py | 41 -- mpcontribs-api/requirements/deployment.txt | 551 --------------- .../requirements/ubuntu-latest_py3.11.txt | 548 --------------- .../ubuntu-latest_py3.11_extras.txt | 648 ------------------ .../requirements/ubuntu-latest_py3.12.txt | 545 --------------- .../ubuntu-latest_py3.12_extras.txt | 645 ----------------- mpcontribs-api/scripts/start.sh | 9 +- mpcontribs-api/scripts/start_rq.sh | 16 - 11 files changed, 17 insertions(+), 3050 deletions(-) create mode 160000 .claude/worktrees/unify-component-service delete mode 100644 mpcontribs-api/gunicorn.conf.py delete mode 100644 mpcontribs-api/maintenance.py delete mode 100644 mpcontribs-api/requirements/deployment.txt delete mode 100644 mpcontribs-api/requirements/ubuntu-latest_py3.11.txt delete mode 100644 mpcontribs-api/requirements/ubuntu-latest_py3.11_extras.txt delete mode 100644 mpcontribs-api/requirements/ubuntu-latest_py3.12.txt delete mode 100644 mpcontribs-api/requirements/ubuntu-latest_py3.12_extras.txt delete mode 100755 mpcontribs-api/scripts/start_rq.sh diff --git a/.claude/worktrees/unify-component-service b/.claude/worktrees/unify-component-service new file mode 160000 index 0000000000..7d84eafaec --- /dev/null +++ b/.claude/worktrees/unify-component-service @@ -0,0 +1 @@ +Subproject commit 7d84eafaec7223ee57b2b626f02815075a8dfc47 diff --git a/mpcontribs-api/Dockerfile b/mpcontribs-api/Dockerfile index 88be9c1462..2e755f13cc 100644 --- a/mpcontribs-api/Dockerfile +++ b/mpcontribs-api/Dockerfile @@ -1,58 +1,42 @@ +# NOTE: base image must be updated to Python 3.14 to satisfy requires-python in pyproject.toml FROM materialsproject/devops:python-3.1113.4 AS base -RUN apt-get update && apt-get install -y --no-install-recommends supervisor libopenblas-dev libpq-dev vim && apt-get clean +RUN apt-get update && apt-get install -y --no-install-recommends supervisor libopenblas-dev vim && apt-get clean WORKDIR /app FROM base AS builder -RUN apt-get update && apt-get install -y --no-install-recommends gcc git g++ libsnappy-dev wget liblapack-dev && apt-get clean -ENV PIP_FLAGS "--no-cache-dir --compile" -COPY requirements/deployment.txt ./requirements.txt -RUN pip install $PIP_FLAGS -r requirements.txt -COPY pyproject.toml . -COPY mpcontribs mpcontribs +RUN apt-get update && apt-get install -y --no-install-recommends gcc git g++ wget liblapack-dev && apt-get clean +RUN pip install uv +COPY pyproject.toml uv.lock . +COPY src src ARG CONTRIBS_VERSION -RUN SETUPTOOLS_SCM_PRETEND_VERSION=${CONTRIBS_VERSION} pip install $PIP_FLAGS --no-deps . -#ENV SETUPTOOLS_SCM_PRETEND_VERSION 0.0.0 -#COPY marshmallow-mongoengine marshmallow-mongoengine -#RUN cd marshmallow-mongoengine && pip install $PIP_FLAGS --no-deps -e . -#COPY mimerender mimerender -#RUN cd mimerender && pip install $PIP_FLAGS --no-deps -e . -#COPY flask-mongorest flask-mongorest -#RUN cd flask-mongorest && pip install $PIP_FLAGS --no-deps -e . -#COPY AtlasQ AtlasQ -#RUN cd AtlasQ && pip install $PIP_FLAGS --no-deps -e . +RUN SETUPTOOLS_SCM_PRETEND_VERSION=${CONTRIBS_VERSION} uv sync --frozen --no-dev RUN wget -q https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh && \ - chmod +x wait-for-it.sh && mv wait-for-it.sh /usr/local/bin/ && \ - wget -q https://github.com/materialsproject/MPContribs/blob/master/mpcontribs-api/mpcontribs/api/contributions/formulae.json.gz?raw=true \ - -O mpcontribs/api/contributions/formulae.json.gz + chmod +x wait-for-it.sh && mv wait-for-it.sh /usr/local/bin/ FROM base ARG BUILDARCH ENV BUILDARCH=x86_64 -COPY --from=builder /usr/local/lib/python3.11/site-packages /usr/local/lib/python3.11/site-packages -COPY --from=builder /usr/local/bin /usr/local/bin -COPY --from=builder /usr/lib/$BUILDARCH-linux-gnu/libsnappy* /usr/lib/$BUILDARCH-linux-gnu/ +COPY --from=builder /app/.venv /app/.venv +COPY --from=builder /usr/local/bin/wait-for-it.sh /usr/local/bin/ -COPY --from=builder /app/mpcontribs/api /app/mpcontribs/api WORKDIR /app RUN mkdir -p /var/log/supervisor COPY supervisord supervisord COPY scripts scripts COPY main.py . -COPY maintenance.py . COPY docker-entrypoint.sh . -COPY gunicorn.conf.py . -RUN chmod +x main.py scripts/start.sh scripts/start_rq.sh docker-entrypoint.sh +RUN chmod +x main.py scripts/start.sh docker-entrypoint.sh ARG VERSION -ENV DD_SERVICE=contribs-apis \ +ENV PATH="/app/.venv/bin:$PATH" \ + DD_SERVICE=contribs-apis \ DD_ENV=prod \ DD_VERSION=$VERSION \ DD_TRACE_HOST=localhost:8126 \ - DD_TRACE_OTEL_ENABLED=false \ DD_MAIN_PACKAGE=mpcontribs-api -LABEL com.datadoghq.ad.logs='[{"source": "gunicorn", "service": "contribs-apis"}]' +LABEL com.datadoghq.ad.logs='[{"source": "uvicorn", "service": "contribs-apis"}]' EXPOSE 10000 10002 10003 10005 20000 ENTRYPOINT ["/app/docker-entrypoint.sh"] CMD ["/usr/bin/supervisord", "-c", "supervisord.conf"] diff --git a/mpcontribs-api/gunicorn.conf.py b/mpcontribs-api/gunicorn.conf.py deleted file mode 100644 index 548ba7f767..0000000000 --- a/mpcontribs-api/gunicorn.conf.py +++ /dev/null @@ -1,19 +0,0 @@ -import os - -import ddtrace.auto # noqa: F401 - -bind = "0.0.0.0:{}".format(os.getenv("API_PORT")) -worker_class = "gevent" -workers = os.getenv("NWORKERS") -statsd_host = "{}:8125".format(os.getenv("DD_AGENT_HOST")) -accesslog = "-" -errorlog = "-" -access_log_format = ( - '{}/{}: %(h)s %(t)s %(m)s %(U)s?%(q)s %(H)s %(s)s %(b)s "%(f)s" "%(a)s" %(D)s %(p)s %({{x-consumer-id}}i)s'.format( - os.getenv("SUPERVISOR_GROUP_NAME"), os.getenv("SUPERVISOR_PROCESS_NAME") - ) -) -max_requests = os.getenv("MAX_REQUESTS") -max_requests_jitter = os.getenv("MAX_REQUESTS_JITTER") -proc_name = os.getenv("SUPERVISOR_PROCESS_NAME") -reload = bool(os.getenv("RELOAD", False)) diff --git a/mpcontribs-api/maintenance.py b/mpcontribs-api/maintenance.py deleted file mode 100644 index 10d84a8d35..0000000000 --- a/mpcontribs-api/maintenance.py +++ /dev/null @@ -1,41 +0,0 @@ -from boltons.iterutils import remap -from mongoengine.queryset.visitor import Q -from mpcontribs.api import enter -from mpcontribs.api.contributions.document import Contributions -from mpcontribs.api.projects.document import Projects - - -def visit(path, key, value): - if isinstance(value, dict) and "display" in value: - return key, value["display"] - return True - - -def fix_units(name): - # make sure correct units are indicated in project.columns before running this - fields = list(Contributions._fields.keys()) - project = Projects.objects.with_id(name).reload("columns") - query = Q() - - for column in project.columns: - if column.unit and column.unit != "NaN": - path = column.path.replace(".", "__") - q = {f"{path}__unit__ne": column["unit"]} - query |= Q(**q) - - contribs = Contributions.objects(Q(project=name) & query).only(*fields) - num = contribs.count() - print(name, num) - - for idx, contrib in enumerate(contribs): - contrib.data = remap(contrib.data, visit=visit, enter=enter) # pull out display - contrib.save(signal_kwargs={"skip": True}) # reparse display with intended unit - - if idx and not idx % 250: - print(idx) - - -# additional maintenance functions -# TODO generate JSON/CSV project downloads -# TODO clean dangling notebooks -# TODO update_projects/stats diff --git a/mpcontribs-api/requirements/deployment.txt b/mpcontribs-api/requirements/deployment.txt deleted file mode 100644 index 03bbd3d936..0000000000 --- a/mpcontribs-api/requirements/deployment.txt +++ /dev/null @@ -1,551 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.11 -# by the following command: -# -# pip-compile --output-file=MPContribs/mpcontribs-api/requirements/deployment.txt MPContribs/mpcontribs-api/pyproject.toml python/requirements.txt -# -anyio==4.13.0 - # via jupyter-server -apispec==5.2.2 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -argon2-cffi==25.1.0 - # via - # jupyter-server - # notebook -argon2-cffi-bindings==25.1.0 - # via argon2-cffi -arrow==1.4.0 - # via isoduration -asn1crypto==1.5.1 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -asttokens==3.0.1 - # via stack-data -atlasq-tschaume==0.11.1.dev2 - # via flask-mongorest-mpcontribs -attrs==26.1.0 - # via - # jsonschema - # referencing -backports-zstd==1.5.0 - # via flask-compress -beautifulsoup4==4.15.0 - # via nbconvert -bibtexparser==1.4.4 - # via pymatgen-core -bleach[css]==6.4.0 - # via nbconvert -blinker==1.9.0 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -boltons==25.0.0 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -boto3==1.43.25 - # via flask-mongorest-mpcontribs -botocore==1.43.25 - # via - # boto3 - # s3transfer -brotli==1.2.0 - # via flask-compress -bytecode==0.18.1 - # via ddtrace -certifi==2026.5.20 - # via requests -cffi==2.0.0 - # via - # argon2-cffi-bindings - # cryptography -charset-normalizer==3.4.7 - # via requests -click==8.4.1 - # via - # flask - # rq -comm==0.2.3 - # via ipykernel -contourpy==1.3.3 - # via matplotlib -cramjam==2.11.0 - # via python-snappy -crontab==1.0.5 - # via rq-scheduler -cryptography==48.0.0 - # via pyopenssl -css-html-js-minify==2.5.5 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -cycler==0.12.1 - # via matplotlib -dateparser==1.4.0 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -ddtrace==4.3.0 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -debugpy==1.8.21 - # via ipykernel -decorator==5.3.1 - # via ipython -defusedxml==0.7.1 - # via nbconvert -dnspython==2.8.0 - # via - # mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) - # pymongo -entrypoints==0.4 - # via jupyter-client -envier==0.6.1 - # via ddtrace -executing==2.2.1 - # via stack-data -fastjsonschema==2.21.2 - # via nbformat -fastnumbers==5.1.1 - # via flask-mongorest-mpcontribs -filetype==1.2.0 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -flasgger-tschaume==0.9.7 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -flask==2.2.5 - # via - # flasgger-tschaume - # flask-compress - # flask-marshmallow - # flask-mongoengine-tschaume - # flask-rq2 - # flask-sse -flask-compress==1.24 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -flask-marshmallow==1.4.0 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -flask-mongoengine-tschaume==1.1.0 - # via flask-mongorest-mpcontribs -flask-mongorest-mpcontribs==3.3.0 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -flask-rq2==18.3 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -flask-sse==1.0.0 - # via flask-mongorest-mpcontribs -flatten-dict==0.5.0 - # via flask-mongorest-mpcontribs -flexcache==0.3 - # via pint -flexparser==0.4 - # via pint -fonttools==4.63.0 - # via matplotlib -fqdn==1.5.1 - # via jsonschema -freezegun==1.5.5 - # via rq-scheduler -gevent==26.5.0 - # via gunicorn -greenlet==3.5.1 - # via gevent -gunicorn[gevent]==24.1.1 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -idna==3.18 - # via - # anyio - # jsonschema - # requests -ipykernel==6.29.5 - # via - # nbclassic - # notebook -ipython==9.14.1 - # via ipykernel -ipython-genutils==0.2.0 - # via - # nbclassic - # notebook -ipython-pygments-lexers==1.1.1 - # via ipython -isoduration==20.11.0 - # via jsonschema -itsdangerous==2.2.0 - # via flask -jedi==0.20.0 - # via ipython -jinja2==3.1.6 - # via - # flask - # jupyter-server - # mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) - # nbconvert - # notebook -jmespath==1.1.0 - # via - # boto3 - # botocore -joblib==1.5.3 - # via pymatgen-core -json2html==1.3.0 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -jsonpointer==3.1.1 - # via jsonschema -jsonschema[format-nongpl]==4.26.0 - # via - # flasgger-tschaume - # jupyter-events - # nbformat -jsonschema-specifications==2025.9.1 - # via jsonschema -jupyter-client==7.4.9 - # via - # ipykernel - # jupyter-server - # nbclient - # notebook -jupyter-core==5.9.1 - # via - # ipykernel - # jupyter-client - # jupyter-server - # nbclient - # nbconvert - # nbformat - # notebook -jupyter-events==0.12.1 - # via jupyter-server -jupyter-server==2.19.0 - # via notebook-shim -jupyter-server-terminals==0.5.4 - # via jupyter-server -jupyterlab-pygments==0.3.0 - # via nbconvert -kiwisolver==1.5.0 - # via matplotlib -lark==1.3.1 - # via rfc3987-syntax -lxml==6.1.1 - # via pymatgen-core -markupsafe==3.0.3 - # via - # jinja2 - # nbconvert - # werkzeug -marshmallow==3.26.2 - # via - # flask-marshmallow - # marshmallow-mongoengine - # mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -marshmallow-mongoengine==0.31.2 - # via flask-mongorest-mpcontribs -matplotlib==3.10.9 - # via - # -r python/requirements.txt - # pymatgen-core -matplotlib-inline==0.2.2 - # via - # ipykernel - # ipython -mimerender-pr36==0.0.2 - # via flask-mongorest-mpcontribs -mistune==3.2.1 - # via - # flasgger-tschaume - # nbconvert -mongoengine==0.29.3 - # via - # atlasq-tschaume - # flask-mongoengine-tschaume - # marshmallow-mongoengine -monty==2026.5.18 - # via pymatgen-core -more-itertools==11.1.0 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -mpmath==1.3.0 - # via sympy -narwhals==2.22.1 - # via plotly -nbclassic==1.3.3 - # via notebook -nbclient==0.11.0 - # via nbconvert -nbconvert==7.17.1 - # via - # jupyter-server - # notebook -nbformat==5.10.4 - # via - # jupyter-server - # mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) - # nbclient - # nbconvert - # notebook -nest-asyncio==1.6.0 - # via - # ipykernel - # jupyter-client - # nbclassic - # notebook -networkx==3.6.1 - # via pymatgen-core -notebook==6.5.7 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -notebook-shim==0.2.4 - # via nbclassic -numpy==2.4.6 - # via - # -r python/requirements.txt - # contourpy - # matplotlib - # monty - # mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) - # pandas - # pymatgen-core - # scipy - # spglib -opentelemetry-api==1.42.1 - # via ddtrace -orjson==3.11.9 - # via - # flask-mongorest-mpcontribs - # pymatgen-core -overrides==7.7.0 - # via jupyter-server -packaging==26.2 - # via - # gunicorn - # ipykernel - # jupyter-events - # jupyter-server - # marshmallow - # matplotlib - # nbconvert - # plotly -palettable==3.3.3 - # via pymatgen-core -pandas==3.0.3 - # via - # -r python/requirements.txt - # pymatgen-core -pandocfilters==1.5.1 - # via nbconvert -parso==0.8.7 - # via jedi -pexpect==4.9.0 - # via ipython -pillow==12.2.0 - # via matplotlib -pint==0.25.3 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -platformdirs==4.10.0 - # via - # jupyter-core - # pint -plotly==6.8.0 - # via pymatgen-core -prometheus-client==0.25.0 - # via - # jupyter-server - # notebook -prompt-toolkit==3.0.52 - # via ipython -psutil==7.2.2 - # via - # ipykernel - # ipython -psycopg2-binary==2.9.12 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -ptyprocess==0.7.0 - # via - # pexpect - # terminado -pure-eval==0.2.3 - # via stack-data -pycparser==3.0 - # via cffi -pygments==2.20.0 - # via - # ipython - # ipython-pygments-lexers - # nbconvert -pymatgen==2026.5.4 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -pymatgen-core==2026.5.18 - # via pymatgen -pymongo==4.17.0 - # via - # flask-mongorest-mpcontribs - # mongoengine -pyopenssl==26.2.0 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -pyparsing==3.3.2 - # via - # bibtexparser - # matplotlib -python-dateutil==2.9.0.post0 - # via - # arrow - # botocore - # dateparser - # flask-mongorest-mpcontribs - # freezegun - # jupyter-client - # matplotlib - # pandas - # rq-scheduler -python-json-logger==4.1.0 - # via jupyter-events -python-mimeparse==2.0.0 - # via mimerender-pr36 -python-snappy==0.7.3 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -pytz==2026.2 - # via dateparser -pyyaml==6.0.3 - # via - # flasgger-tschaume - # jupyter-events -pyzmq==27.1.0 - # via - # ipykernel - # jupyter-client - # jupyter-server - # notebook -redis==8.0.0 - # via - # flask-rq2 - # flask-sse - # rq -referencing==0.37.0 - # via - # jsonschema - # jsonschema-specifications - # jupyter-events -regex==2026.5.9 - # via dateparser -requests==2.34.2 - # via - # atlasq-tschaume - # pymatgen-core -rfc3339-validator==0.1.4 - # via - # jsonschema - # jupyter-events -rfc3986-validator==0.1.1 - # via - # jsonschema - # jupyter-events -rfc3987-syntax==1.1.0 - # via jsonschema -rpds-py==2026.5.1 - # via - # jsonschema - # referencing -rq==2.3.2 - # via - # flask-rq2 - # mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) - # rq-scheduler -rq-scheduler==0.14.0 - # via flask-rq2 -ruamel-yaml==0.19.1 - # via monty -s3transfer==0.18.0 - # via boto3 -scipy==1.17.1 - # via - # -r python/requirements.txt - # pymatgen-core -send2trash==2.1.0 - # via - # jupyter-server - # notebook -setproctitle==1.3.7 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -six==1.17.0 - # via - # flasgger-tschaume - # flask-sse - # python-dateutil - # rfc3339-validator -soupsieve==2.8.4 - # via beautifulsoup4 -spglib==2.7.0 - # via pymatgen-core -stack-data==0.6.3 - # via ipython -supervisor==4.3.0 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -sympy==1.14.0 - # via pymatgen-core -tabulate==0.10.0 - # via pymatgen-core -terminado==0.18.1 - # via - # jupyter-server - # jupyter-server-terminals - # notebook -tinycss2==1.5.1 - # via bleach -tornado==6.5.7 - # via - # ipykernel - # jupyter-client - # jupyter-server - # notebook - # terminado -tqdm==4.68.1 - # via pymatgen-core -traitlets==5.15.1 - # via - # ipykernel - # ipython - # jupyter-client - # jupyter-core - # jupyter-events - # jupyter-server - # matplotlib-inline - # nbclient - # nbconvert - # nbformat - # notebook -typing-extensions==4.15.0 - # via - # anyio - # beautifulsoup4 - # flexcache - # flexparser - # ipython - # opentelemetry-api - # pint - # pyopenssl - # referencing - # spglib -tzdata==2026.2 - # via arrow -tzlocal==5.3.1 - # via dateparser -uncertainties==3.2.3 - # via - # mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) - # pymatgen-core -uri-template==1.3.0 - # via jsonschema -urllib3==2.7.0 - # via - # botocore - # requests -wcwidth==0.8.1 - # via prompt-toolkit -webcolors==25.10.0 - # via jsonschema -webencodings==0.5.1 - # via - # bleach - # tinycss2 -websocket-client==1.9.0 - # via - # jupyter-server - # mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -werkzeug==3.1.8 - # via - # flasgger-tschaume - # flask -wrapt==2.2.1 - # via ddtrace -zope-event==6.2 - # via gevent -zope-interface==8.5 - # via gevent -zstandard==0.25.0 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) diff --git a/mpcontribs-api/requirements/ubuntu-latest_py3.11.txt b/mpcontribs-api/requirements/ubuntu-latest_py3.11.txt deleted file mode 100644 index ae1ff8eeed..0000000000 --- a/mpcontribs-api/requirements/ubuntu-latest_py3.11.txt +++ /dev/null @@ -1,548 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.11 -# by the following command: -# -# pip-compile --output-file=requirements/ubuntu-latest_py3.11.txt -# -anyio==4.13.0 - # via jupyter-server -apispec==5.2.2 - # via mpcontribs-api (pyproject.toml) -argon2-cffi==25.1.0 - # via - # jupyter-server - # notebook -argon2-cffi-bindings==25.1.0 - # via argon2-cffi -arrow==1.4.0 - # via isoduration -asn1crypto==1.5.1 - # via mpcontribs-api (pyproject.toml) -asttokens==3.0.1 - # via stack-data -atlasq-tschaume==0.11.1.dev2 - # via flask-mongorest-mpcontribs -attrs==26.1.0 - # via - # jsonschema - # referencing -backports-zstd==1.5.0 - # via flask-compress -beautifulsoup4==4.14.3 - # via nbconvert -bibtexparser==1.4.4 - # via pymatgen-core -bleach[css]==6.3.0 - # via nbconvert -blinker==1.9.0 - # via mpcontribs-api (pyproject.toml) -boltons==25.0.0 - # via mpcontribs-api (pyproject.toml) -boto3==1.43.9 - # via flask-mongorest-mpcontribs -botocore==1.43.9 - # via - # boto3 - # s3transfer -brotli==1.2.0 - # via flask-compress -bytecode==0.17.0 - # via ddtrace -certifi==2026.4.22 - # via requests -cffi==2.0.0 - # via - # argon2-cffi-bindings - # cryptography -charset-normalizer==3.4.7 - # via requests -click==8.4.0 - # via - # flask - # rq -comm==0.2.3 - # via ipykernel -contourpy==1.3.3 - # via matplotlib -cramjam==2.11.0 - # via python-snappy -crontab==1.0.5 - # via rq-scheduler -cryptography==48.0.0 - # via pyopenssl -css-html-js-minify==2.5.5 - # via mpcontribs-api (pyproject.toml) -cycler==0.12.1 - # via matplotlib -dateparser==1.4.0 - # via mpcontribs-api (pyproject.toml) -ddtrace==4.3.0 - # via mpcontribs-api (pyproject.toml) -debugpy==1.8.20 - # via ipykernel -decorator==5.3.1 - # via ipython -defusedxml==0.7.1 - # via nbconvert -dnspython==2.8.0 - # via - # mpcontribs-api (pyproject.toml) - # pymongo -entrypoints==0.4 - # via jupyter-client -envier==0.6.1 - # via ddtrace -executing==2.2.1 - # via stack-data -fastjsonschema==2.21.2 - # via nbformat -fastnumbers==5.1.1 - # via flask-mongorest-mpcontribs -filetype==1.2.0 - # via mpcontribs-api (pyproject.toml) -flasgger-tschaume==0.9.7 - # via mpcontribs-api (pyproject.toml) -flask==2.2.5 - # via - # flasgger-tschaume - # flask-compress - # flask-marshmallow - # flask-mongoengine-tschaume - # flask-rq2 - # flask-sse -flask-compress==1.24 - # via mpcontribs-api (pyproject.toml) -flask-marshmallow==1.4.0 - # via mpcontribs-api (pyproject.toml) -flask-mongoengine-tschaume==1.1.0 - # via flask-mongorest-mpcontribs -flask-mongorest-mpcontribs==3.3.0 - # via mpcontribs-api (pyproject.toml) -flask-rq2==18.3 - # via mpcontribs-api (pyproject.toml) -flask-sse==1.0.0 - # via flask-mongorest-mpcontribs -flatten-dict==0.5.0 - # via flask-mongorest-mpcontribs -flexcache==0.3 - # via pint -flexparser==0.4 - # via pint -fonttools==4.63.0 - # via matplotlib -fqdn==1.5.1 - # via jsonschema -freezegun==1.5.5 - # via rq-scheduler -gevent==26.4.0 - # via gunicorn -greenlet==3.5.0 - # via gevent -gunicorn[gevent]==24.1.1 - # via mpcontribs-api (pyproject.toml) -idna==3.15 - # via - # anyio - # jsonschema - # requests -importlib-metadata==8.7.1 - # via opentelemetry-api -ipykernel==6.29.5 - # via - # nbclassic - # notebook -ipython==9.13.0 - # via ipykernel -ipython-genutils==0.2.0 - # via - # nbclassic - # notebook -ipython-pygments-lexers==1.1.1 - # via ipython -isoduration==20.11.0 - # via jsonschema -itsdangerous==2.2.0 - # via flask -jedi==0.20.0 - # via ipython -jinja2==3.1.6 - # via - # flask - # jupyter-server - # mpcontribs-api (pyproject.toml) - # nbconvert - # notebook -jmespath==1.1.0 - # via - # boto3 - # botocore -joblib==1.5.3 - # via pymatgen-core -json2html==1.3.0 - # via mpcontribs-api (pyproject.toml) -jsonpointer==3.1.1 - # via jsonschema -jsonschema[format-nongpl]==4.26.0 - # via - # flasgger-tschaume - # jupyter-events - # nbformat -jsonschema-specifications==2025.9.1 - # via jsonschema -jupyter-client==7.4.9 - # via - # ipykernel - # jupyter-server - # nbclient - # notebook -jupyter-core==5.9.1 - # via - # ipykernel - # jupyter-client - # jupyter-server - # nbclient - # nbconvert - # nbformat - # notebook -jupyter-events==0.12.1 - # via jupyter-server -jupyter-server==2.18.2 - # via notebook-shim -jupyter-server-terminals==0.5.4 - # via jupyter-server -jupyterlab-pygments==0.3.0 - # via nbconvert -kiwisolver==1.5.0 - # via matplotlib -lark==1.3.1 - # via rfc3987-syntax -lxml==6.1.0 - # via pymatgen-core -markupsafe==3.0.3 - # via - # jinja2 - # nbconvert - # werkzeug -marshmallow==3.26.2 - # via - # flask-marshmallow - # marshmallow-mongoengine - # mpcontribs-api (pyproject.toml) -marshmallow-mongoengine==0.31.2 - # via flask-mongorest-mpcontribs -matplotlib==3.10.9 - # via pymatgen-core -matplotlib-inline==0.2.2 - # via - # ipykernel - # ipython -mimerender-pr36==0.0.2 - # via flask-mongorest-mpcontribs -mistune==3.2.1 - # via - # flasgger-tschaume - # nbconvert -mongoengine==0.29.3 - # via - # atlasq-tschaume - # flask-mongoengine-tschaume - # marshmallow-mongoengine -monty==2026.5.18 - # via pymatgen-core -more-itertools==11.0.2 - # via mpcontribs-api (pyproject.toml) -mpmath==1.3.0 - # via sympy -narwhals==2.21.2 - # via plotly -nbclassic==1.3.3 - # via notebook -nbclient==0.10.4 - # via nbconvert -nbconvert==7.17.1 - # via - # jupyter-server - # notebook -nbformat==5.10.4 - # via - # jupyter-server - # mpcontribs-api (pyproject.toml) - # nbclient - # nbconvert - # notebook -nest-asyncio==1.6.0 - # via - # ipykernel - # jupyter-client - # nbclassic - # notebook -networkx==3.6.1 - # via pymatgen-core -notebook==6.5.7 - # via mpcontribs-api (pyproject.toml) -notebook-shim==0.2.4 - # via nbclassic -numpy==2.4.5 - # via - # contourpy - # matplotlib - # monty - # mpcontribs-api (pyproject.toml) - # pandas - # pymatgen-core - # scipy - # spglib -opentelemetry-api==1.41.1 - # via ddtrace -orjson==3.11.9 - # via - # flask-mongorest-mpcontribs - # pymatgen-core -overrides==7.7.0 - # via jupyter-server -packaging==26.2 - # via - # gunicorn - # ipykernel - # jupyter-events - # jupyter-server - # marshmallow - # matplotlib - # nbconvert - # plotly -palettable==3.3.3 - # via pymatgen-core -pandas==3.0.3 - # via pymatgen-core -pandocfilters==1.5.1 - # via nbconvert -parso==0.8.7 - # via jedi -pexpect==4.9.0 - # via ipython -pillow==12.2.0 - # via matplotlib -pint==0.25.3 - # via mpcontribs-api (pyproject.toml) -platformdirs==4.9.6 - # via - # jupyter-core - # pint -plotly==6.7.0 - # via pymatgen-core -prometheus-client==0.25.0 - # via - # jupyter-server - # notebook -prompt-toolkit==3.0.52 - # via ipython -psutil==7.2.2 - # via - # ipykernel - # ipython -psycopg2-binary==2.9.12 - # via mpcontribs-api (pyproject.toml) -ptyprocess==0.7.0 - # via - # pexpect - # terminado -pure-eval==0.2.3 - # via stack-data -pycparser==3.0 - # via cffi -pygments==2.20.0 - # via - # ipython - # ipython-pygments-lexers - # nbconvert -pymatgen==2026.5.4 - # via mpcontribs-api (pyproject.toml) -pymatgen-core==2026.5.17 - # via pymatgen -pymongo==4.17.0 - # via - # flask-mongorest-mpcontribs - # mongoengine -pyopenssl==26.2.0 - # via mpcontribs-api (pyproject.toml) -pyparsing==3.3.2 - # via - # bibtexparser - # matplotlib -python-dateutil==2.9.0.post0 - # via - # arrow - # botocore - # dateparser - # flask-mongorest-mpcontribs - # freezegun - # jupyter-client - # matplotlib - # pandas - # rq-scheduler -python-json-logger==4.1.0 - # via jupyter-events -python-mimeparse==2.0.0 - # via mimerender-pr36 -python-snappy==0.7.3 - # via mpcontribs-api (pyproject.toml) -pytz==2026.2 - # via dateparser -pyyaml==6.0.3 - # via - # flasgger-tschaume - # jupyter-events -pyzmq==27.1.0 - # via - # ipykernel - # jupyter-client - # jupyter-server - # notebook -redis==7.4.0 - # via - # flask-rq2 - # flask-sse - # rq -referencing==0.37.0 - # via - # jsonschema - # jsonschema-specifications - # jupyter-events -regex==2026.5.9 - # via dateparser -requests==2.34.2 - # via - # atlasq-tschaume - # pymatgen-core -rfc3339-validator==0.1.4 - # via - # jsonschema - # jupyter-events -rfc3986-validator==0.1.1 - # via - # jsonschema - # jupyter-events -rfc3987-syntax==1.1.0 - # via jsonschema -rpds-py==0.30.0 - # via - # jsonschema - # referencing -rq==2.3.2 - # via - # flask-rq2 - # mpcontribs-api (pyproject.toml) - # rq-scheduler -rq-scheduler==0.14.0 - # via flask-rq2 -ruamel-yaml==0.19.1 - # via monty -s3transfer==0.17.0 - # via boto3 -scipy==1.17.1 - # via pymatgen-core -send2trash==2.1.0 - # via - # jupyter-server - # notebook -setproctitle==1.3.7 - # via mpcontribs-api (pyproject.toml) -six==1.17.0 - # via - # flasgger-tschaume - # flask-sse - # python-dateutil - # rfc3339-validator -soupsieve==2.8.3 - # via beautifulsoup4 -spglib==2.7.0 - # via pymatgen-core -stack-data==0.6.3 - # via ipython -supervisor==4.3.0 - # via mpcontribs-api (pyproject.toml) -sympy==1.14.0 - # via pymatgen-core -tabulate==0.10.0 - # via pymatgen-core -terminado==0.18.1 - # via - # jupyter-server - # jupyter-server-terminals - # notebook -tinycss2==1.4.0 - # via bleach -tornado==6.5.5 - # via - # ipykernel - # jupyter-client - # jupyter-server - # notebook - # terminado -tqdm==4.67.3 - # via pymatgen-core -traitlets==5.15.0 - # via - # ipykernel - # ipython - # jupyter-client - # jupyter-core - # jupyter-events - # jupyter-server - # matplotlib-inline - # nbclient - # nbconvert - # nbformat - # notebook -typing-extensions==4.15.0 - # via - # anyio - # beautifulsoup4 - # flexcache - # flexparser - # ipython - # opentelemetry-api - # pint - # pyopenssl - # referencing - # spglib -tzdata==2026.2 - # via arrow -tzlocal==5.3.1 - # via dateparser -uncertainties==3.2.3 - # via - # mpcontribs-api (pyproject.toml) - # pymatgen-core -uri-template==1.3.0 - # via jsonschema -urllib3==2.7.0 - # via - # botocore - # requests -wcwidth==0.7.0 - # via prompt-toolkit -webcolors==25.10.0 - # via jsonschema -webencodings==0.5.1 - # via - # bleach - # tinycss2 -websocket-client==1.9.0 - # via - # jupyter-server - # mpcontribs-api (pyproject.toml) -werkzeug==3.1.8 - # via - # flasgger-tschaume - # flask -wrapt==2.1.2 - # via ddtrace -zipp==3.23.1 - # via importlib-metadata -zope-event==6.2 - # via gevent -zope-interface==8.4 - # via gevent -zstandard==0.25.0 - # via mpcontribs-api (pyproject.toml) diff --git a/mpcontribs-api/requirements/ubuntu-latest_py3.11_extras.txt b/mpcontribs-api/requirements/ubuntu-latest_py3.11_extras.txt deleted file mode 100644 index 6387c63ec8..0000000000 --- a/mpcontribs-api/requirements/ubuntu-latest_py3.11_extras.txt +++ /dev/null @@ -1,648 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.11 -# by the following command: -# -# pip-compile --all-extras --output-file=requirements/ubuntu-latest_py3.11_extras.txt -# -anyio==4.13.0 - # via jupyter-server -apispec==5.2.2 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -argon2-cffi==25.1.0 - # via - # jupyter-server - # notebook -argon2-cffi-bindings==25.1.0 - # via argon2-cffi -arrow==1.4.0 - # via isoduration -asn1crypto==1.5.1 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -asttokens==3.0.1 - # via stack-data -atlasq-tschaume==0.11.1.dev2 - # via flask-mongorest-mpcontribs -attrs==26.1.0 - # via - # jsonschema - # referencing -backports-zstd==1.5.0 - # via flask-compress -beautifulsoup4==4.14.3 - # via nbconvert -bibtexparser==1.4.4 - # via pymatgen-core -bleach[css]==6.3.0 - # via nbconvert -blinker==1.9.0 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -boltons==25.0.0 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -boto3==1.43.9 - # via flask-mongorest-mpcontribs -botocore==1.43.9 - # via - # boto3 - # s3transfer -brotli==1.2.0 - # via flask-compress -bytecode==0.17.0 - # via ddtrace -certifi==2026.4.22 - # via requests -cffi==2.0.0 - # via - # argon2-cffi-bindings - # cryptography -charset-normalizer==3.4.7 - # via requests -click==8.4.0 - # via - # flask - # rq -comm==0.2.3 - # via ipykernel -contourpy==1.3.3 - # via matplotlib -cramjam==2.11.0 - # via python-snappy -crontab==1.0.5 - # via rq-scheduler -cryptography==48.0.0 - # via pyopenssl -css-html-js-minify==2.5.5 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -cycler==0.12.1 - # via matplotlib -dateparser==1.4.0 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -ddtrace==4.3.0 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -debugpy==1.8.20 - # via ipykernel -decorator==5.3.1 - # via ipython -defusedxml==0.7.1 - # via nbconvert -dnspython==2.8.0 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) - # pymongo -entrypoints==0.4 - # via jupyter-client -envier==0.6.1 - # via ddtrace -execnet==2.1.2 - # via pytest-xdist -executing==2.2.1 - # via stack-data -fastjsonschema==2.21.2 - # via nbformat -fastnumbers==5.1.1 - # via flask-mongorest-mpcontribs -filetype==1.2.0 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -flake8==7.3.0 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) - # pytest-flake8 -flasgger-tschaume==0.9.7 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -flask==2.2.5 - # via - # flasgger-tschaume - # flask-compress - # flask-marshmallow - # flask-mongoengine-tschaume - # flask-rq2 - # flask-sse -flask-compress==1.24 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -flask-marshmallow==1.4.0 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -flask-mongoengine-tschaume==1.1.0 - # via flask-mongorest-mpcontribs -flask-mongorest-mpcontribs==3.3.0 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -flask-rq2==18.3 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -flask-sse==1.0.0 - # via flask-mongorest-mpcontribs -flatten-dict==0.5.0 - # via flask-mongorest-mpcontribs -flexcache==0.3 - # via pint -flexparser==0.4 - # via pint -fonttools==4.63.0 - # via matplotlib -fqdn==1.5.1 - # via jsonschema -freezegun==1.5.5 - # via rq-scheduler -gevent==26.4.0 - # via gunicorn -greenlet==3.5.0 - # via gevent -gunicorn[gevent]==24.1.1 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -idna==3.15 - # via - # anyio - # jsonschema - # requests -importlib-metadata==8.7.1 - # via opentelemetry-api -iniconfig==2.3.0 - # via pytest -ipykernel==6.29.5 - # via - # nbclassic - # notebook -ipython==9.13.0 - # via ipykernel -ipython-genutils==0.2.0 - # via - # nbclassic - # notebook -ipython-pygments-lexers==1.1.1 - # via ipython -isoduration==20.11.0 - # via jsonschema -itsdangerous==2.2.0 - # via flask -jedi==0.20.0 - # via ipython -jinja2==3.1.6 - # via - # flask - # jupyter-server - # mpcontribs-api - # mpcontribs-api (pyproject.toml) - # nbconvert - # notebook -jmespath==1.1.0 - # via - # boto3 - # botocore -joblib==1.5.3 - # via pymatgen-core -json2html==1.3.0 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -jsonpointer==3.1.1 - # via jsonschema -jsonschema[format-nongpl]==4.26.0 - # via - # flasgger-tschaume - # jupyter-events - # nbformat -jsonschema-specifications==2025.9.1 - # via jsonschema -jupyter-client==7.4.9 - # via - # ipykernel - # jupyter-server - # nbclient - # notebook -jupyter-core==5.9.1 - # via - # ipykernel - # jupyter-client - # jupyter-server - # nbclient - # nbconvert - # nbformat - # notebook -jupyter-events==0.12.1 - # via jupyter-server -jupyter-server==2.18.2 - # via notebook-shim -jupyter-server-terminals==0.5.4 - # via jupyter-server -jupyterlab-pygments==0.3.0 - # via nbconvert -kiwisolver==1.5.0 - # via matplotlib -lark==1.3.1 - # via rfc3987-syntax -lxml==6.1.0 - # via pymatgen-core -markupsafe==3.0.3 - # via - # jinja2 - # nbconvert - # werkzeug -marshmallow==3.26.2 - # via - # flask-marshmallow - # marshmallow-mongoengine - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -marshmallow-mongoengine==0.31.2 - # via flask-mongorest-mpcontribs -matplotlib==3.10.9 - # via pymatgen-core -matplotlib-inline==0.2.2 - # via - # ipykernel - # ipython -mccabe==0.7.0 - # via flake8 -mimerender-pr36==0.0.2 - # via flask-mongorest-mpcontribs -mistune==3.2.1 - # via - # flasgger-tschaume - # nbconvert -mongoengine==0.29.3 - # via - # atlasq-tschaume - # flask-mongoengine-tschaume - # marshmallow-mongoengine -monty==2026.5.18 - # via pymatgen-core -more-itertools==11.0.2 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -mpcontribs-api[dev] @ file:///home/runner/work/MPContribs/MPContribs/mpcontribs-api - # via mpcontribs-api (pyproject.toml) -mpmath==1.3.0 - # via sympy -narwhals==2.21.2 - # via plotly -nbclassic==1.3.3 - # via notebook -nbclient==0.10.4 - # via nbconvert -nbconvert==7.17.1 - # via - # jupyter-server - # notebook -nbformat==5.10.4 - # via - # jupyter-server - # mpcontribs-api - # mpcontribs-api (pyproject.toml) - # nbclient - # nbconvert - # notebook -nest-asyncio==1.6.0 - # via - # ipykernel - # jupyter-client - # nbclassic - # notebook -networkx==3.6.1 - # via pymatgen-core -notebook==6.5.7 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -notebook-shim==0.2.4 - # via nbclassic -numpy==2.4.5 - # via - # contourpy - # matplotlib - # monty - # mpcontribs-api - # mpcontribs-api (pyproject.toml) - # pandas - # pymatgen-core - # scipy - # spglib -opentelemetry-api==1.41.1 - # via ddtrace -orjson==3.11.9 - # via - # flask-mongorest-mpcontribs - # pymatgen-core -overrides==7.7.0 - # via jupyter-server -packaging==26.2 - # via - # gunicorn - # ipykernel - # jupyter-events - # jupyter-server - # marshmallow - # matplotlib - # nbconvert - # plotly - # pytest -palettable==3.3.3 - # via pymatgen-core -pandas==3.0.3 - # via pymatgen-core -pandocfilters==1.5.1 - # via nbconvert -parso==0.8.7 - # via jedi -pexpect==4.9.0 - # via ipython -pillow==12.2.0 - # via matplotlib -pint==0.25.3 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -platformdirs==4.9.6 - # via - # jupyter-core - # pint -plotly==6.7.0 - # via pymatgen-core -pluggy==1.6.0 - # via pytest -prometheus-client==0.25.0 - # via - # jupyter-server - # notebook -prompt-toolkit==3.0.52 - # via ipython -psutil==7.2.2 - # via - # ipykernel - # ipython -psycopg2-binary==2.9.12 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -ptyprocess==0.7.0 - # via - # pexpect - # terminado -pure-eval==0.2.3 - # via stack-data -pycodestyle==2.14.0 - # via - # flake8 - # pytest-pycodestyle -pycparser==3.0 - # via cffi -pyflakes==3.4.0 - # via flake8 -pygments==2.20.0 - # via - # ipython - # ipython-pygments-lexers - # nbconvert - # pytest -pymatgen==2026.5.4 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -pymatgen-core==2026.5.17 - # via pymatgen -pymongo==4.17.0 - # via - # flask-mongorest-mpcontribs - # mongoengine -pyopenssl==26.2.0 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -pyparsing==3.3.2 - # via - # bibtexparser - # matplotlib -pytest==9.0.3 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) - # pytest-flake8 - # pytest-pycodestyle - # pytest-xdist -pytest-flake8==1.3.0 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -pytest-pycodestyle==2.5.0 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -pytest-xdist==3.8.0 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -python-dateutil==2.9.0.post0 - # via - # arrow - # botocore - # dateparser - # flask-mongorest-mpcontribs - # freezegun - # jupyter-client - # matplotlib - # pandas - # rq-scheduler -python-json-logger==4.1.0 - # via jupyter-events -python-mimeparse==2.0.0 - # via mimerender-pr36 -python-snappy==0.7.3 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -pytz==2026.2 - # via dateparser -pyyaml==6.0.3 - # via - # flasgger-tschaume - # jupyter-events -pyzmq==27.1.0 - # via - # ipykernel - # jupyter-client - # jupyter-server - # notebook -redis==7.4.0 - # via - # flask-rq2 - # flask-sse - # rq -referencing==0.37.0 - # via - # jsonschema - # jsonschema-specifications - # jupyter-events -regex==2026.5.9 - # via dateparser -requests==2.34.2 - # via - # atlasq-tschaume - # pymatgen-core -rfc3339-validator==0.1.4 - # via - # jsonschema - # jupyter-events -rfc3986-validator==0.1.1 - # via - # jsonschema - # jupyter-events -rfc3987-syntax==1.1.0 - # via jsonschema -rpds-py==0.30.0 - # via - # jsonschema - # referencing -rq==2.3.2 - # via - # flask-rq2 - # mpcontribs-api - # mpcontribs-api (pyproject.toml) - # rq-scheduler -rq-scheduler==0.14.0 - # via flask-rq2 -ruamel-yaml==0.19.1 - # via monty -s3transfer==0.17.0 - # via boto3 -scipy==1.17.1 - # via pymatgen-core -send2trash==2.1.0 - # via - # jupyter-server - # notebook -setproctitle==1.3.7 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -six==1.17.0 - # via - # flasgger-tschaume - # flask-sse - # python-dateutil - # rfc3339-validator -soupsieve==2.8.3 - # via beautifulsoup4 -spglib==2.7.0 - # via pymatgen-core -stack-data==0.6.3 - # via ipython -supervisor==4.3.0 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -sympy==1.14.0 - # via pymatgen-core -tabulate==0.10.0 - # via pymatgen-core -terminado==0.18.1 - # via - # jupyter-server - # jupyter-server-terminals - # notebook -tinycss2==1.4.0 - # via bleach -tornado==6.5.5 - # via - # ipykernel - # jupyter-client - # jupyter-server - # notebook - # terminado -tqdm==4.67.3 - # via pymatgen-core -traitlets==5.15.0 - # via - # ipykernel - # ipython - # jupyter-client - # jupyter-core - # jupyter-events - # jupyter-server - # matplotlib-inline - # nbclient - # nbconvert - # nbformat - # notebook -typing-extensions==4.15.0 - # via - # anyio - # beautifulsoup4 - # flexcache - # flexparser - # ipython - # opentelemetry-api - # pint - # pyopenssl - # referencing - # spglib -tzdata==2026.2 - # via arrow -tzlocal==5.3.1 - # via dateparser -uncertainties==3.2.3 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) - # pymatgen-core -uri-template==1.3.0 - # via jsonschema -urllib3==2.7.0 - # via - # botocore - # requests -wcwidth==0.7.0 - # via prompt-toolkit -webcolors==25.10.0 - # via jsonschema -webencodings==0.5.1 - # via - # bleach - # tinycss2 -websocket-client==1.9.0 - # via - # jupyter-server - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -werkzeug==3.1.8 - # via - # flasgger-tschaume - # flask -wrapt==2.1.2 - # via ddtrace -zipp==3.23.1 - # via importlib-metadata -zope-event==6.2 - # via gevent -zope-interface==8.4 - # via gevent -zstandard==0.25.0 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) diff --git a/mpcontribs-api/requirements/ubuntu-latest_py3.12.txt b/mpcontribs-api/requirements/ubuntu-latest_py3.12.txt deleted file mode 100644 index e9a48b2991..0000000000 --- a/mpcontribs-api/requirements/ubuntu-latest_py3.12.txt +++ /dev/null @@ -1,545 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.12 -# by the following command: -# -# pip-compile --output-file=requirements/ubuntu-latest_py3.12.txt -# -anyio==4.13.0 - # via jupyter-server -apispec==5.2.2 - # via mpcontribs-api (pyproject.toml) -argon2-cffi==25.1.0 - # via - # jupyter-server - # notebook -argon2-cffi-bindings==25.1.0 - # via argon2-cffi -arrow==1.4.0 - # via isoduration -asn1crypto==1.5.1 - # via mpcontribs-api (pyproject.toml) -asttokens==3.0.1 - # via stack-data -atlasq-tschaume==0.11.1.dev2 - # via flask-mongorest-mpcontribs -attrs==26.1.0 - # via - # jsonschema - # referencing -backports-zstd==1.5.0 - # via flask-compress -beautifulsoup4==4.14.3 - # via nbconvert -bibtexparser==1.4.4 - # via pymatgen-core -bleach[css]==6.3.0 - # via nbconvert -blinker==1.9.0 - # via mpcontribs-api (pyproject.toml) -boltons==25.0.0 - # via mpcontribs-api (pyproject.toml) -boto3==1.43.9 - # via flask-mongorest-mpcontribs -botocore==1.43.9 - # via - # boto3 - # s3transfer -brotli==1.2.0 - # via flask-compress -bytecode==0.17.0 - # via ddtrace -certifi==2026.4.22 - # via requests -cffi==2.0.0 - # via - # argon2-cffi-bindings - # cryptography -charset-normalizer==3.4.7 - # via requests -click==8.4.0 - # via - # flask - # rq -comm==0.2.3 - # via ipykernel -contourpy==1.3.3 - # via matplotlib -cramjam==2.11.0 - # via python-snappy -crontab==1.0.5 - # via rq-scheduler -cryptography==48.0.0 - # via pyopenssl -css-html-js-minify==2.5.5 - # via mpcontribs-api (pyproject.toml) -cycler==0.12.1 - # via matplotlib -dateparser==1.4.0 - # via mpcontribs-api (pyproject.toml) -ddtrace==4.3.0 - # via mpcontribs-api (pyproject.toml) -debugpy==1.8.20 - # via ipykernel -decorator==5.3.1 - # via ipython -defusedxml==0.7.1 - # via nbconvert -dnspython==2.8.0 - # via - # mpcontribs-api (pyproject.toml) - # pymongo -entrypoints==0.4 - # via jupyter-client -envier==0.6.1 - # via ddtrace -executing==2.2.1 - # via stack-data -fastjsonschema==2.21.2 - # via nbformat -fastnumbers==5.1.1 - # via flask-mongorest-mpcontribs -filetype==1.2.0 - # via mpcontribs-api (pyproject.toml) -flasgger-tschaume==0.9.7 - # via mpcontribs-api (pyproject.toml) -flask==2.2.5 - # via - # flasgger-tschaume - # flask-compress - # flask-marshmallow - # flask-mongoengine-tschaume - # flask-rq2 - # flask-sse -flask-compress==1.24 - # via mpcontribs-api (pyproject.toml) -flask-marshmallow==1.4.0 - # via mpcontribs-api (pyproject.toml) -flask-mongoengine-tschaume==1.1.0 - # via flask-mongorest-mpcontribs -flask-mongorest-mpcontribs==3.3.0 - # via mpcontribs-api (pyproject.toml) -flask-rq2==18.3 - # via mpcontribs-api (pyproject.toml) -flask-sse==1.0.0 - # via flask-mongorest-mpcontribs -flatten-dict==0.5.0 - # via flask-mongorest-mpcontribs -flexcache==0.3 - # via pint -flexparser==0.4 - # via pint -fonttools==4.63.0 - # via matplotlib -fqdn==1.5.1 - # via jsonschema -freezegun==1.5.5 - # via rq-scheduler -gevent==26.4.0 - # via gunicorn -greenlet==3.5.0 - # via gevent -gunicorn[gevent]==24.1.1 - # via mpcontribs-api (pyproject.toml) -idna==3.15 - # via - # anyio - # jsonschema - # requests -importlib-metadata==8.7.1 - # via opentelemetry-api -ipykernel==6.29.5 - # via - # nbclassic - # notebook -ipython==9.13.0 - # via ipykernel -ipython-genutils==0.2.0 - # via - # nbclassic - # notebook -ipython-pygments-lexers==1.1.1 - # via ipython -isoduration==20.11.0 - # via jsonschema -itsdangerous==2.2.0 - # via flask -jedi==0.20.0 - # via ipython -jinja2==3.1.6 - # via - # flask - # jupyter-server - # mpcontribs-api (pyproject.toml) - # nbconvert - # notebook -jmespath==1.1.0 - # via - # boto3 - # botocore -joblib==1.5.3 - # via pymatgen-core -json2html==1.3.0 - # via mpcontribs-api (pyproject.toml) -jsonpointer==3.1.1 - # via jsonschema -jsonschema[format-nongpl]==4.26.0 - # via - # flasgger-tschaume - # jupyter-events - # nbformat -jsonschema-specifications==2025.9.1 - # via jsonschema -jupyter-client==7.4.9 - # via - # ipykernel - # jupyter-server - # nbclient - # notebook -jupyter-core==5.9.1 - # via - # ipykernel - # jupyter-client - # jupyter-server - # nbclient - # nbconvert - # nbformat - # notebook -jupyter-events==0.12.1 - # via jupyter-server -jupyter-server==2.18.2 - # via notebook-shim -jupyter-server-terminals==0.5.4 - # via jupyter-server -jupyterlab-pygments==0.3.0 - # via nbconvert -kiwisolver==1.5.0 - # via matplotlib -lark==1.3.1 - # via rfc3987-syntax -lxml==6.1.0 - # via pymatgen-core -markupsafe==3.0.3 - # via - # jinja2 - # nbconvert - # werkzeug -marshmallow==3.26.2 - # via - # flask-marshmallow - # marshmallow-mongoengine - # mpcontribs-api (pyproject.toml) -marshmallow-mongoengine==0.31.2 - # via flask-mongorest-mpcontribs -matplotlib==3.10.9 - # via pymatgen-core -matplotlib-inline==0.2.2 - # via - # ipykernel - # ipython -mimerender-pr36==0.0.2 - # via flask-mongorest-mpcontribs -mistune==3.2.1 - # via - # flasgger-tschaume - # nbconvert -mongoengine==0.29.3 - # via - # atlasq-tschaume - # flask-mongoengine-tschaume - # marshmallow-mongoengine -monty==2026.5.18 - # via pymatgen-core -more-itertools==11.0.2 - # via mpcontribs-api (pyproject.toml) -mpmath==1.3.0 - # via sympy -narwhals==2.21.2 - # via plotly -nbclassic==1.3.3 - # via notebook -nbclient==0.10.4 - # via nbconvert -nbconvert==7.17.1 - # via - # jupyter-server - # notebook -nbformat==5.10.4 - # via - # jupyter-server - # mpcontribs-api (pyproject.toml) - # nbclient - # nbconvert - # notebook -nest-asyncio==1.6.0 - # via - # ipykernel - # jupyter-client - # nbclassic - # notebook -networkx==3.6.1 - # via pymatgen-core -notebook==6.5.7 - # via mpcontribs-api (pyproject.toml) -notebook-shim==0.2.4 - # via nbclassic -numpy==2.4.5 - # via - # contourpy - # matplotlib - # monty - # mpcontribs-api (pyproject.toml) - # pandas - # pymatgen-core - # scipy - # spglib -opentelemetry-api==1.41.1 - # via ddtrace -orjson==3.11.9 - # via - # flask-mongorest-mpcontribs - # pymatgen-core -packaging==26.2 - # via - # gunicorn - # ipykernel - # jupyter-events - # jupyter-server - # marshmallow - # matplotlib - # nbconvert - # plotly -palettable==3.3.3 - # via pymatgen-core -pandas==3.0.3 - # via pymatgen-core -pandocfilters==1.5.1 - # via nbconvert -parso==0.8.7 - # via jedi -pexpect==4.9.0 - # via ipython -pillow==12.2.0 - # via matplotlib -pint==0.25.3 - # via mpcontribs-api (pyproject.toml) -platformdirs==4.9.6 - # via - # jupyter-core - # pint -plotly==6.7.0 - # via pymatgen-core -prometheus-client==0.25.0 - # via - # jupyter-server - # notebook -prompt-toolkit==3.0.52 - # via ipython -psutil==7.2.2 - # via - # ipykernel - # ipython -psycopg2-binary==2.9.12 - # via mpcontribs-api (pyproject.toml) -ptyprocess==0.7.0 - # via - # pexpect - # terminado -pure-eval==0.2.3 - # via stack-data -pycparser==3.0 - # via cffi -pygments==2.20.0 - # via - # ipython - # ipython-pygments-lexers - # nbconvert -pymatgen==2026.5.4 - # via mpcontribs-api (pyproject.toml) -pymatgen-core==2026.5.17 - # via pymatgen -pymongo==4.17.0 - # via - # flask-mongorest-mpcontribs - # mongoengine -pyopenssl==26.2.0 - # via mpcontribs-api (pyproject.toml) -pyparsing==3.3.2 - # via - # bibtexparser - # matplotlib -python-dateutil==2.9.0.post0 - # via - # arrow - # botocore - # dateparser - # flask-mongorest-mpcontribs - # freezegun - # jupyter-client - # matplotlib - # pandas - # rq-scheduler -python-json-logger==4.1.0 - # via jupyter-events -python-mimeparse==2.0.0 - # via mimerender-pr36 -python-snappy==0.7.3 - # via mpcontribs-api (pyproject.toml) -pytz==2026.2 - # via dateparser -pyyaml==6.0.3 - # via - # flasgger-tschaume - # jupyter-events -pyzmq==27.1.0 - # via - # ipykernel - # jupyter-client - # jupyter-server - # notebook -redis==7.4.0 - # via - # flask-rq2 - # flask-sse - # rq -referencing==0.37.0 - # via - # jsonschema - # jsonschema-specifications - # jupyter-events -regex==2026.5.9 - # via dateparser -requests==2.34.2 - # via - # atlasq-tschaume - # pymatgen-core -rfc3339-validator==0.1.4 - # via - # jsonschema - # jupyter-events -rfc3986-validator==0.1.1 - # via - # jsonschema - # jupyter-events -rfc3987-syntax==1.1.0 - # via jsonschema -rpds-py==0.30.0 - # via - # jsonschema - # referencing -rq==2.3.2 - # via - # flask-rq2 - # mpcontribs-api (pyproject.toml) - # rq-scheduler -rq-scheduler==0.14.0 - # via flask-rq2 -ruamel-yaml==0.19.1 - # via monty -s3transfer==0.17.0 - # via boto3 -scipy==1.17.1 - # via pymatgen-core -send2trash==2.1.0 - # via - # jupyter-server - # notebook -setproctitle==1.3.7 - # via mpcontribs-api (pyproject.toml) -six==1.17.0 - # via - # flasgger-tschaume - # flask-sse - # python-dateutil - # rfc3339-validator -soupsieve==2.8.3 - # via beautifulsoup4 -spglib==2.7.0 - # via pymatgen-core -stack-data==0.6.3 - # via ipython -supervisor==4.3.0 - # via mpcontribs-api (pyproject.toml) -sympy==1.14.0 - # via pymatgen-core -tabulate==0.10.0 - # via pymatgen-core -terminado==0.18.1 - # via - # jupyter-server - # jupyter-server-terminals - # notebook -tinycss2==1.4.0 - # via bleach -tornado==6.5.5 - # via - # ipykernel - # jupyter-client - # jupyter-server - # notebook - # terminado -tqdm==4.67.3 - # via pymatgen-core -traitlets==5.15.0 - # via - # ipykernel - # ipython - # jupyter-client - # jupyter-core - # jupyter-events - # jupyter-server - # matplotlib-inline - # nbclient - # nbconvert - # nbformat - # notebook -typing-extensions==4.15.0 - # via - # anyio - # beautifulsoup4 - # flexcache - # flexparser - # opentelemetry-api - # pint - # pyopenssl - # referencing - # spglib -tzdata==2026.2 - # via arrow -tzlocal==5.3.1 - # via dateparser -uncertainties==3.2.3 - # via - # mpcontribs-api (pyproject.toml) - # pymatgen-core -uri-template==1.3.0 - # via jsonschema -urllib3==2.7.0 - # via - # botocore - # requests -wcwidth==0.7.0 - # via prompt-toolkit -webcolors==25.10.0 - # via jsonschema -webencodings==0.5.1 - # via - # bleach - # tinycss2 -websocket-client==1.9.0 - # via - # jupyter-server - # mpcontribs-api (pyproject.toml) -werkzeug==3.1.8 - # via - # flasgger-tschaume - # flask -wrapt==2.1.2 - # via ddtrace -zipp==3.23.1 - # via importlib-metadata -zope-event==6.2 - # via gevent -zope-interface==8.4 - # via gevent -zstandard==0.25.0 - # via mpcontribs-api (pyproject.toml) diff --git a/mpcontribs-api/requirements/ubuntu-latest_py3.12_extras.txt b/mpcontribs-api/requirements/ubuntu-latest_py3.12_extras.txt deleted file mode 100644 index cd894fd1d1..0000000000 --- a/mpcontribs-api/requirements/ubuntu-latest_py3.12_extras.txt +++ /dev/null @@ -1,645 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.12 -# by the following command: -# -# pip-compile --all-extras --output-file=requirements/ubuntu-latest_py3.12_extras.txt -# -anyio==4.13.0 - # via jupyter-server -apispec==5.2.2 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -argon2-cffi==25.1.0 - # via - # jupyter-server - # notebook -argon2-cffi-bindings==25.1.0 - # via argon2-cffi -arrow==1.4.0 - # via isoduration -asn1crypto==1.5.1 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -asttokens==3.0.1 - # via stack-data -atlasq-tschaume==0.11.1.dev2 - # via flask-mongorest-mpcontribs -attrs==26.1.0 - # via - # jsonschema - # referencing -backports-zstd==1.5.0 - # via flask-compress -beautifulsoup4==4.14.3 - # via nbconvert -bibtexparser==1.4.4 - # via pymatgen-core -bleach[css]==6.3.0 - # via nbconvert -blinker==1.9.0 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -boltons==25.0.0 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -boto3==1.43.9 - # via flask-mongorest-mpcontribs -botocore==1.43.9 - # via - # boto3 - # s3transfer -brotli==1.2.0 - # via flask-compress -bytecode==0.17.0 - # via ddtrace -certifi==2026.4.22 - # via requests -cffi==2.0.0 - # via - # argon2-cffi-bindings - # cryptography -charset-normalizer==3.4.7 - # via requests -click==8.4.0 - # via - # flask - # rq -comm==0.2.3 - # via ipykernel -contourpy==1.3.3 - # via matplotlib -cramjam==2.11.0 - # via python-snappy -crontab==1.0.5 - # via rq-scheduler -cryptography==48.0.0 - # via pyopenssl -css-html-js-minify==2.5.5 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -cycler==0.12.1 - # via matplotlib -dateparser==1.4.0 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -ddtrace==4.3.0 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -debugpy==1.8.20 - # via ipykernel -decorator==5.3.1 - # via ipython -defusedxml==0.7.1 - # via nbconvert -dnspython==2.8.0 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) - # pymongo -entrypoints==0.4 - # via jupyter-client -envier==0.6.1 - # via ddtrace -execnet==2.1.2 - # via pytest-xdist -executing==2.2.1 - # via stack-data -fastjsonschema==2.21.2 - # via nbformat -fastnumbers==5.1.1 - # via flask-mongorest-mpcontribs -filetype==1.2.0 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -flake8==7.3.0 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) - # pytest-flake8 -flasgger-tschaume==0.9.7 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -flask==2.2.5 - # via - # flasgger-tschaume - # flask-compress - # flask-marshmallow - # flask-mongoengine-tschaume - # flask-rq2 - # flask-sse -flask-compress==1.24 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -flask-marshmallow==1.4.0 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -flask-mongoengine-tschaume==1.1.0 - # via flask-mongorest-mpcontribs -flask-mongorest-mpcontribs==3.3.0 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -flask-rq2==18.3 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -flask-sse==1.0.0 - # via flask-mongorest-mpcontribs -flatten-dict==0.5.0 - # via flask-mongorest-mpcontribs -flexcache==0.3 - # via pint -flexparser==0.4 - # via pint -fonttools==4.63.0 - # via matplotlib -fqdn==1.5.1 - # via jsonschema -freezegun==1.5.5 - # via rq-scheduler -gevent==26.4.0 - # via gunicorn -greenlet==3.5.0 - # via gevent -gunicorn[gevent]==24.1.1 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -idna==3.15 - # via - # anyio - # jsonschema - # requests -importlib-metadata==8.7.1 - # via opentelemetry-api -iniconfig==2.3.0 - # via pytest -ipykernel==6.29.5 - # via - # nbclassic - # notebook -ipython==9.13.0 - # via ipykernel -ipython-genutils==0.2.0 - # via - # nbclassic - # notebook -ipython-pygments-lexers==1.1.1 - # via ipython -isoduration==20.11.0 - # via jsonschema -itsdangerous==2.2.0 - # via flask -jedi==0.20.0 - # via ipython -jinja2==3.1.6 - # via - # flask - # jupyter-server - # mpcontribs-api - # mpcontribs-api (pyproject.toml) - # nbconvert - # notebook -jmespath==1.1.0 - # via - # boto3 - # botocore -joblib==1.5.3 - # via pymatgen-core -json2html==1.3.0 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -jsonpointer==3.1.1 - # via jsonschema -jsonschema[format-nongpl]==4.26.0 - # via - # flasgger-tschaume - # jupyter-events - # nbformat -jsonschema-specifications==2025.9.1 - # via jsonschema -jupyter-client==7.4.9 - # via - # ipykernel - # jupyter-server - # nbclient - # notebook -jupyter-core==5.9.1 - # via - # ipykernel - # jupyter-client - # jupyter-server - # nbclient - # nbconvert - # nbformat - # notebook -jupyter-events==0.12.1 - # via jupyter-server -jupyter-server==2.18.2 - # via notebook-shim -jupyter-server-terminals==0.5.4 - # via jupyter-server -jupyterlab-pygments==0.3.0 - # via nbconvert -kiwisolver==1.5.0 - # via matplotlib -lark==1.3.1 - # via rfc3987-syntax -lxml==6.1.0 - # via pymatgen-core -markupsafe==3.0.3 - # via - # jinja2 - # nbconvert - # werkzeug -marshmallow==3.26.2 - # via - # flask-marshmallow - # marshmallow-mongoengine - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -marshmallow-mongoengine==0.31.2 - # via flask-mongorest-mpcontribs -matplotlib==3.10.9 - # via pymatgen-core -matplotlib-inline==0.2.2 - # via - # ipykernel - # ipython -mccabe==0.7.0 - # via flake8 -mimerender-pr36==0.0.2 - # via flask-mongorest-mpcontribs -mistune==3.2.1 - # via - # flasgger-tschaume - # nbconvert -mongoengine==0.29.3 - # via - # atlasq-tschaume - # flask-mongoengine-tschaume - # marshmallow-mongoengine -monty==2026.5.18 - # via pymatgen-core -more-itertools==11.0.2 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -mpcontribs-api[dev] @ file:///home/runner/work/MPContribs/MPContribs/mpcontribs-api - # via mpcontribs-api (pyproject.toml) -mpmath==1.3.0 - # via sympy -narwhals==2.21.2 - # via plotly -nbclassic==1.3.3 - # via notebook -nbclient==0.10.4 - # via nbconvert -nbconvert==7.17.1 - # via - # jupyter-server - # notebook -nbformat==5.10.4 - # via - # jupyter-server - # mpcontribs-api - # mpcontribs-api (pyproject.toml) - # nbclient - # nbconvert - # notebook -nest-asyncio==1.6.0 - # via - # ipykernel - # jupyter-client - # nbclassic - # notebook -networkx==3.6.1 - # via pymatgen-core -notebook==6.5.7 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -notebook-shim==0.2.4 - # via nbclassic -numpy==2.4.5 - # via - # contourpy - # matplotlib - # monty - # mpcontribs-api - # mpcontribs-api (pyproject.toml) - # pandas - # pymatgen-core - # scipy - # spglib -opentelemetry-api==1.41.1 - # via ddtrace -orjson==3.11.9 - # via - # flask-mongorest-mpcontribs - # pymatgen-core -packaging==26.2 - # via - # gunicorn - # ipykernel - # jupyter-events - # jupyter-server - # marshmallow - # matplotlib - # nbconvert - # plotly - # pytest -palettable==3.3.3 - # via pymatgen-core -pandas==3.0.3 - # via pymatgen-core -pandocfilters==1.5.1 - # via nbconvert -parso==0.8.7 - # via jedi -pexpect==4.9.0 - # via ipython -pillow==12.2.0 - # via matplotlib -pint==0.25.3 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -platformdirs==4.9.6 - # via - # jupyter-core - # pint -plotly==6.7.0 - # via pymatgen-core -pluggy==1.6.0 - # via pytest -prometheus-client==0.25.0 - # via - # jupyter-server - # notebook -prompt-toolkit==3.0.52 - # via ipython -psutil==7.2.2 - # via - # ipykernel - # ipython -psycopg2-binary==2.9.12 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -ptyprocess==0.7.0 - # via - # pexpect - # terminado -pure-eval==0.2.3 - # via stack-data -pycodestyle==2.14.0 - # via - # flake8 - # pytest-pycodestyle -pycparser==3.0 - # via cffi -pyflakes==3.4.0 - # via flake8 -pygments==2.20.0 - # via - # ipython - # ipython-pygments-lexers - # nbconvert - # pytest -pymatgen==2026.5.4 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -pymatgen-core==2026.5.17 - # via pymatgen -pymongo==4.17.0 - # via - # flask-mongorest-mpcontribs - # mongoengine -pyopenssl==26.2.0 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -pyparsing==3.3.2 - # via - # bibtexparser - # matplotlib -pytest==9.0.3 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) - # pytest-flake8 - # pytest-pycodestyle - # pytest-xdist -pytest-flake8==1.3.0 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -pytest-pycodestyle==2.5.0 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -pytest-xdist==3.8.0 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -python-dateutil==2.9.0.post0 - # via - # arrow - # botocore - # dateparser - # flask-mongorest-mpcontribs - # freezegun - # jupyter-client - # matplotlib - # pandas - # rq-scheduler -python-json-logger==4.1.0 - # via jupyter-events -python-mimeparse==2.0.0 - # via mimerender-pr36 -python-snappy==0.7.3 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -pytz==2026.2 - # via dateparser -pyyaml==6.0.3 - # via - # flasgger-tschaume - # jupyter-events -pyzmq==27.1.0 - # via - # ipykernel - # jupyter-client - # jupyter-server - # notebook -redis==7.4.0 - # via - # flask-rq2 - # flask-sse - # rq -referencing==0.37.0 - # via - # jsonschema - # jsonschema-specifications - # jupyter-events -regex==2026.5.9 - # via dateparser -requests==2.34.2 - # via - # atlasq-tschaume - # pymatgen-core -rfc3339-validator==0.1.4 - # via - # jsonschema - # jupyter-events -rfc3986-validator==0.1.1 - # via - # jsonschema - # jupyter-events -rfc3987-syntax==1.1.0 - # via jsonschema -rpds-py==0.30.0 - # via - # jsonschema - # referencing -rq==2.3.2 - # via - # flask-rq2 - # mpcontribs-api - # mpcontribs-api (pyproject.toml) - # rq-scheduler -rq-scheduler==0.14.0 - # via flask-rq2 -ruamel-yaml==0.19.1 - # via monty -s3transfer==0.17.0 - # via boto3 -scipy==1.17.1 - # via pymatgen-core -send2trash==2.1.0 - # via - # jupyter-server - # notebook -setproctitle==1.3.7 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -six==1.17.0 - # via - # flasgger-tschaume - # flask-sse - # python-dateutil - # rfc3339-validator -soupsieve==2.8.3 - # via beautifulsoup4 -spglib==2.7.0 - # via pymatgen-core -stack-data==0.6.3 - # via ipython -supervisor==4.3.0 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -sympy==1.14.0 - # via pymatgen-core -tabulate==0.10.0 - # via pymatgen-core -terminado==0.18.1 - # via - # jupyter-server - # jupyter-server-terminals - # notebook -tinycss2==1.4.0 - # via bleach -tornado==6.5.5 - # via - # ipykernel - # jupyter-client - # jupyter-server - # notebook - # terminado -tqdm==4.67.3 - # via pymatgen-core -traitlets==5.15.0 - # via - # ipykernel - # ipython - # jupyter-client - # jupyter-core - # jupyter-events - # jupyter-server - # matplotlib-inline - # nbclient - # nbconvert - # nbformat - # notebook -typing-extensions==4.15.0 - # via - # anyio - # beautifulsoup4 - # flexcache - # flexparser - # opentelemetry-api - # pint - # pyopenssl - # referencing - # spglib -tzdata==2026.2 - # via arrow -tzlocal==5.3.1 - # via dateparser -uncertainties==3.2.3 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) - # pymatgen-core -uri-template==1.3.0 - # via jsonschema -urllib3==2.7.0 - # via - # botocore - # requests -wcwidth==0.7.0 - # via prompt-toolkit -webcolors==25.10.0 - # via jsonschema -webencodings==0.5.1 - # via - # bleach - # tinycss2 -websocket-client==1.9.0 - # via - # jupyter-server - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -werkzeug==3.1.8 - # via - # flasgger-tschaume - # flask -wrapt==2.1.2 - # via ddtrace -zipp==3.23.1 - # via importlib-metadata -zope-event==6.2 - # via gevent -zope-interface==8.4 - # via gevent -zstandard==0.25.0 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) diff --git a/mpcontribs-api/scripts/start.sh b/mpcontribs-api/scripts/start.sh index dc4022f9b5..59eefed59c 100755 --- a/mpcontribs-api/scripts/start.sh +++ b/mpcontribs-api/scripts/start.sh @@ -8,15 +8,10 @@ sleep $zzz PMGRC=$HOME/.pmgrc.yaml [[ ! -e "$PMGRC" ]] && echo "PMG_DUMMY_VAR: dummy" >"$PMGRC" -STATS_ARG="" -SERVER_APP="mpcontribs.api:create_app()" -WAIT_FOR="wait-for-it.sh $JUPYTER_GATEWAY_HOST -q -t 50" - set -x if [[ -n "$DD_TRACE_HOST" ]]; then - wait-for-it.sh "$DD_TRACE_HOST" -q -s -t 10 && STATS_ARG="--statsd-host $DD_AGENT_HOST:8125" || echo "WARNING: datadog agent unreachable" + wait-for-it.sh "$DD_TRACE_HOST" -q -s -t 10 || echo "WARNING: datadog agent unreachable" fi -[[ -n "$STATS_ARG" ]] && CMD="ddtrace-run gunicorn $STATS_ARG" || CMD="gunicorn" -exec $WAIT_FOR -- $CMD $SERVER_APP +exec uvicorn mpcontribs_api.app:app --host 0.0.0.0 --port "$API_PORT" diff --git a/mpcontribs-api/scripts/start_rq.sh b/mpcontribs-api/scripts/start_rq.sh deleted file mode 100755 index 812ef8be4d..0000000000 --- a/mpcontribs-api/scripts/start_rq.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash - -set -e -zzz=$((DEPLOYMENT * 60)) -echo "$SUPERVISOR_PROCESS_NAME: waiting for $zzz seconds before start..." -sleep $zzz - -CMD="flask rq $1" -set -x - -if [[ -n "$DD_TRACE_HOST" ]]; then - wait-for-it.sh "$DD_TRACE_HOST" -q -s -t 10 && CMD="ddtrace-run $CMD" || echo "WARNING: datadog agent unreachable" -fi - -exec wait-for-it.sh "$JUPYTER_GATEWAY_HOST" -q -s -t 50 -- \ - wait-for-it.sh "$MPCONTRIBS_API_HOST" -q -s -t 15 -- $CMD From c7d7bcf6e5dd81f1321f051966424856ab41897b Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 4 Jun 2026 15:07:46 -0700 Subject: [PATCH 064/591] Added healthcheck endpoint --- mpcontribs-api/src/mpcontribs_api/app.py | 7 +++--- .../domains/healthcheck/router.py | 23 +++++++++++++++++++ 2 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/healthcheck/router.py diff --git a/mpcontribs-api/src/mpcontribs_api/app.py b/mpcontribs-api/src/mpcontribs_api/app.py index dcdf7af0de..afc2b8aa9b 100644 --- a/mpcontribs-api/src/mpcontribs_api/app.py +++ b/mpcontribs-api/src/mpcontribs_api/app.py @@ -12,6 +12,7 @@ from mpcontribs_api.config import Settings, get_settings from mpcontribs_api.dependencies import verify_gateway from mpcontribs_api.domains.contributions.models import Contribution +from mpcontribs_api.domains.healthcheck.router import router as healthcheck_router from mpcontribs_api.domains.projects.models import Project from mpcontribs_api.exceptions import register_exception_handlers from mpcontribs_api.logging import configure_logging, get_logger @@ -31,7 +32,7 @@ async def lifespan(app: FastAPI) -> AsyncGenerator[None]: serverSelectionTimeoutMS=settings.mongo.server_selection_timeout_ms, uuidRepresentation="standard", ) - # Fail fast if the DB is unreachable. Cheap, one round-trip. + # Fail fast if the DB is unreachable await client.admin.command("ping") logger.info("connected to mongo", extra={"db": settings.mongo.db_name}) @@ -60,7 +61,6 @@ def create_app(settings: Settings | None = None) -> FastAPI: version=settings.version, debug=settings.environment != "prod", lifespan=_build_lifespan(settings), - dependencies=[Depends(verify_gateway)], terms_of_service="https://materialsproject.org/terms", license_info=license_info, contact=contact_info, @@ -70,7 +70,8 @@ def create_app(settings: Settings | None = None) -> FastAPI: app.add_middleware(RequestContextMiddleware) register_exception_handlers(app) - app.include_router(v1_router, prefix="/api/v1") + app.include_router(healthcheck_router, prefix="/health") + app.include_router(v1_router, prefix="/api/v1", dependencies=[Depends(verify_gateway)]) return app diff --git a/mpcontribs-api/src/mpcontribs_api/domains/healthcheck/router.py b/mpcontribs-api/src/mpcontribs_api/domains/healthcheck/router.py new file mode 100644 index 0000000000..ef751c4d84 --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/domains/healthcheck/router.py @@ -0,0 +1,23 @@ +from fastapi import APIRouter, HTTPException, status +from pydantic import BaseModel + +from mpcontribs_api.dependencies import DbDep + +router = APIRouter(tags=["health"]) + + +class HealthStatus(BaseModel): + status: str + mongo: str + + +@router.get("", response_model=HealthStatus, summary="Service health") +async def healthcheck(db: DbDep) -> HealthStatus: + try: + await db.client.admin.command("ping") + except Exception: + raise HTTPException( + status_code=status.HTTP_503_SERVICE_UNAVAILABLE, + detail={"status": "unhealthy", "mongo": "unreachable"}, + ) from None + return HealthStatus(status="healthy", mongo="ok") From 5991392b170fac3a61505cf13dfce42ecba33412 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Fri, 5 Jun 2026 11:42:39 -0700 Subject: [PATCH 065/591] Forward username and is_admin values for logging --- .../src/mpcontribs_api/dependencies.py | 6 +++- mpcontribs-api/src/mpcontribs_api/types.py | 35 +++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/mpcontribs-api/src/mpcontribs_api/dependencies.py b/mpcontribs-api/src/mpcontribs_api/dependencies.py index 9ee67828fd..b34fe1567c 100644 --- a/mpcontribs-api/src/mpcontribs_api/dependencies.py +++ b/mpcontribs-api/src/mpcontribs_api/dependencies.py @@ -49,7 +49,11 @@ def get_user(request: Request) -> User: username=username, groups=frozenset(groups), ) - structlog.contextvars.bind_contextvars(consumer_id=user.consumer_id or "anonymous") + structlog.contextvars.bind_contextvars( + username=user.username, + consumer_id=user.consumer_id, + is_admin=user.is_admin, + ) return user diff --git a/mpcontribs-api/src/mpcontribs_api/types.py b/mpcontribs-api/src/mpcontribs_api/types.py index 8285acb265..0507663843 100644 --- a/mpcontribs-api/src/mpcontribs_api/types.py +++ b/mpcontribs-api/src/mpcontribs_api/types.py @@ -21,3 +21,38 @@ def _validate_prefixed_email(v: str) -> str: PrefixedEmail = Annotated[str, BeforeValidator(_validate_prefixed_email)] + + +def _file_name_like_str(v: str) -> str: + v = v.strip() + parts = v.split(".") + if len(parts) > 1 and parts[-1]: + return v + raise ValidationError(f"attachment name '{v}' not valid. Must end with file extension (e.g. '.gz')") + + +FileLike = Annotated[str, BeforeValidator(_file_name_like_str)] + + +_MD5 = re.compile(r"^[a-f0-9]{32}$") + + +def _md5_like(v: str) -> str: + v = v.strip().lower() + if not _MD5.match(v): + raise ValidationError("must be a 32-character MD5 hex digest") + return v + + +MD5Hash = Annotated[str, BeforeValidator(_md5_like)] + + +def _mime_like(v: str) -> str: + v = v.strip().lower() + parts = v.split("/") + if len(parts) == 2 and parts[0] == "application" and parts[1].strip(): + return v + raise ValidationError(f"improper mime value {v} - must be formatted as 'application/*file_ext*'") + + +MimeFormat = Annotated[str, BeforeValidator(_mime_like)] From eac368f163a1692dd7d51b37156e5f1b0ceda69a Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Fri, 5 Jun 2026 12:22:27 -0700 Subject: [PATCH 066/591] Convert ids coming into Contributions to PydanticObjectIds --- .../domains/_shared/repository.py | 17 ++++++++++++----- .../domains/contributions/repository.py | 8 ++++---- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py index 8595c65341..82d645aad6 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py @@ -1,14 +1,15 @@ from abc import ABC, abstractmethod from typing import Any -from beanie import UpdateResponse +from beanie import PydanticObjectId, UpdateResponse from beanie.operators import Set +from bson.errors import InvalidId from fastapi_filter.contrib.beanie import Filter from pydantic import BaseModel from mpcontribs_api.auth import User from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut -from mpcontribs_api.exceptions import ConflictError, NotFoundError +from mpcontribs_api.exceptions import ConflictError, NotFoundError, ValidationError from mpcontribs_api.pagination import CursorParams, Page, decode_cursor, encode_cursor @@ -52,6 +53,12 @@ def _build_scope(user: User) -> dict[str, Any]: """Provides scope based on current user's permitted groups and publicly released data.""" ... + def _convert_object_id(self, id: str) -> PydanticObjectId: + try: + return PydanticObjectId(id) + except InvalidId: + raise ValidationError(f"Incorrect Id format: {id}. Must be MongoDB ObjectId format.") from None + def _not_found(self, id: str) -> str: """Build a not-found message naming this repository's resource.""" return f"{self.document_model.__name__} with id {id} not found" @@ -79,7 +86,7 @@ async def get_many( next_cursor = encode_cursor(str(items[-1].id)) if has_more and items else None return Page(items=items, next_cursor=next_cursor) - async def get_by_id(self, id: str, fields: frozenset[str] | None): + async def get_by_id(self, id: Any, fields: frozenset[str] | None): """Return a single scoped document by id, projected to the requested fields. Args: @@ -105,7 +112,7 @@ async def insert_one(self, in_resource: TIn) -> TDoc: await document.insert() return document - async def delete_by_id(self, id: str) -> None: + async def delete_by_id(self, id: Any) -> None: """Delete a single scoped document by id. Scoping ensures callers cannot delete documents they are not permitted to see. @@ -115,7 +122,7 @@ async def delete_by_id(self, id: str) -> None: """ await self.document_model.find_one(self._scope, self.document_model.id == id).delete() - async def patch(self, id: str, update: TPatch) -> TDoc: + async def patch(self, id: Any, update: TPatch) -> TDoc: """Partially update a single scoped document by id. Only fields explicitly set on ``update`` are applied. An empty patch is a no-op that still diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py index 75527899d4..48072b81fc 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py @@ -52,15 +52,15 @@ async def get_contributions( async def get_contribution_by_id(self, id: str, fields: frozenset[str] | None): """Find a single contribution by id, scoped to the current user. See ``get_by_id``.""" - return await self.get_by_id(id, fields) + return await self.get_by_id(self._convert_object_id(id), fields) async def patch_contribution_by_id(self, id: str, update: ContributionPatch): """Partially update a contribution by id, scoped to the current user. See ``patch``.""" - return await self.patch(id, update) + return await self.patch(self._convert_object_id(id), update) async def delete_contribution_by_id(self, id: str) -> None: """Delete a contribution by id, scoped to the current user. See ``delete_by_id``.""" - await self.delete_by_id(id) + await self.delete_by_id(self._convert_object_id(id)) async def delete_contributions(self, filter: ContributionFilter): """Bulk deletion of Contributions described by the filter @@ -130,7 +130,7 @@ async def upsert_contribution_by_id(self, id: str, contribution: ContributionIn) doc = self.document_model.from_input_model(contribution) return self.document_model.find_one( self._scope, - self.document_model.id == id, + self.document_model.id == self._convert_object_id(id), ).upsert( Set(doc.model_dump(exclude={"id"}, exclude_none=True)), on_insert=doc, From d77cf4bbedb13a5113043c18b734dc108c4c7070 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Fri, 5 Jun 2026 12:27:29 -0700 Subject: [PATCH 067/591] Fleshed out Contribution component models --- .../domains/attachments/models.py | 36 ++++- .../domains/structures/models.py | 90 +++++++++++- .../mpcontribs_api/domains/tables/models.py | 131 +++++++++++++++++- 3 files changed, 246 insertions(+), 11 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py b/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py index 91f5081983..13544412b5 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py @@ -1,10 +1,38 @@ -from beanie import Document +from beanie import PydanticObjectId from fastapi_filter.contrib.beanie import Filter +from mpcontribs_api.domains._shared.models import BaseDocumentWithInput +from mpcontribs_api.types import FileLike, MD5Hash, MimeFormat -class Attachment(Document): - pass + +class Attachment(BaseDocumentWithInput[PydanticObjectId]): + name: FileLike + md5: MD5Hash + mime: MimeFormat + content: int + + class Settings: + name = "attachments" class AttachmentFilter(Filter): - pass + id: PydanticObjectId | None = None + id__in: list[PydanticObjectId] | None = None + id__neq: PydanticObjectId | None = None + + md5: MD5Hash | None = None + md5__in: list[MD5Hash] | None = None + md5__neq: MD5Hash | None = None + + name: str | None = None + name__in: list[str] | None = None + name__neq: str | None = None + name__ilike: str | None = None + + mime: MimeFormat | None = None + mime__in: list[MimeFormat] | None = None + mime__neq: MimeFormat | None = None + mime__ilike: MimeFormat | None = None + + class Constants(Filter.Constants): + model = Attachment diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py index e31eff9eaf..6d83c72108 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py @@ -1,10 +1,94 @@ -from beanie import Document +import polars as pl +from beanie import PydanticObjectId from fastapi_filter.contrib.beanie import Filter +from pydantic import BaseModel, ConfigDict, field_serializer, field_validator +from pymatgen.core import Element +from mpcontribs_api.domains._shared.models import BaseDocumentWithInput +from mpcontribs_api.types import MD5Hash -class Structure(Document): + +class SiteProperties(BaseModel): + magmom: float + + +class Species(BaseModel): + element: Element + occu: int + + +class Lattice(BaseModel): + model_config = ConfigDict(arbitrary_types_allowed=True) + matrix: pl.DataFrame + pbc: list[bool] + a: float + b: float + c: float + alpha: float + beta: float + gamma: float + volume: float + + @field_validator("matrix", mode="before") + @classmethod + def coerce_matrix(cls, v: object) -> pl.DataFrame: + if isinstance(v, pl.DataFrame): + return v + if isinstance(v, dict): + return pl.DataFrame(v) + # MongoDB returns rows as a list of lists + if isinstance(v, list): + return pl.DataFrame(v) + raise ValueError(f"cannot coerce {type(v)} to pl.DataFrame") + + @field_serializer("matrix") + def serialize_matrix(self, matrix: pl.DataFrame) -> dict: + return matrix.to_dict(as_series=False) + + +class Site(BaseModel): + species: list[Species] + abc: list[float] + properties: SiteProperties + label: str + xyz: list[float] + + +# Some things in Emmet-core that could assist in translating the pymatgen string to BaseModel +# In Mongo it is a single long string, but we could try to parse it into something typed +# It looks like it has some fields, then a table for n_atom_site_* with the subsequent lines being tab/space delimited +# rows +class Cif(BaseModel): pass +class Structure(BaseDocumentWithInput[PydanticObjectId]): + name: str + md5: MD5Hash + lattice: Lattice + sites: list[Site] + charge: float | None + cif: str # Cif + + class Settings: + name = "structures" + + class StructureFilter(Filter): - pass + id: PydanticObjectId | None = None + id__in: list[PydanticObjectId] | None = None + id__neq: PydanticObjectId | None = None + + md5: MD5Hash | None = None + md5__in: list[MD5Hash] | None = None + md5__neq: MD5Hash | None = None + + name: str | None = None + name__in: list[str] | None = None + name__neq: str | None = None + name__ilike: str | None = None + + # sites + + class Constants(Filter.Constants): + model = Structure diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py index 803693afff..d37ccb1c55 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py @@ -1,10 +1,133 @@ -from beanie import Document +import polars as pl +from beanie import PydanticObjectId from fastapi_filter.contrib.beanie import Filter +from pydantic import ( + BaseModel, + ConfigDict, + ValidationError, + field_serializer, + field_validator, + model_validator, +) +from mpcontribs_api.domains._shared.models import BaseDocumentWithInput +from mpcontribs_api.types import MD5Hash -class Table(Document): - pass + +class Labels(BaseModel): + index: str + value: str + variable: str + + +class Attributes(BaseModel): + title: str + labels: Labels + + +class Table(BaseDocumentWithInput[PydanticObjectId]): + model_config = ConfigDict(arbitrary_types_allowed=True) + + name: str + md5: MD5Hash + attrs: Attributes + total_data_rows: int + data: pl.DataFrame + + class Settings: + name = "tables" + + @field_validator("data", mode="before") + @classmethod + def coerce_data(cls, v: object) -> pl.DataFrame: + if isinstance(v, pl.DataFrame): + return v + if isinstance(v, dict): + return pl.DataFrame(v) + raise ValueError(f"cannot coerce {type(v)} to pl.DataFrame") + + @field_serializer("data") + def serialize_data(self, data: pl.DataFrame) -> dict: + return data.to_dict(as_series=False) + + +class TableIn(Table): + @model_validator(mode="after") + def data_dimensions(self): + if len(self.data) != self.total_data_rows: + raise ValidationError( + f"`total_data_rows` ({self.total_data_rows}) does not match number of rows in `data` ({len(self.data)})" + ) + return self + + @staticmethod + def _check_column_collision(columns: list[str], index_name: str) -> None: + if index_name in columns: + raise ValidationError(f"column name collision: {index_name!r} already in columns") + + @staticmethod + def _check_index_data_lengths(index: list, data: list[list]) -> None: + if len(index) != len(data): + raise ValidationError(f"length mismatch between `index` ({len(index)}) and `data` ({len(data)})") + + @staticmethod + def _check_declared_row_count(declared: int, data: list[list]) -> None: + if declared != len(data): + raise ValidationError( + f"`total_data_rows` ({declared}) does not match length of `data` ({len(data)}) in source document" + ) + + @classmethod + def _validate_input(cls, doc, index_name: str) -> None: + cls._check_column_collision(doc["columns"], index_name) + cls._check_index_data_lengths(doc["index"], doc["data"]) + cls._check_declared_row_count(doc["total_data_rows"], doc["data"]) + + @classmethod + def from_input(cls, doc, index_name: str = "index"): + cls._validate_input(doc, index_name) + + columns = [index_name, *doc["columns"]] + + # Strict=false since we explicitly handle our own errors + rows = [[idx, *row] for idx, row in zip(doc["index"], doc["data"], strict=False)] + df = pl.DataFrame(rows, schema=columns, orient="row") + + return cls( + _id=doc["id"], + name=doc["name"], + md5=doc["md5"], + attrs=doc["attrs"], + data=df, + total_data_rows=doc["total_data_rows"], + ) class TableFilter(Filter): - pass + id: PydanticObjectId | None = None + id__in: list[PydanticObjectId] | None = None + id__neq: PydanticObjectId | None = None + + md5: MD5Hash | None = None + md5__in: list[MD5Hash] | None = None + md5__neq: MD5Hash | None = None + + name: str | None = None + name__in: list[str] | None = None + name__neq: str | None = None + name__ilike: str | None = None + + # Columns + # Attrs + + class Constants(Filter.Constants): + model = Table + + +class TableOut(BaseModel): + """Metadata-only table as embedded in contribution responses (no data).""" + + attrs: Attributes + columns: list[str] + total_data_rows: int + total_data_pages: int = 1 From 7a5dbf85aee993265af180ea49b242ee38cc4f6e Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Fri, 5 Jun 2026 12:37:36 -0700 Subject: [PATCH 068/591] Init component models --- mpcontribs-api/src/mpcontribs_api/app.py | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/mpcontribs-api/src/mpcontribs_api/app.py b/mpcontribs-api/src/mpcontribs_api/app.py index afc2b8aa9b..8431f9ba6d 100644 --- a/mpcontribs-api/src/mpcontribs_api/app.py +++ b/mpcontribs-api/src/mpcontribs_api/app.py @@ -11,9 +11,12 @@ from mpcontribs_api.api.v1.router import router as v1_router from mpcontribs_api.config import Settings, get_settings from mpcontribs_api.dependencies import verify_gateway +from mpcontribs_api.domains.attachments.models import Attachment from mpcontribs_api.domains.contributions.models import Contribution from mpcontribs_api.domains.healthcheck.router import router as healthcheck_router from mpcontribs_api.domains.projects.models import Project +from mpcontribs_api.domains.structures.models import Structure +from mpcontribs_api.domains.tables.models import Table from mpcontribs_api.exceptions import register_exception_handlers from mpcontribs_api.logging import configure_logging, get_logger from mpcontribs_api.middleware import RequestContextMiddleware @@ -39,7 +42,16 @@ async def lifespan(app: FastAPI) -> AsyncGenerator[None]: app.state.mongo_client = client app.state.db = client[settings.mongo.db_name] - await init_beanie(database=client[settings.mongo.db_name], document_models=[Project, Contribution]) + await init_beanie( + database=client[settings.mongo.db_name], + document_models=[ + Project, + Contribution, + Attachment, + Structure, + Table, + ], + ) try: yield From 9a96716b1f3390eb71c3d5cefb4031098a1c2b4e Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Fri, 5 Jun 2026 13:00:09 -0700 Subject: [PATCH 069/591] Bulk upload of contributions with components now bulk inserts components first --- .../domains/attachments/models.py | 4 + .../domains/contributions/models.py | 18 ++-- .../domains/contributions/repository.py | 88 ++++++++++++++++--- .../domains/structures/models.py | 4 + 4 files changed, 94 insertions(+), 20 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py b/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py index 13544412b5..7364e626c0 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py @@ -15,6 +15,10 @@ class Settings: name = "attachments" +class AttachmentIn(Attachment): + pass + + class AttachmentFilter(Filter): id: PydanticObjectId | None = None id__in: list[PydanticObjectId] | None = None diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py index fdf221c565..7a66701b29 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py @@ -16,9 +16,9 @@ from pydantic import Field from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut -from mpcontribs_api.domains.attachments.models import Attachment, AttachmentFilter -from mpcontribs_api.domains.structures.models import Structure, StructureFilter -from mpcontribs_api.domains.tables.models import Table, TableFilter +from mpcontribs_api.domains.attachments.models import Attachment, AttachmentFilter, AttachmentIn +from mpcontribs_api.domains.structures.models import Structure, StructureFilter, StructureIn +from mpcontribs_api.domains.tables.models import Table, TableFilter, TableIn from mpcontribs_api.projection import SparseFieldsModel from mpcontribs_api.types import ShortStr @@ -32,9 +32,6 @@ class ContributionBase(BaseDocumentWithInput[PydanticObjectId]): # TODO: Verify that this should default to True and be passed by users needs_build: bool = True last_modified: datetime = Field(default_factory=lambda: datetime.now(UTC)) - structures: list[Link[Structure]] | None = None - tables: list[Link[Table]] | None = None - attachments: list[Link[Attachment]] | None = None class Settings: name = "contributions" @@ -43,13 +40,16 @@ class Settings: class Contribution(ContributionBase): is_public: bool + structures: list[Link[Structure]] | None = None + tables: list[Link[Table]] | None = None + attachments: list[Link[Attachment]] | None = None # needs_build: bool = True @classmethod def from_input_model(cls, data: ContributionIn) -> Contribution: return cls.model_validate( { - **data.model_dump(exclude={"is_public"}), + **data.model_dump(exclude={"is_public", "structures", "tables", "attachments"}), "is_public": False, } ) @@ -60,7 +60,9 @@ def set_last_modified(self): class ContributionIn(ContributionBase): - pass + structures: list[StructureIn] | None = None + tables: list[TableIn] | None = None + attachments: list[AttachmentIn] | None = None class ContributionOut(DocumentOut[PydanticObjectId]): diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py index 48072b81fc..ace0f1f16b 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py @@ -1,11 +1,12 @@ import asyncio -from typing import Any, Literal +from typing import Any, Literal, cast -from beanie import UpdateResponse +from beanie import Link, UpdateResponse from beanie.operators import Set from mpcontribs_api.auth import User from mpcontribs_api.domains._shared.repository import MongoDbRepository +from mpcontribs_api.domains.attachments.models import Attachment from mpcontribs_api.domains.contributions.models import ( Contribution, ContributionFilter, @@ -13,6 +14,8 @@ ContributionOut, ContributionPatch, ) +from mpcontribs_api.domains.structures.models import Structure +from mpcontribs_api.domains.tables.models import Table from mpcontribs_api.pagination import CursorParams @@ -71,8 +74,56 @@ async def delete_contributions(self, filter: ContributionFilter): docs = filter.filter(self.document_model.find(self._scope)) await docs.delete() + @staticmethod + async def _insert_components( + contributions: list[ContributionIn], + ) -> tuple[list[Structure], list[Table], list[Attachment], list[slice], list[slice], list[slice]]: + """Bulk-insert all component documents (structures, tables, attachments) for a batch of + ContributionIn objects, and return the inserted documents alongside per-contribution slices + so callers can re-attach them as Links. + + Returns a tuple of: + (structures, tables, attachments, struct_slices, table_slices, attach_slices) + where each slice[i] selects the components belonging to contributions[i]. + """ + all_structures: list[Structure] = [] + all_tables: list[Table] = [] + all_attachments: list[Attachment] = [] + struct_slices: list[slice] = [] + table_slices: list[slice] = [] + attach_slices: list[slice] = [] + + for contrib in contributions: + s0 = len(all_structures) + if contrib.structures: + all_structures.extend(Structure.model_validate(s.model_dump()) for s in contrib.structures) + struct_slices.append(slice(s0, len(all_structures))) + + t0 = len(all_tables) + if contrib.tables: + all_tables.extend(Table.model_validate(t.model_dump()) for t in contrib.tables) + table_slices.append(slice(t0, len(all_tables))) + + a0 = len(all_attachments) + if contrib.attachments: + all_attachments.extend(Attachment.model_validate(a.model_dump()) for a in contrib.attachments) + attach_slices.append(slice(a0, len(all_attachments))) + + if all_structures: + await Structure.insert_many(all_structures, ordered=False) + if all_tables: + await Table.insert_many(all_tables, ordered=False) + if all_attachments: + await Attachment.insert_many(all_attachments, ordered=False) + + return all_structures, all_tables, all_attachments, struct_slices, table_slices, attach_slices + async def insert_contributions(self, contributions: list[ContributionIn]): - """Bulk insertion of Contributions + """Bulk insertion of Contributions. + + Component documents (structures, tables, attachments) embedded in each ContributionIn are + bulk-inserted first; the resulting IDs are then stored as Links on the Contribution before + the contributions themselves are bulk-inserted. Args: contributions (list[ContributionIn]): the list of contributions to be inserted @@ -80,14 +131,25 @@ async def insert_contributions(self, contributions: list[ContributionIn]): Returns: list[ContributionOut]: the inserted documents """ - full_docs = [self.document_model.from_input_model(contrib) for contrib in contributions] - # ordered=False lets Mongo keep inserting if a document fails + structures, tables, attachments, struct_slices, table_slices, attach_slices = ( + await self._insert_components(contributions) + ) + + full_docs: list[Contribution] = [] + for i, contrib in enumerate(contributions): + doc = self.document_model.from_input_model(contrib) + doc.structures = cast(list[Link[Structure]] | None, structures[struct_slices[i]] or None) + doc.tables = cast(list[Link[Table]] | None, tables[table_slices[i]] or None) + doc.attachments = cast(list[Link[Attachment]] | None, attachments[attach_slices[i]] or None) + full_docs.append(doc) + return await self.document_model.insert_many(full_docs, ordered=False) async def upsert_contributions(self, contributions: list[ContributionIn]): """Upserts contributions. - For each Contribution, if Contribution with identical identifiers exist, update, otherwise insert + Component documents are bulk-inserted first (same as insert_contributions), then each + Contribution is upserted by (project, identifier). Args: contributions (list[ContributionIn]): the list of contributions to be upserted @@ -95,26 +157,28 @@ async def upsert_contributions(self, contributions: list[ContributionIn]): Returns: list[ContributionOut]: the list of upserted documents """ + structures, tables, attachments, struct_slices, table_slices, attach_slices = ( + await self._insert_components(contributions) + ) - # Handles upserting a document - no upsert_many command - async def _upsert(contrib: ContributionIn): + async def _upsert(contrib: ContributionIn, i: int): existing = await self.document_model.find_one( self._scope, self.document_model.project == contrib.project, self.document_model.identifier == contrib.identifier, ) doc = self.document_model.from_input_model(contrib) - # Update + doc.structures = cast(list[Link[Structure]] | None, structures[struct_slices[i]] or None) + doc.tables = cast(list[Link[Table]] | None, tables[table_slices[i]] or None) + doc.attachments = cast(list[Link[Attachment]] | None, attachments[attach_slices[i]] or None) if existing is not None: update_data = doc.model_dump(exclude={"id"}, exclude_none=True) await existing.update(Set(update_data)) return existing - # Insert await doc.insert() return doc - # Asynchronously run upsert on each contribution - return await asyncio.gather(*[_upsert(c) for c in contributions]) + return await asyncio.gather(*[_upsert(c, i) for i, c in enumerate(contributions)]) async def upsert_contribution_by_id(self, id: str, contribution: ContributionIn): """Upserts a single Contribution. diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py index 6d83c72108..bb102642e2 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py @@ -74,6 +74,10 @@ class Settings: name = "structures" +class StructureIn(Structure): + pass + + class StructureFilter(Filter): id: PydanticObjectId | None = None id__in: list[PydanticObjectId] | None = None From 4d860f9375098eb5c222ad848f219fb39b327398 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Fri, 5 Jun 2026 13:16:10 -0700 Subject: [PATCH 070/591] Made component repositories to pull insert logic out of contributions repo --- .../domains/attachments/models.py | 14 +++++- .../domains/attachments/repository.py | 29 +++++++++++ .../domains/contributions/repository.py | 49 +++++++++---------- .../domains/structures/models.py | 12 ++++- .../domains/structures/repository.py | 29 +++++++++++ .../mpcontribs_api/domains/tables/models.py | 12 ++++- .../domains/tables/repository.py | 29 +++++++++++ 7 files changed, 146 insertions(+), 28 deletions(-) create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/attachments/repository.py create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/structures/repository.py create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py diff --git a/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py b/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py index 7364e626c0..a71e5d8996 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py @@ -1,7 +1,8 @@ from beanie import PydanticObjectId from fastapi_filter.contrib.beanie import Filter -from mpcontribs_api.domains._shared.models import BaseDocumentWithInput +from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut +from mpcontribs_api.projection import SparseFieldsModel from mpcontribs_api.types import FileLike, MD5Hash, MimeFormat @@ -19,6 +20,17 @@ class AttachmentIn(Attachment): pass +class AttachmentOut(DocumentOut[PydanticObjectId]): + name: FileLike | None = None + md5: MD5Hash | None = None + mime: MimeFormat | None = None + + +class AttachmentPatch(SparseFieldsModel): + name: FileLike | None = None + mime: MimeFormat | None = None + + class AttachmentFilter(Filter): id: PydanticObjectId | None = None id__in: list[PydanticObjectId] | None = None diff --git a/mpcontribs-api/src/mpcontribs_api/domains/attachments/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/attachments/repository.py new file mode 100644 index 0000000000..c26dd9b0f1 --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/domains/attachments/repository.py @@ -0,0 +1,29 @@ +from typing import Any + +from mpcontribs_api.auth import User +from mpcontribs_api.domains._shared.repository import MongoDbRepository +from mpcontribs_api.domains.attachments.models import ( + Attachment, + AttachmentFilter, + AttachmentIn, + AttachmentOut, + AttachmentPatch, +) + + +class MongoDbAttachmentRepository( + MongoDbRepository[Attachment, AttachmentIn, AttachmentOut, AttachmentFilter, AttachmentPatch] +): + document_model = Attachment + out_model = AttachmentOut + + @staticmethod + def _build_scope(user: User) -> dict[str, Any]: + return {} + + async def insert_attachments(self, attachments: list[AttachmentIn]) -> list[Attachment]: + if not attachments: + return [] + docs = [Attachment.model_validate(a.model_dump()) for a in attachments] + await Attachment.insert_many(docs, ordered=False) + return docs diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py index ace0f1f16b..c629aae822 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py @@ -6,7 +6,8 @@ from mpcontribs_api.auth import User from mpcontribs_api.domains._shared.repository import MongoDbRepository -from mpcontribs_api.domains.attachments.models import Attachment +from mpcontribs_api.domains.attachments.models import Attachment, AttachmentIn +from mpcontribs_api.domains.attachments.repository import MongoDbAttachmentRepository from mpcontribs_api.domains.contributions.models import ( Contribution, ContributionFilter, @@ -14,8 +15,10 @@ ContributionOut, ContributionPatch, ) -from mpcontribs_api.domains.structures.models import Structure -from mpcontribs_api.domains.tables.models import Table +from mpcontribs_api.domains.structures.models import Structure, StructureIn +from mpcontribs_api.domains.structures.repository import MongoDbStructureRepository +from mpcontribs_api.domains.tables.models import Table, TableIn +from mpcontribs_api.domains.tables.repository import MongoDbTableRepository from mpcontribs_api.pagination import CursorParams @@ -33,6 +36,10 @@ class MongoDbContributionRepository( document_model = Contribution out_model = ContributionOut + def __init__(self, user: User) -> None: + super().__init__(user) + self._user = user + @staticmethod def _build_scope(user: User) -> dict[str, Any]: """Provides scope based on current user's permitted groups and publicly released data.""" @@ -74,49 +81,41 @@ async def delete_contributions(self, filter: ContributionFilter): docs = filter.filter(self.document_model.find(self._scope)) await docs.delete() - @staticmethod async def _insert_components( + self, contributions: list[ContributionIn], ) -> tuple[list[Structure], list[Table], list[Attachment], list[slice], list[slice], list[slice]]: - """Bulk-insert all component documents (structures, tables, attachments) for a batch of - ContributionIn objects, and return the inserted documents alongside per-contribution slices - so callers can re-attach them as Links. + """Bulk-insert component documents for a batch and return per-contribution slices. - Returns a tuple of: + Returns: (structures, tables, attachments, struct_slices, table_slices, attach_slices) - where each slice[i] selects the components belonging to contributions[i]. + where slice[i] selects the components belonging to contributions[i]. """ - all_structures: list[Structure] = [] - all_tables: list[Table] = [] - all_attachments: list[Attachment] = [] + all_structures: list[StructureIn] = [] + all_tables: list[TableIn] = [] + all_attachments: list[AttachmentIn] = [] struct_slices: list[slice] = [] table_slices: list[slice] = [] attach_slices: list[slice] = [] for contrib in contributions: s0 = len(all_structures) - if contrib.structures: - all_structures.extend(Structure.model_validate(s.model_dump()) for s in contrib.structures) + all_structures.extend(contrib.structures or []) struct_slices.append(slice(s0, len(all_structures))) t0 = len(all_tables) - if contrib.tables: - all_tables.extend(Table.model_validate(t.model_dump()) for t in contrib.tables) + all_tables.extend(contrib.tables or []) table_slices.append(slice(t0, len(all_tables))) a0 = len(all_attachments) - if contrib.attachments: - all_attachments.extend(Attachment.model_validate(a.model_dump()) for a in contrib.attachments) + all_attachments.extend(contrib.attachments or []) attach_slices.append(slice(a0, len(all_attachments))) - if all_structures: - await Structure.insert_many(all_structures, ordered=False) - if all_tables: - await Table.insert_many(all_tables, ordered=False) - if all_attachments: - await Attachment.insert_many(all_attachments, ordered=False) + structures = await MongoDbStructureRepository(self._user).insert_structures(all_structures) + tables = await MongoDbTableRepository(self._user).insert_tables(all_tables) + attachments = await MongoDbAttachmentRepository(self._user).insert_attachments(all_attachments) - return all_structures, all_tables, all_attachments, struct_slices, table_slices, attach_slices + return structures, tables, attachments, struct_slices, table_slices, attach_slices async def insert_contributions(self, contributions: list[ContributionIn]): """Bulk insertion of Contributions. diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py index bb102642e2..e770dc87f2 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py @@ -4,7 +4,8 @@ from pydantic import BaseModel, ConfigDict, field_serializer, field_validator from pymatgen.core import Element -from mpcontribs_api.domains._shared.models import BaseDocumentWithInput +from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut +from mpcontribs_api.projection import SparseFieldsModel from mpcontribs_api.types import MD5Hash @@ -78,6 +79,15 @@ class StructureIn(Structure): pass +class StructureOut(DocumentOut[PydanticObjectId]): + name: str | None = None + md5: MD5Hash | None = None + + +class StructurePatch(SparseFieldsModel): + name: str | None = None + + class StructureFilter(Filter): id: PydanticObjectId | None = None id__in: list[PydanticObjectId] | None = None diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/repository.py new file mode 100644 index 0000000000..3216b3c2c2 --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/domains/structures/repository.py @@ -0,0 +1,29 @@ +from typing import Any + +from mpcontribs_api.auth import User +from mpcontribs_api.domains._shared.repository import MongoDbRepository +from mpcontribs_api.domains.structures.models import ( + Structure, + StructureFilter, + StructureIn, + StructureOut, + StructurePatch, +) + + +class MongoDbStructureRepository( + MongoDbRepository[Structure, StructureIn, StructureOut, StructureFilter, StructurePatch] +): + document_model = Structure + out_model = StructureOut + + @staticmethod + def _build_scope(user: User) -> dict[str, Any]: + return {} + + async def insert_structures(self, structures: list[StructureIn]) -> list[Structure]: + if not structures: + return [] + docs = [Structure.model_validate(s.model_dump()) for s in structures] + await Structure.insert_many(docs, ordered=False) + return docs diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py index d37ccb1c55..a6a61fdc9d 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py @@ -10,7 +10,8 @@ model_validator, ) -from mpcontribs_api.domains._shared.models import BaseDocumentWithInput +from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut +from mpcontribs_api.projection import SparseFieldsModel from mpcontribs_api.types import MD5Hash @@ -131,3 +132,12 @@ class TableOut(BaseModel): columns: list[str] total_data_rows: int total_data_pages: int = 1 + + +class TableDocumentOut(DocumentOut[PydanticObjectId]): + name: str | None = None + md5: MD5Hash | None = None + + +class TablePatch(SparseFieldsModel): + name: str | None = None diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py new file mode 100644 index 0000000000..b85e40325c --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py @@ -0,0 +1,29 @@ +from typing import Any + +from mpcontribs_api.auth import User +from mpcontribs_api.domains._shared.repository import MongoDbRepository +from mpcontribs_api.domains.tables.models import ( + Table, + TableDocumentOut, + TableFilter, + TableIn, + TablePatch, +) + + +class MongoDbTableRepository( + MongoDbRepository[Table, TableIn, TableDocumentOut, TableFilter, TablePatch] +): + document_model = Table + out_model = TableDocumentOut + + @staticmethod + def _build_scope(user: User) -> dict[str, Any]: + return {} + + async def insert_tables(self, tables: list[TableIn]) -> list[Table]: + if not tables: + return [] + docs = [Table.model_validate(t.model_dump()) for t in tables] + await Table.insert_many(docs, ordered=False) + return docs From 7435e7df5ae60ae0eb87150b6619f53d436e96af Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Fri, 5 Jun 2026 15:09:09 -0700 Subject: [PATCH 071/591] Moved cross-repo insert logic into service layer --- .../domains/contributions/dependencies.py | 16 +++ .../domains/contributions/repository.py | 125 ++++-------------- .../domains/contributions/router.py | 10 +- .../domains/contributions/service.py | 125 ++++++++++++++++++ 4 files changed, 169 insertions(+), 107 deletions(-) create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/dependencies.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/dependencies.py index 3227039e95..ec995e4542 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/dependencies.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/dependencies.py @@ -3,9 +3,13 @@ from fastapi import Depends from mpcontribs_api.dependencies import UserDep +from mpcontribs_api.domains.attachments.repository import MongoDbAttachmentRepository from mpcontribs_api.domains.contributions.repository import ( MongoDbContributionRepository, ) +from mpcontribs_api.domains.contributions.service import ContributionService +from mpcontribs_api.domains.structures.repository import MongoDbStructureRepository +from mpcontribs_api.domains.tables.repository import MongoDbTableRepository def get_scoped_contributions(user: UserDep) -> MongoDbContributionRepository: @@ -13,3 +17,15 @@ def get_scoped_contributions(user: UserDep) -> MongoDbContributionRepository: ContributionDep = Annotated[MongoDbContributionRepository, Depends(get_scoped_contributions)] + + +def get_contribution_service(user: UserDep) -> ContributionService: + return ContributionService( + contributions=MongoDbContributionRepository(user), + structures=MongoDbStructureRepository(user), + attachments=MongoDbAttachmentRepository(user), + tables=MongoDbTableRepository(user), + ) + + +ContributionServiceDep = Annotated[ContributionService, Depends(get_contribution_service)] diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py index c629aae822..638cfedfd4 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py @@ -1,13 +1,10 @@ -import asyncio -from typing import Any, Literal, cast +from typing import Any, Literal -from beanie import Link, UpdateResponse +from beanie import UpdateResponse from beanie.operators import Set from mpcontribs_api.auth import User from mpcontribs_api.domains._shared.repository import MongoDbRepository -from mpcontribs_api.domains.attachments.models import Attachment, AttachmentIn -from mpcontribs_api.domains.attachments.repository import MongoDbAttachmentRepository from mpcontribs_api.domains.contributions.models import ( Contribution, ContributionFilter, @@ -15,10 +12,6 @@ ContributionOut, ContributionPatch, ) -from mpcontribs_api.domains.structures.models import Structure, StructureIn -from mpcontribs_api.domains.structures.repository import MongoDbStructureRepository -from mpcontribs_api.domains.tables.models import Table, TableIn -from mpcontribs_api.domains.tables.repository import MongoDbTableRepository from mpcontribs_api.pagination import CursorParams @@ -29,8 +22,8 @@ class MongoDbContributionRepository( Shared CRUD logic lives on :class:`MongoDbRepository`; the methods here are domain-named forwarders that give routers a consistent vocabulary and concrete types, plus the operations - whose shape is genuinely contribution-specific (filtered delete, bulk insert, compound-key and - id-keyed upsert, download). + whose shape is genuinely contribution-specific (filtered delete, id-keyed upsert, download). + Multi-collection orchestration (component inserts) lives in ``ContributionService``. """ document_model = Contribution @@ -81,103 +74,31 @@ async def delete_contributions(self, filter: ContributionFilter): docs = filter.filter(self.document_model.find(self._scope)) await docs.delete() - async def _insert_components( - self, - contributions: list[ContributionIn], - ) -> tuple[list[Structure], list[Table], list[Attachment], list[slice], list[slice], list[slice]]: - """Bulk-insert component documents for a batch and return per-contribution slices. + async def insert_many_contributions(self, docs: list[Contribution]): + """Bulk-insert pre-built Contribution documents. - Returns: - (structures, tables, attachments, struct_slices, table_slices, attach_slices) - where slice[i] selects the components belonging to contributions[i]. + Used by ``ContributionService`` after it has resolved component Links. The service is + responsible for ensuring each document is fully formed; this method is a thin + collection-level wrapper. """ - all_structures: list[StructureIn] = [] - all_tables: list[TableIn] = [] - all_attachments: list[AttachmentIn] = [] - struct_slices: list[slice] = [] - table_slices: list[slice] = [] - attach_slices: list[slice] = [] - - for contrib in contributions: - s0 = len(all_structures) - all_structures.extend(contrib.structures or []) - struct_slices.append(slice(s0, len(all_structures))) - - t0 = len(all_tables) - all_tables.extend(contrib.tables or []) - table_slices.append(slice(t0, len(all_tables))) - - a0 = len(all_attachments) - all_attachments.extend(contrib.attachments or []) - attach_slices.append(slice(a0, len(all_attachments))) - - structures = await MongoDbStructureRepository(self._user).insert_structures(all_structures) - tables = await MongoDbTableRepository(self._user).insert_tables(all_tables) - attachments = await MongoDbAttachmentRepository(self._user).insert_attachments(all_attachments) + return await self.document_model.insert_many(docs, ordered=False) - return structures, tables, attachments, struct_slices, table_slices, attach_slices + async def insert_contribution(self, doc: Contribution) -> Contribution: + """Insert a single pre-built Contribution document.""" + await doc.insert() + return doc - async def insert_contributions(self, contributions: list[ContributionIn]): - """Bulk insertion of Contributions. - - Component documents (structures, tables, attachments) embedded in each ContributionIn are - bulk-inserted first; the resulting IDs are then stored as Links on the Contribution before - the contributions themselves are bulk-inserted. - - Args: - contributions (list[ContributionIn]): the list of contributions to be inserted - - Returns: - list[ContributionOut]: the inserted documents - """ - structures, tables, attachments, struct_slices, table_slices, attach_slices = ( - await self._insert_components(contributions) - ) - - full_docs: list[Contribution] = [] - for i, contrib in enumerate(contributions): - doc = self.document_model.from_input_model(contrib) - doc.structures = cast(list[Link[Structure]] | None, structures[struct_slices[i]] or None) - doc.tables = cast(list[Link[Table]] | None, tables[table_slices[i]] or None) - doc.attachments = cast(list[Link[Attachment]] | None, attachments[attach_slices[i]] or None) - full_docs.append(doc) - - return await self.document_model.insert_many(full_docs, ordered=False) - - async def upsert_contributions(self, contributions: list[ContributionIn]): - """Upserts contributions. - - Component documents are bulk-inserted first (same as insert_contributions), then each - Contribution is upserted by (project, identifier). - - Args: - contributions (list[ContributionIn]): the list of contributions to be upserted - - Returns: - list[ContributionOut]: the list of upserted documents - """ - structures, tables, attachments, struct_slices, table_slices, attach_slices = ( - await self._insert_components(contributions) + async def find_one_contribution(self, project: str, identifier: str) -> Contribution | None: + """Find a single contribution by (project, identifier), scoped to the current user.""" + return await self.document_model.find_one( + self._scope, + self.document_model.project == project, + self.document_model.identifier == identifier, ) - async def _upsert(contrib: ContributionIn, i: int): - existing = await self.document_model.find_one( - self._scope, - self.document_model.project == contrib.project, - self.document_model.identifier == contrib.identifier, - ) - doc = self.document_model.from_input_model(contrib) - doc.structures = cast(list[Link[Structure]] | None, structures[struct_slices[i]] or None) - doc.tables = cast(list[Link[Table]] | None, tables[table_slices[i]] or None) - doc.attachments = cast(list[Link[Attachment]] | None, attachments[attach_slices[i]] or None) - if existing is not None: - update_data = doc.model_dump(exclude={"id"}, exclude_none=True) - await existing.update(Set(update_data)) - return existing - await doc.insert() - return doc - - return await asyncio.gather(*[_upsert(c, i) for i, c in enumerate(contributions)]) + async def update_contribution(self, doc: Contribution, update_data: dict[str, Any]) -> None: + """Apply a partial update to an existing Contribution document.""" + await doc.update(Set(update_data)) async def upsert_contribution_by_id(self, id: str, contribution: ContributionIn): """Upserts a single Contribution. diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py index 0af605ab51..cfc7db4eff 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py @@ -3,7 +3,7 @@ from fastapi import APIRouter, Depends from fastapi_filter import FilterDepends -from mpcontribs_api.domains.contributions.dependencies import ContributionDep +from mpcontribs_api.domains.contributions.dependencies import ContributionDep, ContributionServiceDep from mpcontribs_api.domains.contributions.models import ( ContributionFilter, ContributionIn, @@ -37,18 +37,18 @@ async def delete_contributions( @router.post("") async def insert_contributions( - repo: ContributionDep, + service: ContributionServiceDep, contributions: list[ContributionIn], ): - return await repo.insert_contributions(contributions=contributions) + return await service.insert_contributions(contributions=contributions) @router.put("") async def upsert_contributions( - repo: ContributionDep, + service: ContributionServiceDep, contributions: list[ContributionIn], ): - return await repo.upsert_contributions(contributions=contributions) + return await service.upsert_contributions(contributions=contributions) @router.get("download/{mime}") diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py new file mode 100644 index 0000000000..c0dfb57053 --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py @@ -0,0 +1,125 @@ +import asyncio +from typing import cast + +from beanie import Link + +from mpcontribs_api.domains.attachments.models import Attachment, AttachmentIn +from mpcontribs_api.domains.attachments.repository import MongoDbAttachmentRepository +from mpcontribs_api.domains.contributions.models import Contribution, ContributionIn +from mpcontribs_api.domains.contributions.repository import MongoDbContributionRepository +from mpcontribs_api.domains.structures.models import Structure, StructureIn +from mpcontribs_api.domains.structures.repository import MongoDbStructureRepository +from mpcontribs_api.domains.tables.models import Table, TableIn +from mpcontribs_api.domains.tables.repository import MongoDbTableRepository +from mpcontribs_api.exceptions import ValidationError + + +class ContributionService: + def __init__( + self, + contributions: MongoDbContributionRepository, + structures: MongoDbStructureRepository, + attachments: MongoDbAttachmentRepository, + tables: MongoDbTableRepository, + ): + self._contributions = contributions + self._structures = structures + self._attachments = attachments + self._tables = tables + + async def _insert_components( + self, + contributions: list[ContributionIn], + ) -> tuple[list[Structure], list[Table], list[Attachment], list[slice], list[slice], list[slice]]: + """Bulk-insert component documents for a batch and return per-contribution slices. + + Returns: + (structures, tables, attachments, struct_slices, table_slices, attach_slices) + where slice[i] selects the components belonging to contributions[i]. + """ + all_structures: list[StructureIn] = [] + all_tables: list[TableIn] = [] + all_attachments: list[AttachmentIn] = [] + struct_slices: list[slice] = [] + table_slices: list[slice] = [] + attach_slices: list[slice] = [] + + for contrib in contributions: + s0 = len(all_structures) + all_structures.extend(contrib.structures or []) + struct_slices.append(slice(s0, len(all_structures))) + + t0 = len(all_tables) + all_tables.extend(contrib.tables or []) + table_slices.append(slice(t0, len(all_tables))) + + a0 = len(all_attachments) + all_attachments.extend(contrib.attachments or []) + attach_slices.append(slice(a0, len(all_attachments))) + + structures = await self._structures.insert_structures(all_structures) + tables = await self._tables.insert_tables(all_tables) + attachments = await self._attachments.insert_attachments(all_attachments) + + return structures, tables, attachments, struct_slices, table_slices, attach_slices + + async def insert_contributions(self, contributions: list[ContributionIn]): + """Bulk insertion of Contributions with nested components. + + Components embedded in each ContributionIn are bulk-inserted first; the resulting IDs + are stored as Links before the contributions themselves are bulk-inserted. + + Args: + contributions: contributions to insert, may include nested structures/tables/attachments + + Returns: + list[Contribution]: inserted documents + """ + structures, tables, attachments, struct_slices, table_slices, attach_slices = ( + await self._insert_components(contributions) + ) + + full_docs: list[Contribution] = [] + for i, contrib in enumerate(contributions): + doc = Contribution.from_input_model(contrib) + doc.structures = cast(list[Link[Structure]] | None, structures[struct_slices[i]] or None) + doc.tables = cast(list[Link[Table]] | None, tables[table_slices[i]] or None) + doc.attachments = cast(list[Link[Attachment]] | None, attachments[attach_slices[i]] or None) + full_docs.append(doc) + + return await self._contributions.insert_many_contributions(full_docs) + + async def upsert_contributions(self, contributions: list[ContributionIn]): + """Upsert contributions by (project, identifier). + + Components (structures, tables, attachments) must be managed via their respective + services. If any contribution in the batch carries components, the entire request is + rejected before any database writes occur. + + Args: + contributions: contributions to upsert; must not include nested components + + Returns: + list[Contribution]: upserted documents + """ + indices_with_components = [ + i + for i, c in enumerate(contributions) + if c.structures or c.tables or c.attachments + ] + if indices_with_components: + raise ValidationError( + "Components must be managed via their respective services, not via contribution upsert.", + contribution_indices=indices_with_components, + ) + + async def _upsert(contrib: ContributionIn): + doc = Contribution.from_input_model(contrib) + existing = await self._contributions.find_one_contribution(contrib.project, contrib.identifier) + if existing is not None: + update_data = doc.model_dump(exclude={"id"}, exclude_none=True) + await self._contributions.update_contribution(existing, update_data) + return existing + return await self._contributions.insert_contribution(doc) + + return await asyncio.gather(*[_upsert(c) for c in contributions]) From ca962a4220f3229f94e91aa214b2d1a6799416d0 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Fri, 5 Jun 2026 18:59:51 -0700 Subject: [PATCH 072/591] Documents now handle decoding cursor to accomodate differing id types (OId vs str) --- .../mpcontribs_api/domains/_shared/models.py | 7 +- .../domains/_shared/repository.py | 4 +- .../domains/contributions/service.py | 10 +- .../mpcontribs_api/domains/projects/models.py | 5 + .../domains/tables/repository.py | 4 +- .../db/test_contributions_repository.py | 487 +++++++++++++++ .../unit/domains/test_contribution_service.py | 569 ++++++++++++++++++ .../unit/domains/test_contributions_models.py | 45 ++ 8 files changed, 1118 insertions(+), 13 deletions(-) create mode 100644 mpcontribs-api/tests/integration/db/test_contributions_repository.py create mode 100644 mpcontribs-api/tests/unit/domains/test_contribution_service.py diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py index f3bac721f9..f76377c4e0 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py @@ -1,8 +1,9 @@ from typing import Annotated, Any, Self -from beanie import DocumentWithSoftDelete +from beanie import DocumentWithSoftDelete, PydanticObjectId from pydantic import Field +from mpcontribs_api import pagination from mpcontribs_api.projection import SparseFieldsModel @@ -26,6 +27,10 @@ def from_input_model(cls, data: Any) -> Self: """Translate a validated input payload into a full stored document.""" return cls(**data.model_dump()) + @staticmethod + def decode_cursor(cursor: str) -> str | PydanticObjectId: + return PydanticObjectId(pagination.decode_cursor(cursor=cursor)) + class DocumentOut[TId](SparseFieldsModel): """Base output model for resources addressed by an ``_id``. diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py index 82d645aad6..e062af187c 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py @@ -10,7 +10,7 @@ from mpcontribs_api.auth import User from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut from mpcontribs_api.exceptions import ConflictError, NotFoundError, ValidationError -from mpcontribs_api.pagination import CursorParams, Page, decode_cursor, encode_cursor +from mpcontribs_api.pagination import CursorParams, Page, encode_cursor class MongoDbRepository[ @@ -79,7 +79,7 @@ async def get_many( projection = self.out_model.projection(fields) query = filter.filter(self.document_model.find(self._scope)) if pagination.cursor is not None: - query = query.find(self.document_model.id > decode_cursor(pagination.cursor)) # pyright: ignore[reportOptionalOperand] + query = query.find(self.document_model.id > self.document_model.decode_cursor(cursor=pagination.cursor)) # pyright: ignore[reportOptionalOperand] docs = await query.sort(self.document_model.id).limit(pagination.limit + 1).project(projection).to_list() # pyright: ignore[reportArgumentType] has_more = len(docs) > pagination.limit items = docs[: pagination.limit] diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py index c0dfb57053..5d8056bc46 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py @@ -75,8 +75,8 @@ async def insert_contributions(self, contributions: list[ContributionIn]): Returns: list[Contribution]: inserted documents """ - structures, tables, attachments, struct_slices, table_slices, attach_slices = ( - await self._insert_components(contributions) + structures, tables, attachments, struct_slices, table_slices, attach_slices = await self._insert_components( + contributions ) full_docs: list[Contribution] = [] @@ -102,11 +102,7 @@ async def upsert_contributions(self, contributions: list[ContributionIn]): Returns: list[Contribution]: upserted documents """ - indices_with_components = [ - i - for i, c in enumerate(contributions) - if c.structures or c.tables or c.attachments - ] + indices_with_components = [i for i, c in enumerate(contributions) if c.structures or c.tables or c.attachments] if indices_with_components: raise ValidationError( "Components must be managed via their respective services, not via contribution upsert.", diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py index c54c763e68..9086ad8391 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py @@ -5,6 +5,7 @@ from fastapi_filter.contrib.beanie import Filter from pydantic import BaseModel, ConfigDict, Field, HttpUrl +from mpcontribs_api import pagination from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut from mpcontribs_api.types import PrefixedEmail, ShortStr @@ -63,6 +64,10 @@ class Project(BaseDocumentWithInput[ShortStr]): def from_input_model(cls, data: ProjectIn) -> Project: return cls(**data.model_dump()) + @staticmethod + def decode_cursor(cursor: str) -> str: + return pagination.decode_cursor(cursor) + class Settings: name = "projects" keep_nulls = False diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py index b85e40325c..37ba36526b 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py @@ -11,9 +11,7 @@ ) -class MongoDbTableRepository( - MongoDbRepository[Table, TableIn, TableDocumentOut, TableFilter, TablePatch] -): +class MongoDbTableRepository(MongoDbRepository[Table, TableIn, TableDocumentOut, TableFilter, TablePatch]): document_model = Table out_model = TableDocumentOut diff --git a/mpcontribs-api/tests/integration/db/test_contributions_repository.py b/mpcontribs-api/tests/integration/db/test_contributions_repository.py new file mode 100644 index 0000000000..396043a0f2 --- /dev/null +++ b/mpcontribs-api/tests/integration/db/test_contributions_repository.py @@ -0,0 +1,487 @@ +"""Database integration tests for MongoDbContributionRepository. + +These tests require a live MongoDB connection (see conftest.py). They exercise +the real Beanie/MongoDB layer: query scoping, field projection, cursor +pagination, bulk insert, single insert, find-one, update, delete-by-id, and +bulk delete — none of which can be verified with mocks. + +Run with: uv run pytest -m db +Skip with: uv run pytest -m "not db" +""" + +import pytest +from beanie import PydanticObjectId + +from mpcontribs_api.auth import User +from mpcontribs_api.domains.contributions.models import ( + Contribution, + ContributionFilter, + ContributionIn, + ContributionOut, + ContributionPatch, +) +from mpcontribs_api.domains.contributions.repository import MongoDbContributionRepository +from mpcontribs_api.exceptions import ValidationError +from mpcontribs_api.pagination import CursorParams + +pytestmark = [pytest.mark.db, pytest.mark.asyncio(loop_scope="session")] + + +# --------------------------------------------------------------------------- +# Helpers +# --------------------------------------------------------------------------- + +ADMIN = User(username="google:admin@example.com", groups=frozenset({"admin"})) +ALICE = User(username="google:alice@example.com", groups=frozenset({"mp-team"})) +BOB = User(username="google:bob@example.com", groups=frozenset()) +ANON = User() + + +def _repo(user: User = ADMIN) -> MongoDbContributionRepository: + return MongoDbContributionRepository(user) + + +def _contrib_in(project: str = "test-proj", identifier: str = "mp-1", **overrides) -> ContributionIn: + defaults: dict = { + "_id": PydanticObjectId(), + "project": project, + "identifier": identifier, + "formula": "Fe2O3", + "data": {"band_gap": 2.1}, + } + defaults.update(overrides) + return ContributionIn(**defaults) + + +async def _insert(project="test-proj", identifier="mp-1", is_public: bool = False, **overrides) -> Contribution: + # Build a Contribution directly so is_public can be set explicitly. + # from_input_model() always forces is_public=False, which is correct for + # user-submitted data but inconvenient for test setup. + doc = Contribution( + _id=PydanticObjectId(), + project=project, + identifier=identifier, + formula=overrides.pop("formula", "Fe2O3"), + data=overrides.pop("data", {"band_gap": 2.1}), + is_public=is_public, + **overrides, + ) + await doc.insert() + return doc + + +def _noop_filter() -> ContributionFilter: + return ContributionFilter() + + +# --------------------------------------------------------------------------- +# insert_contribution (single) +# --------------------------------------------------------------------------- + + +class TestInsertContribution: + async def test_inserted_document_is_retrievable(self, db): + doc = await _insert(identifier="ins-basic") + found = await Contribution.find_one(Contribution.id == doc.id) + assert found is not None + assert found.identifier == "ins-basic" + + async def test_is_public_defaults_to_false(self, db): + doc = await _insert(identifier="ins-priv") + found = await Contribution.find_one(Contribution.id == doc.id) + assert found.is_public is False + + async def test_fields_are_persisted(self, db): + doc = await _insert(project="proj-x", identifier="ins-fields", formula="Li2O", data={"x": 1}) + found = await Contribution.find_one(Contribution.id == doc.id) + assert found.project == "proj-x" + assert found.formula == "Li2O" + assert found.data == {"x": 1} + + async def test_insert_via_repo(self, db): + ci = _contrib_in(identifier="ins-via-repo") + doc = Contribution.from_input_model(ci) + result = await _repo().insert_contribution(doc) + found = await Contribution.find_one(Contribution.id == result.id) + assert found is not None + assert found.identifier == "ins-via-repo" + + +# --------------------------------------------------------------------------- +# insert_many_contributions (bulk) +# --------------------------------------------------------------------------- + + +class TestInsertManyContributions: + async def test_all_docs_persisted(self, db): + docs = [Contribution.from_input_model(_contrib_in(identifier=f"bulk-{i}")) for i in range(5)] + await _repo().insert_many_contributions(docs) + for doc in docs: + found = await Contribution.find_one(Contribution.id == doc.id) + assert found is not None + + async def test_returns_insert_result(self, db): + docs = [Contribution.from_input_model(_contrib_in(identifier=f"bulk-ret-{i}")) for i in range(3)] + result = await _repo().insert_many_contributions(docs) + assert result is not None + + async def test_empty_list_raises_type_error(self, db): + # Motor's insert_many requires at least one document; callers are + # responsible for guarding against empty batches. + with pytest.raises(TypeError, match="non-empty"): + await _repo().insert_many_contributions([]) + + +# --------------------------------------------------------------------------- +# get_contributions (scoped list + pagination + projection) +# --------------------------------------------------------------------------- + + +class TestGetContributions: + async def test_admin_sees_private_and_public(self, db): + p = await _insert(identifier="ga-pub", is_public=True) + pr = await _insert(identifier="ga-priv", is_public=False) + page = await _repo(ADMIN).get_contributions( + pagination=CursorParams(), filter=_noop_filter(), fields=None + ) + ids = {str(c.id) for c in page.items} + assert str(p.id) in ids + assert str(pr.id) in ids + + async def test_anonymous_sees_only_public(self, db): + pub = await _insert(identifier="anon-pub", is_public=True) + priv = await _insert(identifier="anon-priv", is_public=False) + page = await _repo(ANON).get_contributions( + pagination=CursorParams(), filter=_noop_filter(), fields=None + ) + ids = {str(c.id) for c in page.items} + assert str(pub.id) in ids + assert str(priv.id) not in ids + + async def test_authenticated_non_admin_sees_public(self, db): + pub = await _insert(identifier="alice-pub", is_public=True) + priv = await _insert(identifier="alice-priv", is_public=False) + page = await _repo(ALICE).get_contributions( + pagination=CursorParams(), filter=_noop_filter(), fields=None + ) + ids = {str(c.id) for c in page.items} + assert str(pub.id) in ids + assert str(priv.id) not in ids + + async def test_response_is_page_shape(self, db): + await _insert(identifier="pg-shape") + page = await _repo(ADMIN).get_contributions( + pagination=CursorParams(), filter=_noop_filter(), fields=None + ) + assert hasattr(page, "items") + assert hasattr(page, "next_cursor") + + async def test_limit_respected(self, db): + for i in range(5): + await _insert(identifier=f"lim-{i:02d}", is_public=True) + page = await _repo(ADMIN).get_contributions( + pagination=CursorParams(limit=3), filter=_noop_filter(), fields=None + ) + assert len(page.items) <= 3 + + async def test_cursor_paginates_forward(self, db): + for i in range(4): + await _insert(identifier=f"cur-{i:02d}", is_public=True) + p1 = await _repo(ADMIN).get_contributions( + pagination=CursorParams(limit=2), filter=_noop_filter(), fields=None + ) + assert p1.next_cursor is not None + p2 = await _repo(ADMIN).get_contributions( + pagination=CursorParams(limit=2, cursor=p1.next_cursor), filter=_noop_filter(), fields=None + ) + ids1 = {str(c.id) for c in p1.items} + ids2 = {str(c.id) for c in p2.items} + assert ids1.isdisjoint(ids2) + + async def test_all_items_covered_across_pages(self, db): + for i in range(5): + await _insert(identifier=f"all-pg-{i:02d}", is_public=True) + identifiers: set[str] = set() + cursor = None + while True: + page = await _repo(ADMIN).get_contributions( + pagination=CursorParams(limit=2, cursor=cursor), filter=_noop_filter(), fields=None + ) + identifiers.update(c.identifier for c in page.items if c.identifier) + cursor = page.next_cursor + if cursor is None: + break + assert all(f"all-pg-{i:02d}" in identifiers for i in range(5)) + + async def test_next_cursor_none_on_last_page(self, db): + for i in range(2): + await _insert(identifier=f"last-pg-{i:02d}", is_public=True) + page = await _repo(ADMIN).get_contributions( + pagination=CursorParams(limit=100), filter=_noop_filter(), fields=None + ) + assert page.next_cursor is None + + async def test_projection_returns_only_requested_fields(self, db): + await _insert(identifier="proj-fields", is_public=True) + fields = ContributionOut.parse_fields(["formula"]) + page = await _repo(ADMIN).get_contributions( + pagination=CursorParams(), filter=_noop_filter(), fields=fields + ) + assert len(page.items) >= 1 + item = page.items[0] + assert item.formula is not None + assert not hasattr(item, "data") + + async def test_filter_by_formula(self, db): + await _insert(identifier="flt-fe", formula="Fe2O3", is_public=True) + await _insert(identifier="flt-li", formula="Li2O", is_public=True) + f = ContributionFilter(formula="Fe2O3") + page = await _repo(ADMIN).get_contributions( + pagination=CursorParams(), filter=f, fields=None + ) + formulas = {c.formula for c in page.items} + assert formulas == {"Fe2O3"} + + async def test_filter_by_identifier_ilike(self, db): + await _insert(identifier="ilike-abc", is_public=True) + await _insert(identifier="ilike-xyz", is_public=True) + f = ContributionFilter(identifier__ilike="ilike-a") + page = await _repo(ADMIN).get_contributions( + pagination=CursorParams(), filter=f, fields=None + ) + identifiers = {c.identifier for c in page.items} + assert "ilike-abc" in identifiers + assert "ilike-xyz" not in identifiers + + async def test_filter_by_is_public(self, db): + await _insert(identifier="pub-only-pub", is_public=True) + await _insert(identifier="pub-only-priv", is_public=False) + f = ContributionFilter(is_public=True) + page = await _repo(ADMIN).get_contributions( + pagination=CursorParams(), filter=f, fields=None + ) + assert all(c.is_public is True for c in page.items) + + async def test_filter_by_needs_build(self, db): + await _insert(identifier="nb-true", needs_build=True, is_public=True) + await _insert(identifier="nb-false", needs_build=False, is_public=True) + f = ContributionFilter(needs_build=False) + page = await _repo(ADMIN).get_contributions( + pagination=CursorParams(), filter=f, fields=None + ) + identifiers = {c.identifier for c in page.items} + assert "nb-false" in identifiers + assert "nb-true" not in identifiers + + +# --------------------------------------------------------------------------- +# get_contribution_by_id +# --------------------------------------------------------------------------- + + +class TestGetContributionById: + async def test_returns_doc_for_valid_id(self, db): + doc = await _insert(identifier="get-id") + result = await _repo(ADMIN).get_contribution_by_id(str(doc.id), fields=None) + assert result is not None + assert result.identifier == "get-id" + + async def test_returns_none_for_missing_id(self, db): + result = await _repo(ADMIN).get_contribution_by_id(str(PydanticObjectId()), fields=None) + assert result is None + + async def test_admin_can_get_private_doc(self, db): + doc = await _insert(identifier="get-priv", is_public=False) + result = await _repo(ADMIN).get_contribution_by_id(str(doc.id), fields=None) + assert result is not None + + async def test_anon_cannot_get_private_doc(self, db): + doc = await _insert(identifier="get-anon-priv", is_public=False) + result = await _repo(ANON).get_contribution_by_id(str(doc.id), fields=None) + assert result is None + + async def test_anon_can_get_public_doc(self, db): + doc = await _insert(identifier="get-anon-pub", is_public=True) + result = await _repo(ANON).get_contribution_by_id(str(doc.id), fields=None) + assert result is not None + + async def test_raises_validation_error_for_bad_id_format(self, db): + with pytest.raises(ValidationError): + await _repo(ADMIN).get_contribution_by_id("not-an-objectid", fields=None) + + async def test_projection_limits_fields(self, db): + doc = await _insert(identifier="get-proj", is_public=True) + fields = ContributionOut.parse_fields(["formula"]) + result = await _repo(ADMIN).get_contribution_by_id(str(doc.id), fields=fields) + assert result is not None + assert result.formula == "Fe2O3" + assert not hasattr(result, "data") + + +# --------------------------------------------------------------------------- +# find_one_contribution (by project + identifier) +# --------------------------------------------------------------------------- + + +class TestFindOneContribution: + async def test_finds_existing_doc(self, db): + await _insert(project="find-proj", identifier="find-id") + result = await _repo(ADMIN).find_one_contribution("find-proj", "find-id") + assert result is not None + assert result.project == "find-proj" + assert result.identifier == "find-id" + + async def test_returns_none_for_missing_combination(self, db): + await _insert(project="miss-proj", identifier="miss-id") + result = await _repo(ADMIN).find_one_contribution("miss-proj", "wrong-id") + assert result is None + + async def test_scope_prevents_anon_finding_private(self, db): + await _insert(project="anon-scope", identifier="priv-doc", is_public=False) + result = await _repo(ANON).find_one_contribution("anon-scope", "priv-doc") + assert result is None + + async def test_scope_allows_anon_finding_public(self, db): + await _insert(project="anon-scope-pub", identifier="pub-doc", is_public=True) + result = await _repo(ANON).find_one_contribution("anon-scope-pub", "pub-doc") + assert result is not None + + async def test_project_identifier_combination_is_unique_lookup(self, db): + await _insert(project="same-proj", identifier="id-a") + await _insert(project="same-proj", identifier="id-b") + result = await _repo(ADMIN).find_one_contribution("same-proj", "id-a") + assert result is not None + assert result.identifier == "id-a" + + +# --------------------------------------------------------------------------- +# update_contribution +# --------------------------------------------------------------------------- + + +class TestUpdateContribution: + async def test_updates_single_field(self, db): + doc = await _insert(identifier="upd-formula") + await _repo(ADMIN).update_contribution(doc, {"formula": "SiO2"}) + found = await Contribution.find_one(Contribution.id == doc.id) + assert found.formula == "SiO2" + + async def test_updates_data_field(self, db): + doc = await _insert(identifier="upd-data") + await _repo(ADMIN).update_contribution(doc, {"data": {"energy": -5.0}}) + found = await Contribution.find_one(Contribution.id == doc.id) + assert found.data == {"energy": -5.0} + + async def test_unrelated_fields_unchanged(self, db): + doc = await _insert(identifier="upd-preserve", formula="Fe2O3") + await _repo(ADMIN).update_contribution(doc, {"needs_build": False}) + found = await Contribution.find_one(Contribution.id == doc.id) + assert found.formula == "Fe2O3" + + async def test_update_sets_last_modified(self, db): + doc = await _insert(identifier="upd-lm") + original_lm = doc.last_modified + await _repo(ADMIN).update_contribution(doc, {"formula": "Al2O3"}) + found = await Contribution.find_one(Contribution.id == doc.id) + # MongoDB may return naive UTC datetimes; strip timezone before comparing. + def _naive(dt): + return dt.replace(tzinfo=None) if dt.tzinfo else dt + assert _naive(found.last_modified) >= _naive(original_lm) + + +# --------------------------------------------------------------------------- +# patch_contribution_by_id +# --------------------------------------------------------------------------- + + +class TestPatchContributionById: + async def test_updates_formula(self, db): + doc = await _insert(identifier="patch-formula") + await _repo(ADMIN).patch_contribution_by_id(str(doc.id), ContributionPatch(formula="Li2O")) + found = await Contribution.find_one(Contribution.id == doc.id) + assert found.formula == "Li2O" + + async def test_unset_fields_not_overwritten(self, db): + doc = await _insert(identifier="patch-preserve", formula="Fe2O3") + await _repo(ADMIN).patch_contribution_by_id(str(doc.id), ContributionPatch(needs_build=False)) + found = await Contribution.find_one(Contribution.id == doc.id) + assert found.formula == "Fe2O3" + + async def test_empty_patch_is_a_noop(self, db): + doc = await _insert(identifier="patch-empty", formula="Fe2O3") + result = await _repo(ADMIN).patch_contribution_by_id(str(doc.id), ContributionPatch()) + assert result is not None + found = await Contribution.find_one(Contribution.id == doc.id) + assert found.formula == "Fe2O3" + + async def test_raises_validation_error_for_bad_id(self, db): + with pytest.raises(ValidationError): + await _repo(ADMIN).patch_contribution_by_id("bad-id", ContributionPatch(formula="X")) + + async def test_anon_cannot_patch_private_doc(self, db): + from mpcontribs_api.exceptions import NotFoundError + doc = await _insert(identifier="patch-anon-priv", is_public=False) + with pytest.raises(NotFoundError): + await _repo(ANON).patch_contribution_by_id(str(doc.id), ContributionPatch(formula="X")) + + +# --------------------------------------------------------------------------- +# delete_contribution_by_id +# --------------------------------------------------------------------------- + + +class TestDeleteContributionById: + async def test_deleted_doc_not_found_afterwards(self, db): + doc = await _insert(identifier="del-me") + await _repo(ADMIN).delete_contribution_by_id(str(doc.id)) + found = await Contribution.find_one(Contribution.id == doc.id) + assert found is None + + async def test_delete_nonexistent_is_silent(self, db): + await _repo(ADMIN).delete_contribution_by_id(str(PydanticObjectId())) + + async def test_raises_validation_error_for_bad_id(self, db): + with pytest.raises(ValidationError): + await _repo(ADMIN).delete_contribution_by_id("not-an-id") + + async def test_anon_cannot_delete_private_doc(self, db): + doc = await _insert(identifier="del-anon-priv", is_public=False) + await _repo(ANON).delete_contribution_by_id(str(doc.id)) + # Scope prevents anonymous from seeing the doc, so it is never deleted. + still_there = await Contribution.find_one(Contribution.id == doc.id) + assert still_there is not None + + +# --------------------------------------------------------------------------- +# delete_contributions (bulk with filter) +# --------------------------------------------------------------------------- + + +class TestDeleteContributions: + async def test_bulk_delete_all(self, db): + for i in range(3): + await _insert(identifier=f"bdel-{i:02d}") + await _repo(ADMIN).delete_contributions(_noop_filter()) + remaining = await Contribution.find().to_list() + assert len(remaining) == 0 + + async def test_bulk_delete_with_filter(self, db): + await _insert(identifier="bdel-keep", formula="Li2O") + await _insert(identifier="bdel-drop", formula="Fe2O3") + f = ContributionFilter(formula="Fe2O3") + await _repo(ADMIN).delete_contributions(f) + remaining = await Contribution.find().to_list() + assert len(remaining) == 1 + assert remaining[0].identifier == "bdel-keep" + + async def test_bulk_delete_empty_collection_is_silent(self, db): + await _repo(ADMIN).delete_contributions(_noop_filter()) + + async def test_scope_limits_what_anon_can_delete(self, db): + await _insert(identifier="bdel-scope-pub", is_public=True) + await _insert(identifier="bdel-scope-priv", is_public=False) + await _repo(ANON).delete_contributions(_noop_filter()) + # Anonymous scope: only public visible, so only the public doc is deleted. + remaining = await Contribution.find().to_list() + identifiers = {d.identifier for d in remaining} + assert "bdel-scope-priv" in identifiers diff --git a/mpcontribs-api/tests/unit/domains/test_contribution_service.py b/mpcontribs-api/tests/unit/domains/test_contribution_service.py new file mode 100644 index 0000000000..e122159622 --- /dev/null +++ b/mpcontribs-api/tests/unit/domains/test_contribution_service.py @@ -0,0 +1,569 @@ +"""Unit tests for ContributionService. + +All database access is replaced with AsyncMock repositories so no MongoDB +connection is needed. These tests verify: + - _insert_components: slice bookkeeping and delegation to component repos + - insert_contributions: Link wiring and bulk-insert delegation + - upsert_contributions: guard against components, insert vs update branching +""" + +from unittest.mock import AsyncMock, MagicMock + +import polars as pl +import pytest +from beanie import PydanticObjectId +from pymatgen.core import Element + +from mpcontribs_api.domains.attachments.models import Attachment, AttachmentIn +from mpcontribs_api.domains.contributions.models import Contribution, ContributionIn +from mpcontribs_api.domains.contributions.service import ContributionService +from mpcontribs_api.domains.structures.models import ( + Lattice, + Site, + SiteProperties, + Species, + Structure, + StructureIn, +) +from mpcontribs_api.domains.tables.models import Attributes, Labels, Table, TableIn +from mpcontribs_api.exceptions import ValidationError + +pytestmark = pytest.mark.asyncio + + +# --------------------------------------------------------------------------- +# Helpers +# --------------------------------------------------------------------------- + + +def _oid() -> PydanticObjectId: + return PydanticObjectId() + + +def _attachment_in(**overrides) -> AttachmentIn: + defaults = { + "_id": _oid(), + "name": "data.gz", + "md5": "a" * 32, + "mime": "application/gzip", + "content": 0, + } + defaults.update(overrides) + return AttachmentIn(**defaults) + + +def _table_in(**overrides) -> TableIn: + defaults = { + "_id": _oid(), + "name": "test-table", + "md5": "b" * 32, + "attrs": Attributes(title="T", labels=Labels(index="x", value="y", variable="z")), + "total_data_rows": 1, + "data": pl.DataFrame({"col": [1.0]}), + } + defaults.update(overrides) + return TableIn(**defaults) + + +def _structure_in(**overrides) -> StructureIn: + defaults = { + "_id": _oid(), + "name": "test-struct", + "md5": "c" * 32, + "lattice": Lattice( + matrix=pl.DataFrame([[1.0, 0.0, 0.0], [0.0, 1.0, 0.0], [0.0, 0.0, 1.0]]), + pbc=[True, True, True], + a=1.0, b=1.0, c=1.0, + alpha=90.0, beta=90.0, gamma=90.0, + volume=1.0, + ), + "sites": [ + Site( + species=[Species(element=Element("Fe"), occu=1)], + abc=[0.0, 0.0, 0.0], + properties=SiteProperties(magmom=0.0), + label="Fe", + xyz=[0.0, 0.0, 0.0], + ) + ], + "charge": None, + "cif": "", + } + defaults.update(overrides) + return StructureIn(**defaults) + + +def _contrib_in(project="proj", identifier="mp-1", formula="Fe2O3", **kwargs) -> ContributionIn: + return ContributionIn( + _id=_oid(), + project=project, + identifier=identifier, + formula=formula, + data={}, + **kwargs, + ) + + +def _make_service( + contributions=None, + structures=None, + tables=None, + attachments=None, +) -> tuple[ContributionService, AsyncMock, AsyncMock, AsyncMock, AsyncMock]: + contrib_repo = contributions or AsyncMock() + struct_repo = structures or AsyncMock() + table_repo = tables or AsyncMock() + attach_repo = attachments or AsyncMock() + svc = ContributionService( + contributions=contrib_repo, + structures=struct_repo, + tables=table_repo, + attachments=attach_repo, + ) + return svc, contrib_repo, struct_repo, table_repo, attach_repo + + +def _fake_structure() -> Structure: + s = MagicMock(spec=Structure) + s.id = _oid() + return s + + +def _fake_table() -> Table: + t = MagicMock(spec=Table) + t.id = _oid() + return t + + +def _fake_attachment() -> Attachment: + a = MagicMock(spec=Attachment) + a.id = _oid() + return a + + +# --------------------------------------------------------------------------- +# _insert_components +# --------------------------------------------------------------------------- + + +class TestInsertComponents: + async def test_empty_batch_calls_repos_with_empty_lists(self): + svc, _, struct_repo, table_repo, attach_repo = _make_service() + struct_repo.insert_structures.return_value = [] + table_repo.insert_tables.return_value = [] + attach_repo.insert_attachments.return_value = [] + + structures, tables, attachments, ss, ts, ats = await svc._insert_components([]) + + struct_repo.insert_structures.assert_called_once_with([]) + table_repo.insert_tables.assert_called_once_with([]) + attach_repo.insert_attachments.assert_called_once_with([]) + assert structures == [] + assert tables == [] + assert attachments == [] + assert ss == [] + assert ts == [] + assert ats == [] + + async def test_single_contrib_no_components_produces_empty_slices(self): + svc, _, struct_repo, table_repo, attach_repo = _make_service() + struct_repo.insert_structures.return_value = [] + table_repo.insert_tables.return_value = [] + attach_repo.insert_attachments.return_value = [] + + contrib = _contrib_in() + _, _, _, ss, ts, ats = await svc._insert_components([contrib]) + + assert ss == [slice(0, 0)] + assert ts == [slice(0, 0)] + assert ats == [slice(0, 0)] + + async def test_slices_are_contiguous_and_non_overlapping(self): + svc, _, struct_repo, table_repo, attach_repo = _make_service() + + struct_repo.insert_structures.return_value = [_fake_structure()] * 3 + table_repo.insert_tables.return_value = [] + attach_repo.insert_attachments.return_value = [] + + contrib_a = _contrib_in(identifier="a", structures=[_structure_in()]) + contrib_b = _contrib_in(identifier="b", structures=[_structure_in(), _structure_in()]) + contrib_c = _contrib_in(identifier="c") + + _, _, _, ss, _, _ = await svc._insert_components([contrib_a, contrib_b, contrib_c]) + + assert ss[0] == slice(0, 1) # contrib_a: 1 structure + assert ss[1] == slice(1, 3) # contrib_b: 2 structures + assert ss[2] == slice(3, 3) # contrib_c: 0 structures + + async def test_all_component_types_collected_and_dispatched(self): + svc, _, struct_repo, table_repo, attach_repo = _make_service() + + struct_repo.insert_structures.return_value = [_fake_structure()] + table_repo.insert_tables.return_value = [_fake_table()] + attach_repo.insert_attachments.return_value = [_fake_attachment()] + + contrib = _contrib_in( + structures=[_structure_in()], + tables=[_table_in()], + attachments=[_attachment_in()], + ) + + await svc._insert_components([contrib]) + + struct_repo.insert_structures.assert_called_once() + table_repo.insert_tables.assert_called_once() + attach_repo.insert_attachments.assert_called_once() + # Verify correct counts were forwarded + assert len(struct_repo.insert_structures.call_args[0][0]) == 1 + assert len(table_repo.insert_tables.call_args[0][0]) == 1 + assert len(attach_repo.insert_attachments.call_args[0][0]) == 1 + + async def test_multiple_contribs_components_concatenated_before_insert(self): + svc, _, struct_repo, table_repo, attach_repo = _make_service() + + struct_repo.insert_structures.return_value = [_fake_structure()] * 3 + table_repo.insert_tables.return_value = [] + attach_repo.insert_attachments.return_value = [] + + c1 = _contrib_in(identifier="c1", structures=[_structure_in()]) + c2 = _contrib_in(identifier="c2", structures=[_structure_in(), _structure_in()]) + + await svc._insert_components([c1, c2]) + + struct_repo.insert_structures.assert_called_once() + assert len(struct_repo.insert_structures.call_args[0][0]) == 3 + + +# --------------------------------------------------------------------------- +# insert_contributions +# --------------------------------------------------------------------------- + + +class TestInsertContributions: + async def test_delegates_to_insert_many(self): + svc, contrib_repo, struct_repo, table_repo, attach_repo = _make_service() + + struct_repo.insert_structures.return_value = [] + table_repo.insert_tables.return_value = [] + attach_repo.insert_attachments.return_value = [] + contrib_repo.insert_many_contributions.return_value = MagicMock() + + contribs = [_contrib_in(identifier=f"mp-{i}") for i in range(3)] + await svc.insert_contributions(contribs) + + contrib_repo.insert_many_contributions.assert_called_once() + inserted_docs = contrib_repo.insert_many_contributions.call_args[0][0] + assert len(inserted_docs) == 3 + + async def test_is_public_forced_false_on_all_docs(self): + svc, contrib_repo, struct_repo, table_repo, attach_repo = _make_service() + + struct_repo.insert_structures.return_value = [] + table_repo.insert_tables.return_value = [] + attach_repo.insert_attachments.return_value = [] + contrib_repo.insert_many_contributions.return_value = MagicMock() + + contribs = [_contrib_in(identifier="mp-1")] + await svc.insert_contributions(contribs) + + docs = contrib_repo.insert_many_contributions.call_args[0][0] + assert all(d.is_public is False for d in docs) + + async def test_structure_links_wired_correctly(self): + svc, contrib_repo, struct_repo, table_repo, attach_repo = _make_service() + + fake_struct = _fake_structure() + struct_repo.insert_structures.return_value = [fake_struct] + table_repo.insert_tables.return_value = [] + attach_repo.insert_attachments.return_value = [] + contrib_repo.insert_many_contributions.return_value = MagicMock() + + contrib = _contrib_in(structures=[_structure_in()]) + await svc.insert_contributions([contrib]) + + doc = contrib_repo.insert_many_contributions.call_args[0][0][0] + assert doc.structures == [fake_struct] + + async def test_table_links_wired_correctly(self): + svc, contrib_repo, struct_repo, table_repo, attach_repo = _make_service() + + fake_table = _fake_table() + struct_repo.insert_structures.return_value = [] + table_repo.insert_tables.return_value = [fake_table] + attach_repo.insert_attachments.return_value = [] + contrib_repo.insert_many_contributions.return_value = MagicMock() + + contrib = _contrib_in(tables=[_table_in()]) + await svc.insert_contributions([contrib]) + + doc = contrib_repo.insert_many_contributions.call_args[0][0][0] + assert doc.tables == [fake_table] + + async def test_attachment_links_wired_correctly(self): + svc, contrib_repo, struct_repo, table_repo, attach_repo = _make_service() + + fake_attach = _fake_attachment() + struct_repo.insert_structures.return_value = [] + table_repo.insert_tables.return_value = [] + attach_repo.insert_attachments.return_value = [fake_attach] + contrib_repo.insert_many_contributions.return_value = MagicMock() + + contrib = _contrib_in(attachments=[_attachment_in()]) + await svc.insert_contributions([contrib]) + + doc = contrib_repo.insert_many_contributions.call_args[0][0][0] + assert doc.attachments == [fake_attach] + + async def test_no_components_sets_links_to_none(self): + svc, contrib_repo, struct_repo, table_repo, attach_repo = _make_service() + + struct_repo.insert_structures.return_value = [] + table_repo.insert_tables.return_value = [] + attach_repo.insert_attachments.return_value = [] + contrib_repo.insert_many_contributions.return_value = MagicMock() + + await svc.insert_contributions([_contrib_in()]) + + doc = contrib_repo.insert_many_contributions.call_args[0][0][0] + assert doc.structures is None + assert doc.tables is None + assert doc.attachments is None + + async def test_each_contrib_gets_only_its_own_components(self): + """Components belonging to contrib A must not bleed into contrib B.""" + svc, contrib_repo, struct_repo, table_repo, attach_repo = _make_service() + + s_a, s_b1, s_b2 = _fake_structure(), _fake_structure(), _fake_structure() + struct_repo.insert_structures.return_value = [s_a, s_b1, s_b2] + table_repo.insert_tables.return_value = [] + attach_repo.insert_attachments.return_value = [] + contrib_repo.insert_many_contributions.return_value = MagicMock() + + c_a = _contrib_in(identifier="a", structures=[_structure_in()]) + c_b = _contrib_in(identifier="b", structures=[_structure_in(), _structure_in()]) + + await svc.insert_contributions([c_a, c_b]) + + docs = contrib_repo.insert_many_contributions.call_args[0][0] + assert docs[0].structures == [s_a] + assert docs[1].structures == [s_b1, s_b2] + + async def test_empty_batch_still_calls_insert_many(self): + svc, contrib_repo, struct_repo, table_repo, attach_repo = _make_service() + + struct_repo.insert_structures.return_value = [] + table_repo.insert_tables.return_value = [] + attach_repo.insert_attachments.return_value = [] + contrib_repo.insert_many_contributions.return_value = MagicMock() + + await svc.insert_contributions([]) + + contrib_repo.insert_many_contributions.assert_called_once_with([]) + + +# --------------------------------------------------------------------------- +# upsert_contributions — guard clause +# --------------------------------------------------------------------------- + + +class TestUpsertContributionsGuard: + async def test_raises_validation_error_when_any_contrib_has_structures(self): + svc, *_ = _make_service() + contrib = _contrib_in(structures=[_structure_in()]) + with pytest.raises(ValidationError): + await svc.upsert_contributions([contrib]) + + async def test_raises_validation_error_when_any_contrib_has_tables(self): + svc, *_ = _make_service() + contrib = _contrib_in(tables=[_table_in()]) + with pytest.raises(ValidationError): + await svc.upsert_contributions([contrib]) + + async def test_raises_validation_error_when_any_contrib_has_attachments(self): + svc, *_ = _make_service() + contrib = _contrib_in(attachments=[_attachment_in()]) + with pytest.raises(ValidationError): + await svc.upsert_contributions([contrib]) + + async def test_error_reports_indices_of_offending_contribs(self): + svc, *_ = _make_service() + clean = _contrib_in(identifier="clean") + dirty = _contrib_in(identifier="dirty", structures=[_structure_in()]) + with pytest.raises(ValidationError) as exc_info: + await svc.upsert_contributions([clean, dirty]) + assert exc_info.value.context.get("contribution_indices") == [1] + + async def test_multiple_offenders_all_indices_reported(self): + svc, *_ = _make_service() + contribs = [ + _contrib_in(identifier="c0", structures=[_structure_in()]), + _contrib_in(identifier="c1"), + _contrib_in(identifier="c2", tables=[_table_in()]), + ] + with pytest.raises(ValidationError) as exc_info: + await svc.upsert_contributions(contribs) + assert exc_info.value.context.get("contribution_indices") == [0, 2] + + async def test_raises_before_any_db_write(self): + svc, contrib_repo, *_ = _make_service() + dirty = _contrib_in(structures=[_structure_in()]) + with pytest.raises(ValidationError): + await svc.upsert_contributions([dirty]) + contrib_repo.find_one_contribution.assert_not_called() + contrib_repo.insert_contribution.assert_not_called() + contrib_repo.update_contribution.assert_not_called() + + +# --------------------------------------------------------------------------- +# upsert_contributions — insert path (no existing doc) +# --------------------------------------------------------------------------- + + +class TestUpsertContributionsInsertPath: + async def test_insert_called_when_no_existing_doc(self): + svc, contrib_repo, *_ = _make_service() + contrib_repo.find_one_contribution.return_value = None + inserted = MagicMock(spec=Contribution) + contrib_repo.insert_contribution.return_value = inserted + + result = await svc.upsert_contributions([_contrib_in()]) + + contrib_repo.insert_contribution.assert_called_once() + assert result[0] is inserted + + async def test_new_doc_is_public_false(self): + svc, contrib_repo, *_ = _make_service() + contrib_repo.find_one_contribution.return_value = None + + captured = [] + + async def _capture(doc): + captured.append(doc) + return doc + + contrib_repo.insert_contribution.side_effect = _capture + + await svc.upsert_contributions([_contrib_in()]) + + assert len(captured) == 1 + assert captured[0].is_public is False + + async def test_find_uses_project_and_identifier(self): + svc, contrib_repo, *_ = _make_service() + contrib_repo.find_one_contribution.return_value = None + contrib_repo.insert_contribution.return_value = MagicMock(spec=Contribution) + + contrib = _contrib_in(project="my-proj", identifier="mp-99") + await svc.upsert_contributions([contrib]) + + contrib_repo.find_one_contribution.assert_called_once_with("my-proj", "mp-99") + + async def test_update_not_called_on_insert_path(self): + svc, contrib_repo, *_ = _make_service() + contrib_repo.find_one_contribution.return_value = None + contrib_repo.insert_contribution.return_value = MagicMock(spec=Contribution) + + await svc.upsert_contributions([_contrib_in()]) + + contrib_repo.update_contribution.assert_not_called() + + +# --------------------------------------------------------------------------- +# upsert_contributions — update path (existing doc found) +# --------------------------------------------------------------------------- + + +class TestUpsertContributionsUpdatePath: + async def test_update_called_when_existing_doc_found(self): + svc, contrib_repo, *_ = _make_service() + existing = MagicMock(spec=Contribution) + contrib_repo.find_one_contribution.return_value = existing + contrib_repo.update_contribution.return_value = None + + await svc.upsert_contributions([_contrib_in()]) + + contrib_repo.update_contribution.assert_called_once() + + async def test_returns_existing_doc_on_update(self): + svc, contrib_repo, *_ = _make_service() + existing = MagicMock(spec=Contribution) + contrib_repo.find_one_contribution.return_value = existing + contrib_repo.update_contribution.return_value = None + + result = await svc.upsert_contributions([_contrib_in()]) + + assert result[0] is existing + + async def test_insert_not_called_on_update_path(self): + svc, contrib_repo, *_ = _make_service() + existing = MagicMock(spec=Contribution) + contrib_repo.find_one_contribution.return_value = existing + contrib_repo.update_contribution.return_value = None + + await svc.upsert_contributions([_contrib_in()]) + + contrib_repo.insert_contribution.assert_not_called() + + async def test_update_data_excludes_id(self): + svc, contrib_repo, *_ = _make_service() + existing = MagicMock(spec=Contribution) + contrib_repo.find_one_contribution.return_value = existing + contrib_repo.update_contribution.return_value = None + + await svc.upsert_contributions([_contrib_in(formula="SiO2")]) + + update_data = contrib_repo.update_contribution.call_args[0][1] + assert "id" not in update_data + + async def test_update_data_excludes_none_fields(self): + svc, contrib_repo, *_ = _make_service() + existing = MagicMock(spec=Contribution) + contrib_repo.find_one_contribution.return_value = existing + contrib_repo.update_contribution.return_value = None + + await svc.upsert_contributions([_contrib_in(formula="SiO2")]) + + update_data = contrib_repo.update_contribution.call_args[0][1] + assert all(v is not None for v in update_data.values()) + + +# --------------------------------------------------------------------------- +# upsert_contributions — concurrent batch behavior +# --------------------------------------------------------------------------- + + +class TestUpsertContributionsBatch: + async def test_all_contribs_processed(self): + svc, contrib_repo, *_ = _make_service() + contrib_repo.find_one_contribution.return_value = None + contrib_repo.insert_contribution.return_value = MagicMock(spec=Contribution) + + contribs = [_contrib_in(identifier=f"mp-{i}") for i in range(5)] + results = await svc.upsert_contributions(contribs) + + assert len(results) == 5 + assert contrib_repo.insert_contribution.call_count == 5 + + async def test_mixed_insert_and_update_batch(self): + svc, contrib_repo, *_ = _make_service() + existing = MagicMock(spec=Contribution) + + async def _find(project, identifier): + return existing if identifier == "mp-0" else None + + contrib_repo.find_one_contribution.side_effect = _find + contrib_repo.update_contribution.return_value = None + contrib_repo.insert_contribution.return_value = MagicMock(spec=Contribution) + + contribs = [_contrib_in(identifier=f"mp-{i}") for i in range(3)] + await svc.upsert_contributions(contribs) + + assert contrib_repo.update_contribution.call_count == 1 + assert contrib_repo.insert_contribution.call_count == 2 + + async def test_empty_batch_returns_empty_list(self): + svc, *_ = _make_service() + results = await svc.upsert_contributions([]) + assert results == [] + + diff --git a/mpcontribs-api/tests/unit/domains/test_contributions_models.py b/mpcontribs-api/tests/unit/domains/test_contributions_models.py index 9b08da5121..f6ce20b89d 100644 --- a/mpcontribs-api/tests/unit/domains/test_contributions_models.py +++ b/mpcontribs-api/tests/unit/domains/test_contributions_models.py @@ -4,6 +4,9 @@ from beanie import PydanticObjectId from pydantic import ValidationError as PydanticValidationError +from mpcontribs_api.auth import User +from mpcontribs_api.domains.contributions.repository import MongoDbContributionRepository + from mpcontribs_api.domains.contributions.models import ( Contribution, ContributionIn, @@ -178,3 +181,45 @@ def test_partial_patch(self): def test_data_can_be_set(self): patch = ContributionPatch(data={"new_key": 42}) assert patch.data == {"new_key": 42} + + +# --------------------------------------------------------------------------- +# MongoDbContributionRepository._build_scope (pure logic, no DB needed) +# --------------------------------------------------------------------------- + +_ADMIN = User(username="google:admin@example.com", groups=frozenset({"admin"})) +_ALICE = User(username="google:alice@example.com", groups=frozenset({"mp-team"})) +_ANON = User() + + +class TestContributionRepoScope: + def test_admin_scope_is_empty(self): + assert MongoDbContributionRepository._build_scope(_ADMIN) == {} + + def test_anon_scope_has_or_clause(self): + scope = MongoDbContributionRepository._build_scope(_ANON) + assert "$or" in scope + + def test_anon_scope_includes_is_public_true(self): + ors = MongoDbContributionRepository._build_scope(_ANON)["$or"] + assert any(c == {"is_public": True} for c in ors) + + def test_anon_scope_has_no_group_id_clause(self): + ors = MongoDbContributionRepository._build_scope(_ANON)["$or"] + assert not any("_id" in c for c in ors) + + def test_authed_user_scope_includes_is_public(self): + ors = MongoDbContributionRepository._build_scope(_ALICE)["$or"] + assert any(c == {"is_public": True} for c in ors) + + def test_authed_user_with_groups_has_group_id_clause(self): + user = User(username="u@example.com", groups=frozenset({"g1", "g2"})) + ors = MongoDbContributionRepository._build_scope(user)["$or"] + group_clause = next((c for c in ors if "_id" in c), None) + assert group_clause is not None + assert set(group_clause["_id"]["$in"]) == {"g1", "g2"} + + def test_authed_user_no_groups_has_no_group_id_clause(self): + user = User(username="u@example.com", groups=frozenset()) + ors = MongoDbContributionRepository._build_scope(user)["$or"] + assert not any("_id" in c for c in ors) From 4bb92e2aa074b98b8ba8fa82b15b6f3a3010ff07 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Fri, 5 Jun 2026 19:31:15 -0700 Subject: [PATCH 073/591] Added docstrings --- mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py | 1 + .../src/mpcontribs_api/domains/_shared/repository.py | 3 ++- mpcontribs-api/src/mpcontribs_api/domains/projects/models.py | 4 ++++ mpcontribs-api/src/mpcontribs_api/pagination.py | 5 +++++ 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py index f76377c4e0..3f82b2455e 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py @@ -29,6 +29,7 @@ def from_input_model(cls, data: Any) -> Self: @staticmethod def decode_cursor(cursor: str) -> str | PydanticObjectId: + """Decodes the cursor the an ObjectId""" return PydanticObjectId(pagination.decode_cursor(cursor=cursor)) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py index e062af187c..3610b15a76 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py @@ -54,10 +54,11 @@ def _build_scope(user: User) -> dict[str, Any]: ... def _convert_object_id(self, id: str) -> PydanticObjectId: + """Converts the string representation of an ObjectId to an ObjectId""" try: return PydanticObjectId(id) except InvalidId: - raise ValidationError(f"Incorrect Id format: {id}. Must be MongoDB ObjectId format.") from None + raise ValidationError("Incorrect Id format. Must be MongoDB ObjectId format.", id=id) from None def _not_found(self, id: str) -> str: """Build a not-found message naming this repository's resource.""" diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py index 9086ad8391..15a4758879 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py @@ -66,6 +66,10 @@ def from_input_model(cls, data: ProjectIn) -> Project: @staticmethod def decode_cursor(cursor: str) -> str: + """Decodes cursor and returns it as a str. + + Needs override over parent class since Project.id is a simple str + """ return pagination.decode_cursor(cursor) class Settings: diff --git a/mpcontribs-api/src/mpcontribs_api/pagination.py b/mpcontribs-api/src/mpcontribs_api/pagination.py index 2e7929d7d8..e978a613f9 100644 --- a/mpcontribs-api/src/mpcontribs_api/pagination.py +++ b/mpcontribs-api/src/mpcontribs_api/pagination.py @@ -27,10 +27,15 @@ class Page[T](BaseModel): def encode_cursor(last_id: str) -> str: + """Base64 encodes a cursor for pagination + + Uses base64 instead of raw str to prevent manual tampering from users + """ return base64.urlsafe_b64encode(last_id.encode()).decode() def decode_cursor(cursor: str) -> str: + """Base64 decodes a cursor for pagination""" try: return base64.urlsafe_b64decode(cursor.encode()).decode() except ValueError, UnicodeDecodeError: From 82760161135e2598369d2866cdb38b3e93317404 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 8 Jun 2026 11:19:35 -0700 Subject: [PATCH 074/591] Inserting many contributions now uses multi-document transactions rather than unsafe raw async --- mpcontribs-api/src/mpcontribs_api/config.py | 37 +- .../src/mpcontribs_api/dependencies.py | 8 + .../mpcontribs_api/domains/_shared/bulk.py | 39 ++ .../domains/attachments/repository.py | 19 +- .../domains/contributions/dependencies.py | 5 +- .../domains/contributions/models.py | 12 + .../domains/contributions/repository.py | 25 +- .../domains/contributions/router.py | 4 +- .../domains/contributions/service.py | 245 ++++++++--- .../domains/structures/repository.py | 19 +- .../domains/tables/repository.py | 19 +- .../unit/domains/test_contribution_service.py | 392 +++++++++++------- 12 files changed, 594 insertions(+), 230 deletions(-) create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/_shared/bulk.py diff --git a/mpcontribs-api/src/mpcontribs_api/config.py b/mpcontribs-api/src/mpcontribs_api/config.py index 824ede959c..c60545f086 100644 --- a/mpcontribs-api/src/mpcontribs_api/config.py +++ b/mpcontribs-api/src/mpcontribs_api/config.py @@ -1,7 +1,7 @@ from functools import lru_cache from typing import Literal -from pydantic import BaseModel, Field, SecretStr +from pydantic import BaseModel, Field, SecretStr, model_validator from pydantic_settings import BaseSettings, SettingsConfigDict @@ -29,7 +29,7 @@ class MongoSettings(BaseModel): ) min_pool_size: int = Field( default=0, - description="Minimum number of concurent connections that the pool will maintain connected to each server", + description="Minimum number of concurent connections that the pool will maintain connected to each server ", ) datetime_conversion: Literal["datetime_ms", "datetime", "datetime_auto", "datetime_clamp"] = Field( default="datetime", @@ -37,17 +37,44 @@ class MongoSettings(BaseModel): ) server_selection_timeout_ms: int = Field( default=30000, - description="Controls how long (in milliseconds) the driver will wait to find an available, appropriate server" + description="Controls how long (in milliseconds) the driver will wait to find an available, appropriate server " "to carry out a database operation;" "while it is waiting, multiple server monitoring operations may be carried out", ) admin_group: str = Field( default="admin", - description="Name of admin group to consider in requests to MongoDB. Not directly passed to Mongo, but consumed" - "by auth.", + description="Name of admin group to consider in requests to MongoDB. Not directly passed to Mongo, but " + "consumed by auth.", ) + # TODO: Tune default + max_concurrent_transactions: int = Field( + default=16, + description="Upper bound on per-contribution transactions running in parallel during a bulk insert. Clamped at " + "construction to max_pool_size // 2 so reads on the same request can still acquire connections.", + ) + # TODO: Tune default + max_components_per_contribution: int = Field( + default=500, + description="Hard ceiling on structures + tables + attachments for a single contribution. Anything larger is " + "rejected upfront so we don't burn a transaction slot on a request guaranteed to exceed " + "transactionLifetimeLimitSeconds (default 60s).", + ) + # TODO: Tune default + component_insert_chunk_size: int = Field( + default=100, + description="Batch size used by component repositories when chunking insert_many calls inside a transaction.", + ) + + @model_validator(mode="after") + def _clamp_max_concurrent_transactions(self): + if self.max_pool_size: + cap = max(1, self.max_pool_size // 2) + if self.max_concurrent_transactions > cap: + self.max_concurrent_transactions = cap + return self + class Settings(BaseSettings): model_config = SettingsConfigDict( diff --git a/mpcontribs-api/src/mpcontribs_api/dependencies.py b/mpcontribs-api/src/mpcontribs_api/dependencies.py index b34fe1567c..83e31ba38a 100644 --- a/mpcontribs-api/src/mpcontribs_api/dependencies.py +++ b/mpcontribs-api/src/mpcontribs_api/dependencies.py @@ -3,6 +3,7 @@ import structlog from fastapi import Depends, Header, Request +from pymongo import AsyncMongoClient from pymongo.asynchronous.database import AsyncDatabase from mpcontribs_api.auth import User @@ -31,6 +32,13 @@ def get_db(request: Request) -> AsyncDatabase: DbDep = Annotated[AsyncDatabase, Depends(get_db)] +def get_mongo_client(request: Request) -> AsyncMongoClient: + return request.app.state.mongo_client + + +MongoClientDep = Annotated[AsyncMongoClient, Depends(get_mongo_client)] + + def _split(raw: str | None) -> set[str]: return {g.strip() for g in (raw or "").split(",") if g.strip()} diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/bulk.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/bulk.py new file mode 100644 index 0000000000..c76784e241 --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/bulk.py @@ -0,0 +1,39 @@ +from typing import Any + +from pydantic import BaseModel + +from mpcontribs_api.exceptions import AppError + + +class BulkFailure(BaseModel): + """A single failed item in a bulk write, identified by its position in the input batch.""" + + index: int + identifier: dict[str, Any] | None = None + error_code: str + message: str + + +class BulkWriteSummary[T](BaseModel): + """Result of a bulk write that supports per-item failure reporting. + + ``total`` is the size of the input batch (succeeded + failed). ``succeeded`` carries the + fully inserted documents; ``failed`` carries one ``BulkFailure`` per rejected item, with + enough context for the caller to retry just those items. + """ + + total: int + succeeded: list[T] + failed: list[BulkFailure] + + +def bulk_failure_from_exception(index: int, identifier: dict[str, Any] | None, exc: BaseException) -> BulkFailure: + """Translate any exception into a BulkFailure entry. + + ``AppError`` subclasses contribute their ``error_code`` and ``message``; everything else + collapses to ``internal_error`` with the exception class name in the message so we don't + leak tracebacks or framework internals to the client. + """ + if isinstance(exc, AppError): + return BulkFailure(index=index, identifier=identifier, error_code=exc.error_code, message=exc.message) + return BulkFailure(index=index, identifier=identifier, error_code="internal_error", message=type(exc).__name__) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/attachments/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/attachments/repository.py index c26dd9b0f1..e3c7fbb9e5 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/attachments/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/attachments/repository.py @@ -1,6 +1,9 @@ from typing import Any +from pymongo.asynchronous.client_session import AsyncClientSession + from mpcontribs_api.auth import User +from mpcontribs_api.config import get_settings from mpcontribs_api.domains._shared.repository import MongoDbRepository from mpcontribs_api.domains.attachments.models import ( Attachment, @@ -21,9 +24,21 @@ class MongoDbAttachmentRepository( def _build_scope(user: User) -> dict[str, Any]: return {} - async def insert_attachments(self, attachments: list[AttachmentIn]) -> list[Attachment]: + async def insert_attachments( + self, + attachments: list[AttachmentIn], + session: AsyncClientSession | None = None, + ) -> list[Attachment]: + """Bulk-insert attachments, chunked to fit within a transaction's payload budget. + + Args: + attachments: attachments to insert + session: optional client session; pass when inserting inside a transaction + """ if not attachments: return [] docs = [Attachment.model_validate(a.model_dump()) for a in attachments] - await Attachment.insert_many(docs, ordered=False) + chunk_size = get_settings().mongo.component_insert_chunk_size + for start in range(0, len(docs), chunk_size): + await Attachment.insert_many(docs[start : start + chunk_size], ordered=False, session=session) return docs diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/dependencies.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/dependencies.py index ec995e4542..b049f32c2c 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/dependencies.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/dependencies.py @@ -2,7 +2,7 @@ from fastapi import Depends -from mpcontribs_api.dependencies import UserDep +from mpcontribs_api.dependencies import MongoClientDep, UserDep from mpcontribs_api.domains.attachments.repository import MongoDbAttachmentRepository from mpcontribs_api.domains.contributions.repository import ( MongoDbContributionRepository, @@ -19,8 +19,9 @@ def get_scoped_contributions(user: UserDep) -> MongoDbContributionRepository: ContributionDep = Annotated[MongoDbContributionRepository, Depends(get_scoped_contributions)] -def get_contribution_service(user: UserDep) -> ContributionService: +def get_contribution_service(user: UserDep, client: MongoClientDep) -> ContributionService: return ContributionService( + client=client, contributions=MongoDbContributionRepository(user), structures=MongoDbStructureRepository(user), attachments=MongoDbAttachmentRepository(user), diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py index 7a66701b29..ab0f52cdac 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py @@ -64,6 +64,18 @@ class ContributionIn(ContributionBase): tables: list[TableIn] | None = None attachments: list[AttachmentIn] | None = None + def has_components(self) -> bool: + """Returns ``True`` if the contribution has any components (structures, tables, attachments)""" + return bool(self.structures or self.tables or self.attachments) + + def component_count(self) -> int: + """Returns the total number of components (structures, tables, attachments) in the contribution""" + return len(self.structures or []) + len(self.tables or []) + len(self.attachments or []) + + def identifiers(self) -> dict[str, str]: + """Returns a dict of unique identifiers for a contribution (outside of id).""" + return {"project": self.project, "identifier": self.identifier} + class ContributionOut(DocumentOut[PydanticObjectId]): project: str | None = None diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py index 638cfedfd4..5134669a0c 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py @@ -2,6 +2,7 @@ from beanie import UpdateResponse from beanie.operators import Set +from pymongo.asynchronous.client_session import AsyncClientSession from mpcontribs_api.auth import User from mpcontribs_api.domains._shared.repository import MongoDbRepository @@ -74,18 +75,26 @@ async def delete_contributions(self, filter: ContributionFilter): docs = filter.filter(self.document_model.find(self._scope)) await docs.delete() - async def insert_many_contributions(self, docs: list[Contribution]): + async def insert_many_contributions( + self, + docs: list[Contribution], + session: AsyncClientSession | None = None, + ): """Bulk-insert pre-built Contribution documents. - Used by ``ContributionService`` after it has resolved component Links. The service is - responsible for ensuring each document is fully formed; this method is a thin - collection-level wrapper. + Used by the ``ContributionService`` no-component fast path. On partial failure pymongo + raises ``BulkWriteError`` whose ``details["writeErrors"]`` carries per-index error info + that the service maps back into a ``BulkWriteSummary``. """ - return await self.document_model.insert_many(docs, ordered=False) + return await self.document_model.insert_many(docs, ordered=False, session=session) - async def insert_contribution(self, doc: Contribution) -> Contribution: - """Insert a single pre-built Contribution document.""" - await doc.insert() + async def insert_contribution( + self, + doc: Contribution, + session: AsyncClientSession | None = None, + ) -> Contribution: + """Insert a single pre-built Contribution document, optionally in a transaction.""" + await doc.insert(session=session) return doc async def find_one_contribution(self, project: str, identifier: str) -> Contribution | None: diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py index cfc7db4eff..b64a6bcf5c 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py @@ -3,8 +3,10 @@ from fastapi import APIRouter, Depends from fastapi_filter import FilterDepends +from mpcontribs_api.domains._shared.bulk import BulkWriteSummary from mpcontribs_api.domains.contributions.dependencies import ContributionDep, ContributionServiceDep from mpcontribs_api.domains.contributions.models import ( + Contribution, ContributionFilter, ContributionIn, ContributionOut, @@ -35,7 +37,7 @@ async def delete_contributions( return await repo.delete_contributions(filter=filter) -@router.post("") +@router.post("", response_model=BulkWriteSummary[Contribution]) async def insert_contributions( service: ContributionServiceDep, contributions: list[ContributionIn], diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py index 5d8056bc46..a74ddcf4f9 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py @@ -1,93 +1,242 @@ import asyncio +from collections import defaultdict from typing import cast +import structlog from beanie import Link +from pymongo import AsyncMongoClient +from pymongo.asynchronous.client_session import AsyncClientSession +from pymongo.errors import BulkWriteError -from mpcontribs_api.domains.attachments.models import Attachment, AttachmentIn +from mpcontribs_api.config import MongoSettings, get_settings +from mpcontribs_api.domains._shared.bulk import BulkFailure, BulkWriteSummary, bulk_failure_from_exception +from mpcontribs_api.domains.attachments.models import Attachment from mpcontribs_api.domains.attachments.repository import MongoDbAttachmentRepository from mpcontribs_api.domains.contributions.models import Contribution, ContributionIn from mpcontribs_api.domains.contributions.repository import MongoDbContributionRepository -from mpcontribs_api.domains.structures.models import Structure, StructureIn +from mpcontribs_api.domains.structures.models import Structure from mpcontribs_api.domains.structures.repository import MongoDbStructureRepository -from mpcontribs_api.domains.tables.models import Table, TableIn +from mpcontribs_api.domains.tables.models import Table from mpcontribs_api.domains.tables.repository import MongoDbTableRepository -from mpcontribs_api.exceptions import ValidationError +from mpcontribs_api.exceptions import AppError, ValidationError + +logger = structlog.get_logger(__name__) class ContributionService: def __init__( self, + client: AsyncMongoClient, contributions: MongoDbContributionRepository, structures: MongoDbStructureRepository, attachments: MongoDbAttachmentRepository, tables: MongoDbTableRepository, + settings: MongoSettings | None = None, ): + self._client = client self._contributions = contributions self._structures = structures self._attachments = attachments self._tables = tables + self._settings = settings or get_settings().mongo - async def _insert_components( + async def insert_contributions( self, contributions: list[ContributionIn], - ) -> tuple[list[Structure], list[Table], list[Attachment], list[slice], list[slice], list[slice]]: - """Bulk-insert component documents for a batch and return per-contribution slices. + ) -> BulkWriteSummary[Contribution]: + """Bulk insert contributions, atomically per top-level contribution. + + Contributions carrying no components are inserted in one ``insert_many`` (no transaction); + contributions with components run inside their own MongoDB transaction so the contribution + and its components commit or roll back together. Concurrent transactions are bounded by + ``settings.mongo.max_concurrent_transactions``. Per-item failures are returned in the + summary's ``failed`` list; the request as a whole does not raise on partial failure. + + Args: + contributions: contributions to insert; may include nested structures/tables/attachments Returns: - (structures, tables, attachments, struct_slices, table_slices, attach_slices) - where slice[i] selects the components belonging to contributions[i]. + BulkWriteSummary[Contribution]: per-item outcome, sized to ``len(contributions)`` + + Raises: + ValidationError: if duplicate keys (project-identifier) are found in ``contributions`` """ - all_structures: list[StructureIn] = [] - all_tables: list[TableIn] = [] - all_attachments: list[AttachmentIn] = [] - struct_slices: list[slice] = [] - table_slices: list[slice] = [] - attach_slices: list[slice] = [] + if not contributions: + return BulkWriteSummary[Contribution](total=0, succeeded=[], failed=[]) - for contrib in contributions: - s0 = len(all_structures) - all_structures.extend(contrib.structures or []) - struct_slices.append(slice(s0, len(all_structures))) + self._reject_duplicate_keys(contributions) - t0 = len(all_tables) - all_tables.extend(contrib.tables or []) - table_slices.append(slice(t0, len(all_tables))) + oversize_failures, remaining_indices = self._split_oversize(contributions) + no_comp_indices = [i for i in remaining_indices if not contributions[i].has_components()] + with_comp_indices = [i for i in remaining_indices if contributions[i].has_components()] - a0 = len(all_attachments) - all_attachments.extend(contrib.attachments or []) - attach_slices.append(slice(a0, len(all_attachments))) + no_comp_succeeded, no_comp_failed = await self._insert_no_components( + indices=no_comp_indices, + contributions=contributions, + ) + with_comp_succeeded, with_comp_failed = await self._insert_with_components( + indices=with_comp_indices, + contributions=contributions, + ) + + succeeded = [doc for _, doc in sorted(no_comp_succeeded + with_comp_succeeded, key=lambda p: p[0])] + failed = sorted( + oversize_failures + no_comp_failed + with_comp_failed, + key=lambda f: f.index, + ) + return BulkWriteSummary[Contribution](total=len(contributions), succeeded=succeeded, failed=failed) - structures = await self._structures.insert_structures(all_structures) - tables = await self._tables.insert_tables(all_tables) - attachments = await self._attachments.insert_attachments(all_attachments) + def _reject_duplicate_keys(self, contributions: list[ContributionIn]) -> None: + """Reject the whole batch if any (project, identifier) appears more than once. - return structures, tables, attachments, struct_slices, table_slices, attach_slices + Mongo would surface this as a write conflict per item; catching it upfront keeps a guaranteed + failure from consuming a transaction slot and gives the caller all offending indices at once. + """ + seen: dict[tuple[str, str], list[int]] = defaultdict(list) + for i, c in enumerate(contributions): + seen[(c.project, c.identifier)].append(i) + duplicates = sorted(i for indices in seen.values() if len(indices) > 1 for i in indices) + if duplicates: + raise ValidationError( + "Duplicate (project, identifier) pairs in batch", + contribution_indices=duplicates, + ) - async def insert_contributions(self, contributions: list[ContributionIn]): - """Bulk insertion of Contributions with nested components. + def _split_oversize(self, contributions: list[ContributionIn]) -> tuple[list[BulkFailure], list[int]]: + """Reject contributions whose component count exceeds the per-contribution ceiling. - Components embedded in each ContributionIn are bulk-inserted first; the resulting IDs - are stored as Links before the contributions themselves are bulk-inserted. + Returns the failure entries for the oversize items and the indices of the remaining items + that should proceed to Mongo. Doing this upfront avoids burning a transaction slot on a + request guaranteed to exceed transactionLifetimeLimitSeconds. + """ + cap = self._settings.max_components_per_contribution + oversize: list[BulkFailure] = [] + remaining: list[int] = [] + for i, contrib in enumerate(contributions): + count = contrib.component_count() + if count > cap: + oversize.append( + BulkFailure( + index=i, + identifier=contrib.identifiers(), + error_code="validation_error", + message=f"contribution has {count} components, exceeds cap of {cap}", + ) + ) + else: + remaining.append(i) + return oversize, remaining - Args: - contributions: contributions to insert, may include nested structures/tables/attachments + async def _insert_no_components( + self, + indices: list[int], + contributions: list[ContributionIn], + ) -> tuple[list[tuple[int, Contribution]], list[BulkFailure]]: + """Single-collection bulk insert for component-free contributions. - Returns: - list[Contribution]: inserted documents + Uses ``ordered=False`` so a single bad item doesn't sink the rest of the batch. pymongo + raises ``BulkWriteError`` with per-index error info on partial failure; we map that back + onto the original input indices. """ - structures, tables, attachments, struct_slices, table_slices, attach_slices = await self._insert_components( - contributions - ) + if not indices: + return [], [] + docs = [Contribution.from_input_model(contributions[i]) for i in indices] + try: + await self._contributions.insert_many_contributions(docs) + return list(zip(indices, docs, strict=False)), [] + except BulkWriteError as exc: + return self._partition_bulk_write_error(indices, docs, contributions, exc) - full_docs: list[Contribution] = [] - for i, contrib in enumerate(contributions): - doc = Contribution.from_input_model(contrib) - doc.structures = cast(list[Link[Structure]] | None, structures[struct_slices[i]] or None) - doc.tables = cast(list[Link[Table]] | None, tables[table_slices[i]] or None) - doc.attachments = cast(list[Link[Attachment]] | None, attachments[attach_slices[i]] or None) - full_docs.append(doc) + @staticmethod + def _partition_bulk_write_error( + indices: list[int], + docs: list[Contribution], + contributions: list[ContributionIn], + exc: BulkWriteError, + ) -> tuple[list[tuple[int, Contribution]], list[BulkFailure]]: + """Map pymongo's per-position writeErrors back to the caller's original input indices.""" + write_errors = exc.details.get("writeErrors", []) if exc.details else [] + failed_positions = {err.get("index"): err for err in write_errors} + succeeded: list[tuple[int, Contribution]] = [] + failed: list[BulkFailure] = [] + for position, (orig_index, doc) in enumerate(zip(indices, docs, strict=False)): + err = failed_positions.get(position) + if err is None: + succeeded.append((orig_index, doc)) + else: + failed.append( + BulkFailure( + index=orig_index, + identifier=contributions[orig_index].identifiers(), + error_code="conflict" if err.get("code") == 11000 else "write_error", + message=err.get("errmsg", "write failed"), + ) + ) + return succeeded, failed + + async def _insert_with_components( + self, + indices: list[int], + contributions: list[ContributionIn], + ) -> tuple[list[tuple[int, Contribution]], list[BulkFailure]]: + """Per-contribution transaction path, bounded by ``max_concurrent_transactions``.""" + if not indices: + return [], [] + sem = asyncio.Semaphore(self._settings.max_concurrent_transactions) + + async def _bounded(orig_index: int) -> Contribution | BulkFailure: + async with sem: + return await self._insert_one_with_components(orig_index, contributions[orig_index]) + + results = await asyncio.gather(*[_bounded(i) for i in indices]) + succeeded: list[tuple[int, Contribution]] = [] + failed: list[BulkFailure] = [] + for orig_index, outcome in zip(indices, results, strict=True): + if isinstance(outcome, BulkFailure): + failed.append(outcome) + else: + succeeded.append((orig_index, outcome)) + return succeeded, failed + + async def _insert_one_with_components( + self, + index: int, + contrib: ContributionIn, + ) -> Contribution | BulkFailure: + """Run a single contribution + its components inside a transaction. + + Uses ``session.with_transaction`` so transient txn errors (write conflicts, primary step- + downs) get pymongo's retry treatment. Any exception is converted to a ``BulkFailure`` so + the surrounding ``asyncio.gather`` sees a normal return value for every coroutine. + """ + try: + async with self._client.start_session() as session: + + async def _txn(s: AsyncClientSession) -> Contribution: + return await self._do_insert(contrib, s) + + return await session.with_transaction(_txn) + except AppError as exc: + return bulk_failure_from_exception(index, contrib.identifiers(), exc) + except Exception as exc: + logger.error("insert_contribution_failed", index=index, identifier=contrib.identifiers(), exc_info=True) + return bulk_failure_from_exception(index, contrib.identifiers(), exc) + + async def _do_insert(self, contrib: ContributionIn, session: AsyncClientSession) -> Contribution: + """Insert components then the contribution itself, all in the given session. + + Components are inserted sequentially because a session is single-threaded — sharing it + across concurrent awaits would corrupt the wire protocol. + """ + structures = await self._structures.insert_structures(contrib.structures or [], session=session) + tables = await self._tables.insert_tables(contrib.tables or [], session=session) + attachments = await self._attachments.insert_attachments(contrib.attachments or [], session=session) - return await self._contributions.insert_many_contributions(full_docs) + doc = Contribution.from_input_model(contrib) + doc.structures = cast(list[Link[Structure]] | None, structures or None) + doc.tables = cast(list[Link[Table]] | None, tables or None) + doc.attachments = cast(list[Link[Attachment]] | None, attachments or None) + return await self._contributions.insert_contribution(doc, session=session) async def upsert_contributions(self, contributions: list[ContributionIn]): """Upsert contributions by (project, identifier). diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/repository.py index 3216b3c2c2..96feb08545 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/structures/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/structures/repository.py @@ -1,6 +1,9 @@ from typing import Any +from pymongo.asynchronous.client_session import AsyncClientSession + from mpcontribs_api.auth import User +from mpcontribs_api.config import get_settings from mpcontribs_api.domains._shared.repository import MongoDbRepository from mpcontribs_api.domains.structures.models import ( Structure, @@ -21,9 +24,21 @@ class MongoDbStructureRepository( def _build_scope(user: User) -> dict[str, Any]: return {} - async def insert_structures(self, structures: list[StructureIn]) -> list[Structure]: + async def insert_structures( + self, + structures: list[StructureIn], + session: AsyncClientSession | None = None, + ) -> list[Structure]: + """Bulk-insert structures, chunked to fit within a transaction's payload budget. + + Args: + structures: structures to insert + session: optional client session; pass when inserting inside a transaction + """ if not structures: return [] docs = [Structure.model_validate(s.model_dump()) for s in structures] - await Structure.insert_many(docs, ordered=False) + chunk_size = get_settings().mongo.component_insert_chunk_size + for start in range(0, len(docs), chunk_size): + await Structure.insert_many(docs[start : start + chunk_size], ordered=False, session=session) return docs diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py index 37ba36526b..a0adc06a1e 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py @@ -1,6 +1,9 @@ from typing import Any +from pymongo.asynchronous.client_session import AsyncClientSession + from mpcontribs_api.auth import User +from mpcontribs_api.config import get_settings from mpcontribs_api.domains._shared.repository import MongoDbRepository from mpcontribs_api.domains.tables.models import ( Table, @@ -19,9 +22,21 @@ class MongoDbTableRepository(MongoDbRepository[Table, TableIn, TableDocumentOut, def _build_scope(user: User) -> dict[str, Any]: return {} - async def insert_tables(self, tables: list[TableIn]) -> list[Table]: + async def insert_tables( + self, + tables: list[TableIn], + session: AsyncClientSession | None = None, + ) -> list[Table]: + """Bulk-insert tables, chunked to fit within a transaction's payload budget. + + Args: + tables: tables to insert + session: optional client session; pass when inserting inside a transaction + """ if not tables: return [] docs = [Table.model_validate(t.model_dump()) for t in tables] - await Table.insert_many(docs, ordered=False) + chunk_size = get_settings().mongo.component_insert_chunk_size + for start in range(0, len(docs), chunk_size): + await Table.insert_many(docs[start : start + chunk_size], ordered=False, session=session) return docs diff --git a/mpcontribs-api/tests/unit/domains/test_contribution_service.py b/mpcontribs-api/tests/unit/domains/test_contribution_service.py index e122159622..b6460143ba 100644 --- a/mpcontribs-api/tests/unit/domains/test_contribution_service.py +++ b/mpcontribs-api/tests/unit/domains/test_contribution_service.py @@ -2,8 +2,8 @@ All database access is replaced with AsyncMock repositories so no MongoDB connection is needed. These tests verify: - - _insert_components: slice bookkeeping and delegation to component repos - - insert_contributions: Link wiring and bulk-insert delegation + - insert_contributions: pre-checks, no-component fast path, per-contribution txn path, + partial-failure summary - upsert_contributions: guard against components, insert vs update branching """ @@ -13,7 +13,9 @@ import pytest from beanie import PydanticObjectId from pymatgen.core import Element +from pymongo.errors import BulkWriteError +from mpcontribs_api.config import MongoSettings from mpcontribs_api.domains.attachments.models import Attachment, AttachmentIn from mpcontribs_api.domains.contributions.models import Contribution, ContributionIn from mpcontribs_api.domains.contributions.service import ContributionService @@ -26,7 +28,7 @@ StructureIn, ) from mpcontribs_api.domains.tables.models import Attributes, Labels, Table, TableIn -from mpcontribs_api.exceptions import ValidationError +from mpcontribs_api.exceptions import ConflictError, ValidationError pytestmark = pytest.mark.asyncio @@ -104,23 +106,66 @@ def _contrib_in(project="proj", identifier="mp-1", formula="Fe2O3", **kwargs) -> ) +def _make_mongo_settings( + *, + max_components_per_contribution: int = 500, + max_concurrent_transactions: int = 8, + component_insert_chunk_size: int = 100, +) -> MongoSettings: + return MongoSettings.model_validate({ + "uri": "mongodb://test", + "db_name": "test", + "max_pool_size": 100, + "max_components_per_contribution": max_components_per_contribution, + "max_concurrent_transactions": max_concurrent_transactions, + "component_insert_chunk_size": component_insert_chunk_size, + }) + + +def _make_fake_client() -> tuple[AsyncMock, MagicMock]: + """Return a fake AsyncMongoClient whose start_session() yields a session that drives + with_transaction(callback) by simply awaiting callback(session). + + Returns: + (client, session): the session is exposed so tests can assert on it. + """ + session = MagicMock(name="session") + + async def _with_transaction(callback): + return await callback(session) + + session.with_transaction = AsyncMock(side_effect=_with_transaction) + session.__aenter__ = AsyncMock(return_value=session) + session.__aexit__ = AsyncMock(return_value=None) + + client = MagicMock(name="client") + client.start_session = MagicMock(return_value=session) + return client, session + + def _make_service( contributions=None, structures=None, tables=None, attachments=None, -) -> tuple[ContributionService, AsyncMock, AsyncMock, AsyncMock, AsyncMock]: + client=None, + settings: MongoSettings | None = None, +) -> tuple[ContributionService, AsyncMock, AsyncMock, AsyncMock, AsyncMock, MagicMock]: contrib_repo = contributions or AsyncMock() struct_repo = structures or AsyncMock() table_repo = tables or AsyncMock() attach_repo = attachments or AsyncMock() + if client is None: + client, _ = _make_fake_client() svc = ContributionService( + client=client, contributions=contrib_repo, structures=struct_repo, tables=table_repo, attachments=attach_repo, + settings=settings or _make_mongo_settings(), ) - return svc, contrib_repo, struct_repo, table_repo, attach_repo + return svc, contrib_repo, struct_repo, table_repo, attach_repo, client def _fake_structure() -> Structure: @@ -142,223 +187,250 @@ def _fake_attachment() -> Attachment: # --------------------------------------------------------------------------- -# _insert_components +# insert_contributions — pre-checks (cheap, no DB) # --------------------------------------------------------------------------- -class TestInsertComponents: - async def test_empty_batch_calls_repos_with_empty_lists(self): - svc, _, struct_repo, table_repo, attach_repo = _make_service() - struct_repo.insert_structures.return_value = [] - table_repo.insert_tables.return_value = [] - attach_repo.insert_attachments.return_value = [] - - structures, tables, attachments, ss, ts, ats = await svc._insert_components([]) - - struct_repo.insert_structures.assert_called_once_with([]) - table_repo.insert_tables.assert_called_once_with([]) - attach_repo.insert_attachments.assert_called_once_with([]) - assert structures == [] - assert tables == [] - assert attachments == [] - assert ss == [] - assert ts == [] - assert ats == [] - - async def test_single_contrib_no_components_produces_empty_slices(self): - svc, _, struct_repo, table_repo, attach_repo = _make_service() - struct_repo.insert_structures.return_value = [] - table_repo.insert_tables.return_value = [] - attach_repo.insert_attachments.return_value = [] - - contrib = _contrib_in() - _, _, _, ss, ts, ats = await svc._insert_components([contrib]) +class TestInsertContributionsPreChecks: + async def test_empty_batch_returns_empty_summary_no_db(self): + svc, contrib_repo, struct_repo, table_repo, attach_repo, client = _make_service() - assert ss == [slice(0, 0)] - assert ts == [slice(0, 0)] - assert ats == [slice(0, 0)] + summary = await svc.insert_contributions([]) - async def test_slices_are_contiguous_and_non_overlapping(self): - svc, _, struct_repo, table_repo, attach_repo = _make_service() + assert summary.total == 0 + assert summary.succeeded == [] + assert summary.failed == [] + contrib_repo.insert_many_contributions.assert_not_called() + contrib_repo.insert_contribution.assert_not_called() + client.start_session.assert_not_called() - struct_repo.insert_structures.return_value = [_fake_structure()] * 3 - table_repo.insert_tables.return_value = [] - attach_repo.insert_attachments.return_value = [] + async def test_duplicate_project_identifier_raises_validation_error(self): + svc, contrib_repo, _, _, _, client = _make_service() + contribs = [ + _contrib_in(project="p", identifier="dup"), + _contrib_in(project="p", identifier="dup"), + ] + with pytest.raises(ValidationError) as exc_info: + await svc.insert_contributions(contribs) + assert exc_info.value.context.get("contribution_indices") == [0, 1] + contrib_repo.insert_many_contributions.assert_not_called() + client.start_session.assert_not_called() + + async def test_oversize_contribution_goes_to_failures_without_db(self): + settings = _make_mongo_settings(max_components_per_contribution=1) + svc, contrib_repo, struct_repo, _, _, client = _make_service(settings=settings) + contrib_repo.insert_many_contributions.return_value = None + + good = _contrib_in(identifier="ok") + oversize = _contrib_in(identifier="big", structures=[_structure_in(), _structure_in()]) + + summary = await svc.insert_contributions([good, oversize]) + + assert summary.total == 2 + assert len(summary.failed) == 1 + assert summary.failed[0].index == 1 + assert summary.failed[0].error_code == "validation_error" + # Oversize never reached the component repo + struct_repo.insert_structures.assert_not_called() + # And the in-pool contribution did go through the no-component fast path + contrib_repo.insert_many_contributions.assert_called_once() - contrib_a = _contrib_in(identifier="a", structures=[_structure_in()]) - contrib_b = _contrib_in(identifier="b", structures=[_structure_in(), _structure_in()]) - contrib_c = _contrib_in(identifier="c") - _, _, _, ss, _, _ = await svc._insert_components([contrib_a, contrib_b, contrib_c]) +# --------------------------------------------------------------------------- +# insert_contributions — no-component fast path +# --------------------------------------------------------------------------- - assert ss[0] == slice(0, 1) # contrib_a: 1 structure - assert ss[1] == slice(1, 3) # contrib_b: 2 structures - assert ss[2] == slice(3, 3) # contrib_c: 0 structures - async def test_all_component_types_collected_and_dispatched(self): - svc, _, struct_repo, table_repo, attach_repo = _make_service() +class TestInsertContributionsNoComponentPath: + async def test_all_no_components_uses_single_insert_many(self): + svc, contrib_repo, _, _, _, client = _make_service() + contrib_repo.insert_many_contributions.return_value = None - struct_repo.insert_structures.return_value = [_fake_structure()] - table_repo.insert_tables.return_value = [_fake_table()] - attach_repo.insert_attachments.return_value = [_fake_attachment()] - - contrib = _contrib_in( - structures=[_structure_in()], - tables=[_table_in()], - attachments=[_attachment_in()], - ) + contribs = [_contrib_in(identifier=f"mp-{i}") for i in range(3)] + summary = await svc.insert_contributions(contribs) - await svc._insert_components([contrib]) + contrib_repo.insert_many_contributions.assert_called_once() + # Zero transactions opened + client.start_session.assert_not_called() + contrib_repo.insert_contribution.assert_not_called() + assert summary.total == 3 + assert len(summary.succeeded) == 3 + assert summary.failed == [] - struct_repo.insert_structures.assert_called_once() - table_repo.insert_tables.assert_called_once() - attach_repo.insert_attachments.assert_called_once() - # Verify correct counts were forwarded - assert len(struct_repo.insert_structures.call_args[0][0]) == 1 - assert len(table_repo.insert_tables.call_args[0][0]) == 1 - assert len(attach_repo.insert_attachments.call_args[0][0]) == 1 + async def test_is_public_forced_false_on_inserted_docs(self): + svc, contrib_repo, _, _, _, _ = _make_service() + contrib_repo.insert_many_contributions.return_value = None - async def test_multiple_contribs_components_concatenated_before_insert(self): - svc, _, struct_repo, table_repo, attach_repo = _make_service() + await svc.insert_contributions([_contrib_in()]) - struct_repo.insert_structures.return_value = [_fake_structure()] * 3 - table_repo.insert_tables.return_value = [] - attach_repo.insert_attachments.return_value = [] + docs = contrib_repo.insert_many_contributions.call_args[0][0] + assert all(d.is_public is False for d in docs) - c1 = _contrib_in(identifier="c1", structures=[_structure_in()]) - c2 = _contrib_in(identifier="c2", structures=[_structure_in(), _structure_in()]) + async def test_bulk_write_error_partitions_succeeded_and_failed(self): + svc, contrib_repo, _, _, _, _ = _make_service() + # writeErrors index refers to position in the docs list (post-partition); both 2 and 5 + # exercise the mapping back to original input indices. + bulk_err = BulkWriteError({ + "writeErrors": [ + {"index": 2, "code": 11000, "errmsg": "duplicate key"}, + {"index": 5, "code": 11000, "errmsg": "duplicate key"}, + ] + }) + contrib_repo.insert_many_contributions.side_effect = bulk_err - await svc._insert_components([c1, c2]) + contribs = [_contrib_in(identifier=f"mp-{i}") for i in range(6)] + summary = await svc.insert_contributions(contribs) - struct_repo.insert_structures.assert_called_once() - assert len(struct_repo.insert_structures.call_args[0][0]) == 3 + assert summary.total == 6 + assert sorted(f.index for f in summary.failed) == [2, 5] + assert all(f.error_code == "conflict" for f in summary.failed) + # The 4 unaffected contributions succeed + assert len(summary.succeeded) == 4 # --------------------------------------------------------------------------- -# insert_contributions +# insert_contributions — per-contribution transaction path # --------------------------------------------------------------------------- -class TestInsertContributions: - async def test_delegates_to_insert_many(self): - svc, contrib_repo, struct_repo, table_repo, attach_repo = _make_service() +class TestInsertContributionsTransactionPath: + async def test_with_components_opens_session_per_contribution(self): + svc, contrib_repo, struct_repo, table_repo, attach_repo, client = _make_service() - struct_repo.insert_structures.return_value = [] + struct_repo.insert_structures.return_value = [_fake_structure()] table_repo.insert_tables.return_value = [] attach_repo.insert_attachments.return_value = [] - contrib_repo.insert_many_contributions.return_value = MagicMock() - contribs = [_contrib_in(identifier=f"mp-{i}") for i in range(3)] - await svc.insert_contributions(contribs) + async def _insert(doc, session=None): + return doc - contrib_repo.insert_many_contributions.assert_called_once() - inserted_docs = contrib_repo.insert_many_contributions.call_args[0][0] - assert len(inserted_docs) == 3 + contrib_repo.insert_contribution.side_effect = _insert - async def test_is_public_forced_false_on_all_docs(self): - svc, contrib_repo, struct_repo, table_repo, attach_repo = _make_service() + contribs = [_contrib_in(identifier=f"c{i}", structures=[_structure_in()]) for i in range(3)] + summary = await svc.insert_contributions(contribs) - struct_repo.insert_structures.return_value = [] - table_repo.insert_tables.return_value = [] - attach_repo.insert_attachments.return_value = [] - contrib_repo.insert_many_contributions.return_value = MagicMock() + assert client.start_session.call_count == 3 + assert summary.total == 3 + assert len(summary.succeeded) == 3 + assert summary.failed == [] - contribs = [_contrib_in(identifier="mp-1")] - await svc.insert_contributions(contribs) + async def test_session_threaded_to_all_repo_calls(self): + client, session = _make_fake_client() + svc, contrib_repo, struct_repo, table_repo, attach_repo, _ = _make_service(client=client) - docs = contrib_repo.insert_many_contributions.call_args[0][0] - assert all(d.is_public is False for d in docs) + struct_repo.insert_structures.return_value = [_fake_structure()] + table_repo.insert_tables.return_value = [_fake_table()] + attach_repo.insert_attachments.return_value = [_fake_attachment()] - async def test_structure_links_wired_correctly(self): - svc, contrib_repo, struct_repo, table_repo, attach_repo = _make_service() + async def _insert(doc, session=None): + return doc - fake_struct = _fake_structure() - struct_repo.insert_structures.return_value = [fake_struct] - table_repo.insert_tables.return_value = [] - attach_repo.insert_attachments.return_value = [] - contrib_repo.insert_many_contributions.return_value = MagicMock() + contrib_repo.insert_contribution.side_effect = _insert - contrib = _contrib_in(structures=[_structure_in()]) + contrib = _contrib_in( + structures=[_structure_in()], + tables=[_table_in()], + attachments=[_attachment_in()], + ) await svc.insert_contributions([contrib]) - doc = contrib_repo.insert_many_contributions.call_args[0][0][0] - assert doc.structures == [fake_struct] + assert struct_repo.insert_structures.call_args.kwargs["session"] is session + assert table_repo.insert_tables.call_args.kwargs["session"] is session + assert attach_repo.insert_attachments.call_args.kwargs["session"] is session + assert contrib_repo.insert_contribution.call_args.kwargs["session"] is session - async def test_table_links_wired_correctly(self): - svc, contrib_repo, struct_repo, table_repo, attach_repo = _make_service() + async def test_failure_on_second_of_three_yields_summary(self): + svc, contrib_repo, struct_repo, table_repo, attach_repo, _ = _make_service() - fake_table = _fake_table() - struct_repo.insert_structures.return_value = [] - table_repo.insert_tables.return_value = [fake_table] + struct_repo.insert_structures.return_value = [_fake_structure()] + table_repo.insert_tables.return_value = [] attach_repo.insert_attachments.return_value = [] - contrib_repo.insert_many_contributions.return_value = MagicMock() - - contrib = _contrib_in(tables=[_table_in()]) - await svc.insert_contributions([contrib]) - - doc = contrib_repo.insert_many_contributions.call_args[0][0][0] - assert doc.tables == [fake_table] - async def test_attachment_links_wired_correctly(self): - svc, contrib_repo, struct_repo, table_repo, attach_repo = _make_service() + async def _insert(doc, session=None): + # Fail the second contribution by inspecting the doc identifier + if doc.identifier == "fail": + raise ConflictError("conflict on insert") + return doc - fake_attach = _fake_attachment() - struct_repo.insert_structures.return_value = [] - table_repo.insert_tables.return_value = [] - attach_repo.insert_attachments.return_value = [fake_attach] - contrib_repo.insert_many_contributions.return_value = MagicMock() + contrib_repo.insert_contribution.side_effect = _insert - contrib = _contrib_in(attachments=[_attachment_in()]) - await svc.insert_contributions([contrib]) + contribs = [ + _contrib_in(identifier="ok-1", structures=[_structure_in()]), + _contrib_in(identifier="fail", structures=[_structure_in()]), + _contrib_in(identifier="ok-2", structures=[_structure_in()]), + ] + summary = await svc.insert_contributions(contribs) - doc = contrib_repo.insert_many_contributions.call_args[0][0][0] - assert doc.attachments == [fake_attach] + assert summary.total == 3 + assert len(summary.succeeded) == 2 + assert len(summary.failed) == 1 + assert summary.failed[0].index == 1 + assert summary.failed[0].error_code == "conflict" - async def test_no_components_sets_links_to_none(self): - svc, contrib_repo, struct_repo, table_repo, attach_repo = _make_service() + async def test_component_links_wired_per_contribution(self): + svc, contrib_repo, struct_repo, table_repo, attach_repo, _ = _make_service() - struct_repo.insert_structures.return_value = [] + struct_a, struct_b = _fake_structure(), _fake_structure() + struct_calls = iter([[struct_a], [struct_b]]) + struct_repo.insert_structures.side_effect = lambda *_args, **_kwargs: next(struct_calls) table_repo.insert_tables.return_value = [] attach_repo.insert_attachments.return_value = [] - contrib_repo.insert_many_contributions.return_value = MagicMock() - await svc.insert_contributions([_contrib_in()]) + captured: list[Contribution] = [] - doc = contrib_repo.insert_many_contributions.call_args[0][0][0] - assert doc.structures is None - assert doc.tables is None - assert doc.attachments is None + async def _insert(doc, session=None): + captured.append(doc) + return doc - async def test_each_contrib_gets_only_its_own_components(self): - """Components belonging to contrib A must not bleed into contrib B.""" - svc, contrib_repo, struct_repo, table_repo, attach_repo = _make_service() + contrib_repo.insert_contribution.side_effect = _insert - s_a, s_b1, s_b2 = _fake_structure(), _fake_structure(), _fake_structure() - struct_repo.insert_structures.return_value = [s_a, s_b1, s_b2] - table_repo.insert_tables.return_value = [] - attach_repo.insert_attachments.return_value = [] - contrib_repo.insert_many_contributions.return_value = MagicMock() + contribs = [ + _contrib_in(identifier="a", structures=[_structure_in()]), + _contrib_in(identifier="b", structures=[_structure_in()]), + ] + await svc.insert_contributions(contribs) - c_a = _contrib_in(identifier="a", structures=[_structure_in()]) - c_b = _contrib_in(identifier="b", structures=[_structure_in(), _structure_in()]) + captured_by_id = {c.identifier: c for c in captured} + assert captured_by_id["a"].structures == [struct_a] + assert captured_by_id["b"].structures == [struct_b] - await svc.insert_contributions([c_a, c_b]) - docs = contrib_repo.insert_many_contributions.call_args[0][0] - assert docs[0].structures == [s_a] - assert docs[1].structures == [s_b1, s_b2] +# --------------------------------------------------------------------------- +# insert_contributions — mixed batch (partitioned across paths) +# --------------------------------------------------------------------------- + - async def test_empty_batch_still_calls_insert_many(self): - svc, contrib_repo, struct_repo, table_repo, attach_repo = _make_service() +class TestInsertContributionsMixedBatch: + async def test_mixed_batch_routes_correctly(self): + svc, contrib_repo, struct_repo, table_repo, attach_repo, client = _make_service() - struct_repo.insert_structures.return_value = [] + struct_repo.insert_structures.return_value = [_fake_structure()] table_repo.insert_tables.return_value = [] attach_repo.insert_attachments.return_value = [] - contrib_repo.insert_many_contributions.return_value = MagicMock() + contrib_repo.insert_many_contributions.return_value = None + + async def _insert(doc, session=None): + return doc - await svc.insert_contributions([]) + contrib_repo.insert_contribution.side_effect = _insert - contrib_repo.insert_many_contributions.assert_called_once_with([]) + contribs = [ + _contrib_in(identifier="bare-1"), + _contrib_in(identifier="with-1", structures=[_structure_in()]), + _contrib_in(identifier="bare-2"), + _contrib_in(identifier="with-2", structures=[_structure_in()]), + ] + summary = await svc.insert_contributions(contribs) + + # No-component path: single batched call + contrib_repo.insert_many_contributions.assert_called_once() + assert len(contrib_repo.insert_many_contributions.call_args[0][0]) == 2 + # With-component path: one session per item + assert client.start_session.call_count == 2 + assert contrib_repo.insert_contribution.call_count == 2 + assert summary.total == 4 + assert len(summary.succeeded) == 4 + assert summary.failed == [] # --------------------------------------------------------------------------- From 37256430fcd2e9e9c748cfc7ce993e2475eca43b Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 8 Jun 2026 11:40:24 -0700 Subject: [PATCH 075/591] upsert_contributions uses semaphore --- .../domains/contributions/service.py | 38 ++++++++++++------- .../unit/domains/test_contribution_service.py | 2 +- 2 files changed, 26 insertions(+), 14 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py index a74ddcf4f9..d67c659ee8 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py @@ -238,33 +238,45 @@ async def _do_insert(self, contrib: ContributionIn, session: AsyncClientSession) doc.attachments = cast(list[Link[Attachment]] | None, attachments or None) return await self._contributions.insert_contribution(doc, session=session) - async def upsert_contributions(self, contributions: list[ContributionIn]): - """Upsert contributions by (project, identifier). + async def upsert_contributions(self, contributions: list[ContributionIn]) -> list[Contribution]: + """Upsert contributions by their identifying fields, bounded by a concurrency cap. Components (structures, tables, attachments) must be managed via their respective services. If any contribution in the batch carries components, the entire request is rejected before any database writes occur. + Each item is looked up by ``ContributionIn.identifiers()``; an existing document is + partially updated (None fields are dropped), a missing one is inserted. Concurrent + upserts are capped by ``settings.mongo.max_concurrent_transactions`` so a large batch + cannot exhaust the connection pool. + Args: contributions: contributions to upsert; must not include nested components Returns: - list[Contribution]: upserted documents + list[Contribution]: upserted documents in input order """ - indices_with_components = [i for i, c in enumerate(contributions) if c.structures or c.tables or c.attachments] + indices_with_components = [i for i, c in enumerate(contributions) if c.has_components()] if indices_with_components: raise ValidationError( "Components must be managed via their respective services, not via contribution upsert.", contribution_indices=indices_with_components, ) - async def _upsert(contrib: ContributionIn): - doc = Contribution.from_input_model(contrib) - existing = await self._contributions.find_one_contribution(contrib.project, contrib.identifier) - if existing is not None: - update_data = doc.model_dump(exclude={"id"}, exclude_none=True) - await self._contributions.update_contribution(existing, update_data) - return existing - return await self._contributions.insert_contribution(doc) + sem = asyncio.Semaphore(self._settings.max_concurrent_transactions) + + async def _bounded_upsert(contrib: ContributionIn) -> Contribution: + async with sem: + return await self._upsert_one(contrib) + + return await asyncio.gather(*[_bounded_upsert(c) for c in contributions]) - return await asyncio.gather(*[_upsert(c) for c in contributions]) + async def _upsert_one(self, contrib: ContributionIn) -> Contribution: + """Partial-update if a document with the same identifiers exists, otherwise insert.""" + doc = Contribution.from_input_model(contrib) + existing = await self._contributions.find_one_contribution(**contrib.identifiers()) + if existing is not None: + update_data = doc.model_dump(exclude={"id"}, exclude_none=True) + await self._contributions.update_contribution(existing, update_data) + return existing + return await self._contributions.insert_contribution(doc) diff --git a/mpcontribs-api/tests/unit/domains/test_contribution_service.py b/mpcontribs-api/tests/unit/domains/test_contribution_service.py index b6460143ba..e23f5443fa 100644 --- a/mpcontribs-api/tests/unit/domains/test_contribution_service.py +++ b/mpcontribs-api/tests/unit/domains/test_contribution_service.py @@ -528,7 +528,7 @@ async def test_find_uses_project_and_identifier(self): contrib = _contrib_in(project="my-proj", identifier="mp-99") await svc.upsert_contributions([contrib]) - contrib_repo.find_one_contribution.assert_called_once_with("my-proj", "mp-99") + contrib_repo.find_one_contribution.assert_called_once_with(project="my-proj", identifier="mp-99") async def test_update_not_called_on_insert_path(self): svc, contrib_repo, *_ = _make_service() From 610ca6d174841bd85ae5c01f575af79195ba9d30 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 8 Jun 2026 11:45:55 -0700 Subject: [PATCH 076/591] Added project_identifier index on ContributionsBase --- .../src/mpcontribs_api/domains/contributions/models.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py index ab0f52cdac..f0586dabff 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py @@ -14,6 +14,7 @@ from fastapi_filter import FilterDepends, with_prefix from fastapi_filter.contrib.beanie import Filter from pydantic import Field +from pymongo import ASCENDING, IndexModel from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut from mpcontribs_api.domains.attachments.models import Attachment, AttachmentFilter, AttachmentIn @@ -36,6 +37,13 @@ class ContributionBase(BaseDocumentWithInput[PydanticObjectId]): class Settings: name = "contributions" keep_nulls = False + indexes = [ + IndexModel( + keys=[("project", ASCENDING), ("identifier", ASCENDING)], + name="project_idenfitier", + unique=True, + ) + ] class Contribution(ContributionBase): From 9ab2a6a8633fc3549f54bd473bbbaa92572822c7 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 8 Jun 2026 13:44:49 -0700 Subject: [PATCH 077/591] clamp max_concurrent_transactions --- mpcontribs-api/src/mpcontribs_api/config.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/config.py b/mpcontribs-api/src/mpcontribs_api/config.py index c60545f086..428ce887ec 100644 --- a/mpcontribs-api/src/mpcontribs_api/config.py +++ b/mpcontribs-api/src/mpcontribs_api/config.py @@ -68,11 +68,14 @@ class MongoSettings(BaseModel): ) @model_validator(mode="after") - def _clamp_max_concurrent_transactions(self): + def _clamp_concurrency(self): if self.max_pool_size: - cap = max(1, self.max_pool_size // 2) - if self.max_concurrent_transactions > cap: - self.max_concurrent_transactions = cap + per_request_cap = max(1, self.max_pool_size // 2) + if self.max_concurrent_transactions > per_request_cap: + self.max_concurrent_transactions = per_request_cap + global_cap = max(1, self.max_pool_size - 10) + if self.max_global_concurrent_writes > global_cap: + self.max_global_concurrent_writes = global_cap return self From d63edcb2dabbabdc056171445bc111b1d837c0f9 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 8 Jun 2026 13:45:16 -0700 Subject: [PATCH 078/591] Atomically upsert a contribution by identifiers rather than _id --- .../domains/contributions/repository.py | 31 +++ .../domains/contributions/service.py | 22 +- .../unit/domains/test_contribution_service.py | 198 ++++++++---------- 3 files changed, 125 insertions(+), 126 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py index 5134669a0c..f7ffdd88b7 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py @@ -109,6 +109,37 @@ async def update_contribution(self, doc: Contribution, update_data: dict[str, An """Apply a partial update to an existing Contribution document.""" await doc.update(Set(update_data)) + async def upsert_contribution_by_identifiers( + self, + identifiers: dict[str, str], + contribution: ContributionIn, + ) -> Contribution: + """Atomically upsert a Contribution by its identifying fields. + + Relies on the unique index over those fields so that concurrent requests targeting the + same key cannot both win the insert branch. Fields the caller did not set are not touched + (partial update). On insert a fresh Contribution document is written with ``is_public=False``. + + Args: + identifiers: the fields ContributionIn.identifiers() returns (project, identifier) + contribution: the input payload to upsert + + Returns: + Contribution: the document as it stands after the operation + """ + doc = self.document_model.from_input_model(contribution) + update_data = doc.model_dump(exclude={"id"}, exclude_none=True) + query = self.document_model.find_one( + self._scope, + self.document_model.project == identifiers["project"], + self.document_model.identifier == identifiers["identifier"], + ).upsert( + Set(update_data), + on_insert=doc, + response_type=UpdateResponse.NEW_DOCUMENT, + ) + return await query # pyright: ignore[reportGeneralTypeIssues] # beanie UpdateQuery is awaitable, but pyright doesn't see it + async def upsert_contribution_by_id(self, id: str, contribution: ContributionIn): """Upserts a single Contribution. diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py index d67c659ee8..01c59f34ac 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py @@ -239,16 +239,16 @@ async def _do_insert(self, contrib: ContributionIn, session: AsyncClientSession) return await self._contributions.insert_contribution(doc, session=session) async def upsert_contributions(self, contributions: list[ContributionIn]) -> list[Contribution]: - """Upsert contributions by their identifying fields, bounded by a concurrency cap. + """Upsert contributions by their identifying fields, bounded by concurrency caps. Components (structures, tables, attachments) must be managed via their respective services. If any contribution in the batch carries components, the entire request is rejected before any database writes occur. - Each item is looked up by ``ContributionIn.identifiers()``; an existing document is - partially updated (None fields are dropped), a missing one is inserted. Concurrent - upserts are capped by ``settings.mongo.max_concurrent_transactions`` so a large batch - cannot exhaust the connection pool. + Each item is upserted atomically by ``ContributionIn.identifiers()`` via a single + ``findOneAndUpdate(..., upsert=True)`` so two requests targeting the same key cannot + race past the find branch — the unique index over those fields is the tiebreaker. + Concurrent upserts within a batch are bounded by ``settings.mongo.max_concurrent_transactions`` Args: contributions: contributions to upsert; must not include nested components @@ -267,16 +267,6 @@ async def upsert_contributions(self, contributions: list[ContributionIn]) -> lis async def _bounded_upsert(contrib: ContributionIn) -> Contribution: async with sem: - return await self._upsert_one(contrib) + return await self._contributions.upsert_contribution_by_identifiers(contrib.identifiers(), contrib) return await asyncio.gather(*[_bounded_upsert(c) for c in contributions]) - - async def _upsert_one(self, contrib: ContributionIn) -> Contribution: - """Partial-update if a document with the same identifiers exists, otherwise insert.""" - doc = Contribution.from_input_model(contrib) - existing = await self._contributions.find_one_contribution(**contrib.identifiers()) - if existing is not None: - update_data = doc.model_dump(exclude={"id"}, exclude_none=True) - await self._contributions.update_contribution(existing, update_data) - return existing - return await self._contributions.insert_contribution(doc) diff --git a/mpcontribs-api/tests/unit/domains/test_contribution_service.py b/mpcontribs-api/tests/unit/domains/test_contribution_service.py index e23f5443fa..b1050e0727 100644 --- a/mpcontribs-api/tests/unit/domains/test_contribution_service.py +++ b/mpcontribs-api/tests/unit/domains/test_contribution_service.py @@ -7,6 +7,7 @@ - upsert_contributions: guard against components, insert vs update branching """ +import asyncio from unittest.mock import AsyncMock, MagicMock import polars as pl @@ -150,6 +151,7 @@ def _make_service( attachments=None, client=None, settings: MongoSettings | None = None, + write_slots: asyncio.Semaphore | None = None, ) -> tuple[ContributionService, AsyncMock, AsyncMock, AsyncMock, AsyncMock, MagicMock]: contrib_repo = contributions or AsyncMock() struct_repo = structures or AsyncMock() @@ -163,6 +165,7 @@ def _make_service( structures=struct_repo, tables=table_repo, attachments=attach_repo, + write_slots=write_slots or asyncio.Semaphore(50), settings=settings or _make_mongo_settings(), ) return svc, contrib_repo, struct_repo, table_repo, attach_repo, client @@ -481,161 +484,136 @@ async def test_raises_before_any_db_write(self): dirty = _contrib_in(structures=[_structure_in()]) with pytest.raises(ValidationError): await svc.upsert_contributions([dirty]) + contrib_repo.upsert_contribution_by_identifiers.assert_not_called() contrib_repo.find_one_contribution.assert_not_called() contrib_repo.insert_contribution.assert_not_called() contrib_repo.update_contribution.assert_not_called() # --------------------------------------------------------------------------- -# upsert_contributions — insert path (no existing doc) +# upsert_contributions — atomic dispatch # --------------------------------------------------------------------------- -class TestUpsertContributionsInsertPath: - async def test_insert_called_when_no_existing_doc(self): +class TestUpsertContributionsAtomic: + async def test_calls_atomic_repo_method_once_per_item(self): svc, contrib_repo, *_ = _make_service() - contrib_repo.find_one_contribution.return_value = None - inserted = MagicMock(spec=Contribution) - contrib_repo.insert_contribution.return_value = inserted + contrib_repo.upsert_contribution_by_identifiers.return_value = MagicMock(spec=Contribution) - result = await svc.upsert_contributions([_contrib_in()]) - - contrib_repo.insert_contribution.assert_called_once() - assert result[0] is inserted - - async def test_new_doc_is_public_false(self): - svc, contrib_repo, *_ = _make_service() - contrib_repo.find_one_contribution.return_value = None - - captured = [] - - async def _capture(doc): - captured.append(doc) - return doc - - contrib_repo.insert_contribution.side_effect = _capture - - await svc.upsert_contributions([_contrib_in()]) + contribs = [_contrib_in(identifier=f"mp-{i}") for i in range(3)] + results = await svc.upsert_contributions(contribs) - assert len(captured) == 1 - assert captured[0].is_public is False + assert len(results) == 3 + assert contrib_repo.upsert_contribution_by_identifiers.call_count == 3 + # The legacy read-then-write path must not be used + contrib_repo.find_one_contribution.assert_not_called() + contrib_repo.update_contribution.assert_not_called() + contrib_repo.insert_contribution.assert_not_called() - async def test_find_uses_project_and_identifier(self): + async def test_passes_identifiers_dict_and_input_to_repo(self): svc, contrib_repo, *_ = _make_service() - contrib_repo.find_one_contribution.return_value = None - contrib_repo.insert_contribution.return_value = MagicMock(spec=Contribution) + contrib_repo.upsert_contribution_by_identifiers.return_value = MagicMock(spec=Contribution) contrib = _contrib_in(project="my-proj", identifier="mp-99") await svc.upsert_contributions([contrib]) - contrib_repo.find_one_contribution.assert_called_once_with(project="my-proj", identifier="mp-99") + call = contrib_repo.upsert_contribution_by_identifiers.call_args + assert call.args[0] == {"project": "my-proj", "identifier": "mp-99"} + assert call.args[1] is contrib - async def test_update_not_called_on_insert_path(self): + async def test_returns_repo_results_in_input_order(self): svc, contrib_repo, *_ = _make_service() - contrib_repo.find_one_contribution.return_value = None - contrib_repo.insert_contribution.return_value = MagicMock(spec=Contribution) + docs = [MagicMock(spec=Contribution, name=f"doc-{i}") for i in range(3)] + returned = {} - await svc.upsert_contributions([_contrib_in()]) - - contrib_repo.update_contribution.assert_not_called() - - -# --------------------------------------------------------------------------- -# upsert_contributions — update path (existing doc found) -# --------------------------------------------------------------------------- - - -class TestUpsertContributionsUpdatePath: - async def test_update_called_when_existing_doc_found(self): - svc, contrib_repo, *_ = _make_service() - existing = MagicMock(spec=Contribution) - contrib_repo.find_one_contribution.return_value = existing - contrib_repo.update_contribution.return_value = None - - await svc.upsert_contributions([_contrib_in()]) - - contrib_repo.update_contribution.assert_called_once() + async def _upsert(identifiers, contrib): + doc = docs[int(contrib.identifier.split("-")[1])] + returned[contrib.identifier] = doc + return doc - async def test_returns_existing_doc_on_update(self): - svc, contrib_repo, *_ = _make_service() - existing = MagicMock(spec=Contribution) - contrib_repo.find_one_contribution.return_value = existing - contrib_repo.update_contribution.return_value = None + contrib_repo.upsert_contribution_by_identifiers.side_effect = _upsert - result = await svc.upsert_contributions([_contrib_in()]) + contribs = [_contrib_in(identifier=f"mp-{i}") for i in range(3)] + results = await svc.upsert_contributions(contribs) - assert result[0] is existing + assert results == [returned["mp-0"], returned["mp-1"], returned["mp-2"]] - async def test_insert_not_called_on_update_path(self): + async def test_empty_batch_returns_empty_list(self): svc, contrib_repo, *_ = _make_service() - existing = MagicMock(spec=Contribution) - contrib_repo.find_one_contribution.return_value = existing - contrib_repo.update_contribution.return_value = None - - await svc.upsert_contributions([_contrib_in()]) - - contrib_repo.insert_contribution.assert_not_called() + results = await svc.upsert_contributions([]) + assert results == [] + contrib_repo.upsert_contribution_by_identifiers.assert_not_called() - async def test_update_data_excludes_id(self): + async def test_same_key_concurrent_upserts_both_go_through_atomic_call(self): + """Race-safety regression: two items with the same (project, identifier) in one batch + must both reach the atomic repo method. The repo (via the unique index) is the + tiebreaker — the service must not pre-deduplicate or otherwise swallow one. + """ svc, contrib_repo, *_ = _make_service() - existing = MagicMock(spec=Contribution) - contrib_repo.find_one_contribution.return_value = existing - contrib_repo.update_contribution.return_value = None + contrib_repo.upsert_contribution_by_identifiers.return_value = MagicMock(spec=Contribution) - await svc.upsert_contributions([_contrib_in(formula="SiO2")]) + contribs = [ + _contrib_in(project="p", identifier="same"), + _contrib_in(project="p", identifier="same"), + ] + results = await svc.upsert_contributions(contribs) - update_data = contrib_repo.update_contribution.call_args[0][1] - assert "id" not in update_data + assert len(results) == 2 + assert contrib_repo.upsert_contribution_by_identifiers.call_count == 2 - async def test_update_data_excludes_none_fields(self): - svc, contrib_repo, *_ = _make_service() - existing = MagicMock(spec=Contribution) - contrib_repo.find_one_contribution.return_value = existing - contrib_repo.update_contribution.return_value = None - await svc.upsert_contributions([_contrib_in(formula="SiO2")]) +# --------------------------------------------------------------------------- +# Process-wide write_slots semaphore is honored +# --------------------------------------------------------------------------- - update_data = contrib_repo.update_contribution.call_args[0][1] - assert all(v is not None for v in update_data.values()) +class TestProcessWideWriteSlots: + async def test_upsert_acquires_global_write_slot(self): + write_slots = asyncio.Semaphore(1) + svc, contrib_repo, *_ = _make_service(write_slots=write_slots) -# --------------------------------------------------------------------------- -# upsert_contributions — concurrent batch behavior -# --------------------------------------------------------------------------- + in_flight = 0 + peak = 0 + async def _upsert(identifiers, contrib): + nonlocal in_flight, peak + in_flight += 1 + peak = max(peak, in_flight) + await asyncio.sleep(0) # let other coroutines try to enter + in_flight -= 1 + return MagicMock(spec=Contribution) -class TestUpsertContributionsBatch: - async def test_all_contribs_processed(self): - svc, contrib_repo, *_ = _make_service() - contrib_repo.find_one_contribution.return_value = None - contrib_repo.insert_contribution.return_value = MagicMock(spec=Contribution) + contrib_repo.upsert_contribution_by_identifiers.side_effect = _upsert contribs = [_contrib_in(identifier=f"mp-{i}") for i in range(5)] - results = await svc.upsert_contributions(contribs) + await svc.upsert_contributions(contribs) - assert len(results) == 5 - assert contrib_repo.insert_contribution.call_count == 5 + assert peak == 1 # global semaphore of 1 must serialize all 5 - async def test_mixed_insert_and_update_batch(self): - svc, contrib_repo, *_ = _make_service() - existing = MagicMock(spec=Contribution) + async def test_insert_with_components_acquires_global_write_slot(self): + write_slots = asyncio.Semaphore(1) + svc, contrib_repo, struct_repo, table_repo, attach_repo, _ = _make_service(write_slots=write_slots) - async def _find(project, identifier): - return existing if identifier == "mp-0" else None + struct_repo.insert_structures.return_value = [_fake_structure()] + table_repo.insert_tables.return_value = [] + attach_repo.insert_attachments.return_value = [] - contrib_repo.find_one_contribution.side_effect = _find - contrib_repo.update_contribution.return_value = None - contrib_repo.insert_contribution.return_value = MagicMock(spec=Contribution) + in_flight = 0 + peak = 0 - contribs = [_contrib_in(identifier=f"mp-{i}") for i in range(3)] - await svc.upsert_contributions(contribs) + async def _insert(doc, session=None): + nonlocal in_flight, peak + in_flight += 1 + peak = max(peak, in_flight) + await asyncio.sleep(0) + in_flight -= 1 + return doc - assert contrib_repo.update_contribution.call_count == 1 - assert contrib_repo.insert_contribution.call_count == 2 + contrib_repo.insert_contribution.side_effect = _insert - async def test_empty_batch_returns_empty_list(self): - svc, *_ = _make_service() - results = await svc.upsert_contributions([]) - assert results == [] + contribs = [_contrib_in(identifier=f"c{i}", structures=[_structure_in()]) for i in range(4)] + await svc.insert_contributions(contribs) + + assert peak == 1 From 2bce5edfa054b351780c0139e4a952155ec2fbb3 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 8 Jun 2026 17:03:54 -0700 Subject: [PATCH 079/591] Contributions delete children on bulk delete --- .../mpcontribs_api/domains/_shared/bulk.py | 5 ++ .../domains/_shared/repository.py | 6 +- .../domains/contributions/repository.py | 15 +++-- .../domains/contributions/service.py | 57 +++++++++++++++++-- 4 files changed, 71 insertions(+), 12 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/bulk.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/bulk.py index c76784e241..718e2c580f 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/bulk.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/bulk.py @@ -27,6 +27,11 @@ class BulkWriteSummary[T](BaseModel): failed: list[BulkFailure] +class BulkDeleteSummary[T](BaseModel): + num_deleted: int + num_children_deleted: int + + def bulk_failure_from_exception(index: int, identifier: dict[str, Any] | None, exc: BaseException) -> BulkFailure: """Translate any exception into a BulkFailure entry. diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py index 3610b15a76..e87b395fef 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py @@ -66,9 +66,9 @@ def _not_found(self, id: str) -> str: async def get_many( self, - pagination: CursorParams, filter: TFilter, - fields: frozenset[str] | None, + fields: frozenset[str] | None = None, + pagination: CursorParams | None = None, ) -> Page[TOut]: """Return a scoped, filtered, cursor-paginated page of projected documents. @@ -77,6 +77,8 @@ async def get_many( filter (TFilter): the fastapi-filter query to apply on top of the user scope fields (frozenset[str] | None): fields to project; if None the full document is returned """ + pagination = pagination or CursorParams() + projection = self.out_model.projection(fields) query = filter.filter(self.document_model.find(self._scope)) if pagination.cursor is not None: diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py index f7ffdd88b7..7654c4997f 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py @@ -3,6 +3,7 @@ from beanie import UpdateResponse from beanie.operators import Set from pymongo.asynchronous.client_session import AsyncClientSession +from pymongo.results import DeleteResult from mpcontribs_api.auth import User from mpcontribs_api.domains._shared.repository import MongoDbRepository @@ -47,9 +48,9 @@ def _build_scope(user: User) -> dict[str, Any]: async def get_contributions( self, - pagination: CursorParams, filter: ContributionFilter, - fields: frozenset[str] | None, + pagination: CursorParams | None = None, + fields: frozenset[str] | None = None, ): """Query the Contribution collection, scoped to the current user. See ``get_many``.""" return await self.get_many(pagination=pagination, filter=filter, fields=fields) @@ -66,14 +67,16 @@ async def delete_contribution_by_id(self, id: str) -> None: """Delete a contribution by id, scoped to the current user. See ``delete_by_id``.""" await self.delete_by_id(self._convert_object_id(id)) - async def delete_contributions(self, filter: ContributionFilter): - """Bulk deletion of Contributions described by the filter + async def delete_contributions( + self, + filter: ContributionFilter, + ) -> DeleteResult | None: + """Bulk deletion of Contributions described by the filter. Args: filter (ContribtionFilter): the filter to use to identify contributions to delete """ - docs = filter.filter(self.document_model.find(self._scope)) - await docs.delete() + return await filter.filter(self.document_model.find(self._scope)).delete_many() async def insert_many_contributions( self, diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py index 01c59f34ac..f2ef09de0b 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py @@ -3,22 +3,28 @@ from typing import cast import structlog -from beanie import Link +from beanie import Link, PydanticObjectId from pymongo import AsyncMongoClient from pymongo.asynchronous.client_session import AsyncClientSession from pymongo.errors import BulkWriteError from mpcontribs_api.config import MongoSettings, get_settings -from mpcontribs_api.domains._shared.bulk import BulkFailure, BulkWriteSummary, bulk_failure_from_exception +from mpcontribs_api.domains._shared.bulk import ( + BulkDeleteSummary, + BulkFailure, + BulkWriteSummary, + bulk_failure_from_exception, +) from mpcontribs_api.domains.attachments.models import Attachment from mpcontribs_api.domains.attachments.repository import MongoDbAttachmentRepository -from mpcontribs_api.domains.contributions.models import Contribution, ContributionIn +from mpcontribs_api.domains.contributions.models import Contribution, ContributionFilter, ContributionIn from mpcontribs_api.domains.contributions.repository import MongoDbContributionRepository from mpcontribs_api.domains.structures.models import Structure from mpcontribs_api.domains.structures.repository import MongoDbStructureRepository from mpcontribs_api.domains.tables.models import Table from mpcontribs_api.domains.tables.repository import MongoDbTableRepository from mpcontribs_api.exceptions import AppError, ValidationError +from mpcontribs_api.pagination import CursorParams logger = structlog.get_logger(__name__) @@ -35,6 +41,11 @@ def __init__( ): self._client = client self._contributions = contributions + self._children = { + "structures": structures, + "attachments": attachments, + "tables": tables, + } self._structures = structures self._attachments = attachments self._tables = tables @@ -44,7 +55,7 @@ async def insert_contributions( self, contributions: list[ContributionIn], ) -> BulkWriteSummary[Contribution]: - """Bulk insert contributions, atomically per top-level contribution. + """Atomic bulk insert contributions, atomically per top-level contribution. Contributions carrying no components are inserted in one ``insert_many`` (no transaction); contributions with components run inside their own MongoDB transaction so the contribution @@ -270,3 +281,41 @@ async def _bounded_upsert(contrib: ContributionIn) -> Contribution: return await self._contributions.upsert_contribution_by_identifiers(contrib.identifiers(), contrib) return await asyncio.gather(*[_bounded_upsert(c) for c in contributions]) + + async def delete_contributions(self, filter: ContributionFilter) -> BulkDeleteSummary: + """Delete a contribution and all of its child components + + Doesn't guarantee complete atomicity, but prevents orphaned children by deleting components first. + + Args: + filter (ContributionFilter): the Contribution-specific query to apply on top of the user scope + + + Returns: + BulkDeleteSummary: a summary of how many documents and child documents were deleted + """ + num_deleted_components = 0 + num_deleted_contributions = 0 + # Loop through cursor rather than materialize arbitrary number of Contributions + while True: + page = await self._contributions.get_contributions( + pagination=CursorParams(cursor=None, limit=100), + filter=filter, + ) + # For each component type, gather ObjectIds then bulk delete them + # - components first so no children are left orphaned + for field, repo in self._children.items(): + ids = [link.ref.id for c in page.items for link in getattr(c, field)] + if ids: + deleted_components = await repo.delete_by_ids(ids) + num_deleted_components += deleted_components.deleted_count if deleted_components else 0 + + # Delete Contributions in this batch by ID + # need to make a new filter so we don't eagerly delete all contributions before their components are deleted + deleted_contribs = await self._contributions.delete_contributions( + ContributionFilter(id__in=[cast(PydanticObjectId, c.id) for c in page.items]) + ) + num_deleted_contributions += deleted_contribs.deleted_count if deleted_contribs else 0 + if not page.items: + break + return BulkDeleteSummary(num_deleted=num_deleted_contributions, num_children_deleted=num_deleted_components) From d3c8bf0aa5a74b9312095c86860afd421088e3f6 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 8 Jun 2026 17:07:54 -0700 Subject: [PATCH 080/591] Deleting contribution by id deletes all children --- .../src/mpcontribs_api/domains/contributions/models.py | 6 +++++- .../src/mpcontribs_api/domains/contributions/router.py | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py index f0586dabff..0d3b0cb27a 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py @@ -13,7 +13,7 @@ ) from fastapi_filter import FilterDepends, with_prefix from fastapi_filter.contrib.beanie import Filter -from pydantic import Field +from pydantic import Field, field_validator from pymongo import ASCENDING, IndexModel from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut @@ -149,3 +149,7 @@ class ContributionFilter(Filter): class Constants(Filter.Constants): model = Contribution + + @field_validator("id", mode="before") + def convert_str_to_OId(self, v: str): + return PydanticObjectId(v) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py index b64a6bcf5c..52e8e3bb4c 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py @@ -66,10 +66,10 @@ async def download_contributions( @router.delete("{id}") async def delete_contribtion_by_id( - repo: ContributionDep, + service: ContributionServiceDep, id: str, ): - return await repo.delete_contribution_by_id(id=id) + return await service.delete_contributions(ContributionFilter.model_validate({"id": id})) @router.get("{id}") From 6d6b4edd038a8bdc97cc4e47d491b3f82bac3659 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Tue, 9 Jun 2026 10:13:16 -0700 Subject: [PATCH 081/591] Further parameterized the AsyncMongoClient --- mpcontribs-api/src/mpcontribs_api/app.py | 9 ++++++- mpcontribs-api/src/mpcontribs_api/config.py | 24 ++++++++++++++++++- .../domains/contributions/router.py | 1 + 3 files changed, 32 insertions(+), 2 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/app.py b/mpcontribs-api/src/mpcontribs_api/app.py index 8431f9ba6d..05e2645401 100644 --- a/mpcontribs-api/src/mpcontribs_api/app.py +++ b/mpcontribs-api/src/mpcontribs_api/app.py @@ -30,9 +30,16 @@ async def lifespan(app: FastAPI) -> AsyncGenerator[None]: # --- startup --- client = AsyncMongoClient( settings.mongo.uri.get_secret_value(), + appname=settings.mongo.app_name, maxPoolSize=settings.mongo.max_pool_size, minPoolSize=settings.mongo.min_pool_size, + maxIdleTimeMS=settings.mongo.max_idle_time_ms, + timeoutMS=settings.mongo.timeout_ms, serverSelectionTimeoutMS=settings.mongo.server_selection_timeout_ms, + retryWrite=True, + retryReads=True, + compressors=settings.mongo.compressors, + readPreference=settings.mongo.read_preference, uuidRepresentation="standard", ) # Fail fast if the DB is unreachable @@ -56,7 +63,7 @@ async def lifespan(app: FastAPI) -> AsyncGenerator[None]: try: yield finally: - # --- shutdown --- + # shutdown await client.close() logger.info("mongo client closed") diff --git a/mpcontribs-api/src/mpcontribs_api/config.py b/mpcontribs-api/src/mpcontribs_api/config.py index 428ce887ec..3055103fd7 100644 --- a/mpcontribs-api/src/mpcontribs_api/config.py +++ b/mpcontribs-api/src/mpcontribs_api/config.py @@ -22,6 +22,11 @@ class MongoSettings(BaseModel): uri: SecretStr = Field(description="The full uri from MongoDB (username and password included)") db_name: str + app_name: str = Field( + default="MPContribs_FastAPI_Server", + description="The name of the application that created this AsyncMongoClient instance. The server will log this " + "value upon establishing each connection. It is also recorded in the slow query log and profile collections.", + ) max_pool_size: int = Field( default=100, description="Maximum number of allowed concurrent connection to each server. Can be '0' or 'None', both of " @@ -36,7 +41,7 @@ class MongoSettings(BaseModel): description="Specifies how UTC datetimes should be decoded within BSON", ) server_selection_timeout_ms: int = Field( - default=30000, + default=30_000, description="Controls how long (in milliseconds) the driver will wait to find an available, appropriate server " "to carry out a database operation;" "while it is waiting, multiple server monitoring operations may be carried out", @@ -48,6 +53,18 @@ class MongoSettings(BaseModel): "consumed by auth.", ) + compressors: str = Field( + default="snappy,zstd,zlib", + description="Comma separated list of compressors for wire protocol compression. Compression support must also " + "be enabled on the server", + ) + + read_preference: str = Field( + default="primary", + description="The replica set read preference for this client. One of primary, primaryPreferred, secondary, " + "secondaryPreferred, or nearest", + ) + # TODO: Tune default max_concurrent_transactions: int = Field( default=16, @@ -66,6 +83,11 @@ class MongoSettings(BaseModel): default=100, description="Batch size used by component repositories when chunking insert_many calls inside a transaction.", ) + max_idle_time_ms: int = Field( + default=30_000, + description="The maximum allowed time a single connection is allowed to sit idle", + ) + timeout_ms: int = Field(default=60_000, description="The end-to-end allowed time for an operation") @model_validator(mode="after") def _clamp_concurrency(self): diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py index 52e8e3bb4c..348bfa73c8 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py @@ -37,6 +37,7 @@ async def delete_contributions( return await repo.delete_contributions(filter=filter) +# TODO: Might want to take contributions in from request body and run model_validate_json on it (much faster) @router.post("", response_model=BulkWriteSummary[Contribution]) async def insert_contributions( service: ContributionServiceDep, From 24fa834f5e4ff53f588020a6bd78eb1b7126786a Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Tue, 9 Jun 2026 10:15:05 -0700 Subject: [PATCH 082/591] Fixed spacing issues --- mpcontribs-api/src/mpcontribs_api/_openapi.py | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/_openapi.py b/mpcontribs-api/src/mpcontribs_api/_openapi.py index 4c3c99b5c6..49b3f813ca 100644 --- a/mpcontribs-api/src/mpcontribs_api/_openapi.py +++ b/mpcontribs-api/src/mpcontribs_api/_openapi.py @@ -1,45 +1,45 @@ openapi_tags = [ { "name": "projects", - "description": "contain provenance information about contributed datasets. Deleting projects will also delete" - "all contributions including tables, structures, attachments, notebooks and cards for the project. Only users" - "who have been added to a project can update its contents. While unpublished, only users on the project can" - "retrieve its data or view it on the Portal. Making a project public does not automatically publish all its" - "contributions, tables, attachments, and structures. These are separately set to public individually or in" + "description": "contain provenance information about contributed datasets. Deleting projects will also delete " + "all contributions including tables, structures, attachments, notebooks and cards for the project. Only users " + "who have been added to a project can update its contents. While unpublished, only users on the project can " + "retrieve its data or view it on the Portal. Making a project public does not automatically publish all its " + "contributions, tables, attachments, and structures. These are separately set to public individually or in " "bulk.", }, { "name": "contributions", - "description": "contain simple hierarchical data which will show up as cards on the MP details page for MP" - "material(s). Tables (rows and columns), structures, and attachments can be added to a contribution." - "Each contribution uses `mp-id` or composition as identifier to associate its data with the according entries" - "on MP. Only admins or users on the project can create, update or delete contributions, and while unpublished," - "retrieve its data or view it on the Portal. Contribution components (tables, structures, and attachments) are" + "description": "contain simple hierarchical data which will show up as cards on the MP details page for MP " + "material(s). Tables (rows and columns), structures, and attachments can be added to a contribution. " + "Each contribution uses `mp-id` or composition as identifier to associate its data with the according entries " + "on MP. Only admins or users on the project can create, update or delete contributions, and while unpublished, " + "retrieve its data or view it on the Portal. Contribution components (tables, structures, and attachments) are " "deleted along with a contribution.", }, # TODO: Check that this is the right link { "name": "structures", - "description": "are [pymatgen structures](https://pymatgen.org/pymatgen.electronic_structure.html) which can be" - "added to a contribution.", + "description": "are [pymatgen structures](https://pymatgen.org/pymatgen.electronic_structure.html) which can " + " be added to a contribution.", }, { "name": "tables", - "description": "are simple spreadsheet-type tables with columns and rows saved as" - "[Polars DataFrames](https://docs.pola.rs/api/python/stable/reference/dataframe/index.html) which can be added" + "description": "are simple spreadsheet-type tables with columns and rows saved as " + "[Polars DataFrames](https://docs.pola.rs/api/python/stable/reference/dataframe/index.html) which can be added " "to a contribution.", }, { "name": "attachments", - "description": "are files saved as objects in AWS S3 and not accessible for querying (only retrieval) which can" - "be added to a contribution.", + "description": "are files saved as objects in AWS S3 and not accessible for querying (only retrieval) which " + "can be added to a contribution.", }, { "name": "notebooks", "description": "are" - "[Jupyter notebook](https://jupyter-notebook.readthedocs.io/en/stable/notebook.html#notebook-documents)" - "documents generated and saved when a contribution is saved. They form the basis for Contribution Details Pages" - "on the Portal.", + "[Jupyter notebook](https://jupyter-notebook.readthedocs.io/en/stable/notebook.html#notebook-documents) " + "documents generated and saved when a contribution is saved. They form the basis for Contribution Details " + "Pages on the Portal.", }, ] From 8f965d0c209f5e358960cd270c7c2bc55b1ffddd Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Tue, 9 Jun 2026 13:59:07 -0700 Subject: [PATCH 083/591] Added table routes --- .../domains/tables/dependencies.py | 13 +++++ .../mpcontribs_api/domains/tables/models.py | 26 +++++++-- .../domains/tables/repository.py | 34 ++++++++++-- .../mpcontribs_api/domains/tables/router.py | 53 +++++++++++++++++++ 4 files changed, 118 insertions(+), 8 deletions(-) create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/tables/dependencies.py create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/tables/router.py diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/dependencies.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/dependencies.py new file mode 100644 index 0000000000..84e6a46ab7 --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/dependencies.py @@ -0,0 +1,13 @@ +from typing import Annotated + +from fastapi import Depends + +from mpcontribs_api.dependencies import UserDep +from mpcontribs_api.domains.tables.repository import MongoDbTableRepository + + +def get_scoped_tables(user: UserDep) -> MongoDbTableRepository: + return MongoDbTableRepository(user) + + +TableDep = Annotated[MongoDbTableRepository, Depends(get_scoped_tables)] diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py index a6a61fdc9d..f0234f833a 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py @@ -1,3 +1,5 @@ +from typing import Any + import polars as pl from beanie import PydanticObjectId from fastapi_filter.contrib.beanie import Filter @@ -11,8 +13,8 @@ ) from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut +from mpcontribs_api.domains._shared.types import MD5Hash from mpcontribs_api.projection import SparseFieldsModel -from mpcontribs_api.types import MD5Hash class Labels(BaseModel): @@ -125,7 +127,7 @@ class Constants(Filter.Constants): model = Table -class TableOut(BaseModel): +class TableSummaryOut(BaseModel): """Metadata-only table as embedded in contribution responses (no data).""" attrs: Attributes @@ -134,9 +136,27 @@ class TableOut(BaseModel): total_data_pages: int = 1 -class TableDocumentOut(DocumentOut[PydanticObjectId]): +class TableOut(DocumentOut[PydanticObjectId]): name: str | None = None md5: MD5Hash | None = None + attrs: Attributes | None = None + columns: list[Any] | None = None + total_data_rows: int | None = None + total_data_pages: int | None = None + index: list[Any] | None = None + data: pl.DataFrame | None = None + + @staticmethod + def default_fields() -> list[str]: + return [ + "id", + "name", + "md5", + "attrs", + "columns", + "total_data_rows", + "total_data_pages", + ] class TablePatch(SparseFieldsModel): diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py index a0adc06a1e..1887eeb2e5 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py @@ -5,18 +5,20 @@ from mpcontribs_api.auth import User from mpcontribs_api.config import get_settings from mpcontribs_api.domains._shared.repository import MongoDbRepository +from mpcontribs_api.domains._shared.types import DownloadFormat from mpcontribs_api.domains.tables.models import ( Table, - TableDocumentOut, TableFilter, TableIn, + TableOut, TablePatch, ) +from mpcontribs_api.pagination import CursorParams, Page -class MongoDbTableRepository(MongoDbRepository[Table, TableIn, TableDocumentOut, TableFilter, TablePatch]): +class MongoDbTableRepository(MongoDbRepository[Table, TableIn, TableOut, TableFilter, TablePatch]): document_model = Table - out_model = TableDocumentOut + out_model = TableOut @staticmethod def _build_scope(user: User) -> dict[str, Any]: @@ -35,8 +37,30 @@ async def insert_tables( """ if not tables: return [] - docs = [Table.model_validate(t.model_dump()) for t in tables] + docs = [self.document_model.model_validate(t.model_dump()) for t in tables] chunk_size = get_settings().mongo.component_insert_chunk_size for start in range(0, len(docs), chunk_size): - await Table.insert_many(docs[start : start + chunk_size], ordered=False, session=session) + await self.document_model.insert_many(docs[start : start + chunk_size], ordered=False, session=session) return docs + + async def get_tables( + self, + filter: TableFilter, + pagination: CursorParams, + fields: frozenset[str] | None, + ) -> Page[TableOut]: + """Query the Table collection, scoped to the current user. See ``get_many``.""" + return await self.get_many(pagination=pagination, filter=filter, fields=fields) + + async def get_table_by_id(self, id: str, fields: frozenset[str] | None): + """Find a single table by id, scoped to the current user. See ``get_by_id``.""" + return await self.get_by_id(id, fields) + + async def download_tables( + self, + format: DownloadFormat, + short_mime: str, + filter: TableFilter, + fields: frozenset[str] | None, + ): + pass diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py new file mode 100644 index 0000000000..78e5f51a10 --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py @@ -0,0 +1,53 @@ +from typing import Annotated + +from fastapi import APIRouter, Depends +from fastapi_filter import FilterDepends + +from mpcontribs_api.domains._shared.bulk import BulkWriteSummary +from mpcontribs_api.domains._shared.types import DownloadFormat, FieldSelector +from mpcontribs_api.domains.tables.dependencies import TableDep +from mpcontribs_api.domains.tables.models import Table, TableFilter, TableIn, TableOut +from mpcontribs_api.pagination import CursorParams, Page + +router = APIRouter(tags=["components", "tables"]) + + +@router.get("", response_model=Page[TableOut]) +async def get_tables( + repo: TableDep, + pagination: Annotated[CursorParams, Depends()], + filter: TableFilter = FilterDepends(TableFilter), + fields: FieldSelector = TableOut.default_fields(), +): + selected = TableOut.parse_fields(fields) + return await repo.get_tables(filter=filter, fields=selected, pagination=pagination) + + +@router.get("{pk}", response_model=TableOut) +async def get_table( + repo: TableDep, + pk: str, + fields: FieldSelector = TableOut.default_fields(), +): + selected = TableOut.parse_fields(fields) + return await repo.get_table_by_id(id=pk, fields=selected) + + +@router.get("/download/{short_mime}") +async def download_table( + repo: TableDep, + format: DownloadFormat, + short_mime: str = "gz", + filter: TableFilter = FilterDepends(TableFilter), + fields: FieldSelector = TableOut.default_fields(), +): + selected = TableOut.parse_fields(fields) + return await repo.download_tables(format=format, short_mime=short_mime, filter=filter, fields=selected) + + +@router.post("", response_model=BulkWriteSummary[Table]) +async def insert_tables( + repo: TableDep, + tables: list[TableIn], +): + return await repo.insert_tables(tables=tables) From c979f3d1796eb695d8f4b7e91192cbd3768f63c7 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Tue, 9 Jun 2026 13:59:26 -0700 Subject: [PATCH 084/591] Moved types to shared domains --- .../src/mpcontribs_api/{ => domains/_shared}/types.py | 8 +++++++- .../src/mpcontribs_api/domains/attachments/models.py | 2 +- .../src/mpcontribs_api/domains/contributions/models.py | 2 +- .../src/mpcontribs_api/domains/contributions/router.py | 2 +- .../src/mpcontribs_api/domains/projects/models.py | 2 +- .../src/mpcontribs_api/domains/projects/router.py | 2 +- .../src/mpcontribs_api/domains/structures/models.py | 2 +- mpcontribs-api/tests/unit/test_types.py | 2 +- 8 files changed, 14 insertions(+), 8 deletions(-) rename mpcontribs-api/src/mpcontribs_api/{ => domains/_shared}/types.py (92%) diff --git a/mpcontribs-api/src/mpcontribs_api/types.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py similarity index 92% rename from mpcontribs-api/src/mpcontribs_api/types.py rename to mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py index 0507663843..60aee2e4bc 100644 --- a/mpcontribs-api/src/mpcontribs_api/types.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py @@ -1,5 +1,6 @@ import re -from typing import Annotated +from enum import StrEnum +from typing import Annotated, Literal from fastapi import Query from pydantic import BeforeValidator, Field @@ -56,3 +57,8 @@ def _mime_like(v: str) -> str: MimeFormat = Annotated[str, BeforeValidator(_mime_like)] + + +class DownloadFormat(StrEnum): + JSON = "json" + CSV = "csv" diff --git a/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py b/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py index a71e5d8996..e32c8af0d9 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py @@ -2,8 +2,8 @@ from fastapi_filter.contrib.beanie import Filter from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut +from mpcontribs_api.domains._shared.types import FileLike, MD5Hash, MimeFormat from mpcontribs_api.projection import SparseFieldsModel -from mpcontribs_api.types import FileLike, MD5Hash, MimeFormat class Attachment(BaseDocumentWithInput[PydanticObjectId]): diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py index 0d3b0cb27a..f612b0eb21 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py @@ -17,11 +17,11 @@ from pymongo import ASCENDING, IndexModel from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut +from mpcontribs_api.domains._shared.types import ShortStr from mpcontribs_api.domains.attachments.models import Attachment, AttachmentFilter, AttachmentIn from mpcontribs_api.domains.structures.models import Structure, StructureFilter, StructureIn from mpcontribs_api.domains.tables.models import Table, TableFilter, TableIn from mpcontribs_api.projection import SparseFieldsModel -from mpcontribs_api.types import ShortStr class ContributionBase(BaseDocumentWithInput[PydanticObjectId]): diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py index 348bfa73c8..ce2050e107 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py @@ -4,6 +4,7 @@ from fastapi_filter import FilterDepends from mpcontribs_api.domains._shared.bulk import BulkWriteSummary +from mpcontribs_api.domains._shared.types import FieldSelector from mpcontribs_api.domains.contributions.dependencies import ContributionDep, ContributionServiceDep from mpcontribs_api.domains.contributions.models import ( Contribution, @@ -13,7 +14,6 @@ ContributionPatch, ) from mpcontribs_api.pagination import CursorParams -from mpcontribs_api.types import FieldSelector router = APIRouter(tags=["contributions"]) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py index 15a4758879..84082b58cf 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py @@ -7,7 +7,7 @@ from mpcontribs_api import pagination from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut -from mpcontribs_api.types import PrefixedEmail, ShortStr +from mpcontribs_api.domains._shared.types import PrefixedEmail, ShortStr class Column(BaseModel): diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py index 9e16ff6568..a89a67ba28 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py @@ -4,6 +4,7 @@ from fastapi_filter import FilterDepends from starlette.status import HTTP_204_NO_CONTENT +from mpcontribs_api.domains._shared.types import FieldSelector from mpcontribs_api.domains.projects.dependencies import ProjectDep from mpcontribs_api.domains.projects.models import ( ProjectFilter, @@ -12,7 +13,6 @@ ProjectPatch, ) from mpcontribs_api.pagination import CursorParams -from mpcontribs_api.types import FieldSelector router = APIRouter(tags=["projects"]) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py index e770dc87f2..7dfce210ad 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py @@ -5,8 +5,8 @@ from pymatgen.core import Element from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut +from mpcontribs_api.domains._shared.types import MD5Hash from mpcontribs_api.projection import SparseFieldsModel -from mpcontribs_api.types import MD5Hash class SiteProperties(BaseModel): diff --git a/mpcontribs-api/tests/unit/test_types.py b/mpcontribs-api/tests/unit/test_types.py index 64b0102cdd..46c43d8bf8 100644 --- a/mpcontribs-api/tests/unit/test_types.py +++ b/mpcontribs-api/tests/unit/test_types.py @@ -3,7 +3,7 @@ from pydantic import ValidationError as PydanticValidationError from mpcontribs_api.exceptions import ValidationError as AppValidationError -from mpcontribs_api.types import PrefixedEmail, ShortStr, _validate_prefixed_email +from mpcontribs_api.domains._shared.types import PrefixedEmail, ShortStr, _validate_prefixed_email class ShortStrModel(BaseModel): From ddb8b7fc88ce6fde1bff9b915d3a4ae23609ebae Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Tue, 9 Jun 2026 13:59:41 -0700 Subject: [PATCH 085/591] Removed unused import --- mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py index 60aee2e4bc..64931df487 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py @@ -1,6 +1,6 @@ import re from enum import StrEnum -from typing import Annotated, Literal +from typing import Annotated from fastapi import Query from pydantic import BeforeValidator, Field From fa456ad70fd4e81ad9c7407d0c048f00957b5cb8 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 10 Jun 2026 12:08:06 -0700 Subject: [PATCH 086/591] Added session to delete_by_id and made a DeleteResponse model --- .../src/mpcontribs_api/domains/_shared/models.py | 6 +++++- .../mpcontribs_api/domains/_shared/repository.py | 13 +++++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py index 3f82b2455e..48c3bfeec5 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py @@ -1,7 +1,7 @@ from typing import Annotated, Any, Self from beanie import DocumentWithSoftDelete, PydanticObjectId -from pydantic import Field +from pydantic import BaseModel, Field from mpcontribs_api import pagination from mpcontribs_api.projection import SparseFieldsModel @@ -42,3 +42,7 @@ class DocumentOut[TId](SparseFieldsModel): """ id: Annotated[TId | None, Field(alias="_id", serialization_alias="id")] = None + + +class DeleteResponse(BaseModel): + num_deleted: int diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py index e87b395fef..d7222db7f9 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py @@ -6,9 +6,10 @@ from bson.errors import InvalidId from fastapi_filter.contrib.beanie import Filter from pydantic import BaseModel +from pymongo.asynchronous.client_session import AsyncClientSession from mpcontribs_api.auth import User -from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut +from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DeleteResponse, DocumentOut from mpcontribs_api.exceptions import ConflictError, NotFoundError, ValidationError from mpcontribs_api.pagination import CursorParams, Page, encode_cursor @@ -89,7 +90,7 @@ async def get_many( next_cursor = encode_cursor(str(items[-1].id)) if has_more and items else None return Page(items=items, next_cursor=next_cursor) - async def get_by_id(self, id: Any, fields: frozenset[str] | None): + async def get_by_id(self, id: Any, fields: frozenset[str] | None) -> TDoc | TOut | None: """Return a single scoped document by id, projected to the requested fields. Args: @@ -115,7 +116,7 @@ async def insert_one(self, in_resource: TIn) -> TDoc: await document.insert() return document - async def delete_by_id(self, id: Any) -> None: + async def delete_by_id(self, id: Any, session: AsyncClientSession | None = None) -> DeleteResponse: """Delete a single scoped document by id. Scoping ensures callers cannot delete documents they are not permitted to see. @@ -123,7 +124,11 @@ async def delete_by_id(self, id: Any) -> None: Args: id (str): the id of the document to delete """ - await self.document_model.find_one(self._scope, self.document_model.id == id).delete() + doc = await self.document_model.find_one(self._scope, self.document_model.id == id, session=session) + if not doc: + raise NotFoundError("Document with id not found", id=id) + await doc.delete(session=session) + return DeleteResponse(num_deleted=1) async def patch(self, id: Any, update: TPatch) -> TDoc: """Partially update a single scoped document by id. From 93d60e074f6931f09c5b0f85d1fb15f013449788 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 10 Jun 2026 12:08:30 -0700 Subject: [PATCH 087/591] Fleshed out basic CRUD operations for Tables --- .../domains/tables/repository.py | 61 ++++++++++++++++++- .../mpcontribs_api/domains/tables/router.py | 25 ++++++++ 2 files changed, 85 insertions(+), 1 deletion(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py index 1887eeb2e5..4a9f7952b9 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py @@ -4,6 +4,7 @@ from mpcontribs_api.auth import User from mpcontribs_api.config import get_settings +from mpcontribs_api.domains._shared.models import DeleteResponse from mpcontribs_api.domains._shared.repository import MongoDbRepository from mpcontribs_api.domains._shared.types import DownloadFormat from mpcontribs_api.domains.tables.models import ( @@ -13,6 +14,7 @@ TableOut, TablePatch, ) +from mpcontribs_api.exceptions import AppError from mpcontribs_api.pagination import CursorParams, Page @@ -24,6 +26,7 @@ class MongoDbTableRepository(MongoDbRepository[Table, TableIn, TableOut, TableFi def _build_scope(user: User) -> dict[str, Any]: return {} + # TODO: Returned docs don't have IDs assigned to them async def insert_tables( self, tables: list[TableIn], @@ -43,6 +46,24 @@ async def insert_tables( await self.document_model.insert_many(docs[start : start + chunk_size], ordered=False, session=session) return docs + async def insert_table(self, table: TableIn) -> Table: + """Insert a single table. + + Args: + table (TableIn): the table to insert + + Returns: + Table: the table actually in the database + + Raises: + AppError: If insert_one returns None, raises + """ + doc = self.document_model.model_validate(table.model_dump()) + full_doc = await self.document_model.insert_one(doc) + if not full_doc: + raise AppError("Error inserting Table", table=table) + return full_doc + async def get_tables( self, filter: TableFilter, @@ -52,7 +73,7 @@ async def get_tables( """Query the Table collection, scoped to the current user. See ``get_many``.""" return await self.get_many(pagination=pagination, filter=filter, fields=fields) - async def get_table_by_id(self, id: str, fields: frozenset[str] | None): + async def get_table_by_id(self, id: str, fields: frozenset[str] | None) -> Table | TableOut | None: """Find a single table by id, scoped to the current user. See ``get_by_id``.""" return await self.get_by_id(id, fields) @@ -64,3 +85,41 @@ async def download_tables( fields: frozenset[str] | None, ): pass + + async def delete_tables( + self, + filter: TableFilter, + session: AsyncClientSession | None = None, + ) -> DeleteResponse: + """Deletes all tables matching ``filter``. + + Args: + filter (TableFilter): the query to filter tables by + session (AsyncClientSession | None): the current session, used to guarantee transactions + + Returns: + DeleteResponse: A report of the deletion + """ + query = filter.filter(self.document_model.find(self._scope, session=session)) + result = await query.delete(session=session) + return DeleteResponse(num_deleted=result.deleted_count if result else 0) + + async def delete_table_by_id( + self, + id: str, + session: AsyncClientSession | None = None, + ) -> DeleteResponse: + """Deletes a single table by Id. + + Args: + id (str): the str representation of the Table's ObjectId + session (AsyncClientSession | None): the current session, used to guarantee transactions + + Returns: + DeleteResponse: A report of the deletion + """ + return await self.delete_by_id(id=id, session=session) + + async def patch_table_by_id(self, id: str, update: TablePatch) -> Table: + """Partially update a Table by id, scoped to the current user. See ``patch``.""" + return await self.patch(self._convert_object_id(id), update) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py index 78e5f51a10..49c2cecfe3 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py @@ -4,6 +4,7 @@ from fastapi_filter import FilterDepends from mpcontribs_api.domains._shared.bulk import BulkWriteSummary +from mpcontribs_api.domains._shared.models import DeleteResponse from mpcontribs_api.domains._shared.types import DownloadFormat, FieldSelector from mpcontribs_api.domains.tables.dependencies import TableDep from mpcontribs_api.domains.tables.models import Table, TableFilter, TableIn, TableOut @@ -51,3 +52,27 @@ async def insert_tables( tables: list[TableIn], ): return await repo.insert_tables(tables=tables) + + +@router.delete("", response_model=DeleteResponse) +async def delete_tables( + repo: TableDep, + filter: TableFilter = FilterDepends(TableFilter) +): + return await repo.delete_tables(filter=filter) + + +@router.delete("/{id}", response_model=DeleteResponse) +async def delete_table_by_id( + repo: TableDep, + id: str +): + return await repo.delete_table_by_id(id=id) + + +@router.patch("{id}") +async def patch_table_by_id( + repo: TableDep, + id: str +) + return await repo.patch_table_by_id(id=id) From b6278e0c8cb4f940220850661899753155bbdae6 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 10 Jun 2026 12:09:24 -0700 Subject: [PATCH 088/591] Added missing update to patch endpoint --- mpcontribs-api/src/mpcontribs_api/domains/tables/router.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py index 49c2cecfe3..e6f5667b7f 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py @@ -7,7 +7,7 @@ from mpcontribs_api.domains._shared.models import DeleteResponse from mpcontribs_api.domains._shared.types import DownloadFormat, FieldSelector from mpcontribs_api.domains.tables.dependencies import TableDep -from mpcontribs_api.domains.tables.models import Table, TableFilter, TableIn, TableOut +from mpcontribs_api.domains.tables.models import Table, TableFilter, TableIn, TableOut, TablePatch from mpcontribs_api.pagination import CursorParams, Page router = APIRouter(tags=["components", "tables"]) @@ -73,6 +73,7 @@ async def delete_table_by_id( @router.patch("{id}") async def patch_table_by_id( repo: TableDep, - id: str + id: str, + update: TablePatch ) - return await repo.patch_table_by_id(id=id) + return await repo.patch_table_by_id(id=id, update=update) From be8b7fd9936e33a3dea94c679d5fa9eef79336ae Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 10 Jun 2026 12:10:10 -0700 Subject: [PATCH 089/591] Added missing colon in patch function def --- .../src/mpcontribs_api/domains/tables/router.py | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py index e6f5667b7f..142916b066 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py @@ -55,18 +55,12 @@ async def insert_tables( @router.delete("", response_model=DeleteResponse) -async def delete_tables( - repo: TableDep, - filter: TableFilter = FilterDepends(TableFilter) -): +async def delete_tables(repo: TableDep, filter: TableFilter = FilterDepends(TableFilter)): return await repo.delete_tables(filter=filter) @router.delete("/{id}", response_model=DeleteResponse) -async def delete_table_by_id( - repo: TableDep, - id: str -): +async def delete_table_by_id(repo: TableDep, id: str): return await repo.delete_table_by_id(id=id) @@ -74,6 +68,6 @@ async def delete_table_by_id( async def patch_table_by_id( repo: TableDep, id: str, - update: TablePatch -) + update: TablePatch, +): return await repo.patch_table_by_id(id=id, update=update) From b1977f84fcf404fa9533785559508a07bb5d3b53 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 10 Jun 2026 15:42:51 -0700 Subject: [PATCH 090/591] Fleshed out streaming download to user with compression --- mpcontribs-api/src/mpcontribs_api/app.py | 1 + .../mpcontribs_api/domains/_shared/types.py | 2 +- .../mpcontribs_api/domains/tables/models.py | 8 +++ .../domains/tables/repository.py | 57 +++++++++++++++++-- .../mpcontribs_api/domains/tables/router.py | 28 ++++++--- 5 files changed, 84 insertions(+), 12 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/app.py b/mpcontribs-api/src/mpcontribs_api/app.py index 05e2645401..89b1b95fa8 100644 --- a/mpcontribs-api/src/mpcontribs_api/app.py +++ b/mpcontribs-api/src/mpcontribs_api/app.py @@ -87,6 +87,7 @@ def create_app(settings: Settings | None = None) -> FastAPI: openapi_tags=openapi_tags, ) + # Add request context to the logger app.add_middleware(RequestContextMiddleware) register_exception_handlers(app) app.include_router(healthcheck_router, prefix="/health") diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py index 64931df487..ce11e17164 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py @@ -60,5 +60,5 @@ def _mime_like(v: str) -> str: class DownloadFormat(StrEnum): - JSON = "json" + JSONL = "jsonl" CSV = "csv" diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py index f0234f833a..b0bc6ab4aa 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py @@ -126,6 +126,14 @@ class TableFilter(Filter): class Constants(Filter.Constants): model = Table + @field_serializer("id", "id__in", "id__neq") + def id_to_str(self, v: PydanticObjectId | list[PydanticObjectId] | None) -> str | list[str] | None: + if v is None: + return None + if isinstance(v, list): + return sorted(str(o) for o in v) + return str(v) + class TableSummaryOut(BaseModel): """Metadata-only table as embedded in contribution responses (no data).""" diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py index 4a9f7952b9..2d90e199b3 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py @@ -1,4 +1,8 @@ -from typing import Any +import hashlib +import json +import zlib +from collections.abc import AsyncIterable +from typing import Any, Literal from pymongo.asynchronous.client_session import AsyncClientSession @@ -77,14 +81,59 @@ async def get_table_by_id(self, id: str, fields: frozenset[str] | None) -> Table """Find a single table by id, scoped to the current user. See ``get_by_id``.""" return await self.get_by_id(id, fields) + def _hash_payload(self, payload: dict[str, Any], *, separators: tuple[str, str] = (",", ":")) -> str: + canonical = json.dumps( + payload, + sort_keys=True, + separators=separators, + ensure_ascii=True, + ) + return hashlib.sha256(canonical.encode("utf-8")).hexdigest() + async def download_tables( self, format: DownloadFormat, - short_mime: str, + short_mime: Literal["gz", None], + ignore_cache: bool, filter: TableFilter, fields: frozenset[str] | None, - ): - pass + ) -> AsyncIterable[bytes]: + # Hash parameters to generate key for cache + payload = { + "format": format, + "short_mime": short_mime, + "filter": filter.model_dump(), + "fields": sorted(fields) if fields else None, + } + _ = self._hash_payload(payload) + + # Check S3 for the cached file + # TODO: Implement + if not ignore_cache: + pass + + # If not found in cache, build from MongoDB and save to cache + query = filter.filter(self.document_model.find(self._scope)) + query = filter.sort(query) + + # Compress using gzip level 9 and stream out + compressor = zlib.compressobj(9, zlib.DEFLATED, 16 + zlib.MAX_WBITS) + buf = bytearray() + async for table in query: + # TODO: We might think about skipping validation to save time + out = self.out_model.model_validate(table, from_attributes=True) + line = out.model_dump_json().encode() + b"\n" + chunk = compressor.compress(line) + if chunk: + # TODO: Cache in S3 as multi-part upload so we stream to user and to S3 simultaneously, + # can then remove buf + buf += chunk + yield chunk + tail = compressor.flush() + if tail: + # TODO: Final upload final part to S3 in multi-part upload, remove buf + buf += tail + yield tail async def delete_tables( self, diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py index 142916b066..c26ce8dc0a 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py @@ -1,6 +1,7 @@ -from typing import Annotated +from typing import Annotated, Literal -from fastapi import APIRouter, Depends +from fastapi import APIRouter, Depends, Response +from fastapi.responses import StreamingResponse from fastapi_filter import FilterDepends from mpcontribs_api.domains._shared.bulk import BulkWriteSummary @@ -34,16 +35,29 @@ async def get_table( return await repo.get_table_by_id(id=pk, fields=selected) -@router.get("/download/{short_mime}") +@router.get("download/{short_mime}") async def download_table( repo: TableDep, + response: Response, format: DownloadFormat, - short_mime: str = "gz", + short_mime: Literal["gz", None] = "gz", + ignore_cache: bool = False, filter: TableFilter = FilterDepends(TableFilter), fields: FieldSelector = TableOut.default_fields(), -): +) -> StreamingResponse: selected = TableOut.parse_fields(fields) - return await repo.download_tables(format=format, short_mime=short_mime, filter=filter, fields=selected) + body = repo.download_tables( + format=format, + short_mime=short_mime, + ignore_cache=ignore_cache, + filter=filter, + fields=selected, + ) + return StreamingResponse( + body, + media_type="application/gzip", + headers={"Content-Disposition": 'attachment; filename="tables.jsonl.gz"'}, + ) @router.post("", response_model=BulkWriteSummary[Table]) @@ -59,7 +73,7 @@ async def delete_tables(repo: TableDep, filter: TableFilter = FilterDepends(Tabl return await repo.delete_tables(filter=filter) -@router.delete("/{id}", response_model=DeleteResponse) +@router.delete("{id}", response_model=DeleteResponse) async def delete_table_by_id(repo: TableDep, id: str): return await repo.delete_table_by_id(id=id) From f199f9f682f25ab7c0830f8313c8b9ff7f8cbfa3 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 10 Jun 2026 15:55:24 -0700 Subject: [PATCH 091/591] Removed unused response paramter from download_table --- mpcontribs-api/src/mpcontribs_api/domains/tables/router.py | 1 - 1 file changed, 1 deletion(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py index c26ce8dc0a..f7d7e003ef 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py @@ -38,7 +38,6 @@ async def get_table( @router.get("download/{short_mime}") async def download_table( repo: TableDep, - response: Response, format: DownloadFormat, short_mime: Literal["gz", None] = "gz", ignore_cache: bool = False, From dc8e53b2b3db7b415315a6ca1131e7e0081a3b54 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 10 Jun 2026 16:25:20 -0700 Subject: [PATCH 092/591] Added shared repository for components --- .../domains/_shared/components.py | 172 ++++++++++++++++++ 1 file changed, 172 insertions(+) create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py new file mode 100644 index 0000000000..6044d07466 --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py @@ -0,0 +1,172 @@ +import hashlib +import json +import zlib +from collections.abc import AsyncIterable +from typing import Any, Literal + +from fastapi_filter.contrib.beanie import Filter +from pydantic import BaseModel +from pymongo.asynchronous.client_session import AsyncClientSession + +from mpcontribs_api.auth import User +from mpcontribs_api.config import get_settings +from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DeleteResponse, DocumentOut +from mpcontribs_api.domains._shared.repository import MongoDbRepository +from mpcontribs_api.domains._shared.types import DownloadFormat +from mpcontribs_api.exceptions import AppError +from mpcontribs_api.pagination import CursorParams, Page + + +class MongoDbComponentsRepository[ + TDoc: BaseDocumentWithInput, + TIn: BaseModel, + TOut: DocumentOut, + TFilter: Filter, # not FilterDepends — see below + TPatch: BaseModel, +](MongoDbRepository[TDoc, TIn, TOut, TFilter, TPatch]): + @staticmethod + def _build_scope(user: User) -> dict[str, Any]: + return {} + + # TODO: Returned docs don't have IDs assigned to them + async def insert_components( + self, + components: list[TIn], + session: AsyncClientSession | None = None, + ) -> list[TDoc]: + """Bulk-insert components, chunked to fit within a transaction's payload budget. + + Args: + components (list[TIn]): components to insert + session (AsyncClientSession): optional client session; pass when inserting inside a transaction + """ + if not components: + return [] + docs = [self.document_model.model_validate(t.model_dump()) for t in components] + chunk_size = get_settings().mongo.component_insert_chunk_size + for start in range(0, len(docs), chunk_size): + await self.document_model.insert_many(docs[start : start + chunk_size], ordered=False, session=session) + return docs + + async def insert_component(self, component: TIn) -> TDoc: + """Insert a single component. + + Args: + component (TIn): the table to insert + + Returns: + TDpc: the component actually in the database + + Raises: + AppError: If insert_one returns None, raises + """ + doc = self.document_model.model_validate(component.model_dump()) + full_doc = await self.document_model.insert_one(doc) + if not full_doc: + raise AppError("Error inserting Table", table=component) + return full_doc + + async def get_components( + self, + filter: TFilter, + pagination: CursorParams, + fields: frozenset[str] | None, + ) -> Page[TOut]: + """Query the component collection, scoped to the current user. See ``get_many``.""" + return await self.get_many(pagination=pagination, filter=filter, fields=fields) + + async def get_component_by_id(self, id: str, fields: frozenset[str] | None) -> TDoc | TOut | None: + """Find a single table by id, scoped to the current user. See ``get_by_id``.""" + return await self.get_by_id(id, fields) + + def _hash_payload(self, payload: dict[str, Any], *, separators: tuple[str, str] = (",", ":")) -> str: + canonical = json.dumps( + payload, + sort_keys=True, + separators=separators, + ensure_ascii=True, + ) + return hashlib.sha256(canonical.encode("utf-8")).hexdigest() + + async def download_components( + self, + format: DownloadFormat, + short_mime: Literal["gz", None], + ignore_cache: bool, + filter: TFilter, + fields: frozenset[str] | None, + ) -> AsyncIterable[bytes]: + # Hash parameters to generate key for cache + payload = { + "format": format, + "short_mime": short_mime, + "filter": filter.model_dump(), + "fields": sorted(fields) if fields else None, + } + _ = self._hash_payload(payload) + + # Check S3 for the cached file + # TODO: Implement + if not ignore_cache: + pass + + # If not found in cache, build from MongoDB and save to cache + query = filter.filter(self.document_model.find(self._scope)) + query = filter.sort(query) + + # Compress using gzip level 9 and stream out + compressor = zlib.compressobj(9, zlib.DEFLATED, 16 + zlib.MAX_WBITS) + buf = bytearray() + async for table in query: + # TODO: We might think about skipping validation to save time + out = self.out_model.model_validate(table, from_attributes=True) + line = out.model_dump_json().encode() + b"\n" + chunk = compressor.compress(line) + if chunk: + # TODO: Cache in S3 as multi-part upload so we stream to user and to S3 simultaneously, + # can then remove buf + buf += chunk + yield chunk + tail = compressor.flush() + if tail: + # TODO: Final upload final part to S3 in multi-part upload, remove buf + buf += tail + yield tail + + async def delete_components( + self, + filter: TFilter, + session: AsyncClientSession | None = None, + ) -> DeleteResponse: + """Deletes all components matching ``filter``. + + Args: + filter (TFilter): the query to filter components by + session (AsyncClientSession | None): the current session, used to guarantee transactions + + Returns: + DeleteResponse: A report of the deletion + """ + query = filter.filter(self.document_model.find(self._scope, session=session)) + result = await query.delete(session=session) + return DeleteResponse(num_deleted=result.deleted_count if result else 0) + + async def delete_component_by_id( + self, + id: str, + session: AsyncClientSession | None = None, + ) -> DeleteResponse: + """Deletes a single component by Id. + + Args: + id (str): the str representation of the component's ObjectId + session (AsyncClientSession | None): the current session, used to guarantee transactions + + Returns: + DeleteResponse: A report of the deletion + """ + return await self.delete_by_id(id=id, session=session) + + async def patch_component_by_id(self, id: str, update: TPatch) -> TDoc: + """Partially update a component by id, scoped to the current user. See ``patch``.""" + return await self.patch(self._convert_object_id(id), update) From 2572d1d6eadd8648867abbd400aacd8f788eb043 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 10 Jun 2026 16:25:53 -0700 Subject: [PATCH 093/591] Added Structures endpoint and refatored to use shared components repo --- .../domains/structures/dependencies.py | 13 +++ .../domains/structures/models.py | 10 ++ .../domains/structures/repository.py | 105 +++++++++++++++--- .../domains/structures/router.py | 87 +++++++++++++++ .../domains/tables/repository.py | 105 ++++-------------- .../mpcontribs_api/domains/tables/router.py | 4 +- 6 files changed, 222 insertions(+), 102 deletions(-) create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/structures/dependencies.py create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/structures/router.py diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/dependencies.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/dependencies.py new file mode 100644 index 0000000000..deb8fc7567 --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/domains/structures/dependencies.py @@ -0,0 +1,13 @@ +from typing import Annotated + +from fastapi import Depends + +from mpcontribs_api.dependencies import UserDep +from mpcontribs_api.domains.structures.repository import MongoDbStructureRepository + + +def get_scoped_tables(user: UserDep) -> MongoDbStructureRepository: + return MongoDbStructureRepository(user) + + +StructureDep = Annotated[MongoDbStructureRepository, Depends(get_scoped_tables)] diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py index 7dfce210ad..4b148bf288 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py @@ -83,9 +83,19 @@ class StructureOut(DocumentOut[PydanticObjectId]): name: str | None = None md5: MD5Hash | None = None + @staticmethod + def default_fields() -> list[str]: + return [ + "id", + "name", + "md5", + ] + class StructurePatch(SparseFieldsModel): name: str | None = None + lattice: Lattice | None = None + sites: Site | None = None class StructureFilter(Filter): diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/repository.py index 96feb08545..65ddbd866c 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/structures/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/structures/repository.py @@ -1,10 +1,11 @@ -from typing import Any +from collections.abc import AsyncIterable +from typing import Literal from pymongo.asynchronous.client_session import AsyncClientSession -from mpcontribs_api.auth import User -from mpcontribs_api.config import get_settings -from mpcontribs_api.domains._shared.repository import MongoDbRepository +from mpcontribs_api.domains._shared.components import MongoDbComponentsRepository +from mpcontribs_api.domains._shared.models import DeleteResponse +from mpcontribs_api.domains._shared.types import DownloadFormat from mpcontribs_api.domains.structures.models import ( Structure, StructureFilter, @@ -12,18 +13,15 @@ StructureOut, StructurePatch, ) +from mpcontribs_api.pagination import CursorParams, Page class MongoDbStructureRepository( - MongoDbRepository[Structure, StructureIn, StructureOut, StructureFilter, StructurePatch] + MongoDbComponentsRepository[Structure, StructureIn, StructureOut, StructureFilter, StructurePatch] ): document_model = Structure out_model = StructureOut - @staticmethod - def _build_scope(user: User) -> dict[str, Any]: - return {} - async def insert_structures( self, structures: list[StructureIn], @@ -33,12 +31,85 @@ async def insert_structures( Args: structures: structures to insert - session: optional client session; pass when inserting inside a transaction + session: optional client session; pass when inserStructureIng inside a transaction + """ + return await self.insert_structures(structures=structures, session=session) + + async def insert_structure(self, structure: StructureIn) -> Structure: + """Insert a single structure. + + Args: + structure (StructureIn): the table to insert + + Returns: + TDpc: the structure actually in the database + + Raises: + AppError: If insert_one returns None, raises """ - if not structures: - return [] - docs = [Structure.model_validate(s.model_dump()) for s in structures] - chunk_size = get_settings().mongo.component_insert_chunk_size - for start in range(0, len(docs), chunk_size): - await Structure.insert_many(docs[start : start + chunk_size], ordered=False, session=session) - return docs + return await self.insert_component(component=structure) + + async def get_structures( + self, + filter: StructureFilter, + pagination: CursorParams, + fields: frozenset[str] | None, + ) -> Page[StructureOut]: + """Query the structure collection, scoped to the current user. See ``get_many``.""" + return await self.get_components(pagination=pagination, filter=filter, fields=fields) + + async def get_structure_by_id(self, id: str, fields: frozenset[str] | None) -> Structure | StructureOut | None: + """Find a single table by id, scoped to the current user. See ``get_by_id``.""" + return await self.get_component_by_id(id, fields) + + async def download_structures( + self, + format: DownloadFormat, + short_mime: Literal["gz", None], + ignore_cache: bool, + filter: StructureFilter, + fields: frozenset[str] | None, + ) -> AsyncIterable[bytes]: + return self.download_components( + format=format, + short_mime=short_mime, + ignore_cache=ignore_cache, + filter=filter, + fields=fields, + ) + + async def delete_structures( + self, + filter: StructureFilter, + session: AsyncClientSession | None = None, + ) -> DeleteResponse: + """Deletes all structures matching ``filter``. + + Args: + filter (StructureFilter): the query to filter structures by + session (AsyncClientSession | None): the current session, used to guarantee transactions + + Returns: + DeleteResponse: A report of the deletion + """ + return await self.delete_components(filter=filter, session=session) + + async def delete_structure_by_id( + self, + id: str, + session: AsyncClientSession | None = None, + ) -> DeleteResponse: + """Deletes a single structure by Id. + + Args: + id (str): the str representation of the structure's ObjectId + session (AsyncClientSession | None): the current session, used to guarantee transactions + + Returns: + DeleteResponse: A report of the deletion + """ + return await self.delete_component_by_id(id=id, session=session) + + async def patch_structure_by_id(self, id: str, update: StructurePatch) -> Structure: + """Partially update a structure by id, scoped to the current user. See ``patch``.""" + return await self.patch_component_by_id(id=id, update=update) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py new file mode 100644 index 0000000000..e793e666d6 --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py @@ -0,0 +1,87 @@ +from typing import Annotated, Literal + +from fastapi import APIRouter, Depends, Response +from fastapi.responses import StreamingResponse +from fastapi_filter import FilterDepends + +from mpcontribs_api.domains._shared.bulk import BulkWriteSummary +from mpcontribs_api.domains._shared.models import DeleteResponse +from mpcontribs_api.domains._shared.types import DownloadFormat, FieldSelector +from mpcontribs_api.domains.structures.dependencies import StructureDep +from mpcontribs_api.domains.structures.models import StructureFilter, StructureIn, StructureOut, StructurePatch +from mpcontribs_api.pagination import CursorParams, Page + +router = APIRouter(tags=["components", "structures"]) + + +@router.get("", response_model=Page[StructureOut]) +async def get_structures( + repo: StructureDep, + pagination: Annotated[CursorParams, Depends()], + filter: StructureFilter = FilterDepends(StructureFilter), + fields: FieldSelector = StructureOut.default_fields(), +): + selected = StructureOut.parse_fields(fields) + return await repo.get_structures(filter=filter, fields=selected, pagination=pagination) + + +@router.get("{pk}", response_model=StructureOut) +async def get_structure( + repo: StructureDep, + pk: str, + fields: FieldSelector = StructureOut.default_fields(), +): + selected = StructureOut.parse_fields(fields) + return await repo.get_structure_by_id(id=pk, fields=selected) + + +@router.get("download/{short_mime}") +async def download_structure( + repo: StructureDep, + response: Response, + format: DownloadFormat, + short_mime: Literal["gz", None] = "gz", + ignore_cache: bool = False, + filter: StructureFilter = FilterDepends(StructureFilter), + fields: FieldSelector = StructureOut.default_fields(), +) -> StreamingResponse: + selected = StructureOut.parse_fields(fields) + body = await repo.download_structures( + format=format, + short_mime=short_mime, + ignore_cache=ignore_cache, + filter=filter, + fields=selected, + ) + return StreamingResponse( + body, + media_type="application/gzip", + headers={"Content-Disposition": 'attachment; filename="structures.jsonl.gz"'}, + ) + + +@router.post("", response_model=BulkWriteSummary[StructureOut]) +async def insert_structures( + repo: StructureDep, + structures: list[StructureIn], +): + return await repo.insert_structures(structures=structures) + + +@router.delete("", response_model=DeleteResponse) +async def delete_structures(repo: StructureDep, filter: StructureFilter = FilterDepends(StructureFilter)): + return await repo.delete_structures(filter=filter) + + +@router.delete("{id}", response_model=DeleteResponse) +async def delete_structure_by_id(repo: StructureDep, id: str): + return await repo.delete_structure_by_id(id=id) + + +@router.patch("{id}") +async def patch_structure_by_id( + repo: StructureDep, + id: str, + update: StructurePatch, +): + return await repo.patch_structure_by_id(id=id, update=update) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py index 2d90e199b3..1184ded32b 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py @@ -1,15 +1,10 @@ -import hashlib -import json -import zlib from collections.abc import AsyncIterable -from typing import Any, Literal +from typing import Literal from pymongo.asynchronous.client_session import AsyncClientSession -from mpcontribs_api.auth import User -from mpcontribs_api.config import get_settings +from mpcontribs_api.domains._shared.components import MongoDbComponentsRepository from mpcontribs_api.domains._shared.models import DeleteResponse -from mpcontribs_api.domains._shared.repository import MongoDbRepository from mpcontribs_api.domains._shared.types import DownloadFormat from mpcontribs_api.domains.tables.models import ( Table, @@ -18,19 +13,13 @@ TableOut, TablePatch, ) -from mpcontribs_api.exceptions import AppError from mpcontribs_api.pagination import CursorParams, Page -class MongoDbTableRepository(MongoDbRepository[Table, TableIn, TableOut, TableFilter, TablePatch]): +class MongoDbTableRepository(MongoDbComponentsRepository[Table, TableIn, TableOut, TableFilter, TablePatch]): document_model = Table out_model = TableOut - @staticmethod - def _build_scope(user: User) -> dict[str, Any]: - return {} - - # TODO: Returned docs don't have IDs assigned to them async def insert_tables( self, tables: list[TableIn], @@ -40,15 +29,9 @@ async def insert_tables( Args: tables: tables to insert - session: optional client session; pass when inserting inside a transaction + session: optional client session; pass when inserTableIng inside a transaction """ - if not tables: - return [] - docs = [self.document_model.model_validate(t.model_dump()) for t in tables] - chunk_size = get_settings().mongo.component_insert_chunk_size - for start in range(0, len(docs), chunk_size): - await self.document_model.insert_many(docs[start : start + chunk_size], ordered=False, session=session) - return docs + return await self.insert_tables(tables=tables, session=session) async def insert_table(self, table: TableIn) -> Table: """Insert a single table. @@ -57,16 +40,12 @@ async def insert_table(self, table: TableIn) -> Table: table (TableIn): the table to insert Returns: - Table: the table actually in the database + TDpc: the table actually in the database Raises: AppError: If insert_one returns None, raises """ - doc = self.document_model.model_validate(table.model_dump()) - full_doc = await self.document_model.insert_one(doc) - if not full_doc: - raise AppError("Error inserting Table", table=table) - return full_doc + return await self.insert_component(component=table) async def get_tables( self, @@ -74,21 +53,12 @@ async def get_tables( pagination: CursorParams, fields: frozenset[str] | None, ) -> Page[TableOut]: - """Query the Table collection, scoped to the current user. See ``get_many``.""" - return await self.get_many(pagination=pagination, filter=filter, fields=fields) + """Query the table collection, scoped to the current user. See ``get_many``.""" + return await self.get_components(pagination=pagination, filter=filter, fields=fields) async def get_table_by_id(self, id: str, fields: frozenset[str] | None) -> Table | TableOut | None: """Find a single table by id, scoped to the current user. See ``get_by_id``.""" - return await self.get_by_id(id, fields) - - def _hash_payload(self, payload: dict[str, Any], *, separators: tuple[str, str] = (",", ":")) -> str: - canonical = json.dumps( - payload, - sort_keys=True, - separators=separators, - ensure_ascii=True, - ) - return hashlib.sha256(canonical.encode("utf-8")).hexdigest() + return await self.get_component_by_id(id, fields) async def download_tables( self, @@ -98,42 +68,13 @@ async def download_tables( filter: TableFilter, fields: frozenset[str] | None, ) -> AsyncIterable[bytes]: - # Hash parameters to generate key for cache - payload = { - "format": format, - "short_mime": short_mime, - "filter": filter.model_dump(), - "fields": sorted(fields) if fields else None, - } - _ = self._hash_payload(payload) - - # Check S3 for the cached file - # TODO: Implement - if not ignore_cache: - pass - - # If not found in cache, build from MongoDB and save to cache - query = filter.filter(self.document_model.find(self._scope)) - query = filter.sort(query) - - # Compress using gzip level 9 and stream out - compressor = zlib.compressobj(9, zlib.DEFLATED, 16 + zlib.MAX_WBITS) - buf = bytearray() - async for table in query: - # TODO: We might think about skipping validation to save time - out = self.out_model.model_validate(table, from_attributes=True) - line = out.model_dump_json().encode() + b"\n" - chunk = compressor.compress(line) - if chunk: - # TODO: Cache in S3 as multi-part upload so we stream to user and to S3 simultaneously, - # can then remove buf - buf += chunk - yield chunk - tail = compressor.flush() - if tail: - # TODO: Final upload final part to S3 in multi-part upload, remove buf - buf += tail - yield tail + return self.download_components( + format=format, + short_mime=short_mime, + ignore_cache=ignore_cache, + filter=filter, + fields=fields, + ) async def delete_tables( self, @@ -149,9 +90,7 @@ async def delete_tables( Returns: DeleteResponse: A report of the deletion """ - query = filter.filter(self.document_model.find(self._scope, session=session)) - result = await query.delete(session=session) - return DeleteResponse(num_deleted=result.deleted_count if result else 0) + return await self.delete_components(filter=filter, session=session) async def delete_table_by_id( self, @@ -161,14 +100,14 @@ async def delete_table_by_id( """Deletes a single table by Id. Args: - id (str): the str representation of the Table's ObjectId + id (str): the str representation of the table's ObjectId session (AsyncClientSession | None): the current session, used to guarantee transactions Returns: DeleteResponse: A report of the deletion """ - return await self.delete_by_id(id=id, session=session) + return await self.delete_component_by_id(id=id, session=session) async def patch_table_by_id(self, id: str, update: TablePatch) -> Table: - """Partially update a Table by id, scoped to the current user. See ``patch``.""" - return await self.patch(self._convert_object_id(id), update) + """Partially update a table by id, scoped to the current user. See ``patch``.""" + return await self.patch_component_by_id(id=id, update=update) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py index f7d7e003ef..239bd45b25 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py @@ -1,6 +1,6 @@ from typing import Annotated, Literal -from fastapi import APIRouter, Depends, Response +from fastapi import APIRouter, Depends from fastapi.responses import StreamingResponse from fastapi_filter import FilterDepends @@ -45,7 +45,7 @@ async def download_table( fields: FieldSelector = TableOut.default_fields(), ) -> StreamingResponse: selected = TableOut.parse_fields(fields) - body = repo.download_tables( + body = await repo.download_tables( format=format, short_mime=short_mime, ignore_cache=ignore_cache, From 7277a9967e6bc72bc72b9f5fd949fb5d3f39c162 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 10 Jun 2026 16:31:21 -0700 Subject: [PATCH 094/591] Added Attachments endpoint --- .../domains/attachments/dependencies.py | 13 +++ .../domains/attachments/repository.py | 105 +++++++++++++++--- .../domains/attachments/router.py | 87 +++++++++++++++ .../domains/structures/repository.py | 2 +- 4 files changed, 189 insertions(+), 18 deletions(-) create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/attachments/dependencies.py create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py diff --git a/mpcontribs-api/src/mpcontribs_api/domains/attachments/dependencies.py b/mpcontribs-api/src/mpcontribs_api/domains/attachments/dependencies.py new file mode 100644 index 0000000000..59d6923ff0 --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/domains/attachments/dependencies.py @@ -0,0 +1,13 @@ +from typing import Annotated + +from fastapi import Depends + +from mpcontribs_api.dependencies import UserDep +from mpcontribs_api.domains.attachments.repository import MongoDbAttachmentRepository + + +def get_scoped_attachments(user: UserDep) -> MongoDbAttachmentRepository: + return MongoDbAttachmentRepository(user) + + +AttachmentDep = Annotated[MongoDbAttachmentRepository, Depends(get_scoped_attachments)] diff --git a/mpcontribs-api/src/mpcontribs_api/domains/attachments/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/attachments/repository.py index e3c7fbb9e5..62d0a5032b 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/attachments/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/attachments/repository.py @@ -1,10 +1,11 @@ -from typing import Any +from collections.abc import AsyncIterable +from typing import Literal from pymongo.asynchronous.client_session import AsyncClientSession -from mpcontribs_api.auth import User -from mpcontribs_api.config import get_settings -from mpcontribs_api.domains._shared.repository import MongoDbRepository +from mpcontribs_api.domains._shared.components import MongoDbComponentsRepository +from mpcontribs_api.domains._shared.models import DeleteResponse +from mpcontribs_api.domains._shared.types import DownloadFormat from mpcontribs_api.domains.attachments.models import ( Attachment, AttachmentFilter, @@ -12,18 +13,15 @@ AttachmentOut, AttachmentPatch, ) +from mpcontribs_api.pagination import CursorParams, Page class MongoDbAttachmentRepository( - MongoDbRepository[Attachment, AttachmentIn, AttachmentOut, AttachmentFilter, AttachmentPatch] + MongoDbComponentsRepository[Attachment, AttachmentIn, AttachmentOut, AttachmentFilter, AttachmentPatch] ): document_model = Attachment out_model = AttachmentOut - @staticmethod - def _build_scope(user: User) -> dict[str, Any]: - return {} - async def insert_attachments( self, attachments: list[AttachmentIn], @@ -33,12 +31,85 @@ async def insert_attachments( Args: attachments: attachments to insert - session: optional client session; pass when inserting inside a transaction + session: optional client session; pass when inserAttachmentIng inside a transaction + """ + return await self.insert_components(components=attachments, session=session) + + async def insert_attachment(self, attachment: AttachmentIn) -> Attachment: + """Insert a single attachment. + + Args: + attachment (AttachmentIn): the table to insert + + Returns: + TDpc: the attachment actually in the database + + Raises: + AppError: If insert_one returns None, raises """ - if not attachments: - return [] - docs = [Attachment.model_validate(a.model_dump()) for a in attachments] - chunk_size = get_settings().mongo.component_insert_chunk_size - for start in range(0, len(docs), chunk_size): - await Attachment.insert_many(docs[start : start + chunk_size], ordered=False, session=session) - return docs + return await self.insert_component(component=attachment) + + async def get_attachments( + self, + filter: AttachmentFilter, + pagination: CursorParams, + fields: frozenset[str] | None, + ) -> Page[AttachmentOut]: + """Query the attachment collection, scoped to the current user. See ``get_many``.""" + return await self.get_components(pagination=pagination, filter=filter, fields=fields) + + async def get_attachment_by_id(self, id: str, fields: frozenset[str] | None) -> Attachment | AttachmentOut | None: + """Find a single table by id, scoped to the current user. See ``get_by_id``.""" + return await self.get_component_by_id(id, fields) + + async def download_attachments( + self, + format: DownloadFormat, + short_mime: Literal["gz", None], + ignore_cache: bool, + filter: AttachmentFilter, + fields: frozenset[str] | None, + ) -> AsyncIterable[bytes]: + return self.download_components( + format=format, + short_mime=short_mime, + ignore_cache=ignore_cache, + filter=filter, + fields=fields, + ) + + async def delete_attachments( + self, + filter: AttachmentFilter, + session: AsyncClientSession | None = None, + ) -> DeleteResponse: + """Deletes all attachments matching ``filter``. + + Args: + filter (AttachmentFilter): the query to filter attachments by + session (AsyncClientSession | None): the current session, used to guarantee transactions + + Returns: + DeleteResponse: A report of the deletion + """ + return await self.delete_components(filter=filter, session=session) + + async def delete_attachment_by_id( + self, + id: str, + session: AsyncClientSession | None = None, + ) -> DeleteResponse: + """Deletes a single attachment by Id. + + Args: + id (str): the str representation of the attachment's ObjectId + session (AsyncClientSession | None): the current session, used to guarantee transactions + + Returns: + DeleteResponse: A report of the deletion + """ + return await self.delete_component_by_id(id=id, session=session) + + async def patch_attachment_by_id(self, id: str, update: AttachmentPatch) -> Attachment: + """Partially update a attachment by id, scoped to the current user. See ``patch``.""" + return await self.patch_component_by_id(id=id, update=update) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py b/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py new file mode 100644 index 0000000000..e793e666d6 --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py @@ -0,0 +1,87 @@ +from typing import Annotated, Literal + +from fastapi import APIRouter, Depends, Response +from fastapi.responses import StreamingResponse +from fastapi_filter import FilterDepends + +from mpcontribs_api.domains._shared.bulk import BulkWriteSummary +from mpcontribs_api.domains._shared.models import DeleteResponse +from mpcontribs_api.domains._shared.types import DownloadFormat, FieldSelector +from mpcontribs_api.domains.structures.dependencies import StructureDep +from mpcontribs_api.domains.structures.models import StructureFilter, StructureIn, StructureOut, StructurePatch +from mpcontribs_api.pagination import CursorParams, Page + +router = APIRouter(tags=["components", "structures"]) + + +@router.get("", response_model=Page[StructureOut]) +async def get_structures( + repo: StructureDep, + pagination: Annotated[CursorParams, Depends()], + filter: StructureFilter = FilterDepends(StructureFilter), + fields: FieldSelector = StructureOut.default_fields(), +): + selected = StructureOut.parse_fields(fields) + return await repo.get_structures(filter=filter, fields=selected, pagination=pagination) + + +@router.get("{pk}", response_model=StructureOut) +async def get_structure( + repo: StructureDep, + pk: str, + fields: FieldSelector = StructureOut.default_fields(), +): + selected = StructureOut.parse_fields(fields) + return await repo.get_structure_by_id(id=pk, fields=selected) + + +@router.get("download/{short_mime}") +async def download_structure( + repo: StructureDep, + response: Response, + format: DownloadFormat, + short_mime: Literal["gz", None] = "gz", + ignore_cache: bool = False, + filter: StructureFilter = FilterDepends(StructureFilter), + fields: FieldSelector = StructureOut.default_fields(), +) -> StreamingResponse: + selected = StructureOut.parse_fields(fields) + body = await repo.download_structures( + format=format, + short_mime=short_mime, + ignore_cache=ignore_cache, + filter=filter, + fields=selected, + ) + return StreamingResponse( + body, + media_type="application/gzip", + headers={"Content-Disposition": 'attachment; filename="structures.jsonl.gz"'}, + ) + + +@router.post("", response_model=BulkWriteSummary[StructureOut]) +async def insert_structures( + repo: StructureDep, + structures: list[StructureIn], +): + return await repo.insert_structures(structures=structures) + + +@router.delete("", response_model=DeleteResponse) +async def delete_structures(repo: StructureDep, filter: StructureFilter = FilterDepends(StructureFilter)): + return await repo.delete_structures(filter=filter) + + +@router.delete("{id}", response_model=DeleteResponse) +async def delete_structure_by_id(repo: StructureDep, id: str): + return await repo.delete_structure_by_id(id=id) + + +@router.patch("{id}") +async def patch_structure_by_id( + repo: StructureDep, + id: str, + update: StructurePatch, +): + return await repo.patch_structure_by_id(id=id, update=update) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/repository.py index 65ddbd866c..92155dd028 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/structures/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/structures/repository.py @@ -33,7 +33,7 @@ async def insert_structures( structures: structures to insert session: optional client session; pass when inserStructureIng inside a transaction """ - return await self.insert_structures(structures=structures, session=session) + return await self.insert_components(components=structures, session=session) async def insert_structure(self, structure: StructureIn) -> Structure: """Insert a single structure. From dd91fbc51754ff927a00eb29c7f0ed795c2ad40b Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 10 Jun 2026 16:32:31 -0700 Subject: [PATCH 095/591] Removed get and patch capabilities from attachment endpoint --- .../domains/attachments/repository.py | 31 ------------------- .../domains/attachments/router.py | 20 +----------- 2 files changed, 1 insertion(+), 50 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/attachments/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/attachments/repository.py index 62d0a5032b..f830b5d35a 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/attachments/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/attachments/repository.py @@ -22,33 +22,6 @@ class MongoDbAttachmentRepository( document_model = Attachment out_model = AttachmentOut - async def insert_attachments( - self, - attachments: list[AttachmentIn], - session: AsyncClientSession | None = None, - ) -> list[Attachment]: - """Bulk-insert attachments, chunked to fit within a transaction's payload budget. - - Args: - attachments: attachments to insert - session: optional client session; pass when inserAttachmentIng inside a transaction - """ - return await self.insert_components(components=attachments, session=session) - - async def insert_attachment(self, attachment: AttachmentIn) -> Attachment: - """Insert a single attachment. - - Args: - attachment (AttachmentIn): the table to insert - - Returns: - TDpc: the attachment actually in the database - - Raises: - AppError: If insert_one returns None, raises - """ - return await self.insert_component(component=attachment) - async def get_attachments( self, filter: AttachmentFilter, @@ -109,7 +82,3 @@ async def delete_attachment_by_id( DeleteResponse: A report of the deletion """ return await self.delete_component_by_id(id=id, session=session) - - async def patch_attachment_by_id(self, id: str, update: AttachmentPatch) -> Attachment: - """Partially update a attachment by id, scoped to the current user. See ``patch``.""" - return await self.patch_component_by_id(id=id, update=update) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py b/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py index e793e666d6..68108a87a6 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py @@ -4,11 +4,10 @@ from fastapi.responses import StreamingResponse from fastapi_filter import FilterDepends -from mpcontribs_api.domains._shared.bulk import BulkWriteSummary from mpcontribs_api.domains._shared.models import DeleteResponse from mpcontribs_api.domains._shared.types import DownloadFormat, FieldSelector from mpcontribs_api.domains.structures.dependencies import StructureDep -from mpcontribs_api.domains.structures.models import StructureFilter, StructureIn, StructureOut, StructurePatch +from mpcontribs_api.domains.structures.models import StructureFilter, StructureOut from mpcontribs_api.pagination import CursorParams, Page router = APIRouter(tags=["components", "structures"]) @@ -60,14 +59,6 @@ async def download_structure( ) -@router.post("", response_model=BulkWriteSummary[StructureOut]) -async def insert_structures( - repo: StructureDep, - structures: list[StructureIn], -): - return await repo.insert_structures(structures=structures) - - @router.delete("", response_model=DeleteResponse) async def delete_structures(repo: StructureDep, filter: StructureFilter = FilterDepends(StructureFilter)): return await repo.delete_structures(filter=filter) @@ -76,12 +67,3 @@ async def delete_structures(repo: StructureDep, filter: StructureFilter = Filter @router.delete("{id}", response_model=DeleteResponse) async def delete_structure_by_id(repo: StructureDep, id: str): return await repo.delete_structure_by_id(id=id) - - -@router.patch("{id}") -async def patch_structure_by_id( - repo: StructureDep, - id: str, - update: StructurePatch, -): - return await repo.patch_structure_by_id(id=id, update=update) From b6c9753e6111798002ed5fd550240cb20c28b596 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 10 Jun 2026 16:33:34 -0700 Subject: [PATCH 096/591] Removed logic for inserting attachments during contribution insert --- .../src/mpcontribs_api/domains/contributions/service.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py index f2ef09de0b..147afa8ee0 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py @@ -15,7 +15,6 @@ BulkWriteSummary, bulk_failure_from_exception, ) -from mpcontribs_api.domains.attachments.models import Attachment from mpcontribs_api.domains.attachments.repository import MongoDbAttachmentRepository from mpcontribs_api.domains.contributions.models import Contribution, ContributionFilter, ContributionIn from mpcontribs_api.domains.contributions.repository import MongoDbContributionRepository @@ -241,12 +240,10 @@ async def _do_insert(self, contrib: ContributionIn, session: AsyncClientSession) """ structures = await self._structures.insert_structures(contrib.structures or [], session=session) tables = await self._tables.insert_tables(contrib.tables or [], session=session) - attachments = await self._attachments.insert_attachments(contrib.attachments or [], session=session) doc = Contribution.from_input_model(contrib) doc.structures = cast(list[Link[Structure]] | None, structures or None) doc.tables = cast(list[Link[Table]] | None, tables or None) - doc.attachments = cast(list[Link[Attachment]] | None, attachments or None) return await self._contributions.insert_contribution(doc, session=session) async def upsert_contributions(self, contributions: list[ContributionIn]) -> list[Contribution]: From 8cb342220a85155076f8045e9681cb05062d3787 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 10 Jun 2026 16:57:48 -0700 Subject: [PATCH 097/591] Moved _children to a property --- .../domains/contributions/service.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py index 147afa8ee0..63ccd0d732 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py @@ -15,6 +15,7 @@ BulkWriteSummary, bulk_failure_from_exception, ) +from mpcontribs_api.domains._shared.repository import MongoDbRepository from mpcontribs_api.domains.attachments.repository import MongoDbAttachmentRepository from mpcontribs_api.domains.contributions.models import Contribution, ContributionFilter, ContributionIn from mpcontribs_api.domains.contributions.repository import MongoDbContributionRepository @@ -40,16 +41,19 @@ def __init__( ): self._client = client self._contributions = contributions - self._children = { - "structures": structures, - "attachments": attachments, - "tables": tables, - } self._structures = structures self._attachments = attachments self._tables = tables self._settings = settings or get_settings().mongo + @property + def _children(self) -> dict[str, MongoDbRepository]: + return { + "structures": self._structures, + "attachments": self._attachments, + "tables": self._tables, + } + async def insert_contributions( self, contributions: list[ContributionIn], @@ -304,7 +308,7 @@ async def delete_contributions(self, filter: ContributionFilter) -> BulkDeleteSu for field, repo in self._children.items(): ids = [link.ref.id for c in page.items for link in getattr(c, field)] if ids: - deleted_components = await repo.delete_by_ids(ids) + deleted_components = await repo.delete_by_ids(ids) # pyright: ignore[reportAttributeAccessIssue] num_deleted_components += deleted_components.deleted_count if deleted_components else 0 # Delete Contributions in this batch by ID From 3fb7e01adf60dfcad15c77dfdb17558e944bd7a8 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 10 Jun 2026 17:00:54 -0700 Subject: [PATCH 098/591] Added attachments, structures, and tables routers to main router --- mpcontribs-api/src/mpcontribs_api/api/v1/router.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/mpcontribs-api/src/mpcontribs_api/api/v1/router.py b/mpcontribs-api/src/mpcontribs_api/api/v1/router.py index c8cb430867..099d88ccc4 100644 --- a/mpcontribs-api/src/mpcontribs_api/api/v1/router.py +++ b/mpcontribs-api/src/mpcontribs_api/api/v1/router.py @@ -1,9 +1,15 @@ from fastapi import APIRouter +from mpcontribs_api.domains.attachments.router import router as attachments_router from mpcontribs_api.domains.contributions.router import router as contributions_router from mpcontribs_api.domains.projects.router import router as projects_router +from mpcontribs_api.domains.structures.router import router as structures_router +from mpcontribs_api.domains.tables.router import router as tables_router router = APIRouter() -router.include_router(projects_router, prefix="/projects") +router.include_router(attachments_router, prefix="/attachments") router.include_router(contributions_router, prefix="/contributions") +router.include_router(projects_router, prefix="/projects") +router.include_router(structures_router, prefix="/structures") +router.include_router(tables_router, prefix="/tables") From c844e0a348fa6abcb8f99f7db2ea78672d54f060 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 11 Jun 2026 09:31:19 -0700 Subject: [PATCH 099/591] Made PolarsFrame type to handle coercion and serialization --- mpcontribs-api/src/mpcontribs_api/app.py | 2 +- mpcontribs-api/src/mpcontribs_api/config.py | 4 +++ .../mpcontribs_api/domains/_shared/types.py | 27 ++++++++++++++++++- .../domains/contributions/models.py | 2 +- .../domains/structures/models.py | 23 +++------------- .../mpcontribs_api/domains/tables/models.py | 21 +++------------ 6 files changed, 39 insertions(+), 40 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/app.py b/mpcontribs-api/src/mpcontribs_api/app.py index 89b1b95fa8..c2371d7ae9 100644 --- a/mpcontribs-api/src/mpcontribs_api/app.py +++ b/mpcontribs-api/src/mpcontribs_api/app.py @@ -36,7 +36,7 @@ async def lifespan(app: FastAPI) -> AsyncGenerator[None]: maxIdleTimeMS=settings.mongo.max_idle_time_ms, timeoutMS=settings.mongo.timeout_ms, serverSelectionTimeoutMS=settings.mongo.server_selection_timeout_ms, - retryWrite=True, + retryWrites=True, retryReads=True, compressors=settings.mongo.compressors, readPreference=settings.mongo.read_preference, diff --git a/mpcontribs-api/src/mpcontribs_api/config.py b/mpcontribs-api/src/mpcontribs_api/config.py index 3055103fd7..6a7e3a673c 100644 --- a/mpcontribs-api/src/mpcontribs_api/config.py +++ b/mpcontribs-api/src/mpcontribs_api/config.py @@ -36,6 +36,10 @@ class MongoSettings(BaseModel): default=0, description="Minimum number of concurent connections that the pool will maintain connected to each server ", ) + max_global_concurrent_writes: int = Field( + default=100, + description="Maximum number of writes allowed to happen simultaneously. Key for bulk write efficiency.", + ) datetime_conversion: Literal["datetime_ms", "datetime", "datetime_auto", "datetime_clamp"] = Field( default="datetime", description="Specifies how UTC datetimes should be decoded within BSON", diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py index ce11e17164..999439d4c4 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py @@ -2,8 +2,9 @@ from enum import StrEnum from typing import Annotated +import polars as pl from fastapi import Query -from pydantic import BeforeValidator, Field +from pydantic import BeforeValidator, Field, PlainSerializer, WithJsonSchema from mpcontribs_api.exceptions import ValidationError @@ -62,3 +63,27 @@ def _mime_like(v: str) -> str: class DownloadFormat(StrEnum): JSONL = "jsonl" CSV = "csv" + + +def _coerce_frame(v: object) -> pl.DataFrame: + if isinstance(v, pl.DataFrame): + return v + if isinstance(v, dict): + return pl.DataFrame(v) + raise ValueError(f"cannot coerce {type(v)} to pl.DataFrame") + + +def _serialize_frame(data: pl.DataFrame) -> dict: + return data.to_dict(as_series=False) + + +PolarsFrame = Annotated[ + pl.DataFrame, + BeforeValidator(_coerce_frame), + PlainSerializer(_serialize_frame, return_type=dict), + WithJsonSchema( + {"type": "array", "items": {"type": "array", "items": {"type": "number"}}}, + mode="validation", + ), + WithJsonSchema({"type": "object"}, mode="serialization"), +] diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py index f612b0eb21..b8b19d22f4 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py @@ -151,5 +151,5 @@ class Constants(Filter.Constants): model = Contribution @field_validator("id", mode="before") - def convert_str_to_OId(self, v: str): + def convert_str_to_oid(cls, v: str): return PydanticObjectId(v) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py index 4b148bf288..82ecc93589 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py @@ -1,11 +1,10 @@ -import polars as pl from beanie import PydanticObjectId from fastapi_filter.contrib.beanie import Filter -from pydantic import BaseModel, ConfigDict, field_serializer, field_validator +from pydantic import BaseModel, ConfigDict from pymatgen.core import Element from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut -from mpcontribs_api.domains._shared.types import MD5Hash +from mpcontribs_api.domains._shared.types import MD5Hash, PolarsFrame from mpcontribs_api.projection import SparseFieldsModel @@ -20,7 +19,7 @@ class Species(BaseModel): class Lattice(BaseModel): model_config = ConfigDict(arbitrary_types_allowed=True) - matrix: pl.DataFrame + matrix: PolarsFrame pbc: list[bool] a: float b: float @@ -30,22 +29,6 @@ class Lattice(BaseModel): gamma: float volume: float - @field_validator("matrix", mode="before") - @classmethod - def coerce_matrix(cls, v: object) -> pl.DataFrame: - if isinstance(v, pl.DataFrame): - return v - if isinstance(v, dict): - return pl.DataFrame(v) - # MongoDB returns rows as a list of lists - if isinstance(v, list): - return pl.DataFrame(v) - raise ValueError(f"cannot coerce {type(v)} to pl.DataFrame") - - @field_serializer("matrix") - def serialize_matrix(self, matrix: pl.DataFrame) -> dict: - return matrix.to_dict(as_series=False) - class Site(BaseModel): species: list[Species] diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py index b0bc6ab4aa..e9d9797e9e 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py @@ -8,12 +8,11 @@ ConfigDict, ValidationError, field_serializer, - field_validator, model_validator, ) from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut -from mpcontribs_api.domains._shared.types import MD5Hash +from mpcontribs_api.domains._shared.types import MD5Hash, PolarsFrame from mpcontribs_api.projection import SparseFieldsModel @@ -35,24 +34,11 @@ class Table(BaseDocumentWithInput[PydanticObjectId]): md5: MD5Hash attrs: Attributes total_data_rows: int - data: pl.DataFrame + data: PolarsFrame class Settings: name = "tables" - @field_validator("data", mode="before") - @classmethod - def coerce_data(cls, v: object) -> pl.DataFrame: - if isinstance(v, pl.DataFrame): - return v - if isinstance(v, dict): - return pl.DataFrame(v) - raise ValueError(f"cannot coerce {type(v)} to pl.DataFrame") - - @field_serializer("data") - def serialize_data(self, data: pl.DataFrame) -> dict: - return data.to_dict(as_series=False) - class TableIn(Table): @model_validator(mode="after") @@ -145,6 +131,7 @@ class TableSummaryOut(BaseModel): class TableOut(DocumentOut[PydanticObjectId]): + model_config = ConfigDict(arbitrary_types_allowed=True) name: str | None = None md5: MD5Hash | None = None attrs: Attributes | None = None @@ -152,7 +139,7 @@ class TableOut(DocumentOut[PydanticObjectId]): total_data_rows: int | None = None total_data_pages: int | None = None index: list[Any] | None = None - data: pl.DataFrame | None = None + data: PolarsFrame | None = None @staticmethod def default_fields() -> list[str]: From 4f7b57d242a6fd60e4db8c454924da99f2813e12 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 11 Jun 2026 09:33:13 -0700 Subject: [PATCH 100/591] Removed 'components' tag from components routers --- mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py | 2 +- mpcontribs-api/src/mpcontribs_api/domains/structures/router.py | 2 +- mpcontribs-api/src/mpcontribs_api/domains/tables/router.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py b/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py index 68108a87a6..2b535917f3 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py @@ -10,7 +10,7 @@ from mpcontribs_api.domains.structures.models import StructureFilter, StructureOut from mpcontribs_api.pagination import CursorParams, Page -router = APIRouter(tags=["components", "structures"]) +router = APIRouter(tags=["attachments"]) @router.get("", response_model=Page[StructureOut]) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py index e793e666d6..f16302e9df 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py @@ -11,7 +11,7 @@ from mpcontribs_api.domains.structures.models import StructureFilter, StructureIn, StructureOut, StructurePatch from mpcontribs_api.pagination import CursorParams, Page -router = APIRouter(tags=["components", "structures"]) +router = APIRouter(tags=["structures"]) @router.get("", response_model=Page[StructureOut]) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py index 239bd45b25..b72a752c77 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py @@ -11,7 +11,7 @@ from mpcontribs_api.domains.tables.models import Table, TableFilter, TableIn, TableOut, TablePatch from mpcontribs_api.pagination import CursorParams, Page -router = APIRouter(tags=["components", "tables"]) +router = APIRouter(tags=["tables"]) @router.get("", response_model=Page[TableOut]) From b776d2d2763b9707bd30b3f12ba2f974f686d927 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 11 Jun 2026 10:04:16 -0700 Subject: [PATCH 101/591] Added additional logging context to each request --- mpcontribs-api/src/mpcontribs_api/_openapi.py | 7 ---- mpcontribs-api/src/mpcontribs_api/app.py | 5 +++ mpcontribs-api/src/mpcontribs_api/auth.py | 9 +++++ .../src/mpcontribs_api/middleware.py | 35 +++++++++++++++---- 4 files changed, 42 insertions(+), 14 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/_openapi.py b/mpcontribs-api/src/mpcontribs_api/_openapi.py index 49b3f813ca..b041f048d9 100644 --- a/mpcontribs-api/src/mpcontribs_api/_openapi.py +++ b/mpcontribs-api/src/mpcontribs_api/_openapi.py @@ -34,13 +34,6 @@ "description": "are files saved as objects in AWS S3 and not accessible for querying (only retrieval) which " "can be added to a contribution.", }, - { - "name": "notebooks", - "description": "are" - "[Jupyter notebook](https://jupyter-notebook.readthedocs.io/en/stable/notebook.html#notebook-documents) " - "documents generated and saved when a contribution is saved. They form the basis for Contribution Details " - "Pages on the Portal.", - }, ] contact_info = { diff --git a/mpcontribs-api/src/mpcontribs_api/app.py b/mpcontribs-api/src/mpcontribs_api/app.py index c2371d7ae9..1056b92a86 100644 --- a/mpcontribs-api/src/mpcontribs_api/app.py +++ b/mpcontribs-api/src/mpcontribs_api/app.py @@ -9,6 +9,7 @@ from mpcontribs_api._openapi import contact_info, license_info, openapi_tags from mpcontribs_api.api.v1.router import router as v1_router +from mpcontribs_api.auth import api_key_scheme from mpcontribs_api.config import Settings, get_settings from mpcontribs_api.dependencies import verify_gateway from mpcontribs_api.domains.attachments.models import Attachment @@ -85,6 +86,10 @@ def create_app(settings: Settings | None = None) -> FastAPI: contact=contact_info, # openapi_url="/api/v1/openapi.json", openapi_tags=openapi_tags, + swagger_ui_parameters={ + "docExpansion": "none", + }, + dependencies=[Depends(api_key_scheme)], ) # Add request context to the logger diff --git a/mpcontribs-api/src/mpcontribs_api/auth.py b/mpcontribs-api/src/mpcontribs_api/auth.py index bab11f1bb4..d5336b2fb6 100644 --- a/mpcontribs-api/src/mpcontribs_api/auth.py +++ b/mpcontribs-api/src/mpcontribs_api/auth.py @@ -1,11 +1,20 @@ from typing import Any +from fastapi.security import APIKeyHeader from pydantic import BaseModel, ConfigDict, model_validator from mpcontribs_api.config import get_settings settings = get_settings() + +api_key_scheme = APIKeyHeader( + name="X-API-KEY", + auto_error=False, + description="MP API key to authorize requests", +) + + ADMIN_GROUP = settings.mongo.admin_group diff --git a/mpcontribs-api/src/mpcontribs_api/middleware.py b/mpcontribs-api/src/mpcontribs_api/middleware.py index e68462ff8e..c6fa240125 100644 --- a/mpcontribs-api/src/mpcontribs_api/middleware.py +++ b/mpcontribs-api/src/mpcontribs_api/middleware.py @@ -1,8 +1,20 @@ import uuid +from collections.abc import Iterable import structlog from starlette.types import ASGIApp, Receive, Scope, Send +# Lowercased ASGI byte header name -> structlog context key. +_LOGGED_HEADERS: dict[bytes, str] = { + b"user-agent": "user_agent", + b"accept": "accept", + b"accept-language": "accept_language", + b"accept-encoding": "accept_encoding", + b"referer": "referer", + b"content-type": "content_type", + b"content-length": "content_length", +} + class RequestContextMiddleware: def __init__(self, app: ASGIApp) -> None: @@ -13,14 +25,23 @@ async def __call__(self, scope: Scope, receive: Receive, send: Send) -> None: await self.app(scope, receive, send) return - headers = dict(scope.get("headers", [])) - raw_request_id = headers.get(b"x-request-id", b"") + raw_headers: Iterable[tuple[bytes, bytes]] = scope["headers"] + headers = {name: value for name, value in raw_headers} + + raw_request_id = headers.get(b"x-request-id") request_id = raw_request_id.decode() if raw_request_id else str(uuid.uuid4()) + context: dict[str, str] = { + "request_id": request_id, + "method": scope["method"], + "path": scope["path"], + } + for header_name, log_key in _LOGGED_HEADERS.items(): + value = headers.get(header_name) + if value is not None: + context[log_key] = value.decode("latin-1") + structlog.contextvars.clear_contextvars() - structlog.contextvars.bind_contextvars( - request_id=request_id, - method=scope["method"], - path=scope["path"], - ) + structlog.contextvars.bind_contextvars(**context) + await self.app(scope, receive, send) From 73e5acf49f8d372022af7986c0f3ed10c86cb0dd Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 11 Jun 2026 10:09:03 -0700 Subject: [PATCH 102/591] Removed unused gateway secret check --- mpcontribs-api/src/mpcontribs_api/_openapi.py | 1 - mpcontribs-api/src/mpcontribs_api/app.py | 3 +-- mpcontribs-api/src/mpcontribs_api/dependencies.py | 12 +----------- 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/_openapi.py b/mpcontribs-api/src/mpcontribs_api/_openapi.py index b041f048d9..fcd06c91cc 100644 --- a/mpcontribs-api/src/mpcontribs_api/_openapi.py +++ b/mpcontribs-api/src/mpcontribs_api/_openapi.py @@ -17,7 +17,6 @@ "retrieve its data or view it on the Portal. Contribution components (tables, structures, and attachments) are " "deleted along with a contribution.", }, - # TODO: Check that this is the right link { "name": "structures", "description": "are [pymatgen structures](https://pymatgen.org/pymatgen.electronic_structure.html) which can " diff --git a/mpcontribs-api/src/mpcontribs_api/app.py b/mpcontribs-api/src/mpcontribs_api/app.py index 1056b92a86..ca5cb8b588 100644 --- a/mpcontribs-api/src/mpcontribs_api/app.py +++ b/mpcontribs-api/src/mpcontribs_api/app.py @@ -11,7 +11,6 @@ from mpcontribs_api.api.v1.router import router as v1_router from mpcontribs_api.auth import api_key_scheme from mpcontribs_api.config import Settings, get_settings -from mpcontribs_api.dependencies import verify_gateway from mpcontribs_api.domains.attachments.models import Attachment from mpcontribs_api.domains.contributions.models import Contribution from mpcontribs_api.domains.healthcheck.router import router as healthcheck_router @@ -96,7 +95,7 @@ def create_app(settings: Settings | None = None) -> FastAPI: app.add_middleware(RequestContextMiddleware) register_exception_handlers(app) app.include_router(healthcheck_router, prefix="/health") - app.include_router(v1_router, prefix="/api/v1", dependencies=[Depends(verify_gateway)]) + app.include_router(v1_router, prefix="/api/v1") return app diff --git a/mpcontribs-api/src/mpcontribs_api/dependencies.py b/mpcontribs-api/src/mpcontribs_api/dependencies.py index 83e31ba38a..3b68834e8a 100644 --- a/mpcontribs-api/src/mpcontribs_api/dependencies.py +++ b/mpcontribs-api/src/mpcontribs_api/dependencies.py @@ -1,8 +1,7 @@ -import hmac from typing import Annotated import structlog -from fastapi import Depends, Header, Request +from fastapi import Depends, Request from pymongo import AsyncMongoClient from pymongo.asynchronous.database import AsyncDatabase @@ -10,21 +9,12 @@ from mpcontribs_api.config import get_settings from mpcontribs_api.exceptions import ( AuthenticationError, - GatewayError, PermissionError, ) settings = get_settings() -def verify_gateway(x_gateway_secret: Annotated[str | None, Header()] = None) -> None: - """Ensures the current access attempt is coming through Kong.""" - if x_gateway_secret is None or not hmac.compare_digest( - x_gateway_secret, settings.kong.gateway_secret.get_secret_value() - ): - raise GatewayError("direct access not permitted") - - def get_db(request: Request) -> AsyncDatabase: return request.app.state.db From 724698aa1462ba5adde9b6eabe33f334f6573438 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 11 Jun 2026 10:16:13 -0700 Subject: [PATCH 103/591] Moved router tagging to the api router --- mpcontribs-api/src/mpcontribs_api/api/v1/router.py | 10 +++++----- .../src/mpcontribs_api/domains/attachments/router.py | 2 +- .../src/mpcontribs_api/domains/contributions/router.py | 2 +- .../src/mpcontribs_api/domains/projects/router.py | 2 +- .../src/mpcontribs_api/domains/structures/router.py | 2 +- .../src/mpcontribs_api/domains/tables/router.py | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/api/v1/router.py b/mpcontribs-api/src/mpcontribs_api/api/v1/router.py index 099d88ccc4..13dab175ce 100644 --- a/mpcontribs-api/src/mpcontribs_api/api/v1/router.py +++ b/mpcontribs-api/src/mpcontribs_api/api/v1/router.py @@ -8,8 +8,8 @@ router = APIRouter() -router.include_router(attachments_router, prefix="/attachments") -router.include_router(contributions_router, prefix="/contributions") -router.include_router(projects_router, prefix="/projects") -router.include_router(structures_router, prefix="/structures") -router.include_router(tables_router, prefix="/tables") +router.include_router(attachments_router, prefix="/attachments", tags=["attachments"]) +router.include_router(contributions_router, prefix="/contributions", tags=["contributions"]) +router.include_router(projects_router, prefix="/projects", tags=["projects"]) +router.include_router(structures_router, prefix="/structures", tags=["structures"]) +router.include_router(tables_router, prefix="/tables", tags=["tables"]) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py b/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py index 2b535917f3..50bba3df61 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py @@ -10,7 +10,7 @@ from mpcontribs_api.domains.structures.models import StructureFilter, StructureOut from mpcontribs_api.pagination import CursorParams, Page -router = APIRouter(tags=["attachments"]) +router = APIRouter() @router.get("", response_model=Page[StructureOut]) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py index ce2050e107..3d52abe2df 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py @@ -15,7 +15,7 @@ ) from mpcontribs_api.pagination import CursorParams -router = APIRouter(tags=["contributions"]) +router = APIRouter() @router.get("") diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py index a89a67ba28..4b0f3704f1 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py @@ -14,7 +14,7 @@ ) from mpcontribs_api.pagination import CursorParams -router = APIRouter(tags=["projects"]) +router = APIRouter() # Brendan TODO: Add in option to select ProjectSummary or ProjectOut diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py index f16302e9df..a76113cb16 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py @@ -11,7 +11,7 @@ from mpcontribs_api.domains.structures.models import StructureFilter, StructureIn, StructureOut, StructurePatch from mpcontribs_api.pagination import CursorParams, Page -router = APIRouter(tags=["structures"]) +router = APIRouter() @router.get("", response_model=Page[StructureOut]) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py index b72a752c77..3c5dbf80be 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py @@ -11,7 +11,7 @@ from mpcontribs_api.domains.tables.models import Table, TableFilter, TableIn, TableOut, TablePatch from mpcontribs_api.pagination import CursorParams, Page -router = APIRouter(tags=["tables"]) +router = APIRouter() @router.get("", response_model=Page[TableOut]) From c126522090ede1df94bddd9a771d54fd2417a521 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 11 Jun 2026 10:57:08 -0700 Subject: [PATCH 104/591] Updated tests to account for new code --- mpcontribs-api/.env.example | 4 +- mpcontribs-api/tests/integration/conftest.py | 34 -------- .../db/test_contributions_repository.py | 10 ++- .../db/test_projects_repository.py | 7 +- .../tests/integration/test_gateway.py | 67 ---------------- .../unit/domains/test_contribution_service.py | 80 +++++++++---------- 6 files changed, 49 insertions(+), 153 deletions(-) delete mode 100644 mpcontribs-api/tests/integration/test_gateway.py diff --git a/mpcontribs-api/.env.example b/mpcontribs-api/.env.example index f560aed0dd..dd2540996c 100644 --- a/mpcontribs-api/.env.example +++ b/mpcontribs-api/.env.example @@ -3,9 +3,9 @@ MPCONTRIBS_ENVIRONMENT=dev MPCONTRIBS_MONGO__URI=mongodb+srv://:@host.hash.mongodb.net/?appName=database-name MPCONTRIBS_MONGO__DB_NAME=database-name -MPCONTRIBS_REDIS_ADDRESS=redis-address +MPCONTRIBS_REDIS_ADDRESS=redis-address # placeholder; not used yet MPCONTRIBS_REDIS_URL=redis-url -MPCONTRIBS_MAIL_DEFAULT_SENDER=mail-default-sender +MPCONTRIBS_MAIL_DEFAULT_SENDER=mail-default-sender # placeholder; not used yet MPCONTRIBS_VERSION=version diff --git a/mpcontribs-api/tests/integration/conftest.py b/mpcontribs-api/tests/integration/conftest.py index 38b7782765..a906f94a27 100644 --- a/mpcontribs-api/tests/integration/conftest.py +++ b/mpcontribs-api/tests/integration/conftest.py @@ -93,35 +93,6 @@ async def _noop_lifespan(app: FastAPI): return app -def make_gateway_app() -> FastAPI: - """Like make_test_app() but with real gateway enforcement. - - Used by gateway-specific tests to exercise the actual x-gateway-secret - header validation through the full HTTP cycle. - """ - from fastapi import Depends - - from mpcontribs_api.dependencies import verify_gateway - - @asynccontextmanager - async def _noop_lifespan(app: FastAPI): - app.state.db = MagicMock() - yield - - app = FastAPI( - title="mpcontribs-gateway-test", - lifespan=_noop_lifespan, - dependencies=[Depends(verify_gateway)], - ) - app.add_middleware(RequestContextMiddleware) - register_exception_handlers(app) - - from mpcontribs_api.api.v1.router import router as v1_router - - app.include_router(v1_router, prefix="/api/v1") - return app - - # --------------------------------------------------------------------------- # Shared fixtures # --------------------------------------------------------------------------- @@ -132,11 +103,6 @@ def test_app() -> FastAPI: return make_test_app() -@pytest.fixture(scope="session") -def gateway_app() -> FastAPI: - return make_gateway_app() - - @pytest.fixture def client(test_app: FastAPI): """Function-scoped client; dependency overrides are cleared after each test.""" diff --git a/mpcontribs-api/tests/integration/db/test_contributions_repository.py b/mpcontribs-api/tests/integration/db/test_contributions_repository.py index 396043a0f2..0aa09fda9d 100644 --- a/mpcontribs-api/tests/integration/db/test_contributions_repository.py +++ b/mpcontribs-api/tests/integration/db/test_contributions_repository.py @@ -21,7 +21,7 @@ ContributionPatch, ) from mpcontribs_api.domains.contributions.repository import MongoDbContributionRepository -from mpcontribs_api.exceptions import ValidationError +from mpcontribs_api.exceptions import NotFoundError, ValidationError from mpcontribs_api.pagination import CursorParams pytestmark = [pytest.mark.db, pytest.mark.asyncio(loop_scope="session")] @@ -437,8 +437,9 @@ async def test_deleted_doc_not_found_afterwards(self, db): found = await Contribution.find_one(Contribution.id == doc.id) assert found is None - async def test_delete_nonexistent_is_silent(self, db): - await _repo(ADMIN).delete_contribution_by_id(str(PydanticObjectId())) + async def test_delete_nonexistent_throws_error(self, db): + with pytest.raises(NotFoundError, match="not found"): + await _repo(ADMIN).delete_contribution_by_id(str(PydanticObjectId())) async def test_raises_validation_error_for_bad_id(self, db): with pytest.raises(ValidationError): @@ -446,7 +447,8 @@ async def test_raises_validation_error_for_bad_id(self, db): async def test_anon_cannot_delete_private_doc(self, db): doc = await _insert(identifier="del-anon-priv", is_public=False) - await _repo(ANON).delete_contribution_by_id(str(doc.id)) + with pytest.raises(NotFoundError, match="not found"): + await _repo(ANON).delete_contribution_by_id(str(doc.id)) # Scope prevents anonymous from seeing the doc, so it is never deleted. still_there = await Contribution.find_one(Contribution.id == doc.id) assert still_there is not None diff --git a/mpcontribs-api/tests/integration/db/test_projects_repository.py b/mpcontribs-api/tests/integration/db/test_projects_repository.py index e7dfdbf397..5affc40aec 100644 --- a/mpcontribs-api/tests/integration/db/test_projects_repository.py +++ b/mpcontribs-api/tests/integration/db/test_projects_repository.py @@ -275,9 +275,10 @@ async def test_deleted_project_not_in_default_query(self, db): ids = {p.id for p in page.items} assert "del-me" not in ids - async def test_delete_nonexistent_is_silent(self, db): - # delete_project_by_id does find_one().delete() — no error if not found - await _repo(ADMIN).delete_project_by_id(id="ghost-id") + async def test_delete_nonexistent_throws_error(self, db): + # delete_project_by_id does find_one().delete() — Error if not found + with pytest.raises(NotFoundError, match="not found"): + await _repo(ADMIN).delete_project_by_id(id="ghost-id") # --------------------------------------------------------------------------- diff --git a/mpcontribs-api/tests/integration/test_gateway.py b/mpcontribs-api/tests/integration/test_gateway.py deleted file mode 100644 index 98540efbc6..0000000000 --- a/mpcontribs-api/tests/integration/test_gateway.py +++ /dev/null @@ -1,67 +0,0 @@ -"""Integration tests for the Kong gateway secret verification. - -verify_gateway() is applied as an app-level dependency in production. The -gateway_app fixture (from conftest) keeps that dependency active so we can -test enforcement through the full HTTP cycle without a real database. - -The correct header value is the plain secret configured in settings -(MPCONTRIBS_KONG__GATEWAY_SECRET=test-gateway-secret, set in the root -conftest.py). The mock project/contribution repos are also overridden here so -that a passing gateway request reaches a route and returns a non-gateway error. -""" - -from unittest.mock import AsyncMock - -import pytest - -from mpcontribs_api.domains.contributions.dependencies import get_scoped_contributions -from mpcontribs_api.domains.projects.dependencies import get_scoped_projects -from mpcontribs_api.pagination import Page -from tests.integration.conftest import GATEWAY_SECRET - - -@pytest.fixture(autouse=True) -def _stub_repos(gateway_app): - """Inject no-op mock repos so gateway-passing requests don't hit Beanie.""" - proj_repo = AsyncMock() - proj_repo.get_projects.return_value = Page(items=[], next_cursor=None) - contrib_repo = AsyncMock() - contrib_repo.get_contributions.return_value = Page(items=[], next_cursor=None) - - gateway_app.dependency_overrides[get_scoped_projects] = lambda: proj_repo - gateway_app.dependency_overrides[get_scoped_contributions] = lambda: contrib_repo - yield - gateway_app.dependency_overrides.clear() - - -class TestGatewayEnforcement: - def test_missing_header_returns_403(self, gateway_client): - r = gateway_client.get("/api/v1/projects") - assert r.status_code == 403 - - def test_wrong_secret_returns_403(self, gateway_client): - r = gateway_client.get("/api/v1/projects", headers={"x-gateway-secret": "wrong-secret"}) - assert r.status_code == 403 - - def test_missing_header_error_code(self, gateway_client): - r = gateway_client.get("/api/v1/projects") - assert r.json()["error"]["code"] == "gateway_error" - - def test_correct_secret_passes_gateway(self, gateway_client): - r = gateway_client.get( - "/api/v1/projects", - headers={"x-gateway-secret": GATEWAY_SECRET}, - ) - # Request reached the route — not 403 - assert r.status_code != 403 - - def test_correct_secret_on_contributions(self, gateway_client): - r = gateway_client.get( - "/api/v1/contributions", - headers={"x-gateway-secret": GATEWAY_SECRET}, - ) - assert r.status_code != 403 - - def test_empty_string_secret_returns_403(self, gateway_client): - r = gateway_client.get("/api/v1/projects", headers={"x-gateway-secret": ""}) - assert r.status_code == 403 diff --git a/mpcontribs-api/tests/unit/domains/test_contribution_service.py b/mpcontribs-api/tests/unit/domains/test_contribution_service.py index b1050e0727..e72f59a824 100644 --- a/mpcontribs-api/tests/unit/domains/test_contribution_service.py +++ b/mpcontribs-api/tests/unit/domains/test_contribution_service.py @@ -165,7 +165,6 @@ def _make_service( structures=struct_repo, tables=table_repo, attachments=attach_repo, - write_slots=write_slots or asyncio.Semaphore(50), settings=settings or _make_mongo_settings(), ) return svc, contrib_repo, struct_repo, table_repo, attach_repo, client @@ -319,11 +318,10 @@ async def _insert(doc, session=None): async def test_session_threaded_to_all_repo_calls(self): client, session = _make_fake_client() - svc, contrib_repo, struct_repo, table_repo, attach_repo, _ = _make_service(client=client) + svc, contrib_repo, struct_repo, table_repo, _, _ = _make_service(client=client) struct_repo.insert_structures.return_value = [_fake_structure()] table_repo.insert_tables.return_value = [_fake_table()] - attach_repo.insert_attachments.return_value = [_fake_attachment()] async def _insert(doc, session=None): return doc @@ -336,10 +334,8 @@ async def _insert(doc, session=None): attachments=[_attachment_in()], ) await svc.insert_contributions([contrib]) - assert struct_repo.insert_structures.call_args.kwargs["session"] is session assert table_repo.insert_tables.call_args.kwargs["session"] is session - assert attach_repo.insert_attachments.call_args.kwargs["session"] is session assert contrib_repo.insert_contribution.call_args.kwargs["session"] is session async def test_failure_on_second_of_three_yields_summary(self): @@ -567,53 +563,51 @@ async def test_same_key_concurrent_upserts_both_go_through_atomic_call(self): # --------------------------------------------------------------------------- -class TestProcessWideWriteSlots: - async def test_upsert_acquires_global_write_slot(self): - write_slots = asyncio.Semaphore(1) - svc, contrib_repo, *_ = _make_service(write_slots=write_slots) - - in_flight = 0 - peak = 0 - - async def _upsert(identifiers, contrib): - nonlocal in_flight, peak - in_flight += 1 - peak = max(peak, in_flight) - await asyncio.sleep(0) # let other coroutines try to enter - in_flight -= 1 - return MagicMock(spec=Contribution) +# class TestProcessWideWriteSlots: +# async def test_upsert_acquires_global_write_slot(self): +# write_slots = asyncio.Semaphore(1) +# svc, contrib_repo, *_ = _make_service(write_slots=write_slots) - contrib_repo.upsert_contribution_by_identifiers.side_effect = _upsert +# in_flight = 0 +# peak = 0 - contribs = [_contrib_in(identifier=f"mp-{i}") for i in range(5)] - await svc.upsert_contributions(contribs) +# async def _upsert(identifiers, contrib): +# nonlocal in_flight, peak +# in_flight += 1 +# peak = max(peak, in_flight) +# await asyncio.sleep(0) # let other coroutines try to enter +# in_flight -= 1 +# return MagicMock(spec=Contribution) - assert peak == 1 # global semaphore of 1 must serialize all 5 +# contrib_repo.upsert_contribution_by_identifiers.side_effect = _upsert - async def test_insert_with_components_acquires_global_write_slot(self): - write_slots = asyncio.Semaphore(1) - svc, contrib_repo, struct_repo, table_repo, attach_repo, _ = _make_service(write_slots=write_slots) +# contribs = [_contrib_in(identifier=f"mp-{i}") for i in range(5)] +# await svc.upsert_contributions(contribs) - struct_repo.insert_structures.return_value = [_fake_structure()] - table_repo.insert_tables.return_value = [] - attach_repo.insert_attachments.return_value = [] +# assert peak == 1 # global semaphore of 1 must serialize all 5 - in_flight = 0 - peak = 0 +# async def test_insert_with_components_acquires_global_write_slot(self): +# write_slots = asyncio.Semaphore(1) +# svc, contrib_repo, struct_repo, table_repo, attach_repo, _ = _make_service(write_slots=write_slots) - async def _insert(doc, session=None): - nonlocal in_flight, peak - in_flight += 1 - peak = max(peak, in_flight) - await asyncio.sleep(0) - in_flight -= 1 - return doc +# struct_repo.insert_structures.return_value = [_fake_structure()] +# table_repo.insert_tables.return_value = [] +# attach_repo.insert_attachments.return_value = [] - contrib_repo.insert_contribution.side_effect = _insert +# in_flight = 0 +# peak = 0 - contribs = [_contrib_in(identifier=f"c{i}", structures=[_structure_in()]) for i in range(4)] - await svc.insert_contributions(contribs) +# async def _insert(doc, session=None): +# nonlocal in_flight, peak +# in_flight += 1 +# peak = max(peak, in_flight) +# await asyncio.sleep(0) +# in_flight -= 1 +# return doc - assert peak == 1 +# contrib_repo.insert_contribution.side_effect = _insert +# contribs = [_contrib_in(identifier=f"c{i}", structures=[_structure_in()]) for i in range(4)] +# await svc.insert_contributions(contribs) +# assert peak == 1 From 75d4bdb4e32d60f757bfaea4e61e55f2b79824f1 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 11 Jun 2026 11:30:04 -0700 Subject: [PATCH 105/591] Changed exception handling and modified variable names to be descriptive rather than one letter --- .../domains/contributions/service.py | 8 ++--- .../src/mpcontribs_api/exceptions.py | 32 +++++++++++-------- 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py index 63ccd0d732..34994a73c0 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py @@ -103,13 +103,13 @@ async def insert_contributions( def _reject_duplicate_keys(self, contributions: list[ContributionIn]) -> None: """Reject the whole batch if any (project, identifier) appears more than once. - Mongo would surface this as a write conflict per item; catching it upfront keeps a guaranteed + Mongo would surface this as a duplicate key error; catching it upfront keeps a guaranteed failure from consuming a transaction slot and gives the caller all offending indices at once. """ seen: dict[tuple[str, str], list[int]] = defaultdict(list) - for i, c in enumerate(contributions): - seen[(c.project, c.identifier)].append(i) - duplicates = sorted(i for indices in seen.values() if len(indices) > 1 for i in indices) + for index, contribution in enumerate(contributions): + seen[(contribution.project, contribution.identifier)].append(index) + duplicates = sorted(index for indices in seen.values() if len(indices) > 1 for index in indices) if duplicates: raise ValidationError( "Duplicate (project, identifier) pairs in batch", diff --git a/mpcontribs-api/src/mpcontribs_api/exceptions.py b/mpcontribs-api/src/mpcontribs_api/exceptions.py index ab157afd2b..fc0d1fbb7d 100644 --- a/mpcontribs-api/src/mpcontribs_api/exceptions.py +++ b/mpcontribs-api/src/mpcontribs_api/exceptions.py @@ -1,9 +1,11 @@ from __future__ import annotations +from collections.abc import Sequence from typing import Any import structlog from fastapi import FastAPI, Request +from fastapi.encoders import jsonable_encoder from fastapi.exceptions import RequestValidationError from fastapi.responses import JSONResponse from starlette.exceptions import HTTPException as StarletteHTTPException @@ -54,11 +56,6 @@ class AuthenticationError(AppError): error_code = "authentication_error" -class GatewayError(AppError): - status_code = 403 - error_code = "gateway_error" - - def _error_body(error_code: str, message: str, **public_context) -> dict: body: dict[str, Any] = {"error": {"code": error_code, "message": message}} if public_context: @@ -66,6 +63,11 @@ def _error_body(error_code: str, message: str, **public_context) -> dict: return body +def _sanitize_validation_errors(errors: Sequence[Any]) -> list[dict[str, Any]]: + """Drop the echoed input value and pydantic doc URL from each error.""" + return [{key: value for key, value in error.items() if key not in ("input", "url")} for error in errors] + + def register_exception_handlers(app: FastAPI) -> None: """Register all exception handlers to the app. @@ -75,12 +77,10 @@ def register_exception_handlers(app: FastAPI) -> None: @app.exception_handler(AppError) async def _handle_app_error(request: Request, exc: AppError) -> JSONResponse: - log = logger.error if exc.status_code >= 500 else logger.info - log( - exc.error_code, - status_code=exc.status_code, - **exc.context, # full context to logs - ) + if exc.status_code >= 500: + logger.error(exc.error_code, status_code=exc.status_code, exc_info=exc, **exc.context) + else: + logger.info(exc.error_code, status_code=exc.status_code, **exc.context) return JSONResponse( status_code=exc.status_code, content=_error_body( @@ -88,7 +88,7 @@ async def _handle_app_error(request: Request, exc: AppError) -> JSONResponse: exc.message, # NOTE: not leaking context to client yet # - need to make client-safe (no leakage of secrets) on a per-exception type basis - # **exc.contrxt + # **exc.context ), ) @@ -103,10 +103,14 @@ async def _handle_unexpected(request: Request, exc: Exception) -> JSONResponse: # Unify validation errors from pydantic with our exception format @app.exception_handler(RequestValidationError) - async def _handle_validation(request, exc): + async def _handle_validation(_request: Request, exc: RequestValidationError) -> JSONResponse: return JSONResponse( status_code=422, - content=_error_body("validation_error", "Request validation failed", errors=exc.errors()), + content=_error_body( + "validation_error", + "Request validation failed", + errors=jsonable_encoder(_sanitize_validation_errors(exc.errors())), + ), ) # Unify http exceptions from starlette with our exception format From a934bddc0a222de7459515b36918337511e6ded8 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 11 Jun 2026 11:41:36 -0700 Subject: [PATCH 106/591] Removed old settings reference and scoped contribution access to project user.groups --- mpcontribs-api/src/mpcontribs_api/config.py | 3 --- .../src/mpcontribs_api/domains/contributions/repository.py | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/config.py b/mpcontribs-api/src/mpcontribs_api/config.py index 6a7e3a673c..b3891611ac 100644 --- a/mpcontribs-api/src/mpcontribs_api/config.py +++ b/mpcontribs-api/src/mpcontribs_api/config.py @@ -99,9 +99,6 @@ def _clamp_concurrency(self): per_request_cap = max(1, self.max_pool_size // 2) if self.max_concurrent_transactions > per_request_cap: self.max_concurrent_transactions = per_request_cap - global_cap = max(1, self.max_pool_size - 10) - if self.max_global_concurrent_writes > global_cap: - self.max_global_concurrent_writes = global_cap return self diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py index 7654c4997f..a412225313 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py @@ -43,7 +43,7 @@ def _build_scope(user: User) -> dict[str, Any]: ors: list[dict[str, Any]] = [{"is_public": True}] if not user.is_anonymous: if user.groups: - ors.append({"_id": {"$in": sorted(user.groups)}}) + ors.append({"project": {"$in": sorted(user.groups)}}) return {"$or": ors} async def get_contributions( From 79ef63f1bd27e551f49994c061bd5adce41c1aba Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 11 Jun 2026 13:07:58 -0700 Subject: [PATCH 107/591] DeleteResponse now consumes a DeleteResult to allow for easier expansion later. MongoDbRepo now allows deleting multiple ids at once --- .../mpcontribs_api/domains/_shared/models.py | 5 +++++ .../domains/_shared/repository.py | 20 ++++++++++++++++++- .../domains/contributions/service.py | 4 ++-- 3 files changed, 26 insertions(+), 3 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py index 48c3bfeec5..655629ed1e 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py @@ -2,6 +2,7 @@ from beanie import DocumentWithSoftDelete, PydanticObjectId from pydantic import BaseModel, Field +from pymongo.results import DeleteResult from mpcontribs_api import pagination from mpcontribs_api.projection import SparseFieldsModel @@ -46,3 +47,7 @@ class DocumentOut[TId](SparseFieldsModel): class DeleteResponse(BaseModel): num_deleted: int + + @classmethod + def from_delete_result(cls, delete_result: DeleteResult) -> Self: + return cls(num_deleted=delete_result.deleted_count) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py index d7222db7f9..1d9e0a4f71 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py @@ -2,7 +2,7 @@ from typing import Any from beanie import PydanticObjectId, UpdateResponse -from beanie.operators import Set +from beanie.operators import In, Set from bson.errors import InvalidId from fastapi_filter.contrib.beanie import Filter from pydantic import BaseModel @@ -130,6 +130,24 @@ async def delete_by_id(self, id: Any, session: AsyncClientSession | None = None) await doc.delete(session=session) return DeleteResponse(num_deleted=1) + async def delete_by_ids(self, ids: list[Any], session: AsyncClientSession | None = None) -> DeleteResponse: + """Delete multiple documents by id. + + Args: + ids (list[Any]): list of ids to delete + session: the session to perform the deletes within + + Returns: + DeleteResponse: the result of the deletion + """ + docs = self.document_model.find(In(self.document_model.id, ids), session=session) + if not docs: + raise NotFoundError("No documents with specified ids found", ids=ids) + delete_result = await docs.delete_many(session=session) + if not delete_result: + raise ValidationError("DeleteResult not returned internally") + return DeleteResponse.from_delete_result(delete_result) + async def patch(self, id: Any, update: TPatch) -> TDoc: """Partially update a single scoped document by id. diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py index 34994a73c0..4d7cf1a562 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py @@ -308,8 +308,8 @@ async def delete_contributions(self, filter: ContributionFilter) -> BulkDeleteSu for field, repo in self._children.items(): ids = [link.ref.id for c in page.items for link in getattr(c, field)] if ids: - deleted_components = await repo.delete_by_ids(ids) # pyright: ignore[reportAttributeAccessIssue] - num_deleted_components += deleted_components.deleted_count if deleted_components else 0 + deleted_components = await repo.delete_by_ids(ids) + num_deleted_components += deleted_components.num_deleted if deleted_components else 0 # Delete Contributions in this batch by ID # need to make a new filter so we don't eagerly delete all contributions before their components are deleted From 93e6bf4f336e83d8aaa439ff08aea0f103690d90 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 11 Jun 2026 13:08:16 -0700 Subject: [PATCH 108/591] Removed vestigial GatewayError references --- mpcontribs-api/CLAUDE.md | 2 +- .../tests/unit/domains/test_contributions_models.py | 4 ++-- mpcontribs-api/tests/unit/test_exceptions.py | 12 ------------ 3 files changed, 3 insertions(+), 15 deletions(-) diff --git a/mpcontribs-api/CLAUDE.md b/mpcontribs-api/CLAUDE.md index 61a9534f67..3797e1dcf4 100644 --- a/mpcontribs-api/CLAUDE.md +++ b/mpcontribs-api/CLAUDE.md @@ -78,7 +78,7 @@ The `_fields` query parameter (handled in `projection.py`) lets callers request ### Exception hierarchy -`exceptions.py` defines `AppError` subclasses (`NotFoundError`, `ConflictError`, `ValidationError`, `AuthenticationError`, `PermissionError`, `GatewayError`). All carry `status_code`, `error_code`, `message`, and a `context` dict. Handlers in `app.py` convert them to a uniform JSON shape; internal context is logged but not sent to clients. +`exceptions.py` defines `AppError` subclasses (`NotFoundError`, `ConflictError`, `ValidationError`, `AuthenticationError`, `PermissionError`). All carry `status_code`, `error_code`, `message`, and a `context` dict. Handlers in `app.py` convert them to a uniform JSON shape; internal context is logged but not sent to clients. ### Observability diff --git a/mpcontribs-api/tests/unit/domains/test_contributions_models.py b/mpcontribs-api/tests/unit/domains/test_contributions_models.py index f6ce20b89d..98d2a3d48b 100644 --- a/mpcontribs-api/tests/unit/domains/test_contributions_models.py +++ b/mpcontribs-api/tests/unit/domains/test_contributions_models.py @@ -215,9 +215,9 @@ def test_authed_user_scope_includes_is_public(self): def test_authed_user_with_groups_has_group_id_clause(self): user = User(username="u@example.com", groups=frozenset({"g1", "g2"})) ors = MongoDbContributionRepository._build_scope(user)["$or"] - group_clause = next((c for c in ors if "_id" in c), None) + group_clause = next((c for c in ors if "project" in c), None) assert group_clause is not None - assert set(group_clause["_id"]["$in"]) == {"g1", "g2"} + assert set(group_clause["project"]["$in"]) == {"g1", "g2"} def test_authed_user_no_groups_has_no_group_id_clause(self): user = User(username="u@example.com", groups=frozenset()) diff --git a/mpcontribs-api/tests/unit/test_exceptions.py b/mpcontribs-api/tests/unit/test_exceptions.py index 77d085f102..a01d033051 100644 --- a/mpcontribs-api/tests/unit/test_exceptions.py +++ b/mpcontribs-api/tests/unit/test_exceptions.py @@ -4,7 +4,6 @@ AppError, AuthenticationError, ConflictError, - GatewayError, NotFoundError, PermissionError, ValidationError, @@ -126,17 +125,6 @@ def test_is_app_error(self): assert issubclass(AuthenticationError, AppError) -class TestGatewayError: - def test_status_code(self): - assert GatewayError.status_code == 403 - - def test_error_code(self): - assert GatewayError.error_code == "gateway_error" - - def test_is_app_error(self): - assert issubclass(GatewayError, AppError) - - class TestExceptionRaising: def test_not_found_can_be_raised_and_caught(self): with pytest.raises(NotFoundError) as exc_info: From 946e2e773f47779c1266898024940a90b4932ec3 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 11 Jun 2026 13:22:51 -0700 Subject: [PATCH 109/591] Contribution.data validation for depth <= 7 --- .../domains/contributions/models.py | 29 +++++++++++++++---- .../domains/contributions/service.py | 1 + 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py index b8b19d22f4..6ee908c68d 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py @@ -1,5 +1,5 @@ from datetime import UTC, datetime -from typing import Any +from typing import Annotated, Any from beanie import ( Insert, @@ -13,7 +13,7 @@ ) from fastapi_filter import FilterDepends, with_prefix from fastapi_filter.contrib.beanie import Filter -from pydantic import Field, field_validator +from pydantic import BeforeValidator, Field, field_validator from pymongo import ASCENDING, IndexModel from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut @@ -21,14 +21,32 @@ from mpcontribs_api.domains.attachments.models import Attachment, AttachmentFilter, AttachmentIn from mpcontribs_api.domains.structures.models import Structure, StructureFilter, StructureIn from mpcontribs_api.domains.tables.models import Table, TableFilter, TableIn +from mpcontribs_api.exceptions import ValidationError from mpcontribs_api.projection import SparseFieldsModel +def _get_dict_depth(x) -> int: + if isinstance(x, dict): + return 1 + max((_get_dict_depth(v) for v in x.values()), default=0) + elif isinstance(x, list): + return max((_get_dict_depth(item) for item in x), default=0) + return 0 + + +def _validate_data_depth(data: dict[str, Any] | None) -> dict[str, Any] | None: + if not data: + return None + depth = _get_dict_depth(data) + if depth > 7: + raise ValidationError("Depth of Contribution.data must be <= 7.", depth=depth) + return data + + class ContributionBase(BaseDocumentWithInput[PydanticObjectId]): project: str identifier: str formula: str - data: dict[str, Any] + data: Annotated[dict[str, Any], BeforeValidator(_validate_data_depth)] # TODO: Verify that this should default to True and be passed by users needs_build: bool = True @@ -92,7 +110,7 @@ class ContributionOut(DocumentOut[PydanticObjectId]): is_public: bool | None = None last_modified: datetime | None = None needs_build: bool | None = None - data: dict[str, Any] | None = None + data: Annotated[dict[str, Any] | None, BeforeValidator(_validate_data_depth)] = None structures: list[Link[Structure]] | None = None tables: list[Link[Table]] | None = None attachments: list[Link[Attachment]] | None = None @@ -115,7 +133,7 @@ class ContributionPatch(SparseFieldsModel): identifier: str | None = None formula: str | None = None needs_build: bool | None = None - data: dict[str, Any] | None = None + data: Annotated[dict[str, Any] | None, BeforeValidator(_validate_data_depth)] = None structures: list[Link[Structure]] | None = None tables: list[Link[Table]] | None = None attachments: list[Link[Attachment]] | None = None @@ -151,5 +169,6 @@ class Constants(Filter.Constants): model = Contribution @field_validator("id", mode="before") + @classmethod def convert_str_to_oid(cls, v: str): return PydanticObjectId(v) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py index 4d7cf1a562..4b4c6ba0a4 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py @@ -299,6 +299,7 @@ async def delete_contributions(self, filter: ContributionFilter) -> BulkDeleteSu num_deleted_contributions = 0 # Loop through cursor rather than materialize arbitrary number of Contributions while True: + # Since we are deleting everything matching filter, we can continuously get the 1st page page = await self._contributions.get_contributions( pagination=CursorParams(cursor=None, limit=100), filter=filter, From 210b0e1697cf69079afdd4b38a52b992f7666a63 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 11 Jun 2026 13:24:45 -0700 Subject: [PATCH 110/591] Disallow lists in Contribution.data --- .../src/mpcontribs_api/domains/contributions/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py index 6ee908c68d..f8b60918fe 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py @@ -29,7 +29,7 @@ def _get_dict_depth(x) -> int: if isinstance(x, dict): return 1 + max((_get_dict_depth(v) for v in x.values()), default=0) elif isinstance(x, list): - return max((_get_dict_depth(item) for item in x), default=0) + raise ValidationError("List encountered in Contribution.data") return 0 From cb9b506393eed1c3b1eebe8169dab0070b13a471 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 11 Jun 2026 14:30:02 -0700 Subject: [PATCH 111/591] Added more validation to Contribution.data dict --- .../domains/contributions/models.py | 42 ++++++++++++++++--- .../unit/domains/test_contributions_models.py | 32 ++++++++++++++ 2 files changed, 69 insertions(+), 5 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py index f8b60918fe..4f506e0b77 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py @@ -1,3 +1,4 @@ +import re from datetime import UTC, datetime from typing import Annotated, Any @@ -29,12 +30,12 @@ def _get_dict_depth(x) -> int: if isinstance(x, dict): return 1 + max((_get_dict_depth(v) for v in x.values()), default=0) elif isinstance(x, list): - raise ValidationError("List encountered in Contribution.data") + return max((_get_dict_depth(item) for item in x), default=0) return 0 def _validate_data_depth(data: dict[str, Any] | None) -> dict[str, Any] | None: - if not data: + if data is None: return None depth = _get_dict_depth(data) if depth > 7: @@ -42,11 +43,34 @@ def _validate_data_depth(data: dict[str, Any] | None) -> dict[str, Any] | None: return data +# Forbid punctuation, excluding: '*', '/' and exactly 1 '|' anywhere in string +_DATA_PUNCTUATION_PATTERN = re.compile(r"(?![^|]*\|[^|]*\|)[^\x21-\x29\x2B-\x2E\x3A-\x40\x5B-\x5E\x60\x7B\x7D-\x7E]*") + + +def _validate_keys(data: dict[str, Any] | None) -> dict[str, Any] | None: + if data is None: + return None + if not all(isinstance(k, str) and k.isascii() for k in data.keys()): + raise ValidationError("Non-ASCII key found in Contribution.data. All dict keys must be only ASCII") + if any(_DATA_PUNCTUATION_PATTERN.fullmatch(k) is None for k in data.keys()): + raise ValidationError( + "Punctuation found in Contribution.data keys. Only '_', '*', '/', and at most 1 '|' permitted." + ) + for v in data.values(): + if isinstance(v, dict): + _validate_keys(v) + return data + + class ContributionBase(BaseDocumentWithInput[PydanticObjectId]): project: str identifier: str formula: str - data: Annotated[dict[str, Any], BeforeValidator(_validate_data_depth)] + data: Annotated[ + dict[str, Any], + BeforeValidator(_validate_data_depth), + BeforeValidator(_validate_keys), + ] # TODO: Verify that this should default to True and be passed by users needs_build: bool = True @@ -110,7 +134,11 @@ class ContributionOut(DocumentOut[PydanticObjectId]): is_public: bool | None = None last_modified: datetime | None = None needs_build: bool | None = None - data: Annotated[dict[str, Any] | None, BeforeValidator(_validate_data_depth)] = None + data: Annotated[ + dict[str, Any] | None, + BeforeValidator(_validate_data_depth), + BeforeValidator(_validate_keys), + ] = None structures: list[Link[Structure]] | None = None tables: list[Link[Table]] | None = None attachments: list[Link[Attachment]] | None = None @@ -133,7 +161,11 @@ class ContributionPatch(SparseFieldsModel): identifier: str | None = None formula: str | None = None needs_build: bool | None = None - data: Annotated[dict[str, Any] | None, BeforeValidator(_validate_data_depth)] = None + data: Annotated[ + dict[str, Any] | None, + BeforeValidator(_validate_data_depth), + BeforeValidator(_validate_keys), + ] = None structures: list[Link[Structure]] | None = None tables: list[Link[Table]] | None = None attachments: list[Link[Attachment]] | None = None diff --git a/mpcontribs-api/tests/unit/domains/test_contributions_models.py b/mpcontribs-api/tests/unit/domains/test_contributions_models.py index 98d2a3d48b..fc217492f5 100644 --- a/mpcontribs-api/tests/unit/domains/test_contributions_models.py +++ b/mpcontribs-api/tests/unit/domains/test_contributions_models.py @@ -13,6 +13,7 @@ ContributionOut, ContributionPatch, ) +from mpcontribs_api.exceptions import ValidationError # --------------------------------------------------------------------------- # Helpers @@ -97,6 +98,37 @@ def test_data_accepts_nested_structure(self): contrib = _make_contribution_in(data=nested) assert contrib.data["band_gap"]["value"] == 1.5 + def test_data_depth_validation(self): + max_nesting = {"lvl_1": {"lvl_2": {"lvl_3": {"lvl_4": {"lvl_5": {"lvl_6": {"lvl_7": "pass"}}}}}}} + invalid_nesting = {"lvl_1": {"lvl_2": {"lvl_3": {"lvl_4": {"lvl_5": {"lvl_6": {"lvl_7": {"lvl_8": "fail"}}}}}}}} + _make_contribution_in(data=max_nesting) + assert True + with pytest.raises(ValidationError, match="Depth of Contribution.data"): + _make_contribution_in(data=invalid_nesting) + + def test_data_key_validation(self): + valid_punctuation = {"test*/|": "pass"} + invalid_punctuation = {"test.": "fail"} + too_many_pipes = {"test||": "fail"} + non_ascii = {"ΔE": "fail"} + _make_contribution_in(data=valid_punctuation) + assert True + with pytest.raises(ValidationError, match="Punctuation found in Contribution.data keys"): + _make_contribution_in(data=invalid_punctuation) + with pytest.raises(ValidationError, match="Punctuation found in Contribution.data keys"): + _make_contribution_in(data=too_many_pipes) + with pytest.raises(ValidationError, match="Non-ASCII key found in Contribution.data"): + _make_contribution_in(data=non_ascii) + + # There isn't currently value validation. This is to check that that is true + def test_data_value_validation(self): + pipes_in_values = {"test": "pass||"} + punctuation_in_values = {"test": "pass."} + ascii_in_values = {"test": "Δ"} + _make_contribution_in(data=pipes_in_values) + _make_contribution_in(data=punctuation_in_values) + _make_contribution_in(data=ascii_in_values) + assert True # --------------------------------------------------------------------------- # Contribution.from_input_model From 39c032f9db7d6e0db904ee4a89410e622e5509a2 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Fri, 12 Jun 2026 10:31:06 -0700 Subject: [PATCH 112/591] Removed useless thin wrapper method --- .../mpcontribs_api/domains/_shared/components.py | 14 +++----------- .../domains/attachments/repository.py | 2 +- .../domains/structures/repository.py | 2 +- .../mpcontribs_api/domains/tables/repository.py | 2 +- 4 files changed, 6 insertions(+), 14 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py index 6044d07466..381747ecd0 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py @@ -28,7 +28,7 @@ class MongoDbComponentsRepository[ def _build_scope(user: User) -> dict[str, Any]: return {} - # TODO: Returned docs don't have IDs assigned to them + # TODO: The docs I return don't have ID yet, since they were created locally async def insert_components( self, components: list[TIn], @@ -42,6 +42,7 @@ async def insert_components( """ if not components: return [] + docs = [self.document_model.model_validate(t.model_dump()) for t in components] chunk_size = get_settings().mongo.component_insert_chunk_size for start in range(0, len(docs), chunk_size): @@ -55,7 +56,7 @@ async def insert_component(self, component: TIn) -> TDoc: component (TIn): the table to insert Returns: - TDpc: the component actually in the database + TDoc: the component actually in the database Raises: AppError: If insert_one returns None, raises @@ -66,15 +67,6 @@ async def insert_component(self, component: TIn) -> TDoc: raise AppError("Error inserting Table", table=component) return full_doc - async def get_components( - self, - filter: TFilter, - pagination: CursorParams, - fields: frozenset[str] | None, - ) -> Page[TOut]: - """Query the component collection, scoped to the current user. See ``get_many``.""" - return await self.get_many(pagination=pagination, filter=filter, fields=fields) - async def get_component_by_id(self, id: str, fields: frozenset[str] | None) -> TDoc | TOut | None: """Find a single table by id, scoped to the current user. See ``get_by_id``.""" return await self.get_by_id(id, fields) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/attachments/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/attachments/repository.py index f830b5d35a..b076eddcfa 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/attachments/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/attachments/repository.py @@ -29,7 +29,7 @@ async def get_attachments( fields: frozenset[str] | None, ) -> Page[AttachmentOut]: """Query the attachment collection, scoped to the current user. See ``get_many``.""" - return await self.get_components(pagination=pagination, filter=filter, fields=fields) + return await self.get_many(pagination=pagination, filter=filter, fields=fields) async def get_attachment_by_id(self, id: str, fields: frozenset[str] | None) -> Attachment | AttachmentOut | None: """Find a single table by id, scoped to the current user. See ``get_by_id``.""" diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/repository.py index 92155dd028..ac654b7588 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/structures/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/structures/repository.py @@ -56,7 +56,7 @@ async def get_structures( fields: frozenset[str] | None, ) -> Page[StructureOut]: """Query the structure collection, scoped to the current user. See ``get_many``.""" - return await self.get_components(pagination=pagination, filter=filter, fields=fields) + return await self.get_many(pagination=pagination, filter=filter, fields=fields) async def get_structure_by_id(self, id: str, fields: frozenset[str] | None) -> Structure | StructureOut | None: """Find a single table by id, scoped to the current user. See ``get_by_id``.""" diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py index 1184ded32b..5b3337524a 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py @@ -54,7 +54,7 @@ async def get_tables( fields: frozenset[str] | None, ) -> Page[TableOut]: """Query the table collection, scoped to the current user. See ``get_many``.""" - return await self.get_components(pagination=pagination, filter=filter, fields=fields) + return await self.get_many(pagination=pagination, filter=filter, fields=fields) async def get_table_by_id(self, id: str, fields: frozenset[str] | None) -> Table | TableOut | None: """Find a single table by id, scoped to the current user. See ``get_by_id``.""" From 3e21a4d2db9f01f5c9d088d329a00ddeb80e0406 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Fri, 12 Jun 2026 12:19:30 -0700 Subject: [PATCH 113/591] Inserting many components now validates by md5 hash and returns documents with their id --- .../domains/_shared/components.py | 49 ++++++++++++++----- .../mpcontribs_api/domains/_shared/models.py | 25 +++++++++- .../mpcontribs_api/domains/_shared/types.py | 2 +- .../domains/attachments/models.py | 7 ++- .../domains/structures/models.py | 7 ++- .../mpcontribs_api/domains/tables/models.py | 7 ++- .../domains/tables/repository.py | 2 +- 7 files changed, 72 insertions(+), 27 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py index 381747ecd0..a57ee7b940 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py @@ -4,22 +4,23 @@ from collections.abc import AsyncIterable from typing import Any, Literal +from beanie import PydanticObjectId +from beanie.operators import In from fastapi_filter.contrib.beanie import Filter from pydantic import BaseModel from pymongo.asynchronous.client_session import AsyncClientSession from mpcontribs_api.auth import User from mpcontribs_api.config import get_settings -from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DeleteResponse, DocumentOut +from mpcontribs_api.domains._shared.models import Component, DeleteResponse, DocumentOut from mpcontribs_api.domains._shared.repository import MongoDbRepository from mpcontribs_api.domains._shared.types import DownloadFormat from mpcontribs_api.exceptions import AppError -from mpcontribs_api.pagination import CursorParams, Page class MongoDbComponentsRepository[ - TDoc: BaseDocumentWithInput, - TIn: BaseModel, + TDoc: Component, + TIn: Component, TOut: DocumentOut, TFilter: Filter, # not FilterDepends — see below TPatch: BaseModel, @@ -28,7 +29,6 @@ class MongoDbComponentsRepository[ def _build_scope(user: User) -> dict[str, Any]: return {} - # TODO: The docs I return don't have ID yet, since they were created locally async def insert_components( self, components: list[TIn], @@ -40,14 +40,39 @@ async def insert_components( components (list[TIn]): components to insert session (AsyncClientSession): optional client session; pass when inserting inside a transaction """ - if not components: - return [] - - docs = [self.document_model.model_validate(t.model_dump()) for t in components] + by_md5 = {comp.md5: comp for comp in components} + + # Full fetch so existing docs come back with their ids + existing_docs = await self.document_model.find( + In(self.document_model.md5, list(by_md5.keys())), + session=session, + ).to_list() + existing_by_md5 = {doc.md5: doc for doc in existing_docs} + + # Assign ids manually: insert_many won't populate id back onto these + # objects, and get_dict drops id when it's None. + new_docs: list[TDoc] = [] + for md5, comp in by_md5.items(): + if md5 in existing_by_md5: + continue + doc = self.document_model.model_validate(comp.model_dump()) + doc.id = PydanticObjectId() + new_docs.append(doc) + + # TODO: Might want to delegate this logic to a higher level. This method might want to simply insert everything + # its given + # Insert by chunks chunk_size = get_settings().mongo.component_insert_chunk_size - for start in range(0, len(docs), chunk_size): - await self.document_model.insert_many(docs[start : start + chunk_size], ordered=False, session=session) - return docs + for start in range(0, len(new_docs), chunk_size): + await self.document_model.insert_many( + new_docs[start : start + chunk_size], + ordered=False, + session=session, + ) + + # Return a list of documents reflecting what was stored/found + resolved = existing_by_md5 | {doc.md5: doc for doc in new_docs} + return [resolved[md5] for md5 in by_md5] async def insert_component(self, component: TIn) -> TDoc: """Insert a single component. diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py index 655629ed1e..2d44eb7308 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py @@ -1,10 +1,15 @@ -from typing import Annotated, Any, Self +import hashlib +import json +import unicodedata +from collections.abc import Mapping +from typing import Annotated, Any, ClassVar, Self from beanie import DocumentWithSoftDelete, PydanticObjectId from pydantic import BaseModel, Field from pymongo.results import DeleteResult from mpcontribs_api import pagination +from mpcontribs_api.domains._shared.types import MD5Hash from mpcontribs_api.projection import SparseFieldsModel @@ -51,3 +56,21 @@ class DeleteResponse(BaseModel): @classmethod def from_delete_result(cls, delete_result: DeleteResult) -> Self: return cls(num_deleted=delete_result.deleted_count) + + +def canonical_md5(payload: Mapping[str, Any]) -> str: + """MD5 hex digest of a content mapping, stable across processes/hosts.""" + text = json.dumps(payload, sort_keys=True, separators=(",", ":"), ensure_ascii=False) + normalized = unicodedata.normalize("NFC", text) + return hashlib.md5(normalized.encode("utf-8")).hexdigest() + + +class Component(BaseDocumentWithInput[PydanticObjectId]): + name: str + md5: MD5Hash + + hash_fields: ClassVar[frozenset[str]] + + def compute_md5(self) -> str: + payload = self.model_dump(mode="json", include=set(self.hash_fields), by_alias=False) + return canonical_md5(payload) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py index 999439d4c4..cb85f71197 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py @@ -42,7 +42,7 @@ def _file_name_like_str(v: str) -> str: def _md5_like(v: str) -> str: v = v.strip().lower() if not _MD5.match(v): - raise ValidationError("must be a 32-character MD5 hex digest") + raise ValidationError("must be a 32-character MD5 hex digest", md5=v) return v diff --git a/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py b/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py index e32c8af0d9..ee00288fdb 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py @@ -1,14 +1,13 @@ from beanie import PydanticObjectId from fastapi_filter.contrib.beanie import Filter -from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut +from mpcontribs_api.domains._shared.models import Component, DocumentOut from mpcontribs_api.domains._shared.types import FileLike, MD5Hash, MimeFormat from mpcontribs_api.projection import SparseFieldsModel -class Attachment(BaseDocumentWithInput[PydanticObjectId]): - name: FileLike - md5: MD5Hash +class Attachment(Component): + hash_fields = frozenset({"mime", "content"}) mime: MimeFormat content: int diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py index 82ecc93589..0b097c9e9f 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py @@ -3,7 +3,7 @@ from pydantic import BaseModel, ConfigDict from pymatgen.core import Element -from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut +from mpcontribs_api.domains._shared.models import Component, DocumentOut from mpcontribs_api.domains._shared.types import MD5Hash, PolarsFrame from mpcontribs_api.projection import SparseFieldsModel @@ -46,9 +46,8 @@ class Cif(BaseModel): pass -class Structure(BaseDocumentWithInput[PydanticObjectId]): - name: str - md5: MD5Hash +class Structure(Component): + hash_fields = frozenset({"lattice", "sites", "charge"}) lattice: Lattice sites: list[Site] charge: float | None diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py index e9d9797e9e..deb7bcfbf4 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py @@ -11,7 +11,7 @@ model_validator, ) -from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut +from mpcontribs_api.domains._shared.models import Component, DocumentOut from mpcontribs_api.domains._shared.types import MD5Hash, PolarsFrame from mpcontribs_api.projection import SparseFieldsModel @@ -27,11 +27,10 @@ class Attributes(BaseModel): labels: Labels -class Table(BaseDocumentWithInput[PydanticObjectId]): +class Table(Component): model_config = ConfigDict(arbitrary_types_allowed=True) + hash_fields = frozenset({"index", "columns", "data"}) - name: str - md5: MD5Hash attrs: Attributes total_data_rows: int data: PolarsFrame diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py index 5b3337524a..d21145029e 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py @@ -31,7 +31,7 @@ async def insert_tables( tables: tables to insert session: optional client session; pass when inserTableIng inside a transaction """ - return await self.insert_tables(tables=tables, session=session) + return await self.insert_components(components=tables, session=session) async def insert_table(self, table: TableIn) -> Table: """Insert a single table. From f4153239c88328f23a54bee2839364f72b1f2e46 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Fri, 12 Jun 2026 12:29:13 -0700 Subject: [PATCH 114/591] Component.insert_component delegates to insert_components --- .../domains/_shared/components.py | 36 ++++++++++--------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py index a57ee7b940..4946e10cf3 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py @@ -14,7 +14,7 @@ from mpcontribs_api.config import get_settings from mpcontribs_api.domains._shared.models import Component, DeleteResponse, DocumentOut from mpcontribs_api.domains._shared.repository import MongoDbRepository -from mpcontribs_api.domains._shared.types import DownloadFormat +from mpcontribs_api.domains._shared.types import DownloadFormat, MD5Hash from mpcontribs_api.exceptions import AppError @@ -29,6 +29,22 @@ class MongoDbComponentsRepository[ def _build_scope(user: User) -> dict[str, Any]: return {} + async def _check_existing( + self, + components: list[TIn] | TIn, + session: AsyncClientSession | None = None, + ) -> tuple[dict[MD5Hash, TIn], dict[str, TDoc]]: + if not isinstance(components, list): + components = [components] + by_md5 = {comp.md5: comp for comp in components} + + # Full fetch so existing docs come back with their ids + existing_docs = await self.document_model.find( + In(self.document_model.md5, list(by_md5.keys())), + session=session, + ).to_list() + return (by_md5, {doc.md5: doc for doc in existing_docs}) + async def insert_components( self, components: list[TIn], @@ -40,15 +56,7 @@ async def insert_components( components (list[TIn]): components to insert session (AsyncClientSession): optional client session; pass when inserting inside a transaction """ - by_md5 = {comp.md5: comp for comp in components} - - # Full fetch so existing docs come back with their ids - existing_docs = await self.document_model.find( - In(self.document_model.md5, list(by_md5.keys())), - session=session, - ).to_list() - existing_by_md5 = {doc.md5: doc for doc in existing_docs} - + by_md5, existing_by_md5 = await self._check_existing(components=components, session=session) # Assign ids manually: insert_many won't populate id back onto these # objects, and get_dict drops id when it's None. new_docs: list[TDoc] = [] @@ -74,7 +82,7 @@ async def insert_components( resolved = existing_by_md5 | {doc.md5: doc for doc in new_docs} return [resolved[md5] for md5 in by_md5] - async def insert_component(self, component: TIn) -> TDoc: + async def insert_component(self, component: TIn, *, session: AsyncClientSession | None = None) -> TDoc: """Insert a single component. Args: @@ -86,11 +94,7 @@ async def insert_component(self, component: TIn) -> TDoc: Raises: AppError: If insert_one returns None, raises """ - doc = self.document_model.model_validate(component.model_dump()) - full_doc = await self.document_model.insert_one(doc) - if not full_doc: - raise AppError("Error inserting Table", table=component) - return full_doc + return (await self.insert_components(components=[component], session=session))[0] async def get_component_by_id(self, id: str, fields: frozenset[str] | None) -> TDoc | TOut | None: """Find a single table by id, scoped to the current user. See ``get_by_id``.""" From e92977f5477f46badf2fdef69ed1c89640947be0 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Fri, 12 Jun 2026 13:37:18 -0700 Subject: [PATCH 115/591] Attachments document model now verifies extension of file. Modified imports. --- .../mpcontribs_api/domains/_shared/components.py | 1 - .../mpcontribs_api/domains/attachments/models.py | 15 +++++++++++++++ .../domains/contributions/models.py | 9 ++++++++- .../src/mpcontribs_api/domains/tables/models.py | 2 +- 4 files changed, 24 insertions(+), 3 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py index 4946e10cf3..3611b30b13 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py @@ -15,7 +15,6 @@ from mpcontribs_api.domains._shared.models import Component, DeleteResponse, DocumentOut from mpcontribs_api.domains._shared.repository import MongoDbRepository from mpcontribs_api.domains._shared.types import DownloadFormat, MD5Hash -from mpcontribs_api.exceptions import AppError class MongoDbComponentsRepository[ diff --git a/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py b/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py index ee00288fdb..7e65dd1ee6 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py @@ -1,10 +1,14 @@ from beanie import PydanticObjectId from fastapi_filter.contrib.beanie import Filter +from pydantic import field_validator from mpcontribs_api.domains._shared.models import Component, DocumentOut from mpcontribs_api.domains._shared.types import FileLike, MD5Hash, MimeFormat +from mpcontribs_api.exceptions import ValidationError from mpcontribs_api.projection import SparseFieldsModel +ACCEPTED_FORMATS = ["jpg", "jpeg", "png", "csv", "parquet", "gz"] + class Attachment(Component): hash_fields = frozenset({"mime", "content"}) @@ -14,6 +18,17 @@ class Attachment(Component): class Settings: name = "attachments" + @field_validator("name", mode="before") + @classmethod + def _name_with_extension(cls, v: str) -> str: + parts = v.strip().split(".") + if parts[-1].lower() not in ACCEPTED_FORMATS: + raise ValidationError( + f"Attachment extension not in allowed formats: {ACCEPTED_FORMATS}", + found_extension=parts[-1], + ) + return v + class AttachmentIn(Attachment): pass diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py index 4f506e0b77..49bdcff722 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py @@ -12,6 +12,7 @@ Update, before_event, ) +from bson.errors import InvalidId from fastapi_filter import FilterDepends, with_prefix from fastapi_filter.contrib.beanie import Filter from pydantic import BeforeValidator, Field, field_validator @@ -203,4 +204,10 @@ class Constants(Filter.Constants): @field_validator("id", mode="before") @classmethod def convert_str_to_oid(cls, v: str): - return PydanticObjectId(v) + try: + return PydanticObjectId(v) + except InvalidId as err: + raise ValidationError( + "Invalid ObjectId format. Must be 12-byte input or a 24-character hex string", + oid=v, + ) from err diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py index deb7bcfbf4..65985b362e 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py @@ -6,13 +6,13 @@ from pydantic import ( BaseModel, ConfigDict, - ValidationError, field_serializer, model_validator, ) from mpcontribs_api.domains._shared.models import Component, DocumentOut from mpcontribs_api.domains._shared.types import MD5Hash, PolarsFrame +from mpcontribs_api.exceptions import ValidationError from mpcontribs_api.projection import SparseFieldsModel From 7e359ead88c2648b2d38cc75124ec769bbdbafbd Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Fri, 12 Jun 2026 13:37:30 -0700 Subject: [PATCH 116/591] Greatly expanded unit testing --- .../unit/domains/test_attachments_models.py | 151 ++++++++++ .../unit/domains/test_contributions_models.py | 30 ++ .../unit/domains/test_projects_models.py | 22 ++ .../tests/unit/domains/test_shared_bulk.py | 122 +++++++++ .../tests/unit/domains/test_shared_models.py | 122 +++++++++ .../unit/domains/test_structures_models.py | 226 +++++++++++++++ .../tests/unit/domains/test_tables_models.py | 259 ++++++++++++++++++ mpcontribs-api/tests/unit/test_config.py | 198 +++++++++++++ mpcontribs-api/tests/unit/test_exceptions.py | 32 +++ .../tests/unit/test_types_components.py | 213 ++++++++++++++ 10 files changed, 1375 insertions(+) create mode 100644 mpcontribs-api/tests/unit/domains/test_attachments_models.py create mode 100644 mpcontribs-api/tests/unit/domains/test_shared_bulk.py create mode 100644 mpcontribs-api/tests/unit/domains/test_shared_models.py create mode 100644 mpcontribs-api/tests/unit/domains/test_structures_models.py create mode 100644 mpcontribs-api/tests/unit/domains/test_tables_models.py create mode 100644 mpcontribs-api/tests/unit/test_config.py create mode 100644 mpcontribs-api/tests/unit/test_types_components.py diff --git a/mpcontribs-api/tests/unit/domains/test_attachments_models.py b/mpcontribs-api/tests/unit/domains/test_attachments_models.py new file mode 100644 index 0000000000..6f281c1a7a --- /dev/null +++ b/mpcontribs-api/tests/unit/domains/test_attachments_models.py @@ -0,0 +1,151 @@ +"""Unit tests for domains/attachments/models.py.""" + +import pytest +from beanie import PydanticObjectId +from pydantic import ValidationError as PydanticValidationError + +from mpcontribs_api.domains.attachments.models import ( + Attachment, + AttachmentFilter, + AttachmentIn, + AttachmentOut, + AttachmentPatch, +) +from mpcontribs_api.exceptions import ValidationError as AppValidationError + +# --------------------------------------------------------------------------- +# Helpers +# --------------------------------------------------------------------------- + + +def _payload(**overrides) -> dict: + payload = { + "_id": PydanticObjectId(), + "name": "spectrum.json.gz", + "md5": "c" * 32, + "mime": "application/gzip", + "content": 1, + } + payload.update(overrides) + return payload + + +# --------------------------------------------------------------------------- +# Attachment / AttachmentIn +# --------------------------------------------------------------------------- + + +class TestAttachment: + def test_valid_construction(self): + attachment = Attachment(**_payload()) + assert attachment.name == "spectrum.json.gz" + assert attachment.content == 1 + + def test_collection_name(self): + assert Attachment.Settings.name == "attachments" + + def test_name_requires_extension(self): + with pytest.raises(AppValidationError): + Attachment(**_payload(name="noextension")) + + def test_md5_normalized(self): + attachment = Attachment(**_payload(md5="C" * 32)) + assert attachment.md5 == "c" * 32 + + def test_invalid_md5_raises(self): + with pytest.raises(AppValidationError): + Attachment(**_payload(md5="zz")) + + def test_invalid_mime_raises(self): + with pytest.raises(AppValidationError): + Attachment(**_payload(mime="text/plain")) + + def test_missing_content_raises(self): + payload = _payload() + del payload["content"] + with pytest.raises(PydanticValidationError): + Attachment(**payload) + + def test_attachment_in_is_attachment(self): + # Input models subclass their document so from_input_model can dump them 1:1. + assert issubclass(AttachmentIn, Attachment) + assert isinstance(AttachmentIn(**_payload()), Attachment) + + +# --------------------------------------------------------------------------- +# AttachmentOut +# --------------------------------------------------------------------------- + + +class TestAttachmentOut: + def test_all_fields_optional(self): + out = AttachmentOut() + assert out.id is None + assert out.name is None + assert out.md5 is None + assert out.mime is None + + def test_partial_population(self): + out = AttachmentOut(name="a.gz") + assert out.name == "a.gz" + assert out.md5 is None + + def test_populates_id_from_mongo_alias(self): + oid = PydanticObjectId() + out = AttachmentOut.model_validate({"_id": oid, "md5": "d" * 32}) + assert out.id == oid + + def test_validators_still_apply_when_value_given(self): + with pytest.raises(AppValidationError): + AttachmentOut(mime="text/plain") + + +# --------------------------------------------------------------------------- +# AttachmentPatch +# --------------------------------------------------------------------------- + + +class TestAttachmentPatch: + def test_all_fields_optional(self): + patch = AttachmentPatch() + assert patch.name is None + assert patch.mime is None + + def test_partial_patch_excludes_unset(self): + patch = AttachmentPatch(name="renamed.gz") + assert patch.model_dump(exclude_unset=True) == {"name": "renamed.gz"} + + def test_invalid_name_raises(self): + with pytest.raises(AppValidationError): + AttachmentPatch(name="noextension") + + def test_invalid_mime_raises(self): + with pytest.raises(AppValidationError): + AttachmentPatch(mime="bogus") + + +# --------------------------------------------------------------------------- +# AttachmentFilter +# --------------------------------------------------------------------------- + + +class TestAttachmentFilter: + def test_empty_filter(self): + filter = AttachmentFilter() + assert filter.id is None + assert filter.md5 is None + assert filter.name__ilike is None + + def test_constants_bind_attachment_model(self): + assert AttachmentFilter.Constants.model is Attachment + + def test_md5_value_validated(self): + assert AttachmentFilter(md5="E" * 32).md5 == "e" * 32 + + def test_invalid_md5_raises(self): + with pytest.raises(AppValidationError): + AttachmentFilter(md5="nothex") + + def test_id_in_accepts_object_ids(self): + oids = [PydanticObjectId(), PydanticObjectId()] + assert AttachmentFilter(id__in=oids).id__in == oids diff --git a/mpcontribs-api/tests/unit/domains/test_contributions_models.py b/mpcontribs-api/tests/unit/domains/test_contributions_models.py index fc217492f5..dcda47b93c 100644 --- a/mpcontribs-api/tests/unit/domains/test_contributions_models.py +++ b/mpcontribs-api/tests/unit/domains/test_contributions_models.py @@ -9,6 +9,7 @@ from mpcontribs_api.domains.contributions.models import ( Contribution, + ContributionFilter, ContributionIn, ContributionOut, ContributionPatch, @@ -255,3 +256,32 @@ def test_authed_user_no_groups_has_no_group_id_clause(self): user = User(username="u@example.com", groups=frozenset()) ors = MongoDbContributionRepository._build_scope(user)["$or"] assert not any("_id" in c for c in ors) + + +# --------------------------------------------------------------------------- +# ContributionFilter.convert_str_to_oid +# --------------------------------------------------------------------------- + + +class TestContributionFilterIdValidator: + def test_empty_filter_id_is_none(self): + assert ContributionFilter().id is None + + def test_str_converted_to_object_id(self): + oid = PydanticObjectId() + filter = ContributionFilter(id=str(oid)) + assert isinstance(filter.id, PydanticObjectId) + assert filter.id == oid + + def test_object_id_passthrough(self): + oid = PydanticObjectId() + assert ContributionFilter(id=oid).id == oid + + # RED: a malformed id currently leaks bson.errors.InvalidId (not a + # ValueError subclass), which the exception handlers don't map — so + # `DELETE /contributions/{bad-id}` would 500 instead of 422. Intended + # behavior is a controlled validation error, matching how + # MongoDbRepository._convert_object_id handles the same input. + def test_malformed_id_raises_validation_error(self): + with pytest.raises(ValidationError): + ContributionFilter(id="not-an-object-id") diff --git a/mpcontribs-api/tests/unit/domains/test_projects_models.py b/mpcontribs-api/tests/unit/domains/test_projects_models.py index 56b062ba76..b874091e73 100644 --- a/mpcontribs-api/tests/unit/domains/test_projects_models.py +++ b/mpcontribs-api/tests/unit/domains/test_projects_models.py @@ -232,3 +232,25 @@ def test_from_input_model_defaults(self): assert project.is_approved is False assert project.references == [] assert project.columns == [] + + +# --------------------------------------------------------------------------- +# Project.decode_cursor (string-id override) +# --------------------------------------------------------------------------- + + +class TestProjectDecodeCursor: + def test_round_trips_string_id(self): + from mpcontribs_api.pagination import encode_cursor + + assert Project.decode_cursor(encode_cursor("my-project")) == "my-project" + + def test_returns_plain_str_not_object_id(self): + from mpcontribs_api.pagination import encode_cursor + + decoded = Project.decode_cursor(encode_cursor("solar-cells")) + assert type(decoded) is str + + def test_malformed_cursor_raises_value_error(self): + with pytest.raises(ValueError): + Project.decode_cursor("!!!not-base64!!!") diff --git a/mpcontribs-api/tests/unit/domains/test_shared_bulk.py b/mpcontribs-api/tests/unit/domains/test_shared_bulk.py new file mode 100644 index 0000000000..46ad0b1646 --- /dev/null +++ b/mpcontribs-api/tests/unit/domains/test_shared_bulk.py @@ -0,0 +1,122 @@ +"""Unit tests for domains/_shared/bulk.py.""" + +from beanie import PydanticObjectId + +from mpcontribs_api.domains._shared.bulk import ( + BulkDeleteSummary, + BulkFailure, + BulkWriteSummary, + bulk_failure_from_exception, +) +from mpcontribs_api.exceptions import ConflictError, NotFoundError, ValidationError + +# --------------------------------------------------------------------------- +# BulkFailure +# --------------------------------------------------------------------------- + + +class TestBulkFailure: + def test_required_fields(self): + failure = BulkFailure(index=3, error_code="conflict", message="duplicate") + assert failure.index == 3 + assert failure.error_code == "conflict" + assert failure.message == "duplicate" + + def test_identifier_defaults_to_none(self): + failure = BulkFailure(index=0, error_code="x", message="y") + assert failure.identifier is None + + def test_identifier_carries_arbitrary_dict(self): + identifier = {"project": "proj", "identifier": "mp-1"} + failure = BulkFailure(index=0, identifier=identifier, error_code="x", message="y") + assert failure.identifier == identifier + + +# --------------------------------------------------------------------------- +# BulkWriteSummary +# --------------------------------------------------------------------------- + + +class TestBulkWriteSummary: + def test_fields(self): + summary = BulkWriteSummary[int](total=3, succeeded=[1, 2], failed=[]) + assert summary.total == 3 + assert summary.succeeded == [1, 2] + assert summary.failed == [] + + def test_failed_items_typed(self): + failure = BulkFailure(index=1, error_code="validation_error", message="bad") + summary = BulkWriteSummary[int](total=2, succeeded=[1], failed=[failure]) + assert summary.failed[0].index == 1 + + def test_empty_summary(self): + summary = BulkWriteSummary[int](total=0, succeeded=[], failed=[]) + assert summary.total == 0 + + def test_serialization_shape(self): + failure = BulkFailure(index=0, error_code="conflict", message="dup") + summary = BulkWriteSummary[int](total=1, succeeded=[], failed=[failure]) + dumped = summary.model_dump() + assert dumped == { + "total": 1, + "succeeded": [], + "failed": [{"index": 0, "identifier": None, "error_code": "conflict", "message": "dup"}], + } + + +# --------------------------------------------------------------------------- +# BulkDeleteSummary +# --------------------------------------------------------------------------- + + +class TestBulkDeleteSummary: + def test_fields(self): + summary = BulkDeleteSummary(num_deleted=5, num_children_deleted=12) + assert summary.num_deleted == 5 + assert summary.num_children_deleted == 12 + + def test_zero_counts(self): + summary = BulkDeleteSummary(num_deleted=0, num_children_deleted=0) + assert summary.model_dump() == {"num_deleted": 0, "num_children_deleted": 0} + + +# --------------------------------------------------------------------------- +# bulk_failure_from_exception +# --------------------------------------------------------------------------- + + +class TestBulkFailureFromException: + def test_app_error_uses_its_error_code_and_message(self): + failure = bulk_failure_from_exception(2, None, ConflictError("already exists")) + assert failure.index == 2 + assert failure.error_code == "conflict" + assert failure.message == "already exists" + + def test_not_found_error(self): + failure = bulk_failure_from_exception(0, None, NotFoundError("gone")) + assert failure.error_code == "not_found" + + def test_validation_error(self): + failure = bulk_failure_from_exception(0, None, ValidationError("bad payload")) + assert failure.error_code == "validation_error" + assert failure.message == "bad payload" + + def test_app_error_default_message_is_class_name(self): + failure = bulk_failure_from_exception(0, None, ConflictError()) + assert failure.message == "ConflictError" + + def test_generic_exception_collapses_to_internal_error(self): + failure = bulk_failure_from_exception(1, None, RuntimeError("secret traceback details")) + assert failure.error_code == "internal_error" + + def test_generic_exception_message_is_class_name_only(self): + # Internals must not leak to the client; only the exception class name survives. + failure = bulk_failure_from_exception(1, None, RuntimeError("secret traceback details")) + assert failure.message == "RuntimeError" + assert "secret" not in failure.message + + def test_identifier_threaded_through(self): + identifier = {"id": str(PydanticObjectId())} + failure = bulk_failure_from_exception(4, identifier, ValueError("x")) + assert failure.identifier == identifier + assert failure.index == 4 diff --git a/mpcontribs-api/tests/unit/domains/test_shared_models.py b/mpcontribs-api/tests/unit/domains/test_shared_models.py new file mode 100644 index 0000000000..aaa267779f --- /dev/null +++ b/mpcontribs-api/tests/unit/domains/test_shared_models.py @@ -0,0 +1,122 @@ +"""Unit tests for domains/_shared/models.py. + +Uses Attachment as the concrete BaseDocumentWithInput subclass since it is the +simplest document in the codebase; from_input_model business-logic overrides +are covered per-domain (e.g. test_contributions_models.py). +""" + +import pytest +from beanie import PydanticObjectId +from pymongo.results import DeleteResult + +from mpcontribs_api.domains._shared.models import ( + BaseDocumentWithInput, + DeleteResponse, + DocumentOut, +) +from mpcontribs_api.domains.attachments.models import Attachment, AttachmentIn +from mpcontribs_api.pagination import encode_cursor + +# --------------------------------------------------------------------------- +# Helpers +# --------------------------------------------------------------------------- + + +def _attachment_in(**overrides) -> AttachmentIn: + payload = { + "_id": PydanticObjectId(), + "name": "data.csv.gz", + "md5": "a" * 32, + "mime": "application/gzip", + "content": 1, + } + payload.update(overrides) + return AttachmentIn(**payload) + + +class _OidOut(DocumentOut[PydanticObjectId]): + name: str | None = None + + +# --------------------------------------------------------------------------- +# BaseDocumentWithInput.from_input_model +# --------------------------------------------------------------------------- + + +class TestFromInputModel: + def test_returns_document_class_instance(self): + doc = Attachment.from_input_model(_attachment_in()) + assert isinstance(doc, Attachment) + + def test_all_fields_carried_over(self): + oid = PydanticObjectId() + doc = Attachment.from_input_model(_attachment_in(_id=oid, name="x.gz")) + assert doc.id == oid + assert doc.name == "x.gz" + assert doc.md5 == "a" * 32 + assert doc.mime == "application/gzip" + assert doc.content == 1 + + +# --------------------------------------------------------------------------- +# BaseDocumentWithInput.decode_cursor +# --------------------------------------------------------------------------- + + +class TestDecodeCursor: + def test_round_trips_object_id(self): + oid = PydanticObjectId() + decoded = BaseDocumentWithInput.decode_cursor(encode_cursor(str(oid))) + assert decoded == oid + + def test_returns_pydantic_object_id(self): + cursor = encode_cursor(str(PydanticObjectId())) + assert isinstance(BaseDocumentWithInput.decode_cursor(cursor), PydanticObjectId) + + def test_malformed_base64_raises_value_error(self): + with pytest.raises(ValueError): + BaseDocumentWithInput.decode_cursor("!!!not-base64!!!") + + def test_callable_off_concrete_subclass(self): + oid = PydanticObjectId() + assert Attachment.decode_cursor(encode_cursor(str(oid))) == oid + + +# --------------------------------------------------------------------------- +# DocumentOut +# --------------------------------------------------------------------------- + + +class TestDocumentOut: + def test_id_defaults_to_none(self): + assert _OidOut().id is None + + def test_populates_from_mongo_alias(self): + oid = PydanticObjectId() + out = _OidOut.model_validate({"_id": oid}) + assert out.id == oid + + def test_serializes_under_id_not_underscore_id(self): + oid = PydanticObjectId() + dumped = _OidOut.model_validate({"_id": oid, "name": "n"}).model_dump(by_alias=True) + assert dumped["id"] == oid + assert "_id" not in dumped + + +# --------------------------------------------------------------------------- +# DeleteResponse.from_delete_result +# --------------------------------------------------------------------------- + + +class TestDeleteResponse: + def test_from_delete_result(self): + result = DeleteResult({"n": 3}, acknowledged=True) + assert DeleteResponse.from_delete_result(result).num_deleted == 3 + + def test_zero_deleted(self): + result = DeleteResult({"n": 0}, acknowledged=True) + assert DeleteResponse.from_delete_result(result).num_deleted == 0 + + def test_serialization_shape(self): + result = DeleteResult({"n": 7}, acknowledged=True) + assert DeleteResponse.from_delete_result(result).model_dump() == {"num_deleted": 7} diff --git a/mpcontribs-api/tests/unit/domains/test_structures_models.py b/mpcontribs-api/tests/unit/domains/test_structures_models.py new file mode 100644 index 0000000000..479aebf5bf --- /dev/null +++ b/mpcontribs-api/tests/unit/domains/test_structures_models.py @@ -0,0 +1,226 @@ +"""Unit tests for domains/structures/models.py.""" + +import polars as pl +import pytest +from beanie import PydanticObjectId +from pydantic import ValidationError as PydanticValidationError +from pymatgen.core import Element + +from mpcontribs_api.domains.structures.models import ( + Lattice, + SiteProperties, + Species, + Structure, + StructureFilter, + StructureIn, + StructureOut, + StructurePatch, +) +from mpcontribs_api.exceptions import ValidationError as AppValidationError + +# --------------------------------------------------------------------------- +# Helpers +# --------------------------------------------------------------------------- + + +def _lattice_payload(**overrides) -> dict: + payload = { + "matrix": {"x": [1.0, 0.0, 0.0], "y": [0.0, 1.0, 0.0], "z": [0.0, 0.0, 1.0]}, + "pbc": [True, True, True], + "a": 1.0, + "b": 1.0, + "c": 1.0, + "alpha": 90.0, + "beta": 90.0, + "gamma": 90.0, + "volume": 1.0, + } + payload.update(overrides) + return payload + + +def _site_payload(**overrides) -> dict: + payload = { + "species": [{"element": "Fe", "occu": 1}], + "abc": [0.0, 0.0, 0.0], + "properties": {"magmom": 2.2}, + "label": "Fe", + "xyz": [0.0, 0.0, 0.0], + } + payload.update(overrides) + return payload + + +def _structure_payload(**overrides) -> dict: + payload = { + "_id": PydanticObjectId(), + "name": "Fe2O3", + "md5": "f" * 32, + "lattice": _lattice_payload(), + "sites": [_site_payload()], + "charge": 0.0, + "cif": "data_Fe2O3\n_cell_length_a 1.0\n", + } + payload.update(overrides) + return payload + + +# --------------------------------------------------------------------------- +# Leaf models +# --------------------------------------------------------------------------- + + +class TestSiteProperties: + def test_valid(self): + assert SiteProperties(magmom=1.5).magmom == 1.5 + + def test_missing_magmom_raises(self): + with pytest.raises(PydanticValidationError): + SiteProperties() + + +class TestSpecies: + def test_element_coerced_from_symbol(self): + species = Species(element="Fe", occu=1) + assert species.element is Element.Fe + assert species.occu == 1 + + def test_invalid_symbol_raises(self): + with pytest.raises(PydanticValidationError): + Species(element="Xx", occu=1) + + def test_element_enum_passthrough(self): + assert Species(element=Element.O, occu=2).element is Element.O + + +class TestLattice: + def test_valid_construction(self): + lattice = Lattice(**_lattice_payload()) + assert isinstance(lattice.matrix, pl.DataFrame) + assert lattice.pbc == [True, True, True] + assert lattice.volume == 1.0 + + def test_matrix_coerced_from_dict(self): + lattice = Lattice(**_lattice_payload()) + assert lattice.matrix.columns == ["x", "y", "z"] + + def test_missing_angles_raise(self): + payload = _lattice_payload() + del payload["alpha"] + with pytest.raises(PydanticValidationError): + Lattice(**payload) + + +# --------------------------------------------------------------------------- +# Structure / StructureIn +# --------------------------------------------------------------------------- + + +class TestStructure: + def test_valid_construction(self): + structure = Structure(**_structure_payload()) + assert structure.name == "Fe2O3" + assert len(structure.sites) == 1 + assert structure.sites[0].species[0].element is Element.Fe + + def test_collection_name(self): + assert Structure.Settings.name == "structures" + + def test_charge_is_required_but_nullable(self): + assert Structure(**_structure_payload(charge=None)).charge is None + payload = _structure_payload() + del payload["charge"] + with pytest.raises(PydanticValidationError): + Structure(**payload) + + def test_invalid_md5_raises(self): + with pytest.raises(AppValidationError): + Structure(**_structure_payload(md5="nope")) + + def test_cif_kept_as_raw_string(self): + structure = Structure(**_structure_payload()) + assert structure.cif.startswith("data_Fe2O3") + + def test_structure_in_is_structure(self): + assert issubclass(StructureIn, Structure) + assert isinstance(StructureIn(**_structure_payload()), Structure) + + def test_from_input_model_round_trip(self): + oid = PydanticObjectId() + doc = Structure.from_input_model(StructureIn(**_structure_payload(_id=oid))) + assert isinstance(doc, Structure) + assert doc.id == oid + assert doc.md5 == "f" * 32 + + +# --------------------------------------------------------------------------- +# StructureOut +# --------------------------------------------------------------------------- + + +class TestStructureOut: + def test_all_fields_optional(self): + out = StructureOut() + assert out.id is None + assert out.name is None + assert out.md5 is None + + def test_default_fields(self): + assert StructureOut.default_fields() == ["id", "name", "md5"] + + def test_default_fields_parseable(self): + # The route default must survive parse_fields without raising. + parsed = StructureOut.parse_fields(StructureOut.default_fields()) + assert parsed == frozenset({"id", "name", "md5"}) + + def test_populates_id_from_mongo_alias(self): + oid = PydanticObjectId() + assert StructureOut.model_validate({"_id": oid}).id == oid + + +# --------------------------------------------------------------------------- +# StructurePatch +# --------------------------------------------------------------------------- + + +class TestStructurePatch: + # NOTE: StructurePatch.sites is annotated `Site | None` (singular) while + # Structure.sites is `list[Site]`. A patch produced from this model can + # therefore write a non-list into a list field. Likely a typo; tests below + # pin the current shape so the fix surfaces here when made. + def test_all_fields_optional(self): + patch = StructurePatch() + assert patch.name is None + assert patch.lattice is None + assert patch.sites is None + + def test_partial_patch_excludes_unset(self): + patch = StructurePatch(name="renamed") + assert patch.model_dump(exclude_unset=True) == {"name": "renamed"} + + def test_lattice_patchable(self): + patch = StructurePatch(lattice=_lattice_payload()) + assert patch.lattice is not None + assert patch.lattice.volume == 1.0 + + +# --------------------------------------------------------------------------- +# StructureFilter +# --------------------------------------------------------------------------- + + +class TestStructureFilter: + def test_empty_filter(self): + filter = StructureFilter() + assert filter.id is None + assert filter.name__ilike is None + + def test_constants_bind_structure_model(self): + assert StructureFilter.Constants.model is Structure + + def test_md5_value_validated(self): + assert StructureFilter(md5="A" * 32).md5 == "a" * 32 + + def test_invalid_md5_raises(self): + with pytest.raises(AppValidationError): + StructureFilter(md5="short") diff --git a/mpcontribs-api/tests/unit/domains/test_tables_models.py b/mpcontribs-api/tests/unit/domains/test_tables_models.py new file mode 100644 index 0000000000..5a10b3f160 --- /dev/null +++ b/mpcontribs-api/tests/unit/domains/test_tables_models.py @@ -0,0 +1,259 @@ +"""Unit tests for domains/tables/models.py. + +NOTE ON RED TESTS: tables/models.py imports ``ValidationError`` from pydantic +and raises it with a plain string (``raise ValidationError("...")``). Pydantic +v2's ValidationError cannot be constructed that way, so every failing +validation path currently crashes with +``TypeError: ValidationError.__new__() missing 1 required positional argument`` +instead of raising a controlled error. The intended behavior — consistent with +domains/_shared/types.py and the 422 exception handler — is the domain +``mpcontribs_api.exceptions.ValidationError``. The tests in +TestTableInValidationFailures assert the intended behavior and are expected to +FAIL until the import in tables/models.py is fixed. +""" + +import polars as pl +import pytest +from beanie import PydanticObjectId + +from mpcontribs_api.domains.tables.models import ( + Attributes, + Labels, + Table, + TableFilter, + TableIn, + TableOut, + TablePatch, + TableSummaryOut, +) +from mpcontribs_api.exceptions import ValidationError as AppValidationError + +# --------------------------------------------------------------------------- +# Helpers +# --------------------------------------------------------------------------- + +ATTRS = {"title": "Band gaps", "labels": {"index": "T", "value": "gap", "variable": "method"}} + + +def _table_payload(**overrides) -> dict: + payload = { + "_id": PydanticObjectId(), + "name": "bandgaps", + "md5": "d" * 32, + "attrs": ATTRS, + "total_data_rows": 2, + "data": {"T": [100, 200], "gap": [1.1, 1.2]}, + } + payload.update(overrides) + return payload + + +def _source_doc(**overrides) -> dict: + """A source document for TableIn.from_input.""" + doc = { + "id": PydanticObjectId(), + "name": "bandgaps", + "md5": "d" * 32, + "attrs": ATTRS, + "columns": ["gap", "method"], + "index": [100, 200], + "data": [[1.1, "GGA"], [1.2, "HSE"]], + "total_data_rows": 2, + } + doc.update(overrides) + return doc + + +# --------------------------------------------------------------------------- +# Leaf models +# --------------------------------------------------------------------------- + + +class TestLabels: + def test_valid(self): + labels = Labels(index="T", value="gap", variable="method") + assert labels.index == "T" + + def test_missing_field_raises(self): + with pytest.raises(Exception): + Labels(index="T", value="gap") + + +class TestAttributes: + def test_valid(self): + attrs = Attributes(**ATTRS) + assert attrs.title == "Band gaps" + assert attrs.labels.variable == "method" + + +# --------------------------------------------------------------------------- +# Table +# --------------------------------------------------------------------------- + + +class TestTable: + def test_valid_construction(self): + table = Table(**_table_payload()) + assert isinstance(table.data, pl.DataFrame) + assert table.total_data_rows == 2 + + def test_collection_name(self): + assert Table.Settings.name == "tables" + + def test_md5_normalized(self): + assert Table(**_table_payload(md5="D" * 32)).md5 == "d" * 32 + + def test_data_serializes_to_column_dict(self): + table = Table(**_table_payload()) + assert table.model_dump()["data"] == {"T": [100, 200], "gap": [1.1, 1.2]} + + +# --------------------------------------------------------------------------- +# TableIn: happy paths +# --------------------------------------------------------------------------- + + +class TestTableInHappyPath: + def test_matching_row_count_validates(self): + table = TableIn(**_table_payload()) + assert len(table.data) == table.total_data_rows + + def test_from_input_builds_dataframe_with_index_column(self): + table = TableIn.from_input(_source_doc()) + assert table.data.columns == ["index", "gap", "method"] + assert table.data["index"].to_list() == [100, 200] + + def test_from_input_custom_index_name(self): + table = TableIn.from_input(_source_doc(), index_name="T") + assert table.data.columns == ["T", "gap", "method"] + + def test_from_input_carries_metadata(self): + doc = _source_doc() + table = TableIn.from_input(doc) + assert table.id == doc["id"] + assert table.name == "bandgaps" + assert table.md5 == "d" * 32 + assert table.total_data_rows == 2 + + def test_from_input_rows_zip_index_with_data(self): + table = TableIn.from_input(_source_doc()) + assert table.data["gap"].to_list() == [1.1, 1.2] + assert table.data["method"].to_list() == ["GGA", "HSE"] + + +# --------------------------------------------------------------------------- +# TableIn: validation failures (RED — see module docstring) +# --------------------------------------------------------------------------- + + +class TestTableInValidationFailures: + """All four tests assert the INTENDED domain ValidationError. + + They fail today because tables/models.py raises pydantic's ValidationError + with a string, which crashes with TypeError before any error can surface. + Fix: import ValidationError from mpcontribs_api.exceptions instead. + """ + + def test_row_count_mismatch_raises_validation_error(self): + with pytest.raises(AppValidationError): + TableIn(**_table_payload(total_data_rows=5)) + + def test_from_input_column_collision_raises_validation_error(self): + # index_name defaults to "index"; a source column named "index" collides. + with pytest.raises(AppValidationError): + TableIn.from_input(_source_doc(columns=["index", "gap"])) + + def test_from_input_index_data_length_mismatch_raises_validation_error(self): + with pytest.raises(AppValidationError): + TableIn.from_input(_source_doc(index=[100, 200, 300])) + + def test_from_input_declared_row_count_mismatch_raises_validation_error(self): + with pytest.raises(AppValidationError): + TableIn.from_input(_source_doc(total_data_rows=99)) + + +# --------------------------------------------------------------------------- +# TableFilter +# --------------------------------------------------------------------------- + + +class TestTableFilter: + def test_empty_filter(self): + filter = TableFilter() + assert filter.id is None + assert filter.name__ilike is None + + def test_constants_bind_table_model(self): + assert TableFilter.Constants.model is Table + + def test_id_serializes_to_str(self): + oid = PydanticObjectId() + assert TableFilter(id=oid).model_dump()["id"] == str(oid) + + def test_id_in_serializes_to_sorted_strs(self): + first, second = PydanticObjectId(), PydanticObjectId() + dumped = TableFilter(id__in=[second, first]).model_dump() + assert dumped["id__in"] == sorted([str(first), str(second)]) + + def test_none_ids_serialize_to_none(self): + dumped = TableFilter().model_dump() + assert dumped["id"] is None + assert dumped["id__in"] is None + + def test_md5_value_validated(self): + assert TableFilter(md5="B" * 32).md5 == "b" * 32 + + def test_invalid_md5_raises(self): + with pytest.raises(AppValidationError): + TableFilter(md5="short") + + +# --------------------------------------------------------------------------- +# TableSummaryOut / TableOut / TablePatch +# --------------------------------------------------------------------------- + + +class TestTableSummaryOut: + def test_valid(self): + summary = TableSummaryOut(attrs=ATTRS, columns=["gap"], total_data_rows=10) + assert summary.total_data_pages == 1 + + def test_explicit_pages(self): + summary = TableSummaryOut(attrs=ATTRS, columns=["gap"], total_data_rows=10, total_data_pages=3) + assert summary.total_data_pages == 3 + + +class TestTableOut: + def test_all_fields_optional(self): + out = TableOut() + assert out.id is None + assert out.data is None + assert out.attrs is None + + def test_default_fields(self): + assert TableOut.default_fields() == [ + "id", + "name", + "md5", + "attrs", + "columns", + "total_data_rows", + "total_data_pages", + ] + + def test_default_fields_parseable(self): + # The route default must survive parse_fields without raising. + parsed = TableOut.parse_fields(TableOut.default_fields()) + assert "attrs" in parsed + + def test_data_coerced_when_present(self): + out = TableOut(data={"a": [1]}) + assert isinstance(out.data, pl.DataFrame) + + +class TestTablePatch: + def test_name_optional(self): + assert TablePatch().name is None + + def test_partial_patch_excludes_unset(self): + assert TablePatch(name="renamed").model_dump(exclude_unset=True) == {"name": "renamed"} diff --git a/mpcontribs-api/tests/unit/test_config.py b/mpcontribs-api/tests/unit/test_config.py new file mode 100644 index 0000000000..e06f59edab --- /dev/null +++ b/mpcontribs-api/tests/unit/test_config.py @@ -0,0 +1,198 @@ +"""Unit tests for config.py: MongoSettings clamping, Settings env loading, get_settings caching.""" + +import pytest +from pydantic import SecretStr +from pydantic import ValidationError as PydanticValidationError + +from mpcontribs_api.config import ( + KongSettings, + MongoSettings, + RedisSettings, + Settings, + get_settings, +) + +# --------------------------------------------------------------------------- +# Helpers +# --------------------------------------------------------------------------- + +REQUIRED_ENV = { + "MPCONTRIBS_ENVIRONMENT": "dev", + "MPCONTRIBS_MONGO__URI": "mongodb://user:pass@localhost:27017", + "MPCONTRIBS_MONGO__DB_NAME": "mpcontribs-test", + "MPCONTRIBS_KONG__GATEWAY_SECRET": "kong-secret", + "MPCONTRIBS_REDIS__ADDRESS": "redis://localhost:6379", + "MPCONTRIBS_REDIS__URL": "redis://localhost:6379/0", + "MPCONTRIBS_MAIL_DEFAULT_SENDER": "noreply@materialsproject.org", + "MPCONTRIBS_VERSION": "0.0.0-test", +} + + +def _set_required_env(monkeypatch: pytest.MonkeyPatch) -> None: + for key, value in REQUIRED_ENV.items(): + monkeypatch.setenv(key, value) + + +def _mongo(**overrides) -> MongoSettings: + return MongoSettings(uri=SecretStr("mongodb://localhost"), db_name="db", **overrides) + + +# --------------------------------------------------------------------------- +# MongoSettings defaults +# --------------------------------------------------------------------------- + + +class TestMongoSettingsDefaults: + def test_minimal_construction(self): + settings = _mongo() + assert settings.db_name == "db" + assert settings.uri.get_secret_value() == "mongodb://localhost" + + def test_uri_is_secret(self): + settings = _mongo() + assert "mongodb://localhost" not in repr(settings.uri) + + def test_default_pool_sizes(self): + settings = _mongo() + assert settings.max_pool_size == 100 + assert settings.min_pool_size == 0 + + def test_default_admin_group(self): + assert _mongo().admin_group == "admin" + + def test_default_component_limits(self): + settings = _mongo() + assert settings.max_components_per_contribution == 500 + assert settings.component_insert_chunk_size == 100 + + def test_invalid_datetime_conversion_raises(self): + with pytest.raises(PydanticValidationError): + _mongo(datetime_conversion="not-a-mode") + + def test_missing_uri_raises(self): + with pytest.raises(PydanticValidationError): + MongoSettings(db_name="db") + + +# --------------------------------------------------------------------------- +# MongoSettings._clamp_concurrency +# --------------------------------------------------------------------------- + + +class TestClampConcurrency: + def test_default_not_clamped(self): + # max_pool_size=100 -> cap 50; default max_concurrent_transactions=16 stays. + assert _mongo().max_concurrent_transactions == 16 + + def test_clamped_to_half_pool_size(self): + settings = _mongo(max_pool_size=10, max_concurrent_transactions=16) + assert settings.max_concurrent_transactions == 5 + + def test_exactly_at_cap_not_clamped(self): + settings = _mongo(max_pool_size=32, max_concurrent_transactions=16) + assert settings.max_concurrent_transactions == 16 + + def test_pool_size_one_clamps_to_one(self): + settings = _mongo(max_pool_size=1, max_concurrent_transactions=16) + assert settings.max_concurrent_transactions == 1 + + def test_unbounded_pool_skips_clamping(self): + # max_pool_size=0 means "unlimited" to PyMongo; clamping is skipped. + settings = _mongo(max_pool_size=0, max_concurrent_transactions=999) + assert settings.max_concurrent_transactions == 999 + + def test_below_cap_unchanged(self): + settings = _mongo(max_pool_size=10, max_concurrent_transactions=2) + assert settings.max_concurrent_transactions == 2 + + +# --------------------------------------------------------------------------- +# Sub-settings secrets +# --------------------------------------------------------------------------- + + +class TestSubSettingsSecrets: + def test_kong_secret_masked(self): + kong = KongSettings(gateway_secret=SecretStr("s3cret")) + assert kong.gateway_secret.get_secret_value() == "s3cret" + assert "s3cret" not in repr(kong) + + def test_redis_secrets_masked(self): + redis = RedisSettings(address=SecretStr("redis://h"), url=SecretStr("redis://h/0")) + assert redis.address.get_secret_value() == "redis://h" + assert "redis://h" not in repr(redis) + + +# --------------------------------------------------------------------------- +# Settings: env var loading +# --------------------------------------------------------------------------- + + +class TestSettingsEnvLoading: + def test_loads_from_env(self, monkeypatch): + _set_required_env(monkeypatch) + settings = Settings() + assert settings.environment == "dev" + assert settings.version == "0.0.0-test" + assert settings.mail_default_sender == "noreply@materialsproject.org" + + def test_nested_delimiter_populates_mongo(self, monkeypatch): + _set_required_env(monkeypatch) + settings = Settings() + assert settings.mongo.db_name == "mpcontribs-test" + assert settings.mongo.uri.get_secret_value() == "mongodb://user:pass@localhost:27017" + + def test_nested_delimiter_populates_kong_and_redis(self, monkeypatch): + _set_required_env(monkeypatch) + settings = Settings() + assert settings.kong.gateway_secret.get_secret_value() == "kong-secret" + assert settings.redis.url.get_secret_value() == "redis://localhost:6379/0" + + def test_nested_field_override(self, monkeypatch): + _set_required_env(monkeypatch) + monkeypatch.setenv("MPCONTRIBS_MONGO__MAX_POOL_SIZE", "10") + settings = Settings() + assert settings.mongo.max_pool_size == 10 + # Clamp validator runs on env-loaded values too. + assert settings.mongo.max_concurrent_transactions == 5 + + def test_invalid_environment_raises(self, monkeypatch): + _set_required_env(monkeypatch) + monkeypatch.setenv("MPCONTRIBS_ENVIRONMENT", "staging") + with pytest.raises(PydanticValidationError): + Settings() + + def test_missing_required_env_raises(self, monkeypatch): + for key in REQUIRED_ENV: + monkeypatch.delenv(key, raising=False) + with pytest.raises(PydanticValidationError): + Settings() + + +# --------------------------------------------------------------------------- +# get_settings caching +# --------------------------------------------------------------------------- + + +class TestGetSettingsCaching: + @pytest.fixture(autouse=True) + def _clear_cache(self): + get_settings.cache_clear() + yield + get_settings.cache_clear() + + def test_returns_settings_instance(self, monkeypatch): + _set_required_env(monkeypatch) + assert isinstance(get_settings(), Settings) + + def test_same_instance_returned(self, monkeypatch): + _set_required_env(monkeypatch) + assert get_settings() is get_settings() + + def test_env_changes_ignored_until_cache_cleared(self, monkeypatch): + _set_required_env(monkeypatch) + first = get_settings() + monkeypatch.setenv("MPCONTRIBS_VERSION", "9.9.9") + assert get_settings().version == first.version + get_settings.cache_clear() + assert get_settings().version == "9.9.9" diff --git a/mpcontribs-api/tests/unit/test_exceptions.py b/mpcontribs-api/tests/unit/test_exceptions.py index a01d033051..894dfec0c1 100644 --- a/mpcontribs-api/tests/unit/test_exceptions.py +++ b/mpcontribs-api/tests/unit/test_exceptions.py @@ -8,6 +8,7 @@ PermissionError, ValidationError, _error_body, + _sanitize_validation_errors, ) @@ -140,3 +141,34 @@ def test_context_available_after_raise(self): with pytest.raises(ValidationError) as exc_info: raise ValidationError("bad field", field="email", value="oops") assert exc_info.value.context == {"field": "email", "value": "oops"} + + +# --------------------------------------------------------------------------- +# _sanitize_validation_errors +# --------------------------------------------------------------------------- + + +class TestSanitizeValidationErrors: + def test_drops_input_and_url_keys(self): + errors = [ + {"type": "missing", "loc": ("body", "name"), "msg": "Field required", "input": {"secret": 1}, "url": "https://errors.pydantic.dev/x"} + ] + sanitized = _sanitize_validation_errors(errors) + assert sanitized == [{"type": "missing", "loc": ("body", "name"), "msg": "Field required"}] + + def test_echoed_input_never_survives(self): + errors = [{"msg": "bad", "input": "user-supplied-payload"}] + assert "input" not in _sanitize_validation_errors(errors)[0] + + def test_multiple_errors_all_sanitized(self): + errors = [ + {"msg": "a", "input": 1, "url": "u"}, + {"msg": "b", "input": 2}, + {"msg": "c"}, + ] + sanitized = _sanitize_validation_errors(errors) + assert all("input" not in e and "url" not in e for e in sanitized) + assert [e["msg"] for e in sanitized] == ["a", "b", "c"] + + def test_empty_sequence(self): + assert _sanitize_validation_errors([]) == [] diff --git a/mpcontribs-api/tests/unit/test_types_components.py b/mpcontribs-api/tests/unit/test_types_components.py new file mode 100644 index 0000000000..a0730f6b67 --- /dev/null +++ b/mpcontribs-api/tests/unit/test_types_components.py @@ -0,0 +1,213 @@ +"""Unit tests for component-related shared types in domains/_shared/types.py. + +Covers FileLike, MD5Hash, MimeFormat, DownloadFormat, and the PolarsFrame +annotated type (coercion + serialization). ShortStr and PrefixedEmail are +covered in test_types.py. +""" + +import polars as pl +import pytest +from pydantic import BaseModel, ConfigDict + +from mpcontribs_api.domains._shared.types import ( + DownloadFormat, + FileLike, + MD5Hash, + MimeFormat, + PolarsFrame, + _coerce_frame, + _serialize_frame, +) +from mpcontribs_api.exceptions import ValidationError as AppValidationError + + +class FileLikeModel(BaseModel): + name: FileLike + + +class MD5Model(BaseModel): + digest: MD5Hash + + +class MimeModel(BaseModel): + mime: MimeFormat + + +class FrameModel(BaseModel): + model_config = ConfigDict(arbitrary_types_allowed=True) + data: PolarsFrame + + +# --------------------------------------------------------------------------- +# FileLike / _file_name_like_str +# --------------------------------------------------------------------------- + + +class TestFileLike: + def test_simple_extension(self): + assert FileLikeModel(name="archive.gz").name == "archive.gz" + + def test_multiple_dots_valid(self): + assert FileLikeModel(name="data.tar.gz").name == "data.tar.gz" + + def test_strips_surrounding_whitespace(self): + assert FileLikeModel(name=" notes.txt ").name == "notes.txt" + + def test_no_extension_raises(self): + with pytest.raises(AppValidationError): + FileLikeModel(name="noextension") + + def test_trailing_dot_raises(self): + with pytest.raises(AppValidationError): + FileLikeModel(name="name.") + + def test_empty_string_raises(self): + with pytest.raises(AppValidationError): + FileLikeModel(name="") + + def test_leading_dot_file_is_accepted(self): + # Documents current behavior: dotfiles split into ["", "ext"], which + # has a non-empty last part and therefore passes. + assert FileLikeModel(name=".gitignore").name == ".gitignore" + + +# --------------------------------------------------------------------------- +# MD5Hash / _md5_like +# --------------------------------------------------------------------------- + + +class TestMD5Hash: + def test_valid_lowercase_hex(self): + assert MD5Model(digest="a" * 32).digest == "a" * 32 + + def test_uppercase_normalized_to_lowercase(self): + assert MD5Model(digest="ABCDEF" + "0" * 26).digest == "abcdef" + "0" * 26 + + def test_strips_whitespace(self): + assert MD5Model(digest=f" {'b' * 32} ").digest == "b" * 32 + + def test_too_short_raises(self): + with pytest.raises(AppValidationError): + MD5Model(digest="a" * 31) + + def test_too_long_raises(self): + with pytest.raises(AppValidationError): + MD5Model(digest="a" * 33) + + def test_non_hex_characters_raise(self): + with pytest.raises(AppValidationError): + MD5Model(digest="g" * 32) + + def test_empty_raises(self): + with pytest.raises(AppValidationError): + MD5Model(digest="") + + +# --------------------------------------------------------------------------- +# MimeFormat / _mime_like +# --------------------------------------------------------------------------- + + +class TestMimeFormat: + def test_valid_application_mime(self): + assert MimeModel(mime="application/gzip").mime == "application/gzip" + + def test_uppercase_normalized(self): + assert MimeModel(mime="APPLICATION/JSON").mime == "application/json" + + def test_strips_whitespace(self): + assert MimeModel(mime=" application/zip ").mime == "application/zip" + + def test_non_application_prefix_raises(self): + with pytest.raises(AppValidationError): + MimeModel(mime="text/plain") + + def test_empty_subtype_raises(self): + with pytest.raises(AppValidationError): + MimeModel(mime="application/") + + def test_missing_slash_raises(self): + with pytest.raises(AppValidationError): + MimeModel(mime="applicationgzip") + + def test_extra_slash_raises(self): + with pytest.raises(AppValidationError): + MimeModel(mime="application/x/y") + + +# --------------------------------------------------------------------------- +# DownloadFormat +# --------------------------------------------------------------------------- + + +class TestDownloadFormat: + def test_members(self): + assert {f.value for f in DownloadFormat} == {"jsonl", "csv"} + + def test_constructible_from_value(self): + assert DownloadFormat("jsonl") is DownloadFormat.JSONL + assert DownloadFormat("csv") is DownloadFormat.CSV + + def test_str_enum_compares_to_plain_str(self): + assert DownloadFormat.CSV == "csv" + + def test_invalid_value_raises(self): + with pytest.raises(ValueError): + DownloadFormat("parquet") + + +# --------------------------------------------------------------------------- +# PolarsFrame: _coerce_frame / _serialize_frame +# --------------------------------------------------------------------------- + + +class TestCoerceFrame: + def test_dataframe_passthrough_is_same_object(self): + df = pl.DataFrame({"a": [1, 2]}) + assert _coerce_frame(df) is df + + def test_dict_coerced_to_dataframe(self): + result = _coerce_frame({"a": [1, 2], "b": [3.0, 4.0]}) + assert isinstance(result, pl.DataFrame) + assert result.columns == ["a", "b"] + assert result.height == 2 + + def test_unsupported_type_raises_value_error(self): + with pytest.raises(ValueError, match="cannot coerce"): + _coerce_frame([[1, 2], [3, 4]]) + + def test_none_raises_value_error(self): + with pytest.raises(ValueError, match="cannot coerce"): + _coerce_frame(None) + + +class TestSerializeFrame: + def test_round_trips_to_column_dict(self): + df = pl.DataFrame({"x": [1, 2], "y": [10, 20]}) + assert _serialize_frame(df) == {"x": [1, 2], "y": [10, 20]} + + def test_empty_frame(self): + assert _serialize_frame(pl.DataFrame({"x": []})) == {"x": []} + + +class TestPolarsFrameAnnotated: + def test_model_accepts_dict(self): + m = FrameModel(data={"a": [1, 2]}) + assert isinstance(m.data, pl.DataFrame) + assert m.data["a"].to_list() == [1, 2] + + def test_model_accepts_dataframe(self): + df = pl.DataFrame({"a": [1]}) + assert FrameModel(data=df).data is df + + def test_model_dump_serializes_to_dict(self): + m = FrameModel(data={"a": [1, 2]}) + assert m.model_dump() == {"data": {"a": [1, 2]}} + + def test_model_dump_json_round_trip(self): + m = FrameModel(data={"a": [1, 2]}) + assert m.model_dump_json() == '{"data":{"a":[1,2]}}' + + def test_invalid_payload_fails_validation(self): + with pytest.raises(Exception): + FrameModel(data=42) From 0413425fbdcf13e7fa32c724bd11200d24e0421b Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Fri, 12 Jun 2026 14:52:52 -0700 Subject: [PATCH 117/591] Fixed domain routers not prefixing '/' --- .../domains/attachments/models.py | 4 ++ .../domains/attachments/router.py | 56 +++++++++---------- .../domains/contributions/router.py | 10 ++-- .../domains/structures/router.py | 8 +-- .../mpcontribs_api/domains/tables/router.py | 8 +-- 5 files changed, 45 insertions(+), 41 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py b/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py index 7e65dd1ee6..dd03082b22 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py @@ -39,6 +39,10 @@ class AttachmentOut(DocumentOut[PydanticObjectId]): md5: MD5Hash | None = None mime: MimeFormat | None = None + @staticmethod + def default_fields() -> list[str]: + return ["id", "name", "md5", "mime"] + class AttachmentPatch(SparseFieldsModel): name: FileLike | None = None diff --git a/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py b/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py index 50bba3df61..53ab425aee 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py @@ -6,46 +6,46 @@ from mpcontribs_api.domains._shared.models import DeleteResponse from mpcontribs_api.domains._shared.types import DownloadFormat, FieldSelector -from mpcontribs_api.domains.structures.dependencies import StructureDep -from mpcontribs_api.domains.structures.models import StructureFilter, StructureOut +from mpcontribs_api.domains.attachments.dependencies import AttachmentDep +from mpcontribs_api.domains.attachments.models import AttachmentFilter, AttachmentOut from mpcontribs_api.pagination import CursorParams, Page router = APIRouter() -@router.get("", response_model=Page[StructureOut]) -async def get_structures( - repo: StructureDep, +@router.get("", response_model=Page[AttachmentOut]) +async def get_attachments( + repo: AttachmentDep, pagination: Annotated[CursorParams, Depends()], - filter: StructureFilter = FilterDepends(StructureFilter), - fields: FieldSelector = StructureOut.default_fields(), + filter: AttachmentFilter = FilterDepends(AttachmentFilter), + fields: FieldSelector = AttachmentOut.default_fields(), ): - selected = StructureOut.parse_fields(fields) - return await repo.get_structures(filter=filter, fields=selected, pagination=pagination) + selected = AttachmentOut.parse_fields(fields) + return await repo.get_attachments(filter=filter, fields=selected, pagination=pagination) -@router.get("{pk}", response_model=StructureOut) -async def get_structure( - repo: StructureDep, +@router.get("/{pk}", response_model=AttachmentOut) +async def get_attachment( + repo: AttachmentDep, pk: str, - fields: FieldSelector = StructureOut.default_fields(), + fields: FieldSelector = AttachmentOut.default_fields(), ): - selected = StructureOut.parse_fields(fields) - return await repo.get_structure_by_id(id=pk, fields=selected) + selected = AttachmentOut.parse_fields(fields) + return await repo.get_attachment_by_id(id=pk, fields=selected) -@router.get("download/{short_mime}") -async def download_structure( - repo: StructureDep, +@router.get("/download/{short_mime}") +async def download_attachment( + repo: AttachmentDep, response: Response, format: DownloadFormat, short_mime: Literal["gz", None] = "gz", ignore_cache: bool = False, - filter: StructureFilter = FilterDepends(StructureFilter), - fields: FieldSelector = StructureOut.default_fields(), + filter: AttachmentFilter = FilterDepends(AttachmentFilter), + fields: FieldSelector = AttachmentOut.default_fields(), ) -> StreamingResponse: - selected = StructureOut.parse_fields(fields) - body = await repo.download_structures( + selected = AttachmentOut.parse_fields(fields) + body = await repo.download_attachments( format=format, short_mime=short_mime, ignore_cache=ignore_cache, @@ -55,15 +55,15 @@ async def download_structure( return StreamingResponse( body, media_type="application/gzip", - headers={"Content-Disposition": 'attachment; filename="structures.jsonl.gz"'}, + headers={"Content-Disposition": 'attachment; filename="attachments.jsonl.gz"'}, ) @router.delete("", response_model=DeleteResponse) -async def delete_structures(repo: StructureDep, filter: StructureFilter = FilterDepends(StructureFilter)): - return await repo.delete_structures(filter=filter) +async def delete_attachments(repo: AttachmentDep, filter: AttachmentFilter = FilterDepends(AttachmentFilter)): + return await repo.delete_attachments(filter=filter) -@router.delete("{id}", response_model=DeleteResponse) -async def delete_structure_by_id(repo: StructureDep, id: str): - return await repo.delete_structure_by_id(id=id) +@router.delete("/{id}", response_model=DeleteResponse) +async def delete_attachment_by_id(repo: AttachmentDep, id: str): + return await repo.delete_attachment_by_id(id=id) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py index 3d52abe2df..0fff612ddc 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py @@ -54,7 +54,7 @@ async def upsert_contributions( return await service.upsert_contributions(contributions=contributions) -@router.get("download/{mime}") +@router.get("/download/{mime}") async def download_contributions( repo: ContributionDep, format: Literal["json", "csv", "parquet"] = "parquet", @@ -65,7 +65,7 @@ async def download_contributions( return await repo.download_contributions(format=format, filter=filter, fields=selected) -@router.delete("{id}") +@router.delete("/{id}") async def delete_contribtion_by_id( service: ContributionServiceDep, id: str, @@ -73,7 +73,7 @@ async def delete_contribtion_by_id( return await service.delete_contributions(ContributionFilter.model_validate({"id": id})) -@router.get("{id}") +@router.get("/{id}") async def get_contribution_by_id( repo: ContributionDep, id: str, @@ -83,11 +83,11 @@ async def get_contribution_by_id( return await repo.get_contribution_by_id(id=id, fields=selected) -@router.put("{id}") +@router.put("/{id}") async def upsert_contribution_by_id(repo: ContributionDep, id: str, contribution: ContributionIn): return await repo.upsert_contribution_by_id(id=id, contribution=contribution) -@router.patch("{id}") +@router.patch("/{id}") async def patch_contribution_by_id(repo: ContributionDep, id: str, update: ContributionPatch): return await repo.patch_contribution_by_id(id=id, update=update) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py index a76113cb16..4f1286c980 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py @@ -25,7 +25,7 @@ async def get_structures( return await repo.get_structures(filter=filter, fields=selected, pagination=pagination) -@router.get("{pk}", response_model=StructureOut) +@router.get("/{pk}", response_model=StructureOut) async def get_structure( repo: StructureDep, pk: str, @@ -35,7 +35,7 @@ async def get_structure( return await repo.get_structure_by_id(id=pk, fields=selected) -@router.get("download/{short_mime}") +@router.get("/download/{short_mime}") async def download_structure( repo: StructureDep, response: Response, @@ -73,12 +73,12 @@ async def delete_structures(repo: StructureDep, filter: StructureFilter = Filter return await repo.delete_structures(filter=filter) -@router.delete("{id}", response_model=DeleteResponse) +@router.delete("/{id}", response_model=DeleteResponse) async def delete_structure_by_id(repo: StructureDep, id: str): return await repo.delete_structure_by_id(id=id) -@router.patch("{id}") +@router.patch("/{id}") async def patch_structure_by_id( repo: StructureDep, id: str, diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py index 3c5dbf80be..265961da88 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py @@ -25,7 +25,7 @@ async def get_tables( return await repo.get_tables(filter=filter, fields=selected, pagination=pagination) -@router.get("{pk}", response_model=TableOut) +@router.get("/{pk}", response_model=TableOut) async def get_table( repo: TableDep, pk: str, @@ -35,7 +35,7 @@ async def get_table( return await repo.get_table_by_id(id=pk, fields=selected) -@router.get("download/{short_mime}") +@router.get("/download/{short_mime}") async def download_table( repo: TableDep, format: DownloadFormat, @@ -72,12 +72,12 @@ async def delete_tables(repo: TableDep, filter: TableFilter = FilterDepends(Tabl return await repo.delete_tables(filter=filter) -@router.delete("{id}", response_model=DeleteResponse) +@router.delete("/{id}", response_model=DeleteResponse) async def delete_table_by_id(repo: TableDep, id: str): return await repo.delete_table_by_id(id=id) -@router.patch("{id}") +@router.patch("/{id}") async def patch_table_by_id( repo: TableDep, id: str, From d89e40cfd1c35c8c6d6668866a870d90487d7a67 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Fri, 12 Jun 2026 14:53:16 -0700 Subject: [PATCH 118/591] Added more thorough integration test coverage --- mpcontribs-api/tests/integration/conftest.py | 24 ++ .../integration/test_component_routes.py | 212 ++++++++++++++++++ .../integration/test_contributions_routes.py | 208 +++++++++++++++++ .../tests/integration/test_healthcheck.py | 86 +++++++ .../unit/domains/test_contribution_service.py | 207 +++++++++++++++++ 5 files changed, 737 insertions(+) create mode 100644 mpcontribs-api/tests/integration/test_component_routes.py create mode 100644 mpcontribs-api/tests/integration/test_contributions_routes.py create mode 100644 mpcontribs-api/tests/integration/test_healthcheck.py diff --git a/mpcontribs-api/tests/integration/conftest.py b/mpcontribs-api/tests/integration/conftest.py index a906f94a27..eef129b066 100644 --- a/mpcontribs-api/tests/integration/conftest.py +++ b/mpcontribs-api/tests/integration/conftest.py @@ -133,3 +133,27 @@ def mock_project_repo() -> AsyncMock: def mock_contribution_repo() -> AsyncMock: """Fully async mock of MongoDbContributionRepository.""" return AsyncMock() + + +@pytest.fixture +def mock_structure_repo() -> AsyncMock: + """Fully async mock of MongoDbStructureRepository.""" + return AsyncMock() + + +@pytest.fixture +def mock_table_repo() -> AsyncMock: + """Fully async mock of MongoDbTableRepository.""" + return AsyncMock() + + +@pytest.fixture +def mock_attachment_repo() -> AsyncMock: + """Fully async mock of MongoDbAttachmentRepository.""" + return AsyncMock() + + +@pytest.fixture +def mock_contribution_service() -> AsyncMock: + """Fully async mock of ContributionService.""" + return AsyncMock() diff --git a/mpcontribs-api/tests/integration/test_component_routes.py b/mpcontribs-api/tests/integration/test_component_routes.py new file mode 100644 index 0000000000..4c62cf47a6 --- /dev/null +++ b/mpcontribs-api/tests/integration/test_component_routes.py @@ -0,0 +1,212 @@ +"""Integration tests for component routers: /structures, /tables, /attachments. + +All use AsyncMock repositories via dependency_overrides, so no DB is required — +the same pattern as test_projects.py / test_contributions.py. + +THREE BUG CLASSES ARE PINNED TO INTENDED BEHAVIOR (these tests are RED): +""" + +import pytest +from beanie import PydanticObjectId + +from mpcontribs_api.domains._shared.models import DeleteResponse +from mpcontribs_api.domains.attachments.dependencies import get_scoped_attachments +from mpcontribs_api.domains.structures.dependencies import get_scoped_tables as get_scoped_structures +from mpcontribs_api.domains.structures.models import StructureOut +from mpcontribs_api.domains.tables.dependencies import get_scoped_tables +from mpcontribs_api.domains.tables.models import TableOut +from mpcontribs_api.pagination import Page + +# --------------------------------------------------------------------------- +# Fixtures: inject mock repos per domain +# --------------------------------------------------------------------------- + + +@pytest.fixture +def structure_repo(test_app, mock_structure_repo): + test_app.dependency_overrides[get_scoped_structures] = lambda: mock_structure_repo + yield mock_structure_repo + test_app.dependency_overrides.pop(get_scoped_structures, None) + + +@pytest.fixture +def table_repo(test_app, mock_table_repo): + test_app.dependency_overrides[get_scoped_tables] = lambda: mock_table_repo + yield mock_table_repo + test_app.dependency_overrides.pop(get_scoped_tables, None) + + +@pytest.fixture +def attachment_repo(test_app, mock_attachment_repo): + test_app.dependency_overrides[get_scoped_attachments] = lambda: mock_attachment_repo + yield mock_attachment_repo + test_app.dependency_overrides.pop(get_scoped_attachments, None) + + +SAMPLE_STRUCTURE = StructureOut(name="Fe2O3.cif", md5="a" * 32) +SAMPLE_TABLE = TableOut(name="bandgaps", md5="b" * 32) + + +# =========================================================================== +# STRUCTURES +# =========================================================================== + + +class TestStructuresList: + def test_empty_page_returns_200(self, client, structure_repo): + structure_repo.get_structures.return_value = Page(items=[], next_cursor=None) + assert client.get("/api/v1/structures").status_code == 200 + + def test_page_shape(self, client, structure_repo): + structure_repo.get_structures.return_value = Page(items=[SAMPLE_STRUCTURE], next_cursor="c") + body = client.get("/api/v1/structures").json() + assert "items" in body + assert body["next_cursor"] == "c" + + def test_repo_called_with_pagination(self, client, structure_repo): + structure_repo.get_structures.return_value = Page(items=[], next_cursor=None) + client.get("/api/v1/structures?limit=5") + kwargs = structure_repo.get_structures.call_args.kwargs + assert kwargs["pagination"].limit == 5 + + def test_invalid_fields_returns_422(self, client, structure_repo): + structure_repo.get_structures.return_value = Page(items=[], next_cursor=None) + assert client.get("/api/v1/structures?_fields=not_a_field").status_code == 422 + + def test_valid_fields_forwarded(self, client, structure_repo): + structure_repo.get_structures.return_value = Page(items=[], next_cursor=None) + client.get("/api/v1/structures?_fields=name") + # parse_fields always includes the id identity field. + assert structure_repo.get_structures.call_args.kwargs["fields"] == frozenset({"id", "name"}) + + +class TestStructuresDelete: + def test_batch_delete_returns_200(self, client, structure_repo): + structure_repo.delete_structures.return_value = DeleteResponse(num_deleted=3) + r = client.delete("/api/v1/structures") + assert r.status_code == 200 + assert r.json() == {"num_deleted": 3} + + def test_repo_delete_called(self, client, structure_repo): + structure_repo.delete_structures.return_value = DeleteResponse(num_deleted=0) + client.delete("/api/v1/structures") + structure_repo.delete_structures.assert_awaited_once() + + +class TestStructuresInsert: + def test_post_route_exists(self, client, structure_repo): + # Empty body -> handler invoked; repo returns a summary-shaped object. + structure_repo.insert_structures.return_value = {"total": 0, "succeeded": [], "failed": []} + r = client.post("/api/v1/structures", json=[]) + assert r.status_code != 404 + + def test_post_forwards_to_repo(self, client, structure_repo): + structure_repo.insert_structures.return_value = {"total": 0, "succeeded": [], "failed": []} + client.post("/api/v1/structures", json=[]) + structure_repo.insert_structures.assert_awaited_once() + + +class TestStructuresByIdRouting: + def test_get_by_id_conventional_path(self, client, structure_repo): + structure_repo.get_structure_by_id.return_value = SAMPLE_STRUCTURE + assert client.get(f"/api/v1/structures/{PydanticObjectId()}").status_code == 200 + + def test_delete_by_id_conventional_path(self, client, structure_repo): + structure_repo.delete_structure_by_id.return_value = DeleteResponse(num_deleted=1) + assert client.delete(f"/api/v1/structures/{PydanticObjectId()}").status_code == 200 + + def test_patch_by_id_conventional_path(self, client, structure_repo): + structure_repo.patch_structure_by_id.return_value = SAMPLE_STRUCTURE + r = client.patch(f"/api/v1/structures/{PydanticObjectId()}", json={"name": "renamed"}) + assert r.status_code == 200 + + def test_download_conventional_path(self, client, structure_repo): + structure_repo.download_structures.return_value = iter([b"x"]) + assert client.get("/api/v1/structures/download/gz?format=csv").status_code == 200 + + +# =========================================================================== +# TABLES +# =========================================================================== + + +class TestTablesList: + def test_empty_page_returns_200(self, client, table_repo): + table_repo.get_tables.return_value = Page(items=[], next_cursor=None) + assert client.get("/api/v1/tables").status_code == 200 + + def test_page_shape(self, client, table_repo): + table_repo.get_tables.return_value = Page(items=[SAMPLE_TABLE], next_cursor=None) + assert "items" in client.get("/api/v1/tables").json() + + def test_invalid_fields_returns_422(self, client, table_repo): + table_repo.get_tables.return_value = Page(items=[], next_cursor=None) + assert client.get("/api/v1/tables?_fields=nope").status_code == 422 + + def test_default_fields_accepted(self, client, table_repo): + table_repo.get_tables.return_value = Page(items=[], next_cursor=None) + assert client.get("/api/v1/tables").status_code == 200 + + +class TestTablesDelete: + def test_batch_delete_returns_200(self, client, table_repo): + table_repo.delete_tables.return_value = DeleteResponse(num_deleted=2) + assert client.delete("/api/v1/tables").json() == {"num_deleted": 2} + + +class TestTablesInsert: + def test_post_forwards_to_repo(self, client, table_repo): + table_repo.insert_tables.return_value = {"total": 0, "succeeded": [], "failed": []} + client.post("/api/v1/tables", json=[]) + table_repo.insert_tables.assert_awaited_once() + + +class TestTablesByIdRouting: + """RED: same glued-path bug as structures.""" + + def test_get_by_id_conventional_path(self, client, table_repo): + table_repo.get_table_by_id.return_value = SAMPLE_TABLE + assert client.get(f"/api/v1/tables/{PydanticObjectId()}").status_code == 200 + + def test_delete_by_id_conventional_path(self, client, table_repo): + table_repo.delete_table_by_id.return_value = DeleteResponse(num_deleted=1) + assert client.delete(f"/api/v1/tables/{PydanticObjectId()}").status_code == 200 + + def test_patch_by_id_conventional_path(self, client, table_repo): + table_repo.patch_table_by_id.return_value = SAMPLE_TABLE + r = client.patch(f"/api/v1/tables/{PydanticObjectId()}", json={"name": "x"}) + assert r.status_code == 200 + + +# =========================================================================== +# ATTACHMENTS (RED: router is a copy of structures, wrong repo + methods) +# =========================================================================== + + +class TestAttachmentsRouterWiring: + """RED: attachments/router.py wires StructureDep and calls structure repo + methods. With the attachment repo overridden, the structure-named methods + don't exist on it, so these assertions can't pass until the router is + rewritten against the attachment domain. + """ + + def test_list_calls_attachment_repo(self, client, attachment_repo): + attachment_repo.get_attachments.return_value = Page(items=[], next_cursor=None) + r = client.get("/api/v1/attachments") + assert r.status_code == 200 + attachment_repo.get_attachments.assert_awaited_once() + + def test_get_by_id_calls_attachment_repo(self, client, attachment_repo): + attachment_repo.get_attachment_by_id.return_value = None + client.get(f"/api/v1/attachments/{PydanticObjectId()}") + attachment_repo.get_attachment_by_id.assert_awaited_once() + + def test_delete_by_id_calls_attachment_repo(self, client, attachment_repo): + attachment_repo.delete_attachment_by_id.return_value = DeleteResponse(num_deleted=1) + client.delete(f"/api/v1/attachments/{PydanticObjectId()}") + attachment_repo.delete_attachment_by_id.assert_awaited_once() + + def test_batch_delete_calls_attachment_repo(self, client, attachment_repo): + attachment_repo.delete_attachments.return_value = DeleteResponse(num_deleted=0) + client.delete("/api/v1/attachments") + attachment_repo.delete_attachments.assert_awaited_once() diff --git a/mpcontribs-api/tests/integration/test_contributions_routes.py b/mpcontribs-api/tests/integration/test_contributions_routes.py new file mode 100644 index 0000000000..af1e32cdde --- /dev/null +++ b/mpcontribs-api/tests/integration/test_contributions_routes.py @@ -0,0 +1,208 @@ +"""Integration tests for previously-untested /contributions routes. + +test_contributions.py covers GET list and DELETE batch plus stub-existence of +POST/PUT. This file covers the behavior of POST, PUT, the single-resource +routes, and download — all via AsyncMock repo/service overrides. + +RED behavior pinned here: + +1. Glued path params (same class as the component routers). Single-resource + contribution routes mount as ``/contributions{id}`` not + ``/contributions/{id}``; the ``...ByIdRouting`` tests assert the + conventional ``/{id}`` form. + +2. Download route shape. The route is declared ``download/{mime}`` but the + handler reads ``format`` from the query and never uses the ``mime`` path + param, while structures/tables use ``download/{short_mime}`` with a + ``DownloadFormat`` enum. test_download_route_conventional_path asserts the + conventional ``/download/...`` path resolves. +""" + +import pytest +from beanie import PydanticObjectId + +from mpcontribs_api.domains._shared.bulk import BulkDeleteSummary, BulkWriteSummary +from mpcontribs_api.domains.contributions.dependencies import ( + get_contribution_service, + get_scoped_contributions, +) +from mpcontribs_api.domains.contributions.models import ContributionOut + +# --------------------------------------------------------------------------- +# Fixtures +# --------------------------------------------------------------------------- + + +@pytest.fixture +def contribution_repo(test_app, mock_contribution_repo): + test_app.dependency_overrides[get_scoped_contributions] = lambda: mock_contribution_repo + yield mock_contribution_repo + test_app.dependency_overrides.pop(get_scoped_contributions, None) + + +@pytest.fixture +def contribution_service(test_app, mock_contribution_service): + test_app.dependency_overrides[get_contribution_service] = lambda: mock_contribution_service + yield mock_contribution_service + test_app.dependency_overrides.pop(get_contribution_service, None) + + +def _valid_contribution_body(**overrides) -> dict: + # ContributionIn inherits a required _id from BaseDocumentWithInput, so a + # client-supplied object id is part of the create contract (mirrors the + # service unit tests, which always pass _id). + body = { + "_id": str(PydanticObjectId()), + "project": "test-project", + "identifier": "mp-1234", + "formula": "Fe2O3", + "data": {"band_gap": 2.1}, + } + body.update(overrides) + return body + + +SAMPLE_OUT = ContributionOut(project="p", identifier="mp-1", formula="Fe2O3") + + +# =========================================================================== +# POST /contributions (bulk insert via service) +# =========================================================================== + + +class TestInsertContributions: + def test_empty_list_returns_200(self, client, contribution_service): + contribution_service.insert_contributions.return_value = BulkWriteSummary( + total=0, succeeded=[], failed=[] + ) + r = client.post("/api/v1/contributions", json=[]) + assert r.status_code == 200 + + def test_response_has_summary_shape(self, client, contribution_service): + contribution_service.insert_contributions.return_value = BulkWriteSummary( + total=0, succeeded=[], failed=[] + ) + body = client.post("/api/v1/contributions", json=[]).json() + assert set(body) == {"total", "succeeded", "failed"} + + def test_service_receives_parsed_contributions(self, client, contribution_service): + contribution_service.insert_contributions.return_value = BulkWriteSummary( + total=1, succeeded=[], failed=[] + ) + client.post("/api/v1/contributions", json=[_valid_contribution_body()]) + contributions = contribution_service.insert_contributions.call_args.kwargs["contributions"] + assert len(contributions) == 1 + assert contributions[0].project == "test-project" + + def test_malformed_body_returns_422(self, client, contribution_service): + # Missing required 'formula'. + r = client.post( + "/api/v1/contributions", + json=[{"_id": str(PydanticObjectId()), "project": "p", "identifier": "mp-1"}], + ) + assert r.status_code == 422 + contribution_service.insert_contributions.assert_not_called() + + def test_non_list_body_returns_422(self, client, contribution_service): + r = client.post("/api/v1/contributions", json=_valid_contribution_body()) + assert r.status_code == 422 + + +# =========================================================================== +# PUT /contributions (bulk upsert via service) +# =========================================================================== + + +class TestUpsertContributions: + def test_empty_list_returns_200(self, client, contribution_service): + contribution_service.upsert_contributions.return_value = [] + assert client.put("/api/v1/contributions", json=[]).status_code == 200 + + def test_service_receives_parsed_contributions(self, client, contribution_service): + contribution_service.upsert_contributions.return_value = [] + client.put("/api/v1/contributions", json=[_valid_contribution_body()]) + contributions = contribution_service.upsert_contributions.call_args.kwargs["contributions"] + assert contributions[0].identifier == "mp-1234" + + def test_malformed_body_returns_422(self, client, contribution_service): + r = client.put( + "/api/v1/contributions", + json=[{"_id": str(PydanticObjectId()), "project": "p"}], + ) + assert r.status_code == 422 + contribution_service.upsert_contributions.assert_not_called() + + +# =========================================================================== +# Single-resource routes (RED: glued path params) +# =========================================================================== + + +class TestContributionByIdRouting: + """RED: routes mount as /contributions{id} not /contributions/{id}.""" + + def test_get_by_id_conventional_path(self, client, contribution_repo): + contribution_repo.get_contribution_by_id.return_value = SAMPLE_OUT + assert client.get(f"/api/v1/contributions/{PydanticObjectId()}").status_code == 200 + + def test_patch_by_id_conventional_path(self, client, contribution_repo): + contribution_repo.patch_contribution_by_id.return_value = SAMPLE_OUT + r = client.patch(f"/api/v1/contributions/{PydanticObjectId()}", json={"formula": "H2O"}) + assert r.status_code == 200 + + def test_put_by_id_conventional_path(self, client, contribution_repo): + contribution_repo.upsert_contribution_by_id.return_value = SAMPLE_OUT + r = client.put(f"/api/v1/contributions/{PydanticObjectId()}", json=_valid_contribution_body()) + assert r.status_code == 200 + + def test_delete_by_id_conventional_path(self, client, contribution_service): + contribution_service.delete_contributions.return_value = BulkDeleteSummary( + num_deleted=1, num_children_deleted=0 + ) + assert client.delete(f"/api/v1/contributions/{PydanticObjectId()}").status_code == 200 + + def test_download_route_conventional_path(self, client, contribution_repo): + # NOTE: this stays red even after the leading-slash fix. The route is + # declared download/{mime} and the handler ignores the mime path param + # while reading `format` from the query — diverging from structures/ + # tables, which use download/{short_mime} + a DownloadFormat enum and + # work. Reconciling the contributions download route with the other + # domains is a separate fix from the glued-path one. + contribution_repo.download_contributions.return_value = iter([b"x"]) + assert client.get("/api/v1/contributions/download/parquet").status_code == 200 + + +# =========================================================================== +# Single-resource behavior (independent of the routing bug, via current paths) +# =========================================================================== + + +class TestDeleteContributionByIdWiring: + """delete_contribtion_by_id builds a ContributionFilter from the id and + delegates to the service. These use the CURRENT (glued) path so the handler + is reached today, isolating the wiring assertion from the routing bug. + + PAIRING NOTE: when the glued-path bug is fixed (leading slash added), these + two tests must be updated to the conventional ``/contributions/{id}`` path — + at that point the TestContributionByIdRouting.test_delete_by_id_conventional_path + test goes green and supersedes them. They are expected to PASS today. + """ + + def test_delete_delegates_to_service(self, client, contribution_service): + contribution_service.delete_contributions.return_value = BulkDeleteSummary( + num_deleted=1, num_children_deleted=2 + ) + oid = PydanticObjectId() + # NOTE: glued path is intentional here — see module docstring. + r = client.delete(f"/api/v1/contributions/{oid}") + assert r.status_code == 200 + contribution_service.delete_contributions.assert_awaited_once() + + def test_delete_builds_filter_from_path_id(self, client, contribution_service): + contribution_service.delete_contributions.return_value = BulkDeleteSummary( + num_deleted=1, num_children_deleted=0 + ) + oid = PydanticObjectId() + client.delete(f"/api/v1/contributions/{oid}") + passed_filter = contribution_service.delete_contributions.call_args.args[0] + assert passed_filter.id == oid diff --git a/mpcontribs-api/tests/integration/test_healthcheck.py b/mpcontribs-api/tests/integration/test_healthcheck.py new file mode 100644 index 0000000000..7dfc8bb0f9 --- /dev/null +++ b/mpcontribs-api/tests/integration/test_healthcheck.py @@ -0,0 +1,86 @@ +"""Integration tests for the /health router. + +The healthcheck router is mounted by create_app() at /health, but the shared +make_test_app() fixture only mounts the v1 router. So this module builds its +own minimal app that mounts the healthcheck router and overrides the DbDep +dependency with a mock whose admin.command("ping") can be made to succeed or +fail. +""" + +from unittest.mock import AsyncMock, MagicMock + +import pytest +from fastapi import FastAPI +from fastapi.testclient import TestClient + +from mpcontribs_api.dependencies import get_db +from mpcontribs_api.domains.healthcheck.router import router as healthcheck_router +from mpcontribs_api.exceptions import register_exception_handlers + + +def _make_db(ping_ok: bool) -> MagicMock: + """Build a mock AsyncDatabase whose client.admin.command is awaitable.""" + db = MagicMock(name="db") + if ping_ok: + db.client.admin.command = AsyncMock(return_value={"ok": 1}) + else: + db.client.admin.command = AsyncMock(side_effect=ConnectionError("mongo down")) + return db + + +@pytest.fixture +def health_app() -> FastAPI: + app = FastAPI() + register_exception_handlers(app) + app.include_router(healthcheck_router, prefix="/health") + return app + + +def _client(app: FastAPI, db: MagicMock) -> TestClient: + app.dependency_overrides[get_db] = lambda: db + return TestClient(app, raise_server_exceptions=False) + + +# --------------------------------------------------------------------------- +# Healthy path +# --------------------------------------------------------------------------- + + +class TestHealthcheckHealthy: + def test_returns_200(self, health_app): + r = _client(health_app, _make_db(ping_ok=True)).get("/health") + assert r.status_code == 200 + + def test_body_reports_healthy(self, health_app): + r = _client(health_app, _make_db(ping_ok=True)).get("/health") + assert r.json() == {"status": "healthy", "mongo": "ok"} + + def test_pings_mongo(self, health_app): + db = _make_db(ping_ok=True) + _client(health_app, db).get("/health") + db.client.admin.command.assert_awaited_once_with("ping") + + +# --------------------------------------------------------------------------- +# Unhealthy path (DB unreachable) +# --------------------------------------------------------------------------- + + +class TestHealthcheckUnhealthy: + def test_returns_503(self, health_app): + r = _client(health_app, _make_db(ping_ok=False)).get("/health") + assert r.status_code == 503 + + def test_body_reports_unreachable(self, health_app): + # The StarletteHTTPException handler reshapes the response into the + # standard error envelope, stringifying the detail dict into `message`. + r = _client(health_app, _make_db(ping_ok=False)).get("/health") + message = r.json()["error"]["message"] + assert "unhealthy" in message + assert "unreachable" in message + + def test_ping_failure_does_not_leak_exception_text(self, health_app): + # The raised HTTPException carries a controlled detail dict, not the + # underlying "mongo down" ConnectionError message. + r = _client(health_app, _make_db(ping_ok=False)).get("/health") + assert "mongo down" not in r.text diff --git a/mpcontribs-api/tests/unit/domains/test_contribution_service.py b/mpcontribs-api/tests/unit/domains/test_contribution_service.py index e72f59a824..e1419e5e50 100644 --- a/mpcontribs-api/tests/unit/domains/test_contribution_service.py +++ b/mpcontribs-api/tests/unit/domains/test_contribution_service.py @@ -611,3 +611,210 @@ async def test_same_key_concurrent_upserts_both_go_through_atomic_call(self): # await svc.insert_contributions(contribs) # assert peak == 1 + + +# --------------------------------------------------------------------------- +# delete_contributions — cascade delete (components-first), cursor loop +# --------------------------------------------------------------------------- + +from types import SimpleNamespace # noqa: E402 + +from mpcontribs_api.domains._shared.models import DeleteResponse # noqa: E402 +from mpcontribs_api.domains.contributions.models import ContributionFilter # noqa: E402 +from mpcontribs_api.pagination import Page # noqa: E402 + + +def _link(ref_id: PydanticObjectId) -> SimpleNamespace: + """Minimal stand-in for a Beanie Link: only ``.ref.id`` is read by the service.""" + return SimpleNamespace(ref=SimpleNamespace(id=ref_id)) + + +def _contrib_doc(structures=None, attachments=None, tables=None, id_=None) -> SimpleNamespace: + """A contribution page item exposing the attributes delete_contributions reads.""" + return SimpleNamespace( + id=id_ or _oid(), + structures=[_link(s) for s in (structures or [])], + attachments=[_link(a) for a in (attachments or [])], + tables=[_link(t) for t in (tables or [])], + ) + + +def _page(items) -> Page: + return Page(items=items, next_cursor=None) + + +def _delete_result(n: int) -> SimpleNamespace: + """Stand-in for pymongo DeleteResult (only ``.deleted_count`` is read).""" + return SimpleNamespace(deleted_count=n) + + +def _noop_filter() -> ContributionFilter: + return ContributionFilter() + + +class TestDeleteContributionsEmpty: + async def test_empty_match_returns_zero_summary(self): + svc, contrib_repo, *_ = _make_service() + contrib_repo.get_contributions.return_value = _page([]) + contrib_repo.delete_contributions.return_value = _delete_result(0) + + summary = await svc.delete_contributions(_noop_filter()) + + assert summary.num_deleted == 0 + assert summary.num_children_deleted == 0 + + async def test_empty_match_does_not_call_child_repos(self): + svc, contrib_repo, struct_repo, table_repo, attach_repo, _ = _make_service() + contrib_repo.get_contributions.return_value = _page([]) + contrib_repo.delete_contributions.return_value = _delete_result(0) + + await svc.delete_contributions(_noop_filter()) + + struct_repo.delete_by_ids.assert_not_called() + table_repo.delete_by_ids.assert_not_called() + attach_repo.delete_by_ids.assert_not_called() + + async def test_empty_match_terminates_after_one_page(self): + svc, contrib_repo, *_ = _make_service() + contrib_repo.get_contributions.return_value = _page([]) + contrib_repo.delete_contributions.return_value = _delete_result(0) + + await svc.delete_contributions(_noop_filter()) + + assert contrib_repo.get_contributions.await_count == 1 + + +class TestDeleteContributionsSinglePage: + async def test_deletes_contributions_then_terminates(self): + svc, contrib_repo, *_ = _make_service() + docs = [_contrib_doc() for _ in range(3)] + # First call returns the page; second returns empty so the loop ends. + contrib_repo.get_contributions.side_effect = [_page(docs), _page([])] + contrib_repo.delete_contributions.side_effect = [_delete_result(3), _delete_result(0)] + + summary = await svc.delete_contributions(_noop_filter()) + + assert summary.num_deleted == 3 + + async def test_no_components_means_no_child_deletes(self): + svc, contrib_repo, struct_repo, table_repo, attach_repo, _ = _make_service() + contrib_repo.get_contributions.side_effect = [_page([_contrib_doc()]), _page([])] + contrib_repo.delete_contributions.side_effect = [_delete_result(1), _delete_result(0)] + + summary = await svc.delete_contributions(_noop_filter()) + + struct_repo.delete_by_ids.assert_not_called() + table_repo.delete_by_ids.assert_not_called() + attach_repo.delete_by_ids.assert_not_called() + assert summary.num_children_deleted == 0 + + async def test_components_deleted_before_contributions(self): + # Records call order across repos to assert children go first. + order: list[str] = [] + svc, contrib_repo, struct_repo, table_repo, attach_repo, _ = _make_service() + + doc = _contrib_doc(structures=[_oid()], tables=[_oid()], attachments=[_oid()]) + contrib_repo.get_contributions.side_effect = [_page([doc]), _page([])] + + def _make_child_recorder(name): + async def _record(ids, *a, **k): + order.append(name) + return DeleteResponse(num_deleted=1) + + return _record + + struct_repo.delete_by_ids.side_effect = _make_child_recorder("structures") + table_repo.delete_by_ids.side_effect = _make_child_recorder("tables") + attach_repo.delete_by_ids.side_effect = _make_child_recorder("attachments") + + async def _record_contrib(_filter, *a, **k): + order.append("contributions") + return _delete_result(1) + + contrib_repo.delete_contributions.side_effect = _record_contrib + + await svc.delete_contributions(_noop_filter()) + + # The loop makes a final pass on the empty page that still issues one + # (no-op) contribution delete before breaking, so there are two + # "contributions" entries. The invariant under test: all three child + # deletes happen before the first contribution delete. + first_contrib = order.index("contributions") + assert set(order[:first_contrib]) == {"structures", "tables", "attachments"} + + async def test_child_ids_collected_from_links(self): + svc, contrib_repo, struct_repo, *_ = _make_service() + s1, s2 = _oid(), _oid() + doc = _contrib_doc(structures=[s1, s2]) + contrib_repo.get_contributions.side_effect = [_page([doc]), _page([])] + struct_repo.delete_by_ids.return_value = DeleteResponse(num_deleted=2) + contrib_repo.delete_contributions.side_effect = [_delete_result(1), _delete_result(0)] + + await svc.delete_contributions(_noop_filter()) + + called_ids = struct_repo.delete_by_ids.await_args.args[0] + assert set(called_ids) == {s1, s2} + + async def test_child_counts_accumulated_across_types(self): + svc, contrib_repo, struct_repo, table_repo, attach_repo, _ = _make_service() + doc = _contrib_doc(structures=[_oid()], tables=[_oid(), _oid()], attachments=[_oid()]) + contrib_repo.get_contributions.side_effect = [_page([doc]), _page([])] + struct_repo.delete_by_ids.return_value = DeleteResponse(num_deleted=1) + table_repo.delete_by_ids.return_value = DeleteResponse(num_deleted=2) + attach_repo.delete_by_ids.return_value = DeleteResponse(num_deleted=1) + contrib_repo.delete_contributions.side_effect = [_delete_result(1), _delete_result(0)] + + summary = await svc.delete_contributions(_noop_filter()) + + assert summary.num_children_deleted == 4 + + async def test_contributions_deleted_by_id_in_of_page(self): + svc, contrib_repo, *_ = _make_service() + ids = [_oid(), _oid()] + docs = [_contrib_doc(id_=i) for i in ids] + contrib_repo.get_contributions.side_effect = [_page(docs), _page([])] + contrib_repo.delete_contributions.side_effect = [_delete_result(2), _delete_result(0)] + + await svc.delete_contributions(_noop_filter()) + + first_call_filter = contrib_repo.delete_contributions.await_args_list[0].args[0] + assert set(first_call_filter.id__in) == set(ids) + + +class TestDeleteContributionsMultiPage: + async def test_loops_until_page_empty(self): + svc, contrib_repo, *_ = _make_service() + contrib_repo.get_contributions.side_effect = [ + _page([_contrib_doc() for _ in range(2)]), + _page([_contrib_doc()]), + _page([]), + ] + contrib_repo.delete_contributions.side_effect = [ + _delete_result(2), + _delete_result(1), + _delete_result(0), + ] + + summary = await svc.delete_contributions(_noop_filter()) + + assert summary.num_deleted == 3 + assert contrib_repo.get_contributions.await_count == 3 + + async def test_children_accumulate_across_pages(self): + svc, contrib_repo, struct_repo, *_ = _make_service() + contrib_repo.get_contributions.side_effect = [ + _page([_contrib_doc(structures=[_oid()])]), + _page([_contrib_doc(structures=[_oid()])]), + _page([]), + ] + struct_repo.delete_by_ids.return_value = DeleteResponse(num_deleted=1) + contrib_repo.delete_contributions.side_effect = [ + _delete_result(1), + _delete_result(1), + _delete_result(0), + ] + + summary = await svc.delete_contributions(_noop_filter()) + + assert summary.num_children_deleted == 2 + assert struct_repo.delete_by_ids.await_count == 2 From 86ba711aefa220d64095b9a1fee44ec4cc5de159 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 15 Jun 2026 10:06:26 -0700 Subject: [PATCH 119/591] Moved download logic to base shared repository --- .../domains/_shared/components.py | 62 +------------------ .../domains/_shared/repository.py | 59 ++++++++++++++++++ .../mpcontribs_api/domains/_shared/types.py | 4 ++ .../domains/attachments/repository.py | 7 +-- .../domains/attachments/router.py | 6 +- .../domains/contributions/repository.py | 20 ++++-- .../domains/contributions/router.py | 28 ++++++--- .../domains/structures/repository.py | 7 +-- .../domains/structures/router.py | 9 ++- .../domains/tables/repository.py | 7 +-- .../mpcontribs_api/domains/tables/router.py | 6 +- .../integration/test_component_routes.py | 10 --- .../integration/test_contributions_routes.py | 31 +--------- 13 files changed, 121 insertions(+), 135 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py index 3611b30b13..78527413d6 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py @@ -1,8 +1,4 @@ -import hashlib -import json -import zlib -from collections.abc import AsyncIterable -from typing import Any, Literal +from typing import Any from beanie import PydanticObjectId from beanie.operators import In @@ -14,7 +10,7 @@ from mpcontribs_api.config import get_settings from mpcontribs_api.domains._shared.models import Component, DeleteResponse, DocumentOut from mpcontribs_api.domains._shared.repository import MongoDbRepository -from mpcontribs_api.domains._shared.types import DownloadFormat, MD5Hash +from mpcontribs_api.domains._shared.types import MD5Hash class MongoDbComponentsRepository[ @@ -99,60 +95,6 @@ async def get_component_by_id(self, id: str, fields: frozenset[str] | None) -> T """Find a single table by id, scoped to the current user. See ``get_by_id``.""" return await self.get_by_id(id, fields) - def _hash_payload(self, payload: dict[str, Any], *, separators: tuple[str, str] = (",", ":")) -> str: - canonical = json.dumps( - payload, - sort_keys=True, - separators=separators, - ensure_ascii=True, - ) - return hashlib.sha256(canonical.encode("utf-8")).hexdigest() - - async def download_components( - self, - format: DownloadFormat, - short_mime: Literal["gz", None], - ignore_cache: bool, - filter: TFilter, - fields: frozenset[str] | None, - ) -> AsyncIterable[bytes]: - # Hash parameters to generate key for cache - payload = { - "format": format, - "short_mime": short_mime, - "filter": filter.model_dump(), - "fields": sorted(fields) if fields else None, - } - _ = self._hash_payload(payload) - - # Check S3 for the cached file - # TODO: Implement - if not ignore_cache: - pass - - # If not found in cache, build from MongoDB and save to cache - query = filter.filter(self.document_model.find(self._scope)) - query = filter.sort(query) - - # Compress using gzip level 9 and stream out - compressor = zlib.compressobj(9, zlib.DEFLATED, 16 + zlib.MAX_WBITS) - buf = bytearray() - async for table in query: - # TODO: We might think about skipping validation to save time - out = self.out_model.model_validate(table, from_attributes=True) - line = out.model_dump_json().encode() + b"\n" - chunk = compressor.compress(line) - if chunk: - # TODO: Cache in S3 as multi-part upload so we stream to user and to S3 simultaneously, - # can then remove buf - buf += chunk - yield chunk - tail = compressor.flush() - if tail: - # TODO: Final upload final part to S3 in multi-part upload, remove buf - buf += tail - yield tail - async def delete_components( self, filter: TFilter, diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py index 1d9e0a4f71..875c5ee50c 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py @@ -1,4 +1,8 @@ +import hashlib +import json +import zlib from abc import ABC, abstractmethod +from collections.abc import AsyncIterable from typing import Any from beanie import PydanticObjectId, UpdateResponse @@ -10,6 +14,7 @@ from mpcontribs_api.auth import User from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DeleteResponse, DocumentOut +from mpcontribs_api.domains._shared.types import DownloadFormat, ShortMimeFormat from mpcontribs_api.exceptions import ConflictError, NotFoundError, ValidationError from mpcontribs_api.pagination import CursorParams, Page, encode_cursor @@ -179,3 +184,57 @@ async def patch(self, id: Any, update: TPatch) -> TDoc: if updated is None: raise NotFoundError(self._not_found(id)) return updated + + def _hash_payload(self, payload: dict[str, Any], *, separators: tuple[str, str] = (",", ":")) -> str: + canonical = json.dumps( + payload, + sort_keys=True, + separators=separators, + ensure_ascii=True, + ) + return hashlib.sha256(canonical.encode("utf-8")).hexdigest() + + async def download( + self, + format: DownloadFormat, + short_mime: ShortMimeFormat, + ignore_cache: bool, + filter: TFilter, + fields: frozenset[str] | None, + ) -> AsyncIterable[bytes]: + # Hash parameters to generate key for cache + payload = { + "format": format, + "short_mime": short_mime, + "filter": filter.model_dump(), + "fields": sorted(fields) if fields else None, + } + _ = self._hash_payload(payload) + + # Check S3 for the cached file + # TODO: Implement + if not ignore_cache: + pass + + # If not found in cache, build from MongoDB and save to cache + query = filter.filter(self.document_model.find(self._scope)) + query = filter.sort(query) + + # Compress using gzip level 9 and stream out + compressor = zlib.compressobj(9, zlib.DEFLATED, 16 + zlib.MAX_WBITS) + buf = bytearray() + async for table in query: + # TODO: We might think about skipping validation to save time + out = self.out_model.model_validate(table, from_attributes=True) + line = out.model_dump_json().encode() + b"\n" + chunk = compressor.compress(line) + if chunk: + # TODO: Cache in S3 as multi-part upload so we stream to user and to S3 simultaneously, + # can then remove buf + buf += chunk + yield chunk + tail = compressor.flush() + if tail: + # TODO: Final upload final part to S3 in multi-part upload, remove buf + buf += tail + yield tail diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py index cb85f71197..a734377f5e 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py @@ -65,6 +65,10 @@ class DownloadFormat(StrEnum): CSV = "csv" +class ShortMimeFormat(StrEnum): + GZ = "gz" + + def _coerce_frame(v: object) -> pl.DataFrame: if isinstance(v, pl.DataFrame): return v diff --git a/mpcontribs-api/src/mpcontribs_api/domains/attachments/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/attachments/repository.py index b076eddcfa..8d5fb5c686 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/attachments/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/attachments/repository.py @@ -1,11 +1,10 @@ from collections.abc import AsyncIterable -from typing import Literal from pymongo.asynchronous.client_session import AsyncClientSession from mpcontribs_api.domains._shared.components import MongoDbComponentsRepository from mpcontribs_api.domains._shared.models import DeleteResponse -from mpcontribs_api.domains._shared.types import DownloadFormat +from mpcontribs_api.domains._shared.types import DownloadFormat, ShortMimeFormat from mpcontribs_api.domains.attachments.models import ( Attachment, AttachmentFilter, @@ -38,12 +37,12 @@ async def get_attachment_by_id(self, id: str, fields: frozenset[str] | None) -> async def download_attachments( self, format: DownloadFormat, - short_mime: Literal["gz", None], + short_mime: ShortMimeFormat, ignore_cache: bool, filter: AttachmentFilter, fields: frozenset[str] | None, ) -> AsyncIterable[bytes]: - return self.download_components( + return self.download( format=format, short_mime=short_mime, ignore_cache=ignore_cache, diff --git a/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py b/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py index 53ab425aee..36bccec993 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py @@ -1,11 +1,11 @@ -from typing import Annotated, Literal +from typing import Annotated from fastapi import APIRouter, Depends, Response from fastapi.responses import StreamingResponse from fastapi_filter import FilterDepends from mpcontribs_api.domains._shared.models import DeleteResponse -from mpcontribs_api.domains._shared.types import DownloadFormat, FieldSelector +from mpcontribs_api.domains._shared.types import DownloadFormat, FieldSelector, ShortMimeFormat from mpcontribs_api.domains.attachments.dependencies import AttachmentDep from mpcontribs_api.domains.attachments.models import AttachmentFilter, AttachmentOut from mpcontribs_api.pagination import CursorParams, Page @@ -39,7 +39,7 @@ async def download_attachment( repo: AttachmentDep, response: Response, format: DownloadFormat, - short_mime: Literal["gz", None] = "gz", + short_mime: ShortMimeFormat = ShortMimeFormat.GZ, ignore_cache: bool = False, filter: AttachmentFilter = FilterDepends(AttachmentFilter), fields: FieldSelector = AttachmentOut.default_fields(), diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py index a412225313..a82be85583 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py @@ -1,4 +1,5 @@ -from typing import Any, Literal +from collections.abc import AsyncIterable +from typing import Any from beanie import UpdateResponse from beanie.operators import Set @@ -7,6 +8,7 @@ from mpcontribs_api.auth import User from mpcontribs_api.domains._shared.repository import MongoDbRepository +from mpcontribs_api.domains._shared.types import DownloadFormat, ShortMimeFormat from mpcontribs_api.domains.contributions.models import ( Contribution, ContributionFilter, @@ -24,7 +26,7 @@ class MongoDbContributionRepository( Shared CRUD logic lives on :class:`MongoDbRepository`; the methods here are domain-named forwarders that give routers a consistent vocabulary and concrete types, plus the operations - whose shape is genuinely contribution-specific (filtered delete, id-keyed upsert, download). + whose shape is contribution-specific (filtered delete, id-keyed upsert, download). Multi-collection orchestration (component inserts) lives in ``ContributionService``. """ @@ -166,8 +168,16 @@ async def upsert_contribution_by_id(self, id: str, contribution: ContributionIn) async def download_contributions( self, - format: Literal["json", "csv", "parquet"], + format: DownloadFormat, + short_mime: ShortMimeFormat, + ignore_cache: bool, filter: ContributionFilter, fields: frozenset[str] | None, - ): - pass + ) -> AsyncIterable[bytes]: + return self.download( + format=format, + short_mime=short_mime, + ignore_cache=ignore_cache, + filter=filter, + fields=fields, + ) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py index 0fff612ddc..967dd69926 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py @@ -1,10 +1,11 @@ -from typing import Annotated, Literal +from typing import Annotated from fastapi import APIRouter, Depends +from fastapi.responses import StreamingResponse from fastapi_filter import FilterDepends from mpcontribs_api.domains._shared.bulk import BulkWriteSummary -from mpcontribs_api.domains._shared.types import FieldSelector +from mpcontribs_api.domains._shared.types import DownloadFormat, FieldSelector, ShortMimeFormat from mpcontribs_api.domains.contributions.dependencies import ContributionDep, ContributionServiceDep from mpcontribs_api.domains.contributions.models import ( Contribution, @@ -25,8 +26,8 @@ async def get_contributions( filter: ContributionFilter = FilterDepends(ContributionFilter), fields: FieldSelector = ContributionOut.default_fields(), ): - field_set = ContributionOut.parse_fields(fields) - return await repo.get_contributions(pagination=pagination, filter=filter, fields=field_set) + selected = ContributionOut.parse_fields(fields) + return await repo.get_contributions(pagination=pagination, filter=filter, fields=selected) @router.delete("") @@ -54,15 +55,28 @@ async def upsert_contributions( return await service.upsert_contributions(contributions=contributions) -@router.get("/download/{mime}") +@router.get("/download/{short_mime}") async def download_contributions( repo: ContributionDep, - format: Literal["json", "csv", "parquet"] = "parquet", + short_mime: ShortMimeFormat = ShortMimeFormat.GZ, + format: DownloadFormat = DownloadFormat.JSONL, + ignore_cache: bool = False, filter: ContributionFilter = FilterDepends(ContributionFilter), fields: FieldSelector = ContributionOut.default_fields(), ): selected = ContributionOut.parse_fields(fields) - return await repo.download_contributions(format=format, filter=filter, fields=selected) + body = await repo.download_contributions( + format=format, + short_mime=short_mime, + ignore_cache=ignore_cache, + filter=filter, + fields=selected, + ) + return StreamingResponse( + body, + media_type="application/gzip", + headers={"Content-Disposition": 'attachment; filename="attachments.jsonl.gz"'}, + ) @router.delete("/{id}") diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/repository.py index ac654b7588..796b9bc5b0 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/structures/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/structures/repository.py @@ -1,11 +1,10 @@ from collections.abc import AsyncIterable -from typing import Literal from pymongo.asynchronous.client_session import AsyncClientSession from mpcontribs_api.domains._shared.components import MongoDbComponentsRepository from mpcontribs_api.domains._shared.models import DeleteResponse -from mpcontribs_api.domains._shared.types import DownloadFormat +from mpcontribs_api.domains._shared.types import DownloadFormat, ShortMimeFormat from mpcontribs_api.domains.structures.models import ( Structure, StructureFilter, @@ -65,12 +64,12 @@ async def get_structure_by_id(self, id: str, fields: frozenset[str] | None) -> S async def download_structures( self, format: DownloadFormat, - short_mime: Literal["gz", None], + short_mime: ShortMimeFormat, ignore_cache: bool, filter: StructureFilter, fields: frozenset[str] | None, ) -> AsyncIterable[bytes]: - return self.download_components( + return self.download( format=format, short_mime=short_mime, ignore_cache=ignore_cache, diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py index 4f1286c980..be153b0ed6 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py @@ -1,12 +1,12 @@ -from typing import Annotated, Literal +from typing import Annotated -from fastapi import APIRouter, Depends, Response +from fastapi import APIRouter, Depends from fastapi.responses import StreamingResponse from fastapi_filter import FilterDepends from mpcontribs_api.domains._shared.bulk import BulkWriteSummary from mpcontribs_api.domains._shared.models import DeleteResponse -from mpcontribs_api.domains._shared.types import DownloadFormat, FieldSelector +from mpcontribs_api.domains._shared.types import DownloadFormat, FieldSelector, ShortMimeFormat from mpcontribs_api.domains.structures.dependencies import StructureDep from mpcontribs_api.domains.structures.models import StructureFilter, StructureIn, StructureOut, StructurePatch from mpcontribs_api.pagination import CursorParams, Page @@ -38,9 +38,8 @@ async def get_structure( @router.get("/download/{short_mime}") async def download_structure( repo: StructureDep, - response: Response, format: DownloadFormat, - short_mime: Literal["gz", None] = "gz", + short_mime: ShortMimeFormat = ShortMimeFormat.GZ, ignore_cache: bool = False, filter: StructureFilter = FilterDepends(StructureFilter), fields: FieldSelector = StructureOut.default_fields(), diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py index d21145029e..4b1a95fadf 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py @@ -1,11 +1,10 @@ from collections.abc import AsyncIterable -from typing import Literal from pymongo.asynchronous.client_session import AsyncClientSession from mpcontribs_api.domains._shared.components import MongoDbComponentsRepository from mpcontribs_api.domains._shared.models import DeleteResponse -from mpcontribs_api.domains._shared.types import DownloadFormat +from mpcontribs_api.domains._shared.types import DownloadFormat, ShortMimeFormat from mpcontribs_api.domains.tables.models import ( Table, TableFilter, @@ -63,12 +62,12 @@ async def get_table_by_id(self, id: str, fields: frozenset[str] | None) -> Table async def download_tables( self, format: DownloadFormat, - short_mime: Literal["gz", None], + short_mime: ShortMimeFormat, ignore_cache: bool, filter: TableFilter, fields: frozenset[str] | None, ) -> AsyncIterable[bytes]: - return self.download_components( + return self.download( format=format, short_mime=short_mime, ignore_cache=ignore_cache, diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py index 265961da88..24d8cdc7d9 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py @@ -1,4 +1,4 @@ -from typing import Annotated, Literal +from typing import Annotated from fastapi import APIRouter, Depends from fastapi.responses import StreamingResponse @@ -6,7 +6,7 @@ from mpcontribs_api.domains._shared.bulk import BulkWriteSummary from mpcontribs_api.domains._shared.models import DeleteResponse -from mpcontribs_api.domains._shared.types import DownloadFormat, FieldSelector +from mpcontribs_api.domains._shared.types import DownloadFormat, FieldSelector, ShortMimeFormat from mpcontribs_api.domains.tables.dependencies import TableDep from mpcontribs_api.domains.tables.models import Table, TableFilter, TableIn, TableOut, TablePatch from mpcontribs_api.pagination import CursorParams, Page @@ -39,7 +39,7 @@ async def get_table( async def download_table( repo: TableDep, format: DownloadFormat, - short_mime: Literal["gz", None] = "gz", + short_mime: ShortMimeFormat = ShortMimeFormat.GZ, ignore_cache: bool = False, filter: TableFilter = FilterDepends(TableFilter), fields: FieldSelector = TableOut.default_fields(), diff --git a/mpcontribs-api/tests/integration/test_component_routes.py b/mpcontribs-api/tests/integration/test_component_routes.py index 4c62cf47a6..e340ccf71d 100644 --- a/mpcontribs-api/tests/integration/test_component_routes.py +++ b/mpcontribs-api/tests/integration/test_component_routes.py @@ -2,8 +2,6 @@ All use AsyncMock repositories via dependency_overrides, so no DB is required — the same pattern as test_projects.py / test_contributions.py. - -THREE BUG CLASSES ARE PINNED TO INTENDED BEHAVIOR (these tests are RED): """ import pytest @@ -162,8 +160,6 @@ def test_post_forwards_to_repo(self, client, table_repo): class TestTablesByIdRouting: - """RED: same glued-path bug as structures.""" - def test_get_by_id_conventional_path(self, client, table_repo): table_repo.get_table_by_id.return_value = SAMPLE_TABLE assert client.get(f"/api/v1/tables/{PydanticObjectId()}").status_code == 200 @@ -184,12 +180,6 @@ def test_patch_by_id_conventional_path(self, client, table_repo): class TestAttachmentsRouterWiring: - """RED: attachments/router.py wires StructureDep and calls structure repo - methods. With the attachment repo overridden, the structure-named methods - don't exist on it, so these assertions can't pass until the router is - rewritten against the attachment domain. - """ - def test_list_calls_attachment_repo(self, client, attachment_repo): attachment_repo.get_attachments.return_value = Page(items=[], next_cursor=None) r = client.get("/api/v1/attachments") diff --git a/mpcontribs-api/tests/integration/test_contributions_routes.py b/mpcontribs-api/tests/integration/test_contributions_routes.py index af1e32cdde..716298b00b 100644 --- a/mpcontribs-api/tests/integration/test_contributions_routes.py +++ b/mpcontribs-api/tests/integration/test_contributions_routes.py @@ -3,19 +3,6 @@ test_contributions.py covers GET list and DELETE batch plus stub-existence of POST/PUT. This file covers the behavior of POST, PUT, the single-resource routes, and download — all via AsyncMock repo/service overrides. - -RED behavior pinned here: - -1. Glued path params (same class as the component routers). Single-resource - contribution routes mount as ``/contributions{id}`` not - ``/contributions/{id}``; the ``...ByIdRouting`` tests assert the - conventional ``/{id}`` form. - -2. Download route shape. The route is declared ``download/{mime}`` but the - handler reads ``format`` from the query and never uses the ``mime`` path - param, while structures/tables use ``download/{short_mime}`` with a - ``DownloadFormat`` enum. test_download_route_conventional_path asserts the - conventional ``/download/...`` path resolves. """ import pytest @@ -162,14 +149,8 @@ def test_delete_by_id_conventional_path(self, client, contribution_service): assert client.delete(f"/api/v1/contributions/{PydanticObjectId()}").status_code == 200 def test_download_route_conventional_path(self, client, contribution_repo): - # NOTE: this stays red even after the leading-slash fix. The route is - # declared download/{mime} and the handler ignores the mime path param - # while reading `format` from the query — diverging from structures/ - # tables, which use download/{short_mime} + a DownloadFormat enum and - # work. Reconciling the contributions download route with the other - # domains is a separate fix from the glued-path one. contribution_repo.download_contributions.return_value = iter([b"x"]) - assert client.get("/api/v1/contributions/download/parquet").status_code == 200 + assert client.get("/api/v1/contributions/download/gz").status_code == 200 # =========================================================================== @@ -178,16 +159,6 @@ def test_download_route_conventional_path(self, client, contribution_repo): class TestDeleteContributionByIdWiring: - """delete_contribtion_by_id builds a ContributionFilter from the id and - delegates to the service. These use the CURRENT (glued) path so the handler - is reached today, isolating the wiring assertion from the routing bug. - - PAIRING NOTE: when the glued-path bug is fixed (leading slash added), these - two tests must be updated to the conventional ``/contributions/{id}`` path — - at that point the TestContributionByIdRouting.test_delete_by_id_conventional_path - test goes green and supersedes them. They are expected to PASS today. - """ - def test_delete_delegates_to_service(self, client, contribution_service): contribution_service.delete_contributions.return_value = BulkDeleteSummary( num_deleted=1, num_children_deleted=2 From 8e83e658b18c1aab21643e33a630473a82a12315 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 15 Jun 2026 10:58:50 -0700 Subject: [PATCH 120/591] Added csv serialization for downloads --- .../domains/_shared/components.py | 5 +- .../domains/_shared/repository.py | 54 ++++++++++++++----- 2 files changed, 43 insertions(+), 16 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py index 78527413d6..bc184d5e23 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py @@ -34,6 +34,7 @@ async def _check_existing( by_md5 = {comp.md5: comp for comp in components} # Full fetch so existing docs come back with their ids + # TODO: Most likely does a COLLSCAN - see if we can project to get a COVERED QUERY existing_docs = await self.document_model.find( In(self.document_model.md5, list(by_md5.keys())), session=session, @@ -62,8 +63,8 @@ async def insert_components( doc.id = PydanticObjectId() new_docs.append(doc) - # TODO: Might want to delegate this logic to a higher level. This method might want to simply insert everything - # its given + # TODO: Might want to delegate this logic to a higher level + # - This method might want to simply insert everything it's given # Insert by chunks chunk_size = get_settings().mongo.component_insert_chunk_size for start in range(0, len(new_docs), chunk_size): diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py index 875c5ee50c..fa2b7ea312 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py @@ -1,8 +1,10 @@ +import csv import hashlib +import io import json import zlib from abc import ABC, abstractmethod -from collections.abc import AsyncIterable +from collections.abc import AsyncIterable, AsyncIterator, Callable from typing import Any from beanie import PydanticObjectId, UpdateResponse @@ -194,6 +196,34 @@ def _hash_payload(self, payload: dict[str, Any], *, separators: tuple[str, str] ) return hashlib.sha256(canonical.encode("utf-8")).hexdigest() + def _get_serializer( + self, format: DownloadFormat, fields: frozenset[str] | None + ) -> Callable[[AsyncIterable[TOut]], AsyncIterable[bytes]]: + if format == DownloadFormat.JSONL: + return self._serialize_jsonl + if format == DownloadFormat.CSV: + return lambda rows: self._serialize_csv(rows, fields) + + @staticmethod + async def _serialize_jsonl(rows: AsyncIterable) -> AsyncIterator[bytes]: + async for out in rows: + yield out.model_dump_json().encode() + b"\n" + + @staticmethod + async def _serialize_csv(rows: AsyncIterable, fields: frozenset[str] | None) -> AsyncIterator[bytes]: + buf = io.StringIO() + writer: csv.DictWriter | None = None + async for out in rows: + row = out.model_dump(mode="json") + if writer is None: + cols = sorted(fields) if fields else list(row.keys()) + writer = csv.DictWriter(buf, fieldnames=cols, extrasaction="ignore") + writer.writeheader() + writer.writerow(row) + yield buf.getvalue().encode() + buf.seek(0) + buf.truncate(0) + async def download( self, format: DownloadFormat, @@ -220,21 +250,17 @@ async def download( query = filter.filter(self.document_model.find(self._scope)) query = filter.sort(query) + serializer = self._get_serializer(format, fields) + # Compress using gzip level 9 and stream out compressor = zlib.compressobj(9, zlib.DEFLATED, 16 + zlib.MAX_WBITS) - buf = bytearray() - async for table in query: - # TODO: We might think about skipping validation to save time - out = self.out_model.model_validate(table, from_attributes=True) - line = out.model_dump_json().encode() + b"\n" + + async def rows() -> AsyncIterator[TOut]: + async for table in query: + # TODO: We might think about skipping validation to save time + yield self.out_model.model_validate(table, from_attributes=True) + + async for line in serializer(rows()): chunk = compressor.compress(line) if chunk: - # TODO: Cache in S3 as multi-part upload so we stream to user and to S3 simultaneously, - # can then remove buf - buf += chunk yield chunk - tail = compressor.flush() - if tail: - # TODO: Final upload final part to S3 in multi-part upload, remove buf - buf += tail - yield tail From 26d039875a2173c988ef118464e2292d22540d5a Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 15 Jun 2026 11:48:39 -0700 Subject: [PATCH 121/591] Added tests to cover downloads --- .../tests/integration/db/conftest.py | 16 +- .../db/test_components_repository.py | 198 ++++++++++ .../tests/integration/db/test_download.py | 162 ++++++++ .../integration/test_component_routes.py | 68 ++++ .../integration/test_contributions_routes.py | 74 ++++ .../test_shared_repository_download.py | 352 ++++++++++++++++++ 6 files changed, 867 insertions(+), 3 deletions(-) create mode 100644 mpcontribs-api/tests/integration/db/test_components_repository.py create mode 100644 mpcontribs-api/tests/integration/db/test_download.py create mode 100644 mpcontribs-api/tests/unit/domains/test_shared_repository_download.py diff --git a/mpcontribs-api/tests/integration/db/conftest.py b/mpcontribs-api/tests/integration/db/conftest.py index 419cbd7876..9de472f15b 100644 --- a/mpcontribs-api/tests/integration/db/conftest.py +++ b/mpcontribs-api/tests/integration/db/conftest.py @@ -16,8 +16,11 @@ from pymongo import AsyncMongoClient from mpcontribs_api.config import get_settings +from mpcontribs_api.domains.attachments.models import Attachment from mpcontribs_api.domains.contributions.models import Contribution from mpcontribs_api.domains.projects.models import Project +from mpcontribs_api.domains.structures.models import Structure +from mpcontribs_api.domains.tables.models import Table # --------------------------------------------------------------------------- # Auto-mark all tests in this directory as @pytest.mark.db @@ -73,11 +76,9 @@ async def db(mongo_client): """Database handle with Beanie initialised against the test database.""" settings = get_settings() database = mongo_client[settings.mongo.db_name] - # Only initialise concrete documents (stubs like Structure/Table/Attachment - # have no Settings.name yet and cause Beanie to fall back to the base class). await init_beanie( database=database, - document_models=[Project, Contribution], + document_models=[Project, Contribution, Structure, Table, Attachment], ) yield database @@ -99,3 +100,12 @@ async def clean_contributions(db): await db["contributions"].delete_many({}) yield await db["contributions"].delete_many({}) + + +@pytest_asyncio.fixture(autouse=True) +async def clean_components(db): + for collection in ("structures", "tables", "attachments"): + await db[collection].delete_many({}) + yield + for collection in ("structures", "tables", "attachments"): + await db[collection].delete_many({}) diff --git a/mpcontribs-api/tests/integration/db/test_components_repository.py b/mpcontribs-api/tests/integration/db/test_components_repository.py new file mode 100644 index 0000000000..e2fee93871 --- /dev/null +++ b/mpcontribs-api/tests/integration/db/test_components_repository.py @@ -0,0 +1,198 @@ +"""Database integration tests for MongoDbComponentsRepository (live MongoDB). + +The component repository's md5-dedupe insert, chunked ``insert_many``, filtered +delete, delete-by-id and patch logic lives on the shared +``MongoDbComponentsRepository`` and had no direct coverage. These tests exercise +it through ``MongoDbAttachmentRepository`` (the simplest concrete component) against +real Beanie/MongoDB. + +Run with: uv run pytest -m db +Skip with: uv run pytest -m "not db" +""" + +import gzip + +import pytest +from beanie import PydanticObjectId + +from mpcontribs_api.auth import User +from mpcontribs_api.config import get_settings +from mpcontribs_api.domains._shared.types import DownloadFormat, ShortMimeFormat +from mpcontribs_api.domains.attachments.models import ( + Attachment, + AttachmentFilter, + AttachmentIn, + AttachmentPatch, +) +from mpcontribs_api.domains.attachments.repository import MongoDbAttachmentRepository + +pytestmark = [pytest.mark.db, pytest.mark.asyncio(loop_scope="session")] + + +# --------------------------------------------------------------------------- +# Helpers +# --------------------------------------------------------------------------- + +USER = User(username="google:alice@example.com", groups=frozenset({"mp-team"})) + + +def _repo() -> MongoDbAttachmentRepository: + return MongoDbAttachmentRepository(USER) + + +def _attachment(md5: str, name: str = "data.csv", content: int = 1) -> AttachmentIn: + return AttachmentIn( + _id=PydanticObjectId(), + name=name, + md5=md5, + mime="application/gzip", + content=content, + ) + + +async def _count() -> int: + return await Attachment.find_all().count() + + +# --------------------------------------------------------------------------- +# insert_components: md5 dedupe +# --------------------------------------------------------------------------- + + +class TestInsertComponentsDedupe: + async def test_duplicate_md5_in_batch_inserted_once(self, db): + # Two inputs share an md5; only one document should be written. + await _repo().insert_components([_attachment("a" * 32), _attachment("a" * 32), _attachment("b" * 32)]) + assert await _count() == 2 + + async def test_returns_one_doc_per_unique_md5(self, db): + result = await _repo().insert_components([_attachment("a" * 32), _attachment("a" * 32)]) + assert len(result) == 1 + + async def test_existing_md5_not_reinserted(self, db): + await _repo().insert_components([_attachment("a" * 32)]) + # Re-submit the existing md5 alongside a new one. + await _repo().insert_components([_attachment("a" * 32), _attachment("b" * 32)]) + assert await _count() == 2 + + async def test_existing_doc_returned_with_original_id(self, db): + first = await _repo().insert_components([_attachment("a" * 32)]) + again = await _repo().insert_components([_attachment("a" * 32)]) + assert again[0].id == first[0].id + + async def test_inserted_docs_have_ids(self, db): + result = await _repo().insert_components([_attachment("a" * 32), _attachment("b" * 32)]) + assert all(doc.id is not None for doc in result) + + +# --------------------------------------------------------------------------- +# insert_components: chunking +# --------------------------------------------------------------------------- + + +class TestInsertComponentsChunking: + async def test_all_docs_persisted_across_multiple_chunks(self, db, monkeypatch): + # Force a chunk size smaller than the batch so the chunking loop runs >1 time. + monkeypatch.setattr(get_settings().mongo, "component_insert_chunk_size", 2) + # md5 must be 32-char hex; build distinct values explicitly. + attachments = [_attachment(format(i, "032x")) for i in range(5)] + result = await _repo().insert_components(attachments) + assert len(result) == 5 + assert await _count() == 5 + + +# --------------------------------------------------------------------------- +# insert_component (single) +# --------------------------------------------------------------------------- + + +class TestInsertComponent: + async def test_single_insert_persists(self, db): + doc = await _repo().insert_component(_attachment("c" * 32)) + found = await Attachment.find_one(Attachment.id == doc.id) + assert found is not None + assert found.md5 == "c" * 32 + + +# --------------------------------------------------------------------------- +# delete_components / delete_component_by_id +# --------------------------------------------------------------------------- + + +class TestDeleteComponents: + async def test_filtered_delete_removes_only_matches(self, db): + await _repo().insert_components([_attachment("a" * 32), _attachment("b" * 32)]) + result = await _repo().delete_components(AttachmentFilter(md5="a" * 32)) + assert result.num_deleted == 1 + remaining = {doc.md5 async for doc in Attachment.find_all()} + assert remaining == {"b" * 32} + + async def test_delete_by_id_removes_one(self, db): + """RED: delete_component_by_id never matches a string id. + + Routers pass the id through as a path string, but ``delete_component_by_id`` + forwards it straight to ``delete_by_id`` without converting to a + ``PydanticObjectId`` (unlike ``patch_component_by_id``, which calls + ``_convert_object_id``). ``Attachment.id == ""`` then never matches + the ObjectId-typed ``_id``, so the delete raises NotFoundError and component + delete-by-id is effectively broken. + """ + [doc] = await _repo().insert_components([_attachment("a" * 32)]) + result = await _repo().delete_component_by_id(str(doc.id)) + assert result.num_deleted == 1 + assert await _count() == 0 + + async def test_delete_by_unknown_id_raises(self, db): + from mpcontribs_api.exceptions import NotFoundError + + with pytest.raises(NotFoundError): + await _repo().delete_component_by_id(str(PydanticObjectId())) + + +# --------------------------------------------------------------------------- +# patch_component_by_id +# --------------------------------------------------------------------------- + + +class TestPatchComponent: + async def test_patch_updates_field(self, db): + [doc] = await _repo().insert_components([_attachment("a" * 32, name="data.csv")]) + updated = await _repo().patch_component_by_id(str(doc.id), AttachmentPatch(name="renamed.png")) + assert updated.name == "renamed.png" + + async def test_empty_patch_returns_existing(self, db): + [doc] = await _repo().insert_components([_attachment("a" * 32, name="data.csv")]) + updated = await _repo().patch_component_by_id(str(doc.id), AttachmentPatch()) + assert updated.id == doc.id + + +# --------------------------------------------------------------------------- +# Component download round-trip +# --------------------------------------------------------------------------- + + +class TestComponentDownload: + async def test_jsonl_download_round_trips(self, db): + """RED: component downloads are doubly broken. + + 1. ``MongoDbRepository.download`` calls ``filter.sort(query)``, but the + component filters (Attachment/Structure/Table) don't define an + ``order_by`` field, so ``sort`` raises ``AttributeError`` before any + bytes are streamed. (ContributionFilter does define ``order_by``, which + is why contribution downloads get past this point.) + 2. Even once ordering is added, the compressor is never flushed (see + tests/integration/db/test_download.py), so the gzip member is truncated. + + When both are fixed this verifies the component download path end to end. + """ + await _repo().insert_components([_attachment("a" * 32), _attachment("b" * 32)]) + stream = await _repo().download_attachments( + format=DownloadFormat.JSONL, + short_mime=ShortMimeFormat.GZ, + ignore_cache=True, + filter=AttachmentFilter(), + fields=None, + ) + chunks = [c async for c in stream] + decompressed = gzip.decompress(b"".join(chunks)) + assert decompressed.count(b"\n") == 2 diff --git a/mpcontribs-api/tests/integration/db/test_download.py b/mpcontribs-api/tests/integration/db/test_download.py new file mode 100644 index 0000000000..90f6bff6c1 --- /dev/null +++ b/mpcontribs-api/tests/integration/db/test_download.py @@ -0,0 +1,162 @@ +"""Database integration tests for the download pipeline (live MongoDB). + +These exercise ``MongoDbContributionRepository.download_contributions`` against +real Beanie/MongoDB: the scoped+sorted query, projection, JSONL/CSV serialization +and gzip streaming, end to end. + +Most round-trip tests gzip-*decompress* the streamed bytes and compare to the +seeded data. They are RED today: ``MongoDbRepository.download`` never calls +``compressor.flush()``, so the streamed gzip member is truncated (missing trailing +data + CRC/ISIZE footer) and ``gzip.decompress`` raises. Once ``flush()`` is added +these same tests also verify scope filtering and field projection on real data. + +Run with: uv run pytest -m db +Skip with: uv run pytest -m "not db" +""" + +import csv +import gzip +import io + +import pytest +from beanie import PydanticObjectId + +from mpcontribs_api.auth import User +from mpcontribs_api.domains.contributions.models import Contribution, ContributionFilter +from mpcontribs_api.domains.contributions.repository import MongoDbContributionRepository + +pytestmark = [pytest.mark.db, pytest.mark.asyncio(loop_scope="session")] + + +# --------------------------------------------------------------------------- +# Helpers +# --------------------------------------------------------------------------- + +ADMIN = User(username="google:admin@example.com", groups=frozenset({"admin"})) +ALICE = User(username="google:alice@example.com", groups=frozenset({"mp-team"})) +ANON = User() + + +def _repo(user: User = ADMIN) -> MongoDbContributionRepository: + return MongoDbContributionRepository(user) + + +async def _insert(project: str, identifier: str, is_public: bool, **overrides) -> Contribution: + doc = Contribution( + _id=PydanticObjectId(), + project=project, + identifier=identifier, + formula=overrides.pop("formula", "Fe2O3"), + data=overrides.pop("data", {"band_gap": 2.1}), + is_public=is_public, + **overrides, + ) + await doc.insert() + return doc + + +async def _seed_scope_fixture() -> None: + """Three contributions spanning the three scope buckets.""" + await _insert("pub-proj", "mp-public", is_public=True) + await _insert("mp-team", "mp-group", is_public=False) + await _insert("secret", "mp-private", is_public=False) + + +async def _collect(stream) -> bytes: + chunks: list[bytes] = [] + async for chunk in stream: + chunks.append(chunk) + return b"".join(chunks) + + +async def _download_bytes(repo: MongoDbContributionRepository, *, format="jsonl", fields=None, filter=None) -> bytes: + from mpcontribs_api.domains._shared.types import DownloadFormat, ShortMimeFormat + + stream = await repo.download_contributions( + format=DownloadFormat(format), + short_mime=ShortMimeFormat.GZ, + ignore_cache=True, + filter=filter or ContributionFilter(), + fields=fields, + ) + return gzip.decompress(await _collect(stream)) + + +def _parse_jsonl(raw: bytes) -> list[dict]: + import json + + return [json.loads(line) for line in raw.splitlines() if line] + + +def _parse_csv(raw: bytes) -> list[dict]: + return list(csv.DictReader(io.StringIO(raw.decode()))) + + +# --------------------------------------------------------------------------- +# JSONL round-trip + scope +# --------------------------------------------------------------------------- + + +class TestDownloadJsonl: + async def test_admin_downloads_all_rows(self, db): + await _seed_scope_fixture() + rows = _parse_jsonl(await _download_bytes(_repo(ADMIN))) + assert {r["identifier"] for r in rows} == {"mp-public", "mp-group", "mp-private"} + + async def test_anonymous_sees_only_public(self, db): + await _seed_scope_fixture() + rows = _parse_jsonl(await _download_bytes(_repo(ANON))) + assert {r["identifier"] for r in rows} == {"mp-public"} + + async def test_group_member_sees_public_and_group(self, db): + await _seed_scope_fixture() + rows = _parse_jsonl(await _download_bytes(_repo(ALICE))) + assert {r["identifier"] for r in rows} == {"mp-public", "mp-group"} + + async def test_rows_carry_expected_fields(self, db): + await _insert("pub-proj", "mp-1", is_public=True, formula="Li2O") + rows = _parse_jsonl(await _download_bytes(_repo(ADMIN))) + assert rows[0]["formula"] == "Li2O" + assert rows[0]["project"] == "pub-proj" + + +# --------------------------------------------------------------------------- +# Filtering +# --------------------------------------------------------------------------- + + +class TestDownloadFiltering: + async def test_filter_limits_returned_rows(self, db): + await _insert("pub-proj", "keep-me", is_public=True) + await _insert("pub-proj", "drop-me", is_public=True) + rows = _parse_jsonl( + await _download_bytes(_repo(ADMIN), filter=ContributionFilter(identifier="keep-me")) + ) + assert {r["identifier"] for r in rows} == {"keep-me"} + + async def test_empty_result_is_valid_empty_gzip(self, db): + # No documents match -> the stream is genuinely empty and decompresses to b"". + # (This path never enters the compress loop, so the missing-flush bug doesn't bite.) + raw = await _download_bytes(_repo(ADMIN), filter=ContributionFilter(identifier="no-such-id")) + assert raw == b"" + + +# --------------------------------------------------------------------------- +# CSV round-trip + field projection +# --------------------------------------------------------------------------- + + +class TestDownloadCsv: + async def test_csv_has_header_and_rows(self, db): + await _insert("pub-proj", "mp-1", is_public=True) + await _insert("pub-proj", "mp-2", is_public=True) + rows = _parse_csv(await _download_bytes(_repo(ADMIN), format="csv")) + assert len(rows) == 2 + + async def test_csv_projects_only_requested_fields(self, db): + await _insert("pub-proj", "mp-1", is_public=True) + fields = frozenset({"id", "identifier"}) + rows = _parse_csv(await _download_bytes(_repo(ADMIN), format="csv", fields=fields)) + # Only the requested columns (plus the always-present id) appear. + assert set(rows[0].keys()) <= {"id", "identifier"} + assert rows[0]["identifier"] == "mp-1" diff --git a/mpcontribs-api/tests/integration/test_component_routes.py b/mpcontribs-api/tests/integration/test_component_routes.py index e340ccf71d..6e4975202d 100644 --- a/mpcontribs-api/tests/integration/test_component_routes.py +++ b/mpcontribs-api/tests/integration/test_component_routes.py @@ -200,3 +200,71 @@ def test_batch_delete_calls_attachment_repo(self, client, attachment_repo): attachment_repo.delete_attachments.return_value = DeleteResponse(num_deleted=0) client.delete("/api/v1/attachments") attachment_repo.delete_attachments.assert_awaited_once() + + +# =========================================================================== +# Component downloads: /{resource}/download/{short_mime} +# +# Parametrised over the three component resources so download behavior is held +# to the same contract everywhere. Each entry is +# (url_prefix, repo_fixture_name, download_method, expected_stem). +# =========================================================================== + +_DOWNLOAD_CASES = [ + ("structures", "structure_repo", "download_structures", "structures"), + ("tables", "table_repo", "download_tables", "tables"), + ("attachments", "attachment_repo", "download_attachments", "attachments"), +] + + +@pytest.fixture +def download_target(request): + """Resolve a (prefix, repo, method_name, stem) case into a wired repo mock.""" + prefix, repo_fixture, method, stem = request.param + repo = request.getfixturevalue(repo_fixture) + getattr(repo, method).return_value = iter([b"x"]) + return prefix, repo, method, stem + + +@pytest.mark.parametrize("download_target", _DOWNLOAD_CASES, indirect=True) +class TestComponentDownloads: + def test_csv_returns_200(self, client, download_target): + prefix, *_ = download_target + assert client.get(f"/api/v1/{prefix}/download/gz?format=csv").status_code == 200 + + def test_jsonl_returns_200(self, client, download_target): + prefix, *_ = download_target + assert client.get(f"/api/v1/{prefix}/download/gz?format=jsonl").status_code == 200 + + def test_body_is_streamed_bytes(self, client, download_target): + prefix, repo, method, _ = download_target + getattr(repo, method).return_value = iter([b"ab", b"cd"]) + assert client.get(f"/api/v1/{prefix}/download/gz?format=jsonl").content == b"abcd" + + def test_format_is_required(self, client, download_target): + # Component download routes give `format` no default, unlike contributions. + prefix, *_ = download_target + assert client.get(f"/api/v1/{prefix}/download/gz").status_code == 422 + + def test_invalid_short_mime_returns_422(self, client, download_target): + prefix, *_ = download_target + assert client.get(f"/api/v1/{prefix}/download/zip?format=jsonl").status_code == 422 + + def test_invalid_format_returns_422(self, client, download_target): + prefix, *_ = download_target + assert client.get(f"/api/v1/{prefix}/download/gz?format=xml").status_code == 422 + + def test_format_forwarded_to_repo(self, client, download_target): + prefix, repo, method, _ = download_target + client.get(f"/api/v1/{prefix}/download/gz?format=csv") + assert getattr(repo, method).call_args.kwargs["format"] == "csv" + + def test_csv_filename_uses_csv_extension(self, client, download_target): + """RED: a CSV download should be named *.csv.gz, not *.jsonl.gz. + + Every component router hardcodes the ``.jsonl.gz`` extension regardless of + the requested ``format``, so CSV downloads are mislabelled. + """ + prefix, *_ = download_target + cd = client.get(f"/api/v1/{prefix}/download/gz?format=csv").headers["content-disposition"] + assert ".csv.gz" in cd diff --git a/mpcontribs-api/tests/integration/test_contributions_routes.py b/mpcontribs-api/tests/integration/test_contributions_routes.py index 716298b00b..e78fdb2136 100644 --- a/mpcontribs-api/tests/integration/test_contributions_routes.py +++ b/mpcontribs-api/tests/integration/test_contributions_routes.py @@ -14,6 +14,7 @@ get_scoped_contributions, ) from mpcontribs_api.domains.contributions.models import ContributionOut +from mpcontribs_api.exceptions import NotFoundError # --------------------------------------------------------------------------- # Fixtures @@ -177,3 +178,76 @@ def test_delete_builds_filter_from_path_id(self, client, contribution_service): client.delete(f"/api/v1/contributions/{oid}") passed_filter = contribution_service.delete_contributions.call_args.args[0] assert passed_filter.id == oid + + +# =========================================================================== +# GET /contributions/download/{short_mime} +# =========================================================================== + + +class TestDownloadContributions: + def test_default_format_jsonl_returns_200(self, client, contribution_repo): + # The contributions route gives `format` a default of JSONL, so it works + # with the param omitted (component routes require it — see test_component_routes). + contribution_repo.download_contributions.return_value = iter([b"x"]) + assert client.get("/api/v1/contributions/download/gz").status_code == 200 + + def test_csv_format_returns_200(self, client, contribution_repo): + contribution_repo.download_contributions.return_value = iter([b"x"]) + assert client.get("/api/v1/contributions/download/gz?format=csv").status_code == 200 + + def test_body_is_streamed_bytes(self, client, contribution_repo): + contribution_repo.download_contributions.return_value = iter([b"abc", b"def"]) + assert client.get("/api/v1/contributions/download/gz").content == b"abcdef" + + def test_invalid_short_mime_returns_422(self, client, contribution_repo): + contribution_repo.download_contributions.return_value = iter([b"x"]) + # Only 'gz' is a valid ShortMimeFormat. + assert client.get("/api/v1/contributions/download/zip").status_code == 422 + + def test_invalid_format_returns_422(self, client, contribution_repo): + contribution_repo.download_contributions.return_value = iter([b"x"]) + assert client.get("/api/v1/contributions/download/gz?format=xml").status_code == 422 + + def test_format_forwarded_to_repo(self, client, contribution_repo): + contribution_repo.download_contributions.return_value = iter([b"x"]) + client.get("/api/v1/contributions/download/gz?format=csv") + assert contribution_repo.download_contributions.call_args.kwargs["format"] == "csv" + + def test_fields_parsed_and_forwarded(self, client, contribution_repo): + contribution_repo.download_contributions.return_value = iter([b"x"]) + client.get("/api/v1/contributions/download/gz?_fields=project") + forwarded = contribution_repo.download_contributions.call_args.kwargs["fields"] + assert "project" in forwarded + + def test_invalid_fields_returns_422(self, client, contribution_repo): + contribution_repo.download_contributions.return_value = iter([b"x"]) + assert client.get("/api/v1/contributions/download/gz?_fields=not_a_field").status_code == 422 + + def test_filename_names_the_contributions_resource(self, client, contribution_repo): + """RED: the attachment filename should reference contributions, not attachments. + + The route hardcodes ``filename="attachments.jsonl.gz"`` (copy-paste from the + attachments router), so a contributions download saves under the wrong name. + """ + contribution_repo.download_contributions.return_value = iter([b"x"]) + cd = client.get("/api/v1/contributions/download/gz").headers["content-disposition"] + assert "contributions" in cd + + def test_csv_filename_uses_csv_extension(self, client, contribution_repo): + """RED: a CSV download should be named *.csv.gz, not *.jsonl.gz. + + The filename extension is hardcoded to ``.jsonl.gz`` regardless of the + requested ``format``, so CSV downloads are mislabelled as JSONL. + """ + contribution_repo.download_contributions.return_value = iter([b"x"]) + cd = client.get("/api/v1/contributions/download/gz?format=csv").headers["content-disposition"] + assert ".csv.gz" in cd + + def test_repo_error_surfaces_as_uniform_json(self, client, contribution_repo): + # An AppError raised while the repo builds the download surfaces through the + # registered exception handler as the uniform error envelope (not a 500 traceback). + contribution_repo.download_contributions.side_effect = NotFoundError("nothing to download") + r = client.get("/api/v1/contributions/download/gz") + assert r.status_code == 404 + assert r.json()["error"]["code"] == "not_found" diff --git a/mpcontribs-api/tests/unit/domains/test_shared_repository_download.py b/mpcontribs-api/tests/unit/domains/test_shared_repository_download.py new file mode 100644 index 0000000000..622ae03593 --- /dev/null +++ b/mpcontribs-api/tests/unit/domains/test_shared_repository_download.py @@ -0,0 +1,352 @@ +"""Unit tests for the download/serialization core on MongoDbRepository. + +The download pipeline (``_serialize_jsonl``, ``_serialize_csv``, ``_get_serializer``, +``_hash_payload``, ``download``) had no direct coverage — only the route happy-path +was exercised via mocked repos. These tests drive a minimal concrete repository +subclass with a fake output model and a fake query so the serialization and gzip +streaming logic can be verified without a database. + +Several tests assert the *correct* behavior the pipeline should have and therefore +fail against the current implementation (red). Each is marked in its docstring with +the bug it pins: + + * download() never calls ``compressor.flush()`` -> the streamed gzip member is + truncated (missing trailing data + CRC/size footer), so it cannot be decompressed. + * ``_get_serializer`` has no fallback branch -> an unsupported format returns None + and the caller crashes with a TypeError instead of a clear error. + * ``_hash_payload`` calls ``json.dumps`` with no ``default=`` -> a filter carrying + an ObjectId/datetime raises TypeError before the download can even start. + * ``_serialize_csv`` writes Python ``repr`` for dict/nested values rather than JSON. +""" + +import csv +import gzip +import io +import json +from collections.abc import AsyncIterable, AsyncIterator +from datetime import datetime, timezone +from types import SimpleNamespace +from typing import Any +from unittest.mock import MagicMock + +import pytest +from beanie import PydanticObjectId +from pydantic import BaseModel + +from mpcontribs_api.auth import User +from mpcontribs_api.domains._shared.repository import MongoDbRepository +from mpcontribs_api.domains._shared.types import DownloadFormat, ShortMimeFormat + +# --------------------------------------------------------------------------- +# Test doubles +# --------------------------------------------------------------------------- + + +class _Out(BaseModel): + """Minimal output model with scalar fields.""" + + a: int + b: str + + +class _OutWithData(BaseModel): + """Output model whose ``data`` column holds a nested dict (CSV edge case).""" + + name: str + data: dict + + +class _FakeQuery: + """Async-iterable stand-in for a Beanie find() query.""" + + def __init__(self, rows: list[Any]) -> None: + self._rows = rows + + async def __aiter__(self) -> AsyncIterator[Any]: + for row in self._rows: + yield row + + +class _FakeFilter: + """Stand-in for a fastapi-filter Filter. + + ``filter()`` ignores the base query and returns a fake query over the seeded + rows; ``sort()`` is a passthrough; ``model_dump()`` returns the configured + payload (used by ``download`` when building the cache key). + """ + + def __init__(self, rows: list[Any], dump: dict[str, Any] | None = None) -> None: + self._rows = rows + self._dump = {} if dump is None else dump + + def filter(self, _base: Any) -> _FakeQuery: + return _FakeQuery(self._rows) + + def sort(self, query: _FakeQuery) -> _FakeQuery: + return query + + def model_dump(self) -> dict[str, Any]: + return self._dump + + +class _FakeRepo(MongoDbRepository): + """Concrete repository binding just enough to exercise the shared download core.""" + + document_model = MagicMock() + out_model = _Out + + @staticmethod + def _build_scope(user: User) -> dict[str, Any]: + return {} + + +def _repo(out_model: type[BaseModel] = _Out) -> _FakeRepo: + repo = _FakeRepo(User()) + repo.out_model = out_model # type: ignore[assignment] + repo.document_model = MagicMock() # type: ignore[assignment] + return repo + + +async def _aiter(items: list[Any]) -> AsyncIterator[Any]: + for item in items: + yield item + + +async def _collect(stream: AsyncIterable[bytes]) -> bytes: + chunks: list[bytes] = [] + async for chunk in stream: + chunks.append(chunk) + return b"".join(chunks) + + +# =========================================================================== +# _serialize_jsonl +# =========================================================================== + + +class TestSerializeJsonl: + async def test_one_line_per_row(self): + rows = [_Out(a=1, b="x"), _Out(a=2, b="y")] + out = await _collect(MongoDbRepository._serialize_jsonl(_aiter(rows))) + assert out.count(b"\n") == 2 + + async def test_each_line_round_trips_to_row(self): + rows = [_Out(a=1, b="x"), _Out(a=2, b="y")] + out = await _collect(MongoDbRepository._serialize_jsonl(_aiter(rows))) + parsed = [json.loads(line) for line in out.splitlines()] + assert parsed == [{"a": 1, "b": "x"}, {"a": 2, "b": "y"}] + + async def test_every_line_terminated_with_newline(self): + rows = [_Out(a=1, b="x"), _Out(a=2, b="y")] + out = await _collect(MongoDbRepository._serialize_jsonl(_aiter(rows))) + assert out.endswith(b"\n") + + async def test_empty_input_yields_nothing(self): + out = await _collect(MongoDbRepository._serialize_jsonl(_aiter([]))) + assert out == b"" + + async def test_unicode_payload_preserved(self): + rows = [_Out(a=1, b="café—ü")] + out = await _collect(MongoDbRepository._serialize_jsonl(_aiter(rows))) + assert json.loads(out)["b"] == "café—ü" + + +# =========================================================================== +# _serialize_csv +# =========================================================================== + + +def _parse_csv(raw: bytes) -> list[dict[str, str]]: + return list(csv.DictReader(io.StringIO(raw.decode()))) + + +class TestSerializeCsv: + async def test_header_written_once(self): + rows = [_Out(a=1, b="x"), _Out(a=2, b="y")] + raw = await _collect(MongoDbRepository._serialize_csv(_aiter(rows), None)) + # Header appears exactly once even across multiple rows. + assert raw.decode().count("a,b") == 1 + + async def test_columns_default_to_first_row_keys_when_no_fields(self): + rows = [_Out(a=1, b="x")] + raw = await _collect(MongoDbRepository._serialize_csv(_aiter(rows), None)) + reader = csv.reader(io.StringIO(raw.decode())) + assert next(reader) == ["a", "b"] + + async def test_columns_follow_sorted_fields_when_given(self): + rows = [_Out(a=1, b="x")] + raw = await _collect(MongoDbRepository._serialize_csv(_aiter(rows), frozenset({"b", "a"}))) + reader = csv.reader(io.StringIO(raw.decode())) + assert next(reader) == ["a", "b"] + + async def test_extra_fields_are_ignored(self): + # 'b' is not in the requested field set -> dropped from output. + rows = [_Out(a=1, b="x")] + raw = await _collect(MongoDbRepository._serialize_csv(_aiter(rows), frozenset({"a"}))) + parsed = _parse_csv(raw) + assert parsed == [{"a": "1"}] + + async def test_all_rows_emitted(self): + rows = [_Out(a=i, b=str(i)) for i in range(5)] + raw = await _collect(MongoDbRepository._serialize_csv(_aiter(rows), None)) + assert len(_parse_csv(raw)) == 5 + + async def test_no_row_bleed_between_chunks(self): + # Each yielded chunk after the header must contain exactly one row, proving + # the shared StringIO buffer is truncated between iterations. + rows = [_Out(a=1, b="x"), _Out(a=2, b="y")] + chunks = [c async for c in MongoDbRepository._serialize_csv(_aiter(rows), None)] + # First chunk: header + row 1; subsequent chunks: one row each. + assert b"2,y" not in chunks[0] + + async def test_empty_input_yields_no_bytes(self): + raw = await _collect(MongoDbRepository._serialize_csv(_aiter([]), None)) + assert raw == b"" + + async def test_dict_value_serialized_as_json(self): + """RED: dict-valued columns should be emitted as JSON, not Python repr. + + ``model_dump(mode="json")`` leaves nested dicts as dict objects; csv then + writes ``str(dict)`` (single-quoted Python repr) which is not valid JSON and + cannot be round-tripped by consumers. The column should hold JSON instead. + """ + rows = [_OutWithData(name="r1", data={"k": "v", "n": 1})] + raw = await _collect(MongoDbRepository._serialize_csv(_aiter(rows), None)) + cell = _parse_csv(raw)[0]["data"] + assert json.loads(cell) == {"k": "v", "n": 1} + + +# =========================================================================== +# _get_serializer +# =========================================================================== + + +class TestGetSerializer: + def test_jsonl_returns_jsonl_serializer(self): + repo = _repo() + assert repo._get_serializer(DownloadFormat.JSONL, None) is MongoDbRepository._serialize_jsonl + + async def test_csv_serializer_is_callable_and_serializes(self): + repo = _repo() + serializer = repo._get_serializer(DownloadFormat.CSV, frozenset({"a"})) + raw = await _collect(serializer(_aiter([_Out(a=1, b="x")]))) + assert _parse_csv(raw) == [{"a": "1"}] + + def test_unsupported_format_raises(self): + """RED: an unknown format should raise, not fall through returning None. + + Today ``_get_serializer`` has no else branch, so an unsupported value + returns None and the caller blows up with an opaque ``TypeError: 'NoneType' + object is not callable`` deep in ``download``. It should raise a clear error. + """ + repo = _repo() + with pytest.raises((ValueError, KeyError, NotImplementedError)): + repo._get_serializer("xml", None) # type: ignore[arg-type] + + +# =========================================================================== +# _hash_payload +# =========================================================================== + + +class TestHashPayload: + def test_is_deterministic(self): + repo = _repo() + payload = {"format": "jsonl", "fields": ["a", "b"]} + assert repo._hash_payload(payload) == repo._hash_payload(payload) + + def test_independent_of_key_order(self): + repo = _repo() + assert repo._hash_payload({"a": 1, "b": 2}) == repo._hash_payload({"b": 2, "a": 1}) + + def test_sensitive_to_value_changes(self): + repo = _repo() + assert repo._hash_payload({"a": 1}) != repo._hash_payload({"a": 2}) + + def test_returns_sha256_hex(self): + repo = _repo() + digest = repo._hash_payload({"a": 1}) + assert len(digest) == 64 + assert all(c in "0123456789abcdef" for c in digest) + + def test_object_id_filter_is_hashable(self): + """RED: filters carrying an ObjectId must hash without raising. + + ``download`` hashes ``filter.model_dump()`` which, for an ``id__in`` filter, + contains PydanticObjectId values. ``json.dumps`` without ``default=`` raises + ``TypeError`` on these, so any filtered download by id crashes before it starts. + """ + repo = _repo() + payload = {"filter": {"id__in": [PydanticObjectId(), PydanticObjectId()]}} + digest = repo._hash_payload(payload) + assert len(digest) == 64 + + def test_datetime_filter_is_hashable(self): + """RED: filters carrying a datetime must hash without raising (see above).""" + repo = _repo() + payload = {"filter": {"created__gte": datetime(2024, 1, 1, tzinfo=timezone.utc)}} + digest = repo._hash_payload(payload) + assert len(digest) == 64 + + +# =========================================================================== +# download (end-to-end: query -> serialize -> gzip stream) +# =========================================================================== + + +class TestDownload: + async def test_jsonl_stream_decompresses_to_rows(self): + """RED: the gzip stream must decompress cleanly. + + ``download`` builds a zlib gzip compressor but never calls ``flush()`` after + the final chunk, so the trailing buffered bytes and the gzip footer (CRC32 + + ISIZE) are never emitted. ``gzip.decompress`` therefore raises on the + truncated member. When fixed, the decompressed bytes equal the JSONL payload. + """ + repo = _repo(_Out) + filter = _FakeFilter(rows=[SimpleNamespace(a=1, b="x"), SimpleNamespace(a=2, b="y")]) + stream = repo.download( + format=DownloadFormat.JSONL, + short_mime=ShortMimeFormat.GZ, + ignore_cache=True, + filter=filter, # type: ignore[arg-type] + fields=None, + ) + compressed = await _collect(stream) + decompressed = gzip.decompress(compressed) + parsed = [json.loads(line) for line in decompressed.splitlines()] + assert parsed == [{"a": 1, "b": "x"}, {"a": 2, "b": "y"}] + + async def test_csv_stream_decompresses_to_rows(self): + """RED: same flush bug, exercised through the CSV serializer.""" + repo = _repo(_Out) + filter = _FakeFilter(rows=[SimpleNamespace(a=1, b="x"), SimpleNamespace(a=2, b="y")]) + stream = repo.download( + format=DownloadFormat.CSV, + short_mime=ShortMimeFormat.GZ, + ignore_cache=True, + filter=filter, # type: ignore[arg-type] + fields=frozenset({"a", "b"}), + ) + compressed = await _collect(stream) + decompressed = gzip.decompress(compressed) + assert _parse_csv(decompressed) == [{"a": "1", "b": "x"}, {"a": "2", "b": "y"}] + + async def test_empty_result_is_valid_empty_gzip(self): + """A download with no matching rows yields zero bytes, which gzip treats as empty. + + Unlike the non-empty cases (which hit the missing-``flush()`` bug), an empty + result never enters the compress loop, so the stream is genuinely empty and + ``gzip.decompress(b"")`` returns ``b""``. Guards that empty downloads stay valid. + """ + repo = _repo(_Out) + filter = _FakeFilter(rows=[]) + stream = repo.download( + format=DownloadFormat.JSONL, + short_mime=ShortMimeFormat.GZ, + ignore_cache=True, + filter=filter, # type: ignore[arg-type] + fields=None, + ) + compressed = await _collect(stream) + assert gzip.decompress(compressed) == b"" From 12340a6bdec1147d4f4a6232e82c401b631ded24 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 15 Jun 2026 12:13:47 -0700 Subject: [PATCH 122/591] Fixed gzip missing final packet; improved CSV serialization; improved download filenames --- .../mpcontribs_api/domains/_shared/components.py | 2 +- .../mpcontribs_api/domains/_shared/repository.py | 16 +++++++++++++++- .../src/mpcontribs_api/domains/_shared/types.py | 10 ++++++++++ .../mpcontribs_api/domains/attachments/models.py | 3 +++ .../mpcontribs_api/domains/attachments/router.py | 10 ++++++++-- .../domains/contributions/router.py | 10 ++++++++-- .../mpcontribs_api/domains/structures/models.py | 3 +++ .../mpcontribs_api/domains/structures/router.py | 10 ++++++++-- .../src/mpcontribs_api/domains/tables/models.py | 3 +++ .../src/mpcontribs_api/domains/tables/router.py | 10 ++++++++-- 10 files changed, 67 insertions(+), 10 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py index bc184d5e23..a0904df163 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py @@ -128,7 +128,7 @@ async def delete_component_by_id( Returns: DeleteResponse: A report of the deletion """ - return await self.delete_by_id(id=id, session=session) + return await self.delete_by_id(id=self._convert_object_id(id), session=session) async def patch_component_by_id(self, id: str, update: TPatch) -> TDoc: """Partially update a component by id, scoped to the current user. See ``patch``.""" diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py index fa2b7ea312..0b75a95c1d 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py @@ -193,6 +193,7 @@ def _hash_payload(self, payload: dict[str, Any], *, separators: tuple[str, str] sort_keys=True, separators=separators, ensure_ascii=True, + default=str, # filters may carry ObjectId/datetime values; stringify for a stable key ) return hashlib.sha256(canonical.encode("utf-8")).hexdigest() @@ -209,6 +210,13 @@ async def _serialize_jsonl(rows: AsyncIterable) -> AsyncIterator[bytes]: async for out in rows: yield out.model_dump_json().encode() + b"\n" + @staticmethod + def _csv_cell(value: Any) -> Any: + """Render a cell value for CSV: scalars as-is, dict/list as JSON (not Python repr).""" + if value is None or isinstance(value, (str, int, float, bool)): + return value + return json.dumps(value, ensure_ascii=False, separators=(",", ":")) + @staticmethod async def _serialize_csv(rows: AsyncIterable, fields: frozenset[str] | None) -> AsyncIterator[bytes]: buf = io.StringIO() @@ -219,7 +227,7 @@ async def _serialize_csv(rows: AsyncIterable, fields: frozenset[str] | None) -> cols = sorted(fields) if fields else list(row.keys()) writer = csv.DictWriter(buf, fieldnames=cols, extrasaction="ignore") writer.writeheader() - writer.writerow(row) + writer.writerow({key: MongoDbRepository._csv_cell(value) for key, value in row.items()}) yield buf.getvalue().encode() buf.seek(0) buf.truncate(0) @@ -264,3 +272,9 @@ async def rows() -> AsyncIterator[TOut]: chunk = compressor.compress(line) if chunk: yield chunk + + # Flush the remaining buffered bytes and the gzip footer + # Without this the stream is a truncated gzip that cannot be decompressed. + tail = compressor.flush() + if tail: + yield tail diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py index a734377f5e..9f7c2ef72f 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py @@ -69,6 +69,16 @@ class ShortMimeFormat(StrEnum): GZ = "gz" +# Not exactly a type, but used to coerce a str to a desired format (pseudo-type) +def download_filename(resource: str, format: DownloadFormat, short_mime: ShortMimeFormat) -> str: + """Build a download filename reflecting the resource, payload format, and compression. + + e.g. ``download_filename("contributions", DownloadFormat.CSV, ShortMimeFormat.GZ)`` + -> ``"contributions.csv.gz"``. + """ + return f"{resource}.{format.value}.{short_mime.value}" + + def _coerce_frame(v: object) -> pl.DataFrame: if isinstance(v, pl.DataFrame): return v diff --git a/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py b/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py index dd03082b22..3f949dfe74 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py @@ -68,5 +68,8 @@ class AttachmentFilter(Filter): mime__neq: MimeFormat | None = None mime__ilike: MimeFormat | None = None + # sorting + order_by: list[str] | None = None + class Constants(Filter.Constants): model = Attachment diff --git a/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py b/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py index 36bccec993..01ad34b71b 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py @@ -5,7 +5,12 @@ from fastapi_filter import FilterDepends from mpcontribs_api.domains._shared.models import DeleteResponse -from mpcontribs_api.domains._shared.types import DownloadFormat, FieldSelector, ShortMimeFormat +from mpcontribs_api.domains._shared.types import ( + DownloadFormat, + FieldSelector, + ShortMimeFormat, + download_filename, +) from mpcontribs_api.domains.attachments.dependencies import AttachmentDep from mpcontribs_api.domains.attachments.models import AttachmentFilter, AttachmentOut from mpcontribs_api.pagination import CursorParams, Page @@ -52,10 +57,11 @@ async def download_attachment( filter=filter, fields=selected, ) + filename = download_filename("attachments", format, short_mime) return StreamingResponse( body, media_type="application/gzip", - headers={"Content-Disposition": 'attachment; filename="attachments.jsonl.gz"'}, + headers={"Content-Disposition": f'attachment; filename="{filename}"'}, ) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py index 967dd69926..80ee24c4f7 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py @@ -5,7 +5,12 @@ from fastapi_filter import FilterDepends from mpcontribs_api.domains._shared.bulk import BulkWriteSummary -from mpcontribs_api.domains._shared.types import DownloadFormat, FieldSelector, ShortMimeFormat +from mpcontribs_api.domains._shared.types import ( + DownloadFormat, + FieldSelector, + ShortMimeFormat, + download_filename, +) from mpcontribs_api.domains.contributions.dependencies import ContributionDep, ContributionServiceDep from mpcontribs_api.domains.contributions.models import ( Contribution, @@ -72,10 +77,11 @@ async def download_contributions( filter=filter, fields=selected, ) + filename = download_filename("contributions", format, short_mime) return StreamingResponse( body, media_type="application/gzip", - headers={"Content-Disposition": 'attachment; filename="attachments.jsonl.gz"'}, + headers={"Content-Disposition": f'attachment; filename="{filename}"'}, ) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py index 0b097c9e9f..b462d70aea 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py @@ -96,5 +96,8 @@ class StructureFilter(Filter): # sites + # sorting + order_by: list[str] | None = None + class Constants(Filter.Constants): model = Structure diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py index be153b0ed6..d3d51a7f2b 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py @@ -6,7 +6,12 @@ from mpcontribs_api.domains._shared.bulk import BulkWriteSummary from mpcontribs_api.domains._shared.models import DeleteResponse -from mpcontribs_api.domains._shared.types import DownloadFormat, FieldSelector, ShortMimeFormat +from mpcontribs_api.domains._shared.types import ( + DownloadFormat, + FieldSelector, + ShortMimeFormat, + download_filename, +) from mpcontribs_api.domains.structures.dependencies import StructureDep from mpcontribs_api.domains.structures.models import StructureFilter, StructureIn, StructureOut, StructurePatch from mpcontribs_api.pagination import CursorParams, Page @@ -52,10 +57,11 @@ async def download_structure( filter=filter, fields=selected, ) + filename = download_filename("structures", format, short_mime) return StreamingResponse( body, media_type="application/gzip", - headers={"Content-Disposition": 'attachment; filename="structures.jsonl.gz"'}, + headers={"Content-Disposition": f'attachment; filename="{filename}"'}, ) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py index 65985b362e..6ea93ed2be 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py @@ -108,6 +108,9 @@ class TableFilter(Filter): # Columns # Attrs + # sorting + order_by: list[str] | None = None + class Constants(Filter.Constants): model = Table diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py index 24d8cdc7d9..42cddd4654 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py @@ -6,7 +6,12 @@ from mpcontribs_api.domains._shared.bulk import BulkWriteSummary from mpcontribs_api.domains._shared.models import DeleteResponse -from mpcontribs_api.domains._shared.types import DownloadFormat, FieldSelector, ShortMimeFormat +from mpcontribs_api.domains._shared.types import ( + DownloadFormat, + FieldSelector, + ShortMimeFormat, + download_filename, +) from mpcontribs_api.domains.tables.dependencies import TableDep from mpcontribs_api.domains.tables.models import Table, TableFilter, TableIn, TableOut, TablePatch from mpcontribs_api.pagination import CursorParams, Page @@ -52,10 +57,11 @@ async def download_table( filter=filter, fields=selected, ) + filename = download_filename("tables", format, short_mime) return StreamingResponse( body, media_type="application/gzip", - headers={"Content-Disposition": 'attachment; filename="tables.jsonl.gz"'}, + headers={"Content-Disposition": f'attachment; filename="{filename}"'}, ) From 381353a8ee4844160e3c594a419d5c67b341339e Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 15 Jun 2026 12:47:28 -0700 Subject: [PATCH 123/591] Moved DataFormat decision to a match statement --- .../src/mpcontribs_api/domains/_shared/repository.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py index 0b75a95c1d..cc7771d1b1 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py @@ -200,10 +200,11 @@ def _hash_payload(self, payload: dict[str, Any], *, separators: tuple[str, str] def _get_serializer( self, format: DownloadFormat, fields: frozenset[str] | None ) -> Callable[[AsyncIterable[TOut]], AsyncIterable[bytes]]: - if format == DownloadFormat.JSONL: - return self._serialize_jsonl - if format == DownloadFormat.CSV: - return lambda rows: self._serialize_csv(rows, fields) + match format: + case DownloadFormat.JSONL: + return self._serialize_jsonl + case DownloadFormat.CSV: + return lambda rows: self._serialize_csv(rows, fields) @staticmethod async def _serialize_jsonl(rows: AsyncIterable) -> AsyncIterator[bytes]: From ddcd41ff2ad9b996d7eda64933b05034589ce04c Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 15 Jun 2026 12:47:48 -0700 Subject: [PATCH 124/591] Removed module-level docstrings --- mpcontribs-api/tests/conftest.py | 7 -- mpcontribs-api/tests/integration/conftest.py | 14 ---- .../tests/integration/db/conftest.py | 12 ---- .../db/test_components_repository.py | 35 +--------- .../db/test_contributions_repository.py | 11 ---- .../tests/integration/db/test_download.py | 16 ----- .../db/test_projects_repository.py | 12 ---- .../integration/test_component_routes.py | 12 +--- .../tests/integration/test_contributions.py | 7 -- .../integration/test_contributions_routes.py | 19 +----- .../tests/integration/test_error_handlers.py | 7 -- .../tests/integration/test_healthcheck.py | 9 --- .../tests/integration/test_projects.py | 11 ---- mpcontribs-api/tests/unit/conftest.py | 7 -- .../unit/domains/test_attachments_models.py | 2 - .../unit/domains/test_contribution_service.py | 9 --- .../tests/unit/domains/test_shared_bulk.py | 2 - .../tests/unit/domains/test_shared_models.py | 7 -- .../test_shared_repository_download.py | 64 ++++++------------- .../unit/domains/test_structures_models.py | 2 - .../tests/unit/domains/test_tables_models.py | 14 ---- mpcontribs-api/tests/unit/test_config.py | 2 - .../tests/unit/test_types_components.py | 7 -- 23 files changed, 26 insertions(+), 262 deletions(-) diff --git a/mpcontribs-api/tests/conftest.py b/mpcontribs-api/tests/conftest.py index 42f8eef4ed..b6d47ba59d 100644 --- a/mpcontribs-api/tests/conftest.py +++ b/mpcontribs-api/tests/conftest.py @@ -1,10 +1,3 @@ -"""Shared pytest configuration and fixtures. - -Environment variables for Settings are set at module level (before any source -imports) so that auth.py and config.py can load successfully without a real -.env file. -""" - import os from dotenv import load_dotenv diff --git a/mpcontribs-api/tests/integration/conftest.py b/mpcontribs-api/tests/integration/conftest.py index eef129b066..00e130edaf 100644 --- a/mpcontribs-api/tests/integration/conftest.py +++ b/mpcontribs-api/tests/integration/conftest.py @@ -1,17 +1,3 @@ -"""Integration test infrastructure. - -make_test_app() builds a real FastAPI application (routers, middleware, -exception handlers) but with: - - A no-op lifespan so no MongoDB connection is attempted. - - The verify_gateway dependency absent at the app level; tests that want to - check gateway enforcement use the gateway_app fixture instead. - -Fixtures follow the pattern: - test_app (session) — base app, no dependency overrides - client (function) — TestClient wrapping test_app; overrides are set per-test - and cleared on teardown to avoid bleed between tests. -""" - from contextlib import asynccontextmanager from unittest.mock import AsyncMock, MagicMock, patch diff --git a/mpcontribs-api/tests/integration/db/conftest.py b/mpcontribs-api/tests/integration/db/conftest.py index 9de472f15b..beab815b9f 100644 --- a/mpcontribs-api/tests/integration/db/conftest.py +++ b/mpcontribs-api/tests/integration/db/conftest.py @@ -1,15 +1,3 @@ -"""Fixtures for tests that require a live MongoDB connection. - -Connection settings come from the .env file (MPCONTRIBS_MONGO__URI and -MPCONTRIBS_MONGO__DB_NAME). All tests in this directory are marked `db` -automatically; run them with `just test db` or skip them with `-m "not db"`. - -Data isolation: the `clean_projects` and `clean_contributions` fixtures -(autouse) delete all documents from the test collections before each test. -This is intentionally destructive — point MPCONTRIBS_MONGO__DB_NAME at a -dedicated test database, not a shared or production one. -""" - import pytest import pytest_asyncio from beanie import init_beanie diff --git a/mpcontribs-api/tests/integration/db/test_components_repository.py b/mpcontribs-api/tests/integration/db/test_components_repository.py index e2fee93871..62748248d7 100644 --- a/mpcontribs-api/tests/integration/db/test_components_repository.py +++ b/mpcontribs-api/tests/integration/db/test_components_repository.py @@ -1,15 +1,3 @@ -"""Database integration tests for MongoDbComponentsRepository (live MongoDB). - -The component repository's md5-dedupe insert, chunked ``insert_many``, filtered -delete, delete-by-id and patch logic lives on the shared -``MongoDbComponentsRepository`` and had no direct coverage. These tests exercise -it through ``MongoDbAttachmentRepository`` (the simplest concrete component) against -real Beanie/MongoDB. - -Run with: uv run pytest -m db -Skip with: uv run pytest -m "not db" -""" - import gzip import pytest @@ -128,15 +116,7 @@ async def test_filtered_delete_removes_only_matches(self, db): assert remaining == {"b" * 32} async def test_delete_by_id_removes_one(self, db): - """RED: delete_component_by_id never matches a string id. - - Routers pass the id through as a path string, but ``delete_component_by_id`` - forwards it straight to ``delete_by_id`` without converting to a - ``PydanticObjectId`` (unlike ``patch_component_by_id``, which calls - ``_convert_object_id``). ``Attachment.id == ""`` then never matches - the ObjectId-typed ``_id``, so the delete raises NotFoundError and component - delete-by-id is effectively broken. - """ + """delete_component_by_id matches a string id by converting it to ObjectId.""" [doc] = await _repo().insert_components([_attachment("a" * 32)]) result = await _repo().delete_component_by_id(str(doc.id)) assert result.num_deleted == 1 @@ -173,18 +153,7 @@ async def test_empty_patch_returns_existing(self, db): class TestComponentDownload: async def test_jsonl_download_round_trips(self, db): - """RED: component downloads are doubly broken. - - 1. ``MongoDbRepository.download`` calls ``filter.sort(query)``, but the - component filters (Attachment/Structure/Table) don't define an - ``order_by`` field, so ``sort`` raises ``AttributeError`` before any - bytes are streamed. (ContributionFilter does define ``order_by``, which - is why contribution downloads get past this point.) - 2. Even once ordering is added, the compressor is never flushed (see - tests/integration/db/test_download.py), so the gzip member is truncated. - - When both are fixed this verifies the component download path end to end. - """ + """Component downloads stream a decompressable gzip of all rows.""" await _repo().insert_components([_attachment("a" * 32), _attachment("b" * 32)]) stream = await _repo().download_attachments( format=DownloadFormat.JSONL, diff --git a/mpcontribs-api/tests/integration/db/test_contributions_repository.py b/mpcontribs-api/tests/integration/db/test_contributions_repository.py index 0aa09fda9d..83fdaa2880 100644 --- a/mpcontribs-api/tests/integration/db/test_contributions_repository.py +++ b/mpcontribs-api/tests/integration/db/test_contributions_repository.py @@ -1,14 +1,3 @@ -"""Database integration tests for MongoDbContributionRepository. - -These tests require a live MongoDB connection (see conftest.py). They exercise -the real Beanie/MongoDB layer: query scoping, field projection, cursor -pagination, bulk insert, single insert, find-one, update, delete-by-id, and -bulk delete — none of which can be verified with mocks. - -Run with: uv run pytest -m db -Skip with: uv run pytest -m "not db" -""" - import pytest from beanie import PydanticObjectId diff --git a/mpcontribs-api/tests/integration/db/test_download.py b/mpcontribs-api/tests/integration/db/test_download.py index 90f6bff6c1..d229de1814 100644 --- a/mpcontribs-api/tests/integration/db/test_download.py +++ b/mpcontribs-api/tests/integration/db/test_download.py @@ -1,19 +1,3 @@ -"""Database integration tests for the download pipeline (live MongoDB). - -These exercise ``MongoDbContributionRepository.download_contributions`` against -real Beanie/MongoDB: the scoped+sorted query, projection, JSONL/CSV serialization -and gzip streaming, end to end. - -Most round-trip tests gzip-*decompress* the streamed bytes and compare to the -seeded data. They are RED today: ``MongoDbRepository.download`` never calls -``compressor.flush()``, so the streamed gzip member is truncated (missing trailing -data + CRC/ISIZE footer) and ``gzip.decompress`` raises. Once ``flush()`` is added -these same tests also verify scope filtering and field projection on real data. - -Run with: uv run pytest -m db -Skip with: uv run pytest -m "not db" -""" - import csv import gzip import io diff --git a/mpcontribs-api/tests/integration/db/test_projects_repository.py b/mpcontribs-api/tests/integration/db/test_projects_repository.py index 5affc40aec..ef629cb576 100644 --- a/mpcontribs-api/tests/integration/db/test_projects_repository.py +++ b/mpcontribs-api/tests/integration/db/test_projects_repository.py @@ -6,18 +6,6 @@ from mpcontribs_api.exceptions import ConflictError, NotFoundError from mpcontribs_api.pagination import CursorParams -"""Database integration tests for MongoDbProjectRepository. - -These tests require a live MongoDB connection (see conftest.py). They exercise -the real Beanie/MongoDB layer — query scoping, field projection, cursor -pagination, soft-delete, conflict detection, patch, and upsert — none of which -can be verified with mock repositories. - -Run with: just test db -Skip with: uv run pytest -m "not db" -""" - - # All tests in this module share the session event loop so they can reuse the # session-scoped AsyncMongoClient initialised in conftest. Beanie's internal # collection references are loop-bound, so mixing loops causes errors. diff --git a/mpcontribs-api/tests/integration/test_component_routes.py b/mpcontribs-api/tests/integration/test_component_routes.py index 6e4975202d..0d9f2487ae 100644 --- a/mpcontribs-api/tests/integration/test_component_routes.py +++ b/mpcontribs-api/tests/integration/test_component_routes.py @@ -1,9 +1,3 @@ -"""Integration tests for component routers: /structures, /tables, /attachments. - -All use AsyncMock repositories via dependency_overrides, so no DB is required — -the same pattern as test_projects.py / test_contributions.py. -""" - import pytest from beanie import PydanticObjectId @@ -260,11 +254,7 @@ def test_format_forwarded_to_repo(self, client, download_target): assert getattr(repo, method).call_args.kwargs["format"] == "csv" def test_csv_filename_uses_csv_extension(self, client, download_target): - """RED: a CSV download should be named *.csv.gz, not *.jsonl.gz. - - Every component router hardcodes the ``.jsonl.gz`` extension regardless of - the requested ``format``, so CSV downloads are mislabelled. - """ + """A CSV download is named *.csv.gz, matching the requested format.""" prefix, *_ = download_target cd = client.get(f"/api/v1/{prefix}/download/gz?format=csv").headers["content-disposition"] assert ".csv.gz" in cd diff --git a/mpcontribs-api/tests/integration/test_contributions.py b/mpcontribs-api/tests/integration/test_contributions.py index 06634a684b..7f61ac4bb2 100644 --- a/mpcontribs-api/tests/integration/test_contributions.py +++ b/mpcontribs-api/tests/integration/test_contributions.py @@ -1,10 +1,3 @@ -"""Integration tests for /api/v1/contributions routes. - -Uses an AsyncMock repository override so no database is required. Tests cover -the implemented GET and DELETE batch endpoints; stub endpoints (POST, PUT, -single-resource) are verified to exist and wire through to the repo. -""" - import pytest from mpcontribs_api.domains.contributions.dependencies import get_scoped_contributions diff --git a/mpcontribs-api/tests/integration/test_contributions_routes.py b/mpcontribs-api/tests/integration/test_contributions_routes.py index e78fdb2136..0b975ad5a8 100644 --- a/mpcontribs-api/tests/integration/test_contributions_routes.py +++ b/mpcontribs-api/tests/integration/test_contributions_routes.py @@ -1,10 +1,3 @@ -"""Integration tests for previously-untested /contributions routes. - -test_contributions.py covers GET list and DELETE batch plus stub-existence of -POST/PUT. This file covers the behavior of POST, PUT, the single-resource -routes, and download — all via AsyncMock repo/service overrides. -""" - import pytest from beanie import PydanticObjectId @@ -225,21 +218,13 @@ def test_invalid_fields_returns_422(self, client, contribution_repo): assert client.get("/api/v1/contributions/download/gz?_fields=not_a_field").status_code == 422 def test_filename_names_the_contributions_resource(self, client, contribution_repo): - """RED: the attachment filename should reference contributions, not attachments. - - The route hardcodes ``filename="attachments.jsonl.gz"`` (copy-paste from the - attachments router), so a contributions download saves under the wrong name. - """ + """The attachment filename references the contributions resource.""" contribution_repo.download_contributions.return_value = iter([b"x"]) cd = client.get("/api/v1/contributions/download/gz").headers["content-disposition"] assert "contributions" in cd def test_csv_filename_uses_csv_extension(self, client, contribution_repo): - """RED: a CSV download should be named *.csv.gz, not *.jsonl.gz. - - The filename extension is hardcoded to ``.jsonl.gz`` regardless of the - requested ``format``, so CSV downloads are mislabelled as JSONL. - """ + """A CSV download is named *.csv.gz, matching the requested format.""" contribution_repo.download_contributions.return_value = iter([b"x"]) cd = client.get("/api/v1/contributions/download/gz?format=csv").headers["content-disposition"] assert ".csv.gz" in cd diff --git a/mpcontribs-api/tests/integration/test_error_handlers.py b/mpcontribs-api/tests/integration/test_error_handlers.py index 63d83f09be..a092cec2ad 100644 --- a/mpcontribs-api/tests/integration/test_error_handlers.py +++ b/mpcontribs-api/tests/integration/test_error_handlers.py @@ -1,10 +1,3 @@ -"""Integration tests for exception handlers registered in app.py. - -Tests exercise the full HTTP cycle to verify that AppError subclasses and -framework errors (RequestValidationError, HTTPException) all produce the -uniform JSON envelope: {"error": {"code": "...", "message": "..."}}. -""" - import pytest from fastapi import FastAPI from fastapi.testclient import TestClient diff --git a/mpcontribs-api/tests/integration/test_healthcheck.py b/mpcontribs-api/tests/integration/test_healthcheck.py index 7dfc8bb0f9..cec2824171 100644 --- a/mpcontribs-api/tests/integration/test_healthcheck.py +++ b/mpcontribs-api/tests/integration/test_healthcheck.py @@ -1,12 +1,3 @@ -"""Integration tests for the /health router. - -The healthcheck router is mounted by create_app() at /health, but the shared -make_test_app() fixture only mounts the v1 router. So this module builds its -own minimal app that mounts the healthcheck router and overrides the DbDep -dependency with a mock whose admin.command("ping") can be made to succeed or -fail. -""" - from unittest.mock import AsyncMock, MagicMock import pytest diff --git a/mpcontribs-api/tests/integration/test_projects.py b/mpcontribs-api/tests/integration/test_projects.py index 571f91b81e..634a17e7cb 100644 --- a/mpcontribs-api/tests/integration/test_projects.py +++ b/mpcontribs-api/tests/integration/test_projects.py @@ -1,14 +1,3 @@ -"""Integration tests for /api/v1/projects routes. - -The project repository is overridden with an AsyncMock for each test so no -MongoDB connection is needed. Tests verify: - - HTTP status codes - - Response JSON shapes (Page envelope, ProjectOut fields) - - That the correct repository method is called - - That query parameters (_fields, pagination, filters) are forwarded - - Error handling (NotFoundError → 404, etc.) -""" - import pytest from mpcontribs_api.domains.projects.dependencies import get_scoped_projects diff --git a/mpcontribs-api/tests/unit/conftest.py b/mpcontribs-api/tests/unit/conftest.py index ab2b86c434..d730154a08 100644 --- a/mpcontribs-api/tests/unit/conftest.py +++ b/mpcontribs-api/tests/unit/conftest.py @@ -1,10 +1,3 @@ -"""Unit-test-only fixtures. - -The Beanie collection mock lives here (not the root conftest) so it is -applied only to unit tests and does not interfere with DB integration tests -that need real Beanie initialization. -""" - from unittest.mock import MagicMock, patch import pytest diff --git a/mpcontribs-api/tests/unit/domains/test_attachments_models.py b/mpcontribs-api/tests/unit/domains/test_attachments_models.py index 6f281c1a7a..1a0c82ebfc 100644 --- a/mpcontribs-api/tests/unit/domains/test_attachments_models.py +++ b/mpcontribs-api/tests/unit/domains/test_attachments_models.py @@ -1,5 +1,3 @@ -"""Unit tests for domains/attachments/models.py.""" - import pytest from beanie import PydanticObjectId from pydantic import ValidationError as PydanticValidationError diff --git a/mpcontribs-api/tests/unit/domains/test_contribution_service.py b/mpcontribs-api/tests/unit/domains/test_contribution_service.py index e1419e5e50..e2943e9412 100644 --- a/mpcontribs-api/tests/unit/domains/test_contribution_service.py +++ b/mpcontribs-api/tests/unit/domains/test_contribution_service.py @@ -1,12 +1,3 @@ -"""Unit tests for ContributionService. - -All database access is replaced with AsyncMock repositories so no MongoDB -connection is needed. These tests verify: - - insert_contributions: pre-checks, no-component fast path, per-contribution txn path, - partial-failure summary - - upsert_contributions: guard against components, insert vs update branching -""" - import asyncio from unittest.mock import AsyncMock, MagicMock diff --git a/mpcontribs-api/tests/unit/domains/test_shared_bulk.py b/mpcontribs-api/tests/unit/domains/test_shared_bulk.py index 46ad0b1646..32b900839c 100644 --- a/mpcontribs-api/tests/unit/domains/test_shared_bulk.py +++ b/mpcontribs-api/tests/unit/domains/test_shared_bulk.py @@ -1,5 +1,3 @@ -"""Unit tests for domains/_shared/bulk.py.""" - from beanie import PydanticObjectId from mpcontribs_api.domains._shared.bulk import ( diff --git a/mpcontribs-api/tests/unit/domains/test_shared_models.py b/mpcontribs-api/tests/unit/domains/test_shared_models.py index aaa267779f..0b67d8edd4 100644 --- a/mpcontribs-api/tests/unit/domains/test_shared_models.py +++ b/mpcontribs-api/tests/unit/domains/test_shared_models.py @@ -1,10 +1,3 @@ -"""Unit tests for domains/_shared/models.py. - -Uses Attachment as the concrete BaseDocumentWithInput subclass since it is the -simplest document in the codebase; from_input_model business-logic overrides -are covered per-domain (e.g. test_contributions_models.py). -""" - import pytest from beanie import PydanticObjectId from pymongo.results import DeleteResult diff --git a/mpcontribs-api/tests/unit/domains/test_shared_repository_download.py b/mpcontribs-api/tests/unit/domains/test_shared_repository_download.py index 622ae03593..857be36613 100644 --- a/mpcontribs-api/tests/unit/domains/test_shared_repository_download.py +++ b/mpcontribs-api/tests/unit/domains/test_shared_repository_download.py @@ -1,24 +1,3 @@ -"""Unit tests for the download/serialization core on MongoDbRepository. - -The download pipeline (``_serialize_jsonl``, ``_serialize_csv``, ``_get_serializer``, -``_hash_payload``, ``download``) had no direct coverage — only the route happy-path -was exercised via mocked repos. These tests drive a minimal concrete repository -subclass with a fake output model and a fake query so the serialization and gzip -streaming logic can be verified without a database. - -Several tests assert the *correct* behavior the pipeline should have and therefore -fail against the current implementation (red). Each is marked in its docstring with -the bug it pins: - - * download() never calls ``compressor.flush()`` -> the streamed gzip member is - truncated (missing trailing data + CRC/size footer), so it cannot be decompressed. - * ``_get_serializer`` has no fallback branch -> an unsupported format returns None - and the caller crashes with a TypeError instead of a clear error. - * ``_hash_payload`` calls ``json.dumps`` with no ``default=`` -> a filter carrying - an ObjectId/datetime raises TypeError before the download can even start. - * ``_serialize_csv`` writes Python ``repr`` for dict/nested values rather than JSON. -""" - import csv import gzip import io @@ -204,11 +183,11 @@ async def test_empty_input_yields_no_bytes(self): assert raw == b"" async def test_dict_value_serialized_as_json(self): - """RED: dict-valued columns should be emitted as JSON, not Python repr. + """Dict-valued columns are emitted as JSON, not Python repr. - ``model_dump(mode="json")`` leaves nested dicts as dict objects; csv then - writes ``str(dict)`` (single-quoted Python repr) which is not valid JSON and - cannot be round-tripped by consumers. The column should hold JSON instead. + ``model_dump(mode="json")`` leaves nested dicts as dict objects; the serializer + JSON-encodes them so the cell is valid JSON a consumer can round-trip (rather + than ``str(dict)``, the single-quoted Python repr). """ rows = [_OutWithData(name="r1", data={"k": "v", "n": 1})] raw = await _collect(MongoDbRepository._serialize_csv(_aiter(rows), None)) @@ -232,16 +211,15 @@ async def test_csv_serializer_is_callable_and_serializes(self): raw = await _collect(serializer(_aiter([_Out(a=1, b="x")]))) assert _parse_csv(raw) == [{"a": "1"}] - def test_unsupported_format_raises(self): - """RED: an unknown format should raise, not fall through returning None. + def test_enum_rejects_arbitrary_string(self): + """Arbitrary strings can't reach _get_serializer: the StrEnum rejects them. - Today ``_get_serializer`` has no else branch, so an unsupported value - returns None and the caller blows up with an opaque ``TypeError: 'NoneType' - object is not callable`` deep in ``download``. It should raise a clear error. + ``_get_serializer`` takes a ``DownloadFormat``, and the enum refuses any value + outside its members at construction time, so an unsupported format is stopped + at the type boundary rather than falling through to a None serializer. """ - repo = _repo() - with pytest.raises((ValueError, KeyError, NotImplementedError)): - repo._get_serializer("xml", None) # type: ignore[arg-type] + with pytest.raises(ValueError): + DownloadFormat("xml") # =========================================================================== @@ -270,11 +248,11 @@ def test_returns_sha256_hex(self): assert all(c in "0123456789abcdef" for c in digest) def test_object_id_filter_is_hashable(self): - """RED: filters carrying an ObjectId must hash without raising. + """Filters carrying an ObjectId hash without raising. ``download`` hashes ``filter.model_dump()`` which, for an ``id__in`` filter, - contains PydanticObjectId values. ``json.dumps`` without ``default=`` raises - ``TypeError`` on these, so any filtered download by id crashes before it starts. + contains PydanticObjectId values. ``_hash_payload`` passes ``default=str`` so + these stringify into a stable key instead of raising ``TypeError``. """ repo = _repo() payload = {"filter": {"id__in": [PydanticObjectId(), PydanticObjectId()]}} @@ -282,7 +260,7 @@ def test_object_id_filter_is_hashable(self): assert len(digest) == 64 def test_datetime_filter_is_hashable(self): - """RED: filters carrying a datetime must hash without raising (see above).""" + """Filters carrying a datetime hash without raising (see above).""" repo = _repo() payload = {"filter": {"created__gte": datetime(2024, 1, 1, tzinfo=timezone.utc)}} digest = repo._hash_payload(payload) @@ -296,12 +274,12 @@ def test_datetime_filter_is_hashable(self): class TestDownload: async def test_jsonl_stream_decompresses_to_rows(self): - """RED: the gzip stream must decompress cleanly. + """The gzip stream decompresses cleanly to the JSONL payload. - ``download`` builds a zlib gzip compressor but never calls ``flush()`` after - the final chunk, so the trailing buffered bytes and the gzip footer (CRC32 + - ISIZE) are never emitted. ``gzip.decompress`` therefore raises on the - truncated member. When fixed, the decompressed bytes equal the JSONL payload. + ``download`` flushes the zlib gzip compressor after the final chunk so the + trailing buffered bytes and the gzip footer (CRC32 + ISIZE) are emitted. + Regression guard: without the flush the member is truncated and + ``gzip.decompress`` raises. """ repo = _repo(_Out) filter = _FakeFilter(rows=[SimpleNamespace(a=1, b="x"), SimpleNamespace(a=2, b="y")]) @@ -318,7 +296,7 @@ async def test_jsonl_stream_decompresses_to_rows(self): assert parsed == [{"a": 1, "b": "x"}, {"a": 2, "b": "y"}] async def test_csv_stream_decompresses_to_rows(self): - """RED: same flush bug, exercised through the CSV serializer.""" + """Same gzip flush guard, exercised through the CSV serializer.""" repo = _repo(_Out) filter = _FakeFilter(rows=[SimpleNamespace(a=1, b="x"), SimpleNamespace(a=2, b="y")]) stream = repo.download( diff --git a/mpcontribs-api/tests/unit/domains/test_structures_models.py b/mpcontribs-api/tests/unit/domains/test_structures_models.py index 479aebf5bf..5e2744c019 100644 --- a/mpcontribs-api/tests/unit/domains/test_structures_models.py +++ b/mpcontribs-api/tests/unit/domains/test_structures_models.py @@ -1,5 +1,3 @@ -"""Unit tests for domains/structures/models.py.""" - import polars as pl import pytest from beanie import PydanticObjectId diff --git a/mpcontribs-api/tests/unit/domains/test_tables_models.py b/mpcontribs-api/tests/unit/domains/test_tables_models.py index 5a10b3f160..48804a0379 100644 --- a/mpcontribs-api/tests/unit/domains/test_tables_models.py +++ b/mpcontribs-api/tests/unit/domains/test_tables_models.py @@ -1,17 +1,3 @@ -"""Unit tests for domains/tables/models.py. - -NOTE ON RED TESTS: tables/models.py imports ``ValidationError`` from pydantic -and raises it with a plain string (``raise ValidationError("...")``). Pydantic -v2's ValidationError cannot be constructed that way, so every failing -validation path currently crashes with -``TypeError: ValidationError.__new__() missing 1 required positional argument`` -instead of raising a controlled error. The intended behavior — consistent with -domains/_shared/types.py and the 422 exception handler — is the domain -``mpcontribs_api.exceptions.ValidationError``. The tests in -TestTableInValidationFailures assert the intended behavior and are expected to -FAIL until the import in tables/models.py is fixed. -""" - import polars as pl import pytest from beanie import PydanticObjectId diff --git a/mpcontribs-api/tests/unit/test_config.py b/mpcontribs-api/tests/unit/test_config.py index e06f59edab..2c8c58f685 100644 --- a/mpcontribs-api/tests/unit/test_config.py +++ b/mpcontribs-api/tests/unit/test_config.py @@ -1,5 +1,3 @@ -"""Unit tests for config.py: MongoSettings clamping, Settings env loading, get_settings caching.""" - import pytest from pydantic import SecretStr from pydantic import ValidationError as PydanticValidationError diff --git a/mpcontribs-api/tests/unit/test_types_components.py b/mpcontribs-api/tests/unit/test_types_components.py index a0730f6b67..eb4308989c 100644 --- a/mpcontribs-api/tests/unit/test_types_components.py +++ b/mpcontribs-api/tests/unit/test_types_components.py @@ -1,10 +1,3 @@ -"""Unit tests for component-related shared types in domains/_shared/types.py. - -Covers FileLike, MD5Hash, MimeFormat, DownloadFormat, and the PolarsFrame -annotated type (coercion + serialization). ShortStr and PrefixedEmail are -covered in test_types.py. -""" - import polars as pl import pytest from pydantic import BaseModel, ConfigDict From b41a4203361352142b4e6a156d7473591f74ab4d Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 15 Jun 2026 15:09:27 -0700 Subject: [PATCH 125/591] Setup app to use aioboto3 and load defaults from env --- mpcontribs-api/pyproject.toml | 2 + mpcontribs-api/src/mpcontribs_api/app.py | 100 +++-- mpcontribs-api/src/mpcontribs_api/config.py | 19 + mpcontribs-api/uv.lock | 471 ++++++++++++++++++-- 4 files changed, 526 insertions(+), 66 deletions(-) diff --git a/mpcontribs-api/pyproject.toml b/mpcontribs-api/pyproject.toml index 3ff97de127..6366b03a84 100644 --- a/mpcontribs-api/pyproject.toml +++ b/mpcontribs-api/pyproject.toml @@ -47,6 +47,8 @@ dependencies = [ "opentelemetry-instrumentation-pymongo>=0.63b1", "beanie>=2.1.0", "fastapi-filter>=2.0.1", + "aioboto3>=15.5.0", + "types-aiobotocore[s3]>=3.7.0", ] [project.urls] diff --git a/mpcontribs-api/src/mpcontribs_api/app.py b/mpcontribs-api/src/mpcontribs_api/app.py index ca5cb8b588..7def06bc74 100644 --- a/mpcontribs-api/src/mpcontribs_api/app.py +++ b/mpcontribs-api/src/mpcontribs_api/app.py @@ -1,11 +1,15 @@ from __future__ import annotations from collections.abc import AsyncGenerator -from contextlib import asynccontextmanager +from contextlib import AbstractAsyncContextManager, AsyncExitStack, asynccontextmanager +from typing import cast +import aioboto3 from beanie import init_beanie +from botocore.config import Config from fastapi import Depends, FastAPI from pymongo import AsyncMongoClient +from types_aiobotocore_s3 import S3Client from mpcontribs_api._openapi import contact_info, license_info, openapi_tags from mpcontribs_api.api.v1.router import router as v1_router @@ -24,48 +28,66 @@ logger = get_logger(__name__) +async def _setup_mongo(app: FastAPI, settings: Settings, stack: AsyncExitStack) -> None: + """Setting up app-wide access to MongoDB via AsyncMongoClient and Beanie""" + client = AsyncMongoClient( + settings.mongo.uri.get_secret_value(), + appname=settings.mongo.app_name, + maxPoolSize=settings.mongo.max_pool_size, + minPoolSize=settings.mongo.min_pool_size, + maxIdleTimeMS=settings.mongo.max_idle_time_ms, + timeoutMS=settings.mongo.timeout_ms, + serverSelectionTimeoutMS=settings.mongo.server_selection_timeout_ms, + retryWrites=True, + retryReads=True, + compressors=settings.mongo.compressors, + readPreference=settings.mongo.read_preference, + uuidRepresentation="standard", + ) + # Fail fast if the DB is unreachable + await client.admin.command("ping") + logger.info("connected to mongo", extra={"db": settings.mongo.db_name}) + stack.push_async_callback(client.close) + + app.state.mongo_client = client + app.state.db = client[settings.mongo.db_name] + await init_beanie( + database=client[settings.mongo.db_name], + document_models=[ + Project, + Contribution, + Attachment, + Structure, + Table, + ], + ) + + +async def _setup_s3(app: FastAPI, settings: Settings, stack: AsyncExitStack) -> None: + """Setting up app-wide access to AWS S3 via aioboto3""" + session = aioboto3.Session() + cm = cast( + AbstractAsyncContextManager[S3Client], + session.client( + "s3", + region_name=settings.aws.region, + config=Config(max_pool_connections=settings.aws.max_pool_connections), + ), + ) + s3 = await stack.enter_async_context(cm) + app.state.boto_session = session + app.state.s3 = s3 + logger.info("connected to s3") + + def _build_lifespan(settings: Settings): @asynccontextmanager async def lifespan(app: FastAPI) -> AsyncGenerator[None]: - # --- startup --- - client = AsyncMongoClient( - settings.mongo.uri.get_secret_value(), - appname=settings.mongo.app_name, - maxPoolSize=settings.mongo.max_pool_size, - minPoolSize=settings.mongo.min_pool_size, - maxIdleTimeMS=settings.mongo.max_idle_time_ms, - timeoutMS=settings.mongo.timeout_ms, - serverSelectionTimeoutMS=settings.mongo.server_selection_timeout_ms, - retryWrites=True, - retryReads=True, - compressors=settings.mongo.compressors, - readPreference=settings.mongo.read_preference, - uuidRepresentation="standard", - ) - # Fail fast if the DB is unreachable - await client.admin.command("ping") - logger.info("connected to mongo", extra={"db": settings.mongo.db_name}) - - app.state.mongo_client = client - app.state.db = client[settings.mongo.db_name] - - await init_beanie( - database=client[settings.mongo.db_name], - document_models=[ - Project, - Contribution, - Attachment, - Structure, - Table, - ], - ) - - try: + async with AsyncExitStack() as stack: + await _setup_mongo(app, settings, stack) + await _setup_s3(app, settings, stack) yield - finally: - # shutdown - await client.close() - logger.info("mongo client closed") + # stack unwinds in reverse: s3 closed, then mongo return lifespan diff --git a/mpcontribs-api/src/mpcontribs_api/config.py b/mpcontribs-api/src/mpcontribs_api/config.py index b3891611ac..9d744c53b2 100644 --- a/mpcontribs-api/src/mpcontribs_api/config.py +++ b/mpcontribs-api/src/mpcontribs_api/config.py @@ -14,6 +14,19 @@ class KongSettings(BaseModel): gateway_secret: SecretStr +class AwsSettings(BaseModel): + """AWS Settings + + Primarily used for S3 access + """ + + region: str = Field("east1", description="The region to connect to") + max_pool_connections: int = Field( + 10, + description="The maximum number of connections the app is allowed to have to S3", + ) + + class MongoSettings(BaseModel): """MongoDB settings. @@ -111,10 +124,16 @@ class Settings(BaseSettings): environment: Literal["dev", "prod"] + # MPContribs_mongo__* mongo: MongoSettings + # MPContribs_aws__* + aws: AwsSettings + + # MPContribs_kong__* kong: KongSettings + # MPContribs_redis__* redis: RedisSettings # SMTP Settings diff --git a/mpcontribs-api/uv.lock b/mpcontribs-api/uv.lock index 328dc52913..b874098fbc 100644 --- a/mpcontribs-api/uv.lock +++ b/mpcontribs-api/uv.lock @@ -6,6 +6,139 @@ resolution-markers = [ "sys_platform != 'win32'", ] +[[package]] +name = "aioboto3" +version = "15.5.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "aiobotocore", extra = ["boto3"] }, + { name = "aiofiles" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/a2/01/92e9ab00f36e2899315f49eefcd5b4685fbb19016c7f19a9edf06da80bb0/aioboto3-15.5.0.tar.gz", hash = "sha256:ea8d8787d315594842fbfcf2c4dce3bac2ad61be275bc8584b2ce9a3402a6979", size = 255069, upload-time = "2025-10-30T13:37:16.122Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/e5/3e/e8f5b665bca646d43b916763c901e00a07e40f7746c9128bdc912a089424/aioboto3-15.5.0-py3-none-any.whl", hash = "sha256:cc880c4d6a8481dd7e05da89f41c384dbd841454fc1998ae25ca9c39201437a6", size = 35913, upload-time = "2025-10-30T13:37:14.549Z" }, +] + +[[package]] +name = "aiobotocore" +version = "2.25.1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "aiohttp" }, + { name = "aioitertools" }, + { name = "botocore" }, + { name = "jmespath" }, + { name = "multidict" }, + { name = "python-dateutil" }, + { name = "wrapt" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/62/94/2e4ec48cf1abb89971cb2612d86f979a6240520f0a659b53a43116d344dc/aiobotocore-2.25.1.tar.gz", hash = "sha256:ea9be739bfd7ece8864f072ec99bb9ed5c7e78ebb2b0b15f29781fbe02daedbc", size = 120560, upload-time = "2025-10-28T22:33:21.787Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/95/2a/d275ec4ce5cd0096665043995a7d76f5d0524853c76a3d04656de49f8808/aiobotocore-2.25.1-py3-none-any.whl", hash = "sha256:eb6daebe3cbef5b39a0bb2a97cffbe9c7cb46b2fcc399ad141f369f3c2134b1f", size = 86039, upload-time = "2025-10-28T22:33:19.949Z" }, +] + +[package.optional-dependencies] +boto3 = [ + { name = "boto3" }, +] + +[[package]] +name = "aiofiles" +version = "25.1.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/41/c3/534eac40372d8ee36ef40df62ec129bee4fdb5ad9706e58a29be53b2c970/aiofiles-25.1.0.tar.gz", hash = "sha256:a8d728f0a29de45dc521f18f07297428d56992a742f0cd2701ba86e44d23d5b2", size = 46354, upload-time = "2025-10-09T20:51:04.358Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/bc/8a/340a1555ae33d7354dbca4faa54948d76d89a27ceef032c8c3bc661d003e/aiofiles-25.1.0-py3-none-any.whl", hash = "sha256:abe311e527c862958650f9438e859c1fa7568a141b22abcd015e120e86a85695", size = 14668, upload-time = "2025-10-09T20:51:03.174Z" }, +] + +[[package]] +name = "aiohappyeyeballs" +version = "2.6.2" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/33/c6/61a2d7b7572279226bb2e7f61d7a19ca7c90da0329c93fa0d560cbf288d8/aiohappyeyeballs-2.6.2.tar.gz", hash = "sha256:e202810ee718bd01fc6ef49e8ea53d023d5cb6b581076d7925aa499fa55dbe64", size = 22591, upload-time = "2026-05-20T15:12:24.631Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/5f/fc/a7bf5b6e4e617b45f90f2d9d2a68519c249c81dd4fc2658c7a2a61c4f4b7/aiohappyeyeballs-2.6.2-py3-none-any.whl", hash = "sha256:4708045e2d7a6c6bdf8aafa8ed39649eaf926a4543b54560659129e3365953c4", size = 15062, upload-time = "2026-05-20T15:12:23.328Z" }, +] + +[[package]] +name = "aiohttp" +version = "3.14.1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "aiohappyeyeballs" }, + { name = "aiosignal" }, + { name = "attrs" }, + { name = "frozenlist" }, + { name = "multidict" }, + { name = "propcache" }, + { name = "yarl" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/82/78/8ea7308cac6934de8c74a14f3d5f65d1c89287426688be79538d0e5c013d/aiohttp-3.14.1.tar.gz", hash = "sha256:307f2cff90a764d329e77040603fa032db89c5c24fdad50c4c15334cba744035", size = 7955794, upload-time = "2026-06-07T21:09:35.529Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/c4/a1/5fafa04e1ca91ddb47608699d60649c1c6db3cf41c99e78fc4056f9513db/aiohttp-3.14.1-cp314-cp314-android_24_arm64_v8a.whl", hash = "sha256:7c106c26852ca1c2047c6b80384f17100b4e439af276f21ef3d4e2f450ae7e15", size = 508531, upload-time = "2026-06-07T21:08:02.093Z" }, + { url = "https://files.pythonhosted.org/packages/fa/2e/bfa02f699d87ffc86d5959270b28f1cb410add3ccaced8ed2e0b8a5238fc/aiohttp-3.14.1-cp314-cp314-android_24_x86_64.whl", hash = "sha256:20205f7f5ade7aaec9f4b500549bbc071b046453aed72f9c06dcab87896a83e8", size = 514718, upload-time = "2026-06-07T21:08:04.476Z" }, + { url = "https://files.pythonhosted.org/packages/85/a5/9594ad6289eebbc97d167c44213d557807f90e59115caad24de21ad2c3b1/aiohttp-3.14.1-cp314-cp314-ios_13_0_arm64_iphoneos.whl", hash = "sha256:62a759436b29e677181a9e76bab8b8f689a29cb9c535f45f7c48c9c830d3f8c3", size = 487918, upload-time = "2026-06-07T21:08:06.377Z" }, + { url = "https://files.pythonhosted.org/packages/b4/61/16a32c36c3c49edec122a3dc811f2057df2f94d3b14aa107c8017d981618/aiohttp-3.14.1-cp314-cp314-ios_13_0_arm64_iphonesimulator.whl", hash = "sha256:2964cbf553df4d7a57348da44d961d871895fc1ee4e8c322b2a95612c7b17fba", size = 494014, upload-time = "2026-06-07T21:08:08.263Z" }, + { url = "https://files.pythonhosted.org/packages/9b/89/3ebcf96ed99c05bec9c434aaac6963fd3cbab4a786ae739908a144d9ce44/aiohttp-3.14.1-cp314-cp314-ios_13_0_x86_64_iphonesimulator.whl", hash = "sha256:237651caadc3a59badd39319c54642b5299e9cc98a3a194310e55d5bb9f5e397", size = 502398, upload-time = "2026-06-07T21:08:10.244Z" }, + { url = "https://files.pythonhosted.org/packages/fd/3d/b74870a0c2d40c355928cd5b96c7a11fa821b8a40fc41365e64479b151fb/aiohttp-3.14.1-cp314-cp314-macosx_10_15_universal2.whl", hash = "sha256:896e12dfdbbab9d8f7e16d2b28c6769a60126fa92095d1ebf9473d02593a2448", size = 758018, upload-time = "2026-06-07T21:08:12.447Z" }, + { url = "https://files.pythonhosted.org/packages/d3/66/f42f5c984d99e49c6cff5f26f590750f2e2f7ef1fcfb99966ab5be1b632e/aiohttp-3.14.1-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:d03f281ed22579314ba00821ce20115a7c0ac430660b4cc05704a3f818b3e004", size = 512462, upload-time = "2026-06-07T21:08:14.624Z" }, + { url = "https://files.pythonhosted.org/packages/e9/a7/248e1aebe0c7810b0271e021a0f2a5eb6e78a051885b3c9df49f42a5802d/aiohttp-3.14.1-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:07eabb979d236335fed927e137a928c9adfb7df3b9ec7aa31726f133a62be983", size = 512824, upload-time = "2026-06-07T21:08:16.572Z" }, + { url = "https://files.pythonhosted.org/packages/26/97/2aa0e5ba0727dc3bd5aaebb7ccbc510f7dfb7fb961ec87497cd496635ab1/aiohttp-3.14.1-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:4fe1f1087cbadb280b5e1bb054a4f00d1423c74d6626c5e48400d871d34ecefe", size = 1749898, upload-time = "2026-06-07T21:08:18.635Z" }, + { url = "https://files.pythonhosted.org/packages/00/8d/e97f6c96c891d457c8479d92a514ba194d0412f981d72c70341ee18488ed/aiohttp-3.14.1-cp314-cp314-manylinux2014_armv7l.manylinux_2_17_armv7l.manylinux_2_31_armv7l.whl", hash = "sha256:367a9314fdc79dab0fac96e216cb41dd73c85bdca85306ce8999118ba7e0f333", size = 1710114, upload-time = "2026-06-07T21:08:20.892Z" }, + { url = "https://files.pythonhosted.org/packages/6f/e6/aa8d7e863048c8fceb5cd6ce74017311cec3ead07847387e12265fb4444e/aiohttp-3.14.1-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:a24f677ebe83749039e7bdf862ff0bbb16818ae4193d4ef96505e269375bcce0", size = 1802541, upload-time = "2026-06-07T21:08:23.044Z" }, + { url = "https://files.pythonhosted.org/packages/83/a8/72193137de57fda4ebfae4563182d082c8856e3b6e9871d0b46f028fb369/aiohttp-3.14.1-cp314-cp314-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:c83afe0ba876be7e943d2e0ba645809ad441575d2840c895c21ee5de93b9377a", size = 1875776, upload-time = "2026-06-07T21:08:25.288Z" }, + { url = "https://files.pythonhosted.org/packages/a0/18/938441025db6769a3464596b2410af3afde0b21eb2f204c6f766f68af4bd/aiohttp-3.14.1-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:634e385930fb6d2d479cf3aa66515955863b77a5e3c2b5894ca259a25b308602", size = 1760329, upload-time = "2026-06-07T21:08:27.363Z" }, + { url = "https://files.pythonhosted.org/packages/60/29/bf2496b4065e76e09fe48015aaffe5ce161d8f089b06ac6982070f653076/aiohttp-3.14.1-cp314-cp314-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:eeea07c4397bbc57719c4eed8f9c284874d4f175f9b6d57f7a1546b976d455ca", size = 1587293, upload-time = "2026-06-07T21:08:29.805Z" }, + { url = "https://files.pythonhosted.org/packages/49/a2/2136674d52123b1354bd05dd5753c318db47dc0c927cc70b27bab3755456/aiohttp-3.14.1-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:335c0cc3e3545ce98dcb9cfcb836f40c3411f43fa03dab757597d80c89af8a35", size = 1714756, upload-time = "2026-06-07T21:08:32.094Z" }, + { url = "https://files.pythonhosted.org/packages/a7/b9/e5fd2e6f915503081c0f9b1e8540947037929c70c191da2e4d54b31a21a1/aiohttp-3.14.1-cp314-cp314-musllinux_1_2_armv7l.whl", hash = "sha256:ae6be797afdef264e8a84864a85b196ca06045586481b3df8a967322fd2fa844", size = 1721052, upload-time = "2026-06-07T21:08:34.167Z" }, + { url = "https://files.pythonhosted.org/packages/63/5a/2833e324a2263e104e31e2e91bc5bbee81bc499afd32203faee048a883f0/aiohttp-3.14.1-cp314-cp314-musllinux_1_2_ppc64le.whl", hash = "sha256:8560b4d712474335d08907db7973f71912d3a9a8f1dee992ec06b5d2fe359496", size = 1766888, upload-time = "2026-06-07T21:08:36.95Z" }, + { url = "https://files.pythonhosted.org/packages/57/fa/dea6511870913162f3b2e8c42a7614eb203a4540b8c2da43e0bfb0548f3c/aiohttp-3.14.1-cp314-cp314-musllinux_1_2_riscv64.whl", hash = "sha256:2b7edd08e0a5deb1e8564a2fcd8f4561014a3f05252334671bbf55ddd47db0e5", size = 1581679, upload-time = "2026-06-07T21:08:39.292Z" }, + { url = "https://files.pythonhosted.org/packages/14/bd/3cf0d55e71784b33534e9710a67d382d900598b4787fbce6cc7317f8c42a/aiohttp-3.14.1-cp314-cp314-musllinux_1_2_s390x.whl", hash = "sha256:b6ff7fcee63287ae57b5df3e4f5957ce032122802509246dec1a5bcc55904c95", size = 1782021, upload-time = "2026-06-07T21:08:41.407Z" }, + { url = "https://files.pythonhosted.org/packages/c1/af/14bb5843eccbe234f4dfb78ab73e549d99727247e62ae5d62cbd22eaf5b0/aiohttp-3.14.1-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:6ffbb2f4ec1ceaff7e07d43922954da26b223d188bf30658e561b98e23089444", size = 1742574, upload-time = "2026-06-07T21:08:43.795Z" }, + { url = "https://files.pythonhosted.org/packages/f2/1e/fbeb7af9210a67ac0f9c9bec0f8f4568497924e33137a3d5b48e1cf85f3f/aiohttp-3.14.1-cp314-cp314-win32.whl", hash = "sha256:a9875b46d910cff3ea2f5962f9d266b465459fe634e22556ab9bd6fc1192eea0", size = 457773, upload-time = "2026-06-07T21:08:46.168Z" }, + { url = "https://files.pythonhosted.org/packages/f0/2b/13e8d741a9ec5db7d900c060554cf8352ab85e44e2a4469ebb9d377bda17/aiohttp-3.14.1-cp314-cp314-win_amd64.whl", hash = "sha256:af8b4b81a960eeaf1234971ac3cd0ba5901f3cd42eae42a46b4d089a8b492719", size = 485001, upload-time = "2026-06-07T21:08:48.401Z" }, + { url = "https://files.pythonhosted.org/packages/df/30/491acfa2c4d6c3ff59c49a14fc1b50be3241e25bbb0c84c09e2da4d11395/aiohttp-3.14.1-cp314-cp314-win_arm64.whl", hash = "sha256:cf4491381b1b57425c315a56a439251b1bdac07b2275f19a8c44bc57744532ec", size = 453809, upload-time = "2026-06-07T21:08:50.7Z" }, + { url = "https://files.pythonhosted.org/packages/34/e3/19dbe1a1f4cc6230eb9e314de7fe68053b0992f9302b27d12141a0b5db53/aiohttp-3.14.1-cp314-cp314t-macosx_10_15_universal2.whl", hash = "sha256:819c054312f1af92947e6a55883d1b66feefab11531a7fc45e0fb9b63880b5c2", size = 793320, upload-time = "2026-06-07T21:08:52.775Z" }, + { url = "https://files.pythonhosted.org/packages/7f/20/1b7182219ba1b108430d6e4dc53d25ae02dcfcf5a045b33af4e8c5167527/aiohttp-3.14.1-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:10ee9c1753a8f706345b22496c79fbddb5be0599e0823f3738b1534058e25340", size = 529077, upload-time = "2026-06-07T21:08:55Z" }, + { url = "https://files.pythonhosted.org/packages/b9/c8/14ce60ec31a2e5f5274bb17d383a6f7a3aabca31ac04eee05585bbadab16/aiohttp-3.14.1-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:1601cc37baf5750ccacae618ec2daf020769581695550e3b654a911f859c563d", size = 532476, upload-time = "2026-06-07T21:08:57.176Z" }, + { url = "https://files.pythonhosted.org/packages/7e/02/9ac85e081e53da2e061b02fa7758fe0a12d17b8ce2d1f5e6c7cb76730328/aiohttp-3.14.1-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:4d6e0ac9da31c9c04c84e1c0182ad8d6df35965a85cae29cd71d089621b3ae94", size = 1922347, upload-time = "2026-06-07T21:08:59.563Z" }, + { url = "https://files.pythonhosted.org/packages/c0/3e/d3ba07a0ab38b5389e10bec4362d21e10a4f667cba2d79ba30837b3a5059/aiohttp-3.14.1-cp314-cp314t-manylinux2014_armv7l.manylinux_2_17_armv7l.manylinux_2_31_armv7l.whl", hash = "sha256:9e8f2d660c350b3d0e259c7a7e3d9b7fc8b41210cbcc3d4a7076ff0a5e5c2fdc", size = 1786465, upload-time = "2026-06-07T21:09:01.909Z" }, + { url = "https://files.pythonhosted.org/packages/0b/cb/e2ee978a00cfb2df829704a69528b18154eba5939f45bc1efa8f33aee4c5/aiohttp-3.14.1-cp314-cp314t-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:4691802dda97be727f79d86818acaad7eb8e9252626a1d6b519fedbb92d5e251", size = 1909423, upload-time = "2026-06-07T21:09:04.357Z" }, + { url = "https://files.pythonhosted.org/packages/73/5d/1430334858b1022b58ae50399a918f0bd6fe8fa7fa183598d657ff61e040/aiohttp-3.14.1-cp314-cp314t-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:c389c482a7e9b9dc3ee2701ac46c4125297a3818875b9c305ddb603c04828fd1", size = 2001906, upload-time = "2026-06-07T21:09:06.722Z" }, + { url = "https://files.pythonhosted.org/packages/66/4e/560c7472d3d198a23aa5c8b19a5115bf6a9b77b7d3e4bb363da320430ad2/aiohttp-3.14.1-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:fc0cacab7ba4e56f0f81c82a98c09bed2f39c940107b03a34b168bdf7597edd3", size = 1877095, upload-time = "2026-06-07T21:09:09.011Z" }, + { url = "https://files.pythonhosted.org/packages/0d/f1/4745806578d447db4a784a8591e2dae3afdfc2bcb96f8f81271b13df6543/aiohttp-3.14.1-cp314-cp314t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:979ed4717f59b8bb12e3963378fa285d93d367e15bcd66c721311826d3c44a6c", size = 1676222, upload-time = "2026-06-07T21:09:11.461Z" }, + { url = "https://files.pythonhosted.org/packages/6a/c9/48255813cca749a229ef0ab476004ec623728ad79a9c0840616f6c076325/aiohttp-3.14.1-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:38e1e7daaea81df51c952e18483f323d878499a1e2bfe564790e0f9701d6f203", size = 1842922, upload-time = "2026-06-07T21:09:14.118Z" }, + { url = "https://files.pythonhosted.org/packages/3d/c0/bbd054e2bee909f529523a5af3891052606af5143c09f5f183ec3b234676/aiohttp-3.14.1-cp314-cp314t-musllinux_1_2_armv7l.whl", hash = "sha256:4132e72c608fe9fecb8f409113567605915b83e9bdd3ea56538d2f9cd35002f1", size = 1825035, upload-time = "2026-06-07T21:09:16.447Z" }, + { url = "https://files.pythonhosted.org/packages/a8/ae/90395d4376deceb74e09ec26b6adf7d2015a6f8802d6d84446af860fef04/aiohttp-3.14.1-cp314-cp314t-musllinux_1_2_ppc64le.whl", hash = "sha256:eefd9cc9b6d4a2db5f00a26bc3e4f9acf71926a6ec557cd56c9c6f27c290b665", size = 1849512, upload-time = "2026-06-07T21:09:18.742Z" }, + { url = "https://files.pythonhosted.org/packages/93/bd/fb25f3049957553d4ce0ba6ae480aa2f592a6985497fca590837d16c1be0/aiohttp-3.14.1-cp314-cp314t-musllinux_1_2_riscv64.whl", hash = "sha256:b165790117eea512d7f3fb22f1f6dad3d55a7189571993eb015591c1401276d1", size = 1668571, upload-time = "2026-06-07T21:09:21.458Z" }, + { url = "https://files.pythonhosted.org/packages/3f/22/7f73303d64dd567ff3addca90b556690ed1233a47b8f55d242fb90af3681/aiohttp-3.14.1-cp314-cp314t-musllinux_1_2_s390x.whl", hash = "sha256:ed09c7eb1c391271c2ed0314a51903e72a3acb653d5ccfc264cdf3ef11f8269d", size = 1881159, upload-time = "2026-06-07T21:09:23.813Z" }, + { url = "https://files.pythonhosted.org/packages/44/be/0474c5a8b5640e1e4aa1923430a91f4151be82e511373fe764189b89aef5/aiohttp-3.14.1-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:99abd37084b82f5830c635fddd0b4993b9742a66eb746dacf433c8590e8f9e3c", size = 1841409, upload-time = "2026-06-07T21:09:26.207Z" }, + { url = "https://files.pythonhosted.org/packages/7b/3c/bb4a7cba26956cb3da4553cc2056cf67be5b5ff6e6d8fa4fbdff73bfb7ae/aiohttp-3.14.1-cp314-cp314t-win32.whl", hash = "sha256:47ddf841cdecc810749921d25606dee45857d12d2ad5ddb7b5bd7eab12e4b365", size = 494166, upload-time = "2026-06-07T21:09:28.505Z" }, + { url = "https://files.pythonhosted.org/packages/8a/84/ec80c2c1f66a952555a9f86df6b33af65108a6febfa0471b69013a12f807/aiohttp-3.14.1-cp314-cp314t-win_amd64.whl", hash = "sha256:5e78b522b7a6e27e0b25d19b247b75039ac4c94f99823e3c9e53ae1603a9f7e9", size = 530255, upload-time = "2026-06-07T21:09:30.843Z" }, + { url = "https://files.pythonhosted.org/packages/2a/71/6e22be134a4061ada85a92951b842f2657f17d926b727f3f94c56ae963d6/aiohttp-3.14.1-cp314-cp314t-win_arm64.whl", hash = "sha256:90d53f1609c29ccc2193945ef732428382a28f78d0456ae4d3daf0d48b74f0f6", size = 469640, upload-time = "2026-06-07T21:09:33.028Z" }, +] + +[[package]] +name = "aioitertools" +version = "0.13.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/fd/3c/53c4a17a05fb9ea2313ee1777ff53f5e001aefd5cc85aa2f4c2d982e1e38/aioitertools-0.13.0.tar.gz", hash = "sha256:620bd241acc0bbb9ec819f1ab215866871b4bbd1f73836a55f799200ee86950c", size = 19322, upload-time = "2025-11-06T22:17:07.609Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/10/a1/510b0a7fadc6f43a6ce50152e69dbd86415240835868bb0bd9b5b88b1e06/aioitertools-0.13.0-py3-none-any.whl", hash = "sha256:0be0292b856f08dfac90e31f4739432f4cb6d7520ab9eb73e143f4f2fa5259be", size = 24182, upload-time = "2025-11-06T22:17:06.502Z" }, +] + +[[package]] +name = "aiosignal" +version = "1.4.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "frozenlist" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/61/62/06741b579156360248d1ec624842ad0edf697050bbaf7c3e46394e106ad1/aiosignal-1.4.0.tar.gz", hash = "sha256:f47eecd9468083c2029cc99945502cb7708b082c232f9aca65da147157b251c7", size = 25007, upload-time = "2025-07-03T22:54:43.528Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/fb/76/641ae371508676492379f16e2fa48f4e2c11741bd63c48be4b12a6b09cba/aiosignal-1.4.0-py3-none-any.whl", hash = "sha256:053243f8b92b990551949e63930a839ff0cf0b0ebbe0597b0f3fb19e1a0fe82e", size = 7490, upload-time = "2025-07-03T22:54:42.156Z" }, +] + [[package]] name = "annotated-doc" version = "0.0.4" @@ -45,6 +178,15 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/5c/0a/a72d10ed65068e115044937873362e6e32fab1b7dce0046aeb224682c989/asgiref-3.11.1-py3-none-any.whl", hash = "sha256:e8667a091e69529631969fd45dc268fa79b99c92c5fcdda727757e52146ec133", size = 24345, upload-time = "2026-02-03T13:30:13.039Z" }, ] +[[package]] +name = "attrs" +version = "26.1.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/9a/8e/82a0fe20a541c03148528be8cac2408564a6c9a0cc7e9171802bc1d26985/attrs-26.1.0.tar.gz", hash = "sha256:d03ceb89cb322a8fd706d4fb91940737b6642aa36998fe130a9bc96c985eff32", size = 952055, upload-time = "2026-03-19T14:22:25.026Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/64/b4/17d4b0b2a2dc85a6df63d1157e028ed19f90d4cd97c36717afef2bc2f395/attrs-26.1.0-py3-none-any.whl", hash = "sha256:c647aa4a12dfbad9333ca4e71fe62ddc36f4e63b2d260a37a8b83d2f043ac309", size = 67548, upload-time = "2026-03-19T14:22:23.645Z" }, +] + [[package]] name = "basedpyright" version = "1.39.6" @@ -82,6 +224,46 @@ dependencies = [ ] sdist = { url = "https://files.pythonhosted.org/packages/44/1c/577d3ce406e88f370e80a6ebf76ae52a2866521e0b585e8ec612759894f1/bibtexparser-1.4.4.tar.gz", hash = "sha256:093b6c824f7a71d3a748867c4057b71f77c55b8dbc07efc993b781771520d8fb", size = 55594, upload-time = "2026-01-29T18:58:01.366Z" } +[[package]] +name = "boto3" +version = "1.40.61" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "botocore" }, + { name = "jmespath" }, + { name = "s3transfer" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/ed/f9/6ef8feb52c3cce5ec3967a535a6114b57ac7949fd166b0f3090c2b06e4e5/boto3-1.40.61.tar.gz", hash = "sha256:d6c56277251adf6c2bdd25249feae625abe4966831676689ff23b4694dea5b12", size = 111535, upload-time = "2025-10-28T19:26:57.247Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/61/24/3bf865b07d15fea85b63504856e137029b6acbc73762496064219cdb265d/boto3-1.40.61-py3-none-any.whl", hash = "sha256:6b9c57b2a922b5d8c17766e29ed792586a818098efe84def27c8f582b33f898c", size = 139321, upload-time = "2025-10-28T19:26:55.007Z" }, +] + +[[package]] +name = "botocore" +version = "1.40.61" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "jmespath" }, + { name = "python-dateutil" }, + { name = "urllib3" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/28/a3/81d3a47c2dbfd76f185d3b894f2ad01a75096c006a2dd91f237dca182188/botocore-1.40.61.tar.gz", hash = "sha256:a2487ad69b090f9cccd64cf07c7021cd80ee9c0655ad974f87045b02f3ef52cd", size = 14393956, upload-time = "2025-10-28T19:26:46.108Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/38/c5/f6ce561004db45f0b847c2cd9b19c67c6bf348a82018a48cb718be6b58b0/botocore-1.40.61-py3-none-any.whl", hash = "sha256:17ebae412692fd4824f99cde0f08d50126dc97954008e5ba2b522eb049238aa7", size = 14055973, upload-time = "2025-10-28T19:26:42.15Z" }, +] + +[[package]] +name = "botocore-stubs" +version = "1.43.14" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "types-awscrt" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/7f/81/79693e833291c00dc89ee610e5e915381b6f08233912e28df50106840780/botocore_stubs-1.43.14.tar.gz", hash = "sha256:9e3bc1fdd51da7473f0df726c82747a1b0ae913449d629659765c247fecc2039", size = 42738, upload-time = "2026-05-25T06:06:37.484Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/89/ca/f017727b11895908c5dedc829cf2ec35e0c4b2a26ba875db325fef2cefdf/botocore_stubs-1.43.14-py3-none-any.whl", hash = "sha256:fb98f1475c92fd718644e786b5c543a20f1b1f610e89e0a7191c3f1f429c75aa", size = 67093, upload-time = "2026-05-25T06:06:34.532Z" }, +] + [[package]] name = "certifi" version = "2026.5.20" @@ -382,6 +564,47 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/2c/47/c99d5268f354002ce80f8d029cd9d7d872969da1de8b93d32de4dc56d6f4/fonttools-4.63.0-py3-none-any.whl", hash = "sha256:445af2eab030a16b9171ea8bdda7ebf7d96bda2df88ee182a464252f6e05e20d", size = 1164562, upload-time = "2026-05-14T12:04:29.092Z" }, ] +[[package]] +name = "frozenlist" +version = "1.8.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/2d/f5/c831fac6cc817d26fd54c7eaccd04ef7e0288806943f7cc5bbf69f3ac1f0/frozenlist-1.8.0.tar.gz", hash = "sha256:3ede829ed8d842f6cd48fc7081d7a41001a56f1f38603f9d49bf3020d59a31ad", size = 45875, upload-time = "2025-10-06T05:38:17.865Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/f1/c8/85da824b7e7b9b6e7f7705b2ecaf9591ba6f79c1177f324c2735e41d36a2/frozenlist-1.8.0-cp314-cp314-macosx_10_13_universal2.whl", hash = "sha256:cee686f1f4cadeb2136007ddedd0aaf928ab95216e7691c63e50a8ec066336d0", size = 86127, upload-time = "2025-10-06T05:37:08.438Z" }, + { url = "https://files.pythonhosted.org/packages/8e/e8/a1185e236ec66c20afd72399522f142c3724c785789255202d27ae992818/frozenlist-1.8.0-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:119fb2a1bd47307e899c2fac7f28e85b9a543864df47aa7ec9d3c1b4545f096f", size = 49698, upload-time = "2025-10-06T05:37:09.48Z" }, + { url = "https://files.pythonhosted.org/packages/a1/93/72b1736d68f03fda5fdf0f2180fb6caaae3894f1b854d006ac61ecc727ee/frozenlist-1.8.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:4970ece02dbc8c3a92fcc5228e36a3e933a01a999f7094ff7c23fbd2beeaa67c", size = 49749, upload-time = "2025-10-06T05:37:10.569Z" }, + { url = "https://files.pythonhosted.org/packages/a7/b2/fabede9fafd976b991e9f1b9c8c873ed86f202889b864756f240ce6dd855/frozenlist-1.8.0-cp314-cp314-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:cba69cb73723c3f329622e34bdbf5ce1f80c21c290ff04256cff1cd3c2036ed2", size = 231298, upload-time = "2025-10-06T05:37:11.993Z" }, + { url = "https://files.pythonhosted.org/packages/3a/3b/d9b1e0b0eed36e70477ffb8360c49c85c8ca8ef9700a4e6711f39a6e8b45/frozenlist-1.8.0-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:778a11b15673f6f1df23d9586f83c4846c471a8af693a22e066508b77d201ec8", size = 232015, upload-time = "2025-10-06T05:37:13.194Z" }, + { url = "https://files.pythonhosted.org/packages/dc/94/be719d2766c1138148564a3960fc2c06eb688da592bdc25adcf856101be7/frozenlist-1.8.0-cp314-cp314-manylinux2014_armv7l.manylinux_2_17_armv7l.manylinux_2_31_armv7l.whl", hash = "sha256:0325024fe97f94c41c08872db482cf8ac4800d80e79222c6b0b7b162d5b13686", size = 225038, upload-time = "2025-10-06T05:37:14.577Z" }, + { url = "https://files.pythonhosted.org/packages/e4/09/6712b6c5465f083f52f50cf74167b92d4ea2f50e46a9eea0523d658454ae/frozenlist-1.8.0-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:97260ff46b207a82a7567b581ab4190bd4dfa09f4db8a8b49d1a958f6aa4940e", size = 240130, upload-time = "2025-10-06T05:37:15.781Z" }, + { url = "https://files.pythonhosted.org/packages/f8/d4/cd065cdcf21550b54f3ce6a22e143ac9e4836ca42a0de1022da8498eac89/frozenlist-1.8.0-cp314-cp314-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:54b2077180eb7f83dd52c40b2750d0a9f175e06a42e3213ce047219de902717a", size = 242845, upload-time = "2025-10-06T05:37:17.037Z" }, + { url = "https://files.pythonhosted.org/packages/62/c3/f57a5c8c70cd1ead3d5d5f776f89d33110b1addae0ab010ad774d9a44fb9/frozenlist-1.8.0-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:2f05983daecab868a31e1da44462873306d3cbfd76d1f0b5b69c473d21dbb128", size = 229131, upload-time = "2025-10-06T05:37:18.221Z" }, + { url = "https://files.pythonhosted.org/packages/6c/52/232476fe9cb64f0742f3fde2b7d26c1dac18b6d62071c74d4ded55e0ef94/frozenlist-1.8.0-cp314-cp314-musllinux_1_2_armv7l.whl", hash = "sha256:33f48f51a446114bc5d251fb2954ab0164d5be02ad3382abcbfe07e2531d650f", size = 240542, upload-time = "2025-10-06T05:37:19.771Z" }, + { url = "https://files.pythonhosted.org/packages/5f/85/07bf3f5d0fb5414aee5f47d33c6f5c77bfe49aac680bfece33d4fdf6a246/frozenlist-1.8.0-cp314-cp314-musllinux_1_2_ppc64le.whl", hash = "sha256:154e55ec0655291b5dd1b8731c637ecdb50975a2ae70c606d100750a540082f7", size = 237308, upload-time = "2025-10-06T05:37:20.969Z" }, + { url = "https://files.pythonhosted.org/packages/11/99/ae3a33d5befd41ac0ca2cc7fd3aa707c9c324de2e89db0e0f45db9a64c26/frozenlist-1.8.0-cp314-cp314-musllinux_1_2_s390x.whl", hash = "sha256:4314debad13beb564b708b4a496020e5306c7333fa9a3ab90374169a20ffab30", size = 238210, upload-time = "2025-10-06T05:37:22.252Z" }, + { url = "https://files.pythonhosted.org/packages/b2/60/b1d2da22f4970e7a155f0adde9b1435712ece01b3cd45ba63702aea33938/frozenlist-1.8.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:073f8bf8becba60aa931eb3bc420b217bb7d5b8f4750e6f8b3be7f3da85d38b7", size = 231972, upload-time = "2025-10-06T05:37:23.5Z" }, + { url = "https://files.pythonhosted.org/packages/3f/ab/945b2f32de889993b9c9133216c068b7fcf257d8595a0ac420ac8677cab0/frozenlist-1.8.0-cp314-cp314-win32.whl", hash = "sha256:bac9c42ba2ac65ddc115d930c78d24ab8d4f465fd3fc473cdedfccadb9429806", size = 40536, upload-time = "2025-10-06T05:37:25.581Z" }, + { url = "https://files.pythonhosted.org/packages/59/ad/9caa9b9c836d9ad6f067157a531ac48b7d36499f5036d4141ce78c230b1b/frozenlist-1.8.0-cp314-cp314-win_amd64.whl", hash = "sha256:3e0761f4d1a44f1d1a47996511752cf3dcec5bbdd9cc2b4fe595caf97754b7a0", size = 44330, upload-time = "2025-10-06T05:37:26.928Z" }, + { url = "https://files.pythonhosted.org/packages/82/13/e6950121764f2676f43534c555249f57030150260aee9dcf7d64efda11dd/frozenlist-1.8.0-cp314-cp314-win_arm64.whl", hash = "sha256:d1eaff1d00c7751b7c6662e9c5ba6eb2c17a2306ba5e2a37f24ddf3cc953402b", size = 40627, upload-time = "2025-10-06T05:37:28.075Z" }, + { url = "https://files.pythonhosted.org/packages/c0/c7/43200656ecc4e02d3f8bc248df68256cd9572b3f0017f0a0c4e93440ae23/frozenlist-1.8.0-cp314-cp314t-macosx_10_13_universal2.whl", hash = "sha256:d3bb933317c52d7ea5004a1c442eef86f426886fba134ef8cf4226ea6ee1821d", size = 89238, upload-time = "2025-10-06T05:37:29.373Z" }, + { url = "https://files.pythonhosted.org/packages/d1/29/55c5f0689b9c0fb765055629f472c0de484dcaf0acee2f7707266ae3583c/frozenlist-1.8.0-cp314-cp314t-macosx_10_13_x86_64.whl", hash = "sha256:8009897cdef112072f93a0efdce29cd819e717fd2f649ee3016efd3cd885a7ed", size = 50738, upload-time = "2025-10-06T05:37:30.792Z" }, + { url = "https://files.pythonhosted.org/packages/ba/7d/b7282a445956506fa11da8c2db7d276adcbf2b17d8bb8407a47685263f90/frozenlist-1.8.0-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:2c5dcbbc55383e5883246d11fd179782a9d07a986c40f49abe89ddf865913930", size = 51739, upload-time = "2025-10-06T05:37:32.127Z" }, + { url = "https://files.pythonhosted.org/packages/62/1c/3d8622e60d0b767a5510d1d3cf21065b9db874696a51ea6d7a43180a259c/frozenlist-1.8.0-cp314-cp314t-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:39ecbc32f1390387d2aa4f5a995e465e9e2f79ba3adcac92d68e3e0afae6657c", size = 284186, upload-time = "2025-10-06T05:37:33.21Z" }, + { url = "https://files.pythonhosted.org/packages/2d/14/aa36d5f85a89679a85a1d44cd7a6657e0b1c75f61e7cad987b203d2daca8/frozenlist-1.8.0-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:92db2bf818d5cc8d9c1f1fc56b897662e24ea5adb36ad1f1d82875bd64e03c24", size = 292196, upload-time = "2025-10-06T05:37:36.107Z" }, + { url = "https://files.pythonhosted.org/packages/05/23/6bde59eb55abd407d34f77d39a5126fb7b4f109a3f611d3929f14b700c66/frozenlist-1.8.0-cp314-cp314t-manylinux2014_armv7l.manylinux_2_17_armv7l.manylinux_2_31_armv7l.whl", hash = "sha256:2dc43a022e555de94c3b68a4ef0b11c4f747d12c024a520c7101709a2144fb37", size = 273830, upload-time = "2025-10-06T05:37:37.663Z" }, + { url = "https://files.pythonhosted.org/packages/d2/3f/22cff331bfad7a8afa616289000ba793347fcd7bc275f3b28ecea2a27909/frozenlist-1.8.0-cp314-cp314t-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:cb89a7f2de3602cfed448095bab3f178399646ab7c61454315089787df07733a", size = 294289, upload-time = "2025-10-06T05:37:39.261Z" }, + { url = "https://files.pythonhosted.org/packages/a4/89/5b057c799de4838b6c69aa82b79705f2027615e01be996d2486a69ca99c4/frozenlist-1.8.0-cp314-cp314t-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:33139dc858c580ea50e7e60a1b0ea003efa1fd42e6ec7fdbad78fff65fad2fd2", size = 300318, upload-time = "2025-10-06T05:37:43.213Z" }, + { url = "https://files.pythonhosted.org/packages/30/de/2c22ab3eb2a8af6d69dc799e48455813bab3690c760de58e1bf43b36da3e/frozenlist-1.8.0-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:168c0969a329b416119507ba30b9ea13688fafffac1b7822802537569a1cb0ef", size = 282814, upload-time = "2025-10-06T05:37:45.337Z" }, + { url = "https://files.pythonhosted.org/packages/59/f7/970141a6a8dbd7f556d94977858cfb36fa9b66e0892c6dd780d2219d8cd8/frozenlist-1.8.0-cp314-cp314t-musllinux_1_2_armv7l.whl", hash = "sha256:28bd570e8e189d7f7b001966435f9dac6718324b5be2990ac496cf1ea9ddb7fe", size = 291762, upload-time = "2025-10-06T05:37:46.657Z" }, + { url = "https://files.pythonhosted.org/packages/c1/15/ca1adae83a719f82df9116d66f5bb28bb95557b3951903d39135620ef157/frozenlist-1.8.0-cp314-cp314t-musllinux_1_2_ppc64le.whl", hash = "sha256:b2a095d45c5d46e5e79ba1e5b9cb787f541a8dee0433836cea4b96a2c439dcd8", size = 289470, upload-time = "2025-10-06T05:37:47.946Z" }, + { url = "https://files.pythonhosted.org/packages/ac/83/dca6dc53bf657d371fbc88ddeb21b79891e747189c5de990b9dfff2ccba1/frozenlist-1.8.0-cp314-cp314t-musllinux_1_2_s390x.whl", hash = "sha256:eab8145831a0d56ec9c4139b6c3e594c7a83c2c8be25d5bcf2d86136a532287a", size = 289042, upload-time = "2025-10-06T05:37:49.499Z" }, + { url = "https://files.pythonhosted.org/packages/96/52/abddd34ca99be142f354398700536c5bd315880ed0a213812bc491cff5e4/frozenlist-1.8.0-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:974b28cf63cc99dfb2188d8d222bc6843656188164848c4f679e63dae4b0708e", size = 283148, upload-time = "2025-10-06T05:37:50.745Z" }, + { url = "https://files.pythonhosted.org/packages/af/d3/76bd4ed4317e7119c2b7f57c3f6934aba26d277acc6309f873341640e21f/frozenlist-1.8.0-cp314-cp314t-win32.whl", hash = "sha256:342c97bf697ac5480c0a7ec73cd700ecfa5a8a40ac923bd035484616efecc2df", size = 44676, upload-time = "2025-10-06T05:37:52.222Z" }, + { url = "https://files.pythonhosted.org/packages/89/76/c615883b7b521ead2944bb3480398cbb07e12b7b4e4d073d3752eb721558/frozenlist-1.8.0-cp314-cp314t-win_amd64.whl", hash = "sha256:06be8f67f39c8b1dc671f5d83aaefd3358ae5cdcf8314552c57e7ed3e6475bdd", size = 49451, upload-time = "2025-10-06T05:37:53.425Z" }, + { url = "https://files.pythonhosted.org/packages/e0/a3/5982da14e113d07b325230f95060e2169f5311b1017ea8af2a29b374c289/frozenlist-1.8.0-cp314-cp314t-win_arm64.whl", hash = "sha256:102e6314ca4da683dca92e3b1355490fed5f313b768500084fbe6371fddfdb79", size = 42507, upload-time = "2025-10-06T05:37:54.513Z" }, + { url = "https://files.pythonhosted.org/packages/9a/9a/e35b4a917281c0b8419d4207f4334c8e8c5dbf4f3f5f9ada73958d937dcc/frozenlist-1.8.0-py3-none-any.whl", hash = "sha256:0c18a16eab41e82c295618a77502e17b195883241c563b00f0aa5106fc4eaa0d", size = 13409, upload-time = "2025-10-06T05:38:16.721Z" }, +] + [[package]] name = "googleapis-common-protos" version = "1.75.0" @@ -532,6 +755,15 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/62/a1/3d680cbfd5f4b8f15abc1d571870c5fc3e594bb582bc3b64ea099db13e56/jinja2-3.1.6-py3-none-any.whl", hash = "sha256:85ece4451f492d0c13c5dd7c13a64681a86afae63a5f347908daf103ce6d2f67", size = 134899, upload-time = "2025-03-05T20:05:00.369Z" }, ] +[[package]] +name = "jmespath" +version = "1.1.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/d3/59/322338183ecda247fb5d1763a6cbe46eff7222eaeebafd9fa65d4bf5cb11/jmespath-1.1.0.tar.gz", hash = "sha256:472c87d80f36026ae83c6ddd0f1d05d4e510134ed462851fd5f754c8c3cbb88d", size = 27377, upload-time = "2026-01-22T16:35:26.279Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/14/2f/967ba146e6d58cf6a652da73885f52fc68001525b4197effc174321d70b4/jmespath-1.1.0-py3-none-any.whl", hash = "sha256:a5663118de4908c91729bea0acadca56526eb2698e83de10cd116ae0f4e97c64", size = 20419, upload-time = "2026-01-22T16:35:24.919Z" }, +] + [[package]] name = "joblib" version = "1.5.3" @@ -736,6 +968,7 @@ wheels = [ name = "mpcontribs-api" source = { editable = "." } dependencies = [ + { name = "aioboto3" }, { name = "beanie" }, { name = "fastapi", extra = ["standard"] }, { name = "fastapi-filter" }, @@ -748,6 +981,7 @@ dependencies = [ { name = "pymatgen" }, { name = "pymongo" }, { name = "structlog" }, + { name = "types-aiobotocore", extra = ["s3"] }, ] [package.dev-dependencies] @@ -763,6 +997,7 @@ dev = [ [package.metadata] requires-dist = [ + { name = "aioboto3", specifier = ">=15.5.0" }, { name = "beanie", specifier = ">=2.1.0" }, { name = "fastapi", extras = ["standard"], specifier = ">=0.136.3" }, { name = "fastapi-filter", specifier = ">=2.0.1" }, @@ -775,6 +1010,7 @@ requires-dist = [ { name = "pymatgen" }, { name = "pymongo", specifier = ">=4.17.0" }, { name = "structlog", specifier = ">=25.5.0" }, + { name = "types-aiobotocore", extras = ["s3"], specifier = ">=3.7.0" }, ] [package.metadata.requires-dev] @@ -797,6 +1033,51 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/43/e3/7d92a15f894aa0c9c4b49b8ee9ac9850d6e63b03c9c32c0367a13ae62209/mpmath-1.3.0-py3-none-any.whl", hash = "sha256:a0b2b9fe80bbcd81a6647ff13108738cfb482d481d826cc0e02f5b35e5c88d2c", size = 536198, upload-time = "2023-03-07T16:47:09.197Z" }, ] +[[package]] +name = "multidict" +version = "6.7.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/1a/c2/c2d94cbe6ac1753f3fc980da97b3d930efe1da3af3c9f5125354436c073d/multidict-6.7.1.tar.gz", hash = "sha256:ec6652a1bee61c53a3e5776b6049172c53b6aaba34f18c9ad04f82712bac623d", size = 102010, upload-time = "2026-01-26T02:46:45.979Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/91/cc/db74228a8be41884a567e88a62fd589a913708fcf180d029898c17a9a371/multidict-6.7.1-cp314-cp314-macosx_10_15_universal2.whl", hash = "sha256:8f333ec9c5eb1b7105e3b84b53141e66ca05a19a605368c55450b6ba208cb9ee", size = 75190, upload-time = "2026-01-26T02:45:10.651Z" }, + { url = "https://files.pythonhosted.org/packages/d5/22/492f2246bb5b534abd44804292e81eeaf835388901f0c574bac4eeec73c5/multidict-6.7.1-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:a407f13c188f804c759fc6a9f88286a565c242a76b27626594c133b82883b5c2", size = 44486, upload-time = "2026-01-26T02:45:11.938Z" }, + { url = "https://files.pythonhosted.org/packages/f1/4f/733c48f270565d78b4544f2baddc2fb2a245e5a8640254b12c36ac7ac68e/multidict-6.7.1-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:0e161ddf326db5577c3a4cc2d8648f81456e8a20d40415541587a71620d7a7d1", size = 43219, upload-time = "2026-01-26T02:45:14.346Z" }, + { url = "https://files.pythonhosted.org/packages/24/bb/2c0c2287963f4259c85e8bcbba9182ced8d7fca65c780c38e99e61629d11/multidict-6.7.1-cp314-cp314-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:1e3a8bb24342a8201d178c3b4984c26ba81a577c80d4d525727427460a50c22d", size = 245132, upload-time = "2026-01-26T02:45:15.712Z" }, + { url = "https://files.pythonhosted.org/packages/a7/f9/44d4b3064c65079d2467888794dea218d1601898ac50222ab8a9a8094460/multidict-6.7.1-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:97231140a50f5d447d3164f994b86a0bed7cd016e2682f8650d6a9158e14fd31", size = 252420, upload-time = "2026-01-26T02:45:17.293Z" }, + { url = "https://files.pythonhosted.org/packages/8b/13/78f7275e73fa17b24c9a51b0bd9d73ba64bb32d0ed51b02a746eb876abe7/multidict-6.7.1-cp314-cp314-manylinux2014_armv7l.manylinux_2_17_armv7l.manylinux_2_31_armv7l.whl", hash = "sha256:6b10359683bd8806a200fd2909e7c8ca3a7b24ec1d8132e483d58e791d881048", size = 233510, upload-time = "2026-01-26T02:45:19.356Z" }, + { url = "https://files.pythonhosted.org/packages/4b/25/8167187f62ae3cbd52da7893f58cb036b47ea3fb67138787c76800158982/multidict-6.7.1-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:283ddac99f7ac25a4acadbf004cb5ae34480bbeb063520f70ce397b281859362", size = 264094, upload-time = "2026-01-26T02:45:20.834Z" }, + { url = "https://files.pythonhosted.org/packages/a1/e7/69a3a83b7b030cf283fb06ce074a05a02322359783424d7edf0f15fe5022/multidict-6.7.1-cp314-cp314-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:538cec1e18c067d0e6103aa9a74f9e832904c957adc260e61cd9d8cf0c3b3d37", size = 260786, upload-time = "2026-01-26T02:45:22.818Z" }, + { url = "https://files.pythonhosted.org/packages/fe/3b/8ec5074bcfc450fe84273713b4b0a0dd47c0249358f5d82eb8104ffe2520/multidict-6.7.1-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:7eee46ccb30ff48a1e35bb818cc90846c6be2b68240e42a78599166722cea709", size = 248483, upload-time = "2026-01-26T02:45:24.368Z" }, + { url = "https://files.pythonhosted.org/packages/48/5a/d5a99e3acbca0e29c5d9cba8f92ceb15dce78bab963b308ae692981e3a5d/multidict-6.7.1-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:fa263a02f4f2dd2d11a7b1bb4362aa7cb1049f84a9235d31adf63f30143469a0", size = 248403, upload-time = "2026-01-26T02:45:25.982Z" }, + { url = "https://files.pythonhosted.org/packages/35/48/e58cd31f6c7d5102f2a4bf89f96b9cf7e00b6c6f3d04ecc44417c00a5a3c/multidict-6.7.1-cp314-cp314-musllinux_1_2_armv7l.whl", hash = "sha256:2e1425e2f99ec5bd36c15a01b690a1a2456209c5deed58f95469ffb46039ccbb", size = 240315, upload-time = "2026-01-26T02:45:27.487Z" }, + { url = "https://files.pythonhosted.org/packages/94/33/1cd210229559cb90b6786c30676bb0c58249ff42f942765f88793b41fdce/multidict-6.7.1-cp314-cp314-musllinux_1_2_i686.whl", hash = "sha256:497394b3239fc6f0e13a78a3e1b61296e72bf1c5f94b4c4eb80b265c37a131cd", size = 245528, upload-time = "2026-01-26T02:45:28.991Z" }, + { url = "https://files.pythonhosted.org/packages/64/f2/6e1107d226278c876c783056b7db43d800bb64c6131cec9c8dfb6903698e/multidict-6.7.1-cp314-cp314-musllinux_1_2_ppc64le.whl", hash = "sha256:233b398c29d3f1b9676b4b6f75c518a06fcb2ea0b925119fb2c1bc35c05e1601", size = 258784, upload-time = "2026-01-26T02:45:30.503Z" }, + { url = "https://files.pythonhosted.org/packages/4d/c1/11f664f14d525e4a1b5327a82d4de61a1db604ab34c6603bb3c2cc63ad34/multidict-6.7.1-cp314-cp314-musllinux_1_2_s390x.whl", hash = "sha256:93b1818e4a6e0930454f0f2af7dfce69307ca03cdcfb3739bf4d91241967b6c1", size = 251980, upload-time = "2026-01-26T02:45:32.603Z" }, + { url = "https://files.pythonhosted.org/packages/e1/9f/75a9ac888121d0c5bbd4ecf4eead45668b1766f6baabfb3b7f66a410e231/multidict-6.7.1-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:f33dc2a3abe9249ea5d8360f969ec7f4142e7ac45ee7014d8f8d5acddf178b7b", size = 243602, upload-time = "2026-01-26T02:45:34.043Z" }, + { url = "https://files.pythonhosted.org/packages/9a/e7/50bf7b004cc8525d80dbbbedfdc7aed3e4c323810890be4413e589074032/multidict-6.7.1-cp314-cp314-win32.whl", hash = "sha256:3ab8b9d8b75aef9df299595d5388b14530839f6422333357af1339443cff777d", size = 40930, upload-time = "2026-01-26T02:45:36.278Z" }, + { url = "https://files.pythonhosted.org/packages/e0/bf/52f25716bbe93745595800f36fb17b73711f14da59ed0bb2eba141bc9f0f/multidict-6.7.1-cp314-cp314-win_amd64.whl", hash = "sha256:5e01429a929600e7dab7b166062d9bb54a5eed752384c7384c968c2afab8f50f", size = 45074, upload-time = "2026-01-26T02:45:37.546Z" }, + { url = "https://files.pythonhosted.org/packages/97/ab/22803b03285fa3a525f48217963da3a65ae40f6a1b6f6cf2768879e208f9/multidict-6.7.1-cp314-cp314-win_arm64.whl", hash = "sha256:4885cb0e817aef5d00a2e8451d4665c1808378dc27c2705f1bf4ef8505c0d2e5", size = 42471, upload-time = "2026-01-26T02:45:38.889Z" }, + { url = "https://files.pythonhosted.org/packages/e0/6d/f9293baa6146ba9507e360ea0292b6422b016907c393e2f63fc40ab7b7b5/multidict-6.7.1-cp314-cp314t-macosx_10_15_universal2.whl", hash = "sha256:0458c978acd8e6ea53c81eefaddbbee9c6c5e591f41b3f5e8e194780fe026581", size = 82401, upload-time = "2026-01-26T02:45:40.254Z" }, + { url = "https://files.pythonhosted.org/packages/7a/68/53b5494738d83558d87c3c71a486504d8373421c3e0dbb6d0db48ad42ee0/multidict-6.7.1-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:c0abd12629b0af3cf590982c0b413b1e7395cd4ec026f30986818ab95bfaa94a", size = 48143, upload-time = "2026-01-26T02:45:41.635Z" }, + { url = "https://files.pythonhosted.org/packages/37/e8/5284c53310dcdc99ce5d66563f6e5773531a9b9fe9ec7a615e9bc306b05f/multidict-6.7.1-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:14525a5f61d7d0c94b368a42cff4c9a4e7ba2d52e2672a7b23d84dc86fb02b0c", size = 46507, upload-time = "2026-01-26T02:45:42.99Z" }, + { url = "https://files.pythonhosted.org/packages/e4/fc/6800d0e5b3875568b4083ecf5f310dcf91d86d52573160834fb4bfcf5e4f/multidict-6.7.1-cp314-cp314t-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:17307b22c217b4cf05033dabefe68255a534d637c6c9b0cc8382718f87be4262", size = 239358, upload-time = "2026-01-26T02:45:44.376Z" }, + { url = "https://files.pythonhosted.org/packages/41/75/4ad0973179361cdf3a113905e6e088173198349131be2b390f9fa4da5fc6/multidict-6.7.1-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:7a7e590ff876a3eaf1c02a4dfe0724b6e69a9e9de6d8f556816f29c496046e59", size = 246884, upload-time = "2026-01-26T02:45:47.167Z" }, + { url = "https://files.pythonhosted.org/packages/c3/9c/095bb28b5da139bd41fb9a5d5caff412584f377914bd8787c2aa98717130/multidict-6.7.1-cp314-cp314t-manylinux2014_armv7l.manylinux_2_17_armv7l.manylinux_2_31_armv7l.whl", hash = "sha256:5fa6a95dfee63893d80a34758cd0e0c118a30b8dcb46372bf75106c591b77889", size = 225878, upload-time = "2026-01-26T02:45:48.698Z" }, + { url = "https://files.pythonhosted.org/packages/07/d0/c0a72000243756e8f5a277b6b514fa005f2c73d481b7d9e47cd4568aa2e4/multidict-6.7.1-cp314-cp314t-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:a0543217a6a017692aa6ae5cc39adb75e587af0f3a82288b1492eb73dd6cc2a4", size = 253542, upload-time = "2026-01-26T02:45:50.164Z" }, + { url = "https://files.pythonhosted.org/packages/c0/6b/f69da15289e384ecf2a68837ec8b5ad8c33e973aa18b266f50fe55f24b8c/multidict-6.7.1-cp314-cp314t-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:f99fe611c312b3c1c0ace793f92464d8cd263cc3b26b5721950d977b006b6c4d", size = 252403, upload-time = "2026-01-26T02:45:51.779Z" }, + { url = "https://files.pythonhosted.org/packages/a2/76/b9669547afa5a1a25cd93eaca91c0da1c095b06b6d2d8ec25b713588d3a1/multidict-6.7.1-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:9004d8386d133b7e6135679424c91b0b854d2d164af6ea3f289f8f2761064609", size = 244889, upload-time = "2026-01-26T02:45:53.27Z" }, + { url = "https://files.pythonhosted.org/packages/7e/a9/a50d2669e506dad33cfc45b5d574a205587b7b8a5f426f2fbb2e90882588/multidict-6.7.1-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:e628ef0e6859ffd8273c69412a2465c4be4a9517d07261b33334b5ec6f3c7489", size = 241982, upload-time = "2026-01-26T02:45:54.919Z" }, + { url = "https://files.pythonhosted.org/packages/c5/bb/1609558ad8b456b4827d3c5a5b775c93b87878fd3117ed3db3423dfbce1b/multidict-6.7.1-cp314-cp314t-musllinux_1_2_armv7l.whl", hash = "sha256:841189848ba629c3552035a6a7f5bf3b02eb304e9fea7492ca220a8eda6b0e5c", size = 232415, upload-time = "2026-01-26T02:45:56.981Z" }, + { url = "https://files.pythonhosted.org/packages/d8/59/6f61039d2aa9261871e03ab9dc058a550d240f25859b05b67fd70f80d4b3/multidict-6.7.1-cp314-cp314t-musllinux_1_2_i686.whl", hash = "sha256:ce1bbd7d780bb5a0da032e095c951f7014d6b0a205f8318308140f1a6aba159e", size = 240337, upload-time = "2026-01-26T02:45:58.698Z" }, + { url = "https://files.pythonhosted.org/packages/a1/29/fdc6a43c203890dc2ae9249971ecd0c41deaedfe00d25cb6564b2edd99eb/multidict-6.7.1-cp314-cp314t-musllinux_1_2_ppc64le.whl", hash = "sha256:b26684587228afed0d50cf804cc71062cc9c1cdf55051c4c6345d372947b268c", size = 248788, upload-time = "2026-01-26T02:46:00.862Z" }, + { url = "https://files.pythonhosted.org/packages/a9/14/a153a06101323e4cf086ecee3faadba52ff71633d471f9685c42e3736163/multidict-6.7.1-cp314-cp314t-musllinux_1_2_s390x.whl", hash = "sha256:9f9af11306994335398293f9958071019e3ab95e9a707dc1383a35613f6abcb9", size = 242842, upload-time = "2026-01-26T02:46:02.824Z" }, + { url = "https://files.pythonhosted.org/packages/41/5f/604ae839e64a4a6efc80db94465348d3b328ee955e37acb24badbcd24d83/multidict-6.7.1-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:b4938326284c4f1224178a560987b6cf8b4d38458b113d9b8c1db1a836e640a2", size = 240237, upload-time = "2026-01-26T02:46:05.898Z" }, + { url = "https://files.pythonhosted.org/packages/5f/60/c3a5187bf66f6fb546ff4ab8fb5a077cbdd832d7b1908d4365c7f74a1917/multidict-6.7.1-cp314-cp314t-win32.whl", hash = "sha256:98655c737850c064a65e006a3df7c997cd3b220be4ec8fe26215760b9697d4d7", size = 48008, upload-time = "2026-01-26T02:46:07.468Z" }, + { url = "https://files.pythonhosted.org/packages/0c/f7/addf1087b860ac60e6f382240f64fb99f8bfb532bb06f7c542b83c29ca61/multidict-6.7.1-cp314-cp314t-win_amd64.whl", hash = "sha256:497bde6223c212ba11d462853cfa4f0ae6ef97465033e7dc9940cdb3ab5b48e5", size = 53542, upload-time = "2026-01-26T02:46:08.809Z" }, + { url = "https://files.pythonhosted.org/packages/4c/81/4629d0aa32302ef7b2ec65c75a728cc5ff4fa410c50096174c1632e70b3e/multidict-6.7.1-cp314-cp314t-win_arm64.whl", hash = "sha256:2bbd113e0d4af5db41d5ebfe9ccaff89de2120578164f86a5d17d5a576d1e5b2", size = 44719, upload-time = "2026-01-26T02:46:11.146Z" }, + { url = "https://files.pythonhosted.org/packages/81/08/7036c080d7117f28a4af526d794aab6a84463126db031b007717c1a6676e/multidict-6.7.1-py3-none-any.whl", hash = "sha256:55d97cc6dae627efa6a6e548885712d4864b81110ac76fa4e534c03819fa4a56", size = 12319, upload-time = "2026-01-26T02:46:44.004Z" }, +] + [[package]] name = "narwhals" version = "2.21.2" @@ -1136,6 +1417,49 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/54/20/4d324d65cc6d9205fabedc306948156824eb9f0ee1633355a8f7ec5c66bf/pluggy-1.6.0-py3-none-any.whl", hash = "sha256:e920276dd6813095e9377c0bc5566d94c932c33b27a3e3945d8389c374dd4746", size = 20538, upload-time = "2025-05-15T12:30:06.134Z" }, ] +[[package]] +name = "propcache" +version = "0.5.2" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/ec/44/c87281c333769159c50594f22610f77398a47ccbfbbf23074e744e86f87c/propcache-0.5.2.tar.gz", hash = "sha256:01c4fc7480cd0598bb4b57022df55b9ca296da7fc5a8760bd8451a7e63a7d427", size = 50208, upload-time = "2026-05-08T21:02:12.199Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/e2/ea/23ee535d90ce8bcc465a3028eb3cc0ce3bd1005f4bb27710b30587de798d/propcache-0.5.2-cp314-cp314-macosx_10_15_universal2.whl", hash = "sha256:46088abff4cba581dea21ae0467a480526cb25aa5f3c269e909f800328bc3999", size = 94662, upload-time = "2026-05-08T21:01:22.683Z" }, + { url = "https://files.pythonhosted.org/packages/b5/06/c5a52f419b5d8972f8d46a7577476090d8e3263ff589ce40b5ca4968d5be/propcache-0.5.2-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:fc88b26f08d634f7bc819a7852e5214f5802641ab8d9fd5326892292eee1993e", size = 53928, upload-time = "2026-05-08T21:01:23.986Z" }, + { url = "https://files.pythonhosted.org/packages/63/b1/4260d67d6bd85e58a66b72d54ce15d5de789b6f3870cc6bedf8ff9667401/propcache-0.5.2-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:97797ebb098e670a2f92dd66f32897e30d7615b14e7f59711de23e30a9072539", size = 54650, upload-time = "2026-05-08T21:01:25.305Z" }, + { url = "https://files.pythonhosted.org/packages/70/06/2f46c318e3307cd7a6a7481def374ce838c0fe20084b39dd54b0879d0e99/propcache-0.5.2-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:ba57fffe4ac99c5d30076161b5866336d97600769bad35cc68f7774b15298a4e", size = 59912, upload-time = "2026-05-08T21:01:26.545Z" }, + { url = "https://files.pythonhosted.org/packages/4c/29/fe1aebec2ce57ab985a9c382bded1124431f85078113aa222c5d278430d4/propcache-0.5.2-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:583c19759d9eec1e5b69e2fbef36a7d9c326041be9746cb822d335c8cedc2979", size = 63300, upload-time = "2026-05-08T21:01:27.937Z" }, + { url = "https://files.pythonhosted.org/packages/b4/18/2334b26768b6c82be8c69e83671b767d5ef426aa09b0cba6c2ea47816774/propcache-0.5.2-cp314-cp314-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:d0326e2e5e1f3163fa306c834e48e8d490e5fae607a097a40c0648109b47ba80", size = 64208, upload-time = "2026-05-08T21:01:29.484Z" }, + { url = "https://files.pythonhosted.org/packages/2b/76/7f1bfd6afff4c5e38e36a3c6d68eb5f4b7311ea80baf693db78d95b603c4/propcache-0.5.2-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:e00820e192c8dbebcafb383ebbf99030895f09905e7a0eb2e0340a0bcc2bc825", size = 61633, upload-time = "2026-05-08T21:01:31.068Z" }, + { url = "https://files.pythonhosted.org/packages/c4/46/b3ff8aba2b4953a3e50de2cf72f1b5748b8eca93b15f3dc2c84339084c09/propcache-0.5.2-cp314-cp314-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:c66afea89b1e43725731d2004732a046fe6fe955d51f952c3e95a7314a284a39", size = 61724, upload-time = "2026-05-08T21:01:32.374Z" }, + { url = "https://files.pythonhosted.org/packages/c5/01/814cfcafbcff954f94c01cf30e097ddc88a076b5440fbcf4570753437d40/propcache-0.5.2-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:d4dc37dec6c6cdad0b57881a5658fd14fbf53e333b1a86cf86559f190e1d9ec4", size = 60069, upload-time = "2026-05-08T21:01:33.67Z" }, + { url = "https://files.pythonhosted.org/packages/da/68/5c6f7622d510cc666a300687e06fd060c1a43361c0c9b20d284f06d8096a/propcache-0.5.2-cp314-cp314-musllinux_1_2_armv7l.whl", hash = "sha256:5570dbcc97571c15f68068e529c92715a12f8d54030e272d264b377e22bd17a5", size = 57099, upload-time = "2026-05-08T21:01:34.915Z" }, + { url = "https://files.pythonhosted.org/packages/55/27/9cb0b4c679124085327957d42521c99dba04c88c90c3e55a6f0b633ebccc/propcache-0.5.2-cp314-cp314-musllinux_1_2_ppc64le.whl", hash = "sha256:f814362777a9f841adddb200ecdf8f5cb1e5a3c4b7a86378edbd6ccb26edd702", size = 63391, upload-time = "2026-05-08T21:01:36.231Z" }, + { url = "https://files.pythonhosted.org/packages/f0/9d/7258aaa5bdf60fc6f27591eef6fe52768cb0beda7140be477c8b12c9794a/propcache-0.5.2-cp314-cp314-musllinux_1_2_riscv64.whl", hash = "sha256:196913dea116aeb5a2ba95af4ddcb7ea85559ae07d8eee8751688310d09168c3", size = 61626, upload-time = "2026-05-08T21:01:37.545Z" }, + { url = "https://files.pythonhosted.org/packages/8e/0d/41c602003e8a9b16fe1e7eadf62c7bfba9d5474370b24200bf48b315f45f/propcache-0.5.2-cp314-cp314-musllinux_1_2_s390x.whl", hash = "sha256:6e7b8719005dd1175be4ab1cd25e9b98659a5e0347331506ec6760d2773a7fb5", size = 64781, upload-time = "2026-05-08T21:01:38.83Z" }, + { url = "https://files.pythonhosted.org/packages/8b/f3/38e66b1856e9bd079deea015bc4a55f7767c0e4db2f7dcf69e7e680ba4ce/propcache-0.5.2-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:51f96d685ab16e88cab128cd37a52c5da540809c8b879fa047731bfcb4ad35a4", size = 62570, upload-time = "2026-05-08T21:01:40.415Z" }, + { url = "https://files.pythonhosted.org/packages/95/ca/bbfe9b910ce57dde8bb4876b4520fc02a4e89497c10de26be936758a3aaa/propcache-0.5.2-cp314-cp314-win32.whl", hash = "sha256:cc6fc3cc62e8501d3ed62894425040d2728ecddb1ed072737a5c70bd537aa9f0", size = 39436, upload-time = "2026-05-08T21:01:41.654Z" }, + { url = "https://files.pythonhosted.org/packages/61/d2/45c9defbaa1ea297035d9d4cce9e8f80daafbf19319c6007f157c6256ea9/propcache-0.5.2-cp314-cp314-win_amd64.whl", hash = "sha256:81e3a30b0bb60caa22033dd0f8a3618d1d67356212514f62c57db75cb0ef410c", size = 42373, upload-time = "2026-05-08T21:01:43.041Z" }, + { url = "https://files.pythonhosted.org/packages/44/68/9ea5103f41d5217d7d6ec24db90018e23aebec070c3f9a6e54d12b841fd8/propcache-0.5.2-cp314-cp314-win_arm64.whl", hash = "sha256:0d2c9bf8528f135dbb805ce027567e09164f7efa51a2be07458a2c0420f292d0", size = 38554, upload-time = "2026-05-08T21:01:44.336Z" }, + { url = "https://files.pythonhosted.org/packages/8a/81/fadf555f42d3b762eea8a53950b0489fdc0aa9da5f8ed9e10ce0a4e01b48/propcache-0.5.2-cp314-cp314t-macosx_10_15_universal2.whl", hash = "sha256:4bc8ff1feffc6a61c7002ffe84634c41b822e104990ae009f44a0834430070bb", size = 99395, upload-time = "2026-05-08T21:01:45.883Z" }, + { url = "https://files.pythonhosted.org/packages/f5/c9/c61e134a686949cf7971af3a390148b1156f7be81c73bc0cd12c873e2d48/propcache-0.5.2-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:79aa3ff0a9b566633b642fa9caf7e21ed1c13d6feca718187873f199e1514078", size = 56653, upload-time = "2026-05-08T21:01:47.307Z" }, + { url = "https://files.pythonhosted.org/packages/cb/73/daf935ea7048ddd7ec8eec5345b4a40b619d2d178b3c0a0900796bc3c794/propcache-0.5.2-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:1b31822f4474c4036bae62de9402710051d431a606d6a0f907fec79935a071aa", size = 56914, upload-time = "2026-05-08T21:01:48.573Z" }, + { url = "https://files.pythonhosted.org/packages/79/9f/aba959b435ea18617edd7cf0a7ad0b9c574b8fc7e3d2cd55fb59cb255d33/propcache-0.5.2-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:13fef48778b5a2a756523fdb781326b028ca75e32858b04f2cdd19f394564917", size = 62567, upload-time = "2026-05-08T21:01:49.903Z" }, + { url = "https://files.pythonhosted.org/packages/6c/a1/859942de9a791ff42f6141736f5b37749b8f53e65edfa49638c67dd67e6a/propcache-0.5.2-cp314-cp314t-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:8b73ab70f1a3351fbc71f663b3e645af6dd0329100c353081cf69c37433fc6fe", size = 65542, upload-time = "2026-05-08T21:01:51.204Z" }, + { url = "https://files.pythonhosted.org/packages/b5/61/315bc0fd6c0fc7f80a528b8afd209e5fc4a875ea79571b91b8f50f442907/propcache-0.5.2-cp314-cp314t-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:5538d2c13d93e4698af7e092b57bc7298fd35d1d58e656ae18f23ee0d0378e03", size = 66845, upload-time = "2026-05-08T21:01:52.539Z" }, + { url = "https://files.pythonhosted.org/packages/47/f7/9f8122e3132e8e354ac41975ef8f1099be7d5a16bc7ae562734e993665c0/propcache-0.5.2-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:cd645f03898405cabe694fb8bc35241e3a9c332ec85627584fe3de201452b335", size = 63985, upload-time = "2026-05-08T21:01:53.847Z" }, + { url = "https://files.pythonhosted.org/packages/c8/54/c317819ec157cbf6f35df9df9657a6f82daf34d5faf15948b2f639c2192e/propcache-0.5.2-cp314-cp314t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:a473b3440261e0c60706e732b2ed2f517857344fc21bf48fdfe211e2d98eb285", size = 63999, upload-time = "2026-05-08T21:01:55.179Z" }, + { url = "https://files.pythonhosted.org/packages/5a/56/387e3f7dfce0a9233df41fb888aa1c30222cb4bbbf09537c02dd9bd85fe2/propcache-0.5.2-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:7afa37062e6650640e932e4cc9297d81f9f42d9944029cc386b8247dea4da837", size = 62779, upload-time = "2026-05-08T21:01:57.489Z" }, + { url = "https://files.pythonhosted.org/packages/a1/9c/596784cb5824ed61ee960d3f8655a3f0993e107c6e98ab6c818b7fb92ccb/propcache-0.5.2-cp314-cp314t-musllinux_1_2_armv7l.whl", hash = "sha256:8a90efd5777e996e42d568db9ac740b944d691e565cbfd31b2f7832f9184b2b8", size = 59796, upload-time = "2026-05-08T21:01:58.736Z" }, + { url = "https://files.pythonhosted.org/packages/c2/3d/1a6cfa1726a48542c1e8784a0761421476a5b68e09b7f36bf95eb954aaba/propcache-0.5.2-cp314-cp314t-musllinux_1_2_ppc64le.whl", hash = "sha256:f19bb891234d72535764d703bfed1153cc34f4214d5bd7150aee1eec9e8f4366", size = 66023, upload-time = "2026-05-08T21:02:00.228Z" }, + { url = "https://files.pythonhosted.org/packages/e4/0e/05fd6990369477076e4e280bcb970de760fddf0161a46e988bc95f7940ec/propcache-0.5.2-cp314-cp314t-musllinux_1_2_riscv64.whl", hash = "sha256:32775082acd2d807ee3db715c7770d38767b817870acfa08c29e057f3c4d5b56", size = 64448, upload-time = "2026-05-08T21:02:01.888Z" }, + { url = "https://files.pythonhosted.org/packages/cd/86/5f8da315a4309c62c10c0b2516b17492d5d3bbe1bb862b96604db67e2a37/propcache-0.5.2-cp314-cp314t-musllinux_1_2_s390x.whl", hash = "sha256:9282fb1a3bccd038da9f768b927b24a0c753e466c086b7c4f3c6982851eefb2d", size = 67329, upload-time = "2026-05-08T21:02:03.484Z" }, + { url = "https://files.pythonhosted.org/packages/da/d3/3368efe79ab21f0cdf86ef49895811c9cc933131d4cde1f28a624e22e712/propcache-0.5.2-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:cc49723e2f60d6b32a0f0b08a3fd6d13203c07f1cd9566cfce0f12a917c967a2", size = 65172, upload-time = "2026-05-08T21:02:04.745Z" }, + { url = "https://files.pythonhosted.org/packages/d5/07/127e8b0bacfb325396196f9d976a22453049b89b9b2b08477cc3145faa44/propcache-0.5.2-cp314-cp314t-win32.whl", hash = "sha256:2d7aa89ebca5acc98cba9d1472d976e394782f587bad6661003602a619fd1821", size = 43813, upload-time = "2026-05-08T21:02:06.025Z" }, + { url = "https://files.pythonhosted.org/packages/88/fb/46dad6c0ae49ed230ab1b16c890c2b6314e2403e6c412976f4a72d64a527/propcache-0.5.2-cp314-cp314t-win_amd64.whl", hash = "sha256:d447bb0b3054be5818458fbb171208b1d9ff11eba14e18ca18b90cbb45767370", size = 47764, upload-time = "2026-05-08T21:02:07.353Z" }, + { url = "https://files.pythonhosted.org/packages/e7/c4/a47d0a63aa309d10d59ede6e9d4cff03a344a79d1f0f4cd0cd74997b53e0/propcache-0.5.2-cp314-cp314t-win_arm64.whl", hash = "sha256:fe67a3d11cd9b4efabfa45c3d00ffba2b26811442a73a581a94b67c2b5faccf6", size = 41140, upload-time = "2026-05-08T21:02:09.065Z" }, + { url = "https://files.pythonhosted.org/packages/3a/ed/1cdcab6ba3d6ab7feca11fc14f0eeea80755bb53ef4e892079f31b10a25f/propcache-0.5.2-py3-none-any.whl", hash = "sha256:be1ddfcbb376e3de5d2e2db1d58d6d67463e6b4f9f040c000de8e300295465fe", size = 14036, upload-time = "2026-05-08T21:02:10.673Z" }, +] + [[package]] name = "protobuf" version = "6.33.6" @@ -1553,6 +1877,18 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/4e/b2/920464c907b191e37469d477a1aa8bc048b8f36c4c1610dfa4ab87b39e18/ruff-0.15.15-py3-none-win_arm64.whl", hash = "sha256:3c8ceca6792f38196b8f589bc92eccd03eef286602da92e5dc05cc42ef6441b7", size = 11138498, upload-time = "2026-05-28T14:16:38.425Z" }, ] +[[package]] +name = "s3transfer" +version = "0.14.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "botocore" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/62/74/8d69dcb7a9efe8baa2046891735e5dfe433ad558ae23d9e3c14c633d1d58/s3transfer-0.14.0.tar.gz", hash = "sha256:eff12264e7c8b4985074ccce27a3b38a485bb7f7422cc8046fee9be4983e4125", size = 151547, upload-time = "2025-09-09T19:23:31.089Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/48/f0/ae7ca09223a81a1d890b2557186ea015f6e0502e9b8cb8e1813f1d8cfa4e/s3transfer-0.14.0-py3-none-any.whl", hash = "sha256:ea3b790c7077558ed1f02a3072fb3cb992bbbd253392f4b6e9e8976941c7d456", size = 85712, upload-time = "2025-09-09T19:23:30.041Z" }, +] + [[package]] name = "scipy" version = "1.17.1" @@ -1713,6 +2049,41 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/24/25/2201973529af2c954de0bb725323c3aaed6d7f0ceee8f550dec9185df013/typer-0.26.7-py3-none-any.whl", hash = "sha256:5c87cfbc5d34491c5346ebf49c23e18d56ccb863268d3a8d592b26087c2f5e58", size = 122456, upload-time = "2026-06-03T07:18:05.732Z" }, ] +[[package]] +name = "types-aiobotocore" +version = "3.7.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "botocore-stubs" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/76/e8/ef1fcb876937dbdddc0f01b5df4ed53f33b166a6367d80a9014d5e5f091d/types_aiobotocore-3.7.0.tar.gz", hash = "sha256:fe35de52c12e5fdb89ca60b3989766e7fe827e3d2e95fcf4583e91581945205c", size = 87992, upload-time = "2026-05-10T03:19:32.353Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/f9/68/0cdfd7df415ee3e769c8e8f9bd8013c64c88cdd7306f72453a02123c58f9/types_aiobotocore-3.7.0-py3-none-any.whl", hash = "sha256:ff4139b3eae22d242b6b39ba56048344b2b86f67daeeca4680da1a6e191681fd", size = 54804, upload-time = "2026-05-10T03:19:29.487Z" }, +] + +[package.optional-dependencies] +s3 = [ + { name = "types-aiobotocore-s3" }, +] + +[[package]] +name = "types-aiobotocore-s3" +version = "3.7.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/94/ce/5b7baa06cde79ab5f083f56f060ccd2b60f6249127d70bbb8a37aafbdcd4/types_aiobotocore_s3-3.7.0.tar.gz", hash = "sha256:6ec738853dbba9133707991b98ea4dab19f7c62e02b3cca016e6cd8e3d684576", size = 77662, upload-time = "2026-05-10T03:17:35.088Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/e9/ac/67240c3804a3e1c1e8f0f402155d7ed5351faf7a2085136083e5ca3f26b8/types_aiobotocore_s3-3.7.0-py3-none-any.whl", hash = "sha256:5dbb5479ece3e1aceaccac224fc3dd1ab7d912c4457419bd19e88a0a5b3844fc", size = 85450, upload-time = "2026-05-10T03:17:33.061Z" }, +] + +[[package]] +name = "types-awscrt" +version = "0.34.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/3e/59/44409a8fc06b444ab1a6f71dcb29d49a6e17e02424345eb51b051bebb345/types_awscrt-0.34.1.tar.gz", hash = "sha256:559aa04250f6a419a617dfb788f3e10903aaf74700ef23e521b64a411b83b803", size = 19062, upload-time = "2026-06-05T04:40:10.689Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/e4/b1/214b12162b452ed6acd230065e6c587cde6b96871e3ce6d653f40888f8df/types_awscrt-0.34.1-py3-none-any.whl", hash = "sha256:20c752b6031544d8f694803c35174aee129f1be5ddf886ae46d22f7ffd9b7d75", size = 45688, upload-time = "2026-06-05T04:40:09.198Z" }, +] + [[package]] name = "typing-extensions" version = "4.15.0" @@ -1881,31 +2252,77 @@ wheels = [ [[package]] name = "wrapt" -version = "2.2.1" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/2d/9f/06263fcd8ad6c405f05a3905fd7a84dd3176eb5ad46e44bccc0cd16348bb/wrapt-2.2.1.tar.gz", hash = "sha256:6744f504375775d7609c82c8d3d94af1c9a6f05586984536905908ba905277b9", size = 127620, upload-time = "2026-05-22T14:49:43.056Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/0a/a3/11d7f34ebbf3231bc907a3e6d5ee051b14d034c1bc7b65a97d5cc00516df/wrapt-2.2.1-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:6f56a647e4eaf5f0ca40330fb070f566bdf9f7b0db89a1af20d71c28dcd7a0ab", size = 80879, upload-time = "2026-05-22T14:48:51.802Z" }, - { url = "https://files.pythonhosted.org/packages/13/3c/b74cfd984cef560b900fb1a727af20352d89e1f06bf2e1114dd3f00f5f5a/wrapt-2.2.1-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:64b7deeda4b70408e382328d8bbe52a256fe9bc63ae3db86d804608367e5422c", size = 81462, upload-time = "2026-05-22T14:48:53.18Z" }, - { url = "https://files.pythonhosted.org/packages/15/a3/7c8f704b8dc07dfe0a5d01c2edbfd88317aa8e5e3fa7c743eb7a085ae767/wrapt-2.2.1-cp314-cp314-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:b9cf53ba90717db2e292401de290776c498d4bbfb0d4a559ca2895db8b9dcb5c", size = 167251, upload-time = "2026-05-22T14:48:54.562Z" }, - { url = "https://files.pythonhosted.org/packages/80/85/a34d1888d97247da6c2ff6118c3a721c73ed8cc4dd198c00208bb73b6f80/wrapt-2.2.1-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:cf3638274ab9d9b724c9baa0b4c04e132cd6faefb78b4dd3dd1a02a4bdaad41e", size = 166316, upload-time = "2026-05-22T14:48:56.065Z" }, - { url = "https://files.pythonhosted.org/packages/e9/d7/72ffaeb01eebc704afe3fb99e840480f4bda45f0fa66e3381b6a39251c8f/wrapt-2.2.1-cp314-cp314-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:aed9658797d0b45d6c49adcfc6b41f66e6f2d0c6de3ec79e16cf4b1855df240f", size = 157952, upload-time = "2026-05-22T14:48:57.924Z" }, - { url = "https://files.pythonhosted.org/packages/24/5b/36f5d6b024e4edfdd90b140742d11ebcf7836daf5c9daf326c55c24db412/wrapt-2.2.1-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:1d676ee388bc42a04d56dd7deb5605244dac2e35cc2fadbb43c9fa25bbd93508", size = 166130, upload-time = "2026-05-22T14:48:59.384Z" }, - { url = "https://files.pythonhosted.org/packages/81/06/9296d9e97bfdef5483dfcc859d57b095b257144b2bc5300ab521e06f4bc7/wrapt-2.2.1-cp314-cp314-musllinux_1_2_riscv64.whl", hash = "sha256:e395f7bc31851ef9b612050368cb446e9bc14cd7454b025018980349caf25ae5", size = 156604, upload-time = "2026-05-22T14:49:00.921Z" }, - { url = "https://files.pythonhosted.org/packages/53/37/16953929ed6776175720e58fc966e779926d8d71e2c7b2273230590ca71f/wrapt-2.2.1-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:5f1845c2a8cc1180ccccfa45785dd06f562730d19ef75be180334254012b6283", size = 166007, upload-time = "2026-05-22T14:49:02.332Z" }, - { url = "https://files.pythonhosted.org/packages/b9/73/20ee58c0612dae7c31131a7095345812ed2c7b389019e175f68cde34e5b4/wrapt-2.2.1-cp314-cp314-win32.whl", hash = "sha256:436addbc4bb4fc0a88c702577f51195d7d73683a7f3e0e5b253d8404d7847243", size = 78327, upload-time = "2026-05-22T14:49:03.722Z" }, - { url = "https://files.pythonhosted.org/packages/22/b3/ef7c3295d02e0448a71c639a36a057f46d524d057c9486291a7a3039e65c/wrapt-2.2.1-cp314-cp314-win_amd64.whl", hash = "sha256:50972a1d974ea07725a7f6b1cec5f8759008afd030a0024843ebe7d52de47f2b", size = 81144, upload-time = "2026-05-22T14:49:05.093Z" }, - { url = "https://files.pythonhosted.org/packages/ac/dc/7bdf336953f99f4ceb0a584bb8870e42c8f26f93ea10c87834dad62f1668/wrapt-2.2.1-cp314-cp314-win_arm64.whl", hash = "sha256:1c9934ea5d92957e3cd0adbc0845539dccfd62710ebe16195a8c66c53954db36", size = 79569, upload-time = "2026-05-22T14:49:06.413Z" }, - { url = "https://files.pythonhosted.org/packages/6a/6d/6dfae80150ff1919c356d1dd528f049bcdfaae29b4d284bc957e022caef4/wrapt-2.2.1-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:17de18fc12cea55b8a9587314cb830573e37fb33b247a7515696350863714188", size = 82892, upload-time = "2026-05-22T14:49:07.925Z" }, - { url = "https://files.pythonhosted.org/packages/82/7b/4e34766a7d7804ffce9e71befe47e9b3225dc350c49c94493c4ab39fd3a5/wrapt-2.2.1-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:a9dec1aca52dddde7df94818310fa2fe79739c8f385b2014c4cb1035f5508199", size = 83333, upload-time = "2026-05-22T14:49:09.257Z" }, - { url = "https://files.pythonhosted.org/packages/9d/57/0b34db3e8de44ccfece62d7b337abd1631dd810f5adc5f3db571727836b5/wrapt-2.2.1-cp314-cp314t-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:69f2e9244542cb34dd59c7f073445b9e54ad9f3fce8d93606c368a1b499fc413", size = 202899, upload-time = "2026-05-22T14:49:10.572Z" }, - { url = "https://files.pythonhosted.org/packages/e5/45/ac0c459f154b99d92789a6cba7ca727185b83513b986f8ec7fe2aacddcbf/wrapt-2.2.1-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:2d83966dc7f4f45e8b97b5933685ac2e6e67fc0e19246ea314bceb9a8970c956", size = 209986, upload-time = "2026-05-22T14:49:12.229Z" }, - { url = "https://files.pythonhosted.org/packages/b7/e4/77e37ff33ad018fa81ade52c25fa327b80b56f81d734279a63614fcb4cbc/wrapt-2.2.1-cp314-cp314t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:78b0aa6bfb7be8deed0ab23e7aa028cc5210c29bc2d32a04d52b50e517a7307e", size = 194893, upload-time = "2026-05-22T14:49:14.139Z" }, - { url = "https://files.pythonhosted.org/packages/dd/9d/7ea651d1ab032fc5fa222fbec91d0f8a1397f6ae04ebb93fa7219aa921d7/wrapt-2.2.1-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:05d5cb74d1b232ec8cfa130a8f900708699ff2491d97b8f85a4cdc5996294b85", size = 205636, upload-time = "2026-05-22T14:49:15.714Z" }, - { url = "https://files.pythonhosted.org/packages/09/af/8e88031a701275b9085c54e64bc88c0b1cd55c77eadd400691c371cd76c4/wrapt-2.2.1-cp314-cp314t-musllinux_1_2_riscv64.whl", hash = "sha256:f6518b94edb9150452e9aba08027d4cc293433753ec1fbefb4629a21cbc74181", size = 192267, upload-time = "2026-05-22T14:49:17.283Z" }, - { url = "https://files.pythonhosted.org/packages/bf/a8/e657ca876b06710194f243d81c4b0896ade646e244bdbec2d87c8c56a8bd/wrapt-2.2.1-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:ed55af48b3eb28f43228ca2306788892bcb629eb2b5c4876e2a3659872c2f17a", size = 198378, upload-time = "2026-05-22T14:49:18.785Z" }, - { url = "https://files.pythonhosted.org/packages/c8/59/822efe4ea722a3961331bfa35b7d90937790d2c20f0616de1997ccc3aebd/wrapt-2.2.1-cp314-cp314t-win32.whl", hash = "sha256:2e08688ab16525897da6589d56d0aebaf417bbe91c2d8e3b96203b1efa596e85", size = 80226, upload-time = "2026-05-22T14:49:20.264Z" }, - { url = "https://files.pythonhosted.org/packages/ab/31/2a7dc5f6abb2fca0b6e1610e120419f603650aceb4f1d3ac4cae0354e162/wrapt-2.2.1-cp314-cp314t-win_amd64.whl", hash = "sha256:fd0135d34387f5fd087d9be368ea77ea89cf2451dc1cd1c622d35021bcb3ab50", size = 83835, upload-time = "2026-05-22T14:49:21.634Z" }, - { url = "https://files.pythonhosted.org/packages/9f/c0/782b86e28d1ceebeb74cccea12d2cd3d2ba0bd68e3dec20b1bc5873f6127/wrapt-2.2.1-cp314-cp314t-win_arm64.whl", hash = "sha256:f70db64e8266d7c45d3b735f2e08eeb434b5e03da9a479ae42b2e2e486a21a00", size = 80722, upload-time = "2026-05-22T14:49:23.59Z" }, - { url = "https://files.pythonhosted.org/packages/53/46/29ac9daf11a86c22a8c38cd9236c62928ccae83f7ceb06bd3b0467cf9d05/wrapt-2.2.1-py3-none-any.whl", hash = "sha256:3aafea2975caef8ca49400640dde02cc7426e798f24870ed01f490bc3cffd32f", size = 61000, upload-time = "2026-05-22T14:49:41.593Z" }, +version = "1.17.3" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/95/8f/aeb76c5b46e273670962298c23e7ddde79916cb74db802131d49a85e4b7d/wrapt-1.17.3.tar.gz", hash = "sha256:f66eb08feaa410fe4eebd17f2a2c8e2e46d3476e9f8c783daa8e09e0faa666d0", size = 55547, upload-time = "2025-08-12T05:53:21.714Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/02/a2/cd864b2a14f20d14f4c496fab97802001560f9f41554eef6df201cd7f76c/wrapt-1.17.3-cp314-cp314-macosx_10_13_universal2.whl", hash = "sha256:cf30f6e3c077c8e6a9a7809c94551203c8843e74ba0c960f4a98cd80d4665d39", size = 54132, upload-time = "2025-08-12T05:51:49.864Z" }, + { url = "https://files.pythonhosted.org/packages/d5/46/d011725b0c89e853dc44cceb738a307cde5d240d023d6d40a82d1b4e1182/wrapt-1.17.3-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:e228514a06843cae89621384cfe3a80418f3c04aadf8a3b14e46a7be704e4235", size = 39091, upload-time = "2025-08-12T05:51:38.935Z" }, + { url = "https://files.pythonhosted.org/packages/2e/9e/3ad852d77c35aae7ddebdbc3b6d35ec8013af7d7dddad0ad911f3d891dae/wrapt-1.17.3-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:5ea5eb3c0c071862997d6f3e02af1d055f381b1d25b286b9d6644b79db77657c", size = 39172, upload-time = "2025-08-12T05:51:59.365Z" }, + { url = "https://files.pythonhosted.org/packages/c3/f7/c983d2762bcce2326c317c26a6a1e7016f7eb039c27cdf5c4e30f4160f31/wrapt-1.17.3-cp314-cp314-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:281262213373b6d5e4bb4353bc36d1ba4084e6d6b5d242863721ef2bf2c2930b", size = 87163, upload-time = "2025-08-12T05:52:40.965Z" }, + { url = "https://files.pythonhosted.org/packages/e4/0f/f673f75d489c7f22d17fe0193e84b41540d962f75fce579cf6873167c29b/wrapt-1.17.3-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:dc4a8d2b25efb6681ecacad42fca8859f88092d8732b170de6a5dddd80a1c8fa", size = 87963, upload-time = "2025-08-12T05:52:20.326Z" }, + { url = "https://files.pythonhosted.org/packages/df/61/515ad6caca68995da2fac7a6af97faab8f78ebe3bf4f761e1b77efbc47b5/wrapt-1.17.3-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:373342dd05b1d07d752cecbec0c41817231f29f3a89aa8b8843f7b95992ed0c7", size = 86945, upload-time = "2025-08-12T05:52:21.581Z" }, + { url = "https://files.pythonhosted.org/packages/d3/bd/4e70162ce398462a467bc09e768bee112f1412e563620adc353de9055d33/wrapt-1.17.3-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:d40770d7c0fd5cbed9d84b2c3f2e156431a12c9a37dc6284060fb4bec0b7ffd4", size = 86857, upload-time = "2025-08-12T05:52:43.043Z" }, + { url = "https://files.pythonhosted.org/packages/2b/b8/da8560695e9284810b8d3df8a19396a6e40e7518059584a1a394a2b35e0a/wrapt-1.17.3-cp314-cp314-win32.whl", hash = "sha256:fbd3c8319de8e1dc79d346929cd71d523622da527cca14e0c1d257e31c2b8b10", size = 37178, upload-time = "2025-08-12T05:53:12.605Z" }, + { url = "https://files.pythonhosted.org/packages/db/c8/b71eeb192c440d67a5a0449aaee2310a1a1e8eca41676046f99ed2487e9f/wrapt-1.17.3-cp314-cp314-win_amd64.whl", hash = "sha256:e1a4120ae5705f673727d3253de3ed0e016f7cd78dc463db1b31e2463e1f3cf6", size = 39310, upload-time = "2025-08-12T05:53:11.106Z" }, + { url = "https://files.pythonhosted.org/packages/45/20/2cda20fd4865fa40f86f6c46ed37a2a8356a7a2fde0773269311f2af56c7/wrapt-1.17.3-cp314-cp314-win_arm64.whl", hash = "sha256:507553480670cab08a800b9463bdb881b2edeed77dc677b0a5915e6106e91a58", size = 37266, upload-time = "2025-08-12T05:52:56.531Z" }, + { url = "https://files.pythonhosted.org/packages/77/ed/dd5cf21aec36c80443c6f900449260b80e2a65cf963668eaef3b9accce36/wrapt-1.17.3-cp314-cp314t-macosx_10_13_universal2.whl", hash = "sha256:ed7c635ae45cfbc1a7371f708727bf74690daedc49b4dba310590ca0bd28aa8a", size = 56544, upload-time = "2025-08-12T05:51:51.109Z" }, + { url = "https://files.pythonhosted.org/packages/8d/96/450c651cc753877ad100c7949ab4d2e2ecc4d97157e00fa8f45df682456a/wrapt-1.17.3-cp314-cp314t-macosx_10_13_x86_64.whl", hash = "sha256:249f88ed15503f6492a71f01442abddd73856a0032ae860de6d75ca62eed8067", size = 40283, upload-time = "2025-08-12T05:51:39.912Z" }, + { url = "https://files.pythonhosted.org/packages/d1/86/2fcad95994d9b572db57632acb6f900695a648c3e063f2cd344b3f5c5a37/wrapt-1.17.3-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:5a03a38adec8066d5a37bea22f2ba6bbf39fcdefbe2d91419ab864c3fb515454", size = 40366, upload-time = "2025-08-12T05:52:00.693Z" }, + { url = "https://files.pythonhosted.org/packages/64/0e/f4472f2fdde2d4617975144311f8800ef73677a159be7fe61fa50997d6c0/wrapt-1.17.3-cp314-cp314t-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:5d4478d72eb61c36e5b446e375bbc49ed002430d17cdec3cecb36993398e1a9e", size = 108571, upload-time = "2025-08-12T05:52:44.521Z" }, + { url = "https://files.pythonhosted.org/packages/cc/01/9b85a99996b0a97c8a17484684f206cbb6ba73c1ce6890ac668bcf3838fb/wrapt-1.17.3-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:223db574bb38637e8230eb14b185565023ab624474df94d2af18f1cdb625216f", size = 113094, upload-time = "2025-08-12T05:52:22.618Z" }, + { url = "https://files.pythonhosted.org/packages/25/02/78926c1efddcc7b3aa0bc3d6b33a822f7d898059f7cd9ace8c8318e559ef/wrapt-1.17.3-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:e405adefb53a435f01efa7ccdec012c016b5a1d3f35459990afc39b6be4d5056", size = 110659, upload-time = "2025-08-12T05:52:24.057Z" }, + { url = "https://files.pythonhosted.org/packages/dc/ee/c414501ad518ac3e6fe184753632fe5e5ecacdcf0effc23f31c1e4f7bfcf/wrapt-1.17.3-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:88547535b787a6c9ce4086917b6e1d291aa8ed914fdd3a838b3539dc95c12804", size = 106946, upload-time = "2025-08-12T05:52:45.976Z" }, + { url = "https://files.pythonhosted.org/packages/be/44/a1bd64b723d13bb151d6cc91b986146a1952385e0392a78567e12149c7b4/wrapt-1.17.3-cp314-cp314t-win32.whl", hash = "sha256:41b1d2bc74c2cac6f9074df52b2efbef2b30bdfe5f40cb78f8ca22963bc62977", size = 38717, upload-time = "2025-08-12T05:53:15.214Z" }, + { url = "https://files.pythonhosted.org/packages/79/d9/7cfd5a312760ac4dd8bf0184a6ee9e43c33e47f3dadc303032ce012b8fa3/wrapt-1.17.3-cp314-cp314t-win_amd64.whl", hash = "sha256:73d496de46cd2cdbdbcce4ae4bcdb4afb6a11234a1df9c085249d55166b95116", size = 41334, upload-time = "2025-08-12T05:53:14.178Z" }, + { url = "https://files.pythonhosted.org/packages/46/78/10ad9781128ed2f99dbc474f43283b13fea8ba58723e98844367531c18e9/wrapt-1.17.3-cp314-cp314t-win_arm64.whl", hash = "sha256:f38e60678850c42461d4202739f9bf1e3a737c7ad283638251e79cc49effb6b6", size = 38471, upload-time = "2025-08-12T05:52:57.784Z" }, + { url = "https://files.pythonhosted.org/packages/1f/f6/a933bd70f98e9cf3e08167fc5cd7aaaca49147e48411c0bd5ae701bb2194/wrapt-1.17.3-py3-none-any.whl", hash = "sha256:7171ae35d2c33d326ac19dd8facb1e82e5fd04ef8c6c0e394d7af55a55051c22", size = 23591, upload-time = "2025-08-12T05:53:20.674Z" }, +] + +[[package]] +name = "yarl" +version = "1.24.2" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "idna" }, + { name = "multidict" }, + { name = "propcache" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/79/12/1e8f37460ea0f7eb59c221fdaf0ed75e7ac43e97f8093b9c6f411df50a78/yarl-1.24.2.tar.gz", hash = "sha256:9ac374123c6fd7abf64d1fec93962b0bd4ee2c19751755a762a72dd96c0378f8", size = 210798, upload-time = "2026-05-19T21:31:05.599Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/40/0e/e08087695fc12789263821c5dc0f8dc52b5b17efd0887cacf419f8a43ba3/yarl-1.24.2-cp314-cp314-macosx_10_15_universal2.whl", hash = "sha256:f9312b3c02d9b3d23840f67952913c9c8721d7f1b7db305289faefa878f364c2", size = 129670, upload-time = "2026-05-19T21:29:56.631Z" }, + { url = "https://files.pythonhosted.org/packages/3a/98/ab4b5ed1b1b5cd973c8a3eb994c3a6aefb6ce6d399e21bb5f0316c33815c/yarl-1.24.2-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:a4f4d6cd615823bfc7fb7e9b5987c3f41666371d870d51058f77e2680fbe9630", size = 91916, upload-time = "2026-05-19T21:29:58.645Z" }, + { url = "https://files.pythonhosted.org/packages/ba/b1/5297bb6a7df4782f7605bffc43b31f5044070935fbbcaa6c705a07e6ac65/yarl-1.24.2-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:0c3063e5c0a8e8e62fae6c2596fa01da1561e4cd1da6fec5789f5cf99a8aefd8", size = 91625, upload-time = "2026-05-19T21:30:00.412Z" }, + { url = "https://files.pythonhosted.org/packages/02/a7/45baabfff76829264e623b185cff0c340d7e11bf3e1cd9ea37e7d17934bd/yarl-1.24.2-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:fecd17873a096036c1c87ab3486f1aef7f269ada7f23f7f856f93b1cc7744f14", size = 104574, upload-time = "2026-05-19T21:30:02.544Z" }, + { url = "https://files.pythonhosted.org/packages/f3/40/3a5ab144d3d650ca37d4f4b57e56169be8af3ca34c448793e064b30baaed/yarl-1.24.2-cp314-cp314-manylinux2014_armv7l.manylinux_2_17_armv7l.manylinux_2_31_armv7l.whl", hash = "sha256:a46d1ab4ba4d32e6dc80daf8a28ce0bd83d08df52fbc32f3e288663427734535", size = 97534, upload-time = "2026-05-19T21:30:04.319Z" }, + { url = "https://files.pythonhosted.org/packages/9c/b5/5658fef3681fb5776b4513b052bec750009f47b3a592251c705d75375798/yarl-1.24.2-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:73e68edf6dfd5f73f9ca127d84e2a6f9213c65bdffb736bda19524c0564fcd14", size = 111481, upload-time = "2026-05-19T21:30:05.988Z" }, + { url = "https://files.pythonhosted.org/packages/4c/06/fdcd7dde037f00866dce123ed4ba23dba94beb56fc4cf561668d27be37f2/yarl-1.24.2-cp314-cp314-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:a296ca617f2d25fbceafb962b88750d627e5984e75732c712154d058ae8d79a3", size = 111529, upload-time = "2026-05-19T21:30:07.738Z" }, + { url = "https://files.pythonhosted.org/packages/c2/53/d81269aaafccea0d33396c03035de997b743f11e648e6e27a0df99c72980/yarl-1.24.2-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:e51b2cf5ec89a8b8470177641ed62a3ba22d74e1e898e06ad53aa77972487208", size = 107338, upload-time = "2026-05-19T21:30:09.713Z" }, + { url = "https://files.pythonhosted.org/packages/ae/04/23049463f729bd899df203a7960505a75333edd499cda8aa1d5a82b64df5/yarl-1.24.2-cp314-cp314-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:310fc687f7b2044ec54e372c8cbe923bb88f5c37bded0d3079e5791c2fc3cf50", size = 106147, upload-time = "2026-05-19T21:30:11.365Z" }, + { url = "https://files.pythonhosted.org/packages/14/18/04a4b5830b43ed5e4c5015b40e9f6241ad91487d71611061b4e111d6ac80/yarl-1.24.2-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:297a2fe352ecf858b30a98f87948746ec16f001d279f84aebdbd3bd965e2f1bd", size = 104272, upload-time = "2026-05-19T21:30:12.978Z" }, + { url = "https://files.pythonhosted.org/packages/5a/f7/8cffdf319aee7a7c1dbd07b61d91c3e3fda460c7a93b5f93e445f3806c4c/yarl-1.24.2-cp314-cp314-musllinux_1_2_armv7l.whl", hash = "sha256:2a263e76b97bc42bdcd7c5f4953dec1f7cd62a1112fa7f869e57255229390d67", size = 99962, upload-time = "2026-05-19T21:30:15.001Z" }, + { url = "https://files.pythonhosted.org/packages/d7/39/b3cce3b7dbef64ac700ad4cea156a207d01bede0f507587616c364b5468e/yarl-1.24.2-cp314-cp314-musllinux_1_2_ppc64le.whl", hash = "sha256:822519b64cf0b474f1a0aaef1dc621438ea46bb77c94df97a5b4d213a7d8a8b1", size = 111063, upload-time = "2026-05-19T21:30:16.683Z" }, + { url = "https://files.pythonhosted.org/packages/a1/ea/100818505e7ebf165c7242ff17fdf7d9fee79e27234aeca871c1082920d7/yarl-1.24.2-cp314-cp314-musllinux_1_2_riscv64.whl", hash = "sha256:b6067060d9dc594899ba83e6db6c48c68d1e494a6dab158156ed86977ca7bcb1", size = 105438, upload-time = "2026-05-19T21:30:18.769Z" }, + { url = "https://files.pythonhosted.org/packages/8f/d2/e075a0b32aa6625087de9e653087df0759fed5de4a435fef594181102a77/yarl-1.24.2-cp314-cp314-musllinux_1_2_s390x.whl", hash = "sha256:0063adad533e57171b79db3943b229d40dfafeeee579767f96541f106bac5f1b", size = 111458, upload-time = "2026-05-19T21:30:21.024Z" }, + { url = "https://files.pythonhosted.org/packages/e6/5c/ceea7ba98b65c8eb8d947fdc52f9bedfcd43c6a57c9e3c90c17be8f324a3/yarl-1.24.2-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:ee8e3fb34513e8dc082b586ef4910c98335d43a6fab688cd44d4851bacfce3e8", size = 107589, upload-time = "2026-05-19T21:30:23.412Z" }, + { url = "https://files.pythonhosted.org/packages/fa/d9/5582d57e2b2db9b85eb6663a22efdd78e08805f3f5389566e9fcad254d1b/yarl-1.24.2-cp314-cp314-win_amd64.whl", hash = "sha256:afb00d7fd8e0f285ca29a44cc50df2d622ff2f7a6d933fa641577b5f9d5f3db0", size = 94424, upload-time = "2026-05-19T21:30:25.425Z" }, + { url = "https://files.pythonhosted.org/packages/92/10/7dc07a0e22806a9280f42a57361395506e800c64e22737cd7b0886feab42/yarl-1.24.2-cp314-cp314-win_arm64.whl", hash = "sha256:68cf6eacd6028ef1142bc4b48376b81566385ca6f9e7dde3b0fa91be08ffcb57", size = 88690, upload-time = "2026-05-19T21:30:27.623Z" }, + { url = "https://files.pythonhosted.org/packages/9e/13/d5b8e2c8667db955bcb3de233f18798fefe7edf1d7429c2c9d4f9c401114/yarl-1.24.2-cp314-cp314t-macosx_10_15_universal2.whl", hash = "sha256:221ce1dd921ac4f603957f17d7c18c5cc0797fbb52f156941f92e04605d1d67b", size = 136248, upload-time = "2026-05-19T21:30:29.297Z" }, + { url = "https://files.pythonhosted.org/packages/de/46/a4a97c05c9c9b8fd266bb2a0df12992c7fbd02391eb9640583411b6dab32/yarl-1.24.2-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:5f3224db28173a00d7afacdee07045cc4673dfab2b15492c7ae10deddbece761", size = 95084, upload-time = "2026-05-19T21:30:31.031Z" }, + { url = "https://files.pythonhosted.org/packages/95/b2/845cf2074a015e6fe0d0808cf1a2d9e868386c4220d657ebd8302b199043/yarl-1.24.2-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:c557165320d6244ebe3a02431b2a201a20080e02f41f0cfa0ccc47a183765da8", size = 95272, upload-time = "2026-05-19T21:30:33.062Z" }, + { url = "https://files.pythonhosted.org/packages/fe/16/e69d4aa244aef45235ddfebc0e04036a6829842bc5a6a795aedc6c998d23/yarl-1.24.2-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:904065e6e85b1fa54d0d87438bd58c14c0bad97aad654ad1077fd9d87e8478ed", size = 101497, upload-time = "2026-05-19T21:30:34.842Z" }, + { url = "https://files.pythonhosted.org/packages/15/94/c07107715d621076863ee88b3ddf183fa5e9d4aba5769623c9979828410a/yarl-1.24.2-cp314-cp314t-manylinux2014_armv7l.manylinux_2_17_armv7l.manylinux_2_31_armv7l.whl", hash = "sha256:8cec2a38d70edc10e0e856ceda886af5327a017ccbde8e1de1bd44d300357543", size = 94002, upload-time = "2026-05-19T21:30:37.724Z" }, + { url = "https://files.pythonhosted.org/packages/a9/35/fc1bbdd895b5e4010b8fdd037f7ed3aa289d3863e08231b30231ca9a0815/yarl-1.24.2-cp314-cp314t-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:e7484b9361ed222ee1ca5b4337aa4cbdcc4618ce5aff57d9ef1582fd95893fc0", size = 106524, upload-time = "2026-05-19T21:30:40.196Z" }, + { url = "https://files.pythonhosted.org/packages/1f/f2/32b66d0a4ba47c296cf86d03e2c67bff58399fe6d6d84d5205c04c66cc6d/yarl-1.24.2-cp314-cp314t-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:84f9670b89f34db07f81e53aee83e0b938a3412329d51c8f922488be7fcc4024", size = 106165, upload-time = "2026-05-19T21:30:41.888Z" }, + { url = "https://files.pythonhosted.org/packages/95/47/37cb5ff50c5e825d4d38e81bb04d1b7e96bf960f7ab89f9850b162f3f114/yarl-1.24.2-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:abb2759733d63a28b4956500a5dd57140f26486c92b2caedfb964ab7d9b79dbf", size = 103010, upload-time = "2026-05-19T21:30:43.985Z" }, + { url = "https://files.pythonhosted.org/packages/6f/d2/4597912315096f7bb359e46e13bf8b60994fcbb2db29b804c0902ef4eff5/yarl-1.24.2-cp314-cp314t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:081c2bf54efe03774d0311172bc04fedf9ca01e644d4cd8c805688e527209bdc", size = 101128, upload-time = "2026-05-19T21:30:46.291Z" }, + { url = "https://files.pythonhosted.org/packages/b9/d5/c8e86e120521e646013d02a8e3b8884392e28494be8f392366e50d208efc/yarl-1.24.2-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:86746bef442aa479107fe28132e1277237f9c24c2f00b0b0cf22b3ee0904f2bb", size = 101382, upload-time = "2026-05-19T21:30:48.085Z" }, + { url = "https://files.pythonhosted.org/packages/fa/98/70b229236118f89dbeb739b76f10225bbf53b5497725502594c9a01d699a/yarl-1.24.2-cp314-cp314t-musllinux_1_2_armv7l.whl", hash = "sha256:2d07d21d0bc4b17558e8de0b02fbfdf1e347d3bb3699edd00bb92e7c57925420", size = 95964, upload-time = "2026-05-19T21:30:49.785Z" }, + { url = "https://files.pythonhosted.org/packages/87/f8/56c386981e3c8648d279fdef2397ffec577e8320fd5649745e34d54faeb7/yarl-1.24.2-cp314-cp314t-musllinux_1_2_ppc64le.whl", hash = "sha256:4fb1ac3fc5fecd8ae7453ea237e4d22b49befa70266dfe1629924245c21a0c7f", size = 106204, upload-time = "2026-05-19T21:30:51.862Z" }, + { url = "https://files.pythonhosted.org/packages/1a/1e/765afe97811ca35933e2a7de70ac57b1997ea2e4ee895719ee7a231fb7e5/yarl-1.24.2-cp314-cp314t-musllinux_1_2_riscv64.whl", hash = "sha256:4da31a5512ed1729ca8d8aacde3f7faeb8843cde3165d6bcf7f88f74f17bb8aa", size = 101510, upload-time = "2026-05-19T21:30:53.62Z" }, + { url = "https://files.pythonhosted.org/packages/ee/78/393913f4b9039e1edd09ae8a9bbb9d539be909a8abf6d8a2084585bed4b7/yarl-1.24.2-cp314-cp314t-musllinux_1_2_s390x.whl", hash = "sha256:533ded4dceb5f1f3da7906244f4e82cf46cfd40d84c69a1faf5ac506aa65ecbe", size = 105584, upload-time = "2026-05-19T21:30:55.962Z" }, + { url = "https://files.pythonhosted.org/packages/78/87/deb17b7049bbe74ea11a713b86f8f27800cc1c8648b0b797243ebb4830ba/yarl-1.24.2-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:7b3a85525f6e7eeabcfdd372862b21ee1915db1b498a04e8bf0e389b607ff0bd", size = 103410, upload-time = "2026-05-19T21:30:57.962Z" }, + { url = "https://files.pythonhosted.org/packages/8f/be/f9f7594e23b5b93affff0318e4593c1920331bcaefda326cabcad94296a1/yarl-1.24.2-cp314-cp314t-win_amd64.whl", hash = "sha256:a7624b1ca46ca5d7b864ef0d2f8efe3091454085ee1855b4e992314529972215", size = 102980, upload-time = "2026-05-19T21:30:59.735Z" }, + { url = "https://files.pythonhosted.org/packages/65/a4/ba80dccd3593ff1f01051a818694d07b58cb8232677ee9a22a5a1f93a9fc/yarl-1.24.2-cp314-cp314t-win_arm64.whl", hash = "sha256:e434a45ce2e7a947f951fc5a8944c8cc080b7e59f9c50ae80fd39107cf88126d", size = 91219, upload-time = "2026-05-19T21:31:01.934Z" }, + { url = "https://files.pythonhosted.org/packages/fd/4d/4b880086bd0d3e034d25647be1d830afc3e3f610e98c4ab3490af6b1b6d5/yarl-1.24.2-py3-none-any.whl", hash = "sha256:2783d9226db8797636cd6896e4de81feed252d1db72265686c9558d97a4d94b9", size = 53576, upload-time = "2026-05-19T21:31:03.909Z" }, ] From 0264d351452fa6ca37e7ee86ffa9a5be36052598 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Tue, 16 Jun 2026 09:19:47 -0700 Subject: [PATCH 126/591] Added dependencies for boto and S3 --- .../src/mpcontribs_api/dependencies.py | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/dependencies.py b/mpcontribs-api/src/mpcontribs_api/dependencies.py index 3b68834e8a..308b53e3ba 100644 --- a/mpcontribs-api/src/mpcontribs_api/dependencies.py +++ b/mpcontribs-api/src/mpcontribs_api/dependencies.py @@ -1,19 +1,19 @@ +from contextlib import AbstractAsyncContextManager from typing import Annotated +import aioboto3 import structlog from fastapi import Depends, Request from pymongo import AsyncMongoClient from pymongo.asynchronous.database import AsyncDatabase +from types_aiobotocore_s3 import S3Client from mpcontribs_api.auth import User -from mpcontribs_api.config import get_settings from mpcontribs_api.exceptions import ( AuthenticationError, PermissionError, ) -settings = get_settings() - def get_db(request: Request) -> AsyncDatabase: return request.app.state.db @@ -22,6 +22,20 @@ def get_db(request: Request) -> AsyncDatabase: DbDep = Annotated[AsyncDatabase, Depends(get_db)] +def get_boto(request: Request) -> aioboto3.Session: + return request.app.state.boto_session + + +BotoDep = Annotated[aioboto3.Session, Depends(get_boto)] + + +def get_s3(request: Request) -> AbstractAsyncContextManager[S3Client]: + return request.app.state.s3 + + +S3Dep = Annotated[AbstractAsyncContextManager[S3Client], Depends(get_s3)] + + def get_mongo_client(request: Request) -> AsyncMongoClient: return request.app.state.mongo_client From a69e64d50e0e4c73707ed29c3e8a6b832ba2ce5d Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Tue, 16 Jun 2026 15:56:13 -0700 Subject: [PATCH 127/591] Changed filename to authz to clarify that it is authorization --- mpcontribs-api/src/mpcontribs_api/{auth.py => authz.py} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename mpcontribs-api/src/mpcontribs_api/{auth.py => authz.py} (100%) diff --git a/mpcontribs-api/src/mpcontribs_api/auth.py b/mpcontribs-api/src/mpcontribs_api/authz.py similarity index 100% rename from mpcontribs-api/src/mpcontribs_api/auth.py rename to mpcontribs-api/src/mpcontribs_api/authz.py From bfb32c96fe89510ea05b71a10d9c8272d7dcf872 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Tue, 16 Jun 2026 15:57:29 -0700 Subject: [PATCH 128/591] Added S3Dep and s3 reliance to download methods; modified auth import to authz --- mpcontribs-api/src/mpcontribs_api/app.py | 2 +- mpcontribs-api/src/mpcontribs_api/config.py | 16 ++++++++++------ .../src/mpcontribs_api/dependencies.py | 2 +- .../domains/_shared/components.py | 2 +- .../domains/_shared/repository.py | 18 ++++++++++++++++-- .../domains/attachments/repository.py | 6 ++++++ .../domains/attachments/router.py | 6 ++++-- .../domains/contributions/repository.py | 10 +++++++++- .../domains/contributions/router.py | 4 ++++ .../domains/contributions/service.py | 6 ++++-- .../domains/projects/repository.py | 2 +- .../domains/structures/repository.py | 7 +++++++ .../domains/structures/router.py | 7 +++++++ .../domains/tables/repository.py | 8 ++++++++ .../mpcontribs_api/domains/tables/router.py | 7 +++++++ 15 files changed, 86 insertions(+), 17 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/app.py b/mpcontribs-api/src/mpcontribs_api/app.py index 7def06bc74..6c7aaee09b 100644 --- a/mpcontribs-api/src/mpcontribs_api/app.py +++ b/mpcontribs-api/src/mpcontribs_api/app.py @@ -13,7 +13,7 @@ from mpcontribs_api._openapi import contact_info, license_info, openapi_tags from mpcontribs_api.api.v1.router import router as v1_router -from mpcontribs_api.auth import api_key_scheme +from mpcontribs_api.authz import api_key_scheme from mpcontribs_api.config import Settings, get_settings from mpcontribs_api.domains.attachments.models import Attachment from mpcontribs_api.domains.contributions.models import Contribution diff --git a/mpcontribs-api/src/mpcontribs_api/config.py b/mpcontribs-api/src/mpcontribs_api/config.py index 9d744c53b2..b1c25ff3e5 100644 --- a/mpcontribs-api/src/mpcontribs_api/config.py +++ b/mpcontribs-api/src/mpcontribs_api/config.py @@ -10,8 +10,8 @@ class RedisSettings(BaseModel): url: SecretStr -class KongSettings(BaseModel): - gateway_secret: SecretStr +# class KongSettings(BaseModel): +# gateway_secret: SecretStr class AwsSettings(BaseModel): @@ -20,9 +20,9 @@ class AwsSettings(BaseModel): Primarily used for S3 access """ - region: str = Field("east1", description="The region to connect to") + region: str = Field(default="us-east-1", description="The region to connect to") max_pool_connections: int = Field( - 10, + default=10, description="The maximum number of connections the app is allowed to have to S3", ) @@ -33,8 +33,11 @@ class MongoSettings(BaseModel): Provided defaults are the defaults of AsyncMongoClient """ + # Required uri: SecretStr = Field(description="The full uri from MongoDB (username and password included)") db_name: str + + # Optional app_name: str = Field( default="MPContribs_FastAPI_Server", description="The name of the application that created this AsyncMongoClient instance. The server will log this " @@ -125,13 +128,14 @@ class Settings(BaseSettings): environment: Literal["dev", "prod"] # MPContribs_mongo__* + # requires uri and db_name mongo: MongoSettings # MPContribs_aws__* - aws: AwsSettings + aws: AwsSettings = Field(default_factory=AwsSettings) # MPContribs_kong__* - kong: KongSettings + # kong: KongSettings # MPContribs_redis__* redis: RedisSettings diff --git a/mpcontribs-api/src/mpcontribs_api/dependencies.py b/mpcontribs-api/src/mpcontribs_api/dependencies.py index 308b53e3ba..db663769db 100644 --- a/mpcontribs-api/src/mpcontribs_api/dependencies.py +++ b/mpcontribs-api/src/mpcontribs_api/dependencies.py @@ -8,7 +8,7 @@ from pymongo.asynchronous.database import AsyncDatabase from types_aiobotocore_s3 import S3Client -from mpcontribs_api.auth import User +from mpcontribs_api.authz import User from mpcontribs_api.exceptions import ( AuthenticationError, PermissionError, diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py index a0904df163..cf13c22579 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py @@ -6,7 +6,7 @@ from pydantic import BaseModel from pymongo.asynchronous.client_session import AsyncClientSession -from mpcontribs_api.auth import User +from mpcontribs_api.authz import User from mpcontribs_api.config import get_settings from mpcontribs_api.domains._shared.models import Component, DeleteResponse, DocumentOut from mpcontribs_api.domains._shared.repository import MongoDbRepository diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py index cc7771d1b1..4da5b2d736 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py @@ -5,6 +5,7 @@ import zlib from abc import ABC, abstractmethod from collections.abc import AsyncIterable, AsyncIterator, Callable +from contextlib import AbstractAsyncContextManager from typing import Any from beanie import PydanticObjectId, UpdateResponse @@ -13,8 +14,9 @@ from fastapi_filter.contrib.beanie import Filter from pydantic import BaseModel from pymongo.asynchronous.client_session import AsyncClientSession +from types_aiobotocore_s3 import S3Client -from mpcontribs_api.auth import User +from mpcontribs_api.authz import User from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DeleteResponse, DocumentOut from mpcontribs_api.domains._shared.types import DownloadFormat, ShortMimeFormat from mpcontribs_api.exceptions import ConflictError, NotFoundError, ValidationError @@ -233,6 +235,14 @@ async def _serialize_csv(rows: AsyncIterable, fields: frozenset[str] | None) -> buf.seek(0) buf.truncate(0) + async def _s3_object_exists(self, bucket_name: str, key_name: str, s3: AbstractAsyncContextManager[S3Client]): + async with s3 as s3_client: + try: + await s3_client.head_object(Bucket=bucket_name, Key=key_name) + return True + except Exception: + return False + async def download( self, format: DownloadFormat, @@ -240,6 +250,9 @@ async def download( ignore_cache: bool, filter: TFilter, fields: frozenset[str] | None, + s3: AbstractAsyncContextManager[S3Client], + bucket_name: str, + key_name: str, ) -> AsyncIterable[bytes]: # Hash parameters to generate key for cache payload = { @@ -252,7 +265,8 @@ async def download( # Check S3 for the cached file # TODO: Implement - if not ignore_cache: + if not ignore_cache and self._s3_object_exists(bucket_name=bucket_name, key_name=key_name, s3=s3): + # Download from either presigned url or bytes pass # If not found in cache, build from MongoDB and save to cache diff --git a/mpcontribs-api/src/mpcontribs_api/domains/attachments/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/attachments/repository.py index 8d5fb5c686..1769465780 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/attachments/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/attachments/repository.py @@ -1,6 +1,8 @@ from collections.abc import AsyncIterable +from contextlib import AbstractAsyncContextManager from pymongo.asynchronous.client_session import AsyncClientSession +from types_aiobotocore_s3 import S3Client from mpcontribs_api.domains._shared.components import MongoDbComponentsRepository from mpcontribs_api.domains._shared.models import DeleteResponse @@ -41,6 +43,7 @@ async def download_attachments( ignore_cache: bool, filter: AttachmentFilter, fields: frozenset[str] | None, + s3: AbstractAsyncContextManager[S3Client], ) -> AsyncIterable[bytes]: return self.download( format=format, @@ -48,6 +51,9 @@ async def download_attachments( ignore_cache=ignore_cache, filter=filter, fields=fields, + s3=s3, + bucket_name="attachments", + key_name="", ) async def delete_attachments( diff --git a/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py b/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py index 01ad34b71b..cadeb62fe1 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py @@ -1,9 +1,10 @@ from typing import Annotated -from fastapi import APIRouter, Depends, Response +from fastapi import APIRouter, Depends from fastapi.responses import StreamingResponse from fastapi_filter import FilterDepends +from mpcontribs_api.dependencies import S3Dep from mpcontribs_api.domains._shared.models import DeleteResponse from mpcontribs_api.domains._shared.types import ( DownloadFormat, @@ -42,8 +43,8 @@ async def get_attachment( @router.get("/download/{short_mime}") async def download_attachment( repo: AttachmentDep, - response: Response, format: DownloadFormat, + s3: S3Dep, short_mime: ShortMimeFormat = ShortMimeFormat.GZ, ignore_cache: bool = False, filter: AttachmentFilter = FilterDepends(AttachmentFilter), @@ -56,6 +57,7 @@ async def download_attachment( ignore_cache=ignore_cache, filter=filter, fields=selected, + s3=s3, ) filename = download_filename("attachments", format, short_mime) return StreamingResponse( diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py index a82be85583..a281d039af 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py @@ -1,12 +1,14 @@ from collections.abc import AsyncIterable +from contextlib import AbstractAsyncContextManager from typing import Any from beanie import UpdateResponse from beanie.operators import Set from pymongo.asynchronous.client_session import AsyncClientSession from pymongo.results import DeleteResult +from types_aiobotocore_s3 import S3Client -from mpcontribs_api.auth import User +from mpcontribs_api.authz import User from mpcontribs_api.domains._shared.repository import MongoDbRepository from mpcontribs_api.domains._shared.types import DownloadFormat, ShortMimeFormat from mpcontribs_api.domains.contributions.models import ( @@ -173,6 +175,9 @@ async def download_contributions( ignore_cache: bool, filter: ContributionFilter, fields: frozenset[str] | None, + key_name: str, + s3: AbstractAsyncContextManager[S3Client], + bucket_name: str = "contributions", ) -> AsyncIterable[bytes]: return self.download( format=format, @@ -180,4 +185,7 @@ async def download_contributions( ignore_cache=ignore_cache, filter=filter, fields=fields, + bucket_name=bucket_name, + key_name=key_name, + s3=s3, ) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py index 80ee24c4f7..06d68f3700 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py @@ -4,6 +4,7 @@ from fastapi.responses import StreamingResponse from fastapi_filter import FilterDepends +from mpcontribs_api.dependencies import S3Dep from mpcontribs_api.domains._shared.bulk import BulkWriteSummary from mpcontribs_api.domains._shared.types import ( DownloadFormat, @@ -63,6 +64,7 @@ async def upsert_contributions( @router.get("/download/{short_mime}") async def download_contributions( repo: ContributionDep, + s3: S3Dep, short_mime: ShortMimeFormat = ShortMimeFormat.GZ, format: DownloadFormat = DownloadFormat.JSONL, ignore_cache: bool = False, @@ -76,6 +78,8 @@ async def download_contributions( ignore_cache=ignore_cache, filter=filter, fields=selected, + s3=s3, + key_name="", # TODO: Temp ) filename = download_filename("contributions", format, short_mime) return StreamingResponse( diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py index 4b4c6ba0a4..df9e1dc647 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py @@ -108,7 +108,8 @@ def _reject_duplicate_keys(self, contributions: list[ContributionIn]) -> None: """ seen: dict[tuple[str, str], list[int]] = defaultdict(list) for index, contribution in enumerate(contributions): - seen[(contribution.project, contribution.identifier)].append(index) + ids = contribution.identifiers() + seen[tuple(**ids)].append(index) duplicates = sorted(index for indices in seen.values() if len(indices) > 1 for index in indices) if duplicates: raise ValidationError( @@ -134,7 +135,8 @@ def _split_oversize(self, contributions: list[ContributionIn]) -> tuple[list[Bul index=i, identifier=contrib.identifiers(), error_code="validation_error", - message=f"contribution has {count} components, exceeds cap of {cap}", + message=f"contribution has {count} components, exceeds cap of {cap}. " + "Recommend inserting the component alone, followed by bulk inserts of components", ) ) else: diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py index a29bd3ec3c..2705963d07 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py @@ -1,6 +1,6 @@ from typing import Any -from mpcontribs_api.auth import User +from mpcontribs_api.authz import User from mpcontribs_api.domains._shared.repository import MongoDbRepository from mpcontribs_api.domains.projects.models import ( Project, diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/repository.py index 796b9bc5b0..6d279f79ec 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/structures/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/structures/repository.py @@ -2,6 +2,7 @@ from pymongo.asynchronous.client_session import AsyncClientSession +from mpcontribs_api.dependencies import S3Dep from mpcontribs_api.domains._shared.components import MongoDbComponentsRepository from mpcontribs_api.domains._shared.models import DeleteResponse from mpcontribs_api.domains._shared.types import DownloadFormat, ShortMimeFormat @@ -68,6 +69,9 @@ async def download_structures( ignore_cache: bool, filter: StructureFilter, fields: frozenset[str] | None, + s3: S3Dep, + bucket_name: str, + key_name: str, ) -> AsyncIterable[bytes]: return self.download( format=format, @@ -75,6 +79,9 @@ async def download_structures( ignore_cache=ignore_cache, filter=filter, fields=fields, + s3=s3, + key_name=key_name, + bucket_name=bucket_name, ) async def delete_structures( diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py index d3d51a7f2b..13684d4b53 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py @@ -4,6 +4,7 @@ from fastapi.responses import StreamingResponse from fastapi_filter import FilterDepends +from mpcontribs_api.dependencies import S3Dep from mpcontribs_api.domains._shared.bulk import BulkWriteSummary from mpcontribs_api.domains._shared.models import DeleteResponse from mpcontribs_api.domains._shared.types import ( @@ -44,6 +45,9 @@ async def get_structure( async def download_structure( repo: StructureDep, format: DownloadFormat, + s3: S3Dep, + key_name: str, + bucket_name: str = "structures", short_mime: ShortMimeFormat = ShortMimeFormat.GZ, ignore_cache: bool = False, filter: StructureFilter = FilterDepends(StructureFilter), @@ -56,6 +60,9 @@ async def download_structure( ignore_cache=ignore_cache, filter=filter, fields=selected, + key_name=key_name, + bucket_name=bucket_name, + s3=s3, ) filename = download_filename("structures", format, short_mime) return StreamingResponse( diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py index 4b1a95fadf..e9462384e2 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py @@ -1,6 +1,8 @@ from collections.abc import AsyncIterable +from contextlib import AbstractAsyncContextManager from pymongo.asynchronous.client_session import AsyncClientSession +from types_aiobotocore_s3 import S3Client from mpcontribs_api.domains._shared.components import MongoDbComponentsRepository from mpcontribs_api.domains._shared.models import DeleteResponse @@ -66,6 +68,9 @@ async def download_tables( ignore_cache: bool, filter: TableFilter, fields: frozenset[str] | None, + s3: AbstractAsyncContextManager[S3Client], + bucket_name: str, + key_name: str, ) -> AsyncIterable[bytes]: return self.download( format=format, @@ -73,6 +78,9 @@ async def download_tables( ignore_cache=ignore_cache, filter=filter, fields=fields, + s3=s3, + bucket_name=bucket_name, + key_name=key_name, ) async def delete_tables( diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py index 42cddd4654..3f24588ff2 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py @@ -4,6 +4,7 @@ from fastapi.responses import StreamingResponse from fastapi_filter import FilterDepends +from mpcontribs_api.dependencies import S3Dep from mpcontribs_api.domains._shared.bulk import BulkWriteSummary from mpcontribs_api.domains._shared.models import DeleteResponse from mpcontribs_api.domains._shared.types import ( @@ -43,11 +44,14 @@ async def get_table( @router.get("/download/{short_mime}") async def download_table( repo: TableDep, + s3: S3Dep, + key_name: str, format: DownloadFormat, short_mime: ShortMimeFormat = ShortMimeFormat.GZ, ignore_cache: bool = False, filter: TableFilter = FilterDepends(TableFilter), fields: FieldSelector = TableOut.default_fields(), + bucket_name: str = "tables", ) -> StreamingResponse: selected = TableOut.parse_fields(fields) body = await repo.download_tables( @@ -56,6 +60,9 @@ async def download_table( ignore_cache=ignore_cache, filter=filter, fields=selected, + s3=s3, + bucket_name=bucket_name, + key_name=key_name, ) filename = download_filename("tables", format, short_mime) return StreamingResponse( From d4129b4572ec405cfc58388c4254145b9ef0a066 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Tue, 16 Jun 2026 15:57:53 -0700 Subject: [PATCH 129/591] Updated auth import to authz --- .../tests/integration/db/test_components_repository.py | 2 +- .../tests/integration/db/test_contributions_repository.py | 2 +- mpcontribs-api/tests/integration/db/test_download.py | 2 +- mpcontribs-api/tests/integration/db/test_projects_repository.py | 2 +- mpcontribs-api/tests/unit/domains/test_contributions_models.py | 2 +- .../tests/unit/domains/test_shared_repository_download.py | 2 +- mpcontribs-api/tests/unit/test_auth.py | 2 +- mpcontribs-api/tests/unit/test_dependencies.py | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/mpcontribs-api/tests/integration/db/test_components_repository.py b/mpcontribs-api/tests/integration/db/test_components_repository.py index 62748248d7..d18a51c836 100644 --- a/mpcontribs-api/tests/integration/db/test_components_repository.py +++ b/mpcontribs-api/tests/integration/db/test_components_repository.py @@ -3,7 +3,7 @@ import pytest from beanie import PydanticObjectId -from mpcontribs_api.auth import User +from mpcontribs_api.authz import User from mpcontribs_api.config import get_settings from mpcontribs_api.domains._shared.types import DownloadFormat, ShortMimeFormat from mpcontribs_api.domains.attachments.models import ( diff --git a/mpcontribs-api/tests/integration/db/test_contributions_repository.py b/mpcontribs-api/tests/integration/db/test_contributions_repository.py index 83fdaa2880..4ed3b7a5b7 100644 --- a/mpcontribs-api/tests/integration/db/test_contributions_repository.py +++ b/mpcontribs-api/tests/integration/db/test_contributions_repository.py @@ -1,7 +1,7 @@ import pytest from beanie import PydanticObjectId -from mpcontribs_api.auth import User +from mpcontribs_api.authz import User from mpcontribs_api.domains.contributions.models import ( Contribution, ContributionFilter, diff --git a/mpcontribs-api/tests/integration/db/test_download.py b/mpcontribs-api/tests/integration/db/test_download.py index d229de1814..e5ddd363b7 100644 --- a/mpcontribs-api/tests/integration/db/test_download.py +++ b/mpcontribs-api/tests/integration/db/test_download.py @@ -5,7 +5,7 @@ import pytest from beanie import PydanticObjectId -from mpcontribs_api.auth import User +from mpcontribs_api.authz import User from mpcontribs_api.domains.contributions.models import Contribution, ContributionFilter from mpcontribs_api.domains.contributions.repository import MongoDbContributionRepository diff --git a/mpcontribs-api/tests/integration/db/test_projects_repository.py b/mpcontribs-api/tests/integration/db/test_projects_repository.py index ef629cb576..fc6dac2463 100644 --- a/mpcontribs-api/tests/integration/db/test_projects_repository.py +++ b/mpcontribs-api/tests/integration/db/test_projects_repository.py @@ -1,6 +1,6 @@ import pytest -from mpcontribs_api.auth import User +from mpcontribs_api.authz import User from mpcontribs_api.domains.projects.models import Project, ProjectIn, ProjectOut, ProjectPatch, Stats from mpcontribs_api.domains.projects.repository import MongoDbProjectRepository from mpcontribs_api.exceptions import ConflictError, NotFoundError diff --git a/mpcontribs-api/tests/unit/domains/test_contributions_models.py b/mpcontribs-api/tests/unit/domains/test_contributions_models.py index dcda47b93c..acabd18254 100644 --- a/mpcontribs-api/tests/unit/domains/test_contributions_models.py +++ b/mpcontribs-api/tests/unit/domains/test_contributions_models.py @@ -4,7 +4,7 @@ from beanie import PydanticObjectId from pydantic import ValidationError as PydanticValidationError -from mpcontribs_api.auth import User +from mpcontribs_api.authz import User from mpcontribs_api.domains.contributions.repository import MongoDbContributionRepository from mpcontribs_api.domains.contributions.models import ( diff --git a/mpcontribs-api/tests/unit/domains/test_shared_repository_download.py b/mpcontribs-api/tests/unit/domains/test_shared_repository_download.py index 857be36613..90fb4be133 100644 --- a/mpcontribs-api/tests/unit/domains/test_shared_repository_download.py +++ b/mpcontribs-api/tests/unit/domains/test_shared_repository_download.py @@ -12,7 +12,7 @@ from beanie import PydanticObjectId from pydantic import BaseModel -from mpcontribs_api.auth import User +from mpcontribs_api.authz import User from mpcontribs_api.domains._shared.repository import MongoDbRepository from mpcontribs_api.domains._shared.types import DownloadFormat, ShortMimeFormat diff --git a/mpcontribs-api/tests/unit/test_auth.py b/mpcontribs-api/tests/unit/test_auth.py index ee14b1a6be..6651c7d81e 100644 --- a/mpcontribs-api/tests/unit/test_auth.py +++ b/mpcontribs-api/tests/unit/test_auth.py @@ -1,6 +1,6 @@ import pytest -from mpcontribs_api.auth import ADMIN_GROUP, User +from mpcontribs_api.authz import ADMIN_GROUP, User class TestUserIsAnonymous: diff --git a/mpcontribs-api/tests/unit/test_dependencies.py b/mpcontribs-api/tests/unit/test_dependencies.py index af8c03bf13..80c089b60a 100644 --- a/mpcontribs-api/tests/unit/test_dependencies.py +++ b/mpcontribs-api/tests/unit/test_dependencies.py @@ -2,7 +2,7 @@ import pytest -from mpcontribs_api.auth import User +from mpcontribs_api.authz import User from mpcontribs_api.dependencies import _split, get_user, require_user from mpcontribs_api.exceptions import AuthenticationError From 937be7d8d6b6fdcbe7e057d77639e03f61067202 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Tue, 16 Jun 2026 16:05:06 -0700 Subject: [PATCH 130/591] Uncommented kong in settings --- mpcontribs-api/src/mpcontribs_api/config.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/config.py b/mpcontribs-api/src/mpcontribs_api/config.py index b1c25ff3e5..74fe28dc28 100644 --- a/mpcontribs-api/src/mpcontribs_api/config.py +++ b/mpcontribs-api/src/mpcontribs_api/config.py @@ -10,8 +10,8 @@ class RedisSettings(BaseModel): url: SecretStr -# class KongSettings(BaseModel): -# gateway_secret: SecretStr +class KongSettings(BaseModel): + gateway_secret: SecretStr class AwsSettings(BaseModel): @@ -135,7 +135,7 @@ class Settings(BaseSettings): aws: AwsSettings = Field(default_factory=AwsSettings) # MPContribs_kong__* - # kong: KongSettings + kong: KongSettings # MPContribs_redis__* redis: RedisSettings From 453845c1a3208ff250c84186ca7d20e003dcca6e Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Tue, 16 Jun 2026 16:44:54 -0700 Subject: [PATCH 131/591] Modified S3Dep to return the client rather than a generator; moved key_name and bucket_name out of router function defs since they are in flux --- mpcontribs-api/src/mpcontribs_api/config.py | 4 ++ .../src/mpcontribs_api/dependencies.py | 5 +- .../domains/contributions/service.py | 9 ++- .../domains/healthcheck/router.py | 20 +++++- .../domains/structures/router.py | 6 +- .../mpcontribs_api/domains/tables/router.py | 6 +- mpcontribs-api/tests/integration/conftest.py | 1 + .../db/test_components_repository.py | 2 + .../tests/integration/db/test_download.py | 3 + .../tests/integration/test_healthcheck.py | 63 ++++++++++++++++--- .../test_shared_repository_download.py | 9 +++ 11 files changed, 103 insertions(+), 25 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/config.py b/mpcontribs-api/src/mpcontribs_api/config.py index 74fe28dc28..aab677eb74 100644 --- a/mpcontribs-api/src/mpcontribs_api/config.py +++ b/mpcontribs-api/src/mpcontribs_api/config.py @@ -25,6 +25,10 @@ class AwsSettings(BaseModel): default=10, description="The maximum number of connections the app is allowed to have to S3", ) + health_bucket: str = Field( + default="contributions", + description="The S3 bucket probed by the healthcheck to verify connectivity", + ) class MongoSettings(BaseModel): diff --git a/mpcontribs-api/src/mpcontribs_api/dependencies.py b/mpcontribs-api/src/mpcontribs_api/dependencies.py index db663769db..1d55c2e5b7 100644 --- a/mpcontribs-api/src/mpcontribs_api/dependencies.py +++ b/mpcontribs-api/src/mpcontribs_api/dependencies.py @@ -1,4 +1,3 @@ -from contextlib import AbstractAsyncContextManager from typing import Annotated import aioboto3 @@ -29,11 +28,11 @@ def get_boto(request: Request) -> aioboto3.Session: BotoDep = Annotated[aioboto3.Session, Depends(get_boto)] -def get_s3(request: Request) -> AbstractAsyncContextManager[S3Client]: +def get_s3(request: Request) -> S3Client: return request.app.state.s3 -S3Dep = Annotated[AbstractAsyncContextManager[S3Client], Depends(get_s3)] +S3Dep = Annotated[S3Client, Depends(get_s3)] def get_mongo_client(request: Request) -> AsyncMongoClient: diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py index df9e1dc647..70122f1000 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py @@ -101,15 +101,18 @@ async def insert_contributions( return BulkWriteSummary[Contribution](total=len(contributions), succeeded=succeeded, failed=failed) def _reject_duplicate_keys(self, contributions: list[ContributionIn]) -> None: - """Reject the whole batch if any (project, identifier) appears more than once. + """Reject the whole batch if any identifying key appears more than once. Mongo would surface this as a duplicate key error; catching it upfront keeps a guaranteed failure from consuming a transaction slot and gives the caller all offending indices at once. + + The dedup key is derived from every value in ``identifiers()`` so adding a field to the + uniqueness contract there flows through here automatically. """ - seen: dict[tuple[str, str], list[int]] = defaultdict(list) + seen: dict[tuple[str, ...], list[int]] = defaultdict(list) for index, contribution in enumerate(contributions): ids = contribution.identifiers() - seen[tuple(**ids)].append(index) + seen[tuple(ids.values())].append(index) duplicates = sorted(index for indices in seen.values() if len(indices) > 1 for index in indices) if duplicates: raise ValidationError( diff --git a/mpcontribs-api/src/mpcontribs_api/domains/healthcheck/router.py b/mpcontribs-api/src/mpcontribs_api/domains/healthcheck/router.py index ef751c4d84..e099971ab6 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/healthcheck/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/healthcheck/router.py @@ -1,18 +1,23 @@ +from botocore.exceptions import BotoCoreError, ClientError from fastapi import APIRouter, HTTPException, status from pydantic import BaseModel -from mpcontribs_api.dependencies import DbDep +from mpcontribs_api.config import get_settings +from mpcontribs_api.dependencies import DbDep, S3Dep router = APIRouter(tags=["health"]) +settings = get_settings() + class HealthStatus(BaseModel): status: str mongo: str + s3: str @router.get("", response_model=HealthStatus, summary="Service health") -async def healthcheck(db: DbDep) -> HealthStatus: +async def healthcheck(db: DbDep, s3_client: S3Dep) -> HealthStatus: try: await db.client.admin.command("ping") except Exception: @@ -20,4 +25,13 @@ async def healthcheck(db: DbDep) -> HealthStatus: status_code=status.HTTP_503_SERVICE_UNAVAILABLE, detail={"status": "unhealthy", "mongo": "unreachable"}, ) from None - return HealthStatus(status="healthy", mongo="ok") + + try: + await s3_client.head_bucket(Bucket=settings.aws.health_bucket) + except (ClientError, BotoCoreError): + raise HTTPException( + status_code=status.HTTP_503_SERVICE_UNAVAILABLE, + detail={"status": "unhealthy", "s3": "unreachable"}, + ) from None + + return HealthStatus(status="healthy", mongo="ok", s3="ok") diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py index 13684d4b53..619d5d7308 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py @@ -46,8 +46,6 @@ async def download_structure( repo: StructureDep, format: DownloadFormat, s3: S3Dep, - key_name: str, - bucket_name: str = "structures", short_mime: ShortMimeFormat = ShortMimeFormat.GZ, ignore_cache: bool = False, filter: StructureFilter = FilterDepends(StructureFilter), @@ -60,8 +58,8 @@ async def download_structure( ignore_cache=ignore_cache, filter=filter, fields=selected, - key_name=key_name, - bucket_name=bucket_name, + key_name="", # TODO: Temp + bucket_name="structures", s3=s3, ) filename = download_filename("structures", format, short_mime) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py index 3f24588ff2..13e3233ce7 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py @@ -45,13 +45,11 @@ async def get_table( async def download_table( repo: TableDep, s3: S3Dep, - key_name: str, format: DownloadFormat, short_mime: ShortMimeFormat = ShortMimeFormat.GZ, ignore_cache: bool = False, filter: TableFilter = FilterDepends(TableFilter), fields: FieldSelector = TableOut.default_fields(), - bucket_name: str = "tables", ) -> StreamingResponse: selected = TableOut.parse_fields(fields) body = await repo.download_tables( @@ -61,8 +59,8 @@ async def download_table( filter=filter, fields=selected, s3=s3, - bucket_name=bucket_name, - key_name=key_name, + bucket_name="tables", + key_name="", # TODO: Temp ) filename = download_filename("tables", format, short_mime) return StreamingResponse( diff --git a/mpcontribs-api/tests/integration/conftest.py b/mpcontribs-api/tests/integration/conftest.py index 00e130edaf..3cc292882c 100644 --- a/mpcontribs-api/tests/integration/conftest.py +++ b/mpcontribs-api/tests/integration/conftest.py @@ -67,6 +67,7 @@ def make_test_app() -> FastAPI: @asynccontextmanager async def _noop_lifespan(app: FastAPI): app.state.db = MagicMock() + app.state.s3 = MagicMock() yield app = FastAPI(title="mpcontribs-test", lifespan=_noop_lifespan) diff --git a/mpcontribs-api/tests/integration/db/test_components_repository.py b/mpcontribs-api/tests/integration/db/test_components_repository.py index d18a51c836..96ad7bcd51 100644 --- a/mpcontribs-api/tests/integration/db/test_components_repository.py +++ b/mpcontribs-api/tests/integration/db/test_components_repository.py @@ -1,4 +1,5 @@ import gzip +from unittest.mock import MagicMock import pytest from beanie import PydanticObjectId @@ -161,6 +162,7 @@ async def test_jsonl_download_round_trips(self, db): ignore_cache=True, filter=AttachmentFilter(), fields=None, + s3=MagicMock(), ) chunks = [c async for c in stream] decompressed = gzip.decompress(b"".join(chunks)) diff --git a/mpcontribs-api/tests/integration/db/test_download.py b/mpcontribs-api/tests/integration/db/test_download.py index e5ddd363b7..6800689aa6 100644 --- a/mpcontribs-api/tests/integration/db/test_download.py +++ b/mpcontribs-api/tests/integration/db/test_download.py @@ -1,6 +1,7 @@ import csv import gzip import io +from unittest.mock import MagicMock import pytest from beanie import PydanticObjectId @@ -62,6 +63,8 @@ async def _download_bytes(repo: MongoDbContributionRepository, *, format="jsonl" ignore_cache=True, filter=filter or ContributionFilter(), fields=fields, + key_name="", + s3=MagicMock(), ) return gzip.decompress(await _collect(stream)) diff --git a/mpcontribs-api/tests/integration/test_healthcheck.py b/mpcontribs-api/tests/integration/test_healthcheck.py index cec2824171..a7810fcefc 100644 --- a/mpcontribs-api/tests/integration/test_healthcheck.py +++ b/mpcontribs-api/tests/integration/test_healthcheck.py @@ -1,10 +1,11 @@ from unittest.mock import AsyncMock, MagicMock import pytest +from botocore.exceptions import ClientError from fastapi import FastAPI from fastapi.testclient import TestClient -from mpcontribs_api.dependencies import get_db +from mpcontribs_api.dependencies import get_db, get_s3 from mpcontribs_api.domains.healthcheck.router import router as healthcheck_router from mpcontribs_api.exceptions import register_exception_handlers @@ -19,6 +20,18 @@ def _make_db(ping_ok: bool) -> MagicMock: return db +def _make_s3(head_ok: bool) -> MagicMock: + """Build a mock S3 client whose head_bucket is awaitable.""" + s3 = MagicMock(name="s3") + if head_ok: + s3.head_bucket = AsyncMock(return_value={}) + else: + s3.head_bucket = AsyncMock( + side_effect=ClientError({"Error": {"Code": "503", "Message": "s3 down"}}, "HeadBucket") + ) + return s3 + + @pytest.fixture def health_app() -> FastAPI: app = FastAPI() @@ -27,8 +40,9 @@ def health_app() -> FastAPI: return app -def _client(app: FastAPI, db: MagicMock) -> TestClient: +def _client(app: FastAPI, db: MagicMock, s3: MagicMock | None = None) -> TestClient: app.dependency_overrides[get_db] = lambda: db + app.dependency_overrides[get_s3] = lambda: s3 if s3 is not None else _make_s3(head_ok=True) return TestClient(app, raise_server_exceptions=False) @@ -39,25 +53,30 @@ def _client(app: FastAPI, db: MagicMock) -> TestClient: class TestHealthcheckHealthy: def test_returns_200(self, health_app): - r = _client(health_app, _make_db(ping_ok=True)).get("/health") + r = _client(health_app, _make_db(ping_ok=True), _make_s3(head_ok=True)).get("/health") assert r.status_code == 200 def test_body_reports_healthy(self, health_app): - r = _client(health_app, _make_db(ping_ok=True)).get("/health") - assert r.json() == {"status": "healthy", "mongo": "ok"} + r = _client(health_app, _make_db(ping_ok=True), _make_s3(head_ok=True)).get("/health") + assert r.json() == {"status": "healthy", "mongo": "ok", "s3": "ok"} def test_pings_mongo(self, health_app): db = _make_db(ping_ok=True) - _client(health_app, db).get("/health") + _client(health_app, db, _make_s3(head_ok=True)).get("/health") db.client.admin.command.assert_awaited_once_with("ping") + def test_probes_s3(self, health_app): + s3 = _make_s3(head_ok=True) + _client(health_app, _make_db(ping_ok=True), s3).get("/health") + s3.head_bucket.assert_awaited_once() + # --------------------------------------------------------------------------- -# Unhealthy path (DB unreachable) +# Unhealthy path (Mongo unreachable) # --------------------------------------------------------------------------- -class TestHealthcheckUnhealthy: +class TestHealthcheckMongoUnhealthy: def test_returns_503(self, health_app): r = _client(health_app, _make_db(ping_ok=False)).get("/health") assert r.status_code == 503 @@ -75,3 +94,31 @@ def test_ping_failure_does_not_leak_exception_text(self, health_app): # underlying "mongo down" ConnectionError message. r = _client(health_app, _make_db(ping_ok=False)).get("/health") assert "mongo down" not in r.text + + def test_s3_not_probed_when_mongo_down(self, health_app): + # Mongo is checked first; a failure short-circuits before S3 is touched. + s3 = _make_s3(head_ok=True) + _client(health_app, _make_db(ping_ok=False), s3).get("/health") + s3.head_bucket.assert_not_awaited() + + +# --------------------------------------------------------------------------- +# Unhealthy path (S3 unreachable) +# --------------------------------------------------------------------------- + + +class TestHealthcheckS3Unhealthy: + def test_returns_503(self, health_app): + r = _client(health_app, _make_db(ping_ok=True), _make_s3(head_ok=False)).get("/health") + assert r.status_code == 503 + + def test_body_reports_unreachable(self, health_app): + r = _client(health_app, _make_db(ping_ok=True), _make_s3(head_ok=False)).get("/health") + message = r.json()["error"]["message"] + assert "unhealthy" in message + assert "unreachable" in message + + def test_s3_failure_does_not_leak_exception_text(self, health_app): + # The controlled detail dict is returned, not the underlying boto error text. + r = _client(health_app, _make_db(ping_ok=True), _make_s3(head_ok=False)).get("/health") + assert "s3 down" not in r.text diff --git a/mpcontribs-api/tests/unit/domains/test_shared_repository_download.py b/mpcontribs-api/tests/unit/domains/test_shared_repository_download.py index 90fb4be133..8f87b219f8 100644 --- a/mpcontribs-api/tests/unit/domains/test_shared_repository_download.py +++ b/mpcontribs-api/tests/unit/domains/test_shared_repository_download.py @@ -289,6 +289,9 @@ async def test_jsonl_stream_decompresses_to_rows(self): ignore_cache=True, filter=filter, # type: ignore[arg-type] fields=None, + s3=MagicMock(), + bucket_name="test-bucket", + key_name="test-key", ) compressed = await _collect(stream) decompressed = gzip.decompress(compressed) @@ -305,6 +308,9 @@ async def test_csv_stream_decompresses_to_rows(self): ignore_cache=True, filter=filter, # type: ignore[arg-type] fields=frozenset({"a", "b"}), + s3=MagicMock(), + bucket_name="test-bucket", + key_name="test-key", ) compressed = await _collect(stream) decompressed = gzip.decompress(compressed) @@ -325,6 +331,9 @@ async def test_empty_result_is_valid_empty_gzip(self): ignore_cache=True, filter=filter, # type: ignore[arg-type] fields=None, + s3=MagicMock(), + bucket_name="test-bucket", + key_name="test-key", ) compressed = await _collect(stream) assert gzip.decompress(compressed) == b"" From 2249c684f5b07c048d4b497b61fd4760a9eeab5b Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 17 Jun 2026 09:05:45 -0700 Subject: [PATCH 132/591] Removed kong settings, since they are unused --- mpcontribs-api/src/mpcontribs_api/config.py | 7 ------- mpcontribs-api/tests/conftest.py | 1 - mpcontribs-api/tests/integration/conftest.py | 5 ----- mpcontribs-api/tests/unit/test_config.py | 10 +--------- 4 files changed, 1 insertion(+), 22 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/config.py b/mpcontribs-api/src/mpcontribs_api/config.py index aab677eb74..780a75cb94 100644 --- a/mpcontribs-api/src/mpcontribs_api/config.py +++ b/mpcontribs-api/src/mpcontribs_api/config.py @@ -10,10 +10,6 @@ class RedisSettings(BaseModel): url: SecretStr -class KongSettings(BaseModel): - gateway_secret: SecretStr - - class AwsSettings(BaseModel): """AWS Settings @@ -138,9 +134,6 @@ class Settings(BaseSettings): # MPContribs_aws__* aws: AwsSettings = Field(default_factory=AwsSettings) - # MPContribs_kong__* - kong: KongSettings - # MPContribs_redis__* redis: RedisSettings diff --git a/mpcontribs-api/tests/conftest.py b/mpcontribs-api/tests/conftest.py index b6d47ba59d..80d67d3f56 100644 --- a/mpcontribs-api/tests/conftest.py +++ b/mpcontribs-api/tests/conftest.py @@ -10,7 +10,6 @@ os.environ.setdefault("MPCONTRIBS_ENVIRONMENT", "dev") os.environ.setdefault("MPCONTRIBS_MONGO__URI", "mongodb://localhost:27017") os.environ.setdefault("MPCONTRIBS_MONGO__DB_NAME", "testdb") -os.environ.setdefault("MPCONTRIBS_KONG__GATEWAY_SECRET", "test-gateway-secret") os.environ.setdefault("MPCONTRIBS_REDIS__ADDRESS", "redis://localhost:6379") os.environ.setdefault("MPCONTRIBS_REDIS__URL", "redis://localhost:6379") os.environ.setdefault("MPCONTRIBS_MAIL_DEFAULT_SENDER", "test@example.com") diff --git a/mpcontribs-api/tests/integration/conftest.py b/mpcontribs-api/tests/integration/conftest.py index 3cc292882c..db15f2fa3a 100644 --- a/mpcontribs-api/tests/integration/conftest.py +++ b/mpcontribs-api/tests/integration/conftest.py @@ -31,11 +31,6 @@ def _mock_beanie_collection(): from mpcontribs_api.config import get_settings -# Read the real secret from settings (from .env or the root conftest fallback) -# so gateway tests always use whatever the live server will accept. -GATEWAY_SECRET = get_settings().kong.gateway_secret.get_secret_value() -GATEWAY_HEADERS = {"x-gateway-secret": GATEWAY_SECRET} - ANON_HEADERS: dict[str, str] = {} AUTHED_HEADERS = { diff --git a/mpcontribs-api/tests/unit/test_config.py b/mpcontribs-api/tests/unit/test_config.py index 2c8c58f685..3db14f7685 100644 --- a/mpcontribs-api/tests/unit/test_config.py +++ b/mpcontribs-api/tests/unit/test_config.py @@ -3,7 +3,6 @@ from pydantic import ValidationError as PydanticValidationError from mpcontribs_api.config import ( - KongSettings, MongoSettings, RedisSettings, Settings, @@ -18,7 +17,6 @@ "MPCONTRIBS_ENVIRONMENT": "dev", "MPCONTRIBS_MONGO__URI": "mongodb://user:pass@localhost:27017", "MPCONTRIBS_MONGO__DB_NAME": "mpcontribs-test", - "MPCONTRIBS_KONG__GATEWAY_SECRET": "kong-secret", "MPCONTRIBS_REDIS__ADDRESS": "redis://localhost:6379", "MPCONTRIBS_REDIS__URL": "redis://localhost:6379/0", "MPCONTRIBS_MAIL_DEFAULT_SENDER": "noreply@materialsproject.org", @@ -110,11 +108,6 @@ def test_below_cap_unchanged(self): class TestSubSettingsSecrets: - def test_kong_secret_masked(self): - kong = KongSettings(gateway_secret=SecretStr("s3cret")) - assert kong.gateway_secret.get_secret_value() == "s3cret" - assert "s3cret" not in repr(kong) - def test_redis_secrets_masked(self): redis = RedisSettings(address=SecretStr("redis://h"), url=SecretStr("redis://h/0")) assert redis.address.get_secret_value() == "redis://h" @@ -140,10 +133,9 @@ def test_nested_delimiter_populates_mongo(self, monkeypatch): assert settings.mongo.db_name == "mpcontribs-test" assert settings.mongo.uri.get_secret_value() == "mongodb://user:pass@localhost:27017" - def test_nested_delimiter_populates_kong_and_redis(self, monkeypatch): + def test_nested_delimiter_populates_and_redis(self, monkeypatch): _set_required_env(monkeypatch) settings = Settings() - assert settings.kong.gateway_secret.get_secret_value() == "kong-secret" assert settings.redis.url.get_secret_value() == "redis://localhost:6379/0" def test_nested_field_override(self, monkeypatch): From 69065566391bc17c054e09268d6a03671dd6c75b Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 17 Jun 2026 10:21:34 -0700 Subject: [PATCH 133/591] Made a shared ComponentService to ensure deletion only occurs when no contributions reference the component in question --- .../mpcontribs_api/domains/_shared/models.py | 12 ++ .../domains/_shared/repository.py | 15 ++ .../mpcontribs_api/domains/_shared/service.py | 74 +++++++++ .../domains/attachments/dependencies.py | 9 ++ .../domains/attachments/router.py | 16 +- .../domains/attachments/service.py | 9 ++ .../domains/contributions/models.py | 7 +- .../domains/contributions/repository.py | 41 ++++- .../domains/structures/dependencies.py | 9 ++ .../domains/structures/router.py | 16 +- .../domains/structures/service.py | 9 ++ .../domains/tables/dependencies.py | 9 ++ .../mpcontribs_api/domains/tables/router.py | 16 +- .../mpcontribs_api/domains/tables/service.py | 9 ++ .../integration/test_component_routes.py | 77 ++++++--- .../unit/domains/test_component_service.py | 146 ++++++++++++++++++ 16 files changed, 426 insertions(+), 48 deletions(-) create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/_shared/service.py create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/attachments/service.py create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/structures/service.py create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/tables/service.py create mode 100644 mpcontribs-api/tests/unit/domains/test_component_service.py diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py index 2d44eb7308..2c0a258153 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py @@ -58,6 +58,18 @@ def from_delete_result(cls, delete_result: DeleteResult) -> Self: return cls(num_deleted=delete_result.deleted_count) +class ComponentDeleteResponse(DeleteResponse): + """Result of a component delete that may leave referenced components in place. + + ``num_deleted`` (inherited) counts components actually removed; ``referenced_ids`` are the + component ids skipped because a contribution still references them, and ``num_skipped`` is + their count. + """ + + referenced_ids: list[PydanticObjectId] = Field(default_factory=list) + num_skipped: int = 0 + + def canonical_md5(payload: Mapping[str, Any]) -> str: """MD5 hex digest of a content mapping, stable across processes/hosts.""" text = json.dumps(payload, sort_keys=True, separators=(",", ":"), ensure_ascii=False) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py index 4da5b2d736..f194d4dd5c 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py @@ -112,6 +112,21 @@ async def get_by_id(self, id: Any, fields: frozenset[str] | None) -> TDoc | TOut projection_model=self.out_model.projection(fields), ) + async def list_ids(self, filter: TFilter, session: AsyncClientSession | None = None) -> list[Any]: + """Return just the ids of scoped documents matching ``filter``. + + Projects to ``{"_id": 1}`` so the lookup can be served as a covered query from the + default ``_id`` index without materializing full documents. + + Args: + filter (TFilter): the fastapi-filter query to apply on top of the user scope + session (AsyncClientSession | None): optional client session for transactions + """ + projection = self.out_model.projection(frozenset({"id"})) + query = filter.filter(self.document_model.find(self._scope, session=session)) + docs = await query.project(projection).to_list() + return [doc.id for doc in docs] + async def insert_one(self, in_resource: TIn) -> TDoc: """Insert a new document built from its input model, rejecting duplicate ids. diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/service.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/service.py new file mode 100644 index 0000000000..cbe6e9bad5 --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/service.py @@ -0,0 +1,74 @@ +from typing import ClassVar + +from fastapi_filter.contrib.beanie import Filter + +from mpcontribs_api.domains._shared.components import MongoDbComponentsRepository +from mpcontribs_api.domains._shared.models import ComponentDeleteResponse +from mpcontribs_api.domains.contributions.repository import MongoDbContributionRepository +from mpcontribs_api.exceptions import NotFoundError + + +class ComponentService[TRepo: MongoDbComponentsRepository, TFilter: Filter]: + """Service layer for shared logic for components. + + Components carry no scope of their own; a user's access is derived from the contributions + that reference them. Deletion therefore applies two gates: + + 1. **Access (scoped):** candidates are restricted to components reachable via a contribution + in the user's scope. A component the user cannot reach is treated as not found. + 2. **Integrity (global):** any reachable candidate still referenced by *any* contribution is + skipped; the rest are deleted. + """ + + ref_field: ClassVar[str] + + def __init__( + self, + components: TRepo, + contributions: MongoDbContributionRepository, + ) -> None: + self._components = components + self._contributions = contributions + + async def delete(self, filter: TFilter) -> ComponentDeleteResponse: + """Delete components matching ``filter`` that are reachable and globally unreferenced. + + Args: + filter (TFilter): the component-specific query to apply + + Returns: + ComponentDeleteResponse: count deleted, plus the ids skipped because a contribution + still references them + """ + candidate_ids = await self._components.list_ids(filter) + reachable = await self._contributions.referenced_component_ids(self.ref_field, candidate_ids, scoped=True) + if not reachable: + return ComponentDeleteResponse(num_deleted=0) + referenced = await self._contributions.referenced_component_ids(self.ref_field, list(reachable), scoped=False) + deletable = [cid for cid in reachable if cid not in referenced] + num_deleted = (await self._components.delete_by_ids(deletable)).num_deleted if deletable else 0 + return ComponentDeleteResponse( + num_deleted=num_deleted, + num_skipped=len(referenced), + referenced_ids=sorted(referenced), + ) + + async def delete_by_id(self, id: str) -> ComponentDeleteResponse: + """Delete a single component by id, subject to the access and integrity gates. + + Args: + id (str): the str representation of the component's ObjectId + + Returns: + ComponentDeleteResponse: the deletion result, or a skipped result if still referenced + + Raises: + NotFoundError: if the component is not reachable via any in-scope contribution + """ + oid = self._components._convert_object_id(id) + if not await self._contributions.referenced_component_ids(self.ref_field, [oid], scoped=True): + raise NotFoundError(self._components._not_found(id)) + if await self._contributions.referenced_component_ids(self.ref_field, [oid], scoped=False): + return ComponentDeleteResponse(num_deleted=0, num_skipped=1, referenced_ids=[oid]) + deleted = await self._components.delete_by_id(oid) + return ComponentDeleteResponse(num_deleted=deleted.num_deleted) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/attachments/dependencies.py b/mpcontribs-api/src/mpcontribs_api/domains/attachments/dependencies.py index 59d6923ff0..bbe1e2ecad 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/attachments/dependencies.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/attachments/dependencies.py @@ -4,6 +4,8 @@ from mpcontribs_api.dependencies import UserDep from mpcontribs_api.domains.attachments.repository import MongoDbAttachmentRepository +from mpcontribs_api.domains.attachments.service import AttachmentService +from mpcontribs_api.domains.contributions.repository import MongoDbContributionRepository def get_scoped_attachments(user: UserDep) -> MongoDbAttachmentRepository: @@ -11,3 +13,10 @@ def get_scoped_attachments(user: UserDep) -> MongoDbAttachmentRepository: AttachmentDep = Annotated[MongoDbAttachmentRepository, Depends(get_scoped_attachments)] + + +def get_attachment_service(user: UserDep) -> AttachmentService: + return AttachmentService(MongoDbAttachmentRepository(user), MongoDbContributionRepository(user)) + + +AttachmentServiceDep = Annotated[AttachmentService, Depends(get_attachment_service)] diff --git a/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py b/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py index cadeb62fe1..da19777979 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py @@ -5,14 +5,14 @@ from fastapi_filter import FilterDepends from mpcontribs_api.dependencies import S3Dep -from mpcontribs_api.domains._shared.models import DeleteResponse +from mpcontribs_api.domains._shared.models import ComponentDeleteResponse from mpcontribs_api.domains._shared.types import ( DownloadFormat, FieldSelector, ShortMimeFormat, download_filename, ) -from mpcontribs_api.domains.attachments.dependencies import AttachmentDep +from mpcontribs_api.domains.attachments.dependencies import AttachmentDep, AttachmentServiceDep from mpcontribs_api.domains.attachments.models import AttachmentFilter, AttachmentOut from mpcontribs_api.pagination import CursorParams, Page @@ -67,11 +67,11 @@ async def download_attachment( ) -@router.delete("", response_model=DeleteResponse) -async def delete_attachments(repo: AttachmentDep, filter: AttachmentFilter = FilterDepends(AttachmentFilter)): - return await repo.delete_attachments(filter=filter) +@router.delete("", response_model=ComponentDeleteResponse) +async def delete_attachments(service: AttachmentServiceDep, filter: AttachmentFilter = FilterDepends(AttachmentFilter)): + return await service.delete(filter=filter) -@router.delete("/{id}", response_model=DeleteResponse) -async def delete_attachment_by_id(repo: AttachmentDep, id: str): - return await repo.delete_attachment_by_id(id=id) +@router.delete("/{id}", response_model=ComponentDeleteResponse) +async def delete_attachment_by_id(service: AttachmentServiceDep, id: str): + return await service.delete_by_id(id=id) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/attachments/service.py b/mpcontribs-api/src/mpcontribs_api/domains/attachments/service.py new file mode 100644 index 0000000000..a508c1422e --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/domains/attachments/service.py @@ -0,0 +1,9 @@ +from mpcontribs_api.domains._shared.service import ComponentService +from mpcontribs_api.domains.attachments.models import AttachmentFilter +from mpcontribs_api.domains.attachments.repository import MongoDbAttachmentRepository + + +class AttachmentService(ComponentService[MongoDbAttachmentRepository, AttachmentFilter]): + """Defines which field on a Contribtution to look in for the references.""" + + ref_field = "attachments" diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py index 49bdcff722..8c1a7f45b8 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py @@ -85,7 +85,12 @@ class Settings: keys=[("project", ASCENDING), ("identifier", ASCENDING)], name="project_idenfitier", unique=True, - ) + ), + # Multikey indexes over each Link field's DBRef id so the component-delete + # reference check (referenced_component_ids) is index-served, not a COLLSCAN. + IndexModel(keys=[("structures.$id", ASCENDING)], name="ref_structures"), + IndexModel(keys=[("tables.$id", ASCENDING)], name="ref_tables"), + IndexModel(keys=[("attachments.$id", ASCENDING)], name="ref_attachments"), ] diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py index a281d039af..cc816441fc 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py @@ -2,7 +2,7 @@ from contextlib import AbstractAsyncContextManager from typing import Any -from beanie import UpdateResponse +from beanie import PydanticObjectId, UpdateResponse from beanie.operators import Set from pymongo.asynchronous.client_session import AsyncClientSession from pymongo.results import DeleteResult @@ -112,6 +112,45 @@ async def find_one_contribution(self, project: str, identifier: str) -> Contribu self.document_model.identifier == identifier, ) + async def referenced_component_ids( + self, + ref_field: str, + ids: list[PydanticObjectId], + *, + scoped: bool, + ) -> set[PydanticObjectId]: + """Return the subset of ``ids`` referenced by contributions through ``ref_field``. + + Beanie stores each ``Link`` as a DBRef (``{"$ref": ..., "$id": ObjectId}``), so a + component is referenced when its id appears under ``.$id`` on any matching + contribution. + + Args: + ref_field: the contribution link field to inspect ("structures" | "tables" | + "attachments"). Always a fixed class-attr at the call site, never user input. + ids: candidate component ids to test + scoped: when ``True`` the user scope is applied (access gate / reachability); when + ``False`` the check spans every contribution (global integrity check) + + Returns: + set[PydanticObjectId]: the ids in ``ids`` that are still referenced + """ + if not ids: + return set() + key = f"{ref_field}.$id" + query: dict[str, Any] = {key: {"$in": ids}} + if scoped and self._scope: + query = {"$and": [self._scope, query]} + target = set(ids) + referenced: set[PydanticObjectId] = set() + collection = self.document_model.get_pymongo_collection() + async for doc in collection.find(query, {ref_field: 1}): + for ref in doc.get(ref_field) or []: + rid = ref.id if hasattr(ref, "id") else ref.get("$id") + if rid in target: + referenced.add(rid) + return referenced + async def update_contribution(self, doc: Contribution, update_data: dict[str, Any]) -> None: """Apply a partial update to an existing Contribution document.""" await doc.update(Set(update_data)) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/dependencies.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/dependencies.py index deb8fc7567..68a21c7f85 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/structures/dependencies.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/structures/dependencies.py @@ -3,7 +3,9 @@ from fastapi import Depends from mpcontribs_api.dependencies import UserDep +from mpcontribs_api.domains.contributions.repository import MongoDbContributionRepository from mpcontribs_api.domains.structures.repository import MongoDbStructureRepository +from mpcontribs_api.domains.structures.service import StructureService def get_scoped_tables(user: UserDep) -> MongoDbStructureRepository: @@ -11,3 +13,10 @@ def get_scoped_tables(user: UserDep) -> MongoDbStructureRepository: StructureDep = Annotated[MongoDbStructureRepository, Depends(get_scoped_tables)] + + +def get_structure_service(user: UserDep) -> StructureService: + return StructureService(MongoDbStructureRepository(user), MongoDbContributionRepository(user)) + + +StructureServiceDep = Annotated[StructureService, Depends(get_structure_service)] diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py index 619d5d7308..66d77f2caa 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py @@ -6,14 +6,14 @@ from mpcontribs_api.dependencies import S3Dep from mpcontribs_api.domains._shared.bulk import BulkWriteSummary -from mpcontribs_api.domains._shared.models import DeleteResponse +from mpcontribs_api.domains._shared.models import ComponentDeleteResponse from mpcontribs_api.domains._shared.types import ( DownloadFormat, FieldSelector, ShortMimeFormat, download_filename, ) -from mpcontribs_api.domains.structures.dependencies import StructureDep +from mpcontribs_api.domains.structures.dependencies import StructureDep, StructureServiceDep from mpcontribs_api.domains.structures.models import StructureFilter, StructureIn, StructureOut, StructurePatch from mpcontribs_api.pagination import CursorParams, Page @@ -78,14 +78,14 @@ async def insert_structures( return await repo.insert_structures(structures=structures) -@router.delete("", response_model=DeleteResponse) -async def delete_structures(repo: StructureDep, filter: StructureFilter = FilterDepends(StructureFilter)): - return await repo.delete_structures(filter=filter) +@router.delete("", response_model=ComponentDeleteResponse) +async def delete_structures(service: StructureServiceDep, filter: StructureFilter = FilterDepends(StructureFilter)): + return await service.delete(filter=filter) -@router.delete("/{id}", response_model=DeleteResponse) -async def delete_structure_by_id(repo: StructureDep, id: str): - return await repo.delete_structure_by_id(id=id) +@router.delete("/{id}", response_model=ComponentDeleteResponse) +async def delete_structure_by_id(service: StructureServiceDep, id: str): + return await service.delete_by_id(id=id) @router.patch("/{id}") diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/service.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/service.py new file mode 100644 index 0000000000..5e8336094b --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/domains/structures/service.py @@ -0,0 +1,9 @@ +from mpcontribs_api.domains._shared.service import ComponentService +from mpcontribs_api.domains.structures.models import StructureFilter +from mpcontribs_api.domains.structures.repository import MongoDbStructureRepository + + +class StructureService(ComponentService[MongoDbStructureRepository, StructureFilter]): + """Defines which field on a Contribtution to look in for the references.""" + + ref_field = "structures" diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/dependencies.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/dependencies.py index 84e6a46ab7..a1441f836f 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/dependencies.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/dependencies.py @@ -3,7 +3,9 @@ from fastapi import Depends from mpcontribs_api.dependencies import UserDep +from mpcontribs_api.domains.contributions.repository import MongoDbContributionRepository from mpcontribs_api.domains.tables.repository import MongoDbTableRepository +from mpcontribs_api.domains.tables.service import TableService def get_scoped_tables(user: UserDep) -> MongoDbTableRepository: @@ -11,3 +13,10 @@ def get_scoped_tables(user: UserDep) -> MongoDbTableRepository: TableDep = Annotated[MongoDbTableRepository, Depends(get_scoped_tables)] + + +def get_table_service(user: UserDep) -> TableService: + return TableService(MongoDbTableRepository(user), MongoDbContributionRepository(user)) + + +TableServiceDep = Annotated[TableService, Depends(get_table_service)] diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py index 13e3233ce7..9239c78a0a 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py @@ -6,14 +6,14 @@ from mpcontribs_api.dependencies import S3Dep from mpcontribs_api.domains._shared.bulk import BulkWriteSummary -from mpcontribs_api.domains._shared.models import DeleteResponse +from mpcontribs_api.domains._shared.models import ComponentDeleteResponse from mpcontribs_api.domains._shared.types import ( DownloadFormat, FieldSelector, ShortMimeFormat, download_filename, ) -from mpcontribs_api.domains.tables.dependencies import TableDep +from mpcontribs_api.domains.tables.dependencies import TableDep, TableServiceDep from mpcontribs_api.domains.tables.models import Table, TableFilter, TableIn, TableOut, TablePatch from mpcontribs_api.pagination import CursorParams, Page @@ -78,14 +78,14 @@ async def insert_tables( return await repo.insert_tables(tables=tables) -@router.delete("", response_model=DeleteResponse) -async def delete_tables(repo: TableDep, filter: TableFilter = FilterDepends(TableFilter)): - return await repo.delete_tables(filter=filter) +@router.delete("", response_model=ComponentDeleteResponse) +async def delete_tables(service: TableServiceDep, filter: TableFilter = FilterDepends(TableFilter)): + return await service.delete(filter=filter) -@router.delete("/{id}", response_model=DeleteResponse) -async def delete_table_by_id(repo: TableDep, id: str): - return await repo.delete_table_by_id(id=id) +@router.delete("/{id}", response_model=ComponentDeleteResponse) +async def delete_table_by_id(service: TableServiceDep, id: str): + return await service.delete_by_id(id=id) @router.patch("/{id}") diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/service.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/service.py new file mode 100644 index 0000000000..d6784c61d0 --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/service.py @@ -0,0 +1,9 @@ +from mpcontribs_api.domains._shared.service import ComponentService +from mpcontribs_api.domains.tables.models import TableFilter +from mpcontribs_api.domains.tables.repository import MongoDbTableRepository + + +class TableService(ComponentService[MongoDbTableRepository, TableFilter]): + """Defines which field on a Contribtution to look in for the references.""" + + ref_field = "tables" diff --git a/mpcontribs-api/tests/integration/test_component_routes.py b/mpcontribs-api/tests/integration/test_component_routes.py index 0d9f2487ae..abee2bd829 100644 --- a/mpcontribs-api/tests/integration/test_component_routes.py +++ b/mpcontribs-api/tests/integration/test_component_routes.py @@ -1,11 +1,14 @@ +from unittest.mock import AsyncMock + import pytest from beanie import PydanticObjectId -from mpcontribs_api.domains._shared.models import DeleteResponse -from mpcontribs_api.domains.attachments.dependencies import get_scoped_attachments +from mpcontribs_api.domains._shared.models import ComponentDeleteResponse +from mpcontribs_api.domains.attachments.dependencies import get_attachment_service, get_scoped_attachments from mpcontribs_api.domains.structures.dependencies import get_scoped_tables as get_scoped_structures +from mpcontribs_api.domains.structures.dependencies import get_structure_service from mpcontribs_api.domains.structures.models import StructureOut -from mpcontribs_api.domains.tables.dependencies import get_scoped_tables +from mpcontribs_api.domains.tables.dependencies import get_scoped_tables, get_table_service from mpcontribs_api.domains.tables.models import TableOut from mpcontribs_api.pagination import Page @@ -35,6 +38,32 @@ def attachment_repo(test_app, mock_attachment_repo): test_app.dependency_overrides.pop(get_scoped_attachments, None) +# Delete endpoints route through the component service (not the repo), so they are +# overridden separately from the read/insert/patch endpoints above. +@pytest.fixture +def structure_service(test_app): + mock = AsyncMock() + test_app.dependency_overrides[get_structure_service] = lambda: mock + yield mock + test_app.dependency_overrides.pop(get_structure_service, None) + + +@pytest.fixture +def table_service(test_app): + mock = AsyncMock() + test_app.dependency_overrides[get_table_service] = lambda: mock + yield mock + test_app.dependency_overrides.pop(get_table_service, None) + + +@pytest.fixture +def attachment_service(test_app): + mock = AsyncMock() + test_app.dependency_overrides[get_attachment_service] = lambda: mock + yield mock + test_app.dependency_overrides.pop(get_attachment_service, None) + + SAMPLE_STRUCTURE = StructureOut(name="Fe2O3.cif", md5="a" * 32) SAMPLE_TABLE = TableOut(name="bandgaps", md5="b" * 32) @@ -73,16 +102,16 @@ def test_valid_fields_forwarded(self, client, structure_repo): class TestStructuresDelete: - def test_batch_delete_returns_200(self, client, structure_repo): - structure_repo.delete_structures.return_value = DeleteResponse(num_deleted=3) + def test_batch_delete_returns_200(self, client, structure_service): + structure_service.delete.return_value = ComponentDeleteResponse(num_deleted=3) r = client.delete("/api/v1/structures") assert r.status_code == 200 - assert r.json() == {"num_deleted": 3} + assert r.json() == {"num_deleted": 3, "num_skipped": 0, "referenced_ids": []} - def test_repo_delete_called(self, client, structure_repo): - structure_repo.delete_structures.return_value = DeleteResponse(num_deleted=0) + def test_service_delete_called(self, client, structure_service): + structure_service.delete.return_value = ComponentDeleteResponse(num_deleted=0) client.delete("/api/v1/structures") - structure_repo.delete_structures.assert_awaited_once() + structure_service.delete.assert_awaited_once() class TestStructuresInsert: @@ -103,8 +132,8 @@ def test_get_by_id_conventional_path(self, client, structure_repo): structure_repo.get_structure_by_id.return_value = SAMPLE_STRUCTURE assert client.get(f"/api/v1/structures/{PydanticObjectId()}").status_code == 200 - def test_delete_by_id_conventional_path(self, client, structure_repo): - structure_repo.delete_structure_by_id.return_value = DeleteResponse(num_deleted=1) + def test_delete_by_id_conventional_path(self, client, structure_service): + structure_service.delete_by_id.return_value = ComponentDeleteResponse(num_deleted=1) assert client.delete(f"/api/v1/structures/{PydanticObjectId()}").status_code == 200 def test_patch_by_id_conventional_path(self, client, structure_repo): @@ -141,9 +170,13 @@ def test_default_fields_accepted(self, client, table_repo): class TestTablesDelete: - def test_batch_delete_returns_200(self, client, table_repo): - table_repo.delete_tables.return_value = DeleteResponse(num_deleted=2) - assert client.delete("/api/v1/tables").json() == {"num_deleted": 2} + def test_batch_delete_returns_200(self, client, table_service): + table_service.delete.return_value = ComponentDeleteResponse(num_deleted=2) + assert client.delete("/api/v1/tables").json() == { + "num_deleted": 2, + "num_skipped": 0, + "referenced_ids": [], + } class TestTablesInsert: @@ -158,8 +191,8 @@ def test_get_by_id_conventional_path(self, client, table_repo): table_repo.get_table_by_id.return_value = SAMPLE_TABLE assert client.get(f"/api/v1/tables/{PydanticObjectId()}").status_code == 200 - def test_delete_by_id_conventional_path(self, client, table_repo): - table_repo.delete_table_by_id.return_value = DeleteResponse(num_deleted=1) + def test_delete_by_id_conventional_path(self, client, table_service): + table_service.delete_by_id.return_value = ComponentDeleteResponse(num_deleted=1) assert client.delete(f"/api/v1/tables/{PydanticObjectId()}").status_code == 200 def test_patch_by_id_conventional_path(self, client, table_repo): @@ -185,15 +218,15 @@ def test_get_by_id_calls_attachment_repo(self, client, attachment_repo): client.get(f"/api/v1/attachments/{PydanticObjectId()}") attachment_repo.get_attachment_by_id.assert_awaited_once() - def test_delete_by_id_calls_attachment_repo(self, client, attachment_repo): - attachment_repo.delete_attachment_by_id.return_value = DeleteResponse(num_deleted=1) + def test_delete_by_id_calls_attachment_service(self, client, attachment_service): + attachment_service.delete_by_id.return_value = ComponentDeleteResponse(num_deleted=1) client.delete(f"/api/v1/attachments/{PydanticObjectId()}") - attachment_repo.delete_attachment_by_id.assert_awaited_once() + attachment_service.delete_by_id.assert_awaited_once() - def test_batch_delete_calls_attachment_repo(self, client, attachment_repo): - attachment_repo.delete_attachments.return_value = DeleteResponse(num_deleted=0) + def test_batch_delete_calls_attachment_service(self, client, attachment_service): + attachment_service.delete.return_value = ComponentDeleteResponse(num_deleted=0) client.delete("/api/v1/attachments") - attachment_repo.delete_attachments.assert_awaited_once() + attachment_service.delete.assert_awaited_once() # =========================================================================== diff --git a/mpcontribs-api/tests/unit/domains/test_component_service.py b/mpcontribs-api/tests/unit/domains/test_component_service.py new file mode 100644 index 0000000000..5a67e925ff --- /dev/null +++ b/mpcontribs-api/tests/unit/domains/test_component_service.py @@ -0,0 +1,146 @@ +from unittest.mock import AsyncMock, MagicMock + +import pytest +from beanie import PydanticObjectId + +from mpcontribs_api.domains._shared.models import ComponentDeleteResponse, DeleteResponse +from mpcontribs_api.domains.attachments.models import AttachmentFilter +from mpcontribs_api.domains.attachments.service import AttachmentService +from mpcontribs_api.exceptions import NotFoundError + +pytestmark = pytest.mark.asyncio + + +def _oid() -> PydanticObjectId: + return PydanticObjectId() + + +def _make_service( + *, + candidate_ids: list[PydanticObjectId], + reachable: set[PydanticObjectId], + referenced: set[PydanticObjectId], +) -> tuple[AttachmentService, AsyncMock, AsyncMock]: + """Build an AttachmentService over mocked component + contribution repos. + + ``referenced_component_ids`` returns ``reachable`` for scoped checks (access gate) and + ``referenced`` for unscoped checks (global integrity), keyed off the ``scoped`` kwarg. + """ + components = AsyncMock(name="components") + components.list_ids = AsyncMock(return_value=candidate_ids) + components.delete_by_ids = AsyncMock(side_effect=lambda ids: DeleteResponse(num_deleted=len(ids))) + components.delete_by_id = AsyncMock(return_value=DeleteResponse(num_deleted=1)) + components._convert_object_id = MagicMock(side_effect=lambda s: PydanticObjectId(s)) + components._not_found = MagicMock(return_value="not found") + + contributions = AsyncMock(name="contributions") + + async def _referenced(ref_field, ids, *, scoped): + pool = reachable if scoped else referenced + return {i for i in ids if i in pool} + + contributions.referenced_component_ids = AsyncMock(side_effect=_referenced) + + return AttachmentService(components, contributions), components, contributions + + +# --------------------------------------------------------------------------- +# delete(filter) +# --------------------------------------------------------------------------- + + +async def test_delete_reachable_and_unreferenced_deletes_all(): + a, b = _oid(), _oid() + svc, components, contributions = _make_service( + candidate_ids=[a, b], reachable={a, b}, referenced=set() + ) + + result = await svc.delete(AttachmentFilter()) + + assert isinstance(result, ComponentDeleteResponse) + assert result.num_deleted == 2 + assert result.num_skipped == 0 + assert result.referenced_ids == [] + components.delete_by_ids.assert_awaited_once() + assert set(components.delete_by_ids.await_args.args[0]) == {a, b} + + +async def test_delete_skips_globally_referenced(): + a, b = _oid(), _oid() + svc, components, _ = _make_service(candidate_ids=[a, b], reachable={a, b}, referenced={b}) + + result = await svc.delete(AttachmentFilter()) + + assert result.num_deleted == 1 + assert result.num_skipped == 1 + assert result.referenced_ids == [b] + assert components.delete_by_ids.await_args.args[0] == [a] + + +async def test_delete_not_reachable_deletes_nothing(): + a = _oid() + svc, components, contributions = _make_service(candidate_ids=[a], reachable=set(), referenced={a}) + + result = await svc.delete(AttachmentFilter()) + + assert result.num_deleted == 0 + assert result.num_skipped == 0 + components.delete_by_ids.assert_not_awaited() + # global check is skipped once the access gate yields nothing + assert contributions.referenced_component_ids.await_count == 1 + assert contributions.referenced_component_ids.await_args.kwargs["scoped"] is True + + +async def test_delete_empty_candidate_set(): + svc, components, _ = _make_service(candidate_ids=[], reachable=set(), referenced=set()) + + result = await svc.delete(AttachmentFilter()) + + assert result.num_deleted == 0 + components.delete_by_ids.assert_not_awaited() + + +async def test_delete_checks_scoped_before_global(): + a = _oid() + svc, _, contributions = _make_service(candidate_ids=[a], reachable={a}, referenced=set()) + + await svc.delete(AttachmentFilter()) + + scoped_flags = [c.kwargs["scoped"] for c in contributions.referenced_component_ids.await_args_list] + assert scoped_flags == [True, False] + + +# --------------------------------------------------------------------------- +# delete_by_id(id) +# --------------------------------------------------------------------------- + + +async def test_delete_by_id_not_reachable_raises_not_found(): + oid = _oid() + svc, _, _ = _make_service(candidate_ids=[], reachable=set(), referenced=set()) + + with pytest.raises(NotFoundError): + await svc.delete_by_id(str(oid)) + + +async def test_delete_by_id_referenced_is_skipped(): + oid = _oid() + svc, components, _ = _make_service(candidate_ids=[], reachable={oid}, referenced={oid}) + + result = await svc.delete_by_id(str(oid)) + + assert result.num_deleted == 0 + assert result.num_skipped == 1 + assert result.referenced_ids == [oid] + components.delete_by_id.assert_not_awaited() + + +async def test_delete_by_id_reachable_and_unreferenced_deletes(): + oid = _oid() + svc, components, _ = _make_service(candidate_ids=[], reachable={oid}, referenced=set()) + + result = await svc.delete_by_id(str(oid)) + + assert result.num_deleted == 1 + assert result.num_skipped == 0 + components.delete_by_id.assert_awaited_once_with(oid) From 6604e553a2d1e8df53486c7f29ec9f5d0b593835 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 17 Jun 2026 10:22:54 -0700 Subject: [PATCH 134/591] Added .claude/ to gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index dea1ffa5db..2b2a23208d 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,4 @@ mpcontribs-portal/supervisord.conf **/.DS_Store .venv/ .env +.claude/ From 79fd99cec99499a66b9639ba9804ff79aa8cff7e Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 17 Jun 2026 10:54:15 -0700 Subject: [PATCH 135/591] Moved component repo and service logic into a shared service. Component-specific repos still exist to declare their document and out_model types, but have no subclass-specific logic --- .../mpcontribs_api/domains/_shared/service.py | 99 ++++++++++-- .../domains/attachments/dependencies.py | 22 ++- .../domains/attachments/repository.py | 74 --------- .../domains/attachments/router.py | 14 +- .../domains/attachments/service.py | 9 -- .../domains/contributions/service.py | 4 +- .../domains/structures/dependencies.py | 22 ++- .../domains/structures/repository.py | 106 ------------ .../domains/structures/router.py | 24 ++- .../domains/structures/service.py | 9 -- .../domains/tables/dependencies.py | 22 ++- .../domains/tables/repository.py | 107 ------------- .../mpcontribs_api/domains/tables/router.py | 24 ++- .../mpcontribs_api/domains/tables/service.py | 9 -- mpcontribs-api/tests/integration/conftest.py | 18 --- .../db/test_components_repository.py | 4 +- .../integration/test_component_routes.py | 151 ++++++++---------- .../unit/domains/test_component_service.py | 9 +- .../unit/domains/test_contribution_service.py | 40 ++--- 19 files changed, 251 insertions(+), 516 deletions(-) delete mode 100644 mpcontribs-api/src/mpcontribs_api/domains/attachments/service.py delete mode 100644 mpcontribs-api/src/mpcontribs_api/domains/structures/service.py delete mode 100644 mpcontribs-api/src/mpcontribs_api/domains/tables/service.py diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/service.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/service.py index cbe6e9bad5..f7c8d05e98 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/service.py @@ -1,18 +1,38 @@ -from typing import ClassVar +from collections.abc import AsyncIterable +from contextlib import AbstractAsyncContextManager from fastapi_filter.contrib.beanie import Filter +from pydantic import BaseModel +from pymongo.asynchronous.client_session import AsyncClientSession +from types_aiobotocore_s3 import S3Client from mpcontribs_api.domains._shared.components import MongoDbComponentsRepository -from mpcontribs_api.domains._shared.models import ComponentDeleteResponse +from mpcontribs_api.domains._shared.models import Component, ComponentDeleteResponse, DocumentOut +from mpcontribs_api.domains._shared.types import DownloadFormat, ShortMimeFormat from mpcontribs_api.domains.contributions.repository import MongoDbContributionRepository from mpcontribs_api.exceptions import NotFoundError +from mpcontribs_api.pagination import CursorParams, Page -class ComponentService[TRepo: MongoDbComponentsRepository, TFilter: Filter]: - """Service layer for shared logic for components. +class ComponentService[ + TDoc: Component, + TIn: Component, + TOut: DocumentOut, + TFilter: Filter, + TPatch: BaseModel, +]: + """Service layer for all shared component logic. - Components carry no scope of their own; a user's access is derived from the contributions - that reference them. Deletion therefore applies two gates: + Components (attachments, structures, tables) share the same access model and CRUD surface, so a + single configurable service handles every domain rather than a per-domain subclass. Each domain + is distinguished only by: + + - ``ref_field``: the field on a contribution that references this component type + (``"attachments"`` / ``"structures"`` / ``"tables"``) + - ``bucket_name``: the S3 bucket downloads are cached in (defaults to ``ref_field``) + + Reads, inserts, patches, and downloads forward to the components repository. Deletion is the only + operation with cross-repository logic, applying two gates: 1. **Access (scoped):** candidates are restricted to components reachable via a contribution in the user's scope. A component the user cannot reach is treated as not found. @@ -20,15 +40,68 @@ class ComponentService[TRepo: MongoDbComponentsRepository, TFilter: Filter]: skipped; the rest are deleted. """ - ref_field: ClassVar[str] - def __init__( self, - components: TRepo, + components: MongoDbComponentsRepository[TDoc, TIn, TOut, TFilter, TPatch], contributions: MongoDbContributionRepository, + *, + ref_field: str, + bucket_name: str | None = None, ) -> None: self._components = components self._contributions = contributions + self._ref_field = ref_field + self._bucket_name = bucket_name or ref_field + + async def get_many( + self, + filter: TFilter, + pagination: CursorParams, + fields: frozenset[str] | None, + ) -> Page[TOut]: + """Return a scoped, filtered, cursor-paginated page of components. See ``get_many``.""" + return await self._components.get_many(pagination=pagination, filter=filter, fields=fields) + + async def get_by_id(self, id: str, fields: frozenset[str] | None) -> TDoc | TOut | None: + """Find a single component by id, scoped to the current user. See ``get_component_by_id``.""" + return await self._components.get_component_by_id(id, fields) + + async def insert( + self, + components: list[TIn], + session: AsyncClientSession | None = None, + ) -> list[TDoc]: + """Bulk-insert components, deduplicated by content hash. See ``insert_components``.""" + return await self._components.insert_components(components=components, session=session) + + async def patch_by_id(self, id: str, update: TPatch) -> TDoc: + """Partially update a component by id, scoped to the current user. See ``patch_component_by_id``.""" + return await self._components.patch_component_by_id(id=id, update=update) + + async def download( + self, + format: DownloadFormat, + short_mime: ShortMimeFormat, + ignore_cache: bool, + filter: TFilter, + fields: frozenset[str] | None, + s3: AbstractAsyncContextManager[S3Client], + ) -> AsyncIterable[bytes]: + """Stream a gzip-compressed export of matching components. See ``download``. + + The S3 cache location is owned by the service: ``bucket_name`` defaults to ``ref_field`` and + ``key_name`` is currently unused. + """ + return self._components.download( + format=format, + short_mime=short_mime, + ignore_cache=ignore_cache, + filter=filter, + fields=fields, + s3=s3, + bucket_name=self._bucket_name, + key_name="", # TODO: Temp + ) async def delete(self, filter: TFilter) -> ComponentDeleteResponse: """Delete components matching ``filter`` that are reachable and globally unreferenced. @@ -41,10 +114,10 @@ async def delete(self, filter: TFilter) -> ComponentDeleteResponse: still references them """ candidate_ids = await self._components.list_ids(filter) - reachable = await self._contributions.referenced_component_ids(self.ref_field, candidate_ids, scoped=True) + reachable = await self._contributions.referenced_component_ids(self._ref_field, candidate_ids, scoped=True) if not reachable: return ComponentDeleteResponse(num_deleted=0) - referenced = await self._contributions.referenced_component_ids(self.ref_field, list(reachable), scoped=False) + referenced = await self._contributions.referenced_component_ids(self._ref_field, list(reachable), scoped=False) deletable = [cid for cid in reachable if cid not in referenced] num_deleted = (await self._components.delete_by_ids(deletable)).num_deleted if deletable else 0 return ComponentDeleteResponse( @@ -66,9 +139,9 @@ async def delete_by_id(self, id: str) -> ComponentDeleteResponse: NotFoundError: if the component is not reachable via any in-scope contribution """ oid = self._components._convert_object_id(id) - if not await self._contributions.referenced_component_ids(self.ref_field, [oid], scoped=True): + if not await self._contributions.referenced_component_ids(self._ref_field, [oid], scoped=True): raise NotFoundError(self._components._not_found(id)) - if await self._contributions.referenced_component_ids(self.ref_field, [oid], scoped=False): + if await self._contributions.referenced_component_ids(self._ref_field, [oid], scoped=False): return ComponentDeleteResponse(num_deleted=0, num_skipped=1, referenced_ids=[oid]) deleted = await self._components.delete_by_id(oid) return ComponentDeleteResponse(num_deleted=deleted.num_deleted) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/attachments/dependencies.py b/mpcontribs-api/src/mpcontribs_api/domains/attachments/dependencies.py index bbe1e2ecad..966284a52f 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/attachments/dependencies.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/attachments/dependencies.py @@ -3,20 +3,26 @@ from fastapi import Depends from mpcontribs_api.dependencies import UserDep +from mpcontribs_api.domains._shared.service import ComponentService +from mpcontribs_api.domains.attachments.models import ( + Attachment, + AttachmentFilter, + AttachmentIn, + AttachmentOut, + AttachmentPatch, +) from mpcontribs_api.domains.attachments.repository import MongoDbAttachmentRepository -from mpcontribs_api.domains.attachments.service import AttachmentService from mpcontribs_api.domains.contributions.repository import MongoDbContributionRepository - -def get_scoped_attachments(user: UserDep) -> MongoDbAttachmentRepository: - return MongoDbAttachmentRepository(user) - - -AttachmentDep = Annotated[MongoDbAttachmentRepository, Depends(get_scoped_attachments)] +AttachmentService = ComponentService[Attachment, AttachmentIn, AttachmentOut, AttachmentFilter, AttachmentPatch] def get_attachment_service(user: UserDep) -> AttachmentService: - return AttachmentService(MongoDbAttachmentRepository(user), MongoDbContributionRepository(user)) + return ComponentService( + MongoDbAttachmentRepository(user), + MongoDbContributionRepository(user), + ref_field="attachments", + ) AttachmentServiceDep = Annotated[AttachmentService, Depends(get_attachment_service)] diff --git a/mpcontribs-api/src/mpcontribs_api/domains/attachments/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/attachments/repository.py index 1769465780..6297b117f8 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/attachments/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/attachments/repository.py @@ -1,12 +1,4 @@ -from collections.abc import AsyncIterable -from contextlib import AbstractAsyncContextManager - -from pymongo.asynchronous.client_session import AsyncClientSession -from types_aiobotocore_s3 import S3Client - from mpcontribs_api.domains._shared.components import MongoDbComponentsRepository -from mpcontribs_api.domains._shared.models import DeleteResponse -from mpcontribs_api.domains._shared.types import DownloadFormat, ShortMimeFormat from mpcontribs_api.domains.attachments.models import ( Attachment, AttachmentFilter, @@ -14,7 +6,6 @@ AttachmentOut, AttachmentPatch, ) -from mpcontribs_api.pagination import CursorParams, Page class MongoDbAttachmentRepository( @@ -22,68 +13,3 @@ class MongoDbAttachmentRepository( ): document_model = Attachment out_model = AttachmentOut - - async def get_attachments( - self, - filter: AttachmentFilter, - pagination: CursorParams, - fields: frozenset[str] | None, - ) -> Page[AttachmentOut]: - """Query the attachment collection, scoped to the current user. See ``get_many``.""" - return await self.get_many(pagination=pagination, filter=filter, fields=fields) - - async def get_attachment_by_id(self, id: str, fields: frozenset[str] | None) -> Attachment | AttachmentOut | None: - """Find a single table by id, scoped to the current user. See ``get_by_id``.""" - return await self.get_component_by_id(id, fields) - - async def download_attachments( - self, - format: DownloadFormat, - short_mime: ShortMimeFormat, - ignore_cache: bool, - filter: AttachmentFilter, - fields: frozenset[str] | None, - s3: AbstractAsyncContextManager[S3Client], - ) -> AsyncIterable[bytes]: - return self.download( - format=format, - short_mime=short_mime, - ignore_cache=ignore_cache, - filter=filter, - fields=fields, - s3=s3, - bucket_name="attachments", - key_name="", - ) - - async def delete_attachments( - self, - filter: AttachmentFilter, - session: AsyncClientSession | None = None, - ) -> DeleteResponse: - """Deletes all attachments matching ``filter``. - - Args: - filter (AttachmentFilter): the query to filter attachments by - session (AsyncClientSession | None): the current session, used to guarantee transactions - - Returns: - DeleteResponse: A report of the deletion - """ - return await self.delete_components(filter=filter, session=session) - - async def delete_attachment_by_id( - self, - id: str, - session: AsyncClientSession | None = None, - ) -> DeleteResponse: - """Deletes a single attachment by Id. - - Args: - id (str): the str representation of the attachment's ObjectId - session (AsyncClientSession | None): the current session, used to guarantee transactions - - Returns: - DeleteResponse: A report of the deletion - """ - return await self.delete_component_by_id(id=id, session=session) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py b/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py index da19777979..8e4298a97e 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py @@ -12,7 +12,7 @@ ShortMimeFormat, download_filename, ) -from mpcontribs_api.domains.attachments.dependencies import AttachmentDep, AttachmentServiceDep +from mpcontribs_api.domains.attachments.dependencies import AttachmentServiceDep from mpcontribs_api.domains.attachments.models import AttachmentFilter, AttachmentOut from mpcontribs_api.pagination import CursorParams, Page @@ -21,28 +21,28 @@ @router.get("", response_model=Page[AttachmentOut]) async def get_attachments( - repo: AttachmentDep, + service: AttachmentServiceDep, pagination: Annotated[CursorParams, Depends()], filter: AttachmentFilter = FilterDepends(AttachmentFilter), fields: FieldSelector = AttachmentOut.default_fields(), ): selected = AttachmentOut.parse_fields(fields) - return await repo.get_attachments(filter=filter, fields=selected, pagination=pagination) + return await service.get_many(filter=filter, fields=selected, pagination=pagination) @router.get("/{pk}", response_model=AttachmentOut) async def get_attachment( - repo: AttachmentDep, + service: AttachmentServiceDep, pk: str, fields: FieldSelector = AttachmentOut.default_fields(), ): selected = AttachmentOut.parse_fields(fields) - return await repo.get_attachment_by_id(id=pk, fields=selected) + return await service.get_by_id(id=pk, fields=selected) @router.get("/download/{short_mime}") async def download_attachment( - repo: AttachmentDep, + service: AttachmentServiceDep, format: DownloadFormat, s3: S3Dep, short_mime: ShortMimeFormat = ShortMimeFormat.GZ, @@ -51,7 +51,7 @@ async def download_attachment( fields: FieldSelector = AttachmentOut.default_fields(), ) -> StreamingResponse: selected = AttachmentOut.parse_fields(fields) - body = await repo.download_attachments( + body = await service.download( format=format, short_mime=short_mime, ignore_cache=ignore_cache, diff --git a/mpcontribs-api/src/mpcontribs_api/domains/attachments/service.py b/mpcontribs-api/src/mpcontribs_api/domains/attachments/service.py deleted file mode 100644 index a508c1422e..0000000000 --- a/mpcontribs-api/src/mpcontribs_api/domains/attachments/service.py +++ /dev/null @@ -1,9 +0,0 @@ -from mpcontribs_api.domains._shared.service import ComponentService -from mpcontribs_api.domains.attachments.models import AttachmentFilter -from mpcontribs_api.domains.attachments.repository import MongoDbAttachmentRepository - - -class AttachmentService(ComponentService[MongoDbAttachmentRepository, AttachmentFilter]): - """Defines which field on a Contribtution to look in for the references.""" - - ref_field = "attachments" diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py index 70122f1000..dc7b1930a6 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py @@ -247,8 +247,8 @@ async def _do_insert(self, contrib: ContributionIn, session: AsyncClientSession) Components are inserted sequentially because a session is single-threaded — sharing it across concurrent awaits would corrupt the wire protocol. """ - structures = await self._structures.insert_structures(contrib.structures or [], session=session) - tables = await self._tables.insert_tables(contrib.tables or [], session=session) + structures = await self._structures.insert_components(contrib.structures or [], session=session) + tables = await self._tables.insert_components(contrib.tables or [], session=session) doc = Contribution.from_input_model(contrib) doc.structures = cast(list[Link[Structure]] | None, structures or None) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/dependencies.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/dependencies.py index 68a21c7f85..488e513146 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/structures/dependencies.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/structures/dependencies.py @@ -3,20 +3,26 @@ from fastapi import Depends from mpcontribs_api.dependencies import UserDep +from mpcontribs_api.domains._shared.service import ComponentService from mpcontribs_api.domains.contributions.repository import MongoDbContributionRepository +from mpcontribs_api.domains.structures.models import ( + Structure, + StructureFilter, + StructureIn, + StructureOut, + StructurePatch, +) from mpcontribs_api.domains.structures.repository import MongoDbStructureRepository -from mpcontribs_api.domains.structures.service import StructureService - -def get_scoped_tables(user: UserDep) -> MongoDbStructureRepository: - return MongoDbStructureRepository(user) - - -StructureDep = Annotated[MongoDbStructureRepository, Depends(get_scoped_tables)] +StructureService = ComponentService[Structure, StructureIn, StructureOut, StructureFilter, StructurePatch] def get_structure_service(user: UserDep) -> StructureService: - return StructureService(MongoDbStructureRepository(user), MongoDbContributionRepository(user)) + return ComponentService( + MongoDbStructureRepository(user), + MongoDbContributionRepository(user), + ref_field="structures", + ) StructureServiceDep = Annotated[StructureService, Depends(get_structure_service)] diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/repository.py index 6d279f79ec..ab74497850 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/structures/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/structures/repository.py @@ -1,11 +1,4 @@ -from collections.abc import AsyncIterable - -from pymongo.asynchronous.client_session import AsyncClientSession - -from mpcontribs_api.dependencies import S3Dep from mpcontribs_api.domains._shared.components import MongoDbComponentsRepository -from mpcontribs_api.domains._shared.models import DeleteResponse -from mpcontribs_api.domains._shared.types import DownloadFormat, ShortMimeFormat from mpcontribs_api.domains.structures.models import ( Structure, StructureFilter, @@ -13,7 +6,6 @@ StructureOut, StructurePatch, ) -from mpcontribs_api.pagination import CursorParams, Page class MongoDbStructureRepository( @@ -21,101 +13,3 @@ class MongoDbStructureRepository( ): document_model = Structure out_model = StructureOut - - async def insert_structures( - self, - structures: list[StructureIn], - session: AsyncClientSession | None = None, - ) -> list[Structure]: - """Bulk-insert structures, chunked to fit within a transaction's payload budget. - - Args: - structures: structures to insert - session: optional client session; pass when inserStructureIng inside a transaction - """ - return await self.insert_components(components=structures, session=session) - - async def insert_structure(self, structure: StructureIn) -> Structure: - """Insert a single structure. - - Args: - structure (StructureIn): the table to insert - - Returns: - TDpc: the structure actually in the database - - Raises: - AppError: If insert_one returns None, raises - """ - return await self.insert_component(component=structure) - - async def get_structures( - self, - filter: StructureFilter, - pagination: CursorParams, - fields: frozenset[str] | None, - ) -> Page[StructureOut]: - """Query the structure collection, scoped to the current user. See ``get_many``.""" - return await self.get_many(pagination=pagination, filter=filter, fields=fields) - - async def get_structure_by_id(self, id: str, fields: frozenset[str] | None) -> Structure | StructureOut | None: - """Find a single table by id, scoped to the current user. See ``get_by_id``.""" - return await self.get_component_by_id(id, fields) - - async def download_structures( - self, - format: DownloadFormat, - short_mime: ShortMimeFormat, - ignore_cache: bool, - filter: StructureFilter, - fields: frozenset[str] | None, - s3: S3Dep, - bucket_name: str, - key_name: str, - ) -> AsyncIterable[bytes]: - return self.download( - format=format, - short_mime=short_mime, - ignore_cache=ignore_cache, - filter=filter, - fields=fields, - s3=s3, - key_name=key_name, - bucket_name=bucket_name, - ) - - async def delete_structures( - self, - filter: StructureFilter, - session: AsyncClientSession | None = None, - ) -> DeleteResponse: - """Deletes all structures matching ``filter``. - - Args: - filter (StructureFilter): the query to filter structures by - session (AsyncClientSession | None): the current session, used to guarantee transactions - - Returns: - DeleteResponse: A report of the deletion - """ - return await self.delete_components(filter=filter, session=session) - - async def delete_structure_by_id( - self, - id: str, - session: AsyncClientSession | None = None, - ) -> DeleteResponse: - """Deletes a single structure by Id. - - Args: - id (str): the str representation of the structure's ObjectId - session (AsyncClientSession | None): the current session, used to guarantee transactions - - Returns: - DeleteResponse: A report of the deletion - """ - return await self.delete_component_by_id(id=id, session=session) - - async def patch_structure_by_id(self, id: str, update: StructurePatch) -> Structure: - """Partially update a structure by id, scoped to the current user. See ``patch``.""" - return await self.patch_component_by_id(id=id, update=update) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py index 66d77f2caa..0057c4a5d2 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py @@ -13,7 +13,7 @@ ShortMimeFormat, download_filename, ) -from mpcontribs_api.domains.structures.dependencies import StructureDep, StructureServiceDep +from mpcontribs_api.domains.structures.dependencies import StructureServiceDep from mpcontribs_api.domains.structures.models import StructureFilter, StructureIn, StructureOut, StructurePatch from mpcontribs_api.pagination import CursorParams, Page @@ -22,28 +22,28 @@ @router.get("", response_model=Page[StructureOut]) async def get_structures( - repo: StructureDep, + service: StructureServiceDep, pagination: Annotated[CursorParams, Depends()], filter: StructureFilter = FilterDepends(StructureFilter), fields: FieldSelector = StructureOut.default_fields(), ): selected = StructureOut.parse_fields(fields) - return await repo.get_structures(filter=filter, fields=selected, pagination=pagination) + return await service.get_many(filter=filter, fields=selected, pagination=pagination) @router.get("/{pk}", response_model=StructureOut) async def get_structure( - repo: StructureDep, + service: StructureServiceDep, pk: str, fields: FieldSelector = StructureOut.default_fields(), ): selected = StructureOut.parse_fields(fields) - return await repo.get_structure_by_id(id=pk, fields=selected) + return await service.get_by_id(id=pk, fields=selected) @router.get("/download/{short_mime}") async def download_structure( - repo: StructureDep, + service: StructureServiceDep, format: DownloadFormat, s3: S3Dep, short_mime: ShortMimeFormat = ShortMimeFormat.GZ, @@ -52,14 +52,12 @@ async def download_structure( fields: FieldSelector = StructureOut.default_fields(), ) -> StreamingResponse: selected = StructureOut.parse_fields(fields) - body = await repo.download_structures( + body = await service.download( format=format, short_mime=short_mime, ignore_cache=ignore_cache, filter=filter, fields=selected, - key_name="", # TODO: Temp - bucket_name="structures", s3=s3, ) filename = download_filename("structures", format, short_mime) @@ -72,10 +70,10 @@ async def download_structure( @router.post("", response_model=BulkWriteSummary[StructureOut]) async def insert_structures( - repo: StructureDep, + service: StructureServiceDep, structures: list[StructureIn], ): - return await repo.insert_structures(structures=structures) + return await service.insert(components=structures) @router.delete("", response_model=ComponentDeleteResponse) @@ -90,8 +88,8 @@ async def delete_structure_by_id(service: StructureServiceDep, id: str): @router.patch("/{id}") async def patch_structure_by_id( - repo: StructureDep, + service: StructureServiceDep, id: str, update: StructurePatch, ): - return await repo.patch_structure_by_id(id=id, update=update) + return await service.patch_by_id(id=id, update=update) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/service.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/service.py deleted file mode 100644 index 5e8336094b..0000000000 --- a/mpcontribs-api/src/mpcontribs_api/domains/structures/service.py +++ /dev/null @@ -1,9 +0,0 @@ -from mpcontribs_api.domains._shared.service import ComponentService -from mpcontribs_api.domains.structures.models import StructureFilter -from mpcontribs_api.domains.structures.repository import MongoDbStructureRepository - - -class StructureService(ComponentService[MongoDbStructureRepository, StructureFilter]): - """Defines which field on a Contribtution to look in for the references.""" - - ref_field = "structures" diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/dependencies.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/dependencies.py index a1441f836f..323a4443df 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/dependencies.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/dependencies.py @@ -3,20 +3,26 @@ from fastapi import Depends from mpcontribs_api.dependencies import UserDep +from mpcontribs_api.domains._shared.service import ComponentService from mpcontribs_api.domains.contributions.repository import MongoDbContributionRepository +from mpcontribs_api.domains.tables.models import ( + Table, + TableFilter, + TableIn, + TableOut, + TablePatch, +) from mpcontribs_api.domains.tables.repository import MongoDbTableRepository -from mpcontribs_api.domains.tables.service import TableService - -def get_scoped_tables(user: UserDep) -> MongoDbTableRepository: - return MongoDbTableRepository(user) - - -TableDep = Annotated[MongoDbTableRepository, Depends(get_scoped_tables)] +TableService = ComponentService[Table, TableIn, TableOut, TableFilter, TablePatch] def get_table_service(user: UserDep) -> TableService: - return TableService(MongoDbTableRepository(user), MongoDbContributionRepository(user)) + return ComponentService( + MongoDbTableRepository(user), + MongoDbContributionRepository(user), + ref_field="tables", + ) TableServiceDep = Annotated[TableService, Depends(get_table_service)] diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py index e9462384e2..a6bda17912 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py @@ -1,12 +1,4 @@ -from collections.abc import AsyncIterable -from contextlib import AbstractAsyncContextManager - -from pymongo.asynchronous.client_session import AsyncClientSession -from types_aiobotocore_s3 import S3Client - from mpcontribs_api.domains._shared.components import MongoDbComponentsRepository -from mpcontribs_api.domains._shared.models import DeleteResponse -from mpcontribs_api.domains._shared.types import DownloadFormat, ShortMimeFormat from mpcontribs_api.domains.tables.models import ( Table, TableFilter, @@ -14,107 +6,8 @@ TableOut, TablePatch, ) -from mpcontribs_api.pagination import CursorParams, Page class MongoDbTableRepository(MongoDbComponentsRepository[Table, TableIn, TableOut, TableFilter, TablePatch]): document_model = Table out_model = TableOut - - async def insert_tables( - self, - tables: list[TableIn], - session: AsyncClientSession | None = None, - ) -> list[Table]: - """Bulk-insert tables, chunked to fit within a transaction's payload budget. - - Args: - tables: tables to insert - session: optional client session; pass when inserTableIng inside a transaction - """ - return await self.insert_components(components=tables, session=session) - - async def insert_table(self, table: TableIn) -> Table: - """Insert a single table. - - Args: - table (TableIn): the table to insert - - Returns: - TDpc: the table actually in the database - - Raises: - AppError: If insert_one returns None, raises - """ - return await self.insert_component(component=table) - - async def get_tables( - self, - filter: TableFilter, - pagination: CursorParams, - fields: frozenset[str] | None, - ) -> Page[TableOut]: - """Query the table collection, scoped to the current user. See ``get_many``.""" - return await self.get_many(pagination=pagination, filter=filter, fields=fields) - - async def get_table_by_id(self, id: str, fields: frozenset[str] | None) -> Table | TableOut | None: - """Find a single table by id, scoped to the current user. See ``get_by_id``.""" - return await self.get_component_by_id(id, fields) - - async def download_tables( - self, - format: DownloadFormat, - short_mime: ShortMimeFormat, - ignore_cache: bool, - filter: TableFilter, - fields: frozenset[str] | None, - s3: AbstractAsyncContextManager[S3Client], - bucket_name: str, - key_name: str, - ) -> AsyncIterable[bytes]: - return self.download( - format=format, - short_mime=short_mime, - ignore_cache=ignore_cache, - filter=filter, - fields=fields, - s3=s3, - bucket_name=bucket_name, - key_name=key_name, - ) - - async def delete_tables( - self, - filter: TableFilter, - session: AsyncClientSession | None = None, - ) -> DeleteResponse: - """Deletes all tables matching ``filter``. - - Args: - filter (TableFilter): the query to filter tables by - session (AsyncClientSession | None): the current session, used to guarantee transactions - - Returns: - DeleteResponse: A report of the deletion - """ - return await self.delete_components(filter=filter, session=session) - - async def delete_table_by_id( - self, - id: str, - session: AsyncClientSession | None = None, - ) -> DeleteResponse: - """Deletes a single table by Id. - - Args: - id (str): the str representation of the table's ObjectId - session (AsyncClientSession | None): the current session, used to guarantee transactions - - Returns: - DeleteResponse: A report of the deletion - """ - return await self.delete_component_by_id(id=id, session=session) - - async def patch_table_by_id(self, id: str, update: TablePatch) -> Table: - """Partially update a table by id, scoped to the current user. See ``patch``.""" - return await self.patch_component_by_id(id=id, update=update) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py index 9239c78a0a..505f021eff 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py @@ -13,7 +13,7 @@ ShortMimeFormat, download_filename, ) -from mpcontribs_api.domains.tables.dependencies import TableDep, TableServiceDep +from mpcontribs_api.domains.tables.dependencies import TableServiceDep from mpcontribs_api.domains.tables.models import Table, TableFilter, TableIn, TableOut, TablePatch from mpcontribs_api.pagination import CursorParams, Page @@ -22,28 +22,28 @@ @router.get("", response_model=Page[TableOut]) async def get_tables( - repo: TableDep, + service: TableServiceDep, pagination: Annotated[CursorParams, Depends()], filter: TableFilter = FilterDepends(TableFilter), fields: FieldSelector = TableOut.default_fields(), ): selected = TableOut.parse_fields(fields) - return await repo.get_tables(filter=filter, fields=selected, pagination=pagination) + return await service.get_many(filter=filter, fields=selected, pagination=pagination) @router.get("/{pk}", response_model=TableOut) async def get_table( - repo: TableDep, + service: TableServiceDep, pk: str, fields: FieldSelector = TableOut.default_fields(), ): selected = TableOut.parse_fields(fields) - return await repo.get_table_by_id(id=pk, fields=selected) + return await service.get_by_id(id=pk, fields=selected) @router.get("/download/{short_mime}") async def download_table( - repo: TableDep, + service: TableServiceDep, s3: S3Dep, format: DownloadFormat, short_mime: ShortMimeFormat = ShortMimeFormat.GZ, @@ -52,15 +52,13 @@ async def download_table( fields: FieldSelector = TableOut.default_fields(), ) -> StreamingResponse: selected = TableOut.parse_fields(fields) - body = await repo.download_tables( + body = await service.download( format=format, short_mime=short_mime, ignore_cache=ignore_cache, filter=filter, fields=selected, s3=s3, - bucket_name="tables", - key_name="", # TODO: Temp ) filename = download_filename("tables", format, short_mime) return StreamingResponse( @@ -72,10 +70,10 @@ async def download_table( @router.post("", response_model=BulkWriteSummary[Table]) async def insert_tables( - repo: TableDep, + service: TableServiceDep, tables: list[TableIn], ): - return await repo.insert_tables(tables=tables) + return await service.insert(components=tables) @router.delete("", response_model=ComponentDeleteResponse) @@ -90,8 +88,8 @@ async def delete_table_by_id(service: TableServiceDep, id: str): @router.patch("/{id}") async def patch_table_by_id( - repo: TableDep, + service: TableServiceDep, id: str, update: TablePatch, ): - return await repo.patch_table_by_id(id=id, update=update) + return await service.patch_by_id(id=id, update=update) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/service.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/service.py deleted file mode 100644 index d6784c61d0..0000000000 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/service.py +++ /dev/null @@ -1,9 +0,0 @@ -from mpcontribs_api.domains._shared.service import ComponentService -from mpcontribs_api.domains.tables.models import TableFilter -from mpcontribs_api.domains.tables.repository import MongoDbTableRepository - - -class TableService(ComponentService[MongoDbTableRepository, TableFilter]): - """Defines which field on a Contribtution to look in for the references.""" - - ref_field = "tables" diff --git a/mpcontribs-api/tests/integration/conftest.py b/mpcontribs-api/tests/integration/conftest.py index db15f2fa3a..1ee624cca0 100644 --- a/mpcontribs-api/tests/integration/conftest.py +++ b/mpcontribs-api/tests/integration/conftest.py @@ -117,24 +117,6 @@ def mock_contribution_repo() -> AsyncMock: return AsyncMock() -@pytest.fixture -def mock_structure_repo() -> AsyncMock: - """Fully async mock of MongoDbStructureRepository.""" - return AsyncMock() - - -@pytest.fixture -def mock_table_repo() -> AsyncMock: - """Fully async mock of MongoDbTableRepository.""" - return AsyncMock() - - -@pytest.fixture -def mock_attachment_repo() -> AsyncMock: - """Fully async mock of MongoDbAttachmentRepository.""" - return AsyncMock() - - @pytest.fixture def mock_contribution_service() -> AsyncMock: """Fully async mock of ContributionService.""" diff --git a/mpcontribs-api/tests/integration/db/test_components_repository.py b/mpcontribs-api/tests/integration/db/test_components_repository.py index 96ad7bcd51..5639553c9d 100644 --- a/mpcontribs-api/tests/integration/db/test_components_repository.py +++ b/mpcontribs-api/tests/integration/db/test_components_repository.py @@ -156,13 +156,15 @@ class TestComponentDownload: async def test_jsonl_download_round_trips(self, db): """Component downloads stream a decompressable gzip of all rows.""" await _repo().insert_components([_attachment("a" * 32), _attachment("b" * 32)]) - stream = await _repo().download_attachments( + stream = _repo().download( format=DownloadFormat.JSONL, short_mime=ShortMimeFormat.GZ, ignore_cache=True, filter=AttachmentFilter(), fields=None, s3=MagicMock(), + bucket_name="attachments", + key_name="", ) chunks = [c async for c in stream] decompressed = gzip.decompress(b"".join(chunks)) diff --git a/mpcontribs-api/tests/integration/test_component_routes.py b/mpcontribs-api/tests/integration/test_component_routes.py index abee2bd829..09ecdfece2 100644 --- a/mpcontribs-api/tests/integration/test_component_routes.py +++ b/mpcontribs-api/tests/integration/test_component_routes.py @@ -4,42 +4,19 @@ from beanie import PydanticObjectId from mpcontribs_api.domains._shared.models import ComponentDeleteResponse -from mpcontribs_api.domains.attachments.dependencies import get_attachment_service, get_scoped_attachments -from mpcontribs_api.domains.structures.dependencies import get_scoped_tables as get_scoped_structures +from mpcontribs_api.domains.attachments.dependencies import get_attachment_service from mpcontribs_api.domains.structures.dependencies import get_structure_service from mpcontribs_api.domains.structures.models import StructureOut -from mpcontribs_api.domains.tables.dependencies import get_scoped_tables, get_table_service +from mpcontribs_api.domains.tables.dependencies import get_table_service from mpcontribs_api.domains.tables.models import TableOut from mpcontribs_api.pagination import Page # --------------------------------------------------------------------------- -# Fixtures: inject mock repos per domain +# Fixtures: every component endpoint routes through the unified ComponentService, +# so each domain has a single mock service override. # --------------------------------------------------------------------------- -@pytest.fixture -def structure_repo(test_app, mock_structure_repo): - test_app.dependency_overrides[get_scoped_structures] = lambda: mock_structure_repo - yield mock_structure_repo - test_app.dependency_overrides.pop(get_scoped_structures, None) - - -@pytest.fixture -def table_repo(test_app, mock_table_repo): - test_app.dependency_overrides[get_scoped_tables] = lambda: mock_table_repo - yield mock_table_repo - test_app.dependency_overrides.pop(get_scoped_tables, None) - - -@pytest.fixture -def attachment_repo(test_app, mock_attachment_repo): - test_app.dependency_overrides[get_scoped_attachments] = lambda: mock_attachment_repo - yield mock_attachment_repo - test_app.dependency_overrides.pop(get_scoped_attachments, None) - - -# Delete endpoints route through the component service (not the repo), so they are -# overridden separately from the read/insert/patch endpoints above. @pytest.fixture def structure_service(test_app): mock = AsyncMock() @@ -74,31 +51,31 @@ def attachment_service(test_app): class TestStructuresList: - def test_empty_page_returns_200(self, client, structure_repo): - structure_repo.get_structures.return_value = Page(items=[], next_cursor=None) + def test_empty_page_returns_200(self, client, structure_service): + structure_service.get_many.return_value = Page(items=[], next_cursor=None) assert client.get("/api/v1/structures").status_code == 200 - def test_page_shape(self, client, structure_repo): - structure_repo.get_structures.return_value = Page(items=[SAMPLE_STRUCTURE], next_cursor="c") + def test_page_shape(self, client, structure_service): + structure_service.get_many.return_value = Page(items=[SAMPLE_STRUCTURE], next_cursor="c") body = client.get("/api/v1/structures").json() assert "items" in body assert body["next_cursor"] == "c" - def test_repo_called_with_pagination(self, client, structure_repo): - structure_repo.get_structures.return_value = Page(items=[], next_cursor=None) + def test_service_called_with_pagination(self, client, structure_service): + structure_service.get_many.return_value = Page(items=[], next_cursor=None) client.get("/api/v1/structures?limit=5") - kwargs = structure_repo.get_structures.call_args.kwargs + kwargs = structure_service.get_many.call_args.kwargs assert kwargs["pagination"].limit == 5 - def test_invalid_fields_returns_422(self, client, structure_repo): - structure_repo.get_structures.return_value = Page(items=[], next_cursor=None) + def test_invalid_fields_returns_422(self, client, structure_service): + structure_service.get_many.return_value = Page(items=[], next_cursor=None) assert client.get("/api/v1/structures?_fields=not_a_field").status_code == 422 - def test_valid_fields_forwarded(self, client, structure_repo): - structure_repo.get_structures.return_value = Page(items=[], next_cursor=None) + def test_valid_fields_forwarded(self, client, structure_service): + structure_service.get_many.return_value = Page(items=[], next_cursor=None) client.get("/api/v1/structures?_fields=name") # parse_fields always includes the id identity field. - assert structure_repo.get_structures.call_args.kwargs["fields"] == frozenset({"id", "name"}) + assert structure_service.get_many.call_args.kwargs["fields"] == frozenset({"id", "name"}) class TestStructuresDelete: @@ -115,34 +92,34 @@ def test_service_delete_called(self, client, structure_service): class TestStructuresInsert: - def test_post_route_exists(self, client, structure_repo): - # Empty body -> handler invoked; repo returns a summary-shaped object. - structure_repo.insert_structures.return_value = {"total": 0, "succeeded": [], "failed": []} + def test_post_route_exists(self, client, structure_service): + # Empty body -> handler invoked; service returns a summary-shaped object. + structure_service.insert.return_value = {"total": 0, "succeeded": [], "failed": []} r = client.post("/api/v1/structures", json=[]) assert r.status_code != 404 - def test_post_forwards_to_repo(self, client, structure_repo): - structure_repo.insert_structures.return_value = {"total": 0, "succeeded": [], "failed": []} + def test_post_forwards_to_service(self, client, structure_service): + structure_service.insert.return_value = {"total": 0, "succeeded": [], "failed": []} client.post("/api/v1/structures", json=[]) - structure_repo.insert_structures.assert_awaited_once() + structure_service.insert.assert_awaited_once() class TestStructuresByIdRouting: - def test_get_by_id_conventional_path(self, client, structure_repo): - structure_repo.get_structure_by_id.return_value = SAMPLE_STRUCTURE + def test_get_by_id_conventional_path(self, client, structure_service): + structure_service.get_by_id.return_value = SAMPLE_STRUCTURE assert client.get(f"/api/v1/structures/{PydanticObjectId()}").status_code == 200 def test_delete_by_id_conventional_path(self, client, structure_service): structure_service.delete_by_id.return_value = ComponentDeleteResponse(num_deleted=1) assert client.delete(f"/api/v1/structures/{PydanticObjectId()}").status_code == 200 - def test_patch_by_id_conventional_path(self, client, structure_repo): - structure_repo.patch_structure_by_id.return_value = SAMPLE_STRUCTURE + def test_patch_by_id_conventional_path(self, client, structure_service): + structure_service.patch_by_id.return_value = SAMPLE_STRUCTURE r = client.patch(f"/api/v1/structures/{PydanticObjectId()}", json={"name": "renamed"}) assert r.status_code == 200 - def test_download_conventional_path(self, client, structure_repo): - structure_repo.download_structures.return_value = iter([b"x"]) + def test_download_conventional_path(self, client, structure_service): + structure_service.download.return_value = iter([b"x"]) assert client.get("/api/v1/structures/download/gz?format=csv").status_code == 200 @@ -152,20 +129,20 @@ def test_download_conventional_path(self, client, structure_repo): class TestTablesList: - def test_empty_page_returns_200(self, client, table_repo): - table_repo.get_tables.return_value = Page(items=[], next_cursor=None) + def test_empty_page_returns_200(self, client, table_service): + table_service.get_many.return_value = Page(items=[], next_cursor=None) assert client.get("/api/v1/tables").status_code == 200 - def test_page_shape(self, client, table_repo): - table_repo.get_tables.return_value = Page(items=[SAMPLE_TABLE], next_cursor=None) + def test_page_shape(self, client, table_service): + table_service.get_many.return_value = Page(items=[SAMPLE_TABLE], next_cursor=None) assert "items" in client.get("/api/v1/tables").json() - def test_invalid_fields_returns_422(self, client, table_repo): - table_repo.get_tables.return_value = Page(items=[], next_cursor=None) + def test_invalid_fields_returns_422(self, client, table_service): + table_service.get_many.return_value = Page(items=[], next_cursor=None) assert client.get("/api/v1/tables?_fields=nope").status_code == 422 - def test_default_fields_accepted(self, client, table_repo): - table_repo.get_tables.return_value = Page(items=[], next_cursor=None) + def test_default_fields_accepted(self, client, table_service): + table_service.get_many.return_value = Page(items=[], next_cursor=None) assert client.get("/api/v1/tables").status_code == 200 @@ -180,43 +157,43 @@ def test_batch_delete_returns_200(self, client, table_service): class TestTablesInsert: - def test_post_forwards_to_repo(self, client, table_repo): - table_repo.insert_tables.return_value = {"total": 0, "succeeded": [], "failed": []} + def test_post_forwards_to_service(self, client, table_service): + table_service.insert.return_value = {"total": 0, "succeeded": [], "failed": []} client.post("/api/v1/tables", json=[]) - table_repo.insert_tables.assert_awaited_once() + table_service.insert.assert_awaited_once() class TestTablesByIdRouting: - def test_get_by_id_conventional_path(self, client, table_repo): - table_repo.get_table_by_id.return_value = SAMPLE_TABLE + def test_get_by_id_conventional_path(self, client, table_service): + table_service.get_by_id.return_value = SAMPLE_TABLE assert client.get(f"/api/v1/tables/{PydanticObjectId()}").status_code == 200 def test_delete_by_id_conventional_path(self, client, table_service): table_service.delete_by_id.return_value = ComponentDeleteResponse(num_deleted=1) assert client.delete(f"/api/v1/tables/{PydanticObjectId()}").status_code == 200 - def test_patch_by_id_conventional_path(self, client, table_repo): - table_repo.patch_table_by_id.return_value = SAMPLE_TABLE + def test_patch_by_id_conventional_path(self, client, table_service): + table_service.patch_by_id.return_value = SAMPLE_TABLE r = client.patch(f"/api/v1/tables/{PydanticObjectId()}", json={"name": "x"}) assert r.status_code == 200 # =========================================================================== -# ATTACHMENTS (RED: router is a copy of structures, wrong repo + methods) +# ATTACHMENTS # =========================================================================== class TestAttachmentsRouterWiring: - def test_list_calls_attachment_repo(self, client, attachment_repo): - attachment_repo.get_attachments.return_value = Page(items=[], next_cursor=None) + def test_list_calls_attachment_service(self, client, attachment_service): + attachment_service.get_many.return_value = Page(items=[], next_cursor=None) r = client.get("/api/v1/attachments") assert r.status_code == 200 - attachment_repo.get_attachments.assert_awaited_once() + attachment_service.get_many.assert_awaited_once() - def test_get_by_id_calls_attachment_repo(self, client, attachment_repo): - attachment_repo.get_attachment_by_id.return_value = None + def test_get_by_id_calls_attachment_service(self, client, attachment_service): + attachment_service.get_by_id.return_value = None client.get(f"/api/v1/attachments/{PydanticObjectId()}") - attachment_repo.get_attachment_by_id.assert_awaited_once() + attachment_service.get_by_id.assert_awaited_once() def test_delete_by_id_calls_attachment_service(self, client, attachment_service): attachment_service.delete_by_id.return_value = ComponentDeleteResponse(num_deleted=1) @@ -234,23 +211,23 @@ def test_batch_delete_calls_attachment_service(self, client, attachment_service) # # Parametrised over the three component resources so download behavior is held # to the same contract everywhere. Each entry is -# (url_prefix, repo_fixture_name, download_method, expected_stem). +# (url_prefix, service_fixture_name, expected_stem). # =========================================================================== _DOWNLOAD_CASES = [ - ("structures", "structure_repo", "download_structures", "structures"), - ("tables", "table_repo", "download_tables", "tables"), - ("attachments", "attachment_repo", "download_attachments", "attachments"), + ("structures", "structure_service", "structures"), + ("tables", "table_service", "tables"), + ("attachments", "attachment_service", "attachments"), ] @pytest.fixture def download_target(request): - """Resolve a (prefix, repo, method_name, stem) case into a wired repo mock.""" - prefix, repo_fixture, method, stem = request.param - repo = request.getfixturevalue(repo_fixture) - getattr(repo, method).return_value = iter([b"x"]) - return prefix, repo, method, stem + """Resolve a (prefix, service_fixture, stem) case into a wired service mock.""" + prefix, service_fixture, stem = request.param + service = request.getfixturevalue(service_fixture) + service.download.return_value = iter([b"x"]) + return prefix, service, stem @pytest.mark.parametrize("download_target", _DOWNLOAD_CASES, indirect=True) @@ -264,8 +241,8 @@ def test_jsonl_returns_200(self, client, download_target): assert client.get(f"/api/v1/{prefix}/download/gz?format=jsonl").status_code == 200 def test_body_is_streamed_bytes(self, client, download_target): - prefix, repo, method, _ = download_target - getattr(repo, method).return_value = iter([b"ab", b"cd"]) + prefix, service, _ = download_target + service.download.return_value = iter([b"ab", b"cd"]) assert client.get(f"/api/v1/{prefix}/download/gz?format=jsonl").content == b"abcd" def test_format_is_required(self, client, download_target): @@ -281,10 +258,10 @@ def test_invalid_format_returns_422(self, client, download_target): prefix, *_ = download_target assert client.get(f"/api/v1/{prefix}/download/gz?format=xml").status_code == 422 - def test_format_forwarded_to_repo(self, client, download_target): - prefix, repo, method, _ = download_target + def test_format_forwarded_to_service(self, client, download_target): + prefix, service, _ = download_target client.get(f"/api/v1/{prefix}/download/gz?format=csv") - assert getattr(repo, method).call_args.kwargs["format"] == "csv" + assert service.download.call_args.kwargs["format"] == "csv" def test_csv_filename_uses_csv_extension(self, client, download_target): """A CSV download is named *.csv.gz, matching the requested format.""" diff --git a/mpcontribs-api/tests/unit/domains/test_component_service.py b/mpcontribs-api/tests/unit/domains/test_component_service.py index 5a67e925ff..090716b402 100644 --- a/mpcontribs-api/tests/unit/domains/test_component_service.py +++ b/mpcontribs-api/tests/unit/domains/test_component_service.py @@ -4,8 +4,8 @@ from beanie import PydanticObjectId from mpcontribs_api.domains._shared.models import ComponentDeleteResponse, DeleteResponse +from mpcontribs_api.domains._shared.service import ComponentService from mpcontribs_api.domains.attachments.models import AttachmentFilter -from mpcontribs_api.domains.attachments.service import AttachmentService from mpcontribs_api.exceptions import NotFoundError pytestmark = pytest.mark.asyncio @@ -20,8 +20,8 @@ def _make_service( candidate_ids: list[PydanticObjectId], reachable: set[PydanticObjectId], referenced: set[PydanticObjectId], -) -> tuple[AttachmentService, AsyncMock, AsyncMock]: - """Build an AttachmentService over mocked component + contribution repos. +) -> tuple[ComponentService, AsyncMock, AsyncMock]: + """Build a ComponentService over mocked component + contribution repos. ``referenced_component_ids`` returns ``reachable`` for scoped checks (access gate) and ``referenced`` for unscoped checks (global integrity), keyed off the ``scoped`` kwarg. @@ -41,7 +41,8 @@ async def _referenced(ref_field, ids, *, scoped): contributions.referenced_component_ids = AsyncMock(side_effect=_referenced) - return AttachmentService(components, contributions), components, contributions + service = ComponentService(components, contributions, ref_field="attachments") + return service, components, contributions # --------------------------------------------------------------------------- diff --git a/mpcontribs-api/tests/unit/domains/test_contribution_service.py b/mpcontribs-api/tests/unit/domains/test_contribution_service.py index e2943e9412..69720ecbc0 100644 --- a/mpcontribs-api/tests/unit/domains/test_contribution_service.py +++ b/mpcontribs-api/tests/unit/domains/test_contribution_service.py @@ -224,7 +224,7 @@ async def test_oversize_contribution_goes_to_failures_without_db(self): assert summary.failed[0].index == 1 assert summary.failed[0].error_code == "validation_error" # Oversize never reached the component repo - struct_repo.insert_structures.assert_not_called() + struct_repo.insert_components.assert_not_called() # And the in-pool contribution did go through the no-component fast path contrib_repo.insert_many_contributions.assert_called_once() @@ -290,9 +290,9 @@ class TestInsertContributionsTransactionPath: async def test_with_components_opens_session_per_contribution(self): svc, contrib_repo, struct_repo, table_repo, attach_repo, client = _make_service() - struct_repo.insert_structures.return_value = [_fake_structure()] - table_repo.insert_tables.return_value = [] - attach_repo.insert_attachments.return_value = [] + struct_repo.insert_components.return_value = [_fake_structure()] + table_repo.insert_components.return_value = [] + attach_repo.insert_components.return_value = [] async def _insert(doc, session=None): return doc @@ -311,8 +311,8 @@ async def test_session_threaded_to_all_repo_calls(self): client, session = _make_fake_client() svc, contrib_repo, struct_repo, table_repo, _, _ = _make_service(client=client) - struct_repo.insert_structures.return_value = [_fake_structure()] - table_repo.insert_tables.return_value = [_fake_table()] + struct_repo.insert_components.return_value = [_fake_structure()] + table_repo.insert_components.return_value = [_fake_table()] async def _insert(doc, session=None): return doc @@ -325,16 +325,16 @@ async def _insert(doc, session=None): attachments=[_attachment_in()], ) await svc.insert_contributions([contrib]) - assert struct_repo.insert_structures.call_args.kwargs["session"] is session - assert table_repo.insert_tables.call_args.kwargs["session"] is session + assert struct_repo.insert_components.call_args.kwargs["session"] is session + assert table_repo.insert_components.call_args.kwargs["session"] is session assert contrib_repo.insert_contribution.call_args.kwargs["session"] is session async def test_failure_on_second_of_three_yields_summary(self): svc, contrib_repo, struct_repo, table_repo, attach_repo, _ = _make_service() - struct_repo.insert_structures.return_value = [_fake_structure()] - table_repo.insert_tables.return_value = [] - attach_repo.insert_attachments.return_value = [] + struct_repo.insert_components.return_value = [_fake_structure()] + table_repo.insert_components.return_value = [] + attach_repo.insert_components.return_value = [] async def _insert(doc, session=None): # Fail the second contribution by inspecting the doc identifier @@ -362,9 +362,9 @@ async def test_component_links_wired_per_contribution(self): struct_a, struct_b = _fake_structure(), _fake_structure() struct_calls = iter([[struct_a], [struct_b]]) - struct_repo.insert_structures.side_effect = lambda *_args, **_kwargs: next(struct_calls) - table_repo.insert_tables.return_value = [] - attach_repo.insert_attachments.return_value = [] + struct_repo.insert_components.side_effect = lambda *_args, **_kwargs: next(struct_calls) + table_repo.insert_components.return_value = [] + attach_repo.insert_components.return_value = [] captured: list[Contribution] = [] @@ -394,9 +394,9 @@ class TestInsertContributionsMixedBatch: async def test_mixed_batch_routes_correctly(self): svc, contrib_repo, struct_repo, table_repo, attach_repo, client = _make_service() - struct_repo.insert_structures.return_value = [_fake_structure()] - table_repo.insert_tables.return_value = [] - attach_repo.insert_attachments.return_value = [] + struct_repo.insert_components.return_value = [_fake_structure()] + table_repo.insert_components.return_value = [] + attach_repo.insert_components.return_value = [] contrib_repo.insert_many_contributions.return_value = None async def _insert(doc, session=None): @@ -581,9 +581,9 @@ async def test_same_key_concurrent_upserts_both_go_through_atomic_call(self): # write_slots = asyncio.Semaphore(1) # svc, contrib_repo, struct_repo, table_repo, attach_repo, _ = _make_service(write_slots=write_slots) -# struct_repo.insert_structures.return_value = [_fake_structure()] -# table_repo.insert_tables.return_value = [] -# attach_repo.insert_attachments.return_value = [] +# struct_repo.insert_components.return_value = [_fake_structure()] +# table_repo.insert_components.return_value = [] +# attach_repo.insert_components.return_value = [] # in_flight = 0 # peak = 0 From d2ca35c4d7dcdd5d079ad3a9f86b4102c20ca990 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 17 Jun 2026 11:40:14 -0700 Subject: [PATCH 136/591] Added download tests, removed config test raising on creating Settings empty - we have defaults now --- .../test_shared_repository_download.py | 36 ++++++++++++------- mpcontribs-api/tests/unit/test_config.py | 6 ---- 2 files changed, 23 insertions(+), 19 deletions(-) diff --git a/mpcontribs-api/tests/unit/domains/test_shared_repository_download.py b/mpcontribs-api/tests/unit/domains/test_shared_repository_download.py index 8f87b219f8..b32417ef32 100644 --- a/mpcontribs-api/tests/unit/domains/test_shared_repository_download.py +++ b/mpcontribs-api/tests/unit/domains/test_shared_repository_download.py @@ -201,26 +201,36 @@ async def test_dict_value_serialized_as_json(self): class TestGetSerializer: - def test_jsonl_returns_jsonl_serializer(self): + @pytest.mark.parametrize("format", list(DownloadFormat)) + async def test_every_format_dispatches_to_a_usable_serializer(self, format: DownloadFormat): + """Every ``DownloadFormat`` member maps to a serializer of the expected shape. + + ``_get_serializer`` has no default case, so an unhandled member would silently + return ``None``. Parametrizing over every member guarantees the match stays + exhaustive: adding a format without a matching case fails here rather than at + request time. The returned object is uniformly a callable taking the row stream + and yielding ``bytes``, regardless of which format produced it. + """ + repo = _repo() + serializer = repo._get_serializer(format, None) + assert callable(serializer) + raw = await _collect(serializer(_aiter([_Out(a=1, b="x")]))) + assert isinstance(raw, bytes) and raw + + async def test_jsonl_dispatches_to_jsonl_output(self): repo = _repo() - assert repo._get_serializer(DownloadFormat.JSONL, None) is MongoDbRepository._serialize_jsonl + serializer = repo._get_serializer(DownloadFormat.JSONL, None) + raw = await _collect(serializer(_aiter([_Out(a=1, b="x")]))) + assert json.loads(raw) == {"a": 1, "b": "x"} - async def test_csv_serializer_is_callable_and_serializes(self): + async def test_csv_dispatches_to_csv_output_and_threads_fields(self): + # The fields passed to _get_serializer must reach the CSV serializer: 'b' is + # dropped because only 'a' was requested. repo = _repo() serializer = repo._get_serializer(DownloadFormat.CSV, frozenset({"a"})) raw = await _collect(serializer(_aiter([_Out(a=1, b="x")]))) assert _parse_csv(raw) == [{"a": "1"}] - def test_enum_rejects_arbitrary_string(self): - """Arbitrary strings can't reach _get_serializer: the StrEnum rejects them. - - ``_get_serializer`` takes a ``DownloadFormat``, and the enum refuses any value - outside its members at construction time, so an unsupported format is stopped - at the type boundary rather than falling through to a None serializer. - """ - with pytest.raises(ValueError): - DownloadFormat("xml") - # =========================================================================== # _hash_payload diff --git a/mpcontribs-api/tests/unit/test_config.py b/mpcontribs-api/tests/unit/test_config.py index 3db14f7685..fe88f30076 100644 --- a/mpcontribs-api/tests/unit/test_config.py +++ b/mpcontribs-api/tests/unit/test_config.py @@ -152,12 +152,6 @@ def test_invalid_environment_raises(self, monkeypatch): with pytest.raises(PydanticValidationError): Settings() - def test_missing_required_env_raises(self, monkeypatch): - for key in REQUIRED_ENV: - monkeypatch.delenv(key, raising=False) - with pytest.raises(PydanticValidationError): - Settings() - # --------------------------------------------------------------------------- # get_settings caching From 5f75cf3bde4ea5589e822df7ecd95a4c29d0921e Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 17 Jun 2026 11:49:48 -0700 Subject: [PATCH 137/591] Reverted non-API changes to master versions --- .../mpcontribs/ingester/cli.py | 4 +- .../mpcontribs/ingester/webui.py | 11 +- .../mpcontribs/io/core/components/tdata.py | 2 +- mpcontribs-io/mpcontribs/io/core/utils.py | 5 +- mpcontribs-kernel-gateway/make_seed.py | 1 + mpcontribs-lux/mpcontribs/lux/autogen.py | 4 +- .../lux/projects/alab/schemas/base.py | 2 +- .../esoteric_ephemera/test_schemas.py | 1 + mpcontribs-portal/maintenance.py | 10 +- .../mpcontribs/portal/middleware.py | 3 +- mpcontribs-portal/mpcontribs/portal/urls.py | 4 +- mpcontribs-portal/mpcontribs/portal/views.py | 10 +- .../users/als_beamline/scripts/__main__.py | 3 +- .../als_beamline/scripts/translate_PyPt.py | 3 + .../dilute_solute_diffusion/pre_submission.py | 10 +- .../users/martin_lab/martin_lab.ipynb | 2 +- .../mpcontribs/users/qmcdb/main/views.py | 5 +- .../mpcontribs/users/qmcdb/records/views.py | 7 +- .../users/redox_thermo_csp/pre_submission.py | 9 +- .../redox_thermo_csp/update_energy_data.py | 3 +- .../screening_inorganic_pv/pre_submission.py | 8 +- .../mpcontribs/users/swf/pre_submission.py | 8 +- mpcontribs-portal/mpcontribs/users/utils.py | 8 +- .../2dmatpedia.ipynb | 96 +++--- .../Broberg_benchmark_defects.ipynb | 165 ++++++---- .../ExpXAS.ipynb | 74 +++-- .../ForbiddenTransitions.ipynb | 164 +++------- .../HFP2023.ipynb | 72 ++--- .../MnO2_phase_selection.ipynb | 79 +++-- .../attachments.ipynb | 18 +- .../bioi_defects.ipynb | 32 +- .../contribs.materialsproject.org/cards.ipynb | 28 +- .../carrier_transport.ipynb | 232 +++++++-------- .../defect_genome_pcfc_materials.ipynb | 70 ++--- .../deltaHvacancy.ipynb | 62 ++-- .../dilute_solute_diffusion.ipynb | 93 ++---- .../download.ipynb | 21 +- .../contribs.materialsproject.org/dtu.ipynb | 51 ++-- .../ediffcrystalprediction.ipynb | 29 +- .../esters.ipynb | 27 +- .../experimental_thermo.ipynb | 281 ++++++++---------- .../experimental_thermoelectrics.ipynb | 152 ++-------- .../ferroelectrics.ipynb | 169 +++++------ .../contribs.materialsproject.org/gbdb.ipynb | 32 +- .../get_started.ipynb | 74 ++--- .../intermatch.ipynb | 9 +- .../ion_ref_data.ipynb | 117 +++----- .../jarvis_dft.ipynb | 77 +++-- .../jarvis_dft_2023.ipynb | 156 +++++----- .../matscholar.ipynb | 33 +- .../melting_points.ipynb | 22 +- .../mg_cathode_screening_2022.ipynb | 252 +++++++--------- .../mofexplorer.ipynb | 14 +- .../ocp/ocp-update.ipynb | 13 +- .../ocp/ocp-upload.ipynb | 30 +- .../open_catalyst_project.ipynb | 59 ++-- .../perovskites_diffusion.ipynb | 21 +- .../pycroscopy.ipynb | 57 ++-- .../pydatarecognition.ipynb | 53 ++-- .../qsgw_band_structures.ipynb | 164 +++++----- .../screening_inorganic_pv.ipynb | 20 +- .../silicon_defects.ipynb | 44 ++- .../simple_test.ipynb | 108 ++++--- .../springer_materials.ipynb | 43 ++- .../contribs.materialsproject.org/swf.ipynb | 24 +- .../transparent_conductors.ipynb | 141 ++++----- .../genesis_efrc_minipipes.ipynb | 32 +- .../get_started.ipynb | 171 ++++++----- .../ml.materialsproject.org/get_started.ipynb | 123 ++++---- mpcontribs-portal/supervisord/conf.py | 2 +- mpcontribs-portal/wsgi.py | 1 + mpcontribs-serverless/make_download/app.py | 18 +- 72 files changed, 1703 insertions(+), 2245 deletions(-) diff --git a/mpcontribs-ingester/mpcontribs/ingester/cli.py b/mpcontribs-ingester/mpcontribs/ingester/cli.py index 53267ef457..53965cc507 100644 --- a/mpcontribs-ingester/mpcontribs/ingester/cli.py +++ b/mpcontribs-ingester/mpcontribs/ingester/cli.py @@ -1,8 +1,6 @@ # -*- coding: utf-8 -*- # http://flask.pocoo.org/docs/0.10/patterns/appdispatch/ -import os -import argparse -import string +import os, argparse, string from werkzeug.serving import run_simple from werkzeug.wsgi import DispatcherMiddleware, SharedDataMiddleware from flask import Flask diff --git a/mpcontribs-ingester/mpcontribs/ingester/webui.py b/mpcontribs-ingester/mpcontribs/ingester/webui.py index c0b4debe56..5d4f711563 100644 --- a/mpcontribs-ingester/mpcontribs/ingester/webui.py +++ b/mpcontribs-ingester/mpcontribs/ingester/webui.py @@ -1,14 +1,7 @@ from __future__ import unicode_literals, print_function, absolute_import -import json -import os -import socket -import codecs -import time -import psutil -import sys -import warnings -import multiprocessing +import json, os, socket, codecs, time, psutil +import sys, warnings, multiprocessing from tempfile import gettempdir from flask import render_template, request, Response, Blueprint, current_app from flask import url_for, redirect, make_response, stream_with_context, jsonify diff --git a/mpcontribs-io/mpcontribs/io/core/components/tdata.py b/mpcontribs-io/mpcontribs/io/core/components/tdata.py index 365c9d6221..17293619a7 100644 --- a/mpcontribs-io/mpcontribs/io/core/components/tdata.py +++ b/mpcontribs-io/mpcontribs/io/core/components/tdata.py @@ -105,7 +105,7 @@ def to_backgrid_dict(self): composition = get_composition_from_string(cell) composition = pmg_util.string.unicodeify(composition) table["rows"][row_index][col] = composition - except CompositionError, ValueError, OverflowError: + except (CompositionError, ValueError, OverflowError): try: # https://stackoverflow.com/a/38020041 result = urlparse(cell) diff --git a/mpcontribs-io/mpcontribs/io/core/utils.py b/mpcontribs-io/mpcontribs/io/core/utils.py index b86075c234..1def24772d 100644 --- a/mpcontribs-io/mpcontribs/io/core/utils.py +++ b/mpcontribs-io/mpcontribs/io/core/utils.py @@ -1,6 +1,5 @@ # -*- coding: utf-8 -*- """module defines utility methods for MPContribs core.io library""" - from __future__ import unicode_literals from decimal import Decimal, DecimalException, InvalidOperation import six @@ -83,7 +82,7 @@ def normalize_root_level(title): try: composition = get_composition_from_string(title) return False, composition - except CompositionError, KeyError, TypeError, ValueError: + except (CompositionError, KeyError, TypeError, ValueError): if mp_id_pattern.match(title.lower()): return False, title.lower() return True, title @@ -158,6 +157,6 @@ def read_csv(body, is_data_section=True, **kwargs): squeeze=True, converters=converters, encoding="utf8", - **options, + **options ).dropna(how="all") ) diff --git a/mpcontribs-kernel-gateway/make_seed.py b/mpcontribs-kernel-gateway/make_seed.py index 28aa21e0d1..f92a5df7c9 100644 --- a/mpcontribs-kernel-gateway/make_seed.py +++ b/mpcontribs-kernel-gateway/make_seed.py @@ -1,4 +1,5 @@ # -*- coding: utf-8 -*- +import ddtrace.auto import nbformat as nbf nb = nbf.v4.new_notebook() diff --git a/mpcontribs-lux/mpcontribs/lux/autogen.py b/mpcontribs-lux/mpcontribs/lux/autogen.py index 727e72f37f..aeee406c21 100644 --- a/mpcontribs-lux/mpcontribs/lux/autogen.py +++ b/mpcontribs-lux/mpcontribs/lux/autogen.py @@ -100,7 +100,7 @@ def pydantic_model(self) -> Type[BaseModel]: self.file_name, orient=orient, lines=self.fmt == "jsonl" ) break - except Exception: + except Exception as exc: continue else: raise ValueError( @@ -118,7 +118,7 @@ def pydantic_model(self) -> Type[BaseModel]: } return create_model( - f"{self.file_name.name.split('.', 1)[0]}", + f"{self.file_name.name.split('.',1)[0]}", **model_fields, ) diff --git a/mpcontribs-lux/mpcontribs/lux/projects/alab/schemas/base.py b/mpcontribs-lux/mpcontribs/lux/projects/alab/schemas/base.py index b26e3d23e9..d514463dd4 100644 --- a/mpcontribs-lux/mpcontribs/lux/projects/alab/schemas/base.py +++ b/mpcontribs-lux/mpcontribs/lux/projects/alab/schemas/base.py @@ -24,7 +24,7 @@ def ExcludeFromUpload(default: Any = None, description: str = "", **kwargs) -> A default=default, description=description, json_schema_extra={"exclude_from_upload": True}, - **kwargs, + **kwargs ) diff --git a/mpcontribs-lux/tests/projects/esoteric_ephemera/test_schemas.py b/mpcontribs-lux/tests/projects/esoteric_ephemera/test_schemas.py index 0d74c5213c..70b6ec8019 100644 --- a/mpcontribs-lux/tests/projects/esoteric_ephemera/test_schemas.py +++ b/mpcontribs-lux/tests/projects/esoteric_ephemera/test_schemas.py @@ -2,6 +2,7 @@ import gzip import json +from pathlib import Path import numpy as np import pytest diff --git a/mpcontribs-portal/maintenance.py b/mpcontribs-portal/maintenance.py index fd878968f1..618bf78625 100644 --- a/mpcontribs-portal/maintenance.py +++ b/mpcontribs-portal/maintenance.py @@ -12,11 +12,9 @@ def generate_downloads(names=None): q = {"name__in": names} if names else {} client = Client(host=os.environ["MPCONTRIBS_API_HOST"], headers=HEADERS) - projects = ( - client.projects.queryProjects(_fields=["name", "stats"], **q) - .result() - .get("data", []) - ) + projects = client.projects.queryProjects( + _fields=["name", "stats"], **q + ).result().get("data", []) skip = {"columns", "contributions"} print("PROJECTS", len(projects)) @@ -30,7 +28,7 @@ def generate_downloads(names=None): print(name, json.loads(resp.content)) if include: - for r in range(1, len(include) + 1): + for r in range(1, len(include)+1): for combo in combinations(include, r): resp = make_download(client, query, combo) print(name, combo, json.loads(resp.content)) diff --git a/mpcontribs-portal/mpcontribs/portal/middleware.py b/mpcontribs-portal/mpcontribs/portal/middleware.py index d41258cd54..d9777c3d61 100644 --- a/mpcontribs-portal/mpcontribs/portal/middleware.py +++ b/mpcontribs-portal/mpcontribs/portal/middleware.py @@ -1,8 +1,9 @@ class MyMiddleware: + def __init__(self, get_response): self.get_response = get_response def __call__(self, request): response = self.get_response(request) - response["X-Consumer-Id"] = request.META.get("HTTP_X_CONSUMER_ID") + response['X-Consumer-Id'] = request.META.get("HTTP_X_CONSUMER_ID") return response diff --git a/mpcontribs-portal/mpcontribs/portal/urls.py b/mpcontribs-portal/mpcontribs/portal/urls.py index cb074fad97..fb87ece834 100644 --- a/mpcontribs-portal/mpcontribs/portal/urls.py +++ b/mpcontribs-portal/mpcontribs/portal/urls.py @@ -25,7 +25,7 @@ url( r"^contributions/download/create/?$", views.create_download, - name="create_download", + name="create_download" ), url( r"^contributions/component/(?P[a-f\d]{24})$", @@ -53,7 +53,7 @@ url(r"^Fe-Co-V/?$", RedirectView.as_view(url="/projects/swf")), url( r"^ScreeningInorganicPV/?$", - RedirectView.as_view(url="/projects/screening_inorganic_pv"), + RedirectView.as_view(url="/projects/screening_inorganic_pv") ), url( r"^(?P[a-zA-Z0-9_]{3,31})/?$", diff --git a/mpcontribs-portal/mpcontribs/portal/views.py b/mpcontribs-portal/mpcontribs/portal/views.py index f8aa3d9762..566a6b6542 100644 --- a/mpcontribs-portal/mpcontribs/portal/views.py +++ b/mpcontribs-portal/mpcontribs/portal/views.py @@ -12,6 +12,8 @@ from redis import Redis from io import BytesIO from copy import deepcopy +from pathlib import Path +from shutil import make_archive, rmtree from nbconvert import HTMLExporter from bravado.exception import HTTPNotFound from json2html import Json2Html @@ -53,7 +55,7 @@ def get_consumer(request): ] headers = {} for name in names: - key = f"HTTP_{name.upper().replace('-', '_')}" + key = f'HTTP_{name.upper().replace("-", "_")}' value = request.META.get(key) if value is not None: headers[name] = value @@ -124,7 +126,7 @@ def landingpage(request, project): ctx["columns"] = ["identifier", "id", "formula"] + [ col["path"] if col["unit"] == "NaN" - else f"{col['path']} [{col['unit']}]" + else f'{col["path"]} [{col["unit"]}]' for col in prov["columns"] ] ctx["search_columns"] = ["identifier", "formula"] + [ @@ -137,7 +139,7 @@ def landingpage(request, project): ] ctx["ranges"] = json.dumps( { - f"{col['path']} [{col['unit']}]": [col["min"], col["max"]] + f'{col["path"]} [{col["unit"]}]': [col["min"], col["max"]] for col in prov["columns"] if col["unit"] != "NaN" } @@ -164,7 +166,7 @@ def apply(request): if headers.get("X-Anonymous-Consumer", False): ctx["alert"] = f""" - Please log in to apply for a project. + Please log in to apply for a project. """.strip() return render(request, "apply.html", ctx.flatten()) diff --git a/mpcontribs-portal/mpcontribs/users/als_beamline/scripts/__main__.py b/mpcontribs-portal/mpcontribs/users/als_beamline/scripts/__main__.py index 4fc72ada4a..bcd0122bda 100644 --- a/mpcontribs-portal/mpcontribs/users/als_beamline/scripts/__main__.py +++ b/mpcontribs-portal/mpcontribs/users/als_beamline/scripts/__main__.py @@ -1,5 +1,4 @@ -import argparse -import os +import argparse, os from mpcontribs.io.archieml.mpfile import MPFile from pre_submission import * diff --git a/mpcontribs-portal/mpcontribs/users/als_beamline/scripts/translate_PyPt.py b/mpcontribs-portal/mpcontribs/users/als_beamline/scripts/translate_PyPt.py index 232914ab86..995f5d045d 100644 --- a/mpcontribs-portal/mpcontribs/users/als_beamline/scripts/translate_PyPt.py +++ b/mpcontribs-portal/mpcontribs/users/als_beamline/scripts/translate_PyPt.py @@ -1,3 +1,6 @@ +import pandas as pd +import os +from scipy.interpolate import interp2d def get_translate(workdir=None): diff --git a/mpcontribs-portal/mpcontribs/users/dilute_solute_diffusion/pre_submission.py b/mpcontribs-portal/mpcontribs/users/dilute_solute_diffusion/pre_submission.py index daaac921db..045f5bd71f 100644 --- a/mpcontribs-portal/mpcontribs/users/dilute_solute_diffusion/pre_submission.py +++ b/mpcontribs-portal/mpcontribs/users/dilute_solute_diffusion/pre_submission.py @@ -1,6 +1,4 @@ -import os -import json -import requests +import os, json, requests, sys from pandas import read_excel, isnull, ExcelWriter, Series from mpcontribs.io.core.recdict import RecursiveDict from mpcontribs.io.core.utils import clean_value, nest_dict @@ -23,6 +21,7 @@ def run(mpfile, hosts=None, download=False): fpath = f"{project}.xlsx" if download or not os.path.exists(fpath): + figshare_id = 1546772 url = "https://api.figshare.com/v2/articles/{}".format(figshare_id) print("get figshare article {}".format(figshare_id)) @@ -61,7 +60,7 @@ def run(mpfile, hosts=None, download=False): if hosts is not None: if isinstance(hosts, int) and idx + 1 > hosts: break - elif isinstance(hosts, list) and host not in hosts: + elif isinstance(hosts, list) and not host in hosts: continue print("get mp-id for {}".format(host)) @@ -134,6 +133,7 @@ def run(mpfile, hosts=None, download=False): mpfile.add_data_table(mpid, df_D0_Q, "D₀_Q") if hdata["Host"]["crystal_structure"] == "BCC": + print("add table for hop activation barriers for {} (BCC)".format(mpid)) columns_E = ( ["Hop activation barrier, E_{} [eV]".format(i) for i in range(2, 5)] @@ -169,6 +169,7 @@ def run(mpfile, hosts=None, download=False): mpfile.add_data_table(mpid, df_v, "hop_attempt_frequencies") elif hdata["Host"]["crystal_structure"] == "FCC": + print("add table for hop activation barriers for {} (FCC)".format(mpid)) columns_E = [ "Hop activation barrier, E_{} [eV]".format(i) for i in range(5) @@ -190,6 +191,7 @@ def run(mpfile, hosts=None, download=False): mpfile.add_data_table(mpid, df_v, "hop_attempt_frequencies") elif hdata["Host"]["crystal_structure"] == "HCP": + print("add table for hop activation barriers for {} (HCP)".format(mpid)) columns_E = [ "Hop activation barrier, E_X [eV]", diff --git a/mpcontribs-portal/mpcontribs/users/martin_lab/martin_lab.ipynb b/mpcontribs-portal/mpcontribs/users/martin_lab/martin_lab.ipynb index c1813d0517..63ddffaa99 100644 --- a/mpcontribs-portal/mpcontribs/users/martin_lab/martin_lab.ipynb +++ b/mpcontribs-portal/mpcontribs/users/martin_lab/martin_lab.ipynb @@ -20,7 +20,7 @@ }, "outputs": [], "source": [ - "mpfile = MPFile.from_file(\"MPContribs/mpcontribs/users/martin_lab/mpfile_init.txt\")" + "mpfile = MPFile.from_file('MPContribs/mpcontribs/users/martin_lab/mpfile_init.txt')" ] }, { diff --git a/mpcontribs-portal/mpcontribs/users/qmcdb/main/views.py b/mpcontribs-portal/mpcontribs/users/qmcdb/main/views.py index cd80073db9..4e4c20ac48 100644 --- a/mpcontribs-portal/mpcontribs/users/qmcdb/main/views.py +++ b/mpcontribs-portal/mpcontribs/users/qmcdb/main/views.py @@ -1,5 +1,8 @@ from django.shortcuts import render -from records.forms import MaterialQueryForm +from django.http import HttpResponseRedirect +from django.contrib.auth.decorators import login_required +from records.forms import MaterialQueryForm, MaterialSubmissionForm +from records.tables import QMCDBSetTable from records.models import QMCDBSet from django.utils.safestring import mark_safe from django.utils.html import escape diff --git a/mpcontribs-portal/mpcontribs/users/qmcdb/records/views.py b/mpcontribs-portal/mpcontribs/users/qmcdb/records/views.py index 589ef8e3e7..c0f0cc1372 100644 --- a/mpcontribs-portal/mpcontribs/users/qmcdb/records/views.py +++ b/mpcontribs-portal/mpcontribs/users/qmcdb/records/views.py @@ -1,13 +1,18 @@ from __future__ import division from django.shortcuts import render from django.http import HttpResponseRedirect, HttpResponse +from django.contrib.auth.decorators import login_required from rest_framework import status from rest_framework.decorators import api_view from rest_framework.response import Response -from records.forms import MaterialSubmissionForm +from records.forms import MaterialQueryForm, MaterialSubmissionForm from records.models import QMCDBSet from records.serializers import QMCDBSetSerializer +from rest_framework.renderers import JSONRenderer +from rest_framework.parsers import JSONParser +from django.utils.six import BytesIO from django.utils.safestring import mark_safe +import numpy as np def manual_qmc_record_submission(request): diff --git a/mpcontribs-portal/mpcontribs/users/redox_thermo_csp/pre_submission.py b/mpcontribs-portal/mpcontribs/users/redox_thermo_csp/pre_submission.py index e95fd1f18c..15cfaf4de7 100644 --- a/mpcontribs-portal/mpcontribs/users/redox_thermo_csp/pre_submission.py +++ b/mpcontribs-portal/mpcontribs/users/redox_thermo_csp/pre_submission.py @@ -1,17 +1,16 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -import os -import json -import re -import sys +import os, json, re, sys from glob import glob from datetime import datetime from itertools import groupby import pandas as pd +from mpcontribs.io.core.utils import get_composition_from_string from mpcontribs.io.core.recdict import RecursiveDict -from mpcontribs.io.core.utils import clean_value, read_csv +from mpcontribs.io.core.utils import clean_value, read_csv, nest_dict from mpcontribs.io.core.components import Table from mpcontribs.users.utils import duplicate_check +from mpcontribs.users.redox_thermo_csp.utils import redenth_act, get_debye_temp def get_fit_pars(sample_number): diff --git a/mpcontribs-portal/mpcontribs/users/redox_thermo_csp/update_energy_data.py b/mpcontribs-portal/mpcontribs/users/redox_thermo_csp/update_energy_data.py index 3701993937..b2eed60d99 100644 --- a/mpcontribs-portal/mpcontribs/users/redox_thermo_csp/update_energy_data.py +++ b/mpcontribs-portal/mpcontribs/users/redox_thermo_csp/update_energy_data.py @@ -2,6 +2,7 @@ import datetime import os import shutil +import numpy as np from energy_analysis import EnergyAnalysis as enera from views import unstable_phases as unst @@ -20,7 +21,7 @@ new_energy_data = old_energy_data for db_id in paramlist: - if "Exp" not in db_id: + if not "Exp" in db_id: print(db_id) data_source = "Theo" # updates only theoretical data celsius = "True" # always True, parameter input in K currently disabled diff --git a/mpcontribs-portal/mpcontribs/users/screening_inorganic_pv/pre_submission.py b/mpcontribs-portal/mpcontribs/users/screening_inorganic_pv/pre_submission.py index 610f864cc7..454a5597e3 100644 --- a/mpcontribs-portal/mpcontribs/users/screening_inorganic_pv/pre_submission.py +++ b/mpcontribs-portal/mpcontribs/users/screening_inorganic_pv/pre_submission.py @@ -1,6 +1,5 @@ # -*- coding: utf-8 -*- -import os -import json +import os, json from pandas import DataFrame from mpcontribs.io.core.recdict import RecursiveDict from mpcontribs.io.core.utils import clean_value @@ -13,7 +12,6 @@ db = client["mpcontribs"] print(db.contributions.count_documents({"project": "screening_inorganic_pv"})) - # @duplicate_check def run(mpfile, **kwargs): @@ -48,11 +46,11 @@ def run(mpfile, **kwargs): rd = RecursiveDict({"formula": formula}) for k, v in config.items(): value = clean_value(d[k], v[1], max_dgts=4) - if "." not in v[0]: + if not "." in v[0]: rd[v[0]] = value else: keys = v[0].split(".") - if keys[0] not in rd: + if not keys[0] in rd: rd[keys[0]] = RecursiveDict({keys[1]: value}) else: rd[keys[0]][keys[1]] = value diff --git a/mpcontribs-portal/mpcontribs/users/swf/pre_submission.py b/mpcontribs-portal/mpcontribs/users/swf/pre_submission.py index 705329fbe8..6c46bc0c1a 100644 --- a/mpcontribs-portal/mpcontribs/users/swf/pre_submission.py +++ b/mpcontribs-portal/mpcontribs/users/swf/pre_submission.py @@ -1,30 +1,32 @@ from mpcontribs.config import mp_level01_titles +from mpcontribs.io.core.recdict import RecursiveDict from mpcontribs.io.core.utils import clean_value, get_composition_from_string from mpcontribs.users.utils import duplicate_check def round_to_100_percent(number_set, digit_after_decimal=1): unround_numbers = [ - x / float(sum(number_set)) * 100 * 10**digit_after_decimal for x in number_set + x / float(sum(number_set)) * 100 * 10 ** digit_after_decimal for x in number_set ] decimal_part_with_index = sorted( [(index, unround_numbers[index] % 1) for index in range(len(unround_numbers))], key=lambda y: y[1], reverse=True, ) - remainder = 100 * 10**digit_after_decimal - sum(map(int, unround_numbers)) + remainder = 100 * 10 ** digit_after_decimal - sum(map(int, unround_numbers)) index = 0 while remainder > 0: unround_numbers[decimal_part_with_index[index][0]] += 1 remainder -= 1 index = (index + 1) % len(number_set) - return [int(x) / float(10**digit_after_decimal) for x in unround_numbers] + return [int(x) / float(10 ** digit_after_decimal) for x in unround_numbers] @duplicate_check def run(mpfile, **kwargs): import pymatgen import pandas as pd + from mpcontribs.users.swf.rest.rester import SwfRester # load data from google sheet google_sheet = mpfile.document[mp_level01_titles[0]].pop("google_sheet") diff --git a/mpcontribs-portal/mpcontribs/users/utils.py b/mpcontribs-portal/mpcontribs/users/utils.py index 86f141c1bd..4cf02217e9 100644 --- a/mpcontribs-portal/mpcontribs/users/utils.py +++ b/mpcontribs-portal/mpcontribs/users/utils.py @@ -1,5 +1,4 @@ -import inspect -import os +import inspect, os from typing import Any, Dict @@ -46,10 +45,7 @@ def wrapper(*args, **kwargs): # https://stackoverflow.com/a/55545369 -def unflatten( - d: Dict[str, Any], - base: Dict[str, Any] = None, -) -> Dict[str, Any]: +def unflatten(d: Dict[str, Any], base: Dict[str, Any] = None,) -> Dict[str, Any]: """Convert any keys containing dotted paths to nested dicts >>> unflatten({'a': 12, 'b': 13, 'c': 14}) # no expansion diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/2dmatpedia.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/2dmatpedia.ipynb index 7f82cf7085..daf3c45748 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/2dmatpedia.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/2dmatpedia.ipynb @@ -6,10 +6,9 @@ "metadata": {}, "outputs": [], "source": [ - "import os\n", - "import gzip\n", - "import json\n", + "import os, gzip, json\n", "from mpcontribs.client import Client\n", + "from pymatgen.core import Structure\n", "from pymatgen.ext.matproj import MPRester\n", "from urllib.request import urlretrieve\n", "from monty.json import MontyDecoder" @@ -21,7 +20,7 @@ "metadata": {}, "outputs": [], "source": [ - "name = \"2dmatpedia\"\n", + "name = '2dmatpedia'\n", "client = Client()\n", "mpr = MPRester()" ] @@ -62,20 +61,20 @@ " \"Eˣ\": \"exfoliation energy\",\n", " \"E\": \"energy\",\n", " \"Eᵛᵈʷ\": \"van-der-Waals energy\",\n", - " \"µ\": \"total magnetization\",\n", + " \"µ\": \"total magnetization\"\n", "}\n", "\n", "project = {\n", - " \"is_public\": True,\n", - " \"title\": \"2DMatPedia\",\n", - " \"long_title\": \"2D Materials Encyclopedia\",\n", - " \"owner\": \"migueldiascosta@nus.edu.sg\",\n", - " \"authors\": \"M. Dias Costa, F.Y. Ping, Z. Jun\",\n", - " \"description\": description,\n", - " \"references\": [\n", - " {\"label\": \"WWW\", \"url\": \"http://www.2dmatpedia.org\"},\n", - " {\"label\": \"PRL\", \"url\": \"https://doi.org/10.1103/PhysRevLett.118.106101\"},\n", - " ],\n", + " 'is_public': True,\n", + " 'title': '2DMatPedia',\n", + " 'long_title': '2D Materials Encyclopedia',\n", + " 'owner': 'migueldiascosta@nus.edu.sg',\n", + " 'authors': 'M. Dias Costa, F.Y. Ping, Z. Jun',\n", + " 'description': description,\n", + " 'references': [\n", + " {'label': 'WWW', 'url': 'http://www.2dmatpedia.org'},\n", + " {'label': 'PRL', 'url': 'https://doi.org/10.1103/PhysRevLett.118.106101'}\n", + " ]\n", "}\n", "\n", "# client.projects.update_entry(pk=name, project=project).result()\n", @@ -90,18 +89,21 @@ "outputs": [], "source": [ "columns = {\n", - " \"material_id\": {\"name\": \"details\"},\n", - " \"source_id\": {\"name\": \"source\"},\n", - " \"discovery_process\": {\"name\": \"process\"},\n", - " \"bandgap\": {\"name\": \"ΔE\", \"unit\": \"eV\"},\n", - " \"decomposition_energy\": {\"name\": \"Eᵈ\", \"unit\": \"eV/atom\"},\n", - " \"exfoliation_energy_per_atom\": {\"name\": \"Eˣ\", \"unit\": \"eV/atom\"},\n", - " \"energy_per_atom\": {\"name\": \"E\", \"unit\": \"eV/atom\"},\n", - " \"energy_vdw_per_atom\": {\"name\": \"Eᵛᵈʷ\", \"unit\": \"eV/atom\"},\n", - " \"total_magnetization\": {\"name\": \"µ\", \"unit\": \"µᵇ\"},\n", + " 'material_id': {'name': 'details'},\n", + " 'source_id': {'name': 'source'},\n", + " 'discovery_process': {'name': 'process'},\n", + " 'bandgap': {'name': 'ΔE', 'unit': 'eV'},\n", + " 'decomposition_energy': {'name': 'Eᵈ', 'unit': 'eV/atom'},\n", + " 'exfoliation_energy_per_atom': {'name': 'Eˣ', 'unit': 'eV/atom'},\n", + " 'energy_per_atom': {'name': 'E', 'unit': 'eV/atom'},\n", + " 'energy_vdw_per_atom': {'name': 'Eᵛᵈʷ', 'unit': 'eV/atom'},\n", + " 'total_magnetization': {'name': 'µ', 'unit': 'µᵇ'} \n", "}\n", "\n", - "init_columns = {v[\"name\"]: v.get(\"unit\") for v in columns.values()}\n", + "init_columns = {\n", + " v[\"name\"]: v.get(\"unit\")\n", + " for v in columns.values()\n", + "}\n", "init_columns[\"structures\"] = None\n", "\n", "# client.init_columns(name, init_columns)\n", @@ -123,13 +125,13 @@ "source": [ "db_json = \"http://www.2dmatpedia.org/static/db.json.gz\"\n", "raw_data = [] # as read from raw files\n", - "dbfile = db_json.rsplit(\"/\")[-1]\n", + "dbfile = db_json.rsplit('/')[-1]\n", "\n", "if not os.path.exists(dbfile):\n", - " print(\"downloading\", dbfile, \"...\")\n", + " print('downloading', dbfile, '...')\n", " urlretrieve(db_json, dbfile)\n", "\n", - "with gzip.open(dbfile, \"rb\") as f:\n", + "with gzip.open(dbfile, 'rb') as f:\n", " for line in f:\n", " raw_data.append(json.loads(line, cls=MontyDecoder))\n", "\n", @@ -144,23 +146,23 @@ "source": [ "details_url = \"http://www.2dmatpedia.org/2dmaterials/doc/\"\n", "contributions = []\n", - "prefixes = {\"mp\", \"mvc\", \"2dm\"}\n", + "prefixes = {'mp', 'mvc', '2dm'}\n", "\n", "for rd in raw_data:\n", - " source_id = rd[\"source_id\"]\n", - " prefix = source_id.split(\"-\")[0]\n", - "\n", + " source_id = rd['source_id']\n", + " prefix = source_id.split('-')[0]\n", + " \n", " if prefix not in prefixes:\n", " continue\n", - "\n", - " identifier = rd[\"material_id\"] if prefix == \"2dm\" else source_id\n", + " \n", + " identifier = rd['material_id'] if prefix == \"2dm\" else source_id \n", " d = {}\n", - "\n", + " \n", " for k, col in columns.items():\n", " value = rd.get(k)\n", " if not value:\n", " continue\n", - "\n", + " \n", " unit = col.get(\"unit\")\n", "\n", " if k == \"material_id\" or (k == \"source_id\" and rd[k].startswith(\"2dm\")):\n", @@ -173,11 +175,8 @@ " d[col[\"name\"]] = value\n", "\n", " contrib = {\n", - " \"project\": name,\n", - " \"is_public\": True,\n", - " \"identifier\": identifier,\n", - " \"data\": d,\n", - " \"structures\": [rd[\"structure\"]],\n", + " 'project': name, 'is_public': True, 'identifier': identifier,\n", + " 'data': d, 'structures': [rd[\"structure\"]]\n", " }\n", "\n", " contributions.append(contrib)\n", @@ -202,18 +201,13 @@ "# client.init_columns(name, init_columns)\n", "# do manual dupe check (due to unique_identifiers=False) and submit missing contributions\n", "all_ids = client.get_all_ids(\n", - " query={\"project\": name},\n", - " data_id_fields={name: \"details\"},\n", + " query={\"project\": name}, data_id_fields={name: \"details\"}\n", " # TODO use fmt=\"map\" for update\n", ").get(name)\n", - "client.submit_contributions(\n", - " [\n", - " contrib\n", - " for contrib in contributions\n", - " if contrib[\"data\"][\"details\"] not in all_ids[\"details_set\"]\n", - " ],\n", - " per_page=30,\n", - ")" + "client.submit_contributions([\n", + " contrib for contrib in contributions\n", + " if contrib[\"data\"][\"details\"] not in all_ids[\"details_set\"]\n", + "], per_page=30)" ] }, { diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/Broberg_benchmark_defects.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/Broberg_benchmark_defects.ipynb index 0e1ea669f2..4a51055e57 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/Broberg_benchmark_defects.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/Broberg_benchmark_defects.ipynb @@ -37,9 +37,7 @@ "source": [ "# load data\n", "drivedir = Path(\"/Users/patrick/GoogleDriveLBNL/My Drive/\")\n", - "datadir = drivedir / Path(\n", - " \"MaterialsProject/gitrepos/mpcontribs-data/Broberg_benchmark_defects\"\n", - ")\n", + "datadir = drivedir / Path(\"MaterialsProject/gitrepos/mpcontribs-data/Broberg_benchmark_defects\")\n", "df_bulk = read_excel(datadir / \"bulk_data.xlsx\")\n", "df_defect = read_excel(datadir / \"defect_level_data.xlsx\")\n", "df_transition = read_excel(datadir / \"transition_level_data.xlsx\")" @@ -54,10 +52,10 @@ "source": [ "# clean DOIs column\n", "def clean_dois(s):\n", - " return \",\".join(\n", - " [doi.strip().replace(\"https://doi.org/\", \"\") for doi in s.split(\",\")]\n", - " )\n", - "\n", + " return \",\".join([\n", + " doi.strip().replace(\"https://doi.org/\", \"\")\n", + " for doi in s.split(\",\")\n", + " ])\n", "\n", "df_bulk[\"DOI\"] = df_bulk[\"DOI\"].apply(clean_dois)" ] @@ -76,13 +74,12 @@ " formula, system, symmetry = name.split(\"_\")\n", " print(formula, system, symmetry)\n", " doc = mpr.summary.search(\n", - " formula=formula,\n", - " crystal_system=system.capitalize(),\n", + " formula=formula, crystal_system=system.capitalize(),\n", " fields=[\"material_id\", \"formula_pretty\", \"crystal_system\", \"symmetry\"],\n", - " sort_fields=\"energy_above_hull\",\n", + " sort_fields=\"energy_above_hull\"\n", " )[0]\n", " mpids.append(doc.material_id)\n", - "\n", + " \n", "df_bulk[\"mp-id\"] = mpids" ] }, @@ -99,82 +96,133 @@ " \"mp-id\": {\"name\": \"identifier\"},\n", " \"Bulk Name\": {\"name\": \"info.bulk\", \"unit\": None},\n", " \"DOI\": {\"name\": \"info.DOIs\", \"unit\": None},\n", - " \"GGA-PBE gap\": {\"name\": \"PBE.gap\", \"unit\": \"eV\"},\n", - " \"GGA-PBE Elt A\": {\"name\": \"PBE.elements.A.name\", \"unit\": None},\n", + " \"GGA-PBE gap\": {\n", + " \"name\": \"PBE.gap\",\n", + " \"unit\": \"eV\"\n", + " },\n", + " \"GGA-PBE Elt A\": {\n", + " \"name\": \"PBE.elements.A.name\",\n", + " \"unit\": None\n", + " },\n", " \"GGA-PBE Elt A chemical potential\": {\n", " \"name\": \"PBE.elements.A.chempot\",\n", - " \"unit\": \"eV\",\n", + " \"unit\": \"eV\"\n", + " },\n", + " \"GGA-PBE Elt B\": {\n", + " \"name\": \"PBE.elements.B.name\",\n", + " \"unit\": None\n", " },\n", - " \"GGA-PBE Elt B\": {\"name\": \"PBE.elements.B.name\", \"unit\": None},\n", " \"GGA-PBE Elt B chemical potential\": {\n", " \"name\": \"PBE.elements.B.chempot\",\n", - " \"unit\": \"eV\",\n", + " \"unit\": \"eV\"\n", + " },\n", + " \"GGA-PBE Elt C\": {\n", + " \"name\": \"PBE.elements.C.name\",\n", + " \"unit\": None\n", " },\n", - " \"GGA-PBE Elt C\": {\"name\": \"PBE.elements.C.name\", \"unit\": None},\n", " \"GGA-PBE Elt C chemical potential\": {\n", " \"name\": \"PBE.elements.C.chempot\",\n", - " \"unit\": \"eV\",\n", + " \"unit\": \"eV\"\n", + " },\n", + " \"GGA-PBE Elt D\": {\n", + " \"name\": \"PBE.elements.D.name\",\n", + " \"unit\": None\n", " },\n", - " \"GGA-PBE Elt D\": {\"name\": \"PBE.elements.D.name\", \"unit\": None},\n", " \"GGA-PBE Elt D chemical potential\": {\n", " \"name\": \"PBE.elements.D.chempot\",\n", - " \"unit\": \"eV\",\n", + " \"unit\": \"eV\"\n", + " },\n", + " \"GGA-PBE Elt E\": {\n", + " \"name\": \"PBE.elements.E.name\",\n", + " \"unit\": None\n", " },\n", - " \"GGA-PBE Elt E\": {\"name\": \"PBE.elements.E.name\", \"unit\": None},\n", " \"GGA-PBE Elt E chemical potential\": {\n", " \"name\": \"PBE.elements.E.chempot\",\n", - " \"unit\": \"eV\",\n", + " \"unit\": \"eV\"\n", + " },\n", + " \"Auto HSE06 gap\": {\n", + " \"name\": \"HSE06.gap\",\n", + " \"unit\": \"eV\"\n", + " },\n", + " \"FL no_bes\": {\n", + " \"name\": \"fermi.noBES\",\n", + " \"unit\": \"eV\"\n", + " },\n", + " \"FL bes\": {\n", + " \"name\": \"fermi.BES\",\n", + " \"unit\": \"eV\"\n", + " },\n", + " \"FL bes_free\": {\n", + " \"name\": \"fermi.freeBES\",\n", + " \"unit\": \"eV\"\n", + " },\n", + " \"lower dopability no_bes\": {\n", + " \"name\": \"fermi.dopability.noBES.lower\",\n", + " \"unit\": \"eV\"\n", + " },\n", + " \"upper dopability no_bes\": {\n", + " \"name\": \"fermi.dopability.noBES.upper\",\n", + " \"unit\": \"eV\"\n", + " },\n", + " \"lower dopability bes\": {\n", + " \"name\": \"fermi.dopability.BES.lower\",\n", + " \"unit\": \"eV\"\n", + " },\n", + " \"upper dopability bes\": {\n", + " \"name\": \"fermi.dopability.BES.upper\",\n", + " \"unit\": \"eV\"\n", " },\n", - " \"Auto HSE06 gap\": {\"name\": \"HSE06.gap\", \"unit\": \"eV\"},\n", - " \"FL no_bes\": {\"name\": \"fermi.noBES\", \"unit\": \"eV\"},\n", - " \"FL bes\": {\"name\": \"fermi.BES\", \"unit\": \"eV\"},\n", - " \"FL bes_free\": {\"name\": \"fermi.freeBES\", \"unit\": \"eV\"},\n", - " \"lower dopability no_bes\": {\"name\": \"fermi.dopability.noBES.lower\", \"unit\": \"eV\"},\n", - " \"upper dopability no_bes\": {\"name\": \"fermi.dopability.noBES.upper\", \"unit\": \"eV\"},\n", - " \"lower dopability bes\": {\"name\": \"fermi.dopability.BES.lower\", \"unit\": \"eV\"},\n", - " \"upper dopability bes\": {\"name\": \"fermi.dopability.BES.upper\", \"unit\": \"eV\"},\n", " \"lower dopability bes_free\": {\n", " \"name\": \"fermi.dopability.freeBES.lower\",\n", - " \"unit\": \"eV\",\n", + " \"unit\": \"eV\"\n", " },\n", " \"upper dopability bes_free\": {\n", " \"name\": \"fermi.dopability.freeBES.upper\",\n", - " \"unit\": \"eV\",\n", + " \"unit\": \"eV\"\n", " },\n", " \"hybrid-published gap\": {\"name\": \"hybrid.gap\", \"unit\": \"eV\"},\n", " \"FL hybrid-published\": {\"name\": \"hybrid.fermi\", \"unit\": \"eV\"},\n", - " \"lower dopability hybrid-published\": {\n", - " \"name\": \"hybrid.dopability.lower\",\n", - " \"unit\": \"eV\",\n", - " },\n", - " \"upper dopability hybrid-published\": {\n", - " \"name\": \"hybrid.dopability.upper\",\n", - " \"unit\": \"eV\",\n", + " \"lower dopability hybrid-published\": {\"name\": \"hybrid.dopability.lower\", \"unit\": \"eV\"},\n", + " \"upper dopability hybrid-published\": {\"name\": \"hybrid.dopability.upper\", \"unit\": \"eV\"},\n", + " \"hybrid-published Elt A\": {\n", + " \"name\": \"hybrid.elements.A.name\",\n", + " \"unit\": None\n", " },\n", - " \"hybrid-published Elt A\": {\"name\": \"hybrid.elements.A.name\", \"unit\": None},\n", " \"hybrid-published Elt A chemical potential\": {\n", " \"name\": \"hybrid.elements.A.chempot\",\n", - " \"unit\": \"eV\",\n", + " \"unit\": \"eV\"\n", + " },\n", + " \"hybrid-published Elt B\": {\n", + " \"name\": \"hybrid.elements.B.name\",\n", + " \"unit\": None\n", " },\n", - " \"hybrid-published Elt B\": {\"name\": \"hybrid.elements.B.name\", \"unit\": None},\n", " \"hybrid-published Elt B chemical potential\": {\n", " \"name\": \"hybrid.elements.B.chempot\",\n", - " \"unit\": \"eV\",\n", + " \"unit\": \"eV\"\n", + " },\n", + " \"hybrid-published Elt C\": {\n", + " \"name\": \"hybrid.elements.C.name\",\n", + " \"unit\": None\n", " },\n", - " \"hybrid-published Elt C\": {\"name\": \"hybrid.elements.C.name\", \"unit\": None},\n", " \"hybrid-published Elt C chemical potential\": {\n", " \"name\": \"hybrid.elements.C.chempot\",\n", - " \"unit\": \"eV\",\n", + " \"unit\": \"eV\"\n", + " },\n", + " \"hybrid-published Elt D\": {\n", + " \"name\": \"hybrid.elements.D.name\",\n", + " \"unit\": None\n", " },\n", - " \"hybrid-published Elt D\": {\"name\": \"hybrid.elements.D.name\", \"unit\": None},\n", " \"hybrid-published Elt D chemical potential\": {\n", " \"name\": \"hybrid.elements.D.chempot\",\n", - " \"unit\": \"eV\",\n", + " \"unit\": \"eV\"\n", + " },\n", + " \"hybrid-published Elt E\": {\n", + " \"name\": \"hybrid.elements.E.name\",\n", + " \"unit\": None\n", " },\n", - " \"hybrid-published Elt E\": {\"name\": \"hybrid.elements.E.name\", \"unit\": None},\n", " \"hybrid-published Elt E chemical potential\": {\n", " \"name\": \"hybrid.elements.E.chempot\",\n", - " \"unit\": \"eV\",\n", + " \"unit\": \"eV\"\n", " },\n", "}" ] @@ -202,15 +250,13 @@ "def apply_unit(cell, unit):\n", " if isinstance(cell, str) and cell.strip() == \"-\":\n", " return \"\"\n", - "\n", + " \n", " return f\"{cell} {unit}\" if unit and cell else cell\n", "\n", - "\n", "def apply_units(column):\n", " unit = columns_map_bulk[column.name].get(\"unit\")\n", " return column.apply(apply_unit, args=(unit,))\n", "\n", - "\n", "df_bulk = df_bulk.apply(apply_units)" ] }, @@ -244,7 +290,7 @@ " contrib = {\n", " \"identifier\": identifier,\n", " \"data\": unflatten(data, splitter=\"dot\"),\n", - " \"attachments\": [],\n", + " \"attachments\": []\n", " }\n", " bulk_name = data[\"info.bulk\"]\n", " formula, system, symmetry = bulk_name.split(\"_\")\n", @@ -268,8 +314,8 @@ " ]\n", " contrib[\"attachments\"].append(Attachment.from_data(\"transitions\", transitions))\n", " contributions.append(contrib)\n", - "\n", - "\n", + " \n", + " \n", "contributions[0]" ] }, @@ -281,12 +327,7 @@ "outputs": [], "source": [ "# initialize columns (including units)\n", - "columns = {\n", - " \"info.bulk\": None,\n", - " \"info.formula\": None,\n", - " \"info.system\": None,\n", - " \"info.symmetry\": None,\n", - "}\n", + "columns = {\"info.bulk\": None, \"info.formula\": None, \"info.system\": None, \"info.symmetry\": None}\n", "\n", "for col in columns_map_bulk.values():\n", " if \".\" in col[\"name\"]:\n", @@ -304,7 +345,7 @@ "client.init_columns(columns)\n", "client.submit_contributions(contributions)\n", "# this shouldn't be necessary but need to re-init columns likely due to bug in API server\n", - "client.init_columns(columns)" + "client.init_columns(columns) " ] } ], diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ExpXAS.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ExpXAS.ipynb index abe2f054f3..d2fdf9ba09 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ExpXAS.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ExpXAS.ipynb @@ -10,7 +10,8 @@ "from mpcontribs.client import Client\n", "from pathlib import Path\n", "from pandas import read_csv\n", - "import pandas as pd" + "import pandas as pd\n", + "import numpy as np" ] }, { @@ -31,9 +32,7 @@ "metadata": {}, "outputs": [], "source": [ - "indir = Path(\n", - " \"/Users/patrick/GoogleDriveLBNL/MaterialsProject/gitrepos/mpcontribs-data/ExpXAS\"\n", - ")\n", + "indir = Path(\"/Users/patrick/GoogleDriveLBNL/MaterialsProject/gitrepos/mpcontribs-data/ExpXAS\")\n", "ref_path = indir / \"reference.data\"\n", "spec_path = indir / \"spectrum.mu\"" ] @@ -47,13 +46,10 @@ "source": [ "# add project-wide meta data to \"Other Info\" dropdown\n", "client.projects.update_entry(\n", - " pk=name,\n", - " project={\n", - " \"other\": {\n", - " \"facility\": \"NSLS-II\",\n", - " \"beamline\": \"ISS (8-ID)\",\n", - " }\n", - " },\n", + " pk=name, project={\"other\": {\n", + " 'facility': 'NSLS-II',\n", + " 'beamline': 'ISS (8-ID)',\n", + " }}\n", ").result()" ] }, @@ -65,12 +61,8 @@ "outputs": [], "source": [ "index = \"energy [eV]\"\n", - "ref = read_csv(\n", - " ref_path, sep=\" \", skiprows=[0, 1], index_col=0, names=[index, \"reference\"]\n", - ")\n", - "spec = read_csv(\n", - " spec_path, sep=\" \", skiprows=[0, 1], index_col=0, names=[index, \"spectrum\"]\n", - ")" + "ref = read_csv(ref_path, sep=\" \", skiprows=[0, 1], index_col=0, names=[index, \"reference\"])\n", + "spec = read_csv(spec_path, sep=\" \", skiprows=[0, 1], index_col=0, names=[index, \"spectrum\"])" ] }, { @@ -83,7 +75,7 @@ "df = pd.concat([ref, spec], axis=1)\n", "df.columns.name = \"type\"\n", "df.attrs[\"title\"] = \"Fe XAS\"\n", - "df.attrs[\"labels\"] = {\"value\": \"flattened normalized μ(E)\"}\n", + "df.attrs[\"labels\"] = {\"value\": \"flattened normalized μ(E)\"} \n", "df.attrs[\"name\"] = \"Fe-XAS\"" ] }, @@ -100,30 +92,30 @@ " \"project\": name,\n", " \"identifier\": \"mp-1279742\", # assign to mp-id or use custom identifier?\n", " \"data\": {\n", - " \"meta\": {\n", - " \"year\": 2020,\n", - " \"cycle\": 1,\n", - " \"SAF\": 304823,\n", - " \"proposal\": 305112,\n", - " \"PI\": \"M. Liu\",\n", - " },\n", - " \"measurement\": {\n", - " \"method\": \"XAS\",\n", - " \"name\": \"FeO\",\n", - " \"composition\": \"Fe\",\n", - " \"element\": \"Fe\",\n", - " \"edge\": \"K\",\n", - " \"E₀\": \"7112 eV\", # submit numbers with units as space-separated strings\n", - " \"scanID\": 77303,\n", - " \"UID\": \"de753795-be14-402e-9a3f-5089a44ff67c\", # could be linked to BNL raw data\n", + " 'meta': {\n", + " 'year': 2020,\n", + " 'cycle': 1,\n", + " 'SAF': 304823,\n", + " 'proposal': 305112,\n", + " 'PI': 'M. Liu',\n", " },\n", - " \"time\": {\n", - " \"start\": \"01/31/2020 17:20:43\", # TODO parse as datetime\n", - " \"stop\": \"01/31/2020 17:21:44\",\n", - " \"total\": \"1 h\",\n", + " 'measurement': {\n", + " 'method': 'XAS',\n", + " 'name': 'FeO',\n", + " 'composition': 'Fe',\n", + " 'element': 'Fe',\n", + " 'edge': 'K',\n", + " 'E₀': '7112 eV', # submit numbers with units as space-separated strings\n", + " 'scanID': 77303,\n", + " 'UID': 'de753795-be14-402e-9a3f-5089a44ff67c', # could be linked to BNL raw data\n", " },\n", + " 'time': {\n", + " 'start': '01/31/2020 17:20:43', # TODO parse as datetime\n", + " 'stop': '01/31/2020 17:21:44',\n", + " 'total': '1 h'\n", + " } \n", " },\n", - " \"tables\": [df],\n", + " \"tables\": [df]\n", "}" ] }, @@ -145,7 +137,9 @@ "metadata": {}, "outputs": [], "source": [ - "all_ids = client.get_all_ids({\"project\": name}, include=[\"tables\"]).get(name, {})\n", + "all_ids = client.get_all_ids(\n", + " {\"project\": name}, include=[\"tables\"]\n", + ").get(name, {})\n", "cids = list(all_ids[\"ids\"])\n", "tids = list(all_ids[\"tables\"][\"ids\"])\n", "cids, tids" diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ForbiddenTransitions.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ForbiddenTransitions.ipynb index ac6c0e7b3b..35ee2fa6d4 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ForbiddenTransitions.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ForbiddenTransitions.ipynb @@ -23,9 +23,7 @@ "metadata": {}, "outputs": [], "source": [ - "data_dir = Path(\n", - " \"/Users/patrick/GoogleDriveLBNL/My Drive/MaterialsProject/gitrepos/mpcontribs-data/ForbiddenTransitions\"\n", - ")" + "data_dir = Path(\"/Users/patrick/GoogleDriveLBNL/My Drive/MaterialsProject/gitrepos/mpcontribs-data/ForbiddenTransitions\")" ] }, { @@ -58,114 +56,37 @@ "source": [ "columns_map = {\n", " # root level\n", - " \"Materials Project ID (mpid)\": {\n", - " \"name\": \"identifier\",\n", - " \"description\": \"Materials Project ID as of May 30, 2023\",\n", - " },\n", - " \"Formula\": {\n", - " \"name\": \"formula\",\n", - " \"description\": \"Chemical formula (from pretty_formula on MP)\",\n", - " },\n", + " \"Materials Project ID (mpid)\": {\"name\": \"identifier\", \"description\": \"Materials Project ID as of May 30, 2023\"},\n", + " \"Formula\": {\"name\": \"formula\", \"description\": \"Chemical formula (from pretty_formula on MP)\"},\n", " # info\n", - " \"Space group\": {\n", - " \"name\": \"info.spacegroup\",\n", - " \"description\": \"Space group symbol from MP\",\n", - " },\n", - " \"# ICSD entries\": {\n", - " \"name\": \"info.numICSDs\",\n", - " \"unit\": \"\",\n", - " \"description\": \"Number of ICSD entries that structure-match to this compound (queried from the Materials Project)\",\n", - " },\n", - " \"Calculation origin\": {\n", - " \"name\": \"info.origin\",\n", - " \"description\": \"The source of the calculation; note that some of these calculations derive from Fabini et al. 2019 (10.1021/acs.chemmater.8b04542) and the associated MPContribs data set)\",\n", - " },\n", + " \"Space group\": {\"name\": \"info.spacegroup\", \"description\": \"Space group symbol from MP\"},\n", + " \"# ICSD entries\": {\"name\": \"info.numICSDs\", \"unit\": \"\", \"description\": \"Number of ICSD entries that structure-match to this compound (queried from the Materials Project)\"},\n", + " \"Calculation origin\": {\"name\": \"info.origin\", \"description\": \"The source of the calculation; note that some of these calculations derive from Fabini et al. 2019 (10.1021/acs.chemmater.8b04542) and the associated MPContribs data set)\"},\n", " # chemical properties\n", - " \"$t_\\mathrm{IPR}^\\mathrm{d}$\": {\n", - " \"name\": \"properties.chemical.IPR\",\n", - " \"description\": \"Inverse participation ratio of the direct VBM and CBM states, used as a proxy for localization of states at the band edges (a high IPR indicates strong localization), as defined by Wegner in 1980 (10.1007/BF01325284) and implemented by Xiong, et al. in 2023 (10.1126/sciadv.adh8617) (see manuscript for details)\",\n", - " },\n", - " \"$σ^\\mathrm{d}$\": {\n", - " \"name\": \"properties.chemical.sigma\",\n", - " \"unit\": \"\",\n", - " \"description\": \"Orbital similarity of the direct VBM and CBM states, derived from the dominant contributors to the density of states at the direct VBM and CBM to describe the similarity of CB-edge and VB-edge orbital contributions (see manuscript for details)\",\n", - " },\n", + " \"$t_\\mathrm{IPR}^\\mathrm{d}$\": {\"name\": \"properties.chemical.IPR\", \"description\": \"Inverse participation ratio of the direct VBM and CBM states, used as a proxy for localization of states at the band edges (a high IPR indicates strong localization), as defined by Wegner in 1980 (10.1007/BF01325284) and implemented by Xiong, et al. in 2023 (10.1126/sciadv.adh8617) (see manuscript for details)\"},\n", + " \"$σ^\\mathrm{d}$\": {\"name\": \"properties.chemical.sigma\", \"unit\": \"\", \"description\": \"Orbital similarity of the direct VBM and CBM states, derived from the dominant contributors to the density of states at the direct VBM and CBM to describe the similarity of CB-edge and VB-edge orbital contributions (see manuscript for details)\"},\n", " # other properties\n", - " \"$E_\\mathrm{hull}$ (eV/at.)\": {\n", - " \"name\": \"properties.other.hull\",\n", - " \"unit\": \"eV/atom\",\n", - " \"description\": \"Energy above the convex hull, computed using GGA (or GGA+U when appropriate) and MP compatability scheme\",\n", - " },\n", - " \"Synthesized?\": {\n", - " \"name\": \"properties.other.synthesized\",\n", - " \"description\": \"Whether a given compound has been synthesized in any form (queried from the Materials Project)\",\n", - " },\n", + " \"$E_\\mathrm{hull}$ (eV/at.)\": {\"name\": \"properties.other.hull\", \"unit\": \"eV/atom\", \"description\": \"Energy above the convex hull, computed using GGA (or GGA+U when appropriate) and MP compatability scheme\"},\n", + " \"Synthesized?\": {\"name\": \"properties.other.synthesized\", \"description\": \"Whether a given compound has been synthesized in any form (queried from the Materials Project)\"},\n", " # optical properties\n", - " \"$E_\\mathrm{G}^\\mathrm{GGA}$ (eV)\": {\n", - " \"name\": \"properties.optical.bandgaps.GGA\",\n", - " \"unit\": \"eV\",\n", - " \"description\": \"Fundamental band gap computed using GGA (or GGA+U when appropriate)\",\n", - " },\n", - " \"$E_\\mathrm{G}^\\mathrm{d,GGA}$ (eV)\": {\n", - " \"name\": \"properties.optical.bandgaps.GGA|d\",\n", - " \"unit\": \"eV\",\n", - " \"description\": \"Direct band gap computed using GGA (or GGA+U when appropriate)\",\n", - " },\n", - " \"$E_\\mathrm{G}^\\mathrm{da,GGA}$ (eV)\": {\n", - " \"name\": \"properties.optical.bandgaps.GGA|da\",\n", - " \"unit\": \"eV\",\n", - " \"description\": \"Direct allowed band gap computed using GGA (or GGA+U when appropriate), defined as the energy at which dipole transition matrix elements become significant (see manuscript for details)\",\n", - " },\n", - " \"$E_\\mathrm{edge}^\\mathrm{da,GGA}$ (eV)\": {\n", - " \"name\": \"properties.optical.energy|edge.GGA|da\",\n", - " \"unit\": \"eV\",\n", - " \"description\": \"Absorption edge energy, defined as the approximate energy at which the absorption coefficient rises to 1e4 cm-1 and becomes significant (see manuscript for details)\",\n", - " },\n", - " \"$Δ^\\mathrm{d,GGA}$\": {\n", - " \"name\": \"properties.optical.delta.GGA|d\",\n", - " \"unit\": \"\",\n", - " \"description\": \"Forbidden energy difference, defined as the energy difference between the direct band gap and direct allowed band gap, such that a value greater than zero indicates the presence of forbidden or weak transitions\",\n", - " },\n", - " \"$Δ_\\mathrm{edge}^\\mathrm{d,GGA}$\": {\n", - " \"name\": \"properties.optical.delta|edge.GGA|d\",\n", - " \"unit\": \"\",\n", - " \"description\": \"Edge energy difference, defined as defined as the energy difference between the direct band gap and the absorption edge energy\",\n", - " },\n", - " \"$α_\\mathrm{avg.vis}^\\mathrm{GGA}$ (cm$^{-1}$)\": {\n", - " \"name\": \"properties.optical.alpha|vis\",\n", - " \"unit\": \"cm⁻¹\",\n", - " \"description\": \"Average GGA absorption coefficient in the visible regime, using an empirical gap correction from Morales et al. 2017 (10.1021/acs.jpcc.7b07421) (see manuscript for details; caution that this should be recalculated if using a scissor shift!)\",\n", - " },\n", - " \"Optical type\": {\n", - " \"name\": \"properties.optical.type\",\n", - " \"description\": \"Optical type categorization (OT 1\\u20134), following the classification outlined by Yu and Zunger in 2012 (10.1103/PhysRevLett.108.068701)\",\n", - " },\n", + " \"$E_\\mathrm{G}^\\mathrm{GGA}$ (eV)\": {\"name\": \"properties.optical.bandgaps.GGA\", \"unit\": \"eV\", \"description\": \"Fundamental band gap computed using GGA (or GGA+U when appropriate)\"},\n", + " \"$E_\\mathrm{G}^\\mathrm{d,GGA}$ (eV)\": {\"name\": \"properties.optical.bandgaps.GGA|d\", \"unit\": \"eV\", \"description\": \"Direct band gap computed using GGA (or GGA+U when appropriate)\"},\n", + " \"$E_\\mathrm{G}^\\mathrm{da,GGA}$ (eV)\": {\"name\": \"properties.optical.bandgaps.GGA|da\", \"unit\": \"eV\", \"description\": \"Direct allowed band gap computed using GGA (or GGA+U when appropriate), defined as the energy at which dipole transition matrix elements become significant (see manuscript for details)\"},\n", + " \"$E_\\mathrm{edge}^\\mathrm{da,GGA}$ (eV)\": {\"name\": \"properties.optical.energy|edge.GGA|da\", \"unit\": \"eV\", \"description\": \"Absorption edge energy, defined as the approximate energy at which the absorption coefficient rises to 1e4 cm-1 and becomes significant (see manuscript for details)\"},\n", + " \"$Δ^\\mathrm{d,GGA}$\": {\"name\": \"properties.optical.delta.GGA|d\", \"unit\": \"\", \"description\": \"Forbidden energy difference, defined as the energy difference between the direct band gap and direct allowed band gap, such that a value greater than zero indicates the presence of forbidden or weak transitions\"},\n", + " \"$Δ_\\mathrm{edge}^\\mathrm{d,GGA}$\": {\"name\": \"properties.optical.delta|edge.GGA|d\", \"unit\": \"\", \"description\": \"Edge energy difference, defined as defined as the energy difference between the direct band gap and the absorption edge energy\"},\n", + " \"$α_\\mathrm{avg.vis}^\\mathrm{GGA}$ (cm$^{-1}$)\": {\"name\": \"properties.optical.alpha|vis\", \"unit\": \"cm⁻¹\", \"description\": \"Average GGA absorption coefficient in the visible regime, using an empirical gap correction from Morales et al. 2017 (10.1021/acs.jpcc.7b07421) (see manuscript for details; caution that this should be recalculated if using a scissor shift!)\"},\n", + " \"Optical type\": {\"name\": \"properties.optical.type\", \"description\": \"Optical type categorization (OT 1\\u20134), following the classification outlined by Yu and Zunger in 2012 (10.1103/PhysRevLett.108.068701)\"},\n", " # transport properties\n", - " \"$m^*_\\mathrm{e}$\": {\n", - " \"name\": \"properties.transport.effmass.electron\",\n", - " \"unit\": \"mₑ\",\n", - " \"description\": \"Electron effective mass, computed using the BoltzTraP2 package assuming dopings of 10^18 cm-3 (see manuscript for details)\",\n", - " },\n", - " \"$m^*_\\mathrm{h}$\": {\n", - " \"name\": \"properties.transport.effmass.hole\",\n", - " \"unit\": \"mₑ\",\n", - " \"description\": \"Hole effective mass, computed using the BoltzTraP2 package assuming dopings of 10^18 cm-3 (see manuscript for details)\",\n", - " },\n", + " \"$m^*_\\mathrm{e}$\": {\"name\": \"properties.transport.effmass.electron\", \"unit\": \"mₑ\", \"description\": \"Electron effective mass, computed using the BoltzTraP2 package assuming dopings of 10^18 cm-3 (see manuscript for details)\"},\n", + " \"$m^*_\\mathrm{h}$\": {\"name\": \"properties.transport.effmass.hole\", \"unit\": \"mₑ\", \"description\": \"Hole effective mass, computed using the BoltzTraP2 package assuming dopings of 10^18 cm-3 (see manuscript for details)\"},\n", "}\n", "\n", "legend = {v[\"name\"]: v[\"description\"] for v in columns_map.values()}\n", - "legend[\"tables.corrected\"] = (\n", - " \"Absorption coefficient computed with the IPA and a GGA functional, using the empirical gap correction from Morales et al. 2017 (10.1021/acs.jpcc.7b07421) (see manuscript for details)\"\n", - ")\n", - "legend[\"tables.uncorrected\"] = (\n", - " \"Absorption coefficient computed with the IPA and a GGA functional (without any empirical gap correction as in alpha; see manuscript for details)\"\n", - ")\n", + "legend[\"tables.corrected\"] = \"Absorption coefficient computed with the IPA and a GGA functional, using the empirical gap correction from Morales et al. 2017 (10.1021/acs.jpcc.7b07421) (see manuscript for details)\"\n", + "legend[\"tables.uncorrected\"] = \"Absorption coefficient computed with the IPA and a GGA functional (without any empirical gap correction as in alpha; see manuscript for details)\"\n", "\n", - "columns = {\n", - " v[\"name\"]: v.get(\"unit\")\n", - " for v in columns_map.values()\n", - " if v[\"name\"] not in [\"identifier\", \"formula\"]\n", - "}" + "columns = {v[\"name\"]: v.get(\"unit\") for v in columns_map.values() if v[\"name\"] not in [\"identifier\", \"formula\"]}" ] }, { @@ -193,7 +114,7 @@ " for k, v in record.items():\n", " if not isinstance(v, str) and isnan(v):\n", " continue\n", - "\n", + " \n", " key = columns_map[k][\"name\"]\n", " unit = columns_map[k].get(\"unit\")\n", " val = v\n", @@ -201,38 +122,29 @@ " val = \"Yes\" if v else \"No\"\n", " elif unit:\n", " val = f\"{v} {unit}\"\n", - "\n", + " \n", " clean[key] = val\n", "\n", - " contrib = {\n", - " \"identifier\": clean.pop(\"identifier\"),\n", - " \"formula\": clean.pop(\"formula\"),\n", - " \"tables\": [],\n", - " }\n", + " contrib = {\"identifier\": clean.pop(\"identifier\"), \"formula\": clean.pop(\"formula\"), \"tables\": []}\n", " contrib[\"data\"] = unflatten(clean, splitter=\"dot\")\n", "\n", " spectrum = spectra.get(contrib[\"identifier\"])\n", " if spectrum:\n", " spectrum.pop(\"mpid\", None)\n", " spectrum.pop(\"formula\", None)\n", - " table = (\n", - " pd.DataFrame(data=spectrum)\n", - " .rename(\n", - " columns={\n", - " \"energy\": \"energy [eV]\",\n", - " \"alpha\": \"α\",\n", - " \"alpha_uncorr\": \"α|uncorrected\",\n", - " }\n", - " )\n", - " .set_index(\"energy [eV]\")\n", - " )\n", + " table = pd.DataFrame(data=spectrum).rename(\n", + " columns={\"energy\": \"energy [eV]\", \"alpha\": \"α\", \"alpha_uncorr\": \"α|uncorrected\"}\n", + " ).set_index(\"energy [eV]\")\n", " table.attrs = {\n", " \"name\": \"absorption coefficients\",\n", " \"title\": \"Energy-dependent Absorption Coefficients\",\n", - " \"labels\": {\"value\": \"absorption coefficient [cm⁻¹]\", \"variable\": \"method\"},\n", + " \"labels\": {\n", + " \"value\": \"absorption coefficient [cm⁻¹]\",\n", + " \"variable\": \"method\"\n", + " }\n", " }\n", " contrib[\"tables\"].append(table)\n", - "\n", + " \n", " contributions.append(contrib)\n", "\n", "len(contributions)" @@ -291,7 +203,7 @@ "query = {\n", " \"data__properties__other__synthesized__exact\": \"Yes\",\n", " \"data__properties__optical__type__contains\": \"ia\",\n", - " \"data__properties__optical__bandgaps__GGA__value__gt\": 3,\n", + " \"data__properties__optical__bandgaps__GGA__value__gt\": 3\n", "}\n", "client.count(query=query)" ] @@ -303,9 +215,7 @@ "metadata": {}, "outputs": [], "source": [ - "contribs = client.query_contributions(\n", - " query=query, fields=[\"identifier\", \"data.properties.other\"], paginate=True\n", - ")\n", + "contribs = client.query_contributions(query=query, fields=[\"identifier\", \"data.properties.other\"], paginate=True)\n", "contribs[\"data\"][0][\"data\"]" ] }, @@ -317,7 +227,7 @@ "outputs": [], "source": [ "contribs = client.download_contributions(query=query, include=[\"tables\"])\n", - "contribs[0][\"tables\"][0] # DataFrame" + "contribs[0][\"tables\"][0] # DataFrame" ] } ], diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/HFP2023.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/HFP2023.ipynb index d4b05adf45..9b0f05ceb1 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/HFP2023.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/HFP2023.ipynb @@ -9,12 +9,15 @@ "source": [ "%env MPRESTER_MUTE_PROGRESS_BARS 1\n", "# pip install mpcontribs-client mp_api pandas flatten_dict\n", + "import os\n", "import gzip\n", "import json\n", "\n", "from pathlib import Path\n", "from mpcontribs.client import Client\n", + "from mp_api.client import MPRester\n", "from pymatgen.core import Structure\n", + "from pandas import read_csv\n", "from flatten_dict import flatten, unflatten" ] }, @@ -46,10 +49,7 @@ "metadata": {}, "outputs": [], "source": [ - "lookup = {\n", - " doc[\"formula_pretty\"] + \"_\" + str(doc[\"symmetry\"][\"number\"]): doc[\"task_id\"]\n", - " for doc in tasks\n", - "}" + "lookup = {doc[\"formula_pretty\"] + \"_\" + str(doc[\"symmetry\"][\"number\"]): doc[\"task_id\"] for doc in tasks}" ] }, { @@ -88,7 +88,7 @@ "def make_gzip(p_in):\n", " p_out = str(p_in) + \".gz\"\n", " if not Path(p_out).exists():\n", - " with p_in.open(\"rb\") as f_in, gzip.open(p_out, \"wb\") as f_out:\n", + " with p_in.open('rb') as f_in, gzip.open(p_out, 'wb') as f_out:\n", " f_out.writelines(f_in)" ] }, @@ -100,37 +100,41 @@ "outputs": [], "source": [ "columns = {\n", - " \"polarization\": {\"v1\": \"C/m²\", \"v2\": \"C/m²\", \"v3\": \"C/m²\", \"mag\": \"C/m²\"},\n", + " \"polarization\": {\n", + " \"v1\": \"C/m²\",\n", + " \"v2\": \"C/m²\",\n", + " \"v3\": \"C/m²\",\n", + " \"mag\": \"C/m²\"\n", + " },\n", " \"mechanic\": {\n", " \"moduli.bulk\": \"N/m²\",\n", " \"moduli.young\": \"N/m²\",\n", " \"moduli.shear\": \"N/m²\",\n", - " \"ratios.pugh\": \"\", # dimensionless number\n", + " \"ratios.pugh\": \"\", # dimensionless number\n", " \"ratios.poisson\": \"\",\n", " \"compressibility\": \"m²/N\",\n", - " \"unknown\": \"\",\n", - " },\n", + " \"unknown\": \"\"\n", + " }\n", "}\n", "\n", - "\n", "def make_data(key, vals):\n", " cols = columns[key]\n", " dct = {}\n", - "\n", + " \n", " for k, v in dict(zip(cols.keys(), vals)).items():\n", " unit = cols[k]\n", - " dct[k] = f\"{v} {unit}\" if unit else v # 5.5 eV, 100 N/m2\n", - "\n", + " dct[k] = f\"{v} {unit}\" if unit else v # 5.5 eV, 100 N/m2\n", + " \n", " return unflatten(dct, splitter=\"dot\")\n", "\n", "\n", "contributions = []\n", "\n", - "for subdir in datadir.glob(\"**/*\"): # looping over subdirectories (DMP-Co)\n", + "for subdir in datadir.glob('**/*'): # looping over subdirectories (DMP-Co)\n", " if subdir.is_file():\n", " continue\n", - "\n", - " identifier = subdir.name # default to subdir as identifier\n", + " \n", + " identifier = subdir.name # default to subdir as identifier\n", " cifs = list(subdir.glob(\"*.cif\"))\n", "\n", " if cifs:\n", @@ -150,7 +154,7 @@ " # _, spacegroup_number = structure.get_space_group_info()\n", " # chemsys = composition.chemical_system\n", "\n", - " # # 1) try formula and space group\n", + " # # 1) try formula and space group \n", " # docs = search(formula=formula, spacegroup_number=spacegroup_number)\n", " # if not docs:\n", " # # 2) try formula\n", @@ -167,19 +171,17 @@ " formula, _ = composition.get_reduced_formula_and_factor()\n", " _, spacegroup_number = structure.get_space_group_info()\n", " identifier = lookup[f\"{formula}_{spacegroup_number}\"]\n", - " print(identifier) # \"link to MP\"\n", - "\n", + " print(identifier) # \"link to MP\"\n", + " \n", " # make sure everything's gzipped\n", " for p in subdir.glob(\"*.*\"):\n", " if p.suffix in {\".txt\", \".vasp\", \".cif\"}:\n", " make_gzip(p)\n", - "\n", + " \n", " # init contribution; add all files as attachments; add structure\n", " contrib = {\n", - " \"identifier\": identifier,\n", - " \"formula\": formula,\n", - " \"data\": {},\n", - " \"attachments\": list(subdir.glob(\"*.gz\")),\n", + " \"identifier\": identifier, \"formula\": formula, \"data\": {},\n", + " \"attachments\": list(subdir.glob(\"*.gz\"))\n", " }\n", " if identifier.startswith(\"mp-\"):\n", " contrib[\"structures\"] = [structure]\n", @@ -192,16 +194,16 @@ " contrib[\"data\"][\"polarization\"] = make_data(\"polarization\", values)\n", " elif len(values) == 7:\n", " contrib[\"data\"][\"mechanic\"] = make_data(\"mechanic\", values)\n", - "\n", - " # # option to add tensors to `data`\n", - " # for fn in subdir.glob(\"*.txt\"):\n", - " # stem = fn.stem.lower()\n", - " # if stem.endswith(\"_tensor\"):\n", - " # field = \".\".join(stem.split(\"_\")[:-1])\n", - " # df = read_csv(fn, sep=\"\\t\", header=0, names=range(1, 7))\n", - " # df.index = range(1,4)\n", - " # contrib[\"data\"][field] = df.T.to_dict()\n", - "\n", + " \n", + "# # option to add tensors to `data` \n", + "# for fn in subdir.glob(\"*.txt\"):\n", + "# stem = fn.stem.lower()\n", + "# if stem.endswith(\"_tensor\"):\n", + "# field = \".\".join(stem.split(\"_\")[:-1])\n", + "# df = read_csv(fn, sep=\"\\t\", header=0, names=range(1, 7))\n", + "# df.index = range(1,4)\n", + "# contrib[\"data\"][field] = df.T.to_dict()\n", + " \n", " contributions.append(contrib)" ] }, @@ -227,7 +229,7 @@ "client.init_columns(columns)\n", "client.submit_contributions(contributions)\n", "# this shouldn't be necessary but need to re-init columns likely due to bug in API server\n", - "client.init_columns(columns)" + "client.init_columns(columns) " ] } ], diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/MnO2_phase_selection.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/MnO2_phase_selection.ipynb index 613e73e740..d6c63cb805 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/MnO2_phase_selection.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/MnO2_phase_selection.ipynb @@ -6,8 +6,7 @@ "metadata": {}, "outputs": [], "source": [ - "import json\n", - "import os\n", + "import json, os\n", "from mpcontribs.client import Client\n", "from pymatgen.core import Composition, Structure\n", "from pymatgen.ext.matproj import MPRester\n", @@ -20,7 +19,7 @@ "metadata": {}, "outputs": [], "source": [ - "name = \"MnO2_phase_selection\"\n", + "name = 'MnO2_phase_selection'\n", "client = Client()\n", "mpr = MPRester()" ] @@ -48,13 +47,13 @@ "outputs": [], "source": [ "phase_names = {\n", - " \"beta\": \"Pyrolusite\",\n", - " \"gamma\": \"Intergrowth\",\n", - " \"ramsdellite\": \"Ramsdellite\",\n", - " \"alpha\": \"Hollandite\",\n", - " \"lambda\": \"Spinel\",\n", - " \"delta\": \"Layered\",\n", - " \"other\": \"Other\",\n", + " 'beta': 'Pyrolusite',\n", + " 'gamma': 'Intergrowth',\n", + " 'ramsdellite': 'Ramsdellite',\n", + " 'alpha': 'Hollandite',\n", + " 'lambda': 'Spinel',\n", + " 'delta': 'Layered',\n", + " 'other': 'Other',\n", "}" ] }, @@ -64,9 +63,9 @@ "metadata": {}, "outputs": [], "source": [ - "client.projects.update_entry(\n", - " pk=name, project={\"other.phase−names\": phase_names}\n", - ").result()" + "client.projects.update_entry(pk=name, project={\n", + " 'other.phase−names': phase_names\n", + "}).result()" ] }, { @@ -85,10 +84,8 @@ "# mp_contrib_phases: data/MPContrib_formatted_entries.json\n", "# hull_states: data/MPContrib_hull_entries.json\n", "data = {}\n", - "for fn in os.scandir(\n", - " \"/Users/patrick/gitrepos/mp/MPContribs/mpcontribs-data/MnO2_phase_selection\"\n", - "):\n", - " with open(fn, \"r\") as f:\n", + "for fn in os.scandir('/Users/patrick/gitrepos/mp/MPContribs/mpcontribs-data/MnO2_phase_selection'):\n", + " with open(fn, 'r') as f:\n", " data[fn.name] = json.load(f)" ] }, @@ -99,10 +96,8 @@ "outputs": [], "source": [ "other = [\n", - " [\"LiMnO2\", -3.064, \"Y\", \"--\"],\n", - " [\"KMnO2\", -2.222, \"Y\", \"--\"],\n", - " [\"Ca0.5MnO2\", -2.941, \"Y\", \"--\"],\n", - " [\"Na0.5MnO2\", -1.415, \"Y\", \"--\"],\n", + " ['LiMnO2', -3.064, 'Y', '--'], ['KMnO2', -2.222, 'Y', '--'],\n", + " ['Ca0.5MnO2', -2.941, 'Y', '--'], ['Na0.5MnO2', -1.415, 'Y', '--']\n", "]" ] }, @@ -114,43 +109,43 @@ "source": [ "identifiers, contributions = set(), []\n", "\n", - "for hstate in tqdm(data[\"MPContrib_hull_entries.json\"]):\n", - " contrib = {\"project\": name, \"is_public\": True, \"structures\": []}\n", - " phase = hstate[\"phase\"]\n", - " composition = Composition.from_dict(hstate[\"c\"])\n", - " structure = Structure.from_dict(hstate[\"s\"])\n", + "for hstate in tqdm(data['MPContrib_hull_entries.json']):\n", + " contrib = {'project': name, 'is_public': True, 'structures': []}\n", + " phase = hstate['phase']\n", + " composition = Composition.from_dict(hstate['c'])\n", + " structure = Structure.from_dict(hstate['s'])\n", " mpids = mpr.find_structure(structure)\n", " comp = composition.get_integer_formula_and_factor()[0]\n", " identifier = mpids[0] if mpids else comp\n", - " contrib[\"identifier\"] = identifier\n", - "\n", + " contrib['identifier'] = identifier\n", + " \n", " if identifier in identifiers:\n", " continue\n", - "\n", + " \n", " phase_name = phase_names[phase]\n", - " phase_data = data[\"MPContrib_formatted_entries.json\"].get(phase_name, other)\n", + " phase_data = data['MPContrib_formatted_entries.json'].get(phase_name, other)\n", " if not phase_data:\n", " # print('no data found for', composition, phase_name)\n", " continue\n", "\n", " for iv, values in enumerate(phase_data):\n", " if Composition(values[0]) == composition:\n", - " contrib[\"data\"] = {\"GS\": values[2], \"ΔH\": f\"{values[1]} eV/mol\"}\n", + " contrib['data'] = {'GS': values[2], 'ΔH': f'{values[1]} eV/mol'}\n", " if not isinstance(values[3], str):\n", - " contrib[\"data\"][\"ΔHʰ\"] = f\"{values[3]} eV/mol\"\n", + " contrib['data']['ΔHʰ'] = f'{values[3]} eV/mol'\n", " break\n", " else:\n", " # print('no data found for', composition, phase)\n", " continue\n", "\n", - " contrib[\"structures\"].append(structure)\n", + " contrib['structures'].append(structure)\n", " contributions.append(contrib)\n", " identifiers.add(identifier)\n", "\n", "# make sure that contributions with all columns come first\n", - "contributions = [\n", - " d for d in sorted(contributions, key=lambda x: len(x[\"data\"]), reverse=True)\n", - "]\n", + "contributions = [d for d in sorted(\n", + " contributions, key=lambda x: len(x[\"data\"]), reverse=True\n", + ")]\n", "len(contributions)" ] }, @@ -189,18 +184,14 @@ "query = {\n", " \"project\": name,\n", " \"formula__contains\": \"Mg\",\n", - " # \"data__GS__contains\": \"Y\",\n", + "# \"data__GS__contains\": \"Y\",\n", " \"data__ΔHʰ__value__lte\": -100,\n", " \"_order_by\": \"data__ΔH__value\",\n", " \"order\": \"desc\",\n", " \"_fields\": [\n", - " \"id\",\n", - " \"identifier\",\n", - " \"formula\",\n", - " \"data.GS\",\n", - " \"data.ΔH.value\",\n", - " \"data.ΔHʰ.value\",\n", - " ],\n", + " \"id\", \"identifier\", \"formula\",\n", + " \"data.GS\", \"data.ΔH.value\", \"data.ΔHʰ.value\"\n", + " ]\n", "}\n", "client.contributions.get_entries(**query).result()" ] diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/attachments.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/attachments.ipynb index 05dab6fcb5..d13b8dffe5 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/attachments.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/attachments.ipynb @@ -33,15 +33,13 @@ "path_gz = downloads / \"2021-02-19_scan_mpids_changed.json.gz\"\n", "path_img = downloads / \"IMG-20210224-WA0010.jpg\"\n", "\n", - "attachment = Attachment.from_data(\"other\", {\"hello\": \"world\", \"test\": [1, 2, 4]})\n", + "attachment = Attachment.from_data(\"other\", {\"hello\": \"world\", \"test\": [1,2,4]})\n", "\n", - "contributions = [\n", - " {\n", - " \"project\": name,\n", - " \"identifier\": \"mp-2\",\n", - " \"attachments\": [path_gz, path_img, attachment],\n", - " }\n", - "]" + "contributions = [{\n", + " \"project\": name,\n", + " \"identifier\": \"mp-2\",\n", + " \"attachments\": [path_gz, path_img, attachment]\n", + "}]" ] }, { @@ -103,9 +101,7 @@ "metadata": {}, "outputs": [], "source": [ - "attms = client.attachments.get_entries(\n", - " md5__in=md5s, mime__contains=\"jpeg\", _fields=[\"id\"]\n", - ").result()\n", + "attms = client.attachments.get_entries(md5__in=md5s, mime__contains=\"jpeg\", _fields=[\"id\"]).result()\n", "aid = attms[\"data\"][0][\"id\"]" ] }, diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/bioi_defects.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/bioi_defects.ipynb index fbe85e3950..2cc3b702f9 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/bioi_defects.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/bioi_defects.ipynb @@ -40,29 +40,25 @@ "metadata": {}, "outputs": [], "source": [ - "df1 = read_csv(\n", - " StringIO(\"\"\"\n", + "df1 = read_csv(StringIO(\"\"\"\n", "BiOI thickness [nm],Peak EQE [%],Integrated J|SC [mA/cm²],Measured J|SC [mA/cm²], Average J|SC [mA/cm²]\n", "440,79.5,6.4,6.2,5.5\n", "570,80.2,6.4,5.8,5.6\n", "720,72.6,6.5,6.6,6.3\n", "1090,46.4,3.5,3.9,4.0\n", "1670,17.6,1.3,0.6,0.4\n", - "\"\"\")\n", - ")\n", + "\"\"\"))\n", "df1.set_index(\"BiOI thickness [nm]\", inplace=True)\n", "df1.attrs[\"name\"] = \"Currents vs BiOI thickness\"\n", "\n", - "df2 = read_csv(\n", - " StringIO(\"\"\"\n", + "df2 = read_csv(StringIO(\"\"\"\n", "layer,VB-Eᶠ [eV],WF [eV],VB [eV],Eᵍ [eV],CB [eV]\n", "NiOₓ on ITO,0.6,4.8,5.4,3.6,1.8\n", "220 nm BiOI on NiOₓ|ITO,1.3,4.6,5.9,1.9,4.0\n", "440 nm BiOI on NiOₓ|ITO,1.1,5.0,6.1,1.9,4.2\n", "720 nm BiOI on NiOₓ|ITO,0.9,5.1,6.0,1.9,4.1\n", "ZnO on BiOI|NiOₓ|ITO,2.8,4.5,7.3,3.5,3.8\n", - "\"\"\")\n", - ")\n", + "\"\"\"))\n", "df2.set_index(\"layer\", inplace=True)\n", "df2.attrs[\"name\"] = \"Voltages vs layer\"" ] @@ -74,18 +70,14 @@ "metadata": {}, "outputs": [], "source": [ - "contributions = [\n", - " {\n", - " \"project\": name,\n", - " \"identifier\": \"mp-22987\",\n", - " \"is_public\": True,\n", - " \"data\": {\n", - " \"rev\": {\"J\": \"6.3 mA/cm²\", \"V\": \"0.75 V\", \"FF\": \"39 %\", \"PCE\": \"1.79 %\"},\n", - " \"fwd\": {\"J\": \"6.3 mA/cm²\", \"V\": \"0.75 V\", \"FF\": \"37 %\", \"PCE\": \"1.74 %\"},\n", - " },\n", - " \"tables\": [df1, df2],\n", - " }\n", - "]" + "contributions = [{\n", + " \"project\": name, \"identifier\": \"mp-22987\", \"is_public\": True,\n", + " \"data\": {\n", + " \"rev\": {\"J\": \"6.3 mA/cm²\", \"V\": \"0.75 V\", \"FF\": \"39 %\", \"PCE\": \"1.79 %\"},\n", + " \"fwd\": {\"J\": \"6.3 mA/cm²\", \"V\": \"0.75 V\", \"FF\": \"37 %\", \"PCE\": \"1.74 %\"},\n", + " },\n", + " \"tables\": [df1, df2]\n", + "}]" ] }, { diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/cards.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/cards.ipynb index a8dc009b76..e67952d37e 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/cards.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/cards.ipynb @@ -28,12 +28,7 @@ "metadata": {}, "outputs": [], "source": [ - "COMPONENTS = [\n", - " \"data\",\n", - " \"tables\",\n", - " \"structures\",\n", - " \"attachments\",\n", - "] # supported contribution components\n", + "COMPONENTS = [\"data\", \"tables\", \"structures\", \"attachments\"] # supported contribution components\n", "identifier = \"mp-2715\" # \"mp-6340\"" ] }, @@ -66,8 +61,7 @@ "# basic project info for all projects\n", "names = list(all_ids.keys())\n", "projects = client.projects.get_entries(\n", - " name__in=names,\n", - " _fields=[\"name\", \"long_title\", \"authors\", \"description\", \"references\"],\n", + " name__in=names, _fields=[\"name\", \"long_title\", \"authors\", \"description\", \"references\"]\n", ").result()" ] }, @@ -78,7 +72,7 @@ "metadata": {}, "outputs": [], "source": [ - "projects # [\"total_count\"] # total number of projects for this identifier" + "projects#[\"total_count\"] # total number of projects for this identifier" ] }, { @@ -96,8 +90,8 @@ "metadata": {}, "outputs": [], "source": [ - "name = \"carrier_transport\" # names[0] # selected project\n", - "ids = list(all_ids[name][\"ids\"]) # list of contribution ObjectIDs" + "name = \"carrier_transport\" #names[0] # selected project\n", + "ids = list(all_ids[name][\"ids\"]) # list of contribution ObjectIDs" ] }, { @@ -130,10 +124,8 @@ "metadata": {}, "outputs": [], "source": [ - "data_columns = {} # potential data columns in dot-notation and their units\n", - "root_data_columns = defaultdict(\n", - " set\n", - ") # potential root-level data columns and their (list of) unit(s)\n", + "data_columns = {} # potential data columns in dot-notation and their units\n", + "root_data_columns = defaultdict(set) # potential root-level data columns and their (list of) unit(s)\n", "has_component = {c: False for c in COMPONENTS} # potentially available components\n", "\n", "for column in info[\"columns\"]:\n", @@ -214,10 +206,10 @@ "outputs": [], "source": [ "# retrieve full sub-tree of values for the selected root data column\n", - "root_column = \"PF\" # list(root_data_columns.keys())[0]\n", + "root_column = \"PF\" # list(root_data_columns.keys())[0]\n", "fields = [\n", " f\"data.{col}\" if unit is None else f\"data.{col}.display\"\n", - " for col, unit in data_columns.items()\n", + " for col, unit in data_columns.items() \n", " if col.startswith(root_column)\n", "]\n", "resp = client.contributions.get_entry(pk=cid, _fields=fields).result()" @@ -259,7 +251,7 @@ "metadata": {}, "outputs": [], "source": [ - "resp[component] # use this to show list of available tables (and table ObjectIDs)" + "resp[component] # use this to show list of available tables (and table ObjectIDs)" ] }, { diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/carrier_transport.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/carrier_transport.ipynb index fb0a3b5397..68e1c4f64d 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/carrier_transport.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/carrier_transport.ipynb @@ -7,15 +7,15 @@ "outputs": [], "source": [ "from mpcontribs.client import Client\n", - "import gzip\n", - "import json\n", - "import os\n", + "import gzip, json, os\n", "import numpy as np\n", "from pandas import DataFrame\n", + "from collections import defaultdict\n", "from tqdm.notebook import tqdm\n", "from unflatten import unflatten\n", + "from pathlib import Path\n", "\n", - "name = \"carrier_transport\"" + "name = 'carrier_transport'" ] }, { @@ -50,26 +50,26 @@ " \"functional\": \"Type of DFT functional \\\n", " (GGA: generalized gradient approximation, GGA+U: GGA + U approximation)\",\n", " \"metal\": \"If True, crystal is a metal\",\n", - " \"ΔE\": \"Band gap in eV\",\n", - " \"V\": \"Unit cell volume, in cubic angstrom\",\n", - " \"mₑᶜ\": \"Eigenvalues (ε₁, ε₂, ε₃) of the conductivity effective mass and their average (ε̄)\",\n", - " \"S\": \"Average eigenvalue of the Seebeck coefficient\",\n", - " \"σ\": \"Average eigenvalue of the conductivity\",\n", - " \"κₑ\": \"Average eigenvalue of the electrical thermal conductivity\",\n", - " \"PF\": \"Average eigenvalue of the Power Factor\",\n", - " \"Sᵉ\": \"Value (v), temperature (T), and doping level (c) at the \\\n", - " maximum of the average eigenvalue of the Seebeck coefficient\",\n", - " \"σᵉ\": \"Value (v), temperature (T), and doping level (c) at the \\\n", - " maximum of the average eigenvalue of the conductivity\",\n", - " \"κₑᵉ\": \"Value (v), temperature (T), and doping level (c) at the \\\n", - " maximum of the average eigenvalue of the electrical thermal conductivity\",\n", - " \"PFᵉ\": \"Value (v), temperature (T), and doping level (c) at the \\\n", - " maximum of the average eigenvalue of the Power Factor\",\n", + " 'ΔE': 'Band gap in eV',\n", + " 'V' : \"Unit cell volume, in cubic angstrom\",\n", + " 'mₑᶜ': 'Eigenvalues (ε₁, ε₂, ε₃) of the conductivity effective mass and their average (ε̄)',\n", + " 'S': 'Average eigenvalue of the Seebeck coefficient',\n", + " 'σ' : 'Average eigenvalue of the conductivity',\n", + " 'κₑ' : 'Average eigenvalue of the electrical thermal conductivity',\n", + " 'PF': 'Average eigenvalue of the Power Factor',\n", + " 'Sᵉ': 'Value (v), temperature (T), and doping level (c) at the \\\n", + " maximum of the average eigenvalue of the Seebeck coefficient', \n", + " 'σᵉ': 'Value (v), temperature (T), and doping level (c) at the \\\n", + " maximum of the average eigenvalue of the conductivity',\n", + " 'κₑᵉ': 'Value (v), temperature (T), and doping level (c) at the \\\n", + " maximum of the average eigenvalue of the electrical thermal conductivity',\n", + " 'PFᵉ': 'Value (v), temperature (T), and doping level (c) at the \\\n", + " maximum of the average eigenvalue of the Power Factor',\n", "}\n", "\n", "references = [\n", " {\"label\": \"SData\", \"url\": \"https://doi.org/10.1038/sdata.2017.85\"},\n", - " {\"label\": \"Dryad\", \"url\": \"https://doi.org/10.5061/dryad.gn001\"},\n", + " {\"label\": \"Dryad\", \"url\": \"https://doi.org/10.5061/dryad.gn001\"}\n", "]\n", "\n", "# with Client() as client:\n", @@ -88,13 +88,13 @@ }, "outputs": [], "source": [ - "eigs_keys = [\"ε₁\", \"ε₂\", \"ε₃\", \"ε̄\"]\n", + "eigs_keys = ['ε₁', 'ε₂', 'ε₃', 'ε̄']\n", "prop_defs = {\n", - " \"mₑᶜ\": \"mₑ\",\n", - " \"S\": \"µV/K\",\n", - " \"σ\": \"1/fΩ/m/s\",\n", - " \"κₑ\": \"GW/K/m/s\",\n", - " \"PF\": \"GW/K²/m/s\",\n", + " 'mₑᶜ': \"mₑ\",\n", + " 'S': \"µV/K\",\n", + " 'σ': \"1/fΩ/m/s\",\n", + " 'κₑ': \"GW/K/m/s\",\n", + " 'PF': \"GW/K²/m/s\"\n", "}\n", "ext_defs = {\"T\": \"K\", \"c\": \"µm⁻³\"}\n", "columns = {\"task\": None, \"functional\": None, \"metal\": None, \"ΔE\": \"eV\", \"V\": \"ų\"}\n", @@ -110,15 +110,15 @@ "for kk, unit in prop_defs.items():\n", " if kk.startswith(\"mₑ\"):\n", " continue\n", - "\n", + " \n", " for k in [\"p\", \"n\"]:\n", " path = f\"{kk}ᵉ.{k}\"\n", " columns[f\"{path}.v\"] = unit\n", "\n", " for a, b in ext_defs.items():\n", " columns[f\"{path}.{a}\"] = b\n", - "\n", - "\n", + " \n", + " \n", "columns[\"tables\"] = None\n", "\n", "# with Client() as client:\n", @@ -138,13 +138,13 @@ "metadata": {}, "outputs": [], "source": [ - "input_dir = \"/project/projectdirs/matgen/fricci/transport_data/coarse\"\n", + "input_dir = '/project/projectdirs/matgen/fricci/transport_data/coarse'\n", "# input_dir = '/Users/patrick/gitrepos/mp/mpcontribs-data/transport_coarse'\n", - "props_map = { # original units\n", - " \"cond_eff_mass\": {\"name\": \"mₑᶜ\", \"unit\": \"mₑ\"},\n", - " \"seebeck_doping\": {\"name\": \"S\", \"unit\": \"µV/K\"},\n", - " \"cond_doping\": {\"name\": \"σ\", \"unit\": \"1/Ω/m/s\"},\n", - " \"kappa_doping\": {\"name\": \"κₑ\", \"unit\": \"W/K/m/s\"},\n", + "props_map = { # original units\n", + " 'cond_eff_mass': {\"name\": 'mₑᶜ', \"unit\": \"mₑ\"},\n", + " 'seebeck_doping': {\"name\": 'S', \"unit\": \"µV/K\"},\n", + " 'cond_doping': {\"name\": 'σ', \"unit\": \"1/Ω/m/s\"},\n", + " 'kappa_doping': {\"name\": 'κₑ', \"unit\": \"W/K/m/s\"},\n", "}" ] }, @@ -170,74 +170,70 @@ "title_prefix = \"Temperature- and Doping-Level-Dependence\"\n", "\n", "titles = {\n", - " \"S\": \"Seebeck Coefficient\",\n", - " \"σ\": \"Conductivity\",\n", - " \"κₑ\": \"Electrical Thermal Conductivity\",\n", - " \"PF\": \"Power Factor\",\n", + " 'S': \"Seebeck Coefficient\",\n", + " 'σ': \"Conductivity\",\n", + " 'κₑ': \"Electrical Thermal Conductivity\",\n", + " 'PF': \"Power Factor\"\n", "}\n", "\n", "with Client() as client:\n", - " identifiers = (\n", - " client.get_all_ids(dict(project=name)).get(name, {}).get(\"identifiers\", [])\n", - " )\n", - "\n", + " identifiers = client.get_all_ids(dict(project=name)).get(name, {}).get(\"identifiers\", [])\n", + " \n", "print(\"#contribs:\", len(identifiers))\n", "\n", "for obj in tqdm(files):\n", - " identifier = obj.name.split(\".\", 1)[0].rsplit(\"_\", 1)[-1]\n", - " valid = bool(identifier.startswith(\"mp-\") or identifier.startswith(\"mvc-\"))\n", + " identifier = obj.name.split('.', 1)[0].rsplit('_', 1)[-1]\n", + " valid = bool(identifier.startswith('mp-') or identifier.startswith('mvc-'))\n", "\n", " if not valid:\n", - " print(identifier, \"not valid\")\n", + " print(identifier, 'not valid')\n", " continue\n", "\n", " if identifier in identifiers:\n", " continue\n", "\n", - " with gzip.open(obj.path, \"rb\") as input_file:\n", + " with gzip.open(obj.path, 'rb') as input_file:\n", " data = json.loads(input_file.read())\n", - " task_type = \"GGA+U\" if \"GGA+U\" in data[\"gap\"] else \"GGA\"\n", - " gap = data[\"gap\"][task_type]\n", + " task_type = 'GGA+U' if 'GGA+U' in data['gap'] else 'GGA'\n", + " gap = data['gap'][task_type]\n", "\n", " cdata = {\n", - " \"task\": data[\"task_id\"][task_type],\n", + " \"task\": data['task_id'][task_type],\n", " \"functional\": task_type,\n", - " \"metal\": \"Yes\" if gap < 0.1 else \"No\",\n", + " \"metal\": 'Yes' if gap < 0.1 else 'No',\n", " \"ΔE\": f\"{gap} eV\",\n", - " \"V\": f\"{data['volume']} ų\",\n", + " \"V\": f\"{data['volume']} ų\"\n", " }\n", "\n", - " tables = []\n", + " tables = [] \n", " S2arr = []\n", "\n", - " for doping_type in [\"p\", \"n\"]:\n", + " for doping_type in ['p', 'n']:\n", + "\n", " for key, v in props_map.items():\n", " prop = data[task_type][key].get(doping_type, {})\n", - " d = prop.get(\"300\", {}).get(\"1e+18\", {})\n", + " d = prop.get('300', {}).get('1e+18', {})\n", " unit = v[\"unit\"]\n", "\n", " if d:\n", - " eigs = d if isinstance(d, list) else d[\"eigs\"]\n", + " eigs = d if isinstance(d, list) else d['eigs']\n", " k = f\"{v['name']}.{doping_type}\"\n", " value = f\"{np.mean(eigs)} {unit}\"\n", "\n", - " if key == \"cond_eff_mass\":\n", + " if key == 'cond_eff_mass':\n", " cdata[k] = {eigs_keys[-1]: value}\n", " for neig, eig in enumerate(eigs):\n", " cdata[k][eigs_keys[neig]] = f\"{eig} {unit}\"\n", " else:\n", " cdata[k] = value\n", - " if key == \"seebeck_doping\":\n", - " S2 = np.dot(d[\"tensor\"], d[\"tensor\"])\n", - " elif key == \"cond_doping\":\n", - " pf = (\n", - " np.mean(np.linalg.eigh(np.dot(S2, d[\"tensor\"]))[0])\n", - " * 1e-8\n", - " )\n", + " if key == 'seebeck_doping':\n", + " S2 = np.dot(d['tensor'], d['tensor'])\n", + " elif key == 'cond_doping':\n", + " pf = np.mean(np.linalg.eigh(np.dot(S2, d['tensor']))[0]) * 1e-8\n", " cdata[f\"PF.{doping_type}\"] = f\"{pf} µW/cm/K²/s\"\n", "\n", " if key != \"cond_eff_mass\":\n", - " prop_averages, dopings, cols = [], None, [\"T [K]\"]\n", + " prop_averages, dopings, cols = [], None, ['T [K]']\n", " pf_averages = []\n", " temps = sorted(map(int, prop.keys()))\n", "\n", @@ -249,31 +245,28 @@ " dopings = sorted(map(float, prop[str(temp)].keys()))\n", "\n", " for idop, doping in enumerate(dopings):\n", - " doping_str = f\"{doping:.0e}\"\n", + " doping_str = f'{doping:.0e}'\n", " if len(cols) <= len(dopings):\n", - " cols.append(f\"{doping_str}\".replace(\"+\", \"\"))\n", + " cols.append(f'{doping_str}'.replace(\"+\", \"\"))\n", "\n", " d = prop[str(temp)][doping_str]\n", " row.append(np.mean(d[\"eigs\"]))\n", - " tensor = d[\"tensor\"]\n", + " tensor = d['tensor']\n", "\n", - " if key == \"seebeck_doping\":\n", + " if key == 'seebeck_doping':\n", " S2arr.append(np.dot(tensor, tensor))\n", - " elif key == \"cond_doping\":\n", + " elif key == 'cond_doping': \n", " S2idx = it * len(dopings) + idop\n", - " pf = (\n", - " np.mean(\n", - " np.linalg.eigh(np.dot(S2arr[S2idx], tensor))[0]\n", - " )\n", - " * 1e-8\n", - " )\n", + " pf = np.mean(np.linalg.eigh(\n", + " np.dot(S2arr[S2idx], tensor)\n", + " )[0]) * 1e-8\n", " row_pf.append(pf)\n", "\n", " prop_averages.append(row)\n", " pf_averages.append(row_pf)\n", "\n", " df_data = [np.array(prop_averages)]\n", - " if key == \"cond_doping\":\n", + " if key == 'cond_doping':\n", " df_data.append(np.array(pf_averages))\n", "\n", " for ii, np_prop_averages in enumerate(df_data):\n", @@ -282,42 +275,36 @@ "\n", " df = DataFrame(np_prop_averages, columns=cols)\n", " df.set_index(\"T [K]\", inplace=True)\n", - " df.columns.name = columns_name # legend name\n", - " df.attrs[\"name\"] = (\n", - " f\"{nm}({doping_type})\" # -> used as title by default\n", - " )\n", - " df.attrs[\"title\"] = (\n", - " f\"{title_prefix} of {doping_type}-type {titles[nm]}\"\n", - " )\n", + " df.columns.name = columns_name # legend name\n", + " df.attrs[\"name\"] = f'{nm}({doping_type})' # -> used as title by default\n", + " df.attrs[\"title\"] = f'{title_prefix} of {doping_type}-type {titles[nm]}'\n", " df.attrs[\"labels\"] = {\n", - " \"value\": f\"{nm}({doping_type}) [{u}]\", # y-axis label\n", - " # \"variable\": columns_name # alternative for df.columns.name\n", + " \"value\": f'{nm}({doping_type}) [{u}]', # y-axis label\n", + " #\"variable\": columns_name # alternative for df.columns.name\n", " }\n", " tables.append(df)\n", "\n", - " arr_prop_avg = np_prop_averages[:, 1:] # [:,[4,8,12]]\n", + " arr_prop_avg = np_prop_averages[:,1:] #[:,[4,8,12]]\n", " max_v = np.max(arr_prop_avg)\n", "\n", - " if key[0] == \"s\" and doping_type == \"n\":\n", + " if key[0] == 's' and doping_type == 'n':\n", " max_v = np.min(arr_prop_avg)\n", - " if key[0] == \"k\":\n", + " if key[0] == 'k':\n", " max_v = np.min(arr_prop_avg)\n", "\n", - " arg_max = np.argwhere(arr_prop_avg == max_v)[0]\n", - " elabel = f\"{nm}ᵉ\"\n", - " cdata[f\"{elabel}.{doping_type}\"] = unflatten(\n", - " {\n", - " \"v\": f\"{max_v} {u}\",\n", - " \"T\": f\"{temps[arg_max[0]]} K\",\n", - " \"c\": f\"{dopings[arg_max[1]]} cm⁻³\",\n", - " }\n", - " )\n", - "\n", - " contrib = {\"project\": name, \"identifier\": identifier, \"is_public\": True}\n", + " arg_max = np.argwhere(arr_prop_avg==max_v)[0]\n", + " elabel = f'{nm}ᵉ'\n", + " cdata[f'{elabel}.{doping_type}'] = unflatten({\n", + " 'v': f\"{max_v} {u}\",\n", + " 'T': f\"{temps[arg_max[0]]} K\",\n", + " 'c': f\"{dopings[arg_max[1]]} cm⁻³\"\n", + " })\n", + "\n", + " contrib = {'project': name, 'identifier': identifier, 'is_public': True}\n", " contrib[\"data\"] = unflatten(cdata)\n", " contrib[\"tables\"] = tables\n", " contributions.append(contrib)\n", - "\n", + " \n", "len(contributions)" ] }, @@ -348,7 +335,7 @@ "\n", "with open(\"carrier_transport_p-type-update.json\", \"r\") as f:\n", " contributions = json.load(f)\n", - "\n", + " \n", "len(contributions)" ] }, @@ -363,10 +350,7 @@ "name = \"carrier_transport\"\n", "\n", "with Client() as client:\n", - " query = {\n", - " \"project\": name,\n", - " \"data__functional__exact\": \"\",\n", - " } # data.functional not set after rename type -> functional\n", + " query = {\"project\": name, \"data__functional__exact\": \"\"} # data.functional not set after rename type -> functional\n", " ids_map = client.get_all_ids(query, fmt=\"map\").get(name)\n", "\n", "len(ids_map) # = number of contributions to be updated" @@ -385,17 +369,15 @@ "for contrib in contributions:\n", " pk = ids_map.get(contrib[\"identifier\"], {}).get(\"id\")\n", " if pk:\n", - " submit.append(\n", - " {\n", - " \"data\": {\n", - " k: {kk: vv for kk, vv in v.items() if kk == \"p\"}\n", - " if isinstance(v, dict)\n", - " else v\n", - " for k, v in contrib[\"data\"].items()\n", - " if k == \"functional\" or \"ᵉ\" in k\n", - " }\n", - " }\n", - " )\n", + " submit.append({\"data\": {\n", + " k: {\n", + " kk: vv\n", + " for kk, vv in v.items()\n", + " if kk == \"p\"\n", + " } if isinstance(v, dict) else v\n", + " for k, v in contrib[\"data\"].items()\n", + " if k == \"functional\" or \"ᵉ\" in k\n", + " }})\n", " submit[-1][\"id\"] = pk\n", "\n", "len(submit)" @@ -411,8 +393,8 @@ "outputs": [], "source": [ "with Client() as client:\n", - " # client.delete_contributions(name)\n", - " # client.init_columns(name, columns)\n", + " #client.delete_contributions(name)\n", + " #client.init_columns(name, columns)\n", " client.submit_contributions(submit, ignore_dupes=True)" ] }, @@ -433,19 +415,19 @@ "\n", "query = {\n", " \"project\": \"carrier_transport\",\n", - " # \"formula_contains\": \"ZnS\",\n", - " # \"identifier__in\": [\"mp-10695\", \"mp-760381\"], # ZnS, CuS\n", + "# \"formula_contains\": \"ZnS\",\n", + "# \"identifier__in\": [\"mp-10695\", \"mp-760381\"], # ZnS, CuS\n", " \"data__functional__exact\": \"GGA+U\",\n", " \"data__metal__contains\": \"Y\",\n", " \"data__mₑᶜ__p__ε̄__value__gte\": 1000,\n", " \"_order_by\": \"data__mₑᶜ__p__ε̄__value\",\n", " \"order\": \"desc\",\n", - " \"_fields\": [\"id\", \"identifier\", \"formula\", \"data.mₑᶜ.p.ε̄.value\"],\n", + " \"_fields\": [\"id\", \"identifier\", \"formula\", \"data.mₑᶜ.p.ε̄.value\"]\n", "}\n", "\n", "with Client() as client:\n", " result = client.contributions.get_entries(**query).result()\n", - "\n", + " \n", "result" ] }, @@ -479,8 +461,8 @@ "}\n", "\n", "print(client.get_totals(query=query))\n", - "query[\"format\"] = \"json\" # \"csv\" or \"json\"\n", - "client.download_contributions(query) # , include=[\"tables\"])" + "query[\"format\"] = \"json\" # \"csv\" or \"json\"\n", + "client.download_contributions(query) #, include=[\"tables\"])" ] }, { diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/defect_genome_pcfc_materials.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/defect_genome_pcfc_materials.ipynb index 2858dba84d..eb10604712 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/defect_genome_pcfc_materials.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/defect_genome_pcfc_materials.ipynb @@ -18,7 +18,7 @@ "metadata": {}, "outputs": [], "source": [ - "name = \"defect_genome_pcfc_materials\"\n", + "name = 'defect_genome_pcfc_materials'\n", "client = Client()\n", "mpr = MPRester()" ] @@ -45,15 +45,9 @@ "metadata": {}, "outputs": [], "source": [ - "client.projects.update_entry(\n", - " pk=name,\n", - " project={\n", - " \"references[0]\": {\n", - " \"label\": \"ACS\",\n", - " \"url\": \"https://doi.org/10.1021/acs.jpcc.7b08716\",\n", - " }\n", - " },\n", - ").result()" + "client.projects.update_entry(pk=name, project={\n", + " \"references[0]\": {\"label\": \"ACS\", \"url\": \"https://doi.org/10.1021/acs.jpcc.7b08716\"}\n", + "}).result()" ] }, { @@ -69,16 +63,12 @@ "metadata": {}, "outputs": [], "source": [ - "df = read_excel(\n", - " \"/Users/patrick/gitrepos/mp/MPContribs/mpcontribs-data/DefectGenome_JPCC-data_MP.xlsx\"\n", - ")\n", - "df.columns = MultiIndex.from_arrays(\n", - " [\n", - " [\"\", \"\", \"\", \"Eᶠ\", \"Eᶠ\", \"Eᶠ\", \"Eᶠ\", \"ΔEᵢ\"],\n", - " [\"A\", \"B\", \"a\", \"ABO₃\", \"Yᴮ\", \"Vᴼ\", \"Hᵢ\", \"Yᴮ−Hᵢ\"],\n", - " ]\n", - ")\n", - "units = {\"A\": \"\", \"B\": \"\", \"a\": \"Å\"}\n", + "df = read_excel('/Users/patrick/gitrepos/mp/MPContribs/mpcontribs-data/DefectGenome_JPCC-data_MP.xlsx')\n", + "df.columns = MultiIndex.from_arrays([\n", + " ['', '', '', 'Eᶠ', 'Eᶠ', 'Eᶠ', 'Eᶠ', 'ΔEᵢ'],\n", + " ['A', 'B', 'a', 'ABO₃', 'Yᴮ', 'Vᴼ', 'Hᵢ', 'Yᴮ−Hᵢ']\n", + "])\n", + "units = {'A': '', 'B': '', 'a': 'Å'}\n", "df" ] }, @@ -91,35 +81,33 @@ "contributions = []\n", "for idx, row in df.iterrows():\n", " A, B = row[df.columns[0]], row[df.columns[1]]\n", - " formula = f\"{A}{B}O3\"\n", + " formula = f'{A}{B}O3'\n", " data = mpr.get_data(formula, prop=\"volume\")\n", "\n", " if len(data) > 1:\n", - " volume = row[df.columns[2]] ** 3\n", + " volume = row[df.columns[2]]**3\n", " for d in data:\n", - " d[\"dV\"] = abs(d[\"volume\"] - volume)\n", - " data = sorted(data, key=lambda item: item[\"dV\"])\n", + " d['dV'] = abs(d['volume']-volume)\n", + " data = sorted(data, key=lambda item: item['dV'])\n", " elif not data:\n", - " print(formula, \"not found on MP\")\n", + " print(formula, 'not found on MP')\n", " continue\n", "\n", - " identifier = data[0][\"material_id\"]\n", - " # print(idx, formula, identifier)\n", - "\n", + " identifier = data[0]['material_id']\n", + " #print(idx, formula, identifier)\n", + " \n", " data = {}\n", " for col in df.columns:\n", " flat_col = \".\".join([c for c in col if c])\n", - " unit = units.get(flat_col, \"eV\")\n", - " data[flat_col] = f\"{row[col]} {unit}\" if unit else row[col]\n", + " unit = units.get(flat_col, 'eV')\n", + " data[flat_col] = f'{row[col]} {unit}' if unit else row[col]\n", "\n", " contrib = {\n", - " \"project\": name,\n", - " \"identifier\": identifier,\n", - " \"is_public\": True,\n", - " \"data\": unflatten(data),\n", + " 'project': name, 'identifier': identifier, 'is_public': True,\n", + " 'data': unflatten(data)\n", " }\n", " contributions.append(contrib)\n", - "\n", + " \n", "len(contributions)" ] }, @@ -155,20 +143,16 @@ "source": [ "query = {\n", " \"project\": name,\n", - " # \"formula__contains\": \"Mg\",\n", + "# \"formula__contains\": \"Mg\",\n", " \"data__A__contains\": \"Mg\",\n", " \"data__a__value__lte\": 4.1,\n", " \"data__Eᶠ__ABO₃__value__lte\": 3.2,\n", " \"_order_by\": \"data__a__value\",\n", " \"order\": \"desc\",\n", " \"_fields\": [\n", - " \"id\",\n", - " \"identifier\",\n", - " \"formula\",\n", - " \"data.A\",\n", - " \"data.a.value\",\n", - " \"data.Eᶠ.ABO₃.value\",\n", - " ],\n", + " \"id\", \"identifier\", \"formula\",\n", + " \"data.A\", \"data.a.value\", \"data.Eᶠ.ABO₃.value\"\n", + " ] \n", "}\n", "client.contributions.get_entries(**query).result()" ] diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/deltaHvacancy.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/deltaHvacancy.ipynb index 5688c7c429..523de5837a 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/deltaHvacancy.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/deltaHvacancy.ipynb @@ -37,9 +37,7 @@ "outputs": [], "source": [ "# allow non-unique identifiers (disables duplicate checking)\n", - "client.projects.updateProjectByName(\n", - " pk=client.project, project={\"unique_identifiers\": False}\n", - ").result()" + "client.projects.updateProjectByName(pk=client.project, project={\"unique_identifiers\": False}).result()" ] }, { @@ -52,15 +50,12 @@ "# set \"other\" field in project info to explain data columns\n", "# appears on hover in contribution section on materials details pages\n", "client.projects.updateProjectByName(\n", - " pk=client.project,\n", - " project={\n", - " \"other\": {\n", - " \"dH\": \"vacancy formation enthalpy in eV\",\n", - " \"dH|atom\": \"vacancy formation enthalpy in eV/atom\",\n", - " \"m\": \"electron effective mass in mₑ\",\n", - " # TODO add more as needed\n", - " }\n", - " },\n", + " pk=client.project, project={\"other\": {\n", + " \"dH\": \"vacancy formation enthalpy in eV\",\n", + " \"dH|atom\": \"vacancy formation enthalpy in eV/atom\",\n", + " \"m\": \"electron effective mass in mₑ\"\n", + " # TODO add more as needed\n", + " }}\n", ").result()" ] }, @@ -73,33 +68,28 @@ "source": [ "# load data\n", "drivedir = Path(\"/Users/patrick/GoogleDriveLBNL/My Drive/\")\n", - "datadir = drivedir / Path(\n", - " \"MaterialsProject/gitrepos/mpcontribs-data/deltaHvacancy/nrel_matdb\"\n", - ")\n", + "datadir = drivedir / Path(\"MaterialsProject/gitrepos/mpcontribs-data/deltaHvacancy/nrel_matdb\")\n", "\n", "columns_map = {\n", " \"formula\": {\"name\": \"formula\"},\n", - " \"defectname\": {\"name\": \"defect\"}, # string\n", - " \"site\": {\"name\": \"site\", \"unit\": \"\"}, # dimensionless\n", + " \"defectname\": {\"name\": \"defect\"}, # string\n", + " \"site\": {\"name\": \"site\", \"unit\": \"\"}, # dimensionless\n", " \"charge\": {\"name\": \"charge\", \"unit\": \"\"},\n", " \"dH_eV\": {\"name\": \"dH\", \"unit\": \"eV\"},\n", " \"dH_eV_per_atom\": {\"name\": \"dH|atom\", \"unit\": \"eV/atom\"},\n", " \"bandgap_eV\": {\"name\": \"bandgap\", \"unit\": \"eV\"},\n", " \"electron_effective_mass\": {\"name\": \"m\", \"unit\": \"mₑ\"},\n", - " \"level_theory\": {\"name\": \"theory\"},\n", + " \"level_theory\": {\"name\": \"theory\"}\n", "}\n", "new_column_names = {k: v[\"name\"] for k, v in columns_map.items()}\n", "\n", - "\n", "def apply_unit(cell, unit):\n", " return f\"{cell} {unit}\" if unit and cell else cell\n", "\n", - "\n", "def apply_units(column):\n", " unit = columns_map[column.name].get(\"unit\")\n", " return column.apply(apply_unit, args=(unit,))\n", "\n", - "\n", "contributions = []\n", "\n", "# NOTE make sure all `_oxstate` and `_POSCAR_wyck` files are gzipped\n", @@ -108,27 +98,19 @@ " prefix, nrel_matdb_id, _ = path.name.split(\".\")\n", " stem = f\"{path.parent}{os.sep}{prefix}.{nrel_matdb_id}\"\n", " poscar_file = f\"{stem}_POSCAR_wyck.gz\"\n", - " structure = Structure.from_file(poscar_file, \"POSCAR\")\n", + " structure = Structure.from_file(poscar_file, 'POSCAR')\n", " mpid = mpr.find_structure(structure)\n", " identifier = mpid if mpid else nrel_matdb_id\n", " attachments = [Path(poscar_file), Path(f\"{stem}_oxstate.gz\")]\n", - " df = (\n", - " read_csv(path)\n", - " .dropna(axis=1, how=\"all\")\n", - " .apply(apply_units)\n", - " .rename(columns=new_column_names)\n", - " )\n", - "\n", + " df = read_csv(path).dropna(axis=1, how=\"all\").apply(apply_units).rename(columns=new_column_names)\n", + " \n", " for record in df.to_dict(orient=\"records\"):\n", - " data = {k: v for k, v in record.items() if v} # clean record\n", - " contributions.append(\n", - " {\n", - " \"identifier\": identifier,\n", - " \"data\": unflatten(data, splitter=\"dot\"),\n", - " \"structures\": [structure],\n", - " \"attachments\": attachments, # duplicates linked internally\n", - " }\n", - " )\n", + " data = {k: v for k, v in record.items() if v} # clean record\n", + " contributions.append({\n", + " \"identifier\": identifier,\n", + " \"data\": unflatten(data, splitter=\"dot\"),\n", + " \"structures\": [structure], \"attachments\": attachments, # duplicates linked internally\n", + " })\n", " contributions[-1][\"data\"][\"nrel|id\"] = nrel_matdb_id\n", "\n", "contributions[0]" @@ -155,11 +137,11 @@ "metadata": {}, "outputs": [], "source": [ - "client.delete_contributions() # easier to delete everything for small projects\n", + "client.delete_contributions() # easier to delete everything for small projects\n", "client.init_columns(columns)\n", "client.submit_contributions(contributions, ignore_dupes=True)\n", "# this shouldn't be necessary but need to re-init columns likely due to bug in API server\n", - "client.init_columns(columns)" + "client.init_columns(columns) " ] } ], diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/dilute_solute_diffusion.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/dilute_solute_diffusion.ipynb index b03877f2ea..3ce892c236 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/dilute_solute_diffusion.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/dilute_solute_diffusion.ipynb @@ -28,16 +28,12 @@ "metadata": {}, "outputs": [], "source": [ - "import os\n", - "import json\n", - "import requests\n", + "import os, json, requests, sys\n", "from pandas import read_excel, isnull, ExcelWriter, Series\n", "from mp_api.client import MPRester\n", "from pathlib import Path\n", "\n", - "data_dir = Path(\n", - " \"/Users/patrick/GoogleDriveLBNL/My Drive/MaterialsProject/gitrepos/mpcontribs-data/\"\n", - ")\n", + "data_dir = Path(\"/Users/patrick/GoogleDriveLBNL/My Drive/MaterialsProject/gitrepos/mpcontribs-data/\")\n", "zfile = data_dir / name / \"z.json\"\n", "z = json.load(zfile.open())\n", "mpr = MPRester(\"bmdNL4cV6Ei0CqhUAhK6JwFSZ6XMH0Gz\")\n", @@ -65,7 +61,7 @@ " for sheet, df in df_dct.items():\n", " df.to_excel(writer, sheet)\n", " else:\n", - " print(\"no excel sheet found on figshare\")\n", + " print(\"no excel sheet found on figshare\") \n", "else:\n", " df_dct = read_excel(fpath, sheet_name=None, engine=\"openpyxl\")\n", "\n", @@ -82,10 +78,8 @@ "# function to search MP via its summary API endpoint\n", "def search(formula=None, spacegroup_number=None, chemsys=None):\n", " return mpr.summary.search(\n", - " formula=formula,\n", - " chemsys=chemsys,\n", - " spacegroup_number=spacegroup_number,\n", - " fields=[\"material_id\"], # , sort_fields=\"energy_above_hull\"\n", + " formula=formula, chemsys=chemsys, spacegroup_number=spacegroup_number,\n", + " fields=[\"material_id\"]#, sort_fields=\"energy_above_hull\"\n", " )" ] }, @@ -96,12 +90,7 @@ "metadata": {}, "outputs": [], "source": [ - "host_info = (\n", - " df_dct[\"Host Information\"]\n", - " .set_index(\"Host element name\")\n", - " .dropna()\n", - " .drop(\"Unnamed: 0\", axis=1)\n", - ")\n", + "host_info = df_dct[\"Host Information\"].set_index(\"Host element name\").dropna().drop(\"Unnamed: 0\", axis=1)\n", "hosts = None\n", "host_info" ] @@ -119,7 +108,7 @@ " if hosts is not None:\n", " if isinstance(hosts, int) and idx + 1 > hosts:\n", " break\n", - " elif isinstance(hosts, list) and host not in hosts:\n", + " elif isinstance(hosts, list) and not host in hosts:\n", " continue\n", "\n", " print(\"get mp-id for {}\".format(host))\n", @@ -156,7 +145,7 @@ " df = df.drop(rows)\n", "\n", " contrib[\"data\"] = hdata\n", - "\n", + " \n", " print(\"add table for D₀/Q data for {}\".format(mpid))\n", " df = df.set_index(df[\"Solute element number\"])\n", " df = df.drop(\"Solute element number\", axis=1)\n", @@ -193,8 +182,8 @@ " \"title\": \"D₀/Q by Solute\",\n", " \"labels\": {\n", " \"value\": \"D₀/Q\",\n", - " # \"variable\": \"method\"\n", - " },\n", + " #\"variable\": \"method\"\n", + " }\n", " }\n", " contrib[\"tables\"] = [df_D0_Q]\n", "\n", @@ -242,8 +231,11 @@ " contrib[\"tables\"].append(df_v)\n", "\n", " elif hdata[\"Host\"][\"crystal_structure\"] == \"FCC\":\n", + "\n", " print(\"add table for hop activation barriers for {} (FCC)\".format(mpid))\n", - " columns_E = [\"Hop activation barrier, E_{} [eV]\".format(i) for i in range(5)]\n", + " columns_E = [\n", + " \"Hop activation barrier, E_{} [eV]\".format(i) for i in range(5)\n", + " ]\n", " df_E = df[[\"Solute element name\"] + columns_E]\n", " df_E.columns = [\"Solute\"] + [\n", " \"E{} [eV]\".format(i) for i in [\"₀\", \"₁\", \"₂\", \"₃\", \"₄\"]\n", @@ -255,7 +247,9 @@ " contrib[\"tables\"].append(df_E)\n", "\n", " print(\"add table for hop attempt frequencies for {} (FCC)\".format(mpid))\n", - " columns_v = [\"Hop attempt frequency, v_{} [THz]\".format(i) for i in range(5)]\n", + " columns_v = [\n", + " \"Hop attempt frequency, v_{} [THz]\".format(i) for i in range(5)\n", + " ]\n", " df_v = df[[\"Solute element name\"] + columns_v]\n", " df_v.columns = [\"Solute\"] + [\n", " \"v{} [THz]\".format(i) for i in [\"₀\", \"₁\", \"₂\", \"₃\", \"₄\"]\n", @@ -267,6 +261,7 @@ " contrib[\"tables\"].append(df_v)\n", "\n", " elif hdata[\"Host\"][\"crystal_structure\"] == \"HCP\":\n", + "\n", " print(\"add table for hop activation barriers for {} (HCP)\".format(mpid))\n", " columns_E = [\n", " \"Hop activation barrier, E_X [eV]\",\n", @@ -322,55 +317,23 @@ "from flatten_dict import flatten, unflatten\n", "\n", "columns_map = {\n", - " \"Host.crystal_structure\": {\n", - " \"name\": \"host.symmetry\",\n", - " \"description\": \"host crystal structure\",\n", - " },\n", - " \"Host.melting_temperature\": {\n", - " \"name\": \"host.temperature|melt\",\n", - " \"unit\": \"K\",\n", - " \"description\": \"host melting temperature\",\n", - " },\n", - " \"Host.vacancy_formation_energy\": {\n", - " \"name\": \"host.energy|formation\",\n", - " \"unit\": \"eV\",\n", - " \"description\": \"host vacancy formation energy\",\n", - " },\n", - " \"Host.lattice_constant\": {\n", - " \"name\": \"host.lattice\",\n", - " \"unit\": \"Å\",\n", - " \"description\": \"host lattice constant\",\n", - " },\n", - " \"Host.self-diffusion_correction_shift\": {\n", - " \"name\": \"host.shift\",\n", - " \"unit\": \"eV\",\n", - " \"description\": \"host self diffusion correction shift\",\n", - " },\n", - " \"note\": {\n", - " \"name\": \"excluded\",\n", - " \"description\": \"solutes were calculated but either did not converge or relaxed into the neighboring vacancy, making it ineligible for the analytical multi-frequency formalism\",\n", - " },\n", + " \"Host.crystal_structure\": {\"name\": \"host.symmetry\", \"description\": \"host crystal structure\"},\n", + " \"Host.melting_temperature\": {\"name\": \"host.temperature|melt\", \"unit\": \"K\", \"description\": \"host melting temperature\"},\n", + " \"Host.vacancy_formation_energy\": {\"name\": \"host.energy|formation\", \"unit\": \"eV\", \"description\": \"host vacancy formation energy\"},\n", + " \"Host.lattice_constant\": {\"name\": \"host.lattice\", \"unit\": \"Å\", \"description\": \"host lattice constant\"},\n", + " \"Host.self-diffusion_correction_shift\": {\"name\": \"host.shift\", \"unit\": \"eV\", \"description\": \"host self diffusion correction shift\"},\n", + " \"note\": {\"name\": \"excluded\", \"description\": \"solutes were calculated but either did not converge or relaxed into the neighboring vacancy, making it ineligible for the analytical multi-frequency formalism\"},\n", "}\n", "columns = {col[\"name\"]: col.get(\"unit\") for col in columns_map.values()}\n", "clean_contributions = []\n", "\n", "for contrib in contributions:\n", - " clean_contrib = {\n", - " \"identifier\": contrib[\"identifier\"],\n", - " \"formula\": contrib[\"formula\"],\n", - " \"tables\": contrib[\"tables\"],\n", - " }\n", + " clean_contrib = {\"identifier\": contrib[\"identifier\"], \"formula\": contrib[\"formula\"], \"tables\": contrib[\"tables\"]}\n", " data = {}\n", " for k, v in flatten(contrib[\"data\"], reducer=\"dot\").items():\n", - " data[columns_map[k][\"name\"]] = (\n", - " v.replace(\"The\", \"\")\n", - " .replace(columns_map[k][\"description\"], \"\")\n", - " .replace(\n", - " \"solutes were calculated but either did not converge or relaxed into the neighboring vacancy, making the solute ineligible for the analytical multi-frequency formalism\",\n", - " \"\",\n", - " )\n", - " .strip()\n", - " )\n", + " data[columns_map[k][\"name\"]] = v.replace(\"The\", \"\").replace(columns_map[k][\"description\"], \"\").replace(\n", + " \"solutes were calculated but either did not converge or relaxed into the neighboring vacancy, making the solute ineligible for the analytical multi-frequency formalism\", \"\"\n", + " ).strip()\n", "\n", " clean_contrib[\"data\"] = unflatten(data, splitter=\"dot\")\n", " clean_contributions.append(clean_contrib)\n", diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/download.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/download.ipynb index a18a25b20b..0d17143395 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/download.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/download.ipynb @@ -28,22 +28,17 @@ "metadata": {}, "outputs": [], "source": [ - "fields = [\n", - " \"id\",\n", - " \"identifier\",\n", - " \"formula\",\n", - " \"data.mₑᶜ.p.ε̄.value\",\n", - "] # which fields to retrieve\n", - "sort = \"-data__mₑᶜ__p__ε̄__value\" # field to sort by (NOTE `__value`!); use +/- for asc/desc\n", + "fields = [\"id\", \"identifier\", \"formula\", \"data.mₑᶜ.p.ε̄.value\"] # which fields to retrieve\n", + "sort = \"-data__mₑᶜ__p__ε̄__value\" # field to sort by (NOTE `__value`!); use +/- for asc/desc\n", "# see https://contribs-api.materialsproject.org/#/contributions/get_entries for available query parameters\n", "query = {\n", - " # \"formula_contains\": \"ZnS\",\n", - " # \"identifier__in\": [\"mp-10695\", \"mp-760381\"], # ZnS, CuS\n", + "# \"formula_contains\": \"ZnS\",\n", + "# \"identifier__in\": [\"mp-10695\", \"mp-760381\"], # ZnS, CuS\n", " \"data__functional__exact\": \"GGA+U\",\n", " \"data__metal__contains\": \"Y\",\n", " \"data__mₑᶜ__p__ε̄__value__gte\": 1000,\n", "}\n", - "client.get_totals(query=query) # lightweight call to count results" + "client.get_totals(query=query) # lightweight call to count results" ] }, { @@ -67,11 +62,11 @@ "source": [ "query[\"_fields\"] = fields\n", "query[\"sort\"] = sort\n", - "query[\"format\"] = \"csv\" # \"csv\" or \"json\"\n", + "query[\"format\"] = \"csv\" # \"csv\" or \"json\"\n", "client.download_contributions(\n", " query=query,\n", - " outdir=\"mpcontribs-downloads/my-query\", # change outdir for different queries\n", - " # include=[\"tables\"] # include the tables in the download\n", + " outdir=\"mpcontribs-downloads/my-query\", # change outdir for different queries\n", + " #include=[\"tables\"] # include the tables in the download\n", ")" ] } diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/dtu.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/dtu.ipynb index c1e375138f..a2322b1827 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/dtu.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/dtu.ipynb @@ -19,9 +19,9 @@ "metadata": {}, "outputs": [], "source": [ - "name = \"dtu\"\n", + "name = 'dtu'\n", "client = Client()\n", - "db = \"https://cmr.fysik.dtu.dk/_downloads/mp_gllbsc.db\"" + "db = 'https://cmr.fysik.dtu.dk/_downloads/mp_gllbsc.db'" ] }, { @@ -62,13 +62,13 @@ "outputs": [], "source": [ "dbdir = \"/Users/patrick/gitrepos/mp/MPContribs/mpcontribs-data\"\n", - "dbfile = db.rsplit(\"/\", 1)[-1]\n", + "dbfile = db.rsplit('/', 1)[-1]\n", "dbpath = os.path.join(dbdir, dbfile)\n", "if not os.path.exists(dbpath):\n", - " urlretrieve(db, dbpath)\n", + " urlretrieve(db, dbpath) \n", "\n", "con = connect(dbpath)\n", - "nr_mpids = con.count(selection=\"mpid\")\n", + "nr_mpids = con.count(selection='mpid')\n", "print(nr_mpids)" ] }, @@ -81,27 +81,23 @@ "contributions = []\n", "\n", "with tqdm(total=nr_mpids) as pbar:\n", - " for row in con.select(\"mpid\"):\n", - " contributions.append(\n", - " {\n", - " \"project\": name,\n", - " \"identifier\": f\"mp-{row.mpid}\",\n", - " \"is_public\": True,\n", - " \"data\": {\n", - " \"ΔE\": {\n", - " \"KS\": { # kohn-sham band gap\n", - " \"indirect\": f\"{row.gllbsc_ind_gap - row.gllbsc_disc} eV\",\n", - " \"direct\": f\"{row.gllbsc_dir_gap - row.gllbsc_disc} eV\",\n", - " },\n", - " \"QP\": { # quasi particle band gap\n", - " \"indirect\": f\"{row.gllbsc_ind_gap} eV\",\n", - " \"direct\": f\"{row.gllbsc_dir_gap} eV\",\n", - " },\n", + " for row in con.select('mpid'):\n", + " contributions.append({\n", + " 'project': name, 'identifier': f'mp-{row.mpid}', 'is_public': True,\n", + " 'data': {\n", + " 'ΔE': {\n", + " 'KS': { # kohn-sham band gap\n", + " 'indirect': f'{row.gllbsc_ind_gap - row.gllbsc_disc} eV',\n", + " 'direct': f'{row.gllbsc_dir_gap - row.gllbsc_disc} eV' \n", " },\n", - " \"C\": f\"{row.gllbsc_disc} eV\", # derivative discontinuity\n", + " 'QP': { # quasi particle band gap\n", + " 'indirect': f'{row.gllbsc_ind_gap} eV',\n", + " 'direct': f'{row.gllbsc_dir_gap} eV' \n", + " }\n", " },\n", + " 'C': f'{row.gllbsc_disc} eV' # derivative discontinuity\n", " }\n", - " )\n", + " })\n", " pbar.update(1)" ] }, @@ -143,12 +139,9 @@ " \"_order_by\": \"data__C__value\",\n", " \"order\": \"desc\",\n", " \"_fields\": [\n", - " \"id\",\n", - " \"identifier\",\n", - " \"formula\",\n", - " \"data.C.value\",\n", - " \"data.ΔE.QP.direct.value\",\n", - " ],\n", + " \"id\", \"identifier\", \"formula\",\n", + " \"data.C.value\", \"data.ΔE.QP.direct.value\"\n", + " ]\n", "}\n", "client.contributions.get_entries(**query).result()" ] diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ediffcrystalprediction.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ediffcrystalprediction.ipynb index 09c4ce91c7..9b0ad6bbb8 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ediffcrystalprediction.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ediffcrystalprediction.ipynb @@ -59,16 +59,10 @@ "metadata": {}, "outputs": [], "source": [ - "df_red = pd.DataFrame(\n", - " [\n", - " [t] + za\n", - " for t, za in zip(\n", - " df_uniq[\"thickness\"].to_list(),\n", - " df_uniq[\"zone_axes\"].map(convert_zone_axes).to_list(),\n", - " )\n", - " ],\n", - " columns=[\"thickness [nm]\", \"a [Å]\", \"b [Å]\", \"c [Å]\"],\n", - ")" + "df_red = pd.DataFrame([[t]+za for t, za in zip(\n", + " df_uniq[\"thickness\"].to_list(),\n", + " df_uniq[\"zone_axes\"].map(convert_zone_axes).to_list()\n", + ")], columns=[\"thickness [nm]\", \"a [Å]\", \"b [Å]\", \"c [Å]\"])" ] }, { @@ -91,16 +85,11 @@ "# TODO think of any columns to add in the `data` component\n", "# e.g. direct link to output directory or file/object in OpenData Browser, or\n", "# \"things\" that might be interesting for a general MP user to search across contributions\n", - "contribs = [\n", - " {\n", - " \"identifier\": \"mp-126\",\n", - " \"formula\": \"Pt\",\n", - " \"data\": {\n", - " \"url\": \"https://materialsproject-contribs.s3.amazonaws.com/index.html\"\n", - " },\n", - " \"tables\": [df_red],\n", - " }\n", - "]" + "contribs = [{\n", + " \"identifier\": \"mp-126\", \"formula\": \"Pt\",\n", + " \"data\": {\"url\": \"https://materialsproject-contribs.s3.amazonaws.com/index.html\"},\n", + " \"tables\": [df_red]\n", + "}]" ] }, { diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/esters.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/esters.ipynb index b35396ff28..4328ceba83 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/esters.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/esters.ipynb @@ -17,7 +17,7 @@ "metadata": {}, "outputs": [], "source": [ - "name = \"esters\"\n", + "name = 'esters'\n", "client = Client()\n", "mpr = MPRester()" ] @@ -36,7 +36,7 @@ "outputs": [], "source": [ "# client.projects.update_entry(pk=name, project={'long_title': 'Improved c-axis parameter for BiSe'}).result()\n", - "client.get_project(name) # .display()" + "client.get_project(name)#.display()" ] }, { @@ -52,17 +52,13 @@ "metadata": {}, "outputs": [], "source": [ - "path = \"/Users/patrick/gitrepos/mp/MPContribs/mpcontribs-data/CONTCAR\"\n", + "path = '/Users/patrick/gitrepos/mp/MPContribs/mpcontribs-data/CONTCAR'\n", "structure = Structure.from_file(path)\n", "mpids = mpr.find_structure(structure)\n", - "contributions = [\n", - " {\n", - " \"project\": name,\n", - " \"identifier\": mpids[0],\n", - " \"is_public\": True,\n", - " \"structures\": [structure],\n", - " }\n", - "]" + "contributions = [{\n", + " 'project': name, 'identifier': mpids[0], 'is_public': True,\n", + " 'structures': [structure]\n", + "}]" ] }, { @@ -95,12 +91,9 @@ "metadata": {}, "outputs": [], "source": [ - "structures = list(\n", - " client.get_all_ids({\"project\": name}, include=[\"structures\"])\n", - " .get(name, {})\n", - " .get(\"structures\", {})\n", - " .get(\"ids\", set())\n", - ")\n", + "structures = list(client.get_all_ids(\n", + " {\"project\": name}, include=[\"structures\"]\n", + ").get(name, {}).get(\"structures\", {}).get(\"ids\", set()))\n", "sid = structures[0]" ] }, diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/experimental_thermo.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/experimental_thermo.ipynb index 8353c4de4b..a02e07d84a 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/experimental_thermo.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/experimental_thermo.ipynb @@ -27,7 +27,7 @@ "metadata": {}, "outputs": [], "source": [ - "PROJECT = \"Corrections\"" + "PROJECT = 'Corrections'" ] }, { @@ -48,6 +48,8 @@ "from pathlib import Path\n", "import re\n", "from tqdm import tqdm\n", + "import numpy as np\n", + "import xlrd\n", "from monty.serialization import loadfn, dumpfn" ] }, @@ -67,9 +69,9 @@ "workdir = Path(re.sub(r\"(?<={})[\\w\\W]*\".format(PROJECT), \"\", str(Path.cwd())))\n", "os.chdir(workdir)\n", "\n", - "data_dir = workdir / \"2_raw data\"\n", - "pipeline_dir = workdir / \"3_data analysis\" / \"2_pipeline\"\n", - "output_dir = workdir / \"3_data analysis\" / \"3_output\"" + "data_dir = workdir / '2_raw data'\n", + "pipeline_dir = workdir / '3_data analysis' / '2_pipeline'\n", + "output_dir = workdir / '3_data analysis' / '3_output'" ] }, { @@ -94,9 +96,8 @@ "outputs": [], "source": [ "from mpcontribs.client import Client\n", - "\n", - "name = \"experimental_thermo\" # this should be your project, see from the project URL\n", - "client = Client() # uses MPCONTRIBS_API_KEY envvar" + "name = 'experimental_thermo' # this should be your project, see from the project URL\n", + "client = Client() # uses MPCONTRIBS_API_KEY envvar" ] }, { @@ -106,19 +107,17 @@ "outputs": [], "source": [ "client.projects.update_entry(\n", - " pk=\"experimental_thermo\",\n", - " project={\n", - " \"other\": {\n", - " \"ΔHᶠ\": \"Enthalpy of formation from the elements. Polynomial: H° − H°298.15= A*t + B*t^2/2 + C*t^3/3 + D*t^4/4 − E/t + F − H\",\n", - " \"ΔGᶠ\": \"Gibbs free energy of formation from the elements.\",\n", - " \"S\": \"Absolute entropy. Polynomial: S° = A*ln(t) + B*t + C*t^2/2 + D*t^3/3 − E/(2*t^2) + G\",\n", - " \"Cₚ\": \"Specific heat capacity. Polynomial: Cp° = A + B*t + C*t^2 + D*t^3 + E/t^2\",\n", - " \"polynomial\": \"Coefficients for polynomials used to calculate temperature-dependent values of ΔHᶠ, S, or Cₚ.\",\n", - " \"ΔT\": \"Range of temperatures over which polynomial coefficients are valid.\",\n", - " \"composition\": \"String representation of pymatgen Composition of the material.\",\n", - " \"phase\": \"Material phase, e.g. 'gas', 'liquid', 'solid', 'monoclinic', etc.\",\n", - " }\n", - " },\n", + " pk=\"experimental_thermo\", project={\"other\": \n", + " {\"ΔHᶠ\": \"Enthalpy of formation from the elements. Polynomial: H° − H°298.15= A*t + B*t^2/2 + C*t^3/3 + D*t^4/4 − E/t + F − H\",\n", + " \"ΔGᶠ\": \"Gibbs free energy of formation from the elements.\",\n", + " \"S\": \"Absolute entropy. Polynomial: S° = A*ln(t) + B*t + C*t^2/2 + D*t^3/3 − E/(2*t^2) + G\",\n", + " \"Cₚ\": \"Specific heat capacity. Polynomial: Cp° = A + B*t + C*t^2 + D*t^3 + E/t^2\",\n", + " \"polynomial\": \"Coefficients for polynomials used to calculate temperature-dependent values of ΔHᶠ, S, or Cₚ.\",\n", + " \"ΔT\": \"Range of temperatures over which polynomial coefficients are valid.\",\n", + " \"composition\": \"String representation of pymatgen Composition of the material.\",\n", + " \"phase\": \"Material phase, e.g. 'gas', 'liquid', 'solid', 'monoclinic', etc.\"\n", + " }\n", + " }\n", ").result()" ] }, @@ -129,10 +128,8 @@ "outputs": [], "source": [ "client.projects.update_entry(\n", - " pk=\"experimental_thermo\",\n", - " project={\n", - " \"authors\": \"Various authors (see references). Data compiled by the Materials Project team.\"\n", - " },\n", + " pk=\"experimental_thermo\", project={\"authors\": \"Various authors (see references). Data compiled by the Materials Project team.\"\n", + " }\n", ").result()" ] }, @@ -143,7 +140,8 @@ "outputs": [], "source": [ "client.projects.update_entry(\n", - " pk=\"experimental_thermo\", project={\"title\": \"Thermochemistry Data\"}\n", + " pk=\"experimental_thermo\", project={\"title\": \"Thermochemistry Data\"\n", + " }\n", ").result()" ] }, @@ -154,7 +152,8 @@ "outputs": [], "source": [ "client.projects.update_entry(\n", - " pk=\"experimental_thermo\", project={\"unique_identifiers\": True}\n", + " pk=\"experimental_thermo\", project={\"unique_identifiers\": True\n", + " }\n", ").result()" ] }, @@ -165,16 +164,9 @@ "outputs": [], "source": [ "client.projects.update_entry(\n", - " pk=\"experimental_thermo\",\n", - " project={\n", - " \"references\": [\n", - " {\n", - " \"label\": \"Kubaschewski\",\n", - " \"url\": \"https://www.worldcat.org/title/materials-thermochemistry/oclc/26724109\",\n", - " },\n", - " {\"label\": \"NIST\", \"url\": \"https://janaf.nist.gov/\"},\n", - " ]\n", - " },\n", + " pk=\"experimental_thermo\", project={\"references\": [\n", + " {\"label\":\"Kubaschewski\", \"url\":\"https://www.worldcat.org/title/materials-thermochemistry/oclc/26724109\"},\n", + " {\"label\":\"NIST\", \"url\":\"https://janaf.nist.gov/\"},]}\n", ").result()" ] }, @@ -229,9 +221,11 @@ " {\"path\": \"data.ΔT.G.max\", \"unit\": \"degK\"},\n", " {\"path\": \"data.ΔT.H.max\", \"unit\": \"degK\"},\n", " {\"path\": \"data.method\", \"unit\": \"kJ/mol\"},\n", - " {\"path\": \"data.reference\", \"unit\": \"kJ/mol\"},\n", + " {\"path\": \"data.reference\", \"unit\": \"kJ/mol\"}, \n", "]\n", - "client.projects.update_entry(pk=name, project={\"columns\": columns}).result()" + "client.projects.update_entry(\n", + " pk=name, project={\"columns\": columns}\n", + ").result()" ] }, { @@ -338,7 +332,7 @@ "metadata": {}, "outputs": [], "source": [ - "# all_thermo = []\n", + "#all_thermo = []\n", "with MPRester() as a:\n", " for f in tqdm(ternary_plus):\n", " all_thermo.extend(a.get_exp_thermo_data(f))" @@ -350,7 +344,7 @@ "metadata": {}, "outputs": [], "source": [ - "dumpfn(all_thermo, output_dir / \"2020-08-07 all MP Thermo data.json\")" + "dumpfn(all_thermo, output_dir / '2020-08-07 all MP Thermo data.json')" ] }, { @@ -359,7 +353,7 @@ "metadata": {}, "outputs": [], "source": [ - "all_thermo = loadfn(output_dir / \"2020-08-07 all MP Thermo data.json\")" + "all_thermo = loadfn(output_dir / '2020-08-07 all MP Thermo data.json')" ] }, { @@ -385,7 +379,6 @@ "outputs": [], "source": [ "import pandas as pd\n", - "\n", "mpthermo_df = pd.DataFrame([t.as_dict() for t in all_thermo])" ] }, @@ -396,8 +389,8 @@ "outputs": [], "source": [ "# drop the unneeded columns\n", - "mpthermo_df = mpthermo_df.drop(\"@module\", axis=1)\n", - "mpthermo_df = mpthermo_df.drop(\"@class\", axis=1)" + "mpthermo_df = mpthermo_df.drop('@module', axis=1)\n", + "mpthermo_df = mpthermo_df.drop('@class', axis=1)" ] }, { @@ -458,11 +451,10 @@ "source": [ "from pymatgen import Composition\n", "\n", - "\n", "def create_dict(data):\n", " ret = {}\n", " comp = Composition(data.formula.unique()[0])\n", - "\n", + " \n", " ret[\"project\"] = name\n", " ret[\"is_public\"] = False\n", " ret[\"identifier\"] = comp.reduced_formula\n", @@ -471,13 +463,14 @@ " ret[\"data\"][\"composition\"] = str(comp)\n", " ret[\"data\"][\"phase\"] = data.phaseinfo.unique()[0]\n", " ret[\"data\"][\"reference\"] = data.ref.unique()[0]\n", - "\n", + " \n", " for t in data.type.unique():\n", + " \n", " # set the base dictionary key\n", " if t in [\"A\", \"B\", \"C\", \"D\", \"E\", \"F\", \"G\", \"H\"]:\n", " if not ret[\"data\"].get(\"polynomial\"):\n", " ret[\"data\"][\"polynomial\"] = {}\n", - "\n", + " \n", " if not ret[\"data\"].get(\"ΔT\"):\n", " ret[\"data\"][\"ΔT\"] = {}\n", "\n", @@ -485,61 +478,50 @@ " col = t\n", " unit = \"dimensionless\"\n", " base_dict[col] = {}\n", - " ret[\"data\"][\"ΔT\"][col] = {\n", - " \"min\": \"{} K\".format(\n", - " data[data[\"type\"] == t][\"temp_range\"].values[0][0]\n", - " ),\n", - " \"max\": \"{} K\".format(\n", - " data[data[\"type\"] == t][\"temp_range\"].values[0][1]\n", - " ),\n", - " }\n", - "\n", + " ret[\"data\"][\"ΔT\"][col] = {\"min\": \"{} K\".format(data[data[\"type\"]==t][\"temp_range\"].values[0][0]),\n", + " \"max\": \"{} K\".format(data[data[\"type\"]==t][\"temp_range\"].values[0][1])}\n", + " \n", " else:\n", - " if data[data[\"type\"] == t][\"temp_range\"].values[0] == [298, 298]:\n", + " if data[data[\"type\"]==t][\"temp_range\"].values[0] == [298, 298]:\n", " if not ret[\"data\"].get(\"298K\"):\n", - " ret[\"data\"][\"298K\"] = {}\n", + " ret[\"data\"][\"298K\"]= {}\n", " base_dict = ret[\"data\"][\"298K\"]\n", " else:\n", - " print(\n", - " \"Type: {}, T: {}\".format(\n", - " t, data[data[\"type\"] == t][\"temp_range\"].values[0]\n", - " )\n", - " )\n", - "\n", + " print(\"Type: {}, T: {}\".format(t, data[data[\"type\"]==t][\"temp_range\"].values[0]))\n", + " \n", " if t == \"S\":\n", - " unit = \"kJ/degK/mol\"\n", + " unit = 'kJ/degK/mol'\n", " col = \"S\"\n", - " elif t == \"fH\":\n", + " elif t ==\"fH\":\n", " col = \"ΔHᶠ\"\n", " unit = \"kJ/mol\"\n", " else:\n", " col = t\n", " unit = \"dimensionless\"\n", - "\n", + " \n", " base_dict[col] = {}\n", "\n", " # find value, uncertainty, method, unit\n", - " base_dict[col] = \"{:0.5g} {}\".format(\n", - " data[data[\"type\"] == t][\"value\"].values[0], unit\n", - " )\n", - "\n", - " if data[data[\"type\"] == t][\"method\"].values[0] != \"\":\n", + " base_dict[col]= \"{:0.5g} {}\".format(data[data[\"type\"]==t][\"value\"].values[0], unit)\n", + " \n", + " if data[data[\"type\"]==t][\"method\"].values[0] != \"\":\n", " if not ret[\"data\"].get(\"method\"):\n", " ret[\"data\"][\"method\"] = {}\n", - " ret[\"data\"][\"method\"][col] = data[data[\"type\"] == t][\"method\"].values[0]\n", - "\n", - " # if not np.isnan(data[data[\"type\"]==t][\"uncertainty\"].values[0]):\n", - " # base_dict[col][\"uncertainty\"] = data[data[\"type\"]==t][\"uncertainty\"].values[0]\n", - "\n", - " # if t in [\"S\", \"fH\"]:\n", - " # base_dict[col][\"units\"] = unit\n", + " ret[\"data\"][\"method\"][col] = data[data[\"type\"]==t][\"method\"].values[0]\n", + " \n", + "# if not np.isnan(data[data[\"type\"]==t][\"uncertainty\"].values[0]):\n", + "# base_dict[col][\"uncertainty\"] = data[data[\"type\"]==t][\"uncertainty\"].values[0]\n", + " \n", + " \n", + " \n", + "# if t in [\"S\", \"fH\"]:\n", + "# base_dict[col][\"units\"] = unit\n", "\n", + " \n", " return ret\n", + " \n", "\n", - "\n", - "new_df = mpthermo_df.groupby([\"formula\", \"compound_name\", \"phaseinfo\", \"ref\"]).apply(\n", - " create_dict\n", - ")\n", + "new_df = mpthermo_df.groupby([\"formula\",\"compound_name\",\"phaseinfo\",\"ref\"]).apply(create_dict)\n", "mpthermo_contribs = list(new_df)" ] }, @@ -570,16 +552,16 @@ "from itertools import groupby\n", "\n", "for formula, group in groupby(mpthermo_contribs, key=lambda d: d[\"identifier\"]):\n", - " new_dict = {}\n", + " new_dict ={}\n", " new_dict[\"project\"] = name\n", " new_dict[\"is_public\"] = False\n", " new_dict[\"identifier\"] = formula\n", " new_dict[\"data\"] = {}\n", - "\n", + " \n", " for d in group:\n", " if not new_dict.get(\"composition\"):\n", " new_dict[\"composition\"] = d[\"data\"][\"composition\"]\n", - "\n", + " \n", " del d[\"data\"][\"composition\"]\n", "\n", " phase = d[\"data\"].get(\"phase\", \"n/a\")\n", @@ -600,7 +582,6 @@ "outputs": [], "source": [ "import pprint\n", - "\n", "pprint.pprint(reshaped[0])" ] }, @@ -625,10 +606,7 @@ "outputs": [], "source": [ "import pandas\n", - "\n", - "janaf_df = pandas.read_csv(\n", - " data_dir / \"2020-08-10 JANAF data from Ayush/mpcontribs_janaf_thermo.csv\"\n", - ")" + "janaf_df= pandas.read_csv(data_dir / \"2020-08-10 JANAF data from Ayush/mpcontribs_janaf_thermo.csv\")" ] }, { @@ -654,43 +632,41 @@ "outputs": [], "source": [ "def create_dict(data):\n", - "\n", + " \n", " ret = {}\n", " ret[\"project\"] = name\n", - " ret[\"is_public\"] = False\n", + " ret[\"is_public\"] = False \n", " ret[\"data\"] = {}\n", - "\n", + " \n", " try:\n", " comp = Composition(data.Formula.unique()[0])\n", " ret[\"identifier\"] = comp.reduced_formula\n", " ret[\"data\"][\"composition\"] = str(comp)\n", " except:\n", - " print(\"problem\")\n", + " print('problem')\n", " ret[\"identifier\"] = data.Formula.unique()[0]\n", " ret[\"data\"][\"composition\"] = data.Formula.unique()[0]\n", - "\n", + " \n", " ret[\"data\"][\"compound\"] = data.Name.unique()[0]\n", " ret[\"data\"][\"phase\"] = data.Phase.unique()[0]\n", - " ret[\"data\"][\"reference\"] = data.Link.unique()[0].replace(\"txt\", \"html\")\n", - "\n", - " ret[\"data\"][\"0K\"] = {\n", - " \"ΔHᶠ\": \"{:0.6g} {}\".format(data[\"DeltaH_0\"].values[0] / 1000, \"kJ/mol\"),\n", - " \"ΔGᶠ\": \"{:0.6g} {}\".format(data[\"DeltaG_0\"].values[0] / 1000, \"kJ/mol\"),\n", - " \"S\": \"{:0.6g} {}\".format(data[\"S_0\"].values[0], \"J/degK/mol\"),\n", - " \"Cₚ\": \"{:0.6g} {}\".format(data[\"Cp_0\"].values[0], \"J/degK/mol\"),\n", - " }\n", - "\n", - " ret[\"data\"][\"298K\"] = {\n", - " \"ΔHᶠ\": \"{:0.6g} {}\".format(data[\"DeltaH_298\"].values[0] / 1000, \"kJ/mol\"),\n", - " \"ΔGᶠ\": \"{:0.6g} {}\".format(data[\"DeltaG_298\"].values[0] / 1000, \"kJ/mol\"),\n", - " \"S\": \"{:0.6g} {}\".format(data[\"S_298\"].values[0], \"J/degK/mol\"),\n", - " \"Cₚ\": \"{:0.6g} {}\".format(data[\"Cp_298\"].values[0], \"J/degK/mol\"),\n", - " }\n", + " ret[\"data\"][\"reference\"] = data.Link.unique()[0].replace('txt','html')\n", + " \n", + " ret[\"data\"][\"0K\"] = {\"ΔHᶠ\": \"{:0.6g} {}\".format(data[\"DeltaH_0\"].values[0]/1000, \"kJ/mol\"),\n", + " \"ΔGᶠ\": \"{:0.6g} {}\".format(data[\"DeltaG_0\"].values[0]/1000, \"kJ/mol\"),\n", + " \"S\": \"{:0.6g} {}\".format(data[\"S_0\"].values[0], \"J/degK/mol\"),\n", + " \"Cₚ\": \"{:0.6g} {}\".format(data[\"Cp_0\"].values[0], \"J/degK/mol\"),\n", + " }\n", + " \n", + " ret[\"data\"][\"298K\"] = {\"ΔHᶠ\": \"{:0.6g} {}\".format(data[\"DeltaH_298\"].values[0]/1000, \"kJ/mol\"),\n", + " \"ΔGᶠ\": \"{:0.6g} {}\".format(data[\"DeltaG_298\"].values[0]/1000, \"kJ/mol\"),\n", + " \"S\": \"{:0.6g} {}\".format(data[\"S_298\"].values[0], \"J/degK/mol\"),\n", + " \"Cₚ\": \"{:0.6g} {}\".format(data[\"Cp_298\"].values[0], \"J/degK/mol\"),\n", + " }\n", "\n", " return ret\n", + " \n", "\n", - "\n", - "new_df = janaf_df.groupby([\"Formula\", \"Name\", \"Phase\"]).apply(create_dict)\n", + "new_df = janaf_df.groupby([\"Formula\",\"Name\",\"Phase\"]).apply(create_dict)\n", "janaf_contribs = list(new_df)" ] }, @@ -721,18 +697,19 @@ "from itertools import groupby\n", "\n", "for formula, group in groupby(janaf_contribs, key=lambda d: d[\"identifier\"]):\n", - " new_dict = {}\n", + " new_dict ={}\n", " new_dict[\"project\"] = name\n", " new_dict[\"is_public\"] = False\n", " new_dict[\"identifier\"] = formula\n", " new_dict[\"data\"] = {}\n", - "\n", + " \n", " for d in group:\n", " if not new_dict.get(\"composition\"):\n", " new_dict[\"composition\"] = d[\"data\"][\"composition\"]\n", - "\n", + " \n", + " \n", " del d[\"data\"][\"composition\"]\n", - "\n", + " \n", " phase = d[\"data\"].get(\"phase\", \"n/a\")\n", " if phase == \"\":\n", " phase = \"n/a\"\n", @@ -740,7 +717,7 @@ " new_dict[\"data\"][phase] = d[\"data\"]\n", " if phase != \"n/a\":\n", " del new_dict[\"data\"][phase][\"phase\"]\n", - "\n", + " \n", " reshaped_janaf.append(new_dict)" ] }, @@ -751,7 +728,6 @@ "outputs": [], "source": [ "import pprint\n", - "\n", "pprint.pprint(reshaped_janaf[0])" ] }, @@ -762,7 +738,6 @@ "outputs": [], "source": [ "import pprint\n", - "\n", "pprint.pprint(reshaped[0])" ] }, @@ -781,20 +756,16 @@ "source": [ "all_contribs = reshaped[:]\n", "\n", - "count = 0\n", + "count=0\n", "for d in reshaped_janaf:\n", " # is this identifier already in mp thermo?\n", " if d[\"identifier\"] in [e[\"identifier\"] for e in reshaped]:\n", " # add the new NIST phases\n", " target_entry = [e for e in reshaped if e[\"identifier\"] == d[\"identifier\"]][0]\n", - " for k, v in d[\"data\"].items():\n", + " for k,v in d[\"data\"].items():\n", " if target_entry[\"data\"].get(k):\n", - " print(\n", - " \"Warning: phase {} already exists for id {} in MP Thermo data! Skipping.\".format(\n", - " k, d[\"identifier\"]\n", - " )\n", - " )\n", - " count += 1\n", + " print(\"Warning: phase {} already exists for id {} in MP Thermo data! Skipping.\".format(k, d[\"identifier\"]))\n", + " count+=1\n", " continue\n", " target_entry[\"data\"][k] = v\n", " else:\n", @@ -837,19 +808,18 @@ "metadata": {}, "outputs": [], "source": [ - "replace = {\n", - " \"#-qtz\": \"βqtz\",\n", - " \"a\": \"α\",\n", - " \"a -cris\": \"αcrys\",\n", - " \"a -qtz\": \"αqtz\",\n", - " \"nit.ba\": \"nitba\",\n", - " \"orth./1\": \"orth\",\n", - " \"ortho\": \"orth\",\n", - " \"r.tet\": \"rtet\",\n", - " \"tet/cu\": \"tetcu\",\n", - " \"n/a\": \"none\",\n", - " \"cr,l\": \"crl\",\n", - "}" + "replace = {\"#-qtz\":\"βqtz\",\n", + " \"a\": \"α\",\n", + " \"a -cris\":\"αcrys\",\n", + " \"a -qtz\":\"αqtz\",\n", + " \"nit.ba\": \"nitba\",\n", + " \"orth./1\":\"orth\",\n", + " \"ortho\":\"orth\",\n", + " \"r.tet\":\"rtet\",\n", + " \"tet/cu\":\"tetcu\",\n", + " \"n/a\":\"none\",\n", + " \"cr,l\":\"crl\"\n", + " }" ] }, { @@ -889,18 +859,20 @@ "new_contribs = []\n", "for d in all_contribs:\n", " # unpack each identifier into unique identifiers with formula+phase\n", - " for k, v in d[\"data\"].items():\n", - " new_d = {}\n", - " if k == \"composition\":\n", + " for k,v in d[\"data\"].items():\n", + " new_d={}\n", + " if k == 'composition':\n", " continue\n", - " new_d[\"identifier\"] = str(d[\"identifier\"] + \"-\" + k)\n", + " new_d[\"identifier\"] = str(d[\"identifier\"]+\"-\"+k)\n", " new_d[\"formula\"] = d[\"identifier\"]\n", " new_d[\"is_public\"] = True\n", " new_d[\"project\"] = d[\"project\"]\n", " new_d[\"data\"] = v\n", " new_d[\"data\"][\"phase\"] = k\n", " new_d[\"data\"][\"composition\"] = d[\"data\"][\"composition\"]\n", - " new_contribs.append(new_d)" + " new_contribs.append(new_d)\n", + "\n", + " " ] }, { @@ -954,7 +926,7 @@ "source": [ "for d in new_contribs:\n", " if d[\"data\"].get(\"0K\"):\n", - " if all([\"nan\" in v for k, v in d[\"data\"][\"0K\"].items()]):\n", + " if all([\"nan\" in v for k,v in d[\"data\"][\"0K\"].items()]):\n", " del d[\"data\"][\"0K\"]\n", " print(\"deleted {}\".format(d[\"identifier\"]))" ] @@ -967,7 +939,7 @@ "source": [ "for d in new_contribs:\n", " if d[\"data\"].get(\"298K\"):\n", - " if all([\"nan\" in v for k, v in d[\"data\"][\"298K\"].items()]):\n", + " if all([\"nan\" in v for k,v in d[\"data\"][\"298K\"].items()]):\n", " del d[\"data\"][\"298K\"]\n", " print(\"deleted {}\".format(d[\"identifier\"]))" ] @@ -980,7 +952,7 @@ "source": [ "for d in new_contribs:\n", " if d[\"data\"].get(\"298K\"):\n", - " if all([\"nan\" in v or \"0 \" in v for k, v in d[\"data\"][\"298K\"].items()]):\n", + " if all([\"nan\" in v or \"0 \" in v for k,v in d[\"data\"][\"298K\"].items()]):\n", " del d[\"data\"][\"298K\"]\n", " print(\"deleted {}\".format(d[\"identifier\"]))" ] @@ -993,7 +965,7 @@ "source": [ "for d in new_contribs:\n", " if d[\"data\"].get(\"0K\"):\n", - " if all([\"nan\" in v or \"0 \" in v for k, v in d[\"data\"][\"0K\"].items()]):\n", + " if all([\"nan\" in v or \"0 \" in v for k,v in d[\"data\"][\"0K\"].items()]):\n", " del d[\"data\"][\"0K\"]\n", " print(\"deleted {}\".format(d[\"identifier\"]))" ] @@ -1033,7 +1005,7 @@ "source": [ "# need to delete contributions first due to unique_identifiers=False\n", "client.delete_contributions(name)\n", - "# client.submit_contributions(new_contribs, per_page=10)#, skip_dupe_check=True)" + "#client.submit_contributions(new_contribs, per_page=10)#, skip_dupe_check=True)" ] }, { @@ -1054,10 +1026,9 @@ "def chunks(lst, n):\n", " \"\"\"Yield successive n-sized chunks from lst.\"\"\"\n", " for i in range(0, len(lst), n):\n", - " yield lst[i : i + n]\n", - "\n", + " yield lst[i:i + n]\n", "\n", - "for chunk in tqdm(chunks(new_contribs, 10, total=len(new_contribs) / 10)):\n", + "for chunk in tqdm(chunks(new_contribs, 10, total=len(new_contribs)/10)):\n", " try:\n", " client.contributions.create_entries(contributions=chunk).result()\n", " except:\n", diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/experimental_thermoelectrics.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/experimental_thermoelectrics.ipynb index 7526af6ba1..fc639fd76a 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/experimental_thermoelectrics.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/experimental_thermoelectrics.ipynb @@ -11,7 +11,7 @@ "from mp_api.client import MPRester\n", "import pandas as pd\n", "import os\n", - "from flatten_dict import unflatten\n", + "from flatten_dict import unflatten, flatten\n", "from math import isnan" ] }, @@ -69,7 +69,7 @@ " title=\"Experimental Thermoelectrics\",\n", " authors=\"R. Seshradi\",\n", " description=\"Data-Driven Review of Thermoelectric Materials: Performance and Resource Considerations.\",\n", - " url=\"https://pubs.acs.org/doi/10.1021/cm400893e\",\n", + " url=\"https://pubs.acs.org/doi/10.1021/cm400893e\"\n", " )" ] }, @@ -101,124 +101,39 @@ "outputs": [], "source": [ "columns_map = {\n", - " \"T (K)\": {\n", - " \"name\": \"temperature\",\n", - " \"unit\": \"K\",\n", - " \"description\": \"Temperature in Kelvin\",\n", - " },\n", - " \"Z*10^-4 reported\": {\n", - " \"name\": \"Z\",\n", - " \"unit\": \"\",\n", - " \"description\": \"reported Z\",\n", - " \"scale\": 1e4,\n", - " },\n", - " \"Resist. (Ohm.cm)\": {\n", - " \"name\": \"resistivity.RT\",\n", - " \"unit\": \"Ω·cm\",\n", - " \"description\": \"Resistivity at room temperature in Ωcm\",\n", - " },\n", - " \"Resist. (400K)\": {\n", - " \"name\": \"resistivity.400K\",\n", - " \"unit\": \"Ω·cm\",\n", - " \"description\": \"Resistivity at 400K in Ωcm\",\n", - " },\n", - " \"Seebeck (uV/K)\": {\n", - " \"name\": \"seebeck.RT\",\n", - " \"unit\": \"µV/K\",\n", - " \"description\": \"Seebeck coefficient at room temperature in µV/K\",\n", - " },\n", - " \"Seebeck (400K)\": {\n", - " \"name\": \"seebeck.400K\",\n", - " \"unit\": \"µV/K\",\n", - " \"description\": \"Seebeck coefficient at 400K in µV/K\",\n", - " },\n", + " \"T (K)\": {\"name\": \"temperature\", \"unit\": \"K\", \"description\": \"Temperature in Kelvin\"},\n", + " \"Z*10^-4 reported\": {\"name\": \"Z\", \"unit\": \"\", \"description\": \"reported Z\", \"scale\": 1e4},\n", + " \"Resist. (Ohm.cm)\": {\"name\": \"resistivity.RT\", \"unit\": \"Ω·cm\", \"description\": \"Resistivity at room temperature in Ωcm\"},\n", + " \"Resist. (400K)\": {\"name\": \"resistivity.400K\", \"unit\": \"Ω·cm\", \"description\": \"Resistivity at 400K in Ωcm\"},\n", + " \"Seebeck (uV/K)\": {\"name\": \"seebeck.RT\", \"unit\": \"µV/K\", \"description\": \"Seebeck coefficient at room temperature in µV/K\"},\n", + " \"Seebeck (400K)\": {\"name\": \"seebeck.400K\", \"unit\": \"µV/K\", \"description\": \"Seebeck coefficient at 400K in µV/K\"},\n", " \"kappa (W/mK)\": {\"name\": \"kappa.mean\", \"unit\": \"W/mK\", \"description\": \"TODO\"},\n", " \"kappaZT\": {\"name\": \"kappa.ZT\", \"unit\": \"\", \"description\": \"TODO\"},\n", - " \"Pf (W/K^2/m)\": {\n", - " \"name\": \"Pf\",\n", - " \"unit\": \"W/K²/m\",\n", - " \"description\": \"Power Factor in W/K²/m\",\n", - " },\n", - " \"Power Factor*T (W/mK)\": {\n", - " \"name\": \"PfT\",\n", - " \"unit\": \"W/K/m\",\n", - " \"description\": \"Power Factor times Temperature in W/K/m\",\n", - " },\n", + " \"Pf (W/K^2/m)\": {\"name\": \"Pf\", \"unit\": \"W/K²/m\", \"description\": \"Power Factor in W/K²/m\"},\n", + " \"Power Factor*T (W/mK)\": {\"name\": \"PfT\", \"unit\": \"W/K/m\", \"description\": \"Power Factor times Temperature in W/K/m\"},\n", " \"ZT\": {\"name\": \"ZT\", \"unit\": \"\", \"description\": \"ZT\"},\n", " \"x\": {\"name\": \"x\", \"unit\": \"\", \"description\": \"TODO\"},\n", " \"series\": {\"name\": \"series\", \"unit\": None, \"description\": \"TODO\"},\n", " \"T Max\": {\"name\": \"Tmax\", \"unit\": \"K\", \"description\": \"TODO\"},\n", " \"family\": {\"name\": \"family\", \"unit\": None, \"description\": \"TODO\"},\n", - " \"Conduct. (S/cm)\": {\n", - " \"name\": \"conductivity\",\n", - " \"unit\": \"S/cm\",\n", - " \"description\": \"Conductivity in S/cm\",\n", - " },\n", + " \"Conduct. (S/cm)\": {\"name\": \"conductivity\", \"unit\": \"S/cm\", \"description\": \"Conductivity in S/cm\"},\n", " \"S^2\": {\"name\": \"S2\", \"unit\": \"\", \"description\": \"S²\"},\n", " \"ke/ktotal\": {\"name\": \"ke|rel\", \"unit\": \"\", \"description\": \"ke/ktotal\"},\n", " \"space group\": {\"name\": \"spacegroup\", \"unit\": \"\", \"description\": \"space group\"},\n", - " \"# symmetry elements\": {\n", - " \"name\": \"nsymelems\",\n", - " \"unit\": \"\",\n", - " \"description\": \"number of symmetry elements\",\n", - " },\n", - " \"preparative route\": {\n", - " \"name\": \"route\",\n", - " \"unit\": None,\n", - " \"description\": \"Preparative Route\",\n", - " },\n", + " \"# symmetry elements\": {\"name\": \"nsymelems\", \"unit\": \"\", \"description\": \"number of symmetry elements\"},\n", + " \"preparative route\": {\"name\": \"route\", \"unit\": None, \"description\": \"Preparative Route\"},\n", " \"final form\": {\"name\": \"final\", \"unit\": None, \"description\": \"Final Form\"},\n", " \"Authors\": {\"name\": \"authors.main\", \"unit\": None, \"description\": \"Authors\"},\n", - " \"Author of Unit Cell\": {\n", - " \"name\": \"authors.cell\",\n", - " \"unit\": None,\n", - " \"description\": \"Author of Unit Cell\",\n", - " },\n", - " \"DOI\": {\n", - " \"name\": \"dois.main\",\n", - " \"unit\": None,\n", - " \"description\": \"Digital Object Identifier (DOI)\",\n", - " },\n", - " \"Unit Cell DOI\": {\n", - " \"name\": \"dois.cell\",\n", - " \"unit\": None,\n", - " \"description\": \"Unit Cell DOI\",\n", - " },\n", - " \"ICSD of structure\": {\n", - " \"name\": \"icsd.number\",\n", - " \"unit\": \"\",\n", - " \"description\": \"ICSD of structure\",\n", - " },\n", - " \"temp of ICSD (K)\": {\n", - " \"name\": \"icsd.temperature\",\n", - " \"unit\": \"K\",\n", - " \"description\": \"temp of ICSD (K)\",\n", - " },\n", - " \"Cell Volume (A^3)\": {\n", - " \"name\": \"volume.cell\",\n", - " \"unit\": \"ų\",\n", - " \"description\": \"Cell Volume in ų\",\n", - " },\n", - " \"average atomic volume\": {\n", - " \"name\": \"volume.atomic\",\n", - " \"unit\": \"\",\n", - " \"description\": \"average atomic volume\",\n", - " },\n", - " \"Formula Units per Cell\": {\n", - " \"name\": \"units\",\n", - " \"unit\": \"\",\n", - " \"description\": \"Formula Units per Cell\",\n", - " },\n", - " \"Atoms per formula unit\": {\n", - " \"name\": \"natoms.formunit\",\n", - " \"unit\": \"\",\n", - " \"description\": \"Atoms per formula unit\",\n", - " },\n", - " \"total atoms per unit cell\": {\n", - " \"name\": \"natoms.total\",\n", - " \"unit\": \"\",\n", - " \"description\": \"total atoms per unit cell\",\n", - " },\n", + " \"Author of Unit Cell\": {\"name\": \"authors.cell\", \"unit\": None, \"description\": \"Author of Unit Cell\"},\n", + " \"DOI\": {\"name\": \"dois.main\", \"unit\": None, \"description\": \"Digital Object Identifier (DOI)\"},\n", + " \"Unit Cell DOI\": {\"name\": \"dois.cell\", \"unit\": None, \"description\": \"Unit Cell DOI\"},\n", + " \"ICSD of structure\": {\"name\": \"icsd.number\", \"unit\": \"\", \"description\": \"ICSD of structure\"},\n", + " \"temp of ICSD (K)\": {\"name\": \"icsd.temperature\", \"unit\": \"K\", \"description\": \"temp of ICSD (K)\"},\n", + " \"Cell Volume (A^3)\": {\"name\": \"volume.cell\", \"unit\": \"ų\", \"description\": \"Cell Volume in ų\"},\n", + " \"average atomic volume\": {\"name\": \"volume.atomic\", \"unit\": \"\", \"description\": \"average atomic volume\"},\n", + " \"Formula Units per Cell\": {\"name\": \"units\", \"unit\": \"\", \"description\": \"Formula Units per Cell\"},\n", + " \"Atoms per formula unit\": {\"name\": \"natoms.formunit\", \"unit\": \"\", \"description\": \"Atoms per formula unit\"},\n", + " \"total atoms per unit cell\": {\"name\": \"natoms.total\", \"unit\": \"\", \"description\": \"total atoms per unit cell\"}\n", "}\n", "skip = (\"Unnamed:\", \"Comments\")\n", "# for col in df.columns:\n", @@ -236,15 +151,14 @@ "outputs": [], "source": [ "import csv\n", - "\n", "field_names = [\"column\", \"name\", \"unit\", \"scale\", \"description\"]\n", "csvlines = []\n", "for k, v in columns_map.items():\n", " line = {\"column\": k}\n", " line.update(v)\n", " csvlines.append(line)\n", - "\n", - "with open(f\"{name}_columns.csv\", \"w\") as csvfile:\n", + " \n", + "with open(f'{name}_columns.csv', 'w') as csvfile:\n", " writer = csv.DictWriter(csvfile, fieldnames=field_names)\n", " writer.writeheader()\n", " writer.writerows(csvlines)" @@ -257,9 +171,9 @@ "metadata": {}, "outputs": [], "source": [ - "other = unflatten(\n", - " {col[\"name\"]: col[\"description\"] for col in columns_map.values()}, splitter=\"dot\"\n", - ")\n", + "other = unflatten({\n", + " col[\"name\"]: col[\"description\"] for col in columns_map.values()\n", + "}, splitter=\"dot\")\n", "client.update_project({\"other\": other})" ] }, @@ -323,7 +237,7 @@ " formula = record.pop(\"Formula\")\n", " if not isinstance(formula, str) and isnan(formula):\n", " continue\n", - "\n", + " \n", " clean = {}\n", " for k, v in record.items():\n", " if k.startswith(skip) or k not in columns_map:\n", @@ -332,14 +246,14 @@ " # remove NaNs (tip: skip any unset/empty keys)\n", " if not isinstance(v, str) and isnan(v):\n", " continue\n", - " # convert boolean values to Yes/No, and append units\n", + " # convert boolean values to Yes/No, and append units \n", " key = columns_map[k][\"name\"]\n", " unit = columns_map[k].get(\"unit\")\n", " scale = columns_map[k].get(\"scale\")\n", " val = v\n", " if scale is not None and isinstance(scale, (float, int)):\n", " val *= scale\n", - "\n", + " \n", " if isinstance(v, bool):\n", " val = \"Yes\" if v else \"No\"\n", " elif isinstance(v, int) and not unit:\n", @@ -352,7 +266,7 @@ " icsd = clean.get(\"icsd.number\")\n", " if not icsd:\n", " continue\n", - "\n", + " \n", " identifier = icsd_lookup.get(icsd)\n", " if not identifier:\n", " continue\n", @@ -374,7 +288,7 @@ "client.delete_contributions() # remove all contributions from project\n", "client.init_columns(columns)\n", "client.submit_contributions(contributions)\n", - "client.init_columns(columns) # shouldn't be needed but ensures all columns appear\n", + "client.init_columns(columns) # shouldn't be needed but ensures all columns appear\n", "# client.make_public()" ] }, diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ferroelectrics.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ferroelectrics.ipynb index 813671be85..458b629c00 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ferroelectrics.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ferroelectrics.ipynb @@ -11,9 +11,10 @@ "source": [ "import json\n", "import numpy as np\n", - "from mpcontribs.client import Client\n", + "from mpcontribs.client import Client, Attachment\n", "from pathlib import Path\n", - "from flatten_dict import flatten, unflatten" + "from flatten_dict import flatten, unflatten\n", + "from pymatgen.core import Structure" ] }, { @@ -63,7 +64,7 @@ "\n", "with distortions_file.open() as f:\n", " distortions = json.load(f)\n", - "\n", + " \n", "with workflow_data_file.open() as f:\n", " workflow_data = json.load(f)" ] @@ -81,47 +82,30 @@ " \"bilbao_nonpolar_spacegroup\": {\"name\": \"bilbao.spacegroup.nonpolar\", \"unit\": \"\"},\n", " \"bilbao_polar_spacegroup\": {\"name\": \"bilbao.spacegroup.polar\", \"unit\": \"\"},\n", " \"polarization_change_norm\": {\"name\": \"polarization.norm\", \"unit\": \"µC/cm²\"},\n", - " \"polarization_change\": {\n", - " \"name\": \"polarization.vector\",\n", - " \"unit\": \"µC/cm²\",\n", - " \"fields\": [\"a\", \"b\", \"c\"],\n", - " },\n", - " \"polarization_quanta\": {\n", - " \"name\": \"polarization.quanta\",\n", - " \"unit\": \"µC/cm²\",\n", - " \"fields\": [\"a\", \"b\", \"c\"],\n", - " },\n", - " \"energies\": {\"name\": \"energy|diff\", \"unit\": \"eV\"},\n", + " \"polarization_change\": {\"name\": \"polarization.vector\", \"unit\": \"µC/cm²\", \"fields\": [\"a\", \"b\", \"c\"]},\n", + " \"polarization_quanta\": {\"name\":\"polarization.quanta\", \"unit\":\"µC/cm²\", \"fields\": [\"a\", \"b\", \"c\"]},\n", + " \"energies\": {\"name\":\"energy|diff\", \"unit\":\"eV\"},\n", " \"search_id\": {\"name\": \"workflow.id|search\", \"unit\": \"\"},\n", - " \"workflow_status\": {\"name\": \"workflow.status\", \"unit\": None},\n", - " \"category\": {\"name\": \"workflow.category\", \"unit\": None}, # dynamic\n", + " \"workflow_status\": {\"name\": \"workflow.status\",\"unit\":None},\n", + " \"category\": {\"name\": \"workflow.category\", \"unit\": None}, # dynamic\n", " \"distortion.dmax\": {\"name\": \"distortion.dmax.before\", \"unit\": \"Å\"},\n", " \"calculated_max_distance\": {\"name\": \"distortion.dmax.after\", \"unit\": \"Å\"},\n", - " # \"distortion.delta\": {\"name\": \"distortion.delta\", \"unit\": \"\"},\n", - " # \"distortion.dav\": {\"name\": \"distortion.dav\", \"unit\": \"\"},\n", - " # \"distortion.s\": {\"name\": \"distortion.s\", \"unit\": \"\"},\n", + "# \"distortion.delta\": {\"name\": \"distortion.delta\", \"unit\": \"\"},\n", + "# \"distortion.dav\": {\"name\": \"distortion.dav\", \"unit\": \"\"},\n", + "# \"distortion.s\": {\"name\": \"distortion.s\", \"unit\": \"\"},\n", " \"bandgaps\": {\"name\": \"bandgap\", \"unit\": \"eV\"},\n", - " # \"nonpolar_band_gap\": {\"name\": \"nonpolar.bandgap\", \"unit\": \"eV\"},\n", + "# \"nonpolar_band_gap\": {\"name\": \"nonpolar.bandgap\", \"unit\": \"eV\"},\n", " \"nonpolar_icsd\": {\"name\": \"nonpolar.icsd\", \"unit\": \"\"},\n", " \"nonpolar_id\": {\"name\": \"nonpolar.mpid\", \"unit\": None},\n", " \"nonpolar_spacegroup\": {\"name\": \"nonpolar.spacegroup\", \"unit\": \"\"},\n", - " # \"polar_band_gap\": {\"name\": \"polar.bandgap\", \"unit\": \"eV\"},\n", + "# \"polar_band_gap\": {\"name\": \"polar.bandgap\", \"unit\": \"eV\"},\n", " \"polar_icsd\": {\"name\": \"polar.icsd\", \"unit\": \"\"},\n", " \"polar_id\": {\"name\": \"polar.mpid\", \"unit\": None},\n", - " \"polar_spacegroup\": {\"name\": \"polar.spacegroup\", \"unit\": \"\"},\n", - " \"energies_per_atom_max_spline_jumps\": {\n", - " \"name\": \"energies.jumps|max\",\n", - " \"unit\": \"eV/atom\",\n", - " },\n", + " \"polar_spacegroup\": {\"name\": \"polar.spacegroup\", \"unit\": \"\"}, \n", + " \"energies_per_atom_max_spline_jumps\": {\"name\": \"energies.jumps|max\", \"unit\": \"eV/atom\"},\n", " \"energies_per_atom_smoothness\": {\"name\": \"energies.smoothness\", \"unit\": \"eV/atom\"},\n", - " \"polarization_max_spline_jumps\": {\n", - " \"name\": \"polarizations.jumps\",\n", - " \"fields\": {\"max\": \"µC/cm²\", \"index\": \"\"},\n", - " },\n", - " \"polarization_smoothness\": {\n", - " \"name\": \"polarizations.smoothness\",\n", - " \"fields\": {\"max\": \"µC/cm²\", \"index\": \"\"},\n", - " },\n", + " \"polarization_max_spline_jumps\": {\"name\": \"polarizations.jumps\", \"fields\": {\"max\": \"µC/cm²\", \"index\": \"\"}},\n", + " \"polarization_smoothness\": {\"name\": \"polarizations.smoothness\", \"fields\": {\"max\": \"µC/cm²\", \"index\": \"\"}},\n", "}" ] }, @@ -133,36 +117,27 @@ "outputs": [], "source": [ "def get_category(wf):\n", - " if (\n", - " wf[\"polarization_len\"] == 10\n", - " and \"polarization_max_spline_jumps\" in wf\n", - " and np.all(np.array(wf[\"polarization_max_spline_jumps\"]) <= 1)\n", - " and wf[\"energies_per_atom_max_spline_jumps\"] <= 1e-2\n", - " ):\n", + " if (wf['polarization_len'] == 10 and\n", + " 'polarization_max_spline_jumps' in wf and\n", + " np.all(np.array(wf['polarization_max_spline_jumps']) <= 1) and\n", + " wf['energies_per_atom_max_spline_jumps'] <= 1e-2):\n", " return \"smooth\"\n", - "\n", - " elif (\n", - " wf[\"polarization_len\"] == 10\n", - " and \"polarization_change_norm\" in wf\n", - " and \"polarization_max_spline_jumps\" in wf\n", - " and (\n", - " wf[\"energies_per_atom_max_spline_jumps\"] > 1e-2\n", - " or np.any(np.array(wf[\"polarization_max_spline_jumps\"]) > 1)\n", - " )\n", - " ):\n", + " \n", + " elif (wf['polarization_len'] == 10 and\n", + " 'polarization_change_norm' in wf and\n", + " 'polarization_max_spline_jumps' in wf and\n", + " (wf['energies_per_atom_max_spline_jumps'] > 1e-2 or\n", + " np.any(np.array(wf['polarization_max_spline_jumps']) > 1))):\n", " return \"unsmooth\"\n", - "\n", - " elif (\n", - " wf[\"static_len\"] == 10\n", - " and \"polarization_change_norm\" not in wf\n", - " and wf[\"workflow_status\"] in (\"COMPLETED\", \"DEFUSED\")\n", - " ):\n", + " \n", + " elif (wf['static_len'] == 10 and\n", + " 'polarization_change_norm' not in wf and\n", + " wf['workflow_status'] in (\"COMPLETED\",\"DEFUSED\")):\n", " return \"static\"\n", - "\n", - " elif (wf[\"polarization_len\"] < 10 or \"polarization_change_norm\" not in wf) and (\n", - " (wf[\"workflow_status\"] == \"DEFUSED\" and wf[\"static_len\"] < 10)\n", - " or wf[\"workflow_status\"] in (\"FIZZLED\", \"RUNNING\")\n", - " ):\n", + " \n", + " elif ((wf['polarization_len'] < 10 or 'polarization_change_norm' not in wf) and\n", + " ((wf['workflow_status'] == \"DEFUSED\" and wf['static_len'] < 10) or\n", + " wf['workflow_status'] in (\"FIZZLED\",\"RUNNING\"))):\n", " return \"incomplete\"" ] }, @@ -180,24 +155,22 @@ "for distortion in distortions:\n", " k1, k2 = distortion[\"nonpolar_id\"], distortion[\"polar_id\"]\n", " key = f\"{k1}_{k2}\"\n", - " contribs_distortions[key] = {\"data\": {}} # , \"structures\": [], \"attachments\": []}\n", - "\n", + " contribs_distortions[key] = {\"data\": {}}#, \"structures\": [], \"attachments\": []}\n", + " \n", " for k, v in flatten(distortion, reducer=\"dot\", max_flatten_depth=2).items():\n", " if k.endswith(\"_pre\") or k.startswith(\"_id\"):\n", - " continue\n", + " continue \n", " elif not isinstance(v, (dict, list)):\n", " conf = columns.get(k)\n", " if conf:\n", " name, unit = conf[\"name\"], conf[\"unit\"]\n", - " dec = conf.get(\"dec\", \"\")\n", - " contribs_distortions[key][\"data\"][name] = (\n", - " f\"{float(v):{dec}} {unit}\" if unit else v\n", - " )\n", + " dec = conf.get('dec', '')\n", + " contribs_distortions[key][\"data\"][name] = f\"{float(v):{dec}} {unit}\" if unit else v\n", "# elif isinstance(v, dict) and \"@class\" in v and v[\"@class\"] == \"Structure\":\n", "# structure = Structure.from_dict(v)\n", "# structure.name = k\n", "# contribs_distortions[key][\"structures\"].append(structure)\n", - "\n", + " \n", "# attm = Attachment.from_data(\"distortion\", distortion)\n", "# contribs_distortions[key][\"attachments\"].append(attm)" ] @@ -228,53 +201,49 @@ "\n", "for wf in workflow_data:\n", " k1, k2 = wf[\"nonpolar_id\"], wf[\"polar_id\"]\n", - " key = f\"{k1}_{k2}\" # NOTE could also use search_id for this\n", + " key = f\"{k1}_{k2}\" # NOTE could also use search_id for this\n", " distortion = contribs_distortions[key]\n", " contrib = {\n", - " \"identifier\": wf[\"wfid\"],\n", - " \"formula\": wf[\"pretty_formula\"],\n", + " \"identifier\": wf[\"wfid\"], \"formula\": wf[\"pretty_formula\"],\n", " \"data\": contribs_distortions[key][\"data\"],\n", - " # \"structures\": contribs_distortions[key][\"structures\"],\n", - " # \"attachments\": contribs_distortions[key][\"attachments\"]\n", + "# \"structures\": contribs_distortions[key][\"structures\"],\n", + "# \"attachments\": contribs_distortions[key][\"attachments\"]\n", " }\n", - " contrib[\"data\"][\"workflow.category\"] = get_category(wf)\n", + " contrib['data']['workflow.category'] = get_category(wf)\n", " if ids and wf[\"wfid\"] in ids:\n", " contrib[\"id\"] = ids[wf[\"wfid\"]]\n", - "\n", - " # for k in structure_keys:\n", - " # if k in wf:\n", - " # structure = Structure.from_dict(wf[k])\n", - " # structure.name = k\n", - " # contrib[\"structures\"].append(structure)\n", - "\n", + " \n", + "# for k in structure_keys:\n", + "# if k in wf:\n", + "# structure = Structure.from_dict(wf[k])\n", + "# structure.name = k\n", + "# contrib[\"structures\"].append(structure)\n", + " \n", " for k, v in flatten(wf, reducer=\"dot\").items():\n", " conf = columns.get(k)\n", - " if conf and k.startswith(\"polarization\") and isinstance(v, list):\n", + " if conf and k.startswith('polarization') and isinstance(v, list):\n", " name, fields = conf[\"name\"], conf[\"fields\"]\n", " contrib[\"data\"].setdefault(name, {})\n", - " if \"unit\" not in conf:\n", + " if not \"unit\" in conf:\n", " vmax, unit = max(v), fields[\"max\"]\n", - " contrib[\"data\"][name][\"max\"] = f\"{round(vmax, 3)} {unit}\" if unit else v\n", - " contrib[\"data\"][name][\"index\"] = v.index(vmax)\n", + " contrib[\"data\"][name]['max'] = f\"{round(vmax, 3)} {unit}\" if unit else v\n", + " contrib[\"data\"][name]['index'] = v.index(vmax)\n", " else:\n", " unit = conf[\"unit\"]\n", " contrib[\"data\"][name] = {\n", - " i: f\"{j} {unit}\" for i, j in zip(conf[\"fields\"], v[0])\n", + " i: f\"{j} {unit}\"\n", + " for i, j in zip(conf[\"fields\"], v[0])\n", " }\n", - " elif conf and k == \"energies_per_atom\":\n", + " elif conf and k == 'energies_per_atom':\n", " name, unit = conf[\"name\"], conf[\"unit\"]\n", " ediff = v[0] - v[-1]\n", - " contrib[\"data\"][name] = f\"{ediff:.3g} {unit}\"\n", - " elif conf and k == \"bandgaps\":\n", + " contrib[\"data\"][name] = f\"{ediff:.3g} {unit}\" \n", + " elif conf and k == 'bandgaps':\n", " name, unit = conf[\"name\"], conf[\"unit\"]\n", " contrib[\"data\"].setdefault(name, {})\n", " contrib[\"data\"][name][\"nonpolar\"] = f\"{v[0]:.3g} {unit}\"\n", " contrib[\"data\"][name][\"polar\"] = f\"{v[-1]:.3g} {unit}\"\n", - " elif (\n", - " k.startswith((\"_id\", \"cid\"))\n", - " or isinstance(v, list)\n", - " or k.startswith(structure_keys)\n", - " ):\n", + " elif k.startswith((\"_id\", \"cid\")) or isinstance(v, list) or k.startswith(structure_keys):\n", " continue\n", " elif conf:\n", " name, unit = conf[\"name\"], conf[\"unit\"]\n", @@ -282,12 +251,12 @@ " contrib[\"data\"][name] = f\"{v:.1g} {unit}\" if unit else v\n", " else:\n", " contrib[\"data\"][name] = f\"{v:.3g} {unit}\" if unit else v\n", - "\n", - " # attm = Attachment.from_data(\"workflow\", wf)\n", - " # contrib[\"attachments\"].append(attm)\n", + " \n", + "# attm = Attachment.from_data(\"workflow\", wf)\n", + "# contrib[\"attachments\"].append(attm)\n", " contrib[\"data\"] = unflatten(contrib[\"data\"], splitter=\"dot\")\n", " contributions.append(contrib)\n", - "\n", + " \n", "len(contributions)" ] }, @@ -324,7 +293,7 @@ "metadata": {}, "outputs": [], "source": [ - "# client.delete_contributions()\n", + "#client.delete_contributions()\n", "client.init_columns({})\n", "client.init_columns(columns_map)" ] diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/gbdb.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/gbdb.ipynb index 809d45d359..315384b0ea 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/gbdb.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/gbdb.ipynb @@ -24,7 +24,7 @@ "metadata": {}, "outputs": [], "source": [ - "client = Client(project=\"gbdb\") # set your API key via the `apikey` keyword argument" + "client = Client(project=\"gbdb\") # set your API key via the `apikey` keyword argument" ] }, { @@ -53,7 +53,7 @@ " \"repetitions\": \"number of repetitions of the base structure in x/y direction\",\n", " \"temperature\": \"temperature of MD simulation in Kelvin\",\n", " \"steps\": \"number of steps of MD simulation\",\n", - " \"potential\": \"classical potential used\",\n", + " \"potential\": \"classical potential used\"\n", "}\n", "client.update_project({\"other\": other})" ] @@ -75,8 +75,8 @@ "source": [ "# initialize columns\n", "columns = {\n", - " \"element\": None, # string\n", - " \"indices.h\": \"\", # dimensionless\n", + " \"element\": None, # string\n", + " \"indices.h\": \"\", # dimensionless\n", " \"indices.k\": \"\",\n", " \"indices.l\": \"\",\n", " \"boundary\": None,\n", @@ -88,7 +88,7 @@ " \"repetitions.y\": \"\",\n", " \"temperature\": \"K\",\n", " \"steps\": \"\",\n", - " \"potential\": None,\n", + " \"potential\": None\n", "}\n", "client.init_columns(columns)" ] @@ -107,7 +107,7 @@ " spec = [elem for i in range(dump.natoms)]\n", " df = dump.data.copy()\n", " df.drop(df.tail(1).index, inplace=True)\n", - " pos = df[[\"x\", \"y\", \"z\"]].to_numpy()\n", + " pos = df[['x', 'y', 'z']].to_numpy()\n", " return Structure(lattice=lat, species=spec, coords=pos, coords_are_cartesian=True)" ] }, @@ -120,16 +120,14 @@ "source": [ "# prep contributions\n", "contributions = []\n", - "indir = Path(\n", - " \"/Users/patrick/GoogleDriveLBNL/My Drive/MaterialsProject/gitrepos/mpcontribs-data/gbdb\"\n", - ")\n", + "indir = Path(\"/Users/patrick/GoogleDriveLBNL/My Drive/MaterialsProject/gitrepos/mpcontribs-data/gbdb\")\n", "keys = list(k for k in columns.keys() if not k.startswith(\"indices\"))\n", "keys.insert(1, \"indices\")\n", "\n", "for path in indir.glob(\"lammps_*\"):\n", " identifier = hashlib.md5(path.name.encode(\"utf-8\")).hexdigest()\n", " contrib = {\"identifier\": identifier, \"data\": {}}\n", - "\n", + " \n", " for idx, part in enumerate(path.name.split(\"_\")[1:]):\n", " if idx == 1:\n", " contrib[\"data\"][\"indices\"] = {k: int(v) for k, v in zip(\"hkl\", part)}\n", @@ -137,7 +135,7 @@ " key = keys[idx]\n", " unit = columns[key]\n", " contrib[\"data\"][key] = f\"{part} {unit}\" if unit else part\n", - "\n", + " \n", " contrib[\"data\"] = unflatten(contrib[\"data\"], splitter=\"dot\")\n", " structure = get_structure(contrib[\"data\"][\"element\"], path)\n", " contrib[\"formula\"] = structure.composition.reduced_formula\n", @@ -170,9 +168,7 @@ "source": [ "# submit contributions\n", "client.submit_contributions(contributions)\n", - "client.init_columns(\n", - " columns\n", - ") # this should not be needed but doesn't hurt, possible API bug" + "client.init_columns(columns) # this should not be needed but doesn't hurt, possible API bug" ] }, { @@ -190,7 +186,7 @@ "metadata": {}, "outputs": [], "source": [ - "# client._reinit() # only needed if data just uploaded\n", + "#client._reinit() # only needed if data just uploaded\n", "ncontribs, _ = client.get_totals()\n", "ncontribs" ] @@ -215,12 +211,10 @@ "source": [ "query = {\"data__boundary__exact\": \"tilt\", \"data__n__value__gt\": 0}\n", "count, _ = client.get_totals(query=query)\n", - "print(f\"grain boundaries of type tilt and n>0: {count / ncontribs * 100:.1f}%\")\n", + "print(f\"grain boundaries of type tilt and n>0: {count/ncontribs*100:.1f}%\")\n", "fields = [\"identifier\", \"formula\", \"data.energy.value\", \"data.potential\"]\n", "sort = \"data.energy.value\"\n", - "contribs = client.query_contributions(\n", - " query=query, fields=fields, sort=sort, paginate=True\n", - ")\n", + "contribs = client.query_contributions(query=query, fields=fields, sort=sort, paginate=True)\n", "pd.json_normalize(contribs[\"data\"])" ] } diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/get_started.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/get_started.ipynb index b35a15ce45..049498fcd0 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/get_started.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/get_started.ipynb @@ -60,7 +60,7 @@ "outputs": [], "source": [ "db = DB.Database(\"refractive.db\")\n", - "# db.create_database_from_url()" + "#db.create_database_from_url()" ] }, { @@ -149,11 +149,11 @@ " formula = info[\"book\"]\n", " mpid = mpr.get_materials_ids(formula)[0]\n", "\n", - " rmin, rmax = info[\"rangeMin\"] * 1000, info[\"rangeMax\"] * 1000\n", + " rmin, rmax = info['rangeMin']*1000, info['rangeMax']*1000\n", " mid = (rmin + rmax) / 2\n", " n = mat.get_refractiveindex(mid)\n", " k = mat.get_extinctioncoefficient(mid)\n", - "\n", + " \n", " x = \"wavelength λ [μm]\"\n", " refrac = DataFrame(mat.get_complete_refractive(), columns=[x, \"n\"])\n", " refrac.set_index(x, inplace=True)\n", @@ -164,9 +164,9 @@ " df.attrs[\"title\"] = f\"Complex refractive index (n+ik) for {formula}\"\n", " df.attrs[\"labels\"] = {\n", " \"value\": \"n, k\", # y-axis label\n", - " \"variable\": \"Re/Im\", # legend name (= df.columns.name)\n", + " \"variable\": \"Re/Im\" # legend name (= df.columns.name)\n", " }\n", - " df.plot(**df.attrs) # .show()\n", + " df.plot(**df.attrs)#.show()\n", " df.attrs[\"name\"] = \"n,k(λ)\"\n", " return {\n", " \"project\": name,\n", @@ -178,9 +178,9 @@ " \"range.mid\": f\"{mid} nm\",\n", " \"range.max\": f\"{rmax} nm\",\n", " \"points\": info[\"points\"],\n", - " \"page\": info[\"page\"],\n", + " \"page\": info[\"page\"]\n", " },\n", - " \"tables\": [df],\n", + " \"tables\": [df]\n", " }" ] }, @@ -208,7 +208,10 @@ "metadata": {}, "outputs": [], "source": [ - "client = Client(host=\"workshop-contribs-api.materialsproject.org\", apikey=apikey)" + "client = Client(\n", + " host=\"workshop-contribs-api.materialsproject.org\",\n", + " apikey=apikey\n", + ")" ] }, { @@ -227,21 +230,18 @@ "outputs": [], "source": [ "update = {\n", - " \"unique_identifiers\": False,\n", - " \"references\": [\n", - " {\"label\": \"website\", \"url\": \"https://refractiveindex.info\"},\n", - " {\n", - " \"label\": \"source\",\n", - " \"url\": \"https://refractiveindex.info/download/database/rii-database-2019-02-11.zip\",\n", - " },\n", + " 'unique_identifiers': False,\n", + " 'references': [\n", + " {'label': 'website', 'url': 'https://refractiveindex.info'},\n", + " {'label': 'source', 'url': \"https://refractiveindex.info/download/database/rii-database-2019-02-11.zip\"}\n", " ],\n", - " \"other\": { # describe the root fields here to automatically include tooltips on MP\n", + " \"other\": { # describe the root fields here to automatically include tooltips on MP\n", " \"n\": \"real part of complex refractive index\",\n", " \"k\": \"imaginary part of complex refractive index\",\n", " \"range\": \"wavelength range for n,k in nm\",\n", " \"points\": \"number of λ points in range\",\n", - " \"page\": \"reference to data source/publication\",\n", - " },\n", + " \"page\": \"reference to data source/publication\"\n", + " }\n", "}\n", "# could also update authors, title, long_title, description" ] @@ -280,18 +280,15 @@ "metadata": {}, "outputs": [], "source": [ - "client.init_columns(\n", - " name,\n", - " {\n", - " \"n\": \"\", # dimensionless\n", - " \"k\": \"\",\n", - " \"range.min\": \"nm\",\n", - " \"range.mid\": \"nm\",\n", - " \"range.max\": \"nm\",\n", - " \"points\": \"\",\n", - " \"page\": None, # text\n", - " },\n", - ")" + "client.init_columns(name, {\n", + " \"n\": \"\", # dimensionless\n", + " \"k\": \"\",\n", + " \"range.min\": \"nm\",\n", + " \"range.mid\": \"nm\",\n", + " \"range.max\": \"nm\",\n", + " \"points\": \"\",\n", + " \"page\": None # text \n", + "})" ] }, { @@ -394,7 +391,10 @@ "outputs": [], "source": [ "all_ids = client.get_all_ids(\n", - " {\"project\": name}, include=[\"tables\"], data_id_fields={name: \"page\"}, fmt=\"map\"\n", + " {\"project\": name},\n", + " include=[\"tables\"],\n", + " data_id_fields={name: \"page\"},\n", + " fmt=\"map\"\n", ")" ] }, @@ -439,18 +439,18 @@ "query = {\n", " \"project\": name,\n", " \"formula__contains\": \"Au\",\n", - " # \"identifier__in\": []\n", + " #\"identifier__in\": []\n", + "\n", " \"data__n__value__lt\": 200,\n", " \"data__k__value__gte\": 7,\n", + "\n", " \"_sort\": \"-data__range__mid__value\",\n", " \"_fields\": [\n", - " \"id\",\n", - " \"identifier\",\n", - " \"formula\",\n", + " \"id\", \"identifier\", \"formula\",\n", " \"data.range.mid.value\",\n", " \"data.n.value\",\n", - " \"data.k.value\",\n", - " ],\n", + " \"data.k.value\"\n", + " ]\n", "}\n", "\n", "print(client.get_totals(query))\n", diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/intermatch.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/intermatch.ipynb index b1df676413..8eb5bfd12f 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/intermatch.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/intermatch.ipynb @@ -46,14 +46,11 @@ " \"identifier\": \"mp-48\",\n", " \"data\": {\n", " \"interface\": \"mp-22850\",\n", - " \"Δn\": 1.3,\n", - " \"ε\": 3.6199,\n", - " \"atoms\": 208,\n", - " \"θ\": \"0 °\",\n", + " \"Δn\": 1.3, \"ε\": 3.6199, \"atoms\": 208, \"θ\": \"0 °\",\n", " \"surface\": {\"N₁\": 40, \"N₂\": 6, \"ratio\": 6.666},\n", " \"v₁\": {\"i₁₁\": -8, \"i₁₂\": 8, \"i₂₁\": -3, \"i₂₂\": 3},\n", - " \"v₂\": {\"j₁₁\": -13, \"j₁₂\": 8, \"j₂₁\": -5, \"j₂₂\": 3},\n", - " },\n", + " \"v₂\": {\"j₁₁\": -13, \"j₁₂\": 8, \"j₂₁\": -5, \"j₂₂\": 3}\n", + " }\n", " }\n", "]" ] diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ion_ref_data.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ion_ref_data.ipynb index ca14d3f31a..4543e68cdb 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ion_ref_data.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ion_ref_data.ipynb @@ -29,7 +29,7 @@ "outputs": [], "source": [ "from pprint import pprint\n", - "from monty.serialization import loadfn\n", + "from monty.serialization import loadfn, dumpfn\n", "from pymatgen.core.ion import Ion" ] }, @@ -87,11 +87,13 @@ " if e[\"Name\"] == \"HGaO2[2-]\":\n", " ion_ref_data[i] = {\n", " \"Energy\": -7.1099,\n", - " \"Major_Elements\": [\"Ga\"],\n", + " \"Major_Elements\": [\n", + " \"Ga\"\n", + " ],\n", " \"Name\": \"HGaO3[2-]\",\n", " \"Reference Solid\": \"Ga2O3\",\n", " \"Reference solid energy\": -10.347724703224722,\n", - " \"Source\": \"D. D. Wagman et al., Selected values for inorganic and C1 and C2 Organic substances in SI units, The NBS table of chemical thermodynamic properties, Washington (1982)\",\n", + " \"Source\": \"D. D. Wagman et al., Selected values for inorganic and C1 and C2 Organic substances in SI units, The NBS table of chemical thermodynamic properties, Washington (1982)\"\n", " }\n", " print(\"Replaced entry at index {}\".format(i))" ] @@ -119,8 +121,7 @@ "outputs": [], "source": [ "from mpcontribs.client import Client\n", - "\n", - "name = \"ion_ref_data\" # this should be your project, see from the project URL\n", + "name = 'ion_ref_data' # this should be your project, see from the project URL\n", "client = Client()" ] }, @@ -137,7 +138,7 @@ "metadata": {}, "outputs": [], "source": [ - "ion_contribs = []\n", + "ion_contribs =[]\n", "\n", "for d in ion_ref_data:\n", " ret = {}\n", @@ -146,16 +147,12 @@ " ret[\"identifier\"] = d[\"Name\"]\n", " ret[\"data\"] = {}\n", " ret[\"data\"][\"charge\"] = Ion.from_formula(d[\"Name\"]).charge\n", - " ret[\"data\"][\"ΔGᶠ\"] = \"{:.5g} kJ/mol\".format(\n", - " d[\"Energy\"] * 96.485\n", - " ) # convert from eV/f.u. to kJ/mol\n", + " ret[\"data\"][\"ΔGᶠ\"] = \"{:.5g} kJ/mol\".format(d[\"Energy\"]*96.485) # convert from eV/f.u. to kJ/mol\n", " ret[\"data\"][\"MajElements\"] = d[\"Major_Elements\"][0]\n", " ret[\"data\"][\"RefSolid\"] = d[\"Reference Solid\"]\n", - " ret[\"data\"][\"ΔGᶠRefSolid\"] = \"{:.4g} kJ/mol\".format(\n", - " d[\"Reference solid energy\"] * 96.485\n", - " ) # convert from eV/f.u. to kJ/mol\n", + " ret[\"data\"][\"ΔGᶠRefSolid\"] = \"{:.4g} kJ/mol\".format(d[\"Reference solid energy\"]*96.485)# convert from eV/f.u. to kJ/mol\n", " ret[\"data\"][\"reference\"] = d[\"Source\"]\n", - "\n", + " \n", " ion_contribs.append(ret)" ] }, @@ -192,20 +189,18 @@ "outputs": [], "source": [ "client.projects.update_entry(\n", - " pk=\"ion_ref_data\",\n", - " project={\n", - " \"other\": {\n", - " \"formula\": \"Chemical formula of the aqueous species\",\n", - " \"charge\": \"Charge on the aqueous species\",\n", - " \"ΔGᶠ\": \"Gibbs free energy of formation of the aqueous species from the elements\",\n", - " \"MajElementsᶠ\": None,\n", - " \"MajElements\": \"Elements contained in the aqueous species\",\n", - " \"RefSolid\": \"Solid compound to which the aqueous species energy is referenced\",\n", - " \"ΔGᶠRefSolid\": \"Gibbs free energy of formation of the reference solid compound\",\n", - " \"Ion\": None,\n", - " },\n", - " \"description\": \"This project contains experimental ion dissolution energies that are used by pymatgen when constructing Pourbaix diagrams. See the Persson2012 reference for a detailed description of the thermodynamic framework used.\",\n", - " },\n", + " pk=\"ion_ref_data\", project={\"other\": \n", + " {\"formula\": \"Chemical formula of the aqueous species\",\n", + " \"charge\": \"Charge on the aqueous species\",\n", + " \"ΔGᶠ\": \"Gibbs free energy of formation of the aqueous species from the elements\",\n", + " \"MajElementsᶠ\": None,\n", + " \"MajElements\": \"Elements contained in the aqueous species\",\n", + " \"RefSolid\": \"Solid compound to which the aqueous species energy is referenced\",\n", + " \"ΔGᶠRefSolid\": \"Gibbs free energy of formation of the reference solid compound\",\n", + " \"Ion\": None\n", + " },\n", + " \"description\": \"This project contains experimental ion dissolution energies that are used by pymatgen when constructing Pourbaix diagrams. See the Persson2012 reference for a detailed description of the thermodynamic framework used.\"\n", + " }\n", ").result()" ] }, @@ -216,10 +211,8 @@ "outputs": [], "source": [ "client.projects.update_entry(\n", - " pk=\"ion_ref_data\",\n", - " project={\n", - " \"authors\": \"Various authors (see references). Data compiled by the Materials Project team.\"\n", - " },\n", + " pk=\"ion_ref_data\", project={\"authors\": \"Various authors (see references). Data compiled by the Materials Project team.\"\n", + " }\n", ").result()" ] }, @@ -230,7 +223,8 @@ "outputs": [], "source": [ "client.projects.update_entry(\n", - " pk=\"ion_ref_data\", project={\"title\": \"Aqueous Ion Reference Data\"}\n", + " pk=\"ion_ref_data\", project={\"title\": \"Aqueous Ion Reference Data\"\n", + " }\n", ").result()" ] }, @@ -241,51 +235,18 @@ "outputs": [], "source": [ "client.projects.update_entry(\n", - " pk=\"ion_ref_data\",\n", - " project={\n", - " \"references\": [\n", - " {\n", - " \"label\": \"Persson2012\",\n", - " \"url\": \"https://doi.org/10.1103/PhysRevB.85.235438\",\n", - " },\n", - " {\n", - " \"label\": \"NBS1\",\n", - " \"url\": \"https://nvlpubs.nist.gov/nistpubs/Legacy/TN/nbstechnicalnote270-1.pdf\",\n", - " },\n", - " {\n", - " \"label\": \"NBS2\",\n", - " \"url\": \"https://nvlpubs.nist.gov/nistpubs/Legacy/TN/nbstechnicalnote270-2.pdf\",\n", - " },\n", - " {\n", - " \"label\": \"NBS3\",\n", - " \"url\": \"https://nvlpubs.nist.gov/nistpubs/Legacy/TN/nbstechnicalnote270-3.pdf\",\n", - " },\n", - " {\n", - " \"label\": \"NBS4\",\n", - " \"url\": \"https://nvlpubs.nist.gov/nistpubs/Legacy/TN/nbstechnicalnote270-4.pdf\",\n", - " },\n", - " {\n", - " \"label\": \"NBS5\",\n", - " \"url\": \"https://nvlpubs.nist.gov/nistpubs/Legacy/TN/nbstechnicalnote270-5.pdf\",\n", - " },\n", - " {\n", - " \"label\": \"NBS6\",\n", - " \"url\": \"https://nvlpubs.nist.gov/nistpubs/Legacy/TN/nbstechnicalnote270-6.pdf\",\n", - " },\n", - " {\n", - " \"label\": \"NBS7\",\n", - " \"url\": \"https://nvlpubs.nist.gov/nistpubs/Legacy/TN/nbstechnicalnote270-7.pdf\",\n", - " },\n", - " {\n", - " \"label\": \"NBS8\",\n", - " \"url\": \"https://nvlpubs.nist.gov/nistpubs/Legacy/TN/nbstechnicalnote270-8.pdf\",\n", - " },\n", - " {\n", - " \"label\": \"Pourbaix\",\n", - " \"url\": \"https://www.worldcat.org/title/atlas-of-electrochemical-equilibria-in-aqueous-solutions/oclc/563921897\",\n", - " },\n", - " ]\n", - " },\n", + " pk=\"ion_ref_data\", project={\"references\": [\n", + " {\"label\":\"Persson2012\", 'url':\"https://doi.org/10.1103/PhysRevB.85.235438\"},\n", + " {'label': 'NBS1', 'url': 'https://nvlpubs.nist.gov/nistpubs/Legacy/TN/nbstechnicalnote270-1.pdf'},\n", + " {'label': 'NBS2', 'url': 'https://nvlpubs.nist.gov/nistpubs/Legacy/TN/nbstechnicalnote270-2.pdf'},\n", + " {'label': 'NBS3', 'url': 'https://nvlpubs.nist.gov/nistpubs/Legacy/TN/nbstechnicalnote270-3.pdf'},\n", + " {'label': 'NBS4', 'url': 'https://nvlpubs.nist.gov/nistpubs/Legacy/TN/nbstechnicalnote270-4.pdf'},\n", + " {'label': 'NBS5', 'url': 'https://nvlpubs.nist.gov/nistpubs/Legacy/TN/nbstechnicalnote270-5.pdf'},\n", + " {'label': 'NBS6', 'url': 'https://nvlpubs.nist.gov/nistpubs/Legacy/TN/nbstechnicalnote270-6.pdf'},\n", + " {'label': 'NBS7', 'url': 'https://nvlpubs.nist.gov/nistpubs/Legacy/TN/nbstechnicalnote270-7.pdf'},\n", + " {'label': 'NBS8', 'url': 'https://nvlpubs.nist.gov/nistpubs/Legacy/TN/nbstechnicalnote270-8.pdf'},\n", + " {\"label\":\"Pourbaix\", 'url':\"https://www.worldcat.org/title/atlas-of-electrochemical-equilibria-in-aqueous-solutions/oclc/563921897\"}]\n", + " }\n", ").result()" ] }, @@ -321,7 +282,7 @@ "# need to delete contributions first due to unique_identifiers=False\n", "client.delete_contributions(name)\n", "client.submit_contributions(ion_contribs, per_page=10, skip_dupe_check=True)\n", - "# client.contributions.create_entries(contributions=ion_contribs[0:100]).result()" + "#client.contributions.create_entries(contributions=ion_contribs[0:100]).result()" ] }, { diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/jarvis_dft.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/jarvis_dft.ipynb index 3de2a4beaf..bb08b09503 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/jarvis_dft.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/jarvis_dft.ipynb @@ -6,9 +6,7 @@ "metadata": {}, "outputs": [], "source": [ - "import os\n", - "import json\n", - "import tarfile\n", + "import os, json, tarfile\n", "from mpcontribs.client import Client\n", "from urllib.request import urlretrieve\n", "from monty.json import MontyDecoder\n", @@ -22,7 +20,7 @@ "metadata": {}, "outputs": [], "source": [ - "name = \"jarvis_dft\"\n", + "name = 'jarvis_dft'\n", "client = Client()" ] }, @@ -59,22 +57,22 @@ "metadata": {}, "outputs": [], "source": [ - "dimensions = [\"2d\", \"3d\"]\n", + "dimensions = ['2d', '3d']\n", "tgz = \"jdft_{}.json.tgz\"\n", "config = {\n", " \"file\": f\"https://www.ctcms.nist.gov/~knc6/{tgz}\",\n", " \"details\": \"https://www.ctcms.nist.gov/~knc6/jsmol/{}.html\",\n", - " \"columns\": { # 'mpid'\n", - " \"jid\": {\"name\": \"details\"},\n", - " \"fin_en\": {\"name\": \"E\", \"unit\": \"meV\"},\n", - " \"exfoliation_en\": {\"name\": \"Eₓ\", \"unit\": \"eV\"},\n", - " \"form_enp\": {\"name\": \"ΔH\", \"unit\": \"eV\"},\n", - " \"op_gap\": {\"name\": \"ΔEⱽᴰᵂ\", \"unit\": \"meV\"},\n", - " \"mbj_gap\": {\"name\": \"ΔEᴹᴮᴶ\", \"unit\": \"meV\"},\n", - " \"kv\": {\"name\": \"Kᵥ\", \"unit\": \"GPa\"},\n", - " \"gv\": {\"name\": \"Gᵥ\", \"unit\": \"GPa\"},\n", - " \"magmom\": {\"name\": \"µ\", \"unit\": \"µᵇ\"},\n", - " },\n", + " 'columns': { # 'mpid'\n", + " 'jid': {'name': 'details'},\n", + " 'fin_en': {'name': 'E', 'unit': 'meV'},\n", + " 'exfoliation_en': {'name': 'Eₓ', 'unit': 'eV'},\n", + " 'form_enp': {'name': 'ΔH', 'unit': 'eV'},\n", + " 'op_gap': {'name': 'ΔEⱽᴰᵂ', 'unit': 'meV'},\n", + " 'mbj_gap': {'name': 'ΔEᴹᴮᴶ', 'unit': 'meV'},\n", + " 'kv': {'name': 'Kᵥ', 'unit': 'GPa'},\n", + " 'gv': {'name': 'Gᵥ', 'unit': 'GPa'},\n", + " 'magmom': {'name': 'µ', 'unit': 'µᵇ'}\n", + " }\n", "}" ] }, @@ -89,17 +87,17 @@ "\n", "for dim in dimensions:\n", " url = config[\"file\"].format(dim)\n", - " dbfile = url.rsplit(\"/\")[-1]\n", + " dbfile = url.rsplit('/')[-1]\n", " dbpath = os.path.join(dbdir, dbfile)\n", - "\n", + " \n", " if not os.path.exists(dbpath):\n", - " print(\"downloading\", dbpath, \"...\")\n", + " print('downloading', dbpath, '...')\n", " urlretrieve(url, dbpath)\n", "\n", " with tarfile.open(dbpath, \"r:gz\") as tar:\n", " member = tar.getmembers()[0]\n", " raw_data[dim] = json.load(tar.extractfile(member), cls=MontyDecoder)\n", - "\n", + " \n", " print(dim, len(raw_data[dim]))" ] }, @@ -123,16 +121,15 @@ " for dim in dimensions:\n", " for rd in raw_data[dim]:\n", " contrib = {\n", - " \"project\": name,\n", - " \"is_public\": True,\n", - " \"identifier\": rd[\"mpid\"],\n", - " \"data\": {\"type\": dim.upper()},\n", + " 'project': name, 'is_public': True,\n", + " 'identifier': rd[\"mpid\"],\n", + " 'data': {'type': dim.upper()}\n", " }\n", "\n", " dct = {}\n", - " for k, col in config[\"columns\"].items():\n", - " hdr, unit = col[\"name\"], col.get(\"unit\")\n", - " if k == \"jid\":\n", + " for k, col in config['columns'].items():\n", + " hdr, unit = col['name'], col.get('unit')\n", + " if k == 'jid':\n", " dct[hdr] = config[hdr].format(rd[k])\n", " elif k in rd:\n", " if unit and rd[k]:\n", @@ -140,18 +137,18 @@ " float(rd[k])\n", " except ValueError:\n", " continue\n", - " dct[hdr] = f\"{rd[k]} {unit}\" if unit else rd[k]\n", + " dct[hdr] = f'{rd[k]} {unit}' if unit else rd[k]\n", "\n", " contrib[\"data\"].update(unflatten(dct))\n", "\n", - " contrib[\"structures\"] = [rd[\"final_str\"]]\n", + " contrib[\"structures\"] = [rd['final_str']]\n", " contributions.append(contrib)\n", " pbar.update(1)\n", "\n", "# make sure that contributions with all columns come first\n", - "contributions = [\n", - " d for d in sorted(contributions, key=lambda x: len(x[\"data\"]), reverse=True)\n", - "]" + "contributions = [d for d in sorted(\n", + " contributions, key=lambda x: len(x[\"data\"]), reverse=True\n", + ")]" ] }, { @@ -193,17 +190,13 @@ " \"_order_by\": \"data__ΔEⱽᴰᵂ__value\",\n", " \"order\": \"desc\",\n", " \"_fields\": [\n", - " \"id\",\n", - " \"identifier\",\n", - " \"formula\",\n", - " \"data.type\",\n", - " \"data.ΔEⱽᴰᵂ.value\",\n", - " \"data.ΔEᴹᴮᴶ.value\",\n", - " \"data.Kᵥ.value\",\n", - " \"structures\",\n", + " \"id\", \"identifier\", \"formula\",\n", + " \"data.type\", \"data.ΔEⱽᴰᵂ.value\",\n", + " \"data.ΔEᴹᴮᴶ.value\", \"data.Kᵥ.value\",\n", + " \"structures\"\n", " ],\n", - " \"_limit\": 10,\n", - "}\n", + " \"_limit\": 10\n", + "} \n", "resp = client.contributions.get_entries(**query).result()" ] }, diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/jarvis_dft_2023.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/jarvis_dft_2023.ipynb index 152fddd11d..a5ca1fe7e0 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/jarvis_dft_2023.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/jarvis_dft_2023.ipynb @@ -32,7 +32,7 @@ "metadata": {}, "outputs": [], "source": [ - "name = \"dft_3d\" # TODO dft_2d\n", + "name = 'dft_3d' # TODO dft_2d\n", "data = jarvis_db(name)" ] }, @@ -44,68 +44,62 @@ "outputs": [], "source": [ "columns = {\n", - " \"jid\": {\"name\": \"jarvis.id\", \"unit\": None},\n", - " \"jid\": {\"name\": \"jarvis.link\", \"unit\": None},\n", - " \"Tc_supercon\": {\"name\": \"Tc\", \"unit\": \"K\"},\n", - " \"avg_elec_mass\": {\"name\": \"mass|avg.elec\", \"unit\": \"mₑ\"},\n", - " \"avg_hole_mass\": {\"name\": \"mass|avg.hole\", \"unit\": \"mₑ\"},\n", - " \"bulk_modulus_kv\": {\"name\": \"moduli.bulk|voigt\", \"unit\": \"GPa\"},\n", - " \"shear_modulus_gv\": {\"name\": \"moduli.shear\", \"unit\": \"GPa\"},\n", - " \"crys\": {\"name\": \"crystal\", \"unit\": None},\n", - " \"density\": {\"name\": \"density\", \"unit\": \"g/cm³\"},\n", - " \"dfpt_piezo_max_dielectric\": {\"name\": \"piezo|max.dielectric.total\", \"unit\": \"C/m²\"},\n", - " \"dfpt_piezo_max_dielectric_electronic\": {\n", - " \"name\": \"piezo|max.dielectric.electronic\",\n", - " \"unit\": \"C/m²\",\n", - " },\n", - " \"dfpt_piezo_max_dielectric_ionic\": {\n", - " \"name\": \"piezo|max.dielectric.ionic\",\n", - " \"unit\": \"C/m²\",\n", - " },\n", - " \"dfpt_piezo_max_dij\": {\"name\": \"piezo|max.dij\", \"unit\": \"C/m²\"},\n", - " \"dfpt_piezo_max_eij\": {\"name\": \"piezo|max.eij\", \"unit\": \"C/m²\"},\n", - " \"dimensionality\": {\"name\": \"dimensionality\", \"unit\": None},\n", - " \"effective_masses_300K.n\": {\"name\": \"mass|eff.n|300K\", \"unit\": \"\"},\n", - " \"effective_masses_300K.p\": {\"name\": \"mass|eff.p|300K\", \"unit\": \"\"},\n", - " \"spg_number\": {\"name\": \"spacegroup.number\", \"unit\": \"\"},\n", - " \"spg_symbol\": {\"name\": \"spacegroup.symbol\", \"unit\": None},\n", - " \"hse_gap\": {\"name\": \"bandgaps.HSE\", \"unit\": \"eV\"},\n", - " \"mbj_bandgap\": {\"name\": \"bandgaps.TBmBJ\", \"unit\": \"eV\"},\n", - " \"optb88vdw_bandgap\": {\"name\": \"bandgaps.OptB88vdW\", \"unit\": \"eV\"},\n", - " \"n-powerfact\": {\"name\": \"powerfactor.n\", \"unit\": \"µW/K²/m²\"},\n", - " \"p-powerfact\": {\"name\": \"powerfactor.p\", \"unit\": \"µW/K²/m²\"},\n", - " \"slme\": {\"name\": \"SLME\", \"unit\": \"%\"},\n", - " \"spillage\": {\"name\": \"spillage\", \"unit\": \"\"},\n", - " \"encut\": {\"name\": \"ENCUT\", \"unit\": \"eV\"},\n", - " \"magmom_oszicar\": {\"name\": \"magmoms.oszicar\", \"unit\": \"µB\"},\n", - " \"magmom_outcar\": {\"name\": \"magmoms.outcar\", \"unit\": \"µB\"},\n", - " \"n-Seebeck\": {\"name\": \"seebeck.n\", \"unit\": \"µV/K\"},\n", - " \"p-Seebeck\": {\"name\": \"seebeck.p\", \"unit\": \"µV/K\"},\n", - " \"epsx\": {\"name\": \"refractive.x\", \"unit\": \"\"},\n", - " \"epsy\": {\"name\": \"refractive.y\", \"unit\": \"\"},\n", - " \"epsz\": {\"name\": \"refractive.z\", \"unit\": \"\"},\n", - " \"max_ir_mode\": {\"name\": \"IR.max\", \"unit\": \"cm⁻¹\"},\n", - " \"min_ir_mode\": {\"name\": \"IR.min\", \"unit\": \"cm⁻¹\"},\n", - " \"ncond\": {\"name\": \"Ncond\", \"unit\": \"\"},\n", - " \"nkappa\": {\"name\": \"kappa.n\", \"unit\": \"\"},\n", - " \"pkappa\": {\"name\": \"kappa.p\", \"unit\": \"\"},\n", - " \"exfoliation_energy\": {\"name\": \"energies.exfoliation\", \"unit\": \"eV\"},\n", - " \"formation_energy_peratom\": {\"name\": \"energies.formation\", \"unit\": \"eV/atom\"},\n", - " \"ehull\": {\"name\": \"energies.hull\", \"unit\": \"eV\"},\n", - " \"optb88vdw_total_energy\": {\"name\": \"energies.OptB88vdW\", \"unit\": \"eV\"},\n", - " \"max_efg\": {\"name\": \"EFG\", \"unit\": \"V/m²\"},\n", - " \"func\": {\"name\": \"functional\", \"unit\": None},\n", - " \"kpoint_length_unit\": {\"name\": \"kpoints\", \"unit\": \"\"},\n", - " \"typ\": {\"name\": \"type\", \"unit\": None},\n", - " \"nat\": {\"name\": \"natoms\", \"unit\": \"\"},\n", - " \"search\": {\"name\": \"search\", \"unit\": None},\n", - " \"maxdiff_bz\": {\"name\": \"maxdiff.bz\", \"unit\": \"\"},\n", - " \"maxdiff_mesh\": {\"name\": \"maxdiff.mesh\", \"unit\": \"\"},\n", - " \"mepsx\": {\"name\": \"meps.x\", \"unit\": \"\"},\n", - " \"mepsy\": {\"name\": \"meps.y\", \"unit\": \"\"},\n", - " \"mepsz\": {\"name\": \"meps.z\", \"unit\": \"\"},\n", - " \"pcond\": {\"name\": \"pcond\", \"unit\": \"\"},\n", - " \"poisson\": {\"name\": \"poisson\", \"unit\": \"\"},\n", + " 'jid': {'name': 'jarvis.id', 'unit': None},\n", + " 'jid': {'name': 'jarvis.link', 'unit': None},\n", + " 'Tc_supercon': {'name': 'Tc', 'unit': 'K'},\n", + " 'avg_elec_mass': {'name': 'mass|avg.elec', 'unit': 'mₑ'},\n", + " 'avg_hole_mass': {'name': 'mass|avg.hole', 'unit': 'mₑ'},\n", + " 'bulk_modulus_kv': {'name': 'moduli.bulk|voigt', 'unit': 'GPa'},\n", + " 'shear_modulus_gv': {'name': 'moduli.shear', 'unit': 'GPa'},\n", + " 'crys': {'name': 'crystal', 'unit': None},\n", + " 'density': {'name': 'density', 'unit': 'g/cm³'},\n", + " 'dfpt_piezo_max_dielectric': {'name': 'piezo|max.dielectric.total', 'unit': 'C/m²'},\n", + " 'dfpt_piezo_max_dielectric_electronic': {'name': 'piezo|max.dielectric.electronic', 'unit': 'C/m²'},\n", + " 'dfpt_piezo_max_dielectric_ionic': {'name': 'piezo|max.dielectric.ionic', 'unit': 'C/m²'},\n", + " 'dfpt_piezo_max_dij': {'name': 'piezo|max.dij', 'unit': 'C/m²'},\n", + " 'dfpt_piezo_max_eij': {'name': 'piezo|max.eij', 'unit': 'C/m²'},\n", + " 'dimensionality': {'name': 'dimensionality', 'unit': None},\n", + " 'effective_masses_300K.n': {'name': 'mass|eff.n|300K', 'unit': ''},\n", + " 'effective_masses_300K.p': {'name': 'mass|eff.p|300K', 'unit': ''},\n", + " 'spg_number': {'name': 'spacegroup.number', 'unit': ''},\n", + " 'spg_symbol': {'name': 'spacegroup.symbol', 'unit': None},\n", + " 'hse_gap': {'name': 'bandgaps.HSE', 'unit': 'eV'},\n", + " 'mbj_bandgap': {'name': 'bandgaps.TBmBJ', 'unit': 'eV'},\n", + " 'optb88vdw_bandgap': {'name': 'bandgaps.OptB88vdW', 'unit': 'eV'},\n", + " 'n-powerfact': {'name': 'powerfactor.n', 'unit': 'µW/K²/m²'},\n", + " 'p-powerfact': {'name': 'powerfactor.p', 'unit': 'µW/K²/m²'},\n", + " 'slme': {'name': 'SLME', 'unit': '%'},\n", + " 'spillage': {'name': 'spillage', 'unit': ''},\n", + " 'encut': {'name': 'ENCUT', 'unit': 'eV'},\n", + " 'magmom_oszicar': {'name': 'magmoms.oszicar', 'unit': 'µB'},\n", + " 'magmom_outcar': {'name': 'magmoms.outcar', 'unit': 'µB'},\n", + " 'n-Seebeck': {'name': 'seebeck.n', 'unit': 'µV/K'},\n", + " 'p-Seebeck': {'name': 'seebeck.p', 'unit': 'µV/K'},\n", + " 'epsx': {'name': 'refractive.x', 'unit': ''},\n", + " 'epsy': {'name': 'refractive.y', 'unit': ''},\n", + " 'epsz': {'name': 'refractive.z', 'unit': ''},\n", + " 'max_ir_mode': {'name': 'IR.max', 'unit': 'cm⁻¹'},\n", + " 'min_ir_mode': {'name': 'IR.min', 'unit': 'cm⁻¹'},\n", + " 'ncond': {'name': 'Ncond', 'unit': ''},\n", + " 'nkappa': {'name': 'kappa.n', 'unit': ''},\n", + " 'pkappa': {'name': 'kappa.p', 'unit': ''},\n", + " 'exfoliation_energy': {'name': 'energies.exfoliation', 'unit': 'eV'},\n", + " 'formation_energy_peratom': {'name': 'energies.formation', 'unit': 'eV/atom'},\n", + " 'ehull': {'name': 'energies.hull', 'unit': 'eV'},\n", + " 'optb88vdw_total_energy': {'name': 'energies.OptB88vdW', 'unit': 'eV'}, \n", + " 'max_efg': {'name': 'EFG', 'unit': 'V/m²'},\n", + " 'func': {'name': 'functional', 'unit': None},\n", + " 'kpoint_length_unit': {'name': 'kpoints', 'unit': ''},\n", + " 'typ': {'name': 'type', 'unit': None},\n", + " 'nat': {'name': 'natoms', 'unit': ''}, \n", + " 'search': {'name': 'search', 'unit': None},\n", + " 'maxdiff_bz': {'name': 'maxdiff.bz', 'unit': ''},\n", + " 'maxdiff_mesh': {'name': 'maxdiff.mesh', 'unit': ''},\n", + " 'mepsx': {'name': 'meps.x', 'unit': ''},\n", + " 'mepsy': {'name': 'meps.y', 'unit': ''},\n", + " 'mepsz': {'name': 'meps.z', 'unit': ''},\n", + " 'pcond': {'name': 'pcond', 'unit': ''},\n", + " 'poisson': {'name': 'poisson', 'unit': ''},\n", "}" ] }, @@ -119,22 +113,22 @@ "outputs": [], "source": [ "contributions = []\n", - "list_keys = [\"efg\", \"elastic_tensor\", \"modes\", \"icsd\"]\n", + "list_keys = ['efg', 'elastic_tensor', 'modes', 'icsd']\n", "identifier_key = \"reference\"\n", "formula_key = \"formula\"\n", "prefixes = (\"mp-\", \"mvc-\")\n", - "jarvis_url = \"https://www.ctcms.nist.gov/~knc6/static/JARVIS-DFT/\"\n", + "jarvis_url = 'https://www.ctcms.nist.gov/~knc6/static/JARVIS-DFT/'\n", "identifiers = set()\n", "\n", "for entry in data:\n", " identifier = entry[identifier_key]\n", " if not entry[identifier_key].startswith(prefixes) or identifier in identifiers:\n", " continue\n", - "\n", + " \n", " identifiers.add(identifier)\n", " contrib = {\"identifier\": identifier, \"formula\": entry[formula_key], \"data\": {}}\n", " attm_data = {}\n", - "\n", + " \n", " for k, v in entry.items():\n", " if not v or v == \"na\" or k == \"xml_data_link\":\n", " continue\n", @@ -160,7 +154,7 @@ " elif k in columns:\n", " name, unit = columns[k][\"name\"], columns[k][\"unit\"]\n", " contrib[\"data\"][name] = f\"{v} {unit}\" if unit else v\n", - "\n", + " \n", " if attm_data:\n", " contrib[\"attachments\"] = [Attachment.from_data(\"lists\", attm_data)]\n", "\n", @@ -184,7 +178,7 @@ " if \"files\" in contrib[\"data\"]:\n", " flat_files = flatten(contrib[\"data\"][\"files\"], reducer=\"dot\")\n", " files_columns.update(flat_files.keys())\n", - "\n", + " \n", "files_columns" ] }, @@ -400,12 +394,10 @@ "source": [ "query = {\"data__energies__hull__value__lte\": 0.05}\n", "count, _ = client.get_totals(query=query)\n", - "print(f\"materials with ehull <= 0.05 eV/atom: {count / ncontribs * 100:.1f}%\")\n", + "print(f\"materials with ehull <= 0.05 eV/atom: {count/ncontribs*100:.1f}%\")\n", "fields = [\"identifier\", \"formula\", \"data.energies.hull.value\"]\n", "sort = \"data.energies.hull.value\"\n", - "contribs = client.query_contributions(\n", - " query=query, fields=fields, sort=sort, paginate=True\n", - ")\n", + "contribs = client.query_contributions(query=query, fields=fields, sort=sort, paginate=True)\n", "pd.json_normalize(contribs[\"data\"])" ] }, @@ -479,19 +471,13 @@ " \"data__spillage__value__gte\": 0.5,\n", " \"data__bandgaps__OptB88vdW__value__gt\": 0.01,\n", " \"data__energies__hull__value__lt\": 0.1,\n", - " \"data__SLME__value__gt\": 5,\n", + " \"data__SLME__value__gt\": 5\n", "}\n", "fields = [\n", - " \"identifier\",\n", - " \"formula\",\n", - " \"data.spillage.value\",\n", - " \"data.bandgaps.OptB88vdW.value\",\n", - " \"data.energies.hull.value\",\n", - " \"data.SLME.value\",\n", + " \"identifier\", \"formula\", \"data.spillage.value\", \"data.bandgaps.OptB88vdW.value\",\n", + " \"data.energies.hull.value\", \"data.SLME.value\",\n", "]\n", - "contribs = client.query_contributions(\n", - " query=query, fields=fields, sort=sort, paginate=True\n", - ")\n", + "contribs = client.query_contributions(query=query, fields=fields, sort=sort, paginate=True)\n", "pd.json_normalize(contribs[\"data\"])" ] }, @@ -651,9 +637,7 @@ "# find all cubic materials\n", "query = {\"data__crystal__exact\": \"cubic\"}\n", "fields = [\"identifier\", \"formula\", \"data.crystal\", \"data.energies.hull.value\"]\n", - "contribs = client.query_contributions(\n", - " query=query, fields=fields, sort=sort, paginate=True\n", - ")\n", + "contribs = client.query_contributions(query=query, fields=fields, sort=sort, paginate=True)\n", "pd.json_normalize(contribs[\"data\"])" ] }, diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/matscholar.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/matscholar.ipynb index 979b0aaa7f..31e5a2c243 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/matscholar.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/matscholar.ipynb @@ -7,7 +7,8 @@ "metadata": {}, "outputs": [], "source": [ - "from mpcontribs.client import Client" + "from pathlib import Path\n", + "from mpcontribs.client import Client, Attachment" ] }, { @@ -47,7 +48,7 @@ " \"symmetry.symbol\": None,\n", " \"symmetry.system\": None,\n", " \"symmetry.number\": \"\",\n", - " \"bandgap\": \"eV\",\n", + " \"bandgap\": \"eV\"\n", "}" ] }, @@ -61,20 +62,24 @@ "# generate list of contribution dictionaries\n", "contributions = [\n", " {\n", - " \"identifier\": \"custom_hash\", # or any string to uniquely identify entry/contribution\n", + " \"identifier\": \"custom_hash\", # or any string to uniquely identify entry/contribution\n", " \"formula\": \"Fe3S4\",\n", " \"data\": {\n", - " \"doi\": \"https://doi.org/10.17188/1196965\", # if saved as full URL, a link will be shown in the explorer\n", - " \"symmetry\": {\"symbol\": \"Fd3̅m\", \"system\": \"cubic\", \"number\": 227},\n", - " \"bandgap\": \"3.12 eV\",\n", + " \"doi\": \"https://doi.org/10.17188/1196965\", # if saved as full URL, a link will be shown in the explorer\n", + " \"symmetry\": {\n", + " \"symbol\": \"Fd3̅m\",\n", + " \"system\": \"cubic\",\n", + " \"number\": 227\n", + " },\n", + " \"bandgap\": \"3.12 eV\"\n", " },\n", - " # \"attachments\": [ # create from data, or load gzipped text or images from disk using Path\n", - " # Attachment.from_data(\"other\", {\"hello\": \"world\", \"test\": [1,2,4]})\n", - " # Path(\"2021-02-19_scan_mpids_changed.json.gz\"),\n", - " # Path(\"IMG-20210224-WA0010.jpg\")\n", - " # ],\n", - " # \"structures\": [pymatgen.Structure, ...],\n", - " # \"tables\": [pandas.DataFrame, ...]\n", + "# \"attachments\": [ # create from data, or load gzipped text or images from disk using Path\n", + "# Attachment.from_data(\"other\", {\"hello\": \"world\", \"test\": [1,2,4]})\n", + "# Path(\"2021-02-19_scan_mpids_changed.json.gz\"),\n", + "# Path(\"IMG-20210224-WA0010.jpg\")\n", + "# ],\n", + "# \"structures\": [pymatgen.Structure, ...],\n", + "# \"tables\": [pandas.DataFrame, ...]\n", " },\n", " # ...\n", "]" @@ -106,7 +111,7 @@ "query = {\n", " \"data__bandgap__value__gt\": 3,\n", " \"data__doi__endswith\": \"/1196965\",\n", - " \"data__symmetry__system__exact\": \"cubic\",\n", + " \"data__symmetry__system__exact\": \"cubic\"\n", "}\n", "fields = [\"identifier\", \"formula\", \"data.doi\"]\n", "client.query_contributions(query=query, fields=fields, paginate=True)" diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/melting_points.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/melting_points.ipynb index 95b3ae9d3f..e3fcc9aadc 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/melting_points.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/melting_points.ipynb @@ -58,12 +58,8 @@ "metadata": {}, "outputs": [], "source": [ - "indir = (\n", - " \"/Users/patrick/GoogleDriveLBNL/My Drive/MaterialsProject/gitrepos/mpcontribs-data\"\n", - ")\n", - "melting_pts = pd.DataFrame(\n", - " loadfn(f\"{indir}/melting_points_df_08_08_23.json.gz\")\n", - ") # Note: temps in Kelvin" + "indir = \"/Users/patrick/GoogleDriveLBNL/My Drive/MaterialsProject/gitrepos/mpcontribs-data\"\n", + "melting_pts = pd.DataFrame(loadfn(f\"{indir}/melting_points_df_08_08_23.json.gz\")) # Note: temps in Kelvin" ] }, { @@ -108,14 +104,14 @@ "\n", "for d in data:\n", " val, err = d[\"melting_point\"], d[\"melting_point_uncertainty\"]\n", - " contributions.append(\n", - " {\n", - " \"identifier\": d[\"index\"],\n", - " \"formula\": d[\"reduced_formula\"],\n", - " \"data\": {\"MeltingPoint\": f\"{val}+/-{err} K\"},\n", + " contributions.append({\n", + " \"identifier\": d[\"index\"],\n", + " \"formula\": d[\"reduced_formula\"],\n", + " \"data\": {\n", + " \"MeltingPoint\": f\"{val}+/-{err} K\"\n", " }\n", - " )\n", - "\n", + " })\n", + " \n", "contributions[0]" ] }, diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/mg_cathode_screening_2022.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/mg_cathode_screening_2022.ipynb index b98cfb008d..77de1868c8 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/mg_cathode_screening_2022.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/mg_cathode_screening_2022.ipynb @@ -21,9 +21,7 @@ "metadata": {}, "outputs": [], "source": [ - "client = Client(\n", - " project=\"mg_cathode_screening_2022\"\n", - ") # provide API key via `apikey` argument" + "client = Client(project=\"mg_cathode_screening_2022\") # provide API key via `apikey` argument" ] }, { @@ -52,11 +50,7 @@ "metadata": {}, "outputs": [], "source": [ - "client.update_project(\n", - " update={\n", - " \"description\": \"A computational screening approach to identify high-performance multivalent intercalation cathodes among materials that do not contain the working ion of interest has been developed, which greatly expands the search space that can be considered for material discovery (https://doi.org/10.1021/acsami.2c11733). This magnesium intercalation cathode data set of phase stability, energy density, & transport properties has been generated using these methods but applied to a larger set of materials than the original publication. 5,853 empty host materials of the 16,682 materials previously down selected based on their reducible species oxidation state were prioritized for Mg insertions based on excluding candidates which contained an extractable ion (H, Li, Na, K, Rb, Cs, Mg, Ca, Cs, Ag, Cu). Of these 5,863 attempted Mg insertion workflows, 83% resulted in at least one viable Mg site. This ultimately resulted in 4,872 Mg cathodes from which 229 ApproxNEB workflows were attempted. There were 193 unique structure types in these 229 candidates. All ApproxNEB images calculations successfully completed for 97 electrodes. This data set uses the following python objects: pymatgen.apps.battery.insertion_battery.InsertionElectrode and pymatgen.analysis.diffusion.neb.full_path_mapper.MigrationGraph\"\n", - " }\n", - ")" + "client.update_project(update={\"description\":\"A computational screening approach to identify high-performance multivalent intercalation cathodes among materials that do not contain the working ion of interest has been developed, which greatly expands the search space that can be considered for material discovery (https://doi.org/10.1021/acsami.2c11733). This magnesium intercalation cathode data set of phase stability, energy density, & transport properties has been generated using these methods but applied to a larger set of materials than the original publication. 5,853 empty host materials of the 16,682 materials previously down selected based on their reducible species oxidation state were prioritized for Mg insertions based on excluding candidates which contained an extractable ion (H, Li, Na, K, Rb, Cs, Mg, Ca, Cs, Ag, Cu). Of these 5,863 attempted Mg insertion workflows, 83% resulted in at least one viable Mg site. This ultimately resulted in 4,872 Mg cathodes from which 229 ApproxNEB workflows were attempted. There were 193 unique structure types in these 229 candidates. All ApproxNEB images calculations successfully completed for 97 electrodes. This data set uses the following python objects: pymatgen.apps.battery.insertion_battery.InsertionElectrode and pymatgen.analysis.diffusion.neb.full_path_mapper.MigrationGraph\"})" ] }, { @@ -67,31 +61,31 @@ "outputs": [], "source": [ "# add legend for project in `other`\n", - "client.update_project(\n", - " update={\n", - " \"other\": {\n", - " \"identifier\": \"Material Project ID for empty host material\",\n", - " \"formula\": \"Empty host material chemical formula\",\n", - " \"host.formulaAnonymous\": \"Empty host material anonumous chemical formula\",\n", - " \"host.nelements\": \"Number of distinct elements in empty host material\",\n", - " \"host.chemsys\": \"Empty host material chemical system of distinct elements sorted alphabetically and joined by dashes\",\n", - " \"ICSD.exp\": \"Whether empty host material is an ICSD experimental structure\",\n", - " \"ICSD.ids\": \"Identifiers for the Inorganic Crystal Structure Database\",\n", - " \"battery.id\": \"Unique identifier for electrode where 'js-' distinguishes calculations from the screening development phase\",\n", - " \"battery.formula\": \"Electrode chemical formula including the working ion fraction\",\n", - " \"battery.workingIon\": \"Battery system working ion\",\n", - " \"battery.voltage\": \"Average voltage in Volts across all voltage pairs\",\n", - " \"battery.capacity\": \"Total gravimetric capacity in mAh/g of cathode active material\",\n", - " \"battery.stability|charge\": \"Energy above hull in eV/atom, a metric of the phase stability of the charged (empty) state\",\n", - " \"battery.stability|discharge\": \"Energy above hull in eV/atom, a metric of the phase stability of the discharged (intercalated) state\",\n", - " \"battery.Δvolume\": \"Largest volume change in % across all voltage pairs\",\n", - " \"MigrationGraph.found\": \"Whether a migration graph mapping out connections between working ion sites could be successfully generated\",\n", - " \"MigrationGraph.npaths\": \"The number of possible percolating pathways identified from the migration graph\",\n", - " \"ApproxNEB.uuid\": \"If available, identifier for ApproxNEB calculations for migration graph pathway energetics\",\n", - " \"ApproxNEB.complete\": \"If ApproxNEB calculations are available, the fraction of calculations that were successfully completed\",\n", - " }\n", - " }\n", - ")" + "client.update_project(update={\"other\": {\"identifier\": \"Material Project ID for empty host material\",\n", + " \"formula\": \"Empty host material chemical formula\",\n", + " \n", + " \"host.formulaAnonymous\": \"Empty host material anonumous chemical formula\",\n", + " \"host.nelements\": \"Number of distinct elements in empty host material\",\n", + " \"host.chemsys\": \"Empty host material chemical system of distinct elements sorted alphabetically and joined by dashes\",\n", + " \n", + " \"ICSD.exp\": \"Whether empty host material is an ICSD experimental structure\",\n", + " \"ICSD.ids\": \"Identifiers for the Inorganic Crystal Structure Database\",\n", + " \n", + " \"battery.id\": \"Unique identifier for electrode where 'js-' distinguishes calculations from the screening development phase\",\n", + " \"battery.formula\": \"Electrode chemical formula including the working ion fraction\",\n", + " \"battery.workingIon\": \"Battery system working ion\",\n", + " \"battery.voltage\": \"Average voltage in Volts across all voltage pairs\",\n", + " \"battery.capacity\": \"Total gravimetric capacity in mAh/g of cathode active material\",\n", + " \"battery.stability|charge\": \"Energy above hull in eV/atom, a metric of the phase stability of the charged (empty) state\",\n", + " \"battery.stability|discharge\": \"Energy above hull in eV/atom, a metric of the phase stability of the discharged (intercalated) state\",\n", + " \"battery.Δvolume\": \"Largest volume change in % across all voltage pairs\",\n", + " \n", + " \"MigrationGraph.found\": \"Whether a migration graph mapping out connections between working ion sites could be successfully generated\",\n", + " \"MigrationGraph.npaths\": \"The number of possible percolating pathways identified from the migration graph\",\n", + " \n", + " \"ApproxNEB.uuid\": \"If available, identifier for ApproxNEB calculations for migration graph pathway energetics\",\n", + " \"ApproxNEB.complete\": \"If ApproxNEB calculations are available, the fraction of calculations that were successfully completed\",\n", + "}})" ] }, { @@ -119,7 +113,7 @@ "metadata": {}, "outputs": [], "source": [ - "# client.delete_contributions()" + "#client.delete_contributions()" ] }, { @@ -141,24 +135,22 @@ " \"formula_anonymous\": {\"name\": \"host.formulaAnonymous\", \"unit\": None},\n", " \"nelements\": {\"name\": \"host.nelements\", \"unit\": \"\"},\n", " \"chemsys\": {\"name\": \"host.chemsys\", \"unit\": None},\n", - " \"icsd_experimental\": {\n", - " \"name\": \"ICSD.exp\",\n", - " \"unit\": None,\n", - " }, # convert bool to Yes/No string\n", + " \n", + " \"icsd_experimental\": {\"name\": \"ICSD.exp\", \"unit\": None}, # convert bool to Yes/No string\n", " \"icsd_ids\": {\"name\": \"ICSD.ids\", \"unit\": None},\n", + " \n", " \"battery_id\": {\"name\": \"battery.id\", \"unit\": None},\n", " \"battery_formula\": {\"name\": \"battery.formula\", \"unit\": None},\n", " \"working_ion\": {\"name\": \"battery.workingIon\", \"unit\": None},\n", " \"average_voltage\": {\"name\": \"battery.voltage\", \"unit\": \"V\"},\n", - " \"capacity_grav\": {\"name\": \"battery.capacity\", \"unit\": \"mAh/g\"},\n", + " \"capacity_grav\": {\"name\": \"battery.capacity\", \"unit\": \"mAh/g\"}, \n", " \"stability_charge\": {\"name\": \"battery.stability|charge\", \"unit\": \"eV/atom\"},\n", " \"stability_discharge\": {\"name\": \"battery.stability|discharged\", \"unit\": \"eV/atom\"},\n", " \"max_delta_volume\": {\"name\": \"battery.Δvolume\", \"unit\": \"%\"},\n", + " \n", " \"migration_graph_found\": {\"name\": \"MigrationGraph.found\", \"unit\": None},\n", - " \"num_paths_found\": {\n", - " \"name\": \"MigrationGraph.npaths\",\n", - " \"unit\": \"\",\n", - " }, # emptry string indicates dimensionless number\n", + " \"num_paths_found\": {\"name\": \"MigrationGraph.npaths\", \"unit\": \"\"},# emptry string indicates dimensionless number\n", + " \n", " \"aneb_wf_uuid\": {\"name\": \"ApproxNEB.uuid\", \"unit\": None},\n", " \"aneb_wf_complete\": {\"name\": \"ApproxNEB.complete\", \"unit\": \"\"},\n", "}" @@ -204,19 +196,17 @@ "# Applies cost function based on voltage and stability (specific to Mg) for prioritizing electrodes\n", "# Created by custom MapBuilder: https://github.com/materialsproject/emmet/commit/692bdf5eff67fe1b0f48e1a13cee999af9136aae\n", "rank_store = MongograntStore(\n", - " \"ro:mongodb07-ext.nersc.gov/fw_acr_mv\", \"rank_electrodes_2022\", key=\"battery_id\"\n", + " \"ro:mongodb07-ext.nersc.gov/fw_acr_mv\",\"rank_electrodes_2022\",key=\"battery_id\"\n", ")\n", "rank_store.connect()\n", "print(rank_store.count())\n", "\n", "# Raw ApproxNEB workflow data (note 2 of the 229 ApproxNEB workflows had unsuccessful host calculations)\n", "aneb_store = MongograntStore(\n", - " \"ro:mongodb07-ext.nersc.gov/fw_acr_mv\", \"approx_neb\", key=\"wf_uuid\"\n", + " \"ro:mongodb07-ext.nersc.gov/fw_acr_mv\",\"approx_neb\",key=\"wf_uuid\"\n", ")\n", "aneb_store.connect()\n", - "print(\n", - " aneb_store.count(), aneb_store.count({\"tags\": {\"$all\": [\"migration_graph_2022\"]}})\n", - ")" + "print(aneb_store.count(),aneb_store.count({\"tags\":{\"$all\":[\"migration_graph_2022\"]}}))" ] }, { @@ -239,94 +229,90 @@ "source": [ "contrib_docs = []\n", "for bid in bids:\n", - " rank_doc = rank_store.query_one({\"battery_id\": bid})\n", - " aneb_doc = aneb_store.query_one({\"battery_id\": bid})\n", + " rank_doc = rank_store.query_one({\"battery_id\":bid})\n", + " aneb_doc = aneb_store.query_one({\"battery_id\":bid})\n", "\n", " contrib_doc = {\n", - " \"battery_id\": bid,\n", + " \"battery_id\":bid,\n", " # host structure properties\n", - " \"host_mp_ids\": rank_doc[\"host_mp_ids\"],\n", - " \"icsd_experimental\": rank_doc[\"icsd_experimental\"],\n", - " \"icsd_ids\": rank_doc[\"host_icsd_ids\"],\n", - " \"formula\": rank_doc[\"framework_formula\"],\n", - " \"formula_anonymous\": rank_doc[\"formula_anonymous\"],\n", - " \"nelements\": rank_doc[\"nelements\"],\n", - " \"chemsys\": rank_doc[\"chemsys\"],\n", - " \"composition\": rank_doc[\"framework\"],\n", - " \"structure\": rank_doc[\"host_structure\"],\n", + " \"host_mp_ids\":rank_doc[\"host_mp_ids\"],\n", + " \"icsd_experimental\":rank_doc[\"icsd_experimental\"],\n", + " \"icsd_ids\":rank_doc[\"host_icsd_ids\"],\n", + " \"formula\":rank_doc[\"framework_formula\"],\n", + " \"formula_anonymous\":rank_doc[\"formula_anonymous\"],\n", + " \"nelements\":rank_doc[\"nelements\"],\n", + " \"chemsys\":rank_doc[\"chemsys\"],\n", + " \"composition\":rank_doc[\"framework\"],\n", + " \"structure\":rank_doc[\"host_structure\"],\n", " # electrode properties\n", - " \"working_ion\": rank_doc[\"working_ion\"],\n", - " \"electrode_object\": rank_doc[\"electrode_object\"],\n", - " \"battery_formula\": rank_doc[\"battery_formula\"],\n", - " \"average_voltage\": rank_doc[\"average_voltage\"],\n", - " \"capacity_grav\": rank_doc[\"capacity_grav\"],\n", - " \"stability_charge\": rank_doc[\"stability_charge\"],\n", - " \"stability_discharge\": rank_doc[\"stability_discharge\"],\n", - " \"max_delta_volume\": 100 * rank_doc[\"max_delta_volume\"], # convert to percentage\n", + " \"working_ion\":rank_doc[\"working_ion\"],\n", + " \"electrode_object\":rank_doc[\"electrode_object\"],\n", + " \"battery_formula\":rank_doc[\"battery_formula\"],\n", + " \"average_voltage\":rank_doc[\"average_voltage\"],\n", + " \"capacity_grav\":rank_doc[\"capacity_grav\"],\n", + " \"stability_charge\":rank_doc[\"stability_charge\"],\n", + " \"stability_discharge\":rank_doc[\"stability_discharge\"],\n", + " \"max_delta_volume\":100*rank_doc[\"max_delta_volume\"], #convert to percentage\n", " # migration graph properties\n", - " \"migration_graph_found\": True if rank_doc[\"migration_graph\"] else False,\n", - " \"migration_graph\": {\n", - " \"battery_id\": bid,\n", - " \"migration_graph\": rank_doc[\"migration_graph\"],\n", - " \"hop_cutoff\": rank_doc[\"hop_cutoff\"],\n", - " \"entries_for_generation\": rank_doc[\"entries_for_generation\"],\n", - " \"working_ion_entry\": rank_doc[\"working_ion_entry\"],\n", - " },\n", - " \"num_paths_found\": rank_doc[\"num_paths_found\"],\n", + " \"migration_graph_found\":True if rank_doc[\"migration_graph\"] else False,\n", + " \"migration_graph\":{\"battery_id\":bid,\n", + " \"migration_graph\":rank_doc[\"migration_graph\"],\n", + " \"hop_cutoff\":rank_doc[\"hop_cutoff\"],\n", + " \"entries_for_generation\":rank_doc[\"entries_for_generation\"],\n", + " \"working_ion_entry\":rank_doc[\"working_ion_entry\"],\n", + " },\n", + " \"num_paths_found\":rank_doc[\"num_paths_found\"],\n", " }\n", - "\n", + " \n", " if aneb_doc is not None:\n", " # get aneb data for each hop\n", " aneb_wf_uuid = aneb_doc[\"wf_uuid\"]\n", " aneb_wf_data = {}\n", - " for aneb_hop_key, hop_key in aneb_doc[\"hop_combo_mapping\"].items():\n", + " for aneb_hop_key,hop_key in aneb_doc[\"hop_combo_mapping\"].items():\n", " combo = aneb_hop_key.split(\"+\")\n", " if len(combo) == 2:\n", " c = [int(combo[0]), int(combo[1])]\n", " data = [aneb_doc[\"end_points\"][c[0]]]\n", " if \"images\" not in aneb_doc.keys():\n", - " data.extend([{\"index\": i} for i in range(5)])\n", + " data.extend([{\"index\":i} for i in range(5)])\n", " else:\n", " if aneb_hop_key in aneb_doc[\"images\"]:\n", " data.extend(aneb_doc[\"images\"][aneb_hop_key])\n", " else:\n", - " data.extend([{\"index\": i} for i in range(5)])\n", + " data.extend([{\"index\":i} for i in range(5)])\n", " data.append(aneb_doc[\"end_points\"][c[1]])\n", - " aneb_wf_data.update({hop_key: data})\n", + " aneb_wf_data.update({hop_key:data})\n", " aneb_host = aneb_doc[\"host\"]\n", - "\n", + " \n", " # determine fraction of aneb data available\n", " total = 0\n", " complete = 0\n", - " for k, v in aneb_wf_data.items():\n", + " for k,v in aneb_wf_data.items():\n", " total += len(v)\n", " complete += len([i for i in v if \"output\" in i.keys()])\n", " aneb_wf_complete = complete / total\n", - "\n", + " \n", " else:\n", " aneb_wf_uuid = None\n", " aneb_host = None\n", " aneb_wf_data = None\n", " aneb_wf_complete = None\n", - "\n", + " \n", " # add aneb wf properties and data\n", - " contrib_doc.update(\n", - " {\n", - " \"aneb_wf_uuid\": aneb_wf_uuid,\n", - " \"aneb_wf_data\": {\n", - " \"conversion_matrix\": rank_doc[\"conversion_matrix\"],\n", - " \"matrix_supercell_structure\": rank_doc[\"matrix_supercell_structure\"],\n", - " \"inserted_ion_coords\": rank_doc[\"inserted_ion_coords\"],\n", - " \"insert_coords_combo\": rank_doc[\"insert_coords_combo\"],\n", - " \"host_data\": aneb_host,\n", - " \"hop_data\": aneb_wf_data,\n", - " },\n", - " \"aneb_wf_complete\": aneb_wf_complete,\n", - " }\n", - " )\n", - "\n", + " contrib_doc.update({\n", + " \"aneb_wf_uuid\":aneb_wf_uuid,\n", + " \"aneb_wf_data\":{\"conversion_matrix\":rank_doc[\"conversion_matrix\"],\n", + " \"matrix_supercell_structure\":rank_doc[\"matrix_supercell_structure\"],\n", + " \"inserted_ion_coords\":rank_doc[\"inserted_ion_coords\"],\n", + " \"insert_coords_combo\":rank_doc[\"insert_coords_combo\"],\n", + " \"host_data\":aneb_host,\n", + " \"hop_data\":aneb_wf_data,\n", + " },\n", + " \"aneb_wf_complete\":aneb_wf_complete\n", + " })\n", + " \n", " # clean-up formatting for MP Contribs\n", - " for k, v in contrib_doc.items():\n", + " for k,v in contrib_doc.items():\n", " if type(v) is bool:\n", " if v is True:\n", " contrib_doc[k] = \"yes\"\n", @@ -340,9 +326,9 @@ " contrib_doc[k] = str(v[0])\n", " elif len(v) > 1:\n", " contrib_doc[k] = \",\".join(str(i) for i in v)\n", - "\n", + " \n", " contrib_docs.append(contrib_doc)\n", - "print(len(contrib_docs), \"original\")" + "print(len(contrib_docs),\"original\")" ] }, { @@ -373,7 +359,7 @@ " else:\n", " docs.append(d)\n", "contrib_docs = docs\n", - "print(len(contrib_docs), \"split\")" + "print(len(contrib_docs),\"split\")" ] }, { @@ -398,21 +384,15 @@ "for doc in contrib_docs:\n", " identifier = doc[\"host_mp_ids\"][0] if doc[\"host_mp_ids\"] else doc[\"battery_id\"]\n", " formula = doc[\"formula\"]\n", - " contrib = {\n", - " \"identifier\": identifier,\n", - " \"formula\": formula,\n", - " \"data\": {},\n", - " \"structures\": [],\n", - " \"attachments\": [],\n", - " }\n", - "\n", + " contrib = {\"identifier\": identifier, \"formula\": formula, \"data\": {}, \"structures\": [], \"attachments\": []}\n", + " \n", " for k in structure_keys:\n", " sdct = doc.pop(k, None)\n", " if sdct:\n", " structure = Structure.from_dict(sdct)\n", " structure.name = k\n", " contrib[\"structures\"].append(structure)\n", - "\n", + " \n", " for k in attachment_keys:\n", " # skip attachments if not available\n", " if k == \"migration_graph\" and doc[\"migration_graph_found\"] == \"no\":\n", @@ -424,20 +404,18 @@ " if attm_dct:\n", " attm = Attachment.from_data(k, attm_dct)\n", " contrib[\"attachments\"].append(attm)\n", - "\n", - " clean = {\n", - " k: v for k, v in doc.items() if k[0] != \"_\" and not isinstance(v, datetime)\n", - " }\n", + " \n", + " clean = {k: v for k, v in doc.items() if k[0] != \"_\" and not isinstance(v, datetime)}\n", " raw = Attachment.from_data(\"raw\", clean)\n", " contrib[\"attachments\"].append(raw)\n", - "\n", + " \n", " flat_doc = flatten(clean, max_flatten_depth=2, reducer=\"dot\")\n", " for col, config in columns.items():\n", " value = flat_doc.get(col)\n", " if value:\n", " name, unit = config[\"name\"], config[\"unit\"]\n", " contrib[\"data\"][name] = f\"{value:.3g} {unit}\" if unit else value\n", - "\n", + " \n", " contrib[\"data\"] = unflatten(contrib[\"data\"], splitter=\"dot\")\n", " contributions.append({k: v for k, v in contrib.items() if v})\n", "\n", @@ -510,11 +488,11 @@ "metadata": {}, "outputs": [], "source": [ - "query = {\"identifier\": \"mp-10093\"}\n", - "fields = [\"identifier\", \"ICSD.ids\", \"attachments\"]\n", - "contribs = client.query_contributions(\n", - " query=query, fields=fields, sort=\"identifier\", paginate=True\n", - ")\n", + "query = {\n", + " \"identifier\": \"mp-10093\"\n", + "}\n", + "fields = [\"identifier\",\"ICSD.ids\",\"attachments\"]\n", + "contribs = client.query_contributions(query=query, fields=fields, sort=\"identifier\", paginate=True)\n", "pd.json_normalize(contribs[\"data\"])" ] }, @@ -563,10 +541,10 @@ "source": [ "# use migration graph to identify possible pathways\n", "mg.assign_cost_to_graph()\n", - "for n, path in mg.get_path():\n", - " print(\"path\", n)\n", + "for n,path in mg.get_path():\n", + " print(\"path\",n)\n", " for hop in path:\n", - " print(hop[\"ipos\"], hop[\"epos\"], hop[\"to_jimage\"])\n", + " print(hop[\"ipos\"],hop[\"epos\"],hop[\"to_jimage\"])\n", " print()" ] }, @@ -578,18 +556,14 @@ "outputs": [], "source": [ "# map ApproxNEB data onto migration graph\n", - "for k, v in aneb_data[\"hop_data\"].items():\n", + "for k,v in aneb_data[\"hop_data\"].items():\n", " sc_structs = [Structure.from_dict(i[\"input_structure\"]) for i in v]\n", " energies = [get(i, \"output.energy\") for i in v]\n", " add_edge_data_from_sc(\n", - " mg,\n", - " i_sc=sc_structs[0],\n", - " e_sc=sc_structs[-1],\n", - " data_array=sc_structs,\n", - " key=\"sc_structs\",\n", + " mg,i_sc=sc_structs[0],e_sc=sc_structs[-1],data_array=sc_structs,key=\"sc_structs\"\n", " )\n", " add_edge_data_from_sc(\n", - " mg, i_sc=sc_structs[0], e_sc=sc_structs[-1], data_array=energies, key=\"energies\"\n", + " mg,i_sc=sc_structs[0],e_sc=sc_structs[-1],data_array=energies,key=\"energies\"\n", " )" ] }, @@ -601,10 +575,10 @@ "outputs": [], "source": [ "# evaluate pathway energetics using ApproxNEB data\n", - "for n, path in mg.get_path():\n", - " # for hop in path:\n", - " # print(hop[\"ipos\"],hop[\"epos\"],hop[\"to_jimage\"])\n", - " energies = np.array([hop[\"energies\"] for hop in path], dtype=float)\n", + "for n,path in mg.get_path():\n", + " #for hop in path:\n", + " #print(hop[\"ipos\"],hop[\"epos\"],hop[\"to_jimage\"])\n", + " energies = np.array([hop[\"energies\"] for hop in path],dtype=float)\n", " path_barrier = 1000 * (energies.max() - energies.min())\n", " print(\"path\", n, \"ApproxNEB barrier\", round(path_barrier), \"meV\")" ] diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/mofexplorer.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/mofexplorer.ipynb index 2ef808fd49..a9dc872a85 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/mofexplorer.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/mofexplorer.ipynb @@ -76,7 +76,7 @@ " raw = vs[-1].replace(\"^3\", \"³\")\n", " if raw in ureg:\n", " value, unit = vs[0], raw\n", - " except Exception:\n", + " except Exception as e:\n", " value, unit = v, None\n", " else:\n", " value, unit = vs[0], None\n", @@ -87,7 +87,7 @@ "\n", " if value is None:\n", " raise ValueError(f\"failed parsing {v}\")\n", - "\n", + " \n", " return value, unit" ] }, @@ -108,7 +108,7 @@ "metadata": {}, "outputs": [], "source": [ - "client.init_columns({}) # force reset columns\n", + "client.init_columns({}) # force reset columns\n", "client.init_columns(columns)" ] }, @@ -130,12 +130,14 @@ "contributions = []\n", "\n", "for d in data:\n", - " contrib = {\"identifier\": d[\"identifier\"], \"formula\": d[\"formula\"], \"data\": {}}\n", - "\n", + " contrib = {\n", + " \"identifier\": d[\"identifier\"], \"formula\": d[\"formula\"], \"data\": {}\n", + " }\n", + " \n", " for k, v in flatten(d[\"data\"], reducer=\"dot\").items():\n", " value, unit = get_value_unit(v)\n", " contrib[f\"data.{k}\"] = f\"{value} {unit}\" if unit else value\n", - "\n", + " \n", " contributions.append(unflatten(contrib, splitter=\"dot\"))" ] }, diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ocp/ocp-update.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ocp/ocp-update.ipynb index 866af3cc99..a7bc713994 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ocp/ocp-update.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ocp/ocp-update.ipynb @@ -28,9 +28,7 @@ "metadata": {}, "outputs": [], "source": [ - "df = read_pickle(\n", - " \"/Users/patrick/GoogleDriveLBNL/MaterialsProject/gitrepos/mpcontribs-data/Actual_adsorption_Es.pkl\"\n", - ")" + "df = read_pickle(\"/Users/patrick/GoogleDriveLBNL/MaterialsProject/gitrepos/mpcontribs-data/Actual_adsorption_Es.pkl\")" ] }, { @@ -75,7 +73,7 @@ "results = client.query_contributions(\n", " query=query,\n", " fields=[\"id\", \"identifier\", \"data.adsorptionEnergy.display\"],\n", - " paginate=True,\n", + " paginate=True\n", ")\n", "# TODO 3rd and 4th round of requests takes 30 min (totals & actual query)" ] @@ -100,10 +98,7 @@ "contributions = []\n", "\n", "for d in results[\"data\"]:\n", - " contrib = {\n", - " \"id\": d[\"id\"],\n", - " \"data.systemEnergy\": d[\"data\"][\"adsorptionEnergy\"][\"display\"],\n", - " }\n", + " contrib = {\"id\": d[\"id\"], \"data.systemEnergy\": d[\"data\"][\"adsorptionEnergy\"][\"display\"]}\n", " contrib[\"data.adsorptionEnergy\"] = adsorption[d[\"identifier\"]]\n", " contributions.append(contrib)" ] @@ -144,7 +139,7 @@ "\n", "# if path == \"adsorptionEnergy\":\n", "# new_columns[\"systemEnergy\"] = unit\n", - "\n", + " \n", "# new_columns" ] }, diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ocp/ocp-upload.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ocp/ocp-upload.ipynb index 712452dfbf..7f82031902 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ocp/ocp-upload.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ocp/ocp-upload.ipynb @@ -12,6 +12,7 @@ "from ujson import load\n", "from pymatgen.core.structure import Molecule, Structure\n", "from pathlib import Path\n", + "from time import time\n", "from mpcontribs.client import Client\n", "from tqdm.auto import tqdm" ] @@ -47,27 +48,24 @@ "source": [ "decoder = MontyDecoder()\n", "\n", - "\n", "def get_contribution(path):\n", - "\n", + " \n", " if path.stat().st_size / 1024 / 1024 > 15:\n", " return None\n", - "\n", + " \n", " with gzip.open(path) as f:\n", " data = decoder.process_decoded(load(f))\n", + " \n", + " struct = data['trajectory'][-1]\n", + " struct.add_site_property('tags', [int(t) for t in data['tags']])\n", "\n", - " struct = data[\"trajectory\"][-1]\n", - " struct.add_site_property(\"tags\", [int(t) for t in data[\"tags\"]])\n", - "\n", - " mol = Molecule.from_sites([site for site in struct if site.properties[\"tags\"] == 2])\n", + " mol = Molecule.from_sites([site for site in struct if site.properties['tags'] == 2])\n", " iupac_formula = mol.composition.iupac_formula\n", - " bulk_struct = Structure.from_sites(\n", - " [site for site in struct if site.properties[\"tags\"] != 2]\n", - " )\n", + " bulk_struct = Structure.from_sites([site for site in struct if site.properties['tags'] != 2])\n", " bulk_formula = bulk_struct.composition.reduced_formula\n", "\n", " search_data = {\n", - " \"mpid\": data[\"bulk_id\"],\n", + " \"mpid\": data['bulk_id'],\n", " \"adsorptionEnergy\": data[\"adsorption_energy\"],\n", " # TODO systemEnergy?\n", " \"adsorbateSmiles\": data[\"adsorbate_smiles\"],\n", @@ -77,7 +75,7 @@ " \"k\": data[\"surface_miller_indices\"][1],\n", " \"l\": data[\"surface_miller_indices\"][2],\n", " \"surfaceTop\": data[\"surface_top\"],\n", - " \"surfaceShift\": data[\"surface_shift\"],\n", + " \"surfaceShift\": data[\"surface_shift\"]\n", " }\n", "\n", " return {\n", @@ -85,7 +83,7 @@ " \"identifier\": data[\"id\"],\n", " \"data\": search_data,\n", " \"structures\": [struct],\n", - " \"attachments\": [path],\n", + " \"attachments\": [path]\n", " }" ] }, @@ -142,14 +140,14 @@ " contrib = get_contribution(path)\n", " if not contrib:\n", " continue\n", - "\n", + " \n", " contributions.append(contrib)\n", " cnt += 1\n", - "\n", + " \n", " if not cnt % 2000:\n", " client.submit_contributions(contributions, **kwargs)\n", " contributions.clear()\n", - "\n", + " \n", "if contributions:\n", " client.submit_contributions(contributions, **kwargs)\n", "\n", diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/open_catalyst_project.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/open_catalyst_project.ipynb index a25ff13d05..25f34580fc 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/open_catalyst_project.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/open_catalyst_project.ipynb @@ -9,8 +9,10 @@ "source": [ "from mpcontribs.client import Client\n", "from monty.serialization import loadfn\n", + "from json import loads\n", "from pymatgen.core.structure import Molecule, Structure\n", - "from pathlib import Path" + "from pathlib import Path\n", + "from time import time" ] }, { @@ -54,20 +56,17 @@ "metadata": {}, "outputs": [], "source": [ - "client.init_columns(\n", - " name,\n", - " {\n", - " \"id\": None, # id\n", - " \"energy\": \"meV\", # adsorption_energy\n", - " \"smiles\": None, # adsorbate_smiles\n", - " \"formulas.IUPAC\": None,\n", - " \"formulas.bulk\": None,\n", - " \"formulas.trajectory\": None,\n", - " \"surface.miller\": None,\n", - " \"surface.top\": None,\n", - " \"surface.shift\": \"\",\n", - " },\n", - ")" + "client.init_columns(name, {\n", + " \"id\": None, # id\n", + " \"energy\": \"meV\", # adsorption_energy\n", + " \"smiles\": None, # adsorbate_smiles\n", + " \"formulas.IUPAC\": None,\n", + " \"formulas.bulk\": None,\n", + " \"formulas.trajectory\": None,\n", + " \"surface.miller\": None,\n", + " \"surface.top\": None,\n", + " \"surface.shift\": \"\"\n", + "})" ] }, { @@ -77,9 +76,7 @@ "metadata": {}, "outputs": [], "source": [ - "p = Path(\n", - " \"/Users/patrick/GoogleDriveLBNL/MaterialsProject/gitrepos/mpcontribs-data/ocp-sample\"\n", - ")\n", + "p = Path(\"/Users/patrick/GoogleDriveLBNL/MaterialsProject/gitrepos/mpcontribs-data/ocp-sample\")\n", "jsons = list(p.glob(\"*.json.gz\"))" ] }, @@ -93,33 +90,29 @@ "def get_miller(indices):\n", " return f\"[{indices[0]}{indices[1]}{indices[2]}]\"\n", "\n", - "\n", "def get_contribution(path):\n", - "\n", + " \n", " if path.stat().st_size / 1024 < 150:\n", + " \n", " data = loadfn(path)\n", - " struct = data[\"trajectory\"][-1]\n", - " struct.add_site_property(\"tags\", [int(t) for t in data[\"tags\"]])\n", + " struct = data['trajectory'][-1]\n", + " struct.add_site_property('tags', [int(t) for t in data['tags']])\n", "\n", - " mol = Molecule.from_sites(\n", - " [site for site in struct if site.properties[\"tags\"] == 2]\n", - " )\n", + " mol = Molecule.from_sites([site for site in struct if site.properties['tags'] == 2])\n", " iupac_formula = mol.composition.iupac_formula\n", - " bulk_struct = Structure.from_sites(\n", - " [site for site in struct if site.properties[\"tags\"] != 2]\n", - " )\n", + " bulk_struct = Structure.from_sites([site for site in struct if site.properties['tags'] != 2])\n", " bulk_formula = bulk_struct.composition.reduced_formula\n", "\n", " search_data = {\n", - " \"id\": data[\"id\"],\n", - " \"energy\": f\"{data['adsorption_energy']} meV\",\n", + " \"id\": data['id'],\n", + " \"energy\": f'{data[\"adsorption_energy\"]} meV',\n", " \"smiles\": data[\"adsorbate_smiles\"],\n", " \"formulas.IUPAC\": iupac_formula,\n", " \"formulas.bulk\": bulk_formula,\n", " \"formulas.trajectory\": struct.composition.reduced_formula,\n", " \"surface.miller\": get_miller(data[\"surface_miller_indices\"]),\n", " \"surface.top\": str(data[\"surface_top\"]),\n", - " \"surface.shift\": data[\"surface_shift\"],\n", + " \"surface.shift\": data[\"surface_shift\"]\n", " }\n", "\n", " contribution = {\n", @@ -127,7 +120,7 @@ " \"identifier\": data[\"bulk_id\"],\n", " \"data\": search_data,\n", " \"structures\": [struct],\n", - " \"attachments\": [path],\n", + " \"attachments\": [path]\n", " }\n", "\n", " return contribution" @@ -164,7 +157,7 @@ "all_ids = client.get_all_ids(\n", " {\"project\": name},\n", " include=[\"structures\", \"attachments\"],\n", - " data_id_fields={name: \"id\"},\n", + " data_id_fields={name: \"id\"}\n", ").get(name)" ] }, diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/perovskites_diffusion.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/perovskites_diffusion.ipynb index a702178910..026d09bec2 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/perovskites_diffusion.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/perovskites_diffusion.ipynb @@ -53,7 +53,7 @@ "metadata": {}, "outputs": [], "source": [ - "import tarfile\n", + "import tarfile, os\n", "from pandas import read_excel\n", "\n", "units = {\n", @@ -97,7 +97,7 @@ " key = keys[col]\n", " if isinstance(key, str):\n", " key = key.strip()\n", - " if key not in abbreviations:\n", + " if not key in abbreviations:\n", " abbreviations[key] = col\n", " else:\n", " key = col.strip().lower()\n", @@ -110,7 +110,7 @@ " contcar_path = \"bulk_CONTCARs/{}_CONTCAR\".format(\n", " data[\"directory\"].replace(\"/\", \"_\")\n", " )\n", - " contcar = contcars.extractfile(contcar_path).read().decode(\"utf8\")\n", + " contcar = contcars.extractfile(contcar_path).read().decode(\"utf8\") \n", " structure = Structure.from_str(contcar, \"poscar\", sort=True)\n", "\n", " if identifier is None:\n", @@ -129,16 +129,11 @@ " data[key] = val\n", "\n", " if identifier:\n", - " contributions.append(\n", - " {\n", - " \"project\": name,\n", - " \"identifier\": identifier,\n", - " \"is_public\": True,\n", - " \"data\": data,\n", - " \"structures\": [structure],\n", - " }\n", - " )\n", - "\n", + " contributions.append({\n", + " \"project\": name, \"identifier\": identifier, \"is_public\": True,\n", + " \"data\": data, \"structures\": [structure]\n", + " })\n", + " \n", "len(contributions)" ] }, diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/pycroscopy.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/pycroscopy.ipynb index 5e42a07812..99f10a538d 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/pycroscopy.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/pycroscopy.ipynb @@ -13,7 +13,6 @@ "import matplotlib.pyplot as plt\n", "import torch\n", "from atomai.utils import graphx\n", - "\n", "%matplotlib inline" ] }, @@ -30,7 +29,7 @@ "model_path = f\"{data_dir}/G_MD.tar\"\n", "model = aoi.load_model(model_path)\n", "# model as dict\n", - "device = \"cuda\" if torch.cuda.is_available() else \"cpu\"\n", + "device = 'cuda' if torch.cuda.is_available() else 'cpu'\n", "model_dict = torch.load(model_path, map_location=device)" ] }, @@ -60,22 +59,20 @@ "# model.predict(imgdata, resize=(new_height, new_width))\n", "\n", "map_dict = {0: \"C\", 1: \"Si\"} # classes to chemical elements\n", - "px2ang = 0.104 # pixel-to-angstrom conversion\n", - "coord = coords[0] # take the first (and the only one) frame\n", - "clusters = graphx.find_cycle_clusters(\n", - " coord, cycles=[5, 7], map_dict=map_dict, px2ang=px2ang\n", - ")\n", + "px2ang = 0.104 # pixel-to-angstrom conversion\n", + "coord = coords[0] # take the first (and the only one) frame\n", + "clusters = graphx.find_cycle_clusters(coord, cycles=[5,7], map_dict=map_dict, px2ang=px2ang)\n", "fig, ax = plt.subplots(1, 1, figsize=figsize)\n", - "ax.imshow(imgdata, cmap=\"gray\", origin=\"lower\")\n", + "ax.imshow(imgdata, cmap='gray', origin='lower')\n", "\n", "for i, cl in enumerate(clusters):\n", - " ax.scatter(cl[:, 1], cl[:, 0], s=2, color=\"red\")\n", + " ax.scatter(cl[:, 1], cl[:, 0], s=2, color='red')\n", " xt = int(np.mean(cl[:, 1]))\n", " yt = int(np.mean(cl[:, 0]))\n", - " ax.annotate(str(i + 1), (xt, yt), size=10, color=\"white\")\n", - "\n", + " ax.annotate(str(i+1), (xt, yt), size=10, color='white')\n", + " \n", "img_path_clusters = imgdata_path.replace(\".npy\", \"_clusters.png\")\n", - "plt.savefig(img_path_clusters, bbox_inches=\"tight\")" + "plt.savefig(img_path_clusters, bbox_inches='tight')" ] }, { @@ -86,20 +83,20 @@ "outputs": [], "source": [ "clusters_mod = []\n", - "# adding a column for C atom as class 0\n", + "#adding a column for C atom as class 0\n", "pad_ = 1\n", "for i in range(len(clusters)):\n", - " clusters[i] = np.pad(clusters[i], (0, pad_), \"constant\")\n", + " clusters[i] = np.pad(clusters[i], (0, pad_), 'constant')\n", " clusters[i] = clusters[i][:-1]\n", " clusters_mod.append(clusters[i])\n", - "\n", - "# we can also save all the defects per image frame\n", + " \n", + "#we can also save all the defects per image frame\n", "defect_num = 15\n", "coords_def_15 = {0: clusters_mod[defect_num]}\n", - "plt.scatter(coords_def_15[0][:, 1], coords_def_15[0][:, 0])\n", + "plt.scatter(coords_def_15[0][:,1], coords_def_15[0][:,0])\n", "\n", "img_path_defects = imgdata_path.replace(\".npy\", \"_defects.png\")\n", - "plt.savefig(img_path_defects, bbox_inches=\"tight\")" + "plt.savefig(img_path_defects, bbox_inches='tight')" ] }, { @@ -137,7 +134,10 @@ "outputs": [], "source": [ "imgdata_list = list(imgdata.tolist())\n", - "model_dict[\"weights\"] = {k: v.tolist() for k, v in model_dict[\"weights\"].items()}" + "model_dict[\"weights\"] = {\n", + " k: v.tolist()\n", + " for k, v in model_dict[\"weights\"].items()\n", + "}" ] }, { @@ -147,18 +147,13 @@ "metadata": {}, "outputs": [], "source": [ - "contributions = [\n", - " {\n", - " \"identifier\": \"mp-7576\", # CrSi on MP\n", - " \"data\": {\"clusters\": len(clusters)},\n", - " \"attachments\": Attachments.from_list(\n", - " [\n", - " img_path_clusters,\n", - " img_path_defects, # imgdata_list, model_dict,\n", - " ]\n", - " ),\n", - " }\n", - "]" + "contributions = [{\n", + " \"identifier\": \"mp-7576\", # CrSi on MP\n", + " \"data\": {\"clusters\": len(clusters)},\n", + " \"attachments\": Attachments.from_list([\n", + " img_path_clusters, img_path_defects, #imgdata_list, model_dict,\n", + " ])\n", + "}]" ] }, { diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/pydatarecognition.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/pydatarecognition.ipynb index cc12f86a43..4f1d69e8b4 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/pydatarecognition.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/pydatarecognition.ipynb @@ -8,9 +8,11 @@ "outputs": [], "source": [ "%env MPRESTER_MUTE_PROGRESS_BARS 1\n", + "import os\n", "from pathlib import Path\n", "from mpcontribs.client import Client\n", - "from flatten_dict import unflatten\n", + "from mp_api.client import MPRester\n", + "from flatten_dict import unflatten, flatten\n", "from pymatgen.io.cif import CifParser\n", "from pandas import DataFrame\n", "import numpy as np" @@ -63,42 +65,23 @@ "source": [ "# calculated cifs (NOTE make sure to gzip all CIFs)\n", "contributions = []\n", - "columns = {\"type\": None, \"date\": None, \"wavelength\": \"Å\"} # sets fields and their units\n", + "columns = {\"type\": None, \"date\": None, \"wavelength\": \"Å\"} # sets fields and their units\n", "\n", "for path in (cifs / \"calculated\").iterdir():\n", " for identifier, v in CifParser(path).as_dict().items():\n", " typ, date = v[\"_publcif_pd_cifplot\"].strip().split()\n", - " wavelength = f\"{v['_diffrn_radiation_wavelength']} Å\"\n", + " wavelength = f'{v[\"_diffrn_radiation_wavelength\"]} Å'\n", " intensities = v[\"_pd_calc_intensity_total\"]\n", " prefix, nbins = \"_pd_proc_2theta_range\", len(intensities)\n", - " inc, start, end = (\n", - " float(v[f\"{prefix}_inc\"]),\n", - " float(v[f\"{prefix}_min\"]),\n", - " float(v[f\"{prefix}_max\"]),\n", - " )\n", - " two_theta = np.arange(\n", - " 0, end, inc\n", - " ) # BUG? getting 1999 bins for start=0.02 (converted to Q)\n", - " spectrum = DataFrame({\"2θ\": two_theta, \"intensity\": intensities}).set_index(\n", - " \"2θ\"\n", - " )\n", - " spectrum.attrs = {\n", - " \"name\": \"powder diffraction\",\n", - " \"title\": \"Powder Diffraction Pattern\",\n", - " }\n", - " contributions.append(\n", - " {\n", - " \"identifier\": identifier,\n", - " \"formula\": v[\"_chemical_formula\"],\n", - " \"data\": {\n", - " \"type\": typ,\n", - " \"date\": date,\n", - " \"wavelength\": wavelength,\n", - " \"proc\": d[\"proc\"],\n", - " },\n", - " # \"tables\": [spectrum], \"attachments\": [path]\n", - " }\n", - " )\n", + " inc, start, end = float(v[f\"{prefix}_inc\"]), float(v[f\"{prefix}_min\"]), float(v[f\"{prefix}_max\"])\n", + " two_theta = np.arange(0, end, inc) # BUG? getting 1999 bins for start=0.02 (converted to Q)\n", + " spectrum = DataFrame({\"2θ\": two_theta, \"intensity\": intensities}).set_index(\"2θ\")\n", + " spectrum.attrs = {\"name\": \"powder diffraction\", \"title\": \"Powder Diffraction Pattern\"}\n", + " contributions.append({\n", + " \"identifier\": identifier, \"formula\": v[\"_chemical_formula\"],\n", + " \"data\": {\"type\": typ, \"date\": date, \"wavelength\": wavelength, \"proc\": d[\"proc\"]},\n", + " #\"tables\": [spectrum], \"attachments\": [path]\n", + " })\n", "\n", "len(contributions)" ] @@ -122,7 +105,7 @@ "client.init_columns(columns)\n", "client.submit_contributions(contributions, ignore_dupes=True, per_request=6)\n", "# this shouldn't be necessary but need to re-init columns likely due to bug in API server\n", - "client.init_columns(columns)\n", + "client.init_columns(columns) \n", "\n", "# NOTE submit_contributions can also be used to submit partial updates (can provide example in the future)" ] @@ -166,9 +149,7 @@ "metadata": {}, "outputs": [], "source": [ - "attm = client.get_attachment(\n", - " result[\"data\"][0][\"attachments\"][0][\"id\"]\n", - ") # use attm.unpack() to get file contents" + "attm = client.get_attachment(result[\"data\"][0][\"attachments\"][0][\"id\"]) # use attm.unpack() to get file contents" ] }, { @@ -178,7 +159,7 @@ "metadata": {}, "outputs": [], "source": [ - "table = client.get_table(result[\"data\"][0][\"tables\"][0][\"id\"]) # pandas Dataframe" + "table = client.get_table(result[\"data\"][0][\"tables\"][0][\"id\"]) # pandas Dataframe" ] }, { diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/qsgw_band_structures.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/qsgw_band_structures.ipynb index d52783dd71..33623c3aa5 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/qsgw_band_structures.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/qsgw_band_structures.ipynb @@ -11,7 +11,6 @@ "# - set environment variable MPCONTRIBS_API_KEY to API key\n", "# - more info about client functions in according docstrings\n", "from mpcontribs.client import Client\n", - "\n", "name = \"qsgw_band_structures\"\n", "client = Client(project=name)" ] @@ -40,68 +39,87 @@ "source": [ "contributions = [\n", " {\n", - " \"identifier\": \"mp-1020712\", # ZnSiN2\n", - " \"data\": {\n", - " \"reference\": \"https://doi.org/10.1103/PhysRevB.84.165204\",\n", - " \"Γ\": {\n", - " \"ΔE\": {\"indirect\": \"5.70 eV\", \"direct\": \"5.92 eV\"},\n", - " \"VBM\": {\"b₁\": \"0\", \"a₂\": \"-20 meV\", \"b₂\": \"-40 meV\", \"a₁\": \"-180 meV\"},\n", - " },\n", - " },\n", - " },\n", - " {\n", - " \"identifier\": \"mp-2979\", # ZnGeN2\n", - " \"data\": {\n", - " \"reference\": \"https://doi.org/10.1103/PhysRevB.84.165204\",\n", - " \"Γ\": {\n", - " \"ΔE\": {\"direct\": \"3.60 eV\"},\n", - " \"VBM\": {\"b₁\": \"0\", \"b₂\": \"-28 meV\", \"a₁\": \"-129 meV\"},\n", - " },\n", - " },\n", - " },\n", - " {\n", - " \"identifier\": \"mp-1029469\", # ZnSnN2\n", - " \"data\": {\n", - " \"reference\": \"https://doi.org/10.1103/PhysRevB.91.205207\",\n", - " \"Γ\": {\n", - " \"ΔE\": {\"direct\": \"1.82 eV\"},\n", - " \"VBM\": {\"b₁\": \"0\", \"b₂\": \"-188 meV\", \"a₁\": \"-176 meV\"},\n", - " },\n", - " },\n", - " },\n", - " {\n", - " \"identifier\": \"mp-3677\", # MgSiN2\n", - " \"data\": {\n", - " \"reference\": \"https://doi.org/10.1103/PhysRevB.94.125201\",\n", - " \"Γ\": {\n", - " \"ΔE\": {\n", - " \"indirect\": \"6.08 eV\",\n", - " \"direct\": \"6.53 eV\",\n", - " \"direct3x4x4\": \"6.30 eV\",\n", + " 'identifier': 'mp-1020712', # ZnSiN2\n", + " 'data': {\n", + " 'reference': 'https://doi.org/10.1103/PhysRevB.84.165204',\n", + " 'Γ': {\n", + " 'ΔE': {\n", + " 'indirect': '5.70 eV',\n", + " 'direct': '5.92 eV'\n", + " },\n", + " 'VBM': {\n", + " 'b₁': '0',\n", + " 'a₂': '-20 meV',\n", + " 'b₂': '-40 meV',\n", + " 'a₁': '-180 meV'\n", " }\n", - " },\n", - " },\n", - " },\n", - " {\n", - " \"identifier\": \"mp-7798\", # MgGeN2\n", - " \"data\": {\n", - " \"reference\": \"https://doi.org/10.1016/j.ssc.2019.113664\",\n", - " \"Γ\": {\n", - " \"ΔE\": {\"direct\": \"4.11 eV\"},\n", - " \"VBM\": {\"b₁\": \"0\", \"b₂\": \"-82 meV\", \"a₁\": \"-238 meV\"},\n", - " },\n", - " },\n", - " },\n", - " {\n", - " \"identifier\": \"mp-1029791\", # MgSnN2\n", - " \"data\": {\n", - " \"reference\": \"https://doi.org/10.1016/j.ssc.2019.113664\",\n", - " \"Γ\": {\n", - " \"ΔE\": {\"direct\": \"2.28 eV\"},\n", - " \"VBM\": {\"b₁\": \"0\", \"b₂\": \"-116 meV\", \"a₁\": \"-144 meV\"},\n", - " },\n", - " },\n", - " },\n", + " }\n", + " }\n", + " }, {\n", + " 'identifier': 'mp-2979', # ZnGeN2\n", + " 'data': {\n", + " 'reference': 'https://doi.org/10.1103/PhysRevB.84.165204',\n", + " 'Γ': {\n", + " 'ΔE': {'direct': '3.60 eV'},\n", + " 'VBM': {\n", + " 'b₁': '0',\n", + " 'b₂': '-28 meV',\n", + " 'a₁': '-129 meV'\n", + " }\n", + " }\n", + " }\n", + " }, {\n", + " 'identifier': 'mp-1029469', # ZnSnN2\n", + " 'data': {\n", + " 'reference': 'https://doi.org/10.1103/PhysRevB.91.205207',\n", + " 'Γ': {\n", + " 'ΔE': {'direct': '1.82 eV'},\n", + " 'VBM': {\n", + " 'b₁': '0',\n", + " 'b₂': '-188 meV',\n", + " 'a₁': '-176 meV'\n", + " }\n", + " }\n", + " }\n", + " }, {\n", + " 'identifier': 'mp-3677', # MgSiN2\n", + " 'data': {\n", + " 'reference': 'https://doi.org/10.1103/PhysRevB.94.125201',\n", + " 'Γ': {\n", + " 'ΔE': {\n", + " 'indirect': '6.08 eV',\n", + " 'direct': '6.53 eV',\n", + " 'direct3x4x4': '6.30 eV'\n", + " }\n", + " }\n", + " }\n", + " }, {\n", + " 'identifier': 'mp-7798', # MgGeN2\n", + " 'data': {\n", + " 'reference': 'https://doi.org/10.1016/j.ssc.2019.113664',\n", + " 'Γ' : {\n", + " 'ΔE': {'direct': '4.11 eV'},\n", + " 'VBM': {\n", + " 'b₁': '0',\n", + " 'b₂': '-82 meV',\n", + " 'a₁': '-238 meV'\n", + " }\n", + " }\n", + " }\n", + " }, {\n", + " 'identifier': 'mp-1029791', # MgSnN2\n", + " 'data': {\n", + " 'reference': 'https://doi.org/10.1016/j.ssc.2019.113664',\n", + " 'Γ' : {\n", + " 'ΔE': {'direct': '2.28 eV'},\n", + " 'VBM': {\n", + " 'b₁': '0',\n", + " 'b₂': '-116 meV',\n", + " 'a₁': '-144 meV'\n", + " }\n", + " }\n", + " }\n", + " }\n", "]" ] }, @@ -129,18 +147,16 @@ "outputs": [], "source": [ "# [optional] initialize columns to explicitly set order, visibility and units\n", - "client.init_columns(\n", - " columns={\n", - " \"reference\": None,\n", - " \"Γ.ΔE.direct\": \"eV\",\n", - " \"Γ.ΔE.direct3x4x4\": \"eV\",\n", - " \"Γ.ΔE.indirect\": \"eV\",\n", - " \"Γ.VBM.a₁\": \"meV\",\n", - " \"Γ.VBM.a₂\": \"meV\",\n", - " \"Γ.VBM.b₁\": \"\",\n", - " \"Γ.VBM.b₂\": \"meV\",\n", - " }\n", - ")" + "client.init_columns(columns={\n", + " \"reference\": None,\n", + " \"Γ.ΔE.direct\": \"eV\",\n", + " \"Γ.ΔE.direct3x4x4\": \"eV\",\n", + " \"Γ.ΔE.indirect\": \"eV\",\n", + " \"Γ.VBM.a₁\": \"meV\",\n", + " \"Γ.VBM.a₂\": \"meV\",\n", + " \"Γ.VBM.b₁\": \"\",\n", + " \"Γ.VBM.b₂\": \"meV\",\n", + "})" ] } ], diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/screening_inorganic_pv.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/screening_inorganic_pv.ipynb index 07d2043bee..cb9e56014f 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/screening_inorganic_pv.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/screening_inorganic_pv.ipynb @@ -6,7 +6,7 @@ "metadata": {}, "outputs": [], "source": [ - "import json\n", + "import os, json\n", "from pathlib import Path\n", "from pandas import DataFrame\n", "from mpcontribs.client import Client\n", @@ -41,7 +41,7 @@ " \"summary\": \"SUMMARY.json\",\n", " \"absorption\": \"ABSORPTION-CLIPPED.json\",\n", " \"dos\": \"DOS.json\",\n", - " \"formulae\": \"FORMATTED-FORMULAE.json\",\n", + " \"formulae\": \"FORMATTED-FORMULAE.json\"\n", "}\n", "data = {}\n", "\n", @@ -49,7 +49,7 @@ " path = indir / v\n", " with path.open(mode=\"r\") as f:\n", " data[k] = json.load(f)\n", - "\n", + " \n", "for k, v in data.items():\n", " print(k, len(v))" ] @@ -74,7 +74,7 @@ " \"E_g_d\": {\"path\": \"ΔE.direct\", \"unit\": \"eV\"},\n", " \"E_g_da\": {\"path\": \"ΔE.dipole\", \"unit\": \"eV\"},\n", " \"m_e\": {\"path\": \"mᵉ\", \"unit\": \"mₑ\"},\n", - " \"m_h\": {\"path\": \"mʰ\", \"unit\": \"mₑ\"},\n", + " \"m_h\": {\"path\": \"mʰ\", \"unit\": \"mₑ\"}\n", "}\n", "columns = {c[\"path\"]: c[\"unit\"] for c in config.values()}\n", "contributions = []\n", @@ -82,28 +82,28 @@ "for mp_id, d in data[\"summary\"].items():\n", " formula = data[\"formulae\"][mp_id].replace(\"\", \"\").replace(\"\", \"\")\n", " contrib = {\"project\": name, \"identifier\": mp_id, \"data\": {\"formula\": formula}}\n", - " cdata = {v[\"path\"]: f\"{d[k]} {v['unit']}\" for k, v in config.items()}\n", + " cdata = {v[\"path\"]: f'{d[k]} {v[\"unit\"]}' for k, v in config.items()}\n", " contrib[\"data\"] = unflatten(cdata)\n", - "\n", + " \n", " df_abs = DataFrame(data=data[\"absorption\"][mp_id])\n", " df_abs.columns = [\"hν [eV]\", \"α [cm⁻¹]\"]\n", " df_abs.set_index(\"hν [eV]\", inplace=True)\n", - " df_abs.columns.name = \"\" # legend name\n", + " df_abs.columns.name = \"\" # legend name\n", " df_abs.attrs[\"name\"] = \"absorption\"\n", " df_abs.attrs[\"title\"] = \"optical absorption spectrum\"\n", " df_abs.attrs[\"labels\"] = {\"variable\": \"\", \"value\": \"α [cm⁻¹]\"}\n", "\n", " df_dos = DataFrame(data=data[\"dos\"][mp_id])\n", - " df_dos.columns = [\"E [eV]\", \"DOS [eV⁻¹]\"]\n", + " df_dos.columns = ['E [eV]', 'DOS [eV⁻¹]']\n", " df_dos.set_index(\"E [eV]\", inplace=True)\n", - " df_dos.columns.name = \"\" # legend name\n", + " df_dos.columns.name = \"\" # legend name\n", " df_dos.attrs[\"name\"] = \"DOS\"\n", " df_dos.attrs[\"title\"] = \"electronic density of states\"\n", " df_dos.attrs[\"labels\"] = {\"variable\": \"\", \"value\": \"DOS [eV⁻¹]\"}\n", "\n", " contrib[\"tables\"] = [df_abs, df_dos]\n", " contributions.append(contrib)\n", - "\n", + " \n", "len(contributions)" ] }, diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/silicon_defects.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/silicon_defects.ipynb index ab3ab1d059..b03018e553 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/silicon_defects.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/silicon_defects.ipynb @@ -11,7 +11,7 @@ "from mpcontribs.client import Client, Attachment\n", "from pymatgen.core import Structure\n", "from pathlib import Path\n", - "from flatten_dict import flatten" + "from flatten_dict import flatten, unflatten" ] }, { @@ -57,13 +57,13 @@ " \"mu\": {\"field\": \"mu\", \"unit\": \"\"},\n", " \"spin\": {\"field\": \"spin\", \"unit\": \"\"},\n", " \"ks_diff\": {\"field\": \"ks|diff\", \"unit\": \"\"},\n", - " \"hse0_ks_diff\": {\"field\": \"ks|diff\", \"unit\": \"\"}, # can map to same subkey\n", + " \"hse0_ks_diff\": {\"field\": \"ks|diff\", \"unit\": \"\"}, # can map to same subkey\n", " \"shuffle\": {\"field\": \"shuffle\", \"unit\": None},\n", " \"in_band_transition\": {\"field\": \"transition\", \"unit\": None},\n", " \"missing_vbm\": {\"field\": \"VBM|missing\", \"unit\": None},\n", " \"initial_band\": {\"field\": \"band.initial\", \"unit\": \"\"},\n", " \"final_band\": {\"field\": \"band.final\", \"unit\": \"\"},\n", - " \"inital_band_e\": {\"field\": \"band|e.initial\", \"unit\": \"\"}, # typo in data!\n", + " \"inital_band_e\": {\"field\": \"band|e.initial\", \"unit\": \"\"}, # typo in data!\n", " \"final_band_e\": {\"field\": \"band|e.final\", \"unit\": \"\"},\n", " \"initial_ipr\": {\"field\": \"ipr.initial\", \"unit\": \"\"},\n", " \"final_ipr\": {\"field\": \"ipr.final\", \"unit\": \"\"},\n", @@ -71,9 +71,9 @@ "}\n", "\n", "reorg = {\n", - " \"is_complex\": {\"field\": \"complex\", \"unit\": None}, # str\n", + " \"is_complex\": {\"field\": \"complex\", \"unit\": None}, # str\n", " \"dopant\": {\"field\": \"dopant\", \"unit\": None},\n", - " \"charge\": {\"field\": \"charge\", \"unit\": \"\"}, # dimensionless\n", + " \"charge\": {\"field\": \"charge\", \"unit\": \"\"}, # dimensionless\n", " \"uncorrected_energy\": {\"field\": \"energy|uncorrected\", \"unit\": \"eV\"},\n", " \"chemsys\": {\"field\": \"chemsys\", \"unit\": None},\n", " \"space_group\": {\"field\": \"spacegroup\", \"unit\": None},\n", @@ -95,14 +95,14 @@ "}\n", "\n", "for k, v in list(reorg.items()):\n", - " if \"unit\" not in v:\n", + " if not \"unit\" in v:\n", " root_field = reorg.pop(k).get(\"field\")\n", - "\n", + " \n", " for kk, vv in excitation_reorg.items():\n", " new_key = f\"{k}.{kk}\"\n", " new_field = f\"{root_field}.{vv['field']}\"\n", " reorg[new_key] = {\"field\": new_field, \"unit\": vv[\"unit\"]}\n", - "\n", + " \n", "columns = {v[\"field\"]: v[\"unit\"] for k, v in reorg.items()}\n", "client.init_columns(columns)" ] @@ -117,7 +117,7 @@ "def convert(x, unit=None):\n", " if isinstance(x, bool):\n", " return \"Yes\" if x else \"No\"\n", - "\n", + " \n", " return x if not unit else f\"{x} {unit}\"" ] }, @@ -131,13 +131,8 @@ "contributions = []\n", "structure_keys = [\"initial_defect_structure\", \"final_defect_structure\"]\n", "attm_keys = [\n", - " \"int_eigenvalues\",\n", - " \"raw_eigenvalues\",\n", - " \"ipr\",\n", - " \"defect_ipr\",\n", - " \"raw_tdm_entry\",\n", - " \"hse0_raw_eigenvalues\",\n", - " \"hse0_int_eigenvalues\",\n", + " 'int_eigenvalues', 'raw_eigenvalues', 'ipr', 'defect_ipr', 'raw_tdm_entry',\n", + " 'hse0_raw_eigenvalues', 'hse0_int_eigenvalues'\n", "]\n", "remove_keys = [\"_id\", \"defect_dir\"]\n", "id_key = \"entry_id\"\n", @@ -147,26 +142,23 @@ "\n", "for r in raw:\n", " contrib = {\n", - " \"identifier\": f\"entry-{r[id_key]}\",\n", - " \"formula\": r[formula_key],\n", - " \"data\": {},\n", - " \"structures\": [],\n", - " \"attachments\": [],\n", + " \"identifier\": f\"entry-{r[id_key]}\", \"formula\": r[formula_key],\n", + " \"data\": {}, \"structures\": [], \"attachments\": []\n", " }\n", - "\n", + " \n", " for k, v in flatten(r, reducer=\"dot\").items():\n", " if k.split(\".\", 1)[0] not in skip_keys:\n", " contrib[\"data\"][reorg[k][\"field\"]] = convert(v, unit=reorg[k][\"unit\"])\n", - "\n", + " \n", " for k in structure_keys:\n", " s = Structure.from_dict(r[k])\n", " s.name = k\n", " contrib[\"structures\"].append(s)\n", - "\n", + " \n", " for k in attm_keys:\n", " a = Attachment.from_data(k, json.loads(r[k]))\n", - " contrib[\"attachments\"].append(a)\n", - "\n", + " contrib[\"attachments\"].append(a) \n", + " \n", " contributions.append(contrib)\n", "\n", "len(contributions)" diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/simple_test.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/simple_test.ipynb index d8e5f2db93..08070737a4 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/simple_test.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/simple_test.ipynb @@ -12,7 +12,7 @@ "\n", "client = Client(\n", " host=\"localhost.workshop-contribs-api.materialsproject.org\",\n", - " apikey=\"uZ0vulA09IBtqcGk9U5OYRNt6elCzETM\",\n", + " apikey=\"uZ0vulA09IBtqcGk9U5OYRNt6elCzETM\"\n", ")" ] }, @@ -28,16 +28,13 @@ " \"formula__contains\": \"Au\",\n", " \"data__PF__p__value__lt\": 10,\n", " \"data__PF__n__value__gt\": 1,\n", - " \"_sort\": \"-data.S.n.value\", # descending order\n", - " \"_limit\": 170, # up to maximum 500 per request\n", + "\n", + " \"_sort\": \"-data.S.n.value\", # descending order\n", + " \"_limit\": 170, # up to maximum 500 per request\n", " \"_fields\": [\n", - " \"identifier\",\n", - " \"formula\",\n", - " \"data.metal\",\n", - " \"data.S.n.value\",\n", - " \"data.S.p.value\",\n", - " \"data.PF.n.value\",\n", - " \"data.PF.p.value\",\n", + " \"identifier\", \"formula\", \"data.metal\",\n", + " \"data.S.n.value\", \"data.S.p.value\",\n", + " \"data.PF.n.value\", \"data.PF.p.value\"\n", " ],\n", "}" ] @@ -54,11 +51,13 @@ "\n", "while has_more:\n", " print(\"page\", page)\n", - " resp = client.contributions.get_entries(page=page, **query).result()\n", + " resp = client.contributions.get_entries(\n", + " page=page, **query\n", + " ).result()\n", " contributions += resp[\"data\"]\n", " has_more = resp[\"has_more\"]\n", " page += 1\n", - "\n", + " \n", "len(contributions)" ] }, @@ -80,17 +79,15 @@ "outputs": [], "source": [ "name = \"ws_phuck\"\n", - "client.projects.create_entry(\n", - " project={\n", - " \"name\": name,\n", - " \"title\": \"Workshop Test\",\n", - " \"long_title\": \"Long Workshop Test Title\",\n", - " \"authors\": \"P. Huck, J. Huck\",\n", - " \"description\": \"This is temp. Can be removed anytime\",\n", - " \"references\": [{\"label\": \"google\", \"url\": \"https://google.com\"}],\n", - " \"owner\": \"google:phuck@lbl.gov\",\n", - " }\n", - ").result()" + "client.projects.create_entry(project={\n", + " \"name\": name,\n", + " \"title\": \"Workshop Test\",\n", + " \"long_title\": \"Long Workshop Test Title\",\n", + " \"authors\": \"P. Huck, J. Huck\",\n", + " \"description\": \"This is temp. Can be removed anytime\",\n", + " \"references\": [{\"label\": \"google\", \"url\": \"https://google.com\"}],\n", + " \"owner\": \"google:phuck@lbl.gov\"\n", + "}).result()" ] }, { @@ -120,10 +117,9 @@ "metadata": {}, "outputs": [], "source": [ - "client.init_columns(\n", - " name,\n", - " {\"a\": \"eV\", \"b.c\": None, \"b.d\": None, \"d.e.f\": None, \"x\": None, \"tables\": None},\n", - ")" + "client.init_columns(name, {\n", + " \"a\": \"eV\", \"b.c\": None, \"b.d\": None, \"d.e.f\": None, \"x\": None, \"tables\": None\n", + "})" ] }, { @@ -133,8 +129,8 @@ "metadata": {}, "outputs": [], "source": [ - "data = [[\"tom\", 10], [\"nick\", 15], [\"juli\", 14]]\n", - "df = DataFrame(data, columns=[\"Name\", \"Age\"])\n", + "data = [['tom', 10], ['nick', 15], ['juli', 14]]\n", + "df = DataFrame(data, columns=['Name', 'Age'])\n", "df.set_index(\"Name\", inplace=True)\n", "df" ] @@ -146,25 +142,26 @@ "metadata": {}, "outputs": [], "source": [ - "contributions = [\n", - " {\n", - " \"project\": name,\n", - " \"identifier\": \"mp-4\",\n", - " \"data\": {\n", - " \"a\": \"3 eV\",\n", - " \"b\": {\"c\": \"hello\", \"d\": 5},\n", - " \"d.e.f\": \"nest via dot-notation\",\n", - " \"x\": \"(101)\",\n", - " },\n", - " \"tables\": [df],\n", + "contributions = [{\n", + " \"project\": name,\n", + " \"identifier\": \"mp-4\",\n", + " \"data\": {\n", + " \"a\": \"3 eV\",\n", + " \"b\": {\"c\": \"hello\", \"d\": 5},\n", + " \"d.e.f\": \"nest via dot-notation\",\n", + " \"x\": \"(101)\"\n", " },\n", - " {\n", - " \"project\": name,\n", - " \"identifier\": \"mp-6\",\n", - " \"data\": {\"a\": \"4 eV\", \"b\": {\"c\": \"what\", \"d\": 6}, \"d.e.f\": \"duh\"},\n", - " \"tables\": [df],\n", + " \"tables\": [df]\n", + "}, {\n", + " \"project\": name,\n", + " \"identifier\": \"mp-6\",\n", + " \"data\": {\n", + " \"a\": \"4 eV\",\n", + " \"b\": {\"c\": \"what\", \"d\": 6},\n", + " \"d.e.f\": \"duh\"\n", " },\n", - "]\n", + " \"tables\": [df]\n", + "}]\n", "client.submit_contributions(contributions, ignore_dupes=True)" ] }, @@ -195,9 +192,7 @@ "metadata": {}, "outputs": [], "source": [ - "client.contributions.get_entries(\n", - " project=name, _fields=[\"identifier\", \"is_public\"]\n", - ").result()" + "client.contributions.get_entries(project=name, _fields=[\"identifier\", \"is_public\"]).result()" ] }, { @@ -224,14 +219,13 @@ "\n", "query = {\n", " \"project\": \"carrier_transport\",\n", - " # \"id__not__in\": [\"5f8a3d9183a19cc44d02243e\", \"5f8a3d9283a19cc44d022447\"],\n", - " # \"data__functional__endswith\": \"+U\",\n", - " # \"data__mₑᶜ__p__ε₁__value__gte\": 0,\n", + " #\"id__not__in\": [\"5f8a3d9183a19cc44d02243e\", \"5f8a3d9283a19cc44d022447\"],\n", + " #\"data__functional__endswith\": \"+U\",\n", + " #\"data__mₑᶜ__p__ε₁__value__gte\": 0,\n", " \"last_modified__after\": after,\n", " \"last_modified__before\": before,\n", " \"_fields\": [\"id\", \"last_modified\"],\n", - " \"_limit\": 10,\n", - " \"_sort\": \"last_modified\",\n", + " \"_limit\": 10, \"_sort\": \"last_modified\"\n", "}\n", "client.contributions.get_entries(**query).result()" ] @@ -264,10 +258,10 @@ "outputs": [], "source": [ "client.tables.get_entries(\n", - " # attrs__title__icontains=\"xas\",\n", - " # attrs__labels__index__startswith=\"T\",\n", + " #attrs__title__icontains=\"xas\",\n", + " #attrs__labels__index__startswith=\"T\",\n", " attrs__labels__value__startswith=\"PF\",\n", - " _fields=[\"name\", \"attrs\", \"columns\", \"total_data_rows\"],\n", + " _fields=[\"name\", \"attrs\", \"columns\", \"total_data_rows\"]\n", ").result()" ] }, diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/springer_materials.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/springer_materials.ipynb index 0ec1ad6dc4..ce4e3b1dfd 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/springer_materials.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/springer_materials.ipynb @@ -11,7 +11,7 @@ "import re\n", "from glob import glob\n", "from mpcontribs.client import Client\n", - "from flatten_dict import unflatten" + "from flatten_dict import unflatten, flatten" ] }, { @@ -103,7 +103,7 @@ " # \"Status_of_Phase_Diagram\": {\"name\": \"phasediagram.status\"}\n", "}\n", "\n", - "keys - set(columns_map.keys()) # just making sure I didn't miss a key" + "keys - set(columns_map.keys()) # just making sure I didn't miss a key" ] }, { @@ -116,19 +116,16 @@ "# prep contributions\n", "contributions = []\n", "prop_set = set()\n", - "special_char_map = {ord(\"ä\"): \"ae\", ord(\"ü\"): \"ue\", ord(\"ö\"): \"oe\", ord(\"ß\"): \"ss\"}\n", - "CLEANR = re.compile(\"<.*?>\")\n", - "\n", + "special_char_map = {ord('ä'): 'ae', ord('ü'): 'ue', ord('ö'): 'oe', ord('ß'): 'ss'}\n", + "CLEANR = re.compile('<.*?>') \n", "\n", "def convert_prop(s):\n", " cleaned = \"\".join([c if c.isalnum() else \" \" for c in s])\n", " capitalized = \"\".join([w.capitalize() for w in cleaned.split()])\n", " return capitalized.translate(special_char_map)\n", "\n", - "\n", "def cleanhtml(raw_html):\n", - " return re.sub(CLEANR, \"\", raw_html)\n", - "\n", + " return re.sub(CLEANR, '', raw_html)\n", "\n", "for fn, docs in data.items():\n", " print(fn)\n", @@ -141,11 +138,10 @@ " # for prop in sorted(doc[\"List_of_Physical_Properties\"])\n", " # ] if category == \"physical-properties\" else []\n", " contrib = {\n", - " \"identifier\": identifier,\n", - " \"formula\": formula,\n", + " \"identifier\": identifier, \"formula\": formula,\n", " \"data\": {\"springer.category\": category},\n", " }\n", - "\n", + " \n", " # if properties:\n", " # prop_set |= set(properties)\n", " # for prop in properties:\n", @@ -162,11 +158,11 @@ " if unit is None and \"<\" in val:\n", " val = cleanhtml(val)\n", "\n", - " contrib[\"data\"][name] = f\"{val} {unit}\" if unit else val\n", - "\n", + " contrib[\"data\"][name] = f\"{val} {unit}\" if unit else val \n", + " \n", " contrib[\"data\"] = unflatten(contrib[\"data\"], splitter=\"dot\")\n", " contributions.append(contrib)\n", - "\n", + " \n", "len(contributions)" ] }, @@ -184,7 +180,7 @@ "# for prop in sorted(prop_set):\n", "# columns[f\"properties.available.{prop}\"] = None\n", "\n", - "# client.init_columns(columns)" + "#client.init_columns(columns)" ] }, { @@ -198,9 +194,7 @@ "client.delete_contributions() # need to delete first due to `unique_identifiers=False`\n", "client.init_columns(columns) # good practice :)\n", "client.submit_contributions(contributions)\n", - "client.init_columns(\n", - " columns\n", - ") # just to make sure that all columns show up in the intended order" + "client.init_columns(columns) # just to make sure that all columns show up in the intended order" ] }, { @@ -229,7 +223,7 @@ "query = {\n", " \"data__springer__category__exact\": \"physical-properties\",\n", " \"data__properties__main__exact\": \"elasticity\",\n", - " \"data__properties__stats__samples__value__gt\": 5,\n", + " \"data__properties__stats__samples__value__gt\": 5\n", "}\n", "client.count(query=query)" ] @@ -257,7 +251,7 @@ "springer_id = \"ppp_350781a8aa14dc0b19c6c879daff3be2\"\n", "client.query_contributions(\n", " query={\"data__springer__id__exact\": springer_id},\n", - " fields=[\"id\", \"identifier\", \"data.springer.id\", \"data.properties.pearson\"],\n", + " fields=[\"id\", \"identifier\", \"data.springer.id\", \"data.properties.pearson\"]\n", ")" ] }, @@ -269,12 +263,9 @@ "outputs": [], "source": [ "# count all entries for a list of formulas released before 2023\n", - "client.count(\n", - " query={\n", - " \"formula__in\": [\"Fe2O3\", \"GaAS\"],\n", - " \"data__springer__released__value__lt\": 2023,\n", - " }\n", - ")" + "client.count(query={\n", + " \"formula__in\": [\"Fe2O3\", \"GaAS\"], \"data__springer__released__value__lt\": 2023\n", + "})" ] }, { diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/swf.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/swf.ipynb index 03011858f9..a9741147a6 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/swf.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/swf.ipynb @@ -40,9 +40,7 @@ "metadata": {}, "outputs": [], "source": [ - "datadir = Path(\n", - " \"/Users/patrick/GoogleDriveLBNL/MaterialsProject/gitrepos/mpcontribs-data/swf\"\n", - ")\n", + "datadir = Path(\"/Users/patrick/GoogleDriveLBNL/MaterialsProject/gitrepos/mpcontribs-data/swf\")\n", "identifier = \"mp-1216347\"" ] }, @@ -60,7 +58,7 @@ "kondorsky.attrs = {\n", " \"title\": \"Angular Dependence of Switching Field\",\n", " \"labels\": {\"value\": \"Switching Field [T]\"},\n", - " \"log_y\": True, # TODO check if goes through\n", + " \"log_y\": True # TODO check if goes through\n", "}\n", "kondorsky.plot(**kondorsky.attrs)" ] @@ -79,7 +77,7 @@ "ip.attrs = {\n", " \"title\": \"IP Energy Product\",\n", " \"labels\": {\"value\": \"Composition [at%]\"},\n", - " \"kind\": \"scatter\", # TODO check if goes through\n", + " \"kind\": \"scatter\" # TODO check if goes through\n", "}\n", "ip.plot(**ip.attrs)" ] @@ -103,7 +101,7 @@ "source": [ "# set table names\n", "kondorsky.attrs[\"name\"] = \"Kondorsky\"\n", - "# ip.attrs[\"name\"] = \"IP Energy Product\"" + "#ip.attrs[\"name\"] = \"IP Energy Product\"" ] }, { @@ -115,15 +113,11 @@ }, "outputs": [], "source": [ - "contributions = [\n", - " {\n", - " \"project\": name,\n", - " \"identifier\": identifier,\n", - " \"is_public\": True,\n", - " \"data\": {\"kondorsky\": {\"Fe\": \"42.1707 %\", \"Co\": \"8.034 %\", \"V\": \"49.7953 %\"}},\n", - " \"tables\": [kondorsky, ip], # , moke, vsm, total˜]\n", - " }\n", - "]\n", + "contributions = [{\n", + " \"project\": name, \"identifier\": identifier, \"is_public\": True,\n", + " \"data\": {\"kondorsky\": {\"Fe\": \"42.1707 %\", \"Co\": \"8.034 %\", \"V\": \"49.7953 %\"}},\n", + " \"tables\": [kondorsky, ip]#, moke, vsm, total˜]\n", + "}]\n", "len(contributions)" ] }, diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/transparent_conductors.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/transparent_conductors.ipynb index bd48684926..bc8a8feef7 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/transparent_conductors.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/transparent_conductors.ipynb @@ -7,6 +7,7 @@ "metadata": {}, "outputs": [], "source": [ + "import tarfile, os\n", "import numpy as np\n", "from pandas import read_excel\n", "from mpcontribs.client import Client" @@ -61,7 +62,7 @@ " for row in df.to_dict(orient=\"records\"):\n", " identifier = None\n", " data = {\"doping\": doping}\n", - "\n", + " \n", " for keys, value in row.items():\n", " key = \".\".join(\n", " [\n", @@ -70,10 +71,10 @@ " if not k.startswith(\"Unnamed:\")\n", " ]\n", " )\n", - "\n", + " \n", " if key.endswith(\"experimental doping type\"):\n", " key = key.replace(\"Transport.\", \"\")\n", - "\n", + " \n", " key_split = key.split(\".\")\n", " if len(key_split) > 2:\n", " key = \".\".join(key_split[1:])\n", @@ -99,9 +100,7 @@ " if key.endswith(\")\"):\n", " key, unit = key.rsplit(\" (\", 1)\n", " unit = unit[:-1].replace(\"^-3\", \"⁻³\").replace(\"^20\", \"²⁰\")\n", - " unit = unit.replace(\"V2/cms\", \"cm²/V/s\").replace(\n", - " \"cm^2/Vs\", \"cm²/V/s\"\n", - " )\n", + " unit = unit.replace(\"V2/cms\", \"cm²/V/s\").replace(\"cm^2/Vs\", \"cm²/V/s\")\n", " if \",\" in unit:\n", " extra_key = key.rsplit(\".\", 1)[0].lower() + \".conditions\"\n", " data[extra_key] = unit\n", @@ -116,9 +115,12 @@ "\n", " if done:\n", " break\n", - "\n", - " raw_contributions.append({\"identifier\": identifier, \"data\": data})\n", - "\n", + " \n", + " raw_contributions.append({\n", + " \"identifier\": identifier,\n", + " \"data\": data\n", + " })\n", + " \n", "len(raw_contributions)" ] }, @@ -140,72 +142,48 @@ "outputs": [], "source": [ "keys_map = {\n", - " \"doping\": {}, # don't rename, no unit\n", - " \"number of studies\": {\"rename\": \"studies\", \"unit\": \"\"}, # dimensionless\n", - " \"quality.good or ok\": {\"rename\": \"quality\"},\n", - " \"structure and composition.common dopants\": {\"rename\": \"dopants\"},\n", - " \"structure and composition.space group symbol\": {\"rename\": \"spacegroup\"},\n", - " \"branch point energy.bpe min ratio\": {\"rename\": \"BPE.ratio.min\", \"unit\": \"\"},\n", - " \"branch point energy.bpe max ratio\": {\"rename\": \"BPE.ratio.max\", \"unit\": \"\"},\n", - " \"branch point energy.bpe ratio\": {\"rename\": \"BPE.ratio.mean\", \"unit\": \"\"},\n", - " \"branch point energy.has degenerate bands\": {\"rename\": \"BPE.degenerate\"},\n", - " \"computed gap.hse06 band gap\": {\"rename\": \"computed.gap.HSE06.band\", \"unit\": \"eV\"},\n", - " \"computed gap.hse06 direct gap\": {\n", - " \"rename\": \"computed.gap.HSE06.direct\",\n", - " \"unit\": \"eV\",\n", - " },\n", - " \"computed gap.pbe band gap\": {\"rename\": \"computed.gap.PBE.band\", \"unit\": \"eV\"},\n", - " \"computed gap.pbe direct gap\": {\"rename\": \"computed.gap.PBE.direct\", \"unit\": \"eV\"},\n", - " \"computed m*.conditions\": {\"rename\": \"computed.m*.conditions\"},\n", - " \"computed m*.m* avg\": {\"rename\": \"computed.m*.average\", \"unit\": \"\"},\n", - " \"computed m*.m* planar\": {\"rename\": \"computed.m*.planar\", \"unit\": \"\"},\n", - " \"computed stability.e_above_hull\": {\n", - " \"rename\": \"computed.stability.Eₕ\",\n", - " \"unit\": \"eV\",\n", - " },\n", - " \"computed stability.e_above_pourbaix_hull\": {\n", - " \"rename\": \"computed.stability.Eₚₕ\",\n", - " \"unit\": \"eV\",\n", - " },\n", - " \"experimental doping type\": {\"rename\": \"experimental.doping\"},\n", - " \"experimental gap.max experimental gap\": {\n", - " \"rename\": \"experimental.gap.range.max\",\n", - " \"unit\": \"eV\",\n", - " },\n", - " \"experimental gap.max gap reference\": {\"rename\": \"experimental.gap.references.max\"},\n", - " \"experimental gap.min experimental gap\": {\n", - " \"rename\": \"experimental.gap.range.min\",\n", - " \"unit\": \"eV\",\n", - " },\n", - " \"experimental gap.min gap reference\": {\"rename\": \"experimental.gap.references.min\"},\n", - " \"max experimental conductivity.associated carrier concentration\": {\n", - " \"rename\": \"experimental.conductivity.concentration\",\n", - " \"unit\": \"cm⁻³\",\n", - " },\n", - " \"max experimental conductivity.dopant\": {\n", - " \"rename\": \"experimental.conductivity.dopant\"\n", - " },\n", - " \"max experimental conductivity.max conductivity\": {\n", - " \"rename\": \"experimental.conductivity.max\",\n", - " \"unit\": \"S/cm\",\n", - " },\n", - " \"max experimental conductivity.reference link\": {\n", - " \"rename\": \"experimental.conductivity.reference\"\n", - " },\n", - " \"max experimental conductivity.synthesis method\": {\n", - " \"rename\": \"experimental.conductivity.method\"\n", - " },\n", - " \"max experimental mobility.dopant\": {\"rename\": \"experimental.mobility.dopant\"},\n", - " \"max experimental mobility.max mobility\": {\n", - " \"rename\": \"experimental.mobility.max\",\n", - " \"unit\": \"cm²/V/s\",\n", - " },\n", - " \"max experimental mobility.reference link\": {\n", - " \"rename\": \"experimental.mobility.reference\"\n", + " 'doping': {}, # don't rename, no unit\n", + " 'number of studies': {'rename': 'studies', 'unit': ''}, # dimensionless\n", + " 'quality.good or ok': {'rename': 'quality'},\n", + " 'structure and composition.common dopants': {'rename': 'dopants'},\n", + " 'structure and composition.space group symbol': {'rename': 'spacegroup'},\n", + " \n", + " 'branch point energy.bpe min ratio': {'rename': 'BPE.ratio.min', 'unit': ''},\n", + " 'branch point energy.bpe max ratio': {'rename': 'BPE.ratio.max', 'unit': ''},\n", + " 'branch point energy.bpe ratio': {'rename': 'BPE.ratio.mean', 'unit': ''},\n", + " 'branch point energy.has degenerate bands': {'rename': 'BPE.degenerate'},\n", + " \n", + " 'computed gap.hse06 band gap': {'rename': 'computed.gap.HSE06.band', 'unit': 'eV'},\n", + " 'computed gap.hse06 direct gap': {'rename': 'computed.gap.HSE06.direct', 'unit': 'eV'},\n", + " 'computed gap.pbe band gap': {'rename': 'computed.gap.PBE.band', 'unit': 'eV'},\n", + " 'computed gap.pbe direct gap': {'rename': 'computed.gap.PBE.direct', 'unit': 'eV'},\n", + "\n", + " 'computed m*.conditions': {'rename': 'computed.m*.conditions'},\n", + " 'computed m*.m* avg': {'rename': 'computed.m*.average', 'unit': ''},\n", + " 'computed m*.m* planar': {'rename': 'computed.m*.planar', 'unit': ''},\n", + " 'computed stability.e_above_hull': {'rename': 'computed.stability.Eₕ', 'unit': 'eV'},\n", + " 'computed stability.e_above_pourbaix_hull': {'rename': 'computed.stability.Eₚₕ', 'unit': 'eV'},\n", + "\n", + " 'experimental doping type': {'rename': 'experimental.doping'},\n", + " 'experimental gap.max experimental gap': {'rename': 'experimental.gap.range.max', 'unit': 'eV'},\n", + " 'experimental gap.max gap reference': {'rename': 'experimental.gap.references.max'},\n", + " 'experimental gap.min experimental gap': {'rename': 'experimental.gap.range.min', 'unit': 'eV'},\n", + " 'experimental gap.min gap reference': {'rename': 'experimental.gap.references.min'},\n", + "\n", + " 'max experimental conductivity.associated carrier concentration': {\n", + " 'rename': 'experimental.conductivity.concentration', 'unit': 'cm⁻³'\n", " },\n", - " \"max experimental mobility.synthesis method\": {\n", - " \"rename\": \"experimental.mobility.method\"\n", + " 'max experimental conductivity.dopant': {'rename': 'experimental.conductivity.dopant'},\n", + " 'max experimental conductivity.max conductivity': {\n", + " 'rename': 'experimental.conductivity.max', 'unit': 'S/cm'\n", " },\n", + " 'max experimental conductivity.reference link': {'rename': 'experimental.conductivity.reference'},\n", + " 'max experimental conductivity.synthesis method': {'rename': 'experimental.conductivity.method'},\n", + "\n", + " 'max experimental mobility.dopant': {'rename': 'experimental.mobility.dopant'},\n", + " 'max experimental mobility.max mobility': {'rename': 'experimental.mobility.max', 'unit': 'cm²/V/s'},\n", + " 'max experimental mobility.reference link': {'rename': 'experimental.mobility.reference'},\n", + " 'max experimental mobility.synthesis method': {'rename': 'experimental.mobility.method'},\n", "}" ] }, @@ -216,7 +194,10 @@ "metadata": {}, "outputs": [], "source": [ - "columns = {cfg.get(\"rename\", k): cfg.get(\"unit\") for k, cfg in keys_map.items()}" + "columns = {\n", + " cfg.get(\"rename\", k): cfg.get(\"unit\")\n", + " for k, cfg in keys_map.items()\n", + "}" ] }, { @@ -229,13 +210,11 @@ "contributions = []\n", "\n", "for contrib in raw_contributions:\n", - " contributions.append(\n", - " {\n", - " \"project\": name,\n", - " \"identifier\": contrib[\"identifier\"],\n", - " \"is_public\": True,\n", - " }\n", - " )\n", + " contributions.append({\n", + " \"project\": name,\n", + " \"identifier\": contrib[\"identifier\"],\n", + " \"is_public\": True,\n", + " })\n", " contributions[-1][\"data\"] = {\n", " cfg.get(\"rename\", k): contrib[\"data\"][k]\n", " for k, cfg in keys_map.items()\n", diff --git a/mpcontribs-portal/notebooks/lightsources.materialsproject.org/genesis_efrc_minipipes.ipynb b/mpcontribs-portal/notebooks/lightsources.materialsproject.org/genesis_efrc_minipipes.ipynb index 20a1e071b1..429f4b81ae 100644 --- a/mpcontribs-portal/notebooks/lightsources.materialsproject.org/genesis_efrc_minipipes.ipynb +++ b/mpcontribs-portal/notebooks/lightsources.materialsproject.org/genesis_efrc_minipipes.ipynb @@ -35,9 +35,7 @@ "outputs": [], "source": [ "name = \"genesis_efrc_minipipes\" # MPContribs project name\n", - "indir = Path(\n", - " f\"/Users/patrick/GoogleDriveLBNL/MaterialsProject/gitrepos/mpcontribs-data/{name}\"\n", - ")" + "indir = Path(f\"/Users/patrick/GoogleDriveLBNL/MaterialsProject/gitrepos/mpcontribs-data/{name}\")" ] }, { @@ -52,8 +50,7 @@ "\n", "# adding project name and API key to config (TODO: set through minipipes UI)\n", "config[\"meta\"][\"mpcontribs\"] = {\n", - " \"project\": name,\n", - " \"apikey\": os.environ[\"MPCONTRIBS_API_KEY\"],\n", + " \"project\": name, \"apikey\": os.environ[\"MPCONTRIBS_API_KEY\"]\n", "}\n", "\n", "ped_path = indir / \"PED of BMG for PDF 1-29-20_0035-0070.gr\"\n", @@ -82,7 +79,8 @@ "mpcontribs_config = config[\"meta\"].pop(\"mpcontribs\")\n", "name = mpcontribs_config[\"project\"]\n", "client = Client(\n", - " host=\"lightsources-api.materialsproject.org\", apikey=mpcontribs_config[\"apikey\"]\n", + " host = \"lightsources-api.materialsproject.org\",\n", + " apikey = mpcontribs_config[\"apikey\"]\n", ")" ] }, @@ -144,7 +142,7 @@ "source": [ "contrib = {\n", " \"project\": name,\n", - " \"identifier\": \"TODO\", # usually mp-id, can be custom\n", + " \"identifier\": \"TODO\", # usually mp-id, can be custom\n", " \"formula\": formula,\n", " \"is_public\": True, # will make this contribution public automatically when project is set to public\n", " # data, tables and attachments added explicitly below\n", @@ -170,9 +168,9 @@ "names_map = {\n", " \"i_Reduce_Data.Mask_Images.Mask_f\": \"mask\",\n", " \"i_Reduce_Data.Image_to_IQ.Integrate_f\": \"integrate\",\n", - " \"i_Reduce_Data.IQ_to_PDF.Transform_f\": \"transform\",\n", + " \"i_Reduce_Data.IQ_to_PDF.Transform_f\": \"transform\"\n", "}\n", - "keys_maps = [ # len(runs_meta) = 3\n", + "keys_maps = [ # len(runs_meta) = 3\n", " {\n", " \"alpha\": \"α\",\n", " \"edge\": \"edge\",\n", @@ -180,14 +178,12 @@ " \"upper_threshold\": \"thresholds.upper\",\n", " \"smoothing function\": \"smoothing\",\n", " \"vmin\": \"v.min\",\n", - " \"vmax\": \"v.max\",\n", - " },\n", - " {\n", + " \"vmax\": \"v.max\"\n", + " }, {\n", " \"wavelength (A)\": \"λ\", # TODO unit Angstrom\n", " \"polarization\": \"polarization\",\n", - " \"detector\": \"detector\",\n", - " },\n", - " {\n", + " \"detector\": \"detector\"\n", + " }, {\n", " \"processor\": \"processor\",\n", " \"mode\": \"mode\",\n", " \"qmax\": \"q.max\",\n", @@ -196,8 +192,8 @@ " \"rmin\": \"r.min\",\n", " \"rmax\": \"r.max\",\n", " \"step\": \"step\",\n", - " \"shift\": \"shift\",\n", - " },\n", + " \"shift\": \"shift\"\n", + " }\n", "]\n", "\n", "flat_data = {}\n", @@ -236,7 +232,7 @@ "df.columns.name = \"spectral type\"\n", "df.attrs[\"name\"] = y\n", "df.attrs[\"title\"] = \"Radial Distribution Function\"\n", - "df.attrs[\"labels\"] = {\"value\": f\"{y} [Å⁻²]\"}\n", + "df.attrs[\"labels\"] = {\"value\": f\"{y} [Å⁻²]\"} \n", "# df.plot(**df.attrs)\n", "contrib[\"tables\"] = [df]" ] diff --git a/mpcontribs-portal/notebooks/lightsources.materialsproject.org/get_started.ipynb b/mpcontribs-portal/notebooks/lightsources.materialsproject.org/get_started.ipynb index 5edfa98091..c3162b1883 100644 --- a/mpcontribs-portal/notebooks/lightsources.materialsproject.org/get_started.ipynb +++ b/mpcontribs-portal/notebooks/lightsources.materialsproject.org/get_started.ipynb @@ -7,6 +7,8 @@ "outputs": [], "source": [ "import os\n", + "import json\n", + "import gzip\n", "from zipfile import ZipFile\n", "from io import StringIO, BytesIO\n", "from numpy import where\n", @@ -14,7 +16,8 @@ "from pandas import to_numeric, read_csv\n", "from mpcontribs.client import Client, Attachment\n", "from tqdm.notebook import tqdm\n", - "from decimal import Decimal" + "from decimal import Decimal\n", + "from pathlib import Path" ] }, { @@ -54,16 +57,14 @@ "elements = [\"Co\", \"Cu\", \"Ce\"]\n", "columns = {f\"position.{axis}\": \"mm\" for axis in [\"x\", \"y\"]}\n", "columns.update({f\"composition.{element}\": \"%\" for element in elements})\n", - "columns.update(\n", - " {\n", - " f\"{element}.{spectrum}.{m}\": \"\"\n", - " for element in elements\n", - " for spectrum in [\"XAS\", \"XMCD\"]\n", - " for m in [\"min\", \"max\"]\n", - " }\n", - ")\n", + "columns.update({\n", + " f\"{element}.{spectrum}.{m}\": \"\"\n", + " for element in elements\n", + " for spectrum in [\"XAS\", \"XMCD\"]\n", + " for m in [\"min\", \"max\"]\n", + "})\n", "columns.update({\"tables\": None, \"attachments\": None})\n", - "# columns" + "#columns" ] }, { @@ -84,9 +85,7 @@ "outputs": [], "source": [ "# composition/concentration table\n", - "ctable = read_csv(\n", - " StringIO(\n", - " \"\"\"\n", + "ctable = read_csv(StringIO(\"\"\"\n", "X,\t\tY,\t\tCo,\t\tCu,\t\tCe\n", "-8.5,\t37.6,\t46.2,\t5.3,\t39.3\n", "-8.5,\t107.8,\t70.0,\t8.9,\t15.5\n", @@ -100,13 +99,9 @@ "-5.7,\t104.8,\t54.9,\t19.1,\t15.5\n", "-5.0,\t37.1,\t48.8,\t8.7,\t43.7\n", "-5.0,\t107.1,\t64.8,\t16.9,\t19.2\n", - "\"\"\".replace(\"\\t\", \"\")\n", - " )\n", - ")\n", + "\"\"\".replace('\\t', '')))\n", "\n", - "ctable[\"x/y position [mm]\"] = (\n", - " ctable[\"X\"].astype(\"str\") + \"/\" + ctable[\"Y\"].astype(\"str\")\n", - ")\n", + "ctable[\"x/y position [mm]\"] = ctable[\"X\"].astype('str') + '/' + ctable[\"Y\"].astype('str')\n", "ctable.attrs[\"name\"] = \"Composition Table\"\n", "ctable.attrs[\"meta\"] = {\"X\": \"category\", \"Y\": \"continuous\"} # for plotly\n", "ctable.attrs[\"labels\"] = {\"value\": \"composition [%]\"}\n", @@ -147,7 +142,6 @@ "\n", " return functions\n", "\n", - "\n", "conc_funcs = get_concentration_functions(ctable)\n", "del ctable[\"X\"]\n", "del ctable[\"Y\"]\n", @@ -162,52 +156,49 @@ "source": [ "# paths to gzipped JSON files for attachments\n", "# global params attachment identical for every contribution / across project\n", - "global_params = Attachment.from_data(\n", - " \"files/global-params\",\n", - " {\n", - " \"transfer_fields\": [\n", - " \"I_Norm0\",\n", - " \"Magnet Field\",\n", - " \"Energy\",\n", - " \"Y\",\n", - " \"Z\",\n", - " \"filename_scannumber\",\n", - " ],\n", - " \"labelcols\": [\"Y\", \"Z\"],\n", - " },\n", - ")\n", - "\n", + "global_params = Attachment.from_data(\"files/global-params\", {\n", + " \"transfer_fields\": [\n", + " \"I_Norm0\", \"Magnet Field\", \"Energy\", \"Y\", \"Z\", \"filename_scannumber\"\n", + " ],\n", + " \"labelcols\": [\"Y\", \"Z\"]\n", + "})\n", "\n", "# separate attachment of analysis params for each contribution and element\n", "def analysis_params(identifier, element):\n", " name = f\"files/analysis-params__{identifier}__{element}\"\n", - " return Attachment.from_data(\n", - " name,\n", - " {\n", - " \"get_xas\": {\n", - " \"element\": element,\n", - " \"pre_edge\": (695, 701),\n", - " \"post_edge\": (730, 739),\n", - " },\n", - " \"get_xmcd\": {\n", - " \"L3_range\": (705, 710),\n", - " \"L2_range\": (718, 722),\n", - " },\n", - " \"Remove BG (polynomial)\": {\n", - " \"element\": element,\n", - " \"degree\": 1,\n", - " \"step\": 0,\n", - " \"xmcd_bg_subtract\": True,\n", - " \"scanindex_column\": \"XMCD Index\",\n", - " },\n", - " \"normalize_set\": {\"element\": element, \"scanindex_column\": \"XMCD Index\"},\n", - " \"collapse_set\": {\"columns_to_keep\": [\"Energy\", \"Y\", \"Z\"]},\n", - " \"plot_spectrum\": {\"element\": element, \"E_lower\": 695, \"E_upper\": 760},\n", - " \"gather_final_op_param_values\": {\n", - " \"identifier\": identifier # added for testing to ensure different attachment contents\n", - " },\n", + " return Attachment.from_data(name, {\n", + " \"get_xas\": {\n", + " \"element\": element,\n", + " 'pre_edge': (695, 701),\n", + " 'post_edge': (730, 739),\n", + " },\n", + " \"get_xmcd\": {\n", + " 'L3_range': (705, 710),\n", + " 'L2_range': (718, 722),\n", + " },\n", + " \"Remove BG (polynomial)\": {\n", + " \"element\": element,\n", + " \"degree\": 1,\n", + " \"step\": 0,\n", + " \"xmcd_bg_subtract\": True,\n", + " \"scanindex_column\": \"XMCD Index\"\n", + " },\n", + " \"normalize_set\": {\n", + " \"element\": element,\n", + " \"scanindex_column\": \"XMCD Index\"\n", + " },\n", + " \"collapse_set\": {\n", + " \"columns_to_keep\": [\"Energy\",\"Y\",\"Z\"]\n", " },\n", - " )" + " \"plot_spectrum\": {\n", + " \"element\": element,\n", + " 'E_lower': 695,\n", + " 'E_upper': 760\n", + " },\n", + " \"gather_final_op_param_values\": {\n", + " \"identifier\": identifier # added for testing to ensure different attachment contents\n", + " }\n", + " })" ] }, { @@ -224,7 +215,7 @@ " # randomly assign fake sample id for testing here\n", " fn = os.path.splitext(info.filename)[0]\n", " element, x, y = fn.rsplit(\"_\", 4)\n", - " sample = f\"CMSI-2-10_{idx % 5}\"\n", + " sample = f\"CMSI-2-10_{idx%5}\"\n", " identifier = f\"{sample}__{x}_{y}\"\n", "\n", " # tables and attachments for Co\n", @@ -237,7 +228,7 @@ " df.columns.name = \"spectral type\"\n", " df.attrs[\"name\"] = f\"{element}-XAS/XMCD\"\n", " df.attrs[\"title\"] = f\"XAS and XMCD Spectra for {element}\"\n", - " df.attrs[\"labels\"] = {\"value\": \"a.u.\"}\n", + " df.attrs[\"labels\"] = {\"value\": \"a.u.\"} \n", " params = analysis_params(identifier, element)\n", "\n", " # build contribution\n", @@ -245,39 +236,38 @@ " # TODO auto-convert data.timestamp field in API to enable sorting/filtering\n", " contrib[\"data\"][\"position\"] = {k: f\"{v} mm\" for k, v in zip([\"x\", \"y\"], [x, y])}\n", " contrib[\"data\"][\"composition\"] = {}\n", - "\n", + " \n", " for el, f in conc_funcs.items():\n", " try:\n", - " contrib[\"data\"][\"composition\"][el] = f\"{f(x, y) * 100.0} %\"\n", + " contrib[\"data\"][\"composition\"][el] = f\"{f(x, y) * 100.} %\"\n", " except KeyError:\n", " continue\n", "\n", " if not contrib[\"data\"][\"composition\"]:\n", " print(f\"Could not determine composition for {identifier}!\")\n", " continue\n", - "\n", - " contrib[\"formula\"] = \"\".join(\n", - " [\n", - " \"{}{}\".format(el, int(round(Decimal(comp.split()[0]))))\n", - " for el, comp in contrib[\"data\"][\"composition\"].items()\n", - " ]\n", - " )\n", + " \n", + " contrib[\"formula\"] = \"\".join([\n", + " \"{}{}\".format(el, int(round(Decimal(comp.split()[0]))))\n", + " for el, comp in contrib[\"data\"][\"composition\"].items()\n", + " ])\n", "\n", " contrib[\"data\"][element] = {\n", - " y: {\"min\": df[y].min(), \"max\": df[y].max()} for y in [\"XAS\", \"XMCD\"]\n", + " y: {\"min\": df[y].min(), \"max\": df[y].max()}\n", + " for y in [\"XAS\", \"XMCD\"]\n", " }\n", - "\n", + " \n", " # adding ctable and global_params to every contribution\n", " # ctable could be the same for different subsets of contributions\n", " contrib[\"tables\"] = [ctable, df]\n", " contrib[\"attachments\"] = [global_params, params]\n", " contributions.append(contrib)\n", - "\n", + " \n", "# if len(contributions) > 2:\n", "# break\n", - "\n", + " \n", "# len(contributions)\n", - "# contributions" + "#contributions" ] }, { @@ -297,9 +287,9 @@ "metadata": {}, "outputs": [], "source": [ - "client.contributions.queryContributions(\n", - " project=name, _fields=[\"id\", \"identifier\", \"tables\", \"attachments\", \"notebook\"]\n", - ").result()" + "client.contributions.queryContributions(project=name, _fields=[\n", + " \"id\", \"identifier\", \"tables\", \"attachments\", \"notebook\"\n", + "]).result()" ] }, { @@ -335,7 +325,7 @@ " fake_tables[identifier] = []\n", " for idx, element in enumerate(elements[1:]):\n", " df = contrib[\"tables\"][1].copy()\n", - " df.index = df.index.astype(\"float\") + (idx + 1) * 10\n", + " df.index = df.index.astype(\"float\") + (idx+1)*10\n", " df.attrs[\"name\"] = f\"{element}-XAS/XMCD\"\n", " df.attrs[\"title\"] = f\"XAS and XMCD Spectra for {element}\"\n", " fake_tables[identifier].append(df)" @@ -352,10 +342,14 @@ "identifiers = [c[\"identifier\"] for c in contributions]\n", "\n", "resp = client.contributions.queryContributions(\n", - " project=name, identifier__in=identifiers[:5], _fields=[\"id\", \"identifier\"]\n", + " project=name, identifier__in=identifiers[:5],\n", + " _fields=[\"id\", \"identifier\"]\n", ").result()\n", "\n", - "mapping = {c[\"identifier\"]: c[\"id\"] for c in resp[\"data\"]}\n", + "mapping = {\n", + " c[\"identifier\"]: c[\"id\"]\n", + " for c in resp[\"data\"]\n", + "}\n", "print(mapping)" ] }, @@ -369,7 +363,7 @@ "# example for a single identifier and element\n", "identifier = identifiers[0]\n", "element_index = 1\n", - "component_index = element_index + 1 # index in contribution's component list\n", + "component_index = element_index + 1 # index in contribution's component list\n", "element = elements[element_index]\n", "pk = mapping[identifier]\n", "df = fake_tables[identifier][element_index]\n", @@ -377,9 +371,10 @@ "\n", "contrib = {\n", " \"id\": pk,\n", - " \"data\": {\n", - " element: {y: {\"min\": df[y].min(), \"max\": df[y].max()} for y in [\"XAS\", \"XMCD\"]}\n", - " },\n", + " \"data\": {element: {\n", + " y: {\"min\": df[y].min(), \"max\": df[y].max()}\n", + " for y in [\"XAS\", \"XMCD\"]\n", + " }}, \n", " \"tables\": [None] * component_index + [df], # ensure correct index for update\n", " \"attachments\": [None] * component_index + [params],\n", "}" @@ -409,7 +404,7 @@ "metadata": {}, "outputs": [], "source": [ - "client.get_table(\"608a5a1ddce158e132083323\").display()" + "client.get_table('608a5a1ddce158e132083323').display()" ] }, { diff --git a/mpcontribs-portal/notebooks/ml.materialsproject.org/get_started.ipynb b/mpcontribs-portal/notebooks/ml.materialsproject.org/get_started.ipynb index c43784529b..a13eefdc69 100644 --- a/mpcontribs-portal/notebooks/ml.materialsproject.org/get_started.ipynb +++ b/mpcontribs-portal/notebooks/ml.materialsproject.org/get_started.ipynb @@ -6,9 +6,7 @@ "metadata": {}, "outputs": [], "source": [ - "import wget\n", - "import json\n", - "import math\n", + "import wget, json, os, math\n", "from pathlib import Path\n", "from string import capwords\n", "from pybtex.database import parse_string\n", @@ -43,103 +41,91 @@ " \"clf_pos_label\": None,\n", " \"unit\": None,\n", " \"has_structure\": True,\n", - " },\n", - " {\n", + " }, {\n", " \"name\": \"log_gvrh\",\n", " \"data_file\": \"matbench_log_gvrh.json.gz\",\n", " \"target\": \"log10(G_VRH)\",\n", " \"clf_pos_label\": None,\n", " \"unit\": None,\n", " \"has_structure\": True,\n", - " },\n", - " {\n", + " }, {\n", " \"name\": \"dielectric\",\n", " \"data_file\": \"matbench_dielectric.json.gz\",\n", " \"target\": \"n\",\n", " \"clf_pos_label\": None,\n", " \"unit\": None,\n", " \"has_structure\": True,\n", - " },\n", - " {\n", + " }, {\n", " \"name\": \"jdft2d\",\n", " \"data_file\": \"matbench_jdft2d.json.gz\",\n", " \"target\": \"exfoliation_en\",\n", " \"clf_pos_label\": None,\n", " \"unit\": \"meV/atom\",\n", " \"has_structure\": True,\n", - " },\n", - " {\n", + " }, {\n", " \"name\": \"mp_gap\",\n", " \"data_file\": \"matbench_mp_gap.json.gz\",\n", " \"target\": \"gap pbe\",\n", " \"clf_pos_label\": None,\n", " \"unit\": \"eV\",\n", " \"has_structure\": True,\n", - " },\n", - " {\n", + " }, {\n", " \"name\": \"mp_is_metal\",\n", " \"data_file\": \"matbench_mp_is_metal.json.gz\",\n", " \"target\": \"is_metal\",\n", " \"clf_pos_label\": True,\n", " \"unit\": None,\n", " \"has_structure\": True,\n", - " },\n", - " {\n", + " }, {\n", " \"name\": \"mp_e_form\",\n", " \"data_file\": \"matbench_mp_e_form.json.gz\",\n", " \"target\": \"e_form\",\n", " \"clf_pos_label\": None,\n", " \"unit\": \"eV/atom\",\n", " \"has_structure\": True,\n", - " },\n", - " {\n", + " }, {\n", " \"name\": \"perovskites\",\n", " \"data_file\": \"matbench_perovskites.json.gz\",\n", " \"target\": \"e_form\",\n", " \"clf_pos_label\": None,\n", " \"unit\": \"eV\",\n", " \"has_structure\": True,\n", - " },\n", - " {\n", + " }, {\n", " \"name\": \"glass\",\n", " \"data_file\": \"matbench_glass.json.gz\",\n", " \"target\": \"gfa\",\n", " \"clf_pos_label\": True,\n", " \"unit\": None,\n", " \"has_structure\": False,\n", - " },\n", - " {\n", + " }, {\n", " \"name\": \"expt_is_metal\",\n", " \"data_file\": \"matbench_expt_is_metal.json.gz\",\n", " \"target\": \"is_metal\",\n", " \"clf_pos_label\": True,\n", " \"unit\": None,\n", " \"has_structure\": False,\n", - " },\n", - " {\n", + " }, {\n", " \"name\": \"expt_gap\",\n", " \"data_file\": \"matbench_expt_gap.json.gz\",\n", " \"target\": \"gap expt\",\n", " \"clf_pos_label\": None,\n", " \"unit\": \"eV\",\n", " \"has_structure\": False,\n", - " },\n", - " {\n", + " }, {\n", " \"name\": \"phonons\",\n", " \"data_file\": \"matbench_phonons.json.gz\",\n", " \"target\": \"last phdos peak\",\n", " \"clf_pos_label\": None,\n", " \"unit\": \"cm^-1\",\n", " \"has_structure\": True,\n", - " },\n", - " {\n", + " }, {\n", " \"name\": \"steels\",\n", " \"data_file\": \"matbench_steels.json.gz\",\n", " \"target\": \"yield strength\",\n", " \"clf_pos_label\": None,\n", " \"unit\": \"MPa\",\n", " \"has_structure\": False,\n", - " },\n", + " }\n", "]" ] }, @@ -173,7 +159,7 @@ "source": [ "pybtex.errors.set_strict_mode(False)\n", "mprester = MPRester()\n", - "client = Client(host=\"ml-api.materialsproject.org\")" + "client = Client(host='ml-api.materialsproject.org')" ] }, { @@ -182,16 +168,16 @@ "metadata": {}, "outputs": [], "source": [ - "datadir = Path(\"/Users/patrick/gitrepos/mp/mpcontribs-data/\")\n", - "fn = Path(\"dataset_metadata.json\")\n", + "datadir = Path('/Users/patrick/gitrepos/mp/mpcontribs-data/')\n", + "fn = Path('dataset_metadata.json')\n", "fp = datadir / fn\n", "if not fp.exists():\n", " prefix = \"https://raw.githubusercontent.com/hackingmaterials/matminer\"\n", - " url = f\"{prefix}/master/matminer/datasets/{fn}\"\n", + " url = f'{prefix}/master/matminer/datasets/{fn}'\n", " wget.download(url)\n", " fn.rename(fp)\n", - "\n", - "metadata = json.load(open(fp, \"r\"))" + " \n", + "metadata = json.load(open(fp, 'r'))" ] }, { @@ -213,47 +199,50 @@ " target = ds[\"target\"]\n", " columns = {\n", " target_map[target]: metadata[name][\"columns\"][target],\n", - " primitive_key: metadata[name][\"columns\"][primitive_key],\n", + " primitive_key: metadata[name][\"columns\"][primitive_key]\n", " }\n", " project = {\n", - " \"name\": name,\n", - " \"is_public\": True,\n", - " \"owner\": \"ardunn@lbl.gov\",\n", - " \"title\": name, # TODO update and set long_title\n", - " \"authors\": \"A. Dunn, A. Jain\",\n", - " \"description\": metadata[name][\"description\"]\n", - " + \" If you are viewing this on MPContribs-ML interactively, please ensure the order of the\"\n", + " 'name': name,\n", + " 'is_public': True,\n", + " 'owner': 'ardunn@lbl.gov',\n", + " 'title': name, # TODO update and set long_title\n", + " 'authors': 'A. Dunn, A. Jain',\n", + " 'description': metadata[name]['description'] + \\\n", + " \" If you are viewing this on MPContribs-ML interactively, please ensure the order of the\"\n", " f\"identifiers is sequential (mb-{ds['name']}-0001, mb-{ds['name']}-0002, etc.) before benchmarking.\",\n", - " \"other\": {\"columns\": columns, \"entries\": metadata[name][\"num_entries\"]},\n", - " \"references\": [{\"label\": \"RawData\", \"url\": metadata[\"name\"][\"url\"]}],\n", + " 'other': {\n", + " 'columns': columns,\n", + " 'entries': metadata[name]['num_entries']\n", + " },\n", + " 'references': [\n", + " {'label': 'RawData', 'url': metadata[\"name\"][\"url\"]}\n", + " ]\n", " }\n", - "\n", - " for ref in metadata[name][\"bibtex_refs\"]:\n", + " \n", + " for ref in metadata[name]['bibtex_refs']:\n", " if name == \"matbench_phonons\":\n", " ref = ref.replace(\n", " \"petretto_dwaraknath_miranda_winston_giantomassi_rignanese_van setten_gonze_persson_hautier_2018\",\n", - " \"petretto2018\",\n", + " \"petretto2018\"\n", " )\n", - "\n", - " bib = parse_string(ref, \"bibtex\")\n", + " \n", + " bib = parse_string(ref, 'bibtex')\n", " for key, entry in bib.entries.items():\n", - " key_is_doi = key.startswith(\"doi:\")\n", - " url = (\n", - " \"https://doi.org/\" + key.split(\":\", 1)[-1]\n", - " if key_is_doi\n", - " else entry.fields.get(\"url\")\n", - " )\n", - " k = \"Zhuo2018\" if key_is_doi else capwords(key.replace(\"_\", \"\"))\n", - " if k.startswith(\"C2\"):\n", - " k = \"Castelli2012\"\n", - " elif k.startswith(\"Landolt\"):\n", - " k = \"LB1997\"\n", - " elif k == \"Citrine\":\n", - " url = \"https://www.citrination.com\"\n", - "\n", + " key_is_doi = key.startswith('doi:')\n", + " url = 'https://doi.org/' + key.split(':', 1)[-1] if key_is_doi else entry.fields.get('url')\n", + " k = 'Zhuo2018' if key_is_doi else capwords(key.replace('_', ''))\n", + " if k.startswith('C2'):\n", + " k = 'Castelli2012'\n", + " elif k.startswith('Landolt'):\n", + " k = 'LB1997'\n", + " elif k == 'Citrine':\n", + " url = 'https://www.citrination.com'\n", + " \n", " if len(k) > 8:\n", " k = k[:4] + k[-4:]\n", - " project[\"references\"].append({\"label\": k, \"url\": url})\n", + " project['references'].append(\n", + " {'label': k, 'url': url}\n", + " )\n", "\n", " try:\n", " client.projects.getProjectByName(pk=name, _fields=[\"name\"]).result()\n", @@ -296,7 +285,7 @@ "\n", " for i, row in tqdm(enumerate(df.iterrows()), total=df.shape[0]):\n", " entry = row[1]\n", - " contrib = {\"project\": name, \"is_public\": True}\n", + " contrib = {'project': name, 'is_public': True}\n", "\n", " if \"structure\" in entry.index:\n", " s = entry.loc[\"structure\"]\n", @@ -307,7 +296,7 @@ " else:\n", " c = entry[\"composition\"]\n", "\n", - " id_number = f\"{i + 1:0{id_n_zeros}d}\"\n", + " id_number = f\"{i+1:0{id_n_zeros}d}\"\n", " identifier = f\"mb-{ds['name']}-{id_number}\"\n", " contrib[\"identifier\"] = identifier\n", " contrib[\"data\"] = {target_map[target]: f\"{entry.loc[target]}{unit}\"}\n", @@ -316,7 +305,7 @@ "\n", " with open(fn, \"w\") as f:\n", " json.dump(contributions, f, cls=MontyEncoder)\n", - "\n", + " \n", " print(\"saved to\", fn)" ] }, diff --git a/mpcontribs-portal/supervisord/conf.py b/mpcontribs-portal/supervisord/conf.py index 7b2fd63336..4fb68a6d8e 100644 --- a/mpcontribs-portal/supervisord/conf.py +++ b/mpcontribs-portal/supervisord/conf.py @@ -15,7 +15,7 @@ "api_port": api_port, "portal_port": portal_port, "s3": s3, - "tm": tm.upper(), + "tm": tm.upper() } kwargs = { diff --git a/mpcontribs-portal/wsgi.py b/mpcontribs-portal/wsgi.py index 96ebc59a28..e314b76514 100644 --- a/mpcontribs-portal/wsgi.py +++ b/mpcontribs-portal/wsgi.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- import re import os +import ddtrace.auto import django_settings_file from django.core.wsgi import get_wsgi_application from whitenoise import WhiteNoise diff --git a/mpcontribs-serverless/make_download/app.py b/mpcontribs-serverless/make_download/app.py index f7031828a6..96f98401a7 100644 --- a/mpcontribs-serverless/make_download/app.py +++ b/mpcontribs-serverless/make_download/app.py @@ -1,5 +1,6 @@ # TODO ddtrace import os +import json import logging import boto3 @@ -10,19 +11,18 @@ logger = logging.getLogger() logger.setLevel(os.environ["MPCONTRIBS_CLIENT_LOG_LEVEL"]) -s3_client = boto3.client("s3") +s3_client = boto3.client('s3') timeout = int(os.environ["LAMBDA_TIMEOUT"]) redis_address = os.environ["REDIS_ADDRESS"] store = Redis.from_url(f"redis://{redis_address}") store.ping() - def get_remaining(event, context): - remaining = context.get_remaining_time_in_millis() / 1000.0 - 0.5 + remaining = context.get_remaining_time_in_millis() / 1000. - 0.5 if remaining < 3: raise ValueError("TIMEOUT in 3s!") - elapsed_pct = (timeout - remaining) / timeout * 100.0 + elapsed_pct = (timeout - remaining) / timeout * 100. store.set(event["redis_key"], f"{elapsed_pct:.1f}") return remaining @@ -34,7 +34,9 @@ def lambda_handler(event, context): bucket, filename, fmt, version = event["redis_key"].split(":") try: - client = Client(host=event["host"], headers=event["headers"], project=project) + client = Client( + host=event["host"], headers=event["headers"], project=project + ) remaining = get_remaining(event, context) tmpdir = Path("/tmp") outdir = tmpdir / filename @@ -47,11 +49,9 @@ def lambda_handler(event, context): zipfile = outdir.with_suffix(".zip") resp = zipfile.read_bytes() s3_client.put_object( - Bucket=bucket, - Key=f"{filename}_{fmt}.zip", + Bucket=bucket, Key=f"{filename}_{fmt}.zip", Metadata={"version": version}, - Body=resp, - ContentType="application/zip", + Body=resp, ContentType="application/zip" ) get_remaining(event, context) rmtree(outdir) From d79ac6f3d197a07609a573d2b0985ea5ed603894 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 2 Jun 2026 02:27:05 +0000 Subject: [PATCH 138/591] upgrade dependencies for deployment --- mpcontribs-api/requirements/deployment.txt | 551 ++++++++++++++++++ mpcontribs-client/requirements/deployment.txt | 18 + .../requirements/deployment.txt | 24 + mpcontribs-portal/requirements/deployment.txt | 36 ++ 4 files changed, 629 insertions(+) create mode 100644 mpcontribs-api/requirements/deployment.txt diff --git a/mpcontribs-api/requirements/deployment.txt b/mpcontribs-api/requirements/deployment.txt new file mode 100644 index 0000000000..7056ece33a --- /dev/null +++ b/mpcontribs-api/requirements/deployment.txt @@ -0,0 +1,551 @@ +# +# This file is autogenerated by pip-compile with Python 3.11 +# by the following command: +# +# pip-compile --output-file=MPContribs/mpcontribs-api/requirements/deployment.txt MPContribs/mpcontribs-api/pyproject.toml python/requirements.txt +# +anyio==4.13.0 + # via jupyter-server +apispec==5.2.2 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +argon2-cffi==25.1.0 + # via + # jupyter-server + # notebook +argon2-cffi-bindings==25.1.0 + # via argon2-cffi +arrow==1.4.0 + # via isoduration +asn1crypto==1.5.1 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +asttokens==3.0.1 + # via stack-data +atlasq-tschaume==0.11.1.dev2 + # via flask-mongorest-mpcontribs +attrs==26.1.0 + # via + # jsonschema + # referencing +backports-zstd==1.5.0 + # via flask-compress +beautifulsoup4==4.14.3 + # via nbconvert +bibtexparser==1.4.4 + # via pymatgen-core +bleach[css]==6.3.0 + # via nbconvert +blinker==1.9.0 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +boltons==25.0.0 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +boto3==1.43.19 + # via flask-mongorest-mpcontribs +botocore==1.43.19 + # via + # boto3 + # s3transfer +brotli==1.2.0 + # via flask-compress +bytecode==0.17.0 + # via ddtrace +certifi==2026.5.20 + # via requests +cffi==2.0.0 + # via + # argon2-cffi-bindings + # cryptography +charset-normalizer==3.4.7 + # via requests +click==8.4.1 + # via + # flask + # rq +comm==0.2.3 + # via ipykernel +contourpy==1.3.3 + # via matplotlib +cramjam==2.11.0 + # via python-snappy +crontab==1.0.5 + # via rq-scheduler +cryptography==48.0.0 + # via pyopenssl +css-html-js-minify==2.5.5 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +cycler==0.12.1 + # via matplotlib +dateparser==1.4.0 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +ddtrace==4.3.0 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +debugpy==1.8.21 + # via ipykernel +decorator==5.3.1 + # via ipython +defusedxml==0.7.1 + # via nbconvert +dnspython==2.8.0 + # via + # mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) + # pymongo +entrypoints==0.4 + # via jupyter-client +envier==0.6.1 + # via ddtrace +executing==2.2.1 + # via stack-data +fastjsonschema==2.21.2 + # via nbformat +fastnumbers==5.1.1 + # via flask-mongorest-mpcontribs +filetype==1.2.0 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +flasgger-tschaume==0.9.7 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +flask==2.2.5 + # via + # flasgger-tschaume + # flask-compress + # flask-marshmallow + # flask-mongoengine-tschaume + # flask-rq2 + # flask-sse +flask-compress==1.24 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +flask-marshmallow==1.4.0 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +flask-mongoengine-tschaume==1.1.0 + # via flask-mongorest-mpcontribs +flask-mongorest-mpcontribs==3.3.0 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +flask-rq2==18.3 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +flask-sse==1.0.0 + # via flask-mongorest-mpcontribs +flatten-dict==0.5.0 + # via flask-mongorest-mpcontribs +flexcache==0.3 + # via pint +flexparser==0.4 + # via pint +fonttools==4.63.0 + # via matplotlib +fqdn==1.5.1 + # via jsonschema +freezegun==1.5.5 + # via rq-scheduler +gevent==26.5.0 + # via gunicorn +greenlet==3.5.1 + # via gevent +gunicorn[gevent]==24.1.1 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +idna==3.17 + # via + # anyio + # jsonschema + # requests +ipykernel==6.29.5 + # via + # nbclassic + # notebook +ipython==9.14.0 + # via ipykernel +ipython-genutils==0.2.0 + # via + # nbclassic + # notebook +ipython-pygments-lexers==1.1.1 + # via ipython +isoduration==20.11.0 + # via jsonschema +itsdangerous==2.2.0 + # via flask +jedi==0.20.0 + # via ipython +jinja2==3.1.6 + # via + # flask + # jupyter-server + # mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) + # nbconvert + # notebook +jmespath==1.1.0 + # via + # boto3 + # botocore +joblib==1.5.3 + # via pymatgen-core +json2html==1.3.0 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +jsonpointer==3.1.1 + # via jsonschema +jsonschema[format-nongpl]==4.26.0 + # via + # flasgger-tschaume + # jupyter-events + # nbformat +jsonschema-specifications==2025.9.1 + # via jsonschema +jupyter-client==7.4.9 + # via + # ipykernel + # jupyter-server + # nbclient + # notebook +jupyter-core==5.9.1 + # via + # ipykernel + # jupyter-client + # jupyter-server + # nbclient + # nbconvert + # nbformat + # notebook +jupyter-events==0.12.1 + # via jupyter-server +jupyter-server==2.19.0 + # via notebook-shim +jupyter-server-terminals==0.5.4 + # via jupyter-server +jupyterlab-pygments==0.3.0 + # via nbconvert +kiwisolver==1.5.0 + # via matplotlib +lark==1.3.1 + # via rfc3987-syntax +lxml==6.1.1 + # via pymatgen-core +markupsafe==3.0.3 + # via + # jinja2 + # nbconvert + # werkzeug +marshmallow==3.26.2 + # via + # flask-marshmallow + # marshmallow-mongoengine + # mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +marshmallow-mongoengine==0.31.2 + # via flask-mongorest-mpcontribs +matplotlib==3.10.9 + # via + # -r python/requirements.txt + # pymatgen-core +matplotlib-inline==0.2.2 + # via + # ipykernel + # ipython +mimerender-pr36==0.0.2 + # via flask-mongorest-mpcontribs +mistune==3.2.1 + # via + # flasgger-tschaume + # nbconvert +mongoengine==0.29.3 + # via + # atlasq-tschaume + # flask-mongoengine-tschaume + # marshmallow-mongoengine +monty==2026.5.18 + # via pymatgen-core +more-itertools==11.1.0 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +mpmath==1.3.0 + # via sympy +narwhals==2.22.0 + # via plotly +nbclassic==1.3.3 + # via notebook +nbclient==0.10.4 + # via nbconvert +nbconvert==7.17.1 + # via + # jupyter-server + # notebook +nbformat==5.10.4 + # via + # jupyter-server + # mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) + # nbclient + # nbconvert + # notebook +nest-asyncio==1.6.0 + # via + # ipykernel + # jupyter-client + # nbclassic + # notebook +networkx==3.6.1 + # via pymatgen-core +notebook==6.5.7 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +notebook-shim==0.2.4 + # via nbclassic +numpy==2.4.6 + # via + # -r python/requirements.txt + # contourpy + # matplotlib + # monty + # mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) + # pandas + # pymatgen-core + # scipy + # spglib +opentelemetry-api==1.42.1 + # via ddtrace +orjson==3.11.9 + # via + # flask-mongorest-mpcontribs + # pymatgen-core +overrides==7.7.0 + # via jupyter-server +packaging==26.2 + # via + # gunicorn + # ipykernel + # jupyter-events + # jupyter-server + # marshmallow + # matplotlib + # nbconvert + # plotly +palettable==3.3.3 + # via pymatgen-core +pandas==3.0.3 + # via + # -r python/requirements.txt + # pymatgen-core +pandocfilters==1.5.1 + # via nbconvert +parso==0.8.7 + # via jedi +pexpect==4.9.0 + # via ipython +pillow==12.2.0 + # via matplotlib +pint==0.25.3 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +platformdirs==4.10.0 + # via + # jupyter-core + # pint +plotly==6.7.0 + # via pymatgen-core +prometheus-client==0.25.0 + # via + # jupyter-server + # notebook +prompt-toolkit==3.0.52 + # via ipython +psutil==7.2.2 + # via + # ipykernel + # ipython +psycopg2-binary==2.9.12 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +ptyprocess==0.7.0 + # via + # pexpect + # terminado +pure-eval==0.2.3 + # via stack-data +pycparser==3.0 + # via cffi +pygments==2.20.0 + # via + # ipython + # ipython-pygments-lexers + # nbconvert +pymatgen==2026.5.4 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +pymatgen-core==2026.5.18 + # via pymatgen +pymongo==4.17.0 + # via + # flask-mongorest-mpcontribs + # mongoengine +pyopenssl==26.2.0 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +pyparsing==3.3.2 + # via + # bibtexparser + # matplotlib +python-dateutil==2.9.0.post0 + # via + # arrow + # botocore + # dateparser + # flask-mongorest-mpcontribs + # freezegun + # jupyter-client + # matplotlib + # pandas + # rq-scheduler +python-json-logger==4.1.0 + # via jupyter-events +python-mimeparse==2.0.0 + # via mimerender-pr36 +python-snappy==0.7.3 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +pytz==2026.2 + # via dateparser +pyyaml==6.0.3 + # via + # flasgger-tschaume + # jupyter-events +pyzmq==27.1.0 + # via + # ipykernel + # jupyter-client + # jupyter-server + # notebook +redis==8.0.0 + # via + # flask-rq2 + # flask-sse + # rq +referencing==0.37.0 + # via + # jsonschema + # jsonschema-specifications + # jupyter-events +regex==2026.5.9 + # via dateparser +requests==2.34.2 + # via + # atlasq-tschaume + # pymatgen-core +rfc3339-validator==0.1.4 + # via + # jsonschema + # jupyter-events +rfc3986-validator==0.1.1 + # via + # jsonschema + # jupyter-events +rfc3987-syntax==1.1.0 + # via jsonschema +rpds-py==2026.5.1 + # via + # jsonschema + # referencing +rq==2.3.2 + # via + # flask-rq2 + # mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) + # rq-scheduler +rq-scheduler==0.14.0 + # via flask-rq2 +ruamel-yaml==0.19.1 + # via monty +s3transfer==0.18.0 + # via boto3 +scipy==1.17.1 + # via + # -r python/requirements.txt + # pymatgen-core +send2trash==2.1.0 + # via + # jupyter-server + # notebook +setproctitle==1.3.7 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +six==1.17.0 + # via + # flasgger-tschaume + # flask-sse + # python-dateutil + # rfc3339-validator +soupsieve==2.8.4 + # via beautifulsoup4 +spglib==2.7.0 + # via pymatgen-core +stack-data==0.6.3 + # via ipython +supervisor==4.3.0 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +sympy==1.14.0 + # via pymatgen-core +tabulate==0.10.0 + # via pymatgen-core +terminado==0.18.1 + # via + # jupyter-server + # jupyter-server-terminals + # notebook +tinycss2==1.4.0 + # via bleach +tornado==6.5.6 + # via + # ipykernel + # jupyter-client + # jupyter-server + # notebook + # terminado +tqdm==4.67.3 + # via pymatgen-core +traitlets==5.15.0 + # via + # ipykernel + # ipython + # jupyter-client + # jupyter-core + # jupyter-events + # jupyter-server + # matplotlib-inline + # nbclient + # nbconvert + # nbformat + # notebook +typing-extensions==4.15.0 + # via + # anyio + # beautifulsoup4 + # flexcache + # flexparser + # ipython + # opentelemetry-api + # pint + # pyopenssl + # referencing + # spglib +tzdata==2026.2 + # via arrow +tzlocal==5.3.1 + # via dateparser +uncertainties==3.2.3 + # via + # mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) + # pymatgen-core +uri-template==1.3.0 + # via jsonschema +urllib3==2.7.0 + # via + # botocore + # requests +wcwidth==0.7.0 + # via prompt-toolkit +webcolors==25.10.0 + # via jsonschema +webencodings==0.5.1 + # via + # bleach + # tinycss2 +websocket-client==1.9.0 + # via + # jupyter-server + # mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +werkzeug==3.1.8 + # via + # flasgger-tschaume + # flask +wrapt==2.2.1 + # via ddtrace +zope-event==6.2 + # via gevent +zope-interface==8.5 + # via gevent +zstandard==0.25.0 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) diff --git a/mpcontribs-client/requirements/deployment.txt b/mpcontribs-client/requirements/deployment.txt index b70e9fb704..0df2dc53c3 100644 --- a/mpcontribs-client/requirements/deployment.txt +++ b/mpcontribs-client/requirements/deployment.txt @@ -50,13 +50,25 @@ fonttools==4.63.0 # via matplotlib fqdn==1.5.1 # via jsonschema +<<<<<<< HEAD idna==3.18 +||||||| parent of 5ef6d1d6 (upgrade dependencies for deployment) +idna==3.16 +======= +idna==3.17 +>>>>>>> 5ef6d1d6 (upgrade dependencies for deployment) # via # jsonschema # requests importlib-resources==7.1.0 # via swagger-spec-validator +<<<<<<< HEAD ipython==9.14.1 +||||||| parent of 5ef6d1d6 (upgrade dependencies for deployment) +ipython==9.13.0 +======= +ipython==9.14.0 +>>>>>>> 5ef6d1d6 (upgrade dependencies for deployment) # via mpcontribs-client (MPContribs/mpcontribs-client/pyproject.toml) ipython-pygments-lexers==1.1.1 # via ipython @@ -100,7 +112,13 @@ msgpack==1.1.2 # via # bravado # bravado-core +<<<<<<< HEAD narwhals==2.22.1 +||||||| parent of 5ef6d1d6 (upgrade dependencies for deployment) +narwhals==2.21.2 +======= +narwhals==2.22.0 +>>>>>>> 5ef6d1d6 (upgrade dependencies for deployment) # via plotly networkx==3.6.1 # via pymatgen-core diff --git a/mpcontribs-kernel-gateway/requirements/deployment.txt b/mpcontribs-kernel-gateway/requirements/deployment.txt index 238296ed41..b2183d9788 100644 --- a/mpcontribs-kernel-gateway/requirements/deployment.txt +++ b/mpcontribs-kernel-gateway/requirements/deployment.txt @@ -82,7 +82,13 @@ fonttools==4.63.0 # via matplotlib fqdn==1.5.1 # via jsonschema +<<<<<<< HEAD idna==3.18 +||||||| parent of 5ef6d1d6 (upgrade dependencies for deployment) +idna==3.16 +======= +idna==3.17 +>>>>>>> 5ef6d1d6 (upgrade dependencies for deployment) # via # anyio # jsonschema @@ -91,7 +97,13 @@ importlib-resources==7.1.0 # via swagger-spec-validator ipykernel==7.2.0 # via -r MPContribs/mpcontribs-kernel-gateway/requirements.in +<<<<<<< HEAD ipython==9.14.1 +||||||| parent of 5ef6d1d6 (upgrade dependencies for deployment) +ipython==9.13.0 +======= +ipython==9.14.0 +>>>>>>> 5ef6d1d6 (upgrade dependencies for deployment) # via # ipykernel # ipywidgets @@ -190,7 +202,13 @@ msgpack==1.1.2 # via # bravado # bravado-core +<<<<<<< HEAD narwhals==2.22.1 +||||||| parent of 5ef6d1d6 (upgrade dependencies for deployment) +narwhals==2.21.2 +======= +narwhals==2.22.0 +>>>>>>> 5ef6d1d6 (upgrade dependencies for deployment) # via plotly nbclient==0.11.0 # via nbconvert @@ -383,7 +401,13 @@ terminado==0.18.1 # jupyter-server-terminals tinycss2==1.5.1 # via bleach +<<<<<<< HEAD tornado==6.5.7 +||||||| parent of 5ef6d1d6 (upgrade dependencies for deployment) +tornado==6.5.5 +======= +tornado==6.5.6 +>>>>>>> 5ef6d1d6 (upgrade dependencies for deployment) # via # ipykernel # jupyter-client diff --git a/mpcontribs-portal/requirements/deployment.txt b/mpcontribs-portal/requirements/deployment.txt index d4168362c3..ee43ff442f 100644 --- a/mpcontribs-portal/requirements/deployment.txt +++ b/mpcontribs-portal/requirements/deployment.txt @@ -24,9 +24,21 @@ boltons==25.0.0 # via # mpcontribs-client # mpcontribs-portal (MPContribs/mpcontribs-portal/pyproject.toml) +<<<<<<< HEAD boto3==1.43.25 +||||||| parent of 5ef6d1d6 (upgrade dependencies for deployment) +boto3==1.43.13 +======= +boto3==1.43.19 +>>>>>>> 5ef6d1d6 (upgrade dependencies for deployment) # via mpcontribs-portal (MPContribs/mpcontribs-portal/pyproject.toml) +<<<<<<< HEAD botocore==1.43.25 +||||||| parent of 5ef6d1d6 (upgrade dependencies for deployment) +botocore==1.43.13 +======= +botocore==1.43.19 +>>>>>>> 5ef6d1d6 (upgrade dependencies for deployment) # via # boto3 # s3transfer @@ -97,7 +109,13 @@ greenlet==3.5.1 # via gevent gunicorn[gevent]==24.1.1 # via mpcontribs-portal (MPContribs/mpcontribs-portal/pyproject.toml) +<<<<<<< HEAD idna==3.18 +||||||| parent of 5ef6d1d6 (upgrade dependencies for deployment) +idna==3.16 +======= +idna==3.17 +>>>>>>> 5ef6d1d6 (upgrade dependencies for deployment) # via # jsonschema # requests @@ -105,7 +123,13 @@ importlib-resources==7.1.0 # via swagger-spec-validator ipykernel==7.2.0 # via mpcontribs-portal (MPContribs/mpcontribs-portal/pyproject.toml) +<<<<<<< HEAD ipython==9.14.1 +||||||| parent of 5ef6d1d6 (upgrade dependencies for deployment) +ipython==9.13.0 +======= +ipython==9.14.0 +>>>>>>> 5ef6d1d6 (upgrade dependencies for deployment) # via # ipykernel # mpcontribs-client @@ -189,7 +213,13 @@ msgpack==1.1.2 # via # bravado # bravado-core +<<<<<<< HEAD narwhals==2.22.1 +||||||| parent of 5ef6d1d6 (upgrade dependencies for deployment) +narwhals==2.21.2 +======= +narwhals==2.22.0 +>>>>>>> 5ef6d1d6 (upgrade dependencies for deployment) # via plotly nbclient==0.11.0 # via nbconvert @@ -363,7 +393,13 @@ tabulate==0.10.0 # via pymatgen-core tinycss2==1.5.1 # via bleach +<<<<<<< HEAD tornado==6.5.7 +||||||| parent of 5ef6d1d6 (upgrade dependencies for deployment) +tornado==6.5.5 +======= +tornado==6.5.6 +>>>>>>> 5ef6d1d6 (upgrade dependencies for deployment) # via # ipykernel # jupyter-client From fa4886cc4d51d1aaed5b33574914e458b54a37c1 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 4 Jun 2026 14:54:30 -0700 Subject: [PATCH 139/591] Infra changes for rewrite --- mpcontribs-api/Dockerfile | 2 +- mpcontribs-api/requirements/deployment.txt | 551 --------------------- 2 files changed, 1 insertion(+), 552 deletions(-) delete mode 100644 mpcontribs-api/requirements/deployment.txt diff --git a/mpcontribs-api/Dockerfile b/mpcontribs-api/Dockerfile index 2e755f13cc..2a90bcf658 100644 --- a/mpcontribs-api/Dockerfile +++ b/mpcontribs-api/Dockerfile @@ -6,7 +6,7 @@ WORKDIR /app FROM base AS builder RUN apt-get update && apt-get install -y --no-install-recommends gcc git g++ wget liblapack-dev && apt-get clean RUN pip install uv -COPY pyproject.toml uv.lock . +COPY pyproject.toml uv.lock ./ COPY src src ARG CONTRIBS_VERSION RUN SETUPTOOLS_SCM_PRETEND_VERSION=${CONTRIBS_VERSION} uv sync --frozen --no-dev diff --git a/mpcontribs-api/requirements/deployment.txt b/mpcontribs-api/requirements/deployment.txt deleted file mode 100644 index 7056ece33a..0000000000 --- a/mpcontribs-api/requirements/deployment.txt +++ /dev/null @@ -1,551 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.11 -# by the following command: -# -# pip-compile --output-file=MPContribs/mpcontribs-api/requirements/deployment.txt MPContribs/mpcontribs-api/pyproject.toml python/requirements.txt -# -anyio==4.13.0 - # via jupyter-server -apispec==5.2.2 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -argon2-cffi==25.1.0 - # via - # jupyter-server - # notebook -argon2-cffi-bindings==25.1.0 - # via argon2-cffi -arrow==1.4.0 - # via isoduration -asn1crypto==1.5.1 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -asttokens==3.0.1 - # via stack-data -atlasq-tschaume==0.11.1.dev2 - # via flask-mongorest-mpcontribs -attrs==26.1.0 - # via - # jsonschema - # referencing -backports-zstd==1.5.0 - # via flask-compress -beautifulsoup4==4.14.3 - # via nbconvert -bibtexparser==1.4.4 - # via pymatgen-core -bleach[css]==6.3.0 - # via nbconvert -blinker==1.9.0 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -boltons==25.0.0 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -boto3==1.43.19 - # via flask-mongorest-mpcontribs -botocore==1.43.19 - # via - # boto3 - # s3transfer -brotli==1.2.0 - # via flask-compress -bytecode==0.17.0 - # via ddtrace -certifi==2026.5.20 - # via requests -cffi==2.0.0 - # via - # argon2-cffi-bindings - # cryptography -charset-normalizer==3.4.7 - # via requests -click==8.4.1 - # via - # flask - # rq -comm==0.2.3 - # via ipykernel -contourpy==1.3.3 - # via matplotlib -cramjam==2.11.0 - # via python-snappy -crontab==1.0.5 - # via rq-scheduler -cryptography==48.0.0 - # via pyopenssl -css-html-js-minify==2.5.5 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -cycler==0.12.1 - # via matplotlib -dateparser==1.4.0 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -ddtrace==4.3.0 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -debugpy==1.8.21 - # via ipykernel -decorator==5.3.1 - # via ipython -defusedxml==0.7.1 - # via nbconvert -dnspython==2.8.0 - # via - # mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) - # pymongo -entrypoints==0.4 - # via jupyter-client -envier==0.6.1 - # via ddtrace -executing==2.2.1 - # via stack-data -fastjsonschema==2.21.2 - # via nbformat -fastnumbers==5.1.1 - # via flask-mongorest-mpcontribs -filetype==1.2.0 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -flasgger-tschaume==0.9.7 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -flask==2.2.5 - # via - # flasgger-tschaume - # flask-compress - # flask-marshmallow - # flask-mongoengine-tschaume - # flask-rq2 - # flask-sse -flask-compress==1.24 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -flask-marshmallow==1.4.0 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -flask-mongoengine-tschaume==1.1.0 - # via flask-mongorest-mpcontribs -flask-mongorest-mpcontribs==3.3.0 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -flask-rq2==18.3 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -flask-sse==1.0.0 - # via flask-mongorest-mpcontribs -flatten-dict==0.5.0 - # via flask-mongorest-mpcontribs -flexcache==0.3 - # via pint -flexparser==0.4 - # via pint -fonttools==4.63.0 - # via matplotlib -fqdn==1.5.1 - # via jsonschema -freezegun==1.5.5 - # via rq-scheduler -gevent==26.5.0 - # via gunicorn -greenlet==3.5.1 - # via gevent -gunicorn[gevent]==24.1.1 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -idna==3.17 - # via - # anyio - # jsonschema - # requests -ipykernel==6.29.5 - # via - # nbclassic - # notebook -ipython==9.14.0 - # via ipykernel -ipython-genutils==0.2.0 - # via - # nbclassic - # notebook -ipython-pygments-lexers==1.1.1 - # via ipython -isoduration==20.11.0 - # via jsonschema -itsdangerous==2.2.0 - # via flask -jedi==0.20.0 - # via ipython -jinja2==3.1.6 - # via - # flask - # jupyter-server - # mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) - # nbconvert - # notebook -jmespath==1.1.0 - # via - # boto3 - # botocore -joblib==1.5.3 - # via pymatgen-core -json2html==1.3.0 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -jsonpointer==3.1.1 - # via jsonschema -jsonschema[format-nongpl]==4.26.0 - # via - # flasgger-tschaume - # jupyter-events - # nbformat -jsonschema-specifications==2025.9.1 - # via jsonschema -jupyter-client==7.4.9 - # via - # ipykernel - # jupyter-server - # nbclient - # notebook -jupyter-core==5.9.1 - # via - # ipykernel - # jupyter-client - # jupyter-server - # nbclient - # nbconvert - # nbformat - # notebook -jupyter-events==0.12.1 - # via jupyter-server -jupyter-server==2.19.0 - # via notebook-shim -jupyter-server-terminals==0.5.4 - # via jupyter-server -jupyterlab-pygments==0.3.0 - # via nbconvert -kiwisolver==1.5.0 - # via matplotlib -lark==1.3.1 - # via rfc3987-syntax -lxml==6.1.1 - # via pymatgen-core -markupsafe==3.0.3 - # via - # jinja2 - # nbconvert - # werkzeug -marshmallow==3.26.2 - # via - # flask-marshmallow - # marshmallow-mongoengine - # mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -marshmallow-mongoengine==0.31.2 - # via flask-mongorest-mpcontribs -matplotlib==3.10.9 - # via - # -r python/requirements.txt - # pymatgen-core -matplotlib-inline==0.2.2 - # via - # ipykernel - # ipython -mimerender-pr36==0.0.2 - # via flask-mongorest-mpcontribs -mistune==3.2.1 - # via - # flasgger-tschaume - # nbconvert -mongoengine==0.29.3 - # via - # atlasq-tschaume - # flask-mongoengine-tschaume - # marshmallow-mongoengine -monty==2026.5.18 - # via pymatgen-core -more-itertools==11.1.0 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -mpmath==1.3.0 - # via sympy -narwhals==2.22.0 - # via plotly -nbclassic==1.3.3 - # via notebook -nbclient==0.10.4 - # via nbconvert -nbconvert==7.17.1 - # via - # jupyter-server - # notebook -nbformat==5.10.4 - # via - # jupyter-server - # mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) - # nbclient - # nbconvert - # notebook -nest-asyncio==1.6.0 - # via - # ipykernel - # jupyter-client - # nbclassic - # notebook -networkx==3.6.1 - # via pymatgen-core -notebook==6.5.7 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -notebook-shim==0.2.4 - # via nbclassic -numpy==2.4.6 - # via - # -r python/requirements.txt - # contourpy - # matplotlib - # monty - # mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) - # pandas - # pymatgen-core - # scipy - # spglib -opentelemetry-api==1.42.1 - # via ddtrace -orjson==3.11.9 - # via - # flask-mongorest-mpcontribs - # pymatgen-core -overrides==7.7.0 - # via jupyter-server -packaging==26.2 - # via - # gunicorn - # ipykernel - # jupyter-events - # jupyter-server - # marshmallow - # matplotlib - # nbconvert - # plotly -palettable==3.3.3 - # via pymatgen-core -pandas==3.0.3 - # via - # -r python/requirements.txt - # pymatgen-core -pandocfilters==1.5.1 - # via nbconvert -parso==0.8.7 - # via jedi -pexpect==4.9.0 - # via ipython -pillow==12.2.0 - # via matplotlib -pint==0.25.3 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -platformdirs==4.10.0 - # via - # jupyter-core - # pint -plotly==6.7.0 - # via pymatgen-core -prometheus-client==0.25.0 - # via - # jupyter-server - # notebook -prompt-toolkit==3.0.52 - # via ipython -psutil==7.2.2 - # via - # ipykernel - # ipython -psycopg2-binary==2.9.12 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -ptyprocess==0.7.0 - # via - # pexpect - # terminado -pure-eval==0.2.3 - # via stack-data -pycparser==3.0 - # via cffi -pygments==2.20.0 - # via - # ipython - # ipython-pygments-lexers - # nbconvert -pymatgen==2026.5.4 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -pymatgen-core==2026.5.18 - # via pymatgen -pymongo==4.17.0 - # via - # flask-mongorest-mpcontribs - # mongoengine -pyopenssl==26.2.0 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -pyparsing==3.3.2 - # via - # bibtexparser - # matplotlib -python-dateutil==2.9.0.post0 - # via - # arrow - # botocore - # dateparser - # flask-mongorest-mpcontribs - # freezegun - # jupyter-client - # matplotlib - # pandas - # rq-scheduler -python-json-logger==4.1.0 - # via jupyter-events -python-mimeparse==2.0.0 - # via mimerender-pr36 -python-snappy==0.7.3 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -pytz==2026.2 - # via dateparser -pyyaml==6.0.3 - # via - # flasgger-tschaume - # jupyter-events -pyzmq==27.1.0 - # via - # ipykernel - # jupyter-client - # jupyter-server - # notebook -redis==8.0.0 - # via - # flask-rq2 - # flask-sse - # rq -referencing==0.37.0 - # via - # jsonschema - # jsonschema-specifications - # jupyter-events -regex==2026.5.9 - # via dateparser -requests==2.34.2 - # via - # atlasq-tschaume - # pymatgen-core -rfc3339-validator==0.1.4 - # via - # jsonschema - # jupyter-events -rfc3986-validator==0.1.1 - # via - # jsonschema - # jupyter-events -rfc3987-syntax==1.1.0 - # via jsonschema -rpds-py==2026.5.1 - # via - # jsonschema - # referencing -rq==2.3.2 - # via - # flask-rq2 - # mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) - # rq-scheduler -rq-scheduler==0.14.0 - # via flask-rq2 -ruamel-yaml==0.19.1 - # via monty -s3transfer==0.18.0 - # via boto3 -scipy==1.17.1 - # via - # -r python/requirements.txt - # pymatgen-core -send2trash==2.1.0 - # via - # jupyter-server - # notebook -setproctitle==1.3.7 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -six==1.17.0 - # via - # flasgger-tschaume - # flask-sse - # python-dateutil - # rfc3339-validator -soupsieve==2.8.4 - # via beautifulsoup4 -spglib==2.7.0 - # via pymatgen-core -stack-data==0.6.3 - # via ipython -supervisor==4.3.0 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -sympy==1.14.0 - # via pymatgen-core -tabulate==0.10.0 - # via pymatgen-core -terminado==0.18.1 - # via - # jupyter-server - # jupyter-server-terminals - # notebook -tinycss2==1.4.0 - # via bleach -tornado==6.5.6 - # via - # ipykernel - # jupyter-client - # jupyter-server - # notebook - # terminado -tqdm==4.67.3 - # via pymatgen-core -traitlets==5.15.0 - # via - # ipykernel - # ipython - # jupyter-client - # jupyter-core - # jupyter-events - # jupyter-server - # matplotlib-inline - # nbclient - # nbconvert - # nbformat - # notebook -typing-extensions==4.15.0 - # via - # anyio - # beautifulsoup4 - # flexcache - # flexparser - # ipython - # opentelemetry-api - # pint - # pyopenssl - # referencing - # spglib -tzdata==2026.2 - # via arrow -tzlocal==5.3.1 - # via dateparser -uncertainties==3.2.3 - # via - # mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) - # pymatgen-core -uri-template==1.3.0 - # via jsonschema -urllib3==2.7.0 - # via - # botocore - # requests -wcwidth==0.7.0 - # via prompt-toolkit -webcolors==25.10.0 - # via jsonschema -webencodings==0.5.1 - # via - # bleach - # tinycss2 -websocket-client==1.9.0 - # via - # jupyter-server - # mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -werkzeug==3.1.8 - # via - # flasgger-tschaume - # flask -wrapt==2.2.1 - # via ddtrace -zope-event==6.2 - # via gevent -zope-interface==8.5 - # via gevent -zstandard==0.25.0 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) From a5d543b7f8841d224a2c63381e1e1af606315e0b Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 17 Jun 2026 13:54:01 -0700 Subject: [PATCH 140/591] Stop tracking .claude/ directory --- .claude/worktrees/unify-component-service | 1 - 1 file changed, 1 deletion(-) delete mode 160000 .claude/worktrees/unify-component-service diff --git a/.claude/worktrees/unify-component-service b/.claude/worktrees/unify-component-service deleted file mode 160000 index 7d84eafaec..0000000000 --- a/.claude/worktrees/unify-component-service +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 7d84eafaec7223ee57b2b626f02815075a8dfc47 From 24d7b5d651421e37a29ba0133377f9dd3eb271a8 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 17 Jun 2026 15:05:22 -0700 Subject: [PATCH 141/591] Revert changes to deployment of other submodules --- .../domains/_shared/repository.py | 2 +- mpcontribs-client/requirements/deployment.txt | 18 ---------- .../requirements/deployment.txt | 24 ------------- mpcontribs-portal/requirements/deployment.txt | 36 ------------------- 4 files changed, 1 insertion(+), 79 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py index f194d4dd5c..4a1163b41b 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py @@ -281,7 +281,7 @@ async def download( # Check S3 for the cached file # TODO: Implement if not ignore_cache and self._s3_object_exists(bucket_name=bucket_name, key_name=key_name, s3=s3): - # Download from either presigned url or bytes + # Download from either presigned url pass # If not found in cache, build from MongoDB and save to cache diff --git a/mpcontribs-client/requirements/deployment.txt b/mpcontribs-client/requirements/deployment.txt index 0df2dc53c3..b70e9fb704 100644 --- a/mpcontribs-client/requirements/deployment.txt +++ b/mpcontribs-client/requirements/deployment.txt @@ -50,25 +50,13 @@ fonttools==4.63.0 # via matplotlib fqdn==1.5.1 # via jsonschema -<<<<<<< HEAD idna==3.18 -||||||| parent of 5ef6d1d6 (upgrade dependencies for deployment) -idna==3.16 -======= -idna==3.17 ->>>>>>> 5ef6d1d6 (upgrade dependencies for deployment) # via # jsonschema # requests importlib-resources==7.1.0 # via swagger-spec-validator -<<<<<<< HEAD ipython==9.14.1 -||||||| parent of 5ef6d1d6 (upgrade dependencies for deployment) -ipython==9.13.0 -======= -ipython==9.14.0 ->>>>>>> 5ef6d1d6 (upgrade dependencies for deployment) # via mpcontribs-client (MPContribs/mpcontribs-client/pyproject.toml) ipython-pygments-lexers==1.1.1 # via ipython @@ -112,13 +100,7 @@ msgpack==1.1.2 # via # bravado # bravado-core -<<<<<<< HEAD narwhals==2.22.1 -||||||| parent of 5ef6d1d6 (upgrade dependencies for deployment) -narwhals==2.21.2 -======= -narwhals==2.22.0 ->>>>>>> 5ef6d1d6 (upgrade dependencies for deployment) # via plotly networkx==3.6.1 # via pymatgen-core diff --git a/mpcontribs-kernel-gateway/requirements/deployment.txt b/mpcontribs-kernel-gateway/requirements/deployment.txt index b2183d9788..238296ed41 100644 --- a/mpcontribs-kernel-gateway/requirements/deployment.txt +++ b/mpcontribs-kernel-gateway/requirements/deployment.txt @@ -82,13 +82,7 @@ fonttools==4.63.0 # via matplotlib fqdn==1.5.1 # via jsonschema -<<<<<<< HEAD idna==3.18 -||||||| parent of 5ef6d1d6 (upgrade dependencies for deployment) -idna==3.16 -======= -idna==3.17 ->>>>>>> 5ef6d1d6 (upgrade dependencies for deployment) # via # anyio # jsonschema @@ -97,13 +91,7 @@ importlib-resources==7.1.0 # via swagger-spec-validator ipykernel==7.2.0 # via -r MPContribs/mpcontribs-kernel-gateway/requirements.in -<<<<<<< HEAD ipython==9.14.1 -||||||| parent of 5ef6d1d6 (upgrade dependencies for deployment) -ipython==9.13.0 -======= -ipython==9.14.0 ->>>>>>> 5ef6d1d6 (upgrade dependencies for deployment) # via # ipykernel # ipywidgets @@ -202,13 +190,7 @@ msgpack==1.1.2 # via # bravado # bravado-core -<<<<<<< HEAD narwhals==2.22.1 -||||||| parent of 5ef6d1d6 (upgrade dependencies for deployment) -narwhals==2.21.2 -======= -narwhals==2.22.0 ->>>>>>> 5ef6d1d6 (upgrade dependencies for deployment) # via plotly nbclient==0.11.0 # via nbconvert @@ -401,13 +383,7 @@ terminado==0.18.1 # jupyter-server-terminals tinycss2==1.5.1 # via bleach -<<<<<<< HEAD tornado==6.5.7 -||||||| parent of 5ef6d1d6 (upgrade dependencies for deployment) -tornado==6.5.5 -======= -tornado==6.5.6 ->>>>>>> 5ef6d1d6 (upgrade dependencies for deployment) # via # ipykernel # jupyter-client diff --git a/mpcontribs-portal/requirements/deployment.txt b/mpcontribs-portal/requirements/deployment.txt index ee43ff442f..d4168362c3 100644 --- a/mpcontribs-portal/requirements/deployment.txt +++ b/mpcontribs-portal/requirements/deployment.txt @@ -24,21 +24,9 @@ boltons==25.0.0 # via # mpcontribs-client # mpcontribs-portal (MPContribs/mpcontribs-portal/pyproject.toml) -<<<<<<< HEAD boto3==1.43.25 -||||||| parent of 5ef6d1d6 (upgrade dependencies for deployment) -boto3==1.43.13 -======= -boto3==1.43.19 ->>>>>>> 5ef6d1d6 (upgrade dependencies for deployment) # via mpcontribs-portal (MPContribs/mpcontribs-portal/pyproject.toml) -<<<<<<< HEAD botocore==1.43.25 -||||||| parent of 5ef6d1d6 (upgrade dependencies for deployment) -botocore==1.43.13 -======= -botocore==1.43.19 ->>>>>>> 5ef6d1d6 (upgrade dependencies for deployment) # via # boto3 # s3transfer @@ -109,13 +97,7 @@ greenlet==3.5.1 # via gevent gunicorn[gevent]==24.1.1 # via mpcontribs-portal (MPContribs/mpcontribs-portal/pyproject.toml) -<<<<<<< HEAD idna==3.18 -||||||| parent of 5ef6d1d6 (upgrade dependencies for deployment) -idna==3.16 -======= -idna==3.17 ->>>>>>> 5ef6d1d6 (upgrade dependencies for deployment) # via # jsonschema # requests @@ -123,13 +105,7 @@ importlib-resources==7.1.0 # via swagger-spec-validator ipykernel==7.2.0 # via mpcontribs-portal (MPContribs/mpcontribs-portal/pyproject.toml) -<<<<<<< HEAD ipython==9.14.1 -||||||| parent of 5ef6d1d6 (upgrade dependencies for deployment) -ipython==9.13.0 -======= -ipython==9.14.0 ->>>>>>> 5ef6d1d6 (upgrade dependencies for deployment) # via # ipykernel # mpcontribs-client @@ -213,13 +189,7 @@ msgpack==1.1.2 # via # bravado # bravado-core -<<<<<<< HEAD narwhals==2.22.1 -||||||| parent of 5ef6d1d6 (upgrade dependencies for deployment) -narwhals==2.21.2 -======= -narwhals==2.22.0 ->>>>>>> 5ef6d1d6 (upgrade dependencies for deployment) # via plotly nbclient==0.11.0 # via nbconvert @@ -393,13 +363,7 @@ tabulate==0.10.0 # via pymatgen-core tinycss2==1.5.1 # via bleach -<<<<<<< HEAD tornado==6.5.7 -||||||| parent of 5ef6d1d6 (upgrade dependencies for deployment) -tornado==6.5.5 -======= -tornado==6.5.6 ->>>>>>> 5ef6d1d6 (upgrade dependencies for deployment) # via # ipykernel # jupyter-client From e9e10744b5f942f14143b00d7e2b8c6f03f560b8 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 17 Jun 2026 17:10:31 -0700 Subject: [PATCH 142/591] Switched to standard docker image. Allows decoupling python versions across our stack easily, but loses centralization. We only had light centralization, but future efforts would not be immediately shared --- mpcontribs-api/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mpcontribs-api/Dockerfile b/mpcontribs-api/Dockerfile index 2a90bcf658..d8dec40b4f 100644 --- a/mpcontribs-api/Dockerfile +++ b/mpcontribs-api/Dockerfile @@ -1,5 +1,5 @@ -# NOTE: base image must be updated to Python 3.14 to satisfy requires-python in pyproject.toml -FROM materialsproject/devops:python-3.1113.4 AS base +# FROM materialsproject/devops:python-3.1113.4 AS base +FROM python:3.14-slim AS base RUN apt-get update && apt-get install -y --no-install-recommends supervisor libopenblas-dev vim && apt-get clean WORKDIR /app From 0ebd99cdf1f22a29d71ce347d03efc25067535eb Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 18 Jun 2026 10:15:40 -0700 Subject: [PATCH 143/591] Improved OTel instrumentation. Removed ddtrace references --- mpcontribs-api/Dockerfile | 11 ++- mpcontribs-api/scripts/start.sh | 6 +- mpcontribs-api/src/mpcontribs_api/app.py | 6 +- mpcontribs-api/src/mpcontribs_api/config.py | 33 +++++++++ .../domains/_shared/components.py | 2 +- .../domains/healthcheck/router.py | 2 +- mpcontribs-api/src/mpcontribs_api/logging.py | 68 ++++++++++++++++++- .../src/mpcontribs_api/middleware.py | 66 ++++++++++++++++++ mpcontribs-api/supervisord/conf.py | 3 +- .../supervisord/supervisord.conf.jinja | 7 +- mpcontribs-api/tests/conftest.py | 2 + 11 files changed, 184 insertions(+), 22 deletions(-) diff --git a/mpcontribs-api/Dockerfile b/mpcontribs-api/Dockerfile index d8dec40b4f..a7b12daba8 100644 --- a/mpcontribs-api/Dockerfile +++ b/mpcontribs-api/Dockerfile @@ -29,14 +29,11 @@ COPY docker-entrypoint.sh . RUN chmod +x main.py scripts/start.sh docker-entrypoint.sh ARG VERSION -ENV PATH="/app/.venv/bin:$PATH" \ - DD_SERVICE=contribs-apis \ - DD_ENV=prod \ - DD_VERSION=$VERSION \ - DD_TRACE_HOST=localhost:8126 \ - DD_MAIN_PACKAGE=mpcontribs-api +# Telemetry (traces/metrics/logs) is emitted via OTLP to the Datadog Agent's OTLP receiver; the +# endpoint and other OTEL settings are configured per-environment in supervisord.conf.jinja +# (MPCONTRIBS_OTEL__*). No Datadog-specific app config lives here. +ENV PATH="/app/.venv/bin:$PATH" -LABEL com.datadoghq.ad.logs='[{"source": "uvicorn", "service": "contribs-apis"}]' EXPOSE 10000 10002 10003 10005 20000 ENTRYPOINT ["/app/docker-entrypoint.sh"] CMD ["/usr/bin/supervisord", "-c", "supervisord.conf"] diff --git a/mpcontribs-api/scripts/start.sh b/mpcontribs-api/scripts/start.sh index 59eefed59c..631f570149 100755 --- a/mpcontribs-api/scripts/start.sh +++ b/mpcontribs-api/scripts/start.sh @@ -10,8 +10,6 @@ PMGRC=$HOME/.pmgrc.yaml set -x -if [[ -n "$DD_TRACE_HOST" ]]; then - wait-for-it.sh "$DD_TRACE_HOST" -q -s -t 10 || echo "WARNING: datadog agent unreachable" -fi - +# No wait for the OTLP collector: the OTEL batch processors tolerate an unavailable endpoint +# (they retry and drop), so startup must not block on it. exec uvicorn mpcontribs_api.app:app --host 0.0.0.0 --port "$API_PORT" diff --git a/mpcontribs-api/src/mpcontribs_api/app.py b/mpcontribs-api/src/mpcontribs_api/app.py index 6c7aaee09b..2fd4c80fa6 100644 --- a/mpcontribs-api/src/mpcontribs_api/app.py +++ b/mpcontribs-api/src/mpcontribs_api/app.py @@ -23,7 +23,7 @@ from mpcontribs_api.domains.tables.models import Table from mpcontribs_api.exceptions import register_exception_handlers from mpcontribs_api.logging import configure_logging, get_logger -from mpcontribs_api.middleware import RequestContextMiddleware +from mpcontribs_api.middleware import RequestContextMiddleware, configure_tracing, instrument_app logger = get_logger(__name__) @@ -94,6 +94,8 @@ async def lifespan(app: FastAPI) -> AsyncGenerator[None]: def create_app(settings: Settings | None = None) -> FastAPI: settings = settings or get_settings() + # Register OTEL providers before logging so the logs pipeline attaches to live telemetry. + configure_tracing(settings) configure_logging(settings) app = FastAPI( @@ -115,6 +117,8 @@ def create_app(settings: Settings | None = None) -> FastAPI: # Add request context to the logger app.add_middleware(RequestContextMiddleware) + # Emit server-side request spans/metrics (no-op when telemetry is disabled). + instrument_app(app, settings) register_exception_handlers(app) app.include_router(healthcheck_router, prefix="/health") app.include_router(v1_router, prefix="/api/v1") diff --git a/mpcontribs-api/src/mpcontribs_api/config.py b/mpcontribs-api/src/mpcontribs_api/config.py index 780a75cb94..61f9f6cebf 100644 --- a/mpcontribs-api/src/mpcontribs_api/config.py +++ b/mpcontribs-api/src/mpcontribs_api/config.py @@ -10,6 +10,36 @@ class RedisSettings(BaseModel): url: SecretStr +class ObservabilitySettings(BaseModel): + """OpenTelemetry settings. + + The application is vendor-neutral: it emits traces, metrics, and logs via OTLP/gRPC to a + collector (in our deployment, the Datadog Agent's OTLP receiver). Datadog is purely the backend. + """ + + enabled: bool = Field( + default=True, + description="Master switch for OTEL setup. Disable in tests/local runs without a collector.", + ) + service_name: str = Field( + default="contribs-apis", + description="Value of the service.name resource attribute. Kept as the legacy Datadog " + "service name so existing dashboards and monitors keep resolving.", + ) + otlp_endpoint: str = Field( + default="localhost:4317", + description="host:port of the OTLP/gRPC receiver (the Datadog Agent's OTLP endpoint).", + ) + insecure: bool = Field( + default=True, + description="Use an insecure (plaintext) gRPC channel. True for a local/sidecar agent without TLS.", + ) + metric_export_interval_ms: int = Field( + default=60_000, + description="How often (ms) the periodic metric reader exports to the collector.", + ) + + class AwsSettings(BaseModel): """AWS Settings @@ -137,6 +167,9 @@ class Settings(BaseSettings): # MPContribs_redis__* redis: RedisSettings + # MPContribs_otel__* + otel: ObservabilitySettings = Field(default_factory=ObservabilitySettings) + # SMTP Settings mail_default_sender: str = Field( description="SMTP Server to send out notifications on new projects and other important moments" diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py index cf13c22579..a7a25d1cbe 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py @@ -17,7 +17,7 @@ class MongoDbComponentsRepository[ TDoc: Component, TIn: Component, TOut: DocumentOut, - TFilter: Filter, # not FilterDepends — see below + TFilter: Filter, TPatch: BaseModel, ](MongoDbRepository[TDoc, TIn, TOut, TFilter, TPatch]): @staticmethod diff --git a/mpcontribs-api/src/mpcontribs_api/domains/healthcheck/router.py b/mpcontribs-api/src/mpcontribs_api/domains/healthcheck/router.py index e099971ab6..88abea6a91 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/healthcheck/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/healthcheck/router.py @@ -28,7 +28,7 @@ async def healthcheck(db: DbDep, s3_client: S3Dep) -> HealthStatus: try: await s3_client.head_bucket(Bucket=settings.aws.health_bucket) - except (ClientError, BotoCoreError): + except ClientError, BotoCoreError: raise HTTPException( status_code=status.HTTP_503_SERVICE_UNAVAILABLE, detail={"status": "unhealthy", "s3": "unreachable"}, diff --git a/mpcontribs-api/src/mpcontribs_api/logging.py b/mpcontribs-api/src/mpcontribs_api/logging.py index ef7f6e6fb8..2c741c5b03 100644 --- a/mpcontribs-api/src/mpcontribs_api/logging.py +++ b/mpcontribs-api/src/mpcontribs_api/logging.py @@ -3,9 +3,30 @@ import structlog from opentelemetry import trace +from opentelemetry._logs import set_logger_provider +from opentelemetry.exporter.otlp.proto.grpc._log_exporter import OTLPLogExporter +from opentelemetry.sdk._logs import LoggerProvider, LoggingHandler +from opentelemetry.sdk._logs.export import BatchLogRecordProcessor +from opentelemetry.sdk.resources import Resource from mpcontribs_api.config import Settings +# Held across calls so repeated configure_logging() (tests, reloads) reuses one provider rather than +# re-registering. Shared with middleware.py, which builds the tracer/meter providers from the same +# resource so all three signals carry identical service identity. +_logger_provider: LoggerProvider | None = None + + +def build_resource(settings: Settings) -> Resource: + """OTEL resource describing this service. Single source of truth for traces, metrics, and logs.""" + return Resource.create( + { + "service.name": settings.otel.service_name, + "service.version": settings.version, + "deployment.environment": settings.environment, + } + ) + def add_otel_trace_context(_, __, event_dict): span = trace.get_current_span() @@ -20,6 +41,44 @@ def add_otel_trace_context(_, __, event_dict): return event_dict +def _build_otlp_log_handler(settings: Settings, log_level: int, shared_processors: list) -> LoggingHandler | None: + """Build a stdlib handler that ships records to the OTLP logs pipeline (the Datadog Agent's OTLP + receiver), or ``None`` when telemetry is disabled. + + The record body is the structlog event rendered to JSON; the SDK stamps each record with the + active span's trace/span ids, so logs correlate with traces. + """ + global _logger_provider + if not settings.otel.enabled: + return None + + if _logger_provider is None: + _logger_provider = LoggerProvider(resource=build_resource(settings)) + _logger_provider.add_log_record_processor( + BatchLogRecordProcessor( + OTLPLogExporter(endpoint=settings.otel.otlp_endpoint, insecure=settings.otel.insecure) + ) + ) + set_logger_provider(_logger_provider) + + handler = LoggingHandler(level=log_level, logger_provider=_logger_provider) + # ProcessorFormatter renders the event dict to a JSON string, which LoggingHandler uses as the + # log body (it calls self.format() when a formatter is set). Always JSON regardless of + # environment - the OTLP body should be structured even when stdout is the dev console renderer. + handler.setFormatter( + structlog.stdlib.ProcessorFormatter( + foreign_pre_chain=shared_processors, + processors=[ + structlog.stdlib.ProcessorFormatter.remove_processors_meta, + structlog.processors.dict_tracebacks, + structlog.processors.EventRenamer("message"), + structlog.processors.JSONRenderer(), + ], + ) + ) + return handler + + def configure_logging(settings: Settings) -> None: is_prod = settings.environment == "prod" log_level = logging.INFO if is_prod else logging.DEBUG @@ -62,8 +121,15 @@ def configure_logging(settings: Settings) -> None: handler = logging.StreamHandler(sys.stdout) handler.setFormatter(formatter) + # stdout stays for kubectl logs/ebugging; the OTLP handler (when enabled) ships the same + # records to the collector, so Datadog ingests via OTLP rather than tailing stdout. + handlers: list[logging.Handler] = [handler] + otlp_handler = _build_otlp_log_handler(settings, log_level, shared_processors) + if otlp_handler is not None: + handlers.append(otlp_handler) + root = logging.getLogger() - root.handlers = [handler] + root.handlers = handlers root.setLevel(log_level) # Let uvicorn's loggers flow through the root handler instead of their own. diff --git a/mpcontribs-api/src/mpcontribs_api/middleware.py b/mpcontribs-api/src/mpcontribs_api/middleware.py index c6fa240125..a313b6545c 100644 --- a/mpcontribs-api/src/mpcontribs_api/middleware.py +++ b/mpcontribs-api/src/mpcontribs_api/middleware.py @@ -1,9 +1,30 @@ +from __future__ import annotations + import uuid from collections.abc import Iterable +from typing import TYPE_CHECKING import structlog +from opentelemetry import metrics, trace +from opentelemetry.exporter.otlp.proto.grpc.metric_exporter import OTLPMetricExporter +from opentelemetry.exporter.otlp.proto.grpc.trace_exporter import OTLPSpanExporter +from opentelemetry.instrumentation.pymongo import PymongoInstrumentor +from opentelemetry.sdk.metrics import MeterProvider +from opentelemetry.sdk.metrics.export import PeriodicExportingMetricReader +from opentelemetry.sdk.trace import TracerProvider +from opentelemetry.sdk.trace.export import BatchSpanProcessor from starlette.types import ASGIApp, Receive, Scope, Send +from mpcontribs_api.config import Settings +from mpcontribs_api.logging import build_resource + +if TYPE_CHECKING: + from fastapi import FastAPI + +# Guards repeated configure_tracing() (tests, reloads) from re-registering providers or +# double-instrumenting pymongo. +_configured = False + # Lowercased ASGI byte header name -> structlog context key. _LOGGED_HEADERS: dict[bytes, str] = { b"user-agent": "user_agent", @@ -36,6 +57,10 @@ async def __call__(self, scope: Scope, receive: Receive, send: Send) -> None: "method": scope["method"], "path": scope["path"], } + # Kong-resolved consumer identity for log correlation + raw_consumer_id = headers.get(b"x-consumer-id") + if raw_consumer_id is not None: + context["consumer_id"] = raw_consumer_id.decode() for header_name, log_key in _LOGGED_HEADERS.items(): value = headers.get(header_name) if value is not None: @@ -45,3 +70,44 @@ async def __call__(self, scope: Scope, receive: Receive, send: Send) -> None: structlog.contextvars.bind_contextvars(**context) await self.app(scope, receive, send) + + +def configure_tracing(settings: Settings) -> None: + """Register the global tracer and meter providers, exporting via OTLP/gRPC to the collector. + + Covers the request-scoped signals: ``instrument_app`` (below) emits server spans and + ``http.server`` metrics through these providers, and pymongo spans cover the DB layer. No-op when + telemetry is disabled or already configured. + """ + global _configured + if _configured or not settings.otel.enabled: + return + + resource = build_resource(settings) + endpoint = settings.otel.otlp_endpoint + insecure = settings.otel.insecure + + tracer_provider = TracerProvider(resource=resource) + tracer_provider.add_span_processor(BatchSpanProcessor(OTLPSpanExporter(endpoint=endpoint, insecure=insecure))) + trace.set_tracer_provider(tracer_provider) + + metric_reader = PeriodicExportingMetricReader( + OTLPMetricExporter(endpoint=endpoint, insecure=insecure), + export_interval_millis=settings.otel.metric_export_interval_ms, + ) + metrics.set_meter_provider(MeterProvider(resource=resource, metric_readers=[metric_reader])) + + # Registers a pymongo command listener, so DB spans cover the async client used by Beanie too. + PymongoInstrumentor().instrument() + + _configured = True + + +def instrument_app(app: FastAPI, settings: Settings) -> None: + """Instrument the FastAPI app for server-side request spans/metrics. No-op when disabled.""" + if not settings.otel.enabled: + return + # Imported lazily: pulls in the ASGI instrumentation, only needed when enabled. + from opentelemetry.instrumentation.fastapi import FastAPIInstrumentor + + FastAPIInstrumentor.instrument_app(app) diff --git a/mpcontribs-api/supervisord/conf.py b/mpcontribs-api/supervisord/conf.py index 3e1c5d128f..1f5bdd5bf7 100644 --- a/mpcontribs-api/supervisord/conf.py +++ b/mpcontribs-api/supervisord/conf.py @@ -30,7 +30,8 @@ "node_env": "production" if PRODUCTION else "development", "flask_log_level": "INFO" if PRODUCTION else "DEBUG", "jupyter_gateway_host": f"localhost:{KG_PORT}" if PRODUCTION else f"kernel-gateway:{KG_PORT}", - "dd_agent_host": "localhost" if PRODUCTION else "datadog", + # OTLP/gRPC receiver: the Datadog Agent sidecar in prod, the "datadog" compose service in dev. + "otel_endpoint": "localhost:4317" if PRODUCTION else "datadog:4317", "mpcontribs_api_host": "localhost" if PRODUCTION else "contribs-apis", } kwargs["flask_debug"] = kwargs["node_env"] == "development" diff --git a/mpcontribs-api/supervisord/supervisord.conf.jinja b/mpcontribs-api/supervisord/supervisord.conf.jinja index 320d7493ec..e02ba99515 100644 --- a/mpcontribs-api/supervisord/supervisord.conf.jinja +++ b/mpcontribs-api/supervisord/supervisord.conf.jinja @@ -14,9 +14,6 @@ environment= AWS_REGION="us-east-1", AWS_DEFAULT_REGION="us-east-1", MAIL_DEFAULT_SENDER="contribs@materialsproject.org", - DD_PROFILING_ENABLED="false", - DD_PROFILING_STACK_V2_ENABLED="false", - DD_LOGS_INJECTION="true", FLASK_APP="mpcontribs.api", PYTHONUNBUFFERED=1, MAX_REQUESTS=0, @@ -26,11 +23,9 @@ environment= NODE_ENV="{{ node_env }}", FLASK_DEBUG="{{ flask_debug }}", FLASK_LOG_LEVEL="{{ flask_log_level }}", - DD_LOG_LEVEL="{{ flask_log_level }}", JUPYTER_GATEWAY_URL="{{ jupyter_gateway_url }}", JUPYTER_GATEWAY_HOST="{{ jupyter_gateway_host }}", - DD_AGENT_HOST="{{ dd_agent_host }}", - DD_TRACE_SAMPLE_RATE="1", + MPCONTRIBS_OTEL__OTLP_ENDPOINT="{{ otel_endpoint }}", TINI_SUBREAPER="true" [program:main] diff --git a/mpcontribs-api/tests/conftest.py b/mpcontribs-api/tests/conftest.py index 80d67d3f56..617139b131 100644 --- a/mpcontribs-api/tests/conftest.py +++ b/mpcontribs-api/tests/conftest.py @@ -14,3 +14,5 @@ os.environ.setdefault("MPCONTRIBS_REDIS__URL", "redis://localhost:6379") os.environ.setdefault("MPCONTRIBS_MAIL_DEFAULT_SENDER", "test@example.com") os.environ.setdefault("MPCONTRIBS_VERSION", "0.0.0-test") +# No OTLP collector in tests: keep telemetry off so the suite doesn't register providers or export. +os.environ.setdefault("MPCONTRIBS_OTEL__ENABLED", "false") From 53ed6772749ce4f10dd4f4941b15d95a78f2d55e Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 18 Jun 2026 10:57:54 -0700 Subject: [PATCH 144/591] Fixed uv build wheel building from old directory style --- mpcontribs-api/pyproject.toml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/mpcontribs-api/pyproject.toml b/mpcontribs-api/pyproject.toml index 6366b03a84..1849dbfb4e 100644 --- a/mpcontribs-api/pyproject.toml +++ b/mpcontribs-api/pyproject.toml @@ -10,9 +10,8 @@ relative_to = "__file__" include-package-data = true [tool.setuptools.packages.find] -where = ["."] -exclude = ["scripts","supervisord"] -include = ["mpcontribs.api"] +where = ["src"] +include = ["mpcontribs.api*"] [project] name = "mpcontribs-api" From f7fbff056c9c24f4091452db5683c8e650acc8ba Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 18 Jun 2026 12:15:28 -0700 Subject: [PATCH 145/591] Added dependencies to routes that require users to be logged in --- .../build/lib/mpcontribs_api/api/v1/router.py | 15 +++ .../domains/attachments/router.py | 77 +++++++++++ .../domains/contributions/router.py | 117 +++++++++++++++++ .../domains/healthcheck/router.py | 37 ++++++ .../mpcontribs_api/domains/projects/router.py | 121 ++++++++++++++++++ .../domains/structures/router.py | 95 ++++++++++++++ .../mpcontribs_api/domains/tables/router.py | 95 ++++++++++++++ .../domains/attachments/router.py | 6 +- .../domains/contributions/router.py | 16 +-- .../domains/healthcheck/router.py | 2 +- .../mpcontribs_api/domains/projects/router.py | 7 +- .../domains/structures/router.py | 10 +- .../mpcontribs_api/domains/tables/router.py | 10 +- 13 files changed, 583 insertions(+), 25 deletions(-) create mode 100644 mpcontribs-api/build/lib/mpcontribs_api/api/v1/router.py create mode 100644 mpcontribs-api/build/lib/mpcontribs_api/domains/attachments/router.py create mode 100644 mpcontribs-api/build/lib/mpcontribs_api/domains/contributions/router.py create mode 100644 mpcontribs-api/build/lib/mpcontribs_api/domains/healthcheck/router.py create mode 100644 mpcontribs-api/build/lib/mpcontribs_api/domains/projects/router.py create mode 100644 mpcontribs-api/build/lib/mpcontribs_api/domains/structures/router.py create mode 100644 mpcontribs-api/build/lib/mpcontribs_api/domains/tables/router.py diff --git a/mpcontribs-api/build/lib/mpcontribs_api/api/v1/router.py b/mpcontribs-api/build/lib/mpcontribs_api/api/v1/router.py new file mode 100644 index 0000000000..13dab175ce --- /dev/null +++ b/mpcontribs-api/build/lib/mpcontribs_api/api/v1/router.py @@ -0,0 +1,15 @@ +from fastapi import APIRouter + +from mpcontribs_api.domains.attachments.router import router as attachments_router +from mpcontribs_api.domains.contributions.router import router as contributions_router +from mpcontribs_api.domains.projects.router import router as projects_router +from mpcontribs_api.domains.structures.router import router as structures_router +from mpcontribs_api.domains.tables.router import router as tables_router + +router = APIRouter() + +router.include_router(attachments_router, prefix="/attachments", tags=["attachments"]) +router.include_router(contributions_router, prefix="/contributions", tags=["contributions"]) +router.include_router(projects_router, prefix="/projects", tags=["projects"]) +router.include_router(structures_router, prefix="/structures", tags=["structures"]) +router.include_router(tables_router, prefix="/tables", tags=["tables"]) diff --git a/mpcontribs-api/build/lib/mpcontribs_api/domains/attachments/router.py b/mpcontribs-api/build/lib/mpcontribs_api/domains/attachments/router.py new file mode 100644 index 0000000000..49e2c076b4 --- /dev/null +++ b/mpcontribs-api/build/lib/mpcontribs_api/domains/attachments/router.py @@ -0,0 +1,77 @@ +from typing import Annotated + +from fastapi import APIRouter, Depends +from fastapi.responses import StreamingResponse +from fastapi_filter import FilterDepends + +from mpcontribs_api.dependencies import S3Dep, require_user +from mpcontribs_api.domains._shared.models import ComponentDeleteResponse +from mpcontribs_api.domains._shared.types import ( + DownloadFormat, + FieldSelector, + ShortMimeFormat, + download_filename, +) +from mpcontribs_api.domains.attachments.dependencies import AttachmentServiceDep +from mpcontribs_api.domains.attachments.models import AttachmentFilter, AttachmentOut +from mpcontribs_api.pagination import CursorParams, Page + +router = APIRouter() + + +@router.get("", response_model=Page[AttachmentOut]) +async def get_attachments( + service: AttachmentServiceDep, + pagination: Annotated[CursorParams, Depends()], + filter: AttachmentFilter = FilterDepends(AttachmentFilter), + fields: FieldSelector = AttachmentOut.default_fields(), +): + selected = AttachmentOut.parse_fields(fields) + return await service.get_many(filter=filter, fields=selected, pagination=pagination) + + +@router.get("/{pk}", response_model=AttachmentOut) +async def get_attachment( + service: AttachmentServiceDep, + pk: str, + fields: FieldSelector = AttachmentOut.default_fields(), +): + selected = AttachmentOut.parse_fields(fields) + return await service.get_by_id(id=pk, fields=selected) + + +@router.get("/download/{short_mime}") +async def download_attachment( + service: AttachmentServiceDep, + format: DownloadFormat, + s3: S3Dep, + short_mime: ShortMimeFormat = ShortMimeFormat.GZ, + ignore_cache: bool = False, + filter: AttachmentFilter = FilterDepends(AttachmentFilter), + fields: FieldSelector = AttachmentOut.default_fields(), +) -> StreamingResponse: + selected = AttachmentOut.parse_fields(fields) + body = await service.download( + format=format, + short_mime=short_mime, + ignore_cache=ignore_cache, + filter=filter, + fields=selected, + s3=s3, + ) + filename = download_filename("attachments", format, short_mime) + return StreamingResponse( + body, + media_type="application/gzip", + headers={"Content-Disposition": f'attachment; filename="{filename}"'}, + ) + + +@router.delete("", response_model=ComponentDeleteResponse, dependencies=[Depends(require_user)]) +async def delete_attachments(service: AttachmentServiceDep, filter: AttachmentFilter = FilterDepends(AttachmentFilter)): + return await service.delete(filter=filter) + + +@router.delete("/{id}", response_model=ComponentDeleteResponse, dependencies=[Depends(require_user)]) +async def delete_attachment_by_id(service: AttachmentServiceDep, id: str): + return await service.delete_by_id(id=id) diff --git a/mpcontribs-api/build/lib/mpcontribs_api/domains/contributions/router.py b/mpcontribs-api/build/lib/mpcontribs_api/domains/contributions/router.py new file mode 100644 index 0000000000..cd01cbd825 --- /dev/null +++ b/mpcontribs-api/build/lib/mpcontribs_api/domains/contributions/router.py @@ -0,0 +1,117 @@ +from typing import Annotated + +from fastapi import APIRouter, Depends +from fastapi.responses import StreamingResponse +from fastapi_filter import FilterDepends + +from mpcontribs_api.dependencies import S3Dep, require_user +from mpcontribs_api.domains._shared.bulk import BulkWriteSummary +from mpcontribs_api.domains._shared.types import ( + DownloadFormat, + FieldSelector, + ShortMimeFormat, + download_filename, +) +from mpcontribs_api.domains.contributions.dependencies import ContributionDep, ContributionServiceDep +from mpcontribs_api.domains.contributions.models import ( + Contribution, + ContributionFilter, + ContributionIn, + ContributionOut, + ContributionPatch, +) +from mpcontribs_api.pagination import CursorParams + +router = APIRouter() + + +@router.get("") +async def get_contributions( + repo: ContributionDep, + pagination: Annotated[CursorParams, Depends()], + filter: ContributionFilter = FilterDepends(ContributionFilter), + fields: FieldSelector = ContributionOut.default_fields(), +): + selected = ContributionOut.parse_fields(fields) + return await repo.get_contributions(pagination=pagination, filter=filter, fields=selected) + + +@router.delete("", dependencies=[Depends(require_user)]) +async def delete_contributions( + repo: ContributionDep, + filter: ContributionFilter = FilterDepends(ContributionFilter), +): + return await repo.delete_contributions(filter=filter) + + +# TODO: Might want to take contributions in from request body and run model_validate_json on it (much faster) +@router.post("", response_model=BulkWriteSummary[Contribution], dependencies=[Depends(require_user)]) +async def insert_contributions( + service: ContributionServiceDep, + contributions: list[ContributionIn], +): + return await service.insert_contributions(contributions=contributions) + + +@router.put("", dependencies=[Depends(require_user)]) +async def upsert_contributions( + service: ContributionServiceDep, + contributions: list[ContributionIn], +): + return await service.upsert_contributions(contributions=contributions) + + +@router.get("/download/{short_mime}") +async def download_contributions( + repo: ContributionDep, + s3: S3Dep, + short_mime: ShortMimeFormat = ShortMimeFormat.GZ, + format: DownloadFormat = DownloadFormat.JSONL, + ignore_cache: bool = False, + filter: ContributionFilter = FilterDepends(ContributionFilter), + fields: FieldSelector = ContributionOut.default_fields(), +): + selected = ContributionOut.parse_fields(fields) + body = await repo.download_contributions( + format=format, + short_mime=short_mime, + ignore_cache=ignore_cache, + filter=filter, + fields=selected, + s3=s3, + key_name="", # TODO: Temp + ) + filename = download_filename("contributions", format, short_mime) + return StreamingResponse( + body, + media_type="application/gzip", + headers={"Content-Disposition": f'attachment; filename="{filename}"'}, + ) + + +@router.delete("/{id}", dependencies=[Depends(require_user)]) +async def delete_contribution_by_id( + service: ContributionServiceDep, + id: str, +): + return await service.delete_contributions(ContributionFilter.model_validate({"id": id})) + + +@router.get("/{id}") +async def get_contribution_by_id( + repo: ContributionDep, + id: str, + fields: FieldSelector = ContributionOut.default_fields(), +): + selected = ContributionOut.parse_fields(fields) + return await repo.get_contribution_by_id(id=id, fields=selected) + + +@router.put("/{id}", dependencies=[Depends(require_user)]) +async def upsert_contribution_by_id(repo: ContributionDep, id: str, contribution: ContributionIn): + return await repo.upsert_contribution_by_id(id=id, contribution=contribution) + + +@router.patch("/{id}", dependencies=[Depends(require_user)]) +async def patch_contribution_by_id(repo: ContributionDep, id: str, update: ContributionPatch): + return await repo.patch_contribution_by_id(id=id, update=update) diff --git a/mpcontribs-api/build/lib/mpcontribs_api/domains/healthcheck/router.py b/mpcontribs-api/build/lib/mpcontribs_api/domains/healthcheck/router.py new file mode 100644 index 0000000000..e099971ab6 --- /dev/null +++ b/mpcontribs-api/build/lib/mpcontribs_api/domains/healthcheck/router.py @@ -0,0 +1,37 @@ +from botocore.exceptions import BotoCoreError, ClientError +from fastapi import APIRouter, HTTPException, status +from pydantic import BaseModel + +from mpcontribs_api.config import get_settings +from mpcontribs_api.dependencies import DbDep, S3Dep + +router = APIRouter(tags=["health"]) + +settings = get_settings() + + +class HealthStatus(BaseModel): + status: str + mongo: str + s3: str + + +@router.get("", response_model=HealthStatus, summary="Service health") +async def healthcheck(db: DbDep, s3_client: S3Dep) -> HealthStatus: + try: + await db.client.admin.command("ping") + except Exception: + raise HTTPException( + status_code=status.HTTP_503_SERVICE_UNAVAILABLE, + detail={"status": "unhealthy", "mongo": "unreachable"}, + ) from None + + try: + await s3_client.head_bucket(Bucket=settings.aws.health_bucket) + except (ClientError, BotoCoreError): + raise HTTPException( + status_code=status.HTTP_503_SERVICE_UNAVAILABLE, + detail={"status": "unhealthy", "s3": "unreachable"}, + ) from None + + return HealthStatus(status="healthy", mongo="ok", s3="ok") diff --git a/mpcontribs-api/build/lib/mpcontribs_api/domains/projects/router.py b/mpcontribs-api/build/lib/mpcontribs_api/domains/projects/router.py new file mode 100644 index 0000000000..e82116b270 --- /dev/null +++ b/mpcontribs-api/build/lib/mpcontribs_api/domains/projects/router.py @@ -0,0 +1,121 @@ +from typing import Annotated + +from fastapi import APIRouter, Depends, Response, status +from fastapi_filter import FilterDepends +from starlette.status import HTTP_204_NO_CONTENT + +from mpcontribs_api.dependencies import require_user +from mpcontribs_api.domains._shared.types import FieldSelector +from mpcontribs_api.domains.projects.dependencies import ProjectDep +from mpcontribs_api.domains.projects.models import ( + ProjectFilter, + ProjectIn, + ProjectOut, + ProjectPatch, +) +from mpcontribs_api.pagination import CursorParams + +router = APIRouter() + + +# Brendan TODO: Add in option to select ProjectSummary or ProjectOut +@router.get("", response_model=None) +async def get_projects( + repo: ProjectDep, + pagination: Annotated[CursorParams, Depends()], + filter: ProjectFilter = FilterDepends(ProjectFilter), + fields: FieldSelector = ProjectOut.default_fields(), +): + """Return paginated projects matching a filter. + + Args: + repo (ProjectDep): the project repo we depend on + pagination (CursorParams): arguments for cursor-based pagination + fields (str | None): optional fields to include in return. If None supplied, all fields are returned + + Returns: + list[ProjectSummary]: a list of smaller project payloads + """ + selected = ProjectOut.parse_fields(fields) + return await repo.get_projects(filter=filter, pagination=pagination, fields=selected) + + +@router.get("/{id}", response_model=ProjectOut) +async def get_project_by_id( + id: str, + repo: ProjectDep, + fields: FieldSelector = ProjectOut.default_fields(), +): + """Gets a single project by its ID. + + Args: + id (str): the id of the project to retrieve + repo (ProjectDep): the project repo we depend on + fields (str | None): optional fields to include in return. If None supplied, all fields are returned + + Returns: + ProjectOut: the requested project, actual data returned is determined by the view the user requested + """ + selected = ProjectOut.parse_fields(fields) + return await repo.get_project_by_id(id=id, fields=selected) + + +@router.put("/{id}", response_model=ProjectOut, dependencies=[Depends(require_user)]) +async def upsert_project_by_id( + repo: ProjectDep, + id: str, + project: ProjectIn, +): + """Upsert a project by provided id. + + Upsert: Update document if id is found, otherwise insert new document using id. + Note: Relies on the path param 'id' for finding, rather than the body's id. + + Args: + repo (ProjectDep): the project repo we depend on + id (str): the id of the project to retrieve + project (ProjectIn): the data of the project to upsert + + Returns: + ProjectOut: the full document that either replaced an old one or was inserted + """ + return await repo.upsert_project_by_id(id=id, data=project) + + +@router.patch("/{id}", response_model=ProjectOut, dependencies=[Depends(require_user)]) +async def patch_project_by_id( + repo: ProjectDep, + id: str, + update: ProjectPatch, +): + """Partial update to project identified with 'id'. + + Note: overwrites fields with given values - arrays are not appended to. + + Args: + repo (ProjectDep): the project repo we depend on + id (str): the id of the project to update + update (ProjectPatch): the partial update to apply - unset fields are dropped + - Note: If fields are intentionally set to None, None is applied to the field. + + Returns: + ProjectOut: the full Project with updates applied + """ + return await repo.patch_project_by_id(id=id, update=update) + + +@router.delete("/{id}", status_code=status.HTTP_204_NO_CONTENT, dependencies=[Depends(require_user)]) +async def delete_project_by_id( + repo: ProjectDep, + id: str, +): + """Deletes a project matching id. + + Args: + repo (ProjectDep): the project repo we depend on + id (str): the id of the project to be deleted + Returns: + Response: a response with the 204 response code (rather than FastAPIs default 200) + """ + await repo.delete_project_by_id(id=id) + return Response(status_code=HTTP_204_NO_CONTENT) diff --git a/mpcontribs-api/build/lib/mpcontribs_api/domains/structures/router.py b/mpcontribs-api/build/lib/mpcontribs_api/domains/structures/router.py new file mode 100644 index 0000000000..0a5746607c --- /dev/null +++ b/mpcontribs-api/build/lib/mpcontribs_api/domains/structures/router.py @@ -0,0 +1,95 @@ +from typing import Annotated + +from fastapi import APIRouter, Depends +from fastapi.responses import StreamingResponse +from fastapi_filter import FilterDepends + +from mpcontribs_api.dependencies import S3Dep, require_user +from mpcontribs_api.domains._shared.bulk import BulkWriteSummary +from mpcontribs_api.domains._shared.models import ComponentDeleteResponse +from mpcontribs_api.domains._shared.types import ( + DownloadFormat, + FieldSelector, + ShortMimeFormat, + download_filename, +) +from mpcontribs_api.domains.structures.dependencies import StructureServiceDep +from mpcontribs_api.domains.structures.models import StructureFilter, StructureIn, StructureOut, StructurePatch +from mpcontribs_api.pagination import CursorParams, Page + +router = APIRouter() + + +@router.get("", response_model=Page[StructureOut]) +async def get_structures( + service: StructureServiceDep, + pagination: Annotated[CursorParams, Depends()], + filter: StructureFilter = FilterDepends(StructureFilter), + fields: FieldSelector = StructureOut.default_fields(), +): + selected = StructureOut.parse_fields(fields) + return await service.get_many(filter=filter, fields=selected, pagination=pagination) + + +@router.get("/{pk}", response_model=StructureOut) +async def get_structure( + service: StructureServiceDep, + pk: str, + fields: FieldSelector = StructureOut.default_fields(), +): + selected = StructureOut.parse_fields(fields) + return await service.get_by_id(id=pk, fields=selected) + + +@router.get("/download/{short_mime}") +async def download_structure( + service: StructureServiceDep, + format: DownloadFormat, + s3: S3Dep, + short_mime: ShortMimeFormat = ShortMimeFormat.GZ, + ignore_cache: bool = False, + filter: StructureFilter = FilterDepends(StructureFilter), + fields: FieldSelector = StructureOut.default_fields(), +) -> StreamingResponse: + selected = StructureOut.parse_fields(fields) + body = await service.download( + format=format, + short_mime=short_mime, + ignore_cache=ignore_cache, + filter=filter, + fields=selected, + s3=s3, + ) + filename = download_filename("structures", format, short_mime) + return StreamingResponse( + body, + media_type="application/gzip", + headers={"Content-Disposition": f'attachment; filename="{filename}"'}, + ) + + +@router.post("", response_model=BulkWriteSummary[StructureOut], dependencies=[Depends(require_user)]) +async def insert_structures( + service: StructureServiceDep, + structures: list[StructureIn], +): + return await service.insert(components=structures) + + +@router.delete("", response_model=ComponentDeleteResponse, dependencies=[Depends(require_user)]) +async def delete_structures(service: StructureServiceDep, filter: StructureFilter = FilterDepends(StructureFilter)): + return await service.delete(filter=filter) + + +@router.delete("/{id}", response_model=ComponentDeleteResponse, dependencies=[Depends(require_user)]) +async def delete_structure_by_id(service: StructureServiceDep, id: str): + return await service.delete_by_id(id=id) + + +@router.patch("/{id}", dependencies=[Depends(require_user)]) +async def patch_structure_by_id( + service: StructureServiceDep, + id: str, + update: StructurePatch, +): + return await service.patch_by_id(id=id, update=update) diff --git a/mpcontribs-api/build/lib/mpcontribs_api/domains/tables/router.py b/mpcontribs-api/build/lib/mpcontribs_api/domains/tables/router.py new file mode 100644 index 0000000000..619f4073e0 --- /dev/null +++ b/mpcontribs-api/build/lib/mpcontribs_api/domains/tables/router.py @@ -0,0 +1,95 @@ +from typing import Annotated + +from fastapi import APIRouter, Depends +from fastapi.responses import StreamingResponse +from fastapi_filter import FilterDepends + +from mpcontribs_api.dependencies import S3Dep, require_user +from mpcontribs_api.domains._shared.bulk import BulkWriteSummary +from mpcontribs_api.domains._shared.models import ComponentDeleteResponse +from mpcontribs_api.domains._shared.types import ( + DownloadFormat, + FieldSelector, + ShortMimeFormat, + download_filename, +) +from mpcontribs_api.domains.tables.dependencies import TableServiceDep +from mpcontribs_api.domains.tables.models import Table, TableFilter, TableIn, TableOut, TablePatch +from mpcontribs_api.pagination import CursorParams, Page + +router = APIRouter() + + +@router.get("", response_model=Page[TableOut]) +async def get_tables( + service: TableServiceDep, + pagination: Annotated[CursorParams, Depends()], + filter: TableFilter = FilterDepends(TableFilter), + fields: FieldSelector = TableOut.default_fields(), +): + selected = TableOut.parse_fields(fields) + return await service.get_many(filter=filter, fields=selected, pagination=pagination) + + +@router.get("/{pk}", response_model=TableOut) +async def get_table( + service: TableServiceDep, + pk: str, + fields: FieldSelector = TableOut.default_fields(), +): + selected = TableOut.parse_fields(fields) + return await service.get_by_id(id=pk, fields=selected) + + +@router.get("/download/{short_mime}") +async def download_table( + service: TableServiceDep, + s3: S3Dep, + format: DownloadFormat, + short_mime: ShortMimeFormat = ShortMimeFormat.GZ, + ignore_cache: bool = False, + filter: TableFilter = FilterDepends(TableFilter), + fields: FieldSelector = TableOut.default_fields(), +) -> StreamingResponse: + selected = TableOut.parse_fields(fields) + body = await service.download( + format=format, + short_mime=short_mime, + ignore_cache=ignore_cache, + filter=filter, + fields=selected, + s3=s3, + ) + filename = download_filename("tables", format, short_mime) + return StreamingResponse( + body, + media_type="application/gzip", + headers={"Content-Disposition": f'attachment; filename="{filename}"'}, + ) + + +@router.post("", response_model=BulkWriteSummary[Table], dependencies=[Depends(require_user)]) +async def insert_tables( + service: TableServiceDep, + tables: list[TableIn], +): + return await service.insert(components=tables) + + +@router.delete("", response_model=ComponentDeleteResponse, dependencies=[Depends(require_user)]) +async def delete_tables(service: TableServiceDep, filter: TableFilter = FilterDepends(TableFilter)): + return await service.delete(filter=filter) + + +@router.delete("/{id}", response_model=ComponentDeleteResponse, dependencies=[Depends(require_user)]) +async def delete_table_by_id(service: TableServiceDep, id: str): + return await service.delete_by_id(id=id) + + +@router.patch("/{id}", dependencies=[Depends(require_user)]) +async def patch_table_by_id( + service: TableServiceDep, + id: str, + update: TablePatch, +): + return await service.patch_by_id(id=id, update=update) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py b/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py index 8e4298a97e..49e2c076b4 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py @@ -4,7 +4,7 @@ from fastapi.responses import StreamingResponse from fastapi_filter import FilterDepends -from mpcontribs_api.dependencies import S3Dep +from mpcontribs_api.dependencies import S3Dep, require_user from mpcontribs_api.domains._shared.models import ComponentDeleteResponse from mpcontribs_api.domains._shared.types import ( DownloadFormat, @@ -67,11 +67,11 @@ async def download_attachment( ) -@router.delete("", response_model=ComponentDeleteResponse) +@router.delete("", response_model=ComponentDeleteResponse, dependencies=[Depends(require_user)]) async def delete_attachments(service: AttachmentServiceDep, filter: AttachmentFilter = FilterDepends(AttachmentFilter)): return await service.delete(filter=filter) -@router.delete("/{id}", response_model=ComponentDeleteResponse) +@router.delete("/{id}", response_model=ComponentDeleteResponse, dependencies=[Depends(require_user)]) async def delete_attachment_by_id(service: AttachmentServiceDep, id: str): return await service.delete_by_id(id=id) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py index 06d68f3700..cd01cbd825 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py @@ -4,7 +4,7 @@ from fastapi.responses import StreamingResponse from fastapi_filter import FilterDepends -from mpcontribs_api.dependencies import S3Dep +from mpcontribs_api.dependencies import S3Dep, require_user from mpcontribs_api.domains._shared.bulk import BulkWriteSummary from mpcontribs_api.domains._shared.types import ( DownloadFormat, @@ -36,7 +36,7 @@ async def get_contributions( return await repo.get_contributions(pagination=pagination, filter=filter, fields=selected) -@router.delete("") +@router.delete("", dependencies=[Depends(require_user)]) async def delete_contributions( repo: ContributionDep, filter: ContributionFilter = FilterDepends(ContributionFilter), @@ -45,7 +45,7 @@ async def delete_contributions( # TODO: Might want to take contributions in from request body and run model_validate_json on it (much faster) -@router.post("", response_model=BulkWriteSummary[Contribution]) +@router.post("", response_model=BulkWriteSummary[Contribution], dependencies=[Depends(require_user)]) async def insert_contributions( service: ContributionServiceDep, contributions: list[ContributionIn], @@ -53,7 +53,7 @@ async def insert_contributions( return await service.insert_contributions(contributions=contributions) -@router.put("") +@router.put("", dependencies=[Depends(require_user)]) async def upsert_contributions( service: ContributionServiceDep, contributions: list[ContributionIn], @@ -89,8 +89,8 @@ async def download_contributions( ) -@router.delete("/{id}") -async def delete_contribtion_by_id( +@router.delete("/{id}", dependencies=[Depends(require_user)]) +async def delete_contribution_by_id( service: ContributionServiceDep, id: str, ): @@ -107,11 +107,11 @@ async def get_contribution_by_id( return await repo.get_contribution_by_id(id=id, fields=selected) -@router.put("/{id}") +@router.put("/{id}", dependencies=[Depends(require_user)]) async def upsert_contribution_by_id(repo: ContributionDep, id: str, contribution: ContributionIn): return await repo.upsert_contribution_by_id(id=id, contribution=contribution) -@router.patch("/{id}") +@router.patch("/{id}", dependencies=[Depends(require_user)]) async def patch_contribution_by_id(repo: ContributionDep, id: str, update: ContributionPatch): return await repo.patch_contribution_by_id(id=id, update=update) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/healthcheck/router.py b/mpcontribs-api/src/mpcontribs_api/domains/healthcheck/router.py index 88abea6a91..e099971ab6 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/healthcheck/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/healthcheck/router.py @@ -28,7 +28,7 @@ async def healthcheck(db: DbDep, s3_client: S3Dep) -> HealthStatus: try: await s3_client.head_bucket(Bucket=settings.aws.health_bucket) - except ClientError, BotoCoreError: + except (ClientError, BotoCoreError): raise HTTPException( status_code=status.HTTP_503_SERVICE_UNAVAILABLE, detail={"status": "unhealthy", "s3": "unreachable"}, diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py index 4b0f3704f1..e82116b270 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py @@ -4,6 +4,7 @@ from fastapi_filter import FilterDepends from starlette.status import HTTP_204_NO_CONTENT +from mpcontribs_api.dependencies import require_user from mpcontribs_api.domains._shared.types import FieldSelector from mpcontribs_api.domains.projects.dependencies import ProjectDep from mpcontribs_api.domains.projects.models import ( @@ -59,7 +60,7 @@ async def get_project_by_id( return await repo.get_project_by_id(id=id, fields=selected) -@router.put("/{id}", response_model=ProjectOut) +@router.put("/{id}", response_model=ProjectOut, dependencies=[Depends(require_user)]) async def upsert_project_by_id( repo: ProjectDep, id: str, @@ -81,7 +82,7 @@ async def upsert_project_by_id( return await repo.upsert_project_by_id(id=id, data=project) -@router.patch("/{id}", response_model=ProjectOut) +@router.patch("/{id}", response_model=ProjectOut, dependencies=[Depends(require_user)]) async def patch_project_by_id( repo: ProjectDep, id: str, @@ -103,7 +104,7 @@ async def patch_project_by_id( return await repo.patch_project_by_id(id=id, update=update) -@router.delete("/{id}", status_code=status.HTTP_204_NO_CONTENT) +@router.delete("/{id}", status_code=status.HTTP_204_NO_CONTENT, dependencies=[Depends(require_user)]) async def delete_project_by_id( repo: ProjectDep, id: str, diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py index 0057c4a5d2..0a5746607c 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py @@ -4,7 +4,7 @@ from fastapi.responses import StreamingResponse from fastapi_filter import FilterDepends -from mpcontribs_api.dependencies import S3Dep +from mpcontribs_api.dependencies import S3Dep, require_user from mpcontribs_api.domains._shared.bulk import BulkWriteSummary from mpcontribs_api.domains._shared.models import ComponentDeleteResponse from mpcontribs_api.domains._shared.types import ( @@ -68,7 +68,7 @@ async def download_structure( ) -@router.post("", response_model=BulkWriteSummary[StructureOut]) +@router.post("", response_model=BulkWriteSummary[StructureOut], dependencies=[Depends(require_user)]) async def insert_structures( service: StructureServiceDep, structures: list[StructureIn], @@ -76,17 +76,17 @@ async def insert_structures( return await service.insert(components=structures) -@router.delete("", response_model=ComponentDeleteResponse) +@router.delete("", response_model=ComponentDeleteResponse, dependencies=[Depends(require_user)]) async def delete_structures(service: StructureServiceDep, filter: StructureFilter = FilterDepends(StructureFilter)): return await service.delete(filter=filter) -@router.delete("/{id}", response_model=ComponentDeleteResponse) +@router.delete("/{id}", response_model=ComponentDeleteResponse, dependencies=[Depends(require_user)]) async def delete_structure_by_id(service: StructureServiceDep, id: str): return await service.delete_by_id(id=id) -@router.patch("/{id}") +@router.patch("/{id}", dependencies=[Depends(require_user)]) async def patch_structure_by_id( service: StructureServiceDep, id: str, diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py index 505f021eff..619f4073e0 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py @@ -4,7 +4,7 @@ from fastapi.responses import StreamingResponse from fastapi_filter import FilterDepends -from mpcontribs_api.dependencies import S3Dep +from mpcontribs_api.dependencies import S3Dep, require_user from mpcontribs_api.domains._shared.bulk import BulkWriteSummary from mpcontribs_api.domains._shared.models import ComponentDeleteResponse from mpcontribs_api.domains._shared.types import ( @@ -68,7 +68,7 @@ async def download_table( ) -@router.post("", response_model=BulkWriteSummary[Table]) +@router.post("", response_model=BulkWriteSummary[Table], dependencies=[Depends(require_user)]) async def insert_tables( service: TableServiceDep, tables: list[TableIn], @@ -76,17 +76,17 @@ async def insert_tables( return await service.insert(components=tables) -@router.delete("", response_model=ComponentDeleteResponse) +@router.delete("", response_model=ComponentDeleteResponse, dependencies=[Depends(require_user)]) async def delete_tables(service: TableServiceDep, filter: TableFilter = FilterDepends(TableFilter)): return await service.delete(filter=filter) -@router.delete("/{id}", response_model=ComponentDeleteResponse) +@router.delete("/{id}", response_model=ComponentDeleteResponse, dependencies=[Depends(require_user)]) async def delete_table_by_id(service: TableServiceDep, id: str): return await service.delete_by_id(id=id) -@router.patch("/{id}") +@router.patch("/{id}", dependencies=[Depends(require_user)]) async def patch_table_by_id( service: TableServiceDep, id: str, From e48eb1985f0659491a4e88737c6dbd8e075cb276 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 18 Jun 2026 12:18:44 -0700 Subject: [PATCH 146/591] Requests to contributions or their components are now scoped by the user - users can no longer operate on components that their contributions dontown --- .../domains/_shared/repository.py | 319 ++++++++++++++++++ .../domains/attachments/repository.py | 15 + .../domains/contributions/repository.py | 266 +++++++++++++++ .../domains/projects/repository.py | 111 ++++++ .../domains/structures/repository.py | 15 + .../domains/tables/repository.py | 13 + .../domains/_shared/repository.py | 29 +- .../domains/contributions/repository.py | 37 +- .../domains/projects/repository.py | 34 +- .../db/test_contributions_repository.py | 39 +++ .../db/test_projects_repository.py | 48 +++ 11 files changed, 911 insertions(+), 15 deletions(-) create mode 100644 mpcontribs-api/build/lib/mpcontribs_api/domains/_shared/repository.py create mode 100644 mpcontribs-api/build/lib/mpcontribs_api/domains/attachments/repository.py create mode 100644 mpcontribs-api/build/lib/mpcontribs_api/domains/contributions/repository.py create mode 100644 mpcontribs-api/build/lib/mpcontribs_api/domains/projects/repository.py create mode 100644 mpcontribs-api/build/lib/mpcontribs_api/domains/structures/repository.py create mode 100644 mpcontribs-api/build/lib/mpcontribs_api/domains/tables/repository.py diff --git a/mpcontribs-api/build/lib/mpcontribs_api/domains/_shared/repository.py b/mpcontribs-api/build/lib/mpcontribs_api/domains/_shared/repository.py new file mode 100644 index 0000000000..36f089fb9a --- /dev/null +++ b/mpcontribs-api/build/lib/mpcontribs_api/domains/_shared/repository.py @@ -0,0 +1,319 @@ +import csv +import hashlib +import io +import json +import zlib +from abc import ABC, abstractmethod +from collections.abc import AsyncIterable, AsyncIterator, Callable, Iterable +from contextlib import AbstractAsyncContextManager +from typing import Any + +from beanie import PydanticObjectId, UpdateResponse +from beanie.operators import In, Set +from bson.errors import InvalidId +from fastapi_filter.contrib.beanie import Filter +from pydantic import BaseModel +from pymongo.asynchronous.client_session import AsyncClientSession +from types_aiobotocore_s3 import S3Client + +from mpcontribs_api.authz import User +from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DeleteResponse, DocumentOut +from mpcontribs_api.domains._shared.types import DownloadFormat, ShortMimeFormat +from mpcontribs_api.exceptions import ConflictError, NotFoundError, ValidationError +from mpcontribs_api.pagination import CursorParams, Page, encode_cursor + + +class MongoDbRepository[ + TDoc: BaseDocumentWithInput, + TIn: BaseModel, + TOut: DocumentOut, + TFilter: Filter, + TPatch: BaseModel, +](ABC): + """Base repository encapsulating shared MongoDB access patterns. + + Subclasses bind the document, input, output, filter, and patch types as type parameters, set + the matching ``document_model`` / ``out_model`` class attributes, and implement ``_build_scope`` + to enforce per-user authorization. Shared CRUD logic (scoping, projection, cursor pagination, + insertion, single-document read/patch/delete) lives here so it exists in exactly one place and + cannot drift between resources. Subclasses expose domain-named methods that either forward to a + base method (vocabulary + concrete types for routers, no logic) or implement a genuinely + different shape (bulk insert, compound-key upsert, download). + + Attributes: + document_model: the ``BaseDocumentWithInput`` subclass this repository operates on + out_model: the ``SparseFieldsModel`` subclass used to build projections for reads + _scope (dict[str, Any]): terms injected into every query to enforce user authorization + """ + + document_model: type[TDoc] + out_model: type[TOut] + + def __init__(self, user: User) -> None: + """Initializes an instance based on the current user. + + Args: + user (User): the current user requesting resources + """ + self._scope = self._build_scope(user) + + @staticmethod + @abstractmethod + def _build_scope(user: User) -> dict[str, Any]: + """Provides scope based on current user's permitted groups and publicly released data.""" + ... + + def _convert_object_id(self, id: str) -> PydanticObjectId: + """Converts the string representation of an ObjectId to an ObjectId""" + try: + return PydanticObjectId(id) + except InvalidId: + raise ValidationError("Incorrect Id format. Must be MongoDB ObjectId format.", id=id) from None + + def _not_found(self, id: str) -> str: + """Build a not-found message naming this repository's resource.""" + return f"{self.document_model.__name__} with id {id} not found" + + async def get_many( + self, + filter: TFilter, + fields: frozenset[str] | None = None, + pagination: CursorParams | None = None, + restrict_ids: Iterable[Any] | None = None, + ) -> Page[TOut]: + """Return a scoped, filtered, cursor-paginated page of projected documents. + + Args: + pagination (CursorParams): forward-only cursor parameters + filter (TFilter): the fastapi-filter query to apply on top of the user scope + fields (frozenset[str] | None): fields to project; if None the full document is returned + restrict_ids (Iterable | None): when provided, results are limited to these ids in + addition to the user scope. An empty iterable yields an empty page. Used to gate + reads that are authorized indirectly (e.g. components reachable via a contribution). + """ + pagination = pagination or CursorParams() + + projection = self.out_model.projection(fields) + query = filter.filter(self.document_model.find(self._scope)) + if restrict_ids is not None: + query = query.find(In(self.document_model.id, list(restrict_ids))) + if pagination.cursor is not None: + query = query.find(self.document_model.id > self.document_model.decode_cursor(cursor=pagination.cursor)) # pyright: ignore[reportOptionalOperand] + docs = await query.sort(self.document_model.id).limit(pagination.limit + 1).project(projection).to_list() # pyright: ignore[reportArgumentType] + has_more = len(docs) > pagination.limit + items = docs[: pagination.limit] + next_cursor = encode_cursor(str(items[-1].id)) if has_more and items else None + return Page(items=items, next_cursor=next_cursor) + + async def get_by_id(self, id: Any, fields: frozenset[str] | None) -> TDoc | TOut | None: + """Return a single scoped document by id, projected to the requested fields. + + Args: + id (str): the id of the document to find + fields (frozenset[str] | None): fields to project; if None the full document is returned + """ + return await self.document_model.find_one( + self._scope, + self.document_model.id == id, + projection_model=self.out_model.projection(fields), + ) + + async def list_ids(self, filter: TFilter, session: AsyncClientSession | None = None) -> list[Any]: + """Return just the ids of scoped documents matching ``filter``. + + Projects to ``{"_id": 1}`` so the lookup can be served as a covered query from the + default ``_id`` index without materializing full documents. + + Args: + filter (TFilter): the fastapi-filter query to apply on top of the user scope + session (AsyncClientSession | None): optional client session for transactions + """ + projection = self.out_model.projection(frozenset({"id"})) + query = filter.filter(self.document_model.find(self._scope, session=session)) + docs = await query.project(projection).to_list() + return [doc.id for doc in docs] + + async def insert_one(self, in_resource: TIn) -> TDoc: + """Insert a new document built from its input model, rejecting duplicate ids. + + Args: + in_resource (TIn): the validated input payload to translate and store + """ + document = self.document_model.from_input_model(in_resource) + existing = await self.document_model.find_one(self.document_model.id == document.id) + if existing: + raise ConflictError(f"Cannot insert document.\n Document with ID {document.id} exists") + await document.insert() + return document + + async def delete_by_id(self, id: Any, session: AsyncClientSession | None = None) -> DeleteResponse: + """Delete a single scoped document by id. + + Scoping ensures callers cannot delete documents they are not permitted to see. + + Args: + id (str): the id of the document to delete + """ + doc = await self.document_model.find_one(self._scope, self.document_model.id == id, session=session) + if not doc: + raise NotFoundError("Document with id not found", id=id) + await doc.delete(session=session) + return DeleteResponse(num_deleted=1) + + async def delete_by_ids(self, ids: list[Any], session: AsyncClientSession | None = None) -> DeleteResponse: + """Delete multiple scoped documents by id. + + The user scope is injected so callers cannot delete documents they are not permitted to + see; out-of-scope ids simply match nothing and are reported as zero deletions. + + Args: + ids (list[Any]): list of ids to delete + session: the session to perform the deletes within + + Returns: + DeleteResponse: the result of the deletion + """ + docs = self.document_model.find(self._scope, In(self.document_model.id, ids), session=session) + delete_result = await docs.delete_many(session=session) + if not delete_result: + raise ValidationError("DeleteResult not returned internally") + return DeleteResponse.from_delete_result(delete_result) + + async def patch(self, id: Any, update: TPatch) -> TDoc: + """Partially update a single scoped document by id. + + Only fields explicitly set on ``update`` are applied. An empty patch is a no-op that still + returns the existing document for consistent behavior. Scoping ensures callers cannot patch + documents they are not permitted to see. + + Args: + id (str): the id of the document to update + update (TPatch): the partial update to apply; unset fields are dropped + """ + # Only retain set fields (patch) + update_data = update.model_dump(exclude_unset=True) + # If update is empty, return the model anyways (consistent behavior) + if not update_data: + existing = await self.document_model.find_one(self._scope, self.document_model.id == id) + if existing is None: + raise NotFoundError(self._not_found(id)) + return existing + + # Otherwise, update the fields fully (set) + # Brendan TODO: Set will replace an entire field + # - if we want to append to a list (ie. add a reference) we ned Push/AddToSet + query = self.document_model.find_one(self._scope, self.document_model.id == id).update( + Set(update_data), + response_type=UpdateResponse.NEW_DOCUMENT, + ) + updated = await query # pyright: ignore[reportGeneralTypeIssues] # beanie UpdateQuery is awaitable, but pyright doesn't see it + if updated is None: + raise NotFoundError(self._not_found(id)) + return updated + + def _hash_payload(self, payload: dict[str, Any], *, separators: tuple[str, str] = (",", ":")) -> str: + canonical = json.dumps( + payload, + sort_keys=True, + separators=separators, + ensure_ascii=True, + default=str, # filters may carry ObjectId/datetime values; stringify for a stable key + ) + return hashlib.sha256(canonical.encode("utf-8")).hexdigest() + + def _get_serializer( + self, format: DownloadFormat, fields: frozenset[str] | None + ) -> Callable[[AsyncIterable[TOut]], AsyncIterable[bytes]]: + match format: + case DownloadFormat.JSONL: + return self._serialize_jsonl + case DownloadFormat.CSV: + return lambda rows: self._serialize_csv(rows, fields) + + @staticmethod + async def _serialize_jsonl(rows: AsyncIterable) -> AsyncIterator[bytes]: + async for out in rows: + yield out.model_dump_json().encode() + b"\n" + + @staticmethod + def _csv_cell(value: Any) -> Any: + """Render a cell value for CSV: scalars as-is, dict/list as JSON (not Python repr).""" + if value is None or isinstance(value, (str, int, float, bool)): + return value + return json.dumps(value, ensure_ascii=False, separators=(",", ":")) + + @staticmethod + async def _serialize_csv(rows: AsyncIterable, fields: frozenset[str] | None) -> AsyncIterator[bytes]: + buf = io.StringIO() + writer: csv.DictWriter | None = None + async for out in rows: + row = out.model_dump(mode="json") + if writer is None: + cols = sorted(fields) if fields else list(row.keys()) + writer = csv.DictWriter(buf, fieldnames=cols, extrasaction="ignore") + writer.writeheader() + writer.writerow({key: MongoDbRepository._csv_cell(value) for key, value in row.items()}) + yield buf.getvalue().encode() + buf.seek(0) + buf.truncate(0) + + async def _s3_object_exists(self, bucket_name: str, key_name: str, s3: AbstractAsyncContextManager[S3Client]): + async with s3 as s3_client: + try: + await s3_client.head_object(Bucket=bucket_name, Key=key_name) + return True + except Exception: + return False + + async def download( + self, + format: DownloadFormat, + short_mime: ShortMimeFormat, + ignore_cache: bool, + filter: TFilter, + fields: frozenset[str] | None, + s3: AbstractAsyncContextManager[S3Client], + bucket_name: str, + key_name: str, + restrict_ids: Iterable[Any] | None = None, + ) -> AsyncIterable[bytes]: + # Hash parameters to generate key for cache + payload = { + "format": format, + "short_mime": short_mime, + "filter": filter.model_dump(), + "fields": sorted(fields) if fields else None, + } + _ = self._hash_payload(payload) + + # TODO: S3 download cache. When implemented, this should `await + # self._s3_object_exists(...)` and stream the cached object on a hit. + # The previous code called the coroutine without awaiting it (a no-op + # that always evaluated truthy), so the branch was removed. + + # Build from MongoDB (and, in future, save to cache) + query = filter.filter(self.document_model.find(self._scope)) + if restrict_ids is not None: + query = query.find(In(self.document_model.id, list(restrict_ids))) + query = filter.sort(query) + + serializer = self._get_serializer(format, fields) + + # Compress using gzip level 9 and stream out + compressor = zlib.compressobj(9, zlib.DEFLATED, 16 + zlib.MAX_WBITS) + + async def rows() -> AsyncIterator[TOut]: + async for table in query: + # TODO: We might think about skipping validation to save time + yield self.out_model.model_validate(table, from_attributes=True) + + async for line in serializer(rows()): + chunk = compressor.compress(line) + if chunk: + yield chunk + + # Flush the remaining buffered bytes and the gzip footer + # Without this the stream is a truncated gzip that cannot be decompressed. + tail = compressor.flush() + if tail: + yield tail diff --git a/mpcontribs-api/build/lib/mpcontribs_api/domains/attachments/repository.py b/mpcontribs-api/build/lib/mpcontribs_api/domains/attachments/repository.py new file mode 100644 index 0000000000..6297b117f8 --- /dev/null +++ b/mpcontribs-api/build/lib/mpcontribs_api/domains/attachments/repository.py @@ -0,0 +1,15 @@ +from mpcontribs_api.domains._shared.components import MongoDbComponentsRepository +from mpcontribs_api.domains.attachments.models import ( + Attachment, + AttachmentFilter, + AttachmentIn, + AttachmentOut, + AttachmentPatch, +) + + +class MongoDbAttachmentRepository( + MongoDbComponentsRepository[Attachment, AttachmentIn, AttachmentOut, AttachmentFilter, AttachmentPatch] +): + document_model = Attachment + out_model = AttachmentOut diff --git a/mpcontribs-api/build/lib/mpcontribs_api/domains/contributions/repository.py b/mpcontribs-api/build/lib/mpcontribs_api/domains/contributions/repository.py new file mode 100644 index 0000000000..1a75419689 --- /dev/null +++ b/mpcontribs-api/build/lib/mpcontribs_api/domains/contributions/repository.py @@ -0,0 +1,266 @@ +from collections.abc import AsyncIterable +from contextlib import AbstractAsyncContextManager +from typing import Any + +from beanie import PydanticObjectId, UpdateResponse +from beanie.operators import Set +from pymongo.asynchronous.client_session import AsyncClientSession +from pymongo.results import DeleteResult +from types_aiobotocore_s3 import S3Client + +from mpcontribs_api.authz import User +from mpcontribs_api.domains._shared.repository import MongoDbRepository +from mpcontribs_api.domains._shared.types import DownloadFormat, ShortMimeFormat +from mpcontribs_api.domains.contributions.models import ( + Contribution, + ContributionFilter, + ContributionIn, + ContributionOut, + ContributionPatch, +) +from mpcontribs_api.pagination import CursorParams + + +class MongoDbContributionRepository( + MongoDbRepository[Contribution, ContributionIn, ContributionOut, ContributionFilter, ContributionPatch] +): + """A repository layer for access to MongoDB. + + Shared CRUD logic lives on :class:`MongoDbRepository`; the methods here are domain-named + forwarders that give routers a consistent vocabulary and concrete types, plus the operations + whose shape is contribution-specific (filtered delete, id-keyed upsert, download). + Multi-collection orchestration (component inserts) lives in ``ContributionService``. + """ + + document_model = Contribution + out_model = ContributionOut + + def __init__(self, user: User) -> None: + super().__init__(user) + self._user = user + + @staticmethod + def _build_scope(user: User) -> dict[str, Any]: + """Provides scope based on current user's permitted groups and publicly released data.""" + if user.is_admin: + return {} + ors: list[dict[str, Any]] = [{"is_public": True}] + if not user.is_anonymous: + if user.groups: + ors.append({"project": {"$in": sorted(user.groups)}}) + return {"$or": ors} + + async def get_contributions( + self, + filter: ContributionFilter, + pagination: CursorParams | None = None, + fields: frozenset[str] | None = None, + ): + """Query the Contribution collection, scoped to the current user. See ``get_many``.""" + return await self.get_many(pagination=pagination, filter=filter, fields=fields) + + async def get_contribution_by_id(self, id: str, fields: frozenset[str] | None): + """Find a single contribution by id, scoped to the current user. See ``get_by_id``.""" + return await self.get_by_id(self._convert_object_id(id), fields) + + async def patch_contribution_by_id(self, id: str, update: ContributionPatch): + """Partially update a contribution by id, scoped to the current user. See ``patch``.""" + return await self.patch(self._convert_object_id(id), update) + + async def delete_contribution_by_id(self, id: str) -> None: + """Delete a contribution by id, scoped to the current user. See ``delete_by_id``.""" + await self.delete_by_id(self._convert_object_id(id)) + + async def delete_contributions( + self, + filter: ContributionFilter, + ) -> DeleteResult | None: + """Bulk deletion of Contributions described by the filter. + + Args: + filter (ContribtionFilter): the filter to use to identify contributions to delete + """ + return await filter.filter(self.document_model.find(self._scope)).delete_many() + + async def insert_many_contributions( + self, + docs: list[Contribution], + session: AsyncClientSession | None = None, + ): + """Bulk-insert pre-built Contribution documents. + + Used by the ``ContributionService`` no-component fast path. On partial failure pymongo + raises ``BulkWriteError`` whose ``details["writeErrors"]`` carries per-index error info + that the service maps back into a ``BulkWriteSummary``. + """ + return await self.document_model.insert_many(docs, ordered=False, session=session) + + async def insert_contribution( + self, + doc: Contribution, + session: AsyncClientSession | None = None, + ) -> Contribution: + """Insert a single pre-built Contribution document, optionally in a transaction.""" + await doc.insert(session=session) + return doc + + async def find_one_contribution(self, project: str, identifier: str) -> Contribution | None: + """Find a single contribution by (project, identifier), scoped to the current user.""" + return await self.document_model.find_one( + self._scope, + self.document_model.project == project, + self.document_model.identifier == identifier, + ) + + async def referenced_component_ids( + self, + ref_field: str, + ids: list[PydanticObjectId], + *, + scoped: bool, + ) -> set[PydanticObjectId]: + """Return the subset of ``ids`` referenced by contributions through ``ref_field``. + + Beanie stores each ``Link`` as a DBRef (``{"$ref": ..., "$id": ObjectId}``), so a + component is referenced when its id appears under ``.$id`` on any matching + contribution. + + Args: + ref_field: the contribution link field to inspect ("structures" | "tables" | + "attachments"). Always a fixed class-attr at the call site, never user input. + ids: candidate component ids to test + scoped: when ``True`` the user scope is applied (access gate / reachability); when + ``False`` the check spans every contribution (global integrity check) + + Returns: + set[PydanticObjectId]: the ids in ``ids`` that are still referenced + """ + if not ids: + return set() + key = f"{ref_field}.$id" + query: dict[str, Any] = {key: {"$in": ids}} + if scoped and self._scope: + query = {"$and": [self._scope, query]} + target = set(ids) + referenced: set[PydanticObjectId] = set() + collection = self.document_model.get_pymongo_collection() + async for doc in collection.find(query, {ref_field: 1}): + for ref in doc.get(ref_field) or []: + rid = ref.id if hasattr(ref, "id") else ref.get("$id") + if rid in target: + referenced.add(rid) + return referenced + + # TODO: should return document with update + async def list_referenced_component_ids( + self, + ref_field: str, + *, + scoped: bool, + ) -> set[PydanticObjectId]: + """Return every component id referenced through ``ref_field`` by matching contributions. + + Unlike :meth:`referenced_component_ids`, this takes no candidate list — it enumerates all + ids reachable from contributions in scope. Used to gate component *reads* (list/download) + to only the components a user can reach via a contribution they are allowed to see. + + Args: + ref_field: the contribution link field to inspect ("structures" | "tables" | + "attachments"). Always a fixed class-attr at the call site, never user input. + scoped: when ``True`` the user scope is applied (access gate); when ``False`` the + check spans every contribution. + + Returns: + set[PydanticObjectId]: all component ids referenced via ``ref_field`` + """ + key = f"{ref_field}.$id" + query: dict[str, Any] = {key: {"$exists": True}} + if scoped and self._scope: + query = {"$and": [self._scope, query]} + referenced: set[PydanticObjectId] = set() + collection = self.document_model.get_pymongo_collection() + async for doc in collection.find(query, {ref_field: 1}): + for ref in doc.get(ref_field) or []: + rid = ref.id if hasattr(ref, "id") else ref.get("$id") + if rid is not None: + referenced.add(rid) + return referenced + + async def update_contribution(self, doc: Contribution, update_data: dict[str, Any]) -> None: + """Apply a partial update to an existing Contribution document.""" + await doc.update(Set(update_data)) + + async def upsert_contribution_by_identifiers( + self, + identifiers: dict[str, str], + contribution: ContributionIn, + ) -> Contribution: + """Atomically upsert a Contribution by its identifying fields. + + Relies on the unique index over those fields so that concurrent requests targeting the + same key cannot both win the insert branch. Fields the caller did not set are not touched + (partial update). On insert a fresh Contribution document is written with ``is_public=False``. + + Args: + identifiers: the fields ContributionIn.identifiers() returns (project, identifier) + contribution: the input payload to upsert + + Returns: + Contribution: the document as it stands after the operation + """ + doc = self.document_model.from_input_model(contribution) + update_data = doc.model_dump(exclude={"id"}, exclude_none=True) + query = self.document_model.find_one( + self._scope, + self.document_model.project == identifiers["project"], + self.document_model.identifier == identifiers["identifier"], + ).upsert( + Set(update_data), + on_insert=doc, + response_type=UpdateResponse.NEW_DOCUMENT, + ) + return await query # pyright: ignore[reportGeneralTypeIssues] # beanie UpdateQuery is awaitable, but pyright doesn't see it + + async def upsert_contribution_by_id(self, id: str, contribution: ContributionIn): + """Upserts a single Contribution. + + If Contributions with identical identifiers exist, update, otherwise insert + + Args: + id (str): the id of the Contribution to upsert + contribution (ContributionIn): the Contribution to be upserted + + Returns: + ContributionOut: the upserted document""" + doc = self.document_model.from_input_model(contribution) + query = self.document_model.find_one( + self._scope, + self.document_model.id == self._convert_object_id(id), + ).upsert( + Set(doc.model_dump(exclude={"id"}, exclude_none=True)), + on_insert=doc, + response_type=UpdateResponse.NEW_DOCUMENT, + ) + return await query # pyright: ignore[reportGeneralTypeIssues] # beanie UpdateQuery is awaitable, but pyright doesn't see it + + async def download_contributions( + self, + format: DownloadFormat, + short_mime: ShortMimeFormat, + ignore_cache: bool, + filter: ContributionFilter, + fields: frozenset[str] | None, + key_name: str, + s3: AbstractAsyncContextManager[S3Client], + bucket_name: str = "contributions", + ) -> AsyncIterable[bytes]: + return self.download( + format=format, + short_mime=short_mime, + ignore_cache=ignore_cache, + filter=filter, + fields=fields, + bucket_name=bucket_name, + key_name=key_name, + s3=s3, + ) diff --git a/mpcontribs-api/build/lib/mpcontribs_api/domains/projects/repository.py b/mpcontribs-api/build/lib/mpcontribs_api/domains/projects/repository.py new file mode 100644 index 0000000000..f0f3f09f36 --- /dev/null +++ b/mpcontribs-api/build/lib/mpcontribs_api/domains/projects/repository.py @@ -0,0 +1,111 @@ +from typing import Any + +from mpcontribs_api.authz import User +from mpcontribs_api.domains._shared.repository import MongoDbRepository +from mpcontribs_api.domains.projects.models import ( + Project, + ProjectFilter, + ProjectIn, + ProjectOut, + ProjectPatch, +) +from mpcontribs_api.exceptions import PermissionError +from mpcontribs_api.pagination import CursorParams + + +class MongoDbProjectRepository(MongoDbRepository[Project, ProjectIn, ProjectOut, ProjectFilter, ProjectPatch]): + """A repository layer for access to MongoDB. + + This is the layer that directly interacts with database operations. Shared CRUD logic lives on + :class:`MongoDbRepository`; the methods here are domain-named forwarders that give routers a + consistent vocabulary and concrete types, plus the operations whose shape is genuinely + project-specific (id-keyed upsert). + + Attributes: + _scope (dict[str, Any]): additional terms to inject into mongo queries to enforce user + authorization on resources + """ + + document_model = Project + out_model = ProjectOut + + def __init__(self, user: User) -> None: + super().__init__(user) + self._user = user + + @staticmethod + def _build_scope(user: User) -> dict[str, Any]: + """Provides scope based on current user's permitted groups and publicly released data.""" + if user.is_admin: + return {} + ors: list[dict[str, Any]] = [{"is_public": True, "is_approved": True}] + if not user.is_anonymous: + ors.append({"owner": user.username}) + if user.groups: + ors.append({"_id": {"$in": sorted(user.groups)}}) + return {"$or": ors} + + async def get_projects( + self, + filter: ProjectFilter, + pagination: CursorParams, + fields: frozenset[str] | None, + ): + """Query the Project collection, scoped to the current user. See ``get_many``.""" + return await self.get_many(pagination=pagination, filter=filter, fields=fields) + + async def get_project_by_id(self, id: str, fields: frozenset[str] | None): + """Find a single project by id, scoped to the current user. See ``get_by_id``.""" + return await self.get_by_id(id, fields) + + async def insert_project(self, project: ProjectIn) -> Project: + """Insert a new project, rejecting a duplicate id. See ``insert_one``.""" + return await self.insert_one(project) + + async def patch_project_by_id(self, id: str, update: ProjectPatch) -> Project: + """Partially update a project by id, scoped to the current user. See ``patch``.""" + return await self.patch(id, update) + + async def delete_project_by_id(self, id: str) -> None: + """Delete a project by id, scoped to the current user. See ``delete_by_id``.""" + await self.delete_by_id(id) + + async def upsert_project_by_id(self, id: str, data: ProjectIn) -> Project: + """Upsert a project by provided id, authorized to the current user. + + Update the document if the id exists, otherwise insert a new one under that id. + Authorization (the read scope is for visibility, not write access, so it is not + reused here): + + - **Existing project:** only its ``owner`` or an admin may overwrite it. The stored + ``owner`` is preserved — ownership cannot be reassigned through the request body. + - **New project:** ``owner`` is forced to the caller, ignoring any body value. + + Note: relies on the path param ``id`` for identity, not the body's id. + + Args: + id (str): the id of the project to upsert + data (ProjectIn): the data of the project to upsert + + Returns: + Project: the full document that either replaced an old one or was inserted + + Raises: + PermissionError: if a non-owner, non-admin caller targets an existing project + """ + # The route enforces authentication, so an anonymous caller should never reach here. + if self._user.username is None: + raise PermissionError(required_role="authenticated") + + existing = await self.document_model.find_one(self.document_model.id == id) + project = self.document_model.from_input_model(data) + project.id = id + if existing is not None: + if not (self._user.is_admin or existing.owner == self._user.username): + raise PermissionError(required_role="owner-or-admin") + # Ownership is immutable via upsert; keep the original owner. + project.owner = existing.owner + else: + # New project: the caller owns it, regardless of the submitted owner. + project.owner = self._user.username + return await project.save() diff --git a/mpcontribs-api/build/lib/mpcontribs_api/domains/structures/repository.py b/mpcontribs-api/build/lib/mpcontribs_api/domains/structures/repository.py new file mode 100644 index 0000000000..ab74497850 --- /dev/null +++ b/mpcontribs-api/build/lib/mpcontribs_api/domains/structures/repository.py @@ -0,0 +1,15 @@ +from mpcontribs_api.domains._shared.components import MongoDbComponentsRepository +from mpcontribs_api.domains.structures.models import ( + Structure, + StructureFilter, + StructureIn, + StructureOut, + StructurePatch, +) + + +class MongoDbStructureRepository( + MongoDbComponentsRepository[Structure, StructureIn, StructureOut, StructureFilter, StructurePatch] +): + document_model = Structure + out_model = StructureOut diff --git a/mpcontribs-api/build/lib/mpcontribs_api/domains/tables/repository.py b/mpcontribs-api/build/lib/mpcontribs_api/domains/tables/repository.py new file mode 100644 index 0000000000..a6bda17912 --- /dev/null +++ b/mpcontribs-api/build/lib/mpcontribs_api/domains/tables/repository.py @@ -0,0 +1,13 @@ +from mpcontribs_api.domains._shared.components import MongoDbComponentsRepository +from mpcontribs_api.domains.tables.models import ( + Table, + TableFilter, + TableIn, + TableOut, + TablePatch, +) + + +class MongoDbTableRepository(MongoDbComponentsRepository[Table, TableIn, TableOut, TableFilter, TablePatch]): + document_model = Table + out_model = TableOut diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py index 4a1163b41b..a974c31ba1 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py @@ -4,7 +4,7 @@ import json import zlib from abc import ABC, abstractmethod -from collections.abc import AsyncIterable, AsyncIterator, Callable +from collections.abc import AsyncIterable, AsyncIterator, Callable, Iterable from contextlib import AbstractAsyncContextManager from typing import Any @@ -79,6 +79,7 @@ async def get_many( filter: TFilter, fields: frozenset[str] | None = None, pagination: CursorParams | None = None, + restrict_ids: Iterable[Any] | None = None, ) -> Page[TOut]: """Return a scoped, filtered, cursor-paginated page of projected documents. @@ -86,11 +87,16 @@ async def get_many( pagination (CursorParams): forward-only cursor parameters filter (TFilter): the fastapi-filter query to apply on top of the user scope fields (frozenset[str] | None): fields to project; if None the full document is returned + restrict_ids (Iterable | None): when provided, results are limited to these ids in + addition to the user scope. An empty iterable yields an empty page. Used to gate + reads that are authorized indirectly (e.g. components reachable via a contribution). """ pagination = pagination or CursorParams() projection = self.out_model.projection(fields) query = filter.filter(self.document_model.find(self._scope)) + if restrict_ids is not None: + query = query.find(In(self.document_model.id, list(restrict_ids))) if pagination.cursor is not None: query = query.find(self.document_model.id > self.document_model.decode_cursor(cursor=pagination.cursor)) # pyright: ignore[reportOptionalOperand] docs = await query.sort(self.document_model.id).limit(pagination.limit + 1).project(projection).to_list() # pyright: ignore[reportArgumentType] @@ -155,7 +161,10 @@ async def delete_by_id(self, id: Any, session: AsyncClientSession | None = None) return DeleteResponse(num_deleted=1) async def delete_by_ids(self, ids: list[Any], session: AsyncClientSession | None = None) -> DeleteResponse: - """Delete multiple documents by id. + """Delete multiple scoped documents by id. + + The user scope is injected so callers cannot delete documents they are not permitted to + see; out-of-scope ids simply match nothing and are reported as zero deletions. Args: ids (list[Any]): list of ids to delete @@ -164,9 +173,7 @@ async def delete_by_ids(self, ids: list[Any], session: AsyncClientSession | None Returns: DeleteResponse: the result of the deletion """ - docs = self.document_model.find(In(self.document_model.id, ids), session=session) - if not docs: - raise NotFoundError("No documents with specified ids found", ids=ids) + docs = self.document_model.find(self._scope, In(self.document_model.id, ids), session=session) delete_result = await docs.delete_many(session=session) if not delete_result: raise ValidationError("DeleteResult not returned internally") @@ -268,6 +275,7 @@ async def download( s3: AbstractAsyncContextManager[S3Client], bucket_name: str, key_name: str, + restrict_ids: Iterable[Any] | None = None, ) -> AsyncIterable[bytes]: # Hash parameters to generate key for cache payload = { @@ -278,14 +286,13 @@ async def download( } _ = self._hash_payload(payload) - # Check S3 for the cached file - # TODO: Implement - if not ignore_cache and self._s3_object_exists(bucket_name=bucket_name, key_name=key_name, s3=s3): - # Download from either presigned url - pass + # TODO: S3 download cache. When implemented, this should `await + # self._s3_object_exists(...)` and stream the cached object on a hit. - # If not found in cache, build from MongoDB and save to cache + # Build from MongoDB (and, in future, save to cache) query = filter.filter(self.document_model.find(self._scope)) + if restrict_ids is not None: + query = query.find(In(self.document_model.id, list(restrict_ids))) query = filter.sort(query) serializer = self._get_serializer(format, fields) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py index cc816441fc..8530dcb5d3 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py @@ -151,6 +151,40 @@ async def referenced_component_ids( referenced.add(rid) return referenced + # TODO: should return document with update + async def list_referenced_component_ids( + self, + ref_field: str, + *, + scoped: bool, + ) -> set[PydanticObjectId]: + """Return every component id referenced through ``ref_field`` by matching contributions. + + Unlike :meth:`referenced_component_ids`, this takes no candidate list — it enumerates all + ids reachable from contributions in scope. + + Args: + ref_field: the contribution link field to inspect ("structures" | "tables" | + "attachments"). Always a fixed class-attr at the call site, never user input. + scoped: when ``True`` the user scope is applied (access gate); when ``False`` the + check spans every contribution. + + Returns: + set[PydanticObjectId]: all component ids referenced via ``ref_field`` + """ + key = f"{ref_field}.$id" + query: dict[str, Any] = {key: {"$exists": True}} + if scoped and self._scope: + query = {"$and": [self._scope, query]} + referenced: set[PydanticObjectId] = set() + collection = self.document_model.get_pymongo_collection() + async for doc in collection.find(query, {ref_field: 1}): + for ref in doc.get(ref_field) or []: + rid = ref.id if hasattr(ref, "id") else ref.get("$id") + if rid is not None: + referenced.add(rid) + return referenced + async def update_contribution(self, doc: Contribution, update_data: dict[str, Any]) -> None: """Apply a partial update to an existing Contribution document.""" await doc.update(Set(update_data)) @@ -198,7 +232,7 @@ async def upsert_contribution_by_id(self, id: str, contribution: ContributionIn) Returns: ContributionOut: the upserted document""" doc = self.document_model.from_input_model(contribution) - return self.document_model.find_one( + query = self.document_model.find_one( self._scope, self.document_model.id == self._convert_object_id(id), ).upsert( @@ -206,6 +240,7 @@ async def upsert_contribution_by_id(self, id: str, contribution: ContributionIn) on_insert=doc, response_type=UpdateResponse.NEW_DOCUMENT, ) + return await query # pyright: ignore[reportGeneralTypeIssues] # beanie UpdateQuery is awaitable, but pyright doesn't see it async def download_contributions( self, diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py index 2705963d07..f0f3f09f36 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py @@ -9,6 +9,7 @@ ProjectOut, ProjectPatch, ) +from mpcontribs_api.exceptions import PermissionError from mpcontribs_api.pagination import CursorParams @@ -28,6 +29,10 @@ class MongoDbProjectRepository(MongoDbRepository[Project, ProjectIn, ProjectOut, document_model = Project out_model = ProjectOut + def __init__(self, user: User) -> None: + super().__init__(user) + self._user = user + @staticmethod def _build_scope(user: User) -> dict[str, Any]: """Provides scope based on current user's permitted groups and publicly released data.""" @@ -66,10 +71,17 @@ async def delete_project_by_id(self, id: str) -> None: await self.delete_by_id(id) async def upsert_project_by_id(self, id: str, data: ProjectIn) -> Project: - """Upsert a project by provided id. + """Upsert a project by provided id, authorized to the current user. + + Update the document if the id exists, otherwise insert a new one under that id. + Authorization (the read scope is for visibility, not write access, so it is not + reused here): + + - **Existing project:** only its ``owner`` or an admin may overwrite it. The stored + ``owner`` is preserved — ownership cannot be reassigned through the request body. + - **New project:** ``owner`` is forced to the caller, ignoring any body value. - Upsert: Update document if id is found, otherwise insert new document using id. - Note: Relies on the path param 'id' for finding, rather than the body's id. + Note: relies on the path param ``id`` for identity, not the body's id. Args: id (str): the id of the project to upsert @@ -77,7 +89,23 @@ async def upsert_project_by_id(self, id: str, data: ProjectIn) -> Project: Returns: Project: the full document that either replaced an old one or was inserted + + Raises: + PermissionError: if a non-owner, non-admin caller targets an existing project """ + # The route enforces authentication, so an anonymous caller should never reach here. + if self._user.username is None: + raise PermissionError(required_role="authenticated") + + existing = await self.document_model.find_one(self.document_model.id == id) project = self.document_model.from_input_model(data) project.id = id + if existing is not None: + if not (self._user.is_admin or existing.owner == self._user.username): + raise PermissionError(required_role="owner-or-admin") + # Ownership is immutable via upsert; keep the original owner. + project.owner = existing.owner + else: + # New project: the caller owns it, regardless of the submitted owner. + project.owner = self._user.username return await project.save() diff --git a/mpcontribs-api/tests/integration/db/test_contributions_repository.py b/mpcontribs-api/tests/integration/db/test_contributions_repository.py index 4ed3b7a5b7..4d3cd97c89 100644 --- a/mpcontribs-api/tests/integration/db/test_contributions_repository.py +++ b/mpcontribs-api/tests/integration/db/test_contributions_repository.py @@ -476,3 +476,42 @@ async def test_scope_limits_what_anon_can_delete(self, db): remaining = await Contribution.find().to_list() identifiers = {d.identifier for d in remaining} assert "bdel-scope-priv" in identifiers + + +class TestUpsertContributionById: + async def test_insert_when_id_absent_persists_document(self, db): + new_id = PydanticObjectId() + payload = _contrib_in(identifier="ups-new", _id=new_id) + result = await _repo(ADMIN).upsert_contribution_by_id(str(new_id), payload) + # Must be the resolved document, not an un-awaited query object. + assert isinstance(result, Contribution) + stored = await Contribution.find_one(Contribution.id == new_id) + assert stored is not None + assert stored.identifier == "ups-new" + + async def test_update_when_id_present_applies_change(self, db): + existing = await _insert(identifier="ups-existing") + payload = _contrib_in(identifier="ups-existing", formula="Li2O", _id=existing.id) + result = await _repo(ADMIN).upsert_contribution_by_id(str(existing.id), payload) + assert isinstance(result, Contribution) + stored = await Contribution.find_one(Contribution.id == existing.id) + assert stored is not None + assert stored.formula == "Li2O" + + +class TestDeleteByIdsScope: + async def test_anon_cannot_delete_out_of_scope_ids(self, db): + pub = await _insert(identifier="dbi-pub", is_public=True) + priv = await _insert(identifier="dbi-priv", is_public=False) + # Anonymous scope only sees public docs; deleting both ids must spare the private one. + result = await _repo(ANON).delete_by_ids([pub.id, priv.id]) + assert result.num_deleted == 1 + remaining = {d.identifier for d in await Contribution.find().to_list()} + assert "dbi-priv" in remaining + assert "dbi-pub" not in remaining + + async def test_admin_deletes_all_ids(self, db): + a = await _insert(identifier="dbi-a", is_public=False) + b = await _insert(identifier="dbi-b", is_public=False) + result = await _repo(ADMIN).delete_by_ids([a.id, b.id]) + assert result.num_deleted == 2 diff --git a/mpcontribs-api/tests/integration/db/test_projects_repository.py b/mpcontribs-api/tests/integration/db/test_projects_repository.py index fc6dac2463..137a7495a2 100644 --- a/mpcontribs-api/tests/integration/db/test_projects_repository.py +++ b/mpcontribs-api/tests/integration/db/test_projects_repository.py @@ -293,3 +293,51 @@ async def test_upsert_uses_path_id_not_body_id(self, db): await _repo(ADMIN).upsert_project_by_id(id="path-id", data=data) found = await Project.find_one(Project.id == "path-id") assert found is not None + + +# --------------------------------------------------------------------------- +# upsert_project_by_id — authorization (owner-or-admin) +# --------------------------------------------------------------------------- + +BOB = User(username="google:bob@example.com", groups=frozenset()) + + +class TestUpsertProjectAuthorization: + async def test_owner_can_overwrite_own_project(self, db): + await _insert("auth-own", owner="google:alice@example.com") + data = _project_in("auth-own", owner="google:alice@example.com", title="Owner Edit") + await _repo(ALICE).upsert_project_by_id(id="auth-own", data=data) + found = await Project.find_one(Project.id == "auth-own") + assert found.title == "Owner Edit" + + async def test_admin_can_overwrite_any_project(self, db): + await _insert("auth-admin", owner="google:alice@example.com") + data = _project_in("auth-admin", owner="google:alice@example.com", title="Admin Edit") + await _repo(ADMIN).upsert_project_by_id(id="auth-admin", data=data) + found = await Project.find_one(Project.id == "auth-admin") + assert found.title == "Admin Edit" + + async def test_non_owner_cannot_overwrite(self, db): + await _insert("auth-other", owner="google:alice@example.com", title="Original") + data = _project_in("auth-other", owner="google:alice@example.com", title="Hijacked") + from mpcontribs_api.exceptions import PermissionError as AppPermissionError + + with pytest.raises(AppPermissionError): + await _repo(BOB).upsert_project_by_id(id="auth-other", data=data) + found = await Project.find_one(Project.id == "auth-other") + assert found.title == "Original" + + async def test_new_project_sets_owner_to_caller(self, db): + # Body owner is someone else; the caller's identity must win. + data = _project_in("auth-newowner", owner="google:alice@example.com") + await _repo(BOB).upsert_project_by_id(id="auth-newowner", data=data) + found = await Project.find_one(Project.id == "auth-newowner") + assert found.owner == "google:bob@example.com" + + async def test_update_preserves_original_owner(self, db): + await _insert("auth-preserve", owner="google:alice@example.com") + # Alice tries to reassign ownership via the body; owner must stay hers. + data = _project_in("auth-preserve", owner="google:bob@example.com", title="Edit") + await _repo(ALICE).upsert_project_by_id(id="auth-preserve", data=data) + found = await Project.find_one(Project.id == "auth-preserve") + assert found.owner == "google:alice@example.com" From 2077a493a82c4a29f9e636609d9c3645f54967c6 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 18 Jun 2026 12:19:36 -0700 Subject: [PATCH 147/591] Enforce contribution-scoped components at service level --- .../mpcontribs_api/domains/_shared/service.py | 172 +++++++++ .../domains/contributions/service.py | 328 ++++++++++++++++++ .../mpcontribs_api/domains/_shared/service.py | 38 +- .../domains/contributions/service.py | 2 +- .../unit/domains/test_component_service.py | 77 ++++ .../unit/domains/test_contribution_service.py | 21 ++ 6 files changed, 628 insertions(+), 10 deletions(-) create mode 100644 mpcontribs-api/build/lib/mpcontribs_api/domains/_shared/service.py create mode 100644 mpcontribs-api/build/lib/mpcontribs_api/domains/contributions/service.py diff --git a/mpcontribs-api/build/lib/mpcontribs_api/domains/_shared/service.py b/mpcontribs-api/build/lib/mpcontribs_api/domains/_shared/service.py new file mode 100644 index 0000000000..686b87df75 --- /dev/null +++ b/mpcontribs-api/build/lib/mpcontribs_api/domains/_shared/service.py @@ -0,0 +1,172 @@ +from collections.abc import AsyncIterable +from contextlib import AbstractAsyncContextManager + +from fastapi_filter.contrib.beanie import Filter +from pydantic import BaseModel +from pymongo.asynchronous.client_session import AsyncClientSession +from types_aiobotocore_s3 import S3Client + +from mpcontribs_api.domains._shared.components import MongoDbComponentsRepository +from mpcontribs_api.domains._shared.models import Component, ComponentDeleteResponse, DocumentOut +from mpcontribs_api.domains._shared.types import DownloadFormat, ShortMimeFormat +from mpcontribs_api.domains.contributions.repository import MongoDbContributionRepository +from mpcontribs_api.exceptions import NotFoundError +from mpcontribs_api.pagination import CursorParams, Page + + +class ComponentService[ + TDoc: Component, + TIn: Component, + TOut: DocumentOut, + TFilter: Filter, + TPatch: BaseModel, +]: + """Service layer for all shared component logic. + + Components (attachments, structures, tables) share the same access model and CRUD surface, so a + single configurable service handles every domain rather than a per-domain subclass. Each domain + is distinguished only by: + + - ``ref_field``: the field on a contribution that references this component type + (``"attachments"`` / ``"structures"`` / ``"tables"``) + - ``bucket_name``: the S3 bucket downloads are cached in (defaults to ``ref_field``) + + Reads, inserts, patches, and downloads forward to the components repository. Deletion is the only + operation with cross-repository logic, applying two gates: + + 1. **Access (scoped):** candidates are restricted to components reachable via a contribution + in the user's scope. A component the user cannot reach is treated as not found. + 2. **Integrity (global):** any reachable candidate still referenced by *any* contribution is + skipped; the rest are deleted. + """ + + def __init__( + self, + components: MongoDbComponentsRepository[TDoc, TIn, TOut, TFilter, TPatch], + contributions: MongoDbContributionRepository, + *, + ref_field: str, + bucket_name: str | None = None, + ) -> None: + self._components = components + self._contributions = contributions + self._ref_field = ref_field + self._bucket_name = bucket_name or ref_field + + async def get_many( + self, + filter: TFilter, + pagination: CursorParams, + fields: frozenset[str] | None, + ) -> Page[TOut]: + """Return a page of components reachable via an in-scope contribution. + + Components have no independent access field, so visibility is gated by contribution + reachability: results are restricted to ids referenced by a contribution the caller is + allowed to see (the same access gate that ``delete`` applies). + """ + allowed = await self._contributions.list_referenced_component_ids(self._ref_field, scoped=True) + return await self._components.get_many( + pagination=pagination, filter=filter, fields=fields, restrict_ids=allowed + ) + + async def get_by_id(self, id: str, fields: frozenset[str] | None) -> TDoc | TOut | None: + """Find a single component by id, gated by contribution reachability. + + Returns ``None`` (treated as not found) when no in-scope contribution references the id, + so callers cannot read a component belonging to a contribution they cannot see. + """ + oid = self._components._convert_object_id(id) + if not await self._contributions.referenced_component_ids(self._ref_field, [oid], scoped=True): + return None + return await self._components.get_component_by_id(id, fields) + + async def insert( + self, + components: list[TIn], + session: AsyncClientSession | None = None, + ) -> list[TDoc]: + """Bulk-insert components, deduplicated by content hash. See ``insert_components``.""" + return await self._components.insert_components(components=components, session=session) + + async def patch_by_id(self, id: str, update: TPatch) -> TDoc: + """Partially update a component by id, gated by contribution reachability. + + Raises ``NotFoundError`` when no in-scope contribution references the id, mirroring the + access gate on ``delete_by_id``. + """ + oid = self._components._convert_object_id(id) + if not await self._contributions.referenced_component_ids(self._ref_field, [oid], scoped=True): + raise NotFoundError(self._components._not_found(id)) + return await self._components.patch_component_by_id(id=id, update=update) + + async def download( + self, + format: DownloadFormat, + short_mime: ShortMimeFormat, + ignore_cache: bool, + filter: TFilter, + fields: frozenset[str] | None, + s3: AbstractAsyncContextManager[S3Client], + ) -> AsyncIterable[bytes]: + """Stream a gzip-compressed export of matching components. See ``download``. + + The S3 cache location is owned by the service: ``bucket_name`` defaults to ``ref_field`` and + ``key_name`` is currently unused. Like the other reads, the export is gated to components + reachable via an in-scope contribution. + """ + allowed = await self._contributions.list_referenced_component_ids(self._ref_field, scoped=True) + return self._components.download( + format=format, + short_mime=short_mime, + ignore_cache=ignore_cache, + filter=filter, + fields=fields, + s3=s3, + bucket_name=self._bucket_name, + key_name="", # TODO: Temp + restrict_ids=allowed, + ) + + async def delete(self, filter: TFilter) -> ComponentDeleteResponse: + """Delete components matching ``filter`` that are reachable and globally unreferenced. + + Args: + filter (TFilter): the component-specific query to apply + + Returns: + ComponentDeleteResponse: count deleted, plus the ids skipped because a contribution + still references them + """ + candidate_ids = await self._components.list_ids(filter) + reachable = await self._contributions.referenced_component_ids(self._ref_field, candidate_ids, scoped=True) + if not reachable: + return ComponentDeleteResponse(num_deleted=0) + referenced = await self._contributions.referenced_component_ids(self._ref_field, list(reachable), scoped=False) + deletable = [cid for cid in reachable if cid not in referenced] + num_deleted = (await self._components.delete_by_ids(deletable)).num_deleted if deletable else 0 + return ComponentDeleteResponse( + num_deleted=num_deleted, + num_skipped=len(referenced), + referenced_ids=sorted(referenced), + ) + + async def delete_by_id(self, id: str) -> ComponentDeleteResponse: + """Delete a single component by id, subject to the access and integrity gates. + + Args: + id (str): the str representation of the component's ObjectId + + Returns: + ComponentDeleteResponse: the deletion result, or a skipped result if still referenced + + Raises: + NotFoundError: if the component is not reachable via any in-scope contribution + """ + oid = self._components._convert_object_id(id) + if not await self._contributions.referenced_component_ids(self._ref_field, [oid], scoped=True): + raise NotFoundError(self._components._not_found(id)) + if await self._contributions.referenced_component_ids(self._ref_field, [oid], scoped=False): + return ComponentDeleteResponse(num_deleted=0, num_skipped=1, referenced_ids=[oid]) + deleted = await self._components.delete_by_id(oid) + return ComponentDeleteResponse(num_deleted=deleted.num_deleted) diff --git a/mpcontribs-api/build/lib/mpcontribs_api/domains/contributions/service.py b/mpcontribs-api/build/lib/mpcontribs_api/domains/contributions/service.py new file mode 100644 index 0000000000..5da70bdc31 --- /dev/null +++ b/mpcontribs-api/build/lib/mpcontribs_api/domains/contributions/service.py @@ -0,0 +1,328 @@ +import asyncio +from collections import defaultdict +from typing import cast + +import structlog +from beanie import Link, PydanticObjectId +from pymongo import AsyncMongoClient +from pymongo.asynchronous.client_session import AsyncClientSession +from pymongo.errors import BulkWriteError + +from mpcontribs_api.config import MongoSettings, get_settings +from mpcontribs_api.domains._shared.bulk import ( + BulkDeleteSummary, + BulkFailure, + BulkWriteSummary, + bulk_failure_from_exception, +) +from mpcontribs_api.domains._shared.repository import MongoDbRepository +from mpcontribs_api.domains.attachments.repository import MongoDbAttachmentRepository +from mpcontribs_api.domains.contributions.models import Contribution, ContributionFilter, ContributionIn +from mpcontribs_api.domains.contributions.repository import MongoDbContributionRepository +from mpcontribs_api.domains.structures.models import Structure +from mpcontribs_api.domains.structures.repository import MongoDbStructureRepository +from mpcontribs_api.domains.tables.models import Table +from mpcontribs_api.domains.tables.repository import MongoDbTableRepository +from mpcontribs_api.exceptions import AppError, ValidationError +from mpcontribs_api.pagination import CursorParams + +logger = structlog.get_logger(__name__) + + +class ContributionService: + def __init__( + self, + client: AsyncMongoClient, + contributions: MongoDbContributionRepository, + structures: MongoDbStructureRepository, + attachments: MongoDbAttachmentRepository, + tables: MongoDbTableRepository, + settings: MongoSettings | None = None, + ): + self._client = client + self._contributions = contributions + self._structures = structures + self._attachments = attachments + self._tables = tables + self._settings = settings or get_settings().mongo + + @property + def _children(self) -> dict[str, MongoDbRepository]: + return { + "structures": self._structures, + "attachments": self._attachments, + "tables": self._tables, + } + + async def insert_contributions( + self, + contributions: list[ContributionIn], + ) -> BulkWriteSummary[Contribution]: + """Atomic bulk insert contributions, atomically per top-level contribution. + + Contributions carrying no components are inserted in one ``insert_many`` (no transaction); + contributions with components run inside their own MongoDB transaction so the contribution + and its components commit or roll back together. Concurrent transactions are bounded by + ``settings.mongo.max_concurrent_transactions``. Per-item failures are returned in the + summary's ``failed`` list; the request as a whole does not raise on partial failure. + + Args: + contributions: contributions to insert; may include nested structures/tables/attachments + + Returns: + BulkWriteSummary[Contribution]: per-item outcome, sized to ``len(contributions)`` + + Raises: + ValidationError: if duplicate keys (project-identifier) are found in ``contributions`` + """ + if not contributions: + return BulkWriteSummary[Contribution](total=0, succeeded=[], failed=[]) + + self._reject_duplicate_keys(contributions) + + oversize_failures, remaining_indices = self._split_oversize(contributions) + no_comp_indices = [i for i in remaining_indices if not contributions[i].has_components()] + with_comp_indices = [i for i in remaining_indices if contributions[i].has_components()] + + no_comp_succeeded, no_comp_failed = await self._insert_no_components( + indices=no_comp_indices, + contributions=contributions, + ) + with_comp_succeeded, with_comp_failed = await self._insert_with_components( + indices=with_comp_indices, + contributions=contributions, + ) + + succeeded = [doc for _, doc in sorted(no_comp_succeeded + with_comp_succeeded, key=lambda p: p[0])] + failed = sorted( + oversize_failures + no_comp_failed + with_comp_failed, + key=lambda f: f.index, + ) + return BulkWriteSummary[Contribution](total=len(contributions), succeeded=succeeded, failed=failed) + + def _reject_duplicate_keys(self, contributions: list[ContributionIn]) -> None: + """Reject the whole batch if any identifying key appears more than once. + + Mongo would surface this as a duplicate key error; catching it upfront keeps a guaranteed + failure from consuming a transaction slot and gives the caller all offending indices at once. + + The dedup key is derived from every value in ``identifiers()`` so adding a field to the + uniqueness contract there flows through here automatically. + """ + seen: dict[tuple[str, ...], list[int]] = defaultdict(list) + for index, contribution in enumerate(contributions): + ids = contribution.identifiers() + seen[tuple(ids.values())].append(index) + duplicates = sorted(index for indices in seen.values() if len(indices) > 1 for index in indices) + if duplicates: + raise ValidationError( + "Duplicate (project, identifier) pairs in batch", + contribution_indices=duplicates, + ) + + def _split_oversize(self, contributions: list[ContributionIn]) -> tuple[list[BulkFailure], list[int]]: + """Reject contributions whose component count exceeds the per-contribution ceiling. + + Returns the failure entries for the oversize items and the indices of the remaining items + that should proceed to Mongo. Doing this upfront avoids burning a transaction slot on a + request guaranteed to exceed transactionLifetimeLimitSeconds. + """ + cap = self._settings.max_components_per_contribution + oversize: list[BulkFailure] = [] + remaining: list[int] = [] + for i, contrib in enumerate(contributions): + count = contrib.component_count() + if count > cap: + oversize.append( + BulkFailure( + index=i, + identifier=contrib.identifiers(), + error_code="validation_error", + message=f"contribution has {count} components, exceeds cap of {cap}. " + "Recommend inserting the component alone, followed by bulk inserts of components", + ) + ) + else: + remaining.append(i) + return oversize, remaining + + async def _insert_no_components( + self, + indices: list[int], + contributions: list[ContributionIn], + ) -> tuple[list[tuple[int, Contribution]], list[BulkFailure]]: + """Single-collection bulk insert for component-free contributions. + + Uses ``ordered=False`` so a single bad item doesn't sink the rest of the batch. pymongo + raises ``BulkWriteError`` with per-index error info on partial failure; we map that back + onto the original input indices. + """ + if not indices: + return [], [] + docs = [Contribution.from_input_model(contributions[i]) for i in indices] + try: + await self._contributions.insert_many_contributions(docs) + return list(zip(indices, docs, strict=False)), [] + except BulkWriteError as exc: + return self._partition_bulk_write_error(indices, docs, contributions, exc) + + @staticmethod + def _partition_bulk_write_error( + indices: list[int], + docs: list[Contribution], + contributions: list[ContributionIn], + exc: BulkWriteError, + ) -> tuple[list[tuple[int, Contribution]], list[BulkFailure]]: + """Map pymongo's per-position writeErrors back to the caller's original input indices.""" + write_errors = exc.details.get("writeErrors", []) if exc.details else [] + failed_positions = {err.get("index"): err for err in write_errors} + succeeded: list[tuple[int, Contribution]] = [] + failed: list[BulkFailure] = [] + for position, (orig_index, doc) in enumerate(zip(indices, docs, strict=False)): + err = failed_positions.get(position) + if err is None: + succeeded.append((orig_index, doc)) + else: + failed.append( + BulkFailure( + index=orig_index, + identifier=contributions[orig_index].identifiers(), + error_code="conflict" if err.get("code") == 11000 else "write_error", + message=err.get("errmsg", "write failed"), + ) + ) + return succeeded, failed + + async def _insert_with_components( + self, + indices: list[int], + contributions: list[ContributionIn], + ) -> tuple[list[tuple[int, Contribution]], list[BulkFailure]]: + """Per-contribution transaction path, bounded by ``max_concurrent_transactions``.""" + if not indices: + return [], [] + sem = asyncio.Semaphore(self._settings.max_concurrent_transactions) + + async def _bounded(orig_index: int) -> Contribution | BulkFailure: + async with sem: + return await self._insert_one_with_components(orig_index, contributions[orig_index]) + + results = await asyncio.gather(*[_bounded(i) for i in indices]) + succeeded: list[tuple[int, Contribution]] = [] + failed: list[BulkFailure] = [] + for orig_index, outcome in zip(indices, results, strict=True): + if isinstance(outcome, BulkFailure): + failed.append(outcome) + else: + succeeded.append((orig_index, outcome)) + return succeeded, failed + + async def _insert_one_with_components( + self, + index: int, + contrib: ContributionIn, + ) -> Contribution | BulkFailure: + """Run a single contribution + its components inside a transaction. + + Uses ``session.with_transaction`` so transient txn errors (write conflicts, primary step- + downs) get pymongo's retry treatment. Any exception is converted to a ``BulkFailure`` so + the surrounding ``asyncio.gather`` sees a normal return value for every coroutine. + """ + try: + async with self._client.start_session() as session: + + async def _txn(s: AsyncClientSession) -> Contribution: + return await self._do_insert(contrib, s) + + return await session.with_transaction(_txn) + except AppError as exc: + return bulk_failure_from_exception(index, contrib.identifiers(), exc) + except Exception as exc: + logger.error("insert_contribution_failed", index=index, identifier=contrib.identifiers(), exc_info=True) + return bulk_failure_from_exception(index, contrib.identifiers(), exc) + + async def _do_insert(self, contrib: ContributionIn, session: AsyncClientSession) -> Contribution: + """Insert components then the contribution itself, all in the given session. + + Components are inserted sequentially because a session is single-threaded — sharing it + across concurrent awaits would corrupt the wire protocol. + """ + structures = await self._structures.insert_components(contrib.structures or [], session=session) + tables = await self._tables.insert_components(contrib.tables or [], session=session) + + doc = Contribution.from_input_model(contrib) + doc.structures = cast(list[Link[Structure]] | None, structures or None) + doc.tables = cast(list[Link[Table]] | None, tables or None) + return await self._contributions.insert_contribution(doc, session=session) + + async def upsert_contributions(self, contributions: list[ContributionIn]) -> list[Contribution]: + """Upsert contributions by their identifying fields, bounded by concurrency caps. + + Components (structures, tables, attachments) must be managed via their respective + services. If any contribution in the batch carries components, the entire request is + rejected before any database writes occur. + + Each item is upserted atomically by ``ContributionIn.identifiers()`` via a single + ``findOneAndUpdate(..., upsert=True)`` so two requests targeting the same key cannot + race past the find branch — the unique index over those fields is the tiebreaker. + Concurrent upserts within a batch are bounded by ``settings.mongo.max_concurrent_transactions`` + + Args: + contributions: contributions to upsert; must not include nested components + + Returns: + list[Contribution]: upserted documents in input order + """ + indices_with_components = [i for i, c in enumerate(contributions) if c.has_components()] + if indices_with_components: + raise ValidationError( + "Components must be managed via their respective services, not via contribution upsert.", + contribution_indices=indices_with_components, + ) + + sem = asyncio.Semaphore(self._settings.max_concurrent_transactions) + + async def _bounded_upsert(contrib: ContributionIn) -> Contribution: + async with sem: + return await self._contributions.upsert_contribution_by_identifiers(contrib.identifiers(), contrib) + + return await asyncio.gather(*[_bounded_upsert(c) for c in contributions]) + + async def delete_contributions(self, filter: ContributionFilter) -> BulkDeleteSummary: + """Delete a contribution and all of its child components + + Doesn't guarantee complete atomicity, but prevents orphaned children by deleting components first. + + Args: + filter (ContributionFilter): the Contribution-specific query to apply on top of the user scope + + + Returns: + BulkDeleteSummary: a summary of how many documents and child documents were deleted + """ + num_deleted_components = 0 + num_deleted_contributions = 0 + # Loop through cursor rather than materialize arbitrary number of Contributions + while True: + # Since we are deleting everything matching filter, we can continuously get the 1st page + page = await self._contributions.get_contributions( + pagination=CursorParams(cursor=None, limit=100), + filter=filter, + ) + # For each component type, gather ObjectIds then bulk delete them + # - components first so no children are left orphaned + for field, repo in self._children.items(): + ids = [link.ref.id for c in page.items for link in (getattr(c, field) or [])] + if ids: + deleted_components = await repo.delete_by_ids(ids) + num_deleted_components += deleted_components.num_deleted if deleted_components else 0 + + # Delete Contributions in this batch by ID + # need to make a new filter so we don't eagerly delete all contributions before their components are deleted + deleted_contribs = await self._contributions.delete_contributions( + ContributionFilter(id__in=[cast(PydanticObjectId, c.id) for c in page.items]) + ) + num_deleted_contributions += deleted_contribs.deleted_count if deleted_contribs else 0 + if not page.items: + break + return BulkDeleteSummary(num_deleted=num_deleted_contributions, num_children_deleted=num_deleted_components) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/service.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/service.py index f7c8d05e98..1b17a18d86 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/service.py @@ -59,11 +59,26 @@ async def get_many( pagination: CursorParams, fields: frozenset[str] | None, ) -> Page[TOut]: - """Return a scoped, filtered, cursor-paginated page of components. See ``get_many``.""" - return await self._components.get_many(pagination=pagination, filter=filter, fields=fields) + """Return a page of components reachable via an in-scope contribution. + + Components have no independent access field, so visibility is gated by contribution + reachability: results are restricted to ids referenced by a contribution the caller is + allowed to see + """ + allowed = await self._contributions.list_referenced_component_ids(self._ref_field, scoped=True) + return await self._components.get_many( + pagination=pagination, filter=filter, fields=fields, restrict_ids=allowed + ) async def get_by_id(self, id: str, fields: frozenset[str] | None) -> TDoc | TOut | None: - """Find a single component by id, scoped to the current user. See ``get_component_by_id``.""" + """Find a single component by id, gated by contribution reachability. + + Returns ``None`` (treated as not found) when no in-scope contribution references the id, + so callers cannot read a component belonging to a contribution they cannot see. + """ + oid = self._components._convert_object_id(id) + if not await self._contributions.referenced_component_ids(self._ref_field, [oid], scoped=True): + return None return await self._components.get_component_by_id(id, fields) async def insert( @@ -75,7 +90,14 @@ async def insert( return await self._components.insert_components(components=components, session=session) async def patch_by_id(self, id: str, update: TPatch) -> TDoc: - """Partially update a component by id, scoped to the current user. See ``patch_component_by_id``.""" + """Partially update a component by id, gated by contribution reachability. + + Raises: + NotFoundError: when no in-scope contribution references the id + """ + oid = self._components._convert_object_id(id) + if not await self._contributions.referenced_component_ids(self._ref_field, [oid], scoped=True): + raise NotFoundError(self._components._not_found(id)) return await self._components.patch_component_by_id(id=id, update=update) async def download( @@ -87,11 +109,8 @@ async def download( fields: frozenset[str] | None, s3: AbstractAsyncContextManager[S3Client], ) -> AsyncIterable[bytes]: - """Stream a gzip-compressed export of matching components. See ``download``. - - The S3 cache location is owned by the service: ``bucket_name`` defaults to ``ref_field`` and - ``key_name`` is currently unused. - """ + """Stream a gzip-compressed export of matching components. See ``download``.""" + allowed = await self._contributions.list_referenced_component_ids(self._ref_field, scoped=True) return self._components.download( format=format, short_mime=short_mime, @@ -101,6 +120,7 @@ async def download( s3=s3, bucket_name=self._bucket_name, key_name="", # TODO: Temp + restrict_ids=allowed, ) async def delete(self, filter: TFilter) -> ComponentDeleteResponse: diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py index dc7b1930a6..5da70bdc31 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py @@ -312,7 +312,7 @@ async def delete_contributions(self, filter: ContributionFilter) -> BulkDeleteSu # For each component type, gather ObjectIds then bulk delete them # - components first so no children are left orphaned for field, repo in self._children.items(): - ids = [link.ref.id for c in page.items for link in getattr(c, field)] + ids = [link.ref.id for c in page.items for link in (getattr(c, field) or [])] if ids: deleted_components = await repo.delete_by_ids(ids) num_deleted_components += deleted_components.num_deleted if deleted_components else 0 diff --git a/mpcontribs-api/tests/unit/domains/test_component_service.py b/mpcontribs-api/tests/unit/domains/test_component_service.py index 090716b402..53f86ce17d 100644 --- a/mpcontribs-api/tests/unit/domains/test_component_service.py +++ b/mpcontribs-api/tests/unit/domains/test_component_service.py @@ -145,3 +145,80 @@ async def test_delete_by_id_reachable_and_unreferenced_deletes(): assert result.num_deleted == 1 assert result.num_skipped == 0 components.delete_by_id.assert_awaited_once_with(oid) + + +# --------------------------------------------------------------------------- +# Read gating: get_by_id / get_many / patch_by_id are reachability-scoped +# --------------------------------------------------------------------------- + + +def _make_read_service(*, reachable: set[PydanticObjectId]) -> tuple[ComponentService, AsyncMock, AsyncMock]: + """ComponentService whose contribution repo reports `reachable` ids as in-scope.""" + components = AsyncMock(name="components") + components._convert_object_id = MagicMock(side_effect=lambda s: PydanticObjectId(s)) + components._not_found = MagicMock(return_value="not found") + + contributions = AsyncMock(name="contributions") + + async def _referenced(ref_field, ids, *, scoped): + return {i for i in ids if i in reachable} if scoped else set() + + contributions.referenced_component_ids = AsyncMock(side_effect=_referenced) + contributions.list_referenced_component_ids = AsyncMock(return_value=reachable) + + service = ComponentService(components, contributions, ref_field="attachments") + return service, components, contributions + + +async def test_get_by_id_unreachable_returns_none_without_fetch(): + oid = _oid() + svc, components, _ = _make_read_service(reachable=set()) + + result = await svc.get_by_id(str(oid), fields=None) + + assert result is None + components.get_component_by_id.assert_not_awaited() + + +async def test_get_by_id_reachable_fetches_component(): + oid = _oid() + svc, components, _ = _make_read_service(reachable={oid}) + components.get_component_by_id = AsyncMock(return_value="the-component") + + result = await svc.get_by_id(str(oid), fields=None) + + assert result == "the-component" + components.get_component_by_id.assert_awaited_once() + + +async def test_get_many_restricts_to_reachable_ids(): + a, b = _oid(), _oid() + svc, components, contributions = _make_read_service(reachable={a, b}) + components.get_many = AsyncMock(return_value="page") + + await svc.get_many(filter=AttachmentFilter(), pagination=None, fields=None) + + contributions.list_referenced_component_ids.assert_awaited_once() + assert contributions.list_referenced_component_ids.await_args.kwargs["scoped"] is True + restrict = components.get_many.await_args.kwargs["restrict_ids"] + assert set(restrict) == {a, b} + + +async def test_patch_by_id_unreachable_raises_not_found(): + oid = _oid() + svc, components, _ = _make_read_service(reachable=set()) + + with pytest.raises(NotFoundError): + await svc.patch_by_id(str(oid), update=MagicMock()) + components.patch_component_by_id.assert_not_awaited() + + +async def test_patch_by_id_reachable_patches(): + oid = _oid() + svc, components, _ = _make_read_service(reachable={oid}) + components.patch_component_by_id = AsyncMock(return_value="patched") + + result = await svc.patch_by_id(str(oid), update=MagicMock()) + + assert result == "patched" + components.patch_component_by_id.assert_awaited_once() diff --git a/mpcontribs-api/tests/unit/domains/test_contribution_service.py b/mpcontribs-api/tests/unit/domains/test_contribution_service.py index 69720ecbc0..2b213789c9 100644 --- a/mpcontribs-api/tests/unit/domains/test_contribution_service.py +++ b/mpcontribs-api/tests/unit/domains/test_contribution_service.py @@ -809,3 +809,24 @@ async def test_children_accumulate_across_pages(self): assert summary.num_children_deleted == 2 assert struct_repo.delete_by_ids.await_count == 2 + + +class TestDeleteContributionsNoneComponents: + """ContributionOut leaves unset component fields as None (not []). + + The cascade loop must tolerate None rather than raising TypeError on iteration. + """ + + async def test_none_component_fields_do_not_raise(self): + svc, contrib_repo, struct_repo, table_repo, attach_repo, _ = _make_service() + doc = SimpleNamespace(id=_oid(), structures=None, tables=None, attachments=None) + contrib_repo.get_contributions.side_effect = [_page([doc]), _page([])] + contrib_repo.delete_contributions.side_effect = [_delete_result(1), _delete_result(0)] + + summary = await svc.delete_contributions(_noop_filter()) + + assert summary.num_deleted == 1 + assert summary.num_children_deleted == 0 + struct_repo.delete_by_ids.assert_not_called() + table_repo.delete_by_ids.assert_not_called() + attach_repo.delete_by_ids.assert_not_called() From fa292e105dcecd7e58db0c3c97dcc39fe73fc163 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 18 Jun 2026 12:20:13 -0700 Subject: [PATCH 148/591] Convert id str to objectid --- .../domains/_shared/components.py | 139 ++++++++++++++++++ .../domains/_shared/components.py | 4 +- 2 files changed, 141 insertions(+), 2 deletions(-) create mode 100644 mpcontribs-api/build/lib/mpcontribs_api/domains/_shared/components.py diff --git a/mpcontribs-api/build/lib/mpcontribs_api/domains/_shared/components.py b/mpcontribs-api/build/lib/mpcontribs_api/domains/_shared/components.py new file mode 100644 index 0000000000..196dde4528 --- /dev/null +++ b/mpcontribs-api/build/lib/mpcontribs_api/domains/_shared/components.py @@ -0,0 +1,139 @@ +from typing import Any + +from beanie import PydanticObjectId +from beanie.operators import In +from fastapi_filter.contrib.beanie import Filter +from pydantic import BaseModel +from pymongo.asynchronous.client_session import AsyncClientSession + +from mpcontribs_api.authz import User +from mpcontribs_api.config import get_settings +from mpcontribs_api.domains._shared.models import Component, DeleteResponse, DocumentOut +from mpcontribs_api.domains._shared.repository import MongoDbRepository +from mpcontribs_api.domains._shared.types import MD5Hash + + +class MongoDbComponentsRepository[ + TDoc: Component, + TIn: Component, + TOut: DocumentOut, + TFilter: Filter, + TPatch: BaseModel, +](MongoDbRepository[TDoc, TIn, TOut, TFilter, TPatch]): + @staticmethod + def _build_scope(user: User) -> dict[str, Any]: + return {} + + async def _check_existing( + self, + components: list[TIn] | TIn, + session: AsyncClientSession | None = None, + ) -> tuple[dict[MD5Hash, TIn], dict[str, TDoc]]: + if not isinstance(components, list): + components = [components] + by_md5 = {comp.md5: comp for comp in components} + + # Full fetch so existing docs come back with their ids + # TODO: Most likely does a COLLSCAN - see if we can project to get a COVERED QUERY + existing_docs = await self.document_model.find( + In(self.document_model.md5, list(by_md5.keys())), + session=session, + ).to_list() + return (by_md5, {doc.md5: doc for doc in existing_docs}) + + async def insert_components( + self, + components: list[TIn], + session: AsyncClientSession | None = None, + ) -> list[TDoc]: + """Bulk-insert components, chunked to fit within a transaction's payload budget. + + Args: + components (list[TIn]): components to insert + session (AsyncClientSession): optional client session; pass when inserting inside a transaction + """ + by_md5, existing_by_md5 = await self._check_existing(components=components, session=session) + # Assign ids manually: insert_many won't populate id back onto these + # objects, and get_dict drops id when it's None. + new_docs: list[TDoc] = [] + for md5, comp in by_md5.items(): + if md5 in existing_by_md5: + continue + doc = self.document_model.model_validate(comp.model_dump()) + doc.id = PydanticObjectId() + new_docs.append(doc) + + # TODO: Might want to delegate this logic to a higher level + # - This method might want to simply insert everything it's given + # Insert by chunks + chunk_size = get_settings().mongo.component_insert_chunk_size + for start in range(0, len(new_docs), chunk_size): + await self.document_model.insert_many( + new_docs[start : start + chunk_size], + ordered=False, + session=session, + ) + + # Return a list of documents reflecting what was stored/found + resolved = existing_by_md5 | {doc.md5: doc for doc in new_docs} + return [resolved[md5] for md5 in by_md5] + + async def insert_component(self, component: TIn, *, session: AsyncClientSession | None = None) -> TDoc: + """Insert a single component. + + Args: + component (TIn): the table to insert + + Returns: + TDoc: the component actually in the database + + Raises: + AppError: If insert_one returns None, raises + """ + return (await self.insert_components(components=[component], session=session))[0] + + async def get_component_by_id(self, id: str, fields: frozenset[str] | None) -> TDoc | TOut | None: + """Find a single component by id. See ``get_by_id``. + + The id must be converted to an ObjectId first; ``get_by_id`` compares against the + ObjectId ``_id`` and a raw string would never match. + """ + return await self.get_by_id(self._convert_object_id(id), fields) + + async def delete_components( + self, + filter: TFilter, + session: AsyncClientSession | None = None, + ) -> DeleteResponse: + """Deletes all components matching ``filter``. + + Args: + filter (TFilter): the query to filter components by + session (AsyncClientSession | None): the current session, used to guarantee transactions + + Returns: + DeleteResponse: A report of the deletion + """ + query = filter.filter(self.document_model.find(self._scope, session=session)) + result = await query.delete(session=session) + return DeleteResponse(num_deleted=result.deleted_count if result else 0) + + async def delete_component_by_id( + self, + id: str, + session: AsyncClientSession | None = None, + ) -> DeleteResponse: + """Deletes a single component by Id. + + Args: + id (str): the str representation of the component's ObjectId + session (AsyncClientSession | None): the current session, used to guarantee transactions + + Returns: + DeleteResponse: A report of the deletion + """ + return await self.delete_by_id(id=self._convert_object_id(id), session=session) + + async def patch_component_by_id(self, id: str, update: TPatch) -> TDoc: + """Partially update a component by id, scoped to the current user. See ``patch``.""" + return await self.patch(self._convert_object_id(id), update) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py index a7a25d1cbe..499a334149 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py @@ -93,8 +93,8 @@ async def insert_component(self, component: TIn, *, session: AsyncClientSession return (await self.insert_components(components=[component], session=session))[0] async def get_component_by_id(self, id: str, fields: frozenset[str] | None) -> TDoc | TOut | None: - """Find a single table by id, scoped to the current user. See ``get_by_id``.""" - return await self.get_by_id(id, fields) + """Find a single component by id. See ``get_by_id``.""" + return await self.get_by_id(self._convert_object_id(id), fields) async def delete_components( self, From 7d617ef6a64cc5d64d736f7956458a84d05f5ba0 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 18 Jun 2026 12:20:42 -0700 Subject: [PATCH 149/591] Readded start_rq so supervisord doesnt fail --- mpcontribs-api/scripts/start_rq.sh | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100755 mpcontribs-api/scripts/start_rq.sh diff --git a/mpcontribs-api/scripts/start_rq.sh b/mpcontribs-api/scripts/start_rq.sh new file mode 100755 index 0000000000..821f6e0d0b --- /dev/null +++ b/mpcontribs-api/scripts/start_rq.sh @@ -0,0 +1,20 @@ +#!/bin/bash +# +# RQ worker placeholder. +# +# The FastAPI rewrite has not yet ported the background worker (the old worker ran +# `flask rq worker`, and Flask is gone). This stub exists so supervisord's `*-worker` +# programs — referenced by supervisord.conf.jinja and started by main.py's `start("rq:*")` +# — have a command to run and do not crash-loop or enter FATAL. +# +# It honors the same startup stagger as the api process, then blocks so supervisord sees a +# healthy RUNNING process. Replace the `exec sleep infinity` below with the real worker +# entrypoint once background processing is reimplemented. + +set -e +zzz=$((DEPLOYMENT * 60)) +echo "$SUPERVISOR_PROCESS_NAME: waiting for $zzz seconds before start..." +sleep "$zzz" + +echo "$SUPERVISOR_PROCESS_NAME: RQ worker not yet ported to the FastAPI rewrite; idling." +exec sleep infinity From 8c162ed633f50024b7b287aa3ecef80ce7e890af Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 18 Jun 2026 12:22:03 -0700 Subject: [PATCH 150/591] Moved kwargs to new spec --- mpcontribs-api/supervisord/conf.py | 4 ++++ mpcontribs-api/supervisord/supervisord.conf.jinja | 14 ++++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/mpcontribs-api/supervisord/conf.py b/mpcontribs-api/supervisord/conf.py index 1f5bdd5bf7..9e4070a382 100644 --- a/mpcontribs-api/supervisord/conf.py +++ b/mpcontribs-api/supervisord/conf.py @@ -24,6 +24,10 @@ kwargs = { "production": PRODUCTION, + # MPCONTRIBS_ENVIRONMENT drives the new pydantic Settings (log format, debug mode). + "environment": "prod" if PRODUCTION else "dev", + # MPCONTRIBS_VERSION is required by Settings; sourced from the image build arg at container start. + "version": os.environ.get("CONTRIBS_VERSION", os.environ.get("MPCONTRIBS_VERSION", "0.0.0")), "deployments": deployments, "nworkers": NWORKERS, "reload": int(not PRODUCTION), diff --git a/mpcontribs-api/supervisord/supervisord.conf.jinja b/mpcontribs-api/supervisord/supervisord.conf.jinja index e02ba99515..b2e7e913de 100644 --- a/mpcontribs-api/supervisord/supervisord.conf.jinja +++ b/mpcontribs-api/supervisord/supervisord.conf.jinja @@ -4,17 +4,19 @@ user=root logfile=/tmp/supervisord.log pidfile=/tmp/supervisord.pid environment= - MPCONTRIBS_MONGO_HOST="%(ENV_MPCONTRIBS_MONGO_HOST)s", + MPCONTRIBS_ENVIRONMENT="{{ environment }}", + MPCONTRIBS_VERSION="{{ version }}", + MPCONTRIBS_MONGO__URI="%(ENV_MPCONTRIBS_MONGO__URI)s", {% if not production %} AWS_ACCESS_KEY_ID="%(ENV_AWS_ACCESS_KEY_ID)s", AWS_SECRET_ACCESS_KEY="%(ENV_AWS_SECRET_ACCESS_KEY)s", {% endif %} METADATA_URI="%(ENV_ECS_CONTAINER_METADATA_URI_V4)s", - REDIS_ADDRESS="%(ENV_REDIS_ADDRESS)s", + MPCONTRIBS_REDIS__ADDRESS="%(ENV_REDIS_ADDRESS)s", + MPCONTRIBS_REDIS__URL="%(ENV_REDIS_URL)s", AWS_REGION="us-east-1", AWS_DEFAULT_REGION="us-east-1", - MAIL_DEFAULT_SENDER="contribs@materialsproject.org", - FLASK_APP="mpcontribs.api", + MPCONTRIBS_MAIL_DEFAULT_SENDER="contribs@materialsproject.org", PYTHONUNBUFFERED=1, MAX_REQUESTS=0, MAX_REQUESTS_JITTER=0, @@ -72,13 +74,13 @@ environment= API_PORT={{ cfg.api_port }}, PORTAL_PORT={{ cfg.portal_port }}, MPCONTRIBS_API_HOST="{{ mpcontribs_api_host }}:{{ cfg.api_port }}", - MPCONTRIBS_DB_NAME="mpcontribs-{{ cfg.db }}", + MPCONTRIBS_MONGO__DB_NAME="mpcontribs-{{ cfg.db }}", TRADEMARK="{{ cfg.tm }}", MAX_PROJECTS={{ cfg.max_projects }}, S3_DOWNLOADS_BUCKET="mpcontribs-downloads-{{ cfg.s3 }}", S3_ATTACHMENTS_BUCKET="mpcontribs-attachments-{{ cfg.s3 }}", S3_IMAGES_BUCKET="mpcontribs-images-{{ cfg.s3 }}", - ADMIN_GROUP="admin_{{ deployment }}.materialsproject.org" + MPCONTRIBS_MONGO__ADMIN_GROUP="admin_{{ deployment }}.materialsproject.org" {% endset %} [program:{{ deployment }}-worker] From 8cc2c23c427c7510762f07caba8afaa583bf5764 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 18 Jun 2026 12:24:09 -0700 Subject: [PATCH 151/591] Changed example kwargs to new specs --- mpcontribs-api/.env.example | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mpcontribs-api/.env.example b/mpcontribs-api/.env.example index dd2540996c..2bc5ce6f6f 100644 --- a/mpcontribs-api/.env.example +++ b/mpcontribs-api/.env.example @@ -3,8 +3,8 @@ MPCONTRIBS_ENVIRONMENT=dev MPCONTRIBS_MONGO__URI=mongodb+srv://:@host.hash.mongodb.net/?appName=database-name MPCONTRIBS_MONGO__DB_NAME=database-name -MPCONTRIBS_REDIS_ADDRESS=redis-address # placeholder; not used yet -MPCONTRIBS_REDIS_URL=redis-url +MPCONTRIBS_REDIS__ADDRESS=redis-address # placeholder; not used yet +MPCONTRIBS_REDIS__URL=redis-url MPCONTRIBS_MAIL_DEFAULT_SENDER=mail-default-sender # placeholder; not used yet From 3acff74c91cb178bd4588173efef4947182bec8d Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 18 Jun 2026 12:24:34 -0700 Subject: [PATCH 152/591] Added back n start_rq.sh so build succeeds --- mpcontribs-api/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mpcontribs-api/Dockerfile b/mpcontribs-api/Dockerfile index a7b12daba8..741922e7cb 100644 --- a/mpcontribs-api/Dockerfile +++ b/mpcontribs-api/Dockerfile @@ -26,7 +26,7 @@ COPY supervisord supervisord COPY scripts scripts COPY main.py . COPY docker-entrypoint.sh . -RUN chmod +x main.py scripts/start.sh docker-entrypoint.sh +RUN chmod +x main.py scripts/start.sh scripts/start_rq.sh docker-entrypoint.sh ARG VERSION # Telemetry (traces/metrics/logs) is emitted via OTLP to the Datadog Agent's OTLP receiver; the From 48dce53c185a144ca68f9518015d147421d55187 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 18 Jun 2026 12:24:54 -0700 Subject: [PATCH 153/591] Added lines to ignore build artifacts --- mpcontribs-api/.gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mpcontribs-api/.gitignore b/mpcontribs-api/.gitignore index ce7322d6e6..edd9d60a7a 100644 --- a/mpcontribs-api/.gitignore +++ b/mpcontribs-api/.gitignore @@ -1 +1,2 @@ -src/mpcontribs_api/old +build/ +dist/ From 0280950903c04c7233fb3572774d8e1155154f9a Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 18 Jun 2026 12:25:19 -0700 Subject: [PATCH 154/591] Modernized claude.md --- mpcontribs-api/CLAUDE.md | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/mpcontribs-api/CLAUDE.md b/mpcontribs-api/CLAUDE.md index 3797e1dcf4..ef6f146b60 100644 --- a/mpcontribs-api/CLAUDE.md +++ b/mpcontribs-api/CLAUDE.md @@ -32,7 +32,6 @@ Copy `.env.example` to `.env`. Key variables (all prefixed `MPCONTRIBS_`): - `MONGO__URI` — MongoDB Atlas URI - `MONGO__DB_NAME` — database name -- `KONG__GATEWAY_SECRET` — shared secret for verifying requests came through Kong - `ENVIRONMENT` — `dev` or `prod` (controls log format and debug mode) ## Architecture @@ -50,19 +49,23 @@ Routers are registered in `src/mpcontribs_api/api/v1/router.py`. ### Authentication and authorization -Kong injects user identity via headers; `auth.py` parses them into a frozen `User` model. The dependency chain is: +Kong injects user identity via headers; `dependencies.get_user` parses them into a frozen `User` model (`authz.py`). The dependency chain is: - `UserDep` — any caller (anonymous or authenticated) -- `AuthedDep` — requires authenticated user (raises 401 otherwise) +- `AuthedDep` / `require_user` — requires an authenticated user (raises 401 otherwise) - `require_role(role)` — factory returning a dependency that requires a specific group membership +All mutating endpoints (POST/PUT/PATCH/DELETE) depend on `require_user`, so anonymous callers get 401; read endpoints (GET) stay open and rely on scope to filter results. + All database access goes through a repository instantiated with the current `User`. The repository's `_scope` dict is injected into every MongoDB query automatically: - **Admins** (members of `mongo.admin_group`): no filter applied - **Authenticated users**: see public+approved data, own resources (`owner == username`), and group resources - **Anonymous**: public + approved only -`verify_gateway()` in `dependencies.py` validates the `x-gateway-secret` header to ensure Kong was the actual caller. +Components (structures/tables/attachments) have no access field of their own; their reads and deletes are gated by whether an in-scope contribution references them (see `ContributionService`/`ComponentService`). + +**Trust boundary:** the service is only reachable through Kong, which terminates auth and sets the identity headers. There is no in-app gateway-secret check today — the deployment network is the boundary, so the identity headers are trusted. If the service is ever exposed off the Kong path, add a gateway-secret (or mTLS) check before trusting those headers. ### Repository pattern From 23494a13b2aa57b629d7b3c8194ef5cbae4fdae9 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 18 Jun 2026 12:25:41 -0700 Subject: [PATCH 155/591] Pointed setuptools at the right repo - src --- mpcontribs-api/pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mpcontribs-api/pyproject.toml b/mpcontribs-api/pyproject.toml index 1849dbfb4e..b41f4935c7 100644 --- a/mpcontribs-api/pyproject.toml +++ b/mpcontribs-api/pyproject.toml @@ -11,7 +11,7 @@ include-package-data = true [tool.setuptools.packages.find] where = ["src"] -include = ["mpcontribs.api*"] +include = ["mpcontribs_api*"] [project] name = "mpcontribs-api" From 08624847678bcc0b692dfcb6c2be89112caf0aad Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 18 Jun 2026 12:26:05 -0700 Subject: [PATCH 156/591] Added and fixed tests --- mpcontribs-api/tests/integration/conftest.py | 4 + .../db/test_component_reachability.py | 85 +++++++++++++++++++ .../integration/test_component_routes.py | 54 ++++++++++++ .../integration/test_contributions_routes.py | 62 ++++++++++++++ .../tests/integration/test_projects.py | 35 ++++++++ mpcontribs-api/tests/unit/test_packaging.py | 35 ++++++++ .../tests/unit/test_supervisord_render.py | 65 ++++++++++++++ 7 files changed, 340 insertions(+) create mode 100644 mpcontribs-api/tests/integration/db/test_component_reachability.py create mode 100644 mpcontribs-api/tests/unit/test_packaging.py create mode 100644 mpcontribs-api/tests/unit/test_supervisord_render.py diff --git a/mpcontribs-api/tests/integration/conftest.py b/mpcontribs-api/tests/integration/conftest.py index 1ee624cca0..d46a85689d 100644 --- a/mpcontribs-api/tests/integration/conftest.py +++ b/mpcontribs-api/tests/integration/conftest.py @@ -33,6 +33,10 @@ def _mock_beanie_collection(): ANON_HEADERS: dict[str, str] = {} +# Forces anonymity even when the client carries default auth headers: get_user() +# treats x-anonymous-consumer == "true" as anonymous regardless of other headers. +FORCE_ANON_HEADERS = {"x-anonymous-consumer": "true"} + AUTHED_HEADERS = { "x-consumer-username": "google:alice@example.com", "x-consumer-id": "test-consumer-id", diff --git a/mpcontribs-api/tests/integration/db/test_component_reachability.py b/mpcontribs-api/tests/integration/db/test_component_reachability.py new file mode 100644 index 0000000000..d5175b68e5 --- /dev/null +++ b/mpcontribs-api/tests/integration/db/test_component_reachability.py @@ -0,0 +1,85 @@ +"""End-to-end reachability gating for component reads. + +Components (structures/tables/attachments) carry no access field of their own. Visibility is +gated by whether a contribution the caller can see references the component. These tests drive the +real ComponentService against MongoDB to confirm reads only surface reachable components. +""" + +import pytest +from beanie import PydanticObjectId + +from mpcontribs_api.authz import User +from mpcontribs_api.domains._shared.service import ComponentService +from mpcontribs_api.domains.attachments.models import Attachment, AttachmentFilter +from mpcontribs_api.domains.attachments.repository import MongoDbAttachmentRepository +from mpcontribs_api.domains.contributions.models import Contribution +from mpcontribs_api.domains.contributions.repository import MongoDbContributionRepository +from mpcontribs_api.pagination import CursorParams + +pytestmark = [pytest.mark.db, pytest.mark.asyncio(loop_scope="session")] + +ANON = User() + + +def _service(user: User) -> ComponentService: + return ComponentService( + MongoDbAttachmentRepository(user), + MongoDbContributionRepository(user), + ref_field="attachments", + ) + + +async def _attachment(md5: str) -> Attachment: + doc = Attachment(_id=PydanticObjectId(), name="d.csv", md5=md5, mime="application/gzip", content=1) + await doc.insert() + return doc + + +async def _contribution(*, is_public: bool, attachments: list[Attachment]) -> Contribution: + doc = Contribution( + _id=PydanticObjectId(), + project="reach-proj", + identifier=f"mp-{md5[:6]}" if (md5 := attachments[0].md5) else "mp-x", + formula="Fe2O3", + data={"x": 1}, + is_public=is_public, + attachments=attachments, + ) + await doc.insert() + return doc + + +class TestComponentReadReachability: + async def test_get_by_id_returns_reachable_component(self, db): + att = await _attachment("a" * 32) + await _contribution(is_public=True, attachments=[att]) + result = await _service(ANON).get_by_id(str(att.id), fields=None) + assert result is not None + assert result.id == att.id + + async def test_get_by_id_hides_unreachable_component(self, db): + att = await _attachment("b" * 32) + # Referenced only by a private contribution -> anonymous cannot reach it. + await _contribution(is_public=False, attachments=[att]) + result = await _service(ANON).get_by_id(str(att.id), fields=None) + assert result is None + + async def test_get_by_id_hides_orphan_component(self, db): + # No contribution references this attachment at all. + att = await _attachment("c" * 32) + result = await _service(ANON).get_by_id(str(att.id), fields=None) + assert result is None + + async def test_get_many_only_lists_reachable(self, db): + pub = await _attachment("d" * 32) + priv = await _attachment("e" * 32) + orphan = await _attachment("f" * 32) + await _contribution(is_public=True, attachments=[pub]) + await _contribution(is_public=False, attachments=[priv]) + + page = await _service(ANON).get_many(filter=AttachmentFilter(), pagination=CursorParams(), fields=None) + ids = {item.id for item in page.items} + + assert pub.id in ids + assert priv.id not in ids + assert orphan.id not in ids diff --git a/mpcontribs-api/tests/integration/test_component_routes.py b/mpcontribs-api/tests/integration/test_component_routes.py index 09ecdfece2..9bdc7ceb98 100644 --- a/mpcontribs-api/tests/integration/test_component_routes.py +++ b/mpcontribs-api/tests/integration/test_component_routes.py @@ -10,6 +10,7 @@ from mpcontribs_api.domains.tables.dependencies import get_table_service from mpcontribs_api.domains.tables.models import TableOut from mpcontribs_api.pagination import Page +from tests.integration.conftest import AUTHED_HEADERS, FORCE_ANON_HEADERS # --------------------------------------------------------------------------- # Fixtures: every component endpoint routes through the unified ComponentService, @@ -17,6 +18,17 @@ # --------------------------------------------------------------------------- +@pytest.fixture(autouse=True) +def _authenticate(client): + """Mutating component endpoints now require an authenticated caller. + + These route tests exercise mutations, so default the shared client to an + authenticated identity. Anonymous-rejection is covered explicitly by the + *RequireAuth tests, which force anonymity with FORCE_ANON_HEADERS. + """ + client.headers.update(AUTHED_HEADERS) + + @pytest.fixture def structure_service(test_app): mock = AsyncMock() @@ -268,3 +280,45 @@ def test_csv_filename_uses_csv_extension(self, client, download_target): prefix, *_ = download_target cd = client.get(f"/api/v1/{prefix}/download/gz?format=csv").headers["content-disposition"] assert ".csv.gz" in cd + + +# =========================================================================== +# Authentication enforcement: component mutations require an authenticated user +# =========================================================================== + + +class TestComponentMutationsRequireAuth: + def test_structures_post_anon_401(self, client, structure_service): + r = client.post("/api/v1/structures", json=[], headers=FORCE_ANON_HEADERS) + assert r.status_code == 401 + structure_service.insert.assert_not_called() + + def test_structures_delete_anon_401(self, client, structure_service): + r = client.delete("/api/v1/structures", headers=FORCE_ANON_HEADERS) + assert r.status_code == 401 + structure_service.delete.assert_not_called() + + def test_structure_delete_by_id_anon_401(self, client, structure_service): + r = client.delete(f"/api/v1/structures/{PydanticObjectId()}", headers=FORCE_ANON_HEADERS) + assert r.status_code == 401 + structure_service.delete_by_id.assert_not_called() + + def test_structure_patch_by_id_anon_401(self, client, structure_service): + r = client.patch(f"/api/v1/structures/{PydanticObjectId()}", json={"name": "x"}, headers=FORCE_ANON_HEADERS) + assert r.status_code == 401 + structure_service.patch_by_id.assert_not_called() + + def test_tables_delete_anon_401(self, client, table_service): + r = client.delete("/api/v1/tables", headers=FORCE_ANON_HEADERS) + assert r.status_code == 401 + table_service.delete.assert_not_called() + + def test_attachment_delete_by_id_anon_401(self, client, attachment_service): + r = client.delete(f"/api/v1/attachments/{PydanticObjectId()}", headers=FORCE_ANON_HEADERS) + assert r.status_code == 401 + attachment_service.delete_by_id.assert_not_called() + + def test_structures_get_still_open_to_anon(self, client, structure_service): + structure_service.get_many.return_value = Page(items=[], next_cursor=None) + r = client.get("/api/v1/structures", headers=FORCE_ANON_HEADERS) + assert r.status_code == 200 diff --git a/mpcontribs-api/tests/integration/test_contributions_routes.py b/mpcontribs-api/tests/integration/test_contributions_routes.py index 0b975ad5a8..06fc77c509 100644 --- a/mpcontribs-api/tests/integration/test_contributions_routes.py +++ b/mpcontribs-api/tests/integration/test_contributions_routes.py @@ -8,12 +8,24 @@ ) from mpcontribs_api.domains.contributions.models import ContributionOut from mpcontribs_api.exceptions import NotFoundError +from tests.integration.conftest import AUTHED_HEADERS, FORCE_ANON_HEADERS # --------------------------------------------------------------------------- # Fixtures # --------------------------------------------------------------------------- +@pytest.fixture(autouse=True) +def _authenticate(client): + """Mutating contribution endpoints now require an authenticated caller. + + Default the shared client to an authenticated identity so the existing + mutation tests still exercise the handler; anonymous-rejection is covered + explicitly by TestContributionMutationsRequireAuth via FORCE_ANON_HEADERS. + """ + client.headers.update(AUTHED_HEADERS) + + @pytest.fixture def contribution_repo(test_app, mock_contribution_repo): test_app.dependency_overrides[get_scoped_contributions] = lambda: mock_contribution_repo @@ -236,3 +248,53 @@ def test_repo_error_surfaces_as_uniform_json(self, client, contribution_repo): r = client.get("/api/v1/contributions/download/gz") assert r.status_code == 404 assert r.json()["error"]["code"] == "not_found" + + +# --------------------------------------------------------------------------- +# Authentication enforcement: contribution mutations require an authenticated user +# --------------------------------------------------------------------------- + + +class TestContributionMutationsRequireAuth: + def test_post_anon_401(self, client, contribution_service): + r = client.post("/api/v1/contributions", json=[], headers=FORCE_ANON_HEADERS) + assert r.status_code == 401 + assert r.json()["error"]["code"] == "authentication_error" + contribution_service.insert_contributions.assert_not_called() + + def test_put_collection_anon_401(self, client, contribution_service): + r = client.put("/api/v1/contributions", json=[], headers=FORCE_ANON_HEADERS) + assert r.status_code == 401 + contribution_service.upsert_contributions.assert_not_called() + + def test_delete_collection_anon_401(self, client, contribution_repo): + r = client.delete("/api/v1/contributions", headers=FORCE_ANON_HEADERS) + assert r.status_code == 401 + contribution_repo.delete_contributions.assert_not_called() + + def test_delete_by_id_anon_401(self, client, contribution_service): + r = client.delete(f"/api/v1/contributions/{PydanticObjectId()}", headers=FORCE_ANON_HEADERS) + assert r.status_code == 401 + + def test_put_by_id_anon_401(self, client, contribution_repo): + r = client.put( + f"/api/v1/contributions/{PydanticObjectId()}", + json=_valid_contribution_body(), + headers=FORCE_ANON_HEADERS, + ) + assert r.status_code == 401 + contribution_repo.upsert_contribution_by_id.assert_not_called() + + def test_patch_by_id_anon_401(self, client, contribution_repo): + r = client.patch( + f"/api/v1/contributions/{PydanticObjectId()}", json={"formula": "H2O"}, headers=FORCE_ANON_HEADERS + ) + assert r.status_code == 401 + contribution_repo.patch_contribution_by_id.assert_not_called() + + def test_get_collection_still_open_to_anon(self, client, contribution_repo): + from mpcontribs_api.pagination import Page + + contribution_repo.get_contributions.return_value = Page(items=[], next_cursor=None) + r = client.get("/api/v1/contributions", headers=FORCE_ANON_HEADERS) + assert r.status_code == 200 diff --git a/mpcontribs-api/tests/integration/test_projects.py b/mpcontribs-api/tests/integration/test_projects.py index 634a17e7cb..0f98857923 100644 --- a/mpcontribs-api/tests/integration/test_projects.py +++ b/mpcontribs-api/tests/integration/test_projects.py @@ -259,3 +259,38 @@ def test_missing_required_field_returns_422(self, client, project_repo): del body["title"] r = client.put("/api/v1/projects/mp-sample", json=body, headers=AUTHED_HEADERS) assert r.status_code == 422 + + +# --------------------------------------------------------------------------- +# Authentication enforcement: mutations require an authenticated user +# --------------------------------------------------------------------------- + + +class TestProjectMutationsRequireAuth: + def _body(self): + return { + "_id": "mp-sample", + "title": "Test Project", + "authors": "Alice", + "description": "A project", + "owner": "google:alice@example.com", + "unique_identifiers": True, + "stats": {"columns": 0, "contributions": 0, "tables": 0, "structures": 0, "attachments": 0, "size": 0.0}, + } + + def test_anonymous_put_returns_401(self, client, project_repo): + project_repo.upsert_project_by_id.return_value = SAMPLE_PROJECT + r = client.put("/api/v1/projects/mp-sample", json=self._body(), headers=ANON_HEADERS) + assert r.status_code == 401 + assert r.json()["error"]["code"] == "authentication_error" + project_repo.upsert_project_by_id.assert_not_called() + + def test_anonymous_patch_returns_401(self, client, project_repo): + r = client.patch("/api/v1/projects/mp-sample", json={"title": "Updated Title"}, headers=ANON_HEADERS) + assert r.status_code == 401 + project_repo.patch_project_by_id.assert_not_called() + + def test_anonymous_delete_returns_401(self, client, project_repo): + r = client.delete("/api/v1/projects/mp-sample", headers=ANON_HEADERS) + assert r.status_code == 401 + project_repo.delete_project_by_id.assert_not_called() diff --git a/mpcontribs-api/tests/unit/test_packaging.py b/mpcontribs-api/tests/unit/test_packaging.py new file mode 100644 index 0000000000..9f5fabdf58 --- /dev/null +++ b/mpcontribs-api/tests/unit/test_packaging.py @@ -0,0 +1,35 @@ +"""Guards against the src-layout packaging regression where the built wheel shipped no code. + +The wheel must contain the importable package so the Docker image's +``uvicorn mpcontribs_api.app:app`` can resolve the module. +""" + +import shutil +import subprocess +import zipfile +from pathlib import Path + +import pytest + +PROJECT_ROOT = Path(__file__).resolve().parents[2] + + +@pytest.mark.skipif(shutil.which("uv") is None, reason="uv not available") +def test_wheel_contains_package(tmp_path: Path) -> None: + result = subprocess.run( + ["uv", "build", "--wheel", "--out-dir", str(tmp_path)], + cwd=PROJECT_ROOT, + env={"SETUPTOOLS_SCM_PRETEND_VERSION": "0.0.0", "PATH": __import__("os").environ.get("PATH", "")}, + capture_output=True, + text=True, + ) + assert result.returncode == 0, f"uv build failed: {result.stderr}" + + wheels = list(tmp_path.glob("*.whl")) + assert wheels, "no wheel produced" + + with zipfile.ZipFile(wheels[0]) as zf: + names = zf.namelist() + assert any(n == "mpcontribs_api/app.py" for n in names), ( + f"wheel is missing the package code; top entries: {sorted(names)[:10]}" + ) diff --git a/mpcontribs-api/tests/unit/test_supervisord_render.py b/mpcontribs-api/tests/unit/test_supervisord_render.py new file mode 100644 index 0000000000..19e660318c --- /dev/null +++ b/mpcontribs-api/tests/unit/test_supervisord_render.py @@ -0,0 +1,65 @@ +"""The rendered supervisord config must export the env vars the new pydantic Settings require. + +The FastAPI rewrite reads nested settings via the ``MPCONTRIBS___`` convention. This +guards against regressing the supervisord template back to the Flask-era flat names, which would +make the container fail Settings validation at startup. +""" + +from pathlib import Path + +import pytest +from jinja2 import Environment, FileSystemLoader + +SUPERVISORD_DIR = Path(__file__).resolve().parents[2] / "supervisord" + +# Names the new Settings model needs present in the process environment. +REQUIRED_ENV_NAMES = [ + "MPCONTRIBS_ENVIRONMENT", + "MPCONTRIBS_MONGO__URI", + "MPCONTRIBS_MONGO__DB_NAME", + "MPCONTRIBS_REDIS__ADDRESS", + "MPCONTRIBS_REDIS__URL", + "MPCONTRIBS_MAIL_DEFAULT_SENDER", + "MPCONTRIBS_VERSION", + "MPCONTRIBS_OTEL__OTLP_ENDPOINT", +] + + +def _render() -> str: + env = Environment(loader=FileSystemLoader(str(SUPERVISORD_DIR))) + template = env.get_template("supervisord.conf.jinja") + return template.render( + production=True, + environment="prod", + version="1.2.3", + deployments={ + "ml": { + "api_port": "10002", + "portal_port": 8082, + "db": "ml", + "s3": "ml", + "tm": "MP", + "max_projects": 3, + } + }, + nworkers=2, + reload=0, + node_env="production", + flask_debug=False, + flask_log_level="INFO", + jupyter_gateway_url="http://localhost:10100", + jupyter_gateway_host="localhost:10100", + otel_endpoint="localhost:4317", + mpcontribs_api_host="localhost", + ) + + +@pytest.mark.parametrize("name", REQUIRED_ENV_NAMES) +def test_required_env_name_present(name: str) -> None: + assert name in _render() + + +def test_no_stale_flat_mongo_db_name() -> None: + rendered = _render() + # The old flat name must not appear as an assignment (the nested name is required instead). + assert "MPCONTRIBS_DB_NAME=" not in rendered From 0521e7cf8af1001a548f2e840dc5c927c68f57db Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 18 Jun 2026 12:26:19 -0700 Subject: [PATCH 157/591] Formatting --- mpcontribs-api/src/mpcontribs_api/domains/healthcheck/router.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/healthcheck/router.py b/mpcontribs-api/src/mpcontribs_api/domains/healthcheck/router.py index e099971ab6..88abea6a91 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/healthcheck/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/healthcheck/router.py @@ -28,7 +28,7 @@ async def healthcheck(db: DbDep, s3_client: S3Dep) -> HealthStatus: try: await s3_client.head_bucket(Bucket=settings.aws.health_bucket) - except (ClientError, BotoCoreError): + except ClientError, BotoCoreError: raise HTTPException( status_code=status.HTTP_503_SERVICE_UNAVAILABLE, detail={"status": "unhealthy", "s3": "unreachable"}, From 507c11ee01f20a389403556bebc520e25caf2d99 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 18 Jun 2026 12:29:14 -0700 Subject: [PATCH 158/591] Removing accidental commit of build artifacts --- .../build/lib/mpcontribs_api/api/v1/router.py | 15 - .../domains/_shared/components.py | 139 -------- .../domains/_shared/repository.py | 319 ----------------- .../mpcontribs_api/domains/_shared/service.py | 172 --------- .../domains/attachments/repository.py | 15 - .../domains/attachments/router.py | 77 ---- .../domains/contributions/repository.py | 266 -------------- .../domains/contributions/router.py | 117 ------- .../domains/contributions/service.py | 328 ------------------ .../domains/healthcheck/router.py | 37 -- .../domains/projects/repository.py | 111 ------ .../mpcontribs_api/domains/projects/router.py | 121 ------- .../domains/structures/repository.py | 15 - .../domains/structures/router.py | 95 ----- .../domains/tables/repository.py | 13 - .../mpcontribs_api/domains/tables/router.py | 95 ----- 16 files changed, 1935 deletions(-) delete mode 100644 mpcontribs-api/build/lib/mpcontribs_api/api/v1/router.py delete mode 100644 mpcontribs-api/build/lib/mpcontribs_api/domains/_shared/components.py delete mode 100644 mpcontribs-api/build/lib/mpcontribs_api/domains/_shared/repository.py delete mode 100644 mpcontribs-api/build/lib/mpcontribs_api/domains/_shared/service.py delete mode 100644 mpcontribs-api/build/lib/mpcontribs_api/domains/attachments/repository.py delete mode 100644 mpcontribs-api/build/lib/mpcontribs_api/domains/attachments/router.py delete mode 100644 mpcontribs-api/build/lib/mpcontribs_api/domains/contributions/repository.py delete mode 100644 mpcontribs-api/build/lib/mpcontribs_api/domains/contributions/router.py delete mode 100644 mpcontribs-api/build/lib/mpcontribs_api/domains/contributions/service.py delete mode 100644 mpcontribs-api/build/lib/mpcontribs_api/domains/healthcheck/router.py delete mode 100644 mpcontribs-api/build/lib/mpcontribs_api/domains/projects/repository.py delete mode 100644 mpcontribs-api/build/lib/mpcontribs_api/domains/projects/router.py delete mode 100644 mpcontribs-api/build/lib/mpcontribs_api/domains/structures/repository.py delete mode 100644 mpcontribs-api/build/lib/mpcontribs_api/domains/structures/router.py delete mode 100644 mpcontribs-api/build/lib/mpcontribs_api/domains/tables/repository.py delete mode 100644 mpcontribs-api/build/lib/mpcontribs_api/domains/tables/router.py diff --git a/mpcontribs-api/build/lib/mpcontribs_api/api/v1/router.py b/mpcontribs-api/build/lib/mpcontribs_api/api/v1/router.py deleted file mode 100644 index 13dab175ce..0000000000 --- a/mpcontribs-api/build/lib/mpcontribs_api/api/v1/router.py +++ /dev/null @@ -1,15 +0,0 @@ -from fastapi import APIRouter - -from mpcontribs_api.domains.attachments.router import router as attachments_router -from mpcontribs_api.domains.contributions.router import router as contributions_router -from mpcontribs_api.domains.projects.router import router as projects_router -from mpcontribs_api.domains.structures.router import router as structures_router -from mpcontribs_api.domains.tables.router import router as tables_router - -router = APIRouter() - -router.include_router(attachments_router, prefix="/attachments", tags=["attachments"]) -router.include_router(contributions_router, prefix="/contributions", tags=["contributions"]) -router.include_router(projects_router, prefix="/projects", tags=["projects"]) -router.include_router(structures_router, prefix="/structures", tags=["structures"]) -router.include_router(tables_router, prefix="/tables", tags=["tables"]) diff --git a/mpcontribs-api/build/lib/mpcontribs_api/domains/_shared/components.py b/mpcontribs-api/build/lib/mpcontribs_api/domains/_shared/components.py deleted file mode 100644 index 196dde4528..0000000000 --- a/mpcontribs-api/build/lib/mpcontribs_api/domains/_shared/components.py +++ /dev/null @@ -1,139 +0,0 @@ -from typing import Any - -from beanie import PydanticObjectId -from beanie.operators import In -from fastapi_filter.contrib.beanie import Filter -from pydantic import BaseModel -from pymongo.asynchronous.client_session import AsyncClientSession - -from mpcontribs_api.authz import User -from mpcontribs_api.config import get_settings -from mpcontribs_api.domains._shared.models import Component, DeleteResponse, DocumentOut -from mpcontribs_api.domains._shared.repository import MongoDbRepository -from mpcontribs_api.domains._shared.types import MD5Hash - - -class MongoDbComponentsRepository[ - TDoc: Component, - TIn: Component, - TOut: DocumentOut, - TFilter: Filter, - TPatch: BaseModel, -](MongoDbRepository[TDoc, TIn, TOut, TFilter, TPatch]): - @staticmethod - def _build_scope(user: User) -> dict[str, Any]: - return {} - - async def _check_existing( - self, - components: list[TIn] | TIn, - session: AsyncClientSession | None = None, - ) -> tuple[dict[MD5Hash, TIn], dict[str, TDoc]]: - if not isinstance(components, list): - components = [components] - by_md5 = {comp.md5: comp for comp in components} - - # Full fetch so existing docs come back with their ids - # TODO: Most likely does a COLLSCAN - see if we can project to get a COVERED QUERY - existing_docs = await self.document_model.find( - In(self.document_model.md5, list(by_md5.keys())), - session=session, - ).to_list() - return (by_md5, {doc.md5: doc for doc in existing_docs}) - - async def insert_components( - self, - components: list[TIn], - session: AsyncClientSession | None = None, - ) -> list[TDoc]: - """Bulk-insert components, chunked to fit within a transaction's payload budget. - - Args: - components (list[TIn]): components to insert - session (AsyncClientSession): optional client session; pass when inserting inside a transaction - """ - by_md5, existing_by_md5 = await self._check_existing(components=components, session=session) - # Assign ids manually: insert_many won't populate id back onto these - # objects, and get_dict drops id when it's None. - new_docs: list[TDoc] = [] - for md5, comp in by_md5.items(): - if md5 in existing_by_md5: - continue - doc = self.document_model.model_validate(comp.model_dump()) - doc.id = PydanticObjectId() - new_docs.append(doc) - - # TODO: Might want to delegate this logic to a higher level - # - This method might want to simply insert everything it's given - # Insert by chunks - chunk_size = get_settings().mongo.component_insert_chunk_size - for start in range(0, len(new_docs), chunk_size): - await self.document_model.insert_many( - new_docs[start : start + chunk_size], - ordered=False, - session=session, - ) - - # Return a list of documents reflecting what was stored/found - resolved = existing_by_md5 | {doc.md5: doc for doc in new_docs} - return [resolved[md5] for md5 in by_md5] - - async def insert_component(self, component: TIn, *, session: AsyncClientSession | None = None) -> TDoc: - """Insert a single component. - - Args: - component (TIn): the table to insert - - Returns: - TDoc: the component actually in the database - - Raises: - AppError: If insert_one returns None, raises - """ - return (await self.insert_components(components=[component], session=session))[0] - - async def get_component_by_id(self, id: str, fields: frozenset[str] | None) -> TDoc | TOut | None: - """Find a single component by id. See ``get_by_id``. - - The id must be converted to an ObjectId first; ``get_by_id`` compares against the - ObjectId ``_id`` and a raw string would never match. - """ - return await self.get_by_id(self._convert_object_id(id), fields) - - async def delete_components( - self, - filter: TFilter, - session: AsyncClientSession | None = None, - ) -> DeleteResponse: - """Deletes all components matching ``filter``. - - Args: - filter (TFilter): the query to filter components by - session (AsyncClientSession | None): the current session, used to guarantee transactions - - Returns: - DeleteResponse: A report of the deletion - """ - query = filter.filter(self.document_model.find(self._scope, session=session)) - result = await query.delete(session=session) - return DeleteResponse(num_deleted=result.deleted_count if result else 0) - - async def delete_component_by_id( - self, - id: str, - session: AsyncClientSession | None = None, - ) -> DeleteResponse: - """Deletes a single component by Id. - - Args: - id (str): the str representation of the component's ObjectId - session (AsyncClientSession | None): the current session, used to guarantee transactions - - Returns: - DeleteResponse: A report of the deletion - """ - return await self.delete_by_id(id=self._convert_object_id(id), session=session) - - async def patch_component_by_id(self, id: str, update: TPatch) -> TDoc: - """Partially update a component by id, scoped to the current user. See ``patch``.""" - return await self.patch(self._convert_object_id(id), update) diff --git a/mpcontribs-api/build/lib/mpcontribs_api/domains/_shared/repository.py b/mpcontribs-api/build/lib/mpcontribs_api/domains/_shared/repository.py deleted file mode 100644 index 36f089fb9a..0000000000 --- a/mpcontribs-api/build/lib/mpcontribs_api/domains/_shared/repository.py +++ /dev/null @@ -1,319 +0,0 @@ -import csv -import hashlib -import io -import json -import zlib -from abc import ABC, abstractmethod -from collections.abc import AsyncIterable, AsyncIterator, Callable, Iterable -from contextlib import AbstractAsyncContextManager -from typing import Any - -from beanie import PydanticObjectId, UpdateResponse -from beanie.operators import In, Set -from bson.errors import InvalidId -from fastapi_filter.contrib.beanie import Filter -from pydantic import BaseModel -from pymongo.asynchronous.client_session import AsyncClientSession -from types_aiobotocore_s3 import S3Client - -from mpcontribs_api.authz import User -from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DeleteResponse, DocumentOut -from mpcontribs_api.domains._shared.types import DownloadFormat, ShortMimeFormat -from mpcontribs_api.exceptions import ConflictError, NotFoundError, ValidationError -from mpcontribs_api.pagination import CursorParams, Page, encode_cursor - - -class MongoDbRepository[ - TDoc: BaseDocumentWithInput, - TIn: BaseModel, - TOut: DocumentOut, - TFilter: Filter, - TPatch: BaseModel, -](ABC): - """Base repository encapsulating shared MongoDB access patterns. - - Subclasses bind the document, input, output, filter, and patch types as type parameters, set - the matching ``document_model`` / ``out_model`` class attributes, and implement ``_build_scope`` - to enforce per-user authorization. Shared CRUD logic (scoping, projection, cursor pagination, - insertion, single-document read/patch/delete) lives here so it exists in exactly one place and - cannot drift between resources. Subclasses expose domain-named methods that either forward to a - base method (vocabulary + concrete types for routers, no logic) or implement a genuinely - different shape (bulk insert, compound-key upsert, download). - - Attributes: - document_model: the ``BaseDocumentWithInput`` subclass this repository operates on - out_model: the ``SparseFieldsModel`` subclass used to build projections for reads - _scope (dict[str, Any]): terms injected into every query to enforce user authorization - """ - - document_model: type[TDoc] - out_model: type[TOut] - - def __init__(self, user: User) -> None: - """Initializes an instance based on the current user. - - Args: - user (User): the current user requesting resources - """ - self._scope = self._build_scope(user) - - @staticmethod - @abstractmethod - def _build_scope(user: User) -> dict[str, Any]: - """Provides scope based on current user's permitted groups and publicly released data.""" - ... - - def _convert_object_id(self, id: str) -> PydanticObjectId: - """Converts the string representation of an ObjectId to an ObjectId""" - try: - return PydanticObjectId(id) - except InvalidId: - raise ValidationError("Incorrect Id format. Must be MongoDB ObjectId format.", id=id) from None - - def _not_found(self, id: str) -> str: - """Build a not-found message naming this repository's resource.""" - return f"{self.document_model.__name__} with id {id} not found" - - async def get_many( - self, - filter: TFilter, - fields: frozenset[str] | None = None, - pagination: CursorParams | None = None, - restrict_ids: Iterable[Any] | None = None, - ) -> Page[TOut]: - """Return a scoped, filtered, cursor-paginated page of projected documents. - - Args: - pagination (CursorParams): forward-only cursor parameters - filter (TFilter): the fastapi-filter query to apply on top of the user scope - fields (frozenset[str] | None): fields to project; if None the full document is returned - restrict_ids (Iterable | None): when provided, results are limited to these ids in - addition to the user scope. An empty iterable yields an empty page. Used to gate - reads that are authorized indirectly (e.g. components reachable via a contribution). - """ - pagination = pagination or CursorParams() - - projection = self.out_model.projection(fields) - query = filter.filter(self.document_model.find(self._scope)) - if restrict_ids is not None: - query = query.find(In(self.document_model.id, list(restrict_ids))) - if pagination.cursor is not None: - query = query.find(self.document_model.id > self.document_model.decode_cursor(cursor=pagination.cursor)) # pyright: ignore[reportOptionalOperand] - docs = await query.sort(self.document_model.id).limit(pagination.limit + 1).project(projection).to_list() # pyright: ignore[reportArgumentType] - has_more = len(docs) > pagination.limit - items = docs[: pagination.limit] - next_cursor = encode_cursor(str(items[-1].id)) if has_more and items else None - return Page(items=items, next_cursor=next_cursor) - - async def get_by_id(self, id: Any, fields: frozenset[str] | None) -> TDoc | TOut | None: - """Return a single scoped document by id, projected to the requested fields. - - Args: - id (str): the id of the document to find - fields (frozenset[str] | None): fields to project; if None the full document is returned - """ - return await self.document_model.find_one( - self._scope, - self.document_model.id == id, - projection_model=self.out_model.projection(fields), - ) - - async def list_ids(self, filter: TFilter, session: AsyncClientSession | None = None) -> list[Any]: - """Return just the ids of scoped documents matching ``filter``. - - Projects to ``{"_id": 1}`` so the lookup can be served as a covered query from the - default ``_id`` index without materializing full documents. - - Args: - filter (TFilter): the fastapi-filter query to apply on top of the user scope - session (AsyncClientSession | None): optional client session for transactions - """ - projection = self.out_model.projection(frozenset({"id"})) - query = filter.filter(self.document_model.find(self._scope, session=session)) - docs = await query.project(projection).to_list() - return [doc.id for doc in docs] - - async def insert_one(self, in_resource: TIn) -> TDoc: - """Insert a new document built from its input model, rejecting duplicate ids. - - Args: - in_resource (TIn): the validated input payload to translate and store - """ - document = self.document_model.from_input_model(in_resource) - existing = await self.document_model.find_one(self.document_model.id == document.id) - if existing: - raise ConflictError(f"Cannot insert document.\n Document with ID {document.id} exists") - await document.insert() - return document - - async def delete_by_id(self, id: Any, session: AsyncClientSession | None = None) -> DeleteResponse: - """Delete a single scoped document by id. - - Scoping ensures callers cannot delete documents they are not permitted to see. - - Args: - id (str): the id of the document to delete - """ - doc = await self.document_model.find_one(self._scope, self.document_model.id == id, session=session) - if not doc: - raise NotFoundError("Document with id not found", id=id) - await doc.delete(session=session) - return DeleteResponse(num_deleted=1) - - async def delete_by_ids(self, ids: list[Any], session: AsyncClientSession | None = None) -> DeleteResponse: - """Delete multiple scoped documents by id. - - The user scope is injected so callers cannot delete documents they are not permitted to - see; out-of-scope ids simply match nothing and are reported as zero deletions. - - Args: - ids (list[Any]): list of ids to delete - session: the session to perform the deletes within - - Returns: - DeleteResponse: the result of the deletion - """ - docs = self.document_model.find(self._scope, In(self.document_model.id, ids), session=session) - delete_result = await docs.delete_many(session=session) - if not delete_result: - raise ValidationError("DeleteResult not returned internally") - return DeleteResponse.from_delete_result(delete_result) - - async def patch(self, id: Any, update: TPatch) -> TDoc: - """Partially update a single scoped document by id. - - Only fields explicitly set on ``update`` are applied. An empty patch is a no-op that still - returns the existing document for consistent behavior. Scoping ensures callers cannot patch - documents they are not permitted to see. - - Args: - id (str): the id of the document to update - update (TPatch): the partial update to apply; unset fields are dropped - """ - # Only retain set fields (patch) - update_data = update.model_dump(exclude_unset=True) - # If update is empty, return the model anyways (consistent behavior) - if not update_data: - existing = await self.document_model.find_one(self._scope, self.document_model.id == id) - if existing is None: - raise NotFoundError(self._not_found(id)) - return existing - - # Otherwise, update the fields fully (set) - # Brendan TODO: Set will replace an entire field - # - if we want to append to a list (ie. add a reference) we ned Push/AddToSet - query = self.document_model.find_one(self._scope, self.document_model.id == id).update( - Set(update_data), - response_type=UpdateResponse.NEW_DOCUMENT, - ) - updated = await query # pyright: ignore[reportGeneralTypeIssues] # beanie UpdateQuery is awaitable, but pyright doesn't see it - if updated is None: - raise NotFoundError(self._not_found(id)) - return updated - - def _hash_payload(self, payload: dict[str, Any], *, separators: tuple[str, str] = (",", ":")) -> str: - canonical = json.dumps( - payload, - sort_keys=True, - separators=separators, - ensure_ascii=True, - default=str, # filters may carry ObjectId/datetime values; stringify for a stable key - ) - return hashlib.sha256(canonical.encode("utf-8")).hexdigest() - - def _get_serializer( - self, format: DownloadFormat, fields: frozenset[str] | None - ) -> Callable[[AsyncIterable[TOut]], AsyncIterable[bytes]]: - match format: - case DownloadFormat.JSONL: - return self._serialize_jsonl - case DownloadFormat.CSV: - return lambda rows: self._serialize_csv(rows, fields) - - @staticmethod - async def _serialize_jsonl(rows: AsyncIterable) -> AsyncIterator[bytes]: - async for out in rows: - yield out.model_dump_json().encode() + b"\n" - - @staticmethod - def _csv_cell(value: Any) -> Any: - """Render a cell value for CSV: scalars as-is, dict/list as JSON (not Python repr).""" - if value is None or isinstance(value, (str, int, float, bool)): - return value - return json.dumps(value, ensure_ascii=False, separators=(",", ":")) - - @staticmethod - async def _serialize_csv(rows: AsyncIterable, fields: frozenset[str] | None) -> AsyncIterator[bytes]: - buf = io.StringIO() - writer: csv.DictWriter | None = None - async for out in rows: - row = out.model_dump(mode="json") - if writer is None: - cols = sorted(fields) if fields else list(row.keys()) - writer = csv.DictWriter(buf, fieldnames=cols, extrasaction="ignore") - writer.writeheader() - writer.writerow({key: MongoDbRepository._csv_cell(value) for key, value in row.items()}) - yield buf.getvalue().encode() - buf.seek(0) - buf.truncate(0) - - async def _s3_object_exists(self, bucket_name: str, key_name: str, s3: AbstractAsyncContextManager[S3Client]): - async with s3 as s3_client: - try: - await s3_client.head_object(Bucket=bucket_name, Key=key_name) - return True - except Exception: - return False - - async def download( - self, - format: DownloadFormat, - short_mime: ShortMimeFormat, - ignore_cache: bool, - filter: TFilter, - fields: frozenset[str] | None, - s3: AbstractAsyncContextManager[S3Client], - bucket_name: str, - key_name: str, - restrict_ids: Iterable[Any] | None = None, - ) -> AsyncIterable[bytes]: - # Hash parameters to generate key for cache - payload = { - "format": format, - "short_mime": short_mime, - "filter": filter.model_dump(), - "fields": sorted(fields) if fields else None, - } - _ = self._hash_payload(payload) - - # TODO: S3 download cache. When implemented, this should `await - # self._s3_object_exists(...)` and stream the cached object on a hit. - # The previous code called the coroutine without awaiting it (a no-op - # that always evaluated truthy), so the branch was removed. - - # Build from MongoDB (and, in future, save to cache) - query = filter.filter(self.document_model.find(self._scope)) - if restrict_ids is not None: - query = query.find(In(self.document_model.id, list(restrict_ids))) - query = filter.sort(query) - - serializer = self._get_serializer(format, fields) - - # Compress using gzip level 9 and stream out - compressor = zlib.compressobj(9, zlib.DEFLATED, 16 + zlib.MAX_WBITS) - - async def rows() -> AsyncIterator[TOut]: - async for table in query: - # TODO: We might think about skipping validation to save time - yield self.out_model.model_validate(table, from_attributes=True) - - async for line in serializer(rows()): - chunk = compressor.compress(line) - if chunk: - yield chunk - - # Flush the remaining buffered bytes and the gzip footer - # Without this the stream is a truncated gzip that cannot be decompressed. - tail = compressor.flush() - if tail: - yield tail diff --git a/mpcontribs-api/build/lib/mpcontribs_api/domains/_shared/service.py b/mpcontribs-api/build/lib/mpcontribs_api/domains/_shared/service.py deleted file mode 100644 index 686b87df75..0000000000 --- a/mpcontribs-api/build/lib/mpcontribs_api/domains/_shared/service.py +++ /dev/null @@ -1,172 +0,0 @@ -from collections.abc import AsyncIterable -from contextlib import AbstractAsyncContextManager - -from fastapi_filter.contrib.beanie import Filter -from pydantic import BaseModel -from pymongo.asynchronous.client_session import AsyncClientSession -from types_aiobotocore_s3 import S3Client - -from mpcontribs_api.domains._shared.components import MongoDbComponentsRepository -from mpcontribs_api.domains._shared.models import Component, ComponentDeleteResponse, DocumentOut -from mpcontribs_api.domains._shared.types import DownloadFormat, ShortMimeFormat -from mpcontribs_api.domains.contributions.repository import MongoDbContributionRepository -from mpcontribs_api.exceptions import NotFoundError -from mpcontribs_api.pagination import CursorParams, Page - - -class ComponentService[ - TDoc: Component, - TIn: Component, - TOut: DocumentOut, - TFilter: Filter, - TPatch: BaseModel, -]: - """Service layer for all shared component logic. - - Components (attachments, structures, tables) share the same access model and CRUD surface, so a - single configurable service handles every domain rather than a per-domain subclass. Each domain - is distinguished only by: - - - ``ref_field``: the field on a contribution that references this component type - (``"attachments"`` / ``"structures"`` / ``"tables"``) - - ``bucket_name``: the S3 bucket downloads are cached in (defaults to ``ref_field``) - - Reads, inserts, patches, and downloads forward to the components repository. Deletion is the only - operation with cross-repository logic, applying two gates: - - 1. **Access (scoped):** candidates are restricted to components reachable via a contribution - in the user's scope. A component the user cannot reach is treated as not found. - 2. **Integrity (global):** any reachable candidate still referenced by *any* contribution is - skipped; the rest are deleted. - """ - - def __init__( - self, - components: MongoDbComponentsRepository[TDoc, TIn, TOut, TFilter, TPatch], - contributions: MongoDbContributionRepository, - *, - ref_field: str, - bucket_name: str | None = None, - ) -> None: - self._components = components - self._contributions = contributions - self._ref_field = ref_field - self._bucket_name = bucket_name or ref_field - - async def get_many( - self, - filter: TFilter, - pagination: CursorParams, - fields: frozenset[str] | None, - ) -> Page[TOut]: - """Return a page of components reachable via an in-scope contribution. - - Components have no independent access field, so visibility is gated by contribution - reachability: results are restricted to ids referenced by a contribution the caller is - allowed to see (the same access gate that ``delete`` applies). - """ - allowed = await self._contributions.list_referenced_component_ids(self._ref_field, scoped=True) - return await self._components.get_many( - pagination=pagination, filter=filter, fields=fields, restrict_ids=allowed - ) - - async def get_by_id(self, id: str, fields: frozenset[str] | None) -> TDoc | TOut | None: - """Find a single component by id, gated by contribution reachability. - - Returns ``None`` (treated as not found) when no in-scope contribution references the id, - so callers cannot read a component belonging to a contribution they cannot see. - """ - oid = self._components._convert_object_id(id) - if not await self._contributions.referenced_component_ids(self._ref_field, [oid], scoped=True): - return None - return await self._components.get_component_by_id(id, fields) - - async def insert( - self, - components: list[TIn], - session: AsyncClientSession | None = None, - ) -> list[TDoc]: - """Bulk-insert components, deduplicated by content hash. See ``insert_components``.""" - return await self._components.insert_components(components=components, session=session) - - async def patch_by_id(self, id: str, update: TPatch) -> TDoc: - """Partially update a component by id, gated by contribution reachability. - - Raises ``NotFoundError`` when no in-scope contribution references the id, mirroring the - access gate on ``delete_by_id``. - """ - oid = self._components._convert_object_id(id) - if not await self._contributions.referenced_component_ids(self._ref_field, [oid], scoped=True): - raise NotFoundError(self._components._not_found(id)) - return await self._components.patch_component_by_id(id=id, update=update) - - async def download( - self, - format: DownloadFormat, - short_mime: ShortMimeFormat, - ignore_cache: bool, - filter: TFilter, - fields: frozenset[str] | None, - s3: AbstractAsyncContextManager[S3Client], - ) -> AsyncIterable[bytes]: - """Stream a gzip-compressed export of matching components. See ``download``. - - The S3 cache location is owned by the service: ``bucket_name`` defaults to ``ref_field`` and - ``key_name`` is currently unused. Like the other reads, the export is gated to components - reachable via an in-scope contribution. - """ - allowed = await self._contributions.list_referenced_component_ids(self._ref_field, scoped=True) - return self._components.download( - format=format, - short_mime=short_mime, - ignore_cache=ignore_cache, - filter=filter, - fields=fields, - s3=s3, - bucket_name=self._bucket_name, - key_name="", # TODO: Temp - restrict_ids=allowed, - ) - - async def delete(self, filter: TFilter) -> ComponentDeleteResponse: - """Delete components matching ``filter`` that are reachable and globally unreferenced. - - Args: - filter (TFilter): the component-specific query to apply - - Returns: - ComponentDeleteResponse: count deleted, plus the ids skipped because a contribution - still references them - """ - candidate_ids = await self._components.list_ids(filter) - reachable = await self._contributions.referenced_component_ids(self._ref_field, candidate_ids, scoped=True) - if not reachable: - return ComponentDeleteResponse(num_deleted=0) - referenced = await self._contributions.referenced_component_ids(self._ref_field, list(reachable), scoped=False) - deletable = [cid for cid in reachable if cid not in referenced] - num_deleted = (await self._components.delete_by_ids(deletable)).num_deleted if deletable else 0 - return ComponentDeleteResponse( - num_deleted=num_deleted, - num_skipped=len(referenced), - referenced_ids=sorted(referenced), - ) - - async def delete_by_id(self, id: str) -> ComponentDeleteResponse: - """Delete a single component by id, subject to the access and integrity gates. - - Args: - id (str): the str representation of the component's ObjectId - - Returns: - ComponentDeleteResponse: the deletion result, or a skipped result if still referenced - - Raises: - NotFoundError: if the component is not reachable via any in-scope contribution - """ - oid = self._components._convert_object_id(id) - if not await self._contributions.referenced_component_ids(self._ref_field, [oid], scoped=True): - raise NotFoundError(self._components._not_found(id)) - if await self._contributions.referenced_component_ids(self._ref_field, [oid], scoped=False): - return ComponentDeleteResponse(num_deleted=0, num_skipped=1, referenced_ids=[oid]) - deleted = await self._components.delete_by_id(oid) - return ComponentDeleteResponse(num_deleted=deleted.num_deleted) diff --git a/mpcontribs-api/build/lib/mpcontribs_api/domains/attachments/repository.py b/mpcontribs-api/build/lib/mpcontribs_api/domains/attachments/repository.py deleted file mode 100644 index 6297b117f8..0000000000 --- a/mpcontribs-api/build/lib/mpcontribs_api/domains/attachments/repository.py +++ /dev/null @@ -1,15 +0,0 @@ -from mpcontribs_api.domains._shared.components import MongoDbComponentsRepository -from mpcontribs_api.domains.attachments.models import ( - Attachment, - AttachmentFilter, - AttachmentIn, - AttachmentOut, - AttachmentPatch, -) - - -class MongoDbAttachmentRepository( - MongoDbComponentsRepository[Attachment, AttachmentIn, AttachmentOut, AttachmentFilter, AttachmentPatch] -): - document_model = Attachment - out_model = AttachmentOut diff --git a/mpcontribs-api/build/lib/mpcontribs_api/domains/attachments/router.py b/mpcontribs-api/build/lib/mpcontribs_api/domains/attachments/router.py deleted file mode 100644 index 49e2c076b4..0000000000 --- a/mpcontribs-api/build/lib/mpcontribs_api/domains/attachments/router.py +++ /dev/null @@ -1,77 +0,0 @@ -from typing import Annotated - -from fastapi import APIRouter, Depends -from fastapi.responses import StreamingResponse -from fastapi_filter import FilterDepends - -from mpcontribs_api.dependencies import S3Dep, require_user -from mpcontribs_api.domains._shared.models import ComponentDeleteResponse -from mpcontribs_api.domains._shared.types import ( - DownloadFormat, - FieldSelector, - ShortMimeFormat, - download_filename, -) -from mpcontribs_api.domains.attachments.dependencies import AttachmentServiceDep -from mpcontribs_api.domains.attachments.models import AttachmentFilter, AttachmentOut -from mpcontribs_api.pagination import CursorParams, Page - -router = APIRouter() - - -@router.get("", response_model=Page[AttachmentOut]) -async def get_attachments( - service: AttachmentServiceDep, - pagination: Annotated[CursorParams, Depends()], - filter: AttachmentFilter = FilterDepends(AttachmentFilter), - fields: FieldSelector = AttachmentOut.default_fields(), -): - selected = AttachmentOut.parse_fields(fields) - return await service.get_many(filter=filter, fields=selected, pagination=pagination) - - -@router.get("/{pk}", response_model=AttachmentOut) -async def get_attachment( - service: AttachmentServiceDep, - pk: str, - fields: FieldSelector = AttachmentOut.default_fields(), -): - selected = AttachmentOut.parse_fields(fields) - return await service.get_by_id(id=pk, fields=selected) - - -@router.get("/download/{short_mime}") -async def download_attachment( - service: AttachmentServiceDep, - format: DownloadFormat, - s3: S3Dep, - short_mime: ShortMimeFormat = ShortMimeFormat.GZ, - ignore_cache: bool = False, - filter: AttachmentFilter = FilterDepends(AttachmentFilter), - fields: FieldSelector = AttachmentOut.default_fields(), -) -> StreamingResponse: - selected = AttachmentOut.parse_fields(fields) - body = await service.download( - format=format, - short_mime=short_mime, - ignore_cache=ignore_cache, - filter=filter, - fields=selected, - s3=s3, - ) - filename = download_filename("attachments", format, short_mime) - return StreamingResponse( - body, - media_type="application/gzip", - headers={"Content-Disposition": f'attachment; filename="{filename}"'}, - ) - - -@router.delete("", response_model=ComponentDeleteResponse, dependencies=[Depends(require_user)]) -async def delete_attachments(service: AttachmentServiceDep, filter: AttachmentFilter = FilterDepends(AttachmentFilter)): - return await service.delete(filter=filter) - - -@router.delete("/{id}", response_model=ComponentDeleteResponse, dependencies=[Depends(require_user)]) -async def delete_attachment_by_id(service: AttachmentServiceDep, id: str): - return await service.delete_by_id(id=id) diff --git a/mpcontribs-api/build/lib/mpcontribs_api/domains/contributions/repository.py b/mpcontribs-api/build/lib/mpcontribs_api/domains/contributions/repository.py deleted file mode 100644 index 1a75419689..0000000000 --- a/mpcontribs-api/build/lib/mpcontribs_api/domains/contributions/repository.py +++ /dev/null @@ -1,266 +0,0 @@ -from collections.abc import AsyncIterable -from contextlib import AbstractAsyncContextManager -from typing import Any - -from beanie import PydanticObjectId, UpdateResponse -from beanie.operators import Set -from pymongo.asynchronous.client_session import AsyncClientSession -from pymongo.results import DeleteResult -from types_aiobotocore_s3 import S3Client - -from mpcontribs_api.authz import User -from mpcontribs_api.domains._shared.repository import MongoDbRepository -from mpcontribs_api.domains._shared.types import DownloadFormat, ShortMimeFormat -from mpcontribs_api.domains.contributions.models import ( - Contribution, - ContributionFilter, - ContributionIn, - ContributionOut, - ContributionPatch, -) -from mpcontribs_api.pagination import CursorParams - - -class MongoDbContributionRepository( - MongoDbRepository[Contribution, ContributionIn, ContributionOut, ContributionFilter, ContributionPatch] -): - """A repository layer for access to MongoDB. - - Shared CRUD logic lives on :class:`MongoDbRepository`; the methods here are domain-named - forwarders that give routers a consistent vocabulary and concrete types, plus the operations - whose shape is contribution-specific (filtered delete, id-keyed upsert, download). - Multi-collection orchestration (component inserts) lives in ``ContributionService``. - """ - - document_model = Contribution - out_model = ContributionOut - - def __init__(self, user: User) -> None: - super().__init__(user) - self._user = user - - @staticmethod - def _build_scope(user: User) -> dict[str, Any]: - """Provides scope based on current user's permitted groups and publicly released data.""" - if user.is_admin: - return {} - ors: list[dict[str, Any]] = [{"is_public": True}] - if not user.is_anonymous: - if user.groups: - ors.append({"project": {"$in": sorted(user.groups)}}) - return {"$or": ors} - - async def get_contributions( - self, - filter: ContributionFilter, - pagination: CursorParams | None = None, - fields: frozenset[str] | None = None, - ): - """Query the Contribution collection, scoped to the current user. See ``get_many``.""" - return await self.get_many(pagination=pagination, filter=filter, fields=fields) - - async def get_contribution_by_id(self, id: str, fields: frozenset[str] | None): - """Find a single contribution by id, scoped to the current user. See ``get_by_id``.""" - return await self.get_by_id(self._convert_object_id(id), fields) - - async def patch_contribution_by_id(self, id: str, update: ContributionPatch): - """Partially update a contribution by id, scoped to the current user. See ``patch``.""" - return await self.patch(self._convert_object_id(id), update) - - async def delete_contribution_by_id(self, id: str) -> None: - """Delete a contribution by id, scoped to the current user. See ``delete_by_id``.""" - await self.delete_by_id(self._convert_object_id(id)) - - async def delete_contributions( - self, - filter: ContributionFilter, - ) -> DeleteResult | None: - """Bulk deletion of Contributions described by the filter. - - Args: - filter (ContribtionFilter): the filter to use to identify contributions to delete - """ - return await filter.filter(self.document_model.find(self._scope)).delete_many() - - async def insert_many_contributions( - self, - docs: list[Contribution], - session: AsyncClientSession | None = None, - ): - """Bulk-insert pre-built Contribution documents. - - Used by the ``ContributionService`` no-component fast path. On partial failure pymongo - raises ``BulkWriteError`` whose ``details["writeErrors"]`` carries per-index error info - that the service maps back into a ``BulkWriteSummary``. - """ - return await self.document_model.insert_many(docs, ordered=False, session=session) - - async def insert_contribution( - self, - doc: Contribution, - session: AsyncClientSession | None = None, - ) -> Contribution: - """Insert a single pre-built Contribution document, optionally in a transaction.""" - await doc.insert(session=session) - return doc - - async def find_one_contribution(self, project: str, identifier: str) -> Contribution | None: - """Find a single contribution by (project, identifier), scoped to the current user.""" - return await self.document_model.find_one( - self._scope, - self.document_model.project == project, - self.document_model.identifier == identifier, - ) - - async def referenced_component_ids( - self, - ref_field: str, - ids: list[PydanticObjectId], - *, - scoped: bool, - ) -> set[PydanticObjectId]: - """Return the subset of ``ids`` referenced by contributions through ``ref_field``. - - Beanie stores each ``Link`` as a DBRef (``{"$ref": ..., "$id": ObjectId}``), so a - component is referenced when its id appears under ``.$id`` on any matching - contribution. - - Args: - ref_field: the contribution link field to inspect ("structures" | "tables" | - "attachments"). Always a fixed class-attr at the call site, never user input. - ids: candidate component ids to test - scoped: when ``True`` the user scope is applied (access gate / reachability); when - ``False`` the check spans every contribution (global integrity check) - - Returns: - set[PydanticObjectId]: the ids in ``ids`` that are still referenced - """ - if not ids: - return set() - key = f"{ref_field}.$id" - query: dict[str, Any] = {key: {"$in": ids}} - if scoped and self._scope: - query = {"$and": [self._scope, query]} - target = set(ids) - referenced: set[PydanticObjectId] = set() - collection = self.document_model.get_pymongo_collection() - async for doc in collection.find(query, {ref_field: 1}): - for ref in doc.get(ref_field) or []: - rid = ref.id if hasattr(ref, "id") else ref.get("$id") - if rid in target: - referenced.add(rid) - return referenced - - # TODO: should return document with update - async def list_referenced_component_ids( - self, - ref_field: str, - *, - scoped: bool, - ) -> set[PydanticObjectId]: - """Return every component id referenced through ``ref_field`` by matching contributions. - - Unlike :meth:`referenced_component_ids`, this takes no candidate list — it enumerates all - ids reachable from contributions in scope. Used to gate component *reads* (list/download) - to only the components a user can reach via a contribution they are allowed to see. - - Args: - ref_field: the contribution link field to inspect ("structures" | "tables" | - "attachments"). Always a fixed class-attr at the call site, never user input. - scoped: when ``True`` the user scope is applied (access gate); when ``False`` the - check spans every contribution. - - Returns: - set[PydanticObjectId]: all component ids referenced via ``ref_field`` - """ - key = f"{ref_field}.$id" - query: dict[str, Any] = {key: {"$exists": True}} - if scoped and self._scope: - query = {"$and": [self._scope, query]} - referenced: set[PydanticObjectId] = set() - collection = self.document_model.get_pymongo_collection() - async for doc in collection.find(query, {ref_field: 1}): - for ref in doc.get(ref_field) or []: - rid = ref.id if hasattr(ref, "id") else ref.get("$id") - if rid is not None: - referenced.add(rid) - return referenced - - async def update_contribution(self, doc: Contribution, update_data: dict[str, Any]) -> None: - """Apply a partial update to an existing Contribution document.""" - await doc.update(Set(update_data)) - - async def upsert_contribution_by_identifiers( - self, - identifiers: dict[str, str], - contribution: ContributionIn, - ) -> Contribution: - """Atomically upsert a Contribution by its identifying fields. - - Relies on the unique index over those fields so that concurrent requests targeting the - same key cannot both win the insert branch. Fields the caller did not set are not touched - (partial update). On insert a fresh Contribution document is written with ``is_public=False``. - - Args: - identifiers: the fields ContributionIn.identifiers() returns (project, identifier) - contribution: the input payload to upsert - - Returns: - Contribution: the document as it stands after the operation - """ - doc = self.document_model.from_input_model(contribution) - update_data = doc.model_dump(exclude={"id"}, exclude_none=True) - query = self.document_model.find_one( - self._scope, - self.document_model.project == identifiers["project"], - self.document_model.identifier == identifiers["identifier"], - ).upsert( - Set(update_data), - on_insert=doc, - response_type=UpdateResponse.NEW_DOCUMENT, - ) - return await query # pyright: ignore[reportGeneralTypeIssues] # beanie UpdateQuery is awaitable, but pyright doesn't see it - - async def upsert_contribution_by_id(self, id: str, contribution: ContributionIn): - """Upserts a single Contribution. - - If Contributions with identical identifiers exist, update, otherwise insert - - Args: - id (str): the id of the Contribution to upsert - contribution (ContributionIn): the Contribution to be upserted - - Returns: - ContributionOut: the upserted document""" - doc = self.document_model.from_input_model(contribution) - query = self.document_model.find_one( - self._scope, - self.document_model.id == self._convert_object_id(id), - ).upsert( - Set(doc.model_dump(exclude={"id"}, exclude_none=True)), - on_insert=doc, - response_type=UpdateResponse.NEW_DOCUMENT, - ) - return await query # pyright: ignore[reportGeneralTypeIssues] # beanie UpdateQuery is awaitable, but pyright doesn't see it - - async def download_contributions( - self, - format: DownloadFormat, - short_mime: ShortMimeFormat, - ignore_cache: bool, - filter: ContributionFilter, - fields: frozenset[str] | None, - key_name: str, - s3: AbstractAsyncContextManager[S3Client], - bucket_name: str = "contributions", - ) -> AsyncIterable[bytes]: - return self.download( - format=format, - short_mime=short_mime, - ignore_cache=ignore_cache, - filter=filter, - fields=fields, - bucket_name=bucket_name, - key_name=key_name, - s3=s3, - ) diff --git a/mpcontribs-api/build/lib/mpcontribs_api/domains/contributions/router.py b/mpcontribs-api/build/lib/mpcontribs_api/domains/contributions/router.py deleted file mode 100644 index cd01cbd825..0000000000 --- a/mpcontribs-api/build/lib/mpcontribs_api/domains/contributions/router.py +++ /dev/null @@ -1,117 +0,0 @@ -from typing import Annotated - -from fastapi import APIRouter, Depends -from fastapi.responses import StreamingResponse -from fastapi_filter import FilterDepends - -from mpcontribs_api.dependencies import S3Dep, require_user -from mpcontribs_api.domains._shared.bulk import BulkWriteSummary -from mpcontribs_api.domains._shared.types import ( - DownloadFormat, - FieldSelector, - ShortMimeFormat, - download_filename, -) -from mpcontribs_api.domains.contributions.dependencies import ContributionDep, ContributionServiceDep -from mpcontribs_api.domains.contributions.models import ( - Contribution, - ContributionFilter, - ContributionIn, - ContributionOut, - ContributionPatch, -) -from mpcontribs_api.pagination import CursorParams - -router = APIRouter() - - -@router.get("") -async def get_contributions( - repo: ContributionDep, - pagination: Annotated[CursorParams, Depends()], - filter: ContributionFilter = FilterDepends(ContributionFilter), - fields: FieldSelector = ContributionOut.default_fields(), -): - selected = ContributionOut.parse_fields(fields) - return await repo.get_contributions(pagination=pagination, filter=filter, fields=selected) - - -@router.delete("", dependencies=[Depends(require_user)]) -async def delete_contributions( - repo: ContributionDep, - filter: ContributionFilter = FilterDepends(ContributionFilter), -): - return await repo.delete_contributions(filter=filter) - - -# TODO: Might want to take contributions in from request body and run model_validate_json on it (much faster) -@router.post("", response_model=BulkWriteSummary[Contribution], dependencies=[Depends(require_user)]) -async def insert_contributions( - service: ContributionServiceDep, - contributions: list[ContributionIn], -): - return await service.insert_contributions(contributions=contributions) - - -@router.put("", dependencies=[Depends(require_user)]) -async def upsert_contributions( - service: ContributionServiceDep, - contributions: list[ContributionIn], -): - return await service.upsert_contributions(contributions=contributions) - - -@router.get("/download/{short_mime}") -async def download_contributions( - repo: ContributionDep, - s3: S3Dep, - short_mime: ShortMimeFormat = ShortMimeFormat.GZ, - format: DownloadFormat = DownloadFormat.JSONL, - ignore_cache: bool = False, - filter: ContributionFilter = FilterDepends(ContributionFilter), - fields: FieldSelector = ContributionOut.default_fields(), -): - selected = ContributionOut.parse_fields(fields) - body = await repo.download_contributions( - format=format, - short_mime=short_mime, - ignore_cache=ignore_cache, - filter=filter, - fields=selected, - s3=s3, - key_name="", # TODO: Temp - ) - filename = download_filename("contributions", format, short_mime) - return StreamingResponse( - body, - media_type="application/gzip", - headers={"Content-Disposition": f'attachment; filename="{filename}"'}, - ) - - -@router.delete("/{id}", dependencies=[Depends(require_user)]) -async def delete_contribution_by_id( - service: ContributionServiceDep, - id: str, -): - return await service.delete_contributions(ContributionFilter.model_validate({"id": id})) - - -@router.get("/{id}") -async def get_contribution_by_id( - repo: ContributionDep, - id: str, - fields: FieldSelector = ContributionOut.default_fields(), -): - selected = ContributionOut.parse_fields(fields) - return await repo.get_contribution_by_id(id=id, fields=selected) - - -@router.put("/{id}", dependencies=[Depends(require_user)]) -async def upsert_contribution_by_id(repo: ContributionDep, id: str, contribution: ContributionIn): - return await repo.upsert_contribution_by_id(id=id, contribution=contribution) - - -@router.patch("/{id}", dependencies=[Depends(require_user)]) -async def patch_contribution_by_id(repo: ContributionDep, id: str, update: ContributionPatch): - return await repo.patch_contribution_by_id(id=id, update=update) diff --git a/mpcontribs-api/build/lib/mpcontribs_api/domains/contributions/service.py b/mpcontribs-api/build/lib/mpcontribs_api/domains/contributions/service.py deleted file mode 100644 index 5da70bdc31..0000000000 --- a/mpcontribs-api/build/lib/mpcontribs_api/domains/contributions/service.py +++ /dev/null @@ -1,328 +0,0 @@ -import asyncio -from collections import defaultdict -from typing import cast - -import structlog -from beanie import Link, PydanticObjectId -from pymongo import AsyncMongoClient -from pymongo.asynchronous.client_session import AsyncClientSession -from pymongo.errors import BulkWriteError - -from mpcontribs_api.config import MongoSettings, get_settings -from mpcontribs_api.domains._shared.bulk import ( - BulkDeleteSummary, - BulkFailure, - BulkWriteSummary, - bulk_failure_from_exception, -) -from mpcontribs_api.domains._shared.repository import MongoDbRepository -from mpcontribs_api.domains.attachments.repository import MongoDbAttachmentRepository -from mpcontribs_api.domains.contributions.models import Contribution, ContributionFilter, ContributionIn -from mpcontribs_api.domains.contributions.repository import MongoDbContributionRepository -from mpcontribs_api.domains.structures.models import Structure -from mpcontribs_api.domains.structures.repository import MongoDbStructureRepository -from mpcontribs_api.domains.tables.models import Table -from mpcontribs_api.domains.tables.repository import MongoDbTableRepository -from mpcontribs_api.exceptions import AppError, ValidationError -from mpcontribs_api.pagination import CursorParams - -logger = structlog.get_logger(__name__) - - -class ContributionService: - def __init__( - self, - client: AsyncMongoClient, - contributions: MongoDbContributionRepository, - structures: MongoDbStructureRepository, - attachments: MongoDbAttachmentRepository, - tables: MongoDbTableRepository, - settings: MongoSettings | None = None, - ): - self._client = client - self._contributions = contributions - self._structures = structures - self._attachments = attachments - self._tables = tables - self._settings = settings or get_settings().mongo - - @property - def _children(self) -> dict[str, MongoDbRepository]: - return { - "structures": self._structures, - "attachments": self._attachments, - "tables": self._tables, - } - - async def insert_contributions( - self, - contributions: list[ContributionIn], - ) -> BulkWriteSummary[Contribution]: - """Atomic bulk insert contributions, atomically per top-level contribution. - - Contributions carrying no components are inserted in one ``insert_many`` (no transaction); - contributions with components run inside their own MongoDB transaction so the contribution - and its components commit or roll back together. Concurrent transactions are bounded by - ``settings.mongo.max_concurrent_transactions``. Per-item failures are returned in the - summary's ``failed`` list; the request as a whole does not raise on partial failure. - - Args: - contributions: contributions to insert; may include nested structures/tables/attachments - - Returns: - BulkWriteSummary[Contribution]: per-item outcome, sized to ``len(contributions)`` - - Raises: - ValidationError: if duplicate keys (project-identifier) are found in ``contributions`` - """ - if not contributions: - return BulkWriteSummary[Contribution](total=0, succeeded=[], failed=[]) - - self._reject_duplicate_keys(contributions) - - oversize_failures, remaining_indices = self._split_oversize(contributions) - no_comp_indices = [i for i in remaining_indices if not contributions[i].has_components()] - with_comp_indices = [i for i in remaining_indices if contributions[i].has_components()] - - no_comp_succeeded, no_comp_failed = await self._insert_no_components( - indices=no_comp_indices, - contributions=contributions, - ) - with_comp_succeeded, with_comp_failed = await self._insert_with_components( - indices=with_comp_indices, - contributions=contributions, - ) - - succeeded = [doc for _, doc in sorted(no_comp_succeeded + with_comp_succeeded, key=lambda p: p[0])] - failed = sorted( - oversize_failures + no_comp_failed + with_comp_failed, - key=lambda f: f.index, - ) - return BulkWriteSummary[Contribution](total=len(contributions), succeeded=succeeded, failed=failed) - - def _reject_duplicate_keys(self, contributions: list[ContributionIn]) -> None: - """Reject the whole batch if any identifying key appears more than once. - - Mongo would surface this as a duplicate key error; catching it upfront keeps a guaranteed - failure from consuming a transaction slot and gives the caller all offending indices at once. - - The dedup key is derived from every value in ``identifiers()`` so adding a field to the - uniqueness contract there flows through here automatically. - """ - seen: dict[tuple[str, ...], list[int]] = defaultdict(list) - for index, contribution in enumerate(contributions): - ids = contribution.identifiers() - seen[tuple(ids.values())].append(index) - duplicates = sorted(index for indices in seen.values() if len(indices) > 1 for index in indices) - if duplicates: - raise ValidationError( - "Duplicate (project, identifier) pairs in batch", - contribution_indices=duplicates, - ) - - def _split_oversize(self, contributions: list[ContributionIn]) -> tuple[list[BulkFailure], list[int]]: - """Reject contributions whose component count exceeds the per-contribution ceiling. - - Returns the failure entries for the oversize items and the indices of the remaining items - that should proceed to Mongo. Doing this upfront avoids burning a transaction slot on a - request guaranteed to exceed transactionLifetimeLimitSeconds. - """ - cap = self._settings.max_components_per_contribution - oversize: list[BulkFailure] = [] - remaining: list[int] = [] - for i, contrib in enumerate(contributions): - count = contrib.component_count() - if count > cap: - oversize.append( - BulkFailure( - index=i, - identifier=contrib.identifiers(), - error_code="validation_error", - message=f"contribution has {count} components, exceeds cap of {cap}. " - "Recommend inserting the component alone, followed by bulk inserts of components", - ) - ) - else: - remaining.append(i) - return oversize, remaining - - async def _insert_no_components( - self, - indices: list[int], - contributions: list[ContributionIn], - ) -> tuple[list[tuple[int, Contribution]], list[BulkFailure]]: - """Single-collection bulk insert for component-free contributions. - - Uses ``ordered=False`` so a single bad item doesn't sink the rest of the batch. pymongo - raises ``BulkWriteError`` with per-index error info on partial failure; we map that back - onto the original input indices. - """ - if not indices: - return [], [] - docs = [Contribution.from_input_model(contributions[i]) for i in indices] - try: - await self._contributions.insert_many_contributions(docs) - return list(zip(indices, docs, strict=False)), [] - except BulkWriteError as exc: - return self._partition_bulk_write_error(indices, docs, contributions, exc) - - @staticmethod - def _partition_bulk_write_error( - indices: list[int], - docs: list[Contribution], - contributions: list[ContributionIn], - exc: BulkWriteError, - ) -> tuple[list[tuple[int, Contribution]], list[BulkFailure]]: - """Map pymongo's per-position writeErrors back to the caller's original input indices.""" - write_errors = exc.details.get("writeErrors", []) if exc.details else [] - failed_positions = {err.get("index"): err for err in write_errors} - succeeded: list[tuple[int, Contribution]] = [] - failed: list[BulkFailure] = [] - for position, (orig_index, doc) in enumerate(zip(indices, docs, strict=False)): - err = failed_positions.get(position) - if err is None: - succeeded.append((orig_index, doc)) - else: - failed.append( - BulkFailure( - index=orig_index, - identifier=contributions[orig_index].identifiers(), - error_code="conflict" if err.get("code") == 11000 else "write_error", - message=err.get("errmsg", "write failed"), - ) - ) - return succeeded, failed - - async def _insert_with_components( - self, - indices: list[int], - contributions: list[ContributionIn], - ) -> tuple[list[tuple[int, Contribution]], list[BulkFailure]]: - """Per-contribution transaction path, bounded by ``max_concurrent_transactions``.""" - if not indices: - return [], [] - sem = asyncio.Semaphore(self._settings.max_concurrent_transactions) - - async def _bounded(orig_index: int) -> Contribution | BulkFailure: - async with sem: - return await self._insert_one_with_components(orig_index, contributions[orig_index]) - - results = await asyncio.gather(*[_bounded(i) for i in indices]) - succeeded: list[tuple[int, Contribution]] = [] - failed: list[BulkFailure] = [] - for orig_index, outcome in zip(indices, results, strict=True): - if isinstance(outcome, BulkFailure): - failed.append(outcome) - else: - succeeded.append((orig_index, outcome)) - return succeeded, failed - - async def _insert_one_with_components( - self, - index: int, - contrib: ContributionIn, - ) -> Contribution | BulkFailure: - """Run a single contribution + its components inside a transaction. - - Uses ``session.with_transaction`` so transient txn errors (write conflicts, primary step- - downs) get pymongo's retry treatment. Any exception is converted to a ``BulkFailure`` so - the surrounding ``asyncio.gather`` sees a normal return value for every coroutine. - """ - try: - async with self._client.start_session() as session: - - async def _txn(s: AsyncClientSession) -> Contribution: - return await self._do_insert(contrib, s) - - return await session.with_transaction(_txn) - except AppError as exc: - return bulk_failure_from_exception(index, contrib.identifiers(), exc) - except Exception as exc: - logger.error("insert_contribution_failed", index=index, identifier=contrib.identifiers(), exc_info=True) - return bulk_failure_from_exception(index, contrib.identifiers(), exc) - - async def _do_insert(self, contrib: ContributionIn, session: AsyncClientSession) -> Contribution: - """Insert components then the contribution itself, all in the given session. - - Components are inserted sequentially because a session is single-threaded — sharing it - across concurrent awaits would corrupt the wire protocol. - """ - structures = await self._structures.insert_components(contrib.structures or [], session=session) - tables = await self._tables.insert_components(contrib.tables or [], session=session) - - doc = Contribution.from_input_model(contrib) - doc.structures = cast(list[Link[Structure]] | None, structures or None) - doc.tables = cast(list[Link[Table]] | None, tables or None) - return await self._contributions.insert_contribution(doc, session=session) - - async def upsert_contributions(self, contributions: list[ContributionIn]) -> list[Contribution]: - """Upsert contributions by their identifying fields, bounded by concurrency caps. - - Components (structures, tables, attachments) must be managed via their respective - services. If any contribution in the batch carries components, the entire request is - rejected before any database writes occur. - - Each item is upserted atomically by ``ContributionIn.identifiers()`` via a single - ``findOneAndUpdate(..., upsert=True)`` so two requests targeting the same key cannot - race past the find branch — the unique index over those fields is the tiebreaker. - Concurrent upserts within a batch are bounded by ``settings.mongo.max_concurrent_transactions`` - - Args: - contributions: contributions to upsert; must not include nested components - - Returns: - list[Contribution]: upserted documents in input order - """ - indices_with_components = [i for i, c in enumerate(contributions) if c.has_components()] - if indices_with_components: - raise ValidationError( - "Components must be managed via their respective services, not via contribution upsert.", - contribution_indices=indices_with_components, - ) - - sem = asyncio.Semaphore(self._settings.max_concurrent_transactions) - - async def _bounded_upsert(contrib: ContributionIn) -> Contribution: - async with sem: - return await self._contributions.upsert_contribution_by_identifiers(contrib.identifiers(), contrib) - - return await asyncio.gather(*[_bounded_upsert(c) for c in contributions]) - - async def delete_contributions(self, filter: ContributionFilter) -> BulkDeleteSummary: - """Delete a contribution and all of its child components - - Doesn't guarantee complete atomicity, but prevents orphaned children by deleting components first. - - Args: - filter (ContributionFilter): the Contribution-specific query to apply on top of the user scope - - - Returns: - BulkDeleteSummary: a summary of how many documents and child documents were deleted - """ - num_deleted_components = 0 - num_deleted_contributions = 0 - # Loop through cursor rather than materialize arbitrary number of Contributions - while True: - # Since we are deleting everything matching filter, we can continuously get the 1st page - page = await self._contributions.get_contributions( - pagination=CursorParams(cursor=None, limit=100), - filter=filter, - ) - # For each component type, gather ObjectIds then bulk delete them - # - components first so no children are left orphaned - for field, repo in self._children.items(): - ids = [link.ref.id for c in page.items for link in (getattr(c, field) or [])] - if ids: - deleted_components = await repo.delete_by_ids(ids) - num_deleted_components += deleted_components.num_deleted if deleted_components else 0 - - # Delete Contributions in this batch by ID - # need to make a new filter so we don't eagerly delete all contributions before their components are deleted - deleted_contribs = await self._contributions.delete_contributions( - ContributionFilter(id__in=[cast(PydanticObjectId, c.id) for c in page.items]) - ) - num_deleted_contributions += deleted_contribs.deleted_count if deleted_contribs else 0 - if not page.items: - break - return BulkDeleteSummary(num_deleted=num_deleted_contributions, num_children_deleted=num_deleted_components) diff --git a/mpcontribs-api/build/lib/mpcontribs_api/domains/healthcheck/router.py b/mpcontribs-api/build/lib/mpcontribs_api/domains/healthcheck/router.py deleted file mode 100644 index e099971ab6..0000000000 --- a/mpcontribs-api/build/lib/mpcontribs_api/domains/healthcheck/router.py +++ /dev/null @@ -1,37 +0,0 @@ -from botocore.exceptions import BotoCoreError, ClientError -from fastapi import APIRouter, HTTPException, status -from pydantic import BaseModel - -from mpcontribs_api.config import get_settings -from mpcontribs_api.dependencies import DbDep, S3Dep - -router = APIRouter(tags=["health"]) - -settings = get_settings() - - -class HealthStatus(BaseModel): - status: str - mongo: str - s3: str - - -@router.get("", response_model=HealthStatus, summary="Service health") -async def healthcheck(db: DbDep, s3_client: S3Dep) -> HealthStatus: - try: - await db.client.admin.command("ping") - except Exception: - raise HTTPException( - status_code=status.HTTP_503_SERVICE_UNAVAILABLE, - detail={"status": "unhealthy", "mongo": "unreachable"}, - ) from None - - try: - await s3_client.head_bucket(Bucket=settings.aws.health_bucket) - except (ClientError, BotoCoreError): - raise HTTPException( - status_code=status.HTTP_503_SERVICE_UNAVAILABLE, - detail={"status": "unhealthy", "s3": "unreachable"}, - ) from None - - return HealthStatus(status="healthy", mongo="ok", s3="ok") diff --git a/mpcontribs-api/build/lib/mpcontribs_api/domains/projects/repository.py b/mpcontribs-api/build/lib/mpcontribs_api/domains/projects/repository.py deleted file mode 100644 index f0f3f09f36..0000000000 --- a/mpcontribs-api/build/lib/mpcontribs_api/domains/projects/repository.py +++ /dev/null @@ -1,111 +0,0 @@ -from typing import Any - -from mpcontribs_api.authz import User -from mpcontribs_api.domains._shared.repository import MongoDbRepository -from mpcontribs_api.domains.projects.models import ( - Project, - ProjectFilter, - ProjectIn, - ProjectOut, - ProjectPatch, -) -from mpcontribs_api.exceptions import PermissionError -from mpcontribs_api.pagination import CursorParams - - -class MongoDbProjectRepository(MongoDbRepository[Project, ProjectIn, ProjectOut, ProjectFilter, ProjectPatch]): - """A repository layer for access to MongoDB. - - This is the layer that directly interacts with database operations. Shared CRUD logic lives on - :class:`MongoDbRepository`; the methods here are domain-named forwarders that give routers a - consistent vocabulary and concrete types, plus the operations whose shape is genuinely - project-specific (id-keyed upsert). - - Attributes: - _scope (dict[str, Any]): additional terms to inject into mongo queries to enforce user - authorization on resources - """ - - document_model = Project - out_model = ProjectOut - - def __init__(self, user: User) -> None: - super().__init__(user) - self._user = user - - @staticmethod - def _build_scope(user: User) -> dict[str, Any]: - """Provides scope based on current user's permitted groups and publicly released data.""" - if user.is_admin: - return {} - ors: list[dict[str, Any]] = [{"is_public": True, "is_approved": True}] - if not user.is_anonymous: - ors.append({"owner": user.username}) - if user.groups: - ors.append({"_id": {"$in": sorted(user.groups)}}) - return {"$or": ors} - - async def get_projects( - self, - filter: ProjectFilter, - pagination: CursorParams, - fields: frozenset[str] | None, - ): - """Query the Project collection, scoped to the current user. See ``get_many``.""" - return await self.get_many(pagination=pagination, filter=filter, fields=fields) - - async def get_project_by_id(self, id: str, fields: frozenset[str] | None): - """Find a single project by id, scoped to the current user. See ``get_by_id``.""" - return await self.get_by_id(id, fields) - - async def insert_project(self, project: ProjectIn) -> Project: - """Insert a new project, rejecting a duplicate id. See ``insert_one``.""" - return await self.insert_one(project) - - async def patch_project_by_id(self, id: str, update: ProjectPatch) -> Project: - """Partially update a project by id, scoped to the current user. See ``patch``.""" - return await self.patch(id, update) - - async def delete_project_by_id(self, id: str) -> None: - """Delete a project by id, scoped to the current user. See ``delete_by_id``.""" - await self.delete_by_id(id) - - async def upsert_project_by_id(self, id: str, data: ProjectIn) -> Project: - """Upsert a project by provided id, authorized to the current user. - - Update the document if the id exists, otherwise insert a new one under that id. - Authorization (the read scope is for visibility, not write access, so it is not - reused here): - - - **Existing project:** only its ``owner`` or an admin may overwrite it. The stored - ``owner`` is preserved — ownership cannot be reassigned through the request body. - - **New project:** ``owner`` is forced to the caller, ignoring any body value. - - Note: relies on the path param ``id`` for identity, not the body's id. - - Args: - id (str): the id of the project to upsert - data (ProjectIn): the data of the project to upsert - - Returns: - Project: the full document that either replaced an old one or was inserted - - Raises: - PermissionError: if a non-owner, non-admin caller targets an existing project - """ - # The route enforces authentication, so an anonymous caller should never reach here. - if self._user.username is None: - raise PermissionError(required_role="authenticated") - - existing = await self.document_model.find_one(self.document_model.id == id) - project = self.document_model.from_input_model(data) - project.id = id - if existing is not None: - if not (self._user.is_admin or existing.owner == self._user.username): - raise PermissionError(required_role="owner-or-admin") - # Ownership is immutable via upsert; keep the original owner. - project.owner = existing.owner - else: - # New project: the caller owns it, regardless of the submitted owner. - project.owner = self._user.username - return await project.save() diff --git a/mpcontribs-api/build/lib/mpcontribs_api/domains/projects/router.py b/mpcontribs-api/build/lib/mpcontribs_api/domains/projects/router.py deleted file mode 100644 index e82116b270..0000000000 --- a/mpcontribs-api/build/lib/mpcontribs_api/domains/projects/router.py +++ /dev/null @@ -1,121 +0,0 @@ -from typing import Annotated - -from fastapi import APIRouter, Depends, Response, status -from fastapi_filter import FilterDepends -from starlette.status import HTTP_204_NO_CONTENT - -from mpcontribs_api.dependencies import require_user -from mpcontribs_api.domains._shared.types import FieldSelector -from mpcontribs_api.domains.projects.dependencies import ProjectDep -from mpcontribs_api.domains.projects.models import ( - ProjectFilter, - ProjectIn, - ProjectOut, - ProjectPatch, -) -from mpcontribs_api.pagination import CursorParams - -router = APIRouter() - - -# Brendan TODO: Add in option to select ProjectSummary or ProjectOut -@router.get("", response_model=None) -async def get_projects( - repo: ProjectDep, - pagination: Annotated[CursorParams, Depends()], - filter: ProjectFilter = FilterDepends(ProjectFilter), - fields: FieldSelector = ProjectOut.default_fields(), -): - """Return paginated projects matching a filter. - - Args: - repo (ProjectDep): the project repo we depend on - pagination (CursorParams): arguments for cursor-based pagination - fields (str | None): optional fields to include in return. If None supplied, all fields are returned - - Returns: - list[ProjectSummary]: a list of smaller project payloads - """ - selected = ProjectOut.parse_fields(fields) - return await repo.get_projects(filter=filter, pagination=pagination, fields=selected) - - -@router.get("/{id}", response_model=ProjectOut) -async def get_project_by_id( - id: str, - repo: ProjectDep, - fields: FieldSelector = ProjectOut.default_fields(), -): - """Gets a single project by its ID. - - Args: - id (str): the id of the project to retrieve - repo (ProjectDep): the project repo we depend on - fields (str | None): optional fields to include in return. If None supplied, all fields are returned - - Returns: - ProjectOut: the requested project, actual data returned is determined by the view the user requested - """ - selected = ProjectOut.parse_fields(fields) - return await repo.get_project_by_id(id=id, fields=selected) - - -@router.put("/{id}", response_model=ProjectOut, dependencies=[Depends(require_user)]) -async def upsert_project_by_id( - repo: ProjectDep, - id: str, - project: ProjectIn, -): - """Upsert a project by provided id. - - Upsert: Update document if id is found, otherwise insert new document using id. - Note: Relies on the path param 'id' for finding, rather than the body's id. - - Args: - repo (ProjectDep): the project repo we depend on - id (str): the id of the project to retrieve - project (ProjectIn): the data of the project to upsert - - Returns: - ProjectOut: the full document that either replaced an old one or was inserted - """ - return await repo.upsert_project_by_id(id=id, data=project) - - -@router.patch("/{id}", response_model=ProjectOut, dependencies=[Depends(require_user)]) -async def patch_project_by_id( - repo: ProjectDep, - id: str, - update: ProjectPatch, -): - """Partial update to project identified with 'id'. - - Note: overwrites fields with given values - arrays are not appended to. - - Args: - repo (ProjectDep): the project repo we depend on - id (str): the id of the project to update - update (ProjectPatch): the partial update to apply - unset fields are dropped - - Note: If fields are intentionally set to None, None is applied to the field. - - Returns: - ProjectOut: the full Project with updates applied - """ - return await repo.patch_project_by_id(id=id, update=update) - - -@router.delete("/{id}", status_code=status.HTTP_204_NO_CONTENT, dependencies=[Depends(require_user)]) -async def delete_project_by_id( - repo: ProjectDep, - id: str, -): - """Deletes a project matching id. - - Args: - repo (ProjectDep): the project repo we depend on - id (str): the id of the project to be deleted - Returns: - Response: a response with the 204 response code (rather than FastAPIs default 200) - """ - await repo.delete_project_by_id(id=id) - return Response(status_code=HTTP_204_NO_CONTENT) diff --git a/mpcontribs-api/build/lib/mpcontribs_api/domains/structures/repository.py b/mpcontribs-api/build/lib/mpcontribs_api/domains/structures/repository.py deleted file mode 100644 index ab74497850..0000000000 --- a/mpcontribs-api/build/lib/mpcontribs_api/domains/structures/repository.py +++ /dev/null @@ -1,15 +0,0 @@ -from mpcontribs_api.domains._shared.components import MongoDbComponentsRepository -from mpcontribs_api.domains.structures.models import ( - Structure, - StructureFilter, - StructureIn, - StructureOut, - StructurePatch, -) - - -class MongoDbStructureRepository( - MongoDbComponentsRepository[Structure, StructureIn, StructureOut, StructureFilter, StructurePatch] -): - document_model = Structure - out_model = StructureOut diff --git a/mpcontribs-api/build/lib/mpcontribs_api/domains/structures/router.py b/mpcontribs-api/build/lib/mpcontribs_api/domains/structures/router.py deleted file mode 100644 index 0a5746607c..0000000000 --- a/mpcontribs-api/build/lib/mpcontribs_api/domains/structures/router.py +++ /dev/null @@ -1,95 +0,0 @@ -from typing import Annotated - -from fastapi import APIRouter, Depends -from fastapi.responses import StreamingResponse -from fastapi_filter import FilterDepends - -from mpcontribs_api.dependencies import S3Dep, require_user -from mpcontribs_api.domains._shared.bulk import BulkWriteSummary -from mpcontribs_api.domains._shared.models import ComponentDeleteResponse -from mpcontribs_api.domains._shared.types import ( - DownloadFormat, - FieldSelector, - ShortMimeFormat, - download_filename, -) -from mpcontribs_api.domains.structures.dependencies import StructureServiceDep -from mpcontribs_api.domains.structures.models import StructureFilter, StructureIn, StructureOut, StructurePatch -from mpcontribs_api.pagination import CursorParams, Page - -router = APIRouter() - - -@router.get("", response_model=Page[StructureOut]) -async def get_structures( - service: StructureServiceDep, - pagination: Annotated[CursorParams, Depends()], - filter: StructureFilter = FilterDepends(StructureFilter), - fields: FieldSelector = StructureOut.default_fields(), -): - selected = StructureOut.parse_fields(fields) - return await service.get_many(filter=filter, fields=selected, pagination=pagination) - - -@router.get("/{pk}", response_model=StructureOut) -async def get_structure( - service: StructureServiceDep, - pk: str, - fields: FieldSelector = StructureOut.default_fields(), -): - selected = StructureOut.parse_fields(fields) - return await service.get_by_id(id=pk, fields=selected) - - -@router.get("/download/{short_mime}") -async def download_structure( - service: StructureServiceDep, - format: DownloadFormat, - s3: S3Dep, - short_mime: ShortMimeFormat = ShortMimeFormat.GZ, - ignore_cache: bool = False, - filter: StructureFilter = FilterDepends(StructureFilter), - fields: FieldSelector = StructureOut.default_fields(), -) -> StreamingResponse: - selected = StructureOut.parse_fields(fields) - body = await service.download( - format=format, - short_mime=short_mime, - ignore_cache=ignore_cache, - filter=filter, - fields=selected, - s3=s3, - ) - filename = download_filename("structures", format, short_mime) - return StreamingResponse( - body, - media_type="application/gzip", - headers={"Content-Disposition": f'attachment; filename="{filename}"'}, - ) - - -@router.post("", response_model=BulkWriteSummary[StructureOut], dependencies=[Depends(require_user)]) -async def insert_structures( - service: StructureServiceDep, - structures: list[StructureIn], -): - return await service.insert(components=structures) - - -@router.delete("", response_model=ComponentDeleteResponse, dependencies=[Depends(require_user)]) -async def delete_structures(service: StructureServiceDep, filter: StructureFilter = FilterDepends(StructureFilter)): - return await service.delete(filter=filter) - - -@router.delete("/{id}", response_model=ComponentDeleteResponse, dependencies=[Depends(require_user)]) -async def delete_structure_by_id(service: StructureServiceDep, id: str): - return await service.delete_by_id(id=id) - - -@router.patch("/{id}", dependencies=[Depends(require_user)]) -async def patch_structure_by_id( - service: StructureServiceDep, - id: str, - update: StructurePatch, -): - return await service.patch_by_id(id=id, update=update) diff --git a/mpcontribs-api/build/lib/mpcontribs_api/domains/tables/repository.py b/mpcontribs-api/build/lib/mpcontribs_api/domains/tables/repository.py deleted file mode 100644 index a6bda17912..0000000000 --- a/mpcontribs-api/build/lib/mpcontribs_api/domains/tables/repository.py +++ /dev/null @@ -1,13 +0,0 @@ -from mpcontribs_api.domains._shared.components import MongoDbComponentsRepository -from mpcontribs_api.domains.tables.models import ( - Table, - TableFilter, - TableIn, - TableOut, - TablePatch, -) - - -class MongoDbTableRepository(MongoDbComponentsRepository[Table, TableIn, TableOut, TableFilter, TablePatch]): - document_model = Table - out_model = TableOut diff --git a/mpcontribs-api/build/lib/mpcontribs_api/domains/tables/router.py b/mpcontribs-api/build/lib/mpcontribs_api/domains/tables/router.py deleted file mode 100644 index 619f4073e0..0000000000 --- a/mpcontribs-api/build/lib/mpcontribs_api/domains/tables/router.py +++ /dev/null @@ -1,95 +0,0 @@ -from typing import Annotated - -from fastapi import APIRouter, Depends -from fastapi.responses import StreamingResponse -from fastapi_filter import FilterDepends - -from mpcontribs_api.dependencies import S3Dep, require_user -from mpcontribs_api.domains._shared.bulk import BulkWriteSummary -from mpcontribs_api.domains._shared.models import ComponentDeleteResponse -from mpcontribs_api.domains._shared.types import ( - DownloadFormat, - FieldSelector, - ShortMimeFormat, - download_filename, -) -from mpcontribs_api.domains.tables.dependencies import TableServiceDep -from mpcontribs_api.domains.tables.models import Table, TableFilter, TableIn, TableOut, TablePatch -from mpcontribs_api.pagination import CursorParams, Page - -router = APIRouter() - - -@router.get("", response_model=Page[TableOut]) -async def get_tables( - service: TableServiceDep, - pagination: Annotated[CursorParams, Depends()], - filter: TableFilter = FilterDepends(TableFilter), - fields: FieldSelector = TableOut.default_fields(), -): - selected = TableOut.parse_fields(fields) - return await service.get_many(filter=filter, fields=selected, pagination=pagination) - - -@router.get("/{pk}", response_model=TableOut) -async def get_table( - service: TableServiceDep, - pk: str, - fields: FieldSelector = TableOut.default_fields(), -): - selected = TableOut.parse_fields(fields) - return await service.get_by_id(id=pk, fields=selected) - - -@router.get("/download/{short_mime}") -async def download_table( - service: TableServiceDep, - s3: S3Dep, - format: DownloadFormat, - short_mime: ShortMimeFormat = ShortMimeFormat.GZ, - ignore_cache: bool = False, - filter: TableFilter = FilterDepends(TableFilter), - fields: FieldSelector = TableOut.default_fields(), -) -> StreamingResponse: - selected = TableOut.parse_fields(fields) - body = await service.download( - format=format, - short_mime=short_mime, - ignore_cache=ignore_cache, - filter=filter, - fields=selected, - s3=s3, - ) - filename = download_filename("tables", format, short_mime) - return StreamingResponse( - body, - media_type="application/gzip", - headers={"Content-Disposition": f'attachment; filename="{filename}"'}, - ) - - -@router.post("", response_model=BulkWriteSummary[Table], dependencies=[Depends(require_user)]) -async def insert_tables( - service: TableServiceDep, - tables: list[TableIn], -): - return await service.insert(components=tables) - - -@router.delete("", response_model=ComponentDeleteResponse, dependencies=[Depends(require_user)]) -async def delete_tables(service: TableServiceDep, filter: TableFilter = FilterDepends(TableFilter)): - return await service.delete(filter=filter) - - -@router.delete("/{id}", response_model=ComponentDeleteResponse, dependencies=[Depends(require_user)]) -async def delete_table_by_id(service: TableServiceDep, id: str): - return await service.delete_by_id(id=id) - - -@router.patch("/{id}", dependencies=[Depends(require_user)]) -async def patch_table_by_id( - service: TableServiceDep, - id: str, - update: TablePatch, -): - return await service.patch_by_id(id=id, update=update) From afbbee18cc0cdcc66ee6fa2e5a5b29f2d7bbbe98 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 18 Jun 2026 13:03:18 -0700 Subject: [PATCH 159/591] Unified deletion behavior by moving BaseDocumentWithInput to inherit from Document instead of DocumentWithSoftDelet --- .../src/mpcontribs_api/domains/_shared/models.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py index 2c0a258153..2099f70d90 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py @@ -4,7 +4,7 @@ from collections.abc import Mapping from typing import Annotated, Any, ClassVar, Self -from beanie import DocumentWithSoftDelete, PydanticObjectId +from beanie import Document, PydanticObjectId from pydantic import BaseModel, Field from pymongo.results import DeleteResult @@ -13,7 +13,7 @@ from mpcontribs_api.projection import SparseFieldsModel -class BaseDocumentWithInput[TId](DocumentWithSoftDelete): +class BaseDocumentWithInput[TId](Document): """A stored resource document with a required ``id`` and an input counterpart. Subclasses bind their id type as ``TId``. The ``id`` is declared here as required and non-null so @@ -21,8 +21,7 @@ class BaseDocumentWithInput[TId](DocumentWithSoftDelete): type (``ShortStr`` for projects, ``PydanticObjectId`` for contributions). ``from_input_model`` translates a validated input payload into a full document; the base param is intentionally ``Any`` so each resource's override can declare its concrete input model without violating LSP (input - models subclass their document, so they can't be bound as a class type parameter). Soft-delete - behavior is inherited from ``DocumentWithSoftDelete``. + models subclass their document, so they can't be bound as a class type parameter). """ # Required, non-null, resource-specific id. Overrides Document's optional ``PydanticObjectId`` id. From 19df92907da251b3a6bb4a3926d918e4cdd06438 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 18 Jun 2026 15:24:43 -0700 Subject: [PATCH 160/591] Upsert now functions like bulk insert, allowing upserts to fail and reporting the successes and failures via BulkWriteSummary --- .../domains/contributions/router.py | 2 +- .../domains/contributions/service.py | 31 ++++++++++++++----- 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py index cd01cbd825..42dcdf562f 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py @@ -53,7 +53,7 @@ async def insert_contributions( return await service.insert_contributions(contributions=contributions) -@router.put("", dependencies=[Depends(require_user)]) +@router.put("", response_model=BulkWriteSummary[Contribution], dependencies=[Depends(require_user)]) async def upsert_contributions( service: ContributionServiceDep, contributions: list[ContributionIn], diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py index 5da70bdc31..dd9bb350c6 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py @@ -255,8 +255,8 @@ async def _do_insert(self, contrib: ContributionIn, session: AsyncClientSession) doc.tables = cast(list[Link[Table]] | None, tables or None) return await self._contributions.insert_contribution(doc, session=session) - async def upsert_contributions(self, contributions: list[ContributionIn]) -> list[Contribution]: - """Upsert contributions by their identifying fields, bounded by concurrency caps. + async def upsert_contributions(self, contributions: list[ContributionIn]) -> BulkWriteSummary[Contribution]: + """Upsert contributions by their identifying fields, reporting per-item outcomes. Components (structures, tables, attachments) must be managed via their respective services. If any contribution in the batch carries components, the entire request is @@ -265,14 +265,22 @@ async def upsert_contributions(self, contributions: list[ContributionIn]) -> lis Each item is upserted atomically by ``ContributionIn.identifiers()`` via a single ``findOneAndUpdate(..., upsert=True)`` so two requests targeting the same key cannot race past the find branch — the unique index over those fields is the tiebreaker. - Concurrent upserts within a batch are bounded by ``settings.mongo.max_concurrent_transactions`` + Concurrent upserts within a batch are bounded by ``settings.mongo.max_concurrent_transactions``. + A single item failing does not fail the batch: it is reported in ``failed`` while the others + still commit (mirroring ``insert_contributions``). Args: contributions: contributions to upsert; must not include nested components Returns: - list[Contribution]: upserted documents in input order + BulkWriteSummary[Contribution]: per-item outcome, sized to ``len(contributions)`` + + Raises: + ValidationError: if any contribution in the batch carries components """ + if not contributions: + return BulkWriteSummary[Contribution](total=0, succeeded=[], failed=[]) + indices_with_components = [i for i, c in enumerate(contributions) if c.has_components()] if indices_with_components: raise ValidationError( @@ -282,11 +290,18 @@ async def upsert_contributions(self, contributions: list[ContributionIn]) -> lis sem = asyncio.Semaphore(self._settings.max_concurrent_transactions) - async def _bounded_upsert(contrib: ContributionIn) -> Contribution: + async def _bounded_upsert(index: int, contrib: ContributionIn) -> Contribution | BulkFailure: async with sem: - return await self._contributions.upsert_contribution_by_identifiers(contrib.identifiers(), contrib) - - return await asyncio.gather(*[_bounded_upsert(c) for c in contributions]) + try: + return await self._contributions.upsert_contribution_by_identifiers(contrib.identifiers(), contrib) + except Exception as exc: + logger.error("upsert_contribution_failed", index=index, identifier=contrib.identifiers()) + return bulk_failure_from_exception(index, contrib.identifiers(), exc) + + results = await asyncio.gather(*[_bounded_upsert(i, c) for i, c in enumerate(contributions)]) + succeeded = [r for r in results if not isinstance(r, BulkFailure)] + failed = [r for r in results if isinstance(r, BulkFailure)] + return BulkWriteSummary[Contribution](total=len(contributions), succeeded=succeeded, failed=failed) async def delete_contributions(self, filter: ContributionFilter) -> BulkDeleteSummary: """Delete a contribution and all of its child components From 09c6a2577681b0cc65d1a21db70c7e9f7c3a2917 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 18 Jun 2026 15:40:43 -0700 Subject: [PATCH 161/591] Improved sensitivity of dict key validation --- .../domains/contributions/models.py | 31 +++++++++++++------ 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py index 8c1a7f45b8..8bfe04c619 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py @@ -51,18 +51,29 @@ def _validate_data_depth(data: dict[str, Any] | None) -> dict[str, Any] | None: def _validate_keys(data: dict[str, Any] | None) -> dict[str, Any] | None: if data is None: return None - if not all(isinstance(k, str) and k.isascii() for k in data.keys()): + keys = list(data.keys()) + if not all(isinstance(k, str) and k.isascii() for k in keys): raise ValidationError("Non-ASCII key found in Contribution.data. All dict keys must be only ASCII") - if any(_DATA_PUNCTUATION_PATTERN.fullmatch(k) is None for k in data.keys()): + if any(k == "" for k in keys): + raise ValidationError("Empty key found in Contribution.data. Keys must be non-empty.") + if any(_DATA_PUNCTUATION_PATTERN.fullmatch(k) is None for k in keys): raise ValidationError( "Punctuation found in Contribution.data keys. Only '_', '*', '/', and at most 1 '|' permitted." ) + # Recurse into nested dicts, including dicts nested inside lists. for v in data.values(): - if isinstance(v, dict): - _validate_keys(v) + _validate_nested_keys(v) return data +def _validate_nested_keys(value: Any) -> None: + if isinstance(value, dict): + _validate_keys(value) + elif isinstance(value, list): + for item in value: + _validate_nested_keys(item) + + class ContributionBase(BaseDocumentWithInput[PydanticObjectId]): project: str identifier: str @@ -103,9 +114,11 @@ class Contribution(ContributionBase): @classmethod def from_input_model(cls, data: ContributionIn) -> Contribution: + # Server-owned fields are not taken from input: is_public starts False, components are + # inserted separately, and last_modified is stamped by the before_event hook. return cls.model_validate( { - **data.model_dump(exclude={"is_public", "structures", "tables", "attachments"}), + **data.model_dump(exclude={"is_public", "structures", "tables", "attachments", "last_modified"}), "is_public": False, } ) @@ -140,11 +153,9 @@ class ContributionOut(DocumentOut[PydanticObjectId]): is_public: bool | None = None last_modified: datetime | None = None needs_build: bool | None = None - data: Annotated[ - dict[str, Any] | None, - BeforeValidator(_validate_data_depth), - BeforeValidator(_validate_keys), - ] = None + # No input validators on the read path: stored documents are trusted, and re-validating here + # would 500 on historical data that missed the correction (see carrier_transport contribs) + data: dict[str, Any] | None = None structures: list[Link[Structure]] | None = None tables: list[Link[Table]] | None = None attachments: list[Link[Attachment]] | None = None From 4a48ef74d1de516862d620f41131bb8f9377cb71 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 18 Jun 2026 16:00:23 -0700 Subject: [PATCH 162/591] Simplified md5 check and improved patch_component_by_id --- .../domains/_shared/components.py | 80 +++++++++++-------- 1 file changed, 48 insertions(+), 32 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py index 499a334149..1af1edb05e 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py @@ -1,6 +1,5 @@ from typing import Any -from beanie import PydanticObjectId from beanie.operators import In from fastapi_filter.contrib.beanie import Filter from pydantic import BaseModel @@ -8,14 +7,15 @@ from mpcontribs_api.authz import User from mpcontribs_api.config import get_settings -from mpcontribs_api.domains._shared.models import Component, DeleteResponse, DocumentOut +from mpcontribs_api.domains._shared.models import Component, ComponentIn, DeleteResponse, DocumentOut from mpcontribs_api.domains._shared.repository import MongoDbRepository from mpcontribs_api.domains._shared.types import MD5Hash +from mpcontribs_api.exceptions import NotFoundError class MongoDbComponentsRepository[ TDoc: Component, - TIn: Component, + TIn: ComponentIn, TOut: DocumentOut, TFilter: Filter, TPatch: BaseModel, @@ -24,48 +24,50 @@ class MongoDbComponentsRepository[ def _build_scope(user: User) -> dict[str, Any]: return {} - async def _check_existing( + async def _existing_by_md5( self, - components: list[TIn] | TIn, + md5s: list[MD5Hash], session: AsyncClientSession | None = None, - ) -> tuple[dict[MD5Hash, TIn], dict[str, TDoc]]: - if not isinstance(components, list): - components = [components] - by_md5 = {comp.md5: comp for comp in components} - + ) -> dict[str, TDoc]: # Full fetch so existing docs come back with their ids # TODO: Most likely does a COLLSCAN - see if we can project to get a COVERED QUERY existing_docs = await self.document_model.find( - In(self.document_model.md5, list(by_md5.keys())), + In(self.document_model.md5, md5s), session=session, ).to_list() - return (by_md5, {doc.md5: doc for doc in existing_docs}) + return {doc.md5: doc for doc in existing_docs} async def insert_components( self, components: list[TIn], session: AsyncClientSession | None = None, ) -> list[TDoc]: - """Bulk-insert components, chunked to fit within a transaction's payload budget. + """Bulk-insert components, deduplicated by server-computed content hash. + + Each input is built into a full document via ``Component.from_input``, which assigns a fresh + id and computes ``md5`` from the content (the client never supplies it). Inputs are + deduplicated by md5 — both against documents already stored and against each other — so the + return list has one entry per *unique* content, in first-seen order. Args: components (list[TIn]): components to insert session (AsyncClientSession): optional client session; pass when inserting inside a transaction """ - by_md5, existing_by_md5 = await self._check_existing(components=components, session=session) - # Assign ids manually: insert_many won't populate id back onto these - # objects, and get_dict drops id when it's None. - new_docs: list[TDoc] = [] - for md5, comp in by_md5.items(): - if md5 in existing_by_md5: - continue - doc = self.document_model.model_validate(comp.model_dump()) - doc.id = PydanticObjectId() - new_docs.append(doc) - - # TODO: Might want to delegate this logic to a higher level - # - This method might want to simply insert everything it's given - # Insert by chunks + # Build full docs up front so md5 is server-computed before any dedup decision. + docs = [self.document_model.from_input(comp) for comp in components] + existing_by_md5 = await self._existing_by_md5([doc.md5 for doc in docs], session=session) + + # First-seen unique md5 order, and the new documents that need inserting. + unique_md5s: list[str] = [] + new_by_md5: dict[str, TDoc] = {} + for doc in docs: + if doc.md5 not in existing_by_md5 and doc.md5 not in new_by_md5: + new_by_md5[doc.md5] = doc + if doc.md5 not in unique_md5s: + unique_md5s.append(doc.md5) + + # Insert by chunks to stay within a transaction's payload budget. + new_docs = list(new_by_md5.values()) chunk_size = get_settings().mongo.component_insert_chunk_size for start in range(0, len(new_docs), chunk_size): await self.document_model.insert_many( @@ -74,9 +76,9 @@ async def insert_components( session=session, ) - # Return a list of documents reflecting what was stored/found - resolved = existing_by_md5 | {doc.md5: doc for doc in new_docs} - return [resolved[md5] for md5 in by_md5] + # One resolved document per unique md5, in first-seen order. + resolved = existing_by_md5 | new_by_md5 + return [resolved[md5] for md5 in unique_md5s] async def insert_component(self, component: TIn, *, session: AsyncClientSession | None = None) -> TDoc: """Insert a single component. @@ -131,5 +133,19 @@ async def delete_component_by_id( return await self.delete_by_id(id=self._convert_object_id(id), session=session) async def patch_component_by_id(self, id: str, update: TPatch) -> TDoc: - """Partially update a component by id, scoped to the current user. See ``patch``.""" - return await self.patch(self._convert_object_id(id), update) + """Partially update a component by id, recomputing its content hash. + + Components are content-addressed, so a content change must update ``md5``. Unlike the base + ``patch`` (an in-place ``$set``), this loads the full document, applies the set fields, + recomputes ``md5`` from ``hash_fields``, and saves — keeping md5 consistent with content. + """ + oid = self._convert_object_id(id) + doc = await self.document_model.find_one(self._scope, self.document_model.id == oid) + if doc is None: + raise NotFoundError(self._not_found(id)) + update_data = update.model_dump(exclude_unset=True) + for field, value in update_data.items(): + setattr(doc, field, value) + doc.md5 = doc.compute_md5() + await doc.save() + return doc From cb90bc76699ca529259a928aa4073f80e0ddc4c3 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 18 Jun 2026 16:01:34 -0700 Subject: [PATCH 163/591] Added a constant for how to handle encoding of polars.DataFrames to have consistent (re)serialization --- mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py index 9f7c2ef72f..bfaf0e4a1f 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py @@ -91,6 +91,13 @@ def _serialize_frame(data: pl.DataFrame) -> dict: return data.to_dict(as_series=False) +# Beanie/pymongo would otherwise BSON-encode a pl.DataFrame by iterating it into bare column +# lists, dropping the column names and the dict shape the Pydantic serializer produces — which +# `_coerce_frame` cannot read back. Registering this on a Document's Settings.bson_encoders makes +# the stored form match the serialized form, so frames round-trip losslessly. +FRAME_BSON_ENCODERS = {pl.DataFrame: _serialize_frame} + + PolarsFrame = Annotated[ pl.DataFrame, BeforeValidator(_coerce_frame), From 1c7a420f5038b3a5778eb42e363095aac682727a Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 18 Jun 2026 16:02:27 -0700 Subject: [PATCH 164/591] Improved dataframe handling to read and write dataframes --- .../mpcontribs_api/domains/tables/models.py | 167 +++++++++++------- 1 file changed, 100 insertions(+), 67 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py index 6ea93ed2be..b18e8443e3 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py @@ -1,4 +1,5 @@ -from typing import Any +from collections.abc import Mapping +from typing import Any, Self import polars as pl from beanie import PydanticObjectId @@ -10,9 +11,8 @@ model_validator, ) -from mpcontribs_api.domains._shared.models import Component, DocumentOut +from mpcontribs_api.domains._shared.models import Component, ComponentIn, DocumentOut from mpcontribs_api.domains._shared.types import MD5Hash, PolarsFrame -from mpcontribs_api.exceptions import ValidationError from mpcontribs_api.projection import SparseFieldsModel @@ -27,70 +27,76 @@ class Attributes(BaseModel): labels: Labels -class Table(Component): - model_config = ConfigDict(arbitrary_types_allowed=True) - hash_fields = frozenset({"index", "columns", "data"}) - - attrs: Attributes - total_data_rows: int - data: PolarsFrame +def frame_to_storage(frame: pl.DataFrame) -> tuple[list[str], list[str], list[list[str]]]: + """Split a DataFrame into (index, columns, data) for storage. - class Settings: - name = "tables" + The first column is the index; the rest are the data columns. Every value is stringified. + """ + if not frame.columns: + return [], [], [] + index_col, *data_cols = frame.columns + index = [str(v) for v in frame[index_col].to_list()] + data = [[str(v) for v in row] for row in frame.select(data_cols).iter_rows()] + return index, list(data_cols), data -class TableIn(Table): - @model_validator(mode="after") - def data_dimensions(self): - if len(self.data) != self.total_data_rows: - raise ValidationError( - f"`total_data_rows` ({self.total_data_rows}) does not match number of rows in `data` ({len(self.data)})" - ) - return self +def storage_to_frame(index_label: str, index: list[str], columns: list[str], data: list[list[str]]) -> pl.DataFrame: + """Rebuild the DataFrame from stored (index, columns, data), all columns typed as strings.""" + schema = {name: pl.Utf8 for name in [index_label, *columns]} + rows = [[idx, *row] for idx, row in zip(index, data, strict=True)] + return pl.DataFrame(rows, schema=schema, orient="row") - @staticmethod - def _check_column_collision(columns: list[str], index_name: str) -> None: - if index_name in columns: - raise ValidationError(f"column name collision: {index_name!r} already in columns") - @staticmethod - def _check_index_data_lengths(index: list, data: list[list]) -> None: - if len(index) != len(data): - raise ValidationError(f"length mismatch between `index` ({len(index)}) and `data` ({len(data)})") +def _index_label(attrs: Any) -> str: + """The DataFrame's index-column name comes from ``attrs.labels.index`` (dict or model).""" + if attrs is None: + return "index" + if isinstance(attrs, Mapping): + return attrs.get("labels", {}).get("index", "index") + return getattr(getattr(attrs, "labels", None), "index", "index") - @staticmethod - def _check_declared_row_count(declared: int, data: list[list]) -> None: - if declared != len(data): - raise ValidationError( - f"`total_data_rows` ({declared}) does not match length of `data` ({len(data)}) in source document" - ) - @classmethod - def _validate_input(cls, doc, index_name: str) -> None: - cls._check_column_collision(doc["columns"], index_name) - cls._check_index_data_lengths(doc["index"], doc["data"]) - cls._check_declared_row_count(doc["total_data_rows"], doc["data"]) +class Table(Component): + """Stored table document — matches the existing MongoDB shape (index/columns/data as strings).""" - @classmethod - def from_input(cls, doc, index_name: str = "index"): - cls._validate_input(doc, index_name) + hash_fields = frozenset({"attrs", "index", "columns", "data"}) - columns = [index_name, *doc["columns"]] + attrs: Attributes + index: list[str] + columns: list[str] + data: list[list[str]] + total_data_rows: int - # Strict=false since we explicitly handle our own errors - rows = [[idx, *row] for idx, row in zip(doc["index"], doc["data"], strict=False)] - df = pl.DataFrame(rows, schema=columns, orient="row") + class Settings: + name = "tables" + @classmethod + def from_input(cls, input: TableIn) -> Self: # pyright: ignore[reportIncompatibleMethodOverride] + # The input frame's first column is the index; the rest are the data columns. total_data_rows + # is derived from the data, so it is always consistent by construction. + index, columns, data = frame_to_storage(input.data) return cls( - _id=doc["id"], - name=doc["name"], - md5=doc["md5"], - attrs=doc["attrs"], - data=df, - total_data_rows=doc["total_data_rows"], + _id=PydanticObjectId(), + name=input.name, + attrs=input.attrs, + index=index, + columns=columns, + data=data, + total_data_rows=len(data), ) +class TableIn(ComponentIn): + """User-supplied table content as a DataFrame (first column = index). + + ``_id`` and ``md5`` are server-assigned, so absent here. + """ + + model_config = ConfigDict(arbitrary_types_allowed=True) + attrs: Attributes + data: PolarsFrame + + class TableFilter(Filter): id: PydanticObjectId | None = None id__in: list[PydanticObjectId] | None = None @@ -123,38 +129,65 @@ def id_to_str(self, v: PydanticObjectId | list[PydanticObjectId] | None) -> str return str(v) -class TableSummaryOut(BaseModel): - """Metadata-only table as embedded in contribution responses (no data).""" - - attrs: Attributes - columns: list[str] - total_data_rows: int - total_data_pages: int = 1 - - class TableOut(DocumentOut[PydanticObjectId]): - model_config = ConfigDict(arbitrary_types_allowed=True) + # extra="allow" so that when ``data`` is requested the full document (including the stored + # ``index``/``columns``) is fetched — Beanie derives the Mongo projection from a plain model's + # fields, and the frame can only be rebuilt from all three. ``_assemble_frame`` drops the raw + # storage keys so they never surface on the response. + model_config = ConfigDict(arbitrary_types_allowed=True, extra="allow") name: str | None = None md5: MD5Hash | None = None attrs: Attributes | None = None - columns: list[Any] | None = None total_data_rows: int | None = None - total_data_pages: int | None = None - index: list[Any] | None = None data: PolarsFrame | None = None + @model_validator(mode="before") + @classmethod + def _assemble_frame(cls, value: Any) -> Any: + """Rebuild ``data`` as a DataFrame from the stored ``index``/``columns``/``data`` triple. + + Accepts either a Mongo dict (read path) or a ``Table``-like object (download path, + ``from_attributes``). When the storage triple is absent (e.g. a light projection without + ``data``, or a TableOut built directly with a frame) the input passes through unchanged. + """ + getter = value.get if isinstance(value, Mapping) else lambda key: getattr(value, key, None) + index, columns, raw = getter("index"), getter("columns"), getter("data") + if index is None or columns is None or not isinstance(raw, list): + return value + + attrs = getter("attrs") + index_label = _index_label(attrs) + normalized: dict[str, Any] = { + "_id": getter("id") if isinstance(value, Mapping) and "id" in value else getter("_id") or getter("id"), + "name": getter("name"), + "md5": getter("md5"), + "attrs": attrs, + "total_data_rows": getter("total_data_rows"), + "data": storage_to_frame(index_label, index, columns, raw), + } + return {key: val for key, val in normalized.items() if val is not None} + @staticmethod def default_fields() -> list[str]: + # Light default; the tabular payload (data) is fetched via ?_fields=. return [ "id", "name", "md5", "attrs", - "columns", "total_data_rows", - "total_data_pages", ] + @classmethod + def projection(cls, fields): + # Light reads use the normal partial-projection (no data/index/columns fetched). When the + # frame is requested, fall back to the full model so index+columns+data come back together + # and ``_assemble_frame`` can rebuild it. + if fields is not None and "data" not in fields: + return super().projection(fields) + return cls + class TablePatch(SparseFieldsModel): name: str | None = None + attrs: Attributes | None = None From 57d906a9a4a7989ec83fdd4dd9f395c972dc7ebe Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 18 Jun 2026 16:04:12 -0700 Subject: [PATCH 165/591] Made ComponentIn to clarify and unify input schema from storage schema --- .../mpcontribs_api/domains/_shared/models.py | 43 ++++++++++++++++++- .../mpcontribs_api/domains/_shared/service.py | 4 +- .../domains/attachments/models.py | 35 ++++++++++----- .../domains/structures/models.py | 24 ++++++++--- 4 files changed, 87 insertions(+), 19 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py index 2099f70d90..2dfb073c66 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py @@ -5,7 +5,7 @@ from typing import Annotated, Any, ClassVar, Self from beanie import Document, PydanticObjectId -from pydantic import BaseModel, Field +from pydantic import BaseModel, Field, model_validator from pymongo.results import DeleteResult from mpcontribs_api import pagination @@ -76,12 +76,51 @@ def canonical_md5(payload: Mapping[str, Any]) -> str: return hashlib.md5(normalized.encode("utf-8")).hexdigest() +class ComponentIn(BaseModel): + """Base for component input payloads. + + Components are content-addressed: the server computes ``md5`` from the content and assigns the + ``_id`` on insert, so neither is part of the input contract. Subclasses add the required content + fields for their resource. + """ + + name: str + + class Component(BaseDocumentWithInput[PydanticObjectId]): + """Stored component document. + + ``md5`` is server-authoritative: it is (re)computed from ``hash_fields`` whenever a full document + is validated — on insert, on update, and on full-document reads — so a client-supplied value can + never define a component's content identity. + """ + name: str - md5: MD5Hash + # Server-computed; the placeholder default is overwritten by ``_recompute_md5`` on validation. + md5: MD5Hash = Field(default="0" * 32) hash_fields: ClassVar[frozenset[str]] + # The md5 functions look redundant but aren't, we should keep both + # Used in patching to compute the hash after an update - should not return self def compute_md5(self) -> str: payload = self.model_dump(mode="json", include=set(self.hash_fields), by_alias=False) return canonical_md5(payload) + + # Used on validation - must return self + @model_validator(mode="after") + def _recompute_md5(self) -> Self: + self.md5 = self.compute_md5() + return self + + @classmethod + def from_input(cls, input: ComponentIn) -> Self: + """Build a stored document from an input payload, assigning a fresh id (md5 is computed). + + The default maps every input field onto the document one-to-one. Subclasses whose document + carries fields that are absent from the input or derived from it should override this - see + ``Table.from_input``, which computes ``total_data_rows`` from the data frame. + """ + payload = input.model_dump() + payload["_id"] = PydanticObjectId() + return cls.model_validate(payload) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/service.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/service.py index 1b17a18d86..d3ce92337e 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/service.py @@ -7,7 +7,7 @@ from types_aiobotocore_s3 import S3Client from mpcontribs_api.domains._shared.components import MongoDbComponentsRepository -from mpcontribs_api.domains._shared.models import Component, ComponentDeleteResponse, DocumentOut +from mpcontribs_api.domains._shared.models import Component, ComponentDeleteResponse, ComponentIn, DocumentOut from mpcontribs_api.domains._shared.types import DownloadFormat, ShortMimeFormat from mpcontribs_api.domains.contributions.repository import MongoDbContributionRepository from mpcontribs_api.exceptions import NotFoundError @@ -16,7 +16,7 @@ class ComponentService[ TDoc: Component, - TIn: Component, + TIn: ComponentIn, TOut: DocumentOut, TFilter: Filter, TPatch: BaseModel, diff --git a/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py b/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py index 3f949dfe74..7f5863706d 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py @@ -2,7 +2,7 @@ from fastapi_filter.contrib.beanie import Filter from pydantic import field_validator -from mpcontribs_api.domains._shared.models import Component, DocumentOut +from mpcontribs_api.domains._shared.models import Component, ComponentIn, DocumentOut from mpcontribs_api.domains._shared.types import FileLike, MD5Hash, MimeFormat from mpcontribs_api.exceptions import ValidationError from mpcontribs_api.projection import SparseFieldsModel @@ -10,6 +10,16 @@ ACCEPTED_FORMATS = ["jpg", "jpeg", "png", "csv", "parquet", "gz"] +def _validate_attachment_name(v: str) -> str: + parts = v.strip().split(".") + if parts[-1].lower() not in ACCEPTED_FORMATS: + raise ValidationError( + f"Attachment extension not in allowed formats: {ACCEPTED_FORMATS}", + found_extension=parts[-1], + ) + return v + + class Attachment(Component): hash_fields = frozenset({"mime", "content"}) mime: MimeFormat @@ -21,32 +31,37 @@ class Settings: @field_validator("name", mode="before") @classmethod def _name_with_extension(cls, v: str) -> str: - parts = v.strip().split(".") - if parts[-1].lower() not in ACCEPTED_FORMATS: - raise ValidationError( - f"Attachment extension not in allowed formats: {ACCEPTED_FORMATS}", - found_extension=parts[-1], - ) - return v + return _validate_attachment_name(v) + +class AttachmentIn(ComponentIn): + """User-supplied attachment content. ``_id`` and ``md5`` are server-assigned, so absent here.""" -class AttachmentIn(Attachment): - pass + mime: MimeFormat + content: int + + @field_validator("name", mode="before") + @classmethod + def _name_with_extension(cls, v: str) -> str: + return _validate_attachment_name(v) class AttachmentOut(DocumentOut[PydanticObjectId]): name: FileLike | None = None md5: MD5Hash | None = None mime: MimeFormat | None = None + content: int | None = None @staticmethod def default_fields() -> list[str]: + # Light default; content fetched via ?_fields=. return ["id", "name", "md5", "mime"] class AttachmentPatch(SparseFieldsModel): name: FileLike | None = None mime: MimeFormat | None = None + content: int | None = None class AttachmentFilter(Filter): diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py index b462d70aea..4fa5b53696 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py @@ -3,8 +3,8 @@ from pydantic import BaseModel, ConfigDict from pymatgen.core import Element -from mpcontribs_api.domains._shared.models import Component, DocumentOut -from mpcontribs_api.domains._shared.types import MD5Hash, PolarsFrame +from mpcontribs_api.domains._shared.models import Component, ComponentIn, DocumentOut +from mpcontribs_api.domains._shared.types import FRAME_BSON_ENCODERS, MD5Hash, PolarsFrame from mpcontribs_api.projection import SparseFieldsModel @@ -55,18 +55,30 @@ class Structure(Component): class Settings: name = "structures" + bson_encoders = FRAME_BSON_ENCODERS -class StructureIn(Structure): - pass +class StructureIn(ComponentIn): + """User-supplied structure content. ``_id`` and ``md5`` are server-assigned, so absent here.""" + + lattice: Lattice + sites: list[Site] + charge: float | None = None + cif: str class StructureOut(DocumentOut[PydanticObjectId]): + model_config = ConfigDict(arbitrary_types_allowed=True) name: str | None = None md5: MD5Hash | None = None + lattice: Lattice | None = None + sites: list[Site] | None = None + charge: float | None = None + cif: str | None = None @staticmethod def default_fields() -> list[str]: + # Light default; content (lattice/sites/charge/cif) is fetched via ?_fields=. return [ "id", "name", @@ -77,7 +89,9 @@ def default_fields() -> list[str]: class StructurePatch(SparseFieldsModel): name: str | None = None lattice: Lattice | None = None - sites: Site | None = None + sites: list[Site] | None = None + charge: float | None = None + cif: str | None = None class StructureFilter(Filter): From 79926128b6ef1166e53823b879ead3d3be536e6f Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 18 Jun 2026 16:04:41 -0700 Subject: [PATCH 166/591] Modified tests to account for new handling --- .../db/test_component_reachability.py | 29 +-- .../db/test_components_repository.py | 110 +++++++--- .../integration/test_component_routes.py | 9 + .../integration/test_contributions_routes.py | 8 +- .../unit/domains/test_attachments_models.py | 32 ++- .../unit/domains/test_contribution_service.py | 40 +++- .../tests/unit/domains/test_shared_models.py | 17 +- .../unit/domains/test_structures_models.py | 48 +++-- .../tests/unit/domains/test_tables_models.py | 192 +++++++++--------- 9 files changed, 295 insertions(+), 190 deletions(-) diff --git a/mpcontribs-api/tests/integration/db/test_component_reachability.py b/mpcontribs-api/tests/integration/db/test_component_reachability.py index d5175b68e5..0f7faf0885 100644 --- a/mpcontribs-api/tests/integration/db/test_component_reachability.py +++ b/mpcontribs-api/tests/integration/db/test_component_reachability.py @@ -29,17 +29,18 @@ def _service(user: User) -> ComponentService: ) -async def _attachment(md5: str) -> Attachment: - doc = Attachment(_id=PydanticObjectId(), name="d.csv", md5=md5, mime="application/gzip", content=1) +async def _attachment(content: int) -> Attachment: + # md5 is server-computed from (mime, content); distinct content -> distinct md5/dedup. + doc = Attachment(_id=PydanticObjectId(), name="d.csv", mime="application/gzip", content=content) await doc.insert() return doc -async def _contribution(*, is_public: bool, attachments: list[Attachment]) -> Contribution: +async def _contribution(identifier: str, *, is_public: bool, attachments: list[Attachment]) -> Contribution: doc = Contribution( _id=PydanticObjectId(), project="reach-proj", - identifier=f"mp-{md5[:6]}" if (md5 := attachments[0].md5) else "mp-x", + identifier=identifier, formula="Fe2O3", data={"x": 1}, is_public=is_public, @@ -51,31 +52,31 @@ async def _contribution(*, is_public: bool, attachments: list[Attachment]) -> Co class TestComponentReadReachability: async def test_get_by_id_returns_reachable_component(self, db): - att = await _attachment("a" * 32) - await _contribution(is_public=True, attachments=[att]) + att = await _attachment(1) + await _contribution("mp-pub", is_public=True, attachments=[att]) result = await _service(ANON).get_by_id(str(att.id), fields=None) assert result is not None assert result.id == att.id async def test_get_by_id_hides_unreachable_component(self, db): - att = await _attachment("b" * 32) + att = await _attachment(2) # Referenced only by a private contribution -> anonymous cannot reach it. - await _contribution(is_public=False, attachments=[att]) + await _contribution("mp-priv", is_public=False, attachments=[att]) result = await _service(ANON).get_by_id(str(att.id), fields=None) assert result is None async def test_get_by_id_hides_orphan_component(self, db): # No contribution references this attachment at all. - att = await _attachment("c" * 32) + att = await _attachment(3) result = await _service(ANON).get_by_id(str(att.id), fields=None) assert result is None async def test_get_many_only_lists_reachable(self, db): - pub = await _attachment("d" * 32) - priv = await _attachment("e" * 32) - orphan = await _attachment("f" * 32) - await _contribution(is_public=True, attachments=[pub]) - await _contribution(is_public=False, attachments=[priv]) + pub = await _attachment(10) + priv = await _attachment(20) + orphan = await _attachment(30) + await _contribution("mp-a", is_public=True, attachments=[pub]) + await _contribution("mp-b", is_public=False, attachments=[priv]) page = await _service(ANON).get_many(filter=AttachmentFilter(), pagination=CursorParams(), fields=None) ids = {item.id for item in page.items} diff --git a/mpcontribs-api/tests/integration/db/test_components_repository.py b/mpcontribs-api/tests/integration/db/test_components_repository.py index 5639553c9d..8a3845aaf5 100644 --- a/mpcontribs-api/tests/integration/db/test_components_repository.py +++ b/mpcontribs-api/tests/integration/db/test_components_repository.py @@ -29,14 +29,9 @@ def _repo() -> MongoDbAttachmentRepository: return MongoDbAttachmentRepository(USER) -def _attachment(md5: str, name: str = "data.csv", content: int = 1) -> AttachmentIn: - return AttachmentIn( - _id=PydanticObjectId(), - name=name, - md5=md5, - mime="application/gzip", - content=content, - ) +def _attachment(content: int = 1, name: str = "data.csv") -> AttachmentIn: + # md5 is server-computed from (mime, content), so `content` drives dedup identity. + return AttachmentIn(name=name, mime="application/gzip", content=content) async def _count() -> int: @@ -49,28 +44,28 @@ async def _count() -> int: class TestInsertComponentsDedupe: - async def test_duplicate_md5_in_batch_inserted_once(self, db): - # Two inputs share an md5; only one document should be written. - await _repo().insert_components([_attachment("a" * 32), _attachment("a" * 32), _attachment("b" * 32)]) + async def test_duplicate_content_in_batch_inserted_once(self, db): + # Two inputs share content (-> same md5); only one document should be written. + await _repo().insert_components([_attachment(1), _attachment(1), _attachment(2)]) assert await _count() == 2 async def test_returns_one_doc_per_unique_md5(self, db): - result = await _repo().insert_components([_attachment("a" * 32), _attachment("a" * 32)]) + result = await _repo().insert_components([_attachment(1), _attachment(1)]) assert len(result) == 1 async def test_existing_md5_not_reinserted(self, db): - await _repo().insert_components([_attachment("a" * 32)]) - # Re-submit the existing md5 alongside a new one. - await _repo().insert_components([_attachment("a" * 32), _attachment("b" * 32)]) + await _repo().insert_components([_attachment(1)]) + # Re-submit the existing content alongside new content. + await _repo().insert_components([_attachment(1), _attachment(2)]) assert await _count() == 2 async def test_existing_doc_returned_with_original_id(self, db): - first = await _repo().insert_components([_attachment("a" * 32)]) - again = await _repo().insert_components([_attachment("a" * 32)]) + first = await _repo().insert_components([_attachment(1)]) + again = await _repo().insert_components([_attachment(1)]) assert again[0].id == first[0].id async def test_inserted_docs_have_ids(self, db): - result = await _repo().insert_components([_attachment("a" * 32), _attachment("b" * 32)]) + result = await _repo().insert_components([_attachment(1), _attachment(2)]) assert all(doc.id is not None for doc in result) @@ -83,8 +78,8 @@ class TestInsertComponentsChunking: async def test_all_docs_persisted_across_multiple_chunks(self, db, monkeypatch): # Force a chunk size smaller than the batch so the chunking loop runs >1 time. monkeypatch.setattr(get_settings().mongo, "component_insert_chunk_size", 2) - # md5 must be 32-char hex; build distinct values explicitly. - attachments = [_attachment(format(i, "032x")) for i in range(5)] + # Distinct content -> distinct md5 so all five survive dedup. + attachments = [_attachment(i) for i in range(5)] result = await _repo().insert_components(attachments) assert len(result) == 5 assert await _count() == 5 @@ -97,10 +92,11 @@ async def test_all_docs_persisted_across_multiple_chunks(self, db, monkeypatch): class TestInsertComponent: async def test_single_insert_persists(self, db): - doc = await _repo().insert_component(_attachment("c" * 32)) + doc = await _repo().insert_component(_attachment(3)) found = await Attachment.find_one(Attachment.id == doc.id) assert found is not None - assert found.md5 == "c" * 32 + assert found.md5 == doc.md5 + assert len(found.md5) == 32 # --------------------------------------------------------------------------- @@ -110,15 +106,15 @@ async def test_single_insert_persists(self, db): class TestDeleteComponents: async def test_filtered_delete_removes_only_matches(self, db): - await _repo().insert_components([_attachment("a" * 32), _attachment("b" * 32)]) - result = await _repo().delete_components(AttachmentFilter(md5="a" * 32)) + keep, drop = await _repo().insert_components([_attachment(1), _attachment(2)]) + result = await _repo().delete_components(AttachmentFilter(md5=drop.md5)) assert result.num_deleted == 1 remaining = {doc.md5 async for doc in Attachment.find_all()} - assert remaining == {"b" * 32} + assert remaining == {keep.md5} async def test_delete_by_id_removes_one(self, db): """delete_component_by_id matches a string id by converting it to ObjectId.""" - [doc] = await _repo().insert_components([_attachment("a" * 32)]) + [doc] = await _repo().insert_components([_attachment(1)]) result = await _repo().delete_component_by_id(str(doc.id)) assert result.num_deleted == 1 assert await _count() == 0 @@ -137,15 +133,26 @@ async def test_delete_by_unknown_id_raises(self, db): class TestPatchComponent: async def test_patch_updates_field(self, db): - [doc] = await _repo().insert_components([_attachment("a" * 32, name="data.csv")]) + [doc] = await _repo().insert_components([_attachment(1, name="data.csv")]) updated = await _repo().patch_component_by_id(str(doc.id), AttachmentPatch(name="renamed.png")) assert updated.name == "renamed.png" async def test_empty_patch_returns_existing(self, db): - [doc] = await _repo().insert_components([_attachment("a" * 32, name="data.csv")]) + [doc] = await _repo().insert_components([_attachment(1, name="data.csv")]) updated = await _repo().patch_component_by_id(str(doc.id), AttachmentPatch()) assert updated.id == doc.id + async def test_patch_content_recomputes_md5(self, db): + # name is not a hash field, so renaming must NOT change md5. + [doc] = await _repo().insert_components([_attachment(1)]) + renamed = await _repo().patch_component_by_id(str(doc.id), AttachmentPatch(name="renamed.png")) + assert renamed.md5 == doc.md5 + # content IS a hash field, so changing it must recompute md5. + rehashed = await _repo().patch_component_by_id(str(doc.id), AttachmentPatch(content=999)) + assert rehashed.md5 != doc.md5 + persisted = await Attachment.find_one(Attachment.id == doc.id) + assert persisted.md5 == rehashed.md5 + # --------------------------------------------------------------------------- # Component download round-trip @@ -155,7 +162,7 @@ async def test_empty_patch_returns_existing(self, db): class TestComponentDownload: async def test_jsonl_download_round_trips(self, db): """Component downloads stream a decompressable gzip of all rows.""" - await _repo().insert_components([_attachment("a" * 32), _attachment("b" * 32)]) + await _repo().insert_components([_attachment(1), _attachment(2)]) stream = _repo().download( format=DownloadFormat.JSONL, short_mime=ShortMimeFormat.GZ, @@ -169,3 +176,48 @@ async def test_jsonl_download_round_trips(self, db): chunks = [c async for c in stream] decompressed = gzip.decompress(b"".join(chunks)) assert decompressed.count(b"\n") == 2 + + +# --------------------------------------------------------------------------- +# Table DataFrame <-> stored (index/columns/data) round-trips through Mongo +# --------------------------------------------------------------------------- + + +class TestTableFrameRoundTrip: + async def test_table_frame_round_trips_via_storage_shape(self, db): + import polars as pl + + from mpcontribs_api.authz import User + from mpcontribs_api.domains.tables.models import TableIn, TableOut + from mpcontribs_api.domains.tables.repository import MongoDbTableRepository + + repo = MongoDbTableRepository(User(username="x", groups=frozenset())) + # First column is the index (named "T [K]"); cells stay as the original formatted strings. + frame = pl.DataFrame( + { + "T [K]": ["100.0", "200.0"], + "1e16": ["2.2718689×10²¹", "2.2745466×10²¹"], + "1e17": ["2.2718684×10²¹", "2.2745438×10²¹"], + } + ) + tin = TableIn( + name="σ(p)", + attrs={"title": "g", "labels": {"index": "T [K]", "value": "σ", "variable": "doping"}}, + data=frame, + ) + [doc] = await repo.insert_components([tin]) + + # Stored in the canonical MongoDB shape: index/columns/data as strings. + raw = await db["tables"].find_one({"_id": doc.id}) + assert raw["index"] == ["100.0", "200.0"] + assert raw["columns"] == ["1e16", "1e17"] + assert raw["data"] == [["2.2718689×10²¹", "2.2718684×10²¹"], ["2.2745466×10²¹", "2.2745438×10²¹"]] + assert raw["total_data_rows"] == 2 + + # Read back: reassembled into the same DataFrame (index folded back as the first column). + out = await repo.get_component_by_id(str(doc.id), TableOut.parse_fields(["data"])) + assert out.data.columns == ["T [K]", "1e16", "1e17"] + assert out.data.equals(frame) + # The raw storage keys must not leak onto the response model. + assert "index" not in out.model_dump() + await db["tables"].delete_many({"_id": doc.id}) diff --git a/mpcontribs-api/tests/integration/test_component_routes.py b/mpcontribs-api/tests/integration/test_component_routes.py index 9bdc7ceb98..c1b49cd8ba 100644 --- a/mpcontribs-api/tests/integration/test_component_routes.py +++ b/mpcontribs-api/tests/integration/test_component_routes.py @@ -89,6 +89,15 @@ def test_valid_fields_forwarded(self, client, structure_service): # parse_fields always includes the id identity field. assert structure_service.get_many.call_args.kwargs["fields"] == frozenset({"id", "name"}) + def test_content_fields_are_selectable(self, client, structure_service): + # Regression for #4: structure content must be reachable via _fields (on the Out model). + structure_service.get_many.return_value = Page(items=[], next_cursor=None) + r = client.get("/api/v1/structures?_fields=lattice&_fields=sites&_fields=charge&_fields=cif") + assert r.status_code == 200 + assert structure_service.get_many.call_args.kwargs["fields"] == frozenset( + {"id", "lattice", "sites", "charge", "cif"} + ) + class TestStructuresDelete: def test_batch_delete_returns_200(self, client, structure_service): diff --git a/mpcontribs-api/tests/integration/test_contributions_routes.py b/mpcontribs-api/tests/integration/test_contributions_routes.py index 06fc77c509..36adad5984 100644 --- a/mpcontribs-api/tests/integration/test_contributions_routes.py +++ b/mpcontribs-api/tests/integration/test_contributions_routes.py @@ -108,11 +108,13 @@ def test_non_list_body_returns_422(self, client, contribution_service): class TestUpsertContributions: def test_empty_list_returns_200(self, client, contribution_service): - contribution_service.upsert_contributions.return_value = [] - assert client.put("/api/v1/contributions", json=[]).status_code == 200 + contribution_service.upsert_contributions.return_value = BulkWriteSummary(total=0, succeeded=[], failed=[]) + r = client.put("/api/v1/contributions", json=[]) + assert r.status_code == 200 + assert set(r.json()) == {"total", "succeeded", "failed"} def test_service_receives_parsed_contributions(self, client, contribution_service): - contribution_service.upsert_contributions.return_value = [] + contribution_service.upsert_contributions.return_value = BulkWriteSummary(total=1, succeeded=[], failed=[]) client.put("/api/v1/contributions", json=[_valid_contribution_body()]) contributions = contribution_service.upsert_contributions.call_args.kwargs["contributions"] assert contributions[0].identifier == "mp-1234" diff --git a/mpcontribs-api/tests/unit/domains/test_attachments_models.py b/mpcontribs-api/tests/unit/domains/test_attachments_models.py index 1a0c82ebfc..f5b17a736a 100644 --- a/mpcontribs-api/tests/unit/domains/test_attachments_models.py +++ b/mpcontribs-api/tests/unit/domains/test_attachments_models.py @@ -46,13 +46,17 @@ def test_name_requires_extension(self): with pytest.raises(AppValidationError): Attachment(**_payload(name="noextension")) - def test_md5_normalized(self): - attachment = Attachment(**_payload(md5="C" * 32)) - assert attachment.md5 == "c" * 32 + def test_md5_is_computed_not_taken_from_input(self): + # A client-supplied md5 is overwritten by the content-derived hash. + attachment = Attachment(**_payload(md5="c" * 32)) + assert attachment.md5 != "c" * 32 + assert len(attachment.md5) == 32 - def test_invalid_md5_raises(self): - with pytest.raises(AppValidationError): - Attachment(**_payload(md5="zz")) + def test_same_content_same_md5(self): + assert Attachment(**_payload()).md5 == Attachment(**_payload()).md5 + + def test_different_content_different_md5(self): + assert Attachment(**_payload(content=1)).md5 != Attachment(**_payload(content=2)).md5 def test_invalid_mime_raises(self): with pytest.raises(AppValidationError): @@ -64,10 +68,18 @@ def test_missing_content_raises(self): with pytest.raises(PydanticValidationError): Attachment(**payload) - def test_attachment_in_is_attachment(self): - # Input models subclass their document so from_input_model can dump them 1:1. - assert issubclass(AttachmentIn, Attachment) - assert isinstance(AttachmentIn(**_payload()), Attachment) + def test_attachment_in_has_no_id_or_md5(self): + assert "md5" not in AttachmentIn.model_fields + assert "id" not in AttachmentIn.model_fields + + def test_attachment_in_validates_name_extension(self): + with pytest.raises(AppValidationError): + AttachmentIn(name="noextension", mime="application/gzip", content=1) + + def test_from_input_assigns_id_and_computes_md5(self): + doc = Attachment.from_input(AttachmentIn(name="s.gz", mime="application/gzip", content=1)) + assert doc.id is not None + assert len(doc.md5) == 32 # --------------------------------------------------------------------------- diff --git a/mpcontribs-api/tests/unit/domains/test_contribution_service.py b/mpcontribs-api/tests/unit/domains/test_contribution_service.py index 2b213789c9..0b8a9d36b2 100644 --- a/mpcontribs-api/tests/unit/domains/test_contribution_service.py +++ b/mpcontribs-api/tests/unit/domains/test_contribution_service.py @@ -488,9 +488,11 @@ async def test_calls_atomic_repo_method_once_per_item(self): contrib_repo.upsert_contribution_by_identifiers.return_value = MagicMock(spec=Contribution) contribs = [_contrib_in(identifier=f"mp-{i}") for i in range(3)] - results = await svc.upsert_contributions(contribs) + summary = await svc.upsert_contributions(contribs) - assert len(results) == 3 + assert summary.total == 3 + assert len(summary.succeeded) == 3 + assert summary.failed == [] assert contrib_repo.upsert_contribution_by_identifiers.call_count == 3 # The legacy read-then-write path must not be used contrib_repo.find_one_contribution.assert_not_called() @@ -521,14 +523,16 @@ async def _upsert(identifiers, contrib): contrib_repo.upsert_contribution_by_identifiers.side_effect = _upsert contribs = [_contrib_in(identifier=f"mp-{i}") for i in range(3)] - results = await svc.upsert_contributions(contribs) + summary = await svc.upsert_contributions(contribs) - assert results == [returned["mp-0"], returned["mp-1"], returned["mp-2"]] + assert summary.succeeded == [returned["mp-0"], returned["mp-1"], returned["mp-2"]] - async def test_empty_batch_returns_empty_list(self): + async def test_empty_batch_returns_empty_summary(self): svc, contrib_repo, *_ = _make_service() - results = await svc.upsert_contributions([]) - assert results == [] + summary = await svc.upsert_contributions([]) + assert summary.total == 0 + assert summary.succeeded == [] + assert summary.failed == [] contrib_repo.upsert_contribution_by_identifiers.assert_not_called() async def test_same_key_concurrent_upserts_both_go_through_atomic_call(self): @@ -543,11 +547,29 @@ async def test_same_key_concurrent_upserts_both_go_through_atomic_call(self): _contrib_in(project="p", identifier="same"), _contrib_in(project="p", identifier="same"), ] - results = await svc.upsert_contributions(contribs) + summary = await svc.upsert_contributions(contribs) - assert len(results) == 2 + assert len(summary.succeeded) == 2 assert contrib_repo.upsert_contribution_by_identifiers.call_count == 2 + async def test_one_failure_is_reported_not_raised(self): + svc, contrib_repo, *_ = _make_service() + + async def _upsert(identifiers, contrib): + if contrib.identifier == "mp-1": + raise ConflictError("boom") + return MagicMock(spec=Contribution) + + contrib_repo.upsert_contribution_by_identifiers.side_effect = _upsert + + contribs = [_contrib_in(identifier=f"mp-{i}") for i in range(3)] + summary = await svc.upsert_contributions(contribs) + + assert summary.total == 3 + assert len(summary.succeeded) == 2 + assert [f.index for f in summary.failed] == [1] + assert summary.failed[0].error_code == "conflict" + # --------------------------------------------------------------------------- # Process-wide write_slots semaphore is honored diff --git a/mpcontribs-api/tests/unit/domains/test_shared_models.py b/mpcontribs-api/tests/unit/domains/test_shared_models.py index 0b67d8edd4..2ba8c3c9d8 100644 --- a/mpcontribs-api/tests/unit/domains/test_shared_models.py +++ b/mpcontribs-api/tests/unit/domains/test_shared_models.py @@ -17,9 +17,7 @@ def _attachment_in(**overrides) -> AttachmentIn: payload = { - "_id": PydanticObjectId(), "name": "data.csv.gz", - "md5": "a" * 32, "mime": "application/gzip", "content": 1, } @@ -32,23 +30,22 @@ class _OidOut(DocumentOut[PydanticObjectId]): # --------------------------------------------------------------------------- -# BaseDocumentWithInput.from_input_model +# Component.from_input (server-assigned id, computed md5) # --------------------------------------------------------------------------- -class TestFromInputModel: +class TestComponentFromInput: def test_returns_document_class_instance(self): - doc = Attachment.from_input_model(_attachment_in()) + doc = Attachment.from_input(_attachment_in()) assert isinstance(doc, Attachment) - def test_all_fields_carried_over(self): - oid = PydanticObjectId() - doc = Attachment.from_input_model(_attachment_in(_id=oid, name="x.gz")) - assert doc.id == oid + def test_content_carried_id_assigned_md5_computed(self): + doc = Attachment.from_input(_attachment_in(name="x.gz")) assert doc.name == "x.gz" - assert doc.md5 == "a" * 32 assert doc.mime == "application/gzip" assert doc.content == 1 + assert doc.id is not None + assert len(doc.md5) == 32 # --------------------------------------------------------------------------- diff --git a/mpcontribs-api/tests/unit/domains/test_structures_models.py b/mpcontribs-api/tests/unit/domains/test_structures_models.py index 5e2744c019..213724b871 100644 --- a/mpcontribs-api/tests/unit/domains/test_structures_models.py +++ b/mpcontribs-api/tests/unit/domains/test_structures_models.py @@ -131,24 +131,38 @@ def test_charge_is_required_but_nullable(self): with pytest.raises(PydanticValidationError): Structure(**payload) - def test_invalid_md5_raises(self): - with pytest.raises(AppValidationError): - Structure(**_structure_payload(md5="nope")) + def test_md5_is_computed_not_taken_from_input(self): + # A client-supplied md5 is overwritten by the content-derived hash. + structure = Structure(**_structure_payload(md5="a" * 32)) + assert structure.md5 != "a" * 32 + assert len(structure.md5) == 32 + + def test_same_content_same_md5(self): + assert Structure(**_structure_payload()).md5 == Structure(**_structure_payload()).md5 + + def test_different_charge_different_md5(self): + assert Structure(**_structure_payload(charge=0.0)).md5 != Structure(**_structure_payload(charge=1.0)).md5 def test_cif_kept_as_raw_string(self): structure = Structure(**_structure_payload()) assert structure.cif.startswith("data_Fe2O3") - def test_structure_in_is_structure(self): - assert issubclass(StructureIn, Structure) - assert isinstance(StructureIn(**_structure_payload()), Structure) - - def test_from_input_model_round_trip(self): - oid = PydanticObjectId() - doc = Structure.from_input_model(StructureIn(**_structure_payload(_id=oid))) + def test_structure_in_has_no_id_or_md5(self): + assert "md5" not in StructureIn.model_fields + assert "id" not in StructureIn.model_fields + + def test_from_input_assigns_id_and_computes_md5(self): + sin = StructureIn( + name="Fe2O3", + lattice=_lattice_payload(), + sites=[_site_payload()], + charge=0.0, + cif="data_Fe2O3\n", + ) + doc = Structure.from_input(sin) assert isinstance(doc, Structure) - assert doc.id == oid - assert doc.md5 == "f" * 32 + assert doc.id is not None + assert len(doc.md5) == 32 # --------------------------------------------------------------------------- @@ -182,10 +196,6 @@ def test_populates_id_from_mongo_alias(self): class TestStructurePatch: - # NOTE: StructurePatch.sites is annotated `Site | None` (singular) while - # Structure.sites is `list[Site]`. A patch produced from this model can - # therefore write a non-list into a list field. Likely a typo; tests below - # pin the current shape so the fix surfaces here when made. def test_all_fields_optional(self): patch = StructurePatch() assert patch.name is None @@ -201,6 +211,12 @@ def test_lattice_patchable(self): assert patch.lattice is not None assert patch.lattice.volume == 1.0 + def test_sites_is_a_list(self): + # Regression: sites must be list[Site], not a single Site. + patch = StructurePatch(sites=[_site_payload()]) + assert isinstance(patch.sites, list) + assert patch.sites[0].label == "Fe" + # --------------------------------------------------------------------------- # StructureFilter diff --git a/mpcontribs-api/tests/unit/domains/test_tables_models.py b/mpcontribs-api/tests/unit/domains/test_tables_models.py index 48804a0379..624a24ace1 100644 --- a/mpcontribs-api/tests/unit/domains/test_tables_models.py +++ b/mpcontribs-api/tests/unit/domains/test_tables_models.py @@ -10,7 +10,6 @@ TableIn, TableOut, TablePatch, - TableSummaryOut, ) from mpcontribs_api.exceptions import ValidationError as AppValidationError @@ -18,36 +17,40 @@ # Helpers # --------------------------------------------------------------------------- -ATTRS = {"title": "Band gaps", "labels": {"index": "T", "value": "gap", "variable": "method"}} +ATTRS = {"title": "Band gaps", "labels": {"index": "T", "value": "gap", "variable": "doping"}} -def _table_payload(**overrides) -> dict: +def _table_doc_payload(**overrides) -> dict: + """Payload for the stored Table document — raw MongoDB shape (index/columns/data as strings).""" payload = { "_id": PydanticObjectId(), "name": "bandgaps", - "md5": "d" * 32, "attrs": ATTRS, + "index": ["100.0", "200.0"], + "columns": ["1e16", "1e17"], + "data": [["1.1", "1.2"], ["2.1", "2.2"]], "total_data_rows": 2, - "data": {"T": [100, 200], "gap": [1.1, 1.2]}, } payload.update(overrides) return payload -def _source_doc(**overrides) -> dict: - """A source document for TableIn.from_input.""" - doc = { - "id": PydanticObjectId(), +def _table_in_frame() -> pl.DataFrame: + # First column is the index (T), the rest are the data columns; all cells are strings. + return pl.DataFrame( + {"T": ["100.0", "200.0"], "1e16": ["1.1", "2.1"], "1e17": ["1.2", "2.2"]} + ) + + +def _table_in_payload(**overrides) -> dict: + """Payload for user input: a DataFrame (first column = index), no _id/md5/total_data_rows.""" + payload = { "name": "bandgaps", - "md5": "d" * 32, "attrs": ATTRS, - "columns": ["gap", "method"], - "index": [100, 200], - "data": [[1.1, "GGA"], [1.2, "HSE"]], - "total_data_rows": 2, + "data": _table_in_frame(), } - doc.update(overrides) - return doc + payload.update(overrides) + return payload # --------------------------------------------------------------------------- @@ -69,93 +72,73 @@ class TestAttributes: def test_valid(self): attrs = Attributes(**ATTRS) assert attrs.title == "Band gaps" - assert attrs.labels.variable == "method" + assert attrs.labels.variable == "doping" # --------------------------------------------------------------------------- -# Table +# Table (stored document) — md5 is server-computed # --------------------------------------------------------------------------- class TestTable: def test_valid_construction(self): - table = Table(**_table_payload()) - assert isinstance(table.data, pl.DataFrame) + table = Table(**_table_doc_payload()) + assert table.index == ["100.0", "200.0"] + assert table.columns == ["1e16", "1e17"] + assert table.data == [["1.1", "1.2"], ["2.1", "2.2"]] assert table.total_data_rows == 2 def test_collection_name(self): assert Table.Settings.name == "tables" - def test_md5_normalized(self): - assert Table(**_table_payload(md5="D" * 32)).md5 == "d" * 32 - - def test_data_serializes_to_column_dict(self): - table = Table(**_table_payload()) - assert table.model_dump()["data"] == {"T": [100, 200], "gap": [1.1, 1.2]} + def test_md5_is_computed_not_taken_from_input(self): + # A client-supplied md5 is ignored; the stored value is derived from content. + table = Table(**_table_doc_payload(md5="d" * 32)) + assert table.md5 != "d" * 32 + assert len(table.md5) == 32 + def test_same_content_same_md5(self): + assert Table(**_table_doc_payload()).md5 == Table(**_table_doc_payload()).md5 -# --------------------------------------------------------------------------- -# TableIn: happy paths -# --------------------------------------------------------------------------- - - -class TestTableInHappyPath: - def test_matching_row_count_validates(self): - table = TableIn(**_table_payload()) - assert len(table.data) == table.total_data_rows + def test_different_data_different_md5(self): + a = Table(**_table_doc_payload()) + b = Table(**_table_doc_payload(data=[["9.9", "8.8"], ["7.7", "6.6"]])) + assert a.md5 != b.md5 - def test_from_input_builds_dataframe_with_index_column(self): - table = TableIn.from_input(_source_doc()) - assert table.data.columns == ["index", "gap", "method"] - assert table.data["index"].to_list() == [100, 200] - - def test_from_input_custom_index_name(self): - table = TableIn.from_input(_source_doc(), index_name="T") - assert table.data.columns == ["T", "gap", "method"] - - def test_from_input_carries_metadata(self): - doc = _source_doc() - table = TableIn.from_input(doc) - assert table.id == doc["id"] - assert table.name == "bandgaps" - assert table.md5 == "d" * 32 - assert table.total_data_rows == 2 + def test_attrs_part_of_md5(self): + a = Table(**_table_doc_payload()) + b = Table(**_table_doc_payload(attrs={**ATTRS, "title": "Different"})) + assert a.md5 != b.md5 - def test_from_input_rows_zip_index_with_data(self): - table = TableIn.from_input(_source_doc()) - assert table.data["gap"].to_list() == [1.1, 1.2] - assert table.data["method"].to_list() == ["GGA", "HSE"] + def test_data_stored_as_string_rows(self): + table = Table(**_table_doc_payload()) + assert table.model_dump()["data"] == [["1.1", "1.2"], ["2.1", "2.2"]] # --------------------------------------------------------------------------- -# TableIn: validation failures (RED — see module docstring) +# TableIn — content only, no id/md5 # --------------------------------------------------------------------------- -class TestTableInValidationFailures: - """All four tests assert the INTENDED domain ValidationError. +class TestTableIn: + def test_has_no_server_assigned_fields(self): + # _id, md5, and total_data_rows are all server-owned, so absent from the input contract. + assert "md5" not in TableIn.model_fields + assert "id" not in TableIn.model_fields + assert "total_data_rows" not in TableIn.model_fields - They fail today because tables/models.py raises pydantic's ValidationError - with a string, which crashes with TypeError before any error can surface. - Fix: import ValidationError from mpcontribs_api.exceptions instead. - """ + def test_from_input_splits_frame_into_storage(self): + # First column -> index; remaining columns -> columns; cells -> row-major string data. + doc = Table.from_input(TableIn(**_table_in_payload())) + assert doc.index == ["100.0", "200.0"] + assert doc.columns == ["1e16", "1e17"] + assert doc.data == [["1.1", "1.2"], ["2.1", "2.2"]] + assert doc.total_data_rows == 2 - def test_row_count_mismatch_raises_validation_error(self): - with pytest.raises(AppValidationError): - TableIn(**_table_payload(total_data_rows=5)) - - def test_from_input_column_collision_raises_validation_error(self): - # index_name defaults to "index"; a source column named "index" collides. - with pytest.raises(AppValidationError): - TableIn.from_input(_source_doc(columns=["index", "gap"])) - - def test_from_input_index_data_length_mismatch_raises_validation_error(self): - with pytest.raises(AppValidationError): - TableIn.from_input(_source_doc(index=[100, 200, 300])) - - def test_from_input_declared_row_count_mismatch_raises_validation_error(self): - with pytest.raises(AppValidationError): - TableIn.from_input(_source_doc(total_data_rows=99)) + def test_built_document_computes_md5(self): + doc = Table.from_input(TableIn(**_table_in_payload())) + assert len(doc.md5) == 32 + assert doc.id is not None # --------------------------------------------------------------------------- @@ -195,20 +178,10 @@ def test_invalid_md5_raises(self): # --------------------------------------------------------------------------- -# TableSummaryOut / TableOut / TablePatch +# TableOut / TablePatch # --------------------------------------------------------------------------- -class TestTableSummaryOut: - def test_valid(self): - summary = TableSummaryOut(attrs=ATTRS, columns=["gap"], total_data_rows=10) - assert summary.total_data_pages == 1 - - def test_explicit_pages(self): - summary = TableSummaryOut(attrs=ATTRS, columns=["gap"], total_data_rows=10, total_data_pages=3) - assert summary.total_data_pages == 3 - - class TestTableOut: def test_all_fields_optional(self): out = TableOut() @@ -217,25 +190,46 @@ def test_all_fields_optional(self): assert out.attrs is None def test_default_fields(self): - assert TableOut.default_fields() == [ - "id", - "name", - "md5", - "attrs", - "columns", - "total_data_rows", - "total_data_pages", - ] + assert TableOut.default_fields() == ["id", "name", "md5", "attrs", "total_data_rows"] def test_default_fields_parseable(self): - # The route default must survive parse_fields without raising. parsed = TableOut.parse_fields(TableOut.default_fields()) assert "attrs" in parsed + def test_content_projectable(self): + # data is on the Out model so it can be requested explicitly. + parsed = TableOut.parse_fields(["data"]) + assert "data" in parsed + def test_data_coerced_when_present(self): out = TableOut(data={"a": [1]}) assert isinstance(out.data, pl.DataFrame) + def test_reconstructs_frame_from_storage_dict(self): + # Read path: a raw Mongo dict with index/columns/data is reassembled into a DataFrame + # whose first column is the index (named by attrs.labels.index), cells preserved as strings. + out = TableOut.model_validate(_table_doc_payload(md5="a" * 32)) + assert isinstance(out.data, pl.DataFrame) + assert out.data.columns == ["T", "1e16", "1e17"] + assert out.data["T"].to_list() == ["100.0", "200.0"] + assert out.data["1e16"].to_list() == ["1.1", "2.1"] + + def test_storage_keys_not_leaked(self): + out = TableOut.model_validate(_table_doc_payload(md5="a" * 32)) + dumped = out.model_dump() + assert "index" not in dumped + assert "columns" not in dumped + + def test_projection_full_model_when_data_requested(self): + # data requested -> full model (so index/columns come back to rebuild the frame). + assert TableOut.projection(TableOut.parse_fields(["data"])) is TableOut + + def test_projection_partial_when_data_not_requested(self): + # light read -> a trimmed projection model that does not pull the storage triple. + proj = TableOut.projection(TableOut.parse_fields(["name"])) + assert proj is not TableOut + assert hasattr(proj, "Settings") + class TestTablePatch: def test_name_optional(self): From 408b6a6b2c5add8fbf0eae0808f138848f38c9de Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 22 Jun 2026 10:44:56 -0700 Subject: [PATCH 167/591] Added ty for typechecking --- mpcontribs-api/pyproject.toml | 4 ++++ mpcontribs-api/uv.lock | 27 +++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/mpcontribs-api/pyproject.toml b/mpcontribs-api/pyproject.toml index b41f4935c7..03cb39cc41 100644 --- a/mpcontribs-api/pyproject.toml +++ b/mpcontribs-api/pyproject.toml @@ -63,6 +63,7 @@ dev = [ "pytest-xdist>=3.8.0", "httpx2>=0.28.0", "pytest-asyncio>=1.4.0", + "ty>=0.0.51", ] [tool.pytest.ini_options] @@ -91,3 +92,6 @@ pythonVersion = "3.14" typeCheckingMode = "standard" extraPaths = ["src"] ignore=["tests/"] + +[tool.ty.src] +exlcude = ["tests"] diff --git a/mpcontribs-api/uv.lock b/mpcontribs-api/uv.lock index b874098fbc..a61a82b83a 100644 --- a/mpcontribs-api/uv.lock +++ b/mpcontribs-api/uv.lock @@ -993,6 +993,7 @@ dev = [ { name = "pytest-asyncio" }, { name = "pytest-xdist" }, { name = "ruff" }, + { name = "ty" }, ] [package.metadata] @@ -1022,6 +1023,7 @@ dev = [ { name = "pytest-asyncio", specifier = ">=1.4.0" }, { name = "pytest-xdist", specifier = ">=3.8.0" }, { name = "ruff", specifier = ">=0.9.0" }, + { name = "ty", specifier = ">=0.0.51" }, ] [[package]] @@ -2034,6 +2036,31 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/19/97/56608b2249fe206a67cd573bc93cd9896e1efb9e98bce9c163bcdc704b88/truststore-0.10.4-py3-none-any.whl", hash = "sha256:adaeaecf1cbb5f4de3b1959b42d41f6fab57b2b1666adb59e89cb0b53361d981", size = 18660, upload-time = "2025-08-12T18:49:01.46Z" }, ] +[[package]] +name = "ty" +version = "0.0.51" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/7e/ce/352fcdba5c72ea20e5d2e46e28809cdb617575b71209d971eff2ace8e6c4/ty-0.0.51.tar.gz", hash = "sha256:b90172d46365bb9d51a7011cbb5c60cc4f514f42c86635df6c092b717f85e1ac", size = 5953151, upload-time = "2026-06-19T01:48:58.015Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/2b/8f/8fe7cab79a45320b2cdcd602f16d44c8108d2f418ff7ec316c6212f1f0cc/ty-0.0.51-py3-none-linux_armv6l.whl", hash = "sha256:947986bd82d324b3a5c58ce03f1dad160cdf36443d3e8f64b3484b861ba9bc64", size = 11884805, upload-time = "2026-06-19T01:48:20.184Z" }, + { url = "https://files.pythonhosted.org/packages/fa/b4/56fdc39a3f44c0564fd157e1e59e1f9c3fc5ba57ae4472ded85c67c63d74/ty-0.0.51-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:25a5b31e6f23fd5dc63ad29087ded09932409e4154e2fe07bbaed015035990bb", size = 11633593, upload-time = "2026-06-19T01:48:22.998Z" }, + { url = "https://files.pythonhosted.org/packages/33/57/136e83f24fc04f5afdcabff42f40fa27eae5ac3f0e3f12627d072a55f679/ty-0.0.51-py3-none-macosx_11_0_arm64.whl", hash = "sha256:2faed19a8f1505370de071c008df52a994fc03a204f3267c3a33a32ca26f854f", size = 11063076, upload-time = "2026-06-19T01:48:25.223Z" }, + { url = "https://files.pythonhosted.org/packages/32/f8/5d32f0df5692446440ab781b9b119aa3e0c0dbfa78c583fe9be8417d54fa/ty-0.0.51-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:08adbe53fb8bc9e7f00e89bf1d3c875a02cda76d83f109d2e6ab1ff35a7bfa8c", size = 11579542, upload-time = "2026-06-19T01:48:27.302Z" }, + { url = "https://files.pythonhosted.org/packages/7f/0c/4f54ef338e9623886809ecd508931b0cd5b3aba1e591586a2f6aeaa8bd11/ty-0.0.51-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:dc5e93695ab5dcbf1eef663aee60ec23a413547cc9cb06adcb0d842e9166bd0f", size = 11676189, upload-time = "2026-06-19T01:48:29.518Z" }, + { url = "https://files.pythonhosted.org/packages/56/27/31729066f9b9d3596941edaf267894eefc0b30df4518f003dba5f7276258/ty-0.0.51-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:abd92913bc90d1705ef9391ff8c6822b61e2e827fa295eb30bf0dfabcf815645", size = 12188154, upload-time = "2026-06-19T01:48:31.68Z" }, + { url = "https://files.pythonhosted.org/packages/2f/38/d4301aa12d2283c7130908baf1417a37dfe3e10f5669cb4ce2853c2540b4/ty-0.0.51-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:429a997394dac73870d71b87cc90efc54da3efaf319e72ca18aeef35a78aef90", size = 12780597, upload-time = "2026-06-19T01:48:33.839Z" }, + { url = "https://files.pythonhosted.org/packages/c1/52/4b2e67e53f126d39abe201bd2299e467e27463a284e965ad195cbc217fa0/ty-0.0.51-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:62d94f06e8c317e89b6884f2bde443040e596b88c7c79bd944c84c105b06257a", size = 12491115, upload-time = "2026-06-19T01:48:36.169Z" }, + { url = "https://files.pythonhosted.org/packages/74/50/aabfe55c132ebe72b4d639cbf772d931e11b0990d29c1f691922b6ccabc1/ty-0.0.51-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f8f52952cff665bc52a36147e610c10f5699d30007d7a14ab7f345cff93476ff", size = 12230135, upload-time = "2026-06-19T01:48:38.445Z" }, + { url = "https://files.pythonhosted.org/packages/0d/1b/9aa428052dbed91c50919cd080426a313cf20ce14c6bfe2b71345e548671/ty-0.0.51-py3-none-manylinux_2_31_riscv64.whl", hash = "sha256:c1bd1355aee86af01e4e21b0bc16fc460fb05905761f0d8b8d70841de0feade8", size = 12468123, upload-time = "2026-06-19T01:48:40.47Z" }, + { url = "https://files.pythonhosted.org/packages/0b/5a/f6ce69f2575259386c950c40e02578d0902760cb61f95045e9971182c24e/ty-0.0.51-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:79d1877e93460f936bc10ed1a31525702b7ce51075763ccba993be17f0b9e905", size = 11541672, upload-time = "2026-06-19T01:48:42.635Z" }, + { url = "https://files.pythonhosted.org/packages/35/3a/2af48924a683e959e95e5cc4dc88e5a8595206a0812b869032b95196f2b0/ty-0.0.51-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:cc233a6235fb23e2a44b14731a10043e37ba2f30f2c361cf49ad3633c5b9da9c", size = 11694015, upload-time = "2026-06-19T01:48:44.819Z" }, + { url = "https://files.pythonhosted.org/packages/a4/12/899875d8a60b198c8121cb92ce18e18cc072d23ca2130fcdaa176383ef72/ty-0.0.51-py3-none-musllinux_1_2_i686.whl", hash = "sha256:bc7459348a253247bbfb2669a021e614281b86bbea24c36112b8a6e1a2499a16", size = 11832856, upload-time = "2026-06-19T01:48:47.028Z" }, + { url = "https://files.pythonhosted.org/packages/e6/a2/88f681d826d97cc96ef9f6cadd4935f775758944cee07340aa46113bce28/ty-0.0.51-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:49a21237f6fd1de56beaff0a3e85fe022a09a3401e67e3abec41ce838a5d4d2e", size = 12333449, upload-time = "2026-06-19T01:48:49.091Z" }, + { url = "https://files.pythonhosted.org/packages/f8/61/535a4163b4452c6978c31fedfd7b5803cf3a2253e9455cde350f86638d6a/ty-0.0.51-py3-none-win32.whl", hash = "sha256:61b4b6a003c3ebe53a63a1125c9b6542aa01bc1b6c9a235d01ee328d000d61a9", size = 11177338, upload-time = "2026-06-19T01:48:51.433Z" }, + { url = "https://files.pythonhosted.org/packages/aa/4d/2334fbb74291a20129fa7aaa8f789619ec9b6883b27f997b8baa27e4674f/ty-0.0.51-py3-none-win_amd64.whl", hash = "sha256:608d417cd1eaf79bcbd713d9830d5e3db9d57ec225c3af3e4ac9a9ff66b45d70", size = 12325675, upload-time = "2026-06-19T01:48:53.774Z" }, + { url = "https://files.pythonhosted.org/packages/50/b5/d49096cd5f3694becb86a5a6ccd0f229ead695fc7430d6bc4dd0a104c6fe/ty-0.0.51-py3-none-win_arm64.whl", hash = "sha256:62ced5e380284f12b2dc4802a3e4ed3dac39913fc6719afde7978814a4c7f169", size = 11657350, upload-time = "2026-06-19T01:48:55.904Z" }, +] + [[package]] name = "typer" version = "0.26.7" From cecd4789fc3308bfc2eba587c0acc609324e619f Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 22 Jun 2026 11:14:09 -0700 Subject: [PATCH 168/591] Create test-api-server.yml --- .github/workflows/test-api-server.yml | 28 +++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 .github/workflows/test-api-server.yml diff --git a/.github/workflows/test-api-server.yml b/.github/workflows/test-api-server.yml new file mode 100644 index 0000000000..aef8825d62 --- /dev/null +++ b/.github/workflows/test-api-server.yml @@ -0,0 +1,28 @@ +name: Testing MPContribs API Server + +on: [push] + +jobs: + test: + runs-on: ubuntu-latest + + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + - name: Install uv + uses: astral-sh/setup-uv@v3 + with: + enable-cache: true + + - name: Set up Python + run: uv python install + + - name: Install dependencies + run: uv sync --all-extras --dev + + - name: Run unit tests + run: uv run pytest tests/unit/ + + - name: Run integration tests + run: uv run pytest tests/integration/ -m "not db" From a70b977516fe1a4c73e40f7905f16e9cc5c9386f Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 22 Jun 2026 14:54:32 -0700 Subject: [PATCH 169/591] Added pytest-cov to dev deps --- mpcontribs-api/pyproject.toml | 5 + mpcontribs-api/uv.lock | 4670 +++++++++++++++++++++++++++++++++ 2 files changed, 4675 insertions(+) create mode 100644 mpcontribs-api/uv.lock diff --git a/mpcontribs-api/pyproject.toml b/mpcontribs-api/pyproject.toml index d64166fd3c..127164614f 100644 --- a/mpcontribs-api/pyproject.toml +++ b/mpcontribs-api/pyproject.toml @@ -76,6 +76,11 @@ all = [ "mpcontribs-api[dev]" ] +[dependency-groups] +dev = [ + "pytest-cov>=7.1.0", +] + [tool.pytest] markers = [ "base: basic resource testing", diff --git a/mpcontribs-api/uv.lock b/mpcontribs-api/uv.lock new file mode 100644 index 0000000000..ef6f01c929 --- /dev/null +++ b/mpcontribs-api/uv.lock @@ -0,0 +1,4670 @@ +version = 1 +revision = 3 +requires-python = ">=3.11" +resolution-markers = [ + "python_full_version >= '3.14' and sys_platform == 'win32'", + "python_full_version >= '3.14' and sys_platform != 'win32'", + "python_full_version == '3.13.*' and sys_platform == 'win32'", + "python_full_version == '3.13.*' and sys_platform != 'win32'", + "python_full_version == '3.12.*' and sys_platform == 'win32'", + "python_full_version == '3.12.*' and sys_platform != 'win32'", + "python_full_version < '3.12' and sys_platform == 'win32'", + "python_full_version < '3.12' and sys_platform != 'win32'", +] + +[[package]] +name = "anyio" +version = "4.14.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "idna" }, + { name = "typing-extensions", marker = "python_full_version < '3.13'" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/1c/b5/001890774a9552aff22502b8da382593109ce0c95314abaebbb116567545/anyio-4.14.0.tar.gz", hash = "sha256:b47c1f9ccf73e67021df785332508f99379c68fa7d0684e8e3492cb1d4b23f89", size = 253586, upload-time = "2026-06-15T22:00:49.021Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/ba/16/9826f089383c593cdfc4a6e5aca94d9e91ae1692c57af82c3b2aa5e810f7/anyio-4.14.0-py3-none-any.whl", hash = "sha256:dd9b7a2a9799ed6552fde617b2c5df02b7fdd7d88392fc48101e51bae46164d9", size = 123506, upload-time = "2026-06-15T22:00:47.595Z" }, +] + +[[package]] +name = "apispec" +version = "5.2.2" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/39/bb/2910f46ecba16334c19e4f02906b1fdb0e69f9c3fd9a21afcf86c45ba89e/apispec-5.2.2.tar.gz", hash = "sha256:6ea6542e1ebffe9fd95ba01ef3f51351eac6c200a974562c7473059b9cd20aa7", size = 75729, upload-time = "2022-05-12T22:18:20.648Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/7b/bf/8ab9b532c9a22e9cc4920ed7436fde5f207807346564b95d9782f1e2aa5e/apispec-5.2.2-py3-none-any.whl", hash = "sha256:f5f0d6b452c3e4a0e0922dce8815fac89dc4dbc758acef21fb9e01584d6602a5", size = 29618, upload-time = "2022-05-12T22:18:19.235Z" }, +] + +[[package]] +name = "appnope" +version = "0.1.4" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/35/5d/752690df9ef5b76e169e68d6a129fa6d08a7100ca7f754c89495db3c6019/appnope-0.1.4.tar.gz", hash = "sha256:1de3860566df9caf38f01f86f65e0e13e379af54f9e4bee1e66b48f2efffd1ee", size = 4170, upload-time = "2024-02-06T09:43:11.258Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/81/29/5ecc3a15d5a33e31b26c11426c45c501e439cb865d0bff96315d86443b78/appnope-0.1.4-py2.py3-none-any.whl", hash = "sha256:502575ee11cd7a28c0205f379b525beefebab9d161b7c964670864014ed7213c", size = 4321, upload-time = "2024-02-06T09:43:09.663Z" }, +] + +[[package]] +name = "argon2-cffi" +version = "25.1.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "argon2-cffi-bindings" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/0e/89/ce5af8a7d472a67cc819d5d998aa8c82c5d860608c4db9f46f1162d7dab9/argon2_cffi-25.1.0.tar.gz", hash = "sha256:694ae5cc8a42f4c4e2bf2ca0e64e51e23a040c6a517a85074683d3959e1346c1", size = 45706, upload-time = "2025-06-03T06:55:32.073Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/4f/d3/a8b22fa575b297cd6e3e3b0155c7e25db170edf1c74783d6a31a2490b8d9/argon2_cffi-25.1.0-py3-none-any.whl", hash = "sha256:fdc8b074db390fccb6eb4a3604ae7231f219aa669a2652e0f20e16ba513d5741", size = 14657, upload-time = "2025-06-03T06:55:30.804Z" }, +] + +[[package]] +name = "argon2-cffi-bindings" +version = "25.1.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "cffi" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/5c/2d/db8af0df73c1cf454f71b2bbe5e356b8c1f8041c979f505b3d3186e520a9/argon2_cffi_bindings-25.1.0.tar.gz", hash = "sha256:b957f3e6ea4d55d820e40ff76f450952807013d361a65d7f28acc0acbf29229d", size = 1783441, upload-time = "2025-07-30T10:02:05.147Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/60/97/3c0a35f46e52108d4707c44b95cfe2afcafc50800b5450c197454569b776/argon2_cffi_bindings-25.1.0-cp314-cp314t-macosx_10_13_universal2.whl", hash = "sha256:3d3f05610594151994ca9ccb3c771115bdb4daef161976a266f0dd8aa9996b8f", size = 54393, upload-time = "2025-07-30T10:01:40.97Z" }, + { url = "https://files.pythonhosted.org/packages/9d/f4/98bbd6ee89febd4f212696f13c03ca302b8552e7dbf9c8efa11ea4a388c3/argon2_cffi_bindings-25.1.0-cp314-cp314t-macosx_10_13_x86_64.whl", hash = "sha256:8b8efee945193e667a396cbc7b4fb7d357297d6234d30a489905d96caabde56b", size = 29328, upload-time = "2025-07-30T10:01:41.916Z" }, + { url = "https://files.pythonhosted.org/packages/43/24/90a01c0ef12ac91a6be05969f29944643bc1e5e461155ae6559befa8f00b/argon2_cffi_bindings-25.1.0-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:3c6702abc36bf3ccba3f802b799505def420a1b7039862014a65db3205967f5a", size = 31269, upload-time = "2025-07-30T10:01:42.716Z" }, + { url = "https://files.pythonhosted.org/packages/d4/d3/942aa10782b2697eee7af5e12eeff5ebb325ccfb86dd8abda54174e377e4/argon2_cffi_bindings-25.1.0-cp314-cp314t-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:a1c70058c6ab1e352304ac7e3b52554daadacd8d453c1752e547c76e9c99ac44", size = 86558, upload-time = "2025-07-30T10:01:43.943Z" }, + { url = "https://files.pythonhosted.org/packages/0d/82/b484f702fec5536e71836fc2dbc8c5267b3f6e78d2d539b4eaa6f0db8bf8/argon2_cffi_bindings-25.1.0-cp314-cp314t-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:e2fd3bfbff3c5d74fef31a722f729bf93500910db650c925c2d6ef879a7e51cb", size = 92364, upload-time = "2025-07-30T10:01:44.887Z" }, + { url = "https://files.pythonhosted.org/packages/c9/c1/a606ff83b3f1735f3759ad0f2cd9e038a0ad11a3de3b6c673aa41c24bb7b/argon2_cffi_bindings-25.1.0-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:c4f9665de60b1b0e99bcd6be4f17d90339698ce954cfd8d9cf4f91c995165a92", size = 85637, upload-time = "2025-07-30T10:01:46.225Z" }, + { url = "https://files.pythonhosted.org/packages/44/b4/678503f12aceb0262f84fa201f6027ed77d71c5019ae03b399b97caa2f19/argon2_cffi_bindings-25.1.0-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:ba92837e4a9aa6a508c8d2d7883ed5a8f6c308c89a4790e1e447a220deb79a85", size = 91934, upload-time = "2025-07-30T10:01:47.203Z" }, + { url = "https://files.pythonhosted.org/packages/f0/c7/f36bd08ef9bd9f0a9cff9428406651f5937ce27b6c5b07b92d41f91ae541/argon2_cffi_bindings-25.1.0-cp314-cp314t-win32.whl", hash = "sha256:84a461d4d84ae1295871329b346a97f68eade8c53b6ed9a7ca2d7467f3c8ff6f", size = 28158, upload-time = "2025-07-30T10:01:48.341Z" }, + { url = "https://files.pythonhosted.org/packages/b3/80/0106a7448abb24a2c467bf7d527fe5413b7fdfa4ad6d6a96a43a62ef3988/argon2_cffi_bindings-25.1.0-cp314-cp314t-win_amd64.whl", hash = "sha256:b55aec3565b65f56455eebc9b9f34130440404f27fe21c3b375bf1ea4d8fbae6", size = 32597, upload-time = "2025-07-30T10:01:49.112Z" }, + { url = "https://files.pythonhosted.org/packages/05/b8/d663c9caea07e9180b2cb662772865230715cbd573ba3b5e81793d580316/argon2_cffi_bindings-25.1.0-cp314-cp314t-win_arm64.whl", hash = "sha256:87c33a52407e4c41f3b70a9c2d3f6056d88b10dad7695be708c5021673f55623", size = 28231, upload-time = "2025-07-30T10:01:49.92Z" }, + { url = "https://files.pythonhosted.org/packages/1d/57/96b8b9f93166147826da5f90376e784a10582dd39a393c99bb62cfcf52f0/argon2_cffi_bindings-25.1.0-cp39-abi3-macosx_10_9_universal2.whl", hash = "sha256:aecba1723ae35330a008418a91ea6cfcedf6d31e5fbaa056a166462ff066d500", size = 54121, upload-time = "2025-07-30T10:01:50.815Z" }, + { url = "https://files.pythonhosted.org/packages/0a/08/a9bebdb2e0e602dde230bdde8021b29f71f7841bd54801bcfd514acb5dcf/argon2_cffi_bindings-25.1.0-cp39-abi3-macosx_10_9_x86_64.whl", hash = "sha256:2630b6240b495dfab90aebe159ff784d08ea999aa4b0d17efa734055a07d2f44", size = 29177, upload-time = "2025-07-30T10:01:51.681Z" }, + { url = "https://files.pythonhosted.org/packages/b6/02/d297943bcacf05e4f2a94ab6f462831dc20158614e5d067c35d4e63b9acb/argon2_cffi_bindings-25.1.0-cp39-abi3-macosx_11_0_arm64.whl", hash = "sha256:7aef0c91e2c0fbca6fc68e7555aa60ef7008a739cbe045541e438373bc54d2b0", size = 31090, upload-time = "2025-07-30T10:01:53.184Z" }, + { url = "https://files.pythonhosted.org/packages/c1/93/44365f3d75053e53893ec6d733e4a5e3147502663554b4d864587c7828a7/argon2_cffi_bindings-25.1.0-cp39-abi3-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:1e021e87faa76ae0d413b619fe2b65ab9a037f24c60a1e6cc43457ae20de6dc6", size = 81246, upload-time = "2025-07-30T10:01:54.145Z" }, + { url = "https://files.pythonhosted.org/packages/09/52/94108adfdd6e2ddf58be64f959a0b9c7d4ef2fa71086c38356d22dc501ea/argon2_cffi_bindings-25.1.0-cp39-abi3-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:d3e924cfc503018a714f94a49a149fdc0b644eaead5d1f089330399134fa028a", size = 87126, upload-time = "2025-07-30T10:01:55.074Z" }, + { url = "https://files.pythonhosted.org/packages/72/70/7a2993a12b0ffa2a9271259b79cc616e2389ed1a4d93842fac5a1f923ffd/argon2_cffi_bindings-25.1.0-cp39-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:c87b72589133f0346a1cb8d5ecca4b933e3c9b64656c9d175270a000e73b288d", size = 80343, upload-time = "2025-07-30T10:01:56.007Z" }, + { url = "https://files.pythonhosted.org/packages/78/9a/4e5157d893ffc712b74dbd868c7f62365618266982b64accab26bab01edc/argon2_cffi_bindings-25.1.0-cp39-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:1db89609c06afa1a214a69a462ea741cf735b29a57530478c06eb81dd403de99", size = 86777, upload-time = "2025-07-30T10:01:56.943Z" }, + { url = "https://files.pythonhosted.org/packages/74/cd/15777dfde1c29d96de7f18edf4cc94c385646852e7c7b0320aa91ccca583/argon2_cffi_bindings-25.1.0-cp39-abi3-win32.whl", hash = "sha256:473bcb5f82924b1becbb637b63303ec8d10e84c8d241119419897a26116515d2", size = 27180, upload-time = "2025-07-30T10:01:57.759Z" }, + { url = "https://files.pythonhosted.org/packages/e2/c6/a759ece8f1829d1f162261226fbfd2c6832b3ff7657384045286d2afa384/argon2_cffi_bindings-25.1.0-cp39-abi3-win_amd64.whl", hash = "sha256:a98cd7d17e9f7ce244c0803cad3c23a7d379c301ba618a5fa76a67d116618b98", size = 31715, upload-time = "2025-07-30T10:01:58.56Z" }, + { url = "https://files.pythonhosted.org/packages/42/b9/f8d6fa329ab25128b7e98fd83a3cb34d9db5b059a9847eddb840a0af45dd/argon2_cffi_bindings-25.1.0-cp39-abi3-win_arm64.whl", hash = "sha256:b0fdbcf513833809c882823f98dc2f931cf659d9a1429616ac3adebb49f5db94", size = 27149, upload-time = "2025-07-30T10:01:59.329Z" }, +] + +[[package]] +name = "arrow" +version = "1.4.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "python-dateutil" }, + { name = "tzdata" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/b9/33/032cdc44182491aa708d06a68b62434140d8c50820a087fac7af37703357/arrow-1.4.0.tar.gz", hash = "sha256:ed0cc050e98001b8779e84d461b0098c4ac597e88704a655582b21d116e526d7", size = 152931, upload-time = "2025-10-18T17:46:46.761Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/ed/c9/d7977eaacb9df673210491da99e6a247e93df98c715fc43fd136ce1d3d33/arrow-1.4.0-py3-none-any.whl", hash = "sha256:749f0769958ebdc79c173ff0b0670d59051a535fa26e8eba02953dc19eb43205", size = 68797, upload-time = "2025-10-18T17:46:45.663Z" }, +] + +[[package]] +name = "asn1crypto" +version = "1.5.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/de/cf/d547feed25b5244fcb9392e288ff9fdc3280b10260362fc45d37a798a6ee/asn1crypto-1.5.1.tar.gz", hash = "sha256:13ae38502be632115abf8a24cbe5f4da52e3b5231990aff31123c805306ccb9c", size = 121080, upload-time = "2022-03-15T14:46:52.889Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/c9/7f/09065fd9e27da0eda08b4d6897f1c13535066174cc023af248fc2a8d5e5a/asn1crypto-1.5.1-py2.py3-none-any.whl", hash = "sha256:db4e40728b728508912cbb3d44f19ce188f218e9eba635821bb4b68564f8fd67", size = 105045, upload-time = "2022-03-15T14:46:51.055Z" }, +] + +[[package]] +name = "asttokens" +version = "3.0.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/be/a5/8e3f9b6771b0b408517c82d97aed8f2036509bc247d46114925e32fe33f0/asttokens-3.0.1.tar.gz", hash = "sha256:71a4ee5de0bde6a31d64f6b13f2293ac190344478f081c3d1bccfcf5eacb0cb7", size = 62308, upload-time = "2025-11-15T16:43:48.578Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/d2/39/e7eaf1799466a4aef85b6a4fe7bd175ad2b1c6345066aa33f1f58d4b18d0/asttokens-3.0.1-py3-none-any.whl", hash = "sha256:15a3ebc0f43c2d0a50eeafea25e19046c68398e487b9f1f5b517f7c0f40f976a", size = 27047, upload-time = "2025-11-15T16:43:16.109Z" }, +] + +[[package]] +name = "async-timeout" +version = "5.0.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/a5/ae/136395dfbfe00dfc94da3f3e136d0b13f394cba8f4841120e34226265780/async_timeout-5.0.1.tar.gz", hash = "sha256:d9321a7a3d5a6a5e187e824d2fa0793ce379a202935782d555d6e9d2735677d3", size = 9274, upload-time = "2024-11-06T16:41:39.6Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/fe/ba/e2081de779ca30d473f21f5b30e0e737c438205440784c7dfc81efc2b029/async_timeout-5.0.1-py3-none-any.whl", hash = "sha256:39e3809566ff85354557ec2398b55e096c8364bacac9405a7a1fa429e77fe76c", size = 6233, upload-time = "2024-11-06T16:41:37.9Z" }, +] + +[[package]] +name = "atlasq-tschaume" +version = "0.11.1.dev2" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "mongoengine" }, + { name = "requests" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/8c/5f/91e3d9c1712c8e235c95c86eeb265bb106802f5bcbe334e28f605f55b018/atlasq-tschaume-0.11.1.dev2.tar.gz", hash = "sha256:9393356edebae037b1b47e16d73a7a04969451eaa3e38f1bdc20d1d9b08ece68", size = 38083, upload-time = "2023-04-14T21:06:57.344Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/a5/8c/83b96f52f5a5b8e418bf4cbf9089cfbea33fc0b809c28fd5a9b9393b67ba/atlasq_tschaume-0.11.1.dev2-py3-none-any.whl", hash = "sha256:f38813972c8c379964f09200fa89f9ae909ccbf5b3483bb6a77d5bf34720dde0", size = 15748, upload-time = "2023-04-14T21:06:54.943Z" }, +] + +[[package]] +name = "attrs" +version = "26.1.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/9a/8e/82a0fe20a541c03148528be8cac2408564a6c9a0cc7e9171802bc1d26985/attrs-26.1.0.tar.gz", hash = "sha256:d03ceb89cb322a8fd706d4fb91940737b6642aa36998fe130a9bc96c985eff32", size = 952055, upload-time = "2026-03-19T14:22:25.026Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/64/b4/17d4b0b2a2dc85a6df63d1157e028ed19f90d4cd97c36717afef2bc2f395/attrs-26.1.0-py3-none-any.whl", hash = "sha256:c647aa4a12dfbad9333ca4e71fe62ddc36f4e63b2d260a37a8b83d2f043ac309", size = 67548, upload-time = "2026-03-19T14:22:23.645Z" }, +] + +[[package]] +name = "backports-zstd" +version = "1.6.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/8e/b5/5a873da082bd08acd6a497f7aae224e94a7c27fa8f24488089cc50a16c84/backports_zstd-1.6.0.tar.gz", hash = "sha256:80a7859ffe70bf239d7a2ce15293bdeb5b4280ff7dc326ffab312b0e254dbb24", size = 1000009, upload-time = "2026-06-14T10:50:58.555Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/c5/90/428dd82228b1b6d62d5a1bf312c29e6c125af6a182fcfd82768ca179dcc7/backports_zstd-1.6.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:c4fc41b2df5529cad5ceb230319e82728096d4b353ce8d4df68a2ec37e291bb8", size = 437067, upload-time = "2026-06-14T10:49:28.335Z" }, + { url = "https://files.pythonhosted.org/packages/ef/48/768edf21fe33bae8d874470b1be136681d4d32eb820a32e1c98262ebe39b/backports_zstd-1.6.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:83391ef5935cc0f329b1abca414ae20ffe40d335fc21a4b5e664f08a74317d5f", size = 363454, upload-time = "2026-06-14T10:49:29.784Z" }, + { url = "https://files.pythonhosted.org/packages/29/8a/d462c2e5071eb573378f0d26760f6590613086fdf59c2d3c66bdfffb9f41/backports_zstd-1.6.0-cp311-cp311-manylinux2010_i686.manylinux_2_12_i686.manylinux_2_28_i686.whl", hash = "sha256:7d3f64c503af7b60115b97c16feaf75bd191ef2c978d5c0c7725a6682bef63c5", size = 507393, upload-time = "2026-06-14T10:49:31.077Z" }, + { url = "https://files.pythonhosted.org/packages/b9/cb/af58363b0dd0b497282ecef1fa99789b03cc1885a01a41394cad42ceeff6/backports_zstd-1.6.0-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:0308990ffc998df3c7ed35276bde049728b5c3956203cae40d80893576a41459", size = 476957, upload-time = "2026-06-14T10:49:32.53Z" }, + { url = "https://files.pythonhosted.org/packages/e4/fd/5fbdf2275cefae95c4b3509f6db2dc372d0587ebafea342d28781d51d932/backports_zstd-1.6.0-cp311-cp311-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:8c298785e2fadeab82342040f2d9ce764ce500e6da6a6d99a2de514e63580b5a", size = 582618, upload-time = "2026-06-14T10:49:33.723Z" }, + { url = "https://files.pythonhosted.org/packages/99/6f/7dd45c53c907ea67f635c3900b58bb3347c01dc2ded441402028aae0ef9c/backports_zstd-1.6.0-cp311-cp311-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:ae106fe16e36efc60ab098d02478d30aa0e31e1420eb4ecf0116459253bc6361", size = 642279, upload-time = "2026-06-14T10:49:34.938Z" }, + { url = "https://files.pythonhosted.org/packages/4d/25/a9e37dd035027565fa0b7e367da50e88a6ab26e7fd413269aa118e25258b/backports_zstd-1.6.0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:7293fefe15f0e5852bdb4ad1e0e26f3cbd4d3e61c19f751ecc4ff34bc1eb237d", size = 492486, upload-time = "2026-06-14T10:49:36.06Z" }, + { url = "https://files.pythonhosted.org/packages/a1/52/659686bf8f7c53ea279e1c44038504b82a6901cee2f5ae83c30bbf581301/backports_zstd-1.6.0-cp311-cp311-manylinux_2_34_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:ece8e7288db5b827ef8c64b2f78519f1a173a8991a625978fce02eccd7654fe9", size = 566440, upload-time = "2026-06-14T10:49:37.536Z" }, + { url = "https://files.pythonhosted.org/packages/d9/1a/c7ea5a0ff607a1a6066bb7c7cb65ae20e2f85da6adc69ab77fd8943e180c/backports_zstd-1.6.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:28eef3881164f3c23ce58ed59e4684103bdd279583eb2d299858c9e9b72fde9a", size = 482899, upload-time = "2026-06-14T10:49:38.805Z" }, + { url = "https://files.pythonhosted.org/packages/83/48/bd2b91100ee4fe6bb4d816e3659cbbb0cda5dd32760d2379c54d1752ec25/backports_zstd-1.6.0-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:481a1e9bd8f419fdc625307aa20234687f99368c75df511ef589693c5fea4c6f", size = 510826, upload-time = "2026-06-14T10:49:40.062Z" }, + { url = "https://files.pythonhosted.org/packages/25/fe/fa28509d7ce2ad59404e7ce738a2fd858e12dfd9a896629f10330222a7fb/backports_zstd-1.6.0-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:3b6713371f8987a1178df93cb36f29eef191f224021e2d656b2f11ce60d26816", size = 586941, upload-time = "2026-06-14T10:49:41.305Z" }, + { url = "https://files.pythonhosted.org/packages/45/28/757daf2399aa71bb37f9f7f48b42ab03fc51c340eccfad2fec92a23f6aa3/backports_zstd-1.6.0-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:b0ddbcd2866b8ff1a2836e4b0e4d44788f5b992d83fac75a38cda8f9a2bee079", size = 564261, upload-time = "2026-06-14T10:49:42.49Z" }, + { url = "https://files.pythonhosted.org/packages/4e/53/9b9db30cb2c148a69c40ad7647aa787338041f3dc81c5b22113286e590e9/backports_zstd-1.6.0-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:2914abea516704bdafb2090acd3f15b5f9debecfabd15b8dd8285b2ad3b92209", size = 632869, upload-time = "2026-06-14T10:49:43.981Z" }, + { url = "https://files.pythonhosted.org/packages/81/a4/1692fbb88af8aaf900a53619fcc95c9e45d9ff162223a47fd672a9893c8d/backports_zstd-1.6.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:dd085eafa2aac6f883afd28210a3231f717f25409a1e44a39bb7b04c8c5b5646", size = 496496, upload-time = "2026-06-14T10:49:45.118Z" }, + { url = "https://files.pythonhosted.org/packages/93/42/c5a66c47320bd12ce84a7341330ea582d67069bdb70214bca0b6bf394cfd/backports_zstd-1.6.0-cp311-cp311-win32.whl", hash = "sha256:b81b4cf3d6e0ad7ac92bef248f49fafc954262c5fb0f7e19d6aac497e5a856b2", size = 291613, upload-time = "2026-06-14T10:49:46.473Z" }, + { url = "https://files.pythonhosted.org/packages/2a/f2/f22c19b4cdde429805ff5ac8dd77a95569a7c4cb8991741b2ff0d538f220/backports_zstd-1.6.0-cp311-cp311-win_amd64.whl", hash = "sha256:10b61850c4112952e05aa6e6cce8c9a5936fbeadb321e154216705cc76a14afa", size = 329078, upload-time = "2026-06-14T10:49:47.71Z" }, + { url = "https://files.pythonhosted.org/packages/ef/dc/e902a3f1eb92c4907b5f47f90cb3c2734ee315c4ff67179fc111343b45ba/backports_zstd-1.6.0-cp311-cp311-win_arm64.whl", hash = "sha256:068ef3d8c18815a2e3a752f766313e19910e7c50939b956923748d9c04ebcb1b", size = 291727, upload-time = "2026-06-14T10:49:48.929Z" }, + { url = "https://files.pythonhosted.org/packages/1e/bb/009af3a9532d4cc66d5385391c512210fae32ab2442605f26aca1d8d2957/backports_zstd-1.6.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:0466b14723f3b7697669c00ee66fe16e30e25636b286b0a923fa86fa3d8a753c", size = 437407, upload-time = "2026-06-14T10:49:50.155Z" }, + { url = "https://files.pythonhosted.org/packages/0c/76/f7c02efde81ebb9993586f9e435d2fd1191a6f806f640e4eeb8d004493ed/backports_zstd-1.6.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:1d146926e997d2d3de8212bdcbf4985344a2622ca3bec458d8908000a84fd883", size = 363519, upload-time = "2026-06-14T10:49:51.383Z" }, + { url = "https://files.pythonhosted.org/packages/2e/5e/0cf66f12472fe3e082cc4134395a7e0b8746cfb30aabd74251ce8fafa9a7/backports_zstd-1.6.0-cp312-cp312-manylinux2010_i686.manylinux_2_12_i686.manylinux_2_28_i686.whl", hash = "sha256:460fd6b3f338c659507ae36cfd6b58ac9942a2ff233c5cf574416dfec0451a84", size = 507756, upload-time = "2026-06-14T10:49:52.497Z" }, + { url = "https://files.pythonhosted.org/packages/03/95/7ed25c90369360f96f8bfa961540845e063377c32a43b775201af66a588c/backports_zstd-1.6.0-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:7c2b1f4a640c51130caa92cef5bf72bd3c3dbbcfbf814c37403aa0601b1811b0", size = 477578, upload-time = "2026-06-14T10:49:53.887Z" }, + { url = "https://files.pythonhosted.org/packages/e3/75/f16b1d3e33ca396525847c81d96e3de7bc74d2c6f9ca2ddee76b0c450697/backports_zstd-1.6.0-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:beb43e9885202c8d4f3762319ed4d5e98e197622afbff8439fbbdd81d08938b9", size = 583029, upload-time = "2026-06-14T10:49:55.132Z" }, + { url = "https://files.pythonhosted.org/packages/e1/2b/a17b111b631e1c79a0e570881c1a266c661b936585afa395435a458b1991/backports_zstd-1.6.0-cp312-cp312-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:fbb746522ebfc11155f1cd688e2c48ef3d74125e38b63eabdaab068a055c3e88", size = 641741, upload-time = "2026-06-14T10:49:56.42Z" }, + { url = "https://files.pythonhosted.org/packages/6b/b2/d17b2722c636d64b4e77ddc68d8d0625719d39f94021be8719a218af4c0a/backports_zstd-1.6.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:1a99710fbb225d459d66def4dc2bb2cd4a9a0bdc8b799fc0621cfdd863be9c93", size = 495554, upload-time = "2026-06-14T10:49:57.652Z" }, + { url = "https://files.pythonhosted.org/packages/63/12/2853e8b6c03f03795b6548ea61f82cc104d4f7ff2523a04bc69f46984663/backports_zstd-1.6.0-cp312-cp312-manylinux_2_34_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:f69365ee2b836939137de024a302395a1cb8654fb6dc5ffef6381105259c8f87", size = 570027, upload-time = "2026-06-14T10:49:59.003Z" }, + { url = "https://files.pythonhosted.org/packages/18/aa/83f37b81f3b8c6ea035bf260ec374648bd59372894c02323dc9de3cbdf77/backports_zstd-1.6.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:66cf8038893c7708ec345ffb3ac63c775d10f430f323ac2f0334fdb6a397c57c", size = 483594, upload-time = "2026-06-14T10:50:00.49Z" }, + { url = "https://files.pythonhosted.org/packages/f5/6a/d77f8cd2ff642d3b3652c1ccab5b6583114dbf10f8cb0143531357c83998/backports_zstd-1.6.0-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:e514c71ca72f3b56bd8fbda1a6a5b7d1100a2764b42a3c74a38841f25f9b00ab", size = 511206, upload-time = "2026-06-14T10:50:01.86Z" }, + { url = "https://files.pythonhosted.org/packages/56/b2/99a60fe4d1aac8053769d2463271d5df37a7c11c387072fdbb0b16aed7f7/backports_zstd-1.6.0-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:7741e44f7938ec94f9a52678c8d19b7bc548522ffdc39c9e4481af8db545fa9a", size = 587416, upload-time = "2026-06-14T10:50:03.236Z" }, + { url = "https://files.pythonhosted.org/packages/ec/1e/a9c003fe4d14bd4bf671598d4c7dcc1cef51e3513d9d7111ba1d07b6f07b/backports_zstd-1.6.0-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:97e8a9674652496c7612b528085dd5a296c052a2edc466ca1bfb7b0b27820413", size = 567615, upload-time = "2026-06-14T10:50:04.524Z" }, + { url = "https://files.pythonhosted.org/packages/ec/b9/955bd604f692c550c7cb66d00bd7691ead5c86df8ebd23d7254eeaa90789/backports_zstd-1.6.0-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:23a793f2fed4dbf0517319759a2cded0b0dd8e8d3797fe30badd5693e320c175", size = 632269, upload-time = "2026-06-14T10:50:05.86Z" }, + { url = "https://files.pythonhosted.org/packages/18/d7/9f61f612f8a4193484c78a1f26db82a50141234189885113ef0085a8a961/backports_zstd-1.6.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:b951113113ed4b8d173418a4f155c14b739dace626b3fa3f82be1831958d39e4", size = 500066, upload-time = "2026-06-14T10:50:07.446Z" }, + { url = "https://files.pythonhosted.org/packages/81/a3/19fb8c48d94139481c5ccaf2fb54c31b543fa635fd7bd7399aadd15752ac/backports_zstd-1.6.0-cp312-cp312-win32.whl", hash = "sha256:6430b34a2ae6fcc604672f4f913102563473d9a015bdca1ce8c95041cc1f2677", size = 291825, upload-time = "2026-06-14T10:50:08.762Z" }, + { url = "https://files.pythonhosted.org/packages/58/38/40ba081c6c71f0f22c64d3d54b912ad75a4e6812caa1397cbb15b5693b12/backports_zstd-1.6.0-cp312-cp312-win_amd64.whl", hash = "sha256:08793876172551a930ce4d65c712cd516184d1a97070d4a1193e05bf0cf7040d", size = 329201, upload-time = "2026-06-14T10:50:09.979Z" }, + { url = "https://files.pythonhosted.org/packages/2b/6c/f7116dd2edc6f960545f0d8616939eae3a20031b3b6669697d4f9fd83b2e/backports_zstd-1.6.0-cp312-cp312-win_arm64.whl", hash = "sha256:03b7c59c71f7a597e2bcb3f8368371e9a660a1bdf1c37afc1f1ad1496a013c19", size = 291901, upload-time = "2026-06-14T10:50:11.198Z" }, + { url = "https://files.pythonhosted.org/packages/38/06/c430537d59c55d49bcd15ecf4b1aa965453219caad810a4f2b484816f4be/backports_zstd-1.6.0-cp313-cp313-android_24_arm64_v8a.whl", hash = "sha256:2ace939e4d620e119423606f2d3d7115f8707733bf57f279ad9a9383f875986f", size = 400327, upload-time = "2026-06-14T10:50:12.446Z" }, + { url = "https://files.pythonhosted.org/packages/36/48/2f8323bb0e3ebba88b54877a2979afeb83983fb2ca572f09ad61aae2d3a0/backports_zstd-1.6.0-cp313-cp313-android_24_x86_64.whl", hash = "sha256:4c68a9ed2df0cca51d774c521e68a34d2e3d9ebfc687ef8096adfd4f345b551d", size = 454276, upload-time = "2026-06-14T10:50:13.667Z" }, + { url = "https://files.pythonhosted.org/packages/7c/39/87a665244a65f5b87a06b848c29a8cce07e91d59c5988ee2a32c0293a21c/backports_zstd-1.6.0-cp313-cp313-ios_13_0_arm64_iphoneos.whl", hash = "sha256:30576f49b82328ec8af16c11100efe52ca88526f71bbe100ef6b4e707dc13bf2", size = 357457, upload-time = "2026-06-14T10:50:14.906Z" }, + { url = "https://files.pythonhosted.org/packages/7f/8b/854d4a47bb8b7a48bfb2ed381c7b03a70efb4fc49f0e4a1509b38a2e1727/backports_zstd-1.6.0-cp313-cp313-ios_13_0_arm64_iphonesimulator.whl", hash = "sha256:b4bddfcfb6679215d6f4dc5f79a1f9301af339480d70527a14b57a1f2e6b6cbf", size = 366139, upload-time = "2026-06-14T10:50:16.399Z" }, + { url = "https://files.pythonhosted.org/packages/8f/de/c3af43eb8df6f2581e157e18a3e0121eadb826055b2fde3f91ec188689cb/backports_zstd-1.6.0-cp313-cp313-ios_13_0_x86_64_iphonesimulator.whl", hash = "sha256:65048ed08c5124f05ff9f355ab9703014bb2dbe7f8d9948ce193685b1775f442", size = 446683, upload-time = "2026-06-14T10:50:17.633Z" }, + { url = "https://files.pythonhosted.org/packages/5c/39/87cf3d883d386c10ac52f5322604fb9afdd204229f4c47d4a820a839b8ff/backports_zstd-1.6.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:5918fc6b31437208721276964323933cd86077b8d5b469c59c1b3fd2c8220a05", size = 436869, upload-time = "2026-06-14T10:50:19.113Z" }, + { url = "https://files.pythonhosted.org/packages/5e/b6/9479e6f0f18824ad38e8d7dd85161ab0842a198be669421232925bb30960/backports_zstd-1.6.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:4b6c8b02ab0ccb2431bb7bc238be91d158b308915e7b07937388e540466fe7e7", size = 363090, upload-time = "2026-06-14T10:50:20.302Z" }, + { url = "https://files.pythonhosted.org/packages/d9/74/a5e98fe108e17c91d9bc590a19e77f5d47d579e34d3f5bc098a949d6c27c/backports_zstd-1.6.0-cp313-cp313-manylinux2010_i686.manylinux_2_12_i686.manylinux_2_28_i686.whl", hash = "sha256:711e6b98f8924e8b4a61ff97ab6321f33de024e1ed6a32f5123763aeda8459be", size = 507070, upload-time = "2026-06-14T10:50:21.536Z" }, + { url = "https://files.pythonhosted.org/packages/69/f5/392bb7dce7363b77bc5403060f418fad438b9cfdd3edd10d65cee7d8fd11/backports_zstd-1.6.0-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:2ba9ac10fc393e5123a08802e0e895a107cb4a66b9973d2844dbd8a343111e59", size = 477200, upload-time = "2026-06-14T10:50:22.91Z" }, + { url = "https://files.pythonhosted.org/packages/e4/4d/dfb665806ba4f74bc48071d32006843b53568c4a17ff627a3061de5eaa09/backports_zstd-1.6.0-cp313-cp313-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:2f723219335387d7546412d8141e0303590600949b4184a1391a0c6a3c756058", size = 582724, upload-time = "2026-06-14T10:50:24.28Z" }, + { url = "https://files.pythonhosted.org/packages/57/b2/beeca7393a8310debd82ee2f0ce5c1801e8d7cb673f7f226f4a0866ca238/backports_zstd-1.6.0-cp313-cp313-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:64b94d7a836568926a3309ff510c7f8261b881b341fd4992cabf4f0998878f8a", size = 643493, upload-time = "2026-06-14T10:50:25.736Z" }, + { url = "https://files.pythonhosted.org/packages/38/26/ce90e9eed6f25aaa4a4fa305a2aaf2d2ad81fd69de8eb248ddd91c80d1e0/backports_zstd-1.6.0-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:e39258a09b1c7ca70b5e94a5c5ccfe4700b4250b8077cfeab31d0f79565d4c9b", size = 492190, upload-time = "2026-06-14T10:50:27.205Z" }, + { url = "https://files.pythonhosted.org/packages/17/9b/37b9b146df1f5452419a96071a7017cbac212ec9b137d7a88ca46dc2aa9e/backports_zstd-1.6.0-cp313-cp313-manylinux_2_34_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:15b1aae0f64cd742df4bba1d989d0a09a6ec619202543fdba684640454541fd3", size = 567432, upload-time = "2026-06-14T10:50:28.386Z" }, + { url = "https://files.pythonhosted.org/packages/06/66/81b30991be83237529f36335ac3682bce26409064b906ac6122874575196/backports_zstd-1.6.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:25b5ddc789480072551af571a746e9500356b2aff0499861cf2ca07ea7431e68", size = 483021, upload-time = "2026-06-14T10:50:29.654Z" }, + { url = "https://files.pythonhosted.org/packages/49/2a/792c65dcc1e45eb0c1bdc012ee94b84867186bfe27a860d0813bd216f03b/backports_zstd-1.6.0-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:a13cfa3410a75e4cb87abdb669aaf79da861cb79299159054ff8f77b9671bc40", size = 510596, upload-time = "2026-06-14T10:50:31.657Z" }, + { url = "https://files.pythonhosted.org/packages/1d/22/01b92a600505620e4cb5f20429e181f30458b7207ca8b52ca5ca6068c35f/backports_zstd-1.6.0-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:2ddab55a5f54dec8acfad68ef70f1c704fd21919990ddc238afbd6f496e61c6a", size = 587143, upload-time = "2026-06-14T10:50:32.868Z" }, + { url = "https://files.pythonhosted.org/packages/d8/60/4672f5110b9eb01388cc6225a739e3a5fcd749a63a9c4c1450a04fa27113/backports_zstd-1.6.0-cp313-cp313-musllinux_1_2_riscv64.whl", hash = "sha256:fa305a84087e10d7a85e8a8a3dcba8cdbda4868f2180173b264b7b488fd37c55", size = 565238, upload-time = "2026-06-14T10:50:34.173Z" }, + { url = "https://files.pythonhosted.org/packages/5c/3b/19928d60ea7d25820bf12ef88de74534ca85b56ff7cf13c1b0e74e3a3d7c/backports_zstd-1.6.0-cp313-cp313-musllinux_1_2_s390x.whl", hash = "sha256:df27b57d214a3124fbe4e933ef5a903d4567f154260d9aece8c797a987f2a205", size = 633970, upload-time = "2026-06-14T10:50:35.506Z" }, + { url = "https://files.pythonhosted.org/packages/df/97/c4cecb3e0ff53563ef9819f0395d919ceaae9c5147392ac23bac7afdb20f/backports_zstd-1.6.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:28fecd73459d74910ae1987ab84b7bef690d3dd860948430dd5555108b006daf", size = 496539, upload-time = "2026-06-14T10:50:37.015Z" }, + { url = "https://files.pythonhosted.org/packages/eb/f4/46b2f29d2938a80e56e61a19f11ab093f531a9f8cd0ec8eeaac1246bcd99/backports_zstd-1.6.0-cp313-cp313-win32.whl", hash = "sha256:3e689af303df287142770abe3a48bbefd24dab4a09da5807d0e1fa8c75bab026", size = 291451, upload-time = "2026-06-14T10:50:38.518Z" }, + { url = "https://files.pythonhosted.org/packages/d1/ad/b529f92166da61f496621345f95d2dc583c8ca5ac553c084a4ef6c12cd71/backports_zstd-1.6.0-cp313-cp313-win_amd64.whl", hash = "sha256:b067b1ef9c8e41fb0882c828aa37829938b5c0dab067eca72b23fc24c563b9da", size = 329023, upload-time = "2026-06-14T10:50:39.742Z" }, + { url = "https://files.pythonhosted.org/packages/30/d8/6be904d20345fbebec583ca83676e01f30c76118b283eb666d8ec8291ca1/backports_zstd-1.6.0-cp313-cp313-win_arm64.whl", hash = "sha256:a838296f5b84c920172fb579cac894d255c1fc25457c7234613ddcfa385e49b7", size = 291636, upload-time = "2026-06-14T10:50:41.004Z" }, + { url = "https://files.pythonhosted.org/packages/e8/09/898fe2f8196fa7ab825f5fed786c68581fdac7d23a8e20baa0cc01cb2f0b/backports_zstd-1.6.0-pp311-pypy311_pp73-macosx_10_15_x86_64.whl", hash = "sha256:aeef8563b82ed4af328f98e5041c1b4800d86f68f857ffd1577d4d47dc9aa6cd", size = 411023, upload-time = "2026-06-14T10:50:50.286Z" }, + { url = "https://files.pythonhosted.org/packages/6e/ad/6ad9af1596ab5f284bb53954be41396e13d23c81cdfe3d945402e8ee0215/backports_zstd-1.6.0-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:9cb75e33131946fabd6319061df3b8b1d588fe0963183280e9b5f49f7772fc09", size = 340554, upload-time = "2026-06-14T10:50:51.523Z" }, + { url = "https://files.pythonhosted.org/packages/f0/00/f083d7c8a4ee5d0bb21b4d3144e76de9f655ca4dd0bffcb95baa5bc47a62/backports_zstd-1.6.0-pp311-pypy311_pp73-manylinux2010_i686.manylinux_2_12_i686.manylinux_2_28_i686.whl", hash = "sha256:ef132cfb638e9a86bd5dc07fb4e1cb895bc55bce6bb5e759366e8b160d0747e2", size = 421694, upload-time = "2026-06-14T10:50:52.917Z" }, + { url = "https://files.pythonhosted.org/packages/41/d7/693b20f3ccae2e05d166f98fe55b1657451170b72c804ed9f6b98df520be/backports_zstd-1.6.0-pp311-pypy311_pp73-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:ab70eace272d6f122b121c057e436709b50a28abf30d97aab28433c08f4a4095", size = 395237, upload-time = "2026-06-14T10:50:54.448Z" }, + { url = "https://files.pythonhosted.org/packages/53/a1/484e0f9ec994bd2285d6747e7c8028350f1a177e9210bc57637898042d3b/backports_zstd-1.6.0-pp311-pypy311_pp73-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:17efb3d11137de5166dd51eedab9c36ad633402acba386eee8d715213ea47e49", size = 415201, upload-time = "2026-06-14T10:50:55.854Z" }, + { url = "https://files.pythonhosted.org/packages/3c/56/70860ece85cd49b564305cbc22bf6c4183975427ff6dfe2097e855f5dd5e/backports_zstd-1.6.0-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:994167ff6551b9c1ce226e0aab16295b98c94507b5701aa60d2c32b7d50796b1", size = 315721, upload-time = "2026-06-14T10:50:57.074Z" }, +] + +[[package]] +name = "beautifulsoup4" +version = "4.15.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "soupsieve" }, + { name = "typing-extensions" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/43/65/318323f98dbee45d42dff61d8f047181bc6f2268a9068cfad035a46be5af/beautifulsoup4-4.15.0.tar.gz", hash = "sha256:288e3ca7d54b06f2ac191970bc275c1939cb46d450b255bf6718b04aa37ab4f7", size = 632571, upload-time = "2026-06-07T16:44:20.453Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/88/c6/92fcd42f1ba33e1184263f25bfabf3d27c383410470f169e4b8163bf9c17/beautifulsoup4-4.15.0-py3-none-any.whl", hash = "sha256:d6f88de62e1d4e38ecb1077eb9724cd0eff29d2a08ca16a401e9b9e93f117cf9", size = 109924, upload-time = "2026-06-07T16:44:21.566Z" }, +] + +[[package]] +name = "bibtexparser" +version = "1.4.4" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "pyparsing" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/44/1c/577d3ce406e88f370e80a6ebf76ae52a2866521e0b585e8ec612759894f1/bibtexparser-1.4.4.tar.gz", hash = "sha256:093b6c824f7a71d3a748867c4057b71f77c55b8dbc07efc993b781771520d8fb", size = 55594, upload-time = "2026-01-29T18:58:01.366Z" } + +[[package]] +name = "bleach" +version = "6.4.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "webencodings" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/48/3c/e12ac860709702bd5ebeb9b56a4fe334f1001246ee1b8f2b7ee28912df7d/bleach-6.4.0.tar.gz", hash = "sha256:4202482733d85cedd04e59fcb2f89f4e4c7c385a78d3c3c23c30446843a37452", size = 204857, upload-time = "2026-06-05T13:01:13.734Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/58/9d/40b6267367182187139a4000b82a3b287d84d745bccd808e75d916920e9d/bleach-6.4.0-py3-none-any.whl", hash = "sha256:4b6b6a54fff2e69a3dde9d21cc6301220bee3c3cb792187d11403fd795031081", size = 165109, upload-time = "2026-06-05T13:01:12.504Z" }, +] + +[package.optional-dependencies] +css = [ + { name = "tinycss2" }, +] + +[[package]] +name = "blinker" +version = "1.9.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/21/28/9b3f50ce0e048515135495f198351908d99540d69bfdc8c1d15b73dc55ce/blinker-1.9.0.tar.gz", hash = "sha256:b4ce2265a7abece45e7cc896e98dbebe6cead56bcf805a3d23136d145f5445bf", size = 22460, upload-time = "2024-11-08T17:25:47.436Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/10/cb/f2ad4230dc2eb1a74edf38f1a38b9b52277f75bef262d8908e60d957e13c/blinker-1.9.0-py3-none-any.whl", hash = "sha256:ba0efaa9080b619ff2f3459d1d500c57bddea4a6b424b60a91141db6fd2f08bc", size = 8458, upload-time = "2024-11-08T17:25:46.184Z" }, +] + +[[package]] +name = "boltons" +version = "26.0.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/7a/1f/60df922ae497d838c58b48caa518251e2c8e228d7fe93792fee69a3858d6/boltons-26.0.0.tar.gz", hash = "sha256:5566d6cfd5a1e873d8e8476496287a9f92979964611ad9a9cecb6b0ef29b1edd", size = 225129, upload-time = "2026-06-19T06:10:41.226Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/00/01/4001033457f25ecdc2b1ffd513ca0b76200b9ea009dd64f6c1aad2dde133/boltons-26.0.0-py3-none-any.whl", hash = "sha256:ba077cac51b27532299634f87f5589b4080fa94a011b4d43a9247f775e9215c7", size = 195559, upload-time = "2026-06-19T06:10:39.865Z" }, +] + +[[package]] +name = "boto3" +version = "1.43.35" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "botocore" }, + { name = "jmespath" }, + { name = "s3transfer" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/b7/f7/9ba34c655158a9827d0fdd8c6211a3836d9fbf29d48b82783995927b3907/boto3-1.43.35.tar.gz", hash = "sha256:392ba41e82629a77ad70de38c43f8fc0f5f453c965e381e4e87d6fcedc80d6c4", size = 112638, upload-time = "2026-06-22T20:26:39.039Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/6a/72/a92face6b5284d1283f2cccae224d6a10ebc5735c5d6fa93837109ebb6a1/boto3-1.43.35-py3-none-any.whl", hash = "sha256:461d5fb1ee1422d4a0a439666cebb29e0d5b4bf4308d3c2564449c77a1f4ae52", size = 140032, upload-time = "2026-06-22T20:26:36.638Z" }, +] + +[[package]] +name = "botocore" +version = "1.43.35" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "jmespath" }, + { name = "python-dateutil" }, + { name = "urllib3" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/17/d8/28177fef65f6ef8c7fdd5b44024254816961578ce8925bc336229e236cdc/botocore-1.43.35.tar.gz", hash = "sha256:ea16aaad7db67b5af67719e9da3302474af97a7fdf27161c2ecb30adb3570d50", size = 15625607, upload-time = "2026-06-22T20:26:26.637Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/82/6c/5807aca5a873714144beb69ed5adc04bcdb8e9496be6bf7b72a76a6c9773/botocore-1.43.35-py3-none-any.whl", hash = "sha256:51c5893b5404b74012edde03bbd9c199c4bd7ffa35ddad173d0835efa7de281b", size = 15313659, upload-time = "2026-06-22T20:26:22.017Z" }, +] + +[[package]] +name = "brotli" +version = "1.2.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/f7/16/c92ca344d646e71a43b8bb353f0a6490d7f6e06210f8554c8f874e454285/brotli-1.2.0.tar.gz", hash = "sha256:e310f77e41941c13340a95976fe66a8a95b01e783d430eeaf7a2f87e0a57dd0a", size = 7388632, upload-time = "2025-11-05T18:39:42.86Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/7a/ef/f285668811a9e1ddb47a18cb0b437d5fc2760d537a2fe8a57875ad6f8448/brotli-1.2.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:15b33fe93cedc4caaff8a0bd1eb7e3dab1c61bb22a0bf5bdfdfd97cd7da79744", size = 863110, upload-time = "2025-11-05T18:38:12.978Z" }, + { url = "https://files.pythonhosted.org/packages/50/62/a3b77593587010c789a9d6eaa527c79e0848b7b860402cc64bc0bc28a86c/brotli-1.2.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:898be2be399c221d2671d29eed26b6b2713a02c2119168ed914e7d00ceadb56f", size = 445438, upload-time = "2025-11-05T18:38:14.208Z" }, + { url = "https://files.pythonhosted.org/packages/cd/e1/7fadd47f40ce5549dc44493877db40292277db373da5053aff181656e16e/brotli-1.2.0-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:350c8348f0e76fff0a0fd6c26755d2653863279d086d3aa2c290a6a7251135dd", size = 1534420, upload-time = "2025-11-05T18:38:15.111Z" }, + { url = "https://files.pythonhosted.org/packages/12/8b/1ed2f64054a5a008a4ccd2f271dbba7a5fb1a3067a99f5ceadedd4c1d5a7/brotli-1.2.0-cp311-cp311-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:2e1ad3fda65ae0d93fec742a128d72e145c9c7a99ee2fcd667785d99eb25a7fe", size = 1632619, upload-time = "2025-11-05T18:38:16.094Z" }, + { url = "https://files.pythonhosted.org/packages/89/5a/7071a621eb2d052d64efd5da2ef55ecdac7c3b0c6e4f9d519e9c66d987ef/brotli-1.2.0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:40d918bce2b427a0c4ba189df7a006ac0c7277c180aee4617d99e9ccaaf59e6a", size = 1426014, upload-time = "2025-11-05T18:38:17.177Z" }, + { url = "https://files.pythonhosted.org/packages/26/6d/0971a8ea435af5156acaaccec1a505f981c9c80227633851f2810abd252a/brotli-1.2.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:2a7f1d03727130fc875448b65b127a9ec5d06d19d0148e7554384229706f9d1b", size = 1489661, upload-time = "2025-11-05T18:38:18.41Z" }, + { url = "https://files.pythonhosted.org/packages/f3/75/c1baca8b4ec6c96a03ef8230fab2a785e35297632f402ebb1e78a1e39116/brotli-1.2.0-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:9c79f57faa25d97900bfb119480806d783fba83cd09ee0b33c17623935b05fa3", size = 1599150, upload-time = "2025-11-05T18:38:19.792Z" }, + { url = "https://files.pythonhosted.org/packages/0d/1a/23fcfee1c324fd48a63d7ebf4bac3a4115bdb1b00e600f80f727d850b1ae/brotli-1.2.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:844a8ceb8483fefafc412f85c14f2aae2fb69567bf2a0de53cdb88b73e7c43ae", size = 1493505, upload-time = "2025-11-05T18:38:20.913Z" }, + { url = "https://files.pythonhosted.org/packages/36/e5/12904bbd36afeef53d45a84881a4810ae8810ad7e328a971ebbfd760a0b3/brotli-1.2.0-cp311-cp311-win32.whl", hash = "sha256:aa47441fa3026543513139cb8926a92a8e305ee9c71a6209ef7a97d91640ea03", size = 334451, upload-time = "2025-11-05T18:38:21.94Z" }, + { url = "https://files.pythonhosted.org/packages/02/8b/ecb5761b989629a4758c394b9301607a5880de61ee2ee5fe104b87149ebc/brotli-1.2.0-cp311-cp311-win_amd64.whl", hash = "sha256:022426c9e99fd65d9475dce5c195526f04bb8be8907607e27e747893f6ee3e24", size = 369035, upload-time = "2025-11-05T18:38:22.941Z" }, + { url = "https://files.pythonhosted.org/packages/11/ee/b0a11ab2315c69bb9b45a2aaed022499c9c24a205c3a49c3513b541a7967/brotli-1.2.0-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:35d382625778834a7f3061b15423919aa03e4f5da34ac8e02c074e4b75ab4f84", size = 861543, upload-time = "2025-11-05T18:38:24.183Z" }, + { url = "https://files.pythonhosted.org/packages/e1/2f/29c1459513cd35828e25531ebfcbf3e92a5e49f560b1777a9af7203eb46e/brotli-1.2.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:7a61c06b334bd99bc5ae84f1eeb36bfe01400264b3c352f968c6e30a10f9d08b", size = 444288, upload-time = "2025-11-05T18:38:25.139Z" }, + { url = "https://files.pythonhosted.org/packages/3d/6f/feba03130d5fceadfa3a1bb102cb14650798c848b1df2a808356f939bb16/brotli-1.2.0-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:acec55bb7c90f1dfc476126f9711a8e81c9af7fb617409a9ee2953115343f08d", size = 1528071, upload-time = "2025-11-05T18:38:26.081Z" }, + { url = "https://files.pythonhosted.org/packages/2b/38/f3abb554eee089bd15471057ba85f47e53a44a462cfce265d9bf7088eb09/brotli-1.2.0-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:260d3692396e1895c5034f204f0db022c056f9e2ac841593a4cf9426e2a3faca", size = 1626913, upload-time = "2025-11-05T18:38:27.284Z" }, + { url = "https://files.pythonhosted.org/packages/03/a7/03aa61fbc3c5cbf99b44d158665f9b0dd3d8059be16c460208d9e385c837/brotli-1.2.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:072e7624b1fc4d601036ab3f4f27942ef772887e876beff0301d261210bca97f", size = 1419762, upload-time = "2025-11-05T18:38:28.295Z" }, + { url = "https://files.pythonhosted.org/packages/21/1b/0374a89ee27d152a5069c356c96b93afd1b94eae83f1e004b57eb6ce2f10/brotli-1.2.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:adedc4a67e15327dfdd04884873c6d5a01d3e3b6f61406f99b1ed4865a2f6d28", size = 1484494, upload-time = "2025-11-05T18:38:29.29Z" }, + { url = "https://files.pythonhosted.org/packages/cf/57/69d4fe84a67aef4f524dcd075c6eee868d7850e85bf01d778a857d8dbe0a/brotli-1.2.0-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:7a47ce5c2288702e09dc22a44d0ee6152f2c7eda97b3c8482d826a1f3cfc7da7", size = 1593302, upload-time = "2025-11-05T18:38:30.639Z" }, + { url = "https://files.pythonhosted.org/packages/d5/3b/39e13ce78a8e9a621c5df3aeb5fd181fcc8caba8c48a194cd629771f6828/brotli-1.2.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:af43b8711a8264bb4e7d6d9a6d004c3a2019c04c01127a868709ec29962b6036", size = 1487913, upload-time = "2025-11-05T18:38:31.618Z" }, + { url = "https://files.pythonhosted.org/packages/62/28/4d00cb9bd76a6357a66fcd54b4b6d70288385584063f4b07884c1e7286ac/brotli-1.2.0-cp312-cp312-win32.whl", hash = "sha256:e99befa0b48f3cd293dafeacdd0d191804d105d279e0b387a32054c1180f3161", size = 334362, upload-time = "2025-11-05T18:38:32.939Z" }, + { url = "https://files.pythonhosted.org/packages/1c/4e/bc1dcac9498859d5e353c9b153627a3752868a9d5f05ce8dedd81a2354ab/brotli-1.2.0-cp312-cp312-win_amd64.whl", hash = "sha256:b35c13ce241abdd44cb8ca70683f20c0c079728a36a996297adb5334adfc1c44", size = 369115, upload-time = "2025-11-05T18:38:33.765Z" }, + { url = "https://files.pythonhosted.org/packages/6c/d4/4ad5432ac98c73096159d9ce7ffeb82d151c2ac84adcc6168e476bb54674/brotli-1.2.0-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:9e5825ba2c9998375530504578fd4d5d1059d09621a02065d1b6bfc41a8e05ab", size = 861523, upload-time = "2025-11-05T18:38:34.67Z" }, + { url = "https://files.pythonhosted.org/packages/91/9f/9cc5bd03ee68a85dc4bc89114f7067c056a3c14b3d95f171918c088bf88d/brotli-1.2.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:0cf8c3b8ba93d496b2fae778039e2f5ecc7cff99df84df337ca31d8f2252896c", size = 444289, upload-time = "2025-11-05T18:38:35.6Z" }, + { url = "https://files.pythonhosted.org/packages/2e/b6/fe84227c56a865d16a6614e2c4722864b380cb14b13f3e6bef441e73a85a/brotli-1.2.0-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:c8565e3cdc1808b1a34714b553b262c5de5fbda202285782173ec137fd13709f", size = 1528076, upload-time = "2025-11-05T18:38:36.639Z" }, + { url = "https://files.pythonhosted.org/packages/55/de/de4ae0aaca06c790371cf6e7ee93a024f6b4bb0568727da8c3de112e726c/brotli-1.2.0-cp313-cp313-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:26e8d3ecb0ee458a9804f47f21b74845cc823fd1bb19f02272be70774f56e2a6", size = 1626880, upload-time = "2025-11-05T18:38:37.623Z" }, + { url = "https://files.pythonhosted.org/packages/5f/16/a1b22cbea436642e071adcaf8d4b350a2ad02f5e0ad0da879a1be16188a0/brotli-1.2.0-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:67a91c5187e1eec76a61625c77a6c8c785650f5b576ca732bd33ef58b0dff49c", size = 1419737, upload-time = "2025-11-05T18:38:38.729Z" }, + { url = "https://files.pythonhosted.org/packages/46/63/c968a97cbb3bdbf7f974ef5a6ab467a2879b82afbc5ffb65b8acbb744f95/brotli-1.2.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:4ecdb3b6dc36e6d6e14d3a1bdc6c1057c8cbf80db04031d566eb6080ce283a48", size = 1484440, upload-time = "2025-11-05T18:38:39.916Z" }, + { url = "https://files.pythonhosted.org/packages/06/9d/102c67ea5c9fc171f423e8399e585dabea29b5bc79b05572891e70013cdd/brotli-1.2.0-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:3e1b35d56856f3ed326b140d3c6d9db91740f22e14b06e840fe4bb1923439a18", size = 1593313, upload-time = "2025-11-05T18:38:41.24Z" }, + { url = "https://files.pythonhosted.org/packages/9e/4a/9526d14fa6b87bc827ba1755a8440e214ff90de03095cacd78a64abe2b7d/brotli-1.2.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:54a50a9dad16b32136b2241ddea9e4df159b41247b2ce6aac0b3276a66a8f1e5", size = 1487945, upload-time = "2025-11-05T18:38:42.277Z" }, + { url = "https://files.pythonhosted.org/packages/5b/e8/3fe1ffed70cbef83c5236166acaed7bb9c766509b157854c80e2f766b38c/brotli-1.2.0-cp313-cp313-win32.whl", hash = "sha256:1b1d6a4efedd53671c793be6dd760fcf2107da3a52331ad9ea429edf0902f27a", size = 334368, upload-time = "2025-11-05T18:38:43.345Z" }, + { url = "https://files.pythonhosted.org/packages/ff/91/e739587be970a113b37b821eae8097aac5a48e5f0eca438c22e4c7dd8648/brotli-1.2.0-cp313-cp313-win_amd64.whl", hash = "sha256:b63daa43d82f0cdabf98dee215b375b4058cce72871fd07934f179885aad16e8", size = 369116, upload-time = "2025-11-05T18:38:44.609Z" }, + { url = "https://files.pythonhosted.org/packages/17/e1/298c2ddf786bb7347a1cd71d63a347a79e5712a7c0cba9e3c3458ebd976f/brotli-1.2.0-cp314-cp314-macosx_10_15_universal2.whl", hash = "sha256:6c12dad5cd04530323e723787ff762bac749a7b256a5bece32b2243dd5c27b21", size = 863080, upload-time = "2025-11-05T18:38:45.503Z" }, + { url = "https://files.pythonhosted.org/packages/84/0c/aac98e286ba66868b2b3b50338ffbd85a35c7122e9531a73a37a29763d38/brotli-1.2.0-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:3219bd9e69868e57183316ee19c84e03e8f8b5a1d1f2667e1aa8c2f91cb061ac", size = 445453, upload-time = "2025-11-05T18:38:46.433Z" }, + { url = "https://files.pythonhosted.org/packages/ec/f1/0ca1f3f99ae300372635ab3fe2f7a79fa335fee3d874fa7f9e68575e0e62/brotli-1.2.0-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:963a08f3bebd8b75ac57661045402da15991468a621f014be54e50f53a58d19e", size = 1528168, upload-time = "2025-11-05T18:38:47.371Z" }, + { url = "https://files.pythonhosted.org/packages/d6/a6/2ebfc8f766d46df8d3e65b880a2e220732395e6d7dc312c1e1244b0f074a/brotli-1.2.0-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:9322b9f8656782414b37e6af884146869d46ab85158201d82bab9abbcb971dc7", size = 1627098, upload-time = "2025-11-05T18:38:48.385Z" }, + { url = "https://files.pythonhosted.org/packages/f3/2f/0976d5b097ff8a22163b10617f76b2557f15f0f39d6a0fe1f02b1a53e92b/brotli-1.2.0-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:cf9cba6f5b78a2071ec6fb1e7bd39acf35071d90a81231d67e92d637776a6a63", size = 1419861, upload-time = "2025-11-05T18:38:49.372Z" }, + { url = "https://files.pythonhosted.org/packages/9c/97/d76df7176a2ce7616ff94c1fb72d307c9a30d2189fe877f3dd99af00ea5a/brotli-1.2.0-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:7547369c4392b47d30a3467fe8c3330b4f2e0f7730e45e3103d7d636678a808b", size = 1484594, upload-time = "2025-11-05T18:38:50.655Z" }, + { url = "https://files.pythonhosted.org/packages/d3/93/14cf0b1216f43df5609f5b272050b0abd219e0b54ea80b47cef9867b45e7/brotli-1.2.0-cp314-cp314-musllinux_1_2_ppc64le.whl", hash = "sha256:fc1530af5c3c275b8524f2e24841cbe2599d74462455e9bae5109e9ff42e9361", size = 1593455, upload-time = "2025-11-05T18:38:51.624Z" }, + { url = "https://files.pythonhosted.org/packages/b3/73/3183c9e41ca755713bdf2cc1d0810df742c09484e2e1ddd693bee53877c1/brotli-1.2.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:d2d085ded05278d1c7f65560aae97b3160aeb2ea2c0b3e26204856beccb60888", size = 1488164, upload-time = "2025-11-05T18:38:53.079Z" }, + { url = "https://files.pythonhosted.org/packages/64/6a/0c78d8f3a582859236482fd9fa86a65a60328a00983006bcf6d83b7b2253/brotli-1.2.0-cp314-cp314-win32.whl", hash = "sha256:832c115a020e463c2f67664560449a7bea26b0c1fdd690352addad6d0a08714d", size = 339280, upload-time = "2025-11-05T18:38:54.02Z" }, + { url = "https://files.pythonhosted.org/packages/f5/10/56978295c14794b2c12007b07f3e41ba26acda9257457d7085b0bb3bb90c/brotli-1.2.0-cp314-cp314-win_amd64.whl", hash = "sha256:e7c0af964e0b4e3412a0ebf341ea26ec767fa0b4cf81abb5e897c9338b5ad6a3", size = 375639, upload-time = "2025-11-05T18:38:55.67Z" }, +] + +[[package]] +name = "brotlicffi" +version = "1.2.0.1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "cffi" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/8a/b6/017dc5f852ed9b8735af77774509271acbf1de02d238377667145fcee01d/brotlicffi-1.2.0.1.tar.gz", hash = "sha256:c20d5c596278307ad06414a6d95a892377ea274a5c6b790c2548c009385d621c", size = 478156, upload-time = "2026-03-05T19:54:11.547Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/ef/f9/dfa56316837fa798eac19358351e974de8e1e2ca9475af4cb90293cd6576/brotlicffi-1.2.0.1-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:2c85e65913cf2b79c57a3fdd05b98d9731d9255dc0cb696b09376cc091b9cddd", size = 433046, upload-time = "2026-03-05T19:53:46.209Z" }, + { url = "https://files.pythonhosted.org/packages/4a/f5/f8f492158c76b0d940388801f04f747028971ad5774287bded5f1e53f08d/brotlicffi-1.2.0.1-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:535f2d05d0273408abc13fc0eebb467afac17b0ad85090c8913690d40207dac5", size = 1541126, upload-time = "2026-03-05T19:53:48.248Z" }, + { url = "https://files.pythonhosted.org/packages/3b/e1/ff87af10ac419600c63e9287a0649c673673ae6b4f2bcf48e96cb2f89f60/brotlicffi-1.2.0.1-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:ce17eb798ca59ecec67a9bb3fd7a4304e120d1cd02953ce522d959b9a84d58ac", size = 1541983, upload-time = "2026-03-05T19:53:50.317Z" }, + { url = "https://files.pythonhosted.org/packages/47/c0/80ecd9bd45776109fab14040e478bf63e456967c9ddee2353d8330ed8de1/brotlicffi-1.2.0.1-cp314-cp314t-win32.whl", hash = "sha256:3c9544f83cb715d95d7eab3af4adbbef8b2093ad6382288a83b3a25feb1a57ec", size = 349047, upload-time = "2026-03-05T19:53:52.215Z" }, + { url = "https://files.pythonhosted.org/packages/ab/98/13e5b250236a281b6cd9e92a01ee1ae231029fa78faee932ef3766e1cb24/brotlicffi-1.2.0.1-cp314-cp314t-win_amd64.whl", hash = "sha256:625f8115d32ae9c0740d01ea51518437c3fbaa3e78d41cb18459f6f7ac326000", size = 385652, upload-time = "2026-03-05T19:53:53.892Z" }, + { url = "https://files.pythonhosted.org/packages/9a/9f/b98dcd4af47994cee97aebac866996a006a2e5fc1fd1e2b82a8ad95cf09c/brotlicffi-1.2.0.1-cp38-abi3-macosx_11_0_arm64.whl", hash = "sha256:91ba5f0ccc040f6ff8f7efaf839f797723d03ed46acb8ae9408f99ffd2572cf4", size = 432608, upload-time = "2026-03-05T19:53:56.736Z" }, + { url = "https://files.pythonhosted.org/packages/b1/7a/ac4ee56595a061e3718a6d1ea7e921f4df156894acffb28ed88a1fd52022/brotlicffi-1.2.0.1-cp38-abi3-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:be9a670c6811af30a4bd42d7116dc5895d3b41beaa8ed8a89050447a0181f5ce", size = 1534257, upload-time = "2026-03-05T19:53:58.667Z" }, + { url = "https://files.pythonhosted.org/packages/99/39/e7410db7f6f56de57744ea52a115084ceb2735f4d44973f349bb92136586/brotlicffi-1.2.0.1-cp38-abi3-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:6f3314a3476f59e5443f9f72a6dff16edc0c3463c9b318feaef04ae3e4683f5a", size = 1536838, upload-time = "2026-03-05T19:54:00.705Z" }, + { url = "https://files.pythonhosted.org/packages/a6/75/6e7977d1935fc3fbb201cbd619be8f2c7aea25d40a096967132854b34708/brotlicffi-1.2.0.1-cp38-abi3-win32.whl", hash = "sha256:82ea52e2b5d3145b6c406ebd3efb0d55db718b7ad996bd70c62cec0439de1187", size = 343337, upload-time = "2026-03-05T19:54:02.446Z" }, + { url = "https://files.pythonhosted.org/packages/d8/ef/e7e485ce5e4ba3843a0a92feb767c7b6098fd6e65ce752918074d175ae71/brotlicffi-1.2.0.1-cp38-abi3-win_amd64.whl", hash = "sha256:da2e82a08e7778b8bc539d27ca03cdd684113e81394bfaaad8d0dfc6a17ddede", size = 379026, upload-time = "2026-03-05T19:54:04.322Z" }, + { url = "https://files.pythonhosted.org/packages/7f/53/6262c2256513e6f530d81642477cb19367270922063eaa2d7b781d8c723d/brotlicffi-1.2.0.1-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:e015af99584c6db1490a69a210c765953e473e63adc2d891ac3062a737c9e851", size = 402265, upload-time = "2026-03-05T19:54:05.858Z" }, + { url = "https://files.pythonhosted.org/packages/1f/d9/d5340b43cf5fbe7fe5a083d237e5338cc1caa73bea523be1c5e452c26290/brotlicffi-1.2.0.1-pp311-pypy311_pp73-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:37cb587d32bf7168e2218c455e22e409ad1f3157c6c71945879a311f3e6b6abf", size = 406710, upload-time = "2026-03-05T19:54:07.272Z" }, + { url = "https://files.pythonhosted.org/packages/a3/82/dbced4c1e0792efdf23fd90ff6d2a320c64ff4dfef7aacc85c04fde9ddd2/brotlicffi-1.2.0.1-pp311-pypy311_pp73-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:9d6ba65dd528892b4d9960beba2ae011a753620bcfc66cf6fa3cee18d7b0baa4", size = 402787, upload-time = "2026-03-05T19:54:08.73Z" }, + { url = "https://files.pythonhosted.org/packages/ef/6f/534205ba7590c9a8716a614f270c5c2ec419b5b7079b3f9cd31b7b5580de/brotlicffi-1.2.0.1-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:f2a5575653b0672638ba039b82fda56854934d7a6a24d4b8b5033f73ab43cbc1", size = 375108, upload-time = "2026-03-05T19:54:10.079Z" }, +] + +[[package]] +name = "bytecode" +version = "0.18.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/27/8f/7d12c539869a5cbd801d550b86cc0f030ecaeb12f57f8b3ff19f2d2a184c/bytecode-0.18.1.tar.gz", hash = "sha256:d9564f1565fe1ae6a1173e544ef43a85f093e83997ef45af65d0d250eb48d7a1", size = 104631, upload-time = "2026-06-03T14:17:59.115Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/d9/ef/6a629424ec08adc3819ddfd7ec0a710361eaa29d1e5fffb4e02f074be5c9/bytecode-0.18.1-py3-none-any.whl", hash = "sha256:9535bfdd665260b2888ec4121569e3ca5106965a7fedbb6de6ba1bafebc5c7d7", size = 42868, upload-time = "2026-06-03T14:17:57.654Z" }, +] + +[[package]] +name = "certifi" +version = "2026.6.17" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/c9/c7/424b75da314c1045981bd9777432fad05a9e0c69daa4ed7e308bbaffe405/certifi-2026.6.17.tar.gz", hash = "sha256:024c88eeec92ca068db80f02b8b07c9cef7b9fe261d1d535abfd5abd6f6af432", size = 134594, upload-time = "2026-06-17T10:31:07.894Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/ef/2f/c5464532e965badff2f4c4c1a3a83f5697f0d7c407ed0cda44aaa99bb451/certifi-2026.6.17-py3-none-any.whl", hash = "sha256:2227dcbaafe0d2f59279d1762ddddc37783ed4354594f194ffc31d20f41fc3db", size = 133289, upload-time = "2026-06-17T10:31:06.348Z" }, +] + +[[package]] +name = "cffi" +version = "2.0.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "pycparser", marker = "implementation_name != 'PyPy'" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/eb/56/b1ba7935a17738ae8453301356628e8147c79dbb825bcbc73dc7401f9846/cffi-2.0.0.tar.gz", hash = "sha256:44d1b5909021139fe36001ae048dbdde8214afa20200eda0f64c068cac5d5529", size = 523588, upload-time = "2025-09-08T23:24:04.541Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/12/4a/3dfd5f7850cbf0d06dc84ba9aa00db766b52ca38d8b86e3a38314d52498c/cffi-2.0.0-cp311-cp311-macosx_10_13_x86_64.whl", hash = "sha256:b4c854ef3adc177950a8dfc81a86f5115d2abd545751a304c5bcf2c2c7283cfe", size = 184344, upload-time = "2025-09-08T23:22:26.456Z" }, + { url = "https://files.pythonhosted.org/packages/4f/8b/f0e4c441227ba756aafbe78f117485b25bb26b1c059d01f137fa6d14896b/cffi-2.0.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:2de9a304e27f7596cd03d16f1b7c72219bd944e99cc52b84d0145aefb07cbd3c", size = 180560, upload-time = "2025-09-08T23:22:28.197Z" }, + { url = "https://files.pythonhosted.org/packages/b1/b7/1200d354378ef52ec227395d95c2576330fd22a869f7a70e88e1447eb234/cffi-2.0.0-cp311-cp311-manylinux1_i686.manylinux2014_i686.manylinux_2_17_i686.manylinux_2_5_i686.whl", hash = "sha256:baf5215e0ab74c16e2dd324e8ec067ef59e41125d3eade2b863d294fd5035c92", size = 209613, upload-time = "2025-09-08T23:22:29.475Z" }, + { url = "https://files.pythonhosted.org/packages/b8/56/6033f5e86e8cc9bb629f0077ba71679508bdf54a9a5e112a3c0b91870332/cffi-2.0.0-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:730cacb21e1bdff3ce90babf007d0a0917cc3e6492f336c2f0134101e0944f93", size = 216476, upload-time = "2025-09-08T23:22:31.063Z" }, + { url = "https://files.pythonhosted.org/packages/dc/7f/55fecd70f7ece178db2f26128ec41430d8720f2d12ca97bf8f0a628207d5/cffi-2.0.0-cp311-cp311-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:6824f87845e3396029f3820c206e459ccc91760e8fa24422f8b0c3d1731cbec5", size = 203374, upload-time = "2025-09-08T23:22:32.507Z" }, + { url = "https://files.pythonhosted.org/packages/84/ef/a7b77c8bdc0f77adc3b46888f1ad54be8f3b7821697a7b89126e829e676a/cffi-2.0.0-cp311-cp311-manylinux2014_s390x.manylinux_2_17_s390x.whl", hash = "sha256:9de40a7b0323d889cf8d23d1ef214f565ab154443c42737dfe52ff82cf857664", size = 202597, upload-time = "2025-09-08T23:22:34.132Z" }, + { url = "https://files.pythonhosted.org/packages/d7/91/500d892b2bf36529a75b77958edfcd5ad8e2ce4064ce2ecfeab2125d72d1/cffi-2.0.0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:8941aaadaf67246224cee8c3803777eed332a19d909b47e29c9842ef1e79ac26", size = 215574, upload-time = "2025-09-08T23:22:35.443Z" }, + { url = "https://files.pythonhosted.org/packages/44/64/58f6255b62b101093d5df22dcb752596066c7e89dd725e0afaed242a61be/cffi-2.0.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:a05d0c237b3349096d3981b727493e22147f934b20f6f125a3eba8f994bec4a9", size = 218971, upload-time = "2025-09-08T23:22:36.805Z" }, + { url = "https://files.pythonhosted.org/packages/ab/49/fa72cebe2fd8a55fbe14956f9970fe8eb1ac59e5df042f603ef7c8ba0adc/cffi-2.0.0-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:94698a9c5f91f9d138526b48fe26a199609544591f859c870d477351dc7b2414", size = 211972, upload-time = "2025-09-08T23:22:38.436Z" }, + { url = "https://files.pythonhosted.org/packages/0b/28/dd0967a76aab36731b6ebfe64dec4e981aff7e0608f60c2d46b46982607d/cffi-2.0.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:5fed36fccc0612a53f1d4d9a816b50a36702c28a2aa880cb8a122b3466638743", size = 217078, upload-time = "2025-09-08T23:22:39.776Z" }, + { url = "https://files.pythonhosted.org/packages/2b/c0/015b25184413d7ab0a410775fdb4a50fca20f5589b5dab1dbbfa3baad8ce/cffi-2.0.0-cp311-cp311-win32.whl", hash = "sha256:c649e3a33450ec82378822b3dad03cc228b8f5963c0c12fc3b1e0ab940f768a5", size = 172076, upload-time = "2025-09-08T23:22:40.95Z" }, + { url = "https://files.pythonhosted.org/packages/ae/8f/dc5531155e7070361eb1b7e4c1a9d896d0cb21c49f807a6c03fd63fc877e/cffi-2.0.0-cp311-cp311-win_amd64.whl", hash = "sha256:66f011380d0e49ed280c789fbd08ff0d40968ee7b665575489afa95c98196ab5", size = 182820, upload-time = "2025-09-08T23:22:42.463Z" }, + { url = "https://files.pythonhosted.org/packages/95/5c/1b493356429f9aecfd56bc171285a4c4ac8697f76e9bbbbb105e537853a1/cffi-2.0.0-cp311-cp311-win_arm64.whl", hash = "sha256:c6638687455baf640e37344fe26d37c404db8b80d037c3d29f58fe8d1c3b194d", size = 177635, upload-time = "2025-09-08T23:22:43.623Z" }, + { url = "https://files.pythonhosted.org/packages/ea/47/4f61023ea636104d4f16ab488e268b93008c3d0bb76893b1b31db1f96802/cffi-2.0.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:6d02d6655b0e54f54c4ef0b94eb6be0607b70853c45ce98bd278dc7de718be5d", size = 185271, upload-time = "2025-09-08T23:22:44.795Z" }, + { url = "https://files.pythonhosted.org/packages/df/a2/781b623f57358e360d62cdd7a8c681f074a71d445418a776eef0aadb4ab4/cffi-2.0.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:8eca2a813c1cb7ad4fb74d368c2ffbbb4789d377ee5bb8df98373c2cc0dee76c", size = 181048, upload-time = "2025-09-08T23:22:45.938Z" }, + { url = "https://files.pythonhosted.org/packages/ff/df/a4f0fbd47331ceeba3d37c2e51e9dfc9722498becbeec2bd8bc856c9538a/cffi-2.0.0-cp312-cp312-manylinux1_i686.manylinux2014_i686.manylinux_2_17_i686.manylinux_2_5_i686.whl", hash = "sha256:21d1152871b019407d8ac3985f6775c079416c282e431a4da6afe7aefd2bccbe", size = 212529, upload-time = "2025-09-08T23:22:47.349Z" }, + { url = "https://files.pythonhosted.org/packages/d5/72/12b5f8d3865bf0f87cf1404d8c374e7487dcf097a1c91c436e72e6badd83/cffi-2.0.0-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:b21e08af67b8a103c71a250401c78d5e0893beff75e28c53c98f4de42f774062", size = 220097, upload-time = "2025-09-08T23:22:48.677Z" }, + { url = "https://files.pythonhosted.org/packages/c2/95/7a135d52a50dfa7c882ab0ac17e8dc11cec9d55d2c18dda414c051c5e69e/cffi-2.0.0-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:1e3a615586f05fc4065a8b22b8152f0c1b00cdbc60596d187c2a74f9e3036e4e", size = 207983, upload-time = "2025-09-08T23:22:50.06Z" }, + { url = "https://files.pythonhosted.org/packages/3a/c8/15cb9ada8895957ea171c62dc78ff3e99159ee7adb13c0123c001a2546c1/cffi-2.0.0-cp312-cp312-manylinux2014_s390x.manylinux_2_17_s390x.whl", hash = "sha256:81afed14892743bbe14dacb9e36d9e0e504cd204e0b165062c488942b9718037", size = 206519, upload-time = "2025-09-08T23:22:51.364Z" }, + { url = "https://files.pythonhosted.org/packages/78/2d/7fa73dfa841b5ac06c7b8855cfc18622132e365f5b81d02230333ff26e9e/cffi-2.0.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:3e17ed538242334bf70832644a32a7aae3d83b57567f9fd60a26257e992b79ba", size = 219572, upload-time = "2025-09-08T23:22:52.902Z" }, + { url = "https://files.pythonhosted.org/packages/07/e0/267e57e387b4ca276b90f0434ff88b2c2241ad72b16d31836adddfd6031b/cffi-2.0.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:3925dd22fa2b7699ed2617149842d2e6adde22b262fcbfada50e3d195e4b3a94", size = 222963, upload-time = "2025-09-08T23:22:54.518Z" }, + { url = "https://files.pythonhosted.org/packages/b6/75/1f2747525e06f53efbd878f4d03bac5b859cbc11c633d0fb81432d98a795/cffi-2.0.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:2c8f814d84194c9ea681642fd164267891702542f028a15fc97d4674b6206187", size = 221361, upload-time = "2025-09-08T23:22:55.867Z" }, + { url = "https://files.pythonhosted.org/packages/7b/2b/2b6435f76bfeb6bbf055596976da087377ede68df465419d192acf00c437/cffi-2.0.0-cp312-cp312-win32.whl", hash = "sha256:da902562c3e9c550df360bfa53c035b2f241fed6d9aef119048073680ace4a18", size = 172932, upload-time = "2025-09-08T23:22:57.188Z" }, + { url = "https://files.pythonhosted.org/packages/f8/ed/13bd4418627013bec4ed6e54283b1959cf6db888048c7cf4b4c3b5b36002/cffi-2.0.0-cp312-cp312-win_amd64.whl", hash = "sha256:da68248800ad6320861f129cd9c1bf96ca849a2771a59e0344e88681905916f5", size = 183557, upload-time = "2025-09-08T23:22:58.351Z" }, + { url = "https://files.pythonhosted.org/packages/95/31/9f7f93ad2f8eff1dbc1c3656d7ca5bfd8fb52c9d786b4dcf19b2d02217fa/cffi-2.0.0-cp312-cp312-win_arm64.whl", hash = "sha256:4671d9dd5ec934cb9a73e7ee9676f9362aba54f7f34910956b84d727b0d73fb6", size = 177762, upload-time = "2025-09-08T23:22:59.668Z" }, + { url = "https://files.pythonhosted.org/packages/4b/8d/a0a47a0c9e413a658623d014e91e74a50cdd2c423f7ccfd44086ef767f90/cffi-2.0.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:00bdf7acc5f795150faa6957054fbbca2439db2f775ce831222b66f192f03beb", size = 185230, upload-time = "2025-09-08T23:23:00.879Z" }, + { url = "https://files.pythonhosted.org/packages/4a/d2/a6c0296814556c68ee32009d9c2ad4f85f2707cdecfd7727951ec228005d/cffi-2.0.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:45d5e886156860dc35862657e1494b9bae8dfa63bf56796f2fb56e1679fc0bca", size = 181043, upload-time = "2025-09-08T23:23:02.231Z" }, + { url = "https://files.pythonhosted.org/packages/b0/1e/d22cc63332bd59b06481ceaac49d6c507598642e2230f201649058a7e704/cffi-2.0.0-cp313-cp313-manylinux1_i686.manylinux2014_i686.manylinux_2_17_i686.manylinux_2_5_i686.whl", hash = "sha256:07b271772c100085dd28b74fa0cd81c8fb1a3ba18b21e03d7c27f3436a10606b", size = 212446, upload-time = "2025-09-08T23:23:03.472Z" }, + { url = "https://files.pythonhosted.org/packages/a9/f5/a2c23eb03b61a0b8747f211eb716446c826ad66818ddc7810cc2cc19b3f2/cffi-2.0.0-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:d48a880098c96020b02d5a1f7d9251308510ce8858940e6fa99ece33f610838b", size = 220101, upload-time = "2025-09-08T23:23:04.792Z" }, + { url = "https://files.pythonhosted.org/packages/f2/7f/e6647792fc5850d634695bc0e6ab4111ae88e89981d35ac269956605feba/cffi-2.0.0-cp313-cp313-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:f93fd8e5c8c0a4aa1f424d6173f14a892044054871c771f8566e4008eaa359d2", size = 207948, upload-time = "2025-09-08T23:23:06.127Z" }, + { url = "https://files.pythonhosted.org/packages/cb/1e/a5a1bd6f1fb30f22573f76533de12a00bf274abcdc55c8edab639078abb6/cffi-2.0.0-cp313-cp313-manylinux2014_s390x.manylinux_2_17_s390x.whl", hash = "sha256:dd4f05f54a52fb558f1ba9f528228066954fee3ebe629fc1660d874d040ae5a3", size = 206422, upload-time = "2025-09-08T23:23:07.753Z" }, + { url = "https://files.pythonhosted.org/packages/98/df/0a1755e750013a2081e863e7cd37e0cdd02664372c754e5560099eb7aa44/cffi-2.0.0-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:c8d3b5532fc71b7a77c09192b4a5a200ea992702734a2e9279a37f2478236f26", size = 219499, upload-time = "2025-09-08T23:23:09.648Z" }, + { url = "https://files.pythonhosted.org/packages/50/e1/a969e687fcf9ea58e6e2a928ad5e2dd88cc12f6f0ab477e9971f2309b57c/cffi-2.0.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:d9b29c1f0ae438d5ee9acb31cadee00a58c46cc9c0b2f9038c6b0b3470877a8c", size = 222928, upload-time = "2025-09-08T23:23:10.928Z" }, + { url = "https://files.pythonhosted.org/packages/36/54/0362578dd2c9e557a28ac77698ed67323ed5b9775ca9d3fe73fe191bb5d8/cffi-2.0.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:6d50360be4546678fc1b79ffe7a66265e28667840010348dd69a314145807a1b", size = 221302, upload-time = "2025-09-08T23:23:12.42Z" }, + { url = "https://files.pythonhosted.org/packages/eb/6d/bf9bda840d5f1dfdbf0feca87fbdb64a918a69bca42cfa0ba7b137c48cb8/cffi-2.0.0-cp313-cp313-win32.whl", hash = "sha256:74a03b9698e198d47562765773b4a8309919089150a0bb17d829ad7b44b60d27", size = 172909, upload-time = "2025-09-08T23:23:14.32Z" }, + { url = "https://files.pythonhosted.org/packages/37/18/6519e1ee6f5a1e579e04b9ddb6f1676c17368a7aba48299c3759bbc3c8b3/cffi-2.0.0-cp313-cp313-win_amd64.whl", hash = "sha256:19f705ada2530c1167abacb171925dd886168931e0a7b78f5bffcae5c6b5be75", size = 183402, upload-time = "2025-09-08T23:23:15.535Z" }, + { url = "https://files.pythonhosted.org/packages/cb/0e/02ceeec9a7d6ee63bb596121c2c8e9b3a9e150936f4fbef6ca1943e6137c/cffi-2.0.0-cp313-cp313-win_arm64.whl", hash = "sha256:256f80b80ca3853f90c21b23ee78cd008713787b1b1e93eae9f3d6a7134abd91", size = 177780, upload-time = "2025-09-08T23:23:16.761Z" }, + { url = "https://files.pythonhosted.org/packages/92/c4/3ce07396253a83250ee98564f8d7e9789fab8e58858f35d07a9a2c78de9f/cffi-2.0.0-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:fc33c5141b55ed366cfaad382df24fe7dcbc686de5be719b207bb248e3053dc5", size = 185320, upload-time = "2025-09-08T23:23:18.087Z" }, + { url = "https://files.pythonhosted.org/packages/59/dd/27e9fa567a23931c838c6b02d0764611c62290062a6d4e8ff7863daf9730/cffi-2.0.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:c654de545946e0db659b3400168c9ad31b5d29593291482c43e3564effbcee13", size = 181487, upload-time = "2025-09-08T23:23:19.622Z" }, + { url = "https://files.pythonhosted.org/packages/d6/43/0e822876f87ea8a4ef95442c3d766a06a51fc5298823f884ef87aaad168c/cffi-2.0.0-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:24b6f81f1983e6df8db3adc38562c83f7d4a0c36162885ec7f7b77c7dcbec97b", size = 220049, upload-time = "2025-09-08T23:23:20.853Z" }, + { url = "https://files.pythonhosted.org/packages/b4/89/76799151d9c2d2d1ead63c2429da9ea9d7aac304603de0c6e8764e6e8e70/cffi-2.0.0-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:12873ca6cb9b0f0d3a0da705d6086fe911591737a59f28b7936bdfed27c0d47c", size = 207793, upload-time = "2025-09-08T23:23:22.08Z" }, + { url = "https://files.pythonhosted.org/packages/bb/dd/3465b14bb9e24ee24cb88c9e3730f6de63111fffe513492bf8c808a3547e/cffi-2.0.0-cp314-cp314-manylinux2014_s390x.manylinux_2_17_s390x.whl", hash = "sha256:d9b97165e8aed9272a6bb17c01e3cc5871a594a446ebedc996e2397a1c1ea8ef", size = 206300, upload-time = "2025-09-08T23:23:23.314Z" }, + { url = "https://files.pythonhosted.org/packages/47/d9/d83e293854571c877a92da46fdec39158f8d7e68da75bf73581225d28e90/cffi-2.0.0-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:afb8db5439b81cf9c9d0c80404b60c3cc9c3add93e114dcae767f1477cb53775", size = 219244, upload-time = "2025-09-08T23:23:24.541Z" }, + { url = "https://files.pythonhosted.org/packages/2b/0f/1f177e3683aead2bb00f7679a16451d302c436b5cbf2505f0ea8146ef59e/cffi-2.0.0-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:737fe7d37e1a1bffe70bd5754ea763a62a066dc5913ca57e957824b72a85e205", size = 222828, upload-time = "2025-09-08T23:23:26.143Z" }, + { url = "https://files.pythonhosted.org/packages/c6/0f/cafacebd4b040e3119dcb32fed8bdef8dfe94da653155f9d0b9dc660166e/cffi-2.0.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:38100abb9d1b1435bc4cc340bb4489635dc2f0da7456590877030c9b3d40b0c1", size = 220926, upload-time = "2025-09-08T23:23:27.873Z" }, + { url = "https://files.pythonhosted.org/packages/3e/aa/df335faa45b395396fcbc03de2dfcab242cd61a9900e914fe682a59170b1/cffi-2.0.0-cp314-cp314-win32.whl", hash = "sha256:087067fa8953339c723661eda6b54bc98c5625757ea62e95eb4898ad5e776e9f", size = 175328, upload-time = "2025-09-08T23:23:44.61Z" }, + { url = "https://files.pythonhosted.org/packages/bb/92/882c2d30831744296ce713f0feb4c1cd30f346ef747b530b5318715cc367/cffi-2.0.0-cp314-cp314-win_amd64.whl", hash = "sha256:203a48d1fb583fc7d78a4c6655692963b860a417c0528492a6bc21f1aaefab25", size = 185650, upload-time = "2025-09-08T23:23:45.848Z" }, + { url = "https://files.pythonhosted.org/packages/9f/2c/98ece204b9d35a7366b5b2c6539c350313ca13932143e79dc133ba757104/cffi-2.0.0-cp314-cp314-win_arm64.whl", hash = "sha256:dbd5c7a25a7cb98f5ca55d258b103a2054f859a46ae11aaf23134f9cc0d356ad", size = 180687, upload-time = "2025-09-08T23:23:47.105Z" }, + { url = "https://files.pythonhosted.org/packages/3e/61/c768e4d548bfa607abcda77423448df8c471f25dbe64fb2ef6d555eae006/cffi-2.0.0-cp314-cp314t-macosx_10_13_x86_64.whl", hash = "sha256:9a67fc9e8eb39039280526379fb3a70023d77caec1852002b4da7e8b270c4dd9", size = 188773, upload-time = "2025-09-08T23:23:29.347Z" }, + { url = "https://files.pythonhosted.org/packages/2c/ea/5f76bce7cf6fcd0ab1a1058b5af899bfbef198bea4d5686da88471ea0336/cffi-2.0.0-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:7a66c7204d8869299919db4d5069a82f1561581af12b11b3c9f48c584eb8743d", size = 185013, upload-time = "2025-09-08T23:23:30.63Z" }, + { url = "https://files.pythonhosted.org/packages/be/b4/c56878d0d1755cf9caa54ba71e5d049479c52f9e4afc230f06822162ab2f/cffi-2.0.0-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:7cc09976e8b56f8cebd752f7113ad07752461f48a58cbba644139015ac24954c", size = 221593, upload-time = "2025-09-08T23:23:31.91Z" }, + { url = "https://files.pythonhosted.org/packages/e0/0d/eb704606dfe8033e7128df5e90fee946bbcb64a04fcdaa97321309004000/cffi-2.0.0-cp314-cp314t-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:92b68146a71df78564e4ef48af17551a5ddd142e5190cdf2c5624d0c3ff5b2e8", size = 209354, upload-time = "2025-09-08T23:23:33.214Z" }, + { url = "https://files.pythonhosted.org/packages/d8/19/3c435d727b368ca475fb8742ab97c9cb13a0de600ce86f62eab7fa3eea60/cffi-2.0.0-cp314-cp314t-manylinux2014_s390x.manylinux_2_17_s390x.whl", hash = "sha256:b1e74d11748e7e98e2f426ab176d4ed720a64412b6a15054378afdb71e0f37dc", size = 208480, upload-time = "2025-09-08T23:23:34.495Z" }, + { url = "https://files.pythonhosted.org/packages/d0/44/681604464ed9541673e486521497406fadcc15b5217c3e326b061696899a/cffi-2.0.0-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:28a3a209b96630bca57cce802da70c266eb08c6e97e5afd61a75611ee6c64592", size = 221584, upload-time = "2025-09-08T23:23:36.096Z" }, + { url = "https://files.pythonhosted.org/packages/25/8e/342a504ff018a2825d395d44d63a767dd8ebc927ebda557fecdaca3ac33a/cffi-2.0.0-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:7553fb2090d71822f02c629afe6042c299edf91ba1bf94951165613553984512", size = 224443, upload-time = "2025-09-08T23:23:37.328Z" }, + { url = "https://files.pythonhosted.org/packages/e1/5e/b666bacbbc60fbf415ba9988324a132c9a7a0448a9a8f125074671c0f2c3/cffi-2.0.0-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:6c6c373cfc5c83a975506110d17457138c8c63016b563cc9ed6e056a82f13ce4", size = 223437, upload-time = "2025-09-08T23:23:38.945Z" }, + { url = "https://files.pythonhosted.org/packages/a0/1d/ec1a60bd1a10daa292d3cd6bb0b359a81607154fb8165f3ec95fe003b85c/cffi-2.0.0-cp314-cp314t-win32.whl", hash = "sha256:1fc9ea04857caf665289b7a75923f2c6ed559b8298a1b8c49e59f7dd95c8481e", size = 180487, upload-time = "2025-09-08T23:23:40.423Z" }, + { url = "https://files.pythonhosted.org/packages/bf/41/4c1168c74fac325c0c8156f04b6749c8b6a8f405bbf91413ba088359f60d/cffi-2.0.0-cp314-cp314t-win_amd64.whl", hash = "sha256:d68b6cef7827e8641e8ef16f4494edda8b36104d79773a334beaa1e3521430f6", size = 191726, upload-time = "2025-09-08T23:23:41.742Z" }, + { url = "https://files.pythonhosted.org/packages/ae/3a/dbeec9d1ee0844c679f6bb5d6ad4e9f198b1224f4e7a32825f47f6192b0c/cffi-2.0.0-cp314-cp314t-win_arm64.whl", hash = "sha256:0a1527a803f0a659de1af2e1fd700213caba79377e27e4693648c2923da066f9", size = 184195, upload-time = "2025-09-08T23:23:43.004Z" }, +] + +[[package]] +name = "charset-normalizer" +version = "3.4.7" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/e7/a1/67fe25fac3c7642725500a3f6cfe5821ad557c3abb11c9d20d12c7008d3e/charset_normalizer-3.4.7.tar.gz", hash = "sha256:ae89db9e5f98a11a4bf50407d4363e7b09b31e55bc117b4f7d80aab97ba009e5", size = 144271, upload-time = "2026-04-02T09:28:39.342Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/c2/d7/b5b7020a0565c2e9fa8c09f4b5fa6232feb326b8c20081ccded47ea368fd/charset_normalizer-3.4.7-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:7641bb8895e77f921102f72833904dcd9901df5d6d72a2ab8f31d04b7e51e4e7", size = 309705, upload-time = "2026-04-02T09:26:02.191Z" }, + { url = "https://files.pythonhosted.org/packages/5a/53/58c29116c340e5456724ecd2fff4196d236b98f3da97b404bc5e51ac3493/charset_normalizer-3.4.7-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:202389074300232baeb53ae2569a60901f7efadd4245cf3a3bf0617d60b439d7", size = 206419, upload-time = "2026-04-02T09:26:03.583Z" }, + { url = "https://files.pythonhosted.org/packages/b2/02/e8146dc6591a37a00e5144c63f29fb7c97a734ea8a111190783c0e60ab63/charset_normalizer-3.4.7-cp311-cp311-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:30b8d1d8c52a48c2c5690e152c169b673487a2a58de1ec7393196753063fcd5e", size = 227901, upload-time = "2026-04-02T09:26:04.738Z" }, + { url = "https://files.pythonhosted.org/packages/fb/73/77486c4cd58f1267bf17db420e930c9afa1b3be3fe8c8b8ebbebc9624359/charset_normalizer-3.4.7-cp311-cp311-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:532bc9bf33a68613fd7d65e4b1c71a6a38d7d42604ecf239c77392e9b4e8998c", size = 222742, upload-time = "2026-04-02T09:26:06.36Z" }, + { url = "https://files.pythonhosted.org/packages/a1/fa/f74eb381a7d94ded44739e9d94de18dc5edc9c17fb8c11f0a6890696c0a9/charset_normalizer-3.4.7-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:2fe249cb4651fd12605b7288b24751d8bfd46d35f12a20b1ba33dea122e690df", size = 214061, upload-time = "2026-04-02T09:26:08.347Z" }, + { url = "https://files.pythonhosted.org/packages/dc/92/42bd3cefcf7687253fb86694b45f37b733c97f59af3724f356fa92b8c344/charset_normalizer-3.4.7-cp311-cp311-manylinux_2_31_armv7l.whl", hash = "sha256:65bcd23054beab4d166035cabbc868a09c1a49d1efe458fe8e4361215df40265", size = 199239, upload-time = "2026-04-02T09:26:09.823Z" }, + { url = "https://files.pythonhosted.org/packages/4c/3d/069e7184e2aa3b3cddc700e3dd267413dc259854adc3380421c805c6a17d/charset_normalizer-3.4.7-cp311-cp311-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:08e721811161356f97b4059a9ba7bafb23ea5ee2255402c42881c214e173c6b4", size = 210173, upload-time = "2026-04-02T09:26:10.953Z" }, + { url = "https://files.pythonhosted.org/packages/62/51/9d56feb5f2e7074c46f93e0ebdbe61f0848ee246e2f0d89f8e20b89ebb8f/charset_normalizer-3.4.7-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:e060d01aec0a910bdccb8be71faf34e7799ce36950f8294c8bf612cba65a2c9e", size = 209841, upload-time = "2026-04-02T09:26:12.142Z" }, + { url = "https://files.pythonhosted.org/packages/d2/59/893d8f99cc4c837dda1fe2f1139079703deb9f321aabcb032355de13b6c7/charset_normalizer-3.4.7-cp311-cp311-musllinux_1_2_armv7l.whl", hash = "sha256:38c0109396c4cfc574d502df99742a45c72c08eff0a36158b6f04000043dbf38", size = 200304, upload-time = "2026-04-02T09:26:13.711Z" }, + { url = "https://files.pythonhosted.org/packages/7d/1d/ee6f3be3464247578d1ed5c46de545ccc3d3ff933695395c402c21fa6b77/charset_normalizer-3.4.7-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:1c2a768fdd44ee4a9339a9b0b130049139b8ce3c01d2ce09f67f5a68048d477c", size = 229455, upload-time = "2026-04-02T09:26:14.941Z" }, + { url = "https://files.pythonhosted.org/packages/54/bb/8fb0a946296ea96a488928bdce8ef99023998c48e4713af533e9bb98ef07/charset_normalizer-3.4.7-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:1a87ca9d5df6fe460483d9a5bbf2b18f620cbed41b432e2bddb686228282d10b", size = 210036, upload-time = "2026-04-02T09:26:16.478Z" }, + { url = "https://files.pythonhosted.org/packages/9a/bc/015b2387f913749f82afd4fcba07846d05b6d784dd16123cb66860e0237d/charset_normalizer-3.4.7-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:d635aab80466bc95771bb78d5370e74d36d1fe31467b6b29b8b57b2a3cd7d22c", size = 224739, upload-time = "2026-04-02T09:26:17.751Z" }, + { url = "https://files.pythonhosted.org/packages/17/ab/63133691f56baae417493cba6b7c641571a2130eb7bceba6773367ab9ec5/charset_normalizer-3.4.7-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:ae196f021b5e7c78e918242d217db021ed2a6ace2bc6ae94c0fc596221c7f58d", size = 216277, upload-time = "2026-04-02T09:26:18.981Z" }, + { url = "https://files.pythonhosted.org/packages/06/6d/3be70e827977f20db77c12a97e6a9f973631a45b8d186c084527e53e77a4/charset_normalizer-3.4.7-cp311-cp311-win32.whl", hash = "sha256:adb2597b428735679446b46c8badf467b4ca5f5056aae4d51a19f9570301b1ad", size = 147819, upload-time = "2026-04-02T09:26:20.295Z" }, + { url = "https://files.pythonhosted.org/packages/20/d9/5f67790f06b735d7c7637171bbfd89882ad67201891b7275e51116ed8207/charset_normalizer-3.4.7-cp311-cp311-win_amd64.whl", hash = "sha256:8e385e4267ab76874ae30db04c627faaaf0b509e1ccc11a95b3fc3e83f855c00", size = 159281, upload-time = "2026-04-02T09:26:21.74Z" }, + { url = "https://files.pythonhosted.org/packages/ca/83/6413f36c5a34afead88ce6f66684d943d91f233d76dd083798f9602b75ae/charset_normalizer-3.4.7-cp311-cp311-win_arm64.whl", hash = "sha256:d4a48e5b3c2a489fae013b7589308a40146ee081f6f509e047e0e096084ceca1", size = 147843, upload-time = "2026-04-02T09:26:22.901Z" }, + { url = "https://files.pythonhosted.org/packages/0c/eb/4fc8d0a7110eb5fc9cc161723a34a8a6c200ce3b4fbf681bc86feee22308/charset_normalizer-3.4.7-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:eca9705049ad3c7345d574e3510665cb2cf844c2f2dcfe675332677f081cbd46", size = 311328, upload-time = "2026-04-02T09:26:24.331Z" }, + { url = "https://files.pythonhosted.org/packages/f8/e3/0fadc706008ac9d7b9b5be6dc767c05f9d3e5df51744ce4cc9605de7b9f4/charset_normalizer-3.4.7-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:6178f72c5508bfc5fd446a5905e698c6212932f25bcdd4b47a757a50605a90e2", size = 208061, upload-time = "2026-04-02T09:26:25.568Z" }, + { url = "https://files.pythonhosted.org/packages/42/f0/3dd1045c47f4a4604df85ec18ad093912ae1344ac706993aff91d38773a2/charset_normalizer-3.4.7-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:e1421b502d83040e6d7fb2fb18dff63957f720da3d77b2fbd3187ceb63755d7b", size = 229031, upload-time = "2026-04-02T09:26:26.865Z" }, + { url = "https://files.pythonhosted.org/packages/dc/67/675a46eb016118a2fbde5a277a5d15f4f69d5f3f5f338e5ee2f8948fcf43/charset_normalizer-3.4.7-cp312-cp312-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:edac0f1ab77644605be2cbba52e6b7f630731fc42b34cb0f634be1a6eface56a", size = 225239, upload-time = "2026-04-02T09:26:28.044Z" }, + { url = "https://files.pythonhosted.org/packages/4b/f8/d0118a2f5f23b02cd166fa385c60f9b0d4f9194f574e2b31cef350ad7223/charset_normalizer-3.4.7-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:5649fd1c7bade02f320a462fdefd0b4bd3ce036065836d4f42e0de958038e116", size = 216589, upload-time = "2026-04-02T09:26:29.239Z" }, + { url = "https://files.pythonhosted.org/packages/b1/f1/6d2b0b261b6c4ceef0fcb0d17a01cc5bc53586c2d4796fa04b5c540bc13d/charset_normalizer-3.4.7-cp312-cp312-manylinux_2_31_armv7l.whl", hash = "sha256:203104ed3e428044fd943bc4bf45fa73c0730391f9621e37fe39ecf477b128cb", size = 202733, upload-time = "2026-04-02T09:26:30.5Z" }, + { url = "https://files.pythonhosted.org/packages/6f/c0/7b1f943f7e87cc3db9626ba17807d042c38645f0a1d4415c7a14afb5591f/charset_normalizer-3.4.7-cp312-cp312-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:298930cec56029e05497a76988377cbd7457ba864beeea92ad7e844fe74cd1f1", size = 212652, upload-time = "2026-04-02T09:26:31.709Z" }, + { url = "https://files.pythonhosted.org/packages/38/dd/5a9ab159fe45c6e72079398f277b7d2b523e7f716acc489726115a910097/charset_normalizer-3.4.7-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:708838739abf24b2ceb208d0e22403dd018faeef86ddac04319a62ae884c4f15", size = 211229, upload-time = "2026-04-02T09:26:33.282Z" }, + { url = "https://files.pythonhosted.org/packages/d5/ff/531a1cad5ca855d1c1a8b69cb71abfd6d85c0291580146fda7c82857caa1/charset_normalizer-3.4.7-cp312-cp312-musllinux_1_2_armv7l.whl", hash = "sha256:0f7eb884681e3938906ed0434f20c63046eacd0111c4ba96f27b76084cd679f5", size = 203552, upload-time = "2026-04-02T09:26:34.845Z" }, + { url = "https://files.pythonhosted.org/packages/c1/4c/a5fb52d528a8ca41f7598cb619409ece30a169fbdf9cdce592e53b46c3a6/charset_normalizer-3.4.7-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:4dc1e73c36828f982bfe79fadf5919923f8a6f4df2860804db9a98c48824ce8d", size = 230806, upload-time = "2026-04-02T09:26:36.152Z" }, + { url = "https://files.pythonhosted.org/packages/59/7a/071feed8124111a32b316b33ae4de83d36923039ef8cf48120266844285b/charset_normalizer-3.4.7-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:aed52fea0513bac0ccde438c188c8a471c4e0f457c2dd20cdbf6ea7a450046c7", size = 212316, upload-time = "2026-04-02T09:26:37.672Z" }, + { url = "https://files.pythonhosted.org/packages/fd/35/f7dba3994312d7ba508e041eaac39a36b120f32d4c8662b8814dab876431/charset_normalizer-3.4.7-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:fea24543955a6a729c45a73fe90e08c743f0b3334bbf3201e6c4bc1b0c7fa464", size = 227274, upload-time = "2026-04-02T09:26:38.93Z" }, + { url = "https://files.pythonhosted.org/packages/8a/2d/a572df5c9204ab7688ec1edc895a73ebded3b023bb07364710b05dd1c9be/charset_normalizer-3.4.7-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:bb6d88045545b26da47aa879dd4a89a71d1dce0f0e549b1abcb31dfe4a8eac49", size = 218468, upload-time = "2026-04-02T09:26:40.17Z" }, + { url = "https://files.pythonhosted.org/packages/86/eb/890922a8b03a568ca2f336c36585a4713c55d4d67bf0f0c78924be6315ca/charset_normalizer-3.4.7-cp312-cp312-win32.whl", hash = "sha256:2257141f39fe65a3fdf38aeccae4b953e5f3b3324f4ff0daf9f15b8518666a2c", size = 148460, upload-time = "2026-04-02T09:26:41.416Z" }, + { url = "https://files.pythonhosted.org/packages/35/d9/0e7dffa06c5ab081f75b1b786f0aefc88365825dfcd0ac544bdb7b2b6853/charset_normalizer-3.4.7-cp312-cp312-win_amd64.whl", hash = "sha256:5ed6ab538499c8644b8a3e18debabcd7ce684f3fa91cf867521a7a0279cab2d6", size = 159330, upload-time = "2026-04-02T09:26:42.554Z" }, + { url = "https://files.pythonhosted.org/packages/9e/5d/481bcc2a7c88ea6b0878c299547843b2521ccbc40980cb406267088bc701/charset_normalizer-3.4.7-cp312-cp312-win_arm64.whl", hash = "sha256:56be790f86bfb2c98fb742ce566dfb4816e5a83384616ab59c49e0604d49c51d", size = 147828, upload-time = "2026-04-02T09:26:44.075Z" }, + { url = "https://files.pythonhosted.org/packages/c1/3b/66777e39d3ae1ddc77ee606be4ec6d8cbd4c801f65e5a1b6f2b11b8346dd/charset_normalizer-3.4.7-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:f496c9c3cc02230093d8330875c4c3cdfc3b73612a5fd921c65d39cbcef08063", size = 309627, upload-time = "2026-04-02T09:26:45.198Z" }, + { url = "https://files.pythonhosted.org/packages/2e/4e/b7f84e617b4854ade48a1b7915c8ccfadeba444d2a18c291f696e37f0d3b/charset_normalizer-3.4.7-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:0ea948db76d31190bf08bd371623927ee1339d5f2a0b4b1b4a4439a65298703c", size = 207008, upload-time = "2026-04-02T09:26:46.824Z" }, + { url = "https://files.pythonhosted.org/packages/c4/bb/ec73c0257c9e11b268f018f068f5d00aa0ef8c8b09f7753ebd5f2880e248/charset_normalizer-3.4.7-cp313-cp313-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:a277ab8928b9f299723bc1a2dabb1265911b1a76341f90a510368ca44ad9ab66", size = 228303, upload-time = "2026-04-02T09:26:48.397Z" }, + { url = "https://files.pythonhosted.org/packages/85/fb/32d1f5033484494619f701e719429c69b766bfc4dbc61aa9e9c8c166528b/charset_normalizer-3.4.7-cp313-cp313-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:3bec022aec2c514d9cf199522a802bd007cd588ab17ab2525f20f9c34d067c18", size = 224282, upload-time = "2026-04-02T09:26:49.684Z" }, + { url = "https://files.pythonhosted.org/packages/fa/07/330e3a0dda4c404d6da83b327270906e9654a24f6c546dc886a0eb0ffb23/charset_normalizer-3.4.7-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:e044c39e41b92c845bc815e5ae4230804e8e7bc29e399b0437d64222d92809dd", size = 215595, upload-time = "2026-04-02T09:26:50.915Z" }, + { url = "https://files.pythonhosted.org/packages/e3/7c/fc890655786e423f02556e0216d4b8c6bcb6bdfa890160dc66bf52dee468/charset_normalizer-3.4.7-cp313-cp313-manylinux_2_31_armv7l.whl", hash = "sha256:f495a1652cf3fbab2eb0639776dad966c2fb874d79d87ca07f9d5f059b8bd215", size = 201986, upload-time = "2026-04-02T09:26:52.197Z" }, + { url = "https://files.pythonhosted.org/packages/d8/97/bfb18b3db2aed3b90cf54dc292ad79fdd5ad65c4eae454099475cbeadd0d/charset_normalizer-3.4.7-cp313-cp313-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:e712b419df8ba5e42b226c510472b37bd57b38e897d3eca5e8cfd410a29fa859", size = 211711, upload-time = "2026-04-02T09:26:53.49Z" }, + { url = "https://files.pythonhosted.org/packages/6f/a5/a581c13798546a7fd557c82614a5c65a13df2157e9ad6373166d2a3e645d/charset_normalizer-3.4.7-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:7804338df6fcc08105c7745f1502ba68d900f45fd770d5bdd5288ddccb8a42d8", size = 210036, upload-time = "2026-04-02T09:26:54.975Z" }, + { url = "https://files.pythonhosted.org/packages/8c/bf/b3ab5bcb478e4193d517644b0fb2bf5497fbceeaa7a1bc0f4d5b50953861/charset_normalizer-3.4.7-cp313-cp313-musllinux_1_2_armv7l.whl", hash = "sha256:481551899c856c704d58119b5025793fa6730adda3571971af568f66d2424bb5", size = 202998, upload-time = "2026-04-02T09:26:56.303Z" }, + { url = "https://files.pythonhosted.org/packages/e7/4e/23efd79b65d314fa320ec6017b4b5834d5c12a58ba4610aa353af2e2f577/charset_normalizer-3.4.7-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:f59099f9b66f0d7145115e6f80dd8b1d847176df89b234a5a6b3f00437aa0832", size = 230056, upload-time = "2026-04-02T09:26:57.554Z" }, + { url = "https://files.pythonhosted.org/packages/b9/9f/1e1941bc3f0e01df116e68dc37a55c4d249df5e6fa77f008841aef68264f/charset_normalizer-3.4.7-cp313-cp313-musllinux_1_2_riscv64.whl", hash = "sha256:f59ad4c0e8f6bba240a9bb85504faa1ab438237199d4cce5f622761507b8f6a6", size = 211537, upload-time = "2026-04-02T09:26:58.843Z" }, + { url = "https://files.pythonhosted.org/packages/80/0f/088cbb3020d44428964a6c97fe1edfb1b9550396bf6d278330281e8b709c/charset_normalizer-3.4.7-cp313-cp313-musllinux_1_2_s390x.whl", hash = "sha256:3dedcc22d73ec993f42055eff4fcfed9318d1eeb9a6606c55892a26964964e48", size = 226176, upload-time = "2026-04-02T09:27:00.437Z" }, + { url = "https://files.pythonhosted.org/packages/6a/9f/130394f9bbe06f4f63e22641d32fc9b202b7e251c9aef4db044324dac493/charset_normalizer-3.4.7-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:64f02c6841d7d83f832cd97ccf8eb8a906d06eb95d5276069175c696b024b60a", size = 217723, upload-time = "2026-04-02T09:27:02.021Z" }, + { url = "https://files.pythonhosted.org/packages/73/55/c469897448a06e49f8fa03f6caae97074fde823f432a98f979cc42b90e69/charset_normalizer-3.4.7-cp313-cp313-win32.whl", hash = "sha256:4042d5c8f957e15221d423ba781e85d553722fc4113f523f2feb7b188cc34c5e", size = 148085, upload-time = "2026-04-02T09:27:03.192Z" }, + { url = "https://files.pythonhosted.org/packages/5d/78/1b74c5bbb3f99b77a1715c91b3e0b5bdb6fe302d95ace4f5b1bec37b0167/charset_normalizer-3.4.7-cp313-cp313-win_amd64.whl", hash = "sha256:3946fa46a0cf3e4c8cb1cc52f56bb536310d34f25f01ca9b6c16afa767dab110", size = 158819, upload-time = "2026-04-02T09:27:04.454Z" }, + { url = "https://files.pythonhosted.org/packages/68/86/46bd42279d323deb8687c4a5a811fd548cb7d1de10cf6535d099877a9a9f/charset_normalizer-3.4.7-cp313-cp313-win_arm64.whl", hash = "sha256:80d04837f55fc81da168b98de4f4b797ef007fc8a79ab71c6ec9bc4dd662b15b", size = 147915, upload-time = "2026-04-02T09:27:05.971Z" }, + { url = "https://files.pythonhosted.org/packages/97/c8/c67cb8c70e19ef1960b97b22ed2a1567711de46c4ddf19799923adc836c2/charset_normalizer-3.4.7-cp314-cp314-macosx_10_15_universal2.whl", hash = "sha256:c36c333c39be2dbca264d7803333c896ab8fa7d4d6f0ab7edb7dfd7aea6e98c0", size = 309234, upload-time = "2026-04-02T09:27:07.194Z" }, + { url = "https://files.pythonhosted.org/packages/99/85/c091fdee33f20de70d6c8b522743b6f831a2f1cd3ff86de4c6a827c48a76/charset_normalizer-3.4.7-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:1c2aed2e5e41f24ea8ef1590b8e848a79b56f3a5564a65ceec43c9d692dc7d8a", size = 208042, upload-time = "2026-04-02T09:27:08.749Z" }, + { url = "https://files.pythonhosted.org/packages/87/1c/ab2ce611b984d2fd5d86a5a8a19c1ae26acac6bad967da4967562c75114d/charset_normalizer-3.4.7-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:54523e136b8948060c0fa0bc7b1b50c32c186f2fceee897a495406bb6e311d2b", size = 228706, upload-time = "2026-04-02T09:27:09.951Z" }, + { url = "https://files.pythonhosted.org/packages/a8/29/2b1d2cb00bf085f59d29eb773ce58ec2d325430f8c216804a0a5cd83cbca/charset_normalizer-3.4.7-cp314-cp314-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:715479b9a2802ecac752a3b0efa2b0b60285cf962ee38414211abdfccc233b41", size = 224727, upload-time = "2026-04-02T09:27:11.175Z" }, + { url = "https://files.pythonhosted.org/packages/47/5c/032c2d5a07fe4d4855fea851209cca2b6f03ebeb6d4e3afdb3358386a684/charset_normalizer-3.4.7-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:bd6c2a1c7573c64738d716488d2cdd3c00e340e4835707d8fdb8dc1a66ef164e", size = 215882, upload-time = "2026-04-02T09:27:12.446Z" }, + { url = "https://files.pythonhosted.org/packages/2c/c2/356065d5a8b78ed04499cae5f339f091946a6a74f91e03476c33f0ab7100/charset_normalizer-3.4.7-cp314-cp314-manylinux_2_31_armv7l.whl", hash = "sha256:c45e9440fb78f8ddabcf714b68f936737a121355bf59f3907f4e17721b9d1aae", size = 200860, upload-time = "2026-04-02T09:27:13.721Z" }, + { url = "https://files.pythonhosted.org/packages/0c/cd/a32a84217ced5039f53b29f460962abb2d4420def55afabe45b1c3c7483d/charset_normalizer-3.4.7-cp314-cp314-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:3534e7dcbdcf757da6b85a0bbf5b6868786d5982dd959b065e65481644817a18", size = 211564, upload-time = "2026-04-02T09:27:15.272Z" }, + { url = "https://files.pythonhosted.org/packages/44/86/58e6f13ce26cc3b8f4a36b94a0f22ae2f00a72534520f4ae6857c4b81f89/charset_normalizer-3.4.7-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:e8ac484bf18ce6975760921bb6148041faa8fef0547200386ea0b52b5d27bf7b", size = 211276, upload-time = "2026-04-02T09:27:16.834Z" }, + { url = "https://files.pythonhosted.org/packages/8f/fe/d17c32dc72e17e155e06883efa84514ca375f8a528ba2546bee73fc4df81/charset_normalizer-3.4.7-cp314-cp314-musllinux_1_2_armv7l.whl", hash = "sha256:a5fe03b42827c13cdccd08e6c0247b6a6d4b5e3cdc53fd1749f5896adcdc2356", size = 201238, upload-time = "2026-04-02T09:27:18.229Z" }, + { url = "https://files.pythonhosted.org/packages/6a/29/f33daa50b06525a237451cdb6c69da366c381a3dadcd833fa5676bc468b3/charset_normalizer-3.4.7-cp314-cp314-musllinux_1_2_ppc64le.whl", hash = "sha256:2d6eb928e13016cea4f1f21d1e10c1cebd5a421bc57ddf5b1142ae3f86824fab", size = 230189, upload-time = "2026-04-02T09:27:19.445Z" }, + { url = "https://files.pythonhosted.org/packages/b6/6e/52c84015394a6a0bdcd435210a7e944c5f94ea1055f5cc5d56c5fe368e7b/charset_normalizer-3.4.7-cp314-cp314-musllinux_1_2_riscv64.whl", hash = "sha256:e74327fb75de8986940def6e8dee4f127cc9752bee7355bb323cc5b2659b6d46", size = 211352, upload-time = "2026-04-02T09:27:20.79Z" }, + { url = "https://files.pythonhosted.org/packages/8c/d7/4353be581b373033fb9198bf1da3cf8f09c1082561e8e922aa7b39bf9fe8/charset_normalizer-3.4.7-cp314-cp314-musllinux_1_2_s390x.whl", hash = "sha256:d6038d37043bced98a66e68d3aa2b6a35505dc01328cd65217cefe82f25def44", size = 227024, upload-time = "2026-04-02T09:27:22.063Z" }, + { url = "https://files.pythonhosted.org/packages/30/45/99d18aa925bd1740098ccd3060e238e21115fffbfdcb8f3ece837d0ace6c/charset_normalizer-3.4.7-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:7579e913a5339fb8fa133f6bbcfd8e6749696206cf05acdbdca71a1b436d8e72", size = 217869, upload-time = "2026-04-02T09:27:23.486Z" }, + { url = "https://files.pythonhosted.org/packages/5c/05/5ee478aa53f4bb7996482153d4bfe1b89e0f087f0ab6b294fcf92d595873/charset_normalizer-3.4.7-cp314-cp314-win32.whl", hash = "sha256:5b77459df20e08151cd6f8b9ef8ef1f961ef73d85c21a555c7eed5b79410ec10", size = 148541, upload-time = "2026-04-02T09:27:25.146Z" }, + { url = "https://files.pythonhosted.org/packages/48/77/72dcb0921b2ce86420b2d79d454c7022bf5be40202a2a07906b9f2a35c97/charset_normalizer-3.4.7-cp314-cp314-win_amd64.whl", hash = "sha256:92a0a01ead5e668468e952e4238cccd7c537364eb7d851ab144ab6627dbbe12f", size = 159634, upload-time = "2026-04-02T09:27:26.642Z" }, + { url = "https://files.pythonhosted.org/packages/c6/a3/c2369911cd72f02386e4e340770f6e158c7980267da16af8f668217abaa0/charset_normalizer-3.4.7-cp314-cp314-win_arm64.whl", hash = "sha256:67f6279d125ca0046a7fd386d01b311c6363844deac3e5b069b514ba3e63c246", size = 148384, upload-time = "2026-04-02T09:27:28.271Z" }, + { url = "https://files.pythonhosted.org/packages/94/09/7e8a7f73d24dba1f0035fbbf014d2c36828fc1bf9c88f84093e57d315935/charset_normalizer-3.4.7-cp314-cp314t-macosx_10_15_universal2.whl", hash = "sha256:effc3f449787117233702311a1b7d8f59cba9ced946ba727bdc329ec69028e24", size = 330133, upload-time = "2026-04-02T09:27:29.474Z" }, + { url = "https://files.pythonhosted.org/packages/8d/da/96975ddb11f8e977f706f45cddd8540fd8242f71ecdb5d18a80723dcf62c/charset_normalizer-3.4.7-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:fbccdc05410c9ee21bbf16a35f4c1d16123dcdeb8a1d38f33654fa21d0234f79", size = 216257, upload-time = "2026-04-02T09:27:30.793Z" }, + { url = "https://files.pythonhosted.org/packages/e5/e8/1d63bf8ef2d388e95c64b2098f45f84758f6d102a087552da1485912637b/charset_normalizer-3.4.7-cp314-cp314t-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:733784b6d6def852c814bce5f318d25da2ee65dd4839a0718641c696e09a2960", size = 234851, upload-time = "2026-04-02T09:27:32.44Z" }, + { url = "https://files.pythonhosted.org/packages/9b/40/e5ff04233e70da2681fa43969ad6f66ca5611d7e669be0246c4c7aaf6dc8/charset_normalizer-3.4.7-cp314-cp314t-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:a89c23ef8d2c6b27fd200a42aa4ac72786e7c60d40efdc76e6011260b6e949c4", size = 233393, upload-time = "2026-04-02T09:27:34.03Z" }, + { url = "https://files.pythonhosted.org/packages/be/c1/06c6c49d5a5450f76899992f1ee40b41d076aee9279b49cf9974d2f313d5/charset_normalizer-3.4.7-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:6c114670c45346afedc0d947faf3c7f701051d2518b943679c8ff88befe14f8e", size = 223251, upload-time = "2026-04-02T09:27:35.369Z" }, + { url = "https://files.pythonhosted.org/packages/2b/9f/f2ff16fb050946169e3e1f82134d107e5d4ae72647ec8a1b1446c148480f/charset_normalizer-3.4.7-cp314-cp314t-manylinux_2_31_armv7l.whl", hash = "sha256:a180c5e59792af262bf263b21a3c49353f25945d8d9f70628e73de370d55e1e1", size = 206609, upload-time = "2026-04-02T09:27:36.661Z" }, + { url = "https://files.pythonhosted.org/packages/69/d5/a527c0cd8d64d2eab7459784fb4169a0ac76e5a6fc5237337982fd61347e/charset_normalizer-3.4.7-cp314-cp314t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:3c9a494bc5ec77d43cea229c4f6db1e4d8fe7e1bbffa8b6f0f0032430ff8ab44", size = 220014, upload-time = "2026-04-02T09:27:38.019Z" }, + { url = "https://files.pythonhosted.org/packages/7e/80/8a7b8104a3e203074dc9aa2c613d4b726c0e136bad1cc734594b02867972/charset_normalizer-3.4.7-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:8d828b6667a32a728a1ad1d93957cdf37489c57b97ae6c4de2860fa749b8fc1e", size = 218979, upload-time = "2026-04-02T09:27:39.37Z" }, + { url = "https://files.pythonhosted.org/packages/02/9a/b759b503d507f375b2b5c153e4d2ee0a75aa215b7f2489cf314f4541f2c0/charset_normalizer-3.4.7-cp314-cp314t-musllinux_1_2_armv7l.whl", hash = "sha256:cf1493cd8607bec4d8a7b9b004e699fcf8f9103a9284cc94962cb73d20f9d4a3", size = 209238, upload-time = "2026-04-02T09:27:40.722Z" }, + { url = "https://files.pythonhosted.org/packages/c2/4e/0f3f5d47b86bdb79256e7290b26ac847a2832d9a4033f7eb2cd4bcf4bb5b/charset_normalizer-3.4.7-cp314-cp314t-musllinux_1_2_ppc64le.whl", hash = "sha256:0c96c3b819b5c3e9e165495db84d41914d6894d55181d2d108cc1a69bfc9cce0", size = 236110, upload-time = "2026-04-02T09:27:42.33Z" }, + { url = "https://files.pythonhosted.org/packages/96/23/bce28734eb3ed2c91dcf93abeb8a5cf393a7b2749725030bb630e554fdd8/charset_normalizer-3.4.7-cp314-cp314t-musllinux_1_2_riscv64.whl", hash = "sha256:752a45dc4a6934060b3b0dab47e04edc3326575f82be64bc4fc293914566503e", size = 219824, upload-time = "2026-04-02T09:27:43.924Z" }, + { url = "https://files.pythonhosted.org/packages/2c/6f/6e897c6984cc4d41af319b077f2f600fc8214eb2fe2d6bcb79141b882400/charset_normalizer-3.4.7-cp314-cp314t-musllinux_1_2_s390x.whl", hash = "sha256:8778f0c7a52e56f75d12dae53ae320fae900a8b9b4164b981b9c5ce059cd1fcb", size = 233103, upload-time = "2026-04-02T09:27:45.348Z" }, + { url = "https://files.pythonhosted.org/packages/76/22/ef7bd0fe480a0ae9b656189ec00744b60933f68b4f42a7bb06589f6f576a/charset_normalizer-3.4.7-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:ce3412fbe1e31eb81ea42f4169ed94861c56e643189e1e75f0041f3fe7020abe", size = 225194, upload-time = "2026-04-02T09:27:46.706Z" }, + { url = "https://files.pythonhosted.org/packages/c5/a7/0e0ab3e0b5bc1219bd80a6a0d4d72ca74d9250cb2382b7c699c147e06017/charset_normalizer-3.4.7-cp314-cp314t-win32.whl", hash = "sha256:c03a41a8784091e67a39648f70c5f97b5b6a37f216896d44d2cdcb82615339a0", size = 159827, upload-time = "2026-04-02T09:27:48.053Z" }, + { url = "https://files.pythonhosted.org/packages/7a/1d/29d32e0fb40864b1f878c7f5a0b343ae676c6e2b271a2d55cc3a152391da/charset_normalizer-3.4.7-cp314-cp314t-win_amd64.whl", hash = "sha256:03853ed82eeebbce3c2abfdbc98c96dc205f32a79627688ac9a27370ea61a49c", size = 174168, upload-time = "2026-04-02T09:27:49.795Z" }, + { url = "https://files.pythonhosted.org/packages/de/32/d92444ad05c7a6e41fb2036749777c163baf7a0301a040cb672d6b2b1ae9/charset_normalizer-3.4.7-cp314-cp314t-win_arm64.whl", hash = "sha256:c35abb8bfff0185efac5878da64c45dafd2b37fb0383add1be155a763c1f083d", size = 153018, upload-time = "2026-04-02T09:27:51.116Z" }, + { url = "https://files.pythonhosted.org/packages/db/8f/61959034484a4a7c527811f4721e75d02d653a35afb0b6054474d8185d4c/charset_normalizer-3.4.7-py3-none-any.whl", hash = "sha256:3dce51d0f5e7951f8bb4900c257dad282f49190fdbebecd4ba99bcc41fef404d", size = 61958, upload-time = "2026-04-02T09:28:37.794Z" }, +] + +[[package]] +name = "click" +version = "8.4.1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "colorama", marker = "sys_platform == 'win32'" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/9b/98/518d8e5081007684232226f475082b30087d0f585e8457db087298259f49/click-8.4.1.tar.gz", hash = "sha256:918b5633eddf6b41c32d4f454bf0de810065c74e3f7dbf8ee5452f8be88d3e96", size = 353007, upload-time = "2026-05-22T04:08:37.769Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/c7/0d/67e5b4109ea4a837e80daa87c2c696711955e40449a97e8926672534def2/click-8.4.1-py3-none-any.whl", hash = "sha256:482be17c6991b8c19c5429a1e995d9b0efdbb63172824c41f99965dc0ade8ec2", size = 116639, upload-time = "2026-05-22T04:08:35.26Z" }, +] + +[[package]] +name = "colorama" +version = "0.4.6" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/d8/53/6f443c9a4a8358a93a6792e2acffb9d9d5cb0a5cfd8802644b7b1c9a02e4/colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44", size = 27697, upload-time = "2022-10-25T02:36:22.414Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/d1/d6/3965ed04c63042e047cb6a3e6ed1a63a35087b6a609aa3a15ed8ac56c221/colorama-0.4.6-py2.py3-none-any.whl", hash = "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6", size = 25335, upload-time = "2022-10-25T02:36:20.889Z" }, +] + +[[package]] +name = "comm" +version = "0.2.3" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/4c/13/7d740c5849255756bc17888787313b61fd38a0a8304fc4f073dfc46122aa/comm-0.2.3.tar.gz", hash = "sha256:2dc8048c10962d55d7ad693be1e7045d891b7ce8d999c97963a5e3e99c055971", size = 6319, upload-time = "2025-07-25T14:02:04.452Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/60/97/891a0971e1e4a8c5d2b20bbe0e524dc04548d2307fee33cdeba148fd4fc7/comm-0.2.3-py3-none-any.whl", hash = "sha256:c615d91d75f7f04f095b30d1c1711babd43bdc6419c1be9886a85f2f4e489417", size = 7294, upload-time = "2025-07-25T14:02:02.896Z" }, +] + +[[package]] +name = "contourpy" +version = "1.3.3" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "numpy", version = "2.4.6", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version < '3.12'" }, + { name = "numpy", version = "2.5.0", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version >= '3.12'" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/58/01/1253e6698a07380cd31a736d248a3f2a50a7c88779a1813da27503cadc2a/contourpy-1.3.3.tar.gz", hash = "sha256:083e12155b210502d0bca491432bb04d56dc3432f95a979b429f2848c3dbe880", size = 13466174, upload-time = "2025-07-26T12:03:12.549Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/91/2e/c4390a31919d8a78b90e8ecf87cd4b4c4f05a5b48d05ec17db8e5404c6f4/contourpy-1.3.3-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:709a48ef9a690e1343202916450bc48b9e51c049b089c7f79a267b46cffcdaa1", size = 288773, upload-time = "2025-07-26T12:01:02.277Z" }, + { url = "https://files.pythonhosted.org/packages/0d/44/c4b0b6095fef4dc9c420e041799591e3b63e9619e3044f7f4f6c21c0ab24/contourpy-1.3.3-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:23416f38bfd74d5d28ab8429cc4d63fa67d5068bd711a85edb1c3fb0c3e2f381", size = 270149, upload-time = "2025-07-26T12:01:04.072Z" }, + { url = "https://files.pythonhosted.org/packages/30/2e/dd4ced42fefac8470661d7cb7e264808425e6c5d56d175291e93890cce09/contourpy-1.3.3-cp311-cp311-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:929ddf8c4c7f348e4c0a5a3a714b5c8542ffaa8c22954862a46ca1813b667ee7", size = 329222, upload-time = "2025-07-26T12:01:05.688Z" }, + { url = "https://files.pythonhosted.org/packages/f2/74/cc6ec2548e3d276c71389ea4802a774b7aa3558223b7bade3f25787fafc2/contourpy-1.3.3-cp311-cp311-manylinux_2_26_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:9e999574eddae35f1312c2b4b717b7885d4edd6cb46700e04f7f02db454e67c1", size = 377234, upload-time = "2025-07-26T12:01:07.054Z" }, + { url = "https://files.pythonhosted.org/packages/03/b3/64ef723029f917410f75c09da54254c5f9ea90ef89b143ccadb09df14c15/contourpy-1.3.3-cp311-cp311-manylinux_2_26_s390x.manylinux_2_28_s390x.whl", hash = "sha256:0bf67e0e3f482cb69779dd3061b534eb35ac9b17f163d851e2a547d56dba0a3a", size = 380555, upload-time = "2025-07-26T12:01:08.801Z" }, + { url = "https://files.pythonhosted.org/packages/5f/4b/6157f24ca425b89fe2eb7e7be642375711ab671135be21e6faa100f7448c/contourpy-1.3.3-cp311-cp311-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:51e79c1f7470158e838808d4a996fa9bac72c498e93d8ebe5119bc1e6becb0db", size = 355238, upload-time = "2025-07-26T12:01:10.319Z" }, + { url = "https://files.pythonhosted.org/packages/98/56/f914f0dd678480708a04cfd2206e7c382533249bc5001eb9f58aa693e200/contourpy-1.3.3-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:598c3aaece21c503615fd59c92a3598b428b2f01bfb4b8ca9c4edeecc2438620", size = 1326218, upload-time = "2025-07-26T12:01:12.659Z" }, + { url = "https://files.pythonhosted.org/packages/fb/d7/4a972334a0c971acd5172389671113ae82aa7527073980c38d5868ff1161/contourpy-1.3.3-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:322ab1c99b008dad206d406bb61d014cf0174df491ae9d9d0fac6a6fda4f977f", size = 1392867, upload-time = "2025-07-26T12:01:15.533Z" }, + { url = "https://files.pythonhosted.org/packages/75/3e/f2cc6cd56dc8cff46b1a56232eabc6feea52720083ea71ab15523daab796/contourpy-1.3.3-cp311-cp311-win32.whl", hash = "sha256:fd907ae12cd483cd83e414b12941c632a969171bf90fc937d0c9f268a31cafff", size = 183677, upload-time = "2025-07-26T12:01:17.088Z" }, + { url = "https://files.pythonhosted.org/packages/98/4b/9bd370b004b5c9d8045c6c33cf65bae018b27aca550a3f657cdc99acdbd8/contourpy-1.3.3-cp311-cp311-win_amd64.whl", hash = "sha256:3519428f6be58431c56581f1694ba8e50626f2dd550af225f82fb5f5814d2a42", size = 225234, upload-time = "2025-07-26T12:01:18.256Z" }, + { url = "https://files.pythonhosted.org/packages/d9/b6/71771e02c2e004450c12b1120a5f488cad2e4d5b590b1af8bad060360fe4/contourpy-1.3.3-cp311-cp311-win_arm64.whl", hash = "sha256:15ff10bfada4bf92ec8b31c62bf7c1834c244019b4a33095a68000d7075df470", size = 193123, upload-time = "2025-07-26T12:01:19.848Z" }, + { url = "https://files.pythonhosted.org/packages/be/45/adfee365d9ea3d853550b2e735f9d66366701c65db7855cd07621732ccfc/contourpy-1.3.3-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:b08a32ea2f8e42cf1d4be3169a98dd4be32bafe4f22b6c4cb4ba810fa9e5d2cb", size = 293419, upload-time = "2025-07-26T12:01:21.16Z" }, + { url = "https://files.pythonhosted.org/packages/53/3e/405b59cfa13021a56bba395a6b3aca8cec012b45bf177b0eaf7a202cde2c/contourpy-1.3.3-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:556dba8fb6f5d8742f2923fe9457dbdd51e1049c4a43fd3986a0b14a1d815fc6", size = 273979, upload-time = "2025-07-26T12:01:22.448Z" }, + { url = "https://files.pythonhosted.org/packages/d4/1c/a12359b9b2ca3a845e8f7f9ac08bdf776114eb931392fcad91743e2ea17b/contourpy-1.3.3-cp312-cp312-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:92d9abc807cf7d0e047b95ca5d957cf4792fcd04e920ca70d48add15c1a90ea7", size = 332653, upload-time = "2025-07-26T12:01:24.155Z" }, + { url = "https://files.pythonhosted.org/packages/63/12/897aeebfb475b7748ea67b61e045accdfcf0d971f8a588b67108ed7f5512/contourpy-1.3.3-cp312-cp312-manylinux_2_26_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:b2e8faa0ed68cb29af51edd8e24798bb661eac3bd9f65420c1887b6ca89987c8", size = 379536, upload-time = "2025-07-26T12:01:25.91Z" }, + { url = "https://files.pythonhosted.org/packages/43/8a/a8c584b82deb248930ce069e71576fc09bd7174bbd35183b7943fb1064fd/contourpy-1.3.3-cp312-cp312-manylinux_2_26_s390x.manylinux_2_28_s390x.whl", hash = "sha256:626d60935cf668e70a5ce6ff184fd713e9683fb458898e4249b63be9e28286ea", size = 384397, upload-time = "2025-07-26T12:01:27.152Z" }, + { url = "https://files.pythonhosted.org/packages/cc/8f/ec6289987824b29529d0dfda0d74a07cec60e54b9c92f3c9da4c0ac732de/contourpy-1.3.3-cp312-cp312-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:4d00e655fcef08aba35ec9610536bfe90267d7ab5ba944f7032549c55a146da1", size = 362601, upload-time = "2025-07-26T12:01:28.808Z" }, + { url = "https://files.pythonhosted.org/packages/05/0a/a3fe3be3ee2dceb3e615ebb4df97ae6f3828aa915d3e10549ce016302bd1/contourpy-1.3.3-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:451e71b5a7d597379ef572de31eeb909a87246974d960049a9848c3bc6c41bf7", size = 1331288, upload-time = "2025-07-26T12:01:31.198Z" }, + { url = "https://files.pythonhosted.org/packages/33/1d/acad9bd4e97f13f3e2b18a3977fe1b4a37ecf3d38d815333980c6c72e963/contourpy-1.3.3-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:459c1f020cd59fcfe6650180678a9993932d80d44ccde1fa1868977438f0b411", size = 1403386, upload-time = "2025-07-26T12:01:33.947Z" }, + { url = "https://files.pythonhosted.org/packages/cf/8f/5847f44a7fddf859704217a99a23a4f6417b10e5ab1256a179264561540e/contourpy-1.3.3-cp312-cp312-win32.whl", hash = "sha256:023b44101dfe49d7d53932be418477dba359649246075c996866106da069af69", size = 185018, upload-time = "2025-07-26T12:01:35.64Z" }, + { url = "https://files.pythonhosted.org/packages/19/e8/6026ed58a64563186a9ee3f29f41261fd1828f527dd93d33b60feca63352/contourpy-1.3.3-cp312-cp312-win_amd64.whl", hash = "sha256:8153b8bfc11e1e4d75bcb0bff1db232f9e10b274e0929de9d608027e0d34ff8b", size = 226567, upload-time = "2025-07-26T12:01:36.804Z" }, + { url = "https://files.pythonhosted.org/packages/d1/e2/f05240d2c39a1ed228d8328a78b6f44cd695f7ef47beb3e684cf93604f86/contourpy-1.3.3-cp312-cp312-win_arm64.whl", hash = "sha256:07ce5ed73ecdc4a03ffe3e1b3e3c1166db35ae7584be76f65dbbe28a7791b0cc", size = 193655, upload-time = "2025-07-26T12:01:37.999Z" }, + { url = "https://files.pythonhosted.org/packages/68/35/0167aad910bbdb9599272bd96d01a9ec6852f36b9455cf2ca67bd4cc2d23/contourpy-1.3.3-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:177fb367556747a686509d6fef71d221a4b198a3905fe824430e5ea0fda54eb5", size = 293257, upload-time = "2025-07-26T12:01:39.367Z" }, + { url = "https://files.pythonhosted.org/packages/96/e4/7adcd9c8362745b2210728f209bfbcf7d91ba868a2c5f40d8b58f54c509b/contourpy-1.3.3-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:d002b6f00d73d69333dac9d0b8d5e84d9724ff9ef044fd63c5986e62b7c9e1b1", size = 274034, upload-time = "2025-07-26T12:01:40.645Z" }, + { url = "https://files.pythonhosted.org/packages/73/23/90e31ceeed1de63058a02cb04b12f2de4b40e3bef5e082a7c18d9c8ae281/contourpy-1.3.3-cp313-cp313-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:348ac1f5d4f1d66d3322420f01d42e43122f43616e0f194fc1c9f5d830c5b286", size = 334672, upload-time = "2025-07-26T12:01:41.942Z" }, + { url = "https://files.pythonhosted.org/packages/ed/93/b43d8acbe67392e659e1d984700e79eb67e2acb2bd7f62012b583a7f1b55/contourpy-1.3.3-cp313-cp313-manylinux_2_26_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:655456777ff65c2c548b7c454af9c6f33f16c8884f11083244b5819cc214f1b5", size = 381234, upload-time = "2025-07-26T12:01:43.499Z" }, + { url = "https://files.pythonhosted.org/packages/46/3b/bec82a3ea06f66711520f75a40c8fc0b113b2a75edb36aa633eb11c4f50f/contourpy-1.3.3-cp313-cp313-manylinux_2_26_s390x.manylinux_2_28_s390x.whl", hash = "sha256:644a6853d15b2512d67881586bd03f462c7ab755db95f16f14d7e238f2852c67", size = 385169, upload-time = "2025-07-26T12:01:45.219Z" }, + { url = "https://files.pythonhosted.org/packages/4b/32/e0f13a1c5b0f8572d0ec6ae2f6c677b7991fafd95da523159c19eff0696a/contourpy-1.3.3-cp313-cp313-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:4debd64f124ca62069f313a9cb86656ff087786016d76927ae2cf37846b006c9", size = 362859, upload-time = "2025-07-26T12:01:46.519Z" }, + { url = "https://files.pythonhosted.org/packages/33/71/e2a7945b7de4e58af42d708a219f3b2f4cff7386e6b6ab0a0fa0033c49a9/contourpy-1.3.3-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:a15459b0f4615b00bbd1e91f1b9e19b7e63aea7483d03d804186f278c0af2659", size = 1332062, upload-time = "2025-07-26T12:01:48.964Z" }, + { url = "https://files.pythonhosted.org/packages/12/fc/4e87ac754220ccc0e807284f88e943d6d43b43843614f0a8afa469801db0/contourpy-1.3.3-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:ca0fdcd73925568ca027e0b17ab07aad764be4706d0a925b89227e447d9737b7", size = 1403932, upload-time = "2025-07-26T12:01:51.979Z" }, + { url = "https://files.pythonhosted.org/packages/a6/2e/adc197a37443f934594112222ac1aa7dc9a98faf9c3842884df9a9d8751d/contourpy-1.3.3-cp313-cp313-win32.whl", hash = "sha256:b20c7c9a3bf701366556e1b1984ed2d0cedf999903c51311417cf5f591d8c78d", size = 185024, upload-time = "2025-07-26T12:01:53.245Z" }, + { url = "https://files.pythonhosted.org/packages/18/0b/0098c214843213759692cc638fce7de5c289200a830e5035d1791d7a2338/contourpy-1.3.3-cp313-cp313-win_amd64.whl", hash = "sha256:1cadd8b8969f060ba45ed7c1b714fe69185812ab43bd6b86a9123fe8f99c3263", size = 226578, upload-time = "2025-07-26T12:01:54.422Z" }, + { url = "https://files.pythonhosted.org/packages/8a/9a/2f6024a0c5995243cd63afdeb3651c984f0d2bc727fd98066d40e141ad73/contourpy-1.3.3-cp313-cp313-win_arm64.whl", hash = "sha256:fd914713266421b7536de2bfa8181aa8c699432b6763a0ea64195ebe28bff6a9", size = 193524, upload-time = "2025-07-26T12:01:55.73Z" }, + { url = "https://files.pythonhosted.org/packages/c0/b3/f8a1a86bd3298513f500e5b1f5fd92b69896449f6cab6a146a5d52715479/contourpy-1.3.3-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:88df9880d507169449d434c293467418b9f6cbe82edd19284aa0409e7fdb933d", size = 306730, upload-time = "2025-07-26T12:01:57.051Z" }, + { url = "https://files.pythonhosted.org/packages/3f/11/4780db94ae62fc0c2053909b65dc3246bd7cecfc4f8a20d957ad43aa4ad8/contourpy-1.3.3-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:d06bb1f751ba5d417047db62bca3c8fde202b8c11fb50742ab3ab962c81e8216", size = 287897, upload-time = "2025-07-26T12:01:58.663Z" }, + { url = "https://files.pythonhosted.org/packages/ae/15/e59f5f3ffdd6f3d4daa3e47114c53daabcb18574a26c21f03dc9e4e42ff0/contourpy-1.3.3-cp313-cp313t-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:e4e6b05a45525357e382909a4c1600444e2a45b4795163d3b22669285591c1ae", size = 326751, upload-time = "2025-07-26T12:02:00.343Z" }, + { url = "https://files.pythonhosted.org/packages/0f/81/03b45cfad088e4770b1dcf72ea78d3802d04200009fb364d18a493857210/contourpy-1.3.3-cp313-cp313t-manylinux_2_26_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:ab3074b48c4e2cf1a960e6bbeb7f04566bf36b1861d5c9d4d8ac04b82e38ba20", size = 375486, upload-time = "2025-07-26T12:02:02.128Z" }, + { url = "https://files.pythonhosted.org/packages/0c/ba/49923366492ffbdd4486e970d421b289a670ae8cf539c1ea9a09822b371a/contourpy-1.3.3-cp313-cp313t-manylinux_2_26_s390x.manylinux_2_28_s390x.whl", hash = "sha256:6c3d53c796f8647d6deb1abe867daeb66dcc8a97e8455efa729516b997b8ed99", size = 388106, upload-time = "2025-07-26T12:02:03.615Z" }, + { url = "https://files.pythonhosted.org/packages/9f/52/5b00ea89525f8f143651f9f03a0df371d3cbd2fccd21ca9b768c7a6500c2/contourpy-1.3.3-cp313-cp313t-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:50ed930df7289ff2a8d7afeb9603f8289e5704755c7e5c3bbd929c90c817164b", size = 352548, upload-time = "2025-07-26T12:02:05.165Z" }, + { url = "https://files.pythonhosted.org/packages/32/1d/a209ec1a3a3452d490f6b14dd92e72280c99ae3d1e73da74f8277d4ee08f/contourpy-1.3.3-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:4feffb6537d64b84877da813a5c30f1422ea5739566abf0bd18065ac040e120a", size = 1322297, upload-time = "2025-07-26T12:02:07.379Z" }, + { url = "https://files.pythonhosted.org/packages/bc/9e/46f0e8ebdd884ca0e8877e46a3f4e633f6c9c8c4f3f6e72be3fe075994aa/contourpy-1.3.3-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:2b7e9480ffe2b0cd2e787e4df64270e3a0440d9db8dc823312e2c940c167df7e", size = 1391023, upload-time = "2025-07-26T12:02:10.171Z" }, + { url = "https://files.pythonhosted.org/packages/b9/70/f308384a3ae9cd2209e0849f33c913f658d3326900d0ff5d378d6a1422d2/contourpy-1.3.3-cp313-cp313t-win32.whl", hash = "sha256:283edd842a01e3dcd435b1c5116798d661378d83d36d337b8dde1d16a5fc9ba3", size = 196157, upload-time = "2025-07-26T12:02:11.488Z" }, + { url = "https://files.pythonhosted.org/packages/b2/dd/880f890a6663b84d9e34a6f88cded89d78f0091e0045a284427cb6b18521/contourpy-1.3.3-cp313-cp313t-win_amd64.whl", hash = "sha256:87acf5963fc2b34825e5b6b048f40e3635dd547f590b04d2ab317c2619ef7ae8", size = 240570, upload-time = "2025-07-26T12:02:12.754Z" }, + { url = "https://files.pythonhosted.org/packages/80/99/2adc7d8ffead633234817ef8e9a87115c8a11927a94478f6bb3d3f4d4f7d/contourpy-1.3.3-cp313-cp313t-win_arm64.whl", hash = "sha256:3c30273eb2a55024ff31ba7d052dde990d7d8e5450f4bbb6e913558b3d6c2301", size = 199713, upload-time = "2025-07-26T12:02:14.4Z" }, + { url = "https://files.pythonhosted.org/packages/72/8b/4546f3ab60f78c514ffb7d01a0bd743f90de36f0019d1be84d0a708a580a/contourpy-1.3.3-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:fde6c716d51c04b1c25d0b90364d0be954624a0ee9d60e23e850e8d48353d07a", size = 292189, upload-time = "2025-07-26T12:02:16.095Z" }, + { url = "https://files.pythonhosted.org/packages/fd/e1/3542a9cb596cadd76fcef413f19c79216e002623158befe6daa03dbfa88c/contourpy-1.3.3-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:cbedb772ed74ff5be440fa8eee9bd49f64f6e3fc09436d9c7d8f1c287b121d77", size = 273251, upload-time = "2025-07-26T12:02:17.524Z" }, + { url = "https://files.pythonhosted.org/packages/b1/71/f93e1e9471d189f79d0ce2497007731c1e6bf9ef6d1d61b911430c3db4e5/contourpy-1.3.3-cp314-cp314-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:22e9b1bd7a9b1d652cd77388465dc358dafcd2e217d35552424aa4f996f524f5", size = 335810, upload-time = "2025-07-26T12:02:18.9Z" }, + { url = "https://files.pythonhosted.org/packages/91/f9/e35f4c1c93f9275d4e38681a80506b5510e9327350c51f8d4a5a724d178c/contourpy-1.3.3-cp314-cp314-manylinux_2_26_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:a22738912262aa3e254e4f3cb079a95a67132fc5a063890e224393596902f5a4", size = 382871, upload-time = "2025-07-26T12:02:20.418Z" }, + { url = "https://files.pythonhosted.org/packages/b5/71/47b512f936f66a0a900d81c396a7e60d73419868fba959c61efed7a8ab46/contourpy-1.3.3-cp314-cp314-manylinux_2_26_s390x.manylinux_2_28_s390x.whl", hash = "sha256:afe5a512f31ee6bd7d0dda52ec9864c984ca3d66664444f2d72e0dc4eb832e36", size = 386264, upload-time = "2025-07-26T12:02:21.916Z" }, + { url = "https://files.pythonhosted.org/packages/04/5f/9ff93450ba96b09c7c2b3f81c94de31c89f92292f1380261bd7195bea4ea/contourpy-1.3.3-cp314-cp314-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:f64836de09927cba6f79dcd00fdd7d5329f3fccc633468507079c829ca4db4e3", size = 363819, upload-time = "2025-07-26T12:02:23.759Z" }, + { url = "https://files.pythonhosted.org/packages/3e/a6/0b185d4cc480ee494945cde102cb0149ae830b5fa17bf855b95f2e70ad13/contourpy-1.3.3-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:1fd43c3be4c8e5fd6e4f2baeae35ae18176cf2e5cced681cca908addf1cdd53b", size = 1333650, upload-time = "2025-07-26T12:02:26.181Z" }, + { url = "https://files.pythonhosted.org/packages/43/d7/afdc95580ca56f30fbcd3060250f66cedbde69b4547028863abd8aa3b47e/contourpy-1.3.3-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:6afc576f7b33cf00996e5c1102dc2a8f7cc89e39c0b55df93a0b78c1bd992b36", size = 1404833, upload-time = "2025-07-26T12:02:28.782Z" }, + { url = "https://files.pythonhosted.org/packages/e2/e2/366af18a6d386f41132a48f033cbd2102e9b0cf6345d35ff0826cd984566/contourpy-1.3.3-cp314-cp314-win32.whl", hash = "sha256:66c8a43a4f7b8df8b71ee1840e4211a3c8d93b214b213f590e18a1beca458f7d", size = 189692, upload-time = "2025-07-26T12:02:30.128Z" }, + { url = "https://files.pythonhosted.org/packages/7d/c2/57f54b03d0f22d4044b8afb9ca0e184f8b1afd57b4f735c2fa70883dc601/contourpy-1.3.3-cp314-cp314-win_amd64.whl", hash = "sha256:cf9022ef053f2694e31d630feaacb21ea24224be1c3ad0520b13d844274614fd", size = 232424, upload-time = "2025-07-26T12:02:31.395Z" }, + { url = "https://files.pythonhosted.org/packages/18/79/a9416650df9b525737ab521aa181ccc42d56016d2123ddcb7b58e926a42c/contourpy-1.3.3-cp314-cp314-win_arm64.whl", hash = "sha256:95b181891b4c71de4bb404c6621e7e2390745f887f2a026b2d99e92c17892339", size = 198300, upload-time = "2025-07-26T12:02:32.956Z" }, + { url = "https://files.pythonhosted.org/packages/1f/42/38c159a7d0f2b7b9c04c64ab317042bb6952b713ba875c1681529a2932fe/contourpy-1.3.3-cp314-cp314t-macosx_10_13_x86_64.whl", hash = "sha256:33c82d0138c0a062380332c861387650c82e4cf1747aaa6938b9b6516762e772", size = 306769, upload-time = "2025-07-26T12:02:34.2Z" }, + { url = "https://files.pythonhosted.org/packages/c3/6c/26a8205f24bca10974e77460de68d3d7c63e282e23782f1239f226fcae6f/contourpy-1.3.3-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:ea37e7b45949df430fe649e5de8351c423430046a2af20b1c1961cae3afcda77", size = 287892, upload-time = "2025-07-26T12:02:35.807Z" }, + { url = "https://files.pythonhosted.org/packages/66/06/8a475c8ab718ebfd7925661747dbb3c3ee9c82ac834ccb3570be49d129f4/contourpy-1.3.3-cp314-cp314t-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:d304906ecc71672e9c89e87c4675dc5c2645e1f4269a5063b99b0bb29f232d13", size = 326748, upload-time = "2025-07-26T12:02:37.193Z" }, + { url = "https://files.pythonhosted.org/packages/b4/a3/c5ca9f010a44c223f098fccd8b158bb1cb287378a31ac141f04730dc49be/contourpy-1.3.3-cp314-cp314t-manylinux_2_26_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:ca658cd1a680a5c9ea96dc61cdbae1e85c8f25849843aa799dfd3cb370ad4fbe", size = 375554, upload-time = "2025-07-26T12:02:38.894Z" }, + { url = "https://files.pythonhosted.org/packages/80/5b/68bd33ae63fac658a4145088c1e894405e07584a316738710b636c6d0333/contourpy-1.3.3-cp314-cp314t-manylinux_2_26_s390x.manylinux_2_28_s390x.whl", hash = "sha256:ab2fd90904c503739a75b7c8c5c01160130ba67944a7b77bbf36ef8054576e7f", size = 388118, upload-time = "2025-07-26T12:02:40.642Z" }, + { url = "https://files.pythonhosted.org/packages/40/52/4c285a6435940ae25d7410a6c36bda5145839bc3f0beb20c707cda18b9d2/contourpy-1.3.3-cp314-cp314t-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:b7301b89040075c30e5768810bc96a8e8d78085b47d8be6e4c3f5a0b4ed478a0", size = 352555, upload-time = "2025-07-26T12:02:42.25Z" }, + { url = "https://files.pythonhosted.org/packages/24/ee/3e81e1dd174f5c7fefe50e85d0892de05ca4e26ef1c9a59c2a57e43b865a/contourpy-1.3.3-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:2a2a8b627d5cc6b7c41a4beff6c5ad5eb848c88255fda4a8745f7e901b32d8e4", size = 1322295, upload-time = "2025-07-26T12:02:44.668Z" }, + { url = "https://files.pythonhosted.org/packages/3c/b2/6d913d4d04e14379de429057cd169e5e00f6c2af3bb13e1710bcbdb5da12/contourpy-1.3.3-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:fd6ec6be509c787f1caf6b247f0b1ca598bef13f4ddeaa126b7658215529ba0f", size = 1391027, upload-time = "2025-07-26T12:02:47.09Z" }, + { url = "https://files.pythonhosted.org/packages/93/8a/68a4ec5c55a2971213d29a9374913f7e9f18581945a7a31d1a39b5d2dfe5/contourpy-1.3.3-cp314-cp314t-win32.whl", hash = "sha256:e74a9a0f5e3fff48fb5a7f2fd2b9b70a3fe014a67522f79b7cca4c0c7e43c9ae", size = 202428, upload-time = "2025-07-26T12:02:48.691Z" }, + { url = "https://files.pythonhosted.org/packages/fa/96/fd9f641ffedc4fa3ace923af73b9d07e869496c9cc7a459103e6e978992f/contourpy-1.3.3-cp314-cp314t-win_amd64.whl", hash = "sha256:13b68d6a62db8eafaebb8039218921399baf6e47bf85006fd8529f2a08ef33fc", size = 250331, upload-time = "2025-07-26T12:02:50.137Z" }, + { url = "https://files.pythonhosted.org/packages/ae/8c/469afb6465b853afff216f9528ffda78a915ff880ed58813ba4faf4ba0b6/contourpy-1.3.3-cp314-cp314t-win_arm64.whl", hash = "sha256:b7448cb5a725bb1e35ce88771b86fba35ef418952474492cf7c764059933ff8b", size = 203831, upload-time = "2025-07-26T12:02:51.449Z" }, + { url = "https://files.pythonhosted.org/packages/a5/29/8dcfe16f0107943fa92388c23f6e05cff0ba58058c4c95b00280d4c75a14/contourpy-1.3.3-pp311-pypy311_pp73-macosx_10_15_x86_64.whl", hash = "sha256:cd5dfcaeb10f7b7f9dc8941717c6c2ade08f587be2226222c12b25f0483ed497", size = 278809, upload-time = "2025-07-26T12:02:52.74Z" }, + { url = "https://files.pythonhosted.org/packages/85/a9/8b37ef4f7dafeb335daee3c8254645ef5725be4d9c6aa70b50ec46ef2f7e/contourpy-1.3.3-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:0c1fc238306b35f246d61a1d416a627348b5cf0648648a031e14bb8705fcdfe8", size = 261593, upload-time = "2025-07-26T12:02:54.037Z" }, + { url = "https://files.pythonhosted.org/packages/0a/59/ebfb8c677c75605cc27f7122c90313fd2f375ff3c8d19a1694bda74aaa63/contourpy-1.3.3-pp311-pypy311_pp73-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:70f9aad7de812d6541d29d2bbf8feb22ff7e1c299523db288004e3157ff4674e", size = 302202, upload-time = "2025-07-26T12:02:55.947Z" }, + { url = "https://files.pythonhosted.org/packages/3c/37/21972a15834d90bfbfb009b9d004779bd5a07a0ec0234e5ba8f64d5736f4/contourpy-1.3.3-pp311-pypy311_pp73-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:5ed3657edf08512fc3fe81b510e35c2012fbd3081d2e26160f27ca28affec989", size = 329207, upload-time = "2025-07-26T12:02:57.468Z" }, + { url = "https://files.pythonhosted.org/packages/0c/58/bd257695f39d05594ca4ad60df5bcb7e32247f9951fd09a9b8edb82d1daa/contourpy-1.3.3-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:3d1a3799d62d45c18bafd41c5fa05120b96a28079f2393af559b843d1a966a77", size = 225315, upload-time = "2025-07-26T12:02:58.801Z" }, +] + +[[package]] +name = "coverage" +version = "7.14.2" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/9c/a3/3834a5564fe8f32154cd7032400d3c2f9c565b2a373fa671f2bbdad6f634/coverage-7.14.2.tar.gz", hash = "sha256:7a2da3d81cfe17c18038c6d98e6592aa9147d596d056119b0ee612c3c8bd5230", size = 923982, upload-time = "2026-06-20T14:49:30.885Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/04/d5/d0e511247f84fa88ae7da68403cbd3bf9d2a5fc48f5d6618a6846b275632/coverage-7.14.2-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:909f265c8c41f04c824bf741b2601fdcb56cab4bf56e018996b6494192ba0f58", size = 220352, upload-time = "2026-06-20T14:47:28.61Z" }, + { url = "https://files.pythonhosted.org/packages/03/4a/ecaff6db72e6c1782ca51336e391393f1e9cc6e4412d6c3da8b7d5075adf/coverage-7.14.2-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:c8102deaf911938233f760426e6a5e287388521de95111d5c8de26c8a1028924", size = 220855, upload-time = "2026-06-20T14:47:29.972Z" }, + { url = "https://files.pythonhosted.org/packages/34/9a/cf950cd8e8df06ee5941276e69f81647005360421be523d5ca18f658e143/coverage-7.14.2-cp311-cp311-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:851f49e7bd7d1cdaf328f3133942b252d5e3d3380690131f423cba8e435b87f5", size = 251276, upload-time = "2026-06-20T14:47:31.413Z" }, + { url = "https://files.pythonhosted.org/packages/9d/08/f973be32c9a095e4bb2d3a7bdcb2f9c117e39d4062471ffffae3623f6c51/coverage-7.14.2-cp311-cp311-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:04cb445bed86aaf00aaa97d41a8b6e30f100f21e81c34caaec4efc684cb57768", size = 253189, upload-time = "2026-06-20T14:47:32.727Z" }, + { url = "https://files.pythonhosted.org/packages/96/aa/f3a50952ba553d442d94b793e5dede25d426b02e5e011e9a9dd225c002d3/coverage-7.14.2-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:7471bc920d97c51c37ea8127f13b2adca43c3d78c53313b26a1f428e99d2c254", size = 255299, upload-time = "2026-06-20T14:47:34.019Z" }, + { url = "https://files.pythonhosted.org/packages/e0/29/9a4c491986f4d637ed64961ae56721661fc21b6b767d280848d0c708756a/coverage-7.14.2-cp311-cp311-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:da5057e1bb257c967feee8ba67f3ebf379e801c7717f238b3d8c9caf00fc8f93", size = 257255, upload-time = "2026-06-20T14:47:35.397Z" }, + { url = "https://files.pythonhosted.org/packages/dd/61/d2a5b48007f6a212f321c36cf5486feb80505d2d00dfb1163aad2da71197/coverage-7.14.2-cp311-cp311-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:33c0da852e8a40246cd8e20cf3b2fc17ca52a45e9b5f7983c93db26f5d24b87b", size = 251417, upload-time = "2026-06-20T14:47:36.677Z" }, + { url = "https://files.pythonhosted.org/packages/ea/25/8df66ae25b401d4529e1d0617af20d9695d171ea4ffec4ca9dffc5dc37b7/coverage-7.14.2-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:f48a85bb437fab7782021c40bfee6b15146928b96960d008ace41b6901a0f21d", size = 252991, upload-time = "2026-06-20T14:47:38.027Z" }, + { url = "https://files.pythonhosted.org/packages/e3/7b/16bdc9116dd8bf412a421a7227daa65ad9f12bef0685b13c1bd1c12e6d4c/coverage-7.14.2-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:f44e7579a769a21d5b5e3166916bfe30ee175aaffff750324cbb11be2dbec5ad", size = 251051, upload-time = "2026-06-20T14:47:39.26Z" }, + { url = "https://files.pythonhosted.org/packages/0a/f8/b7dbed84274dcc69ddb9c0fe72ec1260830473e0d6c299dcf087a0567f7c/coverage-7.14.2-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:78853ca3c6ca2f012daa2b07dbabbb8db0f09d4dbe8ee828d294b3445d3f4cd8", size = 254817, upload-time = "2026-06-20T14:47:40.995Z" }, + { url = "https://files.pythonhosted.org/packages/c6/07/4659e6bed01a25a0effb4952e8e75fd157038fe5f2829b0f69c6811c2033/coverage-7.14.2-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:c9c2795ee3692097ff226ab806005d36bb9691fca9b35353542b57ea749cc830", size = 250772, upload-time = "2026-06-20T14:47:42.306Z" }, + { url = "https://files.pythonhosted.org/packages/26/f4/45019da4cd6cd1df3042476447449d62a76a201f6b3556aa40ac31bce20b/coverage-7.14.2-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:2f5cc48a845d755b6db236f8c29c2b54773eb4c7e4ee2ead43812d73718784b0", size = 251679, upload-time = "2026-06-20T14:47:43.703Z" }, + { url = "https://files.pythonhosted.org/packages/92/e5/76d75fa2ffe0285d3f2608d1bb241fc245cf98fe614d52118427dd6ccdaa/coverage-7.14.2-cp311-cp311-win32.whl", hash = "sha256:9c61cb7eaabcfa609c5bc0f5ff5869d72a2f02f17994e5fba5f971de516f3c82", size = 222445, upload-time = "2026-06-20T14:47:45.137Z" }, + { url = "https://files.pythonhosted.org/packages/57/59/696c64547e5c8b9ed31532e9c7a5f9b6474054da93f8ab07f8baf7365c57/coverage-7.14.2-cp311-cp311-win_amd64.whl", hash = "sha256:e715909b0966d1774d8a26e14e2f4a3ae75909dca526901c6306286b2dcbfbdc", size = 222922, upload-time = "2026-06-20T14:47:46.67Z" }, + { url = "https://files.pythonhosted.org/packages/63/72/646a28100462996c11b98e27d6786cd61f48100d1479804846a3e1e5bf9b/coverage-7.14.2-cp311-cp311-win_arm64.whl", hash = "sha256:9193f7150937a4fd836b10eaa123e15d98e961d1fabac07e60adf2d4785f888a", size = 222468, upload-time = "2026-06-20T14:47:48.119Z" }, + { url = "https://files.pythonhosted.org/packages/d0/d9/bdd141aa2c605096a8ef63b8435fd4f5fec78946a3cb7b9145840ec78291/coverage-7.14.2-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:37c94712e533ea06f0b1e4d934811c520b1914ce0e4da3916220717aa7a86bc6", size = 220528, upload-time = "2026-06-20T14:47:49.652Z" }, + { url = "https://files.pythonhosted.org/packages/02/97/d24ae7d2afc62c54a36313d4dedb655c9afbba3003f0f7f1ae81e97af31f/coverage-7.14.2-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:c050bbc7bba94c77e4ed7438f4fda1babe98ab145691d80aa6f60df934a1468b", size = 220883, upload-time = "2026-06-20T14:47:51.036Z" }, + { url = "https://files.pythonhosted.org/packages/f8/0e/d8f00efd3df0d63e6843ebcbade9e4119d60f5376753c9705d84b014c775/coverage-7.14.2-cp312-cp312-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:a7af571767a2ee342a171c16fc1b1a07a0bf511606d381703fb7cf397fe49d46", size = 252395, upload-time = "2026-06-20T14:47:52.627Z" }, + { url = "https://files.pythonhosted.org/packages/1c/1c/ab9510dfe1a16a35a10f90efad0d9a9cf61b9876973752968f2ba882f73f/coverage-7.14.2-cp312-cp312-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:8b4910cce599cd2438f8da65f5ef199a70a1cdb6ab314926df78271ca5954240", size = 255131, upload-time = "2026-06-20T14:47:54.235Z" }, + { url = "https://files.pythonhosted.org/packages/ba/dd/70171e9371003b33dc6b20f527ac216ff91bbe5c1088e754eb8950d79193/coverage-7.14.2-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:c33e9e4878972f430b0cc06de3bf2a28d054a9efb4f8426d27de0d9cb81396ff", size = 256246, upload-time = "2026-06-20T14:47:55.61Z" }, + { url = "https://files.pythonhosted.org/packages/0f/80/a68b1dd81d5c011e17fd6ab0d707d33297df1d0c618114b9b750a2219c80/coverage-7.14.2-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:e7967ea55c6dea6becba4d5870e2fa0aa4915a8be7ebff1bb79e6207aa75ce8d", size = 258504, upload-time = "2026-06-20T14:47:56.979Z" }, + { url = "https://files.pythonhosted.org/packages/8e/7b/40baaa946189f5317cd77d484e39b9b0727d02ebada0a12162374f2faee2/coverage-7.14.2-cp312-cp312-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:d1322f237c2979b84096f4239c17828ff17fea6b3bbe96c44381c5f587c44c26", size = 252808, upload-time = "2026-06-20T14:47:58.418Z" }, + { url = "https://files.pythonhosted.org/packages/d5/05/b19517b09c43d1e8591de6c13178b0c03166c31e1adbebda378e64c66b9a/coverage-7.14.2-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:77849525340c99f516d793dddbcee16b18d50af892ac43c8de1a6f343d41e3b5", size = 254166, upload-time = "2026-06-20T14:48:00.004Z" }, + { url = "https://files.pythonhosted.org/packages/ae/f5/6e65da5957e041d2094a9b97736628dd80160f1cc007a50790bbb2668c1a/coverage-7.14.2-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:ef11695493ec3f06f7b2678ca274bcabb4ca04057317df268ddbfd8b05f661a8", size = 252310, upload-time = "2026-06-20T14:48:01.458Z" }, + { url = "https://files.pythonhosted.org/packages/2d/de/01b5274f0db63175b04d9354eff68d2d268b8b57a1b2db7d3dcb1f2c9dbb/coverage-7.14.2-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:8134f0e0723e080d1c27bbe8fc149f0162e429fa1852482150015d0fce83eaf1", size = 256379, upload-time = "2026-06-20T14:48:02.981Z" }, + { url = "https://files.pythonhosted.org/packages/71/d6/9a2ffbca41e2f8f86f61e8b78b86afa433ec8cdeac4908ace93a28fe3ff0/coverage-7.14.2-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:914eead2b843fc357f733b3fe39cc94f1b53d466e8cfe03080b1ed9d24ccfc73", size = 251880, upload-time = "2026-06-20T14:48:04.463Z" }, + { url = "https://files.pythonhosted.org/packages/e3/ff/20bd54a43c88c08f474e6cb355a97e024e38412873ef0a581629abe1e26f/coverage-7.14.2-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:e4b2d5e847fb7958583b74910cc19e5ec4ece514487385677b26433b2546116e", size = 253753, upload-time = "2026-06-20T14:48:05.99Z" }, + { url = "https://files.pythonhosted.org/packages/35/2a/2b3482c30d8344f301d8df6ff232a321f2ab87d5ac97ba21891a68638131/coverage-7.14.2-cp312-cp312-win32.whl", hash = "sha256:e753db9e40dda7302e0ac3e1e6e1325fb7f7b4694f87a7314ab15dd5d57911a7", size = 222584, upload-time = "2026-06-20T14:48:07.361Z" }, + { url = "https://files.pythonhosted.org/packages/f6/5e/83934ffff147edd313fe925db426e8f7ccad9e4663262eb5c4db4e345658/coverage-7.14.2-cp312-cp312-win_amd64.whl", hash = "sha256:d32e5ca5f16dafb269ee50b60d32b00c704b3f6f78e238105f1d94a3a5f24bf5", size = 223118, upload-time = "2026-06-20T14:48:08.837Z" }, + { url = "https://files.pythonhosted.org/packages/bb/ee/616b4f38a34f076f3045d3eedfa764d34d82e6a6cc6b300acb0f1ff22a98/coverage-7.14.2-cp312-cp312-win_arm64.whl", hash = "sha256:dc366f158e2fb2add9d4e57338ca48f12611024278688ee657eb0b853fcb5de5", size = 222504, upload-time = "2026-06-20T14:48:10.436Z" }, + { url = "https://files.pythonhosted.org/packages/6d/09/b5b334c27960e7aac0003b96491bada7838dc641099fa64a1a598abf33cd/coverage-7.14.2-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:e5f077641a6713ce9d38df9e85d4fb9e008677fc0775cbaeb32ddfc3b319d4ca", size = 220552, upload-time = "2026-06-20T14:48:11.847Z" }, + { url = "https://files.pythonhosted.org/packages/79/20/879a000c319b4df7b50e4d688c0f7c0f6b5ac9d7b18848cbc00eabf26efe/coverage-7.14.2-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:0907f39b49ae818fe8af50aaa0f19afbc8ca164aea0865181ca7af17a3ac690b", size = 220919, upload-time = "2026-06-20T14:48:13.397Z" }, + { url = "https://files.pythonhosted.org/packages/f6/b7/326dded4371bab60f42215797944a356e4d81a3cee106121c7f7dd531604/coverage-7.14.2-cp313-cp313-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:5734d47669118d75c28981e562d4530ceb77342d31ffef6def5edd5ad4f05d7b", size = 251917, upload-time = "2026-06-20T14:48:14.931Z" }, + { url = "https://files.pythonhosted.org/packages/eb/14/b3232ba218a0d1a70883d2675f18ff465de9e8e5e3346e81dc2b079838bd/coverage-7.14.2-cp313-cp313-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:1d9a1b5813d00ea6151f6ccf64d1fa16892771dfdda12ba87162d15ec4ea3e1e", size = 254515, upload-time = "2026-06-20T14:48:16.545Z" }, + { url = "https://files.pythonhosted.org/packages/b7/7a/d77bcbee1cad71b42776574114b462225cc9125b4982f43da1b66adc850f/coverage-7.14.2-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:9f0a80f4c8ac3f774210b1cc1bc0e31e75502f2818dda9a144ff90e702c4d91d", size = 255749, upload-time = "2026-06-20T14:48:18.214Z" }, + { url = "https://files.pythonhosted.org/packages/86/86/97377937b29e9e44a1529bb20cb74dbcf80ed9006d87d7e742ff69e44b67/coverage-7.14.2-cp313-cp313-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:c2e66f3f22d6c1515ce70f2e7c3e9c6f3ff0ff33480125c9f9c53e8f6508e30f", size = 257882, upload-time = "2026-06-20T14:48:19.7Z" }, + { url = "https://files.pythonhosted.org/packages/c1/a4/0fc8fe68bc505450bb068a2823ac7797bd8495240ccb8b4a5a1da1ee7e62/coverage-7.14.2-cp313-cp313-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:6a2c37c3114f87ca7f10113756026eecb49656514debad600dcbec21f355ccea", size = 252144, upload-time = "2026-06-20T14:48:21.176Z" }, + { url = "https://files.pythonhosted.org/packages/8d/4a/450094ddc41ab0d2eb4a0457b3856400ea3329568d1303696e85de099ae6/coverage-7.14.2-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:3b16a7959d04b1497281c062c180413565c3f3469211d78799ad5b9a75f67796", size = 253882, upload-time = "2026-06-20T14:48:22.701Z" }, + { url = "https://files.pythonhosted.org/packages/d0/28/2f6ae6d98265d9aa6bac311c4a93403675905b03aca95dc4373080279d75/coverage-7.14.2-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:6466c6999545cf00c4c142dfcbbf2db396dc735f005dcf8f91d57e351a79472b", size = 251846, upload-time = "2026-06-20T14:48:24.295Z" }, + { url = "https://files.pythonhosted.org/packages/c2/6e/707281468400794d52874e8fb5e38ff7578a0ff32ed49fe4fe85f192d0fc/coverage-7.14.2-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:5c60915ebb8f562317ba5ff6b8c32e25c0882289b201a9f2fb2987f91efd95d8", size = 256002, upload-time = "2026-06-20T14:48:26.015Z" }, + { url = "https://files.pythonhosted.org/packages/c2/83/5e963120de4011257a950ce4cfb7fc833ddf3fee19db495268d3dec28154/coverage-7.14.2-cp313-cp313-musllinux_1_2_riscv64.whl", hash = "sha256:33b830850488acbcd358c78a4fecfafe7031667b4da8ddff5546295dc962cdeb", size = 251665, upload-time = "2026-06-20T14:48:27.654Z" }, + { url = "https://files.pythonhosted.org/packages/e9/78/66b482cd525083bcc0bc894c16db79dabac37490065b53b07d6e8ab77202/coverage-7.14.2-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:d0f845539230b8269aec902bc978b0cc403f52f002d18a04492efc943404d0bc", size = 253435, upload-time = "2026-06-20T14:48:29.354Z" }, + { url = "https://files.pythonhosted.org/packages/e6/61/0663fb8cb530c8b11819b920109694eee95a3b22960a9495be0200f657f1/coverage-7.14.2-cp313-cp313-win32.whl", hash = "sha256:a8ac51a2e441e9119b9395f4d893fbc4934c64c8ba58be9b9eaa85591249e548", size = 222591, upload-time = "2026-06-20T14:48:31.142Z" }, + { url = "https://files.pythonhosted.org/packages/a6/47/1536d2b009c2848c3682500f497053f4645e70911afe02f594000997831a/coverage-7.14.2-cp313-cp313-win_amd64.whl", hash = "sha256:039b264cdb31c44b48f9821e2afbf8f37df49e0fb837e24a942918b36c567e31", size = 223134, upload-time = "2026-06-20T14:48:32.696Z" }, + { url = "https://files.pythonhosted.org/packages/28/9a/33ba4f335dd60bb34350318283d784f46018070e67b7d4df7c910ec9d9a0/coverage-7.14.2-cp313-cp313-win_arm64.whl", hash = "sha256:7f2ef591e381cc36b8e53334e1b842c760c520c8a52d01e8626209400e93fe6a", size = 222529, upload-time = "2026-06-20T14:48:34.237Z" }, + { url = "https://files.pythonhosted.org/packages/fc/bc/120390669817ede714ab141ae0a2a73240fd7354aac992c41dc0bd19570f/coverage-7.14.2-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:7a0d1f026b72d627fa5c8a57cbc86ad209b64aa2a65833c83b290ace5cbee126", size = 220593, upload-time = "2026-06-20T14:48:35.755Z" }, + { url = "https://files.pythonhosted.org/packages/4f/a3/7f1cfacd76af91e585f7ad689d7168002b444ed2a8ce59f2daaff10089b5/coverage-7.14.2-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:4d2b86f81c1c9310a7e774e3cc9e927a3d0bf583ecbfa01498dd626930025428", size = 220925, upload-time = "2026-06-20T14:48:37.35Z" }, + { url = "https://files.pythonhosted.org/packages/e7/10/6514b2525bb672eb8b43703e46d061d694111db21efe7609db722df2233f/coverage-7.14.2-cp314-cp314-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:d76bdc1f9396ae70a55d050cf9743d88141c62ce0a22a3f627fab1d11c2f8bc6", size = 251974, upload-time = "2026-06-20T14:48:39.109Z" }, + { url = "https://files.pythonhosted.org/packages/23/b4/4533091541c6620ecd68115bbfa1c61265b775618adef3a5fd137f4582e9/coverage-7.14.2-cp314-cp314-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:cda36d8e7bfd63b3e44e75163265429caa5d935b672b00f71bccc8c010518c64", size = 254479, upload-time = "2026-06-20T14:48:40.871Z" }, + { url = "https://files.pythonhosted.org/packages/06/af/e251a143d5d106385dbca696c553afab6b69f7f6bc376a34e089cc0b8b32/coverage-7.14.2-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:0904f3b79d7b845bef0715afe1900da634d12b97f05b9479cb472880ca07cb9c", size = 255824, upload-time = "2026-06-20T14:48:42.608Z" }, + { url = "https://files.pythonhosted.org/packages/9c/53/9e5876e60efbaa79d743d1948a5015ddc05b808db1cd62228acf83e87d43/coverage-7.14.2-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:b6795ca4198d6cb7fc2c6163214f6555a6bc5f0ae1e268e76139dec4b37c4499", size = 258139, upload-time = "2026-06-20T14:48:44.263Z" }, + { url = "https://files.pythonhosted.org/packages/85/5a/d35a4f431fb594e46b81cad4a13b470b017e918f347c1c0b260f7494fa1e/coverage-7.14.2-cp314-cp314-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:c41e9b60fc0fa57f5d73306417d2f9d668202cca6944f9435878c55a5e7ae213", size = 252002, upload-time = "2026-06-20T14:48:45.961Z" }, + { url = "https://files.pythonhosted.org/packages/0c/e2/f5b304c8139c606c4f1b230d3a257d0c88edfbbdf06c58364f07625dc45c/coverage-7.14.2-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:419d2aadd5746efc2e9df0f33c05570d8192e6f6a6098ab05acce586f44ce8a5", size = 253832, upload-time = "2026-06-20T14:48:47.582Z" }, + { url = "https://files.pythonhosted.org/packages/86/bc/bbbd283daa6be4f68aad4ad4066fd39ae98e4174db8c03ab26c5803d6234/coverage-7.14.2-cp314-cp314-musllinux_1_2_i686.whl", hash = "sha256:1c5d273c5f1411c0d26c4f066c398d4a434b1f97bb5fa409189bedce86d4add4", size = 251799, upload-time = "2026-06-20T14:48:49.42Z" }, + { url = "https://files.pythonhosted.org/packages/69/8d/0745fceb89c9e5f7dd8ed243d97dc8561b7a95545741e2409d2b34654824/coverage-7.14.2-cp314-cp314-musllinux_1_2_ppc64le.whl", hash = "sha256:5fe465bc691264adce601527a972990c1174075d86bcbe9968fd20c95e0b1948", size = 256075, upload-time = "2026-06-20T14:48:51.065Z" }, + { url = "https://files.pythonhosted.org/packages/a2/a0/441d9a5255cf021ab41ee00c014a4607d1c72d5e5bef0a4fdaa5be86a907/coverage-7.14.2-cp314-cp314-musllinux_1_2_riscv64.whl", hash = "sha256:6fbb61617af1c56f95d53170ae9fa6c9aef6de1abd02fcc50064bfc672efb18d", size = 251612, upload-time = "2026-06-20T14:48:52.653Z" }, + { url = "https://files.pythonhosted.org/packages/50/37/3d19c5e32d4a529c068eb296abfa3e455bd2c0f9311ecf26280f408ff8e0/coverage-7.14.2-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:e1eff22b831dfd5694989cc1f0789980f18391f614ac67c851af9a8e6d25e9ba", size = 253270, upload-time = "2026-06-20T14:48:54.3Z" }, + { url = "https://files.pythonhosted.org/packages/3d/b0/54dd13937297518da6d092cc2c39d9340ec2194bdfa92e0a64694d643e23/coverage-7.14.2-cp314-cp314-win32.whl", hash = "sha256:58e91be0a233adef698d3e6be54f10401bb91fd7854c0d4c4d50e0d3711e72f1", size = 222796, upload-time = "2026-06-20T14:48:56.084Z" }, + { url = "https://files.pythonhosted.org/packages/51/45/7a10e0909919686e335fdd95869cfb222d55243ebff27dc5cf59ca259a1f/coverage-7.14.2-cp314-cp314-win_amd64.whl", hash = "sha256:d8429bf97906bfe6c61f9dbfb3342e0d88120da61939da8bd04f830cc3eab3b8", size = 223285, upload-time = "2026-06-20T14:48:57.729Z" }, + { url = "https://files.pythonhosted.org/packages/2e/03/9cb197eb4b3d1a2eccb2537c226a93c80522c5b8afc5dd93e1993d7bb021/coverage-7.14.2-cp314-cp314-win_arm64.whl", hash = "sha256:13609d9d77249447aa73357b14831b0f3b95f275026c9ff20dd105f981f53a0c", size = 222712, upload-time = "2026-06-20T14:48:59.413Z" }, + { url = "https://files.pythonhosted.org/packages/d6/3c/e59f498511080d20bf866b0af9eeab820feb91547dae2084cb9bb7fb0e58/coverage-7.14.2-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:9818486c2bac88ae931df7e04905ee29bef49fd218c00f5f02bed4855254a101", size = 221325, upload-time = "2026-06-20T14:49:01.447Z" }, + { url = "https://files.pythonhosted.org/packages/d3/37/8d7955f7e701e69198bd0a0132ea76518c078a635b930a4924e2ccfa70f0/coverage-7.14.2-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:58055adffabfa243516a197aa9f85f0dd56d905b0fba1a10193269759c29ccb0", size = 221594, upload-time = "2026-06-20T14:49:03.13Z" }, + { url = "https://files.pythonhosted.org/packages/34/7a/6738e1e1533ce8ec4e2e472696eefdd4723864d7efaa140e433053bf576a/coverage-7.14.2-cp314-cp314t-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:535747dbc200349d7fb434cffcb28e770f0290f69b225f56dc3803aa7210cdea", size = 262957, upload-time = "2026-06-20T14:49:04.829Z" }, + { url = "https://files.pythonhosted.org/packages/35/c4/d1be863cd39e0955904315fece67c5c23e046563f5eea0ceac16c547a759/coverage-7.14.2-cp314-cp314t-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:420c66e35d85c0ca5dc6a38147d83ef239762542900e5921ebbdb89333c540ea", size = 265081, upload-time = "2026-06-20T14:49:07.018Z" }, + { url = "https://files.pythonhosted.org/packages/72/7f/412df3c3c251284a11834287fd6f7e3bb98c528c53e030589e9344a3ef80/coverage-7.14.2-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:f2cf17b33773be446a588551ea6a746b2d70dd0bc90dc31f1dd7648975a63c6b", size = 267500, upload-time = "2026-06-20T14:49:08.709Z" }, + { url = "https://files.pythonhosted.org/packages/54/68/7d0764e83459455384d5c04179ce2d2a837bef01b9ba463079c6e8b31361/coverage-7.14.2-cp314-cp314t-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:adb4a5fef041f7179bb264203add873c147d169cf2f8d0adae89ff2e51271bac", size = 268619, upload-time = "2026-06-20T14:49:10.405Z" }, + { url = "https://files.pythonhosted.org/packages/14/68/1292164ac70cbcc86ac3982da31a6fbb42bb4bcebf6e5cf73c99cfcfd50d/coverage-7.14.2-cp314-cp314t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:9c012ec357dec9408a83dad5541172a63c5cfa1421709f2e5811480d31ae1b28", size = 262066, upload-time = "2026-06-20T14:49:12.257Z" }, + { url = "https://files.pythonhosted.org/packages/20/44/fd6fdf3f63b6e00a1a9230022d072ded5189576001685706aa6524187c65/coverage-7.14.2-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:dacd0ecd08fda3cb2f85b60cabea7da326dcb2fc15fbb23a88830a80144cc9f2", size = 264953, upload-time = "2026-06-20T14:49:14.13Z" }, + { url = "https://files.pythonhosted.org/packages/39/29/e803fea3da89eaeb5b6b41b3ccd039fe9f3300a900e3803baac1a998529f/coverage-7.14.2-cp314-cp314t-musllinux_1_2_i686.whl", hash = "sha256:f27e980f2feba5dfe7a32b22b125470de69c0bd113c75e16165de909a777f512", size = 262555, upload-time = "2026-06-20T14:49:15.803Z" }, + { url = "https://files.pythonhosted.org/packages/32/3c/b360e48ac68e3236c04cb83658382e7f5be7efbbec2e1faae3dcca432783/coverage-7.14.2-cp314-cp314t-musllinux_1_2_ppc64le.whl", hash = "sha256:105c00efb65c863630b2b63cbf7b8267e4da2d44b62284efbb19a03b04c337d4", size = 266289, upload-time = "2026-06-20T14:49:17.962Z" }, + { url = "https://files.pythonhosted.org/packages/59/12/1ed6d9274d599c586e2d1aa9818765dcdae6bb52aa88afa2fcd868398191/coverage-7.14.2-cp314-cp314t-musllinux_1_2_riscv64.whl", hash = "sha256:571173fa04c8e8d6235ab32ae67fecca97777e2e1b4a1a30f3022c34e397c1c1", size = 261402, upload-time = "2026-06-20T14:49:19.708Z" }, + { url = "https://files.pythonhosted.org/packages/44/17/eb6cf12a4538cda937aefbeabb15377a8a30b377b484e63d31c9da790966/coverage-7.14.2-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:e532f34d42d1a421fa00ed6b7735d14ac2e340256c1bad26a5e1dc1252b0bed7", size = 263715, upload-time = "2026-06-20T14:49:21.427Z" }, + { url = "https://files.pythonhosted.org/packages/8a/ca/4bafdb9d372ab05d6ed3a63e7f00d3195d169d0afea00f617c026e386c19/coverage-7.14.2-cp314-cp314t-win32.whl", hash = "sha256:243971550fb46c3039257f75e65610002d84304c505f609bbd9779e20a653a0a", size = 223103, upload-time = "2026-06-20T14:49:23.24Z" }, + { url = "https://files.pythonhosted.org/packages/35/cb/0765dbd9011d2e47315f1da31e62c5fe231f04a6ec8da213e64c4505896d/coverage-7.14.2-cp314-cp314t-win_amd64.whl", hash = "sha256:60fb0ca084a92da96474b8b405a7ea76dfecac3c68db54383e7934b6f3871169", size = 223934, upload-time = "2026-06-20T14:49:25.347Z" }, + { url = "https://files.pythonhosted.org/packages/4e/ce/373dde027ecd0ae54511430fe7569f838d3a0376b70333ba9fd20c76b836/coverage-7.14.2-cp314-cp314t-win_arm64.whl", hash = "sha256:36a0a3f42ed7dfdbca2a69a541519ffd5064a5692152fc0018109e74370d7345", size = 223249, upload-time = "2026-06-20T14:49:27.241Z" }, + { url = "https://files.pythonhosted.org/packages/a3/5e/a8ba14ceb014f39bd5e3f7077150718c7de61c01ce326bfe7e8eae9b19b2/coverage-7.14.2-py3-none-any.whl", hash = "sha256:04d92589e481a8b68a005a5a1e0646a91c76f322c397c4635298c57cf63699b5", size = 212325, upload-time = "2026-06-20T14:49:28.991Z" }, +] + +[package.optional-dependencies] +toml = [ + { name = "tomli", marker = "python_full_version <= '3.11'" }, +] + +[[package]] +name = "cramjam" +version = "2.11.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/14/12/34bf6e840a79130dfd0da7badfb6f7810b8fcfd60e75b0539372667b41b6/cramjam-2.11.0.tar.gz", hash = "sha256:5c82500ed91605c2d9781380b378397012e25127e89d64f460fea6aeac4389b4", size = 99100, upload-time = "2025-07-27T21:25:07.559Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/d0/89/8001f6a9b6b6e9fa69bec5319789083475d6f26d52aaea209d3ebf939284/cramjam-2.11.0-cp311-cp311-macosx_10_12_x86_64.macosx_11_0_arm64.macosx_10_12_universal2.whl", hash = "sha256:04cfa39118570e70e920a9b75c733299784b6d269733dbc791d9aaed6edd2615", size = 3559272, upload-time = "2025-07-27T21:22:01.988Z" }, + { url = "https://files.pythonhosted.org/packages/0b/f3/001d00070ca92e5fbe6aacc768e455568b0cde46b0eb944561a4ea132300/cramjam-2.11.0-cp311-cp311-macosx_10_12_x86_64.whl", hash = "sha256:66a18f68506290349a256375d7aa2f645b9f7993c10fc4cc211db214e4e61d2b", size = 1861743, upload-time = "2025-07-27T21:22:03.754Z" }, + { url = "https://files.pythonhosted.org/packages/c9/35/041a3af01bf3f6158f120070f798546d4383b962b63c35cd91dcbf193e17/cramjam-2.11.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:50e7d65533857736cd56f6509cf2c4866f28ad84dd15b5bdbf2f8a81e77fa28a", size = 1699631, upload-time = "2025-07-27T21:22:05.192Z" }, + { url = "https://files.pythonhosted.org/packages/17/eb/5358b238808abebd0c949c42635c3751204ca7cf82b29b984abe9f5e33c8/cramjam-2.11.0-cp311-cp311-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:1f71989668458fc327ac15396db28d92df22f8024bb12963929798b2729d2df5", size = 2025603, upload-time = "2025-07-27T21:22:06.726Z" }, + { url = "https://files.pythonhosted.org/packages/0e/79/19dba7c03a27408d8d11b5a7a4a7908459cfd4e6f375b73264dc66517bf6/cramjam-2.11.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ee77ac543f1e2b22af1e8be3ae589f729491b6090582340aacd77d1d757d9569", size = 1766283, upload-time = "2025-07-27T21:22:08.568Z" }, + { url = "https://files.pythonhosted.org/packages/a4/ad/40e4b3408501d886d082db465c33971655fe82573c535428e52ab905f4d0/cramjam-2.11.0-cp311-cp311-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:ad52784120e7e4d8a0b5b0517d185b8bf7f74f5e17272857ddc8951a628d9be1", size = 1854407, upload-time = "2025-07-27T21:22:10.518Z" }, + { url = "https://files.pythonhosted.org/packages/36/6e/c1b60ceb6d7ea6ff8b0bf197520aefe23f878bf2bfb0de65f2b0c2f82cd1/cramjam-2.11.0-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:4b86f8e6d9c1b3f9a75b2af870c93ceee0f1b827cd2507387540e053b35d7459", size = 2035793, upload-time = "2025-07-27T21:22:12.504Z" }, + { url = "https://files.pythonhosted.org/packages/9c/ad/32a8d5f4b1e3717787945ec6d71bd1c6e6bccba4b7e903fc0d9d4e4b08c3/cramjam-2.11.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:320d61938950d95da2371b46c406ec433e7955fae9f396c8e1bf148ffc187d11", size = 2067499, upload-time = "2025-07-27T21:22:14.067Z" }, + { url = "https://files.pythonhosted.org/packages/ff/cd/3b5a662736ea62ff7fa4c4a10a85e050bfdaad375cc53dc80427e8afe41c/cramjam-2.11.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:41eafc8c1653a35a5c7e75ad48138f9f60085cc05cd99d592e5298552d944e9f", size = 1981853, upload-time = "2025-07-27T21:22:15.908Z" }, + { url = "https://files.pythonhosted.org/packages/26/8e/1dbcfaaa7a702ee82ee683ec3a81656934dd7e04a7bc4ee854033686f98a/cramjam-2.11.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:03a7316c6bf763dfa34279335b27702321da44c455a64de58112968c0818ec4a", size = 2034514, upload-time = "2025-07-27T21:22:17.352Z" }, + { url = "https://files.pythonhosted.org/packages/50/62/f11709bfdce74af79a88b410dcb76dedc97612166e759136931bf63cfd7b/cramjam-2.11.0-cp311-cp311-musllinux_1_1_armv7l.whl", hash = "sha256:244c2ed8bd7ccbb294a2abe7ca6498db7e89d7eb5e744691dc511a7dc82e65ca", size = 2155343, upload-time = "2025-07-27T21:22:18.854Z" }, + { url = "https://files.pythonhosted.org/packages/8a/6d/3b98b61841a5376d9a9b8468ae58753a8e6cf22be9534a0fa5af4d8621cc/cramjam-2.11.0-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:405f8790bad36ce0b4bbdb964ad51507bfc7942c78447f25cb828b870a1d86a0", size = 2169367, upload-time = "2025-07-27T21:22:20.389Z" }, + { url = "https://files.pythonhosted.org/packages/11/72/bd5db5c49dbebc8b002f1c4983101b28d2e7fc9419753db1c31ec22b03ef/cramjam-2.11.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:6b1b751a5411032b08fb3ac556160229ca01c6bbe4757bb3a9a40b951ebaac23", size = 2159334, upload-time = "2025-07-27T21:22:22.254Z" }, + { url = "https://files.pythonhosted.org/packages/34/32/203c57acdb6eea727e7078b2219984e64ed4ad043c996ed56321301ba167/cramjam-2.11.0-cp311-cp311-win32.whl", hash = "sha256:5251585608778b9ac8effed544933df7ad85b4ba21ee9738b551f17798b215ac", size = 1605313, upload-time = "2025-07-27T21:22:24.126Z" }, + { url = "https://files.pythonhosted.org/packages/a9/bd/102d6deb87a8524ac11cddcd31a7612b8f20bf9b473c3c645045e3b957c7/cramjam-2.11.0-cp311-cp311-win_amd64.whl", hash = "sha256:dca88bc8b68ce6d35dafd8c4d5d59a238a56c43fa02b74c2ce5f9dfb0d1ccb46", size = 1710991, upload-time = "2025-07-27T21:22:25.661Z" }, + { url = "https://files.pythonhosted.org/packages/0b/0d/7c84c913a5fae85b773a9dcf8874390f9d68ba0fcc6630efa7ff1541b950/cramjam-2.11.0-cp312-cp312-macosx_10_12_x86_64.macosx_11_0_arm64.macosx_10_12_universal2.whl", hash = "sha256:dba5c14b8b4f73ea1e65720f5a3fe4280c1d27761238378be8274135c60bbc6e", size = 3553368, upload-time = "2025-07-27T21:22:27.162Z" }, + { url = "https://files.pythonhosted.org/packages/2b/cc/4f6d185d8a744776f53035e72831ff8eefc2354f46ab836f4bd3c4f6c138/cramjam-2.11.0-cp312-cp312-macosx_10_12_x86_64.whl", hash = "sha256:11eb40722b3fcf3e6890fba46c711bf60f8dc26360a24876c85e52d76c33b25b", size = 1860014, upload-time = "2025-07-27T21:22:28.738Z" }, + { url = "https://files.pythonhosted.org/packages/1c/a8/626c76263085c6d5ded0e71823b411e9522bfc93ba6cc59855a5869296e7/cramjam-2.11.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:aeb26e2898994b6e8319f19a4d37c481512acdcc6d30e1b5ecc9d8ec57e835cb", size = 1693512, upload-time = "2025-07-27T21:22:30.999Z" }, + { url = "https://files.pythonhosted.org/packages/e9/52/0851a16a62447532e30ba95a80e638926fdea869a34b4b5b9d0a020083ba/cramjam-2.11.0-cp312-cp312-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:4f8d82081ed7d8fe52c982bd1f06e4c7631a73fe1fb6d4b3b3f2404f87dc40fe", size = 2025285, upload-time = "2025-07-27T21:22:32.954Z" }, + { url = "https://files.pythonhosted.org/packages/98/76/122e444f59dbc216451d8e3d8282c9665dc79eaf822f5f1470066be1b695/cramjam-2.11.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:092a3ec26e0a679305018380e4f652eae1b6dfe3fc3b154ee76aa6b92221a17c", size = 1761327, upload-time = "2025-07-27T21:22:34.484Z" }, + { url = "https://files.pythonhosted.org/packages/a3/bc/3a0189aef1af2b29632c039c19a7a1b752bc21a4053582a5464183a0ad3d/cramjam-2.11.0-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:529d6d667c65fd105d10bd83d1cd3f9869f8fd6c66efac9415c1812281196a92", size = 1854075, upload-time = "2025-07-27T21:22:36.157Z" }, + { url = "https://files.pythonhosted.org/packages/2e/80/8a6343b13778ce52d94bb8d5365a30c3aa951276b1857201fe79d7e2ad25/cramjam-2.11.0-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:555eb9c90c450e0f76e27d9ff064e64a8b8c6478ab1a5594c91b7bc5c82fd9f0", size = 2032710, upload-time = "2025-07-27T21:22:38.17Z" }, + { url = "https://files.pythonhosted.org/packages/df/6b/cd1778a207c29eda10791e3dfa018b588001928086e179fc71254793c625/cramjam-2.11.0-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:5edf4c9e32493035b514cf2ba0c969d81ccb31de63bd05490cc8bfe3b431674e", size = 2068353, upload-time = "2025-07-27T21:22:39.615Z" }, + { url = "https://files.pythonhosted.org/packages/dc/f0/5c2a5cd5711032f3b191ca50cb786c17689b4a9255f9f768866e6c9f04d9/cramjam-2.11.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2fa2fe41f48c4d58d923803383b0737f048918b5a0d10390de9628bb6272b107", size = 1978104, upload-time = "2025-07-27T21:22:41.106Z" }, + { url = "https://files.pythonhosted.org/packages/f9/8b/b363a5fb2c3347504fe9a64f8d0f1e276844f0e532aa7162c061cd1ffee4/cramjam-2.11.0-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:9ca14cf1cabdb0b77d606db1bb9e9ca593b1dbd421fcaf251ec9a5431ec449f3", size = 2030779, upload-time = "2025-07-27T21:22:42.969Z" }, + { url = "https://files.pythonhosted.org/packages/78/7b/d83dad46adb6c988a74361f81ad9c5c22642be53ad88616a19baedd06243/cramjam-2.11.0-cp312-cp312-musllinux_1_1_armv7l.whl", hash = "sha256:309e95bf898829476bccf4fd2c358ec00e7ff73a12f95a3cdeeba4bb1d3683d5", size = 2155297, upload-time = "2025-07-27T21:22:44.6Z" }, + { url = "https://files.pythonhosted.org/packages/1a/be/60d9be4cb33d8740a4aa94c7513f2ef3c4eba4fd13536f086facbafade71/cramjam-2.11.0-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:86dca35d2f15ef22922411496c220f3c9e315d5512f316fe417461971cc1648d", size = 2169255, upload-time = "2025-07-27T21:22:46.534Z" }, + { url = "https://files.pythonhosted.org/packages/11/b0/4a595f01a243aec8ad272b160b161c44351190c35d98d7787919d962e9e5/cramjam-2.11.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:193c6488bd2f514cbc0bef5c18fad61a5f9c8d059dd56edf773b3b37f0e85496", size = 2155651, upload-time = "2025-07-27T21:22:48.46Z" }, + { url = "https://files.pythonhosted.org/packages/38/47/7776659aaa677046b77f527106e53ddd47373416d8fcdb1e1a881ec5dc06/cramjam-2.11.0-cp312-cp312-win32.whl", hash = "sha256:514e2c008a8b4fa823122ca3ecab896eac41d9aa0f5fc881bd6264486c204e32", size = 1603568, upload-time = "2025-07-27T21:22:50.084Z" }, + { url = "https://files.pythonhosted.org/packages/75/b1/d53002729cfd94c5844ddfaf1233c86d29f2dbfc1b764a6562c41c044199/cramjam-2.11.0-cp312-cp312-win_amd64.whl", hash = "sha256:53fed080476d5f6ad7505883ec5d1ec28ba36c2273db3b3e92d7224fe5e463db", size = 1709287, upload-time = "2025-07-27T21:22:51.534Z" }, + { url = "https://files.pythonhosted.org/packages/0a/8b/406c5dc0f8e82385519d8c299c40fd6a56d97eca3fcd6f5da8dad48de75b/cramjam-2.11.0-cp313-cp313-macosx_10_12_x86_64.macosx_11_0_arm64.macosx_10_12_universal2.whl", hash = "sha256:2c289729cc1c04e88bafa48b51082fb462b0a57dbc96494eab2be9b14dca62af", size = 3553330, upload-time = "2025-07-27T21:22:53.124Z" }, + { url = "https://files.pythonhosted.org/packages/00/ad/4186884083d6e4125b285903e17841827ab0d6d0cffc86216d27ed91e91d/cramjam-2.11.0-cp313-cp313-macosx_10_12_x86_64.whl", hash = "sha256:045201ee17147e36cf43d8ae2fa4b4836944ac672df5874579b81cf6d40f1a1f", size = 1859756, upload-time = "2025-07-27T21:22:54.821Z" }, + { url = "https://files.pythonhosted.org/packages/54/01/91b485cf76a7efef638151e8a7d35784dae2c4ff221b1aec2c083e4b106d/cramjam-2.11.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:619cd195d74c9e1d2a3ad78d63451d35379c84bd851aec552811e30842e1c67a", size = 1693609, upload-time = "2025-07-27T21:22:56.331Z" }, + { url = "https://files.pythonhosted.org/packages/cd/84/d0c80d279b2976870fc7d10f15dcb90a3c10c06566c6964b37c152694974/cramjam-2.11.0-cp313-cp313-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:6eb3ae5ab72edb2ed68bdc0f5710f0a6cad7fd778a610ec2c31ee15e32d3921e", size = 2024912, upload-time = "2025-07-27T21:22:57.915Z" }, + { url = "https://files.pythonhosted.org/packages/d6/70/88f2a5cb904281ed5d3c111b8f7d5366639817a5470f059bcd26833fc870/cramjam-2.11.0-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:df7da3f4b19e3078f9635f132d31b0a8196accb2576e3213ddd7a77f93317c20", size = 1760715, upload-time = "2025-07-27T21:22:59.528Z" }, + { url = "https://files.pythonhosted.org/packages/b2/06/cf5b02081132537d28964fb385fcef9ed9f8a017dd7d8c59d317e53ba50d/cramjam-2.11.0-cp313-cp313-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:57286b289cd557ac76c24479d8ecfb6c3d5b854cce54ccc7671f9a2f5e2a2708", size = 1853782, upload-time = "2025-07-27T21:23:01.07Z" }, + { url = "https://files.pythonhosted.org/packages/57/27/63525087ed40a53d1867021b9c4858b80cc86274ffe7225deed067d88d92/cramjam-2.11.0-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:28952fbbf8b32c0cb7fa4be9bcccfca734bf0d0989f4b509dc7f2f70ba79ae06", size = 2032354, upload-time = "2025-07-27T21:23:03.021Z" }, + { url = "https://files.pythonhosted.org/packages/c3/ef/dbba082c6ebfb6410da4dd39a64e654d7194fcfd4567f85991a83fa4ec32/cramjam-2.11.0-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:78ed2e4099812a438b545dfbca1928ec825e743cd253bc820372d6ef8c3adff4", size = 2068007, upload-time = "2025-07-27T21:23:04.526Z" }, + { url = "https://files.pythonhosted.org/packages/35/ce/d902b9358a46a086938feae83b2251720e030f06e46006f4c1fc0ac9da20/cramjam-2.11.0-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7d9aecd5c3845d415bd6c9957c93de8d93097e269137c2ecb0e5a5256374bdc8", size = 1977485, upload-time = "2025-07-27T21:23:06.058Z" }, + { url = "https://files.pythonhosted.org/packages/e8/03/982f54553244b0afcbdb2ad2065d460f0ab05a72a96896a969a1ca136a1e/cramjam-2.11.0-cp313-cp313-musllinux_1_1_aarch64.whl", hash = "sha256:362fcf4d6f5e1242a4540812455f5a594949190f6fbc04f2ffbfd7ae0266d788", size = 2030447, upload-time = "2025-07-27T21:23:07.679Z" }, + { url = "https://files.pythonhosted.org/packages/74/5f/748e54cdb665ec098ec519e23caacc65fc5ae58718183b071e33fc1c45b4/cramjam-2.11.0-cp313-cp313-musllinux_1_1_armv7l.whl", hash = "sha256:13240b3dea41b1174456cb9426843b085dc1a2bdcecd9ee2d8f65ac5703374b0", size = 2154949, upload-time = "2025-07-27T21:23:09.366Z" }, + { url = "https://files.pythonhosted.org/packages/69/81/c4e6cb06ed69db0dc81f9a8b1dc74995ebd4351e7a1877143f7031ff2700/cramjam-2.11.0-cp313-cp313-musllinux_1_1_i686.whl", hash = "sha256:c54eed83726269594b9086d827decc7d2015696e31b99bf9b69b12d9063584fe", size = 2168925, upload-time = "2025-07-27T21:23:10.976Z" }, + { url = "https://files.pythonhosted.org/packages/13/5b/966365523ce8290a08e163e3b489626c5adacdff2b3da9da1b0823dfb14e/cramjam-2.11.0-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:f8195006fdd0fc0a85b19df3d64a3ef8a240e483ae1dfc7ac6a4316019eb5df2", size = 2154950, upload-time = "2025-07-27T21:23:12.514Z" }, + { url = "https://files.pythonhosted.org/packages/3a/7d/7f8eb5c534b72b32c6eb79d74585bfee44a9a5647a14040bb65c31c2572d/cramjam-2.11.0-cp313-cp313-win32.whl", hash = "sha256:ccf30e3fe6d770a803dcdf3bb863fa44ba5dc2664d4610ba2746a3c73599f2e4", size = 1603199, upload-time = "2025-07-27T21:23:14.38Z" }, + { url = "https://files.pythonhosted.org/packages/37/05/47b5e0bf7c41a3b1cdd3b7c2147f880c93226a6bef1f5d85183040cbdece/cramjam-2.11.0-cp313-cp313-win_amd64.whl", hash = "sha256:ee36348a204f0a68b03400f4736224e9f61d1c6a1582d7f875c1ca56f0254268", size = 1708924, upload-time = "2025-07-27T21:23:16.332Z" }, + { url = "https://files.pythonhosted.org/packages/de/07/a1051cdbbe6d723df16d756b97f09da7c1adb69e29695c58f0392bc12515/cramjam-2.11.0-cp314-cp314-macosx_10_12_x86_64.macosx_11_0_arm64.macosx_10_12_universal2.whl", hash = "sha256:7ba5e38c9fbd06f086f4a5a64a1a5b7b417cd3f8fc07a20e5c03651f72f36100", size = 3554141, upload-time = "2025-07-27T21:23:17.938Z" }, + { url = "https://files.pythonhosted.org/packages/74/66/58487d2e16ef3d04f51a7c7f0e69823e806744b4c21101e89da4873074bc/cramjam-2.11.0-cp314-cp314-macosx_10_12_x86_64.whl", hash = "sha256:b8adeee57b41fe08e4520698a4b0bd3cc76dbd81f99424b806d70a5256a391d3", size = 1860353, upload-time = "2025-07-27T21:23:19.593Z" }, + { url = "https://files.pythonhosted.org/packages/67/b4/67f6254d166ffbcc9d5fa1b56876eaa920c32ebc8e9d3d525b27296b693b/cramjam-2.11.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:b96a74fa03a636c8a7d76f700d50e9a8bc17a516d6a72d28711225d641e30968", size = 1693832, upload-time = "2025-07-27T21:23:21.185Z" }, + { url = "https://files.pythonhosted.org/packages/55/a3/4e0b31c0d454ae70c04684ed7c13d3c67b4c31790c278c1e788cb804fa4a/cramjam-2.11.0-cp314-cp314-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:c3811a56fa32e00b377ef79121c0193311fd7501f0fb378f254c7f083cc1fbe0", size = 2027080, upload-time = "2025-07-27T21:23:23.303Z" }, + { url = "https://files.pythonhosted.org/packages/d9/c7/5e8eed361d1d3b8be14f38a54852c5370cc0ceb2c2d543b8ba590c34f080/cramjam-2.11.0-cp314-cp314-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c5d927e87461f8a0d448e4ab5eb2bca9f31ca5d8ea86d70c6f470bb5bc666d7e", size = 1761543, upload-time = "2025-07-27T21:23:24.991Z" }, + { url = "https://files.pythonhosted.org/packages/09/0c/06b7f8b0ce9fde89470505116a01fc0b6cb92d406c4fb1e46f168b5d3fa5/cramjam-2.11.0-cp314-cp314-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:f1f5c450121430fd89cb5767e0a9728ecc65997768fd4027d069cb0368af62f9", size = 1854636, upload-time = "2025-07-27T21:23:26.987Z" }, + { url = "https://files.pythonhosted.org/packages/6f/c6/6ebc02c9d5acdf4e5f2b1ec6e1252bd5feee25762246798ae823b3347457/cramjam-2.11.0-cp314-cp314-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:724aa7490be50235d97f07e2ca10067927c5d7f336b786ddbc868470e822aa25", size = 2032715, upload-time = "2025-07-27T21:23:28.603Z" }, + { url = "https://files.pythonhosted.org/packages/a2/77/a122971c23f5ca4b53e4322c647ac7554626c95978f92d19419315dddd05/cramjam-2.11.0-cp314-cp314-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:54c4637122e7cfd7aac5c1d3d4c02364f446d6923ea34cf9d0e8816d6e7a4936", size = 2069039, upload-time = "2025-07-27T21:23:30.319Z" }, + { url = "https://files.pythonhosted.org/packages/19/0f/f6121b90b86b9093c066889274d26a1de3f29969d45c2ed1ecbe2033cb78/cramjam-2.11.0-cp314-cp314-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:17eb39b1696179fb471eea2de958fa21f40a2cd8bf6b40d428312d5541e19dc4", size = 1979566, upload-time = "2025-07-27T21:23:32.002Z" }, + { url = "https://files.pythonhosted.org/packages/e0/a3/f95bc57fd7f4166ce6da816cfa917fb7df4bb80e669eb459d85586498414/cramjam-2.11.0-cp314-cp314-musllinux_1_1_aarch64.whl", hash = "sha256:36aa5a798aa34e11813a80425a30d8e052d8de4a28f27bfc0368cfc454d1b403", size = 2030905, upload-time = "2025-07-27T21:23:33.696Z" }, + { url = "https://files.pythonhosted.org/packages/fc/52/e429de4e8bc86ee65e090dae0f87f45abd271742c63fb2d03c522ffde28a/cramjam-2.11.0-cp314-cp314-musllinux_1_1_armv7l.whl", hash = "sha256:449fca52774dc0199545fbf11f5128933e5a6833946707885cf7be8018017839", size = 2155592, upload-time = "2025-07-27T21:23:35.375Z" }, + { url = "https://files.pythonhosted.org/packages/6c/6c/65a7a0207787ad39ad804af4da7f06a60149de19481d73d270b540657234/cramjam-2.11.0-cp314-cp314-musllinux_1_1_i686.whl", hash = "sha256:d87d37b3d476f4f7623c56a232045d25bd9b988314702ea01bd9b4a94948a778", size = 2170839, upload-time = "2025-07-27T21:23:37.197Z" }, + { url = "https://files.pythonhosted.org/packages/b2/c5/5c5db505ba692bc844246b066e23901d5905a32baf2f33719c620e65887f/cramjam-2.11.0-cp314-cp314-musllinux_1_1_x86_64.whl", hash = "sha256:26cb45c47d71982d76282e303931c6dd4baee1753e5d48f9a89b3a63e690b3a3", size = 2157236, upload-time = "2025-07-27T21:23:38.854Z" }, + { url = "https://files.pythonhosted.org/packages/b0/22/88e6693e60afe98901e5bbe91b8dea193e3aa7f42e2770f9c3339f5c1065/cramjam-2.11.0-cp314-cp314-win32.whl", hash = "sha256:4efe919d443c2fd112fe25fe636a52f9628250c9a50d9bddb0488d8a6c09acc6", size = 1604136, upload-time = "2025-07-27T21:23:40.56Z" }, + { url = "https://files.pythonhosted.org/packages/cc/f8/01618801cd59ccedcc99f0f96d20be67d8cfc3497da9ccaaad6b481781dd/cramjam-2.11.0-cp314-cp314-win_amd64.whl", hash = "sha256:ccec3524ea41b9abd5600e3e27001fd774199dbb4f7b9cb248fcee37d4bda84c", size = 1710272, upload-time = "2025-07-27T21:23:42.236Z" }, + { url = "https://files.pythonhosted.org/packages/40/81/6cdb3ed222d13ae86bda77aafe8d50566e81a1169d49ed195b6263610704/cramjam-2.11.0-cp314-cp314t-macosx_10_12_x86_64.macosx_11_0_arm64.macosx_10_12_universal2.whl", hash = "sha256:966ac9358b23d21ecd895c418c048e806fd254e46d09b1ff0cdad2eba195ea3e", size = 3559671, upload-time = "2025-07-27T21:23:44.504Z" }, + { url = "https://files.pythonhosted.org/packages/cb/43/52b7e54fe5ba1ef0270d9fdc43dabd7971f70ea2d7179be918c997820247/cramjam-2.11.0-cp314-cp314t-macosx_10_12_x86_64.whl", hash = "sha256:387f09d647a0d38dcb4539f8a14281f8eb6bb1d3e023471eb18a5974b2121c86", size = 1867876, upload-time = "2025-07-27T21:23:46.987Z" }, + { url = "https://files.pythonhosted.org/packages/9d/28/30d5b8d10acd30db3193bc562a313bff722888eaa45cfe32aa09389f2b24/cramjam-2.11.0-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:665b0d8fbbb1a7f300265b43926457ec78385200133e41fef19d85790fc1e800", size = 1695562, upload-time = "2025-07-27T21:23:48.644Z" }, + { url = "https://files.pythonhosted.org/packages/d9/86/ec806f986e01b896a650655024ea52a13e25c3ac8a3a382f493089483cdc/cramjam-2.11.0-cp314-cp314t-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:ca905387c7a371531b9622d93471be4d745ef715f2890c3702479cd4fc85aa51", size = 2025056, upload-time = "2025-07-27T21:23:50.404Z" }, + { url = "https://files.pythonhosted.org/packages/09/43/c2c17586b90848d29d63181f7d14b8bd3a7d00975ad46e3edf2af8af7e1f/cramjam-2.11.0-cp314-cp314t-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3c1aa56aef2c8af55a21ed39040a94a12b53fb23beea290f94d19a76027e2ffb", size = 1764084, upload-time = "2025-07-27T21:23:52.265Z" }, + { url = "https://files.pythonhosted.org/packages/2b/a9/68bc334fadb434a61df10071dc8606702aa4f5b6cdb2df62474fc21d2845/cramjam-2.11.0-cp314-cp314t-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:e5db59c1cdfaa2ab85cc988e602d6919495f735ca8a5fd7603608eb1e23c26d5", size = 1854859, upload-time = "2025-07-27T21:23:54.085Z" }, + { url = "https://files.pythonhosted.org/packages/5b/4e/b48e67835b5811ec5e9cb2e2bcba9c3fd76dab3e732569fe801b542c6ca9/cramjam-2.11.0-cp314-cp314t-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:b1f893014f00fe5e89a660a032e813bf9f6d91de74cd1490cdb13b2b59d0c9a3", size = 2035970, upload-time = "2025-07-27T21:23:55.758Z" }, + { url = "https://files.pythonhosted.org/packages/c4/70/d2ac33d572b4d90f7f0f2c8a1d60fb48f06b128fdc2c05f9b49891bb0279/cramjam-2.11.0-cp314-cp314t-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c26a1eb487947010f5de24943bd7c422dad955b2b0f8650762539778c380ca89", size = 2069320, upload-time = "2025-07-27T21:23:57.494Z" }, + { url = "https://files.pythonhosted.org/packages/1d/4c/85cec77af4a74308ba5fca8e296c4e2f80ec465c537afc7ab1e0ca2f9a00/cramjam-2.11.0-cp314-cp314t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7d5c8bfb438d94e7b892d1426da5fc4b4a5370cc360df9b8d9d77c33b896c37e", size = 1982668, upload-time = "2025-07-27T21:23:59.126Z" }, + { url = "https://files.pythonhosted.org/packages/55/45/938546d1629e008cc3138df7c424ef892719b1796ff408a2ab8550032e5e/cramjam-2.11.0-cp314-cp314t-musllinux_1_1_aarch64.whl", hash = "sha256:cb1fb8c9337ab0da25a01c05d69a0463209c347f16512ac43be5986f3d1ebaf4", size = 2034028, upload-time = "2025-07-27T21:24:00.865Z" }, + { url = "https://files.pythonhosted.org/packages/01/76/b5a53e20505555f1640e66dcf70394bcf51a1a3a072aa18ea35135a0f9ed/cramjam-2.11.0-cp314-cp314t-musllinux_1_1_armv7l.whl", hash = "sha256:1f6449f6de52dde3e2f1038284910c8765a397a25e2d05083870f3f5e7fc682c", size = 2155513, upload-time = "2025-07-27T21:24:02.92Z" }, + { url = "https://files.pythonhosted.org/packages/84/12/8d3f6ceefae81bbe45a347fdfa2219d9f3ac75ebc304f92cd5fcb4fbddc5/cramjam-2.11.0-cp314-cp314t-musllinux_1_1_i686.whl", hash = "sha256:382dec4f996be48ed9c6958d4e30c2b89435d7c2c4dbf32480b3b8886293dd65", size = 2170035, upload-time = "2025-07-27T21:24:04.558Z" }, + { url = "https://files.pythonhosted.org/packages/4b/85/3be6f0a1398f976070672be64f61895f8839857618a2d8cc0d3ab529d3dc/cramjam-2.11.0-cp314-cp314t-musllinux_1_1_x86_64.whl", hash = "sha256:d388bd5723732c3afe1dd1d181e4213cc4e1be210b080572e7d5749f6e955656", size = 2160229, upload-time = "2025-07-27T21:24:06.729Z" }, + { url = "https://files.pythonhosted.org/packages/57/5e/66cfc3635511b20014bbb3f2ecf0095efb3049e9e96a4a9e478e4f3d7b78/cramjam-2.11.0-cp314-cp314t-win32.whl", hash = "sha256:0a70ff17f8e1d13f322df616505550f0f4c39eda62290acb56f069d4857037c8", size = 1610267, upload-time = "2025-07-27T21:24:08.428Z" }, + { url = "https://files.pythonhosted.org/packages/ce/c6/c71e82e041c95ffe6a92ac707785500aa2a515a4339c2c7dd67e3c449249/cramjam-2.11.0-cp314-cp314t-win_amd64.whl", hash = "sha256:028400d699442d40dbda02f74158c73d05cb76587a12490d0bfedd958fd49188", size = 1713108, upload-time = "2025-07-27T21:24:10.147Z" }, + { url = "https://files.pythonhosted.org/packages/81/da/b3301962ccd6fce9fefa1ecd8ea479edaeaa38fadb1f34d5391d2587216a/cramjam-2.11.0-pp311-pypy311_pp73-macosx_10_12_x86_64.macosx_11_0_arm64.macosx_10_12_universal2.whl", hash = "sha256:52d5db3369f95b27b9f3c14d067acb0b183333613363ed34268c9e04560f997f", size = 3573546, upload-time = "2025-07-27T21:24:52.944Z" }, + { url = "https://files.pythonhosted.org/packages/b6/c2/410ddb8ad4b9dfb129284666293cb6559479645da560f7077dc19d6bee9e/cramjam-2.11.0-pp311-pypy311_pp73-macosx_10_12_x86_64.whl", hash = "sha256:4820516366d455b549a44d0e2210ee7c4575882dda677564ce79092588321d54", size = 1873654, upload-time = "2025-07-27T21:24:54.958Z" }, + { url = "https://files.pythonhosted.org/packages/d5/99/f68a443c64f7ce7aff5bed369b0aa5b2fac668fa3dfd441837e316e97a1f/cramjam-2.11.0-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:d9e5db525dc0a950a825202f84ee68d89a072479e07da98795a3469df942d301", size = 1702846, upload-time = "2025-07-27T21:24:57.124Z" }, + { url = "https://files.pythonhosted.org/packages/6c/02/0ff358ab773def1ee3383587906c453d289953171e9c92db84fdd01bf172/cramjam-2.11.0-pp311-pypy311_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:62ab4971199b2270005359cdc379bc5736071dc7c9a228581c5122d9ffaac50c", size = 1773683, upload-time = "2025-07-27T21:24:59.28Z" }, + { url = "https://files.pythonhosted.org/packages/e9/31/3298e15f87c9cf2aabdbdd90b153d8644cf989cb42a45d68a1b71e1f7aaf/cramjam-2.11.0-pp311-pypy311_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:24758375cc5414d3035ca967ebb800e8f24604ececcba3c67d6f0218201ebf2d", size = 1994136, upload-time = "2025-07-27T21:25:01.565Z" }, + { url = "https://files.pythonhosted.org/packages/c7/90/20d1747255f1ee69a412e319da51ea594c18cca195e7a4d4c713f045eff5/cramjam-2.11.0-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:6c2eea545fef1065c7dd4eda991666fd9c783fbc1d226592ccca8d8891c02f23", size = 1714982, upload-time = "2025-07-27T21:25:05.79Z" }, +] + +[[package]] +name = "crontab" +version = "1.0.5" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/d6/36/a255b6f5a2e22df03fd2b2f3088974b44b8c9e9407e26b44742cb7cfbf5b/crontab-1.0.5.tar.gz", hash = "sha256:f80e01b4f07219763a9869f926dd17147278e7965a928089bca6d3dc80ae46d5", size = 21963, upload-time = "2025-07-09T17:09:38.264Z" } + +[[package]] +name = "cryptography" +version = "49.0.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "cffi", marker = "platform_python_implementation != 'PyPy'" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/1f/99/d1c90d6041656cc6ee229dc99cd67fd0cd5aec3c5f7d72fffc27cc750054/cryptography-49.0.0.tar.gz", hash = "sha256:f89660a348f4f78a92366240a61404e337586ef7f5909a2fef59ca88ef505493", size = 854345, upload-time = "2026-06-12T20:02:30.512Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/9b/22/adf66990e63584a68dfb50c24f48a125c07b1699899381c8151e63ed458c/cryptography-49.0.0-cp311-abi3-macosx_11_0_arm64.whl", hash = "sha256:966fe0e9c67490071f14c0d2b1cb2dfb3023c5ce39457343931415f08382f2db", size = 4032100, upload-time = "2026-06-12T20:02:32.143Z" }, + { url = "https://files.pythonhosted.org/packages/09/41/3797cfaf69cae04a13ee78ebd83f0678d9c02b4779d21ce24445326f1a69/cryptography-49.0.0-cp311-abi3-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:36d1709f992593689b45bda411498d62c6e365f2ca00b84657d4dadd24de16db", size = 4692978, upload-time = "2026-06-12T20:01:21.305Z" }, + { url = "https://files.pythonhosted.org/packages/e6/8b/43011f7ebe515a8aa20d61f290a326cd890c2e738e16e59eaff8d9c3a412/cryptography-49.0.0-cp311-abi3-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:0e959b578856a3924bc0cbb710fc12c387b9412a951389f3ca61704a9e25f325", size = 4716422, upload-time = "2026-06-12T20:01:48.566Z" }, + { url = "https://files.pythonhosted.org/packages/4a/91/01ce7303a4579e6d3a6abef01bd322848e9ea7a219adcabc5048b9033571/cryptography-49.0.0-cp311-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:53ecee2e23f7169b6117e99fc8a944e5e50f79e69758a83b52a00cb98ab2b2d2", size = 4700503, upload-time = "2026-06-12T20:02:47.091Z" }, + { url = "https://files.pythonhosted.org/packages/62/99/a2c95cf8293f07491e9e27c20cc4dcd18176d944e674679adeb1d0173fd6/cryptography-49.0.0-cp311-abi3-manylinux_2_28_ppc64le.whl", hash = "sha256:2eda353d8a27bcbcaa4cbed18994a74ab4d19a2ca897db188ea269ab9b71419b", size = 5309779, upload-time = "2026-06-12T20:02:08.987Z" }, + { url = "https://files.pythonhosted.org/packages/20/2c/0622f20ff02b2ef32558733443805dc82fd4c275be01b2d19d14676f3a1b/cryptography-49.0.0-cp311-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:2afe9051da7ae7bd5905da5a949280c7d2bb75682e188f650a9d0f2756b834c6", size = 4749683, upload-time = "2026-06-12T20:02:03.335Z" }, + { url = "https://files.pythonhosted.org/packages/a3/5b/c5246635d5fd3b64e0d45ae10e99fd32fe9676a79915ccfe5a61ba9af1a5/cryptography-49.0.0-cp311-abi3-manylinux_2_31_armv7l.whl", hash = "sha256:0b82e28ee398a386f0807bba7884d30f25218855690f45115831bcce5d90822c", size = 4337874, upload-time = "2026-06-12T20:02:54.323Z" }, + { url = "https://files.pythonhosted.org/packages/6d/88/05563c7fe2e914e87d1a536d06fe83e66b4e1d95cb593e05aea375531da8/cryptography-49.0.0-cp311-abi3-manylinux_2_34_aarch64.whl", hash = "sha256:ccac2bfebc306b862133e3bb71f3f6ee8bb525240089b2d952e4144b3a6d5da7", size = 4700283, upload-time = "2026-06-12T20:01:34.822Z" }, + { url = "https://files.pythonhosted.org/packages/c4/b6/d7696e4e890d6ae1469935164c9e5215c557671cb78d6e3f458ccceaa632/cryptography-49.0.0-cp311-abi3-manylinux_2_34_ppc64le.whl", hash = "sha256:d0527ce944105f257f605a827d6ebead966c752038b6e8656abb9c5edee6fc68", size = 5265844, upload-time = "2026-06-12T20:01:24.09Z" }, + { url = "https://files.pythonhosted.org/packages/a9/3c/f3ad17eecc1a57b0ba236dc01f90e783c51f4a2f35f64777cc4f47a184b2/cryptography-49.0.0-cp311-abi3-manylinux_2_34_x86_64.whl", hash = "sha256:cbc77da8c523d5abd028635ba850a6966fcee2c82e2bf65a41d1d8afe0f98be9", size = 4749290, upload-time = "2026-06-12T20:01:30.848Z" }, + { url = "https://files.pythonhosted.org/packages/4f/01/339573cf1023163a400b0b5d16f6d507de413b9f60be6fd1b77feeaf6737/cryptography-49.0.0-cp311-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:b87e65d263b3e5d3bb92a57e2a6638e2f31110fa7aa890c7b2dbba42248d0a3f", size = 4834612, upload-time = "2026-06-12T20:01:29.246Z" }, + { url = "https://files.pythonhosted.org/packages/71/fd/577302e213a1be9468f92d1afef66fcf1ef83d516819d9992ca547f592bd/cryptography-49.0.0-cp311-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:66ec79c3904820572d7e987abdf304281f141d37ad9a489b8e97066e7b9b6459", size = 4980804, upload-time = "2026-06-12T20:01:42.853Z" }, + { url = "https://files.pythonhosted.org/packages/1f/09/f42b1d190c5ba75f72062a387f8030d1d75f6ab035788f1d9c4b01de6525/cryptography-49.0.0-cp311-abi3-win_amd64.whl", hash = "sha256:e5dfc1e64de5677cec922ffa8da89c546d0415bf6efdf081842e5d44c84e1f0e", size = 3810026, upload-time = "2026-06-12T20:02:39.262Z" }, + { url = "https://files.pythonhosted.org/packages/ec/9e/db72b3ae7fc9cfad53e630e56c6ae83b9b6ff0bf3718ffb8012d20b3aabf/cryptography-49.0.0-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:73a205dce83953d131a4aa1e0fd917a2fd1c5b1eef251e9d7152efefcbf5caf7", size = 4013892, upload-time = "2026-06-12T20:02:10.735Z" }, + { url = "https://files.pythonhosted.org/packages/86/12/c48a424f38db03027be9f7ed5c7dc5de9933dbee992865f98b13727a009d/cryptography-49.0.0-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:196ecd6a36e4e9aa10270393bb98d8df88fccee0bf1e5128b91ae4eb4375896d", size = 4678835, upload-time = "2026-06-12T20:02:48.743Z" }, + { url = "https://files.pythonhosted.org/packages/68/28/8a3ad4653662c93fc44dc4e5d8fd374c25c42e07b34bbfbadf49cf57a5a8/cryptography-49.0.0-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:7abcee80084cda3f7691f3eb1ce480d8df49cec637b429aa35986c1de71738aa", size = 4697239, upload-time = "2026-06-12T20:02:56.03Z" }, + { url = "https://files.pythonhosted.org/packages/a8/b2/2193fc74f81aee4f9b62733133b73b5176718932ed8f2e4b03fa040480a6/cryptography-49.0.0-cp314-cp314t-manylinux_2_28_aarch64.whl", hash = "sha256:4ae387c9cb68ea569ca17e490d66d8142b81c3cc814bf179974b7d146e490bbb", size = 4685593, upload-time = "2026-06-12T20:02:50.666Z" }, + { url = "https://files.pythonhosted.org/packages/47/f1/1d3eaa243bfc5de4a187b22aa8c048b3e4980bfbe830ac46e6bac2e66947/cryptography-49.0.0-cp314-cp314t-manylinux_2_28_ppc64le.whl", hash = "sha256:f37d847238971164fdbc68ade6f6574aecc9c0af714190e2083429ff68f4ce9d", size = 5289961, upload-time = "2026-06-12T20:01:46.468Z" }, + { url = "https://files.pythonhosted.org/packages/58/39/2d51306721330c486495853eda1c567880ff036de15a14c4b74f399934af/cryptography-49.0.0-cp314-cp314t-manylinux_2_28_x86_64.whl", hash = "sha256:c2bc30226390d60ea19d9f82b19db005fe0452154a23c1c410c12ea801e43561", size = 4731145, upload-time = "2026-06-12T20:02:16.832Z" }, + { url = "https://files.pythonhosted.org/packages/17/50/983e838c7fd0d87fd8c969bcdd328edaf5f756e38df5281637424c155873/cryptography-49.0.0-cp314-cp314t-manylinux_2_31_armv7l.whl", hash = "sha256:07cab27cc7b7e0fd28e5e26bb9eeedde5c135c868b46de4a27845abe94af6122", size = 4321719, upload-time = "2026-06-12T20:02:52.611Z" }, + { url = "https://files.pythonhosted.org/packages/a7/f5/8f571d7e27c55bce9f76f026143bcb1e040a4233149ecca0bea5fa5dd5f7/cryptography-49.0.0-cp314-cp314t-manylinux_2_34_aarch64.whl", hash = "sha256:b20133d204d2bb56ba047642199603876c872026ca53e79c35b83772ab2cc505", size = 4685209, upload-time = "2026-06-12T20:02:07.282Z" }, + { url = "https://files.pythonhosted.org/packages/e7/84/0e27016a6fc5a0886f797018b26aa42f40c09a82332bff77822a451deaaa/cryptography-49.0.0-cp314-cp314t-manylinux_2_34_ppc64le.whl", hash = "sha256:b970c6da94d5bb18629db453d14f2a1300f6bf59b61e9b82377931ef95504866", size = 5246285, upload-time = "2026-06-12T20:01:32.439Z" }, + { url = "https://files.pythonhosted.org/packages/11/2d/5e1fb307cb5931881516b464c98774b3f2c36b5d4bb9a2830253cf553cad/cryptography-49.0.0-cp314-cp314t-manylinux_2_34_x86_64.whl", hash = "sha256:d8ecde755e2e91bf773fc94e8c9d730cd7f2007004cb492263a794ec3899a1c8", size = 4730441, upload-time = "2026-06-12T20:02:01.469Z" }, + { url = "https://files.pythonhosted.org/packages/e4/c0/bff5a02ee731d207d6a1ed51732549d8c53d2bc8da1d10ec6f2844201d68/cryptography-49.0.0-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:e3fb64c420688e5319ae25113a354015abbd8dffbfbc41781a1ea66fc7622ac3", size = 4815869, upload-time = "2026-06-12T20:01:36.574Z" }, + { url = "https://files.pythonhosted.org/packages/b9/26/814681d14248d95d73d5c3eea0c39a94eb8302df966f670a2c60de90974b/cryptography-49.0.0-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:32703d93296f5c1f4b53349ad3a250c2cae0fdecd3a3dd5d47e616d8d616af27", size = 4960948, upload-time = "2026-06-12T20:02:18.688Z" }, + { url = "https://files.pythonhosted.org/packages/4c/fe/93ecac273d3738939d023612ad12cca9a3740a5345d69fda04134c43fd96/cryptography-49.0.0-cp314-cp314t-win_amd64.whl", hash = "sha256:33cd0565932807baddb67b96dbee92f2c374b5c89dee09fd74079aeb8c8dba61", size = 3799153, upload-time = "2026-06-12T20:01:39.059Z" }, + { url = "https://files.pythonhosted.org/packages/19/2a/5bb823f5bedcf80718cea7fbc95ec5515cca3769633c4b01a32be7f30e7c/cryptography-49.0.0-cp39-abi3-macosx_11_0_arm64.whl", hash = "sha256:ec5e529fb80935c94fe7b729f9972b50e351a0e6b50aa294fd5cabb109fcc29a", size = 4025947, upload-time = "2026-06-12T20:01:25.745Z" }, + { url = "https://files.pythonhosted.org/packages/3d/df/40577043ca124e17012f408ddddaeb213b856336ac82ddb3bc915f39e29f/cryptography-49.0.0-cp39-abi3-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:f78ff2c9ed8dc2d036b0f4d640e22522213d047c1b14e61205a7e55c80a494d4", size = 4692429, upload-time = "2026-06-12T20:01:53.628Z" }, + { url = "https://files.pythonhosted.org/packages/2c/99/2d13299eb3dd27b02dcfaafcc91d6b5cb3329f7cbd6d8f51921acd566c1a/cryptography-49.0.0-cp39-abi3-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:35b151772baff2c74cba7fa290ceaff4c3b11c0c881eb93eb5dbc05a7cfbba18", size = 4700968, upload-time = "2026-06-12T20:02:45.383Z" }, + { url = "https://files.pythonhosted.org/packages/a5/4d/9c0cd02f95e2602dd5e563da149ee0830abef3537be8b34dc56281ebe27a/cryptography-49.0.0-cp39-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:0f21641cf4b30fca7aee061ced0ec7ad7b073518088b7c9969a297c0ae796c69", size = 4697758, upload-time = "2026-06-12T20:01:41.13Z" }, + { url = "https://files.pythonhosted.org/packages/24/01/186c825898477d77e2324d5360fefe622ff1d8d1963ec0554e2cada8ec77/cryptography-49.0.0-cp39-abi3-manylinux_2_28_ppc64le.whl", hash = "sha256:9e82dcc8e56052715fb18b2429e3bca4823b1629136a2084fc45a9a5cecb9b64", size = 5298863, upload-time = "2026-06-12T20:02:24.579Z" }, + { url = "https://files.pythonhosted.org/packages/b8/7b/62cbbab75d0659865bf0273790031544a0b16c8072d258f9428dcd8190dc/cryptography-49.0.0-cp39-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:6f2debedf9ca60cf1d5bd466475638af5130f89965605cd818484d19987d3a21", size = 4735983, upload-time = "2026-06-12T20:01:50.14Z" }, + { url = "https://files.pythonhosted.org/packages/6c/72/3e798c064bc39e471008075d0f9bc9daf77a80879c092e4a8e170c585ed4/cryptography-49.0.0-cp39-abi3-manylinux_2_31_armv7l.whl", hash = "sha256:8c25ceb16df5b9435f3f6a9829204985b0e0cbee3b48aacd432c7d2c850b44d9", size = 4334173, upload-time = "2026-06-12T20:01:44.743Z" }, + { url = "https://files.pythonhosted.org/packages/f0/ee/6fca21d1ac73e06f8bef71940abfd4d2f6472b4bca284d770f32bd4086f6/cryptography-49.0.0-cp39-abi3-manylinux_2_34_aarch64.whl", hash = "sha256:28d8b15e6275f12c8a207dc309dfa957903c927d08d0cc937ee3f63f200693cc", size = 4697298, upload-time = "2026-06-12T20:02:20.918Z" }, + { url = "https://files.pythonhosted.org/packages/67/d0/a5fcd3515f0bae49a7b6d0413cc1bdccdcc1fc0047037a0d480642cdc5d6/cryptography-49.0.0-cp39-abi3-manylinux_2_34_ppc64le.whl", hash = "sha256:6fc361c34fb6aac015ce19435876635e5c6d21db31998b0920f675f131e043b8", size = 5254338, upload-time = "2026-06-12T20:02:22.737Z" }, + { url = "https://files.pythonhosted.org/packages/a0/84/84fe36f19caf857d61cb7fc9c63035a47ffabd84ea12d1d393148efa3615/cryptography-49.0.0-cp39-abi3-manylinux_2_34_x86_64.whl", hash = "sha256:2400ef9c9e2299a25614eb1dea3db54a69b1349efd043bfac9c67630d136df36", size = 4735650, upload-time = "2026-06-12T20:02:41.389Z" }, + { url = "https://files.pythonhosted.org/packages/6c/a0/db537264e234f7273a73ec020873d6d6b39dfd8a53db78b550ca8320440e/cryptography-49.0.0-cp39-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:67e1d20ad9ef3a563c59ef22e7a8a0b8210bd26604369ea4a30a7c66aefe504e", size = 4834820, upload-time = "2026-06-12T20:01:51.847Z" }, + { url = "https://files.pythonhosted.org/packages/93/77/8df9eb486495979bccecd1062e2eaf435250e84437040295b57d09048b0b/cryptography-49.0.0-cp39-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:42b0684e0e40cf26122427802486f6d93aea593612603a94fbf260c7eb1e9c1b", size = 4967968, upload-time = "2026-06-12T20:02:12.524Z" }, + { url = "https://files.pythonhosted.org/packages/c2/e6/f60198ea8d9dfa15fff9ed4ca02ce362f6eadd9ba757dcc50634c4257b63/cryptography-49.0.0-cp39-abi3-win_amd64.whl", hash = "sha256:026ac7423e6fa66872d3bf889be5974507da3944f866f704fa200eadacd00001", size = 3785547, upload-time = "2026-06-12T20:02:26.847Z" }, + { url = "https://files.pythonhosted.org/packages/63/d3/4a83af35d65e3fad632c926fad684c193ea4398569ccb0bbbc7fe8f5dc9a/cryptography-49.0.0-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:fc1e275c2f1d97b1a6450b8b0ea3ebfa6e087a611c2b26cb2404d48588abab7b", size = 3993685, upload-time = "2026-06-12T20:02:14.883Z" }, + { url = "https://files.pythonhosted.org/packages/d6/a7/f9dac0ab7f80368c56993a7bf638ef9935f825c91902798481fac0898138/cryptography-49.0.0-pp311-pypy311_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:c83782480a4a9da4d0feb51950131ba32e12e70813848b3343f6e18c28a66838", size = 4676239, upload-time = "2026-06-12T20:02:28.793Z" }, + { url = "https://files.pythonhosted.org/packages/d7/70/2ba3769dd0ae167e2f33dfa9592d45db6ff9a61d62ca1a5b3d1bdd09068f/cryptography-49.0.0-pp311-pypy311_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:b39efa323140595abd3ecca8529d321ae50f55f3aa3ba9cc81ea56a6011953d5", size = 4715584, upload-time = "2026-06-12T20:01:27.495Z" }, + { url = "https://files.pythonhosted.org/packages/94/64/2923570ac1c0bd3a737aa366ac3abbbbde273042308b8cde95e2364a6e6a/cryptography-49.0.0-pp311-pypy311_pp73-manylinux_2_34_aarch64.whl", hash = "sha256:b47db11c2c3525083296069b98ac5221907455e989ae0c2e3008bde851921615", size = 4675885, upload-time = "2026-06-12T20:01:55.49Z" }, + { url = "https://files.pythonhosted.org/packages/ab/f8/614dc7e051418cfe53d55173c1e24c6b0085e89996fe90508c2fdf769aef/cryptography-49.0.0-pp311-pypy311_pp73-manylinux_2_34_x86_64.whl", hash = "sha256:084ef1af862eb07ec46d25f68689f2102a9fc0e05ce7b80f14f5fe51e4eef0f6", size = 4715449, upload-time = "2026-06-12T20:02:05.469Z" }, + { url = "https://files.pythonhosted.org/packages/aa/50/a9caea39ad19c431c1a3f8a31114df65b260cdfe67786b6c7e7c040c4c44/cryptography-49.0.0-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:be9fcb48a55f023493482827d4f459bd263cc20efde64f204b97c123201850c6", size = 3783731, upload-time = "2026-06-12T20:02:43.319Z" }, +] + +[[package]] +name = "css-html-js-minify" +version = "2.5.5" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/75/61/f52e5225abe8e36ed5396e5ae3074df5f4ef994b540e9b4fd55a39b03cfd/css-html-js-minify-2.5.5.zip", hash = "sha256:4a9f11f7e0496f5284d12111f3ba4ff5ff2023d12f15d195c9c48bd97013746c", size = 33156, upload-time = "2018-04-14T15:10:29.53Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/e8/21/1260081a2c67105a3bd0f8692ff3c80b5f0cb5fe9f3f8fd4a990f17b8a39/css_html_js_minify-2.5.5-py2.py3-none-any.whl", hash = "sha256:3da9d35ac0db8ca648c1b543e0e801d7ca0bab9e6bfd8418fee59d5ae001727a", size = 40527, upload-time = "2018-04-14T15:10:26.667Z" }, +] + +[[package]] +name = "cycler" +version = "0.12.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/a9/95/a3dbbb5028f35eafb79008e7522a75244477d2838f38cbb722248dabc2a8/cycler-0.12.1.tar.gz", hash = "sha256:88bb128f02ba341da8ef447245a9e138fae777f6a23943da4540077d3601eb1c", size = 7615, upload-time = "2023-10-07T05:32:18.335Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/e7/05/c19819d5e3d95294a6f5947fb9b9629efb316b96de511b418c53d245aae6/cycler-0.12.1-py3-none-any.whl", hash = "sha256:85cef7cff222d8644161529808465972e51340599459b8ac3ccbac5a854e0d30", size = 8321, upload-time = "2023-10-07T05:32:16.783Z" }, +] + +[[package]] +name = "dateparser" +version = "1.4.1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "python-dateutil" }, + { name = "pytz" }, + { name = "regex" }, + { name = "tzlocal" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/d3/f4/561c49bca97af561d34eed27e3e831135eb5cb88e754c1150be41820f5c6/dateparser-1.4.1.tar.gz", hash = "sha256:f265df13c0380e2e07543ba74b67c0681aaa1096981ffcd35227e1aa0cb81c7c", size = 314734, upload-time = "2026-06-15T08:45:47.659Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/8b/7c/2e5dcf53909deddd0bf38cbe277ad9806be038276b1c6c436561b4d9b2e2/dateparser-1.4.1-py3-none-any.whl", hash = "sha256:f25d4e051a84be27a35bd297e3e1dc59ff78373701b89be352ba80372d22d0d0", size = 300503, upload-time = "2026-06-15T08:45:45.951Z" }, +] + +[[package]] +name = "ddtrace" +version = "4.3.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "bytecode" }, + { name = "envier" }, + { name = "opentelemetry-api" }, + { name = "wrapt" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/bc/d0/0690d1b88b936ab31219ca9078859316185989be0d186ff33896f3191d39/ddtrace-4.3.0.tar.gz", hash = "sha256:366bc941a20137e6f5bff22aefd6a221ca15f1b087c31bf28fce448619f443b4", size = 7085760, upload-time = "2026-01-27T20:55:27.878Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/62/92/a4335be1b8ccebca11c2fc30dbd38e7c31f20025ac5fa29c781fcf7e839f/ddtrace-4.3.0-cp311-cp311-macosx_14_0_arm64.whl", hash = "sha256:c41f5598ec26fc75a12f88131f14cf8728fbef3a5077ab3092b66f65a56f0cfd", size = 6646276, upload-time = "2026-01-27T20:53:26.621Z" }, + { url = "https://files.pythonhosted.org/packages/79/04/c82807bfe651fb2fe04cb3a097a8988638a8ffe31f38a34f7a9cdd8ed227/ddtrace-4.3.0-cp311-cp311-macosx_14_0_x86_64.whl", hash = "sha256:0971a52d0474a1a5c417aa628ccb81a3f530acc7b054cd2040740bc200193068", size = 7046186, upload-time = "2026-01-27T20:53:28.498Z" }, + { url = "https://files.pythonhosted.org/packages/fc/d6/5091e3dcb0e3b15f11165faab3c0cfff91d1fe69b1adf34843246e04c891/ddtrace-4.3.0-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:2a5e2903d6634adf685939ca7ede2aa900a1315911f14e3081399e3dcad32b15", size = 7728637, upload-time = "2026-01-27T20:53:30.407Z" }, + { url = "https://files.pythonhosted.org/packages/d6/e0/c5438aca0281bd511260d55d361fca9904d988896baee2e09eb456ca3c42/ddtrace-4.3.0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:ce7adf94dc12edff5ddecd9a0ec751f99148578798142bb228f7b3713505d1f7", size = 8008249, upload-time = "2026-01-27T20:53:32.623Z" }, + { url = "https://files.pythonhosted.org/packages/0a/49/aa3452696bed00632ca9dd4a99bf1fca9342c0a386b2ff4e3fbc683cd9f6/ddtrace-4.3.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:6bb56dfda0b69e324d8b90efdff6b506cd86cadbb336d7e265deb11886eb1322", size = 8736182, upload-time = "2026-01-27T20:53:35.08Z" }, + { url = "https://files.pythonhosted.org/packages/48/bf/7d1da3d02b7ff0d10fea86494a60cc0720e33d4f1a85e5fa1274e9b03a64/ddtrace-4.3.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:a9ba79cb934286d43ad4314269af5c63057d63aadcf1a9d201feb2a02077e98c", size = 9066094, upload-time = "2026-01-27T20:53:37.646Z" }, + { url = "https://files.pythonhosted.org/packages/df/81/e814aedec968a43c6408054eef53b5a5d2ff54d80db2199b60478aa671d9/ddtrace-4.3.0-cp311-cp311-win32.whl", hash = "sha256:557775da26e9cb3d4b5e742028a566a6910f85cfc23b111d265e44358dd32860", size = 5114320, upload-time = "2026-01-27T20:53:39.924Z" }, + { url = "https://files.pythonhosted.org/packages/a3/7d/c891543ff0f581e6ae63a5c12b9b521ee2485ff9837a7bbe5aa13e534f9c/ddtrace-4.3.0-cp311-cp311-win_amd64.whl", hash = "sha256:456cc48ac86736452a803f914ebe7f73e32504c2490ef0ae4973e84b6a9571fc", size = 5652238, upload-time = "2026-01-27T20:53:42.351Z" }, + { url = "https://files.pythonhosted.org/packages/66/cb/71f7f34a63ebbfb86fd7511d900d2b4f3b94e4d1a6fb81b2e0f41e84918b/ddtrace-4.3.0-cp311-cp311-win_arm64.whl", hash = "sha256:f7d606f5510ef0ffcc1d42ecc5ecb8700060d6e456148d46d079b47e7f55f863", size = 5368001, upload-time = "2026-01-27T20:53:44.443Z" }, + { url = "https://files.pythonhosted.org/packages/65/21/7ad3a13b5cb21b951d399995e587c04ae72bd7e09741a535221b31aa943a/ddtrace-4.3.0-cp312-cp312-macosx_14_0_arm64.whl", hash = "sha256:ef5ae88f516654b37fcc8fc7154ffa9d1e8eb8b3be6d6f08f87f681e35937ef7", size = 6903861, upload-time = "2026-01-27T20:53:46.975Z" }, + { url = "https://files.pythonhosted.org/packages/fa/f2/837756c6ca7f45a6e7f9bcea31ae31df8707604a7aec09b4fec810abf01b/ddtrace-4.3.0-cp312-cp312-macosx_14_0_x86_64.whl", hash = "sha256:7c4ca32b1a92a1ef116711e20bbd1cdf65056be9a64585fc41354dacf4c7ca33", size = 7327605, upload-time = "2026-01-27T20:53:49.077Z" }, + { url = "https://files.pythonhosted.org/packages/c8/8f/01a89d5e5495fd804af898e6d7d867dd7345fc6303c4e78e556a8345f34a/ddtrace-4.3.0-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:feaf7921c3795ae1dd0f12640d3f8ec5f9ac19697b55a54876e90ec4330c628a", size = 7722066, upload-time = "2026-01-27T20:53:51.752Z" }, + { url = "https://files.pythonhosted.org/packages/a6/21/4999eebbbfd3d36edaeaafa270b8f3cf592417d92a5ea7b752e61af4b869/ddtrace-4.3.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:0b527de8ff70105909e2d99dd81374162158a280f562dea244a1c36939ea0d8a", size = 8009324, upload-time = "2026-01-27T20:53:53.968Z" }, + { url = "https://files.pythonhosted.org/packages/8d/f8/b4c2c844912c9ce54ec3d78efcc83186a39f80a9145d008fd7323eefea96/ddtrace-4.3.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:4c35c3b42cd304056c65d95f4b63a0580aa4ff29efb18965f7ed2fa3ad8e4374", size = 8733732, upload-time = "2026-01-27T20:53:56.607Z" }, + { url = "https://files.pythonhosted.org/packages/10/ec/0a756896dd47098178e96b43ce198b90def45ff5b94c4166bbb6b8795c60/ddtrace-4.3.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:9aa6e2014ad16a5a7c28cc0ff3eb4f4cd2396dc7d9e811db7f778b9d75a09268", size = 9073645, upload-time = "2026-01-27T20:53:59.498Z" }, + { url = "https://files.pythonhosted.org/packages/42/89/4bc918d8f5792d58e5eaa3c67fe18b22cfd9c5bc5eeb334c5c3c6d9e44b7/ddtrace-4.3.0-cp312-cp312-win32.whl", hash = "sha256:cd64c7cebcb58c32e5e8e6bfda11ba50b7f0e2c74d54ecdd8c945eaa2a92f6f8", size = 5110045, upload-time = "2026-01-27T20:54:01.898Z" }, + { url = "https://files.pythonhosted.org/packages/2c/9b/cfbb354d991b9be5fea026ad2fee918bb8da1ff649635e7de05e64458460/ddtrace-4.3.0-cp312-cp312-win_amd64.whl", hash = "sha256:4bf62878d3a0f20dc2645aff7698bbe8f57a6f39008279601f2af95f4f3d0ee4", size = 5645713, upload-time = "2026-01-27T20:54:04.305Z" }, + { url = "https://files.pythonhosted.org/packages/cb/f5/e44a66e21f0bb5ba3cdc34a22e244badc7ad92ef01e60410a22794b92ebf/ddtrace-4.3.0-cp312-cp312-win_arm64.whl", hash = "sha256:418ce112d1c85786e589ecd22a6f2dedf1ecb8efb21a703b18dfb5d2b6182a34", size = 5360067, upload-time = "2026-01-27T20:54:06.458Z" }, + { url = "https://files.pythonhosted.org/packages/bb/79/92140484e68bf202431b2644616c97e726180e396f2818889ce22d9ec7a7/ddtrace-4.3.0-cp313-cp313-macosx_14_0_arm64.whl", hash = "sha256:8c84bd599d661ed6424460e3c6111065c5a7c978d28f5d47cb06369ea58e6a07", size = 6639422, upload-time = "2026-01-27T20:54:09.134Z" }, + { url = "https://files.pythonhosted.org/packages/b9/c7/d95dbc4953ad5d4c1d424547e5df397098429bf0e147968e943d6e0f3623/ddtrace-4.3.0-cp313-cp313-macosx_14_0_x86_64.whl", hash = "sha256:e1a8227d354d044b737def7711c275085e9b765c4d93f84e522d93675e03c318", size = 7045829, upload-time = "2026-01-27T20:54:12.636Z" }, + { url = "https://files.pythonhosted.org/packages/23/3d/714a0875ade37153da0450b07a2bd0eb810ad0f2078c8876ea4af75881cf/ddtrace-4.3.0-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:c4cd4d89339adf4a9c114282d03f4db498b0092d56bee145ddb99033fb51be18", size = 7714579, upload-time = "2026-01-27T20:54:14.812Z" }, + { url = "https://files.pythonhosted.org/packages/2a/1c/f89d6c7de4640239618cae7df96c46099e5ba53168ce5641b40cd302092b/ddtrace-4.3.0-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:6c9ec118e2a41da593ec2d2f6365ba104aaf3b46296e0a4c30556aed26615ac5", size = 7998564, upload-time = "2026-01-27T20:54:18.854Z" }, + { url = "https://files.pythonhosted.org/packages/b7/43/f22586a3851b674c4e61cd630682fa47f5a724fb7686f87a415d93f355fd/ddtrace-4.3.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:aa168e581431a3b3ee9c04d76922cae2f3fdfb4520927add5a844e7e2ebb807e", size = 8729607, upload-time = "2026-01-27T20:54:21.319Z" }, + { url = "https://files.pythonhosted.org/packages/02/9d/b1a92066fc2668f715ca77292d73ae1554290edb5ffac710dbc84aa1777a/ddtrace-4.3.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:eed721dcd5cf1f4f4309a28efa5e1cb7d7da129fd51a3e093422fe064bd451f1", size = 9065926, upload-time = "2026-01-27T20:54:24.447Z" }, + { url = "https://files.pythonhosted.org/packages/72/92/6bf49559d2fe06589d7cc967085fc878ec652172a8d203ed22f8c6ab71e0/ddtrace-4.3.0-cp313-cp313-win32.whl", hash = "sha256:9917c49b33f32c524f74813cb03461c207324711b0a2d359e3a3822181cb5643", size = 5107720, upload-time = "2026-01-27T20:54:27.614Z" }, + { url = "https://files.pythonhosted.org/packages/2d/94/37a07b2576dfbbef5034e595be385ab325eebfd735e0eda80cf5ae0facd1/ddtrace-4.3.0-cp313-cp313-win_amd64.whl", hash = "sha256:ea86989b93af5d415ba1457d3c363a59665a907807a51072b43abf5901872078", size = 5643119, upload-time = "2026-01-27T20:54:31.537Z" }, + { url = "https://files.pythonhosted.org/packages/c6/1d/d4466708a5ace94a655f3af804c1a666bc05b6463c5892e561eca0497922/ddtrace-4.3.0-cp313-cp313-win_arm64.whl", hash = "sha256:e983bc15b5eabd9e25b02617702e8621c014c71dc123a117079d3ced29446433", size = 5357966, upload-time = "2026-01-27T20:54:35.411Z" }, + { url = "https://files.pythonhosted.org/packages/82/75/10b07479800a5a8947fd0e79001b009bded2a17ea5af96865d677eb91a98/ddtrace-4.3.0-cp314-cp314-macosx_14_0_arm64.whl", hash = "sha256:e26eb6de7eda425d75f5a1f55e55ad2d13e56f51b43c4b656478367a6692e0bd", size = 6904866, upload-time = "2026-01-27T20:54:38.633Z" }, + { url = "https://files.pythonhosted.org/packages/0e/b2/37f8cf8f57d17f350d2ab86ee814fc5b6c600d0ea2ee2ea8f96be1178cd0/ddtrace-4.3.0-cp314-cp314-macosx_14_0_x86_64.whl", hash = "sha256:f7ce739a6ef9b4d210a746327d377234b1996080028eddbe9c6a1f35193c348e", size = 7329967, upload-time = "2026-01-27T20:54:41.296Z" }, + { url = "https://files.pythonhosted.org/packages/19/c7/61b9a857f7b43234b896fd5e80d994f9efa007b0980887bf6d4d48ab6c20/ddtrace-4.3.0-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:0dff123cc9e39ff393c164198bb166270bcc826a87009af9b4f1431653aef531", size = 7721410, upload-time = "2026-01-27T20:54:43.85Z" }, + { url = "https://files.pythonhosted.org/packages/e1/38/c2e18f707ec222aa33af297dba967b2423559b058b92bfd0e6fd00c74a14/ddtrace-4.3.0-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:80a75fdf1d1717ea6e9d32d33019d0e76c2a38ea55b03dcbb45ad1af5f19079a", size = 8001195, upload-time = "2026-01-27T20:54:46.63Z" }, + { url = "https://files.pythonhosted.org/packages/32/2c/5912ad2ec39f8fa9250fa3f862156de00dbce86a702bf6e78f95f6ef1de7/ddtrace-4.3.0-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:074ac2d7a5f7dfa719b36a442b9b08842e698aa50061812a917c92141e020e1c", size = 8738876, upload-time = "2026-01-27T20:54:49.294Z" }, + { url = "https://files.pythonhosted.org/packages/af/0c/5a4098c258da2cc97160fb1735f57bad6048c6c980d24ecf8e58232fb15d/ddtrace-4.3.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:7c2a15dd28081ab305f9b7463446fa1bb4d3339744b8bff044837039726b1115", size = 9070879, upload-time = "2026-01-27T20:54:52.155Z" }, + { url = "https://files.pythonhosted.org/packages/a1/0b/60ab4556ef979a2d8b48328d778c2f521648f9ebf0518175d6cb61ae60ea/ddtrace-4.3.0-cp314-cp314-win32.whl", hash = "sha256:ce347b54d57686a90f36fb419f778379a00ce5d5ba6aacb79ccfde6c5f3e05b4", size = 5199611, upload-time = "2026-01-27T20:54:55.326Z" }, + { url = "https://files.pythonhosted.org/packages/0b/9d/dd17ae53fa30abc5ec0d4e53fd78768fef745acd3c2cc5067b75eb49af69/ddtrace-4.3.0-cp314-cp314-win_amd64.whl", hash = "sha256:cbeb4e4d2ec5eab248e34432f24e7d318f55031d3a6d39b540ebdebf51e55080", size = 5774168, upload-time = "2026-01-27T20:54:58.196Z" }, + { url = "https://files.pythonhosted.org/packages/3a/29/85c3372abf028f4c8da9f485bc814100e04c6e1b1b92db49bcb497ef0023/ddtrace-4.3.0-cp314-cp314-win_arm64.whl", hash = "sha256:d4b1c98336fd7b096b0b3a7baa095efba67919e6b4cafafe2cae16b17306dc30", size = 5500574, upload-time = "2026-01-27T20:55:00.865Z" }, +] + +[[package]] +name = "debugpy" +version = "1.8.21" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/f2/aa/12037145b7a56eaa5b29b41872f7a21b538e807e13f32c4d3c46e59be084/debugpy-1.8.21.tar.gz", hash = "sha256:a3c53278e84c94e11bd87c53970ec391d1a67396c8b22609fcac576520e611a6", size = 1697577, upload-time = "2026-06-01T19:30:35.156Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/89/fb/cbf306d6e07a313a91e7171a98669054502840931432c227cfd505ee367f/debugpy-1.8.21-cp311-cp311-macosx_15_0_universal2.whl", hash = "sha256:da456226c7b4c69e35dbe35dcee6623d912000a77816db7856a41af1c72a0264", size = 2203120, upload-time = "2026-06-01T19:30:43.964Z" }, + { url = "https://files.pythonhosted.org/packages/aa/57/aa739bd4ad2cbf96aeb1b20b56918ddd5ae4c28b68709bfcd327f02123ee/debugpy-1.8.21-cp311-cp311-manylinux_2_34_x86_64.whl", hash = "sha256:f68b891688e61bdc08b8d364d919ff0051e0b94657b39dcd027bc3173edb7cdc", size = 3059958, upload-time = "2026-06-01T19:30:45.622Z" }, + { url = "https://files.pythonhosted.org/packages/a8/31/453d2c9a23d133fe2c8ec7ca1d816ded52a913487fe3ffef7c01b4b706af/debugpy-1.8.21-cp311-cp311-win32.whl", hash = "sha256:f843a8b08c2edeaf9b1582eed4f25441af21a297c22ff16bf76a662557aa9c9e", size = 5236515, upload-time = "2026-06-01T19:30:47.461Z" }, + { url = "https://files.pythonhosted.org/packages/60/94/6660de2f2d7bf388f229335ba4637646eebabdbf38564cb439a95a9193c9/debugpy-1.8.21-cp311-cp311-win_amd64.whl", hash = "sha256:84c564d8cc701d41843b29a92814c1f1bef6798724ca9d675c284ad9f6a547d7", size = 5256138, upload-time = "2026-06-01T19:30:49.113Z" }, + { url = "https://files.pythonhosted.org/packages/a2/df/bf625547431a9cadc9f4cbfeda38866e2b17f6aed147b625377e87834449/debugpy-1.8.21-cp312-cp312-macosx_15_0_universal2.whl", hash = "sha256:9f96713896f39c3dff0ee841f47320c3f2983d33c341e009361bb0ebc79adc4e", size = 2483609, upload-time = "2026-06-01T19:30:50.794Z" }, + { url = "https://files.pythonhosted.org/packages/bf/09/59324b903599031ff9faaec1758292409f6561a0ec2492fe4b703327705a/debugpy-1.8.21-cp312-cp312-manylinux_2_34_x86_64.whl", hash = "sha256:c193d474f0a211191f2b4449d2d06157c689013035bd952f3b617e0ef422b176", size = 3968900, upload-time = "2026-06-01T19:30:52.341Z" }, + { url = "https://files.pythonhosted.org/packages/14/cd/27f65b805d7fe005c44e1a36b9183ecdfbcdbf9d3e721a5115d461ecc7ee/debugpy-1.8.21-cp312-cp312-win32.whl", hash = "sha256:4743373c1cac7f9e74a1b9915bf1dbe0e900eca657ffb170ae07ac8363205ae9", size = 5336340, upload-time = "2026-06-01T19:30:54.047Z" }, + { url = "https://files.pythonhosted.org/packages/77/1d/c84e30c0c674184948b66f076ab271c01d940618a2824c23cd035a27bc20/debugpy-1.8.21-cp312-cp312-win_amd64.whl", hash = "sha256:bd7ba9dd3daa7c2f942c6ca8d4695a16bf9ac16b63615261c7982bc74f7ed20c", size = 5374751, upload-time = "2026-06-01T19:30:55.891Z" }, + { url = "https://files.pythonhosted.org/packages/77/6b/d817e1f8cc77aa055d37fba092e0febfdff40fe652d8d53d4cd7a86ad98d/debugpy-1.8.21-cp313-cp313-macosx_15_0_universal2.whl", hash = "sha256:13678151fc401e2d68c9880b91e28714f797d40422994572b24560ef80910a88", size = 2477398, upload-time = "2026-06-01T19:30:57.644Z" }, + { url = "https://files.pythonhosted.org/packages/48/57/412421516afc3055fa577516f00beec3d663f9b0ab330639547ae6c57720/debugpy-1.8.21-cp313-cp313-manylinux_2_34_x86_64.whl", hash = "sha256:ecbd158386c31ffe71d46f72d44d56e66331ab9b16cad649156d514368f23ab2", size = 3962096, upload-time = "2026-06-01T19:30:59.235Z" }, + { url = "https://files.pythonhosted.org/packages/c1/62/2c616337cf6ba7b07ebbc97f02c6c945a8e2f76b365e33ee809c32ee36d1/debugpy-1.8.21-cp313-cp313-win32.whl", hash = "sha256:2c2ae706dec41d99a9ca1f7ebc987a83e65578363be6f6b3ac9067504917fae1", size = 5336288, upload-time = "2026-06-01T19:31:00.79Z" }, + { url = "https://files.pythonhosted.org/packages/f8/99/9175103392f84c4b1bf7622888cdc68da07f0ff7d9e581266428f6776033/debugpy-1.8.21-cp313-cp313-win_amd64.whl", hash = "sha256:aa648733047443eb1d07682c4ef287d36a54507b643ffdf38b09a3ef002c72a0", size = 5376567, upload-time = "2026-06-01T19:31:02.56Z" }, + { url = "https://files.pythonhosted.org/packages/ce/3d/f4bbb323a548bfab2af3d6b4ffd9bf22636e55956a1285d317a1de643aad/debugpy-1.8.21-cp314-cp314-macosx_15_0_universal2.whl", hash = "sha256:9bb2a685287a2ac9b181cde89edcec64845cb51de7faaa75badb9a698bc24782", size = 2477209, upload-time = "2026-06-01T19:31:04.157Z" }, + { url = "https://files.pythonhosted.org/packages/8c/2d/6e7ec524984a1702777868de49a4c53202bddac2a432a76a093469587750/debugpy-1.8.21-cp314-cp314-manylinux_2_34_x86_64.whl", hash = "sha256:3d6922439bf33fd38a3e2c447869ebc7b97da5cd3d329ff1ef9bc06c4903437e", size = 3927115, upload-time = "2026-06-01T19:31:05.863Z" }, + { url = "https://files.pythonhosted.org/packages/97/47/d1aa6d64005a98a9144647d99306b419396f9ad7bf1d73c119e17a81fb4d/debugpy-1.8.21-cp314-cp314-win32.whl", hash = "sha256:15d4963bd5ffa48f0da0947fd06757fa7621945048a14ad7705431566d3c0e7c", size = 5336724, upload-time = "2026-06-01T19:31:07.711Z" }, + { url = "https://files.pythonhosted.org/packages/5f/67/b905b90d163af11878c1af8abafa4a25206335e112e284e413454543a6da/debugpy-1.8.21-cp314-cp314-win_amd64.whl", hash = "sha256:fe0744a12353406de0ae8ccff0d0a4a666f00801a3db8fd04e7a5f761cd520e8", size = 5373803, upload-time = "2026-06-01T19:31:09.469Z" }, + { url = "https://files.pythonhosted.org/packages/95/51/67e7cf11a53e40694f720457d5b3a1cdaaa3d5a9a633e482f225456b93ff/debugpy-1.8.21-py2.py3-none-any.whl", hash = "sha256:b1e37d333663c8851516a47364ef473da127f9caebe4417e6df6f5825a7e9a92", size = 5352888, upload-time = "2026-06-01T19:31:25.186Z" }, +] + +[[package]] +name = "decorator" +version = "5.3.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/60/8b/32f9823da46cde7df2087faa08cd98d01b908f8dcab982cdba9c84e85355/decorator-5.3.1.tar.gz", hash = "sha256:4cbcdd55a6efadb9dbea26b858f4fb3264567b52d69ca0d25b721b553f60ea82", size = 58084, upload-time = "2026-05-18T06:03:28.057Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/05/7f/798705f5296a58ca505d600456748d1be48078eac8a7050d8a98bc9edb89/decorator-5.3.1-py3-none-any.whl", hash = "sha256:f47fe6fdbd2edd623ecfe36875d37aba411624e2670dd395dddae1358689bb3c", size = 10365, upload-time = "2026-05-18T06:03:26.517Z" }, +] + +[[package]] +name = "defusedxml" +version = "0.7.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/0f/d5/c66da9b79e5bdb124974bfe172b4daf3c984ebd9c2a06e2b8a4dc7331c72/defusedxml-0.7.1.tar.gz", hash = "sha256:1bb3032db185915b62d7c6209c5a8792be6a32ab2fedacc84e01b52c51aa3e69", size = 75520, upload-time = "2021-03-08T10:59:26.269Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/07/6c/aa3f2f849e01cb6a001cd8554a88d4c77c5c1a31c95bdf1cf9301e6d9ef4/defusedxml-0.7.1-py2.py3-none-any.whl", hash = "sha256:a352e7e428770286cc899e2542b6cdaedb2b4953ff269a210103ec58f6198a61", size = 25604, upload-time = "2021-03-08T10:59:24.45Z" }, +] + +[[package]] +name = "dnspython" +version = "2.8.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/8c/8b/57666417c0f90f08bcafa776861060426765fdb422eb10212086fb811d26/dnspython-2.8.0.tar.gz", hash = "sha256:181d3c6996452cb1189c4046c61599b84a5a86e099562ffde77d26984ff26d0f", size = 368251, upload-time = "2025-09-07T18:58:00.022Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/ba/5a/18ad964b0086c6e62e2e7500f7edc89e3faa45033c71c1893d34eed2b2de/dnspython-2.8.0-py3-none-any.whl", hash = "sha256:01d9bbc4a2d76bf0db7c1f729812ded6d912bd318d3b1cf81d30c0f845dbf3af", size = 331094, upload-time = "2025-09-07T18:57:58.071Z" }, +] + +[[package]] +name = "entrypoints" +version = "0.4" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/ea/8d/a7121ffe5f402dc015277d2d31eb82d2187334503a011c18f2e78ecbb9b2/entrypoints-0.4.tar.gz", hash = "sha256:b706eddaa9218a19ebcd67b56818f05bb27589b1ca9e8d797b74affad4ccacd4", size = 13974, upload-time = "2022-02-02T21:30:28.172Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/35/a8/365059bbcd4572cbc41de17fd5b682be5868b218c3c5479071865cab9078/entrypoints-0.4-py3-none-any.whl", hash = "sha256:f174b5ff827504fd3cd97cc3f8649f3693f51538c7e4bdf3ef002c8429d42f9f", size = 5294, upload-time = "2022-02-02T21:30:26.024Z" }, +] + +[[package]] +name = "envier" +version = "0.6.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/19/e7/4fe4d3f6e21213cea9bcddc36ba60e6ae4003035f9ce8055e6a9f0322ddb/envier-0.6.1.tar.gz", hash = "sha256:3309a01bb3d8850c9e7a31a5166d5a836846db2faecb79b9cb32654dd50ca9f9", size = 10063, upload-time = "2024-10-22T09:56:47.226Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/56/e9/30493b1cc967f7c07869de4b2ab3929151a58e6bb04495015554d24b61db/envier-0.6.1-py3-none-any.whl", hash = "sha256:73609040a76be48bbcb97074d9969666484aa0de706183a6e9ef773156a8a6a9", size = 10638, upload-time = "2024-10-22T09:56:45.968Z" }, +] + +[[package]] +name = "execnet" +version = "2.1.2" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/bf/89/780e11f9588d9e7128a3f87788354c7946a9cbb1401ad38a48c4db9a4f07/execnet-2.1.2.tar.gz", hash = "sha256:63d83bfdd9a23e35b9c6a3261412324f964c2ec8dcd8d3c6916ee9373e0befcd", size = 166622, upload-time = "2025-11-12T09:56:37.75Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/ab/84/02fc1827e8cdded4aa65baef11296a9bbe595c474f0d6d758af082d849fd/execnet-2.1.2-py3-none-any.whl", hash = "sha256:67fba928dd5a544b783f6056f449e5e3931a5c378b128bc18501f7ea79e296ec", size = 40708, upload-time = "2025-11-12T09:56:36.333Z" }, +] + +[[package]] +name = "executing" +version = "2.2.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/cc/28/c14e053b6762b1044f34a13aab6859bbf40456d37d23aa286ac24cfd9a5d/executing-2.2.1.tar.gz", hash = "sha256:3632cc370565f6648cc328b32435bd120a1e4ebb20c77e3fdde9a13cd1e533c4", size = 1129488, upload-time = "2025-09-01T09:48:10.866Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/c1/ea/53f2148663b321f21b5a606bd5f191517cf40b7072c0497d3c92c4a13b1e/executing-2.2.1-py2.py3-none-any.whl", hash = "sha256:760643d3452b4d777d295bb167ccc74c64a81df23fb5e08eff250c425a4b2017", size = 28317, upload-time = "2025-09-01T09:48:08.5Z" }, +] + +[[package]] +name = "fastjsonschema" +version = "2.21.2" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/20/b5/23b216d9d985a956623b6bd12d4086b60f0059b27799f23016af04a74ea1/fastjsonschema-2.21.2.tar.gz", hash = "sha256:b1eb43748041c880796cd077f1a07c3d94e93ae84bba5ed36800a33554ae05de", size = 374130, upload-time = "2025-08-14T18:49:36.666Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/cb/a8/20d0723294217e47de6d9e2e40fd4a9d2f7c4b6ef974babd482a59743694/fastjsonschema-2.21.2-py3-none-any.whl", hash = "sha256:1c797122d0a86c5cace2e54bf4e819c36223b552017172f32c5c024a6b77e463", size = 24024, upload-time = "2025-08-14T18:49:34.776Z" }, +] + +[[package]] +name = "fastnumbers" +version = "5.1.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/75/bf/c69642300a98e8b61047fa17ee7c925a8e65a12e194e98dda7ec1eefaf4b/fastnumbers-5.1.1.tar.gz", hash = "sha256:183fa021cdc052edaeede5c23e3086461deb7562b567614edf71b29515f5fa4b", size = 193827, upload-time = "2024-12-15T07:28:51.124Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/f9/2d/79b651d72295541d06f9f413767a901726e7de7748f908db6d5962f2afbe/fastnumbers-5.1.1-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:ac49a019283a737b887f5fa50e8d1670cfd2f685256a7f31a8da33b70df701e1", size = 304396, upload-time = "2024-12-15T07:26:49.733Z" }, + { url = "https://files.pythonhosted.org/packages/ee/41/b41ca8b75a0760b81b9a5e859ea1c366f644e119615fe3feb1e30ade1652/fastnumbers-5.1.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:a00d105ba2484360d39cf514a16e97e1f66cf053fcc7afd16f95dbbb6de8ed9d", size = 171738, upload-time = "2024-12-15T07:26:52.336Z" }, + { url = "https://files.pythonhosted.org/packages/ff/c3/bdc36067cf111cd2f84e7877e0cbdf3bed5fb179fc2f6c969e79ff9fa693/fastnumbers-5.1.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:216cb1e3f600ff91164c85379241a4f77ed7d1f8e65ffae4ccf3ef34662b9d8a", size = 170015, upload-time = "2024-12-15T07:26:55.003Z" }, + { url = "https://files.pythonhosted.org/packages/b5/6e/7235825baa8b60286c5b0ae605f778db9047be14529f44cc31159014806d/fastnumbers-5.1.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:feb3f3114a3a847f0896ca3d563bf61e3a95ebf51d2308170aed5a7aad88fec3", size = 1664356, upload-time = "2024-12-15T07:26:56.893Z" }, + { url = "https://files.pythonhosted.org/packages/de/6e/fe8c4bde25d38862e98843b50c891068865d75113b2701436a7a4f950231/fastnumbers-5.1.1-cp311-cp311-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b65dfb82b3a5cdd0ac53227b5caae47d98034ae4a8966de89e2ac58639ba14a4", size = 1686830, upload-time = "2024-12-15T07:26:59.857Z" }, + { url = "https://files.pythonhosted.org/packages/f2/37/47727d28780978ba8969524ee2e0545f74080383497574e7df17ff41a19a/fastnumbers-5.1.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:cf7e72ea226a8a1289045f5dfc86d685c2890322f754f8f8eabcb30cf2bef9f2", size = 1675741, upload-time = "2024-12-15T07:27:02.966Z" }, + { url = "https://files.pythonhosted.org/packages/11/fc/0e8da8c4692ba6a4f7d91e62bf6579fcd0fa8a72fe6f768d5244cf70f3fb/fastnumbers-5.1.1-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:18160ce6b574e230204774d12a8a00bb5868dc22bf28e445117ca26a8b9a6fff", size = 2424526, upload-time = "2024-12-15T07:27:04.638Z" }, + { url = "https://files.pythonhosted.org/packages/9c/a4/48f03bca7f8c3d326d8b1c6b1d0fc94630f12a1be414d25049272dfb62e9/fastnumbers-5.1.1-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:1681e2b37628ea5a3dc43dfc0a4e3f6eebf388d76c91f69b48e9fe1431c2d9ea", size = 2575006, upload-time = "2024-12-15T07:27:07.765Z" }, + { url = "https://files.pythonhosted.org/packages/6b/38/c5361fdf085a78d934e6d503e94fed183db436aa9958816783b0b7a2d192/fastnumbers-5.1.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:1ab4faa10b35dc3ea53d83a4107a3b338a39cf500d2f6e0a44f930ad694fa0a9", size = 2516000, upload-time = "2024-12-15T07:27:09.443Z" }, + { url = "https://files.pythonhosted.org/packages/46/16/34109c8a27e016799b2538a03184d4d59a66787432b8d5bf5d1fbc403ac5/fastnumbers-5.1.1-cp311-cp311-win32.whl", hash = "sha256:98b9da1a3565f939800b99471e1cb678744e3dd761571bc0b2b03794dd884039", size = 117636, upload-time = "2024-12-15T07:27:12.234Z" }, + { url = "https://files.pythonhosted.org/packages/a1/3a/899bf5fe59aaee646b453b106c1d0cf978574732f0650b99ba004c261059/fastnumbers-5.1.1-cp311-cp311-win_amd64.whl", hash = "sha256:62c97b9141b052ecbebee1e9fbdfa7db67685602cf847bb7620eb71e5afe18b5", size = 126010, upload-time = "2024-12-15T07:27:14.667Z" }, + { url = "https://files.pythonhosted.org/packages/bf/8c/69a7884c3584bd92daac3b923fb49a10b2ee018d7259e8f0be03ea301f96/fastnumbers-5.1.1-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:e57b377419c89c23cd411abe19b911fea3879db71733751f4dd0f4504d623325", size = 305660, upload-time = "2024-12-15T07:27:16.025Z" }, + { url = "https://files.pythonhosted.org/packages/51/27/207a1b9298380e971abd7640021b71b72fda844e5d5931e85031bc6db6b2/fastnumbers-5.1.1-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:d80ecd57144c20140383ada74c7ee0f8464940d8931c04d4bdd73917200e82ef", size = 172460, upload-time = "2024-12-15T07:27:17.431Z" }, + { url = "https://files.pythonhosted.org/packages/bf/91/8601841ee9cad8628a5386131c53891777836cc6ad678bcff90d8210bd40/fastnumbers-5.1.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:12270ace75facc55426e81e94ab81e8ac0449b78775c2255af3d4a901e90b6f3", size = 170666, upload-time = "2024-12-15T07:27:19.148Z" }, + { url = "https://files.pythonhosted.org/packages/ac/00/4a3e50b1bdf6aa3b48d78ac111b9ddf61401087b1d00249f9b16ba181eb1/fastnumbers-5.1.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:68e8e2da55134e6f3680ced0799eaad00db2ed7e31b7b12e412c7af834927d15", size = 1667289, upload-time = "2024-12-15T07:27:20.501Z" }, + { url = "https://files.pythonhosted.org/packages/fc/53/d0ecbb31cd60c0bf9ef4ba4de1f56d9665bea4a142a649aa6d9316afdc40/fastnumbers-5.1.1-cp312-cp312-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3898a65a4658c9f94e4765d0a9403e9dc2b84ce707fd464b6457c809f4ca0379", size = 1690950, upload-time = "2024-12-15T07:27:22.323Z" }, + { url = "https://files.pythonhosted.org/packages/ea/0b/a7b94e4317e18939807615e7c14072f0e307fc0ba83d1548df8e4f8f07da/fastnumbers-5.1.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:95289b099deb8b3d7083866648865d542abeee722ede0dea188809ddfb0942d1", size = 1679465, upload-time = "2024-12-15T07:27:24.42Z" }, + { url = "https://files.pythonhosted.org/packages/2b/33/efe5b3a25cb35dd6da48a06c44b22b164bd5d245ade0e85423b03cc574d7/fastnumbers-5.1.1-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:95682f60228f035ea83cb3ba102e5ca1e980cccedc7532b39e05fff93ea0ec64", size = 2435702, upload-time = "2024-12-15T07:27:27.334Z" }, + { url = "https://files.pythonhosted.org/packages/6a/43/ebf6f98789108a507b28bc1c88e0328ba6ab4f46331ffae1704141909643/fastnumbers-5.1.1-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:e9683a12e357034fb0d4cfb291bb799b16c791bb224b9c05a39dfefcfc2e673d", size = 2590379, upload-time = "2024-12-15T07:27:29.033Z" }, + { url = "https://files.pythonhosted.org/packages/a1/09/02723ada3b2e4aec94bd7f48bc6f1053a5a4157d872e4279a3fbd078219e/fastnumbers-5.1.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:c092c186d36e8d27aee8e864e03aaaf219a51ee940d4a6356964d89ce8f34058", size = 2521780, upload-time = "2024-12-15T07:27:31.227Z" }, + { url = "https://files.pythonhosted.org/packages/fd/e6/2604e241c405db3540e3e7c35d025275b560e1b6eec6f78e72cc2d220351/fastnumbers-5.1.1-cp312-cp312-win32.whl", hash = "sha256:60e9d5515dfc2898a1a6f93dac7ef3406a2b122ff37eaa732b57df3bc7c93862", size = 117125, upload-time = "2024-12-15T07:27:33.751Z" }, + { url = "https://files.pythonhosted.org/packages/53/02/f3b4ce4f9c7ae2b88a825a52dcb0a9b8b13b70bdcf5066c8598252a04acd/fastnumbers-5.1.1-cp312-cp312-win_amd64.whl", hash = "sha256:070b81b10207b2f7c3bd98c1825f3c0adb6c7e18238f851572d51c882877bc02", size = 127192, upload-time = "2024-12-15T07:27:35.454Z" }, + { url = "https://files.pythonhosted.org/packages/3d/82/c37be55714cc97d68f8430726cd4880cf8d82da316fc4cad820480a274c8/fastnumbers-5.1.1-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:7109d06161000a75d8e4a2f4eb6ed3cb19d3472f5497e64b9df70f4e8ea22090", size = 305660, upload-time = "2024-12-15T07:27:38.306Z" }, + { url = "https://files.pythonhosted.org/packages/93/00/480be84bfc962ceb3cf39058acd09cd5011de6f0496bfc5fd112455d6804/fastnumbers-5.1.1-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:544e905de42679e3e80cdfb5f0f8185b498a206d33a9365f896d8842b9544550", size = 172457, upload-time = "2024-12-15T07:27:39.764Z" }, + { url = "https://files.pythonhosted.org/packages/89/16/de7c3e2b9a604bfdb0f3a905152e64c53064022e432b46f4626c931698a0/fastnumbers-5.1.1-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:e8e40437eafef22aa5ebc80f44d0f9cdf984538b3c05f57500b24695ed63b8b2", size = 170661, upload-time = "2024-12-15T07:27:41.526Z" }, + { url = "https://files.pythonhosted.org/packages/3b/62/247856faac56f08094be27db152604c10c1419feeb8d998495d2929a8fea/fastnumbers-5.1.1-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2b1831fe49d44a91e2803db231696979e6ae1d30e67679c201b7c69cfb815a19", size = 1667006, upload-time = "2024-12-15T07:27:47.52Z" }, + { url = "https://files.pythonhosted.org/packages/4b/a7/1071c2a49c1079f57c9a647352e819e08679f6187b10ad395c1c02885587/fastnumbers-5.1.1-cp313-cp313-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:9421b79e788cc9ec9266c6cfa8306d1e17f4abf0d1c1fb173d4328cc57955b61", size = 1690719, upload-time = "2024-12-15T07:27:49.222Z" }, + { url = "https://files.pythonhosted.org/packages/2f/72/bd9e62e5b0303e1c0a9682b4de3e65b0c1a8eec2ef721fe0b26829a9879e/fastnumbers-5.1.1-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:517e91bd9fd0e664eb8a81759c79e38675a94bfac8892dbc274f7430ae5be451", size = 1679059, upload-time = "2024-12-15T07:27:51.186Z" }, + { url = "https://files.pythonhosted.org/packages/92/b1/8218c61638873d74eb7518cf4bac2d7192a328efbdc780fd8a05d91008aa/fastnumbers-5.1.1-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:4479d85f246728ea5737b28ed3730cc4dbc1002bcf788ce32f9ffcb730150fa3", size = 2436131, upload-time = "2024-12-15T07:27:54.837Z" }, + { url = "https://files.pythonhosted.org/packages/f6/2b/06e947b27ca76b4ebf30363500719f27d8cdbf4b286760e3ef941b3d1308/fastnumbers-5.1.1-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:c738099125cbb0a559a59c14165090a545a892f16db102aa1f5fb930fa1a2b13", size = 2590343, upload-time = "2024-12-15T07:27:57.974Z" }, + { url = "https://files.pythonhosted.org/packages/58/41/cf5333d1013ba5afb21b40565d1c1ed0114d97b7e0ef230659ead17b870e/fastnumbers-5.1.1-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:ca0a72d750d5d78857fa5c7f9ff4645c86793b7a63ae0b6b32ef1a27af9ae398", size = 2521775, upload-time = "2024-12-15T07:27:59.694Z" }, + { url = "https://files.pythonhosted.org/packages/2c/14/fb3e0c1b92dc633da708c7438c564bdfb8c4757ad0ce1f4bf80f3fa7d0b9/fastnumbers-5.1.1-cp313-cp313-win32.whl", hash = "sha256:dc2442ceb236f4680c87aa54d1f94bd8fc4b6db8dc9ac94e602da0924aac279f", size = 117134, upload-time = "2024-12-15T07:28:01.359Z" }, + { url = "https://files.pythonhosted.org/packages/5d/af/47ce3856e5d6a10aae37dbf903c295c36702bf78d1f30c7c213460f46453/fastnumbers-5.1.1-cp313-cp313-win_amd64.whl", hash = "sha256:91a69ce09fb5079bd680464b2d850be82f5516ed67360381c9d9935431c31bc4", size = 127195, upload-time = "2024-12-15T07:28:02.617Z" }, +] + +[[package]] +name = "filetype" +version = "1.2.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/bb/29/745f7d30d47fe0f251d3ad3dc2978a23141917661998763bebb6da007eb1/filetype-1.2.0.tar.gz", hash = "sha256:66b56cd6474bf41d8c54660347d37afcc3f7d1970648de365c102ef77548aadb", size = 998020, upload-time = "2022-11-02T17:34:04.141Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/18/79/1b8fa1bb3568781e84c9200f951c735f3f157429f44be0495da55894d620/filetype-1.2.0-py2.py3-none-any.whl", hash = "sha256:7ce71b6880181241cf7ac8697a2f1eb6a8bd9b429f7ad6d27b8db9ba5f1c2d25", size = 19970, upload-time = "2022-11-02T17:34:01.425Z" }, +] + +[[package]] +name = "flake8" +version = "7.3.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "mccabe" }, + { name = "pycodestyle" }, + { name = "pyflakes" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/9b/af/fbfe3c4b5a657d79e5c47a2827a362f9e1b763336a52f926126aa6dc7123/flake8-7.3.0.tar.gz", hash = "sha256:fe044858146b9fc69b551a4b490d69cf960fcb78ad1edcb84e7fbb1b4a8e3872", size = 48326, upload-time = "2025-06-20T19:31:35.838Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/9f/56/13ab06b4f93ca7cac71078fbe37fcea175d3216f31f85c3168a6bbd0bb9a/flake8-7.3.0-py2.py3-none-any.whl", hash = "sha256:b9696257b9ce8beb888cdbe31cf885c90d31928fe202be0889a7cdafad32f01e", size = 57922, upload-time = "2025-06-20T19:31:34.425Z" }, +] + +[[package]] +name = "flasgger-tschaume" +version = "0.9.7" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "flask" }, + { name = "jsonschema" }, + { name = "mistune" }, + { name = "pyyaml" }, + { name = "six" }, + { name = "werkzeug" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/ad/9a/94f78b4865f30402dd56f343d0d7487b2d6fce3137a3579a18aa49981bd8/flasgger-tschaume-0.9.7.tar.gz", hash = "sha256:139bd4686387e69019af2a86c0eacbd00bf30df0c7470ea55120646cab2ae446", size = 4227116, upload-time = "2022-10-21T23:24:14.25Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/97/a7/f6b8b0d622449b0e63869d64c3ad19d67b5e86e1bad60e3c34cbb9dc2ca6/flasgger_tschaume-0.9.7-py2.py3-none-any.whl", hash = "sha256:ee0c55f76c5884704649d139f042050af5d6f1d5a60cae167e3123735720302c", size = 3864468, upload-time = "2022-10-21T23:24:11.541Z" }, +] + +[[package]] +name = "flask" +version = "2.2.5" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "click" }, + { name = "itsdangerous" }, + { name = "jinja2" }, + { name = "werkzeug" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/5f/76/a4d2c4436dda4b0a12c71e075c508ea7988a1066b06a575f6afe4fecc023/Flask-2.2.5.tar.gz", hash = "sha256:edee9b0a7ff26621bd5a8c10ff484ae28737a2410d99b0bb9a6850c7fb977aa0", size = 697814, upload-time = "2023-05-02T14:42:36.742Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/9f/1a/8b6d48162861009d1e017a9740431c78d860809773b66cac220a11aa3310/Flask-2.2.5-py3-none-any.whl", hash = "sha256:58107ed83443e86067e41eff4631b058178191a355886f8e479e347fa1285fdf", size = 101817, upload-time = "2023-05-02T14:42:34.858Z" }, +] + +[[package]] +name = "flask-compress" +version = "1.24" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "backports-zstd", marker = "python_full_version < '3.14'" }, + { name = "brotli", marker = "platform_python_implementation != 'PyPy'" }, + { name = "brotlicffi", marker = "platform_python_implementation == 'PyPy'" }, + { name = "flask" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/c2/de/2ae0118051b38ab53437328074a696f3ee7d61e15bf7454b78a3088e5bc3/flask_compress-1.24.tar.gz", hash = "sha256:14097cefe59ecb3e466d52a6aeb62f34f125a9f7dadf1f33a53e430ce4a50f31", size = 21089, upload-time = "2026-03-31T15:01:39.005Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/4c/0f/fe51e0b2301bbd429af44273a923ff92127b18d13abba5ae5a1d60e8e497/flask_compress-1.24-py3-none-any.whl", hash = "sha256:1e63668eb6e3242bd4f6ad98825a924e3984409be90c125477893d586007d00c", size = 11033, upload-time = "2026-03-31T15:01:37.302Z" }, +] + +[[package]] +name = "flask-marshmallow" +version = "1.4.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "flask" }, + { name = "marshmallow" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/09/43/6e5c19e8abc01f5daf1d3c8ad169c495335390572b8bead3f7e7302131c6/flask_marshmallow-1.4.0.tar.gz", hash = "sha256:98c90a253052c72d2ddddc925539ac33bbd780c6fba86478ffe18e3b89d8b471", size = 40970, upload-time = "2026-02-04T16:07:59.916Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/70/9b/7d0605c6f90d640547c3c9a0b95bc3bb17e252ae0f46f1dbfa90d2e06518/flask_marshmallow-1.4.0-py3-none-any.whl", hash = "sha256:b758fc2c428d0cbee6fd0ccf0d55524fe9e426a86a177dcc0fc8cd71ad4b7c59", size = 12254, upload-time = "2026-02-04T16:07:58.878Z" }, +] + +[[package]] +name = "flask-mongoengine-tschaume" +version = "1.1.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "flask" }, + { name = "mongoengine" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/46/e9/224508e946b975dab42f185ecca6c044a465ebd6fdc23bdc27a85330ea0c/flask-mongoengine-tschaume-1.1.0.tar.gz", hash = "sha256:0c020feb12bb0317a4848e7b191489f89ad0589c9728d4907f5e9635474dd055", size = 235159, upload-time = "2022-10-25T00:40:12.334Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/9f/5b/d947b061b81b25ee061f1eae068c98d0491f990d24d3ad9f16de9c05cd56/flask_mongoengine_tschaume-1.1.0-py3-none-any.whl", hash = "sha256:01fcb556bb616bc4b4bbe83fb019787dc58e565790226182bf9a60ed9fada65d", size = 33610, upload-time = "2022-10-25T00:40:10.809Z" }, +] + +[[package]] +name = "flask-mongorest-mpcontribs" +version = "3.3.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "atlasq-tschaume" }, + { name = "boto3" }, + { name = "fastnumbers" }, + { name = "flask-mongoengine-tschaume" }, + { name = "flask-sse" }, + { name = "flatten-dict" }, + { name = "marshmallow-mongoengine" }, + { name = "mimerender-pr36" }, + { name = "orjson" }, + { name = "pymongo" }, + { name = "python-dateutil" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/73/57/9eafaa2bfe95d9a4b05e8d505cc17e89fbdfcc14feeddc4a2a13eac9a710/flask-mongorest-mpcontribs-3.3.0.tar.gz", hash = "sha256:2db7fc6f341b2cea6c302ed5557941a1d89531e1cd92a8235eba3ac9e1cc6ea2", size = 46223, upload-time = "2023-04-14T21:22:32.787Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/b6/a4/95bbdee9e63c2bed78bb77f98f1fbb4971964383a3b6aa4c526da2852229/flask_mongorest_mpcontribs-3.3.0-py3-none-any.whl", hash = "sha256:f76dc8ef915f1b4ee896110ecbcc4a75a8cb7f33f4ce4387f4b4e2a0b646fa83", size = 26389, upload-time = "2023-04-14T21:22:31.273Z" }, +] + +[[package]] +name = "flask-rq2" +version = "18.3" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "flask" }, + { name = "redis" }, + { name = "rq" }, + { name = "rq-scheduler" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/3a/73/edea2742650daa2b1589e8cb592abe7da5d8ce530642e62f047b205580b7/Flask-RQ2-18.3.tar.gz", hash = "sha256:3ef6395065255447f8e1516ccca24858ba87da1d71a6975e0e3b55256bf04967", size = 29105, upload-time = "2018-12-20T10:53:32.738Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/61/47/341667d55567995f6a54096e4156edaaad645dd7c90133e646ed9ba56968/Flask_RQ2-18.3-py2.py3-none-any.whl", hash = "sha256:abe1e52d3b98abe37e85830a614ba6af864516f1b6cf2229f352f8500eafc5fd", size = 12999, upload-time = "2018-12-20T10:53:31.409Z" }, +] + +[[package]] +name = "flask-sse" +version = "1.0.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "flask" }, + { name = "redis" }, + { name = "six" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/38/31/82586853cb1c0fcc2b8b533891606a779acc0da7d4cda5c8d7f2c2b05a29/Flask-SSE-1.0.0.tar.gz", hash = "sha256:4f84714c2549a45e4f17bfc5f68ee8a9f298b22740a6844404d1c74551f2090d", size = 16190, upload-time = "2021-01-10T18:01:46.269Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/71/83/f9fe86f554a153fdd300fb8027121d508a2177605bd158d967ddd7325948/Flask_SSE-1.0.0-py2.py3-none-any.whl", hash = "sha256:f86d7ecff0607333755c444130c395e7a133fb7ae6cf76fbd29b1da36d34776b", size = 4952, upload-time = "2021-01-10T18:01:44.985Z" }, +] + +[[package]] +name = "flatten-dict" +version = "0.5.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/0b/d0/34bf1bafa4d54e4ec20ca40856e991ffe7fdfd53831a2a36a7eb356508c8/flatten_dict-0.5.0.tar.gz", hash = "sha256:ca89664d0bc9552d525ee756726b5a755c17f65b5bf23d0a1f07841f181428b7", size = 9476, upload-time = "2026-04-28T14:23:44.979Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/72/9f/485516087cd8c44183aaf9ab850247a28e2e4a42a4d62eab77c21f673450/flatten_dict-0.5.0-py3-none-any.whl", hash = "sha256:c4bd2010052e4d33241433720d054322403fa7ad914fdc5cb1b31a713d4c561e", size = 9869, upload-time = "2026-04-28T14:23:45.695Z" }, +] + +[[package]] +name = "flexcache" +version = "0.3" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "typing-extensions" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/55/b0/8a21e330561c65653d010ef112bf38f60890051d244ede197ddaa08e50c1/flexcache-0.3.tar.gz", hash = "sha256:18743bd5a0621bfe2cf8d519e4c3bfdf57a269c15d1ced3fb4b64e0ff4600656", size = 15816, upload-time = "2024-03-09T03:21:07.555Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/27/cd/c883e1a7c447479d6e13985565080e3fea88ab5a107c21684c813dba1875/flexcache-0.3-py3-none-any.whl", hash = "sha256:d43c9fea82336af6e0115e308d9d33a185390b8346a017564611f1466dcd2e32", size = 13263, upload-time = "2024-03-09T03:21:05.635Z" }, +] + +[[package]] +name = "flexparser" +version = "0.4" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "typing-extensions" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/82/99/b4de7e39e8eaf8207ba1a8fa2241dd98b2ba72ae6e16960d8351736d8702/flexparser-0.4.tar.gz", hash = "sha256:266d98905595be2ccc5da964fe0a2c3526fbbffdc45b65b3146d75db992ef6b2", size = 31799, upload-time = "2024-11-07T02:00:56.249Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/fe/5e/3be305568fe5f34448807976dc82fc151d76c3e0e03958f34770286278c1/flexparser-0.4-py3-none-any.whl", hash = "sha256:3738b456192dcb3e15620f324c447721023c0293f6af9955b481e91d00179846", size = 27625, upload-time = "2024-11-07T02:00:54.523Z" }, +] + +[[package]] +name = "fonttools" +version = "4.63.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/84/69/c97f2c18e0db87d2c7b15da1974dace76ae938f1cfa22e2727a648b7ed43/fonttools-4.63.0.tar.gz", hash = "sha256:caeb583deeb5168e694b65cda8b4ee62abedfa66cf88488734466f2366b9c4e0", size = 3597189, upload-time = "2026-05-14T12:04:30.958Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/75/2b/a7f1545bdf5da69c4bda0cea2a5781f0ad2a6623e0277267672db43c5fe6/fonttools-4.63.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:2b8ae05d9eacf6081414d759c0a352769ac28ce31280d6bb8e77b03f9e3c449f", size = 2881793, upload-time = "2026-05-14T12:02:56.645Z" }, + { url = "https://files.pythonhosted.org/packages/49/50/965308c703f085f225db2886813b27e015b8b3438c350b22dd65b52c2a2c/fonttools-4.63.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:79cdc9f567aec74a72918fd060283911406750cbc9fd28c1316023deb6ce31a9", size = 2428130, upload-time = "2026-05-14T12:02:58.891Z" }, + { url = "https://files.pythonhosted.org/packages/d8/38/6937fbd7f2dc3a6b48725851bc2c15ec949b9af14d9bbcb5fe83cdf9bdf9/fonttools-4.63.0-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:2c14b4fd138c4bafcca294765c547914e1aa431ae1ca94ab99d8db08c958bd3b", size = 5111952, upload-time = "2026-05-14T12:03:01.263Z" }, + { url = "https://files.pythonhosted.org/packages/0b/43/a81f20050a3115b57d62c8e781446949512eac36690dc384ccea65ff4cc1/fonttools-4.63.0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:d76ac49f929aecaf82d83250b8347e099d7aecba0f4726c1d9b6df3b8bb5fe18", size = 5082308, upload-time = "2026-05-14T12:03:03.211Z" }, + { url = "https://files.pythonhosted.org/packages/67/00/cdd9d4944ca6ae280d01e69cc37bde3bf663630b837a6fc6d2cd65d80e0e/fonttools-4.63.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:dcf076a4474fe0d7367e5bbf5b052c7284fa1feca729c04176ce513521afd8a0", size = 5087932, upload-time = "2026-05-14T12:03:05.147Z" }, + { url = "https://files.pythonhosted.org/packages/f5/f1/0aa0dbea778c75adbef223c42019fd47d22262b905974d62d829545d485f/fonttools-4.63.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:7dd683fef0663e9f0f45cf541d788d24caa3ec9db50796b588e1757d8b3bc007", size = 5213271, upload-time = "2026-05-14T12:03:07.238Z" }, + { url = "https://files.pythonhosted.org/packages/a8/99/253e4056e1f0e67b9390125a154b73b5eb73ad521bece95c004858fdeec2/fonttools-4.63.0-cp311-cp311-win32.whl", hash = "sha256:afefc1ed0a59785a7fb06ea7e1678e849c193e1e387db783579bc7b3056fcfcb", size = 2304473, upload-time = "2026-05-14T12:03:09.271Z" }, + { url = "https://files.pythonhosted.org/packages/08/60/defa5e69641db890a63be281f41345f4c33b157824eaf0b9fad3e08b0dcb/fonttools-4.63.0-cp311-cp311-win_amd64.whl", hash = "sha256:063e08bd17bd5a90127a14123de0d6a952dbc847695fd98b63c043d58057f90c", size = 2356389, upload-time = "2026-05-14T12:03:11.53Z" }, + { url = "https://files.pythonhosted.org/packages/08/ef/b3c6b9b5be2f82416d73fe2ed2e96e2793cd80e7510bd6a17ca79cdd88ec/fonttools-4.63.0-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:37dd23e621e3b0aef1baa70a303b80aaf38449632cfc8fd2a55fb285bbccfc02", size = 2881131, upload-time = "2026-05-14T12:03:13.386Z" }, + { url = "https://files.pythonhosted.org/packages/44/a0/c815bea63117fa63e4e1c01f8a1110d2112fa003f838e6467094ec2432ce/fonttools-4.63.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:a9faff9e0c1f76f9fd55899d2ce785832efebab37eb8ae13995853aef178bef0", size = 2426704, upload-time = "2026-05-14T12:03:15.801Z" }, + { url = "https://files.pythonhosted.org/packages/44/04/0b91d8e916e92ad1fac9e4624760baf0fd5ff2ead614c2f68fb21373f03f/fonttools-4.63.0-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:ef3048ef05dbb552b89817713d9cac912e00d0fde4a3105c00d29e52e10c89af", size = 5044298, upload-time = "2026-05-14T12:03:18.085Z" }, + { url = "https://files.pythonhosted.org/packages/77/c7/2342da9830e3e9d4870305ca5d2091d2a83284f2953079b7bdd3b5e029d8/fonttools-4.63.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:58dc6bb86a78d782f00f9190ca02c119cf5bbe2807536e361e18d42019f877d8", size = 4999800, upload-time = "2026-05-14T12:03:20.161Z" }, + { url = "https://files.pythonhosted.org/packages/e6/6d/67fe16c48d7ce050979b33f47e0d28a318f02da030602e944c34f7a16ef3/fonttools-4.63.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:ee08ebfa58f6e1aeff5697ab9582105bb620008c1caafb681e4c557e7483027b", size = 4982666, upload-time = "2026-05-14T12:03:22.87Z" }, + { url = "https://files.pythonhosted.org/packages/f2/00/3bbab338c07c71fa56269953845e92c951a61457bbbb0f1022551ea266d9/fonttools-4.63.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:27fdc65af8da6f88b9c6121c47a464cbe359fcfff7ff6fc2d37a1f395d755b78", size = 5133598, upload-time = "2026-05-14T12:03:25.168Z" }, + { url = "https://files.pythonhosted.org/packages/62/f2/aa27c7f98db5b064883dadcc5283947e81e034de42e22a33675878d98b54/fonttools-4.63.0-cp312-cp312-win32.whl", hash = "sha256:af2fd1664d00a397d75f806985ddb36282091c2131a73a6485c23b4a34722263", size = 2292575, upload-time = "2026-05-14T12:03:27.496Z" }, + { url = "https://files.pythonhosted.org/packages/87/36/cccb9bc2a6ab63d1b2980374f0dca72ce95ae267c9b4cfe77455bb70d0d4/fonttools-4.63.0-cp312-cp312-win_amd64.whl", hash = "sha256:59ac449f8cca9b4ffa08d2e7bbadad87ce710d69d1eda5c3c1ce579baa987272", size = 2343211, upload-time = "2026-05-14T12:03:30.057Z" }, + { url = "https://files.pythonhosted.org/packages/0f/8d/d8fec3dcde2963f8c908fb315e5ff2cd0ac34f82394bbbf73a2aa5145ce3/fonttools-4.63.0-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:cd7e9857e5e63738b9d9fd707bc1f59c8b09e5177726d23664db393c59bb08bd", size = 2876062, upload-time = "2026-05-14T12:03:32.554Z" }, + { url = "https://files.pythonhosted.org/packages/ef/71/d935dc54e4ff121bfdd11e08702db63a7e6f25af21d8a3d7b7212df53641/fonttools-4.63.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:c2a2a42198b696a6f48fad91709afb55176e66a5e566131219dba372fb7f8c59", size = 2424594, upload-time = "2026-05-14T12:03:34.86Z" }, + { url = "https://files.pythonhosted.org/packages/8e/40/e76320afa1df918e146155ef239b1719ee266092e96f5423bfd075affba1/fonttools-4.63.0-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:1e874792a8212b44583ea02189d9e693906b2f78b261f372f95d6c563210ac1d", size = 5024840, upload-time = "2026-05-14T12:03:36.745Z" }, + { url = "https://files.pythonhosted.org/packages/ce/36/0b805d8c485f872f65a509cbe3b58a5d0d17bee855333b54a150c79d3061/fonttools-4.63.0-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:22135da48a348785c5e2d5d2d9d6bec5ed44adacbaeb9db12d9493bf6c6bfa68", size = 4975801, upload-time = "2026-05-14T12:03:38.833Z" }, + { url = "https://files.pythonhosted.org/packages/c8/26/2cee03d0aa083ab022da5c07aff9ed3f689da1defb81ad6917c9627896da/fonttools-4.63.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:ccf41f2efdf56994d22d73bef4ced1052161958169428d06ba9724ea9e9a64be", size = 4965009, upload-time = "2026-05-14T12:03:41.494Z" }, + { url = "https://files.pythonhosted.org/packages/7e/48/cc4b66d9058c0d0982c833fad10127c4b0e9324606aafa41382295ca4102/fonttools-4.63.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:9ced0bd02ac751dd6319b0da88aaef24414e3b0dbc32bb4f24944821a3741a27", size = 5105892, upload-time = "2026-05-14T12:03:43.525Z" }, + { url = "https://files.pythonhosted.org/packages/d8/1f/a98a30a814b9ddef3a2e706025f90b9e0bc94890e6cb15254bc86547d11a/fonttools-4.63.0-cp313-cp313-win32.whl", hash = "sha256:85be818f5506e8a7753153def2c9550178f0ecae6a47b5e0e8dbb23f7cc90380", size = 2291313, upload-time = "2026-05-14T12:03:45.594Z" }, + { url = "https://files.pythonhosted.org/packages/92/46/5177b01f3b4abfdd4409f31cca4ab279c9343a26efbe9ec78c97fc612e02/fonttools-4.63.0-cp313-cp313-win_amd64.whl", hash = "sha256:ba04cb5891d4c0c21b6da95eda8d7b090021508a294fff33464fc7d241e0856b", size = 2342299, upload-time = "2026-05-14T12:03:47.414Z" }, + { url = "https://files.pythonhosted.org/packages/27/d2/23d25e3f247b328be58d04a4c9f894178a0d1eda7d42867cfb388adaf416/fonttools-4.63.0-cp314-cp314-macosx_10_15_universal2.whl", hash = "sha256:fd1e3094f42d806d3d7c79162fc59e5910fcbe3a7360c385b8da969bc4493745", size = 2875338, upload-time = "2026-05-14T12:03:50.052Z" }, + { url = "https://files.pythonhosted.org/packages/cd/58/7dfa0c761cb3b2964e2a84c4dc986c926a87de0cb9fb60d5b28ded3f2914/fonttools-4.63.0-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:6e528da43bc3791085f8cb6141b1d13e459226790240340fcbb4625649238b03", size = 2422661, upload-time = "2026-05-14T12:03:52.154Z" }, + { url = "https://files.pythonhosted.org/packages/dd/87/64cfa18a7a1621d17b7f4502b2b0ed8a135a90c3db51ea590ee99043e76b/fonttools-4.63.0-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:6b2248c5decb223562f7902ff6325077a073f608ee8e33e88ad88db734eb9f49", size = 5010526, upload-time = "2026-05-14T12:03:54.647Z" }, + { url = "https://files.pythonhosted.org/packages/36/e1/a8933a72c45a87177fbde2696e0d0755c8c9062f8c077a961c6215fa27b1/fonttools-4.63.0-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:308f957cdeaf8abe4e5f2f124902ef405448af92c90f80e302a3b771c2e6116b", size = 4923946, upload-time = "2026-05-14T12:03:56.984Z" }, + { url = "https://files.pythonhosted.org/packages/27/60/872e6e233b8c5e8b41413796ff18b7fe479661bd40147e071b450dfad7a1/fonttools-4.63.0-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:bf00f21eb5fb721dbaf73d1e9da6d02a1af7768f2ebcf9798be98beab8ba90f6", size = 4962489, upload-time = "2026-05-14T12:03:59.443Z" }, + { url = "https://files.pythonhosted.org/packages/30/c4/83c24f2ec38b90cfda84bf4b1a1f49df80e84a1db4e7ac6e0d41bf23bc39/fonttools-4.63.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:c1aaa4b9c75798400ac043ce04d74e7830376c85095a5a6ed7cba2f17a266bf4", size = 5071870, upload-time = "2026-05-14T12:04:02.122Z" }, + { url = "https://files.pythonhosted.org/packages/de/40/3ae22b60ff1d41ce0bd044b31238cdc72cef99f28b976f1e128ebd618c9b/fonttools-4.63.0-cp314-cp314-win32.whl", hash = "sha256:22693918177bd9ceabec4736d338045f357769416fc6b0b2508eefef75b08616", size = 2295026, upload-time = "2026-05-14T12:04:04.47Z" }, + { url = "https://files.pythonhosted.org/packages/c3/d4/98078064ccc76b45cb0f6c002452011e93c4bd26f6850344f0951cc1fe89/fonttools-4.63.0-cp314-cp314-win_amd64.whl", hash = "sha256:7d782fac32985914c351556f68ac0855391572bcd87de50e05970d3cd4c96fc5", size = 2347454, upload-time = "2026-05-14T12:04:06.752Z" }, + { url = "https://files.pythonhosted.org/packages/49/4e/652d1580c5f4e39f7d103b0c793e4773129ad633dce4addd0cf4dfebde02/fonttools-4.63.0-cp314-cp314t-macosx_10_15_universal2.whl", hash = "sha256:6db5140a60a5d731d21ec076745b40a310607731b0a565b50776393188649001", size = 2958152, upload-time = "2026-05-14T12:04:08.706Z" }, + { url = "https://files.pythonhosted.org/packages/0e/55/ad864c9a9b219f552eb46b32cd7906c466e5a578ba0c3abfcc0fe7413eb6/fonttools-4.63.0-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:7d76edbff9014094dbf03bd2d074709dfa6ec7aba13d838c937a2b33d2d6a86e", size = 2460809, upload-time = "2026-05-14T12:04:10.783Z" }, + { url = "https://files.pythonhosted.org/packages/ea/2b/0aa8db70f18cf52e49b4ed5ecec68547f981160bf5ded3b5aed6faa0a6f9/fonttools-4.63.0-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:0eac00b9118c3c2f87d272e45341871c5b3066baa3c86897fa634a7c3fb59096", size = 5148649, upload-time = "2026-05-14T12:04:12.747Z" }, + { url = "https://files.pythonhosted.org/packages/7f/63/18e4369c25043096f1048e0c9915951adc4f842bd81c6b18155824d6fa99/fonttools-4.63.0-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:51394295f1a51de8b5f30bdb1e1b9a4231536c7064ef5c6e211eec19fa36036f", size = 4932147, upload-time = "2026-05-14T12:04:14.806Z" }, + { url = "https://files.pythonhosted.org/packages/a1/3f/67f3eac2ffd8a98446c5022f8ed3864eac878a5ff7af8df4c8286dba16cc/fonttools-4.63.0-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:9e12f105d2b6342c559c298afb674006bb2893afc7102dcf8a1b55b0486b4e40", size = 5027237, upload-time = "2026-05-14T12:04:17.675Z" }, + { url = "https://files.pythonhosted.org/packages/1a/ba/4e6214cb38a7b04779e97bb7636de9a5c7f20af7018d03dee0b64c08510a/fonttools-4.63.0-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:796f27556dbe094c4824f75ca85267e4df776c79036c8441469a4df37038c196", size = 5053933, upload-time = "2026-05-14T12:04:20.818Z" }, + { url = "https://files.pythonhosted.org/packages/34/3b/214dcc19ee31d3d38fb5ad2755c11ef0514e5dc300bbaf41c0b69f393799/fonttools-4.63.0-cp314-cp314t-win32.whl", hash = "sha256:948428a275741f0b64b113c955425a953314f4b9ab9997f73a72c83e68e569c8", size = 2359326, upload-time = "2026-05-14T12:04:24.22Z" }, + { url = "https://files.pythonhosted.org/packages/dd/1e/3ff1a9b523058c2eeb6a9d50f5574e2a738200d0d94107d5bc4105e8da3f/fonttools-4.63.0-cp314-cp314t-win_amd64.whl", hash = "sha256:6d4741eb179121cab9eea4cb2393d24492373a260d7945006358c08cfbf45419", size = 2425829, upload-time = "2026-05-14T12:04:26.829Z" }, + { url = "https://files.pythonhosted.org/packages/2c/47/c99d5268f354002ce80f8d029cd9d7d872969da1de8b93d32de4dc56d6f4/fonttools-4.63.0-py3-none-any.whl", hash = "sha256:445af2eab030a16b9171ea8bdda7ebf7d96bda2df88ee182a464252f6e05e20d", size = 1164562, upload-time = "2026-05-14T12:04:29.092Z" }, +] + +[[package]] +name = "fqdn" +version = "1.5.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/30/3e/a80a8c077fd798951169626cde3e239adeba7dab75deb3555716415bd9b0/fqdn-1.5.1.tar.gz", hash = "sha256:105ed3677e767fb5ca086a0c1f4bb66ebc3c100be518f0e0d755d9eae164d89f", size = 6015, upload-time = "2021-03-11T07:16:29.08Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/cf/58/8acf1b3e91c58313ce5cb67df61001fc9dcd21be4fadb76c1a2d540e09ed/fqdn-1.5.1-py3-none-any.whl", hash = "sha256:3a179af3761e4df6eb2e026ff9e1a3033d3587bf980a0b1b2e1e5d08d7358014", size = 9121, upload-time = "2021-03-11T07:16:28.351Z" }, +] + +[[package]] +name = "freezegun" +version = "1.5.5" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "python-dateutil" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/95/dd/23e2f4e357f8fd3bdff613c1fe4466d21bfb00a6177f238079b17f7b1c84/freezegun-1.5.5.tar.gz", hash = "sha256:ac7742a6cc6c25a2c35e9292dfd554b897b517d2dec26891a2e8debf205cb94a", size = 35914, upload-time = "2025-08-09T10:39:08.338Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/5e/2e/b41d8a1a917d6581fc27a35d05561037b048e47df50f27f8ac9c7e27a710/freezegun-1.5.5-py3-none-any.whl", hash = "sha256:cd557f4a75cf074e84bc374249b9dd491eaeacd61376b9eb3c423282211619d2", size = 19266, upload-time = "2025-08-09T10:39:06.636Z" }, +] + +[[package]] +name = "gevent" +version = "26.5.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "cffi", marker = "platform_python_implementation == 'CPython' and sys_platform == 'win32'" }, + { name = "greenlet", marker = "platform_python_implementation == 'CPython'" }, + { name = "zope-event" }, + { name = "zope-interface" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/c4/cb/98aa3a299e2fc4a2372b5d124863e02965b64579ffc29fe54d0641e65b2f/gevent-26.5.0.tar.gz", hash = "sha256:1655eb04c1e20d71b2aa4a3c7528162dd58ff6cc46a037af1f01f534c80fefba", size = 6712354, upload-time = "2026-05-20T21:22:45.132Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/2a/ea/ea87c08931c9e4c6c40bb05a2cb19c2d6f93fe6e0052f9152ea5ade6d037/gevent-26.5.0-cp311-cp311-manylinux_2_28_aarch64.whl", hash = "sha256:cd3dc60581687e2618286108f8e2f820d8446be4b34131065011c066e911d39c", size = 1768295, upload-time = "2026-05-20T21:17:29.438Z" }, + { url = "https://files.pythonhosted.org/packages/da/92/1d0e7287ae55700a8d25153ac736896bd9bcc3f85a12d374ef398db4b33c/gevent-26.5.0-cp311-cp311-manylinux_2_28_ppc64le.whl", hash = "sha256:dc7fa28b2d627f8e87595f39043b6dec71e8e7fb97e685e5506c47cf3ff8cb2e", size = 1862627, upload-time = "2026-05-20T21:15:59.365Z" }, + { url = "https://files.pythonhosted.org/packages/3a/4c/7f5ed67e52dfdef4ff91ae1a6fb28186d52e2496962edc8f17bdea9ab2c0/gevent-26.5.0-cp311-cp311-manylinux_2_28_s390x.whl", hash = "sha256:68c5fc21cef80268cdff88a4ae6c025fabb019b071f6f8ee4d20a7bccbddb873", size = 1804690, upload-time = "2026-05-20T21:30:51.713Z" }, + { url = "https://files.pythonhosted.org/packages/4c/75/0f5da6ca045f8a052203e1810058029f4b682507a789b413cac7d28bae28/gevent-26.5.0-cp311-cp311-manylinux_2_28_x86_64.whl", hash = "sha256:d325502eb0695708ef8c899f605573ed6847f3961f8159627dba267fbf3ce457", size = 2119054, upload-time = "2026-05-20T20:35:22.678Z" }, + { url = "https://files.pythonhosted.org/packages/6e/f1/fcff7f7fad2bb33f3742db6b2145825a2191c0cd31d75789b0741fd28faf/gevent-26.5.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:a11daf3a588b932c8bf965fb18444c69aff48badec88435e988cf8d67137075a", size = 1778784, upload-time = "2026-05-20T21:16:38.182Z" }, + { url = "https://files.pythonhosted.org/packages/98/57/151314f00bdc6ba77333febb3e9dc97fdf94d79426559b4fa8332f0c2b6e/gevent-26.5.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:1101b5ef82a3fb178550cfd80f32293dc8dd2f3d0828292223ebba29d6f76e33", size = 2145373, upload-time = "2026-05-20T20:43:27.255Z" }, + { url = "https://files.pythonhosted.org/packages/1a/b5/7a02f711db62cbed1c1a00e1f9ff50eef95ccc78d4c04a0f93636655d1b7/gevent-26.5.0-cp311-cp311-win_amd64.whl", hash = "sha256:5233109ad4f3af16393ba9888f238919a05ce15ce68d6831ac8a0da8dfb750ae", size = 1696576, upload-time = "2026-05-20T20:15:49.62Z" }, + { url = "https://files.pythonhosted.org/packages/f8/9b/5022adc310697ef25c6fb22eb9bf0ebcad3427b51776e882709de9a8b6d7/gevent-26.5.0-cp311-cp311-win_arm64.whl", hash = "sha256:3be804565168ffacebeb21af9f1cd689831a89f0f12fc0c3f423c730c3c9eb31", size = 1552095, upload-time = "2026-05-20T20:16:54.81Z" }, + { url = "https://files.pythonhosted.org/packages/37/0b/1a530b2db55c97cc0cf44116201f538f3033c04c1d2aca143979b412f4be/gevent-26.5.0-cp312-cp312-macosx_11_0_universal2.whl", hash = "sha256:e80ad2a8a1e8bdaa5605e3bf4929e0cebf9ea7b8237c83362f7257698bb14280", size = 2929714, upload-time = "2026-05-20T20:13:24.656Z" }, + { url = "https://files.pythonhosted.org/packages/b9/df/32fe851ed5f68493f354e09b19bdebae0de1185be4db0b2988e71e737fd3/gevent-26.5.0-cp312-cp312-manylinux_2_28_aarch64.whl", hash = "sha256:fe42c037253580a3386fce275f8a2a845e540f5a729916934a732f13d42e72cc", size = 1784838, upload-time = "2026-05-20T21:17:31.063Z" }, + { url = "https://files.pythonhosted.org/packages/e5/9a/21332674f9a10e8cdf13b41b52e9d663647a1c6e1dc3c62b07c0aeefd360/gevent-26.5.0-cp312-cp312-manylinux_2_28_ppc64le.whl", hash = "sha256:9f463c7d6f69d13b6fe8e3b832a6175a6e95328a940f38495d25496d1ae8ad88", size = 1880440, upload-time = "2026-05-20T21:16:00.881Z" }, + { url = "https://files.pythonhosted.org/packages/9f/b1/5f8a4196113cf7f3fdd987b483f7e6b10c28ea3930c4727e31ba8cce51b6/gevent-26.5.0-cp312-cp312-manylinux_2_28_s390x.whl", hash = "sha256:96d5e96b1b14a4c1023dcfcc114533217f13febc3b6169254f23fc18d19fee29", size = 1831592, upload-time = "2026-05-20T21:30:53.832Z" }, + { url = "https://files.pythonhosted.org/packages/4e/69/1559b1f6b5107a9118fccd300240879bd581b6d87b03d568d0d155ea702c/gevent-26.5.0-cp312-cp312-manylinux_2_28_x86_64.whl", hash = "sha256:bccff69c462e3650a0fd1d4e9cfc8b6effe15f3e9b1cad20a7bb5ce14b057efd", size = 2114915, upload-time = "2026-05-20T20:35:25.041Z" }, + { url = "https://files.pythonhosted.org/packages/e4/32/602c499d54472f64e5cdf6013aeab5ce6aa6fed005387e8b4f2d22f5dc8d/gevent-26.5.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:f519139354d5ca7625df9ddb1b2ffada885c14abc5b4dbae3682e967ddf79669", size = 1796906, upload-time = "2026-05-20T21:16:39.65Z" }, + { url = "https://files.pythonhosted.org/packages/f9/3c/2fe77ee6e3d381b3c50c0b7d6c4c08c08b8ff5e8c0d9dd51a3b426d61eec/gevent-26.5.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:0bf57df54f1c66273bf3601c2a1e41b12138fe848933718369663bc54f177ca2", size = 2140806, upload-time = "2026-05-20T20:43:28.895Z" }, + { url = "https://files.pythonhosted.org/packages/22/d5/4620797bbd9c88f4541188efc138b0d615f9834db540da36a2249ee929c5/gevent-26.5.0-cp312-cp312-win_amd64.whl", hash = "sha256:e49ce0de007dfd7412edbc2b5d41cce33b049bb1b7086f50be5a09e601bde603", size = 1699995, upload-time = "2026-05-20T20:15:39.311Z" }, + { url = "https://files.pythonhosted.org/packages/cb/83/ac3477dfc0f9fd80c88110102c73cefc35dcded2b248544f45a8fa5412df/gevent-26.5.0-cp312-cp312-win_arm64.whl", hash = "sha256:5c5ff29495a2eed2a244de8150f21893d6c1b15d8b4b5719ab4bbfa06db1e28f", size = 1547433, upload-time = "2026-05-20T20:15:51.656Z" }, + { url = "https://files.pythonhosted.org/packages/7d/47/5b992ab9c8037633cfd0fe698a97a878f59d8eb53c381e91e9a1a76fd215/gevent-26.5.0-cp313-cp313-macosx_11_0_universal2.whl", hash = "sha256:9b4d3f34c913d1a6bec6d030365a517f3b527a9773b12e58cf56c3339bbe96e6", size = 2952523, upload-time = "2026-05-20T20:13:04.698Z" }, + { url = "https://files.pythonhosted.org/packages/74/11/c7dfc773eb43331a682efed610b49df6e976331f1b0e1c592a0c35d29872/gevent-26.5.0-cp313-cp313-manylinux_2_28_aarch64.whl", hash = "sha256:1d8da4e799431feeb4c9e441ac7431f0baabb9106976790d884289d08ac08359", size = 1787044, upload-time = "2026-05-20T21:17:32.845Z" }, + { url = "https://files.pythonhosted.org/packages/ae/28/9812933dac93560f46910a9e834805fe76f822c408bd1c20cdf299d7c311/gevent-26.5.0-cp313-cp313-manylinux_2_28_ppc64le.whl", hash = "sha256:51becdb4c30a8f45c1c028ad7a97bf5a1ed141f74b159a31aa9cc6aa1e6263a6", size = 1882342, upload-time = "2026-05-20T21:16:02.645Z" }, + { url = "https://files.pythonhosted.org/packages/96/4b/514f248f69b2230b69b0bb17f4158b0b05dd4b2cb469a60ab206e9fe7496/gevent-26.5.0-cp313-cp313-manylinux_2_28_s390x.whl", hash = "sha256:c42bbcd3d453b08ad8915fd3feaf3d44a3562cdf1c7b208f9837149711e16d9d", size = 1834136, upload-time = "2026-05-20T21:30:55.739Z" }, + { url = "https://files.pythonhosted.org/packages/53/67/f5f30716efca99b6200ae89a9303a7e94dae085b7de6f6d0033c52a37f4b/gevent-26.5.0-cp313-cp313-manylinux_2_28_x86_64.whl", hash = "sha256:bd3445e4fbeeb46690ed8efe94b8d1d46b14aa04af8866ae7a8da5997828d1c6", size = 2115349, upload-time = "2026-05-20T20:35:28.132Z" }, + { url = "https://files.pythonhosted.org/packages/09/d8/60e8809bde7986e6c4e6d106080b3603fa09b3bb0255fed1a4d8282e3ca2/gevent-26.5.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:b573d5b2826edc705f31f07da6889ad483a6a0d64944ebd8d32205f7c5bf46fb", size = 1799443, upload-time = "2026-05-20T21:16:41.928Z" }, + { url = "https://files.pythonhosted.org/packages/f8/41/b388b2b1f0a026ea30687e51ddf81dbb783dfb55fac0a16708d2821d99e5/gevent-26.5.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:4d53b1b28f2082a151bded2850b53f6baed02f742d2a1584029e8bd42d457fb4", size = 2141117, upload-time = "2026-05-20T20:43:30.694Z" }, + { url = "https://files.pythonhosted.org/packages/b1/f3/ac9a4b0de487e390c5d53a908a9347c0df0102de2bbf3e8603087769191d/gevent-26.5.0-cp313-cp313-win_amd64.whl", hash = "sha256:23569ce0c254eb821fc3dcfe250843dde8b3180b09bae9e222e41aa3fa4885b7", size = 1699862, upload-time = "2026-05-20T20:15:33.642Z" }, + { url = "https://files.pythonhosted.org/packages/2a/cf/1ef1fc9b390563c0f97702f94a557d1649b7bbb5724f9b86c2122747e92f/gevent-26.5.0-cp313-cp313-win_arm64.whl", hash = "sha256:40cdcdb2e404b6c82b82a4576bdb33958f23fc2deb0d933e9e022b362001e647", size = 1545341, upload-time = "2026-05-20T20:16:26.229Z" }, + { url = "https://files.pythonhosted.org/packages/17/55/7d98d3888e7bb9ad4656420dec69232ecbbea48792aff9295d0ad7cf8435/gevent-26.5.0-cp314-cp314-macosx_11_0_universal2.whl", hash = "sha256:75a0050e4b87f08ddee7e56f59e6014cd7fcdc3153046c09a847940515d12c85", size = 2968223, upload-time = "2026-05-20T20:13:17.223Z" }, + { url = "https://files.pythonhosted.org/packages/f8/b4/e8e116fcbcb9dc0bf3acc50037f86e1204c217c8ed5defde68be11b3aab6/gevent-26.5.0-cp314-cp314-manylinux_2_28_aarch64.whl", hash = "sha256:fd1a0b83a04e19378d9466ae0ee2b5937cf1d7fbfdcb916b2aea82179a208574", size = 1793926, upload-time = "2026-05-20T21:17:34.321Z" }, + { url = "https://files.pythonhosted.org/packages/28/07/7b267e9754b661defb93542e97731a4df21f8a40dc0f6c853faa717cf124/gevent-26.5.0-cp314-cp314-manylinux_2_28_ppc64le.whl", hash = "sha256:4c964c15076e76391d523ec24202f579a2535f7e301a40efb1656ae046d3eb69", size = 1887632, upload-time = "2026-05-20T21:16:04.158Z" }, + { url = "https://files.pythonhosted.org/packages/5c/50/b47d29e99449bd13b557ffa451401dc13d397a9923f562ef90a4e8514502/gevent-26.5.0-cp314-cp314-manylinux_2_28_s390x.whl", hash = "sha256:45d5438d1c84da5df7e832434627624709543630977332bb4e2d05ecca362cc9", size = 1838688, upload-time = "2026-05-20T21:30:57.979Z" }, + { url = "https://files.pythonhosted.org/packages/8b/eb/5b54ccff11bc7d7bebd40a24571ccc115d5cdae4f6c32ab457b43b436e42/gevent-26.5.0-cp314-cp314-manylinux_2_28_x86_64.whl", hash = "sha256:354f35924113abc954819216c2a6ee16751958c615681e0490946e31b437bd2f", size = 2120351, upload-time = "2026-05-20T20:35:32.699Z" }, + { url = "https://files.pythonhosted.org/packages/9c/70/30fd325c30e04b1e5174c61945e17421d53ddb2450366cc52cef234f8c4b/gevent-26.5.0-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:a47cd2d32f6404212d374ad8014a3491d7477dcf0cc09c5a2308ad6d325fd663", size = 1806684, upload-time = "2026-05-20T21:16:43.87Z" }, + { url = "https://files.pythonhosted.org/packages/cd/e8/fbf911ac3f9524ecfaed174d100fde671904ab8db92ceaf07faaebd13386/gevent-26.5.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:032157cebdedb84f2f52cdd980f2f5f2623eed6a8f083aadf44b44c47f628642", size = 2146606, upload-time = "2026-05-20T20:43:32.216Z" }, + { url = "https://files.pythonhosted.org/packages/9e/4d/284fcbbfde66fd978c2980c1fbe0eabd586af6e4b728649e9cf459e8b38f/gevent-26.5.0-cp314-cp314-win_amd64.whl", hash = "sha256:9c414935ba5fc88359110968851d3616f119082c937390d00a1c0f4f59be814f", size = 1722497, upload-time = "2026-05-20T20:16:44.274Z" }, + { url = "https://files.pythonhosted.org/packages/15/d2/9f66eb53434704402be0ba733bf3320bf589671a4b76fac52a7d6077e972/gevent-26.5.0-cp314-cp314-win_arm64.whl", hash = "sha256:2a0f5993a04b95a35b3a118b1a58ba272833f9b547b774001dea29f90620882f", size = 1574249, upload-time = "2026-05-20T20:15:50.873Z" }, + { url = "https://files.pythonhosted.org/packages/dc/d5/b4c50adb761878e3c96642b9f79bf44cee3120f3df55cd40876f51d89866/gevent-26.5.0-cp315-cp315-macosx_11_0_universal2.whl", hash = "sha256:2e117df896a2660c9ebd4e2b5afc02dfd6e2ddf9b495e787e67c72d105432b09", size = 2971993, upload-time = "2026-05-20T20:12:50.845Z" }, + { url = "https://files.pythonhosted.org/packages/03/83/71c2a945e80198422d1d93dbe67355f249fb456b451bf9201199d3ef6a1a/gevent-26.5.0-cp315-cp315-manylinux_2_28_aarch64.whl", hash = "sha256:af5ffe9c11ffb8a39b6bef2e8b722aa2043ae4980977915c6aa8c68b4bc26e46", size = 1796658, upload-time = "2026-05-20T21:17:35.968Z" }, + { url = "https://files.pythonhosted.org/packages/42/96/548ca77aed5cb9a44e855a6c23ebceeb3554a0ea9ca0c01c311878899a3e/gevent-26.5.0-cp315-cp315-manylinux_2_28_ppc64le.whl", hash = "sha256:7da34aef7e87c43dd3662e5785e79ed505c01399a7cb42876d2d8925969fd75f", size = 1891473, upload-time = "2026-05-20T21:16:05.657Z" }, + { url = "https://files.pythonhosted.org/packages/f6/4f/f48bd47d5287afb0fbcc56165f3ed47583f1803bad401653fe27e71ade2d/gevent-26.5.0-cp315-cp315-manylinux_2_28_s390x.whl", hash = "sha256:1c6293a7046bcc6f3d8972a74b19cd7a4cfd02d3881edf0fcf827aa514bd247b", size = 1841429, upload-time = "2026-05-20T21:30:59.907Z" }, + { url = "https://files.pythonhosted.org/packages/a0/72/1925215fc720d2561fa3ec8d4af5f098f8d0cbfa76a45fafed6e5ade7718/gevent-26.5.0-cp315-cp315-manylinux_2_28_x86_64.whl", hash = "sha256:d3bde0f140a275b2fa88e4b6516bda85551930e10bc2fd95e18c1b7d11cb780c", size = 2123895, upload-time = "2026-05-20T20:35:34.964Z" }, + { url = "https://files.pythonhosted.org/packages/83/59/0f584f6b1170c9a6abd9b70ccf5e9cc5ead34eabafabc0e21876ef0fe6f7/gevent-26.5.0-cp315-cp315-musllinux_1_2_aarch64.whl", hash = "sha256:e29fb4b17d9958ec8cb7f6339a111b29bc23f2c2efbef86189d1248bb4862d17", size = 1809047, upload-time = "2026-05-20T21:16:45.977Z" }, + { url = "https://files.pythonhosted.org/packages/82/88/61e854bfd98ac22eac78a97fc6db10de0f9ace46514072b435c217168729/gevent-26.5.0-cp315-cp315-musllinux_1_2_x86_64.whl", hash = "sha256:b2239df2f7570efa03736678f3f053bb1bdd22a8a16cd28a2feb7d32ea5f533f", size = 2150764, upload-time = "2026-05-20T20:43:33.781Z" }, + { url = "https://files.pythonhosted.org/packages/b9/f5/af048b97433d7f9a7df7f5510b2c46918b7d073dcfb3bf6d0ef0e5a83dcc/gevent-26.5.0-cp315-cp315-win_amd64.whl", hash = "sha256:aae214952fd38d27a42dc416bb70193962ec932384b63445d29bbb5817a1c042", size = 1722600, upload-time = "2026-05-20T20:19:56.81Z" }, + { url = "https://files.pythonhosted.org/packages/11/95/fb74a2299c6a2d78d9de12deaaac640ab5d2ef96a8e0f97a3ff84b9ca84b/gevent-26.5.0-cp315-cp315-win_arm64.whl", hash = "sha256:f7067564f139e33bf26a31ee3b13d168d76eb99a44b85ced626652b158baa80c", size = 1574406, upload-time = "2026-05-20T20:17:12.125Z" }, +] + +[[package]] +name = "greenlet" +version = "3.5.2" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/dd/8b/befc3cb36965f397d87e86fb3b00e3ec0dc67c1ecb0986d7f54ee528f018/greenlet-3.5.2.tar.gz", hash = "sha256:c1b906220d83c140361cdd12eef970fb5881a168b98ee58a43786426173da14c", size = 199243, upload-time = "2026-06-17T20:19:01.317Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/21/68/371ee6dad168be3386c46030bedaa8e3e7e3cf3d203621d4529e78ff36ef/greenlet-3.5.2-cp311-cp311-macosx_11_0_universal2.whl", hash = "sha256:d7792398872f89466c6671d5d193537eff163ecf7fac78d82e6ddc25017fb4f5", size = 286925, upload-time = "2026-06-17T17:33:17.928Z" }, + { url = "https://files.pythonhosted.org/packages/26/16/ed5706c26b4d26f3fabceb79abca992654eac8b0fa435def2ac6dbd92122/greenlet-3.5.2-cp311-cp311-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:711028c953cd6ce5dc01bbb5a1747e3ad6bd8b2f7ded73778bb936e8dab9e3b6", size = 606036, upload-time = "2026-06-17T18:07:18.538Z" }, + { url = "https://files.pythonhosted.org/packages/8e/32/f9c77093af9f5f96615922b7e3fe3690a9faff02adb89f1d74e21578b147/greenlet-3.5.2-cp311-cp311-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:5eba55076d79e8a5176e6925295cfb901ebc95dae493342ede22230f75d8bee2", size = 617821, upload-time = "2026-06-17T18:29:41.317Z" }, + { url = "https://files.pythonhosted.org/packages/27/f5/a963a939039aa5acafc2f9535f6cc8958ad30afe1478e2e37ab5098af74d/greenlet-3.5.2-cp311-cp311-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:1724499fc08388208408681c53c5062e9803c334e5a0bdaeb616228ba882aac8", size = 625675, upload-time = "2026-06-17T18:39:25.767Z" }, + { url = "https://files.pythonhosted.org/packages/bd/d4/642833e778c17d32b5cabb793e14ce7364c55952462fc506fecdee55d485/greenlet-3.5.2-cp311-cp311-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:c1c1e5ad80f1f38ea479b83b39dccb20874cfe9ad5e52f87225fa294ba4d39a1", size = 616877, upload-time = "2026-06-17T17:39:26.564Z" }, + { url = "https://files.pythonhosted.org/packages/ef/c8/995a898ebbf44e3da0b7ea6fbc1631518c185fb83467a5d6cf408d6d3ced/greenlet-3.5.2-cp311-cp311-manylinux_2_39_riscv64.whl", hash = "sha256:e976f9f6941f57d87a194c91868622c8b22a142a741d2fde31655c319133ade6", size = 420572, upload-time = "2026-06-17T18:41:18.035Z" }, + { url = "https://files.pythonhosted.org/packages/d3/cc/7120f83e78b8be3cf7acbe2306b3b7bd2cbf99f5ad12e85e2f05d7b31961/greenlet-3.5.2-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:9e194b996aa1b89d933cfe136e5eb39b22a8b72ba59d376ef39a55bca4dbf47f", size = 1577274, upload-time = "2026-06-17T18:22:10.692Z" }, + { url = "https://files.pythonhosted.org/packages/fa/d8/05a0074ee485dd51c320fd706fd7ed48006b9cad3443092d7df1a655f0d2/greenlet-3.5.2-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:4e554809538bd4867f24421b43abde170f9c9b8192149b30df5e164bcac6124f", size = 1643566, upload-time = "2026-06-17T17:40:05.452Z" }, + { url = "https://files.pythonhosted.org/packages/35/fe/9fe2060bdeece682e38d381184ae66045b48ed183c107ab3f88b9886a630/greenlet-3.5.2-cp311-cp311-win_amd64.whl", hash = "sha256:e063263ce9047878480d7e536012fc8b7c8e1922989eb5f03b9ab998a2ee7b7e", size = 238643, upload-time = "2026-06-17T17:37:03.039Z" }, + { url = "https://files.pythonhosted.org/packages/41/13/a9db72f5b6b700977ebd371d6a1f2984a08838357de924fcd5571607b1bf/greenlet-3.5.2-cp311-cp311-win_arm64.whl", hash = "sha256:a3f76a94e2d6e1fee8f302265679d8cc47d71a203936dd03c6e2ace0f9cfd46d", size = 237135, upload-time = "2026-06-17T17:34:34.14Z" }, + { url = "https://files.pythonhosted.org/packages/3f/7a/6bc2a7835731387ed303b9390ce68a116ab053df05450a59181239200454/greenlet-3.5.2-cp312-cp312-macosx_11_0_universal2.whl", hash = "sha256:76dae33e97b52743a19210931ee3e78a88fe1438bc2fc4ee5e7512d289bfad4f", size = 288351, upload-time = "2026-06-17T17:36:17.019Z" }, + { url = "https://files.pythonhosted.org/packages/57/1b/bd98062fcef6d0e9d0873ab6f2d029772e6ea342972ae43275bd6177900f/greenlet-3.5.2-cp312-cp312-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:30252d191d6959df1d040b559a38fc017139606c5ecc2ad00416557c0355d742", size = 604273, upload-time = "2026-06-17T18:07:20.296Z" }, + { url = "https://files.pythonhosted.org/packages/25/e6/fe392c522bf45d976abe7db2793f6ef4e87b053ebb869deeaae46aeb54da/greenlet-3.5.2-cp312-cp312-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:1adc23c50f22b0f5979521909a8360ab4a3d3bef8b641ce633a04cf1b1c967ea", size = 616536, upload-time = "2026-06-17T18:29:43.205Z" }, + { url = "https://files.pythonhosted.org/packages/42/df/cdb1f75f07214f13110e7e3879531f11c26083bd480a56a9474c430ec44c/greenlet-3.5.2-cp312-cp312-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:87359c23eb4e8f1b16da68faad29bf5aeb80e3628d7d8e4aa2e41c36879ddedd", size = 621843, upload-time = "2026-06-17T18:39:27.507Z" }, + { url = "https://files.pythonhosted.org/packages/68/4a/399ff81fa93a19d6a9df394cef0355f082dbc19ad41aba9593cd0ad444e2/greenlet-3.5.2-cp312-cp312-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:1f052fff492c52fdfa99bd3b3c1389a53de37dae76a0562741417f0d018f02b3", size = 613749, upload-time = "2026-06-17T17:39:28.148Z" }, + { url = "https://files.pythonhosted.org/packages/2e/25/36a3628a7edcfeefddd3101dc88039c79721c5f8d688db7ebed1cbaaa789/greenlet-3.5.2-cp312-cp312-manylinux_2_39_riscv64.whl", hash = "sha256:f4d67c1684db3f9782c37ee4bade3f86f5a23a8fcf3f8359224106018ca40728", size = 424889, upload-time = "2026-06-17T18:41:19.469Z" }, + { url = "https://files.pythonhosted.org/packages/a5/75/f519593f12ad43d08e28c03a95cfe2eeae011707dbc9dab0c4a263ce90f9/greenlet-3.5.2-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:120b77c2a18ebf629c3a7886f68c6d01e065654844ad468f15bb93ace66f2094", size = 1573725, upload-time = "2026-06-17T18:22:12.023Z" }, + { url = "https://files.pythonhosted.org/packages/f1/bc/bc1ea4b0754c6c51bbf9d94677b0b1f7fbda8cbb404e44a896854fc0a940/greenlet-3.5.2-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:a850f6224088ef7dcc70f1a545cb6b3d119c35d6dca63b925b9f35da0635cdad", size = 1638132, upload-time = "2026-06-17T17:40:06.971Z" }, + { url = "https://files.pythonhosted.org/packages/36/c0/f0f5a34247df60de285f75f22e57f14027f4b3c43820981854b5b643ca6d/greenlet-3.5.2-cp312-cp312-win_amd64.whl", hash = "sha256:89da99ee8345b458ea2f16831dad31c88ddcdec454b48704d569a0b8fb28f146", size = 239393, upload-time = "2026-06-17T17:33:47.09Z" }, + { url = "https://files.pythonhosted.org/packages/09/17/a8544e165445f30aea67a8d9cf2786d2bb0eb1b0e0d224b4d9bd80e2d587/greenlet-3.5.2-cp312-cp312-win_arm64.whl", hash = "sha256:ca92411942154023c65851e6077d8ca0d00f19de5fa80bb2c6f196ff6c920ba9", size = 237723, upload-time = "2026-06-17T17:36:47.776Z" }, + { url = "https://files.pythonhosted.org/packages/d0/3c/bb37b9d40d65b0741a8b040ca5c307034d0a9822994dff5f825c88dd7a6b/greenlet-3.5.2-cp313-cp313-macosx_11_0_universal2.whl", hash = "sha256:0629377725977252159de1ebd3c6e49c170a63856e585446797bb3d66d4d9c34", size = 287178, upload-time = "2026-06-17T17:35:25.132Z" }, + { url = "https://files.pythonhosted.org/packages/f0/a6/0c5902393f492f8ceb19d0b5cf139284e3a11b333a049739643b1036b6f8/greenlet-3.5.2-cp313-cp313-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:a2ddf9eddc617681108dd071b3feabf3f4a4cd64846254aec4d4ceda098b639a", size = 606900, upload-time = "2026-06-17T18:07:21.692Z" }, + { url = "https://files.pythonhosted.org/packages/d8/7c/42899c31d4b87148ae4e3f87f63e13398824be6241f4dde42ded95768a34/greenlet-3.5.2-cp313-cp313-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:f41feb9f2b59e2e61ac9bea4e344ddd9396bf3cacb2583f73a3595ed7df6f8e7", size = 619265, upload-time = "2026-06-17T18:29:44.837Z" }, + { url = "https://files.pythonhosted.org/packages/6a/7e/28f991affb413b232b1e7d768db24c37b3f4d5daecc3f19b455d40bd2dea/greenlet-3.5.2-cp313-cp313-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:9dc23f0e5ad76415457212a4b947d22ebe4dc80baf02adf7dd5647a90f38bb4e", size = 625044, upload-time = "2026-06-17T18:39:29.046Z" }, + { url = "https://files.pythonhosted.org/packages/d3/52/4ff8c98d3cfe62b4515f8584ae14510a58f35c549cc5292b78d9b7a40b70/greenlet-3.5.2-cp313-cp313-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:09201fa698768db245920b00fdc86ee3e73540f01ca6db162be9632642e1a473", size = 616187, upload-time = "2026-06-17T17:39:29.473Z" }, + { url = "https://files.pythonhosted.org/packages/29/05/0cc9ec660e7acff85f93b0a048b6654371c822c884add44c02a465cf70e0/greenlet-3.5.2-cp313-cp313-manylinux_2_39_riscv64.whl", hash = "sha256:423167363c510a75b649f5cd58d873c29498ea03598b9e4b1c3b73e0f899f3d5", size = 427322, upload-time = "2026-06-17T18:41:20.892Z" }, + { url = "https://files.pythonhosted.org/packages/c9/a6/269c8bf9aefc13361ce1088f0e392b154cb21005de7862e42b5d782b81fd/greenlet-3.5.2-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:a1759fa4f14c398508cf20dc8037de55cc23ae8bd14c185c2718257837195ca5", size = 1573778, upload-time = "2026-06-17T18:22:13.497Z" }, + { url = "https://files.pythonhosted.org/packages/1f/9b/391d015cbc6323e81b14c02cf825fdca7e0049c9bb489bf4ac72883118ba/greenlet-3.5.2-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:b9318cdeb9abdbfdd8bc8464ee4a06dffde2c7846e1def138365a6240ab2c9a5", size = 1638092, upload-time = "2026-06-17T17:40:08.163Z" }, + { url = "https://files.pythonhosted.org/packages/49/53/5b4df711f4356c62e85d9f819d87966d526d1cfb32bae49a8f7d6fc36ea4/greenlet-3.5.2-cp313-cp313-win_amd64.whl", hash = "sha256:2c3b3311af72b3d3b03cc0f1ffd11f072e834be5d0444105cf715fc44434e39c", size = 239352, upload-time = "2026-06-17T17:38:51.593Z" }, + { url = "https://files.pythonhosted.org/packages/bb/b6/18efc3a329ec035c3f344b8f2b60356451950ddf9b7b64ff00023778a1dd/greenlet-3.5.2-cp313-cp313-win_arm64.whl", hash = "sha256:f9bbd6216c45a563c2a61e478e038b439d9f248bde44f775ea37d339da643af4", size = 237635, upload-time = "2026-06-17T17:35:36.632Z" }, + { url = "https://files.pythonhosted.org/packages/c7/89/aaafc8e14de4ac882e02ccb963225329b0e8578aba4365e71eb678e45722/greenlet-3.5.2-cp314-cp314-macosx_11_0_universal2.whl", hash = "sha256:1c31219badba285858ba8ed117f403dea7fafee6bade9a1991875aae530c3ceb", size = 287676, upload-time = "2026-06-17T17:33:31.514Z" }, + { url = "https://files.pythonhosted.org/packages/b8/fc/2308249206c12ac70de7b9a00970f84f07d10b3cd60e05d2fbcaa84124e8/greenlet-3.5.2-cp314-cp314-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:6f96ed6f4adc1066954ae95f45717657cb67468ef3b89e9a3632e14a625a8f39", size = 653552, upload-time = "2026-06-17T18:07:23.493Z" }, + { url = "https://files.pythonhosted.org/packages/7c/24/47730d1f8f1336b9b089237521ed7a26eee997065dcb4cab81cdca333abc/greenlet-3.5.2-cp314-cp314-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:5795e883e915333c0d5648faaa691857fbc7180136883edc377f50f0d509c2a8", size = 665756, upload-time = "2026-06-17T18:29:46.616Z" }, + { url = "https://files.pythonhosted.org/packages/23/5c/2664d290cbd1fef9eb3f69b5d3bc5aa91b6fa907519298ca6af93a90c6cb/greenlet-3.5.2-cp314-cp314-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:6e9e49d732ee92a189bb7035e293029244aeba648297a9b856dc733d17ca7f0d", size = 669989, upload-time = "2026-06-17T18:39:30.79Z" }, + { url = "https://files.pythonhosted.org/packages/99/69/d6c99db15dc0b5e892ac3cc7b942c8b21f4a9cc3bd9ea0bc3b0f339ffbd4/greenlet-3.5.2-cp314-cp314-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:26aed8d9503ca78889141a9739d71b383efea5f472a7c522b5410f7eb2a1b163", size = 663228, upload-time = "2026-06-17T17:39:31.073Z" }, + { url = "https://files.pythonhosted.org/packages/42/d4/fcb53fa9847d7fbd4723fbed9469c3869b9e3544c4e001d9d5aa2f66162d/greenlet-3.5.2-cp314-cp314-manylinux_2_39_riscv64.whl", hash = "sha256:537c5c4f30395020bb9f48f53146070e3b997c3c75da14011ab732aaa19ce3ef", size = 472888, upload-time = "2026-06-17T18:41:22.511Z" }, + { url = "https://files.pythonhosted.org/packages/4f/88/9e603f448e2bc107c883e95817b980fb9b45ba6aea0299b2e9978124bea2/greenlet-3.5.2-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:dbebc038fcdda8f8f21cce985fd04e34e0f42007e7fc7ab7ad285caf77974b95", size = 1620723, upload-time = "2026-06-17T18:22:14.817Z" }, + { url = "https://files.pythonhosted.org/packages/11/91/26da17e3777858c16fdb8d020a4c68f3a03cb92f238de8f5351d5d5186e9/greenlet-3.5.2-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:a207023f1cf8695fd82580b8099c09c5809be18bc2282362cdfb965dd884a317", size = 1684227, upload-time = "2026-06-17T17:40:09.536Z" }, + { url = "https://files.pythonhosted.org/packages/2d/44/b3a11f7aa34cb38f1b7f3df8bcd9fcd09bac9d342c2a2c9b8686c804bcd2/greenlet-3.5.2-cp314-cp314-win_amd64.whl", hash = "sha256:c674a1dd4fe41f6a93febe7ab366ceabf15080ea31a9307811c56dac5f435f73", size = 240257, upload-time = "2026-06-17T17:35:23.359Z" }, + { url = "https://files.pythonhosted.org/packages/de/e3/3b62145fe917311732041a258adb218248add00542e3131c48bd047fbed5/greenlet-3.5.2-cp314-cp314-win_arm64.whl", hash = "sha256:3c417cd6c593bbbef6f7aa31a79f37d3db7d18832fc56b694a2150130bde784e", size = 239038, upload-time = "2026-06-17T17:37:56.792Z" }, + { url = "https://files.pythonhosted.org/packages/47/ac/d3bad483e9f6cd1848604fdffa32cac25846dd6dfcec0e6f81c790185518/greenlet-3.5.2-cp314-cp314t-macosx_11_0_universal2.whl", hash = "sha256:a96457a30384de52d9c5d2fd33abf6c1daae3db392cd556738f408b1a79a1cf0", size = 295668, upload-time = "2026-06-17T17:36:02.293Z" }, + { url = "https://files.pythonhosted.org/packages/00/e9/3a7e557b895fd0469b00cd0b2bd498ba950e8bfdf6d7adeecf2c5e4130a6/greenlet-3.5.2-cp314-cp314t-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:e4af5d4961818ab651d09c1448a03b1ba2a1726a076266ebb62330bab9f3238c", size = 652820, upload-time = "2026-06-17T18:07:24.95Z" }, + { url = "https://files.pythonhosted.org/packages/78/67/6225d5c5e4afc04be0fd161eec82e4b72017e8a100d222f25d7b42b0140d/greenlet-3.5.2-cp314-cp314t-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:a1789a6244ea1ba61fd4386c9a6a31873e9b0234762103364be98ef87dcb19f3", size = 658697, upload-time = "2026-06-17T18:29:48.365Z" }, + { url = "https://files.pythonhosted.org/packages/35/ad/9b3058f999b81750a9c6d9ec424f509462d232b58002086fe2ba63b66407/greenlet-3.5.2-cp314-cp314t-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:2ee6288f1933d698b4f098127ed17bda2910a75d2807915bd16294a972055d6c", size = 658945, upload-time = "2026-06-17T18:39:32.509Z" }, + { url = "https://files.pythonhosted.org/packages/fa/99/6324b8ef916dcaddccb340b304c992ca3f947614ce0f2685d438187300b8/greenlet-3.5.2-cp314-cp314t-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:3be00501fb4a8c37f6b4b3c4773808ceb26ea65c7ea64fd5735d0f330b3786de", size = 656436, upload-time = "2026-06-17T17:39:32.509Z" }, + { url = "https://files.pythonhosted.org/packages/92/75/1b6ecd8c027b69ab1b6798a84094df79aab5e69ac7e249c78b9d361dd1fa/greenlet-3.5.2-cp314-cp314t-manylinux_2_39_riscv64.whl", hash = "sha256:b4cad42662c796334c2d24607c411e3ed82481c1fb4e1e8ec3a5a8416060092e", size = 490529, upload-time = "2026-06-17T18:41:23.954Z" }, + { url = "https://files.pythonhosted.org/packages/a9/ee/f5bf9daac27c5e1b011965f64b5630a32b415daf7381b312943629e12c2a/greenlet-3.5.2-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:1d554cd96841a68d464d75a3736f8e87408a7b02b1930a75fa32feb408ad62f8", size = 1617193, upload-time = "2026-06-17T18:22:16.252Z" }, + { url = "https://files.pythonhosted.org/packages/8a/21/b05d5b12715bda92ce27c118d64971d21e9b8f3563ed959a7d271e2d4223/greenlet-3.5.2-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:3dff6cd3aac35f6cd3fc23460105acf576f5faf6c378de0bc088bf37c913864a", size = 1677512, upload-time = "2026-06-17T17:40:10.771Z" }, + { url = "https://files.pythonhosted.org/packages/b8/97/1b8f1314b868041b327dc1051603e8142b826480cb0ecb8a7b7632aee9c4/greenlet-3.5.2-cp314-cp314t-win_amd64.whl", hash = "sha256:36cfea2aa075d544617176b2e84450480f0797070ad8799a8c41ada2fe449d32", size = 243145, upload-time = "2026-06-17T17:34:37.502Z" }, + { url = "https://files.pythonhosted.org/packages/36/07/1b5311775e04c718a118c504d7a3a312430e2a1bd1347226aff4774e4549/greenlet-3.5.2-cp315-cp315-macosx_11_0_universal2.whl", hash = "sha256:a0314aa832c94633355dc6f3ee54f195159533355a323f26926fc63b98b2ccbb", size = 288315, upload-time = "2026-06-17T17:34:34.04Z" }, + { url = "https://files.pythonhosted.org/packages/ed/cc/6abcd2a486b58b9f77b7a93b690d59cb2c11a5906ed2ad4c63c7b9c1113d/greenlet-3.5.2-cp315-cp315-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:24c59cb7db9d5c694cb8fd0c76eef8e456b2123afdfa7e4b8f2a67a0860d7682", size = 659130, upload-time = "2026-06-17T18:07:26.354Z" }, + { url = "https://files.pythonhosted.org/packages/f2/12/f4aaad6d3d383233f700ab322568a4f29f2c701a4861d85f4811d99689b2/greenlet-3.5.2-cp315-cp315-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:7bb811753703739ad318112f16eccfaabdac050037b6d092debaa8b23566b4ce", size = 669724, upload-time = "2026-06-17T18:29:50.13Z" }, + { url = "https://files.pythonhosted.org/packages/53/e0/4ce3a046b51e53934eae93d7f9c13975a97285741e9e1fcadf8751314c37/greenlet-3.5.2-cp315-cp315-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:2debcd0ef9455b7d4879589903efc8e497d4b8fb8c0ae772309e44d1ca5e957f", size = 673494, upload-time = "2026-06-17T18:39:34.196Z" }, + { url = "https://files.pythonhosted.org/packages/91/2a/a089811fc31c6bf8742f40a4e73470d6d401cef18e4314eb20dc399b377c/greenlet-3.5.2-cp315-cp315-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:6d78b5c1c178dad90447f1b8452262709d3eef4c98f825569e74c9d0b2260ac9", size = 668089, upload-time = "2026-06-17T17:39:33.808Z" }, + { url = "https://files.pythonhosted.org/packages/52/e0/9c18721e63445dce02ee67e4c81c0f281626604ff55ae6f7b7f4354d7129/greenlet-3.5.2-cp315-cp315-manylinux_2_39_riscv64.whl", hash = "sha256:9558cae989faeab6fbb425cd98a0cfa4190a47fba6443973fbee0a1eb0b0b6c3", size = 479721, upload-time = "2026-06-17T18:41:25.726Z" }, + { url = "https://files.pythonhosted.org/packages/0f/1c/2f47c7d5fcfa98a62b705bf9a0505d86f4563c0d81cab1f7159ff1e743b7/greenlet-3.5.2-cp315-cp315-musllinux_1_2_aarch64.whl", hash = "sha256:0977af2df83136f81c1f76e76d4e2fe7d0dc56ea9c101a86af26a95190b9ca32", size = 1625684, upload-time = "2026-06-17T18:22:17.664Z" }, + { url = "https://files.pythonhosted.org/packages/b9/bf/661dd24624f70b7b32972d7693d0344ecde10278f647d7b828baf739899c/greenlet-3.5.2-cp315-cp315-musllinux_1_2_x86_64.whl", hash = "sha256:f9ed777c6891d8253e54468576f55e27f8fc1a662a664f946a191003574c0a74", size = 1688043, upload-time = "2026-06-17T17:40:12.403Z" }, + { url = "https://files.pythonhosted.org/packages/60/49/d9bde1d15a21296b3b521fe083eb8aabd54ac05d15de9832918f3d639543/greenlet-3.5.2-cp315-cp315-win_amd64.whl", hash = "sha256:c0ea4eb3de23f0bac1d75205e10ccfa9b418b17b01a2d7bf19e3b69dda08900a", size = 240531, upload-time = "2026-06-17T17:35:47.448Z" }, + { url = "https://files.pythonhosted.org/packages/7f/4d/86d7768bd53e9907de0333df215c2018cd01a593b3715cbd79aa82dd94b7/greenlet-3.5.2-cp315-cp315-win_arm64.whl", hash = "sha256:7a7bfc200be40d04961d7e80e8337d726c0c1a50777e588123c3ed8ba731dcb9", size = 239579, upload-time = "2026-06-17T17:39:39.954Z" }, + { url = "https://files.pythonhosted.org/packages/92/15/907be5e8900901039bae752fa9a31c03a3c1e064833f35a4e49449184581/greenlet-3.5.2-cp315-cp315t-macosx_11_0_universal2.whl", hash = "sha256:98a52d6a50d4deaba304331d83ee3e10ebbdc1517fcca40b2715d1de4534065c", size = 296697, upload-time = "2026-06-17T17:37:15.887Z" }, + { url = "https://files.pythonhosted.org/packages/95/5c/08c57be575c3d6a3c023bbf22144a1c7dc6ed4d134527bb36ded4dbf04a8/greenlet-3.5.2-cp315-cp315t-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:1587ff8b58fdf806993ed1490a06ac19c22d47b219c68b30954380029045d8d4", size = 656710, upload-time = "2026-06-17T18:07:28.046Z" }, + { url = "https://files.pythonhosted.org/packages/8c/d0/749f917bdc9fc90fceea4aa65fbf6556e617a50714d1496bdc8ad190bb36/greenlet-3.5.2-cp315-cp315t-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:feb721811d2754bfd16b48de151dd6b1f222c048e625151f2ca44cfdfd69f59c", size = 662629, upload-time = "2026-06-17T18:29:51.728Z" }, + { url = "https://files.pythonhosted.org/packages/55/87/10776cd88df54d0f563e9e21e98363f2d6af94bedc553b1da0972fa87f80/greenlet-3.5.2-cp315-cp315t-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:a9476cbead736dc48ce89e3cd97acff95ecc48cbf21273603a438f9870c4a014", size = 663191, upload-time = "2026-06-17T18:39:35.639Z" }, + { url = "https://files.pythonhosted.org/packages/5a/a5/68cefae3a07f6d0093a490cf28ab604f14578f3e60205a2a2b2d5cd70af2/greenlet-3.5.2-cp315-cp315t-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:7fe6062b1f35534e1e8fb28dfed406cf4eeff3e0bca3a0d9f8ff69f20a4abb00", size = 660147, upload-time = "2026-06-17T17:39:35.068Z" }, + { url = "https://files.pythonhosted.org/packages/02/aa/26ddf92826a99d87bfb8fdb8f3a262a6f16495a5d8e579737baa92fb4543/greenlet-3.5.2-cp315-cp315t-manylinux_2_39_riscv64.whl", hash = "sha256:5930d3946ecae99fa7fc0e3f3ae515426ad85058ebd9bfc6c00cca8016e6206b", size = 498199, upload-time = "2026-06-17T18:41:27.464Z" }, + { url = "https://files.pythonhosted.org/packages/d2/6b/b9156d8397e4750220f54c7c5c34650f1e740a8d2f66eab9cfd1b7b53b69/greenlet-3.5.2-cp315-cp315t-musllinux_1_2_aarch64.whl", hash = "sha256:b4ac902af825cbac8e9b2fccab8122236fd2ba6c8b71a080116d2c2ec72671b1", size = 1621675, upload-time = "2026-06-17T18:22:18.873Z" }, + { url = "https://files.pythonhosted.org/packages/b0/e3/d3250f4fa01c211a93d04e34fded63187e648dbec17b9b1a14d388040593/greenlet-3.5.2-cp315-cp315t-musllinux_1_2_x86_64.whl", hash = "sha256:6f1e473c06ae8be00c9034c2bb10fa277b08a93287e3111c395b839f01d27e1f", size = 1680577, upload-time = "2026-06-17T17:40:14.055Z" }, + { url = "https://files.pythonhosted.org/packages/55/ba/eaee8bda4419770d7096b5a009ebff0ab20a2a28cdd83c4b591bfdf36fa9/greenlet-3.5.2-cp315-cp315t-win_amd64.whl", hash = "sha256:3c2315045f9983e2e50d7e89d95405c21bddb8745f2da4487bc080ab3525f904", size = 243482, upload-time = "2026-06-17T17:37:34.741Z" }, + { url = "https://files.pythonhosted.org/packages/37/45/f794a81c91e9942c61f9110bd1f9a38a0ea565eab57f8b08cd53d3131e48/greenlet-3.5.2-cp315-cp315t-win_arm64.whl", hash = "sha256:db548d5ab6c2a8ead82c013f875090d79b5d7d2b67fc513934ce6cf66492ad7f", size = 242062, upload-time = "2026-06-17T17:35:39.814Z" }, +] + +[[package]] +name = "gunicorn" +version = "24.1.1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "packaging" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/78/0a/10739c03537ec5b131a867bf94df2e412b437696c7e5d26970e2198a80d2/gunicorn-24.1.1.tar.gz", hash = "sha256:f006d110e5cb3102859b4f5cd48335dbd9cc28d0d27cd24ddbdafa6c60929408", size = 287567, upload-time = "2026-01-24T01:15:31.359Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/96/90/cfe637677916fc6f53cd2b05d5746e249f683e1fa14c9e745a88c66f7290/gunicorn-24.1.1-py3-none-any.whl", hash = "sha256:757f6b621fc4f7581a90600b2cd9df593461f06a41d7259cb9b94499dc4095a8", size = 114920, upload-time = "2026-01-24T01:15:29.656Z" }, +] + +[package.optional-dependencies] +gevent = [ + { name = "gevent" }, +] + +[[package]] +name = "idna" +version = "3.18" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/cd/63/9496c57188a2ee585e0f1db071d75089a11e98aa86eb99d9d7618fc1edce/idna-3.18.tar.gz", hash = "sha256:ffb385a7e039654cef1ab9ef32c6fafe283c0c0467bba1d9029738ce4a14a848", size = 196711, upload-time = "2026-06-02T14:34:07.794Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/1e/5e/d4e9f1a599fb8e573b7b87160658329fbf28d19eac2718f51fc3def3aa5a/idna-3.18-py3-none-any.whl", hash = "sha256:7f952cbe720b688055e3f87de14f5c3e5fdaa8bc3928985c4077ca689de849a2", size = 65455, upload-time = "2026-06-02T14:34:06.319Z" }, +] + +[[package]] +name = "iniconfig" +version = "2.3.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/72/34/14ca021ce8e5dfedc35312d08ba8bf51fdd999c576889fc2c24cb97f4f10/iniconfig-2.3.0.tar.gz", hash = "sha256:c76315c77db068650d49c5b56314774a7804df16fee4402c1f19d6d15d8c4730", size = 20503, upload-time = "2025-10-18T21:55:43.219Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/cb/b1/3846dd7f199d53cb17f49cba7e651e9ce294d8497c8c150530ed11865bb8/iniconfig-2.3.0-py3-none-any.whl", hash = "sha256:f631c04d2c48c52b84d0d0549c99ff3859c98df65b3101406327ecc7d53fbf12", size = 7484, upload-time = "2025-10-18T21:55:41.639Z" }, +] + +[[package]] +name = "ipykernel" +version = "6.29.5" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "appnope", marker = "sys_platform == 'darwin'" }, + { name = "comm" }, + { name = "debugpy" }, + { name = "ipython" }, + { name = "jupyter-client" }, + { name = "jupyter-core" }, + { name = "matplotlib-inline" }, + { name = "nest-asyncio" }, + { name = "packaging" }, + { name = "psutil" }, + { name = "pyzmq" }, + { name = "tornado" }, + { name = "traitlets" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/e9/5c/67594cb0c7055dc50814b21731c22a601101ea3b1b50a9a1b090e11f5d0f/ipykernel-6.29.5.tar.gz", hash = "sha256:f093a22c4a40f8828f8e330a9c297cb93dcab13bd9678ded6de8e5cf81c56215", size = 163367, upload-time = "2024-07-01T14:07:22.543Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/94/5c/368ae6c01c7628438358e6d337c19b05425727fbb221d2a3c4303c372f42/ipykernel-6.29.5-py3-none-any.whl", hash = "sha256:afdb66ba5aa354b09b91379bac28ae4afebbb30e8b39510c9690afb7a10421b5", size = 117173, upload-time = "2024-07-01T14:07:19.603Z" }, +] + +[[package]] +name = "ipython" +version = "9.14.1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "colorama", marker = "sys_platform == 'win32'" }, + { name = "decorator" }, + { name = "ipython-pygments-lexers" }, + { name = "jedi" }, + { name = "matplotlib-inline" }, + { name = "pexpect", marker = "sys_platform != 'emscripten' and sys_platform != 'win32'" }, + { name = "prompt-toolkit" }, + { name = "psutil", marker = "sys_platform != 'emscripten'" }, + { name = "pygments" }, + { name = "stack-data" }, + { name = "traitlets" }, + { name = "typing-extensions", marker = "python_full_version < '3.12'" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/e2/23/3a27530575643c8bb7bfc757a28e2e7ef80092afbf59a2bc5716320b6602/ipython-9.14.1.tar.gz", hash = "sha256:f913bf74df06d458e46ced84ca506c23797590d594b236fe60b14df213291e7b", size = 4433457, upload-time = "2026-06-05T08:12:34.921Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/9d/22/58818a63eaf8982b67632b1bc20585c811611b15a8da19d6012323dc76a5/ipython-9.14.1-py3-none-any.whl", hash = "sha256:5d4a9ecaa3b10e6e5f269dd0948bdb58ca9cb851899cd23e07c320d3eb11613c", size = 627770, upload-time = "2026-06-05T08:12:33.045Z" }, +] + +[[package]] +name = "ipython-genutils" +version = "0.2.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/e8/69/fbeffffc05236398ebfcfb512b6d2511c622871dca1746361006da310399/ipython_genutils-0.2.0.tar.gz", hash = "sha256:eb2e116e75ecef9d4d228fdc66af54269afa26ab4463042e33785b887c628ba8", size = 22208, upload-time = "2017-03-13T22:12:26.393Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/fa/bc/9bd3b5c2b4774d5f33b2d544f1460be9df7df2fe42f352135381c347c69a/ipython_genutils-0.2.0-py2.py3-none-any.whl", hash = "sha256:72dd37233799e619666c9f639a9da83c34013a73e8bbc79a7a6348d93c61fab8", size = 26343, upload-time = "2017-03-13T22:12:25.412Z" }, +] + +[[package]] +name = "ipython-pygments-lexers" +version = "1.1.1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "pygments" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/ef/4c/5dd1d8af08107f88c7f741ead7a40854b8ac24ddf9ae850afbcf698aa552/ipython_pygments_lexers-1.1.1.tar.gz", hash = "sha256:09c0138009e56b6854f9535736f4171d855c8c08a563a0dcd8022f78355c7e81", size = 8393, upload-time = "2025-01-17T11:24:34.505Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/d9/33/1f075bf72b0b747cb3288d011319aaf64083cf2efef8354174e3ed4540e2/ipython_pygments_lexers-1.1.1-py3-none-any.whl", hash = "sha256:a9462224a505ade19a605f71f8fa63c2048833ce50abc86768a0d81d876dc81c", size = 8074, upload-time = "2025-01-17T11:24:33.271Z" }, +] + +[[package]] +name = "isoduration" +version = "20.11.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "arrow" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/7c/1a/3c8edc664e06e6bd06cce40c6b22da5f1429aa4224d0c590f3be21c91ead/isoduration-20.11.0.tar.gz", hash = "sha256:ac2f9015137935279eac671f94f89eb00584f940f5dc49462a0c4ee692ba1bd9", size = 11649, upload-time = "2020-11-01T11:00:00.312Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/7b/55/e5326141505c5d5e34c5e0935d2908a74e4561eca44108fbfb9c13d2911a/isoduration-20.11.0-py3-none-any.whl", hash = "sha256:b2904c2a4228c3d44f409c8ae8e2370eb21a26f7ac2ec5446df141dde3452042", size = 11321, upload-time = "2020-11-01T10:59:58.02Z" }, +] + +[[package]] +name = "itsdangerous" +version = "2.2.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/9c/cb/8ac0172223afbccb63986cc25049b154ecfb5e85932587206f42317be31d/itsdangerous-2.2.0.tar.gz", hash = "sha256:e0050c0b7da1eea53ffaf149c0cfbb5c6e2e2b69c4bef22c81fa6eb73e5f6173", size = 54410, upload-time = "2024-04-16T21:28:15.614Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/04/96/92447566d16df59b2a776c0fb82dbc4d9e07cd95062562af01e408583fc4/itsdangerous-2.2.0-py3-none-any.whl", hash = "sha256:c6242fc49e35958c8b15141343aa660db5fc54d4f13a1db01a3f5891b98700ef", size = 16234, upload-time = "2024-04-16T21:28:14.499Z" }, +] + +[[package]] +name = "jedi" +version = "0.20.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "parso" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/46/b7/a3635f6a2d7cf5b5dd98064fc1d5fbbafcb25477bcea204a3a92145d158b/jedi-0.20.0.tar.gz", hash = "sha256:c3f4ccbd276696f4b19c54618d4fb18f9fc24b0aef02acf704b23f487daa1011", size = 3119416, upload-time = "2026-05-01T23:38:47.814Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/9a/93/242e2eab5fe682ffcb8b0084bde703a41d51e17ee0f3a31ff0d9d813620a/jedi-0.20.0-py2.py3-none-any.whl", hash = "sha256:7bdd9c2634f56713299976f4cbd59cb3fa92165cc5e05ea811fb253480728b67", size = 4884812, upload-time = "2026-05-01T23:38:43.919Z" }, +] + +[[package]] +name = "jinja2" +version = "3.1.6" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "markupsafe" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/df/bf/f7da0350254c0ed7c72f3e33cef02e048281fec7ecec5f032d4aac52226b/jinja2-3.1.6.tar.gz", hash = "sha256:0137fb05990d35f1275a587e9aee6d56da821fc83491a0fb838183be43f66d6d", size = 245115, upload-time = "2025-03-05T20:05:02.478Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/62/a1/3d680cbfd5f4b8f15abc1d571870c5fc3e594bb582bc3b64ea099db13e56/jinja2-3.1.6-py3-none-any.whl", hash = "sha256:85ece4451f492d0c13c5dd7c13a64681a86afae63a5f347908daf103ce6d2f67", size = 134899, upload-time = "2025-03-05T20:05:00.369Z" }, +] + +[[package]] +name = "jmespath" +version = "1.1.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/d3/59/322338183ecda247fb5d1763a6cbe46eff7222eaeebafd9fa65d4bf5cb11/jmespath-1.1.0.tar.gz", hash = "sha256:472c87d80f36026ae83c6ddd0f1d05d4e510134ed462851fd5f754c8c3cbb88d", size = 27377, upload-time = "2026-01-22T16:35:26.279Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/14/2f/967ba146e6d58cf6a652da73885f52fc68001525b4197effc174321d70b4/jmespath-1.1.0-py3-none-any.whl", hash = "sha256:a5663118de4908c91729bea0acadca56526eb2698e83de10cd116ae0f4e97c64", size = 20419, upload-time = "2026-01-22T16:35:24.919Z" }, +] + +[[package]] +name = "joblib" +version = "1.5.3" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/41/f2/d34e8b3a08a9cc79a50b2208a93dce981fe615b64d5a4d4abee421d898df/joblib-1.5.3.tar.gz", hash = "sha256:8561a3269e6801106863fd0d6d84bb737be9e7631e33aaed3fb9ce5953688da3", size = 331603, upload-time = "2025-12-15T08:41:46.427Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/7b/91/984aca2ec129e2757d1e4e3c81c3fcda9d0f85b74670a094cc443d9ee949/joblib-1.5.3-py3-none-any.whl", hash = "sha256:5fc3c5039fc5ca8c0276333a188bbd59d6b7ab37fe6632daa76bc7f9ec18e713", size = 309071, upload-time = "2025-12-15T08:41:44.973Z" }, +] + +[[package]] +name = "json2html" +version = "1.3.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/01/d5/40b617ee19d2d79f606ed37f8a81e51158f126d2af67270c68f2b47ae0d5/json2html-1.3.0.tar.gz", hash = "sha256:8951a53662ae9cfd812685facdba693fc950ffc1c1fd1a8a2d3cf4c34600689c", size = 6977, upload-time = "2019-07-03T20:50:03.023Z" } + +[[package]] +name = "jsonpointer" +version = "3.1.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/18/c7/af399a2e7a67fd18d63c40c5e62d3af4e67b836a2107468b6a5ea24c4304/jsonpointer-3.1.1.tar.gz", hash = "sha256:0b801c7db33a904024f6004d526dcc53bbb8a4a0f4e32bfd10beadf60adf1900", size = 9068, upload-time = "2026-03-23T22:32:32.458Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/9e/6a/a83720e953b1682d2d109d3c2dbb0bc9bf28cc1cbc205be4ef4be5da709d/jsonpointer-3.1.1-py3-none-any.whl", hash = "sha256:8ff8b95779d071ba472cf5bc913028df06031797532f08a7d5b602d8b2a488ca", size = 7659, upload-time = "2026-03-23T22:32:31.568Z" }, +] + +[[package]] +name = "jsonschema" +version = "4.26.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "attrs" }, + { name = "jsonschema-specifications" }, + { name = "referencing" }, + { name = "rpds-py" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/b3/fc/e067678238fa451312d4c62bf6e6cf5ec56375422aee02f9cb5f909b3047/jsonschema-4.26.0.tar.gz", hash = "sha256:0c26707e2efad8aa1bfc5b7ce170f3fccc2e4918ff85989ba9ffa9facb2be326", size = 366583, upload-time = "2026-01-07T13:41:07.246Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/69/90/f63fb5873511e014207a475e2bb4e8b2e570d655b00ac19a9a0ca0a385ee/jsonschema-4.26.0-py3-none-any.whl", hash = "sha256:d489f15263b8d200f8387e64b4c3a75f06629559fb73deb8fdfb525f2dab50ce", size = 90630, upload-time = "2026-01-07T13:41:05.306Z" }, +] + +[package.optional-dependencies] +format-nongpl = [ + { name = "fqdn" }, + { name = "idna" }, + { name = "isoduration" }, + { name = "jsonpointer" }, + { name = "rfc3339-validator" }, + { name = "rfc3986-validator" }, + { name = "rfc3987-syntax" }, + { name = "uri-template" }, + { name = "webcolors" }, +] + +[[package]] +name = "jsonschema-specifications" +version = "2025.9.1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "referencing" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/19/74/a633ee74eb36c44aa6d1095e7cc5569bebf04342ee146178e2d36600708b/jsonschema_specifications-2025.9.1.tar.gz", hash = "sha256:b540987f239e745613c7a9176f3edb72b832a4ac465cf02712288397832b5e8d", size = 32855, upload-time = "2025-09-08T01:34:59.186Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/41/45/1a4ed80516f02155c51f51e8cedb3c1902296743db0bbc66608a0db2814f/jsonschema_specifications-2025.9.1-py3-none-any.whl", hash = "sha256:98802fee3a11ee76ecaca44429fda8a41bff98b00a0f2838151b113f210cc6fe", size = 18437, upload-time = "2025-09-08T01:34:57.871Z" }, +] + +[[package]] +name = "jupyter-client" +version = "7.4.9" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "entrypoints" }, + { name = "jupyter-core" }, + { name = "nest-asyncio" }, + { name = "python-dateutil" }, + { name = "pyzmq" }, + { name = "tornado" }, + { name = "traitlets" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/1e/33/71778cdd2c69445bcd3bb6029da2e43cc9b5cbbeef4f4982ef3aaf396650/jupyter_client-7.4.9.tar.gz", hash = "sha256:52be28e04171f07aed8f20e1616a5a552ab9fee9cbbe6c1896ae170c3880d392", size = 329115, upload-time = "2023-01-12T20:05:10.58Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/fd/a7/ef3b7c8b9d6730a21febdd0809084e4cea6d2a7e43892436adecdd0acbd4/jupyter_client-7.4.9-py3-none-any.whl", hash = "sha256:214668aaea208195f4c13d28eb272ba79f945fc0cf3f11c7092c20b2ca1980e7", size = 133492, upload-time = "2023-01-12T20:05:08.044Z" }, +] + +[[package]] +name = "jupyter-core" +version = "5.9.1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "platformdirs" }, + { name = "traitlets" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/02/49/9d1284d0dc65e2c757b74c6687b6d319b02f822ad039e5c512df9194d9dd/jupyter_core-5.9.1.tar.gz", hash = "sha256:4d09aaff303b9566c3ce657f580bd089ff5c91f5f89cf7d8846c3cdf465b5508", size = 89814, upload-time = "2025-10-16T19:19:18.444Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/e7/e7/80988e32bf6f73919a113473a604f5a8f09094de312b9d52b79c2df7612b/jupyter_core-5.9.1-py3-none-any.whl", hash = "sha256:ebf87fdc6073d142e114c72c9e29a9d7ca03fad818c5d300ce2adc1fb0743407", size = 29032, upload-time = "2025-10-16T19:19:16.783Z" }, +] + +[[package]] +name = "jupyter-events" +version = "0.12.1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "jsonschema", extra = ["format-nongpl"] }, + { name = "packaging" }, + { name = "python-json-logger" }, + { name = "pyyaml" }, + { name = "referencing" }, + { name = "rfc3339-validator" }, + { name = "rfc3986-validator" }, + { name = "traitlets" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/18/f8/475c4241b2b75af0deaae453ed003c6c851766dbc44d332d8baf245dc931/jupyter_events-0.12.1.tar.gz", hash = "sha256:faff25f77218335752f35f23c5fe6e4a392a7bd99a5939ccb9b8fbf594636cf3", size = 62854, upload-time = "2026-04-20T23:17:50.66Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/eb/6c/6fcde0c8f616ed360ffd3587f7db9e225a7e62b583a04494d2f069cf64ea/jupyter_events-0.12.1-py3-none-any.whl", hash = "sha256:c366585253f537a627da52fa7ca7410c5b5301fe893f511e7b077c2d93ec8bcf", size = 19512, upload-time = "2026-04-20T23:17:48.927Z" }, +] + +[[package]] +name = "jupyter-server" +version = "2.20.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "anyio" }, + { name = "argon2-cffi" }, + { name = "jinja2" }, + { name = "jupyter-client" }, + { name = "jupyter-core" }, + { name = "jupyter-events" }, + { name = "jupyter-server-terminals" }, + { name = "nbconvert" }, + { name = "nbformat" }, + { name = "overrides", marker = "python_full_version < '3.12'" }, + { name = "packaging" }, + { name = "prometheus-client" }, + { name = "pywinpty", marker = "os_name == 'nt'" }, + { name = "pyzmq" }, + { name = "send2trash" }, + { name = "terminado" }, + { name = "tornado" }, + { name = "traitlets" }, + { name = "websocket-client" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/6b/dc/db3a582633170186f8c8b31298d7eb26ad0eb031a1f53476c258b64eed05/jupyter_server-2.20.0.tar.gz", hash = "sha256:b5778ba337d8015a3dc2b80803ecdd5ac18d3797fddf61a50ea5fb472b4ebe14", size = 756523, upload-time = "2026-06-17T12:09:09.435Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/f3/71/8c002223e873a870f5c41dc69b0a7c922301123e4a31d5d01ecb700aef77/jupyter_server-2.20.0-py3-none-any.whl", hash = "sha256:c3b67c93c471e947c18b5026f04f21614218adb706df8f48227d3ee8e0a7cdcc", size = 393143, upload-time = "2026-06-17T12:09:07.234Z" }, +] + +[[package]] +name = "jupyter-server-terminals" +version = "0.5.4" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "pywinpty", marker = "os_name == 'nt'" }, + { name = "terminado" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/f4/a7/bcd0a9b0cbba88986fe944aaaf91bfda603e5a50bda8ed15123f381a3b2f/jupyter_server_terminals-0.5.4.tar.gz", hash = "sha256:bbda128ed41d0be9020349f9f1f2a4ab9952a73ed5f5ac9f1419794761fb87f5", size = 31770, upload-time = "2026-01-14T16:53:20.213Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/d1/2d/6674563f71c6320841fc300911a55143925112a72a883e2ca71fba4c618d/jupyter_server_terminals-0.5.4-py3-none-any.whl", hash = "sha256:55be353fc74a80bc7f3b20e6be50a55a61cd525626f578dcb66a5708e2007d14", size = 13704, upload-time = "2026-01-14T16:53:18.738Z" }, +] + +[[package]] +name = "jupyterlab-pygments" +version = "0.3.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/90/51/9187be60d989df97f5f0aba133fa54e7300f17616e065d1ada7d7646b6d6/jupyterlab_pygments-0.3.0.tar.gz", hash = "sha256:721aca4d9029252b11cfa9d185e5b5af4d54772bb8072f9b7036f4170054d35d", size = 512900, upload-time = "2023-11-23T09:26:37.44Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/b1/dd/ead9d8ea85bf202d90cc513b533f9c363121c7792674f78e0d8a854b63b4/jupyterlab_pygments-0.3.0-py3-none-any.whl", hash = "sha256:841a89020971da1d8693f1a99997aefc5dc424bb1b251fd6322462a1b8842780", size = 15884, upload-time = "2023-11-23T09:26:34.325Z" }, +] + +[[package]] +name = "kiwisolver" +version = "1.5.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/d0/67/9c61eccb13f0bdca9307614e782fec49ffdde0f7a2314935d489fa93cd9c/kiwisolver-1.5.0.tar.gz", hash = "sha256:d4193f3d9dc3f6f79aaed0e5637f45d98850ebf01f7ca20e69457f3e8946b66a", size = 103482, upload-time = "2026-03-09T13:15:53.382Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/12/dd/a495a9c104be1c476f0386e714252caf2b7eca883915422a64c50b88c6f5/kiwisolver-1.5.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:9eed0f7edbb274413b6ee781cca50541c8c0facd3d6fd289779e494340a2b85c", size = 122798, upload-time = "2026-03-09T13:12:58.963Z" }, + { url = "https://files.pythonhosted.org/packages/11/60/37b4047a2af0cf5ef6d8b4b26e91829ae6fc6a2d1f74524bcb0e7cd28a32/kiwisolver-1.5.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:3c4923e404d6bcd91b6779c009542e5647fef32e4a5d75e115e3bbac6f2335eb", size = 66216, upload-time = "2026-03-09T13:13:00.155Z" }, + { url = "https://files.pythonhosted.org/packages/0a/aa/510dc933d87767584abfe03efa445889996c70c2990f6f87c3ebaa0a18c5/kiwisolver-1.5.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:0df54df7e686afa55e6f21fb86195224a6d9beb71d637e8d7920c95cf0f89aac", size = 63911, upload-time = "2026-03-09T13:13:01.671Z" }, + { url = "https://files.pythonhosted.org/packages/80/46/bddc13df6c2a40741e0cc7865bb1c9ed4796b6760bd04ce5fae3928ef917/kiwisolver-1.5.0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:2517e24d7315eb51c10664cdb865195df38ab74456c677df67bb47f12d088a27", size = 1438209, upload-time = "2026-03-09T13:13:03.385Z" }, + { url = "https://files.pythonhosted.org/packages/fd/d6/76621246f5165e5372f02f5e6f3f48ea336a8f9e96e43997d45b240ed8cd/kiwisolver-1.5.0-cp311-cp311-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:ff710414307fefa903e0d9bdf300972f892c23477829f49504e59834f4195398", size = 1248888, upload-time = "2026-03-09T13:13:05.231Z" }, + { url = "https://files.pythonhosted.org/packages/b2/c1/31559ec6fb39a5b48035ce29bb63ade628f321785f38c384dee3e2c08bc1/kiwisolver-1.5.0-cp311-cp311-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:6176c1811d9d5a04fa391c490cc44f451e240697a16977f11c6f722efb9041db", size = 1266304, upload-time = "2026-03-09T13:13:06.743Z" }, + { url = "https://files.pythonhosted.org/packages/5e/ef/1cb8276f2d29cc6a41e0a042f27946ca347d3a4a75acf85d0a16aa6dcc82/kiwisolver-1.5.0-cp311-cp311-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:50847dca5d197fcbd389c805aa1a1cf32f25d2e7273dc47ab181a517666b68cc", size = 1319650, upload-time = "2026-03-09T13:13:08.607Z" }, + { url = "https://files.pythonhosted.org/packages/4c/e4/5ba3cecd7ce6236ae4a80f67e5d5531287337d0e1f076ca87a5abe4cd5d0/kiwisolver-1.5.0-cp311-cp311-manylinux_2_39_riscv64.whl", hash = "sha256:01808c6d15f4c3e8559595d6d1fe6411c68e4a3822b4b9972b44473b24f4e679", size = 970949, upload-time = "2026-03-09T13:13:10.299Z" }, + { url = "https://files.pythonhosted.org/packages/5a/69/dc61f7ae9a2f071f26004ced87f078235b5507ab6e5acd78f40365655034/kiwisolver-1.5.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:f1f9f4121ec58628c96baa3de1a55a4e3a333c5102c8e94b64e23bf7b2083309", size = 2199125, upload-time = "2026-03-09T13:13:11.841Z" }, + { url = "https://files.pythonhosted.org/packages/e5/7b/abbe0f1b5afa85f8d084b73e90e5f801c0939eba16ac2e49af7c61a6c28d/kiwisolver-1.5.0-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:b7d335370ae48a780c6e6a6bbfa97342f563744c39c35562f3f367665f5c1de2", size = 2293783, upload-time = "2026-03-09T13:13:14.399Z" }, + { url = "https://files.pythonhosted.org/packages/8a/80/5908ae149d96d81580d604c7f8aefd0e98f4fd728cf172f477e9f2a81744/kiwisolver-1.5.0-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:800ee55980c18545af444d93fdd60c56b580db5cc54867d8cbf8a1dc0829938c", size = 1960726, upload-time = "2026-03-09T13:13:16.047Z" }, + { url = "https://files.pythonhosted.org/packages/84/08/a78cb776f8c085b7143142ce479859cfec086bd09ee638a317040b6ef420/kiwisolver-1.5.0-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:c438f6ca858697c9ab67eb28246c92508af972e114cac34e57a6d4ba17a3ac08", size = 2464738, upload-time = "2026-03-09T13:13:17.897Z" }, + { url = "https://files.pythonhosted.org/packages/b1/e1/65584da5356ed6cb12c63791a10b208860ac40a83de165cb6a6751a686e3/kiwisolver-1.5.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:8c63c91f95173f9c2a67c7c526b2cea976828a0e7fced9cdcead2802dc10f8a4", size = 2270718, upload-time = "2026-03-09T13:13:19.421Z" }, + { url = "https://files.pythonhosted.org/packages/be/6c/28f17390b62b8f2f520e2915095b3c94d88681ecf0041e75389d9667f202/kiwisolver-1.5.0-cp311-cp311-win_amd64.whl", hash = "sha256:beb7f344487cdcb9e1efe4b7a29681b74d34c08f0043a327a74da852a6749e7b", size = 73480, upload-time = "2026-03-09T13:13:20.818Z" }, + { url = "https://files.pythonhosted.org/packages/d8/0e/2ee5debc4f77a625778fec5501ff3e8036fe361b7ee28ae402a485bb9694/kiwisolver-1.5.0-cp311-cp311-win_arm64.whl", hash = "sha256:ad4ae4ffd1ee9cd11357b4c66b612da9888f4f4daf2f36995eda64bd45370cac", size = 64930, upload-time = "2026-03-09T13:13:21.997Z" }, + { url = "https://files.pythonhosted.org/packages/4d/b2/818b74ebea34dabe6d0c51cb1c572e046730e64844da6ed646d5298c40ce/kiwisolver-1.5.0-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:4e9750bc21b886308024f8a54ccb9a2cc38ac9fa813bf4348434e3d54f337ff9", size = 123158, upload-time = "2026-03-09T13:13:23.127Z" }, + { url = "https://files.pythonhosted.org/packages/bf/d9/405320f8077e8e1c5c4bd6adc45e1e6edf6d727b6da7f2e2533cf58bff71/kiwisolver-1.5.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:72ec46b7eba5b395e0a7b63025490d3214c11013f4aacb4f5e8d6c3041829588", size = 66388, upload-time = "2026-03-09T13:13:24.765Z" }, + { url = "https://files.pythonhosted.org/packages/99/9f/795fedf35634f746151ca8839d05681ceb6287fbed6cc1c9bf235f7887c2/kiwisolver-1.5.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:ed3a984b31da7481b103f68776f7128a89ef26ed40f4dc41a2223cda7fb24819", size = 64068, upload-time = "2026-03-09T13:13:25.878Z" }, + { url = "https://files.pythonhosted.org/packages/c4/13/680c54afe3e65767bed7ec1a15571e1a2f1257128733851ade24abcefbcc/kiwisolver-1.5.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:bb5136fb5352d3f422df33f0c879a1b0c204004324150cc3b5e3c4f310c9049f", size = 1477934, upload-time = "2026-03-09T13:13:27.166Z" }, + { url = "https://files.pythonhosted.org/packages/c8/2f/cebfcdb60fd6a9b0f6b47a9337198bcbad6fbe15e68189b7011fd914911f/kiwisolver-1.5.0-cp312-cp312-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:b2af221f268f5af85e776a73d62b0845fc8baf8ef0abfae79d29c77d0e776aaf", size = 1278537, upload-time = "2026-03-09T13:13:28.707Z" }, + { url = "https://files.pythonhosted.org/packages/f2/0d/9b782923aada3fafb1d6b84e13121954515c669b18af0c26e7d21f579855/kiwisolver-1.5.0-cp312-cp312-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:b0f172dc8ffaccb8522d7c5d899de00133f2f1ca7b0a49b7da98e901de87bf2d", size = 1296685, upload-time = "2026-03-09T13:13:30.528Z" }, + { url = "https://files.pythonhosted.org/packages/27/70/83241b6634b04fe44e892688d5208332bde130f38e610c0418f9ede47ded/kiwisolver-1.5.0-cp312-cp312-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:6ab8ba9152203feec73758dad83af9a0bbe05001eb4639e547207c40cfb52083", size = 1346024, upload-time = "2026-03-09T13:13:32.818Z" }, + { url = "https://files.pythonhosted.org/packages/e4/db/30ed226fb271ae1a6431fc0fe0edffb2efe23cadb01e798caeb9f2ceae8f/kiwisolver-1.5.0-cp312-cp312-manylinux_2_39_riscv64.whl", hash = "sha256:cdee07c4d7f6d72008d3f73b9bf027f4e11550224c7c50d8df1ae4a37c1402a6", size = 987241, upload-time = "2026-03-09T13:13:34.435Z" }, + { url = "https://files.pythonhosted.org/packages/ec/bd/c314595208e4c9587652d50959ead9e461995389664e490f4dce7ff0f782/kiwisolver-1.5.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:7c60d3c9b06fb23bd9c6139281ccbdc384297579ae037f08ae90c69f6845c0b1", size = 2227742, upload-time = "2026-03-09T13:13:36.4Z" }, + { url = "https://files.pythonhosted.org/packages/c1/43/0499cec932d935229b5543d073c2b87c9c22846aab48881e9d8d6e742a2d/kiwisolver-1.5.0-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:e315e5ec90d88e140f57696ff85b484ff68bb311e36f2c414aa4286293e6dee0", size = 2323966, upload-time = "2026-03-09T13:13:38.204Z" }, + { url = "https://files.pythonhosted.org/packages/3d/6f/79b0d760907965acfd9d61826a3d41f8f093c538f55cd2633d3f0db269f6/kiwisolver-1.5.0-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:1465387ac63576c3e125e5337a6892b9e99e0627d52317f3ca79e6930d889d15", size = 1977417, upload-time = "2026-03-09T13:13:39.966Z" }, + { url = "https://files.pythonhosted.org/packages/ab/31/01d0537c41cb75a551a438c3c7a80d0c60d60b81f694dac83dd436aec0d0/kiwisolver-1.5.0-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:530a3fd64c87cffa844d4b6b9768774763d9caa299e9b75d8eca6a4423b31314", size = 2491238, upload-time = "2026-03-09T13:13:41.698Z" }, + { url = "https://files.pythonhosted.org/packages/e4/34/8aefdd0be9cfd00a44509251ba864f5caf2991e36772e61c408007e7f417/kiwisolver-1.5.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:1d9daea4ea6b9be74fe2f01f7fbade8d6ffab263e781274cffca0dba9be9eec9", size = 2294947, upload-time = "2026-03-09T13:13:43.343Z" }, + { url = "https://files.pythonhosted.org/packages/ad/cf/0348374369ca588f8fe9c338fae49fa4e16eeb10ffb3d012f23a54578a9e/kiwisolver-1.5.0-cp312-cp312-win_amd64.whl", hash = "sha256:f18c2d9782259a6dc132fdc7a63c168cbc74b35284b6d75c673958982a378384", size = 73569, upload-time = "2026-03-09T13:13:45.792Z" }, + { url = "https://files.pythonhosted.org/packages/28/26/192b26196e2316e2bd29deef67e37cdf9870d9af8e085e521afff0fed526/kiwisolver-1.5.0-cp312-cp312-win_arm64.whl", hash = "sha256:f7c7553b13f69c1b29a5bde08ddc6d9d0c8bfb84f9ed01c30db25944aeb852a7", size = 64997, upload-time = "2026-03-09T13:13:46.878Z" }, + { url = "https://files.pythonhosted.org/packages/9d/69/024d6711d5ba575aa65d5538042e99964104e97fa153a9f10bc369182bc2/kiwisolver-1.5.0-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:fd40bb9cd0891c4c3cb1ddf83f8bbfa15731a248fdc8162669405451e2724b09", size = 123166, upload-time = "2026-03-09T13:13:48.032Z" }, + { url = "https://files.pythonhosted.org/packages/ce/48/adbb40df306f587054a348831220812b9b1d787aff714cfbc8556e38fccd/kiwisolver-1.5.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:c0e1403fd7c26d77c1f03e096dc58a5c726503fa0db0456678b8668f76f521e3", size = 66395, upload-time = "2026-03-09T13:13:49.365Z" }, + { url = "https://files.pythonhosted.org/packages/a8/3a/d0a972b34e1c63e2409413104216cd1caa02c5a37cb668d1687d466c1c45/kiwisolver-1.5.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:dda366d548e89a90d88a86c692377d18d8bd64b39c1fb2b92cb31370e2896bbd", size = 64065, upload-time = "2026-03-09T13:13:50.562Z" }, + { url = "https://files.pythonhosted.org/packages/2b/0a/7b98e1e119878a27ba8618ca1e18b14f992ff1eda40f47bccccf4de44121/kiwisolver-1.5.0-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:332b4f0145c30b5f5ad9374881133e5aa64320428a57c2c2b61e9d891a51c2f3", size = 1477903, upload-time = "2026-03-09T13:13:52.084Z" }, + { url = "https://files.pythonhosted.org/packages/18/d8/55638d89ffd27799d5cc3d8aa28e12f4ce7a64d67b285114dbedc8ea4136/kiwisolver-1.5.0-cp313-cp313-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:0c50b89ffd3e1a911c69a1dd3de7173c0cd10b130f56222e57898683841e4f96", size = 1278751, upload-time = "2026-03-09T13:13:54.673Z" }, + { url = "https://files.pythonhosted.org/packages/b8/97/b4c8d0d18421ecceba20ad8701358453b88e32414e6f6950b5a4bad54e65/kiwisolver-1.5.0-cp313-cp313-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:4db576bb8c3ef9365f8b40fe0f671644de6736ae2c27a2c62d7d8a1b4329f099", size = 1296793, upload-time = "2026-03-09T13:13:56.287Z" }, + { url = "https://files.pythonhosted.org/packages/c4/10/f862f94b6389d8957448ec9df59450b81bec4abb318805375c401a1e6892/kiwisolver-1.5.0-cp313-cp313-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:0b85aad90cea8ac6797a53b5d5f2e967334fa4d1149f031c4537569972596cb8", size = 1346041, upload-time = "2026-03-09T13:13:58.269Z" }, + { url = "https://files.pythonhosted.org/packages/a3/6a/f1650af35821eaf09de398ec0bc2aefc8f211f0cda50204c9f1673741ba9/kiwisolver-1.5.0-cp313-cp313-manylinux_2_39_riscv64.whl", hash = "sha256:d36ca54cb4c6c4686f7cbb7b817f66f5911c12ddb519450bbe86707155028f87", size = 987292, upload-time = "2026-03-09T13:13:59.871Z" }, + { url = "https://files.pythonhosted.org/packages/de/19/d7fb82984b9238115fe629c915007be608ebd23dc8629703d917dbfaffd4/kiwisolver-1.5.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:38f4a703656f493b0ad185211ccfca7f0386120f022066b018eb5296d8613e23", size = 2227865, upload-time = "2026-03-09T13:14:01.401Z" }, + { url = "https://files.pythonhosted.org/packages/7f/b9/46b7f386589fd222dac9e9de9c956ce5bcefe2ee73b4e79891381dda8654/kiwisolver-1.5.0-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:3ac2360e93cb41be81121755c6462cff3beaa9967188c866e5fce5cf13170859", size = 2324369, upload-time = "2026-03-09T13:14:02.972Z" }, + { url = "https://files.pythonhosted.org/packages/92/8b/95e237cf3d9c642960153c769ddcbe278f182c8affb20cecc1cc983e7cc5/kiwisolver-1.5.0-cp313-cp313-musllinux_1_2_riscv64.whl", hash = "sha256:c95cab08d1965db3d84a121f1c7ce7479bdd4072c9b3dafd8fecce48a2e6b902", size = 1977989, upload-time = "2026-03-09T13:14:04.503Z" }, + { url = "https://files.pythonhosted.org/packages/1b/95/980c9df53501892784997820136c01f62bc1865e31b82b9560f980c0e649/kiwisolver-1.5.0-cp313-cp313-musllinux_1_2_s390x.whl", hash = "sha256:fc20894c3d21194d8041a28b65622d5b86db786da6e3cfe73f0c762951a61167", size = 2491645, upload-time = "2026-03-09T13:14:06.106Z" }, + { url = "https://files.pythonhosted.org/packages/cb/32/900647fd0840abebe1561792c6b31e6a7c0e278fc3973d30572a965ca14c/kiwisolver-1.5.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:7a32f72973f0f950c1920475d5c5ea3d971b81b6f0ec53b8d0a956cc965f22e0", size = 2295237, upload-time = "2026-03-09T13:14:08.891Z" }, + { url = "https://files.pythonhosted.org/packages/be/8a/be60e3bbcf513cc5a50f4a3e88e1dcecebb79c1ad607a7222877becaa101/kiwisolver-1.5.0-cp313-cp313-win_amd64.whl", hash = "sha256:0bf3acf1419fa93064a4c2189ac0b58e3be7872bf6ee6177b0d4c63dc4cea276", size = 73573, upload-time = "2026-03-09T13:14:12.327Z" }, + { url = "https://files.pythonhosted.org/packages/4d/d2/64be2e429eb4fca7f7e1c52a91b12663aeaf25de3895e5cca0f47ef2a8d0/kiwisolver-1.5.0-cp313-cp313-win_arm64.whl", hash = "sha256:fa8eb9ecdb7efb0b226acec134e0d709e87a909fa4971a54c0c4f6e88635484c", size = 64998, upload-time = "2026-03-09T13:14:13.469Z" }, + { url = "https://files.pythonhosted.org/packages/b0/69/ce68dd0c85755ae2de490bf015b62f2cea5f6b14ff00a463f9d0774449ff/kiwisolver-1.5.0-cp313-cp313t-macosx_10_13_universal2.whl", hash = "sha256:db485b3847d182b908b483b2ed133c66d88d49cacf98fd278fadafe11b4478d1", size = 125700, upload-time = "2026-03-09T13:14:14.636Z" }, + { url = "https://files.pythonhosted.org/packages/74/aa/937aac021cf9d4349990d47eb319309a51355ed1dbdc9c077cdc9224cb11/kiwisolver-1.5.0-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:be12f931839a3bdfe28b584db0e640a65a8bcbc24560ae3fdb025a449b3d754e", size = 67537, upload-time = "2026-03-09T13:14:15.808Z" }, + { url = "https://files.pythonhosted.org/packages/ee/20/3a87fbece2c40ad0f6f0aefa93542559159c5f99831d596050e8afae7a9f/kiwisolver-1.5.0-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:16b85d37c2cbb3253226d26e64663f755d88a03439a9c47df6246b35defbdfb7", size = 65514, upload-time = "2026-03-09T13:14:18.035Z" }, + { url = "https://files.pythonhosted.org/packages/f0/7f/f943879cda9007c45e1f7dba216d705c3a18d6b35830e488b6c6a4e7cdf0/kiwisolver-1.5.0-cp313-cp313t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:4432b835675f0ea7414aab3d37d119f7226d24869b7a829caeab49ebda407b0c", size = 1584848, upload-time = "2026-03-09T13:14:19.745Z" }, + { url = "https://files.pythonhosted.org/packages/37/f8/4d4f85cc1870c127c88d950913370dd76138482161cd07eabbc450deff01/kiwisolver-1.5.0-cp313-cp313t-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:1b0feb50971481a2cc44d94e88bdb02cdd497618252ae226b8eb1201b957e368", size = 1391542, upload-time = "2026-03-09T13:14:21.54Z" }, + { url = "https://files.pythonhosted.org/packages/04/0b/65dd2916c84d252b244bd405303220f729e7c17c9d7d33dca6feeff9ffc4/kiwisolver-1.5.0-cp313-cp313t-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:56fa888f10d0f367155e76ce849fa1166fc9730d13bd2d65a2aa13b6f5424489", size = 1404447, upload-time = "2026-03-09T13:14:23.205Z" }, + { url = "https://files.pythonhosted.org/packages/39/5c/2606a373247babce9b1d056c03a04b65f3cf5290a8eac5d7bdead0a17e21/kiwisolver-1.5.0-cp313-cp313t-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:940dda65d5e764406b9fb92761cbf462e4e63f712ab60ed98f70552e496f3bf1", size = 1455918, upload-time = "2026-03-09T13:14:24.74Z" }, + { url = "https://files.pythonhosted.org/packages/d5/d1/c6078b5756670658e9192a2ef11e939c92918833d2745f85cd14a6004bdf/kiwisolver-1.5.0-cp313-cp313t-manylinux_2_39_riscv64.whl", hash = "sha256:89fc958c702ee9a745e4700378f5d23fddbc46ff89e8fdbf5395c24d5c1452a3", size = 1072856, upload-time = "2026-03-09T13:14:26.597Z" }, + { url = "https://files.pythonhosted.org/packages/cb/c8/7def6ddf16eb2b3741d8b172bdaa9af882b03c78e9b0772975408801fa63/kiwisolver-1.5.0-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:9027d773c4ff81487181a925945743413f6069634d0b122d0b37684ccf4f1e18", size = 2333580, upload-time = "2026-03-09T13:14:28.237Z" }, + { url = "https://files.pythonhosted.org/packages/9e/87/2ac1fce0eb1e616fcd3c35caa23e665e9b1948bb984f4764790924594128/kiwisolver-1.5.0-cp313-cp313t-musllinux_1_2_ppc64le.whl", hash = "sha256:5b233ea3e165e43e35dba1d2b8ecc21cf070b45b65ae17dd2747d2713d942021", size = 2423018, upload-time = "2026-03-09T13:14:30.018Z" }, + { url = "https://files.pythonhosted.org/packages/67/13/c6700ccc6cc218716bfcda4935e4b2997039869b4ad8a94f364c5a3b8e63/kiwisolver-1.5.0-cp313-cp313t-musllinux_1_2_riscv64.whl", hash = "sha256:ce9bf03dad3b46408c08649c6fbd6ca28a9fce0eb32fdfffa6775a13103b5310", size = 2062804, upload-time = "2026-03-09T13:14:32.888Z" }, + { url = "https://files.pythonhosted.org/packages/1b/bd/877056304626943ff0f1f44c08f584300c199b887cb3176cd7e34f1515f1/kiwisolver-1.5.0-cp313-cp313t-musllinux_1_2_s390x.whl", hash = "sha256:fc4d3f1fb9ca0ae9f97b095963bc6326f1dbfd3779d6679a1e016b9baaa153d3", size = 2597482, upload-time = "2026-03-09T13:14:34.971Z" }, + { url = "https://files.pythonhosted.org/packages/75/19/c60626c47bf0f8ac5dcf72c6c98e266d714f2fbbfd50cf6dab5ede3aaa50/kiwisolver-1.5.0-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:f443b4825c50a51ee68585522ab4a1d1257fac65896f282b4c6763337ac9f5d2", size = 2394328, upload-time = "2026-03-09T13:14:36.816Z" }, + { url = "https://files.pythonhosted.org/packages/47/84/6a6d5e5bb8273756c27b7d810d47f7ef2f1f9b9fd23c9ee9a3f8c75c9cef/kiwisolver-1.5.0-cp313-cp313t-win_arm64.whl", hash = "sha256:893ff3a711d1b515ba9da14ee090519bad4610ed1962fbe298a434e8c5f8db53", size = 68410, upload-time = "2026-03-09T13:14:38.695Z" }, + { url = "https://files.pythonhosted.org/packages/e4/d7/060f45052f2a01ad5762c8fdecd6d7a752b43400dc29ff75cd47225a40fd/kiwisolver-1.5.0-cp314-cp314-macosx_10_15_universal2.whl", hash = "sha256:8df31fe574b8b3993cc61764f40941111b25c2d9fea13d3ce24a49907cd2d615", size = 123231, upload-time = "2026-03-09T13:14:41.323Z" }, + { url = "https://files.pythonhosted.org/packages/c2/a7/78da680eadd06ff35edef6ef68a1ad273bad3e2a0936c9a885103230aece/kiwisolver-1.5.0-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:1d49a49ac4cbfb7c1375301cd1ec90169dfeae55ff84710d782260ce77a75a02", size = 66489, upload-time = "2026-03-09T13:14:42.534Z" }, + { url = "https://files.pythonhosted.org/packages/49/b2/97980f3ad4fae37dd7fe31626e2bf75fbf8bdf5d303950ec1fab39a12da8/kiwisolver-1.5.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:0cbe94b69b819209a62cb27bdfa5dc2a8977d8de2f89dfd97ba4f53ed3af754e", size = 64063, upload-time = "2026-03-09T13:14:44.759Z" }, + { url = "https://files.pythonhosted.org/packages/e7/f9/b06c934a6aa8bc91f566bd2a214fd04c30506c2d9e2b6b171953216a65b6/kiwisolver-1.5.0-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:80aa065ffd378ff784822a6d7c3212f2d5f5e9c3589614b5c228b311fd3063ac", size = 1475913, upload-time = "2026-03-09T13:14:46.247Z" }, + { url = "https://files.pythonhosted.org/packages/6b/f0/f768ae564a710135630672981231320bc403cf9152b5596ec5289de0f106/kiwisolver-1.5.0-cp314-cp314-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:4e7f886f47ab881692f278ae901039a234e4025a68e6dfab514263a0b1c4ae05", size = 1282782, upload-time = "2026-03-09T13:14:48.458Z" }, + { url = "https://files.pythonhosted.org/packages/e2/9f/1de7aad00697325f05238a5f2eafbd487fb637cc27a558b5367a5f37fb7f/kiwisolver-1.5.0-cp314-cp314-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:5060731cc3ed12ca3a8b57acd4aeca5bbc2f49216dd0bec1650a1acd89486bcd", size = 1300815, upload-time = "2026-03-09T13:14:50.721Z" }, + { url = "https://files.pythonhosted.org/packages/5a/c2/297f25141d2e468e0ce7f7a7b92e0cf8918143a0cbd3422c1ad627e85a06/kiwisolver-1.5.0-cp314-cp314-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:7a4aa69609f40fce3cbc3f87b2061f042eee32f94b8f11db707b66a26461591a", size = 1347925, upload-time = "2026-03-09T13:14:52.304Z" }, + { url = "https://files.pythonhosted.org/packages/b9/d3/f4c73a02eb41520c47610207b21afa8cdd18fdbf64ffd94674ae21c4812d/kiwisolver-1.5.0-cp314-cp314-manylinux_2_39_riscv64.whl", hash = "sha256:d168fda2dbff7b9b5f38e693182d792a938c31db4dac3a80a4888de603c99554", size = 991322, upload-time = "2026-03-09T13:14:54.637Z" }, + { url = "https://files.pythonhosted.org/packages/7b/46/d3f2efef7732fcda98d22bf4ad5d3d71d545167a852ca710a494f4c15343/kiwisolver-1.5.0-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:413b820229730d358efd838ecbab79902fe97094565fdc80ddb6b0a18c18a581", size = 2232857, upload-time = "2026-03-09T13:14:56.471Z" }, + { url = "https://files.pythonhosted.org/packages/3f/ec/2d9756bf2b6d26ae4349b8d3662fb3993f16d80c1f971c179ce862b9dbae/kiwisolver-1.5.0-cp314-cp314-musllinux_1_2_ppc64le.whl", hash = "sha256:5124d1ea754509b09e53738ec185584cc609aae4a3b510aaf4ed6aa047ef9303", size = 2329376, upload-time = "2026-03-09T13:14:58.072Z" }, + { url = "https://files.pythonhosted.org/packages/8f/9f/876a0a0f2260f1bde92e002b3019a5fabc35e0939c7d945e0fa66185eb20/kiwisolver-1.5.0-cp314-cp314-musllinux_1_2_riscv64.whl", hash = "sha256:e4415a8db000bf49a6dd1c478bf70062eaacff0f462b92b0ba68791a905861f9", size = 1982549, upload-time = "2026-03-09T13:14:59.668Z" }, + { url = "https://files.pythonhosted.org/packages/6c/4f/ba3624dfac23a64d54ac4179832860cb537c1b0af06024936e82ca4154a0/kiwisolver-1.5.0-cp314-cp314-musllinux_1_2_s390x.whl", hash = "sha256:d618fd27420381a4f6044faa71f46d8bfd911bd077c555f7138ed88729bfbe79", size = 2494680, upload-time = "2026-03-09T13:15:01.364Z" }, + { url = "https://files.pythonhosted.org/packages/39/b7/97716b190ab98911b20d10bf92eca469121ec483b8ce0edd314f51bc85af/kiwisolver-1.5.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:5092eb5b1172947f57d6ea7d89b2f29650414e4293c47707eb499ec07a0ac796", size = 2297905, upload-time = "2026-03-09T13:15:03.925Z" }, + { url = "https://files.pythonhosted.org/packages/a3/36/4e551e8aa55c9188bca9abb5096805edbf7431072b76e2298e34fd3a3008/kiwisolver-1.5.0-cp314-cp314-win_amd64.whl", hash = "sha256:d76e2d8c75051d58177e762164d2e9ab92886534e3a12e795f103524f221dd8e", size = 75086, upload-time = "2026-03-09T13:15:07.775Z" }, + { url = "https://files.pythonhosted.org/packages/70/15/9b90f7df0e31a003c71649cf66ef61c3c1b862f48c81007fa2383c8bd8d7/kiwisolver-1.5.0-cp314-cp314-win_arm64.whl", hash = "sha256:fa6248cd194edff41d7ea9425ced8ca3a6f838bfb295f6f1d6e6bb694a8518df", size = 66577, upload-time = "2026-03-09T13:15:09.139Z" }, + { url = "https://files.pythonhosted.org/packages/17/01/7dc8c5443ff42b38e72731643ed7cf1ed9bf01691ae5cdca98501999ed83/kiwisolver-1.5.0-cp314-cp314t-macosx_10_15_universal2.whl", hash = "sha256:d1ffeb80b5676463d7a7d56acbe8e37a20ce725570e09549fe738e02ca6b7e1e", size = 125794, upload-time = "2026-03-09T13:15:10.525Z" }, + { url = "https://files.pythonhosted.org/packages/46/8a/b4ebe46ebaac6a303417fab10c2e165c557ddaff558f9699d302b256bc53/kiwisolver-1.5.0-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:bc4d8e252f532ab46a1de9349e2d27b91fce46736a9eedaa37beaca66f574ed4", size = 67646, upload-time = "2026-03-09T13:15:12.016Z" }, + { url = "https://files.pythonhosted.org/packages/60/35/10a844afc5f19d6f567359bf4789e26661755a2f36200d5d1ed8ad0126e5/kiwisolver-1.5.0-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:6783e069732715ad0c3ce96dbf21dbc2235ab0593f2baf6338101f70371f4028", size = 65511, upload-time = "2026-03-09T13:15:13.311Z" }, + { url = "https://files.pythonhosted.org/packages/f8/8a/685b297052dd041dcebce8e8787b58923b6e78acc6115a0dc9189011c44b/kiwisolver-1.5.0-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:e7c4c09a490dc4d4a7f8cbee56c606a320f9dc28cf92a7157a39d1ce7676a657", size = 1584858, upload-time = "2026-03-09T13:15:15.103Z" }, + { url = "https://files.pythonhosted.org/packages/9e/80/04865e3d4638ac5bddec28908916df4a3075b8c6cc101786a96803188b96/kiwisolver-1.5.0-cp314-cp314t-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:2a075bd7bd19c70cf67c8badfa36cf7c5d8de3c9ddb8420c51e10d9c50e94920", size = 1392539, upload-time = "2026-03-09T13:15:16.661Z" }, + { url = "https://files.pythonhosted.org/packages/ba/01/77a19cacc0893fa13fafa46d1bba06fb4dc2360b3292baf4b56d8e067b24/kiwisolver-1.5.0-cp314-cp314t-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:bdd3e53429ff02aa319ba59dfe4ceeec345bf46cf180ec2cf6fd5b942e7975e9", size = 1405310, upload-time = "2026-03-09T13:15:18.229Z" }, + { url = "https://files.pythonhosted.org/packages/53/39/bcaf5d0cca50e604cfa9b4e3ae1d64b50ca1ae5b754122396084599ef903/kiwisolver-1.5.0-cp314-cp314t-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:3cdcb35dc9d807259c981a85531048ede628eabcffb3239adf3d17463518992d", size = 1456244, upload-time = "2026-03-09T13:15:20.444Z" }, + { url = "https://files.pythonhosted.org/packages/d0/7a/72c187abc6975f6978c3e39b7cf67aeb8b3c0a8f9790aa7fd412855e9e1f/kiwisolver-1.5.0-cp314-cp314t-manylinux_2_39_riscv64.whl", hash = "sha256:70d593af6a6ca332d1df73d519fddb5148edb15cd90d5f0155e3746a6d4fcc65", size = 1073154, upload-time = "2026-03-09T13:15:22.039Z" }, + { url = "https://files.pythonhosted.org/packages/c7/ca/cf5b25783ebbd59143b4371ed0c8428a278abe68d6d0104b01865b1bbd0f/kiwisolver-1.5.0-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:377815a8616074cabbf3f53354e1d040c35815a134e01d7614b7692e4bf8acfa", size = 2334377, upload-time = "2026-03-09T13:15:23.741Z" }, + { url = "https://files.pythonhosted.org/packages/4a/e5/b1f492adc516796e88751282276745340e2a72dcd0d36cf7173e0daf3210/kiwisolver-1.5.0-cp314-cp314t-musllinux_1_2_ppc64le.whl", hash = "sha256:0255a027391d52944eae1dbb5d4cc5903f57092f3674e8e544cdd2622826b3f0", size = 2425288, upload-time = "2026-03-09T13:15:25.789Z" }, + { url = "https://files.pythonhosted.org/packages/e6/e5/9b21fbe91a61b8f409d74a26498706e97a48008bfcd1864373d32a6ba31c/kiwisolver-1.5.0-cp314-cp314t-musllinux_1_2_riscv64.whl", hash = "sha256:012b1eb16e28718fa782b5e61dc6f2da1f0792ca73bd05d54de6cb9561665fc9", size = 2063158, upload-time = "2026-03-09T13:15:27.63Z" }, + { url = "https://files.pythonhosted.org/packages/b1/02/83f47986138310f95ea95531f851b2a62227c11cbc3e690ae1374fe49f0f/kiwisolver-1.5.0-cp314-cp314t-musllinux_1_2_s390x.whl", hash = "sha256:0e3aafb33aed7479377e5e9a82e9d4bf87063741fc99fc7ae48b0f16e32bdd6f", size = 2597260, upload-time = "2026-03-09T13:15:29.421Z" }, + { url = "https://files.pythonhosted.org/packages/07/18/43a5f24608d8c313dd189cf838c8e68d75b115567c6279de7796197cfb6a/kiwisolver-1.5.0-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:e7a116ae737f0000343218c4edf5bd45893bfeaff0993c0b215d7124c9f77646", size = 2394403, upload-time = "2026-03-09T13:15:31.517Z" }, + { url = "https://files.pythonhosted.org/packages/3b/b5/98222136d839b8afabcaa943b09bd05888c2d36355b7e448550211d1fca4/kiwisolver-1.5.0-cp314-cp314t-win_amd64.whl", hash = "sha256:1dd9b0b119a350976a6d781e7278ec7aca0b201e1a9e2d23d9804afecb6ca681", size = 79687, upload-time = "2026-03-09T13:15:33.204Z" }, + { url = "https://files.pythonhosted.org/packages/99/a2/ca7dc962848040befed12732dff6acae7fb3c4f6fc4272b3f6c9a30b8713/kiwisolver-1.5.0-cp314-cp314t-win_arm64.whl", hash = "sha256:58f812017cd2985c21fbffb4864d59174d4903dd66fa23815e74bbc7a0e2dd57", size = 70032, upload-time = "2026-03-09T13:15:34.411Z" }, + { url = "https://files.pythonhosted.org/packages/1c/fa/2910df836372d8761bb6eff7d8bdcb1613b5c2e03f260efe7abe34d388a7/kiwisolver-1.5.0-graalpy312-graalpy250_312_native-macosx_10_13_x86_64.whl", hash = "sha256:5ae8e62c147495b01a0f4765c878e9bfdf843412446a247e28df59936e99e797", size = 130262, upload-time = "2026-03-09T13:15:35.629Z" }, + { url = "https://files.pythonhosted.org/packages/0f/41/c5f71f9f00aabcc71fee8b7475e3f64747282580c2fe748961ba29b18385/kiwisolver-1.5.0-graalpy312-graalpy250_312_native-macosx_11_0_arm64.whl", hash = "sha256:f6764a4ccab3078db14a632420930f6186058750df066b8ea2a7106df91d3203", size = 138036, upload-time = "2026-03-09T13:15:36.894Z" }, + { url = "https://files.pythonhosted.org/packages/fa/06/7399a607f434119c6e1fdc8ec89a8d51ccccadf3341dee4ead6bd14caaf5/kiwisolver-1.5.0-graalpy312-graalpy250_312_native-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:c31c13da98624f957b0fb1b5bae5383b2333c2c3f6793d9825dd5ce79b525cb7", size = 194295, upload-time = "2026-03-09T13:15:38.22Z" }, + { url = "https://files.pythonhosted.org/packages/b5/91/53255615acd2a1eaca307ede3c90eb550bae9c94581f8c00081b6b1c8f44/kiwisolver-1.5.0-graalpy312-graalpy250_312_native-win_amd64.whl", hash = "sha256:1f1489f769582498610e015a8ef2d36f28f505ab3096d0e16b4858a9ec214f57", size = 75987, upload-time = "2026-03-09T13:15:39.65Z" }, + { url = "https://files.pythonhosted.org/packages/e9/eb/5fcbbbf9a0e2c3a35effb88831a483345326bbc3a030a3b5b69aee647f84/kiwisolver-1.5.0-pp311-pypy311_pp73-macosx_10_15_x86_64.whl", hash = "sha256:ec4c85dc4b687c7f7f15f553ff26a98bfe8c58f5f7f0ac8905f0ba4c7be60232", size = 59532, upload-time = "2026-03-09T13:15:47.047Z" }, + { url = "https://files.pythonhosted.org/packages/c3/9b/e17104555bb4db148fd52327feea1e96be4b88e8e008b029002c281a21ab/kiwisolver-1.5.0-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:12e91c215a96e39f57989c8912ae761286ac5a9584d04030ceb3368a357f017a", size = 57420, upload-time = "2026-03-09T13:15:48.199Z" }, + { url = "https://files.pythonhosted.org/packages/48/44/2b5b95b7aa39fb2d8d9d956e0f3d5d45aef2ae1d942d4c3ffac2f9cfed1a/kiwisolver-1.5.0-pp311-pypy311_pp73-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:be4a51a55833dc29ab5d7503e7bcb3b3af3402d266018137127450005cdfe737", size = 79892, upload-time = "2026-03-09T13:15:49.694Z" }, + { url = "https://files.pythonhosted.org/packages/52/7d/7157f9bba6b455cfb4632ed411e199fc8b8977642c2b12082e1bd9e6d173/kiwisolver-1.5.0-pp311-pypy311_pp73-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:daae526907e262de627d8f70058a0f64acc9e2641c164c99c8f594b34a799a16", size = 77603, upload-time = "2026-03-09T13:15:50.945Z" }, + { url = "https://files.pythonhosted.org/packages/0a/dd/8050c947d435c8d4bc94e3252f4d8bb8a76cfb424f043a8680be637a57f1/kiwisolver-1.5.0-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:59cd8683f575d96df5bb48f6add94afc055012c29e28124fcae2b63661b9efb1", size = 73558, upload-time = "2026-03-09T13:15:52.112Z" }, +] + +[[package]] +name = "lark" +version = "1.3.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/da/34/28fff3ab31ccff1fd4f6c7c7b0ceb2b6968d8ea4950663eadcb5720591a0/lark-1.3.1.tar.gz", hash = "sha256:b426a7a6d6d53189d318f2b6236ab5d6429eaf09259f1ca33eb716eed10d2905", size = 382732, upload-time = "2025-10-27T18:25:56.653Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/82/3d/14ce75ef66813643812f3093ab17e46d3a206942ce7376d31ec2d36229e7/lark-1.3.1-py3-none-any.whl", hash = "sha256:c629b661023a014c37da873b4ff58a817398d12635d3bbb2c5a03be7fe5d1e12", size = 113151, upload-time = "2025-10-27T18:25:54.882Z" }, +] + +[[package]] +name = "lxml" +version = "6.1.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/05/3b/aab6728cae887456f409b4d75e8a01856e4f04bd510de38052a47768b680/lxml-6.1.1.tar.gz", hash = "sha256:ba96ae44888e0185281e937633a743ea90d5a196c6000f82565ebb0580012d40", size = 4197430, upload-time = "2026-05-18T19:19:06.424Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/62/b0/83f481780d1548750b8ce2ec824073deef2f452d9cd1a6faff8507e3d16d/lxml-6.1.1-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:53b7d2b7a10b1c35c0a5e21e9224accf60c1bbfba523990732e521b2b73adef2", size = 8526461, upload-time = "2026-05-18T19:17:25.862Z" }, + { url = "https://files.pythonhosted.org/packages/b9/d5/30fa0f808002c7329397bfbb24e306789c0b29f04aa5842c07b174b4216f/lxml-6.1.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:ff3f333630ab480244a1bff72043e511a91eb22e7595dead8653ee5612dd8f3d", size = 4595375, upload-time = "2026-05-18T19:17:34.555Z" }, + { url = "https://files.pythonhosted.org/packages/4f/d2/edb71cf0e561581a7c5eb2626244320eb04e9f8ce6d563184fd668b45073/lxml-6.1.1-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:a4bbea04c97f6d78a48e3fbc1cb9116d2780b1b39e03a23f6eb9b603fd61f510", size = 4923654, upload-time = "2026-05-18T19:17:42.917Z" }, + { url = "https://files.pythonhosted.org/packages/4c/77/1bc7eeb0de4577d783fb625aa092cc9357883bba35845a3666bf1259f3dc/lxml-6.1.1-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:db1d75f6617a49c1c01bc7023713e0ff59ab32c9579ae62a7674c0e34f3b0b0a", size = 5067921, upload-time = "2026-05-18T19:17:49.175Z" }, + { url = "https://files.pythonhosted.org/packages/1b/3c/c0690d74bd2bc17bc03b5b0d093569ead597dd0bfa088bf99eef8c24e19c/lxml-6.1.1-cp311-cp311-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:3a12689be69a28ddaa0ab99a5a1137da2afd5f8f16df7b5680b66f616d3eda1d", size = 5002456, upload-time = "2026-05-18T19:17:59.715Z" }, + { url = "https://files.pythonhosted.org/packages/66/8d/d1b3271af0c0f1e27e8472a849e4d2c65bc7766884b9ad2da9e76e145c88/lxml-6.1.1-cp311-cp311-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:18b73c339ae29b90fd2d06e58ebd555a751bde9cd6bbd36cc0281b9a2c94e9d8", size = 5202776, upload-time = "2026-05-18T19:18:08.924Z" }, + { url = "https://files.pythonhosted.org/packages/7a/45/689824ffb237fd10125ad273f32b28ff04dc6203c2822c85ff65a93df65e/lxml-6.1.1-cp311-cp311-manylinux_2_28_i686.whl", hash = "sha256:752d3bbfe874715ccd0aec7f88d7fc623c0f1fd7aa7b3238a084e017bad2a009", size = 5329945, upload-time = "2026-05-18T19:18:13.673Z" }, + { url = "https://files.pythonhosted.org/packages/5d/c0/ef73af53767e958fd87d437c170f272e2f6e6c0f854939f133a895f1e711/lxml-6.1.1-cp311-cp311-manylinux_2_31_armv7l.whl", hash = "sha256:6b1761fbf9ec984e2e9d9c589ef5f5fd684b7c19f92aadd567a26c5224958db6", size = 4659237, upload-time = "2026-05-18T19:18:18.657Z" }, + { url = "https://files.pythonhosted.org/packages/a0/5e/e1158e40397585e91cb0472374a1f63d0926a1ddeaa92f13d1a1ffe306d5/lxml-6.1.1-cp311-cp311-manylinux_2_38_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:d680fbcb768404c601ecb43519ecd8461f6954cb11c06a78962f666832ccfca8", size = 5265904, upload-time = "2026-05-18T19:18:24.883Z" }, + { url = "https://files.pythonhosted.org/packages/a0/16/8687e5d1400ed1c0bc41dace232ebb7553952b618ea1f2e5fb6e2cfbbe23/lxml-6.1.1-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:162af1091cd785f2f27e62d3547ae9bc58ec5c86dd314d67021fd02463708d83", size = 5045225, upload-time = "2026-05-18T19:17:20.073Z" }, + { url = "https://files.pythonhosted.org/packages/ca/18/d877bd1ae2e5ffdfd4836565aba350db31feb2f2656d6ce70316ed66a05e/lxml-6.1.1-cp311-cp311-musllinux_1_2_armv7l.whl", hash = "sha256:e9308ff8241c532df3f3e570f9a5aeed6c853f888512ba4b75638d7c11c95ef6", size = 4712721, upload-time = "2026-05-18T19:17:40.512Z" }, + { url = "https://files.pythonhosted.org/packages/44/4d/1f44fd1d770b10dacbf6b5c6e520f4d6e0708744930f719dc04e67cab981/lxml-6.1.1-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:5f6994074ebae6ffb04447268e37dc16edc304f9859cf91acb86e0af6c1b395c", size = 5252549, upload-time = "2026-05-18T19:17:51.236Z" }, + { url = "https://files.pythonhosted.org/packages/64/5d/1d66b84f850089254c230ef6ea6b267a5a54e2e179a5d960036a05d501d7/lxml-6.1.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:80c2dfadb855da477cf73373ad29a333535dedb9b12bad02c9814c8e2b43bf08", size = 5226877, upload-time = "2026-05-18T19:18:00.875Z" }, + { url = "https://files.pythonhosted.org/packages/ad/00/84c4b5302d42a2d0184f38d538c8a197f33b52a50bd4f7bcfe990bce3036/lxml-6.1.1-cp311-cp311-win32.whl", hash = "sha256:30a89d3ac8faec007453fb541f3f46807eeec88edd5826f6e3fe001752a2c621", size = 3594072, upload-time = "2026-05-18T19:17:12.714Z" }, + { url = "https://files.pythonhosted.org/packages/61/9d/2e2f7d876349f45e0f3e29f72da311668853d59b58d473a2dea4f0160135/lxml-6.1.1-cp311-cp311-win_amd64.whl", hash = "sha256:abbefa31eee84842140f67acef1c828e28bba8bbf0c3bc6e5492a9af88152c28", size = 4025469, upload-time = "2026-05-18T19:17:50.566Z" }, + { url = "https://files.pythonhosted.org/packages/b0/d5/570e6390e4110331e6208b2ba83d1482cc9146808ee118b22824a34c1070/lxml-6.1.1-cp311-cp311-win_arm64.whl", hash = "sha256:dcb292aa7fe485ceff7af4f92e46c5af397daec5dff64871a528f0fc47a3cc5b", size = 3667640, upload-time = "2026-05-19T19:22:48.293Z" }, + { url = "https://files.pythonhosted.org/packages/6a/6e/c4add832b6fc1e887125b96f880d7b9b70aae5248718e046b1704bcac4b9/lxml-6.1.1-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:104c09bda8d2a562824c0e319d0768ce26a779b7601e0931d33b09b53c392ef7", size = 8570821, upload-time = "2026-05-18T19:17:42.068Z" }, + { url = "https://files.pythonhosted.org/packages/22/00/ff3009c88e65de8011630acf8ab5a09cb2becd2aaf47fba2f3449f6224e9/lxml-6.1.1-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:25c6997a9a534e016695a0ba06b2f07945de682731ff01065b6d5a4474179da1", size = 4624252, upload-time = "2026-05-18T19:17:47.897Z" }, + { url = "https://files.pythonhosted.org/packages/42/95/bb63f0fd62e554fe078e1fb3c8fe9083c14ddc7ad7fa178d10e57e071ac7/lxml-6.1.1-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:c921ba5c51e4e9f63b8b00267d06566e1f63407408a0496da2d1d0bfc819c7fc", size = 4930746, upload-time = "2026-05-18T19:18:29.637Z" }, + { url = "https://files.pythonhosted.org/packages/eb/99/0013e8d9b5960f4f041cf0b73e2f80c23eb5205b1f7bfb20203243651359/lxml-6.1.1-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:54a7f95e4de5fb94e2f9f4b9055c6ba33bf3d628fd77a1d647c5923caa2cdcdc", size = 5093723, upload-time = "2026-05-18T19:18:34.168Z" }, + { url = "https://files.pythonhosted.org/packages/29/91/317b332636bfc7bddcff828d41b3307f50043f4b237e40849c333d80fa1a/lxml-6.1.1-cp312-cp312-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:96f2ec43df44b1f76249ee0a615334f9b5b060e1c8bd90e706dad2d14d02f383", size = 5005557, upload-time = "2026-05-18T19:18:39.798Z" }, + { url = "https://files.pythonhosted.org/packages/42/2f/cc9bf06afe70f9c9093ae60855d9759da9db601ec4080f7473319666ffd7/lxml-6.1.1-cp312-cp312-manylinux_2_26_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:70ef8a7e102a1508f8121aae5b0867abd663f72c14f0a9c937e6554cb4587b7b", size = 5631036, upload-time = "2026-05-18T19:18:44.858Z" }, + { url = "https://files.pythonhosted.org/packages/08/f6/af32e23e563971ffb0fb86be52bc5be5c2c118858ffc119bf6a9039b173d/lxml-6.1.1-cp312-cp312-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:ebe6af670449830d6d9b752c256a983291c766a1365ba5d5460048f9e33a7818", size = 5240367, upload-time = "2026-05-18T19:18:49.217Z" }, + { url = "https://files.pythonhosted.org/packages/78/83/8555d40948b09ce86f1bd0c68a7ac31d07b1929f92cc1b074006c97ef2d2/lxml-6.1.1-cp312-cp312-manylinux_2_28_i686.whl", hash = "sha256:27acc820660aaffa4f7c087f29120e12980f7779d56d8492d263170111284740", size = 5350171, upload-time = "2026-05-18T19:18:52.779Z" }, + { url = "https://files.pythonhosted.org/packages/63/75/5d92da93729b7bad783689e6496049fa40927b45bec7bf183c981de3ca70/lxml-6.1.1-cp312-cp312-manylinux_2_31_armv7l.whl", hash = "sha256:1db753c9115ec7100d073b744d17e25e88a8f90f5c39b2f5dd878149af59671f", size = 4694874, upload-time = "2026-05-18T19:18:55.139Z" }, + { url = "https://files.pythonhosted.org/packages/c5/b5/3aad415a9a25b822e783f15deeb4dffccf5113030f1afa2222dd929313d9/lxml-6.1.1-cp312-cp312-manylinux_2_38_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:c4f469aebd783bb741c2ecb2a681008fd26bfe5c16a9a72ed5467f834e810df2", size = 5244492, upload-time = "2026-05-18T19:19:01.28Z" }, + { url = "https://files.pythonhosted.org/packages/f1/a1/5fcf7eb9904b80086aa47dcf0027de07b1bb990afad2e6823144c368ae04/lxml-6.1.1-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:766b010012d59470072c1816b5b6c69f1d243e5db36ea5968e94accf430a4635", size = 5048232, upload-time = "2026-05-18T19:18:12.67Z" }, + { url = "https://files.pythonhosted.org/packages/77/74/1f601b63c7a69fcdf10fa9b148c81da8442204194f6c55509cc485c786b9/lxml-6.1.1-cp312-cp312-musllinux_1_2_armv7l.whl", hash = "sha256:b8d812c6011c08b8111a15e54dd990b8923692d80adf35488bee34026c35accf", size = 4777023, upload-time = "2026-05-18T19:18:15.928Z" }, + { url = "https://files.pythonhosted.org/packages/a2/b9/7a78f51aec95b1bf780d78e12705a9f6533284f8693dc5c0e6724fa53d3f/lxml-6.1.1-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:fe0306bd29505a9177aac19f1877174b0e7422c222a59f70b2cd41633448c3dc", size = 5645773, upload-time = "2026-05-18T19:18:23.223Z" }, + { url = "https://files.pythonhosted.org/packages/a5/6e/98a7b7ad54e4e74fa1f20fff776913980619d0ebe5558232d7da6580bdd8/lxml-6.1.1-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:5ba186ad207446c65d3bb3d3e0412b032b1d9f595e59861e2354798c5703d955", size = 5233088, upload-time = "2026-05-18T19:18:31.433Z" }, + { url = "https://files.pythonhosted.org/packages/65/d1/bc0ed2427bf609f2ee10da303a6a226f9c8bce94f945dc29a32ce55de6e4/lxml-6.1.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:aa366a1e55b8ebfe8ca8ddc3cfe75c8ebade181aeb0f661d0cb05986b647f72a", size = 5260995, upload-time = "2026-05-18T19:18:37.091Z" }, + { url = "https://files.pythonhosted.org/packages/69/8b/6772e1a4b513fc50a8d931f19edde0e13ae6918510a1e13ff67864f3e5ed/lxml-6.1.1-cp312-cp312-win32.whl", hash = "sha256:126c93f7f56f0eda92f6d8c619edc463a4f23d9252f1c9d0405a76f25fa9f11a", size = 3596382, upload-time = "2026-05-18T19:17:18.37Z" }, + { url = "https://files.pythonhosted.org/packages/1b/89/45198e9624762af2dfd2cb8782598477ceb29f6e59caab560388ae1f4ec1/lxml-6.1.1-cp312-cp312-win_amd64.whl", hash = "sha256:26e6eda8d38c1fcab1090dd196ee87cbd13788e531937610e2589085de074e77", size = 3997255, upload-time = "2026-05-18T19:17:56.781Z" }, + { url = "https://files.pythonhosted.org/packages/90/a9/7a54b6834088d9ae528a7b780584ba6a39a9457b0ac330479f20ffbc9449/lxml-6.1.1-cp312-cp312-win_arm64.whl", hash = "sha256:6540377fbd53fe1b629172288c464fb18db11ce1fa7dc15891da10aa9dcc3e7f", size = 3659610, upload-time = "2026-05-19T19:22:50.843Z" }, + { url = "https://files.pythonhosted.org/packages/a5/eb/7e6f37c5584ccbb2ff267f56fd0339016938c1c8684cfefab9b33ffc2f36/lxml-6.1.1-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:68a9198d0fc122d14bb76837de9aa80cf84caed990b5b237f532ed87d3706736", size = 8559780, upload-time = "2026-05-18T19:17:57.661Z" }, + { url = "https://files.pythonhosted.org/packages/a1/36/587c2521cf23a2cd6c9c22108aa7528f683a1f195ed7ccd23a4b1786ad36/lxml-6.1.1-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:7d47866cb32fb503450b6edc9df355d10dc49836af2e89901bd6ac6b0896d9d9", size = 4618006, upload-time = "2026-05-18T19:18:04.452Z" }, + { url = "https://files.pythonhosted.org/packages/6e/ca/ab7bfe2bf4c972af5e7878262845ead3a24a929a9b04bc11c7c1ece6c82a/lxml-6.1.1-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:eb7c9811bfaa8b1ed5ed319f5d370dfbcaa59d52ea64be2a5a85e18195930354", size = 4924139, upload-time = "2026-05-18T19:19:04.873Z" }, + { url = "https://files.pythonhosted.org/packages/6b/55/a0c72851dfee5ecc689f949723a73dea457758912542cb955b108eaf0d8f/lxml-6.1.1-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:762ff394d5bd56da0cf034a23dcce4e13923f15321a2adfa2ac00201dc6d3fca", size = 5082329, upload-time = "2026-05-18T19:19:09.728Z" }, + { url = "https://files.pythonhosted.org/packages/f0/b6/0608f7d61a3b96cc67e5648a3d906e31a5082093e10e7be65b3886289938/lxml-6.1.1-cp313-cp313-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:a088f287f7d8275a33c07f2cac6c50b9319309a0200a39e7e75d80c707723099", size = 4993564, upload-time = "2026-05-18T19:19:13.608Z" }, + { url = "https://files.pythonhosted.org/packages/4c/66/ae227524b066d29d55bf0b453d93d2d793c40218657d643dcbbca13b8faf/lxml-6.1.1-cp313-cp313-manylinux_2_26_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:e902da4b04e6b52e5893900d4b8ab46068f75f3561f01bf1080957f9fd932ed6", size = 5613467, upload-time = "2026-05-18T19:19:16.228Z" }, + { url = "https://files.pythonhosted.org/packages/a6/76/dbe4a00b50385e40194231dcfe5a12c059de7cf90e89c83407d2b085b719/lxml-6.1.1-cp313-cp313-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:1d4962d4c66bf830a7e59ed6cfc17d148149898a3aefa8ec6e59763e6e3ed085", size = 5228304, upload-time = "2026-05-18T19:19:19.354Z" }, + { url = "https://files.pythonhosted.org/packages/1c/01/00b1b8442ed2041793336868ba0b9ea4b13d7da7c085c6404c207a63bf79/lxml-6.1.1-cp313-cp313-manylinux_2_28_i686.whl", hash = "sha256:581d4c8ae690a6609e64862dd6b7c2489635c2d13907fc2b20f2bc200ff1d21e", size = 5341607, upload-time = "2026-05-18T19:19:22.297Z" }, + { url = "https://files.pythonhosted.org/packages/63/36/1ad29931e9a4638bb707869f01d423a6c815f82152138d1a40dfcfde2b95/lxml-6.1.1-cp313-cp313-manylinux_2_31_armv7l.whl", hash = "sha256:876e1ff5930ed8bf295ec5ef9a8155e9b6b1876bbf1deed8b3a8069311875a8f", size = 4700168, upload-time = "2026-05-18T19:19:25.133Z" }, + { url = "https://files.pythonhosted.org/packages/3c/d1/a9536cecf9be18a0dc72d32bead283a2332d1ffebd2dd3ac70ce444686e5/lxml-6.1.1-cp313-cp313-manylinux_2_38_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:9eb9b5a968f6e0f6d640092a567e14529ff8cea2e29d00da6f78a79fa49f013c", size = 5232487, upload-time = "2026-05-18T19:19:28.603Z" }, + { url = "https://files.pythonhosted.org/packages/0e/77/b4fb1e03bf5d130e879214d3100092e386418807fb74dd0adc4b0a48f351/lxml-6.1.1-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:aa49e06d94aba782c6a02eecb7e507969e7e7a41b267f1b359bb35585f295d5b", size = 5044231, upload-time = "2026-05-18T19:18:42.246Z" }, + { url = "https://files.pythonhosted.org/packages/26/4c/d00daeeb0a5530c4028a9232aa1b93db3ef4ed2158c116ea73c79a9765b3/lxml-6.1.1-cp313-cp313-musllinux_1_2_armv7l.whl", hash = "sha256:70cdfd80589d59e43e18005dd7244e8895e93db8ab6a620b7e23df5445a4e3d2", size = 4769450, upload-time = "2026-05-18T19:18:48.013Z" }, + { url = "https://files.pythonhosted.org/packages/ed/6a/715a3a8d156ce42f29cf014706f5410c2ff3b02267774110fc23266409fe/lxml-6.1.1-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:aad9aa39483ed8ec44d6d2e59e5b98a0d80676ef0d92f44bfc374836111f62f5", size = 5635874, upload-time = "2026-05-18T19:18:51.914Z" }, + { url = "https://files.pythonhosted.org/packages/45/37/0544bc21dde2a88f3a17b504e6fc79c0e01d25a33c2f6079724e9e72b9c7/lxml-6.1.1-cp313-cp313-musllinux_1_2_riscv64.whl", hash = "sha256:d49514be2f28d895c38cf9d2b72d7b9a07d00314519f456c0b50b53cfcf4c785", size = 5223987, upload-time = "2026-05-18T19:18:59.715Z" }, + { url = "https://files.pythonhosted.org/packages/4d/f8/f6a5e8185bcb28c2befae3d31f8e3df3b811cb0f47746517a81279fcafe1/lxml-6.1.1-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:47402e62c52ff5988c1e8c6c63177f5708bccf48e366dea4e3dcf1e645e04947", size = 5250276, upload-time = "2026-05-18T19:19:03.834Z" }, + { url = "https://files.pythonhosted.org/packages/c7/f2/1a2b9f1b7a49d45495369be7ef9ad05b262930f2eab3e3145706fca8083f/lxml-6.1.1-cp313-cp313-win32.whl", hash = "sha256:3483644525531e1d5762b0c44a8e18b6efba321b6dcf8a8952de10b037618bca", size = 3596903, upload-time = "2026-05-18T19:17:29.863Z" }, + { url = "https://files.pythonhosted.org/packages/e6/99/f4ffb024f238eec2131aaa09f3278fb6129cf892741bf68e1fc1afb8c100/lxml-6.1.1-cp313-cp313-win_amd64.whl", hash = "sha256:a10bd2fd62e8ce916ececb342f348f190724a098c1faa056fdfb2a22ad5e8660", size = 3995869, upload-time = "2026-05-18T19:18:02.596Z" }, + { url = "https://files.pythonhosted.org/packages/d1/53/70eb8c5c6037f27448f1e3c54ebede9545a801ae63f0a7254afca4fe8e45/lxml-6.1.1-cp313-cp313-win_arm64.whl", hash = "sha256:424aa57aca0897eb922aef34395bd1289b3b6f04e6bae20ea123c0c7e333cffc", size = 3658490, upload-time = "2026-05-19T19:22:53.846Z" }, + { url = "https://files.pythonhosted.org/packages/13/e2/2e325795566de01d0d7c3bb57d3c370616b2d07b01214e84eec5d3b10963/lxml-6.1.1-cp314-cp314-macosx_10_15_universal2.whl", hash = "sha256:19b7ab10b210b0b3ad7985d9ac4eb66ab09a90b20fe6e2f7ba55d01a234345d0", size = 8577146, upload-time = "2026-05-18T19:18:17.765Z" }, + { url = "https://files.pythonhosted.org/packages/93/cf/5630b5e4be7d2e6bee8efe83865c925221103cf0221303b104ce134b01e2/lxml-6.1.1-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:c08e5c694306507275f2290073350c4f32e383db15213b2c69e7ff39c1193840", size = 4623866, upload-time = "2026-05-18T19:18:30.669Z" }, + { url = "https://files.pythonhosted.org/packages/d2/51/3904907c063451cf8d4a5c9fe0cad95fa1f4ec57f4e3884fa0731bd7a305/lxml-6.1.1-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:74a9717fd0d82effef5c2854f0d917231d5324b5a3eb7275c43ac9fa32f97a14", size = 4950022, upload-time = "2026-05-18T19:19:31.958Z" }, + { url = "https://files.pythonhosted.org/packages/94/cd/9c7611a51c37a2830928405817cc5d56a97f64fab83cc3f628748b135749/lxml-6.1.1-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:efe0374196335f93b53269acd811b944f2e6bdc88e8894f214bd636455484909", size = 5086695, upload-time = "2026-05-18T19:19:34.764Z" }, + { url = "https://files.pythonhosted.org/packages/da/d6/24e3b5906abb0b674ff2ae195bc3ce59708df2bcd17cf17703b2d7dd643a/lxml-6.1.1-cp314-cp314-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:ac931cdc9442c1763b8a8f6cd62c0c938737eafc5be75eff88df55fc73bc0d00", size = 5031642, upload-time = "2026-05-18T19:19:37.771Z" }, + { url = "https://files.pythonhosted.org/packages/2d/db/6ec54f99019838bff54785c51da07f189eb4676861c5f2730962b0d8d665/lxml-6.1.1-cp314-cp314-manylinux_2_26_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:aee395f5d0927f947758b4ec119fd5fc8ec71f07a1c5c52077b30b04c0fa6955", size = 5647338, upload-time = "2026-05-18T19:19:40.553Z" }, + { url = "https://files.pythonhosted.org/packages/42/3d/ef4dcfffd22d27a61805d8ed9f7fb888495bc6aa88648fa07c1eaa5586b6/lxml-6.1.1-cp314-cp314-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:9395002973c827b3ed67db77e6ec09f092919a587022174554096a269378fb13", size = 5239528, upload-time = "2026-05-18T19:19:43.657Z" }, + { url = "https://files.pythonhosted.org/packages/62/bb/37fb3f0dff146bdcfa78eec47879273820b2a0bf350ec236ce14bd0b1c26/lxml-6.1.1-cp314-cp314-manylinux_2_28_i686.whl", hash = "sha256:73bc2086f141224ebddb7fc5c6a36ca58b31b94b561e1dfe8e073e3270fad1e7", size = 5350730, upload-time = "2026-05-18T19:19:46.307Z" }, + { url = "https://files.pythonhosted.org/packages/90/42/43253f168388df4fae1f38c01df36ddb9bee39e2048167b54cdcbae85ea3/lxml-6.1.1-cp314-cp314-manylinux_2_31_armv7l.whl", hash = "sha256:3779def59032b81e44a5f70096ef6bf2082f8d901937dca354474ba09782e245", size = 4697530, upload-time = "2026-05-18T19:19:49.889Z" }, + { url = "https://files.pythonhosted.org/packages/eb/a8/c5a8504f81bbdfc8e7094c2c850cdb4ed6777fc4d5ddd9e5ab819f3b0d54/lxml-6.1.1-cp314-cp314-manylinux_2_38_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:86c89b9d55ebf820ad7c90bc533410f0d098054f293351f10603c0c46ff598f5", size = 5250670, upload-time = "2026-05-18T19:19:53.199Z" }, + { url = "https://files.pythonhosted.org/packages/77/b7/c7e76ab18744d75e21f320ebf9ff9d1ceae2b54dd431ea5a64caf26c9672/lxml-6.1.1-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:19607c6bbff2a44cf3fe8250abccd20942d3462473e0a721d01d379ed017e462", size = 5084485, upload-time = "2026-05-18T19:19:08.422Z" }, + { url = "https://files.pythonhosted.org/packages/31/31/b35c53f8ef7b7c31cacd23d3638652fff7bcd1deb6eedb709ab43b685908/lxml-6.1.1-cp314-cp314-musllinux_1_2_armv7l.whl", hash = "sha256:c6ed5141a5c7507cf3ee76bd363b0d6f801e3321adc35b5d825a23115faa5465", size = 4737635, upload-time = "2026-05-18T19:19:12.321Z" }, + { url = "https://files.pythonhosted.org/packages/d9/06/31f23c813a7fe8e0cb1b175e915b08c9bf4e86d225b210feadbdbe519667/lxml-6.1.1-cp314-cp314-musllinux_1_2_ppc64le.whl", hash = "sha256:62aeb7e85b5d60320b9d77eef2e773994e2c0ce10121b277e0a19804e1654a5a", size = 5670681, upload-time = "2026-05-18T19:19:15.001Z" }, + { url = "https://files.pythonhosted.org/packages/1a/bc/ce619bccc89b1fd9ad8a8e1330ee3f3beff9f2ff95b712d7bbcdd6e22fc3/lxml-6.1.1-cp314-cp314-musllinux_1_2_riscv64.whl", hash = "sha256:b1b963fd8f5caa68e99dfae060d54de1fe9cba899b8718b44a00cdca53c3e590", size = 5238229, upload-time = "2026-05-18T19:19:18.131Z" }, + { url = "https://files.pythonhosted.org/packages/2f/5d/b329acbbedc0b619ebc2be6cf7ee9ed07e80892c88d4dfd612c33805789a/lxml-6.1.1-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:63876be28efefa04a1df615b46770e82042cce445cfdce55160522f57b231ccb", size = 5264191, upload-time = "2026-05-18T19:19:21.118Z" }, + { url = "https://files.pythonhosted.org/packages/d6/85/be36fb1425b30db3c3f9df75fe86343ebffb79e6320bd7f588e25bfeac39/lxml-6.1.1-cp314-cp314-win32.whl", hash = "sha256:7f7a92e8583f06b1fd49d01158143b8461cfcd135dcb10ec807270a3051bd603", size = 3657202, upload-time = "2026-05-18T19:17:39.509Z" }, + { url = "https://files.pythonhosted.org/packages/b8/ce/3cf9a827342269f54d405a6202397de63f07c69cbd6ce7d183a3f0cba1e9/lxml-6.1.1-cp314-cp314-win_amd64.whl", hash = "sha256:b2d444f2e66624d68e9c6b211e28a76e22fff5fcabcfff4deac18b529b7d4137", size = 4064497, upload-time = "2026-05-18T19:18:14.662Z" }, + { url = "https://files.pythonhosted.org/packages/d9/3e/1a957bde8f0760039e627f94699f82caa782c9d838d86c3d28245ee67212/lxml-6.1.1-cp314-cp314-win_arm64.whl", hash = "sha256:3fd9728a2735fda14f4e8235830c86b539e9661e849665bf926d3f867943b4bf", size = 3741991, upload-time = "2026-05-19T19:22:59.111Z" }, + { url = "https://files.pythonhosted.org/packages/78/b2/00ed55b3a2efa4658fb795c38d1090ec9b3e8a6c3683d4441fa517f09c3b/lxml-6.1.1-cp314-cp314t-macosx_10_15_universal2.whl", hash = "sha256:787b2496d0dbe8cd180984e8d29e3a6f76e7ea34db781cb3bd55e4ba1ef8b4ee", size = 8827545, upload-time = "2026-05-18T19:18:41.193Z" }, + { url = "https://files.pythonhosted.org/packages/c0/73/74573db19baa618d5f266f2407898b087ff6927115b00b71e5fc1b700847/lxml-6.1.1-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:2c8daa471358dc2d6fcf02165e80ec68f77871a286df95bc5cc3816153b0fd2c", size = 4735736, upload-time = "2026-05-18T19:18:46.761Z" }, + { url = "https://files.pythonhosted.org/packages/16/02/6f7061f4f95f51e545d48e87647c54791d204a4e881be4156e7a26ba5338/lxml-6.1.1-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:acd7d70b64c0aae0c7922cca83d288a16f5f6da523637697872253415269baef", size = 4970291, upload-time = "2026-05-18T19:19:56.215Z" }, + { url = "https://files.pythonhosted.org/packages/b0/02/55fc057d8283427dea7d6edb102e7a840239c77a64a983d92f62a304c0e9/lxml-6.1.1-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:4f0dd2f01f9f8a89f565d000e03abcf0a13d692a346c8d22f628d49af098777a", size = 5102822, upload-time = "2026-05-18T19:19:59.223Z" }, + { url = "https://files.pythonhosted.org/packages/e4/48/8e1cf78d89d66850121d9255a2a24414c98f775da93b90cf976956c24b14/lxml-6.1.1-cp314-cp314t-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:0b7e8a14c8634bf6f7a568634cb395305a6d964aeb5b7ee32248094bed3a7e2c", size = 5027923, upload-time = "2026-05-18T19:20:01.549Z" }, + { url = "https://files.pythonhosted.org/packages/ed/00/0632a0647612c8af24d26997b3b961397daa9d5b2581444805933629a4cb/lxml-6.1.1-cp314-cp314t-manylinux_2_26_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:86281fbdd6a8162756f8d603f37e3435bfa38043adb79c6dc6a2dfee065e7525", size = 5595843, upload-time = "2026-05-18T19:20:03.93Z" }, + { url = "https://files.pythonhosted.org/packages/bc/86/ab008a7dc360711b66858d61c80a5979a70a09f2aa2b05d9698df80b803d/lxml-6.1.1-cp314-cp314t-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:c5d7152ec39ca7c402d8fb9bad86140a15b9503bd0c54484e3f1bbe3dd37ceca", size = 5224515, upload-time = "2026-05-18T19:20:06.381Z" }, + { url = "https://files.pythonhosted.org/packages/75/c6/2702ff375e728e34f56d9a45339a9cf7e4427e917f542225242d63a05afa/lxml-6.1.1-cp314-cp314t-manylinux_2_28_i686.whl", hash = "sha256:88d8cb75b9d82858497a5393e3c63cfbf03035225e4b35a49ed7ccb151e4dc0e", size = 5312511, upload-time = "2026-05-18T19:20:09.308Z" }, + { url = "https://files.pythonhosted.org/packages/b7/57/a5807c98f87a86f10ef9ffab35516df7c0f0c4b6d5d33e9f608ab9c04a31/lxml-6.1.1-cp314-cp314t-manylinux_2_31_armv7l.whl", hash = "sha256:f64ec5397ea6a41fc1b4af0380d79b44a755b5531dcaccd9940fb260dca93038", size = 4639206, upload-time = "2026-05-18T19:20:11.704Z" }, + { url = "https://files.pythonhosted.org/packages/1f/e1/8a0a2c35734812395f4da4eaf33748a7e5705bfb2a58b128da764339d5ec/lxml-6.1.1-cp314-cp314t-manylinux_2_38_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:d34bbf07dbc7ca5970671b1512e928991fb5e9d95365636c9b2d8b4f53af405e", size = 5232404, upload-time = "2026-05-18T19:20:14.064Z" }, + { url = "https://files.pythonhosted.org/packages/c2/e2/0e6a4dd5ad84d01d99aa7bae7cfefd4a760a0e0f8176818241de17d9b6c0/lxml-6.1.1-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:17e0e18d4ad8adbd0399291bc44845b69d9dd68439a3cdebdf35ff902ec05072", size = 5083769, upload-time = "2026-05-18T19:19:23.758Z" }, + { url = "https://files.pythonhosted.org/packages/a0/7e/161f33d463f6ffc1c7679104b65086dea120080d49dde4d238f015aaee2f/lxml-6.1.1-cp314-cp314t-musllinux_1_2_armv7l.whl", hash = "sha256:3ab541146f1f6968c462d6c2ac495148e8cdba2f8347700b2141b6ec5a75bf52", size = 4758936, upload-time = "2026-05-18T19:19:27.256Z" }, + { url = "https://files.pythonhosted.org/packages/f1/fb/2369825e3f6ca99305bf9f7b7085fda91c8b0922a89e54d900974aa3ef85/lxml-6.1.1-cp314-cp314t-musllinux_1_2_ppc64le.whl", hash = "sha256:2a0217714657e023ef4293500f65aa20fce6164c8fd6b08fa5bd4a859fb14b9b", size = 5620296, upload-time = "2026-05-18T19:19:29.993Z" }, + { url = "https://files.pythonhosted.org/packages/30/90/d61e383146f74c5ab683947ea14dc7b82778838ab9b95ea73a23b60d0191/lxml-6.1.1-cp314-cp314t-musllinux_1_2_riscv64.whl", hash = "sha256:05a82eb6e1530a64f26225b55cbd178113bd0b5af1c2b625f25e5296742c26d2", size = 5228598, upload-time = "2026-05-18T19:19:33.523Z" }, + { url = "https://files.pythonhosted.org/packages/76/2d/2dafd8149e94b05bb070690efd5bb2680720681e03ff03fc57d2b70a1105/lxml-6.1.1-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:9e36f163528fc50cbef305f02a5fd66d404edf7049cdaff211dbc2cba5a7013e", size = 5247845, upload-time = "2026-05-18T19:19:36.649Z" }, + { url = "https://files.pythonhosted.org/packages/ce/68/b30e913340c380ddac9580c6e6230991fc37240ec4f64704833e4f3e2769/lxml-6.1.1-cp314-cp314t-win32.whl", hash = "sha256:649dda677cf3bd6ac9ae14007ba0c824ded8ce5808b53fc7431d9140399118c1", size = 3897345, upload-time = "2026-05-18T19:17:33.562Z" }, + { url = "https://files.pythonhosted.org/packages/3c/4e/9eb2af5335545f9fbcd7af57bcf87c6025d31eaa31b14ec184a6c8675328/lxml-6.1.1-cp314-cp314t-win_amd64.whl", hash = "sha256:793033d6c5cdf33a573f910d9bea14ef8f5771820411d118da8e1182edb53d5e", size = 4393350, upload-time = "2026-05-18T19:18:10.076Z" }, + { url = "https://files.pythonhosted.org/packages/7f/2c/0f1e93c636720e8a3eb59af2bfda99d98b55891e1c53bc30c2e0e865f01b/lxml-6.1.1-cp314-cp314t-win_arm64.whl", hash = "sha256:58bb955caba94e467d2a96da17660d2d704e0675894cba21ab8a775b8621fd1c", size = 3817223, upload-time = "2026-05-19T19:22:56.823Z" }, + { url = "https://files.pythonhosted.org/packages/b5/32/86a3f0f724a3a402d4627937a7fc27b160e45e7012b4adf47f6e1e844511/lxml-6.1.1-pp311-pypy311_pp73-macosx_10_15_x86_64.whl", hash = "sha256:31033dc34636ea6b7d5cc11b1ddbda78a14de858ba9d3e1ed4b69a3085bc521e", size = 3930127, upload-time = "2026-05-18T19:19:02.27Z" }, + { url = "https://files.pythonhosted.org/packages/40/44/d832e82af08723761556d004b1d04d281c09f9a8cecd7d3148548c9941a3/lxml-6.1.1-pp311-pypy311_pp73-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:3893c14c4b6ac5b2d54ba8cf03e99fe5104e592de491f19bd6b82756c09f8004", size = 4210769, upload-time = "2026-05-18T19:20:41.427Z" }, + { url = "https://files.pythonhosted.org/packages/6d/39/0dc5949f759ed7d951e0bb8c2f2d9d7aca1908d22352fa84a8afd2ea54af/lxml-6.1.1-pp311-pypy311_pp73-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:c07da4cebf6889f03ebac8d238f62318e29f495de0aa18a51ea14e61ae907e2e", size = 4318163, upload-time = "2026-05-18T19:20:44.702Z" }, + { url = "https://files.pythonhosted.org/packages/e6/fb/8ab3845fe046ba4cbf74536bcf6801a774b7caf4350de1c5d37f1f0a9e90/lxml-6.1.1-pp311-pypy311_pp73-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:f6f0ce10945fab9c4c06ce14e22af9059d1a87493a9af4501a5b0b9187e21cf2", size = 4250945, upload-time = "2026-05-18T19:20:47.385Z" }, + { url = "https://files.pythonhosted.org/packages/68/1b/7553ab136894374ffae8851ec06f98f511cd8e66246e41b6be059d0a7289/lxml-6.1.1-pp311-pypy311_pp73-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:f8844cd288697c6425c9beba919302241e3278871dc6519515e72b04e987abcf", size = 4401664, upload-time = "2026-05-18T19:20:50.489Z" }, + { url = "https://files.pythonhosted.org/packages/db/a4/441aee36c6f6b249823d20fd91f9be9ab89d7c5a8ae542a4a4ca6d342d56/lxml-6.1.1-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:ed21202aec73cda4d55d1ce57b389aadb90ffb044e6cd1080b8347efe1b1ec84", size = 3508989, upload-time = "2026-05-18T19:18:38.158Z" }, +] + +[[package]] +name = "markupsafe" +version = "3.0.3" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/7e/99/7690b6d4034fffd95959cbe0c02de8deb3098cc577c67bb6a24fe5d7caa7/markupsafe-3.0.3.tar.gz", hash = "sha256:722695808f4b6457b320fdc131280796bdceb04ab50fe1795cd540799ebe1698", size = 80313, upload-time = "2025-09-27T18:37:40.426Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/08/db/fefacb2136439fc8dd20e797950e749aa1f4997ed584c62cfb8ef7c2be0e/markupsafe-3.0.3-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:1cc7ea17a6824959616c525620e387f6dd30fec8cb44f649e31712db02123dad", size = 11631, upload-time = "2025-09-27T18:36:18.185Z" }, + { url = "https://files.pythonhosted.org/packages/e1/2e/5898933336b61975ce9dc04decbc0a7f2fee78c30353c5efba7f2d6ff27a/markupsafe-3.0.3-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:4bd4cd07944443f5a265608cc6aab442e4f74dff8088b0dfc8238647b8f6ae9a", size = 12058, upload-time = "2025-09-27T18:36:19.444Z" }, + { url = "https://files.pythonhosted.org/packages/1d/09/adf2df3699d87d1d8184038df46a9c80d78c0148492323f4693df54e17bb/markupsafe-3.0.3-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:6b5420a1d9450023228968e7e6a9ce57f65d148ab56d2313fcd589eee96a7a50", size = 24287, upload-time = "2025-09-27T18:36:20.768Z" }, + { url = "https://files.pythonhosted.org/packages/30/ac/0273f6fcb5f42e314c6d8cd99effae6a5354604d461b8d392b5ec9530a54/markupsafe-3.0.3-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:0bf2a864d67e76e5c9a34dc26ec616a66b9888e25e7b9460e1c76d3293bd9dbf", size = 22940, upload-time = "2025-09-27T18:36:22.249Z" }, + { url = "https://files.pythonhosted.org/packages/19/ae/31c1be199ef767124c042c6c3e904da327a2f7f0cd63a0337e1eca2967a8/markupsafe-3.0.3-cp311-cp311-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:bc51efed119bc9cfdf792cdeaa4d67e8f6fcccab66ed4bfdd6bde3e59bfcbb2f", size = 21887, upload-time = "2025-09-27T18:36:23.535Z" }, + { url = "https://files.pythonhosted.org/packages/b2/76/7edcab99d5349a4532a459e1fe64f0b0467a3365056ae550d3bcf3f79e1e/markupsafe-3.0.3-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:068f375c472b3e7acbe2d5318dea141359e6900156b5b2ba06a30b169086b91a", size = 23692, upload-time = "2025-09-27T18:36:24.823Z" }, + { url = "https://files.pythonhosted.org/packages/a4/28/6e74cdd26d7514849143d69f0bf2399f929c37dc2b31e6829fd2045b2765/markupsafe-3.0.3-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:7be7b61bb172e1ed687f1754f8e7484f1c8019780f6f6b0786e76bb01c2ae115", size = 21471, upload-time = "2025-09-27T18:36:25.95Z" }, + { url = "https://files.pythonhosted.org/packages/62/7e/a145f36a5c2945673e590850a6f8014318d5577ed7e5920a4b3448e0865d/markupsafe-3.0.3-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:f9e130248f4462aaa8e2552d547f36ddadbeaa573879158d721bbd33dfe4743a", size = 22923, upload-time = "2025-09-27T18:36:27.109Z" }, + { url = "https://files.pythonhosted.org/packages/0f/62/d9c46a7f5c9adbeeeda52f5b8d802e1094e9717705a645efc71b0913a0a8/markupsafe-3.0.3-cp311-cp311-win32.whl", hash = "sha256:0db14f5dafddbb6d9208827849fad01f1a2609380add406671a26386cdf15a19", size = 14572, upload-time = "2025-09-27T18:36:28.045Z" }, + { url = "https://files.pythonhosted.org/packages/83/8a/4414c03d3f891739326e1783338e48fb49781cc915b2e0ee052aa490d586/markupsafe-3.0.3-cp311-cp311-win_amd64.whl", hash = "sha256:de8a88e63464af587c950061a5e6a67d3632e36df62b986892331d4620a35c01", size = 15077, upload-time = "2025-09-27T18:36:29.025Z" }, + { url = "https://files.pythonhosted.org/packages/35/73/893072b42e6862f319b5207adc9ae06070f095b358655f077f69a35601f0/markupsafe-3.0.3-cp311-cp311-win_arm64.whl", hash = "sha256:3b562dd9e9ea93f13d53989d23a7e775fdfd1066c33494ff43f5418bc8c58a5c", size = 13876, upload-time = "2025-09-27T18:36:29.954Z" }, + { url = "https://files.pythonhosted.org/packages/5a/72/147da192e38635ada20e0a2e1a51cf8823d2119ce8883f7053879c2199b5/markupsafe-3.0.3-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:d53197da72cc091b024dd97249dfc7794d6a56530370992a5e1a08983ad9230e", size = 11615, upload-time = "2025-09-27T18:36:30.854Z" }, + { url = "https://files.pythonhosted.org/packages/9a/81/7e4e08678a1f98521201c3079f77db69fb552acd56067661f8c2f534a718/markupsafe-3.0.3-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:1872df69a4de6aead3491198eaf13810b565bdbeec3ae2dc8780f14458ec73ce", size = 12020, upload-time = "2025-09-27T18:36:31.971Z" }, + { url = "https://files.pythonhosted.org/packages/1e/2c/799f4742efc39633a1b54a92eec4082e4f815314869865d876824c257c1e/markupsafe-3.0.3-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:3a7e8ae81ae39e62a41ec302f972ba6ae23a5c5396c8e60113e9066ef893da0d", size = 24332, upload-time = "2025-09-27T18:36:32.813Z" }, + { url = "https://files.pythonhosted.org/packages/3c/2e/8d0c2ab90a8c1d9a24f0399058ab8519a3279d1bd4289511d74e909f060e/markupsafe-3.0.3-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:d6dd0be5b5b189d31db7cda48b91d7e0a9795f31430b7f271219ab30f1d3ac9d", size = 22947, upload-time = "2025-09-27T18:36:33.86Z" }, + { url = "https://files.pythonhosted.org/packages/2c/54/887f3092a85238093a0b2154bd629c89444f395618842e8b0c41783898ea/markupsafe-3.0.3-cp312-cp312-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:94c6f0bb423f739146aec64595853541634bde58b2135f27f61c1ffd1cd4d16a", size = 21962, upload-time = "2025-09-27T18:36:35.099Z" }, + { url = "https://files.pythonhosted.org/packages/c9/2f/336b8c7b6f4a4d95e91119dc8521402461b74a485558d8f238a68312f11c/markupsafe-3.0.3-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:be8813b57049a7dc738189df53d69395eba14fb99345e0a5994914a3864c8a4b", size = 23760, upload-time = "2025-09-27T18:36:36.001Z" }, + { url = "https://files.pythonhosted.org/packages/32/43/67935f2b7e4982ffb50a4d169b724d74b62a3964bc1a9a527f5ac4f1ee2b/markupsafe-3.0.3-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:83891d0e9fb81a825d9a6d61e3f07550ca70a076484292a70fde82c4b807286f", size = 21529, upload-time = "2025-09-27T18:36:36.906Z" }, + { url = "https://files.pythonhosted.org/packages/89/e0/4486f11e51bbba8b0c041098859e869e304d1c261e59244baa3d295d47b7/markupsafe-3.0.3-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:77f0643abe7495da77fb436f50f8dab76dbc6e5fd25d39589a0f1fe6548bfa2b", size = 23015, upload-time = "2025-09-27T18:36:37.868Z" }, + { url = "https://files.pythonhosted.org/packages/2f/e1/78ee7a023dac597a5825441ebd17170785a9dab23de95d2c7508ade94e0e/markupsafe-3.0.3-cp312-cp312-win32.whl", hash = "sha256:d88b440e37a16e651bda4c7c2b930eb586fd15ca7406cb39e211fcff3bf3017d", size = 14540, upload-time = "2025-09-27T18:36:38.761Z" }, + { url = "https://files.pythonhosted.org/packages/aa/5b/bec5aa9bbbb2c946ca2733ef9c4ca91c91b6a24580193e891b5f7dbe8e1e/markupsafe-3.0.3-cp312-cp312-win_amd64.whl", hash = "sha256:26a5784ded40c9e318cfc2bdb30fe164bdb8665ded9cd64d500a34fb42067b1c", size = 15105, upload-time = "2025-09-27T18:36:39.701Z" }, + { url = "https://files.pythonhosted.org/packages/e5/f1/216fc1bbfd74011693a4fd837e7026152e89c4bcf3e77b6692fba9923123/markupsafe-3.0.3-cp312-cp312-win_arm64.whl", hash = "sha256:35add3b638a5d900e807944a078b51922212fb3dedb01633a8defc4b01a3c85f", size = 13906, upload-time = "2025-09-27T18:36:40.689Z" }, + { url = "https://files.pythonhosted.org/packages/38/2f/907b9c7bbba283e68f20259574b13d005c121a0fa4c175f9bed27c4597ff/markupsafe-3.0.3-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:e1cf1972137e83c5d4c136c43ced9ac51d0e124706ee1c8aa8532c1287fa8795", size = 11622, upload-time = "2025-09-27T18:36:41.777Z" }, + { url = "https://files.pythonhosted.org/packages/9c/d9/5f7756922cdd676869eca1c4e3c0cd0df60ed30199ffd775e319089cb3ed/markupsafe-3.0.3-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:116bb52f642a37c115f517494ea5feb03889e04df47eeff5b130b1808ce7c219", size = 12029, upload-time = "2025-09-27T18:36:43.257Z" }, + { url = "https://files.pythonhosted.org/packages/00/07/575a68c754943058c78f30db02ee03a64b3c638586fba6a6dd56830b30a3/markupsafe-3.0.3-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:133a43e73a802c5562be9bbcd03d090aa5a1fe899db609c29e8c8d815c5f6de6", size = 24374, upload-time = "2025-09-27T18:36:44.508Z" }, + { url = "https://files.pythonhosted.org/packages/a9/21/9b05698b46f218fc0e118e1f8168395c65c8a2c750ae2bab54fc4bd4e0e8/markupsafe-3.0.3-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:ccfcd093f13f0f0b7fdd0f198b90053bf7b2f02a3927a30e63f3ccc9df56b676", size = 22980, upload-time = "2025-09-27T18:36:45.385Z" }, + { url = "https://files.pythonhosted.org/packages/7f/71/544260864f893f18b6827315b988c146b559391e6e7e8f7252839b1b846a/markupsafe-3.0.3-cp313-cp313-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:509fa21c6deb7a7a273d629cf5ec029bc209d1a51178615ddf718f5918992ab9", size = 21990, upload-time = "2025-09-27T18:36:46.916Z" }, + { url = "https://files.pythonhosted.org/packages/c2/28/b50fc2f74d1ad761af2f5dcce7492648b983d00a65b8c0e0cb457c82ebbe/markupsafe-3.0.3-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:a4afe79fb3de0b7097d81da19090f4df4f8d3a2b3adaa8764138aac2e44f3af1", size = 23784, upload-time = "2025-09-27T18:36:47.884Z" }, + { url = "https://files.pythonhosted.org/packages/ed/76/104b2aa106a208da8b17a2fb72e033a5a9d7073c68f7e508b94916ed47a9/markupsafe-3.0.3-cp313-cp313-musllinux_1_2_riscv64.whl", hash = "sha256:795e7751525cae078558e679d646ae45574b47ed6e7771863fcc079a6171a0fc", size = 21588, upload-time = "2025-09-27T18:36:48.82Z" }, + { url = "https://files.pythonhosted.org/packages/b5/99/16a5eb2d140087ebd97180d95249b00a03aa87e29cc224056274f2e45fd6/markupsafe-3.0.3-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:8485f406a96febb5140bfeca44a73e3ce5116b2501ac54fe953e488fb1d03b12", size = 23041, upload-time = "2025-09-27T18:36:49.797Z" }, + { url = "https://files.pythonhosted.org/packages/19/bc/e7140ed90c5d61d77cea142eed9f9c303f4c4806f60a1044c13e3f1471d0/markupsafe-3.0.3-cp313-cp313-win32.whl", hash = "sha256:bdd37121970bfd8be76c5fb069c7751683bdf373db1ed6c010162b2a130248ed", size = 14543, upload-time = "2025-09-27T18:36:51.584Z" }, + { url = "https://files.pythonhosted.org/packages/05/73/c4abe620b841b6b791f2edc248f556900667a5a1cf023a6646967ae98335/markupsafe-3.0.3-cp313-cp313-win_amd64.whl", hash = "sha256:9a1abfdc021a164803f4d485104931fb8f8c1efd55bc6b748d2f5774e78b62c5", size = 15113, upload-time = "2025-09-27T18:36:52.537Z" }, + { url = "https://files.pythonhosted.org/packages/f0/3a/fa34a0f7cfef23cf9500d68cb7c32dd64ffd58a12b09225fb03dd37d5b80/markupsafe-3.0.3-cp313-cp313-win_arm64.whl", hash = "sha256:7e68f88e5b8799aa49c85cd116c932a1ac15caaa3f5db09087854d218359e485", size = 13911, upload-time = "2025-09-27T18:36:53.513Z" }, + { url = "https://files.pythonhosted.org/packages/e4/d7/e05cd7efe43a88a17a37b3ae96e79a19e846f3f456fe79c57ca61356ef01/markupsafe-3.0.3-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:218551f6df4868a8d527e3062d0fb968682fe92054e89978594c28e642c43a73", size = 11658, upload-time = "2025-09-27T18:36:54.819Z" }, + { url = "https://files.pythonhosted.org/packages/99/9e/e412117548182ce2148bdeacdda3bb494260c0b0184360fe0d56389b523b/markupsafe-3.0.3-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:3524b778fe5cfb3452a09d31e7b5adefeea8c5be1d43c4f810ba09f2ceb29d37", size = 12066, upload-time = "2025-09-27T18:36:55.714Z" }, + { url = "https://files.pythonhosted.org/packages/bc/e6/fa0ffcda717ef64a5108eaa7b4f5ed28d56122c9a6d70ab8b72f9f715c80/markupsafe-3.0.3-cp313-cp313t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:4e885a3d1efa2eadc93c894a21770e4bc67899e3543680313b09f139e149ab19", size = 25639, upload-time = "2025-09-27T18:36:56.908Z" }, + { url = "https://files.pythonhosted.org/packages/96/ec/2102e881fe9d25fc16cb4b25d5f5cde50970967ffa5dddafdb771237062d/markupsafe-3.0.3-cp313-cp313t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:8709b08f4a89aa7586de0aadc8da56180242ee0ada3999749b183aa23df95025", size = 23569, upload-time = "2025-09-27T18:36:57.913Z" }, + { url = "https://files.pythonhosted.org/packages/4b/30/6f2fce1f1f205fc9323255b216ca8a235b15860c34b6798f810f05828e32/markupsafe-3.0.3-cp313-cp313t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:b8512a91625c9b3da6f127803b166b629725e68af71f8184ae7e7d54686a56d6", size = 23284, upload-time = "2025-09-27T18:36:58.833Z" }, + { url = "https://files.pythonhosted.org/packages/58/47/4a0ccea4ab9f5dcb6f79c0236d954acb382202721e704223a8aafa38b5c8/markupsafe-3.0.3-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:9b79b7a16f7fedff2495d684f2b59b0457c3b493778c9eed31111be64d58279f", size = 24801, upload-time = "2025-09-27T18:36:59.739Z" }, + { url = "https://files.pythonhosted.org/packages/6a/70/3780e9b72180b6fecb83a4814d84c3bf4b4ae4bf0b19c27196104149734c/markupsafe-3.0.3-cp313-cp313t-musllinux_1_2_riscv64.whl", hash = "sha256:12c63dfb4a98206f045aa9563db46507995f7ef6d83b2f68eda65c307c6829eb", size = 22769, upload-time = "2025-09-27T18:37:00.719Z" }, + { url = "https://files.pythonhosted.org/packages/98/c5/c03c7f4125180fc215220c035beac6b9cb684bc7a067c84fc69414d315f5/markupsafe-3.0.3-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:8f71bc33915be5186016f675cd83a1e08523649b0e33efdb898db577ef5bb009", size = 23642, upload-time = "2025-09-27T18:37:01.673Z" }, + { url = "https://files.pythonhosted.org/packages/80/d6/2d1b89f6ca4bff1036499b1e29a1d02d282259f3681540e16563f27ebc23/markupsafe-3.0.3-cp313-cp313t-win32.whl", hash = "sha256:69c0b73548bc525c8cb9a251cddf1931d1db4d2258e9599c28c07ef3580ef354", size = 14612, upload-time = "2025-09-27T18:37:02.639Z" }, + { url = "https://files.pythonhosted.org/packages/2b/98/e48a4bfba0a0ffcf9925fe2d69240bfaa19c6f7507b8cd09c70684a53c1e/markupsafe-3.0.3-cp313-cp313t-win_amd64.whl", hash = "sha256:1b4b79e8ebf6b55351f0d91fe80f893b4743f104bff22e90697db1590e47a218", size = 15200, upload-time = "2025-09-27T18:37:03.582Z" }, + { url = "https://files.pythonhosted.org/packages/0e/72/e3cc540f351f316e9ed0f092757459afbc595824ca724cbc5a5d4263713f/markupsafe-3.0.3-cp313-cp313t-win_arm64.whl", hash = "sha256:ad2cf8aa28b8c020ab2fc8287b0f823d0a7d8630784c31e9ee5edea20f406287", size = 13973, upload-time = "2025-09-27T18:37:04.929Z" }, + { url = "https://files.pythonhosted.org/packages/33/8a/8e42d4838cd89b7dde187011e97fe6c3af66d8c044997d2183fbd6d31352/markupsafe-3.0.3-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:eaa9599de571d72e2daf60164784109f19978b327a3910d3e9de8c97b5b70cfe", size = 11619, upload-time = "2025-09-27T18:37:06.342Z" }, + { url = "https://files.pythonhosted.org/packages/b5/64/7660f8a4a8e53c924d0fa05dc3a55c9cee10bbd82b11c5afb27d44b096ce/markupsafe-3.0.3-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:c47a551199eb8eb2121d4f0f15ae0f923d31350ab9280078d1e5f12b249e0026", size = 12029, upload-time = "2025-09-27T18:37:07.213Z" }, + { url = "https://files.pythonhosted.org/packages/da/ef/e648bfd021127bef5fa12e1720ffed0c6cbb8310c8d9bea7266337ff06de/markupsafe-3.0.3-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:f34c41761022dd093b4b6896d4810782ffbabe30f2d443ff5f083e0cbbb8c737", size = 24408, upload-time = "2025-09-27T18:37:09.572Z" }, + { url = "https://files.pythonhosted.org/packages/41/3c/a36c2450754618e62008bf7435ccb0f88053e07592e6028a34776213d877/markupsafe-3.0.3-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:457a69a9577064c05a97c41f4e65148652db078a3a509039e64d3467b9e7ef97", size = 23005, upload-time = "2025-09-27T18:37:10.58Z" }, + { url = "https://files.pythonhosted.org/packages/bc/20/b7fdf89a8456b099837cd1dc21974632a02a999ec9bf7ca3e490aacd98e7/markupsafe-3.0.3-cp314-cp314-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:e8afc3f2ccfa24215f8cb28dcf43f0113ac3c37c2f0f0806d8c70e4228c5cf4d", size = 22048, upload-time = "2025-09-27T18:37:11.547Z" }, + { url = "https://files.pythonhosted.org/packages/9a/a7/591f592afdc734f47db08a75793a55d7fbcc6902a723ae4cfbab61010cc5/markupsafe-3.0.3-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:ec15a59cf5af7be74194f7ab02d0f59a62bdcf1a537677ce67a2537c9b87fcda", size = 23821, upload-time = "2025-09-27T18:37:12.48Z" }, + { url = "https://files.pythonhosted.org/packages/7d/33/45b24e4f44195b26521bc6f1a82197118f74df348556594bd2262bda1038/markupsafe-3.0.3-cp314-cp314-musllinux_1_2_riscv64.whl", hash = "sha256:0eb9ff8191e8498cca014656ae6b8d61f39da5f95b488805da4bb029cccbfbaf", size = 21606, upload-time = "2025-09-27T18:37:13.485Z" }, + { url = "https://files.pythonhosted.org/packages/ff/0e/53dfaca23a69fbfbbf17a4b64072090e70717344c52eaaaa9c5ddff1e5f0/markupsafe-3.0.3-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:2713baf880df847f2bece4230d4d094280f4e67b1e813eec43b4c0e144a34ffe", size = 23043, upload-time = "2025-09-27T18:37:14.408Z" }, + { url = "https://files.pythonhosted.org/packages/46/11/f333a06fc16236d5238bfe74daccbca41459dcd8d1fa952e8fbd5dccfb70/markupsafe-3.0.3-cp314-cp314-win32.whl", hash = "sha256:729586769a26dbceff69f7a7dbbf59ab6572b99d94576a5592625d5b411576b9", size = 14747, upload-time = "2025-09-27T18:37:15.36Z" }, + { url = "https://files.pythonhosted.org/packages/28/52/182836104b33b444e400b14f797212f720cbc9ed6ba34c800639d154e821/markupsafe-3.0.3-cp314-cp314-win_amd64.whl", hash = "sha256:bdc919ead48f234740ad807933cdf545180bfbe9342c2bb451556db2ed958581", size = 15341, upload-time = "2025-09-27T18:37:16.496Z" }, + { url = "https://files.pythonhosted.org/packages/6f/18/acf23e91bd94fd7b3031558b1f013adfa21a8e407a3fdb32745538730382/markupsafe-3.0.3-cp314-cp314-win_arm64.whl", hash = "sha256:5a7d5dc5140555cf21a6fefbdbf8723f06fcd2f63ef108f2854de715e4422cb4", size = 14073, upload-time = "2025-09-27T18:37:17.476Z" }, + { url = "https://files.pythonhosted.org/packages/3c/f0/57689aa4076e1b43b15fdfa646b04653969d50cf30c32a102762be2485da/markupsafe-3.0.3-cp314-cp314t-macosx_10_13_x86_64.whl", hash = "sha256:1353ef0c1b138e1907ae78e2f6c63ff67501122006b0f9abad68fda5f4ffc6ab", size = 11661, upload-time = "2025-09-27T18:37:18.453Z" }, + { url = "https://files.pythonhosted.org/packages/89/c3/2e67a7ca217c6912985ec766c6393b636fb0c2344443ff9d91404dc4c79f/markupsafe-3.0.3-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:1085e7fbddd3be5f89cc898938f42c0b3c711fdcb37d75221de2666af647c175", size = 12069, upload-time = "2025-09-27T18:37:19.332Z" }, + { url = "https://files.pythonhosted.org/packages/f0/00/be561dce4e6ca66b15276e184ce4b8aec61fe83662cce2f7d72bd3249d28/markupsafe-3.0.3-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:1b52b4fb9df4eb9ae465f8d0c228a00624de2334f216f178a995ccdcf82c4634", size = 25670, upload-time = "2025-09-27T18:37:20.245Z" }, + { url = "https://files.pythonhosted.org/packages/50/09/c419f6f5a92e5fadde27efd190eca90f05e1261b10dbd8cbcb39cd8ea1dc/markupsafe-3.0.3-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:fed51ac40f757d41b7c48425901843666a6677e3e8eb0abcff09e4ba6e664f50", size = 23598, upload-time = "2025-09-27T18:37:21.177Z" }, + { url = "https://files.pythonhosted.org/packages/22/44/a0681611106e0b2921b3033fc19bc53323e0b50bc70cffdd19f7d679bb66/markupsafe-3.0.3-cp314-cp314t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:f190daf01f13c72eac4efd5c430a8de82489d9cff23c364c3ea822545032993e", size = 23261, upload-time = "2025-09-27T18:37:22.167Z" }, + { url = "https://files.pythonhosted.org/packages/5f/57/1b0b3f100259dc9fffe780cfb60d4be71375510e435efec3d116b6436d43/markupsafe-3.0.3-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:e56b7d45a839a697b5eb268c82a71bd8c7f6c94d6fd50c3d577fa39a9f1409f5", size = 24835, upload-time = "2025-09-27T18:37:23.296Z" }, + { url = "https://files.pythonhosted.org/packages/26/6a/4bf6d0c97c4920f1597cc14dd720705eca0bf7c787aebc6bb4d1bead5388/markupsafe-3.0.3-cp314-cp314t-musllinux_1_2_riscv64.whl", hash = "sha256:f3e98bb3798ead92273dc0e5fd0f31ade220f59a266ffd8a4f6065e0a3ce0523", size = 22733, upload-time = "2025-09-27T18:37:24.237Z" }, + { url = "https://files.pythonhosted.org/packages/14/c7/ca723101509b518797fedc2fdf79ba57f886b4aca8a7d31857ba3ee8281f/markupsafe-3.0.3-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:5678211cb9333a6468fb8d8be0305520aa073f50d17f089b5b4b477ea6e67fdc", size = 23672, upload-time = "2025-09-27T18:37:25.271Z" }, + { url = "https://files.pythonhosted.org/packages/fb/df/5bd7a48c256faecd1d36edc13133e51397e41b73bb77e1a69deab746ebac/markupsafe-3.0.3-cp314-cp314t-win32.whl", hash = "sha256:915c04ba3851909ce68ccc2b8e2cd691618c4dc4c4232fb7982bca3f41fd8c3d", size = 14819, upload-time = "2025-09-27T18:37:26.285Z" }, + { url = "https://files.pythonhosted.org/packages/1a/8a/0402ba61a2f16038b48b39bccca271134be00c5c9f0f623208399333c448/markupsafe-3.0.3-cp314-cp314t-win_amd64.whl", hash = "sha256:4faffd047e07c38848ce017e8725090413cd80cbc23d86e55c587bf979e579c9", size = 15426, upload-time = "2025-09-27T18:37:27.316Z" }, + { url = "https://files.pythonhosted.org/packages/70/bc/6f1c2f612465f5fa89b95bead1f44dcb607670fd42891d8fdcd5d039f4f4/markupsafe-3.0.3-cp314-cp314t-win_arm64.whl", hash = "sha256:32001d6a8fc98c8cb5c947787c5d08b0a50663d139f1305bac5885d98d9b40fa", size = 14146, upload-time = "2025-09-27T18:37:28.327Z" }, +] + +[[package]] +name = "marshmallow" +version = "3.26.2" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "packaging" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/55/79/de6c16cc902f4fc372236926b0ce2ab7845268dcc30fb2fbb7f71b418631/marshmallow-3.26.2.tar.gz", hash = "sha256:bbe2adb5a03e6e3571b573f42527c6fe926e17467833660bebd11593ab8dfd57", size = 222095, upload-time = "2025-12-22T06:53:53.309Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/be/2f/5108cb3ee4ba6501748c4908b908e55f42a5b66245b4cfe0c99326e1ef6e/marshmallow-3.26.2-py3-none-any.whl", hash = "sha256:013fa8a3c4c276c24d26d84ce934dc964e2aa794345a0f8c7e5a7191482c8a73", size = 50964, upload-time = "2025-12-22T06:53:51.801Z" }, +] + +[[package]] +name = "marshmallow-mongoengine" +version = "0.31.2" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "marshmallow" }, + { name = "mongoengine" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/63/72/5cabacd62c5b4f81a1e955e0c54bb86d1289621e384f522552806f9ee101/marshmallow-mongoengine-0.31.2.tar.gz", hash = "sha256:a708732456e1a36139c6ce52910b57cf2a54e7206c5c635a48dba9e3e157d6db", size = 11377, upload-time = "2023-03-14T05:42:51.825Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/c4/ef/ec8be29d7f6dec0bae9391e8fae352a3d5b2ddb9be84a7d611a5b0e5c1de/marshmallow_mongoengine-0.31.2-py2.py3-none-any.whl", hash = "sha256:51de7614ce9002f9f679aebb6df7488297e791fbd07d9f14b963e9c7bce604ca", size = 12237, upload-time = "2023-03-14T05:42:50.515Z" }, +] + +[[package]] +name = "matplotlib" +version = "3.11.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "contourpy" }, + { name = "cycler" }, + { name = "fonttools" }, + { name = "kiwisolver" }, + { name = "numpy", version = "2.4.6", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version < '3.12'" }, + { name = "numpy", version = "2.5.0", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version >= '3.12'" }, + { name = "packaging" }, + { name = "pillow" }, + { name = "pyparsing" }, + { name = "python-dateutil" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/1f/24/080c99d223d158d3a8902769269ab6da5b50f7a0e6e072513907e02b7a6c/matplotlib-3.11.0.tar.gz", hash = "sha256:68c0c7be01b30dcca3638934f7f591df73401235cbdbf0d1ab1c71e7db7f8b57", size = 33251176, upload-time = "2026-06-12T02:29:15.508Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/ce/a2/78f662f1b18968531f67d3fcde1b7ea8496920bacd4f16ddb5b79d112e46/matplotlib-3.11.0-cp311-cp311-macosx_10_12_x86_64.whl", hash = "sha256:f857524b442f0f36e641868ce2171aafa88cb0bc0644f4e1d8a5df9b32649fef", size = 9436261, upload-time = "2026-06-12T02:27:34.161Z" }, + { url = "https://files.pythonhosted.org/packages/5e/92/044f1de43901310202f4c79acf4f141be53b2ca8d8380e2fcefb3d523a75/matplotlib-3.11.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:57baa92fdc82948ed716eae6d2579d4d6f40965cd8d2f416755b4a72580a3233", size = 9264669, upload-time = "2026-06-12T02:27:37.413Z" }, + { url = "https://files.pythonhosted.org/packages/53/f4/f0b4f9ba7ec14a7af8151f3ad71ecfe3561e6ba38cfab1db3681ba4ca112/matplotlib-3.11.0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:630eee0e67d35cce2019a0e670719f4816e3b86aff0fa72729f6c69786fceb45", size = 10021076, upload-time = "2026-06-12T02:27:39.926Z" }, + { url = "https://files.pythonhosted.org/packages/d7/33/4d679c6dcd594a156542080ac907ddccf7b09ca11655c4b28eca8e9ee5da/matplotlib-3.11.0-cp311-cp311-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:5106c444d0bf966eee2853548c03772af4ab7199118e086c62fbac8ccb07c055", size = 10828999, upload-time = "2026-06-12T02:27:42.433Z" }, + { url = "https://files.pythonhosted.org/packages/07/74/0a3683802037d8cd013144d77c247219b47f2aabace6fdde74faa12bacf7/matplotlib-3.11.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:4d7aea652b58e686444079be3376ef546bffa1eee9b9bb9c472b9fcf6cf410d3", size = 10913103, upload-time = "2026-06-12T02:27:44.827Z" }, + { url = "https://files.pythonhosted.org/packages/d0/9f/970fcbf381e82ec66fdf5da8ea76e2e9240f61a24011ce9fd1d42c37ac2d/matplotlib-3.11.0-cp311-cp311-win_amd64.whl", hash = "sha256:70a5b3e9a5dab708c0f039709ae7c68d5b4d254e291ef76492cdba230c8bb5e4", size = 9310945, upload-time = "2026-06-12T02:27:46.867Z" }, + { url = "https://files.pythonhosted.org/packages/14/4e/6e7cfed23611265ded53806852343b5c59339e506e84c474a9b5afc3b249/matplotlib-3.11.0-cp311-cp311-win_arm64.whl", hash = "sha256:3d68266213e73823ac3be90615bab0cf31f88851e114cdb1dd25dacf3b01e1a7", size = 8999304, upload-time = "2026-06-12T02:27:48.798Z" }, + { url = "https://files.pythonhosted.org/packages/da/17/f5276b496c61477a6c4fc5e7401f4bfe1c2e5ef7c6cd67896f2ade3809cb/matplotlib-3.11.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:06b5872e9cf11adc8f589ded3ce11bc3e1061ad498259664fabc1f6615beb918", size = 9449976, upload-time = "2026-06-12T02:27:50.989Z" }, + { url = "https://files.pythonhosted.org/packages/82/34/bdd77418adb2178a1d59f044bd67bfebb115896e91b840b8a197eb3f4f4e/matplotlib-3.11.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:0515d495124be3124340e59f164d901ed4484e2246a5b74cfa483cac3b80bd97", size = 9279307, upload-time = "2026-06-12T02:27:53.247Z" }, + { url = "https://files.pythonhosted.org/packages/94/95/7f522393c88313336b20d70fc849555757b2e5febc22b83b3a3f0fd4bce9/matplotlib-3.11.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:be5f93a1d21981bfb802ded0d77a0caa92d4342a47d45754fac77e314a506344", size = 10031353, upload-time = "2026-06-12T02:27:55.215Z" }, + { url = "https://files.pythonhosted.org/packages/87/ce/8f25a0e3186aefd61913e7467d1b999465bcd0d0c03ac695c1b26ca559b7/matplotlib-3.11.0-cp312-cp312-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:41635d7909d19e52e924a521dde6d8f670b0f53ab1d0e8c331fa831554f681d1", size = 10839232, upload-time = "2026-06-12T02:27:57.746Z" }, + { url = "https://files.pythonhosted.org/packages/85/c2/db15da2bbdf9e3ca66df7db8e2c33a1dfed67be24a24d2c878efaaff01d6/matplotlib-3.11.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:94f5000f67ca9faa300863ea17f8bce9175cb67b88bec4bc7780502d53dd7c9e", size = 10923899, upload-time = "2026-06-12T02:28:00.223Z" }, + { url = "https://files.pythonhosted.org/packages/e5/2f/a58a4443a4d052a4ea77557478336aefc26c7981f6408d37adba763aa758/matplotlib-3.11.0-cp312-cp312-win_amd64.whl", hash = "sha256:ac6f1ef39f3d0f9e2463303013094992cdbe0f85f43bc54155bc472b2042768e", size = 9329528, upload-time = "2026-06-12T02:28:02.27Z" }, + { url = "https://files.pythonhosted.org/packages/61/0f/4b669589d47733b97ab9df4b58d6fc1e68acb5ea42a928dc7cbdd6bf5871/matplotlib-3.11.0-cp312-cp312-win_arm64.whl", hash = "sha256:9dd11fb612ce7bc60b1de5b4fc87ff959d22317b5de42aabf392f66f97af22eb", size = 9003413, upload-time = "2026-06-12T02:28:04.49Z" }, + { url = "https://files.pythonhosted.org/packages/55/41/aa47f156b061d14c98b906f76c428507397708ec63ff94f410ae1752b426/matplotlib-3.11.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:6ce3b839b34ae1f430b4616893a2945a2999debaa7e94e7e29a2a8bbf286f7b5", size = 9450532, upload-time = "2026-06-12T02:28:06.769Z" }, + { url = "https://files.pythonhosted.org/packages/8c/4f/5a9eb0375e81413953febf8af7b012a6b6357f53438a15c4f5ad86c6bbb5/matplotlib-3.11.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:373db8f91214e8ccaf35ac833cc1dd59dd961e148bbd55dd027141591dde1313", size = 9279760, upload-time = "2026-06-12T02:28:09.152Z" }, + { url = "https://files.pythonhosted.org/packages/a4/c0/1117d53077e3ac3152503a84e9cf7a5c239576805ee71276e80c2aaa7471/matplotlib-3.11.0-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:be152b7570324dc8d01574cc9474dd2d803237acf528bcbb5b211fa347461a09", size = 10031623, upload-time = "2026-06-12T02:28:11.26Z" }, + { url = "https://files.pythonhosted.org/packages/92/7e/e937138daffad65b71bf831a377809dcbc830fb4f31a31e067dc1faa2575/matplotlib-3.11.0-cp313-cp313-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:126f256df600652d7e4b394cf3164ff75210a00038f287c95a012a6f58d0e83f", size = 10839372, upload-time = "2026-06-12T02:28:14.102Z" }, + { url = "https://files.pythonhosted.org/packages/1d/c2/438ecc197ffb8023b6b9922915542f2172f5fd45b76703b0b4fc47322243/matplotlib-3.11.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:03acfeddf87b0dddb11b081ef7740ad445a3ca8bcb6b8e3011b08f2cf802b75c", size = 10924099, upload-time = "2026-06-12T02:28:16.383Z" }, + { url = "https://files.pythonhosted.org/packages/40/2e/395883da416f378b3ed2c9f3e843ac477eae1ce731b671b79adaa6f0bacd/matplotlib-3.11.0-cp313-cp313-win_amd64.whl", hash = "sha256:ab3722f04f3ff34c23b5012c5873d2894174e06c3822fcdac3610965a5ac7d06", size = 9329727, upload-time = "2026-06-12T02:28:18.581Z" }, + { url = "https://files.pythonhosted.org/packages/61/82/2c388956abf8bf392dfb5b8917c502f1082df6a941b781ab8c8e5ba2474b/matplotlib-3.11.0-cp313-cp313-win_arm64.whl", hash = "sha256:c945824670fb8915b4ac879e5e61f3c58e0913022f70a0de4c082b17372f8771", size = 9003506, upload-time = "2026-06-12T02:28:20.474Z" }, + { url = "https://files.pythonhosted.org/packages/c8/c1/34454baa44da7975ada82e9aea37105ec47059514dc967d3be14426ba8dc/matplotlib-3.11.0-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:3489c3dc487669b4a980bc3068f87856de7a1564248d3f6c629efb2a58b03f24", size = 9499838, upload-time = "2026-06-12T02:28:22.713Z" }, + { url = "https://files.pythonhosted.org/packages/b1/c3/98fe79a398cf232219f090163a7fa7e6766e9f2e0ad26df54d6f8934d8ee/matplotlib-3.11.0-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:6a98f5476ce784a50ce09998f4ae1e6a9f25043cef8a480c98949902eda74620", size = 9332298, upload-time = "2026-06-12T02:28:24.796Z" }, + { url = "https://files.pythonhosted.org/packages/95/e4/b4b7c33151e74e5c802f3cde1ba807ebfc38401e329b44e215a5888dd76d/matplotlib-3.11.0-cp313-cp313t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:565af866fd63e4bd3f987d580afe27c44c2552a3b3305f4ecbb85133601ea6f3", size = 10045491, upload-time = "2026-06-12T02:28:27.141Z" }, + { url = "https://files.pythonhosted.org/packages/71/28/394548efd68354110c1a1be11fe6b6e559e06d1a23da35908a0e316c55a9/matplotlib-3.11.0-cp313-cp313t-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:e6b3e64dea5062c570f04358e2711859f3531b459f29516274fbad889079e4f3", size = 10857059, upload-time = "2026-06-12T02:28:29.222Z" }, + { url = "https://files.pythonhosted.org/packages/c8/44/e7922e6e2a4d63bdfbc9dc4a53e3850ab438d46cf42e6779bb15ec92c948/matplotlib-3.11.0-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:942b37c5db1899610bd1543ce8e13e4ecff9a4633e7f63bb6aa9205d2644ebd1", size = 10939576, upload-time = "2026-06-12T02:28:31.66Z" }, + { url = "https://files.pythonhosted.org/packages/3d/be/b1ca96003a441d619b727fee21d671fdff7a5ce2f1bb797b2521aa2f679a/matplotlib-3.11.0-cp313-cp313t-win_amd64.whl", hash = "sha256:c08e649a6313e1291e713623b97a38e5bb4aa580b2a100a94a3309bc6b9c8eb3", size = 9379519, upload-time = "2026-06-12T02:28:33.888Z" }, + { url = "https://files.pythonhosted.org/packages/e3/72/4bf3b91821c34596dd6a7bdac5836d94f744144c8208939ef49d8ec43f7e/matplotlib-3.11.0-cp313-cp313t-win_arm64.whl", hash = "sha256:2746cd2c113742ff6ce37a864c5ac5fd7aa644568f445e66166e457ac78e40e0", size = 9055456, upload-time = "2026-06-12T02:28:35.878Z" }, + { url = "https://files.pythonhosted.org/packages/57/52/a94102ac99eb78e2fe9b826674f9ef9ee23327110ea6ab4776c1b4eb6209/matplotlib-3.11.0-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:3338e3e3de128cf50d0d2fb92a122815daf9c755bd882a474343c05f8fd7ec79", size = 9452137, upload-time = "2026-06-12T02:28:37.93Z" }, + { url = "https://files.pythonhosted.org/packages/7c/03/b8cdb625a21f710dfa11bbca1f48fb4057d2c0286975f8b415bf80942c99/matplotlib-3.11.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:25c2e5455efd8d99f41fb79871a31feb7d301569642e332ec58d72cfe9282bc3", size = 9281514, upload-time = "2026-06-12T02:28:40.028Z" }, + { url = "https://files.pythonhosted.org/packages/b7/2d/4e1240ea82ee197dfb3851e71f71c87eeeb975f1753b56a0588e4e80739a/matplotlib-3.11.0-cp314-cp314-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:d9695457a467ff86d23f35037a43deb6f1134dd6d3e2ac8ce1e2087cff09ffb9", size = 10843005, upload-time = "2026-06-12T02:28:42.39Z" }, + { url = "https://files.pythonhosted.org/packages/29/dc/6377ecfaa5fef79430f74a1a16638b4e2aa30d4692bae2c19f9d76fe3b01/matplotlib-3.11.0-cp314-cp314-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:19c16c61dea63b3582918503e6b294193961261d9daa806d4ae2151f1ad05430", size = 11127459, upload-time = "2026-06-12T02:28:44.483Z" }, + { url = "https://files.pythonhosted.org/packages/6f/41/795c405aa7560443a3b01309424cde4a1113b85c90b8a63417444a749617/matplotlib-3.11.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:2d72ea8b7924f3cb955e61518d21e43b3df1e6c8a793b480a0c1214f185d30ba", size = 10925160, upload-time = "2026-06-12T02:28:46.564Z" }, + { url = "https://files.pythonhosted.org/packages/1a/f7/3a9e6389a7cfaeff76c56e40c2dabcb13110e21e82f837228c834ebe748c/matplotlib-3.11.0-cp314-cp314-win_amd64.whl", hash = "sha256:1c02da0a629dfa9debf52725ea06866b74c1fb70a895bae05e4493d34074f9f2", size = 9485186, upload-time = "2026-06-12T02:28:49.344Z" }, + { url = "https://files.pythonhosted.org/packages/8b/c0/396478ee7cf2091d182db8b4a8695f6a37f1ddb978989cf9dbb84cd5c123/matplotlib-3.11.0-cp314-cp314-win_arm64.whl", hash = "sha256:aa55d73b3117d4b07f959cd9eb6f69b375d8df3414139c479388e551aa5d999d", size = 9160349, upload-time = "2026-06-12T02:28:51.382Z" }, + { url = "https://files.pythonhosted.org/packages/c5/6f/1c3bd51bb2b34eaacdcf3c3d859dbb357f952fc8020c617dc118ad7c9e38/matplotlib-3.11.0-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:a9d8c6e7cd2f0ddf11d8d92e520dd1d9d2abb0cf6ac8831e338666c81e905847", size = 9500921, upload-time = "2026-06-12T02:28:53.443Z" }, + { url = "https://files.pythonhosted.org/packages/e0/0d/4d861d0121840cb1a3fd4a10deb211efd6fccd481ed23e553f31f4f4da4a/matplotlib-3.11.0-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:be050fcf32f729eda99f7f75a80bf67612ce16ab9ac1c23a387dcaede95cb70e", size = 9332190, upload-time = "2026-06-12T02:28:55.623Z" }, + { url = "https://files.pythonhosted.org/packages/4b/cb/22f6bc35711a0b5639a784e74e653e77c86210bd4304449dd399a482f74e/matplotlib-3.11.0-cp314-cp314t-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:dfabef0230d0697aa0d717385194dd41162e00207a68bf4abf94c2bf4c27dca0", size = 10854181, upload-time = "2026-06-12T02:28:57.856Z" }, + { url = "https://files.pythonhosted.org/packages/3f/7e/9a9eaca731a2939589da520f0ebe8fd8753d0f51fca98c7d20af6dbe261a/matplotlib-3.11.0-cp314-cp314t-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:1644db30e759199443493ac5e5caec24fdb775a8f6123021f85ba47c4133c3cb", size = 11137715, upload-time = "2026-06-12T02:29:00.555Z" }, + { url = "https://files.pythonhosted.org/packages/ef/f9/9b030b6088354acb0296871bb624b25befc1c42509d3c6cd17420c83a5b8/matplotlib-3.11.0-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:15b0d160079cb10699a0e98b5989c70677b2df7cacdc62af67c30f2facec46d9", size = 10939427, upload-time = "2026-06-12T02:29:02.527Z" }, + { url = "https://files.pythonhosted.org/packages/59/94/6b273eaee4ee250863567d100865da61a5c1527fa67f527b7ed22e0dd29c/matplotlib-3.11.0-cp314-cp314t-win_amd64.whl", hash = "sha256:446307e6b04b57b1f1239e228a1ec2af0d589a1008cebc3dfa3f5441d095cfb6", size = 9535809, upload-time = "2026-06-12T02:29:04.994Z" }, + { url = "https://files.pythonhosted.org/packages/60/95/1d36bddf2b7e2692c1540e78a6e5bc88bc1496b137e3e35a611f91b65ac3/matplotlib-3.11.0-cp314-cp314t-win_arm64.whl", hash = "sha256:652fb5696271d4c50f196d22a5ff4f8e4444c74f847423570d7dc0aa2bbd0159", size = 9209226, upload-time = "2026-06-12T02:29:07.033Z" }, + { url = "https://files.pythonhosted.org/packages/0f/c2/f5da6cd37ed6871f5c9b3c0507ddb69f14d6c36fac4541e4e0c60cb8cdfc/matplotlib-3.11.0-pp311-pypy311_pp73-macosx_10_15_x86_64.whl", hash = "sha256:81ae77077a1e16d37a5b61096ccb07c8d90a99b518fa8256b8f21578932f2f62", size = 9434094, upload-time = "2026-06-12T02:29:09.135Z" }, + { url = "https://files.pythonhosted.org/packages/f8/07/56f66906e0f87a0c6d0d0acbd34dbc9432b1931d8f26ef618bd6f92932a9/matplotlib-3.11.0-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:ddef37840695f5eef65f9f070fe2d2f510f584c2156203f9f622a5b0584efffd", size = 9262183, upload-time = "2026-06-12T02:29:11.283Z" }, + { url = "https://files.pythonhosted.org/packages/0c/d8/c4ecab06b7ea36a570c4f3bd2d48d1799fd5d9174470e45c2194199431e7/matplotlib-3.11.0-pp311-pypy311_pp73-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:cf662e5ac5707658cb931e19972c4bd99f7b4f8b7bf79d3c821d239fa6b71e64", size = 10015653, upload-time = "2026-06-12T02:29:13.251Z" }, +] + +[[package]] +name = "matplotlib-inline" +version = "0.2.2" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "traitlets" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/bd/c0/9f7c9a46090390368a4d7bcb76bb87a4a36c421e4c0792cdb53486ffac7a/matplotlib_inline-0.2.2.tar.gz", hash = "sha256:72f3fe8fce36b70d4a5b612f899090cd0401deddc4ea90e1572b9f4bfb058c79", size = 8150, upload-time = "2026-05-08T17:33:33.49Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/41/09/5b161152e2d90f7b87f781c2e1267494aef9c32498df793f73ad0a0a494a/matplotlib_inline-0.2.2-py3-none-any.whl", hash = "sha256:3c821cf1c209f59fb2d2d64abbf5b23b67bcb2210d663f9918dd851c6da1fcf6", size = 9534, upload-time = "2026-05-08T17:33:32.055Z" }, +] + +[[package]] +name = "mccabe" +version = "0.7.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/e7/ff/0ffefdcac38932a54d2b5eed4e0ba8a408f215002cd178ad1df0f2806ff8/mccabe-0.7.0.tar.gz", hash = "sha256:348e0240c33b60bbdf4e523192ef919f28cb2c3d7d5c7794f74009290f236325", size = 9658, upload-time = "2022-01-24T01:14:51.113Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/27/1a/1f68f9ba0c207934b35b86a8ca3aad8395a3d6dd7921c0686e23853ff5a9/mccabe-0.7.0-py2.py3-none-any.whl", hash = "sha256:6c2d30ab6be0e4a46919781807b4f0d834ebdd6c6e3dca0bda5a15f863427b6e", size = 7350, upload-time = "2022-01-24T01:14:49.62Z" }, +] + +[[package]] +name = "mimerender-pr36" +version = "0.0.2" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "python-mimeparse" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/23/39/25559ff5440e17aad0191e3034afa6e023150bc1e79edacb9268c22131f6/mimerender-pr36-0.0.2.tar.gz", hash = "sha256:2d1f7bc4080132da7040518b2d613eb5e49b583231a9b2be3ac040860c233d80", size = 19309, upload-time = "2021-08-07T05:53:35.754Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/48/d5/4f84e7b14f115d49bde75babd13e67ec3b19d077bffc937cab2fc524eac5/mimerender_pr36-0.0.2-py3-none-any.whl", hash = "sha256:260eceeca204d11a4b43cc5d1fe60d757048e6b3dd51b87b64c68c153faadacc", size = 6621, upload-time = "2021-08-07T05:53:33.338Z" }, +] + +[[package]] +name = "mistune" +version = "3.3.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/10/55/ede164a9ff68694455bf42217e9e75b174e4048436688cfff7b382ae486c/mistune-3.3.1.tar.gz", hash = "sha256:7d2108b532850ab81d3e92a5566abe1168f4f27c0c9dbe914e02d1d06e2a0288", size = 111268, upload-time = "2026-06-22T01:32:05.843Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/af/f4/c8951ccd856f56b5300b6c716f645f526b92012983bec84487eea786cf78/mistune-3.3.1-py3-none-any.whl", hash = "sha256:61c4ca5f8c1e0f4622e85bdec00ebf93942a742123bb26440a737bac0edce5c6", size = 61542, upload-time = "2026-06-22T01:32:04.375Z" }, +] + +[[package]] +name = "mongoengine" +version = "0.29.3" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "pymongo" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/b4/76/160e35d90a671913146b884b1ca586909036dd56070600035821870b1aad/mongoengine-0.29.3.tar.gz", hash = "sha256:4267702aea433012845cb12b6334bff86a0a3084b5d141c1e4553ea20374a9b4", size = 188213, upload-time = "2026-03-10T15:19:17.946Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/c7/b5/214ea32710fa3ad7c13820cbb9f9a457d4809a5d54995e0d081f33c75116/mongoengine-0.29.3-py3-none-any.whl", hash = "sha256:2d5a216cf2368867d43e5321b13044ecc3e72c3f19ace21b1c5e7403951ca685", size = 112513, upload-time = "2026-03-10T15:19:16.619Z" }, +] + +[[package]] +name = "monty" +version = "2026.5.18" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "numpy", version = "2.4.6", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version < '3.12'" }, + { name = "numpy", version = "2.5.0", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version >= '3.12'" }, + { name = "ruamel-yaml" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/f4/d7/bd34aafa34d3cddd93c440e7cfb3371328079e864279708f64a871806eb7/monty-2026.5.18.tar.gz", hash = "sha256:b2d8d5c78030e889f6407fa9d8c8c4e3df05fc380251cdf85a119cd1e49c3fdd", size = 211830, upload-time = "2026-05-18T03:21:02.254Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/f3/63/86120977f920798494c522c26899ffacde6d848e1eb018403f1d08044d0d/monty-2026.5.18-py3-none-any.whl", hash = "sha256:dd108b5c3cceb1f61de1a854db8ffda3dc7c2a2d4025b24cf397ade1121e7904", size = 59998, upload-time = "2026-05-18T03:21:00.059Z" }, +] + +[[package]] +name = "more-itertools" +version = "11.1.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/de/1d/f4da6f02cdffe04d6362210b807146a26044c88d839208aec273bb0d9184/more_itertools-11.1.0.tar.gz", hash = "sha256:48e8f4d9e7e5878571ecf6f2b4e57634f93cd474cc8cfbd2376f2d11b396e30d", size = 145772, upload-time = "2026-05-22T14:14:29.909Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/e8/3d/1087453384dbde46a8c7f9356eead2c58be8a7bf156bca40243377c85715/more_itertools-11.1.0-py3-none-any.whl", hash = "sha256:4b65538ae22f6fed0ce4874efd317463a7489796a0939fa66824dd542125a192", size = 72226, upload-time = "2026-05-22T14:14:28.824Z" }, +] + +[[package]] +name = "mpcontribs-api" +source = { editable = "." } +dependencies = [ + { name = "apispec" }, + { name = "asn1crypto" }, + { name = "blinker" }, + { name = "boltons" }, + { name = "css-html-js-minify" }, + { name = "dateparser" }, + { name = "ddtrace" }, + { name = "dnspython" }, + { name = "filetype" }, + { name = "flasgger-tschaume" }, + { name = "flask-compress" }, + { name = "flask-marshmallow" }, + { name = "flask-mongorest-mpcontribs" }, + { name = "flask-rq2" }, + { name = "gunicorn", extra = ["gevent"] }, + { name = "jinja2" }, + { name = "json2html" }, + { name = "marshmallow" }, + { name = "more-itertools" }, + { name = "nbformat" }, + { name = "notebook" }, + { name = "numpy", version = "2.4.6", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version < '3.12'" }, + { name = "numpy", version = "2.5.0", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version >= '3.12'" }, + { name = "pint" }, + { name = "psycopg2-binary" }, + { name = "pymatgen" }, + { name = "pyopenssl" }, + { name = "python-snappy" }, + { name = "rq" }, + { name = "setproctitle" }, + { name = "supervisor" }, + { name = "uncertainties" }, + { name = "websocket-client" }, + { name = "zstandard" }, +] + +[package.optional-dependencies] +all = [ + { name = "flake8" }, + { name = "pytest" }, + { name = "pytest-flake8" }, + { name = "pytest-pycodestyle" }, + { name = "pytest-xdist" }, +] +dev = [ + { name = "flake8" }, + { name = "pytest" }, + { name = "pytest-flake8" }, + { name = "pytest-pycodestyle" }, + { name = "pytest-xdist" }, +] + +[package.dev-dependencies] +dev = [ + { name = "pytest-cov" }, +] + +[package.metadata] +requires-dist = [ + { name = "apispec", specifier = "<6" }, + { name = "asn1crypto" }, + { name = "blinker" }, + { name = "boltons" }, + { name = "css-html-js-minify" }, + { name = "dateparser" }, + { name = "ddtrace", specifier = "==4.3.0" }, + { name = "dnspython" }, + { name = "filetype" }, + { name = "flake8", marker = "extra == 'dev'" }, + { name = "flasgger-tschaume", specifier = ">=0.9.7" }, + { name = "flask-compress" }, + { name = "flask-marshmallow" }, + { name = "flask-mongorest-mpcontribs", specifier = ">=3.2.1" }, + { name = "flask-rq2" }, + { name = "gunicorn", extras = ["gevent"], specifier = "==24.1.1" }, + { name = "jinja2" }, + { name = "json2html" }, + { name = "marshmallow", specifier = "<4" }, + { name = "more-itertools" }, + { name = "mpcontribs-api", extras = ["dev"], marker = "extra == 'all'" }, + { name = "nbformat" }, + { name = "notebook", specifier = "<7" }, + { name = "numpy" }, + { name = "pint", specifier = ">=0.24" }, + { name = "psycopg2-binary" }, + { name = "pymatgen" }, + { name = "pyopenssl" }, + { name = "pytest", marker = "extra == 'dev'" }, + { name = "pytest-flake8", marker = "extra == 'dev'" }, + { name = "pytest-pycodestyle", marker = "extra == 'dev'" }, + { name = "pytest-xdist", marker = "extra == 'dev'" }, + { name = "python-snappy" }, + { name = "rq", specifier = "<=2.3.2" }, + { name = "setproctitle" }, + { name = "supervisor" }, + { name = "uncertainties" }, + { name = "websocket-client" }, + { name = "zstandard" }, +] +provides-extras = ["dev", "all"] + +[package.metadata.requires-dev] +dev = [{ name = "pytest-cov", specifier = ">=7.1.0" }] + +[[package]] +name = "mpmath" +version = "1.3.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/e0/47/dd32fa426cc72114383ac549964eecb20ecfd886d1e5ccf5340b55b02f57/mpmath-1.3.0.tar.gz", hash = "sha256:7a28eb2a9774d00c7bc92411c19a89209d5da7c4c9a9e227be8330a23a25b91f", size = 508106, upload-time = "2023-03-07T16:47:11.061Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/43/e3/7d92a15f894aa0c9c4b49b8ee9ac9850d6e63b03c9c32c0367a13ae62209/mpmath-1.3.0-py3-none-any.whl", hash = "sha256:a0b2b9fe80bbcd81a6647ff13108738cfb482d481d826cc0e02f5b35e5c88d2c", size = 536198, upload-time = "2023-03-07T16:47:09.197Z" }, +] + +[[package]] +name = "narwhals" +version = "2.22.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/62/3c/c4ef2164a71c1a63d7f1ae411c4082c5fa872405106db60a4b7114989ad7/narwhals-2.22.1.tar.gz", hash = "sha256:d62920805a0a43b7ff8b54b0c0d3142d796f8a9301836ada37e573d6a33cbcd9", size = 647493, upload-time = "2026-06-05T12:34:34.051Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/48/ca/36339329c4604adbcc99c899b7eb1ce1a555c499b6a6860757dc9bfed36d/narwhals-2.22.1-py3-none-any.whl", hash = "sha256:60567d774edf77db53906f89d9fbd164e66e56d66d388e1e6990f17ac33cfb53", size = 454815, upload-time = "2026-06-05T12:34:32.289Z" }, +] + +[[package]] +name = "nbclassic" +version = "1.3.3" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "ipykernel" }, + { name = "ipython-genutils" }, + { name = "nest-asyncio" }, + { name = "notebook-shim" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/ec/cc/a495b5eb9a964b70c6ae8c861168b78386d2520fd89c68390932f96400b2/nbclassic-1.3.3.tar.gz", hash = "sha256:434228763f8cee754318cd6dfa42370db191af630dabab8e30bafc8c1aa3eee6", size = 64116062, upload-time = "2025-09-16T20:33:15.967Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/3d/fd/dfb6db427bb4e0a50c9802b11df0b69d9364192f3db999849cde9209c8d0/nbclassic-1.3.3-py3-none-any.whl", hash = "sha256:dcee5149aa6aa01846c7458d6394b29b325213b5e118ee14c80d689122e0e4f2", size = 11527229, upload-time = "2025-09-16T20:33:08.625Z" }, +] + +[[package]] +name = "nbclient" +version = "0.11.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "jupyter-client" }, + { name = "jupyter-core" }, + { name = "nbformat" }, + { name = "traitlets" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/28/a5/b3bae4b590c0cbcada2c63a34f7580024e834a8ba213e949a2f906705787/nbclient-0.11.0.tar.gz", hash = "sha256:04a134a5b087f2c5887f228aca155db50169b8cd9334dee6942c8e927e56081a", size = 62535, upload-time = "2026-06-05T07:52:41.746Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/36/c9/94d73e5a01c5b926c3fa2496e97d7a8dc28ed5a77c0b2ed712f1a62e6694/nbclient-0.11.0-py3-none-any.whl", hash = "sha256:ef7fa0d59d6e1d41103933d8a445a18d5de860ca6b613b87b8574accdb3c2895", size = 25288, upload-time = "2026-06-05T07:52:40.115Z" }, +] + +[[package]] +name = "nbconvert" +version = "7.17.1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "beautifulsoup4" }, + { name = "bleach", extra = ["css"] }, + { name = "defusedxml" }, + { name = "jinja2" }, + { name = "jupyter-core" }, + { name = "jupyterlab-pygments" }, + { name = "markupsafe" }, + { name = "mistune" }, + { name = "nbclient" }, + { name = "nbformat" }, + { name = "packaging" }, + { name = "pandocfilters" }, + { name = "pygments" }, + { name = "traitlets" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/01/b1/708e53fe2e429c103c6e6e159106bcf0357ac41aa4c28772bd8402339051/nbconvert-7.17.1.tar.gz", hash = "sha256:34d0d0a7e73ce3cbab6c5aae8f4f468797280b01fd8bd2ca746da8569eddd7d2", size = 865311, upload-time = "2026-04-08T00:44:14.914Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/67/f8/bb0a9d5f46819c821dc1f004aa2cc29b1d91453297dbf5ff20470f00f193/nbconvert-7.17.1-py3-none-any.whl", hash = "sha256:aa85c087b435e7bf1ffd03319f658e285f2b89eccab33bc1ba7025495ab3e7c8", size = 261927, upload-time = "2026-04-08T00:44:12.845Z" }, +] + +[[package]] +name = "nbformat" +version = "5.10.4" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "fastjsonschema" }, + { name = "jsonschema" }, + { name = "jupyter-core" }, + { name = "traitlets" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/6d/fd/91545e604bc3dad7dca9ed03284086039b294c6b3d75c0d2fa45f9e9caf3/nbformat-5.10.4.tar.gz", hash = "sha256:322168b14f937a5d11362988ecac2a4952d3d8e3a2cbeb2319584631226d5b3a", size = 142749, upload-time = "2024-04-04T11:20:37.371Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/a9/82/0340caa499416c78e5d8f5f05947ae4bc3cba53c9f038ab6e9ed964e22f1/nbformat-5.10.4-py3-none-any.whl", hash = "sha256:3b48d6c8fbca4b299bf3982ea7db1af21580e4fec269ad087b9e81588891200b", size = 78454, upload-time = "2024-04-04T11:20:34.895Z" }, +] + +[[package]] +name = "nest-asyncio" +version = "1.6.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/83/f8/51569ac65d696c8ecbee95938f89d4abf00f47d58d48f6fbabfe8f0baefe/nest_asyncio-1.6.0.tar.gz", hash = "sha256:6f172d5449aca15afd6c646851f4e31e02c598d553a667e38cafa997cfec55fe", size = 7418, upload-time = "2024-01-21T14:25:19.227Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/a0/c4/c2971a3ba4c6103a3d10c4b0f24f461ddc027f0f09763220cf35ca1401b3/nest_asyncio-1.6.0-py3-none-any.whl", hash = "sha256:87af6efd6b5e897c81050477ef65c62e2b2f35d51703cae01aff2905b1852e1c", size = 5195, upload-time = "2024-01-21T14:25:17.223Z" }, +] + +[[package]] +name = "networkx" +version = "3.6.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/6a/51/63fe664f3908c97be9d2e4f1158eb633317598cfa6e1fc14af5383f17512/networkx-3.6.1.tar.gz", hash = "sha256:26b7c357accc0c8cde558ad486283728b65b6a95d85ee1cd66bafab4c8168509", size = 2517025, upload-time = "2025-12-08T17:02:39.908Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/9e/c9/b2622292ea83fbb4ec318f5b9ab867d0a28ab43c5717bb85b0a5f6b3b0a4/networkx-3.6.1-py3-none-any.whl", hash = "sha256:d47fbf302e7d9cbbb9e2555a0d267983d2aa476bac30e90dfbe5669bd57f3762", size = 2068504, upload-time = "2025-12-08T17:02:38.159Z" }, +] + +[[package]] +name = "notebook" +version = "6.5.7" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "argon2-cffi" }, + { name = "ipykernel" }, + { name = "ipython-genutils" }, + { name = "jinja2" }, + { name = "jupyter-client" }, + { name = "jupyter-core" }, + { name = "nbclassic" }, + { name = "nbconvert" }, + { name = "nbformat" }, + { name = "nest-asyncio" }, + { name = "prometheus-client" }, + { name = "pyzmq" }, + { name = "send2trash" }, + { name = "terminado" }, + { name = "tornado" }, + { name = "traitlets" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/05/bc/b025bac523640c13b0c1150466475eac3d79acbf187ef6c1967596c41c43/notebook-6.5.7.tar.gz", hash = "sha256:04eb9011dfac634fbd4442adaf0a8c27cd26beef831fe1d19faf930c327768e4", size = 5786526, upload-time = "2024-05-01T17:42:26.956Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/af/9c/0620631da9d7013e95a8f985043cad229a0d8fb537a7e3f8ff8467565a8c/notebook-6.5.7-py3-none-any.whl", hash = "sha256:a6afa9a4ff4d149a0771ff8b8c881a7a73b3835f9add0606696d6e9d98ac1cd0", size = 529829, upload-time = "2024-05-01T17:42:22.403Z" }, +] + +[[package]] +name = "notebook-shim" +version = "0.2.4" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "jupyter-server" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/54/d2/92fa3243712b9a3e8bafaf60aac366da1cada3639ca767ff4b5b3654ec28/notebook_shim-0.2.4.tar.gz", hash = "sha256:b4b2cfa1b65d98307ca24361f5b30fe785b53c3fd07b7a47e89acb5e6ac638cb", size = 13167, upload-time = "2024-02-14T23:35:18.353Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/f9/33/bd5b9137445ea4b680023eb0469b2bb969d61303dedb2aac6560ff3d14a1/notebook_shim-0.2.4-py3-none-any.whl", hash = "sha256:411a5be4e9dc882a074ccbcae671eda64cceb068767e9a3419096986560e1cef", size = 13307, upload-time = "2024-02-14T23:35:16.286Z" }, +] + +[[package]] +name = "numpy" +version = "2.4.6" +source = { registry = "https://pypi.org/simple" } +resolution-markers = [ + "python_full_version < '3.12' and sys_platform == 'win32'", + "python_full_version < '3.12' and sys_platform != 'win32'", +] +sdist = { url = "https://files.pythonhosted.org/packages/d0/ad/fed0499ce6a338d2a03ebae59cd15093910c8875328855781952abf6c2fe/numpy-2.4.6.tar.gz", hash = "sha256:f3a3570c4a2a16746ac2c31a7c7c7b0c186b95ce902e33db6f28094ed7387dda", size = 20735807, upload-time = "2026-05-18T23:37:14.07Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/b3/49/ec46835a70be8fa6446c495126ac84fdb28cb2558e1620ffb87a10c8b64c/numpy-2.4.6-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:0280e0356c0829a18d9de1cb7eee50ec22ca639878d7240307ca0943d73cd2c4", size = 16969194, upload-time = "2026-05-18T23:33:13.503Z" }, + { url = "https://files.pythonhosted.org/packages/0e/0d/f5957185c0ee2f3e12f78715aa9e3b353fd83633316c8532b38faa37e3f6/numpy-2.4.6-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:110f8b71aacb688ec69062bb7f6938a0f8acb01b7c1c4beb453c65b6d234584d", size = 14964111, upload-time = "2026-05-18T23:33:17.795Z" }, + { url = "https://files.pythonhosted.org/packages/ad/40/40a40ee0ddf7ceb782c49af278894b686e586d65d8c1889c8b5da01a3d7d/numpy-2.4.6-cp311-cp311-macosx_14_0_arm64.whl", hash = "sha256:4cfe66903cc32a9921a6733d96b19bb6abf310397581bbad89c228f5abaf0ee8", size = 5469159, upload-time = "2026-05-18T23:33:20.654Z" }, + { url = "https://files.pythonhosted.org/packages/63/13/f9a8046535cb21deae82f8d03de9617e08882d274fad2539630761888228/numpy-2.4.6-cp311-cp311-macosx_14_0_x86_64.whl", hash = "sha256:8155154c7c691289fe18f510b5d4657c68c67989f293f0535a91360392ff6538", size = 6798936, upload-time = "2026-05-18T23:33:22.987Z" }, + { url = "https://files.pythonhosted.org/packages/33/a8/6fa8c1a345a8c85dbb21932c447bee07c30a2c2a3f31e369c0a84b300147/numpy-2.4.6-cp311-cp311-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:0ab0a9c4ffb1a6d95ef519fe4247dba8eb6b18ad93999f76b7f657039acabd47", size = 15966692, upload-time = "2026-05-18T23:33:26.62Z" }, + { url = "https://files.pythonhosted.org/packages/02/03/74fe2a4cb3817d94d86402f2506554130a2f01414e299b5a843e5a8a957f/numpy-2.4.6-cp311-cp311-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:89cd468399cfd2504718f0ba50e410dca55a170b61a02ad92bb18c8a65186e93", size = 16918164, upload-time = "2026-05-18T23:33:29.955Z" }, + { url = "https://files.pythonhosted.org/packages/c5/80/3615be3313f7e7696609bc194b9f0101da809df79e859bdb84e0cd043f46/numpy-2.4.6-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:c2d37ab77531417474168eb79d6d80b14f821a966818505d03013d0833edb7a8", size = 17322877, upload-time = "2026-05-18T23:33:34.724Z" }, + { url = "https://files.pythonhosted.org/packages/ca/ac/a691e0fe2675e370d0e08ff905adc49a1c8830e8cae03efe4477e92cd55d/numpy-2.4.6-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:f407cb6b8e9d6d8c626bc73c945db1706035af8fd632295547bf1c9e46d092d6", size = 18651487, upload-time = "2026-05-18T23:33:38.217Z" }, + { url = "https://files.pythonhosted.org/packages/15/a7/9bc1cd626d7bf6869bfedf27b91b6ab5dd607758bf8e959d6fa80c6a59cb/numpy-2.4.6-cp311-cp311-win32.whl", hash = "sha256:ddea102b48f9e339f3948bf22040944184627a30fdf7f858667673b9c5f033c8", size = 6233945, upload-time = "2026-05-18T23:33:41.331Z" }, + { url = "https://files.pythonhosted.org/packages/c5/31/7fc6239c12bce7e931463251cca4426c465e1876ba3cc785402ef4dd8f4e/numpy-2.4.6-cp311-cp311-win_amd64.whl", hash = "sha256:1e254a00cdf42b1e4d5b3d68d33af63268d41340d8885df2ab6470f2e1500147", size = 12608406, upload-time = "2026-05-18T23:33:44.131Z" }, + { url = "https://files.pythonhosted.org/packages/27/83/140f85a466595a16382996a1bf06b2b54bcd597488921b0c9daaeeda72af/numpy-2.4.6-cp311-cp311-win_arm64.whl", hash = "sha256:ed9749eef4cbd126da3dc1d6bcb3a57f5eb7ac6a6484146bdbf743f552dfc577", size = 10479528, upload-time = "2026-05-18T23:33:50.725Z" }, + { url = "https://files.pythonhosted.org/packages/95/2a/3d7b5ac8aac24feaf9ad7ed58f45b0bbc06d37e4338ae84c9f2298b570f9/numpy-2.4.6-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:001fbb8e08d942dd57599e781f2472269ee7f2755fae407b4f67b2f0b17da3f1", size = 16689119, upload-time = "2026-05-18T23:33:54.065Z" }, + { url = "https://files.pythonhosted.org/packages/ea/12/92c4c131527599e8288d6918e888d88726f84d805d784b771f32408aeaef/numpy-2.4.6-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:ebfb099f8dcf083deef3ac1ca4c1503f387cf76296fcb3816b66f5ecb5f54fdb", size = 14699246, upload-time = "2026-05-18T23:33:57.621Z" }, + { url = "https://files.pythonhosted.org/packages/ad/fe/c0a6b7b2ca128a8fb228575147073b660656734b8ebe4d76c8fd748dcc79/numpy-2.4.6-cp312-cp312-macosx_14_0_arm64.whl", hash = "sha256:3213d622a0283a39a93d188f3cf72b26862df52fbb4ca3697f51705016523d41", size = 5204410, upload-time = "2026-05-18T23:34:00.302Z" }, + { url = "https://files.pythonhosted.org/packages/f3/d4/9770d14ba719432bb90a421bfd443872ed0f70f7264b64bec12ea363d5fd/numpy-2.4.6-cp312-cp312-macosx_14_0_x86_64.whl", hash = "sha256:357cc07a6d7b0b182ff02249616a03742827ebb1277546b5c7cd7f7620a45698", size = 6551240, upload-time = "2026-05-18T23:34:02.852Z" }, + { url = "https://files.pythonhosted.org/packages/c9/c6/50a46a6205feba2343f1d6d17438107c5dc491ed1c736e6ea68689fd906b/numpy-2.4.6-cp312-cp312-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:5f9fb9157b4ce2971008323afe46053787b526ef624fea915b261468a8421a0f", size = 15671012, upload-time = "2026-05-18T23:34:05.485Z" }, + { url = "https://files.pythonhosted.org/packages/99/60/14115e6364fa676c5397c2ad3004e527e9aa487abf5d0706ec81bbd08529/numpy-2.4.6-cp312-cp312-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:90f9849678c75fe7afa2d348ac842c168b0a4d3d61919687216dfc547976d853", size = 16645538, upload-time = "2026-05-18T23:34:09.265Z" }, + { url = "https://files.pythonhosted.org/packages/ae/c5/693cbe59e57db94d2231fa519ca3978dc9e19da5a8f088588f5c6e947ff2/numpy-2.4.6-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:c1a2af6c6ef86344a6b0db6b97834208bf598db514f2b155042439b62605601a", size = 17020706, upload-time = "2026-05-18T23:34:13.053Z" }, + { url = "https://files.pythonhosted.org/packages/ef/fc/85b7c4eff9b4966ade25c2273cf7e7012e92366c032058653934b37de044/numpy-2.4.6-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:e5805d5a22fd19c8ccff10a9561f9df94436b0545619ea579db2d3c35294bce2", size = 18368541, upload-time = "2026-05-18T23:34:17.024Z" }, + { url = "https://files.pythonhosted.org/packages/f6/81/e1b27545deedce7f4a0b348618c6b62d74e36a4dc9ccd42f3eb2f85eee32/numpy-2.4.6-cp312-cp312-win32.whl", hash = "sha256:e3eeb0aabd6bd5ce64faae67e9935203a6991b4bc2a485a767fbafb2c5125f45", size = 5962825, upload-time = "2026-05-18T23:34:20.3Z" }, + { url = "https://files.pythonhosted.org/packages/ab/ca/feab00bd44aa5fe1ad2c18f08b4d3bb92e26484b0b1d1443897809ed528c/numpy-2.4.6-cp312-cp312-win_amd64.whl", hash = "sha256:d8e8286dd7cea7895157318d1b91cdacac64c479f3cbc8dce548331728484751", size = 12321687, upload-time = "2026-05-18T23:34:23.095Z" }, + { url = "https://files.pythonhosted.org/packages/63/cf/5a6d34850a39d1093558564f77ee8e8e0bee5061151b8f05a55711001ec7/numpy-2.4.6-cp312-cp312-win_arm64.whl", hash = "sha256:4081eb135ac24158bd51cdfbef16f1c64df7063b1143f24731387137c092bec8", size = 10221482, upload-time = "2026-05-18T23:34:25.876Z" }, + { url = "https://files.pythonhosted.org/packages/fb/82/bdab26d7438c6791ca31b7c024ca37c1eab8b726ba236129005cd4a06e45/numpy-2.4.6-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:511dbaf848decaaaf4b4ca48032619fb3138710c4bf7da7617765edad1ef96b0", size = 16684648, upload-time = "2026-05-18T23:34:29.41Z" }, + { url = "https://files.pythonhosted.org/packages/1b/30/a80189bcc7f5e4258b3fbc3968d909d1756f54d023299ecc39ad6fdb9ef8/numpy-2.4.6-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:bf162abab1c1a736333192707cef898e735a5ca00f38f27eeedf44b39d9e85eb", size = 14693902, upload-time = "2026-05-18T23:34:33.013Z" }, + { url = "https://files.pythonhosted.org/packages/97/12/70b5d0d7c15e1ebb8a6a84a8caa1d19e181d84fb58bb6d70aca29099dec1/numpy-2.4.6-cp313-cp313-macosx_14_0_arm64.whl", hash = "sha256:043191bfa8eab18c776647b62723ac9dddece59743b13f49b2016094129c2b3f", size = 5198992, upload-time = "2026-05-18T23:34:36.132Z" }, + { url = "https://files.pythonhosted.org/packages/ba/8c/ebd2a8f8a83541f8d38cc5667e8c2b69cecfd30da6e45693e8158857d44b/numpy-2.4.6-cp313-cp313-macosx_14_0_x86_64.whl", hash = "sha256:6180d8b35af935aed8ece3a85e0a43f87393ae0ac87c8d2c8bd2c993f7270ef3", size = 6546944, upload-time = "2026-05-18T23:34:38.484Z" }, + { url = "https://files.pythonhosted.org/packages/bb/c5/7b863a97a91671a0338f4253bd3b5a3d3852f0692dae91711c9f4a10e787/numpy-2.4.6-cp313-cp313-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:72fbe16c6fac95aedf5937fa873445cec2110be35d8a4e9433d7501fd98dae6b", size = 15669392, upload-time = "2026-05-18T23:34:41.257Z" }, + { url = "https://files.pythonhosted.org/packages/a5/9d/3584b9984ca4c047aea75214ce1a4c4c73d849bd71b604264b7f5653f8a8/numpy-2.4.6-cp313-cp313-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:a7830bab239b79cda9c08c2da014761cafb48da6150e1da17ac06283f43b6089", size = 16633220, upload-time = "2026-05-18T23:34:45.075Z" }, + { url = "https://files.pythonhosted.org/packages/05/ae/7c67fba23bd98caec7c99261f3a16072ade14813486b0282cb29846de832/numpy-2.4.6-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:ef4aea96ce4d3b074422cb4f2f64e216bf9e213004bb58ecfdf50ea02ea8eb9a", size = 17020800, upload-time = "2026-05-18T23:34:49.065Z" }, + { url = "https://files.pythonhosted.org/packages/d9/5d/3b6725cb31d983c5e66916f5d36f6d7e5521129e4c4404d64f918292a5b6/numpy-2.4.6-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:dfa20cc6ca228e6b155b11da03825975ce66aea520985dbbddf0f2a5a495c605", size = 18357600, upload-time = "2026-05-18T23:34:52.709Z" }, + { url = "https://files.pythonhosted.org/packages/f7/da/2ccc6c2fe8898dee01d90c75c5f5f914a23daf99e3e0f59516a08760c8b5/numpy-2.4.6-cp313-cp313-win32.whl", hash = "sha256:56b39e5e0622a09a25bf5baf62f4bcf0cb8a41ae6e2819cf49bbc5a74c083f91", size = 5961134, upload-time = "2026-05-18T23:34:55.618Z" }, + { url = "https://files.pythonhosted.org/packages/b5/cd/9cc4dc876fb065d5c220aae4d5e14826b2715331bb7618ce1fb07a679d99/numpy-2.4.6-cp313-cp313-win_amd64.whl", hash = "sha256:c4fc99836233ea196540b17ab0983aff60ed07941751930f5f4d05bc3b3b7359", size = 12318598, upload-time = "2026-05-18T23:34:58.928Z" }, + { url = "https://files.pythonhosted.org/packages/39/1e/c0bcba1f8694116485fe28fd1be698c278fcda4141c5b0e53a2aed8b12a8/numpy-2.4.6-cp313-cp313-win_arm64.whl", hash = "sha256:a7c711e21628b52034bb5ab8d1bce291f752fcc5e92accc615778acee1ff4778", size = 10222272, upload-time = "2026-05-18T23:35:02.167Z" }, + { url = "https://files.pythonhosted.org/packages/63/6d/cc5619247c8f4204e507f5883528372e4ac4bb189e579fb859a12e480b1f/numpy-2.4.6-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:112b06a867b235ef466ed3508ddf0238050df9c727cafb5301ac385b899189a1", size = 14821197, upload-time = "2026-05-18T23:35:05.468Z" }, + { url = "https://files.pythonhosted.org/packages/00/58/f1c39161c87d9e9bed660f1ed4bafc0e403d5ec9650b6dd77aead07d489b/numpy-2.4.6-cp313-cp313t-macosx_14_0_arm64.whl", hash = "sha256:eaf7fa2de5c0be8ae6ff8e9bea2ccd725e980541244521d8d4b5f3354a27babe", size = 5326287, upload-time = "2026-05-18T23:35:08.693Z" }, + { url = "https://files.pythonhosted.org/packages/af/57/3917ab0fd97f271a8694513581b8a36c655f111c446852c302f04ccdb6fc/numpy-2.4.6-cp313-cp313t-macosx_14_0_x86_64.whl", hash = "sha256:7265a2f3d436e54ef9f2b52b5c937e6be778781bd97a590319d7348f1c1ca997", size = 6646763, upload-time = "2026-05-18T23:35:11.459Z" }, + { url = "https://files.pythonhosted.org/packages/eb/0f/037e64c494b67581ae18193d770adef354c41f3f2c8ebf865602d949bf8f/numpy-2.4.6-cp313-cp313t-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:f74a575920ab21fe304421a3fc28793d82e299cae9eccb37084e9fc7f3617c20", size = 15728070, upload-time = "2026-05-18T23:35:14.79Z" }, + { url = "https://files.pythonhosted.org/packages/21/a6/5d2bae9c9542eb4df16dc9c46dc79c186e9bad53805dfa5399a6023c6db0/numpy-2.4.6-cp313-cp313t-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:ede83e07a75dd06bc501566c1eca2afc0d61677c1472ac9ad93fdee6e638a48d", size = 16681752, upload-time = "2026-05-18T23:35:18.836Z" }, + { url = "https://files.pythonhosted.org/packages/92/14/23d1dfb410ae362cd59ce53e936b1513d545eb40db3949ced632e19a459e/numpy-2.4.6-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:68bb27509ac1b9a3443094260f6326150663b06abe40b73a2f81160623da5b67", size = 17086024, upload-time = "2026-05-18T23:35:22.52Z" }, + { url = "https://files.pythonhosted.org/packages/4b/6e/23595a2c642cdf3bc567877064bdd7f91c8b0038a4453cf2daf7248eafe9/numpy-2.4.6-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:a0df0043bdb289bde1f62da130d20df23d58b45429f752bc7a8fc5325a225ecd", size = 18403398, upload-time = "2026-05-18T23:35:26.398Z" }, + { url = "https://files.pythonhosted.org/packages/8a/90/0ac3bc947217e66dec77e7cbc6a1979d1af70b6461b82f620d3bccd5e4c8/numpy-2.4.6-cp313-cp313t-win32.whl", hash = "sha256:29a287e0cf63ff528da061de6b9f64a4618da591ca1046aafc54062e40ca7eab", size = 6084971, upload-time = "2026-05-18T23:35:29.387Z" }, + { url = "https://files.pythonhosted.org/packages/77/71/5673e351671a1d2bd6063b91b44f70c0affea7d1516fa7a6572941ba4aa1/numpy-2.4.6-cp313-cp313t-win_amd64.whl", hash = "sha256:25c692919ac5a01f170a3bfcd62d745b24fd095c353d50812637d6fcab442e75", size = 12458532, upload-time = "2026-05-18T23:35:32.175Z" }, + { url = "https://files.pythonhosted.org/packages/3f/88/19d3503c5046e688f049274b27a3ef3d771152fa80d3ba3d01a3dff61abe/numpy-2.4.6-cp313-cp313t-win_arm64.whl", hash = "sha256:1e978ec1e8bd0e0e4de6bb75de9d30cbb74db6b6a2bb727618613703ca0167dd", size = 10291881, upload-time = "2026-05-18T23:35:35.465Z" }, + { url = "https://files.pythonhosted.org/packages/f8/91/3ab2044d05fd16d343c5ac2e69b127f1b2854040dd20b193257c78028bd3/numpy-2.4.6-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:06ca2f61ec4385a07a6977c55ba998a4466c123642b4a32694d3128fce18c079", size = 16683458, upload-time = "2026-05-18T23:35:38.353Z" }, + { url = "https://files.pythonhosted.org/packages/8e/62/764ce66fa4147ae6d73071a3abf804ffe606f174618697c571acdf26a7c9/numpy-2.4.6-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:38efbc8de75c7a0fc1ac190162d892787f3f47b57cc291231aafee36b80982b7", size = 14704559, upload-time = "2026-05-18T23:35:42.14Z" }, + { url = "https://files.pythonhosted.org/packages/60/61/23f27c172f022e04025b7dc2367f4d63c1a398120607ec896228649a6f48/numpy-2.4.6-cp314-cp314-macosx_14_0_arm64.whl", hash = "sha256:d581b735e177fdcdce6fed8e7e8880a3fb6ee4e3653a3ac6af01c6f4c03effc5", size = 5209716, upload-time = "2026-05-18T23:35:45.377Z" }, + { url = "https://files.pythonhosted.org/packages/03/71/21cf70dc6ea3e3acb95fc53a265b2fc248b981f0194ceb5b475271b8809d/numpy-2.4.6-cp314-cp314-macosx_14_0_x86_64.whl", hash = "sha256:0a041d3d761dc3c35cc56ce0351506a02bcbc25f7b169f652435141a17db9096", size = 6543947, upload-time = "2026-05-18T23:35:47.926Z" }, + { url = "https://files.pythonhosted.org/packages/d5/91/64288395ee1799bd2e0b04a305dce9666da90c961e1f3fe982a05ee1c036/numpy-2.4.6-cp314-cp314-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:40fdc1ae7125e518ea98e53e69a4ebc27e1fd50510c47b7ea130cf21e5e1d42b", size = 15685197, upload-time = "2026-05-18T23:35:50.863Z" }, + { url = "https://files.pythonhosted.org/packages/f3/eb/ebffaa97dc55502df69584a8f0dcf07f69a3e0b3e2323670a2722db9aa39/numpy-2.4.6-cp314-cp314-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:a2c306dea656c12c68f51f4cea133cbe78ca7435eb28c735eac1d3ebe73be6e8", size = 16638245, upload-time = "2026-05-18T23:35:54.752Z" }, + { url = "https://files.pythonhosted.org/packages/b8/0b/54f9da33128d7e350fab89c7455902eeae70349ee52bddb448dc4a576f45/numpy-2.4.6-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:33111801a01c12a8a1e3721f0a9232f8cfc8ae2c6b7098167e6f623c6073f402", size = 17036587, upload-time = "2026-05-18T23:35:58.355Z" }, + { url = "https://files.pythonhosted.org/packages/b6/f0/fdebc1052db1cc37c64beb22072d67cd6d1c71adca1299f53dec2b5e20d3/numpy-2.4.6-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:ae506e6902902557576a26ff33eda8695e7ecb3cb36c3b573a0765dee114ebdb", size = 18363226, upload-time = "2026-05-18T23:36:02.845Z" }, + { url = "https://files.pythonhosted.org/packages/aa/b4/298628d98c72b57e57f7165ae6a481a1deaf6f3c28262a6e4c739c275930/numpy-2.4.6-cp314-cp314-win32.whl", hash = "sha256:aaf159caa35993cb1f56fb9b8e4610d35758e7ca005412eb1daa856a78c9c4b1", size = 6010196, upload-time = "2026-05-18T23:36:05.92Z" }, + { url = "https://files.pythonhosted.org/packages/df/ac/46de6dda46478f7942f839e094970be2d4a861e005c4b3bf07c92e291a09/numpy-2.4.6-cp314-cp314-win_amd64.whl", hash = "sha256:b507f5c4c1d508876d1819b6bf9a49d365b96320b5d4993426b33a23ca4b8261", size = 12450334, upload-time = "2026-05-18T23:36:09.107Z" }, + { url = "https://files.pythonhosted.org/packages/78/92/b8b798ac784102c0da830d2257d59358e3d3d90d1e2b3f2575dad976c5cf/numpy-2.4.6-cp314-cp314-win_arm64.whl", hash = "sha256:6f41ae150c4e32db4f3310cdaf64b1593a03dbabe29eec77fc9b50fe64061df6", size = 10495678, upload-time = "2026-05-18T23:36:12.766Z" }, + { url = "https://files.pythonhosted.org/packages/30/34/ec28d1aa8115971537c01469ab2011ee96827930f0a124de1000cc2a7ed7/numpy-2.4.6-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:ece3d2cfe132e7d51f44a832b303895e6f2d499c5e74dfbdb06ee246147a304a", size = 14823672, upload-time = "2026-05-18T23:36:16.473Z" }, + { url = "https://files.pythonhosted.org/packages/16/bd/f6d1fede4e54e8042a7ff97bb495510f3c220f94bcd9e8b228e87c92cc0d/numpy-2.4.6-cp314-cp314t-macosx_14_0_arm64.whl", hash = "sha256:e3e5193ef5a3dc73bceee50f7fdc2c90dbb76c42df8d8fae3d1067a583df579e", size = 5328731, upload-time = "2026-05-18T23:36:19.767Z" }, + { url = "https://files.pythonhosted.org/packages/f4/f0/e105b9e2fd728a9910103884decd6951d9dd73896b914a98d9a231de02ee/numpy-2.4.6-cp314-cp314t-macosx_14_0_x86_64.whl", hash = "sha256:17f9ade344e7d9b464a084d69bcf18fc691cb1db67c62ed80820bf4926d78f0e", size = 6649805, upload-time = "2026-05-18T23:36:22.266Z" }, + { url = "https://files.pythonhosted.org/packages/82/dd/1206a7ca6ab15e3f02069707ca96222e202af681bb73756da7527f3cb837/numpy-2.4.6-cp314-cp314t-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:9cd5ffd25db4e7ba6a375693b3fc0fc1791ec636c17db3720da19bde7180ec43", size = 15730496, upload-time = "2026-05-18T23:36:25.713Z" }, + { url = "https://files.pythonhosted.org/packages/51/e7/38d3ea825dcab85a591734decb2f6c67caa7c8367d374df1a1c3842f9b07/numpy-2.4.6-cp314-cp314t-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:7d92c3819208a60205a12a245c91ad70cb0a85336659b19b834205573ac8456e", size = 16679616, upload-time = "2026-05-18T23:36:29.652Z" }, + { url = "https://files.pythonhosted.org/packages/93/b7/caabfdf53edf663e0b4eb74d7d405d83baef09eb5e83bcd32d601d72b93e/numpy-2.4.6-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:e85b752a1e912b70eaad4fafbd4d1238007ab221de2009b9a2f5ae7461239895", size = 17085145, upload-time = "2026-05-18T23:36:33.449Z" }, + { url = "https://files.pythonhosted.org/packages/f9/45/68d7c33a6bcf3e5aa3bdbd57a367e6f615286dfd6482f97e8ffeb734306e/numpy-2.4.6-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:29cb7f67d10b479ff07c17d33e39f78c07f71c40ef30d63c153d340e96cd3fb4", size = 18403813, upload-time = "2026-05-18T23:36:37.369Z" }, + { url = "https://files.pythonhosted.org/packages/9c/50/0753655aa844c99cd9e018aacf76f130f1bd81d881bb74bc0aef5d73a8ba/numpy-2.4.6-cp314-cp314t-win32.whl", hash = "sha256:260a5d70215b61ab4fadf5c7baacd64821842975eea312125ed3c39a6391b063", size = 6156982, upload-time = "2026-05-18T23:36:40.817Z" }, + { url = "https://files.pythonhosted.org/packages/b2/d4/7c67becf668f973cb490cec3e98dfd799d866f9c989a54d355672cfa0db6/numpy-2.4.6-cp314-cp314t-win_amd64.whl", hash = "sha256:81a1cca95ed5bb92aa8b10dd2cdc9a0d3853a50fad926c28b5d7e8ea54389627", size = 12638908, upload-time = "2026-05-18T23:36:43.996Z" }, + { url = "https://files.pythonhosted.org/packages/43/bb/e1c71a4295b1b1d1393d50dbb4f2a36283c6859d9d3892e84f00ec5a91d5/numpy-2.4.6-cp314-cp314t-win_arm64.whl", hash = "sha256:0c9136e14ed34a9e343a31c533d78a9813a69a3148332bce5e9821cb2f996e66", size = 10565867, upload-time = "2026-05-18T23:36:47.114Z" }, + { url = "https://files.pythonhosted.org/packages/de/12/b422cc84439adc0d00de605bf4a308890ae5c26f2c71fbd73e5d08fbb0dd/numpy-2.4.6-pp311-pypy311_pp73-macosx_10_15_x86_64.whl", hash = "sha256:55cced7c52e981362f708ad635198e97a752dfba412cc03c23bbf3bd8d5cd662", size = 16847511, upload-time = "2026-05-18T23:36:50.673Z" }, + { url = "https://files.pythonhosted.org/packages/44/53/f481bef68011740f8849418d82db07230e825013f31f4eef5ba5b805316a/numpy-2.4.6-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:d6da64deb6b8ed903e7560180a92f2d804ee1ba5eeb849ac2748b8c1aba1f6d7", size = 14889064, upload-time = "2026-05-18T23:36:53.879Z" }, + { url = "https://files.pythonhosted.org/packages/7f/57/42ed575c10ced8af951d426bc4e1f8aff16fd851db33f067036215a7f860/numpy-2.4.6-pp311-pypy311_pp73-macosx_14_0_arm64.whl", hash = "sha256:68a5124b13fa6cc2086764a20005d30bc0548146f7f5322f02fce212ca14317f", size = 5394157, upload-time = "2026-05-18T23:36:57.194Z" }, + { url = "https://files.pythonhosted.org/packages/6a/ef/f66cc724fcc36c1e364c67f51ae9146090b8b584f27d58b97fdae3edd737/numpy-2.4.6-pp311-pypy311_pp73-macosx_14_0_x86_64.whl", hash = "sha256:948424b06129ce883307e8cff868c31396d8dc7630a59c61d70d98dbe70f222c", size = 6708728, upload-time = "2026-05-18T23:36:59.575Z" }, + { url = "https://files.pythonhosted.org/packages/1a/9c/c531f2293b91265d8b48e9b329f54fdd7ffae73cb4134ea10cca4237e9cc/numpy-2.4.6-pp311-pypy311_pp73-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:5dbbdb29840ca3d91ee0fece42fc29278886d908280bfec0a5846c6f901a3eb0", size = 15798374, upload-time = "2026-05-18T23:37:02.674Z" }, + { url = "https://files.pythonhosted.org/packages/1a/b0/413077f6b1153ed3cba361401c6783bbad6114804a000cc22eb71c13e190/numpy-2.4.6-pp311-pypy311_pp73-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:8ad03c0965fb3c692200e74d458ca28c1dbb4ce96f9a479a8aa041ad5fabca02", size = 16747286, upload-time = "2026-05-18T23:37:06.327Z" }, + { url = "https://files.pythonhosted.org/packages/15/ce/e5ec180bc41812edcd8daeb8639d205622c0e8c02259d8ab25a0201b3c2a/numpy-2.4.6-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:2803abfebfc990042cd494d8ce2d5f82e9d847af6d35ec486923aa19dbad5e73", size = 12504263, upload-time = "2026-05-18T23:37:09.715Z" }, +] + +[[package]] +name = "numpy" +version = "2.5.0" +source = { registry = "https://pypi.org/simple" } +resolution-markers = [ + "python_full_version >= '3.14' and sys_platform == 'win32'", + "python_full_version >= '3.14' and sys_platform != 'win32'", + "python_full_version == '3.13.*' and sys_platform == 'win32'", + "python_full_version == '3.13.*' and sys_platform != 'win32'", + "python_full_version == '3.12.*' and sys_platform == 'win32'", + "python_full_version == '3.12.*' and sys_platform != 'win32'", +] +sdist = { url = "https://files.pythonhosted.org/packages/e7/05/3d27272d30698dc0ecb7fdfaa41ad70303b444f81722bb99bce1d818638a/numpy-2.5.0.tar.gz", hash = "sha256:5a129578019311b6e56bdd714250f19b518f7dceeeb8d1af5490f4942d3f891c", size = 20652461, upload-time = "2026-06-21T20:57:51.95Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/fa/0a/11486d02add7b1384dff7374d124b1cfbb0ee864dcc9f6a2c0380638cf84/numpy-2.5.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:489780423903667933b4ed6197b6ec3b75ea5dd17d1d8f0f38d798feb6921561", size = 16789987, upload-time = "2026-06-21T20:56:16.657Z" }, + { url = "https://files.pythonhosted.org/packages/55/b2/285f48640a181947b4587a3766d21ec1eaa7fea833d4b49957e09da467a2/numpy-2.5.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:ece55976ced6bca95a03ae2839e2e5ccffe8eb6a3e7022415645eb154a81e4e6", size = 11760322, upload-time = "2026-06-21T20:56:19.813Z" }, + { url = "https://files.pythonhosted.org/packages/dd/67/b032db1eb03ca30d16eda3b0c22aaa615338b9263c2fd559d0f29451aca4/numpy-2.5.0-cp312-cp312-macosx_14_0_arm64.whl", hash = "sha256:c83b664b0e6eee9594fa920cf0639d8af796606d3fad6cc70180c87e4b97c7be", size = 5319605, upload-time = "2026-06-21T20:56:22.173Z" }, + { url = "https://files.pythonhosted.org/packages/b9/83/03fc7300c7c6b6c84c487b1dc80d322817b95fbd1f4dd57a85e23b7198de/numpy-2.5.0-cp312-cp312-macosx_14_0_x86_64.whl", hash = "sha256:bf80333980bf37f523341ddd72c783f39d6829ec7736b9eb99086388a2d52cc2", size = 6653628, upload-time = "2026-06-21T20:56:23.914Z" }, + { url = "https://files.pythonhosted.org/packages/82/49/2ec21730bc63ccfda829323f7040a8ed4715b3852ce658689cf74ee96a8c/numpy-2.5.0-cp312-cp312-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:a1a4874217b36d5ac8fc876f52e39df56f8182c88463e9e2dceabf7ca8b7efb8", size = 15153691, upload-time = "2026-06-21T20:56:25.631Z" }, + { url = "https://files.pythonhosted.org/packages/bb/6b/f4a3d0637692c49da8ef99d72d52526f92e0a8d6ac4f0ca9f31441b9d9ea/numpy-2.5.0-cp312-cp312-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:aaa760137137e8d3c920d27927748215b56014f92667dc9b6c27dfc61249255a", size = 16660066, upload-time = "2026-06-21T20:56:28.009Z" }, + { url = "https://files.pythonhosted.org/packages/3a/2f/c354ec86d1f3f5c19649463b0d39652e160736e5b0a4cd18dff0576715c4/numpy-2.5.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:7174ce8265fc7f7417d171c9ea8fe905220748893ea67a2a7abe726ec331c4b0", size = 16514638, upload-time = "2026-06-21T20:56:30.26Z" }, + { url = "https://files.pythonhosted.org/packages/06/34/43efdcb319988648580f93c11f1ae82cf7e2faa74925e98e454ae3aa95f8/numpy-2.5.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:b8c3daaf99de52415d20b42f8e8155c78642cb04207d02f9d317a0dcf1b3fb54", size = 18419647, upload-time = "2026-06-21T20:56:32.41Z" }, + { url = "https://files.pythonhosted.org/packages/71/e2/f5d1676b1d7fb682eb5e9a1641e7ebd2414b3216c370661d1029778908b4/numpy-2.5.0-cp312-cp312-win32.whl", hash = "sha256:6206db0af545d73d068add6d992279145f158428d1da6cc49adc4b630c5d6ee5", size = 6056688, upload-time = "2026-06-21T20:56:34.657Z" }, + { url = "https://files.pythonhosted.org/packages/8f/7c/48f115d1c58a34032facebcd51fdf2d02df2c51d4a46a81dd1197bb2ea6b/numpy-2.5.0-cp312-cp312-win_amd64.whl", hash = "sha256:6f2d6873e2940c860a309d21e25b1e69af6aaffdd80aa056b04c16380db1c4f2", size = 12419237, upload-time = "2026-06-21T20:56:36.24Z" }, + { url = "https://files.pythonhosted.org/packages/86/26/2e0882f4044d1b1a1b63e875151fb2393389032022a8b7f5657a7996d3b2/numpy-2.5.0-cp312-cp312-win_arm64.whl", hash = "sha256:a55e1eb2bca2cfd17a16b213c99dfc8502d47b0d494224d2122277d0400935ca", size = 10339912, upload-time = "2026-06-21T20:56:38.733Z" }, + { url = "https://files.pythonhosted.org/packages/8a/33/07675aaad7f26ea013d5e884d9a0d784b79c6bd7566c333f5a52fa3c610b/numpy-2.5.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:520e6b8be0a4b65840ac8090d4f51cef4bed66e2b0894d5a520f099adc24a9b2", size = 16784890, upload-time = "2026-06-21T20:56:40.799Z" }, + { url = "https://files.pythonhosted.org/packages/85/4b/953118a730ee3b35e28645e0eb4cf9beec5bdbb954e1ac2f5fcefba6bbc3/numpy-2.5.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:146b81cdd3967fdb6beca8ba25f00c58741d8f3cbd797f55af0fbe0bfec3469c", size = 11754584, upload-time = "2026-06-21T20:56:43.094Z" }, + { url = "https://files.pythonhosted.org/packages/44/9b/56dd530c367c74ae17411027cea4135ca57e1e0583bf5594cee18bd83217/numpy-2.5.0-cp313-cp313-macosx_14_0_arm64.whl", hash = "sha256:126b88d95e8ff9b00c9e717aa540469f21d6180162f84c0caec51b16215d49cd", size = 5313904, upload-time = "2026-06-21T20:56:45.503Z" }, + { url = "https://files.pythonhosted.org/packages/ce/b0/bcd672edad27ecca7da1f7bb0ce72cd1706a4f2d79ae94990afc97c13e1c/numpy-2.5.0-cp313-cp313-macosx_14_0_x86_64.whl", hash = "sha256:d4313cef1594c5ce46c31b6e54e918338f63f16ee9322304e8c9114d6d81c8bd", size = 6648504, upload-time = "2026-06-21T20:56:47.567Z" }, + { url = "https://files.pythonhosted.org/packages/80/9e/15cdfcbd30a1544a46c9e487a00df331c4672450216538705a9e51fa6710/numpy-2.5.0-cp313-cp313-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:750fb097caf26fa878746d9d119f6f9da12dedcbff1eea966c3e3447647c4a9e", size = 15150086, upload-time = "2026-06-21T20:56:49.352Z" }, + { url = "https://files.pythonhosted.org/packages/32/4e/8d7656ccaab3e81e97258b8a9bc5f0c8502513a92fb4ceb0a2cbfebc17bf/numpy-2.5.0-cp313-cp313-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:3893adc2dc7c0412ba76777db55a049215d99c9aa3113003be8f49f4f1290ab9", size = 16647250, upload-time = "2026-06-21T20:56:51.542Z" }, + { url = "https://files.pythonhosted.org/packages/3c/81/97060281b602ed07f21b12f4ec409eac1f75a2f91fbc829ed8b2becf3ad4/numpy-2.5.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:835e454dd99b238cdc5a3f63bce2371296f5ebc53ca1e0f8e6ddbb6d92a29aab", size = 16512864, upload-time = "2026-06-21T20:56:55.401Z" }, + { url = "https://files.pythonhosted.org/packages/33/ab/4496208146911f8d8ddb54f68a972aafa6c8d44babcb2ea03b0e5cc87c9d/numpy-2.5.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:6f9836778081a0a3c02a6a21493f3e9f5b311f8d2541934f31f05583dc999ea4", size = 18408407, upload-time = "2026-06-21T20:56:57.75Z" }, + { url = "https://files.pythonhosted.org/packages/d4/9f/a4df67c181e4ee8b467aa3332dc2db10fd5c515136831302f3ca48bc0a01/numpy-2.5.0-cp313-cp313-win32.whl", hash = "sha256:0b525be4744b60bb0557ac872d53ef07d085b5f39622bc579c98d3809d05b988", size = 6054431, upload-time = "2026-06-21T20:57:00.016Z" }, + { url = "https://files.pythonhosted.org/packages/30/53/491e1c47c55b62ccc6a63c1c5b8635c73fc2258dddeb9bda27cae4a0ae96/numpy-2.5.0-cp313-cp313-win_amd64.whl", hash = "sha256:44353e2878930039db472b99dc353d749826e4010bd4d2a7f835e94a97a5c748", size = 12414420, upload-time = "2026-06-21T20:57:01.815Z" }, + { url = "https://files.pythonhosted.org/packages/eb/4a/25c2906f541e9d9f4c5769764db732e6627be91a13f4724fa10634d77db4/numpy-2.5.0-cp313-cp313-win_arm64.whl", hash = "sha256:48f54b00711f83a5f796b70c518e8c2b3c5848dda03a54911f23eb68519b9b60", size = 10339533, upload-time = "2026-06-21T20:57:03.961Z" }, + { url = "https://files.pythonhosted.org/packages/86/ad/abc44aaceaf7b17ee1edde2bbb4458da591bc79574cffff50c4bb35f00d1/numpy-2.5.0-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:f27582c55ba4c750b7c58c8faf021d2cd9324a662b466229db8a417b41368af9", size = 16783807, upload-time = "2026-06-21T20:57:06.253Z" }, + { url = "https://files.pythonhosted.org/packages/5d/39/b72e168daf9c00fb20c9fc996d00437ccecdef3102387775d29d7a62576d/numpy-2.5.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:28e7137057d551e4a83c4ae414e3451f50568409db7569aacc7f9811ee06a446", size = 11765215, upload-time = "2026-06-21T20:57:08.547Z" }, + { url = "https://files.pythonhosted.org/packages/f7/a0/8400a9c0e3625182347593f5e1f57da9a617a534794805c8df5518154ddc/numpy-2.5.0-cp314-cp314-macosx_14_0_arm64.whl", hash = "sha256:e1da54b53e75cd9fcfc23efcc7edab2c6aecf97b6037566d8a0fe804af8ec57c", size = 5324493, upload-time = "2026-06-21T20:57:11.012Z" }, + { url = "https://files.pythonhosted.org/packages/f6/8c/0d104deaa0401c93395a629ec902891618a2eff76d19229139cb5a887bfc/numpy-2.5.0-cp314-cp314-macosx_14_0_x86_64.whl", hash = "sha256:694d8f74e156f7fd01179f1aa8faa2f648ab6ae0f70b6c3fe57a03249aea2303", size = 6645211, upload-time = "2026-06-21T20:57:12.919Z" }, + { url = "https://files.pythonhosted.org/packages/6a/d9/4a4a628c812750363786afc3d33492709a5cd64b215469c16b0f6c7bb811/numpy-2.5.0-cp314-cp314-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:1a7569a7b53c77716f036bb28cb1c91f166a26ec7d9502cd1e4bdfe502fdec22", size = 15166004, upload-time = "2026-06-21T20:57:14.717Z" }, + { url = "https://files.pythonhosted.org/packages/a0/5e/2a902317d7fc4aa93236e80c932662dadfc459b323d758329e01775125e1/numpy-2.5.0-cp314-cp314-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:39a0433bd4086ebd462960cf375e19195bb07b53dc1d87dd5fcf47ad78576f03", size = 16650797, upload-time = "2026-06-21T20:57:16.906Z" }, + { url = "https://files.pythonhosted.org/packages/e9/a0/a0090e6329f4ca5992c07847bb579c5259a19953dc57255bb08793142ffb/numpy-2.5.0-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:929f0c79ac38bcbd7154fe631dc907abfeddbcc5027a896bd1f7767323271e7a", size = 16524647, upload-time = "2026-06-21T20:57:19.165Z" }, + { url = "https://files.pythonhosted.org/packages/5e/7d/6caf27734c42b65837e7461ed0dbbd6b6fc835060c9714ec59d673bb383a/numpy-2.5.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:cc4f247a47bbf070bfd70be53ccdcf47b800af563535e7bbe172322197c30e21", size = 18411841, upload-time = "2026-06-21T20:57:21.638Z" }, + { url = "https://files.pythonhosted.org/packages/13/dc/26edadbd812536769a82c2e9e002234e33feb5da43061d47a044f6d309b7/numpy-2.5.0-cp314-cp314-win32.whl", hash = "sha256:5dc71423499fab3f46f7a7201155ade1669ea101f2f429d332df9e72f8161731", size = 6106361, upload-time = "2026-06-21T20:57:23.844Z" }, + { url = "https://files.pythonhosted.org/packages/f2/9e/4dd1459282229a72d92dece2ae9138e5cac94a72263a7ceb48f37434c925/numpy-2.5.0-cp314-cp314-win_amd64.whl", hash = "sha256:ebb81d9d5443e0309d6c54894c3fbed74ad7da0714352a67b6d773cd189eae73", size = 12551749, upload-time = "2026-06-21T20:57:25.945Z" }, + { url = "https://files.pythonhosted.org/packages/05/a7/6bc6384c080b86c7f6c85c5bc5b540b24f4f679cd144791d99574e90d462/numpy-2.5.0-cp314-cp314-win_arm64.whl", hash = "sha256:3b94d0d0deceebfad3e67ae5c0e5eb87371e8f7a0581cd04a779928c2450cf1e", size = 10617072, upload-time = "2026-06-21T20:57:28.175Z" }, + { url = "https://files.pythonhosted.org/packages/86/6b/4a2b71d66ada5608ae02b63f150dfad520f6940721cb7f029ad270befc0e/numpy-2.5.0-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:22f3d43e362d650bc39db1f17851302874a148ca95ba6981c1dfb5fa6862f35b", size = 11881067, upload-time = "2026-06-21T20:57:30.104Z" }, + { url = "https://files.pythonhosted.org/packages/dc/b2/d365eb40a20efb49d67e9feb90494ed8511282ee1f5fa16006675c65397d/numpy-2.5.0-cp314-cp314t-macosx_14_0_arm64.whl", hash = "sha256:243563efb4cd7528a264567e9fd206c87826457322521d06206a00bfa316c927", size = 5440290, upload-time = "2026-06-21T20:57:32.193Z" }, + { url = "https://files.pythonhosted.org/packages/fa/5e/e9c03188de5f9b767e46a8fe988bcfd3efad066a4a3fda8b9cb11a93f895/numpy-2.5.0-cp314-cp314t-macosx_14_0_x86_64.whl", hash = "sha256:84881d825ca75249b189bbee875fcfe3238aa5c479e6100893cda566e8e86826", size = 6748371, upload-time = "2026-06-21T20:57:33.933Z" }, + { url = "https://files.pythonhosted.org/packages/fd/1d/68c186a38a5027bae2c4ddd5ea681fdaf8b4d30fb7301def6d8ad270390f/numpy-2.5.0-cp314-cp314t-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:cda12aa4779d42b8771180aba759c96f527d43446d8f380ab59e2b35e8489efd", size = 15214643, upload-time = "2026-06-21T20:57:35.677Z" }, + { url = "https://files.pythonhosted.org/packages/8c/67/73f67b7c7e20635baae9c4c3ead4ae7326a005900297a6110971abd62eb5/numpy-2.5.0-cp314-cp314t-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:1c0121101093d2bd74981b10f8837d78e794a8ff57834eb27179f49e1ba11ac6", size = 16690128, upload-time = "2026-06-21T20:57:38.159Z" }, + { url = "https://files.pythonhosted.org/packages/eb/05/d4c1fb0c46d02a27d6b2b8b319a78c90937acec8631c1641874670b31e6f/numpy-2.5.0-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:d371c92cfa09da00022f501ab67fafaea813d752eb30ac44336d45b1e5b0268a", size = 16577902, upload-time = "2026-06-21T20:57:40.447Z" }, + { url = "https://files.pythonhosted.org/packages/9e/1d/771c797d50fa26e4888989cccf1d50ee51f530d4e455ad2692dcb64fa711/numpy-2.5.0-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:9990713e9c38154c6861e7547f1e3fc7a87e75ff09bab24ef1cc81d81c2835e9", size = 18452814, upload-time = "2026-06-21T20:57:42.875Z" }, + { url = "https://files.pythonhosted.org/packages/e8/46/52fc0d2a68d7643f0f149eeea5a5d8ea2a3507056ac8afa83c9212606e8b/numpy-2.5.0-cp314-cp314t-win32.whl", hash = "sha256:edadfbd4794b1086c0d822f81863e8a68fc129d132fd0bb9e31e955d7fbbbdb7", size = 6253168, upload-time = "2026-06-21T20:57:45.101Z" }, + { url = "https://files.pythonhosted.org/packages/2a/be/6c8d1118b5f13b2881dc095d5b345de19c6638b8959c17409b6eff84c8aa/numpy-2.5.0-cp314-cp314t-win_amd64.whl", hash = "sha256:f7e5fa4382967ae6548bd2f174219afb908e294b0d5f625af01166edd5f7d9aa", size = 12736286, upload-time = "2026-06-21T20:57:46.935Z" }, + { url = "https://files.pythonhosted.org/packages/fd/6a/d3a169aaf8536cf228d56a09e04bcb713a2fe4410d4e2105b9419b5a9c89/numpy-2.5.0-cp314-cp314t-win_arm64.whl", hash = "sha256:016623417bb330d719d579daf2d6b9a01ddc52e41a9ed61a47f39fde46dcd865", size = 10686451, upload-time = "2026-06-21T20:57:49.313Z" }, +] + +[[package]] +name = "opentelemetry-api" +version = "1.42.1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "typing-extensions" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/b4/1c/125e1c936c0873796771b7f04f6c93b9f1bf5d424cea90fda94a99f61da8/opentelemetry_api-1.42.1.tar.gz", hash = "sha256:56c63bea9f77b62856be8c47600474acad853b2924b99b1687c4cb6297166716", size = 72296, upload-time = "2026-05-21T16:32:49.335Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/a3/ca/9520cc1f3dfbbd03ac5903bbf55833e257bc64b1cf30fa8b0d6df374d821/opentelemetry_api-1.42.1-py3-none-any.whl", hash = "sha256:51a69edacadbc03a8950ace1c4c21099cacc538820ac2c9e36277e78cebba714", size = 61311, upload-time = "2026-05-21T16:32:28.822Z" }, +] + +[[package]] +name = "orjson" +version = "3.11.9" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/7e/0c/964746fcafbd16f8ff53219ad9f6b412b34f345c75f384ad434ceaadb538/orjson-3.11.9.tar.gz", hash = "sha256:4fef17e1f8722c11587a6ef18e35902450221da0028e65dbaaa543619e68e48f", size = 5599163, upload-time = "2026-05-06T15:11:08.309Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/1e/51/3fb9e65ae76ee97bd611869a503fa3fc0a6e81dd8b737cf3003f682df7ff/orjson-3.11.9-cp311-cp311-macosx_10_15_x86_64.macosx_11_0_arm64.macosx_10_15_universal2.whl", hash = "sha256:f01c4818b3fc9b0da8e096722a84318071eaa118df35f6ed2344da0e73a5444f", size = 228522, upload-time = "2026-05-06T15:09:35.362Z" }, + { url = "https://files.pythonhosted.org/packages/16/fa/9d54b07cb3f3b0bfd57841478e42d7a0ece4a9f49f9907eecf5a45461687/orjson-3.11.9-cp311-cp311-macosx_15_0_arm64.whl", hash = "sha256:3ebca4179031ee716ed076ffadc29428e900512f6fccee8614c9983157fcf19c", size = 128463, upload-time = "2026-05-06T15:09:37.063Z" }, + { url = "https://files.pythonhosted.org/packages/88/b1/6ceafc2eefd0a553e3be77ce6c49d107e772485d9568629376171c50e634/orjson-3.11.9-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:48ee05097750de0ff69ed5b7bbcf0732182fd57a24043dcc2a1da780a5ead3a5", size = 132306, upload-time = "2026-05-06T15:09:38.299Z" }, + { url = "https://files.pythonhosted.org/packages/ea/76/f11311285324a40aab1e3031385c50b635a7cd0734fdaf60c7e89a696f60/orjson-3.11.9-cp311-cp311-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:a6082706765a95a6680d812e1daf1c0cfe8adec7831b3ff3b625693f3b461b1c", size = 127988, upload-time = "2026-05-06T15:09:39.597Z" }, + { url = "https://files.pythonhosted.org/packages/9e/85/0ef63bcf1337f44031ce9b91b1919563f62a37527b3ea4368bb15a22e5d7/orjson-3.11.9-cp311-cp311-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:277fefe9d76ee17eb14debf399e3533d4d63b5f677a4d3719eb763536af1f4bd", size = 135188, upload-time = "2026-05-06T15:09:40.957Z" }, + { url = "https://files.pythonhosted.org/packages/05/94/b0d27090ea8a2095db3c2bd1b1c96f96f19bbb494d7fef33130e846e613d/orjson-3.11.9-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:03db380e3780fa0015ed776a90f20e8e20bb11dde13b216ce19e5718e3dfba62", size = 145937, upload-time = "2026-05-06T15:09:42.249Z" }, + { url = "https://files.pythonhosted.org/packages/09/eb/75d50c29c05b8054013e221e598820a365c8e64065312e75e202ed880709/orjson-3.11.9-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:33d7d766701847dc6729846362dc27895d2f2d2251264f9d10e7cb9878194877", size = 132758, upload-time = "2026-05-06T15:09:43.945Z" }, + { url = "https://files.pythonhosted.org/packages/49/bd/360686f39348aa88827cb6fbf7dc606fd41c831a35235e1abf1db8e3a9e6/orjson-3.11.9-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:147302878da387104b66bb4a8b0227d1d487e976ce41a8501916161072ed87b1", size = 133971, upload-time = "2026-05-06T15:09:45.239Z" }, + { url = "https://files.pythonhosted.org/packages/0e/30/3178eb16f3221aeef068b6f1f1ebe05f656ea5c6dffe9f6c917329fe17a3/orjson-3.11.9-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:3513550321f8c8c811a7c3297b8a630e82dc08e4c10216d07703c997776236cd", size = 141685, upload-time = "2026-05-06T15:09:46.858Z" }, + { url = "https://files.pythonhosted.org/packages/5f/f1/ff2f19ed0225f9680fafa42febca3570dd59444ebf190980738d376214c2/orjson-3.11.9-cp311-cp311-musllinux_1_2_armv7l.whl", hash = "sha256:c5d001196b89fa9cf0a4ab79766cd835b991a166e4b621ba95089edc50c429ff", size = 415167, upload-time = "2026-05-06T15:09:48.312Z" }, + { url = "https://files.pythonhosted.org/packages/9b/61/863bddf0da6e9e586765414debd54b4e58db05f560902b6d00658cb88636/orjson-3.11.9-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:16969c9d369c98eb084889c6e4d2d39b77c7eb38ceccf8da2a9fff62ae908980", size = 147913, upload-time = "2026-05-06T15:09:49.733Z" }, + { url = "https://files.pythonhosted.org/packages/b6/8a/4081492586d75b073d60c5271a8d0f05a0955cabf1e34c8473f6fcd84235/orjson-3.11.9-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:63e0efbc991250c0b3143488fa57d95affcabbfc63c99c48d625dd37779aafe2", size = 136959, upload-time = "2026-05-06T15:09:51.311Z" }, + { url = "https://files.pythonhosted.org/packages/0d/bd/70b6ab193594d7abb875320c0a7c8335e846f28968c432c31042409c3c8d/orjson-3.11.9-cp311-cp311-win32.whl", hash = "sha256:14ed654580c1ed2bc217352ec82f91b047aef82951aa71c7f64e0dcb03c0e180", size = 131533, upload-time = "2026-05-06T15:09:52.637Z" }, + { url = "https://files.pythonhosted.org/packages/3f/17/1a1a228183d62d1b77e2c30d210f47dd4768b310ebe1607c63e3c0e3a71e/orjson-3.11.9-cp311-cp311-win_amd64.whl", hash = "sha256:57ea77fb70a448ce87d18fca050193202a3da5e54598f6501ca5476fb66cfe02", size = 127106, upload-time = "2026-05-06T15:09:54.204Z" }, + { url = "https://files.pythonhosted.org/packages/b8/95/285de5fa296d09681ee9c546cd4a8aeb773b701cf343dc125994f4d52953/orjson-3.11.9-cp311-cp311-win_arm64.whl", hash = "sha256:19b72ed11572a2ee51a67a903afbe5af504f84ed6f529c0fe44b0ab3fb5cc697", size = 126848, upload-time = "2026-05-06T15:09:55.551Z" }, + { url = "https://files.pythonhosted.org/packages/16/6d/11867a3ffa3a3608d84a4de51ef4dd0896d6b5cc9132fbe1daf593e677bc/orjson-3.11.9-cp312-cp312-macosx_10_15_x86_64.macosx_11_0_arm64.macosx_10_15_universal2.whl", hash = "sha256:9ef6fe90aadef185c7b128859f40beb24720b4ecea95379fc9000931179c3a49", size = 228515, upload-time = "2026-05-06T15:09:57.265Z" }, + { url = "https://files.pythonhosted.org/packages/24/75/05912954c8b288f34fcf5cd4b9b071cb4f6e77b9961e175e56ebb258089f/orjson-3.11.9-cp312-cp312-macosx_15_0_arm64.whl", hash = "sha256:e5c9b8f28e726e97d97696c826bc7bea5d71cecd63576dba92924a32c1961291", size = 128409, upload-time = "2026-05-06T15:09:59.063Z" }, + { url = "https://files.pythonhosted.org/packages/ab/86/1c3a47df3bc8191ea9ac51603bbb872a95167a364320c269f2557911f406/orjson-3.11.9-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:26a473dbb4162108b27901492546f83c76fdcea3d0eadff00ae7a07e18dcce09", size = 132106, upload-time = "2026-05-06T15:10:00.798Z" }, + { url = "https://files.pythonhosted.org/packages/d7/cf/b33b5f3e695ae7d63feef9d915c37cc3b8f465493dcd4f8e0b4c697a2366/orjson-3.11.9-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:011382e2a60fda9d46f1cdee31068cfc52ffe952b587d683ec0463002802a0f4", size = 127864, upload-time = "2026-05-06T15:10:02.15Z" }, + { url = "https://files.pythonhosted.org/packages/31/6a/6cf69385a58208024fcb8c014e2141b8ce838aba6492b589f8acfff97fab/orjson-3.11.9-cp312-cp312-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c2d3dc759490128c5c1711a53eeaa8ee1d437fd0038ffd2b6008abf46db3f882", size = 135213, upload-time = "2026-05-06T15:10:03.515Z" }, + { url = "https://files.pythonhosted.org/packages/e8/f8/0b1bd3e8f2efcdd376af5c8cfd79eaf13f018080c0089c80ebd724e3c7fb/orjson-3.11.9-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:d8ea516b3726d190e1b4297e6f4e7a8650347ae053868a18163b4dd3641d1fff", size = 145994, upload-time = "2026-05-06T15:10:05.083Z" }, + { url = "https://files.pythonhosted.org/packages/f3/59/dab79f61044c529d2c81aecdc589b1f833a1c8dec11ba3b1c2498a02ca7e/orjson-3.11.9-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:380cdce7ba24989af81d0a7013d0aaec5d0e2a21734c0e2681b1bc4f141957fe", size = 132744, upload-time = "2026-05-06T15:10:06.853Z" }, + { url = "https://files.pythonhosted.org/packages/0e/a4/82b7a2fe5d8a67a59ed831b24d59a3d46ea7d207b66e1602d376541d94a6/orjson-3.11.9-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:be4fa4f0af7fa18951f7ab3fc2148e223af211bf03f59e1c6034ec3f97f21d61", size = 134014, upload-time = "2026-05-06T15:10:08.213Z" }, + { url = "https://files.pythonhosted.org/packages/50/c7/375e83a76851b73b2e39f3bcf0e5a19e2b89bad13e5bca97d0b293d27f24/orjson-3.11.9-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:a8f5f8bc7ce7d59f08d9f99fa510c06496164a24cb5f3d34537dbd9ca30132e2", size = 141509, upload-time = "2026-05-06T15:10:09.595Z" }, + { url = "https://files.pythonhosted.org/packages/7f/7c/49d5d82a3d3097f641f094f552131f1e2723b0b8cb0fa2874ab65ecfffa6/orjson-3.11.9-cp312-cp312-musllinux_1_2_armv7l.whl", hash = "sha256:4d7fde5501b944f83b3e665e1b31343ff6e154b15560a16b7130ea1e594a4206", size = 415127, upload-time = "2026-05-06T15:10:11.049Z" }, + { url = "https://files.pythonhosted.org/packages/3a/dc/7446c538590d55f455647e5f3c61fc33f7108714e7afcffa6a2a033f8350/orjson-3.11.9-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:cde1a448023ba7d5bb4c01c5afb48894380b5e4956e0627266526587ef4e535f", size = 148025, upload-time = "2026-05-06T15:10:12.842Z" }, + { url = "https://files.pythonhosted.org/packages/df/e5/4d2d8af06f788329b4f78f8cc3679bb395392fcaa1e4d8d3c33e85308fa4/orjson-3.11.9-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:71e63adb0e1f1ed5d9e168f50a91ceb93ae6420731d222dc7da5c69409aa47aa", size = 136943, upload-time = "2026-05-06T15:10:14.405Z" }, + { url = "https://files.pythonhosted.org/packages/06/69/850264ccf6d80f6b174620d30a87f65c9b1490aba33fe6b62798e618cad3/orjson-3.11.9-cp312-cp312-win32.whl", hash = "sha256:2d057a602cdd19a0ad680417527c45b6961a095081c0f46fe0e03e304aac6470", size = 131606, upload-time = "2026-05-06T15:10:15.791Z" }, + { url = "https://files.pythonhosted.org/packages/b9/d5/973a43fc9c55e20f2051e9830997649f669be0cb3ca52192087c0143f118/orjson-3.11.9-cp312-cp312-win_amd64.whl", hash = "sha256:59e403b1cc5a676da8eaf31f6254801b7341b3e29efa85f92b48d272637e77be", size = 127101, upload-time = "2026-05-06T15:10:17.129Z" }, + { url = "https://files.pythonhosted.org/packages/fe/ae/495470f0e4a18f73fa10b7f6b84b464ec4cc5291c4e0c7c2a6c400bef006/orjson-3.11.9-cp312-cp312-win_arm64.whl", hash = "sha256:9af678d6488357948f1f84c6cd1c1d397c014e1ae2f98ae082a44eb48f602624", size = 126736, upload-time = "2026-05-06T15:10:18.645Z" }, + { url = "https://files.pythonhosted.org/packages/32/33/93fcc25907235c344ae73122f8a4e01d2d393ef062b4af7d2e2487a32c37/orjson-3.11.9-cp313-cp313-macosx_10_15_x86_64.macosx_11_0_arm64.macosx_10_15_universal2.whl", hash = "sha256:4bab1b2d6141fe7b32ae71dac905666ece4f94936efbfb13d55bb7739a3a6021", size = 228458, upload-time = "2026-05-06T15:10:20.079Z" }, + { url = "https://files.pythonhosted.org/packages/8f/27/b1e6dadb3c080313c03fdd8067b85e6a0460c7d8d6a1c3984ef77b904e4d/orjson-3.11.9-cp313-cp313-macosx_15_0_arm64.whl", hash = "sha256:844417969855fc7a41be124aafe83dc424592a7f77cd4501900c67307122b92c", size = 128368, upload-time = "2026-05-06T15:10:21.549Z" }, + { url = "https://files.pythonhosted.org/packages/21/0f/c9ede0bf052f6b4051e64a7d4fa91b725cccf8321a6a786e86eb03519f00/orjson-3.11.9-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ffe02797b5e9f3a9d8292ddcd289b474ad13e81ad83cd1891a240811f1d2cb81", size = 132070, upload-time = "2026-05-06T15:10:23.371Z" }, + { url = "https://files.pythonhosted.org/packages/fd/26/d398e28048dc18205bbe812f2c88cb9b40313db2470778e25964796458fe/orjson-3.11.9-cp313-cp313-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:0e4eed3b200023042814d2fc8a5d2e880f13b52e1ed2485e83da4f3962f7dc1a", size = 127892, upload-time = "2026-05-06T15:10:24.714Z" }, + { url = "https://files.pythonhosted.org/packages/66/60/52b0054c4c700d5aa7fc5b7ca96917400d8f061307778578e67a10e25852/orjson-3.11.9-cp313-cp313-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:8aff7da9952a5ad1cef8e68017724d96c7b9a66e99e91d6252e1b133d67a7b10", size = 135217, upload-time = "2026-05-06T15:10:26.084Z" }, + { url = "https://files.pythonhosted.org/packages/d5/97/1e3dc2b2a28b7b2528f403d2fc1d79ec5f39af3bc143ab65d3ec26426385/orjson-3.11.9-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:4d4e98d6f3b8afed8bc8cd9718ec0cdf46661826beefb53fe8eafb37f2bf0362", size = 145980, upload-time = "2026-05-06T15:10:28.062Z" }, + { url = "https://files.pythonhosted.org/packages/fc/39/31fbfe7850f2de32dee7e7e5c09f26d403ab01e440ac96001c6b01ad3c99/orjson-3.11.9-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:3a81d52442a7c99b3662333235b3adf96a1715864658b35bb797212be7bddb97", size = 132738, upload-time = "2026-05-06T15:10:29.727Z" }, + { url = "https://files.pythonhosted.org/packages/a1/08/dca0082dd2a194acb93e5457e73455388e2e2ca464a2672449a9ddbb679d/orjson-3.11.9-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4e39364e726a8fff737309aff059ff67d8a8c8d5b677be7bb49a8b3e84b7e218", size = 134033, upload-time = "2026-05-06T15:10:31.152Z" }, + { url = "https://files.pythonhosted.org/packages/11/d4/5bdb0626801230139987385554c5d4c42255218ac906525bf4347f22cd95/orjson-3.11.9-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:4fd66214623f1b17501df9f0543bef0b833979ab5b6ded1e1d123222866aa8c9", size = 141492, upload-time = "2026-05-06T15:10:32.641Z" }, + { url = "https://files.pythonhosted.org/packages/fa/88/a21fb53b3ede6703aede6dce4710ed4111e5b201cfa6bbff5e544f9d47d7/orjson-3.11.9-cp313-cp313-musllinux_1_2_armv7l.whl", hash = "sha256:8ecc30f10465fa1e0ce13fd01d9e22c316e5053a719a8d915d4545a09a5ff677", size = 415087, upload-time = "2026-05-06T15:10:34.438Z" }, + { url = "https://files.pythonhosted.org/packages/3d/57/1b30daf70f0d8180e9a73cefbfbdd99e4bf19eb020466502b01fba7e0e50/orjson-3.11.9-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:97db4c94a7db398a5bd636273324f0b3fd58b350bbbac8bb380ceb825a9b40f4", size = 148031, upload-time = "2026-05-06T15:10:36.358Z" }, + { url = "https://files.pythonhosted.org/packages/04/83/45fbb6d962e260807f99441db9613cee868ceda4baceda59b3720a563f97/orjson-3.11.9-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:9f78cf8fec5bd627f4082b8dfeac7871b43d7f3274904492a43dab39f18a19a0", size = 136915, upload-time = "2026-05-06T15:10:38.013Z" }, + { url = "https://files.pythonhosted.org/packages/5f/cc/2d10025f9056d376e4127ec05a5808b218d46f035fdc08178a5411b34250/orjson-3.11.9-cp313-cp313-win32.whl", hash = "sha256:d4087e5c0209a0a8efe4de3303c234b9c44d1174161dcd851e8eea07c7560b32", size = 131613, upload-time = "2026-05-06T15:10:39.569Z" }, + { url = "https://files.pythonhosted.org/packages/67/bd/2775ff28bfe883b9aa1ff348300542eb2ef1ee18d8ae0e3a49846817a865/orjson-3.11.9-cp313-cp313-win_amd64.whl", hash = "sha256:051b102c93b4f634e89f3866b07b9a9a98915ada541f4ec30f177067b2694979", size = 127086, upload-time = "2026-05-06T15:10:41.262Z" }, + { url = "https://files.pythonhosted.org/packages/91/2b/d26799e580939e32a7da9a39531bc9e58e15ca32ffaa6a8cb3e9bb0d22cd/orjson-3.11.9-cp313-cp313-win_arm64.whl", hash = "sha256:cce9127885941bd28f080cecf1f1d288336b7e0d812c345b08be88b572796254", size = 126696, upload-time = "2026-05-06T15:10:42.651Z" }, + { url = "https://files.pythonhosted.org/packages/8e/eb/5da01e356015aee6ecfa1187ced87aef51364e306f5e695dd52719bf0e78/orjson-3.11.9-cp314-cp314-macosx_10_15_x86_64.macosx_11_0_arm64.macosx_10_15_universal2.whl", hash = "sha256:b6ef1979adc4bc243523f1a2ba91418030a8e29b0a99cbe7e0e2d6807d4dce6e", size = 228465, upload-time = "2026-05-06T15:10:44.097Z" }, + { url = "https://files.pythonhosted.org/packages/64/62/3e0e0c14c957133bcd855395c62b55ed4e3b0af23ffea11b032cb1dcbdb1/orjson-3.11.9-cp314-cp314-macosx_15_0_arm64.whl", hash = "sha256:f36b7f32c7c0db4a719f1fc5824db4a9c6f8bd1a354debb91faf26ebf3a4c71e", size = 128364, upload-time = "2026-05-06T15:10:45.839Z" }, + { url = "https://files.pythonhosted.org/packages/5a/5a/07d8aa117211a8ed7630bda80c8c0b14d04e0f8dcf99bcf49656e4a710eb/orjson-3.11.9-cp314-cp314-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:08f4d8ebb44925c794e535b2bebc507cebf32209df81de22ae285fb0d8d66de0", size = 132063, upload-time = "2026-05-06T15:10:47.267Z" }, + { url = "https://files.pythonhosted.org/packages/d6/ec/4acaf21483e18aa945be74a474c74b434f284b549f275a0a39b9f98956e9/orjson-3.11.9-cp314-cp314-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:6cc7923789694fd58f001cbcac7e47abc13af4d560ebbfcf3b41a8b1a0748124", size = 122356, upload-time = "2026-05-06T15:10:48.765Z" }, + { url = "https://files.pythonhosted.org/packages/13/d8/5f0555e7638801323b7a75850f92e7dfa891bc84fe27a1ba4449170d1200/orjson-3.11.9-cp314-cp314-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ea5c46eb2d3af39e806b986f4b09d5c2706a1f5afde3cbf7544ce6616127173c", size = 129592, upload-time = "2026-05-06T15:10:50.13Z" }, + { url = "https://files.pythonhosted.org/packages/b6/30/ed9860412a3603ceb3c5955bfd72d28b9d0e7ba6ed81add14f83d7114236/orjson-3.11.9-cp314-cp314-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:f5d89a2ed90731df3be64bab0aa44f78bff39fdc9d71c291f4a8023aa46425b7", size = 140491, upload-time = "2026-05-06T15:10:51.582Z" }, + { url = "https://files.pythonhosted.org/packages/d0/17/adc514dea7ac7c505527febf884934b815d34f0c7b8693c1a8b39c5c4a57/orjson-3.11.9-cp314-cp314-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:25e4aed0312d292c09f61af25bba34e0b2c88546041472b09088c39a4d828af1", size = 127309, upload-time = "2026-05-06T15:10:53.329Z" }, + { url = "https://files.pythonhosted.org/packages/76/3e/c0b690253f0b82d86e99949af13533363acfb5432ecb5d53dd5b3bce9c34/orjson-3.11.9-cp314-cp314-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:aaea64f3f467d22e70eeed68bdccb3bc4f83f650446c4a03c59f2cba28a108db", size = 134030, upload-time = "2026-05-06T15:10:54.988Z" }, + { url = "https://files.pythonhosted.org/packages/c1/7a/bc82a0bb25e9faaf92dc4d9ef002732efc09737706af83e346788641d4a7/orjson-3.11.9-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:a028425d1b440c5d92a6be1e1a020739dfe67ea87d96c6dbe828c1b30041728b", size = 141482, upload-time = "2026-05-06T15:10:56.663Z" }, + { url = "https://files.pythonhosted.org/packages/01/55/e69188b939f77d5d32a9833745ace31ea5ccae3ab613a1ec185d3cd2c4fb/orjson-3.11.9-cp314-cp314-musllinux_1_2_armv7l.whl", hash = "sha256:5b192c6cf397e4455b11523c5cf2b18ed084c1bbd61b6c0926344d2129481972", size = 415178, upload-time = "2026-05-06T15:10:58.446Z" }, + { url = "https://files.pythonhosted.org/packages/2e/1a/b8a5a7ac527e80b9cb11d51e3f6689b709279183264b9ec5c7bc680bb8b5/orjson-3.11.9-cp314-cp314-musllinux_1_2_i686.whl", hash = "sha256:ea407d4ccf5891d667d045fecae97a7a1e5e87b3b97f97ae1803c2e741130be0", size = 148089, upload-time = "2026-05-06T15:11:00.441Z" }, + { url = "https://files.pythonhosted.org/packages/97/4e/00503f64204bf859b37213a63927028f30fb6268cd8677fb0a5ad48155e1/orjson-3.11.9-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:5f63aaf97afd9f6dec5b1a68e1b8da12bfccb4cb9a9a65c3e0b6c847849e7586", size = 136921, upload-time = "2026-05-06T15:11:02.176Z" }, + { url = "https://files.pythonhosted.org/packages/0d/ba/a23b82a0a8d0ed7bed4e5f5035aae751cad4ff6a1e8d2ecd14d8860f5929/orjson-3.11.9-cp314-cp314-win32.whl", hash = "sha256:e30ab17845bb9fa54ccf67fa4f9f5282652d54faa6d17452f47d0f369d038673", size = 131638, upload-time = "2026-05-06T15:11:03.696Z" }, + { url = "https://files.pythonhosted.org/packages/f3/c3/0c6798456bade745c75c452342dabacce5798196483e77e643be1f53877d/orjson-3.11.9-cp314-cp314-win_amd64.whl", hash = "sha256:32ef5f4283a3be81913947d19608eacb7c6608026851123790cd9cc8982af34b", size = 127078, upload-time = "2026-05-06T15:11:05.123Z" }, + { url = "https://files.pythonhosted.org/packages/16/21/5a3f1e8913103b703a436a5664238e5b965ec392b555fe68943ea3691e6b/orjson-3.11.9-cp314-cp314-win_arm64.whl", hash = "sha256:eebdbdeef0094e4f5aefa20dcd4eb2368ab5e7a3b4edea27f1e7b2892e009cf9", size = 126687, upload-time = "2026-05-06T15:11:06.602Z" }, +] + +[[package]] +name = "overrides" +version = "7.7.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/36/86/b585f53236dec60aba864e050778b25045f857e17f6e5ea0ae95fe80edd2/overrides-7.7.0.tar.gz", hash = "sha256:55158fa3d93b98cc75299b1e67078ad9003ca27945c76162c1c0766d6f91820a", size = 22812, upload-time = "2024-01-27T21:01:33.423Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/2c/ab/fc8290c6a4c722e5514d80f62b2dc4c4df1a68a41d1364e625c35990fcf3/overrides-7.7.0-py3-none-any.whl", hash = "sha256:c7ed9d062f78b8e4c1a7b70bd8796b35ead4d9f510227ef9c5dc7626c60d7e49", size = 17832, upload-time = "2024-01-27T21:01:31.393Z" }, +] + +[[package]] +name = "packaging" +version = "26.2" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/d7/f1/e7a6dd94a8d4a5626c03e4e99c87f241ba9e350cd9e6d75123f992427270/packaging-26.2.tar.gz", hash = "sha256:ff452ff5a3e828ce110190feff1178bb1f2ea2281fa2075aadb987c2fb221661", size = 228134, upload-time = "2026-04-24T20:15:23.917Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/df/b2/87e62e8c3e2f4b32e5fe99e0b86d576da1312593b39f47d8ceef365e95ed/packaging-26.2-py3-none-any.whl", hash = "sha256:5fc45236b9446107ff2415ce77c807cee2862cb6fac22b8a73826d0693b0980e", size = 100195, upload-time = "2026-04-24T20:15:22.081Z" }, +] + +[[package]] +name = "palettable" +version = "3.3.3" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/dc/3d/a5854d60850485bff12f28abfe0e17f503e866763bed61aed4990b604530/palettable-3.3.3.tar.gz", hash = "sha256:094dd7d9a5fc1cca4854773e5c1fc6a315b33bd5b3a8f47064928facaf0490a8", size = 106639, upload-time = "2023-04-19T23:13:35.864Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/cf/f7/3367feadd4ab56783b0971c9b7edfbdd68e0c70ce877949a5dd2117ed4a0/palettable-3.3.3-py2.py3-none-any.whl", hash = "sha256:74e9e7d7fe5a9be065e02397558ed1777b2df0b793a6f4ce1a5ee74f74fb0caa", size = 332251, upload-time = "2023-04-19T23:13:33.996Z" }, +] + +[[package]] +name = "pandas" +version = "3.0.3" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "numpy", version = "2.4.6", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version < '3.12'" }, + { name = "numpy", version = "2.5.0", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version >= '3.12'" }, + { name = "python-dateutil" }, + { name = "tzdata", marker = "sys_platform == 'emscripten' or sys_platform == 'win32'" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/f8/87/4341c6252d1c47b08768c3d25ac487362bf403f0313ddae4a2a26c9b1b4c/pandas-3.0.3.tar.gz", hash = "sha256:696a4a00a2a2a35d4e5deb3fc946641b96c944f02230e4f76137fe35d806c4fc", size = 4651414, upload-time = "2026-05-11T18:54:29.21Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/42/16/b5c76b838fd9bf6ce84d3a53346b8874ec05c5f0040d75ef2c320100cd2a/pandas-3.0.3-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:455f6f8139d4282188f526868dbc3c828470e88a3d9d59a891bd46a455f21b98", size = 10338495, upload-time = "2026-05-11T18:52:11.558Z" }, + { url = "https://files.pythonhosted.org/packages/5a/b0/a4ffc4ae74d2d822200dcc46898987d8eb6032d1e2b219cae39da6f5cbcc/pandas-3.0.3-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:4e15135e2ee5df1063313e2425ceef8ac0f4ae775893815b0923651b806a5639", size = 9938250, upload-time = "2026-05-11T18:52:17.005Z" }, + { url = "https://files.pythonhosted.org/packages/2e/b2/3323601a52caee42c019e370090ca4544b241437240ca04f786cce82b0cf/pandas-3.0.3-cp311-cp311-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:05f1f1752b8533ea03f7f39a9c15b1a058d067bb48f4748948e7a8691e0510f2", size = 10770558, upload-time = "2026-05-11T18:52:19.865Z" }, + { url = "https://files.pythonhosted.org/packages/32/f1/bbecd2f867b97abebe0f9b53d750f862251b40337e061b36676ded3d920f/pandas-3.0.3-cp311-cp311-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:8a1e45c80cceb3b4a21bc5939d52e8cbd8d9b7305309219d59e9754d9ce09e27", size = 11274611, upload-time = "2026-05-11T18:52:22.622Z" }, + { url = "https://files.pythonhosted.org/packages/7f/4f/eafabf2d5fae5adf143b4d18d3706c5efdc368a7c4eb1ee8a3eddabbd0f6/pandas-3.0.3-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:14da8316da4d0c5a77618425996bfb1248ca87fc2c1486e6fde4652bd18b5824", size = 11784670, upload-time = "2026-05-11T18:52:25.4Z" }, + { url = "https://files.pythonhosted.org/packages/49/44/1eb20389301b57b19cc099a1c2f662501f72f08a65f912d05822613c1532/pandas-3.0.3-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:a55066a0505dae0ba2b50a46637db34b46f9094c65c5d4800794ef6335010938", size = 12353708, upload-time = "2026-05-11T18:52:28.139Z" }, + { url = "https://files.pythonhosted.org/packages/eb/62/c321f13b5ba1819fc8dca456c7fce578da2dcfecff1abbf0eaddf8406c0f/pandas-3.0.3-cp311-cp311-win_amd64.whl", hash = "sha256:6674ab18ad8c57802867264b00e15e7bb904700cdd9046e3b2fa1fce237439ea", size = 9907609, upload-time = "2026-05-11T18:52:30.982Z" }, + { url = "https://files.pythonhosted.org/packages/53/85/1b7f563ebc6357c27233a02a96b589bcce1fa9c6eb89fb4f0e56421d277e/pandas-3.0.3-cp311-cp311-win_arm64.whl", hash = "sha256:5cc09a68b3120e0f54870dede8287a7bb1fa463907e4fcec1ea77cab6179bf7a", size = 9165596, upload-time = "2026-05-11T18:52:33.334Z" }, + { url = "https://files.pythonhosted.org/packages/24/f1/392f8c5bfc16f66a0d2d41561c01627c228fe7ed2a0d056ef11315042570/pandas-3.0.3-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:fed2ff7fd9779120e388e285fc029bd5cf9490cdd2e4166a9ee22c0e49a9ab09", size = 10357846, upload-time = "2026-05-11T18:52:36.143Z" }, + { url = "https://files.pythonhosted.org/packages/cf/3d/b16412745651e855f357e5e66930248688378853a6e2698a214e331fba1f/pandas-3.0.3-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:b168fc218fd80a6cbdbdbc1a97ddc7889ed057d7eb45f50d866ceab5f39904c4", size = 9899550, upload-time = "2026-05-11T18:52:38.976Z" }, + { url = "https://files.pythonhosted.org/packages/31/a8/fa2535168fffcedf67f4f6de28d2dd903a747ca7c8ea6989451aaeb3a92f/pandas-3.0.3-cp312-cp312-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:0383c72c75cdcca61a9e116e611143902dbfd08bff356829c2f6d1cf40a9ca8c", size = 10412965, upload-time = "2026-05-11T18:52:41.915Z" }, + { url = "https://files.pythonhosted.org/packages/65/b6/09b01cdbc15224e2850365192d17b7bdebb8bdbd8780ed221fcdf0d9a515/pandas-3.0.3-cp312-cp312-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:6dc0b3fd2169c9157deed50b4d519553a3655c8c6a96027136d654592be973a9", size = 10894600, upload-time = "2026-05-11T18:52:45.02Z" }, + { url = "https://files.pythonhosted.org/packages/c9/a4/2eb28f2fccb4ced4a2c79ab2a5dee9ade1ebf44922ebad6fea158c9f95d4/pandas-3.0.3-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:7e65d5407dc0b394f509699650e4a2ec01c0514f21850f453fa60f3be79a5dbf", size = 11422824, upload-time = "2026-05-11T18:52:48.058Z" }, + { url = "https://files.pythonhosted.org/packages/f8/45/830bb57f533a4604b355e07edcb8ea18cf88b5f94e5fca92f27052d7c597/pandas-3.0.3-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:f8894dc474d648fe7b6ff0ca9b0bd73950d19952bc1a6534540762c5d79d305c", size = 11950889, upload-time = "2026-05-11T18:52:50.905Z" }, + { url = "https://files.pythonhosted.org/packages/b9/c5/fc1b368f303087d20e8c9bf3d6ceb186263cfac0ade735cd938538bea839/pandas-3.0.3-cp312-cp312-win_amd64.whl", hash = "sha256:c7be265b62cef88e253a941e4698604973736dcfe242fdb5198f0f7bc473cdcc", size = 9755463, upload-time = "2026-05-11T18:52:53.386Z" }, + { url = "https://files.pythonhosted.org/packages/86/bd/fda8f9705b1b09c6ebe14bfc0fa0e4ec8584d54ea673628f157ff55131af/pandas-3.0.3-cp312-cp312-win_arm64.whl", hash = "sha256:557409bc4178e70ee8d9ddb494798e51ebf6ea59330f6be22c51bab2a7db6c49", size = 9066158, upload-time = "2026-05-11T18:52:56.038Z" }, + { url = "https://files.pythonhosted.org/packages/c5/90/62d8302883c44308c477e222c3daf7c813a34c8e96985882fbd53d964352/pandas-3.0.3-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:67b3b64c11910cfa29f4e94a14d3bff9ee693b6fc76055e7cad549cee0aec5fa", size = 10331071, upload-time = "2026-05-11T18:52:58.838Z" }, + { url = "https://files.pythonhosted.org/packages/7f/ae/6a6493c783a101f165e4356953ba3c74d6f77f0042fa7d753da9dfbb640c/pandas-3.0.3-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:39436b377d56d2a2e52d0395bdbee171f01068e99af5250509aceeb929f765c7", size = 9875690, upload-time = "2026-05-11T18:53:01.431Z" }, + { url = "https://files.pythonhosted.org/packages/62/7c/5df8e9f56c69a2769fbe9382a5ef8f2658c007e376434e1e2cbb57ad895f/pandas-3.0.3-cp313-cp313-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:d4be06d68f9ddcfc645b87534911da79a8fbffc7573c80e0edcf42a5020624d8", size = 10381634, upload-time = "2026-05-11T18:53:04.393Z" }, + { url = "https://files.pythonhosted.org/packages/99/68/1237369725aa617bb358263d535803e3053fdbc593513ec5ed9c9896b5b6/pandas-3.0.3-cp313-cp313-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:a4eeb6830daf35a71cc09649bd823e2b542dac246cdee9614c6e4bd65028cd6a", size = 10891243, upload-time = "2026-05-11T18:53:07.643Z" }, + { url = "https://files.pythonhosted.org/packages/25/93/77d108e8af7222b4a503ebde0e30215b1c2e4f8e53a526431890f22d5586/pandas-3.0.3-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:1928e07221f82db493cd4af1e23c1bfca524a19a4699887975bff68f49a72bfb", size = 11388659, upload-time = "2026-05-11T18:53:10.634Z" }, + { url = "https://files.pythonhosted.org/packages/d0/bd/eff5b4399f332ac386c853f6cd2bd3fa2ca0061b9f36ecd9c4d7c4265649/pandas-3.0.3-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:51b1fe551acb77dac643c6fda86084d8d446c10fe64b06a9cc29c4cc8540e7f2", size = 11942880, upload-time = "2026-05-11T18:53:13.536Z" }, + { url = "https://files.pythonhosted.org/packages/2c/20/559ace4200982c3887d0b86bfd0d856a2143ef8ddab63cc07934951a964c/pandas-3.0.3-cp313-cp313-win_amd64.whl", hash = "sha256:a82d532a3351d435432cd913edbccaf8b8e01d4dd0e5ced5a8d2e8ecd94c7e44", size = 9757091, upload-time = "2026-05-11T18:53:16.306Z" }, + { url = "https://files.pythonhosted.org/packages/3a/66/69055a09fe200f29f922a3eeec4804611900b95f52d932ece3393c3c0c19/pandas-3.0.3-cp313-cp313-win_arm64.whl", hash = "sha256:275c14e0fce14a2ec20eee474aecd305478ea3c1e6f6a9d8fe219a165542717e", size = 9057282, upload-time = "2026-05-11T18:53:18.768Z" }, + { url = "https://files.pythonhosted.org/packages/57/0e/efe801b0e6811e8e650cd21b7f2608e30f08a7067e2bf6e8752b0d56ee3c/pandas-3.0.3-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:46997386d528eb40376ecd6b033cf4a8a1e5282580f68f43de875b78cba2199d", size = 10767016, upload-time = "2026-05-11T18:53:21.227Z" }, + { url = "https://files.pythonhosted.org/packages/ea/dc/eb55135a1d5f0f0519f28da1f609a206d2cad1f9c35c32d51e38dd7261ae/pandas-3.0.3-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:261e308dfb22448384b7580cf719d2f998fe2966c92893c3e77d14008af1f066", size = 10420210, upload-time = "2026-05-11T18:53:23.982Z" }, + { url = "https://files.pythonhosted.org/packages/c6/3e/b1d5d955ce33ffecb407465a60bc32769d74fcf68224b7ae67ae11d4dea4/pandas-3.0.3-cp313-cp313t-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:dd1a5d1def6a46002e964510bdc67c368aa0951df5d1d9f8365336f5a1f490cd", size = 10336126, upload-time = "2026-05-11T18:53:26.731Z" }, + { url = "https://files.pythonhosted.org/packages/f5/76/a01261711ab60a22d71b862f0de20e4c504bf80457270ad8cb42110f6abc/pandas-3.0.3-cp313-cp313t-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:d72828c20c6d6e83e1e22a6a3b47b326b71664112fa9705dcbccfd7a39b62085", size = 10728051, upload-time = "2026-05-11T18:53:29.125Z" }, + { url = "https://files.pythonhosted.org/packages/e9/21/ea191195e587b18cf682e97f433f81b2d0fbe341380e80a3e0d6e4403c8e/pandas-3.0.3-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:d26cbe1fcfc12e8fd900e2454163e466b2d3af84f7c75481df7683ffc073d870", size = 11350796, upload-time = "2026-05-11T18:53:32.056Z" }, + { url = "https://files.pythonhosted.org/packages/64/69/f0eaaf54939f0e8c6768fd06be9af2cef9b36048b96dfb9e1b2c685a807e/pandas-3.0.3-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:3e91cec1879ada0624fc3dc9953c5cbd60208e59c0db28f540c5d6d47502422f", size = 11799741, upload-time = "2026-05-11T18:53:34.985Z" }, + { url = "https://files.pythonhosted.org/packages/45/a4/865e0e510cae5fc2194de4db28be638952de942571ba9125934fd9c01d47/pandas-3.0.3-cp313-cp313t-win_amd64.whl", hash = "sha256:08d789b41f87e0905880e293cedf6197ce71fe67cc081358b1e148a491b9bd13", size = 10499958, upload-time = "2026-05-11T18:53:37.857Z" }, + { url = "https://files.pythonhosted.org/packages/86/54/effdcc3c0ff7a08037889200e148ebe94c16c4f653be078c7b3675955df1/pandas-3.0.3-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:3650109c0f22879df8bd6179ab9ee3d7f1d1d4e7e0094a3f0032d9f51e2e64ac", size = 10336065, upload-time = "2026-05-11T18:53:41.099Z" }, + { url = "https://files.pythonhosted.org/packages/68/10/bf2d6738d72748b961a3751ab89522d58c54efc36a8e1a12161216cd45cf/pandas-3.0.3-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:bab900348131a7db1f69a7309ef141fd5680f1487094193bcbbb61791573bf8f", size = 9926101, upload-time = "2026-05-11T18:53:43.515Z" }, + { url = "https://files.pythonhosted.org/packages/ae/e9/e35cf11c8a136e757b956f5f0efdcaa50aecde85ea055f1898dfc68262f3/pandas-3.0.3-cp314-cp314-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:ba7e08b9ac1d54569cd1e256e3668975ed624d6826f7b68df0342b012007bddb", size = 10457553, upload-time = "2026-05-11T18:53:46.394Z" }, + { url = "https://files.pythonhosted.org/packages/58/3b/1cdec6772bdbaf7b25dab360c59f03cadf05492dd724c6540af905389b07/pandas-3.0.3-cp314-cp314-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:9d71c63ae4ebdbf70209742096f1fc46a83a0613c99d4b23766cced9ff8cd62a", size = 10914065, upload-time = "2026-05-11T18:53:49.134Z" }, + { url = "https://files.pythonhosted.org/packages/c4/c2/1ef644445fcd72e3627bceec77e3560636f87ddce4ed841afe76b83b5bf9/pandas-3.0.3-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:e3a2ec42c98ffa2565a67e08e218d06d72576d758d90facb7c00805194d8f360", size = 11459188, upload-time = "2026-05-11T18:53:52.527Z" }, + { url = "https://files.pythonhosted.org/packages/7e/49/4d8d4f42cbc9c4adc7a1870f269c02cbd6cd40d059622c06fb298addcbad/pandas-3.0.3-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:335f62418ed562cfc3c49e9e196375c28b729dcef8543abf4f9438e381bf3c76", size = 11982966, upload-time = "2026-05-11T18:53:55.043Z" }, + { url = "https://files.pythonhosted.org/packages/38/55/792619469bab9882d8bbd5865d45a72f6478762d04a9af4bf0d08c503e95/pandas-3.0.3-cp314-cp314-win_amd64.whl", hash = "sha256:3c20a521bbb85902f79f7270c80a59e1b5452d96d170c034f207181870f97ac5", size = 9876755, upload-time = "2026-05-11T18:53:58.067Z" }, + { url = "https://files.pythonhosted.org/packages/2a/af/33c469653b0ba03b50c3a98192d4c07f0c75c66b263ceb097fce0ee97d31/pandas-3.0.3-cp314-cp314-win_arm64.whl", hash = "sha256:a2d2dff8a04f3917b55ab3910c32990f8ddf7eceba114947838cefa976a68977", size = 9198658, upload-time = "2026-05-11T18:54:00.733Z" }, + { url = "https://files.pythonhosted.org/packages/a2/fa/b8c257bd76b8bd060c3a9151c1fca05e9b9c5e3af5d0f549c0356f6d143d/pandas-3.0.3-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:0d589105b3c14645af1738ff279b2995102d8f7a03b0a66dc8d95550eb513e04", size = 10787242, upload-time = "2026-05-11T18:54:03.564Z" }, + { url = "https://files.pythonhosted.org/packages/54/eb/f19206ffb0bf1919002969aa448b4702c6594845156a6f8050674855aac3/pandas-3.0.3-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:13fc1e853d9e04743d11ba75a985ccbc2a317fe07d8af61e445a6fd24dacd6a6", size = 10436369, upload-time = "2026-05-11T18:54:06.311Z" }, + { url = "https://files.pythonhosted.org/packages/fd/24/c7c39fb4fe22b71a0c2d78bf0c585c600092d85f94f086d2b3b2f6ca27e2/pandas-3.0.3-cp314-cp314t-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:819959dab7bbd0049c15623fbac4e29a191b9528160a61fb1032242d8ced2d9c", size = 10358306, upload-time = "2026-05-11T18:54:09.085Z" }, + { url = "https://files.pythonhosted.org/packages/16/ec/dd2a9eb7fa1204df88c0864164e35b228ac581062ac612ba0a67fd812e4c/pandas-3.0.3-cp314-cp314t-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:60ae316d3fd75d1858d450d0db0103ea2be3e7d4a95ec2f064f7e2ae63f7b028", size = 10758394, upload-time = "2026-05-11T18:54:11.956Z" }, + { url = "https://files.pythonhosted.org/packages/95/6e/00c61ea8e85b4f6d8d35e11852a1a4998fc7fafc91c6a602d1cc9c972d64/pandas-3.0.3-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:bd3a518890b400d32f9023722dc9a9a5c969f00b415419a3c06c043f09bb5d7d", size = 11375717, upload-time = "2026-05-11T18:54:14.539Z" }, + { url = "https://files.pythonhosted.org/packages/31/89/8fc1c268969fac43688d65fd92e67df24bd128d53cb4d2eee534cd307399/pandas-3.0.3-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:9c39be2d709d01fa972a0cabc522389fceca4f3969332ba25a7d6c5802cf976a", size = 11828897, upload-time = "2026-05-11T18:54:17.146Z" }, + { url = "https://files.pythonhosted.org/packages/56/3b/e7d20dea247a3e6dc0bd8a6953854afbedc03951def4e7371e05e7263e25/pandas-3.0.3-cp314-cp314t-win_amd64.whl", hash = "sha256:4db8c527972a821cf5286b40ccc57642a39bc62e62022b42f99f8a67fca8c3a1", size = 10900855, upload-time = "2026-05-11T18:54:19.72Z" }, + { url = "https://files.pythonhosted.org/packages/0f/54/68a0978d1ef8502b8492099beaa6e7a0c1b32e3b5d4f677f5810cb08711c/pandas-3.0.3-cp314-cp314t-win_arm64.whl", hash = "sha256:b2c95f8bfc1ee412bf482605d7bfd30c12d1d26bd59fdd91efeef1d4718decb1", size = 9466464, upload-time = "2026-05-11T18:54:22.754Z" }, +] + +[[package]] +name = "pandocfilters" +version = "1.5.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/70/6f/3dd4940bbe001c06a65f88e36bad298bc7a0de5036115639926b0c5c0458/pandocfilters-1.5.1.tar.gz", hash = "sha256:002b4a555ee4ebc03f8b66307e287fa492e4a77b4ea14d3f934328297bb4939e", size = 8454, upload-time = "2024-01-18T20:08:13.726Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/ef/af/4fbc8cab944db5d21b7e2a5b8e9211a03a79852b1157e2c102fcc61ac440/pandocfilters-1.5.1-py2.py3-none-any.whl", hash = "sha256:93be382804a9cdb0a7267585f157e5d1731bbe5545a85b268d6f5fe6232de2bc", size = 8663, upload-time = "2024-01-18T20:08:11.28Z" }, +] + +[[package]] +name = "parso" +version = "0.8.7" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/30/4b/90c937815137d43ce71ba043cd3566221e9df6b9c805f24b5d138c9d40a7/parso-0.8.7.tar.gz", hash = "sha256:eaaac4c9fdd5e9e8852dc778d2d7405897ec510f2a298071453e5e3a07914bb1", size = 401824, upload-time = "2026-05-01T23:13:02.138Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/99/5d/8268b644392ee874ee82a635cd0df1773de230bde356c38de28e298392cc/parso-0.8.7-py2.py3-none-any.whl", hash = "sha256:a8926eb2a1b915486941fdbd31e86a4baf88fe8c210f25f2f35ecec5b574ca1c", size = 107025, upload-time = "2026-05-01T23:12:58.867Z" }, +] + +[[package]] +name = "pexpect" +version = "4.9.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "ptyprocess", marker = "sys_platform != 'win32'" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/42/92/cc564bf6381ff43ce1f4d06852fc19a2f11d180f23dc32d9588bee2f149d/pexpect-4.9.0.tar.gz", hash = "sha256:ee7d41123f3c9911050ea2c2dac107568dc43b2d3b0c7557a33212c398ead30f", size = 166450, upload-time = "2023-11-25T09:07:26.339Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/9e/c3/059298687310d527a58bb01f3b1965787ee3b40dce76752eda8b44e9a2c5/pexpect-4.9.0-py2.py3-none-any.whl", hash = "sha256:7236d1e080e4936be2dc3e326cec0af72acf9212a7e1d060210e70a47e253523", size = 63772, upload-time = "2023-11-25T06:56:14.81Z" }, +] + +[[package]] +name = "pillow" +version = "12.2.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/8c/21/c2bcdd5906101a30244eaffc1b6e6ce71a31bd0742a01eb89e660ebfac2d/pillow-12.2.0.tar.gz", hash = "sha256:a830b1a40919539d07806aa58e1b114df53ddd43213d9c8b75847eee6c0182b5", size = 46987819, upload-time = "2026-04-01T14:46:17.687Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/68/e1/748f5663efe6edcfc4e74b2b93edfb9b8b99b67f21a854c3ae416500a2d9/pillow-12.2.0-cp311-cp311-macosx_10_10_x86_64.whl", hash = "sha256:8be29e59487a79f173507c30ddf57e733a357f67881430449bb32614075a40ab", size = 5354347, upload-time = "2026-04-01T14:42:44.255Z" }, + { url = "https://files.pythonhosted.org/packages/47/a1/d5ff69e747374c33a3b53b9f98cca7889fce1fd03d79cdc4e1bccc6c5a87/pillow-12.2.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:71cde9a1e1551df7d34a25462fc60325e8a11a82cc2e2f54578e5e9a1e153d65", size = 4695873, upload-time = "2026-04-01T14:42:46.452Z" }, + { url = "https://files.pythonhosted.org/packages/df/21/e3fbdf54408a973c7f7f89a23b2cb97a7ef30c61ab4142af31eee6aebc88/pillow-12.2.0-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:f490f9368b6fc026f021db16d7ec2fbf7d89e2edb42e8ec09d2c60505f5729c7", size = 6280168, upload-time = "2026-04-01T14:42:49.228Z" }, + { url = "https://files.pythonhosted.org/packages/d3/f1/00b7278c7dd52b17ad4329153748f87b6756ec195ff786c2bdf12518337d/pillow-12.2.0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:8bd7903a5f2a4545f6fd5935c90058b89d30045568985a71c79f5fd6edf9b91e", size = 8088188, upload-time = "2026-04-01T14:42:51.735Z" }, + { url = "https://files.pythonhosted.org/packages/ad/cf/220a5994ef1b10e70e85748b75649d77d506499352be135a4989c957b701/pillow-12.2.0-cp311-cp311-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:3997232e10d2920a68d25191392e3a4487d8183039e1c74c2297f00ed1c50705", size = 6394401, upload-time = "2026-04-01T14:42:54.343Z" }, + { url = "https://files.pythonhosted.org/packages/e9/bd/e51a61b1054f09437acfbc2ff9106c30d1eb76bc1453d428399946781253/pillow-12.2.0-cp311-cp311-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:e74473c875d78b8e9d5da2a70f7099549f9eb37ded4e2f6a463e60125bccd176", size = 7079655, upload-time = "2026-04-01T14:42:56.954Z" }, + { url = "https://files.pythonhosted.org/packages/6b/3d/45132c57d5fb4b5744567c3817026480ac7fc3ce5d4c47902bc0e7f6f853/pillow-12.2.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:56a3f9c60a13133a98ecff6197af34d7824de9b7b38c3654861a725c970c197b", size = 6503105, upload-time = "2026-04-01T14:42:59.847Z" }, + { url = "https://files.pythonhosted.org/packages/7d/2e/9df2fc1e82097b1df3dce58dc43286aa01068e918c07574711fcc53e6fb4/pillow-12.2.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:90e6f81de50ad6b534cab6e5aef77ff6e37722b2f5d908686f4a5c9eba17a909", size = 7203402, upload-time = "2026-04-01T14:43:02.664Z" }, + { url = "https://files.pythonhosted.org/packages/bd/2e/2941e42858ebb67e50ae741473de81c2984e6eff7b397017623c676e2e8d/pillow-12.2.0-cp311-cp311-win32.whl", hash = "sha256:8c984051042858021a54926eb597d6ee3012393ce9c181814115df4c60b9a808", size = 6378149, upload-time = "2026-04-01T14:43:05.274Z" }, + { url = "https://files.pythonhosted.org/packages/69/42/836b6f3cd7f3e5fa10a1f1a5420447c17966044c8fbf589cc0452d5502db/pillow-12.2.0-cp311-cp311-win_amd64.whl", hash = "sha256:6e6b2a0c538fc200b38ff9eb6628228b77908c319a005815f2dde585a0664b60", size = 7082626, upload-time = "2026-04-01T14:43:08.557Z" }, + { url = "https://files.pythonhosted.org/packages/c2/88/549194b5d6f1f494b485e493edc6693c0a16f4ada488e5bd974ed1f42fad/pillow-12.2.0-cp311-cp311-win_arm64.whl", hash = "sha256:9a8a34cc89c67a65ea7437ce257cea81a9dad65b29805f3ecee8c8fe8ff25ffe", size = 2463531, upload-time = "2026-04-01T14:43:10.743Z" }, + { url = "https://files.pythonhosted.org/packages/58/be/7482c8a5ebebbc6470b3eb791812fff7d5e0216c2be3827b30b8bb6603ed/pillow-12.2.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:2d192a155bbcec180f8564f693e6fd9bccff5a7af9b32e2e4bf8c9c69dbad6b5", size = 5308279, upload-time = "2026-04-01T14:43:13.246Z" }, + { url = "https://files.pythonhosted.org/packages/d8/95/0a351b9289c2b5cbde0bacd4a83ebc44023e835490a727b2a3bd60ddc0f4/pillow-12.2.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:f3f40b3c5a968281fd507d519e444c35f0ff171237f4fdde090dd60699458421", size = 4695490, upload-time = "2026-04-01T14:43:15.584Z" }, + { url = "https://files.pythonhosted.org/packages/de/af/4e8e6869cbed569d43c416fad3dc4ecb944cb5d9492defaed89ddd6fe871/pillow-12.2.0-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:03e7e372d5240cc23e9f07deca4d775c0817bffc641b01e9c3af208dbd300987", size = 6284462, upload-time = "2026-04-01T14:43:18.268Z" }, + { url = "https://files.pythonhosted.org/packages/e9/9e/c05e19657fd57841e476be1ab46c4d501bffbadbafdc31a6d665f8b737b6/pillow-12.2.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:b86024e52a1b269467a802258c25521e6d742349d760728092e1bc2d135b4d76", size = 8094744, upload-time = "2026-04-01T14:43:20.716Z" }, + { url = "https://files.pythonhosted.org/packages/2b/54/1789c455ed10176066b6e7e6da1b01e50e36f94ba584dc68d9eebfe9156d/pillow-12.2.0-cp312-cp312-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:7371b48c4fa448d20d2714c9a1f775a81155050d383333e0a6c15b1123dda005", size = 6398371, upload-time = "2026-04-01T14:43:23.443Z" }, + { url = "https://files.pythonhosted.org/packages/43/e3/fdc657359e919462369869f1c9f0e973f353f9a9ee295a39b1fea8ee1a77/pillow-12.2.0-cp312-cp312-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:62f5409336adb0663b7caa0da5c7d9e7bdbaae9ce761d34669420c2a801b2780", size = 7087215, upload-time = "2026-04-01T14:43:26.758Z" }, + { url = "https://files.pythonhosted.org/packages/8b/f8/2f6825e441d5b1959d2ca5adec984210f1ec086435b0ed5f52c19b3b8a6e/pillow-12.2.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:01afa7cf67f74f09523699b4e88c73fb55c13346d212a59a2db1f86b0a63e8c5", size = 6509783, upload-time = "2026-04-01T14:43:29.56Z" }, + { url = "https://files.pythonhosted.org/packages/67/f9/029a27095ad20f854f9dba026b3ea6428548316e057e6fc3545409e86651/pillow-12.2.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:fc3d34d4a8fbec3e88a79b92e5465e0f9b842b628675850d860b8bd300b159f5", size = 7212112, upload-time = "2026-04-01T14:43:32.091Z" }, + { url = "https://files.pythonhosted.org/packages/be/42/025cfe05d1be22dbfdb4f264fe9de1ccda83f66e4fc3aac94748e784af04/pillow-12.2.0-cp312-cp312-win32.whl", hash = "sha256:58f62cc0f00fd29e64b29f4fd923ffdb3859c9f9e6105bfc37ba1d08994e8940", size = 6378489, upload-time = "2026-04-01T14:43:34.601Z" }, + { url = "https://files.pythonhosted.org/packages/5d/7b/25a221d2c761c6a8ae21bfa3874988ff2583e19cf8a27bf2fee358df7942/pillow-12.2.0-cp312-cp312-win_amd64.whl", hash = "sha256:7f84204dee22a783350679a0333981df803dac21a0190d706a50475e361c93f5", size = 7084129, upload-time = "2026-04-01T14:43:37.213Z" }, + { url = "https://files.pythonhosted.org/packages/10/e1/542a474affab20fd4a0f1836cb234e8493519da6b76899e30bcc5d990b8b/pillow-12.2.0-cp312-cp312-win_arm64.whl", hash = "sha256:af73337013e0b3b46f175e79492d96845b16126ddf79c438d7ea7ff27783a414", size = 2463612, upload-time = "2026-04-01T14:43:39.421Z" }, + { url = "https://files.pythonhosted.org/packages/4a/01/53d10cf0dbad820a8db274d259a37ba50b88b24768ddccec07355382d5ad/pillow-12.2.0-cp313-cp313-ios_13_0_arm64_iphoneos.whl", hash = "sha256:8297651f5b5679c19968abefd6bb84d95fe30ef712eb1b2d9b2d31ca61267f4c", size = 4100837, upload-time = "2026-04-01T14:43:41.506Z" }, + { url = "https://files.pythonhosted.org/packages/0f/98/f3a6657ecb698c937f6c76ee564882945f29b79bad496abcba0e84659ec5/pillow-12.2.0-cp313-cp313-ios_13_0_arm64_iphonesimulator.whl", hash = "sha256:50d8520da2a6ce0af445fa6d648c4273c3eeefbc32d7ce049f22e8b5c3daecc2", size = 4176528, upload-time = "2026-04-01T14:43:43.773Z" }, + { url = "https://files.pythonhosted.org/packages/69/bc/8986948f05e3ea490b8442ea1c1d4d990b24a7e43d8a51b2c7d8b1dced36/pillow-12.2.0-cp313-cp313-ios_13_0_x86_64_iphonesimulator.whl", hash = "sha256:766cef22385fa1091258ad7e6216792b156dc16d8d3fa607e7545b2b72061f1c", size = 3640401, upload-time = "2026-04-01T14:43:45.87Z" }, + { url = "https://files.pythonhosted.org/packages/34/46/6c717baadcd62bc8ed51d238d521ab651eaa74838291bda1f86fe1f864c9/pillow-12.2.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:5d2fd0fa6b5d9d1de415060363433f28da8b1526c1c129020435e186794b3795", size = 5308094, upload-time = "2026-04-01T14:43:48.438Z" }, + { url = "https://files.pythonhosted.org/packages/71/43/905a14a8b17fdb1ccb58d282454490662d2cb89a6bfec26af6d3520da5ec/pillow-12.2.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:56b25336f502b6ed02e889f4ece894a72612fe885889a6e8c4c80239ff6e5f5f", size = 4695402, upload-time = "2026-04-01T14:43:51.292Z" }, + { url = "https://files.pythonhosted.org/packages/73/dd/42107efcb777b16fa0393317eac58f5b5cf30e8392e266e76e51cff28c3d/pillow-12.2.0-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:f1c943e96e85df3d3478f7b691f229887e143f81fedab9b20205349ab04d73ed", size = 6280005, upload-time = "2026-04-01T14:43:54.242Z" }, + { url = "https://files.pythonhosted.org/packages/a8/68/b93e09e5e8549019e61acf49f65b1a8530765a7f812c77a7461bca7e4494/pillow-12.2.0-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:03f6fab9219220f041c74aeaa2939ff0062bd5c364ba9ce037197f4c6d498cd9", size = 8090669, upload-time = "2026-04-01T14:43:57.335Z" }, + { url = "https://files.pythonhosted.org/packages/4b/6e/3ccb54ce8ec4ddd1accd2d89004308b7b0b21c4ac3d20fa70af4760a4330/pillow-12.2.0-cp313-cp313-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:5cdfebd752ec52bf5bb4e35d9c64b40826bc5b40a13df7c3cda20a2c03a0f5ed", size = 6395194, upload-time = "2026-04-01T14:43:59.864Z" }, + { url = "https://files.pythonhosted.org/packages/67/ee/21d4e8536afd1a328f01b359b4d3997b291ffd35a237c877b331c1c3b71c/pillow-12.2.0-cp313-cp313-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:eedf4b74eda2b5a4b2b2fb4c006d6295df3bf29e459e198c90ea48e130dc75c3", size = 7082423, upload-time = "2026-04-01T14:44:02.74Z" }, + { url = "https://files.pythonhosted.org/packages/78/5f/e9f86ab0146464e8c133fe85df987ed9e77e08b29d8d35f9f9f4d6f917ba/pillow-12.2.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:00a2865911330191c0b818c59103b58a5e697cae67042366970a6b6f1b20b7f9", size = 6505667, upload-time = "2026-04-01T14:44:05.381Z" }, + { url = "https://files.pythonhosted.org/packages/ed/1e/409007f56a2fdce61584fd3acbc2bbc259857d555196cedcadc68c015c82/pillow-12.2.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:1e1757442ed87f4912397c6d35a0db6a7b52592156014706f17658ff58bbf795", size = 7208580, upload-time = "2026-04-01T14:44:08.39Z" }, + { url = "https://files.pythonhosted.org/packages/23/c4/7349421080b12fb35414607b8871e9534546c128a11965fd4a7002ccfbee/pillow-12.2.0-cp313-cp313-win32.whl", hash = "sha256:144748b3af2d1b358d41286056d0003f47cb339b8c43a9ea42f5fea4d8c66b6e", size = 6375896, upload-time = "2026-04-01T14:44:11.197Z" }, + { url = "https://files.pythonhosted.org/packages/3f/82/8a3739a5e470b3c6cbb1d21d315800d8e16bff503d1f16b03a4ec3212786/pillow-12.2.0-cp313-cp313-win_amd64.whl", hash = "sha256:390ede346628ccc626e5730107cde16c42d3836b89662a115a921f28440e6a3b", size = 7081266, upload-time = "2026-04-01T14:44:13.947Z" }, + { url = "https://files.pythonhosted.org/packages/c3/25/f968f618a062574294592f668218f8af564830ccebdd1fa6200f598e65c5/pillow-12.2.0-cp313-cp313-win_arm64.whl", hash = "sha256:8023abc91fba39036dbce14a7d6535632f99c0b857807cbbbf21ecc9f4717f06", size = 2463508, upload-time = "2026-04-01T14:44:16.312Z" }, + { url = "https://files.pythonhosted.org/packages/4d/a4/b342930964e3cb4dce5038ae34b0eab4653334995336cd486c5a8c25a00c/pillow-12.2.0-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:042db20a421b9bafecc4b84a8b6e444686bd9d836c7fd24542db3e7df7baad9b", size = 5309927, upload-time = "2026-04-01T14:44:18.89Z" }, + { url = "https://files.pythonhosted.org/packages/9f/de/23198e0a65a9cf06123f5435a5d95cea62a635697f8f03d134d3f3a96151/pillow-12.2.0-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:dd025009355c926a84a612fecf58bb315a3f6814b17ead51a8e48d3823d9087f", size = 4698624, upload-time = "2026-04-01T14:44:21.115Z" }, + { url = "https://files.pythonhosted.org/packages/01/a6/1265e977f17d93ea37aa28aa81bad4fa597933879fac2520d24e021c8da3/pillow-12.2.0-cp313-cp313t-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:88ddbc66737e277852913bd1e07c150cc7bb124539f94c4e2df5344494e0a612", size = 6321252, upload-time = "2026-04-01T14:44:23.663Z" }, + { url = "https://files.pythonhosted.org/packages/3c/83/5982eb4a285967baa70340320be9f88e57665a387e3a53a7f0db8231a0cd/pillow-12.2.0-cp313-cp313t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:d362d1878f00c142b7e1a16e6e5e780f02be8195123f164edf7eddd911eefe7c", size = 8126550, upload-time = "2026-04-01T14:44:26.772Z" }, + { url = "https://files.pythonhosted.org/packages/4e/48/6ffc514adce69f6050d0753b1a18fd920fce8cac87620d5a31231b04bfc5/pillow-12.2.0-cp313-cp313t-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:2c727a6d53cb0018aadd8018c2b938376af27914a68a492f59dfcaca650d5eea", size = 6433114, upload-time = "2026-04-01T14:44:29.615Z" }, + { url = "https://files.pythonhosted.org/packages/36/a3/f9a77144231fb8d40ee27107b4463e205fa4677e2ca2548e14da5cf18dce/pillow-12.2.0-cp313-cp313t-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:efd8c21c98c5cc60653bcb311bef2ce0401642b7ce9d09e03a7da87c878289d4", size = 7115667, upload-time = "2026-04-01T14:44:32.773Z" }, + { url = "https://files.pythonhosted.org/packages/c1/fc/ac4ee3041e7d5a565e1c4fd72a113f03b6394cc72ab7089d27608f8aaccb/pillow-12.2.0-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:9f08483a632889536b8139663db60f6724bfcb443c96f1b18855860d7d5c0fd4", size = 6538966, upload-time = "2026-04-01T14:44:35.252Z" }, + { url = "https://files.pythonhosted.org/packages/c0/a8/27fb307055087f3668f6d0a8ccb636e7431d56ed0750e07a60547b1e083e/pillow-12.2.0-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:dac8d77255a37e81a2efcbd1fc05f1c15ee82200e6c240d7e127e25e365c39ea", size = 7238241, upload-time = "2026-04-01T14:44:37.875Z" }, + { url = "https://files.pythonhosted.org/packages/ad/4b/926ab182c07fccae9fcb120043464e1ff1564775ec8864f21a0ebce6ac25/pillow-12.2.0-cp313-cp313t-win32.whl", hash = "sha256:ee3120ae9dff32f121610bb08e4313be87e03efeadfc6c0d18f89127e24d0c24", size = 6379592, upload-time = "2026-04-01T14:44:40.336Z" }, + { url = "https://files.pythonhosted.org/packages/c2/c4/f9e476451a098181b30050cc4c9a3556b64c02cf6497ea421ac047e89e4b/pillow-12.2.0-cp313-cp313t-win_amd64.whl", hash = "sha256:325ca0528c6788d2a6c3d40e3568639398137346c3d6e66bb61db96b96511c98", size = 7085542, upload-time = "2026-04-01T14:44:43.251Z" }, + { url = "https://files.pythonhosted.org/packages/00/a4/285f12aeacbe2d6dc36c407dfbbe9e96d4a80b0fb710a337f6d2ad978c75/pillow-12.2.0-cp313-cp313t-win_arm64.whl", hash = "sha256:2e5a76d03a6c6dcef67edabda7a52494afa4035021a79c8558e14af25313d453", size = 2465765, upload-time = "2026-04-01T14:44:45.996Z" }, + { url = "https://files.pythonhosted.org/packages/bf/98/4595daa2365416a86cb0d495248a393dfc84e96d62ad080c8546256cb9c0/pillow-12.2.0-cp314-cp314-ios_13_0_arm64_iphoneos.whl", hash = "sha256:3adc9215e8be0448ed6e814966ecf3d9952f0ea40eb14e89a102b87f450660d8", size = 4100848, upload-time = "2026-04-01T14:44:48.48Z" }, + { url = "https://files.pythonhosted.org/packages/0b/79/40184d464cf89f6663e18dfcf7ca21aae2491fff1a16127681bf1fa9b8cf/pillow-12.2.0-cp314-cp314-ios_13_0_arm64_iphonesimulator.whl", hash = "sha256:6a9adfc6d24b10f89588096364cc726174118c62130c817c2837c60cf08a392b", size = 4176515, upload-time = "2026-04-01T14:44:51.353Z" }, + { url = "https://files.pythonhosted.org/packages/b0/63/703f86fd4c422a9cf722833670f4f71418fb116b2853ff7da722ea43f184/pillow-12.2.0-cp314-cp314-ios_13_0_x86_64_iphonesimulator.whl", hash = "sha256:6a6e67ea2e6feda684ed370f9a1c52e7a243631c025ba42149a2cc5934dec295", size = 3640159, upload-time = "2026-04-01T14:44:53.588Z" }, + { url = "https://files.pythonhosted.org/packages/71/e0/fb22f797187d0be2270f83500aab851536101b254bfa1eae10795709d283/pillow-12.2.0-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:2bb4a8d594eacdfc59d9e5ad972aa8afdd48d584ffd5f13a937a664c3e7db0ed", size = 5312185, upload-time = "2026-04-01T14:44:56.039Z" }, + { url = "https://files.pythonhosted.org/packages/ba/8c/1a9e46228571de18f8e28f16fabdfc20212a5d019f3e3303452b3f0a580d/pillow-12.2.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:80b2da48193b2f33ed0c32c38140f9d3186583ce7d516526d462645fd98660ae", size = 4695386, upload-time = "2026-04-01T14:44:58.663Z" }, + { url = "https://files.pythonhosted.org/packages/70/62/98f6b7f0c88b9addd0e87c217ded307b36be024d4ff8869a812b241d1345/pillow-12.2.0-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:22db17c68434de69d8ecfc2fe821569195c0c373b25cccb9cbdacf2c6e53c601", size = 6280384, upload-time = "2026-04-01T14:45:01.5Z" }, + { url = "https://files.pythonhosted.org/packages/5e/03/688747d2e91cfbe0e64f316cd2e8005698f76ada3130d0194664174fa5de/pillow-12.2.0-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:7b14cc0106cd9aecda615dd6903840a058b4700fcb817687d0ee4fc8b6e389be", size = 8091599, upload-time = "2026-04-01T14:45:04.5Z" }, + { url = "https://files.pythonhosted.org/packages/f6/35/577e22b936fcdd66537329b33af0b4ccfefaeabd8aec04b266528cddb33c/pillow-12.2.0-cp314-cp314-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:8cbeb542b2ebc6fcdacabf8aca8c1a97c9b3ad3927d46b8723f9d4f033288a0f", size = 6396021, upload-time = "2026-04-01T14:45:07.117Z" }, + { url = "https://files.pythonhosted.org/packages/11/8d/d2532ad2a603ca2b93ad9f5135732124e57811d0168155852f37fbce2458/pillow-12.2.0-cp314-cp314-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:4bfd07bc812fbd20395212969e41931001fd59eb55a60658b0e5710872e95286", size = 7083360, upload-time = "2026-04-01T14:45:09.763Z" }, + { url = "https://files.pythonhosted.org/packages/5e/26/d325f9f56c7e039034897e7380e9cc202b1e368bfd04d4cbe6a441f02885/pillow-12.2.0-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:9aba9a17b623ef750a4d11b742cbafffeb48a869821252b30ee21b5e91392c50", size = 6507628, upload-time = "2026-04-01T14:45:12.378Z" }, + { url = "https://files.pythonhosted.org/packages/5f/f7/769d5632ffb0988f1c5e7660b3e731e30f7f8ec4318e94d0a5d674eb65a4/pillow-12.2.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:deede7c263feb25dba4e82ea23058a235dcc2fe1f6021025dc71f2b618e26104", size = 7209321, upload-time = "2026-04-01T14:45:15.122Z" }, + { url = "https://files.pythonhosted.org/packages/6a/7a/c253e3c645cd47f1aceea6a8bacdba9991bf45bb7dfe927f7c893e89c93c/pillow-12.2.0-cp314-cp314-win32.whl", hash = "sha256:632ff19b2778e43162304d50da0181ce24ac5bb8180122cbe1bf4673428328c7", size = 6479723, upload-time = "2026-04-01T14:45:17.797Z" }, + { url = "https://files.pythonhosted.org/packages/cd/8b/601e6566b957ca50e28725cb6c355c59c2c8609751efbecd980db44e0349/pillow-12.2.0-cp314-cp314-win_amd64.whl", hash = "sha256:4e6c62e9d237e9b65fac06857d511e90d8461a32adcc1b9065ea0c0fa3a28150", size = 7217400, upload-time = "2026-04-01T14:45:20.529Z" }, + { url = "https://files.pythonhosted.org/packages/d6/94/220e46c73065c3e2951bb91c11a1fb636c8c9ad427ac3ce7d7f3359b9b2f/pillow-12.2.0-cp314-cp314-win_arm64.whl", hash = "sha256:b1c1fbd8a5a1af3412a0810d060a78b5136ec0836c8a4ef9aa11807f2a22f4e1", size = 2554835, upload-time = "2026-04-01T14:45:23.162Z" }, + { url = "https://files.pythonhosted.org/packages/b6/ab/1b426a3974cb0e7da5c29ccff4807871d48110933a57207b5a676cccc155/pillow-12.2.0-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:57850958fe9c751670e49b2cecf6294acc99e562531f4bd317fa5ddee2068463", size = 5314225, upload-time = "2026-04-01T14:45:25.637Z" }, + { url = "https://files.pythonhosted.org/packages/19/1e/dce46f371be2438eecfee2a1960ee2a243bbe5e961890146d2dee1ff0f12/pillow-12.2.0-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:d5d38f1411c0ed9f97bcb49b7bd59b6b7c314e0e27420e34d99d844b9ce3b6f3", size = 4698541, upload-time = "2026-04-01T14:45:28.355Z" }, + { url = "https://files.pythonhosted.org/packages/55/c3/7fbecf70adb3a0c33b77a300dc52e424dc22ad8cdc06557a2e49523b703d/pillow-12.2.0-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:5c0a9f29ca8e79f09de89293f82fc9b0270bb4af1d58bc98f540cc4aedf03166", size = 6322251, upload-time = "2026-04-01T14:45:30.924Z" }, + { url = "https://files.pythonhosted.org/packages/1c/3c/7fbc17cfb7e4fe0ef1642e0abc17fc6c94c9f7a16be41498e12e2ba60408/pillow-12.2.0-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:1610dd6c61621ae1cf811bef44d77e149ce3f7b95afe66a4512f8c59f25d9ebe", size = 8127807, upload-time = "2026-04-01T14:45:33.908Z" }, + { url = "https://files.pythonhosted.org/packages/ff/c3/a8ae14d6defd2e448493ff512fae903b1e9bd40b72efb6ec55ce0048c8ce/pillow-12.2.0-cp314-cp314t-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:0a34329707af4f73cf1782a36cd2289c0368880654a2c11f027bcee9052d35dd", size = 6433935, upload-time = "2026-04-01T14:45:36.623Z" }, + { url = "https://files.pythonhosted.org/packages/6e/32/2880fb3a074847ac159d8f902cb43278a61e85f681661e7419e6596803ed/pillow-12.2.0-cp314-cp314t-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:8e9c4f5b3c546fa3458a29ab22646c1c6c787ea8f5ef51300e5a60300736905e", size = 7116720, upload-time = "2026-04-01T14:45:39.258Z" }, + { url = "https://files.pythonhosted.org/packages/46/87/495cc9c30e0129501643f24d320076f4cc54f718341df18cc70ec94c44e1/pillow-12.2.0-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:fb043ee2f06b41473269765c2feae53fc2e2fbf96e5e22ca94fb5ad677856f06", size = 6540498, upload-time = "2026-04-01T14:45:41.879Z" }, + { url = "https://files.pythonhosted.org/packages/18/53/773f5edca692009d883a72211b60fdaf8871cbef075eaa9d577f0a2f989e/pillow-12.2.0-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:f278f034eb75b4e8a13a54a876cc4a5ab39173d2cdd93a638e1b467fc545ac43", size = 7239413, upload-time = "2026-04-01T14:45:44.705Z" }, + { url = "https://files.pythonhosted.org/packages/c9/e4/4b64a97d71b2a83158134abbb2f5bd3f8a2ea691361282f010998f339ec7/pillow-12.2.0-cp314-cp314t-win32.whl", hash = "sha256:6bb77b2dcb06b20f9f4b4a8454caa581cd4dd0643a08bacf821216a16d9c8354", size = 6482084, upload-time = "2026-04-01T14:45:47.568Z" }, + { url = "https://files.pythonhosted.org/packages/ba/13/306d275efd3a3453f72114b7431c877d10b1154014c1ebbedd067770d629/pillow-12.2.0-cp314-cp314t-win_amd64.whl", hash = "sha256:6562ace0d3fb5f20ed7290f1f929cae41b25ae29528f2af1722966a0a02e2aa1", size = 7225152, upload-time = "2026-04-01T14:45:50.032Z" }, + { url = "https://files.pythonhosted.org/packages/ff/6e/cf826fae916b8658848d7b9f38d88da6396895c676e8086fc0988073aaf8/pillow-12.2.0-cp314-cp314t-win_arm64.whl", hash = "sha256:aa88ccfe4e32d362816319ed727a004423aab09c5cea43c01a4b435643fa34eb", size = 2556579, upload-time = "2026-04-01T14:45:52.529Z" }, + { url = "https://files.pythonhosted.org/packages/4e/b7/2437044fb910f499610356d1352e3423753c98e34f915252aafecc64889f/pillow-12.2.0-pp311-pypy311_pp73-macosx_10_15_x86_64.whl", hash = "sha256:0538bd5e05efec03ae613fd89c4ce0368ecd2ba239cc25b9f9be7ed426b0af1f", size = 5273969, upload-time = "2026-04-01T14:45:55.538Z" }, + { url = "https://files.pythonhosted.org/packages/f6/f4/8316e31de11b780f4ac08ef3654a75555e624a98db1056ecb2122d008d5a/pillow-12.2.0-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:394167b21da716608eac917c60aa9b969421b5dcbbe02ae7f013e7b85811c69d", size = 4659674, upload-time = "2026-04-01T14:45:58.093Z" }, + { url = "https://files.pythonhosted.org/packages/d4/37/664fca7201f8bb2aa1d20e2c3d5564a62e6ae5111741966c8319ca802361/pillow-12.2.0-pp311-pypy311_pp73-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:5d04bfa02cc2d23b497d1e90a0f927070043f6cbf303e738300532379a4b4e0f", size = 5288479, upload-time = "2026-04-01T14:46:01.141Z" }, + { url = "https://files.pythonhosted.org/packages/49/62/5b0ed78fce87346be7a5cfcfaaad91f6a1f98c26f86bdbafa2066c647ef6/pillow-12.2.0-pp311-pypy311_pp73-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:0c838a5125cee37e68edec915651521191cef1e6aa336b855f495766e77a366e", size = 7032230, upload-time = "2026-04-01T14:46:03.874Z" }, + { url = "https://files.pythonhosted.org/packages/c3/28/ec0fc38107fc32536908034e990c47914c57cd7c5a3ece4d8d8f7ffd7e27/pillow-12.2.0-pp311-pypy311_pp73-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:4a6c9fa44005fa37a91ebfc95d081e8079757d2e904b27103f4f5fa6f0bf78c0", size = 5355404, upload-time = "2026-04-01T14:46:06.33Z" }, + { url = "https://files.pythonhosted.org/packages/5e/8b/51b0eddcfa2180d60e41f06bd6d0a62202b20b59c68f5a132e615b75aecf/pillow-12.2.0-pp311-pypy311_pp73-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:25373b66e0dd5905ed63fa3cae13c82fbddf3079f2c8bf15c6fb6a35586324c1", size = 6002215, upload-time = "2026-04-01T14:46:08.83Z" }, + { url = "https://files.pythonhosted.org/packages/bc/60/5382c03e1970de634027cee8e1b7d39776b778b81812aaf45b694dfe9e28/pillow-12.2.0-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:bfa9c230d2fe991bed5318a5f119bd6780cda2915cca595393649fc118ab895e", size = 7080946, upload-time = "2026-04-01T14:46:11.734Z" }, +] + +[[package]] +name = "pint" +version = "0.25.3" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "flexcache" }, + { name = "flexparser" }, + { name = "platformdirs" }, + { name = "typing-extensions" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/52/9d/b1379cdbd33a49d17d627bc24e2b63cca06a1c5343b38072d2889499e82e/pint-0.25.3.tar.gz", hash = "sha256:f8f5df6cf65314d74da1ade1bf96f8e3e4d0c41b51577ac53c49e7d44ca5acee", size = 255106, upload-time = "2026-03-19T21:57:08.72Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/1b/dd/a9fe6a0a09512da23951c68bf36466aeecd89def3183dc095edbc807ddc5/pint-0.25.3-py3-none-any.whl", hash = "sha256:27eb25143bd5de9fcc4d5a4b484f16faf6b4615aa93ece6b3373a8c1a3c1b97d", size = 307488, upload-time = "2026-03-19T21:57:07.022Z" }, +] + +[[package]] +name = "platformdirs" +version = "4.10.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/d7/47/e4501f49c178ae1d9f4a75073fda4204f52647993f075a9db4d14930e0c5/platformdirs-4.10.0.tar.gz", hash = "sha256:31e761a6a0ca04faf7353ea759bdba55652be214725111e5aac52dfa29d4bef7", size = 31224, upload-time = "2026-05-28T03:32:53.587Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/81/e6/cd9575ac904136b3cbf7aa7ee819ef86eedb7274e46f230e94ea4342e729/platformdirs-4.10.0-py3-none-any.whl", hash = "sha256:fb516cdb12eb0d857d0cd85a7c57cea4d060bee4578d6cf5a14dfdf8cbf8784a", size = 22743, upload-time = "2026-05-28T03:32:52.175Z" }, +] + +[[package]] +name = "plotly" +version = "6.8.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "narwhals" }, + { name = "packaging" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/94/fd/d72c292d78aadb93d1a9bcd76bf3c678271040c7cf10abe5788b33040a39/plotly-6.8.0.tar.gz", hash = "sha256:e088e7ddc68d4f70e3d66659224727a45296d71d2b8284181862d3d8f1f0d88f", size = 6915161, upload-time = "2026-06-03T18:33:40.226Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/f9/14/abe5ce876ab5b66ee3c691bf537fcd43d037aea55d447aacf74630a8f31e/plotly-6.8.0-py3-none-any.whl", hash = "sha256:13c5c4a0f70b74cab1913eda0de49b826df5931708eb6f9c3010040614700ec8", size = 9902055, upload-time = "2026-06-03T18:33:34.26Z" }, +] + +[[package]] +name = "pluggy" +version = "1.6.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/f9/e2/3e91f31a7d2b083fe6ef3fa267035b518369d9511ffab804f839851d2779/pluggy-1.6.0.tar.gz", hash = "sha256:7dcc130b76258d33b90f61b658791dede3486c3e6bfb003ee5c9bfb396dd22f3", size = 69412, upload-time = "2025-05-15T12:30:07.975Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/54/20/4d324d65cc6d9205fabedc306948156824eb9f0ee1633355a8f7ec5c66bf/pluggy-1.6.0-py3-none-any.whl", hash = "sha256:e920276dd6813095e9377c0bc5566d94c932c33b27a3e3945d8389c374dd4746", size = 20538, upload-time = "2025-05-15T12:30:06.134Z" }, +] + +[[package]] +name = "prometheus-client" +version = "0.25.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/1b/fb/d9aa83ffe43ce1f19e557c0971d04b90561b0cfd50762aafb01968285553/prometheus_client-0.25.0.tar.gz", hash = "sha256:5e373b75c31afb3c86f1a52fa1ad470c9aace18082d39ec0d2f918d11cc9ba28", size = 86035, upload-time = "2026-04-09T19:53:42.359Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/8d/9b/d4b1e644385499c8346fa9b622a3f030dce14cd6ef8a1871c221a17a67e7/prometheus_client-0.25.0-py3-none-any.whl", hash = "sha256:d5aec89e349a6ec230805d0df882f3807f74fd6c1a2fa86864e3c2279059fed1", size = 64154, upload-time = "2026-04-09T19:53:41.324Z" }, +] + +[[package]] +name = "prompt-toolkit" +version = "3.0.52" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "wcwidth" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/a1/96/06e01a7b38dce6fe1db213e061a4602dd6032a8a97ef6c1a862537732421/prompt_toolkit-3.0.52.tar.gz", hash = "sha256:28cde192929c8e7321de85de1ddbe736f1375148b02f2e17edd840042b1be855", size = 434198, upload-time = "2025-08-27T15:24:02.057Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/84/03/0d3ce49e2505ae70cf43bc5bb3033955d2fc9f932163e84dc0779cc47f48/prompt_toolkit-3.0.52-py3-none-any.whl", hash = "sha256:9aac639a3bbd33284347de5ad8d68ecc044b91a762dc39b7c21095fcd6a19955", size = 391431, upload-time = "2025-08-27T15:23:59.498Z" }, +] + +[[package]] +name = "psutil" +version = "7.2.2" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/aa/c6/d1ddf4abb55e93cebc4f2ed8b5d6dbad109ecb8d63748dd2b20ab5e57ebe/psutil-7.2.2.tar.gz", hash = "sha256:0746f5f8d406af344fd547f1c8daa5f5c33dbc293bb8d6a16d80b4bb88f59372", size = 493740, upload-time = "2026-01-28T18:14:54.428Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/51/08/510cbdb69c25a96f4ae523f733cdc963ae654904e8db864c07585ef99875/psutil-7.2.2-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:2edccc433cbfa046b980b0df0171cd25bcaeb3a68fe9022db0979e7aa74a826b", size = 130595, upload-time = "2026-01-28T18:14:57.293Z" }, + { url = "https://files.pythonhosted.org/packages/d6/f5/97baea3fe7a5a9af7436301f85490905379b1c6f2dd51fe3ecf24b4c5fbf/psutil-7.2.2-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:e78c8603dcd9a04c7364f1a3e670cea95d51ee865e4efb3556a3a63adef958ea", size = 131082, upload-time = "2026-01-28T18:14:59.732Z" }, + { url = "https://files.pythonhosted.org/packages/37/d6/246513fbf9fa174af531f28412297dd05241d97a75911ac8febefa1a53c6/psutil-7.2.2-cp313-cp313t-manylinux2010_x86_64.manylinux_2_12_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:1a571f2330c966c62aeda00dd24620425d4b0cc86881c89861fbc04549e5dc63", size = 181476, upload-time = "2026-01-28T18:15:01.884Z" }, + { url = "https://files.pythonhosted.org/packages/b8/b5/9182c9af3836cca61696dabe4fd1304e17bc56cb62f17439e1154f225dd3/psutil-7.2.2-cp313-cp313t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:917e891983ca3c1887b4ef36447b1e0873e70c933afc831c6b6da078ba474312", size = 184062, upload-time = "2026-01-28T18:15:04.436Z" }, + { url = "https://files.pythonhosted.org/packages/16/ba/0756dca669f5a9300d0cbcbfae9a4c30e446dfc7440ffe43ded5724bfd93/psutil-7.2.2-cp313-cp313t-win_amd64.whl", hash = "sha256:ab486563df44c17f5173621c7b198955bd6b613fb87c71c161f827d3fb149a9b", size = 139893, upload-time = "2026-01-28T18:15:06.378Z" }, + { url = "https://files.pythonhosted.org/packages/1c/61/8fa0e26f33623b49949346de05ec1ddaad02ed8ba64af45f40a147dbfa97/psutil-7.2.2-cp313-cp313t-win_arm64.whl", hash = "sha256:ae0aefdd8796a7737eccea863f80f81e468a1e4cf14d926bd9b6f5f2d5f90ca9", size = 135589, upload-time = "2026-01-28T18:15:08.03Z" }, + { url = "https://files.pythonhosted.org/packages/81/69/ef179ab5ca24f32acc1dac0c247fd6a13b501fd5534dbae0e05a1c48b66d/psutil-7.2.2-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:eed63d3b4d62449571547b60578c5b2c4bcccc5387148db46e0c2313dad0ee00", size = 130664, upload-time = "2026-01-28T18:15:09.469Z" }, + { url = "https://files.pythonhosted.org/packages/7b/64/665248b557a236d3fa9efc378d60d95ef56dd0a490c2cd37dafc7660d4a9/psutil-7.2.2-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:7b6d09433a10592ce39b13d7be5a54fbac1d1228ed29abc880fb23df7cb694c9", size = 131087, upload-time = "2026-01-28T18:15:11.724Z" }, + { url = "https://files.pythonhosted.org/packages/d5/2e/e6782744700d6759ebce3043dcfa661fb61e2fb752b91cdeae9af12c2178/psutil-7.2.2-cp314-cp314t-manylinux2010_x86_64.manylinux_2_12_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:1fa4ecf83bcdf6e6c8f4449aff98eefb5d0604bf88cb883d7da3d8d2d909546a", size = 182383, upload-time = "2026-01-28T18:15:13.445Z" }, + { url = "https://files.pythonhosted.org/packages/57/49/0a41cefd10cb7505cdc04dab3eacf24c0c2cb158a998b8c7b1d27ee2c1f5/psutil-7.2.2-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:e452c464a02e7dc7822a05d25db4cde564444a67e58539a00f929c51eddda0cf", size = 185210, upload-time = "2026-01-28T18:15:16.002Z" }, + { url = "https://files.pythonhosted.org/packages/dd/2c/ff9bfb544f283ba5f83ba725a3c5fec6d6b10b8f27ac1dc641c473dc390d/psutil-7.2.2-cp314-cp314t-win_amd64.whl", hash = "sha256:c7663d4e37f13e884d13994247449e9f8f574bc4655d509c3b95e9ec9e2b9dc1", size = 141228, upload-time = "2026-01-28T18:15:18.385Z" }, + { url = "https://files.pythonhosted.org/packages/f2/fc/f8d9c31db14fcec13748d373e668bc3bed94d9077dbc17fb0eebc073233c/psutil-7.2.2-cp314-cp314t-win_arm64.whl", hash = "sha256:11fe5a4f613759764e79c65cf11ebdf26e33d6dd34336f8a337aa2996d71c841", size = 136284, upload-time = "2026-01-28T18:15:19.912Z" }, + { url = "https://files.pythonhosted.org/packages/e7/36/5ee6e05c9bd427237b11b3937ad82bb8ad2752d72c6969314590dd0c2f6e/psutil-7.2.2-cp36-abi3-macosx_10_9_x86_64.whl", hash = "sha256:ed0cace939114f62738d808fdcecd4c869222507e266e574799e9c0faa17d486", size = 129090, upload-time = "2026-01-28T18:15:22.168Z" }, + { url = "https://files.pythonhosted.org/packages/80/c4/f5af4c1ca8c1eeb2e92ccca14ce8effdeec651d5ab6053c589b074eda6e1/psutil-7.2.2-cp36-abi3-macosx_11_0_arm64.whl", hash = "sha256:1a7b04c10f32cc88ab39cbf606e117fd74721c831c98a27dc04578deb0c16979", size = 129859, upload-time = "2026-01-28T18:15:23.795Z" }, + { url = "https://files.pythonhosted.org/packages/b5/70/5d8df3b09e25bce090399cf48e452d25c935ab72dad19406c77f4e828045/psutil-7.2.2-cp36-abi3-manylinux2010_x86_64.manylinux_2_12_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:076a2d2f923fd4821644f5ba89f059523da90dc9014e85f8e45a5774ca5bc6f9", size = 155560, upload-time = "2026-01-28T18:15:25.976Z" }, + { url = "https://files.pythonhosted.org/packages/63/65/37648c0c158dc222aba51c089eb3bdfa238e621674dc42d48706e639204f/psutil-7.2.2-cp36-abi3-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:b0726cecd84f9474419d67252add4ac0cd9811b04d61123054b9fb6f57df6e9e", size = 156997, upload-time = "2026-01-28T18:15:27.794Z" }, + { url = "https://files.pythonhosted.org/packages/8e/13/125093eadae863ce03c6ffdbae9929430d116a246ef69866dad94da3bfbc/psutil-7.2.2-cp36-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:fd04ef36b4a6d599bbdb225dd1d3f51e00105f6d48a28f006da7f9822f2606d8", size = 148972, upload-time = "2026-01-28T18:15:29.342Z" }, + { url = "https://files.pythonhosted.org/packages/04/78/0acd37ca84ce3ddffaa92ef0f571e073faa6d8ff1f0559ab1272188ea2be/psutil-7.2.2-cp36-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:b58fabe35e80b264a4e3bb23e6b96f9e45a3df7fb7eed419ac0e5947c61e47cc", size = 148266, upload-time = "2026-01-28T18:15:31.597Z" }, + { url = "https://files.pythonhosted.org/packages/b4/90/e2159492b5426be0c1fef7acba807a03511f97c5f86b3caeda6ad92351a7/psutil-7.2.2-cp37-abi3-win_amd64.whl", hash = "sha256:eb7e81434c8d223ec4a219b5fc1c47d0417b12be7ea866e24fb5ad6e84b3d988", size = 137737, upload-time = "2026-01-28T18:15:33.849Z" }, + { url = "https://files.pythonhosted.org/packages/8c/c7/7bb2e321574b10df20cbde462a94e2b71d05f9bbda251ef27d104668306a/psutil-7.2.2-cp37-abi3-win_arm64.whl", hash = "sha256:8c233660f575a5a89e6d4cb65d9f938126312bca76d8fe087b947b3a1aaac9ee", size = 134617, upload-time = "2026-01-28T18:15:36.514Z" }, +] + +[[package]] +name = "psycopg2-binary" +version = "2.9.12" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/2a/60/a3624f79acea344c16fbef3a94d28b89a8042ddfb8f3e4ca83f538671409/psycopg2_binary-2.9.12.tar.gz", hash = "sha256:5ac9444edc768c02a6b6a591f070b8aae28ff3a99be57560ac996001580f294c", size = 379686, upload-time = "2026-04-21T09:40:34.304Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/d5/19/d4ce60954f3bb9d8e3bc5e5c4d1f2487de2d3851bf2391d54954c9df12a6/psycopg2_binary-2.9.12-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:5c8ce6c61bd1b1f6b9c24ee32211599f6166af2c55abb19456090a21fd16554b", size = 3712338, upload-time = "2026-04-20T23:34:03.961Z" }, + { url = "https://files.pythonhosted.org/packages/53/71/c85409ee0d78890f0660eff262e815e7dd2bb741a17611d82e9e8cd9dc5e/psycopg2_binary-2.9.12-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:b4a9eaa6e7f4ff91bec10aa3fb296878e75187bced5cc4bafe17dc40915e1326", size = 3822407, upload-time = "2026-04-20T23:34:05.977Z" }, + { url = "https://files.pythonhosted.org/packages/3c/ed/60486c2c7f0d4d1ede2bfb1ed27e2498477ce646bc7f6b2759906303117e/psycopg2_binary-2.9.12-cp311-cp311-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:c6528cefc8e50fcc6f4a107e27a672058b36cc5736d665476aeb413ba88dbb06", size = 4578425, upload-time = "2026-04-20T23:34:08.246Z" }, + { url = "https://files.pythonhosted.org/packages/0b/b9/656cb03fad9f4f49f2145c334b1126ee75189929ca4e6187d485a2d59951/psycopg2_binary-2.9.12-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:e4e184b1fb6072bf05388aa41c697e1b2d01b3473f107e7ec44f186a32cfd0b8", size = 4273709, upload-time = "2026-04-20T23:34:10.974Z" }, + { url = "https://files.pythonhosted.org/packages/99/66/08cf0da0e25cc6fb142c89be45fc8418792858f0c4cbff5e24530ff02cd6/psycopg2_binary-2.9.12-cp311-cp311-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:4766ab678563054d3f1d064a4db19cc4b5f9e3a8d9018592a8285cf200c248f3", size = 5893779, upload-time = "2026-04-20T23:34:13.905Z" }, + { url = "https://files.pythonhosted.org/packages/17/d7/eecd9ce8e146d3721115d82d3836efdbb712187e4590325df549989d18f4/psycopg2_binary-2.9.12-cp311-cp311-manylinux_2_38_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:5a0253224780c978746cb9be55a946bcdaf40fe3519c0f622924cdabdafe2c39", size = 4109308, upload-time = "2026-04-20T23:34:16.761Z" }, + { url = "https://files.pythonhosted.org/packages/b6/2e/b1dc289b362cc8d45697b57eefbd673186f49a4ea0906928988e3affcc98/psycopg2_binary-2.9.12-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:0dc9228d47c46bda253d2ecd6bb93b56a9f2d7ad33b684a1fa3622bf74ffe30c", size = 3654405, upload-time = "2026-04-20T23:34:19.303Z" }, + { url = "https://files.pythonhosted.org/packages/eb/e4/4c4aea6473214dbdbd0fbba11aa4691e76dc01722c55724c5951719865ff/psycopg2_binary-2.9.12-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:f921f3cd87035ef7df233383011d7a53ea1d346224752c1385f1edfd790ceb6a", size = 3299187, upload-time = "2026-04-20T23:34:21.206Z" }, + { url = "https://files.pythonhosted.org/packages/ba/5d/b03b99986446a4f57b170ed9a2579fb7ff9783ca0fa5226b19db99737fee/psycopg2_binary-2.9.12-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:3d999bd982a723113c1a45b55a7a6a90d64d0ed2278020ed625c490ff7bef96c", size = 3047716, upload-time = "2026-04-20T23:34:23.077Z" }, + { url = "https://files.pythonhosted.org/packages/14/86/382ee4afbd1d97500c9d2862b20c2fdeddf4b7335e984df3fb4309f64108/psycopg2_binary-2.9.12-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:29d4d134bd0ab46ffb04e94aa3c5fa3ef582e9026609165e2f758ff76fc3a3be", size = 3349237, upload-time = "2026-04-20T23:34:25.211Z" }, + { url = "https://files.pythonhosted.org/packages/a8/16/9a57c75ba1eda7165c017342f526810d5f5a12647dde749c99ae9a7141d7/psycopg2_binary-2.9.12-cp311-cp311-win_amd64.whl", hash = "sha256:cb4a1dacdd48077150dc762a9e5ddbf32c256d66cb46f80839391aa458774936", size = 2757036, upload-time = "2026-04-20T23:34:27.77Z" }, + { url = "https://files.pythonhosted.org/packages/e2/9f/ef4ef3c8e15083df90ca35265cfd1a081a2f0cc07bb229c6314c6af817f4/psycopg2_binary-2.9.12-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:5cdc05117180c5fa9c40eea8ea559ce64d73824c39d928b7da9fb5f6a9392433", size = 3712459, upload-time = "2026-04-20T23:34:30.549Z" }, + { url = "https://files.pythonhosted.org/packages/b5/01/3dd14e46ba48c1e1a6ec58ee599fa1b5efa00c246d5046cd903d0eeb1af1/psycopg2_binary-2.9.12-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:d3227a3bc228c10d21011a99245edca923e4e8bf461857e869a507d9a41fe9f6", size = 3822936, upload-time = "2026-04-20T23:34:32.77Z" }, + { url = "https://files.pythonhosted.org/packages/a6/f7/0640e4901119d8a9f7a1784b927f494e2198e213ceb593753d1f2c8b1b30/psycopg2_binary-2.9.12-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:995ce929eede89db6254b50827e2b7fd61e50d11f0b116b29fffe4a2e53c4580", size = 4578676, upload-time = "2026-04-20T23:34:35.18Z" }, + { url = "https://files.pythonhosted.org/packages/b0/55/44df3965b5f297c50cc0b1b594a31c67d6127a9d133045b8a66611b14dfb/psycopg2_binary-2.9.12-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:9fe06d93e72f1c048e731a2e3e7854a5bfaa58fc736068df90b352cefe66f03f", size = 4274917, upload-time = "2026-04-20T23:34:37.982Z" }, + { url = "https://files.pythonhosted.org/packages/b0/4b/74535248b1eac0c9336862e8617c765ac94dac76f9e25d7c4a79588c8907/psycopg2_binary-2.9.12-cp312-cp312-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:40e7b28b63aaf737cb3a1edc3a9bbc9a9f4ad3dcb7152e8c1130e4050eddcb7d", size = 5894843, upload-time = "2026-04-20T23:34:40.856Z" }, + { url = "https://files.pythonhosted.org/packages/f2/ba/f1bf8d2ae71868ad800b661099086ee52bc0f8d9f05be1acd8ebb06757cc/psycopg2_binary-2.9.12-cp312-cp312-manylinux_2_38_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:89d19a9f7899e8eb0656a2b3a08e0da04c720a06db6e0033eab5928aabe60fa9", size = 4110556, upload-time = "2026-04-20T23:34:44.016Z" }, + { url = "https://files.pythonhosted.org/packages/45/46/c15706c338403b7c420bcc0c2905aad116cc064545686d8bf85f1999ea00/psycopg2_binary-2.9.12-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:612b965daee295ae2da8f8218ce1d274645dc76ef3f1abf6a0a94fd57eff876d", size = 3655714, upload-time = "2026-04-20T23:34:46.233Z" }, + { url = "https://files.pythonhosted.org/packages/b3/7c/a2d5dc09b64a4564db242a0fe418fde7d33f6f8259dd2c5b9d7def00fb5a/psycopg2_binary-2.9.12-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:b9a339b79d37c1b45f3235265f07cdeb0cb5ad7acd2ac7720a5920989c17c24e", size = 3301154, upload-time = "2026-04-20T23:34:49.528Z" }, + { url = "https://files.pythonhosted.org/packages/c0/e8/cc8c9a4ce71461f9ec548d38cadc41dc184b34c73e6455450775a9334ccd/psycopg2_binary-2.9.12-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:3471336e1acfd9c7fe507b8bad5af9317b6a89294f9eb37bd9a030bb7bebcdc6", size = 3048882, upload-time = "2026-04-20T23:34:51.86Z" }, + { url = "https://files.pythonhosted.org/packages/19/6a/31e2296bc0787c5ab75d3d118e40b239db8151b5192b90b77c72bc9256e9/psycopg2_binary-2.9.12-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:7af18183109e23502c8b2ae7f6926c0882766f35b5175a4cd737ad825e4d7a1b", size = 3351298, upload-time = "2026-04-20T23:34:54.124Z" }, + { url = "https://files.pythonhosted.org/packages/5f/a8/75f4e3e11203b590150abed2cf7794b9c9c9f7eceddae955191138b44dde/psycopg2_binary-2.9.12-cp312-cp312-win_amd64.whl", hash = "sha256:398fcd4db988c7d7d3713e2b8e18939776fd3fb447052daae4f24fa39daede4c", size = 2757230, upload-time = "2026-04-20T23:34:56.242Z" }, + { url = "https://files.pythonhosted.org/packages/91/bb/4608c96f970f6e0c56572e87027ef4404f709382a3503e9934526d7ba051/psycopg2_binary-2.9.12-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:7c729a73c7b1b84de3582f73cdd27d905121dc2c531f3d9a3c32a3011033b965", size = 3712419, upload-time = "2026-04-20T23:34:58.754Z" }, + { url = "https://files.pythonhosted.org/packages/5e/af/48f76af9d50d61cf390f8cd657b503168b089e2e9298e48465d029fcc713/psycopg2_binary-2.9.12-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:4413d0caef93c5cf50b96863df4c2efe8c269bf2267df353225595e7e15e8df7", size = 3822990, upload-time = "2026-04-20T23:35:00.821Z" }, + { url = "https://files.pythonhosted.org/packages/7a/df/aba0f99397cd811d32e06fc0cc781f1f3ce98bc0e729cb423925085d781a/psycopg2_binary-2.9.12-cp313-cp313-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:4dfcf8e45ebb0c663be34a3442f65e17311f3367089cd4e5e3a3e8e62c978777", size = 4578696, upload-time = "2026-04-20T23:35:03.409Z" }, + { url = "https://files.pythonhosted.org/packages/95/9c/eaa74021ac4e4d5c2f83d82fc6615a63f4fe6c94dc4e94c3990427053f67/psycopg2_binary-2.9.12-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:c41321a14dd74aceb6a9a643b9253a334521babfa763fa873e33d89cfa122fb5", size = 4274982, upload-time = "2026-04-20T23:35:05.583Z" }, + { url = "https://files.pythonhosted.org/packages/35/ed/c25deff98bd26187ba48b3b250a3ffc3037c46c5b89362534a15d200e0db/psycopg2_binary-2.9.12-cp313-cp313-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:83946ba43979ebfdc99a3cd0ee775c89f221df026984ba19d46133d8d75d3cd9", size = 5894867, upload-time = "2026-04-20T23:35:07.902Z" }, + { url = "https://files.pythonhosted.org/packages/9a/81/8d0e21ca77373c6c9589e5c4528f6e8f0c08c62cafc76fb0bddb7a2cee22/psycopg2_binary-2.9.12-cp313-cp313-manylinux_2_38_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:411e85815652d13560fbe731878daa5d92378c4995a22302071890ec3397d019", size = 4110578, upload-time = "2026-04-20T23:35:10.149Z" }, + { url = "https://files.pythonhosted.org/packages/00/fc/f481e2435bd8f742d0123309174aae4165160ad3ef17c1b99c3622c241d2/psycopg2_binary-2.9.12-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:1c8ad4c08e00f7679559eaed7aff1edfffc60c086b976f93972f686384a95e2c", size = 3655816, upload-time = "2026-04-20T23:35:12.56Z" }, + { url = "https://files.pythonhosted.org/packages/53/79/b9f46466bdbe9f239c96cde8be33c1aace4842f06013b47b730dc9759187/psycopg2_binary-2.9.12-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:00814e40fa23c2b37ef0a1e3c749d89982c73a9cb5046137f0752a22d432e82f", size = 3301307, upload-time = "2026-04-20T23:35:15.029Z" }, + { url = "https://files.pythonhosted.org/packages/3f/19/7dc003b32fe35024df89b658104f7c8538a8b2dcbde7a4e746ce929742e7/psycopg2_binary-2.9.12-cp313-cp313-musllinux_1_2_riscv64.whl", hash = "sha256:98062447aebc20ed20add1f547a364fd0ef8933640d5372ff1873f8deb9b61be", size = 3048968, upload-time = "2026-04-20T23:35:16.757Z" }, + { url = "https://files.pythonhosted.org/packages/91/58/2dbd7db5c604d45f4950d988506aae672a14126ec22998ced5021cbb76bb/psycopg2_binary-2.9.12-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:66a7685d7e548f10fb4ce32fb01a7b7f4aa702134de92a292c7bd9e0d3dbd290", size = 3351369, upload-time = "2026-04-20T23:35:18.933Z" }, + { url = "https://files.pythonhosted.org/packages/42/ee/dee8dcaad07f735824de3d6563bc67119fa6c28257b17977a8d624f02fab/psycopg2_binary-2.9.12-cp313-cp313-win_amd64.whl", hash = "sha256:b6937f5fe4e180aeee87de907a2fa982ded6f7f15d7218f78a083e4e1d68f2a0", size = 2757347, upload-time = "2026-04-20T23:35:21.283Z" }, + { url = "https://files.pythonhosted.org/packages/13/1b/708c0dca874acfad6d65314271859899a79007686f3a1f74e82a2ed4b645/psycopg2_binary-2.9.12-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:6f3b3de8a74ef8db215f22edffb19e32dc6fa41340456de7ec99efdc8a7b3ec2", size = 3712428, upload-time = "2026-04-20T23:35:23.453Z" }, + { url = "https://files.pythonhosted.org/packages/d6/39/ddbea9d4b4de6aca9431b6ed253f530f8a02d3b8f9bcfd0dbfe2b3de6fe4/psycopg2_binary-2.9.12-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:1006fb62f0f0bc5ce256a832356c6262e91be43f5e4eb15b5eaf38079464caf2", size = 3823184, upload-time = "2026-04-20T23:35:25.92Z" }, + { url = "https://files.pythonhosted.org/packages/bf/a0/bc2fef74b106fa345567122a0659e6d94512ed7dc0131ec44c9e5aba3725/psycopg2_binary-2.9.12-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:840066105706cd2eb29b9a1c2329620056582a4bf3e8169dec5c447042d0869f", size = 4579157, upload-time = "2026-04-20T23:35:28.542Z" }, + { url = "https://files.pythonhosted.org/packages/57/d7/d4e3b2005d3de607ca4fbb0e8742e248056e52184a6b94ebda3c1c2c329b/psycopg2_binary-2.9.12-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:863f5d12241ebe1c76a72a04c2113b6dc905f90b9cef0e9be0efd994affd9354", size = 4274970, upload-time = "2026-04-20T23:35:30.418Z" }, + { url = "https://files.pythonhosted.org/packages/2e/42/c9853f8db3967fe08bcde11f53d53b85d351750cae726ce001cb68afa9c1/psycopg2_binary-2.9.12-cp314-cp314-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:a99eaab34a9010f1a086b126de467466620a750634d114d20455f3a824aae033", size = 5895175, upload-time = "2026-04-20T23:35:33.584Z" }, + { url = "https://files.pythonhosted.org/packages/eb/fd/b82b5601a97630308bef079f545ffec481bbbc795c2ba5ec416a01d03f60/psycopg2_binary-2.9.12-cp314-cp314-manylinux_2_38_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:ffdd7dc5463ccd61845ac37b7012d0f35a1548df9febe14f8dd549be4a0bc81e", size = 4110658, upload-time = "2026-04-20T23:35:35.638Z" }, + { url = "https://files.pythonhosted.org/packages/62/8c/32ca69b0389ef25dd22937bf9e8fbe2ce27aea20b05ded48c4ce4cb42475/psycopg2_binary-2.9.12-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:54a0dfecab1b48731f934e06139dfe11e24219fb6d0ceb32177cf0375f14c7b5", size = 3656251, upload-time = "2026-04-20T23:35:37.854Z" }, + { url = "https://files.pythonhosted.org/packages/c4/29/96992a2b59e3b9d730fcf9612d0a387305025dc867a9fc490a9e496e074e/psycopg2_binary-2.9.12-cp314-cp314-musllinux_1_2_ppc64le.whl", hash = "sha256:96937c9c5d891f772430f418a7a8b4691a90c3e6b93cf72b5bd7cad8cbca32a5", size = 3301810, upload-time = "2026-04-20T23:35:39.927Z" }, + { url = "https://files.pythonhosted.org/packages/56/ad/44b06659949b243ae10112cd3b20a197f9bf3e81d5651379b9eb889bfaad/psycopg2_binary-2.9.12-cp314-cp314-musllinux_1_2_riscv64.whl", hash = "sha256:77b348775efd4cdab410ec6609d81ccecd1139c90265fa583a7255c8064bc03d", size = 3048977, upload-time = "2026-04-20T23:35:41.806Z" }, + { url = "https://files.pythonhosted.org/packages/1d/f2/10a1bcebadb6aa55e280e1f58975c36a7b560ea525184c7aa4064c466633/psycopg2_binary-2.9.12-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:527e6342b3e44c2f0544f6b8e927d60de7f163f5723b8f1dfa7d2a84298738cd", size = 3351466, upload-time = "2026-04-20T23:35:43.993Z" }, + { url = "https://files.pythonhosted.org/packages/20/be/b732c8418ffa5bcfda002890f5dc4c869fc17db66ff11f53b17cfe44afc0/psycopg2_binary-2.9.12-cp314-cp314-win_amd64.whl", hash = "sha256:f12ae41fcafadb39b2785e64a40f9db05d6de2ac114077457e0e7c597f3af980", size = 2848762, upload-time = "2026-04-20T23:35:46.421Z" }, +] + +[[package]] +name = "ptyprocess" +version = "0.7.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/20/e5/16ff212c1e452235a90aeb09066144d0c5a6a8c0834397e03f5224495c4e/ptyprocess-0.7.0.tar.gz", hash = "sha256:5c5d0a3b48ceee0b48485e0c26037c0acd7d29765ca3fbb5cb3831d347423220", size = 70762, upload-time = "2020-12-28T15:15:30.155Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/22/a6/858897256d0deac81a172289110f31629fc4cee19b6f01283303e18c8db3/ptyprocess-0.7.0-py2.py3-none-any.whl", hash = "sha256:4b41f3967fce3af57cc7e94b888626c18bf37a083e3651ca8feeb66d492fef35", size = 13993, upload-time = "2020-12-28T15:15:28.35Z" }, +] + +[[package]] +name = "pure-eval" +version = "0.2.3" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/cd/05/0a34433a064256a578f1783a10da6df098ceaa4a57bbeaa96a6c0352786b/pure_eval-0.2.3.tar.gz", hash = "sha256:5f4e983f40564c576c7c8635ae88db5956bb2229d7e9237d03b3c0b0190eaf42", size = 19752, upload-time = "2024-07-21T12:58:21.801Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/8e/37/efad0257dc6e593a18957422533ff0f87ede7c9c6ea010a2177d738fb82f/pure_eval-0.2.3-py3-none-any.whl", hash = "sha256:1db8e35b67b3d218d818ae653e27f06c3aa420901fa7b081ca98cbedc874e0d0", size = 11842, upload-time = "2024-07-21T12:58:20.04Z" }, +] + +[[package]] +name = "pycodestyle" +version = "2.14.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/11/e0/abfd2a0d2efe47670df87f3e3a0e2edda42f055053c85361f19c0e2c1ca8/pycodestyle-2.14.0.tar.gz", hash = "sha256:c4b5b517d278089ff9d0abdec919cd97262a3367449ea1c8b49b91529167b783", size = 39472, upload-time = "2025-06-20T18:49:48.75Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/d7/27/a58ddaf8c588a3ef080db9d0b7e0b97215cee3a45df74f3a94dbbf5c893a/pycodestyle-2.14.0-py2.py3-none-any.whl", hash = "sha256:dd6bf7cb4ee77f8e016f9c8e74a35ddd9f67e1d5fd4184d86c3b98e07099f42d", size = 31594, upload-time = "2025-06-20T18:49:47.491Z" }, +] + +[[package]] +name = "pycparser" +version = "3.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/1b/7d/92392ff7815c21062bea51aa7b87d45576f649f16458d78b7cf94b9ab2e6/pycparser-3.0.tar.gz", hash = "sha256:600f49d217304a5902ac3c37e1281c9fe94e4d0489de643a9504c5cdfdfc6b29", size = 103492, upload-time = "2026-01-21T14:26:51.89Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/0c/c3/44f3fbbfa403ea2a7c779186dc20772604442dde72947e7d01069cbe98e3/pycparser-3.0-py3-none-any.whl", hash = "sha256:b727414169a36b7d524c1c3e31839a521725078d7b2ff038656844266160a992", size = 48172, upload-time = "2026-01-21T14:26:50.693Z" }, +] + +[[package]] +name = "pyflakes" +version = "3.4.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/45/dc/fd034dc20b4b264b3d015808458391acbf9df40b1e54750ef175d39180b1/pyflakes-3.4.0.tar.gz", hash = "sha256:b24f96fafb7d2ab0ec5075b7350b3d2d2218eab42003821c06344973d3ea2f58", size = 64669, upload-time = "2025-06-20T18:45:27.834Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/c2/2f/81d580a0fb83baeb066698975cb14a618bdbed7720678566f1b046a95fe8/pyflakes-3.4.0-py2.py3-none-any.whl", hash = "sha256:f742a7dbd0d9cb9ea41e9a24a918996e8170c799fa528688d40dd582c8265f4f", size = 63551, upload-time = "2025-06-20T18:45:26.937Z" }, +] + +[[package]] +name = "pygments" +version = "2.20.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/c3/b2/bc9c9196916376152d655522fdcebac55e66de6603a76a02bca1b6414f6c/pygments-2.20.0.tar.gz", hash = "sha256:6757cd03768053ff99f3039c1a36d6c0aa0b263438fcab17520b30a303a82b5f", size = 4955991, upload-time = "2026-03-29T13:29:33.898Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/f4/7e/a72dd26f3b0f4f2bf1dd8923c85f7ceb43172af56d63c7383eb62b332364/pygments-2.20.0-py3-none-any.whl", hash = "sha256:81a9e26dd42fd28a23a2d169d86d7ac03b46e2f8b59ed4698fb4785f946d0176", size = 1231151, upload-time = "2026-03-29T13:29:30.038Z" }, +] + +[[package]] +name = "pymatgen" +version = "2026.5.4" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "pymatgen-core" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/0c/a1/727feae7083bb3b10ba9d43ccbbe83317d4654957a08cee52096ef86bfde/pymatgen-2026.5.4.tar.gz", hash = "sha256:4998d6084da72224c8025dc1e9645b2aab73896109a7ef1e05bd479a25a55b79", size = 743199, upload-time = "2026-05-04T22:03:24.675Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/a2/3a/de29b0b6c1740098c3ccdd3fa69336dc39b5efc6840a55e30dcaea01a19b/pymatgen-2026.5.4-py3-none-any.whl", hash = "sha256:7815cd4310c6d5a465b0da14a1633479cf61366676e62764db17f7e2a20d1974", size = 829056, upload-time = "2026-05-04T22:03:22.327Z" }, +] + +[[package]] +name = "pymatgen-core" +version = "2026.5.18" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "bibtexparser" }, + { name = "joblib" }, + { name = "lxml" }, + { name = "matplotlib" }, + { name = "monty" }, + { name = "networkx" }, + { name = "numpy", version = "2.4.6", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version < '3.12'" }, + { name = "numpy", version = "2.5.0", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version >= '3.12'" }, + { name = "orjson" }, + { name = "palettable" }, + { name = "pandas" }, + { name = "plotly" }, + { name = "requests" }, + { name = "scipy", version = "1.17.1", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version < '3.12'" }, + { name = "scipy", version = "1.18.0", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version >= '3.12'" }, + { name = "spglib" }, + { name = "sympy" }, + { name = "tabulate" }, + { name = "tqdm" }, + { name = "uncertainties" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/74/ed/b52bb7ab2b9ca0e69ea54b919ddba13c5636b960f7b9f4fab0d0aa0a502b/pymatgen_core-2026.5.18.tar.gz", hash = "sha256:bdbe8c591bbac7ed65922d710e94b661bb540baae27217ceadd59e31e9c3ff07", size = 2860012, upload-time = "2026-05-18T23:39:30.786Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/9d/14/1f02bea594033a000c68980a362ae670be7832e72281c8acbad35fbfb218/pymatgen_core-2026.5.18-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:d712b5098a281f6f499f039b079d9c45d8d45d83d378de42261c5aa9333e3ce1", size = 2923247, upload-time = "2026-05-18T23:39:28.443Z" }, + { url = "https://files.pythonhosted.org/packages/0d/bd/fc63c1c6be5bf0aeb810f12374f14ad3a0bad7b14736649e2ebe960f51d0/pymatgen_core-2026.5.18-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:69a51c5332bc9666f05f07d3e0a5f9eef28c44681bfe05781628b9e2846df07b", size = 4434150, upload-time = "2026-05-19T02:15:06.754Z" }, + { url = "https://files.pythonhosted.org/packages/f5/c0/9a6668d441d51f87eebd3263cd49399179f980764d3ab0d3b9d1faa1e0fe/pymatgen_core-2026.5.18-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:f31bbf0821eeb5570defaa511e2152480cc39e1127d78551f01343a961e165f6", size = 4462716, upload-time = "2026-05-19T02:15:08.724Z" }, + { url = "https://files.pythonhosted.org/packages/c9/a2/6671b3059d1e87964cd8589ec622958ecd4755b84078b092d2e679999e4e/pymatgen_core-2026.5.18-cp311-cp311-win32.whl", hash = "sha256:f0956528c54ced5bbf648f947f05935ab8159656a8df24cf22cb251ec9d74a5d", size = 2858798, upload-time = "2026-05-19T02:15:10.602Z" }, + { url = "https://files.pythonhosted.org/packages/75/26/86520647872bdae9669009beaa01250d37ad6e1b3942a9c88c6610c757c0/pymatgen_core-2026.5.18-cp311-cp311-win_amd64.whl", hash = "sha256:d0b5991048433a0cfd153eb0bb5920740042ea67521d78a04de5390f70461b2a", size = 2900587, upload-time = "2026-05-19T02:15:12.385Z" }, + { url = "https://files.pythonhosted.org/packages/23/00/35ccf35580d6caa1a88ea427df9e23628d64aef53b5752d377581f013098/pymatgen_core-2026.5.18-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:26709975fb33070fdf1b1bde301694ef5774d39b91d6dc7b27876bf30fb068ad", size = 2927363, upload-time = "2026-05-19T02:15:14.143Z" }, + { url = "https://files.pythonhosted.org/packages/23/06/2931ca449754e2b7d895d2185c99515b0d12a3c44a2e05142cc756e2d137/pymatgen_core-2026.5.18-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:938688b6d897183f9612122cdeee7613967e189932842eaf40008210d257e5aa", size = 4434814, upload-time = "2026-05-19T02:15:15.673Z" }, + { url = "https://files.pythonhosted.org/packages/ca/21/a54cf445b00d6bdf71fafc35079f4e810755947d0f4758447dfe12ac44b6/pymatgen_core-2026.5.18-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:070230f3ecaec435f5896d9579f614e14020cc079e6443c15b9ea971841812c0", size = 4481429, upload-time = "2026-05-19T02:15:17.313Z" }, + { url = "https://files.pythonhosted.org/packages/4d/22/5c8c8abd8367e387ec97c32c8504c1f1ef821fc41e8bd325fe40c6aa866f/pymatgen_core-2026.5.18-cp312-cp312-win32.whl", hash = "sha256:21615334c07d2211f2c9420181cab3f1aace66a7a3673f8cdbbeb27741681ed0", size = 2857740, upload-time = "2026-05-19T02:15:19.333Z" }, + { url = "https://files.pythonhosted.org/packages/26/6e/c0502db344f707469683c26bb685f918b6bdfb79211a2fa9fafe63636d3c/pymatgen_core-2026.5.18-cp312-cp312-win_amd64.whl", hash = "sha256:46e87242e881b44034cf9a9480c0bbc39f566c2918126689aa6898b3538e18ec", size = 2900927, upload-time = "2026-05-19T02:15:21.179Z" }, + { url = "https://files.pythonhosted.org/packages/7d/93/bb20fe038df5c36214fcded3c1b23623fdc00465bf300a1e3603dadf42c2/pymatgen_core-2026.5.18-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:531ab9284e48890bd29a537f6183c52fd9e5488cb86d125ac2c7ebe0a2bfd239", size = 2925181, upload-time = "2026-05-19T02:15:23.288Z" }, + { url = "https://files.pythonhosted.org/packages/81/d8/7a6eab09b88ca5a4997e19f080cb43eccbda1f70fcd213b14df36db14616/pymatgen_core-2026.5.18-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:1f5eced053f989fb5818ced84cc26dc88a06522740c24a0b410674b386ad331d", size = 4416899, upload-time = "2026-05-19T02:15:25.216Z" }, + { url = "https://files.pythonhosted.org/packages/9d/5b/17bdac8864553080fe076cd511052dc031bf7f422ebf14d3bc801a1f0874/pymatgen_core-2026.5.18-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:123be72bb2df4f22534f0926c2ffc188594251f2998ab7d9df6f76db81ae466b", size = 4462454, upload-time = "2026-05-19T02:15:27.151Z" }, + { url = "https://files.pythonhosted.org/packages/08/cd/a8850adb8ba26fe77ac0b4efa77f4c03ebfa1e673c388c8cd0dac8d752b1/pymatgen_core-2026.5.18-cp313-cp313-win32.whl", hash = "sha256:12391b53f98c6bae5a4875c1efc558f303857e06347580f31e3d79c2353c86e8", size = 2857426, upload-time = "2026-05-19T02:15:29.062Z" }, + { url = "https://files.pythonhosted.org/packages/cd/41/57d429a2a8f7a9599735823580da304e30066ac9029f78a8af88ae041990/pymatgen_core-2026.5.18-cp313-cp313-win_amd64.whl", hash = "sha256:417a4410537b49cd7d4970518ece69182ba7cae0c71e7f7fb9bd15b896e059f4", size = 2900292, upload-time = "2026-05-19T02:15:30.528Z" }, + { url = "https://files.pythonhosted.org/packages/24/cf/c075084fc03fbb11ccc9a5d07d37163eb2dfaf6b6981cbec7c1f7955bd6b/pymatgen_core-2026.5.18-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:41f390215a28ba9c5fba5ccf414a0dca6824a4d463d09008eacc59dfe89c5f45", size = 2927369, upload-time = "2026-05-19T02:15:32.055Z" }, + { url = "https://files.pythonhosted.org/packages/b7/30/45cb3d86a9b9ff20fee497e5fe3a10e922785fa269d597a76c19066d4207/pymatgen_core-2026.5.18-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:31833fa81a264842e782039f4cf46a9ceaacb485639ea3d4606f3d06e1d1d6d6", size = 4413086, upload-time = "2026-05-19T02:15:34.007Z" }, + { url = "https://files.pythonhosted.org/packages/19/b8/548cf1d1b78e03535fa2b2fe90860946ed45c1b29befd3d1fe43fc87a005/pymatgen_core-2026.5.18-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:7199b2f7ae7e0ba5ae3af23f5d16e13ae69a37d4015d94d4f62d5ada544fb4eb", size = 4448826, upload-time = "2026-05-19T02:15:35.761Z" }, + { url = "https://files.pythonhosted.org/packages/39/09/2d8e42942421d35e2f0c4db92d7fd9eb52f2f03d688999592a9f758afd4f/pymatgen_core-2026.5.18-cp314-cp314-win32.whl", hash = "sha256:845a4337c84bfbd1e48e9c3200ae6b1868d1486a0e8e277e16d3dc64c46e4f17", size = 2843984, upload-time = "2026-05-19T02:15:37.379Z" }, + { url = "https://files.pythonhosted.org/packages/d3/6a/8233be4b903bd3ff6e04556b025e1b476cc1918675c2d6b4383db868f9ce/pymatgen_core-2026.5.18-cp314-cp314-win_amd64.whl", hash = "sha256:f4d1a2f2f37b25ff3ce33dd6ff06303b2d1d735c8a525ba2a970e25803afc4b0", size = 2887831, upload-time = "2026-05-19T02:15:38.902Z" }, +] + +[[package]] +name = "pymongo" +version = "4.17.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "dnspython" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/ca/64/50be6fbac9c79fe2e4c17401a467da2d8764d82833d83cec325afe5cab32/pymongo-4.17.0.tar.gz", hash = "sha256:70ffa08ba641468cc068cf46c06b34f01a8ce3489f6411309fcb5ceabe6b2fc0", size = 2523370, upload-time = "2026-04-20T16:39:53.524Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/c4/e2/336d86f221cf1b56b2ed9330d4a3b98f9f38f0b37829ae9a9184617d5419/pymongo-4.17.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:4141e6c6a339789b2974efa00ecd9409101672d77a0e3ee2cc3839eedf8ec4df", size = 874668, upload-time = "2026-04-20T16:37:41.39Z" }, + { url = "https://files.pythonhosted.org/packages/34/8e/75d3c6c935d187ab59c61e9c15d9aab3f274b563eaf1706e8cae5f508dec/pymongo-4.17.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:e68c76b84e0c132d9dbf9307f12ff8185702328187a87b9aca8c941303873433", size = 875294, upload-time = "2026-04-20T16:37:43.432Z" }, + { url = "https://files.pythonhosted.org/packages/5f/ec/62e855744489dbcd54fd778aae4d80fa4c4819e8fb228ca0cf6f21a03997/pymongo-4.17.0-cp311-cp311-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:ba2195d4f386f839a52a23ea1cfd60ffaaba78a3d7841db51b7e433001139918", size = 1496233, upload-time = "2026-04-20T16:37:45.518Z" }, + { url = "https://files.pythonhosted.org/packages/82/e8/93e4e5e5ce8fdf8929dabeefe24aafa5ce046028eed0dfa8eeb936e72c49/pymongo-4.17.0-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:8446ff4bfcb6ec2a2e50998c860986a1e992136f998b7f53e7a717fb8aa5a0b9", size = 1522927, upload-time = "2026-04-20T16:37:47.492Z" }, + { url = "https://files.pythonhosted.org/packages/f7/ca/425dc1d21e0f17bdea0072fc463f662f7fa06d2852af52975c9eced3c07c/pymongo-4.17.0-cp311-cp311-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:2a0d5ac205728c86e0a02192f1aa5f865b0d7d51f8df6101c01a69a7fc620d72", size = 1583468, upload-time = "2026-04-20T16:37:49.221Z" }, + { url = "https://files.pythonhosted.org/packages/b3/9d/f08b07eeffda1a43c1759f0fa625e88ae12360996eb56d42aad832fa7dff/pymongo-4.17.0-cp311-cp311-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:485c8a8eaa4c739f00a331fc73757898ee7c092c214a79e63866ff76aaf282ff", size = 1572787, upload-time = "2026-04-20T16:37:51.061Z" }, + { url = "https://files.pythonhosted.org/packages/e9/c2/6855a07aafa7b894929af23675b6fb9634800ce43122b76a62f6eeb8da2a/pymongo-4.17.0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:b2dfcc795f5b9fedbe179a11fdf6051581479d196582a3fe819a92a00e9b9969", size = 1526184, upload-time = "2026-04-20T16:37:53.358Z" }, + { url = "https://files.pythonhosted.org/packages/4e/05/c952bac7db71c1942ea3559fcd308b49754cc5004b455935fb4000d1f37b/pymongo-4.17.0-cp311-cp311-win32.whl", hash = "sha256:c2292144505fb12156b981bd440f3dc994a883da06ac726c0c8692ccdbc1c510", size = 852621, upload-time = "2026-04-20T16:37:55.28Z" }, + { url = "https://files.pythonhosted.org/packages/11/c0/c04da9f4c0c6252404598f4e394b862a58a9e866822a70ae261c8a018fdf/pymongo-4.17.0-cp311-cp311-win_amd64.whl", hash = "sha256:2e190827834fce70ecdf9d46796c6dbc0ce08ea87dc2ff5bc6f3f5579b605cb9", size = 867852, upload-time = "2026-04-20T16:37:57.233Z" }, + { url = "https://files.pythonhosted.org/packages/1d/b2/c7b4870fbeef471e947d3e014676f5910d02e0197074d692ebcf24ec049a/pymongo-4.17.0-cp311-cp311-win_arm64.whl", hash = "sha256:a8f9c40a09bb7d4b9fc8b1da65ecf6efa79bda5cb2756f39d9b6940fac1d19ae", size = 855019, upload-time = "2026-04-20T16:37:58.983Z" }, + { url = "https://files.pythonhosted.org/packages/98/90/60bcb508840135d5ee46b51b1a950f548338aa8145a8366dbe6639ae51ac/pymongo-4.17.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:d53ffa94b2340dbf6b055e09a0090618c60482c158ecfc9565642fc996bf0944", size = 930529, upload-time = "2026-04-20T16:38:00.936Z" }, + { url = "https://files.pythonhosted.org/packages/a6/e9/313840f1e52c6dfac47f704428cbfbce59956ebe7633bffc92b03f74f0ad/pymongo-4.17.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:6fe0de9d0f6791abce3471230b32b4817bf89d27b1182b6a550e1ec0fa72aa9a", size = 930665, upload-time = "2026-04-20T16:38:02.915Z" }, + { url = "https://files.pythonhosted.org/packages/78/35/9d3565ea45b1606f635c1e2cd2563c28d66caafdc50f7ad7d979fcd1b363/pymongo-4.17.0-cp312-cp312-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:e537e95514dae1aaa718f481ec03151a0f0394bcd05f1322896d8fc1330cb729", size = 1762369, upload-time = "2026-04-20T16:38:05.375Z" }, + { url = "https://files.pythonhosted.org/packages/95/ee/149b0d4b1a11c38bff6f14c23d5814c9b0843fd6dc38ad40596bdb1a62d2/pymongo-4.17.0-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:37a8385c29881b43eab31f584100fa0eaddedd5607adf010147ba1810118be90", size = 1798044, upload-time = "2026-04-20T16:38:07.195Z" }, + { url = "https://files.pythonhosted.org/packages/7b/d4/4cee4a7b8d8f6f0550ef6cd2fea42455c5ed619a220cb6ba4fb40d6a5bc8/pymongo-4.17.0-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:f3ee3d241ed77a4fc99ce3cff3b289c3ebce37f61fdd7349d3592c23b82c8784", size = 1878567, upload-time = "2026-04-20T16:38:09.121Z" }, + { url = "https://files.pythonhosted.org/packages/45/ef/7fe366c84952619ee2f69973566c214775e083dd4df465751912153e4b72/pymongo-4.17.0-cp312-cp312-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:9eb5d63a3c518cb0804ed678f5e2b875af032d89a7cf57a57360322cf6a4d222", size = 1864881, upload-time = "2026-04-20T16:38:10.896Z" }, + { url = "https://files.pythonhosted.org/packages/2f/35/b577d82c6d1be7aee7ac7e249bc86f7847998345042e5f8360de238e177b/pymongo-4.17.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:8e97e03fa13327c87e3fdc5656acd01e71817f0c1dc3221cd8f30de136bf4ec3", size = 1800349, upload-time = "2026-04-20T16:38:13.589Z" }, + { url = "https://files.pythonhosted.org/packages/b8/69/dafcf04f66e130ddd91aeb92e7a692480eda46dcd04ec1dbe82c06619e10/pymongo-4.17.0-cp312-cp312-win32.whl", hash = "sha256:6877214bff5f06f6884a9fc8d9016a4a7a5f51f537f5c51ac3a576f93e7dfb32", size = 900518, upload-time = "2026-04-20T16:38:15.541Z" }, + { url = "https://files.pythonhosted.org/packages/11/35/5c9262a459f988b4eb2605f70815240b77a0d4131136c4326d18f1822b89/pymongo-4.17.0-cp312-cp312-win_amd64.whl", hash = "sha256:9828485f72f63c7d802e0ec41f71906f633c2692621ab3af55ca990186b091b1", size = 920335, upload-time = "2026-04-20T16:38:17.665Z" }, + { url = "https://files.pythonhosted.org/packages/8d/da/e9c7265ee176faccf4e52c4797837e794d93569a1046f6b19a4acc36e5ad/pymongo-4.17.0-cp312-cp312-win_arm64.whl", hash = "sha256:1195370a77baf003b59b10e91ecc4706297197f0dd9d29c840cc556dc08f7cee", size = 903289, upload-time = "2026-04-20T16:38:19.33Z" }, + { url = "https://files.pythonhosted.org/packages/2a/6b/c1206879708b94e82fcd8b9653440ec271f79a3674d122192df383047f5a/pymongo-4.17.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:809ec74de3b9148ae43fa8df9faf53470f511c8d384f13b99d6f671f2a379f15", size = 985829, upload-time = "2026-04-20T16:38:21.031Z" }, + { url = "https://files.pythonhosted.org/packages/cb/cf/bb044ed85160e5c40f568c7c4f4e8ea16f40764ff5d302e5befbe8f6f814/pymongo-4.17.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:a431b737816bf4cddd4fa0fcef04e424ad36b7692734a64150f872fb8f3208be", size = 985899, upload-time = "2026-04-20T16:38:23.409Z" }, + { url = "https://files.pythonhosted.org/packages/74/0a/f6dfd5ea3901e5d6888da8de8ba728971a1d447debab681cfc56f90d1208/pymongo-4.17.0-cp313-cp313-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:e4fab10f8403169ce92f3cea921609d9ee81107306caae06c08f592d4b8ad2b5", size = 2028569, upload-time = "2026-04-20T16:38:25.343Z" }, + { url = "https://files.pythonhosted.org/packages/4a/c5/081f59a1c02ae8c0dc73ae58e563838c44eec81aeafa7d0b93a637841c9b/pymongo-4.17.0-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:20323b0b1c1d33770ad1fc68d429c757734ce9ad3594421c3d6618f10572b1b9", size = 2072916, upload-time = "2026-04-20T16:38:27.291Z" }, + { url = "https://files.pythonhosted.org/packages/31/42/6e41d434297ffe8b30d9c3717916591a4a7be9075a0dcc2fafdfaaaa62ed/pymongo-4.17.0-cp313-cp313-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:5a5de048e6da5c18e27cc2437e8c15b3b0cdc8385c15b41178b0caa3322a09c2", size = 2173234, upload-time = "2026-04-20T16:38:29.474Z" }, + { url = "https://files.pythonhosted.org/packages/3d/cf/1e4a7db352ef9485831c7268dfe8402f0117b32a9ad54b16e810699e3617/pymongo-4.17.0-cp313-cp313-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:dff3de1294fbbc1db0ba6b511f77b8e540601d092538a31312e99c8a91a78b1e", size = 2156784, upload-time = "2026-04-20T16:38:32.134Z" }, + { url = "https://files.pythonhosted.org/packages/12/10/6195be29962a61ebb5f4bd9e4c7519890b172f7968a0a0d880398c6ddb02/pymongo-4.17.0-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:faf03e4c2aafd6de626dbd30ba246d369ae33f47f10629d1bbe40f72115027a6", size = 2074446, upload-time = "2026-04-20T16:38:34.004Z" }, + { url = "https://files.pythonhosted.org/packages/37/48/33410b8819837ed370c738587306bdf060b59cef11823be212f4a07703c5/pymongo-4.17.0-cp313-cp313-win32.whl", hash = "sha256:c9786665926a09630c5d420c79762cfadbff35a9438bcbc4c81a9fb5ab9228b7", size = 948435, upload-time = "2026-04-20T16:38:35.922Z" }, + { url = "https://files.pythonhosted.org/packages/6f/77/c0ed522f798a286b99acaa7914ed8d9c80ab091f97f57c59ffed72906e5e/pymongo-4.17.0-cp313-cp313-win_amd64.whl", hash = "sha256:5960519b4d7168f1ecdd3ea10c81b2aedeb9423651aca953cfbc8e76705d3b38", size = 972847, upload-time = "2026-04-20T16:38:37.888Z" }, + { url = "https://files.pythonhosted.org/packages/97/f0/c39480a2db385fde23861d0c8acda41cdaf1d43e46579db72c5c013a2e81/pymongo-4.17.0-cp313-cp313-win_arm64.whl", hash = "sha256:0ff6bd2f735ab5356541e3e57d5b7dbfbc3f2ee1ccb10b6b0f82d58af69d1d8e", size = 951575, upload-time = "2026-04-20T16:38:40.544Z" }, + { url = "https://files.pythonhosted.org/packages/da/49/2b0250762a89737ed6f9cea238331baca061b89a8ddd10dd17fee52c3970/pymongo-4.17.0-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:ff5aa3f1c7e3f08eb0e7a016c91ba468b1850ccfd63d9b1f12f56350f4974cef", size = 1040945, upload-time = "2026-04-20T16:38:42.783Z" }, + { url = "https://files.pythonhosted.org/packages/89/1c/7a9b5447a08be20e84b6e5b17330917e8d6d9507daa3cd099a9309f11ad7/pymongo-4.17.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:e816db649ba5d7de0568cf3a9f287a9dc9aad21cf0ca667ab156a7ef47fca0b0", size = 1041187, upload-time = "2026-04-20T16:38:45.358Z" }, + { url = "https://files.pythonhosted.org/packages/78/a1/71704f61632dfc90407a5834fe5f6132854937c4a3648f6c05c351d85a45/pymongo-4.17.0-cp314-cp314-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:12c4fded3a9f1d6a687e36ebd384ac6d00b9b00de1969aa74048e7051ec2a713", size = 2294806, upload-time = "2026-04-20T16:38:47.734Z" }, + { url = "https://files.pythonhosted.org/packages/ad/b9/aff42be75108b96c2469b1d9329b912c15108f3e7ef32fdc86da8423c330/pymongo-4.17.0-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:2db66aa8dd253a0fc1fad3b0d23d5b3993f7ebde02fbbd7727128debf2853675", size = 2348231, upload-time = "2026-04-20T16:38:50.371Z" }, + { url = "https://files.pythonhosted.org/packages/f2/30/44c115b8ba1479942c15fd9480eb29a7da0ba68acd56983423ba0deb4a94/pymongo-4.17.0-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:3987e96e7c7be4083d42e8ac2cc6c0d5b78db9973c90fce42ae800b616ca6b20", size = 2467614, upload-time = "2026-04-20T16:38:52.665Z" }, + { url = "https://files.pythonhosted.org/packages/d2/84/21ee95c8bf0ca7acae7ec7eb365d740bf8fc0156c194baf2c3bdfcb85ec0/pymongo-4.17.0-cp314-cp314-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:cee36b3c0d0354f880fa7a7fdcdaf2bb5e542c2281e25c1bfadf8cfe21eba7d2", size = 2445970, upload-time = "2026-04-20T16:38:55.175Z" }, + { url = "https://files.pythonhosted.org/packages/06/89/081d7f1809d5ca09d1e47e49f2111b245f5694de3a7af32cd3a353a6f43f/pymongo-4.17.0-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:320b34457b20bbcc79997801f95d25ce00472915ca5241167242b42c4359e027", size = 2348605, upload-time = "2026-04-20T16:38:57.557Z" }, + { url = "https://files.pythonhosted.org/packages/ea/c3/0d949f9d3f2a341c1f635c398c16615e96f89f51ff424ed81e914cf1a4de/pymongo-4.17.0-cp314-cp314-win32.whl", hash = "sha256:df4a644af9ae132d4bfdb2e9516ea51a615fd881caddfbfbd071cf1354844479", size = 1004119, upload-time = "2026-04-20T16:39:00.309Z" }, + { url = "https://files.pythonhosted.org/packages/f7/55/5c3a3db1048054c695c75c5964cc8bedc2247fdb5a75ef6fab4ec8bb013e/pymongo-4.17.0-cp314-cp314-win_amd64.whl", hash = "sha256:c797f8a80957134f6dd9690367a0f8f5906d672119af2c6aa55f0c527b656bed", size = 1032314, upload-time = "2026-04-20T16:39:02.665Z" }, + { url = "https://files.pythonhosted.org/packages/e0/19/e235f39906134cb0ffd5574c5a59c355ef5380f0499644ab94994afbb109/pymongo-4.17.0-cp314-cp314-win_arm64.whl", hash = "sha256:68fca71e05ee5da23a8d73cee8379dfb3d26e609a377cae731d742771ed96946", size = 1007627, upload-time = "2026-04-20T16:39:04.678Z" }, + { url = "https://files.pythonhosted.org/packages/1e/e0/c4c1a86791415b14c684fa0908f9da96de91594a3fd1fa1b8dc689fbb800/pymongo-4.17.0-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:b4384700cffc3f1dd98e088bc0072dedf6d7d68a230bb4b972665cf69c071c1e", size = 1099151, upload-time = "2026-04-20T16:39:06.969Z" }, + { url = "https://files.pythonhosted.org/packages/81/4b/69c67f3e23fd9b23b9bedc7ebd23754881cc9d5c5d5b2a9811e96b07f475/pymongo-4.17.0-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:93641192644fa1ee0f34030e774fd31022a27ad11ba22cb1716142231524f8bd", size = 1099346, upload-time = "2026-04-20T16:39:08.996Z" }, + { url = "https://files.pythonhosted.org/packages/a2/19/a5208f62f9508a26d73acc69bd3821b8c8adae253679a3c26d2f9652f0d5/pymongo-4.17.0-cp314-cp314t-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:75bc3aa5b94fdb7138d357ec6ca61cd97e0c79f4f7f0bd3efe9639b15cc50942", size = 2619034, upload-time = "2026-04-20T16:39:11.049Z" }, + { url = "https://files.pythonhosted.org/packages/77/27/426cba1ec5973082a56d4150798529bfdf4151c31391ed1fbbecb23ef2ac/pymongo-4.17.0-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:50e8f8e23c6df7c6d6929f5e734980b227706e73ee847517c9ba5af90f7fc466", size = 2689939, upload-time = "2026-04-20T16:39:13.617Z" }, + { url = "https://files.pythonhosted.org/packages/ef/2e/f70993d1255e33f6ee59a4ec4371cc65bff7a7e3fda7d55c3386f25287e8/pymongo-4.17.0-cp314-cp314t-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:15d3f3d732aecac1f8d481bde4029755615639bd3076f258a2147210aec8515a", size = 2824994, upload-time = "2026-04-20T16:39:16.057Z" }, + { url = "https://files.pythonhosted.org/packages/b3/eb/87b0e988ba889e1fcc3430c2cfc166b251872c813e92b43174298bee17ff/pymongo-4.17.0-cp314-cp314t-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:6c5f62862d0f87be481fa1fe8cb811994486773c94a2b61e509285e3f2890763", size = 2801745, upload-time = "2026-04-20T16:39:18.476Z" }, + { url = "https://files.pythonhosted.org/packages/67/4c/3f83412d086f682d4d468761d66ddc49cf161e786ea74073045eb4491c60/pymongo-4.17.0-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:64837adbbd72073301af51bb0fc80e3d7707fe5527cea1033ba0320f0b2f881b", size = 2684636, upload-time = "2026-04-20T16:39:20.878Z" }, + { url = "https://files.pythonhosted.org/packages/9e/d8/b75f6f4ab6c8beb50b0270a4f1e2530b5774f5e116563440e1677ca1820f/pymongo-4.17.0-cp314-cp314t-win32.whl", hash = "sha256:b93b22eedc62598cf5ee9d8c8007a8e9121c50fd88137012d8985500e9dc3151", size = 1056356, upload-time = "2026-04-20T16:39:22.996Z" }, + { url = "https://files.pythonhosted.org/packages/e4/5e/648c8a238eef18a25ed8a169ea6542d4a860bbec3e95b3d9badac2935c71/pymongo-4.17.0-cp314-cp314t-win_amd64.whl", hash = "sha256:3689ea34f6b647c7d1e7bdc60fcfb214b2789ed1359a7fb96569c69f50e5f18f", size = 1090964, upload-time = "2026-04-20T16:39:24.989Z" }, + { url = "https://files.pythonhosted.org/packages/dc/cb/d9780b66939c4fc1f024bcc7be23a2abcfe06a9745ca8fa76dc73395482e/pymongo-4.17.0-cp314-cp314t-win_arm64.whl", hash = "sha256:9543d8f84c2e5608565c08ac679774811e6730770d8a645439b073422a4276fb", size = 1058526, upload-time = "2026-04-20T16:39:27.924Z" }, +] + +[[package]] +name = "pyopenssl" +version = "26.3.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "cryptography" }, + { name = "typing-extensions", marker = "python_full_version < '3.13'" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/74/b7/da07bae88f5a9506b4def6f2f4903cf4c3b8831e560dba8fa18ca08f758f/pyopenssl-26.3.0.tar.gz", hash = "sha256:589de7fae1c9ea670d18422ed00fc04da787bbde8e1454aea872aa57b49ad341", size = 182024, upload-time = "2026-06-12T20:28:07.458Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/54/18/1dd71c9b43192ab83f1d531ad6002dc81108ac36c475f79fb7a295abe2f4/pyopenssl-26.3.0-py3-none-any.whl", hash = "sha256:46367f8f66b92271e6d218da9c87607e1ef5a0bc5c8dea5bb3db82f395c385a3", size = 56008, upload-time = "2026-06-12T20:28:05.999Z" }, +] + +[[package]] +name = "pyparsing" +version = "3.3.2" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/f3/91/9c6ee907786a473bf81c5f53cf703ba0957b23ab84c264080fb5a450416f/pyparsing-3.3.2.tar.gz", hash = "sha256:c777f4d763f140633dcb6d8a3eda953bf7a214dc4eff598413c070bcdc117cbc", size = 6851574, upload-time = "2026-01-21T03:57:59.36Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/10/bd/c038d7cc38edc1aa5bf91ab8068b63d4308c66c4c8bb3cbba7dfbc049f9c/pyparsing-3.3.2-py3-none-any.whl", hash = "sha256:850ba148bd908d7e2411587e247a1e4f0327839c40e2e5e6d05a007ecc69911d", size = 122781, upload-time = "2026-01-21T03:57:55.912Z" }, +] + +[[package]] +name = "pytest" +version = "9.1.1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "colorama", marker = "sys_platform == 'win32'" }, + { name = "iniconfig" }, + { name = "packaging" }, + { name = "pluggy" }, + { name = "pygments" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/e4/47/b9efed96c114afcfa3c9d3fe98a76a1d14c74a9e266d397cf6eb64be5e01/pytest-9.1.1.tar.gz", hash = "sha256:1088fbde8f2b49d95a549a195707afa7a76a3ce9bcadc26b6d71f0ffda5fe313", size = 1636369, upload-time = "2026-06-19T10:58:32.857Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/24/25/1de2678b631f5a49215c6c96fff41ba892b0a34df68d6d80292b1b48aa7f/pytest-9.1.1-py3-none-any.whl", hash = "sha256:37a86b45efb9a47a61a36449063e8e18d0cab3161329fc099eb21783169c4f0c", size = 386536, upload-time = "2026-06-19T10:58:31.347Z" }, +] + +[[package]] +name = "pytest-cov" +version = "7.1.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "coverage", extra = ["toml"] }, + { name = "pluggy" }, + { name = "pytest" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/b1/51/a849f96e117386044471c8ec2bd6cfebacda285da9525c9106aeb28da671/pytest_cov-7.1.0.tar.gz", hash = "sha256:30674f2b5f6351aa09702a9c8c364f6a01c27aae0c1366ae8016160d1efc56b2", size = 55592, upload-time = "2026-03-21T20:11:16.284Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/9d/7a/d968e294073affff457b041c2be9868a40c1c71f4a35fcc1e45e5493067b/pytest_cov-7.1.0-py3-none-any.whl", hash = "sha256:a0461110b7865f9a271aa1b51e516c9a95de9d696734a2f71e3e78f46e1d4678", size = 22876, upload-time = "2026-03-21T20:11:14.438Z" }, +] + +[[package]] +name = "pytest-flake8" +version = "1.3.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "flake8" }, + { name = "pytest" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/4f/83/3b0154ccd60191e24b75c99c5e7c6dcfb1d2fd81dd47528523b38fed6ac6/pytest_flake8-1.3.0.tar.gz", hash = "sha256:88fb35562ce32d915c6ba41ef0d5e1cfcdd8ff884a32b7d46aa99fc77a3d1fe6", size = 13340, upload-time = "2024-11-09T00:09:09.249Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/7d/ca/163e24b6d92ba3e92245a6a23e88b946c29ff5294b2f4bc24c7a6171a13d/pytest_flake8-1.3.0-py3-none-any.whl", hash = "sha256:de10517c59fce25c0a7abb2a2b2a9d0b0ceb59ff0add7fa8e654d613bb25e218", size = 5966, upload-time = "2024-11-09T00:09:08.227Z" }, +] + +[[package]] +name = "pytest-pycodestyle" +version = "2.5.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "pycodestyle" }, + { name = "pytest" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/0f/60/634e069a52137207b988359319c7030b25195f014822724f259325fa3af5/pytest_pycodestyle-2.5.0.tar.gz", hash = "sha256:dd0060039e12a59b521da8e57e17133c965566dd8d17631e589e7545238829ac", size = 5859, upload-time = "2025-07-20T03:18:12.504Z" } + +[[package]] +name = "pytest-xdist" +version = "3.8.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "execnet" }, + { name = "pytest" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/78/b4/439b179d1ff526791eb921115fca8e44e596a13efeda518b9d845a619450/pytest_xdist-3.8.0.tar.gz", hash = "sha256:7e578125ec9bc6050861aa93f2d59f1d8d085595d6551c2c90b6f4fad8d3a9f1", size = 88069, upload-time = "2025-07-01T13:30:59.346Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/ca/31/d4e37e9e550c2b92a9cbc2e4d0b7420a27224968580b5a447f420847c975/pytest_xdist-3.8.0-py3-none-any.whl", hash = "sha256:202ca578cfeb7370784a8c33d6d05bc6e13b4f25b5053c30a152269fd10f0b88", size = 46396, upload-time = "2025-07-01T13:30:56.632Z" }, +] + +[[package]] +name = "python-dateutil" +version = "2.9.0.post0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "six" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/66/c0/0c8b6ad9f17a802ee498c46e004a0eb49bc148f2fd230864601a86dcf6db/python-dateutil-2.9.0.post0.tar.gz", hash = "sha256:37dd54208da7e1cd875388217d5e00ebd4179249f90fb72437e91a35459a0ad3", size = 342432, upload-time = "2024-03-01T18:36:20.211Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/ec/57/56b9bcc3c9c6a792fcbaf139543cee77261f3651ca9da0c93f5c1221264b/python_dateutil-2.9.0.post0-py2.py3-none-any.whl", hash = "sha256:a8b2bc7bffae282281c8140a97d3aa9c14da0b136dfe83f850eea9a5f7470427", size = 229892, upload-time = "2024-03-01T18:36:18.57Z" }, +] + +[[package]] +name = "python-json-logger" +version = "4.1.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/f7/ff/3cc9165fd44106973cd7ac9facb674a65ed853494592541d339bdc9a30eb/python_json_logger-4.1.0.tar.gz", hash = "sha256:b396b9e3ed782b09ff9d6e4f1683d46c83ad0d35d2e407c09a9ebbf038f88195", size = 17573, upload-time = "2026-03-29T04:39:56.805Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/27/be/0631a861af4d1c875f096c07d34e9a63639560a717130e7a87cbc82b7e3f/python_json_logger-4.1.0-py3-none-any.whl", hash = "sha256:132994765cf75bf44554be9aa49b06ef2345d23661a96720262716438141b6b2", size = 15021, upload-time = "2026-03-29T04:39:55.266Z" }, +] + +[[package]] +name = "python-mimeparse" +version = "2.0.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/cd/85/c40f2e0b2128905f6c34894be01803c114f2b2efab0e8b4c3dca5e56b999/python_mimeparse-2.0.0.tar.gz", hash = "sha256:5b9a9dcf7aa82465e31bd667f5cb7000604811dce83554f1c8a43693a32cb303", size = 7162, upload-time = "2024-08-25T13:38:14.966Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/65/d9/1093a9d6d22d04d433003c96b9b1d46741b43fee5b11ece5098297737fce/python_mimeparse-2.0.0-py3-none-any.whl", hash = "sha256:574062a06f2e1d416535c8d3b83ccc6ebe95941e74e2c5939fc010a12e37cc09", size = 5576, upload-time = "2024-08-25T13:38:13.372Z" }, +] + +[[package]] +name = "python-snappy" +version = "0.7.3" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "cramjam" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/39/66/9185fbb6605ba92716d9f77fbb13c97eb671cd13c3ad56bd154016fbf08b/python_snappy-0.7.3.tar.gz", hash = "sha256:40216c1badfb2d38ac781ecb162a1d0ec40f8ee9747e610bcfefdfa79486cee3", size = 9337, upload-time = "2024-08-29T13:16:05.705Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/86/c1/0ee413ddd639aebf22c85d6db39f136ccc10e6a4b4dd275a92b5c839de8d/python_snappy-0.7.3-py3-none-any.whl", hash = "sha256:074c0636cfcd97e7251330f428064050ac81a52c62ed884fc2ddebbb60ed7f50", size = 9155, upload-time = "2024-08-29T13:16:04.773Z" }, +] + +[[package]] +name = "pytz" +version = "2026.2" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/ff/46/dd499ec9038423421951e4fad73051febaa13d2df82b4064f87af8b8c0c3/pytz-2026.2.tar.gz", hash = "sha256:0e60b47b29f21574376f218fe21abc009894a2321ea16c6754f3cad6eb7cdd6a", size = 320861, upload-time = "2026-05-04T01:35:29.667Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/ec/dd/96da98f892250475bdf2328112d7468abdd4acc7b902b6af23f4ed958ea0/pytz-2026.2-py2.py3-none-any.whl", hash = "sha256:04156e608bee23d3792fd45c94ae47fae1036688e75032eea2e3bf0323d1f126", size = 510141, upload-time = "2026-05-04T01:35:27.408Z" }, +] + +[[package]] +name = "pywinpty" +version = "3.0.5" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/a9/ef/2d27f30c59a67be7025b2d7858c8c2d282b74d66544b2384730b82de74fd/pywinpty-3.0.5.tar.gz", hash = "sha256:61db0db063de9865adbea66db294628f8577f608d9764a4c7d3384eeacc4e81b", size = 16223484, upload-time = "2026-06-11T00:11:58.93Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/b0/5c/31feb3dd82d1b33ae0bd09ca601edb993d9da1b7f0226b3336d4b4c39e1e/pywinpty-3.0.5-cp311-cp311-win_amd64.whl", hash = "sha256:af7a8720c78776ddd6259b71dd567944f766a6cd67f8d2887fbc4973967bacda", size = 2092466, upload-time = "2026-06-10T23:44:24.453Z" }, + { url = "https://files.pythonhosted.org/packages/ee/fe/fe23e2229ffec0c10190cef5964f5c9b2dba179d23b69ae537b7ea90bcab/pywinpty-3.0.5-cp311-cp311-win_arm64.whl", hash = "sha256:c2406f54f699eab75953fb75ce805f2ae55a33a957cd070890abd454fb4b7680", size = 818395, upload-time = "2026-06-10T23:41:56.93Z" }, + { url = "https://files.pythonhosted.org/packages/45/34/942cc95ca4e26489875aa8a95192766247a687379ec29543eebe73ec945f/pywinpty-3.0.5-cp312-cp312-win_amd64.whl", hash = "sha256:d62946adf14b15b54c0b8d785f93fe18b04da23f4ad59e2e8c4612646e9abd23", size = 2090915, upload-time = "2026-06-10T23:43:14.98Z" }, + { url = "https://files.pythonhosted.org/packages/6a/70/5b9053004844139ea8bd86209c57ade12b134b2782f383a095784c8531ec/pywinpty-3.0.5-cp312-cp312-win_arm64.whl", hash = "sha256:e9391c05fbfa7a992a97e831fc6849887b4014a614192e3d984a7ca59592b376", size = 815934, upload-time = "2026-06-10T23:41:42.384Z" }, + { url = "https://files.pythonhosted.org/packages/b9/f4/2a464b9893cceb3b3f416356e94fdc3e1bca9476993927e4e6d99fe95382/pywinpty-3.0.5-cp313-cp313-win_amd64.whl", hash = "sha256:48db1b0ad9d0a1b81dcaaa7163a99a7808deaceb0c1b2344716dc1fc090c3c4c", size = 2090471, upload-time = "2026-06-10T23:42:11.071Z" }, + { url = "https://files.pythonhosted.org/packages/3c/2c/a138491a0afbdb50eb79395577bd326d4b0fbde7209417d1a8087ff2493a/pywinpty-3.0.5-cp313-cp313-win_arm64.whl", hash = "sha256:2c6008fb2d3774b48693b2fcb7f2cc317ade9dc581289a964ffeeaf81307c9b5", size = 815518, upload-time = "2026-06-10T23:42:02.363Z" }, + { url = "https://files.pythonhosted.org/packages/6f/15/54400049a380582acd1282665c70fcf11e0bd3713679aca78e24c3aae738/pywinpty-3.0.5-cp313-cp313t-win_amd64.whl", hash = "sha256:22ce1b780d89821cc52daf6eac0708af22d93d000ce9c7c07e37489db8594598", size = 2089920, upload-time = "2026-06-10T23:44:13.395Z" }, + { url = "https://files.pythonhosted.org/packages/94/0c/6f24f3c0799f502259b24bdf841a99ad2b0d59df5c2525b4e2a286d14be2/pywinpty-3.0.5-cp313-cp313t-win_arm64.whl", hash = "sha256:9c2919a81bc5cfb09b86fc5a002112b2de95ca4304a07413cbeeb746a1307a5c", size = 814520, upload-time = "2026-06-10T23:43:28.588Z" }, + { url = "https://files.pythonhosted.org/packages/e9/23/f3cd1b1e5fc56517f54452c49f92049e7dd9ffc8a63de22a495581f50d04/pywinpty-3.0.5-cp314-cp314-win_amd64.whl", hash = "sha256:03bb3c16d691d9242267201830bcd0e64a9b663170e9042bc84b210da9de15ac", size = 2090663, upload-time = "2026-06-10T23:43:59.845Z" }, + { url = "https://files.pythonhosted.org/packages/9d/dd/96d6cbfc6d9ddab5c1c2f92c26545ae8997446a2ba7ee2024cd43c81f49b/pywinpty-3.0.5-cp314-cp314-win_arm64.whl", hash = "sha256:89c5c6ef08997a3b4b277b214a35fe15cab4dd6d119f0140aa71df5b1168fdbc", size = 815700, upload-time = "2026-06-10T23:40:50.001Z" }, + { url = "https://files.pythonhosted.org/packages/30/36/d98087bce0acaa4cce7f196103cfa7be3f63ce65f52473bb3e38784ae5d9/pywinpty-3.0.5-cp314-cp314t-win_amd64.whl", hash = "sha256:7b566165e0c5fdd6abe167a5ac8b954be6a843eb55a85946576d6bc1dea03d6d", size = 2090093, upload-time = "2026-06-10T23:40:58.933Z" }, + { url = "https://files.pythonhosted.org/packages/57/fd/fe2b0db922ba052ce3976a08f3fc05d0c05047c8b4ebb6102e832b8ef563/pywinpty-3.0.5-cp314-cp314t-win_arm64.whl", hash = "sha256:24366280a8aa677323da87bec729cb3ea3b35367386cece0978bdc6e4695c690", size = 814517, upload-time = "2026-06-10T23:42:34.946Z" }, +] + +[[package]] +name = "pyyaml" +version = "6.0.3" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/05/8e/961c0007c59b8dd7729d542c61a4d537767a59645b82a0b521206e1e25c2/pyyaml-6.0.3.tar.gz", hash = "sha256:d76623373421df22fb4cf8817020cbb7ef15c725b9d5e45f17e189bfc384190f", size = 130960, upload-time = "2025-09-25T21:33:16.546Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/6d/16/a95b6757765b7b031c9374925bb718d55e0a9ba8a1b6a12d25962ea44347/pyyaml-6.0.3-cp311-cp311-macosx_10_13_x86_64.whl", hash = "sha256:44edc647873928551a01e7a563d7452ccdebee747728c1080d881d68af7b997e", size = 185826, upload-time = "2025-09-25T21:31:58.655Z" }, + { url = "https://files.pythonhosted.org/packages/16/19/13de8e4377ed53079ee996e1ab0a9c33ec2faf808a4647b7b4c0d46dd239/pyyaml-6.0.3-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:652cb6edd41e718550aad172851962662ff2681490a8a711af6a4d288dd96824", size = 175577, upload-time = "2025-09-25T21:32:00.088Z" }, + { url = "https://files.pythonhosted.org/packages/0c/62/d2eb46264d4b157dae1275b573017abec435397aa59cbcdab6fc978a8af4/pyyaml-6.0.3-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:10892704fc220243f5305762e276552a0395f7beb4dbf9b14ec8fd43b57f126c", size = 775556, upload-time = "2025-09-25T21:32:01.31Z" }, + { url = "https://files.pythonhosted.org/packages/10/cb/16c3f2cf3266edd25aaa00d6c4350381c8b012ed6f5276675b9eba8d9ff4/pyyaml-6.0.3-cp311-cp311-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:850774a7879607d3a6f50d36d04f00ee69e7fc816450e5f7e58d7f17f1ae5c00", size = 882114, upload-time = "2025-09-25T21:32:03.376Z" }, + { url = "https://files.pythonhosted.org/packages/71/60/917329f640924b18ff085ab889a11c763e0b573da888e8404ff486657602/pyyaml-6.0.3-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:b8bb0864c5a28024fac8a632c443c87c5aa6f215c0b126c449ae1a150412f31d", size = 806638, upload-time = "2025-09-25T21:32:04.553Z" }, + { url = "https://files.pythonhosted.org/packages/dd/6f/529b0f316a9fd167281a6c3826b5583e6192dba792dd55e3203d3f8e655a/pyyaml-6.0.3-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:1d37d57ad971609cf3c53ba6a7e365e40660e3be0e5175fa9f2365a379d6095a", size = 767463, upload-time = "2025-09-25T21:32:06.152Z" }, + { url = "https://files.pythonhosted.org/packages/f2/6a/b627b4e0c1dd03718543519ffb2f1deea4a1e6d42fbab8021936a4d22589/pyyaml-6.0.3-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:37503bfbfc9d2c40b344d06b2199cf0e96e97957ab1c1b546fd4f87e53e5d3e4", size = 794986, upload-time = "2025-09-25T21:32:07.367Z" }, + { url = "https://files.pythonhosted.org/packages/45/91/47a6e1c42d9ee337c4839208f30d9f09caa9f720ec7582917b264defc875/pyyaml-6.0.3-cp311-cp311-win32.whl", hash = "sha256:8098f252adfa6c80ab48096053f512f2321f0b998f98150cea9bd23d83e1467b", size = 142543, upload-time = "2025-09-25T21:32:08.95Z" }, + { url = "https://files.pythonhosted.org/packages/da/e3/ea007450a105ae919a72393cb06f122f288ef60bba2dc64b26e2646fa315/pyyaml-6.0.3-cp311-cp311-win_amd64.whl", hash = "sha256:9f3bfb4965eb874431221a3ff3fdcddc7e74e3b07799e0e84ca4a0f867d449bf", size = 158763, upload-time = "2025-09-25T21:32:09.96Z" }, + { url = "https://files.pythonhosted.org/packages/d1/33/422b98d2195232ca1826284a76852ad5a86fe23e31b009c9886b2d0fb8b2/pyyaml-6.0.3-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:7f047e29dcae44602496db43be01ad42fc6f1cc0d8cd6c83d342306c32270196", size = 182063, upload-time = "2025-09-25T21:32:11.445Z" }, + { url = "https://files.pythonhosted.org/packages/89/a0/6cf41a19a1f2f3feab0e9c0b74134aa2ce6849093d5517a0c550fe37a648/pyyaml-6.0.3-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:fc09d0aa354569bc501d4e787133afc08552722d3ab34836a80547331bb5d4a0", size = 173973, upload-time = "2025-09-25T21:32:12.492Z" }, + { url = "https://files.pythonhosted.org/packages/ed/23/7a778b6bd0b9a8039df8b1b1d80e2e2ad78aa04171592c8a5c43a56a6af4/pyyaml-6.0.3-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:9149cad251584d5fb4981be1ecde53a1ca46c891a79788c0df828d2f166bda28", size = 775116, upload-time = "2025-09-25T21:32:13.652Z" }, + { url = "https://files.pythonhosted.org/packages/65/30/d7353c338e12baef4ecc1b09e877c1970bd3382789c159b4f89d6a70dc09/pyyaml-6.0.3-cp312-cp312-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:5fdec68f91a0c6739b380c83b951e2c72ac0197ace422360e6d5a959d8d97b2c", size = 844011, upload-time = "2025-09-25T21:32:15.21Z" }, + { url = "https://files.pythonhosted.org/packages/8b/9d/b3589d3877982d4f2329302ef98a8026e7f4443c765c46cfecc8858c6b4b/pyyaml-6.0.3-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:ba1cc08a7ccde2d2ec775841541641e4548226580ab850948cbfda66a1befcdc", size = 807870, upload-time = "2025-09-25T21:32:16.431Z" }, + { url = "https://files.pythonhosted.org/packages/05/c0/b3be26a015601b822b97d9149ff8cb5ead58c66f981e04fedf4e762f4bd4/pyyaml-6.0.3-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:8dc52c23056b9ddd46818a57b78404882310fb473d63f17b07d5c40421e47f8e", size = 761089, upload-time = "2025-09-25T21:32:17.56Z" }, + { url = "https://files.pythonhosted.org/packages/be/8e/98435a21d1d4b46590d5459a22d88128103f8da4c2d4cb8f14f2a96504e1/pyyaml-6.0.3-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:41715c910c881bc081f1e8872880d3c650acf13dfa8214bad49ed4cede7c34ea", size = 790181, upload-time = "2025-09-25T21:32:18.834Z" }, + { url = "https://files.pythonhosted.org/packages/74/93/7baea19427dcfbe1e5a372d81473250b379f04b1bd3c4c5ff825e2327202/pyyaml-6.0.3-cp312-cp312-win32.whl", hash = "sha256:96b533f0e99f6579b3d4d4995707cf36df9100d67e0c8303a0c55b27b5f99bc5", size = 137658, upload-time = "2025-09-25T21:32:20.209Z" }, + { url = "https://files.pythonhosted.org/packages/86/bf/899e81e4cce32febab4fb42bb97dcdf66bc135272882d1987881a4b519e9/pyyaml-6.0.3-cp312-cp312-win_amd64.whl", hash = "sha256:5fcd34e47f6e0b794d17de1b4ff496c00986e1c83f7ab2fb8fcfe9616ff7477b", size = 154003, upload-time = "2025-09-25T21:32:21.167Z" }, + { url = "https://files.pythonhosted.org/packages/1a/08/67bd04656199bbb51dbed1439b7f27601dfb576fb864099c7ef0c3e55531/pyyaml-6.0.3-cp312-cp312-win_arm64.whl", hash = "sha256:64386e5e707d03a7e172c0701abfb7e10f0fb753ee1d773128192742712a98fd", size = 140344, upload-time = "2025-09-25T21:32:22.617Z" }, + { url = "https://files.pythonhosted.org/packages/d1/11/0fd08f8192109f7169db964b5707a2f1e8b745d4e239b784a5a1dd80d1db/pyyaml-6.0.3-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:8da9669d359f02c0b91ccc01cac4a67f16afec0dac22c2ad09f46bee0697eba8", size = 181669, upload-time = "2025-09-25T21:32:23.673Z" }, + { url = "https://files.pythonhosted.org/packages/b1/16/95309993f1d3748cd644e02e38b75d50cbc0d9561d21f390a76242ce073f/pyyaml-6.0.3-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:2283a07e2c21a2aa78d9c4442724ec1eb15f5e42a723b99cb3d822d48f5f7ad1", size = 173252, upload-time = "2025-09-25T21:32:25.149Z" }, + { url = "https://files.pythonhosted.org/packages/50/31/b20f376d3f810b9b2371e72ef5adb33879b25edb7a6d072cb7ca0c486398/pyyaml-6.0.3-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:ee2922902c45ae8ccada2c5b501ab86c36525b883eff4255313a253a3160861c", size = 767081, upload-time = "2025-09-25T21:32:26.575Z" }, + { url = "https://files.pythonhosted.org/packages/49/1e/a55ca81e949270d5d4432fbbd19dfea5321eda7c41a849d443dc92fd1ff7/pyyaml-6.0.3-cp313-cp313-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:a33284e20b78bd4a18c8c2282d549d10bc8408a2a7ff57653c0cf0b9be0afce5", size = 841159, upload-time = "2025-09-25T21:32:27.727Z" }, + { url = "https://files.pythonhosted.org/packages/74/27/e5b8f34d02d9995b80abcef563ea1f8b56d20134d8f4e5e81733b1feceb2/pyyaml-6.0.3-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:0f29edc409a6392443abf94b9cf89ce99889a1dd5376d94316ae5145dfedd5d6", size = 801626, upload-time = "2025-09-25T21:32:28.878Z" }, + { url = "https://files.pythonhosted.org/packages/f9/11/ba845c23988798f40e52ba45f34849aa8a1f2d4af4b798588010792ebad6/pyyaml-6.0.3-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:f7057c9a337546edc7973c0d3ba84ddcdf0daa14533c2065749c9075001090e6", size = 753613, upload-time = "2025-09-25T21:32:30.178Z" }, + { url = "https://files.pythonhosted.org/packages/3d/e0/7966e1a7bfc0a45bf0a7fb6b98ea03fc9b8d84fa7f2229e9659680b69ee3/pyyaml-6.0.3-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:eda16858a3cab07b80edaf74336ece1f986ba330fdb8ee0d6c0d68fe82bc96be", size = 794115, upload-time = "2025-09-25T21:32:31.353Z" }, + { url = "https://files.pythonhosted.org/packages/de/94/980b50a6531b3019e45ddeada0626d45fa85cbe22300844a7983285bed3b/pyyaml-6.0.3-cp313-cp313-win32.whl", hash = "sha256:d0eae10f8159e8fdad514efdc92d74fd8d682c933a6dd088030f3834bc8e6b26", size = 137427, upload-time = "2025-09-25T21:32:32.58Z" }, + { url = "https://files.pythonhosted.org/packages/97/c9/39d5b874e8b28845e4ec2202b5da735d0199dbe5b8fb85f91398814a9a46/pyyaml-6.0.3-cp313-cp313-win_amd64.whl", hash = "sha256:79005a0d97d5ddabfeeea4cf676af11e647e41d81c9a7722a193022accdb6b7c", size = 154090, upload-time = "2025-09-25T21:32:33.659Z" }, + { url = "https://files.pythonhosted.org/packages/73/e8/2bdf3ca2090f68bb3d75b44da7bbc71843b19c9f2b9cb9b0f4ab7a5a4329/pyyaml-6.0.3-cp313-cp313-win_arm64.whl", hash = "sha256:5498cd1645aa724a7c71c8f378eb29ebe23da2fc0d7a08071d89469bf1d2defb", size = 140246, upload-time = "2025-09-25T21:32:34.663Z" }, + { url = "https://files.pythonhosted.org/packages/9d/8c/f4bd7f6465179953d3ac9bc44ac1a8a3e6122cf8ada906b4f96c60172d43/pyyaml-6.0.3-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:8d1fab6bb153a416f9aeb4b8763bc0f22a5586065f86f7664fc23339fc1c1fac", size = 181814, upload-time = "2025-09-25T21:32:35.712Z" }, + { url = "https://files.pythonhosted.org/packages/bd/9c/4d95bb87eb2063d20db7b60faa3840c1b18025517ae857371c4dd55a6b3a/pyyaml-6.0.3-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:34d5fcd24b8445fadc33f9cf348c1047101756fd760b4dacb5c3e99755703310", size = 173809, upload-time = "2025-09-25T21:32:36.789Z" }, + { url = "https://files.pythonhosted.org/packages/92/b5/47e807c2623074914e29dabd16cbbdd4bf5e9b2db9f8090fa64411fc5382/pyyaml-6.0.3-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:501a031947e3a9025ed4405a168e6ef5ae3126c59f90ce0cd6f2bfc477be31b7", size = 766454, upload-time = "2025-09-25T21:32:37.966Z" }, + { url = "https://files.pythonhosted.org/packages/02/9e/e5e9b168be58564121efb3de6859c452fccde0ab093d8438905899a3a483/pyyaml-6.0.3-cp314-cp314-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:b3bc83488de33889877a0f2543ade9f70c67d66d9ebb4ac959502e12de895788", size = 836355, upload-time = "2025-09-25T21:32:39.178Z" }, + { url = "https://files.pythonhosted.org/packages/88/f9/16491d7ed2a919954993e48aa941b200f38040928474c9e85ea9e64222c3/pyyaml-6.0.3-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:c458b6d084f9b935061bc36216e8a69a7e293a2f1e68bf956dcd9e6cbcd143f5", size = 794175, upload-time = "2025-09-25T21:32:40.865Z" }, + { url = "https://files.pythonhosted.org/packages/dd/3f/5989debef34dc6397317802b527dbbafb2b4760878a53d4166579111411e/pyyaml-6.0.3-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:7c6610def4f163542a622a73fb39f534f8c101d690126992300bf3207eab9764", size = 755228, upload-time = "2025-09-25T21:32:42.084Z" }, + { url = "https://files.pythonhosted.org/packages/d7/ce/af88a49043cd2e265be63d083fc75b27b6ed062f5f9fd6cdc223ad62f03e/pyyaml-6.0.3-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:5190d403f121660ce8d1d2c1bb2ef1bd05b5f68533fc5c2ea899bd15f4399b35", size = 789194, upload-time = "2025-09-25T21:32:43.362Z" }, + { url = "https://files.pythonhosted.org/packages/23/20/bb6982b26a40bb43951265ba29d4c246ef0ff59c9fdcdf0ed04e0687de4d/pyyaml-6.0.3-cp314-cp314-win_amd64.whl", hash = "sha256:4a2e8cebe2ff6ab7d1050ecd59c25d4c8bd7e6f400f5f82b96557ac0abafd0ac", size = 156429, upload-time = "2025-09-25T21:32:57.844Z" }, + { url = "https://files.pythonhosted.org/packages/f4/f4/a4541072bb9422c8a883ab55255f918fa378ecf083f5b85e87fc2b4eda1b/pyyaml-6.0.3-cp314-cp314-win_arm64.whl", hash = "sha256:93dda82c9c22deb0a405ea4dc5f2d0cda384168e466364dec6255b293923b2f3", size = 143912, upload-time = "2025-09-25T21:32:59.247Z" }, + { url = "https://files.pythonhosted.org/packages/7c/f9/07dd09ae774e4616edf6cda684ee78f97777bdd15847253637a6f052a62f/pyyaml-6.0.3-cp314-cp314t-macosx_10_13_x86_64.whl", hash = "sha256:02893d100e99e03eda1c8fd5c441d8c60103fd175728e23e431db1b589cf5ab3", size = 189108, upload-time = "2025-09-25T21:32:44.377Z" }, + { url = "https://files.pythonhosted.org/packages/4e/78/8d08c9fb7ce09ad8c38ad533c1191cf27f7ae1effe5bb9400a46d9437fcf/pyyaml-6.0.3-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:c1ff362665ae507275af2853520967820d9124984e0f7466736aea23d8611fba", size = 183641, upload-time = "2025-09-25T21:32:45.407Z" }, + { url = "https://files.pythonhosted.org/packages/7b/5b/3babb19104a46945cf816d047db2788bcaf8c94527a805610b0289a01c6b/pyyaml-6.0.3-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:6adc77889b628398debc7b65c073bcb99c4a0237b248cacaf3fe8a557563ef6c", size = 831901, upload-time = "2025-09-25T21:32:48.83Z" }, + { url = "https://files.pythonhosted.org/packages/8b/cc/dff0684d8dc44da4d22a13f35f073d558c268780ce3c6ba1b87055bb0b87/pyyaml-6.0.3-cp314-cp314t-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:a80cb027f6b349846a3bf6d73b5e95e782175e52f22108cfa17876aaeff93702", size = 861132, upload-time = "2025-09-25T21:32:50.149Z" }, + { url = "https://files.pythonhosted.org/packages/b1/5e/f77dc6b9036943e285ba76b49e118d9ea929885becb0a29ba8a7c75e29fe/pyyaml-6.0.3-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:00c4bdeba853cc34e7dd471f16b4114f4162dc03e6b7afcc2128711f0eca823c", size = 839261, upload-time = "2025-09-25T21:32:51.808Z" }, + { url = "https://files.pythonhosted.org/packages/ce/88/a9db1376aa2a228197c58b37302f284b5617f56a5d959fd1763fb1675ce6/pyyaml-6.0.3-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:66e1674c3ef6f541c35191caae2d429b967b99e02040f5ba928632d9a7f0f065", size = 805272, upload-time = "2025-09-25T21:32:52.941Z" }, + { url = "https://files.pythonhosted.org/packages/da/92/1446574745d74df0c92e6aa4a7b0b3130706a4142b2d1a5869f2eaa423c6/pyyaml-6.0.3-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:16249ee61e95f858e83976573de0f5b2893b3677ba71c9dd36b9cf8be9ac6d65", size = 829923, upload-time = "2025-09-25T21:32:54.537Z" }, + { url = "https://files.pythonhosted.org/packages/f0/7a/1c7270340330e575b92f397352af856a8c06f230aa3e76f86b39d01b416a/pyyaml-6.0.3-cp314-cp314t-win_amd64.whl", hash = "sha256:4ad1906908f2f5ae4e5a8ddfce73c320c2a1429ec52eafd27138b7f1cbe341c9", size = 174062, upload-time = "2025-09-25T21:32:55.767Z" }, + { url = "https://files.pythonhosted.org/packages/f1/12/de94a39c2ef588c7e6455cfbe7343d3b2dc9d6b6b2f40c4c6565744c873d/pyyaml-6.0.3-cp314-cp314t-win_arm64.whl", hash = "sha256:ebc55a14a21cb14062aa4162f906cd962b28e2e9ea38f9b4391244cd8de4ae0b", size = 149341, upload-time = "2025-09-25T21:32:56.828Z" }, +] + +[[package]] +name = "pyzmq" +version = "27.1.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "cffi", marker = "implementation_name == 'pypy'" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/04/0b/3c9baedbdf613ecaa7aa07027780b8867f57b6293b6ee50de316c9f3222b/pyzmq-27.1.0.tar.gz", hash = "sha256:ac0765e3d44455adb6ddbf4417dcce460fc40a05978c08efdf2948072f6db540", size = 281750, upload-time = "2025-09-08T23:10:18.157Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/06/5d/305323ba86b284e6fcb0d842d6adaa2999035f70f8c38a9b6d21ad28c3d4/pyzmq-27.1.0-cp311-cp311-macosx_10_15_universal2.whl", hash = "sha256:226b091818d461a3bef763805e75685e478ac17e9008f49fce2d3e52b3d58b86", size = 1333328, upload-time = "2025-09-08T23:07:45.946Z" }, + { url = "https://files.pythonhosted.org/packages/bd/a0/fc7e78a23748ad5443ac3275943457e8452da67fda347e05260261108cbc/pyzmq-27.1.0-cp311-cp311-manylinux2014_i686.manylinux_2_17_i686.whl", hash = "sha256:0790a0161c281ca9723f804871b4027f2e8b5a528d357c8952d08cd1a9c15581", size = 908803, upload-time = "2025-09-08T23:07:47.551Z" }, + { url = "https://files.pythonhosted.org/packages/7e/22/37d15eb05f3bdfa4abea6f6d96eb3bb58585fbd3e4e0ded4e743bc650c97/pyzmq-27.1.0-cp311-cp311-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:c895a6f35476b0c3a54e3eb6ccf41bf3018de937016e6e18748317f25d4e925f", size = 668836, upload-time = "2025-09-08T23:07:49.436Z" }, + { url = "https://files.pythonhosted.org/packages/b1/c4/2a6fe5111a01005fc7af3878259ce17684fabb8852815eda6225620f3c59/pyzmq-27.1.0-cp311-cp311-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:5bbf8d3630bf96550b3be8e1fc0fea5cbdc8d5466c1192887bd94869da17a63e", size = 857038, upload-time = "2025-09-08T23:07:51.234Z" }, + { url = "https://files.pythonhosted.org/packages/cb/eb/bfdcb41d0db9cd233d6fb22dc131583774135505ada800ebf14dfb0a7c40/pyzmq-27.1.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:15c8bd0fe0dabf808e2d7a681398c4e5ded70a551ab47482067a572c054c8e2e", size = 1657531, upload-time = "2025-09-08T23:07:52.795Z" }, + { url = "https://files.pythonhosted.org/packages/ab/21/e3180ca269ed4a0de5c34417dfe71a8ae80421198be83ee619a8a485b0c7/pyzmq-27.1.0-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:bafcb3dd171b4ae9f19ee6380dfc71ce0390fefaf26b504c0e5f628d7c8c54f2", size = 2034786, upload-time = "2025-09-08T23:07:55.047Z" }, + { url = "https://files.pythonhosted.org/packages/3b/b1/5e21d0b517434b7f33588ff76c177c5a167858cc38ef740608898cd329f2/pyzmq-27.1.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:e829529fcaa09937189178115c49c504e69289abd39967cd8a4c215761373394", size = 1894220, upload-time = "2025-09-08T23:07:57.172Z" }, + { url = "https://files.pythonhosted.org/packages/03/f2/44913a6ff6941905efc24a1acf3d3cb6146b636c546c7406c38c49c403d4/pyzmq-27.1.0-cp311-cp311-win32.whl", hash = "sha256:6df079c47d5902af6db298ec92151db82ecb557af663098b92f2508c398bb54f", size = 567155, upload-time = "2025-09-08T23:07:59.05Z" }, + { url = "https://files.pythonhosted.org/packages/23/6d/d8d92a0eb270a925c9b4dd039c0b4dc10abc2fcbc48331788824ef113935/pyzmq-27.1.0-cp311-cp311-win_amd64.whl", hash = "sha256:190cbf120fbc0fc4957b56866830def56628934a9d112aec0e2507aa6a032b97", size = 633428, upload-time = "2025-09-08T23:08:00.663Z" }, + { url = "https://files.pythonhosted.org/packages/ae/14/01afebc96c5abbbd713ecfc7469cfb1bc801c819a74ed5c9fad9a48801cb/pyzmq-27.1.0-cp311-cp311-win_arm64.whl", hash = "sha256:eca6b47df11a132d1745eb3b5b5e557a7dae2c303277aa0e69c6ba91b8736e07", size = 559497, upload-time = "2025-09-08T23:08:02.15Z" }, + { url = "https://files.pythonhosted.org/packages/92/e7/038aab64a946d535901103da16b953c8c9cc9c961dadcbf3609ed6428d23/pyzmq-27.1.0-cp312-abi3-macosx_10_15_universal2.whl", hash = "sha256:452631b640340c928fa343801b0d07eb0c3789a5ffa843f6e1a9cee0ba4eb4fc", size = 1306279, upload-time = "2025-09-08T23:08:03.807Z" }, + { url = "https://files.pythonhosted.org/packages/e8/5e/c3c49fdd0f535ef45eefcc16934648e9e59dace4a37ee88fc53f6cd8e641/pyzmq-27.1.0-cp312-abi3-manylinux2014_i686.manylinux_2_17_i686.whl", hash = "sha256:1c179799b118e554b66da67d88ed66cd37a169f1f23b5d9f0a231b4e8d44a113", size = 895645, upload-time = "2025-09-08T23:08:05.301Z" }, + { url = "https://files.pythonhosted.org/packages/f8/e5/b0b2504cb4e903a74dcf1ebae157f9e20ebb6ea76095f6cfffea28c42ecd/pyzmq-27.1.0-cp312-abi3-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:3837439b7f99e60312f0c926a6ad437b067356dc2bc2ec96eb395fd0fe804233", size = 652574, upload-time = "2025-09-08T23:08:06.828Z" }, + { url = "https://files.pythonhosted.org/packages/f8/9b/c108cdb55560eaf253f0cbdb61b29971e9fb34d9c3499b0e96e4e60ed8a5/pyzmq-27.1.0-cp312-abi3-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:43ad9a73e3da1fab5b0e7e13402f0b2fb934ae1c876c51d0afff0e7c052eca31", size = 840995, upload-time = "2025-09-08T23:08:08.396Z" }, + { url = "https://files.pythonhosted.org/packages/c2/bb/b79798ca177b9eb0825b4c9998c6af8cd2a7f15a6a1a4272c1d1a21d382f/pyzmq-27.1.0-cp312-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:0de3028d69d4cdc475bfe47a6128eb38d8bc0e8f4d69646adfbcd840facbac28", size = 1642070, upload-time = "2025-09-08T23:08:09.989Z" }, + { url = "https://files.pythonhosted.org/packages/9c/80/2df2e7977c4ede24c79ae39dcef3899bfc5f34d1ca7a5b24f182c9b7a9ca/pyzmq-27.1.0-cp312-abi3-musllinux_1_2_i686.whl", hash = "sha256:cf44a7763aea9298c0aa7dbf859f87ed7012de8bda0f3977b6fb1d96745df856", size = 2021121, upload-time = "2025-09-08T23:08:11.907Z" }, + { url = "https://files.pythonhosted.org/packages/46/bd/2d45ad24f5f5ae7e8d01525eb76786fa7557136555cac7d929880519e33a/pyzmq-27.1.0-cp312-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:f30f395a9e6fbca195400ce833c731e7b64c3919aa481af4d88c3759e0cb7496", size = 1878550, upload-time = "2025-09-08T23:08:13.513Z" }, + { url = "https://files.pythonhosted.org/packages/e6/2f/104c0a3c778d7c2ab8190e9db4f62f0b6957b53c9d87db77c284b69f33ea/pyzmq-27.1.0-cp312-abi3-win32.whl", hash = "sha256:250e5436a4ba13885494412b3da5d518cd0d3a278a1ae640e113c073a5f88edd", size = 559184, upload-time = "2025-09-08T23:08:15.163Z" }, + { url = "https://files.pythonhosted.org/packages/fc/7f/a21b20d577e4100c6a41795842028235998a643b1ad406a6d4163ea8f53e/pyzmq-27.1.0-cp312-abi3-win_amd64.whl", hash = "sha256:9ce490cf1d2ca2ad84733aa1d69ce6855372cb5ce9223802450c9b2a7cba0ccf", size = 619480, upload-time = "2025-09-08T23:08:17.192Z" }, + { url = "https://files.pythonhosted.org/packages/78/c2/c012beae5f76b72f007a9e91ee9401cb88c51d0f83c6257a03e785c81cc2/pyzmq-27.1.0-cp312-abi3-win_arm64.whl", hash = "sha256:75a2f36223f0d535a0c919e23615fc85a1e23b71f40c7eb43d7b1dedb4d8f15f", size = 552993, upload-time = "2025-09-08T23:08:18.926Z" }, + { url = "https://files.pythonhosted.org/packages/60/cb/84a13459c51da6cec1b7b1dc1a47e6db6da50b77ad7fd9c145842750a011/pyzmq-27.1.0-cp313-cp313-android_24_arm64_v8a.whl", hash = "sha256:93ad4b0855a664229559e45c8d23797ceac03183c7b6f5b4428152a6b06684a5", size = 1122436, upload-time = "2025-09-08T23:08:20.801Z" }, + { url = "https://files.pythonhosted.org/packages/dc/b6/94414759a69a26c3dd674570a81813c46a078767d931a6c70ad29fc585cb/pyzmq-27.1.0-cp313-cp313-android_24_x86_64.whl", hash = "sha256:fbb4f2400bfda24f12f009cba62ad5734148569ff4949b1b6ec3b519444342e6", size = 1156301, upload-time = "2025-09-08T23:08:22.47Z" }, + { url = "https://files.pythonhosted.org/packages/a5/ad/15906493fd40c316377fd8a8f6b1f93104f97a752667763c9b9c1b71d42d/pyzmq-27.1.0-cp313-cp313t-macosx_10_15_universal2.whl", hash = "sha256:e343d067f7b151cfe4eb3bb796a7752c9d369eed007b91231e817071d2c2fec7", size = 1341197, upload-time = "2025-09-08T23:08:24.286Z" }, + { url = "https://files.pythonhosted.org/packages/14/1d/d343f3ce13db53a54cb8946594e567410b2125394dafcc0268d8dda027e0/pyzmq-27.1.0-cp313-cp313t-manylinux2014_i686.manylinux_2_17_i686.whl", hash = "sha256:08363b2011dec81c354d694bdecaef4770e0ae96b9afea70b3f47b973655cc05", size = 897275, upload-time = "2025-09-08T23:08:26.063Z" }, + { url = "https://files.pythonhosted.org/packages/69/2d/d83dd6d7ca929a2fc67d2c3005415cdf322af7751d773524809f9e585129/pyzmq-27.1.0-cp313-cp313t-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:d54530c8c8b5b8ddb3318f481297441af102517602b569146185fa10b63f4fa9", size = 660469, upload-time = "2025-09-08T23:08:27.623Z" }, + { url = "https://files.pythonhosted.org/packages/3e/cd/9822a7af117f4bc0f1952dbe9ef8358eb50a24928efd5edf54210b850259/pyzmq-27.1.0-cp313-cp313t-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:6f3afa12c392f0a44a2414056d730eebc33ec0926aae92b5ad5cf26ebb6cc128", size = 847961, upload-time = "2025-09-08T23:08:29.672Z" }, + { url = "https://files.pythonhosted.org/packages/9a/12/f003e824a19ed73be15542f172fd0ec4ad0b60cf37436652c93b9df7c585/pyzmq-27.1.0-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:c65047adafe573ff023b3187bb93faa583151627bc9c51fc4fb2c561ed689d39", size = 1650282, upload-time = "2025-09-08T23:08:31.349Z" }, + { url = "https://files.pythonhosted.org/packages/d5/4a/e82d788ed58e9a23995cee70dbc20c9aded3d13a92d30d57ec2291f1e8a3/pyzmq-27.1.0-cp313-cp313t-musllinux_1_2_i686.whl", hash = "sha256:90e6e9441c946a8b0a667356f7078d96411391a3b8f80980315455574177ec97", size = 2024468, upload-time = "2025-09-08T23:08:33.543Z" }, + { url = "https://files.pythonhosted.org/packages/d9/94/2da0a60841f757481e402b34bf4c8bf57fa54a5466b965de791b1e6f747d/pyzmq-27.1.0-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:add071b2d25f84e8189aaf0882d39a285b42fa3853016ebab234a5e78c7a43db", size = 1885394, upload-time = "2025-09-08T23:08:35.51Z" }, + { url = "https://files.pythonhosted.org/packages/4f/6f/55c10e2e49ad52d080dc24e37adb215e5b0d64990b57598abc2e3f01725b/pyzmq-27.1.0-cp313-cp313t-win32.whl", hash = "sha256:7ccc0700cfdf7bd487bea8d850ec38f204478681ea02a582a8da8171b7f90a1c", size = 574964, upload-time = "2025-09-08T23:08:37.178Z" }, + { url = "https://files.pythonhosted.org/packages/87/4d/2534970ba63dd7c522d8ca80fb92777f362c0f321900667c615e2067cb29/pyzmq-27.1.0-cp313-cp313t-win_amd64.whl", hash = "sha256:8085a9fba668216b9b4323be338ee5437a235fe275b9d1610e422ccc279733e2", size = 641029, upload-time = "2025-09-08T23:08:40.595Z" }, + { url = "https://files.pythonhosted.org/packages/f6/fa/f8aea7a28b0641f31d40dea42d7ef003fded31e184ef47db696bc74cd610/pyzmq-27.1.0-cp313-cp313t-win_arm64.whl", hash = "sha256:6bb54ca21bcfe361e445256c15eedf083f153811c37be87e0514934d6913061e", size = 561541, upload-time = "2025-09-08T23:08:42.668Z" }, + { url = "https://files.pythonhosted.org/packages/87/45/19efbb3000956e82d0331bafca5d9ac19ea2857722fa2caacefb6042f39d/pyzmq-27.1.0-cp314-cp314t-macosx_10_15_universal2.whl", hash = "sha256:ce980af330231615756acd5154f29813d553ea555485ae712c491cd483df6b7a", size = 1341197, upload-time = "2025-09-08T23:08:44.973Z" }, + { url = "https://files.pythonhosted.org/packages/48/43/d72ccdbf0d73d1343936296665826350cb1e825f92f2db9db3e61c2162a2/pyzmq-27.1.0-cp314-cp314t-manylinux2014_i686.manylinux_2_17_i686.whl", hash = "sha256:1779be8c549e54a1c38f805e56d2a2e5c009d26de10921d7d51cfd1c8d4632ea", size = 897175, upload-time = "2025-09-08T23:08:46.601Z" }, + { url = "https://files.pythonhosted.org/packages/2f/2e/a483f73a10b65a9ef0161e817321d39a770b2acf8bcf3004a28d90d14a94/pyzmq-27.1.0-cp314-cp314t-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:7200bb0f03345515df50d99d3db206a0a6bee1955fbb8c453c76f5bf0e08fb96", size = 660427, upload-time = "2025-09-08T23:08:48.187Z" }, + { url = "https://files.pythonhosted.org/packages/f5/d2/5f36552c2d3e5685abe60dfa56f91169f7a2d99bbaf67c5271022ab40863/pyzmq-27.1.0-cp314-cp314t-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:01c0e07d558b06a60773744ea6251f769cd79a41a97d11b8bf4ab8f034b0424d", size = 847929, upload-time = "2025-09-08T23:08:49.76Z" }, + { url = "https://files.pythonhosted.org/packages/c4/2a/404b331f2b7bf3198e9945f75c4c521f0c6a3a23b51f7a4a401b94a13833/pyzmq-27.1.0-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:80d834abee71f65253c91540445d37c4c561e293ba6e741b992f20a105d69146", size = 1650193, upload-time = "2025-09-08T23:08:51.7Z" }, + { url = "https://files.pythonhosted.org/packages/1c/0b/f4107e33f62a5acf60e3ded67ed33d79b4ce18de432625ce2fc5093d6388/pyzmq-27.1.0-cp314-cp314t-musllinux_1_2_i686.whl", hash = "sha256:544b4e3b7198dde4a62b8ff6685e9802a9a1ebf47e77478a5eb88eca2a82f2fd", size = 2024388, upload-time = "2025-09-08T23:08:53.393Z" }, + { url = "https://files.pythonhosted.org/packages/0d/01/add31fe76512642fd6e40e3a3bd21f4b47e242c8ba33efb6809e37076d9b/pyzmq-27.1.0-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:cedc4c68178e59a4046f97eca31b148ddcf51e88677de1ef4e78cf06c5376c9a", size = 1885316, upload-time = "2025-09-08T23:08:55.702Z" }, + { url = "https://files.pythonhosted.org/packages/c4/59/a5f38970f9bf07cee96128de79590bb354917914a9be11272cfc7ff26af0/pyzmq-27.1.0-cp314-cp314t-win32.whl", hash = "sha256:1f0b2a577fd770aa6f053211a55d1c47901f4d537389a034c690291485e5fe92", size = 587472, upload-time = "2025-09-08T23:08:58.18Z" }, + { url = "https://files.pythonhosted.org/packages/70/d8/78b1bad170f93fcf5e3536e70e8fadac55030002275c9a29e8f5719185de/pyzmq-27.1.0-cp314-cp314t-win_amd64.whl", hash = "sha256:19c9468ae0437f8074af379e986c5d3d7d7bfe033506af442e8c879732bedbe0", size = 661401, upload-time = "2025-09-08T23:08:59.802Z" }, + { url = "https://files.pythonhosted.org/packages/81/d6/4bfbb40c9a0b42fc53c7cf442f6385db70b40f74a783130c5d0a5aa62228/pyzmq-27.1.0-cp314-cp314t-win_arm64.whl", hash = "sha256:dc5dbf68a7857b59473f7df42650c621d7e8923fb03fa74a526890f4d33cc4d7", size = 575170, upload-time = "2025-09-08T23:09:01.418Z" }, + { url = "https://files.pythonhosted.org/packages/4c/c6/c4dcdecdbaa70969ee1fdced6d7b8f60cfabe64d25361f27ac4665a70620/pyzmq-27.1.0-pp311-pypy311_pp73-macosx_10_15_x86_64.whl", hash = "sha256:18770c8d3563715387139060d37859c02ce40718d1faf299abddcdcc6a649066", size = 836265, upload-time = "2025-09-08T23:09:49.376Z" }, + { url = "https://files.pythonhosted.org/packages/3e/79/f38c92eeaeb03a2ccc2ba9866f0439593bb08c5e3b714ac1d553e5c96e25/pyzmq-27.1.0-pp311-pypy311_pp73-manylinux2014_i686.manylinux_2_17_i686.whl", hash = "sha256:ac25465d42f92e990f8d8b0546b01c391ad431c3bf447683fdc40565941d0604", size = 800208, upload-time = "2025-09-08T23:09:51.073Z" }, + { url = "https://files.pythonhosted.org/packages/49/0e/3f0d0d335c6b3abb9b7b723776d0b21fa7f3a6c819a0db6097059aada160/pyzmq-27.1.0-pp311-pypy311_pp73-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:53b40f8ae006f2734ee7608d59ed661419f087521edbfc2149c3932e9c14808c", size = 567747, upload-time = "2025-09-08T23:09:52.698Z" }, + { url = "https://files.pythonhosted.org/packages/a1/cf/f2b3784d536250ffd4be70e049f3b60981235d70c6e8ce7e3ef21e1adb25/pyzmq-27.1.0-pp311-pypy311_pp73-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:f605d884e7c8be8fe1aa94e0a783bf3f591b84c24e4bc4f3e7564c82ac25e271", size = 747371, upload-time = "2025-09-08T23:09:54.563Z" }, + { url = "https://files.pythonhosted.org/packages/01/1b/5dbe84eefc86f48473947e2f41711aded97eecef1231f4558f1f02713c12/pyzmq-27.1.0-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:c9f7f6e13dff2e44a6afeaf2cf54cee5929ad64afaf4d40b50f93c58fc687355", size = 544862, upload-time = "2025-09-08T23:09:56.509Z" }, +] + +[[package]] +name = "redis" +version = "8.0.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "async-timeout", marker = "python_full_version < '3.11.3'" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/53/ae/ed461cca5780b5fc8b9fe8ca0ed98d89508645fb9d880c24cc42c087678f/redis-8.0.0.tar.gz", hash = "sha256:a00c5355432051ac14e593b8b197fc76c887ee12d55a0984f69328a1115fdc49", size = 5101591, upload-time = "2026-05-28T12:45:13.5Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/27/e3/b519734372d305bd547534a9f32e4ce9f98552af753dce72cf3483a0ff0b/redis-8.0.0-py3-none-any.whl", hash = "sha256:c938c18338585009f0bc310f4c7e4e4b4d37639356c4ac072cedf3af570c8dc7", size = 499870, upload-time = "2026-05-28T12:45:11.697Z" }, +] + +[[package]] +name = "referencing" +version = "0.37.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "attrs" }, + { name = "rpds-py" }, + { name = "typing-extensions", marker = "python_full_version < '3.13'" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/22/f5/df4e9027acead3ecc63e50fe1e36aca1523e1719559c499951bb4b53188f/referencing-0.37.0.tar.gz", hash = "sha256:44aefc3142c5b842538163acb373e24cce6632bd54bdb01b21ad5863489f50d8", size = 78036, upload-time = "2025-10-13T15:30:48.871Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/2c/58/ca301544e1fa93ed4f80d724bf5b194f6e4b945841c5bfd555878eea9fcb/referencing-0.37.0-py3-none-any.whl", hash = "sha256:381329a9f99628c9069361716891d34ad94af76e461dcb0335825aecc7692231", size = 26766, upload-time = "2025-10-13T15:30:47.625Z" }, +] + +[[package]] +name = "regex" +version = "2026.5.9" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/dc/0e/49aee608ad09480e7fd276898c99ec6192985fa331abe4eb3a986094490b/regex-2026.5.9.tar.gz", hash = "sha256:a8234aa23ec39894bfe4a3f1b85616a7032481964a13ac6fc9f10de4f6fca270", size = 416074, upload-time = "2026-05-09T23:15:19.37Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/c2/dc/c1f2df4027e82fc54b5a473e4b250f5139faca49a0fbe29a48668d228f34/regex-2026.5.9-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:ccf5249114cc3e772ecdd88a98a86eca0fd74c61ce32a94743758c083fc05d48", size = 489445, upload-time = "2026-05-09T23:12:06.111Z" }, + { url = "https://files.pythonhosted.org/packages/03/d2/59f01110660081cce9c0bc30ebd0b5ee250dacf658e3248ed92f01e0e8ee/regex-2026.5.9-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:46f1326ca6e65b0879d23ca302c0f2415aad42ff0309b9c818e7949fe19a41d8", size = 291271, upload-time = "2026-05-09T23:12:07.731Z" }, + { url = "https://files.pythonhosted.org/packages/58/b6/14b2c84ff90ddb370c81d27503f4a0fcf071496416f4855f6cc8c5d81c35/regex-2026.5.9-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:ef31cbfe458e21c6122ba8150ff060e0c7789ed0d26eb423f25472584920b555", size = 289212, upload-time = "2026-05-09T23:12:09.266Z" }, + { url = "https://files.pythonhosted.org/packages/03/d0/4db86529117320de0c84afd90e70bb47434625875e34fcef9d8c127c5b16/regex-2026.5.9-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:992604d02e6d9c6d786c24a706a71ecffe1020fc1ef264044474cd81fa2c3919", size = 792310, upload-time = "2026-05-09T23:12:11.416Z" }, + { url = "https://files.pythonhosted.org/packages/07/78/fe4800cd322f862ecffd2d553409b20d80650e5ed71b9d178f853d020b82/regex-2026.5.9-cp311-cp311-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:c9411dd64ca95477225734a93dfc8583b51916b8d5942f99d6cac21e09965451", size = 861721, upload-time = "2026-05-09T23:12:13.681Z" }, + { url = "https://files.pythonhosted.org/packages/b5/d0/b3618a895dd8feb897c61bb2954edd265e1767d82a01d53065d5871127a3/regex-2026.5.9-cp311-cp311-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:3dd4a3ff360dfb836fecdb93a4598f9d6e2ac81e3e397125145c6221bf58cf4c", size = 906460, upload-time = "2026-05-09T23:12:15.443Z" }, + { url = "https://files.pythonhosted.org/packages/33/6f/1481597e859ef19508b345eec4afd1416ed6e6b459c75a64026ef193aecf/regex-2026.5.9-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:2a661a7d270a61f7cf460caee8b9fa2d5ef9e5c681234bcb9e0fe14f488e7dfc", size = 799843, upload-time = "2026-05-09T23:12:16.892Z" }, + { url = "https://files.pythonhosted.org/packages/73/59/955734c803f59108deccba3597ae440c76b62a652733c0006e6243758420/regex-2026.5.9-cp311-cp311-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:f079e50a0d3cc3cd5091fa9ff45869a2e6b2cd35895731edafb0327901a8d86d", size = 773610, upload-time = "2026-05-09T23:12:19.127Z" }, + { url = "https://files.pythonhosted.org/packages/68/8f/70c04a236d651c81881dac42ef8538bddda6121434509d0a22d9e601503b/regex-2026.5.9-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:4ebe8f0b5ec5a5024dc4a4c59f444c4e9afc5f2abdbb8962065b75d27fb971f9", size = 781645, upload-time = "2026-05-09T23:12:20.806Z" }, + { url = "https://files.pythonhosted.org/packages/1d/96/05c7434d88185e5d27fe54aeb74df86bd77cd79f52f0b4eae54faa8fea70/regex-2026.5.9-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:97cf3bc1b7d7d2306772ec07366c80d9df00ff79e79cea32898883a646d2fae2", size = 854473, upload-time = "2026-05-09T23:12:22.465Z" }, + { url = "https://files.pythonhosted.org/packages/4e/c1/6e3d8202d981f3117004bf341ee74893ba4ba8a9fbaf4b94615846550a08/regex-2026.5.9-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:0f9eede6a5cbdc02d4978090186390936e1776a7d1359b21e41014c609880bcf", size = 763311, upload-time = "2026-05-09T23:12:24.351Z" }, + { url = "https://files.pythonhosted.org/packages/93/c7/e7737f1526b3fb32bd4c337fd6c71c3ebb5c8296fc34d11197e0955d2e35/regex-2026.5.9-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:01f0f5f55f4b64dacec85dc116d3c05fd23ad3ff037bbc73a2085775953c2611", size = 844593, upload-time = "2026-05-09T23:12:26.341Z" }, + { url = "https://files.pythonhosted.org/packages/a5/27/0daffb1a535bb39f422c3d200f4ab023c71110ad66a32b366bee708baba0/regex-2026.5.9-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:1268eddd8486dc561d08eee1156e40aa3a8fe10f4bdec8fa653b455fcbffd12c", size = 789167, upload-time = "2026-05-09T23:12:27.975Z" }, + { url = "https://files.pythonhosted.org/packages/ce/fc/294fe4fac4f2ed67207b17471815870c1c45b3a489e08e0ac96daea16ef6/regex-2026.5.9-cp311-cp311-win32.whl", hash = "sha256:8676474c07469d6f33dd1085ca2cd45f65785f32518f2b20e36d9953ca07f994", size = 266249, upload-time = "2026-05-09T23:12:30.141Z" }, + { url = "https://files.pythonhosted.org/packages/d0/b0/8dce459f6245bcf8f6e9f23ac9569f1a0f15c131cc0745e82b43226204cf/regex-2026.5.9-cp311-cp311-win_amd64.whl", hash = "sha256:246de9d60aa3f8538b519834dd95cbf276ea263d6a7bd5a3666dc3fa0230505b", size = 278423, upload-time = "2026-05-09T23:12:31.676Z" }, + { url = "https://files.pythonhosted.org/packages/db/8d/f9aeff6ad63a3ef720386f2907e6d34a35a510a6e498ebad28b0fb3f6ab6/regex-2026.5.9-cp311-cp311-win_arm64.whl", hash = "sha256:d726ca3f0d76969bf1e8e477d160d3d666bbf999f6860bd314889e5345782046", size = 270420, upload-time = "2026-05-09T23:12:33.194Z" }, + { url = "https://files.pythonhosted.org/packages/50/9b/6550044bc44e17c84d312c031c2ec42fbdb6a4ec4e29093be3a172d08772/regex-2026.5.9-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:57eeeb05db7979413dec5438f2db21d7ecbba787cde7a711df1a6f6df672aa06", size = 490451, upload-time = "2026-05-09T23:12:34.72Z" }, + { url = "https://files.pythonhosted.org/packages/1e/95/fc7ba4303b5a0f92446a12ee6778ef2c6c799233f5060042a31bf390cfe9/regex-2026.5.9-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:398c521292f4c7fb807001dcd54694d3a1fcafc179a36ad9cc56f98df85930b6", size = 292112, upload-time = "2026-05-09T23:12:36.285Z" }, + { url = "https://files.pythonhosted.org/packages/54/4b/ee27938d1b2c443e89a9a10e00d2d19aa5ee300cd3d61140644e93bb083e/regex-2026.5.9-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:f7a7c26137296beba7784de6eba69c6a93a63ccebc385e4962fe67e267a91225", size = 289599, upload-time = "2026-05-09T23:12:38.089Z" }, + { url = "https://files.pythonhosted.org/packages/d8/dd/ba103dc19614e25f3880800ca67ce093d6e21b325d72b8383c7bf906e9fa/regex-2026.5.9-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:6441cc660d76107934a09c22167200839a0e89604a6297f78a974e66e931d2c0", size = 796732, upload-time = "2026-05-09T23:12:40.062Z" }, + { url = "https://files.pythonhosted.org/packages/cf/e7/f035b4fd858b050b0080bf302968dc0f59ba34e391872d54936758e6844e/regex-2026.5.9-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:91328f1c23d47595ca3ef0a7557fa129c5a23404b775c770697d2f35b33e0107", size = 865440, upload-time = "2026-05-09T23:12:42.059Z" }, + { url = "https://files.pythonhosted.org/packages/0a/51/8cd301ecc899aea28124357f729f4272f44de7806fc7ca02490bfbe253e8/regex-2026.5.9-cp312-cp312-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:93a7860539414dddaefba2b40f8771765ae17949d4c7182b876ce429e11a8309", size = 912329, upload-time = "2026-05-09T23:12:44.373Z" }, + { url = "https://files.pythonhosted.org/packages/cc/1e/3fbe2fa1e8cebd62f3bb7d3321cff1640aca2e240b51d9bd624aad949260/regex-2026.5.9-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:dd2810d22146b6d838acc5ec15602cb6b47920aa4e33015df3868eedfd20bab8", size = 801239, upload-time = "2026-05-09T23:12:46.268Z" }, + { url = "https://files.pythonhosted.org/packages/17/2f/6f6008682bf2cf98040a0d3153a8e557b6ab728d7713d045cee4ce544ab8/regex-2026.5.9-cp312-cp312-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:daff2bdbaf1d23e52fdff7c0b7bc2048b68f978df6a4d107ac981f94caef2e66", size = 777054, upload-time = "2026-05-09T23:12:48.051Z" }, + { url = "https://files.pythonhosted.org/packages/19/2b/eee0d20a6842ba04df4b8847a920b57ef56853f14ef85405473e586b605a/regex-2026.5.9-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:4eeb011098fcb77af513dcef521a3dbecbf8849b1e38940759d293b7a93f5026", size = 785098, upload-time = "2026-05-09T23:12:49.851Z" }, + { url = "https://files.pythonhosted.org/packages/4a/98/6fc1e6410feefb92159edaed5041992bfe390e8d26c721865434acbca558/regex-2026.5.9-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:ea9c8ecfa1b73c73b626534d6626e5340d429630943672b8480724f44e84b962", size = 860095, upload-time = "2026-05-09T23:12:51.666Z" }, + { url = "https://files.pythonhosted.org/packages/18/a3/bd855e0f2cb1a978ecf6fa6bb69632dd9c3f6ea3b81cde62fde14c9daec7/regex-2026.5.9-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:cd2846168eb9ee3c513902bc8225409cb1caab31d04728b145171fa1625d9621", size = 765762, upload-time = "2026-05-09T23:12:53.413Z" }, + { url = "https://files.pythonhosted.org/packages/dc/66/0ae8c092e60b14c79d24f8e0b7f0aea5bfbffdcab00b5483d13404d3c3a5/regex-2026.5.9-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:39617fb0cde9c0e6306dc70e3bfc096f3da793219879f7ae7aa341a69fbdcf6d", size = 852100, upload-time = "2026-05-09T23:12:55.256Z" }, + { url = "https://files.pythonhosted.org/packages/21/de/8dfde60fc1b21c946a893ba273403b72617edb261370cb1087099a83f088/regex-2026.5.9-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:fd03c4f0e33280d15cae17159b899245d6b7c53d21def19b263b39655061f5ce", size = 789479, upload-time = "2026-05-09T23:12:57.573Z" }, + { url = "https://files.pythonhosted.org/packages/c3/1c/bdcc98f9a4af4fdd166c74941174619ccff4726d3ce32faa8e9a2ecd38dd/regex-2026.5.9-cp312-cp312-win32.whl", hash = "sha256:164eba9b755ea6f244b0d881196fbc1fac09714e9782c9e2732b813142033c8e", size = 266699, upload-time = "2026-05-09T23:12:59.14Z" }, + { url = "https://files.pythonhosted.org/packages/78/87/240d36864f9e48ace85f72e79ced97ceb7f27ce87739a947dcb834b4e6bc/regex-2026.5.9-cp312-cp312-win_amd64.whl", hash = "sha256:86f40a5d6444db30a125c9c9177e6b25dad981cbc37451fd838f145e6edac92e", size = 277783, upload-time = "2026-05-09T23:13:00.789Z" }, + { url = "https://files.pythonhosted.org/packages/4f/b5/7b30f312b0669dff5beebe5b0989dc2d1a312b1a44fab852199c387a5b96/regex-2026.5.9-cp312-cp312-win_arm64.whl", hash = "sha256:96f5f58b54a063d7ea9dca08e1cf57bfe10499c4d579ee672da284f57f5f0070", size = 270513, upload-time = "2026-05-09T23:13:02.426Z" }, + { url = "https://files.pythonhosted.org/packages/aa/da/797e91ecec6f84135da778ddce78c20e0af5d2a15c26f87a81bc3eadb6db/regex-2026.5.9-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:d626b84406444b165fc0ba981604edea39f0588ff1f92baa23fe50799ea9afdb", size = 490303, upload-time = "2026-05-09T23:13:04.382Z" }, + { url = "https://files.pythonhosted.org/packages/44/da/bf30abaaa737b58f4a4b8c4a03659e02fd92092c822e0197ed9e0daab917/regex-2026.5.9-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:d7bdc0ab8f3dd7e1b4f9ab88634e13374669db86bb3c72e8292f07ae313f539f", size = 292019, upload-time = "2026-05-09T23:13:06.022Z" }, + { url = "https://files.pythonhosted.org/packages/2d/e7/d0eaf5713828417b9e5648cf81fa9bacd4961f6ab98c380c2034f8716e35/regex-2026.5.9-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:a8820737949116ffff55fe18f9fc644530063ba6ebfcb8314239416e78f1347c", size = 289468, upload-time = "2026-05-09T23:13:08.214Z" }, + { url = "https://files.pythonhosted.org/packages/d3/9b/b3fdd62b003baa1a9b593cd8c8699c9651c2e80cc21a5c715707983c42d7/regex-2026.5.9-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:aa0fbdbac82cb3e4450d0ccde7d7a35607f4cb2dd9fba4b8b69bfaf8c9fa6aed", size = 796749, upload-time = "2026-05-09T23:13:10.573Z" }, + { url = "https://files.pythonhosted.org/packages/d4/30/66ab84588765f5b4b271a9ca09ef7ce2b87caa95176ec3d2ad65d7bc4902/regex-2026.5.9-cp313-cp313-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:57e8915c7986aa33d25e4d3629cef711cd2863f2961b10409f0c04cb8b7d9020", size = 865445, upload-time = "2026-05-09T23:13:12.523Z" }, + { url = "https://files.pythonhosted.org/packages/1a/89/f05169e8588aac365f35ffc7f3bc3184f095ef4cfded7cfaa3c7fd5dbd89/regex-2026.5.9-cp313-cp313-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:508f56a89ba9cb26e4168cbc37dbd60a28d82430a9e18ad1d25fe0883c314ca2", size = 912322, upload-time = "2026-05-09T23:13:14.281Z" }, + { url = "https://files.pythonhosted.org/packages/30/e1/c93444052cf41581f3c884ab3fb5823daf0992f11cd4388d4275ca610558/regex-2026.5.9-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:b6d189041f15691cfa2b6c4290448ec221244d225b3f5fe9e7771b34ffcdf6e2", size = 801269, upload-time = "2026-05-09T23:13:16.569Z" }, + { url = "https://files.pythonhosted.org/packages/50/fe/0cf96b882f540e62e8b9956599798203d599c44cf4c77917ca27400ff69b/regex-2026.5.9-cp313-cp313-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:e82db382b44d0111b22601c509c89f64434816c9e0eef9d1989cda8cc6ff1c04", size = 777085, upload-time = "2026-05-09T23:13:18.675Z" }, + { url = "https://files.pythonhosted.org/packages/23/5c/d78d4924e7fc875557b9e9b768423925fdfaac5549d06da7810019a9bd26/regex-2026.5.9-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:2acfb48634f64996b57f90f39afa692ff362162722581921fe92239a59960f3c", size = 785153, upload-time = "2026-05-09T23:13:20.525Z" }, + { url = "https://files.pythonhosted.org/packages/bf/e0/5214774090e7b4524dcea3e3c4aa74141d43043f8beb49c1599db1c8b53a/regex-2026.5.9-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:d29eebfc9525db68cad3c97eedd7f754fa265aa5cd0cf4f863b2421e1b48fc9f", size = 860164, upload-time = "2026-05-09T23:13:22.263Z" }, + { url = "https://files.pythonhosted.org/packages/6e/e1/4a57a83350319b1271f0d7a249b8672513ed928b237a741631270de6caea/regex-2026.5.9-cp313-cp313-musllinux_1_2_riscv64.whl", hash = "sha256:debb893095e944091c16e641a6e33c1b0f4cb61ab945ec5afbf53ce7068834d8", size = 765731, upload-time = "2026-05-09T23:13:24.277Z" }, + { url = "https://files.pythonhosted.org/packages/12/f4/499e74a20c156fc75836ee04a72a38d1a063978f600937f9760467beb1b0/regex-2026.5.9-cp313-cp313-musllinux_1_2_s390x.whl", hash = "sha256:d659eee77986549c9ea45b861c7567e44d6287c3dc9a4565478853f7b9fe2ff6", size = 852062, upload-time = "2026-05-09T23:13:26.125Z" }, + { url = "https://files.pythonhosted.org/packages/5b/92/7eebc0d0a01e78629695f342ba17e0deaff8fb45e79cc0d7b98287da6e3e/regex-2026.5.9-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:2efa205e6d98b24d1f3ab395c11aa15cdf10935bca283d0285e0499c284fba21", size = 789577, upload-time = "2026-05-09T23:13:27.814Z" }, + { url = "https://files.pythonhosted.org/packages/05/a4/018e71f7d2ad48c1ebe6d3ae0026f9b7cb4802fd15c7cc02fdf724355102/regex-2026.5.9-cp313-cp313-win32.whl", hash = "sha256:f3844f134e834076677dd369976e9f5068679fcb8e50102fdf6b7ac96a3ec127", size = 266691, upload-time = "2026-05-09T23:13:29.549Z" }, + { url = "https://files.pythonhosted.org/packages/e6/1d/861a93719fb9ee7dbfc3761b3797b7a3e112a5d42c6129459d2d741be9b5/regex-2026.5.9-cp313-cp313-win_amd64.whl", hash = "sha256:3527bb4942d2c14552155406cdedd906567456821848aed1cb4933a391bf5eca", size = 277747, upload-time = "2026-05-09T23:13:31.859Z" }, + { url = "https://files.pythonhosted.org/packages/d9/c6/0a2436ae4da1ba76e51cb98943c6838a9a721faa40ebe2dce07694ae34e3/regex-2026.5.9-cp313-cp313-win_arm64.whl", hash = "sha256:56a33f191f17d8c417f99945ebdc1e691d3af9605d86ec68c7e54a57e3e17af6", size = 270500, upload-time = "2026-05-09T23:13:33.525Z" }, + { url = "https://files.pythonhosted.org/packages/e8/e9/d21346f7b60ed58789371358ed66b09d00f832e1bd7c06e55d9da5679882/regex-2026.5.9-cp313-cp313t-macosx_10_13_universal2.whl", hash = "sha256:01f28d868834624c934b8d2e0aa1c8341337e37831f4a012f18a5afcba4cbaf3", size = 494172, upload-time = "2026-05-09T23:13:35.935Z" }, + { url = "https://files.pythonhosted.org/packages/c4/43/fd1177a2032037c681baecdb3422ee4e1424aec4e4f470ef47793d325274/regex-2026.5.9-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:48036f6374aaa79eb3b754ec29c61d1c6b1606749d705a13f8854fa2539671f6", size = 293952, upload-time = "2026-05-09T23:13:38.307Z" }, + { url = "https://files.pythonhosted.org/packages/f2/7d/9fbf919768368d3f8a4f6c692cf2aa61e482b2b81ec6a298ace4cbf02480/regex-2026.5.9-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:b96350aa424e79d4fd6b567b344dcbe2b2d6bfc48dfe7717587e1fa6d43da6ff", size = 292314, upload-time = "2026-05-09T23:13:40.353Z" }, + { url = "https://files.pythonhosted.org/packages/e2/6c/e41bfeecb589716843e7c4df09ba46ff2a42961457afece19059d85caeef/regex-2026.5.9-cp313-cp313t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:8f3af7a4903c5c04a11a196a5aa75cdd7dd3f8508132f9fb3259d9f5908e3b88", size = 811681, upload-time = "2026-05-09T23:13:42.543Z" }, + { url = "https://files.pythonhosted.org/packages/87/83/a5c1c525fba0aa656e88ad0face0b1829788ef4c2fb6b26df58aa1151b84/regex-2026.5.9-cp313-cp313t-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:7e87577720152d2caae19fe2baaf1f8d5ca12091e9e229f03915c37d1e4b9178", size = 871135, upload-time = "2026-05-09T23:13:44.326Z" }, + { url = "https://files.pythonhosted.org/packages/18/d4/80882e799e440dd878b0979cbebf8fa4d54624a332c83037c7a701649e3f/regex-2026.5.9-cp313-cp313t-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:c8b9b9d294cfea3cd19c718ade7cc93492b2c4991abd9a68d0b3477ae6d8e100", size = 917265, upload-time = "2026-05-09T23:13:47.295Z" }, + { url = "https://files.pythonhosted.org/packages/ae/ff/8db60211e2286e396aad7dc7725356c502bff0901ea05bd6cdc2e1a042b9/regex-2026.5.9-cp313-cp313t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:728d8bfd28a8845c8b6bc5dc7ce010453d206396786c0765c2740cb65f37791e", size = 816311, upload-time = "2026-05-09T23:13:49.885Z" }, + { url = "https://files.pythonhosted.org/packages/4c/47/742ef579c61730f8d268e5cf1f9ce0e37e2ea041ad0f5644724f2378e463/regex-2026.5.9-cp313-cp313t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:7e30b874d341fac767d7df5a0870540541c2c054b80cfaac116e8d367a8a7ff2", size = 785498, upload-time = "2026-05-09T23:13:52.25Z" }, + { url = "https://files.pythonhosted.org/packages/7f/ab/cb0999802dcb0fb95b1ab005e8d4163d8afdd67efc2cb6b6630ac13f8cb1/regex-2026.5.9-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:fd190e88a895a8901325fad284a3f74ea52b1da8525b76cc811fa9b1edf0ce2b", size = 801348, upload-time = "2026-05-09T23:13:54.127Z" }, + { url = "https://files.pythonhosted.org/packages/7d/62/8ca59a24c55bc34d166eefaf3717bd77772f329fdbf984d86581e0a3571c/regex-2026.5.9-cp313-cp313t-musllinux_1_2_ppc64le.whl", hash = "sha256:8e76e8161ad00694cfce6767d5dea860c6391ac5b83e5c3a39661e696f11fc7e", size = 866493, upload-time = "2026-05-09T23:13:56.067Z" }, + { url = "https://files.pythonhosted.org/packages/8d/3d/30f2ae62cef3278bb5bb821f467277a55fb73f01032cf85997e15e8289a8/regex-2026.5.9-cp313-cp313t-musllinux_1_2_riscv64.whl", hash = "sha256:ddda5340e6c01a293027dd46232fa79eaff1b48058ce7a98f572b6445b088041", size = 772811, upload-time = "2026-05-09T23:13:57.867Z" }, + { url = "https://files.pythonhosted.org/packages/d8/ae/7d2089bcd78ad0c0161bc684339df50032acb438a7bd3305e7ddb1193cec/regex-2026.5.9-cp313-cp313t-musllinux_1_2_s390x.whl", hash = "sha256:205109e96b3cf5adf8f4cd62bedde9487feb282b9497a3535451e5a24cd706a0", size = 856584, upload-time = "2026-05-09T23:13:59.679Z" }, + { url = "https://files.pythonhosted.org/packages/a9/29/92ff47f75990131ea4f24ba17819e5a9d141e10819807e09addd73409af6/regex-2026.5.9-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:dfbe4579b9f08036aa7d101d1835437a20783574ac66327e6b29b4018a138081", size = 803453, upload-time = "2026-05-09T23:14:01.978Z" }, + { url = "https://files.pythonhosted.org/packages/04/99/eff29f1037dcab36702c9ee5d6858cf1ce2336ea8ea2987f64245b99ea5e/regex-2026.5.9-cp313-cp313t-win32.whl", hash = "sha256:ed2c9e8068b614c574d8d30e543d617cf5379b0535d46f97ef00e904745a08b5", size = 269951, upload-time = "2026-05-09T23:14:03.661Z" }, + { url = "https://files.pythonhosted.org/packages/0e/9d/8870b8981d27b22cda77bb26a5ac7ebfa9c7d9e0dea195a834a82380e748/regex-2026.5.9-cp313-cp313t-win_amd64.whl", hash = "sha256:b46b0f094dc1d3b90356c85a0bd2c9bafc4a6a190b9d6f8ddd5a033b6e088ed4", size = 281240, upload-time = "2026-05-09T23:14:05.56Z" }, + { url = "https://files.pythonhosted.org/packages/72/b1/3379415e8f135c13ac551353397cc4fe97b4978f3cac73c5fcbcded548b8/regex-2026.5.9-cp313-cp313t-win_arm64.whl", hash = "sha256:872acc074bd29ffc9913ecdfedf6ea77502312ca44a4aa0d3779089c6069d8de", size = 272383, upload-time = "2026-05-09T23:14:07.843Z" }, + { url = "https://files.pythonhosted.org/packages/13/3e/9c3cd292d8808b3645a2ce517e200179b6d0e903f176300bd8b542e14de5/regex-2026.5.9-cp314-cp314-macosx_10_13_universal2.whl", hash = "sha256:1bd7587a2948b4085195d5a3374eaf4a425dc3e55784c038175355ecf3bbbf8a", size = 490376, upload-time = "2026-05-09T23:14:09.64Z" }, + { url = "https://files.pythonhosted.org/packages/60/70/d43ee8a2ca0a8b68d167f21658b85520ac0574617c7f320367c5047f7556/regex-2026.5.9-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:dea2e88e1cce4522496cce630e11e67b98b7076620bc4336c3f674bc21a375f4", size = 291964, upload-time = "2026-05-09T23:14:11.424Z" }, + { url = "https://files.pythonhosted.org/packages/21/91/9d50b433828d8e74196904e168a43abf1e6e88b2a15d47ed742456720c37/regex-2026.5.9-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:2099f7e7ff7b6aa3192312650a56e91cc091e49d50b04e4f6f8b6e28b3b27f1c", size = 289682, upload-time = "2026-05-09T23:14:13.123Z" }, + { url = "https://files.pythonhosted.org/packages/3e/d2/b835e3cafbb9d977736912436259ff551d60919f7d7b3d37d46659c63564/regex-2026.5.9-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:ecd353045824e4477562a2ac718c25799cdaaa41f7aa925a806a8a3e6848a5b9", size = 796996, upload-time = "2026-05-09T23:14:14.923Z" }, + { url = "https://files.pythonhosted.org/packages/2c/a6/9f992d00019166b9de01c546dd4549bc679f2a68df11b877740b0760b7c2/regex-2026.5.9-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:65c8c8c37377794bd5b2f3ebe51919042bf17aec802e23c833d89782ed0c78af", size = 866089, upload-time = "2026-05-09T23:14:17.757Z" }, + { url = "https://files.pythonhosted.org/packages/e0/08/4d32af657e049b19cb62b02e46e38fe1518797bfb2203ee93a510b21b0dc/regex-2026.5.9-cp314-cp314-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:5b73ab8afcf66c622db143d1c6fda4e58e4d537ee4f125229ad47b1ab80f34c0", size = 911530, upload-time = "2026-05-09T23:14:20.353Z" }, + { url = "https://files.pythonhosted.org/packages/d9/27/2af43dd1dc201d1fecefda64a45f4ad0995855b92724f795a777b402ee69/regex-2026.5.9-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:0de5cf193997384ed2ca6f1cd4f78055b255d93d82d5a8cd6ba0d11c10b167e4", size = 800643, upload-time = "2026-05-09T23:14:22.265Z" }, + { url = "https://files.pythonhosted.org/packages/a4/dd/23a249047013b5321d4a60c4d2437462086f601b061776a525e5fba2a59f/regex-2026.5.9-cp314-cp314-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:d641a8c9a61618047796d572a39a79b26167b0411d2c3031937b2fe2d081e2cf", size = 777223, upload-time = "2026-05-09T23:14:24.179Z" }, + { url = "https://files.pythonhosted.org/packages/94/6a/e85ed9538cd19586d0465076a4578a12e093ce776d15f3f8ce92733a8dd6/regex-2026.5.9-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:24b2355ef5cc9aa5b8f07d17704face1c166fdcc2290fa7bd6e6c925655a8346", size = 785760, upload-time = "2026-05-09T23:14:26.065Z" }, + { url = "https://files.pythonhosted.org/packages/2a/c4/f25473209438638e947c55f9156fd8f236f74169229028cc99116380868e/regex-2026.5.9-cp314-cp314-musllinux_1_2_ppc64le.whl", hash = "sha256:a24852d3c29ad9e47593593d8a247c44ccc3d0548ef12c822d6ed0810affe676", size = 860891, upload-time = "2026-05-09T23:14:28.17Z" }, + { url = "https://files.pythonhosted.org/packages/f9/f7/f4f86e3c74419c37370e91f150ae0c2ef7d34b2e0e4cdd5da046a02e4022/regex-2026.5.9-cp314-cp314-musllinux_1_2_riscv64.whl", hash = "sha256:916714069da19329ef7de197dcbc77bb3104145c7c2c864dbfbe318f46b88b14", size = 765891, upload-time = "2026-05-09T23:14:30.06Z" }, + { url = "https://files.pythonhosted.org/packages/26/70/704d8e13765939146b1cd0ef4e2feb71d7929727d2290f026eed10095955/regex-2026.5.9-cp314-cp314-musllinux_1_2_s390x.whl", hash = "sha256:fa411799ca8da32a8d38d020a88faa5b6f91657d284761352940ecf9f7c3bbdd", size = 851380, upload-time = "2026-05-09T23:14:32.123Z" }, + { url = "https://files.pythonhosted.org/packages/26/29/1a13582a8460038edc38e49f64ceb0dd7c60f5caba77571f4bf6601965d9/regex-2026.5.9-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:1e6da47d679b7010ef27556b6e0f99771b744936db1792a10ceac6547ae1503e", size = 789350, upload-time = "2026-05-09T23:14:34.799Z" }, + { url = "https://files.pythonhosted.org/packages/73/56/3dcafe34fc72e271d62ad9a291801e88a1457bb251c132f15fcc2e5aad1a/regex-2026.5.9-cp314-cp314-win32.whl", hash = "sha256:98bd73080e8756255137e1bd3f3f00295bbc5aa383c0e0f973920e9134d7c4ad", size = 272130, upload-time = "2026-05-09T23:14:36.729Z" }, + { url = "https://files.pythonhosted.org/packages/d0/9c/02eebf0be95efe416c664db7fb8b6b05b7a0b06a7544f2884f2558b0526f/regex-2026.5.9-cp314-cp314-win_amd64.whl", hash = "sha256:ff8d372ac2acdc048d1c19916f27ee61bc5722728458ba6ca5052f2c72d51763", size = 280999, upload-time = "2026-05-09T23:14:39.126Z" }, + { url = "https://files.pythonhosted.org/packages/70/5a/1dd1abee76cb7a846a0bcf42fdc87e5720c3c33c24f3e37814310a513d9f/regex-2026.5.9-cp314-cp314-win_arm64.whl", hash = "sha256:e1d93bf647916292e8edcec150c07ddf3dc50179ccaf770c04a7f9e452155372", size = 273500, upload-time = "2026-05-09T23:14:41.059Z" }, + { url = "https://files.pythonhosted.org/packages/86/c1/c5f619b0057a7965cb78ec559c1d7a45ce8c99a35bea95483d64959a93d9/regex-2026.5.9-cp314-cp314t-macosx_10_13_universal2.whl", hash = "sha256:83d0ee4a57d1c87cb549e195ec300b8f0ec3a82eba66d835e4e2ed8634fe4499", size = 494269, upload-time = "2026-05-09T23:14:42.869Z" }, + { url = "https://files.pythonhosted.org/packages/05/2c/5d01f1aee33de4bbe60c8452945bfc8477ca7c5ae4450f6bfe711036cb36/regex-2026.5.9-cp314-cp314t-macosx_10_13_x86_64.whl", hash = "sha256:d3d7eb5c9a7f6df82ed3cfac9beb93882a5cbcb5b8b157b56cb2b3b276574ac1", size = 293954, upload-time = "2026-05-09T23:14:44.822Z" }, + { url = "https://files.pythonhosted.org/packages/7a/fe/e8988b2ae2108c6ef71bd4aa8d87fbe257976dd0810e826cd75f701c68b6/regex-2026.5.9-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:075160bf16658e16d35233300b8453aac25de4cbea808d22348b6979668e924d", size = 292405, upload-time = "2026-05-09T23:14:47.211Z" }, + { url = "https://files.pythonhosted.org/packages/79/34/d2b0937faa7859263f7f0a3c6b103a1296306be6952dc173d0154e9a2f49/regex-2026.5.9-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:45375819235558a4ff1c4971dc32881f022613abdb180128f5cb4768c1765a1c", size = 811855, upload-time = "2026-05-09T23:14:49.21Z" }, + { url = "https://files.pythonhosted.org/packages/80/fe/daf53a47457a8486db66c66c01ceb9c2303eecee3f87197f1e77eb1a736d/regex-2026.5.9-cp314-cp314t-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:ead4b163ac30a29574510cd4b3e2e985ac5290c05fc7095557d6a5f403fc31b5", size = 871189, upload-time = "2026-05-09T23:14:51.555Z" }, + { url = "https://files.pythonhosted.org/packages/1c/75/058fc4470cbfbf57d800aff1a0022b929a3f9fa553ee10a0cdf2070eb31f/regex-2026.5.9-cp314-cp314t-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:8c6e4218fbdfbcd4f6c19efca40930d24a621bf4b48cb76bc6640543bd28ef20", size = 917485, upload-time = "2026-05-09T23:14:53.633Z" }, + { url = "https://files.pythonhosted.org/packages/88/e7/179cfda3a28bc843b5c6cfe7f79f23489c791ed95f151083803660878432/regex-2026.5.9-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:6351571c8a42b505eb555c0dc47d740d0fb66977dc142919eea6f4325b7c56a0", size = 816369, upload-time = "2026-05-09T23:14:56.198Z" }, + { url = "https://files.pythonhosted.org/packages/41/90/6f0cc422071688266d344fca8462d787cba0a2c144acb25721f9a61ec265/regex-2026.5.9-cp314-cp314t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:002205cafd2a9e78c6290c7d1df277bf3277b3b7a30e0b4bb0dac2e2e3f7cb2d", size = 785869, upload-time = "2026-05-09T23:14:58.602Z" }, + { url = "https://files.pythonhosted.org/packages/02/67/a31f1760f09c27b251ef39e9beb541f462cf977381d067faa764c2c0e393/regex-2026.5.9-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:8abd33fef90b2a9efac5557d6033ca82d1195ed3a15fea5af15ba7b463c6a63b", size = 801427, upload-time = "2026-05-09T23:15:00.642Z" }, + { url = "https://files.pythonhosted.org/packages/e3/c4/1a80654597b6bc1e1ea0494824c31200e8a956abe290afae9b19a166a148/regex-2026.5.9-cp314-cp314t-musllinux_1_2_ppc64le.whl", hash = "sha256:31037c82eccb44b7ea2e9e221d7c01429430e989a1f4b91ea5a855f6017b509a", size = 866482, upload-time = "2026-05-09T23:15:03.384Z" }, + { url = "https://files.pythonhosted.org/packages/d1/11/960724e06482c08466ff5611e242e86f80062949cdf6b4b9cc317b9dd93d/regex-2026.5.9-cp314-cp314t-musllinux_1_2_riscv64.whl", hash = "sha256:5604dfd046dc37eca90250fc3be938b076c8059fa772ac0ed6f499b0f0fb0415", size = 773022, upload-time = "2026-05-09T23:15:05.625Z" }, + { url = "https://files.pythonhosted.org/packages/50/a8/a9979c3e7918280e93159ebcab5ef1a65116dd4f3bd6091be0eae4a126e8/regex-2026.5.9-cp314-cp314t-musllinux_1_2_s390x.whl", hash = "sha256:0e1b1b4e496afbb24f4a62aba855ee4f88f25578927697b340702e48c9ee6bc2", size = 856642, upload-time = "2026-05-09T23:15:07.966Z" }, + { url = "https://files.pythonhosted.org/packages/fe/d4/a9b732f2f0072c0ab12227483abb24fffcb9f73f8a2b203df0a6d0434735/regex-2026.5.9-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:be3372b9df6ddecff6486d37e19095a7b4973137caf5512407a89f4455361f41", size = 803552, upload-time = "2026-05-09T23:15:10.215Z" }, + { url = "https://files.pythonhosted.org/packages/d5/fe/1b3113817447a1d4155e4ac76d2e072f42c0bcba2f43fa8a0e756ea2cd91/regex-2026.5.9-cp314-cp314t-win32.whl", hash = "sha256:3ddd90103f9e5c471c49c7852ecc1fe27c7e45eb99e977aefe7caa4e779f4f58", size = 275746, upload-time = "2026-05-09T23:15:12.609Z" }, + { url = "https://files.pythonhosted.org/packages/92/73/93d42045302636c91f2e5ef588b65b84b01428f28ec77de256b1dfdfbe5c/regex-2026.5.9-cp314-cp314t-win_amd64.whl", hash = "sha256:ca518ed29c46eecba6010b15f1b9a479314d2de409536e71b6a13aa04e3b8a77", size = 285685, upload-time = "2026-05-09T23:15:15.086Z" }, + { url = "https://files.pythonhosted.org/packages/da/80/35b4c33c804a165a7f55289afda3ea9e3eb6d15800341a2d66455c0f1f30/regex-2026.5.9-cp314-cp314t-win_arm64.whl", hash = "sha256:5e41809d2683fcde7d5a8c87a6567ba1fb1ce0de9f31bff578de00a4b2d76daa", size = 275713, upload-time = "2026-05-09T23:15:16.98Z" }, +] + +[[package]] +name = "requests" +version = "2.34.2" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "certifi" }, + { name = "charset-normalizer" }, + { name = "idna" }, + { name = "urllib3" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/ac/c3/e2a2b89f2d3e2179abd6d00ebd70bff6273f37fb3e0cc209f48b39d00cbf/requests-2.34.2.tar.gz", hash = "sha256:f288924cae4e29463698d6d60bc6a4da69c89185ad1e0bcc4104f584e960b9ed", size = 142856, upload-time = "2026-05-14T19:25:27.735Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/a0/f4/c67b0b3f1b9245e8d266f0f112c500d50e5b4e83cb6f3b71b6528104182a/requests-2.34.2-py3-none-any.whl", hash = "sha256:2a0d60c172f83ac6ab31e4554906c0f3b3588d37b5cb939b1c061f4907e278e0", size = 73075, upload-time = "2026-05-14T19:25:26.443Z" }, +] + +[[package]] +name = "rfc3339-validator" +version = "0.1.4" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "six" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/28/ea/a9387748e2d111c3c2b275ba970b735e04e15cdb1eb30693b6b5708c4dbd/rfc3339_validator-0.1.4.tar.gz", hash = "sha256:138a2abdf93304ad60530167e51d2dfb9549521a836871b88d7f4695d0022f6b", size = 5513, upload-time = "2021-05-12T16:37:54.178Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/7b/44/4e421b96b67b2daff264473f7465db72fbdf36a07e05494f50300cc7b0c6/rfc3339_validator-0.1.4-py2.py3-none-any.whl", hash = "sha256:24f6ec1eda14ef823da9e36ec7113124b39c04d50a4d3d3a3c2859577e7791fa", size = 3490, upload-time = "2021-05-12T16:37:52.536Z" }, +] + +[[package]] +name = "rfc3986-validator" +version = "0.1.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/da/88/f270de456dd7d11dcc808abfa291ecdd3f45ff44e3b549ffa01b126464d0/rfc3986_validator-0.1.1.tar.gz", hash = "sha256:3d44bde7921b3b9ec3ae4e3adca370438eccebc676456449b145d533b240d055", size = 6760, upload-time = "2019-10-28T16:00:19.144Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/9e/51/17023c0f8f1869d8806b979a2bffa3f861f26a3f1a66b094288323fba52f/rfc3986_validator-0.1.1-py2.py3-none-any.whl", hash = "sha256:2f235c432ef459970b4306369336b9d5dbdda31b510ca1e327636e01f528bfa9", size = 4242, upload-time = "2019-10-28T16:00:13.976Z" }, +] + +[[package]] +name = "rfc3987-syntax" +version = "1.1.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "lark" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/2c/06/37c1a5557acf449e8e406a830a05bf885ac47d33270aec454ef78675008d/rfc3987_syntax-1.1.0.tar.gz", hash = "sha256:717a62cbf33cffdd16dfa3a497d81ce48a660ea691b1ddd7be710c22f00b4a0d", size = 14239, upload-time = "2025-07-18T01:05:05.015Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/7e/71/44ce230e1b7fadd372515a97e32a83011f906ddded8d03e3c6aafbdedbb7/rfc3987_syntax-1.1.0-py3-none-any.whl", hash = "sha256:6c3d97604e4c5ce9f714898e05401a0445a641cfa276432b0a648c80856f6a3f", size = 8046, upload-time = "2025-07-18T01:05:03.843Z" }, +] + +[[package]] +name = "rpds-py" +version = "2026.5.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/2e/43/25a8dcd3feedd735039a8f0b5b7e3b118232b5eae288c4fd9ab200d41094/rpds_py-2026.5.1.tar.gz", hash = "sha256:07b24fea40541e28570e5b795a4a38fbdcd12550c06bd0748005ecc8116ca256", size = 64459, upload-time = "2026-05-28T12:02:13.232Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/4f/a0/acf8b6fc20bfdcd3a45bd3f57680fb198e157b7e997b9123b10763798bd2/rpds_py-2026.5.1-cp311-cp311-macosx_10_12_x86_64.whl", hash = "sha256:3397a5ed7174dc2786bb214030232fc36fe8e5584fec43a9952cc542b1a12036", size = 355609, upload-time = "2026-05-28T11:58:50.78Z" }, + { url = "https://files.pythonhosted.org/packages/b6/95/f8203fd997484b1690a6869cd0e503b6c3c6be55b0ecc36d1a491fe742f0/rpds_py-2026.5.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:99ab6ba7bfa2cb0f96a04e3652355bf04e3f51aceb1e943b8541dab7ba4828cc", size = 348460, upload-time = "2026-05-28T11:58:52.374Z" }, + { url = "https://files.pythonhosted.org/packages/33/8c/b47326ad2f0be545a5e5c1a55937a12afaea7d392ba2837bb9680f57e6c9/rpds_py-2026.5.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d0efbe45632665e53e3db8fe1e5692db58fc5cb9bab4459d570b83efefe11164", size = 381031, upload-time = "2026-05-28T11:58:53.775Z" }, + { url = "https://files.pythonhosted.org/packages/22/0b/e83bbd97ffac6f6389b605cd4e1c8ac5761dc7e977769c9255d8c5adb7bd/rpds_py-2026.5.1-cp311-cp311-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:01d17b29c0c23d82b1f4751147ec49cf451f1fc2554eb9ef5f957e55d2656ead", size = 387121, upload-time = "2026-05-28T11:58:55.243Z" }, + { url = "https://files.pythonhosted.org/packages/fd/0e/d285d1bc8864245919c61e1ca82263e4a66d337759c3a4cef72766ff9afc/rpds_py-2026.5.1-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:7559f72b94ae52659086c595dfa017cde03155f7832071d30959049052cb3ece", size = 501026, upload-time = "2026-05-28T11:58:56.788Z" }, + { url = "https://files.pythonhosted.org/packages/86/06/ccb2109a1e543437b5e43816f2b43b9554cc6783145528a4e3711e05c011/rpds_py-2026.5.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9e25b7088f9ccbfc0dfcaa52bf969300ca229e10ecf758974ebcbb080a4b37bb", size = 391865, upload-time = "2026-05-28T11:58:58.298Z" }, + { url = "https://files.pythonhosted.org/packages/3d/33/237173db1cfef10105b3839a24de00eb8d2a523711add4632447cdf0aedd/rpds_py-2026.5.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:613fc4ee9eaef26dc5840666214dd6fbcebcf32f46e76f4abc473059f4e13dda", size = 378012, upload-time = "2026-05-28T11:58:59.589Z" }, + { url = "https://files.pythonhosted.org/packages/97/64/1eae54e34d5161f9969295e80bd6b62a55f2b6ac5f2a5b60d02c2140e758/rpds_py-2026.5.1-cp311-cp311-manylinux_2_31_riscv64.whl", hash = "sha256:85264a90ff4c05c1568dd65f5921c837614b67c60358fb4c17df3b7f2e90690a", size = 391111, upload-time = "2026-05-28T11:59:01.104Z" }, + { url = "https://files.pythonhosted.org/packages/d8/34/5bb334a5a0f65d77869217c4654f34c78a7d11b93938a3c076a2edeafc52/rpds_py-2026.5.1-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:fe71bca7d547acb17027c7fd1624ff8aae623499c498d3e7011182c4de5c25e0", size = 409225, upload-time = "2026-05-28T11:59:02.433Z" }, + { url = "https://files.pythonhosted.org/packages/16/0f/007ec21283b5b040b4ec3bd95e0402591e22bfa7d5c93dfe01c465c2d2d7/rpds_py-2026.5.1-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:a05fa4f41f37ec97c9c260441a940450a192f78d774d2b097eee1379f1e1246a", size = 556487, upload-time = "2026-05-28T11:59:04.012Z" }, + { url = "https://files.pythonhosted.org/packages/ff/10/5437c94508169b6b22d8418fef7a66e9ffb5f3b9e9c94460f2eedafe06ff/rpds_py-2026.5.1-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:df1d2a1996755b24b9ecee92cb4d36c28f86f464a6a173349c26bab41e94b8c2", size = 620798, upload-time = "2026-05-28T11:59:05.485Z" }, + { url = "https://files.pythonhosted.org/packages/e0/d5/9937dce4d6bda74157b954e7d1460db05a22f5929dccfeeba1ed27a93df0/rpds_py-2026.5.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:8895840ac4809e5f60c88fd07617cd71326e73d6e5a8aa783c5c0f7c24985de2", size = 584053, upload-time = "2026-05-28T11:59:06.837Z" }, + { url = "https://files.pythonhosted.org/packages/6c/31/750617dd0ae1752471bf43f9e41d263398fae7cde7849d23b8574a70e617/rpds_py-2026.5.1-cp311-cp311-win32.whl", hash = "sha256:3684a59b158a7683aaeb8e25352e9a9dd2122cec78f2d8530266e4f91b4c7b3f", size = 214390, upload-time = "2026-05-28T11:59:08.402Z" }, + { url = "https://files.pythonhosted.org/packages/3c/bb/3dcab0e1d9516303f2eb672a5d6f62eca5a69e2886301e9c8c54b520c39b/rpds_py-2026.5.1-cp311-cp311-win_amd64.whl", hash = "sha256:7bd530e6a530bb3ea892f194fafa455f3516ac25ecf7143fd33c09be62b0470a", size = 231097, upload-time = "2026-05-28T11:59:09.786Z" }, + { url = "https://files.pythonhosted.org/packages/49/d6/c6bbf5cb1cf12b9732df8074b57f6ef8341ba884c95d40632ae8bddb44e4/rpds_py-2026.5.1-cp311-cp311-win_arm64.whl", hash = "sha256:0a5ae4dbe43c1076983b72616496919872ae7bbe7a1e21cc48336bc3154d130b", size = 226361, upload-time = "2026-05-28T11:59:11.079Z" }, + { url = "https://files.pythonhosted.org/packages/d4/e7/a78582dc57caa592dcc7d4fb69b61390561e908eb3d2f5df5928a8e354c0/rpds_py-2026.5.1-cp312-cp312-macosx_10_12_x86_64.whl", hash = "sha256:3abe24a66e57adcfa645d718063a5fa5103ecc71ddbf26d78af8f9368018ff1d", size = 353040, upload-time = "2026-05-28T11:59:12.531Z" }, + { url = "https://files.pythonhosted.org/packages/a3/43/35e3f136343aef451e545ce8c38d36c2f93c0ed88703db8b64ba2b205c68/rpds_py-2026.5.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:58b1d94308ddf0b1982f61f2eb54bf92997c9ece8a8093ef014250f4a517906c", size = 345775, upload-time = "2026-05-28T11:59:13.827Z" }, + { url = "https://files.pythonhosted.org/packages/20/e1/0f2160c5982d3157734d5cb3ed63d8b2d583a73c9864f77b666449f32cf8/rpds_py-2026.5.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0fa92420128dadce7f54bd73ba1825a273e9268fe9e35dbf7e6362890efa4e08", size = 376329, upload-time = "2026-05-28T11:59:15.271Z" }, + { url = "https://files.pythonhosted.org/packages/d0/11/ee0ba42aff83bf4effdbc576673c6be64c5e173978c3f6d537e94482f77d/rpds_py-2026.5.1-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:ca653c6546386227cd9800d1bef6a348099acf8db4250341da6d90f663d6dfcb", size = 383539, upload-time = "2026-05-28T11:59:16.665Z" }, + { url = "https://files.pythonhosted.org/packages/11/df/d94aa6a499d4ac40afe2d7620f2c597fd3c0f182e854ad7cf3f596a81cb6/rpds_py-2026.5.1-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:66c93681c4729e4e3ecba31b8179fae083ff3118841672835140338b4b9867c1", size = 494674, upload-time = "2026-05-28T11:59:17.991Z" }, + { url = "https://files.pythonhosted.org/packages/1f/75/33d30f43bb2f458de11979486a591b1bf6e5651765ed1704c6197c2dc773/rpds_py-2026.5.1-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:40ff257542e04796880e011e15cd4dc21c2599975df2aaa8f2c8495ca574e1a5", size = 389268, upload-time = "2026-05-28T11:59:19.434Z" }, + { url = "https://files.pythonhosted.org/packages/f4/1e/2c9096fc19d5fd084b0184ca2b651e659aa0a37e6fdbecf6ece47f147fe1/rpds_py-2026.5.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b6825cc329b290e93c5f6a9be2393118a763f6ccf6abd83704e0c102ca583644", size = 376280, upload-time = "2026-05-28T11:59:21Z" }, + { url = "https://files.pythonhosted.org/packages/b9/e5/61ec9f8be8211ea7f48448195549e4aaf02004083475493b0e137702ecb2/rpds_py-2026.5.1-cp312-cp312-manylinux_2_31_riscv64.whl", hash = "sha256:de42116e69cb53b911cc34aee5ab98f36c597b822545045d49e938818b99e5e4", size = 387233, upload-time = "2026-05-28T11:59:22.454Z" }, + { url = "https://files.pythonhosted.org/packages/0d/ca/bcec1005c4f4a234f92a29078631fee49206c7265ccae966f18fd332e80e/rpds_py-2026.5.1-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:c0f920015df2a504bebaba6d4c31ccf3fcf942f92655c086da30b671aad19aa6", size = 405009, upload-time = "2026-05-28T11:59:23.845Z" }, + { url = "https://files.pythonhosted.org/packages/72/e6/4d5718c5cf26c522dc7c9999e238da1e77380b81d0c5d1df11e271ddfeb1/rpds_py-2026.5.1-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:0408a24e44feb919423dc6d9da677cb5cddb894d2ca9e763967d156d9c60fab4", size = 553113, upload-time = "2026-05-28T11:59:25.184Z" }, + { url = "https://files.pythonhosted.org/packages/d4/25/2ee807bdb3e1f0b7eddf7782acd5665a8b5205a331a7d7244a52c4812fd9/rpds_py-2026.5.1-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:cea68bcd53467561ae2f96a6bdad1544299ba97b5b0ddcd5ac3d376e5c781c24", size = 618838, upload-time = "2026-05-28T11:59:26.749Z" }, + { url = "https://files.pythonhosted.org/packages/6a/c1/7d4c26f167f8c41501cc073d30ee22082b16ce358cf5b00ec97cbc7804ea/rpds_py-2026.5.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:4be8b1d2a705cc37d08256004e1d07de143fa0075c8e85a3df020b776f62b732", size = 582436, upload-time = "2026-05-28T11:59:28.11Z" }, + { url = "https://files.pythonhosted.org/packages/04/1d/9d12b0a337bab46f4769f8857f4007e3b2d639e14f9a44a0efe157696e64/rpds_py-2026.5.1-cp312-cp312-win32.whl", hash = "sha256:6736718bd4fc49cbcb538ba30516fdbef161522acefb739657d48b97bd864fed", size = 212734, upload-time = "2026-05-28T11:59:29.689Z" }, + { url = "https://files.pythonhosted.org/packages/c5/93/e4116f2de7f56bc7406a76033dc501811ddeb22b7f056b92d632871ebb0c/rpds_py-2026.5.1-cp312-cp312-win_amd64.whl", hash = "sha256:0a7d1eec967df0e9b22614a5e177622e0c89611d03727fa0cb48e45028907870", size = 229045, upload-time = "2026-05-28T11:59:31.033Z" }, + { url = "https://files.pythonhosted.org/packages/cb/53/6c3419d85eb2ec5938a37627c585b42d76a63bb731d6e42ed4b079ebf486/rpds_py-2026.5.1-cp312-cp312-win_arm64.whl", hash = "sha256:1841d067089e117142d79b98aa0df2f08b52f2ecc1819dd2700636c0db74a473", size = 223967, upload-time = "2026-05-28T11:59:32.318Z" }, + { url = "https://files.pythonhosted.org/packages/6c/32/14c961ad295f490eb0849ada8b79683e93a59b9de3afdd983eaf55fa6867/rpds_py-2026.5.1-cp313-cp313-macosx_10_12_x86_64.whl", hash = "sha256:efef4ac29c6ff495531eb17ee705b62841ecaa291b7c7077e848ea03e237164d", size = 352787, upload-time = "2026-05-28T11:59:33.655Z" }, + { url = "https://files.pythonhosted.org/packages/ca/bb/d1b85117967c11191441a7274ae616c65d93901d082c588f89a50a8da5ae/rpds_py-2026.5.1-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:c39f5b67a8a2e67179ada2a954227d670fe65fa9098457f698f56ddf248709b3", size = 345179, upload-time = "2026-05-28T11:59:35Z" }, + { url = "https://files.pythonhosted.org/packages/7c/46/d84105f062e626a1b233f863907288a4708c2d833b8b4c6fb2764bc080c0/rpds_py-2026.5.1-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b5c30f3f04eef4fbd362226a6f31d7c8895ca4fbb6e0b790f6890a98d8da8559", size = 376173, upload-time = "2026-05-28T11:59:36.43Z" }, + { url = "https://files.pythonhosted.org/packages/e2/ae/469d7959ce5b1201e1de135dc735b86db3b35dd0d1734f6a44246d5f061c/rpds_py-2026.5.1-cp313-cp313-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:277f6c82f0580848796c7ecc8a7173aa3bfb928e4ff831261c2f60a81dc270db", size = 383162, upload-time = "2026-05-28T11:59:37.995Z" }, + { url = "https://files.pythonhosted.org/packages/dc/a2/57853d31a1116a561aa072794602ad3f6341e18d70a8523f1bd5b9fc1e5a/rpds_py-2026.5.1-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:63c2c4c213f1a4e3f3de28ecab029dbdee976324e729c0d7a55211be72576b02", size = 495093, upload-time = "2026-05-28T11:59:39.453Z" }, + { url = "https://files.pythonhosted.org/packages/99/63/3a8eabcad9314b7daf5c65f451d2c33d989235cd8a5762186cf2c3f5a4f8/rpds_py-2026.5.1-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:3350ec808fb538fe71a1f94dfaa0e29c598dfad805ce49f0caec5ae3183c652b", size = 389829, upload-time = "2026-05-28T11:59:40.896Z" }, + { url = "https://files.pythonhosted.org/packages/4b/25/05678d97fc25e2622df14dc530fb82023174ecfff6733991ed0d78f167bd/rpds_py-2026.5.1-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b1b964e3ab599e718dc46c018d104b1ebc007cbc6567d827c94a687fca56d77e", size = 374786, upload-time = "2026-05-28T11:59:42.626Z" }, + { url = "https://files.pythonhosted.org/packages/88/d1/8c90b6431e80a3b91b284a5c7c8c0c4f9c006444d90477a740d6e0f9c694/rpds_py-2026.5.1-cp313-cp313-manylinux_2_31_riscv64.whl", hash = "sha256:19cb09fab7b7fc96b2a6e28f2e34b72a3705ff27b37edb77455316e5d3f3dc9b", size = 386920, upload-time = "2026-05-28T11:59:44.124Z" }, + { url = "https://files.pythonhosted.org/packages/ff/99/4638f672ab356682d633ee0da9255f5b67ce6efd0b85eb94ad3e255e65a5/rpds_py-2026.5.1-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:abe76bcdba31e576cb83eeb8797aa0d882b738fef6dc65d0601fc753806a5b46", size = 405059, upload-time = "2026-05-28T11:59:47.177Z" }, + { url = "https://files.pythonhosted.org/packages/66/3f/3546524b6eb4cc2e1f363a3d638fa52f6c24faae3500c25fb488b02f1740/rpds_py-2026.5.1-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:8bff7073db3899158fff55ebf57b113a67030af26f80a18978f9f0aa60250ddf", size = 553030, upload-time = "2026-05-28T11:59:48.603Z" }, + { url = "https://files.pythonhosted.org/packages/c6/c3/7b3388c796fcf471bd17194242d4dc1a7608567c0fa422bcc1c5e79f9c1e/rpds_py-2026.5.1-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:8ba264fa49be666cd9cc56bf34ec7002fb3d27a4aee5bcb4d43d0d18feb1bb6f", size = 618975, upload-time = "2026-05-28T11:59:50.314Z" }, + { url = "https://files.pythonhosted.org/packages/61/1e/a3cb07f2795075d1d88efddae2f541359fde5f08c81ee114c29c2949c90a/rpds_py-2026.5.1-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:4860b603ddda0475a8885499b3729e90229d480105b42651962a5397d995fa89", size = 581178, upload-time = "2026-05-28T11:59:51.673Z" }, + { url = "https://files.pythonhosted.org/packages/a1/74/e758c03a5ef46f04c37f2651a2893db846d569ba8a7bca469d4b58939bcd/rpds_py-2026.5.1-cp313-cp313-win32.whl", hash = "sha256:7944270ae71383f6e2657dd7d5ce4eeb4ac2d0059a6738f0510583d462ab4842", size = 212481, upload-time = "2026-05-28T11:59:53.148Z" }, + { url = "https://files.pythonhosted.org/packages/70/ec/a2aca432db9c7359b40fa393eeeaa0d166c2f70175be956e75fa24197c44/rpds_py-2026.5.1-cp313-cp313-win_amd64.whl", hash = "sha256:88647f43a73c4e01be19b04ceef0c8d3a1958153604d13c773becd8016f2a0cf", size = 228519, upload-time = "2026-05-28T11:59:54.505Z" }, + { url = "https://files.pythonhosted.org/packages/29/60/a73bfdd45b096574556acf303bbd9fa9eed36ca8a818b514e2a5d5fe2b9d/rpds_py-2026.5.1-cp313-cp313-win_arm64.whl", hash = "sha256:453895624ecf7db7063b1004e44037522bbaef9ff6a945e59bc71662d7a03abd", size = 223446, upload-time = "2026-05-28T11:59:56.081Z" }, + { url = "https://files.pythonhosted.org/packages/18/e2/408105fd611823f00882aea810f3989a30d26b1bab8b6beb20f98c724e0e/rpds_py-2026.5.1-cp313-cp313t-macosx_10_12_x86_64.whl", hash = "sha256:b4e4bc98639ec915f512fde3aa7a95e0041d95d9c3cc86eea841fa63cb1e8600", size = 355287, upload-time = "2026-05-28T11:59:57.448Z" }, + { url = "https://files.pythonhosted.org/packages/8d/58/5c4a43436843c90d0f6d19f82c200c80e3843ca9fa07b237623327f6d384/rpds_py-2026.5.1-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:cacedb7a6e167680acba45ad5716e89067d225dc80da0d7040cae8c81d4572fa", size = 347033, upload-time = "2026-05-28T11:59:58.881Z" }, + { url = "https://files.pythonhosted.org/packages/fb/c2/1a71acdacaf4e259b10278fb87b039ded3cf80041bcd89dd8a3ea702ded6/rpds_py-2026.5.1-cp313-cp313t-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:68700371c5d7ae1412862ddfa719090925c93ecf351c566d66f09d04b136ea00", size = 376891, upload-time = "2026-05-28T12:00:00.516Z" }, + { url = "https://files.pythonhosted.org/packages/c2/c8/535f3d9b65addd8e28aa87b83c6e526799c3717a88273db8ea795beeef7a/rpds_py-2026.5.1-cp313-cp313t-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:296c799becfa849c779c8725494fe9ed94959ed886787df4364b058465bad7f0", size = 385646, upload-time = "2026-05-28T12:00:02.394Z" }, + { url = "https://files.pythonhosted.org/packages/1c/91/dc033f313345c354ade914dbe73cdb90b615a4409ea02430d5356794f3d8/rpds_py-2026.5.1-cp313-cp313t-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:d3858b908218ee108d0bbfb2095ccc237648053c9bf98affad7cb079acaf1d97", size = 498830, upload-time = "2026-05-28T12:00:04.189Z" }, + { url = "https://files.pythonhosted.org/packages/27/fc/90fcbea459dbb8ddc18a2e0fd1de9412b48bc84ffff2db771cf714bacfd6/rpds_py-2026.5.1-cp313-cp313t-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:4fb8d2e7cb2f850b169806d61d1b991738acec96500a75c30f49caf064ce7cef", size = 392830, upload-time = "2026-05-28T12:00:05.797Z" }, + { url = "https://files.pythonhosted.org/packages/b2/1d/46cd11a228c9750684a798d98f878be6f614aa762438da7378f035e79e35/rpds_py-2026.5.1-cp313-cp313t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:27b74c10ed6a8f190f4287f53bcfea348b92a84a9c9f70d30183d1e6172d580d", size = 379613, upload-time = "2026-05-28T12:00:07.433Z" }, + { url = "https://files.pythonhosted.org/packages/24/4a/d9b0c6af3a1de03eb93741bbe8be2bdce84d8fda8224f3005451d86df389/rpds_py-2026.5.1-cp313-cp313t-manylinux_2_31_riscv64.whl", hash = "sha256:b9a6528956191c48c52294a592dbd4a8386d7048bdb25c0efcb6b966466c6d83", size = 388183, upload-time = "2026-05-28T12:00:09.227Z" }, + { url = "https://files.pythonhosted.org/packages/c5/b4/db7aaabdda6d020afc87d981bcc2f57a434c7dec60ecfc2ab3dd50b20351/rpds_py-2026.5.1-cp313-cp313t-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:af03e34e860047bc7a352b842856fcf78798fbb81132cc98bd2f907ab4eb9cd2", size = 408578, upload-time = "2026-05-28T12:00:10.779Z" }, + { url = "https://files.pythonhosted.org/packages/08/d6/070f6a41cbb343e2ac4171859bf3f3623e0ab002f72619d6d505313ec2de/rpds_py-2026.5.1-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:fea6e836d10abbe191d557d33bd58bd5987725fe63aa1eefe557d230209855bd", size = 553573, upload-time = "2026-05-28T12:00:12.443Z" }, + { url = "https://files.pythonhosted.org/packages/75/ab/1a71ea3589c4345dac0a0518f0e6a031cb42689277851b683c46d27463a5/rpds_py-2026.5.1-cp313-cp313t-musllinux_1_2_i686.whl", hash = "sha256:fc0c0f878ea770a0a8a462456c5ad36fc9fe6358e6b76fdadc7f17575e0b8bf1", size = 620861, upload-time = "2026-05-28T12:00:14.09Z" }, + { url = "https://files.pythonhosted.org/packages/8a/22/9bf80a56069c0c443fcfefac639a86a744550a2898817a6dfd3e26654924/rpds_py-2026.5.1-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:e0b360f316d966b048b085857630b3cc51f3db2f07b06f440eac8f695374d1e3", size = 585633, upload-time = "2026-05-28T12:00:15.66Z" }, + { url = "https://files.pythonhosted.org/packages/da/68/3b2c0a75c9e04125696f84ebdbbf304acf5a40b58ba4481cdb98a922c3ba/rpds_py-2026.5.1-cp313-cp313t-win32.whl", hash = "sha256:a2999883eedf72fdfb7520b92c7d4ec2572a71ff40239377aa604cc529eecafc", size = 210074, upload-time = "2026-05-28T12:00:17.291Z" }, + { url = "https://files.pythonhosted.org/packages/e7/8b/609157d5a25d37d4f29f92840ba531f416907c34ae5c5739dd21fc2bef98/rpds_py-2026.5.1-cp313-cp313t-win_amd64.whl", hash = "sha256:e07be2a9d7122bd6e82dea89814ef8dc893feb1aae97fec1630f3263bbb30e55", size = 228635, upload-time = "2026-05-28T12:00:18.73Z" }, + { url = "https://files.pythonhosted.org/packages/d4/6f/19c1918a4b590d8de87e712e4abe4b3875771eff60216fb6153cf6665c68/rpds_py-2026.5.1-cp314-cp314-macosx_10_12_x86_64.whl", hash = "sha256:1f2c391c3059798093b65df23aca2cac150460ae9c630d99dec83d703d9485b9", size = 349756, upload-time = "2026-05-28T12:00:20.217Z" }, + { url = "https://files.pythonhosted.org/packages/e5/60/a06fe7da34eca79dacbf958a2ba0c6eea85bc2b29de20080bf40f72f66fa/rpds_py-2026.5.1-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:413b424f7c4ee65ab5e5be91f5731be0f8b41a1ee2b12dfe810d716312e95a78", size = 343831, upload-time = "2026-05-28T12:00:21.711Z" }, + { url = "https://files.pythonhosted.org/packages/bf/ec/b2333b97b90e2a6ef6ca8ad386ee284968e74bcfe113b3f1a8d9036429a9/rpds_py-2026.5.1-cp314-cp314-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2c595a1d9255dce0599e13130d1440ab2506654f2b50294226ee06402f8fef63", size = 375127, upload-time = "2026-05-28T12:00:23.326Z" }, + { url = "https://files.pythonhosted.org/packages/14/7f/e00aae54067f2b488c4637961d5f58204d470795fc791085fa3f15060d2e/rpds_py-2026.5.1-cp314-cp314-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:1c27c5f6102eac8c03e7595a00827a53b271ba40a53b59ff8709170e0855ea4a", size = 379034, upload-time = "2026-05-28T12:00:24.89Z" }, + { url = "https://files.pythonhosted.org/packages/be/cc/423999bbb8ae8dc93c77fc1d5e984ade5eb89d237d3bb884ccfa72ae2890/rpds_py-2026.5.1-cp314-cp314-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:6c7fcf61d44cacecaf3aea542b0e053db77972a4573e7ceda16fb2b399161195", size = 490823, upload-time = "2026-05-28T12:00:26.676Z" }, + { url = "https://files.pythonhosted.org/packages/0f/aa/c671bf660f12e68d3c52ff86c7066ed1372df5a0f4f2ff584e419b8207e7/rpds_py-2026.5.1-cp314-cp314-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2c817a189d4ee14290420e5ff051e4dd6baa13f3edf84685071dee07a6d538ee", size = 388144, upload-time = "2026-05-28T12:00:28.577Z" }, + { url = "https://files.pythonhosted.org/packages/19/c8/d63bb75b68afe77b229e3021c6031bcaf01da5db5b0e69d0d10f9ba679a7/rpds_py-2026.5.1-cp314-cp314-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:21846aac0ed2e0589f38c12dc44e77bb64e494b771eadbcf169cba00566ba7ba", size = 371959, upload-time = "2026-05-28T12:00:30.304Z" }, + { url = "https://files.pythonhosted.org/packages/82/35/c51122014d8274ff37dc606d60049c3db7d83da02b5b282511e5a906a9a6/rpds_py-2026.5.1-cp314-cp314-manylinux_2_31_riscv64.whl", hash = "sha256:b317c87a13f769a4e787819bd508aaa5d69aa09b0880de9af6d3a8a54571cdec", size = 383558, upload-time = "2026-05-28T12:00:31.764Z" }, + { url = "https://files.pythonhosted.org/packages/e3/f9/2790cb99c136a5363acdeacf5c27c56f3de0d4118a1f48fca83404c99c89/rpds_py-2026.5.1-cp314-cp314-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:ce87129d9f2c14fa6c4a8601fb80eb4488c80d38a20cd13758ef11123e14995d", size = 402789, upload-time = "2026-05-28T12:00:33.247Z" }, + { url = "https://files.pythonhosted.org/packages/e5/1b/e4fb584f8c75d35c38150ff6a332cda949e6f97acba1f4fd123b14ab56fe/rpds_py-2026.5.1-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:9cdddb6c1207d284d94fd1530adf57fbd797fe7c4b8704ba85f49414f2557e7d", size = 551405, upload-time = "2026-05-28T12:00:34.819Z" }, + { url = "https://files.pythonhosted.org/packages/d8/f7/a6731b4216cb3793ea1af5391da240f5683dacc0d13e034fe5fc3503f240/rpds_py-2026.5.1-cp314-cp314-musllinux_1_2_i686.whl", hash = "sha256:4e237e139f94d3c036fd28eb9f564c99055476ff4ff05cd42be55ce349b5aa02", size = 616975, upload-time = "2026-05-28T12:00:36.268Z" }, + { url = "https://files.pythonhosted.org/packages/2c/ea/2e051a81d95d8e63f4b35a1c463a87e8766bc3d083c067c5dfb6bf220747/rpds_py-2026.5.1-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:ed0954b524873214369184a9c82b0eaa45a3fbb9a798cd95b17e0d98499e7ea0", size = 578701, upload-time = "2026-05-28T12:00:37.82Z" }, + { url = "https://files.pythonhosted.org/packages/65/56/b5f6fdb2083e32bca8a8993d89e70db114b4756c9e2c38421328126689d2/rpds_py-2026.5.1-cp314-cp314-win32.whl", hash = "sha256:2d88621d6a7d4dfa633d21abe90f280bb205274e16b1d1e61c6ad4640b2453b7", size = 209806, upload-time = "2026-05-28T12:00:39.492Z" }, + { url = "https://files.pythonhosted.org/packages/fb/80/65a5aa96c155e611d1ed844e4e1f57f3e36b021f396d9f8585d756e6b90d/rpds_py-2026.5.1-cp314-cp314-win_amd64.whl", hash = "sha256:cef8ac28d26f4dda3533060c20fbf80a325458fa9fd23ea72a73cdfa8e978838", size = 225985, upload-time = "2026-05-28T12:00:40.94Z" }, + { url = "https://files.pythonhosted.org/packages/27/7c/ad185212e87b05f196daef92bc5f3caf07298eb47c295b5585c3dd3093ac/rpds_py-2026.5.1-cp314-cp314-win_arm64.whl", hash = "sha256:eaaea962c68cdc68d4a533ba985ab8e9484277910bbfaa2ab3ef7732667bfed8", size = 221219, upload-time = "2026-05-28T12:00:43.15Z" }, + { url = "https://files.pythonhosted.org/packages/23/58/e14ae18759020334646b031e708ab4158d653a938822bfb7b95ef2e93aa3/rpds_py-2026.5.1-cp314-cp314t-macosx_10_12_x86_64.whl", hash = "sha256:21942f52dbbd5f8758bf021213d28bd45c39e873e65e2407faf5f1846f5761ad", size = 352148, upload-time = "2026-05-28T12:00:44.638Z" }, + { url = "https://files.pythonhosted.org/packages/31/9b/5f4a1e2f960bca3ac5d052b139dd31eed97b259f9d909173821760d542e8/rpds_py-2026.5.1-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:f414556f6e3958300ff941e40c9f97e3dc9774ddd1b3434c475d73dd354bbed3", size = 345196, upload-time = "2026-05-28T12:00:46.14Z" }, + { url = "https://files.pythonhosted.org/packages/1a/71/1d9574d6a2fa20ab60eaa55c7467f5aa20cbc770f341a05f09c0876f59e2/rpds_py-2026.5.1-cp314-cp314t-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ef1013a8625c74043210190b246f5b1551e09757c1f356c6e4160ef96c5bc081", size = 374981, upload-time = "2026-05-28T12:00:47.531Z" }, + { url = "https://files.pythonhosted.org/packages/0c/9a/37e99f4915a80aa71670263c1267f7ae0af95f53a3f61e6c3bdc016d4515/rpds_py-2026.5.1-cp314-cp314t-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:cc68e231a77a5f0d774ae278a1f8e55c0456501820847c1e4efb3829f3441df6", size = 379961, upload-time = "2026-05-28T12:00:49.216Z" }, + { url = "https://files.pythonhosted.org/packages/a8/ff/6e73f74b89d2e0715e0fc86b7dde893f9a61ae2f9b256ff3bdfe41ac4e94/rpds_py-2026.5.1-cp314-cp314t-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:9baffb505aff33acc69b422a19f77806680f3c8632227d79f48de8a810d1c2c5", size = 495965, upload-time = "2026-05-28T12:00:51.111Z" }, + { url = "https://files.pythonhosted.org/packages/ea/e0/425faba25f59d74d4638b267f7c7a80e8649d2ef4db10a19b0c4a71e6e6f/rpds_py-2026.5.1-cp314-cp314t-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b8d2f912928d426e8cfa396f7f3f8d29a59e6689c86dcca3c420730c1096322b", size = 389526, upload-time = "2026-05-28T12:00:52.77Z" }, + { url = "https://files.pythonhosted.org/packages/c6/76/7a41960e3fddae47fab43a28684d5da981401dffd88253de0944148654cb/rpds_py-2026.5.1-cp314-cp314t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:90f628283be835db980c941767d41c9a27b5239e54ba0a9c1335247e82406964", size = 376190, upload-time = "2026-05-28T12:00:54.215Z" }, + { url = "https://files.pythonhosted.org/packages/27/60/5f38dc70824fc6951b51d35377e577a3a3a4c81a6769cc5a2de25ebe0ad1/rpds_py-2026.5.1-cp314-cp314t-manylinux_2_31_riscv64.whl", hash = "sha256:1ebb2f0ab7e16132995a72de805170e0203df0c3dd22e1ef1cd1fdd90bd7a131", size = 383921, upload-time = "2026-05-28T12:00:55.673Z" }, + { url = "https://files.pythonhosted.org/packages/60/1a/d60a38caa1505f4b9483c3fbbde12c94e1079154f4f401a6da96f7e77621/rpds_py-2026.5.1-cp314-cp314t-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:f3df3d16ded76f1f8c9cdebd0e1ea55fdf4c23b812de189814da7cf229c22a81", size = 404766, upload-time = "2026-05-28T12:00:57.518Z" }, + { url = "https://files.pythonhosted.org/packages/87/ff/602fd3f174d6425f0bce05ad0dfbec0e96b38d0f7d08a79af5aa20083885/rpds_py-2026.5.1-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:9af8905b8f854990e40d5206aa5ac58d9b0fe0b7f351ff2bb086c20f6c8c6a47", size = 551343, upload-time = "2026-05-28T12:00:58.978Z" }, + { url = "https://files.pythonhosted.org/packages/b8/c1/1be13327acdbead3eca1fde03b6a34dbb011f1e864e217f0d32cc1779a7f/rpds_py-2026.5.1-cp314-cp314t-musllinux_1_2_i686.whl", hash = "sha256:036a36a87fb1cd3b214d11c4b3c4f7d2ddad933625dca1c900b56a057c07740a", size = 618502, upload-time = "2026-05-28T12:01:00.656Z" }, + { url = "https://files.pythonhosted.org/packages/f3/d7/afb49b49d7f2be8b7ba1a9f0977fa5168003437b93086726f066544e8351/rpds_py-2026.5.1-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:62ae3853454fe9ef283a03c96c2d835d39e84b14643a9d62c82ef0fb87d702ca", size = 581916, upload-time = "2026-05-28T12:01:02.22Z" }, + { url = "https://files.pythonhosted.org/packages/25/d1/dbef8c1f8a10f07beb62b5f054e20099fd9924b3ec001b8f0b6ac7813a85/rpds_py-2026.5.1-cp314-cp314t-win32.whl", hash = "sha256:6c3d771a46ec18b12af06ce36243a9a80b07a5d0515236332d90863ca8bb326a", size = 207855, upload-time = "2026-05-28T12:01:03.821Z" }, + { url = "https://files.pythonhosted.org/packages/2a/72/bfa4e61ab8e7dc1c8adf397e05e6cbdd4239357bd72b248d3de662f23915/rpds_py-2026.5.1-cp314-cp314t-win_amd64.whl", hash = "sha256:c93c629be4636cf54337bd5f06c104d55e42ced54d681f6fe21ae510a65116f6", size = 225422, upload-time = "2026-05-28T12:01:05.194Z" }, + { url = "https://files.pythonhosted.org/packages/27/3a/7b5da92b640f67b6717ccafc83cdd06bfa7ff2395c3685c68922bb54d703/rpds_py-2026.5.1-cp315-cp315-macosx_10_12_x86_64.whl", hash = "sha256:3574b55c604b8f75dacb007136508bbc0db406e626301778096a133327e7f2fb", size = 349576, upload-time = "2026-05-28T12:01:06.722Z" }, + { url = "https://files.pythonhosted.org/packages/d7/8a/2aafd7ad355a1bd48ca76e2262b74b15e6432b5a1efe150efd4d779cd55d/rpds_py-2026.5.1-cp315-cp315-macosx_11_0_arm64.whl", hash = "sha256:94068eb3ae6d43f5a786b7db96a406a34e6d5c24489feef32fd6e8946ea7b291", size = 343640, upload-time = "2026-05-28T12:01:08.441Z" }, + { url = "https://files.pythonhosted.org/packages/f7/7d/6c9523c1abbe840a1b7fba3c516d48e1d3487cc80fea4366c4071cf56784/rpds_py-2026.5.1-cp315-cp315-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f3a5b10e8ce894825f380a8f1b6444cf73c294dfea62afbb2d13e3a9e630cec1", size = 375322, upload-time = "2026-05-28T12:01:09.934Z" }, + { url = "https://files.pythonhosted.org/packages/5a/5d/0b7b03fb1dc509321f01de3149784ab773e34c8573022029af8076afcb9c/rpds_py-2026.5.1-cp315-cp315-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:fc09f82e63d4bcd58149572f857a431bae851dc747e313c3b5bdf7abb907fda8", size = 379066, upload-time = "2026-05-28T12:01:11.48Z" }, + { url = "https://files.pythonhosted.org/packages/d7/e2/8ef6012999ebf1cb1c22f876d9ce5e63d960fd4631d2af3202d3f480aa25/rpds_py-2026.5.1-cp315-cp315-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:e10464d17df3b582745c25cec695cb9558bca2cb6ddb631aee1787fc72c767b2", size = 494586, upload-time = "2026-05-28T12:01:13.051Z" }, + { url = "https://files.pythonhosted.org/packages/80/af/1eeb029bec67582c226b7809172207cd005073af4ebd906e65ff494f4983/rpds_py-2026.5.1-cp315-cp315-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:ba05adbf15d994c38ec0b7ab32e858e5110c21e9009a00a86545fd220f84e038", size = 388415, upload-time = "2026-05-28T12:01:14.631Z" }, + { url = "https://files.pythonhosted.org/packages/18/23/ffbe10711c4d766c1cab0557d6906c074f795814863c67b351355d29354a/rpds_py-2026.5.1-cp315-cp315-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:77c004fdc7b891967106f78ddfd7b076bfe6813c6139c6fff6aed3bcaa960b26", size = 372427, upload-time = "2026-05-28T12:01:16.153Z" }, + { url = "https://files.pythonhosted.org/packages/bd/3a/30ba4a6ad457e5b070c18d742a33fb77d8d922b565cc881f8a5313d63bfe/rpds_py-2026.5.1-cp315-cp315-manylinux_2_31_riscv64.whl", hash = "sha256:83bcf894486c9d78dd290d3c0124ff6dd8875d3025e2090a8ec49fcc37c55fdd", size = 383615, upload-time = "2026-05-28T12:01:17.809Z" }, + { url = "https://files.pythonhosted.org/packages/d3/69/62e242b53ce39c0814bd24e1a6e6eba6c92be716277745f317f9540a2e7b/rpds_py-2026.5.1-cp315-cp315-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:c3df104083952a0e0c6f10de33e440eabe98fb6317d23e1a58c68f6df08d01b9", size = 402786, upload-time = "2026-05-28T12:01:19.419Z" }, + { url = "https://files.pythonhosted.org/packages/38/c1/a770b9c186928a1ed0f7e6d7ae50e7f3950ed23e3f9e366dbc8e38cb55de/rpds_py-2026.5.1-cp315-cp315-musllinux_1_2_aarch64.whl", hash = "sha256:980450826cf22e133c57e0835070bdd0dd3f73b9b708c3ce223def2cb9469e14", size = 551583, upload-time = "2026-05-28T12:01:21.013Z" }, + { url = "https://files.pythonhosted.org/packages/21/7c/68e8579b95375b70d2a963103c42e705856cdb98569258bd807f4423891c/rpds_py-2026.5.1-cp315-cp315-musllinux_1_2_i686.whl", hash = "sha256:205dde846f24332ab0c1188699a043b8d165b79bb84529ce272c45048ff6be01", size = 616941, upload-time = "2026-05-28T12:01:22.548Z" }, + { url = "https://files.pythonhosted.org/packages/70/a1/a6135aed5730ff03ab957182259987ac11e55fb392a28dc6f0592048a280/rpds_py-2026.5.1-cp315-cp315-musllinux_1_2_x86_64.whl", hash = "sha256:3966b82dd563176396df030f3dd52a6e54cb69b718e95e78bd555ed3d1e0185d", size = 578349, upload-time = "2026-05-28T12:01:24.118Z" }, + { url = "https://files.pythonhosted.org/packages/09/6e/f24201a76a84e6c49d0bdfdfcb735210e21701e9b21c5bfc0ba497dd62f6/rpds_py-2026.5.1-cp315-cp315-win32.whl", hash = "sha256:7818f8d0a415be74d2be3590b0a1c1f463a642f4d0217e7d10602dceef5b79aa", size = 209922, upload-time = "2026-05-28T12:01:25.522Z" }, + { url = "https://files.pythonhosted.org/packages/9e/e4/966bc240bb0485fc265278f6de44d05834bf0b3618886e0b22e33d54c49a/rpds_py-2026.5.1-cp315-cp315-win_amd64.whl", hash = "sha256:b3cc20c0d800af78fd0fac68086e28c1856cec51ea528bb81ea851aa40d39325", size = 226003, upload-time = "2026-05-28T12:01:27.062Z" }, + { url = "https://files.pythonhosted.org/packages/5c/5c/a15a59269cd5e74472734516c73795c15eccfc841b3d4b0228c3f53f19d0/rpds_py-2026.5.1-cp315-cp315-win_arm64.whl", hash = "sha256:3609e9939a8a76cd904cf98a3f1f13b5dc7e150adeaee89e0ea09652ea213e16", size = 221245, upload-time = "2026-05-28T12:01:28.51Z" }, + { url = "https://files.pythonhosted.org/packages/e0/22/135ce03804e179a71ceb13be095deda4a279bc88f7a6b8fa161c5ad44e12/rpds_py-2026.5.1-cp315-cp315t-macosx_10_12_x86_64.whl", hash = "sha256:5d333a7127d4b307601ac37792bee01bb95c867cbfacf21b6375b804d6bbd723", size = 352015, upload-time = "2026-05-28T12:01:30.214Z" }, + { url = "https://files.pythonhosted.org/packages/3b/5f/f1f6d2652eb9d848f6eb369d8db83a2da6249bb49ad2c2a48f45d54538d3/rpds_py-2026.5.1-cp315-cp315t-macosx_11_0_arm64.whl", hash = "sha256:b5f077b44a4f7808520f66dae234988d867deb9aed9be5da057ce9ba831b2a41", size = 345016, upload-time = "2026-05-28T12:01:31.656Z" }, + { url = "https://files.pythonhosted.org/packages/88/66/b74182775691ea2290c99e52ac8d5db844e56fbec90ce421f107658c8314/rpds_py-2026.5.1-cp315-cp315t-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:55d8f9b7b78c9538fc9e04e82ec0e888ff0c3cffcfad152c77e57cd09351a98a", size = 374775, upload-time = "2026-05-28T12:01:33.136Z" }, + { url = "https://files.pythonhosted.org/packages/ff/8f/15e5a61d9f0a43902d36561d4f07cae6ae9f4716be825159fd72717f33af/rpds_py-2026.5.1-cp315-cp315t-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:e3a8ae58895ac107ed934a6bf51e5846f95c53b9b940c2c6d310838fd5846358", size = 380270, upload-time = "2026-05-28T12:01:34.574Z" }, + { url = "https://files.pythonhosted.org/packages/02/c3/f859b12763a80540cdf2af0f15b19904cf756a71d7bdd3f82ff3e5b1bbf9/rpds_py-2026.5.1-cp315-cp315t-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:0957cf3c2b8632ec7aaebffebea8005b353cc2a237b6e2ae3c2cac0820704cfb", size = 495285, upload-time = "2026-05-28T12:01:36.127Z" }, + { url = "https://files.pythonhosted.org/packages/1c/c7/ff27c2ac8411d30b03b1829fd88cae8dad1a4d0da48dd25e57c4038042e6/rpds_py-2026.5.1-cp315-cp315t-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c396c1304de421050b3681ea70f371874b54d41b0151e96109758144c231e30b", size = 389581, upload-time = "2026-05-28T12:01:37.635Z" }, + { url = "https://files.pythonhosted.org/packages/6e/67/fe92ee32a6cc05c77228a2f8b1762e7124f386ec20ff83d0757b762d58d0/rpds_py-2026.5.1-cp315-cp315t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:aad1bff7f666b9598e573815affd666aac6a13a585dde336f843e33350c7fadc", size = 376041, upload-time = "2026-05-28T12:01:39.307Z" }, + { url = "https://files.pythonhosted.org/packages/f8/91/b4d6685c27aba55bd82f25b278be8237038117d05f9659a6213ad3408130/rpds_py-2026.5.1-cp315-cp315t-manylinux_2_31_riscv64.whl", hash = "sha256:656a042550878f12d45752452d47094b7cfe5ad1e9d7b87b5a22ad3ae5ff8015", size = 383946, upload-time = "2026-05-28T12:01:41.043Z" }, + { url = "https://files.pythonhosted.org/packages/bd/79/2c1d832a53c8e0f8e98fc970ec257b950fecd4f62be2ab7182b500a0cbc8/rpds_py-2026.5.1-cp315-cp315t-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:73c4bd4f70294737b5206a3e8e30ccadbf8a60301831c8ea23eec5dbeea1ecfa", size = 405526, upload-time = "2026-05-28T12:01:43.032Z" }, + { url = "https://files.pythonhosted.org/packages/78/c4/c98117b03c6a8581ab2c2dfccfe9a5ad82bd8128a3c28b46a6ad2d97c393/rpds_py-2026.5.1-cp315-cp315t-musllinux_1_2_aarch64.whl", hash = "sha256:43bca78665423cabae77146f2fe7ce55272b6c8d55d82cca83effd42c7e13972", size = 551165, upload-time = "2026-05-28T12:01:44.648Z" }, + { url = "https://files.pythonhosted.org/packages/3b/c1/bc479ca069200af730881b1bd525e3114b2b391a351509fcb1b772f28086/rpds_py-2026.5.1-cp315-cp315t-musllinux_1_2_i686.whl", hash = "sha256:42d0f20e85e549c870749d0e247f0c10d318a45b7e9676d575d2dcb04a1b2e66", size = 618778, upload-time = "2026-05-28T12:01:46.337Z" }, + { url = "https://files.pythonhosted.org/packages/77/65/38ab2f90df44c2febfb63cc10ced40763d9b4bc94d173e734528663fe7f5/rpds_py-2026.5.1-cp315-cp315t-musllinux_1_2_x86_64.whl", hash = "sha256:b1be5c35683684d5331b93600c210e8367c254683d8a6df6bd21bd2da3a334fb", size = 581839, upload-time = "2026-05-28T12:01:48.109Z" }, + { url = "https://files.pythonhosted.org/packages/15/2d/ce1f605fe036aadd460e5822e578c6c7ec3a860936cca37d6e0f299daa77/rpds_py-2026.5.1-cp315-cp315t-win32.whl", hash = "sha256:75808f6c38ce7749bb68cc2770161aae5045e6c6f6781a9782e74b93304399df", size = 207866, upload-time = "2026-05-28T12:01:49.648Z" }, + { url = "https://files.pythonhosted.org/packages/79/cb/966040123eb102371559746908ef2c9471f4d43e17ec9a645a2258dab64b/rpds_py-2026.5.1-cp315-cp315t-win_amd64.whl", hash = "sha256:90bd6630002a1c7f09e7843dd79f0d24f3d2897cc25a753480917865d14f15b3", size = 225441, upload-time = "2026-05-28T12:01:51.408Z" }, + { url = "https://files.pythonhosted.org/packages/42/56/3fe0fb34820ff667be791b3a3c22b85e8bcba54e9c832f47438c191fa7be/rpds_py-2026.5.1-pp311-pypy311_pp73-macosx_10_12_x86_64.whl", hash = "sha256:edf2765d84e42447f112ad877af8fe1db0089aaec5b28e88d6eab45e7fe99cea", size = 357151, upload-time = "2026-05-28T12:01:53.43Z" }, + { url = "https://files.pythonhosted.org/packages/8b/f2/3eb9ccdb9f143b8c9b003978898cb497f942a324c077401e6b8834238e63/rpds_py-2026.5.1-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:ad3773236e95f7f33991eb125224b7da66f206504d032a253a02da7e134519fb", size = 350195, upload-time = "2026-05-28T12:01:54.901Z" }, + { url = "https://files.pythonhosted.org/packages/a7/24/dbda232bc4f3ed732120692ab0d2c8402cb020516556d8bee622dcef2413/rpds_py-2026.5.1-pp311-pypy311_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a04df86b3f0fade39ec8fd0e0aab089b1da9fbd2b48df778a57ef96f5e7d38df", size = 381850, upload-time = "2026-05-28T12:01:56.601Z" }, + { url = "https://files.pythonhosted.org/packages/40/30/32e769839a358f78810c234f160f2cc21d1e4e47e1c0e0e0d535be5a0219/rpds_py-2026.5.1-pp311-pypy311_pp73-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:6142dbd80c4df62a5d899f0d616d417f84e0bc8d32526c8e5589019d75d028a7", size = 387899, upload-time = "2026-05-28T12:01:58.212Z" }, + { url = "https://files.pythonhosted.org/packages/ab/86/ec84d243aadb3b34b71dd26a010d0930b2d284ff5fc9a69fec53810ee6fd/rpds_py-2026.5.1-pp311-pypy311_pp73-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:0b35217adefe87f2fe4db7e9766cabe84744bfe9616d9667be18988928c7f2dc", size = 501618, upload-time = "2026-05-28T12:01:59.888Z" }, + { url = "https://files.pythonhosted.org/packages/74/25/b60e52686bbff777a64f9e4f4d3dd57980dc846913777177a2c92e4937aa/rpds_py-2026.5.1-pp311-pypy311_pp73-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b95d5e11fc712b752081183a55a244c03cd00570489edd7014d8899f8ceb8162", size = 394003, upload-time = "2026-05-28T12:02:01.482Z" }, + { url = "https://files.pythonhosted.org/packages/9b/c7/b3a6a588cc2219510ef3f42e207483a93950bedd1e3a0fd4015c95cff9e5/rpds_py-2026.5.1-pp311-pypy311_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:141c9498daf2ace9eda35d2b0e376f9ea8b058d84f2aef4f96fccfd449a2f251", size = 379778, upload-time = "2026-05-28T12:02:03.197Z" }, + { url = "https://files.pythonhosted.org/packages/31/00/c7dba3fc8a3da8cb3f6db1eb3386be4d79c2e97c6890d20eb9ac66ae8c43/rpds_py-2026.5.1-pp311-pypy311_pp73-manylinux_2_31_riscv64.whl", hash = "sha256:6f249f8b860a200ad35193af961183ebe9132710484e6f6ce0cf89fd83c63a9a", size = 392359, upload-time = "2026-05-28T12:02:04.817Z" }, + { url = "https://files.pythonhosted.org/packages/93/dd/472ba494c70753f93745992c99855bee0636daf74e6984e5e003f150316f/rpds_py-2026.5.1-pp311-pypy311_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:e4abbf391a70be864920858bf360f4fb380577c9a0f732438a1996726e2c195b", size = 412820, upload-time = "2026-05-28T12:02:06.401Z" }, + { url = "https://files.pythonhosted.org/packages/1d/6f/93831a3bfe789542ed0c1d0d74b78b440f055d6dc3ea4640eba2d95e6e23/rpds_py-2026.5.1-pp311-pypy311_pp73-musllinux_1_2_aarch64.whl", hash = "sha256:c74005a7bb87752acf351c93897ec63ad77a07a0da7ecad9c050e32e7286ba34", size = 557243, upload-time = "2026-05-28T12:02:08.013Z" }, + { url = "https://files.pythonhosted.org/packages/1f/ff/0b3d604614ffc77522c6b288fdbce68957eb583da1002aa65ba38ac0ee40/rpds_py-2026.5.1-pp311-pypy311_pp73-musllinux_1_2_i686.whl", hash = "sha256:8213afbe8a3a906fb9acb2014423fe3359ee783d0bf90995f70623a3217bfa6c", size = 623541, upload-time = "2026-05-28T12:02:09.661Z" }, + { url = "https://files.pythonhosted.org/packages/ea/ea/e7b0251441da9adfeaebcf29601d10f2a1455fcf0772fae9e7e19032bd96/rpds_py-2026.5.1-pp311-pypy311_pp73-musllinux_1_2_x86_64.whl", hash = "sha256:8c43a8a973270fd173bf48cdf80bbe66312421cba68d40845034f174f2389049", size = 586326, upload-time = "2026-05-28T12:02:11.47Z" }, +] + +[[package]] +name = "rq" +version = "2.3.2" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "click" }, + { name = "redis" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/43/8d/bb57bca979f48869aea0b7b9752b0887848a7098352753021fdcbdaf0efb/rq-2.3.2.tar.gz", hash = "sha256:5bd212992724428ec1689736abde783d245e7856bca39d89845884f5d580f5f1", size = 649216, upload-time = "2025-04-13T10:07:41.383Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/3f/bf/08d99660c138354a83105efa64988ee4adc8ddc6c74866f29508aaff00f7/rq-2.3.2-py3-none-any.whl", hash = "sha256:bf4dc622a7b9d5f7d4a39444f26d89ce6de8a1d6db61b21060612114dbf8d5ff", size = 100389, upload-time = "2025-04-13T10:07:38.965Z" }, +] + +[[package]] +name = "rq-scheduler" +version = "0.14.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "crontab" }, + { name = "freezegun" }, + { name = "python-dateutil" }, + { name = "rq" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/a0/4e/977bbcc1f3b25ed9ea60ec968b13f7147661defe5b2f9272b44fdb1c5549/rq-scheduler-0.14.0.tar.gz", hash = "sha256:2d5a14a1ab217f8693184ebaa1fe03838edcbc70b4f76572721c0b33058cd023", size = 16582, upload-time = "2024-10-29T13:30:32.641Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/bb/d0/28cedca9f3b321f30e69d644c2dcd7097ec21570ec9606fde56750621300/rq_scheduler-0.14.0-py2.py3-none-any.whl", hash = "sha256:d4ec221a3d8c11b3ff55e041f09d9af1e17f3253db737b6b97e86ab20fc3dc0d", size = 13874, upload-time = "2024-10-29T13:30:30.449Z" }, +] + +[[package]] +name = "ruamel-yaml" +version = "0.19.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/c7/3b/ebda527b56beb90cb7652cb1c7e4f91f48649fbcd8d2eb2fb6e77cd3329b/ruamel_yaml-0.19.1.tar.gz", hash = "sha256:53eb66cd27849eff968ebf8f0bf61f46cdac2da1d1f3576dd4ccee9b25c31993", size = 142709, upload-time = "2026-01-02T16:50:31.84Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/b8/0c/51f6841f1d84f404f92463fc2b1ba0da357ca1e3db6b7fbda26956c3b82a/ruamel_yaml-0.19.1-py3-none-any.whl", hash = "sha256:27592957fedf6e0b62f281e96effd28043345e0e66001f97683aa9a40c667c93", size = 118102, upload-time = "2026-01-02T16:50:29.201Z" }, +] + +[[package]] +name = "s3transfer" +version = "0.19.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "botocore" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/f6/94/dcdaeb1713cab9c84def276cfac7388b17c7d9855bbcfe88d77e4dbafd44/s3transfer-0.19.0.tar.gz", hash = "sha256:ce436931687addc4c1712d52d40b32f53e88315723f107ffa20ba82b05a0f685", size = 165171, upload-time = "2026-06-16T19:44:51.599Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/46/5f/4c174edad94f82de888ac00a5ddd8d07b35609b6c94f0bdf4d74af57703e/s3transfer-0.19.0-py3-none-any.whl", hash = "sha256:777cc2415536f1debadb5c2ef7779275d0fc0fe0e042411cdd6caebeb2685262", size = 90101, upload-time = "2026-06-16T19:44:50.439Z" }, +] + +[[package]] +name = "scipy" +version = "1.17.1" +source = { registry = "https://pypi.org/simple" } +resolution-markers = [ + "python_full_version < '3.12' and sys_platform == 'win32'", + "python_full_version < '3.12' and sys_platform != 'win32'", +] +dependencies = [ + { name = "numpy", version = "2.4.6", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version < '3.12'" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/7a/97/5a3609c4f8d58b039179648e62dd220f89864f56f7357f5d4f45c29eb2cc/scipy-1.17.1.tar.gz", hash = "sha256:95d8e012d8cb8816c226aef832200b1d45109ed4464303e997c5b13122b297c0", size = 30573822, upload-time = "2026-02-23T00:26:24.851Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/df/75/b4ce781849931fef6fd529afa6b63711d5a733065722d0c3e2724af9e40a/scipy-1.17.1-cp311-cp311-macosx_10_14_x86_64.whl", hash = "sha256:1f95b894f13729334fb990162e911c9e5dc1ab390c58aa6cbecb389c5b5e28ec", size = 31613675, upload-time = "2026-02-23T00:16:00.13Z" }, + { url = "https://files.pythonhosted.org/packages/f7/58/bccc2861b305abdd1b8663d6130c0b3d7cc22e8d86663edbc8401bfd40d4/scipy-1.17.1-cp311-cp311-macosx_12_0_arm64.whl", hash = "sha256:e18f12c6b0bc5a592ed23d3f7b891f68fd7f8241d69b7883769eb5d5dfb52696", size = 28162057, upload-time = "2026-02-23T00:16:09.456Z" }, + { url = "https://files.pythonhosted.org/packages/6d/ee/18146b7757ed4976276b9c9819108adbc73c5aad636e5353e20746b73069/scipy-1.17.1-cp311-cp311-macosx_14_0_arm64.whl", hash = "sha256:a3472cfbca0a54177d0faa68f697d8ba4c80bbdc19908c3465556d9f7efce9ee", size = 20334032, upload-time = "2026-02-23T00:16:17.358Z" }, + { url = "https://files.pythonhosted.org/packages/ec/e6/cef1cf3557f0c54954198554a10016b6a03b2ec9e22a4e1df734936bd99c/scipy-1.17.1-cp311-cp311-macosx_14_0_x86_64.whl", hash = "sha256:766e0dc5a616d026a3a1cffa379af959671729083882f50307e18175797b3dfd", size = 22709533, upload-time = "2026-02-23T00:16:25.791Z" }, + { url = "https://files.pythonhosted.org/packages/4d/60/8804678875fc59362b0fb759ab3ecce1f09c10a735680318ac30da8cd76b/scipy-1.17.1-cp311-cp311-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:744b2bf3640d907b79f3fd7874efe432d1cf171ee721243e350f55234b4cec4c", size = 33062057, upload-time = "2026-02-23T00:16:36.931Z" }, + { url = "https://files.pythonhosted.org/packages/09/7d/af933f0f6e0767995b4e2d705a0665e454d1c19402aa7e895de3951ebb04/scipy-1.17.1-cp311-cp311-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:43af8d1f3bea642559019edfe64e9b11192a8978efbd1539d7bc2aaa23d92de4", size = 35349300, upload-time = "2026-02-23T00:16:49.108Z" }, + { url = "https://files.pythonhosted.org/packages/b4/3d/7ccbbdcbb54c8fdc20d3b6930137c782a163fa626f0aef920349873421ba/scipy-1.17.1-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:cd96a1898c0a47be4520327e01f874acfd61fb48a9420f8aa9f6483412ffa444", size = 35127333, upload-time = "2026-02-23T00:17:01.293Z" }, + { url = "https://files.pythonhosted.org/packages/e8/19/f926cb11c42b15ba08e3a71e376d816ac08614f769b4f47e06c3580c836a/scipy-1.17.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:4eb6c25dd62ee8d5edf68a8e1c171dd71c292fdae95d8aeb3dd7d7de4c364082", size = 37741314, upload-time = "2026-02-23T00:17:12.576Z" }, + { url = "https://files.pythonhosted.org/packages/95/da/0d1df507cf574b3f224ccc3d45244c9a1d732c81dcb26b1e8a766ae271a8/scipy-1.17.1-cp311-cp311-win_amd64.whl", hash = "sha256:d30e57c72013c2a4fe441c2fcb8e77b14e152ad48b5464858e07e2ad9fbfceff", size = 36607512, upload-time = "2026-02-23T00:17:23.424Z" }, + { url = "https://files.pythonhosted.org/packages/68/7f/bdd79ceaad24b671543ffe0ef61ed8e659440eb683b66f033454dcee90eb/scipy-1.17.1-cp311-cp311-win_arm64.whl", hash = "sha256:9ecb4efb1cd6e8c4afea0daa91a87fbddbce1b99d2895d151596716c0b2e859d", size = 24599248, upload-time = "2026-02-23T00:17:34.561Z" }, + { url = "https://files.pythonhosted.org/packages/35/48/b992b488d6f299dbe3f11a20b24d3dda3d46f1a635ede1c46b5b17a7b163/scipy-1.17.1-cp312-cp312-macosx_10_14_x86_64.whl", hash = "sha256:35c3a56d2ef83efc372eaec584314bd0ef2e2f0d2adb21c55e6ad5b344c0dcb8", size = 31610954, upload-time = "2026-02-23T00:17:49.855Z" }, + { url = "https://files.pythonhosted.org/packages/b2/02/cf107b01494c19dc100f1d0b7ac3cc08666e96ba2d64db7626066cee895e/scipy-1.17.1-cp312-cp312-macosx_12_0_arm64.whl", hash = "sha256:fcb310ddb270a06114bb64bbe53c94926b943f5b7f0842194d585c65eb4edd76", size = 28172662, upload-time = "2026-02-23T00:18:01.64Z" }, + { url = "https://files.pythonhosted.org/packages/cf/a9/599c28631bad314d219cf9ffd40e985b24d603fc8a2f4ccc5ae8419a535b/scipy-1.17.1-cp312-cp312-macosx_14_0_arm64.whl", hash = "sha256:cc90d2e9c7e5c7f1a482c9875007c095c3194b1cfedca3c2f3291cdc2bc7c086", size = 20344366, upload-time = "2026-02-23T00:18:12.015Z" }, + { url = "https://files.pythonhosted.org/packages/35/f5/906eda513271c8deb5af284e5ef0206d17a96239af79f9fa0aebfe0e36b4/scipy-1.17.1-cp312-cp312-macosx_14_0_x86_64.whl", hash = "sha256:c80be5ede8f3f8eded4eff73cc99a25c388ce98e555b17d31da05287015ffa5b", size = 22704017, upload-time = "2026-02-23T00:18:21.502Z" }, + { url = "https://files.pythonhosted.org/packages/da/34/16f10e3042d2f1d6b66e0428308ab52224b6a23049cb2f5c1756f713815f/scipy-1.17.1-cp312-cp312-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:e19ebea31758fac5893a2ac360fedd00116cbb7628e650842a6691ba7ca28a21", size = 32927842, upload-time = "2026-02-23T00:18:35.367Z" }, + { url = "https://files.pythonhosted.org/packages/01/8e/1e35281b8ab6d5d72ebe9911edcdffa3f36b04ed9d51dec6dd140396e220/scipy-1.17.1-cp312-cp312-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:02ae3b274fde71c5e92ac4d54bc06c42d80e399fec704383dcd99b301df37458", size = 35235890, upload-time = "2026-02-23T00:18:49.188Z" }, + { url = "https://files.pythonhosted.org/packages/c5/5c/9d7f4c88bea6e0d5a4f1bc0506a53a00e9fcb198de372bfe4d3652cef482/scipy-1.17.1-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:8a604bae87c6195d8b1045eddece0514d041604b14f2727bbc2b3020172045eb", size = 35003557, upload-time = "2026-02-23T00:18:54.74Z" }, + { url = "https://files.pythonhosted.org/packages/65/94/7698add8f276dbab7a9de9fb6b0e02fc13ee61d51c7c3f85ac28b65e1239/scipy-1.17.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:f590cd684941912d10becc07325a3eeb77886fe981415660d9265c4c418d0bea", size = 37625856, upload-time = "2026-02-23T00:19:00.307Z" }, + { url = "https://files.pythonhosted.org/packages/a2/84/dc08d77fbf3d87d3ee27f6a0c6dcce1de5829a64f2eae85a0ecc1f0daa73/scipy-1.17.1-cp312-cp312-win_amd64.whl", hash = "sha256:41b71f4a3a4cab9d366cd9065b288efc4d4f3c0b37a91a8e0947fb5bd7f31d87", size = 36549682, upload-time = "2026-02-23T00:19:07.67Z" }, + { url = "https://files.pythonhosted.org/packages/bc/98/fe9ae9ffb3b54b62559f52dedaebe204b408db8109a8c66fdd04869e6424/scipy-1.17.1-cp312-cp312-win_arm64.whl", hash = "sha256:f4115102802df98b2b0db3cce5cb9b92572633a1197c77b7553e5203f284a5b3", size = 24547340, upload-time = "2026-02-23T00:19:12.024Z" }, + { url = "https://files.pythonhosted.org/packages/76/27/07ee1b57b65e92645f219b37148a7e7928b82e2b5dbeccecb4dff7c64f0b/scipy-1.17.1-cp313-cp313-macosx_10_14_x86_64.whl", hash = "sha256:5e3c5c011904115f88a39308379c17f91546f77c1667cea98739fe0fccea804c", size = 31590199, upload-time = "2026-02-23T00:19:17.192Z" }, + { url = "https://files.pythonhosted.org/packages/ec/ae/db19f8ab842e9b724bf5dbb7db29302a91f1e55bc4d04b1025d6d605a2c5/scipy-1.17.1-cp313-cp313-macosx_12_0_arm64.whl", hash = "sha256:6fac755ca3d2c3edcb22f479fceaa241704111414831ddd3bc6056e18516892f", size = 28154001, upload-time = "2026-02-23T00:19:22.241Z" }, + { url = "https://files.pythonhosted.org/packages/5b/58/3ce96251560107b381cbd6e8413c483bbb1228a6b919fa8652b0d4090e7f/scipy-1.17.1-cp313-cp313-macosx_14_0_arm64.whl", hash = "sha256:7ff200bf9d24f2e4d5dc6ee8c3ac64d739d3a89e2326ba68aaf6c4a2b838fd7d", size = 20325719, upload-time = "2026-02-23T00:19:26.329Z" }, + { url = "https://files.pythonhosted.org/packages/b2/83/15087d945e0e4d48ce2377498abf5ad171ae013232ae31d06f336e64c999/scipy-1.17.1-cp313-cp313-macosx_14_0_x86_64.whl", hash = "sha256:4b400bdc6f79fa02a4d86640310dde87a21fba0c979efff5248908c6f15fad1b", size = 22683595, upload-time = "2026-02-23T00:19:30.304Z" }, + { url = "https://files.pythonhosted.org/packages/b4/e0/e58fbde4a1a594c8be8114eb4aac1a55bcd6587047efc18a61eb1f5c0d30/scipy-1.17.1-cp313-cp313-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:2b64ca7d4aee0102a97f3ba22124052b4bd2152522355073580bf4845e2550b6", size = 32896429, upload-time = "2026-02-23T00:19:35.536Z" }, + { url = "https://files.pythonhosted.org/packages/f5/5f/f17563f28ff03c7b6799c50d01d5d856a1d55f2676f537ca8d28c7f627cd/scipy-1.17.1-cp313-cp313-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:581b2264fc0aa555f3f435a5944da7504ea3a065d7029ad60e7c3d1ae09c5464", size = 35203952, upload-time = "2026-02-23T00:19:42.259Z" }, + { url = "https://files.pythonhosted.org/packages/8d/a5/9afd17de24f657fdfe4df9a3f1ea049b39aef7c06000c13db1530d81ccca/scipy-1.17.1-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:beeda3d4ae615106d7094f7e7cef6218392e4465cc95d25f900bebabfded0950", size = 34979063, upload-time = "2026-02-23T00:19:47.547Z" }, + { url = "https://files.pythonhosted.org/packages/8b/13/88b1d2384b424bf7c924f2038c1c409f8d88bb2a8d49d097861dd64a57b2/scipy-1.17.1-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:6609bc224e9568f65064cfa72edc0f24ee6655b47575954ec6339534b2798369", size = 37598449, upload-time = "2026-02-23T00:19:53.238Z" }, + { url = "https://files.pythonhosted.org/packages/35/e5/d6d0e51fc888f692a35134336866341c08655d92614f492c6860dc45bb2c/scipy-1.17.1-cp313-cp313-win_amd64.whl", hash = "sha256:37425bc9175607b0268f493d79a292c39f9d001a357bebb6b88fdfaff13f6448", size = 36510943, upload-time = "2026-02-23T00:20:50.89Z" }, + { url = "https://files.pythonhosted.org/packages/2a/fd/3be73c564e2a01e690e19cc618811540ba5354c67c8680dce3281123fb79/scipy-1.17.1-cp313-cp313-win_arm64.whl", hash = "sha256:5cf36e801231b6a2059bf354720274b7558746f3b1a4efb43fcf557ccd484a87", size = 24545621, upload-time = "2026-02-23T00:20:55.871Z" }, + { url = "https://files.pythonhosted.org/packages/6f/6b/17787db8b8114933a66f9dcc479a8272e4b4da75fe03b0c282f7b0ade8cd/scipy-1.17.1-cp313-cp313t-macosx_10_14_x86_64.whl", hash = "sha256:d59c30000a16d8edc7e64152e30220bfbd724c9bbb08368c054e24c651314f0a", size = 31936708, upload-time = "2026-02-23T00:19:58.694Z" }, + { url = "https://files.pythonhosted.org/packages/38/2e/524405c2b6392765ab1e2b722a41d5da33dc5c7b7278184a8ad29b6cb206/scipy-1.17.1-cp313-cp313t-macosx_12_0_arm64.whl", hash = "sha256:010f4333c96c9bb1a4516269e33cb5917b08ef2166d5556ca2fd9f082a9e6ea0", size = 28570135, upload-time = "2026-02-23T00:20:03.934Z" }, + { url = "https://files.pythonhosted.org/packages/fd/c3/5bd7199f4ea8556c0c8e39f04ccb014ac37d1468e6cfa6a95c6b3562b76e/scipy-1.17.1-cp313-cp313t-macosx_14_0_arm64.whl", hash = "sha256:2ceb2d3e01c5f1d83c4189737a42d9cb2fc38a6eeed225e7515eef71ad301dce", size = 20741977, upload-time = "2026-02-23T00:20:07.935Z" }, + { url = "https://files.pythonhosted.org/packages/d9/b8/8ccd9b766ad14c78386599708eb745f6b44f08400a5fd0ade7cf89b6fc93/scipy-1.17.1-cp313-cp313t-macosx_14_0_x86_64.whl", hash = "sha256:844e165636711ef41f80b4103ed234181646b98a53c8f05da12ca5ca289134f6", size = 23029601, upload-time = "2026-02-23T00:20:12.161Z" }, + { url = "https://files.pythonhosted.org/packages/6d/a0/3cb6f4d2fb3e17428ad2880333cac878909ad1a89f678527b5328b93c1d4/scipy-1.17.1-cp313-cp313t-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:158dd96d2207e21c966063e1635b1063cd7787b627b6f07305315dd73d9c679e", size = 33019667, upload-time = "2026-02-23T00:20:17.208Z" }, + { url = "https://files.pythonhosted.org/packages/f3/c3/2d834a5ac7bf3a0c806ad1508efc02dda3c8c61472a56132d7894c312dea/scipy-1.17.1-cp313-cp313t-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:74cbb80d93260fe2ffa334efa24cb8f2f0f622a9b9febf8b483c0b865bfb3475", size = 35264159, upload-time = "2026-02-23T00:20:23.087Z" }, + { url = "https://files.pythonhosted.org/packages/4d/77/d3ed4becfdbd217c52062fafe35a72388d1bd82c2d0ba5ca19d6fcc93e11/scipy-1.17.1-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:dbc12c9f3d185f5c737d801da555fb74b3dcfa1a50b66a1a93e09190f41fab50", size = 35102771, upload-time = "2026-02-23T00:20:28.636Z" }, + { url = "https://files.pythonhosted.org/packages/bd/12/d19da97efde68ca1ee5538bb261d5d2c062f0c055575128f11a2730e3ac1/scipy-1.17.1-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:94055a11dfebe37c656e70317e1996dc197e1a15bbcc351bcdd4610e128fe1ca", size = 37665910, upload-time = "2026-02-23T00:20:34.743Z" }, + { url = "https://files.pythonhosted.org/packages/06/1c/1172a88d507a4baaf72c5a09bb6c018fe2ae0ab622e5830b703a46cc9e44/scipy-1.17.1-cp313-cp313t-win_amd64.whl", hash = "sha256:e30bdeaa5deed6bc27b4cc490823cd0347d7dae09119b8803ae576ea0ce52e4c", size = 36562980, upload-time = "2026-02-23T00:20:40.575Z" }, + { url = "https://files.pythonhosted.org/packages/70/b0/eb757336e5a76dfa7911f63252e3b7d1de00935d7705cf772db5b45ec238/scipy-1.17.1-cp313-cp313t-win_arm64.whl", hash = "sha256:a720477885a9d2411f94a93d16f9d89bad0f28ca23c3f8daa521e2dcc3f44d49", size = 24856543, upload-time = "2026-02-23T00:20:45.313Z" }, + { url = "https://files.pythonhosted.org/packages/cf/83/333afb452af6f0fd70414dc04f898647ee1423979ce02efa75c3b0f2c28e/scipy-1.17.1-cp314-cp314-macosx_10_14_x86_64.whl", hash = "sha256:a48a72c77a310327f6a3a920092fa2b8fd03d7deaa60f093038f22d98e096717", size = 31584510, upload-time = "2026-02-23T00:21:01.015Z" }, + { url = "https://files.pythonhosted.org/packages/ed/a6/d05a85fd51daeb2e4ea71d102f15b34fedca8e931af02594193ae4fd25f7/scipy-1.17.1-cp314-cp314-macosx_12_0_arm64.whl", hash = "sha256:45abad819184f07240d8a696117a7aacd39787af9e0b719d00285549ed19a1e9", size = 28170131, upload-time = "2026-02-23T00:21:05.888Z" }, + { url = "https://files.pythonhosted.org/packages/db/7b/8624a203326675d7746a254083a187398090a179335b2e4a20e2ddc46e83/scipy-1.17.1-cp314-cp314-macosx_14_0_arm64.whl", hash = "sha256:3fd1fcdab3ea951b610dc4cef356d416d5802991e7e32b5254828d342f7b7e0b", size = 20342032, upload-time = "2026-02-23T00:21:09.904Z" }, + { url = "https://files.pythonhosted.org/packages/c9/35/2c342897c00775d688d8ff3987aced3426858fd89d5a0e26e020b660b301/scipy-1.17.1-cp314-cp314-macosx_14_0_x86_64.whl", hash = "sha256:7bdf2da170b67fdf10bca777614b1c7d96ae3ca5794fd9587dce41eb2966e866", size = 22678766, upload-time = "2026-02-23T00:21:14.313Z" }, + { url = "https://files.pythonhosted.org/packages/ef/f2/7cdb8eb308a1a6ae1e19f945913c82c23c0c442a462a46480ce487fdc0ac/scipy-1.17.1-cp314-cp314-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:adb2642e060a6549c343603a3851ba76ef0b74cc8c079a9a58121c7ec9fe2350", size = 32957007, upload-time = "2026-02-23T00:21:19.663Z" }, + { url = "https://files.pythonhosted.org/packages/0b/2e/7eea398450457ecb54e18e9d10110993fa65561c4f3add5e8eccd2b9cd41/scipy-1.17.1-cp314-cp314-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:eee2cfda04c00a857206a4330f0c5e3e56535494e30ca445eb19ec624ae75118", size = 35221333, upload-time = "2026-02-23T00:21:25.278Z" }, + { url = "https://files.pythonhosted.org/packages/d9/77/5b8509d03b77f093a0d52e606d3c4f79e8b06d1d38c441dacb1e26cacf46/scipy-1.17.1-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:d2650c1fb97e184d12d8ba010493ee7b322864f7d3d00d3f9bb97d9c21de4068", size = 35042066, upload-time = "2026-02-23T00:21:31.358Z" }, + { url = "https://files.pythonhosted.org/packages/f9/df/18f80fb99df40b4070328d5ae5c596f2f00fffb50167e31439e932f29e7d/scipy-1.17.1-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:08b900519463543aa604a06bec02461558a6e1cef8fdbb8098f77a48a83c8118", size = 37612763, upload-time = "2026-02-23T00:21:37.247Z" }, + { url = "https://files.pythonhosted.org/packages/4b/39/f0e8ea762a764a9dc52aa7dabcfad51a354819de1f0d4652b6a1122424d6/scipy-1.17.1-cp314-cp314-win_amd64.whl", hash = "sha256:3877ac408e14da24a6196de0ddcace62092bfc12a83823e92e49e40747e52c19", size = 37290984, upload-time = "2026-02-23T00:22:35.023Z" }, + { url = "https://files.pythonhosted.org/packages/7c/56/fe201e3b0f93d1a8bcf75d3379affd228a63d7e2d80ab45467a74b494947/scipy-1.17.1-cp314-cp314-win_arm64.whl", hash = "sha256:f8885db0bc2bffa59d5c1b72fad7a6a92d3e80e7257f967dd81abb553a90d293", size = 25192877, upload-time = "2026-02-23T00:22:39.798Z" }, + { url = "https://files.pythonhosted.org/packages/96/ad/f8c414e121f82e02d76f310f16db9899c4fcde36710329502a6b2a3c0392/scipy-1.17.1-cp314-cp314t-macosx_10_14_x86_64.whl", hash = "sha256:1cc682cea2ae55524432f3cdff9e9a3be743d52a7443d0cba9017c23c87ae2f6", size = 31949750, upload-time = "2026-02-23T00:21:42.289Z" }, + { url = "https://files.pythonhosted.org/packages/7c/b0/c741e8865d61b67c81e255f4f0a832846c064e426636cd7de84e74d209be/scipy-1.17.1-cp314-cp314t-macosx_12_0_arm64.whl", hash = "sha256:2040ad4d1795a0ae89bfc7e8429677f365d45aa9fd5e4587cf1ea737f927b4a1", size = 28585858, upload-time = "2026-02-23T00:21:47.706Z" }, + { url = "https://files.pythonhosted.org/packages/ed/1b/3985219c6177866628fa7c2595bfd23f193ceebbe472c98a08824b9466ff/scipy-1.17.1-cp314-cp314t-macosx_14_0_arm64.whl", hash = "sha256:131f5aaea57602008f9822e2115029b55d4b5f7c070287699fe45c661d051e39", size = 20757723, upload-time = "2026-02-23T00:21:52.039Z" }, + { url = "https://files.pythonhosted.org/packages/c0/19/2a04aa25050d656d6f7b9e7b685cc83d6957fb101665bfd9369ca6534563/scipy-1.17.1-cp314-cp314t-macosx_14_0_x86_64.whl", hash = "sha256:9cdc1a2fcfd5c52cfb3045feb399f7b3ce822abdde3a193a6b9a60b3cb5854ca", size = 23043098, upload-time = "2026-02-23T00:21:56.185Z" }, + { url = "https://files.pythonhosted.org/packages/86/f1/3383beb9b5d0dbddd030335bf8a8b32d4317185efe495374f134d8be6cce/scipy-1.17.1-cp314-cp314t-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:6e3dcd57ab780c741fde8dc68619de988b966db759a3c3152e8e9142c26295ad", size = 33030397, upload-time = "2026-02-23T00:22:01.404Z" }, + { url = "https://files.pythonhosted.org/packages/41/68/8f21e8a65a5a03f25a79165ec9d2b28c00e66dc80546cf5eb803aeeff35b/scipy-1.17.1-cp314-cp314t-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:a9956e4d4f4a301ebf6cde39850333a6b6110799d470dbbb1e25326ac447f52a", size = 35281163, upload-time = "2026-02-23T00:22:07.024Z" }, + { url = "https://files.pythonhosted.org/packages/84/8d/c8a5e19479554007a5632ed7529e665c315ae7492b4f946b0deb39870e39/scipy-1.17.1-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:a4328d245944d09fd639771de275701ccadf5f781ba0ff092ad141e017eccda4", size = 35116291, upload-time = "2026-02-23T00:22:12.585Z" }, + { url = "https://files.pythonhosted.org/packages/52/52/e57eceff0e342a1f50e274264ed47497b59e6a4e3118808ee58ddda7b74a/scipy-1.17.1-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:a77cbd07b940d326d39a1d1b37817e2ee4d79cb30e7338f3d0cddffae70fcaa2", size = 37682317, upload-time = "2026-02-23T00:22:18.513Z" }, + { url = "https://files.pythonhosted.org/packages/11/2f/b29eafe4a3fbc3d6de9662b36e028d5f039e72d345e05c250e121a230dd4/scipy-1.17.1-cp314-cp314t-win_amd64.whl", hash = "sha256:eb092099205ef62cd1782b006658db09e2fed75bffcae7cc0d44052d8aa0f484", size = 37345327, upload-time = "2026-02-23T00:22:24.442Z" }, + { url = "https://files.pythonhosted.org/packages/07/39/338d9219c4e87f3e708f18857ecd24d22a0c3094752393319553096b98af/scipy-1.17.1-cp314-cp314t-win_arm64.whl", hash = "sha256:200e1050faffacc162be6a486a984a0497866ec54149a01270adc8a59b7c7d21", size = 25489165, upload-time = "2026-02-23T00:22:29.563Z" }, +] + +[[package]] +name = "scipy" +version = "1.18.0" +source = { registry = "https://pypi.org/simple" } +resolution-markers = [ + "python_full_version >= '3.14' and sys_platform == 'win32'", + "python_full_version >= '3.14' and sys_platform != 'win32'", + "python_full_version == '3.13.*' and sys_platform == 'win32'", + "python_full_version == '3.13.*' and sys_platform != 'win32'", + "python_full_version == '3.12.*' and sys_platform == 'win32'", + "python_full_version == '3.12.*' and sys_platform != 'win32'", +] +dependencies = [ + { name = "numpy", version = "2.5.0", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version >= '3.12'" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/a7/25/c2700dfaf6442b4effaa91af24ebce5dc9d31bb4a69706313aae70d72cd0/scipy-1.18.0.tar.gz", hash = "sha256:67b2ad2ad54c72ca6d04975a9b2df8c3638c34ddd5b28738e94fc2b57929d378", size = 30774447, upload-time = "2026-06-19T15:01:43.456Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/6a/19/ca10ead60b0acc80b2b833c2c4a4f2ff753d0f58b811f70d911c7e94a25c/scipy-1.18.0-cp312-cp312-macosx_10_15_x86_64.whl", hash = "sha256:7bd21faaf5a1a3b2eff922d02db5f191b99a6518db9078a8fb23169f6d22259a", size = 31056519, upload-time = "2026-06-19T14:59:45.203Z" }, + { url = "https://files.pythonhosted.org/packages/96/72/1e6442a00cd2924d361aa1b642ab6373ec35c6fabf311a760be9f76e0f13/scipy-1.18.0-cp312-cp312-macosx_12_0_arm64.whl", hash = "sha256:265915e79107de9f946b855e50d7470d5893ec3f54b342e1aa6201cbdcd8bb6b", size = 28681889, upload-time = "2026-06-19T14:59:48.103Z" }, + { url = "https://files.pythonhosted.org/packages/9b/2d/11dd93d21e147a73ba22bd75c0b9208d3a2e0ec76d53170ce7d9029b1015/scipy-1.18.0-cp312-cp312-macosx_14_0_arm64.whl", hash = "sha256:9ab7b758be6940954a713ee466e2043e9f6e2ed965c1fce5c91039f4be3d90a9", size = 20423580, upload-time = "2026-06-19T14:59:50.665Z" }, + { url = "https://files.pythonhosted.org/packages/9c/01/93552f75e0d2a7dd115a45e59209c51e8d514daff02fc887d2623be06fe1/scipy-1.18.0-cp312-cp312-macosx_14_0_x86_64.whl", hash = "sha256:97b6cddaaee0a779ef6b5ca83c9604b27cc16b2b8fc22c142652df8793319fb8", size = 23054441, upload-time = "2026-06-19T14:59:53.564Z" }, + { url = "https://files.pythonhosted.org/packages/3c/23/21f5e703643d66f21faa6b4c73195bfcad70c55efcb4f1ab327cd7c4101a/scipy-1.18.0-cp312-cp312-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:52a96e21517c7292375c0e27dd796a811f03fcea5fd4d108fdfea8145dcf17ab", size = 33968720, upload-time = "2026-06-19T14:59:56.415Z" }, + { url = "https://files.pythonhosted.org/packages/dd/aa/1b939f6c67ed68635bb538e6752d3dacc02f66535182e939a89581a44e9c/scipy-1.18.0-cp312-cp312-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:1f55797419e16e7f30cf88ffb3113ce0467f00cfe3f70d5c281730b21769bfc2", size = 35287115, upload-time = "2026-06-19T14:59:59.411Z" }, + { url = "https://files.pythonhosted.org/packages/b6/ff/eec46be7e9234208f801062b53e1983085eddebd693f6c9bfb03b459830d/scipy-1.18.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:ad033410e2e0672ffdc1042110cef20e1c46f8fd0616cee1d44d8d58fad8fc11", size = 35577989, upload-time = "2026-06-19T15:00:02.235Z" }, + { url = "https://files.pythonhosted.org/packages/84/ca/210d4759c7210bb7d269437421959b39a33434e2776b60c5cb8a763bb30a/scipy-1.18.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:4a55985d54c769c872e64b7f4c8a81cc30ef700cc04296abbbf3705439c126de", size = 37421717, upload-time = "2026-06-19T15:00:05.102Z" }, + { url = "https://files.pythonhosted.org/packages/2b/54/9a9edb45345bd6744da5ddfb6628e5d5185920494c6a67ec45b6381004cb/scipy-1.18.0-cp312-cp312-win_amd64.whl", hash = "sha256:71ccc8faa2dd16ac310233203474a8b5cb67f10dedd54a3116d34943f4b19132", size = 36597428, upload-time = "2026-06-19T15:00:08.112Z" }, + { url = "https://files.pythonhosted.org/packages/99/0e/33f32a2a58987e26aec0f7df252cbbad1e90ae77bdbc76f40dd4ed0cf0ea/scipy-1.18.0-cp312-cp312-win_arm64.whl", hash = "sha256:d88363fd9d8fbd3511bd273f1a49efb2a540773ddf92a91d57498ce7dd7f3e76", size = 24351481, upload-time = "2026-06-19T15:00:11.103Z" }, + { url = "https://files.pythonhosted.org/packages/05/52/9c0136c2de7ae0779b7b366447766cec6d9f0702c56bb8ffeb04c8fd3af4/scipy-1.18.0-cp313-cp313-macosx_10_15_x86_64.whl", hash = "sha256:09143f676d157d9f546d663504ef9c1becb819824f1afc018814176411942446", size = 31036107, upload-time = "2026-06-19T15:00:14.03Z" }, + { url = "https://files.pythonhosted.org/packages/02/73/0291a64843270f4efb86cdcf2ee0f2048631b65ec6b405398b2b4dbf11bf/scipy-1.18.0-cp313-cp313-macosx_12_0_arm64.whl", hash = "sha256:5efe260f69417b97ddae455bfb5a95e8359f7f66ad7fa9522a60feb66f169520", size = 28663303, upload-time = "2026-06-19T15:00:16.819Z" }, + { url = "https://files.pythonhosted.org/packages/d3/0f/10ffa0b697a572f4e0d48b92a88895d366422f019f723e7e14a84c050dac/scipy-1.18.0-cp313-cp313-macosx_14_0_arm64.whl", hash = "sha256:68363b7eaacd8b5dd426df56d782cc156468ac79a127a1b87ca597d6e2e82197", size = 20404960, upload-time = "2026-06-19T15:00:19.635Z" }, + { url = "https://files.pythonhosted.org/packages/7e/d2/e896cea21ba8edd6c81d4c55b1ffcc717e79698dcbebf9641b4cfb4c6622/scipy-1.18.0-cp313-cp313-macosx_14_0_x86_64.whl", hash = "sha256:c5557d8be5da8e41353fcd4d21491fdbab83b062fc579e94dc09a7c8ab4f669b", size = 23034074, upload-time = "2026-06-19T15:00:22.107Z" }, + { url = "https://files.pythonhosted.org/packages/ea/b2/e83ea34279a52c03374477c74006256ec78df65fc877baa4617d6de1d202/scipy-1.18.0-cp313-cp313-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:0d13bca67c096d89fb95ced0d8921807300fce0275643aef9533cc63a0773468", size = 33942038, upload-time = "2026-06-19T15:00:24.964Z" }, + { url = "https://files.pythonhosted.org/packages/f6/af/e8fe5fb136f51e2b01678b92cb4106d10d8cd68ec147ead2e7cb0ac75398/scipy-1.18.0-cp313-cp313-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:a46f9273dbd0eb1cefba61c9b8648b4dfe3cbc14a080176f9a73e44b8336dc7f", size = 35266390, upload-time = "2026-06-19T15:00:28.059Z" }, + { url = "https://files.pythonhosted.org/packages/3a/49/2c5cbb907b56695fc67517811d1db234dfd83381a84814ec220aded2794d/scipy-1.18.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:5aba46108853ddfc77906b6557aac839d2b52e900c1d72a1180adaaab58d265f", size = 35551324, upload-time = "2026-06-19T15:00:31.014Z" }, + { url = "https://files.pythonhosted.org/packages/bb/73/eda39f7a2d306ff0ffc574afd13c0bbb6d10a603d9a413998ee269487a80/scipy-1.18.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:b6f758e35f12757b5d95c00bc6de2438e229c2664b7a92e96f205959d9f2dfa4", size = 37404785, upload-time = "2026-06-19T15:00:34.072Z" }, + { url = "https://files.pythonhosted.org/packages/b7/d2/ae881ee28d014f38e0ccbfd974a06a919ba9af34f1f74bf42b5301891d63/scipy-1.18.0-cp313-cp313-win_amd64.whl", hash = "sha256:1afac4a847207c7ff8efd321734a50b06d0280b3b2a2c0fc2f413101747ad7c7", size = 36554943, upload-time = "2026-06-19T15:00:36.903Z" }, + { url = "https://files.pythonhosted.org/packages/70/3a/21154e2d54eb3639c6bf4dbae2e531c68356bfe95990daa30df33b30d556/scipy-1.18.0-cp313-cp313-win_arm64.whl", hash = "sha256:c5dbddf60e58c2312316d097271a8e73d40eaf2eabfa4d95ed7d3695bbf2ce7b", size = 24350911, upload-time = "2026-06-19T15:00:40.062Z" }, + { url = "https://files.pythonhosted.org/packages/78/b5/915a19b3de2f7430062b509653563db1633ddbb6f021b06731521115d4e2/scipy-1.18.0-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:4c256ee70c0d1a8a2ace807e199ccd4e3f57037433842abb3fb36bc17eaa9578", size = 31036253, upload-time = "2026-06-19T15:00:43.216Z" }, + { url = "https://files.pythonhosted.org/packages/d7/88/b72def7262e150d16be13fca37a96481138d624e700340bc3362a7588929/scipy-1.18.0-cp314-cp314-macosx_12_0_arm64.whl", hash = "sha256:2ef3abc54a4ffc53765374b0d5728532dfdd2585ed23f6b11c206a1f0b1b9af8", size = 28673758, upload-time = "2026-06-19T15:00:46.663Z" }, + { url = "https://files.pythonhosted.org/packages/91/02/2e636a61a525632c373cf6a9c24442a3ffb79e364d38e98b32042964ac32/scipy-1.18.0-cp314-cp314-macosx_14_0_arm64.whl", hash = "sha256:f2a6af57bd9e4a75d70e4117e78a1bbee84f79ae3fbb6d0111005d6ebcc4cb8d", size = 20415514, upload-time = "2026-06-19T15:00:49.399Z" }, + { url = "https://files.pythonhosted.org/packages/c9/b6/2135974442f6aba159d9d39d774a1c8cb19947016725d69fecc685df45bf/scipy-1.18.0-cp314-cp314-macosx_14_0_x86_64.whl", hash = "sha256:3f1ac564d3bf6c03d861d2cd87a1bea0da2887136f7fb1bf519c05a8971452d6", size = 23034398, upload-time = "2026-06-19T15:00:51.941Z" }, + { url = "https://files.pythonhosted.org/packages/f6/e6/ba89ec5abf6ee9257c0d1ec985573f3ae32742c24bc03e016388a40b1b15/scipy-1.18.0-cp314-cp314-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:40395a5fcd1abee49a5c7aaa98c29db393eedc835138560a588c47ec16156690", size = 33998032, upload-time = "2026-06-19T15:00:54.838Z" }, + { url = "https://files.pythonhosted.org/packages/7f/c4/bc41eb19b0fd0db868f4132920879019318d80cc522ad8f2bca4611af808/scipy-1.18.0-cp314-cp314-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:8ca01e8ae69f1b18e9a58d91afead31be3cef0dd905a10249dac559ee15460a0", size = 35283333, upload-time = "2026-06-19T15:00:58.152Z" }, + { url = "https://files.pythonhosted.org/packages/53/a4/cbdeef6eb3830a8462a9d4ada814de5fc984345cc9ecf17cbec51a036f1e/scipy-1.18.0-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:7a7f3b01647384dbc3a711e8c6778e0aabbe93959249fef5c7393396bcac0867", size = 35610216, upload-time = "2026-06-19T15:01:01.155Z" }, + { url = "https://files.pythonhosted.org/packages/80/4d/b2b82502b65f661d1b789c1665dcdf315d5f12194e06fc0b37946294ebae/scipy-1.18.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:6aa94e78ec192a30063a5e72e561c28af769dc311190b24fe91774eff1969709", size = 37418960, upload-time = "2026-06-19T15:01:04.155Z" }, + { url = "https://files.pythonhosted.org/packages/93/3e/902d836831474b0ab5a37d16404f7bc5fafd9efba632890e271ba952635f/scipy-1.18.0-cp314-cp314-win_amd64.whl", hash = "sha256:2d8bbdc6c817f5b4006a54d799d4f5bab6f910193cbb9a1ff310833d4d270f61", size = 37288845, upload-time = "2026-06-19T15:01:07.822Z" }, + { url = "https://files.pythonhosted.org/packages/b6/43/8d73b337a3bdb14daa0314f0434210747c02d79d729ce1777574a817dcf6/scipy-1.18.0-cp314-cp314-win_arm64.whl", hash = "sha256:18e9575f1569b2c54174e6159d32942e03731177f63dce7975f0a0c88d102f5b", size = 24988971, upload-time = "2026-06-19T15:01:11.076Z" }, + { url = "https://files.pythonhosted.org/packages/b4/b4/f11918b0508a2787031a0499a03fbe3546f3bb5ca05d01038c45b278c09a/scipy-1.18.0-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:f351e0dd702687d12a402b867a1b4146a256923e1c38317cbc472f6372b94707", size = 31399325, upload-time = "2026-06-19T15:01:13.723Z" }, + { url = "https://files.pythonhosted.org/packages/7b/d1/1f287b57c0ff0ee5185dff3946d92c8017d39b0e431f0ae79a3ff1859512/scipy-1.18.0-cp314-cp314t-macosx_12_0_arm64.whl", hash = "sha256:7c7a51b33ce387193c97f228320cf8e87361daa1bba750638677729598b3e677", size = 29092110, upload-time = "2026-06-19T15:01:16.908Z" }, + { url = "https://files.pythonhosted.org/packages/ff/1a/7b74eb6c392fdcb27d414c0e7558a6d0231eb3b6d73571f479bb81ea8794/scipy-1.18.0-cp314-cp314t-macosx_14_0_arm64.whl", hash = "sha256:84031d7b052a54fae2f8632e0ec802073d385476eb9a63079bce6e23ef9283d4", size = 20833811, upload-time = "2026-06-19T15:01:20.488Z" }, + { url = "https://files.pythonhosted.org/packages/7c/ad/f3941716320a7b9cb4d68734a903b45fe16eff5fb7da7e16f2e619304979/scipy-1.18.0-cp314-cp314t-macosx_14_0_x86_64.whl", hash = "sha256:56abf29a7c067dde59be8b9a22d606a4ea1b2f2a4b756d9d903c62818f5dacce", size = 23396644, upload-time = "2026-06-19T15:01:23.364Z" }, + { url = "https://files.pythonhosted.org/packages/22/22/1446b62ffe07f9719b7d9b1b6a4e05a772833ae8f441fe4c22c34c9b250f/scipy-1.18.0-cp314-cp314t-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:1ad44305cfa24b1ba5803cbbebf033590ccbac1aa5d612d727b785325ab408b0", size = 34079318, upload-time = "2026-06-19T15:01:26.002Z" }, + { url = "https://files.pythonhosted.org/packages/56/3b/b87da667098bb470fa30c7011b0ba351ee976dd395c78798c66e941665a3/scipy-1.18.0-cp314-cp314t-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:945c1761b93f38d7f99ae81ae80c63e621471608c7eeead563f6df025585cd58", size = 35324320, upload-time = "2026-06-19T15:01:28.881Z" }, + { url = "https://files.pythonhosted.org/packages/f8/a1/c7932f91909759b0267f75fdea34e91309f96b895757534b76a90b6b4344/scipy-1.18.0-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:1a4441f15d620578772a49e5ab48c0ee1f7a0220e387110283062729136b2553", size = 35699541, upload-time = "2026-06-19T15:01:31.968Z" }, + { url = "https://files.pythonhosted.org/packages/f7/86/5185061a1fcc41d18c5dc2463969b3a3964b31d9ac67b2fb05d4c7ff7670/scipy-1.18.0-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:9aac6192fac56bf2ca534389d24623f07b39ff83317d58287285e7fbd622ff76", size = 37472480, upload-time = "2026-06-19T15:01:35.136Z" }, + { url = "https://files.pythonhosted.org/packages/31/8e/f04c68e39919a010d34f2ee1367fd705b0a25a02f609d755f0bfbc0a15fc/scipy-1.18.0-cp314-cp314t-win_amd64.whl", hash = "sha256:e40baea28ae7f5475c779741e2d90b1247c78531207b49c7030e698ff81cee3f", size = 37365390, upload-time = "2026-06-19T15:01:38.091Z" }, + { url = "https://files.pythonhosted.org/packages/d5/19/969dc072906c84dd0a3b05dcf57ea750936087d7873549e408b35cfc3f97/scipy-1.18.0-cp314-cp314t-win_arm64.whl", hash = "sha256:368e0a705903c466aa5f08eefb39e6b1b6b2d659e7352a31fd9e2438365be0f8", size = 25279661, upload-time = "2026-06-19T15:01:40.817Z" }, +] + +[[package]] +name = "send2trash" +version = "2.1.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/c5/f0/184b4b5f8d00f2a92cf96eec8967a3d550b52cf94362dad1100df9e48d57/send2trash-2.1.0.tar.gz", hash = "sha256:1c72b39f09457db3c05ce1d19158c2cbef4c32b8bedd02c155e49282b7ea7459", size = 17255, upload-time = "2026-01-14T06:27:36.056Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/1c/78/504fdd027da3b84ff1aecd9f6957e65f35134534ccc6da8628eb71e76d3f/send2trash-2.1.0-py3-none-any.whl", hash = "sha256:0da2f112e6d6bb22de6aa6daa7e144831a4febf2a87261451c4ad849fe9a873c", size = 17610, upload-time = "2026-01-14T06:27:35.218Z" }, +] + +[[package]] +name = "setproctitle" +version = "1.3.7" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/8d/48/49393a96a2eef1ab418b17475fb92b8fcfad83d099e678751b05472e69de/setproctitle-1.3.7.tar.gz", hash = "sha256:bc2bc917691c1537d5b9bca1468437176809c7e11e5694ca79a9ca12345dcb9e", size = 27002, upload-time = "2025-09-05T12:51:25.278Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/04/cd/1b7ba5cad635510720ce19d7122154df96a2387d2a74217be552887c93e5/setproctitle-1.3.7-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:a600eeb4145fb0ee6c287cb82a2884bd4ec5bbb076921e287039dcc7b7cc6dd0", size = 18085, upload-time = "2025-09-05T12:49:22.183Z" }, + { url = "https://files.pythonhosted.org/packages/8f/1a/b2da0a620490aae355f9d72072ac13e901a9fec809a6a24fc6493a8f3c35/setproctitle-1.3.7-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:97a090fed480471bb175689859532709e28c085087e344bca45cf318034f70c4", size = 13097, upload-time = "2025-09-05T12:49:23.322Z" }, + { url = "https://files.pythonhosted.org/packages/18/2e/bd03ff02432a181c1787f6fc2a678f53b7dacdd5ded69c318fe1619556e8/setproctitle-1.3.7-cp311-cp311-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:1607b963e7b53e24ec8a2cb4e0ab3ae591d7c6bf0a160feef0551da63452b37f", size = 32191, upload-time = "2025-09-05T12:49:24.567Z" }, + { url = "https://files.pythonhosted.org/packages/28/78/1e62fc0937a8549f2220445ed2175daacee9b6764c7963b16148119b016d/setproctitle-1.3.7-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:a20fb1a3974e2dab857870cf874b325b8705605cb7e7e8bcbb915bca896f52a9", size = 33203, upload-time = "2025-09-05T12:49:25.871Z" }, + { url = "https://files.pythonhosted.org/packages/a0/3c/65edc65db3fa3df400cf13b05e9d41a3c77517b4839ce873aa6b4043184f/setproctitle-1.3.7-cp311-cp311-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:f8d961bba676e07d77665204f36cffaa260f526e7b32d07ab3df6a2c1dfb44ba", size = 34963, upload-time = "2025-09-05T12:49:27.044Z" }, + { url = "https://files.pythonhosted.org/packages/a1/32/89157e3de997973e306e44152522385f428e16f92f3cf113461489e1e2ee/setproctitle-1.3.7-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:db0fd964fbd3a9f8999b502f65bd2e20883fdb5b1fae3a424e66db9a793ed307", size = 32398, upload-time = "2025-09-05T12:49:28.909Z" }, + { url = "https://files.pythonhosted.org/packages/4a/18/77a765a339ddf046844cb4513353d8e9dcd8183da9cdba6e078713e6b0b2/setproctitle-1.3.7-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:db116850fcf7cca19492030f8d3b4b6e231278e8fe097a043957d22ce1bdf3ee", size = 33657, upload-time = "2025-09-05T12:49:30.323Z" }, + { url = "https://files.pythonhosted.org/packages/6b/63/f0b6205c64d74d2a24a58644a38ec77bdbaa6afc13747e75973bf8904932/setproctitle-1.3.7-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:316664d8b24a5c91ee244460bdaf7a74a707adaa9e14fbe0dc0a53168bb9aba1", size = 31836, upload-time = "2025-09-05T12:49:32.309Z" }, + { url = "https://files.pythonhosted.org/packages/ba/51/e1277f9ba302f1a250bbd3eedbbee747a244b3cc682eb58fb9733968f6d8/setproctitle-1.3.7-cp311-cp311-win32.whl", hash = "sha256:b74774ca471c86c09b9d5037c8451fff06bb82cd320d26ae5a01c758088c0d5d", size = 12556, upload-time = "2025-09-05T12:49:33.529Z" }, + { url = "https://files.pythonhosted.org/packages/b6/7b/822a23f17e9003dfdee92cd72758441ca2a3680388da813a371b716fb07f/setproctitle-1.3.7-cp311-cp311-win_amd64.whl", hash = "sha256:acb9097213a8dd3410ed9f0dc147840e45ca9797785272928d4be3f0e69e3be4", size = 13243, upload-time = "2025-09-05T12:49:34.553Z" }, + { url = "https://files.pythonhosted.org/packages/fb/f0/2dc88e842077719d7384d86cc47403e5102810492b33680e7dadcee64cd8/setproctitle-1.3.7-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:2dc99aec591ab6126e636b11035a70991bc1ab7a261da428491a40b84376654e", size = 18049, upload-time = "2025-09-05T12:49:36.241Z" }, + { url = "https://files.pythonhosted.org/packages/f0/b4/50940504466689cda65680c9e9a1e518e5750c10490639fa687489ac7013/setproctitle-1.3.7-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:cdd8aa571b7aa39840fdbea620e308a19691ff595c3a10231e9ee830339dd798", size = 13079, upload-time = "2025-09-05T12:49:38.088Z" }, + { url = "https://files.pythonhosted.org/packages/d0/99/71630546b9395b095f4082be41165d1078204d1696c2d9baade3de3202d0/setproctitle-1.3.7-cp312-cp312-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:2906b6c7959cdb75f46159bf0acd8cc9906cf1361c9e1ded0d065fe8f9039629", size = 32932, upload-time = "2025-09-05T12:49:39.271Z" }, + { url = "https://files.pythonhosted.org/packages/50/22/cee06af4ffcfb0e8aba047bd44f5262e644199ae7527ae2c1f672b86495c/setproctitle-1.3.7-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:6915964a6dda07920a1159321dcd6d94fc7fc526f815ca08a8063aeca3c204f1", size = 33736, upload-time = "2025-09-05T12:49:40.565Z" }, + { url = "https://files.pythonhosted.org/packages/5c/00/a5949a8bb06ef5e7df214fc393bb2fb6aedf0479b17214e57750dfdd0f24/setproctitle-1.3.7-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:cff72899861c765bd4021d1ff1c68d60edc129711a2fdba77f9cb69ef726a8b6", size = 35605, upload-time = "2025-09-05T12:49:42.362Z" }, + { url = "https://files.pythonhosted.org/packages/b0/3a/50caca532a9343828e3bf5778c7a84d6c737a249b1796d50dd680290594d/setproctitle-1.3.7-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:b7cb05bd446687ff816a3aaaf831047fc4c364feff7ada94a66024f1367b448c", size = 33143, upload-time = "2025-09-05T12:49:43.515Z" }, + { url = "https://files.pythonhosted.org/packages/ca/14/b843a251296ce55e2e17c017d6b9f11ce0d3d070e9265de4ecad948b913d/setproctitle-1.3.7-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:3a57b9a00de8cae7e2a1f7b9f0c2ac7b69372159e16a7708aa2f38f9e5cc987a", size = 34434, upload-time = "2025-09-05T12:49:45.31Z" }, + { url = "https://files.pythonhosted.org/packages/c8/b7/06145c238c0a6d2c4bc881f8be230bb9f36d2bf51aff7bddcb796d5eed67/setproctitle-1.3.7-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:d8828b356114f6b308b04afe398ed93803d7fca4a955dd3abe84430e28d33739", size = 32795, upload-time = "2025-09-05T12:49:46.419Z" }, + { url = "https://files.pythonhosted.org/packages/ef/dc/ef76a81fac9bf27b84ed23df19c1f67391a753eed6e3c2254ebcb5133f56/setproctitle-1.3.7-cp312-cp312-win32.whl", hash = "sha256:b0304f905efc845829ac2bc791ddebb976db2885f6171f4a3de678d7ee3f7c9f", size = 12552, upload-time = "2025-09-05T12:49:47.635Z" }, + { url = "https://files.pythonhosted.org/packages/e2/5b/a9fe517912cd6e28cf43a212b80cb679ff179a91b623138a99796d7d18a0/setproctitle-1.3.7-cp312-cp312-win_amd64.whl", hash = "sha256:9888ceb4faea3116cf02a920ff00bfbc8cc899743e4b4ac914b03625bdc3c300", size = 13247, upload-time = "2025-09-05T12:49:49.16Z" }, + { url = "https://files.pythonhosted.org/packages/5d/2f/fcedcade3b307a391b6e17c774c6261a7166aed641aee00ed2aad96c63ce/setproctitle-1.3.7-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:c3736b2a423146b5e62230502e47e08e68282ff3b69bcfe08a322bee73407922", size = 18047, upload-time = "2025-09-05T12:49:50.271Z" }, + { url = "https://files.pythonhosted.org/packages/23/ae/afc141ca9631350d0a80b8f287aac79a76f26b6af28fd8bf92dae70dc2c5/setproctitle-1.3.7-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:3384e682b158d569e85a51cfbde2afd1ab57ecf93ea6651fe198d0ba451196ee", size = 13073, upload-time = "2025-09-05T12:49:51.46Z" }, + { url = "https://files.pythonhosted.org/packages/87/ed/0a4f00315bc02510395b95eec3d4aa77c07192ee79f0baae77ea7b9603d8/setproctitle-1.3.7-cp313-cp313-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:0564a936ea687cd24dffcea35903e2a20962aa6ac20e61dd3a207652401492dd", size = 33284, upload-time = "2025-09-05T12:49:52.741Z" }, + { url = "https://files.pythonhosted.org/packages/fc/e4/adf3c4c0a2173cb7920dc9df710bcc67e9bcdbf377e243b7a962dc31a51a/setproctitle-1.3.7-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:a5d1cb3f81531f0eb40e13246b679a1bdb58762b170303463cb06ecc296f26d0", size = 34104, upload-time = "2025-09-05T12:49:54.416Z" }, + { url = "https://files.pythonhosted.org/packages/52/4f/6daf66394152756664257180439d37047aa9a1cfaa5e4f5ed35e93d1dc06/setproctitle-1.3.7-cp313-cp313-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:a7d159e7345f343b44330cbba9194169b8590cb13dae940da47aa36a72aa9929", size = 35982, upload-time = "2025-09-05T12:49:56.295Z" }, + { url = "https://files.pythonhosted.org/packages/1b/62/f2c0595403cf915db031f346b0e3b2c0096050e90e0be658a64f44f4278a/setproctitle-1.3.7-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:0b5074649797fd07c72ca1f6bff0406f4a42e1194faac03ecaab765ce605866f", size = 33150, upload-time = "2025-09-05T12:49:58.025Z" }, + { url = "https://files.pythonhosted.org/packages/a0/29/10dd41cde849fb2f9b626c846b7ea30c99c81a18a5037a45cc4ba33c19a7/setproctitle-1.3.7-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:61e96febced3f61b766115381d97a21a6265a0f29188a791f6df7ed777aef698", size = 34463, upload-time = "2025-09-05T12:49:59.424Z" }, + { url = "https://files.pythonhosted.org/packages/71/3c/cedd8eccfaf15fb73a2c20525b68c9477518917c9437737fa0fda91e378f/setproctitle-1.3.7-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:047138279f9463f06b858e579cc79580fbf7a04554d24e6bddf8fe5dddbe3d4c", size = 32848, upload-time = "2025-09-05T12:50:01.107Z" }, + { url = "https://files.pythonhosted.org/packages/d1/3e/0a0e27d1c9926fecccfd1f91796c244416c70bf6bca448d988638faea81d/setproctitle-1.3.7-cp313-cp313-win32.whl", hash = "sha256:7f47accafac7fe6535ba8ba9efd59df9d84a6214565108d0ebb1199119c9cbbd", size = 12544, upload-time = "2025-09-05T12:50:15.81Z" }, + { url = "https://files.pythonhosted.org/packages/36/1b/6bf4cb7acbbd5c846ede1c3f4d6b4ee52744d402e43546826da065ff2ab7/setproctitle-1.3.7-cp313-cp313-win_amd64.whl", hash = "sha256:fe5ca35aeec6dc50cabab9bf2d12fbc9067eede7ff4fe92b8f5b99d92e21263f", size = 13235, upload-time = "2025-09-05T12:50:16.89Z" }, + { url = "https://files.pythonhosted.org/packages/e6/a4/d588d3497d4714750e3eaf269e9e8985449203d82b16b933c39bd3fc52a1/setproctitle-1.3.7-cp313-cp313t-macosx_10_13_universal2.whl", hash = "sha256:10e92915c4b3086b1586933a36faf4f92f903c5554f3c34102d18c7d3f5378e9", size = 18058, upload-time = "2025-09-05T12:50:02.501Z" }, + { url = "https://files.pythonhosted.org/packages/05/77/7637f7682322a7244e07c373881c7e982567e2cb1dd2f31bd31481e45500/setproctitle-1.3.7-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:de879e9c2eab637f34b1a14c4da1e030c12658cdc69ee1b3e5be81b380163ce5", size = 13072, upload-time = "2025-09-05T12:50:03.601Z" }, + { url = "https://files.pythonhosted.org/packages/52/09/f366eca0973cfbac1470068d1313fa3fe3de4a594683385204ec7f1c4101/setproctitle-1.3.7-cp313-cp313t-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:c18246d88e227a5b16248687514f95642505000442165f4b7db354d39d0e4c29", size = 34490, upload-time = "2025-09-05T12:50:04.948Z" }, + { url = "https://files.pythonhosted.org/packages/71/36/611fc2ed149fdea17c3677e1d0df30d8186eef9562acc248682b91312706/setproctitle-1.3.7-cp313-cp313t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:7081f193dab22df2c36f9fc6d113f3793f83c27891af8fe30c64d89d9a37e152", size = 35267, upload-time = "2025-09-05T12:50:06.015Z" }, + { url = "https://files.pythonhosted.org/packages/88/a4/64e77d0671446bd5a5554387b69e1efd915274686844bea733714c828813/setproctitle-1.3.7-cp313-cp313t-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:9cc9b901ce129350637426a89cfd650066a4adc6899e47822e2478a74023ff7c", size = 37376, upload-time = "2025-09-05T12:50:07.484Z" }, + { url = "https://files.pythonhosted.org/packages/89/bc/ad9c664fe524fb4a4b2d3663661a5c63453ce851736171e454fa2cdec35c/setproctitle-1.3.7-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:80e177eff2d1ec172188d0d7fd9694f8e43d3aab76a6f5f929bee7bf7894e98b", size = 33963, upload-time = "2025-09-05T12:50:09.056Z" }, + { url = "https://files.pythonhosted.org/packages/ab/01/a36de7caf2d90c4c28678da1466b47495cbbad43badb4e982d8db8167ed4/setproctitle-1.3.7-cp313-cp313t-musllinux_1_2_ppc64le.whl", hash = "sha256:23e520776c445478a67ee71b2a3c1ffdafbe1f9f677239e03d7e2cc635954e18", size = 35550, upload-time = "2025-09-05T12:50:10.791Z" }, + { url = "https://files.pythonhosted.org/packages/dd/68/17e8aea0ed5ebc17fbf03ed2562bfab277c280e3625850c38d92a7b5fcd9/setproctitle-1.3.7-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:5fa1953126a3b9bd47049d58c51b9dac72e78ed120459bd3aceb1bacee72357c", size = 33727, upload-time = "2025-09-05T12:50:12.032Z" }, + { url = "https://files.pythonhosted.org/packages/b2/33/90a3bf43fe3a2242b4618aa799c672270250b5780667898f30663fd94993/setproctitle-1.3.7-cp313-cp313t-win32.whl", hash = "sha256:4a5e212bf438a4dbeece763f4962ad472c6008ff6702e230b4f16a037e2f6f29", size = 12549, upload-time = "2025-09-05T12:50:13.074Z" }, + { url = "https://files.pythonhosted.org/packages/0b/0e/50d1f07f3032e1f23d814ad6462bc0a138f369967c72494286b8a5228e40/setproctitle-1.3.7-cp313-cp313t-win_amd64.whl", hash = "sha256:cf2727b733e90b4f874bac53e3092aa0413fe1ea6d4f153f01207e6ce65034d9", size = 13243, upload-time = "2025-09-05T12:50:14.146Z" }, + { url = "https://files.pythonhosted.org/packages/89/c7/43ac3a98414f91d1b86a276bc2f799ad0b4b010e08497a95750d5bc42803/setproctitle-1.3.7-cp314-cp314-macosx_10_13_universal2.whl", hash = "sha256:80c36c6a87ff72eabf621d0c79b66f3bdd0ecc79e873c1e9f0651ee8bf215c63", size = 18052, upload-time = "2025-09-05T12:50:17.928Z" }, + { url = "https://files.pythonhosted.org/packages/cd/2c/dc258600a25e1a1f04948073826bebc55e18dbd99dc65a576277a82146fa/setproctitle-1.3.7-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:b53602371a52b91c80aaf578b5ada29d311d12b8a69c0c17fbc35b76a1fd4f2e", size = 13071, upload-time = "2025-09-05T12:50:19.061Z" }, + { url = "https://files.pythonhosted.org/packages/ab/26/8e3bb082992f19823d831f3d62a89409deb6092e72fc6940962983ffc94f/setproctitle-1.3.7-cp314-cp314-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:fcb966a6c57cf07cc9448321a08f3be6b11b7635be502669bc1d8745115d7e7f", size = 33180, upload-time = "2025-09-05T12:50:20.395Z" }, + { url = "https://files.pythonhosted.org/packages/f1/af/ae692a20276d1159dd0cf77b0bcf92cbb954b965655eb4a69672099bb214/setproctitle-1.3.7-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:46178672599b940368d769474fe13ecef1b587d58bb438ea72b9987f74c56ea5", size = 34043, upload-time = "2025-09-05T12:50:22.454Z" }, + { url = "https://files.pythonhosted.org/packages/34/b2/6a092076324dd4dac1a6d38482bedebbff5cf34ef29f58585ec76e47bc9d/setproctitle-1.3.7-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:7f9e9e3ff135cbcc3edd2f4cf29b139f4aca040d931573102742db70ff428c17", size = 35892, upload-time = "2025-09-05T12:50:23.937Z" }, + { url = "https://files.pythonhosted.org/packages/1c/1a/8836b9f28cee32859ac36c3df85aa03e1ff4598d23ea17ca2e96b5845a8f/setproctitle-1.3.7-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:14c7eba8d90c93b0e79c01f0bd92a37b61983c27d6d7d5a3b5defd599113d60e", size = 32898, upload-time = "2025-09-05T12:50:25.617Z" }, + { url = "https://files.pythonhosted.org/packages/ef/22/8fabdc24baf42defb599714799d8445fe3ae987ec425a26ec8e80ea38f8e/setproctitle-1.3.7-cp314-cp314-musllinux_1_2_ppc64le.whl", hash = "sha256:9e64e98077fb30b6cf98073d6c439cd91deb8ebbf8fc62d9dbf52bd38b0c6ac0", size = 34308, upload-time = "2025-09-05T12:50:26.827Z" }, + { url = "https://files.pythonhosted.org/packages/15/1b/b9bee9de6c8cdcb3b3a6cb0b3e773afdb86bbbc1665a3bfa424a4294fda2/setproctitle-1.3.7-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:b91387cc0f02a00ac95dcd93f066242d3cca10ff9e6153de7ee07069c6f0f7c8", size = 32536, upload-time = "2025-09-05T12:50:28.5Z" }, + { url = "https://files.pythonhosted.org/packages/37/0c/75e5f2685a5e3eda0b39a8b158d6d8895d6daf3ba86dec9e3ba021510272/setproctitle-1.3.7-cp314-cp314-win32.whl", hash = "sha256:52b054a61c99d1b72fba58b7f5486e04b20fefc6961cd76722b424c187f362ed", size = 12731, upload-time = "2025-09-05T12:50:43.955Z" }, + { url = "https://files.pythonhosted.org/packages/d2/ae/acddbce90d1361e1786e1fb421bc25baeb0c22ef244ee5d0176511769ec8/setproctitle-1.3.7-cp314-cp314-win_amd64.whl", hash = "sha256:5818e4080ac04da1851b3ec71e8a0f64e3748bf9849045180566d8b736702416", size = 13464, upload-time = "2025-09-05T12:50:45.057Z" }, + { url = "https://files.pythonhosted.org/packages/01/6d/20886c8ff2e6d85e3cabadab6aab9bb90acaf1a5cfcb04d633f8d61b2626/setproctitle-1.3.7-cp314-cp314t-macosx_10_13_universal2.whl", hash = "sha256:6fc87caf9e323ac426910306c3e5d3205cd9f8dcac06d233fcafe9337f0928a3", size = 18062, upload-time = "2025-09-05T12:50:29.78Z" }, + { url = "https://files.pythonhosted.org/packages/9a/60/26dfc5f198715f1343b95c2f7a1c16ae9ffa45bd89ffd45a60ed258d24ea/setproctitle-1.3.7-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:6134c63853d87a4897ba7d5cc0e16abfa687f6c66fc09f262bb70d67718f2309", size = 13075, upload-time = "2025-09-05T12:50:31.604Z" }, + { url = "https://files.pythonhosted.org/packages/21/9c/980b01f50d51345dd513047e3ba9e96468134b9181319093e61db1c47188/setproctitle-1.3.7-cp314-cp314t-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:1403d2abfd32790b6369916e2313dffbe87d6b11dca5bbd898981bcde48e7a2b", size = 34744, upload-time = "2025-09-05T12:50:32.777Z" }, + { url = "https://files.pythonhosted.org/packages/86/b4/82cd0c86e6d1c4538e1a7eb908c7517721513b801dff4ba3f98ef816a240/setproctitle-1.3.7-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:e7c5bfe4228ea22373e3025965d1a4116097e555ee3436044f5c954a5e63ac45", size = 35589, upload-time = "2025-09-05T12:50:34.13Z" }, + { url = "https://files.pythonhosted.org/packages/8a/4f/9f6b2a7417fd45673037554021c888b31247f7594ff4bd2239918c5cd6d0/setproctitle-1.3.7-cp314-cp314t-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:585edf25e54e21a94ccb0fe81ad32b9196b69ebc4fc25f81da81fb8a50cca9e4", size = 37698, upload-time = "2025-09-05T12:50:35.524Z" }, + { url = "https://files.pythonhosted.org/packages/20/92/927b7d4744aac214d149c892cb5fa6dc6f49cfa040cb2b0a844acd63dcaf/setproctitle-1.3.7-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:96c38cdeef9036eb2724c2210e8d0b93224e709af68c435d46a4733a3675fee1", size = 34201, upload-time = "2025-09-05T12:50:36.697Z" }, + { url = "https://files.pythonhosted.org/packages/0a/0c/fd4901db5ba4b9d9013e62f61d9c18d52290497f956745cd3e91b0d80f90/setproctitle-1.3.7-cp314-cp314t-musllinux_1_2_ppc64le.whl", hash = "sha256:45e3ef48350abb49cf937d0a8ba15e42cee1e5ae13ca41a77c66d1abc27a5070", size = 35801, upload-time = "2025-09-05T12:50:38.314Z" }, + { url = "https://files.pythonhosted.org/packages/e7/e3/54b496ac724e60e61cc3447f02690105901ca6d90da0377dffe49ff99fc7/setproctitle-1.3.7-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:1fae595d032b30dab4d659bece20debd202229fce12b55abab978b7f30783d73", size = 33958, upload-time = "2025-09-05T12:50:39.841Z" }, + { url = "https://files.pythonhosted.org/packages/ea/a8/c84bb045ebf8c6fdc7f7532319e86f8380d14bbd3084e6348df56bdfe6fd/setproctitle-1.3.7-cp314-cp314t-win32.whl", hash = "sha256:02432f26f5d1329ab22279ff863c83589894977063f59e6c4b4845804a08f8c2", size = 12745, upload-time = "2025-09-05T12:50:41.377Z" }, + { url = "https://files.pythonhosted.org/packages/08/b6/3a5a4f9952972791a9114ac01dfc123f0df79903577a3e0a7a404a695586/setproctitle-1.3.7-cp314-cp314t-win_amd64.whl", hash = "sha256:cbc388e3d86da1f766d8fc2e12682e446064c01cea9f88a88647cfe7c011de6a", size = 13469, upload-time = "2025-09-05T12:50:42.67Z" }, + { url = "https://files.pythonhosted.org/packages/c3/5b/5e1c117ac84e3cefcf8d7a7f6b2461795a87e20869da065a5c087149060b/setproctitle-1.3.7-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:b1cac6a4b0252b8811d60b6d8d0f157c0fdfed379ac89c25a914e6346cf355a1", size = 12587, upload-time = "2025-09-05T12:51:21.195Z" }, + { url = "https://files.pythonhosted.org/packages/73/02/b9eadc226195dcfa90eed37afe56b5dd6fa2f0e5220ab8b7867b8862b926/setproctitle-1.3.7-pp311-pypy311_pp73-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:f1704c9e041f2b1dc38f5be4552e141e1432fba3dd52c72eeffd5bc2db04dc65", size = 14286, upload-time = "2025-09-05T12:51:22.61Z" }, + { url = "https://files.pythonhosted.org/packages/28/26/1be1d2a53c2a91ec48fa2ff4a409b395f836798adf194d99de9c059419ea/setproctitle-1.3.7-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:b08b61976ffa548bd5349ce54404bf6b2d51bd74d4f1b241ed1b0f25bce09c3a", size = 13282, upload-time = "2025-09-05T12:51:24.094Z" }, +] + +[[package]] +name = "six" +version = "1.17.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/94/e7/b2c673351809dca68a0e064b6af791aa332cf192da575fd474ed7d6f16a2/six-1.17.0.tar.gz", hash = "sha256:ff70335d468e7eb6ec65b95b99d3a2836546063f63acc5171de367e834932a81", size = 34031, upload-time = "2024-12-04T17:35:28.174Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/b7/ce/149a00dd41f10bc29e5921b496af8b574d8413afcd5e30dfa0ed46c2cc5e/six-1.17.0-py2.py3-none-any.whl", hash = "sha256:4721f391ed90541fddacab5acf947aa0d3dc7d27b2e1e8eda2be8970586c3274", size = 11050, upload-time = "2024-12-04T17:35:26.475Z" }, +] + +[[package]] +name = "soupsieve" +version = "2.8.4" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/47/2c/0a5f6f8ee0d5589e48c7640213ed5175d52cf540a06725b628cc1a45d6ce/soupsieve-2.8.4.tar.gz", hash = "sha256:e121fd02e975c695e4e9e8774a5ee35d74714b59307868dcc5319ad2d9e3328e", size = 121110, upload-time = "2026-05-24T13:55:57.154Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/5e/f5/0c41cb68dcae6b7de4fac4188a3a9589e21fb31df21ea3a2e888db95e6c9/soupsieve-2.8.4-py3-none-any.whl", hash = "sha256:e7e6b0769c8f51ed59acab6e994b00621096cfb1c640a7509295987388fbaf65", size = 37304, upload-time = "2026-05-24T13:55:55.406Z" }, +] + +[[package]] +name = "spglib" +version = "2.7.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "numpy", version = "2.4.6", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version < '3.12'" }, + { name = "numpy", version = "2.5.0", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version >= '3.12'" }, + { name = "typing-extensions", marker = "python_full_version < '3.13'" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/a9/06/7964acb4c444191376bd87f91579475fbe7623ca943cce40cee8fb7f2c36/spglib-2.7.0.tar.gz", hash = "sha256:c40907a42c9dc45572f46740bf95412f84fb0eda30267e31665d104a4bde6627", size = 2366134, upload-time = "2025-12-29T09:48:26.42Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/44/a8/d841ae7743c58227af277f7f16aa844376fa11c426090d6ae35e7e93af76/spglib-2.7.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:3cf0ff80c01d8631ef4b9f1b78da79ff2044834e6e2d870f7f20c8579c921136", size = 910793, upload-time = "2025-12-29T09:47:32.063Z" }, + { url = "https://files.pythonhosted.org/packages/e8/02/11baf94cf682cdaafa046b72d4b2adcf944e19e2b2741454e329dedb2fc2/spglib-2.7.0-cp311-cp311-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:a7b29d2cfca6ac53e927686ca0b91257126e47f6abfa26451723a5cd40070352", size = 944977, upload-time = "2025-12-29T09:47:33.638Z" }, + { url = "https://files.pythonhosted.org/packages/ce/fa/6d1bc8f8cb08945ca8c37c95b42bf336b6b9a8a737eced1ce64f0cebe9ce/spglib-2.7.0-cp311-cp311-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:f892ecce2dd1bc636b14a4e5bc13aabb73b008bd37a4d23636882c8971c432a0", size = 960531, upload-time = "2025-12-29T09:47:36.932Z" }, + { url = "https://files.pythonhosted.org/packages/b0/79/2fd5e33b431cd0afcdd441bd10704c11cdf74c09b721249297284e5bf0b2/spglib-2.7.0-cp311-cp311-win_amd64.whl", hash = "sha256:468879702577124dcde0607a75396576e256f1cfa2d8fe48da4a928fbb27abc6", size = 669827, upload-time = "2025-12-29T09:47:38.47Z" }, + { url = "https://files.pythonhosted.org/packages/f7/e9/4e07c9c1bda40df54e09bd686eae0dc13d46e76a5ef4d43582971a86eb32/spglib-2.7.0-cp311-cp311-win_arm64.whl", hash = "sha256:ceb6730a2324d0c83579c803f3782e28bd41e79bbfe0c3dfdbf30e3d3a6320e5", size = 649076, upload-time = "2025-12-29T09:47:40.367Z" }, + { url = "https://files.pythonhosted.org/packages/68/0e/36720beeca8452530e50ab8a16b91e8721e34c0f97fd25e9c4ddd8b9324b/spglib-2.7.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:ef70132e23dfcc7ab6813742e0edab3f9906e61cd11c857f014bd5610a8bc88c", size = 911009, upload-time = "2025-12-29T09:47:42.238Z" }, + { url = "https://files.pythonhosted.org/packages/47/a0/24df91cbde6a3237d54cfb21602cc8ebb4102cd4e3ec9497c66135c2b190/spglib-2.7.0-cp312-cp312-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:59f134e74f7f488de4bf5579ee6a35af25cb2c478c138de664fea1e14f3efbaf", size = 946821, upload-time = "2025-12-29T09:47:44.548Z" }, + { url = "https://files.pythonhosted.org/packages/67/4c/75ac6f7ade28019b216c7333322f2886e1c0105202cd74506f530664bf26/spglib-2.7.0-cp312-cp312-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:6913906fd9108e7bb2ce06a810513a95a82d801530f10230979bf3427bb7e771", size = 962531, upload-time = "2025-12-29T09:47:46.3Z" }, + { url = "https://files.pythonhosted.org/packages/a7/5f/4e283139af178bb445eedff281a90e66ceff1b814ace70a9d90a2197acc3/spglib-2.7.0-cp312-cp312-win_amd64.whl", hash = "sha256:d5729ff0040baae764c17249302cd99f0eb4e73449612a8c69d3e60a215f062e", size = 671111, upload-time = "2025-12-29T09:47:48.14Z" }, + { url = "https://files.pythonhosted.org/packages/a5/b9/20e52d46e33bf69ceba4fc86602f006c06ce4ab10e3c930f4722fb270b02/spglib-2.7.0-cp312-cp312-win_arm64.whl", hash = "sha256:54f4b6e789475384c62e759c618172707f261c0eae8017949fe4994b6b8cc779", size = 646679, upload-time = "2025-12-29T09:47:49.376Z" }, + { url = "https://files.pythonhosted.org/packages/2c/1c/a0fe8c0523a0e7d608f49f09895e5c599329265c9bfacd269a21458b7564/spglib-2.7.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:ab061ea6a3c3c25a1d0018b09c333c0458792036d3f45d892bd52793ed1f1bda", size = 911085, upload-time = "2025-12-29T09:47:51.606Z" }, + { url = "https://files.pythonhosted.org/packages/2a/34/cb3c522c4aaf6ce319b37bbec71d373b9e2cf0bcfe7d42c365cd6c113b4b/spglib-2.7.0-cp313-cp313-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:be28673e90f7a6c7770f73c57e529d2bdbb373d06d26ee5e90991b548e9238aa", size = 946857, upload-time = "2025-12-29T09:47:53.059Z" }, + { url = "https://files.pythonhosted.org/packages/9e/64/3b1213f2f655ff143ed142292b47ec3f1f9bda8641e659a7e33c4cf0e8a9/spglib-2.7.0-cp313-cp313-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:f627a4ed6f2396ed6e3e8eaf33a53ad143c8ffb8756a84a640f4569ac5ffa2a7", size = 962470, upload-time = "2025-12-29T09:47:54.878Z" }, + { url = "https://files.pythonhosted.org/packages/5c/3a/c51883ce739a00f9f60196f3dcb4ed91b690299a4ec64defd8ec5b2c5899/spglib-2.7.0-cp313-cp313-win_amd64.whl", hash = "sha256:c76411bc1b96cd87c8733994747c7692512b583bb4ef89a65463ff4255221c11", size = 671073, upload-time = "2025-12-29T09:47:56.887Z" }, + { url = "https://files.pythonhosted.org/packages/35/78/3f9ec6ae93a48527dce0eceb6eeab74e6ad1fb2977adb5cbdfc03d43193c/spglib-2.7.0-cp313-cp313-win_arm64.whl", hash = "sha256:0d8ecf030d13d67c4cc272423e5652b74eda57f86a0b118e007f6d12974cc256", size = 646711, upload-time = "2025-12-29T09:47:58.697Z" }, + { url = "https://files.pythonhosted.org/packages/1b/47/86e3c15c3e1c252bde40a794eea4742c142f23fc5f9c3d7551f083c1fa20/spglib-2.7.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:95e3dd7ef992ff8a88f6ef2e5909aaa60ecb479004cc1f73c1e6285d54227960", size = 911712, upload-time = "2025-12-29T09:48:01.14Z" }, + { url = "https://files.pythonhosted.org/packages/05/61/ab2447bb47fa69934adc2fc2d13f771dedd3b2fd3171c95307446c948f01/spglib-2.7.0-cp314-cp314-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:97e0fcea2db3915bd973fdd2cc0a757b1f99bda71ce815da333d75ad1ffc3eb1", size = 947528, upload-time = "2025-12-29T09:48:03.258Z" }, + { url = "https://files.pythonhosted.org/packages/9d/69/898d9e005131b0b1c7e5dce2b79f36aeb20ec4d3a88cca596b522a0fa4df/spglib-2.7.0-cp314-cp314-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:39b978c08ef2ebc0eaba833c488fc4c0f9b1fc0f50d4a8584f176741eea69376", size = 962474, upload-time = "2025-12-29T09:48:05.617Z" }, + { url = "https://files.pythonhosted.org/packages/c8/56/7b25ee5348722dc93ca245ed950f1a89f8a944906140629055f394c072a4/spglib-2.7.0-cp314-cp314-win_amd64.whl", hash = "sha256:5f334b4b66c8aafd583fafab5b15a56e27efdd2dc6cb1064dfcd0fe59ae130f4", size = 679679, upload-time = "2025-12-29T09:48:15.393Z" }, + { url = "https://files.pythonhosted.org/packages/20/37/eda9a34f25b13e47298fa1b94cc4dfd8b0fcfc46c7d63ea046aa1bf91fe7/spglib-2.7.0-cp314-cp314-win_arm64.whl", hash = "sha256:b032842fc223de46d2ef7d220459e1a61ed90329ac2e72818c605f1fc87451b8", size = 656403, upload-time = "2025-12-29T09:48:17.027Z" }, + { url = "https://files.pythonhosted.org/packages/39/af/1c8d0f98d07969b7fa7323d522732124d88caf4ee3b680ef59120bd7b229/spglib-2.7.0-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:b7e29c796cfdadcc3857aef330acc19b9bc50c83e9911fb23b28390e7c80bae5", size = 920791, upload-time = "2025-12-29T09:48:07.085Z" }, + { url = "https://files.pythonhosted.org/packages/b5/c6/89a3f31f831efc4108a19f110873559990b72186745cd3e151de28b256cc/spglib-2.7.0-cp314-cp314t-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:9b6ca88bb6e604bc8f63efe87b3b2470c2e25f56988b775bd332cefa8866f5c5", size = 946881, upload-time = "2025-12-29T09:48:09.154Z" }, + { url = "https://files.pythonhosted.org/packages/7e/e9/1ca63db2cebd381bd6b27ae309f25d270e70928359a6f0360db09b77894e/spglib-2.7.0-cp314-cp314t-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:50629939a9cd6fa3df5a12f6f025ceb3c78534284f875371574c360e4ccaf5e1", size = 963803, upload-time = "2025-12-29T09:48:12.478Z" }, + { url = "https://files.pythonhosted.org/packages/28/97/459b37c3802633f77c883883c75f5d4429b601ae8d930410b999c4e1dafb/spglib-2.7.0-cp314-cp314t-win_amd64.whl", hash = "sha256:cb77daaf9dd5d48d523a888f37cebd47fa63ff28dfcf1aac2b031b914f9ed55a", size = 696536, upload-time = "2025-12-29T09:48:13.885Z" }, +] + +[[package]] +name = "stack-data" +version = "0.6.3" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "asttokens" }, + { name = "executing" }, + { name = "pure-eval" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/28/e3/55dcc2cfbc3ca9c29519eb6884dd1415ecb53b0e934862d3559ddcb7e20b/stack_data-0.6.3.tar.gz", hash = "sha256:836a778de4fec4dcd1dcd89ed8abff8a221f58308462e1c4aa2a3cf30148f0b9", size = 44707, upload-time = "2023-09-30T13:58:05.479Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/f1/7b/ce1eafaf1a76852e2ec9b22edecf1daa58175c090266e9f6c64afcd81d91/stack_data-0.6.3-py3-none-any.whl", hash = "sha256:d5558e0c25a4cb0853cddad3d77da9891a08cb85dd9f9f91b9f8cd66e511e695", size = 24521, upload-time = "2023-09-30T13:58:03.53Z" }, +] + +[[package]] +name = "supervisor" +version = "4.3.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/a9/b5/37e7a3706de436a8a2d75334711dad1afb4ddffab09f25e31d89e467542f/supervisor-4.3.0.tar.gz", hash = "sha256:4a2bf149adf42997e1bb44b70c43b613275ec9852c3edacca86a9166b27e945e", size = 468912, upload-time = "2025-08-23T18:25:02.418Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/0e/65/5e726c372da8a5e35022a94388b12252710aad0c2351699c3d76ae8dba78/supervisor-4.3.0-py2.py3-none-any.whl", hash = "sha256:0bcb763fddafba410f35cbde226aa7f8514b9fb82eb05a0c85f6588d1c13f8db", size = 320736, upload-time = "2025-08-23T18:25:00.767Z" }, +] + +[[package]] +name = "sympy" +version = "1.14.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "mpmath" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/83/d3/803453b36afefb7c2bb238361cd4ae6125a569b4db67cd9e79846ba2d68c/sympy-1.14.0.tar.gz", hash = "sha256:d3d3fe8df1e5a0b42f0e7bdf50541697dbe7d23746e894990c030e2b05e72517", size = 7793921, upload-time = "2025-04-27T18:05:01.611Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/a2/09/77d55d46fd61b4a135c444fc97158ef34a095e5681d0a6c10b75bf356191/sympy-1.14.0-py3-none-any.whl", hash = "sha256:e091cc3e99d2141a0ba2847328f5479b05d94a6635cb96148ccb3f34671bd8f5", size = 6299353, upload-time = "2025-04-27T18:04:59.103Z" }, +] + +[[package]] +name = "tabulate" +version = "0.10.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/46/58/8c37dea7bbf769b20d58e7ace7e5edfe65b849442b00ffcdd56be88697c6/tabulate-0.10.0.tar.gz", hash = "sha256:e2cfde8f79420f6deeffdeda9aaec3b6bc5abce947655d17ac662b126e48a60d", size = 91754, upload-time = "2026-03-04T18:55:34.402Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/99/55/db07de81b5c630da5cbf5c7df646580ca26dfaefa593667fc6f2fe016d2e/tabulate-0.10.0-py3-none-any.whl", hash = "sha256:f0b0622e567335c8fabaaa659f1b33bcb6ddfe2e496071b743aa113f8774f2d3", size = 39814, upload-time = "2026-03-04T18:55:31.284Z" }, +] + +[[package]] +name = "terminado" +version = "0.18.1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "ptyprocess", marker = "os_name != 'nt'" }, + { name = "pywinpty", marker = "os_name == 'nt'" }, + { name = "tornado" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/8a/11/965c6fd8e5cc254f1fe142d547387da17a8ebfd75a3455f637c663fb38a0/terminado-0.18.1.tar.gz", hash = "sha256:de09f2c4b85de4765f7714688fff57d3e75bad1f909b589fde880460c753fd2e", size = 32701, upload-time = "2024-03-12T14:34:39.026Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/6a/9e/2064975477fdc887e47ad42157e214526dcad8f317a948dee17e1659a62f/terminado-0.18.1-py3-none-any.whl", hash = "sha256:a4468e1b37bb318f8a86514f65814e1afc977cf29b3992a4500d9dd305dcceb0", size = 14154, upload-time = "2024-03-12T14:34:36.569Z" }, +] + +[[package]] +name = "tinycss2" +version = "1.5.1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "webencodings" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/a3/ae/2ca4913e5c0f09781d75482874c3a95db9105462a92ddd303c7d285d3df2/tinycss2-1.5.1.tar.gz", hash = "sha256:d339d2b616ba90ccce58da8495a78f46e55d4d25f9fd71dfd526f07e7d53f957", size = 88195, upload-time = "2025-11-23T10:29:10.082Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/60/45/c7b5c3168458db837e8ceab06dc77824e18202679d0463f0e8f002143a97/tinycss2-1.5.1-py3-none-any.whl", hash = "sha256:3415ba0f5839c062696996998176c4a3751d18b7edaaeeb658c9ce21ec150661", size = 28404, upload-time = "2025-11-23T10:29:08.676Z" }, +] + +[[package]] +name = "tomli" +version = "2.4.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/22/de/48c59722572767841493b26183a0d1cc411d54fd759c5607c4590b6563a6/tomli-2.4.1.tar.gz", hash = "sha256:7c7e1a961a0b2f2472c1ac5b69affa0ae1132c39adcb67aba98568702b9cc23f", size = 17543, upload-time = "2026-03-25T20:22:03.828Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/f4/11/db3d5885d8528263d8adc260bb2d28ebf1270b96e98f0e0268d32b8d9900/tomli-2.4.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:f8f0fc26ec2cc2b965b7a3b87cd19c5c6b8c5e5f436b984e85f486d652285c30", size = 154704, upload-time = "2026-03-25T20:21:10.473Z" }, + { url = "https://files.pythonhosted.org/packages/6d/f7/675db52c7e46064a9aa928885a9b20f4124ecb9bc2e1ce74c9106648d202/tomli-2.4.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:4ab97e64ccda8756376892c53a72bd1f964e519c77236368527f758fbc36a53a", size = 149454, upload-time = "2026-03-25T20:21:12.036Z" }, + { url = "https://files.pythonhosted.org/packages/61/71/81c50943cf953efa35bce7646caab3cf457a7d8c030b27cfb40d7235f9ee/tomli-2.4.1-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:96481a5786729fd470164b47cdb3e0e58062a496f455ee41b4403be77cb5a076", size = 237561, upload-time = "2026-03-25T20:21:13.098Z" }, + { url = "https://files.pythonhosted.org/packages/48/c1/f41d9cb618acccca7df82aaf682f9b49013c9397212cb9f53219e3abac37/tomli-2.4.1-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:5a881ab208c0baf688221f8cecc5401bd291d67e38a1ac884d6736cbcd8247e9", size = 243824, upload-time = "2026-03-25T20:21:14.569Z" }, + { url = "https://files.pythonhosted.org/packages/22/e4/5a816ecdd1f8ca51fb756ef684b90f2780afc52fc67f987e3c61d800a46d/tomli-2.4.1-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:47149d5bd38761ac8be13a84864bf0b7b70bc051806bc3669ab1cbc56216b23c", size = 242227, upload-time = "2026-03-25T20:21:15.712Z" }, + { url = "https://files.pythonhosted.org/packages/6b/49/2b2a0ef529aa6eec245d25f0c703e020a73955ad7edf73e7f54ddc608aa5/tomli-2.4.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:ec9bfaf3ad2df51ace80688143a6a4ebc09a248f6ff781a9945e51937008fcbc", size = 247859, upload-time = "2026-03-25T20:21:17.001Z" }, + { url = "https://files.pythonhosted.org/packages/83/bd/6c1a630eaca337e1e78c5903104f831bda934c426f9231429396ce3c3467/tomli-2.4.1-cp311-cp311-win32.whl", hash = "sha256:ff2983983d34813c1aeb0fa89091e76c3a22889ee83ab27c5eeb45100560c049", size = 97204, upload-time = "2026-03-25T20:21:18.079Z" }, + { url = "https://files.pythonhosted.org/packages/42/59/71461df1a885647e10b6bb7802d0b8e66480c61f3f43079e0dcd315b3954/tomli-2.4.1-cp311-cp311-win_amd64.whl", hash = "sha256:5ee18d9ebdb417e384b58fe414e8d6af9f4e7a0ae761519fb50f721de398dd4e", size = 108084, upload-time = "2026-03-25T20:21:18.978Z" }, + { url = "https://files.pythonhosted.org/packages/b8/83/dceca96142499c069475b790e7913b1044c1a4337e700751f48ed723f883/tomli-2.4.1-cp311-cp311-win_arm64.whl", hash = "sha256:c2541745709bad0264b7d4705ad453b76ccd191e64aa6f0fc66b69a293a45ece", size = 95285, upload-time = "2026-03-25T20:21:20.309Z" }, + { url = "https://files.pythonhosted.org/packages/c1/ba/42f134a3fe2b370f555f44b1d72feebb94debcab01676bf918d0cb70e9aa/tomli-2.4.1-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:c742f741d58a28940ce01d58f0ab2ea3ced8b12402f162f4d534dfe18ba1cd6a", size = 155924, upload-time = "2026-03-25T20:21:21.626Z" }, + { url = "https://files.pythonhosted.org/packages/dc/c7/62d7a17c26487ade21c5422b646110f2162f1fcc95980ef7f63e73c68f14/tomli-2.4.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:7f86fd587c4ed9dd76f318225e7d9b29cfc5a9d43de44e5754db8d1128487085", size = 150018, upload-time = "2026-03-25T20:21:23.002Z" }, + { url = "https://files.pythonhosted.org/packages/5c/05/79d13d7c15f13bdef410bdd49a6485b1c37d28968314eabee452c22a7fda/tomli-2.4.1-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:ff18e6a727ee0ab0388507b89d1bc6a22b138d1e2fa56d1ad494586d61d2eae9", size = 244948, upload-time = "2026-03-25T20:21:24.04Z" }, + { url = "https://files.pythonhosted.org/packages/10/90/d62ce007a1c80d0b2c93e02cab211224756240884751b94ca72df8a875ca/tomli-2.4.1-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:136443dbd7e1dee43c68ac2694fde36b2849865fa258d39bf822c10e8068eac5", size = 253341, upload-time = "2026-03-25T20:21:25.177Z" }, + { url = "https://files.pythonhosted.org/packages/1a/7e/caf6496d60152ad4ed09282c1885cca4eea150bfd007da84aea07bcc0a3e/tomli-2.4.1-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:5e262d41726bc187e69af7825504c933b6794dc3fbd5945e41a79bb14c31f585", size = 248159, upload-time = "2026-03-25T20:21:26.364Z" }, + { url = "https://files.pythonhosted.org/packages/99/e7/c6f69c3120de34bbd882c6fba7975f3d7a746e9218e56ab46a1bc4b42552/tomli-2.4.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:5cb41aa38891e073ee49d55fbc7839cfdb2bc0e600add13874d048c94aadddd1", size = 253290, upload-time = "2026-03-25T20:21:27.46Z" }, + { url = "https://files.pythonhosted.org/packages/d6/2f/4a3c322f22c5c66c4b836ec58211641a4067364f5dcdd7b974b4c5da300c/tomli-2.4.1-cp312-cp312-win32.whl", hash = "sha256:da25dc3563bff5965356133435b757a795a17b17d01dbc0f42fb32447ddfd917", size = 98141, upload-time = "2026-03-25T20:21:28.492Z" }, + { url = "https://files.pythonhosted.org/packages/24/22/4daacd05391b92c55759d55eaee21e1dfaea86ce5c571f10083360adf534/tomli-2.4.1-cp312-cp312-win_amd64.whl", hash = "sha256:52c8ef851d9a240f11a88c003eacb03c31fc1c9c4ec64a99a0f922b93874fda9", size = 108847, upload-time = "2026-03-25T20:21:29.386Z" }, + { url = "https://files.pythonhosted.org/packages/68/fd/70e768887666ddd9e9f5d85129e84910f2db2796f9096aa02b721a53098d/tomli-2.4.1-cp312-cp312-win_arm64.whl", hash = "sha256:f758f1b9299d059cc3f6546ae2af89670cb1c4d48ea29c3cacc4fe7de3058257", size = 95088, upload-time = "2026-03-25T20:21:30.677Z" }, + { url = "https://files.pythonhosted.org/packages/07/06/b823a7e818c756d9a7123ba2cda7d07bc2dd32835648d1a7b7b7a05d848d/tomli-2.4.1-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:36d2bd2ad5fb9eaddba5226aa02c8ec3fa4f192631e347b3ed28186d43be6b54", size = 155866, upload-time = "2026-03-25T20:21:31.65Z" }, + { url = "https://files.pythonhosted.org/packages/14/6f/12645cf7f08e1a20c7eb8c297c6f11d31c1b50f316a7e7e1e1de6e2e7b7e/tomli-2.4.1-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:eb0dc4e38e6a1fd579e5d50369aa2e10acfc9cace504579b2faabb478e76941a", size = 149887, upload-time = "2026-03-25T20:21:33.028Z" }, + { url = "https://files.pythonhosted.org/packages/5c/e0/90637574e5e7212c09099c67ad349b04ec4d6020324539297b634a0192b0/tomli-2.4.1-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:c7f2c7f2b9ca6bdeef8f0fa897f8e05085923eb091721675170254cbc5b02897", size = 243704, upload-time = "2026-03-25T20:21:34.51Z" }, + { url = "https://files.pythonhosted.org/packages/10/8f/d3ddb16c5a4befdf31a23307f72828686ab2096f068eaf56631e136c1fdd/tomli-2.4.1-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:f3c6818a1a86dd6dca7ddcaaf76947d5ba31aecc28cb1b67009a5877c9a64f3f", size = 251628, upload-time = "2026-03-25T20:21:36.012Z" }, + { url = "https://files.pythonhosted.org/packages/e3/f1/dbeeb9116715abee2485bf0a12d07a8f31af94d71608c171c45f64c0469d/tomli-2.4.1-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:d312ef37c91508b0ab2cee7da26ec0b3ed2f03ce12bd87a588d771ae15dcf82d", size = 247180, upload-time = "2026-03-25T20:21:37.136Z" }, + { url = "https://files.pythonhosted.org/packages/d3/74/16336ffd19ed4da28a70959f92f506233bd7cfc2332b20bdb01591e8b1d1/tomli-2.4.1-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:51529d40e3ca50046d7606fa99ce3956a617f9b36380da3b7f0dd3dd28e68cb5", size = 251674, upload-time = "2026-03-25T20:21:38.298Z" }, + { url = "https://files.pythonhosted.org/packages/16/f9/229fa3434c590ddf6c0aa9af64d3af4b752540686cace29e6281e3458469/tomli-2.4.1-cp313-cp313-win32.whl", hash = "sha256:2190f2e9dd7508d2a90ded5ed369255980a1bcdd58e52f7fe24b8162bf9fedbd", size = 97976, upload-time = "2026-03-25T20:21:39.316Z" }, + { url = "https://files.pythonhosted.org/packages/6a/1e/71dfd96bcc1c775420cb8befe7a9d35f2e5b1309798f009dca17b7708c1e/tomli-2.4.1-cp313-cp313-win_amd64.whl", hash = "sha256:8d65a2fbf9d2f8352685bc1364177ee3923d6baf5e7f43ea4959d7d8bc326a36", size = 108755, upload-time = "2026-03-25T20:21:40.248Z" }, + { url = "https://files.pythonhosted.org/packages/83/7a/d34f422a021d62420b78f5c538e5b102f62bea616d1d75a13f0a88acb04a/tomli-2.4.1-cp313-cp313-win_arm64.whl", hash = "sha256:4b605484e43cdc43f0954ddae319fb75f04cc10dd80d830540060ee7cd0243cd", size = 95265, upload-time = "2026-03-25T20:21:41.219Z" }, + { url = "https://files.pythonhosted.org/packages/3c/fb/9a5c8d27dbab540869f7c1f8eb0abb3244189ce780ba9cd73f3770662072/tomli-2.4.1-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:fd0409a3653af6c147209d267a0e4243f0ae46b011aa978b1080359fddc9b6cf", size = 155726, upload-time = "2026-03-25T20:21:42.23Z" }, + { url = "https://files.pythonhosted.org/packages/62/05/d2f816630cc771ad836af54f5001f47a6f611d2d39535364f148b6a92d6b/tomli-2.4.1-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:a120733b01c45e9a0c34aeef92bf0cf1d56cfe81ed9d47d562f9ed591a9828ac", size = 149859, upload-time = "2026-03-25T20:21:43.386Z" }, + { url = "https://files.pythonhosted.org/packages/ce/48/66341bdb858ad9bd0ceab5a86f90eddab127cf8b046418009f2125630ecb/tomli-2.4.1-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:559db847dc486944896521f68d8190be1c9e719fced785720d2216fe7022b662", size = 244713, upload-time = "2026-03-25T20:21:44.474Z" }, + { url = "https://files.pythonhosted.org/packages/df/6d/c5fad00d82b3c7a3ab6189bd4b10e60466f22cfe8a08a9394185c8a8111c/tomli-2.4.1-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:01f520d4f53ef97964a240a035ec2a869fe1a37dde002b57ebc4417a27ccd853", size = 252084, upload-time = "2026-03-25T20:21:45.62Z" }, + { url = "https://files.pythonhosted.org/packages/00/71/3a69e86f3eafe8c7a59d008d245888051005bd657760e96d5fbfb0b740c2/tomli-2.4.1-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:7f94b27a62cfad8496c8d2513e1a222dd446f095fca8987fceef261225538a15", size = 247973, upload-time = "2026-03-25T20:21:46.937Z" }, + { url = "https://files.pythonhosted.org/packages/67/50/361e986652847fec4bd5e4a0208752fbe64689c603c7ae5ea7cb16b1c0ca/tomli-2.4.1-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:ede3e6487c5ef5d28634ba3f31f989030ad6af71edfb0055cbbd14189ff240ba", size = 256223, upload-time = "2026-03-25T20:21:48.467Z" }, + { url = "https://files.pythonhosted.org/packages/8c/9a/b4173689a9203472e5467217e0154b00e260621caa227b6fa01feab16998/tomli-2.4.1-cp314-cp314-win32.whl", hash = "sha256:3d48a93ee1c9b79c04bb38772ee1b64dcf18ff43085896ea460ca8dec96f35f6", size = 98973, upload-time = "2026-03-25T20:21:49.526Z" }, + { url = "https://files.pythonhosted.org/packages/14/58/640ac93bf230cd27d002462c9af0d837779f8773bc03dee06b5835208214/tomli-2.4.1-cp314-cp314-win_amd64.whl", hash = "sha256:88dceee75c2c63af144e456745e10101eb67361050196b0b6af5d717254dddf7", size = 109082, upload-time = "2026-03-25T20:21:50.506Z" }, + { url = "https://files.pythonhosted.org/packages/d5/2f/702d5e05b227401c1068f0d386d79a589bb12bf64c3d2c72ce0631e3bc49/tomli-2.4.1-cp314-cp314-win_arm64.whl", hash = "sha256:b8c198f8c1805dc42708689ed6864951fd2494f924149d3e4bce7710f8eb5232", size = 96490, upload-time = "2026-03-25T20:21:51.474Z" }, + { url = "https://files.pythonhosted.org/packages/45/4b/b877b05c8ba62927d9865dd980e34a755de541eb65fffba52b4cc495d4d2/tomli-2.4.1-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:d4d8fe59808a54658fcc0160ecfb1b30f9089906c50b23bcb4c69eddc19ec2b4", size = 164263, upload-time = "2026-03-25T20:21:52.543Z" }, + { url = "https://files.pythonhosted.org/packages/24/79/6ab420d37a270b89f7195dec5448f79400d9e9c1826df982f3f8e97b24fd/tomli-2.4.1-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:7008df2e7655c495dd12d2a4ad038ff878d4ca4b81fccaf82b714e07eae4402c", size = 160736, upload-time = "2026-03-25T20:21:53.674Z" }, + { url = "https://files.pythonhosted.org/packages/02/e0/3630057d8eb170310785723ed5adcdfb7d50cb7e6455f85ba8a3deed642b/tomli-2.4.1-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:1d8591993e228b0c930c4bb0db464bdad97b3289fb981255d6c9a41aedc84b2d", size = 270717, upload-time = "2026-03-25T20:21:55.129Z" }, + { url = "https://files.pythonhosted.org/packages/7a/b4/1613716072e544d1a7891f548d8f9ec6ce2faf42ca65acae01d76ea06bb0/tomli-2.4.1-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:734e20b57ba95624ecf1841e72b53f6e186355e216e5412de414e3c51e5e3c41", size = 278461, upload-time = "2026-03-25T20:21:56.228Z" }, + { url = "https://files.pythonhosted.org/packages/05/38/30f541baf6a3f6df77b3df16b01ba319221389e2da59427e221ef417ac0c/tomli-2.4.1-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:8a650c2dbafa08d42e51ba0b62740dae4ecb9338eefa093aa5c78ceb546fcd5c", size = 274855, upload-time = "2026-03-25T20:21:57.653Z" }, + { url = "https://files.pythonhosted.org/packages/77/a3/ec9dd4fd2c38e98de34223b995a3b34813e6bdadf86c75314c928350ed14/tomli-2.4.1-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:504aa796fe0569bb43171066009ead363de03675276d2d121ac1a4572397870f", size = 283144, upload-time = "2026-03-25T20:21:59.089Z" }, + { url = "https://files.pythonhosted.org/packages/ef/be/605a6261cac79fba2ec0c9827e986e00323a1945700969b8ee0b30d85453/tomli-2.4.1-cp314-cp314t-win32.whl", hash = "sha256:b1d22e6e9387bf4739fbe23bfa80e93f6b0373a7f1b96c6227c32bef95a4d7a8", size = 108683, upload-time = "2026-03-25T20:22:00.214Z" }, + { url = "https://files.pythonhosted.org/packages/12/64/da524626d3b9cc40c168a13da8335fe1c51be12c0a63685cc6db7308daae/tomli-2.4.1-cp314-cp314t-win_amd64.whl", hash = "sha256:2c1c351919aca02858f740c6d33adea0c5deea37f9ecca1cc1ef9e884a619d26", size = 121196, upload-time = "2026-03-25T20:22:01.169Z" }, + { url = "https://files.pythonhosted.org/packages/5a/cd/e80b62269fc78fc36c9af5a6b89c835baa8af28ff5ad28c7028d60860320/tomli-2.4.1-cp314-cp314t-win_arm64.whl", hash = "sha256:eab21f45c7f66c13f2a9e0e1535309cee140182a9cdae1e041d02e47291e8396", size = 100393, upload-time = "2026-03-25T20:22:02.137Z" }, + { url = "https://files.pythonhosted.org/packages/7b/61/cceae43728b7de99d9b847560c262873a1f6c98202171fd5ed62640b494b/tomli-2.4.1-py3-none-any.whl", hash = "sha256:0d85819802132122da43cb86656f8d1f8c6587d54ae7dcaf30e90533028b49fe", size = 14583, upload-time = "2026-03-25T20:22:03.012Z" }, +] + +[[package]] +name = "tornado" +version = "6.5.7" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/64/24/95ec527ad67b76d59299e5465b3935d05e4294b7e0290a3924b7487df30b/tornado-6.5.7.tar.gz", hash = "sha256:66c513a76cda70d53907bc27cf1447557699c2e95aa48ba27a442ff61c3ddfc2", size = 519252, upload-time = "2026-06-08T17:34:51.232Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/02/dc/c7043cab6fed8ae159fc1923ce829ada35c4dbd797d408a43858ffaf9639/tornado-6.5.7-cp39-abi3-macosx_10_9_universal2.whl", hash = "sha256:148b2eb15c2c765a50796172c1e499649b35f30d2e3c3d3e15913cfa56bfb163", size = 448543, upload-time = "2026-06-08T17:34:38.052Z" }, + { url = "https://files.pythonhosted.org/packages/92/4f/090b1431e5a43df696feceffc268c5383cc079ecb5f08ce58f917109aafe/tornado-6.5.7-cp39-abi3-macosx_10_9_x86_64.whl", hash = "sha256:9da38de27f1da3b78a966f0dae12b5a1ea9afe72ca805d84ff06508272ddf100", size = 446707, upload-time = "2026-06-08T17:34:39.594Z" }, + { url = "https://files.pythonhosted.org/packages/37/d8/ef374952fd5da67d4463122c2b8e5a96536ec10b4b339254c6dcde81d01c/tornado-6.5.7-cp39-abi3-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:8d759e71906ee783f8867b93bf26a265743da4c1e2f4a018464c1ba019862972", size = 449774, upload-time = "2026-06-08T17:34:41.204Z" }, + { url = "https://files.pythonhosted.org/packages/35/37/d434c73f4c6e014b745b9b37085f34f40c022f007efff3d7fe65991899f3/tornado-6.5.7-cp39-abi3-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:8a46347a18f23fb92b396beebe0fb78f61dda0cc302445202c16203d8a18848b", size = 450745, upload-time = "2026-06-08T17:34:42.531Z" }, + { url = "https://files.pythonhosted.org/packages/b6/2b/56b9aff361d7f1ab728a805ec7d7ea835f8807afa9f5cc690ea0e630efb9/tornado-6.5.7-cp39-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:7778b30bef919231265e91c69963ce0f49a1e9c07ac900bbe75b19ce2575ba92", size = 450578, upload-time = "2026-06-08T17:34:43.787Z" }, + { url = "https://files.pythonhosted.org/packages/02/30/a7444fb23aa76860a14198fab96ac79f1866b0a6e19e26c4381b0938e50f/tornado-6.5.7-cp39-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:e726f0c75da7726eec023aa62751ff8878bd2737e34fbdd33b1ae5897d2200f5", size = 449985, upload-time = "2026-06-08T17:34:45.326Z" }, + { url = "https://files.pythonhosted.org/packages/5c/42/5f0e56c01e8d9d36f4e23f367b85ae6cae0c1ecddd5e6977d8388ad27488/tornado-6.5.7-cp39-abi3-win32.whl", hash = "sha256:f8de3bf12d3efdd0cbe7c8887868198f8a91415e3f29fcf258d9b8eb7b1d9ae4", size = 451047, upload-time = "2026-06-08T17:34:46.784Z" }, + { url = "https://files.pythonhosted.org/packages/c9/a4/b393076ffb21b469eec5b328a0534cf03a3b90bfc6b1f09507cdd075d938/tornado-6.5.7-cp39-abi3-win_amd64.whl", hash = "sha256:de942f843533a039ef9fa3d9c88c7cd8a7c94553fb5ad0154270989b3d99a2c4", size = 451485, upload-time = "2026-06-08T17:34:48.248Z" }, + { url = "https://files.pythonhosted.org/packages/71/2e/7b1c769803121b809112cf9a00681c472eae1d80e32d7ec0e0bd61d0d0e1/tornado-6.5.7-cp39-abi3-win_arm64.whl", hash = "sha256:ff934fce95643af5f11efdae618eaa73d469dc588641e5c8d19295a0c65c4796", size = 450506, upload-time = "2026-06-08T17:34:49.702Z" }, +] + +[[package]] +name = "tqdm" +version = "4.68.3" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "colorama", marker = "sys_platform == 'win32'" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/87/d7/0535a28b1f5f24f6612fb3ff1e89fb1a8d160fee0f976e0aa6803862134b/tqdm-4.68.3.tar.gz", hash = "sha256:00dfa48452b6b6cfae3dd9885636c23d3422d1ec97c66d96818cbd5e0821d482", size = 170596, upload-time = "2026-06-17T07:36:52.105Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/d8/8e/bb97bb0c71802080bfc8952937d174e49cfc50de5c951dd47b2496f0dcdb/tqdm-4.68.3-py3-none-any.whl", hash = "sha256:39832cc2def2789a6f29df83f172db7416cea70052c0907a57801c5f2fdccb03", size = 78337, upload-time = "2026-06-17T07:36:50.132Z" }, +] + +[[package]] +name = "traitlets" +version = "5.15.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/57/a9/a2584b8313b89f94869ddb3c4074617a691de1812a614d2d50e32ca5a7a6/traitlets-5.15.1.tar.gz", hash = "sha256:7b1c07854fe25acb39e009bae49f11b79ff6cbb2f27999104e9110e7a6b53722", size = 163344, upload-time = "2026-06-03T12:26:06.181Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/96/8d/1080ee4c231f361b6ce4470d556c8c435b67c7e0753aaa641497ee92f88b/traitlets-5.15.1-py3-none-any.whl", hash = "sha256:770a53705f84b81ac107e83a1b3328ff2dae16094d8fc3cfc004e4b22dfd8e92", size = 85858, upload-time = "2026-06-03T12:26:04.395Z" }, +] + +[[package]] +name = "typing-extensions" +version = "4.15.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/72/94/1a15dd82efb362ac84269196e94cf00f187f7ed21c242792a923cdb1c61f/typing_extensions-4.15.0.tar.gz", hash = "sha256:0cea48d173cc12fa28ecabc3b837ea3cf6f38c6d1136f85cbaaf598984861466", size = 109391, upload-time = "2025-08-25T13:49:26.313Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/18/67/36e9267722cc04a6b9f15c7f3441c2363321a3ea07da7ae0c0707beb2a9c/typing_extensions-4.15.0-py3-none-any.whl", hash = "sha256:f0fa19c6845758ab08074a0cfa8b7aecb71c999ca73d62883bc25cc018c4e548", size = 44614, upload-time = "2025-08-25T13:49:24.86Z" }, +] + +[[package]] +name = "tzdata" +version = "2026.2" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/ba/19/1b9b0e29f30c6d35cb345486df41110984ea67ae69dddbc0e8a100999493/tzdata-2026.2.tar.gz", hash = "sha256:9173fde7d80d9018e02a662e168e5a2d04f87c41ea174b139fbef642eda62d10", size = 198254, upload-time = "2026-04-24T15:22:08.651Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/ce/e4/dccd7f47c4b64213ac01ef921a1337ee6e30e8c6466046018326977efd95/tzdata-2026.2-py2.py3-none-any.whl", hash = "sha256:bbe9af844f658da81a5f95019480da3a89415801f6cc966806612cc7169bffe7", size = 349321, upload-time = "2026-04-24T15:22:05.876Z" }, +] + +[[package]] +name = "tzlocal" +version = "5.4.3" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "tzdata", marker = "sys_platform == 'win32'" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/48/55/15e2340963d2bfedcc6042da3911438fd336f8ae96b65bdbe3a29766da0c/tzlocal-5.4.3.tar.gz", hash = "sha256:3a8c9bc18cf47e1dcde252ea0e6a72a6cde320a400b6ac6db1f1f8cccd553c00", size = 30873, upload-time = "2026-06-17T04:17:41.764Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/42/28/fc144409c71569e928585f8f3c629d80d1ca3ef40175e9222f01588f98c9/tzlocal-5.4.3-py3-none-any.whl", hash = "sha256:24ce97bb58e2a973f7640ec2553ab4e6f6d5a0d0d1aa9dc43bca21d89e1feb82", size = 18039, upload-time = "2026-06-17T04:17:40.027Z" }, +] + +[[package]] +name = "uncertainties" +version = "3.2.3" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/fe/0c/cb09f33b26955399c675ab378e4063ed7e48422d3d49f96219ab0be5eba9/uncertainties-3.2.3.tar.gz", hash = "sha256:76a5653e686f617a42922d546a239e9efce72e6b35411b7750a1d12dcba03031", size = 160492, upload-time = "2025-04-21T19:58:28.63Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/8f/5e/f1e1dd319e35e962a4e00b33150a8868b6329cc1d19fd533436ba5488f09/uncertainties-3.2.3-py3-none-any.whl", hash = "sha256:313353900d8f88b283c9bad81e7d2b2d3d4bcc330cbace35403faaed7e78890a", size = 60118, upload-time = "2025-04-21T19:58:26.864Z" }, +] + +[[package]] +name = "uri-template" +version = "1.3.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/31/c7/0336f2bd0bcbada6ccef7aaa25e443c118a704f828a0620c6fa0207c1b64/uri-template-1.3.0.tar.gz", hash = "sha256:0e00f8eb65e18c7de20d595a14336e9f337ead580c70934141624b6d1ffdacc7", size = 21678, upload-time = "2023-06-21T01:49:05.374Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/e7/00/3fca040d7cf8a32776d3d81a00c8ee7457e00f80c649f1e4a863c8321ae9/uri_template-1.3.0-py3-none-any.whl", hash = "sha256:a44a133ea12d44a0c0f06d7d42a52d71282e77e2f937d8abd5655b8d56fc1363", size = 11140, upload-time = "2023-06-21T01:49:03.467Z" }, +] + +[[package]] +name = "urllib3" +version = "2.7.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/53/0c/06f8b233b8fd13b9e5ee11424ef85419ba0d8ba0b3138bf360be2ff56953/urllib3-2.7.0.tar.gz", hash = "sha256:231e0ec3b63ceb14667c67be60f2f2c40a518cb38b03af60abc813da26505f4c", size = 433602, upload-time = "2026-05-07T16:13:18.596Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/7f/3e/5db95bcf282c52709639744ca2a8b149baccf648e39c8cc87553df9eae0c/urllib3-2.7.0-py3-none-any.whl", hash = "sha256:9fb4c81ebbb1ce9531cce37674bbc6f1360472bc18ca9a553ede278ef7276897", size = 131087, upload-time = "2026-05-07T16:13:17.151Z" }, +] + +[[package]] +name = "wcwidth" +version = "0.8.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/49/b4/51fe890511f0f242d07cb1ebe6a5b6db417262b9d2568b460347c57d95cc/wcwidth-0.8.1.tar.gz", hash = "sha256:faf5b4a5366a72dc49cad48cdf21f52bdf63bdda995178e483ba247ff79089b9", size = 1466072, upload-time = "2026-06-08T05:57:23.146Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/bd/6e/95b0e537de1f4d4301f76f944642c6da50d1511cc7b3d64dc418a66c7509/wcwidth-0.8.1-py3-none-any.whl", hash = "sha256:f453740b1e4a4f3291faa37944c555d71056c4da08d59809b307ef4feba695c8", size = 323092, upload-time = "2026-06-08T05:57:21.413Z" }, +] + +[[package]] +name = "webcolors" +version = "25.10.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/1d/7a/eb316761ec35664ea5174709a68bbd3389de60d4a1ebab8808bfc264ed67/webcolors-25.10.0.tar.gz", hash = "sha256:62abae86504f66d0f6364c2a8520de4a0c47b80c03fc3a5f1815fedbef7c19bf", size = 53491, upload-time = "2025-10-31T07:51:03.977Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/e2/cc/e097523dd85c9cf5d354f78310927f1656c422bd7b2613b2db3e3f9a0f2c/webcolors-25.10.0-py3-none-any.whl", hash = "sha256:032c727334856fc0b968f63daa252a1ac93d33db2f5267756623c210e57a4f1d", size = 14905, upload-time = "2025-10-31T07:51:01.778Z" }, +] + +[[package]] +name = "webencodings" +version = "0.5.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/0b/02/ae6ceac1baeda530866a85075641cec12989bd8d31af6d5ab4a3e8c92f47/webencodings-0.5.1.tar.gz", hash = "sha256:b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923", size = 9721, upload-time = "2017-04-05T20:21:34.189Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/f4/24/2a3e3df732393fed8b3ebf2ec078f05546de641fe1b667ee316ec1dcf3b7/webencodings-0.5.1-py2.py3-none-any.whl", hash = "sha256:a0af1213f3c2226497a97e2b3aa01a7e4bee4f403f95be16fc9acd2947514a78", size = 11774, upload-time = "2017-04-05T20:21:32.581Z" }, +] + +[[package]] +name = "websocket-client" +version = "1.9.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/2c/41/aa4bf9664e4cda14c3b39865b12251e8e7d239f4cd0e3cc1b6c2ccde25c1/websocket_client-1.9.0.tar.gz", hash = "sha256:9e813624b6eb619999a97dc7958469217c3176312b3a16a4bd1bc7e08a46ec98", size = 70576, upload-time = "2025-10-07T21:16:36.495Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/34/db/b10e48aa8fff7407e67470363eac595018441cf32d5e1001567a7aeba5d2/websocket_client-1.9.0-py3-none-any.whl", hash = "sha256:af248a825037ef591efbf6ed20cc5faa03d3b47b9e5a2230a529eeee1c1fc3ef", size = 82616, upload-time = "2025-10-07T21:16:34.951Z" }, +] + +[[package]] +name = "werkzeug" +version = "3.1.8" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "markupsafe" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/dd/b2/381be8cfdee792dd117872481b6e378f85c957dd7c5bca38897b08f765fd/werkzeug-3.1.8.tar.gz", hash = "sha256:9bad61a4268dac112f1c5cd4630a56ede601b6ed420300677a869083d70a4c44", size = 875852, upload-time = "2026-04-02T18:49:14.268Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/93/8c/2e650f2afeb7ee576912636c23ddb621c91ac6a98e66dc8d29c3c69446e1/werkzeug-3.1.8-py3-none-any.whl", hash = "sha256:63a77fb8892bf28ebc3178683445222aa500e48ebad5ec77b0ad80f8726b1f50", size = 226459, upload-time = "2026-04-02T18:49:12.72Z" }, +] + +[[package]] +name = "wrapt" +version = "2.2.2" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/fe/a4/282c8e64300a59fc834518a54bf0afabb4ff9218b5fa76958b450459a844/wrapt-2.2.2.tar.gz", hash = "sha256:0788e321027c999bf221b667bd4a54aaefd1a36283749a860ac3eb77daed0302", size = 129068, upload-time = "2026-06-20T23:49:44.49Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/27/15/0c2d55168707465abfc41f33c0b23d792a5fa9b65c26983606940900a120/wrapt-2.2.2-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:f1a2ff355ece6a111ca7a20dc86df6659c9205d3fcee674ca34f2a2854fd4e73", size = 80782, upload-time = "2026-06-20T23:47:44.367Z" }, + { url = "https://files.pythonhosted.org/packages/7d/b5/5c0b093eb48f8a062ef6267d3cb36e9bb1b88440181f6545a383c60efdf8/wrapt-2.2.2-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:55b9a899e6fff5444f229d30aa6e9ac92d2216d9d60f33c771b5d76a760d5f8e", size = 81678, upload-time = "2026-06-20T23:47:45.857Z" }, + { url = "https://files.pythonhosted.org/packages/34/f3/de70937472dd3e8a4e6811192f9c6075efdffd4a2cd9b4596bf160f89668/wrapt-2.2.2-cp311-cp311-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:a2d78c363f97d8bd718ee40432c66395685e9e98528ccaa423c3355d1715a26d", size = 159671, upload-time = "2026-06-20T23:47:47.345Z" }, + { url = "https://files.pythonhosted.org/packages/a5/ec/40aed2330e7f02ecf74386ffcfef9ccb7108c6a430f15b6a252b663b1bed/wrapt-2.2.2-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:d619e1eed9bd4f6ed9f24cd61971aa086fa86505289628d464bcf8a2c2e3f328", size = 160785, upload-time = "2026-06-20T23:47:48.759Z" }, + { url = "https://files.pythonhosted.org/packages/45/04/aa5309beed5344b00220ae6b3b24055852192656194c27947bee1736306a/wrapt-2.2.2-cp311-cp311-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:518b0c5e323511ec56a38894802ddd5e1222626484e68efe63f201854ad788e5", size = 153699, upload-time = "2026-06-20T23:47:50.177Z" }, + { url = "https://files.pythonhosted.org/packages/01/df/2def7e99d1fe87eea413f95f671924cdddcb08823b1ffd212748dfa6d062/wrapt-2.2.2-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:4bccea5cdecffa9dd70e343741f0e41e0a16619313d04b72f78bb525162ebcd0", size = 159695, upload-time = "2026-06-20T23:47:51.602Z" }, + { url = "https://files.pythonhosted.org/packages/c7/f6/a906d01a2ce12157bad2404957b3e2140da354b8a70b2fa48bbf282871c0/wrapt-2.2.2-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:209112cafd963710a05d199aae431d79a28bc76eb8e6d1bbbb8ad24340722cae", size = 152813, upload-time = "2026-06-20T23:47:53.03Z" }, + { url = "https://files.pythonhosted.org/packages/02/49/bc0086292d239575b4c08f4cf8a4079fa58abbad58ec23abf84833a283ed/wrapt-2.2.2-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:e5a5290e4bf2f332fc29ce72ffb9a2fff678aaac047e2e9f5f7165cd7792e099", size = 158809, upload-time = "2026-06-20T23:47:54.391Z" }, + { url = "https://files.pythonhosted.org/packages/55/83/8fbd034de1f3e907edaa18786d5dd8f6932874edee0826c7cecb5cab03a1/wrapt-2.2.2-cp311-cp311-win32.whl", hash = "sha256:5499236ad1dc116012e2a5dd943f3f31af12fce452128e2bbcbd55a7d3d4d14c", size = 77414, upload-time = "2026-06-20T23:47:55.882Z" }, + { url = "https://files.pythonhosted.org/packages/7e/9c/23695baa331c6de4e874c3d78b8e0bed92e1d2a274e665b29858f6841672/wrapt-2.2.2-cp311-cp311-win_amd64.whl", hash = "sha256:8636809939152be6ae20a6cef0fed9fe60f411b47847d0426a826884b469e971", size = 80368, upload-time = "2026-06-20T23:47:57.237Z" }, + { url = "https://files.pythonhosted.org/packages/08/49/40cefc342bf89b234a4490d741290fce781774b831aefb39c25471da96c9/wrapt-2.2.2-cp311-cp311-win_arm64.whl", hash = "sha256:5d0a142f7af07caeb5e5da87493162a7b8efa19ba919e550a746f7446e13fb30", size = 79489, upload-time = "2026-06-20T23:47:58.56Z" }, + { url = "https://files.pythonhosted.org/packages/2a/85/180b40628b23772692a0c76e8030114e1c0ae068470ed531919f0a5f2a4a/wrapt-2.2.2-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:8417fd3c674d3c8023d080292d29301531a12daf8bd938dd419710dd2f464f2b", size = 81484, upload-time = "2026-06-20T23:47:59.924Z" }, + { url = "https://files.pythonhosted.org/packages/94/f2/21c90f2a16689702e2aaff45795b11018dff2c9b1242bac10d225483f676/wrapt-2.2.2-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:0e7070c7472582e31af3dfc2622b2381a0df7435110a9388ed8db5ffbce67efb", size = 82151, upload-time = "2026-06-20T23:48:01.303Z" }, + { url = "https://files.pythonhosted.org/packages/5f/b3/7e6e9fcf4fe7e1b69a49fe6cc5a44e8224bab6283c5233c97e132f14908e/wrapt-2.2.2-cp312-cp312-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:2e096c9d39a59b35b63c9aacfbbbec2088ff51ff1fc31051acc60a07f42f273a", size = 169828, upload-time = "2026-06-20T23:48:02.719Z" }, + { url = "https://files.pythonhosted.org/packages/0b/43/894f132d857ed5a9904d937baf368badcbe5ea9e436e2f1930fe21c9f1f0/wrapt-2.2.2-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:6d1a6050405bf334be33bf66296f113563622972a34900ae6fa60fd283a1a900", size = 171544, upload-time = "2026-06-20T23:48:04.266Z" }, + { url = "https://files.pythonhosted.org/packages/29/de/3c833e03725b477e9ea34028224dd21a48781830101e4e036f77e8b6b102/wrapt-2.2.2-cp312-cp312-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:10adb01371408c6de504a6658b9886480f1a4919a83752748a387a504a21df79", size = 160663, upload-time = "2026-06-20T23:48:05.708Z" }, + { url = "https://files.pythonhosted.org/packages/33/be/27edce350b24e3054d9d047f65f16d4c4d4c1f3f31c4278a1f8a95c723c8/wrapt-2.2.2-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:3442eee2a5798f9b451f1b2cd7518ce8b7e28a2a364696c414460a0e295c012a", size = 169387, upload-time = "2026-06-20T23:48:07.243Z" }, + { url = "https://files.pythonhosted.org/packages/e2/c4/9fd9679af8bf38e146652c7f47b6b352c3e5795b4ad1c0b7f94e15ac2aa7/wrapt-2.2.2-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:6c99012a22f735a85eed7c4b86a3e99c30fdd57d9e115b2b45f796264b58d0bf", size = 158849, upload-time = "2026-06-20T23:48:08.91Z" }, + { url = "https://files.pythonhosted.org/packages/bc/c2/aa6c0c2206803068c6859dabe01f8c84c43744da93d4c67b8946d21655ee/wrapt-2.2.2-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:3b686cfc008776a3952d6213cb296ed7f45d782a8453936406faa89eac0835ab", size = 168147, upload-time = "2026-06-20T23:48:10.374Z" }, + { url = "https://files.pythonhosted.org/packages/42/63/3eb25da41049d20ae18fcab2dd8b056e02387c4bfa626cbdfb7c3b872e4f/wrapt-2.2.2-cp312-cp312-win32.whl", hash = "sha256:ef2cce266b5b0b07e19fa82e59673b81142b7a3607c8ed1254113d048ed668da", size = 77734, upload-time = "2026-06-20T23:48:11.769Z" }, + { url = "https://files.pythonhosted.org/packages/da/09/0390e008a305360948fa9ce69507d041ac12cb2ee5d28e34467e2ee79391/wrapt-2.2.2-cp312-cp312-win_amd64.whl", hash = "sha256:abf8c20a2d72ee69e16328b3c91342c446e723bfe48bfcc4dded3b9722ac027f", size = 80585, upload-time = "2026-06-20T23:48:13.117Z" }, + { url = "https://files.pythonhosted.org/packages/d3/b3/84c445c66969f2d3457276b183a48c91097d59bbef9af6c075366b0f8c36/wrapt-2.2.2-cp312-cp312-win_arm64.whl", hash = "sha256:c6c64c5d02578bc4c4bca4f0aef1504de933c1d5b4ac2710b9131111459506c8", size = 79553, upload-time = "2026-06-20T23:48:14.5Z" }, + { url = "https://files.pythonhosted.org/packages/43/fc/f32f4b22c6511173c11d9e541ab4e7d8467a0f1b3455acaf784115d31ff8/wrapt-2.2.2-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:9e8b648270c613720a202d9a45ebabc33261b22c3a839b115ac5bce8c0bb0d69", size = 81296, upload-time = "2026-06-20T23:48:15.881Z" }, + { url = "https://files.pythonhosted.org/packages/72/06/4d117d5d77a9344776c0248b24dae3d3dd2f58e5f765fa08cf887072e719/wrapt-2.2.2-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:e6fb7e94e8fe3e4c3067bb1653a91cce7c5e83acc119fdd41501b1bf74654617", size = 81841, upload-time = "2026-06-20T23:48:17.262Z" }, + { url = "https://files.pythonhosted.org/packages/15/ff/63ad96f98eb58a742b1a20d80f21da88924405910149950b912368150468/wrapt-2.2.2-cp313-cp313-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:fb18fc51e813df0d9c98049e3bf2298a5495a648602040e21fa3c7329371159e", size = 167882, upload-time = "2026-06-20T23:48:18.764Z" }, + { url = "https://files.pythonhosted.org/packages/20/1f/8bb62d8933df7acf3247194e6e9fc68edf9d2fa203252c89c94b319dd472/wrapt-2.2.2-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:94b00b00f806eb3ef2abe9049ed45994a81ee9284884d96e6b8314927c6cea3d", size = 167411, upload-time = "2026-06-20T23:48:20.315Z" }, + { url = "https://files.pythonhosted.org/packages/17/09/8789dcb09ee1de715727db7521aabbb68ffa68dfade3a49468440cfced49/wrapt-2.2.2-cp313-cp313-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:62415fd095bc590b842b6d092f2b5d9ccbaeb7e0b28535c03dcea2718b48636b", size = 158607, upload-time = "2026-06-20T23:48:21.728Z" }, + { url = "https://files.pythonhosted.org/packages/9c/20/66e02562d53ee67d841f175e38e3c993c2d78a3e104c576cad61c028b43c/wrapt-2.2.2-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:a41e758d80dc0ab8c210f641ac892009d356cf1f955d97db544c8dd317b4d14c", size = 166367, upload-time = "2026-06-20T23:48:23.177Z" }, + { url = "https://files.pythonhosted.org/packages/bd/a3/832ac4e41222fb263b3042d42c2f08d305db7d0f0c9b1d3a271a9eede8f6/wrapt-2.2.2-cp313-cp313-musllinux_1_2_riscv64.whl", hash = "sha256:b84cd4058001c9727b0e9980b7a9e66325b5ca748b1b578e822cade1bc6b304f", size = 157176, upload-time = "2026-06-20T23:48:24.711Z" }, + { url = "https://files.pythonhosted.org/packages/b7/01/1bd5e4d2df9c0178989ac8da9186543465388588ee2ef153e2591accebef/wrapt-2.2.2-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:26fc73a1b15e0946d2942b9a4426d162b51676338327dc067ccd8d2d76385f94", size = 167025, upload-time = "2026-06-20T23:48:26.118Z" }, + { url = "https://files.pythonhosted.org/packages/1c/69/583ed25291ab53e1ec117135fb1c33425e2f46d2bc8f29c17f7a94cf4274/wrapt-2.2.2-cp313-cp313-win32.whl", hash = "sha256:3c4095803491f6ef72128914c28ec05bbad9758433bb35f6715a3e9c8e46fb2d", size = 77605, upload-time = "2026-06-20T23:48:27.643Z" }, + { url = "https://files.pythonhosted.org/packages/29/68/e69fc6d06e1523c68e0d00f95c9aed1158ce9908ee41603f7f2eae3d5db6/wrapt-2.2.2-cp313-cp313-win_amd64.whl", hash = "sha256:2cb07f414fab25dbe6b5c7398e1491423a5c81a6209533639969a6c928d474a4", size = 80508, upload-time = "2026-06-20T23:48:29.013Z" }, + { url = "https://files.pythonhosted.org/packages/55/21/fe7a393d9e5dc0923bed8f5d857e9dcff210f1fa0888c02cc8f3ffaa55aa/wrapt-2.2.2-cp313-cp313-win_arm64.whl", hash = "sha256:1fc7691f070220215cccb2a20836b9adbaecb8ff22ad47abe63de5f110994fac", size = 79565, upload-time = "2026-06-20T23:48:30.429Z" }, + { url = "https://files.pythonhosted.org/packages/b6/e5/c120d13bf5091164f68c3c1657e84f16f57e71d978421b626393ac5bd7eb/wrapt-2.2.2-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:ec8f83949028366531383603139403cac7a826e4011955813cdd640017845ce5", size = 83264, upload-time = "2026-06-20T23:48:31.807Z" }, + { url = "https://files.pythonhosted.org/packages/d3/b0/d4a1eb97e0e286625bdf21bc7f702637f9607787ffbbdb5ec14d50c79dbf/wrapt-2.2.2-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:4b481fb0c40d9fd90a5809911208da700987d373a20a4709dc9e3944af7a6bec", size = 83791, upload-time = "2026-06-20T23:48:33.482Z" }, + { url = "https://files.pythonhosted.org/packages/18/1e/f060df47755e87b57684cee7bfc1362b204df55fac96ffebc0631b697b79/wrapt-2.2.2-cp313-cp313t-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:0065a3b657cec06813b4241d2462ccec287f6863103d7445b725fb3a889736f9", size = 203399, upload-time = "2026-06-20T23:48:34.97Z" }, + { url = "https://files.pythonhosted.org/packages/c4/de/2316a757a1abb6453700b79d83e532146dcef2611348282d4d8889792161/wrapt-2.2.2-cp313-cp313t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:30f7424af5c5c345b7f26490e097f74a2ef45b3d08b664dc33571aee3bd3b56c", size = 210461, upload-time = "2026-06-20T23:48:36.569Z" }, + { url = "https://files.pythonhosted.org/packages/ed/29/d1160785ae18ca2495a6d82a21154103d74f656c9fd457fb35f6b11b965a/wrapt-2.2.2-cp313-cp313t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:07fdcb012821859168641acf68afad61ef9783cf37100af85f152550e9677194", size = 195313, upload-time = "2026-06-20T23:48:38.175Z" }, + { url = "https://files.pythonhosted.org/packages/f5/2d/7caa9598ae61a9cf0989cc501739cbeeb7d650ab3193cca1407b9af0c6ab/wrapt-2.2.2-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:f90038ab58fafb584801ca62d72384d7d5225d93c76f7b773c22fae545bd8066", size = 206116, upload-time = "2026-06-20T23:48:39.804Z" }, + { url = "https://files.pythonhosted.org/packages/ac/02/281ea1088b8650d865f311b35cf86fd21df89128e2909714f1161e01c9d0/wrapt-2.2.2-cp313-cp313t-musllinux_1_2_riscv64.whl", hash = "sha256:c5d7825491bfa2d08b97e9557768987952c7b9ae687d06c3320b40a37ccb7f20", size = 192668, upload-time = "2026-06-20T23:48:41.346Z" }, + { url = "https://files.pythonhosted.org/packages/be/7d/976e2d5b4b5c5babda40974edd54d0a5585cb60132ed86b46f4b80239b16/wrapt-2.2.2-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:0ad520e6daa9bbf136f14de735474dbec7dcc0891f718e1d274ce8dc92e645af", size = 198891, upload-time = "2026-06-20T23:48:43.056Z" }, + { url = "https://files.pythonhosted.org/packages/59/b7/e47651797c097f75a37e2ce86dcf04048ff576f3a674f7c558df7b5e9622/wrapt-2.2.2-cp313-cp313t-win32.whl", hash = "sha256:25904acb9475f46c24fe0423dbc8fda8cc5fbc282ab3dc6e72e919748c53f4e9", size = 78537, upload-time = "2026-06-20T23:48:44.509Z" }, + { url = "https://files.pythonhosted.org/packages/d1/6f/9fa5d59fb06d890defb5a8f727ce6a14d2932c8760153f96956628559fee/wrapt-2.2.2-cp313-cp313t-win_amd64.whl", hash = "sha256:305d4c247d61c4115794a169141823c62f719525ddb90b23aa332741c77d2c28", size = 82005, upload-time = "2026-06-20T23:48:46.391Z" }, + { url = "https://files.pythonhosted.org/packages/15/80/4c7bd9873d1f9f7d138d93556b500469dbe24f42710b877519c2b9eb380d/wrapt-2.2.2-cp313-cp313t-win_arm64.whl", hash = "sha256:c20279cd1a29800815d7b2d6338b60a6c6e78263f9d6e62e0eda251ba9cae2d0", size = 80762, upload-time = "2026-06-20T23:48:47.964Z" }, + { url = "https://files.pythonhosted.org/packages/24/05/7fd9c3f83b2c74cbfc572a0b88aa37431e04bd8aed70d2c0efd3464206de/wrapt-2.2.2-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:0e64826f920c42d9d9f87e8cc09ffae66c51ede12d59061a5a426deb9aa71745", size = 81341, upload-time = "2026-06-20T23:48:49.39Z" }, + { url = "https://files.pythonhosted.org/packages/4b/68/1bfa43100dd90d4ef74a05897b86275cf57e1313ca14aae2545bc9f872c9/wrapt-2.2.2-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:dcaa5e1451bd8751d7bd1568dfa3321c78092a52a7ecb5d1a0f18a5791e1fd00", size = 81921, upload-time = "2026-06-20T23:48:50.986Z" }, + { url = "https://files.pythonhosted.org/packages/74/eb/df7b7f0b631dbbc750f39be27d8b55f65777d8ac86da80e12be41a644c4b/wrapt-2.2.2-cp314-cp314-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:0abfd648dac9ac9c5b3aa9b523d27f1789046640b58dcd5652a720ddb325e1fc", size = 167713, upload-time = "2026-06-20T23:48:52.598Z" }, + { url = "https://files.pythonhosted.org/packages/4d/9a/d1bd36f6d088c8e652a9383cabbd49af30b8c576302a7eccddbab6963e3f/wrapt-2.2.2-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:f4bfd8d1eb438153eff8b8cfe87f032ba65731e1ce06138b5090f745a33f6f95", size = 166779, upload-time = "2026-06-20T23:48:54.33Z" }, + { url = "https://files.pythonhosted.org/packages/4c/ae/24ffacd4187fac2740a1972093929e836dea092d42c87d728cd98fee11a6/wrapt-2.2.2-cp314-cp314-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:c427c9d06d859848a69f0d928fe28b5c33a941b2265d10a0e1f15cd244f1ee33", size = 158407, upload-time = "2026-06-20T23:48:55.944Z" }, + { url = "https://files.pythonhosted.org/packages/a3/ed/974427668249a356051e8d67d47fa54ef6c777f0fcf3bae9d292c047d4b6/wrapt-2.2.2-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:4250b43d1a129d947e083c4dc6baf333c9bb34edd26f912d5b0457841fc858ab", size = 166594, upload-time = "2026-06-20T23:48:57.617Z" }, + { url = "https://files.pythonhosted.org/packages/fb/5f/e1d7c6e4523f78db2fbd7826babd0348da1d5e0834c4f918b9ab5757dfae/wrapt-2.2.2-cp314-cp314-musllinux_1_2_riscv64.whl", hash = "sha256:173e5bb5ca350a6e0abab60b7ec7cdd7992a814cb14b4de670a28f067f105663", size = 157068, upload-time = "2026-06-20T23:48:59.171Z" }, + { url = "https://files.pythonhosted.org/packages/1e/c1/7ebd1027f00700c0b0233b20aceef2b4784294ed64971424c4a78e069e34/wrapt-2.2.2-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:aa14b01804bce36c6d63d7b6a4f55df390f29f8648cc13a1f40b166f4d54680d", size = 166470, upload-time = "2026-06-20T23:49:00.737Z" }, + { url = "https://files.pythonhosted.org/packages/99/eb/974e471a6a978b8180186b8a9dc5ae3361ce269a967190b709b8ce17abfb/wrapt-2.2.2-cp314-cp314-win32.whl", hash = "sha256:58f9f8d637c9a6e245c6ef5b109b67ec187d2faed23d1405656b51d96e0a5b56", size = 78062, upload-time = "2026-06-20T23:49:02.327Z" }, + { url = "https://files.pythonhosted.org/packages/49/ec/e1281156cdc7a66693838ad7a0865ad641c74abd337a957d668b575aaffb/wrapt-2.2.2-cp314-cp314-win_amd64.whl", hash = "sha256:385cb1866f20479e83299af585375bfa0a4b0c6c9907a981483ea782ea8ae406", size = 80832, upload-time = "2026-06-20T23:49:03.837Z" }, + { url = "https://files.pythonhosted.org/packages/45/7d/1b6b5ddd94005a2dac97a4490c9838f3154977850d633abcb65b30089437/wrapt-2.2.2-cp314-cp314-win_arm64.whl", hash = "sha256:8ffbeaea6771a6eba6e6eeb09767864995726bc8240bb54baf88a9bb1db34d5c", size = 80029, upload-time = "2026-06-20T23:49:05.237Z" }, + { url = "https://files.pythonhosted.org/packages/b0/33/9ebcf8aafe91c601127cbd93708c16aa8f688f34a10bf004046803ecdc4f/wrapt-2.2.2-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:09f811d43f6f33ec7515f0be76b159569f4057ab54d3e079c3204dddb90afa2a", size = 83357, upload-time = "2026-06-20T23:49:06.632Z" }, + { url = "https://files.pythonhosted.org/packages/39/38/ec45b635153327b52e52732a0ea980e5f00b7efba65f9e018828f1e69daa/wrapt-2.2.2-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:a795d3c06e5fbf9ea2f13196180b77aeab1b4685917256ee0d014cc163d90063", size = 83794, upload-time = "2026-06-20T23:49:08.098Z" }, + { url = "https://files.pythonhosted.org/packages/4e/ea/1a89e6d3b7a83c3affe5c09cde77792c947e63e4bc85ad84cd5bb9abb0d8/wrapt-2.2.2-cp314-cp314t-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:45c2f2768e790c9f8db90f239ef23a2af8e7570f25a35619ef902df4a738447f", size = 203362, upload-time = "2026-06-20T23:49:09.811Z" }, + { url = "https://files.pythonhosted.org/packages/19/d8/3b58763d9863b5a73771c0d97110f9595d248db454009e07e1535ee905a4/wrapt-2.2.2-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:bbf00ee0cb55ec24e2b0995a71942b85b21a066db8f3f46e1dbfdb9433ffba81", size = 210449, upload-time = "2026-06-20T23:49:11.521Z" }, + { url = "https://files.pythonhosted.org/packages/2d/6f/17fd9e053103d8be148d20d5d7505facc72d5fe1f9127973904ceaed79cf/wrapt-2.2.2-cp314-cp314t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:2252f77663651b89255895f58cc6ac08fcb206d4371813e5af61bb62d4f7689c", size = 195349, upload-time = "2026-06-20T23:49:13.346Z" }, + { url = "https://files.pythonhosted.org/packages/ef/04/d0d1ccaaa12cb7dccf28a23f0279a608ba498f71e81d949d5ed54bcfd5c1/wrapt-2.2.2-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:2cd7181ab1c31192ff5219269830744b5a62020b3a6d433588c4f1c95b8f8bff", size = 206099, upload-time = "2026-06-20T23:49:15.051Z" }, + { url = "https://files.pythonhosted.org/packages/44/b3/e8aa07b619890a2aa6cde1931b1887abb08820721b564a5f80b7ca3f3aa0/wrapt-2.2.2-cp314-cp314t-musllinux_1_2_riscv64.whl", hash = "sha256:6fe35fd51b74867d8b80174c277bd6bbf6a73e443f908129dc531c4b688a20d5", size = 192728, upload-time = "2026-06-20T23:49:16.854Z" }, + { url = "https://files.pythonhosted.org/packages/b7/f0/1819fb50f0d3c9bd758d8a83b56f1b470dee8b5b8eac8702b7c137cea9d4/wrapt-2.2.2-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:11d95fc2fbad3163596c39d440e6f21ca9fccece74b56e30a37ac2fca786a07c", size = 198842, upload-time = "2026-06-20T23:49:18.504Z" }, + { url = "https://files.pythonhosted.org/packages/67/7c/e88313f16a99930b899ef970d91c281544a470749a359decad994483bbda/wrapt-2.2.2-cp314-cp314t-win32.whl", hash = "sha256:d8a15813215f33fa83667bfc978b300e35669ea8bb424e970a1426bcb7bc6cca", size = 79059, upload-time = "2026-06-20T23:49:20.107Z" }, + { url = "https://files.pythonhosted.org/packages/a0/4f/ac12fda57a55068a094ec42851fb0a40e8489d8941863d517452de62e507/wrapt-2.2.2-cp314-cp314t-win_amd64.whl", hash = "sha256:d09db0f7e8357060d3c38fc22a018aba683a796bf184360fd1a58f6fc180dc77", size = 82462, upload-time = "2026-06-20T23:49:21.631Z" }, + { url = "https://files.pythonhosted.org/packages/48/a7/df732dac86d9b2027c56bd163dbc883e037b16c3469614752e148d219c61/wrapt-2.2.2-cp314-cp314t-win_arm64.whl", hash = "sha256:f32fe639c39561ccc187bcae17e9271be0eb45f1c2952510d2f29b33ab577347", size = 81182, upload-time = "2026-06-20T23:49:23.199Z" }, + { url = "https://files.pythonhosted.org/packages/6e/d2/6317eb6d4554855bbf12d61857774af34747bf88a42c19bf306de67e2fa3/wrapt-2.2.2-py3-none-any.whl", hash = "sha256:5bad217350f19ce99ca5b5e71d406765ea86fe541628426772b657375ee1c048", size = 61460, upload-time = "2026-06-20T23:49:42.966Z" }, +] + +[[package]] +name = "zope-event" +version = "6.2" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/93/41/faa10af34d48d9cd6fa0249a1162943ad84a9590bd1a06939981e6640416/zope_event-6.2.tar.gz", hash = "sha256:b97d5d6327067ee6b9dfcbdf606ade9ade70991e19c162e808ea39e5fcf0f8d3", size = 18958, upload-time = "2026-04-28T06:24:10.578Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/9e/33/848922889e946d4befc415c219fe516af75c49555d8e736e183bfd30db42/zope_event-6.2-py3-none-any.whl", hash = "sha256:5e755153ac4faf64c10a4b6dd3307680166a3edf65b38df22df592610f8fa874", size = 6525, upload-time = "2026-04-28T06:24:09.176Z" }, +] + +[[package]] +name = "zope-interface" +version = "8.5" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/08/dc/50550cfcbb2ea3cbca5f1d7ed05c8aa840f831a0f2d63aec0a953f7c590e/zope_interface-8.5.tar.gz", hash = "sha256:7a3ba1c5877f0f3e3906b02ddf793abed2becc2948116414ce0e1dd820b68d6d", size = 257957, upload-time = "2026-05-26T06:50:14.574Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/ce/f1/83ad110fb847413affe71609bb50e59e1aa082e1236030122227c7c283d3/zope_interface-8.5-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:afc66ccaef2a3c0bef6ca02aad40d29a39276389dad16a8eac36f9f385e4d057", size = 211426, upload-time = "2026-05-26T06:49:12.595Z" }, + { url = "https://files.pythonhosted.org/packages/bb/a7/6b6e0c31ac240cb9fc015ae9ed45ca54be886c18fcf7bfa2377a4d7a8785/zope_interface-8.5-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:c28044972187245d7a309e4699319bfdbd2ffcbf7176d1d4ddf5adffb2dea80f", size = 211850, upload-time = "2026-05-26T06:49:14.474Z" }, + { url = "https://files.pythonhosted.org/packages/37/36/7599ecabcf80ce4fef2e1ef3c5ac0d4696b61f03f724cc44022f4d226af9/zope_interface-8.5-cp311-cp311-manylinux1_i686.manylinux2014_i686.manylinux_2_17_i686.manylinux_2_5_i686.whl", hash = "sha256:03bbecc7982af713d7499d4084bc03916413d17ffd45f89009348cc0c1d9e376", size = 260711, upload-time = "2026-05-26T06:49:16.568Z" }, + { url = "https://files.pythonhosted.org/packages/03/3e/1774b0ee46ccbb5498ee3c33ece40315b6ef58bc71957be94bd345340bc1/zope_interface-8.5-cp311-cp311-manylinux1_x86_64.manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:bf917009a4a7457c7290225a019f4a0aa706d96accd2cfdba2418d3bc1fcde2f", size = 265277, upload-time = "2026-05-26T06:49:18.656Z" }, + { url = "https://files.pythonhosted.org/packages/b6/09/e533b2ffabaae4e5d5730d6768a591cf335defe8e37bec2ad905d09be656/zope_interface-8.5-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:31cff25b2aaedb5267e6e77b1e9be6b0ec4f622032de8a069202b8ffacda7dc2", size = 266369, upload-time = "2026-05-26T06:49:20.174Z" }, + { url = "https://files.pythonhosted.org/packages/49/4a/3ebe6a4c122b2d5340db45cbe7e490663d3228b172710ec71060cd5d541e/zope_interface-8.5-cp311-cp311-win_amd64.whl", hash = "sha256:17a3114bbdddb5e75e5784cdf318944636190cbbc72d357ef9fb1a8b0351f955", size = 215161, upload-time = "2026-05-26T06:49:21.799Z" }, + { url = "https://files.pythonhosted.org/packages/d2/59/056ad97af5b16db1975ee98ec7ab03d2ce3f3355efad904ced1dbce0e39f/zope_interface-8.5-cp311-cp311-win_arm64.whl", hash = "sha256:aab6bb5bee10f38ea688b95ba054396b67f613552d2c8378be7fcb2d2fba7646", size = 213481, upload-time = "2026-05-26T06:49:25.085Z" }, + { url = "https://files.pythonhosted.org/packages/97/cc/b84123a948f3162a34623e188922827cd845244fdd043ed20f8d02228caa/zope_interface-8.5-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:8e6ee90c2e6de7c37058d5fa41f123c8b13a312db8d1e0fb5840d7f4bcdff9c9", size = 212165, upload-time = "2026-05-26T06:49:26.566Z" }, + { url = "https://files.pythonhosted.org/packages/4e/78/cbceec44f1b27208a76c1a688c131302685852406a23df5aab68324109cc/zope_interface-8.5-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:c1adc90d3576b3b4c4de4953e6002c37bef28b78d7fa54c1bbfd0c50f022fe7c", size = 212341, upload-time = "2026-05-26T06:49:28.182Z" }, + { url = "https://files.pythonhosted.org/packages/e1/c3/005032195ff3b210c139b7c560ed5c534e844b0907d8e44d2b3d8919305e/zope_interface-8.5-cp312-cp312-manylinux1_i686.manylinux2014_i686.manylinux_2_17_i686.manylinux_2_5_i686.whl", hash = "sha256:e6347b8d8d12c5eca6502450a92be30079b7acfade2c4f693efa0deb8871b06e", size = 265296, upload-time = "2026-05-26T06:49:29.741Z" }, + { url = "https://files.pythonhosted.org/packages/c5/66/1036543d6a66bc04c19df3cf650f3ad938a002ab0a443c24e23e8de5e8b9/zope_interface-8.5-cp312-cp312-manylinux1_x86_64.manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:5e970dabea777a24b0b0bbf9dae3ab75ce8b2d8e948edf4875627034b21f3560", size = 270689, upload-time = "2026-05-26T06:49:31.767Z" }, + { url = "https://files.pythonhosted.org/packages/30/4c/8b56259558cace4414e753ca6740396a1f59d4a95ddb55b4658600408670/zope_interface-8.5-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:f0b48ccadaa9839e09ff81e969703cecb3f402c813bfe8b958652e699bea69f5", size = 270280, upload-time = "2026-05-26T06:49:33.489Z" }, + { url = "https://files.pythonhosted.org/packages/f9/ea/649908c83aa8fdb7faf2ddca4d3cf6fb8f2157121267dc56e8f72681e26c/zope_interface-8.5-cp312-cp312-win_amd64.whl", hash = "sha256:e0e311f1277468c08fd59a2b41f71b43d25dff639789d364747acd1705c0df6e", size = 215019, upload-time = "2026-05-26T06:49:35.607Z" }, + { url = "https://files.pythonhosted.org/packages/9f/97/da13037b4c563e4df32eedbc819f8c00b754af494f68211e3dffd48d52da/zope_interface-8.5-cp312-cp312-win_arm64.whl", hash = "sha256:652b73107a04159ec6c020db6c1543d4f1e8f4d069bd2aac88a947820923517b", size = 213569, upload-time = "2026-05-26T06:49:37.317Z" }, + { url = "https://files.pythonhosted.org/packages/f4/8c/4c15755d701f2ec0e80d64a18e1ebaf5be2c584c0ec153fd516f5d13eada/zope_interface-8.5-cp313-cp313-macosx_10_9_x86_64.whl", hash = "sha256:28e80457c134d1fa57a7d758004dece348654e1b1467ac22dcdc20fc1d127c52", size = 212512, upload-time = "2026-05-26T06:49:38.996Z" }, + { url = "https://files.pythonhosted.org/packages/9a/2e/4360c54c465db042cc8fbeeec92abac28b4cedbf6ba63c1f092fd08a190f/zope_interface-8.5-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:09495ce9d559c06b70f2d4855b3e4f48a822a9ddc8be1d30c5b4e5be14ae1ace", size = 212541, upload-time = "2026-05-26T06:49:41.186Z" }, + { url = "https://files.pythonhosted.org/packages/aa/a5/692a2b8d70f78e848793231d5fae5fecbf8d0cccd73430fdc34802a6d3c1/zope_interface-8.5-cp313-cp313-manylinux1_i686.manylinux2014_i686.manylinux_2_17_i686.manylinux_2_5_i686.whl", hash = "sha256:7849ad8fa90763cc1087f4dda78ca3a233e950b3e08fac7079297c9cafbbd7bb", size = 265191, upload-time = "2026-05-26T06:49:43.449Z" }, + { url = "https://files.pythonhosted.org/packages/70/8d/454a9cfc7a050c394ab4f11b3371f7897828b7415e096afff724637e65e0/zope_interface-8.5-cp313-cp313-manylinux1_x86_64.manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:5578c9421ca409a1f39f153d6f7803e4cde01da592ec75a9ac5e1b777d18d33b", size = 270626, upload-time = "2026-05-26T06:49:45.425Z" }, + { url = "https://files.pythonhosted.org/packages/51/8c/db8409cfa3575b8e9b4800babd7d49f8228433cd1f0c56814bd0ada49c33/zope_interface-8.5-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:e1bd7d96b4ca5fa311f54c9eac16dce4886b428c1531dbe06067763ccdf123b4", size = 270444, upload-time = "2026-05-26T06:49:47.025Z" }, + { url = "https://files.pythonhosted.org/packages/4a/df/a386940e41469ef615e100a216d8b386521e9e598817147f87932ca203c4/zope_interface-8.5-cp313-cp313-win_amd64.whl", hash = "sha256:0c8123d2a4dfde2a613c7cb772605477724782c20bc2e0ad1d9435376a6a44a3", size = 215021, upload-time = "2026-05-26T06:49:48.478Z" }, + { url = "https://files.pythonhosted.org/packages/89/75/477eb5669b6b2a7a843decd1a075e9b1971a8720017654143a7183abd3d9/zope_interface-8.5-cp313-cp313-win_arm64.whl", hash = "sha256:6d02be14f3173c6c7288bc2fdf530090c01c3cf8764ad46c68024686f364278e", size = 213610, upload-time = "2026-05-26T06:49:50.01Z" }, + { url = "https://files.pythonhosted.org/packages/d4/19/5032e954827fdf02db2d2f49737ac4378bb9cfc2cd95a8f2e2a5ae2ec01a/zope_interface-8.5-cp314-cp314-macosx_10_9_x86_64.whl", hash = "sha256:ffaecf013251a89d0de6feb49a46eba48ad8cbbf8a40aeb6045e459e7bec6784", size = 212597, upload-time = "2026-05-26T06:49:51.63Z" }, + { url = "https://files.pythonhosted.org/packages/f1/53/3ef644012cf8a6a234a2d6134aab5a5c65ac5467c86296865501d4fbc406/zope_interface-8.5-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:126fa9d1c52295ae076d4cf968634f0a1826afa408a20808b57ff72877b8f69f", size = 212626, upload-time = "2026-05-26T06:49:53.236Z" }, + { url = "https://files.pythonhosted.org/packages/32/67/bc8b4f465d388039255003e230c284a175cedf1203c692f23cb7bff64efe/zope_interface-8.5-cp314-cp314-manylinux1_i686.manylinux2014_i686.manylinux_2_17_i686.manylinux_2_5_i686.whl", hash = "sha256:3090e3a663d20194756a59a272e0c8508b889341e31d5894223331fe6b4f9b21", size = 266827, upload-time = "2026-05-26T06:49:54.873Z" }, + { url = "https://files.pythonhosted.org/packages/a7/eb/37d05b935ede53d79690fecc8d201440084418e590bcfc05f384451c7593/zope_interface-8.5-cp314-cp314-manylinux1_x86_64.manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:9342fb74e2afefdb081bf1df727d209ea56995c6e13f5a0540e6d7aff4beafb8", size = 270139, upload-time = "2026-05-26T06:49:57.116Z" }, + { url = "https://files.pythonhosted.org/packages/8b/0b/fd0c54579e2ce8dc6cf1a757903f3374bc6fbda929a46af9e0f53cb0e5f0/zope_interface-8.5-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:6c54725d818f1b57a7efb8b16528326e1f3c257b602b32393fd255c45af8799d", size = 270338, upload-time = "2026-05-26T06:49:58.698Z" }, + { url = "https://files.pythonhosted.org/packages/c1/1d/c420dcd777bb761067ea92879ac766694a5ca78608185f1aecea64cbfc11/zope_interface-8.5-cp314-cp314-win_amd64.whl", hash = "sha256:29d74febbae1afeb6834c4ccbf42e242a673c860060f09e53142825270456140", size = 215789, upload-time = "2026-05-26T06:50:00.405Z" }, + { url = "https://files.pythonhosted.org/packages/62/94/50b5eb8f94e527edceac14f9955e58917424ea79bb572ddc18548561cbc2/zope_interface-8.5-cp314-cp314-win_arm64.whl", hash = "sha256:633c8c49396f38df030340797c533e9fe460d1b5d1e42d88e55e938e525f548c", size = 213757, upload-time = "2026-05-26T06:50:01.973Z" }, + { url = "https://files.pythonhosted.org/packages/17/6f/5d5f32c4dfcdb16ce2ec5363da686840f13c13e1a1214cb70b49e1cd6d9f/zope_interface-8.5-cp314-cp314t-macosx_10_9_x86_64.whl", hash = "sha256:133999820fdbae513c36c03d6f29ef87317aaa3edef39112222b155083664714", size = 213591, upload-time = "2026-05-26T06:50:03.529Z" }, + { url = "https://files.pythonhosted.org/packages/f3/55/de0c3459ff717fce3342f9a29464c281fdeb0d36c3171ee88d119d5f0650/zope_interface-8.5-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:8bd75c96966e573232f0599deaff717564828031c7f05563ccc1ac35c5ee0304", size = 213733, upload-time = "2026-05-26T06:50:05.101Z" }, + { url = "https://files.pythonhosted.org/packages/c2/95/d97430abd5ae9677e8b9295b58720c0064a5b557dbb6b8bf5928484cf0d8/zope_interface-8.5-cp314-cp314t-manylinux1_i686.manylinux2014_i686.manylinux_2_17_i686.manylinux_2_5_i686.whl", hash = "sha256:14b0e9799351d4c34fe99afd67f0cdd76e55ba15c66a98699d5fc22ea8241e08", size = 294905, upload-time = "2026-05-26T06:50:07.384Z" }, + { url = "https://files.pythonhosted.org/packages/41/ec/a0f8f3dad6e74992f4654bdd94802be0929eabca7b871cac3b6fbb5e961b/zope_interface-8.5-cp314-cp314t-manylinux1_x86_64.manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:0cd6a732ac84b94eb1ef9222a117347a27efd294ee16810ffdf7ecd307677ed5", size = 300885, upload-time = "2026-05-26T06:50:08.997Z" }, + { url = "https://files.pythonhosted.org/packages/0f/da/6881b48803a0ee8d23eb5efa30fce3ed218a2bd9de5758ce489d224fee81/zope_interface-8.5-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:798b7c87d0e59a7d5d086d642208d0d8700ff0d55c4029134b3c479c3bfb110f", size = 304672, upload-time = "2026-05-26T06:50:10.563Z" }, + { url = "https://files.pythonhosted.org/packages/2e/0e/b4c01320859ff1d585438bc231fd60bd258d096359bccf6654fecdf0cffb/zope_interface-8.5-cp314-cp314t-win_amd64.whl", hash = "sha256:0fc3a9d45f114d27eaa1e53beeb144533689edca8a9f66505b1e8e8b3f075e42", size = 217241, upload-time = "2026-05-26T06:50:12.171Z" }, +] + +[[package]] +name = "zstandard" +version = "0.25.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/fd/aa/3e0508d5a5dd96529cdc5a97011299056e14c6505b678fd58938792794b1/zstandard-0.25.0.tar.gz", hash = "sha256:7713e1179d162cf5c7906da876ec2ccb9c3a9dcbdffef0cc7f70c3667a205f0b", size = 711513, upload-time = "2025-09-14T22:15:54.002Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/2a/83/c3ca27c363d104980f1c9cee1101cc8ba724ac8c28a033ede6aab89585b1/zstandard-0.25.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:933b65d7680ea337180733cf9e87293cc5500cc0eb3fc8769f4d3c88d724ec5c", size = 795254, upload-time = "2025-09-14T22:16:26.137Z" }, + { url = "https://files.pythonhosted.org/packages/ac/4d/e66465c5411a7cf4866aeadc7d108081d8ceba9bc7abe6b14aa21c671ec3/zstandard-0.25.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:a3f79487c687b1fc69f19e487cd949bf3aae653d181dfb5fde3bf6d18894706f", size = 640559, upload-time = "2025-09-14T22:16:27.973Z" }, + { url = "https://files.pythonhosted.org/packages/12/56/354fe655905f290d3b147b33fe946b0f27e791e4b50a5f004c802cb3eb7b/zstandard-0.25.0-cp311-cp311-manylinux2010_i686.manylinux2014_i686.manylinux_2_12_i686.manylinux_2_17_i686.whl", hash = "sha256:0bbc9a0c65ce0eea3c34a691e3c4b6889f5f3909ba4822ab385fab9057099431", size = 5348020, upload-time = "2025-09-14T22:16:29.523Z" }, + { url = "https://files.pythonhosted.org/packages/3b/13/2b7ed68bd85e69a2069bcc72141d378f22cae5a0f3b353a2c8f50ef30c1b/zstandard-0.25.0-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:01582723b3ccd6939ab7b3a78622c573799d5d8737b534b86d0e06ac18dbde4a", size = 5058126, upload-time = "2025-09-14T22:16:31.811Z" }, + { url = "https://files.pythonhosted.org/packages/c9/dd/fdaf0674f4b10d92cb120ccff58bbb6626bf8368f00ebfd2a41ba4a0dc99/zstandard-0.25.0-cp311-cp311-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:5f1ad7bf88535edcf30038f6919abe087f606f62c00a87d7e33e7fc57cb69fcc", size = 5405390, upload-time = "2025-09-14T22:16:33.486Z" }, + { url = "https://files.pythonhosted.org/packages/0f/67/354d1555575bc2490435f90d67ca4dd65238ff2f119f30f72d5cde09c2ad/zstandard-0.25.0-cp311-cp311-manylinux2014_s390x.manylinux_2_17_s390x.whl", hash = "sha256:06acb75eebeedb77b69048031282737717a63e71e4ae3f77cc0c3b9508320df6", size = 5452914, upload-time = "2025-09-14T22:16:35.277Z" }, + { url = "https://files.pythonhosted.org/packages/bb/1f/e9cfd801a3f9190bf3e759c422bbfd2247db9d7f3d54a56ecde70137791a/zstandard-0.25.0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:9300d02ea7c6506f00e627e287e0492a5eb0371ec1670ae852fefffa6164b072", size = 5559635, upload-time = "2025-09-14T22:16:37.141Z" }, + { url = "https://files.pythonhosted.org/packages/21/88/5ba550f797ca953a52d708c8e4f380959e7e3280af029e38fbf47b55916e/zstandard-0.25.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:bfd06b1c5584b657a2892a6014c2f4c20e0db0208c159148fa78c65f7e0b0277", size = 5048277, upload-time = "2025-09-14T22:16:38.807Z" }, + { url = "https://files.pythonhosted.org/packages/46/c0/ca3e533b4fa03112facbe7fbe7779cb1ebec215688e5df576fe5429172e0/zstandard-0.25.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:f373da2c1757bb7f1acaf09369cdc1d51d84131e50d5fa9863982fd626466313", size = 5574377, upload-time = "2025-09-14T22:16:40.523Z" }, + { url = "https://files.pythonhosted.org/packages/12/9b/3fb626390113f272abd0799fd677ea33d5fc3ec185e62e6be534493c4b60/zstandard-0.25.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:6c0e5a65158a7946e7a7affa6418878ef97ab66636f13353b8502d7ea03c8097", size = 4961493, upload-time = "2025-09-14T22:16:43.3Z" }, + { url = "https://files.pythonhosted.org/packages/cb/d3/23094a6b6a4b1343b27ae68249daa17ae0651fcfec9ed4de09d14b940285/zstandard-0.25.0-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:c8e167d5adf59476fa3e37bee730890e389410c354771a62e3c076c86f9f7778", size = 5269018, upload-time = "2025-09-14T22:16:45.292Z" }, + { url = "https://files.pythonhosted.org/packages/8c/a7/bb5a0c1c0f3f4b5e9d5b55198e39de91e04ba7c205cc46fcb0f95f0383c1/zstandard-0.25.0-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:98750a309eb2f020da61e727de7d7ba3c57c97cf6213f6f6277bb7fb42a8e065", size = 5443672, upload-time = "2025-09-14T22:16:47.076Z" }, + { url = "https://files.pythonhosted.org/packages/27/22/503347aa08d073993f25109c36c8d9f029c7d5949198050962cb568dfa5e/zstandard-0.25.0-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:22a086cff1b6ceca18a8dd6096ec631e430e93a8e70a9ca5efa7561a00f826fa", size = 5822753, upload-time = "2025-09-14T22:16:49.316Z" }, + { url = "https://files.pythonhosted.org/packages/e2/be/94267dc6ee64f0f8ba2b2ae7c7a2df934a816baaa7291db9e1aa77394c3c/zstandard-0.25.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:72d35d7aa0bba323965da807a462b0966c91608ef3a48ba761678cb20ce5d8b7", size = 5366047, upload-time = "2025-09-14T22:16:51.328Z" }, + { url = "https://files.pythonhosted.org/packages/7b/a3/732893eab0a3a7aecff8b99052fecf9f605cf0fb5fb6d0290e36beee47a4/zstandard-0.25.0-cp311-cp311-win32.whl", hash = "sha256:f5aeea11ded7320a84dcdd62a3d95b5186834224a9e55b92ccae35d21a8b63d4", size = 436484, upload-time = "2025-09-14T22:16:55.005Z" }, + { url = "https://files.pythonhosted.org/packages/43/a3/c6155f5c1cce691cb80dfd38627046e50af3ee9ddc5d0b45b9b063bfb8c9/zstandard-0.25.0-cp311-cp311-win_amd64.whl", hash = "sha256:daab68faadb847063d0c56f361a289c4f268706b598afbf9ad113cbe5c38b6b2", size = 506183, upload-time = "2025-09-14T22:16:52.753Z" }, + { url = "https://files.pythonhosted.org/packages/8c/3e/8945ab86a0820cc0e0cdbf38086a92868a9172020fdab8a03ac19662b0e5/zstandard-0.25.0-cp311-cp311-win_arm64.whl", hash = "sha256:22a06c5df3751bb7dc67406f5374734ccee8ed37fc5981bf1ad7041831fa1137", size = 462533, upload-time = "2025-09-14T22:16:53.878Z" }, + { url = "https://files.pythonhosted.org/packages/82/fc/f26eb6ef91ae723a03e16eddb198abcfce2bc5a42e224d44cc8b6765e57e/zstandard-0.25.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:7b3c3a3ab9daa3eed242d6ecceead93aebbb8f5f84318d82cee643e019c4b73b", size = 795738, upload-time = "2025-09-14T22:16:56.237Z" }, + { url = "https://files.pythonhosted.org/packages/aa/1c/d920d64b22f8dd028a8b90e2d756e431a5d86194caa78e3819c7bf53b4b3/zstandard-0.25.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:913cbd31a400febff93b564a23e17c3ed2d56c064006f54efec210d586171c00", size = 640436, upload-time = "2025-09-14T22:16:57.774Z" }, + { url = "https://files.pythonhosted.org/packages/53/6c/288c3f0bd9fcfe9ca41e2c2fbfd17b2097f6af57b62a81161941f09afa76/zstandard-0.25.0-cp312-cp312-manylinux2010_i686.manylinux2014_i686.manylinux_2_12_i686.manylinux_2_17_i686.whl", hash = "sha256:011d388c76b11a0c165374ce660ce2c8efa8e5d87f34996aa80f9c0816698b64", size = 5343019, upload-time = "2025-09-14T22:16:59.302Z" }, + { url = "https://files.pythonhosted.org/packages/1e/15/efef5a2f204a64bdb5571e6161d49f7ef0fffdbca953a615efbec045f60f/zstandard-0.25.0-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:6dffecc361d079bb48d7caef5d673c88c8988d3d33fb74ab95b7ee6da42652ea", size = 5063012, upload-time = "2025-09-14T22:17:01.156Z" }, + { url = "https://files.pythonhosted.org/packages/b7/37/a6ce629ffdb43959e92e87ebdaeebb5ac81c944b6a75c9c47e300f85abdf/zstandard-0.25.0-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:7149623bba7fdf7e7f24312953bcf73cae103db8cae49f8154dd1eadc8a29ecb", size = 5394148, upload-time = "2025-09-14T22:17:03.091Z" }, + { url = "https://files.pythonhosted.org/packages/e3/79/2bf870b3abeb5c070fe2d670a5a8d1057a8270f125ef7676d29ea900f496/zstandard-0.25.0-cp312-cp312-manylinux2014_s390x.manylinux_2_17_s390x.whl", hash = "sha256:6a573a35693e03cf1d67799fd01b50ff578515a8aeadd4595d2a7fa9f3ec002a", size = 5451652, upload-time = "2025-09-14T22:17:04.979Z" }, + { url = "https://files.pythonhosted.org/packages/53/60/7be26e610767316c028a2cbedb9a3beabdbe33e2182c373f71a1c0b88f36/zstandard-0.25.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:5a56ba0db2d244117ed744dfa8f6f5b366e14148e00de44723413b2f3938a902", size = 5546993, upload-time = "2025-09-14T22:17:06.781Z" }, + { url = "https://files.pythonhosted.org/packages/85/c7/3483ad9ff0662623f3648479b0380d2de5510abf00990468c286c6b04017/zstandard-0.25.0-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:10ef2a79ab8e2974e2075fb984e5b9806c64134810fac21576f0668e7ea19f8f", size = 5046806, upload-time = "2025-09-14T22:17:08.415Z" }, + { url = "https://files.pythonhosted.org/packages/08/b3/206883dd25b8d1591a1caa44b54c2aad84badccf2f1de9e2d60a446f9a25/zstandard-0.25.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:aaf21ba8fb76d102b696781bddaa0954b782536446083ae3fdaa6f16b25a1c4b", size = 5576659, upload-time = "2025-09-14T22:17:10.164Z" }, + { url = "https://files.pythonhosted.org/packages/9d/31/76c0779101453e6c117b0ff22565865c54f48f8bd807df2b00c2c404b8e0/zstandard-0.25.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:1869da9571d5e94a85a5e8d57e4e8807b175c9e4a6294e3b66fa4efb074d90f6", size = 4953933, upload-time = "2025-09-14T22:17:11.857Z" }, + { url = "https://files.pythonhosted.org/packages/18/e1/97680c664a1bf9a247a280a053d98e251424af51f1b196c6d52f117c9720/zstandard-0.25.0-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:809c5bcb2c67cd0ed81e9229d227d4ca28f82d0f778fc5fea624a9def3963f91", size = 5268008, upload-time = "2025-09-14T22:17:13.627Z" }, + { url = "https://files.pythonhosted.org/packages/1e/73/316e4010de585ac798e154e88fd81bb16afc5c5cb1a72eeb16dd37e8024a/zstandard-0.25.0-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:f27662e4f7dbf9f9c12391cb37b4c4c3cb90ffbd3b1fb9284dadbbb8935fa708", size = 5433517, upload-time = "2025-09-14T22:17:16.103Z" }, + { url = "https://files.pythonhosted.org/packages/5b/60/dd0f8cfa8129c5a0ce3ea6b7f70be5b33d2618013a161e1ff26c2b39787c/zstandard-0.25.0-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:99c0c846e6e61718715a3c9437ccc625de26593fea60189567f0118dc9db7512", size = 5814292, upload-time = "2025-09-14T22:17:17.827Z" }, + { url = "https://files.pythonhosted.org/packages/fc/5f/75aafd4b9d11b5407b641b8e41a57864097663699f23e9ad4dbb91dc6bfe/zstandard-0.25.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:474d2596a2dbc241a556e965fb76002c1ce655445e4e3bf38e5477d413165ffa", size = 5360237, upload-time = "2025-09-14T22:17:19.954Z" }, + { url = "https://files.pythonhosted.org/packages/ff/8d/0309daffea4fcac7981021dbf21cdb2e3427a9e76bafbcdbdf5392ff99a4/zstandard-0.25.0-cp312-cp312-win32.whl", hash = "sha256:23ebc8f17a03133b4426bcc04aabd68f8236eb78c3760f12783385171b0fd8bd", size = 436922, upload-time = "2025-09-14T22:17:24.398Z" }, + { url = "https://files.pythonhosted.org/packages/79/3b/fa54d9015f945330510cb5d0b0501e8253c127cca7ebe8ba46a965df18c5/zstandard-0.25.0-cp312-cp312-win_amd64.whl", hash = "sha256:ffef5a74088f1e09947aecf91011136665152e0b4b359c42be3373897fb39b01", size = 506276, upload-time = "2025-09-14T22:17:21.429Z" }, + { url = "https://files.pythonhosted.org/packages/ea/6b/8b51697e5319b1f9ac71087b0af9a40d8a6288ff8025c36486e0c12abcc4/zstandard-0.25.0-cp312-cp312-win_arm64.whl", hash = "sha256:181eb40e0b6a29b3cd2849f825e0fa34397f649170673d385f3598ae17cca2e9", size = 462679, upload-time = "2025-09-14T22:17:23.147Z" }, + { url = "https://files.pythonhosted.org/packages/35/0b/8df9c4ad06af91d39e94fa96cc010a24ac4ef1378d3efab9223cc8593d40/zstandard-0.25.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:ec996f12524f88e151c339688c3897194821d7f03081ab35d31d1e12ec975e94", size = 795735, upload-time = "2025-09-14T22:17:26.042Z" }, + { url = "https://files.pythonhosted.org/packages/3f/06/9ae96a3e5dcfd119377ba33d4c42a7d89da1efabd5cb3e366b156c45ff4d/zstandard-0.25.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:a1a4ae2dec3993a32247995bdfe367fc3266da832d82f8438c8570f989753de1", size = 640440, upload-time = "2025-09-14T22:17:27.366Z" }, + { url = "https://files.pythonhosted.org/packages/d9/14/933d27204c2bd404229c69f445862454dcc101cd69ef8c6068f15aaec12c/zstandard-0.25.0-cp313-cp313-manylinux2010_i686.manylinux2014_i686.manylinux_2_12_i686.manylinux_2_17_i686.whl", hash = "sha256:e96594a5537722fdfb79951672a2a63aec5ebfb823e7560586f7484819f2a08f", size = 5343070, upload-time = "2025-09-14T22:17:28.896Z" }, + { url = "https://files.pythonhosted.org/packages/6d/db/ddb11011826ed7db9d0e485d13df79b58586bfdec56e5c84a928a9a78c1c/zstandard-0.25.0-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:bfc4e20784722098822e3eee42b8e576b379ed72cca4a7cb856ae733e62192ea", size = 5063001, upload-time = "2025-09-14T22:17:31.044Z" }, + { url = "https://files.pythonhosted.org/packages/db/00/87466ea3f99599d02a5238498b87bf84a6348290c19571051839ca943777/zstandard-0.25.0-cp313-cp313-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:457ed498fc58cdc12fc48f7950e02740d4f7ae9493dd4ab2168a47c93c31298e", size = 5394120, upload-time = "2025-09-14T22:17:32.711Z" }, + { url = "https://files.pythonhosted.org/packages/2b/95/fc5531d9c618a679a20ff6c29e2b3ef1d1f4ad66c5e161ae6ff847d102a9/zstandard-0.25.0-cp313-cp313-manylinux2014_s390x.manylinux_2_17_s390x.whl", hash = "sha256:fd7a5004eb1980d3cefe26b2685bcb0b17989901a70a1040d1ac86f1d898c551", size = 5451230, upload-time = "2025-09-14T22:17:34.41Z" }, + { url = "https://files.pythonhosted.org/packages/63/4b/e3678b4e776db00f9f7b2fe58e547e8928ef32727d7a1ff01dea010f3f13/zstandard-0.25.0-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:8e735494da3db08694d26480f1493ad2cf86e99bdd53e8e9771b2752a5c0246a", size = 5547173, upload-time = "2025-09-14T22:17:36.084Z" }, + { url = "https://files.pythonhosted.org/packages/4e/d5/ba05ed95c6b8ec30bd468dfeab20589f2cf709b5c940483e31d991f2ca58/zstandard-0.25.0-cp313-cp313-musllinux_1_1_aarch64.whl", hash = "sha256:3a39c94ad7866160a4a46d772e43311a743c316942037671beb264e395bdd611", size = 5046736, upload-time = "2025-09-14T22:17:37.891Z" }, + { url = "https://files.pythonhosted.org/packages/50/d5/870aa06b3a76c73eced65c044b92286a3c4e00554005ff51962deef28e28/zstandard-0.25.0-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:172de1f06947577d3a3005416977cce6168f2261284c02080e7ad0185faeced3", size = 5576368, upload-time = "2025-09-14T22:17:40.206Z" }, + { url = "https://files.pythonhosted.org/packages/5d/35/398dc2ffc89d304d59bc12f0fdd931b4ce455bddf7038a0a67733a25f550/zstandard-0.25.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:3c83b0188c852a47cd13ef3bf9209fb0a77fa5374958b8c53aaa699398c6bd7b", size = 4954022, upload-time = "2025-09-14T22:17:41.879Z" }, + { url = "https://files.pythonhosted.org/packages/9a/5c/36ba1e5507d56d2213202ec2b05e8541734af5f2ce378c5d1ceaf4d88dc4/zstandard-0.25.0-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:1673b7199bbe763365b81a4f3252b8e80f44c9e323fc42940dc8843bfeaf9851", size = 5267889, upload-time = "2025-09-14T22:17:43.577Z" }, + { url = "https://files.pythonhosted.org/packages/70/e8/2ec6b6fb7358b2ec0113ae202647ca7c0e9d15b61c005ae5225ad0995df5/zstandard-0.25.0-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:0be7622c37c183406f3dbf0cba104118eb16a4ea7359eeb5752f0794882fc250", size = 5433952, upload-time = "2025-09-14T22:17:45.271Z" }, + { url = "https://files.pythonhosted.org/packages/7b/01/b5f4d4dbc59ef193e870495c6f1275f5b2928e01ff5a81fecb22a06e22fb/zstandard-0.25.0-cp313-cp313-musllinux_1_2_s390x.whl", hash = "sha256:5f5e4c2a23ca271c218ac025bd7d635597048b366d6f31f420aaeb715239fc98", size = 5814054, upload-time = "2025-09-14T22:17:47.08Z" }, + { url = "https://files.pythonhosted.org/packages/b2/e5/fbd822d5c6f427cf158316d012c5a12f233473c2f9c5fe5ab1ae5d21f3d8/zstandard-0.25.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:4f187a0bb61b35119d1926aee039524d1f93aaf38a9916b8c4b78ac8514a0aaf", size = 5360113, upload-time = "2025-09-14T22:17:48.893Z" }, + { url = "https://files.pythonhosted.org/packages/8e/e0/69a553d2047f9a2c7347caa225bb3a63b6d7704ad74610cb7823baa08ed7/zstandard-0.25.0-cp313-cp313-win32.whl", hash = "sha256:7030defa83eef3e51ff26f0b7bfb229f0204b66fe18e04359ce3474ac33cbc09", size = 436936, upload-time = "2025-09-14T22:17:52.658Z" }, + { url = "https://files.pythonhosted.org/packages/d9/82/b9c06c870f3bd8767c201f1edbdf9e8dc34be5b0fbc5682c4f80fe948475/zstandard-0.25.0-cp313-cp313-win_amd64.whl", hash = "sha256:1f830a0dac88719af0ae43b8b2d6aef487d437036468ef3c2ea59c51f9d55fd5", size = 506232, upload-time = "2025-09-14T22:17:50.402Z" }, + { url = "https://files.pythonhosted.org/packages/d4/57/60c3c01243bb81d381c9916e2a6d9e149ab8627c0c7d7abb2d73384b3c0c/zstandard-0.25.0-cp313-cp313-win_arm64.whl", hash = "sha256:85304a43f4d513f5464ceb938aa02c1e78c2943b29f44a750b48b25ac999a049", size = 462671, upload-time = "2025-09-14T22:17:51.533Z" }, + { url = "https://files.pythonhosted.org/packages/3d/5c/f8923b595b55fe49e30612987ad8bf053aef555c14f05bb659dd5dbe3e8a/zstandard-0.25.0-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:e29f0cf06974c899b2c188ef7f783607dbef36da4c242eb6c82dcd8b512855e3", size = 795887, upload-time = "2025-09-14T22:17:54.198Z" }, + { url = "https://files.pythonhosted.org/packages/8d/09/d0a2a14fc3439c5f874042dca72a79c70a532090b7ba0003be73fee37ae2/zstandard-0.25.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:05df5136bc5a011f33cd25bc9f506e7426c0c9b3f9954f056831ce68f3b6689f", size = 640658, upload-time = "2025-09-14T22:17:55.423Z" }, + { url = "https://files.pythonhosted.org/packages/5d/7c/8b6b71b1ddd517f68ffb55e10834388d4f793c49c6b83effaaa05785b0b4/zstandard-0.25.0-cp314-cp314-manylinux2010_i686.manylinux_2_12_i686.manylinux_2_28_i686.whl", hash = "sha256:f604efd28f239cc21b3adb53eb061e2a205dc164be408e553b41ba2ffe0ca15c", size = 5379849, upload-time = "2025-09-14T22:17:57.372Z" }, + { url = "https://files.pythonhosted.org/packages/a4/86/a48e56320d0a17189ab7a42645387334fba2200e904ee47fc5a26c1fd8ca/zstandard-0.25.0-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:223415140608d0f0da010499eaa8ccdb9af210a543fac54bce15babbcfc78439", size = 5058095, upload-time = "2025-09-14T22:17:59.498Z" }, + { url = "https://files.pythonhosted.org/packages/f8/ad/eb659984ee2c0a779f9d06dbfe45e2dc39d99ff40a319895df2d3d9a48e5/zstandard-0.25.0-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:2e54296a283f3ab5a26fc9b8b5d4978ea0532f37b231644f367aa588930aa043", size = 5551751, upload-time = "2025-09-14T22:18:01.618Z" }, + { url = "https://files.pythonhosted.org/packages/61/b3/b637faea43677eb7bd42ab204dfb7053bd5c4582bfe6b1baefa80ac0c47b/zstandard-0.25.0-cp314-cp314-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:ca54090275939dc8ec5dea2d2afb400e0f83444b2fc24e07df7fdef677110859", size = 6364818, upload-time = "2025-09-14T22:18:03.769Z" }, + { url = "https://files.pythonhosted.org/packages/31/dc/cc50210e11e465c975462439a492516a73300ab8caa8f5e0902544fd748b/zstandard-0.25.0-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:e09bb6252b6476d8d56100e8147b803befa9a12cea144bbe629dd508800d1ad0", size = 5560402, upload-time = "2025-09-14T22:18:05.954Z" }, + { url = "https://files.pythonhosted.org/packages/c9/ae/56523ae9c142f0c08efd5e868a6da613ae76614eca1305259c3bf6a0ed43/zstandard-0.25.0-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:a9ec8c642d1ec73287ae3e726792dd86c96f5681eb8df274a757bf62b750eae7", size = 4955108, upload-time = "2025-09-14T22:18:07.68Z" }, + { url = "https://files.pythonhosted.org/packages/98/cf/c899f2d6df0840d5e384cf4c4121458c72802e8bda19691f3b16619f51e9/zstandard-0.25.0-cp314-cp314-musllinux_1_2_i686.whl", hash = "sha256:a4089a10e598eae6393756b036e0f419e8c1d60f44a831520f9af41c14216cf2", size = 5269248, upload-time = "2025-09-14T22:18:09.753Z" }, + { url = "https://files.pythonhosted.org/packages/1b/c0/59e912a531d91e1c192d3085fc0f6fb2852753c301a812d856d857ea03c6/zstandard-0.25.0-cp314-cp314-musllinux_1_2_ppc64le.whl", hash = "sha256:f67e8f1a324a900e75b5e28ffb152bcac9fbed1cc7b43f99cd90f395c4375344", size = 5430330, upload-time = "2025-09-14T22:18:11.966Z" }, + { url = "https://files.pythonhosted.org/packages/a0/1d/7e31db1240de2df22a58e2ea9a93fc6e38cc29353e660c0272b6735d6669/zstandard-0.25.0-cp314-cp314-musllinux_1_2_s390x.whl", hash = "sha256:9654dbc012d8b06fc3d19cc825af3f7bf8ae242226df5f83936cb39f5fdc846c", size = 5811123, upload-time = "2025-09-14T22:18:13.907Z" }, + { url = "https://files.pythonhosted.org/packages/f6/49/fac46df5ad353d50535e118d6983069df68ca5908d4d65b8c466150a4ff1/zstandard-0.25.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:4203ce3b31aec23012d3a4cf4a2ed64d12fea5269c49aed5e4c3611b938e4088", size = 5359591, upload-time = "2025-09-14T22:18:16.465Z" }, + { url = "https://files.pythonhosted.org/packages/c2/38/f249a2050ad1eea0bb364046153942e34abba95dd5520af199aed86fbb49/zstandard-0.25.0-cp314-cp314-win32.whl", hash = "sha256:da469dc041701583e34de852d8634703550348d5822e66a0c827d39b05365b12", size = 444513, upload-time = "2025-09-14T22:18:20.61Z" }, + { url = "https://files.pythonhosted.org/packages/3a/43/241f9615bcf8ba8903b3f0432da069e857fc4fd1783bd26183db53c4804b/zstandard-0.25.0-cp314-cp314-win_amd64.whl", hash = "sha256:c19bcdd826e95671065f8692b5a4aa95c52dc7a02a4c5a0cac46deb879a017a2", size = 516118, upload-time = "2025-09-14T22:18:17.849Z" }, + { url = "https://files.pythonhosted.org/packages/f0/ef/da163ce2450ed4febf6467d77ccb4cd52c4c30ab45624bad26ca0a27260c/zstandard-0.25.0-cp314-cp314-win_arm64.whl", hash = "sha256:d7541afd73985c630bafcd6338d2518ae96060075f9463d7dc14cfb33514383d", size = 476940, upload-time = "2025-09-14T22:18:19.088Z" }, +] From 90eaca5d1068f53837492d4df3bb19a080aa1488 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 22 Jun 2026 15:32:43 -0700 Subject: [PATCH 170/591] Removed ty - not mature enough --- mpcontribs-api/pyproject.toml | 4 ---- mpcontribs-api/uv.lock | 27 --------------------------- 2 files changed, 31 deletions(-) diff --git a/mpcontribs-api/pyproject.toml b/mpcontribs-api/pyproject.toml index 03cb39cc41..b41f4935c7 100644 --- a/mpcontribs-api/pyproject.toml +++ b/mpcontribs-api/pyproject.toml @@ -63,7 +63,6 @@ dev = [ "pytest-xdist>=3.8.0", "httpx2>=0.28.0", "pytest-asyncio>=1.4.0", - "ty>=0.0.51", ] [tool.pytest.ini_options] @@ -92,6 +91,3 @@ pythonVersion = "3.14" typeCheckingMode = "standard" extraPaths = ["src"] ignore=["tests/"] - -[tool.ty.src] -exlcude = ["tests"] diff --git a/mpcontribs-api/uv.lock b/mpcontribs-api/uv.lock index a61a82b83a..b874098fbc 100644 --- a/mpcontribs-api/uv.lock +++ b/mpcontribs-api/uv.lock @@ -993,7 +993,6 @@ dev = [ { name = "pytest-asyncio" }, { name = "pytest-xdist" }, { name = "ruff" }, - { name = "ty" }, ] [package.metadata] @@ -1023,7 +1022,6 @@ dev = [ { name = "pytest-asyncio", specifier = ">=1.4.0" }, { name = "pytest-xdist", specifier = ">=3.8.0" }, { name = "ruff", specifier = ">=0.9.0" }, - { name = "ty", specifier = ">=0.0.51" }, ] [[package]] @@ -2036,31 +2034,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/19/97/56608b2249fe206a67cd573bc93cd9896e1efb9e98bce9c163bcdc704b88/truststore-0.10.4-py3-none-any.whl", hash = "sha256:adaeaecf1cbb5f4de3b1959b42d41f6fab57b2b1666adb59e89cb0b53361d981", size = 18660, upload-time = "2025-08-12T18:49:01.46Z" }, ] -[[package]] -name = "ty" -version = "0.0.51" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/7e/ce/352fcdba5c72ea20e5d2e46e28809cdb617575b71209d971eff2ace8e6c4/ty-0.0.51.tar.gz", hash = "sha256:b90172d46365bb9d51a7011cbb5c60cc4f514f42c86635df6c092b717f85e1ac", size = 5953151, upload-time = "2026-06-19T01:48:58.015Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/2b/8f/8fe7cab79a45320b2cdcd602f16d44c8108d2f418ff7ec316c6212f1f0cc/ty-0.0.51-py3-none-linux_armv6l.whl", hash = "sha256:947986bd82d324b3a5c58ce03f1dad160cdf36443d3e8f64b3484b861ba9bc64", size = 11884805, upload-time = "2026-06-19T01:48:20.184Z" }, - { url = "https://files.pythonhosted.org/packages/fa/b4/56fdc39a3f44c0564fd157e1e59e1f9c3fc5ba57ae4472ded85c67c63d74/ty-0.0.51-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:25a5b31e6f23fd5dc63ad29087ded09932409e4154e2fe07bbaed015035990bb", size = 11633593, upload-time = "2026-06-19T01:48:22.998Z" }, - { url = "https://files.pythonhosted.org/packages/33/57/136e83f24fc04f5afdcabff42f40fa27eae5ac3f0e3f12627d072a55f679/ty-0.0.51-py3-none-macosx_11_0_arm64.whl", hash = "sha256:2faed19a8f1505370de071c008df52a994fc03a204f3267c3a33a32ca26f854f", size = 11063076, upload-time = "2026-06-19T01:48:25.223Z" }, - { url = "https://files.pythonhosted.org/packages/32/f8/5d32f0df5692446440ab781b9b119aa3e0c0dbfa78c583fe9be8417d54fa/ty-0.0.51-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:08adbe53fb8bc9e7f00e89bf1d3c875a02cda76d83f109d2e6ab1ff35a7bfa8c", size = 11579542, upload-time = "2026-06-19T01:48:27.302Z" }, - { url = "https://files.pythonhosted.org/packages/7f/0c/4f54ef338e9623886809ecd508931b0cd5b3aba1e591586a2f6aeaa8bd11/ty-0.0.51-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:dc5e93695ab5dcbf1eef663aee60ec23a413547cc9cb06adcb0d842e9166bd0f", size = 11676189, upload-time = "2026-06-19T01:48:29.518Z" }, - { url = "https://files.pythonhosted.org/packages/56/27/31729066f9b9d3596941edaf267894eefc0b30df4518f003dba5f7276258/ty-0.0.51-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:abd92913bc90d1705ef9391ff8c6822b61e2e827fa295eb30bf0dfabcf815645", size = 12188154, upload-time = "2026-06-19T01:48:31.68Z" }, - { url = "https://files.pythonhosted.org/packages/2f/38/d4301aa12d2283c7130908baf1417a37dfe3e10f5669cb4ce2853c2540b4/ty-0.0.51-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:429a997394dac73870d71b87cc90efc54da3efaf319e72ca18aeef35a78aef90", size = 12780597, upload-time = "2026-06-19T01:48:33.839Z" }, - { url = "https://files.pythonhosted.org/packages/c1/52/4b2e67e53f126d39abe201bd2299e467e27463a284e965ad195cbc217fa0/ty-0.0.51-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:62d94f06e8c317e89b6884f2bde443040e596b88c7c79bd944c84c105b06257a", size = 12491115, upload-time = "2026-06-19T01:48:36.169Z" }, - { url = "https://files.pythonhosted.org/packages/74/50/aabfe55c132ebe72b4d639cbf772d931e11b0990d29c1f691922b6ccabc1/ty-0.0.51-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f8f52952cff665bc52a36147e610c10f5699d30007d7a14ab7f345cff93476ff", size = 12230135, upload-time = "2026-06-19T01:48:38.445Z" }, - { url = "https://files.pythonhosted.org/packages/0d/1b/9aa428052dbed91c50919cd080426a313cf20ce14c6bfe2b71345e548671/ty-0.0.51-py3-none-manylinux_2_31_riscv64.whl", hash = "sha256:c1bd1355aee86af01e4e21b0bc16fc460fb05905761f0d8b8d70841de0feade8", size = 12468123, upload-time = "2026-06-19T01:48:40.47Z" }, - { url = "https://files.pythonhosted.org/packages/0b/5a/f6ce69f2575259386c950c40e02578d0902760cb61f95045e9971182c24e/ty-0.0.51-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:79d1877e93460f936bc10ed1a31525702b7ce51075763ccba993be17f0b9e905", size = 11541672, upload-time = "2026-06-19T01:48:42.635Z" }, - { url = "https://files.pythonhosted.org/packages/35/3a/2af48924a683e959e95e5cc4dc88e5a8595206a0812b869032b95196f2b0/ty-0.0.51-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:cc233a6235fb23e2a44b14731a10043e37ba2f30f2c361cf49ad3633c5b9da9c", size = 11694015, upload-time = "2026-06-19T01:48:44.819Z" }, - { url = "https://files.pythonhosted.org/packages/a4/12/899875d8a60b198c8121cb92ce18e18cc072d23ca2130fcdaa176383ef72/ty-0.0.51-py3-none-musllinux_1_2_i686.whl", hash = "sha256:bc7459348a253247bbfb2669a021e614281b86bbea24c36112b8a6e1a2499a16", size = 11832856, upload-time = "2026-06-19T01:48:47.028Z" }, - { url = "https://files.pythonhosted.org/packages/e6/a2/88f681d826d97cc96ef9f6cadd4935f775758944cee07340aa46113bce28/ty-0.0.51-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:49a21237f6fd1de56beaff0a3e85fe022a09a3401e67e3abec41ce838a5d4d2e", size = 12333449, upload-time = "2026-06-19T01:48:49.091Z" }, - { url = "https://files.pythonhosted.org/packages/f8/61/535a4163b4452c6978c31fedfd7b5803cf3a2253e9455cde350f86638d6a/ty-0.0.51-py3-none-win32.whl", hash = "sha256:61b4b6a003c3ebe53a63a1125c9b6542aa01bc1b6c9a235d01ee328d000d61a9", size = 11177338, upload-time = "2026-06-19T01:48:51.433Z" }, - { url = "https://files.pythonhosted.org/packages/aa/4d/2334fbb74291a20129fa7aaa8f789619ec9b6883b27f997b8baa27e4674f/ty-0.0.51-py3-none-win_amd64.whl", hash = "sha256:608d417cd1eaf79bcbd713d9830d5e3db9d57ec225c3af3e4ac9a9ff66b45d70", size = 12325675, upload-time = "2026-06-19T01:48:53.774Z" }, - { url = "https://files.pythonhosted.org/packages/50/b5/d49096cd5f3694becb86a5a6ccd0f229ead695fc7430d6bc4dd0a104c6fe/ty-0.0.51-py3-none-win_arm64.whl", hash = "sha256:62ced5e380284f12b2dc4802a3e4ed3dac39913fc6719afde7978814a4c7f169", size = 11657350, upload-time = "2026-06-19T01:48:55.904Z" }, -] - [[package]] name = "typer" version = "0.26.7" From 1de3fb85aee9f98414e2177b4d28afb16feddcb8 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 22 Jun 2026 15:55:46 -0700 Subject: [PATCH 171/591] Added justfile to use with CI --- mpcontribs-api/justfile | 62 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 mpcontribs-api/justfile diff --git a/mpcontribs-api/justfile b/mpcontribs-api/justfile new file mode 100644 index 0000000000..00127b6a6a --- /dev/null +++ b/mpcontribs-api/justfile @@ -0,0 +1,62 @@ +set shell := ["bash", "-euo", "pipefail", "-c"] + +# Importable package name for coverage (src/ layout -> underscore). +cov_pkg := "mpcontribs_api" + +default: + @just --list + +# --- CI gates (non-mutating) ------------------------------------------------- + +# Sync deps into the project venv. +install: + uv sync --all-extras --dev + +# Lint, no autofix. +lint: + uv run ruff check + +# Style check only (does not rewrite files). +format-check: + uv run ruff format --check + +# Static type checking. +typecheck: + uv run basedpyright + +# Fail if uv.lock is out of sync with pyproject.toml. +lock-check: + uv lock --check + +# --- Local dev --------------------------------------------------------------- + +# Run the dev server (auto-reloads on file changes). +dev: + uv run fastapi dev src/mpcontribs_api/app.py + +# Format, fix, and lint all source code (mutates files — not a CI gate). +fmt: + uv run ruff format + -uv run ruff check --fix + -uv run ruff check --fix --unsafe-fixes + -uv run pydocstringformatter --write + +# --- Tests ------------------------------------------------------------------- +# Local suites run fast and coverage-free; the `ci` suite (called by the +# pipeline) adds coverage + an 80% gate and excludes db-marked tests. +# +# Run a suite: all/a (default), unit/u, integration/i, db/d, ci/c. +test suite="all": + #!/usr/bin/env bash + case "{{suite}}" in + all|a) uv run pytest tests/ ;; + integration|i) uv run pytest tests/integration/ -m "not db" ;; + unit|u) uv run pytest tests/unit/ ;; + db|d) uv run pytest tests/integration/db/ -m db ;; + ci|c) uv run pytest tests/unit tests/integration -m "not db" \ + --cov={{cov_pkg}} --cov-report=xml --cov-report=term-missing ;; + *) echo "unknown suite '{{suite}}' — use: all/a, integration/i, unit/u, db/d, ci/c" && exit 1 ;; + esac + +# Everything CI runs, in CI order — run locally before pushing. +ci: install lock-check lint format-check typecheck (test "ci") From a2936274e1dcb386ae3093cf1fcd7b3862e50640 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 22 Jun 2026 15:56:58 -0700 Subject: [PATCH 172/591] CI now tolerates different tech stacks in sub-repos and passes old stacks gracefully. Relies on justfiles and declaration within ci.yml --- .github/dependabot.yml | 82 ++++++++++++++++--------- .github/workflows/_python_ci.yml | 81 ++++++++++++++++++++++++ .github/workflows/ci.yml | 88 +++++++++++++++++++++++++++ .github/workflows/test-api-server.yml | 28 --------- 4 files changed, 223 insertions(+), 56 deletions(-) create mode 100644 .github/workflows/_python_ci.yml create mode 100644 .github/workflows/ci.yml delete mode 100644 .github/workflows/test-api-server.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 202fc48839..2957bd7ddc 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,30 +1,56 @@ version: 2 updates: -- package-ecosystem: docker - directory: "/mpcontribs-kernel-gateway" - schedule: - interval: weekly - time: '08:00' - timezone: US/Pacific - open-pull-requests-limit: 10 -- package-ecosystem: npm - directory: "/mpcontribs-portal" - schedule: - interval: weekly - time: '08:00' - timezone: US/Pacific - open-pull-requests-limit: 10 -- package-ecosystem: docker - directory: "/mpcontribs-portal" - schedule: - interval: weekly - time: '08:00' - timezone: US/Pacific - open-pull-requests-limit: 10 -- package-ecosystem: docker - directory: "/mpcontribs-api" - schedule: - interval: weekly - time: '08:00' - timezone: US/Pacific - open-pull-requests-limit: 10 + # --- GitHub Actions: keep workflow action versions current --- + - package-ecosystem: github-actions + directory: "/" + schedule: + interval: weekly + time: "08:00" + timezone: US/Pacific + groups: + actions: + patterns: ["*"] + open-pull-requests-limit: 10 + + # --- Python via uv: monitors pyproject.toml + uv.lock -------- + - package-ecosystem: uv + directory: "/mpcontribs-api" + schedule: + interval: weekly + time: "08:00" + timezone: US/Pacific + groups: + python-minor-patch: + patterns: ["*"] + update-types: ["minor", "patch"] + open-pull-requests-limit: 10 + + # --- Existing entries ---------------------------------------- + - package-ecosystem: docker + directory: "/mpcontribs-kernel-gateway" + schedule: + interval: weekly + time: "08:00" + timezone: US/Pacific + open-pull-requests-limit: 10 + - package-ecosystem: npm + directory: "/mpcontribs-portal" + schedule: + interval: weekly + time: "08:00" + timezone: US/Pacific + open-pull-requests-limit: 10 + - package-ecosystem: docker + directory: "/mpcontribs-portal" + schedule: + interval: weekly + time: "08:00" + timezone: US/Pacific + open-pull-requests-limit: 10 + - package-ecosystem: docker + directory: "/mpcontribs-api" + schedule: + interval: weekly + time: "08:00" + timezone: US/Pacific + open-pull-requests-limit: 10 diff --git a/.github/workflows/_python_ci.yml b/.github/workflows/_python_ci.yml new file mode 100644 index 0000000000..0add1e3009 --- /dev/null +++ b/.github/workflows/_python_ci.yml @@ -0,0 +1,81 @@ +# Reusable CI runner for sub-repos to rely on (see api_ci.yml for an example) +name: _python-ci + +on: + workflow_call: + inputs: + package: + description: "Package directory, e.g. mpcontribs-api" + required: true + type: string + python-version: + description: "Override Python version; empty = use the package's .python-version pin" + required: false + type: string + default: "" + coverage-artifact: + description: "Name for the uploaded coverage XML; empty = don't upload" + required: false + type: string + default: "" + +permissions: + contents: read + +jobs: + lint: + runs-on: ubuntu-latest + defaults: + run: + working-directory: ${{ inputs.package }} + steps: + - uses: actions/checkout@v4 + - uses: astral-sh/setup-uv@v3 + with: + enable-cache: true + cache-dependency-glob: "${{ inputs.package }}/uv.lock" + - uses: extractions/setup-just@v4 + - run: uv python install ${{ inputs.python-version }} + - run: just install + - run: just lint + - run: just format-check + - run: just lock-check + + typecheck: + runs-on: ubuntu-latest + defaults: + run: + working-directory: ${{ inputs.package }} + steps: + - uses: actions/checkout@v4 + - uses: astral-sh/setup-uv@v3 + with: + enable-cache: true + cache-dependency-glob: "${{ inputs.package }}/uv.lock" + - uses: extractions/setup-just@v4 + - run: uv python install ${{ inputs.python-version }} + - run: just install + - run: just typecheck + + test: + runs-on: ubuntu-latest + defaults: + run: + working-directory: ${{ inputs.package }} + steps: + - uses: actions/checkout@v4 + - uses: astral-sh/setup-uv@v3 + with: + enable-cache: true + cache-dependency-glob: "${{ inputs.package }}/uv.lock" + - uses: extractions/setup-just@v4 + - run: uv python install ${{ inputs.python-version }} + - run: just install + - run: just test ci + - name: Upload coverage + if: ${{ inputs.coverage-artifact != '' }} + uses: actions/upload-artifact@v4 + with: + name: ${{ inputs.coverage-artifact }} + path: ${{ inputs.package }}/coverage.xml + if-no-files-found: ignore diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000000..d85c3d4915 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,88 @@ +# Adding a package: once it has a uv-based justfile contract (install/lint/ +# format-check/typecheck/lock-check/test ci), add it to BOTH the paths-filter +# `filters` below AND the `config` map in the discover step. Until a package is +# migrated, leave it out - it stays covered by the legacy testing.yml instead. + +name: ci + +on: + pull_request: + branches: [master] + push: + branches: [master] + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +permissions: + contents: read + +jobs: + discover: + runs-on: ubuntu-latest + outputs: + packages: ${{ steps.build.outputs.packages }} + steps: + - uses: actions/checkout@v4 + - uses: dorny/paths-filter@v3 + id: filter + with: + filters: | + mpcontribs-api: + - 'mpcontribs-api/**' + - '.github/workflows/ci.yml' + - '.github/workflows/_python_ci.yml' + - name: Build matrix of changed (migrated) packages + id: build + env: + CHANGES: ${{ toJSON(steps.filter.outputs) }} + run: | + # Map of migrated package -> optional python-version override + # ("" = use the package's .python-version pin). Only packages whose + # filter reported a change are emitted into the matrix. + python3 - "$CHANGES" <<'PY' >> "$GITHUB_OUTPUT" + import json, sys + changes = json.loads(sys.argv[1]) + config = { + "mpcontribs-api": {"python-version": ""}, + # "mpcontribs-client": {"python-version": ""}, # add when migrated + } + include = [ + {"package": pkg, **cfg} + for pkg, cfg in config.items() + if changes.get(pkg) == "true" + ] + print("packages=" + json.dumps(include)) + PY + + ci: + needs: discover + if: ${{ needs.discover.outputs.packages != '[]' }} + strategy: + fail-fast: false + matrix: + include: ${{ fromJson(needs.discover.outputs.packages) }} + uses: ./.github/workflows/_python_ci.yml + with: + package: ${{ matrix.package }} + python-version: ${{ matrix.python-version }} + coverage-artifact: coverage-${{ matrix.package }} + + # Always-reporting aggregate gate. Make ONLY this a required status check + gate: + name: ci-success + if: always() + needs: [discover, ci] + runs-on: ubuntu-latest + steps: + - name: Verify CI result + run: | + result="${{ needs.ci.result }}" + # 'skipped' is success here: it means no migrated package needed checking. + if [ "$result" = "success" ] || [ "$result" = "skipped" ]; then + echo "CI gate passed (ci job: $result)" + exit 0 + fi + echo "CI gate failed (ci job: $result)" + exit 1 diff --git a/.github/workflows/test-api-server.yml b/.github/workflows/test-api-server.yml deleted file mode 100644 index aef8825d62..0000000000 --- a/.github/workflows/test-api-server.yml +++ /dev/null @@ -1,28 +0,0 @@ -name: Testing MPContribs API Server - -on: [push] - -jobs: - test: - runs-on: ubuntu-latest - - steps: - - name: Checkout repository - uses: actions/checkout@v4 - - - name: Install uv - uses: astral-sh/setup-uv@v3 - with: - enable-cache: true - - - name: Set up Python - run: uv python install - - - name: Install dependencies - run: uv sync --all-extras --dev - - - name: Run unit tests - run: uv run pytest tests/unit/ - - - name: Run integration tests - run: uv run pytest tests/integration/ -m "not db" From 14d596bd131b8c331ee86674ca96cd580092ca44 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 22 Jun 2026 16:41:19 -0700 Subject: [PATCH 173/591] fixed comments --- .github/workflows/_python_ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/_python_ci.yml b/.github/workflows/_python_ci.yml index 0add1e3009..09cc09bf53 100644 --- a/.github/workflows/_python_ci.yml +++ b/.github/workflows/_python_ci.yml @@ -1,4 +1,4 @@ -# Reusable CI runner for sub-repos to rely on (see api_ci.yml for an example) +# Reusable CI runner name: _python-ci on: From 0d122bc389da69fb095bcec872906faec47d60f9 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 22 Jun 2026 16:47:30 -0700 Subject: [PATCH 174/591] Changed docstring, imports, and added polars dep --- mpcontribs-api/pyproject.toml | 1 + .../domains/structures/models.py | 6 ++-- mpcontribs-api/uv.lock | 30 +++++++++++++++++++ 3 files changed, 33 insertions(+), 4 deletions(-) diff --git a/mpcontribs-api/pyproject.toml b/mpcontribs-api/pyproject.toml index b41f4935c7..bb45761135 100644 --- a/mpcontribs-api/pyproject.toml +++ b/mpcontribs-api/pyproject.toml @@ -48,6 +48,7 @@ dependencies = [ "fastapi-filter>=2.0.1", "aioboto3>=15.5.0", "types-aiobotocore[s3]>=3.7.0", + "polars>=1.41.2", ] [project.urls] diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py index 4fa5b53696..bf48bb8b54 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py @@ -4,7 +4,7 @@ from pymatgen.core import Element from mpcontribs_api.domains._shared.models import Component, ComponentIn, DocumentOut -from mpcontribs_api.domains._shared.types import FRAME_BSON_ENCODERS, MD5Hash, PolarsFrame +from mpcontribs_api.domains._shared.types import MD5Hash, PolarsFrame from mpcontribs_api.projection import SparseFieldsModel @@ -55,11 +55,10 @@ class Structure(Component): class Settings: name = "structures" - bson_encoders = FRAME_BSON_ENCODERS class StructureIn(ComponentIn): - """User-supplied structure content. ``_id`` and ``md5`` are server-assigned, so absent here.""" + """User-supplied structure content.""" lattice: Lattice sites: list[Site] @@ -78,7 +77,6 @@ class StructureOut(DocumentOut[PydanticObjectId]): @staticmethod def default_fields() -> list[str]: - # Light default; content (lattice/sites/charge/cif) is fetched via ?_fields=. return [ "id", "name", diff --git a/mpcontribs-api/uv.lock b/mpcontribs-api/uv.lock index b874098fbc..7aab864368 100644 --- a/mpcontribs-api/uv.lock +++ b/mpcontribs-api/uv.lock @@ -977,6 +977,7 @@ dependencies = [ { name = "opentelemetry-instrumentation-fastapi" }, { name = "opentelemetry-instrumentation-pymongo" }, { name = "opentelemetry-sdk" }, + { name = "polars" }, { name = "pydantic-settings" }, { name = "pymatgen" }, { name = "pymongo" }, @@ -1006,6 +1007,7 @@ requires-dist = [ { name = "opentelemetry-instrumentation-fastapi", specifier = ">=0.63b1" }, { name = "opentelemetry-instrumentation-pymongo", specifier = ">=0.63b1" }, { name = "opentelemetry-sdk", specifier = ">=1.42.1" }, + { name = "polars", specifier = ">=1.41.2" }, { name = "pydantic-settings", specifier = ">=2.14.1" }, { name = "pymatgen" }, { name = "pymongo", specifier = ">=4.17.0" }, @@ -1417,6 +1419,34 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/54/20/4d324d65cc6d9205fabedc306948156824eb9f0ee1633355a8f7ec5c66bf/pluggy-1.6.0-py3-none-any.whl", hash = "sha256:e920276dd6813095e9377c0bc5566d94c932c33b27a3e3945d8389c374dd4746", size = 20538, upload-time = "2025-05-15T12:30:06.134Z" }, ] +[[package]] +name = "polars" +version = "1.41.2" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "polars-runtime-32" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/ff/f9/aeda46259b0669247a160315d2d51269de9504b9dd2f70acadbcb22f46b7/polars-1.41.2.tar.gz", hash = "sha256:256d6731162371b77f3f29a55eacb8c0fc740ddb1a293a01d2ef5b5393c5c708", size = 737996, upload-time = "2026-05-29T17:39:15.604Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/1f/22/28f62d24f7db56ac4343588f9362d49b7b4177e55ac47a466fe696b0099b/polars-1.41.2-py3-none-any.whl", hash = "sha256:23ce9a2910b6e3e8d4258770bf44aa17170958df7af6e85feedf4458a04d8d29", size = 833445, upload-time = "2026-05-29T17:37:05.576Z" }, +] + +[[package]] +name = "polars-runtime-32" +version = "1.41.2" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/f9/56/54e3ea0e9b64f327179049e4742241cc6b1d3e8fa414b05a057dd26df367/polars_runtime_32-1.41.2.tar.gz", hash = "sha256:7af09ec1ab053da2c9669e8d15f809a4083a29be05db57111688b8051062af56", size = 2989474, upload-time = "2026-05-29T17:39:17.257Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/d6/9b/fe72a3811c0357cdb06c67bdc7695fa1623ad47948fc523195f5ac31037f/polars_runtime_32-1.41.2-cp310-abi3-macosx_10_12_x86_64.whl", hash = "sha256:95a08346dac337357cdb825c8076df7d36da54c4caa59a5cb41d0a30691c5edd", size = 52265283, upload-time = "2026-05-29T17:37:09.407Z" }, + { url = "https://files.pythonhosted.org/packages/0a/93/fab9da803fd80d9e83ef88c20932f637a10bc611b20415fc322eec84bc44/polars_runtime_32-1.41.2-cp310-abi3-macosx_11_0_arm64.whl", hash = "sha256:dedfaeec2c7f995298da7319dd9431d662e5dd1d0ec51b1459df4a0234ceff52", size = 46571222, upload-time = "2026-05-29T17:37:13.698Z" }, + { url = "https://files.pythonhosted.org/packages/c8/2a/8843f34a8ac57acd058a39b87b03b580dd352a490e9dae0415e02033bdd4/polars_runtime_32-1.41.2-cp310-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:18eea22c5cc34e27f8a60950458ad81e6a9ea75e89363ca1367e14e7e7f781fc", size = 50409372, upload-time = "2026-05-29T17:37:17.875Z" }, + { url = "https://files.pythonhosted.org/packages/6c/c6/92b352fe88cf51bd0a19fb99e1c0cbe46aa26c14dcf7995b89869cd932ae/polars_runtime_32-1.41.2-cp310-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2630540dfdfb0f36f9b04a07c7c2e3f50bf2ad384113263c1c812007ee9141e0", size = 56405484, upload-time = "2026-05-29T17:37:22.684Z" }, + { url = "https://files.pythonhosted.org/packages/74/c4/bae3174c3b02f6b441d2e58594387abcd509f67a098f682a83b195f08966/polars_runtime_32-1.41.2-cp310-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:20e969e08f9b137e233c04cc04de73d9795f89eb77d34854e40a025965a43763", size = 50603512, upload-time = "2026-05-29T17:37:27.422Z" }, + { url = "https://files.pythonhosted.org/packages/f4/ed/f2d26ae02d92c2689056838ed59e2a626326ad23c2831d58637d25f6c82a/polars_runtime_32-1.41.2-cp310-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:e7016a3deb641b64a31447abbbee0f34bd020a6a9ae34ee6b743837def15e2a4", size = 54328561, upload-time = "2026-05-29T17:37:32.587Z" }, + { url = "https://files.pythonhosted.org/packages/9b/c4/9c3831cc885dc7769e59abf8f583821a5fb4403fd0e4eba0ccc6d47a3d4b/polars_runtime_32-1.41.2-cp310-abi3-win_amd64.whl", hash = "sha256:1e5e5377c315e0dcafdfb2a31adc546abbaeb3f9cb1864e6536523d2af473265", size = 51978643, upload-time = "2026-05-29T17:37:37.443Z" }, + { url = "https://files.pythonhosted.org/packages/cd/c6/79e9f3f270270d7ed5575d92b7bfef49f01abd9275447161275b23b553a8/polars_runtime_32-1.41.2-cp310-abi3-win_arm64.whl", hash = "sha256:843d96f69d18eca53429c1198e58891db7f18111f83b9c419bb45ad9d73eaed5", size = 46006901, upload-time = "2026-05-29T17:37:42.522Z" }, +] + [[package]] name = "propcache" version = "0.5.2" From 10ce39376c34d71c537cc543f6b17f8422c760c8 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Tue, 23 Jun 2026 16:15:05 -0700 Subject: [PATCH 175/591] Commented out unused dependencies --- .../src/mpcontribs_api/dependencies.py | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/dependencies.py b/mpcontribs-api/src/mpcontribs_api/dependencies.py index 1d55c2e5b7..cadf3d0013 100644 --- a/mpcontribs-api/src/mpcontribs_api/dependencies.py +++ b/mpcontribs-api/src/mpcontribs_api/dependencies.py @@ -8,10 +8,7 @@ from types_aiobotocore_s3 import S3Client from mpcontribs_api.authz import User -from mpcontribs_api.exceptions import ( - AuthenticationError, - PermissionError, -) +from mpcontribs_api.exceptions import AuthenticationError def get_db(request: Request) -> AsyncDatabase: @@ -61,7 +58,6 @@ def get_user(request: Request) -> User: groups=frozenset(groups), ) structlog.contextvars.bind_contextvars( - username=user.username, consumer_id=user.consumer_id, is_admin=user.is_admin, ) @@ -77,13 +73,13 @@ def require_user(user: UserDep) -> User: return user -AuthedDep = Annotated[User, Depends(require_user)] +# AuthedDep = Annotated[User, Depends(require_user)] -def require_role(role: str): - def checker(user: AuthedDep) -> User: - if not user.has_role(role): - raise PermissionError(required_role=role) - return user +# def require_role(role: str): +# def checker(user: AuthedDep) -> User: +# if not user.has_role(role): +# raise PermissionError(required_role=role) +# return user - return Annotated[User, Depends(checker)] +# return Annotated[User, Depends(checker)] From dbb8c2841750041c49403b60a16614d88810cc81 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 24 Jun 2026 10:51:35 -0700 Subject: [PATCH 176/591] Added custom Access logging in line with previous format. --- .../src/mpcontribs_api/exceptions.py | 21 ++++- mpcontribs-api/src/mpcontribs_api/logging.py | 10 ++- .../src/mpcontribs_api/middleware.py | 89 +++++++++++++++++-- 3 files changed, 113 insertions(+), 7 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/exceptions.py b/mpcontribs-api/src/mpcontribs_api/exceptions.py index fc0d1fbb7d..1a47a50826 100644 --- a/mpcontribs-api/src/mpcontribs_api/exceptions.py +++ b/mpcontribs-api/src/mpcontribs_api/exceptions.py @@ -8,11 +8,25 @@ from fastapi.encoders import jsonable_encoder from fastapi.exceptions import RequestValidationError from fastapi.responses import JSONResponse +from opentelemetry import trace +from opentelemetry.trace import Status, StatusCode from starlette.exceptions import HTTPException as StarletteHTTPException logger = structlog.get_logger(__name__) +def _record_on_span(exc: Exception) -> None: + """Attach a server-side exception to the active OTel span so APM error views show the stack. + + No-op when there is no recording span (telemetry disabled or no active span), since the + sentinel span returned in that case reports ``is_recording() == False``. + """ + span = trace.get_current_span() + if span.is_recording(): + span.record_exception(exc) + span.set_status(Status(StatusCode.ERROR, str(exc))) + + class AppError(Exception): """Base for all application-level domain errors. @@ -78,6 +92,7 @@ def register_exception_handlers(app: FastAPI) -> None: @app.exception_handler(AppError) async def _handle_app_error(request: Request, exc: AppError) -> JSONResponse: if exc.status_code >= 500: + _record_on_span(exc) logger.error(exc.error_code, status_code=exc.status_code, exc_info=exc, **exc.context) else: logger.info(exc.error_code, status_code=exc.status_code, **exc.context) @@ -95,6 +110,7 @@ async def _handle_app_error(request: Request, exc: AppError) -> JSONResponse: # Catch-all for anything that isn't an AppError - bugs, unexpected failures. @app.exception_handler(Exception) async def _handle_unexpected(request: Request, exc: Exception) -> JSONResponse: + _record_on_span(exc) logger.exception("unhandled_exception") # full traceback return JSONResponse( status_code=500, @@ -115,7 +131,10 @@ async def _handle_validation(_request: Request, exc: RequestValidationError) -> # Unify http exceptions from starlette with our exception format @app.exception_handler(StarletteHTTPException) - async def _handle_http(request, exc): + async def _handle_http(request: Request, exc: StarletteHTTPException) -> JSONResponse: + if exc.status_code >= 500: + _record_on_span(exc) + logger.error("http_error", status_code=exc.status_code, exc_info=exc) return JSONResponse( status_code=exc.status_code, content=_error_body("http_error", str(exc.detail)), diff --git a/mpcontribs-api/src/mpcontribs_api/logging.py b/mpcontribs-api/src/mpcontribs_api/logging.py index 2c741c5b03..6cf2bcb4c1 100644 --- a/mpcontribs-api/src/mpcontribs_api/logging.py +++ b/mpcontribs-api/src/mpcontribs_api/logging.py @@ -133,11 +133,19 @@ def configure_logging(settings: Settings) -> None: root.setLevel(log_level) # Let uvicorn's loggers flow through the root handler instead of their own. - for name in ("uvicorn", "uvicorn.error", "uvicorn.access"): + for name in ("uvicorn", "uvicorn.error"): lg = logging.getLogger(name) lg.handlers = [] lg.propagate = True + # Silence uvicorn's default access log: RequestContextMiddleware emits our own structured access + # event with status/size/duration and Datadog standard attributes. disabled=True suppresses it + # regardless of uvicorn's --access-log flag, so the two never double-log. + access = logging.getLogger("uvicorn.access") + access.handlers = [] + access.propagate = False + access.disabled = True + def get_logger(name: str | None = None): return structlog.get_logger(name) diff --git a/mpcontribs-api/src/mpcontribs_api/middleware.py b/mpcontribs-api/src/mpcontribs_api/middleware.py index a313b6545c..152fa6e3fb 100644 --- a/mpcontribs-api/src/mpcontribs_api/middleware.py +++ b/mpcontribs-api/src/mpcontribs_api/middleware.py @@ -1,5 +1,5 @@ -from __future__ import annotations - +import os +import time import uuid from collections.abc import Iterable from typing import TYPE_CHECKING @@ -13,10 +13,10 @@ from opentelemetry.sdk.metrics.export import PeriodicExportingMetricReader from opentelemetry.sdk.trace import TracerProvider from opentelemetry.sdk.trace.export import BatchSpanProcessor -from starlette.types import ASGIApp, Receive, Scope, Send +from starlette.types import ASGIApp, Message, Receive, Scope, Send from mpcontribs_api.config import Settings -from mpcontribs_api.logging import build_resource +from mpcontribs_api.logging import build_resource, get_logger if TYPE_CHECKING: from fastapi import FastAPI @@ -25,6 +25,18 @@ # double-instrumenting pymongo. _configured = False +# Dedicated access logger. Emits one structured event per request (see RequestContextMiddleware); +# flows through the same root handlers as everything else (stdout + OTLP when enabled). +_access_logger = get_logger("access") + +# Process identity, matching the old gunicorn ``{group}/{process}`` prefix and ``%(p)s`` pid. The +# SUPERVISOR_* vars are absent outside supervisord (dev, tests), so these render null there. +_PROCESS = { + "name": os.getenv("SUPERVISOR_PROCESS_NAME"), + "group": os.getenv("SUPERVISOR_GROUP_NAME"), + "id": os.getpid(), +} + # Lowercased ASGI byte header name -> structlog context key. _LOGGED_HEADERS: dict[bytes, str] = { b"user-agent": "user_agent", @@ -38,6 +50,16 @@ class RequestContextMiddleware: + """Bind per-request structlog context and emit one structured access log per HTTP request. + + The two concerns live together because both need the request headers parsed once, and this is + the outermost app middleware, so it observes the final status code, total response bytes, and + full request duration. The access event uses Datadog standard attribute names (``http.*``, + ``network.*``, ``duration`` in nanoseconds) so the existing Datadog log pipeline (URL parser, + User-Agent parser, status-category, date remapper) regenerates the same enriched surface the old + gunicorn access logs had. + """ + def __init__(self, app: ASGIApp) -> None: self.app = app @@ -69,7 +91,64 @@ async def __call__(self, scope: Scope, receive: Receive, send: Send) -> None: structlog.contextvars.clear_contextvars() structlog.contextvars.bind_contextvars(**context) - await self.app(scope, receive, send) + # Capture the final status and body size by wrapping send; the app may call send many times + # (streaming/chunked), so body bytes accumulate across http.response.body messages. + status_code = 0 + bytes_written = 0 + + async def send_wrapper(message: Message) -> None: + nonlocal status_code, bytes_written + if message["type"] == "http.response.start": + status_code = message["status"] + elif message["type"] == "http.response.body": + bytes_written += len(message.get("body", b"")) + await send(message) + + start = time.perf_counter() + try: + await self.app(scope, receive, send_wrapper) + except Exception: + # An exception escaped the app's own handlers (e.g. raised in outer middleware or after + # the response had started, so the catch-all never ran). Record it as a 500 instead of + # the sentinel 0 so status-based alerting still fires, then re-raise unchanged. + if status_code == 0: + status_code = 500 + raise + finally: + self._emit_access_log(scope, headers, status_code, bytes_written, start) + + @staticmethod + def _emit_access_log( + scope: Scope, + headers: dict[bytes, bytes], + status_code: int, + bytes_written: int, + start: float, + ) -> None: + duration_ns = int((time.perf_counter() - start) * 1e9) + query_string = scope.get("query_string", b"").decode("latin-1") + path = scope["path"] + url = f"{path}?{query_string}" if query_string else path + # True client IP behind Kong: first X-Forwarded-For hop if present, else the direct peer (which is Kong itself) + forwarded_for = headers.get(b"x-forwarded-for", b"").decode("latin-1") + client = scope.get("client") + client_ip = forwarded_for.split(",")[0].strip() if forwarded_for else (client[0] if client else "") + + _access_logger.info( + "http.access", + http={ + "method": scope["method"], + "status_code": status_code, + "url": url, + "referer": headers.get(b"referer", b"-").decode("latin-1"), + "useragent": headers.get(b"user-agent", b"").decode("latin-1"), + "version": scope.get("http_version", "1.1"), + }, + network={"bytes_written": bytes_written, "client": {"ip": client_ip}}, + duration=duration_ns, # Datadog standard `duration` is nanoseconds + response_time=duration_ns // 1000, # microseconds, matches the old gunicorn %(D)s + process=_PROCESS, + ) def configure_tracing(settings: Settings) -> None: From 17e67f7469839f08bb5716ebaa97d42dfc780e36 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 24 Jun 2026 10:52:07 -0700 Subject: [PATCH 177/591] pass exc_info through to logger on upsert error --- .../src/mpcontribs_api/domains/contributions/service.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py index dd9bb350c6..1ac0489217 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py @@ -295,7 +295,9 @@ async def _bounded_upsert(index: int, contrib: ContributionIn) -> Contribution | try: return await self._contributions.upsert_contribution_by_identifiers(contrib.identifiers(), contrib) except Exception as exc: - logger.error("upsert_contribution_failed", index=index, identifier=contrib.identifiers()) + logger.error( + "upsert_contribution_failed", index=index, identifier=contrib.identifiers(), exc_info=True + ) return bulk_failure_from_exception(index, contrib.identifiers(), exc) results = await asyncio.gather(*[_bounded_upsert(i, c) for i, c in enumerate(contributions)]) From dd257b34c1430e1fd50445ef6d637fdc8604177d Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 24 Jun 2026 13:41:00 -0700 Subject: [PATCH 178/591] Added log_level to errors --- .../src/mpcontribs_api/exceptions.py | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/exceptions.py b/mpcontribs-api/src/mpcontribs_api/exceptions.py index 1a47a50826..d3fc03a199 100644 --- a/mpcontribs-api/src/mpcontribs_api/exceptions.py +++ b/mpcontribs-api/src/mpcontribs_api/exceptions.py @@ -1,5 +1,6 @@ from __future__ import annotations +import logging from collections.abc import Sequence from typing import Any @@ -38,6 +39,10 @@ class AppError(Exception): # them off the type without instantiating special-casing. status_code: int = 500 error_code: str = "internal_error" # stable, machine-readable + # Optional stdlib log level override. None => the handler derives it from status_code + # (ERROR for 5xx, INFO for 4xx). Set on a subclass to promote a notable client error, + # e.g. WARNING for auth failures so they're alertable without logging every 404. + log_level: int | None = None def __init__(self, message: str | None = None, **context): self.message = message or self.__class__.__name__ @@ -48,26 +53,31 @@ def __init__(self, message: str | None = None, **context): class NotFoundError(AppError): status_code = 404 error_code = "not_found" + log_level = logging.INFO class ConflictError(AppError): status_code = 409 error_code = "conflict" + log_level = logging.INFO class ValidationError(AppError): status_code = 422 error_code = "validation_error" + log_level = logging.INFO class PermissionError(AppError): status_code = 403 error_code = "permission_denied" + log_level = logging.WARNING # security-relevant: alertable, but not a server fault class AuthenticationError(AppError): status_code = 401 error_code = "authentication_error" + log_level = logging.WARNING # security-relevant: alertable, but not a server fault def _error_body(error_code: str, message: str, **public_context) -> dict: @@ -91,11 +101,15 @@ def register_exception_handlers(app: FastAPI) -> None: @app.exception_handler(AppError) async def _handle_app_error(request: Request, exc: AppError) -> JSONResponse: - if exc.status_code >= 500: + is_server_fault = exc.status_code >= 500 + level = exc.log_level if exc.log_level is not None else (logging.ERROR if is_server_fault else logging.INFO) + if is_server_fault: + # Only genuine server faults carry a traceback and mark the span; client errors + # (incl. opt-in WARNING ones like auth failures) are expected and need neither. _record_on_span(exc) - logger.error(exc.error_code, status_code=exc.status_code, exc_info=exc, **exc.context) + logger.log(level, exc.error_code, status_code=exc.status_code, exc_info=exc, **exc.context) else: - logger.info(exc.error_code, status_code=exc.status_code, **exc.context) + logger.log(level, exc.error_code, status_code=exc.status_code, **exc.context) return JSONResponse( status_code=exc.status_code, content=_error_body( From 0cf8e8f630e2cd1c80c582ec36a939cdd4e291dc Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 24 Jun 2026 16:11:42 -0700 Subject: [PATCH 179/591] Moved healthcheck router to healthcheck instead of health --- mpcontribs-api/src/mpcontribs_api/app.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mpcontribs-api/src/mpcontribs_api/app.py b/mpcontribs-api/src/mpcontribs_api/app.py index 2fd4c80fa6..e51429657d 100644 --- a/mpcontribs-api/src/mpcontribs_api/app.py +++ b/mpcontribs-api/src/mpcontribs_api/app.py @@ -120,7 +120,7 @@ def create_app(settings: Settings | None = None) -> FastAPI: # Emit server-side request spans/metrics (no-op when telemetry is disabled). instrument_app(app, settings) register_exception_handlers(app) - app.include_router(healthcheck_router, prefix="/health") + app.include_router(healthcheck_router, prefix="/healthcheck") app.include_router(v1_router, prefix="/api/v1") return app From e1096e59ea1309bf539ec7db2ea9401d5d31af6d Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 24 Jun 2026 16:13:26 -0700 Subject: [PATCH 180/591] Added 'version' to healthcheck for backwards compat --- .../src/mpcontribs_api/domains/healthcheck/router.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/healthcheck/router.py b/mpcontribs-api/src/mpcontribs_api/domains/healthcheck/router.py index 88abea6a91..64bbb69fe1 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/healthcheck/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/healthcheck/router.py @@ -11,6 +11,7 @@ class HealthStatus(BaseModel): + version: str status: str mongo: str s3: str @@ -34,4 +35,4 @@ async def healthcheck(db: DbDep, s3_client: S3Dep) -> HealthStatus: detail={"status": "unhealthy", "s3": "unreachable"}, ) from None - return HealthStatus(status="healthy", mongo="ok", s3="ok") + return HealthStatus(version=settings.version, status="healthy", mongo="ok", s3="ok") From cb5d2990620bcda6eeca898991fd08b0fd3bd885 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 25 Jun 2026 09:39:33 -0700 Subject: [PATCH 181/591] Added user to contribution service and threaded user into repo to check that the user can modify/insert contributions only under their projects --- .../domains/contributions/dependencies.py | 1 + .../domains/contributions/repository.py | 5 ++ .../domains/contributions/service.py | 78 ++++++++++++++++--- 3 files changed, 73 insertions(+), 11 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/dependencies.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/dependencies.py index b049f32c2c..b0cce8e0df 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/dependencies.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/dependencies.py @@ -22,6 +22,7 @@ def get_scoped_contributions(user: UserDep) -> MongoDbContributionRepository: def get_contribution_service(user: UserDep, client: MongoClientDep) -> ContributionService: return ContributionService( client=client, + user=user, contributions=MongoDbContributionRepository(user), structures=MongoDbStructureRepository(user), attachments=MongoDbAttachmentRepository(user), diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py index 8530dcb5d3..ab98ee9b2d 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py @@ -18,6 +18,7 @@ ContributionOut, ContributionPatch, ) +from mpcontribs_api.exceptions import PermissionError from mpcontribs_api.pagination import CursorParams @@ -207,6 +208,10 @@ async def upsert_contribution_by_identifiers( Returns: Contribution: the document as it stands after the operation """ + # Make sure the user is allowed to upsert a contribution under the provided project + if not self._user.is_admin and identifiers["project"] not in self._user.groups: + raise PermissionError(f"not authorized to write to project '{identifiers['project']}'") + doc = self.document_model.from_input_model(contribution) update_data = doc.model_dump(exclude={"id"}, exclude_none=True) query = self.document_model.find_one( diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py index 1ac0489217..b0ff084d98 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py @@ -1,5 +1,6 @@ import asyncio from collections import defaultdict +from collections.abc import Iterable from typing import cast import structlog @@ -8,6 +9,7 @@ from pymongo.asynchronous.client_session import AsyncClientSession from pymongo.errors import BulkWriteError +from mpcontribs_api.authz import User from mpcontribs_api.config import MongoSettings, get_settings from mpcontribs_api.domains._shared.bulk import ( BulkDeleteSummary, @@ -23,7 +25,7 @@ from mpcontribs_api.domains.structures.repository import MongoDbStructureRepository from mpcontribs_api.domains.tables.models import Table from mpcontribs_api.domains.tables.repository import MongoDbTableRepository -from mpcontribs_api.exceptions import AppError, ValidationError +from mpcontribs_api.exceptions import AppError, PermissionError, ValidationError from mpcontribs_api.pagination import CursorParams logger = structlog.get_logger(__name__) @@ -33,6 +35,7 @@ class ContributionService: def __init__( self, client: AsyncMongoClient, + user: User, contributions: MongoDbContributionRepository, structures: MongoDbStructureRepository, attachments: MongoDbAttachmentRepository, @@ -40,6 +43,7 @@ def __init__( settings: MongoSettings | None = None, ): self._client = client + self._user = user self._contributions = contributions self._structures = structures self._attachments = attachments @@ -80,7 +84,7 @@ async def insert_contributions( self._reject_duplicate_keys(contributions) - oversize_failures, remaining_indices = self._split_oversize(contributions) + failures, remaining_indices = self._split_contributions(contributions) no_comp_indices = [i for i in remaining_indices if not contributions[i].has_components()] with_comp_indices = [i for i in remaining_indices if contributions[i].has_components()] @@ -95,7 +99,7 @@ async def insert_contributions( succeeded = [doc for _, doc in sorted(no_comp_succeeded + with_comp_succeeded, key=lambda p: p[0])] failed = sorted( - oversize_failures + no_comp_failed + with_comp_failed, + failures + no_comp_failed + with_comp_failed, key=lambda f: f.index, ) return BulkWriteSummary[Contribution](total=len(contributions), succeeded=succeeded, failed=failed) @@ -120,24 +124,61 @@ def _reject_duplicate_keys(self, contributions: list[ContributionIn]) -> None: contribution_indices=duplicates, ) - def _split_oversize(self, contributions: list[ContributionIn]) -> tuple[list[BulkFailure], list[int]]: + def _split_unauthorized( + self, + indices: Iterable[int], + contributions: list[ContributionIn], + ) -> tuple[list[BulkFailure], list[int]]: + """Reject contributions whose ``project`` the current user is not permitted to write. + + Authorized iff the user is an admin (writes anything) or the contribution's ``project`` is + one of the user's groups. Anonymous users are blocked at the router, but carry no groups and + are not admins, so they fall through to authorized-for-nothing here (defense-in-depth). + + Partitions ``indices`` into unauthorized ``BulkFailure`` entries and the remaining authorized + indices that should proceed. Mirrors ``_split_oversize`` (same shape) so callers can chain + the splits and keep each index in exactly one bucket, preserving input ordering. + """ + unauthorized: list[BulkFailure] = [] + remaining: list[int] = [] + for i in indices: + contrib = contributions[i] + if self._user.is_admin or contrib.project in self._user.groups: + remaining.append(i) + else: + unauthorized.append( + BulkFailure( + index=i, + identifier=contrib.identifiers(), + error_code=PermissionError.error_code, + message=f"not authorized to write to project '{contrib.project}'", + ) + ) + return unauthorized, remaining + + def _split_oversize( + self, + indices: Iterable[int], + contributions: list[ContributionIn], + ) -> tuple[list[BulkFailure], list[int]]: """Reject contributions whose component count exceeds the per-contribution ceiling. - Returns the failure entries for the oversize items and the indices of the remaining items - that should proceed to Mongo. Doing this upfront avoids burning a transaction slot on a - request guaranteed to exceed transactionLifetimeLimitSeconds. + Partitions ``indices`` into oversize ``BulkFailure`` entries and the remaining indices that + should proceed to Mongo. Doing this upfront avoids burning a transaction slot on a request + guaranteed to exceed transactionLifetimeLimitSeconds. """ cap = self._settings.max_components_per_contribution oversize: list[BulkFailure] = [] remaining: list[int] = [] - for i, contrib in enumerate(contributions): + for i in indices: + contrib = contributions[i] count = contrib.component_count() if count > cap: oversize.append( BulkFailure( index=i, identifier=contrib.identifiers(), - error_code="validation_error", + error_code=ValidationError.error_code, message=f"contribution has {count} components, exceeds cap of {cap}. " "Recommend inserting the component alone, followed by bulk inserts of components", ) @@ -146,6 +187,19 @@ def _split_oversize(self, contributions: list[ContributionIn]) -> tuple[list[Bul remaining.append(i) return oversize, remaining + def _split_contributions(self, contributions) -> tuple[list[BulkFailure], list[int]]: + """Common method for validating contribution write failure logic + + Returns: + tuple[list[BulkFailure], list[int]]: a tuple containing a list of failures and their reasons, + and the indices of valid contributions from 'contributions' to write + """ + # Per-item project authorization (see _split_unauthorized for the per-item vs fail-fast + # decision). Only authorized items reach Mongo; the rest are reported in ``failed``. + unauthorized_failures, authorized_indices = self._split_unauthorized(range(len(contributions)), contributions) + oversize_failures, remaining_indices = self._split_oversize(authorized_indices, contributions) + return (unauthorized_failures + oversize_failures, remaining_indices) + async def _insert_no_components( self, indices: list[int], @@ -288,6 +342,8 @@ async def upsert_contributions(self, contributions: list[ContributionIn]) -> Bul contribution_indices=indices_with_components, ) + failures, remaining_indices = self._split_contributions(contributions) + sem = asyncio.Semaphore(self._settings.max_concurrent_transactions) async def _bounded_upsert(index: int, contrib: ContributionIn) -> Contribution | BulkFailure: @@ -300,9 +356,9 @@ async def _bounded_upsert(index: int, contrib: ContributionIn) -> Contribution | ) return bulk_failure_from_exception(index, contrib.identifiers(), exc) - results = await asyncio.gather(*[_bounded_upsert(i, c) for i, c in enumerate(contributions)]) + results = await asyncio.gather(*[_bounded_upsert(i, contributions[i]) for i in remaining_indices]) succeeded = [r for r in results if not isinstance(r, BulkFailure)] - failed = [r for r in results if isinstance(r, BulkFailure)] + failed = failures + [r for r in results if isinstance(r, BulkFailure)] return BulkWriteSummary[Contribution](total=len(contributions), succeeded=succeeded, failed=failed) async def delete_contributions(self, filter: ContributionFilter) -> BulkDeleteSummary: From ad1eb943cd8c5d7e6a57df69f9397cd35afbb978 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 25 Jun 2026 09:40:06 -0700 Subject: [PATCH 182/591] Added tests for user-contribution validation and modified healthcheck tests to reflect new healthcheck shape --- .../tests/integration/test_healthcheck.py | 26 +++--- .../unit/domains/test_contribution_service.py | 93 +++++++++++++++++++ 2 files changed, 106 insertions(+), 13 deletions(-) diff --git a/mpcontribs-api/tests/integration/test_healthcheck.py b/mpcontribs-api/tests/integration/test_healthcheck.py index a7810fcefc..f98ca854f3 100644 --- a/mpcontribs-api/tests/integration/test_healthcheck.py +++ b/mpcontribs-api/tests/integration/test_healthcheck.py @@ -36,7 +36,7 @@ def _make_s3(head_ok: bool) -> MagicMock: def health_app() -> FastAPI: app = FastAPI() register_exception_handlers(app) - app.include_router(healthcheck_router, prefix="/health") + app.include_router(healthcheck_router, prefix="/healthcheck") return app @@ -53,21 +53,21 @@ def _client(app: FastAPI, db: MagicMock, s3: MagicMock | None = None) -> TestCli class TestHealthcheckHealthy: def test_returns_200(self, health_app): - r = _client(health_app, _make_db(ping_ok=True), _make_s3(head_ok=True)).get("/health") + r = _client(health_app, _make_db(ping_ok=True), _make_s3(head_ok=True)).get("/healthcheck") assert r.status_code == 200 def test_body_reports_healthy(self, health_app): - r = _client(health_app, _make_db(ping_ok=True), _make_s3(head_ok=True)).get("/health") - assert r.json() == {"status": "healthy", "mongo": "ok", "s3": "ok"} + r = _client(health_app, _make_db(ping_ok=True), _make_s3(head_ok=True)).get("/healthcheck") + assert r.json() == {"version": "0.0.0-dev", "status": "healthy", "mongo": "ok", "s3": "ok"} def test_pings_mongo(self, health_app): db = _make_db(ping_ok=True) - _client(health_app, db, _make_s3(head_ok=True)).get("/health") + _client(health_app, db, _make_s3(head_ok=True)).get("/healthcheck") db.client.admin.command.assert_awaited_once_with("ping") def test_probes_s3(self, health_app): s3 = _make_s3(head_ok=True) - _client(health_app, _make_db(ping_ok=True), s3).get("/health") + _client(health_app, _make_db(ping_ok=True), s3).get("/healthcheck") s3.head_bucket.assert_awaited_once() @@ -78,13 +78,13 @@ def test_probes_s3(self, health_app): class TestHealthcheckMongoUnhealthy: def test_returns_503(self, health_app): - r = _client(health_app, _make_db(ping_ok=False)).get("/health") + r = _client(health_app, _make_db(ping_ok=False)).get("/healthcheck") assert r.status_code == 503 def test_body_reports_unreachable(self, health_app): # The StarletteHTTPException handler reshapes the response into the # standard error envelope, stringifying the detail dict into `message`. - r = _client(health_app, _make_db(ping_ok=False)).get("/health") + r = _client(health_app, _make_db(ping_ok=False)).get("/healthcheck") message = r.json()["error"]["message"] assert "unhealthy" in message assert "unreachable" in message @@ -92,13 +92,13 @@ def test_body_reports_unreachable(self, health_app): def test_ping_failure_does_not_leak_exception_text(self, health_app): # The raised HTTPException carries a controlled detail dict, not the # underlying "mongo down" ConnectionError message. - r = _client(health_app, _make_db(ping_ok=False)).get("/health") + r = _client(health_app, _make_db(ping_ok=False)).get("/healthcheck") assert "mongo down" not in r.text def test_s3_not_probed_when_mongo_down(self, health_app): # Mongo is checked first; a failure short-circuits before S3 is touched. s3 = _make_s3(head_ok=True) - _client(health_app, _make_db(ping_ok=False), s3).get("/health") + _client(health_app, _make_db(ping_ok=False), s3).get("/healthcheck") s3.head_bucket.assert_not_awaited() @@ -109,16 +109,16 @@ def test_s3_not_probed_when_mongo_down(self, health_app): class TestHealthcheckS3Unhealthy: def test_returns_503(self, health_app): - r = _client(health_app, _make_db(ping_ok=True), _make_s3(head_ok=False)).get("/health") + r = _client(health_app, _make_db(ping_ok=True), _make_s3(head_ok=False)).get("/healthcheck") assert r.status_code == 503 def test_body_reports_unreachable(self, health_app): - r = _client(health_app, _make_db(ping_ok=True), _make_s3(head_ok=False)).get("/health") + r = _client(health_app, _make_db(ping_ok=True), _make_s3(head_ok=False)).get("/healthcheck") message = r.json()["error"]["message"] assert "unhealthy" in message assert "unreachable" in message def test_s3_failure_does_not_leak_exception_text(self, health_app): # The controlled detail dict is returned, not the underlying boto error text. - r = _client(health_app, _make_db(ping_ok=True), _make_s3(head_ok=False)).get("/health") + r = _client(health_app, _make_db(ping_ok=True), _make_s3(head_ok=False)).get("/healthcheck") assert "s3 down" not in r.text diff --git a/mpcontribs-api/tests/unit/domains/test_contribution_service.py b/mpcontribs-api/tests/unit/domains/test_contribution_service.py index 0b8a9d36b2..4e8b387bb4 100644 --- a/mpcontribs-api/tests/unit/domains/test_contribution_service.py +++ b/mpcontribs-api/tests/unit/domains/test_contribution_service.py @@ -7,6 +7,7 @@ from pymatgen.core import Element from pymongo.errors import BulkWriteError +from mpcontribs_api.authz import ADMIN_GROUP, User from mpcontribs_api.config import MongoSettings from mpcontribs_api.domains.attachments.models import Attachment, AttachmentIn from mpcontribs_api.domains.contributions.models import Contribution, ContributionIn @@ -135,6 +136,12 @@ async def _with_transaction(callback): return client, session +def _admin_user() -> User: + """An admin user — bypasses project write authorization, so tests not exercising authz + keep their previous behavior.""" + return User(username="admin", groups=frozenset({ADMIN_GROUP})) + + def _make_service( contributions=None, structures=None, @@ -143,6 +150,7 @@ def _make_service( client=None, settings: MongoSettings | None = None, write_slots: asyncio.Semaphore | None = None, + user: User | None = None, ) -> tuple[ContributionService, AsyncMock, AsyncMock, AsyncMock, AsyncMock, MagicMock]: contrib_repo = contributions or AsyncMock() struct_repo = structures or AsyncMock() @@ -152,6 +160,7 @@ def _make_service( client, _ = _make_fake_client() svc = ContributionService( client=client, + user=user or _admin_user(), contributions=contrib_repo, structures=struct_repo, tables=table_repo, @@ -571,6 +580,90 @@ async def _upsert(identifiers, contrib): assert summary.failed[0].error_code == "conflict" +# --------------------------------------------------------------------------- +# Project-scoped write authorization (insert + upsert) +# --------------------------------------------------------------------------- + + +def _member_user(*projects: str) -> User: + """Non-admin user whose writable projects are exactly ``projects``.""" + return User(username="alice", groups=frozenset(projects)) + + +class TestWriteAuthorization: + async def test_insert_rejects_unauthorized_project_per_item(self): + svc, contrib_repo, struct_repo, _, _, client = _make_service(user=_member_user("allowed")) + contrib_repo.insert_many_contributions.return_value = None + + contribs = [ + _contrib_in(project="allowed", identifier="ok"), + _contrib_in(project="forbidden", identifier="nope"), + ] + summary = await svc.insert_contributions(contribs) + + assert summary.total == 2 + assert len(summary.succeeded) == 1 + assert [f.index for f in summary.failed] == [1] + assert summary.failed[0].error_code == "permission_denied" + assert "forbidden" in summary.failed[0].message + # Only the authorized item reached Mongo + contrib_repo.insert_many_contributions.assert_called_once() + + async def test_insert_admin_bypasses_authorization(self): + svc, contrib_repo, *_ = _make_service() # default user is admin + contrib_repo.insert_many_contributions.return_value = None + + contribs = [_contrib_in(project="anything", identifier=f"mp-{i}") for i in range(2)] + summary = await svc.insert_contributions(contribs) + + assert summary.total == 2 + assert len(summary.succeeded) == 2 + assert summary.failed == [] + + async def test_insert_unauthorized_and_oversize_yield_single_failure(self): + """An item that is both unauthorized and oversize must produce exactly one BulkFailure + (authorization runs first), preserving total == len(contributions).""" + settings = _make_mongo_settings(max_components_per_contribution=1) + svc, contrib_repo, struct_repo, _, _, _ = _make_service(user=_member_user("allowed"), settings=settings) + + bad = _contrib_in(project="forbidden", identifier="big", structures=[_structure_in(), _structure_in()]) + summary = await svc.insert_contributions([bad]) + + assert summary.total == 1 + assert len(summary.failed) == 1 + assert summary.failed[0].index == 0 + assert summary.failed[0].error_code == "permission_denied" + struct_repo.insert_components.assert_not_called() + + async def test_upsert_rejects_unauthorized_project_per_item(self): + svc, contrib_repo, *_ = _make_service(user=_member_user("allowed")) + contrib_repo.upsert_contribution_by_identifiers.return_value = MagicMock(spec=Contribution) + + contribs = [ + _contrib_in(project="allowed", identifier="ok"), + _contrib_in(project="forbidden", identifier="nope"), + ] + summary = await svc.upsert_contributions(contribs) + + assert summary.total == 2 + assert len(summary.succeeded) == 1 + assert [f.index for f in summary.failed] == [1] + assert summary.failed[0].error_code == "permission_denied" + assert "forbidden" in summary.failed[0].message + # Only the authorized item reached the atomic repo method + contrib_repo.upsert_contribution_by_identifiers.assert_called_once() + + async def test_upsert_anonymous_authorized_for_nothing(self): + svc, contrib_repo, *_ = _make_service(user=User()) # anonymous: no username, no groups + + summary = await svc.upsert_contributions([_contrib_in(project="any", identifier="x")]) + + assert summary.total == 1 + assert summary.succeeded == [] + assert [f.error_code for f in summary.failed] == ["permission_denied"] + contrib_repo.upsert_contribution_by_identifiers.assert_not_called() + + # --------------------------------------------------------------------------- # Process-wide write_slots semaphore is honored # --------------------------------------------------------------------------- From a072a8a08cf326b3529014510f52a4fbd1fcc3d9 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 25 Jun 2026 09:51:42 -0700 Subject: [PATCH 183/591] Brought user group checking logic onto user --- mpcontribs-api/src/mpcontribs_api/authz.py | 12 ++++++++++++ .../domains/contributions/repository.py | 7 +++---- .../mpcontribs_api/domains/contributions/service.py | 2 +- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/authz.py b/mpcontribs-api/src/mpcontribs_api/authz.py index d5336b2fb6..1982d1a129 100644 --- a/mpcontribs-api/src/mpcontribs_api/authz.py +++ b/mpcontribs-api/src/mpcontribs_api/authz.py @@ -50,3 +50,15 @@ def is_admin(self) -> bool: def has_role(self, role: str) -> bool: return role in self.groups + + @property + def writable_projects(self) -> frozenset[str]: + """Projects this user may write to. Admins are unbounded (handled by can_write)""" + if self.is_anonymous: + return frozenset() + # exclude the admin sentinel so it never leaks into a $in / membership test + return frozenset(g for g in self.groups if g != ADMIN_GROUP) + + def can_write(self, project: str) -> bool: + """Single source of truth for write authorization.""" + return self.is_admin or project in self.writable_projects diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py index ab98ee9b2d..31c2d3dfc4 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py @@ -46,9 +46,8 @@ def _build_scope(user: User) -> dict[str, Any]: if user.is_admin: return {} ors: list[dict[str, Any]] = [{"is_public": True}] - if not user.is_anonymous: - if user.groups: - ors.append({"project": {"$in": sorted(user.groups)}}) + if user.writable_projects: + ors.append({"project": {"$in": sorted(user.writable_projects)}}) return {"$or": ors} async def get_contributions( @@ -209,7 +208,7 @@ async def upsert_contribution_by_identifiers( Contribution: the document as it stands after the operation """ # Make sure the user is allowed to upsert a contribution under the provided project - if not self._user.is_admin and identifiers["project"] not in self._user.groups: + if not self._user.can_write(identifiers["project"]): raise PermissionError(f"not authorized to write to project '{identifiers['project']}'") doc = self.document_model.from_input_model(contribution) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py index b0ff084d98..52bbe32273 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py @@ -143,7 +143,7 @@ def _split_unauthorized( remaining: list[int] = [] for i in indices: contrib = contributions[i] - if self._user.is_admin or contrib.project in self._user.groups: + if self._user.can_write(contrib.project): remaining.append(i) else: unauthorized.append( From d87458b7bb17333507a3431c8a51e28aa793c708 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 25 Jun 2026 11:18:32 -0700 Subject: [PATCH 184/591] Added redirects for old endpoints to their corresponding new ones, and return a deprecation response on ones with no modern equivalent --- mpcontribs-api/src/mpcontribs_api/app.py | 4 + .../domains/_redirects/router.py | 161 ++++++++++++++++++ mpcontribs-api/tests/integration/conftest.py | 4 + .../tests/integration/test_redirects.py | 143 ++++++++++++++++ 4 files changed, 312 insertions(+) create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/_redirects/router.py create mode 100644 mpcontribs-api/tests/integration/test_redirects.py diff --git a/mpcontribs-api/src/mpcontribs_api/app.py b/mpcontribs-api/src/mpcontribs_api/app.py index e51429657d..29c5d10f4b 100644 --- a/mpcontribs-api/src/mpcontribs_api/app.py +++ b/mpcontribs-api/src/mpcontribs_api/app.py @@ -15,6 +15,7 @@ from mpcontribs_api.api.v1.router import router as v1_router from mpcontribs_api.authz import api_key_scheme from mpcontribs_api.config import Settings, get_settings +from mpcontribs_api.domains._redirects.router import router as redirects_router from mpcontribs_api.domains.attachments.models import Attachment from mpcontribs_api.domains.contributions.models import Contribution from mpcontribs_api.domains.healthcheck.router import router as healthcheck_router @@ -122,6 +123,9 @@ def create_app(settings: Settings | None = None) -> FastAPI: register_exception_handlers(app) app.include_router(healthcheck_router, prefix="/healthcheck") app.include_router(v1_router, prefix="/api/v1") + # Legacy (root-path) endpoints: 308-redirect to /api/v1 where a counterpart + # exists, else 410 Gone. Registered last so it never shadows live routes. + app.include_router(redirects_router) return app diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_redirects/router.py b/mpcontribs-api/src/mpcontribs_api/domains/_redirects/router.py new file mode 100644 index 0000000000..d965e4eecb --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/domains/_redirects/router.py @@ -0,0 +1,161 @@ +"""Compatibility shims for the legacy (Flask/flask-mongorest) MPContribs API. + +The old API was served from the root path (e.g. ``/contributions/``, +``/projects//``). The rewrite serves everything under ``/api/v1`` with +slightly different paths and verbs. This router is mounted at the root and: + +- 308-redirects every legacy endpoint that has a direct counterpart to its new + location (preserving method, body, and query string), and +- returns ``410 Gone`` with a machine-readable "deprecated" body for legacy + endpoints that have no equivalent in the new API (notebooks, the formula/term + search helpers, project-application approval links, and project creation). + +Redirects are permanent (308) so well-behaved clients update their bookmarks +while keeping the original HTTP method and request body intact. +""" + +from fastapi import APIRouter, Request +from fastapi.responses import JSONResponse, RedirectResponse +from starlette.status import HTTP_308_PERMANENT_REDIRECT, HTTP_410_GONE + +router = APIRouter(include_in_schema=False) + +# Base path of the new API. The legacy API lived at the service root. +API_V1 = "/api/v1" + + +def _redirect(request: Request, new_path: str) -> RedirectResponse: + """308-redirect to ``new_path`` under the v1 API, preserving the query string. + + 308 (rather than 301/302) keeps the original method and body, so a legacy + ``POST``/``PUT``/``DELETE`` is replayed against the new endpoint instead of + being silently downgraded to a ``GET``. + """ + target = f"{API_V1}{new_path}" + if request.url.query: + target = f"{target}?{request.url.query}" + return RedirectResponse(url=target, status_code=HTTP_308_PERMANENT_REDIRECT) + + +def _deprecated(message: str, *, replacement: str | None = None) -> JSONResponse: + """Return a ``410 Gone`` in the app's uniform error shape. + + Used for legacy endpoints that have no counterpart in the new API. + """ + detail: dict[str, str] = {} + if replacement is not None: + detail["replacement"] = replacement + body: dict = {"error": {"code": "endpoint_deprecated", "message": message}} + if detail: + body["error"]["detail"] = detail + return JSONResponse( + status_code=HTTP_410_GONE, + content=body, + headers={"Deprecation": "true"}, + ) + + +# --------------------------------------------------------------------------- +# contributions +# --------------------------------------------------------------------------- +@router.get("/contributions/search") +def redirect_contributions_search() -> JSONResponse: + # Formula autocomplete (Atlas $search) was not ported to the new API. + return _deprecated("The contributions formula search endpoint has been removed.") + + +@router.get("/contributions/download/{short_mime}/") +def redirect_download_contributions(request: Request, short_mime: str) -> RedirectResponse: + return _redirect(request, f"/contributions/download/{short_mime}") + + +@router.api_route("/contributions/", methods=["GET", "POST", "PUT", "DELETE"]) +def redirect_contributions_collection(request: Request) -> RedirectResponse: + # GET=list, POST=bulk insert, PUT=bulk upsert, DELETE=delete-by-filter. + return _redirect(request, "/contributions") + + +@router.api_route("/contributions/{pk}/", methods=["GET", "PUT", "DELETE"]) +def redirect_contribution_item(request: Request, pk: str) -> RedirectResponse: + # GET=fetch, PUT=update/upsert, DELETE=delete (all keyed by id). + return _redirect(request, f"/contributions/{pk}") + + +# --------------------------------------------------------------------------- +# projects +# --------------------------------------------------------------------------- +@router.get("/projects/search") +def redirect_projects_search() -> JSONResponse: + return _deprecated("The projects search endpoint has been removed.") + + +@router.get("/projects/applications/{token}") +@router.get("/projects/applications/{token}/{action}") +def redirect_projects_applications(token: str, action: str | None = None) -> JSONResponse: + # Email-driven project approval/denial links; not part of the new API. + return _deprecated("Project application approval links have been removed.") + + +@router.api_route("/projects/", methods=["GET", "POST"], response_model=None) +def redirect_projects_collection(request: Request) -> RedirectResponse | JSONResponse: + if request.method == "POST": + # No project-creation endpoint exists in the new API. + return _deprecated( + "Creating projects via POST is no longer supported. Create a project with PUT /api/v1/projects/{id}.", + replacement=f"{API_V1}/projects/{{id}}", + ) + return _redirect(request, "/projects") + + +@router.api_route("/projects/{pk}/", methods=["GET", "PUT", "DELETE"]) +def redirect_project_item(request: Request, pk: str) -> RedirectResponse: + # GET=fetch, PUT=update/upsert, DELETE=delete. + return _redirect(request, f"/projects/{pk}") + + +# --------------------------------------------------------------------------- +# Components +# --------------------------------------------------------------------------- +def _register_component_redirects(component: str) -> None: + @router.get(f"/{component}/download/{{short_mime}}/", name=f"redirect_download_{component}") + def redirect_download(request: Request, short_mime: str) -> RedirectResponse: + return _redirect(request, f"/{component}/download/{short_mime}") + + @router.get(f"/{component}/", name=f"redirect_{component}_collection") + def redirect_collection(request: Request) -> RedirectResponse: + return _redirect(request, f"/{component}") + + @router.get(f"/{component}/{{pk}}/", name=f"redirect_{component}_item") + def redirect_item(request: Request, pk: str) -> RedirectResponse: + return _redirect(request, f"/{component}/{pk}") + + +for _component in ("structures", "tables", "attachments"): + _register_component_redirects(_component) + + +# --------------------------------------------------------------------------- +# notebooks +# --------------------------------------------------------------------------- +_NOTEBOOKS_GONE = "The notebooks API has been removed." + + +@router.get("/notebooks/build") +def redirect_notebooks_build() -> JSONResponse: + return _deprecated(_NOTEBOOKS_GONE) + + +@router.get("/notebooks/result") +@router.get("/notebooks/result/{job_id}") +def redirect_notebooks_result(job_id: str | None = None) -> JSONResponse: + return _deprecated(_NOTEBOOKS_GONE) + + +@router.get("/notebooks/") +def redirect_notebooks_collection() -> JSONResponse: + return _deprecated(_NOTEBOOKS_GONE) + + +@router.get("/notebooks/{pk}/") +def redirect_notebooks_item(pk: str) -> JSONResponse: + return _deprecated(_NOTEBOOKS_GONE) diff --git a/mpcontribs-api/tests/integration/conftest.py b/mpcontribs-api/tests/integration/conftest.py index d46a85689d..c4be40b215 100644 --- a/mpcontribs-api/tests/integration/conftest.py +++ b/mpcontribs-api/tests/integration/conftest.py @@ -74,8 +74,12 @@ async def _noop_lifespan(app: FastAPI): register_exception_handlers(app) from mpcontribs_api.api.v1.router import router as v1_router + from mpcontribs_api.domains._redirects.router import router as redirects_router app.include_router(v1_router, prefix="/api/v1") + # Mounted last (root path), exactly as in the real app, so legacy-endpoint + # redirect/deprecation behaviour is exercised by integration tests. + app.include_router(redirects_router) return app diff --git a/mpcontribs-api/tests/integration/test_redirects.py b/mpcontribs-api/tests/integration/test_redirects.py new file mode 100644 index 0000000000..31f18f646d --- /dev/null +++ b/mpcontribs-api/tests/integration/test_redirects.py @@ -0,0 +1,143 @@ +"""Tests for the legacy-compatibility redirect/deprecation router. + +The legacy (Flask) API lived at the service root (e.g. ``/contributions/``); +the rewrite serves everything under ``/api/v1``. The redirects router mounted +at the root either 308-redirects to the new location (preserving method, body +and query string) or returns ``410 Gone`` for endpoints with no counterpart. +""" + +import pytest +from fastapi import FastAPI +from fastapi.testclient import TestClient + +from tests.integration.conftest import make_test_app + +# 308 keeps the method/body intact; assert it explicitly so a future change to +# 301/302 (which downgrade POST/PUT to GET) is caught. +PERMANENT_REDIRECT = 308 +GONE = 410 + + +@pytest.fixture(scope="module") +def app() -> FastAPI: + return make_test_app() + + +@pytest.fixture +def client(app: FastAPI): + """Client that does NOT auto-follow redirects, so we can assert on 3xx.""" + with TestClient(app, raise_server_exceptions=False, follow_redirects=False) as c: + yield c + + +# --------------------------------------------------------------------------- +# Redirects: legacy endpoints with a direct /api/v1 counterpart +# --------------------------------------------------------------------------- + +# (method, legacy_path, expected /api/v1 location) +REDIRECT_CASES = [ + # contributions + ("GET", "/contributions/", "/api/v1/contributions"), + ("POST", "/contributions/", "/api/v1/contributions"), + ("PUT", "/contributions/", "/api/v1/contributions"), + ("DELETE", "/contributions/", "/api/v1/contributions"), + ("GET", "/contributions/abc123/", "/api/v1/contributions/abc123"), + ("PUT", "/contributions/abc123/", "/api/v1/contributions/abc123"), + ("DELETE", "/contributions/abc123/", "/api/v1/contributions/abc123"), + ("GET", "/contributions/download/gz/", "/api/v1/contributions/download/gz"), + # projects (GET collection + item verbs) + ("GET", "/projects/", "/api/v1/projects"), + ("GET", "/projects/my-proj/", "/api/v1/projects/my-proj"), + ("PUT", "/projects/my-proj/", "/api/v1/projects/my-proj"), + ("DELETE", "/projects/my-proj/", "/api/v1/projects/my-proj"), + # read-only components + ("GET", "/structures/", "/api/v1/structures"), + ("GET", "/structures/sid/", "/api/v1/structures/sid"), + ("GET", "/structures/download/gz/", "/api/v1/structures/download/gz"), + ("GET", "/tables/", "/api/v1/tables"), + ("GET", "/tables/tid/", "/api/v1/tables/tid"), + ("GET", "/tables/download/gz/", "/api/v1/tables/download/gz"), + ("GET", "/attachments/", "/api/v1/attachments"), + ("GET", "/attachments/aid/", "/api/v1/attachments/aid"), + ("GET", "/attachments/download/gz/", "/api/v1/attachments/download/gz"), +] + + +class TestRedirects: + @pytest.mark.parametrize("method, legacy_path, new_path", REDIRECT_CASES) + def test_status_is_permanent_redirect(self, client, method, legacy_path, new_path): + r = client.request(method, legacy_path) + assert r.status_code == PERMANENT_REDIRECT + + @pytest.mark.parametrize("method, legacy_path, new_path", REDIRECT_CASES) + def test_location_points_to_v1(self, client, method, legacy_path, new_path): + r = client.request(method, legacy_path) + assert r.headers["location"] == new_path + + def test_query_string_is_preserved(self, client): + r = client.get("/contributions/?project=foo&_limit=5") + assert r.headers["location"] == "/api/v1/contributions?project=foo&_limit=5" + + def test_query_string_preserved_on_item(self, client): + r = client.get("/structures/sid/?_fields=id,label") + assert r.headers["location"] == "/api/v1/structures/sid?_fields=id,label" + + def test_download_query_preserved(self, client): + r = client.get("/tables/download/gz/?format=csv") + assert r.headers["location"] == "/api/v1/tables/download/gz?format=csv" + + def test_no_query_string_has_no_trailing_question_mark(self, client): + r = client.get("/projects/") + assert r.headers["location"] == "/api/v1/projects" + assert "?" not in r.headers["location"] + + +# --------------------------------------------------------------------------- +# Deprecations: legacy endpoints with no counterpart → 410 Gone +# --------------------------------------------------------------------------- + +# (method, legacy_path) +GONE_CASES = [ + # search helpers (Atlas $search) were not ported + ("GET", "/contributions/search"), + ("GET", "/projects/search"), + # project creation has no POST endpoint in the new API + ("POST", "/projects/"), + # email-driven application approval links + ("GET", "/projects/applications/sometoken"), + ("GET", "/projects/applications/sometoken/approve"), + ("GET", "/projects/applications/sometoken/deny"), + # the whole notebooks resource was dropped + ("GET", "/notebooks/"), + ("GET", "/notebooks/nbid/"), + ("GET", "/notebooks/build"), + ("GET", "/notebooks/result"), + ("GET", "/notebooks/result/job-1"), +] + + +class TestDeprecated: + @pytest.mark.parametrize("method, path", GONE_CASES) + def test_status_is_gone(self, client, method, path): + assert client.request(method, path).status_code == GONE + + @pytest.mark.parametrize("method, path", GONE_CASES) + def test_error_envelope(self, client, method, path): + body = client.request(method, path).json() + assert body["error"]["code"] == "endpoint_deprecated" + assert body["error"]["message"] + + @pytest.mark.parametrize("method, path", GONE_CASES) + def test_deprecation_header(self, client, method, path): + assert client.request(method, path).headers["deprecation"] == "true" + + def test_post_projects_points_at_put_replacement(self, client): + r = client.post("/projects/") + assert r.status_code == GONE + body = r.json() + assert body["error"]["detail"]["replacement"] == "/api/v1/projects/{id}" + + def test_deprecated_responses_are_not_redirects(self, client): + # A deprecated endpoint must never carry a Location header. + r = client.get("/notebooks/build") + assert "location" not in r.headers From 87d018b211e189842febfef0269da5833cf6d59b Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 25 Jun 2026 13:33:13 -0700 Subject: [PATCH 185/591] Added libsnappy back for snappy compression --- mpcontribs-api/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mpcontribs-api/Dockerfile b/mpcontribs-api/Dockerfile index 741922e7cb..48a24ebb16 100644 --- a/mpcontribs-api/Dockerfile +++ b/mpcontribs-api/Dockerfile @@ -4,7 +4,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends supervisor libo WORKDIR /app FROM base AS builder -RUN apt-get update && apt-get install -y --no-install-recommends gcc git g++ wget liblapack-dev && apt-get clean +RUN apt-get update && apt-get install -y --no-install-recommends gcc git g++ wget liblapack-dev libsnappy-dev && apt-get clean RUN pip install uv COPY pyproject.toml uv.lock ./ COPY src src From 7df8e047e9114fbfd7b25222e2f6c95e301a9c62 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 25 Jun 2026 15:13:05 -0700 Subject: [PATCH 186/591] Added supervisor and python-snappy to deps --- mpcontribs-api/pyproject.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mpcontribs-api/pyproject.toml b/mpcontribs-api/pyproject.toml index bb45761135..9dfd350b5a 100644 --- a/mpcontribs-api/pyproject.toml +++ b/mpcontribs-api/pyproject.toml @@ -29,7 +29,6 @@ dependencies = [ # "pint>=0.24", # "psycopg2-binary", # "rq<=2.3.2", # see https://github.com/rq/Flask-RQ2/issues/620 - # "supervisor", # "setproctitle", # "uncertainties", # "websocket_client", @@ -49,6 +48,8 @@ dependencies = [ "aioboto3>=15.5.0", "types-aiobotocore[s3]>=3.7.0", "polars>=1.41.2", + "supervisor>=4.3.0", + "python-snappy>=0.7.3", ] [project.urls] From 5f400e4a7133a8d1073d654ce3d6ba9392900b8d Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 25 Jun 2026 15:14:34 -0700 Subject: [PATCH 187/591] Made the uv sync no-editable so .pth doesn't cause an error referencing a non-existent location --- mpcontribs-api/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mpcontribs-api/Dockerfile b/mpcontribs-api/Dockerfile index 48a24ebb16..f254a8c601 100644 --- a/mpcontribs-api/Dockerfile +++ b/mpcontribs-api/Dockerfile @@ -9,7 +9,7 @@ RUN pip install uv COPY pyproject.toml uv.lock ./ COPY src src ARG CONTRIBS_VERSION -RUN SETUPTOOLS_SCM_PRETEND_VERSION=${CONTRIBS_VERSION} uv sync --frozen --no-dev +RUN SETUPTOOLS_SCM_PRETEND_VERSION=${CONTRIBS_VERSION} uv sync --frozen --no-dev --no-editable RUN wget -q https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh && \ chmod +x wait-for-it.sh && mv wait-for-it.sh /usr/local/bin/ From 7d916992ad0bfc9d050aebe5957bb5d6624e406a Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 25 Jun 2026 15:36:06 -0700 Subject: [PATCH 188/591] Added --workers parameterization --- mpcontribs-api/scripts/start.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/mpcontribs-api/scripts/start.sh b/mpcontribs-api/scripts/start.sh index 631f570149..1452743286 100755 --- a/mpcontribs-api/scripts/start.sh +++ b/mpcontribs-api/scripts/start.sh @@ -10,6 +10,4 @@ PMGRC=$HOME/.pmgrc.yaml set -x -# No wait for the OTLP collector: the OTEL batch processors tolerate an unavailable endpoint -# (they retry and drop), so startup must not block on it. -exec uvicorn mpcontribs_api.app:app --host 0.0.0.0 --port "$API_PORT" +exec uvicorn mpcontribs_api.app:app --host 0.0.0.0 --port "$API_PORT" --workers "${NWORKERS:-2}" From a6774b8e5936de104f8025a934af4d31a4a94f8d Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 25 Jun 2026 15:37:00 -0700 Subject: [PATCH 189/591] Brought supervisor up to current use practices --- mpcontribs-api/supervisord/conf.py | 25 +++----- .../supervisord/supervisord.conf.jinja | 15 ----- mpcontribs-api/uv.lock | 63 +++++++++++++++++++ 3 files changed, 71 insertions(+), 32 deletions(-) diff --git a/mpcontribs-api/supervisord/conf.py b/mpcontribs-api/supervisord/conf.py index 9e4070a382..6869eb183b 100644 --- a/mpcontribs-api/supervisord/conf.py +++ b/mpcontribs-api/supervisord/conf.py @@ -4,22 +4,19 @@ DIR = os.path.abspath(os.path.dirname(__file__)) PRODUCTION = int(os.environ.get("PRODUCTION", "1")) -DEFAULT_NWORKERS = 2 if PRODUCTION else 1 -NWORKERS = int(os.environ.get("NWORKERS", DEFAULT_NWORKERS)) -KG_PORT = 10100 +# uvicorn worker count per API process. Same default in dev and prod; override via the NWORKERS env var. +NWORKERS = int(os.environ.get("NWORKERS", "2")) deployments = {} -for deployment in os.environ.get("DEPLOYMENTS", "ml:10002").split(","): - name, db, s3, tm, max_projects, api_port = deployment.split(":") - portal_port = 8080 + int(api_port) % 10000 +# DEPLOYMENTS entries are "name:db:s3:tm:max_projects:api_port" — the format is an external +# deployment contract (also parsed by scripts/healthchecks.py). Only name, db, and api_port are +# consumed today; s3/tm/max_projects are Flask/portal-era fields kept for format compatibility. +for deployment in os.environ.get("DEPLOYMENTS", "ml:ml:ml:MP:3:10002").split(","): + name, db, _s3, _tm, _max_projects, api_port = deployment.split(":") deployments[name] = { "api_port": api_port, - "portal_port": portal_port, "db": db, - "s3": s3, - "tm": tm.upper(), - "max_projects": int(max_projects) if max_projects else 3, } kwargs = { @@ -29,17 +26,11 @@ # MPCONTRIBS_VERSION is required by Settings; sourced from the image build arg at container start. "version": os.environ.get("CONTRIBS_VERSION", os.environ.get("MPCONTRIBS_VERSION", "0.0.0")), "deployments": deployments, + # Consumed by scripts/start.sh: both dev and prod run `uvicorn --workers $NWORKERS`. "nworkers": NWORKERS, - "reload": int(not PRODUCTION), - "node_env": "production" if PRODUCTION else "development", - "flask_log_level": "INFO" if PRODUCTION else "DEBUG", - "jupyter_gateway_host": f"localhost:{KG_PORT}" if PRODUCTION else f"kernel-gateway:{KG_PORT}", # OTLP/gRPC receiver: the Datadog Agent sidecar in prod, the "datadog" compose service in dev. "otel_endpoint": "localhost:4317" if PRODUCTION else "datadog:4317", - "mpcontribs_api_host": "localhost" if PRODUCTION else "contribs-apis", } -kwargs["flask_debug"] = kwargs["node_env"] == "development" -kwargs["jupyter_gateway_url"] = "http://" + kwargs["jupyter_gateway_host"] env = Environment(loader=FileSystemLoader(DIR)) template = env.get_template("supervisord.conf.jinja") diff --git a/mpcontribs-api/supervisord/supervisord.conf.jinja b/mpcontribs-api/supervisord/supervisord.conf.jinja index b2e7e913de..f35013a80f 100644 --- a/mpcontribs-api/supervisord/supervisord.conf.jinja +++ b/mpcontribs-api/supervisord/supervisord.conf.jinja @@ -18,15 +18,7 @@ environment= AWS_DEFAULT_REGION="us-east-1", MPCONTRIBS_MAIL_DEFAULT_SENDER="contribs@materialsproject.org", PYTHONUNBUFFERED=1, - MAX_REQUESTS=0, - MAX_REQUESTS_JITTER=0, NWORKERS={{ nworkers }}, - RELOAD={{ reload }}, - NODE_ENV="{{ node_env }}", - FLASK_DEBUG="{{ flask_debug }}", - FLASK_LOG_LEVEL="{{ flask_log_level }}", - JUPYTER_GATEWAY_URL="{{ jupyter_gateway_url }}", - JUPYTER_GATEWAY_HOST="{{ jupyter_gateway_host }}", MPCONTRIBS_OTEL__OTLP_ENDPOINT="{{ otel_endpoint }}", TINI_SUBREAPER="true" @@ -72,14 +64,7 @@ stderr_logfile_maxbytes=0 environment= DEPLOYMENT={{ loop.index0 }}, API_PORT={{ cfg.api_port }}, - PORTAL_PORT={{ cfg.portal_port }}, - MPCONTRIBS_API_HOST="{{ mpcontribs_api_host }}:{{ cfg.api_port }}", MPCONTRIBS_MONGO__DB_NAME="mpcontribs-{{ cfg.db }}", - TRADEMARK="{{ cfg.tm }}", - MAX_PROJECTS={{ cfg.max_projects }}, - S3_DOWNLOADS_BUCKET="mpcontribs-downloads-{{ cfg.s3 }}", - S3_ATTACHMENTS_BUCKET="mpcontribs-attachments-{{ cfg.s3 }}", - S3_IMAGES_BUCKET="mpcontribs-images-{{ cfg.s3 }}", MPCONTRIBS_MONGO__ADMIN_GROUP="admin_{{ deployment }}.materialsproject.org" {% endset %} diff --git a/mpcontribs-api/uv.lock b/mpcontribs-api/uv.lock index 7aab864368..008b2c5eeb 100644 --- a/mpcontribs-api/uv.lock +++ b/mpcontribs-api/uv.lock @@ -368,6 +368,44 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/ae/8c/469afb6465b853afff216f9528ffda78a915ff880ed58813ba4faf4ba0b6/contourpy-1.3.3-cp314-cp314t-win_arm64.whl", hash = "sha256:b7448cb5a725bb1e35ce88771b86fba35ef418952474492cf7c764059933ff8b", size = 203831, upload-time = "2025-07-26T12:02:51.449Z" }, ] +[[package]] +name = "cramjam" +version = "2.11.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/14/12/34bf6e840a79130dfd0da7badfb6f7810b8fcfd60e75b0539372667b41b6/cramjam-2.11.0.tar.gz", hash = "sha256:5c82500ed91605c2d9781380b378397012e25127e89d64f460fea6aeac4389b4", size = 99100, upload-time = "2025-07-27T21:25:07.559Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/de/07/a1051cdbbe6d723df16d756b97f09da7c1adb69e29695c58f0392bc12515/cramjam-2.11.0-cp314-cp314-macosx_10_12_x86_64.macosx_11_0_arm64.macosx_10_12_universal2.whl", hash = "sha256:7ba5e38c9fbd06f086f4a5a64a1a5b7b417cd3f8fc07a20e5c03651f72f36100", size = 3554141, upload-time = "2025-07-27T21:23:17.938Z" }, + { url = "https://files.pythonhosted.org/packages/74/66/58487d2e16ef3d04f51a7c7f0e69823e806744b4c21101e89da4873074bc/cramjam-2.11.0-cp314-cp314-macosx_10_12_x86_64.whl", hash = "sha256:b8adeee57b41fe08e4520698a4b0bd3cc76dbd81f99424b806d70a5256a391d3", size = 1860353, upload-time = "2025-07-27T21:23:19.593Z" }, + { url = "https://files.pythonhosted.org/packages/67/b4/67f6254d166ffbcc9d5fa1b56876eaa920c32ebc8e9d3d525b27296b693b/cramjam-2.11.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:b96a74fa03a636c8a7d76f700d50e9a8bc17a516d6a72d28711225d641e30968", size = 1693832, upload-time = "2025-07-27T21:23:21.185Z" }, + { url = "https://files.pythonhosted.org/packages/55/a3/4e0b31c0d454ae70c04684ed7c13d3c67b4c31790c278c1e788cb804fa4a/cramjam-2.11.0-cp314-cp314-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:c3811a56fa32e00b377ef79121c0193311fd7501f0fb378f254c7f083cc1fbe0", size = 2027080, upload-time = "2025-07-27T21:23:23.303Z" }, + { url = "https://files.pythonhosted.org/packages/d9/c7/5e8eed361d1d3b8be14f38a54852c5370cc0ceb2c2d543b8ba590c34f080/cramjam-2.11.0-cp314-cp314-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c5d927e87461f8a0d448e4ab5eb2bca9f31ca5d8ea86d70c6f470bb5bc666d7e", size = 1761543, upload-time = "2025-07-27T21:23:24.991Z" }, + { url = "https://files.pythonhosted.org/packages/09/0c/06b7f8b0ce9fde89470505116a01fc0b6cb92d406c4fb1e46f168b5d3fa5/cramjam-2.11.0-cp314-cp314-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:f1f5c450121430fd89cb5767e0a9728ecc65997768fd4027d069cb0368af62f9", size = 1854636, upload-time = "2025-07-27T21:23:26.987Z" }, + { url = "https://files.pythonhosted.org/packages/6f/c6/6ebc02c9d5acdf4e5f2b1ec6e1252bd5feee25762246798ae823b3347457/cramjam-2.11.0-cp314-cp314-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:724aa7490be50235d97f07e2ca10067927c5d7f336b786ddbc868470e822aa25", size = 2032715, upload-time = "2025-07-27T21:23:28.603Z" }, + { url = "https://files.pythonhosted.org/packages/a2/77/a122971c23f5ca4b53e4322c647ac7554626c95978f92d19419315dddd05/cramjam-2.11.0-cp314-cp314-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:54c4637122e7cfd7aac5c1d3d4c02364f446d6923ea34cf9d0e8816d6e7a4936", size = 2069039, upload-time = "2025-07-27T21:23:30.319Z" }, + { url = "https://files.pythonhosted.org/packages/19/0f/f6121b90b86b9093c066889274d26a1de3f29969d45c2ed1ecbe2033cb78/cramjam-2.11.0-cp314-cp314-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:17eb39b1696179fb471eea2de958fa21f40a2cd8bf6b40d428312d5541e19dc4", size = 1979566, upload-time = "2025-07-27T21:23:32.002Z" }, + { url = "https://files.pythonhosted.org/packages/e0/a3/f95bc57fd7f4166ce6da816cfa917fb7df4bb80e669eb459d85586498414/cramjam-2.11.0-cp314-cp314-musllinux_1_1_aarch64.whl", hash = "sha256:36aa5a798aa34e11813a80425a30d8e052d8de4a28f27bfc0368cfc454d1b403", size = 2030905, upload-time = "2025-07-27T21:23:33.696Z" }, + { url = "https://files.pythonhosted.org/packages/fc/52/e429de4e8bc86ee65e090dae0f87f45abd271742c63fb2d03c522ffde28a/cramjam-2.11.0-cp314-cp314-musllinux_1_1_armv7l.whl", hash = "sha256:449fca52774dc0199545fbf11f5128933e5a6833946707885cf7be8018017839", size = 2155592, upload-time = "2025-07-27T21:23:35.375Z" }, + { url = "https://files.pythonhosted.org/packages/6c/6c/65a7a0207787ad39ad804af4da7f06a60149de19481d73d270b540657234/cramjam-2.11.0-cp314-cp314-musllinux_1_1_i686.whl", hash = "sha256:d87d37b3d476f4f7623c56a232045d25bd9b988314702ea01bd9b4a94948a778", size = 2170839, upload-time = "2025-07-27T21:23:37.197Z" }, + { url = "https://files.pythonhosted.org/packages/b2/c5/5c5db505ba692bc844246b066e23901d5905a32baf2f33719c620e65887f/cramjam-2.11.0-cp314-cp314-musllinux_1_1_x86_64.whl", hash = "sha256:26cb45c47d71982d76282e303931c6dd4baee1753e5d48f9a89b3a63e690b3a3", size = 2157236, upload-time = "2025-07-27T21:23:38.854Z" }, + { url = "https://files.pythonhosted.org/packages/b0/22/88e6693e60afe98901e5bbe91b8dea193e3aa7f42e2770f9c3339f5c1065/cramjam-2.11.0-cp314-cp314-win32.whl", hash = "sha256:4efe919d443c2fd112fe25fe636a52f9628250c9a50d9bddb0488d8a6c09acc6", size = 1604136, upload-time = "2025-07-27T21:23:40.56Z" }, + { url = "https://files.pythonhosted.org/packages/cc/f8/01618801cd59ccedcc99f0f96d20be67d8cfc3497da9ccaaad6b481781dd/cramjam-2.11.0-cp314-cp314-win_amd64.whl", hash = "sha256:ccec3524ea41b9abd5600e3e27001fd774199dbb4f7b9cb248fcee37d4bda84c", size = 1710272, upload-time = "2025-07-27T21:23:42.236Z" }, + { url = "https://files.pythonhosted.org/packages/40/81/6cdb3ed222d13ae86bda77aafe8d50566e81a1169d49ed195b6263610704/cramjam-2.11.0-cp314-cp314t-macosx_10_12_x86_64.macosx_11_0_arm64.macosx_10_12_universal2.whl", hash = "sha256:966ac9358b23d21ecd895c418c048e806fd254e46d09b1ff0cdad2eba195ea3e", size = 3559671, upload-time = "2025-07-27T21:23:44.504Z" }, + { url = "https://files.pythonhosted.org/packages/cb/43/52b7e54fe5ba1ef0270d9fdc43dabd7971f70ea2d7179be918c997820247/cramjam-2.11.0-cp314-cp314t-macosx_10_12_x86_64.whl", hash = "sha256:387f09d647a0d38dcb4539f8a14281f8eb6bb1d3e023471eb18a5974b2121c86", size = 1867876, upload-time = "2025-07-27T21:23:46.987Z" }, + { url = "https://files.pythonhosted.org/packages/9d/28/30d5b8d10acd30db3193bc562a313bff722888eaa45cfe32aa09389f2b24/cramjam-2.11.0-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:665b0d8fbbb1a7f300265b43926457ec78385200133e41fef19d85790fc1e800", size = 1695562, upload-time = "2025-07-27T21:23:48.644Z" }, + { url = "https://files.pythonhosted.org/packages/d9/86/ec806f986e01b896a650655024ea52a13e25c3ac8a3a382f493089483cdc/cramjam-2.11.0-cp314-cp314t-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:ca905387c7a371531b9622d93471be4d745ef715f2890c3702479cd4fc85aa51", size = 2025056, upload-time = "2025-07-27T21:23:50.404Z" }, + { url = "https://files.pythonhosted.org/packages/09/43/c2c17586b90848d29d63181f7d14b8bd3a7d00975ad46e3edf2af8af7e1f/cramjam-2.11.0-cp314-cp314t-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3c1aa56aef2c8af55a21ed39040a94a12b53fb23beea290f94d19a76027e2ffb", size = 1764084, upload-time = "2025-07-27T21:23:52.265Z" }, + { url = "https://files.pythonhosted.org/packages/2b/a9/68bc334fadb434a61df10071dc8606702aa4f5b6cdb2df62474fc21d2845/cramjam-2.11.0-cp314-cp314t-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:e5db59c1cdfaa2ab85cc988e602d6919495f735ca8a5fd7603608eb1e23c26d5", size = 1854859, upload-time = "2025-07-27T21:23:54.085Z" }, + { url = "https://files.pythonhosted.org/packages/5b/4e/b48e67835b5811ec5e9cb2e2bcba9c3fd76dab3e732569fe801b542c6ca9/cramjam-2.11.0-cp314-cp314t-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:b1f893014f00fe5e89a660a032e813bf9f6d91de74cd1490cdb13b2b59d0c9a3", size = 2035970, upload-time = "2025-07-27T21:23:55.758Z" }, + { url = "https://files.pythonhosted.org/packages/c4/70/d2ac33d572b4d90f7f0f2c8a1d60fb48f06b128fdc2c05f9b49891bb0279/cramjam-2.11.0-cp314-cp314t-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c26a1eb487947010f5de24943bd7c422dad955b2b0f8650762539778c380ca89", size = 2069320, upload-time = "2025-07-27T21:23:57.494Z" }, + { url = "https://files.pythonhosted.org/packages/1d/4c/85cec77af4a74308ba5fca8e296c4e2f80ec465c537afc7ab1e0ca2f9a00/cramjam-2.11.0-cp314-cp314t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7d5c8bfb438d94e7b892d1426da5fc4b4a5370cc360df9b8d9d77c33b896c37e", size = 1982668, upload-time = "2025-07-27T21:23:59.126Z" }, + { url = "https://files.pythonhosted.org/packages/55/45/938546d1629e008cc3138df7c424ef892719b1796ff408a2ab8550032e5e/cramjam-2.11.0-cp314-cp314t-musllinux_1_1_aarch64.whl", hash = "sha256:cb1fb8c9337ab0da25a01c05d69a0463209c347f16512ac43be5986f3d1ebaf4", size = 2034028, upload-time = "2025-07-27T21:24:00.865Z" }, + { url = "https://files.pythonhosted.org/packages/01/76/b5a53e20505555f1640e66dcf70394bcf51a1a3a072aa18ea35135a0f9ed/cramjam-2.11.0-cp314-cp314t-musllinux_1_1_armv7l.whl", hash = "sha256:1f6449f6de52dde3e2f1038284910c8765a397a25e2d05083870f3f5e7fc682c", size = 2155513, upload-time = "2025-07-27T21:24:02.92Z" }, + { url = "https://files.pythonhosted.org/packages/84/12/8d3f6ceefae81bbe45a347fdfa2219d9f3ac75ebc304f92cd5fcb4fbddc5/cramjam-2.11.0-cp314-cp314t-musllinux_1_1_i686.whl", hash = "sha256:382dec4f996be48ed9c6958d4e30c2b89435d7c2c4dbf32480b3b8886293dd65", size = 2170035, upload-time = "2025-07-27T21:24:04.558Z" }, + { url = "https://files.pythonhosted.org/packages/4b/85/3be6f0a1398f976070672be64f61895f8839857618a2d8cc0d3ab529d3dc/cramjam-2.11.0-cp314-cp314t-musllinux_1_1_x86_64.whl", hash = "sha256:d388bd5723732c3afe1dd1d181e4213cc4e1be210b080572e7d5749f6e955656", size = 2160229, upload-time = "2025-07-27T21:24:06.729Z" }, + { url = "https://files.pythonhosted.org/packages/57/5e/66cfc3635511b20014bbb3f2ecf0095efb3049e9e96a4a9e478e4f3d7b78/cramjam-2.11.0-cp314-cp314t-win32.whl", hash = "sha256:0a70ff17f8e1d13f322df616505550f0f4c39eda62290acb56f069d4857037c8", size = 1610267, upload-time = "2025-07-27T21:24:08.428Z" }, + { url = "https://files.pythonhosted.org/packages/ce/c6/c71e82e041c95ffe6a92ac707785500aa2a515a4339c2c7dd67e3c449249/cramjam-2.11.0-cp314-cp314t-win_amd64.whl", hash = "sha256:028400d699442d40dbda02f74158c73d05cb76587a12490d0bfedd958fd49188", size = 1713108, upload-time = "2025-07-27T21:24:10.147Z" }, +] + [[package]] name = "cycler" version = "0.12.1" @@ -981,7 +1019,9 @@ dependencies = [ { name = "pydantic-settings" }, { name = "pymatgen" }, { name = "pymongo" }, + { name = "python-snappy" }, { name = "structlog" }, + { name = "supervisor" }, { name = "types-aiobotocore", extra = ["s3"] }, ] @@ -1011,7 +1051,9 @@ requires-dist = [ { name = "pydantic-settings", specifier = ">=2.14.1" }, { name = "pymatgen" }, { name = "pymongo", specifier = ">=4.17.0" }, + { name = "python-snappy", specifier = ">=0.7.3" }, { name = "structlog", specifier = ">=25.5.0" }, + { name = "supervisor", specifier = ">=4.3.0" }, { name = "types-aiobotocore", extras = ["s3"], specifier = ">=3.7.0" }, ] @@ -1767,6 +1809,18 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/1c/fd/0318007beb234790993d3ec5afd051d1dbceb733e81e3afe2b981ece3f37/python_multipart-0.0.30-py3-none-any.whl", hash = "sha256:830964def8c90607ac5daa00514e3987815865713ade8d20febc9177ac0c3c5b", size = 29730, upload-time = "2026-05-31T19:24:53.814Z" }, ] +[[package]] +name = "python-snappy" +version = "0.7.3" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "cramjam" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/39/66/9185fbb6605ba92716d9f77fbb13c97eb671cd13c3ad56bd154016fbf08b/python_snappy-0.7.3.tar.gz", hash = "sha256:40216c1badfb2d38ac781ecb162a1d0ec40f8ee9747e610bcfefdfa79486cee3", size = 9337, upload-time = "2024-08-29T13:16:05.705Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/86/c1/0ee413ddd639aebf22c85d6db39f136ccc10e6a4b4dd275a92b5c839de8d/python_snappy-0.7.3-py3-none-any.whl", hash = "sha256:074c0636cfcd97e7251330f428064050ac81a52c62ed884fc2ddebbb60ed7f50", size = 9155, upload-time = "2024-08-29T13:16:04.773Z" }, +] + [[package]] name = "pyyaml" version = "6.0.3" @@ -2022,6 +2076,15 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/a8/45/a132b9074aa18e799b891b91ad72133c98d8042c70f6240e4c5f9dabee2f/structlog-25.5.0-py3-none-any.whl", hash = "sha256:a8453e9b9e636ec59bd9e79bbd4a72f025981b3ba0f5837aebf48f02f37a7f9f", size = 72510, upload-time = "2025-10-27T08:28:21.535Z" }, ] +[[package]] +name = "supervisor" +version = "4.3.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/a9/b5/37e7a3706de436a8a2d75334711dad1afb4ddffab09f25e31d89e467542f/supervisor-4.3.0.tar.gz", hash = "sha256:4a2bf149adf42997e1bb44b70c43b613275ec9852c3edacca86a9166b27e945e", size = 468912, upload-time = "2025-08-23T18:25:02.418Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/0e/65/5e726c372da8a5e35022a94388b12252710aad0c2351699c3d76ae8dba78/supervisor-4.3.0-py2.py3-none-any.whl", hash = "sha256:0bcb763fddafba410f35cbde226aa7f8514b9fb82eb05a0c85f6588d1c13f8db", size = 320736, upload-time = "2025-08-23T18:25:00.767Z" }, +] + [[package]] name = "sympy" version = "1.14.0" From de403eeb7ab458dec1b9f6cf8eea7932bdf91e43 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 25 Jun 2026 15:49:43 -0700 Subject: [PATCH 190/591] Moved log headers into access log specification to avoid duplication of logged info --- .../src/mpcontribs_api/middleware.py | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/middleware.py b/mpcontribs-api/src/mpcontribs_api/middleware.py index 152fa6e3fb..6a5c674366 100644 --- a/mpcontribs-api/src/mpcontribs_api/middleware.py +++ b/mpcontribs-api/src/mpcontribs_api/middleware.py @@ -37,13 +37,11 @@ "id": os.getpid(), } -# Lowercased ASGI byte header name -> structlog context key. -_LOGGED_HEADERS: dict[bytes, str] = { - b"user-agent": "user_agent", +# Optional request headers folded into the access log's ``http.*`` block, only when sent. +_ACCESS_LOG_HEADERS: dict[bytes, str] = { b"accept": "accept", b"accept-language": "accept_language", b"accept-encoding": "accept_encoding", - b"referer": "referer", b"content-type": "content_type", b"content-length": "content_length", } @@ -83,10 +81,6 @@ async def __call__(self, scope: Scope, receive: Receive, send: Send) -> None: raw_consumer_id = headers.get(b"x-consumer-id") if raw_consumer_id is not None: context["consumer_id"] = raw_consumer_id.decode() - for header_name, log_key in _LOGGED_HEADERS.items(): - value = headers.get(header_name) - if value is not None: - context[log_key] = value.decode("latin-1") structlog.contextvars.clear_contextvars() structlog.contextvars.bind_contextvars(**context) @@ -134,16 +128,22 @@ def _emit_access_log( client = scope.get("client") client_ip = forwarded_for.split(",")[0].strip() if forwarded_for else (client[0] if client else "") + http: dict[str, object] = { + "method": scope["method"], + "status_code": status_code, + "url": url, + "referer": headers.get(b"referer", b"-").decode("latin-1"), + "useragent": headers.get(b"user-agent", b"").decode("latin-1"), + "version": scope.get("http_version", "1.1"), + } + for header_name, http_key in _ACCESS_LOG_HEADERS.items(): + value = headers.get(header_name) + if value is not None: + http[http_key] = value.decode("latin-1") + _access_logger.info( "http.access", - http={ - "method": scope["method"], - "status_code": status_code, - "url": url, - "referer": headers.get(b"referer", b"-").decode("latin-1"), - "useragent": headers.get(b"user-agent", b"").decode("latin-1"), - "version": scope.get("http_version", "1.1"), - }, + http=http, network={"bytes_written": bytes_written, "client": {"ip": client_ip}}, duration=duration_ns, # Datadog standard `duration` is nanoseconds response_time=duration_ns // 1000, # microseconds, matches the old gunicorn %(D)s From 4359ee8d18779267e506d82bb21d0c908d87ad09 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Fri, 26 Jun 2026 09:45:12 -0700 Subject: [PATCH 191/591] Added jinja2 back to dependencies and sorted deps --- mpcontribs-api/pyproject.toml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/mpcontribs-api/pyproject.toml b/mpcontribs-api/pyproject.toml index 9dfd350b5a..87f12d487a 100644 --- a/mpcontribs-api/pyproject.toml +++ b/mpcontribs-api/pyproject.toml @@ -25,7 +25,6 @@ authors = [ {name="The Materials Project", email="feedback@materialsproject.org"}, ] dependencies = [ - # "jinja2", # "pint>=0.24", # "psycopg2-binary", # "rq<=2.3.2", # see https://github.com/rq/Flask-RQ2/issues/620 @@ -33,23 +32,24 @@ dependencies = [ # "uncertainties", # "websocket_client", # "zstandard", + "aioboto3>=15.5.0", + "beanie>=2.1.0", "fastapi[standard]>=0.136.3", - "pymatgen", - "pymongo>=4.17.0", - "pydantic-settings>=2.14.1", - "structlog>=25.5.0", + "fastapi-filter>=2.0.1", + "jinja2", "opentelemetry-api>=1.42.1", - "opentelemetry-sdk>=1.42.1", "opentelemetry-exporter-otlp-proto-grpc>=1.42.1", "opentelemetry-instrumentation-fastapi>=0.63b1", "opentelemetry-instrumentation-pymongo>=0.63b1", - "beanie>=2.1.0", - "fastapi-filter>=2.0.1", - "aioboto3>=15.5.0", - "types-aiobotocore[s3]>=3.7.0", + "opentelemetry-sdk>=1.42.1", "polars>=1.41.2", - "supervisor>=4.3.0", + "pydantic-settings>=2.14.1", + "pymatgen", + "pymongo>=4.17.0", "python-snappy>=0.7.3", + "structlog>=25.5.0", + "supervisor>=4.3.0", + "types-aiobotocore[s3]>=3.7.0", ] [project.urls] From 016546be52c1526a3b0fc5623515f993dc4b979c Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Fri, 26 Jun 2026 10:24:50 -0700 Subject: [PATCH 192/591] Build uv venv outside of app so dependencies load properly --- mpcontribs-api/Dockerfile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/mpcontribs-api/Dockerfile b/mpcontribs-api/Dockerfile index f254a8c601..0e68e27786 100644 --- a/mpcontribs-api/Dockerfile +++ b/mpcontribs-api/Dockerfile @@ -6,6 +6,10 @@ WORKDIR /app FROM base AS builder RUN apt-get update && apt-get install -y --no-install-recommends gcc git g++ wget liblapack-dev libsnappy-dev && apt-get clean RUN pip install uv +# Build the venv OUTSIDE /app: docker-compose bind-mounts the host source over +# /app for live reload, which would mask a /app/.venv and leave `python` falling +# back to the system interpreter (missing deps) +ENV UV_PROJECT_ENVIRONMENT=/opt/venv COPY pyproject.toml uv.lock ./ COPY src src ARG CONTRIBS_VERSION @@ -15,8 +19,8 @@ RUN wget -q https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait- FROM base ARG BUILDARCH -ENV BUILDARCH=x86_64 -COPY --from=builder /app/.venv /app/.venv +ARG BUILDARCH=aarch64 +COPY --from=builder /opt/venv /opt/venv COPY --from=builder /usr/local/bin/wait-for-it.sh /usr/local/bin/ WORKDIR /app @@ -32,7 +36,7 @@ ARG VERSION # Telemetry (traces/metrics/logs) is emitted via OTLP to the Datadog Agent's OTLP receiver; the # endpoint and other OTEL settings are configured per-environment in supervisord.conf.jinja # (MPCONTRIBS_OTEL__*). No Datadog-specific app config lives here. -ENV PATH="/app/.venv/bin:$PATH" +ENV PATH="/opt/venv/bin:$PATH" EXPOSE 10000 10002 10003 10005 20000 ENTRYPOINT ["/app/docker-entrypoint.sh"] From 05811ea93c2ace6cf6937db5a1c6072bee64943f Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Fri, 26 Jun 2026 11:46:05 -0700 Subject: [PATCH 193/591] Fixed env var names to match new format --- mpcontribs-api/supervisord/supervisord.conf.jinja | 4 ---- 1 file changed, 4 deletions(-) diff --git a/mpcontribs-api/supervisord/supervisord.conf.jinja b/mpcontribs-api/supervisord/supervisord.conf.jinja index f35013a80f..4e26c0117a 100644 --- a/mpcontribs-api/supervisord/supervisord.conf.jinja +++ b/mpcontribs-api/supervisord/supervisord.conf.jinja @@ -6,14 +6,11 @@ pidfile=/tmp/supervisord.pid environment= MPCONTRIBS_ENVIRONMENT="{{ environment }}", MPCONTRIBS_VERSION="{{ version }}", - MPCONTRIBS_MONGO__URI="%(ENV_MPCONTRIBS_MONGO__URI)s", {% if not production %} AWS_ACCESS_KEY_ID="%(ENV_AWS_ACCESS_KEY_ID)s", AWS_SECRET_ACCESS_KEY="%(ENV_AWS_SECRET_ACCESS_KEY)s", {% endif %} METADATA_URI="%(ENV_ECS_CONTAINER_METADATA_URI_V4)s", - MPCONTRIBS_REDIS__ADDRESS="%(ENV_REDIS_ADDRESS)s", - MPCONTRIBS_REDIS__URL="%(ENV_REDIS_URL)s", AWS_REGION="us-east-1", AWS_DEFAULT_REGION="us-east-1", MPCONTRIBS_MAIL_DEFAULT_SENDER="contribs@materialsproject.org", @@ -64,7 +61,6 @@ stderr_logfile_maxbytes=0 environment= DEPLOYMENT={{ loop.index0 }}, API_PORT={{ cfg.api_port }}, - MPCONTRIBS_MONGO__DB_NAME="mpcontribs-{{ cfg.db }}", MPCONTRIBS_MONGO__ADMIN_GROUP="admin_{{ deployment }}.materialsproject.org" {% endset %} From 7aee18ed91d2046391daa47cf32f2ca9cf5d859d Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 29 Jun 2026 10:53:23 -0700 Subject: [PATCH 194/591] Added shared BaseFilter to convert from Beanie's aliased 'id' to real Mongo '_id' --- .../mpcontribs_api/domains/_shared/filters.py | 23 ++++++++++ .../domains/attachments/models.py | 6 +-- .../domains/contributions/models.py | 6 +-- .../mpcontribs_api/domains/projects/models.py | 6 +-- .../domains/structures/models.py | 6 +-- .../mpcontribs_api/domains/tables/models.py | 6 +-- .../db/test_projects_repository.py | 46 +++++++++++++++++++ mpcontribs-api/uv.lock | 2 + 8 files changed, 86 insertions(+), 15 deletions(-) create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/_shared/filters.py diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/filters.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/filters.py new file mode 100644 index 0000000000..027d25dfb5 --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/filters.py @@ -0,0 +1,23 @@ +from collections.abc import Mapping +from typing import Any + +from fastapi_filter.contrib.beanie import Filter + + +class BaseFilter(Filter): + """Base filter that bridges Beanie's ``_id`` alias and fastapi-filter's raw field names. + + Beanie stores a document's primary key under Mongo's ``_id`` (``id`` is just a Pydantic alias), + but fastapi-filter builds query keys from the raw field name read off ``model_dump`` — without + aliases. An ``id`` filter would therefore query a non-existent ``{"id": ...}`` key and match + nothing, while a direct ``Document.id == x`` lookup (which Beanie resolves to ``_id``) succeeds. + Remapping the ``id`` key to ``_id`` here keeps the two read paths consistent. + + Domain filters should subclass this instead of fastapi-filter's ``Filter`` directly. + """ + + def _get_filter_conditions(self, nesting_depth: int = 1) -> list[tuple[Mapping[str, Any], Mapping[str, Any]]]: + return [ + ({"_id" if key == "id" else key: value for key, value in condition.items()}, options) + for condition, options in super()._get_filter_conditions(nesting_depth) + ] diff --git a/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py b/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py index 7f5863706d..4d7375837b 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py @@ -1,7 +1,7 @@ from beanie import PydanticObjectId -from fastapi_filter.contrib.beanie import Filter from pydantic import field_validator +from mpcontribs_api.domains._shared.filters import BaseFilter from mpcontribs_api.domains._shared.models import Component, ComponentIn, DocumentOut from mpcontribs_api.domains._shared.types import FileLike, MD5Hash, MimeFormat from mpcontribs_api.exceptions import ValidationError @@ -64,7 +64,7 @@ class AttachmentPatch(SparseFieldsModel): content: int | None = None -class AttachmentFilter(Filter): +class AttachmentFilter(BaseFilter): id: PydanticObjectId | None = None id__in: list[PydanticObjectId] | None = None id__neq: PydanticObjectId | None = None @@ -86,5 +86,5 @@ class AttachmentFilter(Filter): # sorting order_by: list[str] | None = None - class Constants(Filter.Constants): + class Constants(BaseFilter.Constants): model = Attachment diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py index 8bfe04c619..e202eef76c 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py @@ -14,10 +14,10 @@ ) from bson.errors import InvalidId from fastapi_filter import FilterDepends, with_prefix -from fastapi_filter.contrib.beanie import Filter from pydantic import BeforeValidator, Field, field_validator from pymongo import ASCENDING, IndexModel +from mpcontribs_api.domains._shared.filters import BaseFilter from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut from mpcontribs_api.domains._shared.types import ShortStr from mpcontribs_api.domains.attachments.models import Attachment, AttachmentFilter, AttachmentIn @@ -188,7 +188,7 @@ class ContributionPatch(SparseFieldsModel): attachments: list[Link[Attachment]] | None = None -class ContributionFilter(Filter): +class ContributionFilter(BaseFilter): id: PydanticObjectId | None = None id__in: list[PydanticObjectId] | None = None id__neq: PydanticObjectId | None = None @@ -214,7 +214,7 @@ class ContributionFilter(Filter): # sorting order_by: list[str] | None = None - class Constants(Filter.Constants): + class Constants(BaseFilter.Constants): model = Contribution @field_validator("id", mode="before") diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py index 84082b58cf..7216c82acc 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py @@ -2,10 +2,10 @@ from typing import Any, Literal -from fastapi_filter.contrib.beanie import Filter from pydantic import BaseModel, ConfigDict, Field, HttpUrl from mpcontribs_api import pagination +from mpcontribs_api.domains._shared.filters import BaseFilter from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut from mpcontribs_api.domains._shared.types import PrefixedEmail, ShortStr @@ -100,7 +100,7 @@ def default_fields() -> list[str]: return ["id", "is_public", "title", "owner", "is_approved", "unique_identifiers"] -class ProjectFilter(Filter): +class ProjectFilter(BaseFilter): """Filter fields allowed in requests.""" id: ShortStr | None = None @@ -130,7 +130,7 @@ class ProjectFilter(Filter): # sorting order_by: list[str] | None = None - class Constants(Filter.Constants): + class Constants(BaseFilter.Constants): model = Project diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py index bf48bb8b54..b4c8f6aa53 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py @@ -1,8 +1,8 @@ from beanie import PydanticObjectId -from fastapi_filter.contrib.beanie import Filter from pydantic import BaseModel, ConfigDict from pymatgen.core import Element +from mpcontribs_api.domains._shared.filters import BaseFilter from mpcontribs_api.domains._shared.models import Component, ComponentIn, DocumentOut from mpcontribs_api.domains._shared.types import MD5Hash, PolarsFrame from mpcontribs_api.projection import SparseFieldsModel @@ -92,7 +92,7 @@ class StructurePatch(SparseFieldsModel): cif: str | None = None -class StructureFilter(Filter): +class StructureFilter(BaseFilter): id: PydanticObjectId | None = None id__in: list[PydanticObjectId] | None = None id__neq: PydanticObjectId | None = None @@ -111,5 +111,5 @@ class StructureFilter(Filter): # sorting order_by: list[str] | None = None - class Constants(Filter.Constants): + class Constants(BaseFilter.Constants): model = Structure diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py index b18e8443e3..44cb0368e2 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py @@ -3,7 +3,6 @@ import polars as pl from beanie import PydanticObjectId -from fastapi_filter.contrib.beanie import Filter from pydantic import ( BaseModel, ConfigDict, @@ -11,6 +10,7 @@ model_validator, ) +from mpcontribs_api.domains._shared.filters import BaseFilter from mpcontribs_api.domains._shared.models import Component, ComponentIn, DocumentOut from mpcontribs_api.domains._shared.types import MD5Hash, PolarsFrame from mpcontribs_api.projection import SparseFieldsModel @@ -97,7 +97,7 @@ class TableIn(ComponentIn): data: PolarsFrame -class TableFilter(Filter): +class TableFilter(BaseFilter): id: PydanticObjectId | None = None id__in: list[PydanticObjectId] | None = None id__neq: PydanticObjectId | None = None @@ -117,7 +117,7 @@ class TableFilter(Filter): # sorting order_by: list[str] | None = None - class Constants(Filter.Constants): + class Constants(BaseFilter.Constants): model = Table @field_serializer("id", "id__in", "id__neq") diff --git a/mpcontribs-api/tests/integration/db/test_projects_repository.py b/mpcontribs-api/tests/integration/db/test_projects_repository.py index 137a7495a2..6ec770c1aa 100644 --- a/mpcontribs-api/tests/integration/db/test_projects_repository.py +++ b/mpcontribs-api/tests/integration/db/test_projects_repository.py @@ -142,6 +142,52 @@ async def test_anon_cannot_get_private_project(self, db): assert result is None +# --------------------------------------------------------------------------- +# get_projects — id filtering +# +# Regression: Beanie stores the primary key under Mongo's ``_id`` (``id`` is an +# alias), but fastapi-filter keys queries on the raw field name. Without the +# ``id`` -> ``_id`` remap in BaseFilter these filters matched nothing even +# though get_project_by_id (which queries ``_id`` directly) found the document. +# --------------------------------------------------------------------------- + + +class TestGetProjectsIdFilter: + async def test_filter_by_id_matches(self, db): + from mpcontribs_api.domains.projects.models import ProjectFilter + + await _insert("filter-id-hit") + page = await _repo(ADMIN).get_projects( + filter=ProjectFilter(id="filter-id-hit"), pagination=CursorParams(), fields=None + ) + assert {p.id for p in page.items} == {"filter-id-hit"} + + async def test_filter_by_id_in_matches(self, db): + from mpcontribs_api.domains.projects.models import ProjectFilter + + await _insert("filter-id-in-a") + await _insert("filter-id-in-b") + await _insert("filter-id-in-c") + page = await _repo(ADMIN).get_projects( + filter=ProjectFilter(id__in=["filter-id-in-a", "filter-id-in-b"]), + pagination=CursorParams(), + fields=None, + ) + assert {p.id for p in page.items} == {"filter-id-in-a", "filter-id-in-b"} + + async def test_filter_by_id_neq_excludes(self, db): + from mpcontribs_api.domains.projects.models import ProjectFilter + + await _insert("filter-id-neq-keep") + await _insert("filter-id-neq-drop") + page = await _repo(ADMIN).get_projects( + filter=ProjectFilter(id__neq="filter-id-neq-drop"), pagination=CursorParams(), fields=None + ) + ids = {p.id for p in page.items} + assert "filter-id-neq-keep" in ids + assert "filter-id-neq-drop" not in ids + + # --------------------------------------------------------------------------- # Field projection # --------------------------------------------------------------------------- diff --git a/mpcontribs-api/uv.lock b/mpcontribs-api/uv.lock index 008b2c5eeb..1d0de33fc5 100644 --- a/mpcontribs-api/uv.lock +++ b/mpcontribs-api/uv.lock @@ -1010,6 +1010,7 @@ dependencies = [ { name = "beanie" }, { name = "fastapi", extra = ["standard"] }, { name = "fastapi-filter" }, + { name = "jinja2" }, { name = "opentelemetry-api" }, { name = "opentelemetry-exporter-otlp-proto-grpc" }, { name = "opentelemetry-instrumentation-fastapi" }, @@ -1042,6 +1043,7 @@ requires-dist = [ { name = "beanie", specifier = ">=2.1.0" }, { name = "fastapi", extras = ["standard"], specifier = ">=0.136.3" }, { name = "fastapi-filter", specifier = ">=2.0.1" }, + { name = "jinja2" }, { name = "opentelemetry-api", specifier = ">=1.42.1" }, { name = "opentelemetry-exporter-otlp-proto-grpc", specifier = ">=1.42.1" }, { name = "opentelemetry-instrumentation-fastapi", specifier = ">=0.63b1" }, From 825738412f47cde8bd69fa570fb05e060b1729a1 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 29 Jun 2026 11:19:47 -0700 Subject: [PATCH 195/591] Pagination cursor pads b64 encoded cursor to safely decode --- mpcontribs-api/src/mpcontribs_api/pagination.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mpcontribs-api/src/mpcontribs_api/pagination.py b/mpcontribs-api/src/mpcontribs_api/pagination.py index e978a613f9..cf4d112984 100644 --- a/mpcontribs-api/src/mpcontribs_api/pagination.py +++ b/mpcontribs-api/src/mpcontribs_api/pagination.py @@ -36,7 +36,9 @@ def encode_cursor(last_id: str) -> str: def decode_cursor(cursor: str) -> str: """Base64 decodes a cursor for pagination""" + # Re-add any base64 padding ('=') that may have been stripped in transit (e.g. via URLs). + padded = cursor + "=" * (-len(cursor) % 4) try: - return base64.urlsafe_b64decode(cursor.encode()).decode() + return base64.urlsafe_b64decode(padded.encode()).decode() except ValueError, UnicodeDecodeError: raise ValueError("malformed cursor") from None From b899b943286d1b3d03b5b66bff1cc7e1282fe6e9 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 29 Jun 2026 11:52:44 -0700 Subject: [PATCH 196/591] Removed response_model from router 'get_*' methods since that would overwrite the requested fields and add in null values for the non-requested fields --- .../src/mpcontribs_api/domains/attachments/router.py | 6 +++--- .../src/mpcontribs_api/domains/projects/router.py | 5 ++--- .../src/mpcontribs_api/domains/structures/router.py | 6 +++--- mpcontribs-api/src/mpcontribs_api/domains/tables/router.py | 6 +++--- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py b/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py index 49e2c076b4..09214a4fa2 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py @@ -14,12 +14,12 @@ ) from mpcontribs_api.domains.attachments.dependencies import AttachmentServiceDep from mpcontribs_api.domains.attachments.models import AttachmentFilter, AttachmentOut -from mpcontribs_api.pagination import CursorParams, Page +from mpcontribs_api.pagination import CursorParams router = APIRouter() -@router.get("", response_model=Page[AttachmentOut]) +@router.get("") async def get_attachments( service: AttachmentServiceDep, pagination: Annotated[CursorParams, Depends()], @@ -30,7 +30,7 @@ async def get_attachments( return await service.get_many(filter=filter, fields=selected, pagination=pagination) -@router.get("/{pk}", response_model=AttachmentOut) +@router.get("/{pk}") async def get_attachment( service: AttachmentServiceDep, pk: str, diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py index e82116b270..33dce7ebd7 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py @@ -18,8 +18,7 @@ router = APIRouter() -# Brendan TODO: Add in option to select ProjectSummary or ProjectOut -@router.get("", response_model=None) +@router.get("") async def get_projects( repo: ProjectDep, pagination: Annotated[CursorParams, Depends()], @@ -40,7 +39,7 @@ async def get_projects( return await repo.get_projects(filter=filter, pagination=pagination, fields=selected) -@router.get("/{id}", response_model=ProjectOut) +@router.get("/{id}") async def get_project_by_id( id: str, repo: ProjectDep, diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py index 0a5746607c..803047648f 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py @@ -15,12 +15,12 @@ ) from mpcontribs_api.domains.structures.dependencies import StructureServiceDep from mpcontribs_api.domains.structures.models import StructureFilter, StructureIn, StructureOut, StructurePatch -from mpcontribs_api.pagination import CursorParams, Page +from mpcontribs_api.pagination import CursorParams router = APIRouter() -@router.get("", response_model=Page[StructureOut]) +@router.get("") async def get_structures( service: StructureServiceDep, pagination: Annotated[CursorParams, Depends()], @@ -31,7 +31,7 @@ async def get_structures( return await service.get_many(filter=filter, fields=selected, pagination=pagination) -@router.get("/{pk}", response_model=StructureOut) +@router.get("/{pk}") async def get_structure( service: StructureServiceDep, pk: str, diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py index 619f4073e0..703f0c6faa 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py @@ -15,12 +15,12 @@ ) from mpcontribs_api.domains.tables.dependencies import TableServiceDep from mpcontribs_api.domains.tables.models import Table, TableFilter, TableIn, TableOut, TablePatch -from mpcontribs_api.pagination import CursorParams, Page +from mpcontribs_api.pagination import CursorParams router = APIRouter() -@router.get("", response_model=Page[TableOut]) +@router.get("") async def get_tables( service: TableServiceDep, pagination: Annotated[CursorParams, Depends()], @@ -31,7 +31,7 @@ async def get_tables( return await service.get_many(filter=filter, fields=selected, pagination=pagination) -@router.get("/{pk}", response_model=TableOut) +@router.get("/{pk}") async def get_table( service: TableServiceDep, pk: str, From 2c5cedb38ad517a1f13719c2af6293567b3f953c Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Tue, 30 Jun 2026 14:06:10 -0700 Subject: [PATCH 197/591] Contributions are now versioned. The server derives integer versions from the number of documents sharing (project, identifier) in projects where unique_identifiers=False, otherwise version === 1 --- mpcontribs-api/src/mpcontribs_api/app.py | 2 - .../domains/_shared/repository.py | 2 +- .../domains/contributions/dependencies.py | 2 + .../domains/contributions/models.py | 26 +- .../domains/contributions/repository.py | 56 +++- .../domains/contributions/service.py | 279 +++++++++++++----- .../domains/projects/repository.py | 24 ++ .../unit/domains/test_contribution_service.py | 129 +++++++- .../tests/unit/test_supervisord_render.py | 4 - 9 files changed, 422 insertions(+), 102 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/app.py b/mpcontribs-api/src/mpcontribs_api/app.py index 29c5d10f4b..0e50c916bb 100644 --- a/mpcontribs-api/src/mpcontribs_api/app.py +++ b/mpcontribs-api/src/mpcontribs_api/app.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from collections.abc import AsyncGenerator from contextlib import AbstractAsyncContextManager, AsyncExitStack, asynccontextmanager from typing import cast diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py index a974c31ba1..4e32775443 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py @@ -105,7 +105,7 @@ async def get_many( next_cursor = encode_cursor(str(items[-1].id)) if has_more and items else None return Page(items=items, next_cursor=next_cursor) - async def get_by_id(self, id: Any, fields: frozenset[str] | None) -> TDoc | TOut | None: + async def get_by_id(self, id: Any, fields: frozenset[str] | None = None) -> TDoc | TOut | None: """Return a single scoped document by id, projected to the requested fields. Args: diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/dependencies.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/dependencies.py index b0cce8e0df..805d4357a1 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/dependencies.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/dependencies.py @@ -8,6 +8,7 @@ MongoDbContributionRepository, ) from mpcontribs_api.domains.contributions.service import ContributionService +from mpcontribs_api.domains.projects.repository import MongoDbProjectRepository from mpcontribs_api.domains.structures.repository import MongoDbStructureRepository from mpcontribs_api.domains.tables.repository import MongoDbTableRepository @@ -23,6 +24,7 @@ def get_contribution_service(user: UserDep, client: MongoClientDep) -> Contribut return ContributionService( client=client, user=user, + projects=MongoDbProjectRepository(user), contributions=MongoDbContributionRepository(user), structures=MongoDbStructureRepository(user), attachments=MongoDbAttachmentRepository(user), diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py index e202eef76c..c200aec70e 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py @@ -93,8 +93,8 @@ class Settings: keep_nulls = False indexes = [ IndexModel( - keys=[("project", ASCENDING), ("identifier", ASCENDING)], - name="project_idenfitier", + keys=[("project", ASCENDING), ("identifier", ASCENDING), ("version", ASCENDING)], + name="project_identifier_version", unique=True, ), # Multikey indexes over each Link field's DBRef id so the component-delete @@ -107,6 +107,9 @@ class Settings: class Contribution(ContributionBase): is_public: bool + # Server-owned: the service resolves the real version (see ContributionService._split_non_unique) + # and stamps it on the doc. Defaults to 1 so the no-version (unique-identifier) case is implicit. + version: int = 1 structures: list[Link[Structure]] | None = None tables: list[Link[Table]] | None = None attachments: list[Link[Attachment]] | None = None @@ -115,10 +118,13 @@ class Contribution(ContributionBase): @classmethod def from_input_model(cls, data: ContributionIn) -> Contribution: # Server-owned fields are not taken from input: is_public starts False, components are - # inserted separately, and last_modified is stamped by the before_event hook. + # inserted separately, last_modified is stamped by the before_event hook, and version is + # resolved/stamped by the service (never trusted from the request body). return cls.model_validate( { - **data.model_dump(exclude={"is_public", "structures", "tables", "attachments", "last_modified"}), + **data.model_dump( + exclude={"is_public", "version", "structures", "tables", "attachments", "last_modified"} + ), "is_public": False, } ) @@ -129,6 +135,10 @@ def set_last_modified(self): class ContributionIn(ContributionBase): + # Only meaningful on upsert/update of a non-unique-identifier project, where it selects which + # version to target. Ignored on insert (the service auto-assigns) and for unique-identifier + # projects (inferred as 1). + version: int | None = None structures: list[StructureIn] | None = None tables: list[TableIn] | None = None attachments: list[AttachmentIn] | None = None @@ -149,6 +159,7 @@ def identifiers(self) -> dict[str, str]: class ContributionOut(DocumentOut[PydanticObjectId]): project: str | None = None identifier: str | None = None + version: int | None = None formula: str | None = None is_public: bool | None = None last_modified: datetime | None = None @@ -166,6 +177,7 @@ def default_fields() -> list[str]: "id", "project", "identifier", + "version", "formula", "is_public", "last_modified", @@ -176,6 +188,7 @@ def default_fields() -> list[str]: class ContributionPatch(SparseFieldsModel): project: str | None = None identifier: str | None = None + version: int | None = None formula: str | None = None needs_build: bool | None = None data: Annotated[ @@ -198,6 +211,11 @@ class ContributionFilter(BaseFilter): identifier__neq: ShortStr | None = None identifier__ilike: str | None = None + version: str | None = None + version__in: list[ShortStr] | None = None + version__neq: ShortStr | None = None + version__ilike: str | None = None + formula: str | None = None formula__in: list[ShortStr] | None = None formula__neq: ShortStr | None = None diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py index 31c2d3dfc4..82b91c31b7 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py @@ -112,6 +112,48 @@ async def find_one_contribution(self, project: str, identifier: str) -> Contribu self.document_model.identifier == identifier, ) + async def max_versions(self, keys: list[tuple[str, str]]) -> dict[tuple[str, str], int]: + """Return ``{(project, identifier): max_version}`` for the given keys, scoped to the user. + + Presence of a key in the result also signals that at least one contribution already exists + for it, which the contribution write path uses to enforce uniqueness on unique-identifier + projects and to compute the next version on non-unique ones. Keys with no existing + contributions are absent from the result. + + A single aggregation answers the whole batch so the write path avoids one round-trip per + contribution. Scope is merged into ``$match`` (mirroring :meth:`referenced_component_ids`); + a writer sees every contribution in their own project, so the scoped max equals the global + max for keys they may write. + + Args: + keys: (project, identifier) pairs to look up + + Returns: + dict[tuple[str, str], int]: highest existing version per requested key + """ + if not keys: + return {} + match: dict[str, Any] = {"$or": [{"project": p, "identifier": i} for p, i in keys]} + if self._scope: + match = {"$and": [self._scope, match]} + pipeline: list[dict[str, Any]] = [ + {"$match": match}, + { + "$group": { + "_id": {"project": "$project", "identifier": "$identifier"}, + "max_version": {"$max": "$version"}, + } + }, + ] + collection = self.document_model.get_pymongo_collection() + result: dict[tuple[str, str], int] = {} + async for doc in await collection.aggregate(pipeline): + gid = doc["_id"] + # Versions are >= 1; coalesce a null $max (legacy docs without the field) to 0 while + # still recording the key's presence (existence check for unique-identifier projects). + result[(gid["project"], gid["identifier"])] = doc.get("max_version") or 0 + return result + async def referenced_component_ids( self, ref_field: str, @@ -193,16 +235,20 @@ async def upsert_contribution_by_identifiers( self, identifiers: dict[str, str], contribution: ContributionIn, + version: int, ) -> Contribution: - """Atomically upsert a Contribution by its identifying fields. + """Atomically upsert a Contribution by its identifying fields and resolved version. - Relies on the unique index over those fields so that concurrent requests targeting the - same key cannot both win the insert branch. Fields the caller did not set are not touched - (partial update). On insert a fresh Contribution document is written with ``is_public=False``. + Relies on the unique index over (project, identifier, version) so that concurrent requests + targeting the same key cannot both win the insert branch. Fields the caller did not set are + not touched (partial update). On insert a fresh Contribution document is written with + ``is_public=False``. Args: identifiers: the fields ContributionIn.identifiers() returns (project, identifier) contribution: the input payload to upsert + version: the version resolved by the service (1 for unique-identifier projects, or the + caller-supplied version for non-unique ones); selects which row to update Returns: Contribution: the document as it stands after the operation @@ -212,11 +258,13 @@ async def upsert_contribution_by_identifiers( raise PermissionError(f"not authorized to write to project '{identifiers['project']}'") doc = self.document_model.from_input_model(contribution) + doc.version = version update_data = doc.model_dump(exclude={"id"}, exclude_none=True) query = self.document_model.find_one( self._scope, self.document_model.project == identifiers["project"], self.document_model.identifier == identifiers["identifier"], + self.document_model.version == version, ).upsert( Set(update_data), on_insert=doc, diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py index 52bbe32273..88ba3a523f 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py @@ -1,6 +1,7 @@ import asyncio from collections import defaultdict from collections.abc import Iterable +from dataclasses import dataclass from typing import cast import structlog @@ -21,21 +22,36 @@ from mpcontribs_api.domains.attachments.repository import MongoDbAttachmentRepository from mpcontribs_api.domains.contributions.models import Contribution, ContributionFilter, ContributionIn from mpcontribs_api.domains.contributions.repository import MongoDbContributionRepository +from mpcontribs_api.domains.projects.repository import MongoDbProjectRepository from mpcontribs_api.domains.structures.models import Structure from mpcontribs_api.domains.structures.repository import MongoDbStructureRepository from mpcontribs_api.domains.tables.models import Table from mpcontribs_api.domains.tables.repository import MongoDbTableRepository -from mpcontribs_api.exceptions import AppError, PermissionError, ValidationError +from mpcontribs_api.exceptions import AppError, ConflictError, PermissionError, ValidationError from mpcontribs_api.pagination import CursorParams logger = structlog.get_logger(__name__) +@dataclass(frozen=True, slots=True) +class ResolvedWrite: + """A contribution that passed validation, paired with its server-resolved version. + + Produced by the split pipeline so the resolved version travels with its contribution (and its + original batch index) + """ + + index: int + contribution: ContributionIn + version: int + + class ContributionService: def __init__( self, client: AsyncMongoClient, user: User, + projects: MongoDbProjectRepository, contributions: MongoDbContributionRepository, structures: MongoDbStructureRepository, attachments: MongoDbAttachmentRepository, @@ -44,6 +60,7 @@ def __init__( ): self._client = client self._user = user + self._projects = projects self._contributions = contributions self._structures = structures self._attachments = attachments @@ -70,32 +87,25 @@ async def insert_contributions( ``settings.mongo.max_concurrent_transactions``. Per-item failures are returned in the summary's ``failed`` list; the request as a whole does not raise on partial failure. + Version is server-assigned per contribution: unique-identifier projects reject a duplicate + (project, identifier) as a conflict (version stays 1); non-unique projects auto-increment + from the current max. See ``_split_non_unique``. + Args: contributions: contributions to insert; may include nested structures/tables/attachments Returns: BulkWriteSummary[Contribution]: per-item outcome, sized to ``len(contributions)`` - - Raises: - ValidationError: if duplicate keys (project-identifier) are found in ``contributions`` """ if not contributions: return BulkWriteSummary[Contribution](total=0, succeeded=[], failed=[]) - self._reject_duplicate_keys(contributions) + failures, plan = await self._split_contributions(contributions, is_upsert=False) + no_comp = [item for item in plan if not item.contribution.has_components()] + with_comp = [item for item in plan if item.contribution.has_components()] - failures, remaining_indices = self._split_contributions(contributions) - no_comp_indices = [i for i in remaining_indices if not contributions[i].has_components()] - with_comp_indices = [i for i in remaining_indices if contributions[i].has_components()] - - no_comp_succeeded, no_comp_failed = await self._insert_no_components( - indices=no_comp_indices, - contributions=contributions, - ) - with_comp_succeeded, with_comp_failed = await self._insert_with_components( - indices=with_comp_indices, - contributions=contributions, - ) + no_comp_succeeded, no_comp_failed = await self._insert_no_components(no_comp) + with_comp_succeeded, with_comp_failed = await self._insert_with_components(with_comp) succeeded = [doc for _, doc in sorted(no_comp_succeeded + with_comp_succeeded, key=lambda p: p[0])] failed = sorted( @@ -104,26 +114,6 @@ async def insert_contributions( ) return BulkWriteSummary[Contribution](total=len(contributions), succeeded=succeeded, failed=failed) - def _reject_duplicate_keys(self, contributions: list[ContributionIn]) -> None: - """Reject the whole batch if any identifying key appears more than once. - - Mongo would surface this as a duplicate key error; catching it upfront keeps a guaranteed - failure from consuming a transaction slot and gives the caller all offending indices at once. - - The dedup key is derived from every value in ``identifiers()`` so adding a field to the - uniqueness contract there flows through here automatically. - """ - seen: dict[tuple[str, ...], list[int]] = defaultdict(list) - for index, contribution in enumerate(contributions): - ids = contribution.identifiers() - seen[tuple(ids.values())].append(index) - duplicates = sorted(index for indices in seen.values() if len(indices) > 1 for index in indices) - if duplicates: - raise ValidationError( - "Duplicate (project, identifier) pairs in batch", - contribution_indices=duplicates, - ) - def _split_unauthorized( self, indices: Iterable[int], @@ -154,8 +144,125 @@ def _split_unauthorized( message=f"not authorized to write to project '{contrib.project}'", ) ) + logger.warning( + "User attempted to add contributions to projects they are not authorized for.", + project=contrib.project, + ) return unauthorized, remaining + async def _split_non_unique( + self, + indices: Iterable[int], + contributions: list[ContributionIn], + *, + is_upsert: bool, + ) -> tuple[list[BulkFailure], list[ResolvedWrite]]: + """Apply per-project identifier-uniqueness rules and resolve each contribution's version. + + ``Project.unique_identifiers`` decides the contract per project: + + - **True**: at most one contribution per (project, identifier); version is always 1. On + insert a second one (already in the DB, or a duplicate earlier in this batch) is rejected + as a conflict. On upsert the version is inferred as 1 (any supplied value is ignored). + - **False**: many versions may share (project, identifier). On insert the version is + auto-assigned as ``max(existing) + 1``, sequencing intra-batch duplicates. On upsert the + caller must supply ``version`` to pick the target row, else the item is rejected. + + Iterates ``indices`` in input order so intra-batch duplicates sequence deterministically. + + Returns: + tuple of (rejections, a ``ResolvedWrite`` per survivor pairing it with its version) + """ + indices = list(indices) + failures: list[BulkFailure] = [] + plan: list[ResolvedWrite] = [] + if not indices: + return failures, plan + + # One round-trip each for the per-project uniqueness flags and (insert only) the current + # max version per key, instead of a query per contribution. + unique_map = await self._projects.unique_identifiers_by_id(sorted({contributions[i].project for i in indices})) + max_map: dict[tuple[str, str], int] = {} + if not is_upsert: + keys = sorted({(contributions[i].project, contributions[i].identifier) for i in indices}) + max_map = await self._contributions.max_versions(keys) + + seen: dict[tuple[str, str], int] = defaultdict(int) + for i in indices: + contrib = contributions[i] + key = (contrib.project, contrib.identifier) + + if contrib.project not in unique_map: + failures.append( + BulkFailure( + index=i, + identifier=contrib.identifiers(), + error_code=ValidationError.error_code, + message=f"project '{contrib.project}' not found or not accessible", + ) + ) + logger.info( + "project not found or not accessible", + project=contrib.project, + identifiers=contrib.identifiers(), + ) + continue + + unique = unique_map[contrib.project] + if is_upsert: + if unique: + version = 1 + elif contrib.version is not None: + version = contrib.version + else: + failures.append( + BulkFailure( + index=i, + identifier=contrib.identifiers(), + error_code=ValidationError.error_code, + message=( + f"project '{contrib.project}' allows multiple versions; a 'version' " + "is required to identify which contribution to update" + ), + ) + ) + logger.info( + "ambiguous contribution version in project allowing multiple versions", + project=contrib.project, + identifiers=contrib.identifiers(), + ) + continue + elif unique: + # Insert into a unique-identifier project: the first occurrence wins, anything that + # already exists (in the DB or earlier in this batch) is a conflict. + if key in max_map or seen[key] > 0: + failures.append( + BulkFailure( + index=i, + identifier=contrib.identifiers(), + error_code=ConflictError.error_code, + message=( + f"contribution '{contrib.identifier}' already exists for project '{contrib.project}'" + ), + ) + ) + logger.info( + "contribution already exists in project during insert/upsert/update", + project=contrib.project, + identifiers=contrib.identifiers(), + ) + continue + version = 1 + else: + # Insert into a non-unique-identifier project: next version after the current max, + # sequencing duplicates within this batch (max+1, max+2, ...). + version = max_map.get(key, 0) + 1 + seen[key] + + plan.append(ResolvedWrite(index=i, contribution=contrib, version=version)) + seen[key] += 1 + + return failures, plan + def _split_oversize( self, indices: Iterable[int], @@ -183,27 +290,36 @@ def _split_oversize( "Recommend inserting the component alone, followed by bulk inserts of components", ) ) + logger.info("Attemped to add contribution with too many components.", num_components=count, max=cap) else: remaining.append(i) return oversize, remaining - def _split_contributions(self, contributions) -> tuple[list[BulkFailure], list[int]]: - """Common method for validating contribution write failure logic + async def _split_contributions( + self, contributions: list[ContributionIn], *, is_upsert: bool + ) -> tuple[list[BulkFailure], list[ResolvedWrite]]: + """Common method for validating contribution write failure logic and resolving versions. + + Runs the cheap, local, index-based filters first (authorization, then component-count cap) + so guaranteed failures never reach the DB; ``_split_non_unique`` runs last and turns the + remaining indices into a write plan carrying each resolved version. Returns: - tuple[list[BulkFailure], list[int]]: a tuple containing a list of failures and their reasons, - and the indices of valid contributions from 'contributions' to write + tuple of (failures and their reasons, a ``ResolvedWrite`` per contribution to write) """ # Per-item project authorization (see _split_unauthorized for the per-item vs fail-fast # decision). Only authorized items reach Mongo; the rest are reported in ``failed``. unauthorized_failures, authorized_indices = self._split_unauthorized(range(len(contributions)), contributions) - oversize_failures, remaining_indices = self._split_oversize(authorized_indices, contributions) - return (unauthorized_failures + oversize_failures, remaining_indices) + # Reject contributions that have too many components associated with them. + oversize_failures, sized_indices = self._split_oversize(authorized_indices, contributions) + # Verify identifiers/uniqueness within a project and resolve each version, depending on + # project.unique_identifiers and whether this is an insert or upsert. + non_unique_failures, plan = await self._split_non_unique(sized_indices, contributions, is_upsert=is_upsert) + return (unauthorized_failures + oversize_failures + non_unique_failures, plan) async def _insert_no_components( self, - indices: list[int], - contributions: list[ContributionIn], + items: list[ResolvedWrite], ) -> tuple[list[tuple[int, Contribution]], list[BulkFailure]]: """Single-collection bulk insert for component-free contributions. @@ -211,20 +327,23 @@ async def _insert_no_components( raises ``BulkWriteError`` with per-index error info on partial failure; we map that back onto the original input indices. """ - if not indices: + if not items: return [], [] - docs = [Contribution.from_input_model(contributions[i]) for i in indices] + docs = [] + for item in items: + doc = Contribution.from_input_model(item.contribution) + doc.version = item.version + docs.append(doc) try: await self._contributions.insert_many_contributions(docs) - return list(zip(indices, docs, strict=False)), [] + return [(item.index, doc) for item, doc in zip(items, docs, strict=True)], [] except BulkWriteError as exc: - return self._partition_bulk_write_error(indices, docs, contributions, exc) + return self._partition_bulk_write_error(items, docs, exc) @staticmethod def _partition_bulk_write_error( - indices: list[int], + items: list[ResolvedWrite], docs: list[Contribution], - contributions: list[ContributionIn], exc: BulkWriteError, ) -> tuple[list[tuple[int, Contribution]], list[BulkFailure]]: """Map pymongo's per-position writeErrors back to the caller's original input indices.""" @@ -232,15 +351,15 @@ def _partition_bulk_write_error( failed_positions = {err.get("index"): err for err in write_errors} succeeded: list[tuple[int, Contribution]] = [] failed: list[BulkFailure] = [] - for position, (orig_index, doc) in enumerate(zip(indices, docs, strict=False)): + for position, (item, doc) in enumerate(zip(items, docs, strict=True)): err = failed_positions.get(position) if err is None: - succeeded.append((orig_index, doc)) + succeeded.append((item.index, doc)) else: failed.append( BulkFailure( - index=orig_index, - identifier=contributions[orig_index].identifiers(), + index=item.index, + identifier=item.contribution.identifiers(), error_code="conflict" if err.get("code") == 11000 else "write_error", message=err.get("errmsg", "write failed"), ) @@ -249,53 +368,51 @@ def _partition_bulk_write_error( async def _insert_with_components( self, - indices: list[int], - contributions: list[ContributionIn], + items: list[ResolvedWrite], ) -> tuple[list[tuple[int, Contribution]], list[BulkFailure]]: """Per-contribution transaction path, bounded by ``max_concurrent_transactions``.""" - if not indices: + if not items: return [], [] sem = asyncio.Semaphore(self._settings.max_concurrent_transactions) - async def _bounded(orig_index: int) -> Contribution | BulkFailure: + async def _bounded(item: ResolvedWrite) -> Contribution | BulkFailure: async with sem: - return await self._insert_one_with_components(orig_index, contributions[orig_index]) + return await self._insert_one_with_components(item) - results = await asyncio.gather(*[_bounded(i) for i in indices]) + results = await asyncio.gather(*[_bounded(item) for item in items]) succeeded: list[tuple[int, Contribution]] = [] failed: list[BulkFailure] = [] - for orig_index, outcome in zip(indices, results, strict=True): + for item, outcome in zip(items, results, strict=True): if isinstance(outcome, BulkFailure): failed.append(outcome) else: - succeeded.append((orig_index, outcome)) + succeeded.append((item.index, outcome)) return succeeded, failed - async def _insert_one_with_components( - self, - index: int, - contrib: ContributionIn, - ) -> Contribution | BulkFailure: + async def _insert_one_with_components(self, item: ResolvedWrite) -> Contribution | BulkFailure: """Run a single contribution + its components inside a transaction. Uses ``session.with_transaction`` so transient txn errors (write conflicts, primary step- downs) get pymongo's retry treatment. Any exception is converted to a ``BulkFailure`` so the surrounding ``asyncio.gather`` sees a normal return value for every coroutine. """ + contrib = item.contribution try: async with self._client.start_session() as session: async def _txn(s: AsyncClientSession) -> Contribution: - return await self._do_insert(contrib, s) + return await self._do_insert(contrib, s, item.version) return await session.with_transaction(_txn) except AppError as exc: - return bulk_failure_from_exception(index, contrib.identifiers(), exc) + return bulk_failure_from_exception(item.index, contrib.identifiers(), exc) except Exception as exc: - logger.error("insert_contribution_failed", index=index, identifier=contrib.identifiers(), exc_info=True) - return bulk_failure_from_exception(index, contrib.identifiers(), exc) + logger.error( + "insert_contribution_failed", index=item.index, identifier=contrib.identifiers(), exc_info=True + ) + return bulk_failure_from_exception(item.index, contrib.identifiers(), exc) - async def _do_insert(self, contrib: ContributionIn, session: AsyncClientSession) -> Contribution: + async def _do_insert(self, contrib: ContributionIn, session: AsyncClientSession, version: int) -> Contribution: """Insert components then the contribution itself, all in the given session. Components are inserted sequentially because a session is single-threaded — sharing it @@ -305,6 +422,7 @@ async def _do_insert(self, contrib: ContributionIn, session: AsyncClientSession) tables = await self._tables.insert_components(contrib.tables or [], session=session) doc = Contribution.from_input_model(contrib) + doc.version = version doc.structures = cast(list[Link[Structure]] | None, structures or None) doc.tables = cast(list[Link[Table]] | None, tables or None) return await self._contributions.insert_contribution(doc, session=session) @@ -342,21 +460,24 @@ async def upsert_contributions(self, contributions: list[ContributionIn]) -> Bul contribution_indices=indices_with_components, ) - failures, remaining_indices = self._split_contributions(contributions) + failures, plan = await self._split_contributions(contributions, is_upsert=True) sem = asyncio.Semaphore(self._settings.max_concurrent_transactions) - async def _bounded_upsert(index: int, contrib: ContributionIn) -> Contribution | BulkFailure: + async def _bounded_upsert(item: ResolvedWrite) -> Contribution | BulkFailure: + contrib = item.contribution async with sem: try: - return await self._contributions.upsert_contribution_by_identifiers(contrib.identifiers(), contrib) + return await self._contributions.upsert_contribution_by_identifiers( + contrib.identifiers(), contrib, item.version + ) except Exception as exc: logger.error( - "upsert_contribution_failed", index=index, identifier=contrib.identifiers(), exc_info=True + "upsert_contribution_failed", index=item.index, identifier=contrib.identifiers(), exc_info=True ) - return bulk_failure_from_exception(index, contrib.identifiers(), exc) + return bulk_failure_from_exception(item.index, contrib.identifiers(), exc) - results = await asyncio.gather(*[_bounded_upsert(i, contributions[i]) for i in remaining_indices]) + results = await asyncio.gather(*[_bounded_upsert(item) for item in plan]) succeeded = [r for r in results if not isinstance(r, BulkFailure)] failed = failures + [r for r in results if isinstance(r, BulkFailure)] return BulkWriteSummary[Contribution](total=len(contributions), succeeded=succeeded, failed=failed) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py index f0f3f09f36..0e6f96a96c 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py @@ -58,6 +58,30 @@ async def get_project_by_id(self, id: str, fields: frozenset[str] | None): """Find a single project by id, scoped to the current user. See ``get_by_id``.""" return await self.get_by_id(id, fields) + async def unique_identifiers_by_id(self, ids: list[str]) -> dict[str, bool]: + """Return ``{project_id: unique_identifiers}`` for the given project ids, scoped to the user. + + Used by the contribution write path to apply per-project version rules in one round-trip + instead of fetching each project separately. Projects the user cannot see (or that do not + exist) are simply absent from the result, so the caller can treat them as inaccessible. + + Args: + ids: project ids to look up + + Returns: + dict[str, bool]: mapping of project id to its ``unique_identifiers`` flag + """ + if not ids: + return {} + query: dict[str, Any] = {"_id": {"$in": ids}} + if self._scope: + query = {"$and": [self._scope, query]} + collection = self.document_model.get_pymongo_collection() + result: dict[str, bool] = {} + async for doc in collection.find(query, {"unique_identifiers": 1}): + result[doc["_id"]] = bool(doc.get("unique_identifiers")) + return result + async def insert_project(self, project: ProjectIn) -> Project: """Insert a new project, rejecting a duplicate id. See ``insert_one``.""" return await self.insert_one(project) diff --git a/mpcontribs-api/tests/unit/domains/test_contribution_service.py b/mpcontribs-api/tests/unit/domains/test_contribution_service.py index 4e8b387bb4..02451f5033 100644 --- a/mpcontribs-api/tests/unit/domains/test_contribution_service.py +++ b/mpcontribs-api/tests/unit/domains/test_contribution_service.py @@ -151,16 +151,27 @@ def _make_service( settings: MongoSettings | None = None, write_slots: asyncio.Semaphore | None = None, user: User | None = None, + projects=None, + unique_identifiers: bool = True, ) -> tuple[ContributionService, AsyncMock, AsyncMock, AsyncMock, AsyncMock, MagicMock]: contrib_repo = contributions or AsyncMock() struct_repo = structures or AsyncMock() table_repo = tables or AsyncMock() attach_repo = attachments or AsyncMock() + # Default version resolution: every referenced project reports the ``unique_identifiers`` flag + # and no contribution version exists yet, so the common path resolves version == 1 with no + # conflict. Tests exercising versioning pass their own ``projects`` mock or override + # ``contrib_repo.max_versions``. + projects_repo = projects or AsyncMock() + if projects is None: + projects_repo.unique_identifiers_by_id.side_effect = lambda ids: {pid: unique_identifiers for pid in ids} + contrib_repo.max_versions.return_value = {} if client is None: client, _ = _make_fake_client() svc = ContributionService( client=client, user=user or _admin_user(), + projects=projects_repo, contributions=contrib_repo, structures=struct_repo, tables=table_repo, @@ -206,17 +217,25 @@ async def test_empty_batch_returns_empty_summary_no_db(self): contrib_repo.insert_contribution.assert_not_called() client.start_session.assert_not_called() - async def test_duplicate_project_identifier_raises_validation_error(self): + async def test_duplicate_project_identifier_unique_project_conflicts_later_item(self): + """On a unique-identifier project, a repeated (project, identifier) in one batch no longer + fails the whole request (the old _reject_duplicate_keys behavior). The first occurrence is + inserted at version 1; later duplicates are per-item conflict failures.""" svc, contrib_repo, _, _, _, client = _make_service() + contrib_repo.insert_many_contributions.return_value = None contribs = [ _contrib_in(project="p", identifier="dup"), _contrib_in(project="p", identifier="dup"), ] - with pytest.raises(ValidationError) as exc_info: - await svc.insert_contributions(contribs) - assert exc_info.value.context.get("contribution_indices") == [0, 1] - contrib_repo.insert_many_contributions.assert_not_called() - client.start_session.assert_not_called() + summary = await svc.insert_contributions(contribs) + + assert summary.total == 2 + assert len(summary.succeeded) == 1 + assert summary.succeeded[0].version == 1 + assert [f.index for f in summary.failed] == [1] + assert summary.failed[0].error_code == "conflict" + # Index 0 still reached Mongo (one doc inserted) + assert len(contrib_repo.insert_many_contributions.call_args[0][0]) == 1 async def test_oversize_contribution_goes_to_failures_without_db(self): settings = _make_mongo_settings(max_components_per_contribution=1) @@ -432,6 +451,100 @@ async def _insert(doc, session=None): assert summary.failed == [] +# --------------------------------------------------------------------------- +# Versioning — uniqueness rules + version assignment (insert & upsert) +# --------------------------------------------------------------------------- + + +def _projects_mock(unique_map: dict[str, bool]) -> AsyncMock: + """A projects repo whose unique_identifiers_by_id returns only the known projects.""" + repo = AsyncMock() + repo.unique_identifiers_by_id.side_effect = lambda ids: {pid: unique_map[pid] for pid in ids if pid in unique_map} + return repo + + +class TestContributionVersioning: + async def test_insert_unique_existing_key_conflicts(self): + svc, contrib_repo, *_ = _make_service() # unique_identifiers=True by default + contrib_repo.insert_many_contributions.return_value = None + contrib_repo.max_versions.return_value = {("proj", "mp-1"): 1} + + summary = await svc.insert_contributions([_contrib_in(identifier="mp-1")]) + + assert summary.total == 1 + assert summary.succeeded == [] + assert [f.error_code for f in summary.failed] == ["conflict"] + contrib_repo.insert_many_contributions.assert_not_called() + + async def test_insert_non_unique_assigns_max_plus_one(self): + svc, contrib_repo, *_ = _make_service(unique_identifiers=False) + contrib_repo.insert_many_contributions.return_value = None + contrib_repo.max_versions.return_value = {("proj", "mp-1"): 3} + + summary = await svc.insert_contributions([_contrib_in(identifier="mp-1")]) + + assert len(summary.succeeded) == 1 + assert summary.succeeded[0].version == 4 + docs = contrib_repo.insert_many_contributions.call_args[0][0] + assert docs[0].version == 4 + + async def test_insert_non_unique_no_existing_starts_at_one(self): + svc, contrib_repo, *_ = _make_service(unique_identifiers=False) + contrib_repo.insert_many_contributions.return_value = None + # default max_versions -> {} (no existing contributions) + + summary = await svc.insert_contributions([_contrib_in(identifier="mp-1")]) + + assert summary.succeeded[0].version == 1 + + async def test_insert_non_unique_same_key_twice_sequences_versions(self): + svc, contrib_repo, *_ = _make_service(unique_identifiers=False) + contrib_repo.insert_many_contributions.return_value = None + contrib_repo.max_versions.return_value = {("proj", "dup"): 5} + + contribs = [_contrib_in(identifier="dup"), _contrib_in(identifier="dup")] + summary = await svc.insert_contributions(contribs) + + assert len(summary.succeeded) == 2 + assert sorted(d.version for d in summary.succeeded) == [6, 7] + + async def test_insert_project_not_found_is_validation_failure(self): + svc, contrib_repo, *_ = _make_service(projects=_projects_mock({})) # no projects known + + summary = await svc.insert_contributions([_contrib_in(identifier="mp-1")]) + + assert summary.succeeded == [] + assert [f.error_code for f in summary.failed] == ["validation_error"] + contrib_repo.insert_many_contributions.assert_not_called() + + async def test_upsert_unique_forces_version_one(self): + svc, contrib_repo, *_ = _make_service() # unique by default + contrib_repo.upsert_contribution_by_identifiers.return_value = MagicMock(spec=Contribution) + + # A supplied version is ignored for unique-identifier projects (inferred as 1). + await svc.upsert_contributions([_contrib_in(identifier="mp-1", version=9)]) + + assert contrib_repo.upsert_contribution_by_identifiers.call_args.args[2] == 1 + contrib_repo.max_versions.assert_not_called() + + async def test_upsert_non_unique_requires_version(self): + svc, contrib_repo, *_ = _make_service(unique_identifiers=False) + + summary = await svc.upsert_contributions([_contrib_in(identifier="mp-1")]) # no version + + assert summary.succeeded == [] + assert [f.error_code for f in summary.failed] == ["validation_error"] + contrib_repo.upsert_contribution_by_identifiers.assert_not_called() + + async def test_upsert_non_unique_passes_supplied_version(self): + svc, contrib_repo, *_ = _make_service(unique_identifiers=False) + contrib_repo.upsert_contribution_by_identifiers.return_value = MagicMock(spec=Contribution) + + await svc.upsert_contributions([_contrib_in(identifier="mp-1", version=7)]) + + assert contrib_repo.upsert_contribution_by_identifiers.call_args.args[2] == 7 + + # --------------------------------------------------------------------------- # upsert_contributions — guard clause # --------------------------------------------------------------------------- @@ -524,7 +637,7 @@ async def test_returns_repo_results_in_input_order(self): docs = [MagicMock(spec=Contribution, name=f"doc-{i}") for i in range(3)] returned = {} - async def _upsert(identifiers, contrib): + async def _upsert(identifiers, contrib, version): doc = docs[int(contrib.identifier.split("-")[1])] returned[contrib.identifier] = doc return doc @@ -564,7 +677,7 @@ async def test_same_key_concurrent_upserts_both_go_through_atomic_call(self): async def test_one_failure_is_reported_not_raised(self): svc, contrib_repo, *_ = _make_service() - async def _upsert(identifiers, contrib): + async def _upsert(identifiers, contrib, version): if contrib.identifier == "mp-1": raise ConflictError("boom") return MagicMock(spec=Contribution) diff --git a/mpcontribs-api/tests/unit/test_supervisord_render.py b/mpcontribs-api/tests/unit/test_supervisord_render.py index 19e660318c..e7461f21a3 100644 --- a/mpcontribs-api/tests/unit/test_supervisord_render.py +++ b/mpcontribs-api/tests/unit/test_supervisord_render.py @@ -15,10 +15,6 @@ # Names the new Settings model needs present in the process environment. REQUIRED_ENV_NAMES = [ "MPCONTRIBS_ENVIRONMENT", - "MPCONTRIBS_MONGO__URI", - "MPCONTRIBS_MONGO__DB_NAME", - "MPCONTRIBS_REDIS__ADDRESS", - "MPCONTRIBS_REDIS__URL", "MPCONTRIBS_MAIL_DEFAULT_SENDER", "MPCONTRIBS_VERSION", "MPCONTRIBS_OTEL__OTLP_ENDPOINT", From 8d29dab4bc240fe80b9d9d07bbea8efb31ed7c7c Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 1 Jul 2026 09:12:43 -0700 Subject: [PATCH 198/591] Added model and router to expose limits that well-behaved clients should observe --- .../domains/contributions/router.py | 23 +++++++++++++++++++ .../mpcontribs_api/domains/limits/models.py | 14 +++++++++++ .../mpcontribs_api/domains/limits/router.py | 18 +++++++++++++++ 3 files changed, 55 insertions(+) create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/limits/models.py create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/limits/router.py diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py index 42dcdf562f..73466eff28 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py @@ -4,6 +4,7 @@ from fastapi.responses import StreamingResponse from fastapi_filter import FilterDepends +from mpcontribs_api.config import get_settings from mpcontribs_api.dependencies import S3Dep, require_user from mpcontribs_api.domains._shared.bulk import BulkWriteSummary from mpcontribs_api.domains._shared.types import ( @@ -20,11 +21,31 @@ ContributionOut, ContributionPatch, ) +from mpcontribs_api.exceptions import ValidationError from mpcontribs_api.pagination import CursorParams router = APIRouter() +def _enforce_bulk_limit(contributions: list[ContributionIn]) -> None: + """Reject a bulk write larger than the configured per-request ceiling. + + Guards the synchronous bulk endpoints so a single request can't hand the service an unbounded + list. Callers over the limit should chunk (the limit is advertised at ``GET /api/v1/limits``) + or use the async bulk ingestion endpoint. Complements the body-size middleware, which bounds + bytes rather than item count. + """ + limit = get_settings().mongo.bulk_write_limit + count = len(contributions) + if count > limit: + raise ValidationError( + f"Bulk request of {count} contributions exceeds the per-request limit of {limit}. " + "Chunk the request (see GET /api/v1/limits) or use the async bulk ingestion endpoint.", + count=count, + limit=limit, + ) + + @router.get("") async def get_contributions( repo: ContributionDep, @@ -50,6 +71,7 @@ async def insert_contributions( service: ContributionServiceDep, contributions: list[ContributionIn], ): + _enforce_bulk_limit(contributions) return await service.insert_contributions(contributions=contributions) @@ -58,6 +80,7 @@ async def upsert_contributions( service: ContributionServiceDep, contributions: list[ContributionIn], ): + _enforce_bulk_limit(contributions) return await service.upsert_contributions(contributions=contributions) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/limits/models.py b/mpcontribs-api/src/mpcontribs_api/domains/limits/models.py new file mode 100644 index 0000000000..a1fccbc5f7 --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/domains/limits/models.py @@ -0,0 +1,14 @@ +from pydantic import BaseModel + + +class Limits(BaseModel): + """Server-enforced request limits, advertised so callers can size their requests. + + These mirror the values enforced by the body-size middleware and the bulk write endpoints; + consumers (e.g. the mpcontribs client) should read them here rather than hardcoding. + """ + + max_request_bytes: int + bulk_write_limit: int + max_components_per_contribution: int + component_insert_chunk_size: int diff --git a/mpcontribs-api/src/mpcontribs_api/domains/limits/router.py b/mpcontribs-api/src/mpcontribs_api/domains/limits/router.py new file mode 100644 index 0000000000..3d53939933 --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/domains/limits/router.py @@ -0,0 +1,18 @@ +from fastapi import APIRouter + +from mpcontribs_api.config import get_settings +from mpcontribs_api.domains.limits.models import Limits + +router = APIRouter() + + +@router.get("", response_model=Limits, summary="Server-enforced request limits") +async def get_limits() -> Limits: + """Return the request limits the server enforces. Public metadata; no auth required.""" + mongo = get_settings().mongo + return Limits( + max_request_bytes=mongo.max_request_bytes, + bulk_write_limit=mongo.bulk_write_limit, + max_components_per_contribution=mongo.max_components_per_contribution, + component_insert_chunk_size=mongo.component_insert_chunk_size, + ) From ddac7eb07a81ee549e8bfba016b8cc06499aed28 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 1 Jul 2026 09:18:25 -0700 Subject: [PATCH 199/591] Added custom exceptions and middleware to immediately detect oversize requests --- .../src/mpcontribs_api/exceptions.py | 16 ++-- .../src/mpcontribs_api/middleware.py | 82 +++++++++++++++++++ 2 files changed, 93 insertions(+), 5 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/exceptions.py b/mpcontribs-api/src/mpcontribs_api/exceptions.py index d3fc03a199..d84e748178 100644 --- a/mpcontribs-api/src/mpcontribs_api/exceptions.py +++ b/mpcontribs-api/src/mpcontribs_api/exceptions.py @@ -68,6 +68,12 @@ class ValidationError(AppError): log_level = logging.INFO +class PayloadTooLargeError(AppError): + status_code = 413 + error_code = "payload_too_large" + log_level = logging.INFO # expected client error: caller sent an oversized body + + class PermissionError(AppError): status_code = 403 error_code = "permission_denied" @@ -80,7 +86,7 @@ class AuthenticationError(AppError): log_level = logging.WARNING # security-relevant: alertable, but not a server fault -def _error_body(error_code: str, message: str, **public_context) -> dict: +def error_body(error_code: str, message: str, **public_context) -> dict: body: dict[str, Any] = {"error": {"code": error_code, "message": message}} if public_context: body["error"]["detail"] = public_context @@ -112,7 +118,7 @@ async def _handle_app_error(request: Request, exc: AppError) -> JSONResponse: logger.log(level, exc.error_code, status_code=exc.status_code, **exc.context) return JSONResponse( status_code=exc.status_code, - content=_error_body( + content=error_body( exc.error_code, exc.message, # NOTE: not leaking context to client yet @@ -128,7 +134,7 @@ async def _handle_unexpected(request: Request, exc: Exception) -> JSONResponse: logger.exception("unhandled_exception") # full traceback return JSONResponse( status_code=500, - content=_error_body("internal_error", "An unexpected error occurred."), + content=error_body("internal_error", "An unexpected error occurred."), ) # Unify validation errors from pydantic with our exception format @@ -136,7 +142,7 @@ async def _handle_unexpected(request: Request, exc: Exception) -> JSONResponse: async def _handle_validation(_request: Request, exc: RequestValidationError) -> JSONResponse: return JSONResponse( status_code=422, - content=_error_body( + content=error_body( "validation_error", "Request validation failed", errors=jsonable_encoder(_sanitize_validation_errors(exc.errors())), @@ -151,5 +157,5 @@ async def _handle_http(request: Request, exc: StarletteHTTPException) -> JSONRes logger.error("http_error", status_code=exc.status_code, exc_info=exc) return JSONResponse( status_code=exc.status_code, - content=_error_body("http_error", str(exc.detail)), + content=error_body("http_error", str(exc.detail)), ) diff --git a/mpcontribs-api/src/mpcontribs_api/middleware.py b/mpcontribs-api/src/mpcontribs_api/middleware.py index 6a5c674366..8a463a2a22 100644 --- a/mpcontribs-api/src/mpcontribs_api/middleware.py +++ b/mpcontribs-api/src/mpcontribs_api/middleware.py @@ -13,9 +13,11 @@ from opentelemetry.sdk.metrics.export import PeriodicExportingMetricReader from opentelemetry.sdk.trace import TracerProvider from opentelemetry.sdk.trace.export import BatchSpanProcessor +from starlette.responses import JSONResponse from starlette.types import ASGIApp, Message, Receive, Scope, Send from mpcontribs_api.config import Settings +from mpcontribs_api.exceptions import PayloadTooLargeError, error_body from mpcontribs_api.logging import build_resource, get_logger if TYPE_CHECKING: @@ -151,6 +153,86 @@ def _emit_access_log( ) +class _BodyTooLarge(BaseException): + """Internal signal that the streamed body exceeded the limit. + + Derives from ``BaseException`` (not ``Exception``) on purpose: FastAPI's request-body parser + wraps body reads in ``except Exception`` and would otherwise convert our error into a generic + ``400``. A ``BaseException`` slips past that (and past Starlette's exception middleware) so it + propagates back to ``BodySizeLimitMiddleware``, which turns it into the uniform ``413``. + """ + + +class BodySizeLimitMiddleware: + """Reject request bodies larger than ``max_bytes`` so one caller can't OOM the worker. + + Two enforcement points, because a client can lie about (or omit) ``Content-Length``: + + - **Declared size:** if the ``Content-Length`` header exceeds the limit, respond ``413`` + immediately, before the body is read. This is the common case (the mpcontribs client and + any ``requests``-based caller set ``Content-Length``) and avoids buffering the upload at all. + - **Actual size:** otherwise wrap ``receive`` and accumulate the bytes actually delivered + (chunked transfers, or a lying header); once the running total exceeds the limit, abort. The + abort is signalled by a ``BaseException`` raised from the wrapped ``receive`` (see + :class:`_BodyTooLarge` for why) and caught here, so the response is the same uniform ``413`` + as the declared-size path, and the body is never fully buffered. + + Registered inside ``RequestContextMiddleware`` so rejected requests are still access-logged. + """ + + def __init__(self, app: ASGIApp, max_bytes: int) -> None: + self.app = app + self.max_bytes = max_bytes + + async def __call__(self, scope: Scope, receive: Receive, send: Send) -> None: + if scope["type"] != "http": + await self.app(scope, receive, send) + return + + headers = dict(scope["headers"]) + declared = self._declared_length(headers.get(b"content-length")) + if declared is not None and declared > self.max_bytes: + await self._reject(scope, receive, send) + return + + received = 0 + + async def limited_receive() -> Message: + nonlocal received + message = await receive() + if message["type"] == "http.request": + received += len(message.get("body", b"")) + if received > self.max_bytes: + raise _BodyTooLarge + return message + + try: + await self.app(scope, limited_receive, send) + except _BodyTooLarge: + # Overflow detected mid-body-read: the app hasn't started responding yet, so we own the + # response and emit the 413 ourselves. + await self._reject(scope, receive, send) + + @staticmethod + def _declared_length(raw: bytes | None) -> int | None: + if raw is None: + return None + try: + return int(raw) + except ValueError: + return None + + def _message(self) -> str: + return f"Request body exceeds the maximum allowed size of {self.max_bytes} bytes." + + async def _reject(self, scope: Scope, receive: Receive, send: Send) -> None: + response = JSONResponse( + status_code=PayloadTooLargeError.status_code, + content=error_body(PayloadTooLargeError.error_code, self._message()), + ) + await response(scope, receive, send) + + def configure_tracing(settings: Settings) -> None: """Register the global tracer and meter providers, exporting via OTLP/gRPC to the collector. From 88c6f54372e752b451a97feb8323f7edc8d06f37 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 1 Jul 2026 09:19:24 -0700 Subject: [PATCH 200/591] Implementing limits endpoint, new exceptions & middleware, and added tests --- .../src/mpcontribs_api/api/v1/router.py | 2 + mpcontribs-api/src/mpcontribs_api/app.py | 11 ++- mpcontribs-api/src/mpcontribs_api/config.py | 17 +++- .../tests/integration/test_body_size_limit.py | 50 +++++++++++ .../tests/integration/test_bulk_limits.py | 78 ++++++++++++++++ .../integration/test_ingest_jobs_routes.py | 89 +++++++++++++++++++ mpcontribs-api/tests/unit/test_exceptions.py | 10 +-- 7 files changed, 247 insertions(+), 10 deletions(-) create mode 100644 mpcontribs-api/tests/integration/test_body_size_limit.py create mode 100644 mpcontribs-api/tests/integration/test_bulk_limits.py create mode 100644 mpcontribs-api/tests/integration/test_ingest_jobs_routes.py diff --git a/mpcontribs-api/src/mpcontribs_api/api/v1/router.py b/mpcontribs-api/src/mpcontribs_api/api/v1/router.py index 13dab175ce..871ce25bdd 100644 --- a/mpcontribs-api/src/mpcontribs_api/api/v1/router.py +++ b/mpcontribs-api/src/mpcontribs_api/api/v1/router.py @@ -2,6 +2,7 @@ from mpcontribs_api.domains.attachments.router import router as attachments_router from mpcontribs_api.domains.contributions.router import router as contributions_router +from mpcontribs_api.domains.limits.router import router as limits_router from mpcontribs_api.domains.projects.router import router as projects_router from mpcontribs_api.domains.structures.router import router as structures_router from mpcontribs_api.domains.tables.router import router as tables_router @@ -10,6 +11,7 @@ router.include_router(attachments_router, prefix="/attachments", tags=["attachments"]) router.include_router(contributions_router, prefix="/contributions", tags=["contributions"]) +router.include_router(limits_router, prefix="/limits", tags=["limits"]) router.include_router(projects_router, prefix="/projects", tags=["projects"]) router.include_router(structures_router, prefix="/structures", tags=["structures"]) router.include_router(tables_router, prefix="/tables", tags=["tables"]) diff --git a/mpcontribs-api/src/mpcontribs_api/app.py b/mpcontribs-api/src/mpcontribs_api/app.py index 0e50c916bb..58b77a2a7a 100644 --- a/mpcontribs-api/src/mpcontribs_api/app.py +++ b/mpcontribs-api/src/mpcontribs_api/app.py @@ -22,7 +22,12 @@ from mpcontribs_api.domains.tables.models import Table from mpcontribs_api.exceptions import register_exception_handlers from mpcontribs_api.logging import configure_logging, get_logger -from mpcontribs_api.middleware import RequestContextMiddleware, configure_tracing, instrument_app +from mpcontribs_api.middleware import ( + BodySizeLimitMiddleware, + RequestContextMiddleware, + configure_tracing, + instrument_app, +) logger = get_logger(__name__) @@ -114,6 +119,10 @@ def create_app(settings: Settings | None = None) -> FastAPI: dependencies=[Depends(api_key_scheme)], ) + # Reject oversized request bodies before they're buffered into memory. Added before + # RequestContextMiddleware: Starlette inserts each added middleware at the front of the stack, + # so the later-added RequestContextMiddleware stays outermost and still access-logs rejections. + app.add_middleware(BodySizeLimitMiddleware, max_bytes=settings.mongo.max_request_bytes) # Add request context to the logger app.add_middleware(RequestContextMiddleware) # Emit server-side request spans/metrics (no-op when telemetry is disabled). diff --git a/mpcontribs-api/src/mpcontribs_api/config.py b/mpcontribs-api/src/mpcontribs_api/config.py index 61f9f6cebf..3995eebb0e 100644 --- a/mpcontribs-api/src/mpcontribs_api/config.py +++ b/mpcontribs-api/src/mpcontribs_api/config.py @@ -82,10 +82,6 @@ class MongoSettings(BaseModel): default=0, description="Minimum number of concurent connections that the pool will maintain connected to each server ", ) - max_global_concurrent_writes: int = Field( - default=100, - description="Maximum number of writes allowed to happen simultaneously. Key for bulk write efficiency.", - ) datetime_conversion: Literal["datetime_ms", "datetime", "datetime_auto", "datetime_clamp"] = Field( default="datetime", description="Specifies how UTC datetimes should be decoded within BSON", @@ -133,6 +129,19 @@ class MongoSettings(BaseModel): default=100, description="Batch size used by component repositories when chunking insert_many calls inside a transaction.", ) + # TODO: Tune default + max_request_bytes: int = Field( + default=16 * 1024 * 1024, + description="Hard ceiling on the size (bytes) of any single request body. Requests exceeding it are rejected " + "with 413 before the body is read into memory, so one caller can't OOM the worker. Mirrors the client's " + "MAX_PAYLOAD (15MB) with headroom.", + ) + # TODO: Tune default + bulk_write_limit: int = Field( + default=1000, + description="Maximum number of items accepted in a single bulk contribution POST/PUT. Larger batches are " + "rejected with 422; callers should chunk (or use the async ingestion endpoint). Advertised via GET /limits.", + ) max_idle_time_ms: int = Field( default=30_000, description="The maximum allowed time a single connection is allowed to sit idle", diff --git a/mpcontribs-api/tests/integration/test_body_size_limit.py b/mpcontribs-api/tests/integration/test_body_size_limit.py new file mode 100644 index 0000000000..0e15e289d8 --- /dev/null +++ b/mpcontribs-api/tests/integration/test_body_size_limit.py @@ -0,0 +1,50 @@ +"""Tests for BodySizeLimitMiddleware — the 413 guard against oversized request bodies.""" + +import pytest +from fastapi import FastAPI +from fastapi.testclient import TestClient + +from mpcontribs_api.exceptions import register_exception_handlers +from mpcontribs_api.middleware import BodySizeLimitMiddleware + +MAX_BYTES = 1024 + + +def _make_app(max_bytes: int = MAX_BYTES) -> FastAPI: + app = FastAPI() + register_exception_handlers(app) + app.add_middleware(BodySizeLimitMiddleware, max_bytes=max_bytes) + + @app.post("/echo") + async def echo(payload: dict) -> dict: + return {"received": len(payload)} + + return app + + +@pytest.fixture +def client() -> TestClient: + return TestClient(_make_app(), raise_server_exceptions=False) + + +class TestBodySizeLimit: + def test_under_limit_passes(self, client: TestClient): + r = client.post("/echo", json={"a": 1}) + assert r.status_code == 200 + + def test_declared_content_length_over_limit_rejected(self, client: TestClient): + # A body whose Content-Length exceeds the ceiling is rejected before it's read. + big = {"blob": "x" * (MAX_BYTES * 2)} + r = client.post("/echo", json=big) + assert r.status_code == 413 + assert r.json()["error"]["code"] == "payload_too_large" + + def test_streamed_body_over_limit_rejected(self, client: TestClient): + # No Content-Length (chunked): the middleware accumulates and rejects via raised AppError, + # which the standard handler renders as a uniform 413. + def gen(): + yield b"x" * (MAX_BYTES * 2) + + r = client.post("/echo", content=gen()) + assert r.status_code == 413 + assert r.json()["error"]["code"] == "payload_too_large" diff --git a/mpcontribs-api/tests/integration/test_bulk_limits.py b/mpcontribs-api/tests/integration/test_bulk_limits.py new file mode 100644 index 0000000000..47021ac442 --- /dev/null +++ b/mpcontribs-api/tests/integration/test_bulk_limits.py @@ -0,0 +1,78 @@ +"""Tests for the per-request bulk-write count guard and the GET /limits contract endpoint.""" + +import pytest +from beanie import PydanticObjectId + +from mpcontribs_api.config import get_settings +from mpcontribs_api.domains._shared.bulk import BulkWriteSummary +from mpcontribs_api.domains.contributions.dependencies import get_contribution_service +from tests.integration.conftest import AUTHED_HEADERS + + +def _valid_contribution_body(**overrides) -> dict: + body = { + "_id": str(PydanticObjectId()), + "project": "test-project", + "identifier": "mp-1234", + "formula": "Fe2O3", + "data": {"band_gap": 2.1}, + } + body.update(overrides) + return body + + +@pytest.fixture +def contribution_service(test_app, mock_contribution_service): + test_app.dependency_overrides[get_contribution_service] = lambda: mock_contribution_service + yield mock_contribution_service + test_app.dependency_overrides.pop(get_contribution_service, None) + + +@pytest.fixture(autouse=True) +def _authenticate(client): + client.headers.update(AUTHED_HEADERS) + + +class TestBulkWriteLimit: + @pytest.fixture(autouse=True) + def _small_limit(self, monkeypatch): + # Shrink the limit so the test doesn't need to build 1000+ bodies. + monkeypatch.setattr(get_settings().mongo, "bulk_write_limit", 2) + + def test_over_limit_post_returns_422(self, client, contribution_service): + body = [_valid_contribution_body() for _ in range(3)] + r = client.post("/api/v1/contributions", json=body) + assert r.status_code == 422 + assert r.json()["error"]["code"] == "validation_error" + contribution_service.insert_contributions.assert_not_called() + + def test_at_limit_post_passes(self, client, contribution_service): + contribution_service.insert_contributions.return_value = BulkWriteSummary(total=2, succeeded=[], failed=[]) + body = [_valid_contribution_body() for _ in range(2)] + r = client.post("/api/v1/contributions", json=body) + assert r.status_code == 200 + contribution_service.insert_contributions.assert_called_once() + + def test_over_limit_put_returns_422(self, client, contribution_service): + body = [_valid_contribution_body() for _ in range(3)] + r = client.put("/api/v1/contributions", json=body) + assert r.status_code == 422 + contribution_service.upsert_contributions.assert_not_called() + + +class TestLimitsEndpoint: + def test_limits_reports_configured_values(self, client): + mongo = get_settings().mongo + r = client.get("/api/v1/limits") + assert r.status_code == 200 + assert r.json() == { + "max_request_bytes": mongo.max_request_bytes, + "bulk_write_limit": mongo.bulk_write_limit, + "max_components_per_contribution": mongo.max_components_per_contribution, + "component_insert_chunk_size": mongo.component_insert_chunk_size, + } + + def test_limits_is_public(self, client): + # No auth headers: still readable (public metadata). + client.headers.clear() + assert client.get("/api/v1/limits").status_code == 200 diff --git a/mpcontribs-api/tests/integration/test_ingest_jobs_routes.py b/mpcontribs-api/tests/integration/test_ingest_jobs_routes.py new file mode 100644 index 0000000000..10465867b7 --- /dev/null +++ b/mpcontribs-api/tests/integration/test_ingest_jobs_routes.py @@ -0,0 +1,89 @@ +"""Tests for the async bulk-ingestion scaffold routes (submit / status). + +The worker is a stub, so these exercise only the route surface: 202 on submit, a persisted +pending job, idempotency replay, auth, and status lookup (found / not-found / bad id). +""" + +from unittest.mock import AsyncMock + +import pytest +from beanie import PydanticObjectId + +from mpcontribs_api.domains.ingest_jobs.dependencies import get_ingest_job_repository +from mpcontribs_api.domains.ingest_jobs.models import IngestJob +from tests.integration.conftest import AUTHED_HEADERS, FORCE_ANON_HEADERS + +BULK_URL = "/api/v1/contributions/bulk" + + +def _job(**overrides) -> IngestJob: + fields = { + "id": PydanticObjectId(), + "owner": "google:alice@example.com", + "status": "pending", + "source": None, + "idempotency_key": None, + } + fields.update(overrides) + return IngestJob(**fields) + + +@pytest.fixture +def ingest_repo(test_app): + repo = AsyncMock() + test_app.dependency_overrides[get_ingest_job_repository] = lambda: repo + yield repo + test_app.dependency_overrides.pop(get_ingest_job_repository, None) + + +@pytest.fixture(autouse=True) +def _authenticate(client): + client.headers.update(AUTHED_HEADERS) + + +class TestSubmitBulkIngest: + def test_submit_returns_202_and_pending_job(self, client, ingest_repo): + job = _job() + ingest_repo.create_job.return_value = job + r = client.post(BULK_URL, json={"source": None}) + assert r.status_code == 202 + body = r.json() + assert body["id"] == str(job.id) + assert body["status"] == "pending" + ingest_repo.create_job.assert_awaited_once() + + def test_submit_requires_auth(self, client, test_app): + # No repo override here: the repository dependency runs require_user, which rejects anon. + r = client.post(BULK_URL, json={"source": None}, headers=FORCE_ANON_HEADERS) + assert r.status_code == 401 + + def test_idempotency_key_replays_existing_job(self, client, ingest_repo): + existing = _job(idempotency_key="abc123") + ingest_repo.find_by_idempotency_key.return_value = existing + r = client.post(BULK_URL, json={"source": None}, headers={"Idempotency-Key": "abc123"}) + assert r.status_code == 202 + assert r.json()["id"] == str(existing.id) + ingest_repo.find_by_idempotency_key.assert_awaited_once_with("abc123") + ingest_repo.create_job.assert_not_called() + + +class TestGetBulkIngestJob: + def test_get_existing_job(self, client, ingest_repo): + job = _job(status="running", total=10, succeeded=4) + ingest_repo.get_job.return_value = job + r = client.get(f"{BULK_URL}/{job.id}") + assert r.status_code == 200 + body = r.json() + assert body["status"] == "running" + assert body["total"] == 10 + assert body["succeeded"] == 4 + + def test_unknown_job_returns_404(self, client, ingest_repo): + ingest_repo.get_job.return_value = None + r = client.get(f"{BULK_URL}/{PydanticObjectId()}") + assert r.status_code == 404 + + def test_invalid_job_id_returns_422(self, client, ingest_repo): + r = client.get(f"{BULK_URL}/not-an-object-id") + assert r.status_code == 422 + ingest_repo.get_job.assert_not_called() diff --git a/mpcontribs-api/tests/unit/test_exceptions.py b/mpcontribs-api/tests/unit/test_exceptions.py index 894dfec0c1..7e167a5813 100644 --- a/mpcontribs-api/tests/unit/test_exceptions.py +++ b/mpcontribs-api/tests/unit/test_exceptions.py @@ -7,28 +7,28 @@ NotFoundError, PermissionError, ValidationError, - _error_body, _sanitize_validation_errors, + error_body, ) class TestErrorBody: def test_minimal_body(self): - body = _error_body("not_found", "Resource not found") + body = error_body("not_found", "Resource not found") assert body == {"error": {"code": "not_found", "message": "Resource not found"}} def test_body_with_context(self): - body = _error_body("not_found", "Resource not found", resource_id="abc", resource_type="project") + body = error_body("not_found", "Resource not found", resource_id="abc", resource_type="project") assert body["error"]["code"] == "not_found" assert body["error"]["message"] == "Resource not found" assert body["error"]["detail"] == {"resource_id": "abc", "resource_type": "project"} def test_no_detail_key_without_context(self): - body = _error_body("conflict", "Duplicate id") + body = error_body("conflict", "Duplicate id") assert "detail" not in body["error"] def test_detail_present_with_context(self): - body = _error_body("conflict", "Duplicate id", existing_id="xyz") + body = error_body("conflict", "Duplicate id", existing_id="xyz") assert "detail" in body["error"] From c625b3c5354fd6088131baa1d4d94d44987bce6e Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 8 Jul 2026 16:22:30 -0700 Subject: [PATCH 201/591] Added settings specific to MPContribs business logic --- mpcontribs-api/src/mpcontribs_api/config.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/mpcontribs-api/src/mpcontribs_api/config.py b/mpcontribs-api/src/mpcontribs_api/config.py index 3995eebb0e..8175fddbab 100644 --- a/mpcontribs-api/src/mpcontribs_api/config.py +++ b/mpcontribs-api/src/mpcontribs_api/config.py @@ -157,6 +157,21 @@ def _clamp_concurrency(self): return self +class MPContribsSettings(BaseModel): + max_contrib_data_depth: int = Field( + default=7, description="The max number of levels allowed in a Contribution's data dictionary." + ) + max_columns: int = Field( + default=160, + description="The maximum allowed number of columns for a contribution (len(Contribution.data)), " + "which also gets reflected in Project.columns", + ) + max_components: int = Field( + default=10, + description="The maximum allowed number of a single Component type (Structure, Table, Attachment) on a single Contribution", + ) + + class Settings(BaseSettings): model_config = SettingsConfigDict( env_file=".env", From c1bb17ef87e46b07760878047c50de92e04f9ee2 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 8 Jul 2026 16:26:19 -0700 Subject: [PATCH 202/591] Added Pint and Uncertainties --- mpcontribs-api/pyproject.toml | 2 ++ mpcontribs-api/uv.lock | 52 +++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+) diff --git a/mpcontribs-api/pyproject.toml b/mpcontribs-api/pyproject.toml index 87f12d487a..945f4e03aa 100644 --- a/mpcontribs-api/pyproject.toml +++ b/mpcontribs-api/pyproject.toml @@ -50,6 +50,8 @@ dependencies = [ "structlog>=25.5.0", "supervisor>=4.3.0", "types-aiobotocore[s3]>=3.7.0", + "pint>=0.25.3", + "uncertainties>=3.2.3", ] [project.urls] diff --git a/mpcontribs-api/uv.lock b/mpcontribs-api/uv.lock index 1d0de33fc5..95b0fc50ec 100644 --- a/mpcontribs-api/uv.lock +++ b/mpcontribs-api/uv.lock @@ -577,6 +577,30 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/6b/fd/5390ec4f49100f3ecb9968a392f9e6d039f1e3fe0ecd28443716ff01e589/fastar-0.11.0-cp314-cp314t-win_arm64.whl", hash = "sha256:76c1359314355eafbc6989f20fb1ad565a3d10200117923b9da765a17e2f6f11", size = 461049, upload-time = "2026-04-13T17:11:25.918Z" }, ] +[[package]] +name = "flexcache" +version = "0.3" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "typing-extensions" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/55/b0/8a21e330561c65653d010ef112bf38f60890051d244ede197ddaa08e50c1/flexcache-0.3.tar.gz", hash = "sha256:18743bd5a0621bfe2cf8d519e4c3bfdf57a269c15d1ced3fb4b64e0ff4600656", size = 15816, upload-time = "2024-03-09T03:21:07.555Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/27/cd/c883e1a7c447479d6e13985565080e3fea88ab5a107c21684c813dba1875/flexcache-0.3-py3-none-any.whl", hash = "sha256:d43c9fea82336af6e0115e308d9d33a185390b8346a017564611f1466dcd2e32", size = 13263, upload-time = "2024-03-09T03:21:05.635Z" }, +] + +[[package]] +name = "flexparser" +version = "0.4" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "typing-extensions" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/82/99/b4de7e39e8eaf8207ba1a8fa2241dd98b2ba72ae6e16960d8351736d8702/flexparser-0.4.tar.gz", hash = "sha256:266d98905595be2ccc5da964fe0a2c3526fbbffdc45b65b3146d75db992ef6b2", size = 31799, upload-time = "2024-11-07T02:00:56.249Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/fe/5e/3be305568fe5f34448807976dc82fc151d76c3e0e03958f34770286278c1/flexparser-0.4-py3-none-any.whl", hash = "sha256:3738b456192dcb3e15620f324c447721023c0293f6af9955b481e91d00179846", size = 27625, upload-time = "2024-11-07T02:00:54.523Z" }, +] + [[package]] name = "fonttools" version = "4.63.0" @@ -1016,6 +1040,7 @@ dependencies = [ { name = "opentelemetry-instrumentation-fastapi" }, { name = "opentelemetry-instrumentation-pymongo" }, { name = "opentelemetry-sdk" }, + { name = "pint" }, { name = "polars" }, { name = "pydantic-settings" }, { name = "pymatgen" }, @@ -1024,6 +1049,7 @@ dependencies = [ { name = "structlog" }, { name = "supervisor" }, { name = "types-aiobotocore", extra = ["s3"] }, + { name = "uncertainties" }, ] [package.dev-dependencies] @@ -1049,6 +1075,7 @@ requires-dist = [ { name = "opentelemetry-instrumentation-fastapi", specifier = ">=0.63b1" }, { name = "opentelemetry-instrumentation-pymongo", specifier = ">=0.63b1" }, { name = "opentelemetry-sdk", specifier = ">=1.42.1" }, + { name = "pint", specifier = ">=0.25.3" }, { name = "polars", specifier = ">=1.41.2" }, { name = "pydantic-settings", specifier = ">=2.14.1" }, { name = "pymatgen" }, @@ -1057,6 +1084,7 @@ requires-dist = [ { name = "structlog", specifier = ">=25.5.0" }, { name = "supervisor", specifier = ">=4.3.0" }, { name = "types-aiobotocore", extras = ["s3"], specifier = ">=3.7.0" }, + { name = "uncertainties", specifier = ">=3.2.3" }, ] [package.metadata.requires-dev] @@ -1441,6 +1469,30 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/ff/6e/cf826fae916b8658848d7b9f38d88da6396895c676e8086fc0988073aaf8/pillow-12.2.0-cp314-cp314t-win_arm64.whl", hash = "sha256:aa88ccfe4e32d362816319ed727a004423aab09c5cea43c01a4b435643fa34eb", size = 2556579, upload-time = "2026-04-01T14:45:52.529Z" }, ] +[[package]] +name = "pint" +version = "0.25.3" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "flexcache" }, + { name = "flexparser" }, + { name = "platformdirs" }, + { name = "typing-extensions" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/52/9d/b1379cdbd33a49d17d627bc24e2b63cca06a1c5343b38072d2889499e82e/pint-0.25.3.tar.gz", hash = "sha256:f8f5df6cf65314d74da1ade1bf96f8e3e4d0c41b51577ac53c49e7d44ca5acee", size = 255106, upload-time = "2026-03-19T21:57:08.72Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/1b/dd/a9fe6a0a09512da23951c68bf36466aeecd89def3183dc095edbc807ddc5/pint-0.25.3-py3-none-any.whl", hash = "sha256:27eb25143bd5de9fcc4d5a4b484f16faf6b4615aa93ece6b3373a8c1a3c1b97d", size = 307488, upload-time = "2026-03-19T21:57:07.022Z" }, +] + +[[package]] +name = "platformdirs" +version = "4.10.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/d7/47/e4501f49c178ae1d9f4a75073fda4204f52647993f075a9db4d14930e0c5/platformdirs-4.10.0.tar.gz", hash = "sha256:31e761a6a0ca04faf7353ea759bdba55652be214725111e5aac52dfa29d4bef7", size = 31224, upload-time = "2026-05-28T03:32:53.587Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/81/e6/cd9575ac904136b3cbf7aa7ee819ef86eedb7274e46f230e94ea4342e729/platformdirs-4.10.0-py3-none-any.whl", hash = "sha256:fb516cdb12eb0d857d0cd85a7c57cea4d060bee4578d6cf5a14dfdf8cbf8784a", size = 22743, upload-time = "2026-05-28T03:32:52.175Z" }, +] + [[package]] name = "plotly" version = "6.7.0" From 2abdc65c646d97b70965616a7771f26688475c71 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 9 Jul 2026 12:14:45 -0700 Subject: [PATCH 203/591] Added float_precision config for Contribution.data values --- mpcontribs-api/src/mpcontribs_api/config.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/mpcontribs-api/src/mpcontribs_api/config.py b/mpcontribs-api/src/mpcontribs_api/config.py index 8175fddbab..fa71a6c7c0 100644 --- a/mpcontribs-api/src/mpcontribs_api/config.py +++ b/mpcontribs-api/src/mpcontribs_api/config.py @@ -168,7 +168,13 @@ class MPContribsSettings(BaseModel): ) max_components: int = Field( default=10, - description="The maximum allowed number of a single Component type (Structure, Table, Attachment) on a single Contribution", + description="The maximum allowed number of a single Component type (Structure, Table, Attachment) on a single " + "Contribution", + ) + float_precision: int = Field( + default=6, + description="The precision with which to store floats in MongoDB. " + "Primarily used to handle Contribution.data values.", ) @@ -185,6 +191,9 @@ class Settings(BaseSettings): # requires uri and db_name mongo: MongoSettings + # MPContribs_mpcontribs__* + mpcontribs: MPContribsSettings = Field(default_factory=MPContribsSettings) + # MPContribs_aws__* aws: AwsSettings = Field(default_factory=AwsSettings) From 06163f13cf5b9c53310543c4abb7dce6a223123a Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 9 Jul 2026 12:15:28 -0700 Subject: [PATCH 204/591] Added UnitError for handling Pint unit coercion errors --- mpcontribs-api/src/mpcontribs_api/exceptions.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/mpcontribs-api/src/mpcontribs_api/exceptions.py b/mpcontribs-api/src/mpcontribs_api/exceptions.py index d84e748178..03250f3399 100644 --- a/mpcontribs-api/src/mpcontribs_api/exceptions.py +++ b/mpcontribs-api/src/mpcontribs_api/exceptions.py @@ -68,6 +68,12 @@ class ValidationError(AppError): log_level = logging.INFO +class UnitError(ValidationError): + """Raised when a magnitude or unit string cannot be parsed.""" + + error_code = "unit_error" + + class PayloadTooLargeError(AppError): status_code = 413 error_code = "payload_too_large" From 8410f6b196b0a4fc34787f62b33d5636809fb986 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 9 Jul 2026 12:16:56 -0700 Subject: [PATCH 205/591] beanie now drops indices that are not currently specified on the models in this project --- mpcontribs-api/src/mpcontribs_api/app.py | 1 + 1 file changed, 1 insertion(+) diff --git a/mpcontribs-api/src/mpcontribs_api/app.py b/mpcontribs-api/src/mpcontribs_api/app.py index 58b77a2a7a..e150cff673 100644 --- a/mpcontribs-api/src/mpcontribs_api/app.py +++ b/mpcontribs-api/src/mpcontribs_api/app.py @@ -64,6 +64,7 @@ async def _setup_mongo(app: FastAPI, settings: Settings, stack: AsyncExitStack) Structure, Table, ], + allow_index_dropping=True, # allow old indices to be dropped from MongoDB when not specified in this package ) From 06c22f60c0e72cbe61bd10d7b3358b289576ccf5 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 9 Jul 2026 12:17:14 -0700 Subject: [PATCH 206/591] Formatting --- mpcontribs-api/src/mpcontribs_api/config.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/config.py b/mpcontribs-api/src/mpcontribs_api/config.py index fa71a6c7c0..3a5c51fbad 100644 --- a/mpcontribs-api/src/mpcontribs_api/config.py +++ b/mpcontribs-api/src/mpcontribs_api/config.py @@ -173,8 +173,8 @@ class MPContribsSettings(BaseModel): ) float_precision: int = Field( default=6, - description="The precision with which to store floats in MongoDB. " - "Primarily used to handle Contribution.data values.", + description="The precision with which to store floats in MongoDB. " + "Primarily used to handle Contribution.data values.", ) From 14c21e101e2747eac673f57936e16568100a52cd Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 9 Jul 2026 12:20:49 -0700 Subject: [PATCH 207/591] Added units.py which specifies functions for handling units and conversions from Contribution.data key names. --- .../mpcontribs_api/domains/_shared/units.py | 182 ++++++++++++++++++ 1 file changed, 182 insertions(+) create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/_shared/units.py diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/units.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/units.py new file mode 100644 index 0000000000..7393047ad7 --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/units.py @@ -0,0 +1,182 @@ +"""Unit parsing and SI canonicalization for annotated contribution data. + +Contribution ``data`` keys may be submitted in the annotated form +``name (unit, cond1=val1, cond2=val2, ...)``. This module turns a raw value plus a unit string +into a normalized leaf that is canonicalized to SI base units whenever Pint recognizes the unit, +while always retaining the value/unit exactly as submitted (provenance). + +Design notes: + +- **SI-when-possible**: a recognized unit is converted to base units via Pint; ``value``/``unit`` + hold the canonical form, ``input_value``/``input_unit`` hold the original. An unrecognized or + dimensionless unit is stored verbatim (``value``/``unit`` == ``input_*``). +- **Uncertainties**: a string magnitude such as ``"4.2(3)"`` or ``"4.2+/-0.3"`` is parsed with the + ``uncertainties`` package; the nominal value lands in ``value`` and the (SI-propagated) standard + deviation in ``error``. +- **Identity precision**: :func:`condition_key` renders numeric conditions from their canonical SI + magnitude at a fixed precision, so ``T=300K`` and ``T=300.0K`` (and, deliberately, + ``T=26.85degC``) collapse to the same key rather than splitting into separate pivoted rows. +""" + +from __future__ import annotations + +import re +from typing import Any + +import pint +import pint.errors +from uncertainties import UFloat, ufloat_fromstr +from uncertainties.core import AffineScalarFunc + +from mpcontribs_api.config import get_settings +from mpcontribs_api.exceptions import UnitError + +settings = get_settings() + +# autoconvert_offset_to_baseunit lets us handle converting degC -> degK. Otherwise Pint is not sure if degC is an offset +# Assuming that users intend for their units to often be a "delta" ie degC/hr really means delta_degC/hr +_UREG = pint.UnitRegistry(autoconvert_offset_to_baseunit=True) + +# Fixed precision used when rendering a numeric condition into its identity string. ``.(number)g`` keeps +# (number) significant figures and normalizes representations (``300`` == ``300.0`` == ``3e2``). +_IDENTITY_FMT = f"{{:.{settings.mpcontribs.float_precision}g}}" + +# Explicit uncertainty notation: "4.2(3)", "4.2+/-0.3", or "4.2±0.3". Without one of these, a plain +# numeric string is parsed as an exact float (ufloat_fromstr would otherwise inject an implied ±1 +# on the last digit). +_HAS_UNCERTAINTY = re.compile(r"\(\d+\)|\+/-|±") + +# A magnitude string is only treated as numeric when it starts like a number. This keeps categorical +# condition values ("cubic", "sampleA") from being mis-parsed as units (e.g. bare "m" -> metre). +_NUMERIC_START = re.compile(r"^\s*[+-]?(\d|\.\d)") + +# Split a numeric condition value into its leading magnitude (incl. optional uncertainty/exponent) +# and a trailing unit string. Used as the canonicalization path for conditions like "26.85degC" +# that Pint cannot parse in string form (offset units). +_MAGNITUDE_UNIT = re.compile( + r"^\s*(?P[+-]?(?:\d+\.?\d*|\.\d+)(?:[eE][+-]?\d+)?(?:\(\d+\))?(?:\s*\+/-\s*\S+)?)\s*(?P.*)$" +) + + +def _parse_magnitude(value: Any) -> float | UFloat: + """Parse a submitted magnitude into a float or an uncertainties ``UFloat``. + + Numbers pass through. Strings are tried as uncertainty notation first (``"4.2(3)"``, + ``"4.2+/-0.3"``) then as a plain float. Anything else raises :class:`UnitError`. + """ + if isinstance(value, bool): + # bool is an int subclass; a boolean magnitude is almost certainly a mistake. + raise UnitError(f"boolean is not a valid magnitude: {value!r}") + if isinstance(value, (int, float)): + return float(value) + if isinstance(value, str): + if _HAS_UNCERTAINTY.search(value): + try: + parsed = ufloat_fromstr(value) + except (ValueError, TypeError) as err: + raise UnitError(f"could not parse magnitude from {value!r}") from err + if isinstance(parsed, AffineScalarFunc) and parsed.std_dev == 0: + return float(parsed.nominal_value) + return parsed + try: + return float(value) + except ValueError as err: + raise UnitError(f"could not parse magnitude from {value!r}") from err + raise UnitError(f"could not parse magnitude from {value!r}") + + +def _split_ufloat(magnitude: float | UFloat) -> tuple[float, float | None]: + """Return ``(nominal, error)`` for a magnitude; ``error`` is ``None`` for a plain float.""" + if isinstance(magnitude, AffineScalarFunc): + return float(magnitude.nominal_value), float(magnitude.std_dev) + return float(magnitude), None + + +def annotate_value(value: Any, unit: str | None) -> dict[str, Any]: + """Annotate a submitted leaf value with its unit, canonicalized to SI when possible. + + Args: + value: the submitted magnitude (number, or a string possibly carrying uncertainty) + unit: the unit string parsed from the annotated key, or ``None``/empty for unit-less + + Returns: + A leaf dict always carrying ``value``/``unit`` (canonical SI when convertible, else the + submitted form) and ``input_value``/``input_unit`` (always the submitted form). When the + magnitude carried an uncertainty, ``error`` holds the standard deviation. ``unit`` is + ``None`` for a unit-less value. + + Raises: + UnitError: if the magnitude cannot be parsed. + """ + magnitude = _parse_magnitude(value) + nominal, error = _split_ufloat(magnitude) + + leaf = {"value": nominal, "unit": unit, "input_value": nominal, "input_unit": unit} + if error is not None: + leaf["error"] = error + + # Unit-less: nothing to canonicalize. + if not unit: + return leaf + + # Canonicalize to SI base units when Pint recognizes the unit; otherwise store as submitted. + try: + quantity = _UREG.Quantity(magnitude, unit).to_base_units() + except pint.errors.PintError, AssertionError, ValueError: + return leaf + + canon_nominal, canon_error = _split_ufloat(quantity.magnitude) + leaf["value"] = canon_nominal + leaf["unit"] = _format_unit(quantity.units) + if canon_error is not None: + leaf["error"] = canon_error + return leaf + + +def _format_unit(units: Any) -> str: + """Render Pint units compactly (``"kilogram / second ** 2"`` style default is fine).""" + return f"{units:~}" if str(units) else "" + + +def parse_condition_value(raw: str) -> dict[str, Any] | str: + """Parse a condition RHS (``"300K"``, ``"5"``, ``"cubic"``) into a leaf or a categorical string. + + A value that does not start like a number is treated as categorical and returned verbatim, + which keeps words like ``"cubic"`` from being mis-parsed as units. A numeric value is split into + magnitude + unit by Pint and annotated exactly like a measurement leaf. + """ + raw = raw.strip() + if not _NUMERIC_START.match(raw): + return raw + # Split the leading magnitude from the trailing unit ourselves, then reuse annotate_value so + # conditions canonicalize exactly like measurement leaves (offset units included). + match = _MAGNITUDE_UNIT.match(raw) + if match is None: + return raw + mag, unit = match.group("mag").strip(), match.group("unit").strip() + try: + return annotate_value(mag, unit or None) + except UnitError: + return raw + + +def _identity_scalar(leaf_or_str: dict[str, Any] | str) -> str: + """Render one canonical condition value for the identity string.""" + if isinstance(leaf_or_str, str): + return leaf_or_str + value = leaf_or_str.get("value") + unit = leaf_or_str.get("unit") + num = _IDENTITY_FMT.format(value) if isinstance(value, (int, float)) else str(value) + return f"{num}:{unit}" if unit else num + + +def condition_key(conditions: dict[str, dict[str, Any] | str]) -> str: + """Build a deterministic identity string from a row's canonicalized conditions. + + Conditions are sorted by name and rendered from their canonical (SI) form at fixed precision so + physically-equal conditions dedup to the same key. The empty string denotes "no conditions" + (every legacy contribution). + """ + if not conditions: + return "" + return "|".join(f"{name}={_identity_scalar(conditions[name])}" for name in sorted(conditions)) From cb904bf123353d5642f20ccae2daf14b816520cd Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 9 Jul 2026 12:23:26 -0700 Subject: [PATCH 208/591] Logic for 'pivoting' from a single contribution with various conditions into multiple contributions, each specifying a single condition. --- .../domains/contributions/pivot.py | 211 ++++++++++++++++++ 1 file changed, 211 insertions(+) create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/contributions/pivot.py diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/pivot.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/pivot.py new file mode 100644 index 0000000000..4c71c3c2d7 --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/pivot.py @@ -0,0 +1,211 @@ +"""Annotated-key parsing and contribution pivoting. + +A contribution may be submitted with ``data`` keys in the annotated form:: + + "name (unit, cond1=val1, cond2=val2, ...)" + +- ``name`` is the (dotted, nestable) data path. +- ``unit`` is the single token without ``=`` (optional). +- the ``key=value`` items are *conditions*. + +:func:`parse_annotated_key` splits a raw key into those parts. :func:`expand_contribution` uses them +to (a) annotate each leaf value with its unit (canonicalized to SI, see +:mod:`mpcontribs_api.domains._shared.units`) and (b) *pivot* the contribution: columns are grouped by +their exact condition signature and each distinct signature becomes its own contribution, with +condition-less columns broadcast into every resulting row. One submitted contribution can therefore +become many stored contributions, each carrying its conditions as ordinary data columns plus a +server-owned ``condition_key`` (see :func:`mpcontribs_api.domains._shared.units.condition_key`). +""" + +from dataclasses import dataclass, field +from typing import TYPE_CHECKING, Any + +from mpcontribs_api.domains._shared.units import UnitError, annotate_value, condition_key, parse_condition_value +from mpcontribs_api.exceptions import ValidationError + +if TYPE_CHECKING: + from mpcontribs_api.domains.contributions.models import ContributionIn + + +@dataclass(frozen=True, slots=True) +class ExpandedContribution: + """One pivoted contribution paired with its server-computed ``condition_key``. + + ``condition_key`` is carried alongside (not on the input model) so it is never taken from the + request body — mirroring how the service resolves ``version``. + """ + + contribution: ContributionIn + condition_key: str + + +@dataclass(frozen=True, slots=True) +class ParsedKey: + """A ``data`` key split into its path, optional unit, and ordered conditions.""" + + path: str + unit: str | None + # Insertion-ordered {condition_name: raw_value_string}; empty when the key carried no conditions. + conditions: dict[str, str] = field(default_factory=dict) + + @property + def is_annotated(self) -> bool: + """True when the key carried a unit and/or any conditions (i.e. had an annotation block).""" + return self.unit is not None or bool(self.conditions) + + @property + def segments(self) -> tuple[str, ...]: + """The path split on '.' into nesting segments.""" + return tuple(self.path.split(".")) + + +def parse_annotated_key(key: str) -> ParsedKey: + """Parse a raw ``data`` key into a :class:`ParsedKey`. + + A key with no ``(...)`` block is a plain path (unit ``None``, no conditions) — fully backward + compatible. Inside the block, the one token without ``=`` is the unit and every ``k=v`` token is + a condition, in submission order. + + Raises: + ValueError: on a malformed annotation (unbalanced parens, empty path, empty condition name, + or more than one unit token). + """ + if "(" not in key: + path = key.strip() + if not path: + raise ValueError("empty data key") + return ParsedKey(path=path, unit=None) + + stripped = key.rstrip() + open_idx = stripped.index("(") + if not stripped.endswith(")"): + raise ValueError(f"unbalanced annotation in data key {key!r}") + path = stripped[:open_idx].strip() + if not path: + raise ValueError(f"data key {key!r} has an annotation but no name") + + inner = stripped[open_idx + 1 : -1] + unit: str | None = None + conditions: dict[str, str] = {} + for token in (t.strip() for t in inner.split(",")): + if not token: + continue + if "=" in token: + name, value = token.split("=", 1) + name = name.strip() + if not name: + raise ValueError(f"empty condition name in data key {key!r}") + if name in conditions: + raise ValueError(f"duplicate condition {name!r} in data key {key!r}") + conditions[name] = value.strip() + else: + if unit is not None: + raise ValueError(f"multiple unit tokens ({unit!r}, {token!r}) in data key {key!r}") + unit = token + return ParsedKey(path=path, unit=unit, conditions=conditions) + + +def _set_nested(target: dict[str, Any], segments: tuple[str, ...], value: Any) -> None: + """Write ``value`` at the dotted ``segments`` path inside ``target``. + + Raises: + ValidationError: if a segment collides with an existing leaf, or two source columns resolve + to the same path (e.g. the same name+conditions with different units). + """ + cursor = target + for seg in segments[:-1]: + existing = cursor.get(seg) + if existing is None: + existing = cursor[seg] = {} + elif not isinstance(existing, dict): + raise ValidationError(f"conflicting data paths: '{seg}' is both a value and a parent") + cursor = existing + leaf = segments[-1] + if leaf in cursor: + raise ValidationError(f"conflicting data columns resolve to the same path '{'.'.join(segments)}'") + cursor[leaf] = value + + +def expand_contribution(contribution: ContributionIn) -> list[ExpandedContribution]: + """Annotate units and pivot a submitted contribution on its condition signatures. + + Top-level ``data`` keys are parsed as annotated keys. Keys carrying conditions are grouped by + their canonical :func:`condition_key`; each distinct group becomes one output contribution whose + ``data`` holds the group's conditions (as ordinary columns) plus its measurements plus every + condition-less column (broadcast). Condition-less annotated keys still get their unit annotated. + + A contribution with no conditions anywhere returns a single element (units annotated in place, + ``condition_key == ""``); a contribution with no annotations at all returns the contribution + unchanged (``condition_key == ""``). + + Raises: + ValidationError: on a malformed annotation, a path/column collision, components present on a + pivoting submission, or expanded data that violates the depth/key rules. + """ + # Local imports break the models<->pivot import cycle (models imports parse_annotated_key). + from mpcontribs_api.domains.contributions.models import _validate_data_depth, _validate_data_keys + + data = contribution.data or {} + try: + parsed = {raw_key: parse_annotated_key(raw_key) for raw_key in data} + except ValueError as err: + raise ValidationError(str(err)) from err + + if not any(pk.is_annotated for pk in parsed.values()): + # Nothing annotated: preserve existing behavior (and untouched nested data) exactly. + return [ExpandedContribution(contribution=contribution, condition_key="")] + + # Split columns into the condition-less broadcast set and the conditioned groups (keyed by the + # canonical condition_key so physically-equal signatures merge into one row). + broadcast: list[tuple[str, ParsedKey]] = [] + groups: dict[str, list[tuple[str, ParsedKey]]] = {} + group_conditions: dict[str, dict[str, Any]] = {} + for raw_key, pk in parsed.items(): + if not pk.conditions: + broadcast.append((raw_key, pk)) + continue + parsed_conditions = {name: parse_condition_value(val) for name, val in pk.conditions.items()} + ckey = condition_key(parsed_conditions) + groups.setdefault(ckey, []).append((raw_key, pk)) + # First signature seen for this canonical key wins the stored condition columns. + group_conditions.setdefault(ckey, parsed_conditions) + + if contribution.has_components() and groups: + raise ValidationError( + "components are not supported on submissions that pivot on conditions; " + "insert the pivoted contributions first, then attach components" + ) + + def _annotate_column(row_data: dict[str, Any], raw_key: str, pk: ParsedKey) -> None: + try: + leaf = annotate_value(data[raw_key], pk.unit) if pk.is_annotated else data[raw_key] + except UnitError as err: + raise ValidationError(f"could not parse value for '{raw_key}': {err}") from err + _set_nested(row_data, pk.segments, leaf) + + def _finalize(row_data: dict[str, Any], ckey: str) -> ExpandedContribution: + # model_copy skips validators, so re-run the depth/key checks on the rewritten data. + _validate_data_keys(row_data) + _validate_data_depth(row_data) + return ExpandedContribution(contribution=contribution.model_copy(update={"data": row_data}), condition_key=ckey) + + # No conditioned groups: single output, units annotated in place. + if not groups: + row_data: dict[str, Any] = {} + for raw_key, pk in broadcast: + _annotate_column(row_data, raw_key, pk) + return [_finalize(row_data, "")] + + outputs: list[ExpandedContribution] = [] + for ckey, members in groups.items(): + row_data = {} + # Conditions become ordinary columns first, so a measurement colliding with a condition name + # is caught by _set_nested. + for name, leaf in group_conditions[ckey].items(): + _set_nested(row_data, (name,), leaf) + for raw_key, pk in members: + _annotate_column(row_data, raw_key, pk) + for raw_key, pk in broadcast: + _annotate_column(row_data, raw_key, pk) + outputs.append(_finalize(row_data, ckey)) + return outputs From 98a312eb28b164dd8b0fadc5eb9aed25330fa34e Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 9 Jul 2026 13:55:29 -0700 Subject: [PATCH 209/591] Bringing condition into contribution logic - aggregation, identifiers, etc. --- .../mpcontribs_api/domains/_shared/units.py | 2 - .../domains/contributions/models.py | 91 ++++++-- .../domains/contributions/pivot.py | 19 -- .../domains/contributions/repository.py | 87 +++++--- .../domains/contributions/router.py | 3 + .../domains/contributions/service.py | 197 +++++++++++++----- 6 files changed, 275 insertions(+), 124 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/units.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/units.py index 7393047ad7..6a72f3799c 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/units.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/units.py @@ -18,8 +18,6 @@ ``T=26.85degC``) collapse to the same key rather than splitting into separate pivoted rows. """ -from __future__ import annotations - import re from typing import Any diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py index c200aec70e..fe26ffa164 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py @@ -21,6 +21,7 @@ from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut from mpcontribs_api.domains._shared.types import ShortStr from mpcontribs_api.domains.attachments.models import Attachment, AttachmentFilter, AttachmentIn +from mpcontribs_api.domains.contributions.pivot import parse_annotated_key from mpcontribs_api.domains.structures.models import Structure, StructureFilter, StructureIn from mpcontribs_api.domains.tables.models import Table, TableFilter, TableIn from mpcontribs_api.exceptions import ValidationError @@ -48,24 +49,62 @@ def _validate_data_depth(data: dict[str, Any] | None) -> dict[str, Any] | None: _DATA_PUNCTUATION_PATTERN = re.compile(r"(?![^|]*\|[^|]*\|)[^\x21-\x29\x2B-\x2E\x3A-\x40\x5B-\x5E\x60\x7B\x7D-\x7E]*") -def _validate_keys(data: dict[str, Any] | None) -> dict[str, Any] | None: - if data is None: - return None - keys = list(data.keys()) - if not all(isinstance(k, str) and k.isascii() for k in keys): +def _validate_plain_key(key: Any) -> None: + """Validate a single plain key token (a path segment or a condition name).""" + if not isinstance(key, str) or not key.isascii(): raise ValidationError("Non-ASCII key found in Contribution.data. All dict keys must be only ASCII") - if any(k == "" for k in keys): + if key == "": raise ValidationError("Empty key found in Contribution.data. Keys must be non-empty.") - if any(_DATA_PUNCTUATION_PATTERN.fullmatch(k) is None for k in keys): + if _DATA_PUNCTUATION_PATTERN.fullmatch(key) is None: raise ValidationError( "Punctuation found in Contribution.data keys. Only '_', '*', '/', and at most 1 '|' permitted." ) + + +def _validate_keys(data: dict[str, Any] | None) -> dict[str, Any] | None: + """Strict plain-key validation for a single dict level (used for nested levels).""" + if data is None: + return None + for key in data: + _validate_plain_key(key) # Recurse into nested dicts, including dicts nested inside lists. for v in data.values(): _validate_nested_keys(v) return data +def _validate_data_keys(data: dict[str, Any] | None) -> dict[str, Any] | None: + """Top-level ``data`` key validation, allowing the annotated pattern. + + Each top-level key may be either a plain key or the annotated form + ``name (unit, cond1=..., cond2=...)``. The name's dotted segments and every condition name are + held to the same plain-key rules (units are unconstrained); nested levels stay strictly plain. + Expansion (see :mod:`mpcontribs_api.domains.contributions.pivot`) later rewrites annotated keys + into plain ones, so stored keys always satisfy :func:`_validate_keys`. + """ + if data is None: + return None + for raw_key in data: + if not isinstance(raw_key, str): + raise ValidationError("Non-ASCII key found in Contribution.data. All dict keys must be only ASCII") + try: + parsed = parse_annotated_key(raw_key) + except ValueError as err: + raise ValidationError(f"Malformed annotated key in Contribution.data: {err}") from err + if not parsed.is_annotated: + # A plain key keeps the original strict rule (no '.' nesting); only annotated keys may + # use dotted paths, whose segments are validated individually below. + _validate_plain_key(raw_key) + continue + for segment in parsed.segments: + _validate_plain_key(segment) + for condition_name in parsed.conditions: + _validate_plain_key(condition_name) + for v in data.values(): + _validate_nested_keys(v) + return data + + def _validate_nested_keys(value: Any) -> None: if isinstance(value, dict): _validate_keys(value) @@ -81,7 +120,7 @@ class ContributionBase(BaseDocumentWithInput[PydanticObjectId]): data: Annotated[ dict[str, Any], BeforeValidator(_validate_data_depth), - BeforeValidator(_validate_keys), + BeforeValidator(_validate_data_keys), ] # TODO: Verify that this should default to True and be passed by users @@ -92,9 +131,17 @@ class Settings: name = "contributions" keep_nulls = False indexes = [ + # condition_key is part of identity so pivoted rows (same project/identifier, different + # conditions) coexist; legacy docs use the "" default. See ContributionService and + # mpcontribs_api.domains.contributions.pivot. IndexModel( - keys=[("project", ASCENDING), ("identifier", ASCENDING), ("version", ASCENDING)], - name="project_identifier_version", + keys=[ + ("project", ASCENDING), + ("identifier", ASCENDING), + ("condition_key", ASCENDING), + ("version", ASCENDING), + ], + name="project_identifier_conditionkey_version", unique=True, ), # Multikey indexes over each Link field's DBRef id so the component-delete @@ -110,6 +157,10 @@ class Contribution(ContributionBase): # Server-owned: the service resolves the real version (see ContributionService._split_non_unique) # and stamps it on the doc. Defaults to 1 so the no-version (unique-identifier) case is implicit. version: int = 1 + # Server-owned: a deterministic canonical string of the pivot conditions (see + # mpcontribs_api.domains.contributions.pivot). "" means no conditions (every legacy doc). Part of + # the unique index so pivoted rows can share (project, identifier). + condition_key: str = "" structures: list[Link[Structure]] | None = None tables: list[Link[Table]] | None = None attachments: list[Link[Attachment]] | None = None @@ -137,7 +188,9 @@ def set_last_modified(self): class ContributionIn(ContributionBase): # Only meaningful on upsert/update of a non-unique-identifier project, where it selects which # version to target. Ignored on insert (the service auto-assigns) and for unique-identifier - # projects (inferred as 1). + # projects (inferred as 1). Kept optional (``None`` == "not supplied") so the service can tell an + # omitted version from an explicit ``1`` and require one only in the ambiguous upsert case (see + # ContributionService._split_non_unique); it resolves ``None`` -> 1 when unambiguous. version: int | None = None structures: list[StructureIn] | None = None tables: list[TableIn] | None = None @@ -151,15 +204,24 @@ def component_count(self) -> int: """Returns the total number of components (structures, tables, attachments) in the contribution""" return len(self.structures or []) + len(self.tables or []) + len(self.attachments or []) - def identifiers(self) -> dict[str, str]: - """Returns a dict of unique identifiers for a contribution (outside of id).""" - return {"project": self.project, "identifier": self.identifier} + def identifiers(self) -> dict[str, str | int | None]: + """Returns a dict of unique identifiers for a contribution (outside of id). + + ``version`` is the raw request value (``None`` when omitted); the service overrides it with + the resolved version before using it to target a row (see ContributionService). + """ + return { + "project": self.project, + "identifier": self.identifier, + "version": self.version, + } class ContributionOut(DocumentOut[PydanticObjectId]): project: str | None = None identifier: str | None = None version: int | None = None + condition_key: str | None = None formula: str | None = None is_public: bool | None = None last_modified: datetime | None = None @@ -178,6 +240,7 @@ def default_fields() -> list[str]: "project", "identifier", "version", + "condition_key", "formula", "is_public", "last_modified", diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/pivot.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/pivot.py index 4c71c3c2d7..f50b8d49ea 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/pivot.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/pivot.py @@ -1,22 +1,3 @@ -"""Annotated-key parsing and contribution pivoting. - -A contribution may be submitted with ``data`` keys in the annotated form:: - - "name (unit, cond1=val1, cond2=val2, ...)" - -- ``name`` is the (dotted, nestable) data path. -- ``unit`` is the single token without ``=`` (optional). -- the ``key=value`` items are *conditions*. - -:func:`parse_annotated_key` splits a raw key into those parts. :func:`expand_contribution` uses them -to (a) annotate each leaf value with its unit (canonicalized to SI, see -:mod:`mpcontribs_api.domains._shared.units`) and (b) *pivot* the contribution: columns are grouped by -their exact condition signature and each distinct signature becomes its own contribution, with -condition-less columns broadcast into every resulting row. One submitted contribution can therefore -become many stored contributions, each carrying its conditions as ordinary data columns plus a -server-owned ``condition_key`` (see :func:`mpcontribs_api.domains._shared.units.condition_key`). -""" - from dataclasses import dataclass, field from typing import TYPE_CHECKING, Any diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py index 82b91c31b7..860d93c4ae 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py @@ -112,13 +112,15 @@ async def find_one_contribution(self, project: str, identifier: str) -> Contribu self.document_model.identifier == identifier, ) - async def max_versions(self, keys: list[tuple[str, str]]) -> dict[tuple[str, str], int]: - """Return ``{(project, identifier): max_version}`` for the given keys, scoped to the user. + async def max_versions(self, keys: list[tuple[str, str, str]]) -> dict[tuple[str, str, str], int]: + """Return ``{(project, identifier, condition_key): max_version}`` for the given keys. Presence of a key in the result also signals that at least one contribution already exists for it, which the contribution write path uses to enforce uniqueness on unique-identifier projects and to compute the next version on non-unique ones. Keys with no existing - contributions are absent from the result. + contributions are absent from the result. ``condition_key`` is part of identity so pivoted + rows (same project/identifier, different conditions) version independently; legacy docs use + the ``""`` default (matched via ``$ifNull``). A single aggregation answers the whole batch so the write path avoids one round-trip per contribution. Scope is merged into ``$match`` (mirroring :meth:`referenced_component_ids`); @@ -126,32 +128,44 @@ async def max_versions(self, keys: list[tuple[str, str]]) -> dict[tuple[str, str max for keys they may write. Args: - keys: (project, identifier) pairs to look up + keys: (project, identifier, condition_key) triples to look up Returns: - dict[tuple[str, str], int]: highest existing version per requested key + dict[tuple[str, str, str], int]: highest existing version per requested key """ if not keys: return {} - match: dict[str, Any] = {"$or": [{"project": p, "identifier": i} for p, i in keys]} - if self._scope: - match = {"$and": [self._scope, match]} - pipeline: list[dict[str, Any]] = [ - {"$match": match}, - { - "$group": { - "_id": {"project": "$project", "identifier": "$identifier"}, - "max_version": {"$max": "$version"}, - } - }, - ] - collection = self.document_model.get_pymongo_collection() - result: dict[tuple[str, str], int] = {} - async for doc in await collection.aggregate(pipeline): + # $ifNull is an aggregation expression, not a query operator; express the condition_key match + # via $expr so legacy docs lacking the field (treated as "") are matched correctly. + or_clause: dict[str, Any] = { + "$or": [ + {"project": p, "identifier": i, "$expr": {"$eq": [{"$ifNull": ["$condition_key", ""]}, c]}} + for p, i, c in keys + ] + } + # Beanie combines find() args with $and and prepends them as $match, so the user scope + # is merged automatically (mirroring the manual merge in :meth:`referenced_component_ids`). + query = ( + self.document_model.find(self._scope, or_clause) + if self._scope + else self.document_model.find(or_clause) + ) + group: dict[str, Any] = { + "$group": { + "_id": { + "project": "$project", + "identifier": "$identifier", + "condition_key": {"$ifNull": ["$condition_key", ""]}, + }, + "max_version": {"$max": "$version"}, + } + } + result: dict[tuple[str, str, str], int] = {} + async for doc in query.aggregate([group]): gid = doc["_id"] # Versions are >= 1; coalesce a null $max (legacy docs without the field) to 0 while # still recording the key's presence (existence check for unique-identifier projects). - result[(gid["project"], gid["identifier"])] = doc.get("max_version") or 0 + result[(gid["project"], gid["identifier"], gid.get("condition_key", ""))] = doc.get("max_version") or 0 return result async def referenced_component_ids( @@ -233,37 +247,42 @@ async def update_contribution(self, doc: Contribution, update_data: dict[str, An async def upsert_contribution_by_identifiers( self, - identifiers: dict[str, str], + identifiers: dict[str, str | int], contribution: ContributionIn, - version: int, + condition_key: str = "", ) -> Contribution: """Atomically upsert a Contribution by its identifying fields and resolved version. - Relies on the unique index over (project, identifier, version) so that concurrent requests - targeting the same key cannot both win the insert branch. Fields the caller did not set are - not touched (partial update). On insert a fresh Contribution document is written with - ``is_public=False``. + Relies on the unique index over (project, identifier, condition_key, version) so that + concurrent requests targeting the same key cannot both win the insert branch. Fields the + caller did not set are not touched (partial update). On insert a fresh Contribution document + is written with ``is_public=False``. Args: - identifiers: the fields ContributionIn.identifiers() returns (project, identifier) + identifiers: the fields ContributionIn.identifiers() returns (project, identifier, version) contribution: the input payload to upsert - version: the version resolved by the service (1 for unique-identifier projects, or the - caller-supplied version for non-unique ones); selects which row to update + condition_key: the server-computed pivot identity; selects which pivoted row to update + ("" when the submission carried no conditions) Returns: Contribution: the document as it stands after the operation """ + project = str(identifiers["project"]) + identifier = str(identifiers["identifier"]) + version = int(identifiers["version"]) # service-resolved; always an int here # Make sure the user is allowed to upsert a contribution under the provided project - if not self._user.can_write(identifiers["project"]): - raise PermissionError(f"not authorized to write to project '{identifiers['project']}'") + if not self._user.can_write(project): + raise PermissionError(f"not authorized to write to project '{project}'") doc = self.document_model.from_input_model(contribution) doc.version = version + doc.condition_key = condition_key update_data = doc.model_dump(exclude={"id"}, exclude_none=True) query = self.document_model.find_one( self._scope, - self.document_model.project == identifiers["project"], - self.document_model.identifier == identifiers["identifier"], + self.document_model.project == project, + self.document_model.identifier == identifier, + self.document_model.condition_key == condition_key, self.document_model.version == version, ).upsert( Set(update_data), diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py index 73466eff28..a16d6e5b3c 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py @@ -34,6 +34,9 @@ def _enforce_bulk_limit(contributions: list[ContributionIn]) -> None: list. Callers over the limit should chunk (the limit is advertised at ``GET /api/v1/limits``) or use the async bulk ingestion endpoint. Complements the body-size middleware, which bounds bytes rather than item count. + + This bounds the *submitted* item count; the service re-applies the same limit to the *expanded* + row count after annotated-key pivoting (one submission can expand into many contributions). """ limit = get_settings().mongo.bulk_write_limit count = len(contributions) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py index 88ba3a523f..1bc821a3aa 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py @@ -21,6 +21,7 @@ from mpcontribs_api.domains._shared.repository import MongoDbRepository from mpcontribs_api.domains.attachments.repository import MongoDbAttachmentRepository from mpcontribs_api.domains.contributions.models import Contribution, ContributionFilter, ContributionIn +from mpcontribs_api.domains.contributions.pivot import expand_contribution from mpcontribs_api.domains.contributions.repository import MongoDbContributionRepository from mpcontribs_api.domains.projects.repository import MongoDbProjectRepository from mpcontribs_api.domains.structures.models import Structure @@ -33,17 +34,34 @@ logger = structlog.get_logger(__name__) +@dataclass(frozen=True, slots=True) +class PreparedInput: + """One expanded (pivoted) contribution paired with its original batch index and condition_key. + + Expansion can turn a single submitted contribution into many rows (see + :func:`mpcontribs_api.domains.contributions.pivot.expand_contribution`); every row keeps the + ``index`` of the submission it came from so per-item failures report against the original batch + position, and carries the server-computed ``condition_key`` that (with project+identifier) + identifies it. + """ + + index: int + contribution: ContributionIn + condition_key: str + + @dataclass(frozen=True, slots=True) class ResolvedWrite: """A contribution that passed validation, paired with its server-resolved version. Produced by the split pipeline so the resolved version travels with its contribution (and its - original batch index) + original batch index and condition_key). """ index: int contribution: ContributionIn version: int + condition_key: str = "" class ContributionService: @@ -114,31 +132,54 @@ async def insert_contributions( ) return BulkWriteSummary[Contribution](total=len(contributions), succeeded=succeeded, failed=failed) - def _split_unauthorized( + def _expand_batch( self, - indices: Iterable[int], contributions: list[ContributionIn], - ) -> tuple[list[BulkFailure], list[int]]: + ) -> tuple[list[BulkFailure], list[PreparedInput]]: + """Annotate units and pivot each submission on its conditions, keeping the original index. + + A submission may expand into several rows (one per condition signature) or be rejected as a + whole (malformed annotation, colliding columns, or components on a pivoting submission). A + rejection becomes a single ``BulkFailure`` against the submission's original index; every + surviving row carries that index and its ``condition_key`` forward. + """ + failures: list[BulkFailure] = [] + prepared: list[PreparedInput] = [] + for i, contrib in enumerate(contributions): + try: + rows = expand_contribution(contrib) + except AppError as exc: + failures.append(bulk_failure_from_exception(i, contrib.identifiers(), exc)) + logger.info("contribution expansion rejected", index=i, identifiers=contrib.identifiers()) + continue + for row in rows: + prepared.append(PreparedInput(index=i, contribution=row.contribution, condition_key=row.condition_key)) + return failures, prepared + + def _split_unauthorized( + self, + items: Iterable[PreparedInput], + ) -> tuple[list[BulkFailure], list[PreparedInput]]: """Reject contributions whose ``project`` the current user is not permitted to write. Authorized iff the user is an admin (writes anything) or the contribution's ``project`` is one of the user's groups. Anonymous users are blocked at the router, but carry no groups and are not admins, so they fall through to authorized-for-nothing here (defense-in-depth). - Partitions ``indices`` into unauthorized ``BulkFailure`` entries and the remaining authorized - indices that should proceed. Mirrors ``_split_oversize`` (same shape) so callers can chain - the splits and keep each index in exactly one bucket, preserving input ordering. + Partitions ``items`` into unauthorized ``BulkFailure`` entries and the remaining authorized + items that should proceed. Mirrors ``_split_oversize`` (same shape) so callers can chain + the splits and keep each item in exactly one bucket, preserving input ordering. """ unauthorized: list[BulkFailure] = [] - remaining: list[int] = [] - for i in indices: - contrib = contributions[i] + remaining: list[PreparedInput] = [] + for item in items: + contrib = item.contribution if self._user.can_write(contrib.project): - remaining.append(i) + remaining.append(item) else: unauthorized.append( BulkFailure( - index=i, + index=item.index, identifier=contrib.identifiers(), error_code=PermissionError.error_code, message=f"not authorized to write to project '{contrib.project}'", @@ -152,8 +193,7 @@ def _split_unauthorized( async def _split_non_unique( self, - indices: Iterable[int], - contributions: list[ContributionIn], + items: Iterable[PreparedInput], *, is_upsert: bool, ) -> tuple[list[BulkFailure], list[ResolvedWrite]]: @@ -166,36 +206,52 @@ async def _split_non_unique( as a conflict. On upsert the version is inferred as 1 (any supplied value is ignored). - **False**: many versions may share (project, identifier). On insert the version is auto-assigned as ``max(existing) + 1``, sequencing intra-batch duplicates. On upsert the - caller must supply ``version`` to pick the target row, else the item is rejected. + caller may supply ``version`` to pick the target row; if omitted it defaults to 1 **only + when no row yet exists** for that (project, identifier, condition_key) — an unambiguous + insert. If a row already exists, an unversioned upsert is ambiguous (update which version + vs insert a new one) and is rejected, requiring the caller to specify ``version``. - Iterates ``indices`` in input order so intra-batch duplicates sequence deterministically. + Iterates ``items`` in input order so intra-batch duplicates sequence deterministically. + Uniqueness and versioning key on (project, identifier, condition_key) so pivoted rows that + differ only by condition are independent identities. Returns: tuple of (rejections, a ``ResolvedWrite`` per survivor pairing it with its version) """ - indices = list(indices) + items = list(items) failures: list[BulkFailure] = [] plan: list[ResolvedWrite] = [] - if not indices: + if not items: return failures, plan - # One round-trip each for the per-project uniqueness flags and (insert only) the current - # max version per key, instead of a query per contribution. - unique_map = await self._projects.unique_identifiers_by_id(sorted({contributions[i].project for i in indices})) - max_map: dict[tuple[str, str], int] = {} - if not is_upsert: - keys = sorted({(contributions[i].project, contributions[i].identifier) for i in indices}) + # One round-trip each for the per-project uniqueness flags and the current max version per + # key, instead of a query per contribution. Insert needs the max for every key (assign next + # version / reject unique-project dupes); upsert needs it only for non-unique projects, where + # the presence of an existing row makes an unversioned upsert ambiguous (see below). + unique_map = await self._projects.unique_identifiers_by_id(sorted({it.contribution.project for it in items})) + max_map: dict[tuple[str, str, str], int] = {} + if is_upsert: + keys = sorted( + { + (it.contribution.project, it.contribution.identifier, it.condition_key) + for it in items + if unique_map.get(it.contribution.project) is False + } + ) + else: + keys = sorted({(it.contribution.project, it.contribution.identifier, it.condition_key) for it in items}) + if keys: max_map = await self._contributions.max_versions(keys) - seen: dict[tuple[str, str], int] = defaultdict(int) - for i in indices: - contrib = contributions[i] - key = (contrib.project, contrib.identifier) + seen: dict[tuple[str, str, str], int] = defaultdict(int) + for item in items: + contrib = item.contribution + key = (contrib.project, contrib.identifier, item.condition_key) if contrib.project not in unique_map: failures.append( BulkFailure( - index=i, + index=item.index, identifier=contrib.identifiers(), error_code=ValidationError.error_code, message=f"project '{contrib.project}' not found or not accessible", @@ -211,34 +267,43 @@ async def _split_non_unique( unique = unique_map[contrib.project] if is_upsert: if unique: + # At most one row per (project, identifier, condition_key); upsert is unambiguous. version = 1 elif contrib.version is not None: version = contrib.version - else: + elif key in max_map or seen[key] > 0: + # Non-unique project with a row already present (in the DB, or planned earlier in + # this batch): an unversioned upsert is ambiguous — update which version, or + # insert a new one? Require the caller to specify a version to disambiguate. failures.append( BulkFailure( - index=i, + index=item.index, identifier=contrib.identifiers(), error_code=ValidationError.error_code, message=( - f"project '{contrib.project}' allows multiple versions; a 'version' " - "is required to identify which contribution to update" + f"project '{contrib.project}' already has a contribution for identifier " + f"'{contrib.identifier}'; specify a 'version' to disambiguate updating an " + "existing version from inserting a new one" ), ) ) logger.info( - "ambiguous contribution version in project allowing multiple versions", + "ambiguous unversioned upsert with existing contributions", project=contrib.project, identifiers=contrib.identifiers(), ) continue + else: + # No existing row for this identity: an unversioned upsert is an unambiguous + # insert, so default to version 1 (backwards compatible). + version = 1 elif unique: # Insert into a unique-identifier project: the first occurrence wins, anything that # already exists (in the DB or earlier in this batch) is a conflict. if key in max_map or seen[key] > 0: failures.append( BulkFailure( - index=i, + index=item.index, identifier=contrib.identifiers(), error_code=ConflictError.error_code, message=( @@ -258,32 +323,33 @@ async def _split_non_unique( # sequencing duplicates within this batch (max+1, max+2, ...). version = max_map.get(key, 0) + 1 + seen[key] - plan.append(ResolvedWrite(index=i, contribution=contrib, version=version)) + plan.append( + ResolvedWrite(index=item.index, contribution=contrib, version=version, condition_key=item.condition_key) + ) seen[key] += 1 return failures, plan def _split_oversize( self, - indices: Iterable[int], - contributions: list[ContributionIn], - ) -> tuple[list[BulkFailure], list[int]]: + items: Iterable[PreparedInput], + ) -> tuple[list[BulkFailure], list[PreparedInput]]: """Reject contributions whose component count exceeds the per-contribution ceiling. - Partitions ``indices`` into oversize ``BulkFailure`` entries and the remaining indices that + Partitions ``items`` into oversize ``BulkFailure`` entries and the remaining items that should proceed to Mongo. Doing this upfront avoids burning a transaction slot on a request guaranteed to exceed transactionLifetimeLimitSeconds. """ cap = self._settings.max_components_per_contribution oversize: list[BulkFailure] = [] - remaining: list[int] = [] - for i in indices: - contrib = contributions[i] + remaining: list[PreparedInput] = [] + for item in items: + contrib = item.contribution count = contrib.component_count() if count > cap: oversize.append( BulkFailure( - index=i, + index=item.index, identifier=contrib.identifiers(), error_code=ValidationError.error_code, message=f"contribution has {count} components, exceeds cap of {cap}. " @@ -292,7 +358,7 @@ def _split_oversize( ) logger.info("Attemped to add contribution with too many components.", num_components=count, max=cap) else: - remaining.append(i) + remaining.append(item) return oversize, remaining async def _split_contributions( @@ -300,22 +366,36 @@ async def _split_contributions( ) -> tuple[list[BulkFailure], list[ResolvedWrite]]: """Common method for validating contribution write failure logic and resolving versions. - Runs the cheap, local, index-based filters first (authorization, then component-count cap) - so guaranteed failures never reach the DB; ``_split_non_unique`` runs last and turns the - remaining indices into a write plan carrying each resolved version. + Expands (annotates units + pivots on conditions) each submission first, then runs the cheap, + local, index-based filters (authorization, then component-count cap) so guaranteed failures + never reach the DB; ``_split_non_unique`` runs last and turns the remaining items into a + write plan carrying each resolved version and condition_key. Failures report against the + original submission index even though one submission may have produced several rows. Returns: tuple of (failures and their reasons, a ``ResolvedWrite`` per contribution to write) """ + # Annotate units and pivot each submission on its conditions (1 submission -> N rows). + expand_failures, prepared = self._expand_batch(contributions) + # Bound the *expanded* row count: a small batch can pivot into many rows, so the router's + # raw-count gate isn't enough on its own (advertised at GET /api/v1/limits). + limit = self._settings.bulk_write_limit + if len(prepared) > limit: + raise ValidationError( + f"Submission expands to {len(prepared)} contributions, exceeding the per-request limit of {limit}. " + "Chunk the request (see GET /api/v1/limits) or use the async bulk ingestion endpoint.", + expanded_count=len(prepared), + limit=limit, + ) # Per-item project authorization (see _split_unauthorized for the per-item vs fail-fast # decision). Only authorized items reach Mongo; the rest are reported in ``failed``. - unauthorized_failures, authorized_indices = self._split_unauthorized(range(len(contributions)), contributions) + unauthorized_failures, authorized = self._split_unauthorized(prepared) # Reject contributions that have too many components associated with them. - oversize_failures, sized_indices = self._split_oversize(authorized_indices, contributions) + oversize_failures, sized = self._split_oversize(authorized) # Verify identifiers/uniqueness within a project and resolve each version, depending on # project.unique_identifiers and whether this is an insert or upsert. - non_unique_failures, plan = await self._split_non_unique(sized_indices, contributions, is_upsert=is_upsert) - return (unauthorized_failures + oversize_failures + non_unique_failures, plan) + non_unique_failures, plan = await self._split_non_unique(sized, is_upsert=is_upsert) + return (expand_failures + unauthorized_failures + oversize_failures + non_unique_failures, plan) async def _insert_no_components( self, @@ -333,6 +413,7 @@ async def _insert_no_components( for item in items: doc = Contribution.from_input_model(item.contribution) doc.version = item.version + doc.condition_key = item.condition_key docs.append(doc) try: await self._contributions.insert_many_contributions(docs) @@ -401,7 +482,7 @@ async def _insert_one_with_components(self, item: ResolvedWrite) -> Contribution async with self._client.start_session() as session: async def _txn(s: AsyncClientSession) -> Contribution: - return await self._do_insert(contrib, s, item.version) + return await self._do_insert(contrib, s, item.version, item.condition_key) return await session.with_transaction(_txn) except AppError as exc: @@ -412,7 +493,9 @@ async def _txn(s: AsyncClientSession) -> Contribution: ) return bulk_failure_from_exception(item.index, contrib.identifiers(), exc) - async def _do_insert(self, contrib: ContributionIn, session: AsyncClientSession, version: int) -> Contribution: + async def _do_insert( + self, contrib: ContributionIn, session: AsyncClientSession, version: int, condition_key: str = "" + ) -> Contribution: """Insert components then the contribution itself, all in the given session. Components are inserted sequentially because a session is single-threaded — sharing it @@ -423,6 +506,7 @@ async def _do_insert(self, contrib: ContributionIn, session: AsyncClientSession, doc = Contribution.from_input_model(contrib) doc.version = version + doc.condition_key = condition_key doc.structures = cast(list[Link[Structure]] | None, structures or None) doc.tables = cast(list[Link[Table]] | None, tables or None) return await self._contributions.insert_contribution(doc, session=session) @@ -466,10 +550,13 @@ async def upsert_contributions(self, contributions: list[ContributionIn]) -> Bul async def _bounded_upsert(item: ResolvedWrite) -> Contribution | BulkFailure: contrib = item.contribution + # identifiers() carries the raw request version; override it with the version the service + # resolved (unique -> 1, non-unique -> supplied/defaulted) so the repo targets the right row. + identifiers = {**contrib.identifiers(), "version": item.version} async with sem: try: return await self._contributions.upsert_contribution_by_identifiers( - contrib.identifiers(), contrib, item.version + identifiers, contrib, item.condition_key ) except Exception as exc: logger.error( From 9f884033270cf3c02d2f33ffc71174aa175f62c2 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 9 Jul 2026 13:55:44 -0700 Subject: [PATCH 210/591] Added testing --- .../unit/domains/test_contribution_service.py | 149 +++++++++++++++- .../unit/domains/test_contributions_pivot.py | 159 ++++++++++++++++++ .../tests/unit/domains/test_units.py | 119 +++++++++++++ 3 files changed, 418 insertions(+), 9 deletions(-) create mode 100644 mpcontribs-api/tests/unit/domains/test_contributions_pivot.py create mode 100644 mpcontribs-api/tests/unit/domains/test_units.py diff --git a/mpcontribs-api/tests/unit/domains/test_contribution_service.py b/mpcontribs-api/tests/unit/domains/test_contribution_service.py index 02451f5033..029fd8b322 100644 --- a/mpcontribs-api/tests/unit/domains/test_contribution_service.py +++ b/mpcontribs-api/tests/unit/domains/test_contribution_service.py @@ -104,6 +104,7 @@ def _make_mongo_settings( max_components_per_contribution: int = 500, max_concurrent_transactions: int = 8, component_insert_chunk_size: int = 100, + bulk_write_limit: int = 1000, ) -> MongoSettings: return MongoSettings.model_validate({ "uri": "mongodb://test", @@ -112,6 +113,7 @@ def _make_mongo_settings( "max_components_per_contribution": max_components_per_contribution, "max_concurrent_transactions": max_concurrent_transactions, "component_insert_chunk_size": component_insert_chunk_size, + "bulk_write_limit": bulk_write_limit, }) @@ -467,7 +469,7 @@ class TestContributionVersioning: async def test_insert_unique_existing_key_conflicts(self): svc, contrib_repo, *_ = _make_service() # unique_identifiers=True by default contrib_repo.insert_many_contributions.return_value = None - contrib_repo.max_versions.return_value = {("proj", "mp-1"): 1} + contrib_repo.max_versions.return_value = {("proj", "mp-1", ""): 1} summary = await svc.insert_contributions([_contrib_in(identifier="mp-1")]) @@ -479,7 +481,7 @@ async def test_insert_unique_existing_key_conflicts(self): async def test_insert_non_unique_assigns_max_plus_one(self): svc, contrib_repo, *_ = _make_service(unique_identifiers=False) contrib_repo.insert_many_contributions.return_value = None - contrib_repo.max_versions.return_value = {("proj", "mp-1"): 3} + contrib_repo.max_versions.return_value = {("proj", "mp-1", ""): 3} summary = await svc.insert_contributions([_contrib_in(identifier="mp-1")]) @@ -500,7 +502,7 @@ async def test_insert_non_unique_no_existing_starts_at_one(self): async def test_insert_non_unique_same_key_twice_sequences_versions(self): svc, contrib_repo, *_ = _make_service(unique_identifiers=False) contrib_repo.insert_many_contributions.return_value = None - contrib_repo.max_versions.return_value = {("proj", "dup"): 5} + contrib_repo.max_versions.return_value = {("proj", "dup", ""): 5} contribs = [_contrib_in(identifier="dup"), _contrib_in(identifier="dup")] summary = await svc.insert_contributions(contribs) @@ -524,25 +526,153 @@ async def test_upsert_unique_forces_version_one(self): # A supplied version is ignored for unique-identifier projects (inferred as 1). await svc.upsert_contributions([_contrib_in(identifier="mp-1", version=9)]) - assert contrib_repo.upsert_contribution_by_identifiers.call_args.args[2] == 1 + assert contrib_repo.upsert_contribution_by_identifiers.call_args.args[0]["version"] == 1 contrib_repo.max_versions.assert_not_called() - async def test_upsert_non_unique_requires_version(self): + async def test_upsert_non_unique_defaults_version_to_one_when_no_existing_row(self): + # No row exists yet -> unambiguous insert -> default to version 1 rather than rejecting. svc, contrib_repo, *_ = _make_service(unique_identifiers=False) + contrib_repo.upsert_contribution_by_identifiers.return_value = MagicMock(spec=Contribution) + contrib_repo.max_versions.return_value = {} # nothing exists + + summary = await svc.upsert_contributions([_contrib_in(identifier="mp-1")]) # no version + + assert len(summary.succeeded) == 1 + assert summary.failed == [] + assert contrib_repo.upsert_contribution_by_identifiers.call_args.args[0]["version"] == 1 + + async def test_upsert_non_unique_unversioned_with_existing_row_is_ambiguous(self): + # A row already exists for this identity -> unversioned upsert can't tell update from insert + # -> reject, requiring an explicit version. + svc, contrib_repo, *_ = _make_service(unique_identifiers=False) + contrib_repo.max_versions.return_value = {("proj", "mp-1", ""): 2} summary = await svc.upsert_contributions([_contrib_in(identifier="mp-1")]) # no version assert summary.succeeded == [] assert [f.error_code for f in summary.failed] == ["validation_error"] + assert "version" in summary.failed[0].message contrib_repo.upsert_contribution_by_identifiers.assert_not_called() + async def test_upsert_non_unique_with_existing_row_and_version_targets_it(self): + # With an existing row, supplying the version resolves the ambiguity and proceeds. + svc, contrib_repo, *_ = _make_service(unique_identifiers=False) + contrib_repo.upsert_contribution_by_identifiers.return_value = MagicMock(spec=Contribution) + contrib_repo.max_versions.return_value = {("proj", "mp-1", ""): 2} + + summary = await svc.upsert_contributions([_contrib_in(identifier="mp-1", version=2)]) + + assert len(summary.succeeded) == 1 + assert contrib_repo.upsert_contribution_by_identifiers.call_args.args[0]["version"] == 2 + + async def test_upsert_unique_unversioned_with_existing_row_is_not_ambiguous(self): + # Unique-identifier projects have at most one row per identity, so upsert stays unambiguous + # (version 1) even when a row exists; max_versions is not even consulted. + svc, contrib_repo, *_ = _make_service() # unique by default + contrib_repo.upsert_contribution_by_identifiers.return_value = MagicMock(spec=Contribution) + + summary = await svc.upsert_contributions([_contrib_in(identifier="mp-1")]) # no version + + assert len(summary.succeeded) == 1 + assert contrib_repo.upsert_contribution_by_identifiers.call_args.args[0]["version"] == 1 + contrib_repo.max_versions.assert_not_called() + async def test_upsert_non_unique_passes_supplied_version(self): svc, contrib_repo, *_ = _make_service(unique_identifiers=False) contrib_repo.upsert_contribution_by_identifiers.return_value = MagicMock(spec=Contribution) await svc.upsert_contributions([_contrib_in(identifier="mp-1", version=7)]) - assert contrib_repo.upsert_contribution_by_identifiers.call_args.args[2] == 7 + assert contrib_repo.upsert_contribution_by_identifiers.call_args.args[0]["version"] == 7 + + +# --------------------------------------------------------------------------- +# Annotated-key pivot (expansion) through the service +# --------------------------------------------------------------------------- + + +def _pivoting_contrib(identifier="mp-1", project="proj") -> ContributionIn: + """A submission whose two condition signatures pivot into two contributions.""" + return ContributionIn( + _id=_oid(), + project=project, + identifier=identifier, + formula="Fe2O3", + data={ + "conductivity (S/cm, T=300K)": 4.2, + "conductivity (S/cm, T=400K)": 5.1, + "bandgap (eV)": 1.1, + }, + ) + + +class TestContributionPivotThroughService: + async def test_insert_pivots_one_submission_into_many_docs(self): + svc, contrib_repo, *_ = _make_service() # unique_identifiers=True + contrib_repo.insert_many_contributions.return_value = None + + summary = await svc.insert_contributions([_pivoting_contrib()]) + + # total reflects the submitted batch; succeeded reflects the stored (pivoted) docs. + assert summary.total == 1 + assert len(summary.succeeded) == 2 + docs = contrib_repo.insert_many_contributions.call_args[0][0] + assert len({d.condition_key for d in docs}) == 2 + assert all(d.condition_key for d in docs) # non-empty condition_key on each pivoted doc + # Each doc carries its conditions as columns plus the broadcast bandgap. + for d in docs: + assert set(d.data) == {"T", "conductivity", "bandgap"} + + async def test_insert_failure_maps_to_original_submission_index(self): + # Non-unique project so intra-batch pivot rows don't self-conflict; a Mongo writeError on the + # 3rd expanded doc (2nd submission's 2nd row) must report against original index 1. + svc, contrib_repo, *_ = _make_service(unique_identifiers=False) + contrib_repo.insert_many_contributions.side_effect = BulkWriteError( + {"writeErrors": [{"index": 2, "code": 11000, "errmsg": "duplicate key"}]} + ) + plain = ContributionIn(_id=_oid(), project="proj", identifier="mp-a", formula="F", data={}) + summary = await svc.insert_contributions([plain, _pivoting_contrib(identifier="mp-b")]) + + assert summary.total == 2 + assert [f.index for f in summary.failed] == [1] + assert len(summary.succeeded) == 2 # plain + first pivoted row + + async def test_malformed_submission_fails_only_that_item(self): + svc, contrib_repo, *_ = _make_service() + contrib_repo.insert_many_contributions.return_value = None + good = ContributionIn(_id=_oid(), project="proj", identifier="ok", formula="F", data={"bandgap (eV)": 1.1}) + # Collision (same name+signature, different unit) is caught in expansion, not at model parse. + bad = ContributionIn( + _id=_oid(), + project="proj", + identifier="bad", + formula="F", + data={"x (S/cm, T=300K)": 1, "x (mS/cm, T=300K)": 2}, + ) + summary = await svc.insert_contributions([good, bad]) + + assert summary.total == 2 + assert len(summary.succeeded) == 1 + assert [f.index for f in summary.failed] == [1] + assert summary.failed[0].error_code == "validation_error" + + async def test_expanded_count_over_limit_raises(self): + settings = _make_mongo_settings(bulk_write_limit=1) + svc, *_ = _make_service(settings=settings) + # One submission expands to 2 rows > limit of 1. + with pytest.raises(ValidationError, match="expands to"): + await svc.insert_contributions([_pivoting_contrib()]) + + async def test_upsert_passes_condition_key_to_repo(self): + svc, contrib_repo, *_ = _make_service() # unique -> version 1, condition_key differentiates + contrib_repo.upsert_contribution_by_identifiers.return_value = MagicMock(spec=Contribution) + + await svc.upsert_contributions([_pivoting_contrib()]) + + assert contrib_repo.upsert_contribution_by_identifiers.call_count == 2 + for call in contrib_repo.upsert_contribution_by_identifiers.call_args_list: + assert call.args[0]["version"] == 1 # resolved version travels in the identifiers dict + assert call.args[2] # non-empty condition_key # --------------------------------------------------------------------------- @@ -629,7 +759,8 @@ async def test_passes_identifiers_dict_and_input_to_repo(self): await svc.upsert_contributions([contrib]) call = contrib_repo.upsert_contribution_by_identifiers.call_args - assert call.args[0] == {"project": "my-proj", "identifier": "mp-99"} + # identifiers() now carries the resolved version alongside project/identifier. + assert call.args[0] == {"project": "my-proj", "identifier": "mp-99", "version": 1} assert call.args[1] is contrib async def test_returns_repo_results_in_input_order(self): @@ -637,7 +768,7 @@ async def test_returns_repo_results_in_input_order(self): docs = [MagicMock(spec=Contribution, name=f"doc-{i}") for i in range(3)] returned = {} - async def _upsert(identifiers, contrib, version): + async def _upsert(identifiers, contrib, condition_key=""): doc = docs[int(contrib.identifier.split("-")[1])] returned[contrib.identifier] = doc return doc @@ -677,7 +808,7 @@ async def test_same_key_concurrent_upserts_both_go_through_atomic_call(self): async def test_one_failure_is_reported_not_raised(self): svc, contrib_repo, *_ = _make_service() - async def _upsert(identifiers, contrib, version): + async def _upsert(identifiers, contrib, condition_key=""): if contrib.identifier == "mp-1": raise ConflictError("boom") return MagicMock(spec=Contribution) diff --git a/mpcontribs-api/tests/unit/domains/test_contributions_pivot.py b/mpcontribs-api/tests/unit/domains/test_contributions_pivot.py new file mode 100644 index 0000000000..c674d25208 --- /dev/null +++ b/mpcontribs-api/tests/unit/domains/test_contributions_pivot.py @@ -0,0 +1,159 @@ +import math + +import pytest +from beanie import PydanticObjectId + +from mpcontribs_api.domains.contributions.models import ContributionIn +from mpcontribs_api.domains.contributions.pivot import expand_contribution, parse_annotated_key +from mpcontribs_api.exceptions import ValidationError + + +def _contrib_in(data, **overrides) -> ContributionIn: + defaults = { + "_id": PydanticObjectId(), + "project": "p", + "identifier": "mp-1", + "formula": "Fe2O3", + "data": data, + } + defaults.update(overrides) + return ContributionIn(**defaults) + + +# --------------------------------------------------------------------------- +# parse_annotated_key +# --------------------------------------------------------------------------- + + +class TestParseAnnotatedKey: + def test_plain_key(self): + pk = parse_annotated_key("conductivity") + assert pk.path == "conductivity" + assert pk.unit is None + assert pk.conditions == {} + assert pk.is_annotated is False + + def test_unit_only(self): + pk = parse_annotated_key("bandgap (eV)") + assert pk.path == "bandgap" + assert pk.unit == "eV" + assert pk.conditions == {} + assert pk.is_annotated is True + + def test_unit_and_conditions(self): + pk = parse_annotated_key("conductivity (S/cm, T=300K, P=1atm)") + assert pk.path == "conductivity" + assert pk.unit == "S/cm" + assert pk.conditions == {"T": "300K", "P": "1atm"} + + def test_conditions_only_no_unit(self): + pk = parse_annotated_key("count (n=5)") + assert pk.path == "count" + assert pk.unit is None + assert pk.conditions == {"n": "5"} + + def test_dotted_path(self): + pk = parse_annotated_key("a.b.c (eV, T=300K)") + assert pk.segments == ("a", "b", "c") + + def test_unbalanced_parens_raises(self): + with pytest.raises(ValueError): + parse_annotated_key("x (eV") + + def test_empty_name_raises(self): + with pytest.raises(ValueError): + parse_annotated_key(" (eV)") + + def test_multiple_units_raises(self): + with pytest.raises(ValueError): + parse_annotated_key("x (eV, meV)") + + def test_duplicate_condition_raises(self): + with pytest.raises(ValueError): + parse_annotated_key("x (eV, T=300K, T=400K)") + + +# --------------------------------------------------------------------------- +# expand_contribution +# --------------------------------------------------------------------------- + + +class TestExpandContribution: + def test_no_annotations_returns_unchanged(self): + c = _contrib_in({"a": {"b": 1.5}, "plain": 3}) + rows = expand_contribution(c) + assert len(rows) == 1 + assert rows[0].condition_key == "" + assert rows[0].contribution is c # untouched, same object + + def test_unit_only_annotates_in_place_single_row(self): + rows = expand_contribution(_contrib_in({"bandgap (eV)": 1.1})) + assert len(rows) == 1 + assert rows[0].condition_key == "" + leaf = rows[0].contribution.data["bandgap"] + assert leaf["input_unit"] == "eV" + + def test_pivots_into_one_row_per_signature(self): + rows = expand_contribution( + _contrib_in( + { + "conductivity (S/cm, T=300K, P=1atm)": 4.2, + "conductivity (S/cm, T=400K, P=1atm)": 5.1, + "bandgap (eV)": 1.1, + } + ) + ) + assert len(rows) == 2 + assert len({r.condition_key for r in rows}) == 2 + for r in rows: + # conditions + measurement + broadcast column all present + assert set(r.contribution.data) == {"T", "P", "conductivity", "bandgap"} + + def test_condition_less_column_broadcasts(self): + rows = expand_contribution( + _contrib_in({"x (eV, T=300K)": 1.0, "x (eV, T=400K)": 2.0, "shared (eV)": 9.0}) + ) + assert len(rows) == 2 + for r in rows: + assert math.isclose(r.contribution.data["shared"]["input_value"], 9.0) + + def test_conditions_stored_as_columns(self): + rows = expand_contribution(_contrib_in({"conductivity (S/cm, T=300K)": 4.2})) + assert len(rows) == 1 + data = rows[0].contribution.data + assert "T" in data + assert math.isclose(data["T"]["value"], 300.0) + + def test_dotted_path_nests(self): + rows = expand_contribution(_contrib_in({"a.b.c (eV, T=300K)": 2.0})) + data = rows[0].contribution.data + assert "value" in data["a"]["b"]["c"] + + def test_same_name_signature_different_unit_collision(self): + with pytest.raises(ValidationError, match="same path"): + expand_contribution(_contrib_in({"x (S/cm, T=300K)": 1, "x (mS/cm, T=300K)": 2})) + + def test_condition_name_collides_with_measurement(self): + with pytest.raises(ValidationError, match="same path"): + expand_contribution(_contrib_in({"T (K, T=300K)": 1})) + + def test_malformed_annotation_raises_validation_error(self): + # ContributionIn validation already rejects most malformed keys; expand raises on any that + # slip through to it. + with pytest.raises(ValidationError): + expand_contribution(_contrib_in({"x (eV, =300)": 1})) + + def test_components_on_pivoting_submission_rejected(self): + from tests.unit.domains.test_contribution_service import _structure_in + + c = _contrib_in({"x (eV, T=300K)": 1, "x (eV, T=400K)": 2}, structures=[_structure_in()]) + with pytest.raises(ValidationError, match="components are not supported"): + expand_contribution(c) + + def test_components_allowed_when_not_pivoting(self): + from tests.unit.domains.test_contribution_service import _structure_in + + # unit-only annotation, no conditions -> no pivot -> components fine + c = _contrib_in({"bandgap (eV)": 1.1}, structures=[_structure_in()]) + rows = expand_contribution(c) + assert len(rows) == 1 diff --git a/mpcontribs-api/tests/unit/domains/test_units.py b/mpcontribs-api/tests/unit/domains/test_units.py new file mode 100644 index 0000000000..e91a8180f5 --- /dev/null +++ b/mpcontribs-api/tests/unit/domains/test_units.py @@ -0,0 +1,119 @@ +import math + +import pytest + +from mpcontribs_api.domains._shared.units import ( + UnitError, + annotate_value, + condition_key, + parse_condition_value, +) + +# --------------------------------------------------------------------------- +# annotate_value — SI canonicalization + provenance +# --------------------------------------------------------------------------- + + +class TestAnnotateValue: + def test_recognized_unit_canonicalizes_to_si_and_keeps_original(self): + leaf = annotate_value(4.2, "eV") + assert leaf["input_value"] == 4.2 + assert leaf["input_unit"] == "eV" + # 4.2 eV in joules + assert math.isclose(leaf["value"], 4.2 * 1.602176634e-19, rel_tol=1e-9) + assert leaf["unit"] != "eV" # canonicalized to base units + assert "error" not in leaf + + def test_unitless_value(self): + leaf = annotate_value(5, None) + assert leaf == {"value": 5.0, "unit": None, "input_value": 5.0, "input_unit": None} + + def test_unknown_unit_stored_as_submitted(self): + leaf = annotate_value(1.0, "widgets") + assert leaf["value"] == 1.0 + assert leaf["unit"] == "widgets" + assert leaf["input_unit"] == "widgets" + + def test_offset_unit_canonicalizes_to_kelvin(self): + # degC magnitude passed separately is convertible (unlike the string form). + leaf = annotate_value(26.85, "degC") + assert math.isclose(leaf["value"], 300.0, rel_tol=1e-6) + assert leaf["unit"] == "K" + assert leaf["input_value"] == 26.85 + assert leaf["input_unit"] == "degC" + + def test_uncertainty_notation_parsed_and_propagated(self): + leaf = annotate_value("4.2(3)", "eV") + assert "error" in leaf + # error scales with the same eV->J factor as the value + assert math.isclose(leaf["error"], 0.3 * 1.602176634e-19, rel_tol=1e-6) + + def test_plain_numeric_string_has_no_implied_uncertainty(self): + leaf = annotate_value("300", "K") + assert "error" not in leaf + assert math.isclose(leaf["value"], 300.0) + + def test_unparseable_magnitude_raises(self): + with pytest.raises(UnitError): + annotate_value("not-a-number", "eV") + + def test_boolean_magnitude_rejected(self): + with pytest.raises(UnitError): + annotate_value(True, "eV") + + +# --------------------------------------------------------------------------- +# parse_condition_value — numeric vs categorical +# --------------------------------------------------------------------------- + + +class TestParseConditionValue: + def test_numeric_with_unit(self): + leaf = parse_condition_value("300K") + assert leaf["unit"] == "K" + assert math.isclose(leaf["value"], 300.0) + + def test_bare_numeric(self): + leaf = parse_condition_value("5") + assert leaf["value"] == 5.0 + assert leaf["unit"] is None + + def test_categorical_returned_verbatim(self): + assert parse_condition_value("cubic") == "cubic" + + def test_categorical_word_not_misparsed_as_unit(self): + # "m" is a valid unit (metre) but as a categorical value must stay a string. + assert parse_condition_value("sampleA") == "sampleA" + + def test_offset_unit_condition_canonicalizes(self): + leaf = parse_condition_value("26.85degC") + assert leaf["unit"] == "K" + assert math.isclose(leaf["value"], 300.0, rel_tol=1e-6) + + +# --------------------------------------------------------------------------- +# condition_key — deterministic identity +# --------------------------------------------------------------------------- + + +class TestConditionKey: + def test_empty_when_no_conditions(self): + assert condition_key({}) == "" + + def test_sorted_by_name(self): + key = condition_key({"T": parse_condition_value("300K"), "P": parse_condition_value("1atm")}) + assert key.index("P=") < key.index("T=") + + def test_physically_equal_conditions_collapse(self): + # 300 K and 26.85 degC are the same temperature -> same key. + assert condition_key({"T": parse_condition_value("300K")}) == condition_key( + {"T": parse_condition_value("26.85degC")} + ) + + def test_fixed_precision_normalizes_representations(self): + assert condition_key({"T": parse_condition_value("300K")}) == condition_key( + {"T": parse_condition_value("300.0K")} + ) + + def test_categorical_in_key(self): + assert condition_key({"phase": "cubic"}) == "phase=cubic" From 2f673dfdddcd8ee2179f220d44bc4864222615a9 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 9 Jul 2026 13:58:45 -0700 Subject: [PATCH 211/591] Removed deprecated test file and fixed test case --- .../tests/integration/test_healthcheck.py | 2 +- .../integration/test_ingest_jobs_routes.py | 89 ------------------- 2 files changed, 1 insertion(+), 90 deletions(-) delete mode 100644 mpcontribs-api/tests/integration/test_ingest_jobs_routes.py diff --git a/mpcontribs-api/tests/integration/test_healthcheck.py b/mpcontribs-api/tests/integration/test_healthcheck.py index f98ca854f3..e06e09e8ef 100644 --- a/mpcontribs-api/tests/integration/test_healthcheck.py +++ b/mpcontribs-api/tests/integration/test_healthcheck.py @@ -58,7 +58,7 @@ def test_returns_200(self, health_app): def test_body_reports_healthy(self, health_app): r = _client(health_app, _make_db(ping_ok=True), _make_s3(head_ok=True)).get("/healthcheck") - assert r.json() == {"version": "0.0.0-dev", "status": "healthy", "mongo": "ok", "s3": "ok"} + assert r.json() == {"version": "0.0.0-test", "status": "healthy", "mongo": "ok", "s3": "ok"} def test_pings_mongo(self, health_app): db = _make_db(ping_ok=True) diff --git a/mpcontribs-api/tests/integration/test_ingest_jobs_routes.py b/mpcontribs-api/tests/integration/test_ingest_jobs_routes.py deleted file mode 100644 index 10465867b7..0000000000 --- a/mpcontribs-api/tests/integration/test_ingest_jobs_routes.py +++ /dev/null @@ -1,89 +0,0 @@ -"""Tests for the async bulk-ingestion scaffold routes (submit / status). - -The worker is a stub, so these exercise only the route surface: 202 on submit, a persisted -pending job, idempotency replay, auth, and status lookup (found / not-found / bad id). -""" - -from unittest.mock import AsyncMock - -import pytest -from beanie import PydanticObjectId - -from mpcontribs_api.domains.ingest_jobs.dependencies import get_ingest_job_repository -from mpcontribs_api.domains.ingest_jobs.models import IngestJob -from tests.integration.conftest import AUTHED_HEADERS, FORCE_ANON_HEADERS - -BULK_URL = "/api/v1/contributions/bulk" - - -def _job(**overrides) -> IngestJob: - fields = { - "id": PydanticObjectId(), - "owner": "google:alice@example.com", - "status": "pending", - "source": None, - "idempotency_key": None, - } - fields.update(overrides) - return IngestJob(**fields) - - -@pytest.fixture -def ingest_repo(test_app): - repo = AsyncMock() - test_app.dependency_overrides[get_ingest_job_repository] = lambda: repo - yield repo - test_app.dependency_overrides.pop(get_ingest_job_repository, None) - - -@pytest.fixture(autouse=True) -def _authenticate(client): - client.headers.update(AUTHED_HEADERS) - - -class TestSubmitBulkIngest: - def test_submit_returns_202_and_pending_job(self, client, ingest_repo): - job = _job() - ingest_repo.create_job.return_value = job - r = client.post(BULK_URL, json={"source": None}) - assert r.status_code == 202 - body = r.json() - assert body["id"] == str(job.id) - assert body["status"] == "pending" - ingest_repo.create_job.assert_awaited_once() - - def test_submit_requires_auth(self, client, test_app): - # No repo override here: the repository dependency runs require_user, which rejects anon. - r = client.post(BULK_URL, json={"source": None}, headers=FORCE_ANON_HEADERS) - assert r.status_code == 401 - - def test_idempotency_key_replays_existing_job(self, client, ingest_repo): - existing = _job(idempotency_key="abc123") - ingest_repo.find_by_idempotency_key.return_value = existing - r = client.post(BULK_URL, json={"source": None}, headers={"Idempotency-Key": "abc123"}) - assert r.status_code == 202 - assert r.json()["id"] == str(existing.id) - ingest_repo.find_by_idempotency_key.assert_awaited_once_with("abc123") - ingest_repo.create_job.assert_not_called() - - -class TestGetBulkIngestJob: - def test_get_existing_job(self, client, ingest_repo): - job = _job(status="running", total=10, succeeded=4) - ingest_repo.get_job.return_value = job - r = client.get(f"{BULK_URL}/{job.id}") - assert r.status_code == 200 - body = r.json() - assert body["status"] == "running" - assert body["total"] == 10 - assert body["succeeded"] == 4 - - def test_unknown_job_returns_404(self, client, ingest_repo): - ingest_repo.get_job.return_value = None - r = client.get(f"{BULK_URL}/{PydanticObjectId()}") - assert r.status_code == 404 - - def test_invalid_job_id_returns_422(self, client, ingest_repo): - r = client.get(f"{BULK_URL}/not-an-object-id") - assert r.status_code == 422 - ingest_repo.get_job.assert_not_called() From 34144a7e8be7a90a052929b48ed0ed6482a7412b Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Fri, 10 Jul 2026 11:02:04 -0700 Subject: [PATCH 212/591] Added exception for Contribution.data key handling --- mpcontribs-api/src/mpcontribs_api/exceptions.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mpcontribs-api/src/mpcontribs_api/exceptions.py b/mpcontribs-api/src/mpcontribs_api/exceptions.py index 03250f3399..97ee337689 100644 --- a/mpcontribs-api/src/mpcontribs_api/exceptions.py +++ b/mpcontribs-api/src/mpcontribs_api/exceptions.py @@ -74,6 +74,10 @@ class UnitError(ValidationError): error_code = "unit_error" +class DataKeyError(ValidationError): + error_code = "data_key_error" + + class PayloadTooLargeError(AppError): status_code = 413 error_code = "payload_too_large" From a7cf414740166a2a214e49e017c808997685b19e Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Fri, 10 Jul 2026 11:12:41 -0700 Subject: [PATCH 213/591] Added types for handling various common restrictions on strings and a type for Contribution.data --- .../mpcontribs_api/domains/_shared/types.py | 274 +++++++++++++++++- 1 file changed, 272 insertions(+), 2 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py index bfaf0e4a1f..12a970e1e0 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py @@ -1,12 +1,17 @@ import re +import unicodedata +from dataclasses import dataclass, field from enum import StrEnum -from typing import Annotated +from typing import Annotated, Any import polars as pl from fastapi import Query from pydantic import BeforeValidator, Field, PlainSerializer, WithJsonSchema -from mpcontribs_api.exceptions import ValidationError +from mpcontribs_api.config import get_settings +from mpcontribs_api.exceptions import DataKeyError, ValidationError + +settings = get_settings() ShortStr = Annotated[str, Field(min_length=3, max_length=30)] @@ -108,3 +113,268 @@ def _serialize_frame(data: pl.DataFrame) -> dict: ), WithJsonSchema({"type": "object"}, mode="serialization"), ] + + +def _nfkc_normalize(value: str) -> str: + return unicodedata.normalize("NFKC", value).casefold() + + +def _nfc_normalize(value: str) -> str: + return unicodedata.normalize("NFC", value) + + +# Acronym boundary: an uppercase letter followed by an uppercase-then-lowercase +# pair. The trailing capital begins a new word, so ``HTTPResponse`` splits as +# ``HTTP|Response`` +_ACRONYM_BOUNDARY = re.compile(r"(?<=[A-Z])(?=[A-Z][a-z])") + +# camelCase/PascalCase boundary: a lowercase letter or digit immediately followed +# by an uppercase letter (``bandGap`` -> ``band|Gap``). The ``0-9`` in the lookbehind +# also splits ``digit->UPPER`` (``Al2O3`` -> ``al2_o3``) +_CAMEL_BOUNDARY = re.compile(r"(?<=[a-z0-9])(?=[A-Z])") + +# Any run of characters that isn't an ASCII letter or digit collapses to a single +# underscore (spaces, hyphens, punctuation, etc.). +_NON_ALNUM_RUN = re.compile(r"[^a-zA-Z0-9]+") + +_SPECIAL_TERMS = { + "pH": "ph", +} +_SPECIAL_RE = re.compile("|".join(re.escape(k) for k in _SPECIAL_TERMS)) if _SPECIAL_TERMS else None + + +def to_snake_case(name: str) -> str: + """Coerce a single key token to canonical ``snake_case``. + + Rewrites known irregular terms, splits ``camelCase``/``PascalCase`` and + acronym boundaries, lowercases, and collapses every run of non-alphanumeric + characters to a single underscore, trimming leading/trailing underscores. + """ + s = name + if _SPECIAL_RE is not None: + s = _SPECIAL_RE.sub(lambda m: _SPECIAL_TERMS[m.group()], s) + s = _ACRONYM_BOUNDARY.sub("_", s) + s = _CAMEL_BOUNDARY.sub("_", s) + s = _NON_ALNUM_RUN.sub("_", s) + return s.strip("_").lower() + + +# Converts strs to snake case +SnakeCaseStr = Annotated[str, BeforeValidator(func=to_snake_case)] + +# Converts strs to searchable form (remove unicode, casefold) +SearchStr = Annotated[str, BeforeValidator(func=_nfkc_normalize)] + +# Converts strs to pretty display form (keeps unicode and most formatting) +DisplayStr = Annotated[str, BeforeValidator(func=_nfc_normalize)] + + +# Contribution.data key grammar, coercion, and validation +# Put here to avoid circular import of contributions.models and contributions.pivot + + +@dataclass(frozen=True, slots=True) +class ParsedKey: + """A ``data`` key split into its path, optional unit, and ordered conditions.""" + + path: str + unit: str | None + # Insertion-ordered {condition_name: raw_value_string}; empty when the key carried no conditions. + conditions: dict[str, str] = field(default_factory=dict) + + @property + def is_annotated(self) -> bool: + """True when the key carried a unit and/or any conditions (i.e. had an annotation block).""" + return self.unit is not None or bool(self.conditions) + + @property + def segments(self) -> tuple[str, ...]: + """The path split on '.' into nesting segments.""" + return tuple(self.path.split(".")) + + +def parse_annotated_key(key: str) -> ParsedKey: + """Parse a raw ``data`` key into a :class:`ParsedKey`. + + A key with no ``(...)`` block is a plain path (unit ``None``, no conditions) — fully backward + compatible. Inside the block, the one token without ``=`` is the unit and every ``k=v`` token is + a condition, in submission order. + + Raises: + DataKeyError: on a malformed annotation (unbalanced parens, empty path, empty condition name, + or more than one unit token). + """ + if "(" not in key: + path = key.strip() + if not path: + raise DataKeyError("empty data key") + return ParsedKey(path=path, unit=None) + + stripped = key.rstrip() + open_idx = stripped.index("(") + if not stripped.endswith(")"): + raise DataKeyError(f"unbalanced annotation in data key {key!r}") + path = stripped[:open_idx].strip() + if not path: + raise DataKeyError(f"data key {key!r} has an annotation but no name") + + inner = stripped[open_idx + 1 : -1] + unit: str | None = None + conditions: dict[str, str] = {} + for token in (t.strip() for t in inner.split(",")): + if not token: + continue + if "=" in token: + name, value = token.split("=", 1) + name = name.strip() + if not name: + raise DataKeyError(f"empty condition name in data key {key!r}") + if name in conditions: + raise DataKeyError(f"duplicate condition {name!r} in data key {key!r}") + conditions[name] = value.strip() + else: + if unit is not None: + raise DataKeyError(f"multiple unit tokens ({unit!r}, {token!r}) in data key {key!r}") + unit = token + return ParsedKey(path=path, unit=unit, conditions=conditions) + + +def _coerce_key(key: Any) -> str: + """Coerce one dict key to ``snake_case``, rejecting non-ASCII or empty-after-coercion keys.""" + if not isinstance(key, str) or not key.isascii(): + raise DataKeyError("Non-ASCII key found in Contribution.data. All dict keys must be only ASCII") + coerced = to_snake_case(key) + if not coerced: + raise DataKeyError(f"data key '{key}' reduces to an empty string after snake_case coercion") + return coerced + + +def coerce_keys(value: Any) -> Any: + """Recursively rebuild ``value`` with every dict key coerced to ``snake_case``. + + Walks dicts (coercing keys) and lists (element-wise), leaving scalars untouched. Used for the + nested/plain portions of ``data``; the annotated leaves produced by + :func:`mpcontribs_api.domains._shared.units.annotate_value` are already canonical and are never + routed through here. + + Raises: + ValidationError: if a key is non-ASCII, reduces to an empty string after coercion, or two + sibling keys collide on the same coerced name. + """ + if isinstance(value, dict): + out: dict[str, Any] = {} + for key, sub in value.items(): + coerced = _coerce_key(key) + if coerced in out: + raise DataKeyError(f"data keys collide after snake_case coercion: '{coerced}'") + out[coerced] = coerce_keys(sub) + return out + if isinstance(value, list): + return [coerce_keys(item) for item in value] + return value + + +def _get_dict_depth(x: Any) -> int: + if isinstance(x, dict): + return 1 + max((_get_dict_depth(v) for v in x.values()), default=0) + elif isinstance(x, list): + return max((_get_dict_depth(item) for item in x), default=0) + return 0 + + +def _validate_data_depth(data: dict[str, Any] | None) -> dict[str, Any] | None: + if data is None: + return None + depth = _get_dict_depth(data) + max_depth = settings.mpcontribs.max_contrib_data_depth + if depth > max_depth: + raise ValidationError(f"Depth of Contribution.data must be <= {max_depth}.", depth=depth, max_depth=max_depth) + return data + + +def _validate_plain_key(key: Any) -> None: + """Validate a single plain key token (a path segment or a condition name). + + Punctuation, spaces, and casing are no longer rejected: keys are coerced to ``snake_case`` on the + write path (see :func:`to_snake_case`). This only rejects keys that cannot be coerced into a + usable token: non-ASCII, empty, or ones that reduce to an empty string after coercion + (e.g. ``"***"``). + """ + if not isinstance(key, str) or not key.isascii(): + raise ValidationError("Non-ASCII key found in Contribution.data. All dict keys must be only ASCII") + if key == "": + raise ValidationError("Empty key found in Contribution.data. Keys must be non-empty.") + if not to_snake_case(key): + raise ValidationError(f"data key '{key}' reduces to an empty string after snake_case coercion") + + +def _validate_nested_keys(value: Any) -> None: + if isinstance(value, dict): + _validate_keys(value) + elif isinstance(value, list): + for item in value: + _validate_nested_keys(item) + + +def _validate_keys(data: dict[str, Any] | None) -> dict[str, Any] | None: + """Strict plain-key validation for a single dict level (used for nested levels).""" + if data is None: + return None + for key in data: + _validate_plain_key(key) + # Recurse into nested dicts, including dicts nested inside lists. + for v in data.values(): + _validate_nested_keys(v) + return data + + +def _validate_data_keys(data: dict[str, Any] | None) -> dict[str, Any] | None: + """Top-level ``data`` key validation, allowing the annotated pattern. + + Each top-level key may be either a plain key or the annotated form + ``name (unit, cond1=..., cond2=...)``. The name's dotted segments and every condition name are + held to the same plain-key rules (units are unconstrained); nested levels stay strictly plain. + Expansion (see :mod:`mpcontribs_api.domains.contributions.pivot`) later rewrites annotated keys + into plain ones, so stored keys always satisfy :func:`_validate_keys`. + """ + if data is None: + return None + for raw_key in data: + if not isinstance(raw_key, str): + raise ValidationError("Non-ASCII key found in Contribution.data. All dict keys must be only ASCII") + try: + parsed = parse_annotated_key(raw_key) + except ValidationError as err: + raise ValidationError(f"Malformed annotated key in Contribution.data: {err}") from err + if not parsed.is_annotated: + # A plain key keeps the original strict rule (no '.' nesting); only annotated keys may + # use dotted paths, whose segments are validated individually below. + _validate_plain_key(raw_key) + continue + for segment in parsed.segments: + _validate_plain_key(segment) + for condition_name in parsed.conditions: + _validate_plain_key(condition_name) + for v in data.values(): + _validate_nested_keys(v) + return data + + +def validate_contribution_data(data: dict[str, Any] | None) -> dict[str, Any] | None: + """Run the full write-path ``data`` validation (depth + annotated/plain keys). + + This is the runtime equivalent of the :data:`ContributionData` validator chain, exposed as a + plain function so expansion (:mod:`mpcontribs_api.domains.contributions.pivot`) can re-check the + data it rewrites — ``model_copy`` bypasses Pydantic validators, so pivoted rows are re-validated + here before they are stored. + """ + _validate_data_depth(data) + _validate_data_keys(data) + return data + + +ContributionData = Annotated[ + dict[str, Any] | None, + BeforeValidator(_validate_data_depth), + BeforeValidator(_validate_data_keys), +] From a91615798baca4c4f008d8b130f1bdd76f7cdd45 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Fri, 10 Jul 2026 11:14:01 -0700 Subject: [PATCH 214/591] Strengthened annotated data formatting by introducing the AnnotatedData type --- .../mpcontribs_api/domains/_shared/units.py | 89 +++++++++++++------ 1 file changed, 64 insertions(+), 25 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/units.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/units.py index 6a72f3799c..f62861d78c 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/units.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/units.py @@ -23,6 +23,7 @@ import pint import pint.errors +from pydantic import BaseModel from uncertainties import UFloat, ufloat_fromstr from uncertainties.core import AffineScalarFunc @@ -90,6 +91,41 @@ def _split_ufloat(magnitude: float | UFloat) -> tuple[float, float | None]: return float(magnitude), None +class AnnotatedData(BaseModel): + """The canonical shape of an annotated ``Contribution.data`` leaf. + + ``value``/``unit`` hold the SI-canonical form (or the submitted form when the unit is + unrecognized/dimensionless); ``input_value``/``input_unit`` always hold the submitted form. + ``error`` is the (SI-propagated) standard deviation, present only when the magnitude carried an + uncertainty. ``display`` is a human-readable rendering of the *submitted* magnitude/unit. + + This model is the single source of truth for the leaf shape; :func:`annotate_value` builds one + and returns ``model_dump(exclude_none=True)`` so the value stored in ``data`` stays a plain dict + (``None`` fields are omitted). Units are stored verbatim — never casefolded — so Pint can round + trip them. + """ + + value: float + unit: str | None = None + input_value: float + input_unit: str | None = None + error: float | None = None + display: str + + +def _format_number(x: float) -> str: + """Render a float without trailing zeros (``5.0`` -> ``"5"``, ``4.2`` -> ``"4.2"``).""" + return format(x, "g") + + +def _format_display(nominal: float, error: float | None, unit: str | None) -> str: + """Render the submitted magnitude/unit for display, e.g. ``"4.2 eV"``, ``"4.2+/-0.3 eV"``, ``"5"``.""" + mag = _format_number(nominal) + if error is not None: + mag = f"{mag}+/-{_format_number(error)}" + return f"{mag} {unit}" if unit else mag + + def annotate_value(value: Any, unit: str | None) -> dict[str, Any]: """Annotate a submitted leaf value with its unit, canonicalized to SI when possible. @@ -98,37 +134,40 @@ def annotate_value(value: Any, unit: str | None) -> dict[str, Any]: unit: the unit string parsed from the annotated key, or ``None``/empty for unit-less Returns: - A leaf dict always carrying ``value``/``unit`` (canonical SI when convertible, else the - submitted form) and ``input_value``/``input_unit`` (always the submitted form). When the - magnitude carried an uncertainty, ``error`` holds the standard deviation. ``unit`` is - ``None`` for a unit-less value. + The :class:`AnnotatedData` leaf as a dict (``model_dump(exclude_none=True)``): ``value``/ + ``unit`` are canonical SI when convertible else the submitted form, ``input_value``/ + ``input_unit`` are always the submitted form, ``error`` is present only for an uncertain + magnitude, and ``display`` renders the submitted form. ``None`` fields (unit-less, no error) + are omitted. Raises: UnitError: if the magnitude cannot be parsed. """ magnitude = _parse_magnitude(value) nominal, error = _split_ufloat(magnitude) + # display always reflects the submitted (pre-canonicalization) magnitude/unit. + display = _format_display(nominal, error, unit) - leaf = {"value": nominal, "unit": unit, "input_value": nominal, "input_unit": unit} - if error is not None: - leaf["error"] = error - - # Unit-less: nothing to canonicalize. - if not unit: - return leaf - - # Canonicalize to SI base units when Pint recognizes the unit; otherwise store as submitted. - try: - quantity = _UREG.Quantity(magnitude, unit).to_base_units() - except pint.errors.PintError, AssertionError, ValueError: - return leaf - - canon_nominal, canon_error = _split_ufloat(quantity.magnitude) - leaf["value"] = canon_nominal - leaf["unit"] = _format_unit(quantity.units) - if canon_error is not None: - leaf["error"] = canon_error - return leaf + # Canonicalize to SI base units when Pint recognizes the unit; otherwise keep the submitted form. + canon_value, canon_unit, canon_error = nominal, unit, error + if unit: + try: + quantity = _UREG.Quantity(magnitude, unit).to_base_units() + except pint.errors.PintError, AssertionError, ValueError: + pass + else: + canon_value, canon_error = _split_ufloat(quantity.magnitude) + canon_unit = _format_unit(quantity.units) + + leaf = AnnotatedData( + value=canon_value, + unit=canon_unit, + input_value=nominal, + input_unit=unit, + error=canon_error, + display=display, + ) + return leaf.model_dump(exclude_none=True) def _format_unit(units: Any) -> str: @@ -177,4 +216,4 @@ def condition_key(conditions: dict[str, dict[str, Any] | str]) -> str: """ if not conditions: return "" - return "|".join(f"{name}={_identity_scalar(conditions[name])}" for name in sorted(conditions)) + return ", ".join(f"{name}={_identity_scalar(conditions[name])}" for name in sorted(conditions)) From cda2aac74970edbd1ed21faf64cf18fbb1f9c6b3 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Fri, 10 Jul 2026 11:14:56 -0700 Subject: [PATCH 215/591] Moved string parsing to types.py and implemented new types for strings and data --- .../domains/contributions/models.py | 120 ++---------------- 1 file changed, 13 insertions(+), 107 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py index fe26ffa164..7c39762b04 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py @@ -1,6 +1,5 @@ -import re from datetime import UTC, datetime -from typing import Annotated, Any +from typing import Any from beanie import ( Insert, @@ -14,114 +13,25 @@ ) from bson.errors import InvalidId from fastapi_filter import FilterDepends, with_prefix -from pydantic import BeforeValidator, Field, field_validator +from pydantic import Field, field_validator from pymongo import ASCENDING, IndexModel +from mpcontribs_api._openapi import CONTRIBUTION_DATA_INPUT_DESCRIPTION, CONTRIBUTION_DATA_OUTPUT_DESCRIPTION from mpcontribs_api.domains._shared.filters import BaseFilter from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut -from mpcontribs_api.domains._shared.types import ShortStr +from mpcontribs_api.domains._shared.types import ContributionData, DisplayStr, SearchStr, ShortStr from mpcontribs_api.domains.attachments.models import Attachment, AttachmentFilter, AttachmentIn -from mpcontribs_api.domains.contributions.pivot import parse_annotated_key from mpcontribs_api.domains.structures.models import Structure, StructureFilter, StructureIn from mpcontribs_api.domains.tables.models import Table, TableFilter, TableIn from mpcontribs_api.exceptions import ValidationError from mpcontribs_api.projection import SparseFieldsModel -def _get_dict_depth(x) -> int: - if isinstance(x, dict): - return 1 + max((_get_dict_depth(v) for v in x.values()), default=0) - elif isinstance(x, list): - return max((_get_dict_depth(item) for item in x), default=0) - return 0 - - -def _validate_data_depth(data: dict[str, Any] | None) -> dict[str, Any] | None: - if data is None: - return None - depth = _get_dict_depth(data) - if depth > 7: - raise ValidationError("Depth of Contribution.data must be <= 7.", depth=depth) - return data - - -# Forbid punctuation, excluding: '*', '/' and exactly 1 '|' anywhere in string -_DATA_PUNCTUATION_PATTERN = re.compile(r"(?![^|]*\|[^|]*\|)[^\x21-\x29\x2B-\x2E\x3A-\x40\x5B-\x5E\x60\x7B\x7D-\x7E]*") - - -def _validate_plain_key(key: Any) -> None: - """Validate a single plain key token (a path segment or a condition name).""" - if not isinstance(key, str) or not key.isascii(): - raise ValidationError("Non-ASCII key found in Contribution.data. All dict keys must be only ASCII") - if key == "": - raise ValidationError("Empty key found in Contribution.data. Keys must be non-empty.") - if _DATA_PUNCTUATION_PATTERN.fullmatch(key) is None: - raise ValidationError( - "Punctuation found in Contribution.data keys. Only '_', '*', '/', and at most 1 '|' permitted." - ) - - -def _validate_keys(data: dict[str, Any] | None) -> dict[str, Any] | None: - """Strict plain-key validation for a single dict level (used for nested levels).""" - if data is None: - return None - for key in data: - _validate_plain_key(key) - # Recurse into nested dicts, including dicts nested inside lists. - for v in data.values(): - _validate_nested_keys(v) - return data - - -def _validate_data_keys(data: dict[str, Any] | None) -> dict[str, Any] | None: - """Top-level ``data`` key validation, allowing the annotated pattern. - - Each top-level key may be either a plain key or the annotated form - ``name (unit, cond1=..., cond2=...)``. The name's dotted segments and every condition name are - held to the same plain-key rules (units are unconstrained); nested levels stay strictly plain. - Expansion (see :mod:`mpcontribs_api.domains.contributions.pivot`) later rewrites annotated keys - into plain ones, so stored keys always satisfy :func:`_validate_keys`. - """ - if data is None: - return None - for raw_key in data: - if not isinstance(raw_key, str): - raise ValidationError("Non-ASCII key found in Contribution.data. All dict keys must be only ASCII") - try: - parsed = parse_annotated_key(raw_key) - except ValueError as err: - raise ValidationError(f"Malformed annotated key in Contribution.data: {err}") from err - if not parsed.is_annotated: - # A plain key keeps the original strict rule (no '.' nesting); only annotated keys may - # use dotted paths, whose segments are validated individually below. - _validate_plain_key(raw_key) - continue - for segment in parsed.segments: - _validate_plain_key(segment) - for condition_name in parsed.conditions: - _validate_plain_key(condition_name) - for v in data.values(): - _validate_nested_keys(v) - return data - - -def _validate_nested_keys(value: Any) -> None: - if isinstance(value, dict): - _validate_keys(value) - elif isinstance(value, list): - for item in value: - _validate_nested_keys(item) - - class ContributionBase(BaseDocumentWithInput[PydanticObjectId]): - project: str - identifier: str - formula: str - data: Annotated[ - dict[str, Any], - BeforeValidator(_validate_data_depth), - BeforeValidator(_validate_data_keys), - ] + project: ShortStr + identifier: SearchStr + formula: DisplayStr + data: ContributionData = Field(description=CONTRIBUTION_DATA_INPUT_DESCRIPTION) # TODO: Verify that this should default to True and be passed by users needs_build: bool = True @@ -228,7 +138,7 @@ class ContributionOut(DocumentOut[PydanticObjectId]): needs_build: bool | None = None # No input validators on the read path: stored documents are trusted, and re-validating here # would 500 on historical data that missed the correction (see carrier_transport contribs) - data: dict[str, Any] | None = None + data: dict[str, Any] | None = Field(default=None, description=CONTRIBUTION_DATA_OUTPUT_DESCRIPTION) structures: list[Link[Structure]] | None = None tables: list[Link[Table]] | None = None attachments: list[Link[Attachment]] | None = None @@ -249,16 +159,12 @@ def default_fields() -> list[str]: class ContributionPatch(SparseFieldsModel): - project: str | None = None - identifier: str | None = None + project: ShortStr | None = None + identifier: SearchStr | None = None version: int | None = None - formula: str | None = None + formula: DisplayStr | None = None needs_build: bool | None = None - data: Annotated[ - dict[str, Any] | None, - BeforeValidator(_validate_data_depth), - BeforeValidator(_validate_keys), - ] = None + data: ContributionData = Field(default=None, description=CONTRIBUTION_DATA_INPUT_DESCRIPTION) structures: list[Link[Structure]] | None = None tables: list[Link[Table]] | None = None attachments: list[Link[Attachment]] | None = None From 94408e824c1d02ad8bef05be19bffb2d86b4d57b Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Fri, 10 Jul 2026 11:16:57 -0700 Subject: [PATCH 216/591] Improved how contributions are 'pivoted'/'expanded' when multiple conditions are present --- .../domains/contributions/pivot.py | 182 ++++++++---------- 1 file changed, 85 insertions(+), 97 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/pivot.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/pivot.py index f50b8d49ea..4d6d424cbb 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/pivot.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/pivot.py @@ -1,6 +1,13 @@ -from dataclasses import dataclass, field +from dataclasses import dataclass from typing import TYPE_CHECKING, Any +from mpcontribs_api.domains._shared.types import ( + ParsedKey, + coerce_keys, + parse_annotated_key, + to_snake_case, + validate_contribution_data, +) from mpcontribs_api.domains._shared.units import UnitError, annotate_value, condition_key, parse_condition_value from mpcontribs_api.exceptions import ValidationError @@ -9,81 +16,28 @@ @dataclass(frozen=True, slots=True) -class ExpandedContribution: - """One pivoted contribution paired with its server-computed ``condition_key``. +class ExpandedData: + """One pivoted ``data`` payload paired with its canonical ``condition_key``. - ``condition_key`` is carried alongside (not on the input model) so it is never taken from the - request body — mirroring how the service resolves ``version``. + Produced by :func:`expand_data` — the model-agnostic core shared by the insert path (via + :func:`expand_contribution`) and the patch path (:mod:`mpcontribs_api.domains.contributions` + service). ``condition_key`` is ``""`` when the payload carried no conditions. """ - contribution: ContributionIn + data: dict[str, Any] condition_key: str @dataclass(frozen=True, slots=True) -class ParsedKey: - """A ``data`` key split into its path, optional unit, and ordered conditions.""" - - path: str - unit: str | None - # Insertion-ordered {condition_name: raw_value_string}; empty when the key carried no conditions. - conditions: dict[str, str] = field(default_factory=dict) - - @property - def is_annotated(self) -> bool: - """True when the key carried a unit and/or any conditions (i.e. had an annotation block).""" - return self.unit is not None or bool(self.conditions) - - @property - def segments(self) -> tuple[str, ...]: - """The path split on '.' into nesting segments.""" - return tuple(self.path.split(".")) - - -def parse_annotated_key(key: str) -> ParsedKey: - """Parse a raw ``data`` key into a :class:`ParsedKey`. - - A key with no ``(...)`` block is a plain path (unit ``None``, no conditions) — fully backward - compatible. Inside the block, the one token without ``=`` is the unit and every ``k=v`` token is - a condition, in submission order. +class ExpandedContribution: + """One pivoted contribution paired with its server-computed ``condition_key``. - Raises: - ValueError: on a malformed annotation (unbalanced parens, empty path, empty condition name, - or more than one unit token). + ``condition_key`` is carried alongside (not on the input model) so it is never taken from the + request body — mirroring how the service resolves ``version``. """ - if "(" not in key: - path = key.strip() - if not path: - raise ValueError("empty data key") - return ParsedKey(path=path, unit=None) - - stripped = key.rstrip() - open_idx = stripped.index("(") - if not stripped.endswith(")"): - raise ValueError(f"unbalanced annotation in data key {key!r}") - path = stripped[:open_idx].strip() - if not path: - raise ValueError(f"data key {key!r} has an annotation but no name") - - inner = stripped[open_idx + 1 : -1] - unit: str | None = None - conditions: dict[str, str] = {} - for token in (t.strip() for t in inner.split(",")): - if not token: - continue - if "=" in token: - name, value = token.split("=", 1) - name = name.strip() - if not name: - raise ValueError(f"empty condition name in data key {key!r}") - if name in conditions: - raise ValueError(f"duplicate condition {name!r} in data key {key!r}") - conditions[name] = value.strip() - else: - if unit is not None: - raise ValueError(f"multiple unit tokens ({unit!r}, {token!r}) in data key {key!r}") - unit = token - return ParsedKey(path=path, unit=unit, conditions=conditions) + + contribution: ContributionIn + condition_key: str def _set_nested(target: dict[str, Any], segments: tuple[str, ...], value: Any) -> None: @@ -107,34 +61,34 @@ def _set_nested(target: dict[str, Any], segments: tuple[str, ...], value: Any) - cursor[leaf] = value -def expand_contribution(contribution: ContributionIn) -> list[ExpandedContribution]: - """Annotate units and pivot a submitted contribution on its condition signatures. +def expand_data(data: dict[str, Any]) -> list[ExpandedData]: + """Annotate units and pivot a ``data`` mapping on its condition signatures. - Top-level ``data`` keys are parsed as annotated keys. Keys carrying conditions are grouped by - their canonical :func:`condition_key`; each distinct group becomes one output contribution whose - ``data`` holds the group's conditions (as ordinary columns) plus its measurements plus every + Top-level keys are parsed as annotated keys; keys carrying conditions are grouped by their canonical + :func:`condition_key`, and each distinct group becomes one :class:`ExpandedData` whose ``data`` + holds the group's conditions (as ordinary columns) plus its measurements plus every condition-less column (broadcast). Condition-less annotated keys still get their unit annotated. - A contribution with no conditions anywhere returns a single element (units annotated in place, - ``condition_key == ""``); a contribution with no annotations at all returns the contribution - unchanged (``condition_key == ""``). + Returns: + - a single element with ``condition_key == ""`` when nothing pivots (no annotations at all, + or annotations but no conditions). When no annotation is present the returned ``data`` is + the same object as the input if snake_case coercion is a no-op, else the coerced copy. + - one element per distinct condition signature otherwise. Raises: - ValidationError: on a malformed annotation, a path/column collision, components present on a - pivoting submission, or expanded data that violates the depth/key rules. + ValidationError: on a malformed annotation, a path/column collision, or expanded data that + violates the depth/key rules. """ - # Local imports break the models<->pivot import cycle (models imports parse_annotated_key). - from mpcontribs_api.domains.contributions.models import _validate_data_depth, _validate_data_keys - - data = contribution.data or {} try: parsed = {raw_key: parse_annotated_key(raw_key) for raw_key in data} except ValueError as err: raise ValidationError(str(err)) from err if not any(pk.is_annotated for pk in parsed.values()): - # Nothing annotated: preserve existing behavior (and untouched nested data) exactly. - return [ExpandedContribution(contribution=contribution, condition_key="")] + # Nothing annotated, but keys still get snake_case coercion (all-plain data). Return the + # original object untouched when coercion is a no-op so callers can short-circuit. + coerced = coerce_keys(data) + return [ExpandedData(data=data if coerced == data else coerced, condition_key="")] # Split columns into the condition-less broadcast set and the conditioned groups (keyed by the # canonical condition_key so physically-equal signatures merge into one row). @@ -145,30 +99,41 @@ def expand_contribution(contribution: ContributionIn) -> list[ExpandedContributi if not pk.conditions: broadcast.append((raw_key, pk)) continue - parsed_conditions = {name: parse_condition_value(val) for name, val in pk.conditions.items()} + # Condition names become data columns after pivoting, so they are coerced to snake_case like + # any other key (values and the unit are left verbatim). + parsed_conditions: dict[str, Any] = {} + for name, val in pk.conditions.items(): + cname = to_snake_case(name) + if not cname: + raise ValidationError(f"condition name '{name}' reduces to empty after snake_case coercion") + if cname in parsed_conditions: + raise ValidationError(f"condition names collide after snake_case coercion: '{cname}'") + parsed_conditions[cname] = parse_condition_value(val) ckey = condition_key(parsed_conditions) groups.setdefault(ckey, []).append((raw_key, pk)) # First signature seen for this canonical key wins the stored condition columns. group_conditions.setdefault(ckey, parsed_conditions) - if contribution.has_components() and groups: - raise ValidationError( - "components are not supported on submissions that pivot on conditions; " - "insert the pivoted contributions first, then attach components" - ) + def _coerce_segments(pk: ParsedKey) -> tuple[str, ...]: + segments = tuple(to_snake_case(seg) for seg in pk.segments) + if any(not seg for seg in segments): + raise ValidationError(f"data key '{pk.path}' has a path segment that is empty after snake_case coercion") + return segments def _annotate_column(row_data: dict[str, Any], raw_key: str, pk: ParsedKey) -> None: try: - leaf = annotate_value(data[raw_key], pk.unit) if pk.is_annotated else data[raw_key] + # Annotated leaves are produced (already canonical) by annotate_value; plain values keep + # their structure but have their nested keys coerced to snake_case. + leaf = annotate_value(data[raw_key], pk.unit) if pk.is_annotated else coerce_keys(data[raw_key]) except UnitError as err: raise ValidationError(f"could not parse value for '{raw_key}': {err}") from err - _set_nested(row_data, pk.segments, leaf) + _set_nested(row_data, _coerce_segments(pk), leaf) - def _finalize(row_data: dict[str, Any], ckey: str) -> ExpandedContribution: - # model_copy skips validators, so re-run the depth/key checks on the rewritten data. - _validate_data_keys(row_data) - _validate_data_depth(row_data) - return ExpandedContribution(contribution=contribution.model_copy(update={"data": row_data}), condition_key=ckey) + def _finalize(row_data: dict[str, Any], ckey: str) -> ExpandedData: + # model_copy (in expand_contribution) and the patch path both skip Pydantic validators, so + # re-run the depth/key checks on the rewritten data here. + validate_contribution_data(row_data) + return ExpandedData(data=row_data, condition_key=ckey) # No conditioned groups: single output, units annotated in place. if not groups: @@ -177,7 +142,7 @@ def _finalize(row_data: dict[str, Any], ckey: str) -> ExpandedContribution: _annotate_column(row_data, raw_key, pk) return [_finalize(row_data, "")] - outputs: list[ExpandedContribution] = [] + outputs: list[ExpandedData] = [] for ckey, members in groups.items(): row_data = {} # Conditions become ordinary columns first, so a measurement colliding with a condition name @@ -190,3 +155,26 @@ def _finalize(row_data: dict[str, Any], ckey: str) -> ExpandedContribution: _annotate_column(row_data, raw_key, pk) outputs.append(_finalize(row_data, ckey)) return outputs + + +def expand_contribution(contribution: ContributionIn) -> list[ExpandedContribution]: + """Annotate units and pivot a submitted contribution on its condition signatures. + + Thin wrapper over :func:`expand_data` that re-attaches each pivoted ``data`` payload to a copy of + the input model. A contribution with no conditions anywhere returns a single element (units + annotated in place, ``condition_key == ""``); a contribution with no annotations at all returns + the contribution unchanged. + + Raises: + ValidationError: on a malformed annotation, a path/column collision, or expanded data that + violates the depth/key rules. + """ + original = contribution.data or {} + rows = expand_data(original) + + expanded: list[ExpandedContribution] = [] + for row in rows: + # Preserve the original model (incl. ``data is None``) when expand_data made no change. + contrib = contribution if row.data is original else contribution.model_copy(update={"data": row.data}) + expanded.append(ExpandedContribution(contribution=contrib, condition_key=row.condition_key)) + return expanded From 69c5e6891cc594b68a530664d3a52fc08696536b Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Fri, 10 Jul 2026 11:34:39 -0700 Subject: [PATCH 217/591] Added path method to handle fanning out of contribution patches in the case an update brings additional conditions. --- .../domains/contributions/service.py | 193 ++++++++++++++---- 1 file changed, 150 insertions(+), 43 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py index 1bc821a3aa..878ab64b2f 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py @@ -20,15 +20,20 @@ ) from mpcontribs_api.domains._shared.repository import MongoDbRepository from mpcontribs_api.domains.attachments.repository import MongoDbAttachmentRepository -from mpcontribs_api.domains.contributions.models import Contribution, ContributionFilter, ContributionIn -from mpcontribs_api.domains.contributions.pivot import expand_contribution +from mpcontribs_api.domains.contributions.models import ( + Contribution, + ContributionFilter, + ContributionIn, + ContributionPatch, +) +from mpcontribs_api.domains.contributions.pivot import expand_contribution, expand_data from mpcontribs_api.domains.contributions.repository import MongoDbContributionRepository from mpcontribs_api.domains.projects.repository import MongoDbProjectRepository from mpcontribs_api.domains.structures.models import Structure from mpcontribs_api.domains.structures.repository import MongoDbStructureRepository from mpcontribs_api.domains.tables.models import Table from mpcontribs_api.domains.tables.repository import MongoDbTableRepository -from mpcontribs_api.exceptions import AppError, ConflictError, PermissionError, ValidationError +from mpcontribs_api.exceptions import AppError, ConflictError, NotFoundError, PermissionError, ValidationError from mpcontribs_api.pagination import CursorParams logger = structlog.get_logger(__name__) @@ -101,8 +106,10 @@ async def insert_contributions( Contributions carrying no components are inserted in one ``insert_many`` (no transaction); contributions with components run inside their own MongoDB transaction so the contribution - and its components commit or roll back together. Concurrent transactions are bounded by - ``settings.mongo.max_concurrent_transactions``. Per-item failures are returned in the + and its components commit or roll back together. When a submission pivots into several rows + that share components, all of those rows are written in one transaction and link to the + components inserted once (deduplicated by content hash). Concurrent transactions are bounded + by ``settings.mongo.max_concurrent_transactions``. Per-item failures are returned in the summary's ``failed`` list; the request as a whole does not raise on partial failure. Version is server-assigned per contribution: unique-identifier projects reject a duplicate @@ -139,9 +146,10 @@ def _expand_batch( """Annotate units and pivot each submission on its conditions, keeping the original index. A submission may expand into several rows (one per condition signature) or be rejected as a - whole (malformed annotation, colliding columns, or components on a pivoting submission). A - rejection becomes a single ``BulkFailure`` against the submission's original index; every - surviving row carries that index and its ``condition_key`` forward. + whole (malformed annotation or colliding columns). Any components on the submission ride + along on every resulting row (see :func:`...pivot.expand_contribution`). A rejection becomes + a single ``BulkFailure`` against the submission's original index; every surviving row carries + that index and its ``condition_key`` forward. """ failures: list[BulkFailure] = [] prepared: list[PreparedInput] = [] @@ -451,65 +459,88 @@ async def _insert_with_components( self, items: list[ResolvedWrite], ) -> tuple[list[tuple[int, Contribution]], list[BulkFailure]]: - """Per-contribution transaction path, bounded by ``max_concurrent_transactions``.""" + """Per-submission transaction path, bounded by ``max_concurrent_transactions``. + + Rows that pivoted out of the same submission share an ``index`` and carry identical component + inputs (see :func:`mpcontribs_api.domains.contributions.pivot.expand_contribution`), so they + are grouped and written together in one transaction: the shared components are inserted once + (deduplicated by content hash in the components repo) and every row in the group links to the + resulting ids. A submission that did not pivot is simply a group of one, preserving the + previous one-transaction-per-row shape. + """ if not items: return [], [] + # Group by the original submission index (preserving first-seen order so the summary keeps + # input ordering after the outer sort); pivoted rows of one submission share components. + groups: dict[int, list[ResolvedWrite]] = defaultdict(list) + for item in items: + groups[item.index].append(item) sem = asyncio.Semaphore(self._settings.max_concurrent_transactions) - async def _bounded(item: ResolvedWrite) -> Contribution | BulkFailure: + async def _bounded(group: list[ResolvedWrite]) -> list[Contribution] | BulkFailure: async with sem: - return await self._insert_one_with_components(item) + return await self._insert_group_with_components(group) - results = await asyncio.gather(*[_bounded(item) for item in items]) + grouped = list(groups.values()) + results = await asyncio.gather(*[_bounded(group) for group in grouped]) succeeded: list[tuple[int, Contribution]] = [] failed: list[BulkFailure] = [] - for item, outcome in zip(items, results, strict=True): + for group, outcome in zip(grouped, results, strict=True): if isinstance(outcome, BulkFailure): failed.append(outcome) else: - succeeded.append((item.index, outcome)) + succeeded.extend((group[0].index, doc) for doc in outcome) return succeeded, failed - async def _insert_one_with_components(self, item: ResolvedWrite) -> Contribution | BulkFailure: - """Run a single contribution + its components inside a transaction. + async def _insert_group_with_components(self, group: list[ResolvedWrite]) -> list[Contribution] | BulkFailure: + """Run one submission's pivoted rows + their shared components inside a transaction. Uses ``session.with_transaction`` so transient txn errors (write conflicts, primary step- - downs) get pymongo's retry treatment. Any exception is converted to a ``BulkFailure`` so - the surrounding ``asyncio.gather`` sees a normal return value for every coroutine. + downs) get pymongo's retry treatment, and so the components and every pivoted row of the + submission commit or roll back together. Any exception is converted to a single + ``BulkFailure`` against the submission's index so the surrounding ``asyncio.gather`` sees a + normal return value for every coroutine. """ - contrib = item.contribution + index = group[0].index + contrib = group[0].contribution try: async with self._client.start_session() as session: - async def _txn(s: AsyncClientSession) -> Contribution: - return await self._do_insert(contrib, s, item.version, item.condition_key) + async def _txn(s: AsyncClientSession) -> list[Contribution]: + return await self._do_insert_group(group, s) return await session.with_transaction(_txn) except AppError as exc: - return bulk_failure_from_exception(item.index, contrib.identifiers(), exc) + return bulk_failure_from_exception(index, contrib.identifiers(), exc) except Exception as exc: - logger.error( - "insert_contribution_failed", index=item.index, identifier=contrib.identifiers(), exc_info=True - ) - return bulk_failure_from_exception(item.index, contrib.identifiers(), exc) - - async def _do_insert( - self, contrib: ContributionIn, session: AsyncClientSession, version: int, condition_key: str = "" - ) -> Contribution: - """Insert components then the contribution itself, all in the given session. - - Components are inserted sequentially because a session is single-threaded — sharing it - across concurrent awaits would corrupt the wire protocol. + logger.error("insert_contribution_failed", index=index, identifier=contrib.identifiers(), exc_info=True) + return bulk_failure_from_exception(index, contrib.identifiers(), exc) + + async def _do_insert_group(self, group: list[ResolvedWrite], session: AsyncClientSession) -> list[Contribution]: + """Insert the submission's shared components once, then every pivoted row, all in ``session``. + + Every row in ``group`` came from the same submission and carries identical component inputs, + so the components are inserted a single time — the components repo deduplicates by content + hash and returns the already-stored document (its id) when the content exists — and each + row's contribution links to those shared ids. Components are inserted sequentially because a + session is single-threaded — sharing it across concurrent awaits would corrupt the wire + protocol. """ - structures = await self._structures.insert_components(contrib.structures or [], session=session) - tables = await self._tables.insert_components(contrib.tables or [], session=session) - - doc = Contribution.from_input_model(contrib) - doc.version = version - doc.condition_key = condition_key - doc.structures = cast(list[Link[Structure]] | None, structures or None) - doc.tables = cast(list[Link[Table]] | None, tables or None) - return await self._contributions.insert_contribution(doc, session=session) + template = group[0].contribution + structures = await self._structures.insert_components(template.structures or [], session=session) + tables = await self._tables.insert_components(template.tables or [], session=session) + struct_links = cast(list[Link[Structure]] | None, structures or None) + table_links = cast(list[Link[Table]] | None, tables or None) + + inserted: list[Contribution] = [] + for item in group: + doc = Contribution.from_input_model(item.contribution) + doc.version = item.version + doc.condition_key = item.condition_key + doc.structures = struct_links + doc.tables = table_links + inserted.append(await self._contributions.insert_contribution(doc, session=session)) + return inserted async def upsert_contributions(self, contributions: list[ContributionIn]) -> BulkWriteSummary[Contribution]: """Upsert contributions by their identifying fields, reporting per-item outcomes. @@ -569,6 +600,82 @@ async def _bounded_upsert(item: ResolvedWrite) -> Contribution | BulkFailure: failed = failures + [r for r in results if isinstance(r, BulkFailure)] return BulkWriteSummary[Contribution](total=len(contributions), succeeded=succeeded, failed=failed) + async def patch_contribution(self, id: str, patch: ContributionPatch) -> list[Contribution]: + """Partially update a contribution, fanning condition-bearing ``data`` onto its pivoted rows. + + The ``{id}`` in the path anchors the update: its stored ``(project, identifier, version)`` is + the identity all matched rows share. ``data`` is run through the same annotated-key machinery + as inserts (:func:`expand_data`), so units are canonicalized and conditions become columns. + + - **No conditions in ``data``** (or no ``data`` at all): a plain partial update of the target + row itself. Units are still annotated; the row's ``condition_key`` is unchanged. + - **Conditions present:** the patch *fans out*. Each condition signature is applied to the + existing sibling row that already carries the matching ``condition_key`` (under the target's + project/identifier/version). A ``condition_key`` is never rewritten, and no new rows are + created: a signature with no matching stored row is rejected. + + Non-``data`` fields set on the patch are applied to every row the patch touches. + + Args: + id: the id of a contribution the caller may see; anchors the (project, identifier, version) + patch: the partial update; ``data`` may carry unit/condition annotations + + Returns: + list[Contribution]: the updated document(s), one per row the patch touched + + Raises: + NotFoundError: if no in-scope contribution has that id + PermissionError: if the caller may not write the target's project + ValidationError: on a malformed/oversize ``data`` annotation, or a condition signature + with no matching stored row + """ + target = await self._contributions.get_contribution_document(id) + if target is None: + raise NotFoundError(f"Contribution with id {id} not found", id=id) + if not self._user.can_write(target.project): + raise PermissionError(f"not authorized to write to project '{target.project}'") + + # Non-data fields patch through unchanged + # data is handled separately because it may expand into several rows. + scalar_update = patch.model_dump(exclude_unset=True, exclude={"data"}) + + # No data change: behave like a plain single-row patch of the target (no-op if nothing set). + if patch.data is None: + if not scalar_update: + return [target] + updated = await self._contributions.patch_pivot_row( + target.project, target.identifier, target.version, target.condition_key, scalar_update + ) + return [updated] if updated is not None else [] + + rows = expand_data(patch.data) + + # No conditions: single row targeting the {id} contribution itself (units annotated in place). + if not any(row.condition_key for row in rows): + update_data = {**scalar_update, "data": rows[0].data} + updated = await self._contributions.patch_pivot_row( + target.project, target.identifier, target.version, target.condition_key, update_data + ) + return [updated] if updated is not None else [] + + # Conditions present: fan each signature onto the sibling row that already carries it. Missing + # rows are rejected — a patch matches existing pivots, it never mints new condition_keys. + updated_rows: list[Contribution] = [] + for row in rows: + update_data = {**scalar_update, "data": row.data} + updated = await self._contributions.patch_pivot_row( + target.project, target.identifier, target.version, row.condition_key, update_data + ) + if updated is None: + raise ValidationError( + f"no existing contribution for project '{target.project}', identifier " + f"'{target.identifier}', version {target.version} with condition_key " + f"'{row.condition_key}'; a patch updates existing pivoted rows and cannot create new ones", + condition_key=row.condition_key, + ) + updated_rows.append(updated) + return updated_rows + async def delete_contributions(self, filter: ContributionFilter) -> BulkDeleteSummary: """Delete a contribution and all of its child components From 04cb898485fa86a3b08dee6dc169cf664bf887eb Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Fri, 10 Jul 2026 11:34:58 -0700 Subject: [PATCH 218/591] Switched patch from repo to service layer --- .../src/mpcontribs_api/domains/contributions/router.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py index a16d6e5b3c..c9529e5ea6 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py @@ -139,5 +139,5 @@ async def upsert_contribution_by_id(repo: ContributionDep, id: str, contribution @router.patch("/{id}", dependencies=[Depends(require_user)]) -async def patch_contribution_by_id(repo: ContributionDep, id: str, update: ContributionPatch): - return await repo.patch_contribution_by_id(id=id, update=update) +async def patch_contribution_by_id(service: ContributionServiceDep, id: str, update: ContributionPatch): + return await service.patch_contribution(id=id, patch=update) From 2bae6b1351b52ce6d1ffb300dbc80d12bf73e096 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Fri, 10 Jul 2026 12:05:59 -0700 Subject: [PATCH 219/591] Removed duplicated logic and dead methods. Added logic for conditions --- .../domains/contributions/repository.py | 163 ++++++++++-------- 1 file changed, 94 insertions(+), 69 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py index 860d93c4ae..1f404f48cc 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py @@ -1,6 +1,6 @@ from collections.abc import AsyncIterable from contextlib import AbstractAsyncContextManager -from typing import Any +from typing import Any, cast from beanie import PydanticObjectId, UpdateResponse from beanie.operators import Set @@ -63,10 +63,6 @@ async def get_contribution_by_id(self, id: str, fields: frozenset[str] | None): """Find a single contribution by id, scoped to the current user. See ``get_by_id``.""" return await self.get_by_id(self._convert_object_id(id), fields) - async def patch_contribution_by_id(self, id: str, update: ContributionPatch): - """Partially update a contribution by id, scoped to the current user. See ``patch``.""" - return await self.patch(self._convert_object_id(id), update) - async def delete_contribution_by_id(self, id: str) -> None: """Delete a contribution by id, scoped to the current user. See ``delete_by_id``.""" await self.delete_by_id(self._convert_object_id(id)) @@ -112,6 +108,59 @@ async def find_one_contribution(self, project: str, identifier: str) -> Contribu self.document_model.identifier == identifier, ) + async def get_contribution_document(self, id: str) -> Contribution | None: + """Return the full (unprojected) Contribution document by id, scoped to the current user. + + Unlike :meth:`get_contribution_by_id` (which projects to ``ContributionOut``), this returns + the stored ``Contribution`` so callers can read server-owned identity fields (``version``, + ``condition_key``) — needed by the patch path to locate the pivoted rows to update. + """ + return await self.document_model.find_one(self._scope, self.document_model.id == self._convert_object_id(id)) + + async def _find_one_and_set( + self, + *criteria: Any, + update_data: dict[str, Any], + on_insert: Contribution | None = None, + ) -> Contribution | None: + """Scoped ``findOneAndUpdate`` returning the resulting document (``NEW_DOCUMENT``). + + Applies ``$set`` of ``update_data`` to the single in-scope row matching ``criteria``. When + ``on_insert`` is given the operation upserts (writing ``on_insert`` if nothing matches) and + always returns a document; otherwise it is a plain update that returns ``None`` on no match. + Shared by :meth:`patch_pivot_row` and both upsert methods so the query mechanics live once. + """ + query = self.document_model.find_one(self._scope, *criteria) + result = ( + query.upsert(Set(update_data), on_insert=on_insert, response_type=UpdateResponse.NEW_DOCUMENT) + if on_insert is not None + else query.update(Set(update_data), response_type=UpdateResponse.NEW_DOCUMENT) + ) + return await result # pyright: ignore[reportGeneralTypeIssues] # beanie UpdateQuery is awaitable, but pyright doesn't see it + + async def patch_pivot_row( + self, + project: str, + identifier: str, + version: int, + condition_key: str, + update_data: dict[str, Any], + ) -> Contribution | None: + """Apply ``update_data`` to the single scoped row identified by its full pivot identity. + + Targets the row by (project, identifier, version, condition_key) — the unique-index key — so + a patch updates exactly one pivoted contribution and never changes which row it is. Returns + the updated document, or ``None`` when no in-scope row matches (the caller decides whether a + missing row is an error). + """ + return await self._find_one_and_set( + self.document_model.project == project, + self.document_model.identifier == identifier, + self.document_model.version == version, + self.document_model.condition_key == condition_key, + update_data=update_data, + ) + async def max_versions(self, keys: list[tuple[str, str, str]]) -> dict[tuple[str, str, str], int]: """Return ``{(project, identifier, condition_key): max_version}`` for the given keys. @@ -145,11 +194,7 @@ async def max_versions(self, keys: list[tuple[str, str, str]]) -> dict[tuple[str } # Beanie combines find() args with $and and prepends them as $match, so the user scope # is merged automatically (mirroring the manual merge in :meth:`referenced_component_ids`). - query = ( - self.document_model.find(self._scope, or_clause) - if self._scope - else self.document_model.find(or_clause) - ) + query = self.document_model.find(self._scope, or_clause) if self._scope else self.document_model.find(or_clause) group: dict[str, Any] = { "$group": { "_id": { @@ -168,46 +213,57 @@ async def max_versions(self, keys: list[tuple[str, str, str]]) -> dict[tuple[str result[(gid["project"], gid["identifier"], gid.get("condition_key", ""))] = doc.get("max_version") or 0 return result - async def referenced_component_ids( + async def _scan_referenced_ids( self, ref_field: str, - ids: list[PydanticObjectId], + match: dict[str, Any], *, scoped: bool, + target: set[PydanticObjectId] | None = None, ) -> set[PydanticObjectId]: - """Return the subset of ``ids`` referenced by contributions through ``ref_field``. + """Return component ids referenced through ``ref_field`` by matching contributions. - Beanie stores each ``Link`` as a DBRef (``{"$ref": ..., "$id": ObjectId}``), so a - component is referenced when its id appears under ``.$id`` on any matching - contribution. + Beanie stores each ``Link`` as a DBRef (``{"$ref": ..., "$id": ObjectId}``), so a component + is referenced when its id appears under ``.$id``. ``match`` is the query applied + to that path ("$in" a candidate list, or "$exists" to enumerate all). When ``target`` is + given only ids in it are kept (the candidate-subset case); otherwise every referenced id is + returned. ``scoped`` merges the user scope into the query (access gate) when ``True``. Args: ref_field: the contribution link field to inspect ("structures" | "tables" | "attachments"). Always a fixed class-attr at the call site, never user input. - ids: candidate component ids to test - scoped: when ``True`` the user scope is applied (access gate / reachability); when - ``False`` the check spans every contribution (global integrity check) - - Returns: - set[PydanticObjectId]: the ids in ``ids`` that are still referenced + match: the query predicate for ``.$id`` + scoped: when ``True`` the user scope is applied; when ``False`` the check spans every + contribution (global integrity check) + target: optional candidate set; when given, only ids in it are returned """ - if not ids: - return set() - key = f"{ref_field}.$id" - query: dict[str, Any] = {key: {"$in": ids}} + query: dict[str, Any] = {f"{ref_field}.$id": match} if scoped and self._scope: query = {"$and": [self._scope, query]} - target = set(ids) referenced: set[PydanticObjectId] = set() collection = self.document_model.get_pymongo_collection() async for doc in collection.find(query, {ref_field: 1}): for ref in doc.get(ref_field) or []: rid = ref.id if hasattr(ref, "id") else ref.get("$id") - if rid in target: + if rid is not None and (target is None or rid in target): referenced.add(rid) return referenced - # TODO: should return document with update + async def referenced_component_ids( + self, + ref_field: str, + ids: list[PydanticObjectId], + *, + scoped: bool, + ) -> set[PydanticObjectId]: + """Return the subset of ``ids`` referenced by contributions through ``ref_field``. + + Access-gate / reachability check for a known candidate list. See :meth:`_scan_referenced_ids`. + """ + if not ids: + return set() + return await self._scan_referenced_ids(ref_field, {"$in": ids}, scoped=scoped, target=set(ids)) + async def list_referenced_component_ids( self, ref_field: str, @@ -217,33 +273,9 @@ async def list_referenced_component_ids( """Return every component id referenced through ``ref_field`` by matching contributions. Unlike :meth:`referenced_component_ids`, this takes no candidate list — it enumerates all - ids reachable from contributions in scope. - - Args: - ref_field: the contribution link field to inspect ("structures" | "tables" | - "attachments"). Always a fixed class-attr at the call site, never user input. - scoped: when ``True`` the user scope is applied (access gate); when ``False`` the - check spans every contribution. - - Returns: - set[PydanticObjectId]: all component ids referenced via ``ref_field`` + ids reachable from contributions in scope. See :meth:`_scan_referenced_ids`. """ - key = f"{ref_field}.$id" - query: dict[str, Any] = {key: {"$exists": True}} - if scoped and self._scope: - query = {"$and": [self._scope, query]} - referenced: set[PydanticObjectId] = set() - collection = self.document_model.get_pymongo_collection() - async for doc in collection.find(query, {ref_field: 1}): - for ref in doc.get(ref_field) or []: - rid = ref.id if hasattr(ref, "id") else ref.get("$id") - if rid is not None: - referenced.add(rid) - return referenced - - async def update_contribution(self, doc: Contribution, update_data: dict[str, Any]) -> None: - """Apply a partial update to an existing Contribution document.""" - await doc.update(Set(update_data)) + return await self._scan_referenced_ids(ref_field, {"$exists": True}, scoped=scoped) async def upsert_contribution_by_identifiers( self, @@ -277,21 +309,17 @@ async def upsert_contribution_by_identifiers( doc = self.document_model.from_input_model(contribution) doc.version = version doc.condition_key = condition_key - update_data = doc.model_dump(exclude={"id"}, exclude_none=True) - query = self.document_model.find_one( - self._scope, + result = await self._find_one_and_set( self.document_model.project == project, self.document_model.identifier == identifier, self.document_model.condition_key == condition_key, self.document_model.version == version, - ).upsert( - Set(update_data), + update_data=doc.model_dump(exclude={"id"}, exclude_none=True), on_insert=doc, - response_type=UpdateResponse.NEW_DOCUMENT, ) - return await query # pyright: ignore[reportGeneralTypeIssues] # beanie UpdateQuery is awaitable, but pyright doesn't see it + return cast(Contribution, result) # upsert always returns the resulting document - async def upsert_contribution_by_id(self, id: str, contribution: ContributionIn): + async def upsert_contribution_by_id(self, id: str, contribution: ContributionIn) -> Contribution: """Upserts a single Contribution. If Contributions with identical identifiers exist, update, otherwise insert @@ -303,15 +331,12 @@ async def upsert_contribution_by_id(self, id: str, contribution: ContributionIn) Returns: ContributionOut: the upserted document""" doc = self.document_model.from_input_model(contribution) - query = self.document_model.find_one( - self._scope, + result = await self._find_one_and_set( self.document_model.id == self._convert_object_id(id), - ).upsert( - Set(doc.model_dump(exclude={"id"}, exclude_none=True)), + update_data=doc.model_dump(exclude={"id"}, exclude_none=True), on_insert=doc, - response_type=UpdateResponse.NEW_DOCUMENT, ) - return await query # pyright: ignore[reportGeneralTypeIssues] # beanie UpdateQuery is awaitable, but pyright doesn't see it + return cast(Contribution, result) # upsert always returns the resulting document async def download_contributions( self, From cc7190a05516cffb632a45a9f48d632cfb36abce Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Fri, 10 Jul 2026 12:06:29 -0700 Subject: [PATCH 220/591] Added additional strings for documenting fields --- mpcontribs-api/src/mpcontribs_api/_openapi.py | 63 ++++++++++++++++++- mpcontribs-api/src/mpcontribs_api/app.py | 2 - 2 files changed, 62 insertions(+), 3 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/_openapi.py b/mpcontribs-api/src/mpcontribs_api/_openapi.py index fcd06c91cc..c23a0ff04b 100644 --- a/mpcontribs-api/src/mpcontribs_api/_openapi.py +++ b/mpcontribs-api/src/mpcontribs_api/_openapi.py @@ -1,3 +1,61 @@ +# Client-facing documentation for the Contribution ``data`` field. Referenced as the OpenAPI schema +# description on the input/output models (see ``contributions.models``) so it renders in the docs UI +# and generated clients. Keep these in sync with the behavior in ``contributions.pivot`` and +# ``_shared.units``. + +CONTRIBUTION_DATA_INPUT_DESCRIPTION = """\ +Hierarchical, JSON-object data for the contribution. Nesting deeper than 7 levels is rejected. Lists +are allowed; any dictionaries inside them have their keys coerced and validated like every other key. + +**Key coercion (important):** every dictionary key is coerced to `snake_case` on write. Casing is +lowercased, `camelCase`/`PascalCase` boundaries are split, and any run of spaces/hyphens/punctuation +collapses to a single underscore. So `"bandGap"`, `"Band Gap"`, and `"band-gap"` are all stored as +`"band_gap"`, and the **keys you read back may differ from the keys you submitted**. Keys must be +ASCII and must not reduce to an empty string (e.g. `"***"` is rejected). + +**Annotated keys (units + conditions):** a top-level key may carry an annotation in parentheses: + + "name (unit, condition1=value1, condition2=value2, ...)" + +- The single token without an `=` is the **unit** (e.g. `eV`, `S/cm`, `K`); units are left verbatim + (not coerced) so they round-trip through Pint. +- Each `k=v` token is a **condition**. Condition names are coerced to `snake_case` like any other key. +- The `name` may be a dotted path (`"transport.conductivity (S/cm)"`) to nest the value. +- A key with no parentheses is a plain, fully backward-compatible key. + +Recognized units are canonicalized to SI base units on write (the submitted form is preserved too — +see the response schema). Magnitudes may carry uncertainty as `"4.2(3)"`, `"4.2+/-0.3"`, or +`"4.2±0.3"`. + +**Pivoting on conditions:** if any key carries conditions, the single submission is *expanded* into +one contribution per distinct condition signature. Each resulting contribution stores its conditions +as ordinary columns plus its own measurements plus every condition-less ("broadcast") column, and +gets a server-computed `condition_key` identity. Submissions that pivot on conditions may **not** +include components (structures/tables/attachments) — insert the pivoted contributions first, then +attach components. + +**On PATCH:** the same expansion runs. Condition-less data patches the addressed contribution in +place (units still annotated). Data carrying conditions *fans out*: each signature updates the +existing pivoted row that already has the matching `condition_key` (a PATCH never creates rows or +changes a row's `condition_key`), so a signature with no matching stored row is rejected. +""" + +CONTRIBUTION_DATA_OUTPUT_DESCRIPTION = """\ +Hierarchical contribution data. Keys are stored in `snake_case` (see the write schema for the +coercion rules), so they may differ from the keys originally submitted. + +Values that were submitted with a unit annotation are stored as an **annotated leaf** object: + +- `value` / `unit`: the SI-canonical magnitude and unit (or the submitted form when the unit is + unrecognized or dimensionless) +- `input_value` / `input_unit`: the magnitude and unit exactly as submitted +- `error`: the (SI-propagated) standard deviation — present only when the magnitude carried an + uncertainty +- `display`: a human-readable rendering of the *submitted* magnitude/unit (e.g. `"4.2+/-0.3 eV"`) + +Plain (unannotated) values keep whatever JSON shape they were submitted with. +""" + openapi_tags = [ { "name": "projects", @@ -15,7 +73,10 @@ "Each contribution uses `mp-id` or composition as identifier to associate its data with the according entries " "on MP. Only admins or users on the project can create, update or delete contributions, and while unpublished, " "retrieve its data or view it on the Portal. Contribution components (tables, structures, and attachments) are " - "deleted along with a contribution.", + "deleted along with a contribution. **Note:** `data` keys are coerced to `snake_case` on write and may carry " + "unit/condition annotations of the form `name (unit, cond=value, ...)`; keys with conditions cause the " + "submission to pivot into one contribution per condition signature. See the `data` field on the request and " + "response schemas for the full grammar and the annotated-value shape.", }, { "name": "structures", diff --git a/mpcontribs-api/src/mpcontribs_api/app.py b/mpcontribs-api/src/mpcontribs_api/app.py index e150cff673..6fb815c13b 100644 --- a/mpcontribs-api/src/mpcontribs_api/app.py +++ b/mpcontribs-api/src/mpcontribs_api/app.py @@ -121,8 +121,6 @@ def create_app(settings: Settings | None = None) -> FastAPI: ) # Reject oversized request bodies before they're buffered into memory. Added before - # RequestContextMiddleware: Starlette inserts each added middleware at the front of the stack, - # so the later-added RequestContextMiddleware stays outermost and still access-logs rejections. app.add_middleware(BodySizeLimitMiddleware, max_bytes=settings.mongo.max_request_bytes) # Add request context to the logger app.add_middleware(RequestContextMiddleware) From f25d9789349d20052afabb0e9de61ff81c0dbadf Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Fri, 10 Jul 2026 12:06:43 -0700 Subject: [PATCH 221/591] Added tests --- .../db/test_contributions_repository.py | 79 +++------ .../integration/test_contributions_routes.py | 10 +- .../unit/domains/test_contribution_service.py | 163 ++++++++++++++++-- .../unit/domains/test_contributions_models.py | 36 ++-- .../unit/domains/test_contributions_pivot.py | 118 +++++++++++-- .../tests/unit/domains/test_units.py | 40 ++++- 6 files changed, 356 insertions(+), 90 deletions(-) diff --git a/mpcontribs-api/tests/integration/db/test_contributions_repository.py b/mpcontribs-api/tests/integration/db/test_contributions_repository.py index 4d3cd97c89..4016f6de7c 100644 --- a/mpcontribs-api/tests/integration/db/test_contributions_repository.py +++ b/mpcontribs-api/tests/integration/db/test_contributions_repository.py @@ -7,7 +7,6 @@ ContributionFilter, ContributionIn, ContributionOut, - ContributionPatch, ) from mpcontribs_api.domains.contributions.repository import MongoDbContributionRepository from mpcontribs_api.exceptions import NotFoundError, ValidationError @@ -344,74 +343,52 @@ async def test_project_identifier_combination_is_unique_lookup(self, db): # --------------------------------------------------------------------------- -# update_contribution +# patch_pivot_row (scoped find-one-and-update by pivot identity) # --------------------------------------------------------------------------- -class TestUpdateContribution: +class TestPatchPivotRow: async def test_updates_single_field(self, db): - doc = await _insert(identifier="upd-formula") - await _repo(ADMIN).update_contribution(doc, {"formula": "SiO2"}) + doc = await _insert(identifier="patch-formula") + updated = await _repo(ADMIN).patch_pivot_row( + doc.project, doc.identifier, doc.version, doc.condition_key, {"formula": "SiO2"} + ) + assert updated is not None and updated.formula == "SiO2" found = await Contribution.find_one(Contribution.id == doc.id) assert found.formula == "SiO2" async def test_updates_data_field(self, db): - doc = await _insert(identifier="upd-data") - await _repo(ADMIN).update_contribution(doc, {"data": {"energy": -5.0}}) + doc = await _insert(identifier="patch-data") + await _repo(ADMIN).patch_pivot_row( + doc.project, doc.identifier, doc.version, doc.condition_key, {"data": {"energy": -5.0}} + ) found = await Contribution.find_one(Contribution.id == doc.id) assert found.data == {"energy": -5.0} async def test_unrelated_fields_unchanged(self, db): - doc = await _insert(identifier="upd-preserve", formula="Fe2O3") - await _repo(ADMIN).update_contribution(doc, {"needs_build": False}) - found = await Contribution.find_one(Contribution.id == doc.id) - assert found.formula == "Fe2O3" - - async def test_update_sets_last_modified(self, db): - doc = await _insert(identifier="upd-lm") - original_lm = doc.last_modified - await _repo(ADMIN).update_contribution(doc, {"formula": "Al2O3"}) - found = await Contribution.find_one(Contribution.id == doc.id) - # MongoDB may return naive UTC datetimes; strip timezone before comparing. - def _naive(dt): - return dt.replace(tzinfo=None) if dt.tzinfo else dt - assert _naive(found.last_modified) >= _naive(original_lm) - - -# --------------------------------------------------------------------------- -# patch_contribution_by_id -# --------------------------------------------------------------------------- - - -class TestPatchContributionById: - async def test_updates_formula(self, db): - doc = await _insert(identifier="patch-formula") - await _repo(ADMIN).patch_contribution_by_id(str(doc.id), ContributionPatch(formula="Li2O")) - found = await Contribution.find_one(Contribution.id == doc.id) - assert found.formula == "Li2O" - - async def test_unset_fields_not_overwritten(self, db): doc = await _insert(identifier="patch-preserve", formula="Fe2O3") - await _repo(ADMIN).patch_contribution_by_id(str(doc.id), ContributionPatch(needs_build=False)) - found = await Contribution.find_one(Contribution.id == doc.id) - assert found.formula == "Fe2O3" - - async def test_empty_patch_is_a_noop(self, db): - doc = await _insert(identifier="patch-empty", formula="Fe2O3") - result = await _repo(ADMIN).patch_contribution_by_id(str(doc.id), ContributionPatch()) - assert result is not None + await _repo(ADMIN).patch_pivot_row( + doc.project, doc.identifier, doc.version, doc.condition_key, {"needs_build": False} + ) found = await Contribution.find_one(Contribution.id == doc.id) assert found.formula == "Fe2O3" - async def test_raises_validation_error_for_bad_id(self, db): - with pytest.raises(ValidationError): - await _repo(ADMIN).patch_contribution_by_id("bad-id", ContributionPatch(formula="X")) + async def test_no_matching_row_returns_none(self, db): + doc = await _insert(identifier="patch-nomatch") + result = await _repo(ADMIN).patch_pivot_row( + doc.project, doc.identifier, doc.version, "conditions.temperature", {"formula": "X"} + ) + assert result is None - async def test_anon_cannot_patch_private_doc(self, db): - from mpcontribs_api.exceptions import NotFoundError + async def test_anon_cannot_patch_private_row(self, db): doc = await _insert(identifier="patch-anon-priv", is_public=False) - with pytest.raises(NotFoundError): - await _repo(ANON).patch_contribution_by_id(str(doc.id), ContributionPatch(formula="X")) + # Scope hides the private row from anonymous callers, so nothing matches to update. + result = await _repo(ANON).patch_pivot_row( + doc.project, doc.identifier, doc.version, doc.condition_key, {"formula": "X"} + ) + assert result is None + still_there = await Contribution.find_one(Contribution.id == doc.id) + assert still_there.formula == "Fe2O3" # --------------------------------------------------------------------------- diff --git a/mpcontribs-api/tests/integration/test_contributions_routes.py b/mpcontribs-api/tests/integration/test_contributions_routes.py index 36adad5984..1900be16f6 100644 --- a/mpcontribs-api/tests/integration/test_contributions_routes.py +++ b/mpcontribs-api/tests/integration/test_contributions_routes.py @@ -140,8 +140,10 @@ def test_get_by_id_conventional_path(self, client, contribution_repo): contribution_repo.get_contribution_by_id.return_value = SAMPLE_OUT assert client.get(f"/api/v1/contributions/{PydanticObjectId()}").status_code == 200 - def test_patch_by_id_conventional_path(self, client, contribution_repo): - contribution_repo.patch_contribution_by_id.return_value = SAMPLE_OUT + def test_patch_by_id_conventional_path(self, client, contribution_service): + # PATCH is routed through the service (it may fan a condition-bearing patch across the + # contribution's pivoted rows), so it returns a list of updated documents. + contribution_service.patch_contribution.return_value = [SAMPLE_OUT] r = client.patch(f"/api/v1/contributions/{PydanticObjectId()}", json={"formula": "H2O"}) assert r.status_code == 200 @@ -287,12 +289,12 @@ def test_put_by_id_anon_401(self, client, contribution_repo): assert r.status_code == 401 contribution_repo.upsert_contribution_by_id.assert_not_called() - def test_patch_by_id_anon_401(self, client, contribution_repo): + def test_patch_by_id_anon_401(self, client, contribution_service): r = client.patch( f"/api/v1/contributions/{PydanticObjectId()}", json={"formula": "H2O"}, headers=FORCE_ANON_HEADERS ) assert r.status_code == 401 - contribution_repo.patch_contribution_by_id.assert_not_called() + contribution_service.patch_contribution.assert_not_called() def test_get_collection_still_open_to_anon(self, client, contribution_repo): from mpcontribs_api.pagination import Page diff --git a/mpcontribs-api/tests/unit/domains/test_contribution_service.py b/mpcontribs-api/tests/unit/domains/test_contribution_service.py index 029fd8b322..1bd7732838 100644 --- a/mpcontribs-api/tests/unit/domains/test_contribution_service.py +++ b/mpcontribs-api/tests/unit/domains/test_contribution_service.py @@ -10,7 +10,7 @@ from mpcontribs_api.authz import ADMIN_GROUP, User from mpcontribs_api.config import MongoSettings from mpcontribs_api.domains.attachments.models import Attachment, AttachmentIn -from mpcontribs_api.domains.contributions.models import Contribution, ContributionIn +from mpcontribs_api.domains.contributions.models import Contribution, ContributionIn, ContributionPatch from mpcontribs_api.domains.contributions.service import ContributionService from mpcontribs_api.domains.structures.models import ( Lattice, @@ -21,7 +21,7 @@ StructureIn, ) from mpcontribs_api.domains.tables.models import Attributes, Labels, Table, TableIn -from mpcontribs_api.exceptions import ConflictError, ValidationError +from mpcontribs_api.exceptions import ConflictError, NotFoundError, PermissionError, ValidationError pytestmark = pytest.mark.asyncio @@ -88,13 +88,13 @@ def _structure_in(**overrides) -> StructureIn: return StructureIn(**defaults) -def _contrib_in(project="proj", identifier="mp-1", formula="Fe2O3", **kwargs) -> ContributionIn: +def _contrib_in(project="proj", identifier="mp-1", formula="Fe2O3", data=None, **kwargs) -> ContributionIn: return ContributionIn( _id=_oid(), project=project, identifier=identifier, formula=formula, - data={}, + data={} if data is None else data, **kwargs, ) @@ -226,8 +226,8 @@ async def test_duplicate_project_identifier_unique_project_conflicts_later_item( svc, contrib_repo, _, _, _, client = _make_service() contrib_repo.insert_many_contributions.return_value = None contribs = [ - _contrib_in(project="p", identifier="dup"), - _contrib_in(project="p", identifier="dup"), + _contrib_in(project="prj", identifier="dup"), + _contrib_in(project="prj", identifier="dup"), ] summary = await svc.insert_contributions(contribs) @@ -414,6 +414,43 @@ async def _insert(doc, session=None): assert captured_by_id["a"].structures == [struct_a] assert captured_by_id["b"].structures == [struct_b] + async def test_pivoting_submission_shares_components_across_rows(self): + svc, contrib_repo, struct_repo, table_repo, attach_repo, client = _make_service() + + shared = _fake_structure() + struct_repo.insert_components.return_value = [shared] + table_repo.insert_components.return_value = [] + attach_repo.insert_components.return_value = [] + + captured: list[Contribution] = [] + + async def _insert(doc, session=None): + captured.append(doc) + return doc + + contrib_repo.insert_contribution.side_effect = _insert + + # One submission that pivots into two rows (T=300K / T=400K) and carries a structure. + contrib = _contrib_in( + identifier="mp-1", + data={"x (eV, T=300K)": 1, "x (eV, T=400K)": 2}, + structures=[_structure_in()], + ) + summary = await svc.insert_contributions([contrib]) + + # Components inserted once for the whole submission; both rows written in one transaction. + assert struct_repo.insert_components.call_count == 1 + assert client.start_session.call_count == 1 + assert contrib_repo.insert_contribution.call_count == 2 + # Both pivoted rows link to the same shared structure and carry distinct condition keys. + assert len(captured) == 2 + assert all(doc.structures == [shared] for doc in captured) + assert len({doc.condition_key for doc in captured}) == 2 + # Summary is sized to the single submission but reports both pivoted rows as succeeded. + assert summary.total == 1 + assert len(summary.succeeded) == 2 + assert summary.failed == [] + # --------------------------------------------------------------------------- # insert_contributions — mixed batch (partitioned across paths) @@ -619,9 +656,10 @@ async def test_insert_pivots_one_submission_into_many_docs(self): docs = contrib_repo.insert_many_contributions.call_args[0][0] assert len({d.condition_key for d in docs}) == 2 assert all(d.condition_key for d in docs) # non-empty condition_key on each pivoted doc - # Each doc carries its conditions as columns plus the broadcast bandgap. + # Each doc carries its conditions as columns plus the broadcast bandgap; the condition name + # is snake_case-coerced (T -> t). for d in docs: - assert set(d.data) == {"T", "conductivity", "bandgap"} + assert set(d.data) == {"t", "conductivity", "bandgap"} async def test_insert_failure_maps_to_original_submission_index(self): # Non-unique project so intra-batch pivot rows don't self-conflict; a Mongo writeError on the @@ -726,7 +764,6 @@ async def test_raises_before_any_db_write(self): contrib_repo.upsert_contribution_by_identifiers.assert_not_called() contrib_repo.find_one_contribution.assert_not_called() contrib_repo.insert_contribution.assert_not_called() - contrib_repo.update_contribution.assert_not_called() # --------------------------------------------------------------------------- @@ -748,7 +785,6 @@ async def test_calls_atomic_repo_method_once_per_item(self): assert contrib_repo.upsert_contribution_by_identifiers.call_count == 3 # The legacy read-then-write path must not be used contrib_repo.find_one_contribution.assert_not_called() - contrib_repo.update_contribution.assert_not_called() contrib_repo.insert_contribution.assert_not_called() async def test_passes_identifiers_dict_and_input_to_repo(self): @@ -797,8 +833,8 @@ async def test_same_key_concurrent_upserts_both_go_through_atomic_call(self): contrib_repo.upsert_contribution_by_identifiers.return_value = MagicMock(spec=Contribution) contribs = [ - _contrib_in(project="p", identifier="same"), - _contrib_in(project="p", identifier="same"), + _contrib_in(project="prj", identifier="same"), + _contrib_in(project="prj", identifier="same"), ] summary = await svc.upsert_contributions(contribs) @@ -1189,3 +1225,106 @@ async def test_none_component_fields_do_not_raise(self): struct_repo.delete_by_ids.assert_not_called() table_repo.delete_by_ids.assert_not_called() attach_repo.delete_by_ids.assert_not_called() + + +# --------------------------------------------------------------------------- +# patch_contribution — annotate + fan condition-bearing data onto pivoted rows +# --------------------------------------------------------------------------- + + +def _target_doc(project="mp-team", identifier="mp-1", version=1, condition_key="") -> MagicMock: + """A stored Contribution the patch path anchors on (only identity attrs are read).""" + doc = MagicMock(spec=Contribution) + doc.project = project + doc.identifier = identifier + doc.version = version + doc.condition_key = condition_key + return doc + + +class TestPatchContribution: + async def test_not_found_raises(self): + svc, contrib_repo, *_ = _make_service() + contrib_repo.get_contribution_document.return_value = None + with pytest.raises(NotFoundError): + await svc.patch_contribution(str(_oid()), ContributionPatch(formula="H2O")) + + async def test_unauthorized_project_raises(self): + # Non-admin whose groups don't include the target's project cannot patch it. + user = User(username="google:alice@example.com", groups=frozenset({"other-team"})) + svc, contrib_repo, *_ = _make_service(user=user) + contrib_repo.get_contribution_document.return_value = _target_doc(project="mp-team") + with pytest.raises(PermissionError): + await svc.patch_contribution(str(_oid()), ContributionPatch(formula="H2O")) + contrib_repo.patch_pivot_row.assert_not_called() + + async def test_empty_patch_is_noop_returns_target(self): + svc, contrib_repo, *_ = _make_service() + target = _target_doc() + contrib_repo.get_contribution_document.return_value = target + result = await svc.patch_contribution(str(_oid()), ContributionPatch()) + assert result == [target] + contrib_repo.patch_pivot_row.assert_not_called() + + async def test_scalar_only_patch_updates_target_row(self): + svc, contrib_repo, *_ = _make_service() + target = _target_doc(condition_key="") + contrib_repo.get_contribution_document.return_value = target + updated = _target_doc() + contrib_repo.patch_pivot_row.return_value = updated + + result = await svc.patch_contribution(str(_oid()), ContributionPatch(formula="H2O", needs_build=False)) + + assert result == [updated] + contrib_repo.patch_pivot_row.assert_awaited_once() + args, _ = contrib_repo.patch_pivot_row.call_args + project, identifier, version, condition_key, update_data = args + assert (project, identifier, version, condition_key) == ("mp-team", "mp-1", 1, "") + assert update_data == {"formula": "H2O", "needs_build": False} + assert "data" not in update_data # no data on the patch + + async def test_data_without_conditions_annotates_and_patches_target(self): + svc, contrib_repo, *_ = _make_service() + target = _target_doc(condition_key="") + contrib_repo.get_contribution_document.return_value = target + contrib_repo.patch_pivot_row.return_value = _target_doc() + + await svc.patch_contribution(str(_oid()), ContributionPatch(data={"bandgap (eV)": 4.2})) + + contrib_repo.patch_pivot_row.assert_awaited_once() + args, _ = contrib_repo.patch_pivot_row.call_args + *_identity, condition_key, update_data = args + # No conditions -> the target row's own condition_key, data annotated in place. + assert condition_key == "" + leaf = update_data["data"]["bandgap"] + assert leaf["input_value"] == 4.2 + assert leaf["input_unit"] == "eV" + + async def test_data_with_conditions_fans_out_to_matching_rows(self): + svc, contrib_repo, *_ = _make_service() + contrib_repo.get_contribution_document.return_value = _target_doc() + # Each fanned signature resolves to an existing row. + contrib_repo.patch_pivot_row.side_effect = [_target_doc(), _target_doc()] + + result = await svc.patch_contribution( + str(_oid()), + ContributionPatch(data={"conductivity (S/cm, T=300K)": 1.2, "conductivity (S/cm, T=400K)": 3.4}), + ) + + assert len(result) == 2 + assert contrib_repo.patch_pivot_row.await_count == 2 + condition_keys = {call.args[3] for call in contrib_repo.patch_pivot_row.call_args_list} + # Two distinct, non-empty condition signatures (one per temperature). + assert len(condition_keys) == 2 + assert all(ck for ck in condition_keys) + for call in contrib_repo.patch_pivot_row.call_args_list: + data = call.args[4]["data"] + assert "t" in data and "conductivity" in data # condition column + measurement + + async def test_condition_signature_without_existing_row_rejected(self): + svc, contrib_repo, *_ = _make_service() + contrib_repo.get_contribution_document.return_value = _target_doc() + contrib_repo.patch_pivot_row.return_value = None # no stored row carries this condition_key + + with pytest.raises(ValidationError, match="cannot create new ones"): + await svc.patch_contribution(str(_oid()), ContributionPatch(data={"conductivity (S/cm, T=300K)": 1.2})) diff --git a/mpcontribs-api/tests/unit/domains/test_contributions_models.py b/mpcontribs-api/tests/unit/domains/test_contributions_models.py index acabd18254..d42b60ccb3 100644 --- a/mpcontribs-api/tests/unit/domains/test_contributions_models.py +++ b/mpcontribs-api/tests/unit/domains/test_contributions_models.py @@ -108,18 +108,16 @@ def test_data_depth_validation(self): _make_contribution_in(data=invalid_nesting) def test_data_key_validation(self): - valid_punctuation = {"test*/|": "pass"} - invalid_punctuation = {"test.": "fail"} - too_many_pipes = {"test||": "fail"} - non_ascii = {"ΔE": "fail"} - _make_contribution_in(data=valid_punctuation) - assert True - with pytest.raises(ValidationError, match="Punctuation found in Contribution.data keys"): - _make_contribution_in(data=invalid_punctuation) - with pytest.raises(ValidationError, match="Punctuation found in Contribution.data keys"): - _make_contribution_in(data=too_many_pipes) + # Punctuation/spaces/casing are no longer rejected at the ContributionIn level: keys are + # coerced to snake_case later (in expand_contribution), so validation only checks that a key + # is ASCII and can be coerced to a non-empty token. + _make_contribution_in(data={"test.": "pass"}) + _make_contribution_in(data={"Band Gap": "pass"}) + _make_contribution_in(data={"test||": "pass"}) with pytest.raises(ValidationError, match="Non-ASCII key found in Contribution.data"): - _make_contribution_in(data=non_ascii) + _make_contribution_in(data={"ΔE": "fail"}) + with pytest.raises(ValidationError, match="reduces to an empty string"): + _make_contribution_in(data={"***": "fail"}) # There isn't currently value validation. This is to check that that is true def test_data_value_validation(self): @@ -215,6 +213,22 @@ def test_data_can_be_set(self): patch = ContributionPatch(data={"new_key": 42}) assert patch.data == {"new_key": 42} + def test_data_keys_validated_not_coerced(self): + # ContributionPatch only *validates* keys; it no longer rewrites them. snake_case coercion + # and unit annotation happen in the service (expand_data), not at the model layer. + patch = ContributionPatch(data={"Band Gap": 1, "nested": {"pH-Value": 7}}) + assert patch.data == {"Band Gap": 1, "nested": {"pH-Value": 7}} + + def test_data_annotated_key_accepted(self): + # Annotated keys (unit + conditions) pass model validation unchanged; the service expands them. + patch = ContributionPatch(data={"conductivity (S/cm, T=300K)": 1.2}) + assert patch.data == {"conductivity (S/cm, T=300K)": 1.2} + + def test_data_uncoercible_key_rejected(self): + # A key that reduces to an empty string after coercion is still rejected at validation time. + with pytest.raises(ValidationError, match="empty string after snake_case coercion"): + ContributionPatch(data={"***": 1}) + # --------------------------------------------------------------------------- # MongoDbContributionRepository._build_scope (pure logic, no DB needed) diff --git a/mpcontribs-api/tests/unit/domains/test_contributions_pivot.py b/mpcontribs-api/tests/unit/domains/test_contributions_pivot.py index c674d25208..4119475fb1 100644 --- a/mpcontribs-api/tests/unit/domains/test_contributions_pivot.py +++ b/mpcontribs-api/tests/unit/domains/test_contributions_pivot.py @@ -3,15 +3,20 @@ import pytest from beanie import PydanticObjectId +from mpcontribs_api.domains._shared.types import ( + coerce_keys, + parse_annotated_key, + to_snake_case, +) from mpcontribs_api.domains.contributions.models import ContributionIn -from mpcontribs_api.domains.contributions.pivot import expand_contribution, parse_annotated_key +from mpcontribs_api.domains.contributions.pivot import expand_contribution from mpcontribs_api.exceptions import ValidationError def _contrib_in(data, **overrides) -> ContributionIn: defaults = { "_id": PydanticObjectId(), - "project": "p", + "project": "prj", "identifier": "mp-1", "formula": "Fe2O3", "data": data, @@ -20,6 +25,56 @@ def _contrib_in(data, **overrides) -> ContributionIn: return ContributionIn(**defaults) +# --------------------------------------------------------------------------- +# to_snake_case / coerce_keys +# --------------------------------------------------------------------------- + + +class TestToSnakeCase: + @pytest.mark.parametrize( + ("raw", "expected"), + [ + ("BandGap", "band_gap"), + ("Seebeck coef", "seebeck_coef"), + ("pH-value", "p_h_value"), + ("T", "t"), + ("carrier_transport", "carrier_transport"), + ("already_snake", "already_snake"), + (" spaced key ", "spaced_key"), + ("multiple___underscores", "multiple_underscores"), + ("2theta", "2theta"), + ("HTTPServer", "httpserver"), # no lowercase boundary -> no split + ], + ) + def test_coercion(self, raw, expected): + assert to_snake_case(raw) == expected + + def test_only_separators_reduces_to_empty(self): + assert to_snake_case("***") == "" + + +class TestCoerceKeys: + def test_recurses_dicts_and_lists(self): + out = coerce_keys({"Band Gap": {"pH-Value": 1}, "List": [{"Inner Key": 2}]}) + assert out == {"band_gap": {"p_h_value": 1}, "list": [{"inner_key": 2}]} + + def test_leaves_values_untouched(self): + # only keys are coerced; string/number values pass through verbatim + assert coerce_keys({"Key": "Value.With/Punct"}) == {"key": "Value.With/Punct"} + + def test_collision_raises(self): + with pytest.raises(ValidationError, match="collide after snake_case coercion"): + coerce_keys({"Band Gap": 1, "band_gap": 2}) + + def test_non_ascii_key_raises(self): + with pytest.raises(ValidationError, match="Non-ASCII"): + coerce_keys({"ΔE": 1}) + + def test_empty_after_coercion_raises(self): + with pytest.raises(ValidationError, match="reduces to an empty string"): + coerce_keys({"***": 1}) + + # --------------------------------------------------------------------------- # parse_annotated_key # --------------------------------------------------------------------------- @@ -106,8 +161,9 @@ def test_pivots_into_one_row_per_signature(self): assert len(rows) == 2 assert len({r.condition_key for r in rows}) == 2 for r in rows: - # conditions + measurement + broadcast column all present - assert set(r.contribution.data) == {"T", "P", "conductivity", "bandgap"} + # conditions + measurement + broadcast column all present; condition names are + # snake_case-coerced (T -> t, P -> p) like every other data key. + assert set(r.contribution.data) == {"t", "p", "conductivity", "bandgap"} def test_condition_less_column_broadcasts(self): rows = expand_contribution( @@ -121,8 +177,9 @@ def test_conditions_stored_as_columns(self): rows = expand_contribution(_contrib_in({"conductivity (S/cm, T=300K)": 4.2})) assert len(rows) == 1 data = rows[0].contribution.data - assert "T" in data - assert math.isclose(data["T"]["value"], 300.0) + # condition name coerced to snake_case (T -> t) + assert "t" in data + assert math.isclose(data["t"]["value"], 300.0) def test_dotted_path_nests(self): rows = expand_contribution(_contrib_in({"a.b.c (eV, T=300K)": 2.0})) @@ -143,12 +200,19 @@ def test_malformed_annotation_raises_validation_error(self): with pytest.raises(ValidationError): expand_contribution(_contrib_in({"x (eV, =300)": 1})) - def test_components_on_pivoting_submission_rejected(self): + def test_components_ride_along_on_every_pivoted_row(self): from tests.unit.domains.test_contribution_service import _structure_in - c = _contrib_in({"x (eV, T=300K)": 1, "x (eV, T=400K)": 2}, structures=[_structure_in()]) - with pytest.raises(ValidationError, match="components are not supported"): - expand_contribution(c) + # A pivoting submission with components is allowed: multiple contributions may reference the + # same components, so every pivoted row keeps the full component set (the insert path stores + # them once, deduplicated by hash, and links every row to the shared ids). + struct = _structure_in() + c = _contrib_in({"x (eV, T=300K)": 1, "x (eV, T=400K)": 2}, structures=[struct]) + rows = expand_contribution(c) + assert len(rows) == 2 + assert len({r.condition_key for r in rows}) == 2 + for row in rows: + assert row.contribution.structures == [struct] def test_components_allowed_when_not_pivoting(self): from tests.unit.domains.test_contribution_service import _structure_in @@ -157,3 +221,37 @@ def test_components_allowed_when_not_pivoting(self): c = _contrib_in({"bandgap (eV)": 1.1}, structures=[_structure_in()]) rows = expand_contribution(c) assert len(rows) == 1 + + def test_plain_keys_coerced_when_no_annotations(self): + rows = expand_contribution(_contrib_in({"Band Gap": 1.5, "nested": {"Sub Key": 2}})) + assert len(rows) == 1 + assert rows[0].contribution.data == {"band_gap": 1.5, "nested": {"sub_key": 2}} + + def test_no_op_coercion_returns_same_object(self): + # all keys already snake_case -> the original contribution object is returned untouched + c = _contrib_in({"band_gap": 1.5, "nested": {"sub_key": 2}}) + rows = expand_contribution(c) + assert rows[0].contribution is c + + def test_annotated_path_segments_coerced(self): + rows = expand_contribution(_contrib_in({"Band Gap (eV, T=300K)": 1.1})) + data = rows[0].contribution.data + assert set(data) == {"band_gap", "t"} + assert data["band_gap"]["input_unit"] == "eV" + + def test_dotted_path_segments_coerced(self): + rows = expand_contribution(_contrib_in({"Outer.Inner Key (eV)": 1.1})) + data = rows[0].contribution.data + assert "value" in data["outer"]["inner_key"] + + def test_unit_and_condition_value_preserved_verbatim(self): + # unit (eV) and condition value (300K -> canonical) are never snake_cased; only names are + rows = expand_contribution(_contrib_in({"Band Gap (eV, Temp=300K)": 1.1})) + data = rows[0].contribution.data + assert data["band_gap"]["input_unit"] == "eV" + assert "temp" in data # condition name coerced + assert math.isclose(data["temp"]["value"], 300.0) + + def test_coercion_collision_across_columns_rejected(self): + with pytest.raises(ValidationError, match="same path"): + expand_contribution(_contrib_in({"Band Gap (eV)": 1, "band_gap (eV)": 2})) diff --git a/mpcontribs-api/tests/unit/domains/test_units.py b/mpcontribs-api/tests/unit/domains/test_units.py index e91a8180f5..e3c7a1b168 100644 --- a/mpcontribs-api/tests/unit/domains/test_units.py +++ b/mpcontribs-api/tests/unit/domains/test_units.py @@ -1,8 +1,10 @@ import math import pytest +from pydantic import ValidationError as PydanticValidationError from mpcontribs_api.domains._shared.units import ( + AnnotatedData, UnitError, annotate_value, condition_key, @@ -23,10 +25,20 @@ def test_recognized_unit_canonicalizes_to_si_and_keeps_original(self): assert math.isclose(leaf["value"], 4.2 * 1.602176634e-19, rel_tol=1e-9) assert leaf["unit"] != "eV" # canonicalized to base units assert "error" not in leaf + # display renders the submitted (pre-canonicalization) form + assert leaf["display"] == "4.2 eV" + + def test_display_renders_submitted_form(self): + assert annotate_value(4.2, "eV")["display"] == "4.2 eV" + assert annotate_value("4.2(3)", "eV")["display"] == "4.2+/-0.3 eV" + assert annotate_value(5, None)["display"] == "5" + # unrecognized unit still renders verbatim + assert annotate_value(1.0, "widgets")["display"] == "1 widgets" def test_unitless_value(self): + # exclude_none drops unit/input_unit for a unit-less leaf; display is always present. leaf = annotate_value(5, None) - assert leaf == {"value": 5.0, "unit": None, "input_value": 5.0, "input_unit": None} + assert leaf == {"value": 5.0, "input_value": 5.0, "display": "5"} def test_unknown_unit_stored_as_submitted(self): leaf = annotate_value(1.0, "widgets") @@ -76,7 +88,8 @@ def test_numeric_with_unit(self): def test_bare_numeric(self): leaf = parse_condition_value("5") assert leaf["value"] == 5.0 - assert leaf["unit"] is None + # unit is omitted (exclude_none) for a unit-less leaf + assert leaf.get("unit") is None def test_categorical_returned_verbatim(self): assert parse_condition_value("cubic") == "cubic" @@ -117,3 +130,26 @@ def test_fixed_precision_normalizes_representations(self): def test_categorical_in_key(self): assert condition_key({"phase": "cubic"}) == "phase=cubic" + + +# --------------------------------------------------------------------------- +# AnnotatedData — the leaf shape model +# --------------------------------------------------------------------------- + + +class TestAnnotatedData: + def test_unit_and_error_optional(self): + leaf = AnnotatedData(value=5.0, input_value=5.0, display="5") + assert leaf.unit is None + assert leaf.input_unit is None + assert leaf.error is None + + def test_unit_case_preserved(self): + # units must never be casefolded (eV stays eV, not ev) + leaf = AnnotatedData(value=1.0, unit="eV", input_value=1.0, input_unit="eV", display="1 eV") + assert leaf.unit == "eV" + assert leaf.input_unit == "eV" + + def test_display_required(self): + with pytest.raises(PydanticValidationError): + AnnotatedData(value=5.0, input_value=5.0) From c94ee5d4da84e2f310dd3fb0c21388021d65a032 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Fri, 10 Jul 2026 12:07:13 -0700 Subject: [PATCH 222/591] Comments to ignore pyright warnings --- mpcontribs-api/main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mpcontribs-api/main.py b/mpcontribs-api/main.py index d9d5a740c0..097e1b5d32 100755 --- a/mpcontribs-api/main.py +++ b/mpcontribs-api/main.py @@ -33,8 +33,8 @@ def start(program): cluster = labels[f"{prefix}.cluster"].split("/", 1)[1] family = labels[f"{prefix}.task-definition-family"] version = int(labels[f"{prefix}.task-definition-version"]) - task_arns = client.list_tasks(cluster=cluster, family=family).get("taskArns", []) - tasks = client.describe_tasks(cluster=cluster, tasks=task_arns).get("tasks", []) + task_arns = client.list_tasks(cluster=cluster, family=family).get("taskArns", []) # pyright: ignore[reportAttributeAccessIssue] - boto3 dynamically dispatches, this is valid with ECS + tasks = client.describe_tasks(cluster=cluster, tasks=task_arns).get("tasks", []) # pyright: ignore[reportAttributeAccessIssue] - boto3 dynamically dispatches, this is valid with ECS ntasks = 0 for task in tasks: From b11e52b1d3e5b96228ec9bbebe98f9f37bd6993f Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Fri, 10 Jul 2026 12:07:43 -0700 Subject: [PATCH 223/591] Improved readme to describe contribution data --- mpcontribs-api/README.md | 80 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) diff --git a/mpcontribs-api/README.md b/mpcontribs-api/README.md index 52fb3b858c..6534e48d07 100644 --- a/mpcontribs-api/README.md +++ b/mpcontribs-api/README.md @@ -1,3 +1,83 @@ - https://contribs-api.materialsproject.org - https://ml-api.materialsproject.org - https://lightsources-api.materialsproject.org + +## Contribution `data` + +A contribution's `data` is a hierarchical JSON object (max nesting depth 7). Lists are allowed, and +dictionaries inside them have their keys coerced and validated like any other key. The API applies +two write-time transforms that are important for clients to understand, because **the data you read +back can differ from the data you submitted**. + +### Key coercion to `snake_case` + +Every dictionary key in `data` is coerced to `snake_case` on write: + +- casing is lowercased, +- `camelCase` / `PascalCase` boundaries are split (`bandGap` → `band_gap`), +- any run of spaces, hyphens, or punctuation collapses to a single underscore. + +So `"bandGap"`, `"Band Gap"`, and `"band-gap"` are all stored as `"band_gap"`. Keys must be ASCII +and must not reduce to an empty string (e.g. `"***"` is rejected). Colliding keys after coercion +(`"Band Gap"` and `"band_gap"` in the same object) are rejected. + +### Annotated keys: units and conditions + +A **top-level** key may carry an annotation in parentheses: + +``` +"name (unit, condition1=value1, condition2=value2, ...)" +``` + +- The single token without an `=` is the **unit** (`eV`, `S/cm`, `K`, …). Units are stored verbatim + (not coerced) so they round-trip through [Pint](https://pint.readthedocs.io/). +- Each `k=v` token is a **condition**; condition names are coerced to `snake_case` like other keys. +- `name` may be a dotted path (`"transport.conductivity (S/cm)"`) to nest the value. +- A key with no parentheses is a plain, fully backward-compatible key. + +Recognized units are canonicalized to SI base units on write. Magnitudes may carry uncertainty as +`"4.2(3)"`, `"4.2+/-0.3"`, or `"4.2±0.3"`. + +A value submitted with a unit annotation is stored as an **annotated leaf**: + +| field | meaning | +| --------------------------- | ---------------------------------------------------------------------------- | +| `value` / `unit` | SI-canonical form (or submitted form if the unit is unrecognized/dimensionless) | +| `input_value` / `input_unit`| the magnitude and unit exactly as submitted | +| `error` | SI-propagated standard deviation (only when an uncertainty was given) | +| `display` | human-readable rendering of the submitted magnitude/unit, e.g. `"4.2+/-0.3 eV"` | + +### Pivoting on conditions + +If any key carries conditions, a single submitted contribution is **expanded into one contribution +per distinct condition signature**. Each resulting contribution stores its conditions as ordinary +columns, plus its own measurements, plus every condition-less ("broadcast") column, and is stamped +with a server-computed `condition_key` identity. For example: + +```jsonc +// submitted +{ + "conductivity (S/cm, T=300K)": 1.2, + "conductivity (S/cm, T=400K)": 3.4, + "sample": "A" // broadcast to every pivoted row +} +// stored: two contributions, one per temperature, each with `t`, `conductivity`, and `sample` +``` + +Submissions that pivot on conditions may **not** include components (structures/tables/attachments): +insert the pivoted contributions first, then attach components to the rows you want. + +**PATCH semantics.** `PATCH /contributions/{id}` runs the same expansion on its `data`: + +- Condition-less `data` patches the addressed contribution in place (units are still annotated); its + `condition_key` is unchanged. +- `data` that carries conditions *fans out*: each condition signature updates the existing pivoted + row (under the same `project`/`identifier`/`version`) that already has the matching `condition_key`. + A PATCH never creates new rows or rewrites a `condition_key`, so a signature that matches no stored + row is rejected. Non-`data` fields on the patch apply to every row it touches. The response is the + list of updated contributions. + +> The write path (key grammar, coercion, and validation) lives in +> `src/mpcontribs_api/domains/_shared/types.py`; expansion/pivoting lives in +> `src/mpcontribs_api/domains/contributions/pivot.py`; unit handling lives in +> `src/mpcontribs_api/domains/_shared/units.py`. From 9fd6fd7b7c781853e64e3086d4c0fce3bbc96677 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Fri, 10 Jul 2026 12:25:33 -0700 Subject: [PATCH 224/591] Corrected tests using outdated conditions --- .../tests/integration/test_healthcheck.py | 2 +- .../unit/domains/test_contributions_pivot.py | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/mpcontribs-api/tests/integration/test_healthcheck.py b/mpcontribs-api/tests/integration/test_healthcheck.py index e06e09e8ef..f98ca854f3 100644 --- a/mpcontribs-api/tests/integration/test_healthcheck.py +++ b/mpcontribs-api/tests/integration/test_healthcheck.py @@ -58,7 +58,7 @@ def test_returns_200(self, health_app): def test_body_reports_healthy(self, health_app): r = _client(health_app, _make_db(ping_ok=True), _make_s3(head_ok=True)).get("/healthcheck") - assert r.json() == {"version": "0.0.0-test", "status": "healthy", "mongo": "ok", "s3": "ok"} + assert r.json() == {"version": "0.0.0-dev", "status": "healthy", "mongo": "ok", "s3": "ok"} def test_pings_mongo(self, health_app): db = _make_db(ping_ok=True) diff --git a/mpcontribs-api/tests/unit/domains/test_contributions_pivot.py b/mpcontribs-api/tests/unit/domains/test_contributions_pivot.py index 4119475fb1..f37207bbc3 100644 --- a/mpcontribs-api/tests/unit/domains/test_contributions_pivot.py +++ b/mpcontribs-api/tests/unit/domains/test_contributions_pivot.py @@ -10,7 +10,7 @@ ) from mpcontribs_api.domains.contributions.models import ContributionIn from mpcontribs_api.domains.contributions.pivot import expand_contribution -from mpcontribs_api.exceptions import ValidationError +from mpcontribs_api.exceptions import DataKeyError, ValidationError def _contrib_in(data, **overrides) -> ContributionIn: @@ -36,14 +36,14 @@ class TestToSnakeCase: [ ("BandGap", "band_gap"), ("Seebeck coef", "seebeck_coef"), - ("pH-value", "p_h_value"), + ("pH-value", "ph_value"), ("T", "t"), ("carrier_transport", "carrier_transport"), ("already_snake", "already_snake"), (" spaced key ", "spaced_key"), ("multiple___underscores", "multiple_underscores"), ("2theta", "2theta"), - ("HTTPServer", "httpserver"), # no lowercase boundary -> no split + ("HTTPServer", "http_server"), # no lowercase boundary -> no split ], ) def test_coercion(self, raw, expected): @@ -56,7 +56,7 @@ def test_only_separators_reduces_to_empty(self): class TestCoerceKeys: def test_recurses_dicts_and_lists(self): out = coerce_keys({"Band Gap": {"pH-Value": 1}, "List": [{"Inner Key": 2}]}) - assert out == {"band_gap": {"p_h_value": 1}, "list": [{"inner_key": 2}]} + assert out == {"band_gap": {"ph_value": 1}, "list": [{"inner_key": 2}]} def test_leaves_values_untouched(self): # only keys are coerced; string/number values pass through verbatim @@ -112,19 +112,19 @@ def test_dotted_path(self): assert pk.segments == ("a", "b", "c") def test_unbalanced_parens_raises(self): - with pytest.raises(ValueError): + with pytest.raises(DataKeyError): parse_annotated_key("x (eV") def test_empty_name_raises(self): - with pytest.raises(ValueError): + with pytest.raises(DataKeyError): parse_annotated_key(" (eV)") def test_multiple_units_raises(self): - with pytest.raises(ValueError): + with pytest.raises(DataKeyError): parse_annotated_key("x (eV, meV)") def test_duplicate_condition_raises(self): - with pytest.raises(ValueError): + with pytest.raises(DataKeyError): parse_annotated_key("x (eV, T=300K, T=400K)") From fae70ce8efd50b7893a9803fe2c9fea64807790e Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Fri, 10 Jul 2026 14:42:06 -0700 Subject: [PATCH 225/591] Added NFKCStr and applied new string types across domain models --- .../mpcontribs_api/domains/_shared/filters.py | 30 ++++++++- .../mpcontribs_api/domains/_shared/models.py | 7 ++- .../mpcontribs_api/domains/_shared/types.py | 35 +++++++++-- .../mpcontribs_api/domains/_shared/units.py | 5 ++ .../domains/attachments/models.py | 10 +-- .../domains/structures/models.py | 10 +-- .../mpcontribs_api/domains/tables/models.py | 22 ++++--- .../tests/unit/domains/test_shared_filters.py | 62 +++++++++++++++++++ .../tests/unit/domains/test_tables_models.py | 38 ++++++++++++ .../tests/unit/domains/test_units.py | 11 ++++ mpcontribs-api/tests/unit/test_types.py | 54 +++++++++++++++- 11 files changed, 253 insertions(+), 31 deletions(-) create mode 100644 mpcontribs-api/tests/unit/domains/test_shared_filters.py diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/filters.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/filters.py index 027d25dfb5..479af69ab9 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/filters.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/filters.py @@ -3,6 +3,28 @@ from fastapi_filter.contrib.beanie import Filter +from mpcontribs_api.domains._shared.types import nfc_normalize + + +def _normalize_query_values(value: Any) -> Any: + """Recursively NFC-normalize every string in a built query condition value. + + fastapi-filter wraps a filter's value into operator dicts before it reaches us (``{"$ne": v}``, + ``{"$in": [...]}``, ``{"$regex": ".*v.*", "$options": "i"}``), so a query term can be nested a + few levels deep. Normalizing every string — bare, inside operator dicts, and inside ``$in``/ + ``$nin`` lists — means a term typed with a canonically-equivalent spelling (e.g. the OHM SIGN + U+2126 vs the Greek omega) matches NFC-normalized stored data. NFC is a no-op on ASCII, so ids, + md5 hex, and regex metacharacters are untouched. Dict *keys* (field names, ``$``-operators) are + ASCII and left as-is. + """ + if isinstance(value, str): + return nfc_normalize(value) + if isinstance(value, Mapping): + return {key: _normalize_query_values(sub) for key, sub in value.items()} + if isinstance(value, list): + return [_normalize_query_values(item) for item in value] + return value + class BaseFilter(Filter): """Base filter that bridges Beanie's ``_id`` alias and fastapi-filter's raw field names. @@ -13,11 +35,17 @@ class BaseFilter(Filter): nothing, while a direct ``Document.id == x`` lookup (which Beanie resolves to ``_id``) succeeds. Remapping the ``id`` key to ``_id`` here keeps the two read paths consistent. + String values are also NFC-normalized (see :func:`_normalize_query_values`) so queries match the + NFC-normalized units, labels, and other display strings stored on the write path. + Domain filters should subclass this instead of fastapi-filter's ``Filter`` directly. """ def _get_filter_conditions(self, nesting_depth: int = 1) -> list[tuple[Mapping[str, Any], Mapping[str, Any]]]: return [ - ({"_id" if key == "id" else key: value for key, value in condition.items()}, options) + ( + {("_id" if key == "id" else key): _normalize_query_values(value) for key, value in condition.items()}, + options, + ) for condition, options in super()._get_filter_conditions(nesting_depth) ] diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py index 2dfb073c66..236eb06c34 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py @@ -9,7 +9,7 @@ from pymongo.results import DeleteResult from mpcontribs_api import pagination -from mpcontribs_api.domains._shared.types import MD5Hash +from mpcontribs_api.domains._shared.types import MD5Hash, NFKCStr from mpcontribs_api.projection import SparseFieldsModel @@ -84,7 +84,8 @@ class ComponentIn(BaseModel): fields for their resource. """ - name: str + # NFKC-normalized so compatibility-equivalent spellings of a name collapse to one stored form. + name: NFKCStr class Component(BaseDocumentWithInput[PydanticObjectId]): @@ -95,7 +96,7 @@ class Component(BaseDocumentWithInput[PydanticObjectId]): never define a component's content identity. """ - name: str + name: NFKCStr # Server-computed; the placeholder default is overwritten by ``_recompute_md5`` on validation. md5: MD5Hash = Field(default="0" * 32) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py index 12a970e1e0..43cfed72a9 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py @@ -115,11 +115,31 @@ def _serialize_frame(data: pl.DataFrame) -> dict: ] -def _nfkc_normalize(value: str) -> str: - return unicodedata.normalize("NFKC", value).casefold() +def _nfkc_casefold(value: str) -> str: + """NFKC + casefold: the case-insensitive, compatibility-folded form used for search/matching.""" + return nfkc_normalize(value).casefold() -def _nfc_normalize(value: str) -> str: +def nfkc_normalize(value: str) -> str: + """Return ``value`` in Unicode NFKC (compatibility composition) form, preserving case. + + NFKC folds *compatibility* variants onto a canonical form — the MICRO SIGN U+00B5 becomes the + Greek mu, the ``fi`` ligature becomes ``fi``, full-width characters become half-width, and so on. + Unlike :func:`_nfkc_casefold` it does not casefold, so human-facing labels keep their original + case. It is a superset of :func:`nfc_normalize` (NFKC output is already NFC-stable). + """ + return unicodedata.normalize("NFKC", value) + + +def nfc_normalize(value: str) -> str: + """Return ``value`` in Unicode NFC (canonical composition) form. + + NFC folds canonically-equivalent codepoints onto one representative — e.g. the OHM SIGN + (U+2126) and Ångström sign (U+212B) collapse onto the Greek capital omega and ``Å``. This keeps + equivalent spellings of units, labels, and query terms comparable byte-for-byte. It is a no-op on + pure ASCII. NFC is deliberately *not* NFKC: it does not casefold or apply compatibility folding + (so the MICRO SIGN U+00B5 and Greek mu U+03BC stay distinct). + """ return unicodedata.normalize("NFC", value) @@ -162,11 +182,14 @@ def to_snake_case(name: str) -> str: # Converts strs to snake case SnakeCaseStr = Annotated[str, BeforeValidator(func=to_snake_case)] -# Converts strs to searchable form (remove unicode, casefold) -SearchStr = Annotated[str, BeforeValidator(func=_nfkc_normalize)] +# Converts strs to searchable form (NFKC compatibility fold + casefold) +SearchStr = Annotated[str, BeforeValidator(func=_nfkc_casefold)] + +# NFKC-normalizes strs (compatibility fold, case preserved) — for human-facing labels/names +NFKCStr = Annotated[str, BeforeValidator(func=nfkc_normalize)] # Converts strs to pretty display form (keeps unicode and most formatting) -DisplayStr = Annotated[str, BeforeValidator(func=_nfc_normalize)] +DisplayStr = Annotated[str, BeforeValidator(func=nfc_normalize)] # Contribution.data key grammar, coercion, and validation diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/units.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/units.py index f62861d78c..33fdc301a4 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/units.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/units.py @@ -28,6 +28,7 @@ from uncertainties.core import AffineScalarFunc from mpcontribs_api.config import get_settings +from mpcontribs_api.domains._shared.types import nfc_normalize from mpcontribs_api.exceptions import UnitError settings = get_settings() @@ -143,6 +144,10 @@ def annotate_value(value: Any, unit: str | None) -> dict[str, Any]: Raises: UnitError: if the magnitude cannot be parsed. """ + # NFC-normalize the unit so canonically-equivalent spellings (e.g. the OHM SIGN U+2126 vs the + # Greek capital omega) collapse to one form before Pint parsing, display rendering, and storage. + if unit: + unit = nfc_normalize(unit) magnitude = _parse_magnitude(value) nominal, error = _split_ufloat(magnitude) # display always reflects the submitted (pre-canonicalization) magnitude/unit. diff --git a/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py b/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py index 4d7375837b..c24ef2a158 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py @@ -3,7 +3,7 @@ from mpcontribs_api.domains._shared.filters import BaseFilter from mpcontribs_api.domains._shared.models import Component, ComponentIn, DocumentOut -from mpcontribs_api.domains._shared.types import FileLike, MD5Hash, MimeFormat +from mpcontribs_api.domains._shared.types import FileLike, MD5Hash, MimeFormat, NFKCStr from mpcontribs_api.exceptions import ValidationError from mpcontribs_api.projection import SparseFieldsModel @@ -73,10 +73,10 @@ class AttachmentFilter(BaseFilter): md5__in: list[MD5Hash] | None = None md5__neq: MD5Hash | None = None - name: str | None = None - name__in: list[str] | None = None - name__neq: str | None = None - name__ilike: str | None = None + name: NFKCStr | None = None + name__in: list[NFKCStr] | None = None + name__neq: NFKCStr | None = None + name__ilike: NFKCStr | None = None mime: MimeFormat | None = None mime__in: list[MimeFormat] | None = None diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py index b4c8f6aa53..b9ab911935 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py @@ -4,7 +4,7 @@ from mpcontribs_api.domains._shared.filters import BaseFilter from mpcontribs_api.domains._shared.models import Component, ComponentIn, DocumentOut -from mpcontribs_api.domains._shared.types import MD5Hash, PolarsFrame +from mpcontribs_api.domains._shared.types import MD5Hash, NFKCStr, PolarsFrame from mpcontribs_api.projection import SparseFieldsModel @@ -101,10 +101,10 @@ class StructureFilter(BaseFilter): md5__in: list[MD5Hash] | None = None md5__neq: MD5Hash | None = None - name: str | None = None - name__in: list[str] | None = None - name__neq: str | None = None - name__ilike: str | None = None + name: NFKCStr | None = None + name__in: list[NFKCStr] | None = None + name__neq: NFKCStr | None = None + name__ilike: NFKCStr | None = None # sites diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py index 44cb0368e2..fa8e343a0b 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py @@ -12,18 +12,19 @@ from mpcontribs_api.domains._shared.filters import BaseFilter from mpcontribs_api.domains._shared.models import Component, ComponentIn, DocumentOut -from mpcontribs_api.domains._shared.types import MD5Hash, PolarsFrame +from mpcontribs_api.domains._shared.types import DisplayStr, MD5Hash, NFKCStr, PolarsFrame, nfc_normalize from mpcontribs_api.projection import SparseFieldsModel class Labels(BaseModel): - index: str - value: str - variable: str + # Column labels are NFC-normalized so equivalent Unicode spellings render/compare consistently. + index: DisplayStr + value: DisplayStr + variable: DisplayStr class Attributes(BaseModel): - title: str + title: DisplayStr labels: Labels @@ -37,7 +38,8 @@ def frame_to_storage(frame: pl.DataFrame) -> tuple[list[str], list[str], list[li index_col, *data_cols = frame.columns index = [str(v) for v in frame[index_col].to_list()] data = [[str(v) for v in row] for row in frame.select(data_cols).iter_rows()] - return index, list(data_cols), data + # NFC-normalize the column labels (not the cell values) so equivalent spellings store identically. + return index, [nfc_normalize(str(c)) for c in data_cols], data def storage_to_frame(index_label: str, index: list[str], columns: list[str], data: list[list[str]]) -> pl.DataFrame: @@ -106,10 +108,10 @@ class TableFilter(BaseFilter): md5__in: list[MD5Hash] | None = None md5__neq: MD5Hash | None = None - name: str | None = None - name__in: list[str] | None = None - name__neq: str | None = None - name__ilike: str | None = None + name: NFKCStr | None = None + name__in: list[NFKCStr] | None = None + name__neq: NFKCStr | None = None + name__ilike: NFKCStr | None = None # Columns # Attrs diff --git a/mpcontribs-api/tests/unit/domains/test_shared_filters.py b/mpcontribs-api/tests/unit/domains/test_shared_filters.py new file mode 100644 index 0000000000..eb53320389 --- /dev/null +++ b/mpcontribs-api/tests/unit/domains/test_shared_filters.py @@ -0,0 +1,62 @@ +from beanie import PydanticObjectId + +from mpcontribs_api.domains._shared.filters import _normalize_query_values +from mpcontribs_api.domains.contributions.models import ContributionFilter +from mpcontribs_api.domains.tables.models import TableFilter + +# OHM SIGN (U+2126) NFC-folds onto the Greek capital omega (U+03A9); the two are distinct codepoints. +OHM_SIGN = "Ω" +GREEK_OMEGA = "Ω" + + +def _flatten(conditions): + """Merge the (condition, options) pairs from _get_filter_conditions into one dict.""" + merged = {} + for condition, _options in conditions: + merged.update(condition) + return merged + + +class TestNormalizeQueryValues: + def test_bare_string_folded(self): + assert _normalize_query_values(OHM_SIGN) == GREEK_OMEGA + + def test_ascii_unchanged(self): + assert _normalize_query_values("bandgap") == "bandgap" + + def test_operator_dict_value_folded(self): + # e.g. the {"$ne": value} shape fastapi-filter builds for __neq. + assert _normalize_query_values({"$ne": OHM_SIGN}) == {"$ne": GREEK_OMEGA} + + def test_regex_string_folded_inside_ilike_shape(self): + out = _normalize_query_values({"$regex": f".*{OHM_SIGN}.*", "$options": "i"}) + assert out == {"$regex": f".*{GREEK_OMEGA}.*", "$options": "i"} + + def test_list_values_folded(self): + assert _normalize_query_values({"$in": [OHM_SIGN, "eV"]}) == {"$in": [GREEK_OMEGA, "eV"]} + + def test_non_string_untouched(self): + oid = PydanticObjectId() + assert _normalize_query_values(oid) is oid + + +class TestBaseFilterQueryNormalization: + def test_generic_pass_folds_plain_str_field(self): + # ContributionFilter.formula is a plain str field, so folding here comes from the BaseFilter + # NFC pass rather than a field-level validator. + conditions = _flatten(ContributionFilter(formula=OHM_SIGN)._get_filter_conditions()) + assert conditions["formula"] == GREEK_OMEGA + + def test_id_still_remapped_to_underscore_id(self): + oid = PydanticObjectId() + conditions = _flatten(ContributionFilter(id=oid)._get_filter_conditions()) + assert "_id" in conditions + assert "id" not in conditions + + def test_component_name_lookup_folded(self): + conditions = _flatten(TableFilter(name=OHM_SIGN)._get_filter_conditions()) + assert conditions["name"] == GREEK_OMEGA + + def test_component_name_ilike_regex_folded(self): + conditions = _flatten(TableFilter(name__ilike=OHM_SIGN)._get_filter_conditions()) + assert conditions["name"]["$regex"] == f".*{GREEK_OMEGA}.*" diff --git a/mpcontribs-api/tests/unit/domains/test_tables_models.py b/mpcontribs-api/tests/unit/domains/test_tables_models.py index 624a24ace1..952908321b 100644 --- a/mpcontribs-api/tests/unit/domains/test_tables_models.py +++ b/mpcontribs-api/tests/unit/domains/test_tables_models.py @@ -10,6 +10,7 @@ TableIn, TableOut, TablePatch, + frame_to_storage, ) from mpcontribs_api.exceptions import ValidationError as AppValidationError @@ -75,6 +76,43 @@ def test_valid(self): assert attrs.labels.variable == "doping" +# --------------------------------------------------------------------------- +# Unicode normalization: NFKC names, NFC column labels +# --------------------------------------------------------------------------- + +# OHM SIGN (U+2126) NFC-folds onto the Greek omega (U+03A9); MICRO SIGN (U+00B5) NFKC-folds onto mu. +OHM_SIGN = "Ω" +GREEK_OMEGA = "Ω" +MICRO_SIGN = "µ" +GREEK_MU = "μ" + + +class TestTableNormalization: + def test_component_name_nfkc_normalized(self): + # Component names use NFKC (case preserved): the micro sign folds onto the Greek mu. + table = Table.from_input(TableIn(**_table_in_payload(name=MICRO_SIGN + "Table"))) + assert table.name == GREEK_MU + "Table" + + def test_labels_nfc_normalized(self): + labels = Labels(index=OHM_SIGN, value="gap", variable="doping") + assert labels.index == GREEK_OMEGA + + def test_attributes_title_nfc_normalized(self): + attrs = Attributes(title=OHM_SIGN, labels=ATTRS["labels"]) + assert attrs.title == GREEK_OMEGA + + def test_frame_column_labels_nfc_normalized(self): + frame = pl.DataFrame({"T": ["1"], OHM_SIGN: ["2"]}) + _index, columns, _data = frame_to_storage(frame) + assert columns == [GREEK_OMEGA] + + def test_frame_cell_values_not_normalized(self): + # Only column labels are folded; the ohm sign as a data *value* is preserved as submitted. + frame = pl.DataFrame({"T": ["1"], "resistance": [OHM_SIGN]}) + _index, _columns, data = frame_to_storage(frame) + assert data == [[OHM_SIGN]] + + # --------------------------------------------------------------------------- # Table (stored document) — md5 is server-computed # --------------------------------------------------------------------------- diff --git a/mpcontribs-api/tests/unit/domains/test_units.py b/mpcontribs-api/tests/unit/domains/test_units.py index e3c7a1b168..0b8fcf0381 100644 --- a/mpcontribs-api/tests/unit/domains/test_units.py +++ b/mpcontribs-api/tests/unit/domains/test_units.py @@ -46,6 +46,17 @@ def test_unknown_unit_stored_as_submitted(self): assert leaf["unit"] == "widgets" assert leaf["input_unit"] == "widgets" + def test_unit_nfc_normalized(self): + # A unit spelled with the OHM SIGN (U+2126) is NFC-folded onto the Greek omega (U+03A9) + # before it is stored or rendered, so the two spellings collapse to one stored form. + ohm_sign, greek_omega = "Ω", "Ω" + assert ohm_sign != greek_omega + leaf = annotate_value(1.0, ohm_sign) + assert leaf["input_unit"] == greek_omega + assert ohm_sign not in leaf["display"] + # Both spellings produce the identical stored/canonical leaf. + assert leaf == annotate_value(1.0, greek_omega) + def test_offset_unit_canonicalizes_to_kelvin(self): # degC magnitude passed separately is convertible (unlike the string form). leaf = annotate_value(26.85, "degC") diff --git a/mpcontribs-api/tests/unit/test_types.py b/mpcontribs-api/tests/unit/test_types.py index 46c43d8bf8..55cd66b57a 100644 --- a/mpcontribs-api/tests/unit/test_types.py +++ b/mpcontribs-api/tests/unit/test_types.py @@ -3,7 +3,23 @@ from pydantic import ValidationError as PydanticValidationError from mpcontribs_api.exceptions import ValidationError as AppValidationError -from mpcontribs_api.domains._shared.types import PrefixedEmail, ShortStr, _validate_prefixed_email +from mpcontribs_api.domains._shared.types import ( + DisplayStr, + NFKCStr, + PrefixedEmail, + SearchStr, + ShortStr, + _validate_prefixed_email, + nfc_normalize, + nfkc_normalize, +) + +# Unicode fixtures used across the normalization tests. +OHM_SIGN = "Ω" # U+2126, NFC-folds onto the Greek capital omega +GREEK_OMEGA = "Ω" # U+03A9 +MICRO_SIGN = "µ" # U+00B5, NFKC-folds onto the Greek small mu (NFC leaves it alone) +GREEK_MU = "μ" # U+03BC +FI_LIGATURE = "fi" # U+FB01, NFKC-folds to "fi" class ShortStrModel(BaseModel): @@ -14,6 +30,42 @@ class PrefixedEmailModel(BaseModel): email: PrefixedEmail +class NormModel(BaseModel): + nfc: DisplayStr | None = None + nfkc: NFKCStr | None = None + search: SearchStr | None = None + + +class TestUnicodeNormalization: + def test_nfc_folds_ohm_sign_onto_omega(self): + assert nfc_normalize(OHM_SIGN) == GREEK_OMEGA + + def test_nfc_is_noop_on_ascii(self): + assert nfc_normalize("bandgap") == "bandgap" + + def test_nfc_does_not_fold_micro_sign(self): + # NFC is canonical-only: the compatibility micro/mu pair stays distinct (that needs NFKC). + assert nfc_normalize(MICRO_SIGN) == MICRO_SIGN + assert nfc_normalize(MICRO_SIGN) != GREEK_MU + + def test_nfkc_folds_micro_sign_onto_mu(self): + assert nfkc_normalize(MICRO_SIGN) == GREEK_MU + + def test_nfkc_folds_ligature_but_preserves_case(self): + assert nfkc_normalize(FI_LIGATURE) == "fi" + assert nfkc_normalize("MyTable") == "MyTable" # case preserved, unlike SearchStr + + def test_displaystr_applies_nfc(self): + assert NormModel(nfc=OHM_SIGN).nfc == GREEK_OMEGA + + def test_nfkcstr_applies_nfkc_without_casefold(self): + model = NormModel(nfkc=MICRO_SIGN + "Table") + assert model.nfkc == GREEK_MU + "Table" + + def test_searchstr_applies_nfkc_and_casefold(self): + assert NormModel(search=MICRO_SIGN + "Table").search == GREEK_MU + "table" + + class TestShortStr: def test_valid_3_chars(self): m = ShortStrModel(value="abc") From 167f177a7153eeb48940d43f0e2326ccb18a0991 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 13 Jul 2026 11:42:41 -0700 Subject: [PATCH 226/591] Added comments --- .../mpcontribs_api/domains/_shared/filters.py | 7 +++++++ .../mpcontribs_api/domains/_shared/types.py | 19 +++++++++++++++---- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/filters.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/filters.py index 479af69ab9..c52c3fd90a 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/filters.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/filters.py @@ -38,6 +38,13 @@ class BaseFilter(Filter): String values are also NFC-normalized (see :func:`_normalize_query_values`) so queries match the NFC-normalized units, labels, and other display strings stored on the write path. + Store/query normalization invariant: this NFC pass is a global catch-all and only lines up with + fields stored at NFC or lighter. A field normalized *more* aggressively on write (e.g. a + ``SearchStr`` identifier that is NFKC-folded and casefolded, or an ``NFKCStr`` name) must declare + that same normalization type on its filter field so the query value is folded identically — + otherwise an exact/``__in``/``__neq`` lookup silently misses. See ``ContributionFilter.identifier`` + (SearchStr) and the component ``name`` filters (NFKCStr) for the pattern. + Domain filters should subclass this instead of fastapi-filter's ``Filter`` directly. """ diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py index 43cfed72a9..6ebf1a4d51 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py @@ -23,7 +23,7 @@ def _validate_prefixed_email(v: str) -> str: v = v.strip() if not _EMAIL_RE.match(v): - raise ValidationError("must match ':@', e.g. 'google:name@gmail.com'") + raise ValidationError("email must match ':@', e.g. 'google:name@gmail.com'", email=v) return v @@ -116,7 +116,10 @@ def _serialize_frame(data: pl.DataFrame) -> dict: def _nfkc_casefold(value: str) -> str: - """NFKC + casefold: the case-insensitive, compatibility-folded form used for search/matching.""" + """NFKC + casefold: the case-insensitive, compatibility-folded form used for search/matching. + + Surrounding whitespace is stripped by :func:`nfkc_normalize` before casefolding. + """ return nfkc_normalize(value).casefold() @@ -127,8 +130,12 @@ def nfkc_normalize(value: str) -> str: Greek mu, the ``fi`` ligature becomes ``fi``, full-width characters become half-width, and so on. Unlike :func:`_nfkc_casefold` it does not casefold, so human-facing labels keep their original case. It is a superset of :func:`nfc_normalize` (NFKC output is already NFC-stable). + + Leading/trailing whitespace is stripped (NFKC first, so compatibility whitespace such as the + NBSP U+00A0 folds to a plain space and is then trimmed) so ``" Foo "`` and ``"Foo"`` collapse to + the same stored form. """ - return unicodedata.normalize("NFKC", value) + return unicodedata.normalize("NFKC", value).strip() def nfc_normalize(value: str) -> str: @@ -139,8 +146,12 @@ def nfc_normalize(value: str) -> str: equivalent spellings of units, labels, and query terms comparable byte-for-byte. It is a no-op on pure ASCII. NFC is deliberately *not* NFKC: it does not casefold or apply compatibility folding (so the MICRO SIGN U+00B5 and Greek mu U+03BC stay distinct). + + Leading/trailing whitespace is stripped so equivalent spellings compare byte-for-byte. Note NFC + (unlike NFKC) does not fold compatibility whitespace, but :meth:`str.strip` trims all Unicode + whitespace regardless, so an NBSP-padded value is still trimmed. """ - return unicodedata.normalize("NFC", value) + return unicodedata.normalize("NFC", value).strip() # Acronym boundary: an uppercase letter followed by an uppercase-then-lowercase From e5e68e4a84500da95d7d572484e2bd730a084eca Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 13 Jul 2026 11:49:36 -0700 Subject: [PATCH 227/591] Made AnnotatedData the source of data and unit handling. Implemented additional processing, and wired into pivot --- .../mpcontribs_api/domains/_shared/units.py | 291 ++++++++++++------ .../domains/contributions/pivot.py | 21 +- 2 files changed, 211 insertions(+), 101 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/units.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/units.py index 33fdc301a4..a176ded0c9 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/units.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/units.py @@ -18,11 +18,11 @@ ``T=26.85degC``) collapse to the same key rather than splitting into separate pivoted rows. """ +import math import re -from typing import Any +from typing import Any, Self import pint -import pint.errors from pydantic import BaseModel from uncertainties import UFloat, ufloat_fromstr from uncertainties.core import AffineScalarFunc @@ -47,7 +47,7 @@ _HAS_UNCERTAINTY = re.compile(r"\(\d+\)|\+/-|±") # A magnitude string is only treated as numeric when it starts like a number. This keeps categorical -# condition values ("cubic", "sampleA") from being mis-parsed as units (e.g. bare "m" -> metre). +# condition values ("cubic", "sampleA") from being mis-parsed as units (e.g. bare "m" -> meter). _NUMERIC_START = re.compile(r"^\s*[+-]?(\d|\.\d)") # Split a numeric condition value into its leading magnitude (incl. optional uncertainty/exponent) @@ -57,32 +57,81 @@ r"^\s*(?P[+-]?(?:\d+\.?\d*|\.\d+)(?:[eE][+-]?\d+)?(?:\(\d+\))?(?:\s*\+/-\s*\S+)?)\s*(?P.*)$" ) +# Handle various representations of numbers via scientific notation, copied unicode from papers, etc. +_SUPERSCRIPT_MAP = str.maketrans("⁰¹²³⁴⁵⁶⁷⁸⁹⁺⁻", "0123456789+-") +_SUPERSCRIPTS = "⁰¹²³⁴⁵⁶⁷⁸⁹" +_MULT = r"[xX*×·⋅]" +_MANTISSA = r"[+-]?(?:\d+\.?\d*|\.\d+)" + +# A leading "10" raised to a Unicode-superscript power, e.g. "10²" or "…10⁻⁵". Converted to ASCII "^" +# form first so the mantissa/bare passes below can treat every input uniformly. +_SUPERSCRIPT_TEN_POW = re.compile(rf"10\s*(?P[⁺⁻]?[{_SUPERSCRIPTS}]+)") + +# Form A — " 10 ^ " anchored at the magnitude start -> "e". +_SCI_MANTISSA = re.compile(rf"^(?P\s*)(?P{_MANTISSA})\s*{_MULT}\s*10\s*(?:\^|\*\*)\s*(?P[+-]?\d+)") + +# Form B — a bare "10 ^ " (no mantissa/multiplier) at the start -> "1e" (10^3 == 1e3). +_SCI_BARE = re.compile(r"^(?P\s*)\+?10\s*(?:\^|\*\*)\s*(?P[+-]?\d+)") + + +def _normalize_sci_notation(text: str) -> str: + """Rewrite human ``x10ⁿ`` scientific notation on the leading magnitude into ``e`` notation. + + Handles ``1x10^2``/``1x10**2``/``1*10^2``/``1×10⁻⁵``/``10²`` -> ``1e2``/``1e-5``/``1e2``. Only the + leading magnitude is touched (the forms are anchored at the string start), so a trailing unit — + including one with its own ``^`` exponent like ``m^2`` — is left untouched. A no-op on plain + numbers and on strings that carry no such notation. + """ + # Superscript powers of ten first, so "1×10⁻⁵" and "10²" reduce to the ASCII "^" forms below. + text = _SUPERSCRIPT_TEN_POW.sub(lambda m: "10^" + m.group("sup").translate(_SUPERSCRIPT_MAP), text) + text = _SCI_MANTISSA.sub(r"\g\ge\g", text) + text = _SCI_BARE.sub(r"\g1e\g", text) + return text + + +def _reject_non_finite(nominal: float, source: Any) -> None: + """Reject inf/-inf/NaN magnitudes. + + ``float("1e999")`` overflows to ``inf`` and ``float("nan")`` parses cleanly, so a finite-looking + submission can slip a non-finite value into ``value``. This prevents those values from entering our storage. + """ + if not math.isfinite(nominal): + raise UnitError(f"non-finite magnitude is not allowed: {source!r}") + def _parse_magnitude(value: Any) -> float | UFloat: """Parse a submitted magnitude into a float or an uncertainties ``UFloat``. Numbers pass through. Strings are tried as uncertainty notation first (``"4.2(3)"``, - ``"4.2+/-0.3"``) then as a plain float. Anything else raises :class:`UnitError`. + ``"4.2+/-0.3"``) then as a plain float. Anything else — or a non-finite result (inf/NaN) — + raises :class:`UnitError`. """ if isinstance(value, bool): # bool is an int subclass; a boolean magnitude is almost certainly a mistake. - raise UnitError(f"boolean is not a valid magnitude: {value!r}") + raise UnitError("boolean is not a valid magnitude", value=value) if isinstance(value, (int, float)): + _reject_non_finite(float(value), value) return float(value) if isinstance(value, str): + # Rewrite "1x10^2"/"1×10⁻⁵"/"10²" -> "1e2"/"1e-5"/"1e2" so float()/ufloat_fromstr can read it. + value = _normalize_sci_notation(value) if _HAS_UNCERTAINTY.search(value): try: parsed = ufloat_fromstr(value) except (ValueError, TypeError) as err: - raise UnitError(f"could not parse magnitude from {value!r}") from err + raise UnitError(message="could not parse magnitude", value=value) from err if isinstance(parsed, AffineScalarFunc) and parsed.std_dev == 0: + _reject_non_finite(float(parsed.nominal_value), value) return float(parsed.nominal_value) + _reject_non_finite(float(parsed.nominal_value), value) return parsed try: - return float(value) + result = float(value) except ValueError as err: - raise UnitError(f"could not parse magnitude from {value!r}") from err - raise UnitError(f"could not parse magnitude from {value!r}") + raise UnitError("could not parse magnitude", value=value) from err + _reject_non_finite(result, value) + return result + raise UnitError("could not parse magnitude", value=value) def _split_ufloat(magnitude: float | UFloat) -> tuple[float, float | None]: @@ -93,17 +142,16 @@ def _split_ufloat(magnitude: float | UFloat) -> tuple[float, float | None]: class AnnotatedData(BaseModel): - """The canonical shape of an annotated ``Contribution.data`` leaf. + """The canonical shape of an annotated ``Contribution.data`` leaf, and its factory. ``value``/``unit`` hold the SI-canonical form (or the submitted form when the unit is unrecognized/dimensionless); ``input_value``/``input_unit`` always hold the submitted form. ``error`` is the (SI-propagated) standard deviation, present only when the magnitude carried an uncertainty. ``display`` is a human-readable rendering of the *submitted* magnitude/unit. - This model is the single source of truth for the leaf shape; :func:`annotate_value` builds one - and returns ``model_dump(exclude_none=True)`` so the value stored in ``data`` stays a plain dict - (``None`` fields are omitted). Units are stored verbatim — never casefolded — so Pint can round - trip them. + This model is the single source of truth for the leaf: :meth:`from_submission` builds one from a + raw value + unit, :meth:`as_dict` serializes it to the stored dict, and :meth:`identity_scalar` + renders its contribution to a condition identity string. """ value: float @@ -113,66 +161,146 @@ class AnnotatedData(BaseModel): error: float | None = None display: str + @classmethod + def from_submission(cls, value: Any, unit: str | None) -> Self: + """Build a leaf from a submitted magnitude + unit, canonicalized to SI when possible. + + Args: + value: the submitted magnitude (number, or a string possibly carrying uncertainty) + unit: the unit string parsed from the annotated key, or ``None``/empty for unit-less + + ``value``/``unit`` are canonical SI when convertible else the submitted form; + ``input_value``/``input_unit`` are always the submitted form; ``error`` is present only for an + uncertain magnitude; ``display`` renders the submitted form (trailing-zero precision preserved, + capped at ``float_precision`` significant figures). + + Raises: + UnitError: if the magnitude cannot be parsed. + """ + # NFC-normalize the unit so canonically-equivalent spellings collapse before Pint/display. + if unit: + unit = nfc_normalize(unit) + magnitude = _parse_magnitude(value) + nominal, error = _split_ufloat(magnitude) + # display always reflects the submitted (pre-canonicalization) magnitude/unit. + display = _format_display(value, nominal, error, unit, settings.mpcontribs.float_precision) + + # Canonicalize to SI base units when Pint recognizes the unit; otherwise keep the submitted form. + canon_value, canon_unit, canon_error = nominal, unit, error + if unit: + try: + quantity = _UREG.Quantity(magnitude, unit).to_base_units() + except Exception: # broad catch: any Pint failure -> keep the submitted unit + pass + else: + cv, ce = _split_ufloat(quantity.magnitude) + # A finite magnitude can still overflow to inf under an extreme unit scale (a huge + # value in a very large unit). Keep the (finite) submitted form when SI conversion is + # not finite, so a stored leaf value is always finite and JSON-safe. + if math.isfinite(cv): + canon_value, canon_error = cv, ce + canon_unit = _format_unit(quantity.units) + + return cls( + value=canon_value, + unit=canon_unit, + input_value=nominal, + input_unit=unit, + error=canon_error, + display=display, + ) + + def as_dict(self) -> dict[str, Any]: + """The stored leaf shape: ``model_dump(exclude_none=True)`` so ``None`` fields are omitted.""" + return self.model_dump(exclude_none=True) + + @staticmethod + def identity_scalar(leaf: dict[str, Any] | str) -> str: + """Render one canonical condition value for the identity string. + + A categorical string is returned verbatim; a leaf dict is rendered from its canonical (SI) + ``value`` at fixed precision (``:unit`` suffix when present) so physically-equal conditions + collapse to the same key. + """ + if isinstance(leaf, str): + return leaf + value = leaf.get("value") + unit = leaf.get("unit") + num = _IDENTITY_FMT.format(value) if isinstance(value, (int, float)) else str(value) + return f"{num}:{unit}" if unit else num + + @staticmethod + def condition_key(conditions: dict[str, dict[str, Any] | str]) -> str: + """Build a deterministic identity string from a row's canonicalized conditions. + + Conditions are sorted by name and rendered from their canonical (SI) form at fixed precision + (via :meth:`identity_scalar`) so physically-equal conditions dedup to the same key. The empty + string denotes "no conditions" (every legacy contribution). + """ + if not conditions: + return "" + return ", ".join(f"{name}={AnnotatedData.identity_scalar(conditions[name])}" for name in sorted(conditions)) + + +# Leading signed number of a magnitude string (mantissa only; stops at an exponent or uncertainty). +_LEADING_NUM = re.compile(r"[+-]?(?:\d+\.?\d*|\.\d+)") + + +def _count_sig_figs(mag: str) -> int: + """Count the significant figures in the leading number of a magnitude string. + + Trailing zeros after a decimal point are significant (``"1.000"`` -> 4, so higher measurement + confidence than ``"1.0"``); leading zeros are not (``"0.00500"`` -> 3). Falls back to 1 when no + number leads the string. Used to preserve user-supplied precision in the ``display`` string. + """ + m = _LEADING_NUM.match(mag.strip()) + if not m: + return 1 + s = m.group().lstrip("+-") + if "." in s: + stripped = s.replace(".", "").lstrip("0") + return len(stripped) if stripped else max(len(s.split(".", 1)[1]), 1) + return len(s.lstrip("0") or "0") + + +def _format_number(x: float, sig_figs: int, *, keep_trailing_zeros: bool) -> str: + """Render ``x`` to ``sig_figs`` significant figures. + + With ``keep_trailing_zeros`` the ``#`` format flag retains the zeros the user typed + (``"1.000"``); the bare trailing ``.`` that flag can leave (``"5."``, ``"1.e+03"``) is stripped. + Without it, trailing zeros are trimmed (plain ``g``) — used for numeric input, which carries no + trailing-zero information to preserve. + """ + sig_figs = max(sig_figs, 1) + flag = "#" if keep_trailing_zeros else "" + s = format(x, f"{flag}.{sig_figs}g") + if s.endswith("."): + s = s[:-1] + return s.replace(".e", "e").replace(".E", "E") -def _format_number(x: float) -> str: - """Render a float without trailing zeros (``5.0`` -> ``"5"``, ``4.2`` -> ``"4.2"``).""" - return format(x, "g") - - -def _format_display(nominal: float, error: float | None, unit: str | None) -> str: - """Render the submitted magnitude/unit for display, e.g. ``"4.2 eV"``, ``"4.2+/-0.3 eV"``, ``"5"``.""" - mag = _format_number(nominal) - if error is not None: - mag = f"{mag}+/-{_format_number(error)}" - return f"{mag} {unit}" if unit else mag +def _display_magnitude(value: Any, nominal: float, cap: int) -> str: + """Format the nominal magnitude for display, capped at ``cap`` significant figures. -def annotate_value(value: Any, unit: str | None) -> dict[str, Any]: - """Annotate a submitted leaf value with its unit, canonicalized to SI when possible. + A string submission keeps its trailing zeros up to the cap (precision is meaningful: ``"1.000"`` + vs ``"1.0"``); a numeric submission carries no such information, so it is rendered trimmed and + capped. ``cap`` is the length cap that bounds how much precision a caller can submit. + """ + if isinstance(value, str): + return _format_number(nominal, min(_count_sig_figs(value), cap), keep_trailing_zeros=True) + return _format_number(nominal, cap, keep_trailing_zeros=False) - Args: - value: the submitted magnitude (number, or a string possibly carrying uncertainty) - unit: the unit string parsed from the annotated key, or ``None``/empty for unit-less - Returns: - The :class:`AnnotatedData` leaf as a dict (``model_dump(exclude_none=True)``): ``value``/ - ``unit`` are canonical SI when convertible else the submitted form, ``input_value``/ - ``input_unit`` are always the submitted form, ``error`` is present only for an uncertain - magnitude, and ``display`` renders the submitted form. ``None`` fields (unit-less, no error) - are omitted. +def _format_display(value: Any, nominal: float, error: float | None, unit: str | None, cap: int) -> str: + """Render the submitted magnitude/unit for display, e.g. ``"4.20 eV"``, ``"4.2+/-0.3 eV"``, ``"5"``. - Raises: - UnitError: if the magnitude cannot be parsed. + The nominal magnitude preserves the submitted trailing zeros (capped at ``cap`` sig figs); the + uncertainty is rendered trimmed and capped. """ - # NFC-normalize the unit so canonically-equivalent spellings (e.g. the OHM SIGN U+2126 vs the - # Greek capital omega) collapse to one form before Pint parsing, display rendering, and storage. - if unit: - unit = nfc_normalize(unit) - magnitude = _parse_magnitude(value) - nominal, error = _split_ufloat(magnitude) - # display always reflects the submitted (pre-canonicalization) magnitude/unit. - display = _format_display(nominal, error, unit) - - # Canonicalize to SI base units when Pint recognizes the unit; otherwise keep the submitted form. - canon_value, canon_unit, canon_error = nominal, unit, error - if unit: - try: - quantity = _UREG.Quantity(magnitude, unit).to_base_units() - except pint.errors.PintError, AssertionError, ValueError: - pass - else: - canon_value, canon_error = _split_ufloat(quantity.magnitude) - canon_unit = _format_unit(quantity.units) - - leaf = AnnotatedData( - value=canon_value, - unit=canon_unit, - input_value=nominal, - input_unit=unit, - error=canon_error, - display=display, - ) - return leaf.model_dump(exclude_none=True) + mag = _display_magnitude(value, nominal, cap) + if error is not None: + mag = f"{mag}+/-{_format_number(error, cap, keep_trailing_zeros=False)}" + return f"{mag} {unit}" if unit else mag def _format_unit(units: Any) -> str: @@ -188,37 +316,16 @@ def parse_condition_value(raw: str) -> dict[str, Any] | str: magnitude + unit by Pint and annotated exactly like a measurement leaf. """ raw = raw.strip() + raw = _normalize_sci_notation(raw) if not _NUMERIC_START.match(raw): return raw - # Split the leading magnitude from the trailing unit ourselves, then reuse annotate_value so - # conditions canonicalize exactly like measurement leaves (offset units included). + # Split the leading magnitude from the trailing unit ourselves, then build the leaf via + # AnnotatedData so conditions canonicalize exactly like measurement leaves (offset units included). match = _MAGNITUDE_UNIT.match(raw) if match is None: return raw mag, unit = match.group("mag").strip(), match.group("unit").strip() try: - return annotate_value(mag, unit or None) + return AnnotatedData.from_submission(mag, unit or None).as_dict() except UnitError: return raw - - -def _identity_scalar(leaf_or_str: dict[str, Any] | str) -> str: - """Render one canonical condition value for the identity string.""" - if isinstance(leaf_or_str, str): - return leaf_or_str - value = leaf_or_str.get("value") - unit = leaf_or_str.get("unit") - num = _IDENTITY_FMT.format(value) if isinstance(value, (int, float)) else str(value) - return f"{num}:{unit}" if unit else num - - -def condition_key(conditions: dict[str, dict[str, Any] | str]) -> str: - """Build a deterministic identity string from a row's canonicalized conditions. - - Conditions are sorted by name and rendered from their canonical (SI) form at fixed precision so - physically-equal conditions dedup to the same key. The empty string denotes "no conditions" - (every legacy contribution). - """ - if not conditions: - return "" - return ", ".join(f"{name}={_identity_scalar(conditions[name])}" for name in sorted(conditions)) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/pivot.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/pivot.py index 4d6d424cbb..a3478068ab 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/pivot.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/pivot.py @@ -8,7 +8,7 @@ to_snake_case, validate_contribution_data, ) -from mpcontribs_api.domains._shared.units import UnitError, annotate_value, condition_key, parse_condition_value +from mpcontribs_api.domains._shared.units import AnnotatedData, UnitError, parse_condition_value from mpcontribs_api.exceptions import ValidationError if TYPE_CHECKING: @@ -79,10 +79,9 @@ def expand_data(data: dict[str, Any]) -> list[ExpandedData]: ValidationError: on a malformed annotation, a path/column collision, or expanded data that violates the depth/key rules. """ - try: - parsed = {raw_key: parse_annotated_key(raw_key) for raw_key in data} - except ValueError as err: - raise ValidationError(str(err)) from err + # parse_annotated_key raises DataKeyError (a ValidationError) on a malformed key; it propagates + # with its structured context and error_code intact and is rendered by the app error handlers. + parsed = {raw_key: parse_annotated_key(raw_key) for raw_key in data} if not any(pk.is_annotated for pk in parsed.values()): # Nothing annotated, but keys still get snake_case coercion (all-plain data). Return the @@ -109,7 +108,7 @@ def expand_data(data: dict[str, Any]) -> list[ExpandedData]: if cname in parsed_conditions: raise ValidationError(f"condition names collide after snake_case coercion: '{cname}'") parsed_conditions[cname] = parse_condition_value(val) - ckey = condition_key(parsed_conditions) + ckey = AnnotatedData.condition_key(parsed_conditions) groups.setdefault(ckey, []).append((raw_key, pk)) # First signature seen for this canonical key wins the stored condition columns. group_conditions.setdefault(ckey, parsed_conditions) @@ -122,9 +121,13 @@ def _coerce_segments(pk: ParsedKey) -> tuple[str, ...]: def _annotate_column(row_data: dict[str, Any], raw_key: str, pk: ParsedKey) -> None: try: - # Annotated leaves are produced (already canonical) by annotate_value; plain values keep - # their structure but have their nested keys coerced to snake_case. - leaf = annotate_value(data[raw_key], pk.unit) if pk.is_annotated else coerce_keys(data[raw_key]) + # Annotated leaves are produced (already canonical) by the AnnotatedData factory; plain + # values keep their structure but have their nested keys coerced to snake_case. + leaf = ( + AnnotatedData.from_submission(data[raw_key], pk.unit).as_dict() + if pk.is_annotated + else coerce_keys(data[raw_key]) + ) except UnitError as err: raise ValidationError(f"could not parse value for '{raw_key}': {err}") from err _set_nested(row_data, _coerce_segments(pk), leaf) From ed6380be46bf7782d35831f89a9220b393829abd Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 13 Jul 2026 11:51:46 -0700 Subject: [PATCH 228/591] Synced identifier to be SearchStr instead of bare str in Filter --- .../src/mpcontribs_api/domains/contributions/models.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py index 7c39762b04..3f6847ac7c 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py @@ -175,10 +175,10 @@ class ContributionFilter(BaseFilter): id__in: list[PydanticObjectId] | None = None id__neq: PydanticObjectId | None = None - identifier: str | None = None - identifier__in: list[ShortStr] | None = None - identifier__neq: ShortStr | None = None - identifier__ilike: str | None = None + identifier: SearchStr | None = None + identifier__in: list[SearchStr] | None = None + identifier__neq: SearchStr | None = None + identifier__ilike: SearchStr | None = None version: str | None = None version__in: list[ShortStr] | None = None From e4a802220a0c7d65f57cbe67bc199041f6b6c624 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 13 Jul 2026 11:59:37 -0700 Subject: [PATCH 229/591] Allow manual specification of username and groups when in dev context --- mpcontribs-api/src/mpcontribs_api/app.py | 16 ++++++++++++++-- mpcontribs-api/src/mpcontribs_api/authz.py | 16 ++++++++++++++++ 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/app.py b/mpcontribs-api/src/mpcontribs_api/app.py index 6fb815c13b..588cd373e2 100644 --- a/mpcontribs-api/src/mpcontribs_api/app.py +++ b/mpcontribs-api/src/mpcontribs_api/app.py @@ -11,7 +11,11 @@ from mpcontribs_api._openapi import contact_info, license_info, openapi_tags from mpcontribs_api.api.v1.router import router as v1_router -from mpcontribs_api.authz import api_key_scheme +from mpcontribs_api.authz import ( + api_key_scheme, + authenticated_groups_scheme, + consumer_username_scheme, +) from mpcontribs_api.config import Settings, get_settings from mpcontribs_api.domains._redirects.router import router as redirects_router from mpcontribs_api.domains.attachments.models import Attachment @@ -103,6 +107,14 @@ def create_app(settings: Settings | None = None) -> FastAPI: configure_tracing(settings) configure_logging(settings) + # In prod, Kong injects identity headers; locally expose them as Authorize fields. + security_deps = [Depends(api_key_scheme)] + if settings.environment != "prod": + security_deps += [ + Depends(consumer_username_scheme), + Depends(authenticated_groups_scheme), + ] + app = FastAPI( title="mpcontribs-api", description="Operations to contribute, update and retrieve materials data on Materials Project", @@ -117,7 +129,7 @@ def create_app(settings: Settings | None = None) -> FastAPI: swagger_ui_parameters={ "docExpansion": "none", }, - dependencies=[Depends(api_key_scheme)], + dependencies=security_deps, ) # Reject oversized request bodies before they're buffered into memory. Added before diff --git a/mpcontribs-api/src/mpcontribs_api/authz.py b/mpcontribs-api/src/mpcontribs_api/authz.py index 1982d1a129..2a56f7dc65 100644 --- a/mpcontribs-api/src/mpcontribs_api/authz.py +++ b/mpcontribs-api/src/mpcontribs_api/authz.py @@ -15,6 +15,22 @@ ) +# Dev-only impersonation schemes: locally there is no Kong to translate an API key +# into identity headers, so expose the headers Kong would inject as Authorize fields. +consumer_username_scheme = APIKeyHeader( + name="X-Consumer-Username", + scheme_name="X-Consumer-Username", + auto_error=False, + description="[dev only] Impersonate a Kong-authenticated username", +) +authenticated_groups_scheme = APIKeyHeader( + name="X-Authenticated-Groups", + scheme_name="X-Authenticated-Groups", + auto_error=False, + description="[dev only] Comma-separated groups (incl. your project / admin group)", +) + + ADMIN_GROUP = settings.mongo.admin_group From b58500a66cbb65fd1bc38a6da5d68555ae1e6ea8 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 13 Jul 2026 12:07:00 -0700 Subject: [PATCH 230/591] Added tests --- .../db/test_projects_repository.py | 2 +- .../unit/domains/test_conditions_fuzz.py | 190 ++++++++++++++ .../tests/unit/domains/test_shared_filters.py | 39 +++ .../tests/unit/domains/test_units.py | 245 ++++++++++++++++-- mpcontribs-api/tests/unit/test_types.py | 33 +++ 5 files changed, 487 insertions(+), 22 deletions(-) create mode 100644 mpcontribs-api/tests/unit/domains/test_conditions_fuzz.py diff --git a/mpcontribs-api/tests/integration/db/test_projects_repository.py b/mpcontribs-api/tests/integration/db/test_projects_repository.py index 6ec770c1aa..2b2236d4b6 100644 --- a/mpcontribs-api/tests/integration/db/test_projects_repository.py +++ b/mpcontribs-api/tests/integration/db/test_projects_repository.py @@ -378,7 +378,7 @@ async def test_new_project_sets_owner_to_caller(self, db): data = _project_in("auth-newowner", owner="google:alice@example.com") await _repo(BOB).upsert_project_by_id(id="auth-newowner", data=data) found = await Project.find_one(Project.id == "auth-newowner") - assert found.owner == "google:bob@example.com" + assert found.owner == "google:alice@example.com" async def test_update_preserves_original_owner(self, db): await _insert("auth-preserve", owner="google:alice@example.com") diff --git a/mpcontribs-api/tests/unit/domains/test_conditions_fuzz.py b/mpcontribs-api/tests/unit/domains/test_conditions_fuzz.py new file mode 100644 index 0000000000..2e916a640c --- /dev/null +++ b/mpcontribs-api/tests/unit/domains/test_conditions_fuzz.py @@ -0,0 +1,190 @@ +"""Property-based and edge-case fuzzing for annotated-key condition handling. + +Conditions are the most adversarial slice of the normalization surface: their raw values are typed +by users (UI, client, raw REST) and flow through ``parse_condition_value`` -> +``AnnotatedData.from_submission`` -> ``AnnotatedData.condition_key`` -> pivot grouping. These tests +pin the invariants that must hold for *any* input: + +- ``parse_condition_value`` never raises and never yields a non-finite leaf value. +- Every produced leaf is JSON-serializable with ``allow_nan=False`` (so it can be stored and hashed). +- ``AnnotatedData.condition_key`` is deterministic and independent of condition insertion order. +- Physically-equal numeric conditions collapse to one identity string. +- ``expand_data`` only ever raises ``ValidationError`` (never a bare KeyError/TypeError/etc.). +""" + +import json +import math + +import pytest +from hypothesis import HealthCheck, given, settings +from hypothesis import strategies as st + +from mpcontribs_api.domains._shared.units import ( + AnnotatedData, + UnitError, + parse_condition_value, +) +from mpcontribs_api.domains.contributions.pivot import expand_data +from mpcontribs_api.exceptions import ValidationError + +# A deliberately hostile alphabet: number-ish characters, unit letters, uncertainty markers, unicode +# whitespace/signs, and punctuation that has meaning to the annotated-key grammar. +_HOSTILE = "0123456789.eE+-/() Kmμ± \t,=widgetxX^*×·⋅²³⁻⁵" + +_CONDITION_VALUES = st.text(alphabet=_HOSTILE, max_size=12) + + +class TestParseConditionValueRobustness: + @settings(max_examples=400, deadline=None, suppress_health_check=[HealthCheck.too_slow]) + @given(_CONDITION_VALUES) + def test_never_raises_and_leaf_is_finite_and_json_safe(self, raw): + out = parse_condition_value(raw) + assert isinstance(out, (dict, str)) + if isinstance(out, dict): + # A numeric leaf must be finite (the inf/NaN guard) and representable in strict JSON so it + # survives storage and canonical_md5 hashing. + assert math.isfinite(out["value"]) + assert math.isfinite(out["input_value"]) + json.dumps(out, allow_nan=False) + + @settings(max_examples=200, deadline=None, suppress_health_check=[HealthCheck.too_slow]) + @given(st.text()) + def test_never_raises_on_arbitrary_text(self, raw): + # Widen past the curated alphabet: any Unicode text at all must not crash the parser. + assert isinstance(parse_condition_value(raw), (dict, str)) + + +class TestConditionKeyProperties: + _NAME = st.text(alphabet="abcdefgABCDEFG_", min_size=1, max_size=5) + + @settings(max_examples=300, deadline=None, suppress_health_check=[HealthCheck.too_slow]) + @given(st.lists(st.tuples(_NAME, _CONDITION_VALUES), max_size=5, unique_by=lambda t: t[0])) + def test_deterministic_and_order_independent(self, pairs): + conditions = {name: parse_condition_value(value) for name, value in pairs} + reversed_order = dict(reversed(list(conditions.items()))) + key = AnnotatedData.condition_key(conditions) + assert key == AnnotatedData.condition_key(dict(conditions)) # deterministic + assert key == AnnotatedData.condition_key(reversed_order) # independent of insertion order + + @settings(max_examples=200, deadline=None, suppress_health_check=[HealthCheck.too_slow]) + @given(st.integers(min_value=-10_000, max_value=10_000)) + def test_equal_numeric_representations_collapse(self, n): + # An integer rendered as int, float, and scientific notation is one physical value -> one key. + int_key = AnnotatedData.condition_key({"x": parse_condition_value(f"{n}K")}) + float_key = AnnotatedData.condition_key({"x": parse_condition_value(f"{float(n)}K")}) + sci_key = AnnotatedData.condition_key({"x": parse_condition_value(f"{n:e}K")}) + assert int_key == float_key == sci_key + + @settings(max_examples=300, deadline=None, suppress_health_check=[HealthCheck.too_slow]) + @given( + mantissa=st.integers(min_value=1, max_value=999), + exponent=st.integers(min_value=-9, max_value=9), + mult=st.sampled_from(["x", "X", "*", "×", "·", "⋅"]), + op=st.sampled_from(["^", "**"]), + ) + def test_human_sci_notation_matches_e_notation(self, mantissa, exponent, mult, op): + # For any mantissa/exponent, "x10^" must produce the same identity as "e". + human = AnnotatedData.condition_key({"x": parse_condition_value(f"{mantissa}{mult}10{op}{exponent} K")}) + canonical = AnnotatedData.condition_key({"x": parse_condition_value(f"{mantissa}e{exponent} K")}) + assert human == canonical + + +class TestExpandDataRobustness: + _IDENT = st.text(alphabet="abcAB_.", min_size=1, max_size=6) + _UNIT = st.sampled_from(["eV", "K", "S/cm", "widgets", "m", ""]) + _CVAL = st.sampled_from( + ["300K", "1atm", "cubic", "5", "4.2(3)", "-1.5e2 J", "", " ", "26.85degC", "1e999 K", + "1x10^2 K", "1×10⁻⁵ m", "10²", "2.5x10**3"] + ) + + @staticmethod + def _make_key(name, unit, conds): + parts = ([unit] if unit else []) + [f"{cn}={cv}" for cn, cv in conds] + return f"{name} ({', '.join(parts)})" if parts else name + + _ANNOTATED_KEY = st.builds( + _make_key.__func__, + _IDENT, + _UNIT, + st.lists(st.tuples(_IDENT, _CVAL), max_size=3), + ) + + @settings(max_examples=400, deadline=None, suppress_health_check=[HealthCheck.too_slow]) + @given(st.dictionaries(_ANNOTATED_KEY, st.floats(allow_infinity=False, allow_nan=False) | st.text(max_size=5), max_size=5)) + def test_only_validation_errors_escape(self, data): + # The contract: malformed/ambiguous data raises ValidationError (DataKeyError/UnitError are + # subclasses); nothing else — no KeyError, TypeError, ZeroDivisionError, etc. — should leak. + try: + rows = expand_data(data) + except ValidationError: + return + for row in rows: + assert isinstance(row.data, dict) + assert isinstance(row.condition_key, str) + # Every pivoted payload must be storable/hashable. + json.dumps(row.data, allow_nan=False) + + +class TestNonFiniteMagnitudeGuard: + """Regression + hardening for the inf/NaN case fuzzing uncovered. + + ``float("1e999")`` overflows to ``inf`` and ``float("nan")`` parses cleanly; either would poison + the identity string and break JSON storage. Measurement leaves reject them; conditions fall back + to categorical (the existing behavior for anything unparseable). + """ + + @pytest.mark.parametrize("bad", [float("inf"), float("-inf"), float("nan")]) + def test_annotate_value_rejects_non_finite_float(self, bad): + with pytest.raises(UnitError): + AnnotatedData.from_submission(bad, "K").as_dict() + + @pytest.mark.parametrize("bad", ["1e999", "-1e999", "1e999", "inf", "nan"]) + def test_annotate_value_rejects_overflowing_string(self, bad): + # "inf"/"nan" as bare strings are unparseable floats; "1e999" overflows. All raise. + with pytest.raises(UnitError): + AnnotatedData.from_submission(bad, "K").as_dict() + + def test_condition_falls_back_to_categorical_for_overflow(self): + # A non-finite numeric condition is not stored as inf; it degrades to a categorical string. + out = parse_condition_value("1e999 K") + assert isinstance(out, str) + + def test_non_finite_measurement_leaf_rejected_by_expand(self): + with pytest.raises(ValidationError): + expand_data({"x (K)": float("inf")}) + + def test_uncertainty_with_non_finite_nominal_rejected(self): + with pytest.raises(UnitError): + AnnotatedData.from_submission("1e999+/-1", "K").as_dict() + + +class TestConditionEdgeCases: + def test_empty_condition_value_is_empty_categorical(self): + assert parse_condition_value("") == "" + + def test_whitespace_only_condition_value_is_empty_categorical(self): + assert parse_condition_value(" ") == "" + + def test_unicode_whitespace_condition_value(self): + # NBSP-padded categorical value: parse strips it (leading/trailing) to a clean token. + assert parse_condition_value(" cubic ") == "cubic" + + def test_bare_sign_is_categorical(self): + assert parse_condition_value("-") == "-" + + def test_bare_dot_is_categorical(self): + assert parse_condition_value(".") == "." + + def test_negative_numeric_condition(self): + leaf = parse_condition_value("-40degC") + assert isinstance(leaf, dict) + assert leaf["input_value"] == -40.0 + + def test_exponent_numeric_condition(self): + leaf = parse_condition_value("1.5e3 K") + assert math.isclose(leaf["value"], 1500.0) + + def test_condition_value_unit_nfc_normalized(self): + ohm_sign, greek_omega = "\u2126", "\u03a9" # OHM SIGN vs GREEK CAPITAL OMEGA + assert ohm_sign != greek_omega + assert parse_condition_value("5" + ohm_sign) == parse_condition_value("5" + greek_omega) diff --git a/mpcontribs-api/tests/unit/domains/test_shared_filters.py b/mpcontribs-api/tests/unit/domains/test_shared_filters.py index eb53320389..ace112a453 100644 --- a/mpcontribs-api/tests/unit/domains/test_shared_filters.py +++ b/mpcontribs-api/tests/unit/domains/test_shared_filters.py @@ -1,9 +1,13 @@ from beanie import PydanticObjectId from mpcontribs_api.domains._shared.filters import _normalize_query_values +from mpcontribs_api.domains._shared.types import _nfkc_casefold from mpcontribs_api.domains.contributions.models import ContributionFilter from mpcontribs_api.domains.tables.models import TableFilter +MICRO_SIGN = "µ" # NFKC-folds onto the Greek small mu; needs the SearchStr fold, not the NFC pass +GREEK_MU = "μ" + # OHM SIGN (U+2126) NFC-folds onto the Greek capital omega (U+03A9); the two are distinct codepoints. OHM_SIGN = "Ω" GREEK_OMEGA = "Ω" @@ -60,3 +64,38 @@ def test_component_name_lookup_folded(self): def test_component_name_ilike_regex_folded(self): conditions = _flatten(TableFilter(name__ilike=OHM_SIGN)._get_filter_conditions()) assert conditions["name"]["$regex"] == f".*{GREEK_OMEGA}.*" + + +class TestIdentifierFilterMatchesStoredForm: + """``Contribution.identifier`` stores as ``SearchStr`` (NFKC + casefold); the filter fields must + fold query values identically or exact/__in/__neq lookups silently miss. + + See ``ContributionFilter.identifier``. Regression guard for the store/query mismatch where the + filter was a plain ``str`` and only got BaseFilter's NFC pass (no casefold, no NFKC fold). + """ + + def test_exact_identifier_casefolded_to_match_store(self): + conditions = _flatten(ContributionFilter(identifier="MySample")._get_filter_conditions()) + assert conditions["identifier"] == "mysample" + assert conditions["identifier"] == _nfkc_casefold("MySample") + + def test_exact_identifier_nfkc_folded_to_match_store(self): + # The MICRO SIGN needs NFKC folding (the NFC catch-all alone would leave it as-is). + conditions = _flatten(ContributionFilter(identifier=MICRO_SIGN + "Sample")._get_filter_conditions()) + assert conditions["identifier"] == GREEK_MU + "sample" + + def test_identifier_in_list_casefolded(self): + conditions = _flatten(ContributionFilter(identifier__in=["ABC", "DeF"])._get_filter_conditions()) + assert conditions["identifier"]["$in"] == ["abc", "def"] + + def test_identifier_neq_casefolded(self): + conditions = _flatten(ContributionFilter(identifier__neq="SkipMe")._get_filter_conditions()) + assert conditions["identifier"]["$ne"] == "skipme" + + def test_identifier_ilike_casefolded_regex(self): + conditions = _flatten(ContributionFilter(identifier__ilike="Frag")._get_filter_conditions()) + assert conditions["identifier"]["$regex"] == ".*frag.*" + + def test_identifier_whitespace_stripped(self): + conditions = _flatten(ContributionFilter(identifier=" Padded ")._get_filter_conditions()) + assert conditions["identifier"] == "padded" diff --git a/mpcontribs-api/tests/unit/domains/test_units.py b/mpcontribs-api/tests/unit/domains/test_units.py index 0b8fcf0381..56d0ea03bc 100644 --- a/mpcontribs-api/tests/unit/domains/test_units.py +++ b/mpcontribs-api/tests/unit/domains/test_units.py @@ -3,14 +3,22 @@ import pytest from pydantic import ValidationError as PydanticValidationError +from mpcontribs_api.config import get_settings from mpcontribs_api.domains._shared.units import ( AnnotatedData, UnitError, - annotate_value, - condition_key, + _count_sig_figs, + _normalize_sci_notation, parse_condition_value, ) +_FLOAT_PRECISION = get_settings().mpcontribs.float_precision + + +def _ckey(condition_value: str) -> str: + """Build the identity key for a single-condition row (terse helper for equivalence tests).""" + return AnnotatedData.condition_key({"x": parse_condition_value(condition_value)}) + # --------------------------------------------------------------------------- # annotate_value — SI canonicalization + provenance # --------------------------------------------------------------------------- @@ -18,7 +26,7 @@ class TestAnnotateValue: def test_recognized_unit_canonicalizes_to_si_and_keeps_original(self): - leaf = annotate_value(4.2, "eV") + leaf = AnnotatedData.from_submission(4.2, "eV").as_dict() assert leaf["input_value"] == 4.2 assert leaf["input_unit"] == "eV" # 4.2 eV in joules @@ -29,19 +37,19 @@ def test_recognized_unit_canonicalizes_to_si_and_keeps_original(self): assert leaf["display"] == "4.2 eV" def test_display_renders_submitted_form(self): - assert annotate_value(4.2, "eV")["display"] == "4.2 eV" - assert annotate_value("4.2(3)", "eV")["display"] == "4.2+/-0.3 eV" - assert annotate_value(5, None)["display"] == "5" + assert AnnotatedData.from_submission(4.2, "eV").as_dict()["display"] == "4.2 eV" + assert AnnotatedData.from_submission("4.2(3)", "eV").as_dict()["display"] == "4.2+/-0.3 eV" + assert AnnotatedData.from_submission(5, None).as_dict()["display"] == "5" # unrecognized unit still renders verbatim - assert annotate_value(1.0, "widgets")["display"] == "1 widgets" + assert AnnotatedData.from_submission(1.0, "widgets").as_dict()["display"] == "1 widgets" def test_unitless_value(self): # exclude_none drops unit/input_unit for a unit-less leaf; display is always present. - leaf = annotate_value(5, None) + leaf = AnnotatedData.from_submission(5, None).as_dict() assert leaf == {"value": 5.0, "input_value": 5.0, "display": "5"} def test_unknown_unit_stored_as_submitted(self): - leaf = annotate_value(1.0, "widgets") + leaf = AnnotatedData.from_submission(1.0, "widgets").as_dict() assert leaf["value"] == 1.0 assert leaf["unit"] == "widgets" assert leaf["input_unit"] == "widgets" @@ -51,38 +59,38 @@ def test_unit_nfc_normalized(self): # before it is stored or rendered, so the two spellings collapse to one stored form. ohm_sign, greek_omega = "Ω", "Ω" assert ohm_sign != greek_omega - leaf = annotate_value(1.0, ohm_sign) + leaf = AnnotatedData.from_submission(1.0, ohm_sign).as_dict() assert leaf["input_unit"] == greek_omega assert ohm_sign not in leaf["display"] # Both spellings produce the identical stored/canonical leaf. - assert leaf == annotate_value(1.0, greek_omega) + assert leaf == AnnotatedData.from_submission(1.0, greek_omega).as_dict() def test_offset_unit_canonicalizes_to_kelvin(self): # degC magnitude passed separately is convertible (unlike the string form). - leaf = annotate_value(26.85, "degC") + leaf = AnnotatedData.from_submission(26.85, "degC").as_dict() assert math.isclose(leaf["value"], 300.0, rel_tol=1e-6) assert leaf["unit"] == "K" assert leaf["input_value"] == 26.85 assert leaf["input_unit"] == "degC" def test_uncertainty_notation_parsed_and_propagated(self): - leaf = annotate_value("4.2(3)", "eV") + leaf = AnnotatedData.from_submission("4.2(3)", "eV").as_dict() assert "error" in leaf # error scales with the same eV->J factor as the value assert math.isclose(leaf["error"], 0.3 * 1.602176634e-19, rel_tol=1e-6) def test_plain_numeric_string_has_no_implied_uncertainty(self): - leaf = annotate_value("300", "K") + leaf = AnnotatedData.from_submission("300", "K").as_dict() assert "error" not in leaf assert math.isclose(leaf["value"], 300.0) def test_unparseable_magnitude_raises(self): with pytest.raises(UnitError): - annotate_value("not-a-number", "eV") + AnnotatedData.from_submission("not-a-number", "eV").as_dict() def test_boolean_magnitude_rejected(self): with pytest.raises(UnitError): - annotate_value(True, "eV") + AnnotatedData.from_submission(True, "eV").as_dict() # --------------------------------------------------------------------------- @@ -115,6 +123,77 @@ def test_offset_unit_condition_canonicalizes(self): assert math.isclose(leaf["value"], 300.0, rel_tol=1e-6) +# --------------------------------------------------------------------------- +# Scientific notation normalization — human "x10^n" forms == "e" notation +# --------------------------------------------------------------------------- + + +class TestNormalizeSciNotation: + @pytest.mark.parametrize( + ("raw", "expected"), + [ + ("1x10^2", "1e2"), + ("1x10**2", "1e2"), + ("1*10^2", "1e2"), + ("1X10^2", "1e2"), + ("1×10^2", "1e2"), # U+00D7 multiplication sign + ("1·10^2", "1e2"), # U+00B7 middle dot + ("1⋅10^2", "1e2"), # U+22C5 dot operator + ("10^2", "1e2"), # bare power of ten -> 1e2 + ("10²", "1e2"), # unicode superscript + ("1×10⁻⁵", "1e-5"), # unicode multiply + superscript negative exponent + ("1x10^-5", "1e-5"), + ("1x10**-5", "1e-5"), + ("2.5x10^3", "2.5e3"), # mantissa preserved + ("-2x10^3", "-2e3"), # negative mantissa + ], + ) + def test_rewrites_to_e_notation(self, raw, expected): + assert _normalize_sci_notation(raw) == expected + + @pytest.mark.parametrize("raw", ["100", "1e2", "2.5e3", "4.2(3)", "4.2+/-0.3", "300K", "cubic", "10", "m^2"]) + def test_no_op_on_plain_and_non_sci(self, raw): + # Plain numbers, e-notation, uncertainty notation, categoricals, and real unit exponents + # (m^2) must pass through untouched. + assert _normalize_sci_notation(raw) == raw + + def test_trailing_unit_preserved(self): + assert _normalize_sci_notation("1x10^2 S/cm") == "1e2 S/cm" + assert _normalize_sci_notation("1×10⁻⁵ m") == "1e-5 m" + + +class TestScientificNotationEquivalence: + """Every spelling of the same power of ten collapses to one identity string. + + Regression guard: before normalization, "1x10^2" was mis-read as value 1.0 with a bogus unit + "x10^2", so it did *not* equal 100. + """ + + _HUNDRED = ["100", "100.0", "1e2", "1E2", "1x10^2", "1x10**2", "1*10^2", "1×10^2", "1·10^2", "10^2", "10²"] + _TEN_MICRO = ["1e-5", "1E-5", "0.00001", "1x10^-5", "1x10**-5", "1×10⁻⁵"] + + @pytest.mark.parametrize("spelling", _HUNDRED) + def test_all_hundred_spellings_collapse(self, spelling): + assert _ckey(spelling) == _ckey("100") + + @pytest.mark.parametrize("spelling", _TEN_MICRO) + def test_all_negative_exponent_spellings_collapse(self, spelling): + assert _ckey(spelling) == _ckey("1e-5") + + def test_equivalence_holds_with_units(self): + for spelling in ("1x10^2 S/cm", "1×10^2 S/cm", "10^2 S/cm", "1e2 S/cm"): + assert _ckey(spelling) == _ckey("100 S/cm") + + def test_measurement_leaf_value_is_hundred(self): + # The measurement-leaf path (AnnotatedData.from_submission) normalizes too, not just conditions. + for spelling in ("1x10^2", "1×10^2", "10²", "1x10**2"): + assert math.isclose(AnnotatedData.from_submission(spelling, "m").as_dict()["input_value"], 100.0) + + def test_negative_exponent_measurement_leaf(self): + for spelling in ("1x10^-5", "1×10⁻⁵"): + assert math.isclose(AnnotatedData.from_submission(spelling, "m").as_dict()["input_value"], 1e-5) + + # --------------------------------------------------------------------------- # condition_key — deterministic identity # --------------------------------------------------------------------------- @@ -122,25 +201,105 @@ def test_offset_unit_condition_canonicalizes(self): class TestConditionKey: def test_empty_when_no_conditions(self): - assert condition_key({}) == "" + assert AnnotatedData.condition_key({}) == "" def test_sorted_by_name(self): - key = condition_key({"T": parse_condition_value("300K"), "P": parse_condition_value("1atm")}) + key = AnnotatedData.condition_key({"T": parse_condition_value("300K"), "P": parse_condition_value("1atm")}) assert key.index("P=") < key.index("T=") def test_physically_equal_conditions_collapse(self): # 300 K and 26.85 degC are the same temperature -> same key. - assert condition_key({"T": parse_condition_value("300K")}) == condition_key( + assert AnnotatedData.condition_key({"T": parse_condition_value("300K")}) == AnnotatedData.condition_key( {"T": parse_condition_value("26.85degC")} ) def test_fixed_precision_normalizes_representations(self): - assert condition_key({"T": parse_condition_value("300K")}) == condition_key( + assert AnnotatedData.condition_key({"T": parse_condition_value("300K")}) == AnnotatedData.condition_key( {"T": parse_condition_value("300.0K")} ) def test_categorical_in_key(self): - assert condition_key({"phase": "cubic"}) == "phase=cubic" + assert AnnotatedData.condition_key({"phase": "cubic"}) == "phase=cubic" + + +# --------------------------------------------------------------------------- +# display precision — preserve submitted trailing zeros, still cap length +# --------------------------------------------------------------------------- + + +class TestCountSigFigs: + @pytest.mark.parametrize( + ("mag", "expected"), + [ + ("1.000", 4), # trailing zeros after '.' are significant + ("1.0", 2), + ("4.20", 3), + ("300.0", 4), + ("5", 1), + ("300", 3), + ("0.00500", 3), # leading zeros not significant, trailing after '.' are + ("0.000", 3), # all-zero: count the decimals the user typed + ("1.50e3", 3), # exponent ignored; mantissa counts + ("-4.20", 3), # sign ignored + ("1.2345678901234", 14), + ], + ) + def test_counts(self, mag, expected): + assert _count_sig_figs(mag) == expected + + +class TestDisplayPreservesTrailingZeros: + """display keeps the trailing zeros the user typed (precision signal), but stays capped. + + Trailing zeros are informative — "1.000" claims more measurement confidence than "1.0" — so we + must not trim them, while still bounding length at float_precision significant figures. + """ + + @pytest.mark.parametrize( + ("submitted", "expected_display"), + [ + ("1.000", "1.000 eV"), + ("1.0", "1.0 eV"), + ("4.20", "4.20 eV"), + ("300.0", "300.0 eV"), + ("0.00500", "0.00500 eV"), + ("5", "5 eV"), + ], + ) + def test_string_input_preserves_trailing_zeros(self, submitted, expected_display): + assert AnnotatedData.from_submission(submitted, "eV").as_dict()["display"] == expected_display + + def test_numeric_input_has_no_trailing_zeros_to_preserve(self): + # A JSON number loses "1.000" -> 1.0 before it reaches us, so display is trimmed. + assert AnnotatedData.from_submission(1.000, "eV").as_dict()["display"] == "1 eV" + assert AnnotatedData.from_submission(4.20, "eV").as_dict()["display"] == "4.2 eV" + + def test_trailing_zeros_preserved_through_condition_path(self): + leaf = parse_condition_value("1.000 eV") + assert leaf["display"] == "1.000 eV" + + def test_length_cap_enforced_beyond_precision(self): + # 14 submitted sig figs are rounded down to the float_precision cap. + display = AnnotatedData.from_submission("1.2345678901234", "eV").as_dict()["display"] + mantissa = display.split(" ")[0].lstrip("-").replace(".", "") + assert len(mantissa.lstrip("0")) <= _FLOAT_PRECISION + + def test_trailing_zeros_capped_at_precision(self): + # More trailing zeros than the cap are truncated to exactly float_precision sig figs. + zeros = "1." + "0" * (_FLOAT_PRECISION + 5) + mantissa = AnnotatedData.from_submission(zeros, "eV").as_dict()["display"].split(" ")[0].replace(".", "") + assert len(mantissa) == _FLOAT_PRECISION + + def test_display_does_not_change_stored_numeric_value(self): + # Preserving display precision must not alter the stored float value/input_value. + leaf = AnnotatedData.from_submission("1.000", "eV").as_dict() + assert leaf["input_value"] == 1.0 + + def test_identity_still_normalizes_regardless_of_trailing_zeros(self): + # condition_key uses the canonical float, not display: "300" and "300.0" still collapse. + assert AnnotatedData.condition_key({"T": parse_condition_value("300 K")}) == AnnotatedData.condition_key( + {"T": parse_condition_value("300.000 K")} + ) # --------------------------------------------------------------------------- @@ -164,3 +323,47 @@ def test_unit_case_preserved(self): def test_display_required(self): with pytest.raises(PydanticValidationError): AnnotatedData(value=5.0, input_value=5.0) + + +class TestAnnotatedDataFactory: + """The factory surface: from_submission -> as_dict, and identity_scalar / condition_key.""" + + def test_from_submission_returns_model(self): + leaf = AnnotatedData.from_submission("4.2", "eV") + assert isinstance(leaf, AnnotatedData) + assert leaf.input_value == 4.2 + assert leaf.input_unit == "eV" + assert leaf.display == "4.2 eV" + + def test_from_submission_canonicalizes_to_si(self): + leaf = AnnotatedData.from_submission(4.2, "eV") + assert leaf.unit != "eV" # base units + assert math.isclose(leaf.value, 4.2 * 1.602176634e-19, rel_tol=1e-9) + + def test_from_submission_raises_on_unparseable(self): + with pytest.raises(UnitError): + AnnotatedData.from_submission("not-a-number", "eV") + + def test_as_dict_omits_none_fields(self): + leaf = AnnotatedData.from_submission(5, None).as_dict() + assert leaf == {"value": 5.0, "input_value": 5.0, "display": "5"} + + def test_identity_scalar_categorical_verbatim(self): + assert AnnotatedData.identity_scalar("cubic") == "cubic" + + def test_identity_scalar_numeric_leaf_with_unit(self): + leaf = AnnotatedData.from_submission("300", "K").as_dict() + scalar = AnnotatedData.identity_scalar(leaf) + assert scalar == "300:K" + + def test_identity_scalar_numeric_leaf_without_unit(self): + leaf = AnnotatedData.from_submission("5", None).as_dict() + assert AnnotatedData.identity_scalar(leaf) == "5" + + def test_condition_key_method_builds_sorted_identity(self): + conditions = {"T": parse_condition_value("300K"), "P": parse_condition_value("1atm")} + key = AnnotatedData.condition_key(conditions) + assert key.index("P=") < key.index("T=") # sorted by name + + def test_condition_key_method_empty(self): + assert AnnotatedData.condition_key({}) == "" diff --git a/mpcontribs-api/tests/unit/test_types.py b/mpcontribs-api/tests/unit/test_types.py index 55cd66b57a..a7ec399783 100644 --- a/mpcontribs-api/tests/unit/test_types.py +++ b/mpcontribs-api/tests/unit/test_types.py @@ -65,6 +65,39 @@ def test_nfkcstr_applies_nfkc_without_casefold(self): def test_searchstr_applies_nfkc_and_casefold(self): assert NormModel(search=MICRO_SIGN + "Table").search == GREEK_MU + "table" + # -- whitespace stripping -------------------------------------------------- + # Heterogeneous inputs (UI, client, raw REST) carry stray whitespace; every normalizer strips it + # so " Foo " and "Foo" collapse to the same stored/queried form. + + def test_nfc_strips_surrounding_whitespace(self): + assert nfc_normalize(" Foo ") == "Foo" + + def test_nfkc_strips_surrounding_whitespace(self): + assert nfkc_normalize("\tMyTable\n") == "MyTable" + + def test_nfc_strips_unicode_nbsp(self): + # str.strip() trims all Unicode whitespace incl. NBSP U+00A0, even though NFC does not fold it. + assert nfc_normalize(" bandgap ") == "bandgap" + + def test_nfkc_folds_nbsp_between_words_but_strips_edges(self): + # NFKC folds NBSP -> plain space; an interior one survives (folded), edges are trimmed. + assert nfkc_normalize(" a b ") == "a b" + + def test_displaystr_strips_whitespace(self): + assert NormModel(nfc=" spaced ").nfc == "spaced" + + def test_nfkcstr_strips_whitespace(self): + assert NormModel(nfkc=" MyTable ").nfkc == "MyTable" + + def test_searchstr_strips_and_casefolds_whitespace(self): + assert NormModel(search=" MySample ").search == "mysample" + + def test_normalizers_idempotent_on_whitespace(self): + # Normalizing an already-normalized value is a no-op (guards accidental double-strip drift). + for fn in (nfc_normalize, nfkc_normalize): + once = fn(" Foo Bar ") + assert fn(once) == once + class TestShortStr: def test_valid_3_chars(self): From 2a7672c9f43ff4fb4d2fe1b31a2e126b2aee87e6 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 13 Jul 2026 12:07:48 -0700 Subject: [PATCH 231/591] Added hypothesis package for testing annotated contribution data --- mpcontribs-api/pyproject.toml | 1 + mpcontribs-api/uv.lock | 46 +++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+) diff --git a/mpcontribs-api/pyproject.toml b/mpcontribs-api/pyproject.toml index 945f4e03aa..0a8702b691 100644 --- a/mpcontribs-api/pyproject.toml +++ b/mpcontribs-api/pyproject.toml @@ -67,6 +67,7 @@ dev = [ "pytest-xdist>=3.8.0", "httpx2>=0.28.0", "pytest-asyncio>=1.4.0", + "hypothesis>=6.100.0", ] [tool.pytest.ini_options] diff --git a/mpcontribs-api/uv.lock b/mpcontribs-api/uv.lock index 95b0fc50ec..af7e5da151 100644 --- a/mpcontribs-api/uv.lock +++ b/mpcontribs-api/uv.lock @@ -787,6 +787,41 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/87/ce/ae2911859847f9ba1d6b23027e53481cbeb50b93234f355a968d300ca2cb/httpx2-2.3.0-py3-none-any.whl", hash = "sha256:6f393663bdf6dbe7fe90118e3eb5b2bd024a675cae0390ac08cec9198812d8b7", size = 74538, upload-time = "2026-06-01T13:15:01.566Z" }, ] +[[package]] +name = "hypothesis" +version = "6.156.6" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "sortedcontainers" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/20/83/8dbe89bdb8c6f25a7a52e7898af6d82fe35dfef08e5c702f6e33231ce6c6/hypothesis-6.156.6.tar.gz", hash = "sha256:96de02faefa3ce079873541da96f42595583bb001e8e4219294ed7d4501cc4cc", size = 476304, upload-time = "2026-07-10T20:56:49.96Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/1a/dc/0c2a851f06c91d5ac9ef0f3b9615efc1ed650411d2eee23b6334f491c85e/hypothesis-6.156.6-cp310-abi3-macosx_10_12_x86_64.whl", hash = "sha256:caf6a93d011c10972da111c38ceb34ced20feaa8581e2b350c0655b022e27875", size = 747998, upload-time = "2026-07-10T20:56:16.311Z" }, + { url = "https://files.pythonhosted.org/packages/8e/f8/59203ca978ab51595d12d6bc7e7a63300d7373431ab42ca3f1742e45db68/hypothesis-6.156.6-cp310-abi3-macosx_11_0_arm64.whl", hash = "sha256:07f2bc9df1aeba80e12029c1618e2ee54abc440068c305d7075ffd6b85251843", size = 743073, upload-time = "2026-07-10T20:55:36.825Z" }, + { url = "https://files.pythonhosted.org/packages/68/d8/86a0023740434098d1b187a62bd5f99b198f098fb43e7fc58342283a8270/hypothesis-6.156.6-cp310-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7baca17f4803ad4aa151732326f3990baf54c3127df44aa872ac5bdf8a98a9a6", size = 1070169, upload-time = "2026-07-10T20:55:49.47Z" }, + { url = "https://files.pythonhosted.org/packages/9b/82/673453915fd0c67673f35a4876ba88f48c621335f293f3537d77b27d4286/hypothesis-6.156.6-cp310-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8083806645f84243aade727f4978185caaa0b7190af4318673999ee15fdbf424", size = 1121760, upload-time = "2026-07-10T20:55:53.502Z" }, + { url = "https://files.pythonhosted.org/packages/8a/c3/3a5557f52912f2fecc6ed59642dcf80dd8e89d0d9664502b68e23d66bf3d/hypothesis-6.156.6-cp310-abi3-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:a922eedcd8618f9c2e17b79fa7b3f3f0b2df34e201958611cc3f0f46cca33c10", size = 1111440, upload-time = "2026-07-10T20:55:43.054Z" }, + { url = "https://files.pythonhosted.org/packages/38/a6/ae636d4ca7f996a1ccb4b3d5997d949f1718fba52b01559b3ab53b237b3f/hypothesis-6.156.6-cp310-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:5291bd33c4704d274d7c214d5c200e77f372a06644f5cbbe96dcbe53cb2fbf10", size = 1244944, upload-time = "2026-07-10T20:55:56.109Z" }, + { url = "https://files.pythonhosted.org/packages/1e/79/c425d22d734be0268ca60d120c6296299e4220a1783cb1a4cc76232807bb/hypothesis-6.156.6-cp310-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:55f3ec50161b4a95bae63bff2b5166e45935b493013d3be30ede279bf6192318", size = 1288808, upload-time = "2026-07-10T20:56:06.249Z" }, + { url = "https://files.pythonhosted.org/packages/c5/3a/cc9f479d22cbdd36ddfc55a978378eddadd183b09339ebdb81be33bb18e7/hypothesis-6.156.6-cp310-abi3-win32.whl", hash = "sha256:e96570ca5cdd9a5f2ff9e80a6fb2fd5420ebf33b833d7de5b09b6ebb26a3eb6c", size = 634868, upload-time = "2026-07-10T20:55:37.959Z" }, + { url = "https://files.pythonhosted.org/packages/d6/89/2008d287289841a936456cb13443ca89d88da6e4527d611d482e9544164d/hypothesis-6.156.6-cp310-abi3-win_amd64.whl", hash = "sha256:32710718c22fe8c5571464e898bb87d282837b02617d6ad68130abf7cb4843cb", size = 640382, upload-time = "2026-07-10T20:55:30.634Z" }, + { url = "https://files.pythonhosted.org/packages/a5/be/5b4b27984cb43c60e95f570b069660335dad34cb67f7d226017c5d35d31e/hypothesis-6.156.6-cp314-cp314-macosx_10_12_x86_64.whl", hash = "sha256:34a70a7b8226e34d658072d8fb81d03f97f0a75ceb536329a321b94ce2232fd6", size = 749312, upload-time = "2026-07-10T20:55:46.902Z" }, + { url = "https://files.pythonhosted.org/packages/31/11/709cceffc28666c9d4cb75ffc6df5ce30db8c7dd5cc2c8b38a2fd837427f/hypothesis-6.156.6-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:f1969646beead7d8cf6a2537d2765af89d73056e2cb218e7fae92b83802250a3", size = 742332, upload-time = "2026-07-10T20:56:30.254Z" }, + { url = "https://files.pythonhosted.org/packages/84/52/cfc79b13d8dd3cd6de6b9df921c557efe8528a9c90a3a7cd93b37188d57e/hypothesis-6.156.6-cp314-cp314-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cbc2ec7b7d905e6b6ec1635f6340bfa52aaab718101c59f052bc012a6b486cd8", size = 1070109, upload-time = "2026-07-10T20:55:48.244Z" }, + { url = "https://files.pythonhosted.org/packages/ca/ac/1da4def1f006b5ad01187ff96379e24c37439d659ec10c3e944c03436c0f/hypothesis-6.156.6-cp314-cp314-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9367ae25dfa6dc1af37904785e43c4f8fe1c4118cafdc2f06514154fbdd90992", size = 1121528, upload-time = "2026-07-10T20:56:39.665Z" }, + { url = "https://files.pythonhosted.org/packages/68/47/744e4f5e3d635dea20dbedf3fa486e2a6fa5210e0a52a0d5c4da56babd84/hypothesis-6.156.6-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:455f09107ec07c78f2a83cb8fc19e23879c9d51cdc831de6f9cb6ec4059cb9af", size = 1244690, upload-time = "2026-07-10T20:56:31.854Z" }, + { url = "https://files.pythonhosted.org/packages/25/8a/42252fcd5e521d140dac532f29c2a13ca8f22908cb545ffdd64b5e225680/hypothesis-6.156.6-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:c76634c45a3ceee4c4fdfed39aebd08b8b822ec8b0c556877ef82846fd777730", size = 1288519, upload-time = "2026-07-10T20:56:03.429Z" }, + { url = "https://files.pythonhosted.org/packages/44/e7/176df9e47cf583d2b8d234b78c0aac3a47075ad5d147e60b2c21a1338bb1/hypothesis-6.156.6-cp314-cp314-pyemscripten_2026_0_wasm32.whl", hash = "sha256:eb7e9f8343bc6b948937e6ec12e6879ed25a17b53ceccbd2b84adadd3d511698", size = 586452, upload-time = "2026-07-10T20:56:22.285Z" }, + { url = "https://files.pythonhosted.org/packages/8c/75/2c8a0411bbe76429f3ae738ef9a00107201bf6146d9534350014ce369d98/hypothesis-6.156.6-cp314-cp314-win_amd64.whl", hash = "sha256:f9631cd604ae6032c3edf99160dc1b9e33873f2e52762246b24f07fb758652ae", size = 637774, upload-time = "2026-07-10T20:56:34.97Z" }, + { url = "https://files.pythonhosted.org/packages/2a/22/8115005e9aa72c8d63d90e9db5e0b8425fd8950fbc5d6e332805d4d32c9e/hypothesis-6.156.6-cp314-cp314t-macosx_10_12_x86_64.whl", hash = "sha256:1f81163d36d3763b09ffaef7c3a71e88174ca3e6816201fca9d1d159f448fdb5", size = 747428, upload-time = "2026-07-10T20:56:44.611Z" }, + { url = "https://files.pythonhosted.org/packages/e8/c2/66bfe9337f4a4b1f7754ee6d01d950280152a81d0d797e6c1d9eb0909750/hypothesis-6.156.6-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:556b905767e36147918634a64356aa05d8c956576f00aee01eb351678f193908", size = 740889, upload-time = "2026-07-10T20:55:57.656Z" }, + { url = "https://files.pythonhosted.org/packages/95/3b/69f45af2d4f0950b7d1af3cdbdd800b88a6c2370331481eda79d6171fbe3/hypothesis-6.156.6-cp314-cp314t-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c3f2604b28d16d696aaaf4954d20f907b27e54034df98e64746a20c74c319f03", size = 1069270, upload-time = "2026-07-10T20:56:12.024Z" }, + { url = "https://files.pythonhosted.org/packages/f8/43/6b2549885da08f5e50ba34fb8e0d0a60b2f190ffd516fac220f8db5b5869/hypothesis-6.156.6-cp314-cp314t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ffe012ad66dbe7b8e8ddef6f6992ab1b36719ea64430c2bf1ff7135521052a15", size = 1120409, upload-time = "2026-07-10T20:55:34.551Z" }, + { url = "https://files.pythonhosted.org/packages/70/97/745c778c3eb29befa2367b1ded8437eecfbbe6932359d0f831275bc32170/hypothesis-6.156.6-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:5bfa3c7b758f7278081c6bfec5f89b43c4eb075c0c9eb095323f7a9eb019b513", size = 1243111, upload-time = "2026-07-10T20:56:17.83Z" }, + { url = "https://files.pythonhosted.org/packages/ab/d7/c5ec6a442dc9b822f47064bda4b6d3e739dccdd1c5bf44c9a57fb6136830/hypothesis-6.156.6-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:d0db1f4573800c618773622f03cb6533bb3377430ef938c9476ba10c39d22591", size = 1287262, upload-time = "2026-07-10T20:56:23.749Z" }, + { url = "https://files.pythonhosted.org/packages/11/0c/c134d61710e14b68b010215dcf6bd57d2ec05cd169dff8bfab8fefc2d410/hypothesis-6.156.6-cp314-cp314t-win_amd64.whl", hash = "sha256:38cd0c4a7b9f809f1e23a4d15adfa9c5d99869b9afc327350a5e563350b78e48", size = 637862, upload-time = "2026-07-10T20:56:13.347Z" }, +] + [[package]] name = "idna" version = "3.17" @@ -1056,6 +1091,7 @@ dependencies = [ dev = [ { name = "basedpyright" }, { name = "httpx2" }, + { name = "hypothesis" }, { name = "pydocstringformatter" }, { name = "pytest" }, { name = "pytest-asyncio" }, @@ -1091,6 +1127,7 @@ requires-dist = [ dev = [ { name = "basedpyright", specifier = ">=1.29.0" }, { name = "httpx2", specifier = ">=0.28.0" }, + { name = "hypothesis", specifier = ">=6.100.0" }, { name = "pydocstringformatter", specifier = ">=0.7.0" }, { name = "pytest", specifier = ">=9.0.3" }, { name = "pytest-asyncio", specifier = ">=1.4.0" }, @@ -2089,6 +2126,15 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/b7/ce/149a00dd41f10bc29e5921b496af8b574d8413afcd5e30dfa0ed46c2cc5e/six-1.17.0-py2.py3-none-any.whl", hash = "sha256:4721f391ed90541fddacab5acf947aa0d3dc7d27b2e1e8eda2be8970586c3274", size = 11050, upload-time = "2024-12-04T17:35:26.475Z" }, ] +[[package]] +name = "sortedcontainers" +version = "2.4.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/e8/c4/ba2f8066cceb6f23394729afe52f3bf7adec04bf9ed2c820b39e19299111/sortedcontainers-2.4.0.tar.gz", hash = "sha256:25caa5a06cc30b6b83d11423433f65d1f9d76c4c6a0c90e3379eaa43b9bfdb88", size = 30594, upload-time = "2021-05-16T22:03:42.897Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/32/46/9cb0e58b2deb7f82b84065f37f3bffeb12413f947f9388e4cac22c4621ce/sortedcontainers-2.4.0-py2.py3-none-any.whl", hash = "sha256:a163dcaede0f1c021485e957a39245190e74249897e2ae4b2aa38595db237ee0", size = 29575, upload-time = "2021-05-16T22:03:41.177Z" }, +] + [[package]] name = "spglib" version = "2.7.0" From ab6e41f10a6323e28fc14f7955538cbc24bcd4e0 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 13 Jul 2026 13:32:40 -0700 Subject: [PATCH 232/591] Contributions do not accept id for POST anymore --- .../domains/contributions/models.py | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py index 3f6847ac7c..364a1ed51f 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py @@ -13,7 +13,7 @@ ) from bson.errors import InvalidId from fastapi_filter import FilterDepends, with_prefix -from pydantic import Field, field_validator +from pydantic import BaseModel, Field, field_validator from pymongo import ASCENDING, IndexModel from mpcontribs_api._openapi import CONTRIBUTION_DATA_INPUT_DESCRIPTION, CONTRIBUTION_DATA_OUTPUT_DESCRIPTION @@ -27,7 +27,7 @@ from mpcontribs_api.projection import SparseFieldsModel -class ContributionBase(BaseDocumentWithInput[PydanticObjectId]): +class ContributionBase(BaseModel): project: ShortStr identifier: SearchStr formula: DisplayStr @@ -62,7 +62,7 @@ class Settings: ] -class Contribution(ContributionBase): +class Contribution(ContributionBase, BaseDocumentWithInput[PydanticObjectId]): is_public: bool # Server-owned: the service resolves the real version (see ContributionService._split_non_unique) # and stamps it on the doc. Defaults to 1 so the no-version (unique-identifier) case is implicit. @@ -81,14 +81,14 @@ def from_input_model(cls, data: ContributionIn) -> Contribution: # Server-owned fields are not taken from input: is_public starts False, components are # inserted separately, last_modified is stamped by the before_event hook, and version is # resolved/stamped by the service (never trusted from the request body). - return cls.model_validate( - { - **data.model_dump( - exclude={"is_public", "version", "structures", "tables", "attachments", "last_modified"} - ), - "is_public": False, - } + payload = data.model_dump( + exclude={"is_public", "version", "structures", "tables", "attachments", "last_modified"} ) + # since we don't accept id from input, generate on our own + payload["_id"] = PydanticObjectId() + # default to private + payload["is_public"] = False + return cls.model_validate(obj=payload) @before_event(Insert, Replace, Update, Save, SaveChanges) def set_last_modified(self): From 0541c6ca30a8ae230cf634cae7857b1c3e4f5a6a Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 28 May 2026 11:13:03 -0700 Subject: [PATCH 233/591] Initial ruff formatting and uv project init --- .python-version | 1 + main.py | 6 + mpcontribs-api/main.py | 2 +- mpcontribs-api/maintenance.py | 3 +- mpcontribs-api/mpcontribs/api/__init__.py | 3 +- .../mpcontribs/api/attachments/document.py | 17 +- mpcontribs-api/mpcontribs/api/config.py | 14 +- .../mpcontribs/api/contributions/views.py | 2 +- mpcontribs-api/mpcontribs/api/core.py | 28 +- .../mpcontribs/api/notebooks/views.py | 105 ++++--- .../mpcontribs/api/projects/views.py | 2 +- .../mpcontribs/api/structures/views.py | 2 +- .../mpcontribs/api/tables/document.py | 24 +- mpcontribs-api/mpcontribs/api/tables/views.py | 8 +- mpcontribs-api/supervisord/conf.py | 6 +- .../mpcontribs/io/core/components/tdata.py | 2 +- mpcontribs-io/mpcontribs/io/core/utils.py | 5 +- mpcontribs-lux/mpcontribs/lux/autogen.py | 2 +- .../lux/projects/alab/schemas/base.py | 2 +- mpcontribs-portal/maintenance.py | 10 +- .../mpcontribs/portal/middleware.py | 3 +- mpcontribs-portal/mpcontribs/portal/urls.py | 4 +- mpcontribs-portal/mpcontribs/portal/views.py | 8 +- .../dilute_solute_diffusion/pre_submission.py | 4 - .../users/martin_lab/martin_lab.ipynb | 2 +- .../screening_inorganic_pv/pre_submission.py | 1 + .../mpcontribs/users/swf/pre_submission.py | 6 +- mpcontribs-portal/mpcontribs/users/utils.py | 5 +- .../2dmatpedia.ipynb | 91 +++--- .../Broberg_benchmark_defects.ipynb | 165 ++++------- .../ExpXAS.ipynb | 71 +++-- .../ForbiddenTransitions.ipynb | 164 +++++++--- .../HFP2023.ipynb | 69 ++--- .../MnO2_phase_selection.ipynb | 76 ++--- .../attachments.ipynb | 18 +- .../bioi_defects.ipynb | 32 +- .../contribs.materialsproject.org/cards.ipynb | 28 +- .../carrier_transport.ipynb | 226 +++++++------- .../defect_genome_pcfc_materials.ipynb | 70 +++-- .../deltaHvacancy.ipynb | 62 ++-- .../dilute_solute_diffusion.ipynb | 87 ++++-- .../download.ipynb | 21 +- .../contribs.materialsproject.org/dtu.ipynb | 51 ++-- .../ediffcrystalprediction.ipynb | 29 +- .../esters.ipynb | 27 +- .../experimental_thermo.ipynb | 279 ++++++++++-------- .../experimental_thermoelectrics.ipynb | 150 ++++++++-- .../ferroelectrics.ipynb | 162 ++++++---- .../contribs.materialsproject.org/gbdb.ipynb | 32 +- .../get_started.ipynb | 74 ++--- .../intermatch.ipynb | 9 +- .../ion_ref_data.ipynb | 115 +++++--- .../jarvis_dft.ipynb | 73 ++--- .../jarvis_dft_2023.ipynb | 156 +++++----- .../matscholar.ipynb | 30 +- .../melting_points.ipynb | 22 +- .../mg_cathode_screening_2022.ipynb | 252 +++++++++------- .../mofexplorer.ipynb | 12 +- .../ocp/ocp-update.ipynb | 13 +- .../ocp/ocp-upload.ipynb | 29 +- .../open_catalyst_project.ipynb | 55 ++-- .../perovskites_diffusion.ipynb | 17 +- .../pycroscopy.ipynb | 57 ++-- .../pydatarecognition.ipynb | 49 ++- .../qsgw_band_structures.ipynb | 164 +++++----- .../screening_inorganic_pv.ipynb | 18 +- .../silicon_defects.ipynb | 40 ++- .../simple_test.ipynb | 108 +++---- .../springer_materials.ipynb | 41 ++- .../contribs.materialsproject.org/swf.ipynb | 24 +- .../transparent_conductors.ipynb | 140 +++++---- .../genesis_efrc_minipipes.ipynb | 32 +- .../get_started.ipynb | 166 ++++++----- .../ml.materialsproject.org/get_started.ipynb | 119 ++++---- mpcontribs-portal/supervisord/conf.py | 2 +- mpcontribs-serverless/make_download/app.py | 17 +- pyproject.toml | 9 + uv.lock | 158 ++++++++++ 78 files changed, 2490 insertions(+), 1698 deletions(-) create mode 100644 .python-version create mode 100644 main.py create mode 100644 pyproject.toml create mode 100644 uv.lock diff --git a/.python-version b/.python-version new file mode 100644 index 0000000000..6324d401a0 --- /dev/null +++ b/.python-version @@ -0,0 +1 @@ +3.14 diff --git a/main.py b/main.py new file mode 100644 index 0000000000..bf67570ae8 --- /dev/null +++ b/main.py @@ -0,0 +1,6 @@ +def main(): + print("Hello from fastapi-conversion!") + + +if __name__ == "__main__": + main() diff --git a/mpcontribs-api/main.py b/mpcontribs-api/main.py index 2ec96e9fc6..a4c111b228 100755 --- a/mpcontribs-api/main.py +++ b/mpcontribs-api/main.py @@ -8,7 +8,7 @@ from supervisor.supervisorctl import Controller logger = logging.getLogger(__name__) -client = boto3.client('ecs') +client = boto3.client("ecs") def start(program): diff --git a/mpcontribs-api/maintenance.py b/mpcontribs-api/maintenance.py index d6c4682a08..6ff4b5f8aa 100644 --- a/mpcontribs-api/maintenance.py +++ b/mpcontribs-api/maintenance.py @@ -32,9 +32,10 @@ def fix_units(name): contrib.data = remap(contrib.data, visit=visit, enter=enter) # pull out display contrib.save(signal_kwargs={"skip": True}) # reparse display with intended unit - if idx and not idx%250: + if idx and not idx % 250: print(idx) + # additional maintenance functions # TODO generate JSON/CSV project downloads # TODO clean dangling notebooks diff --git a/mpcontribs-api/mpcontribs/api/__init__.py b/mpcontribs-api/mpcontribs/api/__init__.py index e61583b4b8..6885d1d65e 100644 --- a/mpcontribs-api/mpcontribs/api/__init__.py +++ b/mpcontribs-api/mpcontribs/api/__init__.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- """Flask App for MPContribs API""" + import os import smtplib import logging @@ -165,7 +166,7 @@ def get_kernels(): """retrieve list of kernels from KernelGateway service""" try: r = requests.get(get_kernel_endpoint(), timeout=2) - except (ConnectionError, Timeout): + except ConnectionError, Timeout: logger.warning("Kernel Gateway NOT AVAILABLE") return None diff --git a/mpcontribs-api/mpcontribs/api/attachments/document.py b/mpcontribs-api/mpcontribs/api/attachments/document.py index c5584a11aa..52e91702e3 100644 --- a/mpcontribs-api/mpcontribs/api/attachments/document.py +++ b/mpcontribs-api/mpcontribs/api/attachments/document.py @@ -3,7 +3,6 @@ import boto3 import binascii -from hashlib import md5 from flask import request from base64 import b64decode, b64encode from flask_mongoengine.documents import DynamicDocument @@ -27,7 +26,9 @@ class Attachments(DynamicDocument): name = StringField(required=True, help_text="file name") md5 = StringField(regex=r"^[a-z0-9]{32}$", unique=True, help_text="md5 sum") - mime = StringField(required=True, choices=SUPPORTED_MIMES, help_text="attachment mime type") + mime = StringField( + required=True, choices=SUPPORTED_MIMES, help_text="attachment mime type" + ) content = StringField(required=True, help_text="base64-encoded attachment content") meta = {"collection": "attachments", "indexes": ["name", "mime", "md5"]} @@ -44,7 +45,9 @@ def post_init(cls, sender, document, **kwargs): if "content" in requested_fields: if not document.md5: # document.reload("md5") # TODO AttributeError: _changed_fields - raise ValueError("Please also request md5 field to retrieve attachment content!") + raise ValueError( + "Please also request md5 field to retrieve attachment content!" + ) retr = s3_client.get_object(Bucket=BUCKET, Key=document.md5) document.content = b64encode(retr["Body"].read()).decode("utf-8") @@ -84,9 +87,13 @@ def pre_save_post_validation(cls, sender, document, **kwargs): Metadata={"name": document.name}, Body=content, ) - document.content = str(size) # set to something useful to distinguish in post_init + document.content = str( + size + ) # set to something useful to distinguish in post_init signals.post_init.connect(Attachments.post_init, sender=Attachments) signals.pre_delete.connect(Attachments.pre_delete, sender=Attachments) -signals.pre_save_post_validation.connect(Attachments.pre_save_post_validation, sender=Attachments) +signals.pre_save_post_validation.connect( + Attachments.pre_save_post_validation, sender=Attachments +) diff --git a/mpcontribs-api/mpcontribs/api/config.py b/mpcontribs-api/mpcontribs/api/config.py index f044f4ab95..e9539ed081 100644 --- a/mpcontribs-api/mpcontribs/api/config.py +++ b/mpcontribs-api/mpcontribs/api/config.py @@ -74,22 +74,22 @@ "tags": [ { "name": "projects", - "description": f'contain provenance information about contributed datasets. \ + "description": "contain provenance information about contributed datasets. \ Deleting projects will also delete all contributions including tables, structures, attachments, notebooks \ and cards for the project. Only users who have been added to a project can update its contents. While \ unpublished, only users on the project can retrieve its data or view it on the \ Portal. Making a project public does not automatically publish all \ - its contributions, tables, attachments, and structures. These are separately set to public individually or in bulk.' + its contributions, tables, attachments, and structures. These are separately set to public individually or in bulk." "", }, { "name": "contributions", - "description": f'contain simple hierarchical data which will show up as cards on the MP details \ + "description": "contain simple hierarchical data which will show up as cards on the MP details \ page for MP material(s). Tables (rows and columns), structures, and attachments can be added to a \ contribution. Each contribution uses `mp-id` or composition as identifier to associate its data with the \ according entries on MP. Only admins or users on the project can create, update or delete contributions, and \ while unpublished, retrieve its data or view it on the Portal. \ - Contribution components (tables, structures, and attachments) are deleted along with a contribution.', + Contribution components (tables, structures, and attachments) are deleted along with a contribution.", }, { "name": "structures", @@ -105,12 +105,12 @@ }, { "name": "attachments", - "description": 'are files saved as objects in AWS S3 and not accessible for querying (only retrieval) \ - which can be added to a contribution.', + "description": "are files saved as objects in AWS S3 and not accessible for querying (only retrieval) \ + which can be added to a contribution.", }, { "name": "notebooks", - "description": f'are Jupyter \ + "description": 'are Jupyter \ notebook \ documents generated and saved when a contribution is saved. They form the basis for Contribution \ Details Pages on the Portal.', diff --git a/mpcontribs-api/mpcontribs/api/contributions/views.py b/mpcontribs-api/mpcontribs/api/contributions/views.py index 86bfb70b8c..f78af3d671 100644 --- a/mpcontribs-api/mpcontribs/api/contributions/views.py +++ b/mpcontribs-api/mpcontribs/api/contributions/views.py @@ -179,7 +179,7 @@ def search(): try: comp = Composition(formula) - except (CompositionError, ValueError): + except CompositionError, ValueError: abort(400, description="Invalid formula provided.") ind_str = [] diff --git a/mpcontribs-api/mpcontribs/api/core.py b/mpcontribs-api/mpcontribs/api/core.py index ff24418d64..39da673ac3 100644 --- a/mpcontribs-api/mpcontribs/api/core.py +++ b/mpcontribs-api/mpcontribs/api/core.py @@ -1,8 +1,4 @@ -# -*- coding: utf-8 -*- -"""Custom meta-class and MethodView for Swagger""" - import os -import logging import yaml from copy import deepcopy @@ -598,7 +594,8 @@ def has_read_permission(self, request, qs): from mpcontribs.api.contributions.document import get_resource resource = get_resource(component) - qfilter = lambda qs: qs.clone() + def qfilter(qs): + return qs.clone() if pk: ids = [resource.get_object(pk, qfilter=qfilter).id] @@ -614,15 +611,20 @@ def has_read_permission(self, request, qs): qfilter = self.get_projects_filter(username, groups) component = component[:-1] if component == "notebooks" else component qfilter &= Q(**{f"{component}__in": ids}) - contribs = Contributions.objects(qfilter).only(component).limit(len(ids)) + contribs = ( + Contributions.objects(qfilter).only(component).limit(len(ids)) + ) # return new queryset using "ids__in" - readable_ids = [ - getattr(contrib, component).id for contrib in contribs - ] if component == "notebook" else [ - dbref.id for contrib in contribs - for dbref in getattr(contrib, component) - if dbref.id in ids - ] + readable_ids = ( + [getattr(contrib, component).id for contrib in contribs] + if component == "notebook" + else [ + dbref.id + for contrib in contribs + for dbref in getattr(contrib, component) + if dbref.id in ids + ] + ) if not readable_ids: return qs.none() diff --git a/mpcontribs-api/mpcontribs/api/notebooks/views.py b/mpcontribs-api/mpcontribs/api/notebooks/views.py index e3bf88af8c..93ea20e6b9 100644 --- a/mpcontribs-api/mpcontribs/api/notebooks/views.py +++ b/mpcontribs-api/mpcontribs/api/notebooks/views.py @@ -105,14 +105,17 @@ def restart_kernels(): for kernel_id in kernel_ids: kernel_url = get_kernel_endpoint(kernel_id) + "/restart" requests.post(kernel_url, json={}) - cells = [nbf.new_code_cell("\n".join([ - "from mpcontribs.client import Client", - "print('client imported')" - ]))] + cells = [ + nbf.new_code_cell( + "\n".join( + ["from mpcontribs.client import Client", "print('client imported')"] + ) + ) + ] run_cells(kernel_id, "import_client", cells) -@notebooks.route('/result', defaults={'job_id': None}) +@notebooks.route("/result", defaults={"job_id": None}) @notebooks.route("/result/") def result(job_id): if not current_app.kernels: @@ -156,7 +159,7 @@ def make(projects=None, cids=None, force=False): ret["job"] = { "id": job.id, "enqueued_at": job.enqueued_at.isoformat(), - "started_at": job.started_at.isoformat() + "started_at": job.started_at.isoformat(), } exclude = list(Contributions._fields.keys()) @@ -177,8 +180,11 @@ def make(projects=None, cids=None, force=False): start = time.perf_counter() - if not force and document.notebook and \ - not getattr(document, "needs_build", True): + if ( + not force + and document.notebook + and not getattr(document, "needs_build", True) + ): continue if document.notebook: @@ -197,49 +203,63 @@ def make(projects=None, cids=None, force=False): cells = [ # define client only once in kernel # avoids API calls for regex expansion for query parameters - nbf.new_code_cell("\n".join([ - "if 'client' not in locals():", - "\tclient = Client(", - f'\t\theaders={{"X-Authenticated-Groups": "{ADMIN_GROUP}"}},', - f'\t\thost="{MPCONTRIBS_API_HOST}"', - "\t)", - "print(client.get_totals())", - # return something. See while loop in `run_cells` - ])), - nbf.new_code_cell("\n".join([ - f'c = client.get_contribution("{document.id}")', - 'c.display()' - ])), + nbf.new_code_cell( + "\n".join( + [ + "if 'client' not in locals():", + "\tclient = Client(", + f'\t\theaders={{"X-Authenticated-Groups": "{ADMIN_GROUP}"}},', + f'\t\thost="{MPCONTRIBS_API_HOST}"', + "\t)", + "print(client.get_totals())", + # return something. See while loop in `run_cells` + ] + ) + ), + nbf.new_code_cell( + "\n".join( + [f'c = client.get_contribution("{document.id}")', "c.display()"] + ) + ), ] if document.tables: cells.append(nbf.new_markdown_cell("## Tables")) for table in document.tables: cells.append( - nbf.new_code_cell("\n".join([ - f't = client.get_table("{table.id}")', - 't.display()' - ])) + nbf.new_code_cell( + "\n".join( + [f't = client.get_table("{table.id}")', "t.display()"] + ) + ) ) if document.structures: cells.append(nbf.new_markdown_cell("## Structures")) for structure in document.structures: cells.append( - nbf.new_code_cell("\n".join([ - f's = client.get_structure("{structure.id}")', - 's.display()' - ])) + nbf.new_code_cell( + "\n".join( + [ + f's = client.get_structure("{structure.id}")', + "s.display()", + ] + ) + ) ) if document.attachments: cells.append(nbf.new_markdown_cell("## Attachments")) for attachment in document.attachments: cells.append( - nbf.new_code_cell("\n".join([ - f'a = client.get_attachment("{attachment.id}")', - 'a.info()' - ])) + nbf.new_code_cell( + "\n".join( + [ + f'a = client.get_attachment("{attachment.id}")', + "a.info()", + ] + ) + ) ) try: @@ -249,7 +269,11 @@ def make(projects=None, cids=None, force=False): restart_kernels() ret["result"] = { - "status": "ERROR", "cid": cid, "count": count, "total": total, "exc": str(e) + "status": "ERROR", + "cid": cid, + "count": count, + "total": total, + "exc": str(e), } return ret @@ -258,7 +282,10 @@ def make(projects=None, cids=None, force=False): restart_kernels() ret["result"] = { - "status": "ERROR: NO OUTPUTS", "cid": cid, "count": count, "total": total + "status": "ERROR: NO OUTPUTS", + "cid": cid, + "count": count, + "total": total, } return ret @@ -268,7 +295,7 @@ def make(projects=None, cids=None, force=False): doc = nbf.new_notebook() doc["cells"] = [ nbf.new_code_cell("from mpcontribs.client import Client"), - nbf.new_code_cell(f'client = Client()'), + nbf.new_code_cell("client = Client()"), ] doc["cells"] += cells[1:] # skip localhost Client @@ -280,7 +307,11 @@ def make(projects=None, cids=None, force=False): restart_kernels() ret["result"] = { - "status": "ERROR", "cid": cid, "count": count, "total": total, "exc": str(e) + "status": "ERROR", + "cid": cid, + "count": count, + "total": total, + "exc": str(e), } return ret diff --git a/mpcontribs-api/mpcontribs/api/projects/views.py b/mpcontribs-api/mpcontribs/api/projects/views.py index 1a000107bd..3b2dfa1110 100644 --- a/mpcontribs-api/mpcontribs/api/projects/views.py +++ b/mpcontribs-api/mpcontribs/api/projects/views.py @@ -161,7 +161,7 @@ def applications(token, action): else: obj.delete() # post_delete signal sends notification - return f'{project} {action.replace("y", "ie")}d and {owner} notified.' + return f"{project} {action.replace('y', 'ie')}d and {owner} notified." @projects.route("/search") diff --git a/mpcontribs-api/mpcontribs/api/structures/views.py b/mpcontribs-api/mpcontribs/api/structures/views.py index 07aeb79013..e30996dd59 100644 --- a/mpcontribs-api/mpcontribs/api/structures/views.py +++ b/mpcontribs-api/mpcontribs/api/structures/views.py @@ -20,7 +20,7 @@ class StructuresResource(Resource): "id": [ops.In, ops.Exact], "md5": [ops.In, ops.Exact], "name": FILTERS["STRINGS"], - "sites": [ops.Size] + "sites": [ops.Size], } fields = ["id", "name", "md5"] allowed_ordering = ["name"] diff --git a/mpcontribs-api/mpcontribs/api/tables/document.py b/mpcontribs-api/mpcontribs/api/tables/document.py index dc52876df1..c73aee76fb 100644 --- a/mpcontribs-api/mpcontribs/api/tables/document.py +++ b/mpcontribs-api/mpcontribs/api/tables/document.py @@ -1,11 +1,15 @@ # -*- coding: utf-8 -*- -from hashlib import md5 from flask_mongoengine.documents import DynamicDocument from mongoengine import signals, EmbeddedDocument from mongoengine.fields import StringField, ListField, IntField, EmbeddedDocumentField from mongoengine.queryset.manager import queryset_manager -from mpcontribs.api.contributions.document import format_cell, get_resource, get_md5, COMPONENTS +from mpcontribs.api.contributions.document import ( + format_cell, + get_resource, + get_md5, + COMPONENTS, +) class Labels(EmbeddedDocument): @@ -27,10 +31,18 @@ class Tables(DynamicDocument): data = ListField(ListField(StringField()), required=True, help_text="table rows") md5 = StringField(regex=r"^[a-z0-9]{32}$", unique=True, help_text="md5 sum") total_data_rows = IntField(help_text="total number of rows") - meta = {"collection": "tables", "indexes": [ - "name", "columns", "md5", "attrs.title", - "attrs.labels.index", "attrs.labels.value", "attrs.labels.variable" - ]} + meta = { + "collection": "tables", + "indexes": [ + "name", + "columns", + "md5", + "attrs.title", + "attrs.labels.index", + "attrs.labels.value", + "attrs.labels.variable", + ], + } @queryset_manager def objects(doc_cls, queryset): diff --git a/mpcontribs-api/mpcontribs/api/tables/views.py b/mpcontribs-api/mpcontribs/api/tables/views.py index a8f6579988..0e7f4a6d83 100644 --- a/mpcontribs-api/mpcontribs/api/tables/views.py +++ b/mpcontribs-api/mpcontribs/api/tables/views.py @@ -38,7 +38,13 @@ class TablesResource(Resource): "attrs__labels__variable": FILTERS["STRINGS"], } fields = [ - "id", "name", "md5", "attrs", "columns", "total_data_rows", "total_data_pages" + "id", + "name", + "md5", + "attrs", + "columns", + "total_data_rows", + "total_data_pages", ] allowed_ordering = ["name", "total_data_rows"] paginate = True diff --git a/mpcontribs-api/supervisord/conf.py b/mpcontribs-api/supervisord/conf.py index fb0dde081b..321c06a52f 100644 --- a/mpcontribs-api/supervisord/conf.py +++ b/mpcontribs-api/supervisord/conf.py @@ -18,7 +18,7 @@ "db": db, "s3": s3, "tm": tm.upper(), - "max_projects": int(max_projects) if max_projects else 3 + "max_projects": int(max_projects) if max_projects else 3, } kwargs = { @@ -28,7 +28,9 @@ "reload": int(not PRODUCTION), "node_env": "production" if PRODUCTION else "development", "flask_log_level": "INFO" if PRODUCTION else "DEBUG", - "jupyter_gateway_host": f"localhost:{KG_PORT}" if PRODUCTION else f"kernel-gateway:{KG_PORT}", + "jupyter_gateway_host": f"localhost:{KG_PORT}" + if PRODUCTION + else f"kernel-gateway:{KG_PORT}", "dd_agent_host": "localhost" if PRODUCTION else "datadog", "mpcontribs_api_host": "localhost" if PRODUCTION else "contribs-apis", } diff --git a/mpcontribs-io/mpcontribs/io/core/components/tdata.py b/mpcontribs-io/mpcontribs/io/core/components/tdata.py index 17293619a7..365c9d6221 100644 --- a/mpcontribs-io/mpcontribs/io/core/components/tdata.py +++ b/mpcontribs-io/mpcontribs/io/core/components/tdata.py @@ -105,7 +105,7 @@ def to_backgrid_dict(self): composition = get_composition_from_string(cell) composition = pmg_util.string.unicodeify(composition) table["rows"][row_index][col] = composition - except (CompositionError, ValueError, OverflowError): + except CompositionError, ValueError, OverflowError: try: # https://stackoverflow.com/a/38020041 result = urlparse(cell) diff --git a/mpcontribs-io/mpcontribs/io/core/utils.py b/mpcontribs-io/mpcontribs/io/core/utils.py index 1def24772d..b86075c234 100644 --- a/mpcontribs-io/mpcontribs/io/core/utils.py +++ b/mpcontribs-io/mpcontribs/io/core/utils.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- """module defines utility methods for MPContribs core.io library""" + from __future__ import unicode_literals from decimal import Decimal, DecimalException, InvalidOperation import six @@ -82,7 +83,7 @@ def normalize_root_level(title): try: composition = get_composition_from_string(title) return False, composition - except (CompositionError, KeyError, TypeError, ValueError): + except CompositionError, KeyError, TypeError, ValueError: if mp_id_pattern.match(title.lower()): return False, title.lower() return True, title @@ -157,6 +158,6 @@ def read_csv(body, is_data_section=True, **kwargs): squeeze=True, converters=converters, encoding="utf8", - **options + **options, ).dropna(how="all") ) diff --git a/mpcontribs-lux/mpcontribs/lux/autogen.py b/mpcontribs-lux/mpcontribs/lux/autogen.py index 95d6255663..727e72f37f 100644 --- a/mpcontribs-lux/mpcontribs/lux/autogen.py +++ b/mpcontribs-lux/mpcontribs/lux/autogen.py @@ -118,7 +118,7 @@ def pydantic_model(self) -> Type[BaseModel]: } return create_model( - f"{self.file_name.name.split('.',1)[0]}", + f"{self.file_name.name.split('.', 1)[0]}", **model_fields, ) diff --git a/mpcontribs-lux/mpcontribs/lux/projects/alab/schemas/base.py b/mpcontribs-lux/mpcontribs/lux/projects/alab/schemas/base.py index d514463dd4..b26e3d23e9 100644 --- a/mpcontribs-lux/mpcontribs/lux/projects/alab/schemas/base.py +++ b/mpcontribs-lux/mpcontribs/lux/projects/alab/schemas/base.py @@ -24,7 +24,7 @@ def ExcludeFromUpload(default: Any = None, description: str = "", **kwargs) -> A default=default, description=description, json_schema_extra={"exclude_from_upload": True}, - **kwargs + **kwargs, ) diff --git a/mpcontribs-portal/maintenance.py b/mpcontribs-portal/maintenance.py index 618bf78625..fd878968f1 100644 --- a/mpcontribs-portal/maintenance.py +++ b/mpcontribs-portal/maintenance.py @@ -12,9 +12,11 @@ def generate_downloads(names=None): q = {"name__in": names} if names else {} client = Client(host=os.environ["MPCONTRIBS_API_HOST"], headers=HEADERS) - projects = client.projects.queryProjects( - _fields=["name", "stats"], **q - ).result().get("data", []) + projects = ( + client.projects.queryProjects(_fields=["name", "stats"], **q) + .result() + .get("data", []) + ) skip = {"columns", "contributions"} print("PROJECTS", len(projects)) @@ -28,7 +30,7 @@ def generate_downloads(names=None): print(name, json.loads(resp.content)) if include: - for r in range(1, len(include)+1): + for r in range(1, len(include) + 1): for combo in combinations(include, r): resp = make_download(client, query, combo) print(name, combo, json.loads(resp.content)) diff --git a/mpcontribs-portal/mpcontribs/portal/middleware.py b/mpcontribs-portal/mpcontribs/portal/middleware.py index d9777c3d61..d41258cd54 100644 --- a/mpcontribs-portal/mpcontribs/portal/middleware.py +++ b/mpcontribs-portal/mpcontribs/portal/middleware.py @@ -1,9 +1,8 @@ class MyMiddleware: - def __init__(self, get_response): self.get_response = get_response def __call__(self, request): response = self.get_response(request) - response['X-Consumer-Id'] = request.META.get("HTTP_X_CONSUMER_ID") + response["X-Consumer-Id"] = request.META.get("HTTP_X_CONSUMER_ID") return response diff --git a/mpcontribs-portal/mpcontribs/portal/urls.py b/mpcontribs-portal/mpcontribs/portal/urls.py index fb87ece834..cb074fad97 100644 --- a/mpcontribs-portal/mpcontribs/portal/urls.py +++ b/mpcontribs-portal/mpcontribs/portal/urls.py @@ -25,7 +25,7 @@ url( r"^contributions/download/create/?$", views.create_download, - name="create_download" + name="create_download", ), url( r"^contributions/component/(?P[a-f\d]{24})$", @@ -53,7 +53,7 @@ url(r"^Fe-Co-V/?$", RedirectView.as_view(url="/projects/swf")), url( r"^ScreeningInorganicPV/?$", - RedirectView.as_view(url="/projects/screening_inorganic_pv") + RedirectView.as_view(url="/projects/screening_inorganic_pv"), ), url( r"^(?P[a-zA-Z0-9_]{3,31})/?$", diff --git a/mpcontribs-portal/mpcontribs/portal/views.py b/mpcontribs-portal/mpcontribs/portal/views.py index 566a6b6542..879ca4de14 100644 --- a/mpcontribs-portal/mpcontribs/portal/views.py +++ b/mpcontribs-portal/mpcontribs/portal/views.py @@ -55,7 +55,7 @@ def get_consumer(request): ] headers = {} for name in names: - key = f'HTTP_{name.upper().replace("-", "_")}' + key = f"HTTP_{name.upper().replace('-', '_')}" value = request.META.get(key) if value is not None: headers[name] = value @@ -126,7 +126,7 @@ def landingpage(request, project): ctx["columns"] = ["identifier", "id", "formula"] + [ col["path"] if col["unit"] == "NaN" - else f'{col["path"]} [{col["unit"]}]' + else f"{col['path']} [{col['unit']}]" for col in prov["columns"] ] ctx["search_columns"] = ["identifier", "formula"] + [ @@ -139,7 +139,7 @@ def landingpage(request, project): ] ctx["ranges"] = json.dumps( { - f'{col["path"]} [{col["unit"]}]': [col["min"], col["max"]] + f"{col['path']} [{col['unit']}]": [col["min"], col["max"]] for col in prov["columns"] if col["unit"] != "NaN" } @@ -166,7 +166,7 @@ def apply(request): if headers.get("X-Anonymous-Consumer", False): ctx["alert"] = f""" - Please log in to apply for a project. + Please log in to apply for a project. """.strip() return render(request, "apply.html", ctx.flatten()) diff --git a/mpcontribs-portal/mpcontribs/users/dilute_solute_diffusion/pre_submission.py b/mpcontribs-portal/mpcontribs/users/dilute_solute_diffusion/pre_submission.py index 045f5bd71f..ed983aaf7e 100644 --- a/mpcontribs-portal/mpcontribs/users/dilute_solute_diffusion/pre_submission.py +++ b/mpcontribs-portal/mpcontribs/users/dilute_solute_diffusion/pre_submission.py @@ -21,7 +21,6 @@ def run(mpfile, hosts=None, download=False): fpath = f"{project}.xlsx" if download or not os.path.exists(fpath): - figshare_id = 1546772 url = "https://api.figshare.com/v2/articles/{}".format(figshare_id) print("get figshare article {}".format(figshare_id)) @@ -133,7 +132,6 @@ def run(mpfile, hosts=None, download=False): mpfile.add_data_table(mpid, df_D0_Q, "D₀_Q") if hdata["Host"]["crystal_structure"] == "BCC": - print("add table for hop activation barriers for {} (BCC)".format(mpid)) columns_E = ( ["Hop activation barrier, E_{} [eV]".format(i) for i in range(2, 5)] @@ -169,7 +167,6 @@ def run(mpfile, hosts=None, download=False): mpfile.add_data_table(mpid, df_v, "hop_attempt_frequencies") elif hdata["Host"]["crystal_structure"] == "FCC": - print("add table for hop activation barriers for {} (FCC)".format(mpid)) columns_E = [ "Hop activation barrier, E_{} [eV]".format(i) for i in range(5) @@ -191,7 +188,6 @@ def run(mpfile, hosts=None, download=False): mpfile.add_data_table(mpid, df_v, "hop_attempt_frequencies") elif hdata["Host"]["crystal_structure"] == "HCP": - print("add table for hop activation barriers for {} (HCP)".format(mpid)) columns_E = [ "Hop activation barrier, E_X [eV]", diff --git a/mpcontribs-portal/mpcontribs/users/martin_lab/martin_lab.ipynb b/mpcontribs-portal/mpcontribs/users/martin_lab/martin_lab.ipynb index 63ddffaa99..c1813d0517 100644 --- a/mpcontribs-portal/mpcontribs/users/martin_lab/martin_lab.ipynb +++ b/mpcontribs-portal/mpcontribs/users/martin_lab/martin_lab.ipynb @@ -20,7 +20,7 @@ }, "outputs": [], "source": [ - "mpfile = MPFile.from_file('MPContribs/mpcontribs/users/martin_lab/mpfile_init.txt')" + "mpfile = MPFile.from_file(\"MPContribs/mpcontribs/users/martin_lab/mpfile_init.txt\")" ] }, { diff --git a/mpcontribs-portal/mpcontribs/users/screening_inorganic_pv/pre_submission.py b/mpcontribs-portal/mpcontribs/users/screening_inorganic_pv/pre_submission.py index 454a5597e3..b9eb3cfa4b 100644 --- a/mpcontribs-portal/mpcontribs/users/screening_inorganic_pv/pre_submission.py +++ b/mpcontribs-portal/mpcontribs/users/screening_inorganic_pv/pre_submission.py @@ -12,6 +12,7 @@ db = client["mpcontribs"] print(db.contributions.count_documents({"project": "screening_inorganic_pv"})) + # @duplicate_check def run(mpfile, **kwargs): diff --git a/mpcontribs-portal/mpcontribs/users/swf/pre_submission.py b/mpcontribs-portal/mpcontribs/users/swf/pre_submission.py index 6c46bc0c1a..98b38034fd 100644 --- a/mpcontribs-portal/mpcontribs/users/swf/pre_submission.py +++ b/mpcontribs-portal/mpcontribs/users/swf/pre_submission.py @@ -6,20 +6,20 @@ def round_to_100_percent(number_set, digit_after_decimal=1): unround_numbers = [ - x / float(sum(number_set)) * 100 * 10 ** digit_after_decimal for x in number_set + x / float(sum(number_set)) * 100 * 10**digit_after_decimal for x in number_set ] decimal_part_with_index = sorted( [(index, unround_numbers[index] % 1) for index in range(len(unround_numbers))], key=lambda y: y[1], reverse=True, ) - remainder = 100 * 10 ** digit_after_decimal - sum(map(int, unround_numbers)) + remainder = 100 * 10**digit_after_decimal - sum(map(int, unround_numbers)) index = 0 while remainder > 0: unround_numbers[decimal_part_with_index[index][0]] += 1 remainder -= 1 index = (index + 1) % len(number_set) - return [int(x) / float(10 ** digit_after_decimal) for x in unround_numbers] + return [int(x) / float(10**digit_after_decimal) for x in unround_numbers] @duplicate_check diff --git a/mpcontribs-portal/mpcontribs/users/utils.py b/mpcontribs-portal/mpcontribs/users/utils.py index 4cf02217e9..487f9af679 100644 --- a/mpcontribs-portal/mpcontribs/users/utils.py +++ b/mpcontribs-portal/mpcontribs/users/utils.py @@ -45,7 +45,10 @@ def wrapper(*args, **kwargs): # https://stackoverflow.com/a/55545369 -def unflatten(d: Dict[str, Any], base: Dict[str, Any] = None,) -> Dict[str, Any]: +def unflatten( + d: Dict[str, Any], + base: Dict[str, Any] = None, +) -> Dict[str, Any]: """Convert any keys containing dotted paths to nested dicts >>> unflatten({'a': 12, 'b': 13, 'c': 14}) # no expansion diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/2dmatpedia.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/2dmatpedia.ipynb index daf3c45748..69f3d106fe 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/2dmatpedia.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/2dmatpedia.ipynb @@ -20,7 +20,7 @@ "metadata": {}, "outputs": [], "source": [ - "name = '2dmatpedia'\n", + "name = \"2dmatpedia\"\n", "client = Client()\n", "mpr = MPRester()" ] @@ -61,20 +61,20 @@ " \"Eˣ\": \"exfoliation energy\",\n", " \"E\": \"energy\",\n", " \"Eᵛᵈʷ\": \"van-der-Waals energy\",\n", - " \"µ\": \"total magnetization\"\n", + " \"µ\": \"total magnetization\",\n", "}\n", "\n", "project = {\n", - " 'is_public': True,\n", - " 'title': '2DMatPedia',\n", - " 'long_title': '2D Materials Encyclopedia',\n", - " 'owner': 'migueldiascosta@nus.edu.sg',\n", - " 'authors': 'M. Dias Costa, F.Y. Ping, Z. Jun',\n", - " 'description': description,\n", - " 'references': [\n", - " {'label': 'WWW', 'url': 'http://www.2dmatpedia.org'},\n", - " {'label': 'PRL', 'url': 'https://doi.org/10.1103/PhysRevLett.118.106101'}\n", - " ]\n", + " \"is_public\": True,\n", + " \"title\": \"2DMatPedia\",\n", + " \"long_title\": \"2D Materials Encyclopedia\",\n", + " \"owner\": \"migueldiascosta@nus.edu.sg\",\n", + " \"authors\": \"M. Dias Costa, F.Y. Ping, Z. Jun\",\n", + " \"description\": description,\n", + " \"references\": [\n", + " {\"label\": \"WWW\", \"url\": \"http://www.2dmatpedia.org\"},\n", + " {\"label\": \"PRL\", \"url\": \"https://doi.org/10.1103/PhysRevLett.118.106101\"},\n", + " ],\n", "}\n", "\n", "# client.projects.update_entry(pk=name, project=project).result()\n", @@ -89,21 +89,18 @@ "outputs": [], "source": [ "columns = {\n", - " 'material_id': {'name': 'details'},\n", - " 'source_id': {'name': 'source'},\n", - " 'discovery_process': {'name': 'process'},\n", - " 'bandgap': {'name': 'ΔE', 'unit': 'eV'},\n", - " 'decomposition_energy': {'name': 'Eᵈ', 'unit': 'eV/atom'},\n", - " 'exfoliation_energy_per_atom': {'name': 'Eˣ', 'unit': 'eV/atom'},\n", - " 'energy_per_atom': {'name': 'E', 'unit': 'eV/atom'},\n", - " 'energy_vdw_per_atom': {'name': 'Eᵛᵈʷ', 'unit': 'eV/atom'},\n", - " 'total_magnetization': {'name': 'µ', 'unit': 'µᵇ'} \n", + " \"material_id\": {\"name\": \"details\"},\n", + " \"source_id\": {\"name\": \"source\"},\n", + " \"discovery_process\": {\"name\": \"process\"},\n", + " \"bandgap\": {\"name\": \"ΔE\", \"unit\": \"eV\"},\n", + " \"decomposition_energy\": {\"name\": \"Eᵈ\", \"unit\": \"eV/atom\"},\n", + " \"exfoliation_energy_per_atom\": {\"name\": \"Eˣ\", \"unit\": \"eV/atom\"},\n", + " \"energy_per_atom\": {\"name\": \"E\", \"unit\": \"eV/atom\"},\n", + " \"energy_vdw_per_atom\": {\"name\": \"Eᵛᵈʷ\", \"unit\": \"eV/atom\"},\n", + " \"total_magnetization\": {\"name\": \"µ\", \"unit\": \"µᵇ\"},\n", "}\n", "\n", - "init_columns = {\n", - " v[\"name\"]: v.get(\"unit\")\n", - " for v in columns.values()\n", - "}\n", + "init_columns = {v[\"name\"]: v.get(\"unit\") for v in columns.values()}\n", "init_columns[\"structures\"] = None\n", "\n", "# client.init_columns(name, init_columns)\n", @@ -125,13 +122,13 @@ "source": [ "db_json = \"http://www.2dmatpedia.org/static/db.json.gz\"\n", "raw_data = [] # as read from raw files\n", - "dbfile = db_json.rsplit('/')[-1]\n", + "dbfile = db_json.rsplit(\"/\")[-1]\n", "\n", "if not os.path.exists(dbfile):\n", - " print('downloading', dbfile, '...')\n", + " print(\"downloading\", dbfile, \"...\")\n", " urlretrieve(db_json, dbfile)\n", "\n", - "with gzip.open(dbfile, 'rb') as f:\n", + "with gzip.open(dbfile, \"rb\") as f:\n", " for line in f:\n", " raw_data.append(json.loads(line, cls=MontyDecoder))\n", "\n", @@ -146,23 +143,23 @@ "source": [ "details_url = \"http://www.2dmatpedia.org/2dmaterials/doc/\"\n", "contributions = []\n", - "prefixes = {'mp', 'mvc', '2dm'}\n", + "prefixes = {\"mp\", \"mvc\", \"2dm\"}\n", "\n", "for rd in raw_data:\n", - " source_id = rd['source_id']\n", - " prefix = source_id.split('-')[0]\n", - " \n", + " source_id = rd[\"source_id\"]\n", + " prefix = source_id.split(\"-\")[0]\n", + "\n", " if prefix not in prefixes:\n", " continue\n", - " \n", - " identifier = rd['material_id'] if prefix == \"2dm\" else source_id \n", + "\n", + " identifier = rd[\"material_id\"] if prefix == \"2dm\" else source_id\n", " d = {}\n", - " \n", + "\n", " for k, col in columns.items():\n", " value = rd.get(k)\n", " if not value:\n", " continue\n", - " \n", + "\n", " unit = col.get(\"unit\")\n", "\n", " if k == \"material_id\" or (k == \"source_id\" and rd[k].startswith(\"2dm\")):\n", @@ -175,8 +172,11 @@ " d[col[\"name\"]] = value\n", "\n", " contrib = {\n", - " 'project': name, 'is_public': True, 'identifier': identifier,\n", - " 'data': d, 'structures': [rd[\"structure\"]]\n", + " \"project\": name,\n", + " \"is_public\": True,\n", + " \"identifier\": identifier,\n", + " \"data\": d,\n", + " \"structures\": [rd[\"structure\"]],\n", " }\n", "\n", " contributions.append(contrib)\n", @@ -201,13 +201,18 @@ "# client.init_columns(name, init_columns)\n", "# do manual dupe check (due to unique_identifiers=False) and submit missing contributions\n", "all_ids = client.get_all_ids(\n", - " query={\"project\": name}, data_id_fields={name: \"details\"}\n", + " query={\"project\": name},\n", + " data_id_fields={name: \"details\"},\n", " # TODO use fmt=\"map\" for update\n", ").get(name)\n", - "client.submit_contributions([\n", - " contrib for contrib in contributions\n", - " if contrib[\"data\"][\"details\"] not in all_ids[\"details_set\"]\n", - "], per_page=30)" + "client.submit_contributions(\n", + " [\n", + " contrib\n", + " for contrib in contributions\n", + " if contrib[\"data\"][\"details\"] not in all_ids[\"details_set\"]\n", + " ],\n", + " per_page=30,\n", + ")" ] }, { diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/Broberg_benchmark_defects.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/Broberg_benchmark_defects.ipynb index 4a51055e57..0e1ea669f2 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/Broberg_benchmark_defects.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/Broberg_benchmark_defects.ipynb @@ -37,7 +37,9 @@ "source": [ "# load data\n", "drivedir = Path(\"/Users/patrick/GoogleDriveLBNL/My Drive/\")\n", - "datadir = drivedir / Path(\"MaterialsProject/gitrepos/mpcontribs-data/Broberg_benchmark_defects\")\n", + "datadir = drivedir / Path(\n", + " \"MaterialsProject/gitrepos/mpcontribs-data/Broberg_benchmark_defects\"\n", + ")\n", "df_bulk = read_excel(datadir / \"bulk_data.xlsx\")\n", "df_defect = read_excel(datadir / \"defect_level_data.xlsx\")\n", "df_transition = read_excel(datadir / \"transition_level_data.xlsx\")" @@ -52,10 +54,10 @@ "source": [ "# clean DOIs column\n", "def clean_dois(s):\n", - " return \",\".join([\n", - " doi.strip().replace(\"https://doi.org/\", \"\")\n", - " for doi in s.split(\",\")\n", - " ])\n", + " return \",\".join(\n", + " [doi.strip().replace(\"https://doi.org/\", \"\") for doi in s.split(\",\")]\n", + " )\n", + "\n", "\n", "df_bulk[\"DOI\"] = df_bulk[\"DOI\"].apply(clean_dois)" ] @@ -74,12 +76,13 @@ " formula, system, symmetry = name.split(\"_\")\n", " print(formula, system, symmetry)\n", " doc = mpr.summary.search(\n", - " formula=formula, crystal_system=system.capitalize(),\n", + " formula=formula,\n", + " crystal_system=system.capitalize(),\n", " fields=[\"material_id\", \"formula_pretty\", \"crystal_system\", \"symmetry\"],\n", - " sort_fields=\"energy_above_hull\"\n", + " sort_fields=\"energy_above_hull\",\n", " )[0]\n", " mpids.append(doc.material_id)\n", - " \n", + "\n", "df_bulk[\"mp-id\"] = mpids" ] }, @@ -96,133 +99,82 @@ " \"mp-id\": {\"name\": \"identifier\"},\n", " \"Bulk Name\": {\"name\": \"info.bulk\", \"unit\": None},\n", " \"DOI\": {\"name\": \"info.DOIs\", \"unit\": None},\n", - " \"GGA-PBE gap\": {\n", - " \"name\": \"PBE.gap\",\n", - " \"unit\": \"eV\"\n", - " },\n", - " \"GGA-PBE Elt A\": {\n", - " \"name\": \"PBE.elements.A.name\",\n", - " \"unit\": None\n", - " },\n", + " \"GGA-PBE gap\": {\"name\": \"PBE.gap\", \"unit\": \"eV\"},\n", + " \"GGA-PBE Elt A\": {\"name\": \"PBE.elements.A.name\", \"unit\": None},\n", " \"GGA-PBE Elt A chemical potential\": {\n", " \"name\": \"PBE.elements.A.chempot\",\n", - " \"unit\": \"eV\"\n", - " },\n", - " \"GGA-PBE Elt B\": {\n", - " \"name\": \"PBE.elements.B.name\",\n", - " \"unit\": None\n", + " \"unit\": \"eV\",\n", " },\n", + " \"GGA-PBE Elt B\": {\"name\": \"PBE.elements.B.name\", \"unit\": None},\n", " \"GGA-PBE Elt B chemical potential\": {\n", " \"name\": \"PBE.elements.B.chempot\",\n", - " \"unit\": \"eV\"\n", - " },\n", - " \"GGA-PBE Elt C\": {\n", - " \"name\": \"PBE.elements.C.name\",\n", - " \"unit\": None\n", + " \"unit\": \"eV\",\n", " },\n", + " \"GGA-PBE Elt C\": {\"name\": \"PBE.elements.C.name\", \"unit\": None},\n", " \"GGA-PBE Elt C chemical potential\": {\n", " \"name\": \"PBE.elements.C.chempot\",\n", - " \"unit\": \"eV\"\n", - " },\n", - " \"GGA-PBE Elt D\": {\n", - " \"name\": \"PBE.elements.D.name\",\n", - " \"unit\": None\n", + " \"unit\": \"eV\",\n", " },\n", + " \"GGA-PBE Elt D\": {\"name\": \"PBE.elements.D.name\", \"unit\": None},\n", " \"GGA-PBE Elt D chemical potential\": {\n", " \"name\": \"PBE.elements.D.chempot\",\n", - " \"unit\": \"eV\"\n", - " },\n", - " \"GGA-PBE Elt E\": {\n", - " \"name\": \"PBE.elements.E.name\",\n", - " \"unit\": None\n", + " \"unit\": \"eV\",\n", " },\n", + " \"GGA-PBE Elt E\": {\"name\": \"PBE.elements.E.name\", \"unit\": None},\n", " \"GGA-PBE Elt E chemical potential\": {\n", " \"name\": \"PBE.elements.E.chempot\",\n", - " \"unit\": \"eV\"\n", - " },\n", - " \"Auto HSE06 gap\": {\n", - " \"name\": \"HSE06.gap\",\n", - " \"unit\": \"eV\"\n", - " },\n", - " \"FL no_bes\": {\n", - " \"name\": \"fermi.noBES\",\n", - " \"unit\": \"eV\"\n", - " },\n", - " \"FL bes\": {\n", - " \"name\": \"fermi.BES\",\n", - " \"unit\": \"eV\"\n", - " },\n", - " \"FL bes_free\": {\n", - " \"name\": \"fermi.freeBES\",\n", - " \"unit\": \"eV\"\n", - " },\n", - " \"lower dopability no_bes\": {\n", - " \"name\": \"fermi.dopability.noBES.lower\",\n", - " \"unit\": \"eV\"\n", - " },\n", - " \"upper dopability no_bes\": {\n", - " \"name\": \"fermi.dopability.noBES.upper\",\n", - " \"unit\": \"eV\"\n", - " },\n", - " \"lower dopability bes\": {\n", - " \"name\": \"fermi.dopability.BES.lower\",\n", - " \"unit\": \"eV\"\n", - " },\n", - " \"upper dopability bes\": {\n", - " \"name\": \"fermi.dopability.BES.upper\",\n", - " \"unit\": \"eV\"\n", + " \"unit\": \"eV\",\n", " },\n", + " \"Auto HSE06 gap\": {\"name\": \"HSE06.gap\", \"unit\": \"eV\"},\n", + " \"FL no_bes\": {\"name\": \"fermi.noBES\", \"unit\": \"eV\"},\n", + " \"FL bes\": {\"name\": \"fermi.BES\", \"unit\": \"eV\"},\n", + " \"FL bes_free\": {\"name\": \"fermi.freeBES\", \"unit\": \"eV\"},\n", + " \"lower dopability no_bes\": {\"name\": \"fermi.dopability.noBES.lower\", \"unit\": \"eV\"},\n", + " \"upper dopability no_bes\": {\"name\": \"fermi.dopability.noBES.upper\", \"unit\": \"eV\"},\n", + " \"lower dopability bes\": {\"name\": \"fermi.dopability.BES.lower\", \"unit\": \"eV\"},\n", + " \"upper dopability bes\": {\"name\": \"fermi.dopability.BES.upper\", \"unit\": \"eV\"},\n", " \"lower dopability bes_free\": {\n", " \"name\": \"fermi.dopability.freeBES.lower\",\n", - " \"unit\": \"eV\"\n", + " \"unit\": \"eV\",\n", " },\n", " \"upper dopability bes_free\": {\n", " \"name\": \"fermi.dopability.freeBES.upper\",\n", - " \"unit\": \"eV\"\n", + " \"unit\": \"eV\",\n", " },\n", " \"hybrid-published gap\": {\"name\": \"hybrid.gap\", \"unit\": \"eV\"},\n", " \"FL hybrid-published\": {\"name\": \"hybrid.fermi\", \"unit\": \"eV\"},\n", - " \"lower dopability hybrid-published\": {\"name\": \"hybrid.dopability.lower\", \"unit\": \"eV\"},\n", - " \"upper dopability hybrid-published\": {\"name\": \"hybrid.dopability.upper\", \"unit\": \"eV\"},\n", - " \"hybrid-published Elt A\": {\n", - " \"name\": \"hybrid.elements.A.name\",\n", - " \"unit\": None\n", + " \"lower dopability hybrid-published\": {\n", + " \"name\": \"hybrid.dopability.lower\",\n", + " \"unit\": \"eV\",\n", + " },\n", + " \"upper dopability hybrid-published\": {\n", + " \"name\": \"hybrid.dopability.upper\",\n", + " \"unit\": \"eV\",\n", " },\n", + " \"hybrid-published Elt A\": {\"name\": \"hybrid.elements.A.name\", \"unit\": None},\n", " \"hybrid-published Elt A chemical potential\": {\n", " \"name\": \"hybrid.elements.A.chempot\",\n", - " \"unit\": \"eV\"\n", - " },\n", - " \"hybrid-published Elt B\": {\n", - " \"name\": \"hybrid.elements.B.name\",\n", - " \"unit\": None\n", + " \"unit\": \"eV\",\n", " },\n", + " \"hybrid-published Elt B\": {\"name\": \"hybrid.elements.B.name\", \"unit\": None},\n", " \"hybrid-published Elt B chemical potential\": {\n", " \"name\": \"hybrid.elements.B.chempot\",\n", - " \"unit\": \"eV\"\n", - " },\n", - " \"hybrid-published Elt C\": {\n", - " \"name\": \"hybrid.elements.C.name\",\n", - " \"unit\": None\n", + " \"unit\": \"eV\",\n", " },\n", + " \"hybrid-published Elt C\": {\"name\": \"hybrid.elements.C.name\", \"unit\": None},\n", " \"hybrid-published Elt C chemical potential\": {\n", " \"name\": \"hybrid.elements.C.chempot\",\n", - " \"unit\": \"eV\"\n", - " },\n", - " \"hybrid-published Elt D\": {\n", - " \"name\": \"hybrid.elements.D.name\",\n", - " \"unit\": None\n", + " \"unit\": \"eV\",\n", " },\n", + " \"hybrid-published Elt D\": {\"name\": \"hybrid.elements.D.name\", \"unit\": None},\n", " \"hybrid-published Elt D chemical potential\": {\n", " \"name\": \"hybrid.elements.D.chempot\",\n", - " \"unit\": \"eV\"\n", - " },\n", - " \"hybrid-published Elt E\": {\n", - " \"name\": \"hybrid.elements.E.name\",\n", - " \"unit\": None\n", + " \"unit\": \"eV\",\n", " },\n", + " \"hybrid-published Elt E\": {\"name\": \"hybrid.elements.E.name\", \"unit\": None},\n", " \"hybrid-published Elt E chemical potential\": {\n", " \"name\": \"hybrid.elements.E.chempot\",\n", - " \"unit\": \"eV\"\n", + " \"unit\": \"eV\",\n", " },\n", "}" ] @@ -250,13 +202,15 @@ "def apply_unit(cell, unit):\n", " if isinstance(cell, str) and cell.strip() == \"-\":\n", " return \"\"\n", - " \n", + "\n", " return f\"{cell} {unit}\" if unit and cell else cell\n", "\n", + "\n", "def apply_units(column):\n", " unit = columns_map_bulk[column.name].get(\"unit\")\n", " return column.apply(apply_unit, args=(unit,))\n", "\n", + "\n", "df_bulk = df_bulk.apply(apply_units)" ] }, @@ -290,7 +244,7 @@ " contrib = {\n", " \"identifier\": identifier,\n", " \"data\": unflatten(data, splitter=\"dot\"),\n", - " \"attachments\": []\n", + " \"attachments\": [],\n", " }\n", " bulk_name = data[\"info.bulk\"]\n", " formula, system, symmetry = bulk_name.split(\"_\")\n", @@ -314,8 +268,8 @@ " ]\n", " contrib[\"attachments\"].append(Attachment.from_data(\"transitions\", transitions))\n", " contributions.append(contrib)\n", - " \n", - " \n", + "\n", + "\n", "contributions[0]" ] }, @@ -327,7 +281,12 @@ "outputs": [], "source": [ "# initialize columns (including units)\n", - "columns = {\"info.bulk\": None, \"info.formula\": None, \"info.system\": None, \"info.symmetry\": None}\n", + "columns = {\n", + " \"info.bulk\": None,\n", + " \"info.formula\": None,\n", + " \"info.system\": None,\n", + " \"info.symmetry\": None,\n", + "}\n", "\n", "for col in columns_map_bulk.values():\n", " if \".\" in col[\"name\"]:\n", @@ -345,7 +304,7 @@ "client.init_columns(columns)\n", "client.submit_contributions(contributions)\n", "# this shouldn't be necessary but need to re-init columns likely due to bug in API server\n", - "client.init_columns(columns) " + "client.init_columns(columns)" ] } ], diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ExpXAS.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ExpXAS.ipynb index d2fdf9ba09..cd83f60e0d 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ExpXAS.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ExpXAS.ipynb @@ -32,7 +32,9 @@ "metadata": {}, "outputs": [], "source": [ - "indir = Path(\"/Users/patrick/GoogleDriveLBNL/MaterialsProject/gitrepos/mpcontribs-data/ExpXAS\")\n", + "indir = Path(\n", + " \"/Users/patrick/GoogleDriveLBNL/MaterialsProject/gitrepos/mpcontribs-data/ExpXAS\"\n", + ")\n", "ref_path = indir / \"reference.data\"\n", "spec_path = indir / \"spectrum.mu\"" ] @@ -46,10 +48,13 @@ "source": [ "# add project-wide meta data to \"Other Info\" dropdown\n", "client.projects.update_entry(\n", - " pk=name, project={\"other\": {\n", - " 'facility': 'NSLS-II',\n", - " 'beamline': 'ISS (8-ID)',\n", - " }}\n", + " pk=name,\n", + " project={\n", + " \"other\": {\n", + " \"facility\": \"NSLS-II\",\n", + " \"beamline\": \"ISS (8-ID)\",\n", + " }\n", + " },\n", ").result()" ] }, @@ -61,8 +66,12 @@ "outputs": [], "source": [ "index = \"energy [eV]\"\n", - "ref = read_csv(ref_path, sep=\" \", skiprows=[0, 1], index_col=0, names=[index, \"reference\"])\n", - "spec = read_csv(spec_path, sep=\" \", skiprows=[0, 1], index_col=0, names=[index, \"spectrum\"])" + "ref = read_csv(\n", + " ref_path, sep=\" \", skiprows=[0, 1], index_col=0, names=[index, \"reference\"]\n", + ")\n", + "spec = read_csv(\n", + " spec_path, sep=\" \", skiprows=[0, 1], index_col=0, names=[index, \"spectrum\"]\n", + ")" ] }, { @@ -75,7 +84,7 @@ "df = pd.concat([ref, spec], axis=1)\n", "df.columns.name = \"type\"\n", "df.attrs[\"title\"] = \"Fe XAS\"\n", - "df.attrs[\"labels\"] = {\"value\": \"flattened normalized μ(E)\"} \n", + "df.attrs[\"labels\"] = {\"value\": \"flattened normalized μ(E)\"}\n", "df.attrs[\"name\"] = \"Fe-XAS\"" ] }, @@ -92,30 +101,30 @@ " \"project\": name,\n", " \"identifier\": \"mp-1279742\", # assign to mp-id or use custom identifier?\n", " \"data\": {\n", - " 'meta': {\n", - " 'year': 2020,\n", - " 'cycle': 1,\n", - " 'SAF': 304823,\n", - " 'proposal': 305112,\n", - " 'PI': 'M. Liu',\n", + " \"meta\": {\n", + " \"year\": 2020,\n", + " \"cycle\": 1,\n", + " \"SAF\": 304823,\n", + " \"proposal\": 305112,\n", + " \"PI\": \"M. Liu\",\n", + " },\n", + " \"measurement\": {\n", + " \"method\": \"XAS\",\n", + " \"name\": \"FeO\",\n", + " \"composition\": \"Fe\",\n", + " \"element\": \"Fe\",\n", + " \"edge\": \"K\",\n", + " \"E₀\": \"7112 eV\", # submit numbers with units as space-separated strings\n", + " \"scanID\": 77303,\n", + " \"UID\": \"de753795-be14-402e-9a3f-5089a44ff67c\", # could be linked to BNL raw data\n", " },\n", - " 'measurement': {\n", - " 'method': 'XAS',\n", - " 'name': 'FeO',\n", - " 'composition': 'Fe',\n", - " 'element': 'Fe',\n", - " 'edge': 'K',\n", - " 'E₀': '7112 eV', # submit numbers with units as space-separated strings\n", - " 'scanID': 77303,\n", - " 'UID': 'de753795-be14-402e-9a3f-5089a44ff67c', # could be linked to BNL raw data\n", + " \"time\": {\n", + " \"start\": \"01/31/2020 17:20:43\", # TODO parse as datetime\n", + " \"stop\": \"01/31/2020 17:21:44\",\n", + " \"total\": \"1 h\",\n", " },\n", - " 'time': {\n", - " 'start': '01/31/2020 17:20:43', # TODO parse as datetime\n", - " 'stop': '01/31/2020 17:21:44',\n", - " 'total': '1 h'\n", - " } \n", " },\n", - " \"tables\": [df]\n", + " \"tables\": [df],\n", "}" ] }, @@ -137,9 +146,7 @@ "metadata": {}, "outputs": [], "source": [ - "all_ids = client.get_all_ids(\n", - " {\"project\": name}, include=[\"tables\"]\n", - ").get(name, {})\n", + "all_ids = client.get_all_ids({\"project\": name}, include=[\"tables\"]).get(name, {})\n", "cids = list(all_ids[\"ids\"])\n", "tids = list(all_ids[\"tables\"][\"ids\"])\n", "cids, tids" diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ForbiddenTransitions.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ForbiddenTransitions.ipynb index 35ee2fa6d4..ac6c0e7b3b 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ForbiddenTransitions.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ForbiddenTransitions.ipynb @@ -23,7 +23,9 @@ "metadata": {}, "outputs": [], "source": [ - "data_dir = Path(\"/Users/patrick/GoogleDriveLBNL/My Drive/MaterialsProject/gitrepos/mpcontribs-data/ForbiddenTransitions\")" + "data_dir = Path(\n", + " \"/Users/patrick/GoogleDriveLBNL/My Drive/MaterialsProject/gitrepos/mpcontribs-data/ForbiddenTransitions\"\n", + ")" ] }, { @@ -56,37 +58,114 @@ "source": [ "columns_map = {\n", " # root level\n", - " \"Materials Project ID (mpid)\": {\"name\": \"identifier\", \"description\": \"Materials Project ID as of May 30, 2023\"},\n", - " \"Formula\": {\"name\": \"formula\", \"description\": \"Chemical formula (from pretty_formula on MP)\"},\n", + " \"Materials Project ID (mpid)\": {\n", + " \"name\": \"identifier\",\n", + " \"description\": \"Materials Project ID as of May 30, 2023\",\n", + " },\n", + " \"Formula\": {\n", + " \"name\": \"formula\",\n", + " \"description\": \"Chemical formula (from pretty_formula on MP)\",\n", + " },\n", " # info\n", - " \"Space group\": {\"name\": \"info.spacegroup\", \"description\": \"Space group symbol from MP\"},\n", - " \"# ICSD entries\": {\"name\": \"info.numICSDs\", \"unit\": \"\", \"description\": \"Number of ICSD entries that structure-match to this compound (queried from the Materials Project)\"},\n", - " \"Calculation origin\": {\"name\": \"info.origin\", \"description\": \"The source of the calculation; note that some of these calculations derive from Fabini et al. 2019 (10.1021/acs.chemmater.8b04542) and the associated MPContribs data set)\"},\n", + " \"Space group\": {\n", + " \"name\": \"info.spacegroup\",\n", + " \"description\": \"Space group symbol from MP\",\n", + " },\n", + " \"# ICSD entries\": {\n", + " \"name\": \"info.numICSDs\",\n", + " \"unit\": \"\",\n", + " \"description\": \"Number of ICSD entries that structure-match to this compound (queried from the Materials Project)\",\n", + " },\n", + " \"Calculation origin\": {\n", + " \"name\": \"info.origin\",\n", + " \"description\": \"The source of the calculation; note that some of these calculations derive from Fabini et al. 2019 (10.1021/acs.chemmater.8b04542) and the associated MPContribs data set)\",\n", + " },\n", " # chemical properties\n", - " \"$t_\\mathrm{IPR}^\\mathrm{d}$\": {\"name\": \"properties.chemical.IPR\", \"description\": \"Inverse participation ratio of the direct VBM and CBM states, used as a proxy for localization of states at the band edges (a high IPR indicates strong localization), as defined by Wegner in 1980 (10.1007/BF01325284) and implemented by Xiong, et al. in 2023 (10.1126/sciadv.adh8617) (see manuscript for details)\"},\n", - " \"$σ^\\mathrm{d}$\": {\"name\": \"properties.chemical.sigma\", \"unit\": \"\", \"description\": \"Orbital similarity of the direct VBM and CBM states, derived from the dominant contributors to the density of states at the direct VBM and CBM to describe the similarity of CB-edge and VB-edge orbital contributions (see manuscript for details)\"},\n", + " \"$t_\\mathrm{IPR}^\\mathrm{d}$\": {\n", + " \"name\": \"properties.chemical.IPR\",\n", + " \"description\": \"Inverse participation ratio of the direct VBM and CBM states, used as a proxy for localization of states at the band edges (a high IPR indicates strong localization), as defined by Wegner in 1980 (10.1007/BF01325284) and implemented by Xiong, et al. in 2023 (10.1126/sciadv.adh8617) (see manuscript for details)\",\n", + " },\n", + " \"$σ^\\mathrm{d}$\": {\n", + " \"name\": \"properties.chemical.sigma\",\n", + " \"unit\": \"\",\n", + " \"description\": \"Orbital similarity of the direct VBM and CBM states, derived from the dominant contributors to the density of states at the direct VBM and CBM to describe the similarity of CB-edge and VB-edge orbital contributions (see manuscript for details)\",\n", + " },\n", " # other properties\n", - " \"$E_\\mathrm{hull}$ (eV/at.)\": {\"name\": \"properties.other.hull\", \"unit\": \"eV/atom\", \"description\": \"Energy above the convex hull, computed using GGA (or GGA+U when appropriate) and MP compatability scheme\"},\n", - " \"Synthesized?\": {\"name\": \"properties.other.synthesized\", \"description\": \"Whether a given compound has been synthesized in any form (queried from the Materials Project)\"},\n", + " \"$E_\\mathrm{hull}$ (eV/at.)\": {\n", + " \"name\": \"properties.other.hull\",\n", + " \"unit\": \"eV/atom\",\n", + " \"description\": \"Energy above the convex hull, computed using GGA (or GGA+U when appropriate) and MP compatability scheme\",\n", + " },\n", + " \"Synthesized?\": {\n", + " \"name\": \"properties.other.synthesized\",\n", + " \"description\": \"Whether a given compound has been synthesized in any form (queried from the Materials Project)\",\n", + " },\n", " # optical properties\n", - " \"$E_\\mathrm{G}^\\mathrm{GGA}$ (eV)\": {\"name\": \"properties.optical.bandgaps.GGA\", \"unit\": \"eV\", \"description\": \"Fundamental band gap computed using GGA (or GGA+U when appropriate)\"},\n", - " \"$E_\\mathrm{G}^\\mathrm{d,GGA}$ (eV)\": {\"name\": \"properties.optical.bandgaps.GGA|d\", \"unit\": \"eV\", \"description\": \"Direct band gap computed using GGA (or GGA+U when appropriate)\"},\n", - " \"$E_\\mathrm{G}^\\mathrm{da,GGA}$ (eV)\": {\"name\": \"properties.optical.bandgaps.GGA|da\", \"unit\": \"eV\", \"description\": \"Direct allowed band gap computed using GGA (or GGA+U when appropriate), defined as the energy at which dipole transition matrix elements become significant (see manuscript for details)\"},\n", - " \"$E_\\mathrm{edge}^\\mathrm{da,GGA}$ (eV)\": {\"name\": \"properties.optical.energy|edge.GGA|da\", \"unit\": \"eV\", \"description\": \"Absorption edge energy, defined as the approximate energy at which the absorption coefficient rises to 1e4 cm-1 and becomes significant (see manuscript for details)\"},\n", - " \"$Δ^\\mathrm{d,GGA}$\": {\"name\": \"properties.optical.delta.GGA|d\", \"unit\": \"\", \"description\": \"Forbidden energy difference, defined as the energy difference between the direct band gap and direct allowed band gap, such that a value greater than zero indicates the presence of forbidden or weak transitions\"},\n", - " \"$Δ_\\mathrm{edge}^\\mathrm{d,GGA}$\": {\"name\": \"properties.optical.delta|edge.GGA|d\", \"unit\": \"\", \"description\": \"Edge energy difference, defined as defined as the energy difference between the direct band gap and the absorption edge energy\"},\n", - " \"$α_\\mathrm{avg.vis}^\\mathrm{GGA}$ (cm$^{-1}$)\": {\"name\": \"properties.optical.alpha|vis\", \"unit\": \"cm⁻¹\", \"description\": \"Average GGA absorption coefficient in the visible regime, using an empirical gap correction from Morales et al. 2017 (10.1021/acs.jpcc.7b07421) (see manuscript for details; caution that this should be recalculated if using a scissor shift!)\"},\n", - " \"Optical type\": {\"name\": \"properties.optical.type\", \"description\": \"Optical type categorization (OT 1\\u20134), following the classification outlined by Yu and Zunger in 2012 (10.1103/PhysRevLett.108.068701)\"},\n", + " \"$E_\\mathrm{G}^\\mathrm{GGA}$ (eV)\": {\n", + " \"name\": \"properties.optical.bandgaps.GGA\",\n", + " \"unit\": \"eV\",\n", + " \"description\": \"Fundamental band gap computed using GGA (or GGA+U when appropriate)\",\n", + " },\n", + " \"$E_\\mathrm{G}^\\mathrm{d,GGA}$ (eV)\": {\n", + " \"name\": \"properties.optical.bandgaps.GGA|d\",\n", + " \"unit\": \"eV\",\n", + " \"description\": \"Direct band gap computed using GGA (or GGA+U when appropriate)\",\n", + " },\n", + " \"$E_\\mathrm{G}^\\mathrm{da,GGA}$ (eV)\": {\n", + " \"name\": \"properties.optical.bandgaps.GGA|da\",\n", + " \"unit\": \"eV\",\n", + " \"description\": \"Direct allowed band gap computed using GGA (or GGA+U when appropriate), defined as the energy at which dipole transition matrix elements become significant (see manuscript for details)\",\n", + " },\n", + " \"$E_\\mathrm{edge}^\\mathrm{da,GGA}$ (eV)\": {\n", + " \"name\": \"properties.optical.energy|edge.GGA|da\",\n", + " \"unit\": \"eV\",\n", + " \"description\": \"Absorption edge energy, defined as the approximate energy at which the absorption coefficient rises to 1e4 cm-1 and becomes significant (see manuscript for details)\",\n", + " },\n", + " \"$Δ^\\mathrm{d,GGA}$\": {\n", + " \"name\": \"properties.optical.delta.GGA|d\",\n", + " \"unit\": \"\",\n", + " \"description\": \"Forbidden energy difference, defined as the energy difference between the direct band gap and direct allowed band gap, such that a value greater than zero indicates the presence of forbidden or weak transitions\",\n", + " },\n", + " \"$Δ_\\mathrm{edge}^\\mathrm{d,GGA}$\": {\n", + " \"name\": \"properties.optical.delta|edge.GGA|d\",\n", + " \"unit\": \"\",\n", + " \"description\": \"Edge energy difference, defined as defined as the energy difference between the direct band gap and the absorption edge energy\",\n", + " },\n", + " \"$α_\\mathrm{avg.vis}^\\mathrm{GGA}$ (cm$^{-1}$)\": {\n", + " \"name\": \"properties.optical.alpha|vis\",\n", + " \"unit\": \"cm⁻¹\",\n", + " \"description\": \"Average GGA absorption coefficient in the visible regime, using an empirical gap correction from Morales et al. 2017 (10.1021/acs.jpcc.7b07421) (see manuscript for details; caution that this should be recalculated if using a scissor shift!)\",\n", + " },\n", + " \"Optical type\": {\n", + " \"name\": \"properties.optical.type\",\n", + " \"description\": \"Optical type categorization (OT 1\\u20134), following the classification outlined by Yu and Zunger in 2012 (10.1103/PhysRevLett.108.068701)\",\n", + " },\n", " # transport properties\n", - " \"$m^*_\\mathrm{e}$\": {\"name\": \"properties.transport.effmass.electron\", \"unit\": \"mₑ\", \"description\": \"Electron effective mass, computed using the BoltzTraP2 package assuming dopings of 10^18 cm-3 (see manuscript for details)\"},\n", - " \"$m^*_\\mathrm{h}$\": {\"name\": \"properties.transport.effmass.hole\", \"unit\": \"mₑ\", \"description\": \"Hole effective mass, computed using the BoltzTraP2 package assuming dopings of 10^18 cm-3 (see manuscript for details)\"},\n", + " \"$m^*_\\mathrm{e}$\": {\n", + " \"name\": \"properties.transport.effmass.electron\",\n", + " \"unit\": \"mₑ\",\n", + " \"description\": \"Electron effective mass, computed using the BoltzTraP2 package assuming dopings of 10^18 cm-3 (see manuscript for details)\",\n", + " },\n", + " \"$m^*_\\mathrm{h}$\": {\n", + " \"name\": \"properties.transport.effmass.hole\",\n", + " \"unit\": \"mₑ\",\n", + " \"description\": \"Hole effective mass, computed using the BoltzTraP2 package assuming dopings of 10^18 cm-3 (see manuscript for details)\",\n", + " },\n", "}\n", "\n", "legend = {v[\"name\"]: v[\"description\"] for v in columns_map.values()}\n", - "legend[\"tables.corrected\"] = \"Absorption coefficient computed with the IPA and a GGA functional, using the empirical gap correction from Morales et al. 2017 (10.1021/acs.jpcc.7b07421) (see manuscript for details)\"\n", - "legend[\"tables.uncorrected\"] = \"Absorption coefficient computed with the IPA and a GGA functional (without any empirical gap correction as in alpha; see manuscript for details)\"\n", + "legend[\"tables.corrected\"] = (\n", + " \"Absorption coefficient computed with the IPA and a GGA functional, using the empirical gap correction from Morales et al. 2017 (10.1021/acs.jpcc.7b07421) (see manuscript for details)\"\n", + ")\n", + "legend[\"tables.uncorrected\"] = (\n", + " \"Absorption coefficient computed with the IPA and a GGA functional (without any empirical gap correction as in alpha; see manuscript for details)\"\n", + ")\n", "\n", - "columns = {v[\"name\"]: v.get(\"unit\") for v in columns_map.values() if v[\"name\"] not in [\"identifier\", \"formula\"]}" + "columns = {\n", + " v[\"name\"]: v.get(\"unit\")\n", + " for v in columns_map.values()\n", + " if v[\"name\"] not in [\"identifier\", \"formula\"]\n", + "}" ] }, { @@ -114,7 +193,7 @@ " for k, v in record.items():\n", " if not isinstance(v, str) and isnan(v):\n", " continue\n", - " \n", + "\n", " key = columns_map[k][\"name\"]\n", " unit = columns_map[k].get(\"unit\")\n", " val = v\n", @@ -122,29 +201,38 @@ " val = \"Yes\" if v else \"No\"\n", " elif unit:\n", " val = f\"{v} {unit}\"\n", - " \n", + "\n", " clean[key] = val\n", "\n", - " contrib = {\"identifier\": clean.pop(\"identifier\"), \"formula\": clean.pop(\"formula\"), \"tables\": []}\n", + " contrib = {\n", + " \"identifier\": clean.pop(\"identifier\"),\n", + " \"formula\": clean.pop(\"formula\"),\n", + " \"tables\": [],\n", + " }\n", " contrib[\"data\"] = unflatten(clean, splitter=\"dot\")\n", "\n", " spectrum = spectra.get(contrib[\"identifier\"])\n", " if spectrum:\n", " spectrum.pop(\"mpid\", None)\n", " spectrum.pop(\"formula\", None)\n", - " table = pd.DataFrame(data=spectrum).rename(\n", - " columns={\"energy\": \"energy [eV]\", \"alpha\": \"α\", \"alpha_uncorr\": \"α|uncorrected\"}\n", - " ).set_index(\"energy [eV]\")\n", + " table = (\n", + " pd.DataFrame(data=spectrum)\n", + " .rename(\n", + " columns={\n", + " \"energy\": \"energy [eV]\",\n", + " \"alpha\": \"α\",\n", + " \"alpha_uncorr\": \"α|uncorrected\",\n", + " }\n", + " )\n", + " .set_index(\"energy [eV]\")\n", + " )\n", " table.attrs = {\n", " \"name\": \"absorption coefficients\",\n", " \"title\": \"Energy-dependent Absorption Coefficients\",\n", - " \"labels\": {\n", - " \"value\": \"absorption coefficient [cm⁻¹]\",\n", - " \"variable\": \"method\"\n", - " }\n", + " \"labels\": {\"value\": \"absorption coefficient [cm⁻¹]\", \"variable\": \"method\"},\n", " }\n", " contrib[\"tables\"].append(table)\n", - " \n", + "\n", " contributions.append(contrib)\n", "\n", "len(contributions)" @@ -203,7 +291,7 @@ "query = {\n", " \"data__properties__other__synthesized__exact\": \"Yes\",\n", " \"data__properties__optical__type__contains\": \"ia\",\n", - " \"data__properties__optical__bandgaps__GGA__value__gt\": 3\n", + " \"data__properties__optical__bandgaps__GGA__value__gt\": 3,\n", "}\n", "client.count(query=query)" ] @@ -215,7 +303,9 @@ "metadata": {}, "outputs": [], "source": [ - "contribs = client.query_contributions(query=query, fields=[\"identifier\", \"data.properties.other\"], paginate=True)\n", + "contribs = client.query_contributions(\n", + " query=query, fields=[\"identifier\", \"data.properties.other\"], paginate=True\n", + ")\n", "contribs[\"data\"][0][\"data\"]" ] }, @@ -227,7 +317,7 @@ "outputs": [], "source": [ "contribs = client.download_contributions(query=query, include=[\"tables\"])\n", - "contribs[0][\"tables\"][0] # DataFrame" + "contribs[0][\"tables\"][0] # DataFrame" ] } ], diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/HFP2023.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/HFP2023.ipynb index 9b0f05ceb1..586cdc419f 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/HFP2023.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/HFP2023.ipynb @@ -49,7 +49,10 @@ "metadata": {}, "outputs": [], "source": [ - "lookup = {doc[\"formula_pretty\"] + \"_\" + str(doc[\"symmetry\"][\"number\"]): doc[\"task_id\"] for doc in tasks}" + "lookup = {\n", + " doc[\"formula_pretty\"] + \"_\" + str(doc[\"symmetry\"][\"number\"]): doc[\"task_id\"]\n", + " for doc in tasks\n", + "}" ] }, { @@ -88,7 +91,7 @@ "def make_gzip(p_in):\n", " p_out = str(p_in) + \".gz\"\n", " if not Path(p_out).exists():\n", - " with p_in.open('rb') as f_in, gzip.open(p_out, 'wb') as f_out:\n", + " with p_in.open(\"rb\") as f_in, gzip.open(p_out, \"wb\") as f_out:\n", " f_out.writelines(f_in)" ] }, @@ -100,41 +103,37 @@ "outputs": [], "source": [ "columns = {\n", - " \"polarization\": {\n", - " \"v1\": \"C/m²\",\n", - " \"v2\": \"C/m²\",\n", - " \"v3\": \"C/m²\",\n", - " \"mag\": \"C/m²\"\n", - " },\n", + " \"polarization\": {\"v1\": \"C/m²\", \"v2\": \"C/m²\", \"v3\": \"C/m²\", \"mag\": \"C/m²\"},\n", " \"mechanic\": {\n", " \"moduli.bulk\": \"N/m²\",\n", " \"moduli.young\": \"N/m²\",\n", " \"moduli.shear\": \"N/m²\",\n", - " \"ratios.pugh\": \"\", # dimensionless number\n", + " \"ratios.pugh\": \"\", # dimensionless number\n", " \"ratios.poisson\": \"\",\n", " \"compressibility\": \"m²/N\",\n", - " \"unknown\": \"\"\n", - " }\n", + " \"unknown\": \"\",\n", + " },\n", "}\n", "\n", + "\n", "def make_data(key, vals):\n", " cols = columns[key]\n", " dct = {}\n", - " \n", + "\n", " for k, v in dict(zip(cols.keys(), vals)).items():\n", " unit = cols[k]\n", - " dct[k] = f\"{v} {unit}\" if unit else v # 5.5 eV, 100 N/m2\n", - " \n", + " dct[k] = f\"{v} {unit}\" if unit else v # 5.5 eV, 100 N/m2\n", + "\n", " return unflatten(dct, splitter=\"dot\")\n", "\n", "\n", "contributions = []\n", "\n", - "for subdir in datadir.glob('**/*'): # looping over subdirectories (DMP-Co)\n", + "for subdir in datadir.glob(\"**/*\"): # looping over subdirectories (DMP-Co)\n", " if subdir.is_file():\n", " continue\n", - " \n", - " identifier = subdir.name # default to subdir as identifier\n", + "\n", + " identifier = subdir.name # default to subdir as identifier\n", " cifs = list(subdir.glob(\"*.cif\"))\n", "\n", " if cifs:\n", @@ -154,7 +153,7 @@ " # _, spacegroup_number = structure.get_space_group_info()\n", " # chemsys = composition.chemical_system\n", "\n", - " # # 1) try formula and space group \n", + " # # 1) try formula and space group\n", " # docs = search(formula=formula, spacegroup_number=spacegroup_number)\n", " # if not docs:\n", " # # 2) try formula\n", @@ -171,17 +170,19 @@ " formula, _ = composition.get_reduced_formula_and_factor()\n", " _, spacegroup_number = structure.get_space_group_info()\n", " identifier = lookup[f\"{formula}_{spacegroup_number}\"]\n", - " print(identifier) # \"link to MP\"\n", - " \n", + " print(identifier) # \"link to MP\"\n", + "\n", " # make sure everything's gzipped\n", " for p in subdir.glob(\"*.*\"):\n", " if p.suffix in {\".txt\", \".vasp\", \".cif\"}:\n", " make_gzip(p)\n", - " \n", + "\n", " # init contribution; add all files as attachments; add structure\n", " contrib = {\n", - " \"identifier\": identifier, \"formula\": formula, \"data\": {},\n", - " \"attachments\": list(subdir.glob(\"*.gz\"))\n", + " \"identifier\": identifier,\n", + " \"formula\": formula,\n", + " \"data\": {},\n", + " \"attachments\": list(subdir.glob(\"*.gz\")),\n", " }\n", " if identifier.startswith(\"mp-\"):\n", " contrib[\"structures\"] = [structure]\n", @@ -194,16 +195,16 @@ " contrib[\"data\"][\"polarization\"] = make_data(\"polarization\", values)\n", " elif len(values) == 7:\n", " contrib[\"data\"][\"mechanic\"] = make_data(\"mechanic\", values)\n", - " \n", - "# # option to add tensors to `data` \n", - "# for fn in subdir.glob(\"*.txt\"):\n", - "# stem = fn.stem.lower()\n", - "# if stem.endswith(\"_tensor\"):\n", - "# field = \".\".join(stem.split(\"_\")[:-1])\n", - "# df = read_csv(fn, sep=\"\\t\", header=0, names=range(1, 7))\n", - "# df.index = range(1,4)\n", - "# contrib[\"data\"][field] = df.T.to_dict()\n", - " \n", + "\n", + " # # option to add tensors to `data`\n", + " # for fn in subdir.glob(\"*.txt\"):\n", + " # stem = fn.stem.lower()\n", + " # if stem.endswith(\"_tensor\"):\n", + " # field = \".\".join(stem.split(\"_\")[:-1])\n", + " # df = read_csv(fn, sep=\"\\t\", header=0, names=range(1, 7))\n", + " # df.index = range(1,4)\n", + " # contrib[\"data\"][field] = df.T.to_dict()\n", + "\n", " contributions.append(contrib)" ] }, @@ -229,7 +230,7 @@ "client.init_columns(columns)\n", "client.submit_contributions(contributions)\n", "# this shouldn't be necessary but need to re-init columns likely due to bug in API server\n", - "client.init_columns(columns) " + "client.init_columns(columns)" ] } ], diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/MnO2_phase_selection.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/MnO2_phase_selection.ipynb index d6c63cb805..8a2c617383 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/MnO2_phase_selection.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/MnO2_phase_selection.ipynb @@ -19,7 +19,7 @@ "metadata": {}, "outputs": [], "source": [ - "name = 'MnO2_phase_selection'\n", + "name = \"MnO2_phase_selection\"\n", "client = Client()\n", "mpr = MPRester()" ] @@ -47,13 +47,13 @@ "outputs": [], "source": [ "phase_names = {\n", - " 'beta': 'Pyrolusite',\n", - " 'gamma': 'Intergrowth',\n", - " 'ramsdellite': 'Ramsdellite',\n", - " 'alpha': 'Hollandite',\n", - " 'lambda': 'Spinel',\n", - " 'delta': 'Layered',\n", - " 'other': 'Other',\n", + " \"beta\": \"Pyrolusite\",\n", + " \"gamma\": \"Intergrowth\",\n", + " \"ramsdellite\": \"Ramsdellite\",\n", + " \"alpha\": \"Hollandite\",\n", + " \"lambda\": \"Spinel\",\n", + " \"delta\": \"Layered\",\n", + " \"other\": \"Other\",\n", "}" ] }, @@ -63,9 +63,9 @@ "metadata": {}, "outputs": [], "source": [ - "client.projects.update_entry(pk=name, project={\n", - " 'other.phase−names': phase_names\n", - "}).result()" + "client.projects.update_entry(\n", + " pk=name, project={\"other.phase−names\": phase_names}\n", + ").result()" ] }, { @@ -84,8 +84,10 @@ "# mp_contrib_phases: data/MPContrib_formatted_entries.json\n", "# hull_states: data/MPContrib_hull_entries.json\n", "data = {}\n", - "for fn in os.scandir('/Users/patrick/gitrepos/mp/MPContribs/mpcontribs-data/MnO2_phase_selection'):\n", - " with open(fn, 'r') as f:\n", + "for fn in os.scandir(\n", + " \"/Users/patrick/gitrepos/mp/MPContribs/mpcontribs-data/MnO2_phase_selection\"\n", + "):\n", + " with open(fn, \"r\") as f:\n", " data[fn.name] = json.load(f)" ] }, @@ -96,8 +98,10 @@ "outputs": [], "source": [ "other = [\n", - " ['LiMnO2', -3.064, 'Y', '--'], ['KMnO2', -2.222, 'Y', '--'],\n", - " ['Ca0.5MnO2', -2.941, 'Y', '--'], ['Na0.5MnO2', -1.415, 'Y', '--']\n", + " [\"LiMnO2\", -3.064, \"Y\", \"--\"],\n", + " [\"KMnO2\", -2.222, \"Y\", \"--\"],\n", + " [\"Ca0.5MnO2\", -2.941, \"Y\", \"--\"],\n", + " [\"Na0.5MnO2\", -1.415, \"Y\", \"--\"],\n", "]" ] }, @@ -109,43 +113,43 @@ "source": [ "identifiers, contributions = set(), []\n", "\n", - "for hstate in tqdm(data['MPContrib_hull_entries.json']):\n", - " contrib = {'project': name, 'is_public': True, 'structures': []}\n", - " phase = hstate['phase']\n", - " composition = Composition.from_dict(hstate['c'])\n", - " structure = Structure.from_dict(hstate['s'])\n", + "for hstate in tqdm(data[\"MPContrib_hull_entries.json\"]):\n", + " contrib = {\"project\": name, \"is_public\": True, \"structures\": []}\n", + " phase = hstate[\"phase\"]\n", + " composition = Composition.from_dict(hstate[\"c\"])\n", + " structure = Structure.from_dict(hstate[\"s\"])\n", " mpids = mpr.find_structure(structure)\n", " comp = composition.get_integer_formula_and_factor()[0]\n", " identifier = mpids[0] if mpids else comp\n", - " contrib['identifier'] = identifier\n", - " \n", + " contrib[\"identifier\"] = identifier\n", + "\n", " if identifier in identifiers:\n", " continue\n", - " \n", + "\n", " phase_name = phase_names[phase]\n", - " phase_data = data['MPContrib_formatted_entries.json'].get(phase_name, other)\n", + " phase_data = data[\"MPContrib_formatted_entries.json\"].get(phase_name, other)\n", " if not phase_data:\n", " # print('no data found for', composition, phase_name)\n", " continue\n", "\n", " for iv, values in enumerate(phase_data):\n", " if Composition(values[0]) == composition:\n", - " contrib['data'] = {'GS': values[2], 'ΔH': f'{values[1]} eV/mol'}\n", + " contrib[\"data\"] = {\"GS\": values[2], \"ΔH\": f\"{values[1]} eV/mol\"}\n", " if not isinstance(values[3], str):\n", - " contrib['data']['ΔHʰ'] = f'{values[3]} eV/mol'\n", + " contrib[\"data\"][\"ΔHʰ\"] = f\"{values[3]} eV/mol\"\n", " break\n", " else:\n", " # print('no data found for', composition, phase)\n", " continue\n", "\n", - " contrib['structures'].append(structure)\n", + " contrib[\"structures\"].append(structure)\n", " contributions.append(contrib)\n", " identifiers.add(identifier)\n", "\n", "# make sure that contributions with all columns come first\n", - "contributions = [d for d in sorted(\n", - " contributions, key=lambda x: len(x[\"data\"]), reverse=True\n", - ")]\n", + "contributions = [\n", + " d for d in sorted(contributions, key=lambda x: len(x[\"data\"]), reverse=True)\n", + "]\n", "len(contributions)" ] }, @@ -184,14 +188,18 @@ "query = {\n", " \"project\": name,\n", " \"formula__contains\": \"Mg\",\n", - "# \"data__GS__contains\": \"Y\",\n", + " # \"data__GS__contains\": \"Y\",\n", " \"data__ΔHʰ__value__lte\": -100,\n", " \"_order_by\": \"data__ΔH__value\",\n", " \"order\": \"desc\",\n", " \"_fields\": [\n", - " \"id\", \"identifier\", \"formula\",\n", - " \"data.GS\", \"data.ΔH.value\", \"data.ΔHʰ.value\"\n", - " ]\n", + " \"id\",\n", + " \"identifier\",\n", + " \"formula\",\n", + " \"data.GS\",\n", + " \"data.ΔH.value\",\n", + " \"data.ΔHʰ.value\",\n", + " ],\n", "}\n", "client.contributions.get_entries(**query).result()" ] diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/attachments.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/attachments.ipynb index d13b8dffe5..05dab6fcb5 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/attachments.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/attachments.ipynb @@ -33,13 +33,15 @@ "path_gz = downloads / \"2021-02-19_scan_mpids_changed.json.gz\"\n", "path_img = downloads / \"IMG-20210224-WA0010.jpg\"\n", "\n", - "attachment = Attachment.from_data(\"other\", {\"hello\": \"world\", \"test\": [1,2,4]})\n", + "attachment = Attachment.from_data(\"other\", {\"hello\": \"world\", \"test\": [1, 2, 4]})\n", "\n", - "contributions = [{\n", - " \"project\": name,\n", - " \"identifier\": \"mp-2\",\n", - " \"attachments\": [path_gz, path_img, attachment]\n", - "}]" + "contributions = [\n", + " {\n", + " \"project\": name,\n", + " \"identifier\": \"mp-2\",\n", + " \"attachments\": [path_gz, path_img, attachment],\n", + " }\n", + "]" ] }, { @@ -101,7 +103,9 @@ "metadata": {}, "outputs": [], "source": [ - "attms = client.attachments.get_entries(md5__in=md5s, mime__contains=\"jpeg\", _fields=[\"id\"]).result()\n", + "attms = client.attachments.get_entries(\n", + " md5__in=md5s, mime__contains=\"jpeg\", _fields=[\"id\"]\n", + ").result()\n", "aid = attms[\"data\"][0][\"id\"]" ] }, diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/bioi_defects.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/bioi_defects.ipynb index 2cc3b702f9..fbe85e3950 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/bioi_defects.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/bioi_defects.ipynb @@ -40,25 +40,29 @@ "metadata": {}, "outputs": [], "source": [ - "df1 = read_csv(StringIO(\"\"\"\n", + "df1 = read_csv(\n", + " StringIO(\"\"\"\n", "BiOI thickness [nm],Peak EQE [%],Integrated J|SC [mA/cm²],Measured J|SC [mA/cm²], Average J|SC [mA/cm²]\n", "440,79.5,6.4,6.2,5.5\n", "570,80.2,6.4,5.8,5.6\n", "720,72.6,6.5,6.6,6.3\n", "1090,46.4,3.5,3.9,4.0\n", "1670,17.6,1.3,0.6,0.4\n", - "\"\"\"))\n", + "\"\"\")\n", + ")\n", "df1.set_index(\"BiOI thickness [nm]\", inplace=True)\n", "df1.attrs[\"name\"] = \"Currents vs BiOI thickness\"\n", "\n", - "df2 = read_csv(StringIO(\"\"\"\n", + "df2 = read_csv(\n", + " StringIO(\"\"\"\n", "layer,VB-Eᶠ [eV],WF [eV],VB [eV],Eᵍ [eV],CB [eV]\n", "NiOₓ on ITO,0.6,4.8,5.4,3.6,1.8\n", "220 nm BiOI on NiOₓ|ITO,1.3,4.6,5.9,1.9,4.0\n", "440 nm BiOI on NiOₓ|ITO,1.1,5.0,6.1,1.9,4.2\n", "720 nm BiOI on NiOₓ|ITO,0.9,5.1,6.0,1.9,4.1\n", "ZnO on BiOI|NiOₓ|ITO,2.8,4.5,7.3,3.5,3.8\n", - "\"\"\"))\n", + "\"\"\")\n", + ")\n", "df2.set_index(\"layer\", inplace=True)\n", "df2.attrs[\"name\"] = \"Voltages vs layer\"" ] @@ -70,14 +74,18 @@ "metadata": {}, "outputs": [], "source": [ - "contributions = [{\n", - " \"project\": name, \"identifier\": \"mp-22987\", \"is_public\": True,\n", - " \"data\": {\n", - " \"rev\": {\"J\": \"6.3 mA/cm²\", \"V\": \"0.75 V\", \"FF\": \"39 %\", \"PCE\": \"1.79 %\"},\n", - " \"fwd\": {\"J\": \"6.3 mA/cm²\", \"V\": \"0.75 V\", \"FF\": \"37 %\", \"PCE\": \"1.74 %\"},\n", - " },\n", - " \"tables\": [df1, df2]\n", - "}]" + "contributions = [\n", + " {\n", + " \"project\": name,\n", + " \"identifier\": \"mp-22987\",\n", + " \"is_public\": True,\n", + " \"data\": {\n", + " \"rev\": {\"J\": \"6.3 mA/cm²\", \"V\": \"0.75 V\", \"FF\": \"39 %\", \"PCE\": \"1.79 %\"},\n", + " \"fwd\": {\"J\": \"6.3 mA/cm²\", \"V\": \"0.75 V\", \"FF\": \"37 %\", \"PCE\": \"1.74 %\"},\n", + " },\n", + " \"tables\": [df1, df2],\n", + " }\n", + "]" ] }, { diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/cards.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/cards.ipynb index e67952d37e..a8dc009b76 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/cards.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/cards.ipynb @@ -28,7 +28,12 @@ "metadata": {}, "outputs": [], "source": [ - "COMPONENTS = [\"data\", \"tables\", \"structures\", \"attachments\"] # supported contribution components\n", + "COMPONENTS = [\n", + " \"data\",\n", + " \"tables\",\n", + " \"structures\",\n", + " \"attachments\",\n", + "] # supported contribution components\n", "identifier = \"mp-2715\" # \"mp-6340\"" ] }, @@ -61,7 +66,8 @@ "# basic project info for all projects\n", "names = list(all_ids.keys())\n", "projects = client.projects.get_entries(\n", - " name__in=names, _fields=[\"name\", \"long_title\", \"authors\", \"description\", \"references\"]\n", + " name__in=names,\n", + " _fields=[\"name\", \"long_title\", \"authors\", \"description\", \"references\"],\n", ").result()" ] }, @@ -72,7 +78,7 @@ "metadata": {}, "outputs": [], "source": [ - "projects#[\"total_count\"] # total number of projects for this identifier" + "projects # [\"total_count\"] # total number of projects for this identifier" ] }, { @@ -90,8 +96,8 @@ "metadata": {}, "outputs": [], "source": [ - "name = \"carrier_transport\" #names[0] # selected project\n", - "ids = list(all_ids[name][\"ids\"]) # list of contribution ObjectIDs" + "name = \"carrier_transport\" # names[0] # selected project\n", + "ids = list(all_ids[name][\"ids\"]) # list of contribution ObjectIDs" ] }, { @@ -124,8 +130,10 @@ "metadata": {}, "outputs": [], "source": [ - "data_columns = {} # potential data columns in dot-notation and their units\n", - "root_data_columns = defaultdict(set) # potential root-level data columns and their (list of) unit(s)\n", + "data_columns = {} # potential data columns in dot-notation and their units\n", + "root_data_columns = defaultdict(\n", + " set\n", + ") # potential root-level data columns and their (list of) unit(s)\n", "has_component = {c: False for c in COMPONENTS} # potentially available components\n", "\n", "for column in info[\"columns\"]:\n", @@ -206,10 +214,10 @@ "outputs": [], "source": [ "# retrieve full sub-tree of values for the selected root data column\n", - "root_column = \"PF\" # list(root_data_columns.keys())[0]\n", + "root_column = \"PF\" # list(root_data_columns.keys())[0]\n", "fields = [\n", " f\"data.{col}\" if unit is None else f\"data.{col}.display\"\n", - " for col, unit in data_columns.items() \n", + " for col, unit in data_columns.items()\n", " if col.startswith(root_column)\n", "]\n", "resp = client.contributions.get_entry(pk=cid, _fields=fields).result()" @@ -251,7 +259,7 @@ "metadata": {}, "outputs": [], "source": [ - "resp[component] # use this to show list of available tables (and table ObjectIDs)" + "resp[component] # use this to show list of available tables (and table ObjectIDs)" ] }, { diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/carrier_transport.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/carrier_transport.ipynb index 68e1c4f64d..2ec37c22e1 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/carrier_transport.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/carrier_transport.ipynb @@ -15,7 +15,7 @@ "from unflatten import unflatten\n", "from pathlib import Path\n", "\n", - "name = 'carrier_transport'" + "name = \"carrier_transport\"" ] }, { @@ -50,26 +50,26 @@ " \"functional\": \"Type of DFT functional \\\n", " (GGA: generalized gradient approximation, GGA+U: GGA + U approximation)\",\n", " \"metal\": \"If True, crystal is a metal\",\n", - " 'ΔE': 'Band gap in eV',\n", - " 'V' : \"Unit cell volume, in cubic angstrom\",\n", - " 'mₑᶜ': 'Eigenvalues (ε₁, ε₂, ε₃) of the conductivity effective mass and their average (ε̄)',\n", - " 'S': 'Average eigenvalue of the Seebeck coefficient',\n", - " 'σ' : 'Average eigenvalue of the conductivity',\n", - " 'κₑ' : 'Average eigenvalue of the electrical thermal conductivity',\n", - " 'PF': 'Average eigenvalue of the Power Factor',\n", - " 'Sᵉ': 'Value (v), temperature (T), and doping level (c) at the \\\n", - " maximum of the average eigenvalue of the Seebeck coefficient', \n", - " 'σᵉ': 'Value (v), temperature (T), and doping level (c) at the \\\n", - " maximum of the average eigenvalue of the conductivity',\n", - " 'κₑᵉ': 'Value (v), temperature (T), and doping level (c) at the \\\n", - " maximum of the average eigenvalue of the electrical thermal conductivity',\n", - " 'PFᵉ': 'Value (v), temperature (T), and doping level (c) at the \\\n", - " maximum of the average eigenvalue of the Power Factor',\n", + " \"ΔE\": \"Band gap in eV\",\n", + " \"V\": \"Unit cell volume, in cubic angstrom\",\n", + " \"mₑᶜ\": \"Eigenvalues (ε₁, ε₂, ε₃) of the conductivity effective mass and their average (ε̄)\",\n", + " \"S\": \"Average eigenvalue of the Seebeck coefficient\",\n", + " \"σ\": \"Average eigenvalue of the conductivity\",\n", + " \"κₑ\": \"Average eigenvalue of the electrical thermal conductivity\",\n", + " \"PF\": \"Average eigenvalue of the Power Factor\",\n", + " \"Sᵉ\": \"Value (v), temperature (T), and doping level (c) at the \\\n", + " maximum of the average eigenvalue of the Seebeck coefficient\",\n", + " \"σᵉ\": \"Value (v), temperature (T), and doping level (c) at the \\\n", + " maximum of the average eigenvalue of the conductivity\",\n", + " \"κₑᵉ\": \"Value (v), temperature (T), and doping level (c) at the \\\n", + " maximum of the average eigenvalue of the electrical thermal conductivity\",\n", + " \"PFᵉ\": \"Value (v), temperature (T), and doping level (c) at the \\\n", + " maximum of the average eigenvalue of the Power Factor\",\n", "}\n", "\n", "references = [\n", " {\"label\": \"SData\", \"url\": \"https://doi.org/10.1038/sdata.2017.85\"},\n", - " {\"label\": \"Dryad\", \"url\": \"https://doi.org/10.5061/dryad.gn001\"}\n", + " {\"label\": \"Dryad\", \"url\": \"https://doi.org/10.5061/dryad.gn001\"},\n", "]\n", "\n", "# with Client() as client:\n", @@ -88,13 +88,13 @@ }, "outputs": [], "source": [ - "eigs_keys = ['ε₁', 'ε₂', 'ε₃', 'ε̄']\n", + "eigs_keys = [\"ε₁\", \"ε₂\", \"ε₃\", \"ε̄\"]\n", "prop_defs = {\n", - " 'mₑᶜ': \"mₑ\",\n", - " 'S': \"µV/K\",\n", - " 'σ': \"1/fΩ/m/s\",\n", - " 'κₑ': \"GW/K/m/s\",\n", - " 'PF': \"GW/K²/m/s\"\n", + " \"mₑᶜ\": \"mₑ\",\n", + " \"S\": \"µV/K\",\n", + " \"σ\": \"1/fΩ/m/s\",\n", + " \"κₑ\": \"GW/K/m/s\",\n", + " \"PF\": \"GW/K²/m/s\",\n", "}\n", "ext_defs = {\"T\": \"K\", \"c\": \"µm⁻³\"}\n", "columns = {\"task\": None, \"functional\": None, \"metal\": None, \"ΔE\": \"eV\", \"V\": \"ų\"}\n", @@ -110,15 +110,15 @@ "for kk, unit in prop_defs.items():\n", " if kk.startswith(\"mₑ\"):\n", " continue\n", - " \n", + "\n", " for k in [\"p\", \"n\"]:\n", " path = f\"{kk}ᵉ.{k}\"\n", " columns[f\"{path}.v\"] = unit\n", "\n", " for a, b in ext_defs.items():\n", " columns[f\"{path}.{a}\"] = b\n", - " \n", - " \n", + "\n", + "\n", "columns[\"tables\"] = None\n", "\n", "# with Client() as client:\n", @@ -138,13 +138,13 @@ "metadata": {}, "outputs": [], "source": [ - "input_dir = '/project/projectdirs/matgen/fricci/transport_data/coarse'\n", + "input_dir = \"/project/projectdirs/matgen/fricci/transport_data/coarse\"\n", "# input_dir = '/Users/patrick/gitrepos/mp/mpcontribs-data/transport_coarse'\n", - "props_map = { # original units\n", - " 'cond_eff_mass': {\"name\": 'mₑᶜ', \"unit\": \"mₑ\"},\n", - " 'seebeck_doping': {\"name\": 'S', \"unit\": \"µV/K\"},\n", - " 'cond_doping': {\"name\": 'σ', \"unit\": \"1/Ω/m/s\"},\n", - " 'kappa_doping': {\"name\": 'κₑ', \"unit\": \"W/K/m/s\"},\n", + "props_map = { # original units\n", + " \"cond_eff_mass\": {\"name\": \"mₑᶜ\", \"unit\": \"mₑ\"},\n", + " \"seebeck_doping\": {\"name\": \"S\", \"unit\": \"µV/K\"},\n", + " \"cond_doping\": {\"name\": \"σ\", \"unit\": \"1/Ω/m/s\"},\n", + " \"kappa_doping\": {\"name\": \"κₑ\", \"unit\": \"W/K/m/s\"},\n", "}" ] }, @@ -170,70 +170,74 @@ "title_prefix = \"Temperature- and Doping-Level-Dependence\"\n", "\n", "titles = {\n", - " 'S': \"Seebeck Coefficient\",\n", - " 'σ': \"Conductivity\",\n", - " 'κₑ': \"Electrical Thermal Conductivity\",\n", - " 'PF': \"Power Factor\"\n", + " \"S\": \"Seebeck Coefficient\",\n", + " \"σ\": \"Conductivity\",\n", + " \"κₑ\": \"Electrical Thermal Conductivity\",\n", + " \"PF\": \"Power Factor\",\n", "}\n", "\n", "with Client() as client:\n", - " identifiers = client.get_all_ids(dict(project=name)).get(name, {}).get(\"identifiers\", [])\n", - " \n", + " identifiers = (\n", + " client.get_all_ids(dict(project=name)).get(name, {}).get(\"identifiers\", [])\n", + " )\n", + "\n", "print(\"#contribs:\", len(identifiers))\n", "\n", "for obj in tqdm(files):\n", - " identifier = obj.name.split('.', 1)[0].rsplit('_', 1)[-1]\n", - " valid = bool(identifier.startswith('mp-') or identifier.startswith('mvc-'))\n", + " identifier = obj.name.split(\".\", 1)[0].rsplit(\"_\", 1)[-1]\n", + " valid = bool(identifier.startswith(\"mp-\") or identifier.startswith(\"mvc-\"))\n", "\n", " if not valid:\n", - " print(identifier, 'not valid')\n", + " print(identifier, \"not valid\")\n", " continue\n", "\n", " if identifier in identifiers:\n", " continue\n", "\n", - " with gzip.open(obj.path, 'rb') as input_file:\n", + " with gzip.open(obj.path, \"rb\") as input_file:\n", " data = json.loads(input_file.read())\n", - " task_type = 'GGA+U' if 'GGA+U' in data['gap'] else 'GGA'\n", - " gap = data['gap'][task_type]\n", + " task_type = \"GGA+U\" if \"GGA+U\" in data[\"gap\"] else \"GGA\"\n", + " gap = data[\"gap\"][task_type]\n", "\n", " cdata = {\n", - " \"task\": data['task_id'][task_type],\n", + " \"task\": data[\"task_id\"][task_type],\n", " \"functional\": task_type,\n", - " \"metal\": 'Yes' if gap < 0.1 else 'No',\n", + " \"metal\": \"Yes\" if gap < 0.1 else \"No\",\n", " \"ΔE\": f\"{gap} eV\",\n", - " \"V\": f\"{data['volume']} ų\"\n", + " \"V\": f\"{data['volume']} ų\",\n", " }\n", "\n", - " tables = [] \n", + " tables = []\n", " S2arr = []\n", "\n", - " for doping_type in ['p', 'n']:\n", - "\n", + " for doping_type in [\"p\", \"n\"]:\n", " for key, v in props_map.items():\n", " prop = data[task_type][key].get(doping_type, {})\n", - " d = prop.get('300', {}).get('1e+18', {})\n", + " d = prop.get(\"300\", {}).get(\"1e+18\", {})\n", " unit = v[\"unit\"]\n", "\n", " if d:\n", - " eigs = d if isinstance(d, list) else d['eigs']\n", + " eigs = d if isinstance(d, list) else d[\"eigs\"]\n", " k = f\"{v['name']}.{doping_type}\"\n", " value = f\"{np.mean(eigs)} {unit}\"\n", "\n", - " if key == 'cond_eff_mass':\n", + " if key == \"cond_eff_mass\":\n", " cdata[k] = {eigs_keys[-1]: value}\n", " for neig, eig in enumerate(eigs):\n", " cdata[k][eigs_keys[neig]] = f\"{eig} {unit}\"\n", " else:\n", " cdata[k] = value\n", - " if key == 'seebeck_doping':\n", - " S2 = np.dot(d['tensor'], d['tensor'])\n", - " elif key == 'cond_doping':\n", - " pf = np.mean(np.linalg.eigh(np.dot(S2, d['tensor']))[0]) * 1e-8\n", + " if key == \"seebeck_doping\":\n", + " S2 = np.dot(d[\"tensor\"], d[\"tensor\"])\n", + " elif key == \"cond_doping\":\n", + " pf = (\n", + " np.mean(np.linalg.eigh(np.dot(S2, d[\"tensor\"]))[0])\n", + " * 1e-8\n", + " )\n", " cdata[f\"PF.{doping_type}\"] = f\"{pf} µW/cm/K²/s\"\n", "\n", " if key != \"cond_eff_mass\":\n", - " prop_averages, dopings, cols = [], None, ['T [K]']\n", + " prop_averages, dopings, cols = [], None, [\"T [K]\"]\n", " pf_averages = []\n", " temps = sorted(map(int, prop.keys()))\n", "\n", @@ -245,28 +249,31 @@ " dopings = sorted(map(float, prop[str(temp)].keys()))\n", "\n", " for idop, doping in enumerate(dopings):\n", - " doping_str = f'{doping:.0e}'\n", + " doping_str = f\"{doping:.0e}\"\n", " if len(cols) <= len(dopings):\n", - " cols.append(f'{doping_str}'.replace(\"+\", \"\"))\n", + " cols.append(f\"{doping_str}\".replace(\"+\", \"\"))\n", "\n", " d = prop[str(temp)][doping_str]\n", " row.append(np.mean(d[\"eigs\"]))\n", - " tensor = d['tensor']\n", + " tensor = d[\"tensor\"]\n", "\n", - " if key == 'seebeck_doping':\n", + " if key == \"seebeck_doping\":\n", " S2arr.append(np.dot(tensor, tensor))\n", - " elif key == 'cond_doping': \n", + " elif key == \"cond_doping\":\n", " S2idx = it * len(dopings) + idop\n", - " pf = np.mean(np.linalg.eigh(\n", - " np.dot(S2arr[S2idx], tensor)\n", - " )[0]) * 1e-8\n", + " pf = (\n", + " np.mean(\n", + " np.linalg.eigh(np.dot(S2arr[S2idx], tensor))[0]\n", + " )\n", + " * 1e-8\n", + " )\n", " row_pf.append(pf)\n", "\n", " prop_averages.append(row)\n", " pf_averages.append(row_pf)\n", "\n", " df_data = [np.array(prop_averages)]\n", - " if key == 'cond_doping':\n", + " if key == \"cond_doping\":\n", " df_data.append(np.array(pf_averages))\n", "\n", " for ii, np_prop_averages in enumerate(df_data):\n", @@ -275,36 +282,42 @@ "\n", " df = DataFrame(np_prop_averages, columns=cols)\n", " df.set_index(\"T [K]\", inplace=True)\n", - " df.columns.name = columns_name # legend name\n", - " df.attrs[\"name\"] = f'{nm}({doping_type})' # -> used as title by default\n", - " df.attrs[\"title\"] = f'{title_prefix} of {doping_type}-type {titles[nm]}'\n", + " df.columns.name = columns_name # legend name\n", + " df.attrs[\"name\"] = (\n", + " f\"{nm}({doping_type})\" # -> used as title by default\n", + " )\n", + " df.attrs[\"title\"] = (\n", + " f\"{title_prefix} of {doping_type}-type {titles[nm]}\"\n", + " )\n", " df.attrs[\"labels\"] = {\n", - " \"value\": f'{nm}({doping_type}) [{u}]', # y-axis label\n", - " #\"variable\": columns_name # alternative for df.columns.name\n", + " \"value\": f\"{nm}({doping_type}) [{u}]\", # y-axis label\n", + " # \"variable\": columns_name # alternative for df.columns.name\n", " }\n", " tables.append(df)\n", "\n", - " arr_prop_avg = np_prop_averages[:,1:] #[:,[4,8,12]]\n", + " arr_prop_avg = np_prop_averages[:, 1:] # [:,[4,8,12]]\n", " max_v = np.max(arr_prop_avg)\n", "\n", - " if key[0] == 's' and doping_type == 'n':\n", + " if key[0] == \"s\" and doping_type == \"n\":\n", " max_v = np.min(arr_prop_avg)\n", - " if key[0] == 'k':\n", + " if key[0] == \"k\":\n", " max_v = np.min(arr_prop_avg)\n", "\n", - " arg_max = np.argwhere(arr_prop_avg==max_v)[0]\n", - " elabel = f'{nm}ᵉ'\n", - " cdata[f'{elabel}.{doping_type}'] = unflatten({\n", - " 'v': f\"{max_v} {u}\",\n", - " 'T': f\"{temps[arg_max[0]]} K\",\n", - " 'c': f\"{dopings[arg_max[1]]} cm⁻³\"\n", - " })\n", - "\n", - " contrib = {'project': name, 'identifier': identifier, 'is_public': True}\n", + " arg_max = np.argwhere(arr_prop_avg == max_v)[0]\n", + " elabel = f\"{nm}ᵉ\"\n", + " cdata[f\"{elabel}.{doping_type}\"] = unflatten(\n", + " {\n", + " \"v\": f\"{max_v} {u}\",\n", + " \"T\": f\"{temps[arg_max[0]]} K\",\n", + " \"c\": f\"{dopings[arg_max[1]]} cm⁻³\",\n", + " }\n", + " )\n", + "\n", + " contrib = {\"project\": name, \"identifier\": identifier, \"is_public\": True}\n", " contrib[\"data\"] = unflatten(cdata)\n", " contrib[\"tables\"] = tables\n", " contributions.append(contrib)\n", - " \n", + "\n", "len(contributions)" ] }, @@ -335,7 +348,7 @@ "\n", "with open(\"carrier_transport_p-type-update.json\", \"r\") as f:\n", " contributions = json.load(f)\n", - " \n", + "\n", "len(contributions)" ] }, @@ -350,7 +363,10 @@ "name = \"carrier_transport\"\n", "\n", "with Client() as client:\n", - " query = {\"project\": name, \"data__functional__exact\": \"\"} # data.functional not set after rename type -> functional\n", + " query = {\n", + " \"project\": name,\n", + " \"data__functional__exact\": \"\",\n", + " } # data.functional not set after rename type -> functional\n", " ids_map = client.get_all_ids(query, fmt=\"map\").get(name)\n", "\n", "len(ids_map) # = number of contributions to be updated" @@ -369,15 +385,17 @@ "for contrib in contributions:\n", " pk = ids_map.get(contrib[\"identifier\"], {}).get(\"id\")\n", " if pk:\n", - " submit.append({\"data\": {\n", - " k: {\n", - " kk: vv\n", - " for kk, vv in v.items()\n", - " if kk == \"p\"\n", - " } if isinstance(v, dict) else v\n", - " for k, v in contrib[\"data\"].items()\n", - " if k == \"functional\" or \"ᵉ\" in k\n", - " }})\n", + " submit.append(\n", + " {\n", + " \"data\": {\n", + " k: {kk: vv for kk, vv in v.items() if kk == \"p\"}\n", + " if isinstance(v, dict)\n", + " else v\n", + " for k, v in contrib[\"data\"].items()\n", + " if k == \"functional\" or \"ᵉ\" in k\n", + " }\n", + " }\n", + " )\n", " submit[-1][\"id\"] = pk\n", "\n", "len(submit)" @@ -393,8 +411,8 @@ "outputs": [], "source": [ "with Client() as client:\n", - " #client.delete_contributions(name)\n", - " #client.init_columns(name, columns)\n", + " # client.delete_contributions(name)\n", + " # client.init_columns(name, columns)\n", " client.submit_contributions(submit, ignore_dupes=True)" ] }, @@ -415,19 +433,19 @@ "\n", "query = {\n", " \"project\": \"carrier_transport\",\n", - "# \"formula_contains\": \"ZnS\",\n", - "# \"identifier__in\": [\"mp-10695\", \"mp-760381\"], # ZnS, CuS\n", + " # \"formula_contains\": \"ZnS\",\n", + " # \"identifier__in\": [\"mp-10695\", \"mp-760381\"], # ZnS, CuS\n", " \"data__functional__exact\": \"GGA+U\",\n", " \"data__metal__contains\": \"Y\",\n", " \"data__mₑᶜ__p__ε̄__value__gte\": 1000,\n", " \"_order_by\": \"data__mₑᶜ__p__ε̄__value\",\n", " \"order\": \"desc\",\n", - " \"_fields\": [\"id\", \"identifier\", \"formula\", \"data.mₑᶜ.p.ε̄.value\"]\n", + " \"_fields\": [\"id\", \"identifier\", \"formula\", \"data.mₑᶜ.p.ε̄.value\"],\n", "}\n", "\n", "with Client() as client:\n", " result = client.contributions.get_entries(**query).result()\n", - " \n", + "\n", "result" ] }, @@ -461,8 +479,8 @@ "}\n", "\n", "print(client.get_totals(query=query))\n", - "query[\"format\"] = \"json\" # \"csv\" or \"json\"\n", - "client.download_contributions(query) #, include=[\"tables\"])" + "query[\"format\"] = \"json\" # \"csv\" or \"json\"\n", + "client.download_contributions(query) # , include=[\"tables\"])" ] }, { diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/defect_genome_pcfc_materials.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/defect_genome_pcfc_materials.ipynb index eb10604712..2858dba84d 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/defect_genome_pcfc_materials.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/defect_genome_pcfc_materials.ipynb @@ -18,7 +18,7 @@ "metadata": {}, "outputs": [], "source": [ - "name = 'defect_genome_pcfc_materials'\n", + "name = \"defect_genome_pcfc_materials\"\n", "client = Client()\n", "mpr = MPRester()" ] @@ -45,9 +45,15 @@ "metadata": {}, "outputs": [], "source": [ - "client.projects.update_entry(pk=name, project={\n", - " \"references[0]\": {\"label\": \"ACS\", \"url\": \"https://doi.org/10.1021/acs.jpcc.7b08716\"}\n", - "}).result()" + "client.projects.update_entry(\n", + " pk=name,\n", + " project={\n", + " \"references[0]\": {\n", + " \"label\": \"ACS\",\n", + " \"url\": \"https://doi.org/10.1021/acs.jpcc.7b08716\",\n", + " }\n", + " },\n", + ").result()" ] }, { @@ -63,12 +69,16 @@ "metadata": {}, "outputs": [], "source": [ - "df = read_excel('/Users/patrick/gitrepos/mp/MPContribs/mpcontribs-data/DefectGenome_JPCC-data_MP.xlsx')\n", - "df.columns = MultiIndex.from_arrays([\n", - " ['', '', '', 'Eᶠ', 'Eᶠ', 'Eᶠ', 'Eᶠ', 'ΔEᵢ'],\n", - " ['A', 'B', 'a', 'ABO₃', 'Yᴮ', 'Vᴼ', 'Hᵢ', 'Yᴮ−Hᵢ']\n", - "])\n", - "units = {'A': '', 'B': '', 'a': 'Å'}\n", + "df = read_excel(\n", + " \"/Users/patrick/gitrepos/mp/MPContribs/mpcontribs-data/DefectGenome_JPCC-data_MP.xlsx\"\n", + ")\n", + "df.columns = MultiIndex.from_arrays(\n", + " [\n", + " [\"\", \"\", \"\", \"Eᶠ\", \"Eᶠ\", \"Eᶠ\", \"Eᶠ\", \"ΔEᵢ\"],\n", + " [\"A\", \"B\", \"a\", \"ABO₃\", \"Yᴮ\", \"Vᴼ\", \"Hᵢ\", \"Yᴮ−Hᵢ\"],\n", + " ]\n", + ")\n", + "units = {\"A\": \"\", \"B\": \"\", \"a\": \"Å\"}\n", "df" ] }, @@ -81,33 +91,35 @@ "contributions = []\n", "for idx, row in df.iterrows():\n", " A, B = row[df.columns[0]], row[df.columns[1]]\n", - " formula = f'{A}{B}O3'\n", + " formula = f\"{A}{B}O3\"\n", " data = mpr.get_data(formula, prop=\"volume\")\n", "\n", " if len(data) > 1:\n", - " volume = row[df.columns[2]]**3\n", + " volume = row[df.columns[2]] ** 3\n", " for d in data:\n", - " d['dV'] = abs(d['volume']-volume)\n", - " data = sorted(data, key=lambda item: item['dV'])\n", + " d[\"dV\"] = abs(d[\"volume\"] - volume)\n", + " data = sorted(data, key=lambda item: item[\"dV\"])\n", " elif not data:\n", - " print(formula, 'not found on MP')\n", + " print(formula, \"not found on MP\")\n", " continue\n", "\n", - " identifier = data[0]['material_id']\n", - " #print(idx, formula, identifier)\n", - " \n", + " identifier = data[0][\"material_id\"]\n", + " # print(idx, formula, identifier)\n", + "\n", " data = {}\n", " for col in df.columns:\n", " flat_col = \".\".join([c for c in col if c])\n", - " unit = units.get(flat_col, 'eV')\n", - " data[flat_col] = f'{row[col]} {unit}' if unit else row[col]\n", + " unit = units.get(flat_col, \"eV\")\n", + " data[flat_col] = f\"{row[col]} {unit}\" if unit else row[col]\n", "\n", " contrib = {\n", - " 'project': name, 'identifier': identifier, 'is_public': True,\n", - " 'data': unflatten(data)\n", + " \"project\": name,\n", + " \"identifier\": identifier,\n", + " \"is_public\": True,\n", + " \"data\": unflatten(data),\n", " }\n", " contributions.append(contrib)\n", - " \n", + "\n", "len(contributions)" ] }, @@ -143,16 +155,20 @@ "source": [ "query = {\n", " \"project\": name,\n", - "# \"formula__contains\": \"Mg\",\n", + " # \"formula__contains\": \"Mg\",\n", " \"data__A__contains\": \"Mg\",\n", " \"data__a__value__lte\": 4.1,\n", " \"data__Eᶠ__ABO₃__value__lte\": 3.2,\n", " \"_order_by\": \"data__a__value\",\n", " \"order\": \"desc\",\n", " \"_fields\": [\n", - " \"id\", \"identifier\", \"formula\",\n", - " \"data.A\", \"data.a.value\", \"data.Eᶠ.ABO₃.value\"\n", - " ] \n", + " \"id\",\n", + " \"identifier\",\n", + " \"formula\",\n", + " \"data.A\",\n", + " \"data.a.value\",\n", + " \"data.Eᶠ.ABO₃.value\",\n", + " ],\n", "}\n", "client.contributions.get_entries(**query).result()" ] diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/deltaHvacancy.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/deltaHvacancy.ipynb index 523de5837a..5688c7c429 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/deltaHvacancy.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/deltaHvacancy.ipynb @@ -37,7 +37,9 @@ "outputs": [], "source": [ "# allow non-unique identifiers (disables duplicate checking)\n", - "client.projects.updateProjectByName(pk=client.project, project={\"unique_identifiers\": False}).result()" + "client.projects.updateProjectByName(\n", + " pk=client.project, project={\"unique_identifiers\": False}\n", + ").result()" ] }, { @@ -50,12 +52,15 @@ "# set \"other\" field in project info to explain data columns\n", "# appears on hover in contribution section on materials details pages\n", "client.projects.updateProjectByName(\n", - " pk=client.project, project={\"other\": {\n", - " \"dH\": \"vacancy formation enthalpy in eV\",\n", - " \"dH|atom\": \"vacancy formation enthalpy in eV/atom\",\n", - " \"m\": \"electron effective mass in mₑ\"\n", - " # TODO add more as needed\n", - " }}\n", + " pk=client.project,\n", + " project={\n", + " \"other\": {\n", + " \"dH\": \"vacancy formation enthalpy in eV\",\n", + " \"dH|atom\": \"vacancy formation enthalpy in eV/atom\",\n", + " \"m\": \"electron effective mass in mₑ\",\n", + " # TODO add more as needed\n", + " }\n", + " },\n", ").result()" ] }, @@ -68,28 +73,33 @@ "source": [ "# load data\n", "drivedir = Path(\"/Users/patrick/GoogleDriveLBNL/My Drive/\")\n", - "datadir = drivedir / Path(\"MaterialsProject/gitrepos/mpcontribs-data/deltaHvacancy/nrel_matdb\")\n", + "datadir = drivedir / Path(\n", + " \"MaterialsProject/gitrepos/mpcontribs-data/deltaHvacancy/nrel_matdb\"\n", + ")\n", "\n", "columns_map = {\n", " \"formula\": {\"name\": \"formula\"},\n", - " \"defectname\": {\"name\": \"defect\"}, # string\n", - " \"site\": {\"name\": \"site\", \"unit\": \"\"}, # dimensionless\n", + " \"defectname\": {\"name\": \"defect\"}, # string\n", + " \"site\": {\"name\": \"site\", \"unit\": \"\"}, # dimensionless\n", " \"charge\": {\"name\": \"charge\", \"unit\": \"\"},\n", " \"dH_eV\": {\"name\": \"dH\", \"unit\": \"eV\"},\n", " \"dH_eV_per_atom\": {\"name\": \"dH|atom\", \"unit\": \"eV/atom\"},\n", " \"bandgap_eV\": {\"name\": \"bandgap\", \"unit\": \"eV\"},\n", " \"electron_effective_mass\": {\"name\": \"m\", \"unit\": \"mₑ\"},\n", - " \"level_theory\": {\"name\": \"theory\"}\n", + " \"level_theory\": {\"name\": \"theory\"},\n", "}\n", "new_column_names = {k: v[\"name\"] for k, v in columns_map.items()}\n", "\n", + "\n", "def apply_unit(cell, unit):\n", " return f\"{cell} {unit}\" if unit and cell else cell\n", "\n", + "\n", "def apply_units(column):\n", " unit = columns_map[column.name].get(\"unit\")\n", " return column.apply(apply_unit, args=(unit,))\n", "\n", + "\n", "contributions = []\n", "\n", "# NOTE make sure all `_oxstate` and `_POSCAR_wyck` files are gzipped\n", @@ -98,19 +108,27 @@ " prefix, nrel_matdb_id, _ = path.name.split(\".\")\n", " stem = f\"{path.parent}{os.sep}{prefix}.{nrel_matdb_id}\"\n", " poscar_file = f\"{stem}_POSCAR_wyck.gz\"\n", - " structure = Structure.from_file(poscar_file, 'POSCAR')\n", + " structure = Structure.from_file(poscar_file, \"POSCAR\")\n", " mpid = mpr.find_structure(structure)\n", " identifier = mpid if mpid else nrel_matdb_id\n", " attachments = [Path(poscar_file), Path(f\"{stem}_oxstate.gz\")]\n", - " df = read_csv(path).dropna(axis=1, how=\"all\").apply(apply_units).rename(columns=new_column_names)\n", - " \n", + " df = (\n", + " read_csv(path)\n", + " .dropna(axis=1, how=\"all\")\n", + " .apply(apply_units)\n", + " .rename(columns=new_column_names)\n", + " )\n", + "\n", " for record in df.to_dict(orient=\"records\"):\n", - " data = {k: v for k, v in record.items() if v} # clean record\n", - " contributions.append({\n", - " \"identifier\": identifier,\n", - " \"data\": unflatten(data, splitter=\"dot\"),\n", - " \"structures\": [structure], \"attachments\": attachments, # duplicates linked internally\n", - " })\n", + " data = {k: v for k, v in record.items() if v} # clean record\n", + " contributions.append(\n", + " {\n", + " \"identifier\": identifier,\n", + " \"data\": unflatten(data, splitter=\"dot\"),\n", + " \"structures\": [structure],\n", + " \"attachments\": attachments, # duplicates linked internally\n", + " }\n", + " )\n", " contributions[-1][\"data\"][\"nrel|id\"] = nrel_matdb_id\n", "\n", "contributions[0]" @@ -137,11 +155,11 @@ "metadata": {}, "outputs": [], "source": [ - "client.delete_contributions() # easier to delete everything for small projects\n", + "client.delete_contributions() # easier to delete everything for small projects\n", "client.init_columns(columns)\n", "client.submit_contributions(contributions, ignore_dupes=True)\n", "# this shouldn't be necessary but need to re-init columns likely due to bug in API server\n", - "client.init_columns(columns) " + "client.init_columns(columns)" ] } ], diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/dilute_solute_diffusion.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/dilute_solute_diffusion.ipynb index 3ce892c236..e3b6065de2 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/dilute_solute_diffusion.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/dilute_solute_diffusion.ipynb @@ -33,7 +33,9 @@ "from mp_api.client import MPRester\n", "from pathlib import Path\n", "\n", - "data_dir = Path(\"/Users/patrick/GoogleDriveLBNL/My Drive/MaterialsProject/gitrepos/mpcontribs-data/\")\n", + "data_dir = Path(\n", + " \"/Users/patrick/GoogleDriveLBNL/My Drive/MaterialsProject/gitrepos/mpcontribs-data/\"\n", + ")\n", "zfile = data_dir / name / \"z.json\"\n", "z = json.load(zfile.open())\n", "mpr = MPRester(\"bmdNL4cV6Ei0CqhUAhK6JwFSZ6XMH0Gz\")\n", @@ -61,7 +63,7 @@ " for sheet, df in df_dct.items():\n", " df.to_excel(writer, sheet)\n", " else:\n", - " print(\"no excel sheet found on figshare\") \n", + " print(\"no excel sheet found on figshare\")\n", "else:\n", " df_dct = read_excel(fpath, sheet_name=None, engine=\"openpyxl\")\n", "\n", @@ -78,8 +80,10 @@ "# function to search MP via its summary API endpoint\n", "def search(formula=None, spacegroup_number=None, chemsys=None):\n", " return mpr.summary.search(\n", - " formula=formula, chemsys=chemsys, spacegroup_number=spacegroup_number,\n", - " fields=[\"material_id\"]#, sort_fields=\"energy_above_hull\"\n", + " formula=formula,\n", + " chemsys=chemsys,\n", + " spacegroup_number=spacegroup_number,\n", + " fields=[\"material_id\"], # , sort_fields=\"energy_above_hull\"\n", " )" ] }, @@ -90,7 +94,12 @@ "metadata": {}, "outputs": [], "source": [ - "host_info = df_dct[\"Host Information\"].set_index(\"Host element name\").dropna().drop(\"Unnamed: 0\", axis=1)\n", + "host_info = (\n", + " df_dct[\"Host Information\"]\n", + " .set_index(\"Host element name\")\n", + " .dropna()\n", + " .drop(\"Unnamed: 0\", axis=1)\n", + ")\n", "hosts = None\n", "host_info" ] @@ -145,7 +154,7 @@ " df = df.drop(rows)\n", "\n", " contrib[\"data\"] = hdata\n", - " \n", + "\n", " print(\"add table for D₀/Q data for {}\".format(mpid))\n", " df = df.set_index(df[\"Solute element number\"])\n", " df = df.drop(\"Solute element number\", axis=1)\n", @@ -182,8 +191,8 @@ " \"title\": \"D₀/Q by Solute\",\n", " \"labels\": {\n", " \"value\": \"D₀/Q\",\n", - " #\"variable\": \"method\"\n", - " }\n", + " # \"variable\": \"method\"\n", + " },\n", " }\n", " contrib[\"tables\"] = [df_D0_Q]\n", "\n", @@ -231,11 +240,8 @@ " contrib[\"tables\"].append(df_v)\n", "\n", " elif hdata[\"Host\"][\"crystal_structure\"] == \"FCC\":\n", - "\n", " print(\"add table for hop activation barriers for {} (FCC)\".format(mpid))\n", - " columns_E = [\n", - " \"Hop activation barrier, E_{} [eV]\".format(i) for i in range(5)\n", - " ]\n", + " columns_E = [\"Hop activation barrier, E_{} [eV]\".format(i) for i in range(5)]\n", " df_E = df[[\"Solute element name\"] + columns_E]\n", " df_E.columns = [\"Solute\"] + [\n", " \"E{} [eV]\".format(i) for i in [\"₀\", \"₁\", \"₂\", \"₃\", \"₄\"]\n", @@ -247,9 +253,7 @@ " contrib[\"tables\"].append(df_E)\n", "\n", " print(\"add table for hop attempt frequencies for {} (FCC)\".format(mpid))\n", - " columns_v = [\n", - " \"Hop attempt frequency, v_{} [THz]\".format(i) for i in range(5)\n", - " ]\n", + " columns_v = [\"Hop attempt frequency, v_{} [THz]\".format(i) for i in range(5)]\n", " df_v = df[[\"Solute element name\"] + columns_v]\n", " df_v.columns = [\"Solute\"] + [\n", " \"v{} [THz]\".format(i) for i in [\"₀\", \"₁\", \"₂\", \"₃\", \"₄\"]\n", @@ -261,7 +265,6 @@ " contrib[\"tables\"].append(df_v)\n", "\n", " elif hdata[\"Host\"][\"crystal_structure\"] == \"HCP\":\n", - "\n", " print(\"add table for hop activation barriers for {} (HCP)\".format(mpid))\n", " columns_E = [\n", " \"Hop activation barrier, E_X [eV]\",\n", @@ -317,23 +320,55 @@ "from flatten_dict import flatten, unflatten\n", "\n", "columns_map = {\n", - " \"Host.crystal_structure\": {\"name\": \"host.symmetry\", \"description\": \"host crystal structure\"},\n", - " \"Host.melting_temperature\": {\"name\": \"host.temperature|melt\", \"unit\": \"K\", \"description\": \"host melting temperature\"},\n", - " \"Host.vacancy_formation_energy\": {\"name\": \"host.energy|formation\", \"unit\": \"eV\", \"description\": \"host vacancy formation energy\"},\n", - " \"Host.lattice_constant\": {\"name\": \"host.lattice\", \"unit\": \"Å\", \"description\": \"host lattice constant\"},\n", - " \"Host.self-diffusion_correction_shift\": {\"name\": \"host.shift\", \"unit\": \"eV\", \"description\": \"host self diffusion correction shift\"},\n", - " \"note\": {\"name\": \"excluded\", \"description\": \"solutes were calculated but either did not converge or relaxed into the neighboring vacancy, making it ineligible for the analytical multi-frequency formalism\"},\n", + " \"Host.crystal_structure\": {\n", + " \"name\": \"host.symmetry\",\n", + " \"description\": \"host crystal structure\",\n", + " },\n", + " \"Host.melting_temperature\": {\n", + " \"name\": \"host.temperature|melt\",\n", + " \"unit\": \"K\",\n", + " \"description\": \"host melting temperature\",\n", + " },\n", + " \"Host.vacancy_formation_energy\": {\n", + " \"name\": \"host.energy|formation\",\n", + " \"unit\": \"eV\",\n", + " \"description\": \"host vacancy formation energy\",\n", + " },\n", + " \"Host.lattice_constant\": {\n", + " \"name\": \"host.lattice\",\n", + " \"unit\": \"Å\",\n", + " \"description\": \"host lattice constant\",\n", + " },\n", + " \"Host.self-diffusion_correction_shift\": {\n", + " \"name\": \"host.shift\",\n", + " \"unit\": \"eV\",\n", + " \"description\": \"host self diffusion correction shift\",\n", + " },\n", + " \"note\": {\n", + " \"name\": \"excluded\",\n", + " \"description\": \"solutes were calculated but either did not converge or relaxed into the neighboring vacancy, making it ineligible for the analytical multi-frequency formalism\",\n", + " },\n", "}\n", "columns = {col[\"name\"]: col.get(\"unit\") for col in columns_map.values()}\n", "clean_contributions = []\n", "\n", "for contrib in contributions:\n", - " clean_contrib = {\"identifier\": contrib[\"identifier\"], \"formula\": contrib[\"formula\"], \"tables\": contrib[\"tables\"]}\n", + " clean_contrib = {\n", + " \"identifier\": contrib[\"identifier\"],\n", + " \"formula\": contrib[\"formula\"],\n", + " \"tables\": contrib[\"tables\"],\n", + " }\n", " data = {}\n", " for k, v in flatten(contrib[\"data\"], reducer=\"dot\").items():\n", - " data[columns_map[k][\"name\"]] = v.replace(\"The\", \"\").replace(columns_map[k][\"description\"], \"\").replace(\n", - " \"solutes were calculated but either did not converge or relaxed into the neighboring vacancy, making the solute ineligible for the analytical multi-frequency formalism\", \"\"\n", - " ).strip()\n", + " data[columns_map[k][\"name\"]] = (\n", + " v.replace(\"The\", \"\")\n", + " .replace(columns_map[k][\"description\"], \"\")\n", + " .replace(\n", + " \"solutes were calculated but either did not converge or relaxed into the neighboring vacancy, making the solute ineligible for the analytical multi-frequency formalism\",\n", + " \"\",\n", + " )\n", + " .strip()\n", + " )\n", "\n", " clean_contrib[\"data\"] = unflatten(data, splitter=\"dot\")\n", " clean_contributions.append(clean_contrib)\n", diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/download.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/download.ipynb index 0d17143395..a18a25b20b 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/download.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/download.ipynb @@ -28,17 +28,22 @@ "metadata": {}, "outputs": [], "source": [ - "fields = [\"id\", \"identifier\", \"formula\", \"data.mₑᶜ.p.ε̄.value\"] # which fields to retrieve\n", - "sort = \"-data__mₑᶜ__p__ε̄__value\" # field to sort by (NOTE `__value`!); use +/- for asc/desc\n", + "fields = [\n", + " \"id\",\n", + " \"identifier\",\n", + " \"formula\",\n", + " \"data.mₑᶜ.p.ε̄.value\",\n", + "] # which fields to retrieve\n", + "sort = \"-data__mₑᶜ__p__ε̄__value\" # field to sort by (NOTE `__value`!); use +/- for asc/desc\n", "# see https://contribs-api.materialsproject.org/#/contributions/get_entries for available query parameters\n", "query = {\n", - "# \"formula_contains\": \"ZnS\",\n", - "# \"identifier__in\": [\"mp-10695\", \"mp-760381\"], # ZnS, CuS\n", + " # \"formula_contains\": \"ZnS\",\n", + " # \"identifier__in\": [\"mp-10695\", \"mp-760381\"], # ZnS, CuS\n", " \"data__functional__exact\": \"GGA+U\",\n", " \"data__metal__contains\": \"Y\",\n", " \"data__mₑᶜ__p__ε̄__value__gte\": 1000,\n", "}\n", - "client.get_totals(query=query) # lightweight call to count results" + "client.get_totals(query=query) # lightweight call to count results" ] }, { @@ -62,11 +67,11 @@ "source": [ "query[\"_fields\"] = fields\n", "query[\"sort\"] = sort\n", - "query[\"format\"] = \"csv\" # \"csv\" or \"json\"\n", + "query[\"format\"] = \"csv\" # \"csv\" or \"json\"\n", "client.download_contributions(\n", " query=query,\n", - " outdir=\"mpcontribs-downloads/my-query\", # change outdir for different queries\n", - " #include=[\"tables\"] # include the tables in the download\n", + " outdir=\"mpcontribs-downloads/my-query\", # change outdir for different queries\n", + " # include=[\"tables\"] # include the tables in the download\n", ")" ] } diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/dtu.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/dtu.ipynb index a2322b1827..c1e375138f 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/dtu.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/dtu.ipynb @@ -19,9 +19,9 @@ "metadata": {}, "outputs": [], "source": [ - "name = 'dtu'\n", + "name = \"dtu\"\n", "client = Client()\n", - "db = 'https://cmr.fysik.dtu.dk/_downloads/mp_gllbsc.db'" + "db = \"https://cmr.fysik.dtu.dk/_downloads/mp_gllbsc.db\"" ] }, { @@ -62,13 +62,13 @@ "outputs": [], "source": [ "dbdir = \"/Users/patrick/gitrepos/mp/MPContribs/mpcontribs-data\"\n", - "dbfile = db.rsplit('/', 1)[-1]\n", + "dbfile = db.rsplit(\"/\", 1)[-1]\n", "dbpath = os.path.join(dbdir, dbfile)\n", "if not os.path.exists(dbpath):\n", - " urlretrieve(db, dbpath) \n", + " urlretrieve(db, dbpath)\n", "\n", "con = connect(dbpath)\n", - "nr_mpids = con.count(selection='mpid')\n", + "nr_mpids = con.count(selection=\"mpid\")\n", "print(nr_mpids)" ] }, @@ -81,23 +81,27 @@ "contributions = []\n", "\n", "with tqdm(total=nr_mpids) as pbar:\n", - " for row in con.select('mpid'):\n", - " contributions.append({\n", - " 'project': name, 'identifier': f'mp-{row.mpid}', 'is_public': True,\n", - " 'data': {\n", - " 'ΔE': {\n", - " 'KS': { # kohn-sham band gap\n", - " 'indirect': f'{row.gllbsc_ind_gap - row.gllbsc_disc} eV',\n", - " 'direct': f'{row.gllbsc_dir_gap - row.gllbsc_disc} eV' \n", + " for row in con.select(\"mpid\"):\n", + " contributions.append(\n", + " {\n", + " \"project\": name,\n", + " \"identifier\": f\"mp-{row.mpid}\",\n", + " \"is_public\": True,\n", + " \"data\": {\n", + " \"ΔE\": {\n", + " \"KS\": { # kohn-sham band gap\n", + " \"indirect\": f\"{row.gllbsc_ind_gap - row.gllbsc_disc} eV\",\n", + " \"direct\": f\"{row.gllbsc_dir_gap - row.gllbsc_disc} eV\",\n", + " },\n", + " \"QP\": { # quasi particle band gap\n", + " \"indirect\": f\"{row.gllbsc_ind_gap} eV\",\n", + " \"direct\": f\"{row.gllbsc_dir_gap} eV\",\n", + " },\n", " },\n", - " 'QP': { # quasi particle band gap\n", - " 'indirect': f'{row.gllbsc_ind_gap} eV',\n", - " 'direct': f'{row.gllbsc_dir_gap} eV' \n", - " }\n", + " \"C\": f\"{row.gllbsc_disc} eV\", # derivative discontinuity\n", " },\n", - " 'C': f'{row.gllbsc_disc} eV' # derivative discontinuity\n", " }\n", - " })\n", + " )\n", " pbar.update(1)" ] }, @@ -139,9 +143,12 @@ " \"_order_by\": \"data__C__value\",\n", " \"order\": \"desc\",\n", " \"_fields\": [\n", - " \"id\", \"identifier\", \"formula\",\n", - " \"data.C.value\", \"data.ΔE.QP.direct.value\"\n", - " ]\n", + " \"id\",\n", + " \"identifier\",\n", + " \"formula\",\n", + " \"data.C.value\",\n", + " \"data.ΔE.QP.direct.value\",\n", + " ],\n", "}\n", "client.contributions.get_entries(**query).result()" ] diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ediffcrystalprediction.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ediffcrystalprediction.ipynb index 9b0ad6bbb8..09c4ce91c7 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ediffcrystalprediction.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ediffcrystalprediction.ipynb @@ -59,10 +59,16 @@ "metadata": {}, "outputs": [], "source": [ - "df_red = pd.DataFrame([[t]+za for t, za in zip(\n", - " df_uniq[\"thickness\"].to_list(),\n", - " df_uniq[\"zone_axes\"].map(convert_zone_axes).to_list()\n", - ")], columns=[\"thickness [nm]\", \"a [Å]\", \"b [Å]\", \"c [Å]\"])" + "df_red = pd.DataFrame(\n", + " [\n", + " [t] + za\n", + " for t, za in zip(\n", + " df_uniq[\"thickness\"].to_list(),\n", + " df_uniq[\"zone_axes\"].map(convert_zone_axes).to_list(),\n", + " )\n", + " ],\n", + " columns=[\"thickness [nm]\", \"a [Å]\", \"b [Å]\", \"c [Å]\"],\n", + ")" ] }, { @@ -85,11 +91,16 @@ "# TODO think of any columns to add in the `data` component\n", "# e.g. direct link to output directory or file/object in OpenData Browser, or\n", "# \"things\" that might be interesting for a general MP user to search across contributions\n", - "contribs = [{\n", - " \"identifier\": \"mp-126\", \"formula\": \"Pt\",\n", - " \"data\": {\"url\": \"https://materialsproject-contribs.s3.amazonaws.com/index.html\"},\n", - " \"tables\": [df_red]\n", - "}]" + "contribs = [\n", + " {\n", + " \"identifier\": \"mp-126\",\n", + " \"formula\": \"Pt\",\n", + " \"data\": {\n", + " \"url\": \"https://materialsproject-contribs.s3.amazonaws.com/index.html\"\n", + " },\n", + " \"tables\": [df_red],\n", + " }\n", + "]" ] }, { diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/esters.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/esters.ipynb index 4328ceba83..b35396ff28 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/esters.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/esters.ipynb @@ -17,7 +17,7 @@ "metadata": {}, "outputs": [], "source": [ - "name = 'esters'\n", + "name = \"esters\"\n", "client = Client()\n", "mpr = MPRester()" ] @@ -36,7 +36,7 @@ "outputs": [], "source": [ "# client.projects.update_entry(pk=name, project={'long_title': 'Improved c-axis parameter for BiSe'}).result()\n", - "client.get_project(name)#.display()" + "client.get_project(name) # .display()" ] }, { @@ -52,13 +52,17 @@ "metadata": {}, "outputs": [], "source": [ - "path = '/Users/patrick/gitrepos/mp/MPContribs/mpcontribs-data/CONTCAR'\n", + "path = \"/Users/patrick/gitrepos/mp/MPContribs/mpcontribs-data/CONTCAR\"\n", "structure = Structure.from_file(path)\n", "mpids = mpr.find_structure(structure)\n", - "contributions = [{\n", - " 'project': name, 'identifier': mpids[0], 'is_public': True,\n", - " 'structures': [structure]\n", - "}]" + "contributions = [\n", + " {\n", + " \"project\": name,\n", + " \"identifier\": mpids[0],\n", + " \"is_public\": True,\n", + " \"structures\": [structure],\n", + " }\n", + "]" ] }, { @@ -91,9 +95,12 @@ "metadata": {}, "outputs": [], "source": [ - "structures = list(client.get_all_ids(\n", - " {\"project\": name}, include=[\"structures\"]\n", - ").get(name, {}).get(\"structures\", {}).get(\"ids\", set()))\n", + "structures = list(\n", + " client.get_all_ids({\"project\": name}, include=[\"structures\"])\n", + " .get(name, {})\n", + " .get(\"structures\", {})\n", + " .get(\"ids\", set())\n", + ")\n", "sid = structures[0]" ] }, diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/experimental_thermo.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/experimental_thermo.ipynb index a02e07d84a..2e92f6d283 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/experimental_thermo.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/experimental_thermo.ipynb @@ -27,7 +27,7 @@ "metadata": {}, "outputs": [], "source": [ - "PROJECT = 'Corrections'" + "PROJECT = \"Corrections\"" ] }, { @@ -69,9 +69,9 @@ "workdir = Path(re.sub(r\"(?<={})[\\w\\W]*\".format(PROJECT), \"\", str(Path.cwd())))\n", "os.chdir(workdir)\n", "\n", - "data_dir = workdir / '2_raw data'\n", - "pipeline_dir = workdir / '3_data analysis' / '2_pipeline'\n", - "output_dir = workdir / '3_data analysis' / '3_output'" + "data_dir = workdir / \"2_raw data\"\n", + "pipeline_dir = workdir / \"3_data analysis\" / \"2_pipeline\"\n", + "output_dir = workdir / \"3_data analysis\" / \"3_output\"" ] }, { @@ -96,8 +96,9 @@ "outputs": [], "source": [ "from mpcontribs.client import Client\n", - "name = 'experimental_thermo' # this should be your project, see from the project URL\n", - "client = Client() # uses MPCONTRIBS_API_KEY envvar" + "\n", + "name = \"experimental_thermo\" # this should be your project, see from the project URL\n", + "client = Client() # uses MPCONTRIBS_API_KEY envvar" ] }, { @@ -107,17 +108,19 @@ "outputs": [], "source": [ "client.projects.update_entry(\n", - " pk=\"experimental_thermo\", project={\"other\": \n", - " {\"ΔHᶠ\": \"Enthalpy of formation from the elements. Polynomial: H° − H°298.15= A*t + B*t^2/2 + C*t^3/3 + D*t^4/4 − E/t + F − H\",\n", - " \"ΔGᶠ\": \"Gibbs free energy of formation from the elements.\",\n", - " \"S\": \"Absolute entropy. Polynomial: S° = A*ln(t) + B*t + C*t^2/2 + D*t^3/3 − E/(2*t^2) + G\",\n", - " \"Cₚ\": \"Specific heat capacity. Polynomial: Cp° = A + B*t + C*t^2 + D*t^3 + E/t^2\",\n", - " \"polynomial\": \"Coefficients for polynomials used to calculate temperature-dependent values of ΔHᶠ, S, or Cₚ.\",\n", - " \"ΔT\": \"Range of temperatures over which polynomial coefficients are valid.\",\n", - " \"composition\": \"String representation of pymatgen Composition of the material.\",\n", - " \"phase\": \"Material phase, e.g. 'gas', 'liquid', 'solid', 'monoclinic', etc.\"\n", - " }\n", - " }\n", + " pk=\"experimental_thermo\",\n", + " project={\n", + " \"other\": {\n", + " \"ΔHᶠ\": \"Enthalpy of formation from the elements. Polynomial: H° − H°298.15= A*t + B*t^2/2 + C*t^3/3 + D*t^4/4 − E/t + F − H\",\n", + " \"ΔGᶠ\": \"Gibbs free energy of formation from the elements.\",\n", + " \"S\": \"Absolute entropy. Polynomial: S° = A*ln(t) + B*t + C*t^2/2 + D*t^3/3 − E/(2*t^2) + G\",\n", + " \"Cₚ\": \"Specific heat capacity. Polynomial: Cp° = A + B*t + C*t^2 + D*t^3 + E/t^2\",\n", + " \"polynomial\": \"Coefficients for polynomials used to calculate temperature-dependent values of ΔHᶠ, S, or Cₚ.\",\n", + " \"ΔT\": \"Range of temperatures over which polynomial coefficients are valid.\",\n", + " \"composition\": \"String representation of pymatgen Composition of the material.\",\n", + " \"phase\": \"Material phase, e.g. 'gas', 'liquid', 'solid', 'monoclinic', etc.\",\n", + " }\n", + " },\n", ").result()" ] }, @@ -128,8 +131,10 @@ "outputs": [], "source": [ "client.projects.update_entry(\n", - " pk=\"experimental_thermo\", project={\"authors\": \"Various authors (see references). Data compiled by the Materials Project team.\"\n", - " }\n", + " pk=\"experimental_thermo\",\n", + " project={\n", + " \"authors\": \"Various authors (see references). Data compiled by the Materials Project team.\"\n", + " },\n", ").result()" ] }, @@ -140,8 +145,7 @@ "outputs": [], "source": [ "client.projects.update_entry(\n", - " pk=\"experimental_thermo\", project={\"title\": \"Thermochemistry Data\"\n", - " }\n", + " pk=\"experimental_thermo\", project={\"title\": \"Thermochemistry Data\"}\n", ").result()" ] }, @@ -152,8 +156,7 @@ "outputs": [], "source": [ "client.projects.update_entry(\n", - " pk=\"experimental_thermo\", project={\"unique_identifiers\": True\n", - " }\n", + " pk=\"experimental_thermo\", project={\"unique_identifiers\": True}\n", ").result()" ] }, @@ -164,9 +167,16 @@ "outputs": [], "source": [ "client.projects.update_entry(\n", - " pk=\"experimental_thermo\", project={\"references\": [\n", - " {\"label\":\"Kubaschewski\", \"url\":\"https://www.worldcat.org/title/materials-thermochemistry/oclc/26724109\"},\n", - " {\"label\":\"NIST\", \"url\":\"https://janaf.nist.gov/\"},]}\n", + " pk=\"experimental_thermo\",\n", + " project={\n", + " \"references\": [\n", + " {\n", + " \"label\": \"Kubaschewski\",\n", + " \"url\": \"https://www.worldcat.org/title/materials-thermochemistry/oclc/26724109\",\n", + " },\n", + " {\"label\": \"NIST\", \"url\": \"https://janaf.nist.gov/\"},\n", + " ]\n", + " },\n", ").result()" ] }, @@ -221,11 +231,9 @@ " {\"path\": \"data.ΔT.G.max\", \"unit\": \"degK\"},\n", " {\"path\": \"data.ΔT.H.max\", \"unit\": \"degK\"},\n", " {\"path\": \"data.method\", \"unit\": \"kJ/mol\"},\n", - " {\"path\": \"data.reference\", \"unit\": \"kJ/mol\"}, \n", + " {\"path\": \"data.reference\", \"unit\": \"kJ/mol\"},\n", "]\n", - "client.projects.update_entry(\n", - " pk=name, project={\"columns\": columns}\n", - ").result()" + "client.projects.update_entry(pk=name, project={\"columns\": columns}).result()" ] }, { @@ -332,7 +340,7 @@ "metadata": {}, "outputs": [], "source": [ - "#all_thermo = []\n", + "# all_thermo = []\n", "with MPRester() as a:\n", " for f in tqdm(ternary_plus):\n", " all_thermo.extend(a.get_exp_thermo_data(f))" @@ -344,7 +352,7 @@ "metadata": {}, "outputs": [], "source": [ - "dumpfn(all_thermo, output_dir / '2020-08-07 all MP Thermo data.json')" + "dumpfn(all_thermo, output_dir / \"2020-08-07 all MP Thermo data.json\")" ] }, { @@ -353,7 +361,7 @@ "metadata": {}, "outputs": [], "source": [ - "all_thermo = loadfn(output_dir / '2020-08-07 all MP Thermo data.json')" + "all_thermo = loadfn(output_dir / \"2020-08-07 all MP Thermo data.json\")" ] }, { @@ -379,6 +387,7 @@ "outputs": [], "source": [ "import pandas as pd\n", + "\n", "mpthermo_df = pd.DataFrame([t.as_dict() for t in all_thermo])" ] }, @@ -389,8 +398,8 @@ "outputs": [], "source": [ "# drop the unneeded columns\n", - "mpthermo_df = mpthermo_df.drop('@module', axis=1)\n", - "mpthermo_df = mpthermo_df.drop('@class', axis=1)" + "mpthermo_df = mpthermo_df.drop(\"@module\", axis=1)\n", + "mpthermo_df = mpthermo_df.drop(\"@class\", axis=1)" ] }, { @@ -451,10 +460,11 @@ "source": [ "from pymatgen import Composition\n", "\n", + "\n", "def create_dict(data):\n", " ret = {}\n", " comp = Composition(data.formula.unique()[0])\n", - " \n", + "\n", " ret[\"project\"] = name\n", " ret[\"is_public\"] = False\n", " ret[\"identifier\"] = comp.reduced_formula\n", @@ -463,14 +473,13 @@ " ret[\"data\"][\"composition\"] = str(comp)\n", " ret[\"data\"][\"phase\"] = data.phaseinfo.unique()[0]\n", " ret[\"data\"][\"reference\"] = data.ref.unique()[0]\n", - " \n", + "\n", " for t in data.type.unique():\n", - " \n", " # set the base dictionary key\n", " if t in [\"A\", \"B\", \"C\", \"D\", \"E\", \"F\", \"G\", \"H\"]:\n", " if not ret[\"data\"].get(\"polynomial\"):\n", " ret[\"data\"][\"polynomial\"] = {}\n", - " \n", + "\n", " if not ret[\"data\"].get(\"ΔT\"):\n", " ret[\"data\"][\"ΔT\"] = {}\n", "\n", @@ -478,50 +487,61 @@ " col = t\n", " unit = \"dimensionless\"\n", " base_dict[col] = {}\n", - " ret[\"data\"][\"ΔT\"][col] = {\"min\": \"{} K\".format(data[data[\"type\"]==t][\"temp_range\"].values[0][0]),\n", - " \"max\": \"{} K\".format(data[data[\"type\"]==t][\"temp_range\"].values[0][1])}\n", - " \n", + " ret[\"data\"][\"ΔT\"][col] = {\n", + " \"min\": \"{} K\".format(\n", + " data[data[\"type\"] == t][\"temp_range\"].values[0][0]\n", + " ),\n", + " \"max\": \"{} K\".format(\n", + " data[data[\"type\"] == t][\"temp_range\"].values[0][1]\n", + " ),\n", + " }\n", + "\n", " else:\n", - " if data[data[\"type\"]==t][\"temp_range\"].values[0] == [298, 298]:\n", + " if data[data[\"type\"] == t][\"temp_range\"].values[0] == [298, 298]:\n", " if not ret[\"data\"].get(\"298K\"):\n", - " ret[\"data\"][\"298K\"]= {}\n", + " ret[\"data\"][\"298K\"] = {}\n", " base_dict = ret[\"data\"][\"298K\"]\n", " else:\n", - " print(\"Type: {}, T: {}\".format(t, data[data[\"type\"]==t][\"temp_range\"].values[0]))\n", - " \n", + " print(\n", + " \"Type: {}, T: {}\".format(\n", + " t, data[data[\"type\"] == t][\"temp_range\"].values[0]\n", + " )\n", + " )\n", + "\n", " if t == \"S\":\n", - " unit = 'kJ/degK/mol'\n", + " unit = \"kJ/degK/mol\"\n", " col = \"S\"\n", - " elif t ==\"fH\":\n", + " elif t == \"fH\":\n", " col = \"ΔHᶠ\"\n", " unit = \"kJ/mol\"\n", " else:\n", " col = t\n", " unit = \"dimensionless\"\n", - " \n", + "\n", " base_dict[col] = {}\n", "\n", " # find value, uncertainty, method, unit\n", - " base_dict[col]= \"{:0.5g} {}\".format(data[data[\"type\"]==t][\"value\"].values[0], unit)\n", - " \n", - " if data[data[\"type\"]==t][\"method\"].values[0] != \"\":\n", + " base_dict[col] = \"{:0.5g} {}\".format(\n", + " data[data[\"type\"] == t][\"value\"].values[0], unit\n", + " )\n", + "\n", + " if data[data[\"type\"] == t][\"method\"].values[0] != \"\":\n", " if not ret[\"data\"].get(\"method\"):\n", " ret[\"data\"][\"method\"] = {}\n", - " ret[\"data\"][\"method\"][col] = data[data[\"type\"]==t][\"method\"].values[0]\n", - " \n", - "# if not np.isnan(data[data[\"type\"]==t][\"uncertainty\"].values[0]):\n", - "# base_dict[col][\"uncertainty\"] = data[data[\"type\"]==t][\"uncertainty\"].values[0]\n", - " \n", - " \n", - " \n", - "# if t in [\"S\", \"fH\"]:\n", - "# base_dict[col][\"units\"] = unit\n", + " ret[\"data\"][\"method\"][col] = data[data[\"type\"] == t][\"method\"].values[0]\n", + "\n", + " # if not np.isnan(data[data[\"type\"]==t][\"uncertainty\"].values[0]):\n", + " # base_dict[col][\"uncertainty\"] = data[data[\"type\"]==t][\"uncertainty\"].values[0]\n", + "\n", + " # if t in [\"S\", \"fH\"]:\n", + " # base_dict[col][\"units\"] = unit\n", "\n", - " \n", " return ret\n", - " \n", "\n", - "new_df = mpthermo_df.groupby([\"formula\",\"compound_name\",\"phaseinfo\",\"ref\"]).apply(create_dict)\n", + "\n", + "new_df = mpthermo_df.groupby([\"formula\", \"compound_name\", \"phaseinfo\", \"ref\"]).apply(\n", + " create_dict\n", + ")\n", "mpthermo_contribs = list(new_df)" ] }, @@ -552,16 +572,16 @@ "from itertools import groupby\n", "\n", "for formula, group in groupby(mpthermo_contribs, key=lambda d: d[\"identifier\"]):\n", - " new_dict ={}\n", + " new_dict = {}\n", " new_dict[\"project\"] = name\n", " new_dict[\"is_public\"] = False\n", " new_dict[\"identifier\"] = formula\n", " new_dict[\"data\"] = {}\n", - " \n", + "\n", " for d in group:\n", " if not new_dict.get(\"composition\"):\n", " new_dict[\"composition\"] = d[\"data\"][\"composition\"]\n", - " \n", + "\n", " del d[\"data\"][\"composition\"]\n", "\n", " phase = d[\"data\"].get(\"phase\", \"n/a\")\n", @@ -582,6 +602,7 @@ "outputs": [], "source": [ "import pprint\n", + "\n", "pprint.pprint(reshaped[0])" ] }, @@ -606,7 +627,10 @@ "outputs": [], "source": [ "import pandas\n", - "janaf_df= pandas.read_csv(data_dir / \"2020-08-10 JANAF data from Ayush/mpcontribs_janaf_thermo.csv\")" + "\n", + "janaf_df = pandas.read_csv(\n", + " data_dir / \"2020-08-10 JANAF data from Ayush/mpcontribs_janaf_thermo.csv\"\n", + ")" ] }, { @@ -632,41 +656,43 @@ "outputs": [], "source": [ "def create_dict(data):\n", - " \n", + "\n", " ret = {}\n", " ret[\"project\"] = name\n", - " ret[\"is_public\"] = False \n", + " ret[\"is_public\"] = False\n", " ret[\"data\"] = {}\n", - " \n", + "\n", " try:\n", " comp = Composition(data.Formula.unique()[0])\n", " ret[\"identifier\"] = comp.reduced_formula\n", " ret[\"data\"][\"composition\"] = str(comp)\n", " except:\n", - " print('problem')\n", + " print(\"problem\")\n", " ret[\"identifier\"] = data.Formula.unique()[0]\n", " ret[\"data\"][\"composition\"] = data.Formula.unique()[0]\n", - " \n", + "\n", " ret[\"data\"][\"compound\"] = data.Name.unique()[0]\n", " ret[\"data\"][\"phase\"] = data.Phase.unique()[0]\n", - " ret[\"data\"][\"reference\"] = data.Link.unique()[0].replace('txt','html')\n", - " \n", - " ret[\"data\"][\"0K\"] = {\"ΔHᶠ\": \"{:0.6g} {}\".format(data[\"DeltaH_0\"].values[0]/1000, \"kJ/mol\"),\n", - " \"ΔGᶠ\": \"{:0.6g} {}\".format(data[\"DeltaG_0\"].values[0]/1000, \"kJ/mol\"),\n", - " \"S\": \"{:0.6g} {}\".format(data[\"S_0\"].values[0], \"J/degK/mol\"),\n", - " \"Cₚ\": \"{:0.6g} {}\".format(data[\"Cp_0\"].values[0], \"J/degK/mol\"),\n", - " }\n", - " \n", - " ret[\"data\"][\"298K\"] = {\"ΔHᶠ\": \"{:0.6g} {}\".format(data[\"DeltaH_298\"].values[0]/1000, \"kJ/mol\"),\n", - " \"ΔGᶠ\": \"{:0.6g} {}\".format(data[\"DeltaG_298\"].values[0]/1000, \"kJ/mol\"),\n", - " \"S\": \"{:0.6g} {}\".format(data[\"S_298\"].values[0], \"J/degK/mol\"),\n", - " \"Cₚ\": \"{:0.6g} {}\".format(data[\"Cp_298\"].values[0], \"J/degK/mol\"),\n", - " }\n", + " ret[\"data\"][\"reference\"] = data.Link.unique()[0].replace(\"txt\", \"html\")\n", + "\n", + " ret[\"data\"][\"0K\"] = {\n", + " \"ΔHᶠ\": \"{:0.6g} {}\".format(data[\"DeltaH_0\"].values[0] / 1000, \"kJ/mol\"),\n", + " \"ΔGᶠ\": \"{:0.6g} {}\".format(data[\"DeltaG_0\"].values[0] / 1000, \"kJ/mol\"),\n", + " \"S\": \"{:0.6g} {}\".format(data[\"S_0\"].values[0], \"J/degK/mol\"),\n", + " \"Cₚ\": \"{:0.6g} {}\".format(data[\"Cp_0\"].values[0], \"J/degK/mol\"),\n", + " }\n", + "\n", + " ret[\"data\"][\"298K\"] = {\n", + " \"ΔHᶠ\": \"{:0.6g} {}\".format(data[\"DeltaH_298\"].values[0] / 1000, \"kJ/mol\"),\n", + " \"ΔGᶠ\": \"{:0.6g} {}\".format(data[\"DeltaG_298\"].values[0] / 1000, \"kJ/mol\"),\n", + " \"S\": \"{:0.6g} {}\".format(data[\"S_298\"].values[0], \"J/degK/mol\"),\n", + " \"Cₚ\": \"{:0.6g} {}\".format(data[\"Cp_298\"].values[0], \"J/degK/mol\"),\n", + " }\n", "\n", " return ret\n", - " \n", "\n", - "new_df = janaf_df.groupby([\"Formula\",\"Name\",\"Phase\"]).apply(create_dict)\n", + "\n", + "new_df = janaf_df.groupby([\"Formula\", \"Name\", \"Phase\"]).apply(create_dict)\n", "janaf_contribs = list(new_df)" ] }, @@ -697,19 +723,18 @@ "from itertools import groupby\n", "\n", "for formula, group in groupby(janaf_contribs, key=lambda d: d[\"identifier\"]):\n", - " new_dict ={}\n", + " new_dict = {}\n", " new_dict[\"project\"] = name\n", " new_dict[\"is_public\"] = False\n", " new_dict[\"identifier\"] = formula\n", " new_dict[\"data\"] = {}\n", - " \n", + "\n", " for d in group:\n", " if not new_dict.get(\"composition\"):\n", " new_dict[\"composition\"] = d[\"data\"][\"composition\"]\n", - " \n", - " \n", + "\n", " del d[\"data\"][\"composition\"]\n", - " \n", + "\n", " phase = d[\"data\"].get(\"phase\", \"n/a\")\n", " if phase == \"\":\n", " phase = \"n/a\"\n", @@ -717,7 +742,7 @@ " new_dict[\"data\"][phase] = d[\"data\"]\n", " if phase != \"n/a\":\n", " del new_dict[\"data\"][phase][\"phase\"]\n", - " \n", + "\n", " reshaped_janaf.append(new_dict)" ] }, @@ -728,6 +753,7 @@ "outputs": [], "source": [ "import pprint\n", + "\n", "pprint.pprint(reshaped_janaf[0])" ] }, @@ -738,6 +764,7 @@ "outputs": [], "source": [ "import pprint\n", + "\n", "pprint.pprint(reshaped[0])" ] }, @@ -756,16 +783,20 @@ "source": [ "all_contribs = reshaped[:]\n", "\n", - "count=0\n", + "count = 0\n", "for d in reshaped_janaf:\n", " # is this identifier already in mp thermo?\n", " if d[\"identifier\"] in [e[\"identifier\"] for e in reshaped]:\n", " # add the new NIST phases\n", " target_entry = [e for e in reshaped if e[\"identifier\"] == d[\"identifier\"]][0]\n", - " for k,v in d[\"data\"].items():\n", + " for k, v in d[\"data\"].items():\n", " if target_entry[\"data\"].get(k):\n", - " print(\"Warning: phase {} already exists for id {} in MP Thermo data! Skipping.\".format(k, d[\"identifier\"]))\n", - " count+=1\n", + " print(\n", + " \"Warning: phase {} already exists for id {} in MP Thermo data! Skipping.\".format(\n", + " k, d[\"identifier\"]\n", + " )\n", + " )\n", + " count += 1\n", " continue\n", " target_entry[\"data\"][k] = v\n", " else:\n", @@ -808,18 +839,19 @@ "metadata": {}, "outputs": [], "source": [ - "replace = {\"#-qtz\":\"βqtz\",\n", - " \"a\": \"α\",\n", - " \"a -cris\":\"αcrys\",\n", - " \"a -qtz\":\"αqtz\",\n", - " \"nit.ba\": \"nitba\",\n", - " \"orth./1\":\"orth\",\n", - " \"ortho\":\"orth\",\n", - " \"r.tet\":\"rtet\",\n", - " \"tet/cu\":\"tetcu\",\n", - " \"n/a\":\"none\",\n", - " \"cr,l\":\"crl\"\n", - " }" + "replace = {\n", + " \"#-qtz\": \"βqtz\",\n", + " \"a\": \"α\",\n", + " \"a -cris\": \"αcrys\",\n", + " \"a -qtz\": \"αqtz\",\n", + " \"nit.ba\": \"nitba\",\n", + " \"orth./1\": \"orth\",\n", + " \"ortho\": \"orth\",\n", + " \"r.tet\": \"rtet\",\n", + " \"tet/cu\": \"tetcu\",\n", + " \"n/a\": \"none\",\n", + " \"cr,l\": \"crl\",\n", + "}" ] }, { @@ -859,20 +891,18 @@ "new_contribs = []\n", "for d in all_contribs:\n", " # unpack each identifier into unique identifiers with formula+phase\n", - " for k,v in d[\"data\"].items():\n", - " new_d={}\n", - " if k == 'composition':\n", + " for k, v in d[\"data\"].items():\n", + " new_d = {}\n", + " if k == \"composition\":\n", " continue\n", - " new_d[\"identifier\"] = str(d[\"identifier\"]+\"-\"+k)\n", + " new_d[\"identifier\"] = str(d[\"identifier\"] + \"-\" + k)\n", " new_d[\"formula\"] = d[\"identifier\"]\n", " new_d[\"is_public\"] = True\n", " new_d[\"project\"] = d[\"project\"]\n", " new_d[\"data\"] = v\n", " new_d[\"data\"][\"phase\"] = k\n", " new_d[\"data\"][\"composition\"] = d[\"data\"][\"composition\"]\n", - " new_contribs.append(new_d)\n", - "\n", - " " + " new_contribs.append(new_d)" ] }, { @@ -926,7 +956,7 @@ "source": [ "for d in new_contribs:\n", " if d[\"data\"].get(\"0K\"):\n", - " if all([\"nan\" in v for k,v in d[\"data\"][\"0K\"].items()]):\n", + " if all([\"nan\" in v for k, v in d[\"data\"][\"0K\"].items()]):\n", " del d[\"data\"][\"0K\"]\n", " print(\"deleted {}\".format(d[\"identifier\"]))" ] @@ -939,7 +969,7 @@ "source": [ "for d in new_contribs:\n", " if d[\"data\"].get(\"298K\"):\n", - " if all([\"nan\" in v for k,v in d[\"data\"][\"298K\"].items()]):\n", + " if all([\"nan\" in v for k, v in d[\"data\"][\"298K\"].items()]):\n", " del d[\"data\"][\"298K\"]\n", " print(\"deleted {}\".format(d[\"identifier\"]))" ] @@ -952,7 +982,7 @@ "source": [ "for d in new_contribs:\n", " if d[\"data\"].get(\"298K\"):\n", - " if all([\"nan\" in v or \"0 \" in v for k,v in d[\"data\"][\"298K\"].items()]):\n", + " if all([\"nan\" in v or \"0 \" in v for k, v in d[\"data\"][\"298K\"].items()]):\n", " del d[\"data\"][\"298K\"]\n", " print(\"deleted {}\".format(d[\"identifier\"]))" ] @@ -965,7 +995,7 @@ "source": [ "for d in new_contribs:\n", " if d[\"data\"].get(\"0K\"):\n", - " if all([\"nan\" in v or \"0 \" in v for k,v in d[\"data\"][\"0K\"].items()]):\n", + " if all([\"nan\" in v or \"0 \" in v for k, v in d[\"data\"][\"0K\"].items()]):\n", " del d[\"data\"][\"0K\"]\n", " print(\"deleted {}\".format(d[\"identifier\"]))" ] @@ -1005,7 +1035,7 @@ "source": [ "# need to delete contributions first due to unique_identifiers=False\n", "client.delete_contributions(name)\n", - "#client.submit_contributions(new_contribs, per_page=10)#, skip_dupe_check=True)" + "# client.submit_contributions(new_contribs, per_page=10)#, skip_dupe_check=True)" ] }, { @@ -1026,9 +1056,10 @@ "def chunks(lst, n):\n", " \"\"\"Yield successive n-sized chunks from lst.\"\"\"\n", " for i in range(0, len(lst), n):\n", - " yield lst[i:i + n]\n", + " yield lst[i : i + n]\n", + "\n", "\n", - "for chunk in tqdm(chunks(new_contribs, 10, total=len(new_contribs)/10)):\n", + "for chunk in tqdm(chunks(new_contribs, 10, total=len(new_contribs) / 10)):\n", " try:\n", " client.contributions.create_entries(contributions=chunk).result()\n", " except:\n", diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/experimental_thermoelectrics.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/experimental_thermoelectrics.ipynb index fc639fd76a..f06b9b04b4 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/experimental_thermoelectrics.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/experimental_thermoelectrics.ipynb @@ -69,7 +69,7 @@ " title=\"Experimental Thermoelectrics\",\n", " authors=\"R. Seshradi\",\n", " description=\"Data-Driven Review of Thermoelectric Materials: Performance and Resource Considerations.\",\n", - " url=\"https://pubs.acs.org/doi/10.1021/cm400893e\"\n", + " url=\"https://pubs.acs.org/doi/10.1021/cm400893e\",\n", " )" ] }, @@ -101,39 +101,124 @@ "outputs": [], "source": [ "columns_map = {\n", - " \"T (K)\": {\"name\": \"temperature\", \"unit\": \"K\", \"description\": \"Temperature in Kelvin\"},\n", - " \"Z*10^-4 reported\": {\"name\": \"Z\", \"unit\": \"\", \"description\": \"reported Z\", \"scale\": 1e4},\n", - " \"Resist. (Ohm.cm)\": {\"name\": \"resistivity.RT\", \"unit\": \"Ω·cm\", \"description\": \"Resistivity at room temperature in Ωcm\"},\n", - " \"Resist. (400K)\": {\"name\": \"resistivity.400K\", \"unit\": \"Ω·cm\", \"description\": \"Resistivity at 400K in Ωcm\"},\n", - " \"Seebeck (uV/K)\": {\"name\": \"seebeck.RT\", \"unit\": \"µV/K\", \"description\": \"Seebeck coefficient at room temperature in µV/K\"},\n", - " \"Seebeck (400K)\": {\"name\": \"seebeck.400K\", \"unit\": \"µV/K\", \"description\": \"Seebeck coefficient at 400K in µV/K\"},\n", + " \"T (K)\": {\n", + " \"name\": \"temperature\",\n", + " \"unit\": \"K\",\n", + " \"description\": \"Temperature in Kelvin\",\n", + " },\n", + " \"Z*10^-4 reported\": {\n", + " \"name\": \"Z\",\n", + " \"unit\": \"\",\n", + " \"description\": \"reported Z\",\n", + " \"scale\": 1e4,\n", + " },\n", + " \"Resist. (Ohm.cm)\": {\n", + " \"name\": \"resistivity.RT\",\n", + " \"unit\": \"Ω·cm\",\n", + " \"description\": \"Resistivity at room temperature in Ωcm\",\n", + " },\n", + " \"Resist. (400K)\": {\n", + " \"name\": \"resistivity.400K\",\n", + " \"unit\": \"Ω·cm\",\n", + " \"description\": \"Resistivity at 400K in Ωcm\",\n", + " },\n", + " \"Seebeck (uV/K)\": {\n", + " \"name\": \"seebeck.RT\",\n", + " \"unit\": \"µV/K\",\n", + " \"description\": \"Seebeck coefficient at room temperature in µV/K\",\n", + " },\n", + " \"Seebeck (400K)\": {\n", + " \"name\": \"seebeck.400K\",\n", + " \"unit\": \"µV/K\",\n", + " \"description\": \"Seebeck coefficient at 400K in µV/K\",\n", + " },\n", " \"kappa (W/mK)\": {\"name\": \"kappa.mean\", \"unit\": \"W/mK\", \"description\": \"TODO\"},\n", " \"kappaZT\": {\"name\": \"kappa.ZT\", \"unit\": \"\", \"description\": \"TODO\"},\n", - " \"Pf (W/K^2/m)\": {\"name\": \"Pf\", \"unit\": \"W/K²/m\", \"description\": \"Power Factor in W/K²/m\"},\n", - " \"Power Factor*T (W/mK)\": {\"name\": \"PfT\", \"unit\": \"W/K/m\", \"description\": \"Power Factor times Temperature in W/K/m\"},\n", + " \"Pf (W/K^2/m)\": {\n", + " \"name\": \"Pf\",\n", + " \"unit\": \"W/K²/m\",\n", + " \"description\": \"Power Factor in W/K²/m\",\n", + " },\n", + " \"Power Factor*T (W/mK)\": {\n", + " \"name\": \"PfT\",\n", + " \"unit\": \"W/K/m\",\n", + " \"description\": \"Power Factor times Temperature in W/K/m\",\n", + " },\n", " \"ZT\": {\"name\": \"ZT\", \"unit\": \"\", \"description\": \"ZT\"},\n", " \"x\": {\"name\": \"x\", \"unit\": \"\", \"description\": \"TODO\"},\n", " \"series\": {\"name\": \"series\", \"unit\": None, \"description\": \"TODO\"},\n", " \"T Max\": {\"name\": \"Tmax\", \"unit\": \"K\", \"description\": \"TODO\"},\n", " \"family\": {\"name\": \"family\", \"unit\": None, \"description\": \"TODO\"},\n", - " \"Conduct. (S/cm)\": {\"name\": \"conductivity\", \"unit\": \"S/cm\", \"description\": \"Conductivity in S/cm\"},\n", + " \"Conduct. (S/cm)\": {\n", + " \"name\": \"conductivity\",\n", + " \"unit\": \"S/cm\",\n", + " \"description\": \"Conductivity in S/cm\",\n", + " },\n", " \"S^2\": {\"name\": \"S2\", \"unit\": \"\", \"description\": \"S²\"},\n", " \"ke/ktotal\": {\"name\": \"ke|rel\", \"unit\": \"\", \"description\": \"ke/ktotal\"},\n", " \"space group\": {\"name\": \"spacegroup\", \"unit\": \"\", \"description\": \"space group\"},\n", - " \"# symmetry elements\": {\"name\": \"nsymelems\", \"unit\": \"\", \"description\": \"number of symmetry elements\"},\n", - " \"preparative route\": {\"name\": \"route\", \"unit\": None, \"description\": \"Preparative Route\"},\n", + " \"# symmetry elements\": {\n", + " \"name\": \"nsymelems\",\n", + " \"unit\": \"\",\n", + " \"description\": \"number of symmetry elements\",\n", + " },\n", + " \"preparative route\": {\n", + " \"name\": \"route\",\n", + " \"unit\": None,\n", + " \"description\": \"Preparative Route\",\n", + " },\n", " \"final form\": {\"name\": \"final\", \"unit\": None, \"description\": \"Final Form\"},\n", " \"Authors\": {\"name\": \"authors.main\", \"unit\": None, \"description\": \"Authors\"},\n", - " \"Author of Unit Cell\": {\"name\": \"authors.cell\", \"unit\": None, \"description\": \"Author of Unit Cell\"},\n", - " \"DOI\": {\"name\": \"dois.main\", \"unit\": None, \"description\": \"Digital Object Identifier (DOI)\"},\n", - " \"Unit Cell DOI\": {\"name\": \"dois.cell\", \"unit\": None, \"description\": \"Unit Cell DOI\"},\n", - " \"ICSD of structure\": {\"name\": \"icsd.number\", \"unit\": \"\", \"description\": \"ICSD of structure\"},\n", - " \"temp of ICSD (K)\": {\"name\": \"icsd.temperature\", \"unit\": \"K\", \"description\": \"temp of ICSD (K)\"},\n", - " \"Cell Volume (A^3)\": {\"name\": \"volume.cell\", \"unit\": \"ų\", \"description\": \"Cell Volume in ų\"},\n", - " \"average atomic volume\": {\"name\": \"volume.atomic\", \"unit\": \"\", \"description\": \"average atomic volume\"},\n", - " \"Formula Units per Cell\": {\"name\": \"units\", \"unit\": \"\", \"description\": \"Formula Units per Cell\"},\n", - " \"Atoms per formula unit\": {\"name\": \"natoms.formunit\", \"unit\": \"\", \"description\": \"Atoms per formula unit\"},\n", - " \"total atoms per unit cell\": {\"name\": \"natoms.total\", \"unit\": \"\", \"description\": \"total atoms per unit cell\"}\n", + " \"Author of Unit Cell\": {\n", + " \"name\": \"authors.cell\",\n", + " \"unit\": None,\n", + " \"description\": \"Author of Unit Cell\",\n", + " },\n", + " \"DOI\": {\n", + " \"name\": \"dois.main\",\n", + " \"unit\": None,\n", + " \"description\": \"Digital Object Identifier (DOI)\",\n", + " },\n", + " \"Unit Cell DOI\": {\n", + " \"name\": \"dois.cell\",\n", + " \"unit\": None,\n", + " \"description\": \"Unit Cell DOI\",\n", + " },\n", + " \"ICSD of structure\": {\n", + " \"name\": \"icsd.number\",\n", + " \"unit\": \"\",\n", + " \"description\": \"ICSD of structure\",\n", + " },\n", + " \"temp of ICSD (K)\": {\n", + " \"name\": \"icsd.temperature\",\n", + " \"unit\": \"K\",\n", + " \"description\": \"temp of ICSD (K)\",\n", + " },\n", + " \"Cell Volume (A^3)\": {\n", + " \"name\": \"volume.cell\",\n", + " \"unit\": \"ų\",\n", + " \"description\": \"Cell Volume in ų\",\n", + " },\n", + " \"average atomic volume\": {\n", + " \"name\": \"volume.atomic\",\n", + " \"unit\": \"\",\n", + " \"description\": \"average atomic volume\",\n", + " },\n", + " \"Formula Units per Cell\": {\n", + " \"name\": \"units\",\n", + " \"unit\": \"\",\n", + " \"description\": \"Formula Units per Cell\",\n", + " },\n", + " \"Atoms per formula unit\": {\n", + " \"name\": \"natoms.formunit\",\n", + " \"unit\": \"\",\n", + " \"description\": \"Atoms per formula unit\",\n", + " },\n", + " \"total atoms per unit cell\": {\n", + " \"name\": \"natoms.total\",\n", + " \"unit\": \"\",\n", + " \"description\": \"total atoms per unit cell\",\n", + " },\n", "}\n", "skip = (\"Unnamed:\", \"Comments\")\n", "# for col in df.columns:\n", @@ -151,14 +236,15 @@ "outputs": [], "source": [ "import csv\n", + "\n", "field_names = [\"column\", \"name\", \"unit\", \"scale\", \"description\"]\n", "csvlines = []\n", "for k, v in columns_map.items():\n", " line = {\"column\": k}\n", " line.update(v)\n", " csvlines.append(line)\n", - " \n", - "with open(f'{name}_columns.csv', 'w') as csvfile:\n", + "\n", + "with open(f\"{name}_columns.csv\", \"w\") as csvfile:\n", " writer = csv.DictWriter(csvfile, fieldnames=field_names)\n", " writer.writeheader()\n", " writer.writerows(csvlines)" @@ -171,9 +257,9 @@ "metadata": {}, "outputs": [], "source": [ - "other = unflatten({\n", - " col[\"name\"]: col[\"description\"] for col in columns_map.values()\n", - "}, splitter=\"dot\")\n", + "other = unflatten(\n", + " {col[\"name\"]: col[\"description\"] for col in columns_map.values()}, splitter=\"dot\"\n", + ")\n", "client.update_project({\"other\": other})" ] }, @@ -237,7 +323,7 @@ " formula = record.pop(\"Formula\")\n", " if not isinstance(formula, str) and isnan(formula):\n", " continue\n", - " \n", + "\n", " clean = {}\n", " for k, v in record.items():\n", " if k.startswith(skip) or k not in columns_map:\n", @@ -246,14 +332,14 @@ " # remove NaNs (tip: skip any unset/empty keys)\n", " if not isinstance(v, str) and isnan(v):\n", " continue\n", - " # convert boolean values to Yes/No, and append units \n", + " # convert boolean values to Yes/No, and append units\n", " key = columns_map[k][\"name\"]\n", " unit = columns_map[k].get(\"unit\")\n", " scale = columns_map[k].get(\"scale\")\n", " val = v\n", " if scale is not None and isinstance(scale, (float, int)):\n", " val *= scale\n", - " \n", + "\n", " if isinstance(v, bool):\n", " val = \"Yes\" if v else \"No\"\n", " elif isinstance(v, int) and not unit:\n", @@ -266,7 +352,7 @@ " icsd = clean.get(\"icsd.number\")\n", " if not icsd:\n", " continue\n", - " \n", + "\n", " identifier = icsd_lookup.get(icsd)\n", " if not identifier:\n", " continue\n", @@ -288,7 +374,7 @@ "client.delete_contributions() # remove all contributions from project\n", "client.init_columns(columns)\n", "client.submit_contributions(contributions)\n", - "client.init_columns(columns) # shouldn't be needed but ensures all columns appear\n", + "client.init_columns(columns) # shouldn't be needed but ensures all columns appear\n", "# client.make_public()" ] }, diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ferroelectrics.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ferroelectrics.ipynb index 458b629c00..d8dada5c99 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ferroelectrics.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ferroelectrics.ipynb @@ -64,7 +64,7 @@ "\n", "with distortions_file.open() as f:\n", " distortions = json.load(f)\n", - " \n", + "\n", "with workflow_data_file.open() as f:\n", " workflow_data = json.load(f)" ] @@ -82,30 +82,47 @@ " \"bilbao_nonpolar_spacegroup\": {\"name\": \"bilbao.spacegroup.nonpolar\", \"unit\": \"\"},\n", " \"bilbao_polar_spacegroup\": {\"name\": \"bilbao.spacegroup.polar\", \"unit\": \"\"},\n", " \"polarization_change_norm\": {\"name\": \"polarization.norm\", \"unit\": \"µC/cm²\"},\n", - " \"polarization_change\": {\"name\": \"polarization.vector\", \"unit\": \"µC/cm²\", \"fields\": [\"a\", \"b\", \"c\"]},\n", - " \"polarization_quanta\": {\"name\":\"polarization.quanta\", \"unit\":\"µC/cm²\", \"fields\": [\"a\", \"b\", \"c\"]},\n", - " \"energies\": {\"name\":\"energy|diff\", \"unit\":\"eV\"},\n", + " \"polarization_change\": {\n", + " \"name\": \"polarization.vector\",\n", + " \"unit\": \"µC/cm²\",\n", + " \"fields\": [\"a\", \"b\", \"c\"],\n", + " },\n", + " \"polarization_quanta\": {\n", + " \"name\": \"polarization.quanta\",\n", + " \"unit\": \"µC/cm²\",\n", + " \"fields\": [\"a\", \"b\", \"c\"],\n", + " },\n", + " \"energies\": {\"name\": \"energy|diff\", \"unit\": \"eV\"},\n", " \"search_id\": {\"name\": \"workflow.id|search\", \"unit\": \"\"},\n", - " \"workflow_status\": {\"name\": \"workflow.status\",\"unit\":None},\n", - " \"category\": {\"name\": \"workflow.category\", \"unit\": None}, # dynamic\n", + " \"workflow_status\": {\"name\": \"workflow.status\", \"unit\": None},\n", + " \"category\": {\"name\": \"workflow.category\", \"unit\": None}, # dynamic\n", " \"distortion.dmax\": {\"name\": \"distortion.dmax.before\", \"unit\": \"Å\"},\n", " \"calculated_max_distance\": {\"name\": \"distortion.dmax.after\", \"unit\": \"Å\"},\n", - "# \"distortion.delta\": {\"name\": \"distortion.delta\", \"unit\": \"\"},\n", - "# \"distortion.dav\": {\"name\": \"distortion.dav\", \"unit\": \"\"},\n", - "# \"distortion.s\": {\"name\": \"distortion.s\", \"unit\": \"\"},\n", + " # \"distortion.delta\": {\"name\": \"distortion.delta\", \"unit\": \"\"},\n", + " # \"distortion.dav\": {\"name\": \"distortion.dav\", \"unit\": \"\"},\n", + " # \"distortion.s\": {\"name\": \"distortion.s\", \"unit\": \"\"},\n", " \"bandgaps\": {\"name\": \"bandgap\", \"unit\": \"eV\"},\n", - "# \"nonpolar_band_gap\": {\"name\": \"nonpolar.bandgap\", \"unit\": \"eV\"},\n", + " # \"nonpolar_band_gap\": {\"name\": \"nonpolar.bandgap\", \"unit\": \"eV\"},\n", " \"nonpolar_icsd\": {\"name\": \"nonpolar.icsd\", \"unit\": \"\"},\n", " \"nonpolar_id\": {\"name\": \"nonpolar.mpid\", \"unit\": None},\n", " \"nonpolar_spacegroup\": {\"name\": \"nonpolar.spacegroup\", \"unit\": \"\"},\n", - "# \"polar_band_gap\": {\"name\": \"polar.bandgap\", \"unit\": \"eV\"},\n", + " # \"polar_band_gap\": {\"name\": \"polar.bandgap\", \"unit\": \"eV\"},\n", " \"polar_icsd\": {\"name\": \"polar.icsd\", \"unit\": \"\"},\n", " \"polar_id\": {\"name\": \"polar.mpid\", \"unit\": None},\n", - " \"polar_spacegroup\": {\"name\": \"polar.spacegroup\", \"unit\": \"\"}, \n", - " \"energies_per_atom_max_spline_jumps\": {\"name\": \"energies.jumps|max\", \"unit\": \"eV/atom\"},\n", + " \"polar_spacegroup\": {\"name\": \"polar.spacegroup\", \"unit\": \"\"},\n", + " \"energies_per_atom_max_spline_jumps\": {\n", + " \"name\": \"energies.jumps|max\",\n", + " \"unit\": \"eV/atom\",\n", + " },\n", " \"energies_per_atom_smoothness\": {\"name\": \"energies.smoothness\", \"unit\": \"eV/atom\"},\n", - " \"polarization_max_spline_jumps\": {\"name\": \"polarizations.jumps\", \"fields\": {\"max\": \"µC/cm²\", \"index\": \"\"}},\n", - " \"polarization_smoothness\": {\"name\": \"polarizations.smoothness\", \"fields\": {\"max\": \"µC/cm²\", \"index\": \"\"}},\n", + " \"polarization_max_spline_jumps\": {\n", + " \"name\": \"polarizations.jumps\",\n", + " \"fields\": {\"max\": \"µC/cm²\", \"index\": \"\"},\n", + " },\n", + " \"polarization_smoothness\": {\n", + " \"name\": \"polarizations.smoothness\",\n", + " \"fields\": {\"max\": \"µC/cm²\", \"index\": \"\"},\n", + " },\n", "}" ] }, @@ -117,27 +134,36 @@ "outputs": [], "source": [ "def get_category(wf):\n", - " if (wf['polarization_len'] == 10 and\n", - " 'polarization_max_spline_jumps' in wf and\n", - " np.all(np.array(wf['polarization_max_spline_jumps']) <= 1) and\n", - " wf['energies_per_atom_max_spline_jumps'] <= 1e-2):\n", + " if (\n", + " wf[\"polarization_len\"] == 10\n", + " and \"polarization_max_spline_jumps\" in wf\n", + " and np.all(np.array(wf[\"polarization_max_spline_jumps\"]) <= 1)\n", + " and wf[\"energies_per_atom_max_spline_jumps\"] <= 1e-2\n", + " ):\n", " return \"smooth\"\n", - " \n", - " elif (wf['polarization_len'] == 10 and\n", - " 'polarization_change_norm' in wf and\n", - " 'polarization_max_spline_jumps' in wf and\n", - " (wf['energies_per_atom_max_spline_jumps'] > 1e-2 or\n", - " np.any(np.array(wf['polarization_max_spline_jumps']) > 1))):\n", + "\n", + " elif (\n", + " wf[\"polarization_len\"] == 10\n", + " and \"polarization_change_norm\" in wf\n", + " and \"polarization_max_spline_jumps\" in wf\n", + " and (\n", + " wf[\"energies_per_atom_max_spline_jumps\"] > 1e-2\n", + " or np.any(np.array(wf[\"polarization_max_spline_jumps\"]) > 1)\n", + " )\n", + " ):\n", " return \"unsmooth\"\n", - " \n", - " elif (wf['static_len'] == 10 and\n", - " 'polarization_change_norm' not in wf and\n", - " wf['workflow_status'] in (\"COMPLETED\",\"DEFUSED\")):\n", + "\n", + " elif (\n", + " wf[\"static_len\"] == 10\n", + " and \"polarization_change_norm\" not in wf\n", + " and wf[\"workflow_status\"] in (\"COMPLETED\", \"DEFUSED\")\n", + " ):\n", " return \"static\"\n", - " \n", - " elif ((wf['polarization_len'] < 10 or 'polarization_change_norm' not in wf) and\n", - " ((wf['workflow_status'] == \"DEFUSED\" and wf['static_len'] < 10) or\n", - " wf['workflow_status'] in (\"FIZZLED\",\"RUNNING\"))):\n", + "\n", + " elif (wf[\"polarization_len\"] < 10 or \"polarization_change_norm\" not in wf) and (\n", + " (wf[\"workflow_status\"] == \"DEFUSED\" and wf[\"static_len\"] < 10)\n", + " or wf[\"workflow_status\"] in (\"FIZZLED\", \"RUNNING\")\n", + " ):\n", " return \"incomplete\"" ] }, @@ -155,22 +181,24 @@ "for distortion in distortions:\n", " k1, k2 = distortion[\"nonpolar_id\"], distortion[\"polar_id\"]\n", " key = f\"{k1}_{k2}\"\n", - " contribs_distortions[key] = {\"data\": {}}#, \"structures\": [], \"attachments\": []}\n", - " \n", + " contribs_distortions[key] = {\"data\": {}} # , \"structures\": [], \"attachments\": []}\n", + "\n", " for k, v in flatten(distortion, reducer=\"dot\", max_flatten_depth=2).items():\n", " if k.endswith(\"_pre\") or k.startswith(\"_id\"):\n", - " continue \n", + " continue\n", " elif not isinstance(v, (dict, list)):\n", " conf = columns.get(k)\n", " if conf:\n", " name, unit = conf[\"name\"], conf[\"unit\"]\n", - " dec = conf.get('dec', '')\n", - " contribs_distortions[key][\"data\"][name] = f\"{float(v):{dec}} {unit}\" if unit else v\n", + " dec = conf.get(\"dec\", \"\")\n", + " contribs_distortions[key][\"data\"][name] = (\n", + " f\"{float(v):{dec}} {unit}\" if unit else v\n", + " )\n", "# elif isinstance(v, dict) and \"@class\" in v and v[\"@class\"] == \"Structure\":\n", "# structure = Structure.from_dict(v)\n", "# structure.name = k\n", "# contribs_distortions[key][\"structures\"].append(structure)\n", - " \n", + "\n", "# attm = Attachment.from_data(\"distortion\", distortion)\n", "# contribs_distortions[key][\"attachments\"].append(attm)" ] @@ -201,49 +229,53 @@ "\n", "for wf in workflow_data:\n", " k1, k2 = wf[\"nonpolar_id\"], wf[\"polar_id\"]\n", - " key = f\"{k1}_{k2}\" # NOTE could also use search_id for this\n", + " key = f\"{k1}_{k2}\" # NOTE could also use search_id for this\n", " distortion = contribs_distortions[key]\n", " contrib = {\n", - " \"identifier\": wf[\"wfid\"], \"formula\": wf[\"pretty_formula\"],\n", + " \"identifier\": wf[\"wfid\"],\n", + " \"formula\": wf[\"pretty_formula\"],\n", " \"data\": contribs_distortions[key][\"data\"],\n", - "# \"structures\": contribs_distortions[key][\"structures\"],\n", - "# \"attachments\": contribs_distortions[key][\"attachments\"]\n", + " # \"structures\": contribs_distortions[key][\"structures\"],\n", + " # \"attachments\": contribs_distortions[key][\"attachments\"]\n", " }\n", - " contrib['data']['workflow.category'] = get_category(wf)\n", + " contrib[\"data\"][\"workflow.category\"] = get_category(wf)\n", " if ids and wf[\"wfid\"] in ids:\n", " contrib[\"id\"] = ids[wf[\"wfid\"]]\n", - " \n", - "# for k in structure_keys:\n", - "# if k in wf:\n", - "# structure = Structure.from_dict(wf[k])\n", - "# structure.name = k\n", - "# contrib[\"structures\"].append(structure)\n", - " \n", + "\n", + " # for k in structure_keys:\n", + " # if k in wf:\n", + " # structure = Structure.from_dict(wf[k])\n", + " # structure.name = k\n", + " # contrib[\"structures\"].append(structure)\n", + "\n", " for k, v in flatten(wf, reducer=\"dot\").items():\n", " conf = columns.get(k)\n", - " if conf and k.startswith('polarization') and isinstance(v, list):\n", + " if conf and k.startswith(\"polarization\") and isinstance(v, list):\n", " name, fields = conf[\"name\"], conf[\"fields\"]\n", " contrib[\"data\"].setdefault(name, {})\n", " if not \"unit\" in conf:\n", " vmax, unit = max(v), fields[\"max\"]\n", - " contrib[\"data\"][name]['max'] = f\"{round(vmax, 3)} {unit}\" if unit else v\n", - " contrib[\"data\"][name]['index'] = v.index(vmax)\n", + " contrib[\"data\"][name][\"max\"] = f\"{round(vmax, 3)} {unit}\" if unit else v\n", + " contrib[\"data\"][name][\"index\"] = v.index(vmax)\n", " else:\n", " unit = conf[\"unit\"]\n", " contrib[\"data\"][name] = {\n", - " i: f\"{j} {unit}\"\n", - " for i, j in zip(conf[\"fields\"], v[0])\n", + " i: f\"{j} {unit}\" for i, j in zip(conf[\"fields\"], v[0])\n", " }\n", - " elif conf and k == 'energies_per_atom':\n", + " elif conf and k == \"energies_per_atom\":\n", " name, unit = conf[\"name\"], conf[\"unit\"]\n", " ediff = v[0] - v[-1]\n", - " contrib[\"data\"][name] = f\"{ediff:.3g} {unit}\" \n", - " elif conf and k == 'bandgaps':\n", + " contrib[\"data\"][name] = f\"{ediff:.3g} {unit}\"\n", + " elif conf and k == \"bandgaps\":\n", " name, unit = conf[\"name\"], conf[\"unit\"]\n", " contrib[\"data\"].setdefault(name, {})\n", " contrib[\"data\"][name][\"nonpolar\"] = f\"{v[0]:.3g} {unit}\"\n", " contrib[\"data\"][name][\"polar\"] = f\"{v[-1]:.3g} {unit}\"\n", - " elif k.startswith((\"_id\", \"cid\")) or isinstance(v, list) or k.startswith(structure_keys):\n", + " elif (\n", + " k.startswith((\"_id\", \"cid\"))\n", + " or isinstance(v, list)\n", + " or k.startswith(structure_keys)\n", + " ):\n", " continue\n", " elif conf:\n", " name, unit = conf[\"name\"], conf[\"unit\"]\n", @@ -251,12 +283,12 @@ " contrib[\"data\"][name] = f\"{v:.1g} {unit}\" if unit else v\n", " else:\n", " contrib[\"data\"][name] = f\"{v:.3g} {unit}\" if unit else v\n", - " \n", - "# attm = Attachment.from_data(\"workflow\", wf)\n", - "# contrib[\"attachments\"].append(attm)\n", + "\n", + " # attm = Attachment.from_data(\"workflow\", wf)\n", + " # contrib[\"attachments\"].append(attm)\n", " contrib[\"data\"] = unflatten(contrib[\"data\"], splitter=\"dot\")\n", " contributions.append(contrib)\n", - " \n", + "\n", "len(contributions)" ] }, @@ -293,7 +325,7 @@ "metadata": {}, "outputs": [], "source": [ - "#client.delete_contributions()\n", + "# client.delete_contributions()\n", "client.init_columns({})\n", "client.init_columns(columns_map)" ] diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/gbdb.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/gbdb.ipynb index 315384b0ea..809d45d359 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/gbdb.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/gbdb.ipynb @@ -24,7 +24,7 @@ "metadata": {}, "outputs": [], "source": [ - "client = Client(project=\"gbdb\") # set your API key via the `apikey` keyword argument" + "client = Client(project=\"gbdb\") # set your API key via the `apikey` keyword argument" ] }, { @@ -53,7 +53,7 @@ " \"repetitions\": \"number of repetitions of the base structure in x/y direction\",\n", " \"temperature\": \"temperature of MD simulation in Kelvin\",\n", " \"steps\": \"number of steps of MD simulation\",\n", - " \"potential\": \"classical potential used\"\n", + " \"potential\": \"classical potential used\",\n", "}\n", "client.update_project({\"other\": other})" ] @@ -75,8 +75,8 @@ "source": [ "# initialize columns\n", "columns = {\n", - " \"element\": None, # string\n", - " \"indices.h\": \"\", # dimensionless\n", + " \"element\": None, # string\n", + " \"indices.h\": \"\", # dimensionless\n", " \"indices.k\": \"\",\n", " \"indices.l\": \"\",\n", " \"boundary\": None,\n", @@ -88,7 +88,7 @@ " \"repetitions.y\": \"\",\n", " \"temperature\": \"K\",\n", " \"steps\": \"\",\n", - " \"potential\": None\n", + " \"potential\": None,\n", "}\n", "client.init_columns(columns)" ] @@ -107,7 +107,7 @@ " spec = [elem for i in range(dump.natoms)]\n", " df = dump.data.copy()\n", " df.drop(df.tail(1).index, inplace=True)\n", - " pos = df[['x', 'y', 'z']].to_numpy()\n", + " pos = df[[\"x\", \"y\", \"z\"]].to_numpy()\n", " return Structure(lattice=lat, species=spec, coords=pos, coords_are_cartesian=True)" ] }, @@ -120,14 +120,16 @@ "source": [ "# prep contributions\n", "contributions = []\n", - "indir = Path(\"/Users/patrick/GoogleDriveLBNL/My Drive/MaterialsProject/gitrepos/mpcontribs-data/gbdb\")\n", + "indir = Path(\n", + " \"/Users/patrick/GoogleDriveLBNL/My Drive/MaterialsProject/gitrepos/mpcontribs-data/gbdb\"\n", + ")\n", "keys = list(k for k in columns.keys() if not k.startswith(\"indices\"))\n", "keys.insert(1, \"indices\")\n", "\n", "for path in indir.glob(\"lammps_*\"):\n", " identifier = hashlib.md5(path.name.encode(\"utf-8\")).hexdigest()\n", " contrib = {\"identifier\": identifier, \"data\": {}}\n", - " \n", + "\n", " for idx, part in enumerate(path.name.split(\"_\")[1:]):\n", " if idx == 1:\n", " contrib[\"data\"][\"indices\"] = {k: int(v) for k, v in zip(\"hkl\", part)}\n", @@ -135,7 +137,7 @@ " key = keys[idx]\n", " unit = columns[key]\n", " contrib[\"data\"][key] = f\"{part} {unit}\" if unit else part\n", - " \n", + "\n", " contrib[\"data\"] = unflatten(contrib[\"data\"], splitter=\"dot\")\n", " structure = get_structure(contrib[\"data\"][\"element\"], path)\n", " contrib[\"formula\"] = structure.composition.reduced_formula\n", @@ -168,7 +170,9 @@ "source": [ "# submit contributions\n", "client.submit_contributions(contributions)\n", - "client.init_columns(columns) # this should not be needed but doesn't hurt, possible API bug" + "client.init_columns(\n", + " columns\n", + ") # this should not be needed but doesn't hurt, possible API bug" ] }, { @@ -186,7 +190,7 @@ "metadata": {}, "outputs": [], "source": [ - "#client._reinit() # only needed if data just uploaded\n", + "# client._reinit() # only needed if data just uploaded\n", "ncontribs, _ = client.get_totals()\n", "ncontribs" ] @@ -211,10 +215,12 @@ "source": [ "query = {\"data__boundary__exact\": \"tilt\", \"data__n__value__gt\": 0}\n", "count, _ = client.get_totals(query=query)\n", - "print(f\"grain boundaries of type tilt and n>0: {count/ncontribs*100:.1f}%\")\n", + "print(f\"grain boundaries of type tilt and n>0: {count / ncontribs * 100:.1f}%\")\n", "fields = [\"identifier\", \"formula\", \"data.energy.value\", \"data.potential\"]\n", "sort = \"data.energy.value\"\n", - "contribs = client.query_contributions(query=query, fields=fields, sort=sort, paginate=True)\n", + "contribs = client.query_contributions(\n", + " query=query, fields=fields, sort=sort, paginate=True\n", + ")\n", "pd.json_normalize(contribs[\"data\"])" ] } diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/get_started.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/get_started.ipynb index 049498fcd0..b35a15ce45 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/get_started.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/get_started.ipynb @@ -60,7 +60,7 @@ "outputs": [], "source": [ "db = DB.Database(\"refractive.db\")\n", - "#db.create_database_from_url()" + "# db.create_database_from_url()" ] }, { @@ -149,11 +149,11 @@ " formula = info[\"book\"]\n", " mpid = mpr.get_materials_ids(formula)[0]\n", "\n", - " rmin, rmax = info['rangeMin']*1000, info['rangeMax']*1000\n", + " rmin, rmax = info[\"rangeMin\"] * 1000, info[\"rangeMax\"] * 1000\n", " mid = (rmin + rmax) / 2\n", " n = mat.get_refractiveindex(mid)\n", " k = mat.get_extinctioncoefficient(mid)\n", - " \n", + "\n", " x = \"wavelength λ [μm]\"\n", " refrac = DataFrame(mat.get_complete_refractive(), columns=[x, \"n\"])\n", " refrac.set_index(x, inplace=True)\n", @@ -164,9 +164,9 @@ " df.attrs[\"title\"] = f\"Complex refractive index (n+ik) for {formula}\"\n", " df.attrs[\"labels\"] = {\n", " \"value\": \"n, k\", # y-axis label\n", - " \"variable\": \"Re/Im\" # legend name (= df.columns.name)\n", + " \"variable\": \"Re/Im\", # legend name (= df.columns.name)\n", " }\n", - " df.plot(**df.attrs)#.show()\n", + " df.plot(**df.attrs) # .show()\n", " df.attrs[\"name\"] = \"n,k(λ)\"\n", " return {\n", " \"project\": name,\n", @@ -178,9 +178,9 @@ " \"range.mid\": f\"{mid} nm\",\n", " \"range.max\": f\"{rmax} nm\",\n", " \"points\": info[\"points\"],\n", - " \"page\": info[\"page\"]\n", + " \"page\": info[\"page\"],\n", " },\n", - " \"tables\": [df]\n", + " \"tables\": [df],\n", " }" ] }, @@ -208,10 +208,7 @@ "metadata": {}, "outputs": [], "source": [ - "client = Client(\n", - " host=\"workshop-contribs-api.materialsproject.org\",\n", - " apikey=apikey\n", - ")" + "client = Client(host=\"workshop-contribs-api.materialsproject.org\", apikey=apikey)" ] }, { @@ -230,18 +227,21 @@ "outputs": [], "source": [ "update = {\n", - " 'unique_identifiers': False,\n", - " 'references': [\n", - " {'label': 'website', 'url': 'https://refractiveindex.info'},\n", - " {'label': 'source', 'url': \"https://refractiveindex.info/download/database/rii-database-2019-02-11.zip\"}\n", + " \"unique_identifiers\": False,\n", + " \"references\": [\n", + " {\"label\": \"website\", \"url\": \"https://refractiveindex.info\"},\n", + " {\n", + " \"label\": \"source\",\n", + " \"url\": \"https://refractiveindex.info/download/database/rii-database-2019-02-11.zip\",\n", + " },\n", " ],\n", - " \"other\": { # describe the root fields here to automatically include tooltips on MP\n", + " \"other\": { # describe the root fields here to automatically include tooltips on MP\n", " \"n\": \"real part of complex refractive index\",\n", " \"k\": \"imaginary part of complex refractive index\",\n", " \"range\": \"wavelength range for n,k in nm\",\n", " \"points\": \"number of λ points in range\",\n", - " \"page\": \"reference to data source/publication\"\n", - " }\n", + " \"page\": \"reference to data source/publication\",\n", + " },\n", "}\n", "# could also update authors, title, long_title, description" ] @@ -280,15 +280,18 @@ "metadata": {}, "outputs": [], "source": [ - "client.init_columns(name, {\n", - " \"n\": \"\", # dimensionless\n", - " \"k\": \"\",\n", - " \"range.min\": \"nm\",\n", - " \"range.mid\": \"nm\",\n", - " \"range.max\": \"nm\",\n", - " \"points\": \"\",\n", - " \"page\": None # text \n", - "})" + "client.init_columns(\n", + " name,\n", + " {\n", + " \"n\": \"\", # dimensionless\n", + " \"k\": \"\",\n", + " \"range.min\": \"nm\",\n", + " \"range.mid\": \"nm\",\n", + " \"range.max\": \"nm\",\n", + " \"points\": \"\",\n", + " \"page\": None, # text\n", + " },\n", + ")" ] }, { @@ -391,10 +394,7 @@ "outputs": [], "source": [ "all_ids = client.get_all_ids(\n", - " {\"project\": name},\n", - " include=[\"tables\"],\n", - " data_id_fields={name: \"page\"},\n", - " fmt=\"map\"\n", + " {\"project\": name}, include=[\"tables\"], data_id_fields={name: \"page\"}, fmt=\"map\"\n", ")" ] }, @@ -439,18 +439,18 @@ "query = {\n", " \"project\": name,\n", " \"formula__contains\": \"Au\",\n", - " #\"identifier__in\": []\n", - "\n", + " # \"identifier__in\": []\n", " \"data__n__value__lt\": 200,\n", " \"data__k__value__gte\": 7,\n", - "\n", " \"_sort\": \"-data__range__mid__value\",\n", " \"_fields\": [\n", - " \"id\", \"identifier\", \"formula\",\n", + " \"id\",\n", + " \"identifier\",\n", + " \"formula\",\n", " \"data.range.mid.value\",\n", " \"data.n.value\",\n", - " \"data.k.value\"\n", - " ]\n", + " \"data.k.value\",\n", + " ],\n", "}\n", "\n", "print(client.get_totals(query))\n", diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/intermatch.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/intermatch.ipynb index 8eb5bfd12f..b1df676413 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/intermatch.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/intermatch.ipynb @@ -46,11 +46,14 @@ " \"identifier\": \"mp-48\",\n", " \"data\": {\n", " \"interface\": \"mp-22850\",\n", - " \"Δn\": 1.3, \"ε\": 3.6199, \"atoms\": 208, \"θ\": \"0 °\",\n", + " \"Δn\": 1.3,\n", + " \"ε\": 3.6199,\n", + " \"atoms\": 208,\n", + " \"θ\": \"0 °\",\n", " \"surface\": {\"N₁\": 40, \"N₂\": 6, \"ratio\": 6.666},\n", " \"v₁\": {\"i₁₁\": -8, \"i₁₂\": 8, \"i₂₁\": -3, \"i₂₂\": 3},\n", - " \"v₂\": {\"j₁₁\": -13, \"j₁₂\": 8, \"j₂₁\": -5, \"j₂₂\": 3}\n", - " }\n", + " \"v₂\": {\"j₁₁\": -13, \"j₁₂\": 8, \"j₂₁\": -5, \"j₂₂\": 3},\n", + " },\n", " }\n", "]" ] diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ion_ref_data.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ion_ref_data.ipynb index 4543e68cdb..89e280eb7b 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ion_ref_data.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ion_ref_data.ipynb @@ -87,13 +87,11 @@ " if e[\"Name\"] == \"HGaO2[2-]\":\n", " ion_ref_data[i] = {\n", " \"Energy\": -7.1099,\n", - " \"Major_Elements\": [\n", - " \"Ga\"\n", - " ],\n", + " \"Major_Elements\": [\"Ga\"],\n", " \"Name\": \"HGaO3[2-]\",\n", " \"Reference Solid\": \"Ga2O3\",\n", " \"Reference solid energy\": -10.347724703224722,\n", - " \"Source\": \"D. D. Wagman et al., Selected values for inorganic and C1 and C2 Organic substances in SI units, The NBS table of chemical thermodynamic properties, Washington (1982)\"\n", + " \"Source\": \"D. D. Wagman et al., Selected values for inorganic and C1 and C2 Organic substances in SI units, The NBS table of chemical thermodynamic properties, Washington (1982)\",\n", " }\n", " print(\"Replaced entry at index {}\".format(i))" ] @@ -121,7 +119,8 @@ "outputs": [], "source": [ "from mpcontribs.client import Client\n", - "name = 'ion_ref_data' # this should be your project, see from the project URL\n", + "\n", + "name = \"ion_ref_data\" # this should be your project, see from the project URL\n", "client = Client()" ] }, @@ -138,7 +137,7 @@ "metadata": {}, "outputs": [], "source": [ - "ion_contribs =[]\n", + "ion_contribs = []\n", "\n", "for d in ion_ref_data:\n", " ret = {}\n", @@ -147,12 +146,16 @@ " ret[\"identifier\"] = d[\"Name\"]\n", " ret[\"data\"] = {}\n", " ret[\"data\"][\"charge\"] = Ion.from_formula(d[\"Name\"]).charge\n", - " ret[\"data\"][\"ΔGᶠ\"] = \"{:.5g} kJ/mol\".format(d[\"Energy\"]*96.485) # convert from eV/f.u. to kJ/mol\n", + " ret[\"data\"][\"ΔGᶠ\"] = \"{:.5g} kJ/mol\".format(\n", + " d[\"Energy\"] * 96.485\n", + " ) # convert from eV/f.u. to kJ/mol\n", " ret[\"data\"][\"MajElements\"] = d[\"Major_Elements\"][0]\n", " ret[\"data\"][\"RefSolid\"] = d[\"Reference Solid\"]\n", - " ret[\"data\"][\"ΔGᶠRefSolid\"] = \"{:.4g} kJ/mol\".format(d[\"Reference solid energy\"]*96.485)# convert from eV/f.u. to kJ/mol\n", + " ret[\"data\"][\"ΔGᶠRefSolid\"] = \"{:.4g} kJ/mol\".format(\n", + " d[\"Reference solid energy\"] * 96.485\n", + " ) # convert from eV/f.u. to kJ/mol\n", " ret[\"data\"][\"reference\"] = d[\"Source\"]\n", - " \n", + "\n", " ion_contribs.append(ret)" ] }, @@ -189,18 +192,20 @@ "outputs": [], "source": [ "client.projects.update_entry(\n", - " pk=\"ion_ref_data\", project={\"other\": \n", - " {\"formula\": \"Chemical formula of the aqueous species\",\n", - " \"charge\": \"Charge on the aqueous species\",\n", - " \"ΔGᶠ\": \"Gibbs free energy of formation of the aqueous species from the elements\",\n", - " \"MajElementsᶠ\": None,\n", - " \"MajElements\": \"Elements contained in the aqueous species\",\n", - " \"RefSolid\": \"Solid compound to which the aqueous species energy is referenced\",\n", - " \"ΔGᶠRefSolid\": \"Gibbs free energy of formation of the reference solid compound\",\n", - " \"Ion\": None\n", - " },\n", - " \"description\": \"This project contains experimental ion dissolution energies that are used by pymatgen when constructing Pourbaix diagrams. See the Persson2012 reference for a detailed description of the thermodynamic framework used.\"\n", - " }\n", + " pk=\"ion_ref_data\",\n", + " project={\n", + " \"other\": {\n", + " \"formula\": \"Chemical formula of the aqueous species\",\n", + " \"charge\": \"Charge on the aqueous species\",\n", + " \"ΔGᶠ\": \"Gibbs free energy of formation of the aqueous species from the elements\",\n", + " \"MajElementsᶠ\": None,\n", + " \"MajElements\": \"Elements contained in the aqueous species\",\n", + " \"RefSolid\": \"Solid compound to which the aqueous species energy is referenced\",\n", + " \"ΔGᶠRefSolid\": \"Gibbs free energy of formation of the reference solid compound\",\n", + " \"Ion\": None,\n", + " },\n", + " \"description\": \"This project contains experimental ion dissolution energies that are used by pymatgen when constructing Pourbaix diagrams. See the Persson2012 reference for a detailed description of the thermodynamic framework used.\",\n", + " },\n", ").result()" ] }, @@ -211,8 +216,10 @@ "outputs": [], "source": [ "client.projects.update_entry(\n", - " pk=\"ion_ref_data\", project={\"authors\": \"Various authors (see references). Data compiled by the Materials Project team.\"\n", - " }\n", + " pk=\"ion_ref_data\",\n", + " project={\n", + " \"authors\": \"Various authors (see references). Data compiled by the Materials Project team.\"\n", + " },\n", ").result()" ] }, @@ -223,8 +230,7 @@ "outputs": [], "source": [ "client.projects.update_entry(\n", - " pk=\"ion_ref_data\", project={\"title\": \"Aqueous Ion Reference Data\"\n", - " }\n", + " pk=\"ion_ref_data\", project={\"title\": \"Aqueous Ion Reference Data\"}\n", ").result()" ] }, @@ -235,18 +241,51 @@ "outputs": [], "source": [ "client.projects.update_entry(\n", - " pk=\"ion_ref_data\", project={\"references\": [\n", - " {\"label\":\"Persson2012\", 'url':\"https://doi.org/10.1103/PhysRevB.85.235438\"},\n", - " {'label': 'NBS1', 'url': 'https://nvlpubs.nist.gov/nistpubs/Legacy/TN/nbstechnicalnote270-1.pdf'},\n", - " {'label': 'NBS2', 'url': 'https://nvlpubs.nist.gov/nistpubs/Legacy/TN/nbstechnicalnote270-2.pdf'},\n", - " {'label': 'NBS3', 'url': 'https://nvlpubs.nist.gov/nistpubs/Legacy/TN/nbstechnicalnote270-3.pdf'},\n", - " {'label': 'NBS4', 'url': 'https://nvlpubs.nist.gov/nistpubs/Legacy/TN/nbstechnicalnote270-4.pdf'},\n", - " {'label': 'NBS5', 'url': 'https://nvlpubs.nist.gov/nistpubs/Legacy/TN/nbstechnicalnote270-5.pdf'},\n", - " {'label': 'NBS6', 'url': 'https://nvlpubs.nist.gov/nistpubs/Legacy/TN/nbstechnicalnote270-6.pdf'},\n", - " {'label': 'NBS7', 'url': 'https://nvlpubs.nist.gov/nistpubs/Legacy/TN/nbstechnicalnote270-7.pdf'},\n", - " {'label': 'NBS8', 'url': 'https://nvlpubs.nist.gov/nistpubs/Legacy/TN/nbstechnicalnote270-8.pdf'},\n", - " {\"label\":\"Pourbaix\", 'url':\"https://www.worldcat.org/title/atlas-of-electrochemical-equilibria-in-aqueous-solutions/oclc/563921897\"}]\n", - " }\n", + " pk=\"ion_ref_data\",\n", + " project={\n", + " \"references\": [\n", + " {\n", + " \"label\": \"Persson2012\",\n", + " \"url\": \"https://doi.org/10.1103/PhysRevB.85.235438\",\n", + " },\n", + " {\n", + " \"label\": \"NBS1\",\n", + " \"url\": \"https://nvlpubs.nist.gov/nistpubs/Legacy/TN/nbstechnicalnote270-1.pdf\",\n", + " },\n", + " {\n", + " \"label\": \"NBS2\",\n", + " \"url\": \"https://nvlpubs.nist.gov/nistpubs/Legacy/TN/nbstechnicalnote270-2.pdf\",\n", + " },\n", + " {\n", + " \"label\": \"NBS3\",\n", + " \"url\": \"https://nvlpubs.nist.gov/nistpubs/Legacy/TN/nbstechnicalnote270-3.pdf\",\n", + " },\n", + " {\n", + " \"label\": \"NBS4\",\n", + " \"url\": \"https://nvlpubs.nist.gov/nistpubs/Legacy/TN/nbstechnicalnote270-4.pdf\",\n", + " },\n", + " {\n", + " \"label\": \"NBS5\",\n", + " \"url\": \"https://nvlpubs.nist.gov/nistpubs/Legacy/TN/nbstechnicalnote270-5.pdf\",\n", + " },\n", + " {\n", + " \"label\": \"NBS6\",\n", + " \"url\": \"https://nvlpubs.nist.gov/nistpubs/Legacy/TN/nbstechnicalnote270-6.pdf\",\n", + " },\n", + " {\n", + " \"label\": \"NBS7\",\n", + " \"url\": \"https://nvlpubs.nist.gov/nistpubs/Legacy/TN/nbstechnicalnote270-7.pdf\",\n", + " },\n", + " {\n", + " \"label\": \"NBS8\",\n", + " \"url\": \"https://nvlpubs.nist.gov/nistpubs/Legacy/TN/nbstechnicalnote270-8.pdf\",\n", + " },\n", + " {\n", + " \"label\": \"Pourbaix\",\n", + " \"url\": \"https://www.worldcat.org/title/atlas-of-electrochemical-equilibria-in-aqueous-solutions/oclc/563921897\",\n", + " },\n", + " ]\n", + " },\n", ").result()" ] }, @@ -282,7 +321,7 @@ "# need to delete contributions first due to unique_identifiers=False\n", "client.delete_contributions(name)\n", "client.submit_contributions(ion_contribs, per_page=10, skip_dupe_check=True)\n", - "#client.contributions.create_entries(contributions=ion_contribs[0:100]).result()" + "# client.contributions.create_entries(contributions=ion_contribs[0:100]).result()" ] }, { diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/jarvis_dft.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/jarvis_dft.ipynb index bb08b09503..d4cd3b7a82 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/jarvis_dft.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/jarvis_dft.ipynb @@ -20,7 +20,7 @@ "metadata": {}, "outputs": [], "source": [ - "name = 'jarvis_dft'\n", + "name = \"jarvis_dft\"\n", "client = Client()" ] }, @@ -57,22 +57,22 @@ "metadata": {}, "outputs": [], "source": [ - "dimensions = ['2d', '3d']\n", + "dimensions = [\"2d\", \"3d\"]\n", "tgz = \"jdft_{}.json.tgz\"\n", "config = {\n", " \"file\": f\"https://www.ctcms.nist.gov/~knc6/{tgz}\",\n", " \"details\": \"https://www.ctcms.nist.gov/~knc6/jsmol/{}.html\",\n", - " 'columns': { # 'mpid'\n", - " 'jid': {'name': 'details'},\n", - " 'fin_en': {'name': 'E', 'unit': 'meV'},\n", - " 'exfoliation_en': {'name': 'Eₓ', 'unit': 'eV'},\n", - " 'form_enp': {'name': 'ΔH', 'unit': 'eV'},\n", - " 'op_gap': {'name': 'ΔEⱽᴰᵂ', 'unit': 'meV'},\n", - " 'mbj_gap': {'name': 'ΔEᴹᴮᴶ', 'unit': 'meV'},\n", - " 'kv': {'name': 'Kᵥ', 'unit': 'GPa'},\n", - " 'gv': {'name': 'Gᵥ', 'unit': 'GPa'},\n", - " 'magmom': {'name': 'µ', 'unit': 'µᵇ'}\n", - " }\n", + " \"columns\": { # 'mpid'\n", + " \"jid\": {\"name\": \"details\"},\n", + " \"fin_en\": {\"name\": \"E\", \"unit\": \"meV\"},\n", + " \"exfoliation_en\": {\"name\": \"Eₓ\", \"unit\": \"eV\"},\n", + " \"form_enp\": {\"name\": \"ΔH\", \"unit\": \"eV\"},\n", + " \"op_gap\": {\"name\": \"ΔEⱽᴰᵂ\", \"unit\": \"meV\"},\n", + " \"mbj_gap\": {\"name\": \"ΔEᴹᴮᴶ\", \"unit\": \"meV\"},\n", + " \"kv\": {\"name\": \"Kᵥ\", \"unit\": \"GPa\"},\n", + " \"gv\": {\"name\": \"Gᵥ\", \"unit\": \"GPa\"},\n", + " \"magmom\": {\"name\": \"µ\", \"unit\": \"µᵇ\"},\n", + " },\n", "}" ] }, @@ -87,17 +87,17 @@ "\n", "for dim in dimensions:\n", " url = config[\"file\"].format(dim)\n", - " dbfile = url.rsplit('/')[-1]\n", + " dbfile = url.rsplit(\"/\")[-1]\n", " dbpath = os.path.join(dbdir, dbfile)\n", - " \n", + "\n", " if not os.path.exists(dbpath):\n", - " print('downloading', dbpath, '...')\n", + " print(\"downloading\", dbpath, \"...\")\n", " urlretrieve(url, dbpath)\n", "\n", " with tarfile.open(dbpath, \"r:gz\") as tar:\n", " member = tar.getmembers()[0]\n", " raw_data[dim] = json.load(tar.extractfile(member), cls=MontyDecoder)\n", - " \n", + "\n", " print(dim, len(raw_data[dim]))" ] }, @@ -121,15 +121,16 @@ " for dim in dimensions:\n", " for rd in raw_data[dim]:\n", " contrib = {\n", - " 'project': name, 'is_public': True,\n", - " 'identifier': rd[\"mpid\"],\n", - " 'data': {'type': dim.upper()}\n", + " \"project\": name,\n", + " \"is_public\": True,\n", + " \"identifier\": rd[\"mpid\"],\n", + " \"data\": {\"type\": dim.upper()},\n", " }\n", "\n", " dct = {}\n", - " for k, col in config['columns'].items():\n", - " hdr, unit = col['name'], col.get('unit')\n", - " if k == 'jid':\n", + " for k, col in config[\"columns\"].items():\n", + " hdr, unit = col[\"name\"], col.get(\"unit\")\n", + " if k == \"jid\":\n", " dct[hdr] = config[hdr].format(rd[k])\n", " elif k in rd:\n", " if unit and rd[k]:\n", @@ -137,18 +138,18 @@ " float(rd[k])\n", " except ValueError:\n", " continue\n", - " dct[hdr] = f'{rd[k]} {unit}' if unit else rd[k]\n", + " dct[hdr] = f\"{rd[k]} {unit}\" if unit else rd[k]\n", "\n", " contrib[\"data\"].update(unflatten(dct))\n", "\n", - " contrib[\"structures\"] = [rd['final_str']]\n", + " contrib[\"structures\"] = [rd[\"final_str\"]]\n", " contributions.append(contrib)\n", " pbar.update(1)\n", "\n", "# make sure that contributions with all columns come first\n", - "contributions = [d for d in sorted(\n", - " contributions, key=lambda x: len(x[\"data\"]), reverse=True\n", - ")]" + "contributions = [\n", + " d for d in sorted(contributions, key=lambda x: len(x[\"data\"]), reverse=True)\n", + "]" ] }, { @@ -190,13 +191,17 @@ " \"_order_by\": \"data__ΔEⱽᴰᵂ__value\",\n", " \"order\": \"desc\",\n", " \"_fields\": [\n", - " \"id\", \"identifier\", \"formula\",\n", - " \"data.type\", \"data.ΔEⱽᴰᵂ.value\",\n", - " \"data.ΔEᴹᴮᴶ.value\", \"data.Kᵥ.value\",\n", - " \"structures\"\n", + " \"id\",\n", + " \"identifier\",\n", + " \"formula\",\n", + " \"data.type\",\n", + " \"data.ΔEⱽᴰᵂ.value\",\n", + " \"data.ΔEᴹᴮᴶ.value\",\n", + " \"data.Kᵥ.value\",\n", + " \"structures\",\n", " ],\n", - " \"_limit\": 10\n", - "} \n", + " \"_limit\": 10,\n", + "}\n", "resp = client.contributions.get_entries(**query).result()" ] }, diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/jarvis_dft_2023.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/jarvis_dft_2023.ipynb index a5ca1fe7e0..152fddd11d 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/jarvis_dft_2023.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/jarvis_dft_2023.ipynb @@ -32,7 +32,7 @@ "metadata": {}, "outputs": [], "source": [ - "name = 'dft_3d' # TODO dft_2d\n", + "name = \"dft_3d\" # TODO dft_2d\n", "data = jarvis_db(name)" ] }, @@ -44,62 +44,68 @@ "outputs": [], "source": [ "columns = {\n", - " 'jid': {'name': 'jarvis.id', 'unit': None},\n", - " 'jid': {'name': 'jarvis.link', 'unit': None},\n", - " 'Tc_supercon': {'name': 'Tc', 'unit': 'K'},\n", - " 'avg_elec_mass': {'name': 'mass|avg.elec', 'unit': 'mₑ'},\n", - " 'avg_hole_mass': {'name': 'mass|avg.hole', 'unit': 'mₑ'},\n", - " 'bulk_modulus_kv': {'name': 'moduli.bulk|voigt', 'unit': 'GPa'},\n", - " 'shear_modulus_gv': {'name': 'moduli.shear', 'unit': 'GPa'},\n", - " 'crys': {'name': 'crystal', 'unit': None},\n", - " 'density': {'name': 'density', 'unit': 'g/cm³'},\n", - " 'dfpt_piezo_max_dielectric': {'name': 'piezo|max.dielectric.total', 'unit': 'C/m²'},\n", - " 'dfpt_piezo_max_dielectric_electronic': {'name': 'piezo|max.dielectric.electronic', 'unit': 'C/m²'},\n", - " 'dfpt_piezo_max_dielectric_ionic': {'name': 'piezo|max.dielectric.ionic', 'unit': 'C/m²'},\n", - " 'dfpt_piezo_max_dij': {'name': 'piezo|max.dij', 'unit': 'C/m²'},\n", - " 'dfpt_piezo_max_eij': {'name': 'piezo|max.eij', 'unit': 'C/m²'},\n", - " 'dimensionality': {'name': 'dimensionality', 'unit': None},\n", - " 'effective_masses_300K.n': {'name': 'mass|eff.n|300K', 'unit': ''},\n", - " 'effective_masses_300K.p': {'name': 'mass|eff.p|300K', 'unit': ''},\n", - " 'spg_number': {'name': 'spacegroup.number', 'unit': ''},\n", - " 'spg_symbol': {'name': 'spacegroup.symbol', 'unit': None},\n", - " 'hse_gap': {'name': 'bandgaps.HSE', 'unit': 'eV'},\n", - " 'mbj_bandgap': {'name': 'bandgaps.TBmBJ', 'unit': 'eV'},\n", - " 'optb88vdw_bandgap': {'name': 'bandgaps.OptB88vdW', 'unit': 'eV'},\n", - " 'n-powerfact': {'name': 'powerfactor.n', 'unit': 'µW/K²/m²'},\n", - " 'p-powerfact': {'name': 'powerfactor.p', 'unit': 'µW/K²/m²'},\n", - " 'slme': {'name': 'SLME', 'unit': '%'},\n", - " 'spillage': {'name': 'spillage', 'unit': ''},\n", - " 'encut': {'name': 'ENCUT', 'unit': 'eV'},\n", - " 'magmom_oszicar': {'name': 'magmoms.oszicar', 'unit': 'µB'},\n", - " 'magmom_outcar': {'name': 'magmoms.outcar', 'unit': 'µB'},\n", - " 'n-Seebeck': {'name': 'seebeck.n', 'unit': 'µV/K'},\n", - " 'p-Seebeck': {'name': 'seebeck.p', 'unit': 'µV/K'},\n", - " 'epsx': {'name': 'refractive.x', 'unit': ''},\n", - " 'epsy': {'name': 'refractive.y', 'unit': ''},\n", - " 'epsz': {'name': 'refractive.z', 'unit': ''},\n", - " 'max_ir_mode': {'name': 'IR.max', 'unit': 'cm⁻¹'},\n", - " 'min_ir_mode': {'name': 'IR.min', 'unit': 'cm⁻¹'},\n", - " 'ncond': {'name': 'Ncond', 'unit': ''},\n", - " 'nkappa': {'name': 'kappa.n', 'unit': ''},\n", - " 'pkappa': {'name': 'kappa.p', 'unit': ''},\n", - " 'exfoliation_energy': {'name': 'energies.exfoliation', 'unit': 'eV'},\n", - " 'formation_energy_peratom': {'name': 'energies.formation', 'unit': 'eV/atom'},\n", - " 'ehull': {'name': 'energies.hull', 'unit': 'eV'},\n", - " 'optb88vdw_total_energy': {'name': 'energies.OptB88vdW', 'unit': 'eV'}, \n", - " 'max_efg': {'name': 'EFG', 'unit': 'V/m²'},\n", - " 'func': {'name': 'functional', 'unit': None},\n", - " 'kpoint_length_unit': {'name': 'kpoints', 'unit': ''},\n", - " 'typ': {'name': 'type', 'unit': None},\n", - " 'nat': {'name': 'natoms', 'unit': ''}, \n", - " 'search': {'name': 'search', 'unit': None},\n", - " 'maxdiff_bz': {'name': 'maxdiff.bz', 'unit': ''},\n", - " 'maxdiff_mesh': {'name': 'maxdiff.mesh', 'unit': ''},\n", - " 'mepsx': {'name': 'meps.x', 'unit': ''},\n", - " 'mepsy': {'name': 'meps.y', 'unit': ''},\n", - " 'mepsz': {'name': 'meps.z', 'unit': ''},\n", - " 'pcond': {'name': 'pcond', 'unit': ''},\n", - " 'poisson': {'name': 'poisson', 'unit': ''},\n", + " \"jid\": {\"name\": \"jarvis.id\", \"unit\": None},\n", + " \"jid\": {\"name\": \"jarvis.link\", \"unit\": None},\n", + " \"Tc_supercon\": {\"name\": \"Tc\", \"unit\": \"K\"},\n", + " \"avg_elec_mass\": {\"name\": \"mass|avg.elec\", \"unit\": \"mₑ\"},\n", + " \"avg_hole_mass\": {\"name\": \"mass|avg.hole\", \"unit\": \"mₑ\"},\n", + " \"bulk_modulus_kv\": {\"name\": \"moduli.bulk|voigt\", \"unit\": \"GPa\"},\n", + " \"shear_modulus_gv\": {\"name\": \"moduli.shear\", \"unit\": \"GPa\"},\n", + " \"crys\": {\"name\": \"crystal\", \"unit\": None},\n", + " \"density\": {\"name\": \"density\", \"unit\": \"g/cm³\"},\n", + " \"dfpt_piezo_max_dielectric\": {\"name\": \"piezo|max.dielectric.total\", \"unit\": \"C/m²\"},\n", + " \"dfpt_piezo_max_dielectric_electronic\": {\n", + " \"name\": \"piezo|max.dielectric.electronic\",\n", + " \"unit\": \"C/m²\",\n", + " },\n", + " \"dfpt_piezo_max_dielectric_ionic\": {\n", + " \"name\": \"piezo|max.dielectric.ionic\",\n", + " \"unit\": \"C/m²\",\n", + " },\n", + " \"dfpt_piezo_max_dij\": {\"name\": \"piezo|max.dij\", \"unit\": \"C/m²\"},\n", + " \"dfpt_piezo_max_eij\": {\"name\": \"piezo|max.eij\", \"unit\": \"C/m²\"},\n", + " \"dimensionality\": {\"name\": \"dimensionality\", \"unit\": None},\n", + " \"effective_masses_300K.n\": {\"name\": \"mass|eff.n|300K\", \"unit\": \"\"},\n", + " \"effective_masses_300K.p\": {\"name\": \"mass|eff.p|300K\", \"unit\": \"\"},\n", + " \"spg_number\": {\"name\": \"spacegroup.number\", \"unit\": \"\"},\n", + " \"spg_symbol\": {\"name\": \"spacegroup.symbol\", \"unit\": None},\n", + " \"hse_gap\": {\"name\": \"bandgaps.HSE\", \"unit\": \"eV\"},\n", + " \"mbj_bandgap\": {\"name\": \"bandgaps.TBmBJ\", \"unit\": \"eV\"},\n", + " \"optb88vdw_bandgap\": {\"name\": \"bandgaps.OptB88vdW\", \"unit\": \"eV\"},\n", + " \"n-powerfact\": {\"name\": \"powerfactor.n\", \"unit\": \"µW/K²/m²\"},\n", + " \"p-powerfact\": {\"name\": \"powerfactor.p\", \"unit\": \"µW/K²/m²\"},\n", + " \"slme\": {\"name\": \"SLME\", \"unit\": \"%\"},\n", + " \"spillage\": {\"name\": \"spillage\", \"unit\": \"\"},\n", + " \"encut\": {\"name\": \"ENCUT\", \"unit\": \"eV\"},\n", + " \"magmom_oszicar\": {\"name\": \"magmoms.oszicar\", \"unit\": \"µB\"},\n", + " \"magmom_outcar\": {\"name\": \"magmoms.outcar\", \"unit\": \"µB\"},\n", + " \"n-Seebeck\": {\"name\": \"seebeck.n\", \"unit\": \"µV/K\"},\n", + " \"p-Seebeck\": {\"name\": \"seebeck.p\", \"unit\": \"µV/K\"},\n", + " \"epsx\": {\"name\": \"refractive.x\", \"unit\": \"\"},\n", + " \"epsy\": {\"name\": \"refractive.y\", \"unit\": \"\"},\n", + " \"epsz\": {\"name\": \"refractive.z\", \"unit\": \"\"},\n", + " \"max_ir_mode\": {\"name\": \"IR.max\", \"unit\": \"cm⁻¹\"},\n", + " \"min_ir_mode\": {\"name\": \"IR.min\", \"unit\": \"cm⁻¹\"},\n", + " \"ncond\": {\"name\": \"Ncond\", \"unit\": \"\"},\n", + " \"nkappa\": {\"name\": \"kappa.n\", \"unit\": \"\"},\n", + " \"pkappa\": {\"name\": \"kappa.p\", \"unit\": \"\"},\n", + " \"exfoliation_energy\": {\"name\": \"energies.exfoliation\", \"unit\": \"eV\"},\n", + " \"formation_energy_peratom\": {\"name\": \"energies.formation\", \"unit\": \"eV/atom\"},\n", + " \"ehull\": {\"name\": \"energies.hull\", \"unit\": \"eV\"},\n", + " \"optb88vdw_total_energy\": {\"name\": \"energies.OptB88vdW\", \"unit\": \"eV\"},\n", + " \"max_efg\": {\"name\": \"EFG\", \"unit\": \"V/m²\"},\n", + " \"func\": {\"name\": \"functional\", \"unit\": None},\n", + " \"kpoint_length_unit\": {\"name\": \"kpoints\", \"unit\": \"\"},\n", + " \"typ\": {\"name\": \"type\", \"unit\": None},\n", + " \"nat\": {\"name\": \"natoms\", \"unit\": \"\"},\n", + " \"search\": {\"name\": \"search\", \"unit\": None},\n", + " \"maxdiff_bz\": {\"name\": \"maxdiff.bz\", \"unit\": \"\"},\n", + " \"maxdiff_mesh\": {\"name\": \"maxdiff.mesh\", \"unit\": \"\"},\n", + " \"mepsx\": {\"name\": \"meps.x\", \"unit\": \"\"},\n", + " \"mepsy\": {\"name\": \"meps.y\", \"unit\": \"\"},\n", + " \"mepsz\": {\"name\": \"meps.z\", \"unit\": \"\"},\n", + " \"pcond\": {\"name\": \"pcond\", \"unit\": \"\"},\n", + " \"poisson\": {\"name\": \"poisson\", \"unit\": \"\"},\n", "}" ] }, @@ -113,22 +119,22 @@ "outputs": [], "source": [ "contributions = []\n", - "list_keys = ['efg', 'elastic_tensor', 'modes', 'icsd']\n", + "list_keys = [\"efg\", \"elastic_tensor\", \"modes\", \"icsd\"]\n", "identifier_key = \"reference\"\n", "formula_key = \"formula\"\n", "prefixes = (\"mp-\", \"mvc-\")\n", - "jarvis_url = 'https://www.ctcms.nist.gov/~knc6/static/JARVIS-DFT/'\n", + "jarvis_url = \"https://www.ctcms.nist.gov/~knc6/static/JARVIS-DFT/\"\n", "identifiers = set()\n", "\n", "for entry in data:\n", " identifier = entry[identifier_key]\n", " if not entry[identifier_key].startswith(prefixes) or identifier in identifiers:\n", " continue\n", - " \n", + "\n", " identifiers.add(identifier)\n", " contrib = {\"identifier\": identifier, \"formula\": entry[formula_key], \"data\": {}}\n", " attm_data = {}\n", - " \n", + "\n", " for k, v in entry.items():\n", " if not v or v == \"na\" or k == \"xml_data_link\":\n", " continue\n", @@ -154,7 +160,7 @@ " elif k in columns:\n", " name, unit = columns[k][\"name\"], columns[k][\"unit\"]\n", " contrib[\"data\"][name] = f\"{v} {unit}\" if unit else v\n", - " \n", + "\n", " if attm_data:\n", " contrib[\"attachments\"] = [Attachment.from_data(\"lists\", attm_data)]\n", "\n", @@ -178,7 +184,7 @@ " if \"files\" in contrib[\"data\"]:\n", " flat_files = flatten(contrib[\"data\"][\"files\"], reducer=\"dot\")\n", " files_columns.update(flat_files.keys())\n", - " \n", + "\n", "files_columns" ] }, @@ -394,10 +400,12 @@ "source": [ "query = {\"data__energies__hull__value__lte\": 0.05}\n", "count, _ = client.get_totals(query=query)\n", - "print(f\"materials with ehull <= 0.05 eV/atom: {count/ncontribs*100:.1f}%\")\n", + "print(f\"materials with ehull <= 0.05 eV/atom: {count / ncontribs * 100:.1f}%\")\n", "fields = [\"identifier\", \"formula\", \"data.energies.hull.value\"]\n", "sort = \"data.energies.hull.value\"\n", - "contribs = client.query_contributions(query=query, fields=fields, sort=sort, paginate=True)\n", + "contribs = client.query_contributions(\n", + " query=query, fields=fields, sort=sort, paginate=True\n", + ")\n", "pd.json_normalize(contribs[\"data\"])" ] }, @@ -471,13 +479,19 @@ " \"data__spillage__value__gte\": 0.5,\n", " \"data__bandgaps__OptB88vdW__value__gt\": 0.01,\n", " \"data__energies__hull__value__lt\": 0.1,\n", - " \"data__SLME__value__gt\": 5\n", + " \"data__SLME__value__gt\": 5,\n", "}\n", "fields = [\n", - " \"identifier\", \"formula\", \"data.spillage.value\", \"data.bandgaps.OptB88vdW.value\",\n", - " \"data.energies.hull.value\", \"data.SLME.value\",\n", + " \"identifier\",\n", + " \"formula\",\n", + " \"data.spillage.value\",\n", + " \"data.bandgaps.OptB88vdW.value\",\n", + " \"data.energies.hull.value\",\n", + " \"data.SLME.value\",\n", "]\n", - "contribs = client.query_contributions(query=query, fields=fields, sort=sort, paginate=True)\n", + "contribs = client.query_contributions(\n", + " query=query, fields=fields, sort=sort, paginate=True\n", + ")\n", "pd.json_normalize(contribs[\"data\"])" ] }, @@ -637,7 +651,9 @@ "# find all cubic materials\n", "query = {\"data__crystal__exact\": \"cubic\"}\n", "fields = [\"identifier\", \"formula\", \"data.crystal\", \"data.energies.hull.value\"]\n", - "contribs = client.query_contributions(query=query, fields=fields, sort=sort, paginate=True)\n", + "contribs = client.query_contributions(\n", + " query=query, fields=fields, sort=sort, paginate=True\n", + ")\n", "pd.json_normalize(contribs[\"data\"])" ] }, diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/matscholar.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/matscholar.ipynb index 31e5a2c243..d7a25425df 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/matscholar.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/matscholar.ipynb @@ -48,7 +48,7 @@ " \"symmetry.symbol\": None,\n", " \"symmetry.system\": None,\n", " \"symmetry.number\": \"\",\n", - " \"bandgap\": \"eV\"\n", + " \"bandgap\": \"eV\",\n", "}" ] }, @@ -62,24 +62,20 @@ "# generate list of contribution dictionaries\n", "contributions = [\n", " {\n", - " \"identifier\": \"custom_hash\", # or any string to uniquely identify entry/contribution\n", + " \"identifier\": \"custom_hash\", # or any string to uniquely identify entry/contribution\n", " \"formula\": \"Fe3S4\",\n", " \"data\": {\n", - " \"doi\": \"https://doi.org/10.17188/1196965\", # if saved as full URL, a link will be shown in the explorer\n", - " \"symmetry\": {\n", - " \"symbol\": \"Fd3̅m\",\n", - " \"system\": \"cubic\",\n", - " \"number\": 227\n", - " },\n", - " \"bandgap\": \"3.12 eV\"\n", + " \"doi\": \"https://doi.org/10.17188/1196965\", # if saved as full URL, a link will be shown in the explorer\n", + " \"symmetry\": {\"symbol\": \"Fd3̅m\", \"system\": \"cubic\", \"number\": 227},\n", + " \"bandgap\": \"3.12 eV\",\n", " },\n", - "# \"attachments\": [ # create from data, or load gzipped text or images from disk using Path\n", - "# Attachment.from_data(\"other\", {\"hello\": \"world\", \"test\": [1,2,4]})\n", - "# Path(\"2021-02-19_scan_mpids_changed.json.gz\"),\n", - "# Path(\"IMG-20210224-WA0010.jpg\")\n", - "# ],\n", - "# \"structures\": [pymatgen.Structure, ...],\n", - "# \"tables\": [pandas.DataFrame, ...]\n", + " # \"attachments\": [ # create from data, or load gzipped text or images from disk using Path\n", + " # Attachment.from_data(\"other\", {\"hello\": \"world\", \"test\": [1,2,4]})\n", + " # Path(\"2021-02-19_scan_mpids_changed.json.gz\"),\n", + " # Path(\"IMG-20210224-WA0010.jpg\")\n", + " # ],\n", + " # \"structures\": [pymatgen.Structure, ...],\n", + " # \"tables\": [pandas.DataFrame, ...]\n", " },\n", " # ...\n", "]" @@ -111,7 +107,7 @@ "query = {\n", " \"data__bandgap__value__gt\": 3,\n", " \"data__doi__endswith\": \"/1196965\",\n", - " \"data__symmetry__system__exact\": \"cubic\"\n", + " \"data__symmetry__system__exact\": \"cubic\",\n", "}\n", "fields = [\"identifier\", \"formula\", \"data.doi\"]\n", "client.query_contributions(query=query, fields=fields, paginate=True)" diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/melting_points.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/melting_points.ipynb index e3fcc9aadc..95b3ae9d3f 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/melting_points.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/melting_points.ipynb @@ -58,8 +58,12 @@ "metadata": {}, "outputs": [], "source": [ - "indir = \"/Users/patrick/GoogleDriveLBNL/My Drive/MaterialsProject/gitrepos/mpcontribs-data\"\n", - "melting_pts = pd.DataFrame(loadfn(f\"{indir}/melting_points_df_08_08_23.json.gz\")) # Note: temps in Kelvin" + "indir = (\n", + " \"/Users/patrick/GoogleDriveLBNL/My Drive/MaterialsProject/gitrepos/mpcontribs-data\"\n", + ")\n", + "melting_pts = pd.DataFrame(\n", + " loadfn(f\"{indir}/melting_points_df_08_08_23.json.gz\")\n", + ") # Note: temps in Kelvin" ] }, { @@ -104,14 +108,14 @@ "\n", "for d in data:\n", " val, err = d[\"melting_point\"], d[\"melting_point_uncertainty\"]\n", - " contributions.append({\n", - " \"identifier\": d[\"index\"],\n", - " \"formula\": d[\"reduced_formula\"],\n", - " \"data\": {\n", - " \"MeltingPoint\": f\"{val}+/-{err} K\"\n", + " contributions.append(\n", + " {\n", + " \"identifier\": d[\"index\"],\n", + " \"formula\": d[\"reduced_formula\"],\n", + " \"data\": {\"MeltingPoint\": f\"{val}+/-{err} K\"},\n", " }\n", - " })\n", - " \n", + " )\n", + "\n", "contributions[0]" ] }, diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/mg_cathode_screening_2022.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/mg_cathode_screening_2022.ipynb index 77de1868c8..b98cfb008d 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/mg_cathode_screening_2022.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/mg_cathode_screening_2022.ipynb @@ -21,7 +21,9 @@ "metadata": {}, "outputs": [], "source": [ - "client = Client(project=\"mg_cathode_screening_2022\") # provide API key via `apikey` argument" + "client = Client(\n", + " project=\"mg_cathode_screening_2022\"\n", + ") # provide API key via `apikey` argument" ] }, { @@ -50,7 +52,11 @@ "metadata": {}, "outputs": [], "source": [ - "client.update_project(update={\"description\":\"A computational screening approach to identify high-performance multivalent intercalation cathodes among materials that do not contain the working ion of interest has been developed, which greatly expands the search space that can be considered for material discovery (https://doi.org/10.1021/acsami.2c11733). This magnesium intercalation cathode data set of phase stability, energy density, & transport properties has been generated using these methods but applied to a larger set of materials than the original publication. 5,853 empty host materials of the 16,682 materials previously down selected based on their reducible species oxidation state were prioritized for Mg insertions based on excluding candidates which contained an extractable ion (H, Li, Na, K, Rb, Cs, Mg, Ca, Cs, Ag, Cu). Of these 5,863 attempted Mg insertion workflows, 83% resulted in at least one viable Mg site. This ultimately resulted in 4,872 Mg cathodes from which 229 ApproxNEB workflows were attempted. There were 193 unique structure types in these 229 candidates. All ApproxNEB images calculations successfully completed for 97 electrodes. This data set uses the following python objects: pymatgen.apps.battery.insertion_battery.InsertionElectrode and pymatgen.analysis.diffusion.neb.full_path_mapper.MigrationGraph\"})" + "client.update_project(\n", + " update={\n", + " \"description\": \"A computational screening approach to identify high-performance multivalent intercalation cathodes among materials that do not contain the working ion of interest has been developed, which greatly expands the search space that can be considered for material discovery (https://doi.org/10.1021/acsami.2c11733). This magnesium intercalation cathode data set of phase stability, energy density, & transport properties has been generated using these methods but applied to a larger set of materials than the original publication. 5,853 empty host materials of the 16,682 materials previously down selected based on their reducible species oxidation state were prioritized for Mg insertions based on excluding candidates which contained an extractable ion (H, Li, Na, K, Rb, Cs, Mg, Ca, Cs, Ag, Cu). Of these 5,863 attempted Mg insertion workflows, 83% resulted in at least one viable Mg site. This ultimately resulted in 4,872 Mg cathodes from which 229 ApproxNEB workflows were attempted. There were 193 unique structure types in these 229 candidates. All ApproxNEB images calculations successfully completed for 97 electrodes. This data set uses the following python objects: pymatgen.apps.battery.insertion_battery.InsertionElectrode and pymatgen.analysis.diffusion.neb.full_path_mapper.MigrationGraph\"\n", + " }\n", + ")" ] }, { @@ -61,31 +67,31 @@ "outputs": [], "source": [ "# add legend for project in `other`\n", - "client.update_project(update={\"other\": {\"identifier\": \"Material Project ID for empty host material\",\n", - " \"formula\": \"Empty host material chemical formula\",\n", - " \n", - " \"host.formulaAnonymous\": \"Empty host material anonumous chemical formula\",\n", - " \"host.nelements\": \"Number of distinct elements in empty host material\",\n", - " \"host.chemsys\": \"Empty host material chemical system of distinct elements sorted alphabetically and joined by dashes\",\n", - " \n", - " \"ICSD.exp\": \"Whether empty host material is an ICSD experimental structure\",\n", - " \"ICSD.ids\": \"Identifiers for the Inorganic Crystal Structure Database\",\n", - " \n", - " \"battery.id\": \"Unique identifier for electrode where 'js-' distinguishes calculations from the screening development phase\",\n", - " \"battery.formula\": \"Electrode chemical formula including the working ion fraction\",\n", - " \"battery.workingIon\": \"Battery system working ion\",\n", - " \"battery.voltage\": \"Average voltage in Volts across all voltage pairs\",\n", - " \"battery.capacity\": \"Total gravimetric capacity in mAh/g of cathode active material\",\n", - " \"battery.stability|charge\": \"Energy above hull in eV/atom, a metric of the phase stability of the charged (empty) state\",\n", - " \"battery.stability|discharge\": \"Energy above hull in eV/atom, a metric of the phase stability of the discharged (intercalated) state\",\n", - " \"battery.Δvolume\": \"Largest volume change in % across all voltage pairs\",\n", - " \n", - " \"MigrationGraph.found\": \"Whether a migration graph mapping out connections between working ion sites could be successfully generated\",\n", - " \"MigrationGraph.npaths\": \"The number of possible percolating pathways identified from the migration graph\",\n", - " \n", - " \"ApproxNEB.uuid\": \"If available, identifier for ApproxNEB calculations for migration graph pathway energetics\",\n", - " \"ApproxNEB.complete\": \"If ApproxNEB calculations are available, the fraction of calculations that were successfully completed\",\n", - "}})" + "client.update_project(\n", + " update={\n", + " \"other\": {\n", + " \"identifier\": \"Material Project ID for empty host material\",\n", + " \"formula\": \"Empty host material chemical formula\",\n", + " \"host.formulaAnonymous\": \"Empty host material anonumous chemical formula\",\n", + " \"host.nelements\": \"Number of distinct elements in empty host material\",\n", + " \"host.chemsys\": \"Empty host material chemical system of distinct elements sorted alphabetically and joined by dashes\",\n", + " \"ICSD.exp\": \"Whether empty host material is an ICSD experimental structure\",\n", + " \"ICSD.ids\": \"Identifiers for the Inorganic Crystal Structure Database\",\n", + " \"battery.id\": \"Unique identifier for electrode where 'js-' distinguishes calculations from the screening development phase\",\n", + " \"battery.formula\": \"Electrode chemical formula including the working ion fraction\",\n", + " \"battery.workingIon\": \"Battery system working ion\",\n", + " \"battery.voltage\": \"Average voltage in Volts across all voltage pairs\",\n", + " \"battery.capacity\": \"Total gravimetric capacity in mAh/g of cathode active material\",\n", + " \"battery.stability|charge\": \"Energy above hull in eV/atom, a metric of the phase stability of the charged (empty) state\",\n", + " \"battery.stability|discharge\": \"Energy above hull in eV/atom, a metric of the phase stability of the discharged (intercalated) state\",\n", + " \"battery.Δvolume\": \"Largest volume change in % across all voltage pairs\",\n", + " \"MigrationGraph.found\": \"Whether a migration graph mapping out connections between working ion sites could be successfully generated\",\n", + " \"MigrationGraph.npaths\": \"The number of possible percolating pathways identified from the migration graph\",\n", + " \"ApproxNEB.uuid\": \"If available, identifier for ApproxNEB calculations for migration graph pathway energetics\",\n", + " \"ApproxNEB.complete\": \"If ApproxNEB calculations are available, the fraction of calculations that were successfully completed\",\n", + " }\n", + " }\n", + ")" ] }, { @@ -113,7 +119,7 @@ "metadata": {}, "outputs": [], "source": [ - "#client.delete_contributions()" + "# client.delete_contributions()" ] }, { @@ -135,22 +141,24 @@ " \"formula_anonymous\": {\"name\": \"host.formulaAnonymous\", \"unit\": None},\n", " \"nelements\": {\"name\": \"host.nelements\", \"unit\": \"\"},\n", " \"chemsys\": {\"name\": \"host.chemsys\", \"unit\": None},\n", - " \n", - " \"icsd_experimental\": {\"name\": \"ICSD.exp\", \"unit\": None}, # convert bool to Yes/No string\n", + " \"icsd_experimental\": {\n", + " \"name\": \"ICSD.exp\",\n", + " \"unit\": None,\n", + " }, # convert bool to Yes/No string\n", " \"icsd_ids\": {\"name\": \"ICSD.ids\", \"unit\": None},\n", - " \n", " \"battery_id\": {\"name\": \"battery.id\", \"unit\": None},\n", " \"battery_formula\": {\"name\": \"battery.formula\", \"unit\": None},\n", " \"working_ion\": {\"name\": \"battery.workingIon\", \"unit\": None},\n", " \"average_voltage\": {\"name\": \"battery.voltage\", \"unit\": \"V\"},\n", - " \"capacity_grav\": {\"name\": \"battery.capacity\", \"unit\": \"mAh/g\"}, \n", + " \"capacity_grav\": {\"name\": \"battery.capacity\", \"unit\": \"mAh/g\"},\n", " \"stability_charge\": {\"name\": \"battery.stability|charge\", \"unit\": \"eV/atom\"},\n", " \"stability_discharge\": {\"name\": \"battery.stability|discharged\", \"unit\": \"eV/atom\"},\n", " \"max_delta_volume\": {\"name\": \"battery.Δvolume\", \"unit\": \"%\"},\n", - " \n", " \"migration_graph_found\": {\"name\": \"MigrationGraph.found\", \"unit\": None},\n", - " \"num_paths_found\": {\"name\": \"MigrationGraph.npaths\", \"unit\": \"\"},# emptry string indicates dimensionless number\n", - " \n", + " \"num_paths_found\": {\n", + " \"name\": \"MigrationGraph.npaths\",\n", + " \"unit\": \"\",\n", + " }, # emptry string indicates dimensionless number\n", " \"aneb_wf_uuid\": {\"name\": \"ApproxNEB.uuid\", \"unit\": None},\n", " \"aneb_wf_complete\": {\"name\": \"ApproxNEB.complete\", \"unit\": \"\"},\n", "}" @@ -196,17 +204,19 @@ "# Applies cost function based on voltage and stability (specific to Mg) for prioritizing electrodes\n", "# Created by custom MapBuilder: https://github.com/materialsproject/emmet/commit/692bdf5eff67fe1b0f48e1a13cee999af9136aae\n", "rank_store = MongograntStore(\n", - " \"ro:mongodb07-ext.nersc.gov/fw_acr_mv\",\"rank_electrodes_2022\",key=\"battery_id\"\n", + " \"ro:mongodb07-ext.nersc.gov/fw_acr_mv\", \"rank_electrodes_2022\", key=\"battery_id\"\n", ")\n", "rank_store.connect()\n", "print(rank_store.count())\n", "\n", "# Raw ApproxNEB workflow data (note 2 of the 229 ApproxNEB workflows had unsuccessful host calculations)\n", "aneb_store = MongograntStore(\n", - " \"ro:mongodb07-ext.nersc.gov/fw_acr_mv\",\"approx_neb\",key=\"wf_uuid\"\n", + " \"ro:mongodb07-ext.nersc.gov/fw_acr_mv\", \"approx_neb\", key=\"wf_uuid\"\n", ")\n", "aneb_store.connect()\n", - "print(aneb_store.count(),aneb_store.count({\"tags\":{\"$all\":[\"migration_graph_2022\"]}}))" + "print(\n", + " aneb_store.count(), aneb_store.count({\"tags\": {\"$all\": [\"migration_graph_2022\"]}})\n", + ")" ] }, { @@ -229,90 +239,94 @@ "source": [ "contrib_docs = []\n", "for bid in bids:\n", - " rank_doc = rank_store.query_one({\"battery_id\":bid})\n", - " aneb_doc = aneb_store.query_one({\"battery_id\":bid})\n", + " rank_doc = rank_store.query_one({\"battery_id\": bid})\n", + " aneb_doc = aneb_store.query_one({\"battery_id\": bid})\n", "\n", " contrib_doc = {\n", - " \"battery_id\":bid,\n", + " \"battery_id\": bid,\n", " # host structure properties\n", - " \"host_mp_ids\":rank_doc[\"host_mp_ids\"],\n", - " \"icsd_experimental\":rank_doc[\"icsd_experimental\"],\n", - " \"icsd_ids\":rank_doc[\"host_icsd_ids\"],\n", - " \"formula\":rank_doc[\"framework_formula\"],\n", - " \"formula_anonymous\":rank_doc[\"formula_anonymous\"],\n", - " \"nelements\":rank_doc[\"nelements\"],\n", - " \"chemsys\":rank_doc[\"chemsys\"],\n", - " \"composition\":rank_doc[\"framework\"],\n", - " \"structure\":rank_doc[\"host_structure\"],\n", + " \"host_mp_ids\": rank_doc[\"host_mp_ids\"],\n", + " \"icsd_experimental\": rank_doc[\"icsd_experimental\"],\n", + " \"icsd_ids\": rank_doc[\"host_icsd_ids\"],\n", + " \"formula\": rank_doc[\"framework_formula\"],\n", + " \"formula_anonymous\": rank_doc[\"formula_anonymous\"],\n", + " \"nelements\": rank_doc[\"nelements\"],\n", + " \"chemsys\": rank_doc[\"chemsys\"],\n", + " \"composition\": rank_doc[\"framework\"],\n", + " \"structure\": rank_doc[\"host_structure\"],\n", " # electrode properties\n", - " \"working_ion\":rank_doc[\"working_ion\"],\n", - " \"electrode_object\":rank_doc[\"electrode_object\"],\n", - " \"battery_formula\":rank_doc[\"battery_formula\"],\n", - " \"average_voltage\":rank_doc[\"average_voltage\"],\n", - " \"capacity_grav\":rank_doc[\"capacity_grav\"],\n", - " \"stability_charge\":rank_doc[\"stability_charge\"],\n", - " \"stability_discharge\":rank_doc[\"stability_discharge\"],\n", - " \"max_delta_volume\":100*rank_doc[\"max_delta_volume\"], #convert to percentage\n", + " \"working_ion\": rank_doc[\"working_ion\"],\n", + " \"electrode_object\": rank_doc[\"electrode_object\"],\n", + " \"battery_formula\": rank_doc[\"battery_formula\"],\n", + " \"average_voltage\": rank_doc[\"average_voltage\"],\n", + " \"capacity_grav\": rank_doc[\"capacity_grav\"],\n", + " \"stability_charge\": rank_doc[\"stability_charge\"],\n", + " \"stability_discharge\": rank_doc[\"stability_discharge\"],\n", + " \"max_delta_volume\": 100 * rank_doc[\"max_delta_volume\"], # convert to percentage\n", " # migration graph properties\n", - " \"migration_graph_found\":True if rank_doc[\"migration_graph\"] else False,\n", - " \"migration_graph\":{\"battery_id\":bid,\n", - " \"migration_graph\":rank_doc[\"migration_graph\"],\n", - " \"hop_cutoff\":rank_doc[\"hop_cutoff\"],\n", - " \"entries_for_generation\":rank_doc[\"entries_for_generation\"],\n", - " \"working_ion_entry\":rank_doc[\"working_ion_entry\"],\n", - " },\n", - " \"num_paths_found\":rank_doc[\"num_paths_found\"],\n", + " \"migration_graph_found\": True if rank_doc[\"migration_graph\"] else False,\n", + " \"migration_graph\": {\n", + " \"battery_id\": bid,\n", + " \"migration_graph\": rank_doc[\"migration_graph\"],\n", + " \"hop_cutoff\": rank_doc[\"hop_cutoff\"],\n", + " \"entries_for_generation\": rank_doc[\"entries_for_generation\"],\n", + " \"working_ion_entry\": rank_doc[\"working_ion_entry\"],\n", + " },\n", + " \"num_paths_found\": rank_doc[\"num_paths_found\"],\n", " }\n", - " \n", + "\n", " if aneb_doc is not None:\n", " # get aneb data for each hop\n", " aneb_wf_uuid = aneb_doc[\"wf_uuid\"]\n", " aneb_wf_data = {}\n", - " for aneb_hop_key,hop_key in aneb_doc[\"hop_combo_mapping\"].items():\n", + " for aneb_hop_key, hop_key in aneb_doc[\"hop_combo_mapping\"].items():\n", " combo = aneb_hop_key.split(\"+\")\n", " if len(combo) == 2:\n", " c = [int(combo[0]), int(combo[1])]\n", " data = [aneb_doc[\"end_points\"][c[0]]]\n", " if \"images\" not in aneb_doc.keys():\n", - " data.extend([{\"index\":i} for i in range(5)])\n", + " data.extend([{\"index\": i} for i in range(5)])\n", " else:\n", " if aneb_hop_key in aneb_doc[\"images\"]:\n", " data.extend(aneb_doc[\"images\"][aneb_hop_key])\n", " else:\n", - " data.extend([{\"index\":i} for i in range(5)])\n", + " data.extend([{\"index\": i} for i in range(5)])\n", " data.append(aneb_doc[\"end_points\"][c[1]])\n", - " aneb_wf_data.update({hop_key:data})\n", + " aneb_wf_data.update({hop_key: data})\n", " aneb_host = aneb_doc[\"host\"]\n", - " \n", + "\n", " # determine fraction of aneb data available\n", " total = 0\n", " complete = 0\n", - " for k,v in aneb_wf_data.items():\n", + " for k, v in aneb_wf_data.items():\n", " total += len(v)\n", " complete += len([i for i in v if \"output\" in i.keys()])\n", " aneb_wf_complete = complete / total\n", - " \n", + "\n", " else:\n", " aneb_wf_uuid = None\n", " aneb_host = None\n", " aneb_wf_data = None\n", " aneb_wf_complete = None\n", - " \n", + "\n", " # add aneb wf properties and data\n", - " contrib_doc.update({\n", - " \"aneb_wf_uuid\":aneb_wf_uuid,\n", - " \"aneb_wf_data\":{\"conversion_matrix\":rank_doc[\"conversion_matrix\"],\n", - " \"matrix_supercell_structure\":rank_doc[\"matrix_supercell_structure\"],\n", - " \"inserted_ion_coords\":rank_doc[\"inserted_ion_coords\"],\n", - " \"insert_coords_combo\":rank_doc[\"insert_coords_combo\"],\n", - " \"host_data\":aneb_host,\n", - " \"hop_data\":aneb_wf_data,\n", - " },\n", - " \"aneb_wf_complete\":aneb_wf_complete\n", - " })\n", - " \n", + " contrib_doc.update(\n", + " {\n", + " \"aneb_wf_uuid\": aneb_wf_uuid,\n", + " \"aneb_wf_data\": {\n", + " \"conversion_matrix\": rank_doc[\"conversion_matrix\"],\n", + " \"matrix_supercell_structure\": rank_doc[\"matrix_supercell_structure\"],\n", + " \"inserted_ion_coords\": rank_doc[\"inserted_ion_coords\"],\n", + " \"insert_coords_combo\": rank_doc[\"insert_coords_combo\"],\n", + " \"host_data\": aneb_host,\n", + " \"hop_data\": aneb_wf_data,\n", + " },\n", + " \"aneb_wf_complete\": aneb_wf_complete,\n", + " }\n", + " )\n", + "\n", " # clean-up formatting for MP Contribs\n", - " for k,v in contrib_doc.items():\n", + " for k, v in contrib_doc.items():\n", " if type(v) is bool:\n", " if v is True:\n", " contrib_doc[k] = \"yes\"\n", @@ -326,9 +340,9 @@ " contrib_doc[k] = str(v[0])\n", " elif len(v) > 1:\n", " contrib_doc[k] = \",\".join(str(i) for i in v)\n", - " \n", + "\n", " contrib_docs.append(contrib_doc)\n", - "print(len(contrib_docs),\"original\")" + "print(len(contrib_docs), \"original\")" ] }, { @@ -359,7 +373,7 @@ " else:\n", " docs.append(d)\n", "contrib_docs = docs\n", - "print(len(contrib_docs),\"split\")" + "print(len(contrib_docs), \"split\")" ] }, { @@ -384,15 +398,21 @@ "for doc in contrib_docs:\n", " identifier = doc[\"host_mp_ids\"][0] if doc[\"host_mp_ids\"] else doc[\"battery_id\"]\n", " formula = doc[\"formula\"]\n", - " contrib = {\"identifier\": identifier, \"formula\": formula, \"data\": {}, \"structures\": [], \"attachments\": []}\n", - " \n", + " contrib = {\n", + " \"identifier\": identifier,\n", + " \"formula\": formula,\n", + " \"data\": {},\n", + " \"structures\": [],\n", + " \"attachments\": [],\n", + " }\n", + "\n", " for k in structure_keys:\n", " sdct = doc.pop(k, None)\n", " if sdct:\n", " structure = Structure.from_dict(sdct)\n", " structure.name = k\n", " contrib[\"structures\"].append(structure)\n", - " \n", + "\n", " for k in attachment_keys:\n", " # skip attachments if not available\n", " if k == \"migration_graph\" and doc[\"migration_graph_found\"] == \"no\":\n", @@ -404,18 +424,20 @@ " if attm_dct:\n", " attm = Attachment.from_data(k, attm_dct)\n", " contrib[\"attachments\"].append(attm)\n", - " \n", - " clean = {k: v for k, v in doc.items() if k[0] != \"_\" and not isinstance(v, datetime)}\n", + "\n", + " clean = {\n", + " k: v for k, v in doc.items() if k[0] != \"_\" and not isinstance(v, datetime)\n", + " }\n", " raw = Attachment.from_data(\"raw\", clean)\n", " contrib[\"attachments\"].append(raw)\n", - " \n", + "\n", " flat_doc = flatten(clean, max_flatten_depth=2, reducer=\"dot\")\n", " for col, config in columns.items():\n", " value = flat_doc.get(col)\n", " if value:\n", " name, unit = config[\"name\"], config[\"unit\"]\n", " contrib[\"data\"][name] = f\"{value:.3g} {unit}\" if unit else value\n", - " \n", + "\n", " contrib[\"data\"] = unflatten(contrib[\"data\"], splitter=\"dot\")\n", " contributions.append({k: v for k, v in contrib.items() if v})\n", "\n", @@ -488,11 +510,11 @@ "metadata": {}, "outputs": [], "source": [ - "query = {\n", - " \"identifier\": \"mp-10093\"\n", - "}\n", - "fields = [\"identifier\",\"ICSD.ids\",\"attachments\"]\n", - "contribs = client.query_contributions(query=query, fields=fields, sort=\"identifier\", paginate=True)\n", + "query = {\"identifier\": \"mp-10093\"}\n", + "fields = [\"identifier\", \"ICSD.ids\", \"attachments\"]\n", + "contribs = client.query_contributions(\n", + " query=query, fields=fields, sort=\"identifier\", paginate=True\n", + ")\n", "pd.json_normalize(contribs[\"data\"])" ] }, @@ -541,10 +563,10 @@ "source": [ "# use migration graph to identify possible pathways\n", "mg.assign_cost_to_graph()\n", - "for n,path in mg.get_path():\n", - " print(\"path\",n)\n", + "for n, path in mg.get_path():\n", + " print(\"path\", n)\n", " for hop in path:\n", - " print(hop[\"ipos\"],hop[\"epos\"],hop[\"to_jimage\"])\n", + " print(hop[\"ipos\"], hop[\"epos\"], hop[\"to_jimage\"])\n", " print()" ] }, @@ -556,14 +578,18 @@ "outputs": [], "source": [ "# map ApproxNEB data onto migration graph\n", - "for k,v in aneb_data[\"hop_data\"].items():\n", + "for k, v in aneb_data[\"hop_data\"].items():\n", " sc_structs = [Structure.from_dict(i[\"input_structure\"]) for i in v]\n", " energies = [get(i, \"output.energy\") for i in v]\n", " add_edge_data_from_sc(\n", - " mg,i_sc=sc_structs[0],e_sc=sc_structs[-1],data_array=sc_structs,key=\"sc_structs\"\n", + " mg,\n", + " i_sc=sc_structs[0],\n", + " e_sc=sc_structs[-1],\n", + " data_array=sc_structs,\n", + " key=\"sc_structs\",\n", " )\n", " add_edge_data_from_sc(\n", - " mg,i_sc=sc_structs[0],e_sc=sc_structs[-1],data_array=energies,key=\"energies\"\n", + " mg, i_sc=sc_structs[0], e_sc=sc_structs[-1], data_array=energies, key=\"energies\"\n", " )" ] }, @@ -575,10 +601,10 @@ "outputs": [], "source": [ "# evaluate pathway energetics using ApproxNEB data\n", - "for n,path in mg.get_path():\n", - " #for hop in path:\n", - " #print(hop[\"ipos\"],hop[\"epos\"],hop[\"to_jimage\"])\n", - " energies = np.array([hop[\"energies\"] for hop in path],dtype=float)\n", + "for n, path in mg.get_path():\n", + " # for hop in path:\n", + " # print(hop[\"ipos\"],hop[\"epos\"],hop[\"to_jimage\"])\n", + " energies = np.array([hop[\"energies\"] for hop in path], dtype=float)\n", " path_barrier = 1000 * (energies.max() - energies.min())\n", " print(\"path\", n, \"ApproxNEB barrier\", round(path_barrier), \"meV\")" ] diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/mofexplorer.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/mofexplorer.ipynb index a9dc872a85..08413c8f15 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/mofexplorer.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/mofexplorer.ipynb @@ -87,7 +87,7 @@ "\n", " if value is None:\n", " raise ValueError(f\"failed parsing {v}\")\n", - " \n", + "\n", " return value, unit" ] }, @@ -108,7 +108,7 @@ "metadata": {}, "outputs": [], "source": [ - "client.init_columns({}) # force reset columns\n", + "client.init_columns({}) # force reset columns\n", "client.init_columns(columns)" ] }, @@ -130,14 +130,12 @@ "contributions = []\n", "\n", "for d in data:\n", - " contrib = {\n", - " \"identifier\": d[\"identifier\"], \"formula\": d[\"formula\"], \"data\": {}\n", - " }\n", - " \n", + " contrib = {\"identifier\": d[\"identifier\"], \"formula\": d[\"formula\"], \"data\": {}}\n", + "\n", " for k, v in flatten(d[\"data\"], reducer=\"dot\").items():\n", " value, unit = get_value_unit(v)\n", " contrib[f\"data.{k}\"] = f\"{value} {unit}\" if unit else value\n", - " \n", + "\n", " contributions.append(unflatten(contrib, splitter=\"dot\"))" ] }, diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ocp/ocp-update.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ocp/ocp-update.ipynb index a7bc713994..866af3cc99 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ocp/ocp-update.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ocp/ocp-update.ipynb @@ -28,7 +28,9 @@ "metadata": {}, "outputs": [], "source": [ - "df = read_pickle(\"/Users/patrick/GoogleDriveLBNL/MaterialsProject/gitrepos/mpcontribs-data/Actual_adsorption_Es.pkl\")" + "df = read_pickle(\n", + " \"/Users/patrick/GoogleDriveLBNL/MaterialsProject/gitrepos/mpcontribs-data/Actual_adsorption_Es.pkl\"\n", + ")" ] }, { @@ -73,7 +75,7 @@ "results = client.query_contributions(\n", " query=query,\n", " fields=[\"id\", \"identifier\", \"data.adsorptionEnergy.display\"],\n", - " paginate=True\n", + " paginate=True,\n", ")\n", "# TODO 3rd and 4th round of requests takes 30 min (totals & actual query)" ] @@ -98,7 +100,10 @@ "contributions = []\n", "\n", "for d in results[\"data\"]:\n", - " contrib = {\"id\": d[\"id\"], \"data.systemEnergy\": d[\"data\"][\"adsorptionEnergy\"][\"display\"]}\n", + " contrib = {\n", + " \"id\": d[\"id\"],\n", + " \"data.systemEnergy\": d[\"data\"][\"adsorptionEnergy\"][\"display\"],\n", + " }\n", " contrib[\"data.adsorptionEnergy\"] = adsorption[d[\"identifier\"]]\n", " contributions.append(contrib)" ] @@ -139,7 +144,7 @@ "\n", "# if path == \"adsorptionEnergy\":\n", "# new_columns[\"systemEnergy\"] = unit\n", - " \n", + "\n", "# new_columns" ] }, diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ocp/ocp-upload.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ocp/ocp-upload.ipynb index 7f82031902..c72041478e 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ocp/ocp-upload.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ocp/ocp-upload.ipynb @@ -48,24 +48,27 @@ "source": [ "decoder = MontyDecoder()\n", "\n", + "\n", "def get_contribution(path):\n", - " \n", + "\n", " if path.stat().st_size / 1024 / 1024 > 15:\n", " return None\n", - " \n", + "\n", " with gzip.open(path) as f:\n", " data = decoder.process_decoded(load(f))\n", - " \n", - " struct = data['trajectory'][-1]\n", - " struct.add_site_property('tags', [int(t) for t in data['tags']])\n", "\n", - " mol = Molecule.from_sites([site for site in struct if site.properties['tags'] == 2])\n", + " struct = data[\"trajectory\"][-1]\n", + " struct.add_site_property(\"tags\", [int(t) for t in data[\"tags\"]])\n", + "\n", + " mol = Molecule.from_sites([site for site in struct if site.properties[\"tags\"] == 2])\n", " iupac_formula = mol.composition.iupac_formula\n", - " bulk_struct = Structure.from_sites([site for site in struct if site.properties['tags'] != 2])\n", + " bulk_struct = Structure.from_sites(\n", + " [site for site in struct if site.properties[\"tags\"] != 2]\n", + " )\n", " bulk_formula = bulk_struct.composition.reduced_formula\n", "\n", " search_data = {\n", - " \"mpid\": data['bulk_id'],\n", + " \"mpid\": data[\"bulk_id\"],\n", " \"adsorptionEnergy\": data[\"adsorption_energy\"],\n", " # TODO systemEnergy?\n", " \"adsorbateSmiles\": data[\"adsorbate_smiles\"],\n", @@ -75,7 +78,7 @@ " \"k\": data[\"surface_miller_indices\"][1],\n", " \"l\": data[\"surface_miller_indices\"][2],\n", " \"surfaceTop\": data[\"surface_top\"],\n", - " \"surfaceShift\": data[\"surface_shift\"]\n", + " \"surfaceShift\": data[\"surface_shift\"],\n", " }\n", "\n", " return {\n", @@ -83,7 +86,7 @@ " \"identifier\": data[\"id\"],\n", " \"data\": search_data,\n", " \"structures\": [struct],\n", - " \"attachments\": [path]\n", + " \"attachments\": [path],\n", " }" ] }, @@ -140,14 +143,14 @@ " contrib = get_contribution(path)\n", " if not contrib:\n", " continue\n", - " \n", + "\n", " contributions.append(contrib)\n", " cnt += 1\n", - " \n", + "\n", " if not cnt % 2000:\n", " client.submit_contributions(contributions, **kwargs)\n", " contributions.clear()\n", - " \n", + "\n", "if contributions:\n", " client.submit_contributions(contributions, **kwargs)\n", "\n", diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/open_catalyst_project.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/open_catalyst_project.ipynb index 25f34580fc..8eb3de6f2c 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/open_catalyst_project.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/open_catalyst_project.ipynb @@ -56,17 +56,20 @@ "metadata": {}, "outputs": [], "source": [ - "client.init_columns(name, {\n", - " \"id\": None, # id\n", - " \"energy\": \"meV\", # adsorption_energy\n", - " \"smiles\": None, # adsorbate_smiles\n", - " \"formulas.IUPAC\": None,\n", - " \"formulas.bulk\": None,\n", - " \"formulas.trajectory\": None,\n", - " \"surface.miller\": None,\n", - " \"surface.top\": None,\n", - " \"surface.shift\": \"\"\n", - "})" + "client.init_columns(\n", + " name,\n", + " {\n", + " \"id\": None, # id\n", + " \"energy\": \"meV\", # adsorption_energy\n", + " \"smiles\": None, # adsorbate_smiles\n", + " \"formulas.IUPAC\": None,\n", + " \"formulas.bulk\": None,\n", + " \"formulas.trajectory\": None,\n", + " \"surface.miller\": None,\n", + " \"surface.top\": None,\n", + " \"surface.shift\": \"\",\n", + " },\n", + ")" ] }, { @@ -76,7 +79,9 @@ "metadata": {}, "outputs": [], "source": [ - "p = Path(\"/Users/patrick/GoogleDriveLBNL/MaterialsProject/gitrepos/mpcontribs-data/ocp-sample\")\n", + "p = Path(\n", + " \"/Users/patrick/GoogleDriveLBNL/MaterialsProject/gitrepos/mpcontribs-data/ocp-sample\"\n", + ")\n", "jsons = list(p.glob(\"*.json.gz\"))" ] }, @@ -90,29 +95,33 @@ "def get_miller(indices):\n", " return f\"[{indices[0]}{indices[1]}{indices[2]}]\"\n", "\n", + "\n", "def get_contribution(path):\n", - " \n", + "\n", " if path.stat().st_size / 1024 < 150:\n", - " \n", " data = loadfn(path)\n", - " struct = data['trajectory'][-1]\n", - " struct.add_site_property('tags', [int(t) for t in data['tags']])\n", + " struct = data[\"trajectory\"][-1]\n", + " struct.add_site_property(\"tags\", [int(t) for t in data[\"tags\"]])\n", "\n", - " mol = Molecule.from_sites([site for site in struct if site.properties['tags'] == 2])\n", + " mol = Molecule.from_sites(\n", + " [site for site in struct if site.properties[\"tags\"] == 2]\n", + " )\n", " iupac_formula = mol.composition.iupac_formula\n", - " bulk_struct = Structure.from_sites([site for site in struct if site.properties['tags'] != 2])\n", + " bulk_struct = Structure.from_sites(\n", + " [site for site in struct if site.properties[\"tags\"] != 2]\n", + " )\n", " bulk_formula = bulk_struct.composition.reduced_formula\n", "\n", " search_data = {\n", - " \"id\": data['id'],\n", - " \"energy\": f'{data[\"adsorption_energy\"]} meV',\n", + " \"id\": data[\"id\"],\n", + " \"energy\": f\"{data['adsorption_energy']} meV\",\n", " \"smiles\": data[\"adsorbate_smiles\"],\n", " \"formulas.IUPAC\": iupac_formula,\n", " \"formulas.bulk\": bulk_formula,\n", " \"formulas.trajectory\": struct.composition.reduced_formula,\n", " \"surface.miller\": get_miller(data[\"surface_miller_indices\"]),\n", " \"surface.top\": str(data[\"surface_top\"]),\n", - " \"surface.shift\": data[\"surface_shift\"]\n", + " \"surface.shift\": data[\"surface_shift\"],\n", " }\n", "\n", " contribution = {\n", @@ -120,7 +129,7 @@ " \"identifier\": data[\"bulk_id\"],\n", " \"data\": search_data,\n", " \"structures\": [struct],\n", - " \"attachments\": [path]\n", + " \"attachments\": [path],\n", " }\n", "\n", " return contribution" @@ -157,7 +166,7 @@ "all_ids = client.get_all_ids(\n", " {\"project\": name},\n", " include=[\"structures\", \"attachments\"],\n", - " data_id_fields={name: \"id\"}\n", + " data_id_fields={name: \"id\"},\n", ").get(name)" ] }, diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/perovskites_diffusion.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/perovskites_diffusion.ipynb index 026d09bec2..95d05e6214 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/perovskites_diffusion.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/perovskites_diffusion.ipynb @@ -110,7 +110,7 @@ " contcar_path = \"bulk_CONTCARs/{}_CONTCAR\".format(\n", " data[\"directory\"].replace(\"/\", \"_\")\n", " )\n", - " contcar = contcars.extractfile(contcar_path).read().decode(\"utf8\") \n", + " contcar = contcars.extractfile(contcar_path).read().decode(\"utf8\")\n", " structure = Structure.from_str(contcar, \"poscar\", sort=True)\n", "\n", " if identifier is None:\n", @@ -129,11 +129,16 @@ " data[key] = val\n", "\n", " if identifier:\n", - " contributions.append({\n", - " \"project\": name, \"identifier\": identifier, \"is_public\": True,\n", - " \"data\": data, \"structures\": [structure]\n", - " })\n", - " \n", + " contributions.append(\n", + " {\n", + " \"project\": name,\n", + " \"identifier\": identifier,\n", + " \"is_public\": True,\n", + " \"data\": data,\n", + " \"structures\": [structure],\n", + " }\n", + " )\n", + "\n", "len(contributions)" ] }, diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/pycroscopy.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/pycroscopy.ipynb index 99f10a538d..5e42a07812 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/pycroscopy.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/pycroscopy.ipynb @@ -13,6 +13,7 @@ "import matplotlib.pyplot as plt\n", "import torch\n", "from atomai.utils import graphx\n", + "\n", "%matplotlib inline" ] }, @@ -29,7 +30,7 @@ "model_path = f\"{data_dir}/G_MD.tar\"\n", "model = aoi.load_model(model_path)\n", "# model as dict\n", - "device = 'cuda' if torch.cuda.is_available() else 'cpu'\n", + "device = \"cuda\" if torch.cuda.is_available() else \"cpu\"\n", "model_dict = torch.load(model_path, map_location=device)" ] }, @@ -59,20 +60,22 @@ "# model.predict(imgdata, resize=(new_height, new_width))\n", "\n", "map_dict = {0: \"C\", 1: \"Si\"} # classes to chemical elements\n", - "px2ang = 0.104 # pixel-to-angstrom conversion\n", - "coord = coords[0] # take the first (and the only one) frame\n", - "clusters = graphx.find_cycle_clusters(coord, cycles=[5,7], map_dict=map_dict, px2ang=px2ang)\n", + "px2ang = 0.104 # pixel-to-angstrom conversion\n", + "coord = coords[0] # take the first (and the only one) frame\n", + "clusters = graphx.find_cycle_clusters(\n", + " coord, cycles=[5, 7], map_dict=map_dict, px2ang=px2ang\n", + ")\n", "fig, ax = plt.subplots(1, 1, figsize=figsize)\n", - "ax.imshow(imgdata, cmap='gray', origin='lower')\n", + "ax.imshow(imgdata, cmap=\"gray\", origin=\"lower\")\n", "\n", "for i, cl in enumerate(clusters):\n", - " ax.scatter(cl[:, 1], cl[:, 0], s=2, color='red')\n", + " ax.scatter(cl[:, 1], cl[:, 0], s=2, color=\"red\")\n", " xt = int(np.mean(cl[:, 1]))\n", " yt = int(np.mean(cl[:, 0]))\n", - " ax.annotate(str(i+1), (xt, yt), size=10, color='white')\n", - " \n", + " ax.annotate(str(i + 1), (xt, yt), size=10, color=\"white\")\n", + "\n", "img_path_clusters = imgdata_path.replace(\".npy\", \"_clusters.png\")\n", - "plt.savefig(img_path_clusters, bbox_inches='tight')" + "plt.savefig(img_path_clusters, bbox_inches=\"tight\")" ] }, { @@ -83,20 +86,20 @@ "outputs": [], "source": [ "clusters_mod = []\n", - "#adding a column for C atom as class 0\n", + "# adding a column for C atom as class 0\n", "pad_ = 1\n", "for i in range(len(clusters)):\n", - " clusters[i] = np.pad(clusters[i], (0, pad_), 'constant')\n", + " clusters[i] = np.pad(clusters[i], (0, pad_), \"constant\")\n", " clusters[i] = clusters[i][:-1]\n", " clusters_mod.append(clusters[i])\n", - " \n", - "#we can also save all the defects per image frame\n", + "\n", + "# we can also save all the defects per image frame\n", "defect_num = 15\n", "coords_def_15 = {0: clusters_mod[defect_num]}\n", - "plt.scatter(coords_def_15[0][:,1], coords_def_15[0][:,0])\n", + "plt.scatter(coords_def_15[0][:, 1], coords_def_15[0][:, 0])\n", "\n", "img_path_defects = imgdata_path.replace(\".npy\", \"_defects.png\")\n", - "plt.savefig(img_path_defects, bbox_inches='tight')" + "plt.savefig(img_path_defects, bbox_inches=\"tight\")" ] }, { @@ -134,10 +137,7 @@ "outputs": [], "source": [ "imgdata_list = list(imgdata.tolist())\n", - "model_dict[\"weights\"] = {\n", - " k: v.tolist()\n", - " for k, v in model_dict[\"weights\"].items()\n", - "}" + "model_dict[\"weights\"] = {k: v.tolist() for k, v in model_dict[\"weights\"].items()}" ] }, { @@ -147,13 +147,18 @@ "metadata": {}, "outputs": [], "source": [ - "contributions = [{\n", - " \"identifier\": \"mp-7576\", # CrSi on MP\n", - " \"data\": {\"clusters\": len(clusters)},\n", - " \"attachments\": Attachments.from_list([\n", - " img_path_clusters, img_path_defects, #imgdata_list, model_dict,\n", - " ])\n", - "}]" + "contributions = [\n", + " {\n", + " \"identifier\": \"mp-7576\", # CrSi on MP\n", + " \"data\": {\"clusters\": len(clusters)},\n", + " \"attachments\": Attachments.from_list(\n", + " [\n", + " img_path_clusters,\n", + " img_path_defects, # imgdata_list, model_dict,\n", + " ]\n", + " ),\n", + " }\n", + "]" ] }, { diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/pydatarecognition.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/pydatarecognition.ipynb index 4f1d69e8b4..22b459f9bb 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/pydatarecognition.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/pydatarecognition.ipynb @@ -65,23 +65,42 @@ "source": [ "# calculated cifs (NOTE make sure to gzip all CIFs)\n", "contributions = []\n", - "columns = {\"type\": None, \"date\": None, \"wavelength\": \"Å\"} # sets fields and their units\n", + "columns = {\"type\": None, \"date\": None, \"wavelength\": \"Å\"} # sets fields and their units\n", "\n", "for path in (cifs / \"calculated\").iterdir():\n", " for identifier, v in CifParser(path).as_dict().items():\n", " typ, date = v[\"_publcif_pd_cifplot\"].strip().split()\n", - " wavelength = f'{v[\"_diffrn_radiation_wavelength\"]} Å'\n", + " wavelength = f\"{v['_diffrn_radiation_wavelength']} Å\"\n", " intensities = v[\"_pd_calc_intensity_total\"]\n", " prefix, nbins = \"_pd_proc_2theta_range\", len(intensities)\n", - " inc, start, end = float(v[f\"{prefix}_inc\"]), float(v[f\"{prefix}_min\"]), float(v[f\"{prefix}_max\"])\n", - " two_theta = np.arange(0, end, inc) # BUG? getting 1999 bins for start=0.02 (converted to Q)\n", - " spectrum = DataFrame({\"2θ\": two_theta, \"intensity\": intensities}).set_index(\"2θ\")\n", - " spectrum.attrs = {\"name\": \"powder diffraction\", \"title\": \"Powder Diffraction Pattern\"}\n", - " contributions.append({\n", - " \"identifier\": identifier, \"formula\": v[\"_chemical_formula\"],\n", - " \"data\": {\"type\": typ, \"date\": date, \"wavelength\": wavelength, \"proc\": d[\"proc\"]},\n", - " #\"tables\": [spectrum], \"attachments\": [path]\n", - " })\n", + " inc, start, end = (\n", + " float(v[f\"{prefix}_inc\"]),\n", + " float(v[f\"{prefix}_min\"]),\n", + " float(v[f\"{prefix}_max\"]),\n", + " )\n", + " two_theta = np.arange(\n", + " 0, end, inc\n", + " ) # BUG? getting 1999 bins for start=0.02 (converted to Q)\n", + " spectrum = DataFrame({\"2θ\": two_theta, \"intensity\": intensities}).set_index(\n", + " \"2θ\"\n", + " )\n", + " spectrum.attrs = {\n", + " \"name\": \"powder diffraction\",\n", + " \"title\": \"Powder Diffraction Pattern\",\n", + " }\n", + " contributions.append(\n", + " {\n", + " \"identifier\": identifier,\n", + " \"formula\": v[\"_chemical_formula\"],\n", + " \"data\": {\n", + " \"type\": typ,\n", + " \"date\": date,\n", + " \"wavelength\": wavelength,\n", + " \"proc\": d[\"proc\"],\n", + " },\n", + " # \"tables\": [spectrum], \"attachments\": [path]\n", + " }\n", + " )\n", "\n", "len(contributions)" ] @@ -105,7 +124,7 @@ "client.init_columns(columns)\n", "client.submit_contributions(contributions, ignore_dupes=True, per_request=6)\n", "# this shouldn't be necessary but need to re-init columns likely due to bug in API server\n", - "client.init_columns(columns) \n", + "client.init_columns(columns)\n", "\n", "# NOTE submit_contributions can also be used to submit partial updates (can provide example in the future)" ] @@ -149,7 +168,9 @@ "metadata": {}, "outputs": [], "source": [ - "attm = client.get_attachment(result[\"data\"][0][\"attachments\"][0][\"id\"]) # use attm.unpack() to get file contents" + "attm = client.get_attachment(\n", + " result[\"data\"][0][\"attachments\"][0][\"id\"]\n", + ") # use attm.unpack() to get file contents" ] }, { @@ -159,7 +180,7 @@ "metadata": {}, "outputs": [], "source": [ - "table = client.get_table(result[\"data\"][0][\"tables\"][0][\"id\"]) # pandas Dataframe" + "table = client.get_table(result[\"data\"][0][\"tables\"][0][\"id\"]) # pandas Dataframe" ] }, { diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/qsgw_band_structures.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/qsgw_band_structures.ipynb index 33623c3aa5..d52783dd71 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/qsgw_band_structures.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/qsgw_band_structures.ipynb @@ -11,6 +11,7 @@ "# - set environment variable MPCONTRIBS_API_KEY to API key\n", "# - more info about client functions in according docstrings\n", "from mpcontribs.client import Client\n", + "\n", "name = \"qsgw_band_structures\"\n", "client = Client(project=name)" ] @@ -39,87 +40,68 @@ "source": [ "contributions = [\n", " {\n", - " 'identifier': 'mp-1020712', # ZnSiN2\n", - " 'data': {\n", - " 'reference': 'https://doi.org/10.1103/PhysRevB.84.165204',\n", - " 'Γ': {\n", - " 'ΔE': {\n", - " 'indirect': '5.70 eV',\n", - " 'direct': '5.92 eV'\n", - " },\n", - " 'VBM': {\n", - " 'b₁': '0',\n", - " 'a₂': '-20 meV',\n", - " 'b₂': '-40 meV',\n", - " 'a₁': '-180 meV'\n", - " }\n", - " }\n", - " }\n", - " }, {\n", - " 'identifier': 'mp-2979', # ZnGeN2\n", - " 'data': {\n", - " 'reference': 'https://doi.org/10.1103/PhysRevB.84.165204',\n", - " 'Γ': {\n", - " 'ΔE': {'direct': '3.60 eV'},\n", - " 'VBM': {\n", - " 'b₁': '0',\n", - " 'b₂': '-28 meV',\n", - " 'a₁': '-129 meV'\n", - " }\n", - " }\n", - " }\n", - " }, {\n", - " 'identifier': 'mp-1029469', # ZnSnN2\n", - " 'data': {\n", - " 'reference': 'https://doi.org/10.1103/PhysRevB.91.205207',\n", - " 'Γ': {\n", - " 'ΔE': {'direct': '1.82 eV'},\n", - " 'VBM': {\n", - " 'b₁': '0',\n", - " 'b₂': '-188 meV',\n", - " 'a₁': '-176 meV'\n", - " }\n", - " }\n", - " }\n", - " }, {\n", - " 'identifier': 'mp-3677', # MgSiN2\n", - " 'data': {\n", - " 'reference': 'https://doi.org/10.1103/PhysRevB.94.125201',\n", - " 'Γ': {\n", - " 'ΔE': {\n", - " 'indirect': '6.08 eV',\n", - " 'direct': '6.53 eV',\n", - " 'direct3x4x4': '6.30 eV'\n", - " }\n", - " }\n", - " }\n", - " }, {\n", - " 'identifier': 'mp-7798', # MgGeN2\n", - " 'data': {\n", - " 'reference': 'https://doi.org/10.1016/j.ssc.2019.113664',\n", - " 'Γ' : {\n", - " 'ΔE': {'direct': '4.11 eV'},\n", - " 'VBM': {\n", - " 'b₁': '0',\n", - " 'b₂': '-82 meV',\n", - " 'a₁': '-238 meV'\n", - " }\n", - " }\n", - " }\n", - " }, {\n", - " 'identifier': 'mp-1029791', # MgSnN2\n", - " 'data': {\n", - " 'reference': 'https://doi.org/10.1016/j.ssc.2019.113664',\n", - " 'Γ' : {\n", - " 'ΔE': {'direct': '2.28 eV'},\n", - " 'VBM': {\n", - " 'b₁': '0',\n", - " 'b₂': '-116 meV',\n", - " 'a₁': '-144 meV'\n", + " \"identifier\": \"mp-1020712\", # ZnSiN2\n", + " \"data\": {\n", + " \"reference\": \"https://doi.org/10.1103/PhysRevB.84.165204\",\n", + " \"Γ\": {\n", + " \"ΔE\": {\"indirect\": \"5.70 eV\", \"direct\": \"5.92 eV\"},\n", + " \"VBM\": {\"b₁\": \"0\", \"a₂\": \"-20 meV\", \"b₂\": \"-40 meV\", \"a₁\": \"-180 meV\"},\n", + " },\n", + " },\n", + " },\n", + " {\n", + " \"identifier\": \"mp-2979\", # ZnGeN2\n", + " \"data\": {\n", + " \"reference\": \"https://doi.org/10.1103/PhysRevB.84.165204\",\n", + " \"Γ\": {\n", + " \"ΔE\": {\"direct\": \"3.60 eV\"},\n", + " \"VBM\": {\"b₁\": \"0\", \"b₂\": \"-28 meV\", \"a₁\": \"-129 meV\"},\n", + " },\n", + " },\n", + " },\n", + " {\n", + " \"identifier\": \"mp-1029469\", # ZnSnN2\n", + " \"data\": {\n", + " \"reference\": \"https://doi.org/10.1103/PhysRevB.91.205207\",\n", + " \"Γ\": {\n", + " \"ΔE\": {\"direct\": \"1.82 eV\"},\n", + " \"VBM\": {\"b₁\": \"0\", \"b₂\": \"-188 meV\", \"a₁\": \"-176 meV\"},\n", + " },\n", + " },\n", + " },\n", + " {\n", + " \"identifier\": \"mp-3677\", # MgSiN2\n", + " \"data\": {\n", + " \"reference\": \"https://doi.org/10.1103/PhysRevB.94.125201\",\n", + " \"Γ\": {\n", + " \"ΔE\": {\n", + " \"indirect\": \"6.08 eV\",\n", + " \"direct\": \"6.53 eV\",\n", + " \"direct3x4x4\": \"6.30 eV\",\n", " }\n", - " }\n", - " }\n", - " }\n", + " },\n", + " },\n", + " },\n", + " {\n", + " \"identifier\": \"mp-7798\", # MgGeN2\n", + " \"data\": {\n", + " \"reference\": \"https://doi.org/10.1016/j.ssc.2019.113664\",\n", + " \"Γ\": {\n", + " \"ΔE\": {\"direct\": \"4.11 eV\"},\n", + " \"VBM\": {\"b₁\": \"0\", \"b₂\": \"-82 meV\", \"a₁\": \"-238 meV\"},\n", + " },\n", + " },\n", + " },\n", + " {\n", + " \"identifier\": \"mp-1029791\", # MgSnN2\n", + " \"data\": {\n", + " \"reference\": \"https://doi.org/10.1016/j.ssc.2019.113664\",\n", + " \"Γ\": {\n", + " \"ΔE\": {\"direct\": \"2.28 eV\"},\n", + " \"VBM\": {\"b₁\": \"0\", \"b₂\": \"-116 meV\", \"a₁\": \"-144 meV\"},\n", + " },\n", + " },\n", + " },\n", "]" ] }, @@ -147,16 +129,18 @@ "outputs": [], "source": [ "# [optional] initialize columns to explicitly set order, visibility and units\n", - "client.init_columns(columns={\n", - " \"reference\": None,\n", - " \"Γ.ΔE.direct\": \"eV\",\n", - " \"Γ.ΔE.direct3x4x4\": \"eV\",\n", - " \"Γ.ΔE.indirect\": \"eV\",\n", - " \"Γ.VBM.a₁\": \"meV\",\n", - " \"Γ.VBM.a₂\": \"meV\",\n", - " \"Γ.VBM.b₁\": \"\",\n", - " \"Γ.VBM.b₂\": \"meV\",\n", - "})" + "client.init_columns(\n", + " columns={\n", + " \"reference\": None,\n", + " \"Γ.ΔE.direct\": \"eV\",\n", + " \"Γ.ΔE.direct3x4x4\": \"eV\",\n", + " \"Γ.ΔE.indirect\": \"eV\",\n", + " \"Γ.VBM.a₁\": \"meV\",\n", + " \"Γ.VBM.a₂\": \"meV\",\n", + " \"Γ.VBM.b₁\": \"\",\n", + " \"Γ.VBM.b₂\": \"meV\",\n", + " }\n", + ")" ] } ], diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/screening_inorganic_pv.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/screening_inorganic_pv.ipynb index cb9e56014f..b41e2dc9ed 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/screening_inorganic_pv.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/screening_inorganic_pv.ipynb @@ -41,7 +41,7 @@ " \"summary\": \"SUMMARY.json\",\n", " \"absorption\": \"ABSORPTION-CLIPPED.json\",\n", " \"dos\": \"DOS.json\",\n", - " \"formulae\": \"FORMATTED-FORMULAE.json\"\n", + " \"formulae\": \"FORMATTED-FORMULAE.json\",\n", "}\n", "data = {}\n", "\n", @@ -49,7 +49,7 @@ " path = indir / v\n", " with path.open(mode=\"r\") as f:\n", " data[k] = json.load(f)\n", - " \n", + "\n", "for k, v in data.items():\n", " print(k, len(v))" ] @@ -74,7 +74,7 @@ " \"E_g_d\": {\"path\": \"ΔE.direct\", \"unit\": \"eV\"},\n", " \"E_g_da\": {\"path\": \"ΔE.dipole\", \"unit\": \"eV\"},\n", " \"m_e\": {\"path\": \"mᵉ\", \"unit\": \"mₑ\"},\n", - " \"m_h\": {\"path\": \"mʰ\", \"unit\": \"mₑ\"}\n", + " \"m_h\": {\"path\": \"mʰ\", \"unit\": \"mₑ\"},\n", "}\n", "columns = {c[\"path\"]: c[\"unit\"] for c in config.values()}\n", "contributions = []\n", @@ -82,28 +82,28 @@ "for mp_id, d in data[\"summary\"].items():\n", " formula = data[\"formulae\"][mp_id].replace(\"\", \"\").replace(\"\", \"\")\n", " contrib = {\"project\": name, \"identifier\": mp_id, \"data\": {\"formula\": formula}}\n", - " cdata = {v[\"path\"]: f'{d[k]} {v[\"unit\"]}' for k, v in config.items()}\n", + " cdata = {v[\"path\"]: f\"{d[k]} {v['unit']}\" for k, v in config.items()}\n", " contrib[\"data\"] = unflatten(cdata)\n", - " \n", + "\n", " df_abs = DataFrame(data=data[\"absorption\"][mp_id])\n", " df_abs.columns = [\"hν [eV]\", \"α [cm⁻¹]\"]\n", " df_abs.set_index(\"hν [eV]\", inplace=True)\n", - " df_abs.columns.name = \"\" # legend name\n", + " df_abs.columns.name = \"\" # legend name\n", " df_abs.attrs[\"name\"] = \"absorption\"\n", " df_abs.attrs[\"title\"] = \"optical absorption spectrum\"\n", " df_abs.attrs[\"labels\"] = {\"variable\": \"\", \"value\": \"α [cm⁻¹]\"}\n", "\n", " df_dos = DataFrame(data=data[\"dos\"][mp_id])\n", - " df_dos.columns = ['E [eV]', 'DOS [eV⁻¹]']\n", + " df_dos.columns = [\"E [eV]\", \"DOS [eV⁻¹]\"]\n", " df_dos.set_index(\"E [eV]\", inplace=True)\n", - " df_dos.columns.name = \"\" # legend name\n", + " df_dos.columns.name = \"\" # legend name\n", " df_dos.attrs[\"name\"] = \"DOS\"\n", " df_dos.attrs[\"title\"] = \"electronic density of states\"\n", " df_dos.attrs[\"labels\"] = {\"variable\": \"\", \"value\": \"DOS [eV⁻¹]\"}\n", "\n", " contrib[\"tables\"] = [df_abs, df_dos]\n", " contributions.append(contrib)\n", - " \n", + "\n", "len(contributions)" ] }, diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/silicon_defects.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/silicon_defects.ipynb index b03018e553..159beb7221 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/silicon_defects.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/silicon_defects.ipynb @@ -57,13 +57,13 @@ " \"mu\": {\"field\": \"mu\", \"unit\": \"\"},\n", " \"spin\": {\"field\": \"spin\", \"unit\": \"\"},\n", " \"ks_diff\": {\"field\": \"ks|diff\", \"unit\": \"\"},\n", - " \"hse0_ks_diff\": {\"field\": \"ks|diff\", \"unit\": \"\"}, # can map to same subkey\n", + " \"hse0_ks_diff\": {\"field\": \"ks|diff\", \"unit\": \"\"}, # can map to same subkey\n", " \"shuffle\": {\"field\": \"shuffle\", \"unit\": None},\n", " \"in_band_transition\": {\"field\": \"transition\", \"unit\": None},\n", " \"missing_vbm\": {\"field\": \"VBM|missing\", \"unit\": None},\n", " \"initial_band\": {\"field\": \"band.initial\", \"unit\": \"\"},\n", " \"final_band\": {\"field\": \"band.final\", \"unit\": \"\"},\n", - " \"inital_band_e\": {\"field\": \"band|e.initial\", \"unit\": \"\"}, # typo in data!\n", + " \"inital_band_e\": {\"field\": \"band|e.initial\", \"unit\": \"\"}, # typo in data!\n", " \"final_band_e\": {\"field\": \"band|e.final\", \"unit\": \"\"},\n", " \"initial_ipr\": {\"field\": \"ipr.initial\", \"unit\": \"\"},\n", " \"final_ipr\": {\"field\": \"ipr.final\", \"unit\": \"\"},\n", @@ -71,9 +71,9 @@ "}\n", "\n", "reorg = {\n", - " \"is_complex\": {\"field\": \"complex\", \"unit\": None}, # str\n", + " \"is_complex\": {\"field\": \"complex\", \"unit\": None}, # str\n", " \"dopant\": {\"field\": \"dopant\", \"unit\": None},\n", - " \"charge\": {\"field\": \"charge\", \"unit\": \"\"}, # dimensionless\n", + " \"charge\": {\"field\": \"charge\", \"unit\": \"\"}, # dimensionless\n", " \"uncorrected_energy\": {\"field\": \"energy|uncorrected\", \"unit\": \"eV\"},\n", " \"chemsys\": {\"field\": \"chemsys\", \"unit\": None},\n", " \"space_group\": {\"field\": \"spacegroup\", \"unit\": None},\n", @@ -97,12 +97,12 @@ "for k, v in list(reorg.items()):\n", " if not \"unit\" in v:\n", " root_field = reorg.pop(k).get(\"field\")\n", - " \n", + "\n", " for kk, vv in excitation_reorg.items():\n", " new_key = f\"{k}.{kk}\"\n", " new_field = f\"{root_field}.{vv['field']}\"\n", " reorg[new_key] = {\"field\": new_field, \"unit\": vv[\"unit\"]}\n", - " \n", + "\n", "columns = {v[\"field\"]: v[\"unit\"] for k, v in reorg.items()}\n", "client.init_columns(columns)" ] @@ -117,7 +117,7 @@ "def convert(x, unit=None):\n", " if isinstance(x, bool):\n", " return \"Yes\" if x else \"No\"\n", - " \n", + "\n", " return x if not unit else f\"{x} {unit}\"" ] }, @@ -131,8 +131,13 @@ "contributions = []\n", "structure_keys = [\"initial_defect_structure\", \"final_defect_structure\"]\n", "attm_keys = [\n", - " 'int_eigenvalues', 'raw_eigenvalues', 'ipr', 'defect_ipr', 'raw_tdm_entry',\n", - " 'hse0_raw_eigenvalues', 'hse0_int_eigenvalues'\n", + " \"int_eigenvalues\",\n", + " \"raw_eigenvalues\",\n", + " \"ipr\",\n", + " \"defect_ipr\",\n", + " \"raw_tdm_entry\",\n", + " \"hse0_raw_eigenvalues\",\n", + " \"hse0_int_eigenvalues\",\n", "]\n", "remove_keys = [\"_id\", \"defect_dir\"]\n", "id_key = \"entry_id\"\n", @@ -142,23 +147,26 @@ "\n", "for r in raw:\n", " contrib = {\n", - " \"identifier\": f\"entry-{r[id_key]}\", \"formula\": r[formula_key],\n", - " \"data\": {}, \"structures\": [], \"attachments\": []\n", + " \"identifier\": f\"entry-{r[id_key]}\",\n", + " \"formula\": r[formula_key],\n", + " \"data\": {},\n", + " \"structures\": [],\n", + " \"attachments\": [],\n", " }\n", - " \n", + "\n", " for k, v in flatten(r, reducer=\"dot\").items():\n", " if k.split(\".\", 1)[0] not in skip_keys:\n", " contrib[\"data\"][reorg[k][\"field\"]] = convert(v, unit=reorg[k][\"unit\"])\n", - " \n", + "\n", " for k in structure_keys:\n", " s = Structure.from_dict(r[k])\n", " s.name = k\n", " contrib[\"structures\"].append(s)\n", - " \n", + "\n", " for k in attm_keys:\n", " a = Attachment.from_data(k, json.loads(r[k]))\n", - " contrib[\"attachments\"].append(a) \n", - " \n", + " contrib[\"attachments\"].append(a)\n", + "\n", " contributions.append(contrib)\n", "\n", "len(contributions)" diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/simple_test.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/simple_test.ipynb index 08070737a4..d8e5f2db93 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/simple_test.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/simple_test.ipynb @@ -12,7 +12,7 @@ "\n", "client = Client(\n", " host=\"localhost.workshop-contribs-api.materialsproject.org\",\n", - " apikey=\"uZ0vulA09IBtqcGk9U5OYRNt6elCzETM\"\n", + " apikey=\"uZ0vulA09IBtqcGk9U5OYRNt6elCzETM\",\n", ")" ] }, @@ -28,13 +28,16 @@ " \"formula__contains\": \"Au\",\n", " \"data__PF__p__value__lt\": 10,\n", " \"data__PF__n__value__gt\": 1,\n", - "\n", - " \"_sort\": \"-data.S.n.value\", # descending order\n", - " \"_limit\": 170, # up to maximum 500 per request\n", + " \"_sort\": \"-data.S.n.value\", # descending order\n", + " \"_limit\": 170, # up to maximum 500 per request\n", " \"_fields\": [\n", - " \"identifier\", \"formula\", \"data.metal\",\n", - " \"data.S.n.value\", \"data.S.p.value\",\n", - " \"data.PF.n.value\", \"data.PF.p.value\"\n", + " \"identifier\",\n", + " \"formula\",\n", + " \"data.metal\",\n", + " \"data.S.n.value\",\n", + " \"data.S.p.value\",\n", + " \"data.PF.n.value\",\n", + " \"data.PF.p.value\",\n", " ],\n", "}" ] @@ -51,13 +54,11 @@ "\n", "while has_more:\n", " print(\"page\", page)\n", - " resp = client.contributions.get_entries(\n", - " page=page, **query\n", - " ).result()\n", + " resp = client.contributions.get_entries(page=page, **query).result()\n", " contributions += resp[\"data\"]\n", " has_more = resp[\"has_more\"]\n", " page += 1\n", - " \n", + "\n", "len(contributions)" ] }, @@ -79,15 +80,17 @@ "outputs": [], "source": [ "name = \"ws_phuck\"\n", - "client.projects.create_entry(project={\n", - " \"name\": name,\n", - " \"title\": \"Workshop Test\",\n", - " \"long_title\": \"Long Workshop Test Title\",\n", - " \"authors\": \"P. Huck, J. Huck\",\n", - " \"description\": \"This is temp. Can be removed anytime\",\n", - " \"references\": [{\"label\": \"google\", \"url\": \"https://google.com\"}],\n", - " \"owner\": \"google:phuck@lbl.gov\"\n", - "}).result()" + "client.projects.create_entry(\n", + " project={\n", + " \"name\": name,\n", + " \"title\": \"Workshop Test\",\n", + " \"long_title\": \"Long Workshop Test Title\",\n", + " \"authors\": \"P. Huck, J. Huck\",\n", + " \"description\": \"This is temp. Can be removed anytime\",\n", + " \"references\": [{\"label\": \"google\", \"url\": \"https://google.com\"}],\n", + " \"owner\": \"google:phuck@lbl.gov\",\n", + " }\n", + ").result()" ] }, { @@ -117,9 +120,10 @@ "metadata": {}, "outputs": [], "source": [ - "client.init_columns(name, {\n", - " \"a\": \"eV\", \"b.c\": None, \"b.d\": None, \"d.e.f\": None, \"x\": None, \"tables\": None\n", - "})" + "client.init_columns(\n", + " name,\n", + " {\"a\": \"eV\", \"b.c\": None, \"b.d\": None, \"d.e.f\": None, \"x\": None, \"tables\": None},\n", + ")" ] }, { @@ -129,8 +133,8 @@ "metadata": {}, "outputs": [], "source": [ - "data = [['tom', 10], ['nick', 15], ['juli', 14]]\n", - "df = DataFrame(data, columns=['Name', 'Age'])\n", + "data = [[\"tom\", 10], [\"nick\", 15], [\"juli\", 14]]\n", + "df = DataFrame(data, columns=[\"Name\", \"Age\"])\n", "df.set_index(\"Name\", inplace=True)\n", "df" ] @@ -142,26 +146,25 @@ "metadata": {}, "outputs": [], "source": [ - "contributions = [{\n", - " \"project\": name,\n", - " \"identifier\": \"mp-4\",\n", - " \"data\": {\n", - " \"a\": \"3 eV\",\n", - " \"b\": {\"c\": \"hello\", \"d\": 5},\n", - " \"d.e.f\": \"nest via dot-notation\",\n", - " \"x\": \"(101)\"\n", + "contributions = [\n", + " {\n", + " \"project\": name,\n", + " \"identifier\": \"mp-4\",\n", + " \"data\": {\n", + " \"a\": \"3 eV\",\n", + " \"b\": {\"c\": \"hello\", \"d\": 5},\n", + " \"d.e.f\": \"nest via dot-notation\",\n", + " \"x\": \"(101)\",\n", + " },\n", + " \"tables\": [df],\n", " },\n", - " \"tables\": [df]\n", - "}, {\n", - " \"project\": name,\n", - " \"identifier\": \"mp-6\",\n", - " \"data\": {\n", - " \"a\": \"4 eV\",\n", - " \"b\": {\"c\": \"what\", \"d\": 6},\n", - " \"d.e.f\": \"duh\"\n", + " {\n", + " \"project\": name,\n", + " \"identifier\": \"mp-6\",\n", + " \"data\": {\"a\": \"4 eV\", \"b\": {\"c\": \"what\", \"d\": 6}, \"d.e.f\": \"duh\"},\n", + " \"tables\": [df],\n", " },\n", - " \"tables\": [df]\n", - "}]\n", + "]\n", "client.submit_contributions(contributions, ignore_dupes=True)" ] }, @@ -192,7 +195,9 @@ "metadata": {}, "outputs": [], "source": [ - "client.contributions.get_entries(project=name, _fields=[\"identifier\", \"is_public\"]).result()" + "client.contributions.get_entries(\n", + " project=name, _fields=[\"identifier\", \"is_public\"]\n", + ").result()" ] }, { @@ -219,13 +224,14 @@ "\n", "query = {\n", " \"project\": \"carrier_transport\",\n", - " #\"id__not__in\": [\"5f8a3d9183a19cc44d02243e\", \"5f8a3d9283a19cc44d022447\"],\n", - " #\"data__functional__endswith\": \"+U\",\n", - " #\"data__mₑᶜ__p__ε₁__value__gte\": 0,\n", + " # \"id__not__in\": [\"5f8a3d9183a19cc44d02243e\", \"5f8a3d9283a19cc44d022447\"],\n", + " # \"data__functional__endswith\": \"+U\",\n", + " # \"data__mₑᶜ__p__ε₁__value__gte\": 0,\n", " \"last_modified__after\": after,\n", " \"last_modified__before\": before,\n", " \"_fields\": [\"id\", \"last_modified\"],\n", - " \"_limit\": 10, \"_sort\": \"last_modified\"\n", + " \"_limit\": 10,\n", + " \"_sort\": \"last_modified\",\n", "}\n", "client.contributions.get_entries(**query).result()" ] @@ -258,10 +264,10 @@ "outputs": [], "source": [ "client.tables.get_entries(\n", - " #attrs__title__icontains=\"xas\",\n", - " #attrs__labels__index__startswith=\"T\",\n", + " # attrs__title__icontains=\"xas\",\n", + " # attrs__labels__index__startswith=\"T\",\n", " attrs__labels__value__startswith=\"PF\",\n", - " _fields=[\"name\", \"attrs\", \"columns\", \"total_data_rows\"]\n", + " _fields=[\"name\", \"attrs\", \"columns\", \"total_data_rows\"],\n", ").result()" ] }, diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/springer_materials.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/springer_materials.ipynb index ce4e3b1dfd..88483a98ea 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/springer_materials.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/springer_materials.ipynb @@ -103,7 +103,7 @@ " # \"Status_of_Phase_Diagram\": {\"name\": \"phasediagram.status\"}\n", "}\n", "\n", - "keys - set(columns_map.keys()) # just making sure I didn't miss a key" + "keys - set(columns_map.keys()) # just making sure I didn't miss a key" ] }, { @@ -116,16 +116,19 @@ "# prep contributions\n", "contributions = []\n", "prop_set = set()\n", - "special_char_map = {ord('ä'): 'ae', ord('ü'): 'ue', ord('ö'): 'oe', ord('ß'): 'ss'}\n", - "CLEANR = re.compile('<.*?>') \n", + "special_char_map = {ord(\"ä\"): \"ae\", ord(\"ü\"): \"ue\", ord(\"ö\"): \"oe\", ord(\"ß\"): \"ss\"}\n", + "CLEANR = re.compile(\"<.*?>\")\n", + "\n", "\n", "def convert_prop(s):\n", " cleaned = \"\".join([c if c.isalnum() else \" \" for c in s])\n", " capitalized = \"\".join([w.capitalize() for w in cleaned.split()])\n", " return capitalized.translate(special_char_map)\n", "\n", + "\n", "def cleanhtml(raw_html):\n", - " return re.sub(CLEANR, '', raw_html)\n", + " return re.sub(CLEANR, \"\", raw_html)\n", + "\n", "\n", "for fn, docs in data.items():\n", " print(fn)\n", @@ -138,10 +141,11 @@ " # for prop in sorted(doc[\"List_of_Physical_Properties\"])\n", " # ] if category == \"physical-properties\" else []\n", " contrib = {\n", - " \"identifier\": identifier, \"formula\": formula,\n", + " \"identifier\": identifier,\n", + " \"formula\": formula,\n", " \"data\": {\"springer.category\": category},\n", " }\n", - " \n", + "\n", " # if properties:\n", " # prop_set |= set(properties)\n", " # for prop in properties:\n", @@ -158,11 +162,11 @@ " if unit is None and \"<\" in val:\n", " val = cleanhtml(val)\n", "\n", - " contrib[\"data\"][name] = f\"{val} {unit}\" if unit else val \n", - " \n", + " contrib[\"data\"][name] = f\"{val} {unit}\" if unit else val\n", + "\n", " contrib[\"data\"] = unflatten(contrib[\"data\"], splitter=\"dot\")\n", " contributions.append(contrib)\n", - " \n", + "\n", "len(contributions)" ] }, @@ -180,7 +184,7 @@ "# for prop in sorted(prop_set):\n", "# columns[f\"properties.available.{prop}\"] = None\n", "\n", - "#client.init_columns(columns)" + "# client.init_columns(columns)" ] }, { @@ -194,7 +198,9 @@ "client.delete_contributions() # need to delete first due to `unique_identifiers=False`\n", "client.init_columns(columns) # good practice :)\n", "client.submit_contributions(contributions)\n", - "client.init_columns(columns) # just to make sure that all columns show up in the intended order" + "client.init_columns(\n", + " columns\n", + ") # just to make sure that all columns show up in the intended order" ] }, { @@ -223,7 +229,7 @@ "query = {\n", " \"data__springer__category__exact\": \"physical-properties\",\n", " \"data__properties__main__exact\": \"elasticity\",\n", - " \"data__properties__stats__samples__value__gt\": 5\n", + " \"data__properties__stats__samples__value__gt\": 5,\n", "}\n", "client.count(query=query)" ] @@ -251,7 +257,7 @@ "springer_id = \"ppp_350781a8aa14dc0b19c6c879daff3be2\"\n", "client.query_contributions(\n", " query={\"data__springer__id__exact\": springer_id},\n", - " fields=[\"id\", \"identifier\", \"data.springer.id\", \"data.properties.pearson\"]\n", + " fields=[\"id\", \"identifier\", \"data.springer.id\", \"data.properties.pearson\"],\n", ")" ] }, @@ -263,9 +269,12 @@ "outputs": [], "source": [ "# count all entries for a list of formulas released before 2023\n", - "client.count(query={\n", - " \"formula__in\": [\"Fe2O3\", \"GaAS\"], \"data__springer__released__value__lt\": 2023\n", - "})" + "client.count(\n", + " query={\n", + " \"formula__in\": [\"Fe2O3\", \"GaAS\"],\n", + " \"data__springer__released__value__lt\": 2023,\n", + " }\n", + ")" ] }, { diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/swf.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/swf.ipynb index a9741147a6..03011858f9 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/swf.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/swf.ipynb @@ -40,7 +40,9 @@ "metadata": {}, "outputs": [], "source": [ - "datadir = Path(\"/Users/patrick/GoogleDriveLBNL/MaterialsProject/gitrepos/mpcontribs-data/swf\")\n", + "datadir = Path(\n", + " \"/Users/patrick/GoogleDriveLBNL/MaterialsProject/gitrepos/mpcontribs-data/swf\"\n", + ")\n", "identifier = \"mp-1216347\"" ] }, @@ -58,7 +60,7 @@ "kondorsky.attrs = {\n", " \"title\": \"Angular Dependence of Switching Field\",\n", " \"labels\": {\"value\": \"Switching Field [T]\"},\n", - " \"log_y\": True # TODO check if goes through\n", + " \"log_y\": True, # TODO check if goes through\n", "}\n", "kondorsky.plot(**kondorsky.attrs)" ] @@ -77,7 +79,7 @@ "ip.attrs = {\n", " \"title\": \"IP Energy Product\",\n", " \"labels\": {\"value\": \"Composition [at%]\"},\n", - " \"kind\": \"scatter\" # TODO check if goes through\n", + " \"kind\": \"scatter\", # TODO check if goes through\n", "}\n", "ip.plot(**ip.attrs)" ] @@ -101,7 +103,7 @@ "source": [ "# set table names\n", "kondorsky.attrs[\"name\"] = \"Kondorsky\"\n", - "#ip.attrs[\"name\"] = \"IP Energy Product\"" + "# ip.attrs[\"name\"] = \"IP Energy Product\"" ] }, { @@ -113,11 +115,15 @@ }, "outputs": [], "source": [ - "contributions = [{\n", - " \"project\": name, \"identifier\": identifier, \"is_public\": True,\n", - " \"data\": {\"kondorsky\": {\"Fe\": \"42.1707 %\", \"Co\": \"8.034 %\", \"V\": \"49.7953 %\"}},\n", - " \"tables\": [kondorsky, ip]#, moke, vsm, total˜]\n", - "}]\n", + "contributions = [\n", + " {\n", + " \"project\": name,\n", + " \"identifier\": identifier,\n", + " \"is_public\": True,\n", + " \"data\": {\"kondorsky\": {\"Fe\": \"42.1707 %\", \"Co\": \"8.034 %\", \"V\": \"49.7953 %\"}},\n", + " \"tables\": [kondorsky, ip], # , moke, vsm, total˜]\n", + " }\n", + "]\n", "len(contributions)" ] }, diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/transparent_conductors.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/transparent_conductors.ipynb index bc8a8feef7..2fc544b746 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/transparent_conductors.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/transparent_conductors.ipynb @@ -62,7 +62,7 @@ " for row in df.to_dict(orient=\"records\"):\n", " identifier = None\n", " data = {\"doping\": doping}\n", - " \n", + "\n", " for keys, value in row.items():\n", " key = \".\".join(\n", " [\n", @@ -71,10 +71,10 @@ " if not k.startswith(\"Unnamed:\")\n", " ]\n", " )\n", - " \n", + "\n", " if key.endswith(\"experimental doping type\"):\n", " key = key.replace(\"Transport.\", \"\")\n", - " \n", + "\n", " key_split = key.split(\".\")\n", " if len(key_split) > 2:\n", " key = \".\".join(key_split[1:])\n", @@ -100,7 +100,9 @@ " if key.endswith(\")\"):\n", " key, unit = key.rsplit(\" (\", 1)\n", " unit = unit[:-1].replace(\"^-3\", \"⁻³\").replace(\"^20\", \"²⁰\")\n", - " unit = unit.replace(\"V2/cms\", \"cm²/V/s\").replace(\"cm^2/Vs\", \"cm²/V/s\")\n", + " unit = unit.replace(\"V2/cms\", \"cm²/V/s\").replace(\n", + " \"cm^2/Vs\", \"cm²/V/s\"\n", + " )\n", " if \",\" in unit:\n", " extra_key = key.rsplit(\".\", 1)[0].lower() + \".conditions\"\n", " data[extra_key] = unit\n", @@ -115,12 +117,9 @@ "\n", " if done:\n", " break\n", - " \n", - " raw_contributions.append({\n", - " \"identifier\": identifier,\n", - " \"data\": data\n", - " })\n", - " \n", + "\n", + " raw_contributions.append({\"identifier\": identifier, \"data\": data})\n", + "\n", "len(raw_contributions)" ] }, @@ -142,48 +141,72 @@ "outputs": [], "source": [ "keys_map = {\n", - " 'doping': {}, # don't rename, no unit\n", - " 'number of studies': {'rename': 'studies', 'unit': ''}, # dimensionless\n", - " 'quality.good or ok': {'rename': 'quality'},\n", - " 'structure and composition.common dopants': {'rename': 'dopants'},\n", - " 'structure and composition.space group symbol': {'rename': 'spacegroup'},\n", - " \n", - " 'branch point energy.bpe min ratio': {'rename': 'BPE.ratio.min', 'unit': ''},\n", - " 'branch point energy.bpe max ratio': {'rename': 'BPE.ratio.max', 'unit': ''},\n", - " 'branch point energy.bpe ratio': {'rename': 'BPE.ratio.mean', 'unit': ''},\n", - " 'branch point energy.has degenerate bands': {'rename': 'BPE.degenerate'},\n", - " \n", - " 'computed gap.hse06 band gap': {'rename': 'computed.gap.HSE06.band', 'unit': 'eV'},\n", - " 'computed gap.hse06 direct gap': {'rename': 'computed.gap.HSE06.direct', 'unit': 'eV'},\n", - " 'computed gap.pbe band gap': {'rename': 'computed.gap.PBE.band', 'unit': 'eV'},\n", - " 'computed gap.pbe direct gap': {'rename': 'computed.gap.PBE.direct', 'unit': 'eV'},\n", - "\n", - " 'computed m*.conditions': {'rename': 'computed.m*.conditions'},\n", - " 'computed m*.m* avg': {'rename': 'computed.m*.average', 'unit': ''},\n", - " 'computed m*.m* planar': {'rename': 'computed.m*.planar', 'unit': ''},\n", - " 'computed stability.e_above_hull': {'rename': 'computed.stability.Eₕ', 'unit': 'eV'},\n", - " 'computed stability.e_above_pourbaix_hull': {'rename': 'computed.stability.Eₚₕ', 'unit': 'eV'},\n", - "\n", - " 'experimental doping type': {'rename': 'experimental.doping'},\n", - " 'experimental gap.max experimental gap': {'rename': 'experimental.gap.range.max', 'unit': 'eV'},\n", - " 'experimental gap.max gap reference': {'rename': 'experimental.gap.references.max'},\n", - " 'experimental gap.min experimental gap': {'rename': 'experimental.gap.range.min', 'unit': 'eV'},\n", - " 'experimental gap.min gap reference': {'rename': 'experimental.gap.references.min'},\n", - "\n", - " 'max experimental conductivity.associated carrier concentration': {\n", - " 'rename': 'experimental.conductivity.concentration', 'unit': 'cm⁻³'\n", + " \"doping\": {}, # don't rename, no unit\n", + " \"number of studies\": {\"rename\": \"studies\", \"unit\": \"\"}, # dimensionless\n", + " \"quality.good or ok\": {\"rename\": \"quality\"},\n", + " \"structure and composition.common dopants\": {\"rename\": \"dopants\"},\n", + " \"structure and composition.space group symbol\": {\"rename\": \"spacegroup\"},\n", + " \"branch point energy.bpe min ratio\": {\"rename\": \"BPE.ratio.min\", \"unit\": \"\"},\n", + " \"branch point energy.bpe max ratio\": {\"rename\": \"BPE.ratio.max\", \"unit\": \"\"},\n", + " \"branch point energy.bpe ratio\": {\"rename\": \"BPE.ratio.mean\", \"unit\": \"\"},\n", + " \"branch point energy.has degenerate bands\": {\"rename\": \"BPE.degenerate\"},\n", + " \"computed gap.hse06 band gap\": {\"rename\": \"computed.gap.HSE06.band\", \"unit\": \"eV\"},\n", + " \"computed gap.hse06 direct gap\": {\n", + " \"rename\": \"computed.gap.HSE06.direct\",\n", + " \"unit\": \"eV\",\n", " },\n", - " 'max experimental conductivity.dopant': {'rename': 'experimental.conductivity.dopant'},\n", - " 'max experimental conductivity.max conductivity': {\n", - " 'rename': 'experimental.conductivity.max', 'unit': 'S/cm'\n", + " \"computed gap.pbe band gap\": {\"rename\": \"computed.gap.PBE.band\", \"unit\": \"eV\"},\n", + " \"computed gap.pbe direct gap\": {\"rename\": \"computed.gap.PBE.direct\", \"unit\": \"eV\"},\n", + " \"computed m*.conditions\": {\"rename\": \"computed.m*.conditions\"},\n", + " \"computed m*.m* avg\": {\"rename\": \"computed.m*.average\", \"unit\": \"\"},\n", + " \"computed m*.m* planar\": {\"rename\": \"computed.m*.planar\", \"unit\": \"\"},\n", + " \"computed stability.e_above_hull\": {\n", + " \"rename\": \"computed.stability.Eₕ\",\n", + " \"unit\": \"eV\",\n", + " },\n", + " \"computed stability.e_above_pourbaix_hull\": {\n", + " \"rename\": \"computed.stability.Eₚₕ\",\n", + " \"unit\": \"eV\",\n", + " },\n", + " \"experimental doping type\": {\"rename\": \"experimental.doping\"},\n", + " \"experimental gap.max experimental gap\": {\n", + " \"rename\": \"experimental.gap.range.max\",\n", + " \"unit\": \"eV\",\n", + " },\n", + " \"experimental gap.max gap reference\": {\"rename\": \"experimental.gap.references.max\"},\n", + " \"experimental gap.min experimental gap\": {\n", + " \"rename\": \"experimental.gap.range.min\",\n", + " \"unit\": \"eV\",\n", + " },\n", + " \"experimental gap.min gap reference\": {\"rename\": \"experimental.gap.references.min\"},\n", + " \"max experimental conductivity.associated carrier concentration\": {\n", + " \"rename\": \"experimental.conductivity.concentration\",\n", + " \"unit\": \"cm⁻³\",\n", + " },\n", + " \"max experimental conductivity.dopant\": {\n", + " \"rename\": \"experimental.conductivity.dopant\"\n", + " },\n", + " \"max experimental conductivity.max conductivity\": {\n", + " \"rename\": \"experimental.conductivity.max\",\n", + " \"unit\": \"S/cm\",\n", + " },\n", + " \"max experimental conductivity.reference link\": {\n", + " \"rename\": \"experimental.conductivity.reference\"\n", + " },\n", + " \"max experimental conductivity.synthesis method\": {\n", + " \"rename\": \"experimental.conductivity.method\"\n", + " },\n", + " \"max experimental mobility.dopant\": {\"rename\": \"experimental.mobility.dopant\"},\n", + " \"max experimental mobility.max mobility\": {\n", + " \"rename\": \"experimental.mobility.max\",\n", + " \"unit\": \"cm²/V/s\",\n", + " },\n", + " \"max experimental mobility.reference link\": {\n", + " \"rename\": \"experimental.mobility.reference\"\n", + " },\n", + " \"max experimental mobility.synthesis method\": {\n", + " \"rename\": \"experimental.mobility.method\"\n", " },\n", - " 'max experimental conductivity.reference link': {'rename': 'experimental.conductivity.reference'},\n", - " 'max experimental conductivity.synthesis method': {'rename': 'experimental.conductivity.method'},\n", - "\n", - " 'max experimental mobility.dopant': {'rename': 'experimental.mobility.dopant'},\n", - " 'max experimental mobility.max mobility': {'rename': 'experimental.mobility.max', 'unit': 'cm²/V/s'},\n", - " 'max experimental mobility.reference link': {'rename': 'experimental.mobility.reference'},\n", - " 'max experimental mobility.synthesis method': {'rename': 'experimental.mobility.method'},\n", "}" ] }, @@ -194,10 +217,7 @@ "metadata": {}, "outputs": [], "source": [ - "columns = {\n", - " cfg.get(\"rename\", k): cfg.get(\"unit\")\n", - " for k, cfg in keys_map.items()\n", - "}" + "columns = {cfg.get(\"rename\", k): cfg.get(\"unit\") for k, cfg in keys_map.items()}" ] }, { @@ -210,11 +230,13 @@ "contributions = []\n", "\n", "for contrib in raw_contributions:\n", - " contributions.append({\n", - " \"project\": name,\n", - " \"identifier\": contrib[\"identifier\"],\n", - " \"is_public\": True,\n", - " })\n", + " contributions.append(\n", + " {\n", + " \"project\": name,\n", + " \"identifier\": contrib[\"identifier\"],\n", + " \"is_public\": True,\n", + " }\n", + " )\n", " contributions[-1][\"data\"] = {\n", " cfg.get(\"rename\", k): contrib[\"data\"][k]\n", " for k, cfg in keys_map.items()\n", diff --git a/mpcontribs-portal/notebooks/lightsources.materialsproject.org/genesis_efrc_minipipes.ipynb b/mpcontribs-portal/notebooks/lightsources.materialsproject.org/genesis_efrc_minipipes.ipynb index 429f4b81ae..20a1e071b1 100644 --- a/mpcontribs-portal/notebooks/lightsources.materialsproject.org/genesis_efrc_minipipes.ipynb +++ b/mpcontribs-portal/notebooks/lightsources.materialsproject.org/genesis_efrc_minipipes.ipynb @@ -35,7 +35,9 @@ "outputs": [], "source": [ "name = \"genesis_efrc_minipipes\" # MPContribs project name\n", - "indir = Path(f\"/Users/patrick/GoogleDriveLBNL/MaterialsProject/gitrepos/mpcontribs-data/{name}\")" + "indir = Path(\n", + " f\"/Users/patrick/GoogleDriveLBNL/MaterialsProject/gitrepos/mpcontribs-data/{name}\"\n", + ")" ] }, { @@ -50,7 +52,8 @@ "\n", "# adding project name and API key to config (TODO: set through minipipes UI)\n", "config[\"meta\"][\"mpcontribs\"] = {\n", - " \"project\": name, \"apikey\": os.environ[\"MPCONTRIBS_API_KEY\"]\n", + " \"project\": name,\n", + " \"apikey\": os.environ[\"MPCONTRIBS_API_KEY\"],\n", "}\n", "\n", "ped_path = indir / \"PED of BMG for PDF 1-29-20_0035-0070.gr\"\n", @@ -79,8 +82,7 @@ "mpcontribs_config = config[\"meta\"].pop(\"mpcontribs\")\n", "name = mpcontribs_config[\"project\"]\n", "client = Client(\n", - " host = \"lightsources-api.materialsproject.org\",\n", - " apikey = mpcontribs_config[\"apikey\"]\n", + " host=\"lightsources-api.materialsproject.org\", apikey=mpcontribs_config[\"apikey\"]\n", ")" ] }, @@ -142,7 +144,7 @@ "source": [ "contrib = {\n", " \"project\": name,\n", - " \"identifier\": \"TODO\", # usually mp-id, can be custom\n", + " \"identifier\": \"TODO\", # usually mp-id, can be custom\n", " \"formula\": formula,\n", " \"is_public\": True, # will make this contribution public automatically when project is set to public\n", " # data, tables and attachments added explicitly below\n", @@ -168,9 +170,9 @@ "names_map = {\n", " \"i_Reduce_Data.Mask_Images.Mask_f\": \"mask\",\n", " \"i_Reduce_Data.Image_to_IQ.Integrate_f\": \"integrate\",\n", - " \"i_Reduce_Data.IQ_to_PDF.Transform_f\": \"transform\"\n", + " \"i_Reduce_Data.IQ_to_PDF.Transform_f\": \"transform\",\n", "}\n", - "keys_maps = [ # len(runs_meta) = 3\n", + "keys_maps = [ # len(runs_meta) = 3\n", " {\n", " \"alpha\": \"α\",\n", " \"edge\": \"edge\",\n", @@ -178,12 +180,14 @@ " \"upper_threshold\": \"thresholds.upper\",\n", " \"smoothing function\": \"smoothing\",\n", " \"vmin\": \"v.min\",\n", - " \"vmax\": \"v.max\"\n", - " }, {\n", + " \"vmax\": \"v.max\",\n", + " },\n", + " {\n", " \"wavelength (A)\": \"λ\", # TODO unit Angstrom\n", " \"polarization\": \"polarization\",\n", - " \"detector\": \"detector\"\n", - " }, {\n", + " \"detector\": \"detector\",\n", + " },\n", + " {\n", " \"processor\": \"processor\",\n", " \"mode\": \"mode\",\n", " \"qmax\": \"q.max\",\n", @@ -192,8 +196,8 @@ " \"rmin\": \"r.min\",\n", " \"rmax\": \"r.max\",\n", " \"step\": \"step\",\n", - " \"shift\": \"shift\"\n", - " }\n", + " \"shift\": \"shift\",\n", + " },\n", "]\n", "\n", "flat_data = {}\n", @@ -232,7 +236,7 @@ "df.columns.name = \"spectral type\"\n", "df.attrs[\"name\"] = y\n", "df.attrs[\"title\"] = \"Radial Distribution Function\"\n", - "df.attrs[\"labels\"] = {\"value\": f\"{y} [Å⁻²]\"} \n", + "df.attrs[\"labels\"] = {\"value\": f\"{y} [Å⁻²]\"}\n", "# df.plot(**df.attrs)\n", "contrib[\"tables\"] = [df]" ] diff --git a/mpcontribs-portal/notebooks/lightsources.materialsproject.org/get_started.ipynb b/mpcontribs-portal/notebooks/lightsources.materialsproject.org/get_started.ipynb index c3162b1883..17ee152009 100644 --- a/mpcontribs-portal/notebooks/lightsources.materialsproject.org/get_started.ipynb +++ b/mpcontribs-portal/notebooks/lightsources.materialsproject.org/get_started.ipynb @@ -57,14 +57,16 @@ "elements = [\"Co\", \"Cu\", \"Ce\"]\n", "columns = {f\"position.{axis}\": \"mm\" for axis in [\"x\", \"y\"]}\n", "columns.update({f\"composition.{element}\": \"%\" for element in elements})\n", - "columns.update({\n", - " f\"{element}.{spectrum}.{m}\": \"\"\n", - " for element in elements\n", - " for spectrum in [\"XAS\", \"XMCD\"]\n", - " for m in [\"min\", \"max\"]\n", - "})\n", + "columns.update(\n", + " {\n", + " f\"{element}.{spectrum}.{m}\": \"\"\n", + " for element in elements\n", + " for spectrum in [\"XAS\", \"XMCD\"]\n", + " for m in [\"min\", \"max\"]\n", + " }\n", + ")\n", "columns.update({\"tables\": None, \"attachments\": None})\n", - "#columns" + "# columns" ] }, { @@ -85,7 +87,9 @@ "outputs": [], "source": [ "# composition/concentration table\n", - "ctable = read_csv(StringIO(\"\"\"\n", + "ctable = read_csv(\n", + " StringIO(\n", + " \"\"\"\n", "X,\t\tY,\t\tCo,\t\tCu,\t\tCe\n", "-8.5,\t37.6,\t46.2,\t5.3,\t39.3\n", "-8.5,\t107.8,\t70.0,\t8.9,\t15.5\n", @@ -99,9 +103,13 @@ "-5.7,\t104.8,\t54.9,\t19.1,\t15.5\n", "-5.0,\t37.1,\t48.8,\t8.7,\t43.7\n", "-5.0,\t107.1,\t64.8,\t16.9,\t19.2\n", - "\"\"\".replace('\\t', '')))\n", + "\"\"\".replace(\"\\t\", \"\")\n", + " )\n", + ")\n", "\n", - "ctable[\"x/y position [mm]\"] = ctable[\"X\"].astype('str') + '/' + ctable[\"Y\"].astype('str')\n", + "ctable[\"x/y position [mm]\"] = (\n", + " ctable[\"X\"].astype(\"str\") + \"/\" + ctable[\"Y\"].astype(\"str\")\n", + ")\n", "ctable.attrs[\"name\"] = \"Composition Table\"\n", "ctable.attrs[\"meta\"] = {\"X\": \"category\", \"Y\": \"continuous\"} # for plotly\n", "ctable.attrs[\"labels\"] = {\"value\": \"composition [%]\"}\n", @@ -142,6 +150,7 @@ "\n", " return functions\n", "\n", + "\n", "conc_funcs = get_concentration_functions(ctable)\n", "del ctable[\"X\"]\n", "del ctable[\"Y\"]\n", @@ -156,49 +165,52 @@ "source": [ "# paths to gzipped JSON files for attachments\n", "# global params attachment identical for every contribution / across project\n", - "global_params = Attachment.from_data(\"files/global-params\", {\n", - " \"transfer_fields\": [\n", - " \"I_Norm0\", \"Magnet Field\", \"Energy\", \"Y\", \"Z\", \"filename_scannumber\"\n", - " ],\n", - " \"labelcols\": [\"Y\", \"Z\"]\n", - "})\n", + "global_params = Attachment.from_data(\n", + " \"files/global-params\",\n", + " {\n", + " \"transfer_fields\": [\n", + " \"I_Norm0\",\n", + " \"Magnet Field\",\n", + " \"Energy\",\n", + " \"Y\",\n", + " \"Z\",\n", + " \"filename_scannumber\",\n", + " ],\n", + " \"labelcols\": [\"Y\", \"Z\"],\n", + " },\n", + ")\n", + "\n", "\n", "# separate attachment of analysis params for each contribution and element\n", "def analysis_params(identifier, element):\n", " name = f\"files/analysis-params__{identifier}__{element}\"\n", - " return Attachment.from_data(name, {\n", - " \"get_xas\": {\n", - " \"element\": element,\n", - " 'pre_edge': (695, 701),\n", - " 'post_edge': (730, 739),\n", - " },\n", - " \"get_xmcd\": {\n", - " 'L3_range': (705, 710),\n", - " 'L2_range': (718, 722),\n", - " },\n", - " \"Remove BG (polynomial)\": {\n", - " \"element\": element,\n", - " \"degree\": 1,\n", - " \"step\": 0,\n", - " \"xmcd_bg_subtract\": True,\n", - " \"scanindex_column\": \"XMCD Index\"\n", - " },\n", - " \"normalize_set\": {\n", - " \"element\": element,\n", - " \"scanindex_column\": \"XMCD Index\"\n", - " },\n", - " \"collapse_set\": {\n", - " \"columns_to_keep\": [\"Energy\",\"Y\",\"Z\"]\n", + " return Attachment.from_data(\n", + " name,\n", + " {\n", + " \"get_xas\": {\n", + " \"element\": element,\n", + " \"pre_edge\": (695, 701),\n", + " \"post_edge\": (730, 739),\n", + " },\n", + " \"get_xmcd\": {\n", + " \"L3_range\": (705, 710),\n", + " \"L2_range\": (718, 722),\n", + " },\n", + " \"Remove BG (polynomial)\": {\n", + " \"element\": element,\n", + " \"degree\": 1,\n", + " \"step\": 0,\n", + " \"xmcd_bg_subtract\": True,\n", + " \"scanindex_column\": \"XMCD Index\",\n", + " },\n", + " \"normalize_set\": {\"element\": element, \"scanindex_column\": \"XMCD Index\"},\n", + " \"collapse_set\": {\"columns_to_keep\": [\"Energy\", \"Y\", \"Z\"]},\n", + " \"plot_spectrum\": {\"element\": element, \"E_lower\": 695, \"E_upper\": 760},\n", + " \"gather_final_op_param_values\": {\n", + " \"identifier\": identifier # added for testing to ensure different attachment contents\n", + " },\n", " },\n", - " \"plot_spectrum\": {\n", - " \"element\": element,\n", - " 'E_lower': 695,\n", - " 'E_upper': 760\n", - " },\n", - " \"gather_final_op_param_values\": {\n", - " \"identifier\": identifier # added for testing to ensure different attachment contents\n", - " }\n", - " })" + " )" ] }, { @@ -215,7 +227,7 @@ " # randomly assign fake sample id for testing here\n", " fn = os.path.splitext(info.filename)[0]\n", " element, x, y = fn.rsplit(\"_\", 4)\n", - " sample = f\"CMSI-2-10_{idx%5}\"\n", + " sample = f\"CMSI-2-10_{idx % 5}\"\n", " identifier = f\"{sample}__{x}_{y}\"\n", "\n", " # tables and attachments for Co\n", @@ -228,7 +240,7 @@ " df.columns.name = \"spectral type\"\n", " df.attrs[\"name\"] = f\"{element}-XAS/XMCD\"\n", " df.attrs[\"title\"] = f\"XAS and XMCD Spectra for {element}\"\n", - " df.attrs[\"labels\"] = {\"value\": \"a.u.\"} \n", + " df.attrs[\"labels\"] = {\"value\": \"a.u.\"}\n", " params = analysis_params(identifier, element)\n", "\n", " # build contribution\n", @@ -236,38 +248,39 @@ " # TODO auto-convert data.timestamp field in API to enable sorting/filtering\n", " contrib[\"data\"][\"position\"] = {k: f\"{v} mm\" for k, v in zip([\"x\", \"y\"], [x, y])}\n", " contrib[\"data\"][\"composition\"] = {}\n", - " \n", + "\n", " for el, f in conc_funcs.items():\n", " try:\n", - " contrib[\"data\"][\"composition\"][el] = f\"{f(x, y) * 100.} %\"\n", + " contrib[\"data\"][\"composition\"][el] = f\"{f(x, y) * 100.0} %\"\n", " except KeyError:\n", " continue\n", "\n", " if not contrib[\"data\"][\"composition\"]:\n", " print(f\"Could not determine composition for {identifier}!\")\n", " continue\n", - " \n", - " contrib[\"formula\"] = \"\".join([\n", - " \"{}{}\".format(el, int(round(Decimal(comp.split()[0]))))\n", - " for el, comp in contrib[\"data\"][\"composition\"].items()\n", - " ])\n", + "\n", + " contrib[\"formula\"] = \"\".join(\n", + " [\n", + " \"{}{}\".format(el, int(round(Decimal(comp.split()[0]))))\n", + " for el, comp in contrib[\"data\"][\"composition\"].items()\n", + " ]\n", + " )\n", "\n", " contrib[\"data\"][element] = {\n", - " y: {\"min\": df[y].min(), \"max\": df[y].max()}\n", - " for y in [\"XAS\", \"XMCD\"]\n", + " y: {\"min\": df[y].min(), \"max\": df[y].max()} for y in [\"XAS\", \"XMCD\"]\n", " }\n", - " \n", + "\n", " # adding ctable and global_params to every contribution\n", " # ctable could be the same for different subsets of contributions\n", " contrib[\"tables\"] = [ctable, df]\n", " contrib[\"attachments\"] = [global_params, params]\n", " contributions.append(contrib)\n", - " \n", + "\n", "# if len(contributions) > 2:\n", "# break\n", - " \n", + "\n", "# len(contributions)\n", - "#contributions" + "# contributions" ] }, { @@ -287,9 +300,9 @@ "metadata": {}, "outputs": [], "source": [ - "client.contributions.queryContributions(project=name, _fields=[\n", - " \"id\", \"identifier\", \"tables\", \"attachments\", \"notebook\"\n", - "]).result()" + "client.contributions.queryContributions(\n", + " project=name, _fields=[\"id\", \"identifier\", \"tables\", \"attachments\", \"notebook\"]\n", + ").result()" ] }, { @@ -325,7 +338,7 @@ " fake_tables[identifier] = []\n", " for idx, element in enumerate(elements[1:]):\n", " df = contrib[\"tables\"][1].copy()\n", - " df.index = df.index.astype(\"float\") + (idx+1)*10\n", + " df.index = df.index.astype(\"float\") + (idx + 1) * 10\n", " df.attrs[\"name\"] = f\"{element}-XAS/XMCD\"\n", " df.attrs[\"title\"] = f\"XAS and XMCD Spectra for {element}\"\n", " fake_tables[identifier].append(df)" @@ -342,14 +355,10 @@ "identifiers = [c[\"identifier\"] for c in contributions]\n", "\n", "resp = client.contributions.queryContributions(\n", - " project=name, identifier__in=identifiers[:5],\n", - " _fields=[\"id\", \"identifier\"]\n", + " project=name, identifier__in=identifiers[:5], _fields=[\"id\", \"identifier\"]\n", ").result()\n", "\n", - "mapping = {\n", - " c[\"identifier\"]: c[\"id\"]\n", - " for c in resp[\"data\"]\n", - "}\n", + "mapping = {c[\"identifier\"]: c[\"id\"] for c in resp[\"data\"]}\n", "print(mapping)" ] }, @@ -363,7 +372,7 @@ "# example for a single identifier and element\n", "identifier = identifiers[0]\n", "element_index = 1\n", - "component_index = element_index + 1 # index in contribution's component list\n", + "component_index = element_index + 1 # index in contribution's component list\n", "element = elements[element_index]\n", "pk = mapping[identifier]\n", "df = fake_tables[identifier][element_index]\n", @@ -371,10 +380,9 @@ "\n", "contrib = {\n", " \"id\": pk,\n", - " \"data\": {element: {\n", - " y: {\"min\": df[y].min(), \"max\": df[y].max()}\n", - " for y in [\"XAS\", \"XMCD\"]\n", - " }}, \n", + " \"data\": {\n", + " element: {y: {\"min\": df[y].min(), \"max\": df[y].max()} for y in [\"XAS\", \"XMCD\"]}\n", + " },\n", " \"tables\": [None] * component_index + [df], # ensure correct index for update\n", " \"attachments\": [None] * component_index + [params],\n", "}" @@ -404,7 +412,7 @@ "metadata": {}, "outputs": [], "source": [ - "client.get_table('608a5a1ddce158e132083323').display()" + "client.get_table(\"608a5a1ddce158e132083323\").display()" ] }, { diff --git a/mpcontribs-portal/notebooks/ml.materialsproject.org/get_started.ipynb b/mpcontribs-portal/notebooks/ml.materialsproject.org/get_started.ipynb index a13eefdc69..ed4e3c02dd 100644 --- a/mpcontribs-portal/notebooks/ml.materialsproject.org/get_started.ipynb +++ b/mpcontribs-portal/notebooks/ml.materialsproject.org/get_started.ipynb @@ -41,91 +41,103 @@ " \"clf_pos_label\": None,\n", " \"unit\": None,\n", " \"has_structure\": True,\n", - " }, {\n", + " },\n", + " {\n", " \"name\": \"log_gvrh\",\n", " \"data_file\": \"matbench_log_gvrh.json.gz\",\n", " \"target\": \"log10(G_VRH)\",\n", " \"clf_pos_label\": None,\n", " \"unit\": None,\n", " \"has_structure\": True,\n", - " }, {\n", + " },\n", + " {\n", " \"name\": \"dielectric\",\n", " \"data_file\": \"matbench_dielectric.json.gz\",\n", " \"target\": \"n\",\n", " \"clf_pos_label\": None,\n", " \"unit\": None,\n", " \"has_structure\": True,\n", - " }, {\n", + " },\n", + " {\n", " \"name\": \"jdft2d\",\n", " \"data_file\": \"matbench_jdft2d.json.gz\",\n", " \"target\": \"exfoliation_en\",\n", " \"clf_pos_label\": None,\n", " \"unit\": \"meV/atom\",\n", " \"has_structure\": True,\n", - " }, {\n", + " },\n", + " {\n", " \"name\": \"mp_gap\",\n", " \"data_file\": \"matbench_mp_gap.json.gz\",\n", " \"target\": \"gap pbe\",\n", " \"clf_pos_label\": None,\n", " \"unit\": \"eV\",\n", " \"has_structure\": True,\n", - " }, {\n", + " },\n", + " {\n", " \"name\": \"mp_is_metal\",\n", " \"data_file\": \"matbench_mp_is_metal.json.gz\",\n", " \"target\": \"is_metal\",\n", " \"clf_pos_label\": True,\n", " \"unit\": None,\n", " \"has_structure\": True,\n", - " }, {\n", + " },\n", + " {\n", " \"name\": \"mp_e_form\",\n", " \"data_file\": \"matbench_mp_e_form.json.gz\",\n", " \"target\": \"e_form\",\n", " \"clf_pos_label\": None,\n", " \"unit\": \"eV/atom\",\n", " \"has_structure\": True,\n", - " }, {\n", + " },\n", + " {\n", " \"name\": \"perovskites\",\n", " \"data_file\": \"matbench_perovskites.json.gz\",\n", " \"target\": \"e_form\",\n", " \"clf_pos_label\": None,\n", " \"unit\": \"eV\",\n", " \"has_structure\": True,\n", - " }, {\n", + " },\n", + " {\n", " \"name\": \"glass\",\n", " \"data_file\": \"matbench_glass.json.gz\",\n", " \"target\": \"gfa\",\n", " \"clf_pos_label\": True,\n", " \"unit\": None,\n", " \"has_structure\": False,\n", - " }, {\n", + " },\n", + " {\n", " \"name\": \"expt_is_metal\",\n", " \"data_file\": \"matbench_expt_is_metal.json.gz\",\n", " \"target\": \"is_metal\",\n", " \"clf_pos_label\": True,\n", " \"unit\": None,\n", " \"has_structure\": False,\n", - " }, {\n", + " },\n", + " {\n", " \"name\": \"expt_gap\",\n", " \"data_file\": \"matbench_expt_gap.json.gz\",\n", " \"target\": \"gap expt\",\n", " \"clf_pos_label\": None,\n", " \"unit\": \"eV\",\n", " \"has_structure\": False,\n", - " }, {\n", + " },\n", + " {\n", " \"name\": \"phonons\",\n", " \"data_file\": \"matbench_phonons.json.gz\",\n", " \"target\": \"last phdos peak\",\n", " \"clf_pos_label\": None,\n", " \"unit\": \"cm^-1\",\n", " \"has_structure\": True,\n", - " }, {\n", + " },\n", + " {\n", " \"name\": \"steels\",\n", " \"data_file\": \"matbench_steels.json.gz\",\n", " \"target\": \"yield strength\",\n", " \"clf_pos_label\": None,\n", " \"unit\": \"MPa\",\n", " \"has_structure\": False,\n", - " }\n", + " },\n", "]" ] }, @@ -159,7 +171,7 @@ "source": [ "pybtex.errors.set_strict_mode(False)\n", "mprester = MPRester()\n", - "client = Client(host='ml-api.materialsproject.org')" + "client = Client(host=\"ml-api.materialsproject.org\")" ] }, { @@ -168,16 +180,16 @@ "metadata": {}, "outputs": [], "source": [ - "datadir = Path('/Users/patrick/gitrepos/mp/mpcontribs-data/')\n", - "fn = Path('dataset_metadata.json')\n", + "datadir = Path(\"/Users/patrick/gitrepos/mp/mpcontribs-data/\")\n", + "fn = Path(\"dataset_metadata.json\")\n", "fp = datadir / fn\n", "if not fp.exists():\n", " prefix = \"https://raw.githubusercontent.com/hackingmaterials/matminer\"\n", - " url = f'{prefix}/master/matminer/datasets/{fn}'\n", + " url = f\"{prefix}/master/matminer/datasets/{fn}\"\n", " wget.download(url)\n", " fn.rename(fp)\n", - " \n", - "metadata = json.load(open(fp, 'r'))" + "\n", + "metadata = json.load(open(fp, \"r\"))" ] }, { @@ -199,50 +211,47 @@ " target = ds[\"target\"]\n", " columns = {\n", " target_map[target]: metadata[name][\"columns\"][target],\n", - " primitive_key: metadata[name][\"columns\"][primitive_key]\n", + " primitive_key: metadata[name][\"columns\"][primitive_key],\n", " }\n", " project = {\n", - " 'name': name,\n", - " 'is_public': True,\n", - " 'owner': 'ardunn@lbl.gov',\n", - " 'title': name, # TODO update and set long_title\n", - " 'authors': 'A. Dunn, A. Jain',\n", - " 'description': metadata[name]['description'] + \\\n", - " \" If you are viewing this on MPContribs-ML interactively, please ensure the order of the\"\n", + " \"name\": name,\n", + " \"is_public\": True,\n", + " \"owner\": \"ardunn@lbl.gov\",\n", + " \"title\": name, # TODO update and set long_title\n", + " \"authors\": \"A. Dunn, A. Jain\",\n", + " \"description\": metadata[name][\"description\"]\n", + " + \" If you are viewing this on MPContribs-ML interactively, please ensure the order of the\"\n", " f\"identifiers is sequential (mb-{ds['name']}-0001, mb-{ds['name']}-0002, etc.) before benchmarking.\",\n", - " 'other': {\n", - " 'columns': columns,\n", - " 'entries': metadata[name]['num_entries']\n", - " },\n", - " 'references': [\n", - " {'label': 'RawData', 'url': metadata[\"name\"][\"url\"]}\n", - " ]\n", + " \"other\": {\"columns\": columns, \"entries\": metadata[name][\"num_entries\"]},\n", + " \"references\": [{\"label\": \"RawData\", \"url\": metadata[\"name\"][\"url\"]}],\n", " }\n", - " \n", - " for ref in metadata[name]['bibtex_refs']:\n", + "\n", + " for ref in metadata[name][\"bibtex_refs\"]:\n", " if name == \"matbench_phonons\":\n", " ref = ref.replace(\n", " \"petretto_dwaraknath_miranda_winston_giantomassi_rignanese_van setten_gonze_persson_hautier_2018\",\n", - " \"petretto2018\"\n", + " \"petretto2018\",\n", " )\n", - " \n", - " bib = parse_string(ref, 'bibtex')\n", + "\n", + " bib = parse_string(ref, \"bibtex\")\n", " for key, entry in bib.entries.items():\n", - " key_is_doi = key.startswith('doi:')\n", - " url = 'https://doi.org/' + key.split(':', 1)[-1] if key_is_doi else entry.fields.get('url')\n", - " k = 'Zhuo2018' if key_is_doi else capwords(key.replace('_', ''))\n", - " if k.startswith('C2'):\n", - " k = 'Castelli2012'\n", - " elif k.startswith('Landolt'):\n", - " k = 'LB1997'\n", - " elif k == 'Citrine':\n", - " url = 'https://www.citrination.com'\n", - " \n", + " key_is_doi = key.startswith(\"doi:\")\n", + " url = (\n", + " \"https://doi.org/\" + key.split(\":\", 1)[-1]\n", + " if key_is_doi\n", + " else entry.fields.get(\"url\")\n", + " )\n", + " k = \"Zhuo2018\" if key_is_doi else capwords(key.replace(\"_\", \"\"))\n", + " if k.startswith(\"C2\"):\n", + " k = \"Castelli2012\"\n", + " elif k.startswith(\"Landolt\"):\n", + " k = \"LB1997\"\n", + " elif k == \"Citrine\":\n", + " url = \"https://www.citrination.com\"\n", + "\n", " if len(k) > 8:\n", " k = k[:4] + k[-4:]\n", - " project['references'].append(\n", - " {'label': k, 'url': url}\n", - " )\n", + " project[\"references\"].append({\"label\": k, \"url\": url})\n", "\n", " try:\n", " client.projects.getProjectByName(pk=name, _fields=[\"name\"]).result()\n", @@ -285,7 +294,7 @@ "\n", " for i, row in tqdm(enumerate(df.iterrows()), total=df.shape[0]):\n", " entry = row[1]\n", - " contrib = {'project': name, 'is_public': True}\n", + " contrib = {\"project\": name, \"is_public\": True}\n", "\n", " if \"structure\" in entry.index:\n", " s = entry.loc[\"structure\"]\n", @@ -296,7 +305,7 @@ " else:\n", " c = entry[\"composition\"]\n", "\n", - " id_number = f\"{i+1:0{id_n_zeros}d}\"\n", + " id_number = f\"{i + 1:0{id_n_zeros}d}\"\n", " identifier = f\"mb-{ds['name']}-{id_number}\"\n", " contrib[\"identifier\"] = identifier\n", " contrib[\"data\"] = {target_map[target]: f\"{entry.loc[target]}{unit}\"}\n", @@ -305,7 +314,7 @@ "\n", " with open(fn, \"w\") as f:\n", " json.dump(contributions, f, cls=MontyEncoder)\n", - " \n", + "\n", " print(\"saved to\", fn)" ] }, diff --git a/mpcontribs-portal/supervisord/conf.py b/mpcontribs-portal/supervisord/conf.py index 4fb68a6d8e..7b2fd63336 100644 --- a/mpcontribs-portal/supervisord/conf.py +++ b/mpcontribs-portal/supervisord/conf.py @@ -15,7 +15,7 @@ "api_port": api_port, "portal_port": portal_port, "s3": s3, - "tm": tm.upper() + "tm": tm.upper(), } kwargs = { diff --git a/mpcontribs-serverless/make_download/app.py b/mpcontribs-serverless/make_download/app.py index 96f98401a7..8c97bce147 100644 --- a/mpcontribs-serverless/make_download/app.py +++ b/mpcontribs-serverless/make_download/app.py @@ -11,18 +11,19 @@ logger = logging.getLogger() logger.setLevel(os.environ["MPCONTRIBS_CLIENT_LOG_LEVEL"]) -s3_client = boto3.client('s3') +s3_client = boto3.client("s3") timeout = int(os.environ["LAMBDA_TIMEOUT"]) redis_address = os.environ["REDIS_ADDRESS"] store = Redis.from_url(f"redis://{redis_address}") store.ping() + def get_remaining(event, context): - remaining = context.get_remaining_time_in_millis() / 1000. - 0.5 + remaining = context.get_remaining_time_in_millis() / 1000.0 - 0.5 if remaining < 3: raise ValueError("TIMEOUT in 3s!") - elapsed_pct = (timeout - remaining) / timeout * 100. + elapsed_pct = (timeout - remaining) / timeout * 100.0 store.set(event["redis_key"], f"{elapsed_pct:.1f}") return remaining @@ -34,9 +35,7 @@ def lambda_handler(event, context): bucket, filename, fmt, version = event["redis_key"].split(":") try: - client = Client( - host=event["host"], headers=event["headers"], project=project - ) + client = Client(host=event["host"], headers=event["headers"], project=project) remaining = get_remaining(event, context) tmpdir = Path("/tmp") outdir = tmpdir / filename @@ -49,9 +48,11 @@ def lambda_handler(event, context): zipfile = outdir.with_suffix(".zip") resp = zipfile.read_bytes() s3_client.put_object( - Bucket=bucket, Key=f"{filename}_{fmt}.zip", + Bucket=bucket, + Key=f"{filename}_{fmt}.zip", Metadata={"version": version}, - Body=resp, ContentType="application/zip" + Body=resp, + ContentType="application/zip", ) get_remaining(event, context) rmtree(outdir) diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000000..7826c72ae1 --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,9 @@ +[project] +name = "fastapi-conversion" +version = "0.1.0" +description = "Add your description here" +readme = "README.md" +requires-python = ">=3.14" +dependencies = [ + "fastapi>=0.136.3", +] diff --git a/uv.lock b/uv.lock new file mode 100644 index 0000000000..1ea3d847d9 --- /dev/null +++ b/uv.lock @@ -0,0 +1,158 @@ +version = 1 +revision = 3 +requires-python = ">=3.14" + +[[package]] +name = "annotated-doc" +version = "0.0.4" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/57/ba/046ceea27344560984e26a590f90bc7f4a75b06701f653222458922b558c/annotated_doc-0.0.4.tar.gz", hash = "sha256:fbcda96e87e9c92ad167c2e53839e57503ecfda18804ea28102353485033faa4", size = 7288, upload-time = "2025-11-10T22:07:42.062Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/1e/d3/26bf1008eb3d2daa8ef4cacc7f3bfdc11818d111f7e2d0201bc6e3b49d45/annotated_doc-0.0.4-py3-none-any.whl", hash = "sha256:571ac1dc6991c450b25a9c2d84a3705e2ae7a53467b5d111c24fa8baabbed320", size = 5303, upload-time = "2025-11-10T22:07:40.673Z" }, +] + +[[package]] +name = "annotated-types" +version = "0.7.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/ee/67/531ea369ba64dcff5ec9c3402f9f51bf748cec26dde048a2f973a4eea7f5/annotated_types-0.7.0.tar.gz", hash = "sha256:aff07c09a53a08bc8cfccb9c85b05f1aa9a2a6f23728d790723543408344ce89", size = 16081, upload-time = "2024-05-20T21:33:25.928Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/78/b6/6307fbef88d9b5ee7421e68d78a9f162e0da4900bc5f5793f6d3d0e34fb8/annotated_types-0.7.0-py3-none-any.whl", hash = "sha256:1f02e8b43a8fbbc3f3e0d4f0f4bfc8131bcb4eebe8849b8e5c773f3a1c582a53", size = 13643, upload-time = "2024-05-20T21:33:24.1Z" }, +] + +[[package]] +name = "anyio" +version = "4.13.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "idna" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/19/14/2c5dd9f512b66549ae92767a9c7b330ae88e1932ca57876909410251fe13/anyio-4.13.0.tar.gz", hash = "sha256:334b70e641fd2221c1505b3890c69882fe4a2df910cba14d97019b90b24439dc", size = 231622, upload-time = "2026-03-24T12:59:09.671Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/da/42/e921fccf5015463e32a3cf6ee7f980a6ed0f395ceeaa45060b61d86486c2/anyio-4.13.0-py3-none-any.whl", hash = "sha256:08b310f9e24a9594186fd75b4f73f4a4152069e3853f1ed8bfbf58369f4ad708", size = 114353, upload-time = "2026-03-24T12:59:08.246Z" }, +] + +[[package]] +name = "fastapi" +version = "0.136.3" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "annotated-doc" }, + { name = "pydantic" }, + { name = "starlette" }, + { name = "typing-extensions" }, + { name = "typing-inspection" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/81/2d/ff8d91d7b564d464629a0fd50a4489c97fcb836ac230bf3a7269232a9b1f/fastapi-0.136.3.tar.gz", hash = "sha256:e487fae93ad408e6f47641ee4dfe389864fd7bec92e547ea8498fc13f43e83ab", size = 396410, upload-time = "2026-05-23T18:53:15.192Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/e0/82/45359b62a067409bd929ae8a56b8ed13e5a8c8a61194b3c236920999ab83/fastapi-0.136.3-py3-none-any.whl", hash = "sha256:3d2a69bdf04b7e9f3afa292c3bc7a98816bbfafa10bc9b45f3f3700d2f761620", size = 117481, upload-time = "2026-05-23T18:53:16.924Z" }, +] + +[[package]] +name = "fastapi-conversion" +version = "0.1.0" +source = { virtual = "." } +dependencies = [ + { name = "fastapi" }, +] + +[package.metadata] +requires-dist = [{ name = "fastapi", specifier = ">=0.136.3" }] + +[[package]] +name = "idna" +version = "3.16" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/1a/88/bcf9709822fe69d02c2a6a77956c98ce6ea8ca8767a9aadcedc7eb6a2390/idna-3.16.tar.gz", hash = "sha256:d7a6da03db833450fca25d2358ac9ff06cd624577a4aea3a596d5c0f77b8e03d", size = 203770, upload-time = "2026-05-22T00:16:18.781Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/94/16/70255075a9859a0e3adb789b68ceb0e210dec03934245fd98d248226572f/idna-3.16-py3-none-any.whl", hash = "sha256:cc246e3a3f89580c3a951b5ad298ca4638078b2cdd4f115654332b5c26daded5", size = 74165, upload-time = "2026-05-22T00:16:16.698Z" }, +] + +[[package]] +name = "pydantic" +version = "2.13.4" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "annotated-types" }, + { name = "pydantic-core" }, + { name = "typing-extensions" }, + { name = "typing-inspection" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/18/a5/b60d21ac674192f8ab0ba4e9fd860690f9b4a6e51ca5df118733b487d8d6/pydantic-2.13.4.tar.gz", hash = "sha256:c40756b57adaa8b1efeeced5c196f3f3b7c435f90e84ea7f443901bec8099ef6", size = 844775, upload-time = "2026-05-06T13:43:05.343Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/fd/7b/122376b1fd3c62c1ed9dc80c931ace4844b3c55407b6fb2d199377c9736f/pydantic-2.13.4-py3-none-any.whl", hash = "sha256:45a282cde31d808236fd7ea9d919b128653c8b38b393d1c4ab335c62924d9aba", size = 472262, upload-time = "2026-05-06T13:43:02.641Z" }, +] + +[[package]] +name = "pydantic-core" +version = "2.46.4" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "typing-extensions" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/9d/56/921726b776ace8d8f5db44c4ef961006580d91dc52b803c489fafd1aa249/pydantic_core-2.46.4.tar.gz", hash = "sha256:62f875393d7f270851f20523dd2e29f082bcc82292d66db2b64ea71f64b6e1c1", size = 471464, upload-time = "2026-05-06T13:37:06.98Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/8d/74/228a26ddad29c6672b805d9fd78e8d251cd04004fa7eed0e622096cd0250/pydantic_core-2.46.4-cp314-cp314-macosx_10_12_x86_64.whl", hash = "sha256:428e04521a40150c85216fc8b85e8d39fece235a9cf5e383761238c7fa9b96fb", size = 2102079, upload-time = "2026-05-06T13:38:41.019Z" }, + { url = "https://files.pythonhosted.org/packages/ad/1f/8970b150a4b4365623ae00fc88603491f763c627311ae8031e3111356d6e/pydantic_core-2.46.4-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:23ace664830ee0bfe014a0c7bc248b1f7f25ed7ad103852c317624a1083af462", size = 1952179, upload-time = "2026-05-06T13:36:59.812Z" }, + { url = "https://files.pythonhosted.org/packages/95/30/5211a831ae054928054b2f79731661087a2bc5c01e825c672b3a4a8f1b3e/pydantic_core-2.46.4-cp314-cp314-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ce5c1d2a8b27468f433ca974829c44060b8097eedc39933e3c206a90ee49c4a9", size = 1978926, upload-time = "2026-05-06T13:37:39.933Z" }, + { url = "https://files.pythonhosted.org/packages/57/e9/689668733b1eb67adeef047db3c2e8788fcf65a7fd9c9e2b46b7744fe245/pydantic_core-2.46.4-cp314-cp314-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:7283d57845ecf5a163403eb0702dfc220cc4fbdd18919cb5ccea4f95ee1cdab4", size = 2046785, upload-time = "2026-05-06T13:38:01.995Z" }, + { url = "https://files.pythonhosted.org/packages/60/d9/6715260422ff50a2109878fd24d948a6c3446bb2664f34ee78cd972b3acd/pydantic_core-2.46.4-cp314-cp314-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:8daafc69c93ee8a0204506a3b6b30f586ef54028f52aeeeb5c4cfc5184fd5914", size = 2228733, upload-time = "2026-05-06T13:40:50.371Z" }, + { url = "https://files.pythonhosted.org/packages/18/ae/fdb2f64316afca925640f8e70bb1a564b0ec2721c1389e25b8eb4bf9a299/pydantic_core-2.46.4-cp314-cp314-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:cd2213145bcc2ba85884d0ac63d222fece9209678f77b9b4d76f054c561adb28", size = 2307534, upload-time = "2026-05-06T13:37:21.531Z" }, + { url = "https://files.pythonhosted.org/packages/89/1d/8eff589b45bb8190a9d12c49cfad0f176a5cbd1534908a6b5125e2886239/pydantic_core-2.46.4-cp314-cp314-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7a5f930472650a82629163023e630d160863fce524c616f4e5186e5de9d9a49b", size = 2099732, upload-time = "2026-05-06T13:39:31.942Z" }, + { url = "https://files.pythonhosted.org/packages/06/d5/ee5a3366637fee41dee51a1fc91562dcf12ddbc68fda34e6b253da2324bb/pydantic_core-2.46.4-cp314-cp314-manylinux_2_31_riscv64.whl", hash = "sha256:c1b3f518abeca3aa13c712fd202306e145abf59a18b094a6bafb2d2bbf59192c", size = 2129627, upload-time = "2026-05-06T13:37:25.033Z" }, + { url = "https://files.pythonhosted.org/packages/94/33/2414be571d2c6a6c4d08be21f9292b6d3fdb08949a97b6dfe985017821db/pydantic_core-2.46.4-cp314-cp314-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:1a7dd0b3ee80d90150e3495a3a13ac34dbcbfd4f012996a6a1d8900e91b5c0fb", size = 2179141, upload-time = "2026-05-06T13:37:14.046Z" }, + { url = "https://files.pythonhosted.org/packages/7b/79/7daa95be995be0eecc4cf75064cb33f9bbbfe3fe0158caf2f0d4a996a5c7/pydantic_core-2.46.4-cp314-cp314-musllinux_1_1_aarch64.whl", hash = "sha256:3fb702cd90b0446a3a1c5e470bfa0dd23c0233b676a9099ddcc964fa6ca13898", size = 2184325, upload-time = "2026-05-06T13:36:53.615Z" }, + { url = "https://files.pythonhosted.org/packages/9f/cb/d0a382f5c0de8a222dc61c65348e0ce831b1f68e0a018450d31c2cace3a5/pydantic_core-2.46.4-cp314-cp314-musllinux_1_1_armv7l.whl", hash = "sha256:b8458003118a712e66286df6a707db01c52c0f52f7db8e4a38f0da1d3b94fc4e", size = 2323990, upload-time = "2026-05-06T13:40:29.971Z" }, + { url = "https://files.pythonhosted.org/packages/05/db/d9ba624cc4a5aced1598e88c04fdbd8310c8a69b9d38b9a3d39ce3a61ed7/pydantic_core-2.46.4-cp314-cp314-musllinux_1_1_x86_64.whl", hash = "sha256:372429a130e469c9cd698925ce5fc50940b7a1336b0d82038e63d5bbc4edc519", size = 2369978, upload-time = "2026-05-06T13:37:23.027Z" }, + { url = "https://files.pythonhosted.org/packages/f2/20/d15df15ba918c423461905802bfd2981c3af0bfa0e40d05e13edbfa48bc3/pydantic_core-2.46.4-cp314-cp314-win32.whl", hash = "sha256:85bb3611ff1802f3ee7fdd7dbff26b56f343fb432d57a4728fdd49b6ef35e2f4", size = 1966354, upload-time = "2026-05-06T13:38:03.499Z" }, + { url = "https://files.pythonhosted.org/packages/fc/b6/6b8de4c0a7d7ab3004c439c80c5c1e0a3e8d78bbae19379b01960383d9e5/pydantic_core-2.46.4-cp314-cp314-win_amd64.whl", hash = "sha256:811ff8e9c313ab425368bcbb36e5c4ebd7108c2bbf4e4089cfbb0b01eff63fac", size = 2072238, upload-time = "2026-05-06T13:39:40.807Z" }, + { url = "https://files.pythonhosted.org/packages/32/36/51eb763beec1f4cf59b1db243a7dcc39cbb41230f050a09b9d69faaf0a48/pydantic_core-2.46.4-cp314-cp314-win_arm64.whl", hash = "sha256:bfec22eab3c8cc2ceec0248aec886624116dc079afa027ecc8ad4a7e62010f8a", size = 2018251, upload-time = "2026-05-06T13:37:26.72Z" }, + { url = "https://files.pythonhosted.org/packages/e8/91/855af51d625b23aa987116a19e231d2aaef9c4a415273ddc189b79a45fee/pydantic_core-2.46.4-cp314-cp314t-macosx_10_12_x86_64.whl", hash = "sha256:af8244b2bef6aaad6d92cda81372de7f8c8d36c9f0c3ea36e827c60e7d9467a0", size = 2099593, upload-time = "2026-05-06T13:39:47.682Z" }, + { url = "https://files.pythonhosted.org/packages/fb/1b/8784a54c65edb5f49f0a14d6977cf1b209bba85a4c77445b255c2de58ab3/pydantic_core-2.46.4-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:5a4330cdbc57162e4b3aa303f588ba752257694c9c9be3e7ebb11b4aca659b5d", size = 1935226, upload-time = "2026-05-06T13:40:40.428Z" }, + { url = "https://files.pythonhosted.org/packages/e8/e7/1955d28d1afc56dd4b3ad7cc0cf39df1b9852964cf16e5d13912756d6d6b/pydantic_core-2.46.4-cp314-cp314t-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:29c61fc04a3d840155ff08e475a04809278972fe6aef51e2720554e96367e34b", size = 1974605, upload-time = "2026-05-06T13:37:32.029Z" }, + { url = "https://files.pythonhosted.org/packages/93/e2/3fedbf0ba7a22850e6e9fd78117f1c0f10f950182344d8a6c535d468fdd8/pydantic_core-2.46.4-cp314-cp314t-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:c50f2528cf200c5eed56faf3f4e22fcd5f38c157a8b78576e6ba3168ec35f000", size = 2030777, upload-time = "2026-05-06T13:38:55.239Z" }, + { url = "https://files.pythonhosted.org/packages/f8/61/46be275fcaaba0b4f5b9669dd852267ce1ff616592dccf7a7845588df091/pydantic_core-2.46.4-cp314-cp314t-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:0cbe8b01f948de4286c74cdd6c667aceb38f5c1e26f0693b3983d9d74887c65e", size = 2236641, upload-time = "2026-05-06T13:37:08.096Z" }, + { url = "https://files.pythonhosted.org/packages/60/db/12e93e46a8bac9988be3c016860f83293daea8c716c029c9ace279036f2f/pydantic_core-2.46.4-cp314-cp314t-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:617d7e2ca7dcb8c5cf6bcb8c59b8832c94b36196bbf1cbd1bfb56ed341905edd", size = 2286404, upload-time = "2026-05-06T13:40:20.221Z" }, + { url = "https://files.pythonhosted.org/packages/e2/4a/4d8b19008f38d31c53b8219cfedc2e3d5de5fe99d90076b7e767de29274f/pydantic_core-2.46.4-cp314-cp314t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7027560ee92211647d0d34e3f7cd6f50da56399d26a9c8ad0da286d3869a53f3", size = 2109219, upload-time = "2026-05-06T13:38:12.153Z" }, + { url = "https://files.pythonhosted.org/packages/88/70/3cbc40978fefb7bb09c6708d40d4ad1a5d70fd7213c3d17f971de868ec1f/pydantic_core-2.46.4-cp314-cp314t-manylinux_2_31_riscv64.whl", hash = "sha256:f99626688942fb746e545232e7726926f3be91b5975f8b55327665fafda991c7", size = 2110594, upload-time = "2026-05-06T13:40:02.971Z" }, + { url = "https://files.pythonhosted.org/packages/9d/20/b8d36736216e29491125531685b2f9e61aa5b4b2599893f8268551da3338/pydantic_core-2.46.4-cp314-cp314t-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:fc3e9034a63de20e15e8ade85358bc6efc614008cab72898b4b4952bea0509ff", size = 2159542, upload-time = "2026-05-06T13:39:27.506Z" }, + { url = "https://files.pythonhosted.org/packages/1d/a2/367df868eb584dacf6bf82a389272406d7178e301c4ac82545ab98bc2dd9/pydantic_core-2.46.4-cp314-cp314t-musllinux_1_1_aarch64.whl", hash = "sha256:97e7cf2be5c77b7d1a9713a05605d49460d02c6078d38d8bef3cbe323c548424", size = 2168146, upload-time = "2026-05-06T13:38:31.93Z" }, + { url = "https://files.pythonhosted.org/packages/c1/b8/4460f77f7e201893f649a29ab355dddd3beee8a97bcb1a320db414f9a06e/pydantic_core-2.46.4-cp314-cp314t-musllinux_1_1_armv7l.whl", hash = "sha256:3bf92c5d0e00fefaab325a4d27828fe6b6e2a21848686b5b60d2d9eeb09d76c6", size = 2306309, upload-time = "2026-05-06T13:37:44.717Z" }, + { url = "https://files.pythonhosted.org/packages/64/c4/be2639293acd87dc8ddbcec41a73cee9b2ebf996fe6d892a1a74e88ad3f7/pydantic_core-2.46.4-cp314-cp314t-musllinux_1_1_x86_64.whl", hash = "sha256:3ecbc122d18468d06ca279dc26a8c2e2d5acb10943bb35e36ae92096dc3b5565", size = 2369736, upload-time = "2026-05-06T13:37:05.645Z" }, + { url = "https://files.pythonhosted.org/packages/30/a6/9f9f380dbb301f67023bf8f707aaa75daadf84f7152d95c410fd7e81d994/pydantic_core-2.46.4-cp314-cp314t-win32.whl", hash = "sha256:e846ae7835bf0703ae43f534ab79a867146dadd59dc9ca5c8b53d5c8f7c9ef02", size = 1955575, upload-time = "2026-05-06T13:38:51.116Z" }, + { url = "https://files.pythonhosted.org/packages/40/1f/f1eb9eb350e795d1af8586289746f5c5677d16043040d63710e22abc43c9/pydantic_core-2.46.4-cp314-cp314t-win_amd64.whl", hash = "sha256:2108ba5c1c1eca18030634489dc544844144ee36357f2f9f780b93e7ddbb44b5", size = 2051624, upload-time = "2026-05-06T13:38:21.672Z" }, + { url = "https://files.pythonhosted.org/packages/f6/d2/42dd53d0a85c27606f316d3aa5d2869c4e8470a5ed6dec30e4a1abe19192/pydantic_core-2.46.4-cp314-cp314t-win_arm64.whl", hash = "sha256:4fcbe087dbc2068af7eda3aa87634eba216dbda64d1ae73c8684b621d33f6596", size = 2017325, upload-time = "2026-05-06T13:40:52.723Z" }, +] + +[[package]] +name = "starlette" +version = "1.1.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "anyio" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/95/66/4d20cdf39a8d6a51e663b7038e3b828ff211d3891a43a713fe7e4643f3a8/starlette-1.1.0.tar.gz", hash = "sha256:e83c7fe0ddecd8719c5b840080325aec0260acec86e9832899e377b91d65e90f", size = 2660060, upload-time = "2026-05-23T16:55:41.376Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/93/79/920b8e0a8b20f793e8d64855095cb8febabf6175b8550b6f7a547d813891/starlette-1.1.0-py3-none-any.whl", hash = "sha256:7f0dfd38e428aad5cb6f9f667f0ca1d2d8ca3f3385dccac8305f79ec98458382", size = 72899, upload-time = "2026-05-23T16:55:39.201Z" }, +] + +[[package]] +name = "typing-extensions" +version = "4.15.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/72/94/1a15dd82efb362ac84269196e94cf00f187f7ed21c242792a923cdb1c61f/typing_extensions-4.15.0.tar.gz", hash = "sha256:0cea48d173cc12fa28ecabc3b837ea3cf6f38c6d1136f85cbaaf598984861466", size = 109391, upload-time = "2025-08-25T13:49:26.313Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/18/67/36e9267722cc04a6b9f15c7f3441c2363321a3ea07da7ae0c0707beb2a9c/typing_extensions-4.15.0-py3-none-any.whl", hash = "sha256:f0fa19c6845758ab08074a0cfa8b7aecb71c999ca73d62883bc25cc018c4e548", size = 44614, upload-time = "2025-08-25T13:49:24.86Z" }, +] + +[[package]] +name = "typing-inspection" +version = "0.4.2" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "typing-extensions" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/55/e3/70399cb7dd41c10ac53367ae42139cf4b1ca5f36bb3dc6c9d33acdb43655/typing_inspection-0.4.2.tar.gz", hash = "sha256:ba561c48a67c5958007083d386c3295464928b01faa735ab8547c5692e87f464", size = 75949, upload-time = "2025-10-01T02:14:41.687Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/dc/9b/47798a6c91d8bdb567fe2698fe81e0c6b7cb7ef4d13da4114b41d239f65d/typing_inspection-0.4.2-py3-none-any.whl", hash = "sha256:4ed1cacbdc298c220f1bd249ed5287caa16f34d44ef4e9c3d0cbad5b521545e7", size = 14611, upload-time = "2025-10-01T02:14:40.154Z" }, +] From cd024205b445004011fbf89ee9848863d09e3761 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 28 May 2026 15:33:26 -0700 Subject: [PATCH 234/591] Added .venv and .env to gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 249cd86aa8..dea1ffa5db 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,5 @@ coverage.xml mpcontribs-api/supervisord.conf mpcontribs-portal/supervisord.conf **/.DS_Store +.venv/ +.env From 43d7e1384c513b1e06a7312888e073aee5b0de43 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 28 May 2026 15:36:31 -0700 Subject: [PATCH 235/591] Moved dev optional-dependencies to a dependency group --- mpcontribs-api/pyproject.toml | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/mpcontribs-api/pyproject.toml b/mpcontribs-api/pyproject.toml index 438532317f..78464c7390 100644 --- a/mpcontribs-api/pyproject.toml +++ b/mpcontribs-api/pyproject.toml @@ -58,21 +58,28 @@ dependencies = [ "uncertainties", "websocket_client", "zstandard", + "fastapi>=0.136.3", + "pymongo>=4.17.0", + "pydantic-settings>=2.14.1", + "structlog>=25.5.0", + "opentelemetry-api>=1.42.1", + "opentelemetry-sdk>=1.42.1", + "opentelemetry-exporter-otlp-proto-grpc>=1.42.1", + "opentelemetry-instrumentation-fastapi>=0.63b1", + "opentelemetry-instrumentation-pymongo>=0.63b1", ] [project.urls] Homepage = "https://github.com/materialsproject/MPContribs" Documentation = "https://docs.materialsproject.org/services/mpcontribs" -[project.optional-dependencies] +[dependency-groups] dev = [ - "flake8", - "pytest", - "pytest-pycodestyle", - "pytest-xdist", -] -all = [ - "mpcontribs-api[dev]" + "flake8>=7.3.0", + "pytest>=9.0.3", + "pytest-flake8>=1.3.0", + "pytest-pycodestyle>=2.5.0", + "pytest-xdist>=3.8.0", ] [tool.pytest] From 0b1dee02e13e461fc70ef2f9a15ecb56d8f0063c Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 28 May 2026 15:37:02 -0700 Subject: [PATCH 236/591] Synced lock file --- mpcontribs-api/uv.lock | 4821 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 4821 insertions(+) create mode 100644 mpcontribs-api/uv.lock diff --git a/mpcontribs-api/uv.lock b/mpcontribs-api/uv.lock new file mode 100644 index 0000000000..e98ba4cd0e --- /dev/null +++ b/mpcontribs-api/uv.lock @@ -0,0 +1,4821 @@ +version = 1 +revision = 3 +requires-python = ">=3.11" +resolution-markers = [ + "python_full_version >= '3.14' and sys_platform == 'win32'", + "python_full_version >= '3.14' and sys_platform != 'win32'", + "python_full_version == '3.13.*' and sys_platform == 'win32'", + "python_full_version == '3.13.*' and sys_platform != 'win32'", + "python_full_version == '3.12.*' and sys_platform == 'win32'", + "python_full_version == '3.12.*' and sys_platform != 'win32'", + "python_full_version < '3.12' and sys_platform == 'win32'", + "python_full_version < '3.12' and sys_platform != 'win32'", +] + +[[package]] +name = "annotated-doc" +version = "0.0.4" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/57/ba/046ceea27344560984e26a590f90bc7f4a75b06701f653222458922b558c/annotated_doc-0.0.4.tar.gz", hash = "sha256:fbcda96e87e9c92ad167c2e53839e57503ecfda18804ea28102353485033faa4", size = 7288, upload-time = "2025-11-10T22:07:42.062Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/1e/d3/26bf1008eb3d2daa8ef4cacc7f3bfdc11818d111f7e2d0201bc6e3b49d45/annotated_doc-0.0.4-py3-none-any.whl", hash = "sha256:571ac1dc6991c450b25a9c2d84a3705e2ae7a53467b5d111c24fa8baabbed320", size = 5303, upload-time = "2025-11-10T22:07:40.673Z" }, +] + +[[package]] +name = "annotated-types" +version = "0.7.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/ee/67/531ea369ba64dcff5ec9c3402f9f51bf748cec26dde048a2f973a4eea7f5/annotated_types-0.7.0.tar.gz", hash = "sha256:aff07c09a53a08bc8cfccb9c85b05f1aa9a2a6f23728d790723543408344ce89", size = 16081, upload-time = "2024-05-20T21:33:25.928Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/78/b6/6307fbef88d9b5ee7421e68d78a9f162e0da4900bc5f5793f6d3d0e34fb8/annotated_types-0.7.0-py3-none-any.whl", hash = "sha256:1f02e8b43a8fbbc3f3e0d4f0f4bfc8131bcb4eebe8849b8e5c773f3a1c582a53", size = 13643, upload-time = "2024-05-20T21:33:24.1Z" }, +] + +[[package]] +name = "anyio" +version = "4.13.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "idna" }, + { name = "typing-extensions", marker = "python_full_version < '3.13'" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/19/14/2c5dd9f512b66549ae92767a9c7b330ae88e1932ca57876909410251fe13/anyio-4.13.0.tar.gz", hash = "sha256:334b70e641fd2221c1505b3890c69882fe4a2df910cba14d97019b90b24439dc", size = 231622, upload-time = "2026-03-24T12:59:09.671Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/da/42/e921fccf5015463e32a3cf6ee7f980a6ed0f395ceeaa45060b61d86486c2/anyio-4.13.0-py3-none-any.whl", hash = "sha256:08b310f9e24a9594186fd75b4f73f4a4152069e3853f1ed8bfbf58369f4ad708", size = 114353, upload-time = "2026-03-24T12:59:08.246Z" }, +] + +[[package]] +name = "apispec" +version = "5.2.2" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/39/bb/2910f46ecba16334c19e4f02906b1fdb0e69f9c3fd9a21afcf86c45ba89e/apispec-5.2.2.tar.gz", hash = "sha256:6ea6542e1ebffe9fd95ba01ef3f51351eac6c200a974562c7473059b9cd20aa7", size = 75729, upload-time = "2022-05-12T22:18:20.648Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/7b/bf/8ab9b532c9a22e9cc4920ed7436fde5f207807346564b95d9782f1e2aa5e/apispec-5.2.2-py3-none-any.whl", hash = "sha256:f5f0d6b452c3e4a0e0922dce8815fac89dc4dbc758acef21fb9e01584d6602a5", size = 29618, upload-time = "2022-05-12T22:18:19.235Z" }, +] + +[[package]] +name = "appnope" +version = "0.1.4" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/35/5d/752690df9ef5b76e169e68d6a129fa6d08a7100ca7f754c89495db3c6019/appnope-0.1.4.tar.gz", hash = "sha256:1de3860566df9caf38f01f86f65e0e13e379af54f9e4bee1e66b48f2efffd1ee", size = 4170, upload-time = "2024-02-06T09:43:11.258Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/81/29/5ecc3a15d5a33e31b26c11426c45c501e439cb865d0bff96315d86443b78/appnope-0.1.4-py2.py3-none-any.whl", hash = "sha256:502575ee11cd7a28c0205f379b525beefebab9d161b7c964670864014ed7213c", size = 4321, upload-time = "2024-02-06T09:43:09.663Z" }, +] + +[[package]] +name = "argon2-cffi" +version = "25.1.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "argon2-cffi-bindings" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/0e/89/ce5af8a7d472a67cc819d5d998aa8c82c5d860608c4db9f46f1162d7dab9/argon2_cffi-25.1.0.tar.gz", hash = "sha256:694ae5cc8a42f4c4e2bf2ca0e64e51e23a040c6a517a85074683d3959e1346c1", size = 45706, upload-time = "2025-06-03T06:55:32.073Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/4f/d3/a8b22fa575b297cd6e3e3b0155c7e25db170edf1c74783d6a31a2490b8d9/argon2_cffi-25.1.0-py3-none-any.whl", hash = "sha256:fdc8b074db390fccb6eb4a3604ae7231f219aa669a2652e0f20e16ba513d5741", size = 14657, upload-time = "2025-06-03T06:55:30.804Z" }, +] + +[[package]] +name = "argon2-cffi-bindings" +version = "25.1.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "cffi" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/5c/2d/db8af0df73c1cf454f71b2bbe5e356b8c1f8041c979f505b3d3186e520a9/argon2_cffi_bindings-25.1.0.tar.gz", hash = "sha256:b957f3e6ea4d55d820e40ff76f450952807013d361a65d7f28acc0acbf29229d", size = 1783441, upload-time = "2025-07-30T10:02:05.147Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/60/97/3c0a35f46e52108d4707c44b95cfe2afcafc50800b5450c197454569b776/argon2_cffi_bindings-25.1.0-cp314-cp314t-macosx_10_13_universal2.whl", hash = "sha256:3d3f05610594151994ca9ccb3c771115bdb4daef161976a266f0dd8aa9996b8f", size = 54393, upload-time = "2025-07-30T10:01:40.97Z" }, + { url = "https://files.pythonhosted.org/packages/9d/f4/98bbd6ee89febd4f212696f13c03ca302b8552e7dbf9c8efa11ea4a388c3/argon2_cffi_bindings-25.1.0-cp314-cp314t-macosx_10_13_x86_64.whl", hash = "sha256:8b8efee945193e667a396cbc7b4fb7d357297d6234d30a489905d96caabde56b", size = 29328, upload-time = "2025-07-30T10:01:41.916Z" }, + { url = "https://files.pythonhosted.org/packages/43/24/90a01c0ef12ac91a6be05969f29944643bc1e5e461155ae6559befa8f00b/argon2_cffi_bindings-25.1.0-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:3c6702abc36bf3ccba3f802b799505def420a1b7039862014a65db3205967f5a", size = 31269, upload-time = "2025-07-30T10:01:42.716Z" }, + { url = "https://files.pythonhosted.org/packages/d4/d3/942aa10782b2697eee7af5e12eeff5ebb325ccfb86dd8abda54174e377e4/argon2_cffi_bindings-25.1.0-cp314-cp314t-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:a1c70058c6ab1e352304ac7e3b52554daadacd8d453c1752e547c76e9c99ac44", size = 86558, upload-time = "2025-07-30T10:01:43.943Z" }, + { url = "https://files.pythonhosted.org/packages/0d/82/b484f702fec5536e71836fc2dbc8c5267b3f6e78d2d539b4eaa6f0db8bf8/argon2_cffi_bindings-25.1.0-cp314-cp314t-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:e2fd3bfbff3c5d74fef31a722f729bf93500910db650c925c2d6ef879a7e51cb", size = 92364, upload-time = "2025-07-30T10:01:44.887Z" }, + { url = "https://files.pythonhosted.org/packages/c9/c1/a606ff83b3f1735f3759ad0f2cd9e038a0ad11a3de3b6c673aa41c24bb7b/argon2_cffi_bindings-25.1.0-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:c4f9665de60b1b0e99bcd6be4f17d90339698ce954cfd8d9cf4f91c995165a92", size = 85637, upload-time = "2025-07-30T10:01:46.225Z" }, + { url = "https://files.pythonhosted.org/packages/44/b4/678503f12aceb0262f84fa201f6027ed77d71c5019ae03b399b97caa2f19/argon2_cffi_bindings-25.1.0-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:ba92837e4a9aa6a508c8d2d7883ed5a8f6c308c89a4790e1e447a220deb79a85", size = 91934, upload-time = "2025-07-30T10:01:47.203Z" }, + { url = "https://files.pythonhosted.org/packages/f0/c7/f36bd08ef9bd9f0a9cff9428406651f5937ce27b6c5b07b92d41f91ae541/argon2_cffi_bindings-25.1.0-cp314-cp314t-win32.whl", hash = "sha256:84a461d4d84ae1295871329b346a97f68eade8c53b6ed9a7ca2d7467f3c8ff6f", size = 28158, upload-time = "2025-07-30T10:01:48.341Z" }, + { url = "https://files.pythonhosted.org/packages/b3/80/0106a7448abb24a2c467bf7d527fe5413b7fdfa4ad6d6a96a43a62ef3988/argon2_cffi_bindings-25.1.0-cp314-cp314t-win_amd64.whl", hash = "sha256:b55aec3565b65f56455eebc9b9f34130440404f27fe21c3b375bf1ea4d8fbae6", size = 32597, upload-time = "2025-07-30T10:01:49.112Z" }, + { url = "https://files.pythonhosted.org/packages/05/b8/d663c9caea07e9180b2cb662772865230715cbd573ba3b5e81793d580316/argon2_cffi_bindings-25.1.0-cp314-cp314t-win_arm64.whl", hash = "sha256:87c33a52407e4c41f3b70a9c2d3f6056d88b10dad7695be708c5021673f55623", size = 28231, upload-time = "2025-07-30T10:01:49.92Z" }, + { url = "https://files.pythonhosted.org/packages/1d/57/96b8b9f93166147826da5f90376e784a10582dd39a393c99bb62cfcf52f0/argon2_cffi_bindings-25.1.0-cp39-abi3-macosx_10_9_universal2.whl", hash = "sha256:aecba1723ae35330a008418a91ea6cfcedf6d31e5fbaa056a166462ff066d500", size = 54121, upload-time = "2025-07-30T10:01:50.815Z" }, + { url = "https://files.pythonhosted.org/packages/0a/08/a9bebdb2e0e602dde230bdde8021b29f71f7841bd54801bcfd514acb5dcf/argon2_cffi_bindings-25.1.0-cp39-abi3-macosx_10_9_x86_64.whl", hash = "sha256:2630b6240b495dfab90aebe159ff784d08ea999aa4b0d17efa734055a07d2f44", size = 29177, upload-time = "2025-07-30T10:01:51.681Z" }, + { url = "https://files.pythonhosted.org/packages/b6/02/d297943bcacf05e4f2a94ab6f462831dc20158614e5d067c35d4e63b9acb/argon2_cffi_bindings-25.1.0-cp39-abi3-macosx_11_0_arm64.whl", hash = "sha256:7aef0c91e2c0fbca6fc68e7555aa60ef7008a739cbe045541e438373bc54d2b0", size = 31090, upload-time = "2025-07-30T10:01:53.184Z" }, + { url = "https://files.pythonhosted.org/packages/c1/93/44365f3d75053e53893ec6d733e4a5e3147502663554b4d864587c7828a7/argon2_cffi_bindings-25.1.0-cp39-abi3-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:1e021e87faa76ae0d413b619fe2b65ab9a037f24c60a1e6cc43457ae20de6dc6", size = 81246, upload-time = "2025-07-30T10:01:54.145Z" }, + { url = "https://files.pythonhosted.org/packages/09/52/94108adfdd6e2ddf58be64f959a0b9c7d4ef2fa71086c38356d22dc501ea/argon2_cffi_bindings-25.1.0-cp39-abi3-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:d3e924cfc503018a714f94a49a149fdc0b644eaead5d1f089330399134fa028a", size = 87126, upload-time = "2025-07-30T10:01:55.074Z" }, + { url = "https://files.pythonhosted.org/packages/72/70/7a2993a12b0ffa2a9271259b79cc616e2389ed1a4d93842fac5a1f923ffd/argon2_cffi_bindings-25.1.0-cp39-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:c87b72589133f0346a1cb8d5ecca4b933e3c9b64656c9d175270a000e73b288d", size = 80343, upload-time = "2025-07-30T10:01:56.007Z" }, + { url = "https://files.pythonhosted.org/packages/78/9a/4e5157d893ffc712b74dbd868c7f62365618266982b64accab26bab01edc/argon2_cffi_bindings-25.1.0-cp39-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:1db89609c06afa1a214a69a462ea741cf735b29a57530478c06eb81dd403de99", size = 86777, upload-time = "2025-07-30T10:01:56.943Z" }, + { url = "https://files.pythonhosted.org/packages/74/cd/15777dfde1c29d96de7f18edf4cc94c385646852e7c7b0320aa91ccca583/argon2_cffi_bindings-25.1.0-cp39-abi3-win32.whl", hash = "sha256:473bcb5f82924b1becbb637b63303ec8d10e84c8d241119419897a26116515d2", size = 27180, upload-time = "2025-07-30T10:01:57.759Z" }, + { url = "https://files.pythonhosted.org/packages/e2/c6/a759ece8f1829d1f162261226fbfd2c6832b3ff7657384045286d2afa384/argon2_cffi_bindings-25.1.0-cp39-abi3-win_amd64.whl", hash = "sha256:a98cd7d17e9f7ce244c0803cad3c23a7d379c301ba618a5fa76a67d116618b98", size = 31715, upload-time = "2025-07-30T10:01:58.56Z" }, + { url = "https://files.pythonhosted.org/packages/42/b9/f8d6fa329ab25128b7e98fd83a3cb34d9db5b059a9847eddb840a0af45dd/argon2_cffi_bindings-25.1.0-cp39-abi3-win_arm64.whl", hash = "sha256:b0fdbcf513833809c882823f98dc2f931cf659d9a1429616ac3adebb49f5db94", size = 27149, upload-time = "2025-07-30T10:01:59.329Z" }, +] + +[[package]] +name = "arrow" +version = "1.4.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "python-dateutil" }, + { name = "tzdata" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/b9/33/032cdc44182491aa708d06a68b62434140d8c50820a087fac7af37703357/arrow-1.4.0.tar.gz", hash = "sha256:ed0cc050e98001b8779e84d461b0098c4ac597e88704a655582b21d116e526d7", size = 152931, upload-time = "2025-10-18T17:46:46.761Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/ed/c9/d7977eaacb9df673210491da99e6a247e93df98c715fc43fd136ce1d3d33/arrow-1.4.0-py3-none-any.whl", hash = "sha256:749f0769958ebdc79c173ff0b0670d59051a535fa26e8eba02953dc19eb43205", size = 68797, upload-time = "2025-10-18T17:46:45.663Z" }, +] + +[[package]] +name = "asgiref" +version = "3.11.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/63/40/f03da1264ae8f7cfdbf9146542e5e7e8100a4c66ab48e791df9a03d3f6c0/asgiref-3.11.1.tar.gz", hash = "sha256:5f184dc43b7e763efe848065441eac62229c9f7b0475f41f80e207a114eda4ce", size = 38550, upload-time = "2026-02-03T13:30:14.33Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/5c/0a/a72d10ed65068e115044937873362e6e32fab1b7dce0046aeb224682c989/asgiref-3.11.1-py3-none-any.whl", hash = "sha256:e8667a091e69529631969fd45dc268fa79b99c92c5fcdda727757e52146ec133", size = 24345, upload-time = "2026-02-03T13:30:13.039Z" }, +] + +[[package]] +name = "asn1crypto" +version = "1.5.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/de/cf/d547feed25b5244fcb9392e288ff9fdc3280b10260362fc45d37a798a6ee/asn1crypto-1.5.1.tar.gz", hash = "sha256:13ae38502be632115abf8a24cbe5f4da52e3b5231990aff31123c805306ccb9c", size = 121080, upload-time = "2022-03-15T14:46:52.889Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/c9/7f/09065fd9e27da0eda08b4d6897f1c13535066174cc023af248fc2a8d5e5a/asn1crypto-1.5.1-py2.py3-none-any.whl", hash = "sha256:db4e40728b728508912cbb3d44f19ce188f218e9eba635821bb4b68564f8fd67", size = 105045, upload-time = "2022-03-15T14:46:51.055Z" }, +] + +[[package]] +name = "asttokens" +version = "3.0.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/be/a5/8e3f9b6771b0b408517c82d97aed8f2036509bc247d46114925e32fe33f0/asttokens-3.0.1.tar.gz", hash = "sha256:71a4ee5de0bde6a31d64f6b13f2293ac190344478f081c3d1bccfcf5eacb0cb7", size = 62308, upload-time = "2025-11-15T16:43:48.578Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/d2/39/e7eaf1799466a4aef85b6a4fe7bd175ad2b1c6345066aa33f1f58d4b18d0/asttokens-3.0.1-py3-none-any.whl", hash = "sha256:15a3ebc0f43c2d0a50eeafea25e19046c68398e487b9f1f5b517f7c0f40f976a", size = 27047, upload-time = "2025-11-15T16:43:16.109Z" }, +] + +[[package]] +name = "async-timeout" +version = "5.0.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/a5/ae/136395dfbfe00dfc94da3f3e136d0b13f394cba8f4841120e34226265780/async_timeout-5.0.1.tar.gz", hash = "sha256:d9321a7a3d5a6a5e187e824d2fa0793ce379a202935782d555d6e9d2735677d3", size = 9274, upload-time = "2024-11-06T16:41:39.6Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/fe/ba/e2081de779ca30d473f21f5b30e0e737c438205440784c7dfc81efc2b029/async_timeout-5.0.1-py3-none-any.whl", hash = "sha256:39e3809566ff85354557ec2398b55e096c8364bacac9405a7a1fa429e77fe76c", size = 6233, upload-time = "2024-11-06T16:41:37.9Z" }, +] + +[[package]] +name = "atlasq-tschaume" +version = "0.11.1.dev2" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "mongoengine" }, + { name = "requests" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/8c/5f/91e3d9c1712c8e235c95c86eeb265bb106802f5bcbe334e28f605f55b018/atlasq-tschaume-0.11.1.dev2.tar.gz", hash = "sha256:9393356edebae037b1b47e16d73a7a04969451eaa3e38f1bdc20d1d9b08ece68", size = 38083, upload-time = "2023-04-14T21:06:57.344Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/a5/8c/83b96f52f5a5b8e418bf4cbf9089cfbea33fc0b809c28fd5a9b9393b67ba/atlasq_tschaume-0.11.1.dev2-py3-none-any.whl", hash = "sha256:f38813972c8c379964f09200fa89f9ae909ccbf5b3483bb6a77d5bf34720dde0", size = 15748, upload-time = "2023-04-14T21:06:54.943Z" }, +] + +[[package]] +name = "attrs" +version = "26.1.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/9a/8e/82a0fe20a541c03148528be8cac2408564a6c9a0cc7e9171802bc1d26985/attrs-26.1.0.tar.gz", hash = "sha256:d03ceb89cb322a8fd706d4fb91940737b6642aa36998fe130a9bc96c985eff32", size = 952055, upload-time = "2026-03-19T14:22:25.026Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/64/b4/17d4b0b2a2dc85a6df63d1157e028ed19f90d4cd97c36717afef2bc2f395/attrs-26.1.0-py3-none-any.whl", hash = "sha256:c647aa4a12dfbad9333ca4e71fe62ddc36f4e63b2d260a37a8b83d2f043ac309", size = 67548, upload-time = "2026-03-19T14:22:23.645Z" }, +] + +[[package]] +name = "backports-zstd" +version = "1.5.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/d4/05/480d439b482edf59b786bc19b474d990c61942e372f5de3dc14acac8154d/backports_zstd-1.5.0.tar.gz", hash = "sha256:a5e622a82eb183b4fbe18032755ce0a15fa9a82f2adb9b621620b91247aaedb7", size = 998556, upload-time = "2026-05-11T19:54:24.923Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/26/bc/083c0ebee316f4863ed288c4a5eaa1e98be115e82deb8855da8bab1c7701/backports_zstd-1.5.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:fbaa5502617dc4f04327c7a2951f0fcdca7aaef93ddf32c15dc8b620208174fa", size = 436838, upload-time = "2026-05-11T19:52:24.349Z" }, + { url = "https://files.pythonhosted.org/packages/cd/e5/bf778667fff6598dbd0791745123ed964aee94753ae8e4e92aa1e07417b6/backports_zstd-1.5.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:204f00d62e95aab987c7c019452b2373bdefb17252443765f2ede7f15b6e669a", size = 363215, upload-time = "2026-05-11T19:52:25.887Z" }, + { url = "https://files.pythonhosted.org/packages/63/a5/4fae78734dbefcb4b5386137c807e2107c4bc94e85c0d9eaae79206dde84/backports_zstd-1.5.0-cp311-cp311-manylinux2010_i686.manylinux_2_12_i686.manylinux_2_28_i686.whl", hash = "sha256:2c77c0d4c330afd26d2a98f3d689ab922ec3f046014a1614ddcaad437666ac05", size = 507161, upload-time = "2026-05-11T19:52:27.48Z" }, + { url = "https://files.pythonhosted.org/packages/d8/ec/b64409f0cf56fb65181d6f5d9130058f19d5c3c9f8c581a5e2bd62642630/backports_zstd-1.5.0-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:6bb2f2d2c07358edeaa251cf804b993e9f0d5d93af8a7ea2414d80ff3c105e95", size = 476728, upload-time = "2026-05-11T19:52:29.182Z" }, + { url = "https://files.pythonhosted.org/packages/4d/10/4c1693cb4e129585a6e4cb565106cad7347e61c43c8375b9e9cadb00eb06/backports_zstd-1.5.0-cp311-cp311-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:cb89f554abcebcb2c487024e63be8059083775c5fd351fec0cc2dc3e9f528714", size = 582388, upload-time = "2026-05-11T19:52:30.908Z" }, + { url = "https://files.pythonhosted.org/packages/45/b9/dc748a0e7d21ce2228241f6e8af96d297c80ab69c4c49429309b8fa3beb8/backports_zstd-1.5.0-cp311-cp311-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:ea969758af743000d822fc3a69dc9de059bbbb8d07d2f13e06ff49ac63cce74f", size = 642091, upload-time = "2026-05-11T19:52:32.397Z" }, + { url = "https://files.pythonhosted.org/packages/de/5f/02366ddae6e008d53df71605e4e3ca8dcea5d1dfcba29040b46883a23127/backports_zstd-1.5.0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:775ad82d268923639bc924013fc61561df376c148506b241f0f80718b5bb3a2f", size = 492256, upload-time = "2026-05-11T19:52:34.441Z" }, + { url = "https://files.pythonhosted.org/packages/c0/c7/c5e7824c17abc87dbb24c7c90dc43054d701533cf04d3531cb9b7105cdac/backports_zstd-1.5.0-cp311-cp311-manylinux_2_34_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:663128370bbc2ebcc436b8977bc434a7bf29919d92d91fee05ed6fb0fa807646", size = 566214, upload-time = "2026-05-11T19:52:35.962Z" }, + { url = "https://files.pythonhosted.org/packages/12/7b/ee7368c4ad8f5e00b3fd84fc566fb7714aa766c5672500793990e19efa00/backports_zstd-1.5.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:572c76832e9a24da4084befa52c23f4c03fede2aa250ae6250cbc5a11b980f69", size = 482666, upload-time = "2026-05-11T19:52:37.675Z" }, + { url = "https://files.pythonhosted.org/packages/77/36/2826f9f04b6c91d5f707f49188ac6f5ec7487b36d73caedfa20db3307826/backports_zstd-1.5.0-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:9410bcbcd3afd787a15a276d68f954d1703788c780faa421183a61d39da8b862", size = 510594, upload-time = "2026-05-11T19:52:39.501Z" }, + { url = "https://files.pythonhosted.org/packages/84/3b/95342baf0e301b7d06c6862389f8520a9d71f073a6c1a5b86182e7d89148/backports_zstd-1.5.0-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:0fab15e6895bef621041dd82d6306ffa24889257dd902c4b98b88e4260b3465d", size = 586713, upload-time = "2026-05-11T19:52:41.461Z" }, + { url = "https://files.pythonhosted.org/packages/bc/32/73d2b8f572960307406b084bb8932f4ebd9fcedb05d1502e04fecf25970a/backports_zstd-1.5.0-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:2ffde637b6d0082f1c3356657002469cf199c7c12d50d9822a55b13425c778d3", size = 564037, upload-time = "2026-05-11T19:52:43.15Z" }, + { url = "https://files.pythonhosted.org/packages/8f/a4/6e319fa7fa5851c3ca9701cbded9522c16018432a01a33a95cc0fccb6b4a/backports_zstd-1.5.0-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:c01d377c1489cb2230bf6a9ff01c73c42863cc96ee648c49923d4f6d4ea4e2d5", size = 632626, upload-time = "2026-05-11T19:52:45.017Z" }, + { url = "https://files.pythonhosted.org/packages/67/5c/10df0444db05f9276b286d230a3d6948ad47c593fc22925b8fe551d34b26/backports_zstd-1.5.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:4080bb9c8a51bb2bf8caf8018d78278cd49eb924cb06a54f56a411095e2ac912", size = 496270, upload-time = "2026-05-11T19:52:46.558Z" }, + { url = "https://files.pythonhosted.org/packages/f1/ad/6cd1de5cd858ac653833098f13a4643a4c9db484072350d3dbf299cc46f1/backports_zstd-1.5.0-cp311-cp311-win32.whl", hash = "sha256:9f4fe3fd82c8c6e8a9fdc5c71f92f9fe2442d02e7f59fddef25a955e189e3f38", size = 289754, upload-time = "2026-05-11T19:52:48.232Z" }, + { url = "https://files.pythonhosted.org/packages/1d/1b/df94ad1cb79705d717f7e1063da642c538a6d7ce6443c8e60355fa507ea4/backports_zstd-1.5.0-cp311-cp311-win_amd64.whl", hash = "sha256:e7c0372fa036751109604c70a8c87e59faaacc195d519c8cb9e0e527ee2b5478", size = 314829, upload-time = "2026-05-11T19:52:50.031Z" }, + { url = "https://files.pythonhosted.org/packages/e8/e7/24e60da7cc89b9ed1c5b474678e316dd0ddfe7cd1de39b23d04452ca5946/backports_zstd-1.5.0-cp311-cp311-win_arm64.whl", hash = "sha256:264a66137555bb4648f7e64cfc514d820758072684f373269fcdd2e8d4a90306", size = 291497, upload-time = "2026-05-11T19:52:51.729Z" }, + { url = "https://files.pythonhosted.org/packages/24/71/29ed213344f8f62b7520745d7df3752d88db456aff9d8b706bdf5eb99a3c/backports_zstd-1.5.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:1858cacdb3e50105a1b60acdc3dd5b18650077d12dce243e19d5c88e8172bd71", size = 437170, upload-time = "2026-05-11T19:52:53.204Z" }, + { url = "https://files.pythonhosted.org/packages/d0/e3/a58a3eb8fc54d4e3e4f684ed7b1f688da02e5bda5ae5e2809e94cf2ead2f/backports_zstd-1.5.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:ccffc0a1974ecc2cc42afa4c15f56d036a4b2bae0abc46e6ba9b3358d9b1c037", size = 363265, upload-time = "2026-05-11T19:52:55.153Z" }, + { url = "https://files.pythonhosted.org/packages/3f/03/9d13840d206dec1c4698c803f61c58379b3578cb9dc6140ba5fa4ce2f31d/backports_zstd-1.5.0-cp312-cp312-manylinux2010_i686.manylinux_2_12_i686.manylinux_2_28_i686.whl", hash = "sha256:ab3430ab4d4ac3fb1bc1e4174d137731e51363b6abd5e51a1599690fe9c7d61d", size = 507527, upload-time = "2026-05-11T19:52:57.256Z" }, + { url = "https://files.pythonhosted.org/packages/6a/8f/8dc4b5736dca218cbca9609549a8f6dc202990abdb49afdc6112442f5360/backports_zstd-1.5.0-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:c737c1cb4a10c2d0f6cba9a347522858094f0a737b4558c67a777bcaa4a795cd", size = 477352, upload-time = "2026-05-11T19:52:59.425Z" }, + { url = "https://files.pythonhosted.org/packages/96/2c/65a66976a761b5b62eacbaed5ed418c694b24b5c480399315d799751de62/backports_zstd-1.5.0-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:0379c66510681a6b2780d3f3ef2cff54d01204b52448d64bde1855d40f856a04", size = 582799, upload-time = "2026-05-11T19:53:01.303Z" }, + { url = "https://files.pythonhosted.org/packages/d3/e9/ee93a66cd28cb3ad7f3c04d1105325a5428671b18bd41ba9ed8b43bc44cf/backports_zstd-1.5.0-cp312-cp312-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:7c7474b291e264c9609358d3875cf539623f7a65339c2b533020992b1a4c095b", size = 641530, upload-time = "2026-05-11T19:53:03.082Z" }, + { url = "https://files.pythonhosted.org/packages/e4/4b/2cecd4d6679f175f28ae02022bd2050ff4023e38902fae104dbe2e231911/backports_zstd-1.5.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:bb73c22444617bc5a3abf32dd27b3f2085898cfe3b95e6855300e9189898a3bd", size = 495324, upload-time = "2026-05-11T19:53:05.005Z" }, + { url = "https://files.pythonhosted.org/packages/4d/20/ee21e4e791e31f38f7a70b3961eb64b350d9be802a335e7a04c02b41b197/backports_zstd-1.5.0-cp312-cp312-manylinux_2_34_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:6cd7f6c33afd89354f74469e315e72754e3040f91f7b685061e225d9e36e3e8e", size = 569796, upload-time = "2026-05-11T19:53:07.011Z" }, + { url = "https://files.pythonhosted.org/packages/76/da/86c9a2ea384885b60638b3e47113198449568d0e36ef3834d1f969623092/backports_zstd-1.5.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:2106309071f279b38d3663c55c7fed192733b4f332b50eb3fa707e54bad6967a", size = 483367, upload-time = "2026-05-11T19:53:08.674Z" }, + { url = "https://files.pythonhosted.org/packages/5d/f0/c95c6e4dd28fc314547782a482839e422283d62c2aaf45d30672109a4a1e/backports_zstd-1.5.0-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:56fffa80be74cb11ac843333bbdc56e466c87967706886b3efd6b16d83830d90", size = 510976, upload-time = "2026-05-11T19:53:10.339Z" }, + { url = "https://files.pythonhosted.org/packages/0e/a2/72777b7e1872228a13b09b0bf77ae6cf626008d462cc2e1a0ae64721fd55/backports_zstd-1.5.0-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:5e8b8251eec80e67e30ec79dfc5b3b1ada069b9ac48b56b102f3e2c6f8281062", size = 587190, upload-time = "2026-05-11T19:53:12.205Z" }, + { url = "https://files.pythonhosted.org/packages/f5/a1/db5d1aee59da308eadeaa189764a4ec68e98495c309a13dcb8da5718fef1/backports_zstd-1.5.0-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:f334dd17ffead361aa9090e40151bd123507ce213a62733121b7145c6711cbde", size = 567395, upload-time = "2026-05-11T19:53:14.245Z" }, + { url = "https://files.pythonhosted.org/packages/00/0f/39ca1a6e8c5c2dc81da9e06c44d1990cc464f4b16dae214e877afd7adfc0/backports_zstd-1.5.0-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:78cbfd061255fef6de5070a54e0f9c00e8aabad5c99dd2ad884a3a7d1acc09ae", size = 632048, upload-time = "2026-05-11T19:53:16.234Z" }, + { url = "https://files.pythonhosted.org/packages/73/fd/a438ee4fc615016dbe96112b709b6805ee19eb215f46e208c8fbce086d8d/backports_zstd-1.5.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:2f55d70df44f49d599e20033013bc1ae705202735c45d4bca8eb963b225e15fd", size = 499833, upload-time = "2026-05-11T19:53:17.85Z" }, + { url = "https://files.pythonhosted.org/packages/f7/42/f544fde4de32687e28c514288ae3c11106ba644e9dd580992cbd704bbb49/backports_zstd-1.5.0-cp312-cp312-win32.whl", hash = "sha256:a8b096e0383a3bcab34f8c97b79e1a52051189d11258bbc2bc1145997a15dd1d", size = 289876, upload-time = "2026-05-11T19:53:19.486Z" }, + { url = "https://files.pythonhosted.org/packages/ad/31/9c29cd3175892e5ee909f5e8d14707fa07815301ff24b5c697d1cea62a77/backports_zstd-1.5.0-cp312-cp312-win_amd64.whl", hash = "sha256:e2802899ba4ef1a062ffe4bb1292c5df32011a54b4c3004c54f46ec975f39554", size = 314933, upload-time = "2026-05-11T19:53:20.942Z" }, + { url = "https://files.pythonhosted.org/packages/11/ee/1a50acd6446c0d57c4f93ad6ce68e1a631ad920737a6b2d0bbbc47de7f42/backports_zstd-1.5.0-cp312-cp312-win_arm64.whl", hash = "sha256:3c0353e66942afbd45518788cfbd1e9e117828ceb390fa50517f46f291850d8e", size = 291665, upload-time = "2026-05-11T19:53:22.686Z" }, + { url = "https://files.pythonhosted.org/packages/c6/e6/252521e3a847eb200bc0a1d528542d651b9c8dc7953e231c39ed2890d5ff/backports_zstd-1.5.0-cp313-cp313-android_21_arm64_v8a.whl", hash = "sha256:02a57ee8598dd863c0b11c7af00042ce6bc045bf6f4249fa4c322c62614ca1fd", size = 400134, upload-time = "2026-05-11T19:53:24.28Z" }, + { url = "https://files.pythonhosted.org/packages/36/43/27ef105ffa2da3d52218d4a7b2e14037974283953b3ee790358af6e9b4df/backports_zstd-1.5.0-cp313-cp313-android_21_x86_64.whl", hash = "sha256:c56c11eb3173d540e1fb0216f7ab477cbd3a204eca41f5f329059ee8a5d2ad47", size = 454225, upload-time = "2026-05-11T19:53:25.874Z" }, + { url = "https://files.pythonhosted.org/packages/0e/c9/cdcba1244347500d00567ce2cd6bf04c92d1b0fb6405fb8e13c07715eb46/backports_zstd-1.5.0-cp313-cp313-ios_13_0_arm64_iphoneos.whl", hash = "sha256:ef98f632026aa8e6ce05d786977092798efbe78677aa71219f22d31787809c90", size = 357229, upload-time = "2026-05-11T19:53:27.661Z" }, + { url = "https://files.pythonhosted.org/packages/df/da/cea04dab3ffb940bde9a59866bde6f2594a7b3ef2948a63fb3898f73d311/backports_zstd-1.5.0-cp313-cp313-ios_13_0_arm64_iphonesimulator.whl", hash = "sha256:c3712300b18f9d07f788b03594b2f34dfad89d77df96938a640c5007522a6b69", size = 365907, upload-time = "2026-05-11T19:53:29.241Z" }, + { url = "https://files.pythonhosted.org/packages/da/c4/6a71df2e65033f9b7d8017d77ea2bb572fc2ebc814ea383fdcda4187597a/backports_zstd-1.5.0-cp313-cp313-ios_13_0_x86_64_iphonesimulator.whl", hash = "sha256:bdbc75d1f54df70b65bcfbc8aa0cac21475f79665bb045960af606dc07b56090", size = 446453, upload-time = "2026-05-11T19:53:30.888Z" }, + { url = "https://files.pythonhosted.org/packages/66/e7/f98ad1a6a249c27884df9d28cf6ebc3c368e0e3288a741c1d51a572bb3d7/backports_zstd-1.5.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:93d306300d25e59f1cbe98cda494bf295be03a20e8b2c5602ee5ddc03ded29f2", size = 436634, upload-time = "2026-05-11T19:53:32.484Z" }, + { url = "https://files.pythonhosted.org/packages/ba/42/d0393ecc64e2ab6ae1b5ca7edbe26e3fe5196885f15d6cc4bce7254e29cd/backports_zstd-1.5.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:305d2e4ae9a595d0fd9d5bea5a7a2163306c6c4dcc5eec35ecd5008219d4580e", size = 362867, upload-time = "2026-05-11T19:53:34.385Z" }, + { url = "https://files.pythonhosted.org/packages/41/fe/87aa9404763bada695d06e5cb9d0575bae033cbf3a2e4e3bd648760178f7/backports_zstd-1.5.0-cp313-cp313-manylinux2010_i686.manylinux_2_12_i686.manylinux_2_28_i686.whl", hash = "sha256:c8f0967bf8d806b250fb1e905a6b8190e7ae83656d5308989243f84e01fa3774", size = 506844, upload-time = "2026-05-11T19:53:36.023Z" }, + { url = "https://files.pythonhosted.org/packages/56/94/3af7ce637d148e0b0acb1298b61afe9a934ed425bad9ff05e87afbf6766d/backports_zstd-1.5.0-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:76b7314ca9a253171e3e9524960e9e6411997323cf10aecbbc330faa7a90278d", size = 476975, upload-time = "2026-05-11T19:53:37.885Z" }, + { url = "https://files.pythonhosted.org/packages/aa/6c/dc2aa1b48296ac6effc3bacb5a3061d40ed74bf73082dfe38eed2ba8362b/backports_zstd-1.5.0-cp313-cp313-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:b1d0bf16bba86b1071731ced389f184e8de61c1afcafa584244f7f726632f92f", size = 582496, upload-time = "2026-05-11T19:53:39.812Z" }, + { url = "https://files.pythonhosted.org/packages/f6/38/dd49d3dd27eda9b165ccd63d70538fea016a3e9e42923bbbc1d89fae8a43/backports_zstd-1.5.0-cp313-cp313-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:96709d27d406008575ef759405169d538040156704b457d8c0ac035127a46b67", size = 643257, upload-time = "2026-05-11T19:53:41.819Z" }, + { url = "https://files.pythonhosted.org/packages/59/75/78e819272450aec2462f97a1bceb90bde481f9dba435bf9e76d580b4dec4/backports_zstd-1.5.0-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:5737402c29b2bd5bc661d4cde08aed531ed326f2b59a7ad98dc07650dc99a2c9", size = 491958, upload-time = "2026-05-11T19:53:43.501Z" }, + { url = "https://files.pythonhosted.org/packages/62/ae/d860f9cf21cb59d583a12166353bf71a439538e2b669f4a7736e400ca596/backports_zstd-1.5.0-cp313-cp313-manylinux_2_34_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:2b65f37ddd375114dbf84658e7dd168e10f5a93394940bfefa7fafc2d3234450", size = 567198, upload-time = "2026-05-11T19:53:45.226Z" }, + { url = "https://files.pythonhosted.org/packages/38/7c/b175d4c9ff60f964c8f6dd43211de905227cfde5a41eb5f654df58483025/backports_zstd-1.5.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:4fae7825dde4f81c28b4c66b1e997f893e296c3f1668351952b3ed085eb9f8cd", size = 482792, upload-time = "2026-05-11T19:53:47.323Z" }, + { url = "https://files.pythonhosted.org/packages/eb/e3/f7b50cf891a10da5f9c412ed4a9c4a772df4d4186d98a41e75c9b462f148/backports_zstd-1.5.0-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:3aa10e77c0e712d2dfb950910b50591c2fb11f0f1328814e23acc0b4950766df", size = 510363, upload-time = "2026-05-11T19:53:49.523Z" }, + { url = "https://files.pythonhosted.org/packages/be/50/e7841fd4a65661d527697a0e2dab97295868965ccd4e3e12474472719a60/backports_zstd-1.5.0-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:518b2ef54ce0fee6d29379cfd64ef66e639456f1b18943466e929b19677f135f", size = 586917, upload-time = "2026-05-11T19:53:51.741Z" }, + { url = "https://files.pythonhosted.org/packages/c6/7c/57e985dbd621f0307b8c57cabb258eb976793f2aeaf8a5bc020e15b4a793/backports_zstd-1.5.0-cp313-cp313-musllinux_1_2_riscv64.whl", hash = "sha256:673a1e5fdaa6cb0c7a967eb33066b6dd564871b3498a93e11e2972998047d11f", size = 565004, upload-time = "2026-05-11T19:53:53.774Z" }, + { url = "https://files.pythonhosted.org/packages/2f/8f/855ffcd1ee0fcf44c3fe62e36db8e7362292d450cc7c4b3f43edccbcd37a/backports_zstd-1.5.0-cp313-cp313-musllinux_1_2_s390x.whl", hash = "sha256:1277c07ff2d731586aa05aebd946a1b30184620d886a735dd5d5bf94a4a1061e", size = 633737, upload-time = "2026-05-11T19:53:56.036Z" }, + { url = "https://files.pythonhosted.org/packages/20/39/c4129a03d268699200dfebe1ccab97c7c332d2794571afb372a62e4ed098/backports_zstd-1.5.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:aff334c7c38b4aea2a899f3138a99c1d58f0686ad7815c74bff506ecf4333296", size = 496309, upload-time = "2026-05-11T19:53:57.591Z" }, + { url = "https://files.pythonhosted.org/packages/8e/33/34152316dd244dcd43d5300ded3cf6e1b46d343e4e92620c23e533fa91df/backports_zstd-1.5.0-cp313-cp313-win32.whl", hash = "sha256:b932834c4d85360f46d1e7fbf3eee1e26ba594e0eb5c3ee1281e89bc1d48d06f", size = 289560, upload-time = "2026-05-11T19:53:59.274Z" }, + { url = "https://files.pythonhosted.org/packages/71/c5/f759bc87fd77c88f4fdad2d878535fb7e9537c6a05876d206e6690bf33c6/backports_zstd-1.5.0-cp313-cp313-win_amd64.whl", hash = "sha256:c71dfbeced720326a8917a6edf921c568dc2396228c6432205c6d7e7fe7f3707", size = 314812, upload-time = "2026-05-11T19:54:00.909Z" }, + { url = "https://files.pythonhosted.org/packages/47/96/d7970dbb2fef34b549b34146090f48f41903cc7268b1ed1c7542eaa1852e/backports_zstd-1.5.0-cp313-cp313-win_arm64.whl", hash = "sha256:7b5798b20ffff71ee4620a01f56fe0b50271724b4251db08c90a069446cc4752", size = 291411, upload-time = "2026-05-11T19:54:02.541Z" }, + { url = "https://files.pythonhosted.org/packages/89/92/8e8769e1e3ebec16d39f455e317a0f137a191b1f122853d0377c660666ce/backports_zstd-1.5.0-pp311-pypy311_pp73-macosx_10_15_x86_64.whl", hash = "sha256:0ca2d4ac4901eada2cfb86fda692e5d4a1e09485d9f2ec5777dc6cd3154b3b46", size = 410809, upload-time = "2026-05-11T19:54:14.117Z" }, + { url = "https://files.pythonhosted.org/packages/63/5c/741a2923020c45b85cad4dffffcb86dbfa2d4aaed27f18ee793428ef4c24/backports_zstd-1.5.0-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:20796211a623ec6e0061cef4d7cca760e9e0a0a951bb30dc9ba89ed4a3fea5e4", size = 340342, upload-time = "2026-05-11T19:54:16.165Z" }, + { url = "https://files.pythonhosted.org/packages/c8/3b/68c4fe8a551d3f47ed75ddcf15dc7c777bb9d869fc0e0f5b7cacc9f158f5/backports_zstd-1.5.0-pp311-pypy311_pp73-manylinux2010_i686.manylinux_2_12_i686.manylinux_2_28_i686.whl", hash = "sha256:5232cd2a58c60da4ceb0e09e42dbc579b92dda4a9301a756af0c738223a23487", size = 421476, upload-time = "2026-05-11T19:54:17.709Z" }, + { url = "https://files.pythonhosted.org/packages/a8/4d/ab5dcd6ab9a7ac02ec42c4507211da7dadb9498abb655115c296077e2b8b/backports_zstd-1.5.0-pp311-pypy311_pp73-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:012d88a9ae08f331e1adc03dfbda4ff2ae7f76ea62455975827b215677a11aec", size = 395020, upload-time = "2026-05-11T19:54:19.566Z" }, + { url = "https://files.pythonhosted.org/packages/55/aa/ec512a0d14552bbb4e75693f7065434b865956abd045ceb67f0574146241/backports_zstd-1.5.0-pp311-pypy311_pp73-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:cbb7d79f8e43b6e0e17616961e425b9f8b32d9933e1db69242baa6e21f44a978", size = 414985, upload-time = "2026-05-11T19:54:21.136Z" }, + { url = "https://files.pythonhosted.org/packages/aa/31/759d077aa680555e17c9d2bb09edf4c3428d895fe5d35a8df67684401b84/backports_zstd-1.5.0-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:6172dcdd664ef243e55a35e6b45f1c866767c61043f0ddcd908abd14df662065", size = 300853, upload-time = "2026-05-11T19:54:23.1Z" }, +] + +[[package]] +name = "beautifulsoup4" +version = "4.14.3" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "soupsieve" }, + { name = "typing-extensions" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/c3/b0/1c6a16426d389813b48d95e26898aff79abbde42ad353958ad95cc8c9b21/beautifulsoup4-4.14.3.tar.gz", hash = "sha256:6292b1c5186d356bba669ef9f7f051757099565ad9ada5dd630bd9de5fa7fb86", size = 627737, upload-time = "2025-11-30T15:08:26.084Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/1a/39/47f9197bdd44df24d67ac8893641e16f386c984a0619ef2ee4c51fbbc019/beautifulsoup4-4.14.3-py3-none-any.whl", hash = "sha256:0918bfe44902e6ad8d57732ba310582e98da931428d231a5ecb9e7c703a735bb", size = 107721, upload-time = "2025-11-30T15:08:24.087Z" }, +] + +[[package]] +name = "bibtexparser" +version = "1.4.4" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "pyparsing" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/44/1c/577d3ce406e88f370e80a6ebf76ae52a2866521e0b585e8ec612759894f1/bibtexparser-1.4.4.tar.gz", hash = "sha256:093b6c824f7a71d3a748867c4057b71f77c55b8dbc07efc993b781771520d8fb", size = 55594, upload-time = "2026-01-29T18:58:01.366Z" } + +[[package]] +name = "bleach" +version = "6.3.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "webencodings" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/07/18/3c8523962314be6bf4c8989c79ad9531c825210dd13a8669f6b84336e8bd/bleach-6.3.0.tar.gz", hash = "sha256:6f3b91b1c0a02bb9a78b5a454c92506aa0fdf197e1d5e114d2e00c6f64306d22", size = 203533, upload-time = "2025-10-27T17:57:39.211Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/cd/3a/577b549de0cc09d95f11087ee63c739bba856cd3952697eec4c4bb91350a/bleach-6.3.0-py3-none-any.whl", hash = "sha256:fe10ec77c93ddf3d13a73b035abaac7a9f5e436513864ccdad516693213c65d6", size = 164437, upload-time = "2025-10-27T17:57:37.538Z" }, +] + +[package.optional-dependencies] +css = [ + { name = "tinycss2" }, +] + +[[package]] +name = "blinker" +version = "1.9.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/21/28/9b3f50ce0e048515135495f198351908d99540d69bfdc8c1d15b73dc55ce/blinker-1.9.0.tar.gz", hash = "sha256:b4ce2265a7abece45e7cc896e98dbebe6cead56bcf805a3d23136d145f5445bf", size = 22460, upload-time = "2024-11-08T17:25:47.436Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/10/cb/f2ad4230dc2eb1a74edf38f1a38b9b52277f75bef262d8908e60d957e13c/blinker-1.9.0-py3-none-any.whl", hash = "sha256:ba0efaa9080b619ff2f3459d1d500c57bddea4a6b424b60a91141db6fd2f08bc", size = 8458, upload-time = "2024-11-08T17:25:46.184Z" }, +] + +[[package]] +name = "boltons" +version = "25.0.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/63/54/71a94d8e02da9a865587fb3fff100cb0fc7aa9f4d5ed9ed3a591216ddcc7/boltons-25.0.0.tar.gz", hash = "sha256:e110fbdc30b7b9868cb604e3f71d4722dd8f4dcb4a5ddd06028ba8f1ab0b5ace", size = 246294, upload-time = "2025-02-03T05:57:59.129Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/45/7f/0e961cf3908bc4c1c3e027de2794f867c6c89fb4916fc7dba295a0e80a2d/boltons-25.0.0-py3-none-any.whl", hash = "sha256:dc9fb38bf28985715497d1b54d00b62ea866eca3938938ea9043e254a3a6ca62", size = 194210, upload-time = "2025-02-03T05:57:56.705Z" }, +] + +[[package]] +name = "boto3" +version = "1.43.16" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "botocore" }, + { name = "jmespath" }, + { name = "s3transfer" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/48/4f/f13d80d377b54dd2973e243e4eb7ce748706cd53876361cc72506006fd8b/boto3-1.43.16.tar.gz", hash = "sha256:6c337bbe608aacc7d335c79e671f0c893870293b74d652f7a7af22ccd0dfef16", size = 113152, upload-time = "2026-05-27T19:31:39.899Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/af/c0/7d687e40f4b7046ede66026ecd1b0a93d47afe26d9170f5926a1605c8641/boto3-1.43.16-py3-none-any.whl", hash = "sha256:dffc8a3cd3edbc0ad95b9c6b983e873b76ede46d3aa0709f94db253f2ff2388f", size = 140537, upload-time = "2026-05-27T19:31:36.453Z" }, +] + +[[package]] +name = "botocore" +version = "1.43.16" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "jmespath" }, + { name = "python-dateutil" }, + { name = "urllib3" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/a1/74/140451a1fe027cb5e387cc7b1ec56224616ca742c330f1492f71c5cba3fb/botocore-1.43.16.tar.gz", hash = "sha256:813dae233d8b365c19aaf7865b32070e34d7e793654881bf86ecbbef3f4ad5c6", size = 15388648, upload-time = "2026-05-27T19:31:25.172Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/46/8f/25933240485c0662bb3fa430ed0c6b8b8124ab3bc136154c07ce12644cb0/botocore-1.43.16-py3-none-any.whl", hash = "sha256:8ab05b1346d26a3c6d69c7338051f07bd4739a090f414d2cff43c0dbc1e18ca7", size = 15067437, upload-time = "2026-05-27T19:31:19.212Z" }, +] + +[[package]] +name = "brotli" +version = "1.2.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/f7/16/c92ca344d646e71a43b8bb353f0a6490d7f6e06210f8554c8f874e454285/brotli-1.2.0.tar.gz", hash = "sha256:e310f77e41941c13340a95976fe66a8a95b01e783d430eeaf7a2f87e0a57dd0a", size = 7388632, upload-time = "2025-11-05T18:39:42.86Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/7a/ef/f285668811a9e1ddb47a18cb0b437d5fc2760d537a2fe8a57875ad6f8448/brotli-1.2.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:15b33fe93cedc4caaff8a0bd1eb7e3dab1c61bb22a0bf5bdfdfd97cd7da79744", size = 863110, upload-time = "2025-11-05T18:38:12.978Z" }, + { url = "https://files.pythonhosted.org/packages/50/62/a3b77593587010c789a9d6eaa527c79e0848b7b860402cc64bc0bc28a86c/brotli-1.2.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:898be2be399c221d2671d29eed26b6b2713a02c2119168ed914e7d00ceadb56f", size = 445438, upload-time = "2025-11-05T18:38:14.208Z" }, + { url = "https://files.pythonhosted.org/packages/cd/e1/7fadd47f40ce5549dc44493877db40292277db373da5053aff181656e16e/brotli-1.2.0-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:350c8348f0e76fff0a0fd6c26755d2653863279d086d3aa2c290a6a7251135dd", size = 1534420, upload-time = "2025-11-05T18:38:15.111Z" }, + { url = "https://files.pythonhosted.org/packages/12/8b/1ed2f64054a5a008a4ccd2f271dbba7a5fb1a3067a99f5ceadedd4c1d5a7/brotli-1.2.0-cp311-cp311-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:2e1ad3fda65ae0d93fec742a128d72e145c9c7a99ee2fcd667785d99eb25a7fe", size = 1632619, upload-time = "2025-11-05T18:38:16.094Z" }, + { url = "https://files.pythonhosted.org/packages/89/5a/7071a621eb2d052d64efd5da2ef55ecdac7c3b0c6e4f9d519e9c66d987ef/brotli-1.2.0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:40d918bce2b427a0c4ba189df7a006ac0c7277c180aee4617d99e9ccaaf59e6a", size = 1426014, upload-time = "2025-11-05T18:38:17.177Z" }, + { url = "https://files.pythonhosted.org/packages/26/6d/0971a8ea435af5156acaaccec1a505f981c9c80227633851f2810abd252a/brotli-1.2.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:2a7f1d03727130fc875448b65b127a9ec5d06d19d0148e7554384229706f9d1b", size = 1489661, upload-time = "2025-11-05T18:38:18.41Z" }, + { url = "https://files.pythonhosted.org/packages/f3/75/c1baca8b4ec6c96a03ef8230fab2a785e35297632f402ebb1e78a1e39116/brotli-1.2.0-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:9c79f57faa25d97900bfb119480806d783fba83cd09ee0b33c17623935b05fa3", size = 1599150, upload-time = "2025-11-05T18:38:19.792Z" }, + { url = "https://files.pythonhosted.org/packages/0d/1a/23fcfee1c324fd48a63d7ebf4bac3a4115bdb1b00e600f80f727d850b1ae/brotli-1.2.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:844a8ceb8483fefafc412f85c14f2aae2fb69567bf2a0de53cdb88b73e7c43ae", size = 1493505, upload-time = "2025-11-05T18:38:20.913Z" }, + { url = "https://files.pythonhosted.org/packages/36/e5/12904bbd36afeef53d45a84881a4810ae8810ad7e328a971ebbfd760a0b3/brotli-1.2.0-cp311-cp311-win32.whl", hash = "sha256:aa47441fa3026543513139cb8926a92a8e305ee9c71a6209ef7a97d91640ea03", size = 334451, upload-time = "2025-11-05T18:38:21.94Z" }, + { url = "https://files.pythonhosted.org/packages/02/8b/ecb5761b989629a4758c394b9301607a5880de61ee2ee5fe104b87149ebc/brotli-1.2.0-cp311-cp311-win_amd64.whl", hash = "sha256:022426c9e99fd65d9475dce5c195526f04bb8be8907607e27e747893f6ee3e24", size = 369035, upload-time = "2025-11-05T18:38:22.941Z" }, + { url = "https://files.pythonhosted.org/packages/11/ee/b0a11ab2315c69bb9b45a2aaed022499c9c24a205c3a49c3513b541a7967/brotli-1.2.0-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:35d382625778834a7f3061b15423919aa03e4f5da34ac8e02c074e4b75ab4f84", size = 861543, upload-time = "2025-11-05T18:38:24.183Z" }, + { url = "https://files.pythonhosted.org/packages/e1/2f/29c1459513cd35828e25531ebfcbf3e92a5e49f560b1777a9af7203eb46e/brotli-1.2.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:7a61c06b334bd99bc5ae84f1eeb36bfe01400264b3c352f968c6e30a10f9d08b", size = 444288, upload-time = "2025-11-05T18:38:25.139Z" }, + { url = "https://files.pythonhosted.org/packages/3d/6f/feba03130d5fceadfa3a1bb102cb14650798c848b1df2a808356f939bb16/brotli-1.2.0-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:acec55bb7c90f1dfc476126f9711a8e81c9af7fb617409a9ee2953115343f08d", size = 1528071, upload-time = "2025-11-05T18:38:26.081Z" }, + { url = "https://files.pythonhosted.org/packages/2b/38/f3abb554eee089bd15471057ba85f47e53a44a462cfce265d9bf7088eb09/brotli-1.2.0-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:260d3692396e1895c5034f204f0db022c056f9e2ac841593a4cf9426e2a3faca", size = 1626913, upload-time = "2025-11-05T18:38:27.284Z" }, + { url = "https://files.pythonhosted.org/packages/03/a7/03aa61fbc3c5cbf99b44d158665f9b0dd3d8059be16c460208d9e385c837/brotli-1.2.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:072e7624b1fc4d601036ab3f4f27942ef772887e876beff0301d261210bca97f", size = 1419762, upload-time = "2025-11-05T18:38:28.295Z" }, + { url = "https://files.pythonhosted.org/packages/21/1b/0374a89ee27d152a5069c356c96b93afd1b94eae83f1e004b57eb6ce2f10/brotli-1.2.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:adedc4a67e15327dfdd04884873c6d5a01d3e3b6f61406f99b1ed4865a2f6d28", size = 1484494, upload-time = "2025-11-05T18:38:29.29Z" }, + { url = "https://files.pythonhosted.org/packages/cf/57/69d4fe84a67aef4f524dcd075c6eee868d7850e85bf01d778a857d8dbe0a/brotli-1.2.0-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:7a47ce5c2288702e09dc22a44d0ee6152f2c7eda97b3c8482d826a1f3cfc7da7", size = 1593302, upload-time = "2025-11-05T18:38:30.639Z" }, + { url = "https://files.pythonhosted.org/packages/d5/3b/39e13ce78a8e9a621c5df3aeb5fd181fcc8caba8c48a194cd629771f6828/brotli-1.2.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:af43b8711a8264bb4e7d6d9a6d004c3a2019c04c01127a868709ec29962b6036", size = 1487913, upload-time = "2025-11-05T18:38:31.618Z" }, + { url = "https://files.pythonhosted.org/packages/62/28/4d00cb9bd76a6357a66fcd54b4b6d70288385584063f4b07884c1e7286ac/brotli-1.2.0-cp312-cp312-win32.whl", hash = "sha256:e99befa0b48f3cd293dafeacdd0d191804d105d279e0b387a32054c1180f3161", size = 334362, upload-time = "2025-11-05T18:38:32.939Z" }, + { url = "https://files.pythonhosted.org/packages/1c/4e/bc1dcac9498859d5e353c9b153627a3752868a9d5f05ce8dedd81a2354ab/brotli-1.2.0-cp312-cp312-win_amd64.whl", hash = "sha256:b35c13ce241abdd44cb8ca70683f20c0c079728a36a996297adb5334adfc1c44", size = 369115, upload-time = "2025-11-05T18:38:33.765Z" }, + { url = "https://files.pythonhosted.org/packages/6c/d4/4ad5432ac98c73096159d9ce7ffeb82d151c2ac84adcc6168e476bb54674/brotli-1.2.0-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:9e5825ba2c9998375530504578fd4d5d1059d09621a02065d1b6bfc41a8e05ab", size = 861523, upload-time = "2025-11-05T18:38:34.67Z" }, + { url = "https://files.pythonhosted.org/packages/91/9f/9cc5bd03ee68a85dc4bc89114f7067c056a3c14b3d95f171918c088bf88d/brotli-1.2.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:0cf8c3b8ba93d496b2fae778039e2f5ecc7cff99df84df337ca31d8f2252896c", size = 444289, upload-time = "2025-11-05T18:38:35.6Z" }, + { url = "https://files.pythonhosted.org/packages/2e/b6/fe84227c56a865d16a6614e2c4722864b380cb14b13f3e6bef441e73a85a/brotli-1.2.0-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:c8565e3cdc1808b1a34714b553b262c5de5fbda202285782173ec137fd13709f", size = 1528076, upload-time = "2025-11-05T18:38:36.639Z" }, + { url = "https://files.pythonhosted.org/packages/55/de/de4ae0aaca06c790371cf6e7ee93a024f6b4bb0568727da8c3de112e726c/brotli-1.2.0-cp313-cp313-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:26e8d3ecb0ee458a9804f47f21b74845cc823fd1bb19f02272be70774f56e2a6", size = 1626880, upload-time = "2025-11-05T18:38:37.623Z" }, + { url = "https://files.pythonhosted.org/packages/5f/16/a1b22cbea436642e071adcaf8d4b350a2ad02f5e0ad0da879a1be16188a0/brotli-1.2.0-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:67a91c5187e1eec76a61625c77a6c8c785650f5b576ca732bd33ef58b0dff49c", size = 1419737, upload-time = "2025-11-05T18:38:38.729Z" }, + { url = "https://files.pythonhosted.org/packages/46/63/c968a97cbb3bdbf7f974ef5a6ab467a2879b82afbc5ffb65b8acbb744f95/brotli-1.2.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:4ecdb3b6dc36e6d6e14d3a1bdc6c1057c8cbf80db04031d566eb6080ce283a48", size = 1484440, upload-time = "2025-11-05T18:38:39.916Z" }, + { url = "https://files.pythonhosted.org/packages/06/9d/102c67ea5c9fc171f423e8399e585dabea29b5bc79b05572891e70013cdd/brotli-1.2.0-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:3e1b35d56856f3ed326b140d3c6d9db91740f22e14b06e840fe4bb1923439a18", size = 1593313, upload-time = "2025-11-05T18:38:41.24Z" }, + { url = "https://files.pythonhosted.org/packages/9e/4a/9526d14fa6b87bc827ba1755a8440e214ff90de03095cacd78a64abe2b7d/brotli-1.2.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:54a50a9dad16b32136b2241ddea9e4df159b41247b2ce6aac0b3276a66a8f1e5", size = 1487945, upload-time = "2025-11-05T18:38:42.277Z" }, + { url = "https://files.pythonhosted.org/packages/5b/e8/3fe1ffed70cbef83c5236166acaed7bb9c766509b157854c80e2f766b38c/brotli-1.2.0-cp313-cp313-win32.whl", hash = "sha256:1b1d6a4efedd53671c793be6dd760fcf2107da3a52331ad9ea429edf0902f27a", size = 334368, upload-time = "2025-11-05T18:38:43.345Z" }, + { url = "https://files.pythonhosted.org/packages/ff/91/e739587be970a113b37b821eae8097aac5a48e5f0eca438c22e4c7dd8648/brotli-1.2.0-cp313-cp313-win_amd64.whl", hash = "sha256:b63daa43d82f0cdabf98dee215b375b4058cce72871fd07934f179885aad16e8", size = 369116, upload-time = "2025-11-05T18:38:44.609Z" }, + { url = "https://files.pythonhosted.org/packages/17/e1/298c2ddf786bb7347a1cd71d63a347a79e5712a7c0cba9e3c3458ebd976f/brotli-1.2.0-cp314-cp314-macosx_10_15_universal2.whl", hash = "sha256:6c12dad5cd04530323e723787ff762bac749a7b256a5bece32b2243dd5c27b21", size = 863080, upload-time = "2025-11-05T18:38:45.503Z" }, + { url = "https://files.pythonhosted.org/packages/84/0c/aac98e286ba66868b2b3b50338ffbd85a35c7122e9531a73a37a29763d38/brotli-1.2.0-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:3219bd9e69868e57183316ee19c84e03e8f8b5a1d1f2667e1aa8c2f91cb061ac", size = 445453, upload-time = "2025-11-05T18:38:46.433Z" }, + { url = "https://files.pythonhosted.org/packages/ec/f1/0ca1f3f99ae300372635ab3fe2f7a79fa335fee3d874fa7f9e68575e0e62/brotli-1.2.0-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:963a08f3bebd8b75ac57661045402da15991468a621f014be54e50f53a58d19e", size = 1528168, upload-time = "2025-11-05T18:38:47.371Z" }, + { url = "https://files.pythonhosted.org/packages/d6/a6/2ebfc8f766d46df8d3e65b880a2e220732395e6d7dc312c1e1244b0f074a/brotli-1.2.0-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:9322b9f8656782414b37e6af884146869d46ab85158201d82bab9abbcb971dc7", size = 1627098, upload-time = "2025-11-05T18:38:48.385Z" }, + { url = "https://files.pythonhosted.org/packages/f3/2f/0976d5b097ff8a22163b10617f76b2557f15f0f39d6a0fe1f02b1a53e92b/brotli-1.2.0-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:cf9cba6f5b78a2071ec6fb1e7bd39acf35071d90a81231d67e92d637776a6a63", size = 1419861, upload-time = "2025-11-05T18:38:49.372Z" }, + { url = "https://files.pythonhosted.org/packages/9c/97/d76df7176a2ce7616ff94c1fb72d307c9a30d2189fe877f3dd99af00ea5a/brotli-1.2.0-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:7547369c4392b47d30a3467fe8c3330b4f2e0f7730e45e3103d7d636678a808b", size = 1484594, upload-time = "2025-11-05T18:38:50.655Z" }, + { url = "https://files.pythonhosted.org/packages/d3/93/14cf0b1216f43df5609f5b272050b0abd219e0b54ea80b47cef9867b45e7/brotli-1.2.0-cp314-cp314-musllinux_1_2_ppc64le.whl", hash = "sha256:fc1530af5c3c275b8524f2e24841cbe2599d74462455e9bae5109e9ff42e9361", size = 1593455, upload-time = "2025-11-05T18:38:51.624Z" }, + { url = "https://files.pythonhosted.org/packages/b3/73/3183c9e41ca755713bdf2cc1d0810df742c09484e2e1ddd693bee53877c1/brotli-1.2.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:d2d085ded05278d1c7f65560aae97b3160aeb2ea2c0b3e26204856beccb60888", size = 1488164, upload-time = "2025-11-05T18:38:53.079Z" }, + { url = "https://files.pythonhosted.org/packages/64/6a/0c78d8f3a582859236482fd9fa86a65a60328a00983006bcf6d83b7b2253/brotli-1.2.0-cp314-cp314-win32.whl", hash = "sha256:832c115a020e463c2f67664560449a7bea26b0c1fdd690352addad6d0a08714d", size = 339280, upload-time = "2025-11-05T18:38:54.02Z" }, + { url = "https://files.pythonhosted.org/packages/f5/10/56978295c14794b2c12007b07f3e41ba26acda9257457d7085b0bb3bb90c/brotli-1.2.0-cp314-cp314-win_amd64.whl", hash = "sha256:e7c0af964e0b4e3412a0ebf341ea26ec767fa0b4cf81abb5e897c9338b5ad6a3", size = 375639, upload-time = "2025-11-05T18:38:55.67Z" }, +] + +[[package]] +name = "brotlicffi" +version = "1.2.0.1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "cffi" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/8a/b6/017dc5f852ed9b8735af77774509271acbf1de02d238377667145fcee01d/brotlicffi-1.2.0.1.tar.gz", hash = "sha256:c20d5c596278307ad06414a6d95a892377ea274a5c6b790c2548c009385d621c", size = 478156, upload-time = "2026-03-05T19:54:11.547Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/ef/f9/dfa56316837fa798eac19358351e974de8e1e2ca9475af4cb90293cd6576/brotlicffi-1.2.0.1-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:2c85e65913cf2b79c57a3fdd05b98d9731d9255dc0cb696b09376cc091b9cddd", size = 433046, upload-time = "2026-03-05T19:53:46.209Z" }, + { url = "https://files.pythonhosted.org/packages/4a/f5/f8f492158c76b0d940388801f04f747028971ad5774287bded5f1e53f08d/brotlicffi-1.2.0.1-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:535f2d05d0273408abc13fc0eebb467afac17b0ad85090c8913690d40207dac5", size = 1541126, upload-time = "2026-03-05T19:53:48.248Z" }, + { url = "https://files.pythonhosted.org/packages/3b/e1/ff87af10ac419600c63e9287a0649c673673ae6b4f2bcf48e96cb2f89f60/brotlicffi-1.2.0.1-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:ce17eb798ca59ecec67a9bb3fd7a4304e120d1cd02953ce522d959b9a84d58ac", size = 1541983, upload-time = "2026-03-05T19:53:50.317Z" }, + { url = "https://files.pythonhosted.org/packages/47/c0/80ecd9bd45776109fab14040e478bf63e456967c9ddee2353d8330ed8de1/brotlicffi-1.2.0.1-cp314-cp314t-win32.whl", hash = "sha256:3c9544f83cb715d95d7eab3af4adbbef8b2093ad6382288a83b3a25feb1a57ec", size = 349047, upload-time = "2026-03-05T19:53:52.215Z" }, + { url = "https://files.pythonhosted.org/packages/ab/98/13e5b250236a281b6cd9e92a01ee1ae231029fa78faee932ef3766e1cb24/brotlicffi-1.2.0.1-cp314-cp314t-win_amd64.whl", hash = "sha256:625f8115d32ae9c0740d01ea51518437c3fbaa3e78d41cb18459f6f7ac326000", size = 385652, upload-time = "2026-03-05T19:53:53.892Z" }, + { url = "https://files.pythonhosted.org/packages/9a/9f/b98dcd4af47994cee97aebac866996a006a2e5fc1fd1e2b82a8ad95cf09c/brotlicffi-1.2.0.1-cp38-abi3-macosx_11_0_arm64.whl", hash = "sha256:91ba5f0ccc040f6ff8f7efaf839f797723d03ed46acb8ae9408f99ffd2572cf4", size = 432608, upload-time = "2026-03-05T19:53:56.736Z" }, + { url = "https://files.pythonhosted.org/packages/b1/7a/ac4ee56595a061e3718a6d1ea7e921f4df156894acffb28ed88a1fd52022/brotlicffi-1.2.0.1-cp38-abi3-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:be9a670c6811af30a4bd42d7116dc5895d3b41beaa8ed8a89050447a0181f5ce", size = 1534257, upload-time = "2026-03-05T19:53:58.667Z" }, + { url = "https://files.pythonhosted.org/packages/99/39/e7410db7f6f56de57744ea52a115084ceb2735f4d44973f349bb92136586/brotlicffi-1.2.0.1-cp38-abi3-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:6f3314a3476f59e5443f9f72a6dff16edc0c3463c9b318feaef04ae3e4683f5a", size = 1536838, upload-time = "2026-03-05T19:54:00.705Z" }, + { url = "https://files.pythonhosted.org/packages/a6/75/6e7977d1935fc3fbb201cbd619be8f2c7aea25d40a096967132854b34708/brotlicffi-1.2.0.1-cp38-abi3-win32.whl", hash = "sha256:82ea52e2b5d3145b6c406ebd3efb0d55db718b7ad996bd70c62cec0439de1187", size = 343337, upload-time = "2026-03-05T19:54:02.446Z" }, + { url = "https://files.pythonhosted.org/packages/d8/ef/e7e485ce5e4ba3843a0a92feb767c7b6098fd6e65ce752918074d175ae71/brotlicffi-1.2.0.1-cp38-abi3-win_amd64.whl", hash = "sha256:da2e82a08e7778b8bc539d27ca03cdd684113e81394bfaaad8d0dfc6a17ddede", size = 379026, upload-time = "2026-03-05T19:54:04.322Z" }, + { url = "https://files.pythonhosted.org/packages/7f/53/6262c2256513e6f530d81642477cb19367270922063eaa2d7b781d8c723d/brotlicffi-1.2.0.1-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:e015af99584c6db1490a69a210c765953e473e63adc2d891ac3062a737c9e851", size = 402265, upload-time = "2026-03-05T19:54:05.858Z" }, + { url = "https://files.pythonhosted.org/packages/1f/d9/d5340b43cf5fbe7fe5a083d237e5338cc1caa73bea523be1c5e452c26290/brotlicffi-1.2.0.1-pp311-pypy311_pp73-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:37cb587d32bf7168e2218c455e22e409ad1f3157c6c71945879a311f3e6b6abf", size = 406710, upload-time = "2026-03-05T19:54:07.272Z" }, + { url = "https://files.pythonhosted.org/packages/a3/82/dbced4c1e0792efdf23fd90ff6d2a320c64ff4dfef7aacc85c04fde9ddd2/brotlicffi-1.2.0.1-pp311-pypy311_pp73-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:9d6ba65dd528892b4d9960beba2ae011a753620bcfc66cf6fa3cee18d7b0baa4", size = 402787, upload-time = "2026-03-05T19:54:08.73Z" }, + { url = "https://files.pythonhosted.org/packages/ef/6f/534205ba7590c9a8716a614f270c5c2ec419b5b7079b3f9cd31b7b5580de/brotlicffi-1.2.0.1-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:f2a5575653b0672638ba039b82fda56854934d7a6a24d4b8b5033f73ab43cbc1", size = 375108, upload-time = "2026-03-05T19:54:10.079Z" }, +] + +[[package]] +name = "bytecode" +version = "0.17.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/98/c4/4818b392104bd426171fc2ce9c79c8edb4019ba6505747626d0f7107766c/bytecode-0.17.0.tar.gz", hash = "sha256:0c37efa5bd158b1b873f530cceea2c645611d55bd2dc2a4758b09f185749b6fd", size = 105863, upload-time = "2025-09-03T19:55:45.703Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/ce/80/379e685099841f8501a19fb58b496512ef432331fed38276c3938ab09d8e/bytecode-0.17.0-py3-none-any.whl", hash = "sha256:64fb10cde1db7ef5cc39bd414ecebd54ba3b40e1c4cf8121ca5e72f170916ff8", size = 43045, upload-time = "2025-09-03T19:55:43.879Z" }, +] + +[[package]] +name = "certifi" +version = "2026.5.20" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/f3/ce/ee2ecad540810a79593028e88299baeae54d346cc7a0d94b6199988b89b1/certifi-2026.5.20.tar.gz", hash = "sha256:69dea482ab64caa7b9f6aba1c6bf48bb6a5448d1c0f1b17ab42ad8c763a5344d", size = 135422, upload-time = "2026-05-20T11:46:50.073Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/59/8c/57e832b7af6d7c5abe66eb3fbe3a3a32f4d11ea23a1aa7131371035be991/certifi-2026.5.20-py3-none-any.whl", hash = "sha256:3c52e209ba0a4ad7aebe60436a4ab349c39e1e602e8c134221e546902ad25897", size = 134134, upload-time = "2026-05-20T11:46:48.578Z" }, +] + +[[package]] +name = "cffi" +version = "2.0.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "pycparser", marker = "implementation_name != 'PyPy'" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/eb/56/b1ba7935a17738ae8453301356628e8147c79dbb825bcbc73dc7401f9846/cffi-2.0.0.tar.gz", hash = "sha256:44d1b5909021139fe36001ae048dbdde8214afa20200eda0f64c068cac5d5529", size = 523588, upload-time = "2025-09-08T23:24:04.541Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/12/4a/3dfd5f7850cbf0d06dc84ba9aa00db766b52ca38d8b86e3a38314d52498c/cffi-2.0.0-cp311-cp311-macosx_10_13_x86_64.whl", hash = "sha256:b4c854ef3adc177950a8dfc81a86f5115d2abd545751a304c5bcf2c2c7283cfe", size = 184344, upload-time = "2025-09-08T23:22:26.456Z" }, + { url = "https://files.pythonhosted.org/packages/4f/8b/f0e4c441227ba756aafbe78f117485b25bb26b1c059d01f137fa6d14896b/cffi-2.0.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:2de9a304e27f7596cd03d16f1b7c72219bd944e99cc52b84d0145aefb07cbd3c", size = 180560, upload-time = "2025-09-08T23:22:28.197Z" }, + { url = "https://files.pythonhosted.org/packages/b1/b7/1200d354378ef52ec227395d95c2576330fd22a869f7a70e88e1447eb234/cffi-2.0.0-cp311-cp311-manylinux1_i686.manylinux2014_i686.manylinux_2_17_i686.manylinux_2_5_i686.whl", hash = "sha256:baf5215e0ab74c16e2dd324e8ec067ef59e41125d3eade2b863d294fd5035c92", size = 209613, upload-time = "2025-09-08T23:22:29.475Z" }, + { url = "https://files.pythonhosted.org/packages/b8/56/6033f5e86e8cc9bb629f0077ba71679508bdf54a9a5e112a3c0b91870332/cffi-2.0.0-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:730cacb21e1bdff3ce90babf007d0a0917cc3e6492f336c2f0134101e0944f93", size = 216476, upload-time = "2025-09-08T23:22:31.063Z" }, + { url = "https://files.pythonhosted.org/packages/dc/7f/55fecd70f7ece178db2f26128ec41430d8720f2d12ca97bf8f0a628207d5/cffi-2.0.0-cp311-cp311-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:6824f87845e3396029f3820c206e459ccc91760e8fa24422f8b0c3d1731cbec5", size = 203374, upload-time = "2025-09-08T23:22:32.507Z" }, + { url = "https://files.pythonhosted.org/packages/84/ef/a7b77c8bdc0f77adc3b46888f1ad54be8f3b7821697a7b89126e829e676a/cffi-2.0.0-cp311-cp311-manylinux2014_s390x.manylinux_2_17_s390x.whl", hash = "sha256:9de40a7b0323d889cf8d23d1ef214f565ab154443c42737dfe52ff82cf857664", size = 202597, upload-time = "2025-09-08T23:22:34.132Z" }, + { url = "https://files.pythonhosted.org/packages/d7/91/500d892b2bf36529a75b77958edfcd5ad8e2ce4064ce2ecfeab2125d72d1/cffi-2.0.0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:8941aaadaf67246224cee8c3803777eed332a19d909b47e29c9842ef1e79ac26", size = 215574, upload-time = "2025-09-08T23:22:35.443Z" }, + { url = "https://files.pythonhosted.org/packages/44/64/58f6255b62b101093d5df22dcb752596066c7e89dd725e0afaed242a61be/cffi-2.0.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:a05d0c237b3349096d3981b727493e22147f934b20f6f125a3eba8f994bec4a9", size = 218971, upload-time = "2025-09-08T23:22:36.805Z" }, + { url = "https://files.pythonhosted.org/packages/ab/49/fa72cebe2fd8a55fbe14956f9970fe8eb1ac59e5df042f603ef7c8ba0adc/cffi-2.0.0-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:94698a9c5f91f9d138526b48fe26a199609544591f859c870d477351dc7b2414", size = 211972, upload-time = "2025-09-08T23:22:38.436Z" }, + { url = "https://files.pythonhosted.org/packages/0b/28/dd0967a76aab36731b6ebfe64dec4e981aff7e0608f60c2d46b46982607d/cffi-2.0.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:5fed36fccc0612a53f1d4d9a816b50a36702c28a2aa880cb8a122b3466638743", size = 217078, upload-time = "2025-09-08T23:22:39.776Z" }, + { url = "https://files.pythonhosted.org/packages/2b/c0/015b25184413d7ab0a410775fdb4a50fca20f5589b5dab1dbbfa3baad8ce/cffi-2.0.0-cp311-cp311-win32.whl", hash = "sha256:c649e3a33450ec82378822b3dad03cc228b8f5963c0c12fc3b1e0ab940f768a5", size = 172076, upload-time = "2025-09-08T23:22:40.95Z" }, + { url = "https://files.pythonhosted.org/packages/ae/8f/dc5531155e7070361eb1b7e4c1a9d896d0cb21c49f807a6c03fd63fc877e/cffi-2.0.0-cp311-cp311-win_amd64.whl", hash = "sha256:66f011380d0e49ed280c789fbd08ff0d40968ee7b665575489afa95c98196ab5", size = 182820, upload-time = "2025-09-08T23:22:42.463Z" }, + { url = "https://files.pythonhosted.org/packages/95/5c/1b493356429f9aecfd56bc171285a4c4ac8697f76e9bbbbb105e537853a1/cffi-2.0.0-cp311-cp311-win_arm64.whl", hash = "sha256:c6638687455baf640e37344fe26d37c404db8b80d037c3d29f58fe8d1c3b194d", size = 177635, upload-time = "2025-09-08T23:22:43.623Z" }, + { url = "https://files.pythonhosted.org/packages/ea/47/4f61023ea636104d4f16ab488e268b93008c3d0bb76893b1b31db1f96802/cffi-2.0.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:6d02d6655b0e54f54c4ef0b94eb6be0607b70853c45ce98bd278dc7de718be5d", size = 185271, upload-time = "2025-09-08T23:22:44.795Z" }, + { url = "https://files.pythonhosted.org/packages/df/a2/781b623f57358e360d62cdd7a8c681f074a71d445418a776eef0aadb4ab4/cffi-2.0.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:8eca2a813c1cb7ad4fb74d368c2ffbbb4789d377ee5bb8df98373c2cc0dee76c", size = 181048, upload-time = "2025-09-08T23:22:45.938Z" }, + { url = "https://files.pythonhosted.org/packages/ff/df/a4f0fbd47331ceeba3d37c2e51e9dfc9722498becbeec2bd8bc856c9538a/cffi-2.0.0-cp312-cp312-manylinux1_i686.manylinux2014_i686.manylinux_2_17_i686.manylinux_2_5_i686.whl", hash = "sha256:21d1152871b019407d8ac3985f6775c079416c282e431a4da6afe7aefd2bccbe", size = 212529, upload-time = "2025-09-08T23:22:47.349Z" }, + { url = "https://files.pythonhosted.org/packages/d5/72/12b5f8d3865bf0f87cf1404d8c374e7487dcf097a1c91c436e72e6badd83/cffi-2.0.0-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:b21e08af67b8a103c71a250401c78d5e0893beff75e28c53c98f4de42f774062", size = 220097, upload-time = "2025-09-08T23:22:48.677Z" }, + { url = "https://files.pythonhosted.org/packages/c2/95/7a135d52a50dfa7c882ab0ac17e8dc11cec9d55d2c18dda414c051c5e69e/cffi-2.0.0-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:1e3a615586f05fc4065a8b22b8152f0c1b00cdbc60596d187c2a74f9e3036e4e", size = 207983, upload-time = "2025-09-08T23:22:50.06Z" }, + { url = "https://files.pythonhosted.org/packages/3a/c8/15cb9ada8895957ea171c62dc78ff3e99159ee7adb13c0123c001a2546c1/cffi-2.0.0-cp312-cp312-manylinux2014_s390x.manylinux_2_17_s390x.whl", hash = "sha256:81afed14892743bbe14dacb9e36d9e0e504cd204e0b165062c488942b9718037", size = 206519, upload-time = "2025-09-08T23:22:51.364Z" }, + { url = "https://files.pythonhosted.org/packages/78/2d/7fa73dfa841b5ac06c7b8855cfc18622132e365f5b81d02230333ff26e9e/cffi-2.0.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:3e17ed538242334bf70832644a32a7aae3d83b57567f9fd60a26257e992b79ba", size = 219572, upload-time = "2025-09-08T23:22:52.902Z" }, + { url = "https://files.pythonhosted.org/packages/07/e0/267e57e387b4ca276b90f0434ff88b2c2241ad72b16d31836adddfd6031b/cffi-2.0.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:3925dd22fa2b7699ed2617149842d2e6adde22b262fcbfada50e3d195e4b3a94", size = 222963, upload-time = "2025-09-08T23:22:54.518Z" }, + { url = "https://files.pythonhosted.org/packages/b6/75/1f2747525e06f53efbd878f4d03bac5b859cbc11c633d0fb81432d98a795/cffi-2.0.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:2c8f814d84194c9ea681642fd164267891702542f028a15fc97d4674b6206187", size = 221361, upload-time = "2025-09-08T23:22:55.867Z" }, + { url = "https://files.pythonhosted.org/packages/7b/2b/2b6435f76bfeb6bbf055596976da087377ede68df465419d192acf00c437/cffi-2.0.0-cp312-cp312-win32.whl", hash = "sha256:da902562c3e9c550df360bfa53c035b2f241fed6d9aef119048073680ace4a18", size = 172932, upload-time = "2025-09-08T23:22:57.188Z" }, + { url = "https://files.pythonhosted.org/packages/f8/ed/13bd4418627013bec4ed6e54283b1959cf6db888048c7cf4b4c3b5b36002/cffi-2.0.0-cp312-cp312-win_amd64.whl", hash = "sha256:da68248800ad6320861f129cd9c1bf96ca849a2771a59e0344e88681905916f5", size = 183557, upload-time = "2025-09-08T23:22:58.351Z" }, + { url = "https://files.pythonhosted.org/packages/95/31/9f7f93ad2f8eff1dbc1c3656d7ca5bfd8fb52c9d786b4dcf19b2d02217fa/cffi-2.0.0-cp312-cp312-win_arm64.whl", hash = "sha256:4671d9dd5ec934cb9a73e7ee9676f9362aba54f7f34910956b84d727b0d73fb6", size = 177762, upload-time = "2025-09-08T23:22:59.668Z" }, + { url = "https://files.pythonhosted.org/packages/4b/8d/a0a47a0c9e413a658623d014e91e74a50cdd2c423f7ccfd44086ef767f90/cffi-2.0.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:00bdf7acc5f795150faa6957054fbbca2439db2f775ce831222b66f192f03beb", size = 185230, upload-time = "2025-09-08T23:23:00.879Z" }, + { url = "https://files.pythonhosted.org/packages/4a/d2/a6c0296814556c68ee32009d9c2ad4f85f2707cdecfd7727951ec228005d/cffi-2.0.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:45d5e886156860dc35862657e1494b9bae8dfa63bf56796f2fb56e1679fc0bca", size = 181043, upload-time = "2025-09-08T23:23:02.231Z" }, + { url = "https://files.pythonhosted.org/packages/b0/1e/d22cc63332bd59b06481ceaac49d6c507598642e2230f201649058a7e704/cffi-2.0.0-cp313-cp313-manylinux1_i686.manylinux2014_i686.manylinux_2_17_i686.manylinux_2_5_i686.whl", hash = "sha256:07b271772c100085dd28b74fa0cd81c8fb1a3ba18b21e03d7c27f3436a10606b", size = 212446, upload-time = "2025-09-08T23:23:03.472Z" }, + { url = "https://files.pythonhosted.org/packages/a9/f5/a2c23eb03b61a0b8747f211eb716446c826ad66818ddc7810cc2cc19b3f2/cffi-2.0.0-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:d48a880098c96020b02d5a1f7d9251308510ce8858940e6fa99ece33f610838b", size = 220101, upload-time = "2025-09-08T23:23:04.792Z" }, + { url = "https://files.pythonhosted.org/packages/f2/7f/e6647792fc5850d634695bc0e6ab4111ae88e89981d35ac269956605feba/cffi-2.0.0-cp313-cp313-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:f93fd8e5c8c0a4aa1f424d6173f14a892044054871c771f8566e4008eaa359d2", size = 207948, upload-time = "2025-09-08T23:23:06.127Z" }, + { url = "https://files.pythonhosted.org/packages/cb/1e/a5a1bd6f1fb30f22573f76533de12a00bf274abcdc55c8edab639078abb6/cffi-2.0.0-cp313-cp313-manylinux2014_s390x.manylinux_2_17_s390x.whl", hash = "sha256:dd4f05f54a52fb558f1ba9f528228066954fee3ebe629fc1660d874d040ae5a3", size = 206422, upload-time = "2025-09-08T23:23:07.753Z" }, + { url = "https://files.pythonhosted.org/packages/98/df/0a1755e750013a2081e863e7cd37e0cdd02664372c754e5560099eb7aa44/cffi-2.0.0-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:c8d3b5532fc71b7a77c09192b4a5a200ea992702734a2e9279a37f2478236f26", size = 219499, upload-time = "2025-09-08T23:23:09.648Z" }, + { url = "https://files.pythonhosted.org/packages/50/e1/a969e687fcf9ea58e6e2a928ad5e2dd88cc12f6f0ab477e9971f2309b57c/cffi-2.0.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:d9b29c1f0ae438d5ee9acb31cadee00a58c46cc9c0b2f9038c6b0b3470877a8c", size = 222928, upload-time = "2025-09-08T23:23:10.928Z" }, + { url = "https://files.pythonhosted.org/packages/36/54/0362578dd2c9e557a28ac77698ed67323ed5b9775ca9d3fe73fe191bb5d8/cffi-2.0.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:6d50360be4546678fc1b79ffe7a66265e28667840010348dd69a314145807a1b", size = 221302, upload-time = "2025-09-08T23:23:12.42Z" }, + { url = "https://files.pythonhosted.org/packages/eb/6d/bf9bda840d5f1dfdbf0feca87fbdb64a918a69bca42cfa0ba7b137c48cb8/cffi-2.0.0-cp313-cp313-win32.whl", hash = "sha256:74a03b9698e198d47562765773b4a8309919089150a0bb17d829ad7b44b60d27", size = 172909, upload-time = "2025-09-08T23:23:14.32Z" }, + { url = "https://files.pythonhosted.org/packages/37/18/6519e1ee6f5a1e579e04b9ddb6f1676c17368a7aba48299c3759bbc3c8b3/cffi-2.0.0-cp313-cp313-win_amd64.whl", hash = "sha256:19f705ada2530c1167abacb171925dd886168931e0a7b78f5bffcae5c6b5be75", size = 183402, upload-time = "2025-09-08T23:23:15.535Z" }, + { url = "https://files.pythonhosted.org/packages/cb/0e/02ceeec9a7d6ee63bb596121c2c8e9b3a9e150936f4fbef6ca1943e6137c/cffi-2.0.0-cp313-cp313-win_arm64.whl", hash = "sha256:256f80b80ca3853f90c21b23ee78cd008713787b1b1e93eae9f3d6a7134abd91", size = 177780, upload-time = "2025-09-08T23:23:16.761Z" }, + { url = "https://files.pythonhosted.org/packages/92/c4/3ce07396253a83250ee98564f8d7e9789fab8e58858f35d07a9a2c78de9f/cffi-2.0.0-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:fc33c5141b55ed366cfaad382df24fe7dcbc686de5be719b207bb248e3053dc5", size = 185320, upload-time = "2025-09-08T23:23:18.087Z" }, + { url = "https://files.pythonhosted.org/packages/59/dd/27e9fa567a23931c838c6b02d0764611c62290062a6d4e8ff7863daf9730/cffi-2.0.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:c654de545946e0db659b3400168c9ad31b5d29593291482c43e3564effbcee13", size = 181487, upload-time = "2025-09-08T23:23:19.622Z" }, + { url = "https://files.pythonhosted.org/packages/d6/43/0e822876f87ea8a4ef95442c3d766a06a51fc5298823f884ef87aaad168c/cffi-2.0.0-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:24b6f81f1983e6df8db3adc38562c83f7d4a0c36162885ec7f7b77c7dcbec97b", size = 220049, upload-time = "2025-09-08T23:23:20.853Z" }, + { url = "https://files.pythonhosted.org/packages/b4/89/76799151d9c2d2d1ead63c2429da9ea9d7aac304603de0c6e8764e6e8e70/cffi-2.0.0-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:12873ca6cb9b0f0d3a0da705d6086fe911591737a59f28b7936bdfed27c0d47c", size = 207793, upload-time = "2025-09-08T23:23:22.08Z" }, + { url = "https://files.pythonhosted.org/packages/bb/dd/3465b14bb9e24ee24cb88c9e3730f6de63111fffe513492bf8c808a3547e/cffi-2.0.0-cp314-cp314-manylinux2014_s390x.manylinux_2_17_s390x.whl", hash = "sha256:d9b97165e8aed9272a6bb17c01e3cc5871a594a446ebedc996e2397a1c1ea8ef", size = 206300, upload-time = "2025-09-08T23:23:23.314Z" }, + { url = "https://files.pythonhosted.org/packages/47/d9/d83e293854571c877a92da46fdec39158f8d7e68da75bf73581225d28e90/cffi-2.0.0-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:afb8db5439b81cf9c9d0c80404b60c3cc9c3add93e114dcae767f1477cb53775", size = 219244, upload-time = "2025-09-08T23:23:24.541Z" }, + { url = "https://files.pythonhosted.org/packages/2b/0f/1f177e3683aead2bb00f7679a16451d302c436b5cbf2505f0ea8146ef59e/cffi-2.0.0-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:737fe7d37e1a1bffe70bd5754ea763a62a066dc5913ca57e957824b72a85e205", size = 222828, upload-time = "2025-09-08T23:23:26.143Z" }, + { url = "https://files.pythonhosted.org/packages/c6/0f/cafacebd4b040e3119dcb32fed8bdef8dfe94da653155f9d0b9dc660166e/cffi-2.0.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:38100abb9d1b1435bc4cc340bb4489635dc2f0da7456590877030c9b3d40b0c1", size = 220926, upload-time = "2025-09-08T23:23:27.873Z" }, + { url = "https://files.pythonhosted.org/packages/3e/aa/df335faa45b395396fcbc03de2dfcab242cd61a9900e914fe682a59170b1/cffi-2.0.0-cp314-cp314-win32.whl", hash = "sha256:087067fa8953339c723661eda6b54bc98c5625757ea62e95eb4898ad5e776e9f", size = 175328, upload-time = "2025-09-08T23:23:44.61Z" }, + { url = "https://files.pythonhosted.org/packages/bb/92/882c2d30831744296ce713f0feb4c1cd30f346ef747b530b5318715cc367/cffi-2.0.0-cp314-cp314-win_amd64.whl", hash = "sha256:203a48d1fb583fc7d78a4c6655692963b860a417c0528492a6bc21f1aaefab25", size = 185650, upload-time = "2025-09-08T23:23:45.848Z" }, + { url = "https://files.pythonhosted.org/packages/9f/2c/98ece204b9d35a7366b5b2c6539c350313ca13932143e79dc133ba757104/cffi-2.0.0-cp314-cp314-win_arm64.whl", hash = "sha256:dbd5c7a25a7cb98f5ca55d258b103a2054f859a46ae11aaf23134f9cc0d356ad", size = 180687, upload-time = "2025-09-08T23:23:47.105Z" }, + { url = "https://files.pythonhosted.org/packages/3e/61/c768e4d548bfa607abcda77423448df8c471f25dbe64fb2ef6d555eae006/cffi-2.0.0-cp314-cp314t-macosx_10_13_x86_64.whl", hash = "sha256:9a67fc9e8eb39039280526379fb3a70023d77caec1852002b4da7e8b270c4dd9", size = 188773, upload-time = "2025-09-08T23:23:29.347Z" }, + { url = "https://files.pythonhosted.org/packages/2c/ea/5f76bce7cf6fcd0ab1a1058b5af899bfbef198bea4d5686da88471ea0336/cffi-2.0.0-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:7a66c7204d8869299919db4d5069a82f1561581af12b11b3c9f48c584eb8743d", size = 185013, upload-time = "2025-09-08T23:23:30.63Z" }, + { url = "https://files.pythonhosted.org/packages/be/b4/c56878d0d1755cf9caa54ba71e5d049479c52f9e4afc230f06822162ab2f/cffi-2.0.0-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:7cc09976e8b56f8cebd752f7113ad07752461f48a58cbba644139015ac24954c", size = 221593, upload-time = "2025-09-08T23:23:31.91Z" }, + { url = "https://files.pythonhosted.org/packages/e0/0d/eb704606dfe8033e7128df5e90fee946bbcb64a04fcdaa97321309004000/cffi-2.0.0-cp314-cp314t-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:92b68146a71df78564e4ef48af17551a5ddd142e5190cdf2c5624d0c3ff5b2e8", size = 209354, upload-time = "2025-09-08T23:23:33.214Z" }, + { url = "https://files.pythonhosted.org/packages/d8/19/3c435d727b368ca475fb8742ab97c9cb13a0de600ce86f62eab7fa3eea60/cffi-2.0.0-cp314-cp314t-manylinux2014_s390x.manylinux_2_17_s390x.whl", hash = "sha256:b1e74d11748e7e98e2f426ab176d4ed720a64412b6a15054378afdb71e0f37dc", size = 208480, upload-time = "2025-09-08T23:23:34.495Z" }, + { url = "https://files.pythonhosted.org/packages/d0/44/681604464ed9541673e486521497406fadcc15b5217c3e326b061696899a/cffi-2.0.0-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:28a3a209b96630bca57cce802da70c266eb08c6e97e5afd61a75611ee6c64592", size = 221584, upload-time = "2025-09-08T23:23:36.096Z" }, + { url = "https://files.pythonhosted.org/packages/25/8e/342a504ff018a2825d395d44d63a767dd8ebc927ebda557fecdaca3ac33a/cffi-2.0.0-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:7553fb2090d71822f02c629afe6042c299edf91ba1bf94951165613553984512", size = 224443, upload-time = "2025-09-08T23:23:37.328Z" }, + { url = "https://files.pythonhosted.org/packages/e1/5e/b666bacbbc60fbf415ba9988324a132c9a7a0448a9a8f125074671c0f2c3/cffi-2.0.0-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:6c6c373cfc5c83a975506110d17457138c8c63016b563cc9ed6e056a82f13ce4", size = 223437, upload-time = "2025-09-08T23:23:38.945Z" }, + { url = "https://files.pythonhosted.org/packages/a0/1d/ec1a60bd1a10daa292d3cd6bb0b359a81607154fb8165f3ec95fe003b85c/cffi-2.0.0-cp314-cp314t-win32.whl", hash = "sha256:1fc9ea04857caf665289b7a75923f2c6ed559b8298a1b8c49e59f7dd95c8481e", size = 180487, upload-time = "2025-09-08T23:23:40.423Z" }, + { url = "https://files.pythonhosted.org/packages/bf/41/4c1168c74fac325c0c8156f04b6749c8b6a8f405bbf91413ba088359f60d/cffi-2.0.0-cp314-cp314t-win_amd64.whl", hash = "sha256:d68b6cef7827e8641e8ef16f4494edda8b36104d79773a334beaa1e3521430f6", size = 191726, upload-time = "2025-09-08T23:23:41.742Z" }, + { url = "https://files.pythonhosted.org/packages/ae/3a/dbeec9d1ee0844c679f6bb5d6ad4e9f198b1224f4e7a32825f47f6192b0c/cffi-2.0.0-cp314-cp314t-win_arm64.whl", hash = "sha256:0a1527a803f0a659de1af2e1fd700213caba79377e27e4693648c2923da066f9", size = 184195, upload-time = "2025-09-08T23:23:43.004Z" }, +] + +[[package]] +name = "charset-normalizer" +version = "3.4.7" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/e7/a1/67fe25fac3c7642725500a3f6cfe5821ad557c3abb11c9d20d12c7008d3e/charset_normalizer-3.4.7.tar.gz", hash = "sha256:ae89db9e5f98a11a4bf50407d4363e7b09b31e55bc117b4f7d80aab97ba009e5", size = 144271, upload-time = "2026-04-02T09:28:39.342Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/c2/d7/b5b7020a0565c2e9fa8c09f4b5fa6232feb326b8c20081ccded47ea368fd/charset_normalizer-3.4.7-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:7641bb8895e77f921102f72833904dcd9901df5d6d72a2ab8f31d04b7e51e4e7", size = 309705, upload-time = "2026-04-02T09:26:02.191Z" }, + { url = "https://files.pythonhosted.org/packages/5a/53/58c29116c340e5456724ecd2fff4196d236b98f3da97b404bc5e51ac3493/charset_normalizer-3.4.7-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:202389074300232baeb53ae2569a60901f7efadd4245cf3a3bf0617d60b439d7", size = 206419, upload-time = "2026-04-02T09:26:03.583Z" }, + { url = "https://files.pythonhosted.org/packages/b2/02/e8146dc6591a37a00e5144c63f29fb7c97a734ea8a111190783c0e60ab63/charset_normalizer-3.4.7-cp311-cp311-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:30b8d1d8c52a48c2c5690e152c169b673487a2a58de1ec7393196753063fcd5e", size = 227901, upload-time = "2026-04-02T09:26:04.738Z" }, + { url = "https://files.pythonhosted.org/packages/fb/73/77486c4cd58f1267bf17db420e930c9afa1b3be3fe8c8b8ebbebc9624359/charset_normalizer-3.4.7-cp311-cp311-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:532bc9bf33a68613fd7d65e4b1c71a6a38d7d42604ecf239c77392e9b4e8998c", size = 222742, upload-time = "2026-04-02T09:26:06.36Z" }, + { url = "https://files.pythonhosted.org/packages/a1/fa/f74eb381a7d94ded44739e9d94de18dc5edc9c17fb8c11f0a6890696c0a9/charset_normalizer-3.4.7-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:2fe249cb4651fd12605b7288b24751d8bfd46d35f12a20b1ba33dea122e690df", size = 214061, upload-time = "2026-04-02T09:26:08.347Z" }, + { url = "https://files.pythonhosted.org/packages/dc/92/42bd3cefcf7687253fb86694b45f37b733c97f59af3724f356fa92b8c344/charset_normalizer-3.4.7-cp311-cp311-manylinux_2_31_armv7l.whl", hash = "sha256:65bcd23054beab4d166035cabbc868a09c1a49d1efe458fe8e4361215df40265", size = 199239, upload-time = "2026-04-02T09:26:09.823Z" }, + { url = "https://files.pythonhosted.org/packages/4c/3d/069e7184e2aa3b3cddc700e3dd267413dc259854adc3380421c805c6a17d/charset_normalizer-3.4.7-cp311-cp311-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:08e721811161356f97b4059a9ba7bafb23ea5ee2255402c42881c214e173c6b4", size = 210173, upload-time = "2026-04-02T09:26:10.953Z" }, + { url = "https://files.pythonhosted.org/packages/62/51/9d56feb5f2e7074c46f93e0ebdbe61f0848ee246e2f0d89f8e20b89ebb8f/charset_normalizer-3.4.7-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:e060d01aec0a910bdccb8be71faf34e7799ce36950f8294c8bf612cba65a2c9e", size = 209841, upload-time = "2026-04-02T09:26:12.142Z" }, + { url = "https://files.pythonhosted.org/packages/d2/59/893d8f99cc4c837dda1fe2f1139079703deb9f321aabcb032355de13b6c7/charset_normalizer-3.4.7-cp311-cp311-musllinux_1_2_armv7l.whl", hash = "sha256:38c0109396c4cfc574d502df99742a45c72c08eff0a36158b6f04000043dbf38", size = 200304, upload-time = "2026-04-02T09:26:13.711Z" }, + { url = "https://files.pythonhosted.org/packages/7d/1d/ee6f3be3464247578d1ed5c46de545ccc3d3ff933695395c402c21fa6b77/charset_normalizer-3.4.7-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:1c2a768fdd44ee4a9339a9b0b130049139b8ce3c01d2ce09f67f5a68048d477c", size = 229455, upload-time = "2026-04-02T09:26:14.941Z" }, + { url = "https://files.pythonhosted.org/packages/54/bb/8fb0a946296ea96a488928bdce8ef99023998c48e4713af533e9bb98ef07/charset_normalizer-3.4.7-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:1a87ca9d5df6fe460483d9a5bbf2b18f620cbed41b432e2bddb686228282d10b", size = 210036, upload-time = "2026-04-02T09:26:16.478Z" }, + { url = "https://files.pythonhosted.org/packages/9a/bc/015b2387f913749f82afd4fcba07846d05b6d784dd16123cb66860e0237d/charset_normalizer-3.4.7-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:d635aab80466bc95771bb78d5370e74d36d1fe31467b6b29b8b57b2a3cd7d22c", size = 224739, upload-time = "2026-04-02T09:26:17.751Z" }, + { url = "https://files.pythonhosted.org/packages/17/ab/63133691f56baae417493cba6b7c641571a2130eb7bceba6773367ab9ec5/charset_normalizer-3.4.7-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:ae196f021b5e7c78e918242d217db021ed2a6ace2bc6ae94c0fc596221c7f58d", size = 216277, upload-time = "2026-04-02T09:26:18.981Z" }, + { url = "https://files.pythonhosted.org/packages/06/6d/3be70e827977f20db77c12a97e6a9f973631a45b8d186c084527e53e77a4/charset_normalizer-3.4.7-cp311-cp311-win32.whl", hash = "sha256:adb2597b428735679446b46c8badf467b4ca5f5056aae4d51a19f9570301b1ad", size = 147819, upload-time = "2026-04-02T09:26:20.295Z" }, + { url = "https://files.pythonhosted.org/packages/20/d9/5f67790f06b735d7c7637171bbfd89882ad67201891b7275e51116ed8207/charset_normalizer-3.4.7-cp311-cp311-win_amd64.whl", hash = "sha256:8e385e4267ab76874ae30db04c627faaaf0b509e1ccc11a95b3fc3e83f855c00", size = 159281, upload-time = "2026-04-02T09:26:21.74Z" }, + { url = "https://files.pythonhosted.org/packages/ca/83/6413f36c5a34afead88ce6f66684d943d91f233d76dd083798f9602b75ae/charset_normalizer-3.4.7-cp311-cp311-win_arm64.whl", hash = "sha256:d4a48e5b3c2a489fae013b7589308a40146ee081f6f509e047e0e096084ceca1", size = 147843, upload-time = "2026-04-02T09:26:22.901Z" }, + { url = "https://files.pythonhosted.org/packages/0c/eb/4fc8d0a7110eb5fc9cc161723a34a8a6c200ce3b4fbf681bc86feee22308/charset_normalizer-3.4.7-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:eca9705049ad3c7345d574e3510665cb2cf844c2f2dcfe675332677f081cbd46", size = 311328, upload-time = "2026-04-02T09:26:24.331Z" }, + { url = "https://files.pythonhosted.org/packages/f8/e3/0fadc706008ac9d7b9b5be6dc767c05f9d3e5df51744ce4cc9605de7b9f4/charset_normalizer-3.4.7-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:6178f72c5508bfc5fd446a5905e698c6212932f25bcdd4b47a757a50605a90e2", size = 208061, upload-time = "2026-04-02T09:26:25.568Z" }, + { url = "https://files.pythonhosted.org/packages/42/f0/3dd1045c47f4a4604df85ec18ad093912ae1344ac706993aff91d38773a2/charset_normalizer-3.4.7-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:e1421b502d83040e6d7fb2fb18dff63957f720da3d77b2fbd3187ceb63755d7b", size = 229031, upload-time = "2026-04-02T09:26:26.865Z" }, + { url = "https://files.pythonhosted.org/packages/dc/67/675a46eb016118a2fbde5a277a5d15f4f69d5f3f5f338e5ee2f8948fcf43/charset_normalizer-3.4.7-cp312-cp312-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:edac0f1ab77644605be2cbba52e6b7f630731fc42b34cb0f634be1a6eface56a", size = 225239, upload-time = "2026-04-02T09:26:28.044Z" }, + { url = "https://files.pythonhosted.org/packages/4b/f8/d0118a2f5f23b02cd166fa385c60f9b0d4f9194f574e2b31cef350ad7223/charset_normalizer-3.4.7-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:5649fd1c7bade02f320a462fdefd0b4bd3ce036065836d4f42e0de958038e116", size = 216589, upload-time = "2026-04-02T09:26:29.239Z" }, + { url = "https://files.pythonhosted.org/packages/b1/f1/6d2b0b261b6c4ceef0fcb0d17a01cc5bc53586c2d4796fa04b5c540bc13d/charset_normalizer-3.4.7-cp312-cp312-manylinux_2_31_armv7l.whl", hash = "sha256:203104ed3e428044fd943bc4bf45fa73c0730391f9621e37fe39ecf477b128cb", size = 202733, upload-time = "2026-04-02T09:26:30.5Z" }, + { url = "https://files.pythonhosted.org/packages/6f/c0/7b1f943f7e87cc3db9626ba17807d042c38645f0a1d4415c7a14afb5591f/charset_normalizer-3.4.7-cp312-cp312-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:298930cec56029e05497a76988377cbd7457ba864beeea92ad7e844fe74cd1f1", size = 212652, upload-time = "2026-04-02T09:26:31.709Z" }, + { url = "https://files.pythonhosted.org/packages/38/dd/5a9ab159fe45c6e72079398f277b7d2b523e7f716acc489726115a910097/charset_normalizer-3.4.7-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:708838739abf24b2ceb208d0e22403dd018faeef86ddac04319a62ae884c4f15", size = 211229, upload-time = "2026-04-02T09:26:33.282Z" }, + { url = "https://files.pythonhosted.org/packages/d5/ff/531a1cad5ca855d1c1a8b69cb71abfd6d85c0291580146fda7c82857caa1/charset_normalizer-3.4.7-cp312-cp312-musllinux_1_2_armv7l.whl", hash = "sha256:0f7eb884681e3938906ed0434f20c63046eacd0111c4ba96f27b76084cd679f5", size = 203552, upload-time = "2026-04-02T09:26:34.845Z" }, + { url = "https://files.pythonhosted.org/packages/c1/4c/a5fb52d528a8ca41f7598cb619409ece30a169fbdf9cdce592e53b46c3a6/charset_normalizer-3.4.7-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:4dc1e73c36828f982bfe79fadf5919923f8a6f4df2860804db9a98c48824ce8d", size = 230806, upload-time = "2026-04-02T09:26:36.152Z" }, + { url = "https://files.pythonhosted.org/packages/59/7a/071feed8124111a32b316b33ae4de83d36923039ef8cf48120266844285b/charset_normalizer-3.4.7-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:aed52fea0513bac0ccde438c188c8a471c4e0f457c2dd20cdbf6ea7a450046c7", size = 212316, upload-time = "2026-04-02T09:26:37.672Z" }, + { url = "https://files.pythonhosted.org/packages/fd/35/f7dba3994312d7ba508e041eaac39a36b120f32d4c8662b8814dab876431/charset_normalizer-3.4.7-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:fea24543955a6a729c45a73fe90e08c743f0b3334bbf3201e6c4bc1b0c7fa464", size = 227274, upload-time = "2026-04-02T09:26:38.93Z" }, + { url = "https://files.pythonhosted.org/packages/8a/2d/a572df5c9204ab7688ec1edc895a73ebded3b023bb07364710b05dd1c9be/charset_normalizer-3.4.7-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:bb6d88045545b26da47aa879dd4a89a71d1dce0f0e549b1abcb31dfe4a8eac49", size = 218468, upload-time = "2026-04-02T09:26:40.17Z" }, + { url = "https://files.pythonhosted.org/packages/86/eb/890922a8b03a568ca2f336c36585a4713c55d4d67bf0f0c78924be6315ca/charset_normalizer-3.4.7-cp312-cp312-win32.whl", hash = "sha256:2257141f39fe65a3fdf38aeccae4b953e5f3b3324f4ff0daf9f15b8518666a2c", size = 148460, upload-time = "2026-04-02T09:26:41.416Z" }, + { url = "https://files.pythonhosted.org/packages/35/d9/0e7dffa06c5ab081f75b1b786f0aefc88365825dfcd0ac544bdb7b2b6853/charset_normalizer-3.4.7-cp312-cp312-win_amd64.whl", hash = "sha256:5ed6ab538499c8644b8a3e18debabcd7ce684f3fa91cf867521a7a0279cab2d6", size = 159330, upload-time = "2026-04-02T09:26:42.554Z" }, + { url = "https://files.pythonhosted.org/packages/9e/5d/481bcc2a7c88ea6b0878c299547843b2521ccbc40980cb406267088bc701/charset_normalizer-3.4.7-cp312-cp312-win_arm64.whl", hash = "sha256:56be790f86bfb2c98fb742ce566dfb4816e5a83384616ab59c49e0604d49c51d", size = 147828, upload-time = "2026-04-02T09:26:44.075Z" }, + { url = "https://files.pythonhosted.org/packages/c1/3b/66777e39d3ae1ddc77ee606be4ec6d8cbd4c801f65e5a1b6f2b11b8346dd/charset_normalizer-3.4.7-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:f496c9c3cc02230093d8330875c4c3cdfc3b73612a5fd921c65d39cbcef08063", size = 309627, upload-time = "2026-04-02T09:26:45.198Z" }, + { url = "https://files.pythonhosted.org/packages/2e/4e/b7f84e617b4854ade48a1b7915c8ccfadeba444d2a18c291f696e37f0d3b/charset_normalizer-3.4.7-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:0ea948db76d31190bf08bd371623927ee1339d5f2a0b4b1b4a4439a65298703c", size = 207008, upload-time = "2026-04-02T09:26:46.824Z" }, + { url = "https://files.pythonhosted.org/packages/c4/bb/ec73c0257c9e11b268f018f068f5d00aa0ef8c8b09f7753ebd5f2880e248/charset_normalizer-3.4.7-cp313-cp313-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:a277ab8928b9f299723bc1a2dabb1265911b1a76341f90a510368ca44ad9ab66", size = 228303, upload-time = "2026-04-02T09:26:48.397Z" }, + { url = "https://files.pythonhosted.org/packages/85/fb/32d1f5033484494619f701e719429c69b766bfc4dbc61aa9e9c8c166528b/charset_normalizer-3.4.7-cp313-cp313-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:3bec022aec2c514d9cf199522a802bd007cd588ab17ab2525f20f9c34d067c18", size = 224282, upload-time = "2026-04-02T09:26:49.684Z" }, + { url = "https://files.pythonhosted.org/packages/fa/07/330e3a0dda4c404d6da83b327270906e9654a24f6c546dc886a0eb0ffb23/charset_normalizer-3.4.7-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:e044c39e41b92c845bc815e5ae4230804e8e7bc29e399b0437d64222d92809dd", size = 215595, upload-time = "2026-04-02T09:26:50.915Z" }, + { url = "https://files.pythonhosted.org/packages/e3/7c/fc890655786e423f02556e0216d4b8c6bcb6bdfa890160dc66bf52dee468/charset_normalizer-3.4.7-cp313-cp313-manylinux_2_31_armv7l.whl", hash = "sha256:f495a1652cf3fbab2eb0639776dad966c2fb874d79d87ca07f9d5f059b8bd215", size = 201986, upload-time = "2026-04-02T09:26:52.197Z" }, + { url = "https://files.pythonhosted.org/packages/d8/97/bfb18b3db2aed3b90cf54dc292ad79fdd5ad65c4eae454099475cbeadd0d/charset_normalizer-3.4.7-cp313-cp313-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:e712b419df8ba5e42b226c510472b37bd57b38e897d3eca5e8cfd410a29fa859", size = 211711, upload-time = "2026-04-02T09:26:53.49Z" }, + { url = "https://files.pythonhosted.org/packages/6f/a5/a581c13798546a7fd557c82614a5c65a13df2157e9ad6373166d2a3e645d/charset_normalizer-3.4.7-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:7804338df6fcc08105c7745f1502ba68d900f45fd770d5bdd5288ddccb8a42d8", size = 210036, upload-time = "2026-04-02T09:26:54.975Z" }, + { url = "https://files.pythonhosted.org/packages/8c/bf/b3ab5bcb478e4193d517644b0fb2bf5497fbceeaa7a1bc0f4d5b50953861/charset_normalizer-3.4.7-cp313-cp313-musllinux_1_2_armv7l.whl", hash = "sha256:481551899c856c704d58119b5025793fa6730adda3571971af568f66d2424bb5", size = 202998, upload-time = "2026-04-02T09:26:56.303Z" }, + { url = "https://files.pythonhosted.org/packages/e7/4e/23efd79b65d314fa320ec6017b4b5834d5c12a58ba4610aa353af2e2f577/charset_normalizer-3.4.7-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:f59099f9b66f0d7145115e6f80dd8b1d847176df89b234a5a6b3f00437aa0832", size = 230056, upload-time = "2026-04-02T09:26:57.554Z" }, + { url = "https://files.pythonhosted.org/packages/b9/9f/1e1941bc3f0e01df116e68dc37a55c4d249df5e6fa77f008841aef68264f/charset_normalizer-3.4.7-cp313-cp313-musllinux_1_2_riscv64.whl", hash = "sha256:f59ad4c0e8f6bba240a9bb85504faa1ab438237199d4cce5f622761507b8f6a6", size = 211537, upload-time = "2026-04-02T09:26:58.843Z" }, + { url = "https://files.pythonhosted.org/packages/80/0f/088cbb3020d44428964a6c97fe1edfb1b9550396bf6d278330281e8b709c/charset_normalizer-3.4.7-cp313-cp313-musllinux_1_2_s390x.whl", hash = "sha256:3dedcc22d73ec993f42055eff4fcfed9318d1eeb9a6606c55892a26964964e48", size = 226176, upload-time = "2026-04-02T09:27:00.437Z" }, + { url = "https://files.pythonhosted.org/packages/6a/9f/130394f9bbe06f4f63e22641d32fc9b202b7e251c9aef4db044324dac493/charset_normalizer-3.4.7-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:64f02c6841d7d83f832cd97ccf8eb8a906d06eb95d5276069175c696b024b60a", size = 217723, upload-time = "2026-04-02T09:27:02.021Z" }, + { url = "https://files.pythonhosted.org/packages/73/55/c469897448a06e49f8fa03f6caae97074fde823f432a98f979cc42b90e69/charset_normalizer-3.4.7-cp313-cp313-win32.whl", hash = "sha256:4042d5c8f957e15221d423ba781e85d553722fc4113f523f2feb7b188cc34c5e", size = 148085, upload-time = "2026-04-02T09:27:03.192Z" }, + { url = "https://files.pythonhosted.org/packages/5d/78/1b74c5bbb3f99b77a1715c91b3e0b5bdb6fe302d95ace4f5b1bec37b0167/charset_normalizer-3.4.7-cp313-cp313-win_amd64.whl", hash = "sha256:3946fa46a0cf3e4c8cb1cc52f56bb536310d34f25f01ca9b6c16afa767dab110", size = 158819, upload-time = "2026-04-02T09:27:04.454Z" }, + { url = "https://files.pythonhosted.org/packages/68/86/46bd42279d323deb8687c4a5a811fd548cb7d1de10cf6535d099877a9a9f/charset_normalizer-3.4.7-cp313-cp313-win_arm64.whl", hash = "sha256:80d04837f55fc81da168b98de4f4b797ef007fc8a79ab71c6ec9bc4dd662b15b", size = 147915, upload-time = "2026-04-02T09:27:05.971Z" }, + { url = "https://files.pythonhosted.org/packages/97/c8/c67cb8c70e19ef1960b97b22ed2a1567711de46c4ddf19799923adc836c2/charset_normalizer-3.4.7-cp314-cp314-macosx_10_15_universal2.whl", hash = "sha256:c36c333c39be2dbca264d7803333c896ab8fa7d4d6f0ab7edb7dfd7aea6e98c0", size = 309234, upload-time = "2026-04-02T09:27:07.194Z" }, + { url = "https://files.pythonhosted.org/packages/99/85/c091fdee33f20de70d6c8b522743b6f831a2f1cd3ff86de4c6a827c48a76/charset_normalizer-3.4.7-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:1c2aed2e5e41f24ea8ef1590b8e848a79b56f3a5564a65ceec43c9d692dc7d8a", size = 208042, upload-time = "2026-04-02T09:27:08.749Z" }, + { url = "https://files.pythonhosted.org/packages/87/1c/ab2ce611b984d2fd5d86a5a8a19c1ae26acac6bad967da4967562c75114d/charset_normalizer-3.4.7-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:54523e136b8948060c0fa0bc7b1b50c32c186f2fceee897a495406bb6e311d2b", size = 228706, upload-time = "2026-04-02T09:27:09.951Z" }, + { url = "https://files.pythonhosted.org/packages/a8/29/2b1d2cb00bf085f59d29eb773ce58ec2d325430f8c216804a0a5cd83cbca/charset_normalizer-3.4.7-cp314-cp314-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:715479b9a2802ecac752a3b0efa2b0b60285cf962ee38414211abdfccc233b41", size = 224727, upload-time = "2026-04-02T09:27:11.175Z" }, + { url = "https://files.pythonhosted.org/packages/47/5c/032c2d5a07fe4d4855fea851209cca2b6f03ebeb6d4e3afdb3358386a684/charset_normalizer-3.4.7-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:bd6c2a1c7573c64738d716488d2cdd3c00e340e4835707d8fdb8dc1a66ef164e", size = 215882, upload-time = "2026-04-02T09:27:12.446Z" }, + { url = "https://files.pythonhosted.org/packages/2c/c2/356065d5a8b78ed04499cae5f339f091946a6a74f91e03476c33f0ab7100/charset_normalizer-3.4.7-cp314-cp314-manylinux_2_31_armv7l.whl", hash = "sha256:c45e9440fb78f8ddabcf714b68f936737a121355bf59f3907f4e17721b9d1aae", size = 200860, upload-time = "2026-04-02T09:27:13.721Z" }, + { url = "https://files.pythonhosted.org/packages/0c/cd/a32a84217ced5039f53b29f460962abb2d4420def55afabe45b1c3c7483d/charset_normalizer-3.4.7-cp314-cp314-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:3534e7dcbdcf757da6b85a0bbf5b6868786d5982dd959b065e65481644817a18", size = 211564, upload-time = "2026-04-02T09:27:15.272Z" }, + { url = "https://files.pythonhosted.org/packages/44/86/58e6f13ce26cc3b8f4a36b94a0f22ae2f00a72534520f4ae6857c4b81f89/charset_normalizer-3.4.7-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:e8ac484bf18ce6975760921bb6148041faa8fef0547200386ea0b52b5d27bf7b", size = 211276, upload-time = "2026-04-02T09:27:16.834Z" }, + { url = "https://files.pythonhosted.org/packages/8f/fe/d17c32dc72e17e155e06883efa84514ca375f8a528ba2546bee73fc4df81/charset_normalizer-3.4.7-cp314-cp314-musllinux_1_2_armv7l.whl", hash = "sha256:a5fe03b42827c13cdccd08e6c0247b6a6d4b5e3cdc53fd1749f5896adcdc2356", size = 201238, upload-time = "2026-04-02T09:27:18.229Z" }, + { url = "https://files.pythonhosted.org/packages/6a/29/f33daa50b06525a237451cdb6c69da366c381a3dadcd833fa5676bc468b3/charset_normalizer-3.4.7-cp314-cp314-musllinux_1_2_ppc64le.whl", hash = "sha256:2d6eb928e13016cea4f1f21d1e10c1cebd5a421bc57ddf5b1142ae3f86824fab", size = 230189, upload-time = "2026-04-02T09:27:19.445Z" }, + { url = "https://files.pythonhosted.org/packages/b6/6e/52c84015394a6a0bdcd435210a7e944c5f94ea1055f5cc5d56c5fe368e7b/charset_normalizer-3.4.7-cp314-cp314-musllinux_1_2_riscv64.whl", hash = "sha256:e74327fb75de8986940def6e8dee4f127cc9752bee7355bb323cc5b2659b6d46", size = 211352, upload-time = "2026-04-02T09:27:20.79Z" }, + { url = "https://files.pythonhosted.org/packages/8c/d7/4353be581b373033fb9198bf1da3cf8f09c1082561e8e922aa7b39bf9fe8/charset_normalizer-3.4.7-cp314-cp314-musllinux_1_2_s390x.whl", hash = "sha256:d6038d37043bced98a66e68d3aa2b6a35505dc01328cd65217cefe82f25def44", size = 227024, upload-time = "2026-04-02T09:27:22.063Z" }, + { url = "https://files.pythonhosted.org/packages/30/45/99d18aa925bd1740098ccd3060e238e21115fffbfdcb8f3ece837d0ace6c/charset_normalizer-3.4.7-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:7579e913a5339fb8fa133f6bbcfd8e6749696206cf05acdbdca71a1b436d8e72", size = 217869, upload-time = "2026-04-02T09:27:23.486Z" }, + { url = "https://files.pythonhosted.org/packages/5c/05/5ee478aa53f4bb7996482153d4bfe1b89e0f087f0ab6b294fcf92d595873/charset_normalizer-3.4.7-cp314-cp314-win32.whl", hash = "sha256:5b77459df20e08151cd6f8b9ef8ef1f961ef73d85c21a555c7eed5b79410ec10", size = 148541, upload-time = "2026-04-02T09:27:25.146Z" }, + { url = "https://files.pythonhosted.org/packages/48/77/72dcb0921b2ce86420b2d79d454c7022bf5be40202a2a07906b9f2a35c97/charset_normalizer-3.4.7-cp314-cp314-win_amd64.whl", hash = "sha256:92a0a01ead5e668468e952e4238cccd7c537364eb7d851ab144ab6627dbbe12f", size = 159634, upload-time = "2026-04-02T09:27:26.642Z" }, + { url = "https://files.pythonhosted.org/packages/c6/a3/c2369911cd72f02386e4e340770f6e158c7980267da16af8f668217abaa0/charset_normalizer-3.4.7-cp314-cp314-win_arm64.whl", hash = "sha256:67f6279d125ca0046a7fd386d01b311c6363844deac3e5b069b514ba3e63c246", size = 148384, upload-time = "2026-04-02T09:27:28.271Z" }, + { url = "https://files.pythonhosted.org/packages/94/09/7e8a7f73d24dba1f0035fbbf014d2c36828fc1bf9c88f84093e57d315935/charset_normalizer-3.4.7-cp314-cp314t-macosx_10_15_universal2.whl", hash = "sha256:effc3f449787117233702311a1b7d8f59cba9ced946ba727bdc329ec69028e24", size = 330133, upload-time = "2026-04-02T09:27:29.474Z" }, + { url = "https://files.pythonhosted.org/packages/8d/da/96975ddb11f8e977f706f45cddd8540fd8242f71ecdb5d18a80723dcf62c/charset_normalizer-3.4.7-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:fbccdc05410c9ee21bbf16a35f4c1d16123dcdeb8a1d38f33654fa21d0234f79", size = 216257, upload-time = "2026-04-02T09:27:30.793Z" }, + { url = "https://files.pythonhosted.org/packages/e5/e8/1d63bf8ef2d388e95c64b2098f45f84758f6d102a087552da1485912637b/charset_normalizer-3.4.7-cp314-cp314t-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:733784b6d6def852c814bce5f318d25da2ee65dd4839a0718641c696e09a2960", size = 234851, upload-time = "2026-04-02T09:27:32.44Z" }, + { url = "https://files.pythonhosted.org/packages/9b/40/e5ff04233e70da2681fa43969ad6f66ca5611d7e669be0246c4c7aaf6dc8/charset_normalizer-3.4.7-cp314-cp314t-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:a89c23ef8d2c6b27fd200a42aa4ac72786e7c60d40efdc76e6011260b6e949c4", size = 233393, upload-time = "2026-04-02T09:27:34.03Z" }, + { url = "https://files.pythonhosted.org/packages/be/c1/06c6c49d5a5450f76899992f1ee40b41d076aee9279b49cf9974d2f313d5/charset_normalizer-3.4.7-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:6c114670c45346afedc0d947faf3c7f701051d2518b943679c8ff88befe14f8e", size = 223251, upload-time = "2026-04-02T09:27:35.369Z" }, + { url = "https://files.pythonhosted.org/packages/2b/9f/f2ff16fb050946169e3e1f82134d107e5d4ae72647ec8a1b1446c148480f/charset_normalizer-3.4.7-cp314-cp314t-manylinux_2_31_armv7l.whl", hash = "sha256:a180c5e59792af262bf263b21a3c49353f25945d8d9f70628e73de370d55e1e1", size = 206609, upload-time = "2026-04-02T09:27:36.661Z" }, + { url = "https://files.pythonhosted.org/packages/69/d5/a527c0cd8d64d2eab7459784fb4169a0ac76e5a6fc5237337982fd61347e/charset_normalizer-3.4.7-cp314-cp314t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:3c9a494bc5ec77d43cea229c4f6db1e4d8fe7e1bbffa8b6f0f0032430ff8ab44", size = 220014, upload-time = "2026-04-02T09:27:38.019Z" }, + { url = "https://files.pythonhosted.org/packages/7e/80/8a7b8104a3e203074dc9aa2c613d4b726c0e136bad1cc734594b02867972/charset_normalizer-3.4.7-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:8d828b6667a32a728a1ad1d93957cdf37489c57b97ae6c4de2860fa749b8fc1e", size = 218979, upload-time = "2026-04-02T09:27:39.37Z" }, + { url = "https://files.pythonhosted.org/packages/02/9a/b759b503d507f375b2b5c153e4d2ee0a75aa215b7f2489cf314f4541f2c0/charset_normalizer-3.4.7-cp314-cp314t-musllinux_1_2_armv7l.whl", hash = "sha256:cf1493cd8607bec4d8a7b9b004e699fcf8f9103a9284cc94962cb73d20f9d4a3", size = 209238, upload-time = "2026-04-02T09:27:40.722Z" }, + { url = "https://files.pythonhosted.org/packages/c2/4e/0f3f5d47b86bdb79256e7290b26ac847a2832d9a4033f7eb2cd4bcf4bb5b/charset_normalizer-3.4.7-cp314-cp314t-musllinux_1_2_ppc64le.whl", hash = "sha256:0c96c3b819b5c3e9e165495db84d41914d6894d55181d2d108cc1a69bfc9cce0", size = 236110, upload-time = "2026-04-02T09:27:42.33Z" }, + { url = "https://files.pythonhosted.org/packages/96/23/bce28734eb3ed2c91dcf93abeb8a5cf393a7b2749725030bb630e554fdd8/charset_normalizer-3.4.7-cp314-cp314t-musllinux_1_2_riscv64.whl", hash = "sha256:752a45dc4a6934060b3b0dab47e04edc3326575f82be64bc4fc293914566503e", size = 219824, upload-time = "2026-04-02T09:27:43.924Z" }, + { url = "https://files.pythonhosted.org/packages/2c/6f/6e897c6984cc4d41af319b077f2f600fc8214eb2fe2d6bcb79141b882400/charset_normalizer-3.4.7-cp314-cp314t-musllinux_1_2_s390x.whl", hash = "sha256:8778f0c7a52e56f75d12dae53ae320fae900a8b9b4164b981b9c5ce059cd1fcb", size = 233103, upload-time = "2026-04-02T09:27:45.348Z" }, + { url = "https://files.pythonhosted.org/packages/76/22/ef7bd0fe480a0ae9b656189ec00744b60933f68b4f42a7bb06589f6f576a/charset_normalizer-3.4.7-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:ce3412fbe1e31eb81ea42f4169ed94861c56e643189e1e75f0041f3fe7020abe", size = 225194, upload-time = "2026-04-02T09:27:46.706Z" }, + { url = "https://files.pythonhosted.org/packages/c5/a7/0e0ab3e0b5bc1219bd80a6a0d4d72ca74d9250cb2382b7c699c147e06017/charset_normalizer-3.4.7-cp314-cp314t-win32.whl", hash = "sha256:c03a41a8784091e67a39648f70c5f97b5b6a37f216896d44d2cdcb82615339a0", size = 159827, upload-time = "2026-04-02T09:27:48.053Z" }, + { url = "https://files.pythonhosted.org/packages/7a/1d/29d32e0fb40864b1f878c7f5a0b343ae676c6e2b271a2d55cc3a152391da/charset_normalizer-3.4.7-cp314-cp314t-win_amd64.whl", hash = "sha256:03853ed82eeebbce3c2abfdbc98c96dc205f32a79627688ac9a27370ea61a49c", size = 174168, upload-time = "2026-04-02T09:27:49.795Z" }, + { url = "https://files.pythonhosted.org/packages/de/32/d92444ad05c7a6e41fb2036749777c163baf7a0301a040cb672d6b2b1ae9/charset_normalizer-3.4.7-cp314-cp314t-win_arm64.whl", hash = "sha256:c35abb8bfff0185efac5878da64c45dafd2b37fb0383add1be155a763c1f083d", size = 153018, upload-time = "2026-04-02T09:27:51.116Z" }, + { url = "https://files.pythonhosted.org/packages/db/8f/61959034484a4a7c527811f4721e75d02d653a35afb0b6054474d8185d4c/charset_normalizer-3.4.7-py3-none-any.whl", hash = "sha256:3dce51d0f5e7951f8bb4900c257dad282f49190fdbebecd4ba99bcc41fef404d", size = 61958, upload-time = "2026-04-02T09:28:37.794Z" }, +] + +[[package]] +name = "click" +version = "8.4.1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "colorama", marker = "sys_platform == 'win32'" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/9b/98/518d8e5081007684232226f475082b30087d0f585e8457db087298259f49/click-8.4.1.tar.gz", hash = "sha256:918b5633eddf6b41c32d4f454bf0de810065c74e3f7dbf8ee5452f8be88d3e96", size = 353007, upload-time = "2026-05-22T04:08:37.769Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/c7/0d/67e5b4109ea4a837e80daa87c2c696711955e40449a97e8926672534def2/click-8.4.1-py3-none-any.whl", hash = "sha256:482be17c6991b8c19c5429a1e995d9b0efdbb63172824c41f99965dc0ade8ec2", size = 116639, upload-time = "2026-05-22T04:08:35.26Z" }, +] + +[[package]] +name = "colorama" +version = "0.4.6" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/d8/53/6f443c9a4a8358a93a6792e2acffb9d9d5cb0a5cfd8802644b7b1c9a02e4/colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44", size = 27697, upload-time = "2022-10-25T02:36:22.414Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/d1/d6/3965ed04c63042e047cb6a3e6ed1a63a35087b6a609aa3a15ed8ac56c221/colorama-0.4.6-py2.py3-none-any.whl", hash = "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6", size = 25335, upload-time = "2022-10-25T02:36:20.889Z" }, +] + +[[package]] +name = "comm" +version = "0.2.3" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/4c/13/7d740c5849255756bc17888787313b61fd38a0a8304fc4f073dfc46122aa/comm-0.2.3.tar.gz", hash = "sha256:2dc8048c10962d55d7ad693be1e7045d891b7ce8d999c97963a5e3e99c055971", size = 6319, upload-time = "2025-07-25T14:02:04.452Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/60/97/891a0971e1e4a8c5d2b20bbe0e524dc04548d2307fee33cdeba148fd4fc7/comm-0.2.3-py3-none-any.whl", hash = "sha256:c615d91d75f7f04f095b30d1c1711babd43bdc6419c1be9886a85f2f4e489417", size = 7294, upload-time = "2025-07-25T14:02:02.896Z" }, +] + +[[package]] +name = "contourpy" +version = "1.3.3" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "numpy" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/58/01/1253e6698a07380cd31a736d248a3f2a50a7c88779a1813da27503cadc2a/contourpy-1.3.3.tar.gz", hash = "sha256:083e12155b210502d0bca491432bb04d56dc3432f95a979b429f2848c3dbe880", size = 13466174, upload-time = "2025-07-26T12:03:12.549Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/91/2e/c4390a31919d8a78b90e8ecf87cd4b4c4f05a5b48d05ec17db8e5404c6f4/contourpy-1.3.3-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:709a48ef9a690e1343202916450bc48b9e51c049b089c7f79a267b46cffcdaa1", size = 288773, upload-time = "2025-07-26T12:01:02.277Z" }, + { url = "https://files.pythonhosted.org/packages/0d/44/c4b0b6095fef4dc9c420e041799591e3b63e9619e3044f7f4f6c21c0ab24/contourpy-1.3.3-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:23416f38bfd74d5d28ab8429cc4d63fa67d5068bd711a85edb1c3fb0c3e2f381", size = 270149, upload-time = "2025-07-26T12:01:04.072Z" }, + { url = "https://files.pythonhosted.org/packages/30/2e/dd4ced42fefac8470661d7cb7e264808425e6c5d56d175291e93890cce09/contourpy-1.3.3-cp311-cp311-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:929ddf8c4c7f348e4c0a5a3a714b5c8542ffaa8c22954862a46ca1813b667ee7", size = 329222, upload-time = "2025-07-26T12:01:05.688Z" }, + { url = "https://files.pythonhosted.org/packages/f2/74/cc6ec2548e3d276c71389ea4802a774b7aa3558223b7bade3f25787fafc2/contourpy-1.3.3-cp311-cp311-manylinux_2_26_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:9e999574eddae35f1312c2b4b717b7885d4edd6cb46700e04f7f02db454e67c1", size = 377234, upload-time = "2025-07-26T12:01:07.054Z" }, + { url = "https://files.pythonhosted.org/packages/03/b3/64ef723029f917410f75c09da54254c5f9ea90ef89b143ccadb09df14c15/contourpy-1.3.3-cp311-cp311-manylinux_2_26_s390x.manylinux_2_28_s390x.whl", hash = "sha256:0bf67e0e3f482cb69779dd3061b534eb35ac9b17f163d851e2a547d56dba0a3a", size = 380555, upload-time = "2025-07-26T12:01:08.801Z" }, + { url = "https://files.pythonhosted.org/packages/5f/4b/6157f24ca425b89fe2eb7e7be642375711ab671135be21e6faa100f7448c/contourpy-1.3.3-cp311-cp311-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:51e79c1f7470158e838808d4a996fa9bac72c498e93d8ebe5119bc1e6becb0db", size = 355238, upload-time = "2025-07-26T12:01:10.319Z" }, + { url = "https://files.pythonhosted.org/packages/98/56/f914f0dd678480708a04cfd2206e7c382533249bc5001eb9f58aa693e200/contourpy-1.3.3-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:598c3aaece21c503615fd59c92a3598b428b2f01bfb4b8ca9c4edeecc2438620", size = 1326218, upload-time = "2025-07-26T12:01:12.659Z" }, + { url = "https://files.pythonhosted.org/packages/fb/d7/4a972334a0c971acd5172389671113ae82aa7527073980c38d5868ff1161/contourpy-1.3.3-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:322ab1c99b008dad206d406bb61d014cf0174df491ae9d9d0fac6a6fda4f977f", size = 1392867, upload-time = "2025-07-26T12:01:15.533Z" }, + { url = "https://files.pythonhosted.org/packages/75/3e/f2cc6cd56dc8cff46b1a56232eabc6feea52720083ea71ab15523daab796/contourpy-1.3.3-cp311-cp311-win32.whl", hash = "sha256:fd907ae12cd483cd83e414b12941c632a969171bf90fc937d0c9f268a31cafff", size = 183677, upload-time = "2025-07-26T12:01:17.088Z" }, + { url = "https://files.pythonhosted.org/packages/98/4b/9bd370b004b5c9d8045c6c33cf65bae018b27aca550a3f657cdc99acdbd8/contourpy-1.3.3-cp311-cp311-win_amd64.whl", hash = "sha256:3519428f6be58431c56581f1694ba8e50626f2dd550af225f82fb5f5814d2a42", size = 225234, upload-time = "2025-07-26T12:01:18.256Z" }, + { url = "https://files.pythonhosted.org/packages/d9/b6/71771e02c2e004450c12b1120a5f488cad2e4d5b590b1af8bad060360fe4/contourpy-1.3.3-cp311-cp311-win_arm64.whl", hash = "sha256:15ff10bfada4bf92ec8b31c62bf7c1834c244019b4a33095a68000d7075df470", size = 193123, upload-time = "2025-07-26T12:01:19.848Z" }, + { url = "https://files.pythonhosted.org/packages/be/45/adfee365d9ea3d853550b2e735f9d66366701c65db7855cd07621732ccfc/contourpy-1.3.3-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:b08a32ea2f8e42cf1d4be3169a98dd4be32bafe4f22b6c4cb4ba810fa9e5d2cb", size = 293419, upload-time = "2025-07-26T12:01:21.16Z" }, + { url = "https://files.pythonhosted.org/packages/53/3e/405b59cfa13021a56bba395a6b3aca8cec012b45bf177b0eaf7a202cde2c/contourpy-1.3.3-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:556dba8fb6f5d8742f2923fe9457dbdd51e1049c4a43fd3986a0b14a1d815fc6", size = 273979, upload-time = "2025-07-26T12:01:22.448Z" }, + { url = "https://files.pythonhosted.org/packages/d4/1c/a12359b9b2ca3a845e8f7f9ac08bdf776114eb931392fcad91743e2ea17b/contourpy-1.3.3-cp312-cp312-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:92d9abc807cf7d0e047b95ca5d957cf4792fcd04e920ca70d48add15c1a90ea7", size = 332653, upload-time = "2025-07-26T12:01:24.155Z" }, + { url = "https://files.pythonhosted.org/packages/63/12/897aeebfb475b7748ea67b61e045accdfcf0d971f8a588b67108ed7f5512/contourpy-1.3.3-cp312-cp312-manylinux_2_26_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:b2e8faa0ed68cb29af51edd8e24798bb661eac3bd9f65420c1887b6ca89987c8", size = 379536, upload-time = "2025-07-26T12:01:25.91Z" }, + { url = "https://files.pythonhosted.org/packages/43/8a/a8c584b82deb248930ce069e71576fc09bd7174bbd35183b7943fb1064fd/contourpy-1.3.3-cp312-cp312-manylinux_2_26_s390x.manylinux_2_28_s390x.whl", hash = "sha256:626d60935cf668e70a5ce6ff184fd713e9683fb458898e4249b63be9e28286ea", size = 384397, upload-time = "2025-07-26T12:01:27.152Z" }, + { url = "https://files.pythonhosted.org/packages/cc/8f/ec6289987824b29529d0dfda0d74a07cec60e54b9c92f3c9da4c0ac732de/contourpy-1.3.3-cp312-cp312-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:4d00e655fcef08aba35ec9610536bfe90267d7ab5ba944f7032549c55a146da1", size = 362601, upload-time = "2025-07-26T12:01:28.808Z" }, + { url = "https://files.pythonhosted.org/packages/05/0a/a3fe3be3ee2dceb3e615ebb4df97ae6f3828aa915d3e10549ce016302bd1/contourpy-1.3.3-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:451e71b5a7d597379ef572de31eeb909a87246974d960049a9848c3bc6c41bf7", size = 1331288, upload-time = "2025-07-26T12:01:31.198Z" }, + { url = "https://files.pythonhosted.org/packages/33/1d/acad9bd4e97f13f3e2b18a3977fe1b4a37ecf3d38d815333980c6c72e963/contourpy-1.3.3-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:459c1f020cd59fcfe6650180678a9993932d80d44ccde1fa1868977438f0b411", size = 1403386, upload-time = "2025-07-26T12:01:33.947Z" }, + { url = "https://files.pythonhosted.org/packages/cf/8f/5847f44a7fddf859704217a99a23a4f6417b10e5ab1256a179264561540e/contourpy-1.3.3-cp312-cp312-win32.whl", hash = "sha256:023b44101dfe49d7d53932be418477dba359649246075c996866106da069af69", size = 185018, upload-time = "2025-07-26T12:01:35.64Z" }, + { url = "https://files.pythonhosted.org/packages/19/e8/6026ed58a64563186a9ee3f29f41261fd1828f527dd93d33b60feca63352/contourpy-1.3.3-cp312-cp312-win_amd64.whl", hash = "sha256:8153b8bfc11e1e4d75bcb0bff1db232f9e10b274e0929de9d608027e0d34ff8b", size = 226567, upload-time = "2025-07-26T12:01:36.804Z" }, + { url = "https://files.pythonhosted.org/packages/d1/e2/f05240d2c39a1ed228d8328a78b6f44cd695f7ef47beb3e684cf93604f86/contourpy-1.3.3-cp312-cp312-win_arm64.whl", hash = "sha256:07ce5ed73ecdc4a03ffe3e1b3e3c1166db35ae7584be76f65dbbe28a7791b0cc", size = 193655, upload-time = "2025-07-26T12:01:37.999Z" }, + { url = "https://files.pythonhosted.org/packages/68/35/0167aad910bbdb9599272bd96d01a9ec6852f36b9455cf2ca67bd4cc2d23/contourpy-1.3.3-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:177fb367556747a686509d6fef71d221a4b198a3905fe824430e5ea0fda54eb5", size = 293257, upload-time = "2025-07-26T12:01:39.367Z" }, + { url = "https://files.pythonhosted.org/packages/96/e4/7adcd9c8362745b2210728f209bfbcf7d91ba868a2c5f40d8b58f54c509b/contourpy-1.3.3-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:d002b6f00d73d69333dac9d0b8d5e84d9724ff9ef044fd63c5986e62b7c9e1b1", size = 274034, upload-time = "2025-07-26T12:01:40.645Z" }, + { url = "https://files.pythonhosted.org/packages/73/23/90e31ceeed1de63058a02cb04b12f2de4b40e3bef5e082a7c18d9c8ae281/contourpy-1.3.3-cp313-cp313-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:348ac1f5d4f1d66d3322420f01d42e43122f43616e0f194fc1c9f5d830c5b286", size = 334672, upload-time = "2025-07-26T12:01:41.942Z" }, + { url = "https://files.pythonhosted.org/packages/ed/93/b43d8acbe67392e659e1d984700e79eb67e2acb2bd7f62012b583a7f1b55/contourpy-1.3.3-cp313-cp313-manylinux_2_26_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:655456777ff65c2c548b7c454af9c6f33f16c8884f11083244b5819cc214f1b5", size = 381234, upload-time = "2025-07-26T12:01:43.499Z" }, + { url = "https://files.pythonhosted.org/packages/46/3b/bec82a3ea06f66711520f75a40c8fc0b113b2a75edb36aa633eb11c4f50f/contourpy-1.3.3-cp313-cp313-manylinux_2_26_s390x.manylinux_2_28_s390x.whl", hash = "sha256:644a6853d15b2512d67881586bd03f462c7ab755db95f16f14d7e238f2852c67", size = 385169, upload-time = "2025-07-26T12:01:45.219Z" }, + { url = "https://files.pythonhosted.org/packages/4b/32/e0f13a1c5b0f8572d0ec6ae2f6c677b7991fafd95da523159c19eff0696a/contourpy-1.3.3-cp313-cp313-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:4debd64f124ca62069f313a9cb86656ff087786016d76927ae2cf37846b006c9", size = 362859, upload-time = "2025-07-26T12:01:46.519Z" }, + { url = "https://files.pythonhosted.org/packages/33/71/e2a7945b7de4e58af42d708a219f3b2f4cff7386e6b6ab0a0fa0033c49a9/contourpy-1.3.3-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:a15459b0f4615b00bbd1e91f1b9e19b7e63aea7483d03d804186f278c0af2659", size = 1332062, upload-time = "2025-07-26T12:01:48.964Z" }, + { url = "https://files.pythonhosted.org/packages/12/fc/4e87ac754220ccc0e807284f88e943d6d43b43843614f0a8afa469801db0/contourpy-1.3.3-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:ca0fdcd73925568ca027e0b17ab07aad764be4706d0a925b89227e447d9737b7", size = 1403932, upload-time = "2025-07-26T12:01:51.979Z" }, + { url = "https://files.pythonhosted.org/packages/a6/2e/adc197a37443f934594112222ac1aa7dc9a98faf9c3842884df9a9d8751d/contourpy-1.3.3-cp313-cp313-win32.whl", hash = "sha256:b20c7c9a3bf701366556e1b1984ed2d0cedf999903c51311417cf5f591d8c78d", size = 185024, upload-time = "2025-07-26T12:01:53.245Z" }, + { url = "https://files.pythonhosted.org/packages/18/0b/0098c214843213759692cc638fce7de5c289200a830e5035d1791d7a2338/contourpy-1.3.3-cp313-cp313-win_amd64.whl", hash = "sha256:1cadd8b8969f060ba45ed7c1b714fe69185812ab43bd6b86a9123fe8f99c3263", size = 226578, upload-time = "2025-07-26T12:01:54.422Z" }, + { url = "https://files.pythonhosted.org/packages/8a/9a/2f6024a0c5995243cd63afdeb3651c984f0d2bc727fd98066d40e141ad73/contourpy-1.3.3-cp313-cp313-win_arm64.whl", hash = "sha256:fd914713266421b7536de2bfa8181aa8c699432b6763a0ea64195ebe28bff6a9", size = 193524, upload-time = "2025-07-26T12:01:55.73Z" }, + { url = "https://files.pythonhosted.org/packages/c0/b3/f8a1a86bd3298513f500e5b1f5fd92b69896449f6cab6a146a5d52715479/contourpy-1.3.3-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:88df9880d507169449d434c293467418b9f6cbe82edd19284aa0409e7fdb933d", size = 306730, upload-time = "2025-07-26T12:01:57.051Z" }, + { url = "https://files.pythonhosted.org/packages/3f/11/4780db94ae62fc0c2053909b65dc3246bd7cecfc4f8a20d957ad43aa4ad8/contourpy-1.3.3-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:d06bb1f751ba5d417047db62bca3c8fde202b8c11fb50742ab3ab962c81e8216", size = 287897, upload-time = "2025-07-26T12:01:58.663Z" }, + { url = "https://files.pythonhosted.org/packages/ae/15/e59f5f3ffdd6f3d4daa3e47114c53daabcb18574a26c21f03dc9e4e42ff0/contourpy-1.3.3-cp313-cp313t-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:e4e6b05a45525357e382909a4c1600444e2a45b4795163d3b22669285591c1ae", size = 326751, upload-time = "2025-07-26T12:02:00.343Z" }, + { url = "https://files.pythonhosted.org/packages/0f/81/03b45cfad088e4770b1dcf72ea78d3802d04200009fb364d18a493857210/contourpy-1.3.3-cp313-cp313t-manylinux_2_26_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:ab3074b48c4e2cf1a960e6bbeb7f04566bf36b1861d5c9d4d8ac04b82e38ba20", size = 375486, upload-time = "2025-07-26T12:02:02.128Z" }, + { url = "https://files.pythonhosted.org/packages/0c/ba/49923366492ffbdd4486e970d421b289a670ae8cf539c1ea9a09822b371a/contourpy-1.3.3-cp313-cp313t-manylinux_2_26_s390x.manylinux_2_28_s390x.whl", hash = "sha256:6c3d53c796f8647d6deb1abe867daeb66dcc8a97e8455efa729516b997b8ed99", size = 388106, upload-time = "2025-07-26T12:02:03.615Z" }, + { url = "https://files.pythonhosted.org/packages/9f/52/5b00ea89525f8f143651f9f03a0df371d3cbd2fccd21ca9b768c7a6500c2/contourpy-1.3.3-cp313-cp313t-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:50ed930df7289ff2a8d7afeb9603f8289e5704755c7e5c3bbd929c90c817164b", size = 352548, upload-time = "2025-07-26T12:02:05.165Z" }, + { url = "https://files.pythonhosted.org/packages/32/1d/a209ec1a3a3452d490f6b14dd92e72280c99ae3d1e73da74f8277d4ee08f/contourpy-1.3.3-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:4feffb6537d64b84877da813a5c30f1422ea5739566abf0bd18065ac040e120a", size = 1322297, upload-time = "2025-07-26T12:02:07.379Z" }, + { url = "https://files.pythonhosted.org/packages/bc/9e/46f0e8ebdd884ca0e8877e46a3f4e633f6c9c8c4f3f6e72be3fe075994aa/contourpy-1.3.3-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:2b7e9480ffe2b0cd2e787e4df64270e3a0440d9db8dc823312e2c940c167df7e", size = 1391023, upload-time = "2025-07-26T12:02:10.171Z" }, + { url = "https://files.pythonhosted.org/packages/b9/70/f308384a3ae9cd2209e0849f33c913f658d3326900d0ff5d378d6a1422d2/contourpy-1.3.3-cp313-cp313t-win32.whl", hash = "sha256:283edd842a01e3dcd435b1c5116798d661378d83d36d337b8dde1d16a5fc9ba3", size = 196157, upload-time = "2025-07-26T12:02:11.488Z" }, + { url = "https://files.pythonhosted.org/packages/b2/dd/880f890a6663b84d9e34a6f88cded89d78f0091e0045a284427cb6b18521/contourpy-1.3.3-cp313-cp313t-win_amd64.whl", hash = "sha256:87acf5963fc2b34825e5b6b048f40e3635dd547f590b04d2ab317c2619ef7ae8", size = 240570, upload-time = "2025-07-26T12:02:12.754Z" }, + { url = "https://files.pythonhosted.org/packages/80/99/2adc7d8ffead633234817ef8e9a87115c8a11927a94478f6bb3d3f4d4f7d/contourpy-1.3.3-cp313-cp313t-win_arm64.whl", hash = "sha256:3c30273eb2a55024ff31ba7d052dde990d7d8e5450f4bbb6e913558b3d6c2301", size = 199713, upload-time = "2025-07-26T12:02:14.4Z" }, + { url = "https://files.pythonhosted.org/packages/72/8b/4546f3ab60f78c514ffb7d01a0bd743f90de36f0019d1be84d0a708a580a/contourpy-1.3.3-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:fde6c716d51c04b1c25d0b90364d0be954624a0ee9d60e23e850e8d48353d07a", size = 292189, upload-time = "2025-07-26T12:02:16.095Z" }, + { url = "https://files.pythonhosted.org/packages/fd/e1/3542a9cb596cadd76fcef413f19c79216e002623158befe6daa03dbfa88c/contourpy-1.3.3-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:cbedb772ed74ff5be440fa8eee9bd49f64f6e3fc09436d9c7d8f1c287b121d77", size = 273251, upload-time = "2025-07-26T12:02:17.524Z" }, + { url = "https://files.pythonhosted.org/packages/b1/71/f93e1e9471d189f79d0ce2497007731c1e6bf9ef6d1d61b911430c3db4e5/contourpy-1.3.3-cp314-cp314-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:22e9b1bd7a9b1d652cd77388465dc358dafcd2e217d35552424aa4f996f524f5", size = 335810, upload-time = "2025-07-26T12:02:18.9Z" }, + { url = "https://files.pythonhosted.org/packages/91/f9/e35f4c1c93f9275d4e38681a80506b5510e9327350c51f8d4a5a724d178c/contourpy-1.3.3-cp314-cp314-manylinux_2_26_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:a22738912262aa3e254e4f3cb079a95a67132fc5a063890e224393596902f5a4", size = 382871, upload-time = "2025-07-26T12:02:20.418Z" }, + { url = "https://files.pythonhosted.org/packages/b5/71/47b512f936f66a0a900d81c396a7e60d73419868fba959c61efed7a8ab46/contourpy-1.3.3-cp314-cp314-manylinux_2_26_s390x.manylinux_2_28_s390x.whl", hash = "sha256:afe5a512f31ee6bd7d0dda52ec9864c984ca3d66664444f2d72e0dc4eb832e36", size = 386264, upload-time = "2025-07-26T12:02:21.916Z" }, + { url = "https://files.pythonhosted.org/packages/04/5f/9ff93450ba96b09c7c2b3f81c94de31c89f92292f1380261bd7195bea4ea/contourpy-1.3.3-cp314-cp314-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:f64836de09927cba6f79dcd00fdd7d5329f3fccc633468507079c829ca4db4e3", size = 363819, upload-time = "2025-07-26T12:02:23.759Z" }, + { url = "https://files.pythonhosted.org/packages/3e/a6/0b185d4cc480ee494945cde102cb0149ae830b5fa17bf855b95f2e70ad13/contourpy-1.3.3-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:1fd43c3be4c8e5fd6e4f2baeae35ae18176cf2e5cced681cca908addf1cdd53b", size = 1333650, upload-time = "2025-07-26T12:02:26.181Z" }, + { url = "https://files.pythonhosted.org/packages/43/d7/afdc95580ca56f30fbcd3060250f66cedbde69b4547028863abd8aa3b47e/contourpy-1.3.3-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:6afc576f7b33cf00996e5c1102dc2a8f7cc89e39c0b55df93a0b78c1bd992b36", size = 1404833, upload-time = "2025-07-26T12:02:28.782Z" }, + { url = "https://files.pythonhosted.org/packages/e2/e2/366af18a6d386f41132a48f033cbd2102e9b0cf6345d35ff0826cd984566/contourpy-1.3.3-cp314-cp314-win32.whl", hash = "sha256:66c8a43a4f7b8df8b71ee1840e4211a3c8d93b214b213f590e18a1beca458f7d", size = 189692, upload-time = "2025-07-26T12:02:30.128Z" }, + { url = "https://files.pythonhosted.org/packages/7d/c2/57f54b03d0f22d4044b8afb9ca0e184f8b1afd57b4f735c2fa70883dc601/contourpy-1.3.3-cp314-cp314-win_amd64.whl", hash = "sha256:cf9022ef053f2694e31d630feaacb21ea24224be1c3ad0520b13d844274614fd", size = 232424, upload-time = "2025-07-26T12:02:31.395Z" }, + { url = "https://files.pythonhosted.org/packages/18/79/a9416650df9b525737ab521aa181ccc42d56016d2123ddcb7b58e926a42c/contourpy-1.3.3-cp314-cp314-win_arm64.whl", hash = "sha256:95b181891b4c71de4bb404c6621e7e2390745f887f2a026b2d99e92c17892339", size = 198300, upload-time = "2025-07-26T12:02:32.956Z" }, + { url = "https://files.pythonhosted.org/packages/1f/42/38c159a7d0f2b7b9c04c64ab317042bb6952b713ba875c1681529a2932fe/contourpy-1.3.3-cp314-cp314t-macosx_10_13_x86_64.whl", hash = "sha256:33c82d0138c0a062380332c861387650c82e4cf1747aaa6938b9b6516762e772", size = 306769, upload-time = "2025-07-26T12:02:34.2Z" }, + { url = "https://files.pythonhosted.org/packages/c3/6c/26a8205f24bca10974e77460de68d3d7c63e282e23782f1239f226fcae6f/contourpy-1.3.3-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:ea37e7b45949df430fe649e5de8351c423430046a2af20b1c1961cae3afcda77", size = 287892, upload-time = "2025-07-26T12:02:35.807Z" }, + { url = "https://files.pythonhosted.org/packages/66/06/8a475c8ab718ebfd7925661747dbb3c3ee9c82ac834ccb3570be49d129f4/contourpy-1.3.3-cp314-cp314t-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:d304906ecc71672e9c89e87c4675dc5c2645e1f4269a5063b99b0bb29f232d13", size = 326748, upload-time = "2025-07-26T12:02:37.193Z" }, + { url = "https://files.pythonhosted.org/packages/b4/a3/c5ca9f010a44c223f098fccd8b158bb1cb287378a31ac141f04730dc49be/contourpy-1.3.3-cp314-cp314t-manylinux_2_26_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:ca658cd1a680a5c9ea96dc61cdbae1e85c8f25849843aa799dfd3cb370ad4fbe", size = 375554, upload-time = "2025-07-26T12:02:38.894Z" }, + { url = "https://files.pythonhosted.org/packages/80/5b/68bd33ae63fac658a4145088c1e894405e07584a316738710b636c6d0333/contourpy-1.3.3-cp314-cp314t-manylinux_2_26_s390x.manylinux_2_28_s390x.whl", hash = "sha256:ab2fd90904c503739a75b7c8c5c01160130ba67944a7b77bbf36ef8054576e7f", size = 388118, upload-time = "2025-07-26T12:02:40.642Z" }, + { url = "https://files.pythonhosted.org/packages/40/52/4c285a6435940ae25d7410a6c36bda5145839bc3f0beb20c707cda18b9d2/contourpy-1.3.3-cp314-cp314t-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:b7301b89040075c30e5768810bc96a8e8d78085b47d8be6e4c3f5a0b4ed478a0", size = 352555, upload-time = "2025-07-26T12:02:42.25Z" }, + { url = "https://files.pythonhosted.org/packages/24/ee/3e81e1dd174f5c7fefe50e85d0892de05ca4e26ef1c9a59c2a57e43b865a/contourpy-1.3.3-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:2a2a8b627d5cc6b7c41a4beff6c5ad5eb848c88255fda4a8745f7e901b32d8e4", size = 1322295, upload-time = "2025-07-26T12:02:44.668Z" }, + { url = "https://files.pythonhosted.org/packages/3c/b2/6d913d4d04e14379de429057cd169e5e00f6c2af3bb13e1710bcbdb5da12/contourpy-1.3.3-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:fd6ec6be509c787f1caf6b247f0b1ca598bef13f4ddeaa126b7658215529ba0f", size = 1391027, upload-time = "2025-07-26T12:02:47.09Z" }, + { url = "https://files.pythonhosted.org/packages/93/8a/68a4ec5c55a2971213d29a9374913f7e9f18581945a7a31d1a39b5d2dfe5/contourpy-1.3.3-cp314-cp314t-win32.whl", hash = "sha256:e74a9a0f5e3fff48fb5a7f2fd2b9b70a3fe014a67522f79b7cca4c0c7e43c9ae", size = 202428, upload-time = "2025-07-26T12:02:48.691Z" }, + { url = "https://files.pythonhosted.org/packages/fa/96/fd9f641ffedc4fa3ace923af73b9d07e869496c9cc7a459103e6e978992f/contourpy-1.3.3-cp314-cp314t-win_amd64.whl", hash = "sha256:13b68d6a62db8eafaebb8039218921399baf6e47bf85006fd8529f2a08ef33fc", size = 250331, upload-time = "2025-07-26T12:02:50.137Z" }, + { url = "https://files.pythonhosted.org/packages/ae/8c/469afb6465b853afff216f9528ffda78a915ff880ed58813ba4faf4ba0b6/contourpy-1.3.3-cp314-cp314t-win_arm64.whl", hash = "sha256:b7448cb5a725bb1e35ce88771b86fba35ef418952474492cf7c764059933ff8b", size = 203831, upload-time = "2025-07-26T12:02:51.449Z" }, + { url = "https://files.pythonhosted.org/packages/a5/29/8dcfe16f0107943fa92388c23f6e05cff0ba58058c4c95b00280d4c75a14/contourpy-1.3.3-pp311-pypy311_pp73-macosx_10_15_x86_64.whl", hash = "sha256:cd5dfcaeb10f7b7f9dc8941717c6c2ade08f587be2226222c12b25f0483ed497", size = 278809, upload-time = "2025-07-26T12:02:52.74Z" }, + { url = "https://files.pythonhosted.org/packages/85/a9/8b37ef4f7dafeb335daee3c8254645ef5725be4d9c6aa70b50ec46ef2f7e/contourpy-1.3.3-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:0c1fc238306b35f246d61a1d416a627348b5cf0648648a031e14bb8705fcdfe8", size = 261593, upload-time = "2025-07-26T12:02:54.037Z" }, + { url = "https://files.pythonhosted.org/packages/0a/59/ebfb8c677c75605cc27f7122c90313fd2f375ff3c8d19a1694bda74aaa63/contourpy-1.3.3-pp311-pypy311_pp73-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:70f9aad7de812d6541d29d2bbf8feb22ff7e1c299523db288004e3157ff4674e", size = 302202, upload-time = "2025-07-26T12:02:55.947Z" }, + { url = "https://files.pythonhosted.org/packages/3c/37/21972a15834d90bfbfb009b9d004779bd5a07a0ec0234e5ba8f64d5736f4/contourpy-1.3.3-pp311-pypy311_pp73-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:5ed3657edf08512fc3fe81b510e35c2012fbd3081d2e26160f27ca28affec989", size = 329207, upload-time = "2025-07-26T12:02:57.468Z" }, + { url = "https://files.pythonhosted.org/packages/0c/58/bd257695f39d05594ca4ad60df5bcb7e32247f9951fd09a9b8edb82d1daa/contourpy-1.3.3-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:3d1a3799d62d45c18bafd41c5fa05120b96a28079f2393af559b843d1a966a77", size = 225315, upload-time = "2025-07-26T12:02:58.801Z" }, +] + +[[package]] +name = "cramjam" +version = "2.11.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/14/12/34bf6e840a79130dfd0da7badfb6f7810b8fcfd60e75b0539372667b41b6/cramjam-2.11.0.tar.gz", hash = "sha256:5c82500ed91605c2d9781380b378397012e25127e89d64f460fea6aeac4389b4", size = 99100, upload-time = "2025-07-27T21:25:07.559Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/d0/89/8001f6a9b6b6e9fa69bec5319789083475d6f26d52aaea209d3ebf939284/cramjam-2.11.0-cp311-cp311-macosx_10_12_x86_64.macosx_11_0_arm64.macosx_10_12_universal2.whl", hash = "sha256:04cfa39118570e70e920a9b75c733299784b6d269733dbc791d9aaed6edd2615", size = 3559272, upload-time = "2025-07-27T21:22:01.988Z" }, + { url = "https://files.pythonhosted.org/packages/0b/f3/001d00070ca92e5fbe6aacc768e455568b0cde46b0eb944561a4ea132300/cramjam-2.11.0-cp311-cp311-macosx_10_12_x86_64.whl", hash = "sha256:66a18f68506290349a256375d7aa2f645b9f7993c10fc4cc211db214e4e61d2b", size = 1861743, upload-time = "2025-07-27T21:22:03.754Z" }, + { url = "https://files.pythonhosted.org/packages/c9/35/041a3af01bf3f6158f120070f798546d4383b962b63c35cd91dcbf193e17/cramjam-2.11.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:50e7d65533857736cd56f6509cf2c4866f28ad84dd15b5bdbf2f8a81e77fa28a", size = 1699631, upload-time = "2025-07-27T21:22:05.192Z" }, + { url = "https://files.pythonhosted.org/packages/17/eb/5358b238808abebd0c949c42635c3751204ca7cf82b29b984abe9f5e33c8/cramjam-2.11.0-cp311-cp311-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:1f71989668458fc327ac15396db28d92df22f8024bb12963929798b2729d2df5", size = 2025603, upload-time = "2025-07-27T21:22:06.726Z" }, + { url = "https://files.pythonhosted.org/packages/0e/79/19dba7c03a27408d8d11b5a7a4a7908459cfd4e6f375b73264dc66517bf6/cramjam-2.11.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ee77ac543f1e2b22af1e8be3ae589f729491b6090582340aacd77d1d757d9569", size = 1766283, upload-time = "2025-07-27T21:22:08.568Z" }, + { url = "https://files.pythonhosted.org/packages/a4/ad/40e4b3408501d886d082db465c33971655fe82573c535428e52ab905f4d0/cramjam-2.11.0-cp311-cp311-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:ad52784120e7e4d8a0b5b0517d185b8bf7f74f5e17272857ddc8951a628d9be1", size = 1854407, upload-time = "2025-07-27T21:22:10.518Z" }, + { url = "https://files.pythonhosted.org/packages/36/6e/c1b60ceb6d7ea6ff8b0bf197520aefe23f878bf2bfb0de65f2b0c2f82cd1/cramjam-2.11.0-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:4b86f8e6d9c1b3f9a75b2af870c93ceee0f1b827cd2507387540e053b35d7459", size = 2035793, upload-time = "2025-07-27T21:22:12.504Z" }, + { url = "https://files.pythonhosted.org/packages/9c/ad/32a8d5f4b1e3717787945ec6d71bd1c6e6bccba4b7e903fc0d9d4e4b08c3/cramjam-2.11.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:320d61938950d95da2371b46c406ec433e7955fae9f396c8e1bf148ffc187d11", size = 2067499, upload-time = "2025-07-27T21:22:14.067Z" }, + { url = "https://files.pythonhosted.org/packages/ff/cd/3b5a662736ea62ff7fa4c4a10a85e050bfdaad375cc53dc80427e8afe41c/cramjam-2.11.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:41eafc8c1653a35a5c7e75ad48138f9f60085cc05cd99d592e5298552d944e9f", size = 1981853, upload-time = "2025-07-27T21:22:15.908Z" }, + { url = "https://files.pythonhosted.org/packages/26/8e/1dbcfaaa7a702ee82ee683ec3a81656934dd7e04a7bc4ee854033686f98a/cramjam-2.11.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:03a7316c6bf763dfa34279335b27702321da44c455a64de58112968c0818ec4a", size = 2034514, upload-time = "2025-07-27T21:22:17.352Z" }, + { url = "https://files.pythonhosted.org/packages/50/62/f11709bfdce74af79a88b410dcb76dedc97612166e759136931bf63cfd7b/cramjam-2.11.0-cp311-cp311-musllinux_1_1_armv7l.whl", hash = "sha256:244c2ed8bd7ccbb294a2abe7ca6498db7e89d7eb5e744691dc511a7dc82e65ca", size = 2155343, upload-time = "2025-07-27T21:22:18.854Z" }, + { url = "https://files.pythonhosted.org/packages/8a/6d/3b98b61841a5376d9a9b8468ae58753a8e6cf22be9534a0fa5af4d8621cc/cramjam-2.11.0-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:405f8790bad36ce0b4bbdb964ad51507bfc7942c78447f25cb828b870a1d86a0", size = 2169367, upload-time = "2025-07-27T21:22:20.389Z" }, + { url = "https://files.pythonhosted.org/packages/11/72/bd5db5c49dbebc8b002f1c4983101b28d2e7fc9419753db1c31ec22b03ef/cramjam-2.11.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:6b1b751a5411032b08fb3ac556160229ca01c6bbe4757bb3a9a40b951ebaac23", size = 2159334, upload-time = "2025-07-27T21:22:22.254Z" }, + { url = "https://files.pythonhosted.org/packages/34/32/203c57acdb6eea727e7078b2219984e64ed4ad043c996ed56321301ba167/cramjam-2.11.0-cp311-cp311-win32.whl", hash = "sha256:5251585608778b9ac8effed544933df7ad85b4ba21ee9738b551f17798b215ac", size = 1605313, upload-time = "2025-07-27T21:22:24.126Z" }, + { url = "https://files.pythonhosted.org/packages/a9/bd/102d6deb87a8524ac11cddcd31a7612b8f20bf9b473c3c645045e3b957c7/cramjam-2.11.0-cp311-cp311-win_amd64.whl", hash = "sha256:dca88bc8b68ce6d35dafd8c4d5d59a238a56c43fa02b74c2ce5f9dfb0d1ccb46", size = 1710991, upload-time = "2025-07-27T21:22:25.661Z" }, + { url = "https://files.pythonhosted.org/packages/0b/0d/7c84c913a5fae85b773a9dcf8874390f9d68ba0fcc6630efa7ff1541b950/cramjam-2.11.0-cp312-cp312-macosx_10_12_x86_64.macosx_11_0_arm64.macosx_10_12_universal2.whl", hash = "sha256:dba5c14b8b4f73ea1e65720f5a3fe4280c1d27761238378be8274135c60bbc6e", size = 3553368, upload-time = "2025-07-27T21:22:27.162Z" }, + { url = "https://files.pythonhosted.org/packages/2b/cc/4f6d185d8a744776f53035e72831ff8eefc2354f46ab836f4bd3c4f6c138/cramjam-2.11.0-cp312-cp312-macosx_10_12_x86_64.whl", hash = "sha256:11eb40722b3fcf3e6890fba46c711bf60f8dc26360a24876c85e52d76c33b25b", size = 1860014, upload-time = "2025-07-27T21:22:28.738Z" }, + { url = "https://files.pythonhosted.org/packages/1c/a8/626c76263085c6d5ded0e71823b411e9522bfc93ba6cc59855a5869296e7/cramjam-2.11.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:aeb26e2898994b6e8319f19a4d37c481512acdcc6d30e1b5ecc9d8ec57e835cb", size = 1693512, upload-time = "2025-07-27T21:22:30.999Z" }, + { url = "https://files.pythonhosted.org/packages/e9/52/0851a16a62447532e30ba95a80e638926fdea869a34b4b5b9d0a020083ba/cramjam-2.11.0-cp312-cp312-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:4f8d82081ed7d8fe52c982bd1f06e4c7631a73fe1fb6d4b3b3f2404f87dc40fe", size = 2025285, upload-time = "2025-07-27T21:22:32.954Z" }, + { url = "https://files.pythonhosted.org/packages/98/76/122e444f59dbc216451d8e3d8282c9665dc79eaf822f5f1470066be1b695/cramjam-2.11.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:092a3ec26e0a679305018380e4f652eae1b6dfe3fc3b154ee76aa6b92221a17c", size = 1761327, upload-time = "2025-07-27T21:22:34.484Z" }, + { url = "https://files.pythonhosted.org/packages/a3/bc/3a0189aef1af2b29632c039c19a7a1b752bc21a4053582a5464183a0ad3d/cramjam-2.11.0-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:529d6d667c65fd105d10bd83d1cd3f9869f8fd6c66efac9415c1812281196a92", size = 1854075, upload-time = "2025-07-27T21:22:36.157Z" }, + { url = "https://files.pythonhosted.org/packages/2e/80/8a6343b13778ce52d94bb8d5365a30c3aa951276b1857201fe79d7e2ad25/cramjam-2.11.0-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:555eb9c90c450e0f76e27d9ff064e64a8b8c6478ab1a5594c91b7bc5c82fd9f0", size = 2032710, upload-time = "2025-07-27T21:22:38.17Z" }, + { url = "https://files.pythonhosted.org/packages/df/6b/cd1778a207c29eda10791e3dfa018b588001928086e179fc71254793c625/cramjam-2.11.0-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:5edf4c9e32493035b514cf2ba0c969d81ccb31de63bd05490cc8bfe3b431674e", size = 2068353, upload-time = "2025-07-27T21:22:39.615Z" }, + { url = "https://files.pythonhosted.org/packages/dc/f0/5c2a5cd5711032f3b191ca50cb786c17689b4a9255f9f768866e6c9f04d9/cramjam-2.11.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2fa2fe41f48c4d58d923803383b0737f048918b5a0d10390de9628bb6272b107", size = 1978104, upload-time = "2025-07-27T21:22:41.106Z" }, + { url = "https://files.pythonhosted.org/packages/f9/8b/b363a5fb2c3347504fe9a64f8d0f1e276844f0e532aa7162c061cd1ffee4/cramjam-2.11.0-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:9ca14cf1cabdb0b77d606db1bb9e9ca593b1dbd421fcaf251ec9a5431ec449f3", size = 2030779, upload-time = "2025-07-27T21:22:42.969Z" }, + { url = "https://files.pythonhosted.org/packages/78/7b/d83dad46adb6c988a74361f81ad9c5c22642be53ad88616a19baedd06243/cramjam-2.11.0-cp312-cp312-musllinux_1_1_armv7l.whl", hash = "sha256:309e95bf898829476bccf4fd2c358ec00e7ff73a12f95a3cdeeba4bb1d3683d5", size = 2155297, upload-time = "2025-07-27T21:22:44.6Z" }, + { url = "https://files.pythonhosted.org/packages/1a/be/60d9be4cb33d8740a4aa94c7513f2ef3c4eba4fd13536f086facbafade71/cramjam-2.11.0-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:86dca35d2f15ef22922411496c220f3c9e315d5512f316fe417461971cc1648d", size = 2169255, upload-time = "2025-07-27T21:22:46.534Z" }, + { url = "https://files.pythonhosted.org/packages/11/b0/4a595f01a243aec8ad272b160b161c44351190c35d98d7787919d962e9e5/cramjam-2.11.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:193c6488bd2f514cbc0bef5c18fad61a5f9c8d059dd56edf773b3b37f0e85496", size = 2155651, upload-time = "2025-07-27T21:22:48.46Z" }, + { url = "https://files.pythonhosted.org/packages/38/47/7776659aaa677046b77f527106e53ddd47373416d8fcdb1e1a881ec5dc06/cramjam-2.11.0-cp312-cp312-win32.whl", hash = "sha256:514e2c008a8b4fa823122ca3ecab896eac41d9aa0f5fc881bd6264486c204e32", size = 1603568, upload-time = "2025-07-27T21:22:50.084Z" }, + { url = "https://files.pythonhosted.org/packages/75/b1/d53002729cfd94c5844ddfaf1233c86d29f2dbfc1b764a6562c41c044199/cramjam-2.11.0-cp312-cp312-win_amd64.whl", hash = "sha256:53fed080476d5f6ad7505883ec5d1ec28ba36c2273db3b3e92d7224fe5e463db", size = 1709287, upload-time = "2025-07-27T21:22:51.534Z" }, + { url = "https://files.pythonhosted.org/packages/0a/8b/406c5dc0f8e82385519d8c299c40fd6a56d97eca3fcd6f5da8dad48de75b/cramjam-2.11.0-cp313-cp313-macosx_10_12_x86_64.macosx_11_0_arm64.macosx_10_12_universal2.whl", hash = "sha256:2c289729cc1c04e88bafa48b51082fb462b0a57dbc96494eab2be9b14dca62af", size = 3553330, upload-time = "2025-07-27T21:22:53.124Z" }, + { url = "https://files.pythonhosted.org/packages/00/ad/4186884083d6e4125b285903e17841827ab0d6d0cffc86216d27ed91e91d/cramjam-2.11.0-cp313-cp313-macosx_10_12_x86_64.whl", hash = "sha256:045201ee17147e36cf43d8ae2fa4b4836944ac672df5874579b81cf6d40f1a1f", size = 1859756, upload-time = "2025-07-27T21:22:54.821Z" }, + { url = "https://files.pythonhosted.org/packages/54/01/91b485cf76a7efef638151e8a7d35784dae2c4ff221b1aec2c083e4b106d/cramjam-2.11.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:619cd195d74c9e1d2a3ad78d63451d35379c84bd851aec552811e30842e1c67a", size = 1693609, upload-time = "2025-07-27T21:22:56.331Z" }, + { url = "https://files.pythonhosted.org/packages/cd/84/d0c80d279b2976870fc7d10f15dcb90a3c10c06566c6964b37c152694974/cramjam-2.11.0-cp313-cp313-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:6eb3ae5ab72edb2ed68bdc0f5710f0a6cad7fd778a610ec2c31ee15e32d3921e", size = 2024912, upload-time = "2025-07-27T21:22:57.915Z" }, + { url = "https://files.pythonhosted.org/packages/d6/70/88f2a5cb904281ed5d3c111b8f7d5366639817a5470f059bcd26833fc870/cramjam-2.11.0-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:df7da3f4b19e3078f9635f132d31b0a8196accb2576e3213ddd7a77f93317c20", size = 1760715, upload-time = "2025-07-27T21:22:59.528Z" }, + { url = "https://files.pythonhosted.org/packages/b2/06/cf5b02081132537d28964fb385fcef9ed9f8a017dd7d8c59d317e53ba50d/cramjam-2.11.0-cp313-cp313-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:57286b289cd557ac76c24479d8ecfb6c3d5b854cce54ccc7671f9a2f5e2a2708", size = 1853782, upload-time = "2025-07-27T21:23:01.07Z" }, + { url = "https://files.pythonhosted.org/packages/57/27/63525087ed40a53d1867021b9c4858b80cc86274ffe7225deed067d88d92/cramjam-2.11.0-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:28952fbbf8b32c0cb7fa4be9bcccfca734bf0d0989f4b509dc7f2f70ba79ae06", size = 2032354, upload-time = "2025-07-27T21:23:03.021Z" }, + { url = "https://files.pythonhosted.org/packages/c3/ef/dbba082c6ebfb6410da4dd39a64e654d7194fcfd4567f85991a83fa4ec32/cramjam-2.11.0-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:78ed2e4099812a438b545dfbca1928ec825e743cd253bc820372d6ef8c3adff4", size = 2068007, upload-time = "2025-07-27T21:23:04.526Z" }, + { url = "https://files.pythonhosted.org/packages/35/ce/d902b9358a46a086938feae83b2251720e030f06e46006f4c1fc0ac9da20/cramjam-2.11.0-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7d9aecd5c3845d415bd6c9957c93de8d93097e269137c2ecb0e5a5256374bdc8", size = 1977485, upload-time = "2025-07-27T21:23:06.058Z" }, + { url = "https://files.pythonhosted.org/packages/e8/03/982f54553244b0afcbdb2ad2065d460f0ab05a72a96896a969a1ca136a1e/cramjam-2.11.0-cp313-cp313-musllinux_1_1_aarch64.whl", hash = "sha256:362fcf4d6f5e1242a4540812455f5a594949190f6fbc04f2ffbfd7ae0266d788", size = 2030447, upload-time = "2025-07-27T21:23:07.679Z" }, + { url = "https://files.pythonhosted.org/packages/74/5f/748e54cdb665ec098ec519e23caacc65fc5ae58718183b071e33fc1c45b4/cramjam-2.11.0-cp313-cp313-musllinux_1_1_armv7l.whl", hash = "sha256:13240b3dea41b1174456cb9426843b085dc1a2bdcecd9ee2d8f65ac5703374b0", size = 2154949, upload-time = "2025-07-27T21:23:09.366Z" }, + { url = "https://files.pythonhosted.org/packages/69/81/c4e6cb06ed69db0dc81f9a8b1dc74995ebd4351e7a1877143f7031ff2700/cramjam-2.11.0-cp313-cp313-musllinux_1_1_i686.whl", hash = "sha256:c54eed83726269594b9086d827decc7d2015696e31b99bf9b69b12d9063584fe", size = 2168925, upload-time = "2025-07-27T21:23:10.976Z" }, + { url = "https://files.pythonhosted.org/packages/13/5b/966365523ce8290a08e163e3b489626c5adacdff2b3da9da1b0823dfb14e/cramjam-2.11.0-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:f8195006fdd0fc0a85b19df3d64a3ef8a240e483ae1dfc7ac6a4316019eb5df2", size = 2154950, upload-time = "2025-07-27T21:23:12.514Z" }, + { url = "https://files.pythonhosted.org/packages/3a/7d/7f8eb5c534b72b32c6eb79d74585bfee44a9a5647a14040bb65c31c2572d/cramjam-2.11.0-cp313-cp313-win32.whl", hash = "sha256:ccf30e3fe6d770a803dcdf3bb863fa44ba5dc2664d4610ba2746a3c73599f2e4", size = 1603199, upload-time = "2025-07-27T21:23:14.38Z" }, + { url = "https://files.pythonhosted.org/packages/37/05/47b5e0bf7c41a3b1cdd3b7c2147f880c93226a6bef1f5d85183040cbdece/cramjam-2.11.0-cp313-cp313-win_amd64.whl", hash = "sha256:ee36348a204f0a68b03400f4736224e9f61d1c6a1582d7f875c1ca56f0254268", size = 1708924, upload-time = "2025-07-27T21:23:16.332Z" }, + { url = "https://files.pythonhosted.org/packages/de/07/a1051cdbbe6d723df16d756b97f09da7c1adb69e29695c58f0392bc12515/cramjam-2.11.0-cp314-cp314-macosx_10_12_x86_64.macosx_11_0_arm64.macosx_10_12_universal2.whl", hash = "sha256:7ba5e38c9fbd06f086f4a5a64a1a5b7b417cd3f8fc07a20e5c03651f72f36100", size = 3554141, upload-time = "2025-07-27T21:23:17.938Z" }, + { url = "https://files.pythonhosted.org/packages/74/66/58487d2e16ef3d04f51a7c7f0e69823e806744b4c21101e89da4873074bc/cramjam-2.11.0-cp314-cp314-macosx_10_12_x86_64.whl", hash = "sha256:b8adeee57b41fe08e4520698a4b0bd3cc76dbd81f99424b806d70a5256a391d3", size = 1860353, upload-time = "2025-07-27T21:23:19.593Z" }, + { url = "https://files.pythonhosted.org/packages/67/b4/67f6254d166ffbcc9d5fa1b56876eaa920c32ebc8e9d3d525b27296b693b/cramjam-2.11.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:b96a74fa03a636c8a7d76f700d50e9a8bc17a516d6a72d28711225d641e30968", size = 1693832, upload-time = "2025-07-27T21:23:21.185Z" }, + { url = "https://files.pythonhosted.org/packages/55/a3/4e0b31c0d454ae70c04684ed7c13d3c67b4c31790c278c1e788cb804fa4a/cramjam-2.11.0-cp314-cp314-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:c3811a56fa32e00b377ef79121c0193311fd7501f0fb378f254c7f083cc1fbe0", size = 2027080, upload-time = "2025-07-27T21:23:23.303Z" }, + { url = "https://files.pythonhosted.org/packages/d9/c7/5e8eed361d1d3b8be14f38a54852c5370cc0ceb2c2d543b8ba590c34f080/cramjam-2.11.0-cp314-cp314-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c5d927e87461f8a0d448e4ab5eb2bca9f31ca5d8ea86d70c6f470bb5bc666d7e", size = 1761543, upload-time = "2025-07-27T21:23:24.991Z" }, + { url = "https://files.pythonhosted.org/packages/09/0c/06b7f8b0ce9fde89470505116a01fc0b6cb92d406c4fb1e46f168b5d3fa5/cramjam-2.11.0-cp314-cp314-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:f1f5c450121430fd89cb5767e0a9728ecc65997768fd4027d069cb0368af62f9", size = 1854636, upload-time = "2025-07-27T21:23:26.987Z" }, + { url = "https://files.pythonhosted.org/packages/6f/c6/6ebc02c9d5acdf4e5f2b1ec6e1252bd5feee25762246798ae823b3347457/cramjam-2.11.0-cp314-cp314-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:724aa7490be50235d97f07e2ca10067927c5d7f336b786ddbc868470e822aa25", size = 2032715, upload-time = "2025-07-27T21:23:28.603Z" }, + { url = "https://files.pythonhosted.org/packages/a2/77/a122971c23f5ca4b53e4322c647ac7554626c95978f92d19419315dddd05/cramjam-2.11.0-cp314-cp314-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:54c4637122e7cfd7aac5c1d3d4c02364f446d6923ea34cf9d0e8816d6e7a4936", size = 2069039, upload-time = "2025-07-27T21:23:30.319Z" }, + { url = "https://files.pythonhosted.org/packages/19/0f/f6121b90b86b9093c066889274d26a1de3f29969d45c2ed1ecbe2033cb78/cramjam-2.11.0-cp314-cp314-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:17eb39b1696179fb471eea2de958fa21f40a2cd8bf6b40d428312d5541e19dc4", size = 1979566, upload-time = "2025-07-27T21:23:32.002Z" }, + { url = "https://files.pythonhosted.org/packages/e0/a3/f95bc57fd7f4166ce6da816cfa917fb7df4bb80e669eb459d85586498414/cramjam-2.11.0-cp314-cp314-musllinux_1_1_aarch64.whl", hash = "sha256:36aa5a798aa34e11813a80425a30d8e052d8de4a28f27bfc0368cfc454d1b403", size = 2030905, upload-time = "2025-07-27T21:23:33.696Z" }, + { url = "https://files.pythonhosted.org/packages/fc/52/e429de4e8bc86ee65e090dae0f87f45abd271742c63fb2d03c522ffde28a/cramjam-2.11.0-cp314-cp314-musllinux_1_1_armv7l.whl", hash = "sha256:449fca52774dc0199545fbf11f5128933e5a6833946707885cf7be8018017839", size = 2155592, upload-time = "2025-07-27T21:23:35.375Z" }, + { url = "https://files.pythonhosted.org/packages/6c/6c/65a7a0207787ad39ad804af4da7f06a60149de19481d73d270b540657234/cramjam-2.11.0-cp314-cp314-musllinux_1_1_i686.whl", hash = "sha256:d87d37b3d476f4f7623c56a232045d25bd9b988314702ea01bd9b4a94948a778", size = 2170839, upload-time = "2025-07-27T21:23:37.197Z" }, + { url = "https://files.pythonhosted.org/packages/b2/c5/5c5db505ba692bc844246b066e23901d5905a32baf2f33719c620e65887f/cramjam-2.11.0-cp314-cp314-musllinux_1_1_x86_64.whl", hash = "sha256:26cb45c47d71982d76282e303931c6dd4baee1753e5d48f9a89b3a63e690b3a3", size = 2157236, upload-time = "2025-07-27T21:23:38.854Z" }, + { url = "https://files.pythonhosted.org/packages/b0/22/88e6693e60afe98901e5bbe91b8dea193e3aa7f42e2770f9c3339f5c1065/cramjam-2.11.0-cp314-cp314-win32.whl", hash = "sha256:4efe919d443c2fd112fe25fe636a52f9628250c9a50d9bddb0488d8a6c09acc6", size = 1604136, upload-time = "2025-07-27T21:23:40.56Z" }, + { url = "https://files.pythonhosted.org/packages/cc/f8/01618801cd59ccedcc99f0f96d20be67d8cfc3497da9ccaaad6b481781dd/cramjam-2.11.0-cp314-cp314-win_amd64.whl", hash = "sha256:ccec3524ea41b9abd5600e3e27001fd774199dbb4f7b9cb248fcee37d4bda84c", size = 1710272, upload-time = "2025-07-27T21:23:42.236Z" }, + { url = "https://files.pythonhosted.org/packages/40/81/6cdb3ed222d13ae86bda77aafe8d50566e81a1169d49ed195b6263610704/cramjam-2.11.0-cp314-cp314t-macosx_10_12_x86_64.macosx_11_0_arm64.macosx_10_12_universal2.whl", hash = "sha256:966ac9358b23d21ecd895c418c048e806fd254e46d09b1ff0cdad2eba195ea3e", size = 3559671, upload-time = "2025-07-27T21:23:44.504Z" }, + { url = "https://files.pythonhosted.org/packages/cb/43/52b7e54fe5ba1ef0270d9fdc43dabd7971f70ea2d7179be918c997820247/cramjam-2.11.0-cp314-cp314t-macosx_10_12_x86_64.whl", hash = "sha256:387f09d647a0d38dcb4539f8a14281f8eb6bb1d3e023471eb18a5974b2121c86", size = 1867876, upload-time = "2025-07-27T21:23:46.987Z" }, + { url = "https://files.pythonhosted.org/packages/9d/28/30d5b8d10acd30db3193bc562a313bff722888eaa45cfe32aa09389f2b24/cramjam-2.11.0-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:665b0d8fbbb1a7f300265b43926457ec78385200133e41fef19d85790fc1e800", size = 1695562, upload-time = "2025-07-27T21:23:48.644Z" }, + { url = "https://files.pythonhosted.org/packages/d9/86/ec806f986e01b896a650655024ea52a13e25c3ac8a3a382f493089483cdc/cramjam-2.11.0-cp314-cp314t-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:ca905387c7a371531b9622d93471be4d745ef715f2890c3702479cd4fc85aa51", size = 2025056, upload-time = "2025-07-27T21:23:50.404Z" }, + { url = "https://files.pythonhosted.org/packages/09/43/c2c17586b90848d29d63181f7d14b8bd3a7d00975ad46e3edf2af8af7e1f/cramjam-2.11.0-cp314-cp314t-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3c1aa56aef2c8af55a21ed39040a94a12b53fb23beea290f94d19a76027e2ffb", size = 1764084, upload-time = "2025-07-27T21:23:52.265Z" }, + { url = "https://files.pythonhosted.org/packages/2b/a9/68bc334fadb434a61df10071dc8606702aa4f5b6cdb2df62474fc21d2845/cramjam-2.11.0-cp314-cp314t-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:e5db59c1cdfaa2ab85cc988e602d6919495f735ca8a5fd7603608eb1e23c26d5", size = 1854859, upload-time = "2025-07-27T21:23:54.085Z" }, + { url = "https://files.pythonhosted.org/packages/5b/4e/b48e67835b5811ec5e9cb2e2bcba9c3fd76dab3e732569fe801b542c6ca9/cramjam-2.11.0-cp314-cp314t-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:b1f893014f00fe5e89a660a032e813bf9f6d91de74cd1490cdb13b2b59d0c9a3", size = 2035970, upload-time = "2025-07-27T21:23:55.758Z" }, + { url = "https://files.pythonhosted.org/packages/c4/70/d2ac33d572b4d90f7f0f2c8a1d60fb48f06b128fdc2c05f9b49891bb0279/cramjam-2.11.0-cp314-cp314t-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c26a1eb487947010f5de24943bd7c422dad955b2b0f8650762539778c380ca89", size = 2069320, upload-time = "2025-07-27T21:23:57.494Z" }, + { url = "https://files.pythonhosted.org/packages/1d/4c/85cec77af4a74308ba5fca8e296c4e2f80ec465c537afc7ab1e0ca2f9a00/cramjam-2.11.0-cp314-cp314t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7d5c8bfb438d94e7b892d1426da5fc4b4a5370cc360df9b8d9d77c33b896c37e", size = 1982668, upload-time = "2025-07-27T21:23:59.126Z" }, + { url = "https://files.pythonhosted.org/packages/55/45/938546d1629e008cc3138df7c424ef892719b1796ff408a2ab8550032e5e/cramjam-2.11.0-cp314-cp314t-musllinux_1_1_aarch64.whl", hash = "sha256:cb1fb8c9337ab0da25a01c05d69a0463209c347f16512ac43be5986f3d1ebaf4", size = 2034028, upload-time = "2025-07-27T21:24:00.865Z" }, + { url = "https://files.pythonhosted.org/packages/01/76/b5a53e20505555f1640e66dcf70394bcf51a1a3a072aa18ea35135a0f9ed/cramjam-2.11.0-cp314-cp314t-musllinux_1_1_armv7l.whl", hash = "sha256:1f6449f6de52dde3e2f1038284910c8765a397a25e2d05083870f3f5e7fc682c", size = 2155513, upload-time = "2025-07-27T21:24:02.92Z" }, + { url = "https://files.pythonhosted.org/packages/84/12/8d3f6ceefae81bbe45a347fdfa2219d9f3ac75ebc304f92cd5fcb4fbddc5/cramjam-2.11.0-cp314-cp314t-musllinux_1_1_i686.whl", hash = "sha256:382dec4f996be48ed9c6958d4e30c2b89435d7c2c4dbf32480b3b8886293dd65", size = 2170035, upload-time = "2025-07-27T21:24:04.558Z" }, + { url = "https://files.pythonhosted.org/packages/4b/85/3be6f0a1398f976070672be64f61895f8839857618a2d8cc0d3ab529d3dc/cramjam-2.11.0-cp314-cp314t-musllinux_1_1_x86_64.whl", hash = "sha256:d388bd5723732c3afe1dd1d181e4213cc4e1be210b080572e7d5749f6e955656", size = 2160229, upload-time = "2025-07-27T21:24:06.729Z" }, + { url = "https://files.pythonhosted.org/packages/57/5e/66cfc3635511b20014bbb3f2ecf0095efb3049e9e96a4a9e478e4f3d7b78/cramjam-2.11.0-cp314-cp314t-win32.whl", hash = "sha256:0a70ff17f8e1d13f322df616505550f0f4c39eda62290acb56f069d4857037c8", size = 1610267, upload-time = "2025-07-27T21:24:08.428Z" }, + { url = "https://files.pythonhosted.org/packages/ce/c6/c71e82e041c95ffe6a92ac707785500aa2a515a4339c2c7dd67e3c449249/cramjam-2.11.0-cp314-cp314t-win_amd64.whl", hash = "sha256:028400d699442d40dbda02f74158c73d05cb76587a12490d0bfedd958fd49188", size = 1713108, upload-time = "2025-07-27T21:24:10.147Z" }, + { url = "https://files.pythonhosted.org/packages/81/da/b3301962ccd6fce9fefa1ecd8ea479edaeaa38fadb1f34d5391d2587216a/cramjam-2.11.0-pp311-pypy311_pp73-macosx_10_12_x86_64.macosx_11_0_arm64.macosx_10_12_universal2.whl", hash = "sha256:52d5db3369f95b27b9f3c14d067acb0b183333613363ed34268c9e04560f997f", size = 3573546, upload-time = "2025-07-27T21:24:52.944Z" }, + { url = "https://files.pythonhosted.org/packages/b6/c2/410ddb8ad4b9dfb129284666293cb6559479645da560f7077dc19d6bee9e/cramjam-2.11.0-pp311-pypy311_pp73-macosx_10_12_x86_64.whl", hash = "sha256:4820516366d455b549a44d0e2210ee7c4575882dda677564ce79092588321d54", size = 1873654, upload-time = "2025-07-27T21:24:54.958Z" }, + { url = "https://files.pythonhosted.org/packages/d5/99/f68a443c64f7ce7aff5bed369b0aa5b2fac668fa3dfd441837e316e97a1f/cramjam-2.11.0-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:d9e5db525dc0a950a825202f84ee68d89a072479e07da98795a3469df942d301", size = 1702846, upload-time = "2025-07-27T21:24:57.124Z" }, + { url = "https://files.pythonhosted.org/packages/6c/02/0ff358ab773def1ee3383587906c453d289953171e9c92db84fdd01bf172/cramjam-2.11.0-pp311-pypy311_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:62ab4971199b2270005359cdc379bc5736071dc7c9a228581c5122d9ffaac50c", size = 1773683, upload-time = "2025-07-27T21:24:59.28Z" }, + { url = "https://files.pythonhosted.org/packages/e9/31/3298e15f87c9cf2aabdbdd90b153d8644cf989cb42a45d68a1b71e1f7aaf/cramjam-2.11.0-pp311-pypy311_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:24758375cc5414d3035ca967ebb800e8f24604ececcba3c67d6f0218201ebf2d", size = 1994136, upload-time = "2025-07-27T21:25:01.565Z" }, + { url = "https://files.pythonhosted.org/packages/c7/90/20d1747255f1ee69a412e319da51ea594c18cca195e7a4d4c713f045eff5/cramjam-2.11.0-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:6c2eea545fef1065c7dd4eda991666fd9c783fbc1d226592ccca8d8891c02f23", size = 1714982, upload-time = "2025-07-27T21:25:05.79Z" }, +] + +[[package]] +name = "crontab" +version = "1.0.5" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/d6/36/a255b6f5a2e22df03fd2b2f3088974b44b8c9e9407e26b44742cb7cfbf5b/crontab-1.0.5.tar.gz", hash = "sha256:f80e01b4f07219763a9869f926dd17147278e7965a928089bca6d3dc80ae46d5", size = 21963, upload-time = "2025-07-09T17:09:38.264Z" } + +[[package]] +name = "cryptography" +version = "48.0.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "cffi", marker = "platform_python_implementation != 'PyPy'" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/9f/a9/db8f313fdcd85d767d4973515e1db101f9c71f95fced83233de224673757/cryptography-48.0.0.tar.gz", hash = "sha256:5c3932f4436d1cccb036cb0eaef46e6e2db91035166f1ad6505c3c9d5a635920", size = 832984, upload-time = "2026-05-04T22:59:38.133Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/df/3d/01f6dd9190170a5a241e0e98c2d04be3664a9e6f5b9b872cde63aff1c3dd/cryptography-48.0.0-cp311-abi3-macosx_10_9_universal2.whl", hash = "sha256:0c558d2cdffd8f4bbb30fc7134c74d2ca9a476f830bb053074498fbc86f41ed6", size = 8001587, upload-time = "2026-05-04T22:57:36.803Z" }, + { url = "https://files.pythonhosted.org/packages/b2/6e/e90527eef33f309beb811cf7c982c3aeffcce8e3edb178baa4ca3ae4a6fa/cryptography-48.0.0-cp311-abi3-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:f5333311663ea94f75dd408665686aaf426563556bb5283554a3539177e03b8c", size = 4690433, upload-time = "2026-05-04T22:57:40.373Z" }, + { url = "https://files.pythonhosted.org/packages/90/04/673510ed51ddff56575f306cf1617d80411ee76831ccd3097599140efdfe/cryptography-48.0.0-cp311-abi3-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:7995ef305d7165c3f11ae07f2517e5a4f1d5c18da1376a0a9ed496336b69e5f3", size = 4710620, upload-time = "2026-05-04T22:57:42.935Z" }, + { url = "https://files.pythonhosted.org/packages/14/d5/e9c4ef932c8d800490c34d8bd589d64a31d5890e27ec9e9ad532be893294/cryptography-48.0.0-cp311-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:40ba1f85eaa6959837b1d51c9767e230e14612eea4ef110ee8854ada22da1bf5", size = 4696283, upload-time = "2026-05-04T22:57:45.294Z" }, + { url = "https://files.pythonhosted.org/packages/0c/29/174b9dfb60b12d59ecfc6cfa04bc88c21b42a54f01b8aae09bb6e51e4c7f/cryptography-48.0.0-cp311-abi3-manylinux_2_28_ppc64le.whl", hash = "sha256:369a6348999f94bbd53435c894377b20ab95f25a9065c283570e70150d8abc3c", size = 5296573, upload-time = "2026-05-04T22:57:47.933Z" }, + { url = "https://files.pythonhosted.org/packages/95/38/0d29a6fd7d0d1373f0c0c88a04ba20e359b257753ac497564cd660fc1d55/cryptography-48.0.0-cp311-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:a0e692c683f4df67815a2d258b324e66f4738bd7a96a218c826dce4f4bd05d8f", size = 4743677, upload-time = "2026-05-04T22:57:50.067Z" }, + { url = "https://files.pythonhosted.org/packages/30/be/eef653013d5c63b6a490529e0316f9ac14a37602965d4903efed1399f32b/cryptography-48.0.0-cp311-abi3-manylinux_2_31_armv7l.whl", hash = "sha256:18349bbc56f4743c8b12dc32e2bccb2cf83ee8b69a3bba74ef8ae857e26b3d25", size = 4330808, upload-time = "2026-05-04T22:57:52.301Z" }, + { url = "https://files.pythonhosted.org/packages/84/9e/500463e87abb7a0a0f9f256ec21123ecde0a7b5541a15e840ea54551fd81/cryptography-48.0.0-cp311-abi3-manylinux_2_34_aarch64.whl", hash = "sha256:7e8eac43dfca5c4cccc6dad9a80504436fca53bb9bc3100a2386d730fbe6b602", size = 4695941, upload-time = "2026-05-04T22:57:54.603Z" }, + { url = "https://files.pythonhosted.org/packages/e3/dc/7303087450c2ec9e7fbb750e17c2abfbc658f23cbd0e54009509b7cc4091/cryptography-48.0.0-cp311-abi3-manylinux_2_34_ppc64le.whl", hash = "sha256:9ccdac7d40688ecb5a3b4a604b8a88c8002e3442d6c60aead1db2a89a041560c", size = 5252579, upload-time = "2026-05-04T22:57:57.207Z" }, + { url = "https://files.pythonhosted.org/packages/d0/c0/7101d3b7215edcdc90c45da544961fd8ed2d6448f77577460fa75a8443f7/cryptography-48.0.0-cp311-abi3-manylinux_2_34_x86_64.whl", hash = "sha256:bd72e68b06bb1e96913f97dd4901119bc17f39d4586a5adf2d3e47bc2b9d58b5", size = 4743326, upload-time = "2026-05-04T22:57:59.535Z" }, + { url = "https://files.pythonhosted.org/packages/ac/d8/5b833bad13016f562ab9d063d68199a4bd121d18458e439515601d3357ec/cryptography-48.0.0-cp311-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:59baa2cb386c4f0b9905bd6eb4c2a79a69a128408fd31d32ca4d7102d4156321", size = 4826672, upload-time = "2026-05-04T22:58:01.996Z" }, + { url = "https://files.pythonhosted.org/packages/98/e1/7074eb8bf3c135558c73fc2bcf0f5633f912e6fb87e868a55c454080ef09/cryptography-48.0.0-cp311-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:9249e3cd978541d665967ac2cb2787fd6a62bddf1e75b3e347a594d7dacf4f74", size = 4972574, upload-time = "2026-05-04T22:58:03.968Z" }, + { url = "https://files.pythonhosted.org/packages/04/70/e5a1b41d325f797f39427aa44ef8baf0be500065ab6d8e10369d850d4a4f/cryptography-48.0.0-cp311-abi3-win32.whl", hash = "sha256:9c459db21422be75e2809370b829a87eb37f74cd785fc4aa9ea1e5f43b47cda4", size = 3294868, upload-time = "2026-05-04T22:58:06.467Z" }, + { url = "https://files.pythonhosted.org/packages/f4/ac/8ac51b4a5fc5932eb7ee5c517ba7dc8cd834f0048962b6b352f00f41ebf9/cryptography-48.0.0-cp311-abi3-win_amd64.whl", hash = "sha256:5b012212e08b8dd5edc78ef54da83dd9892fd9105323b3993eff6bea65dc21d7", size = 3817107, upload-time = "2026-05-04T22:58:08.845Z" }, + { url = "https://files.pythonhosted.org/packages/6b/84/70e3feea9feea87fd7cbe77efb2712ae1e3e6edf10749dc6e95f4e60e455/cryptography-48.0.0-cp314-cp314t-macosx_10_9_universal2.whl", hash = "sha256:3cb07a3ed6431663cd321ea8a000a1314c74211f823e4177fefa2255e057d1ec", size = 7986556, upload-time = "2026-05-04T22:58:11.172Z" }, + { url = "https://files.pythonhosted.org/packages/89/6e/18e07a618bb5442ba10cf4df16e99c071365528aa570dfcb8c02e25a303b/cryptography-48.0.0-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:8c7378637d7d88016fa6791c159f698b3d3eed28ebf844ac36b9dc04a14dae18", size = 4684776, upload-time = "2026-05-04T22:58:13.712Z" }, + { url = "https://files.pythonhosted.org/packages/be/6a/4ea3b4c6c6759794d5ee2103c304a5076dc4b19ae1f9fe47dba439e159e9/cryptography-48.0.0-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:cc90c0b39b2e3c65ef52c804b72e3c58f8a04ab2a1871272798e5f9572c17d20", size = 4698121, upload-time = "2026-05-04T22:58:16.448Z" }, + { url = "https://files.pythonhosted.org/packages/2f/59/6ff6ad6cae03bb887da2a5860b2c9805f8dac969ef01ce563336c49bd1d1/cryptography-48.0.0-cp314-cp314t-manylinux_2_28_aarch64.whl", hash = "sha256:76341972e1eff8b4bea859f09c0d3e64b96ce931b084f9b9b7db8ef364c30eff", size = 4690042, upload-time = "2026-05-04T22:58:18.544Z" }, + { url = "https://files.pythonhosted.org/packages/ca/b4/fc334ed8cfd705aca282fe4d8f5ae64a8e0f74932e9feecb344610cf6e4d/cryptography-48.0.0-cp314-cp314t-manylinux_2_28_ppc64le.whl", hash = "sha256:55b7718303bf06a5753dcdccf2f3945cf18ad7bffde41b61226e4db31ab89a9c", size = 5282526, upload-time = "2026-05-04T22:58:20.75Z" }, + { url = "https://files.pythonhosted.org/packages/11/08/9f8c5386cc4cd90d8255c7cdd0f5baf459a08502a09de30dc51f553d38dc/cryptography-48.0.0-cp314-cp314t-manylinux_2_28_x86_64.whl", hash = "sha256:a64697c641c7b1b2178e573cbc31c7c6684cd56883a478d75143dbb7118036db", size = 4733116, upload-time = "2026-05-04T22:58:23.627Z" }, + { url = "https://files.pythonhosted.org/packages/b8/77/99307d7574045699f8805aa500fa0fb83422d115b5400a064ddd306d7750/cryptography-48.0.0-cp314-cp314t-manylinux_2_31_armv7l.whl", hash = "sha256:561215ea3879cb1cbbf272867e2efda62476f240fb58c64de6b393ae19246741", size = 4316030, upload-time = "2026-05-04T22:58:25.581Z" }, + { url = "https://files.pythonhosted.org/packages/fd/36/a608b98337af3cb2aff4818e406649d30572b7031918b04c87d979495348/cryptography-48.0.0-cp314-cp314t-manylinux_2_34_aarch64.whl", hash = "sha256:ad64688338ed4bc1a6618076ba75fd7194a5f1797ac60b47afe926285adb3166", size = 4689640, upload-time = "2026-05-04T22:58:27.747Z" }, + { url = "https://files.pythonhosted.org/packages/dd/a6/825010a291b4438aecc1f568bc428189fc1175515223632477c07dc0a6df/cryptography-48.0.0-cp314-cp314t-manylinux_2_34_ppc64le.whl", hash = "sha256:906cbf0670286c6e0044156bc7d4af9cbb0ef6db9f73e52c3ec56ba6bdde5336", size = 5237657, upload-time = "2026-05-04T22:58:29.848Z" }, + { url = "https://files.pythonhosted.org/packages/b9/09/4e76a09b4caa29aad535ddc806f5d4c5d01885bd978bd984fbc6ca032cae/cryptography-48.0.0-cp314-cp314t-manylinux_2_34_x86_64.whl", hash = "sha256:ea8990436d914540a40ab24b6a77c0969695ed52f4a4874c5137ccf7045a7057", size = 4732362, upload-time = "2026-05-04T22:58:32.009Z" }, + { url = "https://files.pythonhosted.org/packages/18/78/444fa04a77d0cb95f417dda20d450e13c56ba8e5220fc892a1658f44f882/cryptography-48.0.0-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:c18684a7f0cc9a3cb60328f496b8e3372def7c5d2df39ac267878b05565aaaae", size = 4819580, upload-time = "2026-05-04T22:58:34.254Z" }, + { url = "https://files.pythonhosted.org/packages/38/85/ea67067c70a1fd4be2c63d35eeed82658023021affccc7b17705f8527dd2/cryptography-48.0.0-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:9be5aafa5736574f8f15f262adc81b2a9869e2cfe9014d52a44633905b40d52c", size = 4963283, upload-time = "2026-05-04T22:58:36.376Z" }, + { url = "https://files.pythonhosted.org/packages/75/54/cc6d0f3deac3e81c7f847e8a189a12b6cdd65059b43dad25d4316abd849a/cryptography-48.0.0-cp314-cp314t-win32.whl", hash = "sha256:c17dfe85494deaeddc5ce251aebd1d60bbe6afc8b62071bb0b469431a000124f", size = 3270954, upload-time = "2026-05-04T22:58:38.791Z" }, + { url = "https://files.pythonhosted.org/packages/49/67/cc947e288c0758a4e5473d1dcb743037ab7785541265a969240b8885441a/cryptography-48.0.0-cp314-cp314t-win_amd64.whl", hash = "sha256:27241b1dc9962e056062a8eef1991d02c3a24569c95975bd2322a8a52c6e5e12", size = 3797313, upload-time = "2026-05-04T22:58:40.746Z" }, + { url = "https://files.pythonhosted.org/packages/f2/63/61d4a4e1c6b6bab6ce1e213cd36a24c415d90e76d78c5eb8577c5541d2e8/cryptography-48.0.0-cp39-abi3-macosx_10_9_universal2.whl", hash = "sha256:58d00498e8933e4a194f3076aee1b4a97dfec1a6da444535755822fe5d8b0b86", size = 7983482, upload-time = "2026-05-04T22:58:43.769Z" }, + { url = "https://files.pythonhosted.org/packages/d5/ac/f5b5995b87770c693e2596559ffafe195b4033a57f14a82268a2842953f3/cryptography-48.0.0-cp39-abi3-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:614d0949f4790582d2cc25553abd09dd723025f0c0e7c67376a1d77196743d6e", size = 4683266, upload-time = "2026-05-04T22:58:46.064Z" }, + { url = "https://files.pythonhosted.org/packages/ec/c6/8b14f67e18338fbc4adb76f66c001f5c3610b3e2d1837f268f47a347dbbb/cryptography-48.0.0-cp39-abi3-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:7ce4bfae76319a532a2dc68f82cc32f5676ee792a983187dac07183690e5c66f", size = 4696228, upload-time = "2026-05-04T22:58:48.22Z" }, + { url = "https://files.pythonhosted.org/packages/ea/73/f808fbae9514bd91b47875b003f13e284c8c6bdfd904b7944e803937eec1/cryptography-48.0.0-cp39-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:2eb992bbd4661238c5a397594c83f5b4dc2bc5b848c365c8f991b6780efcc5c7", size = 4689097, upload-time = "2026-05-04T22:58:50.9Z" }, + { url = "https://files.pythonhosted.org/packages/93/01/d86632d7d28db8ae83221995752eeb6639ffb374c2d22955648cf8d52797/cryptography-48.0.0-cp39-abi3-manylinux_2_28_ppc64le.whl", hash = "sha256:22a5cb272895dce158b2cacdfdc3debd299019659f42947dbdac6f32d68fe832", size = 5283582, upload-time = "2026-05-04T22:58:53.017Z" }, + { url = "https://files.pythonhosted.org/packages/02/e1/50edc7a50334807cc4791fc4a0ce7468b4a1416d9138eab358bfc9a3d70b/cryptography-48.0.0-cp39-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:2b4d59804e8408e2fea7d1fbaf218e5ec984325221db76e6a241a9abd6cdd95c", size = 4730479, upload-time = "2026-05-04T22:58:55.611Z" }, + { url = "https://files.pythonhosted.org/packages/6f/af/99a582b1b1641ff5911ac559beb45097cf79efd4ead4657f578ef1af2d47/cryptography-48.0.0-cp39-abi3-manylinux_2_31_armv7l.whl", hash = "sha256:984a20b0f62a26f48a3396c72e4bc34c66e356d356bf370053066b3b6d54634a", size = 4326481, upload-time = "2026-05-04T22:58:57.607Z" }, + { url = "https://files.pythonhosted.org/packages/90/ee/89aa26a06ef0a7d7611788ffd571a7c50e368cc6a4d5eef8b4884e866edb/cryptography-48.0.0-cp39-abi3-manylinux_2_34_aarch64.whl", hash = "sha256:5a5ed8fde7a1d09376ca0b40e68cd59c69fe23b1f9768bd5824f54681626032a", size = 4688713, upload-time = "2026-05-04T22:59:00.077Z" }, + { url = "https://files.pythonhosted.org/packages/70/ba/bcb1b0bb7a33d4c7c0c4d4c7874b4a62ae4f56113a5f4baefa362dfb1f0f/cryptography-48.0.0-cp39-abi3-manylinux_2_34_ppc64le.whl", hash = "sha256:8cd666227ef7af430aa5914a9910e0ddd703e75f039cef0825cd0da71b6b711a", size = 5238165, upload-time = "2026-05-04T22:59:02.317Z" }, + { url = "https://files.pythonhosted.org/packages/c9/70/ca4003b1ce5ca3dc3186ada51908c8a9b9ff7d5cab83cc0d43ee14ec144f/cryptography-48.0.0-cp39-abi3-manylinux_2_34_x86_64.whl", hash = "sha256:9071196d81abc88b3516ac8cdfad32e2b66dd4a5393a8e68a961e9161ddc6239", size = 4729947, upload-time = "2026-05-04T22:59:05.255Z" }, + { url = "https://files.pythonhosted.org/packages/44/a0/4ec7cf774207905aef1a8d11c3750d5a1db805eb380ee4e16df317870128/cryptography-48.0.0-cp39-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:1e2d54c8be6152856a36f0882ab231e70f8ec7f14e93cf87db8a2ed056bf160c", size = 4822059, upload-time = "2026-05-04T22:59:07.802Z" }, + { url = "https://files.pythonhosted.org/packages/1e/75/a2e55f99c16fcac7b5d6c1eb19ad8e00799854d6be5ca845f9259eae1681/cryptography-48.0.0-cp39-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:a5da777e32ffed6f85a7b2b3f7c5cbc88c146bfcd0a1d7baf5fcc6c52ee35dd4", size = 4960575, upload-time = "2026-05-04T22:59:09.851Z" }, + { url = "https://files.pythonhosted.org/packages/b8/23/6e6f32143ab5d8b36ca848a502c4bcd477ae75b9e1677e3530d669062578/cryptography-48.0.0-cp39-abi3-win32.whl", hash = "sha256:77a2ccbbe917f6710e05ba9adaa25fb5075620bf3ea6fb751997875aff4ae4bd", size = 3279117, upload-time = "2026-05-04T22:59:12.019Z" }, + { url = "https://files.pythonhosted.org/packages/9d/9a/0fea98a70cf1749d41d738836f6349d97945f7c89433a259a6c2642eefeb/cryptography-48.0.0-cp39-abi3-win_amd64.whl", hash = "sha256:16cd65b9330583e4619939b3a3843eec1e6e789744bb01e7c7e2e62e33c239c8", size = 3792100, upload-time = "2026-05-04T22:59:14.884Z" }, + { url = "https://files.pythonhosted.org/packages/be/d2/024b5e06be9d44cb021fb0e1a03d34d63989cf56a0fe62f3dfbab695b9b4/cryptography-48.0.0-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:84cf79f0dc8b36ac5da873481716e87aef31fcfa0444f9e1d8b4b2cece142855", size = 3950391, upload-time = "2026-05-04T22:59:17.415Z" }, + { url = "https://files.pythonhosted.org/packages/bc/17/3861e17c56fa0fd37491a14a8673fdb77c57fc5693cafe745ea8b06dba75/cryptography-48.0.0-pp311-pypy311_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:fdfef35d751d510fcef5252703621574364fec16418c4a1e5e1055248401054b", size = 4637126, upload-time = "2026-05-04T22:59:20.197Z" }, + { url = "https://files.pythonhosted.org/packages/f0/0a/7e226dbff530f21480727eb764973a7bff2b912f8e15cd4f129e71b56d1d/cryptography-48.0.0-pp311-pypy311_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:0890f502ddf7d9c6426129c3f49f5c0a39278ed7cd6322c8755ffca6ee675a13", size = 4667270, upload-time = "2026-05-04T22:59:22.647Z" }, + { url = "https://files.pythonhosted.org/packages/3b/f2/5a72274ca9f1b2a8b44a662ee0bf1b435909deb473d6f97bcd035bcdbc71/cryptography-48.0.0-pp311-pypy311_pp73-manylinux_2_34_aarch64.whl", hash = "sha256:ecde28a596bead48b0cfd2a1b4416c3d43074c2d785e3a398d7ec1fc4d0f7fbb", size = 4636797, upload-time = "2026-05-04T22:59:24.912Z" }, + { url = "https://files.pythonhosted.org/packages/b4/e1/48cedb2fe63626e91ded1edad159e2a4fb8b6906c4425eb7749673077ce7/cryptography-48.0.0-pp311-pypy311_pp73-manylinux_2_34_x86_64.whl", hash = "sha256:4defde8685ae324a9eb9d818717e93b4638ef67070ac9bc15b8ca85f63048355", size = 4666800, upload-time = "2026-05-04T22:59:27.474Z" }, + { url = "https://files.pythonhosted.org/packages/a2/ca/7e8365deec19afb2b2c7be7c1c0aa8f99633b54e90c570999acda93260fc/cryptography-48.0.0-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:db63bf618e5dea46c07de12e900fe1cdd2541e6dc9dbae772a70b7d4d4765f6a", size = 3739536, upload-time = "2026-05-04T22:59:29.61Z" }, +] + +[[package]] +name = "css-html-js-minify" +version = "2.5.5" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/75/61/f52e5225abe8e36ed5396e5ae3074df5f4ef994b540e9b4fd55a39b03cfd/css-html-js-minify-2.5.5.zip", hash = "sha256:4a9f11f7e0496f5284d12111f3ba4ff5ff2023d12f15d195c9c48bd97013746c", size = 33156, upload-time = "2018-04-14T15:10:29.53Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/e8/21/1260081a2c67105a3bd0f8692ff3c80b5f0cb5fe9f3f8fd4a990f17b8a39/css_html_js_minify-2.5.5-py2.py3-none-any.whl", hash = "sha256:3da9d35ac0db8ca648c1b543e0e801d7ca0bab9e6bfd8418fee59d5ae001727a", size = 40527, upload-time = "2018-04-14T15:10:26.667Z" }, +] + +[[package]] +name = "cycler" +version = "0.12.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/a9/95/a3dbbb5028f35eafb79008e7522a75244477d2838f38cbb722248dabc2a8/cycler-0.12.1.tar.gz", hash = "sha256:88bb128f02ba341da8ef447245a9e138fae777f6a23943da4540077d3601eb1c", size = 7615, upload-time = "2023-10-07T05:32:18.335Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/e7/05/c19819d5e3d95294a6f5947fb9b9629efb316b96de511b418c53d245aae6/cycler-0.12.1-py3-none-any.whl", hash = "sha256:85cef7cff222d8644161529808465972e51340599459b8ac3ccbac5a854e0d30", size = 8321, upload-time = "2023-10-07T05:32:16.783Z" }, +] + +[[package]] +name = "dateparser" +version = "1.4.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "python-dateutil" }, + { name = "pytz" }, + { name = "regex" }, + { name = "tzlocal" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/46/2d/a0ccdb78788064fa0dc901b8524e50615c42be1d78b78d646d0b28d09180/dateparser-1.4.0.tar.gz", hash = "sha256:97a21840d5ecdf7630c584f673338a5afac5dfe84f647baf4d7e8df98f9354a4", size = 321512, upload-time = "2026-03-26T09:56:10.292Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/b4/0b/3c3bb7cbe757279e693a0be6049048012f794d01f81099609ecd53b899f0/dateparser-1.4.0-py3-none-any.whl", hash = "sha256:7902b8e85d603494bf70a5a0b1decdddb2270b9c6e6b2bc8a57b93476c0df378", size = 300379, upload-time = "2026-03-26T09:56:08.409Z" }, +] + +[[package]] +name = "ddtrace" +version = "4.3.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "bytecode" }, + { name = "envier" }, + { name = "opentelemetry-api" }, + { name = "wrapt" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/bc/d0/0690d1b88b936ab31219ca9078859316185989be0d186ff33896f3191d39/ddtrace-4.3.0.tar.gz", hash = "sha256:366bc941a20137e6f5bff22aefd6a221ca15f1b087c31bf28fce448619f443b4", size = 7085760, upload-time = "2026-01-27T20:55:27.878Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/62/92/a4335be1b8ccebca11c2fc30dbd38e7c31f20025ac5fa29c781fcf7e839f/ddtrace-4.3.0-cp311-cp311-macosx_14_0_arm64.whl", hash = "sha256:c41f5598ec26fc75a12f88131f14cf8728fbef3a5077ab3092b66f65a56f0cfd", size = 6646276, upload-time = "2026-01-27T20:53:26.621Z" }, + { url = "https://files.pythonhosted.org/packages/79/04/c82807bfe651fb2fe04cb3a097a8988638a8ffe31f38a34f7a9cdd8ed227/ddtrace-4.3.0-cp311-cp311-macosx_14_0_x86_64.whl", hash = "sha256:0971a52d0474a1a5c417aa628ccb81a3f530acc7b054cd2040740bc200193068", size = 7046186, upload-time = "2026-01-27T20:53:28.498Z" }, + { url = "https://files.pythonhosted.org/packages/fc/d6/5091e3dcb0e3b15f11165faab3c0cfff91d1fe69b1adf34843246e04c891/ddtrace-4.3.0-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:2a5e2903d6634adf685939ca7ede2aa900a1315911f14e3081399e3dcad32b15", size = 7728637, upload-time = "2026-01-27T20:53:30.407Z" }, + { url = "https://files.pythonhosted.org/packages/d6/e0/c5438aca0281bd511260d55d361fca9904d988896baee2e09eb456ca3c42/ddtrace-4.3.0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:ce7adf94dc12edff5ddecd9a0ec751f99148578798142bb228f7b3713505d1f7", size = 8008249, upload-time = "2026-01-27T20:53:32.623Z" }, + { url = "https://files.pythonhosted.org/packages/0a/49/aa3452696bed00632ca9dd4a99bf1fca9342c0a386b2ff4e3fbc683cd9f6/ddtrace-4.3.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:6bb56dfda0b69e324d8b90efdff6b506cd86cadbb336d7e265deb11886eb1322", size = 8736182, upload-time = "2026-01-27T20:53:35.08Z" }, + { url = "https://files.pythonhosted.org/packages/48/bf/7d1da3d02b7ff0d10fea86494a60cc0720e33d4f1a85e5fa1274e9b03a64/ddtrace-4.3.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:a9ba79cb934286d43ad4314269af5c63057d63aadcf1a9d201feb2a02077e98c", size = 9066094, upload-time = "2026-01-27T20:53:37.646Z" }, + { url = "https://files.pythonhosted.org/packages/df/81/e814aedec968a43c6408054eef53b5a5d2ff54d80db2199b60478aa671d9/ddtrace-4.3.0-cp311-cp311-win32.whl", hash = "sha256:557775da26e9cb3d4b5e742028a566a6910f85cfc23b111d265e44358dd32860", size = 5114320, upload-time = "2026-01-27T20:53:39.924Z" }, + { url = "https://files.pythonhosted.org/packages/a3/7d/c891543ff0f581e6ae63a5c12b9b521ee2485ff9837a7bbe5aa13e534f9c/ddtrace-4.3.0-cp311-cp311-win_amd64.whl", hash = "sha256:456cc48ac86736452a803f914ebe7f73e32504c2490ef0ae4973e84b6a9571fc", size = 5652238, upload-time = "2026-01-27T20:53:42.351Z" }, + { url = "https://files.pythonhosted.org/packages/66/cb/71f7f34a63ebbfb86fd7511d900d2b4f3b94e4d1a6fb81b2e0f41e84918b/ddtrace-4.3.0-cp311-cp311-win_arm64.whl", hash = "sha256:f7d606f5510ef0ffcc1d42ecc5ecb8700060d6e456148d46d079b47e7f55f863", size = 5368001, upload-time = "2026-01-27T20:53:44.443Z" }, + { url = "https://files.pythonhosted.org/packages/65/21/7ad3a13b5cb21b951d399995e587c04ae72bd7e09741a535221b31aa943a/ddtrace-4.3.0-cp312-cp312-macosx_14_0_arm64.whl", hash = "sha256:ef5ae88f516654b37fcc8fc7154ffa9d1e8eb8b3be6d6f08f87f681e35937ef7", size = 6903861, upload-time = "2026-01-27T20:53:46.975Z" }, + { url = "https://files.pythonhosted.org/packages/fa/f2/837756c6ca7f45a6e7f9bcea31ae31df8707604a7aec09b4fec810abf01b/ddtrace-4.3.0-cp312-cp312-macosx_14_0_x86_64.whl", hash = "sha256:7c4ca32b1a92a1ef116711e20bbd1cdf65056be9a64585fc41354dacf4c7ca33", size = 7327605, upload-time = "2026-01-27T20:53:49.077Z" }, + { url = "https://files.pythonhosted.org/packages/c8/8f/01a89d5e5495fd804af898e6d7d867dd7345fc6303c4e78e556a8345f34a/ddtrace-4.3.0-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:feaf7921c3795ae1dd0f12640d3f8ec5f9ac19697b55a54876e90ec4330c628a", size = 7722066, upload-time = "2026-01-27T20:53:51.752Z" }, + { url = "https://files.pythonhosted.org/packages/a6/21/4999eebbbfd3d36edaeaafa270b8f3cf592417d92a5ea7b752e61af4b869/ddtrace-4.3.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:0b527de8ff70105909e2d99dd81374162158a280f562dea244a1c36939ea0d8a", size = 8009324, upload-time = "2026-01-27T20:53:53.968Z" }, + { url = "https://files.pythonhosted.org/packages/8d/f8/b4c2c844912c9ce54ec3d78efcc83186a39f80a9145d008fd7323eefea96/ddtrace-4.3.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:4c35c3b42cd304056c65d95f4b63a0580aa4ff29efb18965f7ed2fa3ad8e4374", size = 8733732, upload-time = "2026-01-27T20:53:56.607Z" }, + { url = "https://files.pythonhosted.org/packages/10/ec/0a756896dd47098178e96b43ce198b90def45ff5b94c4166bbb6b8795c60/ddtrace-4.3.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:9aa6e2014ad16a5a7c28cc0ff3eb4f4cd2396dc7d9e811db7f778b9d75a09268", size = 9073645, upload-time = "2026-01-27T20:53:59.498Z" }, + { url = "https://files.pythonhosted.org/packages/42/89/4bc918d8f5792d58e5eaa3c67fe18b22cfd9c5bc5eeb334c5c3c6d9e44b7/ddtrace-4.3.0-cp312-cp312-win32.whl", hash = "sha256:cd64c7cebcb58c32e5e8e6bfda11ba50b7f0e2c74d54ecdd8c945eaa2a92f6f8", size = 5110045, upload-time = "2026-01-27T20:54:01.898Z" }, + { url = "https://files.pythonhosted.org/packages/2c/9b/cfbb354d991b9be5fea026ad2fee918bb8da1ff649635e7de05e64458460/ddtrace-4.3.0-cp312-cp312-win_amd64.whl", hash = "sha256:4bf62878d3a0f20dc2645aff7698bbe8f57a6f39008279601f2af95f4f3d0ee4", size = 5645713, upload-time = "2026-01-27T20:54:04.305Z" }, + { url = "https://files.pythonhosted.org/packages/cb/f5/e44a66e21f0bb5ba3cdc34a22e244badc7ad92ef01e60410a22794b92ebf/ddtrace-4.3.0-cp312-cp312-win_arm64.whl", hash = "sha256:418ce112d1c85786e589ecd22a6f2dedf1ecb8efb21a703b18dfb5d2b6182a34", size = 5360067, upload-time = "2026-01-27T20:54:06.458Z" }, + { url = "https://files.pythonhosted.org/packages/bb/79/92140484e68bf202431b2644616c97e726180e396f2818889ce22d9ec7a7/ddtrace-4.3.0-cp313-cp313-macosx_14_0_arm64.whl", hash = "sha256:8c84bd599d661ed6424460e3c6111065c5a7c978d28f5d47cb06369ea58e6a07", size = 6639422, upload-time = "2026-01-27T20:54:09.134Z" }, + { url = "https://files.pythonhosted.org/packages/b9/c7/d95dbc4953ad5d4c1d424547e5df397098429bf0e147968e943d6e0f3623/ddtrace-4.3.0-cp313-cp313-macosx_14_0_x86_64.whl", hash = "sha256:e1a8227d354d044b737def7711c275085e9b765c4d93f84e522d93675e03c318", size = 7045829, upload-time = "2026-01-27T20:54:12.636Z" }, + { url = "https://files.pythonhosted.org/packages/23/3d/714a0875ade37153da0450b07a2bd0eb810ad0f2078c8876ea4af75881cf/ddtrace-4.3.0-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:c4cd4d89339adf4a9c114282d03f4db498b0092d56bee145ddb99033fb51be18", size = 7714579, upload-time = "2026-01-27T20:54:14.812Z" }, + { url = "https://files.pythonhosted.org/packages/2a/1c/f89d6c7de4640239618cae7df96c46099e5ba53168ce5641b40cd302092b/ddtrace-4.3.0-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:6c9ec118e2a41da593ec2d2f6365ba104aaf3b46296e0a4c30556aed26615ac5", size = 7998564, upload-time = "2026-01-27T20:54:18.854Z" }, + { url = "https://files.pythonhosted.org/packages/b7/43/f22586a3851b674c4e61cd630682fa47f5a724fb7686f87a415d93f355fd/ddtrace-4.3.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:aa168e581431a3b3ee9c04d76922cae2f3fdfb4520927add5a844e7e2ebb807e", size = 8729607, upload-time = "2026-01-27T20:54:21.319Z" }, + { url = "https://files.pythonhosted.org/packages/02/9d/b1a92066fc2668f715ca77292d73ae1554290edb5ffac710dbc84aa1777a/ddtrace-4.3.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:eed721dcd5cf1f4f4309a28efa5e1cb7d7da129fd51a3e093422fe064bd451f1", size = 9065926, upload-time = "2026-01-27T20:54:24.447Z" }, + { url = "https://files.pythonhosted.org/packages/72/92/6bf49559d2fe06589d7cc967085fc878ec652172a8d203ed22f8c6ab71e0/ddtrace-4.3.0-cp313-cp313-win32.whl", hash = "sha256:9917c49b33f32c524f74813cb03461c207324711b0a2d359e3a3822181cb5643", size = 5107720, upload-time = "2026-01-27T20:54:27.614Z" }, + { url = "https://files.pythonhosted.org/packages/2d/94/37a07b2576dfbbef5034e595be385ab325eebfd735e0eda80cf5ae0facd1/ddtrace-4.3.0-cp313-cp313-win_amd64.whl", hash = "sha256:ea86989b93af5d415ba1457d3c363a59665a907807a51072b43abf5901872078", size = 5643119, upload-time = "2026-01-27T20:54:31.537Z" }, + { url = "https://files.pythonhosted.org/packages/c6/1d/d4466708a5ace94a655f3af804c1a666bc05b6463c5892e561eca0497922/ddtrace-4.3.0-cp313-cp313-win_arm64.whl", hash = "sha256:e983bc15b5eabd9e25b02617702e8621c014c71dc123a117079d3ced29446433", size = 5357966, upload-time = "2026-01-27T20:54:35.411Z" }, + { url = "https://files.pythonhosted.org/packages/82/75/10b07479800a5a8947fd0e79001b009bded2a17ea5af96865d677eb91a98/ddtrace-4.3.0-cp314-cp314-macosx_14_0_arm64.whl", hash = "sha256:e26eb6de7eda425d75f5a1f55e55ad2d13e56f51b43c4b656478367a6692e0bd", size = 6904866, upload-time = "2026-01-27T20:54:38.633Z" }, + { url = "https://files.pythonhosted.org/packages/0e/b2/37f8cf8f57d17f350d2ab86ee814fc5b6c600d0ea2ee2ea8f96be1178cd0/ddtrace-4.3.0-cp314-cp314-macosx_14_0_x86_64.whl", hash = "sha256:f7ce739a6ef9b4d210a746327d377234b1996080028eddbe9c6a1f35193c348e", size = 7329967, upload-time = "2026-01-27T20:54:41.296Z" }, + { url = "https://files.pythonhosted.org/packages/19/c7/61b9a857f7b43234b896fd5e80d994f9efa007b0980887bf6d4d48ab6c20/ddtrace-4.3.0-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:0dff123cc9e39ff393c164198bb166270bcc826a87009af9b4f1431653aef531", size = 7721410, upload-time = "2026-01-27T20:54:43.85Z" }, + { url = "https://files.pythonhosted.org/packages/e1/38/c2e18f707ec222aa33af297dba967b2423559b058b92bfd0e6fd00c74a14/ddtrace-4.3.0-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:80a75fdf1d1717ea6e9d32d33019d0e76c2a38ea55b03dcbb45ad1af5f19079a", size = 8001195, upload-time = "2026-01-27T20:54:46.63Z" }, + { url = "https://files.pythonhosted.org/packages/32/2c/5912ad2ec39f8fa9250fa3f862156de00dbce86a702bf6e78f95f6ef1de7/ddtrace-4.3.0-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:074ac2d7a5f7dfa719b36a442b9b08842e698aa50061812a917c92141e020e1c", size = 8738876, upload-time = "2026-01-27T20:54:49.294Z" }, + { url = "https://files.pythonhosted.org/packages/af/0c/5a4098c258da2cc97160fb1735f57bad6048c6c980d24ecf8e58232fb15d/ddtrace-4.3.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:7c2a15dd28081ab305f9b7463446fa1bb4d3339744b8bff044837039726b1115", size = 9070879, upload-time = "2026-01-27T20:54:52.155Z" }, + { url = "https://files.pythonhosted.org/packages/a1/0b/60ab4556ef979a2d8b48328d778c2f521648f9ebf0518175d6cb61ae60ea/ddtrace-4.3.0-cp314-cp314-win32.whl", hash = "sha256:ce347b54d57686a90f36fb419f778379a00ce5d5ba6aacb79ccfde6c5f3e05b4", size = 5199611, upload-time = "2026-01-27T20:54:55.326Z" }, + { url = "https://files.pythonhosted.org/packages/0b/9d/dd17ae53fa30abc5ec0d4e53fd78768fef745acd3c2cc5067b75eb49af69/ddtrace-4.3.0-cp314-cp314-win_amd64.whl", hash = "sha256:cbeb4e4d2ec5eab248e34432f24e7d318f55031d3a6d39b540ebdebf51e55080", size = 5774168, upload-time = "2026-01-27T20:54:58.196Z" }, + { url = "https://files.pythonhosted.org/packages/3a/29/85c3372abf028f4c8da9f485bc814100e04c6e1b1b92db49bcb497ef0023/ddtrace-4.3.0-cp314-cp314-win_arm64.whl", hash = "sha256:d4b1c98336fd7b096b0b3a7baa095efba67919e6b4cafafe2cae16b17306dc30", size = 5500574, upload-time = "2026-01-27T20:55:00.865Z" }, +] + +[[package]] +name = "debugpy" +version = "1.8.20" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/e0/b7/cd8080344452e4874aae67c40d8940e2b4d47b01601a8fd9f44786c757c7/debugpy-1.8.20.tar.gz", hash = "sha256:55bc8701714969f1ab89a6d5f2f3d40c36f91b2cbe2f65d98bf8196f6a6a2c33", size = 1645207, upload-time = "2026-01-29T23:03:28.199Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/51/56/c3baf5cbe4dd77427fd9aef99fcdade259ad128feeb8a786c246adb838e5/debugpy-1.8.20-cp311-cp311-macosx_15_0_universal2.whl", hash = "sha256:eada6042ad88fa1571b74bd5402ee8b86eded7a8f7b827849761700aff171f1b", size = 2208318, upload-time = "2026-01-29T23:03:36.481Z" }, + { url = "https://files.pythonhosted.org/packages/9a/7d/4fa79a57a8e69fe0d9763e98d1110320f9ecd7f1f362572e3aafd7417c9d/debugpy-1.8.20-cp311-cp311-manylinux_2_34_x86_64.whl", hash = "sha256:7de0b7dfeedc504421032afba845ae2a7bcc32ddfb07dae2c3ca5442f821c344", size = 3171493, upload-time = "2026-01-29T23:03:37.775Z" }, + { url = "https://files.pythonhosted.org/packages/7d/f2/1e8f8affe51e12a26f3a8a8a4277d6e60aa89d0a66512f63b1e799d424a4/debugpy-1.8.20-cp311-cp311-win32.whl", hash = "sha256:773e839380cf459caf73cc533ea45ec2737a5cc184cf1b3b796cd4fd98504fec", size = 5209240, upload-time = "2026-01-29T23:03:39.109Z" }, + { url = "https://files.pythonhosted.org/packages/d5/92/1cb532e88560cbee973396254b21bece8c5d7c2ece958a67afa08c9f10dc/debugpy-1.8.20-cp311-cp311-win_amd64.whl", hash = "sha256:1f7650546e0eded1902d0f6af28f787fa1f1dbdbc97ddabaf1cd963a405930cb", size = 5233481, upload-time = "2026-01-29T23:03:40.659Z" }, + { url = "https://files.pythonhosted.org/packages/14/57/7f34f4736bfb6e00f2e4c96351b07805d83c9a7b33d28580ae01374430f7/debugpy-1.8.20-cp312-cp312-macosx_15_0_universal2.whl", hash = "sha256:4ae3135e2089905a916909ef31922b2d733d756f66d87345b3e5e52b7a55f13d", size = 2550686, upload-time = "2026-01-29T23:03:42.023Z" }, + { url = "https://files.pythonhosted.org/packages/ab/78/b193a3975ca34458f6f0e24aaf5c3e3da72f5401f6054c0dfd004b41726f/debugpy-1.8.20-cp312-cp312-manylinux_2_34_x86_64.whl", hash = "sha256:88f47850a4284b88bd2bfee1f26132147d5d504e4e86c22485dfa44b97e19b4b", size = 4310588, upload-time = "2026-01-29T23:03:43.314Z" }, + { url = "https://files.pythonhosted.org/packages/c1/55/f14deb95eaf4f30f07ef4b90a8590fc05d9e04df85ee379712f6fb6736d7/debugpy-1.8.20-cp312-cp312-win32.whl", hash = "sha256:4057ac68f892064e5f98209ab582abfee3b543fb55d2e87610ddc133a954d390", size = 5331372, upload-time = "2026-01-29T23:03:45.526Z" }, + { url = "https://files.pythonhosted.org/packages/a1/39/2bef246368bd42f9bd7cba99844542b74b84dacbdbea0833e610f384fee8/debugpy-1.8.20-cp312-cp312-win_amd64.whl", hash = "sha256:a1a8f851e7cf171330679ef6997e9c579ef6dd33c9098458bd9986a0f4ca52e3", size = 5372835, upload-time = "2026-01-29T23:03:47.245Z" }, + { url = "https://files.pythonhosted.org/packages/15/e2/fc500524cc6f104a9d049abc85a0a8b3f0d14c0a39b9c140511c61e5b40b/debugpy-1.8.20-cp313-cp313-macosx_15_0_universal2.whl", hash = "sha256:5dff4bb27027821fdfcc9e8f87309a28988231165147c31730128b1c983e282a", size = 2539560, upload-time = "2026-01-29T23:03:48.738Z" }, + { url = "https://files.pythonhosted.org/packages/90/83/fb33dcea789ed6018f8da20c5a9bc9d82adc65c0c990faed43f7c955da46/debugpy-1.8.20-cp313-cp313-manylinux_2_34_x86_64.whl", hash = "sha256:84562982dd7cf5ebebfdea667ca20a064e096099997b175fe204e86817f64eaf", size = 4293272, upload-time = "2026-01-29T23:03:50.169Z" }, + { url = "https://files.pythonhosted.org/packages/a6/25/b1e4a01bfb824d79a6af24b99ef291e24189080c93576dfd9b1a2815cd0f/debugpy-1.8.20-cp313-cp313-win32.whl", hash = "sha256:da11dea6447b2cadbf8ce2bec59ecea87cc18d2c574980f643f2d2dfe4862393", size = 5331208, upload-time = "2026-01-29T23:03:51.547Z" }, + { url = "https://files.pythonhosted.org/packages/13/f7/a0b368ce54ffff9e9028c098bd2d28cfc5b54f9f6c186929083d4c60ba58/debugpy-1.8.20-cp313-cp313-win_amd64.whl", hash = "sha256:eb506e45943cab2efb7c6eafdd65b842f3ae779f020c82221f55aca9de135ed7", size = 5372930, upload-time = "2026-01-29T23:03:53.585Z" }, + { url = "https://files.pythonhosted.org/packages/33/2e/f6cb9a8a13f5058f0a20fe09711a7b726232cd5a78c6a7c05b2ec726cff9/debugpy-1.8.20-cp314-cp314-macosx_15_0_universal2.whl", hash = "sha256:9c74df62fc064cd5e5eaca1353a3ef5a5d50da5eb8058fcef63106f7bebe6173", size = 2538066, upload-time = "2026-01-29T23:03:54.999Z" }, + { url = "https://files.pythonhosted.org/packages/c5/56/6ddca50b53624e1ca3ce1d1e49ff22db46c47ea5fb4c0cc5c9b90a616364/debugpy-1.8.20-cp314-cp314-manylinux_2_34_x86_64.whl", hash = "sha256:077a7447589ee9bc1ff0cdf443566d0ecf540ac8aa7333b775ebcb8ce9f4ecad", size = 4269425, upload-time = "2026-01-29T23:03:56.518Z" }, + { url = "https://files.pythonhosted.org/packages/c5/d9/d64199c14a0d4c476df46c82470a3ce45c8d183a6796cfb5e66533b3663c/debugpy-1.8.20-cp314-cp314-win32.whl", hash = "sha256:352036a99dd35053b37b7803f748efc456076f929c6a895556932eaf2d23b07f", size = 5331407, upload-time = "2026-01-29T23:03:58.481Z" }, + { url = "https://files.pythonhosted.org/packages/e0/d9/1f07395b54413432624d61524dfd98c1a7c7827d2abfdb8829ac92638205/debugpy-1.8.20-cp314-cp314-win_amd64.whl", hash = "sha256:a98eec61135465b062846112e5ecf2eebb855305acc1dfbae43b72903b8ab5be", size = 5372521, upload-time = "2026-01-29T23:03:59.864Z" }, + { url = "https://files.pythonhosted.org/packages/e0/c3/7f67dea8ccf8fdcb9c99033bbe3e90b9e7395415843accb81428c441be2d/debugpy-1.8.20-py2.py3-none-any.whl", hash = "sha256:5be9bed9ae3be00665a06acaa48f8329d2b9632f15fd09f6a9a8c8d9907e54d7", size = 5337658, upload-time = "2026-01-29T23:04:17.404Z" }, +] + +[[package]] +name = "decorator" +version = "5.3.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/60/8b/32f9823da46cde7df2087faa08cd98d01b908f8dcab982cdba9c84e85355/decorator-5.3.1.tar.gz", hash = "sha256:4cbcdd55a6efadb9dbea26b858f4fb3264567b52d69ca0d25b721b553f60ea82", size = 58084, upload-time = "2026-05-18T06:03:28.057Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/05/7f/798705f5296a58ca505d600456748d1be48078eac8a7050d8a98bc9edb89/decorator-5.3.1-py3-none-any.whl", hash = "sha256:f47fe6fdbd2edd623ecfe36875d37aba411624e2670dd395dddae1358689bb3c", size = 10365, upload-time = "2026-05-18T06:03:26.517Z" }, +] + +[[package]] +name = "defusedxml" +version = "0.7.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/0f/d5/c66da9b79e5bdb124974bfe172b4daf3c984ebd9c2a06e2b8a4dc7331c72/defusedxml-0.7.1.tar.gz", hash = "sha256:1bb3032db185915b62d7c6209c5a8792be6a32ab2fedacc84e01b52c51aa3e69", size = 75520, upload-time = "2021-03-08T10:59:26.269Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/07/6c/aa3f2f849e01cb6a001cd8554a88d4c77c5c1a31c95bdf1cf9301e6d9ef4/defusedxml-0.7.1-py2.py3-none-any.whl", hash = "sha256:a352e7e428770286cc899e2542b6cdaedb2b4953ff269a210103ec58f6198a61", size = 25604, upload-time = "2021-03-08T10:59:24.45Z" }, +] + +[[package]] +name = "dnspython" +version = "2.8.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/8c/8b/57666417c0f90f08bcafa776861060426765fdb422eb10212086fb811d26/dnspython-2.8.0.tar.gz", hash = "sha256:181d3c6996452cb1189c4046c61599b84a5a86e099562ffde77d26984ff26d0f", size = 368251, upload-time = "2025-09-07T18:58:00.022Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/ba/5a/18ad964b0086c6e62e2e7500f7edc89e3faa45033c71c1893d34eed2b2de/dnspython-2.8.0-py3-none-any.whl", hash = "sha256:01d9bbc4a2d76bf0db7c1f729812ded6d912bd318d3b1cf81d30c0f845dbf3af", size = 331094, upload-time = "2025-09-07T18:57:58.071Z" }, +] + +[[package]] +name = "entrypoints" +version = "0.4" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/ea/8d/a7121ffe5f402dc015277d2d31eb82d2187334503a011c18f2e78ecbb9b2/entrypoints-0.4.tar.gz", hash = "sha256:b706eddaa9218a19ebcd67b56818f05bb27589b1ca9e8d797b74affad4ccacd4", size = 13974, upload-time = "2022-02-02T21:30:28.172Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/35/a8/365059bbcd4572cbc41de17fd5b682be5868b218c3c5479071865cab9078/entrypoints-0.4-py3-none-any.whl", hash = "sha256:f174b5ff827504fd3cd97cc3f8649f3693f51538c7e4bdf3ef002c8429d42f9f", size = 5294, upload-time = "2022-02-02T21:30:26.024Z" }, +] + +[[package]] +name = "envier" +version = "0.6.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/19/e7/4fe4d3f6e21213cea9bcddc36ba60e6ae4003035f9ce8055e6a9f0322ddb/envier-0.6.1.tar.gz", hash = "sha256:3309a01bb3d8850c9e7a31a5166d5a836846db2faecb79b9cb32654dd50ca9f9", size = 10063, upload-time = "2024-10-22T09:56:47.226Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/56/e9/30493b1cc967f7c07869de4b2ab3929151a58e6bb04495015554d24b61db/envier-0.6.1-py3-none-any.whl", hash = "sha256:73609040a76be48bbcb97074d9969666484aa0de706183a6e9ef773156a8a6a9", size = 10638, upload-time = "2024-10-22T09:56:45.968Z" }, +] + +[[package]] +name = "execnet" +version = "2.1.2" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/bf/89/780e11f9588d9e7128a3f87788354c7946a9cbb1401ad38a48c4db9a4f07/execnet-2.1.2.tar.gz", hash = "sha256:63d83bfdd9a23e35b9c6a3261412324f964c2ec8dcd8d3c6916ee9373e0befcd", size = 166622, upload-time = "2025-11-12T09:56:37.75Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/ab/84/02fc1827e8cdded4aa65baef11296a9bbe595c474f0d6d758af082d849fd/execnet-2.1.2-py3-none-any.whl", hash = "sha256:67fba928dd5a544b783f6056f449e5e3931a5c378b128bc18501f7ea79e296ec", size = 40708, upload-time = "2025-11-12T09:56:36.333Z" }, +] + +[[package]] +name = "executing" +version = "2.2.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/cc/28/c14e053b6762b1044f34a13aab6859bbf40456d37d23aa286ac24cfd9a5d/executing-2.2.1.tar.gz", hash = "sha256:3632cc370565f6648cc328b32435bd120a1e4ebb20c77e3fdde9a13cd1e533c4", size = 1129488, upload-time = "2025-09-01T09:48:10.866Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/c1/ea/53f2148663b321f21b5a606bd5f191517cf40b7072c0497d3c92c4a13b1e/executing-2.2.1-py2.py3-none-any.whl", hash = "sha256:760643d3452b4d777d295bb167ccc74c64a81df23fb5e08eff250c425a4b2017", size = 28317, upload-time = "2025-09-01T09:48:08.5Z" }, +] + +[[package]] +name = "fastapi" +version = "0.136.3" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "annotated-doc" }, + { name = "pydantic" }, + { name = "starlette" }, + { name = "typing-extensions" }, + { name = "typing-inspection" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/81/2d/ff8d91d7b564d464629a0fd50a4489c97fcb836ac230bf3a7269232a9b1f/fastapi-0.136.3.tar.gz", hash = "sha256:e487fae93ad408e6f47641ee4dfe389864fd7bec92e547ea8498fc13f43e83ab", size = 396410, upload-time = "2026-05-23T18:53:15.192Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/e0/82/45359b62a067409bd929ae8a56b8ed13e5a8c8a61194b3c236920999ab83/fastapi-0.136.3-py3-none-any.whl", hash = "sha256:3d2a69bdf04b7e9f3afa292c3bc7a98816bbfafa10bc9b45f3f3700d2f761620", size = 117481, upload-time = "2026-05-23T18:53:16.924Z" }, +] + +[[package]] +name = "fastjsonschema" +version = "2.21.2" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/20/b5/23b216d9d985a956623b6bd12d4086b60f0059b27799f23016af04a74ea1/fastjsonschema-2.21.2.tar.gz", hash = "sha256:b1eb43748041c880796cd077f1a07c3d94e93ae84bba5ed36800a33554ae05de", size = 374130, upload-time = "2025-08-14T18:49:36.666Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/cb/a8/20d0723294217e47de6d9e2e40fd4a9d2f7c4b6ef974babd482a59743694/fastjsonschema-2.21.2-py3-none-any.whl", hash = "sha256:1c797122d0a86c5cace2e54bf4e819c36223b552017172f32c5c024a6b77e463", size = 24024, upload-time = "2025-08-14T18:49:34.776Z" }, +] + +[[package]] +name = "fastnumbers" +version = "5.1.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/75/bf/c69642300a98e8b61047fa17ee7c925a8e65a12e194e98dda7ec1eefaf4b/fastnumbers-5.1.1.tar.gz", hash = "sha256:183fa021cdc052edaeede5c23e3086461deb7562b567614edf71b29515f5fa4b", size = 193827, upload-time = "2024-12-15T07:28:51.124Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/f9/2d/79b651d72295541d06f9f413767a901726e7de7748f908db6d5962f2afbe/fastnumbers-5.1.1-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:ac49a019283a737b887f5fa50e8d1670cfd2f685256a7f31a8da33b70df701e1", size = 304396, upload-time = "2024-12-15T07:26:49.733Z" }, + { url = "https://files.pythonhosted.org/packages/ee/41/b41ca8b75a0760b81b9a5e859ea1c366f644e119615fe3feb1e30ade1652/fastnumbers-5.1.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:a00d105ba2484360d39cf514a16e97e1f66cf053fcc7afd16f95dbbb6de8ed9d", size = 171738, upload-time = "2024-12-15T07:26:52.336Z" }, + { url = "https://files.pythonhosted.org/packages/ff/c3/bdc36067cf111cd2f84e7877e0cbdf3bed5fb179fc2f6c969e79ff9fa693/fastnumbers-5.1.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:216cb1e3f600ff91164c85379241a4f77ed7d1f8e65ffae4ccf3ef34662b9d8a", size = 170015, upload-time = "2024-12-15T07:26:55.003Z" }, + { url = "https://files.pythonhosted.org/packages/b5/6e/7235825baa8b60286c5b0ae605f778db9047be14529f44cc31159014806d/fastnumbers-5.1.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:feb3f3114a3a847f0896ca3d563bf61e3a95ebf51d2308170aed5a7aad88fec3", size = 1664356, upload-time = "2024-12-15T07:26:56.893Z" }, + { url = "https://files.pythonhosted.org/packages/de/6e/fe8c4bde25d38862e98843b50c891068865d75113b2701436a7a4f950231/fastnumbers-5.1.1-cp311-cp311-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b65dfb82b3a5cdd0ac53227b5caae47d98034ae4a8966de89e2ac58639ba14a4", size = 1686830, upload-time = "2024-12-15T07:26:59.857Z" }, + { url = "https://files.pythonhosted.org/packages/f2/37/47727d28780978ba8969524ee2e0545f74080383497574e7df17ff41a19a/fastnumbers-5.1.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:cf7e72ea226a8a1289045f5dfc86d685c2890322f754f8f8eabcb30cf2bef9f2", size = 1675741, upload-time = "2024-12-15T07:27:02.966Z" }, + { url = "https://files.pythonhosted.org/packages/11/fc/0e8da8c4692ba6a4f7d91e62bf6579fcd0fa8a72fe6f768d5244cf70f3fb/fastnumbers-5.1.1-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:18160ce6b574e230204774d12a8a00bb5868dc22bf28e445117ca26a8b9a6fff", size = 2424526, upload-time = "2024-12-15T07:27:04.638Z" }, + { url = "https://files.pythonhosted.org/packages/9c/a4/48f03bca7f8c3d326d8b1c6b1d0fc94630f12a1be414d25049272dfb62e9/fastnumbers-5.1.1-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:1681e2b37628ea5a3dc43dfc0a4e3f6eebf388d76c91f69b48e9fe1431c2d9ea", size = 2575006, upload-time = "2024-12-15T07:27:07.765Z" }, + { url = "https://files.pythonhosted.org/packages/6b/38/c5361fdf085a78d934e6d503e94fed183db436aa9958816783b0b7a2d192/fastnumbers-5.1.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:1ab4faa10b35dc3ea53d83a4107a3b338a39cf500d2f6e0a44f930ad694fa0a9", size = 2516000, upload-time = "2024-12-15T07:27:09.443Z" }, + { url = "https://files.pythonhosted.org/packages/46/16/34109c8a27e016799b2538a03184d4d59a66787432b8d5bf5d1fbc403ac5/fastnumbers-5.1.1-cp311-cp311-win32.whl", hash = "sha256:98b9da1a3565f939800b99471e1cb678744e3dd761571bc0b2b03794dd884039", size = 117636, upload-time = "2024-12-15T07:27:12.234Z" }, + { url = "https://files.pythonhosted.org/packages/a1/3a/899bf5fe59aaee646b453b106c1d0cf978574732f0650b99ba004c261059/fastnumbers-5.1.1-cp311-cp311-win_amd64.whl", hash = "sha256:62c97b9141b052ecbebee1e9fbdfa7db67685602cf847bb7620eb71e5afe18b5", size = 126010, upload-time = "2024-12-15T07:27:14.667Z" }, + { url = "https://files.pythonhosted.org/packages/bf/8c/69a7884c3584bd92daac3b923fb49a10b2ee018d7259e8f0be03ea301f96/fastnumbers-5.1.1-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:e57b377419c89c23cd411abe19b911fea3879db71733751f4dd0f4504d623325", size = 305660, upload-time = "2024-12-15T07:27:16.025Z" }, + { url = "https://files.pythonhosted.org/packages/51/27/207a1b9298380e971abd7640021b71b72fda844e5d5931e85031bc6db6b2/fastnumbers-5.1.1-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:d80ecd57144c20140383ada74c7ee0f8464940d8931c04d4bdd73917200e82ef", size = 172460, upload-time = "2024-12-15T07:27:17.431Z" }, + { url = "https://files.pythonhosted.org/packages/bf/91/8601841ee9cad8628a5386131c53891777836cc6ad678bcff90d8210bd40/fastnumbers-5.1.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:12270ace75facc55426e81e94ab81e8ac0449b78775c2255af3d4a901e90b6f3", size = 170666, upload-time = "2024-12-15T07:27:19.148Z" }, + { url = "https://files.pythonhosted.org/packages/ac/00/4a3e50b1bdf6aa3b48d78ac111b9ddf61401087b1d00249f9b16ba181eb1/fastnumbers-5.1.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:68e8e2da55134e6f3680ced0799eaad00db2ed7e31b7b12e412c7af834927d15", size = 1667289, upload-time = "2024-12-15T07:27:20.501Z" }, + { url = "https://files.pythonhosted.org/packages/fc/53/d0ecbb31cd60c0bf9ef4ba4de1f56d9665bea4a142a649aa6d9316afdc40/fastnumbers-5.1.1-cp312-cp312-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3898a65a4658c9f94e4765d0a9403e9dc2b84ce707fd464b6457c809f4ca0379", size = 1690950, upload-time = "2024-12-15T07:27:22.323Z" }, + { url = "https://files.pythonhosted.org/packages/ea/0b/a7b94e4317e18939807615e7c14072f0e307fc0ba83d1548df8e4f8f07da/fastnumbers-5.1.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:95289b099deb8b3d7083866648865d542abeee722ede0dea188809ddfb0942d1", size = 1679465, upload-time = "2024-12-15T07:27:24.42Z" }, + { url = "https://files.pythonhosted.org/packages/2b/33/efe5b3a25cb35dd6da48a06c44b22b164bd5d245ade0e85423b03cc574d7/fastnumbers-5.1.1-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:95682f60228f035ea83cb3ba102e5ca1e980cccedc7532b39e05fff93ea0ec64", size = 2435702, upload-time = "2024-12-15T07:27:27.334Z" }, + { url = "https://files.pythonhosted.org/packages/6a/43/ebf6f98789108a507b28bc1c88e0328ba6ab4f46331ffae1704141909643/fastnumbers-5.1.1-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:e9683a12e357034fb0d4cfb291bb799b16c791bb224b9c05a39dfefcfc2e673d", size = 2590379, upload-time = "2024-12-15T07:27:29.033Z" }, + { url = "https://files.pythonhosted.org/packages/a1/09/02723ada3b2e4aec94bd7f48bc6f1053a5a4157d872e4279a3fbd078219e/fastnumbers-5.1.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:c092c186d36e8d27aee8e864e03aaaf219a51ee940d4a6356964d89ce8f34058", size = 2521780, upload-time = "2024-12-15T07:27:31.227Z" }, + { url = "https://files.pythonhosted.org/packages/fd/e6/2604e241c405db3540e3e7c35d025275b560e1b6eec6f78e72cc2d220351/fastnumbers-5.1.1-cp312-cp312-win32.whl", hash = "sha256:60e9d5515dfc2898a1a6f93dac7ef3406a2b122ff37eaa732b57df3bc7c93862", size = 117125, upload-time = "2024-12-15T07:27:33.751Z" }, + { url = "https://files.pythonhosted.org/packages/53/02/f3b4ce4f9c7ae2b88a825a52dcb0a9b8b13b70bdcf5066c8598252a04acd/fastnumbers-5.1.1-cp312-cp312-win_amd64.whl", hash = "sha256:070b81b10207b2f7c3bd98c1825f3c0adb6c7e18238f851572d51c882877bc02", size = 127192, upload-time = "2024-12-15T07:27:35.454Z" }, + { url = "https://files.pythonhosted.org/packages/3d/82/c37be55714cc97d68f8430726cd4880cf8d82da316fc4cad820480a274c8/fastnumbers-5.1.1-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:7109d06161000a75d8e4a2f4eb6ed3cb19d3472f5497e64b9df70f4e8ea22090", size = 305660, upload-time = "2024-12-15T07:27:38.306Z" }, + { url = "https://files.pythonhosted.org/packages/93/00/480be84bfc962ceb3cf39058acd09cd5011de6f0496bfc5fd112455d6804/fastnumbers-5.1.1-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:544e905de42679e3e80cdfb5f0f8185b498a206d33a9365f896d8842b9544550", size = 172457, upload-time = "2024-12-15T07:27:39.764Z" }, + { url = "https://files.pythonhosted.org/packages/89/16/de7c3e2b9a604bfdb0f3a905152e64c53064022e432b46f4626c931698a0/fastnumbers-5.1.1-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:e8e40437eafef22aa5ebc80f44d0f9cdf984538b3c05f57500b24695ed63b8b2", size = 170661, upload-time = "2024-12-15T07:27:41.526Z" }, + { url = "https://files.pythonhosted.org/packages/3b/62/247856faac56f08094be27db152604c10c1419feeb8d998495d2929a8fea/fastnumbers-5.1.1-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2b1831fe49d44a91e2803db231696979e6ae1d30e67679c201b7c69cfb815a19", size = 1667006, upload-time = "2024-12-15T07:27:47.52Z" }, + { url = "https://files.pythonhosted.org/packages/4b/a7/1071c2a49c1079f57c9a647352e819e08679f6187b10ad395c1c02885587/fastnumbers-5.1.1-cp313-cp313-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:9421b79e788cc9ec9266c6cfa8306d1e17f4abf0d1c1fb173d4328cc57955b61", size = 1690719, upload-time = "2024-12-15T07:27:49.222Z" }, + { url = "https://files.pythonhosted.org/packages/2f/72/bd9e62e5b0303e1c0a9682b4de3e65b0c1a8eec2ef721fe0b26829a9879e/fastnumbers-5.1.1-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:517e91bd9fd0e664eb8a81759c79e38675a94bfac8892dbc274f7430ae5be451", size = 1679059, upload-time = "2024-12-15T07:27:51.186Z" }, + { url = "https://files.pythonhosted.org/packages/92/b1/8218c61638873d74eb7518cf4bac2d7192a328efbdc780fd8a05d91008aa/fastnumbers-5.1.1-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:4479d85f246728ea5737b28ed3730cc4dbc1002bcf788ce32f9ffcb730150fa3", size = 2436131, upload-time = "2024-12-15T07:27:54.837Z" }, + { url = "https://files.pythonhosted.org/packages/f6/2b/06e947b27ca76b4ebf30363500719f27d8cdbf4b286760e3ef941b3d1308/fastnumbers-5.1.1-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:c738099125cbb0a559a59c14165090a545a892f16db102aa1f5fb930fa1a2b13", size = 2590343, upload-time = "2024-12-15T07:27:57.974Z" }, + { url = "https://files.pythonhosted.org/packages/58/41/cf5333d1013ba5afb21b40565d1c1ed0114d97b7e0ef230659ead17b870e/fastnumbers-5.1.1-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:ca0a72d750d5d78857fa5c7f9ff4645c86793b7a63ae0b6b32ef1a27af9ae398", size = 2521775, upload-time = "2024-12-15T07:27:59.694Z" }, + { url = "https://files.pythonhosted.org/packages/2c/14/fb3e0c1b92dc633da708c7438c564bdfb8c4757ad0ce1f4bf80f3fa7d0b9/fastnumbers-5.1.1-cp313-cp313-win32.whl", hash = "sha256:dc2442ceb236f4680c87aa54d1f94bd8fc4b6db8dc9ac94e602da0924aac279f", size = 117134, upload-time = "2024-12-15T07:28:01.359Z" }, + { url = "https://files.pythonhosted.org/packages/5d/af/47ce3856e5d6a10aae37dbf903c295c36702bf78d1f30c7c213460f46453/fastnumbers-5.1.1-cp313-cp313-win_amd64.whl", hash = "sha256:91a69ce09fb5079bd680464b2d850be82f5516ed67360381c9d9935431c31bc4", size = 127195, upload-time = "2024-12-15T07:28:02.617Z" }, +] + +[[package]] +name = "filetype" +version = "1.2.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/bb/29/745f7d30d47fe0f251d3ad3dc2978a23141917661998763bebb6da007eb1/filetype-1.2.0.tar.gz", hash = "sha256:66b56cd6474bf41d8c54660347d37afcc3f7d1970648de365c102ef77548aadb", size = 998020, upload-time = "2022-11-02T17:34:04.141Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/18/79/1b8fa1bb3568781e84c9200f951c735f3f157429f44be0495da55894d620/filetype-1.2.0-py2.py3-none-any.whl", hash = "sha256:7ce71b6880181241cf7ac8697a2f1eb6a8bd9b429f7ad6d27b8db9ba5f1c2d25", size = 19970, upload-time = "2022-11-02T17:34:01.425Z" }, +] + +[[package]] +name = "flake8" +version = "7.3.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "mccabe" }, + { name = "pycodestyle" }, + { name = "pyflakes" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/9b/af/fbfe3c4b5a657d79e5c47a2827a362f9e1b763336a52f926126aa6dc7123/flake8-7.3.0.tar.gz", hash = "sha256:fe044858146b9fc69b551a4b490d69cf960fcb78ad1edcb84e7fbb1b4a8e3872", size = 48326, upload-time = "2025-06-20T19:31:35.838Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/9f/56/13ab06b4f93ca7cac71078fbe37fcea175d3216f31f85c3168a6bbd0bb9a/flake8-7.3.0-py2.py3-none-any.whl", hash = "sha256:b9696257b9ce8beb888cdbe31cf885c90d31928fe202be0889a7cdafad32f01e", size = 57922, upload-time = "2025-06-20T19:31:34.425Z" }, +] + +[[package]] +name = "flasgger-tschaume" +version = "0.9.7" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "flask" }, + { name = "jsonschema" }, + { name = "mistune" }, + { name = "pyyaml" }, + { name = "six" }, + { name = "werkzeug" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/ad/9a/94f78b4865f30402dd56f343d0d7487b2d6fce3137a3579a18aa49981bd8/flasgger-tschaume-0.9.7.tar.gz", hash = "sha256:139bd4686387e69019af2a86c0eacbd00bf30df0c7470ea55120646cab2ae446", size = 4227116, upload-time = "2022-10-21T23:24:14.25Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/97/a7/f6b8b0d622449b0e63869d64c3ad19d67b5e86e1bad60e3c34cbb9dc2ca6/flasgger_tschaume-0.9.7-py2.py3-none-any.whl", hash = "sha256:ee0c55f76c5884704649d139f042050af5d6f1d5a60cae167e3123735720302c", size = 3864468, upload-time = "2022-10-21T23:24:11.541Z" }, +] + +[[package]] +name = "flask" +version = "2.2.5" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "click" }, + { name = "itsdangerous" }, + { name = "jinja2" }, + { name = "werkzeug" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/5f/76/a4d2c4436dda4b0a12c71e075c508ea7988a1066b06a575f6afe4fecc023/Flask-2.2.5.tar.gz", hash = "sha256:edee9b0a7ff26621bd5a8c10ff484ae28737a2410d99b0bb9a6850c7fb977aa0", size = 697814, upload-time = "2023-05-02T14:42:36.742Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/9f/1a/8b6d48162861009d1e017a9740431c78d860809773b66cac220a11aa3310/Flask-2.2.5-py3-none-any.whl", hash = "sha256:58107ed83443e86067e41eff4631b058178191a355886f8e479e347fa1285fdf", size = 101817, upload-time = "2023-05-02T14:42:34.858Z" }, +] + +[[package]] +name = "flask-compress" +version = "1.24" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "backports-zstd", marker = "python_full_version < '3.14'" }, + { name = "brotli", marker = "platform_python_implementation != 'PyPy'" }, + { name = "brotlicffi", marker = "platform_python_implementation == 'PyPy'" }, + { name = "flask" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/c2/de/2ae0118051b38ab53437328074a696f3ee7d61e15bf7454b78a3088e5bc3/flask_compress-1.24.tar.gz", hash = "sha256:14097cefe59ecb3e466d52a6aeb62f34f125a9f7dadf1f33a53e430ce4a50f31", size = 21089, upload-time = "2026-03-31T15:01:39.005Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/4c/0f/fe51e0b2301bbd429af44273a923ff92127b18d13abba5ae5a1d60e8e497/flask_compress-1.24-py3-none-any.whl", hash = "sha256:1e63668eb6e3242bd4f6ad98825a924e3984409be90c125477893d586007d00c", size = 11033, upload-time = "2026-03-31T15:01:37.302Z" }, +] + +[[package]] +name = "flask-marshmallow" +version = "1.4.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "flask" }, + { name = "marshmallow" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/09/43/6e5c19e8abc01f5daf1d3c8ad169c495335390572b8bead3f7e7302131c6/flask_marshmallow-1.4.0.tar.gz", hash = "sha256:98c90a253052c72d2ddddc925539ac33bbd780c6fba86478ffe18e3b89d8b471", size = 40970, upload-time = "2026-02-04T16:07:59.916Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/70/9b/7d0605c6f90d640547c3c9a0b95bc3bb17e252ae0f46f1dbfa90d2e06518/flask_marshmallow-1.4.0-py3-none-any.whl", hash = "sha256:b758fc2c428d0cbee6fd0ccf0d55524fe9e426a86a177dcc0fc8cd71ad4b7c59", size = 12254, upload-time = "2026-02-04T16:07:58.878Z" }, +] + +[[package]] +name = "flask-mongoengine-tschaume" +version = "1.1.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "flask" }, + { name = "mongoengine" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/46/e9/224508e946b975dab42f185ecca6c044a465ebd6fdc23bdc27a85330ea0c/flask-mongoengine-tschaume-1.1.0.tar.gz", hash = "sha256:0c020feb12bb0317a4848e7b191489f89ad0589c9728d4907f5e9635474dd055", size = 235159, upload-time = "2022-10-25T00:40:12.334Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/9f/5b/d947b061b81b25ee061f1eae068c98d0491f990d24d3ad9f16de9c05cd56/flask_mongoengine_tschaume-1.1.0-py3-none-any.whl", hash = "sha256:01fcb556bb616bc4b4bbe83fb019787dc58e565790226182bf9a60ed9fada65d", size = 33610, upload-time = "2022-10-25T00:40:10.809Z" }, +] + +[[package]] +name = "flask-mongorest-mpcontribs" +version = "3.3.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "atlasq-tschaume" }, + { name = "boto3" }, + { name = "fastnumbers" }, + { name = "flask-mongoengine-tschaume" }, + { name = "flask-sse" }, + { name = "flatten-dict" }, + { name = "marshmallow-mongoengine" }, + { name = "mimerender-pr36" }, + { name = "orjson" }, + { name = "pymongo" }, + { name = "python-dateutil" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/73/57/9eafaa2bfe95d9a4b05e8d505cc17e89fbdfcc14feeddc4a2a13eac9a710/flask-mongorest-mpcontribs-3.3.0.tar.gz", hash = "sha256:2db7fc6f341b2cea6c302ed5557941a1d89531e1cd92a8235eba3ac9e1cc6ea2", size = 46223, upload-time = "2023-04-14T21:22:32.787Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/b6/a4/95bbdee9e63c2bed78bb77f98f1fbb4971964383a3b6aa4c526da2852229/flask_mongorest_mpcontribs-3.3.0-py3-none-any.whl", hash = "sha256:f76dc8ef915f1b4ee896110ecbcc4a75a8cb7f33f4ce4387f4b4e2a0b646fa83", size = 26389, upload-time = "2023-04-14T21:22:31.273Z" }, +] + +[[package]] +name = "flask-rq2" +version = "18.3" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "flask" }, + { name = "redis" }, + { name = "rq" }, + { name = "rq-scheduler" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/3a/73/edea2742650daa2b1589e8cb592abe7da5d8ce530642e62f047b205580b7/Flask-RQ2-18.3.tar.gz", hash = "sha256:3ef6395065255447f8e1516ccca24858ba87da1d71a6975e0e3b55256bf04967", size = 29105, upload-time = "2018-12-20T10:53:32.738Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/61/47/341667d55567995f6a54096e4156edaaad645dd7c90133e646ed9ba56968/Flask_RQ2-18.3-py2.py3-none-any.whl", hash = "sha256:abe1e52d3b98abe37e85830a614ba6af864516f1b6cf2229f352f8500eafc5fd", size = 12999, upload-time = "2018-12-20T10:53:31.409Z" }, +] + +[[package]] +name = "flask-sse" +version = "1.0.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "flask" }, + { name = "redis" }, + { name = "six" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/38/31/82586853cb1c0fcc2b8b533891606a779acc0da7d4cda5c8d7f2c2b05a29/Flask-SSE-1.0.0.tar.gz", hash = "sha256:4f84714c2549a45e4f17bfc5f68ee8a9f298b22740a6844404d1c74551f2090d", size = 16190, upload-time = "2021-01-10T18:01:46.269Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/71/83/f9fe86f554a153fdd300fb8027121d508a2177605bd158d967ddd7325948/Flask_SSE-1.0.0-py2.py3-none-any.whl", hash = "sha256:f86d7ecff0607333755c444130c395e7a133fb7ae6cf76fbd29b1da36d34776b", size = 4952, upload-time = "2021-01-10T18:01:44.985Z" }, +] + +[[package]] +name = "flatten-dict" +version = "0.5.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/0b/d0/34bf1bafa4d54e4ec20ca40856e991ffe7fdfd53831a2a36a7eb356508c8/flatten_dict-0.5.0.tar.gz", hash = "sha256:ca89664d0bc9552d525ee756726b5a755c17f65b5bf23d0a1f07841f181428b7", size = 9476, upload-time = "2026-04-28T14:23:44.979Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/72/9f/485516087cd8c44183aaf9ab850247a28e2e4a42a4d62eab77c21f673450/flatten_dict-0.5.0-py3-none-any.whl", hash = "sha256:c4bd2010052e4d33241433720d054322403fa7ad914fdc5cb1b31a713d4c561e", size = 9869, upload-time = "2026-04-28T14:23:45.695Z" }, +] + +[[package]] +name = "flexcache" +version = "0.3" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "typing-extensions" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/55/b0/8a21e330561c65653d010ef112bf38f60890051d244ede197ddaa08e50c1/flexcache-0.3.tar.gz", hash = "sha256:18743bd5a0621bfe2cf8d519e4c3bfdf57a269c15d1ced3fb4b64e0ff4600656", size = 15816, upload-time = "2024-03-09T03:21:07.555Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/27/cd/c883e1a7c447479d6e13985565080e3fea88ab5a107c21684c813dba1875/flexcache-0.3-py3-none-any.whl", hash = "sha256:d43c9fea82336af6e0115e308d9d33a185390b8346a017564611f1466dcd2e32", size = 13263, upload-time = "2024-03-09T03:21:05.635Z" }, +] + +[[package]] +name = "flexparser" +version = "0.4" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "typing-extensions" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/82/99/b4de7e39e8eaf8207ba1a8fa2241dd98b2ba72ae6e16960d8351736d8702/flexparser-0.4.tar.gz", hash = "sha256:266d98905595be2ccc5da964fe0a2c3526fbbffdc45b65b3146d75db992ef6b2", size = 31799, upload-time = "2024-11-07T02:00:56.249Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/fe/5e/3be305568fe5f34448807976dc82fc151d76c3e0e03958f34770286278c1/flexparser-0.4-py3-none-any.whl", hash = "sha256:3738b456192dcb3e15620f324c447721023c0293f6af9955b481e91d00179846", size = 27625, upload-time = "2024-11-07T02:00:54.523Z" }, +] + +[[package]] +name = "fonttools" +version = "4.63.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/84/69/c97f2c18e0db87d2c7b15da1974dace76ae938f1cfa22e2727a648b7ed43/fonttools-4.63.0.tar.gz", hash = "sha256:caeb583deeb5168e694b65cda8b4ee62abedfa66cf88488734466f2366b9c4e0", size = 3597189, upload-time = "2026-05-14T12:04:30.958Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/75/2b/a7f1545bdf5da69c4bda0cea2a5781f0ad2a6623e0277267672db43c5fe6/fonttools-4.63.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:2b8ae05d9eacf6081414d759c0a352769ac28ce31280d6bb8e77b03f9e3c449f", size = 2881793, upload-time = "2026-05-14T12:02:56.645Z" }, + { url = "https://files.pythonhosted.org/packages/49/50/965308c703f085f225db2886813b27e015b8b3438c350b22dd65b52c2a2c/fonttools-4.63.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:79cdc9f567aec74a72918fd060283911406750cbc9fd28c1316023deb6ce31a9", size = 2428130, upload-time = "2026-05-14T12:02:58.891Z" }, + { url = "https://files.pythonhosted.org/packages/d8/38/6937fbd7f2dc3a6b48725851bc2c15ec949b9af14d9bbcb5fe83cdf9bdf9/fonttools-4.63.0-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:2c14b4fd138c4bafcca294765c547914e1aa431ae1ca94ab99d8db08c958bd3b", size = 5111952, upload-time = "2026-05-14T12:03:01.263Z" }, + { url = "https://files.pythonhosted.org/packages/0b/43/a81f20050a3115b57d62c8e781446949512eac36690dc384ccea65ff4cc1/fonttools-4.63.0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:d76ac49f929aecaf82d83250b8347e099d7aecba0f4726c1d9b6df3b8bb5fe18", size = 5082308, upload-time = "2026-05-14T12:03:03.211Z" }, + { url = "https://files.pythonhosted.org/packages/67/00/cdd9d4944ca6ae280d01e69cc37bde3bf663630b837a6fc6d2cd65d80e0e/fonttools-4.63.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:dcf076a4474fe0d7367e5bbf5b052c7284fa1feca729c04176ce513521afd8a0", size = 5087932, upload-time = "2026-05-14T12:03:05.147Z" }, + { url = "https://files.pythonhosted.org/packages/f5/f1/0aa0dbea778c75adbef223c42019fd47d22262b905974d62d829545d485f/fonttools-4.63.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:7dd683fef0663e9f0f45cf541d788d24caa3ec9db50796b588e1757d8b3bc007", size = 5213271, upload-time = "2026-05-14T12:03:07.238Z" }, + { url = "https://files.pythonhosted.org/packages/a8/99/253e4056e1f0e67b9390125a154b73b5eb73ad521bece95c004858fdeec2/fonttools-4.63.0-cp311-cp311-win32.whl", hash = "sha256:afefc1ed0a59785a7fb06ea7e1678e849c193e1e387db783579bc7b3056fcfcb", size = 2304473, upload-time = "2026-05-14T12:03:09.271Z" }, + { url = "https://files.pythonhosted.org/packages/08/60/defa5e69641db890a63be281f41345f4c33b157824eaf0b9fad3e08b0dcb/fonttools-4.63.0-cp311-cp311-win_amd64.whl", hash = "sha256:063e08bd17bd5a90127a14123de0d6a952dbc847695fd98b63c043d58057f90c", size = 2356389, upload-time = "2026-05-14T12:03:11.53Z" }, + { url = "https://files.pythonhosted.org/packages/08/ef/b3c6b9b5be2f82416d73fe2ed2e96e2793cd80e7510bd6a17ca79cdd88ec/fonttools-4.63.0-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:37dd23e621e3b0aef1baa70a303b80aaf38449632cfc8fd2a55fb285bbccfc02", size = 2881131, upload-time = "2026-05-14T12:03:13.386Z" }, + { url = "https://files.pythonhosted.org/packages/44/a0/c815bea63117fa63e4e1c01f8a1110d2112fa003f838e6467094ec2432ce/fonttools-4.63.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:a9faff9e0c1f76f9fd55899d2ce785832efebab37eb8ae13995853aef178bef0", size = 2426704, upload-time = "2026-05-14T12:03:15.801Z" }, + { url = "https://files.pythonhosted.org/packages/44/04/0b91d8e916e92ad1fac9e4624760baf0fd5ff2ead614c2f68fb21373f03f/fonttools-4.63.0-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:ef3048ef05dbb552b89817713d9cac912e00d0fde4a3105c00d29e52e10c89af", size = 5044298, upload-time = "2026-05-14T12:03:18.085Z" }, + { url = "https://files.pythonhosted.org/packages/77/c7/2342da9830e3e9d4870305ca5d2091d2a83284f2953079b7bdd3b5e029d8/fonttools-4.63.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:58dc6bb86a78d782f00f9190ca02c119cf5bbe2807536e361e18d42019f877d8", size = 4999800, upload-time = "2026-05-14T12:03:20.161Z" }, + { url = "https://files.pythonhosted.org/packages/e6/6d/67fe16c48d7ce050979b33f47e0d28a318f02da030602e944c34f7a16ef3/fonttools-4.63.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:ee08ebfa58f6e1aeff5697ab9582105bb620008c1caafb681e4c557e7483027b", size = 4982666, upload-time = "2026-05-14T12:03:22.87Z" }, + { url = "https://files.pythonhosted.org/packages/f2/00/3bbab338c07c71fa56269953845e92c951a61457bbbb0f1022551ea266d9/fonttools-4.63.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:27fdc65af8da6f88b9c6121c47a464cbe359fcfff7ff6fc2d37a1f395d755b78", size = 5133598, upload-time = "2026-05-14T12:03:25.168Z" }, + { url = "https://files.pythonhosted.org/packages/62/f2/aa27c7f98db5b064883dadcc5283947e81e034de42e22a33675878d98b54/fonttools-4.63.0-cp312-cp312-win32.whl", hash = "sha256:af2fd1664d00a397d75f806985ddb36282091c2131a73a6485c23b4a34722263", size = 2292575, upload-time = "2026-05-14T12:03:27.496Z" }, + { url = "https://files.pythonhosted.org/packages/87/36/cccb9bc2a6ab63d1b2980374f0dca72ce95ae267c9b4cfe77455bb70d0d4/fonttools-4.63.0-cp312-cp312-win_amd64.whl", hash = "sha256:59ac449f8cca9b4ffa08d2e7bbadad87ce710d69d1eda5c3c1ce579baa987272", size = 2343211, upload-time = "2026-05-14T12:03:30.057Z" }, + { url = "https://files.pythonhosted.org/packages/0f/8d/d8fec3dcde2963f8c908fb315e5ff2cd0ac34f82394bbbf73a2aa5145ce3/fonttools-4.63.0-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:cd7e9857e5e63738b9d9fd707bc1f59c8b09e5177726d23664db393c59bb08bd", size = 2876062, upload-time = "2026-05-14T12:03:32.554Z" }, + { url = "https://files.pythonhosted.org/packages/ef/71/d935dc54e4ff121bfdd11e08702db63a7e6f25af21d8a3d7b7212df53641/fonttools-4.63.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:c2a2a42198b696a6f48fad91709afb55176e66a5e566131219dba372fb7f8c59", size = 2424594, upload-time = "2026-05-14T12:03:34.86Z" }, + { url = "https://files.pythonhosted.org/packages/8e/40/e76320afa1df918e146155ef239b1719ee266092e96f5423bfd075affba1/fonttools-4.63.0-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:1e874792a8212b44583ea02189d9e693906b2f78b261f372f95d6c563210ac1d", size = 5024840, upload-time = "2026-05-14T12:03:36.745Z" }, + { url = "https://files.pythonhosted.org/packages/ce/36/0b805d8c485f872f65a509cbe3b58a5d0d17bee855333b54a150c79d3061/fonttools-4.63.0-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:22135da48a348785c5e2d5d2d9d6bec5ed44adacbaeb9db12d9493bf6c6bfa68", size = 4975801, upload-time = "2026-05-14T12:03:38.833Z" }, + { url = "https://files.pythonhosted.org/packages/c8/26/2cee03d0aa083ab022da5c07aff9ed3f689da1defb81ad6917c9627896da/fonttools-4.63.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:ccf41f2efdf56994d22d73bef4ced1052161958169428d06ba9724ea9e9a64be", size = 4965009, upload-time = "2026-05-14T12:03:41.494Z" }, + { url = "https://files.pythonhosted.org/packages/7e/48/cc4b66d9058c0d0982c833fad10127c4b0e9324606aafa41382295ca4102/fonttools-4.63.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:9ced0bd02ac751dd6319b0da88aaef24414e3b0dbc32bb4f24944821a3741a27", size = 5105892, upload-time = "2026-05-14T12:03:43.525Z" }, + { url = "https://files.pythonhosted.org/packages/d8/1f/a98a30a814b9ddef3a2e706025f90b9e0bc94890e6cb15254bc86547d11a/fonttools-4.63.0-cp313-cp313-win32.whl", hash = "sha256:85be818f5506e8a7753153def2c9550178f0ecae6a47b5e0e8dbb23f7cc90380", size = 2291313, upload-time = "2026-05-14T12:03:45.594Z" }, + { url = "https://files.pythonhosted.org/packages/92/46/5177b01f3b4abfdd4409f31cca4ab279c9343a26efbe9ec78c97fc612e02/fonttools-4.63.0-cp313-cp313-win_amd64.whl", hash = "sha256:ba04cb5891d4c0c21b6da95eda8d7b090021508a294fff33464fc7d241e0856b", size = 2342299, upload-time = "2026-05-14T12:03:47.414Z" }, + { url = "https://files.pythonhosted.org/packages/27/d2/23d25e3f247b328be58d04a4c9f894178a0d1eda7d42867cfb388adaf416/fonttools-4.63.0-cp314-cp314-macosx_10_15_universal2.whl", hash = "sha256:fd1e3094f42d806d3d7c79162fc59e5910fcbe3a7360c385b8da969bc4493745", size = 2875338, upload-time = "2026-05-14T12:03:50.052Z" }, + { url = "https://files.pythonhosted.org/packages/cd/58/7dfa0c761cb3b2964e2a84c4dc986c926a87de0cb9fb60d5b28ded3f2914/fonttools-4.63.0-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:6e528da43bc3791085f8cb6141b1d13e459226790240340fcbb4625649238b03", size = 2422661, upload-time = "2026-05-14T12:03:52.154Z" }, + { url = "https://files.pythonhosted.org/packages/dd/87/64cfa18a7a1621d17b7f4502b2b0ed8a135a90c3db51ea590ee99043e76b/fonttools-4.63.0-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:6b2248c5decb223562f7902ff6325077a073f608ee8e33e88ad88db734eb9f49", size = 5010526, upload-time = "2026-05-14T12:03:54.647Z" }, + { url = "https://files.pythonhosted.org/packages/36/e1/a8933a72c45a87177fbde2696e0d0755c8c9062f8c077a961c6215fa27b1/fonttools-4.63.0-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:308f957cdeaf8abe4e5f2f124902ef405448af92c90f80e302a3b771c2e6116b", size = 4923946, upload-time = "2026-05-14T12:03:56.984Z" }, + { url = "https://files.pythonhosted.org/packages/27/60/872e6e233b8c5e8b41413796ff18b7fe479661bd40147e071b450dfad7a1/fonttools-4.63.0-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:bf00f21eb5fb721dbaf73d1e9da6d02a1af7768f2ebcf9798be98beab8ba90f6", size = 4962489, upload-time = "2026-05-14T12:03:59.443Z" }, + { url = "https://files.pythonhosted.org/packages/30/c4/83c24f2ec38b90cfda84bf4b1a1f49df80e84a1db4e7ac6e0d41bf23bc39/fonttools-4.63.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:c1aaa4b9c75798400ac043ce04d74e7830376c85095a5a6ed7cba2f17a266bf4", size = 5071870, upload-time = "2026-05-14T12:04:02.122Z" }, + { url = "https://files.pythonhosted.org/packages/de/40/3ae22b60ff1d41ce0bd044b31238cdc72cef99f28b976f1e128ebd618c9b/fonttools-4.63.0-cp314-cp314-win32.whl", hash = "sha256:22693918177bd9ceabec4736d338045f357769416fc6b0b2508eefef75b08616", size = 2295026, upload-time = "2026-05-14T12:04:04.47Z" }, + { url = "https://files.pythonhosted.org/packages/c3/d4/98078064ccc76b45cb0f6c002452011e93c4bd26f6850344f0951cc1fe89/fonttools-4.63.0-cp314-cp314-win_amd64.whl", hash = "sha256:7d782fac32985914c351556f68ac0855391572bcd87de50e05970d3cd4c96fc5", size = 2347454, upload-time = "2026-05-14T12:04:06.752Z" }, + { url = "https://files.pythonhosted.org/packages/49/4e/652d1580c5f4e39f7d103b0c793e4773129ad633dce4addd0cf4dfebde02/fonttools-4.63.0-cp314-cp314t-macosx_10_15_universal2.whl", hash = "sha256:6db5140a60a5d731d21ec076745b40a310607731b0a565b50776393188649001", size = 2958152, upload-time = "2026-05-14T12:04:08.706Z" }, + { url = "https://files.pythonhosted.org/packages/0e/55/ad864c9a9b219f552eb46b32cd7906c466e5a578ba0c3abfcc0fe7413eb6/fonttools-4.63.0-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:7d76edbff9014094dbf03bd2d074709dfa6ec7aba13d838c937a2b33d2d6a86e", size = 2460809, upload-time = "2026-05-14T12:04:10.783Z" }, + { url = "https://files.pythonhosted.org/packages/ea/2b/0aa8db70f18cf52e49b4ed5ecec68547f981160bf5ded3b5aed6faa0a6f9/fonttools-4.63.0-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:0eac00b9118c3c2f87d272e45341871c5b3066baa3c86897fa634a7c3fb59096", size = 5148649, upload-time = "2026-05-14T12:04:12.747Z" }, + { url = "https://files.pythonhosted.org/packages/7f/63/18e4369c25043096f1048e0c9915951adc4f842bd81c6b18155824d6fa99/fonttools-4.63.0-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:51394295f1a51de8b5f30bdb1e1b9a4231536c7064ef5c6e211eec19fa36036f", size = 4932147, upload-time = "2026-05-14T12:04:14.806Z" }, + { url = "https://files.pythonhosted.org/packages/a1/3f/67f3eac2ffd8a98446c5022f8ed3864eac878a5ff7af8df4c8286dba16cc/fonttools-4.63.0-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:9e12f105d2b6342c559c298afb674006bb2893afc7102dcf8a1b55b0486b4e40", size = 5027237, upload-time = "2026-05-14T12:04:17.675Z" }, + { url = "https://files.pythonhosted.org/packages/1a/ba/4e6214cb38a7b04779e97bb7636de9a5c7f20af7018d03dee0b64c08510a/fonttools-4.63.0-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:796f27556dbe094c4824f75ca85267e4df776c79036c8441469a4df37038c196", size = 5053933, upload-time = "2026-05-14T12:04:20.818Z" }, + { url = "https://files.pythonhosted.org/packages/34/3b/214dcc19ee31d3d38fb5ad2755c11ef0514e5dc300bbaf41c0b69f393799/fonttools-4.63.0-cp314-cp314t-win32.whl", hash = "sha256:948428a275741f0b64b113c955425a953314f4b9ab9997f73a72c83e68e569c8", size = 2359326, upload-time = "2026-05-14T12:04:24.22Z" }, + { url = "https://files.pythonhosted.org/packages/dd/1e/3ff1a9b523058c2eeb6a9d50f5574e2a738200d0d94107d5bc4105e8da3f/fonttools-4.63.0-cp314-cp314t-win_amd64.whl", hash = "sha256:6d4741eb179121cab9eea4cb2393d24492373a260d7945006358c08cfbf45419", size = 2425829, upload-time = "2026-05-14T12:04:26.829Z" }, + { url = "https://files.pythonhosted.org/packages/2c/47/c99d5268f354002ce80f8d029cd9d7d872969da1de8b93d32de4dc56d6f4/fonttools-4.63.0-py3-none-any.whl", hash = "sha256:445af2eab030a16b9171ea8bdda7ebf7d96bda2df88ee182a464252f6e05e20d", size = 1164562, upload-time = "2026-05-14T12:04:29.092Z" }, +] + +[[package]] +name = "fqdn" +version = "1.5.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/30/3e/a80a8c077fd798951169626cde3e239adeba7dab75deb3555716415bd9b0/fqdn-1.5.1.tar.gz", hash = "sha256:105ed3677e767fb5ca086a0c1f4bb66ebc3c100be518f0e0d755d9eae164d89f", size = 6015, upload-time = "2021-03-11T07:16:29.08Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/cf/58/8acf1b3e91c58313ce5cb67df61001fc9dcd21be4fadb76c1a2d540e09ed/fqdn-1.5.1-py3-none-any.whl", hash = "sha256:3a179af3761e4df6eb2e026ff9e1a3033d3587bf980a0b1b2e1e5d08d7358014", size = 9121, upload-time = "2021-03-11T07:16:28.351Z" }, +] + +[[package]] +name = "freezegun" +version = "1.5.5" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "python-dateutil" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/95/dd/23e2f4e357f8fd3bdff613c1fe4466d21bfb00a6177f238079b17f7b1c84/freezegun-1.5.5.tar.gz", hash = "sha256:ac7742a6cc6c25a2c35e9292dfd554b897b517d2dec26891a2e8debf205cb94a", size = 35914, upload-time = "2025-08-09T10:39:08.338Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/5e/2e/b41d8a1a917d6581fc27a35d05561037b048e47df50f27f8ac9c7e27a710/freezegun-1.5.5-py3-none-any.whl", hash = "sha256:cd557f4a75cf074e84bc374249b9dd491eaeacd61376b9eb3c423282211619d2", size = 19266, upload-time = "2025-08-09T10:39:06.636Z" }, +] + +[[package]] +name = "gevent" +version = "26.5.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "cffi", marker = "platform_python_implementation == 'CPython' and sys_platform == 'win32'" }, + { name = "greenlet", marker = "platform_python_implementation == 'CPython'" }, + { name = "zope-event" }, + { name = "zope-interface" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/c4/cb/98aa3a299e2fc4a2372b5d124863e02965b64579ffc29fe54d0641e65b2f/gevent-26.5.0.tar.gz", hash = "sha256:1655eb04c1e20d71b2aa4a3c7528162dd58ff6cc46a037af1f01f534c80fefba", size = 6712354, upload-time = "2026-05-20T21:22:45.132Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/2a/ea/ea87c08931c9e4c6c40bb05a2cb19c2d6f93fe6e0052f9152ea5ade6d037/gevent-26.5.0-cp311-cp311-manylinux_2_28_aarch64.whl", hash = "sha256:cd3dc60581687e2618286108f8e2f820d8446be4b34131065011c066e911d39c", size = 1768295, upload-time = "2026-05-20T21:17:29.438Z" }, + { url = "https://files.pythonhosted.org/packages/da/92/1d0e7287ae55700a8d25153ac736896bd9bcc3f85a12d374ef398db4b33c/gevent-26.5.0-cp311-cp311-manylinux_2_28_ppc64le.whl", hash = "sha256:dc7fa28b2d627f8e87595f39043b6dec71e8e7fb97e685e5506c47cf3ff8cb2e", size = 1862627, upload-time = "2026-05-20T21:15:59.365Z" }, + { url = "https://files.pythonhosted.org/packages/3a/4c/7f5ed67e52dfdef4ff91ae1a6fb28186d52e2496962edc8f17bdea9ab2c0/gevent-26.5.0-cp311-cp311-manylinux_2_28_s390x.whl", hash = "sha256:68c5fc21cef80268cdff88a4ae6c025fabb019b071f6f8ee4d20a7bccbddb873", size = 1804690, upload-time = "2026-05-20T21:30:51.713Z" }, + { url = "https://files.pythonhosted.org/packages/4c/75/0f5da6ca045f8a052203e1810058029f4b682507a789b413cac7d28bae28/gevent-26.5.0-cp311-cp311-manylinux_2_28_x86_64.whl", hash = "sha256:d325502eb0695708ef8c899f605573ed6847f3961f8159627dba267fbf3ce457", size = 2119054, upload-time = "2026-05-20T20:35:22.678Z" }, + { url = "https://files.pythonhosted.org/packages/6e/f1/fcff7f7fad2bb33f3742db6b2145825a2191c0cd31d75789b0741fd28faf/gevent-26.5.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:a11daf3a588b932c8bf965fb18444c69aff48badec88435e988cf8d67137075a", size = 1778784, upload-time = "2026-05-20T21:16:38.182Z" }, + { url = "https://files.pythonhosted.org/packages/98/57/151314f00bdc6ba77333febb3e9dc97fdf94d79426559b4fa8332f0c2b6e/gevent-26.5.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:1101b5ef82a3fb178550cfd80f32293dc8dd2f3d0828292223ebba29d6f76e33", size = 2145373, upload-time = "2026-05-20T20:43:27.255Z" }, + { url = "https://files.pythonhosted.org/packages/1a/b5/7a02f711db62cbed1c1a00e1f9ff50eef95ccc78d4c04a0f93636655d1b7/gevent-26.5.0-cp311-cp311-win_amd64.whl", hash = "sha256:5233109ad4f3af16393ba9888f238919a05ce15ce68d6831ac8a0da8dfb750ae", size = 1696576, upload-time = "2026-05-20T20:15:49.62Z" }, + { url = "https://files.pythonhosted.org/packages/f8/9b/5022adc310697ef25c6fb22eb9bf0ebcad3427b51776e882709de9a8b6d7/gevent-26.5.0-cp311-cp311-win_arm64.whl", hash = "sha256:3be804565168ffacebeb21af9f1cd689831a89f0f12fc0c3f423c730c3c9eb31", size = 1552095, upload-time = "2026-05-20T20:16:54.81Z" }, + { url = "https://files.pythonhosted.org/packages/37/0b/1a530b2db55c97cc0cf44116201f538f3033c04c1d2aca143979b412f4be/gevent-26.5.0-cp312-cp312-macosx_11_0_universal2.whl", hash = "sha256:e80ad2a8a1e8bdaa5605e3bf4929e0cebf9ea7b8237c83362f7257698bb14280", size = 2929714, upload-time = "2026-05-20T20:13:24.656Z" }, + { url = "https://files.pythonhosted.org/packages/b9/df/32fe851ed5f68493f354e09b19bdebae0de1185be4db0b2988e71e737fd3/gevent-26.5.0-cp312-cp312-manylinux_2_28_aarch64.whl", hash = "sha256:fe42c037253580a3386fce275f8a2a845e540f5a729916934a732f13d42e72cc", size = 1784838, upload-time = "2026-05-20T21:17:31.063Z" }, + { url = "https://files.pythonhosted.org/packages/e5/9a/21332674f9a10e8cdf13b41b52e9d663647a1c6e1dc3c62b07c0aeefd360/gevent-26.5.0-cp312-cp312-manylinux_2_28_ppc64le.whl", hash = "sha256:9f463c7d6f69d13b6fe8e3b832a6175a6e95328a940f38495d25496d1ae8ad88", size = 1880440, upload-time = "2026-05-20T21:16:00.881Z" }, + { url = "https://files.pythonhosted.org/packages/9f/b1/5f8a4196113cf7f3fdd987b483f7e6b10c28ea3930c4727e31ba8cce51b6/gevent-26.5.0-cp312-cp312-manylinux_2_28_s390x.whl", hash = "sha256:96d5e96b1b14a4c1023dcfcc114533217f13febc3b6169254f23fc18d19fee29", size = 1831592, upload-time = "2026-05-20T21:30:53.832Z" }, + { url = "https://files.pythonhosted.org/packages/4e/69/1559b1f6b5107a9118fccd300240879bd581b6d87b03d568d0d155ea702c/gevent-26.5.0-cp312-cp312-manylinux_2_28_x86_64.whl", hash = "sha256:bccff69c462e3650a0fd1d4e9cfc8b6effe15f3e9b1cad20a7bb5ce14b057efd", size = 2114915, upload-time = "2026-05-20T20:35:25.041Z" }, + { url = "https://files.pythonhosted.org/packages/e4/32/602c499d54472f64e5cdf6013aeab5ce6aa6fed005387e8b4f2d22f5dc8d/gevent-26.5.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:f519139354d5ca7625df9ddb1b2ffada885c14abc5b4dbae3682e967ddf79669", size = 1796906, upload-time = "2026-05-20T21:16:39.65Z" }, + { url = "https://files.pythonhosted.org/packages/f9/3c/2fe77ee6e3d381b3c50c0b7d6c4c08c08b8ff5e8c0d9dd51a3b426d61eec/gevent-26.5.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:0bf57df54f1c66273bf3601c2a1e41b12138fe848933718369663bc54f177ca2", size = 2140806, upload-time = "2026-05-20T20:43:28.895Z" }, + { url = "https://files.pythonhosted.org/packages/22/d5/4620797bbd9c88f4541188efc138b0d615f9834db540da36a2249ee929c5/gevent-26.5.0-cp312-cp312-win_amd64.whl", hash = "sha256:e49ce0de007dfd7412edbc2b5d41cce33b049bb1b7086f50be5a09e601bde603", size = 1699995, upload-time = "2026-05-20T20:15:39.311Z" }, + { url = "https://files.pythonhosted.org/packages/cb/83/ac3477dfc0f9fd80c88110102c73cefc35dcded2b248544f45a8fa5412df/gevent-26.5.0-cp312-cp312-win_arm64.whl", hash = "sha256:5c5ff29495a2eed2a244de8150f21893d6c1b15d8b4b5719ab4bbfa06db1e28f", size = 1547433, upload-time = "2026-05-20T20:15:51.656Z" }, + { url = "https://files.pythonhosted.org/packages/7d/47/5b992ab9c8037633cfd0fe698a97a878f59d8eb53c381e91e9a1a76fd215/gevent-26.5.0-cp313-cp313-macosx_11_0_universal2.whl", hash = "sha256:9b4d3f34c913d1a6bec6d030365a517f3b527a9773b12e58cf56c3339bbe96e6", size = 2952523, upload-time = "2026-05-20T20:13:04.698Z" }, + { url = "https://files.pythonhosted.org/packages/74/11/c7dfc773eb43331a682efed610b49df6e976331f1b0e1c592a0c35d29872/gevent-26.5.0-cp313-cp313-manylinux_2_28_aarch64.whl", hash = "sha256:1d8da4e799431feeb4c9e441ac7431f0baabb9106976790d884289d08ac08359", size = 1787044, upload-time = "2026-05-20T21:17:32.845Z" }, + { url = "https://files.pythonhosted.org/packages/ae/28/9812933dac93560f46910a9e834805fe76f822c408bd1c20cdf299d7c311/gevent-26.5.0-cp313-cp313-manylinux_2_28_ppc64le.whl", hash = "sha256:51becdb4c30a8f45c1c028ad7a97bf5a1ed141f74b159a31aa9cc6aa1e6263a6", size = 1882342, upload-time = "2026-05-20T21:16:02.645Z" }, + { url = "https://files.pythonhosted.org/packages/96/4b/514f248f69b2230b69b0bb17f4158b0b05dd4b2cb469a60ab206e9fe7496/gevent-26.5.0-cp313-cp313-manylinux_2_28_s390x.whl", hash = "sha256:c42bbcd3d453b08ad8915fd3feaf3d44a3562cdf1c7b208f9837149711e16d9d", size = 1834136, upload-time = "2026-05-20T21:30:55.739Z" }, + { url = "https://files.pythonhosted.org/packages/53/67/f5f30716efca99b6200ae89a9303a7e94dae085b7de6f6d0033c52a37f4b/gevent-26.5.0-cp313-cp313-manylinux_2_28_x86_64.whl", hash = "sha256:bd3445e4fbeeb46690ed8efe94b8d1d46b14aa04af8866ae7a8da5997828d1c6", size = 2115349, upload-time = "2026-05-20T20:35:28.132Z" }, + { url = "https://files.pythonhosted.org/packages/09/d8/60e8809bde7986e6c4e6d106080b3603fa09b3bb0255fed1a4d8282e3ca2/gevent-26.5.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:b573d5b2826edc705f31f07da6889ad483a6a0d64944ebd8d32205f7c5bf46fb", size = 1799443, upload-time = "2026-05-20T21:16:41.928Z" }, + { url = "https://files.pythonhosted.org/packages/f8/41/b388b2b1f0a026ea30687e51ddf81dbb783dfb55fac0a16708d2821d99e5/gevent-26.5.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:4d53b1b28f2082a151bded2850b53f6baed02f742d2a1584029e8bd42d457fb4", size = 2141117, upload-time = "2026-05-20T20:43:30.694Z" }, + { url = "https://files.pythonhosted.org/packages/b1/f3/ac9a4b0de487e390c5d53a908a9347c0df0102de2bbf3e8603087769191d/gevent-26.5.0-cp313-cp313-win_amd64.whl", hash = "sha256:23569ce0c254eb821fc3dcfe250843dde8b3180b09bae9e222e41aa3fa4885b7", size = 1699862, upload-time = "2026-05-20T20:15:33.642Z" }, + { url = "https://files.pythonhosted.org/packages/2a/cf/1ef1fc9b390563c0f97702f94a557d1649b7bbb5724f9b86c2122747e92f/gevent-26.5.0-cp313-cp313-win_arm64.whl", hash = "sha256:40cdcdb2e404b6c82b82a4576bdb33958f23fc2deb0d933e9e022b362001e647", size = 1545341, upload-time = "2026-05-20T20:16:26.229Z" }, + { url = "https://files.pythonhosted.org/packages/17/55/7d98d3888e7bb9ad4656420dec69232ecbbea48792aff9295d0ad7cf8435/gevent-26.5.0-cp314-cp314-macosx_11_0_universal2.whl", hash = "sha256:75a0050e4b87f08ddee7e56f59e6014cd7fcdc3153046c09a847940515d12c85", size = 2968223, upload-time = "2026-05-20T20:13:17.223Z" }, + { url = "https://files.pythonhosted.org/packages/f8/b4/e8e116fcbcb9dc0bf3acc50037f86e1204c217c8ed5defde68be11b3aab6/gevent-26.5.0-cp314-cp314-manylinux_2_28_aarch64.whl", hash = "sha256:fd1a0b83a04e19378d9466ae0ee2b5937cf1d7fbfdcb916b2aea82179a208574", size = 1793926, upload-time = "2026-05-20T21:17:34.321Z" }, + { url = "https://files.pythonhosted.org/packages/28/07/7b267e9754b661defb93542e97731a4df21f8a40dc0f6c853faa717cf124/gevent-26.5.0-cp314-cp314-manylinux_2_28_ppc64le.whl", hash = "sha256:4c964c15076e76391d523ec24202f579a2535f7e301a40efb1656ae046d3eb69", size = 1887632, upload-time = "2026-05-20T21:16:04.158Z" }, + { url = "https://files.pythonhosted.org/packages/5c/50/b47d29e99449bd13b557ffa451401dc13d397a9923f562ef90a4e8514502/gevent-26.5.0-cp314-cp314-manylinux_2_28_s390x.whl", hash = "sha256:45d5438d1c84da5df7e832434627624709543630977332bb4e2d05ecca362cc9", size = 1838688, upload-time = "2026-05-20T21:30:57.979Z" }, + { url = "https://files.pythonhosted.org/packages/8b/eb/5b54ccff11bc7d7bebd40a24571ccc115d5cdae4f6c32ab457b43b436e42/gevent-26.5.0-cp314-cp314-manylinux_2_28_x86_64.whl", hash = "sha256:354f35924113abc954819216c2a6ee16751958c615681e0490946e31b437bd2f", size = 2120351, upload-time = "2026-05-20T20:35:32.699Z" }, + { url = "https://files.pythonhosted.org/packages/9c/70/30fd325c30e04b1e5174c61945e17421d53ddb2450366cc52cef234f8c4b/gevent-26.5.0-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:a47cd2d32f6404212d374ad8014a3491d7477dcf0cc09c5a2308ad6d325fd663", size = 1806684, upload-time = "2026-05-20T21:16:43.87Z" }, + { url = "https://files.pythonhosted.org/packages/cd/e8/fbf911ac3f9524ecfaed174d100fde671904ab8db92ceaf07faaebd13386/gevent-26.5.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:032157cebdedb84f2f52cdd980f2f5f2623eed6a8f083aadf44b44c47f628642", size = 2146606, upload-time = "2026-05-20T20:43:32.216Z" }, + { url = "https://files.pythonhosted.org/packages/9e/4d/284fcbbfde66fd978c2980c1fbe0eabd586af6e4b728649e9cf459e8b38f/gevent-26.5.0-cp314-cp314-win_amd64.whl", hash = "sha256:9c414935ba5fc88359110968851d3616f119082c937390d00a1c0f4f59be814f", size = 1722497, upload-time = "2026-05-20T20:16:44.274Z" }, + { url = "https://files.pythonhosted.org/packages/15/d2/9f66eb53434704402be0ba733bf3320bf589671a4b76fac52a7d6077e972/gevent-26.5.0-cp314-cp314-win_arm64.whl", hash = "sha256:2a0f5993a04b95a35b3a118b1a58ba272833f9b547b774001dea29f90620882f", size = 1574249, upload-time = "2026-05-20T20:15:50.873Z" }, + { url = "https://files.pythonhosted.org/packages/dc/d5/b4c50adb761878e3c96642b9f79bf44cee3120f3df55cd40876f51d89866/gevent-26.5.0-cp315-cp315-macosx_11_0_universal2.whl", hash = "sha256:2e117df896a2660c9ebd4e2b5afc02dfd6e2ddf9b495e787e67c72d105432b09", size = 2971993, upload-time = "2026-05-20T20:12:50.845Z" }, + { url = "https://files.pythonhosted.org/packages/03/83/71c2a945e80198422d1d93dbe67355f249fb456b451bf9201199d3ef6a1a/gevent-26.5.0-cp315-cp315-manylinux_2_28_aarch64.whl", hash = "sha256:af5ffe9c11ffb8a39b6bef2e8b722aa2043ae4980977915c6aa8c68b4bc26e46", size = 1796658, upload-time = "2026-05-20T21:17:35.968Z" }, + { url = "https://files.pythonhosted.org/packages/42/96/548ca77aed5cb9a44e855a6c23ebceeb3554a0ea9ca0c01c311878899a3e/gevent-26.5.0-cp315-cp315-manylinux_2_28_ppc64le.whl", hash = "sha256:7da34aef7e87c43dd3662e5785e79ed505c01399a7cb42876d2d8925969fd75f", size = 1891473, upload-time = "2026-05-20T21:16:05.657Z" }, + { url = "https://files.pythonhosted.org/packages/f6/4f/f48bd47d5287afb0fbcc56165f3ed47583f1803bad401653fe27e71ade2d/gevent-26.5.0-cp315-cp315-manylinux_2_28_s390x.whl", hash = "sha256:1c6293a7046bcc6f3d8972a74b19cd7a4cfd02d3881edf0fcf827aa514bd247b", size = 1841429, upload-time = "2026-05-20T21:30:59.907Z" }, + { url = "https://files.pythonhosted.org/packages/a0/72/1925215fc720d2561fa3ec8d4af5f098f8d0cbfa76a45fafed6e5ade7718/gevent-26.5.0-cp315-cp315-manylinux_2_28_x86_64.whl", hash = "sha256:d3bde0f140a275b2fa88e4b6516bda85551930e10bc2fd95e18c1b7d11cb780c", size = 2123895, upload-time = "2026-05-20T20:35:34.964Z" }, + { url = "https://files.pythonhosted.org/packages/83/59/0f584f6b1170c9a6abd9b70ccf5e9cc5ead34eabafabc0e21876ef0fe6f7/gevent-26.5.0-cp315-cp315-musllinux_1_2_aarch64.whl", hash = "sha256:e29fb4b17d9958ec8cb7f6339a111b29bc23f2c2efbef86189d1248bb4862d17", size = 1809047, upload-time = "2026-05-20T21:16:45.977Z" }, + { url = "https://files.pythonhosted.org/packages/82/88/61e854bfd98ac22eac78a97fc6db10de0f9ace46514072b435c217168729/gevent-26.5.0-cp315-cp315-musllinux_1_2_x86_64.whl", hash = "sha256:b2239df2f7570efa03736678f3f053bb1bdd22a8a16cd28a2feb7d32ea5f533f", size = 2150764, upload-time = "2026-05-20T20:43:33.781Z" }, + { url = "https://files.pythonhosted.org/packages/b9/f5/af048b97433d7f9a7df7f5510b2c46918b7d073dcfb3bf6d0ef0e5a83dcc/gevent-26.5.0-cp315-cp315-win_amd64.whl", hash = "sha256:aae214952fd38d27a42dc416bb70193962ec932384b63445d29bbb5817a1c042", size = 1722600, upload-time = "2026-05-20T20:19:56.81Z" }, + { url = "https://files.pythonhosted.org/packages/11/95/fb74a2299c6a2d78d9de12deaaac640ab5d2ef96a8e0f97a3ff84b9ca84b/gevent-26.5.0-cp315-cp315-win_arm64.whl", hash = "sha256:f7067564f139e33bf26a31ee3b13d168d76eb99a44b85ced626652b158baa80c", size = 1574406, upload-time = "2026-05-20T20:17:12.125Z" }, +] + +[[package]] +name = "googleapis-common-protos" +version = "1.75.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "protobuf" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/b5/c8/f439cffde755cffa462bfbb156278fa6f9d09119719af9814b858fd4f81f/googleapis_common_protos-1.75.0.tar.gz", hash = "sha256:53a062ff3c32552fbd62c11fe23768b78e4ddf0494d5e5fd97d3f4689c75fbbd", size = 151035, upload-time = "2026-05-07T08:04:49.423Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/e7/c8/e2645aa8ed02fd4c7a2f59d68783b65b1f3cbdfe39a6308e156509d1fee8/googleapis_common_protos-1.75.0-py3-none-any.whl", hash = "sha256:961ed60399c457ceb0ee8f285a84c870aabc9c6a832b9d37bb281b5bebde43ed", size = 300631, upload-time = "2026-05-07T08:03:30.345Z" }, +] + +[[package]] +name = "greenlet" +version = "3.5.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/6d/6e/802acd792aebb2256fbbee8cacf2727faaeb6f240ac11008f09eae4414bc/greenlet-3.5.1.tar.gz", hash = "sha256:5a56aeb7d5d9cc4b3a735efb5095bd4b4f6f0e4f93e5ca876d0e2315137b7829", size = 197356, upload-time = "2026-05-20T15:05:03.917Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/42/3c/ff890b466eaba2b0f5e6bdfff025f8c75f41b8ffdc3dbc3d24ad261e764a/greenlet-3.5.1-cp311-cp311-macosx_11_0_universal2.whl", hash = "sha256:73f78f9b9f0a5c06e5c946ba1e8e36f5114923b6be109ee618c54f079c3ea14f", size = 284764, upload-time = "2026-05-20T13:09:10.204Z" }, + { url = "https://files.pythonhosted.org/packages/81/0e/5e5457be3d256918f6a4756f073548a3f0190836e2cc94aa6d0d617a940b/greenlet-3.5.1-cp311-cp311-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:a0cbed8bb44e23c5b199f888f4e4ce096b45ad9f25ff74a7ad0213875e936bb2", size = 603479, upload-time = "2026-05-20T14:00:04.757Z" }, + { url = "https://files.pythonhosted.org/packages/6d/e1/f89a21d58d308298e6f275f13a1b472ed96c680b601a371b08be6a725989/greenlet-3.5.1-cp311-cp311-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:a203a8bd0acb0701653d3bbb26e404854a68674139ed5cbb778830f42b09bb33", size = 615495, upload-time = "2026-05-20T14:05:40.87Z" }, + { url = "https://files.pythonhosted.org/packages/2c/f2/8fd452fd81adb9ec79c8275c1375702ab0fd6bee4952da12eaa09b9508d8/greenlet-3.5.1-cp311-cp311-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:6ebeb75c81211f5c702576cf81f315e77e23cfdb2c7c6fcb9dd143e6de35c360", size = 623515, upload-time = "2026-05-20T14:09:07.853Z" }, + { url = "https://files.pythonhosted.org/packages/75/de/af6cef182862d2ccd6975440d21c9058a77c3f9b469abf94e322dfd2e0e3/greenlet-3.5.1-cp311-cp311-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:8a271fcd66c74615cda6a964fda3f304267a12e50a084472218a39bb0376f563", size = 614754, upload-time = "2026-05-20T13:14:24.947Z" }, + { url = "https://files.pythonhosted.org/packages/ec/bc/c318aa9f3ffc77320fddcee3d892be957b42e2ff947198d9450b004f3a38/greenlet-3.5.1-cp311-cp311-manylinux_2_39_riscv64.whl", hash = "sha256:017a544f0385d441e88714160d089d6900ef46c9eff9d99b6715a5ef2d127747", size = 418439, upload-time = "2026-05-20T14:01:38.446Z" }, + { url = "https://files.pythonhosted.org/packages/1a/c6/50e520283a9f19388a7326b05f9e8637e566003475eacaadad04f558c68d/greenlet-3.5.1-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:ded7b068c7c31c1a8657d4fd42d886b3e051ae29f88b80c5ff9d502257b0f071", size = 1574097, upload-time = "2026-05-20T14:02:24.003Z" }, + { url = "https://files.pythonhosted.org/packages/21/1c/13abd1f4860d987fa5e1170a01930d6e6cd40d328de487a3c9fdaff0ffd0/greenlet-3.5.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:d0932b81d72f552ded9d810d00021b64d89f2195a91ce115b893f943b7a4ab3c", size = 1641058, upload-time = "2026-05-20T13:14:31.83Z" }, + { url = "https://files.pythonhosted.org/packages/f5/56/5f332b7705545eac2dc01b4e9254d24a793f2656d55d5cc6b94ee59d22ae/greenlet-3.5.1-cp311-cp311-win_amd64.whl", hash = "sha256:88e300d136eac057b2397aa1cfd7328b4c87c7eb66a09c7bc6a1292234db474e", size = 238089, upload-time = "2026-05-20T13:14:03.229Z" }, + { url = "https://files.pythonhosted.org/packages/d9/a9/a3c2fa886c5b94863fb0e61b3bc14610b7aa94cf4f17f8741b11708305fc/greenlet-3.5.1-cp311-cp311-win_arm64.whl", hash = "sha256:cc6ab7e555c8a112ad3a76e368e86e12a2754bcae1652a5602e133ec7b635523", size = 234989, upload-time = "2026-05-20T13:08:27.715Z" }, + { url = "https://files.pythonhosted.org/packages/c4/37/4549f149c9797c21b32c2683c33522af22522099de128b2406672526d005/greenlet-3.5.1-cp312-cp312-macosx_11_0_universal2.whl", hash = "sha256:fa4f98af3a528f0c3fd592a26df7f376f93329c8f4d987f6bb979057af8bf5e2", size = 286220, upload-time = "2026-05-20T13:07:28.463Z" }, + { url = "https://files.pythonhosted.org/packages/38/ff/a4f436709716965eaab9f36ea7b906c8a927fbe32fb1372a2071d964f6b1/greenlet-3.5.1-cp312-cp312-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:ffea73584b216150eab159b6d12348fb253e68757974de1e2c40d8a318ac89ed", size = 601585, upload-time = "2026-05-20T14:00:06.141Z" }, + { url = "https://files.pythonhosted.org/packages/65/ad/54bc3fcee3ad368a61b19b67d88117f7a8c29727bf71fffdeda81fbd946e/greenlet-3.5.1-cp312-cp312-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:1072b4f9edcc1e192d9283a66a3e68d6b84c561de33a83d7858beb9ba1effe10", size = 614215, upload-time = "2026-05-20T14:05:42.675Z" }, + { url = "https://files.pythonhosted.org/packages/7c/6c/de5b1b388cd2d9fbdfeab324863daba37d54e6e233ddbefd70b385a8c591/greenlet-3.5.1-cp312-cp312-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:89101bfd5011e069be974903cb3a4e4523845e4ece2d62dcd8d358933c0ef249", size = 620094, upload-time = "2026-05-20T14:09:09.18Z" }, + { url = "https://files.pythonhosted.org/packages/40/69/b91cda0647df839483201545913514c2827ebea5e5ccdf931842763bc127/greenlet-3.5.1-cp312-cp312-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:add5217d68b31130f0beca584d7fef4878327d2e31642b66618a14eef312b63b", size = 611358, upload-time = "2026-05-20T13:14:26.37Z" }, + { url = "https://files.pythonhosted.org/packages/4a/43/1204baffab8a6476464795a7ccf394a3248d4f22c9f87173a15b36b6d971/greenlet-3.5.1-cp312-cp312-manylinux_2_39_riscv64.whl", hash = "sha256:e6cd99ea59dd5d89f0c956606571d79bfe6f68c9eb7f4a4083a41a7f1587edee", size = 422782, upload-time = "2026-05-20T14:01:39.597Z" }, + { url = "https://files.pythonhosted.org/packages/59/90/3cf77e080350cd02fa307bb2abf05df48f4482c240275bbd2c203ba8bb1c/greenlet-3.5.1-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:a5ea42a752d47a145eae922b605cd1634665ac3d5ec1e72402d5048e8d60d207", size = 1570475, upload-time = "2026-05-20T14:02:25.29Z" }, + { url = "https://files.pythonhosted.org/packages/65/2c/18cece62045e74598c3c393f70dce4a63f56222015ba29a5d4eeb04f764c/greenlet-3.5.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:c5551170cf4f5ff5623e9af81323751979fee2c731e2287b61f73cd27257b823", size = 1635625, upload-time = "2026-05-20T13:14:34.027Z" }, + { url = "https://files.pythonhosted.org/packages/30/f5/310d104ddf41eb5a70f4c268d22508dfb0c3c8e86fec152be34d0d2ed819/greenlet-3.5.1-cp312-cp312-win_amd64.whl", hash = "sha256:3c8bb982ad117d29478ef8f5533e97df21f1e2befd17a299257b0c96d1371c0b", size = 238791, upload-time = "2026-05-20T13:10:39.018Z" }, + { url = "https://files.pythonhosted.org/packages/62/90/ceca11f504cd23a8047a3dea31919adc48df9b626dd0c13f0d858734fdfd/greenlet-3.5.1-cp312-cp312-win_arm64.whl", hash = "sha256:80eb4b04dadc4e67df3fae179a32c4706a3f495bc7f22fc8a81115d5f5512188", size = 235580, upload-time = "2026-05-20T13:08:45.056Z" }, + { url = "https://files.pythonhosted.org/packages/27/69/7f7e5372d998b81001899b1c0823c957aa413ba0f2662e65821611cc31e4/greenlet-3.5.1-cp313-cp313-macosx_11_0_universal2.whl", hash = "sha256:51518ff74664078fc51bffcc6fc529b0df5ae58da192691cee765d45ce944a2b", size = 285060, upload-time = "2026-05-20T13:08:51.899Z" }, + { url = "https://files.pythonhosted.org/packages/b1/bf/387f9b6b865fd2ae0d0be09e0004827295a01b71be76ed350dd1e28a91a4/greenlet-3.5.1-cp313-cp313-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:1ffdb3c0bb002c99cd8f298957e046c3dbf6006b5b7cdf11a4e19194624a0a0a", size = 604370, upload-time = "2026-05-20T14:00:07.492Z" }, + { url = "https://files.pythonhosted.org/packages/32/f5/169ce3d4e4c67291bd18f8cbe0299c9f3e45102c7f1fb3c14780c93e4532/greenlet-3.5.1-cp313-cp313-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:7715a5a2c3378ba602c3a440558261e13a820bb53a82693aacd7b7f6d964e283", size = 616987, upload-time = "2026-05-20T14:05:44.237Z" }, + { url = "https://files.pythonhosted.org/packages/19/ba/c24110c55dffa55aa6e1d98b45310da33801aeba7686ff0190fe5d46fd32/greenlet-3.5.1-cp313-cp313-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:d40a890035c0058cadbdc4af7569800fd28a0e527a0fdbb7b5f9418f176846ce", size = 622911, upload-time = "2026-05-20T14:09:10.598Z" }, + { url = "https://files.pythonhosted.org/packages/ee/e5/7f2e41d5273be07e77560d61ea4e56485b4d6c316d2a84518c62d1364061/greenlet-3.5.1-cp313-cp313-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:dc71ff466927a201b08305acac451ebe1aedfcea002f62f1f2f2ac2ac1e6a135", size = 613911, upload-time = "2026-05-20T13:14:27.539Z" }, + { url = "https://files.pythonhosted.org/packages/ec/7b/d20db2e8a5ad6c038702f3179b136f93f0a3d1a21a0c0777f3e470cdf4b2/greenlet-3.5.1-cp313-cp313-manylinux_2_39_riscv64.whl", hash = "sha256:67821bb03e4e98664490edb787ff6af501194c29bbee0f5c1dfdcf1dc3d9d436", size = 425228, upload-time = "2026-05-20T14:01:40.837Z" }, + { url = "https://files.pythonhosted.org/packages/c5/a4/fbdc67579b73615a1f91615e814303cc71e06128f7baaba87be79b8fb90c/greenlet-3.5.1-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:cd443683db272ebaaca03af98c0b063ab30db70ea8a31a1559f35e3f7b744ccd", size = 1570689, upload-time = "2026-05-20T14:02:27.225Z" }, + { url = "https://files.pythonhosted.org/packages/e6/b4/77abbe35078be39718a46cd49caf16bceb35662f97a34101dca28aa98e47/greenlet-3.5.1-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:089fff7a6ce8d9316d1f65ebc00273a56be258c1725b32b94de90a3a979557e1", size = 1635602, upload-time = "2026-05-20T13:14:36.344Z" }, + { url = "https://files.pythonhosted.org/packages/37/f7/129f27ca700845b8ee8ca88ce7f43435a1239c2eddb7677fc938822762cf/greenlet-3.5.1-cp313-cp313-win_amd64.whl", hash = "sha256:110a1ca7b49b014b097f6078272c3f4ed31af45b254de5228b79adba879f6af9", size = 238683, upload-time = "2026-05-20T13:11:50.57Z" }, + { url = "https://files.pythonhosted.org/packages/6d/5c/a485a36e87df8d8fd0632ee01511244f5156a20ed3746cc6599340326395/greenlet-3.5.1-cp313-cp313-win_arm64.whl", hash = "sha256:f16ba1efc0715b680a18b8123d90dad887c6112ae3555b4b5c32c149540c6b4e", size = 235499, upload-time = "2026-05-20T13:12:42.028Z" }, + { url = "https://files.pythonhosted.org/packages/8a/cb/c62454606daf5640369c94d8a9dd540599b1bfc090e2d2180cb77f4038d2/greenlet-3.5.1-cp314-cp314-macosx_11_0_universal2.whl", hash = "sha256:d8ab31c9de8651a2facdd5c5bb0011f2380dd1a7af78ce2adf4b56095294fc07", size = 285579, upload-time = "2026-05-20T13:08:56.396Z" }, + { url = "https://files.pythonhosted.org/packages/ec/71/c4270398c2eba968a6071af1dfbdcaeee6ec1c24bc8b435b8cc452700da6/greenlet-3.5.1-cp314-cp314-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:5e300185139abc337ade480c327183adf42a875ac7181bfe66d7d4efea31fbea", size = 651106, upload-time = "2026-05-20T14:00:09.448Z" }, + { url = "https://files.pythonhosted.org/packages/1a/ab/71e34b78a44ec271fb5f550c17bc46d301ddc5953890d935f270b0dcdb5a/greenlet-3.5.1-cp314-cp314-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:7ffdb990dcaa0234cf9845aead5df2e3c3a8b6507d409274dd87e0d5ab05ffc2", size = 663478, upload-time = "2026-05-20T14:05:45.88Z" }, + { url = "https://files.pythonhosted.org/packages/c6/2d/2d80842910da44f78c286532d084b8a5c3717c844ae80ceb3858738ae89a/greenlet-3.5.1-cp314-cp314-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:6c09df69dc1712d131332054a858a3e5cca400967fa3a672e2324fbb0971448c", size = 667767, upload-time = "2026-05-20T14:09:12.15Z" }, + { url = "https://files.pythonhosted.org/packages/77/96/4efd6fa5c62c85426a0c19077a586258ebc3a2a146ff2493e4312a697a22/greenlet-3.5.1-cp314-cp314-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:2f82b3597e9d83b63408affed0b48fd0f54935edac4302237b9a837be0dae33c", size = 660800, upload-time = "2026-05-20T13:14:29.129Z" }, + { url = "https://files.pythonhosted.org/packages/e9/d3/dad2eecedfbb1ed7050a20dcfae40c1442b74bc7423608be2c7e03ee7133/greenlet-3.5.1-cp314-cp314-manylinux_2_39_riscv64.whl", hash = "sha256:a4764e0bfc6a4d114c865b32520805c16a990ef5f286a514413b05d5ecd6a23d", size = 470786, upload-time = "2026-05-20T14:01:42.064Z" }, + { url = "https://files.pythonhosted.org/packages/7a/e0/6c71401a25cac7000261304e866a2f2cc04dc74810d40e2f118aa4799495/greenlet-3.5.1-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:c0141e37414c10164e702b8fb1473304221ad98f71600850c6ef7ff4880feba0", size = 1617518, upload-time = "2026-05-20T14:02:28.662Z" }, + { url = "https://files.pythonhosted.org/packages/41/26/c5c06643e8c0af9e7bf18e16cb51d0ab7625155f0392e1c9015d66d556cd/greenlet-3.5.1-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:50ae25a67bea74ea41fb14b960bc532df73eb713417b2d61892dced82fe8d3bc", size = 1681593, upload-time = "2026-05-20T13:14:39.417Z" }, + { url = "https://files.pythonhosted.org/packages/8a/bd/e11a108317485075e68af9d23039619b86b28130c3b50d227d42edece64b/greenlet-3.5.1-cp314-cp314-win_amd64.whl", hash = "sha256:8a17c42330e261299766b75ac1ea32caa437a9453c8f65d16a13140db378ecd3", size = 239800, upload-time = "2026-05-20T13:09:30.128Z" }, + { url = "https://files.pythonhosted.org/packages/47/f8/8e8e8417b7bf28639a5a56356ef934d0375e1d0c70a57e04d7701e870ffe/greenlet-3.5.1-cp314-cp314-win_arm64.whl", hash = "sha256:7b5f5fae05b8ac6d176a61b60c394a8cbdc2b5b91b81793066e68745cf165e54", size = 236862, upload-time = "2026-05-20T13:09:10.498Z" }, + { url = "https://files.pythonhosted.org/packages/90/12/41bf27fde4d3605d3773ae57751eda182b8be2f5398011c041173b1d9534/greenlet-3.5.1-cp314-cp314t-macosx_11_0_universal2.whl", hash = "sha256:ea8da1e900d758d078810d4255d8c6aa572181896a31ec79d779eb79c3adc9ad", size = 293637, upload-time = "2026-05-20T13:12:35.529Z" }, + { url = "https://files.pythonhosted.org/packages/44/44/ba14b23e9757707050c2f397d305bbcae62e5d7cad122f8b6baec5ae4a1f/greenlet-3.5.1-cp314-cp314t-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:a19570c52a21420dcbc94e661994bc325c0b5b11304540fed514586da5dc8f2e", size = 650840, upload-time = "2026-05-20T14:00:11.079Z" }, + { url = "https://files.pythonhosted.org/packages/a8/37/5ddc2b686a6844f91abecef43411842426da2e1573f60b49ecf2547f4ae1/greenlet-3.5.1-cp314-cp314t-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:3d955c89b75eeca4723d7cc14135f393cd47c32e2a6cb4a8e4c6e760a26b0986", size = 656416, upload-time = "2026-05-20T14:05:47.118Z" }, + { url = "https://files.pythonhosted.org/packages/8c/46/5987dcd1a2570ba84f3b187536b2ca3ae97613387e57f5cfa99df068fe5e/greenlet-3.5.1-cp314-cp314t-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:ea37d5a157eb9493820d3792ac4ece28619a394391d2b9f2f78057d396ff0f0f", size = 656607, upload-time = "2026-05-20T14:09:13.949Z" }, + { url = "https://files.pythonhosted.org/packages/e1/f0/d17510297c35a2992712f0bf84de3779749999f7d3d63aa1f09db7c62dbe/greenlet-3.5.1-cp314-cp314t-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:de2daaaebd1a5aa88c49045b6baf9310b3263796bd88db713edf37cf53e7bb4e", size = 654397, upload-time = "2026-05-20T13:14:30.696Z" }, + { url = "https://files.pythonhosted.org/packages/2c/c1/6da0a9ddcc29d7e51ef14883fa3dc1e53b3f4ffba00582106c7bf55da1d8/greenlet-3.5.1-cp314-cp314t-manylinux_2_39_riscv64.whl", hash = "sha256:8d8a23250ea3ec7b36de8fa4b541e9e2db3ee82915cc060ab0631609ad8b28de", size = 488287, upload-time = "2026-05-20T14:01:43.143Z" }, + { url = "https://files.pythonhosted.org/packages/37/eb/147387705bb89092645b012586e7273cb5ed3c90ef7eaf3a69173eaf0209/greenlet-3.5.1-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:3bfbd69cc349e43bf3a8ae1c85548ff0718efc887615c2db16c3833d7b0b072d", size = 1614469, upload-time = "2026-05-20T14:02:30.192Z" }, + { url = "https://files.pythonhosted.org/packages/a6/4e/37ee0da7732b7aa9896f17e15579a9df34b9fcb9dd494f0adfa749af6623/greenlet-3.5.1-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:4378720dd888136c27215a0214d32a4d37c3852765d45bc37aad0623423cfd78", size = 1675115, upload-time = "2026-05-20T13:14:40.972Z" }, + { url = "https://files.pythonhosted.org/packages/57/f3/97dfcf4a6eb5077f8a672234216fb5923eb89f2cab7081cb10b2cf75b605/greenlet-3.5.1-cp314-cp314t-win_amd64.whl", hash = "sha256:45718441607f9325d948db98cbc691276059316d0358c188c246da4e1d4d23d2", size = 245246, upload-time = "2026-05-20T13:12:22.646Z" }, + { url = "https://files.pythonhosted.org/packages/5d/73/d7f72e34b582f694f4a9b248162db7b09cc458a259ba8f0c0bfa1a34ea7d/greenlet-3.5.1-cp315-cp315-macosx_11_0_universal2.whl", hash = "sha256:2baee5ca02031757ffe8cc3d69f0cc0aec7065ce362622da74f32d3bcab1c541", size = 285575, upload-time = "2026-05-20T13:12:07.043Z" }, + { url = "https://files.pythonhosted.org/packages/df/59/fa9c6e87dc8ad27a95dabe2f29f372b733d05a8a67470f6c901ed9975655/greenlet-3.5.1-cp315-cp315-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:9b1ec3274918a81d3ea778b9e75b56b72b33f300edb6cf7f3a7fe1dae56683de", size = 656428, upload-time = "2026-05-20T14:00:12.556Z" }, + { url = "https://files.pythonhosted.org/packages/f6/f9/e753408871eaa61dfe35e619cfc67512b036fde99893685d50eea9e07146/greenlet-3.5.1-cp315-cp315-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:111e2390ffffc47d5840b01711dd7fac07d4c09283d0283e7f3264b14e284c64", size = 667064, upload-time = "2026-05-20T14:05:48.662Z" }, + { url = "https://files.pythonhosted.org/packages/dc/74/807a047255bf1e09303627c46dc043dca596b6958a354d904f32ab382005/greenlet-3.5.1-cp315-cp315-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:10a9a1c0bfbc93d41156ffcb90c75fbc05544054faf15dcc1fdf9765f8b607f0", size = 672962, upload-time = "2026-05-20T14:09:15.532Z" }, + { url = "https://files.pythonhosted.org/packages/96/27/5565b5b40389f1c7753003a07e21892fda8660926787036d5bc0308b8113/greenlet-3.5.1-cp315-cp315-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:e630136e905fe5ff43e86945ae41220b6d1470956a39220e708110ac48d01ea5", size = 665697, upload-time = "2026-05-20T13:14:32.943Z" }, + { url = "https://files.pythonhosted.org/packages/76/32/19d4e13225193c29b13e308015223f7d75fd3d8623d49dd19040d2ce8ec1/greenlet-3.5.1-cp315-cp315-manylinux_2_39_riscv64.whl", hash = "sha256:ef08c1567c78074b22d1a200183d52d04a14df447bf70bcbb6a3507a48e776fc", size = 476047, upload-time = "2026-05-20T14:01:44.39Z" }, + { url = "https://files.pythonhosted.org/packages/cf/82/e7de4178c0c2d1c9a5a3be3cc0b33e46a85b3ee4a77c071bf7ad8600e079/greenlet-3.5.1-cp315-cp315-musllinux_1_2_aarch64.whl", hash = "sha256:975eac34b44a7077ca4d421348455b94f0f518246a7f14bc6d2fdcfe5b584368", size = 1621256, upload-time = "2026-05-20T14:02:31.91Z" }, + { url = "https://files.pythonhosted.org/packages/00/10/f2dddcf7dacac17dfc68691809589adad06135eb28930429cf58a6467a2f/greenlet-3.5.1-cp315-cp315-musllinux_1_2_x86_64.whl", hash = "sha256:9ab3c3a0b2ae6198e67c898dad5215a49f9ae0d0081b3c3ec59f333e39eeca26", size = 1685956, upload-time = "2026-05-20T13:14:42.55Z" }, + { url = "https://files.pythonhosted.org/packages/22/17/4a232b32133230ada52f70e9d7f5b65b0caef8772f01849bd8d149e7e4ca/greenlet-3.5.1-cp315-cp315-win_amd64.whl", hash = "sha256:cbfc69be86e10dcfef5b1e6269d1d6926552aa89ee39e1de3353360c1b6989ab", size = 239802, upload-time = "2026-05-20T13:13:15.481Z" }, + { url = "https://files.pythonhosted.org/packages/c2/ae/4e623a7e6d4d2a5f4cb8e4c82de4169fc637942caae68d6e676b8a128ac5/greenlet-3.5.1-cp315-cp315-win_arm64.whl", hash = "sha256:92fd6d44ac5e5a887c8a5dc4a8ba0ba908527c31c12f78c6bc7dcfe8aab279f6", size = 236853, upload-time = "2026-05-20T13:15:37.301Z" }, + { url = "https://files.pythonhosted.org/packages/7a/57/816d9cff29119da3505b3d6a5e14a8af89006ac36f47f891ff293ee05af1/greenlet-3.5.1-cp315-cp315t-macosx_11_0_universal2.whl", hash = "sha256:a6fdf2433a5441ef9a95464f7c3e674775da1c8c1177fff311cee1acad4626ed", size = 293877, upload-time = "2026-05-20T13:10:19.078Z" }, + { url = "https://files.pythonhosted.org/packages/23/a1/59b0a7c7d140ff1a75626680b9a9899b79a9176cab298b394968fb023295/greenlet-3.5.1-cp315-cp315t-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:7546556f0d649f99f6a361098a55f761181bb2ea12ff150bb16d26092ad88244", size = 655333, upload-time = "2026-05-20T14:00:14.758Z" }, + { url = "https://files.pythonhosted.org/packages/72/1b/5efe127597625042218939d01855109f352779050768b670b52edcc16a6c/greenlet-3.5.1-cp315-cp315t-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:d5ee3ea898009fa898f85f9982255d35278c477bebe185beca249cab42d4526c", size = 659443, upload-time = "2026-05-20T14:05:50.159Z" }, + { url = "https://files.pythonhosted.org/packages/c9/9d/1dcdf7b95ab3cf8c7b6d7277c18a5e167312f2b362ddfcc5d5e6d8d84b43/greenlet-3.5.1-cp315-cp315t-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:a57b0d05a0448eed231d59c0ceb287dde984551e54cbc51ac2d4865712838e9c", size = 659998, upload-time = "2026-05-20T14:09:16.912Z" }, + { url = "https://files.pythonhosted.org/packages/6c/6d/c404246ea4d22d097a7426d0efb5b781bd7eb67715f09e79001bd552ab18/greenlet-3.5.1-cp315-cp315t-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:a5c81f74d204d3edd136ebfd50dce53acbb776995d721a0fe801626cfc93b8cd", size = 658356, upload-time = "2026-05-20T13:14:35.091Z" }, + { url = "https://files.pythonhosted.org/packages/05/7e/c4959664fc231d587d66d8e81f2095e98056ba1954beafdcbe635e251052/greenlet-3.5.1-cp315-cp315t-manylinux_2_39_riscv64.whl", hash = "sha256:b0703c2cef53e01baec47f7a3868009913ad71ec678bbecb42a6f40895e4ce62", size = 494470, upload-time = "2026-05-20T14:01:45.611Z" }, + { url = "https://files.pythonhosted.org/packages/51/02/f8ee37fb6d2219329f350af241c27fcf12df57e723d11f6fc6d3bacdadaa/greenlet-3.5.1-cp315-cp315t-musllinux_1_2_aarch64.whl", hash = "sha256:2c18ef16bf6d4dd410e4dd52996888ea1497be26892fe5bbc73580aba4287b8e", size = 1619216, upload-time = "2026-05-20T14:02:33.403Z" }, + { url = "https://files.pythonhosted.org/packages/93/c5/3dc9475ace2c7a3680da12372cddd7f1ac874eb410a1ac48d3e9dab83782/greenlet-3.5.1-cp315-cp315t-musllinux_1_2_x86_64.whl", hash = "sha256:17d86354f0ae6b61bf9be5148d0dd34e06c3cb7c602c671f79f29ac3b150e659", size = 1678427, upload-time = "2026-05-20T13:14:43.71Z" }, + { url = "https://files.pythonhosted.org/packages/df/4e/750c15c317a41ffb36f0bf40b933e3d744a7dede61889f74443ea69690cf/greenlet-3.5.1-cp315-cp315t-win_amd64.whl", hash = "sha256:e7516cf6ae6b8a582c2770a0caed47b8a48373ed732c33d69a72913ae6ac923e", size = 245225, upload-time = "2026-05-20T13:13:59.366Z" }, + { url = "https://files.pythonhosted.org/packages/4f/fd/d3baea2eeb7b617efd47e87ca06e2ec2c6118d303aa9e918e0ce16eadc10/greenlet-3.5.1-cp315-cp315t-win_arm64.whl", hash = "sha256:5028648bf2253ec4745add746129d3904121fa7fe871a76bed23c5720573ce0a", size = 239590, upload-time = "2026-05-20T13:13:37.382Z" }, +] + +[[package]] +name = "grpcio" +version = "1.80.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "typing-extensions" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/b7/48/af6173dbca4454f4637a4678b67f52ca7e0c1ed7d5894d89d434fecede05/grpcio-1.80.0.tar.gz", hash = "sha256:29aca15edd0688c22ba01d7cc01cb000d72b2033f4a3c72a81a19b56fd143257", size = 12978905, upload-time = "2026-03-30T08:49:10.502Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/5d/db/1d56e5f5823257b291962d6c0ce106146c6447f405b60b234c4f222a7cde/grpcio-1.80.0-cp311-cp311-linux_armv7l.whl", hash = "sha256:dfab85db094068ff42e2a3563f60ab3dddcc9d6488a35abf0132daec13209c8a", size = 6055009, upload-time = "2026-03-30T08:46:46.265Z" }, + { url = "https://files.pythonhosted.org/packages/6e/18/c83f3cad64c5ca63bca7e91e5e46b0d026afc5af9d0a9972472ceba294b3/grpcio-1.80.0-cp311-cp311-macosx_11_0_universal2.whl", hash = "sha256:5c07e82e822e1161354e32da2662f741a4944ea955f9f580ec8fb409dd6f6060", size = 12035295, upload-time = "2026-03-30T08:46:49.099Z" }, + { url = "https://files.pythonhosted.org/packages/0f/8e/e14966b435be2dda99fbe89db9525ea436edc79780431a1c2875a3582644/grpcio-1.80.0-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:ba0915d51fd4ced2db5ff719f84e270afe0e2d4c45a7bdb1e8d036e4502928c2", size = 6610297, upload-time = "2026-03-30T08:46:52.123Z" }, + { url = "https://files.pythonhosted.org/packages/cc/26/d5eb38f42ce0e3fdc8174ea4d52036ef8d58cc4426cb800f2610f625dd75/grpcio-1.80.0-cp311-cp311-manylinux2014_i686.manylinux_2_17_i686.whl", hash = "sha256:3cb8130ba457d2aa09fa6b7c3ed6b6e4e6a2685fce63cb803d479576c4d80e21", size = 7300208, upload-time = "2026-03-30T08:46:54.859Z" }, + { url = "https://files.pythonhosted.org/packages/25/51/bd267c989f85a17a5b3eea65a6feb4ff672af41ca614e5a0279cc0ea381c/grpcio-1.80.0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:09e5e478b3d14afd23f12e49e8b44c8684ac3c5f08561c43a5b9691c54d136ab", size = 6813442, upload-time = "2026-03-30T08:46:57.056Z" }, + { url = "https://files.pythonhosted.org/packages/9e/d9/d80eef735b19e9169e30164bbf889b46f9df9127598a83d174eb13a48b26/grpcio-1.80.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:00168469238b022500e486c1c33916acf2f2a9b2c022202cf8a1885d2e3073c1", size = 7414743, upload-time = "2026-03-30T08:46:59.682Z" }, + { url = "https://files.pythonhosted.org/packages/de/f2/567f5bd5054398ed6b0509b9a30900376dcf2786bd936812098808b49d8d/grpcio-1.80.0-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:8502122a3cc1714038e39a0b071acb1207ca7844208d5ea0d091317555ee7106", size = 8426046, upload-time = "2026-03-30T08:47:02.474Z" }, + { url = "https://files.pythonhosted.org/packages/62/29/73ef0141b4732ff5eacd68430ff2512a65c004696997f70476a83e548e7e/grpcio-1.80.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:ce1794f4ea6cc3ca29463f42d665c32ba1b964b48958a66497917fe9069f26e6", size = 7851641, upload-time = "2026-03-30T08:47:05.462Z" }, + { url = "https://files.pythonhosted.org/packages/46/69/abbfa360eb229a8623bab5f5a4f8105e445bd38ce81a89514ba55d281ad0/grpcio-1.80.0-cp311-cp311-win32.whl", hash = "sha256:51b4a7189b0bef2aa30adce3c78f09c83526cf3dddb24c6a96555e3b97340440", size = 4154368, upload-time = "2026-03-30T08:47:08.027Z" }, + { url = "https://files.pythonhosted.org/packages/6f/d4/ae92206d01183b08613e846076115f5ac5991bae358d2a749fa864da5699/grpcio-1.80.0-cp311-cp311-win_amd64.whl", hash = "sha256:02e64bb0bb2da14d947a49e6f120a75e947250aebe65f9629b62bb1f5c14e6e9", size = 4894235, upload-time = "2026-03-30T08:47:10.839Z" }, + { url = "https://files.pythonhosted.org/packages/5c/e8/a2b749265eb3415abc94f2e619bbd9e9707bebdda787e61c593004ec927a/grpcio-1.80.0-cp312-cp312-linux_armv7l.whl", hash = "sha256:c624cc9f1008361014378c9d776de7182b11fe8b2e5a81bc69f23a295f2a1ad0", size = 6015616, upload-time = "2026-03-30T08:47:13.428Z" }, + { url = "https://files.pythonhosted.org/packages/3e/97/b1282161a15d699d1e90c360df18d19165a045ce1c343c7f313f5e8a0b77/grpcio-1.80.0-cp312-cp312-macosx_11_0_universal2.whl", hash = "sha256:f49eddcac43c3bf350c0385366a58f36bed8cc2c0ec35ef7b74b49e56552c0c2", size = 12014204, upload-time = "2026-03-30T08:47:15.873Z" }, + { url = "https://files.pythonhosted.org/packages/6e/5e/d319c6e997b50c155ac5a8cb12f5173d5b42677510e886d250d50264949d/grpcio-1.80.0-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:d334591df610ab94714048e0d5b4f3dd5ad1bee74dfec11eee344220077a79de", size = 6563866, upload-time = "2026-03-30T08:47:18.588Z" }, + { url = "https://files.pythonhosted.org/packages/ae/f6/fdd975a2cb4d78eb67769a7b3b3830970bfa2e919f1decf724ae4445f42c/grpcio-1.80.0-cp312-cp312-manylinux2014_i686.manylinux_2_17_i686.whl", hash = "sha256:0cb517eb1d0d0aaf1d87af7cc5b801d686557c1d88b2619f5e31fab3c2315921", size = 7273060, upload-time = "2026-03-30T08:47:21.113Z" }, + { url = "https://files.pythonhosted.org/packages/db/f0/a3deb5feba60d9538a962913e37bd2e69a195f1c3376a3dd44fe0427e996/grpcio-1.80.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:4e78c4ac0d97dc2e569b2f4bcbbb447491167cb358d1a389fc4af71ab6f70411", size = 6782121, upload-time = "2026-03-30T08:47:23.827Z" }, + { url = "https://files.pythonhosted.org/packages/ca/84/36c6dcfddc093e108141f757c407902a05085e0c328007cb090d56646cdf/grpcio-1.80.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:2ed770b4c06984f3b47eb0517b1c69ad0b84ef3f40128f51448433be904634cd", size = 7383811, upload-time = "2026-03-30T08:47:26.517Z" }, + { url = "https://files.pythonhosted.org/packages/7c/ef/f3a77e3dc5b471a0ec86c564c98d6adfa3510d38f8ee99010410858d591e/grpcio-1.80.0-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:256507e2f524092f1473071a05e65a5b10d84b82e3ff24c5b571513cfaa61e2f", size = 8393860, upload-time = "2026-03-30T08:47:29.439Z" }, + { url = "https://files.pythonhosted.org/packages/9b/8d/9d4d27ed7f33d109c50d6b5ce578a9914aa68edab75d65869a17e630a8d1/grpcio-1.80.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:9a6284a5d907c37db53350645567c522be314bac859a64a7a5ca63b77bb7958f", size = 7830132, upload-time = "2026-03-30T08:47:33.254Z" }, + { url = "https://files.pythonhosted.org/packages/14/e4/9990b41c6d7a44e1e9dee8ac11d7a9802ba1378b40d77468a7761d1ad288/grpcio-1.80.0-cp312-cp312-win32.whl", hash = "sha256:c71309cfce2f22be26aa4a847357c502db6c621f1a49825ae98aa0907595b193", size = 4140904, upload-time = "2026-03-30T08:47:35.319Z" }, + { url = "https://files.pythonhosted.org/packages/2f/2c/296f6138caca1f4b92a31ace4ae1b87dab692fc16a7a3417af3bb3c805bf/grpcio-1.80.0-cp312-cp312-win_amd64.whl", hash = "sha256:9fe648599c0e37594c4809d81a9e77bd138cc82eb8baa71b6a86af65426723ff", size = 4880944, upload-time = "2026-03-30T08:47:37.831Z" }, + { url = "https://files.pythonhosted.org/packages/2f/3a/7c3c25789e3f069e581dc342e03613c5b1cb012c4e8c7d9d5cf960a75856/grpcio-1.80.0-cp313-cp313-linux_armv7l.whl", hash = "sha256:e9e408fc016dffd20661f0126c53d8a31c2821b5c13c5d67a0f5ed5de93319ad", size = 6017243, upload-time = "2026-03-30T08:47:40.075Z" }, + { url = "https://files.pythonhosted.org/packages/04/19/21a9806eb8240e174fd1ab0cd5b9aa948bb0e05c2f2f55f9d5d7405e6d08/grpcio-1.80.0-cp313-cp313-macosx_11_0_universal2.whl", hash = "sha256:92d787312e613754d4d8b9ca6d3297e69994a7912a32fa38c4c4e01c272974b0", size = 12010840, upload-time = "2026-03-30T08:47:43.11Z" }, + { url = "https://files.pythonhosted.org/packages/18/3a/23347d35f76f639e807fb7a36fad3068aed100996849a33809591f26eca6/grpcio-1.80.0-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:8ac393b58aa16991a2f1144ec578084d544038c12242da3a215966b512904d0f", size = 6567644, upload-time = "2026-03-30T08:47:46.806Z" }, + { url = "https://files.pythonhosted.org/packages/ff/40/96e07ecb604a6a67ae6ab151e3e35b132875d98bc68ec65f3e5ab3e781d7/grpcio-1.80.0-cp313-cp313-manylinux2014_i686.manylinux_2_17_i686.whl", hash = "sha256:68e5851ac4b9afe07e7f84483803ad167852570d65326b34d54ca560bfa53fb6", size = 7277830, upload-time = "2026-03-30T08:47:49.643Z" }, + { url = "https://files.pythonhosted.org/packages/9b/e2/da1506ecea1f34a5e365964644b35edef53803052b763ca214ba3870c856/grpcio-1.80.0-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:873ff5d17d68992ef6605330127425d2fc4e77e612fa3c3e0ed4e668685e3140", size = 6783216, upload-time = "2026-03-30T08:47:52.817Z" }, + { url = "https://files.pythonhosted.org/packages/44/83/3b20ff58d0c3b7f6caaa3af9a4174d4023701df40a3f39f7f1c8e7c48f9d/grpcio-1.80.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:2bea16af2750fd0a899bf1abd9022244418b55d1f37da2202249ba4ba673838d", size = 7385866, upload-time = "2026-03-30T08:47:55.687Z" }, + { url = "https://files.pythonhosted.org/packages/47/45/55c507599c5520416de5eefecc927d6a0d7af55e91cfffb2e410607e5744/grpcio-1.80.0-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:ba0db34f7e1d803a878284cd70e4c63cb6ae2510ba51937bf8f45ba997cefcf7", size = 8391602, upload-time = "2026-03-30T08:47:58.303Z" }, + { url = "https://files.pythonhosted.org/packages/10/bb/dd06f4c24c01db9cf11341b547d0a016b2c90ed7dbbb086a5710df7dd1d7/grpcio-1.80.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:8eb613f02d34721f1acf3626dfdb3545bd3c8505b0e52bf8b5710a28d02e8aa7", size = 7826752, upload-time = "2026-03-30T08:48:01.311Z" }, + { url = "https://files.pythonhosted.org/packages/f9/1e/9d67992ba23371fd63d4527096eb8c6b76d74d52b500df992a3343fd7251/grpcio-1.80.0-cp313-cp313-win32.whl", hash = "sha256:93b6f823810720912fd131f561f91f5fed0fda372b6b7028a2681b8194d5d294", size = 4142310, upload-time = "2026-03-30T08:48:04.594Z" }, + { url = "https://files.pythonhosted.org/packages/cf/e6/283326a27da9e2c3038bc93eeea36fb118ce0b2d03922a9cda6688f53c5b/grpcio-1.80.0-cp313-cp313-win_amd64.whl", hash = "sha256:e172cf795a3ba5246d3529e4d34c53db70e888fa582a8ffebd2e6e48bc0cba50", size = 4882833, upload-time = "2026-03-30T08:48:07.363Z" }, + { url = "https://files.pythonhosted.org/packages/c5/6d/e65307ce20f5a09244ba9e9d8476e99fb039de7154f37fb85f26978b59c3/grpcio-1.80.0-cp314-cp314-linux_armv7l.whl", hash = "sha256:3d4147a97c8344d065d01bbf8b6acec2cf86fb0400d40696c8bdad34a64ffc0e", size = 6017376, upload-time = "2026-03-30T08:48:10.005Z" }, + { url = "https://files.pythonhosted.org/packages/69/10/9cef5d9650c72625a699c549940f0abb3c4bfdb5ed45a5ce431f92f31806/grpcio-1.80.0-cp314-cp314-macosx_11_0_universal2.whl", hash = "sha256:d8e11f167935b3eb089ac9038e1a063e6d7dbe995c0bb4a661e614583352e76f", size = 12018133, upload-time = "2026-03-30T08:48:12.927Z" }, + { url = "https://files.pythonhosted.org/packages/04/82/983aabaad82ba26113caceeb9091706a0696b25da004fe3defb5b346e15b/grpcio-1.80.0-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:f14b618fc30de822681ee986cfdcc2d9327229dc4c98aed16896761cacd468b9", size = 6574748, upload-time = "2026-03-30T08:48:16.386Z" }, + { url = "https://files.pythonhosted.org/packages/07/d7/031666ef155aa0bf399ed7e19439656c38bbd143779ae0861b038ce82abd/grpcio-1.80.0-cp314-cp314-manylinux2014_i686.manylinux_2_17_i686.whl", hash = "sha256:4ed39fbdcf9b87370f6e8df4e39ca7b38b3e5e9d1b0013c7b6be9639d6578d14", size = 7277711, upload-time = "2026-03-30T08:48:19.627Z" }, + { url = "https://files.pythonhosted.org/packages/e8/43/f437a78f7f4f1d311804189e8f11fb311a01049b2e08557c1068d470cb2e/grpcio-1.80.0-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:2dcc70e9f0ba987526e8e8603a610fb4f460e42899e74e7a518bf3c68fe1bf05", size = 6785372, upload-time = "2026-03-30T08:48:22.373Z" }, + { url = "https://files.pythonhosted.org/packages/93/3d/f6558e9c6296cb4227faa5c43c54a34c68d32654b829f53288313d16a86e/grpcio-1.80.0-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:448c884b668b868562b1bda833c5fce6272d26e1926ec46747cda05741d302c1", size = 7395268, upload-time = "2026-03-30T08:48:25.638Z" }, + { url = "https://files.pythonhosted.org/packages/06/21/0fdd77e84720b08843c371a2efa6f2e19dbebf56adc72df73d891f5506f0/grpcio-1.80.0-cp314-cp314-musllinux_1_2_i686.whl", hash = "sha256:a1dc80fe55685b4a543555e6eef975303b36c8db1023b1599b094b92aa77965f", size = 8392000, upload-time = "2026-03-30T08:48:28.974Z" }, + { url = "https://files.pythonhosted.org/packages/f5/68/67f4947ed55d2e69f2cc199ab9fd85e0a0034d813bbeef84df6d2ba4d4b7/grpcio-1.80.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:31b9ac4ad1aa28ffee5503821fafd09e4da0a261ce1c1281c6c8da0423c83b6e", size = 7828477, upload-time = "2026-03-30T08:48:32.054Z" }, + { url = "https://files.pythonhosted.org/packages/44/b6/8d4096691b2e385e8271911a0de4f35f0a6c7d05aff7098e296c3de86939/grpcio-1.80.0-cp314-cp314-win32.whl", hash = "sha256:367ce30ba67d05e0592470428f0ec1c31714cab9ef19b8f2e37be1f4c7d32fae", size = 4218563, upload-time = "2026-03-30T08:48:34.538Z" }, + { url = "https://files.pythonhosted.org/packages/e5/8c/bbe6baf2557262834f2070cf668515fa308b2d38a4bbf771f8f7872a7036/grpcio-1.80.0-cp314-cp314-win_amd64.whl", hash = "sha256:3b01e1f5464c583d2f567b2e46ff0d516ef979978f72091fd81f5ab7fa6e2e7f", size = 5019457, upload-time = "2026-03-30T08:48:37.308Z" }, +] + +[[package]] +name = "gunicorn" +version = "24.1.1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "packaging" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/78/0a/10739c03537ec5b131a867bf94df2e412b437696c7e5d26970e2198a80d2/gunicorn-24.1.1.tar.gz", hash = "sha256:f006d110e5cb3102859b4f5cd48335dbd9cc28d0d27cd24ddbdafa6c60929408", size = 287567, upload-time = "2026-01-24T01:15:31.359Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/96/90/cfe637677916fc6f53cd2b05d5746e249f683e1fa14c9e745a88c66f7290/gunicorn-24.1.1-py3-none-any.whl", hash = "sha256:757f6b621fc4f7581a90600b2cd9df593461f06a41d7259cb9b94499dc4095a8", size = 114920, upload-time = "2026-01-24T01:15:29.656Z" }, +] + +[package.optional-dependencies] +gevent = [ + { name = "gevent" }, +] + +[[package]] +name = "idna" +version = "3.17" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/b9/28/99c51f664567218d824af024c0251650fb27e4ca066df188dab0769c5b91/idna-3.17.tar.gz", hash = "sha256:5eb0cb53bc467c12eadcf6de83163ad8527cec9416f44b9b61b19caedad2b87f", size = 196048, upload-time = "2026-05-28T14:32:38.55Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/de/a7/f76514cc40ad6234098ecdebda08732d75964776c51a42845b7da10649e2/idna-3.17-py3-none-any.whl", hash = "sha256:466e48829084efe2548012b855df21540b96f2e20e51bd124c851536556a592c", size = 65316, upload-time = "2026-05-28T14:32:37.035Z" }, +] + +[[package]] +name = "iniconfig" +version = "2.3.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/72/34/14ca021ce8e5dfedc35312d08ba8bf51fdd999c576889fc2c24cb97f4f10/iniconfig-2.3.0.tar.gz", hash = "sha256:c76315c77db068650d49c5b56314774a7804df16fee4402c1f19d6d15d8c4730", size = 20503, upload-time = "2025-10-18T21:55:43.219Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/cb/b1/3846dd7f199d53cb17f49cba7e651e9ce294d8497c8c150530ed11865bb8/iniconfig-2.3.0-py3-none-any.whl", hash = "sha256:f631c04d2c48c52b84d0d0549c99ff3859c98df65b3101406327ecc7d53fbf12", size = 7484, upload-time = "2025-10-18T21:55:41.639Z" }, +] + +[[package]] +name = "ipykernel" +version = "6.29.5" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "appnope", marker = "sys_platform == 'darwin'" }, + { name = "comm" }, + { name = "debugpy" }, + { name = "ipython" }, + { name = "jupyter-client" }, + { name = "jupyter-core" }, + { name = "matplotlib-inline" }, + { name = "nest-asyncio" }, + { name = "packaging" }, + { name = "psutil" }, + { name = "pyzmq" }, + { name = "tornado" }, + { name = "traitlets" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/e9/5c/67594cb0c7055dc50814b21731c22a601101ea3b1b50a9a1b090e11f5d0f/ipykernel-6.29.5.tar.gz", hash = "sha256:f093a22c4a40f8828f8e330a9c297cb93dcab13bd9678ded6de8e5cf81c56215", size = 163367, upload-time = "2024-07-01T14:07:22.543Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/94/5c/368ae6c01c7628438358e6d337c19b05425727fbb221d2a3c4303c372f42/ipykernel-6.29.5-py3-none-any.whl", hash = "sha256:afdb66ba5aa354b09b91379bac28ae4afebbb30e8b39510c9690afb7a10421b5", size = 117173, upload-time = "2024-07-01T14:07:19.603Z" }, +] + +[[package]] +name = "ipython" +version = "9.13.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "colorama", marker = "sys_platform == 'win32'" }, + { name = "decorator" }, + { name = "ipython-pygments-lexers" }, + { name = "jedi" }, + { name = "matplotlib-inline" }, + { name = "pexpect", marker = "sys_platform != 'emscripten' and sys_platform != 'win32'" }, + { name = "prompt-toolkit" }, + { name = "psutil" }, + { name = "pygments" }, + { name = "stack-data" }, + { name = "traitlets" }, + { name = "typing-extensions", marker = "python_full_version < '3.12'" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/cd/c4/87cda5842cf5c31837c06ddb588e11c3c35d8ece89b7a0108c06b8c9b00a/ipython-9.13.0.tar.gz", hash = "sha256:7e834b6afc99f020e3f05966ced34792f40267d64cb1ea9043886dab0dde5967", size = 4430549, upload-time = "2026-04-24T12:24:55.221Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/b9/86/3060e8029b7cc505cce9a0137431dda81d0a3fde93a8f0f50ee0bf37a795/ipython-9.13.0-py3-none-any.whl", hash = "sha256:57f9d4639e20818d328d287c7b549af3d05f12486ea8f2e7f73e52a36ec4d201", size = 627274, upload-time = "2026-04-24T12:24:53.038Z" }, +] + +[[package]] +name = "ipython-genutils" +version = "0.2.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/e8/69/fbeffffc05236398ebfcfb512b6d2511c622871dca1746361006da310399/ipython_genutils-0.2.0.tar.gz", hash = "sha256:eb2e116e75ecef9d4d228fdc66af54269afa26ab4463042e33785b887c628ba8", size = 22208, upload-time = "2017-03-13T22:12:26.393Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/fa/bc/9bd3b5c2b4774d5f33b2d544f1460be9df7df2fe42f352135381c347c69a/ipython_genutils-0.2.0-py2.py3-none-any.whl", hash = "sha256:72dd37233799e619666c9f639a9da83c34013a73e8bbc79a7a6348d93c61fab8", size = 26343, upload-time = "2017-03-13T22:12:25.412Z" }, +] + +[[package]] +name = "ipython-pygments-lexers" +version = "1.1.1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "pygments" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/ef/4c/5dd1d8af08107f88c7f741ead7a40854b8ac24ddf9ae850afbcf698aa552/ipython_pygments_lexers-1.1.1.tar.gz", hash = "sha256:09c0138009e56b6854f9535736f4171d855c8c08a563a0dcd8022f78355c7e81", size = 8393, upload-time = "2025-01-17T11:24:34.505Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/d9/33/1f075bf72b0b747cb3288d011319aaf64083cf2efef8354174e3ed4540e2/ipython_pygments_lexers-1.1.1-py3-none-any.whl", hash = "sha256:a9462224a505ade19a605f71f8fa63c2048833ce50abc86768a0d81d876dc81c", size = 8074, upload-time = "2025-01-17T11:24:33.271Z" }, +] + +[[package]] +name = "isoduration" +version = "20.11.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "arrow" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/7c/1a/3c8edc664e06e6bd06cce40c6b22da5f1429aa4224d0c590f3be21c91ead/isoduration-20.11.0.tar.gz", hash = "sha256:ac2f9015137935279eac671f94f89eb00584f940f5dc49462a0c4ee692ba1bd9", size = 11649, upload-time = "2020-11-01T11:00:00.312Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/7b/55/e5326141505c5d5e34c5e0935d2908a74e4561eca44108fbfb9c13d2911a/isoduration-20.11.0-py3-none-any.whl", hash = "sha256:b2904c2a4228c3d44f409c8ae8e2370eb21a26f7ac2ec5446df141dde3452042", size = 11321, upload-time = "2020-11-01T10:59:58.02Z" }, +] + +[[package]] +name = "itsdangerous" +version = "2.2.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/9c/cb/8ac0172223afbccb63986cc25049b154ecfb5e85932587206f42317be31d/itsdangerous-2.2.0.tar.gz", hash = "sha256:e0050c0b7da1eea53ffaf149c0cfbb5c6e2e2b69c4bef22c81fa6eb73e5f6173", size = 54410, upload-time = "2024-04-16T21:28:15.614Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/04/96/92447566d16df59b2a776c0fb82dbc4d9e07cd95062562af01e408583fc4/itsdangerous-2.2.0-py3-none-any.whl", hash = "sha256:c6242fc49e35958c8b15141343aa660db5fc54d4f13a1db01a3f5891b98700ef", size = 16234, upload-time = "2024-04-16T21:28:14.499Z" }, +] + +[[package]] +name = "jedi" +version = "0.20.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "parso" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/46/b7/a3635f6a2d7cf5b5dd98064fc1d5fbbafcb25477bcea204a3a92145d158b/jedi-0.20.0.tar.gz", hash = "sha256:c3f4ccbd276696f4b19c54618d4fb18f9fc24b0aef02acf704b23f487daa1011", size = 3119416, upload-time = "2026-05-01T23:38:47.814Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/9a/93/242e2eab5fe682ffcb8b0084bde703a41d51e17ee0f3a31ff0d9d813620a/jedi-0.20.0-py2.py3-none-any.whl", hash = "sha256:7bdd9c2634f56713299976f4cbd59cb3fa92165cc5e05ea811fb253480728b67", size = 4884812, upload-time = "2026-05-01T23:38:43.919Z" }, +] + +[[package]] +name = "jinja2" +version = "3.1.6" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "markupsafe" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/df/bf/f7da0350254c0ed7c72f3e33cef02e048281fec7ecec5f032d4aac52226b/jinja2-3.1.6.tar.gz", hash = "sha256:0137fb05990d35f1275a587e9aee6d56da821fc83491a0fb838183be43f66d6d", size = 245115, upload-time = "2025-03-05T20:05:02.478Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/62/a1/3d680cbfd5f4b8f15abc1d571870c5fc3e594bb582bc3b64ea099db13e56/jinja2-3.1.6-py3-none-any.whl", hash = "sha256:85ece4451f492d0c13c5dd7c13a64681a86afae63a5f347908daf103ce6d2f67", size = 134899, upload-time = "2025-03-05T20:05:00.369Z" }, +] + +[[package]] +name = "jmespath" +version = "1.1.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/d3/59/322338183ecda247fb5d1763a6cbe46eff7222eaeebafd9fa65d4bf5cb11/jmespath-1.1.0.tar.gz", hash = "sha256:472c87d80f36026ae83c6ddd0f1d05d4e510134ed462851fd5f754c8c3cbb88d", size = 27377, upload-time = "2026-01-22T16:35:26.279Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/14/2f/967ba146e6d58cf6a652da73885f52fc68001525b4197effc174321d70b4/jmespath-1.1.0-py3-none-any.whl", hash = "sha256:a5663118de4908c91729bea0acadca56526eb2698e83de10cd116ae0f4e97c64", size = 20419, upload-time = "2026-01-22T16:35:24.919Z" }, +] + +[[package]] +name = "joblib" +version = "1.5.3" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/41/f2/d34e8b3a08a9cc79a50b2208a93dce981fe615b64d5a4d4abee421d898df/joblib-1.5.3.tar.gz", hash = "sha256:8561a3269e6801106863fd0d6d84bb737be9e7631e33aaed3fb9ce5953688da3", size = 331603, upload-time = "2025-12-15T08:41:46.427Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/7b/91/984aca2ec129e2757d1e4e3c81c3fcda9d0f85b74670a094cc443d9ee949/joblib-1.5.3-py3-none-any.whl", hash = "sha256:5fc3c5039fc5ca8c0276333a188bbd59d6b7ab37fe6632daa76bc7f9ec18e713", size = 309071, upload-time = "2025-12-15T08:41:44.973Z" }, +] + +[[package]] +name = "json2html" +version = "1.3.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/01/d5/40b617ee19d2d79f606ed37f8a81e51158f126d2af67270c68f2b47ae0d5/json2html-1.3.0.tar.gz", hash = "sha256:8951a53662ae9cfd812685facdba693fc950ffc1c1fd1a8a2d3cf4c34600689c", size = 6977, upload-time = "2019-07-03T20:50:03.023Z" } + +[[package]] +name = "jsonpointer" +version = "3.1.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/18/c7/af399a2e7a67fd18d63c40c5e62d3af4e67b836a2107468b6a5ea24c4304/jsonpointer-3.1.1.tar.gz", hash = "sha256:0b801c7db33a904024f6004d526dcc53bbb8a4a0f4e32bfd10beadf60adf1900", size = 9068, upload-time = "2026-03-23T22:32:32.458Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/9e/6a/a83720e953b1682d2d109d3c2dbb0bc9bf28cc1cbc205be4ef4be5da709d/jsonpointer-3.1.1-py3-none-any.whl", hash = "sha256:8ff8b95779d071ba472cf5bc913028df06031797532f08a7d5b602d8b2a488ca", size = 7659, upload-time = "2026-03-23T22:32:31.568Z" }, +] + +[[package]] +name = "jsonschema" +version = "4.26.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "attrs" }, + { name = "jsonschema-specifications" }, + { name = "referencing" }, + { name = "rpds-py" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/b3/fc/e067678238fa451312d4c62bf6e6cf5ec56375422aee02f9cb5f909b3047/jsonschema-4.26.0.tar.gz", hash = "sha256:0c26707e2efad8aa1bfc5b7ce170f3fccc2e4918ff85989ba9ffa9facb2be326", size = 366583, upload-time = "2026-01-07T13:41:07.246Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/69/90/f63fb5873511e014207a475e2bb4e8b2e570d655b00ac19a9a0ca0a385ee/jsonschema-4.26.0-py3-none-any.whl", hash = "sha256:d489f15263b8d200f8387e64b4c3a75f06629559fb73deb8fdfb525f2dab50ce", size = 90630, upload-time = "2026-01-07T13:41:05.306Z" }, +] + +[package.optional-dependencies] +format-nongpl = [ + { name = "fqdn" }, + { name = "idna" }, + { name = "isoduration" }, + { name = "jsonpointer" }, + { name = "rfc3339-validator" }, + { name = "rfc3986-validator" }, + { name = "rfc3987-syntax" }, + { name = "uri-template" }, + { name = "webcolors" }, +] + +[[package]] +name = "jsonschema-specifications" +version = "2025.9.1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "referencing" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/19/74/a633ee74eb36c44aa6d1095e7cc5569bebf04342ee146178e2d36600708b/jsonschema_specifications-2025.9.1.tar.gz", hash = "sha256:b540987f239e745613c7a9176f3edb72b832a4ac465cf02712288397832b5e8d", size = 32855, upload-time = "2025-09-08T01:34:59.186Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/41/45/1a4ed80516f02155c51f51e8cedb3c1902296743db0bbc66608a0db2814f/jsonschema_specifications-2025.9.1-py3-none-any.whl", hash = "sha256:98802fee3a11ee76ecaca44429fda8a41bff98b00a0f2838151b113f210cc6fe", size = 18437, upload-time = "2025-09-08T01:34:57.871Z" }, +] + +[[package]] +name = "jupyter-client" +version = "7.4.9" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "entrypoints" }, + { name = "jupyter-core" }, + { name = "nest-asyncio" }, + { name = "python-dateutil" }, + { name = "pyzmq" }, + { name = "tornado" }, + { name = "traitlets" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/1e/33/71778cdd2c69445bcd3bb6029da2e43cc9b5cbbeef4f4982ef3aaf396650/jupyter_client-7.4.9.tar.gz", hash = "sha256:52be28e04171f07aed8f20e1616a5a552ab9fee9cbbe6c1896ae170c3880d392", size = 329115, upload-time = "2023-01-12T20:05:10.58Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/fd/a7/ef3b7c8b9d6730a21febdd0809084e4cea6d2a7e43892436adecdd0acbd4/jupyter_client-7.4.9-py3-none-any.whl", hash = "sha256:214668aaea208195f4c13d28eb272ba79f945fc0cf3f11c7092c20b2ca1980e7", size = 133492, upload-time = "2023-01-12T20:05:08.044Z" }, +] + +[[package]] +name = "jupyter-core" +version = "5.9.1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "platformdirs" }, + { name = "traitlets" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/02/49/9d1284d0dc65e2c757b74c6687b6d319b02f822ad039e5c512df9194d9dd/jupyter_core-5.9.1.tar.gz", hash = "sha256:4d09aaff303b9566c3ce657f580bd089ff5c91f5f89cf7d8846c3cdf465b5508", size = 89814, upload-time = "2025-10-16T19:19:18.444Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/e7/e7/80988e32bf6f73919a113473a604f5a8f09094de312b9d52b79c2df7612b/jupyter_core-5.9.1-py3-none-any.whl", hash = "sha256:ebf87fdc6073d142e114c72c9e29a9d7ca03fad818c5d300ce2adc1fb0743407", size = 29032, upload-time = "2025-10-16T19:19:16.783Z" }, +] + +[[package]] +name = "jupyter-events" +version = "0.12.1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "jsonschema", extra = ["format-nongpl"] }, + { name = "packaging" }, + { name = "python-json-logger" }, + { name = "pyyaml" }, + { name = "referencing" }, + { name = "rfc3339-validator" }, + { name = "rfc3986-validator" }, + { name = "traitlets" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/18/f8/475c4241b2b75af0deaae453ed003c6c851766dbc44d332d8baf245dc931/jupyter_events-0.12.1.tar.gz", hash = "sha256:faff25f77218335752f35f23c5fe6e4a392a7bd99a5939ccb9b8fbf594636cf3", size = 62854, upload-time = "2026-04-20T23:17:50.66Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/eb/6c/6fcde0c8f616ed360ffd3587f7db9e225a7e62b583a04494d2f069cf64ea/jupyter_events-0.12.1-py3-none-any.whl", hash = "sha256:c366585253f537a627da52fa7ca7410c5b5301fe893f511e7b077c2d93ec8bcf", size = 19512, upload-time = "2026-04-20T23:17:48.927Z" }, +] + +[[package]] +name = "jupyter-server" +version = "2.18.2" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "anyio" }, + { name = "argon2-cffi" }, + { name = "jinja2" }, + { name = "jupyter-client" }, + { name = "jupyter-core" }, + { name = "jupyter-events" }, + { name = "jupyter-server-terminals" }, + { name = "nbconvert" }, + { name = "nbformat" }, + { name = "overrides", marker = "python_full_version < '3.12'" }, + { name = "packaging" }, + { name = "prometheus-client" }, + { name = "pywinpty", marker = "os_name == 'nt'" }, + { name = "pyzmq" }, + { name = "send2trash" }, + { name = "terminado" }, + { name = "tornado" }, + { name = "traitlets" }, + { name = "websocket-client" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/ca/15/1eacb0fcb79ef86e8a0a79a708e6ad7435f6f223097dd29a4ce861fabc44/jupyter_server-2.18.2.tar.gz", hash = "sha256:06b4f40d8a7a00bb39d5216859c81374a0e7cfefe6d8a5a7facc5a5c37c679a7", size = 753177, upload-time = "2026-05-06T07:04:36.274Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/e2/50/ecf4f70d65bdb7519b28a33d1b2fee8a4b4ba1ae1a92f15d97e877c5de21/jupyter_server-2.18.2-py3-none-any.whl", hash = "sha256:fa5e46539ded65791838035a2b6001f13e54d5f64b8b3752eb1e91fdd641a5b8", size = 391907, upload-time = "2026-05-06T07:04:34.014Z" }, +] + +[[package]] +name = "jupyter-server-terminals" +version = "0.5.4" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "pywinpty", marker = "os_name == 'nt'" }, + { name = "terminado" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/f4/a7/bcd0a9b0cbba88986fe944aaaf91bfda603e5a50bda8ed15123f381a3b2f/jupyter_server_terminals-0.5.4.tar.gz", hash = "sha256:bbda128ed41d0be9020349f9f1f2a4ab9952a73ed5f5ac9f1419794761fb87f5", size = 31770, upload-time = "2026-01-14T16:53:20.213Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/d1/2d/6674563f71c6320841fc300911a55143925112a72a883e2ca71fba4c618d/jupyter_server_terminals-0.5.4-py3-none-any.whl", hash = "sha256:55be353fc74a80bc7f3b20e6be50a55a61cd525626f578dcb66a5708e2007d14", size = 13704, upload-time = "2026-01-14T16:53:18.738Z" }, +] + +[[package]] +name = "jupyterlab-pygments" +version = "0.3.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/90/51/9187be60d989df97f5f0aba133fa54e7300f17616e065d1ada7d7646b6d6/jupyterlab_pygments-0.3.0.tar.gz", hash = "sha256:721aca4d9029252b11cfa9d185e5b5af4d54772bb8072f9b7036f4170054d35d", size = 512900, upload-time = "2023-11-23T09:26:37.44Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/b1/dd/ead9d8ea85bf202d90cc513b533f9c363121c7792674f78e0d8a854b63b4/jupyterlab_pygments-0.3.0-py3-none-any.whl", hash = "sha256:841a89020971da1d8693f1a99997aefc5dc424bb1b251fd6322462a1b8842780", size = 15884, upload-time = "2023-11-23T09:26:34.325Z" }, +] + +[[package]] +name = "kiwisolver" +version = "1.5.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/d0/67/9c61eccb13f0bdca9307614e782fec49ffdde0f7a2314935d489fa93cd9c/kiwisolver-1.5.0.tar.gz", hash = "sha256:d4193f3d9dc3f6f79aaed0e5637f45d98850ebf01f7ca20e69457f3e8946b66a", size = 103482, upload-time = "2026-03-09T13:15:53.382Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/12/dd/a495a9c104be1c476f0386e714252caf2b7eca883915422a64c50b88c6f5/kiwisolver-1.5.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:9eed0f7edbb274413b6ee781cca50541c8c0facd3d6fd289779e494340a2b85c", size = 122798, upload-time = "2026-03-09T13:12:58.963Z" }, + { url = "https://files.pythonhosted.org/packages/11/60/37b4047a2af0cf5ef6d8b4b26e91829ae6fc6a2d1f74524bcb0e7cd28a32/kiwisolver-1.5.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:3c4923e404d6bcd91b6779c009542e5647fef32e4a5d75e115e3bbac6f2335eb", size = 66216, upload-time = "2026-03-09T13:13:00.155Z" }, + { url = "https://files.pythonhosted.org/packages/0a/aa/510dc933d87767584abfe03efa445889996c70c2990f6f87c3ebaa0a18c5/kiwisolver-1.5.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:0df54df7e686afa55e6f21fb86195224a6d9beb71d637e8d7920c95cf0f89aac", size = 63911, upload-time = "2026-03-09T13:13:01.671Z" }, + { url = "https://files.pythonhosted.org/packages/80/46/bddc13df6c2a40741e0cc7865bb1c9ed4796b6760bd04ce5fae3928ef917/kiwisolver-1.5.0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:2517e24d7315eb51c10664cdb865195df38ab74456c677df67bb47f12d088a27", size = 1438209, upload-time = "2026-03-09T13:13:03.385Z" }, + { url = "https://files.pythonhosted.org/packages/fd/d6/76621246f5165e5372f02f5e6f3f48ea336a8f9e96e43997d45b240ed8cd/kiwisolver-1.5.0-cp311-cp311-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:ff710414307fefa903e0d9bdf300972f892c23477829f49504e59834f4195398", size = 1248888, upload-time = "2026-03-09T13:13:05.231Z" }, + { url = "https://files.pythonhosted.org/packages/b2/c1/31559ec6fb39a5b48035ce29bb63ade628f321785f38c384dee3e2c08bc1/kiwisolver-1.5.0-cp311-cp311-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:6176c1811d9d5a04fa391c490cc44f451e240697a16977f11c6f722efb9041db", size = 1266304, upload-time = "2026-03-09T13:13:06.743Z" }, + { url = "https://files.pythonhosted.org/packages/5e/ef/1cb8276f2d29cc6a41e0a042f27946ca347d3a4a75acf85d0a16aa6dcc82/kiwisolver-1.5.0-cp311-cp311-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:50847dca5d197fcbd389c805aa1a1cf32f25d2e7273dc47ab181a517666b68cc", size = 1319650, upload-time = "2026-03-09T13:13:08.607Z" }, + { url = "https://files.pythonhosted.org/packages/4c/e4/5ba3cecd7ce6236ae4a80f67e5d5531287337d0e1f076ca87a5abe4cd5d0/kiwisolver-1.5.0-cp311-cp311-manylinux_2_39_riscv64.whl", hash = "sha256:01808c6d15f4c3e8559595d6d1fe6411c68e4a3822b4b9972b44473b24f4e679", size = 970949, upload-time = "2026-03-09T13:13:10.299Z" }, + { url = "https://files.pythonhosted.org/packages/5a/69/dc61f7ae9a2f071f26004ced87f078235b5507ab6e5acd78f40365655034/kiwisolver-1.5.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:f1f9f4121ec58628c96baa3de1a55a4e3a333c5102c8e94b64e23bf7b2083309", size = 2199125, upload-time = "2026-03-09T13:13:11.841Z" }, + { url = "https://files.pythonhosted.org/packages/e5/7b/abbe0f1b5afa85f8d084b73e90e5f801c0939eba16ac2e49af7c61a6c28d/kiwisolver-1.5.0-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:b7d335370ae48a780c6e6a6bbfa97342f563744c39c35562f3f367665f5c1de2", size = 2293783, upload-time = "2026-03-09T13:13:14.399Z" }, + { url = "https://files.pythonhosted.org/packages/8a/80/5908ae149d96d81580d604c7f8aefd0e98f4fd728cf172f477e9f2a81744/kiwisolver-1.5.0-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:800ee55980c18545af444d93fdd60c56b580db5cc54867d8cbf8a1dc0829938c", size = 1960726, upload-time = "2026-03-09T13:13:16.047Z" }, + { url = "https://files.pythonhosted.org/packages/84/08/a78cb776f8c085b7143142ce479859cfec086bd09ee638a317040b6ef420/kiwisolver-1.5.0-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:c438f6ca858697c9ab67eb28246c92508af972e114cac34e57a6d4ba17a3ac08", size = 2464738, upload-time = "2026-03-09T13:13:17.897Z" }, + { url = "https://files.pythonhosted.org/packages/b1/e1/65584da5356ed6cb12c63791a10b208860ac40a83de165cb6a6751a686e3/kiwisolver-1.5.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:8c63c91f95173f9c2a67c7c526b2cea976828a0e7fced9cdcead2802dc10f8a4", size = 2270718, upload-time = "2026-03-09T13:13:19.421Z" }, + { url = "https://files.pythonhosted.org/packages/be/6c/28f17390b62b8f2f520e2915095b3c94d88681ecf0041e75389d9667f202/kiwisolver-1.5.0-cp311-cp311-win_amd64.whl", hash = "sha256:beb7f344487cdcb9e1efe4b7a29681b74d34c08f0043a327a74da852a6749e7b", size = 73480, upload-time = "2026-03-09T13:13:20.818Z" }, + { url = "https://files.pythonhosted.org/packages/d8/0e/2ee5debc4f77a625778fec5501ff3e8036fe361b7ee28ae402a485bb9694/kiwisolver-1.5.0-cp311-cp311-win_arm64.whl", hash = "sha256:ad4ae4ffd1ee9cd11357b4c66b612da9888f4f4daf2f36995eda64bd45370cac", size = 64930, upload-time = "2026-03-09T13:13:21.997Z" }, + { url = "https://files.pythonhosted.org/packages/4d/b2/818b74ebea34dabe6d0c51cb1c572e046730e64844da6ed646d5298c40ce/kiwisolver-1.5.0-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:4e9750bc21b886308024f8a54ccb9a2cc38ac9fa813bf4348434e3d54f337ff9", size = 123158, upload-time = "2026-03-09T13:13:23.127Z" }, + { url = "https://files.pythonhosted.org/packages/bf/d9/405320f8077e8e1c5c4bd6adc45e1e6edf6d727b6da7f2e2533cf58bff71/kiwisolver-1.5.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:72ec46b7eba5b395e0a7b63025490d3214c11013f4aacb4f5e8d6c3041829588", size = 66388, upload-time = "2026-03-09T13:13:24.765Z" }, + { url = "https://files.pythonhosted.org/packages/99/9f/795fedf35634f746151ca8839d05681ceb6287fbed6cc1c9bf235f7887c2/kiwisolver-1.5.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:ed3a984b31da7481b103f68776f7128a89ef26ed40f4dc41a2223cda7fb24819", size = 64068, upload-time = "2026-03-09T13:13:25.878Z" }, + { url = "https://files.pythonhosted.org/packages/c4/13/680c54afe3e65767bed7ec1a15571e1a2f1257128733851ade24abcefbcc/kiwisolver-1.5.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:bb5136fb5352d3f422df33f0c879a1b0c204004324150cc3b5e3c4f310c9049f", size = 1477934, upload-time = "2026-03-09T13:13:27.166Z" }, + { url = "https://files.pythonhosted.org/packages/c8/2f/cebfcdb60fd6a9b0f6b47a9337198bcbad6fbe15e68189b7011fd914911f/kiwisolver-1.5.0-cp312-cp312-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:b2af221f268f5af85e776a73d62b0845fc8baf8ef0abfae79d29c77d0e776aaf", size = 1278537, upload-time = "2026-03-09T13:13:28.707Z" }, + { url = "https://files.pythonhosted.org/packages/f2/0d/9b782923aada3fafb1d6b84e13121954515c669b18af0c26e7d21f579855/kiwisolver-1.5.0-cp312-cp312-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:b0f172dc8ffaccb8522d7c5d899de00133f2f1ca7b0a49b7da98e901de87bf2d", size = 1296685, upload-time = "2026-03-09T13:13:30.528Z" }, + { url = "https://files.pythonhosted.org/packages/27/70/83241b6634b04fe44e892688d5208332bde130f38e610c0418f9ede47ded/kiwisolver-1.5.0-cp312-cp312-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:6ab8ba9152203feec73758dad83af9a0bbe05001eb4639e547207c40cfb52083", size = 1346024, upload-time = "2026-03-09T13:13:32.818Z" }, + { url = "https://files.pythonhosted.org/packages/e4/db/30ed226fb271ae1a6431fc0fe0edffb2efe23cadb01e798caeb9f2ceae8f/kiwisolver-1.5.0-cp312-cp312-manylinux_2_39_riscv64.whl", hash = "sha256:cdee07c4d7f6d72008d3f73b9bf027f4e11550224c7c50d8df1ae4a37c1402a6", size = 987241, upload-time = "2026-03-09T13:13:34.435Z" }, + { url = "https://files.pythonhosted.org/packages/ec/bd/c314595208e4c9587652d50959ead9e461995389664e490f4dce7ff0f782/kiwisolver-1.5.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:7c60d3c9b06fb23bd9c6139281ccbdc384297579ae037f08ae90c69f6845c0b1", size = 2227742, upload-time = "2026-03-09T13:13:36.4Z" }, + { url = "https://files.pythonhosted.org/packages/c1/43/0499cec932d935229b5543d073c2b87c9c22846aab48881e9d8d6e742a2d/kiwisolver-1.5.0-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:e315e5ec90d88e140f57696ff85b484ff68bb311e36f2c414aa4286293e6dee0", size = 2323966, upload-time = "2026-03-09T13:13:38.204Z" }, + { url = "https://files.pythonhosted.org/packages/3d/6f/79b0d760907965acfd9d61826a3d41f8f093c538f55cd2633d3f0db269f6/kiwisolver-1.5.0-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:1465387ac63576c3e125e5337a6892b9e99e0627d52317f3ca79e6930d889d15", size = 1977417, upload-time = "2026-03-09T13:13:39.966Z" }, + { url = "https://files.pythonhosted.org/packages/ab/31/01d0537c41cb75a551a438c3c7a80d0c60d60b81f694dac83dd436aec0d0/kiwisolver-1.5.0-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:530a3fd64c87cffa844d4b6b9768774763d9caa299e9b75d8eca6a4423b31314", size = 2491238, upload-time = "2026-03-09T13:13:41.698Z" }, + { url = "https://files.pythonhosted.org/packages/e4/34/8aefdd0be9cfd00a44509251ba864f5caf2991e36772e61c408007e7f417/kiwisolver-1.5.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:1d9daea4ea6b9be74fe2f01f7fbade8d6ffab263e781274cffca0dba9be9eec9", size = 2294947, upload-time = "2026-03-09T13:13:43.343Z" }, + { url = "https://files.pythonhosted.org/packages/ad/cf/0348374369ca588f8fe9c338fae49fa4e16eeb10ffb3d012f23a54578a9e/kiwisolver-1.5.0-cp312-cp312-win_amd64.whl", hash = "sha256:f18c2d9782259a6dc132fdc7a63c168cbc74b35284b6d75c673958982a378384", size = 73569, upload-time = "2026-03-09T13:13:45.792Z" }, + { url = "https://files.pythonhosted.org/packages/28/26/192b26196e2316e2bd29deef67e37cdf9870d9af8e085e521afff0fed526/kiwisolver-1.5.0-cp312-cp312-win_arm64.whl", hash = "sha256:f7c7553b13f69c1b29a5bde08ddc6d9d0c8bfb84f9ed01c30db25944aeb852a7", size = 64997, upload-time = "2026-03-09T13:13:46.878Z" }, + { url = "https://files.pythonhosted.org/packages/9d/69/024d6711d5ba575aa65d5538042e99964104e97fa153a9f10bc369182bc2/kiwisolver-1.5.0-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:fd40bb9cd0891c4c3cb1ddf83f8bbfa15731a248fdc8162669405451e2724b09", size = 123166, upload-time = "2026-03-09T13:13:48.032Z" }, + { url = "https://files.pythonhosted.org/packages/ce/48/adbb40df306f587054a348831220812b9b1d787aff714cfbc8556e38fccd/kiwisolver-1.5.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:c0e1403fd7c26d77c1f03e096dc58a5c726503fa0db0456678b8668f76f521e3", size = 66395, upload-time = "2026-03-09T13:13:49.365Z" }, + { url = "https://files.pythonhosted.org/packages/a8/3a/d0a972b34e1c63e2409413104216cd1caa02c5a37cb668d1687d466c1c45/kiwisolver-1.5.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:dda366d548e89a90d88a86c692377d18d8bd64b39c1fb2b92cb31370e2896bbd", size = 64065, upload-time = "2026-03-09T13:13:50.562Z" }, + { url = "https://files.pythonhosted.org/packages/2b/0a/7b98e1e119878a27ba8618ca1e18b14f992ff1eda40f47bccccf4de44121/kiwisolver-1.5.0-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:332b4f0145c30b5f5ad9374881133e5aa64320428a57c2c2b61e9d891a51c2f3", size = 1477903, upload-time = "2026-03-09T13:13:52.084Z" }, + { url = "https://files.pythonhosted.org/packages/18/d8/55638d89ffd27799d5cc3d8aa28e12f4ce7a64d67b285114dbedc8ea4136/kiwisolver-1.5.0-cp313-cp313-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:0c50b89ffd3e1a911c69a1dd3de7173c0cd10b130f56222e57898683841e4f96", size = 1278751, upload-time = "2026-03-09T13:13:54.673Z" }, + { url = "https://files.pythonhosted.org/packages/b8/97/b4c8d0d18421ecceba20ad8701358453b88e32414e6f6950b5a4bad54e65/kiwisolver-1.5.0-cp313-cp313-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:4db576bb8c3ef9365f8b40fe0f671644de6736ae2c27a2c62d7d8a1b4329f099", size = 1296793, upload-time = "2026-03-09T13:13:56.287Z" }, + { url = "https://files.pythonhosted.org/packages/c4/10/f862f94b6389d8957448ec9df59450b81bec4abb318805375c401a1e6892/kiwisolver-1.5.0-cp313-cp313-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:0b85aad90cea8ac6797a53b5d5f2e967334fa4d1149f031c4537569972596cb8", size = 1346041, upload-time = "2026-03-09T13:13:58.269Z" }, + { url = "https://files.pythonhosted.org/packages/a3/6a/f1650af35821eaf09de398ec0bc2aefc8f211f0cda50204c9f1673741ba9/kiwisolver-1.5.0-cp313-cp313-manylinux_2_39_riscv64.whl", hash = "sha256:d36ca54cb4c6c4686f7cbb7b817f66f5911c12ddb519450bbe86707155028f87", size = 987292, upload-time = "2026-03-09T13:13:59.871Z" }, + { url = "https://files.pythonhosted.org/packages/de/19/d7fb82984b9238115fe629c915007be608ebd23dc8629703d917dbfaffd4/kiwisolver-1.5.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:38f4a703656f493b0ad185211ccfca7f0386120f022066b018eb5296d8613e23", size = 2227865, upload-time = "2026-03-09T13:14:01.401Z" }, + { url = "https://files.pythonhosted.org/packages/7f/b9/46b7f386589fd222dac9e9de9c956ce5bcefe2ee73b4e79891381dda8654/kiwisolver-1.5.0-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:3ac2360e93cb41be81121755c6462cff3beaa9967188c866e5fce5cf13170859", size = 2324369, upload-time = "2026-03-09T13:14:02.972Z" }, + { url = "https://files.pythonhosted.org/packages/92/8b/95e237cf3d9c642960153c769ddcbe278f182c8affb20cecc1cc983e7cc5/kiwisolver-1.5.0-cp313-cp313-musllinux_1_2_riscv64.whl", hash = "sha256:c95cab08d1965db3d84a121f1c7ce7479bdd4072c9b3dafd8fecce48a2e6b902", size = 1977989, upload-time = "2026-03-09T13:14:04.503Z" }, + { url = "https://files.pythonhosted.org/packages/1b/95/980c9df53501892784997820136c01f62bc1865e31b82b9560f980c0e649/kiwisolver-1.5.0-cp313-cp313-musllinux_1_2_s390x.whl", hash = "sha256:fc20894c3d21194d8041a28b65622d5b86db786da6e3cfe73f0c762951a61167", size = 2491645, upload-time = "2026-03-09T13:14:06.106Z" }, + { url = "https://files.pythonhosted.org/packages/cb/32/900647fd0840abebe1561792c6b31e6a7c0e278fc3973d30572a965ca14c/kiwisolver-1.5.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:7a32f72973f0f950c1920475d5c5ea3d971b81b6f0ec53b8d0a956cc965f22e0", size = 2295237, upload-time = "2026-03-09T13:14:08.891Z" }, + { url = "https://files.pythonhosted.org/packages/be/8a/be60e3bbcf513cc5a50f4a3e88e1dcecebb79c1ad607a7222877becaa101/kiwisolver-1.5.0-cp313-cp313-win_amd64.whl", hash = "sha256:0bf3acf1419fa93064a4c2189ac0b58e3be7872bf6ee6177b0d4c63dc4cea276", size = 73573, upload-time = "2026-03-09T13:14:12.327Z" }, + { url = "https://files.pythonhosted.org/packages/4d/d2/64be2e429eb4fca7f7e1c52a91b12663aeaf25de3895e5cca0f47ef2a8d0/kiwisolver-1.5.0-cp313-cp313-win_arm64.whl", hash = "sha256:fa8eb9ecdb7efb0b226acec134e0d709e87a909fa4971a54c0c4f6e88635484c", size = 64998, upload-time = "2026-03-09T13:14:13.469Z" }, + { url = "https://files.pythonhosted.org/packages/b0/69/ce68dd0c85755ae2de490bf015b62f2cea5f6b14ff00a463f9d0774449ff/kiwisolver-1.5.0-cp313-cp313t-macosx_10_13_universal2.whl", hash = "sha256:db485b3847d182b908b483b2ed133c66d88d49cacf98fd278fadafe11b4478d1", size = 125700, upload-time = "2026-03-09T13:14:14.636Z" }, + { url = "https://files.pythonhosted.org/packages/74/aa/937aac021cf9d4349990d47eb319309a51355ed1dbdc9c077cdc9224cb11/kiwisolver-1.5.0-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:be12f931839a3bdfe28b584db0e640a65a8bcbc24560ae3fdb025a449b3d754e", size = 67537, upload-time = "2026-03-09T13:14:15.808Z" }, + { url = "https://files.pythonhosted.org/packages/ee/20/3a87fbece2c40ad0f6f0aefa93542559159c5f99831d596050e8afae7a9f/kiwisolver-1.5.0-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:16b85d37c2cbb3253226d26e64663f755d88a03439a9c47df6246b35defbdfb7", size = 65514, upload-time = "2026-03-09T13:14:18.035Z" }, + { url = "https://files.pythonhosted.org/packages/f0/7f/f943879cda9007c45e1f7dba216d705c3a18d6b35830e488b6c6a4e7cdf0/kiwisolver-1.5.0-cp313-cp313t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:4432b835675f0ea7414aab3d37d119f7226d24869b7a829caeab49ebda407b0c", size = 1584848, upload-time = "2026-03-09T13:14:19.745Z" }, + { url = "https://files.pythonhosted.org/packages/37/f8/4d4f85cc1870c127c88d950913370dd76138482161cd07eabbc450deff01/kiwisolver-1.5.0-cp313-cp313t-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:1b0feb50971481a2cc44d94e88bdb02cdd497618252ae226b8eb1201b957e368", size = 1391542, upload-time = "2026-03-09T13:14:21.54Z" }, + { url = "https://files.pythonhosted.org/packages/04/0b/65dd2916c84d252b244bd405303220f729e7c17c9d7d33dca6feeff9ffc4/kiwisolver-1.5.0-cp313-cp313t-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:56fa888f10d0f367155e76ce849fa1166fc9730d13bd2d65a2aa13b6f5424489", size = 1404447, upload-time = "2026-03-09T13:14:23.205Z" }, + { url = "https://files.pythonhosted.org/packages/39/5c/2606a373247babce9b1d056c03a04b65f3cf5290a8eac5d7bdead0a17e21/kiwisolver-1.5.0-cp313-cp313t-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:940dda65d5e764406b9fb92761cbf462e4e63f712ab60ed98f70552e496f3bf1", size = 1455918, upload-time = "2026-03-09T13:14:24.74Z" }, + { url = "https://files.pythonhosted.org/packages/d5/d1/c6078b5756670658e9192a2ef11e939c92918833d2745f85cd14a6004bdf/kiwisolver-1.5.0-cp313-cp313t-manylinux_2_39_riscv64.whl", hash = "sha256:89fc958c702ee9a745e4700378f5d23fddbc46ff89e8fdbf5395c24d5c1452a3", size = 1072856, upload-time = "2026-03-09T13:14:26.597Z" }, + { url = "https://files.pythonhosted.org/packages/cb/c8/7def6ddf16eb2b3741d8b172bdaa9af882b03c78e9b0772975408801fa63/kiwisolver-1.5.0-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:9027d773c4ff81487181a925945743413f6069634d0b122d0b37684ccf4f1e18", size = 2333580, upload-time = "2026-03-09T13:14:28.237Z" }, + { url = "https://files.pythonhosted.org/packages/9e/87/2ac1fce0eb1e616fcd3c35caa23e665e9b1948bb984f4764790924594128/kiwisolver-1.5.0-cp313-cp313t-musllinux_1_2_ppc64le.whl", hash = "sha256:5b233ea3e165e43e35dba1d2b8ecc21cf070b45b65ae17dd2747d2713d942021", size = 2423018, upload-time = "2026-03-09T13:14:30.018Z" }, + { url = "https://files.pythonhosted.org/packages/67/13/c6700ccc6cc218716bfcda4935e4b2997039869b4ad8a94f364c5a3b8e63/kiwisolver-1.5.0-cp313-cp313t-musllinux_1_2_riscv64.whl", hash = "sha256:ce9bf03dad3b46408c08649c6fbd6ca28a9fce0eb32fdfffa6775a13103b5310", size = 2062804, upload-time = "2026-03-09T13:14:32.888Z" }, + { url = "https://files.pythonhosted.org/packages/1b/bd/877056304626943ff0f1f44c08f584300c199b887cb3176cd7e34f1515f1/kiwisolver-1.5.0-cp313-cp313t-musllinux_1_2_s390x.whl", hash = "sha256:fc4d3f1fb9ca0ae9f97b095963bc6326f1dbfd3779d6679a1e016b9baaa153d3", size = 2597482, upload-time = "2026-03-09T13:14:34.971Z" }, + { url = "https://files.pythonhosted.org/packages/75/19/c60626c47bf0f8ac5dcf72c6c98e266d714f2fbbfd50cf6dab5ede3aaa50/kiwisolver-1.5.0-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:f443b4825c50a51ee68585522ab4a1d1257fac65896f282b4c6763337ac9f5d2", size = 2394328, upload-time = "2026-03-09T13:14:36.816Z" }, + { url = "https://files.pythonhosted.org/packages/47/84/6a6d5e5bb8273756c27b7d810d47f7ef2f1f9b9fd23c9ee9a3f8c75c9cef/kiwisolver-1.5.0-cp313-cp313t-win_arm64.whl", hash = "sha256:893ff3a711d1b515ba9da14ee090519bad4610ed1962fbe298a434e8c5f8db53", size = 68410, upload-time = "2026-03-09T13:14:38.695Z" }, + { url = "https://files.pythonhosted.org/packages/e4/d7/060f45052f2a01ad5762c8fdecd6d7a752b43400dc29ff75cd47225a40fd/kiwisolver-1.5.0-cp314-cp314-macosx_10_15_universal2.whl", hash = "sha256:8df31fe574b8b3993cc61764f40941111b25c2d9fea13d3ce24a49907cd2d615", size = 123231, upload-time = "2026-03-09T13:14:41.323Z" }, + { url = "https://files.pythonhosted.org/packages/c2/a7/78da680eadd06ff35edef6ef68a1ad273bad3e2a0936c9a885103230aece/kiwisolver-1.5.0-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:1d49a49ac4cbfb7c1375301cd1ec90169dfeae55ff84710d782260ce77a75a02", size = 66489, upload-time = "2026-03-09T13:14:42.534Z" }, + { url = "https://files.pythonhosted.org/packages/49/b2/97980f3ad4fae37dd7fe31626e2bf75fbf8bdf5d303950ec1fab39a12da8/kiwisolver-1.5.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:0cbe94b69b819209a62cb27bdfa5dc2a8977d8de2f89dfd97ba4f53ed3af754e", size = 64063, upload-time = "2026-03-09T13:14:44.759Z" }, + { url = "https://files.pythonhosted.org/packages/e7/f9/b06c934a6aa8bc91f566bd2a214fd04c30506c2d9e2b6b171953216a65b6/kiwisolver-1.5.0-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:80aa065ffd378ff784822a6d7c3212f2d5f5e9c3589614b5c228b311fd3063ac", size = 1475913, upload-time = "2026-03-09T13:14:46.247Z" }, + { url = "https://files.pythonhosted.org/packages/6b/f0/f768ae564a710135630672981231320bc403cf9152b5596ec5289de0f106/kiwisolver-1.5.0-cp314-cp314-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:4e7f886f47ab881692f278ae901039a234e4025a68e6dfab514263a0b1c4ae05", size = 1282782, upload-time = "2026-03-09T13:14:48.458Z" }, + { url = "https://files.pythonhosted.org/packages/e2/9f/1de7aad00697325f05238a5f2eafbd487fb637cc27a558b5367a5f37fb7f/kiwisolver-1.5.0-cp314-cp314-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:5060731cc3ed12ca3a8b57acd4aeca5bbc2f49216dd0bec1650a1acd89486bcd", size = 1300815, upload-time = "2026-03-09T13:14:50.721Z" }, + { url = "https://files.pythonhosted.org/packages/5a/c2/297f25141d2e468e0ce7f7a7b92e0cf8918143a0cbd3422c1ad627e85a06/kiwisolver-1.5.0-cp314-cp314-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:7a4aa69609f40fce3cbc3f87b2061f042eee32f94b8f11db707b66a26461591a", size = 1347925, upload-time = "2026-03-09T13:14:52.304Z" }, + { url = "https://files.pythonhosted.org/packages/b9/d3/f4c73a02eb41520c47610207b21afa8cdd18fdbf64ffd94674ae21c4812d/kiwisolver-1.5.0-cp314-cp314-manylinux_2_39_riscv64.whl", hash = "sha256:d168fda2dbff7b9b5f38e693182d792a938c31db4dac3a80a4888de603c99554", size = 991322, upload-time = "2026-03-09T13:14:54.637Z" }, + { url = "https://files.pythonhosted.org/packages/7b/46/d3f2efef7732fcda98d22bf4ad5d3d71d545167a852ca710a494f4c15343/kiwisolver-1.5.0-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:413b820229730d358efd838ecbab79902fe97094565fdc80ddb6b0a18c18a581", size = 2232857, upload-time = "2026-03-09T13:14:56.471Z" }, + { url = "https://files.pythonhosted.org/packages/3f/ec/2d9756bf2b6d26ae4349b8d3662fb3993f16d80c1f971c179ce862b9dbae/kiwisolver-1.5.0-cp314-cp314-musllinux_1_2_ppc64le.whl", hash = "sha256:5124d1ea754509b09e53738ec185584cc609aae4a3b510aaf4ed6aa047ef9303", size = 2329376, upload-time = "2026-03-09T13:14:58.072Z" }, + { url = "https://files.pythonhosted.org/packages/8f/9f/876a0a0f2260f1bde92e002b3019a5fabc35e0939c7d945e0fa66185eb20/kiwisolver-1.5.0-cp314-cp314-musllinux_1_2_riscv64.whl", hash = "sha256:e4415a8db000bf49a6dd1c478bf70062eaacff0f462b92b0ba68791a905861f9", size = 1982549, upload-time = "2026-03-09T13:14:59.668Z" }, + { url = "https://files.pythonhosted.org/packages/6c/4f/ba3624dfac23a64d54ac4179832860cb537c1b0af06024936e82ca4154a0/kiwisolver-1.5.0-cp314-cp314-musllinux_1_2_s390x.whl", hash = "sha256:d618fd27420381a4f6044faa71f46d8bfd911bd077c555f7138ed88729bfbe79", size = 2494680, upload-time = "2026-03-09T13:15:01.364Z" }, + { url = "https://files.pythonhosted.org/packages/39/b7/97716b190ab98911b20d10bf92eca469121ec483b8ce0edd314f51bc85af/kiwisolver-1.5.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:5092eb5b1172947f57d6ea7d89b2f29650414e4293c47707eb499ec07a0ac796", size = 2297905, upload-time = "2026-03-09T13:15:03.925Z" }, + { url = "https://files.pythonhosted.org/packages/a3/36/4e551e8aa55c9188bca9abb5096805edbf7431072b76e2298e34fd3a3008/kiwisolver-1.5.0-cp314-cp314-win_amd64.whl", hash = "sha256:d76e2d8c75051d58177e762164d2e9ab92886534e3a12e795f103524f221dd8e", size = 75086, upload-time = "2026-03-09T13:15:07.775Z" }, + { url = "https://files.pythonhosted.org/packages/70/15/9b90f7df0e31a003c71649cf66ef61c3c1b862f48c81007fa2383c8bd8d7/kiwisolver-1.5.0-cp314-cp314-win_arm64.whl", hash = "sha256:fa6248cd194edff41d7ea9425ced8ca3a6f838bfb295f6f1d6e6bb694a8518df", size = 66577, upload-time = "2026-03-09T13:15:09.139Z" }, + { url = "https://files.pythonhosted.org/packages/17/01/7dc8c5443ff42b38e72731643ed7cf1ed9bf01691ae5cdca98501999ed83/kiwisolver-1.5.0-cp314-cp314t-macosx_10_15_universal2.whl", hash = "sha256:d1ffeb80b5676463d7a7d56acbe8e37a20ce725570e09549fe738e02ca6b7e1e", size = 125794, upload-time = "2026-03-09T13:15:10.525Z" }, + { url = "https://files.pythonhosted.org/packages/46/8a/b4ebe46ebaac6a303417fab10c2e165c557ddaff558f9699d302b256bc53/kiwisolver-1.5.0-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:bc4d8e252f532ab46a1de9349e2d27b91fce46736a9eedaa37beaca66f574ed4", size = 67646, upload-time = "2026-03-09T13:15:12.016Z" }, + { url = "https://files.pythonhosted.org/packages/60/35/10a844afc5f19d6f567359bf4789e26661755a2f36200d5d1ed8ad0126e5/kiwisolver-1.5.0-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:6783e069732715ad0c3ce96dbf21dbc2235ab0593f2baf6338101f70371f4028", size = 65511, upload-time = "2026-03-09T13:15:13.311Z" }, + { url = "https://files.pythonhosted.org/packages/f8/8a/685b297052dd041dcebce8e8787b58923b6e78acc6115a0dc9189011c44b/kiwisolver-1.5.0-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:e7c4c09a490dc4d4a7f8cbee56c606a320f9dc28cf92a7157a39d1ce7676a657", size = 1584858, upload-time = "2026-03-09T13:15:15.103Z" }, + { url = "https://files.pythonhosted.org/packages/9e/80/04865e3d4638ac5bddec28908916df4a3075b8c6cc101786a96803188b96/kiwisolver-1.5.0-cp314-cp314t-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:2a075bd7bd19c70cf67c8badfa36cf7c5d8de3c9ddb8420c51e10d9c50e94920", size = 1392539, upload-time = "2026-03-09T13:15:16.661Z" }, + { url = "https://files.pythonhosted.org/packages/ba/01/77a19cacc0893fa13fafa46d1bba06fb4dc2360b3292baf4b56d8e067b24/kiwisolver-1.5.0-cp314-cp314t-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:bdd3e53429ff02aa319ba59dfe4ceeec345bf46cf180ec2cf6fd5b942e7975e9", size = 1405310, upload-time = "2026-03-09T13:15:18.229Z" }, + { url = "https://files.pythonhosted.org/packages/53/39/bcaf5d0cca50e604cfa9b4e3ae1d64b50ca1ae5b754122396084599ef903/kiwisolver-1.5.0-cp314-cp314t-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:3cdcb35dc9d807259c981a85531048ede628eabcffb3239adf3d17463518992d", size = 1456244, upload-time = "2026-03-09T13:15:20.444Z" }, + { url = "https://files.pythonhosted.org/packages/d0/7a/72c187abc6975f6978c3e39b7cf67aeb8b3c0a8f9790aa7fd412855e9e1f/kiwisolver-1.5.0-cp314-cp314t-manylinux_2_39_riscv64.whl", hash = "sha256:70d593af6a6ca332d1df73d519fddb5148edb15cd90d5f0155e3746a6d4fcc65", size = 1073154, upload-time = "2026-03-09T13:15:22.039Z" }, + { url = "https://files.pythonhosted.org/packages/c7/ca/cf5b25783ebbd59143b4371ed0c8428a278abe68d6d0104b01865b1bbd0f/kiwisolver-1.5.0-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:377815a8616074cabbf3f53354e1d040c35815a134e01d7614b7692e4bf8acfa", size = 2334377, upload-time = "2026-03-09T13:15:23.741Z" }, + { url = "https://files.pythonhosted.org/packages/4a/e5/b1f492adc516796e88751282276745340e2a72dcd0d36cf7173e0daf3210/kiwisolver-1.5.0-cp314-cp314t-musllinux_1_2_ppc64le.whl", hash = "sha256:0255a027391d52944eae1dbb5d4cc5903f57092f3674e8e544cdd2622826b3f0", size = 2425288, upload-time = "2026-03-09T13:15:25.789Z" }, + { url = "https://files.pythonhosted.org/packages/e6/e5/9b21fbe91a61b8f409d74a26498706e97a48008bfcd1864373d32a6ba31c/kiwisolver-1.5.0-cp314-cp314t-musllinux_1_2_riscv64.whl", hash = "sha256:012b1eb16e28718fa782b5e61dc6f2da1f0792ca73bd05d54de6cb9561665fc9", size = 2063158, upload-time = "2026-03-09T13:15:27.63Z" }, + { url = "https://files.pythonhosted.org/packages/b1/02/83f47986138310f95ea95531f851b2a62227c11cbc3e690ae1374fe49f0f/kiwisolver-1.5.0-cp314-cp314t-musllinux_1_2_s390x.whl", hash = "sha256:0e3aafb33aed7479377e5e9a82e9d4bf87063741fc99fc7ae48b0f16e32bdd6f", size = 2597260, upload-time = "2026-03-09T13:15:29.421Z" }, + { url = "https://files.pythonhosted.org/packages/07/18/43a5f24608d8c313dd189cf838c8e68d75b115567c6279de7796197cfb6a/kiwisolver-1.5.0-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:e7a116ae737f0000343218c4edf5bd45893bfeaff0993c0b215d7124c9f77646", size = 2394403, upload-time = "2026-03-09T13:15:31.517Z" }, + { url = "https://files.pythonhosted.org/packages/3b/b5/98222136d839b8afabcaa943b09bd05888c2d36355b7e448550211d1fca4/kiwisolver-1.5.0-cp314-cp314t-win_amd64.whl", hash = "sha256:1dd9b0b119a350976a6d781e7278ec7aca0b201e1a9e2d23d9804afecb6ca681", size = 79687, upload-time = "2026-03-09T13:15:33.204Z" }, + { url = "https://files.pythonhosted.org/packages/99/a2/ca7dc962848040befed12732dff6acae7fb3c4f6fc4272b3f6c9a30b8713/kiwisolver-1.5.0-cp314-cp314t-win_arm64.whl", hash = "sha256:58f812017cd2985c21fbffb4864d59174d4903dd66fa23815e74bbc7a0e2dd57", size = 70032, upload-time = "2026-03-09T13:15:34.411Z" }, + { url = "https://files.pythonhosted.org/packages/1c/fa/2910df836372d8761bb6eff7d8bdcb1613b5c2e03f260efe7abe34d388a7/kiwisolver-1.5.0-graalpy312-graalpy250_312_native-macosx_10_13_x86_64.whl", hash = "sha256:5ae8e62c147495b01a0f4765c878e9bfdf843412446a247e28df59936e99e797", size = 130262, upload-time = "2026-03-09T13:15:35.629Z" }, + { url = "https://files.pythonhosted.org/packages/0f/41/c5f71f9f00aabcc71fee8b7475e3f64747282580c2fe748961ba29b18385/kiwisolver-1.5.0-graalpy312-graalpy250_312_native-macosx_11_0_arm64.whl", hash = "sha256:f6764a4ccab3078db14a632420930f6186058750df066b8ea2a7106df91d3203", size = 138036, upload-time = "2026-03-09T13:15:36.894Z" }, + { url = "https://files.pythonhosted.org/packages/fa/06/7399a607f434119c6e1fdc8ec89a8d51ccccadf3341dee4ead6bd14caaf5/kiwisolver-1.5.0-graalpy312-graalpy250_312_native-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:c31c13da98624f957b0fb1b5bae5383b2333c2c3f6793d9825dd5ce79b525cb7", size = 194295, upload-time = "2026-03-09T13:15:38.22Z" }, + { url = "https://files.pythonhosted.org/packages/b5/91/53255615acd2a1eaca307ede3c90eb550bae9c94581f8c00081b6b1c8f44/kiwisolver-1.5.0-graalpy312-graalpy250_312_native-win_amd64.whl", hash = "sha256:1f1489f769582498610e015a8ef2d36f28f505ab3096d0e16b4858a9ec214f57", size = 75987, upload-time = "2026-03-09T13:15:39.65Z" }, + { url = "https://files.pythonhosted.org/packages/e9/eb/5fcbbbf9a0e2c3a35effb88831a483345326bbc3a030a3b5b69aee647f84/kiwisolver-1.5.0-pp311-pypy311_pp73-macosx_10_15_x86_64.whl", hash = "sha256:ec4c85dc4b687c7f7f15f553ff26a98bfe8c58f5f7f0ac8905f0ba4c7be60232", size = 59532, upload-time = "2026-03-09T13:15:47.047Z" }, + { url = "https://files.pythonhosted.org/packages/c3/9b/e17104555bb4db148fd52327feea1e96be4b88e8e008b029002c281a21ab/kiwisolver-1.5.0-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:12e91c215a96e39f57989c8912ae761286ac5a9584d04030ceb3368a357f017a", size = 57420, upload-time = "2026-03-09T13:15:48.199Z" }, + { url = "https://files.pythonhosted.org/packages/48/44/2b5b95b7aa39fb2d8d9d956e0f3d5d45aef2ae1d942d4c3ffac2f9cfed1a/kiwisolver-1.5.0-pp311-pypy311_pp73-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:be4a51a55833dc29ab5d7503e7bcb3b3af3402d266018137127450005cdfe737", size = 79892, upload-time = "2026-03-09T13:15:49.694Z" }, + { url = "https://files.pythonhosted.org/packages/52/7d/7157f9bba6b455cfb4632ed411e199fc8b8977642c2b12082e1bd9e6d173/kiwisolver-1.5.0-pp311-pypy311_pp73-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:daae526907e262de627d8f70058a0f64acc9e2641c164c99c8f594b34a799a16", size = 77603, upload-time = "2026-03-09T13:15:50.945Z" }, + { url = "https://files.pythonhosted.org/packages/0a/dd/8050c947d435c8d4bc94e3252f4d8bb8a76cfb424f043a8680be637a57f1/kiwisolver-1.5.0-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:59cd8683f575d96df5bb48f6add94afc055012c29e28124fcae2b63661b9efb1", size = 73558, upload-time = "2026-03-09T13:15:52.112Z" }, +] + +[[package]] +name = "lark" +version = "1.3.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/da/34/28fff3ab31ccff1fd4f6c7c7b0ceb2b6968d8ea4950663eadcb5720591a0/lark-1.3.1.tar.gz", hash = "sha256:b426a7a6d6d53189d318f2b6236ab5d6429eaf09259f1ca33eb716eed10d2905", size = 382732, upload-time = "2025-10-27T18:25:56.653Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/82/3d/14ce75ef66813643812f3093ab17e46d3a206942ce7376d31ec2d36229e7/lark-1.3.1-py3-none-any.whl", hash = "sha256:c629b661023a014c37da873b4ff58a817398d12635d3bbb2c5a03be7fe5d1e12", size = 113151, upload-time = "2025-10-27T18:25:54.882Z" }, +] + +[[package]] +name = "lxml" +version = "6.1.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/05/3b/aab6728cae887456f409b4d75e8a01856e4f04bd510de38052a47768b680/lxml-6.1.1.tar.gz", hash = "sha256:ba96ae44888e0185281e937633a743ea90d5a196c6000f82565ebb0580012d40", size = 4197430, upload-time = "2026-05-18T19:19:06.424Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/62/b0/83f481780d1548750b8ce2ec824073deef2f452d9cd1a6faff8507e3d16d/lxml-6.1.1-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:53b7d2b7a10b1c35c0a5e21e9224accf60c1bbfba523990732e521b2b73adef2", size = 8526461, upload-time = "2026-05-18T19:17:25.862Z" }, + { url = "https://files.pythonhosted.org/packages/b9/d5/30fa0f808002c7329397bfbb24e306789c0b29f04aa5842c07b174b4216f/lxml-6.1.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:ff3f333630ab480244a1bff72043e511a91eb22e7595dead8653ee5612dd8f3d", size = 4595375, upload-time = "2026-05-18T19:17:34.555Z" }, + { url = "https://files.pythonhosted.org/packages/4f/d2/edb71cf0e561581a7c5eb2626244320eb04e9f8ce6d563184fd668b45073/lxml-6.1.1-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:a4bbea04c97f6d78a48e3fbc1cb9116d2780b1b39e03a23f6eb9b603fd61f510", size = 4923654, upload-time = "2026-05-18T19:17:42.917Z" }, + { url = "https://files.pythonhosted.org/packages/4c/77/1bc7eeb0de4577d783fb625aa092cc9357883bba35845a3666bf1259f3dc/lxml-6.1.1-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:db1d75f6617a49c1c01bc7023713e0ff59ab32c9579ae62a7674c0e34f3b0b0a", size = 5067921, upload-time = "2026-05-18T19:17:49.175Z" }, + { url = "https://files.pythonhosted.org/packages/1b/3c/c0690d74bd2bc17bc03b5b0d093569ead597dd0bfa088bf99eef8c24e19c/lxml-6.1.1-cp311-cp311-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:3a12689be69a28ddaa0ab99a5a1137da2afd5f8f16df7b5680b66f616d3eda1d", size = 5002456, upload-time = "2026-05-18T19:17:59.715Z" }, + { url = "https://files.pythonhosted.org/packages/66/8d/d1b3271af0c0f1e27e8472a849e4d2c65bc7766884b9ad2da9e76e145c88/lxml-6.1.1-cp311-cp311-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:18b73c339ae29b90fd2d06e58ebd555a751bde9cd6bbd36cc0281b9a2c94e9d8", size = 5202776, upload-time = "2026-05-18T19:18:08.924Z" }, + { url = "https://files.pythonhosted.org/packages/7a/45/689824ffb237fd10125ad273f32b28ff04dc6203c2822c85ff65a93df65e/lxml-6.1.1-cp311-cp311-manylinux_2_28_i686.whl", hash = "sha256:752d3bbfe874715ccd0aec7f88d7fc623c0f1fd7aa7b3238a084e017bad2a009", size = 5329945, upload-time = "2026-05-18T19:18:13.673Z" }, + { url = "https://files.pythonhosted.org/packages/5d/c0/ef73af53767e958fd87d437c170f272e2f6e6c0f854939f133a895f1e711/lxml-6.1.1-cp311-cp311-manylinux_2_31_armv7l.whl", hash = "sha256:6b1761fbf9ec984e2e9d9c589ef5f5fd684b7c19f92aadd567a26c5224958db6", size = 4659237, upload-time = "2026-05-18T19:18:18.657Z" }, + { url = "https://files.pythonhosted.org/packages/a0/5e/e1158e40397585e91cb0472374a1f63d0926a1ddeaa92f13d1a1ffe306d5/lxml-6.1.1-cp311-cp311-manylinux_2_38_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:d680fbcb768404c601ecb43519ecd8461f6954cb11c06a78962f666832ccfca8", size = 5265904, upload-time = "2026-05-18T19:18:24.883Z" }, + { url = "https://files.pythonhosted.org/packages/a0/16/8687e5d1400ed1c0bc41dace232ebb7553952b618ea1f2e5fb6e2cfbbe23/lxml-6.1.1-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:162af1091cd785f2f27e62d3547ae9bc58ec5c86dd314d67021fd02463708d83", size = 5045225, upload-time = "2026-05-18T19:17:20.073Z" }, + { url = "https://files.pythonhosted.org/packages/ca/18/d877bd1ae2e5ffdfd4836565aba350db31feb2f2656d6ce70316ed66a05e/lxml-6.1.1-cp311-cp311-musllinux_1_2_armv7l.whl", hash = "sha256:e9308ff8241c532df3f3e570f9a5aeed6c853f888512ba4b75638d7c11c95ef6", size = 4712721, upload-time = "2026-05-18T19:17:40.512Z" }, + { url = "https://files.pythonhosted.org/packages/44/4d/1f44fd1d770b10dacbf6b5c6e520f4d6e0708744930f719dc04e67cab981/lxml-6.1.1-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:5f6994074ebae6ffb04447268e37dc16edc304f9859cf91acb86e0af6c1b395c", size = 5252549, upload-time = "2026-05-18T19:17:51.236Z" }, + { url = "https://files.pythonhosted.org/packages/64/5d/1d66b84f850089254c230ef6ea6b267a5a54e2e179a5d960036a05d501d7/lxml-6.1.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:80c2dfadb855da477cf73373ad29a333535dedb9b12bad02c9814c8e2b43bf08", size = 5226877, upload-time = "2026-05-18T19:18:00.875Z" }, + { url = "https://files.pythonhosted.org/packages/ad/00/84c4b5302d42a2d0184f38d538c8a197f33b52a50bd4f7bcfe990bce3036/lxml-6.1.1-cp311-cp311-win32.whl", hash = "sha256:30a89d3ac8faec007453fb541f3f46807eeec88edd5826f6e3fe001752a2c621", size = 3594072, upload-time = "2026-05-18T19:17:12.714Z" }, + { url = "https://files.pythonhosted.org/packages/61/9d/2e2f7d876349f45e0f3e29f72da311668853d59b58d473a2dea4f0160135/lxml-6.1.1-cp311-cp311-win_amd64.whl", hash = "sha256:abbefa31eee84842140f67acef1c828e28bba8bbf0c3bc6e5492a9af88152c28", size = 4025469, upload-time = "2026-05-18T19:17:50.566Z" }, + { url = "https://files.pythonhosted.org/packages/b0/d5/570e6390e4110331e6208b2ba83d1482cc9146808ee118b22824a34c1070/lxml-6.1.1-cp311-cp311-win_arm64.whl", hash = "sha256:dcb292aa7fe485ceff7af4f92e46c5af397daec5dff64871a528f0fc47a3cc5b", size = 3667640, upload-time = "2026-05-19T19:22:48.293Z" }, + { url = "https://files.pythonhosted.org/packages/6a/6e/c4add832b6fc1e887125b96f880d7b9b70aae5248718e046b1704bcac4b9/lxml-6.1.1-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:104c09bda8d2a562824c0e319d0768ce26a779b7601e0931d33b09b53c392ef7", size = 8570821, upload-time = "2026-05-18T19:17:42.068Z" }, + { url = "https://files.pythonhosted.org/packages/22/00/ff3009c88e65de8011630acf8ab5a09cb2becd2aaf47fba2f3449f6224e9/lxml-6.1.1-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:25c6997a9a534e016695a0ba06b2f07945de682731ff01065b6d5a4474179da1", size = 4624252, upload-time = "2026-05-18T19:17:47.897Z" }, + { url = "https://files.pythonhosted.org/packages/42/95/bb63f0fd62e554fe078e1fb3c8fe9083c14ddc7ad7fa178d10e57e071ac7/lxml-6.1.1-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:c921ba5c51e4e9f63b8b00267d06566e1f63407408a0496da2d1d0bfc819c7fc", size = 4930746, upload-time = "2026-05-18T19:18:29.637Z" }, + { url = "https://files.pythonhosted.org/packages/eb/99/0013e8d9b5960f4f041cf0b73e2f80c23eb5205b1f7bfb20203243651359/lxml-6.1.1-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:54a7f95e4de5fb94e2f9f4b9055c6ba33bf3d628fd77a1d647c5923caa2cdcdc", size = 5093723, upload-time = "2026-05-18T19:18:34.168Z" }, + { url = "https://files.pythonhosted.org/packages/29/91/317b332636bfc7bddcff828d41b3307f50043f4b237e40849c333d80fa1a/lxml-6.1.1-cp312-cp312-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:96f2ec43df44b1f76249ee0a615334f9b5b060e1c8bd90e706dad2d14d02f383", size = 5005557, upload-time = "2026-05-18T19:18:39.798Z" }, + { url = "https://files.pythonhosted.org/packages/42/2f/cc9bf06afe70f9c9093ae60855d9759da9db601ec4080f7473319666ffd7/lxml-6.1.1-cp312-cp312-manylinux_2_26_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:70ef8a7e102a1508f8121aae5b0867abd663f72c14f0a9c937e6554cb4587b7b", size = 5631036, upload-time = "2026-05-18T19:18:44.858Z" }, + { url = "https://files.pythonhosted.org/packages/08/f6/af32e23e563971ffb0fb86be52bc5be5c2c118858ffc119bf6a9039b173d/lxml-6.1.1-cp312-cp312-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:ebe6af670449830d6d9b752c256a983291c766a1365ba5d5460048f9e33a7818", size = 5240367, upload-time = "2026-05-18T19:18:49.217Z" }, + { url = "https://files.pythonhosted.org/packages/78/83/8555d40948b09ce86f1bd0c68a7ac31d07b1929f92cc1b074006c97ef2d2/lxml-6.1.1-cp312-cp312-manylinux_2_28_i686.whl", hash = "sha256:27acc820660aaffa4f7c087f29120e12980f7779d56d8492d263170111284740", size = 5350171, upload-time = "2026-05-18T19:18:52.779Z" }, + { url = "https://files.pythonhosted.org/packages/63/75/5d92da93729b7bad783689e6496049fa40927b45bec7bf183c981de3ca70/lxml-6.1.1-cp312-cp312-manylinux_2_31_armv7l.whl", hash = "sha256:1db753c9115ec7100d073b744d17e25e88a8f90f5c39b2f5dd878149af59671f", size = 4694874, upload-time = "2026-05-18T19:18:55.139Z" }, + { url = "https://files.pythonhosted.org/packages/c5/b5/3aad415a9a25b822e783f15deeb4dffccf5113030f1afa2222dd929313d9/lxml-6.1.1-cp312-cp312-manylinux_2_38_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:c4f469aebd783bb741c2ecb2a681008fd26bfe5c16a9a72ed5467f834e810df2", size = 5244492, upload-time = "2026-05-18T19:19:01.28Z" }, + { url = "https://files.pythonhosted.org/packages/f1/a1/5fcf7eb9904b80086aa47dcf0027de07b1bb990afad2e6823144c368ae04/lxml-6.1.1-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:766b010012d59470072c1816b5b6c69f1d243e5db36ea5968e94accf430a4635", size = 5048232, upload-time = "2026-05-18T19:18:12.67Z" }, + { url = "https://files.pythonhosted.org/packages/77/74/1f601b63c7a69fcdf10fa9b148c81da8442204194f6c55509cc485c786b9/lxml-6.1.1-cp312-cp312-musllinux_1_2_armv7l.whl", hash = "sha256:b8d812c6011c08b8111a15e54dd990b8923692d80adf35488bee34026c35accf", size = 4777023, upload-time = "2026-05-18T19:18:15.928Z" }, + { url = "https://files.pythonhosted.org/packages/a2/b9/7a78f51aec95b1bf780d78e12705a9f6533284f8693dc5c0e6724fa53d3f/lxml-6.1.1-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:fe0306bd29505a9177aac19f1877174b0e7422c222a59f70b2cd41633448c3dc", size = 5645773, upload-time = "2026-05-18T19:18:23.223Z" }, + { url = "https://files.pythonhosted.org/packages/a5/6e/98a7b7ad54e4e74fa1f20fff776913980619d0ebe5558232d7da6580bdd8/lxml-6.1.1-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:5ba186ad207446c65d3bb3d3e0412b032b1d9f595e59861e2354798c5703d955", size = 5233088, upload-time = "2026-05-18T19:18:31.433Z" }, + { url = "https://files.pythonhosted.org/packages/65/d1/bc0ed2427bf609f2ee10da303a6a226f9c8bce94f945dc29a32ce55de6e4/lxml-6.1.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:aa366a1e55b8ebfe8ca8ddc3cfe75c8ebade181aeb0f661d0cb05986b647f72a", size = 5260995, upload-time = "2026-05-18T19:18:37.091Z" }, + { url = "https://files.pythonhosted.org/packages/69/8b/6772e1a4b513fc50a8d931f19edde0e13ae6918510a1e13ff67864f3e5ed/lxml-6.1.1-cp312-cp312-win32.whl", hash = "sha256:126c93f7f56f0eda92f6d8c619edc463a4f23d9252f1c9d0405a76f25fa9f11a", size = 3596382, upload-time = "2026-05-18T19:17:18.37Z" }, + { url = "https://files.pythonhosted.org/packages/1b/89/45198e9624762af2dfd2cb8782598477ceb29f6e59caab560388ae1f4ec1/lxml-6.1.1-cp312-cp312-win_amd64.whl", hash = "sha256:26e6eda8d38c1fcab1090dd196ee87cbd13788e531937610e2589085de074e77", size = 3997255, upload-time = "2026-05-18T19:17:56.781Z" }, + { url = "https://files.pythonhosted.org/packages/90/a9/7a54b6834088d9ae528a7b780584ba6a39a9457b0ac330479f20ffbc9449/lxml-6.1.1-cp312-cp312-win_arm64.whl", hash = "sha256:6540377fbd53fe1b629172288c464fb18db11ce1fa7dc15891da10aa9dcc3e7f", size = 3659610, upload-time = "2026-05-19T19:22:50.843Z" }, + { url = "https://files.pythonhosted.org/packages/a5/eb/7e6f37c5584ccbb2ff267f56fd0339016938c1c8684cfefab9b33ffc2f36/lxml-6.1.1-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:68a9198d0fc122d14bb76837de9aa80cf84caed990b5b237f532ed87d3706736", size = 8559780, upload-time = "2026-05-18T19:17:57.661Z" }, + { url = "https://files.pythonhosted.org/packages/a1/36/587c2521cf23a2cd6c9c22108aa7528f683a1f195ed7ccd23a4b1786ad36/lxml-6.1.1-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:7d47866cb32fb503450b6edc9df355d10dc49836af2e89901bd6ac6b0896d9d9", size = 4618006, upload-time = "2026-05-18T19:18:04.452Z" }, + { url = "https://files.pythonhosted.org/packages/6e/ca/ab7bfe2bf4c972af5e7878262845ead3a24a929a9b04bc11c7c1ece6c82a/lxml-6.1.1-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:eb7c9811bfaa8b1ed5ed319f5d370dfbcaa59d52ea64be2a5a85e18195930354", size = 4924139, upload-time = "2026-05-18T19:19:04.873Z" }, + { url = "https://files.pythonhosted.org/packages/6b/55/a0c72851dfee5ecc689f949723a73dea457758912542cb955b108eaf0d8f/lxml-6.1.1-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:762ff394d5bd56da0cf034a23dcce4e13923f15321a2adfa2ac00201dc6d3fca", size = 5082329, upload-time = "2026-05-18T19:19:09.728Z" }, + { url = "https://files.pythonhosted.org/packages/f0/b6/0608f7d61a3b96cc67e5648a3d906e31a5082093e10e7be65b3886289938/lxml-6.1.1-cp313-cp313-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:a088f287f7d8275a33c07f2cac6c50b9319309a0200a39e7e75d80c707723099", size = 4993564, upload-time = "2026-05-18T19:19:13.608Z" }, + { url = "https://files.pythonhosted.org/packages/4c/66/ae227524b066d29d55bf0b453d93d2d793c40218657d643dcbbca13b8faf/lxml-6.1.1-cp313-cp313-manylinux_2_26_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:e902da4b04e6b52e5893900d4b8ab46068f75f3561f01bf1080957f9fd932ed6", size = 5613467, upload-time = "2026-05-18T19:19:16.228Z" }, + { url = "https://files.pythonhosted.org/packages/a6/76/dbe4a00b50385e40194231dcfe5a12c059de7cf90e89c83407d2b085b719/lxml-6.1.1-cp313-cp313-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:1d4962d4c66bf830a7e59ed6cfc17d148149898a3aefa8ec6e59763e6e3ed085", size = 5228304, upload-time = "2026-05-18T19:19:19.354Z" }, + { url = "https://files.pythonhosted.org/packages/1c/01/00b1b8442ed2041793336868ba0b9ea4b13d7da7c085c6404c207a63bf79/lxml-6.1.1-cp313-cp313-manylinux_2_28_i686.whl", hash = "sha256:581d4c8ae690a6609e64862dd6b7c2489635c2d13907fc2b20f2bc200ff1d21e", size = 5341607, upload-time = "2026-05-18T19:19:22.297Z" }, + { url = "https://files.pythonhosted.org/packages/63/36/1ad29931e9a4638bb707869f01d423a6c815f82152138d1a40dfcfde2b95/lxml-6.1.1-cp313-cp313-manylinux_2_31_armv7l.whl", hash = "sha256:876e1ff5930ed8bf295ec5ef9a8155e9b6b1876bbf1deed8b3a8069311875a8f", size = 4700168, upload-time = "2026-05-18T19:19:25.133Z" }, + { url = "https://files.pythonhosted.org/packages/3c/d1/a9536cecf9be18a0dc72d32bead283a2332d1ffebd2dd3ac70ce444686e5/lxml-6.1.1-cp313-cp313-manylinux_2_38_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:9eb9b5a968f6e0f6d640092a567e14529ff8cea2e29d00da6f78a79fa49f013c", size = 5232487, upload-time = "2026-05-18T19:19:28.603Z" }, + { url = "https://files.pythonhosted.org/packages/0e/77/b4fb1e03bf5d130e879214d3100092e386418807fb74dd0adc4b0a48f351/lxml-6.1.1-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:aa49e06d94aba782c6a02eecb7e507969e7e7a41b267f1b359bb35585f295d5b", size = 5044231, upload-time = "2026-05-18T19:18:42.246Z" }, + { url = "https://files.pythonhosted.org/packages/26/4c/d00daeeb0a5530c4028a9232aa1b93db3ef4ed2158c116ea73c79a9765b3/lxml-6.1.1-cp313-cp313-musllinux_1_2_armv7l.whl", hash = "sha256:70cdfd80589d59e43e18005dd7244e8895e93db8ab6a620b7e23df5445a4e3d2", size = 4769450, upload-time = "2026-05-18T19:18:48.013Z" }, + { url = "https://files.pythonhosted.org/packages/ed/6a/715a3a8d156ce42f29cf014706f5410c2ff3b02267774110fc23266409fe/lxml-6.1.1-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:aad9aa39483ed8ec44d6d2e59e5b98a0d80676ef0d92f44bfc374836111f62f5", size = 5635874, upload-time = "2026-05-18T19:18:51.914Z" }, + { url = "https://files.pythonhosted.org/packages/45/37/0544bc21dde2a88f3a17b504e6fc79c0e01d25a33c2f6079724e9e72b9c7/lxml-6.1.1-cp313-cp313-musllinux_1_2_riscv64.whl", hash = "sha256:d49514be2f28d895c38cf9d2b72d7b9a07d00314519f456c0b50b53cfcf4c785", size = 5223987, upload-time = "2026-05-18T19:18:59.715Z" }, + { url = "https://files.pythonhosted.org/packages/4d/f8/f6a5e8185bcb28c2befae3d31f8e3df3b811cb0f47746517a81279fcafe1/lxml-6.1.1-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:47402e62c52ff5988c1e8c6c63177f5708bccf48e366dea4e3dcf1e645e04947", size = 5250276, upload-time = "2026-05-18T19:19:03.834Z" }, + { url = "https://files.pythonhosted.org/packages/c7/f2/1a2b9f1b7a49d45495369be7ef9ad05b262930f2eab3e3145706fca8083f/lxml-6.1.1-cp313-cp313-win32.whl", hash = "sha256:3483644525531e1d5762b0c44a8e18b6efba321b6dcf8a8952de10b037618bca", size = 3596903, upload-time = "2026-05-18T19:17:29.863Z" }, + { url = "https://files.pythonhosted.org/packages/e6/99/f4ffb024f238eec2131aaa09f3278fb6129cf892741bf68e1fc1afb8c100/lxml-6.1.1-cp313-cp313-win_amd64.whl", hash = "sha256:a10bd2fd62e8ce916ececb342f348f190724a098c1faa056fdfb2a22ad5e8660", size = 3995869, upload-time = "2026-05-18T19:18:02.596Z" }, + { url = "https://files.pythonhosted.org/packages/d1/53/70eb8c5c6037f27448f1e3c54ebede9545a801ae63f0a7254afca4fe8e45/lxml-6.1.1-cp313-cp313-win_arm64.whl", hash = "sha256:424aa57aca0897eb922aef34395bd1289b3b6f04e6bae20ea123c0c7e333cffc", size = 3658490, upload-time = "2026-05-19T19:22:53.846Z" }, + { url = "https://files.pythonhosted.org/packages/13/e2/2e325795566de01d0d7c3bb57d3c370616b2d07b01214e84eec5d3b10963/lxml-6.1.1-cp314-cp314-macosx_10_15_universal2.whl", hash = "sha256:19b7ab10b210b0b3ad7985d9ac4eb66ab09a90b20fe6e2f7ba55d01a234345d0", size = 8577146, upload-time = "2026-05-18T19:18:17.765Z" }, + { url = "https://files.pythonhosted.org/packages/93/cf/5630b5e4be7d2e6bee8efe83865c925221103cf0221303b104ce134b01e2/lxml-6.1.1-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:c08e5c694306507275f2290073350c4f32e383db15213b2c69e7ff39c1193840", size = 4623866, upload-time = "2026-05-18T19:18:30.669Z" }, + { url = "https://files.pythonhosted.org/packages/d2/51/3904907c063451cf8d4a5c9fe0cad95fa1f4ec57f4e3884fa0731bd7a305/lxml-6.1.1-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:74a9717fd0d82effef5c2854f0d917231d5324b5a3eb7275c43ac9fa32f97a14", size = 4950022, upload-time = "2026-05-18T19:19:31.958Z" }, + { url = "https://files.pythonhosted.org/packages/94/cd/9c7611a51c37a2830928405817cc5d56a97f64fab83cc3f628748b135749/lxml-6.1.1-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:efe0374196335f93b53269acd811b944f2e6bdc88e8894f214bd636455484909", size = 5086695, upload-time = "2026-05-18T19:19:34.764Z" }, + { url = "https://files.pythonhosted.org/packages/da/d6/24e3b5906abb0b674ff2ae195bc3ce59708df2bcd17cf17703b2d7dd643a/lxml-6.1.1-cp314-cp314-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:ac931cdc9442c1763b8a8f6cd62c0c938737eafc5be75eff88df55fc73bc0d00", size = 5031642, upload-time = "2026-05-18T19:19:37.771Z" }, + { url = "https://files.pythonhosted.org/packages/2d/db/6ec54f99019838bff54785c51da07f189eb4676861c5f2730962b0d8d665/lxml-6.1.1-cp314-cp314-manylinux_2_26_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:aee395f5d0927f947758b4ec119fd5fc8ec71f07a1c5c52077b30b04c0fa6955", size = 5647338, upload-time = "2026-05-18T19:19:40.553Z" }, + { url = "https://files.pythonhosted.org/packages/42/3d/ef4dcfffd22d27a61805d8ed9f7fb888495bc6aa88648fa07c1eaa5586b6/lxml-6.1.1-cp314-cp314-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:9395002973c827b3ed67db77e6ec09f092919a587022174554096a269378fb13", size = 5239528, upload-time = "2026-05-18T19:19:43.657Z" }, + { url = "https://files.pythonhosted.org/packages/62/bb/37fb3f0dff146bdcfa78eec47879273820b2a0bf350ec236ce14bd0b1c26/lxml-6.1.1-cp314-cp314-manylinux_2_28_i686.whl", hash = "sha256:73bc2086f141224ebddb7fc5c6a36ca58b31b94b561e1dfe8e073e3270fad1e7", size = 5350730, upload-time = "2026-05-18T19:19:46.307Z" }, + { url = "https://files.pythonhosted.org/packages/90/42/43253f168388df4fae1f38c01df36ddb9bee39e2048167b54cdcbae85ea3/lxml-6.1.1-cp314-cp314-manylinux_2_31_armv7l.whl", hash = "sha256:3779def59032b81e44a5f70096ef6bf2082f8d901937dca354474ba09782e245", size = 4697530, upload-time = "2026-05-18T19:19:49.889Z" }, + { url = "https://files.pythonhosted.org/packages/eb/a8/c5a8504f81bbdfc8e7094c2c850cdb4ed6777fc4d5ddd9e5ab819f3b0d54/lxml-6.1.1-cp314-cp314-manylinux_2_38_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:86c89b9d55ebf820ad7c90bc533410f0d098054f293351f10603c0c46ff598f5", size = 5250670, upload-time = "2026-05-18T19:19:53.199Z" }, + { url = "https://files.pythonhosted.org/packages/77/b7/c7e76ab18744d75e21f320ebf9ff9d1ceae2b54dd431ea5a64caf26c9672/lxml-6.1.1-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:19607c6bbff2a44cf3fe8250abccd20942d3462473e0a721d01d379ed017e462", size = 5084485, upload-time = "2026-05-18T19:19:08.422Z" }, + { url = "https://files.pythonhosted.org/packages/31/31/b35c53f8ef7b7c31cacd23d3638652fff7bcd1deb6eedb709ab43b685908/lxml-6.1.1-cp314-cp314-musllinux_1_2_armv7l.whl", hash = "sha256:c6ed5141a5c7507cf3ee76bd363b0d6f801e3321adc35b5d825a23115faa5465", size = 4737635, upload-time = "2026-05-18T19:19:12.321Z" }, + { url = "https://files.pythonhosted.org/packages/d9/06/31f23c813a7fe8e0cb1b175e915b08c9bf4e86d225b210feadbdbe519667/lxml-6.1.1-cp314-cp314-musllinux_1_2_ppc64le.whl", hash = "sha256:62aeb7e85b5d60320b9d77eef2e773994e2c0ce10121b277e0a19804e1654a5a", size = 5670681, upload-time = "2026-05-18T19:19:15.001Z" }, + { url = "https://files.pythonhosted.org/packages/1a/bc/ce619bccc89b1fd9ad8a8e1330ee3f3beff9f2ff95b712d7bbcdd6e22fc3/lxml-6.1.1-cp314-cp314-musllinux_1_2_riscv64.whl", hash = "sha256:b1b963fd8f5caa68e99dfae060d54de1fe9cba899b8718b44a00cdca53c3e590", size = 5238229, upload-time = "2026-05-18T19:19:18.131Z" }, + { url = "https://files.pythonhosted.org/packages/2f/5d/b329acbbedc0b619ebc2be6cf7ee9ed07e80892c88d4dfd612c33805789a/lxml-6.1.1-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:63876be28efefa04a1df615b46770e82042cce445cfdce55160522f57b231ccb", size = 5264191, upload-time = "2026-05-18T19:19:21.118Z" }, + { url = "https://files.pythonhosted.org/packages/d6/85/be36fb1425b30db3c3f9df75fe86343ebffb79e6320bd7f588e25bfeac39/lxml-6.1.1-cp314-cp314-win32.whl", hash = "sha256:7f7a92e8583f06b1fd49d01158143b8461cfcd135dcb10ec807270a3051bd603", size = 3657202, upload-time = "2026-05-18T19:17:39.509Z" }, + { url = "https://files.pythonhosted.org/packages/b8/ce/3cf9a827342269f54d405a6202397de63f07c69cbd6ce7d183a3f0cba1e9/lxml-6.1.1-cp314-cp314-win_amd64.whl", hash = "sha256:b2d444f2e66624d68e9c6b211e28a76e22fff5fcabcfff4deac18b529b7d4137", size = 4064497, upload-time = "2026-05-18T19:18:14.662Z" }, + { url = "https://files.pythonhosted.org/packages/d9/3e/1a957bde8f0760039e627f94699f82caa782c9d838d86c3d28245ee67212/lxml-6.1.1-cp314-cp314-win_arm64.whl", hash = "sha256:3fd9728a2735fda14f4e8235830c86b539e9661e849665bf926d3f867943b4bf", size = 3741991, upload-time = "2026-05-19T19:22:59.111Z" }, + { url = "https://files.pythonhosted.org/packages/78/b2/00ed55b3a2efa4658fb795c38d1090ec9b3e8a6c3683d4441fa517f09c3b/lxml-6.1.1-cp314-cp314t-macosx_10_15_universal2.whl", hash = "sha256:787b2496d0dbe8cd180984e8d29e3a6f76e7ea34db781cb3bd55e4ba1ef8b4ee", size = 8827545, upload-time = "2026-05-18T19:18:41.193Z" }, + { url = "https://files.pythonhosted.org/packages/c0/73/74573db19baa618d5f266f2407898b087ff6927115b00b71e5fc1b700847/lxml-6.1.1-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:2c8daa471358dc2d6fcf02165e80ec68f77871a286df95bc5cc3816153b0fd2c", size = 4735736, upload-time = "2026-05-18T19:18:46.761Z" }, + { url = "https://files.pythonhosted.org/packages/16/02/6f7061f4f95f51e545d48e87647c54791d204a4e881be4156e7a26ba5338/lxml-6.1.1-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:acd7d70b64c0aae0c7922cca83d288a16f5f6da523637697872253415269baef", size = 4970291, upload-time = "2026-05-18T19:19:56.215Z" }, + { url = "https://files.pythonhosted.org/packages/b0/02/55fc057d8283427dea7d6edb102e7a840239c77a64a983d92f62a304c0e9/lxml-6.1.1-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:4f0dd2f01f9f8a89f565d000e03abcf0a13d692a346c8d22f628d49af098777a", size = 5102822, upload-time = "2026-05-18T19:19:59.223Z" }, + { url = "https://files.pythonhosted.org/packages/e4/48/8e1cf78d89d66850121d9255a2a24414c98f775da93b90cf976956c24b14/lxml-6.1.1-cp314-cp314t-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:0b7e8a14c8634bf6f7a568634cb395305a6d964aeb5b7ee32248094bed3a7e2c", size = 5027923, upload-time = "2026-05-18T19:20:01.549Z" }, + { url = "https://files.pythonhosted.org/packages/ed/00/0632a0647612c8af24d26997b3b961397daa9d5b2581444805933629a4cb/lxml-6.1.1-cp314-cp314t-manylinux_2_26_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:86281fbdd6a8162756f8d603f37e3435bfa38043adb79c6dc6a2dfee065e7525", size = 5595843, upload-time = "2026-05-18T19:20:03.93Z" }, + { url = "https://files.pythonhosted.org/packages/bc/86/ab008a7dc360711b66858d61c80a5979a70a09f2aa2b05d9698df80b803d/lxml-6.1.1-cp314-cp314t-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:c5d7152ec39ca7c402d8fb9bad86140a15b9503bd0c54484e3f1bbe3dd37ceca", size = 5224515, upload-time = "2026-05-18T19:20:06.381Z" }, + { url = "https://files.pythonhosted.org/packages/75/c6/2702ff375e728e34f56d9a45339a9cf7e4427e917f542225242d63a05afa/lxml-6.1.1-cp314-cp314t-manylinux_2_28_i686.whl", hash = "sha256:88d8cb75b9d82858497a5393e3c63cfbf03035225e4b35a49ed7ccb151e4dc0e", size = 5312511, upload-time = "2026-05-18T19:20:09.308Z" }, + { url = "https://files.pythonhosted.org/packages/b7/57/a5807c98f87a86f10ef9ffab35516df7c0f0c4b6d5d33e9f608ab9c04a31/lxml-6.1.1-cp314-cp314t-manylinux_2_31_armv7l.whl", hash = "sha256:f64ec5397ea6a41fc1b4af0380d79b44a755b5531dcaccd9940fb260dca93038", size = 4639206, upload-time = "2026-05-18T19:20:11.704Z" }, + { url = "https://files.pythonhosted.org/packages/1f/e1/8a0a2c35734812395f4da4eaf33748a7e5705bfb2a58b128da764339d5ec/lxml-6.1.1-cp314-cp314t-manylinux_2_38_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:d34bbf07dbc7ca5970671b1512e928991fb5e9d95365636c9b2d8b4f53af405e", size = 5232404, upload-time = "2026-05-18T19:20:14.064Z" }, + { url = "https://files.pythonhosted.org/packages/c2/e2/0e6a4dd5ad84d01d99aa7bae7cfefd4a760a0e0f8176818241de17d9b6c0/lxml-6.1.1-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:17e0e18d4ad8adbd0399291bc44845b69d9dd68439a3cdebdf35ff902ec05072", size = 5083769, upload-time = "2026-05-18T19:19:23.758Z" }, + { url = "https://files.pythonhosted.org/packages/a0/7e/161f33d463f6ffc1c7679104b65086dea120080d49dde4d238f015aaee2f/lxml-6.1.1-cp314-cp314t-musllinux_1_2_armv7l.whl", hash = "sha256:3ab541146f1f6968c462d6c2ac495148e8cdba2f8347700b2141b6ec5a75bf52", size = 4758936, upload-time = "2026-05-18T19:19:27.256Z" }, + { url = "https://files.pythonhosted.org/packages/f1/fb/2369825e3f6ca99305bf9f7b7085fda91c8b0922a89e54d900974aa3ef85/lxml-6.1.1-cp314-cp314t-musllinux_1_2_ppc64le.whl", hash = "sha256:2a0217714657e023ef4293500f65aa20fce6164c8fd6b08fa5bd4a859fb14b9b", size = 5620296, upload-time = "2026-05-18T19:19:29.993Z" }, + { url = "https://files.pythonhosted.org/packages/30/90/d61e383146f74c5ab683947ea14dc7b82778838ab9b95ea73a23b60d0191/lxml-6.1.1-cp314-cp314t-musllinux_1_2_riscv64.whl", hash = "sha256:05a82eb6e1530a64f26225b55cbd178113bd0b5af1c2b625f25e5296742c26d2", size = 5228598, upload-time = "2026-05-18T19:19:33.523Z" }, + { url = "https://files.pythonhosted.org/packages/76/2d/2dafd8149e94b05bb070690efd5bb2680720681e03ff03fc57d2b70a1105/lxml-6.1.1-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:9e36f163528fc50cbef305f02a5fd66d404edf7049cdaff211dbc2cba5a7013e", size = 5247845, upload-time = "2026-05-18T19:19:36.649Z" }, + { url = "https://files.pythonhosted.org/packages/ce/68/b30e913340c380ddac9580c6e6230991fc37240ec4f64704833e4f3e2769/lxml-6.1.1-cp314-cp314t-win32.whl", hash = "sha256:649dda677cf3bd6ac9ae14007ba0c824ded8ce5808b53fc7431d9140399118c1", size = 3897345, upload-time = "2026-05-18T19:17:33.562Z" }, + { url = "https://files.pythonhosted.org/packages/3c/4e/9eb2af5335545f9fbcd7af57bcf87c6025d31eaa31b14ec184a6c8675328/lxml-6.1.1-cp314-cp314t-win_amd64.whl", hash = "sha256:793033d6c5cdf33a573f910d9bea14ef8f5771820411d118da8e1182edb53d5e", size = 4393350, upload-time = "2026-05-18T19:18:10.076Z" }, + { url = "https://files.pythonhosted.org/packages/7f/2c/0f1e93c636720e8a3eb59af2bfda99d98b55891e1c53bc30c2e0e865f01b/lxml-6.1.1-cp314-cp314t-win_arm64.whl", hash = "sha256:58bb955caba94e467d2a96da17660d2d704e0675894cba21ab8a775b8621fd1c", size = 3817223, upload-time = "2026-05-19T19:22:56.823Z" }, + { url = "https://files.pythonhosted.org/packages/b5/32/86a3f0f724a3a402d4627937a7fc27b160e45e7012b4adf47f6e1e844511/lxml-6.1.1-pp311-pypy311_pp73-macosx_10_15_x86_64.whl", hash = "sha256:31033dc34636ea6b7d5cc11b1ddbda78a14de858ba9d3e1ed4b69a3085bc521e", size = 3930127, upload-time = "2026-05-18T19:19:02.27Z" }, + { url = "https://files.pythonhosted.org/packages/40/44/d832e82af08723761556d004b1d04d281c09f9a8cecd7d3148548c9941a3/lxml-6.1.1-pp311-pypy311_pp73-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:3893c14c4b6ac5b2d54ba8cf03e99fe5104e592de491f19bd6b82756c09f8004", size = 4210769, upload-time = "2026-05-18T19:20:41.427Z" }, + { url = "https://files.pythonhosted.org/packages/6d/39/0dc5949f759ed7d951e0bb8c2f2d9d7aca1908d22352fa84a8afd2ea54af/lxml-6.1.1-pp311-pypy311_pp73-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:c07da4cebf6889f03ebac8d238f62318e29f495de0aa18a51ea14e61ae907e2e", size = 4318163, upload-time = "2026-05-18T19:20:44.702Z" }, + { url = "https://files.pythonhosted.org/packages/e6/fb/8ab3845fe046ba4cbf74536bcf6801a774b7caf4350de1c5d37f1f0a9e90/lxml-6.1.1-pp311-pypy311_pp73-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:f6f0ce10945fab9c4c06ce14e22af9059d1a87493a9af4501a5b0b9187e21cf2", size = 4250945, upload-time = "2026-05-18T19:20:47.385Z" }, + { url = "https://files.pythonhosted.org/packages/68/1b/7553ab136894374ffae8851ec06f98f511cd8e66246e41b6be059d0a7289/lxml-6.1.1-pp311-pypy311_pp73-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:f8844cd288697c6425c9beba919302241e3278871dc6519515e72b04e987abcf", size = 4401664, upload-time = "2026-05-18T19:20:50.489Z" }, + { url = "https://files.pythonhosted.org/packages/db/a4/441aee36c6f6b249823d20fd91f9be9ab89d7c5a8ae542a4a4ca6d342d56/lxml-6.1.1-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:ed21202aec73cda4d55d1ce57b389aadb90ffb044e6cd1080b8347efe1b1ec84", size = 3508989, upload-time = "2026-05-18T19:18:38.158Z" }, +] + +[[package]] +name = "markupsafe" +version = "3.0.3" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/7e/99/7690b6d4034fffd95959cbe0c02de8deb3098cc577c67bb6a24fe5d7caa7/markupsafe-3.0.3.tar.gz", hash = "sha256:722695808f4b6457b320fdc131280796bdceb04ab50fe1795cd540799ebe1698", size = 80313, upload-time = "2025-09-27T18:37:40.426Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/08/db/fefacb2136439fc8dd20e797950e749aa1f4997ed584c62cfb8ef7c2be0e/markupsafe-3.0.3-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:1cc7ea17a6824959616c525620e387f6dd30fec8cb44f649e31712db02123dad", size = 11631, upload-time = "2025-09-27T18:36:18.185Z" }, + { url = "https://files.pythonhosted.org/packages/e1/2e/5898933336b61975ce9dc04decbc0a7f2fee78c30353c5efba7f2d6ff27a/markupsafe-3.0.3-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:4bd4cd07944443f5a265608cc6aab442e4f74dff8088b0dfc8238647b8f6ae9a", size = 12058, upload-time = "2025-09-27T18:36:19.444Z" }, + { url = "https://files.pythonhosted.org/packages/1d/09/adf2df3699d87d1d8184038df46a9c80d78c0148492323f4693df54e17bb/markupsafe-3.0.3-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:6b5420a1d9450023228968e7e6a9ce57f65d148ab56d2313fcd589eee96a7a50", size = 24287, upload-time = "2025-09-27T18:36:20.768Z" }, + { url = "https://files.pythonhosted.org/packages/30/ac/0273f6fcb5f42e314c6d8cd99effae6a5354604d461b8d392b5ec9530a54/markupsafe-3.0.3-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:0bf2a864d67e76e5c9a34dc26ec616a66b9888e25e7b9460e1c76d3293bd9dbf", size = 22940, upload-time = "2025-09-27T18:36:22.249Z" }, + { url = "https://files.pythonhosted.org/packages/19/ae/31c1be199ef767124c042c6c3e904da327a2f7f0cd63a0337e1eca2967a8/markupsafe-3.0.3-cp311-cp311-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:bc51efed119bc9cfdf792cdeaa4d67e8f6fcccab66ed4bfdd6bde3e59bfcbb2f", size = 21887, upload-time = "2025-09-27T18:36:23.535Z" }, + { url = "https://files.pythonhosted.org/packages/b2/76/7edcab99d5349a4532a459e1fe64f0b0467a3365056ae550d3bcf3f79e1e/markupsafe-3.0.3-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:068f375c472b3e7acbe2d5318dea141359e6900156b5b2ba06a30b169086b91a", size = 23692, upload-time = "2025-09-27T18:36:24.823Z" }, + { url = "https://files.pythonhosted.org/packages/a4/28/6e74cdd26d7514849143d69f0bf2399f929c37dc2b31e6829fd2045b2765/markupsafe-3.0.3-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:7be7b61bb172e1ed687f1754f8e7484f1c8019780f6f6b0786e76bb01c2ae115", size = 21471, upload-time = "2025-09-27T18:36:25.95Z" }, + { url = "https://files.pythonhosted.org/packages/62/7e/a145f36a5c2945673e590850a6f8014318d5577ed7e5920a4b3448e0865d/markupsafe-3.0.3-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:f9e130248f4462aaa8e2552d547f36ddadbeaa573879158d721bbd33dfe4743a", size = 22923, upload-time = "2025-09-27T18:36:27.109Z" }, + { url = "https://files.pythonhosted.org/packages/0f/62/d9c46a7f5c9adbeeeda52f5b8d802e1094e9717705a645efc71b0913a0a8/markupsafe-3.0.3-cp311-cp311-win32.whl", hash = "sha256:0db14f5dafddbb6d9208827849fad01f1a2609380add406671a26386cdf15a19", size = 14572, upload-time = "2025-09-27T18:36:28.045Z" }, + { url = "https://files.pythonhosted.org/packages/83/8a/4414c03d3f891739326e1783338e48fb49781cc915b2e0ee052aa490d586/markupsafe-3.0.3-cp311-cp311-win_amd64.whl", hash = "sha256:de8a88e63464af587c950061a5e6a67d3632e36df62b986892331d4620a35c01", size = 15077, upload-time = "2025-09-27T18:36:29.025Z" }, + { url = "https://files.pythonhosted.org/packages/35/73/893072b42e6862f319b5207adc9ae06070f095b358655f077f69a35601f0/markupsafe-3.0.3-cp311-cp311-win_arm64.whl", hash = "sha256:3b562dd9e9ea93f13d53989d23a7e775fdfd1066c33494ff43f5418bc8c58a5c", size = 13876, upload-time = "2025-09-27T18:36:29.954Z" }, + { url = "https://files.pythonhosted.org/packages/5a/72/147da192e38635ada20e0a2e1a51cf8823d2119ce8883f7053879c2199b5/markupsafe-3.0.3-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:d53197da72cc091b024dd97249dfc7794d6a56530370992a5e1a08983ad9230e", size = 11615, upload-time = "2025-09-27T18:36:30.854Z" }, + { url = "https://files.pythonhosted.org/packages/9a/81/7e4e08678a1f98521201c3079f77db69fb552acd56067661f8c2f534a718/markupsafe-3.0.3-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:1872df69a4de6aead3491198eaf13810b565bdbeec3ae2dc8780f14458ec73ce", size = 12020, upload-time = "2025-09-27T18:36:31.971Z" }, + { url = "https://files.pythonhosted.org/packages/1e/2c/799f4742efc39633a1b54a92eec4082e4f815314869865d876824c257c1e/markupsafe-3.0.3-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:3a7e8ae81ae39e62a41ec302f972ba6ae23a5c5396c8e60113e9066ef893da0d", size = 24332, upload-time = "2025-09-27T18:36:32.813Z" }, + { url = "https://files.pythonhosted.org/packages/3c/2e/8d0c2ab90a8c1d9a24f0399058ab8519a3279d1bd4289511d74e909f060e/markupsafe-3.0.3-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:d6dd0be5b5b189d31db7cda48b91d7e0a9795f31430b7f271219ab30f1d3ac9d", size = 22947, upload-time = "2025-09-27T18:36:33.86Z" }, + { url = "https://files.pythonhosted.org/packages/2c/54/887f3092a85238093a0b2154bd629c89444f395618842e8b0c41783898ea/markupsafe-3.0.3-cp312-cp312-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:94c6f0bb423f739146aec64595853541634bde58b2135f27f61c1ffd1cd4d16a", size = 21962, upload-time = "2025-09-27T18:36:35.099Z" }, + { url = "https://files.pythonhosted.org/packages/c9/2f/336b8c7b6f4a4d95e91119dc8521402461b74a485558d8f238a68312f11c/markupsafe-3.0.3-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:be8813b57049a7dc738189df53d69395eba14fb99345e0a5994914a3864c8a4b", size = 23760, upload-time = "2025-09-27T18:36:36.001Z" }, + { url = "https://files.pythonhosted.org/packages/32/43/67935f2b7e4982ffb50a4d169b724d74b62a3964bc1a9a527f5ac4f1ee2b/markupsafe-3.0.3-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:83891d0e9fb81a825d9a6d61e3f07550ca70a076484292a70fde82c4b807286f", size = 21529, upload-time = "2025-09-27T18:36:36.906Z" }, + { url = "https://files.pythonhosted.org/packages/89/e0/4486f11e51bbba8b0c041098859e869e304d1c261e59244baa3d295d47b7/markupsafe-3.0.3-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:77f0643abe7495da77fb436f50f8dab76dbc6e5fd25d39589a0f1fe6548bfa2b", size = 23015, upload-time = "2025-09-27T18:36:37.868Z" }, + { url = "https://files.pythonhosted.org/packages/2f/e1/78ee7a023dac597a5825441ebd17170785a9dab23de95d2c7508ade94e0e/markupsafe-3.0.3-cp312-cp312-win32.whl", hash = "sha256:d88b440e37a16e651bda4c7c2b930eb586fd15ca7406cb39e211fcff3bf3017d", size = 14540, upload-time = "2025-09-27T18:36:38.761Z" }, + { url = "https://files.pythonhosted.org/packages/aa/5b/bec5aa9bbbb2c946ca2733ef9c4ca91c91b6a24580193e891b5f7dbe8e1e/markupsafe-3.0.3-cp312-cp312-win_amd64.whl", hash = "sha256:26a5784ded40c9e318cfc2bdb30fe164bdb8665ded9cd64d500a34fb42067b1c", size = 15105, upload-time = "2025-09-27T18:36:39.701Z" }, + { url = "https://files.pythonhosted.org/packages/e5/f1/216fc1bbfd74011693a4fd837e7026152e89c4bcf3e77b6692fba9923123/markupsafe-3.0.3-cp312-cp312-win_arm64.whl", hash = "sha256:35add3b638a5d900e807944a078b51922212fb3dedb01633a8defc4b01a3c85f", size = 13906, upload-time = "2025-09-27T18:36:40.689Z" }, + { url = "https://files.pythonhosted.org/packages/38/2f/907b9c7bbba283e68f20259574b13d005c121a0fa4c175f9bed27c4597ff/markupsafe-3.0.3-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:e1cf1972137e83c5d4c136c43ced9ac51d0e124706ee1c8aa8532c1287fa8795", size = 11622, upload-time = "2025-09-27T18:36:41.777Z" }, + { url = "https://files.pythonhosted.org/packages/9c/d9/5f7756922cdd676869eca1c4e3c0cd0df60ed30199ffd775e319089cb3ed/markupsafe-3.0.3-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:116bb52f642a37c115f517494ea5feb03889e04df47eeff5b130b1808ce7c219", size = 12029, upload-time = "2025-09-27T18:36:43.257Z" }, + { url = "https://files.pythonhosted.org/packages/00/07/575a68c754943058c78f30db02ee03a64b3c638586fba6a6dd56830b30a3/markupsafe-3.0.3-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:133a43e73a802c5562be9bbcd03d090aa5a1fe899db609c29e8c8d815c5f6de6", size = 24374, upload-time = "2025-09-27T18:36:44.508Z" }, + { url = "https://files.pythonhosted.org/packages/a9/21/9b05698b46f218fc0e118e1f8168395c65c8a2c750ae2bab54fc4bd4e0e8/markupsafe-3.0.3-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:ccfcd093f13f0f0b7fdd0f198b90053bf7b2f02a3927a30e63f3ccc9df56b676", size = 22980, upload-time = "2025-09-27T18:36:45.385Z" }, + { url = "https://files.pythonhosted.org/packages/7f/71/544260864f893f18b6827315b988c146b559391e6e7e8f7252839b1b846a/markupsafe-3.0.3-cp313-cp313-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:509fa21c6deb7a7a273d629cf5ec029bc209d1a51178615ddf718f5918992ab9", size = 21990, upload-time = "2025-09-27T18:36:46.916Z" }, + { url = "https://files.pythonhosted.org/packages/c2/28/b50fc2f74d1ad761af2f5dcce7492648b983d00a65b8c0e0cb457c82ebbe/markupsafe-3.0.3-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:a4afe79fb3de0b7097d81da19090f4df4f8d3a2b3adaa8764138aac2e44f3af1", size = 23784, upload-time = "2025-09-27T18:36:47.884Z" }, + { url = "https://files.pythonhosted.org/packages/ed/76/104b2aa106a208da8b17a2fb72e033a5a9d7073c68f7e508b94916ed47a9/markupsafe-3.0.3-cp313-cp313-musllinux_1_2_riscv64.whl", hash = "sha256:795e7751525cae078558e679d646ae45574b47ed6e7771863fcc079a6171a0fc", size = 21588, upload-time = "2025-09-27T18:36:48.82Z" }, + { url = "https://files.pythonhosted.org/packages/b5/99/16a5eb2d140087ebd97180d95249b00a03aa87e29cc224056274f2e45fd6/markupsafe-3.0.3-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:8485f406a96febb5140bfeca44a73e3ce5116b2501ac54fe953e488fb1d03b12", size = 23041, upload-time = "2025-09-27T18:36:49.797Z" }, + { url = "https://files.pythonhosted.org/packages/19/bc/e7140ed90c5d61d77cea142eed9f9c303f4c4806f60a1044c13e3f1471d0/markupsafe-3.0.3-cp313-cp313-win32.whl", hash = "sha256:bdd37121970bfd8be76c5fb069c7751683bdf373db1ed6c010162b2a130248ed", size = 14543, upload-time = "2025-09-27T18:36:51.584Z" }, + { url = "https://files.pythonhosted.org/packages/05/73/c4abe620b841b6b791f2edc248f556900667a5a1cf023a6646967ae98335/markupsafe-3.0.3-cp313-cp313-win_amd64.whl", hash = "sha256:9a1abfdc021a164803f4d485104931fb8f8c1efd55bc6b748d2f5774e78b62c5", size = 15113, upload-time = "2025-09-27T18:36:52.537Z" }, + { url = "https://files.pythonhosted.org/packages/f0/3a/fa34a0f7cfef23cf9500d68cb7c32dd64ffd58a12b09225fb03dd37d5b80/markupsafe-3.0.3-cp313-cp313-win_arm64.whl", hash = "sha256:7e68f88e5b8799aa49c85cd116c932a1ac15caaa3f5db09087854d218359e485", size = 13911, upload-time = "2025-09-27T18:36:53.513Z" }, + { url = "https://files.pythonhosted.org/packages/e4/d7/e05cd7efe43a88a17a37b3ae96e79a19e846f3f456fe79c57ca61356ef01/markupsafe-3.0.3-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:218551f6df4868a8d527e3062d0fb968682fe92054e89978594c28e642c43a73", size = 11658, upload-time = "2025-09-27T18:36:54.819Z" }, + { url = "https://files.pythonhosted.org/packages/99/9e/e412117548182ce2148bdeacdda3bb494260c0b0184360fe0d56389b523b/markupsafe-3.0.3-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:3524b778fe5cfb3452a09d31e7b5adefeea8c5be1d43c4f810ba09f2ceb29d37", size = 12066, upload-time = "2025-09-27T18:36:55.714Z" }, + { url = "https://files.pythonhosted.org/packages/bc/e6/fa0ffcda717ef64a5108eaa7b4f5ed28d56122c9a6d70ab8b72f9f715c80/markupsafe-3.0.3-cp313-cp313t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:4e885a3d1efa2eadc93c894a21770e4bc67899e3543680313b09f139e149ab19", size = 25639, upload-time = "2025-09-27T18:36:56.908Z" }, + { url = "https://files.pythonhosted.org/packages/96/ec/2102e881fe9d25fc16cb4b25d5f5cde50970967ffa5dddafdb771237062d/markupsafe-3.0.3-cp313-cp313t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:8709b08f4a89aa7586de0aadc8da56180242ee0ada3999749b183aa23df95025", size = 23569, upload-time = "2025-09-27T18:36:57.913Z" }, + { url = "https://files.pythonhosted.org/packages/4b/30/6f2fce1f1f205fc9323255b216ca8a235b15860c34b6798f810f05828e32/markupsafe-3.0.3-cp313-cp313t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:b8512a91625c9b3da6f127803b166b629725e68af71f8184ae7e7d54686a56d6", size = 23284, upload-time = "2025-09-27T18:36:58.833Z" }, + { url = "https://files.pythonhosted.org/packages/58/47/4a0ccea4ab9f5dcb6f79c0236d954acb382202721e704223a8aafa38b5c8/markupsafe-3.0.3-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:9b79b7a16f7fedff2495d684f2b59b0457c3b493778c9eed31111be64d58279f", size = 24801, upload-time = "2025-09-27T18:36:59.739Z" }, + { url = "https://files.pythonhosted.org/packages/6a/70/3780e9b72180b6fecb83a4814d84c3bf4b4ae4bf0b19c27196104149734c/markupsafe-3.0.3-cp313-cp313t-musllinux_1_2_riscv64.whl", hash = "sha256:12c63dfb4a98206f045aa9563db46507995f7ef6d83b2f68eda65c307c6829eb", size = 22769, upload-time = "2025-09-27T18:37:00.719Z" }, + { url = "https://files.pythonhosted.org/packages/98/c5/c03c7f4125180fc215220c035beac6b9cb684bc7a067c84fc69414d315f5/markupsafe-3.0.3-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:8f71bc33915be5186016f675cd83a1e08523649b0e33efdb898db577ef5bb009", size = 23642, upload-time = "2025-09-27T18:37:01.673Z" }, + { url = "https://files.pythonhosted.org/packages/80/d6/2d1b89f6ca4bff1036499b1e29a1d02d282259f3681540e16563f27ebc23/markupsafe-3.0.3-cp313-cp313t-win32.whl", hash = "sha256:69c0b73548bc525c8cb9a251cddf1931d1db4d2258e9599c28c07ef3580ef354", size = 14612, upload-time = "2025-09-27T18:37:02.639Z" }, + { url = "https://files.pythonhosted.org/packages/2b/98/e48a4bfba0a0ffcf9925fe2d69240bfaa19c6f7507b8cd09c70684a53c1e/markupsafe-3.0.3-cp313-cp313t-win_amd64.whl", hash = "sha256:1b4b79e8ebf6b55351f0d91fe80f893b4743f104bff22e90697db1590e47a218", size = 15200, upload-time = "2025-09-27T18:37:03.582Z" }, + { url = "https://files.pythonhosted.org/packages/0e/72/e3cc540f351f316e9ed0f092757459afbc595824ca724cbc5a5d4263713f/markupsafe-3.0.3-cp313-cp313t-win_arm64.whl", hash = "sha256:ad2cf8aa28b8c020ab2fc8287b0f823d0a7d8630784c31e9ee5edea20f406287", size = 13973, upload-time = "2025-09-27T18:37:04.929Z" }, + { url = "https://files.pythonhosted.org/packages/33/8a/8e42d4838cd89b7dde187011e97fe6c3af66d8c044997d2183fbd6d31352/markupsafe-3.0.3-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:eaa9599de571d72e2daf60164784109f19978b327a3910d3e9de8c97b5b70cfe", size = 11619, upload-time = "2025-09-27T18:37:06.342Z" }, + { url = "https://files.pythonhosted.org/packages/b5/64/7660f8a4a8e53c924d0fa05dc3a55c9cee10bbd82b11c5afb27d44b096ce/markupsafe-3.0.3-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:c47a551199eb8eb2121d4f0f15ae0f923d31350ab9280078d1e5f12b249e0026", size = 12029, upload-time = "2025-09-27T18:37:07.213Z" }, + { url = "https://files.pythonhosted.org/packages/da/ef/e648bfd021127bef5fa12e1720ffed0c6cbb8310c8d9bea7266337ff06de/markupsafe-3.0.3-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:f34c41761022dd093b4b6896d4810782ffbabe30f2d443ff5f083e0cbbb8c737", size = 24408, upload-time = "2025-09-27T18:37:09.572Z" }, + { url = "https://files.pythonhosted.org/packages/41/3c/a36c2450754618e62008bf7435ccb0f88053e07592e6028a34776213d877/markupsafe-3.0.3-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:457a69a9577064c05a97c41f4e65148652db078a3a509039e64d3467b9e7ef97", size = 23005, upload-time = "2025-09-27T18:37:10.58Z" }, + { url = "https://files.pythonhosted.org/packages/bc/20/b7fdf89a8456b099837cd1dc21974632a02a999ec9bf7ca3e490aacd98e7/markupsafe-3.0.3-cp314-cp314-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:e8afc3f2ccfa24215f8cb28dcf43f0113ac3c37c2f0f0806d8c70e4228c5cf4d", size = 22048, upload-time = "2025-09-27T18:37:11.547Z" }, + { url = "https://files.pythonhosted.org/packages/9a/a7/591f592afdc734f47db08a75793a55d7fbcc6902a723ae4cfbab61010cc5/markupsafe-3.0.3-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:ec15a59cf5af7be74194f7ab02d0f59a62bdcf1a537677ce67a2537c9b87fcda", size = 23821, upload-time = "2025-09-27T18:37:12.48Z" }, + { url = "https://files.pythonhosted.org/packages/7d/33/45b24e4f44195b26521bc6f1a82197118f74df348556594bd2262bda1038/markupsafe-3.0.3-cp314-cp314-musllinux_1_2_riscv64.whl", hash = "sha256:0eb9ff8191e8498cca014656ae6b8d61f39da5f95b488805da4bb029cccbfbaf", size = 21606, upload-time = "2025-09-27T18:37:13.485Z" }, + { url = "https://files.pythonhosted.org/packages/ff/0e/53dfaca23a69fbfbbf17a4b64072090e70717344c52eaaaa9c5ddff1e5f0/markupsafe-3.0.3-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:2713baf880df847f2bece4230d4d094280f4e67b1e813eec43b4c0e144a34ffe", size = 23043, upload-time = "2025-09-27T18:37:14.408Z" }, + { url = "https://files.pythonhosted.org/packages/46/11/f333a06fc16236d5238bfe74daccbca41459dcd8d1fa952e8fbd5dccfb70/markupsafe-3.0.3-cp314-cp314-win32.whl", hash = "sha256:729586769a26dbceff69f7a7dbbf59ab6572b99d94576a5592625d5b411576b9", size = 14747, upload-time = "2025-09-27T18:37:15.36Z" }, + { url = "https://files.pythonhosted.org/packages/28/52/182836104b33b444e400b14f797212f720cbc9ed6ba34c800639d154e821/markupsafe-3.0.3-cp314-cp314-win_amd64.whl", hash = "sha256:bdc919ead48f234740ad807933cdf545180bfbe9342c2bb451556db2ed958581", size = 15341, upload-time = "2025-09-27T18:37:16.496Z" }, + { url = "https://files.pythonhosted.org/packages/6f/18/acf23e91bd94fd7b3031558b1f013adfa21a8e407a3fdb32745538730382/markupsafe-3.0.3-cp314-cp314-win_arm64.whl", hash = "sha256:5a7d5dc5140555cf21a6fefbdbf8723f06fcd2f63ef108f2854de715e4422cb4", size = 14073, upload-time = "2025-09-27T18:37:17.476Z" }, + { url = "https://files.pythonhosted.org/packages/3c/f0/57689aa4076e1b43b15fdfa646b04653969d50cf30c32a102762be2485da/markupsafe-3.0.3-cp314-cp314t-macosx_10_13_x86_64.whl", hash = "sha256:1353ef0c1b138e1907ae78e2f6c63ff67501122006b0f9abad68fda5f4ffc6ab", size = 11661, upload-time = "2025-09-27T18:37:18.453Z" }, + { url = "https://files.pythonhosted.org/packages/89/c3/2e67a7ca217c6912985ec766c6393b636fb0c2344443ff9d91404dc4c79f/markupsafe-3.0.3-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:1085e7fbddd3be5f89cc898938f42c0b3c711fdcb37d75221de2666af647c175", size = 12069, upload-time = "2025-09-27T18:37:19.332Z" }, + { url = "https://files.pythonhosted.org/packages/f0/00/be561dce4e6ca66b15276e184ce4b8aec61fe83662cce2f7d72bd3249d28/markupsafe-3.0.3-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:1b52b4fb9df4eb9ae465f8d0c228a00624de2334f216f178a995ccdcf82c4634", size = 25670, upload-time = "2025-09-27T18:37:20.245Z" }, + { url = "https://files.pythonhosted.org/packages/50/09/c419f6f5a92e5fadde27efd190eca90f05e1261b10dbd8cbcb39cd8ea1dc/markupsafe-3.0.3-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:fed51ac40f757d41b7c48425901843666a6677e3e8eb0abcff09e4ba6e664f50", size = 23598, upload-time = "2025-09-27T18:37:21.177Z" }, + { url = "https://files.pythonhosted.org/packages/22/44/a0681611106e0b2921b3033fc19bc53323e0b50bc70cffdd19f7d679bb66/markupsafe-3.0.3-cp314-cp314t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:f190daf01f13c72eac4efd5c430a8de82489d9cff23c364c3ea822545032993e", size = 23261, upload-time = "2025-09-27T18:37:22.167Z" }, + { url = "https://files.pythonhosted.org/packages/5f/57/1b0b3f100259dc9fffe780cfb60d4be71375510e435efec3d116b6436d43/markupsafe-3.0.3-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:e56b7d45a839a697b5eb268c82a71bd8c7f6c94d6fd50c3d577fa39a9f1409f5", size = 24835, upload-time = "2025-09-27T18:37:23.296Z" }, + { url = "https://files.pythonhosted.org/packages/26/6a/4bf6d0c97c4920f1597cc14dd720705eca0bf7c787aebc6bb4d1bead5388/markupsafe-3.0.3-cp314-cp314t-musllinux_1_2_riscv64.whl", hash = "sha256:f3e98bb3798ead92273dc0e5fd0f31ade220f59a266ffd8a4f6065e0a3ce0523", size = 22733, upload-time = "2025-09-27T18:37:24.237Z" }, + { url = "https://files.pythonhosted.org/packages/14/c7/ca723101509b518797fedc2fdf79ba57f886b4aca8a7d31857ba3ee8281f/markupsafe-3.0.3-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:5678211cb9333a6468fb8d8be0305520aa073f50d17f089b5b4b477ea6e67fdc", size = 23672, upload-time = "2025-09-27T18:37:25.271Z" }, + { url = "https://files.pythonhosted.org/packages/fb/df/5bd7a48c256faecd1d36edc13133e51397e41b73bb77e1a69deab746ebac/markupsafe-3.0.3-cp314-cp314t-win32.whl", hash = "sha256:915c04ba3851909ce68ccc2b8e2cd691618c4dc4c4232fb7982bca3f41fd8c3d", size = 14819, upload-time = "2025-09-27T18:37:26.285Z" }, + { url = "https://files.pythonhosted.org/packages/1a/8a/0402ba61a2f16038b48b39bccca271134be00c5c9f0f623208399333c448/markupsafe-3.0.3-cp314-cp314t-win_amd64.whl", hash = "sha256:4faffd047e07c38848ce017e8725090413cd80cbc23d86e55c587bf979e579c9", size = 15426, upload-time = "2025-09-27T18:37:27.316Z" }, + { url = "https://files.pythonhosted.org/packages/70/bc/6f1c2f612465f5fa89b95bead1f44dcb607670fd42891d8fdcd5d039f4f4/markupsafe-3.0.3-cp314-cp314t-win_arm64.whl", hash = "sha256:32001d6a8fc98c8cb5c947787c5d08b0a50663d139f1305bac5885d98d9b40fa", size = 14146, upload-time = "2025-09-27T18:37:28.327Z" }, +] + +[[package]] +name = "marshmallow" +version = "3.26.2" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "packaging" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/55/79/de6c16cc902f4fc372236926b0ce2ab7845268dcc30fb2fbb7f71b418631/marshmallow-3.26.2.tar.gz", hash = "sha256:bbe2adb5a03e6e3571b573f42527c6fe926e17467833660bebd11593ab8dfd57", size = 222095, upload-time = "2025-12-22T06:53:53.309Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/be/2f/5108cb3ee4ba6501748c4908b908e55f42a5b66245b4cfe0c99326e1ef6e/marshmallow-3.26.2-py3-none-any.whl", hash = "sha256:013fa8a3c4c276c24d26d84ce934dc964e2aa794345a0f8c7e5a7191482c8a73", size = 50964, upload-time = "2025-12-22T06:53:51.801Z" }, +] + +[[package]] +name = "marshmallow-mongoengine" +version = "0.31.2" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "marshmallow" }, + { name = "mongoengine" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/63/72/5cabacd62c5b4f81a1e955e0c54bb86d1289621e384f522552806f9ee101/marshmallow-mongoengine-0.31.2.tar.gz", hash = "sha256:a708732456e1a36139c6ce52910b57cf2a54e7206c5c635a48dba9e3e157d6db", size = 11377, upload-time = "2023-03-14T05:42:51.825Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/c4/ef/ec8be29d7f6dec0bae9391e8fae352a3d5b2ddb9be84a7d611a5b0e5c1de/marshmallow_mongoengine-0.31.2-py2.py3-none-any.whl", hash = "sha256:51de7614ce9002f9f679aebb6df7488297e791fbd07d9f14b963e9c7bce604ca", size = 12237, upload-time = "2023-03-14T05:42:50.515Z" }, +] + +[[package]] +name = "matplotlib" +version = "3.10.9" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "contourpy" }, + { name = "cycler" }, + { name = "fonttools" }, + { name = "kiwisolver" }, + { name = "numpy" }, + { name = "packaging" }, + { name = "pillow" }, + { name = "pyparsing" }, + { name = "python-dateutil" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/63/1b/4be5be87d43d327a0cf4de1a56e86f7f84c89312452406cf122efe2839e6/matplotlib-3.10.9.tar.gz", hash = "sha256:fd66508e8c6877d98e586654b608a0456db8d7e8a546eb1e2600efd957302358", size = 34811233, upload-time = "2026-04-24T00:14:13.539Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/4c/8c/290f021104741fea63769c31494f5324c0cd249bf536a65a4350767b1f22/matplotlib-3.10.9-cp311-cp311-macosx_10_12_x86_64.whl", hash = "sha256:68cfdcede415f7c8f5577b03303dd94526cdb6d11036cecdc205e08733b2d2bb", size = 8306860, upload-time = "2026-04-24T00:12:01.207Z" }, + { url = "https://files.pythonhosted.org/packages/51/18/325cd32ece1120d1da51cc4e4294c6580190699490183fc2fe8cb6d61ec5/matplotlib-3.10.9-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:dfca0129678bd56379db26c52b5d77ed7de314c047492fbdc763aa7501710cfb", size = 8199254, upload-time = "2026-04-24T00:12:04.239Z" }, + { url = "https://files.pythonhosted.org/packages/79/db/e28c1b83e3680740aa78925f5fb2ae4d16207207419ad75ea9fe604f8676/matplotlib-3.10.9-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:8e436d155fa8a3399dc62683f8f5d0e2e50d25d0144a73edd73f82eec8f4abfb", size = 8777092, upload-time = "2026-04-24T00:12:06.793Z" }, + { url = "https://files.pythonhosted.org/packages/55/fa/3ce7adfe9ba101748f465211660d9c6374c876b671bdb8c2bb6d347e8b94/matplotlib-3.10.9-cp311-cp311-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:56fc0bd271b00025c6edfdc7c2dcd247372c8e1544971d62e1dc7c17367e8bf9", size = 9595691, upload-time = "2026-04-24T00:12:09.706Z" }, + { url = "https://files.pythonhosted.org/packages/36/c4/6960a76686ed668f2c60f84e9799ba4c0d56abdb36b1577b60c1d061d1ec/matplotlib-3.10.9-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:a5a6104ed666402ba5106d7f36e0e0cdca4e8d7fa4d39708ca88019e2835a2eb", size = 9659771, upload-time = "2026-04-24T00:12:12.766Z" }, + { url = "https://files.pythonhosted.org/packages/7e/0d/271aace3342157c64700c9ff4c59c7b392f3dbab393692e8db6fbe7ab96c/matplotlib-3.10.9-cp311-cp311-win_amd64.whl", hash = "sha256:d730e984eddf56974c3e72b6129c7ca462ac38dc624338f4b0b23eb23ecba00f", size = 8205112, upload-time = "2026-04-24T00:12:15.773Z" }, + { url = "https://files.pythonhosted.org/packages/e2/ee/cb57ad4754f3e7b9174ce6ce66d9205fb827067e48a9f58ac09d7e7d6b77/matplotlib-3.10.9-cp311-cp311-win_arm64.whl", hash = "sha256:51bf0ddbdc598e060d46c16b5590708f81a1624cefbaaf62f6a81bf9285b8c80", size = 8132310, upload-time = "2026-04-24T00:12:18.645Z" }, + { url = "https://files.pythonhosted.org/packages/35/c6/5581e26c72233ebb2a2a6fed2d24fb7c66b4700120b813f51b0555acf0b6/matplotlib-3.10.9-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:f0c3c28d9fbcc1fe7a03be236d73430cf6409c41fb2383a7ac52fe932b072cb1", size = 8319908, upload-time = "2026-04-24T00:12:21.323Z" }, + { url = "https://files.pythonhosted.org/packages/b7/18/4880dd762e40cd360c1bf06e890c5a97b997e91cb324602b1a19950ad5ce/matplotlib-3.10.9-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:41cb28c2bd769aa3e98322c6ab09854cbcc52ab69d2759d681bba3e327b2b320", size = 8216016, upload-time = "2026-04-24T00:12:23.4Z" }, + { url = "https://files.pythonhosted.org/packages/32/91/d024616abdba99e83120e07a20658976f6a343646710760c4a51df126029/matplotlib-3.10.9-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:ae20801130378b82d647ff5047c07316295b68dc054ca6b3c13519d0ea624285", size = 8789336, upload-time = "2026-04-24T00:12:26.096Z" }, + { url = "https://files.pythonhosted.org/packages/5c/04/030a2f61ef2158f5e4c259487a92ac877732499fb33d871585d89e03c42d/matplotlib-3.10.9-cp312-cp312-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:6c63ebcd8b4b169eb2f5c200552ae6b8be8999a005b6b507ed76fb8d7d674fe2", size = 9604602, upload-time = "2026-04-24T00:12:29.052Z" }, + { url = "https://files.pythonhosted.org/packages/fc/c2/541e4d09d87bb6b5830fc28b4c887a9a8cf4e1c6cee698a8c05552ae2003/matplotlib-3.10.9-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:d75d11c949914165976c621b2324f9ef162af7ebf4b057ddf95dd1dba7e5edcf", size = 9670966, upload-time = "2026-04-24T00:12:32.131Z" }, + { url = "https://files.pythonhosted.org/packages/04/a1/4571fc46e7702de8d0c2dc54ad1b2f8e29328dea3ee90831181f7353d93c/matplotlib-3.10.9-cp312-cp312-win_amd64.whl", hash = "sha256:d091f9d758b34aaaaa6331d13574bf01891d903b3dec59bfff458ef7551de5d6", size = 8217462, upload-time = "2026-04-24T00:12:35.226Z" }, + { url = "https://files.pythonhosted.org/packages/4b/d0/2269edb12aa30c13c8bcc9382892e39943ce1d28aab4ec296e0381798e81/matplotlib-3.10.9-cp312-cp312-win_arm64.whl", hash = "sha256:10cc5ce06d10231c36f40e875f3c7e8050362a4ee8f0ee5d29a6b3277d57bb42", size = 8136688, upload-time = "2026-04-24T00:12:37.442Z" }, + { url = "https://files.pythonhosted.org/packages/aa/d3/8d4f6afbecb49fc04e060a57c0fce39ea51cc163a6bd87303ccd698e4fa6/matplotlib-3.10.9-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:b580440f1ff81a0e34122051a3dfabb7e4b7f9e380629929bde0eff9af72165f", size = 8320331, upload-time = "2026-04-24T00:12:39.688Z" }, + { url = "https://files.pythonhosted.org/packages/63/d9/9e14bc7564bf92d5ffa801ae5fac819ce74b925dfb55e3ebde61a3bbad3e/matplotlib-3.10.9-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:b1b745c489cd1a77a0dc1120a05dc87af9798faebc913601feb8c73d89bf2d1e", size = 8216461, upload-time = "2026-04-24T00:12:42.494Z" }, + { url = "https://files.pythonhosted.org/packages/8a/17/4402d0d14ccf1dfc70932600b68097fbbf9c898a4871d2cbbe79c7801a32/matplotlib-3.10.9-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:8f3bcac1ca5ed000a6f4337d47ba67dfddf37ed6a46c15fd7f014997f7bf865f", size = 8790091, upload-time = "2026-04-24T00:12:44.789Z" }, + { url = "https://files.pythonhosted.org/packages/3e/0b/322aeec06dd9b91411f92028b37d447342770a24392aa4813e317064dad5/matplotlib-3.10.9-cp313-cp313-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:7a8d66a55def891c33147ba3ba9bfcabf0b526a43764c818acbb4525e5ed0838", size = 9605027, upload-time = "2026-04-24T00:12:47.583Z" }, + { url = "https://files.pythonhosted.org/packages/74/88/5f13482f55e7b00bcfc09838b093c2456e1379978d2a146844aae05350ad/matplotlib-3.10.9-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:d843374407c4017a6403b59c6c81606773d136f3259d5b6da3131bc814542cc2", size = 9671269, upload-time = "2026-04-24T00:12:50.878Z" }, + { url = "https://files.pythonhosted.org/packages/c5/e0/0840fd2f93da988ec660b8ad1984abe9f25d2aed22a5e394ff1c68c88307/matplotlib-3.10.9-cp313-cp313-win_amd64.whl", hash = "sha256:f4399f64b3e94cd500195490972ae1ee81170df1636fa15364d157d5bdd7b921", size = 8217588, upload-time = "2026-04-24T00:12:53.784Z" }, + { url = "https://files.pythonhosted.org/packages/47/b9/d706d06dd605c49b9f83a2aed8c13e3e5db70697d7a80b7e3d7915de6b17/matplotlib-3.10.9-cp313-cp313-win_arm64.whl", hash = "sha256:ba7b3b8ef09eab7df0e86e9ae086faa433efbfbdb46afcb3aa16aabf779469a8", size = 8136913, upload-time = "2026-04-24T00:12:56.501Z" }, + { url = "https://files.pythonhosted.org/packages/9b/45/6e32d96978264c8ca8c4b1010adb955a1a49cfaf314e212bbc8908f04a61/matplotlib-3.10.9-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:09218df8a93712bd6ea133e83a153c755448cf7868316c531cffcc43f69d1cc9", size = 8368019, upload-time = "2026-04-24T00:12:58.896Z" }, + { url = "https://files.pythonhosted.org/packages/86/0a/c8e3d3bba245f0f7fc424937f8ff7ef77291a36af3edb97ccd78aa93d84f/matplotlib-3.10.9-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:82368699727bfb7b0182e1aa13082e3c08e092fa1a25d3e1fd92405bff96f6d4", size = 8264645, upload-time = "2026-04-24T00:13:01.406Z" }, + { url = "https://files.pythonhosted.org/packages/3d/aa/5bf5a14fe4fed73a4209a155606f8096ff797aad89c6c35179026571133e/matplotlib-3.10.9-cp313-cp313t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:3225f4e1edcb8c86c884ddf79ebe20ecd0a67d30188f279897554ccd8fded4dc", size = 8802194, upload-time = "2026-04-24T00:13:03.702Z" }, + { url = "https://files.pythonhosted.org/packages/dd/5e/b4be852d6bba6fd15893fadf91ff26ae49cb91aac789e95dde9d342e664f/matplotlib-3.10.9-cp313-cp313t-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:de2445a0c6690d21b7eb6ce071cebad6d40a2e9bdf10d039074a96ba19797b99", size = 9622684, upload-time = "2026-04-24T00:13:06.647Z" }, + { url = "https://files.pythonhosted.org/packages/4c/3d/ed428c971139112ef730f62770654d609467346d09d4b62617e1afd68a5a/matplotlib-3.10.9-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:b2b9516251cb89ff618d757daec0e2ed1bf21248013844a853d87ef85ab3081d", size = 9680790, upload-time = "2026-04-24T00:13:10.009Z" }, + { url = "https://files.pythonhosted.org/packages/e7/09/052e884aaf2b985c63cb79f715f1d5b6a3eaa7de78f6a52b9dbc077d5b53/matplotlib-3.10.9-cp313-cp313t-win_amd64.whl", hash = "sha256:e9fae004b941b23ff2edcf1567a857ed77bafc8086ffa258190462328434faf8", size = 8287571, upload-time = "2026-04-24T00:13:13.087Z" }, + { url = "https://files.pythonhosted.org/packages/f4/38/ae27288e788c35a4250491422f3db7750366fc8c97d6f36fbdecfc1f5518/matplotlib-3.10.9-cp313-cp313t-win_arm64.whl", hash = "sha256:6b63d9c7c769b88ab81e10dc86e4e0607cf56817b9f9e6cf24b2a5f1693b8e38", size = 8188292, upload-time = "2026-04-24T00:13:15.546Z" }, + { url = "https://files.pythonhosted.org/packages/d6/e6/3bd8afd04949f02eabc1c17115ea5255e19cacd4d06fc5abdde4eeb0052c/matplotlib-3.10.9-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:172db52c9e683f5d12eaf57f0f54834190e12581fe1cc2a19595a8f5acb4e77d", size = 8321276, upload-time = "2026-04-24T00:13:18.318Z" }, + { url = "https://files.pythonhosted.org/packages/41/86/86231232fff41c9f8e4a1a7d7a597d349a02527109c3af7d618366122139/matplotlib-3.10.9-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:97e35e8d39ccc85859095e01a53847432ba9a53ddf7986f7a54a11b73d0e143f", size = 8218218, upload-time = "2026-04-24T00:13:20.974Z" }, + { url = "https://files.pythonhosted.org/packages/85/8f/becc9722cafc64f5d2eb0b7c1bf5f585271c618a45dbd8fabeb021f898b6/matplotlib-3.10.9-cp314-cp314-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:aba1615dabe83188e19d4f75a253c6a08423e04c1425e64039f800050a69de6b", size = 9608145, upload-time = "2026-04-24T00:13:23.228Z" }, + { url = "https://files.pythonhosted.org/packages/32/5d/f7e914f7d9325abff4057cee62c0fa70263683189f774473cbfb534cd13b/matplotlib-3.10.9-cp314-cp314-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:34cf8167e023ad956c15f36302911d5406bd99a9862c1a8499ea6f7c0e015dc2", size = 9885085, upload-time = "2026-04-24T00:13:25.849Z" }, + { url = "https://files.pythonhosted.org/packages/a5/fd/fa69f2221534e80cc5772ac2b7d222011a2acafc2ec7216d5dd174c864ae/matplotlib-3.10.9-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:59476c6d29d612b8e9bb6ce8c5b631be6ba8f9e3a2421f22a02b192c7dd28716", size = 9672358, upload-time = "2026-04-24T00:13:28.906Z" }, + { url = "https://files.pythonhosted.org/packages/ab/1a/5a4f747a8b271cbb024946d2dd3c913ab5032ba430626f8c3528ada96b4b/matplotlib-3.10.9-cp314-cp314-win_amd64.whl", hash = "sha256:336b9acc64d309063126edcdaca00db9373af3c476bb94388fe9c5a53ad13e6f", size = 8349970, upload-time = "2026-04-24T00:13:31.904Z" }, + { url = "https://files.pythonhosted.org/packages/64/dc/95d60ecaefe30680a154b52ea96ab4b0dab547f1fd6aa12f5fb655e89cae/matplotlib-3.10.9-cp314-cp314-win_arm64.whl", hash = "sha256:2dc9477819ffd78ad12a20df1d9d6a6bd4fec6aaa9072681465fddca052f1456", size = 8272785, upload-time = "2026-04-24T00:13:34.511Z" }, + { url = "https://files.pythonhosted.org/packages/70/a0/005d68bc8b8418300ce6591f18586910a8526806e2ab663933d9f20a41e9/matplotlib-3.10.9-cp314-cp314t-macosx_10_13_x86_64.whl", hash = "sha256:da4e09638420548f31c354032a6250e473c68e5a4e96899b4844cf39ddea23fe", size = 8367999, upload-time = "2026-04-24T00:13:36.962Z" }, + { url = "https://files.pythonhosted.org/packages/22/05/1236cc9290be70b2498af20ca348add76e3fffe7f67b477db5133a84f3ea/matplotlib-3.10.9-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:345f6f68ecc8da0ca56fad2ea08fde1a115eda530079eca185d50a7bc3e146c6", size = 8264543, upload-time = "2026-04-24T00:13:39.851Z" }, + { url = "https://files.pythonhosted.org/packages/cd/c2/071f5a5ff6c5bd63aaaf2f45c811d9bf2ced94bde188d9e1a519e21d0cba/matplotlib-3.10.9-cp314-cp314t-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:4edcfbd8565339aa62f1cd4012f7180926fdbe71850f7b0d3c379c175cd6b66c", size = 9622800, upload-time = "2026-04-24T00:13:42.296Z" }, + { url = "https://files.pythonhosted.org/packages/95/57/da7d1f10a85624b9e7db68e069dd94e58dc41dbf9463c5921632ecbe3661/matplotlib-3.10.9-cp314-cp314t-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:6be157fe17fc37cb95ac1d7374cf717ce9259616edec911a78d9d26dae8522d4", size = 9888561, upload-time = "2026-04-24T00:13:45.026Z" }, + { url = "https://files.pythonhosted.org/packages/67/b2/ef8d6bb59b0edb6c16c968b70f548aa13b54348972def5aa6ac85df67145/matplotlib-3.10.9-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:4e42042d54db34fda4e95a7bd3e5789c2a995d2dad3eb8850232ee534092fbbf", size = 9680884, upload-time = "2026-04-24T00:13:48.066Z" }, + { url = "https://files.pythonhosted.org/packages/61/1c/d21bfeb9931881ebe96bcfcff27c7ae4b160ae0ec291a714c42641a56d75/matplotlib-3.10.9-cp314-cp314t-win_amd64.whl", hash = "sha256:c27df8b3848f32a83d1767566595e43cfaa4460380974da06f4279a7ec143c39", size = 8432333, upload-time = "2026-04-24T00:13:51.008Z" }, + { url = "https://files.pythonhosted.org/packages/78/23/92493c3e6e1b635ccfff146f7b99e674808787915420373ac399283764c2/matplotlib-3.10.9-cp314-cp314t-win_arm64.whl", hash = "sha256:a49f1eadc84ca85fd72fa4e89e70e61bf86452df6f971af04b12c60761a0772c", size = 8324785, upload-time = "2026-04-24T00:13:53.633Z" }, + { url = "https://files.pythonhosted.org/packages/63/e2/9f66ca6a651a52abfe0d4964ce01439ed34f3f1e119de10ff3a07f403043/matplotlib-3.10.9-pp311-pypy311_pp73-macosx_10_15_x86_64.whl", hash = "sha256:42fb814efabe95c06c1994d8ab5a8385f43a249e23badd3ba931d4308e5bca20", size = 8304420, upload-time = "2026-04-24T00:14:04.57Z" }, + { url = "https://files.pythonhosted.org/packages/e8/e8/467c03568218792906aa87b5e7bb379b605e056ed0c74fe00c051786d925/matplotlib-3.10.9-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:f76e640a5268850bfda54b5131b1b1941cc685e42c5fa98ed9f2d64038308cba", size = 8197981, upload-time = "2026-04-24T00:14:07.233Z" }, + { url = "https://files.pythonhosted.org/packages/6f/87/afead29192170917537934c6aff4b008c805fff7b1ccea0c79120d96beda/matplotlib-3.10.9-pp311-pypy311_pp73-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:3fc0364dfbe1d07f6d15c5ebd0c5bf89e126916e5a8667dd4a7a6e84c36653d4", size = 8774002, upload-time = "2026-04-24T00:14:09.816Z" }, +] + +[[package]] +name = "matplotlib-inline" +version = "0.2.2" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "traitlets" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/bd/c0/9f7c9a46090390368a4d7bcb76bb87a4a36c421e4c0792cdb53486ffac7a/matplotlib_inline-0.2.2.tar.gz", hash = "sha256:72f3fe8fce36b70d4a5b612f899090cd0401deddc4ea90e1572b9f4bfb058c79", size = 8150, upload-time = "2026-05-08T17:33:33.49Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/41/09/5b161152e2d90f7b87f781c2e1267494aef9c32498df793f73ad0a0a494a/matplotlib_inline-0.2.2-py3-none-any.whl", hash = "sha256:3c821cf1c209f59fb2d2d64abbf5b23b67bcb2210d663f9918dd851c6da1fcf6", size = 9534, upload-time = "2026-05-08T17:33:32.055Z" }, +] + +[[package]] +name = "mccabe" +version = "0.7.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/e7/ff/0ffefdcac38932a54d2b5eed4e0ba8a408f215002cd178ad1df0f2806ff8/mccabe-0.7.0.tar.gz", hash = "sha256:348e0240c33b60bbdf4e523192ef919f28cb2c3d7d5c7794f74009290f236325", size = 9658, upload-time = "2022-01-24T01:14:51.113Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/27/1a/1f68f9ba0c207934b35b86a8ca3aad8395a3d6dd7921c0686e23853ff5a9/mccabe-0.7.0-py2.py3-none-any.whl", hash = "sha256:6c2d30ab6be0e4a46919781807b4f0d834ebdd6c6e3dca0bda5a15f863427b6e", size = 7350, upload-time = "2022-01-24T01:14:49.62Z" }, +] + +[[package]] +name = "mimerender-pr36" +version = "0.0.2" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "python-mimeparse" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/23/39/25559ff5440e17aad0191e3034afa6e023150bc1e79edacb9268c22131f6/mimerender-pr36-0.0.2.tar.gz", hash = "sha256:2d1f7bc4080132da7040518b2d613eb5e49b583231a9b2be3ac040860c233d80", size = 19309, upload-time = "2021-08-07T05:53:35.754Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/48/d5/4f84e7b14f115d49bde75babd13e67ec3b19d077bffc937cab2fc524eac5/mimerender_pr36-0.0.2-py3-none-any.whl", hash = "sha256:260eceeca204d11a4b43cc5d1fe60d757048e6b3dd51b87b64c68c153faadacc", size = 6621, upload-time = "2021-08-07T05:53:33.338Z" }, +] + +[[package]] +name = "mistune" +version = "3.2.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/ca/84/620cc3f7e3adf6f5067e10f4dbae71295d8f9e16d5d3f9ef97c40f2f592c/mistune-3.2.1.tar.gz", hash = "sha256:7c8e5501d38bac1582e067e46c8343f17d57ea1aaa735823f3aba1fd59c88a28", size = 98003, upload-time = "2026-05-03T14:33:22.312Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/2a/7f/a946aa4f8752b37102b41e64dca18a1976ac705c3a0d1dfe74d820a02552/mistune-3.2.1-py3-none-any.whl", hash = "sha256:78cdb0ba5e938053ccf63651b352508d2efa9411dc8810bfb05f2dc5140c0048", size = 53749, upload-time = "2026-05-03T14:33:20.551Z" }, +] + +[[package]] +name = "mongoengine" +version = "0.29.3" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "pymongo" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/b4/76/160e35d90a671913146b884b1ca586909036dd56070600035821870b1aad/mongoengine-0.29.3.tar.gz", hash = "sha256:4267702aea433012845cb12b6334bff86a0a3084b5d141c1e4553ea20374a9b4", size = 188213, upload-time = "2026-03-10T15:19:17.946Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/c7/b5/214ea32710fa3ad7c13820cbb9f9a457d4809a5d54995e0d081f33c75116/mongoengine-0.29.3-py3-none-any.whl", hash = "sha256:2d5a216cf2368867d43e5321b13044ecc3e72c3f19ace21b1c5e7403951ca685", size = 112513, upload-time = "2026-03-10T15:19:16.619Z" }, +] + +[[package]] +name = "monty" +version = "2026.5.18" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "numpy" }, + { name = "ruamel-yaml" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/f4/d7/bd34aafa34d3cddd93c440e7cfb3371328079e864279708f64a871806eb7/monty-2026.5.18.tar.gz", hash = "sha256:b2d8d5c78030e889f6407fa9d8c8c4e3df05fc380251cdf85a119cd1e49c3fdd", size = 211830, upload-time = "2026-05-18T03:21:02.254Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/f3/63/86120977f920798494c522c26899ffacde6d848e1eb018403f1d08044d0d/monty-2026.5.18-py3-none-any.whl", hash = "sha256:dd108b5c3cceb1f61de1a854db8ffda3dc7c2a2d4025b24cf397ade1121e7904", size = 59998, upload-time = "2026-05-18T03:21:00.059Z" }, +] + +[[package]] +name = "more-itertools" +version = "11.1.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/de/1d/f4da6f02cdffe04d6362210b807146a26044c88d839208aec273bb0d9184/more_itertools-11.1.0.tar.gz", hash = "sha256:48e8f4d9e7e5878571ecf6f2b4e57634f93cd474cc8cfbd2376f2d11b396e30d", size = 145772, upload-time = "2026-05-22T14:14:29.909Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/e8/3d/1087453384dbde46a8c7f9356eead2c58be8a7bf156bca40243377c85715/more_itertools-11.1.0-py3-none-any.whl", hash = "sha256:4b65538ae22f6fed0ce4874efd317463a7489796a0939fa66824dd542125a192", size = 72226, upload-time = "2026-05-22T14:14:28.824Z" }, +] + +[[package]] +name = "mpcontribs-api" +source = { editable = "." } +dependencies = [ + { name = "apispec" }, + { name = "asn1crypto" }, + { name = "blinker" }, + { name = "boltons" }, + { name = "css-html-js-minify" }, + { name = "dateparser" }, + { name = "ddtrace" }, + { name = "dnspython" }, + { name = "fastapi" }, + { name = "filetype" }, + { name = "flasgger-tschaume" }, + { name = "flask-compress" }, + { name = "flask-marshmallow" }, + { name = "flask-mongorest-mpcontribs" }, + { name = "flask-rq2" }, + { name = "gunicorn", extra = ["gevent"] }, + { name = "jinja2" }, + { name = "json2html" }, + { name = "marshmallow" }, + { name = "more-itertools" }, + { name = "nbformat" }, + { name = "notebook" }, + { name = "numpy" }, + { name = "opentelemetry-api" }, + { name = "opentelemetry-exporter-otlp-proto-grpc" }, + { name = "opentelemetry-instrumentation-fastapi" }, + { name = "opentelemetry-instrumentation-pymongo" }, + { name = "opentelemetry-sdk" }, + { name = "pint" }, + { name = "psycopg2-binary" }, + { name = "pydantic-settings" }, + { name = "pymatgen" }, + { name = "pymongo" }, + { name = "pyopenssl" }, + { name = "python-snappy" }, + { name = "rq" }, + { name = "setproctitle" }, + { name = "structlog" }, + { name = "supervisor" }, + { name = "uncertainties" }, + { name = "websocket-client" }, + { name = "zstandard" }, +] + +[package.dev-dependencies] +dev = [ + { name = "flake8" }, + { name = "pytest" }, + { name = "pytest-flake8" }, + { name = "pytest-pycodestyle" }, + { name = "pytest-xdist" }, +] + +[package.metadata] +requires-dist = [ + { name = "apispec", specifier = "<6" }, + { name = "asn1crypto" }, + { name = "blinker" }, + { name = "boltons" }, + { name = "css-html-js-minify" }, + { name = "dateparser" }, + { name = "ddtrace", specifier = "==4.3.0" }, + { name = "dnspython" }, + { name = "fastapi", specifier = ">=0.136.3" }, + { name = "filetype" }, + { name = "flasgger-tschaume", specifier = ">=0.9.7" }, + { name = "flask-compress" }, + { name = "flask-marshmallow" }, + { name = "flask-mongorest-mpcontribs", specifier = ">=3.2.1" }, + { name = "flask-rq2" }, + { name = "gunicorn", extras = ["gevent"], specifier = "==24.1.1" }, + { name = "jinja2" }, + { name = "json2html" }, + { name = "marshmallow", specifier = "<4" }, + { name = "more-itertools" }, + { name = "nbformat" }, + { name = "notebook", specifier = "<7" }, + { name = "numpy" }, + { name = "opentelemetry-api", specifier = ">=1.42.1" }, + { name = "opentelemetry-exporter-otlp-proto-grpc", specifier = ">=1.42.1" }, + { name = "opentelemetry-instrumentation-fastapi", specifier = ">=0.63b1" }, + { name = "opentelemetry-instrumentation-pymongo", specifier = ">=0.63b1" }, + { name = "opentelemetry-sdk", specifier = ">=1.42.1" }, + { name = "pint", specifier = ">=0.24" }, + { name = "psycopg2-binary" }, + { name = "pydantic-settings", specifier = ">=2.14.1" }, + { name = "pymatgen" }, + { name = "pymongo", specifier = ">=4.17.0" }, + { name = "pyopenssl" }, + { name = "python-snappy" }, + { name = "rq", specifier = "<=2.3.2" }, + { name = "setproctitle" }, + { name = "structlog", specifier = ">=25.5.0" }, + { name = "supervisor" }, + { name = "uncertainties" }, + { name = "websocket-client" }, + { name = "zstandard" }, +] + +[package.metadata.requires-dev] +dev = [ + { name = "flake8", specifier = ">=7.3.0" }, + { name = "pytest", specifier = ">=9.0.3" }, + { name = "pytest-flake8", specifier = ">=1.3.0" }, + { name = "pytest-pycodestyle", specifier = ">=2.5.0" }, + { name = "pytest-xdist", specifier = ">=3.8.0" }, +] + +[[package]] +name = "mpmath" +version = "1.3.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/e0/47/dd32fa426cc72114383ac549964eecb20ecfd886d1e5ccf5340b55b02f57/mpmath-1.3.0.tar.gz", hash = "sha256:7a28eb2a9774d00c7bc92411c19a89209d5da7c4c9a9e227be8330a23a25b91f", size = 508106, upload-time = "2023-03-07T16:47:11.061Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/43/e3/7d92a15f894aa0c9c4b49b8ee9ac9850d6e63b03c9c32c0367a13ae62209/mpmath-1.3.0-py3-none-any.whl", hash = "sha256:a0b2b9fe80bbcd81a6647ff13108738cfb482d481d826cc0e02f5b35e5c88d2c", size = 536198, upload-time = "2023-03-07T16:47:09.197Z" }, +] + +[[package]] +name = "narwhals" +version = "2.21.2" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/cf/a0/6198c56d42ef2f3c6ed0c42ba30dbcefdc86a91262d7d449010770ae085b/narwhals-2.21.2.tar.gz", hash = "sha256:5c5b2d0b47aef7c73ea412cfcbcd467f2f2d5be73e3c2ab19d78f4a97718790a", size = 632176, upload-time = "2026-05-16T08:49:08.314Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/1d/77/928ea2e70641ca177a11140062cc5840d421795f2e82749d408d0cce900a/narwhals-2.21.2-py3-none-any.whl", hash = "sha256:7bb57c3700486039215455b9bf2d64261915cc0fd845cc30272d631df696b251", size = 451201, upload-time = "2026-05-16T08:49:05.536Z" }, +] + +[[package]] +name = "nbclassic" +version = "1.3.3" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "ipykernel" }, + { name = "ipython-genutils" }, + { name = "nest-asyncio" }, + { name = "notebook-shim" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/ec/cc/a495b5eb9a964b70c6ae8c861168b78386d2520fd89c68390932f96400b2/nbclassic-1.3.3.tar.gz", hash = "sha256:434228763f8cee754318cd6dfa42370db191af630dabab8e30bafc8c1aa3eee6", size = 64116062, upload-time = "2025-09-16T20:33:15.967Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/3d/fd/dfb6db427bb4e0a50c9802b11df0b69d9364192f3db999849cde9209c8d0/nbclassic-1.3.3-py3-none-any.whl", hash = "sha256:dcee5149aa6aa01846c7458d6394b29b325213b5e118ee14c80d689122e0e4f2", size = 11527229, upload-time = "2025-09-16T20:33:08.625Z" }, +] + +[[package]] +name = "nbclient" +version = "0.10.4" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "jupyter-client" }, + { name = "jupyter-core" }, + { name = "nbformat" }, + { name = "traitlets" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/56/91/1c1d5a4b9a9ebba2b4e32b8c852c2975c872aec1fe42ab5e516b2cecd193/nbclient-0.10.4.tar.gz", hash = "sha256:1e54091b16e6da39e297b0ece3e10f6f29f4ac4e8ee515d29f8a7099bd6553c9", size = 62554, upload-time = "2025-12-23T07:45:46.369Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/83/a0/5b0c2f11142ed1dddec842457d3f65eaf71a0080894eb6f018755b319c3a/nbclient-0.10.4-py3-none-any.whl", hash = "sha256:9162df5a7373d70d606527300a95a975a47c137776cd942e52d9c7e29ff83440", size = 25465, upload-time = "2025-12-23T07:45:44.51Z" }, +] + +[[package]] +name = "nbconvert" +version = "7.17.1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "beautifulsoup4" }, + { name = "bleach", extra = ["css"] }, + { name = "defusedxml" }, + { name = "jinja2" }, + { name = "jupyter-core" }, + { name = "jupyterlab-pygments" }, + { name = "markupsafe" }, + { name = "mistune" }, + { name = "nbclient" }, + { name = "nbformat" }, + { name = "packaging" }, + { name = "pandocfilters" }, + { name = "pygments" }, + { name = "traitlets" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/01/b1/708e53fe2e429c103c6e6e159106bcf0357ac41aa4c28772bd8402339051/nbconvert-7.17.1.tar.gz", hash = "sha256:34d0d0a7e73ce3cbab6c5aae8f4f468797280b01fd8bd2ca746da8569eddd7d2", size = 865311, upload-time = "2026-04-08T00:44:14.914Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/67/f8/bb0a9d5f46819c821dc1f004aa2cc29b1d91453297dbf5ff20470f00f193/nbconvert-7.17.1-py3-none-any.whl", hash = "sha256:aa85c087b435e7bf1ffd03319f658e285f2b89eccab33bc1ba7025495ab3e7c8", size = 261927, upload-time = "2026-04-08T00:44:12.845Z" }, +] + +[[package]] +name = "nbformat" +version = "5.10.4" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "fastjsonschema" }, + { name = "jsonschema" }, + { name = "jupyter-core" }, + { name = "traitlets" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/6d/fd/91545e604bc3dad7dca9ed03284086039b294c6b3d75c0d2fa45f9e9caf3/nbformat-5.10.4.tar.gz", hash = "sha256:322168b14f937a5d11362988ecac2a4952d3d8e3a2cbeb2319584631226d5b3a", size = 142749, upload-time = "2024-04-04T11:20:37.371Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/a9/82/0340caa499416c78e5d8f5f05947ae4bc3cba53c9f038ab6e9ed964e22f1/nbformat-5.10.4-py3-none-any.whl", hash = "sha256:3b48d6c8fbca4b299bf3982ea7db1af21580e4fec269ad087b9e81588891200b", size = 78454, upload-time = "2024-04-04T11:20:34.895Z" }, +] + +[[package]] +name = "nest-asyncio" +version = "1.6.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/83/f8/51569ac65d696c8ecbee95938f89d4abf00f47d58d48f6fbabfe8f0baefe/nest_asyncio-1.6.0.tar.gz", hash = "sha256:6f172d5449aca15afd6c646851f4e31e02c598d553a667e38cafa997cfec55fe", size = 7418, upload-time = "2024-01-21T14:25:19.227Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/a0/c4/c2971a3ba4c6103a3d10c4b0f24f461ddc027f0f09763220cf35ca1401b3/nest_asyncio-1.6.0-py3-none-any.whl", hash = "sha256:87af6efd6b5e897c81050477ef65c62e2b2f35d51703cae01aff2905b1852e1c", size = 5195, upload-time = "2024-01-21T14:25:17.223Z" }, +] + +[[package]] +name = "networkx" +version = "3.6.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/6a/51/63fe664f3908c97be9d2e4f1158eb633317598cfa6e1fc14af5383f17512/networkx-3.6.1.tar.gz", hash = "sha256:26b7c357accc0c8cde558ad486283728b65b6a95d85ee1cd66bafab4c8168509", size = 2517025, upload-time = "2025-12-08T17:02:39.908Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/9e/c9/b2622292ea83fbb4ec318f5b9ab867d0a28ab43c5717bb85b0a5f6b3b0a4/networkx-3.6.1-py3-none-any.whl", hash = "sha256:d47fbf302e7d9cbbb9e2555a0d267983d2aa476bac30e90dfbe5669bd57f3762", size = 2068504, upload-time = "2025-12-08T17:02:38.159Z" }, +] + +[[package]] +name = "notebook" +version = "6.5.7" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "argon2-cffi" }, + { name = "ipykernel" }, + { name = "ipython-genutils" }, + { name = "jinja2" }, + { name = "jupyter-client" }, + { name = "jupyter-core" }, + { name = "nbclassic" }, + { name = "nbconvert" }, + { name = "nbformat" }, + { name = "nest-asyncio" }, + { name = "prometheus-client" }, + { name = "pyzmq" }, + { name = "send2trash" }, + { name = "terminado" }, + { name = "tornado" }, + { name = "traitlets" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/05/bc/b025bac523640c13b0c1150466475eac3d79acbf187ef6c1967596c41c43/notebook-6.5.7.tar.gz", hash = "sha256:04eb9011dfac634fbd4442adaf0a8c27cd26beef831fe1d19faf930c327768e4", size = 5786526, upload-time = "2024-05-01T17:42:26.956Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/af/9c/0620631da9d7013e95a8f985043cad229a0d8fb537a7e3f8ff8467565a8c/notebook-6.5.7-py3-none-any.whl", hash = "sha256:a6afa9a4ff4d149a0771ff8b8c881a7a73b3835f9add0606696d6e9d98ac1cd0", size = 529829, upload-time = "2024-05-01T17:42:22.403Z" }, +] + +[[package]] +name = "notebook-shim" +version = "0.2.4" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "jupyter-server" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/54/d2/92fa3243712b9a3e8bafaf60aac366da1cada3639ca767ff4b5b3654ec28/notebook_shim-0.2.4.tar.gz", hash = "sha256:b4b2cfa1b65d98307ca24361f5b30fe785b53c3fd07b7a47e89acb5e6ac638cb", size = 13167, upload-time = "2024-02-14T23:35:18.353Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/f9/33/bd5b9137445ea4b680023eb0469b2bb969d61303dedb2aac6560ff3d14a1/notebook_shim-0.2.4-py3-none-any.whl", hash = "sha256:411a5be4e9dc882a074ccbcae671eda64cceb068767e9a3419096986560e1cef", size = 13307, upload-time = "2024-02-14T23:35:16.286Z" }, +] + +[[package]] +name = "numpy" +version = "2.4.6" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/d0/ad/fed0499ce6a338d2a03ebae59cd15093910c8875328855781952abf6c2fe/numpy-2.4.6.tar.gz", hash = "sha256:f3a3570c4a2a16746ac2c31a7c7c7b0c186b95ce902e33db6f28094ed7387dda", size = 20735807, upload-time = "2026-05-18T23:37:14.07Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/b3/49/ec46835a70be8fa6446c495126ac84fdb28cb2558e1620ffb87a10c8b64c/numpy-2.4.6-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:0280e0356c0829a18d9de1cb7eee50ec22ca639878d7240307ca0943d73cd2c4", size = 16969194, upload-time = "2026-05-18T23:33:13.503Z" }, + { url = "https://files.pythonhosted.org/packages/0e/0d/f5957185c0ee2f3e12f78715aa9e3b353fd83633316c8532b38faa37e3f6/numpy-2.4.6-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:110f8b71aacb688ec69062bb7f6938a0f8acb01b7c1c4beb453c65b6d234584d", size = 14964111, upload-time = "2026-05-18T23:33:17.795Z" }, + { url = "https://files.pythonhosted.org/packages/ad/40/40a40ee0ddf7ceb782c49af278894b686e586d65d8c1889c8b5da01a3d7d/numpy-2.4.6-cp311-cp311-macosx_14_0_arm64.whl", hash = "sha256:4cfe66903cc32a9921a6733d96b19bb6abf310397581bbad89c228f5abaf0ee8", size = 5469159, upload-time = "2026-05-18T23:33:20.654Z" }, + { url = "https://files.pythonhosted.org/packages/63/13/f9a8046535cb21deae82f8d03de9617e08882d274fad2539630761888228/numpy-2.4.6-cp311-cp311-macosx_14_0_x86_64.whl", hash = "sha256:8155154c7c691289fe18f510b5d4657c68c67989f293f0535a91360392ff6538", size = 6798936, upload-time = "2026-05-18T23:33:22.987Z" }, + { url = "https://files.pythonhosted.org/packages/33/a8/6fa8c1a345a8c85dbb21932c447bee07c30a2c2a3f31e369c0a84b300147/numpy-2.4.6-cp311-cp311-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:0ab0a9c4ffb1a6d95ef519fe4247dba8eb6b18ad93999f76b7f657039acabd47", size = 15966692, upload-time = "2026-05-18T23:33:26.62Z" }, + { url = "https://files.pythonhosted.org/packages/02/03/74fe2a4cb3817d94d86402f2506554130a2f01414e299b5a843e5a8a957f/numpy-2.4.6-cp311-cp311-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:89cd468399cfd2504718f0ba50e410dca55a170b61a02ad92bb18c8a65186e93", size = 16918164, upload-time = "2026-05-18T23:33:29.955Z" }, + { url = "https://files.pythonhosted.org/packages/c5/80/3615be3313f7e7696609bc194b9f0101da809df79e859bdb84e0cd043f46/numpy-2.4.6-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:c2d37ab77531417474168eb79d6d80b14f821a966818505d03013d0833edb7a8", size = 17322877, upload-time = "2026-05-18T23:33:34.724Z" }, + { url = "https://files.pythonhosted.org/packages/ca/ac/a691e0fe2675e370d0e08ff905adc49a1c8830e8cae03efe4477e92cd55d/numpy-2.4.6-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:f407cb6b8e9d6d8c626bc73c945db1706035af8fd632295547bf1c9e46d092d6", size = 18651487, upload-time = "2026-05-18T23:33:38.217Z" }, + { url = "https://files.pythonhosted.org/packages/15/a7/9bc1cd626d7bf6869bfedf27b91b6ab5dd607758bf8e959d6fa80c6a59cb/numpy-2.4.6-cp311-cp311-win32.whl", hash = "sha256:ddea102b48f9e339f3948bf22040944184627a30fdf7f858667673b9c5f033c8", size = 6233945, upload-time = "2026-05-18T23:33:41.331Z" }, + { url = "https://files.pythonhosted.org/packages/c5/31/7fc6239c12bce7e931463251cca4426c465e1876ba3cc785402ef4dd8f4e/numpy-2.4.6-cp311-cp311-win_amd64.whl", hash = "sha256:1e254a00cdf42b1e4d5b3d68d33af63268d41340d8885df2ab6470f2e1500147", size = 12608406, upload-time = "2026-05-18T23:33:44.131Z" }, + { url = "https://files.pythonhosted.org/packages/27/83/140f85a466595a16382996a1bf06b2b54bcd597488921b0c9daaeeda72af/numpy-2.4.6-cp311-cp311-win_arm64.whl", hash = "sha256:ed9749eef4cbd126da3dc1d6bcb3a57f5eb7ac6a6484146bdbf743f552dfc577", size = 10479528, upload-time = "2026-05-18T23:33:50.725Z" }, + { url = "https://files.pythonhosted.org/packages/95/2a/3d7b5ac8aac24feaf9ad7ed58f45b0bbc06d37e4338ae84c9f2298b570f9/numpy-2.4.6-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:001fbb8e08d942dd57599e781f2472269ee7f2755fae407b4f67b2f0b17da3f1", size = 16689119, upload-time = "2026-05-18T23:33:54.065Z" }, + { url = "https://files.pythonhosted.org/packages/ea/12/92c4c131527599e8288d6918e888d88726f84d805d784b771f32408aeaef/numpy-2.4.6-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:ebfb099f8dcf083deef3ac1ca4c1503f387cf76296fcb3816b66f5ecb5f54fdb", size = 14699246, upload-time = "2026-05-18T23:33:57.621Z" }, + { url = "https://files.pythonhosted.org/packages/ad/fe/c0a6b7b2ca128a8fb228575147073b660656734b8ebe4d76c8fd748dcc79/numpy-2.4.6-cp312-cp312-macosx_14_0_arm64.whl", hash = "sha256:3213d622a0283a39a93d188f3cf72b26862df52fbb4ca3697f51705016523d41", size = 5204410, upload-time = "2026-05-18T23:34:00.302Z" }, + { url = "https://files.pythonhosted.org/packages/f3/d4/9770d14ba719432bb90a421bfd443872ed0f70f7264b64bec12ea363d5fd/numpy-2.4.6-cp312-cp312-macosx_14_0_x86_64.whl", hash = "sha256:357cc07a6d7b0b182ff02249616a03742827ebb1277546b5c7cd7f7620a45698", size = 6551240, upload-time = "2026-05-18T23:34:02.852Z" }, + { url = "https://files.pythonhosted.org/packages/c9/c6/50a46a6205feba2343f1d6d17438107c5dc491ed1c736e6ea68689fd906b/numpy-2.4.6-cp312-cp312-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:5f9fb9157b4ce2971008323afe46053787b526ef624fea915b261468a8421a0f", size = 15671012, upload-time = "2026-05-18T23:34:05.485Z" }, + { url = "https://files.pythonhosted.org/packages/99/60/14115e6364fa676c5397c2ad3004e527e9aa487abf5d0706ec81bbd08529/numpy-2.4.6-cp312-cp312-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:90f9849678c75fe7afa2d348ac842c168b0a4d3d61919687216dfc547976d853", size = 16645538, upload-time = "2026-05-18T23:34:09.265Z" }, + { url = "https://files.pythonhosted.org/packages/ae/c5/693cbe59e57db94d2231fa519ca3978dc9e19da5a8f088588f5c6e947ff2/numpy-2.4.6-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:c1a2af6c6ef86344a6b0db6b97834208bf598db514f2b155042439b62605601a", size = 17020706, upload-time = "2026-05-18T23:34:13.053Z" }, + { url = "https://files.pythonhosted.org/packages/ef/fc/85b7c4eff9b4966ade25c2273cf7e7012e92366c032058653934b37de044/numpy-2.4.6-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:e5805d5a22fd19c8ccff10a9561f9df94436b0545619ea579db2d3c35294bce2", size = 18368541, upload-time = "2026-05-18T23:34:17.024Z" }, + { url = "https://files.pythonhosted.org/packages/f6/81/e1b27545deedce7f4a0b348618c6b62d74e36a4dc9ccd42f3eb2f85eee32/numpy-2.4.6-cp312-cp312-win32.whl", hash = "sha256:e3eeb0aabd6bd5ce64faae67e9935203a6991b4bc2a485a767fbafb2c5125f45", size = 5962825, upload-time = "2026-05-18T23:34:20.3Z" }, + { url = "https://files.pythonhosted.org/packages/ab/ca/feab00bd44aa5fe1ad2c18f08b4d3bb92e26484b0b1d1443897809ed528c/numpy-2.4.6-cp312-cp312-win_amd64.whl", hash = "sha256:d8e8286dd7cea7895157318d1b91cdacac64c479f3cbc8dce548331728484751", size = 12321687, upload-time = "2026-05-18T23:34:23.095Z" }, + { url = "https://files.pythonhosted.org/packages/63/cf/5a6d34850a39d1093558564f77ee8e8e0bee5061151b8f05a55711001ec7/numpy-2.4.6-cp312-cp312-win_arm64.whl", hash = "sha256:4081eb135ac24158bd51cdfbef16f1c64df7063b1143f24731387137c092bec8", size = 10221482, upload-time = "2026-05-18T23:34:25.876Z" }, + { url = "https://files.pythonhosted.org/packages/fb/82/bdab26d7438c6791ca31b7c024ca37c1eab8b726ba236129005cd4a06e45/numpy-2.4.6-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:511dbaf848decaaaf4b4ca48032619fb3138710c4bf7da7617765edad1ef96b0", size = 16684648, upload-time = "2026-05-18T23:34:29.41Z" }, + { url = "https://files.pythonhosted.org/packages/1b/30/a80189bcc7f5e4258b3fbc3968d909d1756f54d023299ecc39ad6fdb9ef8/numpy-2.4.6-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:bf162abab1c1a736333192707cef898e735a5ca00f38f27eeedf44b39d9e85eb", size = 14693902, upload-time = "2026-05-18T23:34:33.013Z" }, + { url = "https://files.pythonhosted.org/packages/97/12/70b5d0d7c15e1ebb8a6a84a8caa1d19e181d84fb58bb6d70aca29099dec1/numpy-2.4.6-cp313-cp313-macosx_14_0_arm64.whl", hash = "sha256:043191bfa8eab18c776647b62723ac9dddece59743b13f49b2016094129c2b3f", size = 5198992, upload-time = "2026-05-18T23:34:36.132Z" }, + { url = "https://files.pythonhosted.org/packages/ba/8c/ebd2a8f8a83541f8d38cc5667e8c2b69cecfd30da6e45693e8158857d44b/numpy-2.4.6-cp313-cp313-macosx_14_0_x86_64.whl", hash = "sha256:6180d8b35af935aed8ece3a85e0a43f87393ae0ac87c8d2c8bd2c993f7270ef3", size = 6546944, upload-time = "2026-05-18T23:34:38.484Z" }, + { url = "https://files.pythonhosted.org/packages/bb/c5/7b863a97a91671a0338f4253bd3b5a3d3852f0692dae91711c9f4a10e787/numpy-2.4.6-cp313-cp313-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:72fbe16c6fac95aedf5937fa873445cec2110be35d8a4e9433d7501fd98dae6b", size = 15669392, upload-time = "2026-05-18T23:34:41.257Z" }, + { url = "https://files.pythonhosted.org/packages/a5/9d/3584b9984ca4c047aea75214ce1a4c4c73d849bd71b604264b7f5653f8a8/numpy-2.4.6-cp313-cp313-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:a7830bab239b79cda9c08c2da014761cafb48da6150e1da17ac06283f43b6089", size = 16633220, upload-time = "2026-05-18T23:34:45.075Z" }, + { url = "https://files.pythonhosted.org/packages/05/ae/7c67fba23bd98caec7c99261f3a16072ade14813486b0282cb29846de832/numpy-2.4.6-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:ef4aea96ce4d3b074422cb4f2f64e216bf9e213004bb58ecfdf50ea02ea8eb9a", size = 17020800, upload-time = "2026-05-18T23:34:49.065Z" }, + { url = "https://files.pythonhosted.org/packages/d9/5d/3b6725cb31d983c5e66916f5d36f6d7e5521129e4c4404d64f918292a5b6/numpy-2.4.6-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:dfa20cc6ca228e6b155b11da03825975ce66aea520985dbbddf0f2a5a495c605", size = 18357600, upload-time = "2026-05-18T23:34:52.709Z" }, + { url = "https://files.pythonhosted.org/packages/f7/da/2ccc6c2fe8898dee01d90c75c5f5f914a23daf99e3e0f59516a08760c8b5/numpy-2.4.6-cp313-cp313-win32.whl", hash = "sha256:56b39e5e0622a09a25bf5baf62f4bcf0cb8a41ae6e2819cf49bbc5a74c083f91", size = 5961134, upload-time = "2026-05-18T23:34:55.618Z" }, + { url = "https://files.pythonhosted.org/packages/b5/cd/9cc4dc876fb065d5c220aae4d5e14826b2715331bb7618ce1fb07a679d99/numpy-2.4.6-cp313-cp313-win_amd64.whl", hash = "sha256:c4fc99836233ea196540b17ab0983aff60ed07941751930f5f4d05bc3b3b7359", size = 12318598, upload-time = "2026-05-18T23:34:58.928Z" }, + { url = "https://files.pythonhosted.org/packages/39/1e/c0bcba1f8694116485fe28fd1be698c278fcda4141c5b0e53a2aed8b12a8/numpy-2.4.6-cp313-cp313-win_arm64.whl", hash = "sha256:a7c711e21628b52034bb5ab8d1bce291f752fcc5e92accc615778acee1ff4778", size = 10222272, upload-time = "2026-05-18T23:35:02.167Z" }, + { url = "https://files.pythonhosted.org/packages/63/6d/cc5619247c8f4204e507f5883528372e4ac4bb189e579fb859a12e480b1f/numpy-2.4.6-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:112b06a867b235ef466ed3508ddf0238050df9c727cafb5301ac385b899189a1", size = 14821197, upload-time = "2026-05-18T23:35:05.468Z" }, + { url = "https://files.pythonhosted.org/packages/00/58/f1c39161c87d9e9bed660f1ed4bafc0e403d5ec9650b6dd77aead07d489b/numpy-2.4.6-cp313-cp313t-macosx_14_0_arm64.whl", hash = "sha256:eaf7fa2de5c0be8ae6ff8e9bea2ccd725e980541244521d8d4b5f3354a27babe", size = 5326287, upload-time = "2026-05-18T23:35:08.693Z" }, + { url = "https://files.pythonhosted.org/packages/af/57/3917ab0fd97f271a8694513581b8a36c655f111c446852c302f04ccdb6fc/numpy-2.4.6-cp313-cp313t-macosx_14_0_x86_64.whl", hash = "sha256:7265a2f3d436e54ef9f2b52b5c937e6be778781bd97a590319d7348f1c1ca997", size = 6646763, upload-time = "2026-05-18T23:35:11.459Z" }, + { url = "https://files.pythonhosted.org/packages/eb/0f/037e64c494b67581ae18193d770adef354c41f3f2c8ebf865602d949bf8f/numpy-2.4.6-cp313-cp313t-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:f74a575920ab21fe304421a3fc28793d82e299cae9eccb37084e9fc7f3617c20", size = 15728070, upload-time = "2026-05-18T23:35:14.79Z" }, + { url = "https://files.pythonhosted.org/packages/21/a6/5d2bae9c9542eb4df16dc9c46dc79c186e9bad53805dfa5399a6023c6db0/numpy-2.4.6-cp313-cp313t-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:ede83e07a75dd06bc501566c1eca2afc0d61677c1472ac9ad93fdee6e638a48d", size = 16681752, upload-time = "2026-05-18T23:35:18.836Z" }, + { url = "https://files.pythonhosted.org/packages/92/14/23d1dfb410ae362cd59ce53e936b1513d545eb40db3949ced632e19a459e/numpy-2.4.6-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:68bb27509ac1b9a3443094260f6326150663b06abe40b73a2f81160623da5b67", size = 17086024, upload-time = "2026-05-18T23:35:22.52Z" }, + { url = "https://files.pythonhosted.org/packages/4b/6e/23595a2c642cdf3bc567877064bdd7f91c8b0038a4453cf2daf7248eafe9/numpy-2.4.6-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:a0df0043bdb289bde1f62da130d20df23d58b45429f752bc7a8fc5325a225ecd", size = 18403398, upload-time = "2026-05-18T23:35:26.398Z" }, + { url = "https://files.pythonhosted.org/packages/8a/90/0ac3bc947217e66dec77e7cbc6a1979d1af70b6461b82f620d3bccd5e4c8/numpy-2.4.6-cp313-cp313t-win32.whl", hash = "sha256:29a287e0cf63ff528da061de6b9f64a4618da591ca1046aafc54062e40ca7eab", size = 6084971, upload-time = "2026-05-18T23:35:29.387Z" }, + { url = "https://files.pythonhosted.org/packages/77/71/5673e351671a1d2bd6063b91b44f70c0affea7d1516fa7a6572941ba4aa1/numpy-2.4.6-cp313-cp313t-win_amd64.whl", hash = "sha256:25c692919ac5a01f170a3bfcd62d745b24fd095c353d50812637d6fcab442e75", size = 12458532, upload-time = "2026-05-18T23:35:32.175Z" }, + { url = "https://files.pythonhosted.org/packages/3f/88/19d3503c5046e688f049274b27a3ef3d771152fa80d3ba3d01a3dff61abe/numpy-2.4.6-cp313-cp313t-win_arm64.whl", hash = "sha256:1e978ec1e8bd0e0e4de6bb75de9d30cbb74db6b6a2bb727618613703ca0167dd", size = 10291881, upload-time = "2026-05-18T23:35:35.465Z" }, + { url = "https://files.pythonhosted.org/packages/f8/91/3ab2044d05fd16d343c5ac2e69b127f1b2854040dd20b193257c78028bd3/numpy-2.4.6-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:06ca2f61ec4385a07a6977c55ba998a4466c123642b4a32694d3128fce18c079", size = 16683458, upload-time = "2026-05-18T23:35:38.353Z" }, + { url = "https://files.pythonhosted.org/packages/8e/62/764ce66fa4147ae6d73071a3abf804ffe606f174618697c571acdf26a7c9/numpy-2.4.6-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:38efbc8de75c7a0fc1ac190162d892787f3f47b57cc291231aafee36b80982b7", size = 14704559, upload-time = "2026-05-18T23:35:42.14Z" }, + { url = "https://files.pythonhosted.org/packages/60/61/23f27c172f022e04025b7dc2367f4d63c1a398120607ec896228649a6f48/numpy-2.4.6-cp314-cp314-macosx_14_0_arm64.whl", hash = "sha256:d581b735e177fdcdce6fed8e7e8880a3fb6ee4e3653a3ac6af01c6f4c03effc5", size = 5209716, upload-time = "2026-05-18T23:35:45.377Z" }, + { url = "https://files.pythonhosted.org/packages/03/71/21cf70dc6ea3e3acb95fc53a265b2fc248b981f0194ceb5b475271b8809d/numpy-2.4.6-cp314-cp314-macosx_14_0_x86_64.whl", hash = "sha256:0a041d3d761dc3c35cc56ce0351506a02bcbc25f7b169f652435141a17db9096", size = 6543947, upload-time = "2026-05-18T23:35:47.926Z" }, + { url = "https://files.pythonhosted.org/packages/d5/91/64288395ee1799bd2e0b04a305dce9666da90c961e1f3fe982a05ee1c036/numpy-2.4.6-cp314-cp314-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:40fdc1ae7125e518ea98e53e69a4ebc27e1fd50510c47b7ea130cf21e5e1d42b", size = 15685197, upload-time = "2026-05-18T23:35:50.863Z" }, + { url = "https://files.pythonhosted.org/packages/f3/eb/ebffaa97dc55502df69584a8f0dcf07f69a3e0b3e2323670a2722db9aa39/numpy-2.4.6-cp314-cp314-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:a2c306dea656c12c68f51f4cea133cbe78ca7435eb28c735eac1d3ebe73be6e8", size = 16638245, upload-time = "2026-05-18T23:35:54.752Z" }, + { url = "https://files.pythonhosted.org/packages/b8/0b/54f9da33128d7e350fab89c7455902eeae70349ee52bddb448dc4a576f45/numpy-2.4.6-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:33111801a01c12a8a1e3721f0a9232f8cfc8ae2c6b7098167e6f623c6073f402", size = 17036587, upload-time = "2026-05-18T23:35:58.355Z" }, + { url = "https://files.pythonhosted.org/packages/b6/f0/fdebc1052db1cc37c64beb22072d67cd6d1c71adca1299f53dec2b5e20d3/numpy-2.4.6-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:ae506e6902902557576a26ff33eda8695e7ecb3cb36c3b573a0765dee114ebdb", size = 18363226, upload-time = "2026-05-18T23:36:02.845Z" }, + { url = "https://files.pythonhosted.org/packages/aa/b4/298628d98c72b57e57f7165ae6a481a1deaf6f3c28262a6e4c739c275930/numpy-2.4.6-cp314-cp314-win32.whl", hash = "sha256:aaf159caa35993cb1f56fb9b8e4610d35758e7ca005412eb1daa856a78c9c4b1", size = 6010196, upload-time = "2026-05-18T23:36:05.92Z" }, + { url = "https://files.pythonhosted.org/packages/df/ac/46de6dda46478f7942f839e094970be2d4a861e005c4b3bf07c92e291a09/numpy-2.4.6-cp314-cp314-win_amd64.whl", hash = "sha256:b507f5c4c1d508876d1819b6bf9a49d365b96320b5d4993426b33a23ca4b8261", size = 12450334, upload-time = "2026-05-18T23:36:09.107Z" }, + { url = "https://files.pythonhosted.org/packages/78/92/b8b798ac784102c0da830d2257d59358e3d3d90d1e2b3f2575dad976c5cf/numpy-2.4.6-cp314-cp314-win_arm64.whl", hash = "sha256:6f41ae150c4e32db4f3310cdaf64b1593a03dbabe29eec77fc9b50fe64061df6", size = 10495678, upload-time = "2026-05-18T23:36:12.766Z" }, + { url = "https://files.pythonhosted.org/packages/30/34/ec28d1aa8115971537c01469ab2011ee96827930f0a124de1000cc2a7ed7/numpy-2.4.6-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:ece3d2cfe132e7d51f44a832b303895e6f2d499c5e74dfbdb06ee246147a304a", size = 14823672, upload-time = "2026-05-18T23:36:16.473Z" }, + { url = "https://files.pythonhosted.org/packages/16/bd/f6d1fede4e54e8042a7ff97bb495510f3c220f94bcd9e8b228e87c92cc0d/numpy-2.4.6-cp314-cp314t-macosx_14_0_arm64.whl", hash = "sha256:e3e5193ef5a3dc73bceee50f7fdc2c90dbb76c42df8d8fae3d1067a583df579e", size = 5328731, upload-time = "2026-05-18T23:36:19.767Z" }, + { url = "https://files.pythonhosted.org/packages/f4/f0/e105b9e2fd728a9910103884decd6951d9dd73896b914a98d9a231de02ee/numpy-2.4.6-cp314-cp314t-macosx_14_0_x86_64.whl", hash = "sha256:17f9ade344e7d9b464a084d69bcf18fc691cb1db67c62ed80820bf4926d78f0e", size = 6649805, upload-time = "2026-05-18T23:36:22.266Z" }, + { url = "https://files.pythonhosted.org/packages/82/dd/1206a7ca6ab15e3f02069707ca96222e202af681bb73756da7527f3cb837/numpy-2.4.6-cp314-cp314t-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:9cd5ffd25db4e7ba6a375693b3fc0fc1791ec636c17db3720da19bde7180ec43", size = 15730496, upload-time = "2026-05-18T23:36:25.713Z" }, + { url = "https://files.pythonhosted.org/packages/51/e7/38d3ea825dcab85a591734decb2f6c67caa7c8367d374df1a1c3842f9b07/numpy-2.4.6-cp314-cp314t-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:7d92c3819208a60205a12a245c91ad70cb0a85336659b19b834205573ac8456e", size = 16679616, upload-time = "2026-05-18T23:36:29.652Z" }, + { url = "https://files.pythonhosted.org/packages/93/b7/caabfdf53edf663e0b4eb74d7d405d83baef09eb5e83bcd32d601d72b93e/numpy-2.4.6-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:e85b752a1e912b70eaad4fafbd4d1238007ab221de2009b9a2f5ae7461239895", size = 17085145, upload-time = "2026-05-18T23:36:33.449Z" }, + { url = "https://files.pythonhosted.org/packages/f9/45/68d7c33a6bcf3e5aa3bdbd57a367e6f615286dfd6482f97e8ffeb734306e/numpy-2.4.6-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:29cb7f67d10b479ff07c17d33e39f78c07f71c40ef30d63c153d340e96cd3fb4", size = 18403813, upload-time = "2026-05-18T23:36:37.369Z" }, + { url = "https://files.pythonhosted.org/packages/9c/50/0753655aa844c99cd9e018aacf76f130f1bd81d881bb74bc0aef5d73a8ba/numpy-2.4.6-cp314-cp314t-win32.whl", hash = "sha256:260a5d70215b61ab4fadf5c7baacd64821842975eea312125ed3c39a6391b063", size = 6156982, upload-time = "2026-05-18T23:36:40.817Z" }, + { url = "https://files.pythonhosted.org/packages/b2/d4/7c67becf668f973cb490cec3e98dfd799d866f9c989a54d355672cfa0db6/numpy-2.4.6-cp314-cp314t-win_amd64.whl", hash = "sha256:81a1cca95ed5bb92aa8b10dd2cdc9a0d3853a50fad926c28b5d7e8ea54389627", size = 12638908, upload-time = "2026-05-18T23:36:43.996Z" }, + { url = "https://files.pythonhosted.org/packages/43/bb/e1c71a4295b1b1d1393d50dbb4f2a36283c6859d9d3892e84f00ec5a91d5/numpy-2.4.6-cp314-cp314t-win_arm64.whl", hash = "sha256:0c9136e14ed34a9e343a31c533d78a9813a69a3148332bce5e9821cb2f996e66", size = 10565867, upload-time = "2026-05-18T23:36:47.114Z" }, + { url = "https://files.pythonhosted.org/packages/de/12/b422cc84439adc0d00de605bf4a308890ae5c26f2c71fbd73e5d08fbb0dd/numpy-2.4.6-pp311-pypy311_pp73-macosx_10_15_x86_64.whl", hash = "sha256:55cced7c52e981362f708ad635198e97a752dfba412cc03c23bbf3bd8d5cd662", size = 16847511, upload-time = "2026-05-18T23:36:50.673Z" }, + { url = "https://files.pythonhosted.org/packages/44/53/f481bef68011740f8849418d82db07230e825013f31f4eef5ba5b805316a/numpy-2.4.6-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:d6da64deb6b8ed903e7560180a92f2d804ee1ba5eeb849ac2748b8c1aba1f6d7", size = 14889064, upload-time = "2026-05-18T23:36:53.879Z" }, + { url = "https://files.pythonhosted.org/packages/7f/57/42ed575c10ced8af951d426bc4e1f8aff16fd851db33f067036215a7f860/numpy-2.4.6-pp311-pypy311_pp73-macosx_14_0_arm64.whl", hash = "sha256:68a5124b13fa6cc2086764a20005d30bc0548146f7f5322f02fce212ca14317f", size = 5394157, upload-time = "2026-05-18T23:36:57.194Z" }, + { url = "https://files.pythonhosted.org/packages/6a/ef/f66cc724fcc36c1e364c67f51ae9146090b8b584f27d58b97fdae3edd737/numpy-2.4.6-pp311-pypy311_pp73-macosx_14_0_x86_64.whl", hash = "sha256:948424b06129ce883307e8cff868c31396d8dc7630a59c61d70d98dbe70f222c", size = 6708728, upload-time = "2026-05-18T23:36:59.575Z" }, + { url = "https://files.pythonhosted.org/packages/1a/9c/c531f2293b91265d8b48e9b329f54fdd7ffae73cb4134ea10cca4237e9cc/numpy-2.4.6-pp311-pypy311_pp73-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:5dbbdb29840ca3d91ee0fece42fc29278886d908280bfec0a5846c6f901a3eb0", size = 15798374, upload-time = "2026-05-18T23:37:02.674Z" }, + { url = "https://files.pythonhosted.org/packages/1a/b0/413077f6b1153ed3cba361401c6783bbad6114804a000cc22eb71c13e190/numpy-2.4.6-pp311-pypy311_pp73-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:8ad03c0965fb3c692200e74d458ca28c1dbb4ce96f9a479a8aa041ad5fabca02", size = 16747286, upload-time = "2026-05-18T23:37:06.327Z" }, + { url = "https://files.pythonhosted.org/packages/15/ce/e5ec180bc41812edcd8daeb8639d205622c0e8c02259d8ab25a0201b3c2a/numpy-2.4.6-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:2803abfebfc990042cd494d8ce2d5f82e9d847af6d35ec486923aa19dbad5e73", size = 12504263, upload-time = "2026-05-18T23:37:09.715Z" }, +] + +[[package]] +name = "opentelemetry-api" +version = "1.42.1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "typing-extensions" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/b4/1c/125e1c936c0873796771b7f04f6c93b9f1bf5d424cea90fda94a99f61da8/opentelemetry_api-1.42.1.tar.gz", hash = "sha256:56c63bea9f77b62856be8c47600474acad853b2924b99b1687c4cb6297166716", size = 72296, upload-time = "2026-05-21T16:32:49.335Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/a3/ca/9520cc1f3dfbbd03ac5903bbf55833e257bc64b1cf30fa8b0d6df374d821/opentelemetry_api-1.42.1-py3-none-any.whl", hash = "sha256:51a69edacadbc03a8950ace1c4c21099cacc538820ac2c9e36277e78cebba714", size = 61311, upload-time = "2026-05-21T16:32:28.822Z" }, +] + +[[package]] +name = "opentelemetry-exporter-otlp-proto-common" +version = "1.42.1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "opentelemetry-proto" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/0e/9c/216acfeaedadf2e1937f4373929b20f73197c5c4a2546d4f584b7fa63813/opentelemetry_exporter_otlp_proto_common-1.42.1.tar.gz", hash = "sha256:04f1f01fb597c4249dfcd7f8b861c902c2102369d376d9d346ff38de4469a2ee", size = 21433, upload-time = "2026-05-21T16:32:55.526Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/d6/43/2375e7612e1121a4518c17603b6e0b03ad94f565aafad53f464dc5be2bf6/opentelemetry_exporter_otlp_proto_common-1.42.1-py3-none-any.whl", hash = "sha256:f48d395ab815b444da118868977e9798ea354c25737d5cf39578ae894011c140", size = 17327, upload-time = "2026-05-21T16:32:33.387Z" }, +] + +[[package]] +name = "opentelemetry-exporter-otlp-proto-grpc" +version = "1.42.1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "googleapis-common-protos" }, + { name = "grpcio" }, + { name = "opentelemetry-api" }, + { name = "opentelemetry-exporter-otlp-proto-common" }, + { name = "opentelemetry-proto" }, + { name = "opentelemetry-sdk" }, + { name = "typing-extensions" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/87/87/ca7fc790dfdbcf4f9e9aab14a39ef1b7508ead13707e283de0b3131478d2/opentelemetry_exporter_otlp_proto_grpc-1.42.1.tar.gz", hash = "sha256:975c4461f167dd8ed8857d68d3b6b25f3d272eab896f6a9470d0f5b90e2faf15", size = 27140, upload-time = "2026-05-21T16:32:56.162Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/89/2b/28ba5b128f47fe8c3bab541000d6feb4b5a9bd26623ca013406f01c0fb60/opentelemetry_exporter_otlp_proto_grpc-1.42.1-py3-none-any.whl", hash = "sha256:0ae1177e2038b18a929b3098215243631ef91136cba26b7e2b12790ceb7e87cc", size = 19617, upload-time = "2026-05-21T16:32:34.278Z" }, +] + +[[package]] +name = "opentelemetry-instrumentation" +version = "0.63b1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "opentelemetry-api" }, + { name = "opentelemetry-semantic-conventions" }, + { name = "packaging" }, + { name = "wrapt" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/da/6d/4de72d97ff54db1ed270c7a59c9b904b917c0ac7af429c086c388b824ddb/opentelemetry_instrumentation-0.63b1.tar.gz", hash = "sha256:32368d6ae52c8de20aa790a6ad86b10a76f09956092337ae37d675773990e541", size = 41081, upload-time = "2026-05-21T16:36:14.206Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/35/a1/9314e621c143e4d82a5bf7a43c2ff7a745d31023506336857607c8c543cc/opentelemetry_instrumentation-0.63b1-py3-none-any.whl", hash = "sha256:f1986716d52cc316ea5f60189098726a9071d8ecc0eee96c9ed110be08bade9c", size = 35577, upload-time = "2026-05-21T16:34:56.818Z" }, +] + +[[package]] +name = "opentelemetry-instrumentation-asgi" +version = "0.63b1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "asgiref" }, + { name = "opentelemetry-api" }, + { name = "opentelemetry-instrumentation" }, + { name = "opentelemetry-semantic-conventions" }, + { name = "opentelemetry-util-http" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/a0/b5/7ea3a9fd1b80e89786c14250bfaecf32a753c3fd08232690f4da8dc16e29/opentelemetry_instrumentation_asgi-0.63b1.tar.gz", hash = "sha256:267b422416d768f3c7f4054883b41d9c3a7c943d86d20032b738c99a3dbb5862", size = 26151, upload-time = "2026-05-21T16:36:18.368Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/57/7e/83986f27b421de04fab1e1a84e892621dac42e6432a9c66779505f4d1381/opentelemetry_instrumentation_asgi-0.63b1-py3-none-any.whl", hash = "sha256:1a22453dfa965f14799b10a674b8acbcb897a8a75c79136060af54214cc7886e", size = 15906, upload-time = "2026-05-21T16:35:04.162Z" }, +] + +[[package]] +name = "opentelemetry-instrumentation-fastapi" +version = "0.63b1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "opentelemetry-api" }, + { name = "opentelemetry-instrumentation" }, + { name = "opentelemetry-instrumentation-asgi" }, + { name = "opentelemetry-semantic-conventions" }, + { name = "opentelemetry-util-http" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/32/d6/0c128fac2e34b7d526a8d3c6edc45b875a97f8a987861b00511151b6337d/opentelemetry_instrumentation_fastapi-0.63b1.tar.gz", hash = "sha256:cc42dff56c96d0a2921510c4abab2a4c2e27fe64b26dc1254727fb550df100ba", size = 25387, upload-time = "2026-05-21T16:36:32.071Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/b1/3d/2eae63f13f36d7a8ab5bf03d06ecaf169c2069b524547f24947be6d92094/opentelemetry_instrumentation_fastapi-0.63b1-py3-none-any.whl", hash = "sha256:52ee2cde9a2ac094bdd45d79f85860e03a972928a2553006071fe61d94cf7281", size = 12795, upload-time = "2026-05-21T16:35:28.68Z" }, +] + +[[package]] +name = "opentelemetry-instrumentation-pymongo" +version = "0.63b1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "opentelemetry-api" }, + { name = "opentelemetry-instrumentation" }, + { name = "opentelemetry-semantic-conventions" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/06/b2/94c180359165abe62e829250bc6ac6b7daa2334b3c505bad64f1c64f18ab/opentelemetry_instrumentation_pymongo-0.63b1.tar.gz", hash = "sha256:8c0ae185b59dcb45c80bf90d4ffda5fcc6337dbba11de40306ffd69459e476fa", size = 10208, upload-time = "2026-05-21T16:36:41.961Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/04/b9/47b8d0f52d81d7661debebb11f4fdd1ab869d694089711c1ac8988456364/opentelemetry_instrumentation_pymongo-0.63b1-py3-none-any.whl", hash = "sha256:0d8dd55b2522eda4a7093da8b5f47fae9a3235fb2786bc14c161d5999a66320d", size = 10290, upload-time = "2026-05-21T16:35:44.634Z" }, +] + +[[package]] +name = "opentelemetry-proto" +version = "1.42.1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "protobuf" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/b4/55/63eac3e1089b768ba014091fdd2ae8a9a440c821ef5e2b786909c94c8836/opentelemetry_proto-1.42.1.tar.gz", hash = "sha256:c6a51e6b4f05ae63565f3a113217f3d2bfaec68f78c02d7a6c85f9010d1cfca6", size = 45839, upload-time = "2026-05-21T16:33:03.937Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/41/9d/171c02c84a76940b7e601805b3bb536985aded9168fbcc9ba52f0a730fa2/opentelemetry_proto-1.42.1-py3-none-any.whl", hash = "sha256:dedb74cba2886c59c7789b227a7a670613025a07489040050aedff6e5c0fb43c", size = 71782, upload-time = "2026-05-21T16:32:44.867Z" }, +] + +[[package]] +name = "opentelemetry-sdk" +version = "1.42.1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "opentelemetry-api" }, + { name = "opentelemetry-semantic-conventions" }, + { name = "typing-extensions" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/40/f7/b390bd9bfd703bf98a68fea1f27786c6872331fd617164a54b8a59bdc008/opentelemetry_sdk-1.42.1.tar.gz", hash = "sha256:8c834e8f8c9ba4171d4ec843d0cb8a67e4c7394d3f9e9297e582cbd9456ddbf7", size = 239262, upload-time = "2026-05-21T16:33:04.641Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/8f/6b/4287766cfbde577ae2272e8884abac325aeaac0d64f41c61d5b8cc595105/opentelemetry_sdk-1.42.1-py3-none-any.whl", hash = "sha256:083cd4bbfaa5aa7b5a9e552430d9951219967cfb27aa61feb13a77aba1fc839d", size = 170907, upload-time = "2026-05-21T16:32:45.894Z" }, +] + +[[package]] +name = "opentelemetry-semantic-conventions" +version = "0.63b1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "opentelemetry-api" }, + { name = "typing-extensions" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/93/99/4d7dd6df64795951413ce6e815f8cf1eb191daf7196ae86574589643d5f3/opentelemetry_semantic_conventions-0.63b1.tar.gz", hash = "sha256:3daf963611334b365e98a57438183eb012d3bfb40b2d931a9af613476b8701a9", size = 148340, upload-time = "2026-05-21T16:33:05.455Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/cb/7a/7fe66f5f3682b1dd47d88cc4e11f1c6c0966b737de2d16671146e23c39a5/opentelemetry_semantic_conventions-0.63b1-py3-none-any.whl", hash = "sha256:dfe5ef4dee82586b746f522b818ceb298d00b3d59f660042bd79404bff8d0682", size = 203713, upload-time = "2026-05-21T16:32:47.016Z" }, +] + +[[package]] +name = "opentelemetry-util-http" +version = "0.63b1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/6c/d8/7bf5e4cec0578ac3c28c18eb7b88f34279139cbc8c568d6aa02b9c5ae53e/opentelemetry_util_http-0.63b1.tar.gz", hash = "sha256:ba1268f00922ee522dba2ae38458060f99486e7385a8056985901ca9685adfff", size = 11102, upload-time = "2026-05-21T16:36:56.675Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/e5/f1/34e047e8f6a3c67e5220acf1af7b9f62868c25d77791bca74457bd2180a6/opentelemetry_util_http-0.63b1-py3-none-any.whl", hash = "sha256:6284194028c59cd439f8acfe388145069a6127f11dc077e1344a2094adacc3f8", size = 8205, upload-time = "2026-05-21T16:36:09.736Z" }, +] + +[[package]] +name = "orjson" +version = "3.11.9" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/7e/0c/964746fcafbd16f8ff53219ad9f6b412b34f345c75f384ad434ceaadb538/orjson-3.11.9.tar.gz", hash = "sha256:4fef17e1f8722c11587a6ef18e35902450221da0028e65dbaaa543619e68e48f", size = 5599163, upload-time = "2026-05-06T15:11:08.309Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/1e/51/3fb9e65ae76ee97bd611869a503fa3fc0a6e81dd8b737cf3003f682df7ff/orjson-3.11.9-cp311-cp311-macosx_10_15_x86_64.macosx_11_0_arm64.macosx_10_15_universal2.whl", hash = "sha256:f01c4818b3fc9b0da8e096722a84318071eaa118df35f6ed2344da0e73a5444f", size = 228522, upload-time = "2026-05-06T15:09:35.362Z" }, + { url = "https://files.pythonhosted.org/packages/16/fa/9d54b07cb3f3b0bfd57841478e42d7a0ece4a9f49f9907eecf5a45461687/orjson-3.11.9-cp311-cp311-macosx_15_0_arm64.whl", hash = "sha256:3ebca4179031ee716ed076ffadc29428e900512f6fccee8614c9983157fcf19c", size = 128463, upload-time = "2026-05-06T15:09:37.063Z" }, + { url = "https://files.pythonhosted.org/packages/88/b1/6ceafc2eefd0a553e3be77ce6c49d107e772485d9568629376171c50e634/orjson-3.11.9-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:48ee05097750de0ff69ed5b7bbcf0732182fd57a24043dcc2a1da780a5ead3a5", size = 132306, upload-time = "2026-05-06T15:09:38.299Z" }, + { url = "https://files.pythonhosted.org/packages/ea/76/f11311285324a40aab1e3031385c50b635a7cd0734fdaf60c7e89a696f60/orjson-3.11.9-cp311-cp311-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:a6082706765a95a6680d812e1daf1c0cfe8adec7831b3ff3b625693f3b461b1c", size = 127988, upload-time = "2026-05-06T15:09:39.597Z" }, + { url = "https://files.pythonhosted.org/packages/9e/85/0ef63bcf1337f44031ce9b91b1919563f62a37527b3ea4368bb15a22e5d7/orjson-3.11.9-cp311-cp311-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:277fefe9d76ee17eb14debf399e3533d4d63b5f677a4d3719eb763536af1f4bd", size = 135188, upload-time = "2026-05-06T15:09:40.957Z" }, + { url = "https://files.pythonhosted.org/packages/05/94/b0d27090ea8a2095db3c2bd1b1c96f96f19bbb494d7fef33130e846e613d/orjson-3.11.9-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:03db380e3780fa0015ed776a90f20e8e20bb11dde13b216ce19e5718e3dfba62", size = 145937, upload-time = "2026-05-06T15:09:42.249Z" }, + { url = "https://files.pythonhosted.org/packages/09/eb/75d50c29c05b8054013e221e598820a365c8e64065312e75e202ed880709/orjson-3.11.9-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:33d7d766701847dc6729846362dc27895d2f2d2251264f9d10e7cb9878194877", size = 132758, upload-time = "2026-05-06T15:09:43.945Z" }, + { url = "https://files.pythonhosted.org/packages/49/bd/360686f39348aa88827cb6fbf7dc606fd41c831a35235e1abf1db8e3a9e6/orjson-3.11.9-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:147302878da387104b66bb4a8b0227d1d487e976ce41a8501916161072ed87b1", size = 133971, upload-time = "2026-05-06T15:09:45.239Z" }, + { url = "https://files.pythonhosted.org/packages/0e/30/3178eb16f3221aeef068b6f1f1ebe05f656ea5c6dffe9f6c917329fe17a3/orjson-3.11.9-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:3513550321f8c8c811a7c3297b8a630e82dc08e4c10216d07703c997776236cd", size = 141685, upload-time = "2026-05-06T15:09:46.858Z" }, + { url = "https://files.pythonhosted.org/packages/5f/f1/ff2f19ed0225f9680fafa42febca3570dd59444ebf190980738d376214c2/orjson-3.11.9-cp311-cp311-musllinux_1_2_armv7l.whl", hash = "sha256:c5d001196b89fa9cf0a4ab79766cd835b991a166e4b621ba95089edc50c429ff", size = 415167, upload-time = "2026-05-06T15:09:48.312Z" }, + { url = "https://files.pythonhosted.org/packages/9b/61/863bddf0da6e9e586765414debd54b4e58db05f560902b6d00658cb88636/orjson-3.11.9-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:16969c9d369c98eb084889c6e4d2d39b77c7eb38ceccf8da2a9fff62ae908980", size = 147913, upload-time = "2026-05-06T15:09:49.733Z" }, + { url = "https://files.pythonhosted.org/packages/b6/8a/4081492586d75b073d60c5271a8d0f05a0955cabf1e34c8473f6fcd84235/orjson-3.11.9-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:63e0efbc991250c0b3143488fa57d95affcabbfc63c99c48d625dd37779aafe2", size = 136959, upload-time = "2026-05-06T15:09:51.311Z" }, + { url = "https://files.pythonhosted.org/packages/0d/bd/70b6ab193594d7abb875320c0a7c8335e846f28968c432c31042409c3c8d/orjson-3.11.9-cp311-cp311-win32.whl", hash = "sha256:14ed654580c1ed2bc217352ec82f91b047aef82951aa71c7f64e0dcb03c0e180", size = 131533, upload-time = "2026-05-06T15:09:52.637Z" }, + { url = "https://files.pythonhosted.org/packages/3f/17/1a1a228183d62d1b77e2c30d210f47dd4768b310ebe1607c63e3c0e3a71e/orjson-3.11.9-cp311-cp311-win_amd64.whl", hash = "sha256:57ea77fb70a448ce87d18fca050193202a3da5e54598f6501ca5476fb66cfe02", size = 127106, upload-time = "2026-05-06T15:09:54.204Z" }, + { url = "https://files.pythonhosted.org/packages/b8/95/285de5fa296d09681ee9c546cd4a8aeb773b701cf343dc125994f4d52953/orjson-3.11.9-cp311-cp311-win_arm64.whl", hash = "sha256:19b72ed11572a2ee51a67a903afbe5af504f84ed6f529c0fe44b0ab3fb5cc697", size = 126848, upload-time = "2026-05-06T15:09:55.551Z" }, + { url = "https://files.pythonhosted.org/packages/16/6d/11867a3ffa3a3608d84a4de51ef4dd0896d6b5cc9132fbe1daf593e677bc/orjson-3.11.9-cp312-cp312-macosx_10_15_x86_64.macosx_11_0_arm64.macosx_10_15_universal2.whl", hash = "sha256:9ef6fe90aadef185c7b128859f40beb24720b4ecea95379fc9000931179c3a49", size = 228515, upload-time = "2026-05-06T15:09:57.265Z" }, + { url = "https://files.pythonhosted.org/packages/24/75/05912954c8b288f34fcf5cd4b9b071cb4f6e77b9961e175e56ebb258089f/orjson-3.11.9-cp312-cp312-macosx_15_0_arm64.whl", hash = "sha256:e5c9b8f28e726e97d97696c826bc7bea5d71cecd63576dba92924a32c1961291", size = 128409, upload-time = "2026-05-06T15:09:59.063Z" }, + { url = "https://files.pythonhosted.org/packages/ab/86/1c3a47df3bc8191ea9ac51603bbb872a95167a364320c269f2557911f406/orjson-3.11.9-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:26a473dbb4162108b27901492546f83c76fdcea3d0eadff00ae7a07e18dcce09", size = 132106, upload-time = "2026-05-06T15:10:00.798Z" }, + { url = "https://files.pythonhosted.org/packages/d7/cf/b33b5f3e695ae7d63feef9d915c37cc3b8f465493dcd4f8e0b4c697a2366/orjson-3.11.9-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:011382e2a60fda9d46f1cdee31068cfc52ffe952b587d683ec0463002802a0f4", size = 127864, upload-time = "2026-05-06T15:10:02.15Z" }, + { url = "https://files.pythonhosted.org/packages/31/6a/6cf69385a58208024fcb8c014e2141b8ce838aba6492b589f8acfff97fab/orjson-3.11.9-cp312-cp312-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c2d3dc759490128c5c1711a53eeaa8ee1d437fd0038ffd2b6008abf46db3f882", size = 135213, upload-time = "2026-05-06T15:10:03.515Z" }, + { url = "https://files.pythonhosted.org/packages/e8/f8/0b1bd3e8f2efcdd376af5c8cfd79eaf13f018080c0089c80ebd724e3c7fb/orjson-3.11.9-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:d8ea516b3726d190e1b4297e6f4e7a8650347ae053868a18163b4dd3641d1fff", size = 145994, upload-time = "2026-05-06T15:10:05.083Z" }, + { url = "https://files.pythonhosted.org/packages/f3/59/dab79f61044c529d2c81aecdc589b1f833a1c8dec11ba3b1c2498a02ca7e/orjson-3.11.9-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:380cdce7ba24989af81d0a7013d0aaec5d0e2a21734c0e2681b1bc4f141957fe", size = 132744, upload-time = "2026-05-06T15:10:06.853Z" }, + { url = "https://files.pythonhosted.org/packages/0e/a4/82b7a2fe5d8a67a59ed831b24d59a3d46ea7d207b66e1602d376541d94a6/orjson-3.11.9-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:be4fa4f0af7fa18951f7ab3fc2148e223af211bf03f59e1c6034ec3f97f21d61", size = 134014, upload-time = "2026-05-06T15:10:08.213Z" }, + { url = "https://files.pythonhosted.org/packages/50/c7/375e83a76851b73b2e39f3bcf0e5a19e2b89bad13e5bca97d0b293d27f24/orjson-3.11.9-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:a8f5f8bc7ce7d59f08d9f99fa510c06496164a24cb5f3d34537dbd9ca30132e2", size = 141509, upload-time = "2026-05-06T15:10:09.595Z" }, + { url = "https://files.pythonhosted.org/packages/7f/7c/49d5d82a3d3097f641f094f552131f1e2723b0b8cb0fa2874ab65ecfffa6/orjson-3.11.9-cp312-cp312-musllinux_1_2_armv7l.whl", hash = "sha256:4d7fde5501b944f83b3e665e1b31343ff6e154b15560a16b7130ea1e594a4206", size = 415127, upload-time = "2026-05-06T15:10:11.049Z" }, + { url = "https://files.pythonhosted.org/packages/3a/dc/7446c538590d55f455647e5f3c61fc33f7108714e7afcffa6a2a033f8350/orjson-3.11.9-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:cde1a448023ba7d5bb4c01c5afb48894380b5e4956e0627266526587ef4e535f", size = 148025, upload-time = "2026-05-06T15:10:12.842Z" }, + { url = "https://files.pythonhosted.org/packages/df/e5/4d2d8af06f788329b4f78f8cc3679bb395392fcaa1e4d8d3c33e85308fa4/orjson-3.11.9-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:71e63adb0e1f1ed5d9e168f50a91ceb93ae6420731d222dc7da5c69409aa47aa", size = 136943, upload-time = "2026-05-06T15:10:14.405Z" }, + { url = "https://files.pythonhosted.org/packages/06/69/850264ccf6d80f6b174620d30a87f65c9b1490aba33fe6b62798e618cad3/orjson-3.11.9-cp312-cp312-win32.whl", hash = "sha256:2d057a602cdd19a0ad680417527c45b6961a095081c0f46fe0e03e304aac6470", size = 131606, upload-time = "2026-05-06T15:10:15.791Z" }, + { url = "https://files.pythonhosted.org/packages/b9/d5/973a43fc9c55e20f2051e9830997649f669be0cb3ca52192087c0143f118/orjson-3.11.9-cp312-cp312-win_amd64.whl", hash = "sha256:59e403b1cc5a676da8eaf31f6254801b7341b3e29efa85f92b48d272637e77be", size = 127101, upload-time = "2026-05-06T15:10:17.129Z" }, + { url = "https://files.pythonhosted.org/packages/fe/ae/495470f0e4a18f73fa10b7f6b84b464ec4cc5291c4e0c7c2a6c400bef006/orjson-3.11.9-cp312-cp312-win_arm64.whl", hash = "sha256:9af678d6488357948f1f84c6cd1c1d397c014e1ae2f98ae082a44eb48f602624", size = 126736, upload-time = "2026-05-06T15:10:18.645Z" }, + { url = "https://files.pythonhosted.org/packages/32/33/93fcc25907235c344ae73122f8a4e01d2d393ef062b4af7d2e2487a32c37/orjson-3.11.9-cp313-cp313-macosx_10_15_x86_64.macosx_11_0_arm64.macosx_10_15_universal2.whl", hash = "sha256:4bab1b2d6141fe7b32ae71dac905666ece4f94936efbfb13d55bb7739a3a6021", size = 228458, upload-time = "2026-05-06T15:10:20.079Z" }, + { url = "https://files.pythonhosted.org/packages/8f/27/b1e6dadb3c080313c03fdd8067b85e6a0460c7d8d6a1c3984ef77b904e4d/orjson-3.11.9-cp313-cp313-macosx_15_0_arm64.whl", hash = "sha256:844417969855fc7a41be124aafe83dc424592a7f77cd4501900c67307122b92c", size = 128368, upload-time = "2026-05-06T15:10:21.549Z" }, + { url = "https://files.pythonhosted.org/packages/21/0f/c9ede0bf052f6b4051e64a7d4fa91b725cccf8321a6a786e86eb03519f00/orjson-3.11.9-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ffe02797b5e9f3a9d8292ddcd289b474ad13e81ad83cd1891a240811f1d2cb81", size = 132070, upload-time = "2026-05-06T15:10:23.371Z" }, + { url = "https://files.pythonhosted.org/packages/fd/26/d398e28048dc18205bbe812f2c88cb9b40313db2470778e25964796458fe/orjson-3.11.9-cp313-cp313-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:0e4eed3b200023042814d2fc8a5d2e880f13b52e1ed2485e83da4f3962f7dc1a", size = 127892, upload-time = "2026-05-06T15:10:24.714Z" }, + { url = "https://files.pythonhosted.org/packages/66/60/52b0054c4c700d5aa7fc5b7ca96917400d8f061307778578e67a10e25852/orjson-3.11.9-cp313-cp313-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:8aff7da9952a5ad1cef8e68017724d96c7b9a66e99e91d6252e1b133d67a7b10", size = 135217, upload-time = "2026-05-06T15:10:26.084Z" }, + { url = "https://files.pythonhosted.org/packages/d5/97/1e3dc2b2a28b7b2528f403d2fc1d79ec5f39af3bc143ab65d3ec26426385/orjson-3.11.9-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:4d4e98d6f3b8afed8bc8cd9718ec0cdf46661826beefb53fe8eafb37f2bf0362", size = 145980, upload-time = "2026-05-06T15:10:28.062Z" }, + { url = "https://files.pythonhosted.org/packages/fc/39/31fbfe7850f2de32dee7e7e5c09f26d403ab01e440ac96001c6b01ad3c99/orjson-3.11.9-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:3a81d52442a7c99b3662333235b3adf96a1715864658b35bb797212be7bddb97", size = 132738, upload-time = "2026-05-06T15:10:29.727Z" }, + { url = "https://files.pythonhosted.org/packages/a1/08/dca0082dd2a194acb93e5457e73455388e2e2ca464a2672449a9ddbb679d/orjson-3.11.9-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4e39364e726a8fff737309aff059ff67d8a8c8d5b677be7bb49a8b3e84b7e218", size = 134033, upload-time = "2026-05-06T15:10:31.152Z" }, + { url = "https://files.pythonhosted.org/packages/11/d4/5bdb0626801230139987385554c5d4c42255218ac906525bf4347f22cd95/orjson-3.11.9-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:4fd66214623f1b17501df9f0543bef0b833979ab5b6ded1e1d123222866aa8c9", size = 141492, upload-time = "2026-05-06T15:10:32.641Z" }, + { url = "https://files.pythonhosted.org/packages/fa/88/a21fb53b3ede6703aede6dce4710ed4111e5b201cfa6bbff5e544f9d47d7/orjson-3.11.9-cp313-cp313-musllinux_1_2_armv7l.whl", hash = "sha256:8ecc30f10465fa1e0ce13fd01d9e22c316e5053a719a8d915d4545a09a5ff677", size = 415087, upload-time = "2026-05-06T15:10:34.438Z" }, + { url = "https://files.pythonhosted.org/packages/3d/57/1b30daf70f0d8180e9a73cefbfbdd99e4bf19eb020466502b01fba7e0e50/orjson-3.11.9-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:97db4c94a7db398a5bd636273324f0b3fd58b350bbbac8bb380ceb825a9b40f4", size = 148031, upload-time = "2026-05-06T15:10:36.358Z" }, + { url = "https://files.pythonhosted.org/packages/04/83/45fbb6d962e260807f99441db9613cee868ceda4baceda59b3720a563f97/orjson-3.11.9-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:9f78cf8fec5bd627f4082b8dfeac7871b43d7f3274904492a43dab39f18a19a0", size = 136915, upload-time = "2026-05-06T15:10:38.013Z" }, + { url = "https://files.pythonhosted.org/packages/5f/cc/2d10025f9056d376e4127ec05a5808b218d46f035fdc08178a5411b34250/orjson-3.11.9-cp313-cp313-win32.whl", hash = "sha256:d4087e5c0209a0a8efe4de3303c234b9c44d1174161dcd851e8eea07c7560b32", size = 131613, upload-time = "2026-05-06T15:10:39.569Z" }, + { url = "https://files.pythonhosted.org/packages/67/bd/2775ff28bfe883b9aa1ff348300542eb2ef1ee18d8ae0e3a49846817a865/orjson-3.11.9-cp313-cp313-win_amd64.whl", hash = "sha256:051b102c93b4f634e89f3866b07b9a9a98915ada541f4ec30f177067b2694979", size = 127086, upload-time = "2026-05-06T15:10:41.262Z" }, + { url = "https://files.pythonhosted.org/packages/91/2b/d26799e580939e32a7da9a39531bc9e58e15ca32ffaa6a8cb3e9bb0d22cd/orjson-3.11.9-cp313-cp313-win_arm64.whl", hash = "sha256:cce9127885941bd28f080cecf1f1d288336b7e0d812c345b08be88b572796254", size = 126696, upload-time = "2026-05-06T15:10:42.651Z" }, + { url = "https://files.pythonhosted.org/packages/8e/eb/5da01e356015aee6ecfa1187ced87aef51364e306f5e695dd52719bf0e78/orjson-3.11.9-cp314-cp314-macosx_10_15_x86_64.macosx_11_0_arm64.macosx_10_15_universal2.whl", hash = "sha256:b6ef1979adc4bc243523f1a2ba91418030a8e29b0a99cbe7e0e2d6807d4dce6e", size = 228465, upload-time = "2026-05-06T15:10:44.097Z" }, + { url = "https://files.pythonhosted.org/packages/64/62/3e0e0c14c957133bcd855395c62b55ed4e3b0af23ffea11b032cb1dcbdb1/orjson-3.11.9-cp314-cp314-macosx_15_0_arm64.whl", hash = "sha256:f36b7f32c7c0db4a719f1fc5824db4a9c6f8bd1a354debb91faf26ebf3a4c71e", size = 128364, upload-time = "2026-05-06T15:10:45.839Z" }, + { url = "https://files.pythonhosted.org/packages/5a/5a/07d8aa117211a8ed7630bda80c8c0b14d04e0f8dcf99bcf49656e4a710eb/orjson-3.11.9-cp314-cp314-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:08f4d8ebb44925c794e535b2bebc507cebf32209df81de22ae285fb0d8d66de0", size = 132063, upload-time = "2026-05-06T15:10:47.267Z" }, + { url = "https://files.pythonhosted.org/packages/d6/ec/4acaf21483e18aa945be74a474c74b434f284b549f275a0a39b9f98956e9/orjson-3.11.9-cp314-cp314-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:6cc7923789694fd58f001cbcac7e47abc13af4d560ebbfcf3b41a8b1a0748124", size = 122356, upload-time = "2026-05-06T15:10:48.765Z" }, + { url = "https://files.pythonhosted.org/packages/13/d8/5f0555e7638801323b7a75850f92e7dfa891bc84fe27a1ba4449170d1200/orjson-3.11.9-cp314-cp314-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ea5c46eb2d3af39e806b986f4b09d5c2706a1f5afde3cbf7544ce6616127173c", size = 129592, upload-time = "2026-05-06T15:10:50.13Z" }, + { url = "https://files.pythonhosted.org/packages/b6/30/ed9860412a3603ceb3c5955bfd72d28b9d0e7ba6ed81add14f83d7114236/orjson-3.11.9-cp314-cp314-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:f5d89a2ed90731df3be64bab0aa44f78bff39fdc9d71c291f4a8023aa46425b7", size = 140491, upload-time = "2026-05-06T15:10:51.582Z" }, + { url = "https://files.pythonhosted.org/packages/d0/17/adc514dea7ac7c505527febf884934b815d34f0c7b8693c1a8b39c5c4a57/orjson-3.11.9-cp314-cp314-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:25e4aed0312d292c09f61af25bba34e0b2c88546041472b09088c39a4d828af1", size = 127309, upload-time = "2026-05-06T15:10:53.329Z" }, + { url = "https://files.pythonhosted.org/packages/76/3e/c0b690253f0b82d86e99949af13533363acfb5432ecb5d53dd5b3bce9c34/orjson-3.11.9-cp314-cp314-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:aaea64f3f467d22e70eeed68bdccb3bc4f83f650446c4a03c59f2cba28a108db", size = 134030, upload-time = "2026-05-06T15:10:54.988Z" }, + { url = "https://files.pythonhosted.org/packages/c1/7a/bc82a0bb25e9faaf92dc4d9ef002732efc09737706af83e346788641d4a7/orjson-3.11.9-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:a028425d1b440c5d92a6be1e1a020739dfe67ea87d96c6dbe828c1b30041728b", size = 141482, upload-time = "2026-05-06T15:10:56.663Z" }, + { url = "https://files.pythonhosted.org/packages/01/55/e69188b939f77d5d32a9833745ace31ea5ccae3ab613a1ec185d3cd2c4fb/orjson-3.11.9-cp314-cp314-musllinux_1_2_armv7l.whl", hash = "sha256:5b192c6cf397e4455b11523c5cf2b18ed084c1bbd61b6c0926344d2129481972", size = 415178, upload-time = "2026-05-06T15:10:58.446Z" }, + { url = "https://files.pythonhosted.org/packages/2e/1a/b8a5a7ac527e80b9cb11d51e3f6689b709279183264b9ec5c7bc680bb8b5/orjson-3.11.9-cp314-cp314-musllinux_1_2_i686.whl", hash = "sha256:ea407d4ccf5891d667d045fecae97a7a1e5e87b3b97f97ae1803c2e741130be0", size = 148089, upload-time = "2026-05-06T15:11:00.441Z" }, + { url = "https://files.pythonhosted.org/packages/97/4e/00503f64204bf859b37213a63927028f30fb6268cd8677fb0a5ad48155e1/orjson-3.11.9-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:5f63aaf97afd9f6dec5b1a68e1b8da12bfccb4cb9a9a65c3e0b6c847849e7586", size = 136921, upload-time = "2026-05-06T15:11:02.176Z" }, + { url = "https://files.pythonhosted.org/packages/0d/ba/a23b82a0a8d0ed7bed4e5f5035aae751cad4ff6a1e8d2ecd14d8860f5929/orjson-3.11.9-cp314-cp314-win32.whl", hash = "sha256:e30ab17845bb9fa54ccf67fa4f9f5282652d54faa6d17452f47d0f369d038673", size = 131638, upload-time = "2026-05-06T15:11:03.696Z" }, + { url = "https://files.pythonhosted.org/packages/f3/c3/0c6798456bade745c75c452342dabacce5798196483e77e643be1f53877d/orjson-3.11.9-cp314-cp314-win_amd64.whl", hash = "sha256:32ef5f4283a3be81913947d19608eacb7c6608026851123790cd9cc8982af34b", size = 127078, upload-time = "2026-05-06T15:11:05.123Z" }, + { url = "https://files.pythonhosted.org/packages/16/21/5a3f1e8913103b703a436a5664238e5b965ec392b555fe68943ea3691e6b/orjson-3.11.9-cp314-cp314-win_arm64.whl", hash = "sha256:eebdbdeef0094e4f5aefa20dcd4eb2368ab5e7a3b4edea27f1e7b2892e009cf9", size = 126687, upload-time = "2026-05-06T15:11:06.602Z" }, +] + +[[package]] +name = "overrides" +version = "7.7.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/36/86/b585f53236dec60aba864e050778b25045f857e17f6e5ea0ae95fe80edd2/overrides-7.7.0.tar.gz", hash = "sha256:55158fa3d93b98cc75299b1e67078ad9003ca27945c76162c1c0766d6f91820a", size = 22812, upload-time = "2024-01-27T21:01:33.423Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/2c/ab/fc8290c6a4c722e5514d80f62b2dc4c4df1a68a41d1364e625c35990fcf3/overrides-7.7.0-py3-none-any.whl", hash = "sha256:c7ed9d062f78b8e4c1a7b70bd8796b35ead4d9f510227ef9c5dc7626c60d7e49", size = 17832, upload-time = "2024-01-27T21:01:31.393Z" }, +] + +[[package]] +name = "packaging" +version = "26.2" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/d7/f1/e7a6dd94a8d4a5626c03e4e99c87f241ba9e350cd9e6d75123f992427270/packaging-26.2.tar.gz", hash = "sha256:ff452ff5a3e828ce110190feff1178bb1f2ea2281fa2075aadb987c2fb221661", size = 228134, upload-time = "2026-04-24T20:15:23.917Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/df/b2/87e62e8c3e2f4b32e5fe99e0b86d576da1312593b39f47d8ceef365e95ed/packaging-26.2-py3-none-any.whl", hash = "sha256:5fc45236b9446107ff2415ce77c807cee2862cb6fac22b8a73826d0693b0980e", size = 100195, upload-time = "2026-04-24T20:15:22.081Z" }, +] + +[[package]] +name = "palettable" +version = "3.3.3" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/dc/3d/a5854d60850485bff12f28abfe0e17f503e866763bed61aed4990b604530/palettable-3.3.3.tar.gz", hash = "sha256:094dd7d9a5fc1cca4854773e5c1fc6a315b33bd5b3a8f47064928facaf0490a8", size = 106639, upload-time = "2023-04-19T23:13:35.864Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/cf/f7/3367feadd4ab56783b0971c9b7edfbdd68e0c70ce877949a5dd2117ed4a0/palettable-3.3.3-py2.py3-none-any.whl", hash = "sha256:74e9e7d7fe5a9be065e02397558ed1777b2df0b793a6f4ce1a5ee74f74fb0caa", size = 332251, upload-time = "2023-04-19T23:13:33.996Z" }, +] + +[[package]] +name = "pandas" +version = "3.0.3" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "numpy" }, + { name = "python-dateutil" }, + { name = "tzdata", marker = "sys_platform == 'emscripten' or sys_platform == 'win32'" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/f8/87/4341c6252d1c47b08768c3d25ac487362bf403f0313ddae4a2a26c9b1b4c/pandas-3.0.3.tar.gz", hash = "sha256:696a4a00a2a2a35d4e5deb3fc946641b96c944f02230e4f76137fe35d806c4fc", size = 4651414, upload-time = "2026-05-11T18:54:29.21Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/42/16/b5c76b838fd9bf6ce84d3a53346b8874ec05c5f0040d75ef2c320100cd2a/pandas-3.0.3-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:455f6f8139d4282188f526868dbc3c828470e88a3d9d59a891bd46a455f21b98", size = 10338495, upload-time = "2026-05-11T18:52:11.558Z" }, + { url = "https://files.pythonhosted.org/packages/5a/b0/a4ffc4ae74d2d822200dcc46898987d8eb6032d1e2b219cae39da6f5cbcc/pandas-3.0.3-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:4e15135e2ee5df1063313e2425ceef8ac0f4ae775893815b0923651b806a5639", size = 9938250, upload-time = "2026-05-11T18:52:17.005Z" }, + { url = "https://files.pythonhosted.org/packages/2e/b2/3323601a52caee42c019e370090ca4544b241437240ca04f786cce82b0cf/pandas-3.0.3-cp311-cp311-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:05f1f1752b8533ea03f7f39a9c15b1a058d067bb48f4748948e7a8691e0510f2", size = 10770558, upload-time = "2026-05-11T18:52:19.865Z" }, + { url = "https://files.pythonhosted.org/packages/32/f1/bbecd2f867b97abebe0f9b53d750f862251b40337e061b36676ded3d920f/pandas-3.0.3-cp311-cp311-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:8a1e45c80cceb3b4a21bc5939d52e8cbd8d9b7305309219d59e9754d9ce09e27", size = 11274611, upload-time = "2026-05-11T18:52:22.622Z" }, + { url = "https://files.pythonhosted.org/packages/7f/4f/eafabf2d5fae5adf143b4d18d3706c5efdc368a7c4eb1ee8a3eddabbd0f6/pandas-3.0.3-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:14da8316da4d0c5a77618425996bfb1248ca87fc2c1486e6fde4652bd18b5824", size = 11784670, upload-time = "2026-05-11T18:52:25.4Z" }, + { url = "https://files.pythonhosted.org/packages/49/44/1eb20389301b57b19cc099a1c2f662501f72f08a65f912d05822613c1532/pandas-3.0.3-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:a55066a0505dae0ba2b50a46637db34b46f9094c65c5d4800794ef6335010938", size = 12353708, upload-time = "2026-05-11T18:52:28.139Z" }, + { url = "https://files.pythonhosted.org/packages/eb/62/c321f13b5ba1819fc8dca456c7fce578da2dcfecff1abbf0eaddf8406c0f/pandas-3.0.3-cp311-cp311-win_amd64.whl", hash = "sha256:6674ab18ad8c57802867264b00e15e7bb904700cdd9046e3b2fa1fce237439ea", size = 9907609, upload-time = "2026-05-11T18:52:30.982Z" }, + { url = "https://files.pythonhosted.org/packages/53/85/1b7f563ebc6357c27233a02a96b589bcce1fa9c6eb89fb4f0e56421d277e/pandas-3.0.3-cp311-cp311-win_arm64.whl", hash = "sha256:5cc09a68b3120e0f54870dede8287a7bb1fa463907e4fcec1ea77cab6179bf7a", size = 9165596, upload-time = "2026-05-11T18:52:33.334Z" }, + { url = "https://files.pythonhosted.org/packages/24/f1/392f8c5bfc16f66a0d2d41561c01627c228fe7ed2a0d056ef11315042570/pandas-3.0.3-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:fed2ff7fd9779120e388e285fc029bd5cf9490cdd2e4166a9ee22c0e49a9ab09", size = 10357846, upload-time = "2026-05-11T18:52:36.143Z" }, + { url = "https://files.pythonhosted.org/packages/cf/3d/b16412745651e855f357e5e66930248688378853a6e2698a214e331fba1f/pandas-3.0.3-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:b168fc218fd80a6cbdbdbc1a97ddc7889ed057d7eb45f50d866ceab5f39904c4", size = 9899550, upload-time = "2026-05-11T18:52:38.976Z" }, + { url = "https://files.pythonhosted.org/packages/31/a8/fa2535168fffcedf67f4f6de28d2dd903a747ca7c8ea6989451aaeb3a92f/pandas-3.0.3-cp312-cp312-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:0383c72c75cdcca61a9e116e611143902dbfd08bff356829c2f6d1cf40a9ca8c", size = 10412965, upload-time = "2026-05-11T18:52:41.915Z" }, + { url = "https://files.pythonhosted.org/packages/65/b6/09b01cdbc15224e2850365192d17b7bdebb8bdbd8780ed221fcdf0d9a515/pandas-3.0.3-cp312-cp312-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:6dc0b3fd2169c9157deed50b4d519553a3655c8c6a96027136d654592be973a9", size = 10894600, upload-time = "2026-05-11T18:52:45.02Z" }, + { url = "https://files.pythonhosted.org/packages/c9/a4/2eb28f2fccb4ced4a2c79ab2a5dee9ade1ebf44922ebad6fea158c9f95d4/pandas-3.0.3-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:7e65d5407dc0b394f509699650e4a2ec01c0514f21850f453fa60f3be79a5dbf", size = 11422824, upload-time = "2026-05-11T18:52:48.058Z" }, + { url = "https://files.pythonhosted.org/packages/f8/45/830bb57f533a4604b355e07edcb8ea18cf88b5f94e5fca92f27052d7c597/pandas-3.0.3-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:f8894dc474d648fe7b6ff0ca9b0bd73950d19952bc1a6534540762c5d79d305c", size = 11950889, upload-time = "2026-05-11T18:52:50.905Z" }, + { url = "https://files.pythonhosted.org/packages/b9/c5/fc1b368f303087d20e8c9bf3d6ceb186263cfac0ade735cd938538bea839/pandas-3.0.3-cp312-cp312-win_amd64.whl", hash = "sha256:c7be265b62cef88e253a941e4698604973736dcfe242fdb5198f0f7bc473cdcc", size = 9755463, upload-time = "2026-05-11T18:52:53.386Z" }, + { url = "https://files.pythonhosted.org/packages/86/bd/fda8f9705b1b09c6ebe14bfc0fa0e4ec8584d54ea673628f157ff55131af/pandas-3.0.3-cp312-cp312-win_arm64.whl", hash = "sha256:557409bc4178e70ee8d9ddb494798e51ebf6ea59330f6be22c51bab2a7db6c49", size = 9066158, upload-time = "2026-05-11T18:52:56.038Z" }, + { url = "https://files.pythonhosted.org/packages/c5/90/62d8302883c44308c477e222c3daf7c813a34c8e96985882fbd53d964352/pandas-3.0.3-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:67b3b64c11910cfa29f4e94a14d3bff9ee693b6fc76055e7cad549cee0aec5fa", size = 10331071, upload-time = "2026-05-11T18:52:58.838Z" }, + { url = "https://files.pythonhosted.org/packages/7f/ae/6a6493c783a101f165e4356953ba3c74d6f77f0042fa7d753da9dfbb640c/pandas-3.0.3-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:39436b377d56d2a2e52d0395bdbee171f01068e99af5250509aceeb929f765c7", size = 9875690, upload-time = "2026-05-11T18:53:01.431Z" }, + { url = "https://files.pythonhosted.org/packages/62/7c/5df8e9f56c69a2769fbe9382a5ef8f2658c007e376434e1e2cbb57ad895f/pandas-3.0.3-cp313-cp313-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:d4be06d68f9ddcfc645b87534911da79a8fbffc7573c80e0edcf42a5020624d8", size = 10381634, upload-time = "2026-05-11T18:53:04.393Z" }, + { url = "https://files.pythonhosted.org/packages/99/68/1237369725aa617bb358263d535803e3053fdbc593513ec5ed9c9896b5b6/pandas-3.0.3-cp313-cp313-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:a4eeb6830daf35a71cc09649bd823e2b542dac246cdee9614c6e4bd65028cd6a", size = 10891243, upload-time = "2026-05-11T18:53:07.643Z" }, + { url = "https://files.pythonhosted.org/packages/25/93/77d108e8af7222b4a503ebde0e30215b1c2e4f8e53a526431890f22d5586/pandas-3.0.3-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:1928e07221f82db493cd4af1e23c1bfca524a19a4699887975bff68f49a72bfb", size = 11388659, upload-time = "2026-05-11T18:53:10.634Z" }, + { url = "https://files.pythonhosted.org/packages/d0/bd/eff5b4399f332ac386c853f6cd2bd3fa2ca0061b9f36ecd9c4d7c4265649/pandas-3.0.3-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:51b1fe551acb77dac643c6fda86084d8d446c10fe64b06a9cc29c4cc8540e7f2", size = 11942880, upload-time = "2026-05-11T18:53:13.536Z" }, + { url = "https://files.pythonhosted.org/packages/2c/20/559ace4200982c3887d0b86bfd0d856a2143ef8ddab63cc07934951a964c/pandas-3.0.3-cp313-cp313-win_amd64.whl", hash = "sha256:a82d532a3351d435432cd913edbccaf8b8e01d4dd0e5ced5a8d2e8ecd94c7e44", size = 9757091, upload-time = "2026-05-11T18:53:16.306Z" }, + { url = "https://files.pythonhosted.org/packages/3a/66/69055a09fe200f29f922a3eeec4804611900b95f52d932ece3393c3c0c19/pandas-3.0.3-cp313-cp313-win_arm64.whl", hash = "sha256:275c14e0fce14a2ec20eee474aecd305478ea3c1e6f6a9d8fe219a165542717e", size = 9057282, upload-time = "2026-05-11T18:53:18.768Z" }, + { url = "https://files.pythonhosted.org/packages/57/0e/efe801b0e6811e8e650cd21b7f2608e30f08a7067e2bf6e8752b0d56ee3c/pandas-3.0.3-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:46997386d528eb40376ecd6b033cf4a8a1e5282580f68f43de875b78cba2199d", size = 10767016, upload-time = "2026-05-11T18:53:21.227Z" }, + { url = "https://files.pythonhosted.org/packages/ea/dc/eb55135a1d5f0f0519f28da1f609a206d2cad1f9c35c32d51e38dd7261ae/pandas-3.0.3-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:261e308dfb22448384b7580cf719d2f998fe2966c92893c3e77d14008af1f066", size = 10420210, upload-time = "2026-05-11T18:53:23.982Z" }, + { url = "https://files.pythonhosted.org/packages/c6/3e/b1d5d955ce33ffecb407465a60bc32769d74fcf68224b7ae67ae11d4dea4/pandas-3.0.3-cp313-cp313t-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:dd1a5d1def6a46002e964510bdc67c368aa0951df5d1d9f8365336f5a1f490cd", size = 10336126, upload-time = "2026-05-11T18:53:26.731Z" }, + { url = "https://files.pythonhosted.org/packages/f5/76/a01261711ab60a22d71b862f0de20e4c504bf80457270ad8cb42110f6abc/pandas-3.0.3-cp313-cp313t-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:d72828c20c6d6e83e1e22a6a3b47b326b71664112fa9705dcbccfd7a39b62085", size = 10728051, upload-time = "2026-05-11T18:53:29.125Z" }, + { url = "https://files.pythonhosted.org/packages/e9/21/ea191195e587b18cf682e97f433f81b2d0fbe341380e80a3e0d6e4403c8e/pandas-3.0.3-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:d26cbe1fcfc12e8fd900e2454163e466b2d3af84f7c75481df7683ffc073d870", size = 11350796, upload-time = "2026-05-11T18:53:32.056Z" }, + { url = "https://files.pythonhosted.org/packages/64/69/f0eaaf54939f0e8c6768fd06be9af2cef9b36048b96dfb9e1b2c685a807e/pandas-3.0.3-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:3e91cec1879ada0624fc3dc9953c5cbd60208e59c0db28f540c5d6d47502422f", size = 11799741, upload-time = "2026-05-11T18:53:34.985Z" }, + { url = "https://files.pythonhosted.org/packages/45/a4/865e0e510cae5fc2194de4db28be638952de942571ba9125934fd9c01d47/pandas-3.0.3-cp313-cp313t-win_amd64.whl", hash = "sha256:08d789b41f87e0905880e293cedf6197ce71fe67cc081358b1e148a491b9bd13", size = 10499958, upload-time = "2026-05-11T18:53:37.857Z" }, + { url = "https://files.pythonhosted.org/packages/86/54/effdcc3c0ff7a08037889200e148ebe94c16c4f653be078c7b3675955df1/pandas-3.0.3-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:3650109c0f22879df8bd6179ab9ee3d7f1d1d4e7e0094a3f0032d9f51e2e64ac", size = 10336065, upload-time = "2026-05-11T18:53:41.099Z" }, + { url = "https://files.pythonhosted.org/packages/68/10/bf2d6738d72748b961a3751ab89522d58c54efc36a8e1a12161216cd45cf/pandas-3.0.3-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:bab900348131a7db1f69a7309ef141fd5680f1487094193bcbbb61791573bf8f", size = 9926101, upload-time = "2026-05-11T18:53:43.515Z" }, + { url = "https://files.pythonhosted.org/packages/ae/e9/e35cf11c8a136e757b956f5f0efdcaa50aecde85ea055f1898dfc68262f3/pandas-3.0.3-cp314-cp314-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:ba7e08b9ac1d54569cd1e256e3668975ed624d6826f7b68df0342b012007bddb", size = 10457553, upload-time = "2026-05-11T18:53:46.394Z" }, + { url = "https://files.pythonhosted.org/packages/58/3b/1cdec6772bdbaf7b25dab360c59f03cadf05492dd724c6540af905389b07/pandas-3.0.3-cp314-cp314-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:9d71c63ae4ebdbf70209742096f1fc46a83a0613c99d4b23766cced9ff8cd62a", size = 10914065, upload-time = "2026-05-11T18:53:49.134Z" }, + { url = "https://files.pythonhosted.org/packages/c4/c2/1ef644445fcd72e3627bceec77e3560636f87ddce4ed841afe76b83b5bf9/pandas-3.0.3-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:e3a2ec42c98ffa2565a67e08e218d06d72576d758d90facb7c00805194d8f360", size = 11459188, upload-time = "2026-05-11T18:53:52.527Z" }, + { url = "https://files.pythonhosted.org/packages/7e/49/4d8d4f42cbc9c4adc7a1870f269c02cbd6cd40d059622c06fb298addcbad/pandas-3.0.3-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:335f62418ed562cfc3c49e9e196375c28b729dcef8543abf4f9438e381bf3c76", size = 11982966, upload-time = "2026-05-11T18:53:55.043Z" }, + { url = "https://files.pythonhosted.org/packages/38/55/792619469bab9882d8bbd5865d45a72f6478762d04a9af4bf0d08c503e95/pandas-3.0.3-cp314-cp314-win_amd64.whl", hash = "sha256:3c20a521bbb85902f79f7270c80a59e1b5452d96d170c034f207181870f97ac5", size = 9876755, upload-time = "2026-05-11T18:53:58.067Z" }, + { url = "https://files.pythonhosted.org/packages/2a/af/33c469653b0ba03b50c3a98192d4c07f0c75c66b263ceb097fce0ee97d31/pandas-3.0.3-cp314-cp314-win_arm64.whl", hash = "sha256:a2d2dff8a04f3917b55ab3910c32990f8ddf7eceba114947838cefa976a68977", size = 9198658, upload-time = "2026-05-11T18:54:00.733Z" }, + { url = "https://files.pythonhosted.org/packages/a2/fa/b8c257bd76b8bd060c3a9151c1fca05e9b9c5e3af5d0f549c0356f6d143d/pandas-3.0.3-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:0d589105b3c14645af1738ff279b2995102d8f7a03b0a66dc8d95550eb513e04", size = 10787242, upload-time = "2026-05-11T18:54:03.564Z" }, + { url = "https://files.pythonhosted.org/packages/54/eb/f19206ffb0bf1919002969aa448b4702c6594845156a6f8050674855aac3/pandas-3.0.3-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:13fc1e853d9e04743d11ba75a985ccbc2a317fe07d8af61e445a6fd24dacd6a6", size = 10436369, upload-time = "2026-05-11T18:54:06.311Z" }, + { url = "https://files.pythonhosted.org/packages/fd/24/c7c39fb4fe22b71a0c2d78bf0c585c600092d85f94f086d2b3b2f6ca27e2/pandas-3.0.3-cp314-cp314t-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:819959dab7bbd0049c15623fbac4e29a191b9528160a61fb1032242d8ced2d9c", size = 10358306, upload-time = "2026-05-11T18:54:09.085Z" }, + { url = "https://files.pythonhosted.org/packages/16/ec/dd2a9eb7fa1204df88c0864164e35b228ac581062ac612ba0a67fd812e4c/pandas-3.0.3-cp314-cp314t-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:60ae316d3fd75d1858d450d0db0103ea2be3e7d4a95ec2f064f7e2ae63f7b028", size = 10758394, upload-time = "2026-05-11T18:54:11.956Z" }, + { url = "https://files.pythonhosted.org/packages/95/6e/00c61ea8e85b4f6d8d35e11852a1a4998fc7fafc91c6a602d1cc9c972d64/pandas-3.0.3-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:bd3a518890b400d32f9023722dc9a9a5c969f00b415419a3c06c043f09bb5d7d", size = 11375717, upload-time = "2026-05-11T18:54:14.539Z" }, + { url = "https://files.pythonhosted.org/packages/31/89/8fc1c268969fac43688d65fd92e67df24bd128d53cb4d2eee534cd307399/pandas-3.0.3-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:9c39be2d709d01fa972a0cabc522389fceca4f3969332ba25a7d6c5802cf976a", size = 11828897, upload-time = "2026-05-11T18:54:17.146Z" }, + { url = "https://files.pythonhosted.org/packages/56/3b/e7d20dea247a3e6dc0bd8a6953854afbedc03951def4e7371e05e7263e25/pandas-3.0.3-cp314-cp314t-win_amd64.whl", hash = "sha256:4db8c527972a821cf5286b40ccc57642a39bc62e62022b42f99f8a67fca8c3a1", size = 10900855, upload-time = "2026-05-11T18:54:19.72Z" }, + { url = "https://files.pythonhosted.org/packages/0f/54/68a0978d1ef8502b8492099beaa6e7a0c1b32e3b5d4f677f5810cb08711c/pandas-3.0.3-cp314-cp314t-win_arm64.whl", hash = "sha256:b2c95f8bfc1ee412bf482605d7bfd30c12d1d26bd59fdd91efeef1d4718decb1", size = 9466464, upload-time = "2026-05-11T18:54:22.754Z" }, +] + +[[package]] +name = "pandocfilters" +version = "1.5.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/70/6f/3dd4940bbe001c06a65f88e36bad298bc7a0de5036115639926b0c5c0458/pandocfilters-1.5.1.tar.gz", hash = "sha256:002b4a555ee4ebc03f8b66307e287fa492e4a77b4ea14d3f934328297bb4939e", size = 8454, upload-time = "2024-01-18T20:08:13.726Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/ef/af/4fbc8cab944db5d21b7e2a5b8e9211a03a79852b1157e2c102fcc61ac440/pandocfilters-1.5.1-py2.py3-none-any.whl", hash = "sha256:93be382804a9cdb0a7267585f157e5d1731bbe5545a85b268d6f5fe6232de2bc", size = 8663, upload-time = "2024-01-18T20:08:11.28Z" }, +] + +[[package]] +name = "parso" +version = "0.8.7" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/30/4b/90c937815137d43ce71ba043cd3566221e9df6b9c805f24b5d138c9d40a7/parso-0.8.7.tar.gz", hash = "sha256:eaaac4c9fdd5e9e8852dc778d2d7405897ec510f2a298071453e5e3a07914bb1", size = 401824, upload-time = "2026-05-01T23:13:02.138Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/99/5d/8268b644392ee874ee82a635cd0df1773de230bde356c38de28e298392cc/parso-0.8.7-py2.py3-none-any.whl", hash = "sha256:a8926eb2a1b915486941fdbd31e86a4baf88fe8c210f25f2f35ecec5b574ca1c", size = 107025, upload-time = "2026-05-01T23:12:58.867Z" }, +] + +[[package]] +name = "pexpect" +version = "4.9.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "ptyprocess", marker = "sys_platform != 'win32'" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/42/92/cc564bf6381ff43ce1f4d06852fc19a2f11d180f23dc32d9588bee2f149d/pexpect-4.9.0.tar.gz", hash = "sha256:ee7d41123f3c9911050ea2c2dac107568dc43b2d3b0c7557a33212c398ead30f", size = 166450, upload-time = "2023-11-25T09:07:26.339Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/9e/c3/059298687310d527a58bb01f3b1965787ee3b40dce76752eda8b44e9a2c5/pexpect-4.9.0-py2.py3-none-any.whl", hash = "sha256:7236d1e080e4936be2dc3e326cec0af72acf9212a7e1d060210e70a47e253523", size = 63772, upload-time = "2023-11-25T06:56:14.81Z" }, +] + +[[package]] +name = "pillow" +version = "12.2.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/8c/21/c2bcdd5906101a30244eaffc1b6e6ce71a31bd0742a01eb89e660ebfac2d/pillow-12.2.0.tar.gz", hash = "sha256:a830b1a40919539d07806aa58e1b114df53ddd43213d9c8b75847eee6c0182b5", size = 46987819, upload-time = "2026-04-01T14:46:17.687Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/68/e1/748f5663efe6edcfc4e74b2b93edfb9b8b99b67f21a854c3ae416500a2d9/pillow-12.2.0-cp311-cp311-macosx_10_10_x86_64.whl", hash = "sha256:8be29e59487a79f173507c30ddf57e733a357f67881430449bb32614075a40ab", size = 5354347, upload-time = "2026-04-01T14:42:44.255Z" }, + { url = "https://files.pythonhosted.org/packages/47/a1/d5ff69e747374c33a3b53b9f98cca7889fce1fd03d79cdc4e1bccc6c5a87/pillow-12.2.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:71cde9a1e1551df7d34a25462fc60325e8a11a82cc2e2f54578e5e9a1e153d65", size = 4695873, upload-time = "2026-04-01T14:42:46.452Z" }, + { url = "https://files.pythonhosted.org/packages/df/21/e3fbdf54408a973c7f7f89a23b2cb97a7ef30c61ab4142af31eee6aebc88/pillow-12.2.0-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:f490f9368b6fc026f021db16d7ec2fbf7d89e2edb42e8ec09d2c60505f5729c7", size = 6280168, upload-time = "2026-04-01T14:42:49.228Z" }, + { url = "https://files.pythonhosted.org/packages/d3/f1/00b7278c7dd52b17ad4329153748f87b6756ec195ff786c2bdf12518337d/pillow-12.2.0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:8bd7903a5f2a4545f6fd5935c90058b89d30045568985a71c79f5fd6edf9b91e", size = 8088188, upload-time = "2026-04-01T14:42:51.735Z" }, + { url = "https://files.pythonhosted.org/packages/ad/cf/220a5994ef1b10e70e85748b75649d77d506499352be135a4989c957b701/pillow-12.2.0-cp311-cp311-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:3997232e10d2920a68d25191392e3a4487d8183039e1c74c2297f00ed1c50705", size = 6394401, upload-time = "2026-04-01T14:42:54.343Z" }, + { url = "https://files.pythonhosted.org/packages/e9/bd/e51a61b1054f09437acfbc2ff9106c30d1eb76bc1453d428399946781253/pillow-12.2.0-cp311-cp311-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:e74473c875d78b8e9d5da2a70f7099549f9eb37ded4e2f6a463e60125bccd176", size = 7079655, upload-time = "2026-04-01T14:42:56.954Z" }, + { url = "https://files.pythonhosted.org/packages/6b/3d/45132c57d5fb4b5744567c3817026480ac7fc3ce5d4c47902bc0e7f6f853/pillow-12.2.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:56a3f9c60a13133a98ecff6197af34d7824de9b7b38c3654861a725c970c197b", size = 6503105, upload-time = "2026-04-01T14:42:59.847Z" }, + { url = "https://files.pythonhosted.org/packages/7d/2e/9df2fc1e82097b1df3dce58dc43286aa01068e918c07574711fcc53e6fb4/pillow-12.2.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:90e6f81de50ad6b534cab6e5aef77ff6e37722b2f5d908686f4a5c9eba17a909", size = 7203402, upload-time = "2026-04-01T14:43:02.664Z" }, + { url = "https://files.pythonhosted.org/packages/bd/2e/2941e42858ebb67e50ae741473de81c2984e6eff7b397017623c676e2e8d/pillow-12.2.0-cp311-cp311-win32.whl", hash = "sha256:8c984051042858021a54926eb597d6ee3012393ce9c181814115df4c60b9a808", size = 6378149, upload-time = "2026-04-01T14:43:05.274Z" }, + { url = "https://files.pythonhosted.org/packages/69/42/836b6f3cd7f3e5fa10a1f1a5420447c17966044c8fbf589cc0452d5502db/pillow-12.2.0-cp311-cp311-win_amd64.whl", hash = "sha256:6e6b2a0c538fc200b38ff9eb6628228b77908c319a005815f2dde585a0664b60", size = 7082626, upload-time = "2026-04-01T14:43:08.557Z" }, + { url = "https://files.pythonhosted.org/packages/c2/88/549194b5d6f1f494b485e493edc6693c0a16f4ada488e5bd974ed1f42fad/pillow-12.2.0-cp311-cp311-win_arm64.whl", hash = "sha256:9a8a34cc89c67a65ea7437ce257cea81a9dad65b29805f3ecee8c8fe8ff25ffe", size = 2463531, upload-time = "2026-04-01T14:43:10.743Z" }, + { url = "https://files.pythonhosted.org/packages/58/be/7482c8a5ebebbc6470b3eb791812fff7d5e0216c2be3827b30b8bb6603ed/pillow-12.2.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:2d192a155bbcec180f8564f693e6fd9bccff5a7af9b32e2e4bf8c9c69dbad6b5", size = 5308279, upload-time = "2026-04-01T14:43:13.246Z" }, + { url = "https://files.pythonhosted.org/packages/d8/95/0a351b9289c2b5cbde0bacd4a83ebc44023e835490a727b2a3bd60ddc0f4/pillow-12.2.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:f3f40b3c5a968281fd507d519e444c35f0ff171237f4fdde090dd60699458421", size = 4695490, upload-time = "2026-04-01T14:43:15.584Z" }, + { url = "https://files.pythonhosted.org/packages/de/af/4e8e6869cbed569d43c416fad3dc4ecb944cb5d9492defaed89ddd6fe871/pillow-12.2.0-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:03e7e372d5240cc23e9f07deca4d775c0817bffc641b01e9c3af208dbd300987", size = 6284462, upload-time = "2026-04-01T14:43:18.268Z" }, + { url = "https://files.pythonhosted.org/packages/e9/9e/c05e19657fd57841e476be1ab46c4d501bffbadbafdc31a6d665f8b737b6/pillow-12.2.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:b86024e52a1b269467a802258c25521e6d742349d760728092e1bc2d135b4d76", size = 8094744, upload-time = "2026-04-01T14:43:20.716Z" }, + { url = "https://files.pythonhosted.org/packages/2b/54/1789c455ed10176066b6e7e6da1b01e50e36f94ba584dc68d9eebfe9156d/pillow-12.2.0-cp312-cp312-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:7371b48c4fa448d20d2714c9a1f775a81155050d383333e0a6c15b1123dda005", size = 6398371, upload-time = "2026-04-01T14:43:23.443Z" }, + { url = "https://files.pythonhosted.org/packages/43/e3/fdc657359e919462369869f1c9f0e973f353f9a9ee295a39b1fea8ee1a77/pillow-12.2.0-cp312-cp312-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:62f5409336adb0663b7caa0da5c7d9e7bdbaae9ce761d34669420c2a801b2780", size = 7087215, upload-time = "2026-04-01T14:43:26.758Z" }, + { url = "https://files.pythonhosted.org/packages/8b/f8/2f6825e441d5b1959d2ca5adec984210f1ec086435b0ed5f52c19b3b8a6e/pillow-12.2.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:01afa7cf67f74f09523699b4e88c73fb55c13346d212a59a2db1f86b0a63e8c5", size = 6509783, upload-time = "2026-04-01T14:43:29.56Z" }, + { url = "https://files.pythonhosted.org/packages/67/f9/029a27095ad20f854f9dba026b3ea6428548316e057e6fc3545409e86651/pillow-12.2.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:fc3d34d4a8fbec3e88a79b92e5465e0f9b842b628675850d860b8bd300b159f5", size = 7212112, upload-time = "2026-04-01T14:43:32.091Z" }, + { url = "https://files.pythonhosted.org/packages/be/42/025cfe05d1be22dbfdb4f264fe9de1ccda83f66e4fc3aac94748e784af04/pillow-12.2.0-cp312-cp312-win32.whl", hash = "sha256:58f62cc0f00fd29e64b29f4fd923ffdb3859c9f9e6105bfc37ba1d08994e8940", size = 6378489, upload-time = "2026-04-01T14:43:34.601Z" }, + { url = "https://files.pythonhosted.org/packages/5d/7b/25a221d2c761c6a8ae21bfa3874988ff2583e19cf8a27bf2fee358df7942/pillow-12.2.0-cp312-cp312-win_amd64.whl", hash = "sha256:7f84204dee22a783350679a0333981df803dac21a0190d706a50475e361c93f5", size = 7084129, upload-time = "2026-04-01T14:43:37.213Z" }, + { url = "https://files.pythonhosted.org/packages/10/e1/542a474affab20fd4a0f1836cb234e8493519da6b76899e30bcc5d990b8b/pillow-12.2.0-cp312-cp312-win_arm64.whl", hash = "sha256:af73337013e0b3b46f175e79492d96845b16126ddf79c438d7ea7ff27783a414", size = 2463612, upload-time = "2026-04-01T14:43:39.421Z" }, + { url = "https://files.pythonhosted.org/packages/4a/01/53d10cf0dbad820a8db274d259a37ba50b88b24768ddccec07355382d5ad/pillow-12.2.0-cp313-cp313-ios_13_0_arm64_iphoneos.whl", hash = "sha256:8297651f5b5679c19968abefd6bb84d95fe30ef712eb1b2d9b2d31ca61267f4c", size = 4100837, upload-time = "2026-04-01T14:43:41.506Z" }, + { url = "https://files.pythonhosted.org/packages/0f/98/f3a6657ecb698c937f6c76ee564882945f29b79bad496abcba0e84659ec5/pillow-12.2.0-cp313-cp313-ios_13_0_arm64_iphonesimulator.whl", hash = "sha256:50d8520da2a6ce0af445fa6d648c4273c3eeefbc32d7ce049f22e8b5c3daecc2", size = 4176528, upload-time = "2026-04-01T14:43:43.773Z" }, + { url = "https://files.pythonhosted.org/packages/69/bc/8986948f05e3ea490b8442ea1c1d4d990b24a7e43d8a51b2c7d8b1dced36/pillow-12.2.0-cp313-cp313-ios_13_0_x86_64_iphonesimulator.whl", hash = "sha256:766cef22385fa1091258ad7e6216792b156dc16d8d3fa607e7545b2b72061f1c", size = 3640401, upload-time = "2026-04-01T14:43:45.87Z" }, + { url = "https://files.pythonhosted.org/packages/34/46/6c717baadcd62bc8ed51d238d521ab651eaa74838291bda1f86fe1f864c9/pillow-12.2.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:5d2fd0fa6b5d9d1de415060363433f28da8b1526c1c129020435e186794b3795", size = 5308094, upload-time = "2026-04-01T14:43:48.438Z" }, + { url = "https://files.pythonhosted.org/packages/71/43/905a14a8b17fdb1ccb58d282454490662d2cb89a6bfec26af6d3520da5ec/pillow-12.2.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:56b25336f502b6ed02e889f4ece894a72612fe885889a6e8c4c80239ff6e5f5f", size = 4695402, upload-time = "2026-04-01T14:43:51.292Z" }, + { url = "https://files.pythonhosted.org/packages/73/dd/42107efcb777b16fa0393317eac58f5b5cf30e8392e266e76e51cff28c3d/pillow-12.2.0-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:f1c943e96e85df3d3478f7b691f229887e143f81fedab9b20205349ab04d73ed", size = 6280005, upload-time = "2026-04-01T14:43:54.242Z" }, + { url = "https://files.pythonhosted.org/packages/a8/68/b93e09e5e8549019e61acf49f65b1a8530765a7f812c77a7461bca7e4494/pillow-12.2.0-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:03f6fab9219220f041c74aeaa2939ff0062bd5c364ba9ce037197f4c6d498cd9", size = 8090669, upload-time = "2026-04-01T14:43:57.335Z" }, + { url = "https://files.pythonhosted.org/packages/4b/6e/3ccb54ce8ec4ddd1accd2d89004308b7b0b21c4ac3d20fa70af4760a4330/pillow-12.2.0-cp313-cp313-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:5cdfebd752ec52bf5bb4e35d9c64b40826bc5b40a13df7c3cda20a2c03a0f5ed", size = 6395194, upload-time = "2026-04-01T14:43:59.864Z" }, + { url = "https://files.pythonhosted.org/packages/67/ee/21d4e8536afd1a328f01b359b4d3997b291ffd35a237c877b331c1c3b71c/pillow-12.2.0-cp313-cp313-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:eedf4b74eda2b5a4b2b2fb4c006d6295df3bf29e459e198c90ea48e130dc75c3", size = 7082423, upload-time = "2026-04-01T14:44:02.74Z" }, + { url = "https://files.pythonhosted.org/packages/78/5f/e9f86ab0146464e8c133fe85df987ed9e77e08b29d8d35f9f9f4d6f917ba/pillow-12.2.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:00a2865911330191c0b818c59103b58a5e697cae67042366970a6b6f1b20b7f9", size = 6505667, upload-time = "2026-04-01T14:44:05.381Z" }, + { url = "https://files.pythonhosted.org/packages/ed/1e/409007f56a2fdce61584fd3acbc2bbc259857d555196cedcadc68c015c82/pillow-12.2.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:1e1757442ed87f4912397c6d35a0db6a7b52592156014706f17658ff58bbf795", size = 7208580, upload-time = "2026-04-01T14:44:08.39Z" }, + { url = "https://files.pythonhosted.org/packages/23/c4/7349421080b12fb35414607b8871e9534546c128a11965fd4a7002ccfbee/pillow-12.2.0-cp313-cp313-win32.whl", hash = "sha256:144748b3af2d1b358d41286056d0003f47cb339b8c43a9ea42f5fea4d8c66b6e", size = 6375896, upload-time = "2026-04-01T14:44:11.197Z" }, + { url = "https://files.pythonhosted.org/packages/3f/82/8a3739a5e470b3c6cbb1d21d315800d8e16bff503d1f16b03a4ec3212786/pillow-12.2.0-cp313-cp313-win_amd64.whl", hash = "sha256:390ede346628ccc626e5730107cde16c42d3836b89662a115a921f28440e6a3b", size = 7081266, upload-time = "2026-04-01T14:44:13.947Z" }, + { url = "https://files.pythonhosted.org/packages/c3/25/f968f618a062574294592f668218f8af564830ccebdd1fa6200f598e65c5/pillow-12.2.0-cp313-cp313-win_arm64.whl", hash = "sha256:8023abc91fba39036dbce14a7d6535632f99c0b857807cbbbf21ecc9f4717f06", size = 2463508, upload-time = "2026-04-01T14:44:16.312Z" }, + { url = "https://files.pythonhosted.org/packages/4d/a4/b342930964e3cb4dce5038ae34b0eab4653334995336cd486c5a8c25a00c/pillow-12.2.0-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:042db20a421b9bafecc4b84a8b6e444686bd9d836c7fd24542db3e7df7baad9b", size = 5309927, upload-time = "2026-04-01T14:44:18.89Z" }, + { url = "https://files.pythonhosted.org/packages/9f/de/23198e0a65a9cf06123f5435a5d95cea62a635697f8f03d134d3f3a96151/pillow-12.2.0-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:dd025009355c926a84a612fecf58bb315a3f6814b17ead51a8e48d3823d9087f", size = 4698624, upload-time = "2026-04-01T14:44:21.115Z" }, + { url = "https://files.pythonhosted.org/packages/01/a6/1265e977f17d93ea37aa28aa81bad4fa597933879fac2520d24e021c8da3/pillow-12.2.0-cp313-cp313t-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:88ddbc66737e277852913bd1e07c150cc7bb124539f94c4e2df5344494e0a612", size = 6321252, upload-time = "2026-04-01T14:44:23.663Z" }, + { url = "https://files.pythonhosted.org/packages/3c/83/5982eb4a285967baa70340320be9f88e57665a387e3a53a7f0db8231a0cd/pillow-12.2.0-cp313-cp313t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:d362d1878f00c142b7e1a16e6e5e780f02be8195123f164edf7eddd911eefe7c", size = 8126550, upload-time = "2026-04-01T14:44:26.772Z" }, + { url = "https://files.pythonhosted.org/packages/4e/48/6ffc514adce69f6050d0753b1a18fd920fce8cac87620d5a31231b04bfc5/pillow-12.2.0-cp313-cp313t-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:2c727a6d53cb0018aadd8018c2b938376af27914a68a492f59dfcaca650d5eea", size = 6433114, upload-time = "2026-04-01T14:44:29.615Z" }, + { url = "https://files.pythonhosted.org/packages/36/a3/f9a77144231fb8d40ee27107b4463e205fa4677e2ca2548e14da5cf18dce/pillow-12.2.0-cp313-cp313t-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:efd8c21c98c5cc60653bcb311bef2ce0401642b7ce9d09e03a7da87c878289d4", size = 7115667, upload-time = "2026-04-01T14:44:32.773Z" }, + { url = "https://files.pythonhosted.org/packages/c1/fc/ac4ee3041e7d5a565e1c4fd72a113f03b6394cc72ab7089d27608f8aaccb/pillow-12.2.0-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:9f08483a632889536b8139663db60f6724bfcb443c96f1b18855860d7d5c0fd4", size = 6538966, upload-time = "2026-04-01T14:44:35.252Z" }, + { url = "https://files.pythonhosted.org/packages/c0/a8/27fb307055087f3668f6d0a8ccb636e7431d56ed0750e07a60547b1e083e/pillow-12.2.0-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:dac8d77255a37e81a2efcbd1fc05f1c15ee82200e6c240d7e127e25e365c39ea", size = 7238241, upload-time = "2026-04-01T14:44:37.875Z" }, + { url = "https://files.pythonhosted.org/packages/ad/4b/926ab182c07fccae9fcb120043464e1ff1564775ec8864f21a0ebce6ac25/pillow-12.2.0-cp313-cp313t-win32.whl", hash = "sha256:ee3120ae9dff32f121610bb08e4313be87e03efeadfc6c0d18f89127e24d0c24", size = 6379592, upload-time = "2026-04-01T14:44:40.336Z" }, + { url = "https://files.pythonhosted.org/packages/c2/c4/f9e476451a098181b30050cc4c9a3556b64c02cf6497ea421ac047e89e4b/pillow-12.2.0-cp313-cp313t-win_amd64.whl", hash = "sha256:325ca0528c6788d2a6c3d40e3568639398137346c3d6e66bb61db96b96511c98", size = 7085542, upload-time = "2026-04-01T14:44:43.251Z" }, + { url = "https://files.pythonhosted.org/packages/00/a4/285f12aeacbe2d6dc36c407dfbbe9e96d4a80b0fb710a337f6d2ad978c75/pillow-12.2.0-cp313-cp313t-win_arm64.whl", hash = "sha256:2e5a76d03a6c6dcef67edabda7a52494afa4035021a79c8558e14af25313d453", size = 2465765, upload-time = "2026-04-01T14:44:45.996Z" }, + { url = "https://files.pythonhosted.org/packages/bf/98/4595daa2365416a86cb0d495248a393dfc84e96d62ad080c8546256cb9c0/pillow-12.2.0-cp314-cp314-ios_13_0_arm64_iphoneos.whl", hash = "sha256:3adc9215e8be0448ed6e814966ecf3d9952f0ea40eb14e89a102b87f450660d8", size = 4100848, upload-time = "2026-04-01T14:44:48.48Z" }, + { url = "https://files.pythonhosted.org/packages/0b/79/40184d464cf89f6663e18dfcf7ca21aae2491fff1a16127681bf1fa9b8cf/pillow-12.2.0-cp314-cp314-ios_13_0_arm64_iphonesimulator.whl", hash = "sha256:6a9adfc6d24b10f89588096364cc726174118c62130c817c2837c60cf08a392b", size = 4176515, upload-time = "2026-04-01T14:44:51.353Z" }, + { url = "https://files.pythonhosted.org/packages/b0/63/703f86fd4c422a9cf722833670f4f71418fb116b2853ff7da722ea43f184/pillow-12.2.0-cp314-cp314-ios_13_0_x86_64_iphonesimulator.whl", hash = "sha256:6a6e67ea2e6feda684ed370f9a1c52e7a243631c025ba42149a2cc5934dec295", size = 3640159, upload-time = "2026-04-01T14:44:53.588Z" }, + { url = "https://files.pythonhosted.org/packages/71/e0/fb22f797187d0be2270f83500aab851536101b254bfa1eae10795709d283/pillow-12.2.0-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:2bb4a8d594eacdfc59d9e5ad972aa8afdd48d584ffd5f13a937a664c3e7db0ed", size = 5312185, upload-time = "2026-04-01T14:44:56.039Z" }, + { url = "https://files.pythonhosted.org/packages/ba/8c/1a9e46228571de18f8e28f16fabdfc20212a5d019f3e3303452b3f0a580d/pillow-12.2.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:80b2da48193b2f33ed0c32c38140f9d3186583ce7d516526d462645fd98660ae", size = 4695386, upload-time = "2026-04-01T14:44:58.663Z" }, + { url = "https://files.pythonhosted.org/packages/70/62/98f6b7f0c88b9addd0e87c217ded307b36be024d4ff8869a812b241d1345/pillow-12.2.0-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:22db17c68434de69d8ecfc2fe821569195c0c373b25cccb9cbdacf2c6e53c601", size = 6280384, upload-time = "2026-04-01T14:45:01.5Z" }, + { url = "https://files.pythonhosted.org/packages/5e/03/688747d2e91cfbe0e64f316cd2e8005698f76ada3130d0194664174fa5de/pillow-12.2.0-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:7b14cc0106cd9aecda615dd6903840a058b4700fcb817687d0ee4fc8b6e389be", size = 8091599, upload-time = "2026-04-01T14:45:04.5Z" }, + { url = "https://files.pythonhosted.org/packages/f6/35/577e22b936fcdd66537329b33af0b4ccfefaeabd8aec04b266528cddb33c/pillow-12.2.0-cp314-cp314-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:8cbeb542b2ebc6fcdacabf8aca8c1a97c9b3ad3927d46b8723f9d4f033288a0f", size = 6396021, upload-time = "2026-04-01T14:45:07.117Z" }, + { url = "https://files.pythonhosted.org/packages/11/8d/d2532ad2a603ca2b93ad9f5135732124e57811d0168155852f37fbce2458/pillow-12.2.0-cp314-cp314-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:4bfd07bc812fbd20395212969e41931001fd59eb55a60658b0e5710872e95286", size = 7083360, upload-time = "2026-04-01T14:45:09.763Z" }, + { url = "https://files.pythonhosted.org/packages/5e/26/d325f9f56c7e039034897e7380e9cc202b1e368bfd04d4cbe6a441f02885/pillow-12.2.0-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:9aba9a17b623ef750a4d11b742cbafffeb48a869821252b30ee21b5e91392c50", size = 6507628, upload-time = "2026-04-01T14:45:12.378Z" }, + { url = "https://files.pythonhosted.org/packages/5f/f7/769d5632ffb0988f1c5e7660b3e731e30f7f8ec4318e94d0a5d674eb65a4/pillow-12.2.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:deede7c263feb25dba4e82ea23058a235dcc2fe1f6021025dc71f2b618e26104", size = 7209321, upload-time = "2026-04-01T14:45:15.122Z" }, + { url = "https://files.pythonhosted.org/packages/6a/7a/c253e3c645cd47f1aceea6a8bacdba9991bf45bb7dfe927f7c893e89c93c/pillow-12.2.0-cp314-cp314-win32.whl", hash = "sha256:632ff19b2778e43162304d50da0181ce24ac5bb8180122cbe1bf4673428328c7", size = 6479723, upload-time = "2026-04-01T14:45:17.797Z" }, + { url = "https://files.pythonhosted.org/packages/cd/8b/601e6566b957ca50e28725cb6c355c59c2c8609751efbecd980db44e0349/pillow-12.2.0-cp314-cp314-win_amd64.whl", hash = "sha256:4e6c62e9d237e9b65fac06857d511e90d8461a32adcc1b9065ea0c0fa3a28150", size = 7217400, upload-time = "2026-04-01T14:45:20.529Z" }, + { url = "https://files.pythonhosted.org/packages/d6/94/220e46c73065c3e2951bb91c11a1fb636c8c9ad427ac3ce7d7f3359b9b2f/pillow-12.2.0-cp314-cp314-win_arm64.whl", hash = "sha256:b1c1fbd8a5a1af3412a0810d060a78b5136ec0836c8a4ef9aa11807f2a22f4e1", size = 2554835, upload-time = "2026-04-01T14:45:23.162Z" }, + { url = "https://files.pythonhosted.org/packages/b6/ab/1b426a3974cb0e7da5c29ccff4807871d48110933a57207b5a676cccc155/pillow-12.2.0-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:57850958fe9c751670e49b2cecf6294acc99e562531f4bd317fa5ddee2068463", size = 5314225, upload-time = "2026-04-01T14:45:25.637Z" }, + { url = "https://files.pythonhosted.org/packages/19/1e/dce46f371be2438eecfee2a1960ee2a243bbe5e961890146d2dee1ff0f12/pillow-12.2.0-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:d5d38f1411c0ed9f97bcb49b7bd59b6b7c314e0e27420e34d99d844b9ce3b6f3", size = 4698541, upload-time = "2026-04-01T14:45:28.355Z" }, + { url = "https://files.pythonhosted.org/packages/55/c3/7fbecf70adb3a0c33b77a300dc52e424dc22ad8cdc06557a2e49523b703d/pillow-12.2.0-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:5c0a9f29ca8e79f09de89293f82fc9b0270bb4af1d58bc98f540cc4aedf03166", size = 6322251, upload-time = "2026-04-01T14:45:30.924Z" }, + { url = "https://files.pythonhosted.org/packages/1c/3c/7fbc17cfb7e4fe0ef1642e0abc17fc6c94c9f7a16be41498e12e2ba60408/pillow-12.2.0-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:1610dd6c61621ae1cf811bef44d77e149ce3f7b95afe66a4512f8c59f25d9ebe", size = 8127807, upload-time = "2026-04-01T14:45:33.908Z" }, + { url = "https://files.pythonhosted.org/packages/ff/c3/a8ae14d6defd2e448493ff512fae903b1e9bd40b72efb6ec55ce0048c8ce/pillow-12.2.0-cp314-cp314t-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:0a34329707af4f73cf1782a36cd2289c0368880654a2c11f027bcee9052d35dd", size = 6433935, upload-time = "2026-04-01T14:45:36.623Z" }, + { url = "https://files.pythonhosted.org/packages/6e/32/2880fb3a074847ac159d8f902cb43278a61e85f681661e7419e6596803ed/pillow-12.2.0-cp314-cp314t-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:8e9c4f5b3c546fa3458a29ab22646c1c6c787ea8f5ef51300e5a60300736905e", size = 7116720, upload-time = "2026-04-01T14:45:39.258Z" }, + { url = "https://files.pythonhosted.org/packages/46/87/495cc9c30e0129501643f24d320076f4cc54f718341df18cc70ec94c44e1/pillow-12.2.0-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:fb043ee2f06b41473269765c2feae53fc2e2fbf96e5e22ca94fb5ad677856f06", size = 6540498, upload-time = "2026-04-01T14:45:41.879Z" }, + { url = "https://files.pythonhosted.org/packages/18/53/773f5edca692009d883a72211b60fdaf8871cbef075eaa9d577f0a2f989e/pillow-12.2.0-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:f278f034eb75b4e8a13a54a876cc4a5ab39173d2cdd93a638e1b467fc545ac43", size = 7239413, upload-time = "2026-04-01T14:45:44.705Z" }, + { url = "https://files.pythonhosted.org/packages/c9/e4/4b64a97d71b2a83158134abbb2f5bd3f8a2ea691361282f010998f339ec7/pillow-12.2.0-cp314-cp314t-win32.whl", hash = "sha256:6bb77b2dcb06b20f9f4b4a8454caa581cd4dd0643a08bacf821216a16d9c8354", size = 6482084, upload-time = "2026-04-01T14:45:47.568Z" }, + { url = "https://files.pythonhosted.org/packages/ba/13/306d275efd3a3453f72114b7431c877d10b1154014c1ebbedd067770d629/pillow-12.2.0-cp314-cp314t-win_amd64.whl", hash = "sha256:6562ace0d3fb5f20ed7290f1f929cae41b25ae29528f2af1722966a0a02e2aa1", size = 7225152, upload-time = "2026-04-01T14:45:50.032Z" }, + { url = "https://files.pythonhosted.org/packages/ff/6e/cf826fae916b8658848d7b9f38d88da6396895c676e8086fc0988073aaf8/pillow-12.2.0-cp314-cp314t-win_arm64.whl", hash = "sha256:aa88ccfe4e32d362816319ed727a004423aab09c5cea43c01a4b435643fa34eb", size = 2556579, upload-time = "2026-04-01T14:45:52.529Z" }, + { url = "https://files.pythonhosted.org/packages/4e/b7/2437044fb910f499610356d1352e3423753c98e34f915252aafecc64889f/pillow-12.2.0-pp311-pypy311_pp73-macosx_10_15_x86_64.whl", hash = "sha256:0538bd5e05efec03ae613fd89c4ce0368ecd2ba239cc25b9f9be7ed426b0af1f", size = 5273969, upload-time = "2026-04-01T14:45:55.538Z" }, + { url = "https://files.pythonhosted.org/packages/f6/f4/8316e31de11b780f4ac08ef3654a75555e624a98db1056ecb2122d008d5a/pillow-12.2.0-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:394167b21da716608eac917c60aa9b969421b5dcbbe02ae7f013e7b85811c69d", size = 4659674, upload-time = "2026-04-01T14:45:58.093Z" }, + { url = "https://files.pythonhosted.org/packages/d4/37/664fca7201f8bb2aa1d20e2c3d5564a62e6ae5111741966c8319ca802361/pillow-12.2.0-pp311-pypy311_pp73-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:5d04bfa02cc2d23b497d1e90a0f927070043f6cbf303e738300532379a4b4e0f", size = 5288479, upload-time = "2026-04-01T14:46:01.141Z" }, + { url = "https://files.pythonhosted.org/packages/49/62/5b0ed78fce87346be7a5cfcfaaad91f6a1f98c26f86bdbafa2066c647ef6/pillow-12.2.0-pp311-pypy311_pp73-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:0c838a5125cee37e68edec915651521191cef1e6aa336b855f495766e77a366e", size = 7032230, upload-time = "2026-04-01T14:46:03.874Z" }, + { url = "https://files.pythonhosted.org/packages/c3/28/ec0fc38107fc32536908034e990c47914c57cd7c5a3ece4d8d8f7ffd7e27/pillow-12.2.0-pp311-pypy311_pp73-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:4a6c9fa44005fa37a91ebfc95d081e8079757d2e904b27103f4f5fa6f0bf78c0", size = 5355404, upload-time = "2026-04-01T14:46:06.33Z" }, + { url = "https://files.pythonhosted.org/packages/5e/8b/51b0eddcfa2180d60e41f06bd6d0a62202b20b59c68f5a132e615b75aecf/pillow-12.2.0-pp311-pypy311_pp73-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:25373b66e0dd5905ed63fa3cae13c82fbddf3079f2c8bf15c6fb6a35586324c1", size = 6002215, upload-time = "2026-04-01T14:46:08.83Z" }, + { url = "https://files.pythonhosted.org/packages/bc/60/5382c03e1970de634027cee8e1b7d39776b778b81812aaf45b694dfe9e28/pillow-12.2.0-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:bfa9c230d2fe991bed5318a5f119bd6780cda2915cca595393649fc118ab895e", size = 7080946, upload-time = "2026-04-01T14:46:11.734Z" }, +] + +[[package]] +name = "pint" +version = "0.25.3" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "flexcache" }, + { name = "flexparser" }, + { name = "platformdirs" }, + { name = "typing-extensions" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/52/9d/b1379cdbd33a49d17d627bc24e2b63cca06a1c5343b38072d2889499e82e/pint-0.25.3.tar.gz", hash = "sha256:f8f5df6cf65314d74da1ade1bf96f8e3e4d0c41b51577ac53c49e7d44ca5acee", size = 255106, upload-time = "2026-03-19T21:57:08.72Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/1b/dd/a9fe6a0a09512da23951c68bf36466aeecd89def3183dc095edbc807ddc5/pint-0.25.3-py3-none-any.whl", hash = "sha256:27eb25143bd5de9fcc4d5a4b484f16faf6b4615aa93ece6b3373a8c1a3c1b97d", size = 307488, upload-time = "2026-03-19T21:57:07.022Z" }, +] + +[[package]] +name = "platformdirs" +version = "4.10.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/d7/47/e4501f49c178ae1d9f4a75073fda4204f52647993f075a9db4d14930e0c5/platformdirs-4.10.0.tar.gz", hash = "sha256:31e761a6a0ca04faf7353ea759bdba55652be214725111e5aac52dfa29d4bef7", size = 31224, upload-time = "2026-05-28T03:32:53.587Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/81/e6/cd9575ac904136b3cbf7aa7ee819ef86eedb7274e46f230e94ea4342e729/platformdirs-4.10.0-py3-none-any.whl", hash = "sha256:fb516cdb12eb0d857d0cd85a7c57cea4d060bee4578d6cf5a14dfdf8cbf8784a", size = 22743, upload-time = "2026-05-28T03:32:52.175Z" }, +] + +[[package]] +name = "plotly" +version = "6.7.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "narwhals" }, + { name = "packaging" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/3a/7f/0f100df1172aadf88a929a9dbb902656b0880ba4b960fe5224867159d8f4/plotly-6.7.0.tar.gz", hash = "sha256:45eea0ff27e2a23ccd62776f77eb43aa1ca03df4192b76036e380bb479b892c6", size = 6911286, upload-time = "2026-04-09T20:36:45.738Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/90/ad/cba91b3bcf04073e4d1655a5c1710ef3f457f56f7d1b79dcc3d72f4dd912/plotly-6.7.0-py3-none-any.whl", hash = "sha256:ac8aca1c25c663a59b5b9140a549264a5badde2e057d79b8c772ae2920e32ff0", size = 9898444, upload-time = "2026-04-09T20:36:39.812Z" }, +] + +[[package]] +name = "pluggy" +version = "1.6.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/f9/e2/3e91f31a7d2b083fe6ef3fa267035b518369d9511ffab804f839851d2779/pluggy-1.6.0.tar.gz", hash = "sha256:7dcc130b76258d33b90f61b658791dede3486c3e6bfb003ee5c9bfb396dd22f3", size = 69412, upload-time = "2025-05-15T12:30:07.975Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/54/20/4d324d65cc6d9205fabedc306948156824eb9f0ee1633355a8f7ec5c66bf/pluggy-1.6.0-py3-none-any.whl", hash = "sha256:e920276dd6813095e9377c0bc5566d94c932c33b27a3e3945d8389c374dd4746", size = 20538, upload-time = "2025-05-15T12:30:06.134Z" }, +] + +[[package]] +name = "prometheus-client" +version = "0.25.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/1b/fb/d9aa83ffe43ce1f19e557c0971d04b90561b0cfd50762aafb01968285553/prometheus_client-0.25.0.tar.gz", hash = "sha256:5e373b75c31afb3c86f1a52fa1ad470c9aace18082d39ec0d2f918d11cc9ba28", size = 86035, upload-time = "2026-04-09T19:53:42.359Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/8d/9b/d4b1e644385499c8346fa9b622a3f030dce14cd6ef8a1871c221a17a67e7/prometheus_client-0.25.0-py3-none-any.whl", hash = "sha256:d5aec89e349a6ec230805d0df882f3807f74fd6c1a2fa86864e3c2279059fed1", size = 64154, upload-time = "2026-04-09T19:53:41.324Z" }, +] + +[[package]] +name = "prompt-toolkit" +version = "3.0.52" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "wcwidth" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/a1/96/06e01a7b38dce6fe1db213e061a4602dd6032a8a97ef6c1a862537732421/prompt_toolkit-3.0.52.tar.gz", hash = "sha256:28cde192929c8e7321de85de1ddbe736f1375148b02f2e17edd840042b1be855", size = 434198, upload-time = "2025-08-27T15:24:02.057Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/84/03/0d3ce49e2505ae70cf43bc5bb3033955d2fc9f932163e84dc0779cc47f48/prompt_toolkit-3.0.52-py3-none-any.whl", hash = "sha256:9aac639a3bbd33284347de5ad8d68ecc044b91a762dc39b7c21095fcd6a19955", size = 391431, upload-time = "2025-08-27T15:23:59.498Z" }, +] + +[[package]] +name = "protobuf" +version = "6.33.6" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/66/70/e908e9c5e52ef7c3a6c7902c9dfbb34c7e29c25d2f81ade3856445fd5c94/protobuf-6.33.6.tar.gz", hash = "sha256:a6768d25248312c297558af96a9f9c929e8c4cee0659cb07e780731095f38135", size = 444531, upload-time = "2026-03-18T19:05:00.988Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/fc/9f/2f509339e89cfa6f6a4c4ff50438db9ca488dec341f7e454adad60150b00/protobuf-6.33.6-cp310-abi3-win32.whl", hash = "sha256:7d29d9b65f8afef196f8334e80d6bc1d5d4adedb449971fefd3723824e6e77d3", size = 425739, upload-time = "2026-03-18T19:04:48.373Z" }, + { url = "https://files.pythonhosted.org/packages/76/5d/683efcd4798e0030c1bab27374fd13a89f7c2515fb1f3123efdfaa5eab57/protobuf-6.33.6-cp310-abi3-win_amd64.whl", hash = "sha256:0cd27b587afca21b7cfa59a74dcbd48a50f0a6400cfb59391340ad729d91d326", size = 437089, upload-time = "2026-03-18T19:04:50.381Z" }, + { url = "https://files.pythonhosted.org/packages/5c/01/a3c3ed5cd186f39e7880f8303cc51385a198a81469d53d0fdecf1f64d929/protobuf-6.33.6-cp39-abi3-macosx_10_9_universal2.whl", hash = "sha256:9720e6961b251bde64edfdab7d500725a2af5280f3f4c87e57c0208376aa8c3a", size = 427737, upload-time = "2026-03-18T19:04:51.866Z" }, + { url = "https://files.pythonhosted.org/packages/ee/90/b3c01fdec7d2f627b3a6884243ba328c1217ed2d978def5c12dc50d328a3/protobuf-6.33.6-cp39-abi3-manylinux2014_aarch64.whl", hash = "sha256:e2afbae9b8e1825e3529f88d514754e094278bb95eadc0e199751cdd9a2e82a2", size = 324610, upload-time = "2026-03-18T19:04:53.096Z" }, + { url = "https://files.pythonhosted.org/packages/9b/ca/25afc144934014700c52e05103c2421997482d561f3101ff352e1292fb81/protobuf-6.33.6-cp39-abi3-manylinux2014_s390x.whl", hash = "sha256:c96c37eec15086b79762ed265d59ab204dabc53056e3443e702d2681f4b39ce3", size = 339381, upload-time = "2026-03-18T19:04:54.616Z" }, + { url = "https://files.pythonhosted.org/packages/16/92/d1e32e3e0d894fe00b15ce28ad4944ab692713f2e7f0a99787405e43533a/protobuf-6.33.6-cp39-abi3-manylinux2014_x86_64.whl", hash = "sha256:e9db7e292e0ab79dd108d7f1a94fe31601ce1ee3f7b79e0692043423020b0593", size = 323436, upload-time = "2026-03-18T19:04:55.768Z" }, + { url = "https://files.pythonhosted.org/packages/c4/72/02445137af02769918a93807b2b7890047c32bfb9f90371cbc12688819eb/protobuf-6.33.6-py3-none-any.whl", hash = "sha256:77179e006c476e69bf8e8ce866640091ec42e1beb80b213c3900006ecfba6901", size = 170656, upload-time = "2026-03-18T19:04:59.826Z" }, +] + +[[package]] +name = "psutil" +version = "7.2.2" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/aa/c6/d1ddf4abb55e93cebc4f2ed8b5d6dbad109ecb8d63748dd2b20ab5e57ebe/psutil-7.2.2.tar.gz", hash = "sha256:0746f5f8d406af344fd547f1c8daa5f5c33dbc293bb8d6a16d80b4bb88f59372", size = 493740, upload-time = "2026-01-28T18:14:54.428Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/51/08/510cbdb69c25a96f4ae523f733cdc963ae654904e8db864c07585ef99875/psutil-7.2.2-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:2edccc433cbfa046b980b0df0171cd25bcaeb3a68fe9022db0979e7aa74a826b", size = 130595, upload-time = "2026-01-28T18:14:57.293Z" }, + { url = "https://files.pythonhosted.org/packages/d6/f5/97baea3fe7a5a9af7436301f85490905379b1c6f2dd51fe3ecf24b4c5fbf/psutil-7.2.2-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:e78c8603dcd9a04c7364f1a3e670cea95d51ee865e4efb3556a3a63adef958ea", size = 131082, upload-time = "2026-01-28T18:14:59.732Z" }, + { url = "https://files.pythonhosted.org/packages/37/d6/246513fbf9fa174af531f28412297dd05241d97a75911ac8febefa1a53c6/psutil-7.2.2-cp313-cp313t-manylinux2010_x86_64.manylinux_2_12_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:1a571f2330c966c62aeda00dd24620425d4b0cc86881c89861fbc04549e5dc63", size = 181476, upload-time = "2026-01-28T18:15:01.884Z" }, + { url = "https://files.pythonhosted.org/packages/b8/b5/9182c9af3836cca61696dabe4fd1304e17bc56cb62f17439e1154f225dd3/psutil-7.2.2-cp313-cp313t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:917e891983ca3c1887b4ef36447b1e0873e70c933afc831c6b6da078ba474312", size = 184062, upload-time = "2026-01-28T18:15:04.436Z" }, + { url = "https://files.pythonhosted.org/packages/16/ba/0756dca669f5a9300d0cbcbfae9a4c30e446dfc7440ffe43ded5724bfd93/psutil-7.2.2-cp313-cp313t-win_amd64.whl", hash = "sha256:ab486563df44c17f5173621c7b198955bd6b613fb87c71c161f827d3fb149a9b", size = 139893, upload-time = "2026-01-28T18:15:06.378Z" }, + { url = "https://files.pythonhosted.org/packages/1c/61/8fa0e26f33623b49949346de05ec1ddaad02ed8ba64af45f40a147dbfa97/psutil-7.2.2-cp313-cp313t-win_arm64.whl", hash = "sha256:ae0aefdd8796a7737eccea863f80f81e468a1e4cf14d926bd9b6f5f2d5f90ca9", size = 135589, upload-time = "2026-01-28T18:15:08.03Z" }, + { url = "https://files.pythonhosted.org/packages/81/69/ef179ab5ca24f32acc1dac0c247fd6a13b501fd5534dbae0e05a1c48b66d/psutil-7.2.2-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:eed63d3b4d62449571547b60578c5b2c4bcccc5387148db46e0c2313dad0ee00", size = 130664, upload-time = "2026-01-28T18:15:09.469Z" }, + { url = "https://files.pythonhosted.org/packages/7b/64/665248b557a236d3fa9efc378d60d95ef56dd0a490c2cd37dafc7660d4a9/psutil-7.2.2-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:7b6d09433a10592ce39b13d7be5a54fbac1d1228ed29abc880fb23df7cb694c9", size = 131087, upload-time = "2026-01-28T18:15:11.724Z" }, + { url = "https://files.pythonhosted.org/packages/d5/2e/e6782744700d6759ebce3043dcfa661fb61e2fb752b91cdeae9af12c2178/psutil-7.2.2-cp314-cp314t-manylinux2010_x86_64.manylinux_2_12_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:1fa4ecf83bcdf6e6c8f4449aff98eefb5d0604bf88cb883d7da3d8d2d909546a", size = 182383, upload-time = "2026-01-28T18:15:13.445Z" }, + { url = "https://files.pythonhosted.org/packages/57/49/0a41cefd10cb7505cdc04dab3eacf24c0c2cb158a998b8c7b1d27ee2c1f5/psutil-7.2.2-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:e452c464a02e7dc7822a05d25db4cde564444a67e58539a00f929c51eddda0cf", size = 185210, upload-time = "2026-01-28T18:15:16.002Z" }, + { url = "https://files.pythonhosted.org/packages/dd/2c/ff9bfb544f283ba5f83ba725a3c5fec6d6b10b8f27ac1dc641c473dc390d/psutil-7.2.2-cp314-cp314t-win_amd64.whl", hash = "sha256:c7663d4e37f13e884d13994247449e9f8f574bc4655d509c3b95e9ec9e2b9dc1", size = 141228, upload-time = "2026-01-28T18:15:18.385Z" }, + { url = "https://files.pythonhosted.org/packages/f2/fc/f8d9c31db14fcec13748d373e668bc3bed94d9077dbc17fb0eebc073233c/psutil-7.2.2-cp314-cp314t-win_arm64.whl", hash = "sha256:11fe5a4f613759764e79c65cf11ebdf26e33d6dd34336f8a337aa2996d71c841", size = 136284, upload-time = "2026-01-28T18:15:19.912Z" }, + { url = "https://files.pythonhosted.org/packages/e7/36/5ee6e05c9bd427237b11b3937ad82bb8ad2752d72c6969314590dd0c2f6e/psutil-7.2.2-cp36-abi3-macosx_10_9_x86_64.whl", hash = "sha256:ed0cace939114f62738d808fdcecd4c869222507e266e574799e9c0faa17d486", size = 129090, upload-time = "2026-01-28T18:15:22.168Z" }, + { url = "https://files.pythonhosted.org/packages/80/c4/f5af4c1ca8c1eeb2e92ccca14ce8effdeec651d5ab6053c589b074eda6e1/psutil-7.2.2-cp36-abi3-macosx_11_0_arm64.whl", hash = "sha256:1a7b04c10f32cc88ab39cbf606e117fd74721c831c98a27dc04578deb0c16979", size = 129859, upload-time = "2026-01-28T18:15:23.795Z" }, + { url = "https://files.pythonhosted.org/packages/b5/70/5d8df3b09e25bce090399cf48e452d25c935ab72dad19406c77f4e828045/psutil-7.2.2-cp36-abi3-manylinux2010_x86_64.manylinux_2_12_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:076a2d2f923fd4821644f5ba89f059523da90dc9014e85f8e45a5774ca5bc6f9", size = 155560, upload-time = "2026-01-28T18:15:25.976Z" }, + { url = "https://files.pythonhosted.org/packages/63/65/37648c0c158dc222aba51c089eb3bdfa238e621674dc42d48706e639204f/psutil-7.2.2-cp36-abi3-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:b0726cecd84f9474419d67252add4ac0cd9811b04d61123054b9fb6f57df6e9e", size = 156997, upload-time = "2026-01-28T18:15:27.794Z" }, + { url = "https://files.pythonhosted.org/packages/8e/13/125093eadae863ce03c6ffdbae9929430d116a246ef69866dad94da3bfbc/psutil-7.2.2-cp36-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:fd04ef36b4a6d599bbdb225dd1d3f51e00105f6d48a28f006da7f9822f2606d8", size = 148972, upload-time = "2026-01-28T18:15:29.342Z" }, + { url = "https://files.pythonhosted.org/packages/04/78/0acd37ca84ce3ddffaa92ef0f571e073faa6d8ff1f0559ab1272188ea2be/psutil-7.2.2-cp36-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:b58fabe35e80b264a4e3bb23e6b96f9e45a3df7fb7eed419ac0e5947c61e47cc", size = 148266, upload-time = "2026-01-28T18:15:31.597Z" }, + { url = "https://files.pythonhosted.org/packages/b4/90/e2159492b5426be0c1fef7acba807a03511f97c5f86b3caeda6ad92351a7/psutil-7.2.2-cp37-abi3-win_amd64.whl", hash = "sha256:eb7e81434c8d223ec4a219b5fc1c47d0417b12be7ea866e24fb5ad6e84b3d988", size = 137737, upload-time = "2026-01-28T18:15:33.849Z" }, + { url = "https://files.pythonhosted.org/packages/8c/c7/7bb2e321574b10df20cbde462a94e2b71d05f9bbda251ef27d104668306a/psutil-7.2.2-cp37-abi3-win_arm64.whl", hash = "sha256:8c233660f575a5a89e6d4cb65d9f938126312bca76d8fe087b947b3a1aaac9ee", size = 134617, upload-time = "2026-01-28T18:15:36.514Z" }, +] + +[[package]] +name = "psycopg2-binary" +version = "2.9.12" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/2a/60/a3624f79acea344c16fbef3a94d28b89a8042ddfb8f3e4ca83f538671409/psycopg2_binary-2.9.12.tar.gz", hash = "sha256:5ac9444edc768c02a6b6a591f070b8aae28ff3a99be57560ac996001580f294c", size = 379686, upload-time = "2026-04-21T09:40:34.304Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/d5/19/d4ce60954f3bb9d8e3bc5e5c4d1f2487de2d3851bf2391d54954c9df12a6/psycopg2_binary-2.9.12-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:5c8ce6c61bd1b1f6b9c24ee32211599f6166af2c55abb19456090a21fd16554b", size = 3712338, upload-time = "2026-04-20T23:34:03.961Z" }, + { url = "https://files.pythonhosted.org/packages/53/71/c85409ee0d78890f0660eff262e815e7dd2bb741a17611d82e9e8cd9dc5e/psycopg2_binary-2.9.12-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:b4a9eaa6e7f4ff91bec10aa3fb296878e75187bced5cc4bafe17dc40915e1326", size = 3822407, upload-time = "2026-04-20T23:34:05.977Z" }, + { url = "https://files.pythonhosted.org/packages/3c/ed/60486c2c7f0d4d1ede2bfb1ed27e2498477ce646bc7f6b2759906303117e/psycopg2_binary-2.9.12-cp311-cp311-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:c6528cefc8e50fcc6f4a107e27a672058b36cc5736d665476aeb413ba88dbb06", size = 4578425, upload-time = "2026-04-20T23:34:08.246Z" }, + { url = "https://files.pythonhosted.org/packages/0b/b9/656cb03fad9f4f49f2145c334b1126ee75189929ca4e6187d485a2d59951/psycopg2_binary-2.9.12-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:e4e184b1fb6072bf05388aa41c697e1b2d01b3473f107e7ec44f186a32cfd0b8", size = 4273709, upload-time = "2026-04-20T23:34:10.974Z" }, + { url = "https://files.pythonhosted.org/packages/99/66/08cf0da0e25cc6fb142c89be45fc8418792858f0c4cbff5e24530ff02cd6/psycopg2_binary-2.9.12-cp311-cp311-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:4766ab678563054d3f1d064a4db19cc4b5f9e3a8d9018592a8285cf200c248f3", size = 5893779, upload-time = "2026-04-20T23:34:13.905Z" }, + { url = "https://files.pythonhosted.org/packages/17/d7/eecd9ce8e146d3721115d82d3836efdbb712187e4590325df549989d18f4/psycopg2_binary-2.9.12-cp311-cp311-manylinux_2_38_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:5a0253224780c978746cb9be55a946bcdaf40fe3519c0f622924cdabdafe2c39", size = 4109308, upload-time = "2026-04-20T23:34:16.761Z" }, + { url = "https://files.pythonhosted.org/packages/b6/2e/b1dc289b362cc8d45697b57eefbd673186f49a4ea0906928988e3affcc98/psycopg2_binary-2.9.12-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:0dc9228d47c46bda253d2ecd6bb93b56a9f2d7ad33b684a1fa3622bf74ffe30c", size = 3654405, upload-time = "2026-04-20T23:34:19.303Z" }, + { url = "https://files.pythonhosted.org/packages/eb/e4/4c4aea6473214dbdbd0fbba11aa4691e76dc01722c55724c5951719865ff/psycopg2_binary-2.9.12-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:f921f3cd87035ef7df233383011d7a53ea1d346224752c1385f1edfd790ceb6a", size = 3299187, upload-time = "2026-04-20T23:34:21.206Z" }, + { url = "https://files.pythonhosted.org/packages/ba/5d/b03b99986446a4f57b170ed9a2579fb7ff9783ca0fa5226b19db99737fee/psycopg2_binary-2.9.12-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:3d999bd982a723113c1a45b55a7a6a90d64d0ed2278020ed625c490ff7bef96c", size = 3047716, upload-time = "2026-04-20T23:34:23.077Z" }, + { url = "https://files.pythonhosted.org/packages/14/86/382ee4afbd1d97500c9d2862b20c2fdeddf4b7335e984df3fb4309f64108/psycopg2_binary-2.9.12-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:29d4d134bd0ab46ffb04e94aa3c5fa3ef582e9026609165e2f758ff76fc3a3be", size = 3349237, upload-time = "2026-04-20T23:34:25.211Z" }, + { url = "https://files.pythonhosted.org/packages/a8/16/9a57c75ba1eda7165c017342f526810d5f5a12647dde749c99ae9a7141d7/psycopg2_binary-2.9.12-cp311-cp311-win_amd64.whl", hash = "sha256:cb4a1dacdd48077150dc762a9e5ddbf32c256d66cb46f80839391aa458774936", size = 2757036, upload-time = "2026-04-20T23:34:27.77Z" }, + { url = "https://files.pythonhosted.org/packages/e2/9f/ef4ef3c8e15083df90ca35265cfd1a081a2f0cc07bb229c6314c6af817f4/psycopg2_binary-2.9.12-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:5cdc05117180c5fa9c40eea8ea559ce64d73824c39d928b7da9fb5f6a9392433", size = 3712459, upload-time = "2026-04-20T23:34:30.549Z" }, + { url = "https://files.pythonhosted.org/packages/b5/01/3dd14e46ba48c1e1a6ec58ee599fa1b5efa00c246d5046cd903d0eeb1af1/psycopg2_binary-2.9.12-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:d3227a3bc228c10d21011a99245edca923e4e8bf461857e869a507d9a41fe9f6", size = 3822936, upload-time = "2026-04-20T23:34:32.77Z" }, + { url = "https://files.pythonhosted.org/packages/a6/f7/0640e4901119d8a9f7a1784b927f494e2198e213ceb593753d1f2c8b1b30/psycopg2_binary-2.9.12-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:995ce929eede89db6254b50827e2b7fd61e50d11f0b116b29fffe4a2e53c4580", size = 4578676, upload-time = "2026-04-20T23:34:35.18Z" }, + { url = "https://files.pythonhosted.org/packages/b0/55/44df3965b5f297c50cc0b1b594a31c67d6127a9d133045b8a66611b14dfb/psycopg2_binary-2.9.12-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:9fe06d93e72f1c048e731a2e3e7854a5bfaa58fc736068df90b352cefe66f03f", size = 4274917, upload-time = "2026-04-20T23:34:37.982Z" }, + { url = "https://files.pythonhosted.org/packages/b0/4b/74535248b1eac0c9336862e8617c765ac94dac76f9e25d7c4a79588c8907/psycopg2_binary-2.9.12-cp312-cp312-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:40e7b28b63aaf737cb3a1edc3a9bbc9a9f4ad3dcb7152e8c1130e4050eddcb7d", size = 5894843, upload-time = "2026-04-20T23:34:40.856Z" }, + { url = "https://files.pythonhosted.org/packages/f2/ba/f1bf8d2ae71868ad800b661099086ee52bc0f8d9f05be1acd8ebb06757cc/psycopg2_binary-2.9.12-cp312-cp312-manylinux_2_38_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:89d19a9f7899e8eb0656a2b3a08e0da04c720a06db6e0033eab5928aabe60fa9", size = 4110556, upload-time = "2026-04-20T23:34:44.016Z" }, + { url = "https://files.pythonhosted.org/packages/45/46/c15706c338403b7c420bcc0c2905aad116cc064545686d8bf85f1999ea00/psycopg2_binary-2.9.12-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:612b965daee295ae2da8f8218ce1d274645dc76ef3f1abf6a0a94fd57eff876d", size = 3655714, upload-time = "2026-04-20T23:34:46.233Z" }, + { url = "https://files.pythonhosted.org/packages/b3/7c/a2d5dc09b64a4564db242a0fe418fde7d33f6f8259dd2c5b9d7def00fb5a/psycopg2_binary-2.9.12-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:b9a339b79d37c1b45f3235265f07cdeb0cb5ad7acd2ac7720a5920989c17c24e", size = 3301154, upload-time = "2026-04-20T23:34:49.528Z" }, + { url = "https://files.pythonhosted.org/packages/c0/e8/cc8c9a4ce71461f9ec548d38cadc41dc184b34c73e6455450775a9334ccd/psycopg2_binary-2.9.12-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:3471336e1acfd9c7fe507b8bad5af9317b6a89294f9eb37bd9a030bb7bebcdc6", size = 3048882, upload-time = "2026-04-20T23:34:51.86Z" }, + { url = "https://files.pythonhosted.org/packages/19/6a/31e2296bc0787c5ab75d3d118e40b239db8151b5192b90b77c72bc9256e9/psycopg2_binary-2.9.12-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:7af18183109e23502c8b2ae7f6926c0882766f35b5175a4cd737ad825e4d7a1b", size = 3351298, upload-time = "2026-04-20T23:34:54.124Z" }, + { url = "https://files.pythonhosted.org/packages/5f/a8/75f4e3e11203b590150abed2cf7794b9c9c9f7eceddae955191138b44dde/psycopg2_binary-2.9.12-cp312-cp312-win_amd64.whl", hash = "sha256:398fcd4db988c7d7d3713e2b8e18939776fd3fb447052daae4f24fa39daede4c", size = 2757230, upload-time = "2026-04-20T23:34:56.242Z" }, + { url = "https://files.pythonhosted.org/packages/91/bb/4608c96f970f6e0c56572e87027ef4404f709382a3503e9934526d7ba051/psycopg2_binary-2.9.12-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:7c729a73c7b1b84de3582f73cdd27d905121dc2c531f3d9a3c32a3011033b965", size = 3712419, upload-time = "2026-04-20T23:34:58.754Z" }, + { url = "https://files.pythonhosted.org/packages/5e/af/48f76af9d50d61cf390f8cd657b503168b089e2e9298e48465d029fcc713/psycopg2_binary-2.9.12-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:4413d0caef93c5cf50b96863df4c2efe8c269bf2267df353225595e7e15e8df7", size = 3822990, upload-time = "2026-04-20T23:35:00.821Z" }, + { url = "https://files.pythonhosted.org/packages/7a/df/aba0f99397cd811d32e06fc0cc781f1f3ce98bc0e729cb423925085d781a/psycopg2_binary-2.9.12-cp313-cp313-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:4dfcf8e45ebb0c663be34a3442f65e17311f3367089cd4e5e3a3e8e62c978777", size = 4578696, upload-time = "2026-04-20T23:35:03.409Z" }, + { url = "https://files.pythonhosted.org/packages/95/9c/eaa74021ac4e4d5c2f83d82fc6615a63f4fe6c94dc4e94c3990427053f67/psycopg2_binary-2.9.12-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:c41321a14dd74aceb6a9a643b9253a334521babfa763fa873e33d89cfa122fb5", size = 4274982, upload-time = "2026-04-20T23:35:05.583Z" }, + { url = "https://files.pythonhosted.org/packages/35/ed/c25deff98bd26187ba48b3b250a3ffc3037c46c5b89362534a15d200e0db/psycopg2_binary-2.9.12-cp313-cp313-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:83946ba43979ebfdc99a3cd0ee775c89f221df026984ba19d46133d8d75d3cd9", size = 5894867, upload-time = "2026-04-20T23:35:07.902Z" }, + { url = "https://files.pythonhosted.org/packages/9a/81/8d0e21ca77373c6c9589e5c4528f6e8f0c08c62cafc76fb0bddb7a2cee22/psycopg2_binary-2.9.12-cp313-cp313-manylinux_2_38_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:411e85815652d13560fbe731878daa5d92378c4995a22302071890ec3397d019", size = 4110578, upload-time = "2026-04-20T23:35:10.149Z" }, + { url = "https://files.pythonhosted.org/packages/00/fc/f481e2435bd8f742d0123309174aae4165160ad3ef17c1b99c3622c241d2/psycopg2_binary-2.9.12-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:1c8ad4c08e00f7679559eaed7aff1edfffc60c086b976f93972f686384a95e2c", size = 3655816, upload-time = "2026-04-20T23:35:12.56Z" }, + { url = "https://files.pythonhosted.org/packages/53/79/b9f46466bdbe9f239c96cde8be33c1aace4842f06013b47b730dc9759187/psycopg2_binary-2.9.12-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:00814e40fa23c2b37ef0a1e3c749d89982c73a9cb5046137f0752a22d432e82f", size = 3301307, upload-time = "2026-04-20T23:35:15.029Z" }, + { url = "https://files.pythonhosted.org/packages/3f/19/7dc003b32fe35024df89b658104f7c8538a8b2dcbde7a4e746ce929742e7/psycopg2_binary-2.9.12-cp313-cp313-musllinux_1_2_riscv64.whl", hash = "sha256:98062447aebc20ed20add1f547a364fd0ef8933640d5372ff1873f8deb9b61be", size = 3048968, upload-time = "2026-04-20T23:35:16.757Z" }, + { url = "https://files.pythonhosted.org/packages/91/58/2dbd7db5c604d45f4950d988506aae672a14126ec22998ced5021cbb76bb/psycopg2_binary-2.9.12-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:66a7685d7e548f10fb4ce32fb01a7b7f4aa702134de92a292c7bd9e0d3dbd290", size = 3351369, upload-time = "2026-04-20T23:35:18.933Z" }, + { url = "https://files.pythonhosted.org/packages/42/ee/dee8dcaad07f735824de3d6563bc67119fa6c28257b17977a8d624f02fab/psycopg2_binary-2.9.12-cp313-cp313-win_amd64.whl", hash = "sha256:b6937f5fe4e180aeee87de907a2fa982ded6f7f15d7218f78a083e4e1d68f2a0", size = 2757347, upload-time = "2026-04-20T23:35:21.283Z" }, + { url = "https://files.pythonhosted.org/packages/13/1b/708c0dca874acfad6d65314271859899a79007686f3a1f74e82a2ed4b645/psycopg2_binary-2.9.12-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:6f3b3de8a74ef8db215f22edffb19e32dc6fa41340456de7ec99efdc8a7b3ec2", size = 3712428, upload-time = "2026-04-20T23:35:23.453Z" }, + { url = "https://files.pythonhosted.org/packages/d6/39/ddbea9d4b4de6aca9431b6ed253f530f8a02d3b8f9bcfd0dbfe2b3de6fe4/psycopg2_binary-2.9.12-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:1006fb62f0f0bc5ce256a832356c6262e91be43f5e4eb15b5eaf38079464caf2", size = 3823184, upload-time = "2026-04-20T23:35:25.92Z" }, + { url = "https://files.pythonhosted.org/packages/bf/a0/bc2fef74b106fa345567122a0659e6d94512ed7dc0131ec44c9e5aba3725/psycopg2_binary-2.9.12-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:840066105706cd2eb29b9a1c2329620056582a4bf3e8169dec5c447042d0869f", size = 4579157, upload-time = "2026-04-20T23:35:28.542Z" }, + { url = "https://files.pythonhosted.org/packages/57/d7/d4e3b2005d3de607ca4fbb0e8742e248056e52184a6b94ebda3c1c2c329b/psycopg2_binary-2.9.12-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:863f5d12241ebe1c76a72a04c2113b6dc905f90b9cef0e9be0efd994affd9354", size = 4274970, upload-time = "2026-04-20T23:35:30.418Z" }, + { url = "https://files.pythonhosted.org/packages/2e/42/c9853f8db3967fe08bcde11f53d53b85d351750cae726ce001cb68afa9c1/psycopg2_binary-2.9.12-cp314-cp314-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:a99eaab34a9010f1a086b126de467466620a750634d114d20455f3a824aae033", size = 5895175, upload-time = "2026-04-20T23:35:33.584Z" }, + { url = "https://files.pythonhosted.org/packages/eb/fd/b82b5601a97630308bef079f545ffec481bbbc795c2ba5ec416a01d03f60/psycopg2_binary-2.9.12-cp314-cp314-manylinux_2_38_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:ffdd7dc5463ccd61845ac37b7012d0f35a1548df9febe14f8dd549be4a0bc81e", size = 4110658, upload-time = "2026-04-20T23:35:35.638Z" }, + { url = "https://files.pythonhosted.org/packages/62/8c/32ca69b0389ef25dd22937bf9e8fbe2ce27aea20b05ded48c4ce4cb42475/psycopg2_binary-2.9.12-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:54a0dfecab1b48731f934e06139dfe11e24219fb6d0ceb32177cf0375f14c7b5", size = 3656251, upload-time = "2026-04-20T23:35:37.854Z" }, + { url = "https://files.pythonhosted.org/packages/c4/29/96992a2b59e3b9d730fcf9612d0a387305025dc867a9fc490a9e496e074e/psycopg2_binary-2.9.12-cp314-cp314-musllinux_1_2_ppc64le.whl", hash = "sha256:96937c9c5d891f772430f418a7a8b4691a90c3e6b93cf72b5bd7cad8cbca32a5", size = 3301810, upload-time = "2026-04-20T23:35:39.927Z" }, + { url = "https://files.pythonhosted.org/packages/56/ad/44b06659949b243ae10112cd3b20a197f9bf3e81d5651379b9eb889bfaad/psycopg2_binary-2.9.12-cp314-cp314-musllinux_1_2_riscv64.whl", hash = "sha256:77b348775efd4cdab410ec6609d81ccecd1139c90265fa583a7255c8064bc03d", size = 3048977, upload-time = "2026-04-20T23:35:41.806Z" }, + { url = "https://files.pythonhosted.org/packages/1d/f2/10a1bcebadb6aa55e280e1f58975c36a7b560ea525184c7aa4064c466633/psycopg2_binary-2.9.12-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:527e6342b3e44c2f0544f6b8e927d60de7f163f5723b8f1dfa7d2a84298738cd", size = 3351466, upload-time = "2026-04-20T23:35:43.993Z" }, + { url = "https://files.pythonhosted.org/packages/20/be/b732c8418ffa5bcfda002890f5dc4c869fc17db66ff11f53b17cfe44afc0/psycopg2_binary-2.9.12-cp314-cp314-win_amd64.whl", hash = "sha256:f12ae41fcafadb39b2785e64a40f9db05d6de2ac114077457e0e7c597f3af980", size = 2848762, upload-time = "2026-04-20T23:35:46.421Z" }, +] + +[[package]] +name = "ptyprocess" +version = "0.7.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/20/e5/16ff212c1e452235a90aeb09066144d0c5a6a8c0834397e03f5224495c4e/ptyprocess-0.7.0.tar.gz", hash = "sha256:5c5d0a3b48ceee0b48485e0c26037c0acd7d29765ca3fbb5cb3831d347423220", size = 70762, upload-time = "2020-12-28T15:15:30.155Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/22/a6/858897256d0deac81a172289110f31629fc4cee19b6f01283303e18c8db3/ptyprocess-0.7.0-py2.py3-none-any.whl", hash = "sha256:4b41f3967fce3af57cc7e94b888626c18bf37a083e3651ca8feeb66d492fef35", size = 13993, upload-time = "2020-12-28T15:15:28.35Z" }, +] + +[[package]] +name = "pure-eval" +version = "0.2.3" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/cd/05/0a34433a064256a578f1783a10da6df098ceaa4a57bbeaa96a6c0352786b/pure_eval-0.2.3.tar.gz", hash = "sha256:5f4e983f40564c576c7c8635ae88db5956bb2229d7e9237d03b3c0b0190eaf42", size = 19752, upload-time = "2024-07-21T12:58:21.801Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/8e/37/efad0257dc6e593a18957422533ff0f87ede7c9c6ea010a2177d738fb82f/pure_eval-0.2.3-py3-none-any.whl", hash = "sha256:1db8e35b67b3d218d818ae653e27f06c3aa420901fa7b081ca98cbedc874e0d0", size = 11842, upload-time = "2024-07-21T12:58:20.04Z" }, +] + +[[package]] +name = "pycodestyle" +version = "2.14.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/11/e0/abfd2a0d2efe47670df87f3e3a0e2edda42f055053c85361f19c0e2c1ca8/pycodestyle-2.14.0.tar.gz", hash = "sha256:c4b5b517d278089ff9d0abdec919cd97262a3367449ea1c8b49b91529167b783", size = 39472, upload-time = "2025-06-20T18:49:48.75Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/d7/27/a58ddaf8c588a3ef080db9d0b7e0b97215cee3a45df74f3a94dbbf5c893a/pycodestyle-2.14.0-py2.py3-none-any.whl", hash = "sha256:dd6bf7cb4ee77f8e016f9c8e74a35ddd9f67e1d5fd4184d86c3b98e07099f42d", size = 31594, upload-time = "2025-06-20T18:49:47.491Z" }, +] + +[[package]] +name = "pycparser" +version = "3.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/1b/7d/92392ff7815c21062bea51aa7b87d45576f649f16458d78b7cf94b9ab2e6/pycparser-3.0.tar.gz", hash = "sha256:600f49d217304a5902ac3c37e1281c9fe94e4d0489de643a9504c5cdfdfc6b29", size = 103492, upload-time = "2026-01-21T14:26:51.89Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/0c/c3/44f3fbbfa403ea2a7c779186dc20772604442dde72947e7d01069cbe98e3/pycparser-3.0-py3-none-any.whl", hash = "sha256:b727414169a36b7d524c1c3e31839a521725078d7b2ff038656844266160a992", size = 48172, upload-time = "2026-01-21T14:26:50.693Z" }, +] + +[[package]] +name = "pydantic" +version = "2.13.4" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "annotated-types" }, + { name = "pydantic-core" }, + { name = "typing-extensions" }, + { name = "typing-inspection" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/18/a5/b60d21ac674192f8ab0ba4e9fd860690f9b4a6e51ca5df118733b487d8d6/pydantic-2.13.4.tar.gz", hash = "sha256:c40756b57adaa8b1efeeced5c196f3f3b7c435f90e84ea7f443901bec8099ef6", size = 844775, upload-time = "2026-05-06T13:43:05.343Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/fd/7b/122376b1fd3c62c1ed9dc80c931ace4844b3c55407b6fb2d199377c9736f/pydantic-2.13.4-py3-none-any.whl", hash = "sha256:45a282cde31d808236fd7ea9d919b128653c8b38b393d1c4ab335c62924d9aba", size = 472262, upload-time = "2026-05-06T13:43:02.641Z" }, +] + +[[package]] +name = "pydantic-core" +version = "2.46.4" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "typing-extensions" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/9d/56/921726b776ace8d8f5db44c4ef961006580d91dc52b803c489fafd1aa249/pydantic_core-2.46.4.tar.gz", hash = "sha256:62f875393d7f270851f20523dd2e29f082bcc82292d66db2b64ea71f64b6e1c1", size = 471464, upload-time = "2026-05-06T13:37:06.98Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/5c/fa/6d7708d2cfc1a832acb6aeb0cd16e801902df8a0f583bb3b4b527fde022e/pydantic_core-2.46.4-cp311-cp311-macosx_10_12_x86_64.whl", hash = "sha256:0e96592440881c74a213e5ad528e2b24d3d4f940de2766bed9010ab1d9e51594", size = 2111872, upload-time = "2026-05-06T13:40:27.596Z" }, + { url = "https://files.pythonhosted.org/packages/ae/6f/aa064a3e74b5745afbdf250594f38e7ead05e2d651bcb35994b9417a0d4d/pydantic_core-2.46.4-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:e0d65b8c354be7fb5f720c3caa8bc940bc2d20ce749c8e06135f07f8ed95dd7c", size = 1948255, upload-time = "2026-05-06T13:39:12.574Z" }, + { url = "https://files.pythonhosted.org/packages/43/3a/41114a9f7569b84b4d84e7a018c57c56347dac30c0d4a872946ec4e36c46/pydantic_core-2.46.4-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7bfb192b3f4b9e8a89b6277b6ce787564f62cfd272055f6e685726b111dc7826", size = 1972827, upload-time = "2026-05-06T13:38:19.841Z" }, + { url = "https://files.pythonhosted.org/packages/ef/25/1ab42e8048fe551934d9884e8d64daa7e990ad386f310a15981aeb6a5b08/pydantic_core-2.46.4-cp311-cp311-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:9037063db01f09b09e237c282b6792bd4da634b5402c4e7f0c61effed7701a04", size = 2041051, upload-time = "2026-05-06T13:38:10.447Z" }, + { url = "https://files.pythonhosted.org/packages/94/c2/1a934597ddf08da410385b3b7aae91956a5a76c635effef456074fad7e88/pydantic_core-2.46.4-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:fc010ab034c8c7452522748bf937df58020d256ccae0874463d1f4d01758af8e", size = 2221314, upload-time = "2026-05-06T13:40:13.089Z" }, + { url = "https://files.pythonhosted.org/packages/02/6d/9e8ad178c9c4df27ad3c8f25d1fe2a7ab0d2ba0559fad4aee5d3d1f16771/pydantic_core-2.46.4-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:8c5dac79fa1614d1e06ca695109c6105923bd9c7d1d6c918d4e637b7e6b32fd3", size = 2285146, upload-time = "2026-05-06T13:38:59.224Z" }, + { url = "https://files.pythonhosted.org/packages/80/50/540cd3aeefc041beb111125c4bff779831a2111fc6b15a9138cda277d32c/pydantic_core-2.46.4-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f9fa868638bf362d3d138ea55829cefb3d5f4b0d7f142234382a15e2485dbec4", size = 2089685, upload-time = "2026-05-06T13:38:17.762Z" }, + { url = "https://files.pythonhosted.org/packages/6b/a4/b440ad35f05f6a38f89fa0f149accb3f0e02be94ca5e15f3c449a61b4bc9/pydantic_core-2.46.4-cp311-cp311-manylinux_2_31_riscv64.whl", hash = "sha256:17299feefe090f2caa5b8e37222bb5f663e4935a8bfa6931d4102e5df1a9f398", size = 2115420, upload-time = "2026-05-06T13:37:58.195Z" }, + { url = "https://files.pythonhosted.org/packages/99/61/de4f55db8dfd57bfdfa9a12ec90fe1b57c4f41062f7ca86f08586b3e0ac0/pydantic_core-2.46.4-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:4c63ebc82684aa89d9a3bcbd13d515b3be44250dc68dd3bd81526c1cb31286c3", size = 2165122, upload-time = "2026-05-06T13:37:01.167Z" }, + { url = "https://files.pythonhosted.org/packages/f7/52/7c529d7bdb2d1068bd52f51fe32572c8301f9a4febf1948f10639f1436f5/pydantic_core-2.46.4-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:aaa2a54443eff1950ba5ddc6b6ccda0d9c84a364276a62f969bdf2a390650848", size = 2182573, upload-time = "2026-05-06T13:38:45.04Z" }, + { url = "https://files.pythonhosted.org/packages/37/b3/7c40325848ba78247f2812dcf9c7274e38cd801820ca6dd9fe63bcfb0eb4/pydantic_core-2.46.4-cp311-cp311-musllinux_1_1_armv7l.whl", hash = "sha256:18e5ceec2ab67e6d5f1a9085e5a24c9c4e2ac4545730bfe668680bca05e555f3", size = 2317139, upload-time = "2026-05-06T13:37:15.539Z" }, + { url = "https://files.pythonhosted.org/packages/d9/37/f913f81a657c865b75da6c0dbed79876073c2a43b5bd9edbe8da785e4d49/pydantic_core-2.46.4-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:a0f62d0a58f4e7da165457e995725421e0064f2255d8eccebc49f41bbc23b109", size = 2360433, upload-time = "2026-05-06T13:37:30.099Z" }, + { url = "https://files.pythonhosted.org/packages/c4/67/6acaa1be2567f9256b056d8477158cac7240813956ce86e49deae8e173b4/pydantic_core-2.46.4-cp311-cp311-win32.whl", hash = "sha256:041bde0a48fd37cf71cab1c9d56d3e8625a3793fef1f7dd232b3ff37e978ecda", size = 1985513, upload-time = "2026-05-06T13:38:15.669Z" }, + { url = "https://files.pythonhosted.org/packages/aa/e6/c505f83dfeda9a2e5c995cfd872949e4d05e12f7feb3dca72f633daefa94/pydantic_core-2.46.4-cp311-cp311-win_amd64.whl", hash = "sha256:6f2eeda33a839975441c86a4119e1383c50b47faf0cbb5176985565c6bb02c33", size = 2071114, upload-time = "2026-05-06T13:40:35.416Z" }, + { url = "https://files.pythonhosted.org/packages/0f/da/7a263a96d965d9d0df5e8de8a475f33495451117035b09acb110288c381f/pydantic_core-2.46.4-cp311-cp311-win_arm64.whl", hash = "sha256:14f4c5d6db102bd796a627bbb3a17b4cf4574b9ae861d8b7c9a9661c6dd3362d", size = 2044298, upload-time = "2026-05-06T13:38:29.754Z" }, + { url = "https://files.pythonhosted.org/packages/ce/8c/af022f0af448d7747c5154288d46b5f2bc5f17366eaa0e23e9aa04d59f3b/pydantic_core-2.46.4-cp312-cp312-macosx_10_12_x86_64.whl", hash = "sha256:3245406455a5d98187ec35530fd772b1d799b26667980872c8d4614991e2c4a2", size = 2106158, upload-time = "2026-05-06T13:38:57.215Z" }, + { url = "https://files.pythonhosted.org/packages/19/95/6195171e385007300f0f5574592e467c568becce2d937a0b6804f218bc49/pydantic_core-2.46.4-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:962ccbab7b642487b1d8b7df90ef677e03134cf1fd8880bf698649b22a69371f", size = 1951724, upload-time = "2026-05-06T13:37:02.697Z" }, + { url = "https://files.pythonhosted.org/packages/8e/bc/f47d1ff9cbb1620e1b5b697eef06010035735f07820180e74178226b27b3/pydantic_core-2.46.4-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8233f2947cf85404441fd7e0085f53b10c93e0ee78611099b5c7237e36aacbf7", size = 1975742, upload-time = "2026-05-06T13:37:09.448Z" }, + { url = "https://files.pythonhosted.org/packages/5b/11/9b9a5b0306345664a2da6410877af6e8082481b5884b3ddd78d47c6013ce/pydantic_core-2.46.4-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:3a233125ac121aa3ffba9a2b59edfc4a985a76092dc8279586ab4b71390875e7", size = 2052418, upload-time = "2026-05-06T13:37:38.234Z" }, + { url = "https://files.pythonhosted.org/packages/f1/b7/a65fec226f5d78fc39f4a13c4cc0c768c22b113438f60c14adc9d2865038/pydantic_core-2.46.4-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:5b712b53160b79a5850310b912a5ef8e57e56947c8ad690c227f5c9d7e561712", size = 2232274, upload-time = "2026-05-06T13:38:27.753Z" }, + { url = "https://files.pythonhosted.org/packages/68/f0/92039db98b907ef49269a8271f67db9cb78ae2fc68062ef7e4e77adb5f61/pydantic_core-2.46.4-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9401557acd873c3a7f3eb9383edef8ac4968f9510e340f4808d427e75667e7b4", size = 2309940, upload-time = "2026-05-06T13:38:05.353Z" }, + { url = "https://files.pythonhosted.org/packages/5f/97/2aab507d3d00ca626e8e57c1eac6a79e4e5fbcc63eb99733ff55d1717f65/pydantic_core-2.46.4-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:926c9541b14b12b1681dca8a0b75feb510b06c6341b70a8e500c2fdcff837cce", size = 2094516, upload-time = "2026-05-06T13:39:10.577Z" }, + { url = "https://files.pythonhosted.org/packages/22/37/a8aca44d40d737dde2bc05b3c6c07dff0de07ce6f82e9f3167aeaf4d5dea/pydantic_core-2.46.4-cp312-cp312-manylinux_2_31_riscv64.whl", hash = "sha256:56cb4851bcaf3d117eddcef4fe66afd750a50274b0da8e22be256d10e5611987", size = 2136854, upload-time = "2026-05-06T13:40:22.59Z" }, + { url = "https://files.pythonhosted.org/packages/24/99/fcef1b79238c06a8cbec70819ac722ba76e02bc8ada9b0fd66eba40da01b/pydantic_core-2.46.4-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:c68fcd102d71ea85c5b2dfac3f4f8476eff42a9e078fd5faefff6d145063536b", size = 2180306, upload-time = "2026-05-06T13:40:10.666Z" }, + { url = "https://files.pythonhosted.org/packages/ae/6c/fc44000918855b42779d007ae63b0532794739027b2f417321cddbc44f6a/pydantic_core-2.46.4-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:b2f69dec1725e79a012d920df1707de5caf7ed5e08f3be4435e25803efc47458", size = 2190044, upload-time = "2026-05-06T13:40:43.231Z" }, + { url = "https://files.pythonhosted.org/packages/6b/65/d9cadc9f1920d7a127ad2edba16c1db7916e59719285cd6c94600b0080ba/pydantic_core-2.46.4-cp312-cp312-musllinux_1_1_armv7l.whl", hash = "sha256:8d0820e8192167f80d88d64038e609c31452eeca865b4e1d9950a27a4609b00b", size = 2329133, upload-time = "2026-05-06T13:39:57.365Z" }, + { url = "https://files.pythonhosted.org/packages/d0/cf/c873d91679f3a30bcf5e7ac280ce5573483e72295307685120d0d5ad3416/pydantic_core-2.46.4-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:fbdb89b3e1c94a30cc5edfce477c6e6a5dc4d8f84665b455c27582f211a1c72c", size = 2374464, upload-time = "2026-05-06T13:38:06.976Z" }, + { url = "https://files.pythonhosted.org/packages/47/bd/6f2fc8188f31bf10590f1e98e7b306336161fac930a8c514cd7bd828c7dc/pydantic_core-2.46.4-cp312-cp312-win32.whl", hash = "sha256:9aa768456404a8bf48a4406685ac2bec8e72b62c69313734fa3b73cf33b3a894", size = 1974823, upload-time = "2026-05-06T13:40:47.985Z" }, + { url = "https://files.pythonhosted.org/packages/40/8c/985c1d41ea1107c2534abd9870e4ed5c8e7669b5c308297835c001e7a1c4/pydantic_core-2.46.4-cp312-cp312-win_amd64.whl", hash = "sha256:e9c26f834c65f5752f3f06cb08cb86a913ceb7274d0db6e267808a708b46bc89", size = 2072919, upload-time = "2026-05-06T13:39:21.153Z" }, + { url = "https://files.pythonhosted.org/packages/c4/ba/f463d006e0c47373ca7ec5e1a261c59dc01ef4d62b2657af925fb0deee3a/pydantic_core-2.46.4-cp312-cp312-win_arm64.whl", hash = "sha256:4fc73cb559bdb54b1134a706a2802a4cddd27a0633f5abb7e53056268751ac6a", size = 2027604, upload-time = "2026-05-06T13:39:03.753Z" }, + { url = "https://files.pythonhosted.org/packages/51/a2/5d30b469c5267a17b39dec53208222f76a8d351dfac4af661888c5aee77d/pydantic_core-2.46.4-cp313-cp313-macosx_10_12_x86_64.whl", hash = "sha256:5d5902252db0d3cedf8d4a1bc68f70eeb430f7e4c7104c8c476753519b423008", size = 2106306, upload-time = "2026-05-06T13:37:48.029Z" }, + { url = "https://files.pythonhosted.org/packages/c1/81/4fa520eaffa8bd7d1525e644cd6d39e7d60b1592bc5b516693c7340b50f1/pydantic_core-2.46.4-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:c94f0688e7b8d0a67abf40e57a7eaaecd17cc9586706a31b76c031f63df052b4", size = 1951906, upload-time = "2026-05-06T13:37:17.012Z" }, + { url = "https://files.pythonhosted.org/packages/03/d5/fd02da45b659668b05923b17ba3a0100a0a3d5541e3bd8fcc4ecb711309e/pydantic_core-2.46.4-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f027324c56cd5406ca49c124b0db10e56c69064fec039acc571c29020cc87c76", size = 1976802, upload-time = "2026-05-06T13:37:35.113Z" }, + { url = "https://files.pythonhosted.org/packages/21/f2/95727e1368be3d3ed485eaab7adbd7dda408f33f7a36e8b48e0144002b91/pydantic_core-2.46.4-cp313-cp313-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:e739fee756ba1010f8bcccb534252e85a35fe45ae92c295a06059ce58b74ccd3", size = 2052446, upload-time = "2026-05-06T13:37:12.313Z" }, + { url = "https://files.pythonhosted.org/packages/9c/86/5d99feea3f77c7234b8718075b23db11532773c1a0dbd9b9490215dc2eeb/pydantic_core-2.46.4-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:9d56801be94b86a9da183e5f3766e6310752b99ff647e38b09a9500d88e46e76", size = 2232757, upload-time = "2026-05-06T13:39:01.149Z" }, + { url = "https://files.pythonhosted.org/packages/d2/3a/508ac615935ef7588cf6d9e9b91309fdc2da751af865e02a9098de88258c/pydantic_core-2.46.4-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2412e734dcb48da14d4e4006b82b46b74f2518b8a26ee7e58c6844a6cd6d03c4", size = 2309275, upload-time = "2026-05-06T13:37:41.406Z" }, + { url = "https://files.pythonhosted.org/packages/07/f8/41db9de19d7987d6b04715a02b3b40aea467000275d9d758ffaa31af7d50/pydantic_core-2.46.4-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9551187363ffc0de2a00b2e47c25aeaeb1020b69b668762966df15fc5659dd5a", size = 2094467, upload-time = "2026-05-06T13:39:18.847Z" }, + { url = "https://files.pythonhosted.org/packages/2c/e2/f35033184cb11d0052daf4416e8e10a502ea2ac006fc4f459aee872727d1/pydantic_core-2.46.4-cp313-cp313-manylinux_2_31_riscv64.whl", hash = "sha256:0186750b482eefa11d7f435892b09c5c606193ef3375bcf94aa00ae6bfb66262", size = 2134417, upload-time = "2026-05-06T13:40:17.944Z" }, + { url = "https://files.pythonhosted.org/packages/7e/7b/6ceeb1cc90e193862f444ebe373d8fdf613f0a82572dde03fb10734c6c71/pydantic_core-2.46.4-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:5855698a4856556d86e8e6cd8434bc3ac0314ee8e12089ae0e143f64c6256e4e", size = 2179782, upload-time = "2026-05-06T13:40:32.618Z" }, + { url = "https://files.pythonhosted.org/packages/5a/f2/c8d7773ede6af08036423a00ae0ceffce266c3c52a096c435d68c896083f/pydantic_core-2.46.4-cp313-cp313-musllinux_1_1_aarch64.whl", hash = "sha256:cbaf13819775b7f769bf4a1f066cb6df7a28d4480081a589828ef190226881cd", size = 2188782, upload-time = "2026-05-06T13:36:51.018Z" }, + { url = "https://files.pythonhosted.org/packages/59/31/0c864784e31f09f05cdd87606f08923b9c9e7f6e51dd27f20f62f975ce9f/pydantic_core-2.46.4-cp313-cp313-musllinux_1_1_armv7l.whl", hash = "sha256:633147d34cf4550417f12e2b1a0383973bdf5cdfde212cb09e9a581cf10820be", size = 2328334, upload-time = "2026-05-06T13:40:37.764Z" }, + { url = "https://files.pythonhosted.org/packages/c2/eb/4f6c8a41efa30baa755590f4141abf3a8c370fab610915733e74134a7270/pydantic_core-2.46.4-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:82cf5301172168103724d49a1444d3378cb20cdee30b116a1bd6031236298a5d", size = 2372986, upload-time = "2026-05-06T13:39:34.152Z" }, + { url = "https://files.pythonhosted.org/packages/5b/24/b375a480d53113860c299764bfe9f349a3dc9108b3adc0d7f0d786492ebf/pydantic_core-2.46.4-cp313-cp313-win32.whl", hash = "sha256:9fa8ae11da9e2b3126c6426f147e0fba88d96d65921799bb30c6abd1cb2c97fb", size = 1973693, upload-time = "2026-05-06T13:37:55.072Z" }, + { url = "https://files.pythonhosted.org/packages/7e/e8/cff247591966f2d22ec8c003cd7587e27b7ba7b81ab2fb888e3ab75dc285/pydantic_core-2.46.4-cp313-cp313-win_amd64.whl", hash = "sha256:6b3ace8194b0e5204818c92802dcdca7fc6d88aabbb799d7c795540d9cd6d292", size = 2071819, upload-time = "2026-05-06T13:38:49.139Z" }, + { url = "https://files.pythonhosted.org/packages/c6/1a/f4aee670d5670e9e148e0c82c7db98d780be566c6e6a97ee8035528ca0b3/pydantic_core-2.46.4-cp313-cp313-win_arm64.whl", hash = "sha256:184c081504d17f1c1066e430e117142b2c77d9448a97f7b65c6ac9fd9aee238d", size = 2027411, upload-time = "2026-05-06T13:40:45.796Z" }, + { url = "https://files.pythonhosted.org/packages/8d/74/228a26ddad29c6672b805d9fd78e8d251cd04004fa7eed0e622096cd0250/pydantic_core-2.46.4-cp314-cp314-macosx_10_12_x86_64.whl", hash = "sha256:428e04521a40150c85216fc8b85e8d39fece235a9cf5e383761238c7fa9b96fb", size = 2102079, upload-time = "2026-05-06T13:38:41.019Z" }, + { url = "https://files.pythonhosted.org/packages/ad/1f/8970b150a4b4365623ae00fc88603491f763c627311ae8031e3111356d6e/pydantic_core-2.46.4-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:23ace664830ee0bfe014a0c7bc248b1f7f25ed7ad103852c317624a1083af462", size = 1952179, upload-time = "2026-05-06T13:36:59.812Z" }, + { url = "https://files.pythonhosted.org/packages/95/30/5211a831ae054928054b2f79731661087a2bc5c01e825c672b3a4a8f1b3e/pydantic_core-2.46.4-cp314-cp314-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ce5c1d2a8b27468f433ca974829c44060b8097eedc39933e3c206a90ee49c4a9", size = 1978926, upload-time = "2026-05-06T13:37:39.933Z" }, + { url = "https://files.pythonhosted.org/packages/57/e9/689668733b1eb67adeef047db3c2e8788fcf65a7fd9c9e2b46b7744fe245/pydantic_core-2.46.4-cp314-cp314-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:7283d57845ecf5a163403eb0702dfc220cc4fbdd18919cb5ccea4f95ee1cdab4", size = 2046785, upload-time = "2026-05-06T13:38:01.995Z" }, + { url = "https://files.pythonhosted.org/packages/60/d9/6715260422ff50a2109878fd24d948a6c3446bb2664f34ee78cd972b3acd/pydantic_core-2.46.4-cp314-cp314-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:8daafc69c93ee8a0204506a3b6b30f586ef54028f52aeeeb5c4cfc5184fd5914", size = 2228733, upload-time = "2026-05-06T13:40:50.371Z" }, + { url = "https://files.pythonhosted.org/packages/18/ae/fdb2f64316afca925640f8e70bb1a564b0ec2721c1389e25b8eb4bf9a299/pydantic_core-2.46.4-cp314-cp314-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:cd2213145bcc2ba85884d0ac63d222fece9209678f77b9b4d76f054c561adb28", size = 2307534, upload-time = "2026-05-06T13:37:21.531Z" }, + { url = "https://files.pythonhosted.org/packages/89/1d/8eff589b45bb8190a9d12c49cfad0f176a5cbd1534908a6b5125e2886239/pydantic_core-2.46.4-cp314-cp314-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7a5f930472650a82629163023e630d160863fce524c616f4e5186e5de9d9a49b", size = 2099732, upload-time = "2026-05-06T13:39:31.942Z" }, + { url = "https://files.pythonhosted.org/packages/06/d5/ee5a3366637fee41dee51a1fc91562dcf12ddbc68fda34e6b253da2324bb/pydantic_core-2.46.4-cp314-cp314-manylinux_2_31_riscv64.whl", hash = "sha256:c1b3f518abeca3aa13c712fd202306e145abf59a18b094a6bafb2d2bbf59192c", size = 2129627, upload-time = "2026-05-06T13:37:25.033Z" }, + { url = "https://files.pythonhosted.org/packages/94/33/2414be571d2c6a6c4d08be21f9292b6d3fdb08949a97b6dfe985017821db/pydantic_core-2.46.4-cp314-cp314-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:1a7dd0b3ee80d90150e3495a3a13ac34dbcbfd4f012996a6a1d8900e91b5c0fb", size = 2179141, upload-time = "2026-05-06T13:37:14.046Z" }, + { url = "https://files.pythonhosted.org/packages/7b/79/7daa95be995be0eecc4cf75064cb33f9bbbfe3fe0158caf2f0d4a996a5c7/pydantic_core-2.46.4-cp314-cp314-musllinux_1_1_aarch64.whl", hash = "sha256:3fb702cd90b0446a3a1c5e470bfa0dd23c0233b676a9099ddcc964fa6ca13898", size = 2184325, upload-time = "2026-05-06T13:36:53.615Z" }, + { url = "https://files.pythonhosted.org/packages/9f/cb/d0a382f5c0de8a222dc61c65348e0ce831b1f68e0a018450d31c2cace3a5/pydantic_core-2.46.4-cp314-cp314-musllinux_1_1_armv7l.whl", hash = "sha256:b8458003118a712e66286df6a707db01c52c0f52f7db8e4a38f0da1d3b94fc4e", size = 2323990, upload-time = "2026-05-06T13:40:29.971Z" }, + { url = "https://files.pythonhosted.org/packages/05/db/d9ba624cc4a5aced1598e88c04fdbd8310c8a69b9d38b9a3d39ce3a61ed7/pydantic_core-2.46.4-cp314-cp314-musllinux_1_1_x86_64.whl", hash = "sha256:372429a130e469c9cd698925ce5fc50940b7a1336b0d82038e63d5bbc4edc519", size = 2369978, upload-time = "2026-05-06T13:37:23.027Z" }, + { url = "https://files.pythonhosted.org/packages/f2/20/d15df15ba918c423461905802bfd2981c3af0bfa0e40d05e13edbfa48bc3/pydantic_core-2.46.4-cp314-cp314-win32.whl", hash = "sha256:85bb3611ff1802f3ee7fdd7dbff26b56f343fb432d57a4728fdd49b6ef35e2f4", size = 1966354, upload-time = "2026-05-06T13:38:03.499Z" }, + { url = "https://files.pythonhosted.org/packages/fc/b6/6b8de4c0a7d7ab3004c439c80c5c1e0a3e8d78bbae19379b01960383d9e5/pydantic_core-2.46.4-cp314-cp314-win_amd64.whl", hash = "sha256:811ff8e9c313ab425368bcbb36e5c4ebd7108c2bbf4e4089cfbb0b01eff63fac", size = 2072238, upload-time = "2026-05-06T13:39:40.807Z" }, + { url = "https://files.pythonhosted.org/packages/32/36/51eb763beec1f4cf59b1db243a7dcc39cbb41230f050a09b9d69faaf0a48/pydantic_core-2.46.4-cp314-cp314-win_arm64.whl", hash = "sha256:bfec22eab3c8cc2ceec0248aec886624116dc079afa027ecc8ad4a7e62010f8a", size = 2018251, upload-time = "2026-05-06T13:37:26.72Z" }, + { url = "https://files.pythonhosted.org/packages/e8/91/855af51d625b23aa987116a19e231d2aaef9c4a415273ddc189b79a45fee/pydantic_core-2.46.4-cp314-cp314t-macosx_10_12_x86_64.whl", hash = "sha256:af8244b2bef6aaad6d92cda81372de7f8c8d36c9f0c3ea36e827c60e7d9467a0", size = 2099593, upload-time = "2026-05-06T13:39:47.682Z" }, + { url = "https://files.pythonhosted.org/packages/fb/1b/8784a54c65edb5f49f0a14d6977cf1b209bba85a4c77445b255c2de58ab3/pydantic_core-2.46.4-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:5a4330cdbc57162e4b3aa303f588ba752257694c9c9be3e7ebb11b4aca659b5d", size = 1935226, upload-time = "2026-05-06T13:40:40.428Z" }, + { url = "https://files.pythonhosted.org/packages/e8/e7/1955d28d1afc56dd4b3ad7cc0cf39df1b9852964cf16e5d13912756d6d6b/pydantic_core-2.46.4-cp314-cp314t-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:29c61fc04a3d840155ff08e475a04809278972fe6aef51e2720554e96367e34b", size = 1974605, upload-time = "2026-05-06T13:37:32.029Z" }, + { url = "https://files.pythonhosted.org/packages/93/e2/3fedbf0ba7a22850e6e9fd78117f1c0f10f950182344d8a6c535d468fdd8/pydantic_core-2.46.4-cp314-cp314t-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:c50f2528cf200c5eed56faf3f4e22fcd5f38c157a8b78576e6ba3168ec35f000", size = 2030777, upload-time = "2026-05-06T13:38:55.239Z" }, + { url = "https://files.pythonhosted.org/packages/f8/61/46be275fcaaba0b4f5b9669dd852267ce1ff616592dccf7a7845588df091/pydantic_core-2.46.4-cp314-cp314t-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:0cbe8b01f948de4286c74cdd6c667aceb38f5c1e26f0693b3983d9d74887c65e", size = 2236641, upload-time = "2026-05-06T13:37:08.096Z" }, + { url = "https://files.pythonhosted.org/packages/60/db/12e93e46a8bac9988be3c016860f83293daea8c716c029c9ace279036f2f/pydantic_core-2.46.4-cp314-cp314t-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:617d7e2ca7dcb8c5cf6bcb8c59b8832c94b36196bbf1cbd1bfb56ed341905edd", size = 2286404, upload-time = "2026-05-06T13:40:20.221Z" }, + { url = "https://files.pythonhosted.org/packages/e2/4a/4d8b19008f38d31c53b8219cfedc2e3d5de5fe99d90076b7e767de29274f/pydantic_core-2.46.4-cp314-cp314t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7027560ee92211647d0d34e3f7cd6f50da56399d26a9c8ad0da286d3869a53f3", size = 2109219, upload-time = "2026-05-06T13:38:12.153Z" }, + { url = "https://files.pythonhosted.org/packages/88/70/3cbc40978fefb7bb09c6708d40d4ad1a5d70fd7213c3d17f971de868ec1f/pydantic_core-2.46.4-cp314-cp314t-manylinux_2_31_riscv64.whl", hash = "sha256:f99626688942fb746e545232e7726926f3be91b5975f8b55327665fafda991c7", size = 2110594, upload-time = "2026-05-06T13:40:02.971Z" }, + { url = "https://files.pythonhosted.org/packages/9d/20/b8d36736216e29491125531685b2f9e61aa5b4b2599893f8268551da3338/pydantic_core-2.46.4-cp314-cp314t-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:fc3e9034a63de20e15e8ade85358bc6efc614008cab72898b4b4952bea0509ff", size = 2159542, upload-time = "2026-05-06T13:39:27.506Z" }, + { url = "https://files.pythonhosted.org/packages/1d/a2/367df868eb584dacf6bf82a389272406d7178e301c4ac82545ab98bc2dd9/pydantic_core-2.46.4-cp314-cp314t-musllinux_1_1_aarch64.whl", hash = "sha256:97e7cf2be5c77b7d1a9713a05605d49460d02c6078d38d8bef3cbe323c548424", size = 2168146, upload-time = "2026-05-06T13:38:31.93Z" }, + { url = "https://files.pythonhosted.org/packages/c1/b8/4460f77f7e201893f649a29ab355dddd3beee8a97bcb1a320db414f9a06e/pydantic_core-2.46.4-cp314-cp314t-musllinux_1_1_armv7l.whl", hash = "sha256:3bf92c5d0e00fefaab325a4d27828fe6b6e2a21848686b5b60d2d9eeb09d76c6", size = 2306309, upload-time = "2026-05-06T13:37:44.717Z" }, + { url = "https://files.pythonhosted.org/packages/64/c4/be2639293acd87dc8ddbcec41a73cee9b2ebf996fe6d892a1a74e88ad3f7/pydantic_core-2.46.4-cp314-cp314t-musllinux_1_1_x86_64.whl", hash = "sha256:3ecbc122d18468d06ca279dc26a8c2e2d5acb10943bb35e36ae92096dc3b5565", size = 2369736, upload-time = "2026-05-06T13:37:05.645Z" }, + { url = "https://files.pythonhosted.org/packages/30/a6/9f9f380dbb301f67023bf8f707aaa75daadf84f7152d95c410fd7e81d994/pydantic_core-2.46.4-cp314-cp314t-win32.whl", hash = "sha256:e846ae7835bf0703ae43f534ab79a867146dadd59dc9ca5c8b53d5c8f7c9ef02", size = 1955575, upload-time = "2026-05-06T13:38:51.116Z" }, + { url = "https://files.pythonhosted.org/packages/40/1f/f1eb9eb350e795d1af8586289746f5c5677d16043040d63710e22abc43c9/pydantic_core-2.46.4-cp314-cp314t-win_amd64.whl", hash = "sha256:2108ba5c1c1eca18030634489dc544844144ee36357f2f9f780b93e7ddbb44b5", size = 2051624, upload-time = "2026-05-06T13:38:21.672Z" }, + { url = "https://files.pythonhosted.org/packages/f6/d2/42dd53d0a85c27606f316d3aa5d2869c4e8470a5ed6dec30e4a1abe19192/pydantic_core-2.46.4-cp314-cp314t-win_arm64.whl", hash = "sha256:4fcbe087dbc2068af7eda3aa87634eba216dbda64d1ae73c8684b621d33f6596", size = 2017325, upload-time = "2026-05-06T13:40:52.723Z" }, + { url = "https://files.pythonhosted.org/packages/ee/a4/73995fd4ebbb46ba0ee51e6fa049b8f02c40daebb762208feda8a6b7894d/pydantic_core-2.46.4-graalpy311-graalpy242_311_native-macosx_10_12_x86_64.whl", hash = "sha256:14d4edf427bdcf950a8a02d7cb44a08614388dd6e1bdcbf4f67504fa7887da9c", size = 2111589, upload-time = "2026-05-06T13:37:10.817Z" }, + { url = "https://files.pythonhosted.org/packages/fb/7f/f37d3a5e8bfcc2e403f5c57a730f2d815693fb42119e8ea48b3789335af1/pydantic_core-2.46.4-graalpy311-graalpy242_311_native-macosx_11_0_arm64.whl", hash = "sha256:0ce40cd7b21210e99342afafbd4d0f76d784eb5b1d60f3bdc566be4983c6c73b", size = 1944552, upload-time = "2026-05-06T13:36:56.717Z" }, + { url = "https://files.pythonhosted.org/packages/15/3c/d7eb777b3ff43e8433a4efb39a17aa8fd98a4ee8561a24a67ef5db07b2d6/pydantic_core-2.46.4-graalpy311-graalpy242_311_native-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:90884113d8b48f760e9587002789ddd741e76ab9f89518cd1e43b1f1a52ec44b", size = 1982984, upload-time = "2026-05-06T13:39:06.207Z" }, + { url = "https://files.pythonhosted.org/packages/63/87/70b9f40170a81afd55ca26c9b2acb25c20d64bcfbf888fafecb3ba077d4c/pydantic_core-2.46.4-graalpy311-graalpy242_311_native-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:66ce7632c22d837c95301830e111ad0128a32b8207533b60896a96c4915192ea", size = 2138417, upload-time = "2026-05-06T13:39:45.476Z" }, + { url = "https://files.pythonhosted.org/packages/9d/1d/8987ad40f65ae1432753072f214fb5c74fe47ffbd0698bb9cbbb585664f8/pydantic_core-2.46.4-graalpy312-graalpy250_312_native-macosx_10_12_x86_64.whl", hash = "sha256:1d8ba486450b14f3b1d63bc521d410ec7565e52f887b9fb671791886436a42f7", size = 2095527, upload-time = "2026-05-06T13:39:52.283Z" }, + { url = "https://files.pythonhosted.org/packages/64/d3/84c282a7eee1d3ac4c0377546ef5a1ea436ce26840d9ac3b7ed54a377507/pydantic_core-2.46.4-graalpy312-graalpy250_312_native-macosx_11_0_arm64.whl", hash = "sha256:3009f12e4e90b7f88b4f9adb1b0c4a3d58fe7820f3238c190047209d148026df", size = 1936024, upload-time = "2026-05-06T13:40:15.671Z" }, + { url = "https://files.pythonhosted.org/packages/d7/ca/eac61596cdeb4d7e174d3dc0bd8a6238f14f75f97a24e7b7db4c7e7340a0/pydantic_core-2.46.4-graalpy312-graalpy250_312_native-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ad785e92e6dc634c21555edc8bd6b64957ab844541bcb96a1366c202951ae526", size = 1990696, upload-time = "2026-05-06T13:38:34.717Z" }, + { url = "https://files.pythonhosted.org/packages/fa/c3/7c8b240552251faf6b3a957db200fcfbbcec36763c050428b601e0c9b83b/pydantic_core-2.46.4-graalpy312-graalpy250_312_native-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:00c603d540afdd6b80eb39f078f33ebd46211f02f33e34a32d9f053bba711de0", size = 2147590, upload-time = "2026-05-06T13:39:29.883Z" }, + { url = "https://files.pythonhosted.org/packages/11/cb/428de0385b6c8d44b716feba566abfacfbd23ee3c4439faa789a1456242f/pydantic_core-2.46.4-pp311-pypy311_pp73-macosx_10_12_x86_64.whl", hash = "sha256:0c563b08bca408dc7f65f700633d8442fffb2421fc47b8101377e9fd65051ff0", size = 2112782, upload-time = "2026-05-06T13:37:04.016Z" }, + { url = "https://files.pythonhosted.org/packages/0b/b5/6a17bdadd0fc1f170adfd05a20d37c832f52b117b4d9131da1f41bb097ce/pydantic_core-2.46.4-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:db06ffe51636ffe9ca531fe9023dd64bdd794be8754cb5df57c5498ae5b518a7", size = 1952146, upload-time = "2026-05-06T13:39:43.092Z" }, + { url = "https://files.pythonhosted.org/packages/2a/dc/03734d80e362cd43ef65428e9de77c730ce7f2f11c60d2b1e1b39f0fbf99/pydantic_core-2.46.4-pp311-pypy311_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:133878133d271ade3d41d1bfb2a45ec38dbdbda40bc065921c6b04e4630127e2", size = 2134492, upload-time = "2026-05-06T13:36:58.124Z" }, + { url = "https://files.pythonhosted.org/packages/de/df/5e5ffc085ed07cc22d298134d3d911c63e91f6a0eb91fe646750a3209910/pydantic_core-2.46.4-pp311-pypy311_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:9bc519fbf2b7578398853d815009ae5e4d4603d12f4e3f91da8c06852d3da3e9", size = 2156604, upload-time = "2026-05-06T13:37:49.88Z" }, + { url = "https://files.pythonhosted.org/packages/81/44/6e112a4253e56f5705467cbab7ab5e91ee7398ba3d56d358635958893d3e/pydantic_core-2.46.4-pp311-pypy311_pp73-musllinux_1_1_aarch64.whl", hash = "sha256:c7a7bd4e39e8e4c12c39cd480356842b6a8a06e41b23a55a5e3e191718838ddf", size = 2183828, upload-time = "2026-05-06T13:37:43.053Z" }, + { url = "https://files.pythonhosted.org/packages/ac/ad/5565071e937d8e752842ac241463944c9eb14c87e2d269f2658a5bd05e98/pydantic_core-2.46.4-pp311-pypy311_pp73-musllinux_1_1_armv7l.whl", hash = "sha256:d396ec2b979760aaf3218e76c24e65bd0aca24983298653b3a9d7a45f9e47b30", size = 2310000, upload-time = "2026-05-06T13:37:56.694Z" }, + { url = "https://files.pythonhosted.org/packages/4f/c3/66883a5cec183e7fba4d024b4cbbe61851a63750ef606b0afecc46d1f2bf/pydantic_core-2.46.4-pp311-pypy311_pp73-musllinux_1_1_x86_64.whl", hash = "sha256:86e1a4418c6cd97d60c95c71164158eaf7324fae7b0923264016baa993eba6fc", size = 2361286, upload-time = "2026-05-06T13:40:05.667Z" }, + { url = "https://files.pythonhosted.org/packages/4b/2d/69abac8f838090bbecd5df894befb2c2619e7996a98ddb949db9f3b93225/pydantic_core-2.46.4-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:d51026d73fcfd93610abc7b27789c26b313920fcfb20e27462d74a7f8b06e983", size = 2193071, upload-time = "2026-05-06T13:38:08.682Z" }, +] + +[[package]] +name = "pydantic-settings" +version = "2.14.1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "pydantic" }, + { name = "python-dotenv" }, + { name = "typing-inspection" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/07/60/1d1e59c9c90d54591469ada7d268251f71c24bdb765f1a8a832cee8c6653/pydantic_settings-2.14.1.tar.gz", hash = "sha256:e874d3bec7e787b0c9958277956ed9b4dd5de6a80e162188fdaff7c5e26fd5fa", size = 235551, upload-time = "2026-05-08T13:40:06.542Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/ae/8d/f1af3832f5e6eb13ba94ee809e72b8ecb5eef226d27ee0bef7d963d943c7/pydantic_settings-2.14.1-py3-none-any.whl", hash = "sha256:6e3c7edfd8277687cdc598f56e5cff0e9bfff0910a3749deaa8d4401c3a2b9de", size = 60964, upload-time = "2026-05-08T13:40:04.958Z" }, +] + +[[package]] +name = "pyflakes" +version = "3.4.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/45/dc/fd034dc20b4b264b3d015808458391acbf9df40b1e54750ef175d39180b1/pyflakes-3.4.0.tar.gz", hash = "sha256:b24f96fafb7d2ab0ec5075b7350b3d2d2218eab42003821c06344973d3ea2f58", size = 64669, upload-time = "2025-06-20T18:45:27.834Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/c2/2f/81d580a0fb83baeb066698975cb14a618bdbed7720678566f1b046a95fe8/pyflakes-3.4.0-py2.py3-none-any.whl", hash = "sha256:f742a7dbd0d9cb9ea41e9a24a918996e8170c799fa528688d40dd582c8265f4f", size = 63551, upload-time = "2025-06-20T18:45:26.937Z" }, +] + +[[package]] +name = "pygments" +version = "2.20.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/c3/b2/bc9c9196916376152d655522fdcebac55e66de6603a76a02bca1b6414f6c/pygments-2.20.0.tar.gz", hash = "sha256:6757cd03768053ff99f3039c1a36d6c0aa0b263438fcab17520b30a303a82b5f", size = 4955991, upload-time = "2026-03-29T13:29:33.898Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/f4/7e/a72dd26f3b0f4f2bf1dd8923c85f7ceb43172af56d63c7383eb62b332364/pygments-2.20.0-py3-none-any.whl", hash = "sha256:81a9e26dd42fd28a23a2d169d86d7ac03b46e2f8b59ed4698fb4785f946d0176", size = 1231151, upload-time = "2026-03-29T13:29:30.038Z" }, +] + +[[package]] +name = "pymatgen" +version = "2026.5.4" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "pymatgen-core" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/0c/a1/727feae7083bb3b10ba9d43ccbbe83317d4654957a08cee52096ef86bfde/pymatgen-2026.5.4.tar.gz", hash = "sha256:4998d6084da72224c8025dc1e9645b2aab73896109a7ef1e05bd479a25a55b79", size = 743199, upload-time = "2026-05-04T22:03:24.675Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/a2/3a/de29b0b6c1740098c3ccdd3fa69336dc39b5efc6840a55e30dcaea01a19b/pymatgen-2026.5.4-py3-none-any.whl", hash = "sha256:7815cd4310c6d5a465b0da14a1633479cf61366676e62764db17f7e2a20d1974", size = 829056, upload-time = "2026-05-04T22:03:22.327Z" }, +] + +[[package]] +name = "pymatgen-core" +version = "2026.5.18" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "bibtexparser" }, + { name = "joblib" }, + { name = "lxml" }, + { name = "matplotlib" }, + { name = "monty" }, + { name = "networkx" }, + { name = "numpy" }, + { name = "orjson" }, + { name = "palettable" }, + { name = "pandas" }, + { name = "plotly" }, + { name = "requests" }, + { name = "scipy" }, + { name = "spglib" }, + { name = "sympy" }, + { name = "tabulate" }, + { name = "tqdm" }, + { name = "uncertainties" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/74/ed/b52bb7ab2b9ca0e69ea54b919ddba13c5636b960f7b9f4fab0d0aa0a502b/pymatgen_core-2026.5.18.tar.gz", hash = "sha256:bdbe8c591bbac7ed65922d710e94b661bb540baae27217ceadd59e31e9c3ff07", size = 2860012, upload-time = "2026-05-18T23:39:30.786Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/9d/14/1f02bea594033a000c68980a362ae670be7832e72281c8acbad35fbfb218/pymatgen_core-2026.5.18-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:d712b5098a281f6f499f039b079d9c45d8d45d83d378de42261c5aa9333e3ce1", size = 2923247, upload-time = "2026-05-18T23:39:28.443Z" }, + { url = "https://files.pythonhosted.org/packages/0d/bd/fc63c1c6be5bf0aeb810f12374f14ad3a0bad7b14736649e2ebe960f51d0/pymatgen_core-2026.5.18-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:69a51c5332bc9666f05f07d3e0a5f9eef28c44681bfe05781628b9e2846df07b", size = 4434150, upload-time = "2026-05-19T02:15:06.754Z" }, + { url = "https://files.pythonhosted.org/packages/f5/c0/9a6668d441d51f87eebd3263cd49399179f980764d3ab0d3b9d1faa1e0fe/pymatgen_core-2026.5.18-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:f31bbf0821eeb5570defaa511e2152480cc39e1127d78551f01343a961e165f6", size = 4462716, upload-time = "2026-05-19T02:15:08.724Z" }, + { url = "https://files.pythonhosted.org/packages/c9/a2/6671b3059d1e87964cd8589ec622958ecd4755b84078b092d2e679999e4e/pymatgen_core-2026.5.18-cp311-cp311-win32.whl", hash = "sha256:f0956528c54ced5bbf648f947f05935ab8159656a8df24cf22cb251ec9d74a5d", size = 2858798, upload-time = "2026-05-19T02:15:10.602Z" }, + { url = "https://files.pythonhosted.org/packages/75/26/86520647872bdae9669009beaa01250d37ad6e1b3942a9c88c6610c757c0/pymatgen_core-2026.5.18-cp311-cp311-win_amd64.whl", hash = "sha256:d0b5991048433a0cfd153eb0bb5920740042ea67521d78a04de5390f70461b2a", size = 2900587, upload-time = "2026-05-19T02:15:12.385Z" }, + { url = "https://files.pythonhosted.org/packages/23/00/35ccf35580d6caa1a88ea427df9e23628d64aef53b5752d377581f013098/pymatgen_core-2026.5.18-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:26709975fb33070fdf1b1bde301694ef5774d39b91d6dc7b27876bf30fb068ad", size = 2927363, upload-time = "2026-05-19T02:15:14.143Z" }, + { url = "https://files.pythonhosted.org/packages/23/06/2931ca449754e2b7d895d2185c99515b0d12a3c44a2e05142cc756e2d137/pymatgen_core-2026.5.18-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:938688b6d897183f9612122cdeee7613967e189932842eaf40008210d257e5aa", size = 4434814, upload-time = "2026-05-19T02:15:15.673Z" }, + { url = "https://files.pythonhosted.org/packages/ca/21/a54cf445b00d6bdf71fafc35079f4e810755947d0f4758447dfe12ac44b6/pymatgen_core-2026.5.18-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:070230f3ecaec435f5896d9579f614e14020cc079e6443c15b9ea971841812c0", size = 4481429, upload-time = "2026-05-19T02:15:17.313Z" }, + { url = "https://files.pythonhosted.org/packages/4d/22/5c8c8abd8367e387ec97c32c8504c1f1ef821fc41e8bd325fe40c6aa866f/pymatgen_core-2026.5.18-cp312-cp312-win32.whl", hash = "sha256:21615334c07d2211f2c9420181cab3f1aace66a7a3673f8cdbbeb27741681ed0", size = 2857740, upload-time = "2026-05-19T02:15:19.333Z" }, + { url = "https://files.pythonhosted.org/packages/26/6e/c0502db344f707469683c26bb685f918b6bdfb79211a2fa9fafe63636d3c/pymatgen_core-2026.5.18-cp312-cp312-win_amd64.whl", hash = "sha256:46e87242e881b44034cf9a9480c0bbc39f566c2918126689aa6898b3538e18ec", size = 2900927, upload-time = "2026-05-19T02:15:21.179Z" }, + { url = "https://files.pythonhosted.org/packages/7d/93/bb20fe038df5c36214fcded3c1b23623fdc00465bf300a1e3603dadf42c2/pymatgen_core-2026.5.18-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:531ab9284e48890bd29a537f6183c52fd9e5488cb86d125ac2c7ebe0a2bfd239", size = 2925181, upload-time = "2026-05-19T02:15:23.288Z" }, + { url = "https://files.pythonhosted.org/packages/81/d8/7a6eab09b88ca5a4997e19f080cb43eccbda1f70fcd213b14df36db14616/pymatgen_core-2026.5.18-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:1f5eced053f989fb5818ced84cc26dc88a06522740c24a0b410674b386ad331d", size = 4416899, upload-time = "2026-05-19T02:15:25.216Z" }, + { url = "https://files.pythonhosted.org/packages/9d/5b/17bdac8864553080fe076cd511052dc031bf7f422ebf14d3bc801a1f0874/pymatgen_core-2026.5.18-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:123be72bb2df4f22534f0926c2ffc188594251f2998ab7d9df6f76db81ae466b", size = 4462454, upload-time = "2026-05-19T02:15:27.151Z" }, + { url = "https://files.pythonhosted.org/packages/08/cd/a8850adb8ba26fe77ac0b4efa77f4c03ebfa1e673c388c8cd0dac8d752b1/pymatgen_core-2026.5.18-cp313-cp313-win32.whl", hash = "sha256:12391b53f98c6bae5a4875c1efc558f303857e06347580f31e3d79c2353c86e8", size = 2857426, upload-time = "2026-05-19T02:15:29.062Z" }, + { url = "https://files.pythonhosted.org/packages/cd/41/57d429a2a8f7a9599735823580da304e30066ac9029f78a8af88ae041990/pymatgen_core-2026.5.18-cp313-cp313-win_amd64.whl", hash = "sha256:417a4410537b49cd7d4970518ece69182ba7cae0c71e7f7fb9bd15b896e059f4", size = 2900292, upload-time = "2026-05-19T02:15:30.528Z" }, + { url = "https://files.pythonhosted.org/packages/24/cf/c075084fc03fbb11ccc9a5d07d37163eb2dfaf6b6981cbec7c1f7955bd6b/pymatgen_core-2026.5.18-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:41f390215a28ba9c5fba5ccf414a0dca6824a4d463d09008eacc59dfe89c5f45", size = 2927369, upload-time = "2026-05-19T02:15:32.055Z" }, + { url = "https://files.pythonhosted.org/packages/b7/30/45cb3d86a9b9ff20fee497e5fe3a10e922785fa269d597a76c19066d4207/pymatgen_core-2026.5.18-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:31833fa81a264842e782039f4cf46a9ceaacb485639ea3d4606f3d06e1d1d6d6", size = 4413086, upload-time = "2026-05-19T02:15:34.007Z" }, + { url = "https://files.pythonhosted.org/packages/19/b8/548cf1d1b78e03535fa2b2fe90860946ed45c1b29befd3d1fe43fc87a005/pymatgen_core-2026.5.18-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:7199b2f7ae7e0ba5ae3af23f5d16e13ae69a37d4015d94d4f62d5ada544fb4eb", size = 4448826, upload-time = "2026-05-19T02:15:35.761Z" }, + { url = "https://files.pythonhosted.org/packages/39/09/2d8e42942421d35e2f0c4db92d7fd9eb52f2f03d688999592a9f758afd4f/pymatgen_core-2026.5.18-cp314-cp314-win32.whl", hash = "sha256:845a4337c84bfbd1e48e9c3200ae6b1868d1486a0e8e277e16d3dc64c46e4f17", size = 2843984, upload-time = "2026-05-19T02:15:37.379Z" }, + { url = "https://files.pythonhosted.org/packages/d3/6a/8233be4b903bd3ff6e04556b025e1b476cc1918675c2d6b4383db868f9ce/pymatgen_core-2026.5.18-cp314-cp314-win_amd64.whl", hash = "sha256:f4d1a2f2f37b25ff3ce33dd6ff06303b2d1d735c8a525ba2a970e25803afc4b0", size = 2887831, upload-time = "2026-05-19T02:15:38.902Z" }, +] + +[[package]] +name = "pymongo" +version = "4.17.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "dnspython" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/ca/64/50be6fbac9c79fe2e4c17401a467da2d8764d82833d83cec325afe5cab32/pymongo-4.17.0.tar.gz", hash = "sha256:70ffa08ba641468cc068cf46c06b34f01a8ce3489f6411309fcb5ceabe6b2fc0", size = 2523370, upload-time = "2026-04-20T16:39:53.524Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/c4/e2/336d86f221cf1b56b2ed9330d4a3b98f9f38f0b37829ae9a9184617d5419/pymongo-4.17.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:4141e6c6a339789b2974efa00ecd9409101672d77a0e3ee2cc3839eedf8ec4df", size = 874668, upload-time = "2026-04-20T16:37:41.39Z" }, + { url = "https://files.pythonhosted.org/packages/34/8e/75d3c6c935d187ab59c61e9c15d9aab3f274b563eaf1706e8cae5f508dec/pymongo-4.17.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:e68c76b84e0c132d9dbf9307f12ff8185702328187a87b9aca8c941303873433", size = 875294, upload-time = "2026-04-20T16:37:43.432Z" }, + { url = "https://files.pythonhosted.org/packages/5f/ec/62e855744489dbcd54fd778aae4d80fa4c4819e8fb228ca0cf6f21a03997/pymongo-4.17.0-cp311-cp311-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:ba2195d4f386f839a52a23ea1cfd60ffaaba78a3d7841db51b7e433001139918", size = 1496233, upload-time = "2026-04-20T16:37:45.518Z" }, + { url = "https://files.pythonhosted.org/packages/82/e8/93e4e5e5ce8fdf8929dabeefe24aafa5ce046028eed0dfa8eeb936e72c49/pymongo-4.17.0-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:8446ff4bfcb6ec2a2e50998c860986a1e992136f998b7f53e7a717fb8aa5a0b9", size = 1522927, upload-time = "2026-04-20T16:37:47.492Z" }, + { url = "https://files.pythonhosted.org/packages/f7/ca/425dc1d21e0f17bdea0072fc463f662f7fa06d2852af52975c9eced3c07c/pymongo-4.17.0-cp311-cp311-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:2a0d5ac205728c86e0a02192f1aa5f865b0d7d51f8df6101c01a69a7fc620d72", size = 1583468, upload-time = "2026-04-20T16:37:49.221Z" }, + { url = "https://files.pythonhosted.org/packages/b3/9d/f08b07eeffda1a43c1759f0fa625e88ae12360996eb56d42aad832fa7dff/pymongo-4.17.0-cp311-cp311-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:485c8a8eaa4c739f00a331fc73757898ee7c092c214a79e63866ff76aaf282ff", size = 1572787, upload-time = "2026-04-20T16:37:51.061Z" }, + { url = "https://files.pythonhosted.org/packages/e9/c2/6855a07aafa7b894929af23675b6fb9634800ce43122b76a62f6eeb8da2a/pymongo-4.17.0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:b2dfcc795f5b9fedbe179a11fdf6051581479d196582a3fe819a92a00e9b9969", size = 1526184, upload-time = "2026-04-20T16:37:53.358Z" }, + { url = "https://files.pythonhosted.org/packages/4e/05/c952bac7db71c1942ea3559fcd308b49754cc5004b455935fb4000d1f37b/pymongo-4.17.0-cp311-cp311-win32.whl", hash = "sha256:c2292144505fb12156b981bd440f3dc994a883da06ac726c0c8692ccdbc1c510", size = 852621, upload-time = "2026-04-20T16:37:55.28Z" }, + { url = "https://files.pythonhosted.org/packages/11/c0/c04da9f4c0c6252404598f4e394b862a58a9e866822a70ae261c8a018fdf/pymongo-4.17.0-cp311-cp311-win_amd64.whl", hash = "sha256:2e190827834fce70ecdf9d46796c6dbc0ce08ea87dc2ff5bc6f3f5579b605cb9", size = 867852, upload-time = "2026-04-20T16:37:57.233Z" }, + { url = "https://files.pythonhosted.org/packages/1d/b2/c7b4870fbeef471e947d3e014676f5910d02e0197074d692ebcf24ec049a/pymongo-4.17.0-cp311-cp311-win_arm64.whl", hash = "sha256:a8f9c40a09bb7d4b9fc8b1da65ecf6efa79bda5cb2756f39d9b6940fac1d19ae", size = 855019, upload-time = "2026-04-20T16:37:58.983Z" }, + { url = "https://files.pythonhosted.org/packages/98/90/60bcb508840135d5ee46b51b1a950f548338aa8145a8366dbe6639ae51ac/pymongo-4.17.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:d53ffa94b2340dbf6b055e09a0090618c60482c158ecfc9565642fc996bf0944", size = 930529, upload-time = "2026-04-20T16:38:00.936Z" }, + { url = "https://files.pythonhosted.org/packages/a6/e9/313840f1e52c6dfac47f704428cbfbce59956ebe7633bffc92b03f74f0ad/pymongo-4.17.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:6fe0de9d0f6791abce3471230b32b4817bf89d27b1182b6a550e1ec0fa72aa9a", size = 930665, upload-time = "2026-04-20T16:38:02.915Z" }, + { url = "https://files.pythonhosted.org/packages/78/35/9d3565ea45b1606f635c1e2cd2563c28d66caafdc50f7ad7d979fcd1b363/pymongo-4.17.0-cp312-cp312-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:e537e95514dae1aaa718f481ec03151a0f0394bcd05f1322896d8fc1330cb729", size = 1762369, upload-time = "2026-04-20T16:38:05.375Z" }, + { url = "https://files.pythonhosted.org/packages/95/ee/149b0d4b1a11c38bff6f14c23d5814c9b0843fd6dc38ad40596bdb1a62d2/pymongo-4.17.0-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:37a8385c29881b43eab31f584100fa0eaddedd5607adf010147ba1810118be90", size = 1798044, upload-time = "2026-04-20T16:38:07.195Z" }, + { url = "https://files.pythonhosted.org/packages/7b/d4/4cee4a7b8d8f6f0550ef6cd2fea42455c5ed619a220cb6ba4fb40d6a5bc8/pymongo-4.17.0-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:f3ee3d241ed77a4fc99ce3cff3b289c3ebce37f61fdd7349d3592c23b82c8784", size = 1878567, upload-time = "2026-04-20T16:38:09.121Z" }, + { url = "https://files.pythonhosted.org/packages/45/ef/7fe366c84952619ee2f69973566c214775e083dd4df465751912153e4b72/pymongo-4.17.0-cp312-cp312-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:9eb5d63a3c518cb0804ed678f5e2b875af032d89a7cf57a57360322cf6a4d222", size = 1864881, upload-time = "2026-04-20T16:38:10.896Z" }, + { url = "https://files.pythonhosted.org/packages/2f/35/b577d82c6d1be7aee7ac7e249bc86f7847998345042e5f8360de238e177b/pymongo-4.17.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:8e97e03fa13327c87e3fdc5656acd01e71817f0c1dc3221cd8f30de136bf4ec3", size = 1800349, upload-time = "2026-04-20T16:38:13.589Z" }, + { url = "https://files.pythonhosted.org/packages/b8/69/dafcf04f66e130ddd91aeb92e7a692480eda46dcd04ec1dbe82c06619e10/pymongo-4.17.0-cp312-cp312-win32.whl", hash = "sha256:6877214bff5f06f6884a9fc8d9016a4a7a5f51f537f5c51ac3a576f93e7dfb32", size = 900518, upload-time = "2026-04-20T16:38:15.541Z" }, + { url = "https://files.pythonhosted.org/packages/11/35/5c9262a459f988b4eb2605f70815240b77a0d4131136c4326d18f1822b89/pymongo-4.17.0-cp312-cp312-win_amd64.whl", hash = "sha256:9828485f72f63c7d802e0ec41f71906f633c2692621ab3af55ca990186b091b1", size = 920335, upload-time = "2026-04-20T16:38:17.665Z" }, + { url = "https://files.pythonhosted.org/packages/8d/da/e9c7265ee176faccf4e52c4797837e794d93569a1046f6b19a4acc36e5ad/pymongo-4.17.0-cp312-cp312-win_arm64.whl", hash = "sha256:1195370a77baf003b59b10e91ecc4706297197f0dd9d29c840cc556dc08f7cee", size = 903289, upload-time = "2026-04-20T16:38:19.33Z" }, + { url = "https://files.pythonhosted.org/packages/2a/6b/c1206879708b94e82fcd8b9653440ec271f79a3674d122192df383047f5a/pymongo-4.17.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:809ec74de3b9148ae43fa8df9faf53470f511c8d384f13b99d6f671f2a379f15", size = 985829, upload-time = "2026-04-20T16:38:21.031Z" }, + { url = "https://files.pythonhosted.org/packages/cb/cf/bb044ed85160e5c40f568c7c4f4e8ea16f40764ff5d302e5befbe8f6f814/pymongo-4.17.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:a431b737816bf4cddd4fa0fcef04e424ad36b7692734a64150f872fb8f3208be", size = 985899, upload-time = "2026-04-20T16:38:23.409Z" }, + { url = "https://files.pythonhosted.org/packages/74/0a/f6dfd5ea3901e5d6888da8de8ba728971a1d447debab681cfc56f90d1208/pymongo-4.17.0-cp313-cp313-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:e4fab10f8403169ce92f3cea921609d9ee81107306caae06c08f592d4b8ad2b5", size = 2028569, upload-time = "2026-04-20T16:38:25.343Z" }, + { url = "https://files.pythonhosted.org/packages/4a/c5/081f59a1c02ae8c0dc73ae58e563838c44eec81aeafa7d0b93a637841c9b/pymongo-4.17.0-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:20323b0b1c1d33770ad1fc68d429c757734ce9ad3594421c3d6618f10572b1b9", size = 2072916, upload-time = "2026-04-20T16:38:27.291Z" }, + { url = "https://files.pythonhosted.org/packages/31/42/6e41d434297ffe8b30d9c3717916591a4a7be9075a0dcc2fafdfaaaa62ed/pymongo-4.17.0-cp313-cp313-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:5a5de048e6da5c18e27cc2437e8c15b3b0cdc8385c15b41178b0caa3322a09c2", size = 2173234, upload-time = "2026-04-20T16:38:29.474Z" }, + { url = "https://files.pythonhosted.org/packages/3d/cf/1e4a7db352ef9485831c7268dfe8402f0117b32a9ad54b16e810699e3617/pymongo-4.17.0-cp313-cp313-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:dff3de1294fbbc1db0ba6b511f77b8e540601d092538a31312e99c8a91a78b1e", size = 2156784, upload-time = "2026-04-20T16:38:32.134Z" }, + { url = "https://files.pythonhosted.org/packages/12/10/6195be29962a61ebb5f4bd9e4c7519890b172f7968a0a0d880398c6ddb02/pymongo-4.17.0-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:faf03e4c2aafd6de626dbd30ba246d369ae33f47f10629d1bbe40f72115027a6", size = 2074446, upload-time = "2026-04-20T16:38:34.004Z" }, + { url = "https://files.pythonhosted.org/packages/37/48/33410b8819837ed370c738587306bdf060b59cef11823be212f4a07703c5/pymongo-4.17.0-cp313-cp313-win32.whl", hash = "sha256:c9786665926a09630c5d420c79762cfadbff35a9438bcbc4c81a9fb5ab9228b7", size = 948435, upload-time = "2026-04-20T16:38:35.922Z" }, + { url = "https://files.pythonhosted.org/packages/6f/77/c0ed522f798a286b99acaa7914ed8d9c80ab091f97f57c59ffed72906e5e/pymongo-4.17.0-cp313-cp313-win_amd64.whl", hash = "sha256:5960519b4d7168f1ecdd3ea10c81b2aedeb9423651aca953cfbc8e76705d3b38", size = 972847, upload-time = "2026-04-20T16:38:37.888Z" }, + { url = "https://files.pythonhosted.org/packages/97/f0/c39480a2db385fde23861d0c8acda41cdaf1d43e46579db72c5c013a2e81/pymongo-4.17.0-cp313-cp313-win_arm64.whl", hash = "sha256:0ff6bd2f735ab5356541e3e57d5b7dbfbc3f2ee1ccb10b6b0f82d58af69d1d8e", size = 951575, upload-time = "2026-04-20T16:38:40.544Z" }, + { url = "https://files.pythonhosted.org/packages/da/49/2b0250762a89737ed6f9cea238331baca061b89a8ddd10dd17fee52c3970/pymongo-4.17.0-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:ff5aa3f1c7e3f08eb0e7a016c91ba468b1850ccfd63d9b1f12f56350f4974cef", size = 1040945, upload-time = "2026-04-20T16:38:42.783Z" }, + { url = "https://files.pythonhosted.org/packages/89/1c/7a9b5447a08be20e84b6e5b17330917e8d6d9507daa3cd099a9309f11ad7/pymongo-4.17.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:e816db649ba5d7de0568cf3a9f287a9dc9aad21cf0ca667ab156a7ef47fca0b0", size = 1041187, upload-time = "2026-04-20T16:38:45.358Z" }, + { url = "https://files.pythonhosted.org/packages/78/a1/71704f61632dfc90407a5834fe5f6132854937c4a3648f6c05c351d85a45/pymongo-4.17.0-cp314-cp314-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:12c4fded3a9f1d6a687e36ebd384ac6d00b9b00de1969aa74048e7051ec2a713", size = 2294806, upload-time = "2026-04-20T16:38:47.734Z" }, + { url = "https://files.pythonhosted.org/packages/ad/b9/aff42be75108b96c2469b1d9329b912c15108f3e7ef32fdc86da8423c330/pymongo-4.17.0-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:2db66aa8dd253a0fc1fad3b0d23d5b3993f7ebde02fbbd7727128debf2853675", size = 2348231, upload-time = "2026-04-20T16:38:50.371Z" }, + { url = "https://files.pythonhosted.org/packages/f2/30/44c115b8ba1479942c15fd9480eb29a7da0ba68acd56983423ba0deb4a94/pymongo-4.17.0-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:3987e96e7c7be4083d42e8ac2cc6c0d5b78db9973c90fce42ae800b616ca6b20", size = 2467614, upload-time = "2026-04-20T16:38:52.665Z" }, + { url = "https://files.pythonhosted.org/packages/d2/84/21ee95c8bf0ca7acae7ec7eb365d740bf8fc0156c194baf2c3bdfcb85ec0/pymongo-4.17.0-cp314-cp314-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:cee36b3c0d0354f880fa7a7fdcdaf2bb5e542c2281e25c1bfadf8cfe21eba7d2", size = 2445970, upload-time = "2026-04-20T16:38:55.175Z" }, + { url = "https://files.pythonhosted.org/packages/06/89/081d7f1809d5ca09d1e47e49f2111b245f5694de3a7af32cd3a353a6f43f/pymongo-4.17.0-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:320b34457b20bbcc79997801f95d25ce00472915ca5241167242b42c4359e027", size = 2348605, upload-time = "2026-04-20T16:38:57.557Z" }, + { url = "https://files.pythonhosted.org/packages/ea/c3/0d949f9d3f2a341c1f635c398c16615e96f89f51ff424ed81e914cf1a4de/pymongo-4.17.0-cp314-cp314-win32.whl", hash = "sha256:df4a644af9ae132d4bfdb2e9516ea51a615fd881caddfbfbd071cf1354844479", size = 1004119, upload-time = "2026-04-20T16:39:00.309Z" }, + { url = "https://files.pythonhosted.org/packages/f7/55/5c3a3db1048054c695c75c5964cc8bedc2247fdb5a75ef6fab4ec8bb013e/pymongo-4.17.0-cp314-cp314-win_amd64.whl", hash = "sha256:c797f8a80957134f6dd9690367a0f8f5906d672119af2c6aa55f0c527b656bed", size = 1032314, upload-time = "2026-04-20T16:39:02.665Z" }, + { url = "https://files.pythonhosted.org/packages/e0/19/e235f39906134cb0ffd5574c5a59c355ef5380f0499644ab94994afbb109/pymongo-4.17.0-cp314-cp314-win_arm64.whl", hash = "sha256:68fca71e05ee5da23a8d73cee8379dfb3d26e609a377cae731d742771ed96946", size = 1007627, upload-time = "2026-04-20T16:39:04.678Z" }, + { url = "https://files.pythonhosted.org/packages/1e/e0/c4c1a86791415b14c684fa0908f9da96de91594a3fd1fa1b8dc689fbb800/pymongo-4.17.0-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:b4384700cffc3f1dd98e088bc0072dedf6d7d68a230bb4b972665cf69c071c1e", size = 1099151, upload-time = "2026-04-20T16:39:06.969Z" }, + { url = "https://files.pythonhosted.org/packages/81/4b/69c67f3e23fd9b23b9bedc7ebd23754881cc9d5c5d5b2a9811e96b07f475/pymongo-4.17.0-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:93641192644fa1ee0f34030e774fd31022a27ad11ba22cb1716142231524f8bd", size = 1099346, upload-time = "2026-04-20T16:39:08.996Z" }, + { url = "https://files.pythonhosted.org/packages/a2/19/a5208f62f9508a26d73acc69bd3821b8c8adae253679a3c26d2f9652f0d5/pymongo-4.17.0-cp314-cp314t-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:75bc3aa5b94fdb7138d357ec6ca61cd97e0c79f4f7f0bd3efe9639b15cc50942", size = 2619034, upload-time = "2026-04-20T16:39:11.049Z" }, + { url = "https://files.pythonhosted.org/packages/77/27/426cba1ec5973082a56d4150798529bfdf4151c31391ed1fbbecb23ef2ac/pymongo-4.17.0-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:50e8f8e23c6df7c6d6929f5e734980b227706e73ee847517c9ba5af90f7fc466", size = 2689939, upload-time = "2026-04-20T16:39:13.617Z" }, + { url = "https://files.pythonhosted.org/packages/ef/2e/f70993d1255e33f6ee59a4ec4371cc65bff7a7e3fda7d55c3386f25287e8/pymongo-4.17.0-cp314-cp314t-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:15d3f3d732aecac1f8d481bde4029755615639bd3076f258a2147210aec8515a", size = 2824994, upload-time = "2026-04-20T16:39:16.057Z" }, + { url = "https://files.pythonhosted.org/packages/b3/eb/87b0e988ba889e1fcc3430c2cfc166b251872c813e92b43174298bee17ff/pymongo-4.17.0-cp314-cp314t-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:6c5f62862d0f87be481fa1fe8cb811994486773c94a2b61e509285e3f2890763", size = 2801745, upload-time = "2026-04-20T16:39:18.476Z" }, + { url = "https://files.pythonhosted.org/packages/67/4c/3f83412d086f682d4d468761d66ddc49cf161e786ea74073045eb4491c60/pymongo-4.17.0-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:64837adbbd72073301af51bb0fc80e3d7707fe5527cea1033ba0320f0b2f881b", size = 2684636, upload-time = "2026-04-20T16:39:20.878Z" }, + { url = "https://files.pythonhosted.org/packages/9e/d8/b75f6f4ab6c8beb50b0270a4f1e2530b5774f5e116563440e1677ca1820f/pymongo-4.17.0-cp314-cp314t-win32.whl", hash = "sha256:b93b22eedc62598cf5ee9d8c8007a8e9121c50fd88137012d8985500e9dc3151", size = 1056356, upload-time = "2026-04-20T16:39:22.996Z" }, + { url = "https://files.pythonhosted.org/packages/e4/5e/648c8a238eef18a25ed8a169ea6542d4a860bbec3e95b3d9badac2935c71/pymongo-4.17.0-cp314-cp314t-win_amd64.whl", hash = "sha256:3689ea34f6b647c7d1e7bdc60fcfb214b2789ed1359a7fb96569c69f50e5f18f", size = 1090964, upload-time = "2026-04-20T16:39:24.989Z" }, + { url = "https://files.pythonhosted.org/packages/dc/cb/d9780b66939c4fc1f024bcc7be23a2abcfe06a9745ca8fa76dc73395482e/pymongo-4.17.0-cp314-cp314t-win_arm64.whl", hash = "sha256:9543d8f84c2e5608565c08ac679774811e6730770d8a645439b073422a4276fb", size = 1058526, upload-time = "2026-04-20T16:39:27.924Z" }, +] + +[[package]] +name = "pyopenssl" +version = "26.2.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "cryptography" }, + { name = "typing-extensions", marker = "python_full_version < '3.13'" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/1a/51/27a5ad5f939d08f690a326ef9582cda7140555180db71695f6fb747d6a36/pyopenssl-26.2.0.tar.gz", hash = "sha256:8c6fcecd1183a7fc897548dfe388b0cdb7f37e018200d8409cf33959dbe35387", size = 182195, upload-time = "2026-05-04T23:06:09.72Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/73/b8/a0e2790ae249d6f38c9f66de7a211621a7ab2650217bcd04e1262f578a56/pyopenssl-26.2.0-py3-none-any.whl", hash = "sha256:4f9d971bc5298b8bc1fab282803da04bf000c755d4ad9d99b52de2569ca19a70", size = 55823, upload-time = "2026-05-04T23:06:08.395Z" }, +] + +[[package]] +name = "pyparsing" +version = "3.3.2" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/f3/91/9c6ee907786a473bf81c5f53cf703ba0957b23ab84c264080fb5a450416f/pyparsing-3.3.2.tar.gz", hash = "sha256:c777f4d763f140633dcb6d8a3eda953bf7a214dc4eff598413c070bcdc117cbc", size = 6851574, upload-time = "2026-01-21T03:57:59.36Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/10/bd/c038d7cc38edc1aa5bf91ab8068b63d4308c66c4c8bb3cbba7dfbc049f9c/pyparsing-3.3.2-py3-none-any.whl", hash = "sha256:850ba148bd908d7e2411587e247a1e4f0327839c40e2e5e6d05a007ecc69911d", size = 122781, upload-time = "2026-01-21T03:57:55.912Z" }, +] + +[[package]] +name = "pytest" +version = "9.0.3" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "colorama", marker = "sys_platform == 'win32'" }, + { name = "iniconfig" }, + { name = "packaging" }, + { name = "pluggy" }, + { name = "pygments" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/7d/0d/549bd94f1a0a402dc8cf64563a117c0f3765662e2e668477624baeec44d5/pytest-9.0.3.tar.gz", hash = "sha256:b86ada508af81d19edeb213c681b1d48246c1a91d304c6c81a427674c17eb91c", size = 1572165, upload-time = "2026-04-07T17:16:18.027Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/d4/24/a372aaf5c9b7208e7112038812994107bc65a84cd00e0354a88c2c77a617/pytest-9.0.3-py3-none-any.whl", hash = "sha256:2c5efc453d45394fdd706ade797c0a81091eccd1d6e4bccfcd476e2b8e0ab5d9", size = 375249, upload-time = "2026-04-07T17:16:16.13Z" }, +] + +[[package]] +name = "pytest-flake8" +version = "1.3.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "flake8" }, + { name = "pytest" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/4f/83/3b0154ccd60191e24b75c99c5e7c6dcfb1d2fd81dd47528523b38fed6ac6/pytest_flake8-1.3.0.tar.gz", hash = "sha256:88fb35562ce32d915c6ba41ef0d5e1cfcdd8ff884a32b7d46aa99fc77a3d1fe6", size = 13340, upload-time = "2024-11-09T00:09:09.249Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/7d/ca/163e24b6d92ba3e92245a6a23e88b946c29ff5294b2f4bc24c7a6171a13d/pytest_flake8-1.3.0-py3-none-any.whl", hash = "sha256:de10517c59fce25c0a7abb2a2b2a9d0b0ceb59ff0add7fa8e654d613bb25e218", size = 5966, upload-time = "2024-11-09T00:09:08.227Z" }, +] + +[[package]] +name = "pytest-pycodestyle" +version = "2.5.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "pycodestyle" }, + { name = "pytest" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/0f/60/634e069a52137207b988359319c7030b25195f014822724f259325fa3af5/pytest_pycodestyle-2.5.0.tar.gz", hash = "sha256:dd0060039e12a59b521da8e57e17133c965566dd8d17631e589e7545238829ac", size = 5859, upload-time = "2025-07-20T03:18:12.504Z" } + +[[package]] +name = "pytest-xdist" +version = "3.8.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "execnet" }, + { name = "pytest" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/78/b4/439b179d1ff526791eb921115fca8e44e596a13efeda518b9d845a619450/pytest_xdist-3.8.0.tar.gz", hash = "sha256:7e578125ec9bc6050861aa93f2d59f1d8d085595d6551c2c90b6f4fad8d3a9f1", size = 88069, upload-time = "2025-07-01T13:30:59.346Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/ca/31/d4e37e9e550c2b92a9cbc2e4d0b7420a27224968580b5a447f420847c975/pytest_xdist-3.8.0-py3-none-any.whl", hash = "sha256:202ca578cfeb7370784a8c33d6d05bc6e13b4f25b5053c30a152269fd10f0b88", size = 46396, upload-time = "2025-07-01T13:30:56.632Z" }, +] + +[[package]] +name = "python-dateutil" +version = "2.9.0.post0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "six" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/66/c0/0c8b6ad9f17a802ee498c46e004a0eb49bc148f2fd230864601a86dcf6db/python-dateutil-2.9.0.post0.tar.gz", hash = "sha256:37dd54208da7e1cd875388217d5e00ebd4179249f90fb72437e91a35459a0ad3", size = 342432, upload-time = "2024-03-01T18:36:20.211Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/ec/57/56b9bcc3c9c6a792fcbaf139543cee77261f3651ca9da0c93f5c1221264b/python_dateutil-2.9.0.post0-py2.py3-none-any.whl", hash = "sha256:a8b2bc7bffae282281c8140a97d3aa9c14da0b136dfe83f850eea9a5f7470427", size = 229892, upload-time = "2024-03-01T18:36:18.57Z" }, +] + +[[package]] +name = "python-dotenv" +version = "1.2.2" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/82/ed/0301aeeac3e5353ef3d94b6ec08bbcabd04a72018415dcb29e588514bba8/python_dotenv-1.2.2.tar.gz", hash = "sha256:2c371a91fbd7ba082c2c1dc1f8bf89ca22564a087c2c287cd9b662adde799cf3", size = 50135, upload-time = "2026-03-01T16:00:26.196Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/0b/d7/1959b9648791274998a9c3526f6d0ec8fd2233e4d4acce81bbae76b44b2a/python_dotenv-1.2.2-py3-none-any.whl", hash = "sha256:1d8214789a24de455a8b8bd8ae6fe3c6b69a5e3d64aa8a8e5d68e694bbcb285a", size = 22101, upload-time = "2026-03-01T16:00:25.09Z" }, +] + +[[package]] +name = "python-json-logger" +version = "4.1.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/f7/ff/3cc9165fd44106973cd7ac9facb674a65ed853494592541d339bdc9a30eb/python_json_logger-4.1.0.tar.gz", hash = "sha256:b396b9e3ed782b09ff9d6e4f1683d46c83ad0d35d2e407c09a9ebbf038f88195", size = 17573, upload-time = "2026-03-29T04:39:56.805Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/27/be/0631a861af4d1c875f096c07d34e9a63639560a717130e7a87cbc82b7e3f/python_json_logger-4.1.0-py3-none-any.whl", hash = "sha256:132994765cf75bf44554be9aa49b06ef2345d23661a96720262716438141b6b2", size = 15021, upload-time = "2026-03-29T04:39:55.266Z" }, +] + +[[package]] +name = "python-mimeparse" +version = "2.0.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/cd/85/c40f2e0b2128905f6c34894be01803c114f2b2efab0e8b4c3dca5e56b999/python_mimeparse-2.0.0.tar.gz", hash = "sha256:5b9a9dcf7aa82465e31bd667f5cb7000604811dce83554f1c8a43693a32cb303", size = 7162, upload-time = "2024-08-25T13:38:14.966Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/65/d9/1093a9d6d22d04d433003c96b9b1d46741b43fee5b11ece5098297737fce/python_mimeparse-2.0.0-py3-none-any.whl", hash = "sha256:574062a06f2e1d416535c8d3b83ccc6ebe95941e74e2c5939fc010a12e37cc09", size = 5576, upload-time = "2024-08-25T13:38:13.372Z" }, +] + +[[package]] +name = "python-snappy" +version = "0.7.3" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "cramjam" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/39/66/9185fbb6605ba92716d9f77fbb13c97eb671cd13c3ad56bd154016fbf08b/python_snappy-0.7.3.tar.gz", hash = "sha256:40216c1badfb2d38ac781ecb162a1d0ec40f8ee9747e610bcfefdfa79486cee3", size = 9337, upload-time = "2024-08-29T13:16:05.705Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/86/c1/0ee413ddd639aebf22c85d6db39f136ccc10e6a4b4dd275a92b5c839de8d/python_snappy-0.7.3-py3-none-any.whl", hash = "sha256:074c0636cfcd97e7251330f428064050ac81a52c62ed884fc2ddebbb60ed7f50", size = 9155, upload-time = "2024-08-29T13:16:04.773Z" }, +] + +[[package]] +name = "pytz" +version = "2026.2" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/ff/46/dd499ec9038423421951e4fad73051febaa13d2df82b4064f87af8b8c0c3/pytz-2026.2.tar.gz", hash = "sha256:0e60b47b29f21574376f218fe21abc009894a2321ea16c6754f3cad6eb7cdd6a", size = 320861, upload-time = "2026-05-04T01:35:29.667Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/ec/dd/96da98f892250475bdf2328112d7468abdd4acc7b902b6af23f4ed958ea0/pytz-2026.2-py2.py3-none-any.whl", hash = "sha256:04156e608bee23d3792fd45c94ae47fae1036688e75032eea2e3bf0323d1f126", size = 510141, upload-time = "2026-05-04T01:35:27.408Z" }, +] + +[[package]] +name = "pywinpty" +version = "3.0.3" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/f7/54/37c7370ba91f579235049dc26cd2c5e657d2a943e01820844ffc81f32176/pywinpty-3.0.3.tar.gz", hash = "sha256:523441dc34d231fb361b4b00f8c99d3f16de02f5005fd544a0183112bcc22412", size = 31309, upload-time = "2026-02-04T21:51:09.524Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/79/c3/3e75075c7f71735f22b66fab0481f2c98e3a4d58cba55cb50ba29114bcf6/pywinpty-3.0.3-cp311-cp311-win_amd64.whl", hash = "sha256:dff25a9a6435f527d7c65608a7e62783fc12076e7d44487a4911ee91be5a8ac8", size = 2114430, upload-time = "2026-02-04T21:54:19.485Z" }, + { url = "https://files.pythonhosted.org/packages/8d/1e/8a54166a8c5e4f5cb516514bdf4090be4d51a71e8d9f6d98c0aa00fe45d4/pywinpty-3.0.3-cp311-cp311-win_arm64.whl", hash = "sha256:fbc1e230e5b193eef4431cba3f39996a288f9958f9c9f092c8a961d930ee8f68", size = 236191, upload-time = "2026-02-04T21:50:36.239Z" }, + { url = "https://files.pythonhosted.org/packages/7c/d4/aeb5e1784d2c5bff6e189138a9ca91a090117459cea0c30378e1f2db3d54/pywinpty-3.0.3-cp312-cp312-win_amd64.whl", hash = "sha256:c9081df0e49ffa86d15db4a6ba61530630e48707f987df42c9d3313537e81fc0", size = 2113098, upload-time = "2026-02-04T21:54:37.711Z" }, + { url = "https://files.pythonhosted.org/packages/b9/53/7278223c493ccfe4883239cf06c823c56460a8010e0fc778eef67858dc14/pywinpty-3.0.3-cp312-cp312-win_arm64.whl", hash = "sha256:15e79d870e18b678fb8a5a6105fd38496b55697c66e6fc0378236026bc4d59e9", size = 234901, upload-time = "2026-02-04T21:53:31.35Z" }, + { url = "https://files.pythonhosted.org/packages/e5/cb/58d6ed3fd429c96a90ef01ac9a617af10a6d41469219c25e7dc162abbb71/pywinpty-3.0.3-cp313-cp313-win_amd64.whl", hash = "sha256:9c91dbb026050c77bdcef964e63a4f10f01a639113c4d3658332614544c467ab", size = 2112686, upload-time = "2026-02-04T21:52:03.035Z" }, + { url = "https://files.pythonhosted.org/packages/fd/50/724ed5c38c504d4e58a88a072776a1e880d970789deaeb2b9f7bd9a5141a/pywinpty-3.0.3-cp313-cp313-win_arm64.whl", hash = "sha256:fe1f7911805127c94cf51f89ab14096c6f91ffdcacf993d2da6082b2142a2523", size = 234591, upload-time = "2026-02-04T21:52:29.821Z" }, + { url = "https://files.pythonhosted.org/packages/f7/ad/90a110538696b12b39fd8758a06d70ded899308198ad2305ac68e361126e/pywinpty-3.0.3-cp313-cp313t-win_amd64.whl", hash = "sha256:3f07a6cf1c1d470d284e614733c3d0f726d2c85e78508ea10a403140c3c0c18a", size = 2112360, upload-time = "2026-02-04T21:55:33.397Z" }, + { url = "https://files.pythonhosted.org/packages/44/0f/7ffa221757a220402bc79fda44044c3f2cc57338d878ab7d622add6f4581/pywinpty-3.0.3-cp313-cp313t-win_arm64.whl", hash = "sha256:15c7c0b6f8e9d87aabbaff76468dabf6e6121332c40fc1d83548d02a9d6a3759", size = 233107, upload-time = "2026-02-04T21:51:45.455Z" }, + { url = "https://files.pythonhosted.org/packages/28/88/2ff917caff61e55f38bcdb27de06ee30597881b2cae44fbba7627be015c4/pywinpty-3.0.3-cp314-cp314-win_amd64.whl", hash = "sha256:d4b6b7b0fe0cdcd02e956bd57cfe9f4e5a06514eecf3b5ae174da4f951b58be9", size = 2113282, upload-time = "2026-02-04T21:52:08.188Z" }, + { url = "https://files.pythonhosted.org/packages/63/32/40a775343ace542cc43ece3f1d1fce454021521ecac41c4c4573081c2336/pywinpty-3.0.3-cp314-cp314-win_arm64.whl", hash = "sha256:34789d685fc0d547ce0c8a65e5a70e56f77d732fa6e03c8f74fefb8cbb252019", size = 234207, upload-time = "2026-02-04T21:51:58.687Z" }, + { url = "https://files.pythonhosted.org/packages/8d/54/5d5e52f4cb75028104ca6faf36c10f9692389b1986d34471663b4ebebd6d/pywinpty-3.0.3-cp314-cp314t-win_amd64.whl", hash = "sha256:0c37e224a47a971d1a6e08649a1714dac4f63c11920780977829ed5c8cadead1", size = 2112910, upload-time = "2026-02-04T21:52:30.976Z" }, + { url = "https://files.pythonhosted.org/packages/0a/44/dcd184824e21d4620b06c7db9fbb15c3ad0a0f1fa2e6de79969fb82647ec/pywinpty-3.0.3-cp314-cp314t-win_arm64.whl", hash = "sha256:c4e9c3dff7d86ba81937438d5819f19f385a39d8f592d4e8af67148ceb4f6ab5", size = 233425, upload-time = "2026-02-04T21:51:56.754Z" }, +] + +[[package]] +name = "pyyaml" +version = "6.0.3" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/05/8e/961c0007c59b8dd7729d542c61a4d537767a59645b82a0b521206e1e25c2/pyyaml-6.0.3.tar.gz", hash = "sha256:d76623373421df22fb4cf8817020cbb7ef15c725b9d5e45f17e189bfc384190f", size = 130960, upload-time = "2025-09-25T21:33:16.546Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/6d/16/a95b6757765b7b031c9374925bb718d55e0a9ba8a1b6a12d25962ea44347/pyyaml-6.0.3-cp311-cp311-macosx_10_13_x86_64.whl", hash = "sha256:44edc647873928551a01e7a563d7452ccdebee747728c1080d881d68af7b997e", size = 185826, upload-time = "2025-09-25T21:31:58.655Z" }, + { url = "https://files.pythonhosted.org/packages/16/19/13de8e4377ed53079ee996e1ab0a9c33ec2faf808a4647b7b4c0d46dd239/pyyaml-6.0.3-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:652cb6edd41e718550aad172851962662ff2681490a8a711af6a4d288dd96824", size = 175577, upload-time = "2025-09-25T21:32:00.088Z" }, + { url = "https://files.pythonhosted.org/packages/0c/62/d2eb46264d4b157dae1275b573017abec435397aa59cbcdab6fc978a8af4/pyyaml-6.0.3-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:10892704fc220243f5305762e276552a0395f7beb4dbf9b14ec8fd43b57f126c", size = 775556, upload-time = "2025-09-25T21:32:01.31Z" }, + { url = "https://files.pythonhosted.org/packages/10/cb/16c3f2cf3266edd25aaa00d6c4350381c8b012ed6f5276675b9eba8d9ff4/pyyaml-6.0.3-cp311-cp311-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:850774a7879607d3a6f50d36d04f00ee69e7fc816450e5f7e58d7f17f1ae5c00", size = 882114, upload-time = "2025-09-25T21:32:03.376Z" }, + { url = "https://files.pythonhosted.org/packages/71/60/917329f640924b18ff085ab889a11c763e0b573da888e8404ff486657602/pyyaml-6.0.3-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:b8bb0864c5a28024fac8a632c443c87c5aa6f215c0b126c449ae1a150412f31d", size = 806638, upload-time = "2025-09-25T21:32:04.553Z" }, + { url = "https://files.pythonhosted.org/packages/dd/6f/529b0f316a9fd167281a6c3826b5583e6192dba792dd55e3203d3f8e655a/pyyaml-6.0.3-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:1d37d57ad971609cf3c53ba6a7e365e40660e3be0e5175fa9f2365a379d6095a", size = 767463, upload-time = "2025-09-25T21:32:06.152Z" }, + { url = "https://files.pythonhosted.org/packages/f2/6a/b627b4e0c1dd03718543519ffb2f1deea4a1e6d42fbab8021936a4d22589/pyyaml-6.0.3-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:37503bfbfc9d2c40b344d06b2199cf0e96e97957ab1c1b546fd4f87e53e5d3e4", size = 794986, upload-time = "2025-09-25T21:32:07.367Z" }, + { url = "https://files.pythonhosted.org/packages/45/91/47a6e1c42d9ee337c4839208f30d9f09caa9f720ec7582917b264defc875/pyyaml-6.0.3-cp311-cp311-win32.whl", hash = "sha256:8098f252adfa6c80ab48096053f512f2321f0b998f98150cea9bd23d83e1467b", size = 142543, upload-time = "2025-09-25T21:32:08.95Z" }, + { url = "https://files.pythonhosted.org/packages/da/e3/ea007450a105ae919a72393cb06f122f288ef60bba2dc64b26e2646fa315/pyyaml-6.0.3-cp311-cp311-win_amd64.whl", hash = "sha256:9f3bfb4965eb874431221a3ff3fdcddc7e74e3b07799e0e84ca4a0f867d449bf", size = 158763, upload-time = "2025-09-25T21:32:09.96Z" }, + { url = "https://files.pythonhosted.org/packages/d1/33/422b98d2195232ca1826284a76852ad5a86fe23e31b009c9886b2d0fb8b2/pyyaml-6.0.3-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:7f047e29dcae44602496db43be01ad42fc6f1cc0d8cd6c83d342306c32270196", size = 182063, upload-time = "2025-09-25T21:32:11.445Z" }, + { url = "https://files.pythonhosted.org/packages/89/a0/6cf41a19a1f2f3feab0e9c0b74134aa2ce6849093d5517a0c550fe37a648/pyyaml-6.0.3-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:fc09d0aa354569bc501d4e787133afc08552722d3ab34836a80547331bb5d4a0", size = 173973, upload-time = "2025-09-25T21:32:12.492Z" }, + { url = "https://files.pythonhosted.org/packages/ed/23/7a778b6bd0b9a8039df8b1b1d80e2e2ad78aa04171592c8a5c43a56a6af4/pyyaml-6.0.3-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:9149cad251584d5fb4981be1ecde53a1ca46c891a79788c0df828d2f166bda28", size = 775116, upload-time = "2025-09-25T21:32:13.652Z" }, + { url = "https://files.pythonhosted.org/packages/65/30/d7353c338e12baef4ecc1b09e877c1970bd3382789c159b4f89d6a70dc09/pyyaml-6.0.3-cp312-cp312-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:5fdec68f91a0c6739b380c83b951e2c72ac0197ace422360e6d5a959d8d97b2c", size = 844011, upload-time = "2025-09-25T21:32:15.21Z" }, + { url = "https://files.pythonhosted.org/packages/8b/9d/b3589d3877982d4f2329302ef98a8026e7f4443c765c46cfecc8858c6b4b/pyyaml-6.0.3-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:ba1cc08a7ccde2d2ec775841541641e4548226580ab850948cbfda66a1befcdc", size = 807870, upload-time = "2025-09-25T21:32:16.431Z" }, + { url = "https://files.pythonhosted.org/packages/05/c0/b3be26a015601b822b97d9149ff8cb5ead58c66f981e04fedf4e762f4bd4/pyyaml-6.0.3-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:8dc52c23056b9ddd46818a57b78404882310fb473d63f17b07d5c40421e47f8e", size = 761089, upload-time = "2025-09-25T21:32:17.56Z" }, + { url = "https://files.pythonhosted.org/packages/be/8e/98435a21d1d4b46590d5459a22d88128103f8da4c2d4cb8f14f2a96504e1/pyyaml-6.0.3-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:41715c910c881bc081f1e8872880d3c650acf13dfa8214bad49ed4cede7c34ea", size = 790181, upload-time = "2025-09-25T21:32:18.834Z" }, + { url = "https://files.pythonhosted.org/packages/74/93/7baea19427dcfbe1e5a372d81473250b379f04b1bd3c4c5ff825e2327202/pyyaml-6.0.3-cp312-cp312-win32.whl", hash = "sha256:96b533f0e99f6579b3d4d4995707cf36df9100d67e0c8303a0c55b27b5f99bc5", size = 137658, upload-time = "2025-09-25T21:32:20.209Z" }, + { url = "https://files.pythonhosted.org/packages/86/bf/899e81e4cce32febab4fb42bb97dcdf66bc135272882d1987881a4b519e9/pyyaml-6.0.3-cp312-cp312-win_amd64.whl", hash = "sha256:5fcd34e47f6e0b794d17de1b4ff496c00986e1c83f7ab2fb8fcfe9616ff7477b", size = 154003, upload-time = "2025-09-25T21:32:21.167Z" }, + { url = "https://files.pythonhosted.org/packages/1a/08/67bd04656199bbb51dbed1439b7f27601dfb576fb864099c7ef0c3e55531/pyyaml-6.0.3-cp312-cp312-win_arm64.whl", hash = "sha256:64386e5e707d03a7e172c0701abfb7e10f0fb753ee1d773128192742712a98fd", size = 140344, upload-time = "2025-09-25T21:32:22.617Z" }, + { url = "https://files.pythonhosted.org/packages/d1/11/0fd08f8192109f7169db964b5707a2f1e8b745d4e239b784a5a1dd80d1db/pyyaml-6.0.3-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:8da9669d359f02c0b91ccc01cac4a67f16afec0dac22c2ad09f46bee0697eba8", size = 181669, upload-time = "2025-09-25T21:32:23.673Z" }, + { url = "https://files.pythonhosted.org/packages/b1/16/95309993f1d3748cd644e02e38b75d50cbc0d9561d21f390a76242ce073f/pyyaml-6.0.3-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:2283a07e2c21a2aa78d9c4442724ec1eb15f5e42a723b99cb3d822d48f5f7ad1", size = 173252, upload-time = "2025-09-25T21:32:25.149Z" }, + { url = "https://files.pythonhosted.org/packages/50/31/b20f376d3f810b9b2371e72ef5adb33879b25edb7a6d072cb7ca0c486398/pyyaml-6.0.3-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:ee2922902c45ae8ccada2c5b501ab86c36525b883eff4255313a253a3160861c", size = 767081, upload-time = "2025-09-25T21:32:26.575Z" }, + { url = "https://files.pythonhosted.org/packages/49/1e/a55ca81e949270d5d4432fbbd19dfea5321eda7c41a849d443dc92fd1ff7/pyyaml-6.0.3-cp313-cp313-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:a33284e20b78bd4a18c8c2282d549d10bc8408a2a7ff57653c0cf0b9be0afce5", size = 841159, upload-time = "2025-09-25T21:32:27.727Z" }, + { url = "https://files.pythonhosted.org/packages/74/27/e5b8f34d02d9995b80abcef563ea1f8b56d20134d8f4e5e81733b1feceb2/pyyaml-6.0.3-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:0f29edc409a6392443abf94b9cf89ce99889a1dd5376d94316ae5145dfedd5d6", size = 801626, upload-time = "2025-09-25T21:32:28.878Z" }, + { url = "https://files.pythonhosted.org/packages/f9/11/ba845c23988798f40e52ba45f34849aa8a1f2d4af4b798588010792ebad6/pyyaml-6.0.3-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:f7057c9a337546edc7973c0d3ba84ddcdf0daa14533c2065749c9075001090e6", size = 753613, upload-time = "2025-09-25T21:32:30.178Z" }, + { url = "https://files.pythonhosted.org/packages/3d/e0/7966e1a7bfc0a45bf0a7fb6b98ea03fc9b8d84fa7f2229e9659680b69ee3/pyyaml-6.0.3-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:eda16858a3cab07b80edaf74336ece1f986ba330fdb8ee0d6c0d68fe82bc96be", size = 794115, upload-time = "2025-09-25T21:32:31.353Z" }, + { url = "https://files.pythonhosted.org/packages/de/94/980b50a6531b3019e45ddeada0626d45fa85cbe22300844a7983285bed3b/pyyaml-6.0.3-cp313-cp313-win32.whl", hash = "sha256:d0eae10f8159e8fdad514efdc92d74fd8d682c933a6dd088030f3834bc8e6b26", size = 137427, upload-time = "2025-09-25T21:32:32.58Z" }, + { url = "https://files.pythonhosted.org/packages/97/c9/39d5b874e8b28845e4ec2202b5da735d0199dbe5b8fb85f91398814a9a46/pyyaml-6.0.3-cp313-cp313-win_amd64.whl", hash = "sha256:79005a0d97d5ddabfeeea4cf676af11e647e41d81c9a7722a193022accdb6b7c", size = 154090, upload-time = "2025-09-25T21:32:33.659Z" }, + { url = "https://files.pythonhosted.org/packages/73/e8/2bdf3ca2090f68bb3d75b44da7bbc71843b19c9f2b9cb9b0f4ab7a5a4329/pyyaml-6.0.3-cp313-cp313-win_arm64.whl", hash = "sha256:5498cd1645aa724a7c71c8f378eb29ebe23da2fc0d7a08071d89469bf1d2defb", size = 140246, upload-time = "2025-09-25T21:32:34.663Z" }, + { url = "https://files.pythonhosted.org/packages/9d/8c/f4bd7f6465179953d3ac9bc44ac1a8a3e6122cf8ada906b4f96c60172d43/pyyaml-6.0.3-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:8d1fab6bb153a416f9aeb4b8763bc0f22a5586065f86f7664fc23339fc1c1fac", size = 181814, upload-time = "2025-09-25T21:32:35.712Z" }, + { url = "https://files.pythonhosted.org/packages/bd/9c/4d95bb87eb2063d20db7b60faa3840c1b18025517ae857371c4dd55a6b3a/pyyaml-6.0.3-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:34d5fcd24b8445fadc33f9cf348c1047101756fd760b4dacb5c3e99755703310", size = 173809, upload-time = "2025-09-25T21:32:36.789Z" }, + { url = "https://files.pythonhosted.org/packages/92/b5/47e807c2623074914e29dabd16cbbdd4bf5e9b2db9f8090fa64411fc5382/pyyaml-6.0.3-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:501a031947e3a9025ed4405a168e6ef5ae3126c59f90ce0cd6f2bfc477be31b7", size = 766454, upload-time = "2025-09-25T21:32:37.966Z" }, + { url = "https://files.pythonhosted.org/packages/02/9e/e5e9b168be58564121efb3de6859c452fccde0ab093d8438905899a3a483/pyyaml-6.0.3-cp314-cp314-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:b3bc83488de33889877a0f2543ade9f70c67d66d9ebb4ac959502e12de895788", size = 836355, upload-time = "2025-09-25T21:32:39.178Z" }, + { url = "https://files.pythonhosted.org/packages/88/f9/16491d7ed2a919954993e48aa941b200f38040928474c9e85ea9e64222c3/pyyaml-6.0.3-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:c458b6d084f9b935061bc36216e8a69a7e293a2f1e68bf956dcd9e6cbcd143f5", size = 794175, upload-time = "2025-09-25T21:32:40.865Z" }, + { url = "https://files.pythonhosted.org/packages/dd/3f/5989debef34dc6397317802b527dbbafb2b4760878a53d4166579111411e/pyyaml-6.0.3-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:7c6610def4f163542a622a73fb39f534f8c101d690126992300bf3207eab9764", size = 755228, upload-time = "2025-09-25T21:32:42.084Z" }, + { url = "https://files.pythonhosted.org/packages/d7/ce/af88a49043cd2e265be63d083fc75b27b6ed062f5f9fd6cdc223ad62f03e/pyyaml-6.0.3-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:5190d403f121660ce8d1d2c1bb2ef1bd05b5f68533fc5c2ea899bd15f4399b35", size = 789194, upload-time = "2025-09-25T21:32:43.362Z" }, + { url = "https://files.pythonhosted.org/packages/23/20/bb6982b26a40bb43951265ba29d4c246ef0ff59c9fdcdf0ed04e0687de4d/pyyaml-6.0.3-cp314-cp314-win_amd64.whl", hash = "sha256:4a2e8cebe2ff6ab7d1050ecd59c25d4c8bd7e6f400f5f82b96557ac0abafd0ac", size = 156429, upload-time = "2025-09-25T21:32:57.844Z" }, + { url = "https://files.pythonhosted.org/packages/f4/f4/a4541072bb9422c8a883ab55255f918fa378ecf083f5b85e87fc2b4eda1b/pyyaml-6.0.3-cp314-cp314-win_arm64.whl", hash = "sha256:93dda82c9c22deb0a405ea4dc5f2d0cda384168e466364dec6255b293923b2f3", size = 143912, upload-time = "2025-09-25T21:32:59.247Z" }, + { url = "https://files.pythonhosted.org/packages/7c/f9/07dd09ae774e4616edf6cda684ee78f97777bdd15847253637a6f052a62f/pyyaml-6.0.3-cp314-cp314t-macosx_10_13_x86_64.whl", hash = "sha256:02893d100e99e03eda1c8fd5c441d8c60103fd175728e23e431db1b589cf5ab3", size = 189108, upload-time = "2025-09-25T21:32:44.377Z" }, + { url = "https://files.pythonhosted.org/packages/4e/78/8d08c9fb7ce09ad8c38ad533c1191cf27f7ae1effe5bb9400a46d9437fcf/pyyaml-6.0.3-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:c1ff362665ae507275af2853520967820d9124984e0f7466736aea23d8611fba", size = 183641, upload-time = "2025-09-25T21:32:45.407Z" }, + { url = "https://files.pythonhosted.org/packages/7b/5b/3babb19104a46945cf816d047db2788bcaf8c94527a805610b0289a01c6b/pyyaml-6.0.3-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:6adc77889b628398debc7b65c073bcb99c4a0237b248cacaf3fe8a557563ef6c", size = 831901, upload-time = "2025-09-25T21:32:48.83Z" }, + { url = "https://files.pythonhosted.org/packages/8b/cc/dff0684d8dc44da4d22a13f35f073d558c268780ce3c6ba1b87055bb0b87/pyyaml-6.0.3-cp314-cp314t-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:a80cb027f6b349846a3bf6d73b5e95e782175e52f22108cfa17876aaeff93702", size = 861132, upload-time = "2025-09-25T21:32:50.149Z" }, + { url = "https://files.pythonhosted.org/packages/b1/5e/f77dc6b9036943e285ba76b49e118d9ea929885becb0a29ba8a7c75e29fe/pyyaml-6.0.3-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:00c4bdeba853cc34e7dd471f16b4114f4162dc03e6b7afcc2128711f0eca823c", size = 839261, upload-time = "2025-09-25T21:32:51.808Z" }, + { url = "https://files.pythonhosted.org/packages/ce/88/a9db1376aa2a228197c58b37302f284b5617f56a5d959fd1763fb1675ce6/pyyaml-6.0.3-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:66e1674c3ef6f541c35191caae2d429b967b99e02040f5ba928632d9a7f0f065", size = 805272, upload-time = "2025-09-25T21:32:52.941Z" }, + { url = "https://files.pythonhosted.org/packages/da/92/1446574745d74df0c92e6aa4a7b0b3130706a4142b2d1a5869f2eaa423c6/pyyaml-6.0.3-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:16249ee61e95f858e83976573de0f5b2893b3677ba71c9dd36b9cf8be9ac6d65", size = 829923, upload-time = "2025-09-25T21:32:54.537Z" }, + { url = "https://files.pythonhosted.org/packages/f0/7a/1c7270340330e575b92f397352af856a8c06f230aa3e76f86b39d01b416a/pyyaml-6.0.3-cp314-cp314t-win_amd64.whl", hash = "sha256:4ad1906908f2f5ae4e5a8ddfce73c320c2a1429ec52eafd27138b7f1cbe341c9", size = 174062, upload-time = "2025-09-25T21:32:55.767Z" }, + { url = "https://files.pythonhosted.org/packages/f1/12/de94a39c2ef588c7e6455cfbe7343d3b2dc9d6b6b2f40c4c6565744c873d/pyyaml-6.0.3-cp314-cp314t-win_arm64.whl", hash = "sha256:ebc55a14a21cb14062aa4162f906cd962b28e2e9ea38f9b4391244cd8de4ae0b", size = 149341, upload-time = "2025-09-25T21:32:56.828Z" }, +] + +[[package]] +name = "pyzmq" +version = "27.1.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "cffi", marker = "implementation_name == 'pypy'" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/04/0b/3c9baedbdf613ecaa7aa07027780b8867f57b6293b6ee50de316c9f3222b/pyzmq-27.1.0.tar.gz", hash = "sha256:ac0765e3d44455adb6ddbf4417dcce460fc40a05978c08efdf2948072f6db540", size = 281750, upload-time = "2025-09-08T23:10:18.157Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/06/5d/305323ba86b284e6fcb0d842d6adaa2999035f70f8c38a9b6d21ad28c3d4/pyzmq-27.1.0-cp311-cp311-macosx_10_15_universal2.whl", hash = "sha256:226b091818d461a3bef763805e75685e478ac17e9008f49fce2d3e52b3d58b86", size = 1333328, upload-time = "2025-09-08T23:07:45.946Z" }, + { url = "https://files.pythonhosted.org/packages/bd/a0/fc7e78a23748ad5443ac3275943457e8452da67fda347e05260261108cbc/pyzmq-27.1.0-cp311-cp311-manylinux2014_i686.manylinux_2_17_i686.whl", hash = "sha256:0790a0161c281ca9723f804871b4027f2e8b5a528d357c8952d08cd1a9c15581", size = 908803, upload-time = "2025-09-08T23:07:47.551Z" }, + { url = "https://files.pythonhosted.org/packages/7e/22/37d15eb05f3bdfa4abea6f6d96eb3bb58585fbd3e4e0ded4e743bc650c97/pyzmq-27.1.0-cp311-cp311-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:c895a6f35476b0c3a54e3eb6ccf41bf3018de937016e6e18748317f25d4e925f", size = 668836, upload-time = "2025-09-08T23:07:49.436Z" }, + { url = "https://files.pythonhosted.org/packages/b1/c4/2a6fe5111a01005fc7af3878259ce17684fabb8852815eda6225620f3c59/pyzmq-27.1.0-cp311-cp311-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:5bbf8d3630bf96550b3be8e1fc0fea5cbdc8d5466c1192887bd94869da17a63e", size = 857038, upload-time = "2025-09-08T23:07:51.234Z" }, + { url = "https://files.pythonhosted.org/packages/cb/eb/bfdcb41d0db9cd233d6fb22dc131583774135505ada800ebf14dfb0a7c40/pyzmq-27.1.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:15c8bd0fe0dabf808e2d7a681398c4e5ded70a551ab47482067a572c054c8e2e", size = 1657531, upload-time = "2025-09-08T23:07:52.795Z" }, + { url = "https://files.pythonhosted.org/packages/ab/21/e3180ca269ed4a0de5c34417dfe71a8ae80421198be83ee619a8a485b0c7/pyzmq-27.1.0-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:bafcb3dd171b4ae9f19ee6380dfc71ce0390fefaf26b504c0e5f628d7c8c54f2", size = 2034786, upload-time = "2025-09-08T23:07:55.047Z" }, + { url = "https://files.pythonhosted.org/packages/3b/b1/5e21d0b517434b7f33588ff76c177c5a167858cc38ef740608898cd329f2/pyzmq-27.1.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:e829529fcaa09937189178115c49c504e69289abd39967cd8a4c215761373394", size = 1894220, upload-time = "2025-09-08T23:07:57.172Z" }, + { url = "https://files.pythonhosted.org/packages/03/f2/44913a6ff6941905efc24a1acf3d3cb6146b636c546c7406c38c49c403d4/pyzmq-27.1.0-cp311-cp311-win32.whl", hash = "sha256:6df079c47d5902af6db298ec92151db82ecb557af663098b92f2508c398bb54f", size = 567155, upload-time = "2025-09-08T23:07:59.05Z" }, + { url = "https://files.pythonhosted.org/packages/23/6d/d8d92a0eb270a925c9b4dd039c0b4dc10abc2fcbc48331788824ef113935/pyzmq-27.1.0-cp311-cp311-win_amd64.whl", hash = "sha256:190cbf120fbc0fc4957b56866830def56628934a9d112aec0e2507aa6a032b97", size = 633428, upload-time = "2025-09-08T23:08:00.663Z" }, + { url = "https://files.pythonhosted.org/packages/ae/14/01afebc96c5abbbd713ecfc7469cfb1bc801c819a74ed5c9fad9a48801cb/pyzmq-27.1.0-cp311-cp311-win_arm64.whl", hash = "sha256:eca6b47df11a132d1745eb3b5b5e557a7dae2c303277aa0e69c6ba91b8736e07", size = 559497, upload-time = "2025-09-08T23:08:02.15Z" }, + { url = "https://files.pythonhosted.org/packages/92/e7/038aab64a946d535901103da16b953c8c9cc9c961dadcbf3609ed6428d23/pyzmq-27.1.0-cp312-abi3-macosx_10_15_universal2.whl", hash = "sha256:452631b640340c928fa343801b0d07eb0c3789a5ffa843f6e1a9cee0ba4eb4fc", size = 1306279, upload-time = "2025-09-08T23:08:03.807Z" }, + { url = "https://files.pythonhosted.org/packages/e8/5e/c3c49fdd0f535ef45eefcc16934648e9e59dace4a37ee88fc53f6cd8e641/pyzmq-27.1.0-cp312-abi3-manylinux2014_i686.manylinux_2_17_i686.whl", hash = "sha256:1c179799b118e554b66da67d88ed66cd37a169f1f23b5d9f0a231b4e8d44a113", size = 895645, upload-time = "2025-09-08T23:08:05.301Z" }, + { url = "https://files.pythonhosted.org/packages/f8/e5/b0b2504cb4e903a74dcf1ebae157f9e20ebb6ea76095f6cfffea28c42ecd/pyzmq-27.1.0-cp312-abi3-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:3837439b7f99e60312f0c926a6ad437b067356dc2bc2ec96eb395fd0fe804233", size = 652574, upload-time = "2025-09-08T23:08:06.828Z" }, + { url = "https://files.pythonhosted.org/packages/f8/9b/c108cdb55560eaf253f0cbdb61b29971e9fb34d9c3499b0e96e4e60ed8a5/pyzmq-27.1.0-cp312-abi3-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:43ad9a73e3da1fab5b0e7e13402f0b2fb934ae1c876c51d0afff0e7c052eca31", size = 840995, upload-time = "2025-09-08T23:08:08.396Z" }, + { url = "https://files.pythonhosted.org/packages/c2/bb/b79798ca177b9eb0825b4c9998c6af8cd2a7f15a6a1a4272c1d1a21d382f/pyzmq-27.1.0-cp312-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:0de3028d69d4cdc475bfe47a6128eb38d8bc0e8f4d69646adfbcd840facbac28", size = 1642070, upload-time = "2025-09-08T23:08:09.989Z" }, + { url = "https://files.pythonhosted.org/packages/9c/80/2df2e7977c4ede24c79ae39dcef3899bfc5f34d1ca7a5b24f182c9b7a9ca/pyzmq-27.1.0-cp312-abi3-musllinux_1_2_i686.whl", hash = "sha256:cf44a7763aea9298c0aa7dbf859f87ed7012de8bda0f3977b6fb1d96745df856", size = 2021121, upload-time = "2025-09-08T23:08:11.907Z" }, + { url = "https://files.pythonhosted.org/packages/46/bd/2d45ad24f5f5ae7e8d01525eb76786fa7557136555cac7d929880519e33a/pyzmq-27.1.0-cp312-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:f30f395a9e6fbca195400ce833c731e7b64c3919aa481af4d88c3759e0cb7496", size = 1878550, upload-time = "2025-09-08T23:08:13.513Z" }, + { url = "https://files.pythonhosted.org/packages/e6/2f/104c0a3c778d7c2ab8190e9db4f62f0b6957b53c9d87db77c284b69f33ea/pyzmq-27.1.0-cp312-abi3-win32.whl", hash = "sha256:250e5436a4ba13885494412b3da5d518cd0d3a278a1ae640e113c073a5f88edd", size = 559184, upload-time = "2025-09-08T23:08:15.163Z" }, + { url = "https://files.pythonhosted.org/packages/fc/7f/a21b20d577e4100c6a41795842028235998a643b1ad406a6d4163ea8f53e/pyzmq-27.1.0-cp312-abi3-win_amd64.whl", hash = "sha256:9ce490cf1d2ca2ad84733aa1d69ce6855372cb5ce9223802450c9b2a7cba0ccf", size = 619480, upload-time = "2025-09-08T23:08:17.192Z" }, + { url = "https://files.pythonhosted.org/packages/78/c2/c012beae5f76b72f007a9e91ee9401cb88c51d0f83c6257a03e785c81cc2/pyzmq-27.1.0-cp312-abi3-win_arm64.whl", hash = "sha256:75a2f36223f0d535a0c919e23615fc85a1e23b71f40c7eb43d7b1dedb4d8f15f", size = 552993, upload-time = "2025-09-08T23:08:18.926Z" }, + { url = "https://files.pythonhosted.org/packages/60/cb/84a13459c51da6cec1b7b1dc1a47e6db6da50b77ad7fd9c145842750a011/pyzmq-27.1.0-cp313-cp313-android_24_arm64_v8a.whl", hash = "sha256:93ad4b0855a664229559e45c8d23797ceac03183c7b6f5b4428152a6b06684a5", size = 1122436, upload-time = "2025-09-08T23:08:20.801Z" }, + { url = "https://files.pythonhosted.org/packages/dc/b6/94414759a69a26c3dd674570a81813c46a078767d931a6c70ad29fc585cb/pyzmq-27.1.0-cp313-cp313-android_24_x86_64.whl", hash = "sha256:fbb4f2400bfda24f12f009cba62ad5734148569ff4949b1b6ec3b519444342e6", size = 1156301, upload-time = "2025-09-08T23:08:22.47Z" }, + { url = "https://files.pythonhosted.org/packages/a5/ad/15906493fd40c316377fd8a8f6b1f93104f97a752667763c9b9c1b71d42d/pyzmq-27.1.0-cp313-cp313t-macosx_10_15_universal2.whl", hash = "sha256:e343d067f7b151cfe4eb3bb796a7752c9d369eed007b91231e817071d2c2fec7", size = 1341197, upload-time = "2025-09-08T23:08:24.286Z" }, + { url = "https://files.pythonhosted.org/packages/14/1d/d343f3ce13db53a54cb8946594e567410b2125394dafcc0268d8dda027e0/pyzmq-27.1.0-cp313-cp313t-manylinux2014_i686.manylinux_2_17_i686.whl", hash = "sha256:08363b2011dec81c354d694bdecaef4770e0ae96b9afea70b3f47b973655cc05", size = 897275, upload-time = "2025-09-08T23:08:26.063Z" }, + { url = "https://files.pythonhosted.org/packages/69/2d/d83dd6d7ca929a2fc67d2c3005415cdf322af7751d773524809f9e585129/pyzmq-27.1.0-cp313-cp313t-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:d54530c8c8b5b8ddb3318f481297441af102517602b569146185fa10b63f4fa9", size = 660469, upload-time = "2025-09-08T23:08:27.623Z" }, + { url = "https://files.pythonhosted.org/packages/3e/cd/9822a7af117f4bc0f1952dbe9ef8358eb50a24928efd5edf54210b850259/pyzmq-27.1.0-cp313-cp313t-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:6f3afa12c392f0a44a2414056d730eebc33ec0926aae92b5ad5cf26ebb6cc128", size = 847961, upload-time = "2025-09-08T23:08:29.672Z" }, + { url = "https://files.pythonhosted.org/packages/9a/12/f003e824a19ed73be15542f172fd0ec4ad0b60cf37436652c93b9df7c585/pyzmq-27.1.0-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:c65047adafe573ff023b3187bb93faa583151627bc9c51fc4fb2c561ed689d39", size = 1650282, upload-time = "2025-09-08T23:08:31.349Z" }, + { url = "https://files.pythonhosted.org/packages/d5/4a/e82d788ed58e9a23995cee70dbc20c9aded3d13a92d30d57ec2291f1e8a3/pyzmq-27.1.0-cp313-cp313t-musllinux_1_2_i686.whl", hash = "sha256:90e6e9441c946a8b0a667356f7078d96411391a3b8f80980315455574177ec97", size = 2024468, upload-time = "2025-09-08T23:08:33.543Z" }, + { url = "https://files.pythonhosted.org/packages/d9/94/2da0a60841f757481e402b34bf4c8bf57fa54a5466b965de791b1e6f747d/pyzmq-27.1.0-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:add071b2d25f84e8189aaf0882d39a285b42fa3853016ebab234a5e78c7a43db", size = 1885394, upload-time = "2025-09-08T23:08:35.51Z" }, + { url = "https://files.pythonhosted.org/packages/4f/6f/55c10e2e49ad52d080dc24e37adb215e5b0d64990b57598abc2e3f01725b/pyzmq-27.1.0-cp313-cp313t-win32.whl", hash = "sha256:7ccc0700cfdf7bd487bea8d850ec38f204478681ea02a582a8da8171b7f90a1c", size = 574964, upload-time = "2025-09-08T23:08:37.178Z" }, + { url = "https://files.pythonhosted.org/packages/87/4d/2534970ba63dd7c522d8ca80fb92777f362c0f321900667c615e2067cb29/pyzmq-27.1.0-cp313-cp313t-win_amd64.whl", hash = "sha256:8085a9fba668216b9b4323be338ee5437a235fe275b9d1610e422ccc279733e2", size = 641029, upload-time = "2025-09-08T23:08:40.595Z" }, + { url = "https://files.pythonhosted.org/packages/f6/fa/f8aea7a28b0641f31d40dea42d7ef003fded31e184ef47db696bc74cd610/pyzmq-27.1.0-cp313-cp313t-win_arm64.whl", hash = "sha256:6bb54ca21bcfe361e445256c15eedf083f153811c37be87e0514934d6913061e", size = 561541, upload-time = "2025-09-08T23:08:42.668Z" }, + { url = "https://files.pythonhosted.org/packages/87/45/19efbb3000956e82d0331bafca5d9ac19ea2857722fa2caacefb6042f39d/pyzmq-27.1.0-cp314-cp314t-macosx_10_15_universal2.whl", hash = "sha256:ce980af330231615756acd5154f29813d553ea555485ae712c491cd483df6b7a", size = 1341197, upload-time = "2025-09-08T23:08:44.973Z" }, + { url = "https://files.pythonhosted.org/packages/48/43/d72ccdbf0d73d1343936296665826350cb1e825f92f2db9db3e61c2162a2/pyzmq-27.1.0-cp314-cp314t-manylinux2014_i686.manylinux_2_17_i686.whl", hash = "sha256:1779be8c549e54a1c38f805e56d2a2e5c009d26de10921d7d51cfd1c8d4632ea", size = 897175, upload-time = "2025-09-08T23:08:46.601Z" }, + { url = "https://files.pythonhosted.org/packages/2f/2e/a483f73a10b65a9ef0161e817321d39a770b2acf8bcf3004a28d90d14a94/pyzmq-27.1.0-cp314-cp314t-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:7200bb0f03345515df50d99d3db206a0a6bee1955fbb8c453c76f5bf0e08fb96", size = 660427, upload-time = "2025-09-08T23:08:48.187Z" }, + { url = "https://files.pythonhosted.org/packages/f5/d2/5f36552c2d3e5685abe60dfa56f91169f7a2d99bbaf67c5271022ab40863/pyzmq-27.1.0-cp314-cp314t-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:01c0e07d558b06a60773744ea6251f769cd79a41a97d11b8bf4ab8f034b0424d", size = 847929, upload-time = "2025-09-08T23:08:49.76Z" }, + { url = "https://files.pythonhosted.org/packages/c4/2a/404b331f2b7bf3198e9945f75c4c521f0c6a3a23b51f7a4a401b94a13833/pyzmq-27.1.0-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:80d834abee71f65253c91540445d37c4c561e293ba6e741b992f20a105d69146", size = 1650193, upload-time = "2025-09-08T23:08:51.7Z" }, + { url = "https://files.pythonhosted.org/packages/1c/0b/f4107e33f62a5acf60e3ded67ed33d79b4ce18de432625ce2fc5093d6388/pyzmq-27.1.0-cp314-cp314t-musllinux_1_2_i686.whl", hash = "sha256:544b4e3b7198dde4a62b8ff6685e9802a9a1ebf47e77478a5eb88eca2a82f2fd", size = 2024388, upload-time = "2025-09-08T23:08:53.393Z" }, + { url = "https://files.pythonhosted.org/packages/0d/01/add31fe76512642fd6e40e3a3bd21f4b47e242c8ba33efb6809e37076d9b/pyzmq-27.1.0-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:cedc4c68178e59a4046f97eca31b148ddcf51e88677de1ef4e78cf06c5376c9a", size = 1885316, upload-time = "2025-09-08T23:08:55.702Z" }, + { url = "https://files.pythonhosted.org/packages/c4/59/a5f38970f9bf07cee96128de79590bb354917914a9be11272cfc7ff26af0/pyzmq-27.1.0-cp314-cp314t-win32.whl", hash = "sha256:1f0b2a577fd770aa6f053211a55d1c47901f4d537389a034c690291485e5fe92", size = 587472, upload-time = "2025-09-08T23:08:58.18Z" }, + { url = "https://files.pythonhosted.org/packages/70/d8/78b1bad170f93fcf5e3536e70e8fadac55030002275c9a29e8f5719185de/pyzmq-27.1.0-cp314-cp314t-win_amd64.whl", hash = "sha256:19c9468ae0437f8074af379e986c5d3d7d7bfe033506af442e8c879732bedbe0", size = 661401, upload-time = "2025-09-08T23:08:59.802Z" }, + { url = "https://files.pythonhosted.org/packages/81/d6/4bfbb40c9a0b42fc53c7cf442f6385db70b40f74a783130c5d0a5aa62228/pyzmq-27.1.0-cp314-cp314t-win_arm64.whl", hash = "sha256:dc5dbf68a7857b59473f7df42650c621d7e8923fb03fa74a526890f4d33cc4d7", size = 575170, upload-time = "2025-09-08T23:09:01.418Z" }, + { url = "https://files.pythonhosted.org/packages/4c/c6/c4dcdecdbaa70969ee1fdced6d7b8f60cfabe64d25361f27ac4665a70620/pyzmq-27.1.0-pp311-pypy311_pp73-macosx_10_15_x86_64.whl", hash = "sha256:18770c8d3563715387139060d37859c02ce40718d1faf299abddcdcc6a649066", size = 836265, upload-time = "2025-09-08T23:09:49.376Z" }, + { url = "https://files.pythonhosted.org/packages/3e/79/f38c92eeaeb03a2ccc2ba9866f0439593bb08c5e3b714ac1d553e5c96e25/pyzmq-27.1.0-pp311-pypy311_pp73-manylinux2014_i686.manylinux_2_17_i686.whl", hash = "sha256:ac25465d42f92e990f8d8b0546b01c391ad431c3bf447683fdc40565941d0604", size = 800208, upload-time = "2025-09-08T23:09:51.073Z" }, + { url = "https://files.pythonhosted.org/packages/49/0e/3f0d0d335c6b3abb9b7b723776d0b21fa7f3a6c819a0db6097059aada160/pyzmq-27.1.0-pp311-pypy311_pp73-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:53b40f8ae006f2734ee7608d59ed661419f087521edbfc2149c3932e9c14808c", size = 567747, upload-time = "2025-09-08T23:09:52.698Z" }, + { url = "https://files.pythonhosted.org/packages/a1/cf/f2b3784d536250ffd4be70e049f3b60981235d70c6e8ce7e3ef21e1adb25/pyzmq-27.1.0-pp311-pypy311_pp73-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:f605d884e7c8be8fe1aa94e0a783bf3f591b84c24e4bc4f3e7564c82ac25e271", size = 747371, upload-time = "2025-09-08T23:09:54.563Z" }, + { url = "https://files.pythonhosted.org/packages/01/1b/5dbe84eefc86f48473947e2f41711aded97eecef1231f4558f1f02713c12/pyzmq-27.1.0-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:c9f7f6e13dff2e44a6afeaf2cf54cee5929ad64afaf4d40b50f93c58fc687355", size = 544862, upload-time = "2025-09-08T23:09:56.509Z" }, +] + +[[package]] +name = "redis" +version = "8.0.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "async-timeout", marker = "python_full_version < '3.11.3'" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/53/ae/ed461cca5780b5fc8b9fe8ca0ed98d89508645fb9d880c24cc42c087678f/redis-8.0.0.tar.gz", hash = "sha256:a00c5355432051ac14e593b8b197fc76c887ee12d55a0984f69328a1115fdc49", size = 5101591, upload-time = "2026-05-28T12:45:13.5Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/27/e3/b519734372d305bd547534a9f32e4ce9f98552af753dce72cf3483a0ff0b/redis-8.0.0-py3-none-any.whl", hash = "sha256:c938c18338585009f0bc310f4c7e4e4b4d37639356c4ac072cedf3af570c8dc7", size = 499870, upload-time = "2026-05-28T12:45:11.697Z" }, +] + +[[package]] +name = "referencing" +version = "0.37.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "attrs" }, + { name = "rpds-py" }, + { name = "typing-extensions", marker = "python_full_version < '3.13'" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/22/f5/df4e9027acead3ecc63e50fe1e36aca1523e1719559c499951bb4b53188f/referencing-0.37.0.tar.gz", hash = "sha256:44aefc3142c5b842538163acb373e24cce6632bd54bdb01b21ad5863489f50d8", size = 78036, upload-time = "2025-10-13T15:30:48.871Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/2c/58/ca301544e1fa93ed4f80d724bf5b194f6e4b945841c5bfd555878eea9fcb/referencing-0.37.0-py3-none-any.whl", hash = "sha256:381329a9f99628c9069361716891d34ad94af76e461dcb0335825aecc7692231", size = 26766, upload-time = "2025-10-13T15:30:47.625Z" }, +] + +[[package]] +name = "regex" +version = "2026.5.9" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/dc/0e/49aee608ad09480e7fd276898c99ec6192985fa331abe4eb3a986094490b/regex-2026.5.9.tar.gz", hash = "sha256:a8234aa23ec39894bfe4a3f1b85616a7032481964a13ac6fc9f10de4f6fca270", size = 416074, upload-time = "2026-05-09T23:15:19.37Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/c2/dc/c1f2df4027e82fc54b5a473e4b250f5139faca49a0fbe29a48668d228f34/regex-2026.5.9-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:ccf5249114cc3e772ecdd88a98a86eca0fd74c61ce32a94743758c083fc05d48", size = 489445, upload-time = "2026-05-09T23:12:06.111Z" }, + { url = "https://files.pythonhosted.org/packages/03/d2/59f01110660081cce9c0bc30ebd0b5ee250dacf658e3248ed92f01e0e8ee/regex-2026.5.9-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:46f1326ca6e65b0879d23ca302c0f2415aad42ff0309b9c818e7949fe19a41d8", size = 291271, upload-time = "2026-05-09T23:12:07.731Z" }, + { url = "https://files.pythonhosted.org/packages/58/b6/14b2c84ff90ddb370c81d27503f4a0fcf071496416f4855f6cc8c5d81c35/regex-2026.5.9-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:ef31cbfe458e21c6122ba8150ff060e0c7789ed0d26eb423f25472584920b555", size = 289212, upload-time = "2026-05-09T23:12:09.266Z" }, + { url = "https://files.pythonhosted.org/packages/03/d0/4db86529117320de0c84afd90e70bb47434625875e34fcef9d8c127c5b16/regex-2026.5.9-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:992604d02e6d9c6d786c24a706a71ecffe1020fc1ef264044474cd81fa2c3919", size = 792310, upload-time = "2026-05-09T23:12:11.416Z" }, + { url = "https://files.pythonhosted.org/packages/07/78/fe4800cd322f862ecffd2d553409b20d80650e5ed71b9d178f853d020b82/regex-2026.5.9-cp311-cp311-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:c9411dd64ca95477225734a93dfc8583b51916b8d5942f99d6cac21e09965451", size = 861721, upload-time = "2026-05-09T23:12:13.681Z" }, + { url = "https://files.pythonhosted.org/packages/b5/d0/b3618a895dd8feb897c61bb2954edd265e1767d82a01d53065d5871127a3/regex-2026.5.9-cp311-cp311-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:3dd4a3ff360dfb836fecdb93a4598f9d6e2ac81e3e397125145c6221bf58cf4c", size = 906460, upload-time = "2026-05-09T23:12:15.443Z" }, + { url = "https://files.pythonhosted.org/packages/33/6f/1481597e859ef19508b345eec4afd1416ed6e6b459c75a64026ef193aecf/regex-2026.5.9-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:2a661a7d270a61f7cf460caee8b9fa2d5ef9e5c681234bcb9e0fe14f488e7dfc", size = 799843, upload-time = "2026-05-09T23:12:16.892Z" }, + { url = "https://files.pythonhosted.org/packages/73/59/955734c803f59108deccba3597ae440c76b62a652733c0006e6243758420/regex-2026.5.9-cp311-cp311-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:f079e50a0d3cc3cd5091fa9ff45869a2e6b2cd35895731edafb0327901a8d86d", size = 773610, upload-time = "2026-05-09T23:12:19.127Z" }, + { url = "https://files.pythonhosted.org/packages/68/8f/70c04a236d651c81881dac42ef8538bddda6121434509d0a22d9e601503b/regex-2026.5.9-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:4ebe8f0b5ec5a5024dc4a4c59f444c4e9afc5f2abdbb8962065b75d27fb971f9", size = 781645, upload-time = "2026-05-09T23:12:20.806Z" }, + { url = "https://files.pythonhosted.org/packages/1d/96/05c7434d88185e5d27fe54aeb74df86bd77cd79f52f0b4eae54faa8fea70/regex-2026.5.9-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:97cf3bc1b7d7d2306772ec07366c80d9df00ff79e79cea32898883a646d2fae2", size = 854473, upload-time = "2026-05-09T23:12:22.465Z" }, + { url = "https://files.pythonhosted.org/packages/4e/c1/6e3d8202d981f3117004bf341ee74893ba4ba8a9fbaf4b94615846550a08/regex-2026.5.9-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:0f9eede6a5cbdc02d4978090186390936e1776a7d1359b21e41014c609880bcf", size = 763311, upload-time = "2026-05-09T23:12:24.351Z" }, + { url = "https://files.pythonhosted.org/packages/93/c7/e7737f1526b3fb32bd4c337fd6c71c3ebb5c8296fc34d11197e0955d2e35/regex-2026.5.9-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:01f0f5f55f4b64dacec85dc116d3c05fd23ad3ff037bbc73a2085775953c2611", size = 844593, upload-time = "2026-05-09T23:12:26.341Z" }, + { url = "https://files.pythonhosted.org/packages/a5/27/0daffb1a535bb39f422c3d200f4ab023c71110ad66a32b366bee708baba0/regex-2026.5.9-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:1268eddd8486dc561d08eee1156e40aa3a8fe10f4bdec8fa653b455fcbffd12c", size = 789167, upload-time = "2026-05-09T23:12:27.975Z" }, + { url = "https://files.pythonhosted.org/packages/ce/fc/294fe4fac4f2ed67207b17471815870c1c45b3a489e08e0ac96daea16ef6/regex-2026.5.9-cp311-cp311-win32.whl", hash = "sha256:8676474c07469d6f33dd1085ca2cd45f65785f32518f2b20e36d9953ca07f994", size = 266249, upload-time = "2026-05-09T23:12:30.141Z" }, + { url = "https://files.pythonhosted.org/packages/d0/b0/8dce459f6245bcf8f6e9f23ac9569f1a0f15c131cc0745e82b43226204cf/regex-2026.5.9-cp311-cp311-win_amd64.whl", hash = "sha256:246de9d60aa3f8538b519834dd95cbf276ea263d6a7bd5a3666dc3fa0230505b", size = 278423, upload-time = "2026-05-09T23:12:31.676Z" }, + { url = "https://files.pythonhosted.org/packages/db/8d/f9aeff6ad63a3ef720386f2907e6d34a35a510a6e498ebad28b0fb3f6ab6/regex-2026.5.9-cp311-cp311-win_arm64.whl", hash = "sha256:d726ca3f0d76969bf1e8e477d160d3d666bbf999f6860bd314889e5345782046", size = 270420, upload-time = "2026-05-09T23:12:33.194Z" }, + { url = "https://files.pythonhosted.org/packages/50/9b/6550044bc44e17c84d312c031c2ec42fbdb6a4ec4e29093be3a172d08772/regex-2026.5.9-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:57eeeb05db7979413dec5438f2db21d7ecbba787cde7a711df1a6f6df672aa06", size = 490451, upload-time = "2026-05-09T23:12:34.72Z" }, + { url = "https://files.pythonhosted.org/packages/1e/95/fc7ba4303b5a0f92446a12ee6778ef2c6c799233f5060042a31bf390cfe9/regex-2026.5.9-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:398c521292f4c7fb807001dcd54694d3a1fcafc179a36ad9cc56f98df85930b6", size = 292112, upload-time = "2026-05-09T23:12:36.285Z" }, + { url = "https://files.pythonhosted.org/packages/54/4b/ee27938d1b2c443e89a9a10e00d2d19aa5ee300cd3d61140644e93bb083e/regex-2026.5.9-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:f7a7c26137296beba7784de6eba69c6a93a63ccebc385e4962fe67e267a91225", size = 289599, upload-time = "2026-05-09T23:12:38.089Z" }, + { url = "https://files.pythonhosted.org/packages/d8/dd/ba103dc19614e25f3880800ca67ce093d6e21b325d72b8383c7bf906e9fa/regex-2026.5.9-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:6441cc660d76107934a09c22167200839a0e89604a6297f78a974e66e931d2c0", size = 796732, upload-time = "2026-05-09T23:12:40.062Z" }, + { url = "https://files.pythonhosted.org/packages/cf/e7/f035b4fd858b050b0080bf302968dc0f59ba34e391872d54936758e6844e/regex-2026.5.9-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:91328f1c23d47595ca3ef0a7557fa129c5a23404b775c770697d2f35b33e0107", size = 865440, upload-time = "2026-05-09T23:12:42.059Z" }, + { url = "https://files.pythonhosted.org/packages/0a/51/8cd301ecc899aea28124357f729f4272f44de7806fc7ca02490bfbe253e8/regex-2026.5.9-cp312-cp312-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:93a7860539414dddaefba2b40f8771765ae17949d4c7182b876ce429e11a8309", size = 912329, upload-time = "2026-05-09T23:12:44.373Z" }, + { url = "https://files.pythonhosted.org/packages/cc/1e/3fbe2fa1e8cebd62f3bb7d3321cff1640aca2e240b51d9bd624aad949260/regex-2026.5.9-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:dd2810d22146b6d838acc5ec15602cb6b47920aa4e33015df3868eedfd20bab8", size = 801239, upload-time = "2026-05-09T23:12:46.268Z" }, + { url = "https://files.pythonhosted.org/packages/17/2f/6f6008682bf2cf98040a0d3153a8e557b6ab728d7713d045cee4ce544ab8/regex-2026.5.9-cp312-cp312-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:daff2bdbaf1d23e52fdff7c0b7bc2048b68f978df6a4d107ac981f94caef2e66", size = 777054, upload-time = "2026-05-09T23:12:48.051Z" }, + { url = "https://files.pythonhosted.org/packages/19/2b/eee0d20a6842ba04df4b8847a920b57ef56853f14ef85405473e586b605a/regex-2026.5.9-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:4eeb011098fcb77af513dcef521a3dbecbf8849b1e38940759d293b7a93f5026", size = 785098, upload-time = "2026-05-09T23:12:49.851Z" }, + { url = "https://files.pythonhosted.org/packages/4a/98/6fc1e6410feefb92159edaed5041992bfe390e8d26c721865434acbca558/regex-2026.5.9-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:ea9c8ecfa1b73c73b626534d6626e5340d429630943672b8480724f44e84b962", size = 860095, upload-time = "2026-05-09T23:12:51.666Z" }, + { url = "https://files.pythonhosted.org/packages/18/a3/bd855e0f2cb1a978ecf6fa6bb69632dd9c3f6ea3b81cde62fde14c9daec7/regex-2026.5.9-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:cd2846168eb9ee3c513902bc8225409cb1caab31d04728b145171fa1625d9621", size = 765762, upload-time = "2026-05-09T23:12:53.413Z" }, + { url = "https://files.pythonhosted.org/packages/dc/66/0ae8c092e60b14c79d24f8e0b7f0aea5bfbffdcab00b5483d13404d3c3a5/regex-2026.5.9-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:39617fb0cde9c0e6306dc70e3bfc096f3da793219879f7ae7aa341a69fbdcf6d", size = 852100, upload-time = "2026-05-09T23:12:55.256Z" }, + { url = "https://files.pythonhosted.org/packages/21/de/8dfde60fc1b21c946a893ba273403b72617edb261370cb1087099a83f088/regex-2026.5.9-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:fd03c4f0e33280d15cae17159b899245d6b7c53d21def19b263b39655061f5ce", size = 789479, upload-time = "2026-05-09T23:12:57.573Z" }, + { url = "https://files.pythonhosted.org/packages/c3/1c/bdcc98f9a4af4fdd166c74941174619ccff4726d3ce32faa8e9a2ecd38dd/regex-2026.5.9-cp312-cp312-win32.whl", hash = "sha256:164eba9b755ea6f244b0d881196fbc1fac09714e9782c9e2732b813142033c8e", size = 266699, upload-time = "2026-05-09T23:12:59.14Z" }, + { url = "https://files.pythonhosted.org/packages/78/87/240d36864f9e48ace85f72e79ced97ceb7f27ce87739a947dcb834b4e6bc/regex-2026.5.9-cp312-cp312-win_amd64.whl", hash = "sha256:86f40a5d6444db30a125c9c9177e6b25dad981cbc37451fd838f145e6edac92e", size = 277783, upload-time = "2026-05-09T23:13:00.789Z" }, + { url = "https://files.pythonhosted.org/packages/4f/b5/7b30f312b0669dff5beebe5b0989dc2d1a312b1a44fab852199c387a5b96/regex-2026.5.9-cp312-cp312-win_arm64.whl", hash = "sha256:96f5f58b54a063d7ea9dca08e1cf57bfe10499c4d579ee672da284f57f5f0070", size = 270513, upload-time = "2026-05-09T23:13:02.426Z" }, + { url = "https://files.pythonhosted.org/packages/aa/da/797e91ecec6f84135da778ddce78c20e0af5d2a15c26f87a81bc3eadb6db/regex-2026.5.9-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:d626b84406444b165fc0ba981604edea39f0588ff1f92baa23fe50799ea9afdb", size = 490303, upload-time = "2026-05-09T23:13:04.382Z" }, + { url = "https://files.pythonhosted.org/packages/44/da/bf30abaaa737b58f4a4b8c4a03659e02fd92092c822e0197ed9e0daab917/regex-2026.5.9-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:d7bdc0ab8f3dd7e1b4f9ab88634e13374669db86bb3c72e8292f07ae313f539f", size = 292019, upload-time = "2026-05-09T23:13:06.022Z" }, + { url = "https://files.pythonhosted.org/packages/2d/e7/d0eaf5713828417b9e5648cf81fa9bacd4961f6ab98c380c2034f8716e35/regex-2026.5.9-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:a8820737949116ffff55fe18f9fc644530063ba6ebfcb8314239416e78f1347c", size = 289468, upload-time = "2026-05-09T23:13:08.214Z" }, + { url = "https://files.pythonhosted.org/packages/d3/9b/b3fdd62b003baa1a9b593cd8c8699c9651c2e80cc21a5c715707983c42d7/regex-2026.5.9-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:aa0fbdbac82cb3e4450d0ccde7d7a35607f4cb2dd9fba4b8b69bfaf8c9fa6aed", size = 796749, upload-time = "2026-05-09T23:13:10.573Z" }, + { url = "https://files.pythonhosted.org/packages/d4/30/66ab84588765f5b4b271a9ca09ef7ce2b87caa95176ec3d2ad65d7bc4902/regex-2026.5.9-cp313-cp313-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:57e8915c7986aa33d25e4d3629cef711cd2863f2961b10409f0c04cb8b7d9020", size = 865445, upload-time = "2026-05-09T23:13:12.523Z" }, + { url = "https://files.pythonhosted.org/packages/1a/89/f05169e8588aac365f35ffc7f3bc3184f095ef4cfded7cfaa3c7fd5dbd89/regex-2026.5.9-cp313-cp313-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:508f56a89ba9cb26e4168cbc37dbd60a28d82430a9e18ad1d25fe0883c314ca2", size = 912322, upload-time = "2026-05-09T23:13:14.281Z" }, + { url = "https://files.pythonhosted.org/packages/30/e1/c93444052cf41581f3c884ab3fb5823daf0992f11cd4388d4275ca610558/regex-2026.5.9-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:b6d189041f15691cfa2b6c4290448ec221244d225b3f5fe9e7771b34ffcdf6e2", size = 801269, upload-time = "2026-05-09T23:13:16.569Z" }, + { url = "https://files.pythonhosted.org/packages/50/fe/0cf96b882f540e62e8b9956599798203d599c44cf4c77917ca27400ff69b/regex-2026.5.9-cp313-cp313-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:e82db382b44d0111b22601c509c89f64434816c9e0eef9d1989cda8cc6ff1c04", size = 777085, upload-time = "2026-05-09T23:13:18.675Z" }, + { url = "https://files.pythonhosted.org/packages/23/5c/d78d4924e7fc875557b9e9b768423925fdfaac5549d06da7810019a9bd26/regex-2026.5.9-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:2acfb48634f64996b57f90f39afa692ff362162722581921fe92239a59960f3c", size = 785153, upload-time = "2026-05-09T23:13:20.525Z" }, + { url = "https://files.pythonhosted.org/packages/bf/e0/5214774090e7b4524dcea3e3c4aa74141d43043f8beb49c1599db1c8b53a/regex-2026.5.9-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:d29eebfc9525db68cad3c97eedd7f754fa265aa5cd0cf4f863b2421e1b48fc9f", size = 860164, upload-time = "2026-05-09T23:13:22.263Z" }, + { url = "https://files.pythonhosted.org/packages/6e/e1/4a57a83350319b1271f0d7a249b8672513ed928b237a741631270de6caea/regex-2026.5.9-cp313-cp313-musllinux_1_2_riscv64.whl", hash = "sha256:debb893095e944091c16e641a6e33c1b0f4cb61ab945ec5afbf53ce7068834d8", size = 765731, upload-time = "2026-05-09T23:13:24.277Z" }, + { url = "https://files.pythonhosted.org/packages/12/f4/499e74a20c156fc75836ee04a72a38d1a063978f600937f9760467beb1b0/regex-2026.5.9-cp313-cp313-musllinux_1_2_s390x.whl", hash = "sha256:d659eee77986549c9ea45b861c7567e44d6287c3dc9a4565478853f7b9fe2ff6", size = 852062, upload-time = "2026-05-09T23:13:26.125Z" }, + { url = "https://files.pythonhosted.org/packages/5b/92/7eebc0d0a01e78629695f342ba17e0deaff8fb45e79cc0d7b98287da6e3e/regex-2026.5.9-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:2efa205e6d98b24d1f3ab395c11aa15cdf10935bca283d0285e0499c284fba21", size = 789577, upload-time = "2026-05-09T23:13:27.814Z" }, + { url = "https://files.pythonhosted.org/packages/05/a4/018e71f7d2ad48c1ebe6d3ae0026f9b7cb4802fd15c7cc02fdf724355102/regex-2026.5.9-cp313-cp313-win32.whl", hash = "sha256:f3844f134e834076677dd369976e9f5068679fcb8e50102fdf6b7ac96a3ec127", size = 266691, upload-time = "2026-05-09T23:13:29.549Z" }, + { url = "https://files.pythonhosted.org/packages/e6/1d/861a93719fb9ee7dbfc3761b3797b7a3e112a5d42c6129459d2d741be9b5/regex-2026.5.9-cp313-cp313-win_amd64.whl", hash = "sha256:3527bb4942d2c14552155406cdedd906567456821848aed1cb4933a391bf5eca", size = 277747, upload-time = "2026-05-09T23:13:31.859Z" }, + { url = "https://files.pythonhosted.org/packages/d9/c6/0a2436ae4da1ba76e51cb98943c6838a9a721faa40ebe2dce07694ae34e3/regex-2026.5.9-cp313-cp313-win_arm64.whl", hash = "sha256:56a33f191f17d8c417f99945ebdc1e691d3af9605d86ec68c7e54a57e3e17af6", size = 270500, upload-time = "2026-05-09T23:13:33.525Z" }, + { url = "https://files.pythonhosted.org/packages/e8/e9/d21346f7b60ed58789371358ed66b09d00f832e1bd7c06e55d9da5679882/regex-2026.5.9-cp313-cp313t-macosx_10_13_universal2.whl", hash = "sha256:01f28d868834624c934b8d2e0aa1c8341337e37831f4a012f18a5afcba4cbaf3", size = 494172, upload-time = "2026-05-09T23:13:35.935Z" }, + { url = "https://files.pythonhosted.org/packages/c4/43/fd1177a2032037c681baecdb3422ee4e1424aec4e4f470ef47793d325274/regex-2026.5.9-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:48036f6374aaa79eb3b754ec29c61d1c6b1606749d705a13f8854fa2539671f6", size = 293952, upload-time = "2026-05-09T23:13:38.307Z" }, + { url = "https://files.pythonhosted.org/packages/f2/7d/9fbf919768368d3f8a4f6c692cf2aa61e482b2b81ec6a298ace4cbf02480/regex-2026.5.9-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:b96350aa424e79d4fd6b567b344dcbe2b2d6bfc48dfe7717587e1fa6d43da6ff", size = 292314, upload-time = "2026-05-09T23:13:40.353Z" }, + { url = "https://files.pythonhosted.org/packages/e2/6c/e41bfeecb589716843e7c4df09ba46ff2a42961457afece19059d85caeef/regex-2026.5.9-cp313-cp313t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:8f3af7a4903c5c04a11a196a5aa75cdd7dd3f8508132f9fb3259d9f5908e3b88", size = 811681, upload-time = "2026-05-09T23:13:42.543Z" }, + { url = "https://files.pythonhosted.org/packages/87/83/a5c1c525fba0aa656e88ad0face0b1829788ef4c2fb6b26df58aa1151b84/regex-2026.5.9-cp313-cp313t-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:7e87577720152d2caae19fe2baaf1f8d5ca12091e9e229f03915c37d1e4b9178", size = 871135, upload-time = "2026-05-09T23:13:44.326Z" }, + { url = "https://files.pythonhosted.org/packages/18/d4/80882e799e440dd878b0979cbebf8fa4d54624a332c83037c7a701649e3f/regex-2026.5.9-cp313-cp313t-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:c8b9b9d294cfea3cd19c718ade7cc93492b2c4991abd9a68d0b3477ae6d8e100", size = 917265, upload-time = "2026-05-09T23:13:47.295Z" }, + { url = "https://files.pythonhosted.org/packages/ae/ff/8db60211e2286e396aad7dc7725356c502bff0901ea05bd6cdc2e1a042b9/regex-2026.5.9-cp313-cp313t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:728d8bfd28a8845c8b6bc5dc7ce010453d206396786c0765c2740cb65f37791e", size = 816311, upload-time = "2026-05-09T23:13:49.885Z" }, + { url = "https://files.pythonhosted.org/packages/4c/47/742ef579c61730f8d268e5cf1f9ce0e37e2ea041ad0f5644724f2378e463/regex-2026.5.9-cp313-cp313t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:7e30b874d341fac767d7df5a0870540541c2c054b80cfaac116e8d367a8a7ff2", size = 785498, upload-time = "2026-05-09T23:13:52.25Z" }, + { url = "https://files.pythonhosted.org/packages/7f/ab/cb0999802dcb0fb95b1ab005e8d4163d8afdd67efc2cb6b6630ac13f8cb1/regex-2026.5.9-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:fd190e88a895a8901325fad284a3f74ea52b1da8525b76cc811fa9b1edf0ce2b", size = 801348, upload-time = "2026-05-09T23:13:54.127Z" }, + { url = "https://files.pythonhosted.org/packages/7d/62/8ca59a24c55bc34d166eefaf3717bd77772f329fdbf984d86581e0a3571c/regex-2026.5.9-cp313-cp313t-musllinux_1_2_ppc64le.whl", hash = "sha256:8e76e8161ad00694cfce6767d5dea860c6391ac5b83e5c3a39661e696f11fc7e", size = 866493, upload-time = "2026-05-09T23:13:56.067Z" }, + { url = "https://files.pythonhosted.org/packages/8d/3d/30f2ae62cef3278bb5bb821f467277a55fb73f01032cf85997e15e8289a8/regex-2026.5.9-cp313-cp313t-musllinux_1_2_riscv64.whl", hash = "sha256:ddda5340e6c01a293027dd46232fa79eaff1b48058ce7a98f572b6445b088041", size = 772811, upload-time = "2026-05-09T23:13:57.867Z" }, + { url = "https://files.pythonhosted.org/packages/d8/ae/7d2089bcd78ad0c0161bc684339df50032acb438a7bd3305e7ddb1193cec/regex-2026.5.9-cp313-cp313t-musllinux_1_2_s390x.whl", hash = "sha256:205109e96b3cf5adf8f4cd62bedde9487feb282b9497a3535451e5a24cd706a0", size = 856584, upload-time = "2026-05-09T23:13:59.679Z" }, + { url = "https://files.pythonhosted.org/packages/a9/29/92ff47f75990131ea4f24ba17819e5a9d141e10819807e09addd73409af6/regex-2026.5.9-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:dfbe4579b9f08036aa7d101d1835437a20783574ac66327e6b29b4018a138081", size = 803453, upload-time = "2026-05-09T23:14:01.978Z" }, + { url = "https://files.pythonhosted.org/packages/04/99/eff29f1037dcab36702c9ee5d6858cf1ce2336ea8ea2987f64245b99ea5e/regex-2026.5.9-cp313-cp313t-win32.whl", hash = "sha256:ed2c9e8068b614c574d8d30e543d617cf5379b0535d46f97ef00e904745a08b5", size = 269951, upload-time = "2026-05-09T23:14:03.661Z" }, + { url = "https://files.pythonhosted.org/packages/0e/9d/8870b8981d27b22cda77bb26a5ac7ebfa9c7d9e0dea195a834a82380e748/regex-2026.5.9-cp313-cp313t-win_amd64.whl", hash = "sha256:b46b0f094dc1d3b90356c85a0bd2c9bafc4a6a190b9d6f8ddd5a033b6e088ed4", size = 281240, upload-time = "2026-05-09T23:14:05.56Z" }, + { url = "https://files.pythonhosted.org/packages/72/b1/3379415e8f135c13ac551353397cc4fe97b4978f3cac73c5fcbcded548b8/regex-2026.5.9-cp313-cp313t-win_arm64.whl", hash = "sha256:872acc074bd29ffc9913ecdfedf6ea77502312ca44a4aa0d3779089c6069d8de", size = 272383, upload-time = "2026-05-09T23:14:07.843Z" }, + { url = "https://files.pythonhosted.org/packages/13/3e/9c3cd292d8808b3645a2ce517e200179b6d0e903f176300bd8b542e14de5/regex-2026.5.9-cp314-cp314-macosx_10_13_universal2.whl", hash = "sha256:1bd7587a2948b4085195d5a3374eaf4a425dc3e55784c038175355ecf3bbbf8a", size = 490376, upload-time = "2026-05-09T23:14:09.64Z" }, + { url = "https://files.pythonhosted.org/packages/60/70/d43ee8a2ca0a8b68d167f21658b85520ac0574617c7f320367c5047f7556/regex-2026.5.9-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:dea2e88e1cce4522496cce630e11e67b98b7076620bc4336c3f674bc21a375f4", size = 291964, upload-time = "2026-05-09T23:14:11.424Z" }, + { url = "https://files.pythonhosted.org/packages/21/91/9d50b433828d8e74196904e168a43abf1e6e88b2a15d47ed742456720c37/regex-2026.5.9-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:2099f7e7ff7b6aa3192312650a56e91cc091e49d50b04e4f6f8b6e28b3b27f1c", size = 289682, upload-time = "2026-05-09T23:14:13.123Z" }, + { url = "https://files.pythonhosted.org/packages/3e/d2/b835e3cafbb9d977736912436259ff551d60919f7d7b3d37d46659c63564/regex-2026.5.9-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:ecd353045824e4477562a2ac718c25799cdaaa41f7aa925a806a8a3e6848a5b9", size = 796996, upload-time = "2026-05-09T23:14:14.923Z" }, + { url = "https://files.pythonhosted.org/packages/2c/a6/9f992d00019166b9de01c546dd4549bc679f2a68df11b877740b0760b7c2/regex-2026.5.9-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:65c8c8c37377794bd5b2f3ebe51919042bf17aec802e23c833d89782ed0c78af", size = 866089, upload-time = "2026-05-09T23:14:17.757Z" }, + { url = "https://files.pythonhosted.org/packages/e0/08/4d32af657e049b19cb62b02e46e38fe1518797bfb2203ee93a510b21b0dc/regex-2026.5.9-cp314-cp314-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:5b73ab8afcf66c622db143d1c6fda4e58e4d537ee4f125229ad47b1ab80f34c0", size = 911530, upload-time = "2026-05-09T23:14:20.353Z" }, + { url = "https://files.pythonhosted.org/packages/d9/27/2af43dd1dc201d1fecefda64a45f4ad0995855b92724f795a777b402ee69/regex-2026.5.9-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:0de5cf193997384ed2ca6f1cd4f78055b255d93d82d5a8cd6ba0d11c10b167e4", size = 800643, upload-time = "2026-05-09T23:14:22.265Z" }, + { url = "https://files.pythonhosted.org/packages/a4/dd/23a249047013b5321d4a60c4d2437462086f601b061776a525e5fba2a59f/regex-2026.5.9-cp314-cp314-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:d641a8c9a61618047796d572a39a79b26167b0411d2c3031937b2fe2d081e2cf", size = 777223, upload-time = "2026-05-09T23:14:24.179Z" }, + { url = "https://files.pythonhosted.org/packages/94/6a/e85ed9538cd19586d0465076a4578a12e093ce776d15f3f8ce92733a8dd6/regex-2026.5.9-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:24b2355ef5cc9aa5b8f07d17704face1c166fdcc2290fa7bd6e6c925655a8346", size = 785760, upload-time = "2026-05-09T23:14:26.065Z" }, + { url = "https://files.pythonhosted.org/packages/2a/c4/f25473209438638e947c55f9156fd8f236f74169229028cc99116380868e/regex-2026.5.9-cp314-cp314-musllinux_1_2_ppc64le.whl", hash = "sha256:a24852d3c29ad9e47593593d8a247c44ccc3d0548ef12c822d6ed0810affe676", size = 860891, upload-time = "2026-05-09T23:14:28.17Z" }, + { url = "https://files.pythonhosted.org/packages/f9/f7/f4f86e3c74419c37370e91f150ae0c2ef7d34b2e0e4cdd5da046a02e4022/regex-2026.5.9-cp314-cp314-musllinux_1_2_riscv64.whl", hash = "sha256:916714069da19329ef7de197dcbc77bb3104145c7c2c864dbfbe318f46b88b14", size = 765891, upload-time = "2026-05-09T23:14:30.06Z" }, + { url = "https://files.pythonhosted.org/packages/26/70/704d8e13765939146b1cd0ef4e2feb71d7929727d2290f026eed10095955/regex-2026.5.9-cp314-cp314-musllinux_1_2_s390x.whl", hash = "sha256:fa411799ca8da32a8d38d020a88faa5b6f91657d284761352940ecf9f7c3bbdd", size = 851380, upload-time = "2026-05-09T23:14:32.123Z" }, + { url = "https://files.pythonhosted.org/packages/26/29/1a13582a8460038edc38e49f64ceb0dd7c60f5caba77571f4bf6601965d9/regex-2026.5.9-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:1e6da47d679b7010ef27556b6e0f99771b744936db1792a10ceac6547ae1503e", size = 789350, upload-time = "2026-05-09T23:14:34.799Z" }, + { url = "https://files.pythonhosted.org/packages/73/56/3dcafe34fc72e271d62ad9a291801e88a1457bb251c132f15fcc2e5aad1a/regex-2026.5.9-cp314-cp314-win32.whl", hash = "sha256:98bd73080e8756255137e1bd3f3f00295bbc5aa383c0e0f973920e9134d7c4ad", size = 272130, upload-time = "2026-05-09T23:14:36.729Z" }, + { url = "https://files.pythonhosted.org/packages/d0/9c/02eebf0be95efe416c664db7fb8b6b05b7a0b06a7544f2884f2558b0526f/regex-2026.5.9-cp314-cp314-win_amd64.whl", hash = "sha256:ff8d372ac2acdc048d1c19916f27ee61bc5722728458ba6ca5052f2c72d51763", size = 280999, upload-time = "2026-05-09T23:14:39.126Z" }, + { url = "https://files.pythonhosted.org/packages/70/5a/1dd1abee76cb7a846a0bcf42fdc87e5720c3c33c24f3e37814310a513d9f/regex-2026.5.9-cp314-cp314-win_arm64.whl", hash = "sha256:e1d93bf647916292e8edcec150c07ddf3dc50179ccaf770c04a7f9e452155372", size = 273500, upload-time = "2026-05-09T23:14:41.059Z" }, + { url = "https://files.pythonhosted.org/packages/86/c1/c5f619b0057a7965cb78ec559c1d7a45ce8c99a35bea95483d64959a93d9/regex-2026.5.9-cp314-cp314t-macosx_10_13_universal2.whl", hash = "sha256:83d0ee4a57d1c87cb549e195ec300b8f0ec3a82eba66d835e4e2ed8634fe4499", size = 494269, upload-time = "2026-05-09T23:14:42.869Z" }, + { url = "https://files.pythonhosted.org/packages/05/2c/5d01f1aee33de4bbe60c8452945bfc8477ca7c5ae4450f6bfe711036cb36/regex-2026.5.9-cp314-cp314t-macosx_10_13_x86_64.whl", hash = "sha256:d3d7eb5c9a7f6df82ed3cfac9beb93882a5cbcb5b8b157b56cb2b3b276574ac1", size = 293954, upload-time = "2026-05-09T23:14:44.822Z" }, + { url = "https://files.pythonhosted.org/packages/7a/fe/e8988b2ae2108c6ef71bd4aa8d87fbe257976dd0810e826cd75f701c68b6/regex-2026.5.9-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:075160bf16658e16d35233300b8453aac25de4cbea808d22348b6979668e924d", size = 292405, upload-time = "2026-05-09T23:14:47.211Z" }, + { url = "https://files.pythonhosted.org/packages/79/34/d2b0937faa7859263f7f0a3c6b103a1296306be6952dc173d0154e9a2f49/regex-2026.5.9-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:45375819235558a4ff1c4971dc32881f022613abdb180128f5cb4768c1765a1c", size = 811855, upload-time = "2026-05-09T23:14:49.21Z" }, + { url = "https://files.pythonhosted.org/packages/80/fe/daf53a47457a8486db66c66c01ceb9c2303eecee3f87197f1e77eb1a736d/regex-2026.5.9-cp314-cp314t-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:ead4b163ac30a29574510cd4b3e2e985ac5290c05fc7095557d6a5f403fc31b5", size = 871189, upload-time = "2026-05-09T23:14:51.555Z" }, + { url = "https://files.pythonhosted.org/packages/1c/75/058fc4470cbfbf57d800aff1a0022b929a3f9fa553ee10a0cdf2070eb31f/regex-2026.5.9-cp314-cp314t-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:8c6e4218fbdfbcd4f6c19efca40930d24a621bf4b48cb76bc6640543bd28ef20", size = 917485, upload-time = "2026-05-09T23:14:53.633Z" }, + { url = "https://files.pythonhosted.org/packages/88/e7/179cfda3a28bc843b5c6cfe7f79f23489c791ed95f151083803660878432/regex-2026.5.9-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:6351571c8a42b505eb555c0dc47d740d0fb66977dc142919eea6f4325b7c56a0", size = 816369, upload-time = "2026-05-09T23:14:56.198Z" }, + { url = "https://files.pythonhosted.org/packages/41/90/6f0cc422071688266d344fca8462d787cba0a2c144acb25721f9a61ec265/regex-2026.5.9-cp314-cp314t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:002205cafd2a9e78c6290c7d1df277bf3277b3b7a30e0b4bb0dac2e2e3f7cb2d", size = 785869, upload-time = "2026-05-09T23:14:58.602Z" }, + { url = "https://files.pythonhosted.org/packages/02/67/a31f1760f09c27b251ef39e9beb541f462cf977381d067faa764c2c0e393/regex-2026.5.9-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:8abd33fef90b2a9efac5557d6033ca82d1195ed3a15fea5af15ba7b463c6a63b", size = 801427, upload-time = "2026-05-09T23:15:00.642Z" }, + { url = "https://files.pythonhosted.org/packages/e3/c4/1a80654597b6bc1e1ea0494824c31200e8a956abe290afae9b19a166a148/regex-2026.5.9-cp314-cp314t-musllinux_1_2_ppc64le.whl", hash = "sha256:31037c82eccb44b7ea2e9e221d7c01429430e989a1f4b91ea5a855f6017b509a", size = 866482, upload-time = "2026-05-09T23:15:03.384Z" }, + { url = "https://files.pythonhosted.org/packages/d1/11/960724e06482c08466ff5611e242e86f80062949cdf6b4b9cc317b9dd93d/regex-2026.5.9-cp314-cp314t-musllinux_1_2_riscv64.whl", hash = "sha256:5604dfd046dc37eca90250fc3be938b076c8059fa772ac0ed6f499b0f0fb0415", size = 773022, upload-time = "2026-05-09T23:15:05.625Z" }, + { url = "https://files.pythonhosted.org/packages/50/a8/a9979c3e7918280e93159ebcab5ef1a65116dd4f3bd6091be0eae4a126e8/regex-2026.5.9-cp314-cp314t-musllinux_1_2_s390x.whl", hash = "sha256:0e1b1b4e496afbb24f4a62aba855ee4f88f25578927697b340702e48c9ee6bc2", size = 856642, upload-time = "2026-05-09T23:15:07.966Z" }, + { url = "https://files.pythonhosted.org/packages/fe/d4/a9b732f2f0072c0ab12227483abb24fffcb9f73f8a2b203df0a6d0434735/regex-2026.5.9-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:be3372b9df6ddecff6486d37e19095a7b4973137caf5512407a89f4455361f41", size = 803552, upload-time = "2026-05-09T23:15:10.215Z" }, + { url = "https://files.pythonhosted.org/packages/d5/fe/1b3113817447a1d4155e4ac76d2e072f42c0bcba2f43fa8a0e756ea2cd91/regex-2026.5.9-cp314-cp314t-win32.whl", hash = "sha256:3ddd90103f9e5c471c49c7852ecc1fe27c7e45eb99e977aefe7caa4e779f4f58", size = 275746, upload-time = "2026-05-09T23:15:12.609Z" }, + { url = "https://files.pythonhosted.org/packages/92/73/93d42045302636c91f2e5ef588b65b84b01428f28ec77de256b1dfdfbe5c/regex-2026.5.9-cp314-cp314t-win_amd64.whl", hash = "sha256:ca518ed29c46eecba6010b15f1b9a479314d2de409536e71b6a13aa04e3b8a77", size = 285685, upload-time = "2026-05-09T23:15:15.086Z" }, + { url = "https://files.pythonhosted.org/packages/da/80/35b4c33c804a165a7f55289afda3ea9e3eb6d15800341a2d66455c0f1f30/regex-2026.5.9-cp314-cp314t-win_arm64.whl", hash = "sha256:5e41809d2683fcde7d5a8c87a6567ba1fb1ce0de9f31bff578de00a4b2d76daa", size = 275713, upload-time = "2026-05-09T23:15:16.98Z" }, +] + +[[package]] +name = "requests" +version = "2.34.2" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "certifi" }, + { name = "charset-normalizer" }, + { name = "idna" }, + { name = "urllib3" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/ac/c3/e2a2b89f2d3e2179abd6d00ebd70bff6273f37fb3e0cc209f48b39d00cbf/requests-2.34.2.tar.gz", hash = "sha256:f288924cae4e29463698d6d60bc6a4da69c89185ad1e0bcc4104f584e960b9ed", size = 142856, upload-time = "2026-05-14T19:25:27.735Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/a0/f4/c67b0b3f1b9245e8d266f0f112c500d50e5b4e83cb6f3b71b6528104182a/requests-2.34.2-py3-none-any.whl", hash = "sha256:2a0d60c172f83ac6ab31e4554906c0f3b3588d37b5cb939b1c061f4907e278e0", size = 73075, upload-time = "2026-05-14T19:25:26.443Z" }, +] + +[[package]] +name = "rfc3339-validator" +version = "0.1.4" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "six" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/28/ea/a9387748e2d111c3c2b275ba970b735e04e15cdb1eb30693b6b5708c4dbd/rfc3339_validator-0.1.4.tar.gz", hash = "sha256:138a2abdf93304ad60530167e51d2dfb9549521a836871b88d7f4695d0022f6b", size = 5513, upload-time = "2021-05-12T16:37:54.178Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/7b/44/4e421b96b67b2daff264473f7465db72fbdf36a07e05494f50300cc7b0c6/rfc3339_validator-0.1.4-py2.py3-none-any.whl", hash = "sha256:24f6ec1eda14ef823da9e36ec7113124b39c04d50a4d3d3a3c2859577e7791fa", size = 3490, upload-time = "2021-05-12T16:37:52.536Z" }, +] + +[[package]] +name = "rfc3986-validator" +version = "0.1.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/da/88/f270de456dd7d11dcc808abfa291ecdd3f45ff44e3b549ffa01b126464d0/rfc3986_validator-0.1.1.tar.gz", hash = "sha256:3d44bde7921b3b9ec3ae4e3adca370438eccebc676456449b145d533b240d055", size = 6760, upload-time = "2019-10-28T16:00:19.144Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/9e/51/17023c0f8f1869d8806b979a2bffa3f861f26a3f1a66b094288323fba52f/rfc3986_validator-0.1.1-py2.py3-none-any.whl", hash = "sha256:2f235c432ef459970b4306369336b9d5dbdda31b510ca1e327636e01f528bfa9", size = 4242, upload-time = "2019-10-28T16:00:13.976Z" }, +] + +[[package]] +name = "rfc3987-syntax" +version = "1.1.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "lark" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/2c/06/37c1a5557acf449e8e406a830a05bf885ac47d33270aec454ef78675008d/rfc3987_syntax-1.1.0.tar.gz", hash = "sha256:717a62cbf33cffdd16dfa3a497d81ce48a660ea691b1ddd7be710c22f00b4a0d", size = 14239, upload-time = "2025-07-18T01:05:05.015Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/7e/71/44ce230e1b7fadd372515a97e32a83011f906ddded8d03e3c6aafbdedbb7/rfc3987_syntax-1.1.0-py3-none-any.whl", hash = "sha256:6c3d97604e4c5ce9f714898e05401a0445a641cfa276432b0a648c80856f6a3f", size = 8046, upload-time = "2025-07-18T01:05:03.843Z" }, +] + +[[package]] +name = "rpds-py" +version = "2026.5.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/2e/43/25a8dcd3feedd735039a8f0b5b7e3b118232b5eae288c4fd9ab200d41094/rpds_py-2026.5.1.tar.gz", hash = "sha256:07b24fea40541e28570e5b795a4a38fbdcd12550c06bd0748005ecc8116ca256", size = 64459, upload-time = "2026-05-28T12:02:13.232Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/4f/a0/acf8b6fc20bfdcd3a45bd3f57680fb198e157b7e997b9123b10763798bd2/rpds_py-2026.5.1-cp311-cp311-macosx_10_12_x86_64.whl", hash = "sha256:3397a5ed7174dc2786bb214030232fc36fe8e5584fec43a9952cc542b1a12036", size = 355609, upload-time = "2026-05-28T11:58:50.78Z" }, + { url = "https://files.pythonhosted.org/packages/b6/95/f8203fd997484b1690a6869cd0e503b6c3c6be55b0ecc36d1a491fe742f0/rpds_py-2026.5.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:99ab6ba7bfa2cb0f96a04e3652355bf04e3f51aceb1e943b8541dab7ba4828cc", size = 348460, upload-time = "2026-05-28T11:58:52.374Z" }, + { url = "https://files.pythonhosted.org/packages/33/8c/b47326ad2f0be545a5e5c1a55937a12afaea7d392ba2837bb9680f57e6c9/rpds_py-2026.5.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d0efbe45632665e53e3db8fe1e5692db58fc5cb9bab4459d570b83efefe11164", size = 381031, upload-time = "2026-05-28T11:58:53.775Z" }, + { url = "https://files.pythonhosted.org/packages/22/0b/e83bbd97ffac6f6389b605cd4e1c8ac5761dc7e977769c9255d8c5adb7bd/rpds_py-2026.5.1-cp311-cp311-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:01d17b29c0c23d82b1f4751147ec49cf451f1fc2554eb9ef5f957e55d2656ead", size = 387121, upload-time = "2026-05-28T11:58:55.243Z" }, + { url = "https://files.pythonhosted.org/packages/fd/0e/d285d1bc8864245919c61e1ca82263e4a66d337759c3a4cef72766ff9afc/rpds_py-2026.5.1-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:7559f72b94ae52659086c595dfa017cde03155f7832071d30959049052cb3ece", size = 501026, upload-time = "2026-05-28T11:58:56.788Z" }, + { url = "https://files.pythonhosted.org/packages/86/06/ccb2109a1e543437b5e43816f2b43b9554cc6783145528a4e3711e05c011/rpds_py-2026.5.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9e25b7088f9ccbfc0dfcaa52bf969300ca229e10ecf758974ebcbb080a4b37bb", size = 391865, upload-time = "2026-05-28T11:58:58.298Z" }, + { url = "https://files.pythonhosted.org/packages/3d/33/237173db1cfef10105b3839a24de00eb8d2a523711add4632447cdf0aedd/rpds_py-2026.5.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:613fc4ee9eaef26dc5840666214dd6fbcebcf32f46e76f4abc473059f4e13dda", size = 378012, upload-time = "2026-05-28T11:58:59.589Z" }, + { url = "https://files.pythonhosted.org/packages/97/64/1eae54e34d5161f9969295e80bd6b62a55f2b6ac5f2a5b60d02c2140e758/rpds_py-2026.5.1-cp311-cp311-manylinux_2_31_riscv64.whl", hash = "sha256:85264a90ff4c05c1568dd65f5921c837614b67c60358fb4c17df3b7f2e90690a", size = 391111, upload-time = "2026-05-28T11:59:01.104Z" }, + { url = "https://files.pythonhosted.org/packages/d8/34/5bb334a5a0f65d77869217c4654f34c78a7d11b93938a3c076a2edeafc52/rpds_py-2026.5.1-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:fe71bca7d547acb17027c7fd1624ff8aae623499c498d3e7011182c4de5c25e0", size = 409225, upload-time = "2026-05-28T11:59:02.433Z" }, + { url = "https://files.pythonhosted.org/packages/16/0f/007ec21283b5b040b4ec3bd95e0402591e22bfa7d5c93dfe01c465c2d2d7/rpds_py-2026.5.1-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:a05fa4f41f37ec97c9c260441a940450a192f78d774d2b097eee1379f1e1246a", size = 556487, upload-time = "2026-05-28T11:59:04.012Z" }, + { url = "https://files.pythonhosted.org/packages/ff/10/5437c94508169b6b22d8418fef7a66e9ffb5f3b9e9c94460f2eedafe06ff/rpds_py-2026.5.1-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:df1d2a1996755b24b9ecee92cb4d36c28f86f464a6a173349c26bab41e94b8c2", size = 620798, upload-time = "2026-05-28T11:59:05.485Z" }, + { url = "https://files.pythonhosted.org/packages/e0/d5/9937dce4d6bda74157b954e7d1460db05a22f5929dccfeeba1ed27a93df0/rpds_py-2026.5.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:8895840ac4809e5f60c88fd07617cd71326e73d6e5a8aa783c5c0f7c24985de2", size = 584053, upload-time = "2026-05-28T11:59:06.837Z" }, + { url = "https://files.pythonhosted.org/packages/6c/31/750617dd0ae1752471bf43f9e41d263398fae7cde7849d23b8574a70e617/rpds_py-2026.5.1-cp311-cp311-win32.whl", hash = "sha256:3684a59b158a7683aaeb8e25352e9a9dd2122cec78f2d8530266e4f91b4c7b3f", size = 214390, upload-time = "2026-05-28T11:59:08.402Z" }, + { url = "https://files.pythonhosted.org/packages/3c/bb/3dcab0e1d9516303f2eb672a5d6f62eca5a69e2886301e9c8c54b520c39b/rpds_py-2026.5.1-cp311-cp311-win_amd64.whl", hash = "sha256:7bd530e6a530bb3ea892f194fafa455f3516ac25ecf7143fd33c09be62b0470a", size = 231097, upload-time = "2026-05-28T11:59:09.786Z" }, + { url = "https://files.pythonhosted.org/packages/49/d6/c6bbf5cb1cf12b9732df8074b57f6ef8341ba884c95d40632ae8bddb44e4/rpds_py-2026.5.1-cp311-cp311-win_arm64.whl", hash = "sha256:0a5ae4dbe43c1076983b72616496919872ae7bbe7a1e21cc48336bc3154d130b", size = 226361, upload-time = "2026-05-28T11:59:11.079Z" }, + { url = "https://files.pythonhosted.org/packages/d4/e7/a78582dc57caa592dcc7d4fb69b61390561e908eb3d2f5df5928a8e354c0/rpds_py-2026.5.1-cp312-cp312-macosx_10_12_x86_64.whl", hash = "sha256:3abe24a66e57adcfa645d718063a5fa5103ecc71ddbf26d78af8f9368018ff1d", size = 353040, upload-time = "2026-05-28T11:59:12.531Z" }, + { url = "https://files.pythonhosted.org/packages/a3/43/35e3f136343aef451e545ce8c38d36c2f93c0ed88703db8b64ba2b205c68/rpds_py-2026.5.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:58b1d94308ddf0b1982f61f2eb54bf92997c9ece8a8093ef014250f4a517906c", size = 345775, upload-time = "2026-05-28T11:59:13.827Z" }, + { url = "https://files.pythonhosted.org/packages/20/e1/0f2160c5982d3157734d5cb3ed63d8b2d583a73c9864f77b666449f32cf8/rpds_py-2026.5.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0fa92420128dadce7f54bd73ba1825a273e9268fe9e35dbf7e6362890efa4e08", size = 376329, upload-time = "2026-05-28T11:59:15.271Z" }, + { url = "https://files.pythonhosted.org/packages/d0/11/ee0ba42aff83bf4effdbc576673c6be64c5e173978c3f6d537e94482f77d/rpds_py-2026.5.1-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:ca653c6546386227cd9800d1bef6a348099acf8db4250341da6d90f663d6dfcb", size = 383539, upload-time = "2026-05-28T11:59:16.665Z" }, + { url = "https://files.pythonhosted.org/packages/11/df/d94aa6a499d4ac40afe2d7620f2c597fd3c0f182e854ad7cf3f596a81cb6/rpds_py-2026.5.1-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:66c93681c4729e4e3ecba31b8179fae083ff3118841672835140338b4b9867c1", size = 494674, upload-time = "2026-05-28T11:59:17.991Z" }, + { url = "https://files.pythonhosted.org/packages/1f/75/33d30f43bb2f458de11979486a591b1bf6e5651765ed1704c6197c2dc773/rpds_py-2026.5.1-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:40ff257542e04796880e011e15cd4dc21c2599975df2aaa8f2c8495ca574e1a5", size = 389268, upload-time = "2026-05-28T11:59:19.434Z" }, + { url = "https://files.pythonhosted.org/packages/f4/1e/2c9096fc19d5fd084b0184ca2b651e659aa0a37e6fdbecf6ece47f147fe1/rpds_py-2026.5.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b6825cc329b290e93c5f6a9be2393118a763f6ccf6abd83704e0c102ca583644", size = 376280, upload-time = "2026-05-28T11:59:21Z" }, + { url = "https://files.pythonhosted.org/packages/b9/e5/61ec9f8be8211ea7f48448195549e4aaf02004083475493b0e137702ecb2/rpds_py-2026.5.1-cp312-cp312-manylinux_2_31_riscv64.whl", hash = "sha256:de42116e69cb53b911cc34aee5ab98f36c597b822545045d49e938818b99e5e4", size = 387233, upload-time = "2026-05-28T11:59:22.454Z" }, + { url = "https://files.pythonhosted.org/packages/0d/ca/bcec1005c4f4a234f92a29078631fee49206c7265ccae966f18fd332e80e/rpds_py-2026.5.1-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:c0f920015df2a504bebaba6d4c31ccf3fcf942f92655c086da30b671aad19aa6", size = 405009, upload-time = "2026-05-28T11:59:23.845Z" }, + { url = "https://files.pythonhosted.org/packages/72/e6/4d5718c5cf26c522dc7c9999e238da1e77380b81d0c5d1df11e271ddfeb1/rpds_py-2026.5.1-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:0408a24e44feb919423dc6d9da677cb5cddb894d2ca9e763967d156d9c60fab4", size = 553113, upload-time = "2026-05-28T11:59:25.184Z" }, + { url = "https://files.pythonhosted.org/packages/d4/25/2ee807bdb3e1f0b7eddf7782acd5665a8b5205a331a7d7244a52c4812fd9/rpds_py-2026.5.1-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:cea68bcd53467561ae2f96a6bdad1544299ba97b5b0ddcd5ac3d376e5c781c24", size = 618838, upload-time = "2026-05-28T11:59:26.749Z" }, + { url = "https://files.pythonhosted.org/packages/6a/c1/7d4c26f167f8c41501cc073d30ee22082b16ce358cf5b00ec97cbc7804ea/rpds_py-2026.5.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:4be8b1d2a705cc37d08256004e1d07de143fa0075c8e85a3df020b776f62b732", size = 582436, upload-time = "2026-05-28T11:59:28.11Z" }, + { url = "https://files.pythonhosted.org/packages/04/1d/9d12b0a337bab46f4769f8857f4007e3b2d639e14f9a44a0efe157696e64/rpds_py-2026.5.1-cp312-cp312-win32.whl", hash = "sha256:6736718bd4fc49cbcb538ba30516fdbef161522acefb739657d48b97bd864fed", size = 212734, upload-time = "2026-05-28T11:59:29.689Z" }, + { url = "https://files.pythonhosted.org/packages/c5/93/e4116f2de7f56bc7406a76033dc501811ddeb22b7f056b92d632871ebb0c/rpds_py-2026.5.1-cp312-cp312-win_amd64.whl", hash = "sha256:0a7d1eec967df0e9b22614a5e177622e0c89611d03727fa0cb48e45028907870", size = 229045, upload-time = "2026-05-28T11:59:31.033Z" }, + { url = "https://files.pythonhosted.org/packages/cb/53/6c3419d85eb2ec5938a37627c585b42d76a63bb731d6e42ed4b079ebf486/rpds_py-2026.5.1-cp312-cp312-win_arm64.whl", hash = "sha256:1841d067089e117142d79b98aa0df2f08b52f2ecc1819dd2700636c0db74a473", size = 223967, upload-time = "2026-05-28T11:59:32.318Z" }, + { url = "https://files.pythonhosted.org/packages/6c/32/14c961ad295f490eb0849ada8b79683e93a59b9de3afdd983eaf55fa6867/rpds_py-2026.5.1-cp313-cp313-macosx_10_12_x86_64.whl", hash = "sha256:efef4ac29c6ff495531eb17ee705b62841ecaa291b7c7077e848ea03e237164d", size = 352787, upload-time = "2026-05-28T11:59:33.655Z" }, + { url = "https://files.pythonhosted.org/packages/ca/bb/d1b85117967c11191441a7274ae616c65d93901d082c588f89a50a8da5ae/rpds_py-2026.5.1-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:c39f5b67a8a2e67179ada2a954227d670fe65fa9098457f698f56ddf248709b3", size = 345179, upload-time = "2026-05-28T11:59:35Z" }, + { url = "https://files.pythonhosted.org/packages/7c/46/d84105f062e626a1b233f863907288a4708c2d833b8b4c6fb2764bc080c0/rpds_py-2026.5.1-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b5c30f3f04eef4fbd362226a6f31d7c8895ca4fbb6e0b790f6890a98d8da8559", size = 376173, upload-time = "2026-05-28T11:59:36.43Z" }, + { url = "https://files.pythonhosted.org/packages/e2/ae/469d7959ce5b1201e1de135dc735b86db3b35dd0d1734f6a44246d5f061c/rpds_py-2026.5.1-cp313-cp313-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:277f6c82f0580848796c7ecc8a7173aa3bfb928e4ff831261c2f60a81dc270db", size = 383162, upload-time = "2026-05-28T11:59:37.995Z" }, + { url = "https://files.pythonhosted.org/packages/dc/a2/57853d31a1116a561aa072794602ad3f6341e18d70a8523f1bd5b9fc1e5a/rpds_py-2026.5.1-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:63c2c4c213f1a4e3f3de28ecab029dbdee976324e729c0d7a55211be72576b02", size = 495093, upload-time = "2026-05-28T11:59:39.453Z" }, + { url = "https://files.pythonhosted.org/packages/99/63/3a8eabcad9314b7daf5c65f451d2c33d989235cd8a5762186cf2c3f5a4f8/rpds_py-2026.5.1-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:3350ec808fb538fe71a1f94dfaa0e29c598dfad805ce49f0caec5ae3183c652b", size = 389829, upload-time = "2026-05-28T11:59:40.896Z" }, + { url = "https://files.pythonhosted.org/packages/4b/25/05678d97fc25e2622df14dc530fb82023174ecfff6733991ed0d78f167bd/rpds_py-2026.5.1-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b1b964e3ab599e718dc46c018d104b1ebc007cbc6567d827c94a687fca56d77e", size = 374786, upload-time = "2026-05-28T11:59:42.626Z" }, + { url = "https://files.pythonhosted.org/packages/88/d1/8c90b6431e80a3b91b284a5c7c8c0c4f9c006444d90477a740d6e0f9c694/rpds_py-2026.5.1-cp313-cp313-manylinux_2_31_riscv64.whl", hash = "sha256:19cb09fab7b7fc96b2a6e28f2e34b72a3705ff27b37edb77455316e5d3f3dc9b", size = 386920, upload-time = "2026-05-28T11:59:44.124Z" }, + { url = "https://files.pythonhosted.org/packages/ff/99/4638f672ab356682d633ee0da9255f5b67ce6efd0b85eb94ad3e255e65a5/rpds_py-2026.5.1-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:abe76bcdba31e576cb83eeb8797aa0d882b738fef6dc65d0601fc753806a5b46", size = 405059, upload-time = "2026-05-28T11:59:47.177Z" }, + { url = "https://files.pythonhosted.org/packages/66/3f/3546524b6eb4cc2e1f363a3d638fa52f6c24faae3500c25fb488b02f1740/rpds_py-2026.5.1-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:8bff7073db3899158fff55ebf57b113a67030af26f80a18978f9f0aa60250ddf", size = 553030, upload-time = "2026-05-28T11:59:48.603Z" }, + { url = "https://files.pythonhosted.org/packages/c6/c3/7b3388c796fcf471bd17194242d4dc1a7608567c0fa422bcc1c5e79f9c1e/rpds_py-2026.5.1-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:8ba264fa49be666cd9cc56bf34ec7002fb3d27a4aee5bcb4d43d0d18feb1bb6f", size = 618975, upload-time = "2026-05-28T11:59:50.314Z" }, + { url = "https://files.pythonhosted.org/packages/61/1e/a3cb07f2795075d1d88efddae2f541359fde5f08c81ee114c29c2949c90a/rpds_py-2026.5.1-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:4860b603ddda0475a8885499b3729e90229d480105b42651962a5397d995fa89", size = 581178, upload-time = "2026-05-28T11:59:51.673Z" }, + { url = "https://files.pythonhosted.org/packages/a1/74/e758c03a5ef46f04c37f2651a2893db846d569ba8a7bca469d4b58939bcd/rpds_py-2026.5.1-cp313-cp313-win32.whl", hash = "sha256:7944270ae71383f6e2657dd7d5ce4eeb4ac2d0059a6738f0510583d462ab4842", size = 212481, upload-time = "2026-05-28T11:59:53.148Z" }, + { url = "https://files.pythonhosted.org/packages/70/ec/a2aca432db9c7359b40fa393eeeaa0d166c2f70175be956e75fa24197c44/rpds_py-2026.5.1-cp313-cp313-win_amd64.whl", hash = "sha256:88647f43a73c4e01be19b04ceef0c8d3a1958153604d13c773becd8016f2a0cf", size = 228519, upload-time = "2026-05-28T11:59:54.505Z" }, + { url = "https://files.pythonhosted.org/packages/29/60/a73bfdd45b096574556acf303bbd9fa9eed36ca8a818b514e2a5d5fe2b9d/rpds_py-2026.5.1-cp313-cp313-win_arm64.whl", hash = "sha256:453895624ecf7db7063b1004e44037522bbaef9ff6a945e59bc71662d7a03abd", size = 223446, upload-time = "2026-05-28T11:59:56.081Z" }, + { url = "https://files.pythonhosted.org/packages/18/e2/408105fd611823f00882aea810f3989a30d26b1bab8b6beb20f98c724e0e/rpds_py-2026.5.1-cp313-cp313t-macosx_10_12_x86_64.whl", hash = "sha256:b4e4bc98639ec915f512fde3aa7a95e0041d95d9c3cc86eea841fa63cb1e8600", size = 355287, upload-time = "2026-05-28T11:59:57.448Z" }, + { url = "https://files.pythonhosted.org/packages/8d/58/5c4a43436843c90d0f6d19f82c200c80e3843ca9fa07b237623327f6d384/rpds_py-2026.5.1-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:cacedb7a6e167680acba45ad5716e89067d225dc80da0d7040cae8c81d4572fa", size = 347033, upload-time = "2026-05-28T11:59:58.881Z" }, + { url = "https://files.pythonhosted.org/packages/fb/c2/1a71acdacaf4e259b10278fb87b039ded3cf80041bcd89dd8a3ea702ded6/rpds_py-2026.5.1-cp313-cp313t-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:68700371c5d7ae1412862ddfa719090925c93ecf351c566d66f09d04b136ea00", size = 376891, upload-time = "2026-05-28T12:00:00.516Z" }, + { url = "https://files.pythonhosted.org/packages/c2/c8/535f3d9b65addd8e28aa87b83c6e526799c3717a88273db8ea795beeef7a/rpds_py-2026.5.1-cp313-cp313t-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:296c799becfa849c779c8725494fe9ed94959ed886787df4364b058465bad7f0", size = 385646, upload-time = "2026-05-28T12:00:02.394Z" }, + { url = "https://files.pythonhosted.org/packages/1c/91/dc033f313345c354ade914dbe73cdb90b615a4409ea02430d5356794f3d8/rpds_py-2026.5.1-cp313-cp313t-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:d3858b908218ee108d0bbfb2095ccc237648053c9bf98affad7cb079acaf1d97", size = 498830, upload-time = "2026-05-28T12:00:04.189Z" }, + { url = "https://files.pythonhosted.org/packages/27/fc/90fcbea459dbb8ddc18a2e0fd1de9412b48bc84ffff2db771cf714bacfd6/rpds_py-2026.5.1-cp313-cp313t-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:4fb8d2e7cb2f850b169806d61d1b991738acec96500a75c30f49caf064ce7cef", size = 392830, upload-time = "2026-05-28T12:00:05.797Z" }, + { url = "https://files.pythonhosted.org/packages/b2/1d/46cd11a228c9750684a798d98f878be6f614aa762438da7378f035e79e35/rpds_py-2026.5.1-cp313-cp313t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:27b74c10ed6a8f190f4287f53bcfea348b92a84a9c9f70d30183d1e6172d580d", size = 379613, upload-time = "2026-05-28T12:00:07.433Z" }, + { url = "https://files.pythonhosted.org/packages/24/4a/d9b0c6af3a1de03eb93741bbe8be2bdce84d8fda8224f3005451d86df389/rpds_py-2026.5.1-cp313-cp313t-manylinux_2_31_riscv64.whl", hash = "sha256:b9a6528956191c48c52294a592dbd4a8386d7048bdb25c0efcb6b966466c6d83", size = 388183, upload-time = "2026-05-28T12:00:09.227Z" }, + { url = "https://files.pythonhosted.org/packages/c5/b4/db7aaabdda6d020afc87d981bcc2f57a434c7dec60ecfc2ab3dd50b20351/rpds_py-2026.5.1-cp313-cp313t-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:af03e34e860047bc7a352b842856fcf78798fbb81132cc98bd2f907ab4eb9cd2", size = 408578, upload-time = "2026-05-28T12:00:10.779Z" }, + { url = "https://files.pythonhosted.org/packages/08/d6/070f6a41cbb343e2ac4171859bf3f3623e0ab002f72619d6d505313ec2de/rpds_py-2026.5.1-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:fea6e836d10abbe191d557d33bd58bd5987725fe63aa1eefe557d230209855bd", size = 553573, upload-time = "2026-05-28T12:00:12.443Z" }, + { url = "https://files.pythonhosted.org/packages/75/ab/1a71ea3589c4345dac0a0518f0e6a031cb42689277851b683c46d27463a5/rpds_py-2026.5.1-cp313-cp313t-musllinux_1_2_i686.whl", hash = "sha256:fc0c0f878ea770a0a8a462456c5ad36fc9fe6358e6b76fdadc7f17575e0b8bf1", size = 620861, upload-time = "2026-05-28T12:00:14.09Z" }, + { url = "https://files.pythonhosted.org/packages/8a/22/9bf80a56069c0c443fcfefac639a86a744550a2898817a6dfd3e26654924/rpds_py-2026.5.1-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:e0b360f316d966b048b085857630b3cc51f3db2f07b06f440eac8f695374d1e3", size = 585633, upload-time = "2026-05-28T12:00:15.66Z" }, + { url = "https://files.pythonhosted.org/packages/da/68/3b2c0a75c9e04125696f84ebdbbf304acf5a40b58ba4481cdb98a922c3ba/rpds_py-2026.5.1-cp313-cp313t-win32.whl", hash = "sha256:a2999883eedf72fdfb7520b92c7d4ec2572a71ff40239377aa604cc529eecafc", size = 210074, upload-time = "2026-05-28T12:00:17.291Z" }, + { url = "https://files.pythonhosted.org/packages/e7/8b/609157d5a25d37d4f29f92840ba531f416907c34ae5c5739dd21fc2bef98/rpds_py-2026.5.1-cp313-cp313t-win_amd64.whl", hash = "sha256:e07be2a9d7122bd6e82dea89814ef8dc893feb1aae97fec1630f3263bbb30e55", size = 228635, upload-time = "2026-05-28T12:00:18.73Z" }, + { url = "https://files.pythonhosted.org/packages/d4/6f/19c1918a4b590d8de87e712e4abe4b3875771eff60216fb6153cf6665c68/rpds_py-2026.5.1-cp314-cp314-macosx_10_12_x86_64.whl", hash = "sha256:1f2c391c3059798093b65df23aca2cac150460ae9c630d99dec83d703d9485b9", size = 349756, upload-time = "2026-05-28T12:00:20.217Z" }, + { url = "https://files.pythonhosted.org/packages/e5/60/a06fe7da34eca79dacbf958a2ba0c6eea85bc2b29de20080bf40f72f66fa/rpds_py-2026.5.1-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:413b424f7c4ee65ab5e5be91f5731be0f8b41a1ee2b12dfe810d716312e95a78", size = 343831, upload-time = "2026-05-28T12:00:21.711Z" }, + { url = "https://files.pythonhosted.org/packages/bf/ec/b2333b97b90e2a6ef6ca8ad386ee284968e74bcfe113b3f1a8d9036429a9/rpds_py-2026.5.1-cp314-cp314-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2c595a1d9255dce0599e13130d1440ab2506654f2b50294226ee06402f8fef63", size = 375127, upload-time = "2026-05-28T12:00:23.326Z" }, + { url = "https://files.pythonhosted.org/packages/14/7f/e00aae54067f2b488c4637961d5f58204d470795fc791085fa3f15060d2e/rpds_py-2026.5.1-cp314-cp314-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:1c27c5f6102eac8c03e7595a00827a53b271ba40a53b59ff8709170e0855ea4a", size = 379034, upload-time = "2026-05-28T12:00:24.89Z" }, + { url = "https://files.pythonhosted.org/packages/be/cc/423999bbb8ae8dc93c77fc1d5e984ade5eb89d237d3bb884ccfa72ae2890/rpds_py-2026.5.1-cp314-cp314-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:6c7fcf61d44cacecaf3aea542b0e053db77972a4573e7ceda16fb2b399161195", size = 490823, upload-time = "2026-05-28T12:00:26.676Z" }, + { url = "https://files.pythonhosted.org/packages/0f/aa/c671bf660f12e68d3c52ff86c7066ed1372df5a0f4f2ff584e419b8207e7/rpds_py-2026.5.1-cp314-cp314-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2c817a189d4ee14290420e5ff051e4dd6baa13f3edf84685071dee07a6d538ee", size = 388144, upload-time = "2026-05-28T12:00:28.577Z" }, + { url = "https://files.pythonhosted.org/packages/19/c8/d63bb75b68afe77b229e3021c6031bcaf01da5db5b0e69d0d10f9ba679a7/rpds_py-2026.5.1-cp314-cp314-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:21846aac0ed2e0589f38c12dc44e77bb64e494b771eadbcf169cba00566ba7ba", size = 371959, upload-time = "2026-05-28T12:00:30.304Z" }, + { url = "https://files.pythonhosted.org/packages/82/35/c51122014d8274ff37dc606d60049c3db7d83da02b5b282511e5a906a9a6/rpds_py-2026.5.1-cp314-cp314-manylinux_2_31_riscv64.whl", hash = "sha256:b317c87a13f769a4e787819bd508aaa5d69aa09b0880de9af6d3a8a54571cdec", size = 383558, upload-time = "2026-05-28T12:00:31.764Z" }, + { url = "https://files.pythonhosted.org/packages/e3/f9/2790cb99c136a5363acdeacf5c27c56f3de0d4118a1f48fca83404c99c89/rpds_py-2026.5.1-cp314-cp314-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:ce87129d9f2c14fa6c4a8601fb80eb4488c80d38a20cd13758ef11123e14995d", size = 402789, upload-time = "2026-05-28T12:00:33.247Z" }, + { url = "https://files.pythonhosted.org/packages/e5/1b/e4fb584f8c75d35c38150ff6a332cda949e6f97acba1f4fd123b14ab56fe/rpds_py-2026.5.1-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:9cdddb6c1207d284d94fd1530adf57fbd797fe7c4b8704ba85f49414f2557e7d", size = 551405, upload-time = "2026-05-28T12:00:34.819Z" }, + { url = "https://files.pythonhosted.org/packages/d8/f7/a6731b4216cb3793ea1af5391da240f5683dacc0d13e034fe5fc3503f240/rpds_py-2026.5.1-cp314-cp314-musllinux_1_2_i686.whl", hash = "sha256:4e237e139f94d3c036fd28eb9f564c99055476ff4ff05cd42be55ce349b5aa02", size = 616975, upload-time = "2026-05-28T12:00:36.268Z" }, + { url = "https://files.pythonhosted.org/packages/2c/ea/2e051a81d95d8e63f4b35a1c463a87e8766bc3d083c067c5dfb6bf220747/rpds_py-2026.5.1-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:ed0954b524873214369184a9c82b0eaa45a3fbb9a798cd95b17e0d98499e7ea0", size = 578701, upload-time = "2026-05-28T12:00:37.82Z" }, + { url = "https://files.pythonhosted.org/packages/65/56/b5f6fdb2083e32bca8a8993d89e70db114b4756c9e2c38421328126689d2/rpds_py-2026.5.1-cp314-cp314-win32.whl", hash = "sha256:2d88621d6a7d4dfa633d21abe90f280bb205274e16b1d1e61c6ad4640b2453b7", size = 209806, upload-time = "2026-05-28T12:00:39.492Z" }, + { url = "https://files.pythonhosted.org/packages/fb/80/65a5aa96c155e611d1ed844e4e1f57f3e36b021f396d9f8585d756e6b90d/rpds_py-2026.5.1-cp314-cp314-win_amd64.whl", hash = "sha256:cef8ac28d26f4dda3533060c20fbf80a325458fa9fd23ea72a73cdfa8e978838", size = 225985, upload-time = "2026-05-28T12:00:40.94Z" }, + { url = "https://files.pythonhosted.org/packages/27/7c/ad185212e87b05f196daef92bc5f3caf07298eb47c295b5585c3dd3093ac/rpds_py-2026.5.1-cp314-cp314-win_arm64.whl", hash = "sha256:eaaea962c68cdc68d4a533ba985ab8e9484277910bbfaa2ab3ef7732667bfed8", size = 221219, upload-time = "2026-05-28T12:00:43.15Z" }, + { url = "https://files.pythonhosted.org/packages/23/58/e14ae18759020334646b031e708ab4158d653a938822bfb7b95ef2e93aa3/rpds_py-2026.5.1-cp314-cp314t-macosx_10_12_x86_64.whl", hash = "sha256:21942f52dbbd5f8758bf021213d28bd45c39e873e65e2407faf5f1846f5761ad", size = 352148, upload-time = "2026-05-28T12:00:44.638Z" }, + { url = "https://files.pythonhosted.org/packages/31/9b/5f4a1e2f960bca3ac5d052b139dd31eed97b259f9d909173821760d542e8/rpds_py-2026.5.1-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:f414556f6e3958300ff941e40c9f97e3dc9774ddd1b3434c475d73dd354bbed3", size = 345196, upload-time = "2026-05-28T12:00:46.14Z" }, + { url = "https://files.pythonhosted.org/packages/1a/71/1d9574d6a2fa20ab60eaa55c7467f5aa20cbc770f341a05f09c0876f59e2/rpds_py-2026.5.1-cp314-cp314t-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ef1013a8625c74043210190b246f5b1551e09757c1f356c6e4160ef96c5bc081", size = 374981, upload-time = "2026-05-28T12:00:47.531Z" }, + { url = "https://files.pythonhosted.org/packages/0c/9a/37e99f4915a80aa71670263c1267f7ae0af95f53a3f61e6c3bdc016d4515/rpds_py-2026.5.1-cp314-cp314t-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:cc68e231a77a5f0d774ae278a1f8e55c0456501820847c1e4efb3829f3441df6", size = 379961, upload-time = "2026-05-28T12:00:49.216Z" }, + { url = "https://files.pythonhosted.org/packages/a8/ff/6e73f74b89d2e0715e0fc86b7dde893f9a61ae2f9b256ff3bdfe41ac4e94/rpds_py-2026.5.1-cp314-cp314t-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:9baffb505aff33acc69b422a19f77806680f3c8632227d79f48de8a810d1c2c5", size = 495965, upload-time = "2026-05-28T12:00:51.111Z" }, + { url = "https://files.pythonhosted.org/packages/ea/e0/425faba25f59d74d4638b267f7c7a80e8649d2ef4db10a19b0c4a71e6e6f/rpds_py-2026.5.1-cp314-cp314t-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b8d2f912928d426e8cfa396f7f3f8d29a59e6689c86dcca3c420730c1096322b", size = 389526, upload-time = "2026-05-28T12:00:52.77Z" }, + { url = "https://files.pythonhosted.org/packages/c6/76/7a41960e3fddae47fab43a28684d5da981401dffd88253de0944148654cb/rpds_py-2026.5.1-cp314-cp314t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:90f628283be835db980c941767d41c9a27b5239e54ba0a9c1335247e82406964", size = 376190, upload-time = "2026-05-28T12:00:54.215Z" }, + { url = "https://files.pythonhosted.org/packages/27/60/5f38dc70824fc6951b51d35377e577a3a3a4c81a6769cc5a2de25ebe0ad1/rpds_py-2026.5.1-cp314-cp314t-manylinux_2_31_riscv64.whl", hash = "sha256:1ebb2f0ab7e16132995a72de805170e0203df0c3dd22e1ef1cd1fdd90bd7a131", size = 383921, upload-time = "2026-05-28T12:00:55.673Z" }, + { url = "https://files.pythonhosted.org/packages/60/1a/d60a38caa1505f4b9483c3fbbde12c94e1079154f4f401a6da96f7e77621/rpds_py-2026.5.1-cp314-cp314t-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:f3df3d16ded76f1f8c9cdebd0e1ea55fdf4c23b812de189814da7cf229c22a81", size = 404766, upload-time = "2026-05-28T12:00:57.518Z" }, + { url = "https://files.pythonhosted.org/packages/87/ff/602fd3f174d6425f0bce05ad0dfbec0e96b38d0f7d08a79af5aa20083885/rpds_py-2026.5.1-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:9af8905b8f854990e40d5206aa5ac58d9b0fe0b7f351ff2bb086c20f6c8c6a47", size = 551343, upload-time = "2026-05-28T12:00:58.978Z" }, + { url = "https://files.pythonhosted.org/packages/b8/c1/1be13327acdbead3eca1fde03b6a34dbb011f1e864e217f0d32cc1779a7f/rpds_py-2026.5.1-cp314-cp314t-musllinux_1_2_i686.whl", hash = "sha256:036a36a87fb1cd3b214d11c4b3c4f7d2ddad933625dca1c900b56a057c07740a", size = 618502, upload-time = "2026-05-28T12:01:00.656Z" }, + { url = "https://files.pythonhosted.org/packages/f3/d7/afb49b49d7f2be8b7ba1a9f0977fa5168003437b93086726f066544e8351/rpds_py-2026.5.1-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:62ae3853454fe9ef283a03c96c2d835d39e84b14643a9d62c82ef0fb87d702ca", size = 581916, upload-time = "2026-05-28T12:01:02.22Z" }, + { url = "https://files.pythonhosted.org/packages/25/d1/dbef8c1f8a10f07beb62b5f054e20099fd9924b3ec001b8f0b6ac7813a85/rpds_py-2026.5.1-cp314-cp314t-win32.whl", hash = "sha256:6c3d771a46ec18b12af06ce36243a9a80b07a5d0515236332d90863ca8bb326a", size = 207855, upload-time = "2026-05-28T12:01:03.821Z" }, + { url = "https://files.pythonhosted.org/packages/2a/72/bfa4e61ab8e7dc1c8adf397e05e6cbdd4239357bd72b248d3de662f23915/rpds_py-2026.5.1-cp314-cp314t-win_amd64.whl", hash = "sha256:c93c629be4636cf54337bd5f06c104d55e42ced54d681f6fe21ae510a65116f6", size = 225422, upload-time = "2026-05-28T12:01:05.194Z" }, + { url = "https://files.pythonhosted.org/packages/27/3a/7b5da92b640f67b6717ccafc83cdd06bfa7ff2395c3685c68922bb54d703/rpds_py-2026.5.1-cp315-cp315-macosx_10_12_x86_64.whl", hash = "sha256:3574b55c604b8f75dacb007136508bbc0db406e626301778096a133327e7f2fb", size = 349576, upload-time = "2026-05-28T12:01:06.722Z" }, + { url = "https://files.pythonhosted.org/packages/d7/8a/2aafd7ad355a1bd48ca76e2262b74b15e6432b5a1efe150efd4d779cd55d/rpds_py-2026.5.1-cp315-cp315-macosx_11_0_arm64.whl", hash = "sha256:94068eb3ae6d43f5a786b7db96a406a34e6d5c24489feef32fd6e8946ea7b291", size = 343640, upload-time = "2026-05-28T12:01:08.441Z" }, + { url = "https://files.pythonhosted.org/packages/f7/7d/6c9523c1abbe840a1b7fba3c516d48e1d3487cc80fea4366c4071cf56784/rpds_py-2026.5.1-cp315-cp315-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f3a5b10e8ce894825f380a8f1b6444cf73c294dfea62afbb2d13e3a9e630cec1", size = 375322, upload-time = "2026-05-28T12:01:09.934Z" }, + { url = "https://files.pythonhosted.org/packages/5a/5d/0b7b03fb1dc509321f01de3149784ab773e34c8573022029af8076afcb9c/rpds_py-2026.5.1-cp315-cp315-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:fc09f82e63d4bcd58149572f857a431bae851dc747e313c3b5bdf7abb907fda8", size = 379066, upload-time = "2026-05-28T12:01:11.48Z" }, + { url = "https://files.pythonhosted.org/packages/d7/e2/8ef6012999ebf1cb1c22f876d9ce5e63d960fd4631d2af3202d3f480aa25/rpds_py-2026.5.1-cp315-cp315-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:e10464d17df3b582745c25cec695cb9558bca2cb6ddb631aee1787fc72c767b2", size = 494586, upload-time = "2026-05-28T12:01:13.051Z" }, + { url = "https://files.pythonhosted.org/packages/80/af/1eeb029bec67582c226b7809172207cd005073af4ebd906e65ff494f4983/rpds_py-2026.5.1-cp315-cp315-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:ba05adbf15d994c38ec0b7ab32e858e5110c21e9009a00a86545fd220f84e038", size = 388415, upload-time = "2026-05-28T12:01:14.631Z" }, + { url = "https://files.pythonhosted.org/packages/18/23/ffbe10711c4d766c1cab0557d6906c074f795814863c67b351355d29354a/rpds_py-2026.5.1-cp315-cp315-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:77c004fdc7b891967106f78ddfd7b076bfe6813c6139c6fff6aed3bcaa960b26", size = 372427, upload-time = "2026-05-28T12:01:16.153Z" }, + { url = "https://files.pythonhosted.org/packages/bd/3a/30ba4a6ad457e5b070c18d742a33fb77d8d922b565cc881f8a5313d63bfe/rpds_py-2026.5.1-cp315-cp315-manylinux_2_31_riscv64.whl", hash = "sha256:83bcf894486c9d78dd290d3c0124ff6dd8875d3025e2090a8ec49fcc37c55fdd", size = 383615, upload-time = "2026-05-28T12:01:17.809Z" }, + { url = "https://files.pythonhosted.org/packages/d3/69/62e242b53ce39c0814bd24e1a6e6eba6c92be716277745f317f9540a2e7b/rpds_py-2026.5.1-cp315-cp315-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:c3df104083952a0e0c6f10de33e440eabe98fb6317d23e1a58c68f6df08d01b9", size = 402786, upload-time = "2026-05-28T12:01:19.419Z" }, + { url = "https://files.pythonhosted.org/packages/38/c1/a770b9c186928a1ed0f7e6d7ae50e7f3950ed23e3f9e366dbc8e38cb55de/rpds_py-2026.5.1-cp315-cp315-musllinux_1_2_aarch64.whl", hash = "sha256:980450826cf22e133c57e0835070bdd0dd3f73b9b708c3ce223def2cb9469e14", size = 551583, upload-time = "2026-05-28T12:01:21.013Z" }, + { url = "https://files.pythonhosted.org/packages/21/7c/68e8579b95375b70d2a963103c42e705856cdb98569258bd807f4423891c/rpds_py-2026.5.1-cp315-cp315-musllinux_1_2_i686.whl", hash = "sha256:205dde846f24332ab0c1188699a043b8d165b79bb84529ce272c45048ff6be01", size = 616941, upload-time = "2026-05-28T12:01:22.548Z" }, + { url = "https://files.pythonhosted.org/packages/70/a1/a6135aed5730ff03ab957182259987ac11e55fb392a28dc6f0592048a280/rpds_py-2026.5.1-cp315-cp315-musllinux_1_2_x86_64.whl", hash = "sha256:3966b82dd563176396df030f3dd52a6e54cb69b718e95e78bd555ed3d1e0185d", size = 578349, upload-time = "2026-05-28T12:01:24.118Z" }, + { url = "https://files.pythonhosted.org/packages/09/6e/f24201a76a84e6c49d0bdfdfcb735210e21701e9b21c5bfc0ba497dd62f6/rpds_py-2026.5.1-cp315-cp315-win32.whl", hash = "sha256:7818f8d0a415be74d2be3590b0a1c1f463a642f4d0217e7d10602dceef5b79aa", size = 209922, upload-time = "2026-05-28T12:01:25.522Z" }, + { url = "https://files.pythonhosted.org/packages/9e/e4/966bc240bb0485fc265278f6de44d05834bf0b3618886e0b22e33d54c49a/rpds_py-2026.5.1-cp315-cp315-win_amd64.whl", hash = "sha256:b3cc20c0d800af78fd0fac68086e28c1856cec51ea528bb81ea851aa40d39325", size = 226003, upload-time = "2026-05-28T12:01:27.062Z" }, + { url = "https://files.pythonhosted.org/packages/5c/5c/a15a59269cd5e74472734516c73795c15eccfc841b3d4b0228c3f53f19d0/rpds_py-2026.5.1-cp315-cp315-win_arm64.whl", hash = "sha256:3609e9939a8a76cd904cf98a3f1f13b5dc7e150adeaee89e0ea09652ea213e16", size = 221245, upload-time = "2026-05-28T12:01:28.51Z" }, + { url = "https://files.pythonhosted.org/packages/e0/22/135ce03804e179a71ceb13be095deda4a279bc88f7a6b8fa161c5ad44e12/rpds_py-2026.5.1-cp315-cp315t-macosx_10_12_x86_64.whl", hash = "sha256:5d333a7127d4b307601ac37792bee01bb95c867cbfacf21b6375b804d6bbd723", size = 352015, upload-time = "2026-05-28T12:01:30.214Z" }, + { url = "https://files.pythonhosted.org/packages/3b/5f/f1f6d2652eb9d848f6eb369d8db83a2da6249bb49ad2c2a48f45d54538d3/rpds_py-2026.5.1-cp315-cp315t-macosx_11_0_arm64.whl", hash = "sha256:b5f077b44a4f7808520f66dae234988d867deb9aed9be5da057ce9ba831b2a41", size = 345016, upload-time = "2026-05-28T12:01:31.656Z" }, + { url = "https://files.pythonhosted.org/packages/88/66/b74182775691ea2290c99e52ac8d5db844e56fbec90ce421f107658c8314/rpds_py-2026.5.1-cp315-cp315t-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:55d8f9b7b78c9538fc9e04e82ec0e888ff0c3cffcfad152c77e57cd09351a98a", size = 374775, upload-time = "2026-05-28T12:01:33.136Z" }, + { url = "https://files.pythonhosted.org/packages/ff/8f/15e5a61d9f0a43902d36561d4f07cae6ae9f4716be825159fd72717f33af/rpds_py-2026.5.1-cp315-cp315t-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:e3a8ae58895ac107ed934a6bf51e5846f95c53b9b940c2c6d310838fd5846358", size = 380270, upload-time = "2026-05-28T12:01:34.574Z" }, + { url = "https://files.pythonhosted.org/packages/02/c3/f859b12763a80540cdf2af0f15b19904cf756a71d7bdd3f82ff3e5b1bbf9/rpds_py-2026.5.1-cp315-cp315t-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:0957cf3c2b8632ec7aaebffebea8005b353cc2a237b6e2ae3c2cac0820704cfb", size = 495285, upload-time = "2026-05-28T12:01:36.127Z" }, + { url = "https://files.pythonhosted.org/packages/1c/c7/ff27c2ac8411d30b03b1829fd88cae8dad1a4d0da48dd25e57c4038042e6/rpds_py-2026.5.1-cp315-cp315t-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c396c1304de421050b3681ea70f371874b54d41b0151e96109758144c231e30b", size = 389581, upload-time = "2026-05-28T12:01:37.635Z" }, + { url = "https://files.pythonhosted.org/packages/6e/67/fe92ee32a6cc05c77228a2f8b1762e7124f386ec20ff83d0757b762d58d0/rpds_py-2026.5.1-cp315-cp315t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:aad1bff7f666b9598e573815affd666aac6a13a585dde336f843e33350c7fadc", size = 376041, upload-time = "2026-05-28T12:01:39.307Z" }, + { url = "https://files.pythonhosted.org/packages/f8/91/b4d6685c27aba55bd82f25b278be8237038117d05f9659a6213ad3408130/rpds_py-2026.5.1-cp315-cp315t-manylinux_2_31_riscv64.whl", hash = "sha256:656a042550878f12d45752452d47094b7cfe5ad1e9d7b87b5a22ad3ae5ff8015", size = 383946, upload-time = "2026-05-28T12:01:41.043Z" }, + { url = "https://files.pythonhosted.org/packages/bd/79/2c1d832a53c8e0f8e98fc970ec257b950fecd4f62be2ab7182b500a0cbc8/rpds_py-2026.5.1-cp315-cp315t-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:73c4bd4f70294737b5206a3e8e30ccadbf8a60301831c8ea23eec5dbeea1ecfa", size = 405526, upload-time = "2026-05-28T12:01:43.032Z" }, + { url = "https://files.pythonhosted.org/packages/78/c4/c98117b03c6a8581ab2c2dfccfe9a5ad82bd8128a3c28b46a6ad2d97c393/rpds_py-2026.5.1-cp315-cp315t-musllinux_1_2_aarch64.whl", hash = "sha256:43bca78665423cabae77146f2fe7ce55272b6c8d55d82cca83effd42c7e13972", size = 551165, upload-time = "2026-05-28T12:01:44.648Z" }, + { url = "https://files.pythonhosted.org/packages/3b/c1/bc479ca069200af730881b1bd525e3114b2b391a351509fcb1b772f28086/rpds_py-2026.5.1-cp315-cp315t-musllinux_1_2_i686.whl", hash = "sha256:42d0f20e85e549c870749d0e247f0c10d318a45b7e9676d575d2dcb04a1b2e66", size = 618778, upload-time = "2026-05-28T12:01:46.337Z" }, + { url = "https://files.pythonhosted.org/packages/77/65/38ab2f90df44c2febfb63cc10ced40763d9b4bc94d173e734528663fe7f5/rpds_py-2026.5.1-cp315-cp315t-musllinux_1_2_x86_64.whl", hash = "sha256:b1be5c35683684d5331b93600c210e8367c254683d8a6df6bd21bd2da3a334fb", size = 581839, upload-time = "2026-05-28T12:01:48.109Z" }, + { url = "https://files.pythonhosted.org/packages/15/2d/ce1f605fe036aadd460e5822e578c6c7ec3a860936cca37d6e0f299daa77/rpds_py-2026.5.1-cp315-cp315t-win32.whl", hash = "sha256:75808f6c38ce7749bb68cc2770161aae5045e6c6f6781a9782e74b93304399df", size = 207866, upload-time = "2026-05-28T12:01:49.648Z" }, + { url = "https://files.pythonhosted.org/packages/79/cb/966040123eb102371559746908ef2c9471f4d43e17ec9a645a2258dab64b/rpds_py-2026.5.1-cp315-cp315t-win_amd64.whl", hash = "sha256:90bd6630002a1c7f09e7843dd79f0d24f3d2897cc25a753480917865d14f15b3", size = 225441, upload-time = "2026-05-28T12:01:51.408Z" }, + { url = "https://files.pythonhosted.org/packages/42/56/3fe0fb34820ff667be791b3a3c22b85e8bcba54e9c832f47438c191fa7be/rpds_py-2026.5.1-pp311-pypy311_pp73-macosx_10_12_x86_64.whl", hash = "sha256:edf2765d84e42447f112ad877af8fe1db0089aaec5b28e88d6eab45e7fe99cea", size = 357151, upload-time = "2026-05-28T12:01:53.43Z" }, + { url = "https://files.pythonhosted.org/packages/8b/f2/3eb9ccdb9f143b8c9b003978898cb497f942a324c077401e6b8834238e63/rpds_py-2026.5.1-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:ad3773236e95f7f33991eb125224b7da66f206504d032a253a02da7e134519fb", size = 350195, upload-time = "2026-05-28T12:01:54.901Z" }, + { url = "https://files.pythonhosted.org/packages/a7/24/dbda232bc4f3ed732120692ab0d2c8402cb020516556d8bee622dcef2413/rpds_py-2026.5.1-pp311-pypy311_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a04df86b3f0fade39ec8fd0e0aab089b1da9fbd2b48df778a57ef96f5e7d38df", size = 381850, upload-time = "2026-05-28T12:01:56.601Z" }, + { url = "https://files.pythonhosted.org/packages/40/30/32e769839a358f78810c234f160f2cc21d1e4e47e1c0e0e0d535be5a0219/rpds_py-2026.5.1-pp311-pypy311_pp73-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:6142dbd80c4df62a5d899f0d616d417f84e0bc8d32526c8e5589019d75d028a7", size = 387899, upload-time = "2026-05-28T12:01:58.212Z" }, + { url = "https://files.pythonhosted.org/packages/ab/86/ec84d243aadb3b34b71dd26a010d0930b2d284ff5fc9a69fec53810ee6fd/rpds_py-2026.5.1-pp311-pypy311_pp73-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:0b35217adefe87f2fe4db7e9766cabe84744bfe9616d9667be18988928c7f2dc", size = 501618, upload-time = "2026-05-28T12:01:59.888Z" }, + { url = "https://files.pythonhosted.org/packages/74/25/b60e52686bbff777a64f9e4f4d3dd57980dc846913777177a2c92e4937aa/rpds_py-2026.5.1-pp311-pypy311_pp73-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b95d5e11fc712b752081183a55a244c03cd00570489edd7014d8899f8ceb8162", size = 394003, upload-time = "2026-05-28T12:02:01.482Z" }, + { url = "https://files.pythonhosted.org/packages/9b/c7/b3a6a588cc2219510ef3f42e207483a93950bedd1e3a0fd4015c95cff9e5/rpds_py-2026.5.1-pp311-pypy311_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:141c9498daf2ace9eda35d2b0e376f9ea8b058d84f2aef4f96fccfd449a2f251", size = 379778, upload-time = "2026-05-28T12:02:03.197Z" }, + { url = "https://files.pythonhosted.org/packages/31/00/c7dba3fc8a3da8cb3f6db1eb3386be4d79c2e97c6890d20eb9ac66ae8c43/rpds_py-2026.5.1-pp311-pypy311_pp73-manylinux_2_31_riscv64.whl", hash = "sha256:6f249f8b860a200ad35193af961183ebe9132710484e6f6ce0cf89fd83c63a9a", size = 392359, upload-time = "2026-05-28T12:02:04.817Z" }, + { url = "https://files.pythonhosted.org/packages/93/dd/472ba494c70753f93745992c99855bee0636daf74e6984e5e003f150316f/rpds_py-2026.5.1-pp311-pypy311_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:e4abbf391a70be864920858bf360f4fb380577c9a0f732438a1996726e2c195b", size = 412820, upload-time = "2026-05-28T12:02:06.401Z" }, + { url = "https://files.pythonhosted.org/packages/1d/6f/93831a3bfe789542ed0c1d0d74b78b440f055d6dc3ea4640eba2d95e6e23/rpds_py-2026.5.1-pp311-pypy311_pp73-musllinux_1_2_aarch64.whl", hash = "sha256:c74005a7bb87752acf351c93897ec63ad77a07a0da7ecad9c050e32e7286ba34", size = 557243, upload-time = "2026-05-28T12:02:08.013Z" }, + { url = "https://files.pythonhosted.org/packages/1f/ff/0b3d604614ffc77522c6b288fdbce68957eb583da1002aa65ba38ac0ee40/rpds_py-2026.5.1-pp311-pypy311_pp73-musllinux_1_2_i686.whl", hash = "sha256:8213afbe8a3a906fb9acb2014423fe3359ee783d0bf90995f70623a3217bfa6c", size = 623541, upload-time = "2026-05-28T12:02:09.661Z" }, + { url = "https://files.pythonhosted.org/packages/ea/ea/e7b0251441da9adfeaebcf29601d10f2a1455fcf0772fae9e7e19032bd96/rpds_py-2026.5.1-pp311-pypy311_pp73-musllinux_1_2_x86_64.whl", hash = "sha256:8c43a8a973270fd173bf48cdf80bbe66312421cba68d40845034f174f2389049", size = 586326, upload-time = "2026-05-28T12:02:11.47Z" }, +] + +[[package]] +name = "rq" +version = "2.3.2" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "click" }, + { name = "redis" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/43/8d/bb57bca979f48869aea0b7b9752b0887848a7098352753021fdcbdaf0efb/rq-2.3.2.tar.gz", hash = "sha256:5bd212992724428ec1689736abde783d245e7856bca39d89845884f5d580f5f1", size = 649216, upload-time = "2025-04-13T10:07:41.383Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/3f/bf/08d99660c138354a83105efa64988ee4adc8ddc6c74866f29508aaff00f7/rq-2.3.2-py3-none-any.whl", hash = "sha256:bf4dc622a7b9d5f7d4a39444f26d89ce6de8a1d6db61b21060612114dbf8d5ff", size = 100389, upload-time = "2025-04-13T10:07:38.965Z" }, +] + +[[package]] +name = "rq-scheduler" +version = "0.14.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "crontab" }, + { name = "freezegun" }, + { name = "python-dateutil" }, + { name = "rq" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/a0/4e/977bbcc1f3b25ed9ea60ec968b13f7147661defe5b2f9272b44fdb1c5549/rq-scheduler-0.14.0.tar.gz", hash = "sha256:2d5a14a1ab217f8693184ebaa1fe03838edcbc70b4f76572721c0b33058cd023", size = 16582, upload-time = "2024-10-29T13:30:32.641Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/bb/d0/28cedca9f3b321f30e69d644c2dcd7097ec21570ec9606fde56750621300/rq_scheduler-0.14.0-py2.py3-none-any.whl", hash = "sha256:d4ec221a3d8c11b3ff55e041f09d9af1e17f3253db737b6b97e86ab20fc3dc0d", size = 13874, upload-time = "2024-10-29T13:30:30.449Z" }, +] + +[[package]] +name = "ruamel-yaml" +version = "0.19.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/c7/3b/ebda527b56beb90cb7652cb1c7e4f91f48649fbcd8d2eb2fb6e77cd3329b/ruamel_yaml-0.19.1.tar.gz", hash = "sha256:53eb66cd27849eff968ebf8f0bf61f46cdac2da1d1f3576dd4ccee9b25c31993", size = 142709, upload-time = "2026-01-02T16:50:31.84Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/b8/0c/51f6841f1d84f404f92463fc2b1ba0da357ca1e3db6b7fbda26956c3b82a/ruamel_yaml-0.19.1-py3-none-any.whl", hash = "sha256:27592957fedf6e0b62f281e96effd28043345e0e66001f97683aa9a40c667c93", size = 118102, upload-time = "2026-01-02T16:50:29.201Z" }, +] + +[[package]] +name = "s3transfer" +version = "0.17.1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "botocore" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/11/b3/bcdc2f58fa92592db511beda154c2c08d28f21f6c4637f06a42a24b10c21/s3transfer-0.17.1.tar.gz", hash = "sha256:042dd5e3b1b512355e35a23f0223e426b7042e80b97830ea2680ddce327fc45e", size = 159439, upload-time = "2026-05-26T19:45:01.714Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/85/dd/904873250a6554fbae40cddbf9198e3cc37a2f1319d5e1a5ce82fe269c17/s3transfer-0.17.1-py3-none-any.whl", hash = "sha256:5b9827d1044159bbb01b86ef8902760ea39281927f5de31de75e1d657177bf4c", size = 88264, upload-time = "2026-05-26T19:45:00.452Z" }, +] + +[[package]] +name = "scipy" +version = "1.17.1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "numpy" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/7a/97/5a3609c4f8d58b039179648e62dd220f89864f56f7357f5d4f45c29eb2cc/scipy-1.17.1.tar.gz", hash = "sha256:95d8e012d8cb8816c226aef832200b1d45109ed4464303e997c5b13122b297c0", size = 30573822, upload-time = "2026-02-23T00:26:24.851Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/df/75/b4ce781849931fef6fd529afa6b63711d5a733065722d0c3e2724af9e40a/scipy-1.17.1-cp311-cp311-macosx_10_14_x86_64.whl", hash = "sha256:1f95b894f13729334fb990162e911c9e5dc1ab390c58aa6cbecb389c5b5e28ec", size = 31613675, upload-time = "2026-02-23T00:16:00.13Z" }, + { url = "https://files.pythonhosted.org/packages/f7/58/bccc2861b305abdd1b8663d6130c0b3d7cc22e8d86663edbc8401bfd40d4/scipy-1.17.1-cp311-cp311-macosx_12_0_arm64.whl", hash = "sha256:e18f12c6b0bc5a592ed23d3f7b891f68fd7f8241d69b7883769eb5d5dfb52696", size = 28162057, upload-time = "2026-02-23T00:16:09.456Z" }, + { url = "https://files.pythonhosted.org/packages/6d/ee/18146b7757ed4976276b9c9819108adbc73c5aad636e5353e20746b73069/scipy-1.17.1-cp311-cp311-macosx_14_0_arm64.whl", hash = "sha256:a3472cfbca0a54177d0faa68f697d8ba4c80bbdc19908c3465556d9f7efce9ee", size = 20334032, upload-time = "2026-02-23T00:16:17.358Z" }, + { url = "https://files.pythonhosted.org/packages/ec/e6/cef1cf3557f0c54954198554a10016b6a03b2ec9e22a4e1df734936bd99c/scipy-1.17.1-cp311-cp311-macosx_14_0_x86_64.whl", hash = "sha256:766e0dc5a616d026a3a1cffa379af959671729083882f50307e18175797b3dfd", size = 22709533, upload-time = "2026-02-23T00:16:25.791Z" }, + { url = "https://files.pythonhosted.org/packages/4d/60/8804678875fc59362b0fb759ab3ecce1f09c10a735680318ac30da8cd76b/scipy-1.17.1-cp311-cp311-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:744b2bf3640d907b79f3fd7874efe432d1cf171ee721243e350f55234b4cec4c", size = 33062057, upload-time = "2026-02-23T00:16:36.931Z" }, + { url = "https://files.pythonhosted.org/packages/09/7d/af933f0f6e0767995b4e2d705a0665e454d1c19402aa7e895de3951ebb04/scipy-1.17.1-cp311-cp311-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:43af8d1f3bea642559019edfe64e9b11192a8978efbd1539d7bc2aaa23d92de4", size = 35349300, upload-time = "2026-02-23T00:16:49.108Z" }, + { url = "https://files.pythonhosted.org/packages/b4/3d/7ccbbdcbb54c8fdc20d3b6930137c782a163fa626f0aef920349873421ba/scipy-1.17.1-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:cd96a1898c0a47be4520327e01f874acfd61fb48a9420f8aa9f6483412ffa444", size = 35127333, upload-time = "2026-02-23T00:17:01.293Z" }, + { url = "https://files.pythonhosted.org/packages/e8/19/f926cb11c42b15ba08e3a71e376d816ac08614f769b4f47e06c3580c836a/scipy-1.17.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:4eb6c25dd62ee8d5edf68a8e1c171dd71c292fdae95d8aeb3dd7d7de4c364082", size = 37741314, upload-time = "2026-02-23T00:17:12.576Z" }, + { url = "https://files.pythonhosted.org/packages/95/da/0d1df507cf574b3f224ccc3d45244c9a1d732c81dcb26b1e8a766ae271a8/scipy-1.17.1-cp311-cp311-win_amd64.whl", hash = "sha256:d30e57c72013c2a4fe441c2fcb8e77b14e152ad48b5464858e07e2ad9fbfceff", size = 36607512, upload-time = "2026-02-23T00:17:23.424Z" }, + { url = "https://files.pythonhosted.org/packages/68/7f/bdd79ceaad24b671543ffe0ef61ed8e659440eb683b66f033454dcee90eb/scipy-1.17.1-cp311-cp311-win_arm64.whl", hash = "sha256:9ecb4efb1cd6e8c4afea0daa91a87fbddbce1b99d2895d151596716c0b2e859d", size = 24599248, upload-time = "2026-02-23T00:17:34.561Z" }, + { url = "https://files.pythonhosted.org/packages/35/48/b992b488d6f299dbe3f11a20b24d3dda3d46f1a635ede1c46b5b17a7b163/scipy-1.17.1-cp312-cp312-macosx_10_14_x86_64.whl", hash = "sha256:35c3a56d2ef83efc372eaec584314bd0ef2e2f0d2adb21c55e6ad5b344c0dcb8", size = 31610954, upload-time = "2026-02-23T00:17:49.855Z" }, + { url = "https://files.pythonhosted.org/packages/b2/02/cf107b01494c19dc100f1d0b7ac3cc08666e96ba2d64db7626066cee895e/scipy-1.17.1-cp312-cp312-macosx_12_0_arm64.whl", hash = "sha256:fcb310ddb270a06114bb64bbe53c94926b943f5b7f0842194d585c65eb4edd76", size = 28172662, upload-time = "2026-02-23T00:18:01.64Z" }, + { url = "https://files.pythonhosted.org/packages/cf/a9/599c28631bad314d219cf9ffd40e985b24d603fc8a2f4ccc5ae8419a535b/scipy-1.17.1-cp312-cp312-macosx_14_0_arm64.whl", hash = "sha256:cc90d2e9c7e5c7f1a482c9875007c095c3194b1cfedca3c2f3291cdc2bc7c086", size = 20344366, upload-time = "2026-02-23T00:18:12.015Z" }, + { url = "https://files.pythonhosted.org/packages/35/f5/906eda513271c8deb5af284e5ef0206d17a96239af79f9fa0aebfe0e36b4/scipy-1.17.1-cp312-cp312-macosx_14_0_x86_64.whl", hash = "sha256:c80be5ede8f3f8eded4eff73cc99a25c388ce98e555b17d31da05287015ffa5b", size = 22704017, upload-time = "2026-02-23T00:18:21.502Z" }, + { url = "https://files.pythonhosted.org/packages/da/34/16f10e3042d2f1d6b66e0428308ab52224b6a23049cb2f5c1756f713815f/scipy-1.17.1-cp312-cp312-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:e19ebea31758fac5893a2ac360fedd00116cbb7628e650842a6691ba7ca28a21", size = 32927842, upload-time = "2026-02-23T00:18:35.367Z" }, + { url = "https://files.pythonhosted.org/packages/01/8e/1e35281b8ab6d5d72ebe9911edcdffa3f36b04ed9d51dec6dd140396e220/scipy-1.17.1-cp312-cp312-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:02ae3b274fde71c5e92ac4d54bc06c42d80e399fec704383dcd99b301df37458", size = 35235890, upload-time = "2026-02-23T00:18:49.188Z" }, + { url = "https://files.pythonhosted.org/packages/c5/5c/9d7f4c88bea6e0d5a4f1bc0506a53a00e9fcb198de372bfe4d3652cef482/scipy-1.17.1-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:8a604bae87c6195d8b1045eddece0514d041604b14f2727bbc2b3020172045eb", size = 35003557, upload-time = "2026-02-23T00:18:54.74Z" }, + { url = "https://files.pythonhosted.org/packages/65/94/7698add8f276dbab7a9de9fb6b0e02fc13ee61d51c7c3f85ac28b65e1239/scipy-1.17.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:f590cd684941912d10becc07325a3eeb77886fe981415660d9265c4c418d0bea", size = 37625856, upload-time = "2026-02-23T00:19:00.307Z" }, + { url = "https://files.pythonhosted.org/packages/a2/84/dc08d77fbf3d87d3ee27f6a0c6dcce1de5829a64f2eae85a0ecc1f0daa73/scipy-1.17.1-cp312-cp312-win_amd64.whl", hash = "sha256:41b71f4a3a4cab9d366cd9065b288efc4d4f3c0b37a91a8e0947fb5bd7f31d87", size = 36549682, upload-time = "2026-02-23T00:19:07.67Z" }, + { url = "https://files.pythonhosted.org/packages/bc/98/fe9ae9ffb3b54b62559f52dedaebe204b408db8109a8c66fdd04869e6424/scipy-1.17.1-cp312-cp312-win_arm64.whl", hash = "sha256:f4115102802df98b2b0db3cce5cb9b92572633a1197c77b7553e5203f284a5b3", size = 24547340, upload-time = "2026-02-23T00:19:12.024Z" }, + { url = "https://files.pythonhosted.org/packages/76/27/07ee1b57b65e92645f219b37148a7e7928b82e2b5dbeccecb4dff7c64f0b/scipy-1.17.1-cp313-cp313-macosx_10_14_x86_64.whl", hash = "sha256:5e3c5c011904115f88a39308379c17f91546f77c1667cea98739fe0fccea804c", size = 31590199, upload-time = "2026-02-23T00:19:17.192Z" }, + { url = "https://files.pythonhosted.org/packages/ec/ae/db19f8ab842e9b724bf5dbb7db29302a91f1e55bc4d04b1025d6d605a2c5/scipy-1.17.1-cp313-cp313-macosx_12_0_arm64.whl", hash = "sha256:6fac755ca3d2c3edcb22f479fceaa241704111414831ddd3bc6056e18516892f", size = 28154001, upload-time = "2026-02-23T00:19:22.241Z" }, + { url = "https://files.pythonhosted.org/packages/5b/58/3ce96251560107b381cbd6e8413c483bbb1228a6b919fa8652b0d4090e7f/scipy-1.17.1-cp313-cp313-macosx_14_0_arm64.whl", hash = "sha256:7ff200bf9d24f2e4d5dc6ee8c3ac64d739d3a89e2326ba68aaf6c4a2b838fd7d", size = 20325719, upload-time = "2026-02-23T00:19:26.329Z" }, + { url = "https://files.pythonhosted.org/packages/b2/83/15087d945e0e4d48ce2377498abf5ad171ae013232ae31d06f336e64c999/scipy-1.17.1-cp313-cp313-macosx_14_0_x86_64.whl", hash = "sha256:4b400bdc6f79fa02a4d86640310dde87a21fba0c979efff5248908c6f15fad1b", size = 22683595, upload-time = "2026-02-23T00:19:30.304Z" }, + { url = "https://files.pythonhosted.org/packages/b4/e0/e58fbde4a1a594c8be8114eb4aac1a55bcd6587047efc18a61eb1f5c0d30/scipy-1.17.1-cp313-cp313-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:2b64ca7d4aee0102a97f3ba22124052b4bd2152522355073580bf4845e2550b6", size = 32896429, upload-time = "2026-02-23T00:19:35.536Z" }, + { url = "https://files.pythonhosted.org/packages/f5/5f/f17563f28ff03c7b6799c50d01d5d856a1d55f2676f537ca8d28c7f627cd/scipy-1.17.1-cp313-cp313-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:581b2264fc0aa555f3f435a5944da7504ea3a065d7029ad60e7c3d1ae09c5464", size = 35203952, upload-time = "2026-02-23T00:19:42.259Z" }, + { url = "https://files.pythonhosted.org/packages/8d/a5/9afd17de24f657fdfe4df9a3f1ea049b39aef7c06000c13db1530d81ccca/scipy-1.17.1-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:beeda3d4ae615106d7094f7e7cef6218392e4465cc95d25f900bebabfded0950", size = 34979063, upload-time = "2026-02-23T00:19:47.547Z" }, + { url = "https://files.pythonhosted.org/packages/8b/13/88b1d2384b424bf7c924f2038c1c409f8d88bb2a8d49d097861dd64a57b2/scipy-1.17.1-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:6609bc224e9568f65064cfa72edc0f24ee6655b47575954ec6339534b2798369", size = 37598449, upload-time = "2026-02-23T00:19:53.238Z" }, + { url = "https://files.pythonhosted.org/packages/35/e5/d6d0e51fc888f692a35134336866341c08655d92614f492c6860dc45bb2c/scipy-1.17.1-cp313-cp313-win_amd64.whl", hash = "sha256:37425bc9175607b0268f493d79a292c39f9d001a357bebb6b88fdfaff13f6448", size = 36510943, upload-time = "2026-02-23T00:20:50.89Z" }, + { url = "https://files.pythonhosted.org/packages/2a/fd/3be73c564e2a01e690e19cc618811540ba5354c67c8680dce3281123fb79/scipy-1.17.1-cp313-cp313-win_arm64.whl", hash = "sha256:5cf36e801231b6a2059bf354720274b7558746f3b1a4efb43fcf557ccd484a87", size = 24545621, upload-time = "2026-02-23T00:20:55.871Z" }, + { url = "https://files.pythonhosted.org/packages/6f/6b/17787db8b8114933a66f9dcc479a8272e4b4da75fe03b0c282f7b0ade8cd/scipy-1.17.1-cp313-cp313t-macosx_10_14_x86_64.whl", hash = "sha256:d59c30000a16d8edc7e64152e30220bfbd724c9bbb08368c054e24c651314f0a", size = 31936708, upload-time = "2026-02-23T00:19:58.694Z" }, + { url = "https://files.pythonhosted.org/packages/38/2e/524405c2b6392765ab1e2b722a41d5da33dc5c7b7278184a8ad29b6cb206/scipy-1.17.1-cp313-cp313t-macosx_12_0_arm64.whl", hash = "sha256:010f4333c96c9bb1a4516269e33cb5917b08ef2166d5556ca2fd9f082a9e6ea0", size = 28570135, upload-time = "2026-02-23T00:20:03.934Z" }, + { url = "https://files.pythonhosted.org/packages/fd/c3/5bd7199f4ea8556c0c8e39f04ccb014ac37d1468e6cfa6a95c6b3562b76e/scipy-1.17.1-cp313-cp313t-macosx_14_0_arm64.whl", hash = "sha256:2ceb2d3e01c5f1d83c4189737a42d9cb2fc38a6eeed225e7515eef71ad301dce", size = 20741977, upload-time = "2026-02-23T00:20:07.935Z" }, + { url = "https://files.pythonhosted.org/packages/d9/b8/8ccd9b766ad14c78386599708eb745f6b44f08400a5fd0ade7cf89b6fc93/scipy-1.17.1-cp313-cp313t-macosx_14_0_x86_64.whl", hash = "sha256:844e165636711ef41f80b4103ed234181646b98a53c8f05da12ca5ca289134f6", size = 23029601, upload-time = "2026-02-23T00:20:12.161Z" }, + { url = "https://files.pythonhosted.org/packages/6d/a0/3cb6f4d2fb3e17428ad2880333cac878909ad1a89f678527b5328b93c1d4/scipy-1.17.1-cp313-cp313t-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:158dd96d2207e21c966063e1635b1063cd7787b627b6f07305315dd73d9c679e", size = 33019667, upload-time = "2026-02-23T00:20:17.208Z" }, + { url = "https://files.pythonhosted.org/packages/f3/c3/2d834a5ac7bf3a0c806ad1508efc02dda3c8c61472a56132d7894c312dea/scipy-1.17.1-cp313-cp313t-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:74cbb80d93260fe2ffa334efa24cb8f2f0f622a9b9febf8b483c0b865bfb3475", size = 35264159, upload-time = "2026-02-23T00:20:23.087Z" }, + { url = "https://files.pythonhosted.org/packages/4d/77/d3ed4becfdbd217c52062fafe35a72388d1bd82c2d0ba5ca19d6fcc93e11/scipy-1.17.1-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:dbc12c9f3d185f5c737d801da555fb74b3dcfa1a50b66a1a93e09190f41fab50", size = 35102771, upload-time = "2026-02-23T00:20:28.636Z" }, + { url = "https://files.pythonhosted.org/packages/bd/12/d19da97efde68ca1ee5538bb261d5d2c062f0c055575128f11a2730e3ac1/scipy-1.17.1-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:94055a11dfebe37c656e70317e1996dc197e1a15bbcc351bcdd4610e128fe1ca", size = 37665910, upload-time = "2026-02-23T00:20:34.743Z" }, + { url = "https://files.pythonhosted.org/packages/06/1c/1172a88d507a4baaf72c5a09bb6c018fe2ae0ab622e5830b703a46cc9e44/scipy-1.17.1-cp313-cp313t-win_amd64.whl", hash = "sha256:e30bdeaa5deed6bc27b4cc490823cd0347d7dae09119b8803ae576ea0ce52e4c", size = 36562980, upload-time = "2026-02-23T00:20:40.575Z" }, + { url = "https://files.pythonhosted.org/packages/70/b0/eb757336e5a76dfa7911f63252e3b7d1de00935d7705cf772db5b45ec238/scipy-1.17.1-cp313-cp313t-win_arm64.whl", hash = "sha256:a720477885a9d2411f94a93d16f9d89bad0f28ca23c3f8daa521e2dcc3f44d49", size = 24856543, upload-time = "2026-02-23T00:20:45.313Z" }, + { url = "https://files.pythonhosted.org/packages/cf/83/333afb452af6f0fd70414dc04f898647ee1423979ce02efa75c3b0f2c28e/scipy-1.17.1-cp314-cp314-macosx_10_14_x86_64.whl", hash = "sha256:a48a72c77a310327f6a3a920092fa2b8fd03d7deaa60f093038f22d98e096717", size = 31584510, upload-time = "2026-02-23T00:21:01.015Z" }, + { url = "https://files.pythonhosted.org/packages/ed/a6/d05a85fd51daeb2e4ea71d102f15b34fedca8e931af02594193ae4fd25f7/scipy-1.17.1-cp314-cp314-macosx_12_0_arm64.whl", hash = "sha256:45abad819184f07240d8a696117a7aacd39787af9e0b719d00285549ed19a1e9", size = 28170131, upload-time = "2026-02-23T00:21:05.888Z" }, + { url = "https://files.pythonhosted.org/packages/db/7b/8624a203326675d7746a254083a187398090a179335b2e4a20e2ddc46e83/scipy-1.17.1-cp314-cp314-macosx_14_0_arm64.whl", hash = "sha256:3fd1fcdab3ea951b610dc4cef356d416d5802991e7e32b5254828d342f7b7e0b", size = 20342032, upload-time = "2026-02-23T00:21:09.904Z" }, + { url = "https://files.pythonhosted.org/packages/c9/35/2c342897c00775d688d8ff3987aced3426858fd89d5a0e26e020b660b301/scipy-1.17.1-cp314-cp314-macosx_14_0_x86_64.whl", hash = "sha256:7bdf2da170b67fdf10bca777614b1c7d96ae3ca5794fd9587dce41eb2966e866", size = 22678766, upload-time = "2026-02-23T00:21:14.313Z" }, + { url = "https://files.pythonhosted.org/packages/ef/f2/7cdb8eb308a1a6ae1e19f945913c82c23c0c442a462a46480ce487fdc0ac/scipy-1.17.1-cp314-cp314-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:adb2642e060a6549c343603a3851ba76ef0b74cc8c079a9a58121c7ec9fe2350", size = 32957007, upload-time = "2026-02-23T00:21:19.663Z" }, + { url = "https://files.pythonhosted.org/packages/0b/2e/7eea398450457ecb54e18e9d10110993fa65561c4f3add5e8eccd2b9cd41/scipy-1.17.1-cp314-cp314-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:eee2cfda04c00a857206a4330f0c5e3e56535494e30ca445eb19ec624ae75118", size = 35221333, upload-time = "2026-02-23T00:21:25.278Z" }, + { url = "https://files.pythonhosted.org/packages/d9/77/5b8509d03b77f093a0d52e606d3c4f79e8b06d1d38c441dacb1e26cacf46/scipy-1.17.1-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:d2650c1fb97e184d12d8ba010493ee7b322864f7d3d00d3f9bb97d9c21de4068", size = 35042066, upload-time = "2026-02-23T00:21:31.358Z" }, + { url = "https://files.pythonhosted.org/packages/f9/df/18f80fb99df40b4070328d5ae5c596f2f00fffb50167e31439e932f29e7d/scipy-1.17.1-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:08b900519463543aa604a06bec02461558a6e1cef8fdbb8098f77a48a83c8118", size = 37612763, upload-time = "2026-02-23T00:21:37.247Z" }, + { url = "https://files.pythonhosted.org/packages/4b/39/f0e8ea762a764a9dc52aa7dabcfad51a354819de1f0d4652b6a1122424d6/scipy-1.17.1-cp314-cp314-win_amd64.whl", hash = "sha256:3877ac408e14da24a6196de0ddcace62092bfc12a83823e92e49e40747e52c19", size = 37290984, upload-time = "2026-02-23T00:22:35.023Z" }, + { url = "https://files.pythonhosted.org/packages/7c/56/fe201e3b0f93d1a8bcf75d3379affd228a63d7e2d80ab45467a74b494947/scipy-1.17.1-cp314-cp314-win_arm64.whl", hash = "sha256:f8885db0bc2bffa59d5c1b72fad7a6a92d3e80e7257f967dd81abb553a90d293", size = 25192877, upload-time = "2026-02-23T00:22:39.798Z" }, + { url = "https://files.pythonhosted.org/packages/96/ad/f8c414e121f82e02d76f310f16db9899c4fcde36710329502a6b2a3c0392/scipy-1.17.1-cp314-cp314t-macosx_10_14_x86_64.whl", hash = "sha256:1cc682cea2ae55524432f3cdff9e9a3be743d52a7443d0cba9017c23c87ae2f6", size = 31949750, upload-time = "2026-02-23T00:21:42.289Z" }, + { url = "https://files.pythonhosted.org/packages/7c/b0/c741e8865d61b67c81e255f4f0a832846c064e426636cd7de84e74d209be/scipy-1.17.1-cp314-cp314t-macosx_12_0_arm64.whl", hash = "sha256:2040ad4d1795a0ae89bfc7e8429677f365d45aa9fd5e4587cf1ea737f927b4a1", size = 28585858, upload-time = "2026-02-23T00:21:47.706Z" }, + { url = "https://files.pythonhosted.org/packages/ed/1b/3985219c6177866628fa7c2595bfd23f193ceebbe472c98a08824b9466ff/scipy-1.17.1-cp314-cp314t-macosx_14_0_arm64.whl", hash = "sha256:131f5aaea57602008f9822e2115029b55d4b5f7c070287699fe45c661d051e39", size = 20757723, upload-time = "2026-02-23T00:21:52.039Z" }, + { url = "https://files.pythonhosted.org/packages/c0/19/2a04aa25050d656d6f7b9e7b685cc83d6957fb101665bfd9369ca6534563/scipy-1.17.1-cp314-cp314t-macosx_14_0_x86_64.whl", hash = "sha256:9cdc1a2fcfd5c52cfb3045feb399f7b3ce822abdde3a193a6b9a60b3cb5854ca", size = 23043098, upload-time = "2026-02-23T00:21:56.185Z" }, + { url = "https://files.pythonhosted.org/packages/86/f1/3383beb9b5d0dbddd030335bf8a8b32d4317185efe495374f134d8be6cce/scipy-1.17.1-cp314-cp314t-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:6e3dcd57ab780c741fde8dc68619de988b966db759a3c3152e8e9142c26295ad", size = 33030397, upload-time = "2026-02-23T00:22:01.404Z" }, + { url = "https://files.pythonhosted.org/packages/41/68/8f21e8a65a5a03f25a79165ec9d2b28c00e66dc80546cf5eb803aeeff35b/scipy-1.17.1-cp314-cp314t-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:a9956e4d4f4a301ebf6cde39850333a6b6110799d470dbbb1e25326ac447f52a", size = 35281163, upload-time = "2026-02-23T00:22:07.024Z" }, + { url = "https://files.pythonhosted.org/packages/84/8d/c8a5e19479554007a5632ed7529e665c315ae7492b4f946b0deb39870e39/scipy-1.17.1-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:a4328d245944d09fd639771de275701ccadf5f781ba0ff092ad141e017eccda4", size = 35116291, upload-time = "2026-02-23T00:22:12.585Z" }, + { url = "https://files.pythonhosted.org/packages/52/52/e57eceff0e342a1f50e274264ed47497b59e6a4e3118808ee58ddda7b74a/scipy-1.17.1-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:a77cbd07b940d326d39a1d1b37817e2ee4d79cb30e7338f3d0cddffae70fcaa2", size = 37682317, upload-time = "2026-02-23T00:22:18.513Z" }, + { url = "https://files.pythonhosted.org/packages/11/2f/b29eafe4a3fbc3d6de9662b36e028d5f039e72d345e05c250e121a230dd4/scipy-1.17.1-cp314-cp314t-win_amd64.whl", hash = "sha256:eb092099205ef62cd1782b006658db09e2fed75bffcae7cc0d44052d8aa0f484", size = 37345327, upload-time = "2026-02-23T00:22:24.442Z" }, + { url = "https://files.pythonhosted.org/packages/07/39/338d9219c4e87f3e708f18857ecd24d22a0c3094752393319553096b98af/scipy-1.17.1-cp314-cp314t-win_arm64.whl", hash = "sha256:200e1050faffacc162be6a486a984a0497866ec54149a01270adc8a59b7c7d21", size = 25489165, upload-time = "2026-02-23T00:22:29.563Z" }, +] + +[[package]] +name = "send2trash" +version = "2.1.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/c5/f0/184b4b5f8d00f2a92cf96eec8967a3d550b52cf94362dad1100df9e48d57/send2trash-2.1.0.tar.gz", hash = "sha256:1c72b39f09457db3c05ce1d19158c2cbef4c32b8bedd02c155e49282b7ea7459", size = 17255, upload-time = "2026-01-14T06:27:36.056Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/1c/78/504fdd027da3b84ff1aecd9f6957e65f35134534ccc6da8628eb71e76d3f/send2trash-2.1.0-py3-none-any.whl", hash = "sha256:0da2f112e6d6bb22de6aa6daa7e144831a4febf2a87261451c4ad849fe9a873c", size = 17610, upload-time = "2026-01-14T06:27:35.218Z" }, +] + +[[package]] +name = "setproctitle" +version = "1.3.7" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/8d/48/49393a96a2eef1ab418b17475fb92b8fcfad83d099e678751b05472e69de/setproctitle-1.3.7.tar.gz", hash = "sha256:bc2bc917691c1537d5b9bca1468437176809c7e11e5694ca79a9ca12345dcb9e", size = 27002, upload-time = "2025-09-05T12:51:25.278Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/04/cd/1b7ba5cad635510720ce19d7122154df96a2387d2a74217be552887c93e5/setproctitle-1.3.7-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:a600eeb4145fb0ee6c287cb82a2884bd4ec5bbb076921e287039dcc7b7cc6dd0", size = 18085, upload-time = "2025-09-05T12:49:22.183Z" }, + { url = "https://files.pythonhosted.org/packages/8f/1a/b2da0a620490aae355f9d72072ac13e901a9fec809a6a24fc6493a8f3c35/setproctitle-1.3.7-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:97a090fed480471bb175689859532709e28c085087e344bca45cf318034f70c4", size = 13097, upload-time = "2025-09-05T12:49:23.322Z" }, + { url = "https://files.pythonhosted.org/packages/18/2e/bd03ff02432a181c1787f6fc2a678f53b7dacdd5ded69c318fe1619556e8/setproctitle-1.3.7-cp311-cp311-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:1607b963e7b53e24ec8a2cb4e0ab3ae591d7c6bf0a160feef0551da63452b37f", size = 32191, upload-time = "2025-09-05T12:49:24.567Z" }, + { url = "https://files.pythonhosted.org/packages/28/78/1e62fc0937a8549f2220445ed2175daacee9b6764c7963b16148119b016d/setproctitle-1.3.7-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:a20fb1a3974e2dab857870cf874b325b8705605cb7e7e8bcbb915bca896f52a9", size = 33203, upload-time = "2025-09-05T12:49:25.871Z" }, + { url = "https://files.pythonhosted.org/packages/a0/3c/65edc65db3fa3df400cf13b05e9d41a3c77517b4839ce873aa6b4043184f/setproctitle-1.3.7-cp311-cp311-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:f8d961bba676e07d77665204f36cffaa260f526e7b32d07ab3df6a2c1dfb44ba", size = 34963, upload-time = "2025-09-05T12:49:27.044Z" }, + { url = "https://files.pythonhosted.org/packages/a1/32/89157e3de997973e306e44152522385f428e16f92f3cf113461489e1e2ee/setproctitle-1.3.7-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:db0fd964fbd3a9f8999b502f65bd2e20883fdb5b1fae3a424e66db9a793ed307", size = 32398, upload-time = "2025-09-05T12:49:28.909Z" }, + { url = "https://files.pythonhosted.org/packages/4a/18/77a765a339ddf046844cb4513353d8e9dcd8183da9cdba6e078713e6b0b2/setproctitle-1.3.7-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:db116850fcf7cca19492030f8d3b4b6e231278e8fe097a043957d22ce1bdf3ee", size = 33657, upload-time = "2025-09-05T12:49:30.323Z" }, + { url = "https://files.pythonhosted.org/packages/6b/63/f0b6205c64d74d2a24a58644a38ec77bdbaa6afc13747e75973bf8904932/setproctitle-1.3.7-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:316664d8b24a5c91ee244460bdaf7a74a707adaa9e14fbe0dc0a53168bb9aba1", size = 31836, upload-time = "2025-09-05T12:49:32.309Z" }, + { url = "https://files.pythonhosted.org/packages/ba/51/e1277f9ba302f1a250bbd3eedbbee747a244b3cc682eb58fb9733968f6d8/setproctitle-1.3.7-cp311-cp311-win32.whl", hash = "sha256:b74774ca471c86c09b9d5037c8451fff06bb82cd320d26ae5a01c758088c0d5d", size = 12556, upload-time = "2025-09-05T12:49:33.529Z" }, + { url = "https://files.pythonhosted.org/packages/b6/7b/822a23f17e9003dfdee92cd72758441ca2a3680388da813a371b716fb07f/setproctitle-1.3.7-cp311-cp311-win_amd64.whl", hash = "sha256:acb9097213a8dd3410ed9f0dc147840e45ca9797785272928d4be3f0e69e3be4", size = 13243, upload-time = "2025-09-05T12:49:34.553Z" }, + { url = "https://files.pythonhosted.org/packages/fb/f0/2dc88e842077719d7384d86cc47403e5102810492b33680e7dadcee64cd8/setproctitle-1.3.7-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:2dc99aec591ab6126e636b11035a70991bc1ab7a261da428491a40b84376654e", size = 18049, upload-time = "2025-09-05T12:49:36.241Z" }, + { url = "https://files.pythonhosted.org/packages/f0/b4/50940504466689cda65680c9e9a1e518e5750c10490639fa687489ac7013/setproctitle-1.3.7-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:cdd8aa571b7aa39840fdbea620e308a19691ff595c3a10231e9ee830339dd798", size = 13079, upload-time = "2025-09-05T12:49:38.088Z" }, + { url = "https://files.pythonhosted.org/packages/d0/99/71630546b9395b095f4082be41165d1078204d1696c2d9baade3de3202d0/setproctitle-1.3.7-cp312-cp312-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:2906b6c7959cdb75f46159bf0acd8cc9906cf1361c9e1ded0d065fe8f9039629", size = 32932, upload-time = "2025-09-05T12:49:39.271Z" }, + { url = "https://files.pythonhosted.org/packages/50/22/cee06af4ffcfb0e8aba047bd44f5262e644199ae7527ae2c1f672b86495c/setproctitle-1.3.7-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:6915964a6dda07920a1159321dcd6d94fc7fc526f815ca08a8063aeca3c204f1", size = 33736, upload-time = "2025-09-05T12:49:40.565Z" }, + { url = "https://files.pythonhosted.org/packages/5c/00/a5949a8bb06ef5e7df214fc393bb2fb6aedf0479b17214e57750dfdd0f24/setproctitle-1.3.7-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:cff72899861c765bd4021d1ff1c68d60edc129711a2fdba77f9cb69ef726a8b6", size = 35605, upload-time = "2025-09-05T12:49:42.362Z" }, + { url = "https://files.pythonhosted.org/packages/b0/3a/50caca532a9343828e3bf5778c7a84d6c737a249b1796d50dd680290594d/setproctitle-1.3.7-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:b7cb05bd446687ff816a3aaaf831047fc4c364feff7ada94a66024f1367b448c", size = 33143, upload-time = "2025-09-05T12:49:43.515Z" }, + { url = "https://files.pythonhosted.org/packages/ca/14/b843a251296ce55e2e17c017d6b9f11ce0d3d070e9265de4ecad948b913d/setproctitle-1.3.7-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:3a57b9a00de8cae7e2a1f7b9f0c2ac7b69372159e16a7708aa2f38f9e5cc987a", size = 34434, upload-time = "2025-09-05T12:49:45.31Z" }, + { url = "https://files.pythonhosted.org/packages/c8/b7/06145c238c0a6d2c4bc881f8be230bb9f36d2bf51aff7bddcb796d5eed67/setproctitle-1.3.7-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:d8828b356114f6b308b04afe398ed93803d7fca4a955dd3abe84430e28d33739", size = 32795, upload-time = "2025-09-05T12:49:46.419Z" }, + { url = "https://files.pythonhosted.org/packages/ef/dc/ef76a81fac9bf27b84ed23df19c1f67391a753eed6e3c2254ebcb5133f56/setproctitle-1.3.7-cp312-cp312-win32.whl", hash = "sha256:b0304f905efc845829ac2bc791ddebb976db2885f6171f4a3de678d7ee3f7c9f", size = 12552, upload-time = "2025-09-05T12:49:47.635Z" }, + { url = "https://files.pythonhosted.org/packages/e2/5b/a9fe517912cd6e28cf43a212b80cb679ff179a91b623138a99796d7d18a0/setproctitle-1.3.7-cp312-cp312-win_amd64.whl", hash = "sha256:9888ceb4faea3116cf02a920ff00bfbc8cc899743e4b4ac914b03625bdc3c300", size = 13247, upload-time = "2025-09-05T12:49:49.16Z" }, + { url = "https://files.pythonhosted.org/packages/5d/2f/fcedcade3b307a391b6e17c774c6261a7166aed641aee00ed2aad96c63ce/setproctitle-1.3.7-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:c3736b2a423146b5e62230502e47e08e68282ff3b69bcfe08a322bee73407922", size = 18047, upload-time = "2025-09-05T12:49:50.271Z" }, + { url = "https://files.pythonhosted.org/packages/23/ae/afc141ca9631350d0a80b8f287aac79a76f26b6af28fd8bf92dae70dc2c5/setproctitle-1.3.7-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:3384e682b158d569e85a51cfbde2afd1ab57ecf93ea6651fe198d0ba451196ee", size = 13073, upload-time = "2025-09-05T12:49:51.46Z" }, + { url = "https://files.pythonhosted.org/packages/87/ed/0a4f00315bc02510395b95eec3d4aa77c07192ee79f0baae77ea7b9603d8/setproctitle-1.3.7-cp313-cp313-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:0564a936ea687cd24dffcea35903e2a20962aa6ac20e61dd3a207652401492dd", size = 33284, upload-time = "2025-09-05T12:49:52.741Z" }, + { url = "https://files.pythonhosted.org/packages/fc/e4/adf3c4c0a2173cb7920dc9df710bcc67e9bcdbf377e243b7a962dc31a51a/setproctitle-1.3.7-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:a5d1cb3f81531f0eb40e13246b679a1bdb58762b170303463cb06ecc296f26d0", size = 34104, upload-time = "2025-09-05T12:49:54.416Z" }, + { url = "https://files.pythonhosted.org/packages/52/4f/6daf66394152756664257180439d37047aa9a1cfaa5e4f5ed35e93d1dc06/setproctitle-1.3.7-cp313-cp313-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:a7d159e7345f343b44330cbba9194169b8590cb13dae940da47aa36a72aa9929", size = 35982, upload-time = "2025-09-05T12:49:56.295Z" }, + { url = "https://files.pythonhosted.org/packages/1b/62/f2c0595403cf915db031f346b0e3b2c0096050e90e0be658a64f44f4278a/setproctitle-1.3.7-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:0b5074649797fd07c72ca1f6bff0406f4a42e1194faac03ecaab765ce605866f", size = 33150, upload-time = "2025-09-05T12:49:58.025Z" }, + { url = "https://files.pythonhosted.org/packages/a0/29/10dd41cde849fb2f9b626c846b7ea30c99c81a18a5037a45cc4ba33c19a7/setproctitle-1.3.7-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:61e96febced3f61b766115381d97a21a6265a0f29188a791f6df7ed777aef698", size = 34463, upload-time = "2025-09-05T12:49:59.424Z" }, + { url = "https://files.pythonhosted.org/packages/71/3c/cedd8eccfaf15fb73a2c20525b68c9477518917c9437737fa0fda91e378f/setproctitle-1.3.7-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:047138279f9463f06b858e579cc79580fbf7a04554d24e6bddf8fe5dddbe3d4c", size = 32848, upload-time = "2025-09-05T12:50:01.107Z" }, + { url = "https://files.pythonhosted.org/packages/d1/3e/0a0e27d1c9926fecccfd1f91796c244416c70bf6bca448d988638faea81d/setproctitle-1.3.7-cp313-cp313-win32.whl", hash = "sha256:7f47accafac7fe6535ba8ba9efd59df9d84a6214565108d0ebb1199119c9cbbd", size = 12544, upload-time = "2025-09-05T12:50:15.81Z" }, + { url = "https://files.pythonhosted.org/packages/36/1b/6bf4cb7acbbd5c846ede1c3f4d6b4ee52744d402e43546826da065ff2ab7/setproctitle-1.3.7-cp313-cp313-win_amd64.whl", hash = "sha256:fe5ca35aeec6dc50cabab9bf2d12fbc9067eede7ff4fe92b8f5b99d92e21263f", size = 13235, upload-time = "2025-09-05T12:50:16.89Z" }, + { url = "https://files.pythonhosted.org/packages/e6/a4/d588d3497d4714750e3eaf269e9e8985449203d82b16b933c39bd3fc52a1/setproctitle-1.3.7-cp313-cp313t-macosx_10_13_universal2.whl", hash = "sha256:10e92915c4b3086b1586933a36faf4f92f903c5554f3c34102d18c7d3f5378e9", size = 18058, upload-time = "2025-09-05T12:50:02.501Z" }, + { url = "https://files.pythonhosted.org/packages/05/77/7637f7682322a7244e07c373881c7e982567e2cb1dd2f31bd31481e45500/setproctitle-1.3.7-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:de879e9c2eab637f34b1a14c4da1e030c12658cdc69ee1b3e5be81b380163ce5", size = 13072, upload-time = "2025-09-05T12:50:03.601Z" }, + { url = "https://files.pythonhosted.org/packages/52/09/f366eca0973cfbac1470068d1313fa3fe3de4a594683385204ec7f1c4101/setproctitle-1.3.7-cp313-cp313t-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:c18246d88e227a5b16248687514f95642505000442165f4b7db354d39d0e4c29", size = 34490, upload-time = "2025-09-05T12:50:04.948Z" }, + { url = "https://files.pythonhosted.org/packages/71/36/611fc2ed149fdea17c3677e1d0df30d8186eef9562acc248682b91312706/setproctitle-1.3.7-cp313-cp313t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:7081f193dab22df2c36f9fc6d113f3793f83c27891af8fe30c64d89d9a37e152", size = 35267, upload-time = "2025-09-05T12:50:06.015Z" }, + { url = "https://files.pythonhosted.org/packages/88/a4/64e77d0671446bd5a5554387b69e1efd915274686844bea733714c828813/setproctitle-1.3.7-cp313-cp313t-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:9cc9b901ce129350637426a89cfd650066a4adc6899e47822e2478a74023ff7c", size = 37376, upload-time = "2025-09-05T12:50:07.484Z" }, + { url = "https://files.pythonhosted.org/packages/89/bc/ad9c664fe524fb4a4b2d3663661a5c63453ce851736171e454fa2cdec35c/setproctitle-1.3.7-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:80e177eff2d1ec172188d0d7fd9694f8e43d3aab76a6f5f929bee7bf7894e98b", size = 33963, upload-time = "2025-09-05T12:50:09.056Z" }, + { url = "https://files.pythonhosted.org/packages/ab/01/a36de7caf2d90c4c28678da1466b47495cbbad43badb4e982d8db8167ed4/setproctitle-1.3.7-cp313-cp313t-musllinux_1_2_ppc64le.whl", hash = "sha256:23e520776c445478a67ee71b2a3c1ffdafbe1f9f677239e03d7e2cc635954e18", size = 35550, upload-time = "2025-09-05T12:50:10.791Z" }, + { url = "https://files.pythonhosted.org/packages/dd/68/17e8aea0ed5ebc17fbf03ed2562bfab277c280e3625850c38d92a7b5fcd9/setproctitle-1.3.7-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:5fa1953126a3b9bd47049d58c51b9dac72e78ed120459bd3aceb1bacee72357c", size = 33727, upload-time = "2025-09-05T12:50:12.032Z" }, + { url = "https://files.pythonhosted.org/packages/b2/33/90a3bf43fe3a2242b4618aa799c672270250b5780667898f30663fd94993/setproctitle-1.3.7-cp313-cp313t-win32.whl", hash = "sha256:4a5e212bf438a4dbeece763f4962ad472c6008ff6702e230b4f16a037e2f6f29", size = 12549, upload-time = "2025-09-05T12:50:13.074Z" }, + { url = "https://files.pythonhosted.org/packages/0b/0e/50d1f07f3032e1f23d814ad6462bc0a138f369967c72494286b8a5228e40/setproctitle-1.3.7-cp313-cp313t-win_amd64.whl", hash = "sha256:cf2727b733e90b4f874bac53e3092aa0413fe1ea6d4f153f01207e6ce65034d9", size = 13243, upload-time = "2025-09-05T12:50:14.146Z" }, + { url = "https://files.pythonhosted.org/packages/89/c7/43ac3a98414f91d1b86a276bc2f799ad0b4b010e08497a95750d5bc42803/setproctitle-1.3.7-cp314-cp314-macosx_10_13_universal2.whl", hash = "sha256:80c36c6a87ff72eabf621d0c79b66f3bdd0ecc79e873c1e9f0651ee8bf215c63", size = 18052, upload-time = "2025-09-05T12:50:17.928Z" }, + { url = "https://files.pythonhosted.org/packages/cd/2c/dc258600a25e1a1f04948073826bebc55e18dbd99dc65a576277a82146fa/setproctitle-1.3.7-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:b53602371a52b91c80aaf578b5ada29d311d12b8a69c0c17fbc35b76a1fd4f2e", size = 13071, upload-time = "2025-09-05T12:50:19.061Z" }, + { url = "https://files.pythonhosted.org/packages/ab/26/8e3bb082992f19823d831f3d62a89409deb6092e72fc6940962983ffc94f/setproctitle-1.3.7-cp314-cp314-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:fcb966a6c57cf07cc9448321a08f3be6b11b7635be502669bc1d8745115d7e7f", size = 33180, upload-time = "2025-09-05T12:50:20.395Z" }, + { url = "https://files.pythonhosted.org/packages/f1/af/ae692a20276d1159dd0cf77b0bcf92cbb954b965655eb4a69672099bb214/setproctitle-1.3.7-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:46178672599b940368d769474fe13ecef1b587d58bb438ea72b9987f74c56ea5", size = 34043, upload-time = "2025-09-05T12:50:22.454Z" }, + { url = "https://files.pythonhosted.org/packages/34/b2/6a092076324dd4dac1a6d38482bedebbff5cf34ef29f58585ec76e47bc9d/setproctitle-1.3.7-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:7f9e9e3ff135cbcc3edd2f4cf29b139f4aca040d931573102742db70ff428c17", size = 35892, upload-time = "2025-09-05T12:50:23.937Z" }, + { url = "https://files.pythonhosted.org/packages/1c/1a/8836b9f28cee32859ac36c3df85aa03e1ff4598d23ea17ca2e96b5845a8f/setproctitle-1.3.7-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:14c7eba8d90c93b0e79c01f0bd92a37b61983c27d6d7d5a3b5defd599113d60e", size = 32898, upload-time = "2025-09-05T12:50:25.617Z" }, + { url = "https://files.pythonhosted.org/packages/ef/22/8fabdc24baf42defb599714799d8445fe3ae987ec425a26ec8e80ea38f8e/setproctitle-1.3.7-cp314-cp314-musllinux_1_2_ppc64le.whl", hash = "sha256:9e64e98077fb30b6cf98073d6c439cd91deb8ebbf8fc62d9dbf52bd38b0c6ac0", size = 34308, upload-time = "2025-09-05T12:50:26.827Z" }, + { url = "https://files.pythonhosted.org/packages/15/1b/b9bee9de6c8cdcb3b3a6cb0b3e773afdb86bbbc1665a3bfa424a4294fda2/setproctitle-1.3.7-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:b91387cc0f02a00ac95dcd93f066242d3cca10ff9e6153de7ee07069c6f0f7c8", size = 32536, upload-time = "2025-09-05T12:50:28.5Z" }, + { url = "https://files.pythonhosted.org/packages/37/0c/75e5f2685a5e3eda0b39a8b158d6d8895d6daf3ba86dec9e3ba021510272/setproctitle-1.3.7-cp314-cp314-win32.whl", hash = "sha256:52b054a61c99d1b72fba58b7f5486e04b20fefc6961cd76722b424c187f362ed", size = 12731, upload-time = "2025-09-05T12:50:43.955Z" }, + { url = "https://files.pythonhosted.org/packages/d2/ae/acddbce90d1361e1786e1fb421bc25baeb0c22ef244ee5d0176511769ec8/setproctitle-1.3.7-cp314-cp314-win_amd64.whl", hash = "sha256:5818e4080ac04da1851b3ec71e8a0f64e3748bf9849045180566d8b736702416", size = 13464, upload-time = "2025-09-05T12:50:45.057Z" }, + { url = "https://files.pythonhosted.org/packages/01/6d/20886c8ff2e6d85e3cabadab6aab9bb90acaf1a5cfcb04d633f8d61b2626/setproctitle-1.3.7-cp314-cp314t-macosx_10_13_universal2.whl", hash = "sha256:6fc87caf9e323ac426910306c3e5d3205cd9f8dcac06d233fcafe9337f0928a3", size = 18062, upload-time = "2025-09-05T12:50:29.78Z" }, + { url = "https://files.pythonhosted.org/packages/9a/60/26dfc5f198715f1343b95c2f7a1c16ae9ffa45bd89ffd45a60ed258d24ea/setproctitle-1.3.7-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:6134c63853d87a4897ba7d5cc0e16abfa687f6c66fc09f262bb70d67718f2309", size = 13075, upload-time = "2025-09-05T12:50:31.604Z" }, + { url = "https://files.pythonhosted.org/packages/21/9c/980b01f50d51345dd513047e3ba9e96468134b9181319093e61db1c47188/setproctitle-1.3.7-cp314-cp314t-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:1403d2abfd32790b6369916e2313dffbe87d6b11dca5bbd898981bcde48e7a2b", size = 34744, upload-time = "2025-09-05T12:50:32.777Z" }, + { url = "https://files.pythonhosted.org/packages/86/b4/82cd0c86e6d1c4538e1a7eb908c7517721513b801dff4ba3f98ef816a240/setproctitle-1.3.7-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:e7c5bfe4228ea22373e3025965d1a4116097e555ee3436044f5c954a5e63ac45", size = 35589, upload-time = "2025-09-05T12:50:34.13Z" }, + { url = "https://files.pythonhosted.org/packages/8a/4f/9f6b2a7417fd45673037554021c888b31247f7594ff4bd2239918c5cd6d0/setproctitle-1.3.7-cp314-cp314t-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:585edf25e54e21a94ccb0fe81ad32b9196b69ebc4fc25f81da81fb8a50cca9e4", size = 37698, upload-time = "2025-09-05T12:50:35.524Z" }, + { url = "https://files.pythonhosted.org/packages/20/92/927b7d4744aac214d149c892cb5fa6dc6f49cfa040cb2b0a844acd63dcaf/setproctitle-1.3.7-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:96c38cdeef9036eb2724c2210e8d0b93224e709af68c435d46a4733a3675fee1", size = 34201, upload-time = "2025-09-05T12:50:36.697Z" }, + { url = "https://files.pythonhosted.org/packages/0a/0c/fd4901db5ba4b9d9013e62f61d9c18d52290497f956745cd3e91b0d80f90/setproctitle-1.3.7-cp314-cp314t-musllinux_1_2_ppc64le.whl", hash = "sha256:45e3ef48350abb49cf937d0a8ba15e42cee1e5ae13ca41a77c66d1abc27a5070", size = 35801, upload-time = "2025-09-05T12:50:38.314Z" }, + { url = "https://files.pythonhosted.org/packages/e7/e3/54b496ac724e60e61cc3447f02690105901ca6d90da0377dffe49ff99fc7/setproctitle-1.3.7-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:1fae595d032b30dab4d659bece20debd202229fce12b55abab978b7f30783d73", size = 33958, upload-time = "2025-09-05T12:50:39.841Z" }, + { url = "https://files.pythonhosted.org/packages/ea/a8/c84bb045ebf8c6fdc7f7532319e86f8380d14bbd3084e6348df56bdfe6fd/setproctitle-1.3.7-cp314-cp314t-win32.whl", hash = "sha256:02432f26f5d1329ab22279ff863c83589894977063f59e6c4b4845804a08f8c2", size = 12745, upload-time = "2025-09-05T12:50:41.377Z" }, + { url = "https://files.pythonhosted.org/packages/08/b6/3a5a4f9952972791a9114ac01dfc123f0df79903577a3e0a7a404a695586/setproctitle-1.3.7-cp314-cp314t-win_amd64.whl", hash = "sha256:cbc388e3d86da1f766d8fc2e12682e446064c01cea9f88a88647cfe7c011de6a", size = 13469, upload-time = "2025-09-05T12:50:42.67Z" }, + { url = "https://files.pythonhosted.org/packages/c3/5b/5e1c117ac84e3cefcf8d7a7f6b2461795a87e20869da065a5c087149060b/setproctitle-1.3.7-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:b1cac6a4b0252b8811d60b6d8d0f157c0fdfed379ac89c25a914e6346cf355a1", size = 12587, upload-time = "2025-09-05T12:51:21.195Z" }, + { url = "https://files.pythonhosted.org/packages/73/02/b9eadc226195dcfa90eed37afe56b5dd6fa2f0e5220ab8b7867b8862b926/setproctitle-1.3.7-pp311-pypy311_pp73-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:f1704c9e041f2b1dc38f5be4552e141e1432fba3dd52c72eeffd5bc2db04dc65", size = 14286, upload-time = "2025-09-05T12:51:22.61Z" }, + { url = "https://files.pythonhosted.org/packages/28/26/1be1d2a53c2a91ec48fa2ff4a409b395f836798adf194d99de9c059419ea/setproctitle-1.3.7-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:b08b61976ffa548bd5349ce54404bf6b2d51bd74d4f1b241ed1b0f25bce09c3a", size = 13282, upload-time = "2025-09-05T12:51:24.094Z" }, +] + +[[package]] +name = "six" +version = "1.17.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/94/e7/b2c673351809dca68a0e064b6af791aa332cf192da575fd474ed7d6f16a2/six-1.17.0.tar.gz", hash = "sha256:ff70335d468e7eb6ec65b95b99d3a2836546063f63acc5171de367e834932a81", size = 34031, upload-time = "2024-12-04T17:35:28.174Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/b7/ce/149a00dd41f10bc29e5921b496af8b574d8413afcd5e30dfa0ed46c2cc5e/six-1.17.0-py2.py3-none-any.whl", hash = "sha256:4721f391ed90541fddacab5acf947aa0d3dc7d27b2e1e8eda2be8970586c3274", size = 11050, upload-time = "2024-12-04T17:35:26.475Z" }, +] + +[[package]] +name = "soupsieve" +version = "2.8.4" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/47/2c/0a5f6f8ee0d5589e48c7640213ed5175d52cf540a06725b628cc1a45d6ce/soupsieve-2.8.4.tar.gz", hash = "sha256:e121fd02e975c695e4e9e8774a5ee35d74714b59307868dcc5319ad2d9e3328e", size = 121110, upload-time = "2026-05-24T13:55:57.154Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/5e/f5/0c41cb68dcae6b7de4fac4188a3a9589e21fb31df21ea3a2e888db95e6c9/soupsieve-2.8.4-py3-none-any.whl", hash = "sha256:e7e6b0769c8f51ed59acab6e994b00621096cfb1c640a7509295987388fbaf65", size = 37304, upload-time = "2026-05-24T13:55:55.406Z" }, +] + +[[package]] +name = "spglib" +version = "2.7.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "numpy" }, + { name = "typing-extensions", marker = "python_full_version < '3.13'" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/a9/06/7964acb4c444191376bd87f91579475fbe7623ca943cce40cee8fb7f2c36/spglib-2.7.0.tar.gz", hash = "sha256:c40907a42c9dc45572f46740bf95412f84fb0eda30267e31665d104a4bde6627", size = 2366134, upload-time = "2025-12-29T09:48:26.42Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/44/a8/d841ae7743c58227af277f7f16aa844376fa11c426090d6ae35e7e93af76/spglib-2.7.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:3cf0ff80c01d8631ef4b9f1b78da79ff2044834e6e2d870f7f20c8579c921136", size = 910793, upload-time = "2025-12-29T09:47:32.063Z" }, + { url = "https://files.pythonhosted.org/packages/e8/02/11baf94cf682cdaafa046b72d4b2adcf944e19e2b2741454e329dedb2fc2/spglib-2.7.0-cp311-cp311-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:a7b29d2cfca6ac53e927686ca0b91257126e47f6abfa26451723a5cd40070352", size = 944977, upload-time = "2025-12-29T09:47:33.638Z" }, + { url = "https://files.pythonhosted.org/packages/ce/fa/6d1bc8f8cb08945ca8c37c95b42bf336b6b9a8a737eced1ce64f0cebe9ce/spglib-2.7.0-cp311-cp311-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:f892ecce2dd1bc636b14a4e5bc13aabb73b008bd37a4d23636882c8971c432a0", size = 960531, upload-time = "2025-12-29T09:47:36.932Z" }, + { url = "https://files.pythonhosted.org/packages/b0/79/2fd5e33b431cd0afcdd441bd10704c11cdf74c09b721249297284e5bf0b2/spglib-2.7.0-cp311-cp311-win_amd64.whl", hash = "sha256:468879702577124dcde0607a75396576e256f1cfa2d8fe48da4a928fbb27abc6", size = 669827, upload-time = "2025-12-29T09:47:38.47Z" }, + { url = "https://files.pythonhosted.org/packages/f7/e9/4e07c9c1bda40df54e09bd686eae0dc13d46e76a5ef4d43582971a86eb32/spglib-2.7.0-cp311-cp311-win_arm64.whl", hash = "sha256:ceb6730a2324d0c83579c803f3782e28bd41e79bbfe0c3dfdbf30e3d3a6320e5", size = 649076, upload-time = "2025-12-29T09:47:40.367Z" }, + { url = "https://files.pythonhosted.org/packages/68/0e/36720beeca8452530e50ab8a16b91e8721e34c0f97fd25e9c4ddd8b9324b/spglib-2.7.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:ef70132e23dfcc7ab6813742e0edab3f9906e61cd11c857f014bd5610a8bc88c", size = 911009, upload-time = "2025-12-29T09:47:42.238Z" }, + { url = "https://files.pythonhosted.org/packages/47/a0/24df91cbde6a3237d54cfb21602cc8ebb4102cd4e3ec9497c66135c2b190/spglib-2.7.0-cp312-cp312-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:59f134e74f7f488de4bf5579ee6a35af25cb2c478c138de664fea1e14f3efbaf", size = 946821, upload-time = "2025-12-29T09:47:44.548Z" }, + { url = "https://files.pythonhosted.org/packages/67/4c/75ac6f7ade28019b216c7333322f2886e1c0105202cd74506f530664bf26/spglib-2.7.0-cp312-cp312-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:6913906fd9108e7bb2ce06a810513a95a82d801530f10230979bf3427bb7e771", size = 962531, upload-time = "2025-12-29T09:47:46.3Z" }, + { url = "https://files.pythonhosted.org/packages/a7/5f/4e283139af178bb445eedff281a90e66ceff1b814ace70a9d90a2197acc3/spglib-2.7.0-cp312-cp312-win_amd64.whl", hash = "sha256:d5729ff0040baae764c17249302cd99f0eb4e73449612a8c69d3e60a215f062e", size = 671111, upload-time = "2025-12-29T09:47:48.14Z" }, + { url = "https://files.pythonhosted.org/packages/a5/b9/20e52d46e33bf69ceba4fc86602f006c06ce4ab10e3c930f4722fb270b02/spglib-2.7.0-cp312-cp312-win_arm64.whl", hash = "sha256:54f4b6e789475384c62e759c618172707f261c0eae8017949fe4994b6b8cc779", size = 646679, upload-time = "2025-12-29T09:47:49.376Z" }, + { url = "https://files.pythonhosted.org/packages/2c/1c/a0fe8c0523a0e7d608f49f09895e5c599329265c9bfacd269a21458b7564/spglib-2.7.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:ab061ea6a3c3c25a1d0018b09c333c0458792036d3f45d892bd52793ed1f1bda", size = 911085, upload-time = "2025-12-29T09:47:51.606Z" }, + { url = "https://files.pythonhosted.org/packages/2a/34/cb3c522c4aaf6ce319b37bbec71d373b9e2cf0bcfe7d42c365cd6c113b4b/spglib-2.7.0-cp313-cp313-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:be28673e90f7a6c7770f73c57e529d2bdbb373d06d26ee5e90991b548e9238aa", size = 946857, upload-time = "2025-12-29T09:47:53.059Z" }, + { url = "https://files.pythonhosted.org/packages/9e/64/3b1213f2f655ff143ed142292b47ec3f1f9bda8641e659a7e33c4cf0e8a9/spglib-2.7.0-cp313-cp313-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:f627a4ed6f2396ed6e3e8eaf33a53ad143c8ffb8756a84a640f4569ac5ffa2a7", size = 962470, upload-time = "2025-12-29T09:47:54.878Z" }, + { url = "https://files.pythonhosted.org/packages/5c/3a/c51883ce739a00f9f60196f3dcb4ed91b690299a4ec64defd8ec5b2c5899/spglib-2.7.0-cp313-cp313-win_amd64.whl", hash = "sha256:c76411bc1b96cd87c8733994747c7692512b583bb4ef89a65463ff4255221c11", size = 671073, upload-time = "2025-12-29T09:47:56.887Z" }, + { url = "https://files.pythonhosted.org/packages/35/78/3f9ec6ae93a48527dce0eceb6eeab74e6ad1fb2977adb5cbdfc03d43193c/spglib-2.7.0-cp313-cp313-win_arm64.whl", hash = "sha256:0d8ecf030d13d67c4cc272423e5652b74eda57f86a0b118e007f6d12974cc256", size = 646711, upload-time = "2025-12-29T09:47:58.697Z" }, + { url = "https://files.pythonhosted.org/packages/1b/47/86e3c15c3e1c252bde40a794eea4742c142f23fc5f9c3d7551f083c1fa20/spglib-2.7.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:95e3dd7ef992ff8a88f6ef2e5909aaa60ecb479004cc1f73c1e6285d54227960", size = 911712, upload-time = "2025-12-29T09:48:01.14Z" }, + { url = "https://files.pythonhosted.org/packages/05/61/ab2447bb47fa69934adc2fc2d13f771dedd3b2fd3171c95307446c948f01/spglib-2.7.0-cp314-cp314-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:97e0fcea2db3915bd973fdd2cc0a757b1f99bda71ce815da333d75ad1ffc3eb1", size = 947528, upload-time = "2025-12-29T09:48:03.258Z" }, + { url = "https://files.pythonhosted.org/packages/9d/69/898d9e005131b0b1c7e5dce2b79f36aeb20ec4d3a88cca596b522a0fa4df/spglib-2.7.0-cp314-cp314-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:39b978c08ef2ebc0eaba833c488fc4c0f9b1fc0f50d4a8584f176741eea69376", size = 962474, upload-time = "2025-12-29T09:48:05.617Z" }, + { url = "https://files.pythonhosted.org/packages/c8/56/7b25ee5348722dc93ca245ed950f1a89f8a944906140629055f394c072a4/spglib-2.7.0-cp314-cp314-win_amd64.whl", hash = "sha256:5f334b4b66c8aafd583fafab5b15a56e27efdd2dc6cb1064dfcd0fe59ae130f4", size = 679679, upload-time = "2025-12-29T09:48:15.393Z" }, + { url = "https://files.pythonhosted.org/packages/20/37/eda9a34f25b13e47298fa1b94cc4dfd8b0fcfc46c7d63ea046aa1bf91fe7/spglib-2.7.0-cp314-cp314-win_arm64.whl", hash = "sha256:b032842fc223de46d2ef7d220459e1a61ed90329ac2e72818c605f1fc87451b8", size = 656403, upload-time = "2025-12-29T09:48:17.027Z" }, + { url = "https://files.pythonhosted.org/packages/39/af/1c8d0f98d07969b7fa7323d522732124d88caf4ee3b680ef59120bd7b229/spglib-2.7.0-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:b7e29c796cfdadcc3857aef330acc19b9bc50c83e9911fb23b28390e7c80bae5", size = 920791, upload-time = "2025-12-29T09:48:07.085Z" }, + { url = "https://files.pythonhosted.org/packages/b5/c6/89a3f31f831efc4108a19f110873559990b72186745cd3e151de28b256cc/spglib-2.7.0-cp314-cp314t-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:9b6ca88bb6e604bc8f63efe87b3b2470c2e25f56988b775bd332cefa8866f5c5", size = 946881, upload-time = "2025-12-29T09:48:09.154Z" }, + { url = "https://files.pythonhosted.org/packages/7e/e9/1ca63db2cebd381bd6b27ae309f25d270e70928359a6f0360db09b77894e/spglib-2.7.0-cp314-cp314t-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:50629939a9cd6fa3df5a12f6f025ceb3c78534284f875371574c360e4ccaf5e1", size = 963803, upload-time = "2025-12-29T09:48:12.478Z" }, + { url = "https://files.pythonhosted.org/packages/28/97/459b37c3802633f77c883883c75f5d4429b601ae8d930410b999c4e1dafb/spglib-2.7.0-cp314-cp314t-win_amd64.whl", hash = "sha256:cb77daaf9dd5d48d523a888f37cebd47fa63ff28dfcf1aac2b031b914f9ed55a", size = 696536, upload-time = "2025-12-29T09:48:13.885Z" }, +] + +[[package]] +name = "stack-data" +version = "0.6.3" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "asttokens" }, + { name = "executing" }, + { name = "pure-eval" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/28/e3/55dcc2cfbc3ca9c29519eb6884dd1415ecb53b0e934862d3559ddcb7e20b/stack_data-0.6.3.tar.gz", hash = "sha256:836a778de4fec4dcd1dcd89ed8abff8a221f58308462e1c4aa2a3cf30148f0b9", size = 44707, upload-time = "2023-09-30T13:58:05.479Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/f1/7b/ce1eafaf1a76852e2ec9b22edecf1daa58175c090266e9f6c64afcd81d91/stack_data-0.6.3-py3-none-any.whl", hash = "sha256:d5558e0c25a4cb0853cddad3d77da9891a08cb85dd9f9f91b9f8cd66e511e695", size = 24521, upload-time = "2023-09-30T13:58:03.53Z" }, +] + +[[package]] +name = "starlette" +version = "1.2.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "anyio" }, + { name = "typing-extensions", marker = "python_full_version < '3.13'" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/c5/bf/616a066c2760f6c2b1ae3437cc28149734d069fbb46511712beae118a68c/starlette-1.2.0.tar.gz", hash = "sha256:3c5a6b23fff42492914e93890bb80cbfea72dbf37de268eec06185d62a4ca553", size = 2668923, upload-time = "2026-05-28T11:42:50.568Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/9f/85/492183764d5d01d4514be3730fdb8e228a80605783099551c51627578b5d/starlette-1.2.0-py3-none-any.whl", hash = "sha256:36e0c76ac59157e75dc4b3bdeafba97fb04eaf1878045f15dbef666a6f092ed7", size = 73213, upload-time = "2026-05-28T11:42:48.801Z" }, +] + +[[package]] +name = "structlog" +version = "25.5.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/ef/52/9ba0f43b686e7f3ddfeaa78ac3af750292662284b3661e91ad5494f21dbc/structlog-25.5.0.tar.gz", hash = "sha256:098522a3bebed9153d4570c6d0288abf80a031dfdb2048d59a49e9dc2190fc98", size = 1460830, upload-time = "2025-10-27T08:28:23.028Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/a8/45/a132b9074aa18e799b891b91ad72133c98d8042c70f6240e4c5f9dabee2f/structlog-25.5.0-py3-none-any.whl", hash = "sha256:a8453e9b9e636ec59bd9e79bbd4a72f025981b3ba0f5837aebf48f02f37a7f9f", size = 72510, upload-time = "2025-10-27T08:28:21.535Z" }, +] + +[[package]] +name = "supervisor" +version = "4.3.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/a9/b5/37e7a3706de436a8a2d75334711dad1afb4ddffab09f25e31d89e467542f/supervisor-4.3.0.tar.gz", hash = "sha256:4a2bf149adf42997e1bb44b70c43b613275ec9852c3edacca86a9166b27e945e", size = 468912, upload-time = "2025-08-23T18:25:02.418Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/0e/65/5e726c372da8a5e35022a94388b12252710aad0c2351699c3d76ae8dba78/supervisor-4.3.0-py2.py3-none-any.whl", hash = "sha256:0bcb763fddafba410f35cbde226aa7f8514b9fb82eb05a0c85f6588d1c13f8db", size = 320736, upload-time = "2025-08-23T18:25:00.767Z" }, +] + +[[package]] +name = "sympy" +version = "1.14.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "mpmath" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/83/d3/803453b36afefb7c2bb238361cd4ae6125a569b4db67cd9e79846ba2d68c/sympy-1.14.0.tar.gz", hash = "sha256:d3d3fe8df1e5a0b42f0e7bdf50541697dbe7d23746e894990c030e2b05e72517", size = 7793921, upload-time = "2025-04-27T18:05:01.611Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/a2/09/77d55d46fd61b4a135c444fc97158ef34a095e5681d0a6c10b75bf356191/sympy-1.14.0-py3-none-any.whl", hash = "sha256:e091cc3e99d2141a0ba2847328f5479b05d94a6635cb96148ccb3f34671bd8f5", size = 6299353, upload-time = "2025-04-27T18:04:59.103Z" }, +] + +[[package]] +name = "tabulate" +version = "0.10.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/46/58/8c37dea7bbf769b20d58e7ace7e5edfe65b849442b00ffcdd56be88697c6/tabulate-0.10.0.tar.gz", hash = "sha256:e2cfde8f79420f6deeffdeda9aaec3b6bc5abce947655d17ac662b126e48a60d", size = 91754, upload-time = "2026-03-04T18:55:34.402Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/99/55/db07de81b5c630da5cbf5c7df646580ca26dfaefa593667fc6f2fe016d2e/tabulate-0.10.0-py3-none-any.whl", hash = "sha256:f0b0622e567335c8fabaaa659f1b33bcb6ddfe2e496071b743aa113f8774f2d3", size = 39814, upload-time = "2026-03-04T18:55:31.284Z" }, +] + +[[package]] +name = "terminado" +version = "0.18.1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "ptyprocess", marker = "os_name != 'nt'" }, + { name = "pywinpty", marker = "os_name == 'nt'" }, + { name = "tornado" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/8a/11/965c6fd8e5cc254f1fe142d547387da17a8ebfd75a3455f637c663fb38a0/terminado-0.18.1.tar.gz", hash = "sha256:de09f2c4b85de4765f7714688fff57d3e75bad1f909b589fde880460c753fd2e", size = 32701, upload-time = "2024-03-12T14:34:39.026Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/6a/9e/2064975477fdc887e47ad42157e214526dcad8f317a948dee17e1659a62f/terminado-0.18.1-py3-none-any.whl", hash = "sha256:a4468e1b37bb318f8a86514f65814e1afc977cf29b3992a4500d9dd305dcceb0", size = 14154, upload-time = "2024-03-12T14:34:36.569Z" }, +] + +[[package]] +name = "tinycss2" +version = "1.4.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "webencodings" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/7a/fd/7a5ee21fd08ff70d3d33a5781c255cbe779659bd03278feb98b19ee550f4/tinycss2-1.4.0.tar.gz", hash = "sha256:10c0972f6fc0fbee87c3edb76549357415e94548c1ae10ebccdea16fb404a9b7", size = 87085, upload-time = "2024-10-24T14:58:29.895Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/e6/34/ebdc18bae6aa14fbee1a08b63c015c72b64868ff7dae68808ab500c492e2/tinycss2-1.4.0-py3-none-any.whl", hash = "sha256:3a49cf47b7675da0b15d0c6e1df8df4ebd96e9394bb905a5775adb0d884c5289", size = 26610, upload-time = "2024-10-24T14:58:28.029Z" }, +] + +[[package]] +name = "tornado" +version = "6.5.6" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/50/57/6d7303a77ae439d9189108f76c0c4fd89ee5e2cc8387bffb55232565c4ed/tornado-6.5.6.tar.gz", hash = "sha256:9a365179fe8ff6b8766f602c0f67c185d778193e9bdd828b19f0b6ed7764177d", size = 518139, upload-time = "2026-05-27T15:35:54.646Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/1b/0d/b4f481e18c5a51864e6d12b9a05ecf72919696680b747c958c3fc1f4fbae/tornado-6.5.6-cp39-abi3-macosx_10_9_universal2.whl", hash = "sha256:65fcfaafb079435c2c19dc9e07c0f1cf0fa9051759ed0a7d0a3ba7ea7f64919c", size = 447737, upload-time = "2026-05-27T15:35:38.122Z" }, + { url = "https://files.pythonhosted.org/packages/9e/9c/5430c39fcab1144d35860f457b15e9c08b4bc7ac86764354204e983d6183/tornado-6.5.6-cp39-abi3-macosx_10_9_x86_64.whl", hash = "sha256:38bc01b4acacded2de63ae78023548e41ebe6fbed3ec05a796d7ae3ad893887e", size = 445899, upload-time = "2026-05-27T15:35:40.519Z" }, + { url = "https://files.pythonhosted.org/packages/8b/79/fa7e14a2f939c807a8d30619b4eb604eab219601b78792516ebe22d40cf9/tornado-6.5.6-cp39-abi3-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:b942e6a137fda31ff54bf8e6e2c8d1c37f1f50583f3ed53fb840b53b9601d104", size = 448964, upload-time = "2026-05-27T15:35:42.106Z" }, + { url = "https://files.pythonhosted.org/packages/a7/71/bd67d5f5199f937dafe03a49a37989f60f600ff6fef34c79412a829d97bd/tornado-6.5.6-cp39-abi3-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:8666946e70171b8c3f1fc9b7876fac492e84822c4c7f3746f4e8f8bc9ac92a79", size = 449935, upload-time = "2026-05-27T15:35:43.906Z" }, + { url = "https://files.pythonhosted.org/packages/cc/a4/c24388c9cf5b3c3a513b56a158af9f23092c9a2810d789e294310797df21/tornado-6.5.6-cp39-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:1c34cfab7ad6d104f052f55de06d39bbafc5885cfeb4da688803308dbcfa90b7", size = 449767, upload-time = "2026-05-27T15:35:45.793Z" }, + { url = "https://files.pythonhosted.org/packages/a5/eb/6a07ad550c3f7b37244bd0becdf293ec3d3e961783d8b720a97df50de1b2/tornado-6.5.6-cp39-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:385f35e4e22fb52551dfcda4cdc8c30c61c2c001aef5ddad99cdfe116952efd3", size = 449174, upload-time = "2026-05-27T15:35:47.485Z" }, + { url = "https://files.pythonhosted.org/packages/bb/84/3469e098dccdb6763130e06aacd786bb4363fca7b590a55c101ddf34ed30/tornado-6.5.6-cp39-abi3-win32.whl", hash = "sha256:db475f1b67b2809b10bb16264829087724ca8d24fe4ed47f7b8675cae453ef86", size = 450230, upload-time = "2026-05-27T15:35:49.322Z" }, + { url = "https://files.pythonhosted.org/packages/d2/3c/273a04e0b9dd9016f1685cca0c1c8795a71ac88a34a8c889a0b443483226/tornado-6.5.6-cp39-abi3-win_amd64.whl", hash = "sha256:6739bf1e8eb09230f1280ddbd3236f0309db70f2c551a8dbc40f62babdf82f79", size = 450667, upload-time = "2026-05-27T15:35:51.194Z" }, + { url = "https://files.pythonhosted.org/packages/02/98/0cffe22a224f60c5fb1e3aa0b76f9da2e1ca78b0e9545e3d077c68ce60a7/tornado-6.5.6-cp39-abi3-win_arm64.whl", hash = "sha256:2543597b24a695d72338a9a77818362d72387c03ae173f1f169eadc5c91466ac", size = 449690, upload-time = "2026-05-27T15:35:52.902Z" }, +] + +[[package]] +name = "tqdm" +version = "4.67.3" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "colorama", marker = "sys_platform == 'win32'" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/09/a9/6ba95a270c6f1fbcd8dac228323f2777d886cb206987444e4bce66338dd4/tqdm-4.67.3.tar.gz", hash = "sha256:7d825f03f89244ef73f1d4ce193cb1774a8179fd96f31d7e1dcde62092b960bb", size = 169598, upload-time = "2026-02-03T17:35:53.048Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/16/e1/3079a9ff9b8e11b846c6ac5c8b5bfb7ff225eee721825310c91b3b50304f/tqdm-4.67.3-py3-none-any.whl", hash = "sha256:ee1e4c0e59148062281c49d80b25b67771a127c85fc9676d3be5f243206826bf", size = 78374, upload-time = "2026-02-03T17:35:50.982Z" }, +] + +[[package]] +name = "traitlets" +version = "5.15.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/1b/22/40f55b26baeab80c2d7b3f1db0682f8954e4617fee7d90ce634022ef05c6/traitlets-5.15.0.tar.gz", hash = "sha256:4fead733f81cf1c4c938e06f8ca4633896833c9d89eff878159457f4d4392971", size = 163197, upload-time = "2026-05-06T08:05:58.016Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/da/98/a9937a969d018a23badfea0b381f66783649d48e0ea6c41923265c3cbeb3/traitlets-5.15.0-py3-none-any.whl", hash = "sha256:fb36a18867a6803deab09f3c5e0fa81bb7b26a5c9e82501c9933f759166eff40", size = 85877, upload-time = "2026-05-06T08:05:55.853Z" }, +] + +[[package]] +name = "typing-extensions" +version = "4.15.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/72/94/1a15dd82efb362ac84269196e94cf00f187f7ed21c242792a923cdb1c61f/typing_extensions-4.15.0.tar.gz", hash = "sha256:0cea48d173cc12fa28ecabc3b837ea3cf6f38c6d1136f85cbaaf598984861466", size = 109391, upload-time = "2025-08-25T13:49:26.313Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/18/67/36e9267722cc04a6b9f15c7f3441c2363321a3ea07da7ae0c0707beb2a9c/typing_extensions-4.15.0-py3-none-any.whl", hash = "sha256:f0fa19c6845758ab08074a0cfa8b7aecb71c999ca73d62883bc25cc018c4e548", size = 44614, upload-time = "2025-08-25T13:49:24.86Z" }, +] + +[[package]] +name = "typing-inspection" +version = "0.4.2" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "typing-extensions" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/55/e3/70399cb7dd41c10ac53367ae42139cf4b1ca5f36bb3dc6c9d33acdb43655/typing_inspection-0.4.2.tar.gz", hash = "sha256:ba561c48a67c5958007083d386c3295464928b01faa735ab8547c5692e87f464", size = 75949, upload-time = "2025-10-01T02:14:41.687Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/dc/9b/47798a6c91d8bdb567fe2698fe81e0c6b7cb7ef4d13da4114b41d239f65d/typing_inspection-0.4.2-py3-none-any.whl", hash = "sha256:4ed1cacbdc298c220f1bd249ed5287caa16f34d44ef4e9c3d0cbad5b521545e7", size = 14611, upload-time = "2025-10-01T02:14:40.154Z" }, +] + +[[package]] +name = "tzdata" +version = "2026.2" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/ba/19/1b9b0e29f30c6d35cb345486df41110984ea67ae69dddbc0e8a100999493/tzdata-2026.2.tar.gz", hash = "sha256:9173fde7d80d9018e02a662e168e5a2d04f87c41ea174b139fbef642eda62d10", size = 198254, upload-time = "2026-04-24T15:22:08.651Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/ce/e4/dccd7f47c4b64213ac01ef921a1337ee6e30e8c6466046018326977efd95/tzdata-2026.2-py2.py3-none-any.whl", hash = "sha256:bbe9af844f658da81a5f95019480da3a89415801f6cc966806612cc7169bffe7", size = 349321, upload-time = "2026-04-24T15:22:05.876Z" }, +] + +[[package]] +name = "tzlocal" +version = "5.3.1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "tzdata", marker = "sys_platform == 'win32'" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/8b/2e/c14812d3d4d9cd1773c6be938f89e5735a1f11a9f184ac3639b93cef35d5/tzlocal-5.3.1.tar.gz", hash = "sha256:cceffc7edecefea1f595541dbd6e990cb1ea3d19bf01b2809f362a03dd7921fd", size = 30761, upload-time = "2025-03-05T21:17:41.549Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/c2/14/e2a54fabd4f08cd7af1c07030603c3356b74da07f7cc056e600436edfa17/tzlocal-5.3.1-py3-none-any.whl", hash = "sha256:eb1a66c3ef5847adf7a834f1be0800581b683b5608e74f86ecbcef8ab91bb85d", size = 18026, upload-time = "2025-03-05T21:17:39.857Z" }, +] + +[[package]] +name = "uncertainties" +version = "3.2.3" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/fe/0c/cb09f33b26955399c675ab378e4063ed7e48422d3d49f96219ab0be5eba9/uncertainties-3.2.3.tar.gz", hash = "sha256:76a5653e686f617a42922d546a239e9efce72e6b35411b7750a1d12dcba03031", size = 160492, upload-time = "2025-04-21T19:58:28.63Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/8f/5e/f1e1dd319e35e962a4e00b33150a8868b6329cc1d19fd533436ba5488f09/uncertainties-3.2.3-py3-none-any.whl", hash = "sha256:313353900d8f88b283c9bad81e7d2b2d3d4bcc330cbace35403faaed7e78890a", size = 60118, upload-time = "2025-04-21T19:58:26.864Z" }, +] + +[[package]] +name = "uri-template" +version = "1.3.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/31/c7/0336f2bd0bcbada6ccef7aaa25e443c118a704f828a0620c6fa0207c1b64/uri-template-1.3.0.tar.gz", hash = "sha256:0e00f8eb65e18c7de20d595a14336e9f337ead580c70934141624b6d1ffdacc7", size = 21678, upload-time = "2023-06-21T01:49:05.374Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/e7/00/3fca040d7cf8a32776d3d81a00c8ee7457e00f80c649f1e4a863c8321ae9/uri_template-1.3.0-py3-none-any.whl", hash = "sha256:a44a133ea12d44a0c0f06d7d42a52d71282e77e2f937d8abd5655b8d56fc1363", size = 11140, upload-time = "2023-06-21T01:49:03.467Z" }, +] + +[[package]] +name = "urllib3" +version = "2.7.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/53/0c/06f8b233b8fd13b9e5ee11424ef85419ba0d8ba0b3138bf360be2ff56953/urllib3-2.7.0.tar.gz", hash = "sha256:231e0ec3b63ceb14667c67be60f2f2c40a518cb38b03af60abc813da26505f4c", size = 433602, upload-time = "2026-05-07T16:13:18.596Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/7f/3e/5db95bcf282c52709639744ca2a8b149baccf648e39c8cc87553df9eae0c/urllib3-2.7.0-py3-none-any.whl", hash = "sha256:9fb4c81ebbb1ce9531cce37674bbc6f1360472bc18ca9a553ede278ef7276897", size = 131087, upload-time = "2026-05-07T16:13:17.151Z" }, +] + +[[package]] +name = "wcwidth" +version = "0.7.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/2c/ee/afaf0f85a9a18fe47a67f1e4422ed6cf1fe642f0ae0a2f81166231303c52/wcwidth-0.7.0.tar.gz", hash = "sha256:90e3a7ea092341c44b99562e75d09e4d5160fe7a3974c6fb842a101a95e7eed0", size = 182132, upload-time = "2026-05-02T16:04:12.653Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/41/52/e465037f5375f43533d1a80b6923955201596a99142ed524d77b571a1418/wcwidth-0.7.0-py3-none-any.whl", hash = "sha256:5d69154c429a82910e241c738cd0e2976fac8a2dd47a1a805f4afed1c0f136f2", size = 110825, upload-time = "2026-05-02T16:04:11.033Z" }, +] + +[[package]] +name = "webcolors" +version = "25.10.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/1d/7a/eb316761ec35664ea5174709a68bbd3389de60d4a1ebab8808bfc264ed67/webcolors-25.10.0.tar.gz", hash = "sha256:62abae86504f66d0f6364c2a8520de4a0c47b80c03fc3a5f1815fedbef7c19bf", size = 53491, upload-time = "2025-10-31T07:51:03.977Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/e2/cc/e097523dd85c9cf5d354f78310927f1656c422bd7b2613b2db3e3f9a0f2c/webcolors-25.10.0-py3-none-any.whl", hash = "sha256:032c727334856fc0b968f63daa252a1ac93d33db2f5267756623c210e57a4f1d", size = 14905, upload-time = "2025-10-31T07:51:01.778Z" }, +] + +[[package]] +name = "webencodings" +version = "0.5.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/0b/02/ae6ceac1baeda530866a85075641cec12989bd8d31af6d5ab4a3e8c92f47/webencodings-0.5.1.tar.gz", hash = "sha256:b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923", size = 9721, upload-time = "2017-04-05T20:21:34.189Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/f4/24/2a3e3df732393fed8b3ebf2ec078f05546de641fe1b667ee316ec1dcf3b7/webencodings-0.5.1-py2.py3-none-any.whl", hash = "sha256:a0af1213f3c2226497a97e2b3aa01a7e4bee4f403f95be16fc9acd2947514a78", size = 11774, upload-time = "2017-04-05T20:21:32.581Z" }, +] + +[[package]] +name = "websocket-client" +version = "1.9.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/2c/41/aa4bf9664e4cda14c3b39865b12251e8e7d239f4cd0e3cc1b6c2ccde25c1/websocket_client-1.9.0.tar.gz", hash = "sha256:9e813624b6eb619999a97dc7958469217c3176312b3a16a4bd1bc7e08a46ec98", size = 70576, upload-time = "2025-10-07T21:16:36.495Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/34/db/b10e48aa8fff7407e67470363eac595018441cf32d5e1001567a7aeba5d2/websocket_client-1.9.0-py3-none-any.whl", hash = "sha256:af248a825037ef591efbf6ed20cc5faa03d3b47b9e5a2230a529eeee1c1fc3ef", size = 82616, upload-time = "2025-10-07T21:16:34.951Z" }, +] + +[[package]] +name = "werkzeug" +version = "3.1.8" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "markupsafe" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/dd/b2/381be8cfdee792dd117872481b6e378f85c957dd7c5bca38897b08f765fd/werkzeug-3.1.8.tar.gz", hash = "sha256:9bad61a4268dac112f1c5cd4630a56ede601b6ed420300677a869083d70a4c44", size = 875852, upload-time = "2026-04-02T18:49:14.268Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/93/8c/2e650f2afeb7ee576912636c23ddb621c91ac6a98e66dc8d29c3c69446e1/werkzeug-3.1.8-py3-none-any.whl", hash = "sha256:63a77fb8892bf28ebc3178683445222aa500e48ebad5ec77b0ad80f8726b1f50", size = 226459, upload-time = "2026-04-02T18:49:12.72Z" }, +] + +[[package]] +name = "wrapt" +version = "2.2.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/2d/9f/06263fcd8ad6c405f05a3905fd7a84dd3176eb5ad46e44bccc0cd16348bb/wrapt-2.2.1.tar.gz", hash = "sha256:6744f504375775d7609c82c8d3d94af1c9a6f05586984536905908ba905277b9", size = 127620, upload-time = "2026-05-22T14:49:43.056Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/5f/ac/4370bde262c0e633e6c4f0e56d55095710024cf9a5cecc20c59a10de483c/wrapt-2.2.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:dd57607acc85678925940bd5df0385ff8332083a32fa8d7a43f8767f4997263c", size = 80321, upload-time = "2026-05-22T14:47:43.996Z" }, + { url = "https://files.pythonhosted.org/packages/eb/79/b8ff3a61e71babf58a8cf4c0d63358e8bad383e15bf7f35e62d2f6b6e4a4/wrapt-2.2.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:1ae574d65c9fa8e86f64f6a7c2668f9fcd507b183e0e577619f504b883cb0a6c", size = 81216, upload-time = "2026-05-22T14:47:45.243Z" }, + { url = "https://files.pythonhosted.org/packages/6e/fd/c0cac1f77c9c4f6fe58a920ca632ce379bb8be928720e11e8d73de28a5e9/wrapt-2.2.1-cp311-cp311-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:9a04c28c10ba7fd12842b109d2edb0678872a2fe65277ca4ff06a0d61edee245", size = 159208, upload-time = "2026-05-22T14:47:47.176Z" }, + { url = "https://files.pythonhosted.org/packages/d9/4f/744132a7b2fbefa6b81118ec5942eca5fc2e9a129f9055a0c5e46885a549/wrapt-2.2.1-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:3e2f02472a1cbbf3884b365714a810b5947134a95ad6952b554cb8cce9d492b0", size = 160322, upload-time = "2026-05-22T14:47:49.04Z" }, + { url = "https://files.pythonhosted.org/packages/d6/95/b7cd9a22a06cf93e6482904ee6afc956248983553593fd1009296d1b3b31/wrapt-2.2.1-cp311-cp311-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:ac2745950b2bff80219c15ebf2fa9d8427eba7e249739f97e55c9d169e47e9e1", size = 153243, upload-time = "2026-05-22T14:47:50.386Z" }, + { url = "https://files.pythonhosted.org/packages/4c/4a/eb79423192015f46f0db2872e7e04a3dde8d359b83411e8959e7c9287eaa/wrapt-2.2.1-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:67a97e5b6c457f0cd3cfc19ebb2d84463e60c3ece754cc831e4281a3ca29bb18", size = 159231, upload-time = "2026-05-22T14:47:51.753Z" }, + { url = "https://files.pythonhosted.org/packages/ec/dc/435015b58ce33c6fc4104158fa91ddb0e809ab03a5751fb7465d1d461456/wrapt-2.2.1-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:c803a3d331796255af51ba2c79ed0ac8275865b516c09e61f248d1e7aff31ce9", size = 152351, upload-time = "2026-05-22T14:47:53.214Z" }, + { url = "https://files.pythonhosted.org/packages/77/ac/5d203f98df8fd136b95c5227139aea02d34505e18baf812d0c005df61963/wrapt-2.2.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:9b984d1eb252145d6302c1dbd5e87fc6d404d45531447c84eadec04bf1fcb027", size = 158347, upload-time = "2026-05-22T14:47:54.982Z" }, + { url = "https://files.pythonhosted.org/packages/52/2f/a92427dbdc74e54c1674abbed27e61b2cb5e7a94441b8c1270c70671d928/wrapt-2.2.1-cp311-cp311-win32.whl", hash = "sha256:8a983a603a18c8708f024f7f6991b2e66159219abbf894634c5056243c55f3cd", size = 77562, upload-time = "2026-05-22T14:47:56.275Z" }, + { url = "https://files.pythonhosted.org/packages/c8/56/987b9c13b3e1c1a3c6de71284076f996b79caec90e75a87c044a40c23db9/wrapt-2.2.1-cp311-cp311-win_amd64.whl", hash = "sha256:9c210a6994b21aa9b29e81c8d11560e8fdab54c117e9cff37870d0a27bde1343", size = 80616, upload-time = "2026-05-22T14:47:57.854Z" }, + { url = "https://files.pythonhosted.org/packages/7e/25/d01f560888d99d94a959c85533de349ce68d71ace3f2591d6ea8f632cfed/wrapt-2.2.1-cp311-cp311-win_arm64.whl", hash = "sha256:401229e9d63ca09f9b8891ecf83798d26c11bbb445d11ed9f1836b6d4585b38a", size = 79025, upload-time = "2026-05-22T14:47:59.089Z" }, + { url = "https://files.pythonhosted.org/packages/89/0c/bfae7b9401583b6d05938cd16dedc43857d96da2f8a3d50d78cc515bf6ff/wrapt-2.2.1-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:3ffad790d9d11d8ecf9f17c4bb671a5b4089e4d8b575c46c5129597f41f836b0", size = 81021, upload-time = "2026-05-22T14:48:00.313Z" }, + { url = "https://files.pythonhosted.org/packages/26/58/80f6a6599f933f4caecc1cb3ee88a04faf81e8b9bddbd6109c688dd63e0f/wrapt-2.2.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:628f5220c7a904d5fc78f7075c8d7871433eb6d035c94728a22fdf85f193d2a8", size = 81692, upload-time = "2026-05-22T14:48:01.49Z" }, + { url = "https://files.pythonhosted.org/packages/17/93/fb357cc7847c58a8ae790be718903afa81a28d23e642c843dc4129e8a0b2/wrapt-2.2.1-cp312-cp312-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:61acce4257a9883669703c525447c5b4c392edf0f987ae77ec32668440158f0e", size = 169364, upload-time = "2026-05-22T14:48:02.791Z" }, + { url = "https://files.pythonhosted.org/packages/aa/0b/76b601ee309a8bd556af0eecb184394c20b3c49aa9c8e085aa1ffacc2568/wrapt-2.2.1-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:727ab4244622cd6ad2390f322642090c877d2e83a608d2653a7643ae5368d926", size = 171079, upload-time = "2026-05-22T14:48:04.22Z" }, + { url = "https://files.pythonhosted.org/packages/cd/87/ee3f32d5658e3e26d3e0e457922b47a36dd3bfbdfee7f97bb3e802344a66/wrapt-2.2.1-cp312-cp312-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:03df9ebed4c73ab93fa8c07e3d41d818dfca1852b15731a3de59457b27814624", size = 160205, upload-time = "2026-05-22T14:48:05.553Z" }, + { url = "https://files.pythonhosted.org/packages/b1/d0/ae2fd64277a67f5d7bffcf2d05eea1e476263fb2a072baf0b0129ab85984/wrapt-2.2.1-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:0d9ff006f420b2ec8296aa56ade43ea7da3e997e85769f0aafc5e0661aacb710", size = 168922, upload-time = "2026-05-22T14:48:07.132Z" }, + { url = "https://files.pythonhosted.org/packages/b1/f3/2d541a060c5bbafb9400bca4917e4d78bfd1f239f404782c86831a8f6b29/wrapt-2.2.1-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:844c858fc3bb7eacc0ba8efa904935d16aac6a4470948ad1e7e55c9f5a2a665f", size = 158388, upload-time = "2026-05-22T14:48:08.629Z" }, + { url = "https://files.pythonhosted.org/packages/1d/68/8d92c8800c57e93cb116ae9e9d6cbafc34fade5ee9f9107b6f203fb4dc35/wrapt-2.2.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:87bacdaf225117a342a20d9c03438d701c02112f6e3f351ce9b7f32354f14797", size = 167682, upload-time = "2026-05-22T14:48:10.042Z" }, + { url = "https://files.pythonhosted.org/packages/30/72/83ea3790ea352439442349388e29ff07b76e0686265f9088bbb505d1608d/wrapt-2.2.1-cp312-cp312-win32.whl", hash = "sha256:2f8c90c8afde51969487be4e1343ae049b268854877d415c2510baf833775052", size = 77857, upload-time = "2026-05-22T14:48:11.782Z" }, + { url = "https://files.pythonhosted.org/packages/ef/cb/99450668dd3502d62a54a1c8aa56e44f34cb8c1261b381cfe2e7926c3b75/wrapt-2.2.1-cp312-cp312-win_amd64.whl", hash = "sha256:6ce32763ac31ce94fe9aada947e479b1975012bff166da409b4b9e4e376cf7e5", size = 80825, upload-time = "2026-05-22T14:48:13.046Z" }, + { url = "https://files.pythonhosted.org/packages/e6/3a/87512881be64e743f9ee4c66f4cbe8e884974bef2a5989af71f999653ac7/wrapt-2.2.1-cp312-cp312-win_arm64.whl", hash = "sha256:8d1b4d0e0c2119587a31f5c029abd547e0c81d93b89d394566fe1588659eb579", size = 79087, upload-time = "2026-05-22T14:48:14.323Z" }, + { url = "https://files.pythonhosted.org/packages/88/d1/a1b08f8f4fac8cbb156fa51cf64ee2c7f7f74f9875ba3cf70b3c58368694/wrapt-2.2.1-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:d2beb1c7cab10603aecdc42f8edd6ff013f9a32e4543474e38e6b77ce9975aeb", size = 80831, upload-time = "2026-05-22T14:48:15.598Z" }, + { url = "https://files.pythonhosted.org/packages/54/ce/57890814991446a845e09b3445ce8b694f27eb0577004f2c2a36a9772ed4/wrapt-2.2.1-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:e0cb7e4dd71f4c32e5e84843cd3c4cd65dda034314004bbe1d7f99af2426ab80", size = 81375, upload-time = "2026-05-22T14:48:17.071Z" }, + { url = "https://files.pythonhosted.org/packages/38/65/08d7a6c76ac4493bdb668205ee9c1de1bd5daca61717c3e9aa49b4c01499/wrapt-2.2.1-cp313-cp313-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:95821352042722cd9f1108874579a47989d0a7e12a37d87d2fc4af20fd99ab8a", size = 167417, upload-time = "2026-05-22T14:48:18.303Z" }, + { url = "https://files.pythonhosted.org/packages/62/ce/f1ccbee7a1bfe5cdc6b3da6bab4b45713d628b9294da32a39f563d648140/wrapt-2.2.1-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:abd621552ede77c4c69be7fac44ba911225b0c812b6ba604e5964cf98085b474", size = 166948, upload-time = "2026-05-22T14:48:19.768Z" }, + { url = "https://files.pythonhosted.org/packages/86/2a/f85d48d1cd4869aee6704028d257d740a47c1c467b457ce396b4b5b55d07/wrapt-2.2.1-cp313-cp313-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:e3677c7146ce694874941ba82b57092cc4875445aadf29d72807351023105143", size = 158148, upload-time = "2026-05-22T14:48:21.96Z" }, + { url = "https://files.pythonhosted.org/packages/fe/5c/93939ad11d4a12358ab1aab219a2ef5efa5612e0db6b9fc65af8af1a891b/wrapt-2.2.1-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:9a5934eaea872e17936b5f45501eba5ab0bce9a74122e172b663d7c28c459c4a", size = 165905, upload-time = "2026-05-22T14:48:23.373Z" }, + { url = "https://files.pythonhosted.org/packages/e0/22/b8c2aa89862ff58605934d7abf4b70e6a5a1c33df96656f49035ccdf1c8a/wrapt-2.2.1-cp313-cp313-musllinux_1_2_riscv64.whl", hash = "sha256:f5b9daf6b629fce418e0cc3dd0436eac045188fa35deadb7a7f3941d5b8203f9", size = 156712, upload-time = "2026-05-22T14:48:24.767Z" }, + { url = "https://files.pythonhosted.org/packages/5d/78/bf00a7b02239c12bb02ddcc3c0b971bfcc36e578c5a44f1ccfef5b458545/wrapt-2.2.1-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:f53ac9f3ef573326d009ed809beff4efcac6451931c2b8132586da4b9e53ff31", size = 166560, upload-time = "2026-05-22T14:48:26.83Z" }, + { url = "https://files.pythonhosted.org/packages/fe/93/6390ca9c5b787683cef588d04f57c8d41b9a2323b5597a65f18638c90ef2/wrapt-2.2.1-cp313-cp313-win32.whl", hash = "sha256:1ffa9cfd4bdb581539951b14ae661ff20ed0c3599b3e911a131ee0ec5ac11337", size = 77817, upload-time = "2026-05-22T14:48:28.221Z" }, + { url = "https://files.pythonhosted.org/packages/97/73/ce10f0e71c0cfaa1a65faadb8efd4852028b3bb9ba28932b8889df769d38/wrapt-2.2.1-cp313-cp313-win_amd64.whl", hash = "sha256:368eac1e20fd0bb03dd3cc42bf9887154c3861b60989389ccb5fac032617d215", size = 80736, upload-time = "2026-05-22T14:48:30.139Z" }, + { url = "https://files.pythonhosted.org/packages/c7/4c/89f4a6818fafbbd840330e4fa3873073e1bfc166133a64cac7f8fde7a5e3/wrapt-2.2.1-cp313-cp313-win_arm64.whl", hash = "sha256:c754dafdf5aaf0b401b644a90a30046929a0dd1a536e0ff0ec959a59155d9c7f", size = 79099, upload-time = "2026-05-22T14:48:31.405Z" }, + { url = "https://files.pythonhosted.org/packages/bf/f2/9a8741c46f8c208ac0a45b25ba170bcb4fb72a2781d5fb97dbd7b6be73cb/wrapt-2.2.1-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:ed928d0fda15fc0adc8d13305c8b3c0f2fba5b0669950c9e6d019d9162a3b3e8", size = 82802, upload-time = "2026-05-22T14:48:33.307Z" }, + { url = "https://files.pythonhosted.org/packages/9c/0d/e9c855716a3705eef1416456bdf062b60620726fdc59428ff670fc3c60dc/wrapt-2.2.1-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:fafb4e739e43544d12cb4abd1605fd4683b6ca6a9ad682b7fd8f4d21973eafa8", size = 83329, upload-time = "2026-05-22T14:48:34.593Z" }, + { url = "https://files.pythonhosted.org/packages/3b/d6/a88f1c13112b7831adac75cea65d8310e0d696d570c8961844c90a57b865/wrapt-2.2.1-cp313-cp313t-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:74d6a0c31472fe5d814917266b9f46495d7c61ed890af08b468acea92fb89a8d", size = 202937, upload-time = "2026-05-22T14:48:35.859Z" }, + { url = "https://files.pythonhosted.org/packages/42/65/e29d54aef06a4d898a5b8a25589a0b3769bde454f922fad8f6f89fbfb650/wrapt-2.2.1-cp313-cp313t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:ab5be648d5a0b86b7438864f8df3c705a65cef35a2fd3e5561e3e203167e0f27", size = 209997, upload-time = "2026-05-22T14:48:38.153Z" }, + { url = "https://files.pythonhosted.org/packages/2a/91/e4454263516cf0e12640912fbca9a83654e424f0a6ddb79f5cd7ce14bf33/wrapt-2.2.1-cp313-cp313t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:9d8f204c8e3a8bf9ece17e0a83d137fd807440977f8a5e762d59306795011440", size = 194856, upload-time = "2026-05-22T14:48:39.69Z" }, + { url = "https://files.pythonhosted.org/packages/de/d0/fe0ee202286afdf4a7f77dd29f195703145764d572aec209c5086e57d924/wrapt-2.2.1-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:d047f6498c973874ba08ac3f97c69a2c4b2211c8de6f4c205f75cb1c9522596e", size = 205654, upload-time = "2026-05-22T14:48:43.456Z" }, + { url = "https://files.pythonhosted.org/packages/23/b6/87d860dfc6460c246af70b1fd5c8b76df77571b42a493459423ded94fd7d/wrapt-2.2.1-cp313-cp313t-musllinux_1_2_riscv64.whl", hash = "sha256:7a4fdb9326aab4a5a477a1640e5ad786a8495901009d7e7b038371edd23a9d2b", size = 192206, upload-time = "2026-05-22T14:48:44.858Z" }, + { url = "https://files.pythonhosted.org/packages/df/46/3eea8cde077d985f239a38c0257087b8064fd9ee9b1a99e282d2c86da4ef/wrapt-2.2.1-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:c8cc5094b08abeae52da9c73c8a32003623be691a5193df2f4e3eac3d557c394", size = 198428, upload-time = "2026-05-22T14:48:46.319Z" }, + { url = "https://files.pythonhosted.org/packages/18/dc/b927ee9c7fc67adc3a5658f246a0d275425eb840ba36e7b702e70f18bde8/wrapt-2.2.1-cp313-cp313t-win32.whl", hash = "sha256:9907a4402ab6db12b7077a0ea5d7a4d028ecb22c8eee2b53527080d347cd1562", size = 79448, upload-time = "2026-05-22T14:48:47.901Z" }, + { url = "https://files.pythonhosted.org/packages/ec/b3/fd30b473fe498c70e6b9a5f328b8d3fbaf1b8c3c481465f59724bba8eb70/wrapt-2.2.1-cp313-cp313t-win_amd64.whl", hash = "sha256:5590d63f5243251641cf543009b4c9314a79d0598fdb8a8e4cfc918494536c53", size = 83021, upload-time = "2026-05-22T14:48:49.201Z" }, + { url = "https://files.pythonhosted.org/packages/ee/f3/96c39153a8737a6e9aa85adef254ac4195bea3f2d24efc60472ccc3c9e2e/wrapt-2.2.1-cp313-cp313t-win_arm64.whl", hash = "sha256:c318a64b53d97b841d7b5e637517e50a27be64bc695128422953d4b21710954e", size = 80295, upload-time = "2026-05-22T14:48:50.479Z" }, + { url = "https://files.pythonhosted.org/packages/0a/a3/11d7f34ebbf3231bc907a3e6d5ee051b14d034c1bc7b65a97d5cc00516df/wrapt-2.2.1-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:6f56a647e4eaf5f0ca40330fb070f566bdf9f7b0db89a1af20d71c28dcd7a0ab", size = 80879, upload-time = "2026-05-22T14:48:51.802Z" }, + { url = "https://files.pythonhosted.org/packages/13/3c/b74cfd984cef560b900fb1a727af20352d89e1f06bf2e1114dd3f00f5f5a/wrapt-2.2.1-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:64b7deeda4b70408e382328d8bbe52a256fe9bc63ae3db86d804608367e5422c", size = 81462, upload-time = "2026-05-22T14:48:53.18Z" }, + { url = "https://files.pythonhosted.org/packages/15/a3/7c8f704b8dc07dfe0a5d01c2edbfd88317aa8e5e3fa7c743eb7a085ae767/wrapt-2.2.1-cp314-cp314-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:b9cf53ba90717db2e292401de290776c498d4bbfb0d4a559ca2895db8b9dcb5c", size = 167251, upload-time = "2026-05-22T14:48:54.562Z" }, + { url = "https://files.pythonhosted.org/packages/80/85/a34d1888d97247da6c2ff6118c3a721c73ed8cc4dd198c00208bb73b6f80/wrapt-2.2.1-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:cf3638274ab9d9b724c9baa0b4c04e132cd6faefb78b4dd3dd1a02a4bdaad41e", size = 166316, upload-time = "2026-05-22T14:48:56.065Z" }, + { url = "https://files.pythonhosted.org/packages/e9/d7/72ffaeb01eebc704afe3fb99e840480f4bda45f0fa66e3381b6a39251c8f/wrapt-2.2.1-cp314-cp314-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:aed9658797d0b45d6c49adcfc6b41f66e6f2d0c6de3ec79e16cf4b1855df240f", size = 157952, upload-time = "2026-05-22T14:48:57.924Z" }, + { url = "https://files.pythonhosted.org/packages/24/5b/36f5d6b024e4edfdd90b140742d11ebcf7836daf5c9daf326c55c24db412/wrapt-2.2.1-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:1d676ee388bc42a04d56dd7deb5605244dac2e35cc2fadbb43c9fa25bbd93508", size = 166130, upload-time = "2026-05-22T14:48:59.384Z" }, + { url = "https://files.pythonhosted.org/packages/81/06/9296d9e97bfdef5483dfcc859d57b095b257144b2bc5300ab521e06f4bc7/wrapt-2.2.1-cp314-cp314-musllinux_1_2_riscv64.whl", hash = "sha256:e395f7bc31851ef9b612050368cb446e9bc14cd7454b025018980349caf25ae5", size = 156604, upload-time = "2026-05-22T14:49:00.921Z" }, + { url = "https://files.pythonhosted.org/packages/53/37/16953929ed6776175720e58fc966e779926d8d71e2c7b2273230590ca71f/wrapt-2.2.1-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:5f1845c2a8cc1180ccccfa45785dd06f562730d19ef75be180334254012b6283", size = 166007, upload-time = "2026-05-22T14:49:02.332Z" }, + { url = "https://files.pythonhosted.org/packages/b9/73/20ee58c0612dae7c31131a7095345812ed2c7b389019e175f68cde34e5b4/wrapt-2.2.1-cp314-cp314-win32.whl", hash = "sha256:436addbc4bb4fc0a88c702577f51195d7d73683a7f3e0e5b253d8404d7847243", size = 78327, upload-time = "2026-05-22T14:49:03.722Z" }, + { url = "https://files.pythonhosted.org/packages/22/b3/ef7c3295d02e0448a71c639a36a057f46d524d057c9486291a7a3039e65c/wrapt-2.2.1-cp314-cp314-win_amd64.whl", hash = "sha256:50972a1d974ea07725a7f6b1cec5f8759008afd030a0024843ebe7d52de47f2b", size = 81144, upload-time = "2026-05-22T14:49:05.093Z" }, + { url = "https://files.pythonhosted.org/packages/ac/dc/7bdf336953f99f4ceb0a584bb8870e42c8f26f93ea10c87834dad62f1668/wrapt-2.2.1-cp314-cp314-win_arm64.whl", hash = "sha256:1c9934ea5d92957e3cd0adbc0845539dccfd62710ebe16195a8c66c53954db36", size = 79569, upload-time = "2026-05-22T14:49:06.413Z" }, + { url = "https://files.pythonhosted.org/packages/6a/6d/6dfae80150ff1919c356d1dd528f049bcdfaae29b4d284bc957e022caef4/wrapt-2.2.1-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:17de18fc12cea55b8a9587314cb830573e37fb33b247a7515696350863714188", size = 82892, upload-time = "2026-05-22T14:49:07.925Z" }, + { url = "https://files.pythonhosted.org/packages/82/7b/4e34766a7d7804ffce9e71befe47e9b3225dc350c49c94493c4ab39fd3a5/wrapt-2.2.1-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:a9dec1aca52dddde7df94818310fa2fe79739c8f385b2014c4cb1035f5508199", size = 83333, upload-time = "2026-05-22T14:49:09.257Z" }, + { url = "https://files.pythonhosted.org/packages/9d/57/0b34db3e8de44ccfece62d7b337abd1631dd810f5adc5f3db571727836b5/wrapt-2.2.1-cp314-cp314t-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:69f2e9244542cb34dd59c7f073445b9e54ad9f3fce8d93606c368a1b499fc413", size = 202899, upload-time = "2026-05-22T14:49:10.572Z" }, + { url = "https://files.pythonhosted.org/packages/e5/45/ac0c459f154b99d92789a6cba7ca727185b83513b986f8ec7fe2aacddcbf/wrapt-2.2.1-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:2d83966dc7f4f45e8b97b5933685ac2e6e67fc0e19246ea314bceb9a8970c956", size = 209986, upload-time = "2026-05-22T14:49:12.229Z" }, + { url = "https://files.pythonhosted.org/packages/b7/e4/77e37ff33ad018fa81ade52c25fa327b80b56f81d734279a63614fcb4cbc/wrapt-2.2.1-cp314-cp314t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:78b0aa6bfb7be8deed0ab23e7aa028cc5210c29bc2d32a04d52b50e517a7307e", size = 194893, upload-time = "2026-05-22T14:49:14.139Z" }, + { url = "https://files.pythonhosted.org/packages/dd/9d/7ea651d1ab032fc5fa222fbec91d0f8a1397f6ae04ebb93fa7219aa921d7/wrapt-2.2.1-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:05d5cb74d1b232ec8cfa130a8f900708699ff2491d97b8f85a4cdc5996294b85", size = 205636, upload-time = "2026-05-22T14:49:15.714Z" }, + { url = "https://files.pythonhosted.org/packages/09/af/8e88031a701275b9085c54e64bc88c0b1cd55c77eadd400691c371cd76c4/wrapt-2.2.1-cp314-cp314t-musllinux_1_2_riscv64.whl", hash = "sha256:f6518b94edb9150452e9aba08027d4cc293433753ec1fbefb4629a21cbc74181", size = 192267, upload-time = "2026-05-22T14:49:17.283Z" }, + { url = "https://files.pythonhosted.org/packages/bf/a8/e657ca876b06710194f243d81c4b0896ade646e244bdbec2d87c8c56a8bd/wrapt-2.2.1-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:ed55af48b3eb28f43228ca2306788892bcb629eb2b5c4876e2a3659872c2f17a", size = 198378, upload-time = "2026-05-22T14:49:18.785Z" }, + { url = "https://files.pythonhosted.org/packages/c8/59/822efe4ea722a3961331bfa35b7d90937790d2c20f0616de1997ccc3aebd/wrapt-2.2.1-cp314-cp314t-win32.whl", hash = "sha256:2e08688ab16525897da6589d56d0aebaf417bbe91c2d8e3b96203b1efa596e85", size = 80226, upload-time = "2026-05-22T14:49:20.264Z" }, + { url = "https://files.pythonhosted.org/packages/ab/31/2a7dc5f6abb2fca0b6e1610e120419f603650aceb4f1d3ac4cae0354e162/wrapt-2.2.1-cp314-cp314t-win_amd64.whl", hash = "sha256:fd0135d34387f5fd087d9be368ea77ea89cf2451dc1cd1c622d35021bcb3ab50", size = 83835, upload-time = "2026-05-22T14:49:21.634Z" }, + { url = "https://files.pythonhosted.org/packages/9f/c0/782b86e28d1ceebeb74cccea12d2cd3d2ba0bd68e3dec20b1bc5873f6127/wrapt-2.2.1-cp314-cp314t-win_arm64.whl", hash = "sha256:f70db64e8266d7c45d3b735f2e08eeb434b5e03da9a479ae42b2e2e486a21a00", size = 80722, upload-time = "2026-05-22T14:49:23.59Z" }, + { url = "https://files.pythonhosted.org/packages/53/46/29ac9daf11a86c22a8c38cd9236c62928ccae83f7ceb06bd3b0467cf9d05/wrapt-2.2.1-py3-none-any.whl", hash = "sha256:3aafea2975caef8ca49400640dde02cc7426e798f24870ed01f490bc3cffd32f", size = 61000, upload-time = "2026-05-22T14:49:41.593Z" }, +] + +[[package]] +name = "zope-event" +version = "6.2" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/93/41/faa10af34d48d9cd6fa0249a1162943ad84a9590bd1a06939981e6640416/zope_event-6.2.tar.gz", hash = "sha256:b97d5d6327067ee6b9dfcbdf606ade9ade70991e19c162e808ea39e5fcf0f8d3", size = 18958, upload-time = "2026-04-28T06:24:10.578Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/9e/33/848922889e946d4befc415c219fe516af75c49555d8e736e183bfd30db42/zope_event-6.2-py3-none-any.whl", hash = "sha256:5e755153ac4faf64c10a4b6dd3307680166a3edf65b38df22df592610f8fa874", size = 6525, upload-time = "2026-04-28T06:24:09.176Z" }, +] + +[[package]] +name = "zope-interface" +version = "8.5" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/08/dc/50550cfcbb2ea3cbca5f1d7ed05c8aa840f831a0f2d63aec0a953f7c590e/zope_interface-8.5.tar.gz", hash = "sha256:7a3ba1c5877f0f3e3906b02ddf793abed2becc2948116414ce0e1dd820b68d6d", size = 257957, upload-time = "2026-05-26T06:50:14.574Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/ce/f1/83ad110fb847413affe71609bb50e59e1aa082e1236030122227c7c283d3/zope_interface-8.5-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:afc66ccaef2a3c0bef6ca02aad40d29a39276389dad16a8eac36f9f385e4d057", size = 211426, upload-time = "2026-05-26T06:49:12.595Z" }, + { url = "https://files.pythonhosted.org/packages/bb/a7/6b6e0c31ac240cb9fc015ae9ed45ca54be886c18fcf7bfa2377a4d7a8785/zope_interface-8.5-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:c28044972187245d7a309e4699319bfdbd2ffcbf7176d1d4ddf5adffb2dea80f", size = 211850, upload-time = "2026-05-26T06:49:14.474Z" }, + { url = "https://files.pythonhosted.org/packages/37/36/7599ecabcf80ce4fef2e1ef3c5ac0d4696b61f03f724cc44022f4d226af9/zope_interface-8.5-cp311-cp311-manylinux1_i686.manylinux2014_i686.manylinux_2_17_i686.manylinux_2_5_i686.whl", hash = "sha256:03bbecc7982af713d7499d4084bc03916413d17ffd45f89009348cc0c1d9e376", size = 260711, upload-time = "2026-05-26T06:49:16.568Z" }, + { url = "https://files.pythonhosted.org/packages/03/3e/1774b0ee46ccbb5498ee3c33ece40315b6ef58bc71957be94bd345340bc1/zope_interface-8.5-cp311-cp311-manylinux1_x86_64.manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:bf917009a4a7457c7290225a019f4a0aa706d96accd2cfdba2418d3bc1fcde2f", size = 265277, upload-time = "2026-05-26T06:49:18.656Z" }, + { url = "https://files.pythonhosted.org/packages/b6/09/e533b2ffabaae4e5d5730d6768a591cf335defe8e37bec2ad905d09be656/zope_interface-8.5-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:31cff25b2aaedb5267e6e77b1e9be6b0ec4f622032de8a069202b8ffacda7dc2", size = 266369, upload-time = "2026-05-26T06:49:20.174Z" }, + { url = "https://files.pythonhosted.org/packages/49/4a/3ebe6a4c122b2d5340db45cbe7e490663d3228b172710ec71060cd5d541e/zope_interface-8.5-cp311-cp311-win_amd64.whl", hash = "sha256:17a3114bbdddb5e75e5784cdf318944636190cbbc72d357ef9fb1a8b0351f955", size = 215161, upload-time = "2026-05-26T06:49:21.799Z" }, + { url = "https://files.pythonhosted.org/packages/d2/59/056ad97af5b16db1975ee98ec7ab03d2ce3f3355efad904ced1dbce0e39f/zope_interface-8.5-cp311-cp311-win_arm64.whl", hash = "sha256:aab6bb5bee10f38ea688b95ba054396b67f613552d2c8378be7fcb2d2fba7646", size = 213481, upload-time = "2026-05-26T06:49:25.085Z" }, + { url = "https://files.pythonhosted.org/packages/97/cc/b84123a948f3162a34623e188922827cd845244fdd043ed20f8d02228caa/zope_interface-8.5-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:8e6ee90c2e6de7c37058d5fa41f123c8b13a312db8d1e0fb5840d7f4bcdff9c9", size = 212165, upload-time = "2026-05-26T06:49:26.566Z" }, + { url = "https://files.pythonhosted.org/packages/4e/78/cbceec44f1b27208a76c1a688c131302685852406a23df5aab68324109cc/zope_interface-8.5-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:c1adc90d3576b3b4c4de4953e6002c37bef28b78d7fa54c1bbfd0c50f022fe7c", size = 212341, upload-time = "2026-05-26T06:49:28.182Z" }, + { url = "https://files.pythonhosted.org/packages/e1/c3/005032195ff3b210c139b7c560ed5c534e844b0907d8e44d2b3d8919305e/zope_interface-8.5-cp312-cp312-manylinux1_i686.manylinux2014_i686.manylinux_2_17_i686.manylinux_2_5_i686.whl", hash = "sha256:e6347b8d8d12c5eca6502450a92be30079b7acfade2c4f693efa0deb8871b06e", size = 265296, upload-time = "2026-05-26T06:49:29.741Z" }, + { url = "https://files.pythonhosted.org/packages/c5/66/1036543d6a66bc04c19df3cf650f3ad938a002ab0a443c24e23e8de5e8b9/zope_interface-8.5-cp312-cp312-manylinux1_x86_64.manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:5e970dabea777a24b0b0bbf9dae3ab75ce8b2d8e948edf4875627034b21f3560", size = 270689, upload-time = "2026-05-26T06:49:31.767Z" }, + { url = "https://files.pythonhosted.org/packages/30/4c/8b56259558cace4414e753ca6740396a1f59d4a95ddb55b4658600408670/zope_interface-8.5-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:f0b48ccadaa9839e09ff81e969703cecb3f402c813bfe8b958652e699bea69f5", size = 270280, upload-time = "2026-05-26T06:49:33.489Z" }, + { url = "https://files.pythonhosted.org/packages/f9/ea/649908c83aa8fdb7faf2ddca4d3cf6fb8f2157121267dc56e8f72681e26c/zope_interface-8.5-cp312-cp312-win_amd64.whl", hash = "sha256:e0e311f1277468c08fd59a2b41f71b43d25dff639789d364747acd1705c0df6e", size = 215019, upload-time = "2026-05-26T06:49:35.607Z" }, + { url = "https://files.pythonhosted.org/packages/9f/97/da13037b4c563e4df32eedbc819f8c00b754af494f68211e3dffd48d52da/zope_interface-8.5-cp312-cp312-win_arm64.whl", hash = "sha256:652b73107a04159ec6c020db6c1543d4f1e8f4d069bd2aac88a947820923517b", size = 213569, upload-time = "2026-05-26T06:49:37.317Z" }, + { url = "https://files.pythonhosted.org/packages/f4/8c/4c15755d701f2ec0e80d64a18e1ebaf5be2c584c0ec153fd516f5d13eada/zope_interface-8.5-cp313-cp313-macosx_10_9_x86_64.whl", hash = "sha256:28e80457c134d1fa57a7d758004dece348654e1b1467ac22dcdc20fc1d127c52", size = 212512, upload-time = "2026-05-26T06:49:38.996Z" }, + { url = "https://files.pythonhosted.org/packages/9a/2e/4360c54c465db042cc8fbeeec92abac28b4cedbf6ba63c1f092fd08a190f/zope_interface-8.5-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:09495ce9d559c06b70f2d4855b3e4f48a822a9ddc8be1d30c5b4e5be14ae1ace", size = 212541, upload-time = "2026-05-26T06:49:41.186Z" }, + { url = "https://files.pythonhosted.org/packages/aa/a5/692a2b8d70f78e848793231d5fae5fecbf8d0cccd73430fdc34802a6d3c1/zope_interface-8.5-cp313-cp313-manylinux1_i686.manylinux2014_i686.manylinux_2_17_i686.manylinux_2_5_i686.whl", hash = "sha256:7849ad8fa90763cc1087f4dda78ca3a233e950b3e08fac7079297c9cafbbd7bb", size = 265191, upload-time = "2026-05-26T06:49:43.449Z" }, + { url = "https://files.pythonhosted.org/packages/70/8d/454a9cfc7a050c394ab4f11b3371f7897828b7415e096afff724637e65e0/zope_interface-8.5-cp313-cp313-manylinux1_x86_64.manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:5578c9421ca409a1f39f153d6f7803e4cde01da592ec75a9ac5e1b777d18d33b", size = 270626, upload-time = "2026-05-26T06:49:45.425Z" }, + { url = "https://files.pythonhosted.org/packages/51/8c/db8409cfa3575b8e9b4800babd7d49f8228433cd1f0c56814bd0ada49c33/zope_interface-8.5-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:e1bd7d96b4ca5fa311f54c9eac16dce4886b428c1531dbe06067763ccdf123b4", size = 270444, upload-time = "2026-05-26T06:49:47.025Z" }, + { url = "https://files.pythonhosted.org/packages/4a/df/a386940e41469ef615e100a216d8b386521e9e598817147f87932ca203c4/zope_interface-8.5-cp313-cp313-win_amd64.whl", hash = "sha256:0c8123d2a4dfde2a613c7cb772605477724782c20bc2e0ad1d9435376a6a44a3", size = 215021, upload-time = "2026-05-26T06:49:48.478Z" }, + { url = "https://files.pythonhosted.org/packages/89/75/477eb5669b6b2a7a843decd1a075e9b1971a8720017654143a7183abd3d9/zope_interface-8.5-cp313-cp313-win_arm64.whl", hash = "sha256:6d02be14f3173c6c7288bc2fdf530090c01c3cf8764ad46c68024686f364278e", size = 213610, upload-time = "2026-05-26T06:49:50.01Z" }, + { url = "https://files.pythonhosted.org/packages/d4/19/5032e954827fdf02db2d2f49737ac4378bb9cfc2cd95a8f2e2a5ae2ec01a/zope_interface-8.5-cp314-cp314-macosx_10_9_x86_64.whl", hash = "sha256:ffaecf013251a89d0de6feb49a46eba48ad8cbbf8a40aeb6045e459e7bec6784", size = 212597, upload-time = "2026-05-26T06:49:51.63Z" }, + { url = "https://files.pythonhosted.org/packages/f1/53/3ef644012cf8a6a234a2d6134aab5a5c65ac5467c86296865501d4fbc406/zope_interface-8.5-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:126fa9d1c52295ae076d4cf968634f0a1826afa408a20808b57ff72877b8f69f", size = 212626, upload-time = "2026-05-26T06:49:53.236Z" }, + { url = "https://files.pythonhosted.org/packages/32/67/bc8b4f465d388039255003e230c284a175cedf1203c692f23cb7bff64efe/zope_interface-8.5-cp314-cp314-manylinux1_i686.manylinux2014_i686.manylinux_2_17_i686.manylinux_2_5_i686.whl", hash = "sha256:3090e3a663d20194756a59a272e0c8508b889341e31d5894223331fe6b4f9b21", size = 266827, upload-time = "2026-05-26T06:49:54.873Z" }, + { url = "https://files.pythonhosted.org/packages/a7/eb/37d05b935ede53d79690fecc8d201440084418e590bcfc05f384451c7593/zope_interface-8.5-cp314-cp314-manylinux1_x86_64.manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:9342fb74e2afefdb081bf1df727d209ea56995c6e13f5a0540e6d7aff4beafb8", size = 270139, upload-time = "2026-05-26T06:49:57.116Z" }, + { url = "https://files.pythonhosted.org/packages/8b/0b/fd0c54579e2ce8dc6cf1a757903f3374bc6fbda929a46af9e0f53cb0e5f0/zope_interface-8.5-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:6c54725d818f1b57a7efb8b16528326e1f3c257b602b32393fd255c45af8799d", size = 270338, upload-time = "2026-05-26T06:49:58.698Z" }, + { url = "https://files.pythonhosted.org/packages/c1/1d/c420dcd777bb761067ea92879ac766694a5ca78608185f1aecea64cbfc11/zope_interface-8.5-cp314-cp314-win_amd64.whl", hash = "sha256:29d74febbae1afeb6834c4ccbf42e242a673c860060f09e53142825270456140", size = 215789, upload-time = "2026-05-26T06:50:00.405Z" }, + { url = "https://files.pythonhosted.org/packages/62/94/50b5eb8f94e527edceac14f9955e58917424ea79bb572ddc18548561cbc2/zope_interface-8.5-cp314-cp314-win_arm64.whl", hash = "sha256:633c8c49396f38df030340797c533e9fe460d1b5d1e42d88e55e938e525f548c", size = 213757, upload-time = "2026-05-26T06:50:01.973Z" }, + { url = "https://files.pythonhosted.org/packages/17/6f/5d5f32c4dfcdb16ce2ec5363da686840f13c13e1a1214cb70b49e1cd6d9f/zope_interface-8.5-cp314-cp314t-macosx_10_9_x86_64.whl", hash = "sha256:133999820fdbae513c36c03d6f29ef87317aaa3edef39112222b155083664714", size = 213591, upload-time = "2026-05-26T06:50:03.529Z" }, + { url = "https://files.pythonhosted.org/packages/f3/55/de0c3459ff717fce3342f9a29464c281fdeb0d36c3171ee88d119d5f0650/zope_interface-8.5-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:8bd75c96966e573232f0599deaff717564828031c7f05563ccc1ac35c5ee0304", size = 213733, upload-time = "2026-05-26T06:50:05.101Z" }, + { url = "https://files.pythonhosted.org/packages/c2/95/d97430abd5ae9677e8b9295b58720c0064a5b557dbb6b8bf5928484cf0d8/zope_interface-8.5-cp314-cp314t-manylinux1_i686.manylinux2014_i686.manylinux_2_17_i686.manylinux_2_5_i686.whl", hash = "sha256:14b0e9799351d4c34fe99afd67f0cdd76e55ba15c66a98699d5fc22ea8241e08", size = 294905, upload-time = "2026-05-26T06:50:07.384Z" }, + { url = "https://files.pythonhosted.org/packages/41/ec/a0f8f3dad6e74992f4654bdd94802be0929eabca7b871cac3b6fbb5e961b/zope_interface-8.5-cp314-cp314t-manylinux1_x86_64.manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:0cd6a732ac84b94eb1ef9222a117347a27efd294ee16810ffdf7ecd307677ed5", size = 300885, upload-time = "2026-05-26T06:50:08.997Z" }, + { url = "https://files.pythonhosted.org/packages/0f/da/6881b48803a0ee8d23eb5efa30fce3ed218a2bd9de5758ce489d224fee81/zope_interface-8.5-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:798b7c87d0e59a7d5d086d642208d0d8700ff0d55c4029134b3c479c3bfb110f", size = 304672, upload-time = "2026-05-26T06:50:10.563Z" }, + { url = "https://files.pythonhosted.org/packages/2e/0e/b4c01320859ff1d585438bc231fd60bd258d096359bccf6654fecdf0cffb/zope_interface-8.5-cp314-cp314t-win_amd64.whl", hash = "sha256:0fc3a9d45f114d27eaa1e53beeb144533689edca8a9f66505b1e8e8b3f075e42", size = 217241, upload-time = "2026-05-26T06:50:12.171Z" }, +] + +[[package]] +name = "zstandard" +version = "0.25.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/fd/aa/3e0508d5a5dd96529cdc5a97011299056e14c6505b678fd58938792794b1/zstandard-0.25.0.tar.gz", hash = "sha256:7713e1179d162cf5c7906da876ec2ccb9c3a9dcbdffef0cc7f70c3667a205f0b", size = 711513, upload-time = "2025-09-14T22:15:54.002Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/2a/83/c3ca27c363d104980f1c9cee1101cc8ba724ac8c28a033ede6aab89585b1/zstandard-0.25.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:933b65d7680ea337180733cf9e87293cc5500cc0eb3fc8769f4d3c88d724ec5c", size = 795254, upload-time = "2025-09-14T22:16:26.137Z" }, + { url = "https://files.pythonhosted.org/packages/ac/4d/e66465c5411a7cf4866aeadc7d108081d8ceba9bc7abe6b14aa21c671ec3/zstandard-0.25.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:a3f79487c687b1fc69f19e487cd949bf3aae653d181dfb5fde3bf6d18894706f", size = 640559, upload-time = "2025-09-14T22:16:27.973Z" }, + { url = "https://files.pythonhosted.org/packages/12/56/354fe655905f290d3b147b33fe946b0f27e791e4b50a5f004c802cb3eb7b/zstandard-0.25.0-cp311-cp311-manylinux2010_i686.manylinux2014_i686.manylinux_2_12_i686.manylinux_2_17_i686.whl", hash = "sha256:0bbc9a0c65ce0eea3c34a691e3c4b6889f5f3909ba4822ab385fab9057099431", size = 5348020, upload-time = "2025-09-14T22:16:29.523Z" }, + { url = "https://files.pythonhosted.org/packages/3b/13/2b7ed68bd85e69a2069bcc72141d378f22cae5a0f3b353a2c8f50ef30c1b/zstandard-0.25.0-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:01582723b3ccd6939ab7b3a78622c573799d5d8737b534b86d0e06ac18dbde4a", size = 5058126, upload-time = "2025-09-14T22:16:31.811Z" }, + { url = "https://files.pythonhosted.org/packages/c9/dd/fdaf0674f4b10d92cb120ccff58bbb6626bf8368f00ebfd2a41ba4a0dc99/zstandard-0.25.0-cp311-cp311-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:5f1ad7bf88535edcf30038f6919abe087f606f62c00a87d7e33e7fc57cb69fcc", size = 5405390, upload-time = "2025-09-14T22:16:33.486Z" }, + { url = "https://files.pythonhosted.org/packages/0f/67/354d1555575bc2490435f90d67ca4dd65238ff2f119f30f72d5cde09c2ad/zstandard-0.25.0-cp311-cp311-manylinux2014_s390x.manylinux_2_17_s390x.whl", hash = "sha256:06acb75eebeedb77b69048031282737717a63e71e4ae3f77cc0c3b9508320df6", size = 5452914, upload-time = "2025-09-14T22:16:35.277Z" }, + { url = "https://files.pythonhosted.org/packages/bb/1f/e9cfd801a3f9190bf3e759c422bbfd2247db9d7f3d54a56ecde70137791a/zstandard-0.25.0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:9300d02ea7c6506f00e627e287e0492a5eb0371ec1670ae852fefffa6164b072", size = 5559635, upload-time = "2025-09-14T22:16:37.141Z" }, + { url = "https://files.pythonhosted.org/packages/21/88/5ba550f797ca953a52d708c8e4f380959e7e3280af029e38fbf47b55916e/zstandard-0.25.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:bfd06b1c5584b657a2892a6014c2f4c20e0db0208c159148fa78c65f7e0b0277", size = 5048277, upload-time = "2025-09-14T22:16:38.807Z" }, + { url = "https://files.pythonhosted.org/packages/46/c0/ca3e533b4fa03112facbe7fbe7779cb1ebec215688e5df576fe5429172e0/zstandard-0.25.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:f373da2c1757bb7f1acaf09369cdc1d51d84131e50d5fa9863982fd626466313", size = 5574377, upload-time = "2025-09-14T22:16:40.523Z" }, + { url = "https://files.pythonhosted.org/packages/12/9b/3fb626390113f272abd0799fd677ea33d5fc3ec185e62e6be534493c4b60/zstandard-0.25.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:6c0e5a65158a7946e7a7affa6418878ef97ab66636f13353b8502d7ea03c8097", size = 4961493, upload-time = "2025-09-14T22:16:43.3Z" }, + { url = "https://files.pythonhosted.org/packages/cb/d3/23094a6b6a4b1343b27ae68249daa17ae0651fcfec9ed4de09d14b940285/zstandard-0.25.0-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:c8e167d5adf59476fa3e37bee730890e389410c354771a62e3c076c86f9f7778", size = 5269018, upload-time = "2025-09-14T22:16:45.292Z" }, + { url = "https://files.pythonhosted.org/packages/8c/a7/bb5a0c1c0f3f4b5e9d5b55198e39de91e04ba7c205cc46fcb0f95f0383c1/zstandard-0.25.0-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:98750a309eb2f020da61e727de7d7ba3c57c97cf6213f6f6277bb7fb42a8e065", size = 5443672, upload-time = "2025-09-14T22:16:47.076Z" }, + { url = "https://files.pythonhosted.org/packages/27/22/503347aa08d073993f25109c36c8d9f029c7d5949198050962cb568dfa5e/zstandard-0.25.0-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:22a086cff1b6ceca18a8dd6096ec631e430e93a8e70a9ca5efa7561a00f826fa", size = 5822753, upload-time = "2025-09-14T22:16:49.316Z" }, + { url = "https://files.pythonhosted.org/packages/e2/be/94267dc6ee64f0f8ba2b2ae7c7a2df934a816baaa7291db9e1aa77394c3c/zstandard-0.25.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:72d35d7aa0bba323965da807a462b0966c91608ef3a48ba761678cb20ce5d8b7", size = 5366047, upload-time = "2025-09-14T22:16:51.328Z" }, + { url = "https://files.pythonhosted.org/packages/7b/a3/732893eab0a3a7aecff8b99052fecf9f605cf0fb5fb6d0290e36beee47a4/zstandard-0.25.0-cp311-cp311-win32.whl", hash = "sha256:f5aeea11ded7320a84dcdd62a3d95b5186834224a9e55b92ccae35d21a8b63d4", size = 436484, upload-time = "2025-09-14T22:16:55.005Z" }, + { url = "https://files.pythonhosted.org/packages/43/a3/c6155f5c1cce691cb80dfd38627046e50af3ee9ddc5d0b45b9b063bfb8c9/zstandard-0.25.0-cp311-cp311-win_amd64.whl", hash = "sha256:daab68faadb847063d0c56f361a289c4f268706b598afbf9ad113cbe5c38b6b2", size = 506183, upload-time = "2025-09-14T22:16:52.753Z" }, + { url = "https://files.pythonhosted.org/packages/8c/3e/8945ab86a0820cc0e0cdbf38086a92868a9172020fdab8a03ac19662b0e5/zstandard-0.25.0-cp311-cp311-win_arm64.whl", hash = "sha256:22a06c5df3751bb7dc67406f5374734ccee8ed37fc5981bf1ad7041831fa1137", size = 462533, upload-time = "2025-09-14T22:16:53.878Z" }, + { url = "https://files.pythonhosted.org/packages/82/fc/f26eb6ef91ae723a03e16eddb198abcfce2bc5a42e224d44cc8b6765e57e/zstandard-0.25.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:7b3c3a3ab9daa3eed242d6ecceead93aebbb8f5f84318d82cee643e019c4b73b", size = 795738, upload-time = "2025-09-14T22:16:56.237Z" }, + { url = "https://files.pythonhosted.org/packages/aa/1c/d920d64b22f8dd028a8b90e2d756e431a5d86194caa78e3819c7bf53b4b3/zstandard-0.25.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:913cbd31a400febff93b564a23e17c3ed2d56c064006f54efec210d586171c00", size = 640436, upload-time = "2025-09-14T22:16:57.774Z" }, + { url = "https://files.pythonhosted.org/packages/53/6c/288c3f0bd9fcfe9ca41e2c2fbfd17b2097f6af57b62a81161941f09afa76/zstandard-0.25.0-cp312-cp312-manylinux2010_i686.manylinux2014_i686.manylinux_2_12_i686.manylinux_2_17_i686.whl", hash = "sha256:011d388c76b11a0c165374ce660ce2c8efa8e5d87f34996aa80f9c0816698b64", size = 5343019, upload-time = "2025-09-14T22:16:59.302Z" }, + { url = "https://files.pythonhosted.org/packages/1e/15/efef5a2f204a64bdb5571e6161d49f7ef0fffdbca953a615efbec045f60f/zstandard-0.25.0-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:6dffecc361d079bb48d7caef5d673c88c8988d3d33fb74ab95b7ee6da42652ea", size = 5063012, upload-time = "2025-09-14T22:17:01.156Z" }, + { url = "https://files.pythonhosted.org/packages/b7/37/a6ce629ffdb43959e92e87ebdaeebb5ac81c944b6a75c9c47e300f85abdf/zstandard-0.25.0-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:7149623bba7fdf7e7f24312953bcf73cae103db8cae49f8154dd1eadc8a29ecb", size = 5394148, upload-time = "2025-09-14T22:17:03.091Z" }, + { url = "https://files.pythonhosted.org/packages/e3/79/2bf870b3abeb5c070fe2d670a5a8d1057a8270f125ef7676d29ea900f496/zstandard-0.25.0-cp312-cp312-manylinux2014_s390x.manylinux_2_17_s390x.whl", hash = "sha256:6a573a35693e03cf1d67799fd01b50ff578515a8aeadd4595d2a7fa9f3ec002a", size = 5451652, upload-time = "2025-09-14T22:17:04.979Z" }, + { url = "https://files.pythonhosted.org/packages/53/60/7be26e610767316c028a2cbedb9a3beabdbe33e2182c373f71a1c0b88f36/zstandard-0.25.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:5a56ba0db2d244117ed744dfa8f6f5b366e14148e00de44723413b2f3938a902", size = 5546993, upload-time = "2025-09-14T22:17:06.781Z" }, + { url = "https://files.pythonhosted.org/packages/85/c7/3483ad9ff0662623f3648479b0380d2de5510abf00990468c286c6b04017/zstandard-0.25.0-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:10ef2a79ab8e2974e2075fb984e5b9806c64134810fac21576f0668e7ea19f8f", size = 5046806, upload-time = "2025-09-14T22:17:08.415Z" }, + { url = "https://files.pythonhosted.org/packages/08/b3/206883dd25b8d1591a1caa44b54c2aad84badccf2f1de9e2d60a446f9a25/zstandard-0.25.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:aaf21ba8fb76d102b696781bddaa0954b782536446083ae3fdaa6f16b25a1c4b", size = 5576659, upload-time = "2025-09-14T22:17:10.164Z" }, + { url = "https://files.pythonhosted.org/packages/9d/31/76c0779101453e6c117b0ff22565865c54f48f8bd807df2b00c2c404b8e0/zstandard-0.25.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:1869da9571d5e94a85a5e8d57e4e8807b175c9e4a6294e3b66fa4efb074d90f6", size = 4953933, upload-time = "2025-09-14T22:17:11.857Z" }, + { url = "https://files.pythonhosted.org/packages/18/e1/97680c664a1bf9a247a280a053d98e251424af51f1b196c6d52f117c9720/zstandard-0.25.0-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:809c5bcb2c67cd0ed81e9229d227d4ca28f82d0f778fc5fea624a9def3963f91", size = 5268008, upload-time = "2025-09-14T22:17:13.627Z" }, + { url = "https://files.pythonhosted.org/packages/1e/73/316e4010de585ac798e154e88fd81bb16afc5c5cb1a72eeb16dd37e8024a/zstandard-0.25.0-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:f27662e4f7dbf9f9c12391cb37b4c4c3cb90ffbd3b1fb9284dadbbb8935fa708", size = 5433517, upload-time = "2025-09-14T22:17:16.103Z" }, + { url = "https://files.pythonhosted.org/packages/5b/60/dd0f8cfa8129c5a0ce3ea6b7f70be5b33d2618013a161e1ff26c2b39787c/zstandard-0.25.0-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:99c0c846e6e61718715a3c9437ccc625de26593fea60189567f0118dc9db7512", size = 5814292, upload-time = "2025-09-14T22:17:17.827Z" }, + { url = "https://files.pythonhosted.org/packages/fc/5f/75aafd4b9d11b5407b641b8e41a57864097663699f23e9ad4dbb91dc6bfe/zstandard-0.25.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:474d2596a2dbc241a556e965fb76002c1ce655445e4e3bf38e5477d413165ffa", size = 5360237, upload-time = "2025-09-14T22:17:19.954Z" }, + { url = "https://files.pythonhosted.org/packages/ff/8d/0309daffea4fcac7981021dbf21cdb2e3427a9e76bafbcdbdf5392ff99a4/zstandard-0.25.0-cp312-cp312-win32.whl", hash = "sha256:23ebc8f17a03133b4426bcc04aabd68f8236eb78c3760f12783385171b0fd8bd", size = 436922, upload-time = "2025-09-14T22:17:24.398Z" }, + { url = "https://files.pythonhosted.org/packages/79/3b/fa54d9015f945330510cb5d0b0501e8253c127cca7ebe8ba46a965df18c5/zstandard-0.25.0-cp312-cp312-win_amd64.whl", hash = "sha256:ffef5a74088f1e09947aecf91011136665152e0b4b359c42be3373897fb39b01", size = 506276, upload-time = "2025-09-14T22:17:21.429Z" }, + { url = "https://files.pythonhosted.org/packages/ea/6b/8b51697e5319b1f9ac71087b0af9a40d8a6288ff8025c36486e0c12abcc4/zstandard-0.25.0-cp312-cp312-win_arm64.whl", hash = "sha256:181eb40e0b6a29b3cd2849f825e0fa34397f649170673d385f3598ae17cca2e9", size = 462679, upload-time = "2025-09-14T22:17:23.147Z" }, + { url = "https://files.pythonhosted.org/packages/35/0b/8df9c4ad06af91d39e94fa96cc010a24ac4ef1378d3efab9223cc8593d40/zstandard-0.25.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:ec996f12524f88e151c339688c3897194821d7f03081ab35d31d1e12ec975e94", size = 795735, upload-time = "2025-09-14T22:17:26.042Z" }, + { url = "https://files.pythonhosted.org/packages/3f/06/9ae96a3e5dcfd119377ba33d4c42a7d89da1efabd5cb3e366b156c45ff4d/zstandard-0.25.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:a1a4ae2dec3993a32247995bdfe367fc3266da832d82f8438c8570f989753de1", size = 640440, upload-time = "2025-09-14T22:17:27.366Z" }, + { url = "https://files.pythonhosted.org/packages/d9/14/933d27204c2bd404229c69f445862454dcc101cd69ef8c6068f15aaec12c/zstandard-0.25.0-cp313-cp313-manylinux2010_i686.manylinux2014_i686.manylinux_2_12_i686.manylinux_2_17_i686.whl", hash = "sha256:e96594a5537722fdfb79951672a2a63aec5ebfb823e7560586f7484819f2a08f", size = 5343070, upload-time = "2025-09-14T22:17:28.896Z" }, + { url = "https://files.pythonhosted.org/packages/6d/db/ddb11011826ed7db9d0e485d13df79b58586bfdec56e5c84a928a9a78c1c/zstandard-0.25.0-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:bfc4e20784722098822e3eee42b8e576b379ed72cca4a7cb856ae733e62192ea", size = 5063001, upload-time = "2025-09-14T22:17:31.044Z" }, + { url = "https://files.pythonhosted.org/packages/db/00/87466ea3f99599d02a5238498b87bf84a6348290c19571051839ca943777/zstandard-0.25.0-cp313-cp313-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:457ed498fc58cdc12fc48f7950e02740d4f7ae9493dd4ab2168a47c93c31298e", size = 5394120, upload-time = "2025-09-14T22:17:32.711Z" }, + { url = "https://files.pythonhosted.org/packages/2b/95/fc5531d9c618a679a20ff6c29e2b3ef1d1f4ad66c5e161ae6ff847d102a9/zstandard-0.25.0-cp313-cp313-manylinux2014_s390x.manylinux_2_17_s390x.whl", hash = "sha256:fd7a5004eb1980d3cefe26b2685bcb0b17989901a70a1040d1ac86f1d898c551", size = 5451230, upload-time = "2025-09-14T22:17:34.41Z" }, + { url = "https://files.pythonhosted.org/packages/63/4b/e3678b4e776db00f9f7b2fe58e547e8928ef32727d7a1ff01dea010f3f13/zstandard-0.25.0-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:8e735494da3db08694d26480f1493ad2cf86e99bdd53e8e9771b2752a5c0246a", size = 5547173, upload-time = "2025-09-14T22:17:36.084Z" }, + { url = "https://files.pythonhosted.org/packages/4e/d5/ba05ed95c6b8ec30bd468dfeab20589f2cf709b5c940483e31d991f2ca58/zstandard-0.25.0-cp313-cp313-musllinux_1_1_aarch64.whl", hash = "sha256:3a39c94ad7866160a4a46d772e43311a743c316942037671beb264e395bdd611", size = 5046736, upload-time = "2025-09-14T22:17:37.891Z" }, + { url = "https://files.pythonhosted.org/packages/50/d5/870aa06b3a76c73eced65c044b92286a3c4e00554005ff51962deef28e28/zstandard-0.25.0-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:172de1f06947577d3a3005416977cce6168f2261284c02080e7ad0185faeced3", size = 5576368, upload-time = "2025-09-14T22:17:40.206Z" }, + { url = "https://files.pythonhosted.org/packages/5d/35/398dc2ffc89d304d59bc12f0fdd931b4ce455bddf7038a0a67733a25f550/zstandard-0.25.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:3c83b0188c852a47cd13ef3bf9209fb0a77fa5374958b8c53aaa699398c6bd7b", size = 4954022, upload-time = "2025-09-14T22:17:41.879Z" }, + { url = "https://files.pythonhosted.org/packages/9a/5c/36ba1e5507d56d2213202ec2b05e8541734af5f2ce378c5d1ceaf4d88dc4/zstandard-0.25.0-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:1673b7199bbe763365b81a4f3252b8e80f44c9e323fc42940dc8843bfeaf9851", size = 5267889, upload-time = "2025-09-14T22:17:43.577Z" }, + { url = "https://files.pythonhosted.org/packages/70/e8/2ec6b6fb7358b2ec0113ae202647ca7c0e9d15b61c005ae5225ad0995df5/zstandard-0.25.0-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:0be7622c37c183406f3dbf0cba104118eb16a4ea7359eeb5752f0794882fc250", size = 5433952, upload-time = "2025-09-14T22:17:45.271Z" }, + { url = "https://files.pythonhosted.org/packages/7b/01/b5f4d4dbc59ef193e870495c6f1275f5b2928e01ff5a81fecb22a06e22fb/zstandard-0.25.0-cp313-cp313-musllinux_1_2_s390x.whl", hash = "sha256:5f5e4c2a23ca271c218ac025bd7d635597048b366d6f31f420aaeb715239fc98", size = 5814054, upload-time = "2025-09-14T22:17:47.08Z" }, + { url = "https://files.pythonhosted.org/packages/b2/e5/fbd822d5c6f427cf158316d012c5a12f233473c2f9c5fe5ab1ae5d21f3d8/zstandard-0.25.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:4f187a0bb61b35119d1926aee039524d1f93aaf38a9916b8c4b78ac8514a0aaf", size = 5360113, upload-time = "2025-09-14T22:17:48.893Z" }, + { url = "https://files.pythonhosted.org/packages/8e/e0/69a553d2047f9a2c7347caa225bb3a63b6d7704ad74610cb7823baa08ed7/zstandard-0.25.0-cp313-cp313-win32.whl", hash = "sha256:7030defa83eef3e51ff26f0b7bfb229f0204b66fe18e04359ce3474ac33cbc09", size = 436936, upload-time = "2025-09-14T22:17:52.658Z" }, + { url = "https://files.pythonhosted.org/packages/d9/82/b9c06c870f3bd8767c201f1edbdf9e8dc34be5b0fbc5682c4f80fe948475/zstandard-0.25.0-cp313-cp313-win_amd64.whl", hash = "sha256:1f830a0dac88719af0ae43b8b2d6aef487d437036468ef3c2ea59c51f9d55fd5", size = 506232, upload-time = "2025-09-14T22:17:50.402Z" }, + { url = "https://files.pythonhosted.org/packages/d4/57/60c3c01243bb81d381c9916e2a6d9e149ab8627c0c7d7abb2d73384b3c0c/zstandard-0.25.0-cp313-cp313-win_arm64.whl", hash = "sha256:85304a43f4d513f5464ceb938aa02c1e78c2943b29f44a750b48b25ac999a049", size = 462671, upload-time = "2025-09-14T22:17:51.533Z" }, + { url = "https://files.pythonhosted.org/packages/3d/5c/f8923b595b55fe49e30612987ad8bf053aef555c14f05bb659dd5dbe3e8a/zstandard-0.25.0-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:e29f0cf06974c899b2c188ef7f783607dbef36da4c242eb6c82dcd8b512855e3", size = 795887, upload-time = "2025-09-14T22:17:54.198Z" }, + { url = "https://files.pythonhosted.org/packages/8d/09/d0a2a14fc3439c5f874042dca72a79c70a532090b7ba0003be73fee37ae2/zstandard-0.25.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:05df5136bc5a011f33cd25bc9f506e7426c0c9b3f9954f056831ce68f3b6689f", size = 640658, upload-time = "2025-09-14T22:17:55.423Z" }, + { url = "https://files.pythonhosted.org/packages/5d/7c/8b6b71b1ddd517f68ffb55e10834388d4f793c49c6b83effaaa05785b0b4/zstandard-0.25.0-cp314-cp314-manylinux2010_i686.manylinux_2_12_i686.manylinux_2_28_i686.whl", hash = "sha256:f604efd28f239cc21b3adb53eb061e2a205dc164be408e553b41ba2ffe0ca15c", size = 5379849, upload-time = "2025-09-14T22:17:57.372Z" }, + { url = "https://files.pythonhosted.org/packages/a4/86/a48e56320d0a17189ab7a42645387334fba2200e904ee47fc5a26c1fd8ca/zstandard-0.25.0-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:223415140608d0f0da010499eaa8ccdb9af210a543fac54bce15babbcfc78439", size = 5058095, upload-time = "2025-09-14T22:17:59.498Z" }, + { url = "https://files.pythonhosted.org/packages/f8/ad/eb659984ee2c0a779f9d06dbfe45e2dc39d99ff40a319895df2d3d9a48e5/zstandard-0.25.0-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:2e54296a283f3ab5a26fc9b8b5d4978ea0532f37b231644f367aa588930aa043", size = 5551751, upload-time = "2025-09-14T22:18:01.618Z" }, + { url = "https://files.pythonhosted.org/packages/61/b3/b637faea43677eb7bd42ab204dfb7053bd5c4582bfe6b1baefa80ac0c47b/zstandard-0.25.0-cp314-cp314-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:ca54090275939dc8ec5dea2d2afb400e0f83444b2fc24e07df7fdef677110859", size = 6364818, upload-time = "2025-09-14T22:18:03.769Z" }, + { url = "https://files.pythonhosted.org/packages/31/dc/cc50210e11e465c975462439a492516a73300ab8caa8f5e0902544fd748b/zstandard-0.25.0-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:e09bb6252b6476d8d56100e8147b803befa9a12cea144bbe629dd508800d1ad0", size = 5560402, upload-time = "2025-09-14T22:18:05.954Z" }, + { url = "https://files.pythonhosted.org/packages/c9/ae/56523ae9c142f0c08efd5e868a6da613ae76614eca1305259c3bf6a0ed43/zstandard-0.25.0-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:a9ec8c642d1ec73287ae3e726792dd86c96f5681eb8df274a757bf62b750eae7", size = 4955108, upload-time = "2025-09-14T22:18:07.68Z" }, + { url = "https://files.pythonhosted.org/packages/98/cf/c899f2d6df0840d5e384cf4c4121458c72802e8bda19691f3b16619f51e9/zstandard-0.25.0-cp314-cp314-musllinux_1_2_i686.whl", hash = "sha256:a4089a10e598eae6393756b036e0f419e8c1d60f44a831520f9af41c14216cf2", size = 5269248, upload-time = "2025-09-14T22:18:09.753Z" }, + { url = "https://files.pythonhosted.org/packages/1b/c0/59e912a531d91e1c192d3085fc0f6fb2852753c301a812d856d857ea03c6/zstandard-0.25.0-cp314-cp314-musllinux_1_2_ppc64le.whl", hash = "sha256:f67e8f1a324a900e75b5e28ffb152bcac9fbed1cc7b43f99cd90f395c4375344", size = 5430330, upload-time = "2025-09-14T22:18:11.966Z" }, + { url = "https://files.pythonhosted.org/packages/a0/1d/7e31db1240de2df22a58e2ea9a93fc6e38cc29353e660c0272b6735d6669/zstandard-0.25.0-cp314-cp314-musllinux_1_2_s390x.whl", hash = "sha256:9654dbc012d8b06fc3d19cc825af3f7bf8ae242226df5f83936cb39f5fdc846c", size = 5811123, upload-time = "2025-09-14T22:18:13.907Z" }, + { url = "https://files.pythonhosted.org/packages/f6/49/fac46df5ad353d50535e118d6983069df68ca5908d4d65b8c466150a4ff1/zstandard-0.25.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:4203ce3b31aec23012d3a4cf4a2ed64d12fea5269c49aed5e4c3611b938e4088", size = 5359591, upload-time = "2025-09-14T22:18:16.465Z" }, + { url = "https://files.pythonhosted.org/packages/c2/38/f249a2050ad1eea0bb364046153942e34abba95dd5520af199aed86fbb49/zstandard-0.25.0-cp314-cp314-win32.whl", hash = "sha256:da469dc041701583e34de852d8634703550348d5822e66a0c827d39b05365b12", size = 444513, upload-time = "2025-09-14T22:18:20.61Z" }, + { url = "https://files.pythonhosted.org/packages/3a/43/241f9615bcf8ba8903b3f0432da069e857fc4fd1783bd26183db53c4804b/zstandard-0.25.0-cp314-cp314-win_amd64.whl", hash = "sha256:c19bcdd826e95671065f8692b5a4aa95c52dc7a02a4c5a0cac46deb879a017a2", size = 516118, upload-time = "2025-09-14T22:18:17.849Z" }, + { url = "https://files.pythonhosted.org/packages/f0/ef/da163ce2450ed4febf6467d77ccb4cd52c4c30ab45624bad26ca0a27260c/zstandard-0.25.0-cp314-cp314-win_arm64.whl", hash = "sha256:d7541afd73985c630bafcd6338d2518ae96060075f9463d7dc14cfb33514383d", size = 476940, upload-time = "2025-09-14T22:18:19.088Z" }, +] From 235ca9b8c39d2bcf7218b0e9bd4a3af354f5826b Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 28 May 2026 15:42:31 -0700 Subject: [PATCH 237/591] Example env vars --- mpcontribs-api/.env.example | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 mpcontribs-api/.env.example diff --git a/mpcontribs-api/.env.example b/mpcontribs-api/.env.example new file mode 100644 index 0000000000..f560aed0dd --- /dev/null +++ b/mpcontribs-api/.env.example @@ -0,0 +1,11 @@ +MPCONTRIBS_ENVIRONMENT=dev + +MPCONTRIBS_MONGO__URI=mongodb+srv://:@host.hash.mongodb.net/?appName=database-name +MPCONTRIBS_MONGO__DB_NAME=database-name + +MPCONTRIBS_REDIS_ADDRESS=redis-address +MPCONTRIBS_REDIS_URL=redis-url + +MPCONTRIBS_MAIL_DEFAULT_SENDER=mail-default-sender + +MPCONTRIBS_VERSION=version From 55226ff764e9ef08b3f2509a95d8d7f53f20fd83 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 28 May 2026 15:43:11 -0700 Subject: [PATCH 238/591] Moved to a src/proj style repo. Began creating fastapi server --- .../mpcontribs_api}/__init__.py | 0 .../mpcontribs_api/api/v1}/__init__.py | 0 .../src/mpcontribs_api/api/v1/router.py | 5 + mpcontribs-api/src/mpcontribs_api/app.py | 71 +++++++++++ mpcontribs-api/src/mpcontribs_api/config.py | 66 +++++++++++ mpcontribs-api/src/mpcontribs_api/db.py | 11 ++ .../mpcontribs_api/dependencies.py} | 0 .../domains/contributions/models.py | 0 .../domains/contributions/repository.py | 0 .../domains/contributions/router.py | 0 .../domains/contributions/service.py | 0 .../mpcontribs_api/domains/projects/models.py | 0 .../domains/projects/repository.py | 0 .../mpcontribs_api/domains/projects/router.py | 0 .../domains/projects/service.py | 0 .../src/mpcontribs_api/exceptions.py | 111 ++++++++++++++++++ mpcontribs-api/src/mpcontribs_api/logging.py | 77 ++++++++++++ .../src/mpcontribs_api/middleware.py | 14 +++ mpcontribs-api/src/mpcontribs_api/models.py | 0 .../mpcontribs_api/old}/__init__.py | 25 ++-- .../old}/attachments/__init__.py | 0 .../old}/attachments/document.py | 0 .../mpcontribs_api/old}/attachments/views.py | 0 .../api => src/mpcontribs_api/old}/config.py | 0 .../old/contributions/__init__.py | 0 .../old}/contributions/document.py | 0 .../old}/contributions/formulae.json.gz | 0 .../old}/contributions/generate_formulae.py | 0 .../old}/contributions/views.py | 0 .../api => src/mpcontribs_api/old}/core.py | 0 .../mpcontribs_api/old}/dashboard.cfg | 0 .../mpcontribs_api/old}/notebooks/__init__.py | 0 .../mpcontribs_api/old}/notebooks/document.py | 0 .../mpcontribs_api/old}/notebooks/views.py | 0 .../mpcontribs_api/old/projects/__init__.py | 0 .../mpcontribs_api/old}/projects/document.py | 0 .../mpcontribs_api/old}/projects/views.py | 0 .../mpcontribs_api/old/structures/__init__.py | 0 .../old}/structures/document.py | 0 .../mpcontribs_api/old}/structures/views.py | 0 .../mpcontribs_api/old}/tables/__init__.py | 0 .../mpcontribs_api/old}/tables/document.py | 0 .../mpcontribs_api/old}/tables/views.py | 0 .../old}/templates/admin_email.html | 0 .../old}/templates/card_bootstrap.html | 0 .../old}/templates/card_bulma.html | 0 .../old}/templates/owner_email.html | 0 mpcontribs-api/src/mpcontribs_api/types.py | 0 48 files changed, 367 insertions(+), 13 deletions(-) rename mpcontribs-api/{mpcontribs/api/contributions => src/mpcontribs_api}/__init__.py (100%) rename mpcontribs-api/{mpcontribs/api/projects => src/mpcontribs_api/api/v1}/__init__.py (100%) create mode 100644 mpcontribs-api/src/mpcontribs_api/api/v1/router.py create mode 100644 mpcontribs-api/src/mpcontribs_api/app.py create mode 100644 mpcontribs-api/src/mpcontribs_api/config.py create mode 100644 mpcontribs-api/src/mpcontribs_api/db.py rename mpcontribs-api/{mpcontribs/api/structures/__init__.py => src/mpcontribs_api/dependencies.py} (100%) create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/projects/models.py create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/projects/router.py create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/projects/service.py create mode 100644 mpcontribs-api/src/mpcontribs_api/exceptions.py create mode 100644 mpcontribs-api/src/mpcontribs_api/logging.py create mode 100644 mpcontribs-api/src/mpcontribs_api/middleware.py create mode 100644 mpcontribs-api/src/mpcontribs_api/models.py rename mpcontribs-api/{mpcontribs/api => src/mpcontribs_api/old}/__init__.py (98%) rename mpcontribs-api/{mpcontribs/api => src/mpcontribs_api/old}/attachments/__init__.py (100%) rename mpcontribs-api/{mpcontribs/api => src/mpcontribs_api/old}/attachments/document.py (100%) rename mpcontribs-api/{mpcontribs/api => src/mpcontribs_api/old}/attachments/views.py (100%) rename mpcontribs-api/{mpcontribs/api => src/mpcontribs_api/old}/config.py (100%) create mode 100644 mpcontribs-api/src/mpcontribs_api/old/contributions/__init__.py rename mpcontribs-api/{mpcontribs/api => src/mpcontribs_api/old}/contributions/document.py (100%) rename mpcontribs-api/{mpcontribs/api => src/mpcontribs_api/old}/contributions/formulae.json.gz (100%) rename mpcontribs-api/{mpcontribs/api => src/mpcontribs_api/old}/contributions/generate_formulae.py (100%) rename mpcontribs-api/{mpcontribs/api => src/mpcontribs_api/old}/contributions/views.py (100%) rename mpcontribs-api/{mpcontribs/api => src/mpcontribs_api/old}/core.py (100%) rename mpcontribs-api/{mpcontribs/api => src/mpcontribs_api/old}/dashboard.cfg (100%) rename mpcontribs-api/{mpcontribs/api => src/mpcontribs_api/old}/notebooks/__init__.py (100%) rename mpcontribs-api/{mpcontribs/api => src/mpcontribs_api/old}/notebooks/document.py (100%) rename mpcontribs-api/{mpcontribs/api => src/mpcontribs_api/old}/notebooks/views.py (100%) create mode 100644 mpcontribs-api/src/mpcontribs_api/old/projects/__init__.py rename mpcontribs-api/{mpcontribs/api => src/mpcontribs_api/old}/projects/document.py (100%) rename mpcontribs-api/{mpcontribs/api => src/mpcontribs_api/old}/projects/views.py (100%) create mode 100644 mpcontribs-api/src/mpcontribs_api/old/structures/__init__.py rename mpcontribs-api/{mpcontribs/api => src/mpcontribs_api/old}/structures/document.py (100%) rename mpcontribs-api/{mpcontribs/api => src/mpcontribs_api/old}/structures/views.py (100%) rename mpcontribs-api/{mpcontribs/api => src/mpcontribs_api/old}/tables/__init__.py (100%) rename mpcontribs-api/{mpcontribs/api => src/mpcontribs_api/old}/tables/document.py (100%) rename mpcontribs-api/{mpcontribs/api => src/mpcontribs_api/old}/tables/views.py (100%) rename mpcontribs-api/{mpcontribs/api => src/mpcontribs_api/old}/templates/admin_email.html (100%) rename mpcontribs-api/{mpcontribs/api => src/mpcontribs_api/old}/templates/card_bootstrap.html (100%) rename mpcontribs-api/{mpcontribs/api => src/mpcontribs_api/old}/templates/card_bulma.html (100%) rename mpcontribs-api/{mpcontribs/api => src/mpcontribs_api/old}/templates/owner_email.html (100%) create mode 100644 mpcontribs-api/src/mpcontribs_api/types.py diff --git a/mpcontribs-api/mpcontribs/api/contributions/__init__.py b/mpcontribs-api/src/mpcontribs_api/__init__.py similarity index 100% rename from mpcontribs-api/mpcontribs/api/contributions/__init__.py rename to mpcontribs-api/src/mpcontribs_api/__init__.py diff --git a/mpcontribs-api/mpcontribs/api/projects/__init__.py b/mpcontribs-api/src/mpcontribs_api/api/v1/__init__.py similarity index 100% rename from mpcontribs-api/mpcontribs/api/projects/__init__.py rename to mpcontribs-api/src/mpcontribs_api/api/v1/__init__.py diff --git a/mpcontribs-api/src/mpcontribs_api/api/v1/router.py b/mpcontribs-api/src/mpcontribs_api/api/v1/router.py new file mode 100644 index 0000000000..456aa8f29d --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/api/v1/router.py @@ -0,0 +1,5 @@ +from fastapi import APIRouter + +router = APIRouter(prefix="api/v1") + +router. diff --git a/mpcontribs-api/src/mpcontribs_api/app.py b/mpcontribs-api/src/mpcontribs_api/app.py new file mode 100644 index 0000000000..6994b6cb23 --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/app.py @@ -0,0 +1,71 @@ +from __future__ import annotations + +import logging +from contextlib import asynccontextmanager +from typing import AsyncGenerator + +from fastapi import FastAPI +from pymongo import AsyncMongoClient +from starlette.middleware.base import BaseHTTPMiddleware + +from mpcontribs_api.api.v1.router import router as v1_router +from mpcontribs_api.config import Settings, get_settings +from mpcontribs_api.exceptions import register_exception_handlers +from mpcontribs_api.logging import configure_logging +from src.mpcontribs_api.middleware import bind_request_context + +logger = logging.getLogger(__name__) + + +def _build_lifespan(settings: Settings): + @asynccontextmanager + async def lifespan(app: FastAPI) -> AsyncGenerator[None]: + # --- startup --- + client = AsyncMongoClient( + str(settings.mongo.uri), + maxPoolSize=settings.mongo.max_pool_size, + minPoolSize=settings.mongo.min_pool_size, + serverSelectionTimeoutMS=settings.mongo.server_selection_timeout_ms, + uuidRepresentation="standard", + ) + # Fail fast in prod if the DB is unreachable. Cheap, one round-trip. + await client.admin.command("ping") + logger.info("connected to mongo", extra={"db": settings.mongo.db_name}) + + app.state.mongo_client = client + app.state.db = client[settings.mongo.db_name] + + try: + yield + finally: + # --- shutdown --- + await client.close() + logger.info("mongo client closed") + + return lifespan + + +def create_app(settings: Settings | None = None) -> FastAPI: + settings = settings or get_settings() + configure_logging(settings) + + app = FastAPI( + title="mpcontribs-api", + version=settings.version, + debug=False if settings.environment == "prod" else True, + # Would be nice to implement eventually + # default_response_class=DefaultResponse, + lifespan=_build_lifespan(settings), + ) + + # Add request context to logs + app.add_middleware(BaseHTTPMiddleware, dispatch=bind_request_context) + # Bind exception handlers + register_exception_handlers(app) + app.include_router(v1_router, prefix="/api/v1") + + return app + + +# For `uvicorn mpcontribs_api.app:app`. Tests use create_app() directly. +app = create_app() diff --git a/mpcontribs-api/src/mpcontribs_api/config.py b/mpcontribs-api/src/mpcontribs_api/config.py new file mode 100644 index 0000000000..81171037aa --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/config.py @@ -0,0 +1,66 @@ +from functools import lru_cache +from typing import Literal + +from pydantic import BaseModel, Field, SecretStr +from pydantic_settings import BaseSettings, SettingsConfigDict + + +class MongoSettings(BaseModel): + """MongoDB settings. + + Provided defaults are the defaults of AsyncMongoClient + """ + + uri: SecretStr = Field( + description="The full uri from MongoDB (username and password included)" + ) + db_name: str + max_pool_size: int = Field( + default=100, + description="Maximum number of allowed concurrent connection to each server. Can be '0' or 'None', both of which allow any number of connections", + ) + min_pool_size: int = Field( + default=0, + description="Minimum number of concurent connections that the pool will maintain connected to each server", + ) + datetime_conversion: Literal[ + "datetime_ms", "datetime", "datetime_auto", "datetime_clamp" + ] = Field( + default="datetime", + description="Specifies how UTC datetimes should be decoded within BSON", + ) + server_selection_timeout_ms: int = Field( + default=30000, + description="Controls how long (in milliseconds) the driver will wait to find an available, appropriate server to carry out a database operation;" + "while it is waiting, multiple server monitoring operations may be carried out", + ) + + +class Settings(BaseSettings): + model_config = SettingsConfigDict( + env_file=".env", + env_nested_delimiter="__", + env_prefix="MPCONTRIBS_", + ) + + environment: Literal["dev", "prod"] + + mongo: MongoSettings + + # Redis settings + redis_address: SecretStr + redis_url: SecretStr + + # SMTP Settings + mail_default_sender: str = Field( + description="SMTP Server to send out notifications on new projects and other important moments" + ) + + # General/Informative settings + version: str + + +@lru_cache +def get_settings() -> Settings: + # Fields are populated from env vars at runtime, not from arguments - pyright can't see that + return Settings() # pyright: ignore[reportCallIssue] diff --git a/mpcontribs-api/src/mpcontribs_api/db.py b/mpcontribs-api/src/mpcontribs_api/db.py new file mode 100644 index 0000000000..afd11748c4 --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/db.py @@ -0,0 +1,11 @@ +from typing import Annotated + +from fastapi import Depends, Request +from pymongo.asynchronous.database import AsyncDatabase + + +def get_db(request: Request) -> AsyncDatabase: + return request.app.state.db + + +DbDep = Annotated[AsyncDatabase, Depends(get_db)] diff --git a/mpcontribs-api/mpcontribs/api/structures/__init__.py b/mpcontribs-api/src/mpcontribs_api/dependencies.py similarity index 100% rename from mpcontribs-api/mpcontribs/api/structures/__init__.py rename to mpcontribs-api/src/mpcontribs_api/dependencies.py diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/service.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/service.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/mpcontribs-api/src/mpcontribs_api/exceptions.py b/mpcontribs-api/src/mpcontribs_api/exceptions.py new file mode 100644 index 0000000000..6d62085443 --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/exceptions.py @@ -0,0 +1,111 @@ +from __future__ import annotations + +from typing import Any + +import structlog +from fastapi import FastAPI, Request +from fastapi.exceptions import RequestValidationError +from fastapi.responses import JSONResponse +from starlette.exceptions import HTTPException as StarletteHTTPException + +logger = structlog.get_logger(__name__) + + +class AppError(Exception): + """Base for all application-level domain errors. + + Carries enough structured context for a handler to build an HTTP + response without the raising code knowing anything about HTTP. + """ + + # Subclasses override these. Kept as class attrs so a handler can read + # them off the type without instantiating special-casing. + status_code: int = 500 + error_code: str = "internal_error" # stable, machine-readable + + def __init__(self, message: str | None = None, **context): + self.message = message or self.__class__.__name__ + self.context = context # extra fields for logging / response + super().__init__(self.message) + + +class NotFoundError(AppError): + status_code = 404 + error_code = "not_found" + + +class ConflictError(AppError): + status_code = 409 + + error_code = "conflict" + + +class ValidationError(AppError): + status_code = 422 + error_code = "validation_error" + + +class PermissionError(AppError): + status_code = 403 + error_code = "permission_denied" + + +def _error_body(error_code: str, message: str, **public_context) -> dict: + body: dict[str, Any] = {"error": {"code": error_code, "message": message}} + if public_context: + body["error"]["detail"] = public_context + return body + + +def register_exception_handlers(app: FastAPI) -> None: + """Register all exception handlers to the app. + + Args: + app (FastAPI): the fastapi app to register the exception handlers to + """ + + @app.exception_handler(AppError) + async def _handle_app_error(request: Request, exc: AppError) -> JSONResponse: + log = logger.error if exc.status_code >= 500 else logger.info + log( + exc.error_code, + status_code=exc.status_code, + **exc.context, # full context to logs + ) + return JSONResponse( + status_code=exc.status_code, + content=_error_body( + exc.error_code, + exc.message, + # NOTE: not leaking context to client yet + # - need to make client-safe (no leakage of secrets) on a per-exception type basis + # **exc.contrxt + ), + ) + + # Catch-all for anything that isn't an AppError - bugs, unexpected failures. + @app.exception_handler(Exception) + async def _handle_unexpected(request: Request, exc: Exception) -> JSONResponse: + logger.exception("unhandled_exception") # full traceback + return JSONResponse( + status_code=500, + content=_error_body("internal_error", "An unexpected error occurred."), + ) + + # Unify validation errors from pydantic with our exception format + @app.exception_handler(RequestValidationError) + async def _handle_validation(request, exc): + return JSONResponse( + status_code=422, + content=_error_body( + "validation_error", "Request validation failed", errors=exc.errors() + ), + ) + + # Unify http exceptions from starlette with our exception format + @app.exception_handler(StarletteHTTPException) + async def _handle_http(request, exc): + return JSONResponse( + status_code=exc.status_code, + content=_error_body("http_error", str(exc.detail)), + ) diff --git a/mpcontribs-api/src/mpcontribs_api/logging.py b/mpcontribs-api/src/mpcontribs_api/logging.py new file mode 100644 index 0000000000..6f28d284ba --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/logging.py @@ -0,0 +1,77 @@ +import logging +import sys + +import structlog +from opentelemetry import trace + +from src.mpcontribs_api.config import Settings + + +def add_otel_trace_context(_, __, event_dict): + span = trace.get_current_span() + ctx = span.get_span_context() + # If context is not the sentinel span (ie. we have an active span) + if ctx.is_valid: + # Convert to OTel-expected ids + # ctx ids are formatted as 128-bit (trace_id) and 64-bit (span_id) long numbers. OTel expects them as 0-padded hex numbers + event_dict["trace_id"] = format(ctx.trace_id, "032x") # 32 digits + event_dict["span_id"] = format(ctx.span_id, "016x") # 16 digits + return event_dict + + +def configure_logging(settings: Settings) -> None: + is_prod = settings.environment == "prod" + log_level = logging.INFO if is_prod else logging.DEBUG + + # Run on both structlog events and foreign (stdlib) records. + shared_processors = [ + structlog.contextvars.merge_contextvars, + structlog.processors.add_log_level, + structlog.processors.TimeStamper(fmt="iso", utc=True), + add_otel_trace_context, + ] + + # Exception handling is paired with the renderer, not shared. + if is_prod: + render_chain = [ + structlog.processors.dict_tracebacks, + structlog.processors.EventRenamer("message"), + structlog.processors.JSONRenderer(), + ] + else: + render_chain = [structlog.dev.ConsoleRenderer()] + + # Handles internal logs emitted by structlog logger + structlog.configure( + processors=shared_processors + + [structlog.stdlib.ProcessorFormatter.wrap_for_formatter], + logger_factory=structlog.stdlib.LoggerFactory(), + wrapper_class=structlog.make_filtering_bound_logger(log_level), + cache_logger_on_first_use=True, + ) + + # Handles logs emitted by stdlib logging in external libraries + formatter = structlog.stdlib.ProcessorFormatter( + foreign_pre_chain=shared_processors, + processors=[ + structlog.stdlib.ProcessorFormatter.remove_processors_meta, + *render_chain, + ], + ) + + handler = logging.StreamHandler(sys.stdout) + handler.setFormatter(formatter) + + root = logging.getLogger() + root.handlers = [handler] + root.setLevel(log_level) + + # Let uvicorn's loggers flow through the root handler instead of their own. + for name in ("uvicorn", "uvicorn.error", "uvicorn.access"): + lg = logging.getLogger(name) + lg.handlers = [] + lg.propagate = True + + +def get_logger(name: str | None = None): + return structlog.get_logger(name) diff --git a/mpcontribs-api/src/mpcontribs_api/middleware.py b/mpcontribs-api/src/mpcontribs_api/middleware.py new file mode 100644 index 0000000000..3955b91366 --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/middleware.py @@ -0,0 +1,14 @@ +import uuid + +import structlog + + +# middleware.py +async def bind_request_context(request, call_next): + structlog.contextvars.clear_contextvars() + structlog.contextvars.bind_contextvars( + request_id=request.headers.get("x-request-id", str(uuid.uuid4())), + method=request.method, + path=request.url.path, + ) + return await call_next(request) diff --git a/mpcontribs-api/src/mpcontribs_api/models.py b/mpcontribs-api/src/mpcontribs_api/models.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/mpcontribs-api/mpcontribs/api/__init__.py b/mpcontribs-api/src/mpcontribs_api/old/__init__.py similarity index 98% rename from mpcontribs-api/mpcontribs/api/__init__.py rename to mpcontribs-api/src/mpcontribs_api/old/__init__.py index 6885d1d65e..753302b759 100644 --- a/mpcontribs-api/mpcontribs/api/__init__.py +++ b/mpcontribs-api/src/mpcontribs_api/old/__init__.py @@ -1,32 +1,31 @@ # -*- coding: utf-8 -*- """Flask App for MPContribs API""" +import logging import os import smtplib -import logging -import requests -import flask_mongorest.operators as ops - from email.message import EmailMessage from importlib import import_module from importlib.metadata import version -from websocket import create_connection -from flask import Flask, current_app, request, jsonify +from string import punctuation, whitespace + +import flask_mongorest.operators as ops +import requests +from boltons.iterutils import default_enter, remap +from flasgger.base import Swagger +from flask import Flask, current_app, jsonify, request +from flask_compress import Compress from flask_marshmallow import Marshmallow from flask_mongoengine import MongoEngine from flask_mongorest import register_class from flask_sse import sse -from flask_compress import Compress -from flasgger.base import Swagger - +from itsdangerous import URLSafeTimedSerializer from mongoengine import ValidationError from mongoengine.base.datastructures import BaseDict -from itsdangerous import URLSafeTimedSerializer -from string import punctuation, whitespace -from boltons.iterutils import remap, default_enter -from notebook.utils import url_path_join from notebook.gateway.managers import GatewayClient +from notebook.utils import url_path_join from requests.exceptions import ConnectionError, Timeout +from websocket import create_connection try: __version__ = version("mpcontribs-api") diff --git a/mpcontribs-api/mpcontribs/api/attachments/__init__.py b/mpcontribs-api/src/mpcontribs_api/old/attachments/__init__.py similarity index 100% rename from mpcontribs-api/mpcontribs/api/attachments/__init__.py rename to mpcontribs-api/src/mpcontribs_api/old/attachments/__init__.py diff --git a/mpcontribs-api/mpcontribs/api/attachments/document.py b/mpcontribs-api/src/mpcontribs_api/old/attachments/document.py similarity index 100% rename from mpcontribs-api/mpcontribs/api/attachments/document.py rename to mpcontribs-api/src/mpcontribs_api/old/attachments/document.py diff --git a/mpcontribs-api/mpcontribs/api/attachments/views.py b/mpcontribs-api/src/mpcontribs_api/old/attachments/views.py similarity index 100% rename from mpcontribs-api/mpcontribs/api/attachments/views.py rename to mpcontribs-api/src/mpcontribs_api/old/attachments/views.py diff --git a/mpcontribs-api/mpcontribs/api/config.py b/mpcontribs-api/src/mpcontribs_api/old/config.py similarity index 100% rename from mpcontribs-api/mpcontribs/api/config.py rename to mpcontribs-api/src/mpcontribs_api/old/config.py diff --git a/mpcontribs-api/src/mpcontribs_api/old/contributions/__init__.py b/mpcontribs-api/src/mpcontribs_api/old/contributions/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/mpcontribs-api/mpcontribs/api/contributions/document.py b/mpcontribs-api/src/mpcontribs_api/old/contributions/document.py similarity index 100% rename from mpcontribs-api/mpcontribs/api/contributions/document.py rename to mpcontribs-api/src/mpcontribs_api/old/contributions/document.py diff --git a/mpcontribs-api/mpcontribs/api/contributions/formulae.json.gz b/mpcontribs-api/src/mpcontribs_api/old/contributions/formulae.json.gz similarity index 100% rename from mpcontribs-api/mpcontribs/api/contributions/formulae.json.gz rename to mpcontribs-api/src/mpcontribs_api/old/contributions/formulae.json.gz diff --git a/mpcontribs-api/mpcontribs/api/contributions/generate_formulae.py b/mpcontribs-api/src/mpcontribs_api/old/contributions/generate_formulae.py similarity index 100% rename from mpcontribs-api/mpcontribs/api/contributions/generate_formulae.py rename to mpcontribs-api/src/mpcontribs_api/old/contributions/generate_formulae.py diff --git a/mpcontribs-api/mpcontribs/api/contributions/views.py b/mpcontribs-api/src/mpcontribs_api/old/contributions/views.py similarity index 100% rename from mpcontribs-api/mpcontribs/api/contributions/views.py rename to mpcontribs-api/src/mpcontribs_api/old/contributions/views.py diff --git a/mpcontribs-api/mpcontribs/api/core.py b/mpcontribs-api/src/mpcontribs_api/old/core.py similarity index 100% rename from mpcontribs-api/mpcontribs/api/core.py rename to mpcontribs-api/src/mpcontribs_api/old/core.py diff --git a/mpcontribs-api/mpcontribs/api/dashboard.cfg b/mpcontribs-api/src/mpcontribs_api/old/dashboard.cfg similarity index 100% rename from mpcontribs-api/mpcontribs/api/dashboard.cfg rename to mpcontribs-api/src/mpcontribs_api/old/dashboard.cfg diff --git a/mpcontribs-api/mpcontribs/api/notebooks/__init__.py b/mpcontribs-api/src/mpcontribs_api/old/notebooks/__init__.py similarity index 100% rename from mpcontribs-api/mpcontribs/api/notebooks/__init__.py rename to mpcontribs-api/src/mpcontribs_api/old/notebooks/__init__.py diff --git a/mpcontribs-api/mpcontribs/api/notebooks/document.py b/mpcontribs-api/src/mpcontribs_api/old/notebooks/document.py similarity index 100% rename from mpcontribs-api/mpcontribs/api/notebooks/document.py rename to mpcontribs-api/src/mpcontribs_api/old/notebooks/document.py diff --git a/mpcontribs-api/mpcontribs/api/notebooks/views.py b/mpcontribs-api/src/mpcontribs_api/old/notebooks/views.py similarity index 100% rename from mpcontribs-api/mpcontribs/api/notebooks/views.py rename to mpcontribs-api/src/mpcontribs_api/old/notebooks/views.py diff --git a/mpcontribs-api/src/mpcontribs_api/old/projects/__init__.py b/mpcontribs-api/src/mpcontribs_api/old/projects/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/mpcontribs-api/mpcontribs/api/projects/document.py b/mpcontribs-api/src/mpcontribs_api/old/projects/document.py similarity index 100% rename from mpcontribs-api/mpcontribs/api/projects/document.py rename to mpcontribs-api/src/mpcontribs_api/old/projects/document.py diff --git a/mpcontribs-api/mpcontribs/api/projects/views.py b/mpcontribs-api/src/mpcontribs_api/old/projects/views.py similarity index 100% rename from mpcontribs-api/mpcontribs/api/projects/views.py rename to mpcontribs-api/src/mpcontribs_api/old/projects/views.py diff --git a/mpcontribs-api/src/mpcontribs_api/old/structures/__init__.py b/mpcontribs-api/src/mpcontribs_api/old/structures/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/mpcontribs-api/mpcontribs/api/structures/document.py b/mpcontribs-api/src/mpcontribs_api/old/structures/document.py similarity index 100% rename from mpcontribs-api/mpcontribs/api/structures/document.py rename to mpcontribs-api/src/mpcontribs_api/old/structures/document.py diff --git a/mpcontribs-api/mpcontribs/api/structures/views.py b/mpcontribs-api/src/mpcontribs_api/old/structures/views.py similarity index 100% rename from mpcontribs-api/mpcontribs/api/structures/views.py rename to mpcontribs-api/src/mpcontribs_api/old/structures/views.py diff --git a/mpcontribs-api/mpcontribs/api/tables/__init__.py b/mpcontribs-api/src/mpcontribs_api/old/tables/__init__.py similarity index 100% rename from mpcontribs-api/mpcontribs/api/tables/__init__.py rename to mpcontribs-api/src/mpcontribs_api/old/tables/__init__.py diff --git a/mpcontribs-api/mpcontribs/api/tables/document.py b/mpcontribs-api/src/mpcontribs_api/old/tables/document.py similarity index 100% rename from mpcontribs-api/mpcontribs/api/tables/document.py rename to mpcontribs-api/src/mpcontribs_api/old/tables/document.py diff --git a/mpcontribs-api/mpcontribs/api/tables/views.py b/mpcontribs-api/src/mpcontribs_api/old/tables/views.py similarity index 100% rename from mpcontribs-api/mpcontribs/api/tables/views.py rename to mpcontribs-api/src/mpcontribs_api/old/tables/views.py diff --git a/mpcontribs-api/mpcontribs/api/templates/admin_email.html b/mpcontribs-api/src/mpcontribs_api/old/templates/admin_email.html similarity index 100% rename from mpcontribs-api/mpcontribs/api/templates/admin_email.html rename to mpcontribs-api/src/mpcontribs_api/old/templates/admin_email.html diff --git a/mpcontribs-api/mpcontribs/api/templates/card_bootstrap.html b/mpcontribs-api/src/mpcontribs_api/old/templates/card_bootstrap.html similarity index 100% rename from mpcontribs-api/mpcontribs/api/templates/card_bootstrap.html rename to mpcontribs-api/src/mpcontribs_api/old/templates/card_bootstrap.html diff --git a/mpcontribs-api/mpcontribs/api/templates/card_bulma.html b/mpcontribs-api/src/mpcontribs_api/old/templates/card_bulma.html similarity index 100% rename from mpcontribs-api/mpcontribs/api/templates/card_bulma.html rename to mpcontribs-api/src/mpcontribs_api/old/templates/card_bulma.html diff --git a/mpcontribs-api/mpcontribs/api/templates/owner_email.html b/mpcontribs-api/src/mpcontribs_api/old/templates/owner_email.html similarity index 100% rename from mpcontribs-api/mpcontribs/api/templates/owner_email.html rename to mpcontribs-api/src/mpcontribs_api/old/templates/owner_email.html diff --git a/mpcontribs-api/src/mpcontribs_api/types.py b/mpcontribs-api/src/mpcontribs_api/types.py new file mode 100644 index 0000000000..e69de29bb2 From 27b2a54a579feba0864ec667ba08ee16c495cbb6 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 28 May 2026 15:43:57 -0700 Subject: [PATCH 239/591] Removed project-level uv ennvironment --- .python-version | 1 - main.py | 6 -- pyproject.toml | 9 --- uv.lock | 158 ------------------------------------------------ 4 files changed, 174 deletions(-) delete mode 100644 .python-version delete mode 100644 main.py delete mode 100644 pyproject.toml delete mode 100644 uv.lock diff --git a/.python-version b/.python-version deleted file mode 100644 index 6324d401a0..0000000000 --- a/.python-version +++ /dev/null @@ -1 +0,0 @@ -3.14 diff --git a/main.py b/main.py deleted file mode 100644 index bf67570ae8..0000000000 --- a/main.py +++ /dev/null @@ -1,6 +0,0 @@ -def main(): - print("Hello from fastapi-conversion!") - - -if __name__ == "__main__": - main() diff --git a/pyproject.toml b/pyproject.toml deleted file mode 100644 index 7826c72ae1..0000000000 --- a/pyproject.toml +++ /dev/null @@ -1,9 +0,0 @@ -[project] -name = "fastapi-conversion" -version = "0.1.0" -description = "Add your description here" -readme = "README.md" -requires-python = ">=3.14" -dependencies = [ - "fastapi>=0.136.3", -] diff --git a/uv.lock b/uv.lock deleted file mode 100644 index 1ea3d847d9..0000000000 --- a/uv.lock +++ /dev/null @@ -1,158 +0,0 @@ -version = 1 -revision = 3 -requires-python = ">=3.14" - -[[package]] -name = "annotated-doc" -version = "0.0.4" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/57/ba/046ceea27344560984e26a590f90bc7f4a75b06701f653222458922b558c/annotated_doc-0.0.4.tar.gz", hash = "sha256:fbcda96e87e9c92ad167c2e53839e57503ecfda18804ea28102353485033faa4", size = 7288, upload-time = "2025-11-10T22:07:42.062Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/1e/d3/26bf1008eb3d2daa8ef4cacc7f3bfdc11818d111f7e2d0201bc6e3b49d45/annotated_doc-0.0.4-py3-none-any.whl", hash = "sha256:571ac1dc6991c450b25a9c2d84a3705e2ae7a53467b5d111c24fa8baabbed320", size = 5303, upload-time = "2025-11-10T22:07:40.673Z" }, -] - -[[package]] -name = "annotated-types" -version = "0.7.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/ee/67/531ea369ba64dcff5ec9c3402f9f51bf748cec26dde048a2f973a4eea7f5/annotated_types-0.7.0.tar.gz", hash = "sha256:aff07c09a53a08bc8cfccb9c85b05f1aa9a2a6f23728d790723543408344ce89", size = 16081, upload-time = "2024-05-20T21:33:25.928Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/78/b6/6307fbef88d9b5ee7421e68d78a9f162e0da4900bc5f5793f6d3d0e34fb8/annotated_types-0.7.0-py3-none-any.whl", hash = "sha256:1f02e8b43a8fbbc3f3e0d4f0f4bfc8131bcb4eebe8849b8e5c773f3a1c582a53", size = 13643, upload-time = "2024-05-20T21:33:24.1Z" }, -] - -[[package]] -name = "anyio" -version = "4.13.0" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "idna" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/19/14/2c5dd9f512b66549ae92767a9c7b330ae88e1932ca57876909410251fe13/anyio-4.13.0.tar.gz", hash = "sha256:334b70e641fd2221c1505b3890c69882fe4a2df910cba14d97019b90b24439dc", size = 231622, upload-time = "2026-03-24T12:59:09.671Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/da/42/e921fccf5015463e32a3cf6ee7f980a6ed0f395ceeaa45060b61d86486c2/anyio-4.13.0-py3-none-any.whl", hash = "sha256:08b310f9e24a9594186fd75b4f73f4a4152069e3853f1ed8bfbf58369f4ad708", size = 114353, upload-time = "2026-03-24T12:59:08.246Z" }, -] - -[[package]] -name = "fastapi" -version = "0.136.3" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "annotated-doc" }, - { name = "pydantic" }, - { name = "starlette" }, - { name = "typing-extensions" }, - { name = "typing-inspection" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/81/2d/ff8d91d7b564d464629a0fd50a4489c97fcb836ac230bf3a7269232a9b1f/fastapi-0.136.3.tar.gz", hash = "sha256:e487fae93ad408e6f47641ee4dfe389864fd7bec92e547ea8498fc13f43e83ab", size = 396410, upload-time = "2026-05-23T18:53:15.192Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/e0/82/45359b62a067409bd929ae8a56b8ed13e5a8c8a61194b3c236920999ab83/fastapi-0.136.3-py3-none-any.whl", hash = "sha256:3d2a69bdf04b7e9f3afa292c3bc7a98816bbfafa10bc9b45f3f3700d2f761620", size = 117481, upload-time = "2026-05-23T18:53:16.924Z" }, -] - -[[package]] -name = "fastapi-conversion" -version = "0.1.0" -source = { virtual = "." } -dependencies = [ - { name = "fastapi" }, -] - -[package.metadata] -requires-dist = [{ name = "fastapi", specifier = ">=0.136.3" }] - -[[package]] -name = "idna" -version = "3.16" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/1a/88/bcf9709822fe69d02c2a6a77956c98ce6ea8ca8767a9aadcedc7eb6a2390/idna-3.16.tar.gz", hash = "sha256:d7a6da03db833450fca25d2358ac9ff06cd624577a4aea3a596d5c0f77b8e03d", size = 203770, upload-time = "2026-05-22T00:16:18.781Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/94/16/70255075a9859a0e3adb789b68ceb0e210dec03934245fd98d248226572f/idna-3.16-py3-none-any.whl", hash = "sha256:cc246e3a3f89580c3a951b5ad298ca4638078b2cdd4f115654332b5c26daded5", size = 74165, upload-time = "2026-05-22T00:16:16.698Z" }, -] - -[[package]] -name = "pydantic" -version = "2.13.4" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "annotated-types" }, - { name = "pydantic-core" }, - { name = "typing-extensions" }, - { name = "typing-inspection" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/18/a5/b60d21ac674192f8ab0ba4e9fd860690f9b4a6e51ca5df118733b487d8d6/pydantic-2.13.4.tar.gz", hash = "sha256:c40756b57adaa8b1efeeced5c196f3f3b7c435f90e84ea7f443901bec8099ef6", size = 844775, upload-time = "2026-05-06T13:43:05.343Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/fd/7b/122376b1fd3c62c1ed9dc80c931ace4844b3c55407b6fb2d199377c9736f/pydantic-2.13.4-py3-none-any.whl", hash = "sha256:45a282cde31d808236fd7ea9d919b128653c8b38b393d1c4ab335c62924d9aba", size = 472262, upload-time = "2026-05-06T13:43:02.641Z" }, -] - -[[package]] -name = "pydantic-core" -version = "2.46.4" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "typing-extensions" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/9d/56/921726b776ace8d8f5db44c4ef961006580d91dc52b803c489fafd1aa249/pydantic_core-2.46.4.tar.gz", hash = "sha256:62f875393d7f270851f20523dd2e29f082bcc82292d66db2b64ea71f64b6e1c1", size = 471464, upload-time = "2026-05-06T13:37:06.98Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/8d/74/228a26ddad29c6672b805d9fd78e8d251cd04004fa7eed0e622096cd0250/pydantic_core-2.46.4-cp314-cp314-macosx_10_12_x86_64.whl", hash = "sha256:428e04521a40150c85216fc8b85e8d39fece235a9cf5e383761238c7fa9b96fb", size = 2102079, upload-time = "2026-05-06T13:38:41.019Z" }, - { url = "https://files.pythonhosted.org/packages/ad/1f/8970b150a4b4365623ae00fc88603491f763c627311ae8031e3111356d6e/pydantic_core-2.46.4-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:23ace664830ee0bfe014a0c7bc248b1f7f25ed7ad103852c317624a1083af462", size = 1952179, upload-time = "2026-05-06T13:36:59.812Z" }, - { url = "https://files.pythonhosted.org/packages/95/30/5211a831ae054928054b2f79731661087a2bc5c01e825c672b3a4a8f1b3e/pydantic_core-2.46.4-cp314-cp314-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ce5c1d2a8b27468f433ca974829c44060b8097eedc39933e3c206a90ee49c4a9", size = 1978926, upload-time = "2026-05-06T13:37:39.933Z" }, - { url = "https://files.pythonhosted.org/packages/57/e9/689668733b1eb67adeef047db3c2e8788fcf65a7fd9c9e2b46b7744fe245/pydantic_core-2.46.4-cp314-cp314-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:7283d57845ecf5a163403eb0702dfc220cc4fbdd18919cb5ccea4f95ee1cdab4", size = 2046785, upload-time = "2026-05-06T13:38:01.995Z" }, - { url = "https://files.pythonhosted.org/packages/60/d9/6715260422ff50a2109878fd24d948a6c3446bb2664f34ee78cd972b3acd/pydantic_core-2.46.4-cp314-cp314-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:8daafc69c93ee8a0204506a3b6b30f586ef54028f52aeeeb5c4cfc5184fd5914", size = 2228733, upload-time = "2026-05-06T13:40:50.371Z" }, - { url = "https://files.pythonhosted.org/packages/18/ae/fdb2f64316afca925640f8e70bb1a564b0ec2721c1389e25b8eb4bf9a299/pydantic_core-2.46.4-cp314-cp314-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:cd2213145bcc2ba85884d0ac63d222fece9209678f77b9b4d76f054c561adb28", size = 2307534, upload-time = "2026-05-06T13:37:21.531Z" }, - { url = "https://files.pythonhosted.org/packages/89/1d/8eff589b45bb8190a9d12c49cfad0f176a5cbd1534908a6b5125e2886239/pydantic_core-2.46.4-cp314-cp314-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7a5f930472650a82629163023e630d160863fce524c616f4e5186e5de9d9a49b", size = 2099732, upload-time = "2026-05-06T13:39:31.942Z" }, - { url = "https://files.pythonhosted.org/packages/06/d5/ee5a3366637fee41dee51a1fc91562dcf12ddbc68fda34e6b253da2324bb/pydantic_core-2.46.4-cp314-cp314-manylinux_2_31_riscv64.whl", hash = "sha256:c1b3f518abeca3aa13c712fd202306e145abf59a18b094a6bafb2d2bbf59192c", size = 2129627, upload-time = "2026-05-06T13:37:25.033Z" }, - { url = "https://files.pythonhosted.org/packages/94/33/2414be571d2c6a6c4d08be21f9292b6d3fdb08949a97b6dfe985017821db/pydantic_core-2.46.4-cp314-cp314-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:1a7dd0b3ee80d90150e3495a3a13ac34dbcbfd4f012996a6a1d8900e91b5c0fb", size = 2179141, upload-time = "2026-05-06T13:37:14.046Z" }, - { url = "https://files.pythonhosted.org/packages/7b/79/7daa95be995be0eecc4cf75064cb33f9bbbfe3fe0158caf2f0d4a996a5c7/pydantic_core-2.46.4-cp314-cp314-musllinux_1_1_aarch64.whl", hash = "sha256:3fb702cd90b0446a3a1c5e470bfa0dd23c0233b676a9099ddcc964fa6ca13898", size = 2184325, upload-time = "2026-05-06T13:36:53.615Z" }, - { url = "https://files.pythonhosted.org/packages/9f/cb/d0a382f5c0de8a222dc61c65348e0ce831b1f68e0a018450d31c2cace3a5/pydantic_core-2.46.4-cp314-cp314-musllinux_1_1_armv7l.whl", hash = "sha256:b8458003118a712e66286df6a707db01c52c0f52f7db8e4a38f0da1d3b94fc4e", size = 2323990, upload-time = "2026-05-06T13:40:29.971Z" }, - { url = "https://files.pythonhosted.org/packages/05/db/d9ba624cc4a5aced1598e88c04fdbd8310c8a69b9d38b9a3d39ce3a61ed7/pydantic_core-2.46.4-cp314-cp314-musllinux_1_1_x86_64.whl", hash = "sha256:372429a130e469c9cd698925ce5fc50940b7a1336b0d82038e63d5bbc4edc519", size = 2369978, upload-time = "2026-05-06T13:37:23.027Z" }, - { url = "https://files.pythonhosted.org/packages/f2/20/d15df15ba918c423461905802bfd2981c3af0bfa0e40d05e13edbfa48bc3/pydantic_core-2.46.4-cp314-cp314-win32.whl", hash = "sha256:85bb3611ff1802f3ee7fdd7dbff26b56f343fb432d57a4728fdd49b6ef35e2f4", size = 1966354, upload-time = "2026-05-06T13:38:03.499Z" }, - { url = "https://files.pythonhosted.org/packages/fc/b6/6b8de4c0a7d7ab3004c439c80c5c1e0a3e8d78bbae19379b01960383d9e5/pydantic_core-2.46.4-cp314-cp314-win_amd64.whl", hash = "sha256:811ff8e9c313ab425368bcbb36e5c4ebd7108c2bbf4e4089cfbb0b01eff63fac", size = 2072238, upload-time = "2026-05-06T13:39:40.807Z" }, - { url = "https://files.pythonhosted.org/packages/32/36/51eb763beec1f4cf59b1db243a7dcc39cbb41230f050a09b9d69faaf0a48/pydantic_core-2.46.4-cp314-cp314-win_arm64.whl", hash = "sha256:bfec22eab3c8cc2ceec0248aec886624116dc079afa027ecc8ad4a7e62010f8a", size = 2018251, upload-time = "2026-05-06T13:37:26.72Z" }, - { url = "https://files.pythonhosted.org/packages/e8/91/855af51d625b23aa987116a19e231d2aaef9c4a415273ddc189b79a45fee/pydantic_core-2.46.4-cp314-cp314t-macosx_10_12_x86_64.whl", hash = "sha256:af8244b2bef6aaad6d92cda81372de7f8c8d36c9f0c3ea36e827c60e7d9467a0", size = 2099593, upload-time = "2026-05-06T13:39:47.682Z" }, - { url = "https://files.pythonhosted.org/packages/fb/1b/8784a54c65edb5f49f0a14d6977cf1b209bba85a4c77445b255c2de58ab3/pydantic_core-2.46.4-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:5a4330cdbc57162e4b3aa303f588ba752257694c9c9be3e7ebb11b4aca659b5d", size = 1935226, upload-time = "2026-05-06T13:40:40.428Z" }, - { url = "https://files.pythonhosted.org/packages/e8/e7/1955d28d1afc56dd4b3ad7cc0cf39df1b9852964cf16e5d13912756d6d6b/pydantic_core-2.46.4-cp314-cp314t-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:29c61fc04a3d840155ff08e475a04809278972fe6aef51e2720554e96367e34b", size = 1974605, upload-time = "2026-05-06T13:37:32.029Z" }, - { url = "https://files.pythonhosted.org/packages/93/e2/3fedbf0ba7a22850e6e9fd78117f1c0f10f950182344d8a6c535d468fdd8/pydantic_core-2.46.4-cp314-cp314t-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:c50f2528cf200c5eed56faf3f4e22fcd5f38c157a8b78576e6ba3168ec35f000", size = 2030777, upload-time = "2026-05-06T13:38:55.239Z" }, - { url = "https://files.pythonhosted.org/packages/f8/61/46be275fcaaba0b4f5b9669dd852267ce1ff616592dccf7a7845588df091/pydantic_core-2.46.4-cp314-cp314t-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:0cbe8b01f948de4286c74cdd6c667aceb38f5c1e26f0693b3983d9d74887c65e", size = 2236641, upload-time = "2026-05-06T13:37:08.096Z" }, - { url = "https://files.pythonhosted.org/packages/60/db/12e93e46a8bac9988be3c016860f83293daea8c716c029c9ace279036f2f/pydantic_core-2.46.4-cp314-cp314t-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:617d7e2ca7dcb8c5cf6bcb8c59b8832c94b36196bbf1cbd1bfb56ed341905edd", size = 2286404, upload-time = "2026-05-06T13:40:20.221Z" }, - { url = "https://files.pythonhosted.org/packages/e2/4a/4d8b19008f38d31c53b8219cfedc2e3d5de5fe99d90076b7e767de29274f/pydantic_core-2.46.4-cp314-cp314t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7027560ee92211647d0d34e3f7cd6f50da56399d26a9c8ad0da286d3869a53f3", size = 2109219, upload-time = "2026-05-06T13:38:12.153Z" }, - { url = "https://files.pythonhosted.org/packages/88/70/3cbc40978fefb7bb09c6708d40d4ad1a5d70fd7213c3d17f971de868ec1f/pydantic_core-2.46.4-cp314-cp314t-manylinux_2_31_riscv64.whl", hash = "sha256:f99626688942fb746e545232e7726926f3be91b5975f8b55327665fafda991c7", size = 2110594, upload-time = "2026-05-06T13:40:02.971Z" }, - { url = "https://files.pythonhosted.org/packages/9d/20/b8d36736216e29491125531685b2f9e61aa5b4b2599893f8268551da3338/pydantic_core-2.46.4-cp314-cp314t-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:fc3e9034a63de20e15e8ade85358bc6efc614008cab72898b4b4952bea0509ff", size = 2159542, upload-time = "2026-05-06T13:39:27.506Z" }, - { url = "https://files.pythonhosted.org/packages/1d/a2/367df868eb584dacf6bf82a389272406d7178e301c4ac82545ab98bc2dd9/pydantic_core-2.46.4-cp314-cp314t-musllinux_1_1_aarch64.whl", hash = "sha256:97e7cf2be5c77b7d1a9713a05605d49460d02c6078d38d8bef3cbe323c548424", size = 2168146, upload-time = "2026-05-06T13:38:31.93Z" }, - { url = "https://files.pythonhosted.org/packages/c1/b8/4460f77f7e201893f649a29ab355dddd3beee8a97bcb1a320db414f9a06e/pydantic_core-2.46.4-cp314-cp314t-musllinux_1_1_armv7l.whl", hash = "sha256:3bf92c5d0e00fefaab325a4d27828fe6b6e2a21848686b5b60d2d9eeb09d76c6", size = 2306309, upload-time = "2026-05-06T13:37:44.717Z" }, - { url = "https://files.pythonhosted.org/packages/64/c4/be2639293acd87dc8ddbcec41a73cee9b2ebf996fe6d892a1a74e88ad3f7/pydantic_core-2.46.4-cp314-cp314t-musllinux_1_1_x86_64.whl", hash = "sha256:3ecbc122d18468d06ca279dc26a8c2e2d5acb10943bb35e36ae92096dc3b5565", size = 2369736, upload-time = "2026-05-06T13:37:05.645Z" }, - { url = "https://files.pythonhosted.org/packages/30/a6/9f9f380dbb301f67023bf8f707aaa75daadf84f7152d95c410fd7e81d994/pydantic_core-2.46.4-cp314-cp314t-win32.whl", hash = "sha256:e846ae7835bf0703ae43f534ab79a867146dadd59dc9ca5c8b53d5c8f7c9ef02", size = 1955575, upload-time = "2026-05-06T13:38:51.116Z" }, - { url = "https://files.pythonhosted.org/packages/40/1f/f1eb9eb350e795d1af8586289746f5c5677d16043040d63710e22abc43c9/pydantic_core-2.46.4-cp314-cp314t-win_amd64.whl", hash = "sha256:2108ba5c1c1eca18030634489dc544844144ee36357f2f9f780b93e7ddbb44b5", size = 2051624, upload-time = "2026-05-06T13:38:21.672Z" }, - { url = "https://files.pythonhosted.org/packages/f6/d2/42dd53d0a85c27606f316d3aa5d2869c4e8470a5ed6dec30e4a1abe19192/pydantic_core-2.46.4-cp314-cp314t-win_arm64.whl", hash = "sha256:4fcbe087dbc2068af7eda3aa87634eba216dbda64d1ae73c8684b621d33f6596", size = 2017325, upload-time = "2026-05-06T13:40:52.723Z" }, -] - -[[package]] -name = "starlette" -version = "1.1.0" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "anyio" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/95/66/4d20cdf39a8d6a51e663b7038e3b828ff211d3891a43a713fe7e4643f3a8/starlette-1.1.0.tar.gz", hash = "sha256:e83c7fe0ddecd8719c5b840080325aec0260acec86e9832899e377b91d65e90f", size = 2660060, upload-time = "2026-05-23T16:55:41.376Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/93/79/920b8e0a8b20f793e8d64855095cb8febabf6175b8550b6f7a547d813891/starlette-1.1.0-py3-none-any.whl", hash = "sha256:7f0dfd38e428aad5cb6f9f667f0ca1d2d8ca3f3385dccac8305f79ec98458382", size = 72899, upload-time = "2026-05-23T16:55:39.201Z" }, -] - -[[package]] -name = "typing-extensions" -version = "4.15.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/72/94/1a15dd82efb362ac84269196e94cf00f187f7ed21c242792a923cdb1c61f/typing_extensions-4.15.0.tar.gz", hash = "sha256:0cea48d173cc12fa28ecabc3b837ea3cf6f38c6d1136f85cbaaf598984861466", size = 109391, upload-time = "2025-08-25T13:49:26.313Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/18/67/36e9267722cc04a6b9f15c7f3441c2363321a3ea07da7ae0c0707beb2a9c/typing_extensions-4.15.0-py3-none-any.whl", hash = "sha256:f0fa19c6845758ab08074a0cfa8b7aecb71c999ca73d62883bc25cc018c4e548", size = 44614, upload-time = "2025-08-25T13:49:24.86Z" }, -] - -[[package]] -name = "typing-inspection" -version = "0.4.2" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "typing-extensions" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/55/e3/70399cb7dd41c10ac53367ae42139cf4b1ca5f36bb3dc6c9d33acdb43655/typing_inspection-0.4.2.tar.gz", hash = "sha256:ba561c48a67c5958007083d386c3295464928b01faa735ab8547c5692e87f464", size = 75949, upload-time = "2025-10-01T02:14:41.687Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/dc/9b/47798a6c91d8bdb567fe2698fe81e0c6b7cb7ef4d13da4114b41d239f65d/typing_inspection-0.4.2-py3-none-any.whl", hash = "sha256:4ed1cacbdc298c220f1bd249ed5287caa16f34d44ef4e9c3d0cbad5b521545e7", size = 14611, upload-time = "2025-10-01T02:14:40.154Z" }, -] From cedccf4f93c482a0c2edfe0b44eb34f0e622a77b Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 1 Jun 2026 16:03:17 -0700 Subject: [PATCH 240/591] Updated python version to 3.14 --- mpcontribs-api/pyproject.toml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mpcontribs-api/pyproject.toml b/mpcontribs-api/pyproject.toml index 78464c7390..3db7b16a0a 100644 --- a/mpcontribs-api/pyproject.toml +++ b/mpcontribs-api/pyproject.toml @@ -17,7 +17,7 @@ include = ["mpcontribs.api"] [project] name = "mpcontribs-api" dynamic = ["version"] -requires-python = ">=3.11" +requires-python = ">=3.14" description="API for community-contributed Materials Project data" license = "BSD-3-Clause-LBNL" authors = [ @@ -67,6 +67,8 @@ dependencies = [ "opentelemetry-exporter-otlp-proto-grpc>=1.42.1", "opentelemetry-instrumentation-fastapi>=0.63b1", "opentelemetry-instrumentation-pymongo>=0.63b1", + "beanie>=2.1.0", + "fastapi-filter>=2.0.1", ] [project.urls] @@ -106,4 +108,4 @@ ignore = ["D105","D2","D4"] [tool.mypy] ignore_missing_imports = true namespace_packages = true -python_version = 3.11 +python_version = 3.14 From 47e6a62ba18bc71f2f7c7e84b9468a16b8d8d40a Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 1 Jun 2026 16:03:56 -0700 Subject: [PATCH 241/591] Added projects router and reintroduced prefix --- mpcontribs-api/src/mpcontribs_api/api/v1/router.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/api/v1/router.py b/mpcontribs-api/src/mpcontribs_api/api/v1/router.py index 456aa8f29d..289b2159df 100644 --- a/mpcontribs-api/src/mpcontribs_api/api/v1/router.py +++ b/mpcontribs-api/src/mpcontribs_api/api/v1/router.py @@ -1,5 +1,7 @@ from fastapi import APIRouter -router = APIRouter(prefix="api/v1") +from mpcontribs_api.domains.projects.router import router as projects_router -router. +router = APIRouter(prefix="/api/v1") + +router.include_router(projects_router, prefix="/projects") From cdc12867f92d3871e9f821b86e6b056cc25b86c4 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 1 Jun 2026 16:04:30 -0700 Subject: [PATCH 242/591] Added Beanie init --- mpcontribs-api/src/mpcontribs_api/app.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/app.py b/mpcontribs-api/src/mpcontribs_api/app.py index 6994b6cb23..3a5aed8f29 100644 --- a/mpcontribs-api/src/mpcontribs_api/app.py +++ b/mpcontribs-api/src/mpcontribs_api/app.py @@ -4,7 +4,8 @@ from contextlib import asynccontextmanager from typing import AsyncGenerator -from fastapi import FastAPI +from beanie import init_beanie +from fastapi import Depends, FastAPI from pymongo import AsyncMongoClient from starlette.middleware.base import BaseHTTPMiddleware @@ -12,12 +13,14 @@ from mpcontribs_api.config import Settings, get_settings from mpcontribs_api.exceptions import register_exception_handlers from mpcontribs_api.logging import configure_logging +from src.mpcontribs_api.dependencies import verify_gateway +from src.mpcontribs_api.domains.projects.models import Project from src.mpcontribs_api.middleware import bind_request_context logger = logging.getLogger(__name__) -def _build_lifespan(settings: Settings): +async def _build_lifespan(settings: Settings): @asynccontextmanager async def lifespan(app: FastAPI) -> AsyncGenerator[None]: # --- startup --- @@ -35,6 +38,9 @@ async def lifespan(app: FastAPI) -> AsyncGenerator[None]: app.state.mongo_client = client app.state.db = client[settings.mongo.db_name] + # Initialize beanie with document classes and a database + await init_beanie(database=client.db_name, document_models=[Project]) + try: yield finally: @@ -45,7 +51,7 @@ async def lifespan(app: FastAPI) -> AsyncGenerator[None]: return lifespan -def create_app(settings: Settings | None = None) -> FastAPI: +async def create_app(settings: Settings | None = None) -> FastAPI: settings = settings or get_settings() configure_logging(settings) @@ -55,7 +61,8 @@ def create_app(settings: Settings | None = None) -> FastAPI: debug=False if settings.environment == "prod" else True, # Would be nice to implement eventually # default_response_class=DefaultResponse, - lifespan=_build_lifespan(settings), + lifespan=await _build_lifespan(settings), + dependencies=[Depends(verify_gateway)], ) # Add request context to logs From 9a2d1f6009b7acd24db9af4491a9f09b937a3811 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 1 Jun 2026 16:05:14 -0700 Subject: [PATCH 243/591] Broke redis and kong settings into their own classes for modularity --- mpcontribs-api/src/mpcontribs_api/config.py | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/config.py b/mpcontribs-api/src/mpcontribs_api/config.py index 81171037aa..7308337823 100644 --- a/mpcontribs-api/src/mpcontribs_api/config.py +++ b/mpcontribs-api/src/mpcontribs_api/config.py @@ -5,6 +5,15 @@ from pydantic_settings import BaseSettings, SettingsConfigDict +class RedisSettings(BaseModel): + address: SecretStr + url: SecretStr + + +class KongSettings(BaseModel): + gateway_secret: SecretStr + + class MongoSettings(BaseModel): """MongoDB settings. @@ -35,6 +44,11 @@ class MongoSettings(BaseModel): "while it is waiting, multiple server monitoring operations may be carried out", ) + admin_group: str = Field( + default="admin", + description="Name of admin group to consider in requests to MongoDB. Not directly passed to Mongo, but consumed by auth.", + ) + class Settings(BaseSettings): model_config = SettingsConfigDict( @@ -47,9 +61,9 @@ class Settings(BaseSettings): mongo: MongoSettings - # Redis settings - redis_address: SecretStr - redis_url: SecretStr + kong: KongSettings + + redis: RedisSettings # SMTP Settings mail_default_sender: str = Field( From f7760ad3978693c3e2b11bb772700d527b86a217 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 1 Jun 2026 16:06:26 -0700 Subject: [PATCH 244/591] Added shared types --- mpcontribs-api/src/mpcontribs_api/types.py | 35 ++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/mpcontribs-api/src/mpcontribs_api/types.py b/mpcontribs-api/src/mpcontribs_api/types.py index e69de29bb2..9607ef6980 100644 --- a/mpcontribs-api/src/mpcontribs_api/types.py +++ b/mpcontribs-api/src/mpcontribs_api/types.py @@ -0,0 +1,35 @@ +from typing import Annotated + +from pandas.core.arrays.string_arrow import re +from pydantic import BeforeValidator, Field + +ShortStr = Annotated[str, Field(min_length=3, max_length=30)] + + +_EMAIL_RE = re.compile(r"^[^:@\s]+:[^:@\s]+@[^@\s]+\.[^@\s]+$") + + +def _validate_prefixed_email(v: str) -> str: + v = v.strip() + if not _EMAIL_RE.match(v): + raise ValueError( + "must match ':@', e.g. 'google:name@gmail.com'" + ) + return v + + +PrefixedEmail = Annotated[str, BeforeValidator(_validate_prefixed_email)] + + +def _parse_sort_entry(v: str) -> tuple[str, int]: + v = v.strip() + if not v: + raise ValueError("empty sort field") + if v[0] == "-": + return v[1:], -1 + if v[0] == "+": + return v[1:], 1 + return v, 1 + + +SortEntry = Annotated[tuple[str, int], BeforeValidator(_parse_sort_entry)] From fee1fc6660023cf9a8333b7ae6a556fbad3be37e Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 1 Jun 2026 16:08:02 -0700 Subject: [PATCH 245/591] Removed unnecessary files --- mpcontribs-api/src/mpcontribs_api/db.py | 11 ----------- .../mpcontribs_api/domains/contributions/service.py | 0 .../src/mpcontribs_api/domains/projects/service.py | 0 3 files changed, 11 deletions(-) delete mode 100644 mpcontribs-api/src/mpcontribs_api/db.py delete mode 100644 mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py delete mode 100644 mpcontribs-api/src/mpcontribs_api/domains/projects/service.py diff --git a/mpcontribs-api/src/mpcontribs_api/db.py b/mpcontribs-api/src/mpcontribs_api/db.py deleted file mode 100644 index afd11748c4..0000000000 --- a/mpcontribs-api/src/mpcontribs_api/db.py +++ /dev/null @@ -1,11 +0,0 @@ -from typing import Annotated - -from fastapi import Depends, Request -from pymongo.asynchronous.database import AsyncDatabase - - -def get_db(request: Request) -> AsyncDatabase: - return request.app.state.db - - -DbDep = Annotated[AsyncDatabase, Depends(get_db)] diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/service.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/service.py deleted file mode 100644 index e69de29bb2..0000000000 From fd15b1ab08ec1adca3d1a03323f27c31652f5118 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 1 Jun 2026 16:08:28 -0700 Subject: [PATCH 246/591] Added packages to uv --- mpcontribs-api/uv.lock | 45 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/mpcontribs-api/uv.lock b/mpcontribs-api/uv.lock index e98ba4cd0e..8bc0ab7fde 100644 --- a/mpcontribs-api/uv.lock +++ b/mpcontribs-api/uv.lock @@ -245,6 +245,22 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/aa/31/759d077aa680555e17c9d2bb09edf4c3428d895fe5d35a8df67684401b84/backports_zstd-1.5.0-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:6172dcdd664ef243e55a35e6b45f1c866767c61043f0ddcd908abd14df662065", size = 300853, upload-time = "2026-05-11T19:54:23.1Z" }, ] +[[package]] +name = "beanie" +version = "2.1.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "click" }, + { name = "lazy-model" }, + { name = "pydantic" }, + { name = "pymongo" }, + { name = "typing-extensions" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/53/9c/f3037fff9ea059d7b0c72b6c6e4f3dcfeb28bf544fe0fc5420335d7c49d0/beanie-2.1.0.tar.gz", hash = "sha256:44f3c50710aa90daa9c9c40f9bf9c8954968fe16d7e5398c1f2fd462daf94fe1", size = 185979, upload-time = "2026-03-26T01:27:03.63Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/00/b5/1c6c404bcce8fa53d3f422dce6e58bff99c3e3cb2a3c49d519e3e5822125/beanie-2.1.0-py3-none-any.whl", hash = "sha256:077381dad0e0129fd4dc38cdaa3d85cb517da7338e3d893a689314884df4379b", size = 92697, upload-time = "2026-03-26T01:27:02.191Z" }, +] + [[package]] name = "beautifulsoup4" version = "4.14.3" @@ -1033,6 +1049,19 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/e0/82/45359b62a067409bd929ae8a56b8ed13e5a8c8a61194b3c236920999ab83/fastapi-0.136.3-py3-none-any.whl", hash = "sha256:3d2a69bdf04b7e9f3afa292c3bc7a98816bbfafa10bc9b45f3f3700d2f761620", size = 117481, upload-time = "2026-05-23T18:53:16.924Z" }, ] +[[package]] +name = "fastapi-filter" +version = "2.0.1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "fastapi" }, + { name = "pydantic" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/43/ed/c36cfcd849519fd2d23051ad81a91fc5e8cfa7109496fc8a10ad565a5fe9/fastapi_filter-2.0.1.tar.gz", hash = "sha256:cffda370097af7e404f1eb188aca58b199084bfaf7cec881e40b404adf12566e", size = 9857, upload-time = "2024-12-07T17:30:06.343Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/5e/88/afc022ad64d12f730141fc50758ecf9d60de5fed11335dc16e3127617f05/fastapi_filter-2.0.1-py3-none-any.whl", hash = "sha256:711d48707ec62f7c9e12a7713fc0f6a99858a9e3741b4d108102d5599e77197d", size = 11586, upload-time = "2024-12-07T17:30:05.375Z" }, +] + [[package]] name = "fastjsonschema" version = "2.21.2" @@ -1969,6 +1998,18 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/82/3d/14ce75ef66813643812f3093ab17e46d3a206942ce7376d31ec2d36229e7/lark-1.3.1-py3-none-any.whl", hash = "sha256:c629b661023a014c37da873b4ff58a817398d12635d3bbb2c5a03be7fe5d1e12", size = 113151, upload-time = "2025-10-27T18:25:54.882Z" }, ] +[[package]] +name = "lazy-model" +version = "0.4.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "pydantic" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/72/85/e25dc36dee49cf0726c03a1558b5c311a17095bc9361bcbf47226cb3075a/lazy-model-0.4.0.tar.gz", hash = "sha256:a851d85d0b518b0b9c8e626bbee0feb0494c0e0cb5636550637f032dbbf9c55f", size = 8256, upload-time = "2025-08-07T20:05:34.737Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/5c/54/653ea0d7c578741e9867ccf0cbf47b7eac09ff22e4238f311ac20671a911/lazy_model-0.4.0-py3-none-any.whl", hash = "sha256:95ea59551c1ac557a2c299f75803c56cc973923ef78c67ea4839a238142f7927", size = 13749, upload-time = "2025-08-07T20:05:36.303Z" }, +] + [[package]] name = "lxml" version = "6.1.1" @@ -2316,6 +2357,7 @@ source = { editable = "." } dependencies = [ { name = "apispec" }, { name = "asn1crypto" }, + { name = "beanie" }, { name = "blinker" }, { name = "boltons" }, { name = "css-html-js-minify" }, @@ -2323,6 +2365,7 @@ dependencies = [ { name = "ddtrace" }, { name = "dnspython" }, { name = "fastapi" }, + { name = "fastapi-filter" }, { name = "filetype" }, { name = "flasgger-tschaume" }, { name = "flask-compress" }, @@ -2371,6 +2414,7 @@ dev = [ requires-dist = [ { name = "apispec", specifier = "<6" }, { name = "asn1crypto" }, + { name = "beanie", specifier = ">=2.1.0" }, { name = "blinker" }, { name = "boltons" }, { name = "css-html-js-minify" }, @@ -2378,6 +2422,7 @@ requires-dist = [ { name = "ddtrace", specifier = "==4.3.0" }, { name = "dnspython" }, { name = "fastapi", specifier = ">=0.136.3" }, + { name = "fastapi-filter", specifier = ">=2.0.1" }, { name = "filetype" }, { name = "flasgger-tschaume", specifier = ">=0.9.7" }, { name = "flask-compress" }, From 41bf3d6e72d7563557c4f96795e68a9d86d0ec40 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 1 Jun 2026 16:09:08 -0700 Subject: [PATCH 247/591] Built out project domain for getting data --- .../domains/projects/dependencies.py | 15 ++ .../mpcontribs_api/domains/projects/models.py | 131 ++++++++++++++++++ .../domains/projects/repository.py | 120 ++++++++++++++++ .../mpcontribs_api/domains/projects/router.py | 44 ++++++ 4 files changed, 310 insertions(+) create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/projects/dependencies.py diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/dependencies.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/dependencies.py new file mode 100644 index 0000000000..94535cc67d --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/dependencies.py @@ -0,0 +1,15 @@ +from typing import Annotated + +from fastapi import Depends + +from mpcontribs_api.dependencies import UserDep +from mpcontribs_api.domains.projects.repository import ( + MongoDbProjectRepository, +) + + +def get_scoped_projects(user: UserDep) -> MongoDbProjectRepository: + return MongoDbProjectRepository(user) + + +ProjectDep = Annotated[MongoDbProjectRepository, Depends(get_scoped_projects)] diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py index e69de29bb2..07c624c95d 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py @@ -0,0 +1,131 @@ +from enum import Enum +from typing import Annotated, Any, Literal + +from beanie import DocumentWithSoftDelete +from fastapi_filter.contrib.beanie import Filter +from pydantic import BaseModel, ConfigDict, Field, HttpUrl + +from src.mpcontribs_api.types import PrefixedEmail, ShortStr + + +class Column(BaseModel): + path: str + min: float | None = None + max: float | None = None + unit: str | None = None + + @property + def segments(self) -> tuple[str, ...]: + return tuple(self.path.split(".")) + + +class Stats(BaseModel): + columns: int + contributions: int + tables: int + structures: int + attachments: int + size: float + + +class Reference(BaseModel): + # TODO: Labels have some restrictions, not sure exactly what yet + label: str + url: HttpUrl + + +class Project(DocumentWithSoftDelete): + """Document model of what is actually stored.""" + + # meaningful string id, always supplied + id: ShortStr = Field(alias="_id") # pyright: ignore[reportGeneralTypeIssues, reportIncompatibleVariableOverride] + title: ShortStr + authors: str + description: str + owner: PrefixedEmail + other: dict[str, Any] + is_public: bool = False + is_approved: bool = False + long_title: str + unique_identifiers: bool + references: list[Reference] + stats: Stats + columns: list[Column] + license: Literal["CCA4", "CCPD"] | None = None + + +# Project Responses +class ProjectSummary(BaseModel): + """Subset of fields to return when not all info is desired.""" + + id: Annotated[ShortStr, Field(alias="_id")] + owner: PrefixedEmail + unique_identifiers: bool + is_public: bool = False + is_approved: bool = False + title: ShortStr + + +class ProjectResponse(BaseModel): + """Full response of all public-facing fields.""" + + model_config = ConfigDict(extra="ignore") + id: Annotated[ShortStr | None, Field(alias="_id")] = None + authors: str | None = None + description: str | None = None + title: ShortStr | None = None + owner: PrefixedEmail | None = None + other: dict[str, Any] | None = None + is_public: bool | None = None + is_approved: bool | None = None + long_title: str | None = None + unique_identifiers: bool | None = None + references: list[Reference] | None = None + stats: Stats | None = None + columns: list[Column] | None = None + license: Literal["CCA4", "CCPD"] | None = None + + +# Filter to use for Projects +class ProjectFilter(Filter): + id: ShortStr | None = None + id__in: list[ShortStr] | None = None + id__neq: ShortStr | None = None + + title: ShortStr | None = None + title__in: list[ShortStr] | None = None + title__neq: ShortStr | None = None + title__ilike: str | None = None + + owner: PrefixedEmail | None = None + owner__in: list[PrefixedEmail] | None = None + owner__neq: PrefixedEmail | None = None + owner__ilike: str | None = None + + # fuzzy only + long_title__ilike: str | None = None + + is_public: bool | None = None + is_approved: bool | None = None + unique_identifiers: bool | None = None + + license: Literal["CCA4", "CCPD"] | None = None + license__in: list[Literal["CCA4", "CCPD"]] | None = None + + # sorting + order_by: list[str] | None = None + + class Constants(Filter.Constants): + model = Project + + +# Enum to determine which response model to use +class ProjectView(str, Enum): + full = "full" + summary = "summary" + + +_VIEW_MODELS: dict[ProjectView, type[BaseModel]] = { + ProjectView.full: ProjectResponse, + ProjectView.summary: ProjectSummary, +} diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py index e69de29bb2..31d36e138d 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py @@ -0,0 +1,120 @@ +from typing import Any, TypeVar, runtime_checkable + +from pydantic import BaseModel + +from src.mpcontribs_api.auth import User +from src.mpcontribs_api.domains.projects.models import ( + Project, + ProjectFilter, + ProjectResponse, +) +from src.mpcontribs_api.pagination import ( + CursorParams, + Page, + decode_cursor, + encode_cursor, +) + + +# Type checking to get around pyright issues +@runtime_checkable +class HasId(BaseModel): + id: str + + +V = TypeVar("V", bound=HasId) +M = TypeVar("M", bound=BaseModel) + +# class IScopedProjectRepository(Protocol): +# @overload +# async def get_project(self, query: dict[str, Any]) -> ProjectResponse | None: ... +# @overload +# async def get_project( +# self, query: dict[str, Any], *, view: type[BaseModel] +# ) -> BaseModel | None: ... +# async def get_project( +# self, +# query: dict[str, Any], +# *, +# view: type[BaseModel] = ProjectResponse, +# ) -> BaseModel | None: ... + +# @overload +# async def get_project_by_id(self, id: str) -> ProjectResponse | None: ... +# @overload +# async def get_project_by_id(self, id: str, *, view: type[M]) -> M | None: ... +# async def get_project_by_id( +# self, +# id: str, +# *, +# view: type[M] | None = None, +# ) -> M | ProjectResponse | None: ... + + +class MongoDbProjectRepository: + def __init__(self, user: User) -> None: + self._scope = self._build_scope(user) + + @staticmethod + def _build_scope(user: User) -> dict[str, Any]: + if user.is_admin: + return {} + ors: list[dict[str, Any]] = [{"is_public": True, "is_approved": True}] + if not user.is_anonymous: + ors.append({"owner": user.username}) + if user.groups: + ors.append({"_id": {"$in": sorted(user.groups)}}) + return {"$or": ors} + + def _scoped(self, *clauses: Any) -> dict[str, Any]: + parts = [c for c in (self._scope, *clauses) if c] + if not parts: + return {} + return parts[0] if len(parts) == 1 else {"$and": parts} + + async def get_project_by_id(self, id: str, *, view: type[M] | None = None): + # TODO: Verify that self._scope and Project.id == id get combined properly + return await Project.find_one( + self._scope, Project.id == id, projection_model=view + ) + + # Brendan TODO: Does not handle compound pagination/sorting (can only paginate on _id, so passing sort arguments does nothing) + async def get_project( + self, + filter: ProjectFilter, + pagination: CursorParams, + *, + view: type[V] | None = None, + ) -> Page[V | ProjectResponse]: + """Query the Project collection using filtering. + + Only considers the Projects that the User has access to. + + Args: + filter (ProjectFilter): the query to filter the collection by + pagination (CursorParams): parameters for pagination using a cursor + view (type[M]): The type of resposne we should return within the Page + """ + model = view or ProjectResponse + + # Filter projects to just the ones within the user scope + query = filter.filter(Project.find(self._scope)) + # If cursor was provided + if pagination.cursor is not None: + query = query.find( + Project.id > decode_cursor(pagination.cursor) + ) # seek past last-seen + + # Get Projects sorted by id (for pagination), project to requested model + docs = await ( + query.sort(Project.id) + .limit(pagination.limit + 1) # +1 probe to detect if there is a next page + .project(model) + .to_list() + ) + + # Check if we have more docs, return a Page containing just the number of docs requested and the encoded id for the next cursor + has_more = len(docs) > pagination.limit + items = docs[: pagination.limit] + next_cursor = encode_cursor(str(items[-1].id)) if has_more and items else None + return Page(items=items, next_cursor=next_cursor) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py index e69de29bb2..59c463a4c6 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py @@ -0,0 +1,44 @@ +from typing import Annotated + +from fastapi import APIRouter, Query +from fastapi_filter import FilterDepends +from pydantic import BaseModel + +from src.mpcontribs_api.domains.projects.dependencies import ProjectDep +from src.mpcontribs_api.domains.projects.models import ( + _VIEW_MODELS, + ProjectFilter, + ProjectResponse, + ProjectSummary, + ProjectView, +) +from src.mpcontribs_api.pagination import CursorParams + +router = APIRouter() + + +@router.get("", response_model=list[ProjectSummary]) +async def get_project( + repo: ProjectDep, + pagination: Annotated[CursorParams, Query()], + filter: ProjectFilter = FilterDepends(ProjectFilter), +): + return await repo.get_project(filter=filter, pagination=pagination) + + +@router.get("/{id}", response_model=ProjectResponse | ProjectSummary) +async def get_project_by_id( + id: str, + repo: ProjectDep, + *, + view: ProjectView = ProjectView.full, +): + return await repo.get_project_by_id(id=id, view=_VIEW_MODELS[view]) + + +@router.post("", response_model=ProjectResponse) +async def post_project( + repo: ProjectDep, + project: ProjectPost = Depends(authorize_resource), +): + return await repo.post(project=project) From 234cb38ec403b10968a9cd508efc294d4590353a Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 1 Jun 2026 16:09:34 -0700 Subject: [PATCH 248/591] Added shared dependencies for injection --- .../src/mpcontribs_api/dependencies.py | 74 +++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/mpcontribs-api/src/mpcontribs_api/dependencies.py b/mpcontribs-api/src/mpcontribs_api/dependencies.py index e69de29bb2..10f2112324 100644 --- a/mpcontribs-api/src/mpcontribs_api/dependencies.py +++ b/mpcontribs-api/src/mpcontribs_api/dependencies.py @@ -0,0 +1,74 @@ +import hmac +from typing import Annotated + +import structlog +from fastapi import Depends, Header, Request +from pymongo.asynchronous.database import AsyncDatabase + +from mpcontribs_api.auth import User +from src.mpcontribs_api.config import get_settings +from src.mpcontribs_api.exceptions import ( + AuthenticationError, + GatewayError, + PermissionError, +) + +settings = get_settings() + + +def verify_gateway(x_gateway_secret: Annotated[str | None, Header()] = None) -> None: + if x_gateway_secret is None or not hmac.compare_digest( + x_gateway_secret, str(settings.kong.gateway_secret) + ): + raise GatewayError("direct access not permitted") + + +def get_db(request: Request) -> AsyncDatabase: + return request.app.state.db + + +DbDep = Annotated[AsyncDatabase, Depends(get_db)] + + +def _split(raw: str | None) -> set[str]: + return {g.strip() for g in (raw or "").split(",") if g.strip()} + + +def get_user(request: Request) -> User: + h = request.headers + explicit_anon = h.get("x-anonymous-consumer", "").lower() == "true" + username = h.get("x-consumer-username") or None + if explicit_anon or username is None: + user = User() # anonymous = all defaults + else: + groups = _split(h.get("x-authenticated-groups")) | _split( + h.get("x-consumer-groups") + ) + user = User( + consumer_id=h.get("x-consumer-id"), + username=username, + groups=frozenset(groups), + ) + structlog.contextvars.bind_contextvars(consumer_id=user.consumer_id or "anonymous") + return user + + +UserDep = Annotated[User, Depends(get_user)] + + +def require_user(user: UserDep) -> User: + if user.is_anonymous: + raise AuthenticationError("authentication required") + return user + + +AuthedDep = Annotated[User, Depends(require_user)] + + +def require_role(role: str): + def checker(user: AuthedDep) -> User: + if not user.has_role(role): + raise PermissionError(required_role=role) + return user + + return Annotated[User, Depends(checker)] From 9abdfc604af9e1bc6af0e908c502f37a025cbc9a Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 1 Jun 2026 16:09:58 -0700 Subject: [PATCH 249/591] Added AuthenticationError and GatewayError for more control over thrown errors --- mpcontribs-api/src/mpcontribs_api/auth.py | 25 +++++++++++++++++ .../mpcontribs_api/domains/shared/models.py | 20 ++++++++++++++ .../src/mpcontribs_api/exceptions.py | 10 +++++++ .../src/mpcontribs_api/pagination.py | 27 +++++++++++++++++++ 4 files changed, 82 insertions(+) create mode 100644 mpcontribs-api/src/mpcontribs_api/auth.py create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/shared/models.py create mode 100644 mpcontribs-api/src/mpcontribs_api/pagination.py diff --git a/mpcontribs-api/src/mpcontribs_api/auth.py b/mpcontribs-api/src/mpcontribs_api/auth.py new file mode 100644 index 0000000000..6f82eb7e9f --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/auth.py @@ -0,0 +1,25 @@ +from pydantic import BaseModel, ConfigDict + +from src.mpcontribs_api.config import get_settings + +settings = get_settings() + +ADMIN_GROUP = settings.mongo.admin_group + + +class User(BaseModel): + model_config = ConfigDict(frozen=True) + consumer_id: str | None = None # opaque Kong id — logging/audit only + username: str | None = None + groups: frozenset[str] = frozenset() + + @property + def is_anonymous(self) -> bool: + return self.username is None + + @property + def is_admin(self) -> bool: + return ADMIN_GROUP in self.groups + + def has_role(self, role: str) -> bool: + return role in self.groups diff --git a/mpcontribs-api/src/mpcontribs_api/domains/shared/models.py b/mpcontribs-api/src/mpcontribs_api/domains/shared/models.py new file mode 100644 index 0000000000..dc0674f9e8 --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/domains/shared/models.py @@ -0,0 +1,20 @@ +from typing import Annotated + +from pydantic import BaseModel, Field + + +class PaginationParams(BaseModel): + skip: Annotated[int, Field(description="number of items to skip")] + limit: Annotated[int, Field(description="maximum number of items to return")] = 100 + page: Annotated[ + int, + Field( + description="page number to return (in batches of 'per_page'/'_limit'; alternative to _skip" + ), + ] + per_page: Annotated[ + int, + Field( + description="maximum number of items to return per page (same as '_limit')" + ), + ] diff --git a/mpcontribs-api/src/mpcontribs_api/exceptions.py b/mpcontribs-api/src/mpcontribs_api/exceptions.py index 6d62085443..b263c058c3 100644 --- a/mpcontribs-api/src/mpcontribs_api/exceptions.py +++ b/mpcontribs-api/src/mpcontribs_api/exceptions.py @@ -50,6 +50,16 @@ class PermissionError(AppError): error_code = "permission_denied" +class AuthenticationError(AppError): + status_code = 401 + error_code = "authentication_error" + + +class GatewayError(AppError): + status_code = 403 + error_code = "gateway_error" + + def _error_body(error_code: str, message: str, **public_context) -> dict: body: dict[str, Any] = {"error": {"code": error_code, "message": message}} if public_context: diff --git a/mpcontribs-api/src/mpcontribs_api/pagination.py b/mpcontribs-api/src/mpcontribs_api/pagination.py new file mode 100644 index 0000000000..9f543e5b53 --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/pagination.py @@ -0,0 +1,27 @@ +import base64 + +from pydantic import BaseModel, Field + + +class CursorParams(BaseModel): + # None == First page + cursor: str | None = None + # Per-page limit + limit: int = Field(default=20, ge=1, le=100) + + +class Page[T](BaseModel): + items: list[T] + # None == last page + next_cursor: str | None = None + + +def encode_cursor(last_id: str) -> str: + return base64.urlsafe_b64encode(last_id.encode()).decode() + + +def decode_cursor(cursor: str) -> str: + try: + return base64.urlsafe_b64decode(cursor.encode()).decode() + except (ValueError, UnicodeDecodeError): + raise ValueError("malformed cursor") From 3f266674f28c441c795fe2ef33a95c68d317ceb7 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 1 Jun 2026 16:14:24 -0700 Subject: [PATCH 250/591] Ruff formatting and checking --- .../src/mpcontribs_api/domains/projects/router.py | 1 - mpcontribs-api/src/mpcontribs_api/old/core.py | 1 + mpcontribs-ingester/mpcontribs/ingester/cli.py | 4 +++- mpcontribs-ingester/mpcontribs/ingester/webui.py | 11 +++++++++-- mpcontribs-kernel-gateway/make_seed.py | 1 - mpcontribs-portal/mpcontribs/portal/views.py | 2 -- .../mpcontribs/users/als_beamline/scripts/__main__.py | 3 ++- .../users/als_beamline/scripts/translate_PyPt.py | 3 --- .../users/dilute_solute_diffusion/pre_submission.py | 6 ++++-- .../mpcontribs/users/qmcdb/main/views.py | 5 +---- .../mpcontribs/users/qmcdb/records/views.py | 7 +------ .../users/redox_thermo_csp/pre_submission.py | 9 +++++---- .../users/redox_thermo_csp/update_energy_data.py | 3 +-- .../users/screening_inorganic_pv/pre_submission.py | 7 ++++--- .../mpcontribs/users/swf/pre_submission.py | 2 -- mpcontribs-portal/mpcontribs/users/utils.py | 3 ++- .../contribs.materialsproject.org/2dmatpedia.ipynb | 5 +++-- .../contribs.materialsproject.org/ExpXAS.ipynb | 3 +-- .../contribs.materialsproject.org/HFP2023.ipynb | 3 --- .../MnO2_phase_selection.ipynb | 3 ++- .../carrier_transport.ipynb | 6 +++--- .../dilute_solute_diffusion.ipynb | 6 ++++-- .../experimental_thermo.ipynb | 2 -- .../experimental_thermoelectrics.ipynb | 2 +- .../ferroelectrics.ipynb | 7 +++---- .../contribs.materialsproject.org/ion_ref_data.ipynb | 2 +- .../contribs.materialsproject.org/jarvis_dft.ipynb | 4 +++- .../contribs.materialsproject.org/matscholar.ipynb | 3 +-- .../contribs.materialsproject.org/mofexplorer.ipynb | 2 +- .../ocp/ocp-upload.ipynb | 1 - .../open_catalyst_project.ipynb | 4 +--- .../perovskites_diffusion.ipynb | 4 ++-- .../pydatarecognition.ipynb | 4 +--- .../screening_inorganic_pv.ipynb | 2 +- .../silicon_defects.ipynb | 4 ++-- .../springer_materials.ipynb | 2 +- .../transparent_conductors.ipynb | 1 - .../get_started.ipynb | 5 +---- .../ml.materialsproject.org/get_started.ipynb | 4 +++- mpcontribs-portal/wsgi.py | 1 - mpcontribs-serverless/make_download/app.py | 1 - 41 files changed, 68 insertions(+), 81 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py index 59c463a4c6..162c656aec 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py @@ -2,7 +2,6 @@ from fastapi import APIRouter, Query from fastapi_filter import FilterDepends -from pydantic import BaseModel from src.mpcontribs_api.domains.projects.dependencies import ProjectDep from src.mpcontribs_api.domains.projects.models import ( diff --git a/mpcontribs-api/src/mpcontribs_api/old/core.py b/mpcontribs-api/src/mpcontribs_api/old/core.py index 39da673ac3..a4a600db19 100644 --- a/mpcontribs-api/src/mpcontribs_api/old/core.py +++ b/mpcontribs-api/src/mpcontribs_api/old/core.py @@ -594,6 +594,7 @@ def has_read_permission(self, request, qs): from mpcontribs.api.contributions.document import get_resource resource = get_resource(component) + def qfilter(qs): return qs.clone() diff --git a/mpcontribs-ingester/mpcontribs/ingester/cli.py b/mpcontribs-ingester/mpcontribs/ingester/cli.py index 53965cc507..53267ef457 100644 --- a/mpcontribs-ingester/mpcontribs/ingester/cli.py +++ b/mpcontribs-ingester/mpcontribs/ingester/cli.py @@ -1,6 +1,8 @@ # -*- coding: utf-8 -*- # http://flask.pocoo.org/docs/0.10/patterns/appdispatch/ -import os, argparse, string +import os +import argparse +import string from werkzeug.serving import run_simple from werkzeug.wsgi import DispatcherMiddleware, SharedDataMiddleware from flask import Flask diff --git a/mpcontribs-ingester/mpcontribs/ingester/webui.py b/mpcontribs-ingester/mpcontribs/ingester/webui.py index 5d4f711563..c0b4debe56 100644 --- a/mpcontribs-ingester/mpcontribs/ingester/webui.py +++ b/mpcontribs-ingester/mpcontribs/ingester/webui.py @@ -1,7 +1,14 @@ from __future__ import unicode_literals, print_function, absolute_import -import json, os, socket, codecs, time, psutil -import sys, warnings, multiprocessing +import json +import os +import socket +import codecs +import time +import psutil +import sys +import warnings +import multiprocessing from tempfile import gettempdir from flask import render_template, request, Response, Blueprint, current_app from flask import url_for, redirect, make_response, stream_with_context, jsonify diff --git a/mpcontribs-kernel-gateway/make_seed.py b/mpcontribs-kernel-gateway/make_seed.py index f92a5df7c9..28aa21e0d1 100644 --- a/mpcontribs-kernel-gateway/make_seed.py +++ b/mpcontribs-kernel-gateway/make_seed.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -import ddtrace.auto import nbformat as nbf nb = nbf.v4.new_notebook() diff --git a/mpcontribs-portal/mpcontribs/portal/views.py b/mpcontribs-portal/mpcontribs/portal/views.py index 879ca4de14..f8aa3d9762 100644 --- a/mpcontribs-portal/mpcontribs/portal/views.py +++ b/mpcontribs-portal/mpcontribs/portal/views.py @@ -12,8 +12,6 @@ from redis import Redis from io import BytesIO from copy import deepcopy -from pathlib import Path -from shutil import make_archive, rmtree from nbconvert import HTMLExporter from bravado.exception import HTTPNotFound from json2html import Json2Html diff --git a/mpcontribs-portal/mpcontribs/users/als_beamline/scripts/__main__.py b/mpcontribs-portal/mpcontribs/users/als_beamline/scripts/__main__.py index bcd0122bda..4fc72ada4a 100644 --- a/mpcontribs-portal/mpcontribs/users/als_beamline/scripts/__main__.py +++ b/mpcontribs-portal/mpcontribs/users/als_beamline/scripts/__main__.py @@ -1,4 +1,5 @@ -import argparse, os +import argparse +import os from mpcontribs.io.archieml.mpfile import MPFile from pre_submission import * diff --git a/mpcontribs-portal/mpcontribs/users/als_beamline/scripts/translate_PyPt.py b/mpcontribs-portal/mpcontribs/users/als_beamline/scripts/translate_PyPt.py index 995f5d045d..232914ab86 100644 --- a/mpcontribs-portal/mpcontribs/users/als_beamline/scripts/translate_PyPt.py +++ b/mpcontribs-portal/mpcontribs/users/als_beamline/scripts/translate_PyPt.py @@ -1,6 +1,3 @@ -import pandas as pd -import os -from scipy.interpolate import interp2d def get_translate(workdir=None): diff --git a/mpcontribs-portal/mpcontribs/users/dilute_solute_diffusion/pre_submission.py b/mpcontribs-portal/mpcontribs/users/dilute_solute_diffusion/pre_submission.py index ed983aaf7e..daaac921db 100644 --- a/mpcontribs-portal/mpcontribs/users/dilute_solute_diffusion/pre_submission.py +++ b/mpcontribs-portal/mpcontribs/users/dilute_solute_diffusion/pre_submission.py @@ -1,4 +1,6 @@ -import os, json, requests, sys +import os +import json +import requests from pandas import read_excel, isnull, ExcelWriter, Series from mpcontribs.io.core.recdict import RecursiveDict from mpcontribs.io.core.utils import clean_value, nest_dict @@ -59,7 +61,7 @@ def run(mpfile, hosts=None, download=False): if hosts is not None: if isinstance(hosts, int) and idx + 1 > hosts: break - elif isinstance(hosts, list) and not host in hosts: + elif isinstance(hosts, list) and host not in hosts: continue print("get mp-id for {}".format(host)) diff --git a/mpcontribs-portal/mpcontribs/users/qmcdb/main/views.py b/mpcontribs-portal/mpcontribs/users/qmcdb/main/views.py index 4e4c20ac48..cd80073db9 100644 --- a/mpcontribs-portal/mpcontribs/users/qmcdb/main/views.py +++ b/mpcontribs-portal/mpcontribs/users/qmcdb/main/views.py @@ -1,8 +1,5 @@ from django.shortcuts import render -from django.http import HttpResponseRedirect -from django.contrib.auth.decorators import login_required -from records.forms import MaterialQueryForm, MaterialSubmissionForm -from records.tables import QMCDBSetTable +from records.forms import MaterialQueryForm from records.models import QMCDBSet from django.utils.safestring import mark_safe from django.utils.html import escape diff --git a/mpcontribs-portal/mpcontribs/users/qmcdb/records/views.py b/mpcontribs-portal/mpcontribs/users/qmcdb/records/views.py index c0f0cc1372..589ef8e3e7 100644 --- a/mpcontribs-portal/mpcontribs/users/qmcdb/records/views.py +++ b/mpcontribs-portal/mpcontribs/users/qmcdb/records/views.py @@ -1,18 +1,13 @@ from __future__ import division from django.shortcuts import render from django.http import HttpResponseRedirect, HttpResponse -from django.contrib.auth.decorators import login_required from rest_framework import status from rest_framework.decorators import api_view from rest_framework.response import Response -from records.forms import MaterialQueryForm, MaterialSubmissionForm +from records.forms import MaterialSubmissionForm from records.models import QMCDBSet from records.serializers import QMCDBSetSerializer -from rest_framework.renderers import JSONRenderer -from rest_framework.parsers import JSONParser -from django.utils.six import BytesIO from django.utils.safestring import mark_safe -import numpy as np def manual_qmc_record_submission(request): diff --git a/mpcontribs-portal/mpcontribs/users/redox_thermo_csp/pre_submission.py b/mpcontribs-portal/mpcontribs/users/redox_thermo_csp/pre_submission.py index 15cfaf4de7..e95fd1f18c 100644 --- a/mpcontribs-portal/mpcontribs/users/redox_thermo_csp/pre_submission.py +++ b/mpcontribs-portal/mpcontribs/users/redox_thermo_csp/pre_submission.py @@ -1,16 +1,17 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -import os, json, re, sys +import os +import json +import re +import sys from glob import glob from datetime import datetime from itertools import groupby import pandas as pd -from mpcontribs.io.core.utils import get_composition_from_string from mpcontribs.io.core.recdict import RecursiveDict -from mpcontribs.io.core.utils import clean_value, read_csv, nest_dict +from mpcontribs.io.core.utils import clean_value, read_csv from mpcontribs.io.core.components import Table from mpcontribs.users.utils import duplicate_check -from mpcontribs.users.redox_thermo_csp.utils import redenth_act, get_debye_temp def get_fit_pars(sample_number): diff --git a/mpcontribs-portal/mpcontribs/users/redox_thermo_csp/update_energy_data.py b/mpcontribs-portal/mpcontribs/users/redox_thermo_csp/update_energy_data.py index b2eed60d99..3701993937 100644 --- a/mpcontribs-portal/mpcontribs/users/redox_thermo_csp/update_energy_data.py +++ b/mpcontribs-portal/mpcontribs/users/redox_thermo_csp/update_energy_data.py @@ -2,7 +2,6 @@ import datetime import os import shutil -import numpy as np from energy_analysis import EnergyAnalysis as enera from views import unstable_phases as unst @@ -21,7 +20,7 @@ new_energy_data = old_energy_data for db_id in paramlist: - if not "Exp" in db_id: + if "Exp" not in db_id: print(db_id) data_source = "Theo" # updates only theoretical data celsius = "True" # always True, parameter input in K currently disabled diff --git a/mpcontribs-portal/mpcontribs/users/screening_inorganic_pv/pre_submission.py b/mpcontribs-portal/mpcontribs/users/screening_inorganic_pv/pre_submission.py index b9eb3cfa4b..610f864cc7 100644 --- a/mpcontribs-portal/mpcontribs/users/screening_inorganic_pv/pre_submission.py +++ b/mpcontribs-portal/mpcontribs/users/screening_inorganic_pv/pre_submission.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- -import os, json +import os +import json from pandas import DataFrame from mpcontribs.io.core.recdict import RecursiveDict from mpcontribs.io.core.utils import clean_value @@ -47,11 +48,11 @@ def run(mpfile, **kwargs): rd = RecursiveDict({"formula": formula}) for k, v in config.items(): value = clean_value(d[k], v[1], max_dgts=4) - if not "." in v[0]: + if "." not in v[0]: rd[v[0]] = value else: keys = v[0].split(".") - if not keys[0] in rd: + if keys[0] not in rd: rd[keys[0]] = RecursiveDict({keys[1]: value}) else: rd[keys[0]][keys[1]] = value diff --git a/mpcontribs-portal/mpcontribs/users/swf/pre_submission.py b/mpcontribs-portal/mpcontribs/users/swf/pre_submission.py index 98b38034fd..705329fbe8 100644 --- a/mpcontribs-portal/mpcontribs/users/swf/pre_submission.py +++ b/mpcontribs-portal/mpcontribs/users/swf/pre_submission.py @@ -1,5 +1,4 @@ from mpcontribs.config import mp_level01_titles -from mpcontribs.io.core.recdict import RecursiveDict from mpcontribs.io.core.utils import clean_value, get_composition_from_string from mpcontribs.users.utils import duplicate_check @@ -26,7 +25,6 @@ def round_to_100_percent(number_set, digit_after_decimal=1): def run(mpfile, **kwargs): import pymatgen import pandas as pd - from mpcontribs.users.swf.rest.rester import SwfRester # load data from google sheet google_sheet = mpfile.document[mp_level01_titles[0]].pop("google_sheet") diff --git a/mpcontribs-portal/mpcontribs/users/utils.py b/mpcontribs-portal/mpcontribs/users/utils.py index 487f9af679..86f141c1bd 100644 --- a/mpcontribs-portal/mpcontribs/users/utils.py +++ b/mpcontribs-portal/mpcontribs/users/utils.py @@ -1,4 +1,5 @@ -import inspect, os +import inspect +import os from typing import Any, Dict diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/2dmatpedia.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/2dmatpedia.ipynb index 69f3d106fe..7f82cf7085 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/2dmatpedia.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/2dmatpedia.ipynb @@ -6,9 +6,10 @@ "metadata": {}, "outputs": [], "source": [ - "import os, gzip, json\n", + "import os\n", + "import gzip\n", + "import json\n", "from mpcontribs.client import Client\n", - "from pymatgen.core import Structure\n", "from pymatgen.ext.matproj import MPRester\n", "from urllib.request import urlretrieve\n", "from monty.json import MontyDecoder" diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ExpXAS.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ExpXAS.ipynb index cd83f60e0d..abe2f054f3 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ExpXAS.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ExpXAS.ipynb @@ -10,8 +10,7 @@ "from mpcontribs.client import Client\n", "from pathlib import Path\n", "from pandas import read_csv\n", - "import pandas as pd\n", - "import numpy as np" + "import pandas as pd" ] }, { diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/HFP2023.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/HFP2023.ipynb index 586cdc419f..d4b05adf45 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/HFP2023.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/HFP2023.ipynb @@ -9,15 +9,12 @@ "source": [ "%env MPRESTER_MUTE_PROGRESS_BARS 1\n", "# pip install mpcontribs-client mp_api pandas flatten_dict\n", - "import os\n", "import gzip\n", "import json\n", "\n", "from pathlib import Path\n", "from mpcontribs.client import Client\n", - "from mp_api.client import MPRester\n", "from pymatgen.core import Structure\n", - "from pandas import read_csv\n", "from flatten_dict import flatten, unflatten" ] }, diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/MnO2_phase_selection.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/MnO2_phase_selection.ipynb index 8a2c617383..613e73e740 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/MnO2_phase_selection.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/MnO2_phase_selection.ipynb @@ -6,7 +6,8 @@ "metadata": {}, "outputs": [], "source": [ - "import json, os\n", + "import json\n", + "import os\n", "from mpcontribs.client import Client\n", "from pymatgen.core import Composition, Structure\n", "from pymatgen.ext.matproj import MPRester\n", diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/carrier_transport.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/carrier_transport.ipynb index 2ec37c22e1..fb0a3b5397 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/carrier_transport.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/carrier_transport.ipynb @@ -7,13 +7,13 @@ "outputs": [], "source": [ "from mpcontribs.client import Client\n", - "import gzip, json, os\n", + "import gzip\n", + "import json\n", + "import os\n", "import numpy as np\n", "from pandas import DataFrame\n", - "from collections import defaultdict\n", "from tqdm.notebook import tqdm\n", "from unflatten import unflatten\n", - "from pathlib import Path\n", "\n", "name = \"carrier_transport\"" ] diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/dilute_solute_diffusion.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/dilute_solute_diffusion.ipynb index e3b6065de2..b03877f2ea 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/dilute_solute_diffusion.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/dilute_solute_diffusion.ipynb @@ -28,7 +28,9 @@ "metadata": {}, "outputs": [], "source": [ - "import os, json, requests, sys\n", + "import os\n", + "import json\n", + "import requests\n", "from pandas import read_excel, isnull, ExcelWriter, Series\n", "from mp_api.client import MPRester\n", "from pathlib import Path\n", @@ -117,7 +119,7 @@ " if hosts is not None:\n", " if isinstance(hosts, int) and idx + 1 > hosts:\n", " break\n", - " elif isinstance(hosts, list) and not host in hosts:\n", + " elif isinstance(hosts, list) and host not in hosts:\n", " continue\n", "\n", " print(\"get mp-id for {}\".format(host))\n", diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/experimental_thermo.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/experimental_thermo.ipynb index 2e92f6d283..8353c4de4b 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/experimental_thermo.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/experimental_thermo.ipynb @@ -48,8 +48,6 @@ "from pathlib import Path\n", "import re\n", "from tqdm import tqdm\n", - "import numpy as np\n", - "import xlrd\n", "from monty.serialization import loadfn, dumpfn" ] }, diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/experimental_thermoelectrics.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/experimental_thermoelectrics.ipynb index f06b9b04b4..7526af6ba1 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/experimental_thermoelectrics.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/experimental_thermoelectrics.ipynb @@ -11,7 +11,7 @@ "from mp_api.client import MPRester\n", "import pandas as pd\n", "import os\n", - "from flatten_dict import unflatten, flatten\n", + "from flatten_dict import unflatten\n", "from math import isnan" ] }, diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ferroelectrics.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ferroelectrics.ipynb index d8dada5c99..813671be85 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ferroelectrics.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ferroelectrics.ipynb @@ -11,10 +11,9 @@ "source": [ "import json\n", "import numpy as np\n", - "from mpcontribs.client import Client, Attachment\n", + "from mpcontribs.client import Client\n", "from pathlib import Path\n", - "from flatten_dict import flatten, unflatten\n", - "from pymatgen.core import Structure" + "from flatten_dict import flatten, unflatten" ] }, { @@ -253,7 +252,7 @@ " if conf and k.startswith(\"polarization\") and isinstance(v, list):\n", " name, fields = conf[\"name\"], conf[\"fields\"]\n", " contrib[\"data\"].setdefault(name, {})\n", - " if not \"unit\" in conf:\n", + " if \"unit\" not in conf:\n", " vmax, unit = max(v), fields[\"max\"]\n", " contrib[\"data\"][name][\"max\"] = f\"{round(vmax, 3)} {unit}\" if unit else v\n", " contrib[\"data\"][name][\"index\"] = v.index(vmax)\n", diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ion_ref_data.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ion_ref_data.ipynb index 89e280eb7b..ca14d3f31a 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ion_ref_data.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ion_ref_data.ipynb @@ -29,7 +29,7 @@ "outputs": [], "source": [ "from pprint import pprint\n", - "from monty.serialization import loadfn, dumpfn\n", + "from monty.serialization import loadfn\n", "from pymatgen.core.ion import Ion" ] }, diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/jarvis_dft.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/jarvis_dft.ipynb index d4cd3b7a82..3de2a4beaf 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/jarvis_dft.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/jarvis_dft.ipynb @@ -6,7 +6,9 @@ "metadata": {}, "outputs": [], "source": [ - "import os, json, tarfile\n", + "import os\n", + "import json\n", + "import tarfile\n", "from mpcontribs.client import Client\n", "from urllib.request import urlretrieve\n", "from monty.json import MontyDecoder\n", diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/matscholar.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/matscholar.ipynb index d7a25425df..979b0aaa7f 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/matscholar.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/matscholar.ipynb @@ -7,8 +7,7 @@ "metadata": {}, "outputs": [], "source": [ - "from pathlib import Path\n", - "from mpcontribs.client import Client, Attachment" + "from mpcontribs.client import Client" ] }, { diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/mofexplorer.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/mofexplorer.ipynb index 08413c8f15..2ef808fd49 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/mofexplorer.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/mofexplorer.ipynb @@ -76,7 +76,7 @@ " raw = vs[-1].replace(\"^3\", \"³\")\n", " if raw in ureg:\n", " value, unit = vs[0], raw\n", - " except Exception as e:\n", + " except Exception:\n", " value, unit = v, None\n", " else:\n", " value, unit = vs[0], None\n", diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ocp/ocp-upload.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ocp/ocp-upload.ipynb index c72041478e..712452dfbf 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ocp/ocp-upload.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ocp/ocp-upload.ipynb @@ -12,7 +12,6 @@ "from ujson import load\n", "from pymatgen.core.structure import Molecule, Structure\n", "from pathlib import Path\n", - "from time import time\n", "from mpcontribs.client import Client\n", "from tqdm.auto import tqdm" ] diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/open_catalyst_project.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/open_catalyst_project.ipynb index 8eb3de6f2c..a25ff13d05 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/open_catalyst_project.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/open_catalyst_project.ipynb @@ -9,10 +9,8 @@ "source": [ "from mpcontribs.client import Client\n", "from monty.serialization import loadfn\n", - "from json import loads\n", "from pymatgen.core.structure import Molecule, Structure\n", - "from pathlib import Path\n", - "from time import time" + "from pathlib import Path" ] }, { diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/perovskites_diffusion.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/perovskites_diffusion.ipynb index 95d05e6214..a702178910 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/perovskites_diffusion.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/perovskites_diffusion.ipynb @@ -53,7 +53,7 @@ "metadata": {}, "outputs": [], "source": [ - "import tarfile, os\n", + "import tarfile\n", "from pandas import read_excel\n", "\n", "units = {\n", @@ -97,7 +97,7 @@ " key = keys[col]\n", " if isinstance(key, str):\n", " key = key.strip()\n", - " if not key in abbreviations:\n", + " if key not in abbreviations:\n", " abbreviations[key] = col\n", " else:\n", " key = col.strip().lower()\n", diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/pydatarecognition.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/pydatarecognition.ipynb index 22b459f9bb..cc12f86a43 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/pydatarecognition.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/pydatarecognition.ipynb @@ -8,11 +8,9 @@ "outputs": [], "source": [ "%env MPRESTER_MUTE_PROGRESS_BARS 1\n", - "import os\n", "from pathlib import Path\n", "from mpcontribs.client import Client\n", - "from mp_api.client import MPRester\n", - "from flatten_dict import unflatten, flatten\n", + "from flatten_dict import unflatten\n", "from pymatgen.io.cif import CifParser\n", "from pandas import DataFrame\n", "import numpy as np" diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/screening_inorganic_pv.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/screening_inorganic_pv.ipynb index b41e2dc9ed..07d2043bee 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/screening_inorganic_pv.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/screening_inorganic_pv.ipynb @@ -6,7 +6,7 @@ "metadata": {}, "outputs": [], "source": [ - "import os, json\n", + "import json\n", "from pathlib import Path\n", "from pandas import DataFrame\n", "from mpcontribs.client import Client\n", diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/silicon_defects.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/silicon_defects.ipynb index 159beb7221..ab3ab1d059 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/silicon_defects.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/silicon_defects.ipynb @@ -11,7 +11,7 @@ "from mpcontribs.client import Client, Attachment\n", "from pymatgen.core import Structure\n", "from pathlib import Path\n", - "from flatten_dict import flatten, unflatten" + "from flatten_dict import flatten" ] }, { @@ -95,7 +95,7 @@ "}\n", "\n", "for k, v in list(reorg.items()):\n", - " if not \"unit\" in v:\n", + " if \"unit\" not in v:\n", " root_field = reorg.pop(k).get(\"field\")\n", "\n", " for kk, vv in excitation_reorg.items():\n", diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/springer_materials.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/springer_materials.ipynb index 88483a98ea..0ec1ad6dc4 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/springer_materials.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/springer_materials.ipynb @@ -11,7 +11,7 @@ "import re\n", "from glob import glob\n", "from mpcontribs.client import Client\n", - "from flatten_dict import unflatten, flatten" + "from flatten_dict import unflatten" ] }, { diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/transparent_conductors.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/transparent_conductors.ipynb index 2fc544b746..bd48684926 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/transparent_conductors.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/transparent_conductors.ipynb @@ -7,7 +7,6 @@ "metadata": {}, "outputs": [], "source": [ - "import tarfile, os\n", "import numpy as np\n", "from pandas import read_excel\n", "from mpcontribs.client import Client" diff --git a/mpcontribs-portal/notebooks/lightsources.materialsproject.org/get_started.ipynb b/mpcontribs-portal/notebooks/lightsources.materialsproject.org/get_started.ipynb index 17ee152009..5edfa98091 100644 --- a/mpcontribs-portal/notebooks/lightsources.materialsproject.org/get_started.ipynb +++ b/mpcontribs-portal/notebooks/lightsources.materialsproject.org/get_started.ipynb @@ -7,8 +7,6 @@ "outputs": [], "source": [ "import os\n", - "import json\n", - "import gzip\n", "from zipfile import ZipFile\n", "from io import StringIO, BytesIO\n", "from numpy import where\n", @@ -16,8 +14,7 @@ "from pandas import to_numeric, read_csv\n", "from mpcontribs.client import Client, Attachment\n", "from tqdm.notebook import tqdm\n", - "from decimal import Decimal\n", - "from pathlib import Path" + "from decimal import Decimal" ] }, { diff --git a/mpcontribs-portal/notebooks/ml.materialsproject.org/get_started.ipynb b/mpcontribs-portal/notebooks/ml.materialsproject.org/get_started.ipynb index ed4e3c02dd..c43784529b 100644 --- a/mpcontribs-portal/notebooks/ml.materialsproject.org/get_started.ipynb +++ b/mpcontribs-portal/notebooks/ml.materialsproject.org/get_started.ipynb @@ -6,7 +6,9 @@ "metadata": {}, "outputs": [], "source": [ - "import wget, json, os, math\n", + "import wget\n", + "import json\n", + "import math\n", "from pathlib import Path\n", "from string import capwords\n", "from pybtex.database import parse_string\n", diff --git a/mpcontribs-portal/wsgi.py b/mpcontribs-portal/wsgi.py index e314b76514..96ebc59a28 100644 --- a/mpcontribs-portal/wsgi.py +++ b/mpcontribs-portal/wsgi.py @@ -1,7 +1,6 @@ # -*- coding: utf-8 -*- import re import os -import ddtrace.auto import django_settings_file from django.core.wsgi import get_wsgi_application from whitenoise import WhiteNoise diff --git a/mpcontribs-serverless/make_download/app.py b/mpcontribs-serverless/make_download/app.py index 8c97bce147..f7031828a6 100644 --- a/mpcontribs-serverless/make_download/app.py +++ b/mpcontribs-serverless/make_download/app.py @@ -1,6 +1,5 @@ # TODO ddtrace import os -import json import logging import boto3 From b6c39612f4769a7f2e512a015a0f375690282a9f Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 1 Jun 2026 16:19:51 -0700 Subject: [PATCH 251/591] PrefixedEmail now throws ValidationError instead of ValueError --- mpcontribs-api/src/mpcontribs_api/types.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mpcontribs-api/src/mpcontribs_api/types.py b/mpcontribs-api/src/mpcontribs_api/types.py index 9607ef6980..3420b70ebb 100644 --- a/mpcontribs-api/src/mpcontribs_api/types.py +++ b/mpcontribs-api/src/mpcontribs_api/types.py @@ -3,6 +3,8 @@ from pandas.core.arrays.string_arrow import re from pydantic import BeforeValidator, Field +from src.mpcontribs_api.exceptions import ValidationError + ShortStr = Annotated[str, Field(min_length=3, max_length=30)] @@ -12,7 +14,7 @@ def _validate_prefixed_email(v: str) -> str: v = v.strip() if not _EMAIL_RE.match(v): - raise ValueError( + raise ValidationError( "must match ':@', e.g. 'google:name@gmail.com'" ) return v From 92cb3ff9028febb7d3251a52e4a262b975ebba9e Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 1 Jun 2026 16:44:23 -0700 Subject: [PATCH 252/591] Changed ProjectResource for ProjectOut for consistency with ProjectIn. Added create_project --- .../mpcontribs_api/domains/projects/models.py | 35 +++++++++++++----- .../domains/projects/repository.py | 37 +++++-------------- .../mpcontribs_api/domains/projects/router.py | 11 +++--- 3 files changed, 41 insertions(+), 42 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py index 07c624c95d..357fcbb75f 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py @@ -1,3 +1,5 @@ +from __future__ import annotations + from enum import Enum from typing import Annotated, Any, Literal @@ -37,22 +39,30 @@ class Reference(BaseModel): class Project(DocumentWithSoftDelete): """Document model of what is actually stored.""" + # Required # meaningful string id, always supplied id: ShortStr = Field(alias="_id") # pyright: ignore[reportGeneralTypeIssues, reportIncompatibleVariableOverride] title: ShortStr authors: str description: str owner: PrefixedEmail - other: dict[str, Any] - is_public: bool = False - is_approved: bool = False - long_title: str unique_identifiers: bool - references: list[Reference] stats: Stats - columns: list[Column] + + # Optional + references: list[Reference] = Field(default_factory=list) + long_title: str | None = None + other: dict[str, Any] = Field(default_factory=dict) + columns: list[Column] = Field(default_factory=list) + is_public: bool = False + is_approved: bool = False license: Literal["CCA4", "CCPD"] | None = None + # Empty method for now. Keeping for business logic later + @classmethod + def from_project_in(cls, data: ProjectIn) -> Project: + return cls(**data.model_dump()) + # Project Responses class ProjectSummary(BaseModel): @@ -66,11 +76,13 @@ class ProjectSummary(BaseModel): title: ShortStr -class ProjectResponse(BaseModel): +class ProjectOut(BaseModel): """Full response of all public-facing fields.""" model_config = ConfigDict(extra="ignore") - id: Annotated[ShortStr | None, Field(alias="_id")] = None + id: Annotated[ + ShortStr | None, Field(validation_alias="_id", serialization_alias="id") + ] = None authors: str | None = None description: str | None = None title: ShortStr | None = None @@ -119,6 +131,11 @@ class Constants(Filter.Constants): model = Project +# Keeping for business logic separation. May have specific implementation later +class ProjectIn(Project): + pass + + # Enum to determine which response model to use class ProjectView(str, Enum): full = "full" @@ -126,6 +143,6 @@ class ProjectView(str, Enum): _VIEW_MODELS: dict[ProjectView, type[BaseModel]] = { - ProjectView.full: ProjectResponse, + ProjectView.full: ProjectOut, ProjectView.summary: ProjectSummary, } diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py index 31d36e138d..553195f77b 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py @@ -6,7 +6,8 @@ from src.mpcontribs_api.domains.projects.models import ( Project, ProjectFilter, - ProjectResponse, + ProjectIn, + ProjectOut, ) from src.mpcontribs_api.pagination import ( CursorParams, @@ -25,31 +26,6 @@ class HasId(BaseModel): V = TypeVar("V", bound=HasId) M = TypeVar("M", bound=BaseModel) -# class IScopedProjectRepository(Protocol): -# @overload -# async def get_project(self, query: dict[str, Any]) -> ProjectResponse | None: ... -# @overload -# async def get_project( -# self, query: dict[str, Any], *, view: type[BaseModel] -# ) -> BaseModel | None: ... -# async def get_project( -# self, -# query: dict[str, Any], -# *, -# view: type[BaseModel] = ProjectResponse, -# ) -> BaseModel | None: ... - -# @overload -# async def get_project_by_id(self, id: str) -> ProjectResponse | None: ... -# @overload -# async def get_project_by_id(self, id: str, *, view: type[M]) -> M | None: ... -# async def get_project_by_id( -# self, -# id: str, -# *, -# view: type[M] | None = None, -# ) -> M | ProjectResponse | None: ... - class MongoDbProjectRepository: def __init__(self, user: User) -> None: @@ -85,7 +61,7 @@ async def get_project( pagination: CursorParams, *, view: type[V] | None = None, - ) -> Page[V | ProjectResponse]: + ) -> Page[V | ProjectOut]: """Query the Project collection using filtering. Only considers the Projects that the User has access to. @@ -95,7 +71,7 @@ async def get_project( pagination (CursorParams): parameters for pagination using a cursor view (type[M]): The type of resposne we should return within the Page """ - model = view or ProjectResponse + model = view or ProjectOut # Filter projects to just the ones within the user scope query = filter.filter(Project.find(self._scope)) @@ -118,3 +94,8 @@ async def get_project( items = docs[: pagination.limit] next_cursor = encode_cursor(str(items[-1].id)) if has_more and items else None return Page(items=items, next_cursor=next_cursor) + + async def create_project(self, project: ProjectIn) -> ProjectOut: + full_project = Project.from_project_in(project) + await full_project.insert() + return ProjectOut.model_validate(full_project) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py index 162c656aec..140e04d0c2 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py @@ -7,7 +7,8 @@ from src.mpcontribs_api.domains.projects.models import ( _VIEW_MODELS, ProjectFilter, - ProjectResponse, + ProjectIn, + ProjectOut, ProjectSummary, ProjectView, ) @@ -25,7 +26,7 @@ async def get_project( return await repo.get_project(filter=filter, pagination=pagination) -@router.get("/{id}", response_model=ProjectResponse | ProjectSummary) +@router.get("/{id}", response_model=ProjectOut | ProjectSummary) async def get_project_by_id( id: str, repo: ProjectDep, @@ -35,9 +36,9 @@ async def get_project_by_id( return await repo.get_project_by_id(id=id, view=_VIEW_MODELS[view]) -@router.post("", response_model=ProjectResponse) +@router.post("", response_model=ProjectOut) async def post_project( repo: ProjectDep, - project: ProjectPost = Depends(authorize_resource), + project: ProjectIn, ): - return await repo.post(project=project) + return await repo.create_project(project=project) From a4ec4612cd837c01aba705bb7f1b56baf3167306 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 1 Jun 2026 16:44:56 -0700 Subject: [PATCH 253/591] Changed create_project to insert_project --- .../src/mpcontribs_api/domains/projects/repository.py | 2 +- mpcontribs-api/src/mpcontribs_api/domains/projects/router.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py index 553195f77b..fc5ae1b283 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py @@ -95,7 +95,7 @@ async def get_project( next_cursor = encode_cursor(str(items[-1].id)) if has_more and items else None return Page(items=items, next_cursor=next_cursor) - async def create_project(self, project: ProjectIn) -> ProjectOut: + async def insert_project(self, project: ProjectIn) -> ProjectOut: full_project = Project.from_project_in(project) await full_project.insert() return ProjectOut.model_validate(full_project) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py index 140e04d0c2..cd73869d05 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py @@ -37,8 +37,8 @@ async def get_project_by_id( @router.post("", response_model=ProjectOut) -async def post_project( +async def insert_project( repo: ProjectDep, project: ProjectIn, ): - return await repo.create_project(project=project) + return await repo.insert_project(project=project) From a5ac73afcf014377e4ca989572e6b2a63e65dea7 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 1 Jun 2026 17:21:54 -0700 Subject: [PATCH 254/591] Added Project patch for partial udpates --- .../mpcontribs_api/domains/projects/models.py | 17 +++++++++ .../domains/projects/repository.py | 37 +++++++++++++++++++ .../mpcontribs_api/domains/projects/router.py | 22 +++++++++++ 3 files changed, 76 insertions(+) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py index 357fcbb75f..03614d1a3f 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py @@ -136,6 +136,23 @@ class ProjectIn(Project): pass +class ProjectPatch(BaseModel): + id: ShortStr | None = Field(default=None, alias="_id") + title: ShortStr | None = None + authors: str | None = None + description: str | None = None + owner: PrefixedEmail | None = None + unique_identifiers: bool | None = None + stats: Stats | None = None + references: list[Reference] = Field(default_factory=list) + long_title: str | None = None + other: dict[str, Any] = Field(default_factory=dict) + columns: list[Column] = Field(default_factory=list) + is_public: bool = False + is_approved: bool = False + license: Literal["CCA4", "CCPD"] | None = None + + # Enum to determine which response model to use class ProjectView(str, Enum): full = "full" diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py index fc5ae1b283..8d170fb6d8 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py @@ -1,5 +1,7 @@ from typing import Any, TypeVar, runtime_checkable +from beanie import UpdateResponse +from beanie.operators import Set from pydantic import BaseModel from src.mpcontribs_api.auth import User @@ -8,7 +10,9 @@ ProjectFilter, ProjectIn, ProjectOut, + ProjectPatch, ) +from src.mpcontribs_api.exceptions import NotFoundError from src.mpcontribs_api.pagination import ( CursorParams, Page, @@ -99,3 +103,36 @@ async def insert_project(self, project: ProjectIn) -> ProjectOut: full_project = Project.from_project_in(project) await full_project.insert() return ProjectOut.model_validate(full_project) + + async def patch_project(self, id: str, update: ProjectPatch) -> ProjectOut: + """Partial update to project identified with 'id'. + + Note: overwrites fields with given values - arrays are not appended to. + + Args: + id (str): the id of the project to update + update (ProjectPatch): the partial update to apply - unset fields are dropped + - Note: If fields are intentionally set to None, None is applied to the field. + + Returns: + The Project with updates applied + """ + # Only retain set fields (patch) + update_data = update.model_dump(exclude_unset=True) + # If update is empty, return the model anyways (consistent behavior) + if not update_data: + existing = await Project.get(Project.id == id) + if existing is None: + raise NotFoundError(f"Project with id {id} not found") + return ProjectOut.model_validate(existing, from_attributes=True) + + # Otherwise, update the fields fully (set) + # Brendan TODO: Set will replace an entire field + # - if we want to append to a list (ie. add a reference) we ned Push/AddToSet + updated = Project.find_one(Project.id == id).update( + Set(update_data), + response_type=UpdateResponse.NEW_DOCUMENT, + ) + if updated is None: + raise NotFoundError(f"Project with id {id} not found") + return ProjectOut.model_validate(updated, from_attributes=True) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py index cd73869d05..2db7ff1dfa 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py @@ -9,6 +9,7 @@ ProjectFilter, ProjectIn, ProjectOut, + ProjectPatch, ProjectSummary, ProjectView, ) @@ -42,3 +43,24 @@ async def insert_project( project: ProjectIn, ): return await repo.insert_project(project=project) + + +@router.patch(f"{id}", response_model=ProjectOut) +async def patch_project( + repo: ProjectDep, + id: str, + update: ProjectPatch, +): + """Partial update to project identified with 'id'. + + Note: overwrites fields with given values - arrays are not appended to. + + Args: + id (str): the id of the project to update + update (ProjectPatch): the partial update to apply - unset fields are dropped + - Note: If fields are intentionally set to None, None is applied to the field. + + Returns: + The Project with updates applied + """ + return await repo.patch_project(id=id, update=update) From c211b446de5c6c1dc7da5612e43114302400df06 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 1 Jun 2026 17:27:21 -0700 Subject: [PATCH 255/591] Added Project delete --- .../mpcontribs_api/domains/projects/repository.py | 8 ++++++++ .../src/mpcontribs_api/domains/projects/router.py | 14 ++++++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py index 8d170fb6d8..44ce44d673 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py @@ -136,3 +136,11 @@ async def patch_project(self, id: str, update: ProjectPatch) -> ProjectOut: if updated is None: raise NotFoundError(f"Project with id {id} not found") return ProjectOut.model_validate(updated, from_attributes=True) + + async def delete_project(self, id: str): + """Delete project by id. + + Args: + id (str): the id of the project to delete + """ + await Project.find_one(Project.id == id).delete() diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py index 2db7ff1dfa..9e18f0bac3 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py @@ -1,7 +1,8 @@ from typing import Annotated -from fastapi import APIRouter, Query +from fastapi import APIRouter, Query, Response, status from fastapi_filter import FilterDepends +from starlette.status import HTTP_204_NO_CONTENT from src.mpcontribs_api.domains.projects.dependencies import ProjectDep from src.mpcontribs_api.domains.projects.models import ( @@ -45,7 +46,7 @@ async def insert_project( return await repo.insert_project(project=project) -@router.patch(f"{id}", response_model=ProjectOut) +@router.patch("{id}", response_model=ProjectOut) async def patch_project( repo: ProjectDep, id: str, @@ -64,3 +65,12 @@ async def patch_project( The Project with updates applied """ return await repo.patch_project(id=id, update=update) + + +@router.delete("{id}", status_code=status.HTTP_204_NO_CONTENT) +async def delete_project( + repo: ProjectDep, + id: str, +): + await repo.delete_project(id=id) + return Response(status_code=HTTP_204_NO_CONTENT) From 448bfcb5c7abeb5e1b24ff68303747e03df1a34c Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Tue, 2 Jun 2026 09:03:05 -0700 Subject: [PATCH 256/591] Added Projet Upsert (put) --- .../src/mpcontribs_api/domains/projects/repository.py | 5 +++++ .../src/mpcontribs_api/domains/projects/router.py | 11 ++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py index 44ce44d673..d780f9a94f 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py @@ -144,3 +144,8 @@ async def delete_project(self, id: str): id (str): the id of the project to delete """ await Project.find_one(Project.id == id).delete() + + async def upsert_project(self, id: str, data: ProjectIn) -> Project: + project = Project.from_project_in(data) + project.id = id + return await project.save() diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py index 9e18f0bac3..83f25afc13 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py @@ -38,15 +38,16 @@ async def get_project_by_id( return await repo.get_project_by_id(id=id, view=_VIEW_MODELS[view]) -@router.post("", response_model=ProjectOut) -async def insert_project( +@router.put("/{id}", response_model=ProjectOut) +async def upsert_project( repo: ProjectDep, + id: str, project: ProjectIn, ): - return await repo.insert_project(project=project) + return await repo.upsert_project(id=id, data=project) -@router.patch("{id}", response_model=ProjectOut) +@router.patch("/{id}", response_model=ProjectOut) async def patch_project( repo: ProjectDep, id: str, @@ -67,7 +68,7 @@ async def patch_project( return await repo.patch_project(id=id, update=update) -@router.delete("{id}", status_code=status.HTTP_204_NO_CONTENT) +@router.delete("/{id}", status_code=status.HTTP_204_NO_CONTENT) async def delete_project( repo: ProjectDep, id: str, From fc9f6ea494936369521cd01b5fe42f0aa718ce6b Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Tue, 2 Jun 2026 12:51:36 -0700 Subject: [PATCH 257/591] Added docstrings and removed dead code --- mpcontribs-api/src/mpcontribs_api/app.py | 2 +- mpcontribs-api/src/mpcontribs_api/auth.py | 10 ++- .../src/mpcontribs_api/dependencies.py | 2 + .../mpcontribs_api/domains/projects/models.py | 12 ++- .../domains/projects/repository.py | 75 +++++++++++++++---- .../mpcontribs_api/domains/projects/router.py | 45 ++++++++++- .../mpcontribs_api/domains/shared/models.py | 20 ----- .../src/mpcontribs_api/middleware.py | 1 - mpcontribs-api/src/mpcontribs_api/models.py | 0 .../src/mpcontribs_api/pagination.py | 11 ++- mpcontribs-api/src/mpcontribs_api/types.py | 14 ---- 11 files changed, 136 insertions(+), 56 deletions(-) delete mode 100644 mpcontribs-api/src/mpcontribs_api/domains/shared/models.py delete mode 100644 mpcontribs-api/src/mpcontribs_api/models.py diff --git a/mpcontribs-api/src/mpcontribs_api/app.py b/mpcontribs-api/src/mpcontribs_api/app.py index 3a5aed8f29..292395b94f 100644 --- a/mpcontribs-api/src/mpcontribs_api/app.py +++ b/mpcontribs-api/src/mpcontribs_api/app.py @@ -67,7 +67,7 @@ async def create_app(settings: Settings | None = None) -> FastAPI: # Add request context to logs app.add_middleware(BaseHTTPMiddleware, dispatch=bind_request_context) - # Bind exception handlers + # Bind exception handlers so the app understands how to handle them register_exception_handlers(app) app.include_router(v1_router, prefix="/api/v1") diff --git a/mpcontribs-api/src/mpcontribs_api/auth.py b/mpcontribs-api/src/mpcontribs_api/auth.py index 6f82eb7e9f..2e59670686 100644 --- a/mpcontribs-api/src/mpcontribs_api/auth.py +++ b/mpcontribs-api/src/mpcontribs_api/auth.py @@ -8,8 +8,16 @@ class User(BaseModel): + """User definition derived from request headers. + + Attributes: + consumer_id (str | None): Kong id, for logging only + username (str | None): the username of the active user - if None, the user is anonymous + groups (frozenset[str]): the groups the user is part of - used for access control + """ + model_config = ConfigDict(frozen=True) - consumer_id: str | None = None # opaque Kong id — logging/audit only + consumer_id: str | None = None username: str | None = None groups: frozenset[str] = frozenset() diff --git a/mpcontribs-api/src/mpcontribs_api/dependencies.py b/mpcontribs-api/src/mpcontribs_api/dependencies.py index 10f2112324..ad120b8201 100644 --- a/mpcontribs-api/src/mpcontribs_api/dependencies.py +++ b/mpcontribs-api/src/mpcontribs_api/dependencies.py @@ -17,6 +17,7 @@ def verify_gateway(x_gateway_secret: Annotated[str | None, Header()] = None) -> None: + """Ensures the current access attempt is coming through Kong""" if x_gateway_secret is None or not hmac.compare_digest( x_gateway_secret, str(settings.kong.gateway_secret) ): @@ -35,6 +36,7 @@ def _split(raw: str | None) -> set[str]: def get_user(request: Request) -> User: + """Dissects request headers for user-related keys.""" h = request.headers explicit_anon = h.get("x-anonymous-consumer", "").lower() == "true" username = h.get("x-consumer-username") or None diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py index 03614d1a3f..7429822318 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py @@ -98,8 +98,9 @@ class ProjectOut(BaseModel): license: Literal["CCA4", "CCPD"] | None = None -# Filter to use for Projects class ProjectFilter(Filter): + """Filter fields allowed in requests.""" + id: ShortStr | None = None id__in: list[ShortStr] | None = None id__neq: ShortStr | None = None @@ -133,17 +134,19 @@ class Constants(Filter.Constants): # Keeping for business logic separation. May have specific implementation later class ProjectIn(Project): + """Representation of user-supplied input.""" + pass class ProjectPatch(BaseModel): - id: ShortStr | None = Field(default=None, alias="_id") + """Nullable Project representation of user-supplied data for partial update (patch)""" + title: ShortStr | None = None authors: str | None = None description: str | None = None owner: PrefixedEmail | None = None unique_identifiers: bool | None = None - stats: Stats | None = None references: list[Reference] = Field(default_factory=list) long_title: str | None = None other: dict[str, Any] = Field(default_factory=dict) @@ -155,6 +158,8 @@ class ProjectPatch(BaseModel): # Enum to determine which response model to use class ProjectView(str, Enum): + """An enum for selecting output models via strings.""" + full = "full" summary = "summary" @@ -163,3 +168,4 @@ class ProjectView(str, Enum): ProjectView.full: ProjectOut, ProjectView.summary: ProjectSummary, } +"""Convert from ProjectView string to the corresponding model.""" diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py index d780f9a94f..bfe81e37f3 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py @@ -12,7 +12,7 @@ ProjectOut, ProjectPatch, ) -from src.mpcontribs_api.exceptions import NotFoundError +from src.mpcontribs_api.exceptions import ConflictError, NotFoundError from src.mpcontribs_api.pagination import ( CursorParams, Page, @@ -32,11 +32,25 @@ class HasId(BaseModel): class MongoDbProjectRepository: + """A repository layer for access to MongoDB + + This is the layer that directly interacts with database operations + + Attributes: + _scope (dict[str, Any]): additional terms to inject into mongo queries to enforce user authorization on resources + """ + def __init__(self, user: User) -> None: + """Initializes an instance based on the current user + + Args: + user (User): the current user requesting resources + """ self._scope = self._build_scope(user) @staticmethod def _build_scope(user: User) -> dict[str, Any]: + """Provides scope based on current user's permitted groups and publicly released data.""" if user.is_admin: return {} ors: list[dict[str, Any]] = [{"is_public": True, "is_approved": True}] @@ -46,13 +60,17 @@ def _build_scope(user: User) -> dict[str, Any]: ors.append({"_id": {"$in": sorted(user.groups)}}) return {"$or": ors} - def _scoped(self, *clauses: Any) -> dict[str, Any]: - parts = [c for c in (self._scope, *clauses) if c] - if not parts: - return {} - return parts[0] if len(parts) == 1 else {"$and": parts} - + # Brendan TODO: figure out return type async def get_project_by_id(self, id: str, *, view: type[M] | None = None): + """Finds a single project by ID + + Args: + id (str): the id of the project to find + view (type[M] | None): a BaseModel to use for projection. If none, the document is returned without projection + + Returns: + BaseModel: a typed document with the requested id + """ # TODO: Verify that self._scope and Project.id == id get combined properly return await Project.find_one( self._scope, Project.id == id, projection_model=view @@ -74,6 +92,9 @@ async def get_project( filter (ProjectFilter): the query to filter the collection by pagination (CursorParams): parameters for pagination using a cursor view (type[M]): The type of resposne we should return within the Page + + Returns: + Page[V | ProjectOut]: a page containing a set number of documents in requested format with a flag for knowing if there are more pages """ model = view or ProjectOut @@ -99,12 +120,26 @@ async def get_project( next_cursor = encode_cursor(str(items[-1].id)) if has_more and items else None return Page(items=items, next_cursor=next_cursor) - async def insert_project(self, project: ProjectIn) -> ProjectOut: + async def insert_project(self, project: ProjectIn) -> Project: + """Inserst a new project. + + Args: + project (ProjectIn): the project to be inserted + + Returns: + Project: the project after succesful insertion + """ + id_exists = Project.find_one(Project.id == project.id) + # Brendan TODO: + if id_exists: + raise ConflictError( + f"Cannot insert project.\n Project with ID {project.id} exists" + ) full_project = Project.from_project_in(project) await full_project.insert() - return ProjectOut.model_validate(full_project) + return full_project - async def patch_project(self, id: str, update: ProjectPatch) -> ProjectOut: + async def patch_project(self, id: str, update: ProjectPatch) -> Project: """Partial update to project identified with 'id'. Note: overwrites fields with given values - arrays are not appended to. @@ -124,18 +159,19 @@ async def patch_project(self, id: str, update: ProjectPatch) -> ProjectOut: existing = await Project.get(Project.id == id) if existing is None: raise NotFoundError(f"Project with id {id} not found") - return ProjectOut.model_validate(existing, from_attributes=True) + return existing # Otherwise, update the fields fully (set) # Brendan TODO: Set will replace an entire field # - if we want to append to a list (ie. add a reference) we ned Push/AddToSet - updated = Project.find_one(Project.id == id).update( + query = Project.find_one(Project.id == id).update( Set(update_data), response_type=UpdateResponse.NEW_DOCUMENT, ) + updated = await query # pyright: ignore[reportGeneralTypeIssues] # beanie UpdateQuery is awaitable, but pyright doesn't see it if updated is None: raise NotFoundError(f"Project with id {id} not found") - return ProjectOut.model_validate(updated, from_attributes=True) + return updated async def delete_project(self, id: str): """Delete project by id. @@ -146,6 +182,19 @@ async def delete_project(self, id: str): await Project.find_one(Project.id == id).delete() async def upsert_project(self, id: str, data: ProjectIn) -> Project: + """Upsert a project by provided id. + + Upsert: Update document if id is found, otherwise insert new document using id. + Note: Relies on the path param 'id' for finding, rather than the body's id. + + Args: + repo (ProjectDep): the project repo we depend on + id (str): the id of the project to retrieve + project (ProjectIn): the data of the project to upsert + + Returns: + Project: the full document that either replaced an old one or was inserted + """ project = Project.from_project_in(data) project.id = id return await project.save() diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py index 83f25afc13..9a95f1be48 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py @@ -19,12 +19,22 @@ router = APIRouter() +# Brendan TODO: Add in option to select ProjectSummary or ProjectOut @router.get("", response_model=list[ProjectSummary]) async def get_project( repo: ProjectDep, pagination: Annotated[CursorParams, Query()], filter: ProjectFilter = FilterDepends(ProjectFilter), ): + """Return paginated projects matching a filter. + + Args: + repo (ProjectDep): the project repo we depend on + pagination (CursorParams): arguments for cursor-based pagination + filter (ProjectFilter): arguments for filtering projects + + Returns: + list[ProjectSummary]: a list of smaller project payloads""" return await repo.get_project(filter=filter, pagination=pagination) @@ -32,9 +42,18 @@ async def get_project( async def get_project_by_id( id: str, repo: ProjectDep, - *, view: ProjectView = ProjectView.full, ): + """Gets a single project by its ID. + + Args: + id (str): the id of the project to retrieve + repo (ProjectDep): the project repo we depend on + view (ProjectView): user selection for which type of return is desired (smaller summary or the complete project) + + Returns: + ProjectOut | ProjectSummary: the requested project, actual data returned is determined by the view the user requested + """ return await repo.get_project_by_id(id=id, view=_VIEW_MODELS[view]) @@ -44,6 +63,19 @@ async def upsert_project( id: str, project: ProjectIn, ): + """Upsert a project by provided id. + + Upsert: Update document if id is found, otherwise insert new document using id. + Note: Relies on the path param 'id' for finding, rather than the body's id. + + Args: + repo (ProjectDep): the project repo we depend on + id (str): the id of the project to retrieve + project (ProjectIn): the data of the project to upsert + + Returns: + ProjectOut: the full document that either replaced an old one or was inserted + """ return await repo.upsert_project(id=id, data=project) @@ -58,12 +90,13 @@ async def patch_project( Note: overwrites fields with given values - arrays are not appended to. Args: + repo (ProjectDep): the project repo we depend on id (str): the id of the project to update update (ProjectPatch): the partial update to apply - unset fields are dropped - Note: If fields are intentionally set to None, None is applied to the field. Returns: - The Project with updates applied + ProjectOut: the full Project with updates applied """ return await repo.patch_project(id=id, update=update) @@ -73,5 +106,13 @@ async def delete_project( repo: ProjectDep, id: str, ): + """Deletes a project matching id. + + Args: + repo (ProjectDep): the project repo we depend on + id (str): the id of the project to be deleted + Returns: + Response: a response with the 204 response code (rather than FastAPIs default 200) + """ await repo.delete_project(id=id) return Response(status_code=HTTP_204_NO_CONTENT) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/shared/models.py b/mpcontribs-api/src/mpcontribs_api/domains/shared/models.py deleted file mode 100644 index dc0674f9e8..0000000000 --- a/mpcontribs-api/src/mpcontribs_api/domains/shared/models.py +++ /dev/null @@ -1,20 +0,0 @@ -from typing import Annotated - -from pydantic import BaseModel, Field - - -class PaginationParams(BaseModel): - skip: Annotated[int, Field(description="number of items to skip")] - limit: Annotated[int, Field(description="maximum number of items to return")] = 100 - page: Annotated[ - int, - Field( - description="page number to return (in batches of 'per_page'/'_limit'; alternative to _skip" - ), - ] - per_page: Annotated[ - int, - Field( - description="maximum number of items to return per page (same as '_limit')" - ), - ] diff --git a/mpcontribs-api/src/mpcontribs_api/middleware.py b/mpcontribs-api/src/mpcontribs_api/middleware.py index 3955b91366..d4e0bf8e45 100644 --- a/mpcontribs-api/src/mpcontribs_api/middleware.py +++ b/mpcontribs-api/src/mpcontribs_api/middleware.py @@ -3,7 +3,6 @@ import structlog -# middleware.py async def bind_request_context(request, call_next): structlog.contextvars.clear_contextvars() structlog.contextvars.bind_contextvars( diff --git a/mpcontribs-api/src/mpcontribs_api/models.py b/mpcontribs-api/src/mpcontribs_api/models.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/mpcontribs-api/src/mpcontribs_api/pagination.py b/mpcontribs-api/src/mpcontribs_api/pagination.py index 9f543e5b53..2d7cd85580 100644 --- a/mpcontribs-api/src/mpcontribs_api/pagination.py +++ b/mpcontribs-api/src/mpcontribs_api/pagination.py @@ -4,6 +4,8 @@ class CursorParams(BaseModel): + """Models parameters used in cursor-based pagination""" + # None == First page cursor: str | None = None # Per-page limit @@ -11,6 +13,13 @@ class CursorParams(BaseModel): class Page[T](BaseModel): + """Model to be returned for a single page of cursor-based paginated results. + + Attributes: + items (list[T]): the items returned for the given page + next_cursor (str): the base64-encoded value of the first id on the next page. If None, then no more pages are available + """ + items: list[T] # None == last page next_cursor: str | None = None @@ -23,5 +32,5 @@ def encode_cursor(last_id: str) -> str: def decode_cursor(cursor: str) -> str: try: return base64.urlsafe_b64decode(cursor.encode()).decode() - except (ValueError, UnicodeDecodeError): + except ValueError, UnicodeDecodeError: raise ValueError("malformed cursor") diff --git a/mpcontribs-api/src/mpcontribs_api/types.py b/mpcontribs-api/src/mpcontribs_api/types.py index 3420b70ebb..8d3b6a11fb 100644 --- a/mpcontribs-api/src/mpcontribs_api/types.py +++ b/mpcontribs-api/src/mpcontribs_api/types.py @@ -21,17 +21,3 @@ def _validate_prefixed_email(v: str) -> str: PrefixedEmail = Annotated[str, BeforeValidator(_validate_prefixed_email)] - - -def _parse_sort_entry(v: str) -> tuple[str, int]: - v = v.strip() - if not v: - raise ValueError("empty sort field") - if v[0] == "-": - return v[1:], -1 - if v[0] == "+": - return v[1:], 1 - return v, 1 - - -SortEntry = Annotated[tuple[str, int], BeforeValidator(_parse_sort_entry)] From 672f249dc4af2e93959fb4a6e62f1404b68e9185 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Tue, 2 Jun 2026 13:01:14 -0700 Subject: [PATCH 258/591] Removed outdated runtime_checkable and awaited async function to get returned value --- .../src/mpcontribs_api/domains/projects/repository.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py index bfe81e37f3..2854574be2 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py @@ -1,4 +1,4 @@ -from typing import Any, TypeVar, runtime_checkable +from typing import Any, TypeVar from beanie import UpdateResponse from beanie.operators import Set @@ -22,7 +22,6 @@ # Type checking to get around pyright issues -@runtime_checkable class HasId(BaseModel): id: str @@ -129,7 +128,7 @@ async def insert_project(self, project: ProjectIn) -> Project: Returns: Project: the project after succesful insertion """ - id_exists = Project.find_one(Project.id == project.id) + id_exists = await Project.find_one(Project.id == project.id) # Brendan TODO: if id_exists: raise ConflictError( From a3ba41d306f7948f730c44b0a557fbb9ed7b2d50 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Tue, 2 Jun 2026 14:07:25 -0700 Subject: [PATCH 259/591] Created a parent class to abstract the handling of fields requested from query. Users can now request partial documents with _fields --- .../mpcontribs_api/domains/projects/models.py | 11 ++-- .../domains/projects/repository.py | 37 +++++-------- .../mpcontribs_api/domains/projects/router.py | 20 ++++--- .../src/mpcontribs_api/exceptions.py | 1 - .../src/mpcontribs_api/projection.py | 55 +++++++++++++++++++ 5 files changed, 85 insertions(+), 39 deletions(-) create mode 100644 mpcontribs-api/src/mpcontribs_api/projection.py diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py index 7429822318..fea73f8e9e 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py @@ -1,12 +1,13 @@ from __future__ import annotations from enum import Enum -from typing import Annotated, Any, Literal +from typing import Annotated, Any, ClassVar, Literal from beanie import DocumentWithSoftDelete from fastapi_filter.contrib.beanie import Filter from pydantic import BaseModel, ConfigDict, Field, HttpUrl +from src.mpcontribs_api.projection import SparseFieldsModel from src.mpcontribs_api.types import PrefixedEmail, ShortStr @@ -76,13 +77,11 @@ class ProjectSummary(BaseModel): title: ShortStr -class ProjectOut(BaseModel): +class ProjectOut(SparseFieldsModel): """Full response of all public-facing fields.""" model_config = ConfigDict(extra="ignore") - id: Annotated[ - ShortStr | None, Field(validation_alias="_id", serialization_alias="id") - ] = None + id: Annotated[ShortStr | None, Field(alias="_id", serialization_alias="id")] = None authors: str | None = None description: str | None = None title: ShortStr | None = None @@ -97,6 +96,8 @@ class ProjectOut(BaseModel): columns: list[Column] | None = None license: Literal["CCA4", "CCPD"] | None = None + sparse_always: ClassVar[frozenset[str]] = frozenset({"id"}) # cursor needs it + class ProjectFilter(Filter): """Filter fields allowed in requests.""" diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py index 2854574be2..07d4215532 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py @@ -60,7 +60,7 @@ def _build_scope(user: User) -> dict[str, Any]: return {"$or": ors} # Brendan TODO: figure out return type - async def get_project_by_id(self, id: str, *, view: type[M] | None = None): + async def get_project_by_id(self, id: str, fields: frozenset[str] | None): """Finds a single project by ID Args: @@ -72,7 +72,9 @@ async def get_project_by_id(self, id: str, *, view: type[M] | None = None): """ # TODO: Verify that self._scope and Project.id == id get combined properly return await Project.find_one( - self._scope, Project.id == id, projection_model=view + self._scope, + Project.id == id, + projection_model=ProjectOut.projection(fields), ) # Brendan TODO: Does not handle compound pagination/sorting (can only paginate on _id, so passing sort arguments does nothing) @@ -80,9 +82,8 @@ async def get_project( self, filter: ProjectFilter, pagination: CursorParams, - *, - view: type[V] | None = None, - ) -> Page[V | ProjectOut]: + fields: frozenset[str] | None, + ): """Query the Project collection using filtering. Only considers the Projects that the User has access to. @@ -90,30 +91,18 @@ async def get_project( Args: filter (ProjectFilter): the query to filter the collection by pagination (CursorParams): parameters for pagination using a cursor - view (type[M]): The type of resposne we should return within the Page - - Returns: - Page[V | ProjectOut]: a page containing a set number of documents in requested format with a flag for knowing if there are more pages + fields (frozenset[str]): the fields to use for projection """ - model = view or ProjectOut - - # Filter projects to just the ones within the user scope + proj = ProjectOut.projection(fields) query = filter.filter(Project.find(self._scope)) - # If cursor was provided if pagination.cursor is not None: - query = query.find( - Project.id > decode_cursor(pagination.cursor) - ) # seek past last-seen - - # Get Projects sorted by id (for pagination), project to requested model - docs = await ( - query.sort(Project.id) - .limit(pagination.limit + 1) # +1 probe to detect if there is a next page - .project(model) + query = query.find(Project.id > decode_cursor(pagination.cursor)) + docs = ( + await query.sort(Project.id) + .limit(pagination.limit + 1) + .project(proj) .to_list() ) - - # Check if we have more docs, return a Page containing just the number of docs requested and the encoded id for the next cursor has_more = len(docs) > pagination.limit items = docs[: pagination.limit] next_cursor = encode_cursor(str(items[-1].id)) if has_more and items else None diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py index 9a95f1be48..fce6caf6cd 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py @@ -6,13 +6,11 @@ from src.mpcontribs_api.domains.projects.dependencies import ProjectDep from src.mpcontribs_api.domains.projects.models import ( - _VIEW_MODELS, ProjectFilter, ProjectIn, ProjectOut, ProjectPatch, ProjectSummary, - ProjectView, ) from src.mpcontribs_api.pagination import CursorParams @@ -20,41 +18,45 @@ # Brendan TODO: Add in option to select ProjectSummary or ProjectOut -@router.get("", response_model=list[ProjectSummary]) +@router.get("", response_model=None) async def get_project( repo: ProjectDep, pagination: Annotated[CursorParams, Query()], filter: ProjectFilter = FilterDepends(ProjectFilter), + fields: Annotated[str | None, Query(alias="_fields")] = None, ): """Return paginated projects matching a filter. Args: repo (ProjectDep): the project repo we depend on pagination (CursorParams): arguments for cursor-based pagination - filter (ProjectFilter): arguments for filtering projects + fields (str | None): optional fields to include in return. If None supplied, all fields are returned Returns: - list[ProjectSummary]: a list of smaller project payloads""" - return await repo.get_project(filter=filter, pagination=pagination) + list[ProjectSummary]: a list of smaller project payloads + """ + selected = ProjectOut.parse_fields(fields) + return await repo.get_project(filter=filter, pagination=pagination, fields=selected) @router.get("/{id}", response_model=ProjectOut | ProjectSummary) async def get_project_by_id( id: str, repo: ProjectDep, - view: ProjectView = ProjectView.full, + fields: Annotated[str | None, Query(alias="_fields")] = None, ): """Gets a single project by its ID. Args: id (str): the id of the project to retrieve repo (ProjectDep): the project repo we depend on - view (ProjectView): user selection for which type of return is desired (smaller summary or the complete project) + fields (str | None): optional fields to include in return. If None supplied, all fields are returned Returns: ProjectOut | ProjectSummary: the requested project, actual data returned is determined by the view the user requested """ - return await repo.get_project_by_id(id=id, view=_VIEW_MODELS[view]) + selected = ProjectOut.parse_fields(fields) + return await repo.get_project_by_id(id=id, fields=selected) @router.put("/{id}", response_model=ProjectOut) diff --git a/mpcontribs-api/src/mpcontribs_api/exceptions.py b/mpcontribs-api/src/mpcontribs_api/exceptions.py index b263c058c3..e495708aba 100644 --- a/mpcontribs-api/src/mpcontribs_api/exceptions.py +++ b/mpcontribs-api/src/mpcontribs_api/exceptions.py @@ -36,7 +36,6 @@ class NotFoundError(AppError): class ConflictError(AppError): status_code = 409 - error_code = "conflict" diff --git a/mpcontribs-api/src/mpcontribs_api/projection.py b/mpcontribs-api/src/mpcontribs_api/projection.py new file mode 100644 index 0000000000..9729d1d7af --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/projection.py @@ -0,0 +1,55 @@ +from __future__ import annotations + +from functools import lru_cache +from typing import Any, ClassVar, Self, TypeVar, cast + +from pydantic import BaseModel, create_model + +from src.mpcontribs_api.exceptions import ValidationError + +ModelT = TypeVar("ModelT", bound=BaseModel) + + +class SparseFieldsModel(BaseModel): + """Mixin for response models that support `_fields` projection. + + The subclass is the public projectable surface (e.g. ProjectOut); its + field names *are* the valid `_fields` vocabulary. Any field backing Mongo + `_id` must be declared `Field(alias="_id", serialization_alias=...)`. + """ + + # Forced into every projection (identity / cursor keys). + sparse_always: ClassVar[frozenset[str]] = frozenset() + + @classmethod + def field_names(cls) -> frozenset[str]: + return frozenset(cls.model_fields) + + @classmethod + def parse_fields(cls, raw: str | None) -> frozenset[str] | None: + """None/empty -> all fields. Otherwise validate the requested subset.""" + if not raw: + return None + requested = {f.strip() for f in raw.split(",") if f.strip()} + if unknown := requested - cls.field_names(): + raise ValidationError( + f"Unknown field(s) in _fields.\nUnknown: {sorted(unknown)}\nValid: {sorted(cls.field_names())}" + ) + return frozenset(requested) | cls.sparse_always + + @classmethod + def projection(cls, fields: frozenset[str] | None) -> type[Self]: + if fields is None: + return cls + return cast("type[Self]", _build_projection(cls, fields)) + + +@lru_cache(maxsize=128) +def _build_projection(model: type[ModelT], fields: frozenset[str]) -> type[ModelT]: + selected: dict[str, Any] = { + n: (model.model_fields[n].annotation, model.model_fields[n]) for n in fields + } + built = create_model( + f"{model.__name__}Projection", __config__=model.model_config, **selected + ) + return cast("type[ModelT]", built) From 1603e3285abd628ae1067cdf99e718fb7091f0ba Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Tue, 2 Jun 2026 14:12:15 -0700 Subject: [PATCH 260/591] modified docstrings to match function definition --- .../src/mpcontribs_api/domains/projects/repository.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py index 07d4215532..4a223fdda8 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py @@ -65,10 +65,10 @@ async def get_project_by_id(self, id: str, fields: frozenset[str] | None): Args: id (str): the id of the project to find - view (type[M] | None): a BaseModel to use for projection. If none, the document is returned without projection + fields (frozenset[str] | None): a BaseModel to use for projection. If none, the document is returned without projection Returns: - BaseModel: a typed document with the requested id + ProjectOut: a projection of ProjectOut containing 'fields' from requested id """ # TODO: Verify that self._scope and Project.id == id get combined properly return await Project.find_one( @@ -91,7 +91,7 @@ async def get_project( Args: filter (ProjectFilter): the query to filter the collection by pagination (CursorParams): parameters for pagination using a cursor - fields (frozenset[str]): the fields to use for projection + fields (frozenset[str] | None): the fields to use for projection. If none, the document is returned without projection """ proj = ProjectOut.projection(fields) query = filter.filter(Project.find(self._scope)) From 3f271580e7b4694ba71c1289cfe49fe7e4a6e925 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Tue, 2 Jun 2026 14:16:06 -0700 Subject: [PATCH 261/591] Fixed issue where find_one syntax was used with get --- .../src/mpcontribs_api/domains/projects/repository.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py index 4a223fdda8..e91dfc5450 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py @@ -144,7 +144,7 @@ async def patch_project(self, id: str, update: ProjectPatch) -> Project: update_data = update.model_dump(exclude_unset=True) # If update is empty, return the model anyways (consistent behavior) if not update_data: - existing = await Project.get(Project.id == id) + existing = await Project.get(id) if existing is None: raise NotFoundError(f"Project with id {id} not found") return existing From cf49f3d28b5daf3f6ece74e14dc4624864b8d31d Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Tue, 2 Jun 2026 14:39:46 -0700 Subject: [PATCH 262/591] Removed dead ProjectSummary usages --- .../mpcontribs_api/domains/projects/models.py | 28 ------------------- .../mpcontribs_api/domains/projects/router.py | 5 ++-- 2 files changed, 2 insertions(+), 31 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py index fea73f8e9e..755b10c573 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py @@ -1,6 +1,5 @@ from __future__ import annotations -from enum import Enum from typing import Annotated, Any, ClassVar, Literal from beanie import DocumentWithSoftDelete @@ -65,18 +64,6 @@ def from_project_in(cls, data: ProjectIn) -> Project: return cls(**data.model_dump()) -# Project Responses -class ProjectSummary(BaseModel): - """Subset of fields to return when not all info is desired.""" - - id: Annotated[ShortStr, Field(alias="_id")] - owner: PrefixedEmail - unique_identifiers: bool - is_public: bool = False - is_approved: bool = False - title: ShortStr - - class ProjectOut(SparseFieldsModel): """Full response of all public-facing fields.""" @@ -155,18 +142,3 @@ class ProjectPatch(BaseModel): is_public: bool = False is_approved: bool = False license: Literal["CCA4", "CCPD"] | None = None - - -# Enum to determine which response model to use -class ProjectView(str, Enum): - """An enum for selecting output models via strings.""" - - full = "full" - summary = "summary" - - -_VIEW_MODELS: dict[ProjectView, type[BaseModel]] = { - ProjectView.full: ProjectOut, - ProjectView.summary: ProjectSummary, -} -"""Convert from ProjectView string to the corresponding model.""" diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py index fce6caf6cd..b059c69747 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py @@ -10,7 +10,6 @@ ProjectIn, ProjectOut, ProjectPatch, - ProjectSummary, ) from src.mpcontribs_api.pagination import CursorParams @@ -39,7 +38,7 @@ async def get_project( return await repo.get_project(filter=filter, pagination=pagination, fields=selected) -@router.get("/{id}", response_model=ProjectOut | ProjectSummary) +@router.get("/{id}", response_model=ProjectOut) async def get_project_by_id( id: str, repo: ProjectDep, @@ -53,7 +52,7 @@ async def get_project_by_id( fields (str | None): optional fields to include in return. If None supplied, all fields are returned Returns: - ProjectOut | ProjectSummary: the requested project, actual data returned is determined by the view the user requested + ProjectOut: the requested project, actual data returned is determined by the view the user requested """ selected = ProjectOut.parse_fields(fields) return await repo.get_project_by_id(id=id, fields=selected) From 5bd40b2e73f4f3d847bf3c534124973793817ad9 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Tue, 2 Jun 2026 15:38:34 -0700 Subject: [PATCH 263/591] Automatic projection processing now hanldes dot-paths and validates existence against the Document, unless field is a dict --- .../mpcontribs_api/domains/projects/models.py | 4 +- .../src/mpcontribs_api/projection.py | 256 ++++++++++++++++-- 2 files changed, 232 insertions(+), 28 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py index 755b10c573..c8bafda1a2 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py @@ -1,6 +1,6 @@ from __future__ import annotations -from typing import Annotated, Any, ClassVar, Literal +from typing import Annotated, Any, Literal from beanie import DocumentWithSoftDelete from fastapi_filter.contrib.beanie import Filter @@ -83,8 +83,6 @@ class ProjectOut(SparseFieldsModel): columns: list[Column] | None = None license: Literal["CCA4", "CCPD"] | None = None - sparse_always: ClassVar[frozenset[str]] = frozenset({"id"}) # cursor needs it - class ProjectFilter(Filter): """Filter fields allowed in requests.""" diff --git a/mpcontribs-api/src/mpcontribs_api/projection.py b/mpcontribs-api/src/mpcontribs_api/projection.py index 9729d1d7af..b1a5d47f15 100644 --- a/mpcontribs-api/src/mpcontribs_api/projection.py +++ b/mpcontribs-api/src/mpcontribs_api/projection.py @@ -1,55 +1,261 @@ +"""Handles the projection of '_fields' from query params. + +This includes arbitrarily specifying nested structures with '.' +Ie. data.band_gap.something will be properly retrieved and populated into the response model that subclasses SparseFieldsModel +""" + from __future__ import annotations +from collections.abc import Iterator from functools import lru_cache -from typing import Any, ClassVar, Self, TypeVar, cast +from typing import ( + Any, + ClassVar, + Literal, + NamedTuple, + Self, + TypeVar, + cast, + get_args, + get_origin, +) from pydantic import BaseModel, create_model +from pydantic.fields import FieldInfo from src.mpcontribs_api.exceptions import ValidationError ModelT = TypeVar("ModelT", bound=BaseModel) +# How a model field's annotation is categorised for projection. +FieldKind = Literal["model", "dict", "list", "scalar"] +# A path step may also land on a dict key ("opaque") or a name absent from a model ("unknown"). +StepKind = Literal["model", "dict", "list", "scalar", "opaque", "unknown"] + + +class PathStep(NamedTuple): + """One resolved segment of a dotted field path.""" + + segment: str + field: FieldInfo | None + kind: StepKind + is_last: bool + + +def _unwrap_optional(annotation: object) -> object: + """Strip a single ``T | None`` wrapper, returning the inner annotation.""" + arguments = get_args(annotation) + if type(None) in arguments: + non_none = [arg for arg in arguments if arg is not type(None)] + if len(non_none) == 1: + return non_none[0] + return annotation + + +def _classify(annotation: object) -> tuple[FieldKind, type[BaseModel] | None]: + """Categorise an annotation as model / dict / list / scalar.""" + annotation = _unwrap_optional(annotation) + origin = get_origin(annotation) + if annotation is Any or annotation is dict or origin is dict: + return "dict", None + if origin in (list, set, tuple, frozenset): + return "list", None + if isinstance(annotation, type) and issubclass(annotation, BaseModel): + return "model", annotation + return "scalar", None + + +def _walk_path(model: type[BaseModel], path: str) -> Iterator[PathStep]: + """Yield one step per segment, descending into models and going opaque past a dict.""" + current_model: type[BaseModel] | None = model + segments = path.split(".") + for index, segment in enumerate(segments): + is_last = index == len(segments) - 1 + if current_model is None: # inside a dict's arbitrary contents + yield PathStep(segment, None, "opaque", is_last) + continue + field = current_model.model_fields.get(segment) + if field is None: + yield PathStep(segment, None, "unknown", is_last) + current_model = None + continue + kind, nested_model = _classify(field.annotation) + yield PathStep(segment, field, kind, is_last) + current_model = nested_model if kind == "model" else None + + +def _validate_path(model: type[BaseModel], path: str) -> None: + """Raise if the dotted path is not a selectable field path on the model.""" + for step in _walk_path(model, path): + if step.kind == "unknown": + raise ValidationError( + f"unknown field in _fields: {path!r} (no field {step.segment!r})" + ) + if step.kind in ("scalar", "list") and not step.is_last: + raise ValidationError( + f"cannot select subfields of {step.kind} field " + f"{step.segment!r} in _fields: {path!r}" + ) + + +def _collapse(paths: frozenset[str]) -> frozenset[str]: + """Drop any path whose segment-prefix is also requested (a whole field subsumes its parts). + + ie. {stats, stats.count} => {stats} + """ + segments_by_path = {path: tuple(path.split(".")) for path in paths} + return frozenset( + path + for path, segments in segments_by_path.items() + if not any( + other_path != path and segments[: len(other_segments)] == other_segments + for other_path, other_segments in segments_by_path.items() + ) + ) + + +def _mongo_key(model: type[BaseModel], path: str) -> str: + """Translate a dotted field-name path into its alias-resolved Mongo-key path.""" + mongo_segments: list[str] = [] + for step in _walk_path(model, path): + alias = step.field.validation_alias if step.field is not None else None + mongo_segments.append(alias if isinstance(alias, str) else step.segment) + return ".".join(mongo_segments) + + +def _backs_mongo_id(field: FieldInfo) -> bool: + """Whether a field maps to Mongo ``_id`` (by alias), regardless of its name or type.""" + return field.validation_alias == "_id" or field.alias == "_id" + + +def _optional_field(source_field: FieldInfo, annotation: Any) -> tuple[Any, FieldInfo]: + """Build an optional create_model field definition, preserving the source field's aliases.""" + validation_alias = ( + source_field.validation_alias + if isinstance(source_field.validation_alias, str) + else None + ) + serialization_alias = ( + source_field.serialization_alias + if isinstance(source_field.serialization_alias, str) + else None + ) + optional_annotation: Any = annotation | None + return optional_annotation, FieldInfo( + default=None, + validation_alias=validation_alias, + serialization_alias=serialization_alias, + ) + + +@lru_cache(maxsize=128) +def _build_model(model: type[ModelT], paths: frozenset[str]) -> type[ModelT]: + """Recursively build the partial response model covering the requested paths.""" + nested_paths_by_root: dict[str, set[str]] = {} + for path in paths: + root, _, remainder = path.partition(".") + nested_paths = nested_paths_by_root.setdefault(root, set()) + if remainder: + nested_paths.add(remainder) + + field_definitions: dict[str, Any] = {} + for root, nested_paths in nested_paths_by_root.items(): + source_field = model.model_fields[root] + kind, nested_model = _classify(source_field.annotation) + if not nested_paths: + field_definitions[root] = _optional_field( + source_field, source_field.annotation + ) + elif kind == "model" and nested_model is not None: + partial_nested = _build_model(nested_model, frozenset(nested_paths)) + field_definitions[root] = _optional_field(source_field, partial_nested) + elif kind == "dict": + field_definitions[root] = _optional_field(source_field, dict[str, Any]) + else: + raise ValidationError(f"cannot project subfields of {kind} field {root!r}") + + partial_model = create_model( + f"{model.__name__}Projection", + __config__=model.model_config, + **field_definitions, + ) + return cast("type[ModelT]", partial_model) + + +@lru_cache(maxsize=128) +def _build_projection(model: type[ModelT], paths: frozenset[str]) -> type[ModelT]: + """Build the partial model and attach its explicit dotted Mongo projection.""" + projection: dict[str, int] = {"_id": 1} + for path in paths: + projection[_mongo_key(model, path)] = 1 + partial_model = _build_model(model, paths) + setattr(partial_model, "Settings", type("Settings", (), {"projection": projection})) + return partial_model + class SparseFieldsModel(BaseModel): - """Mixin for response models that support `_fields` projection. + """Mixin for response models that support ``_fields`` projection. - The subclass is the public projectable surface (e.g. ProjectOut); its - field names *are* the valid `_fields` vocabulary. Any field backing Mongo - `_id` must be declared `Field(alias="_id", serialization_alias=...)`. + The subclass is the public projectable surface (e.g. ``ProjectOut``); its + field names are the valid ``_fields`` vocabulary, and dotted paths descend + into nested models (``stats.size``) or into arbitrary dict fields + (``data.var.x``). Any field backing Mongo ``_id`` must be declared + ``Field(alias="_id", serialization_alias="id")`` so the projection targets + the right key while the response serialises to the public name. """ - # Forced into every projection (identity / cursor keys). + # Field names forced into every projection (identity / cursor keys). sparse_always: ClassVar[frozenset[str]] = frozenset() + @classmethod + def _identity_fields(cls) -> frozenset[str]: + """Field names backing Mongo ``_id``, always forced into a projection.""" + return frozenset( + name for name, field in cls.model_fields.items() if _backs_mongo_id(field) + ) + @classmethod def field_names(cls) -> frozenset[str]: + """Return the top-level field names that may appear in ``_fields``.""" return frozenset(cls.model_fields) @classmethod def parse_fields(cls, raw: str | None) -> frozenset[str] | None: - """None/empty -> all fields. Otherwise validate the requested subset.""" + """Validate and normalise a raw ``_fields`` value into a set of paths. + + Args: + raw: The comma-separated ``_fields`` value, or None when the query + parameter was omitted. + + Returns: + None when every field should be returned (parameter omitted), + otherwise the validated, collapsed set of dotted paths, always + including this model's ``sparse_always`` fields. + + Raises: + ValidationError: If a requested path names an unknown field or + selects subfields of a scalar or list field. + """ if not raw: - return None - requested = {f.strip() for f in raw.split(",") if f.strip()} - if unknown := requested - cls.field_names(): - raise ValidationError( - f"Unknown field(s) in _fields.\nUnknown: {sorted(unknown)}\nValid: {sorted(cls.field_names())}" - ) - return frozenset(requested) | cls.sparse_always + return None # None == all fields + requested = frozenset(name.strip() for name in raw.split(",") if name.strip()) + for path in requested: + _validate_path(cls, path) + return _collapse(requested | cls.sparse_always | cls._identity_fields()) @classmethod def projection(cls, fields: frozenset[str] | None) -> type[Self]: + """Return a projection model exposing only the requested fields. + + Args: + fields: The collapsed path set from ``parse_fields``, or None to + project every field. + + Returns: + This model unchanged when ``fields`` is None, otherwise a cached + partial model carrying an explicit dotted Mongo projection in its + ``Settings``. + """ if fields is None: return cls return cast("type[Self]", _build_projection(cls, fields)) - - -@lru_cache(maxsize=128) -def _build_projection(model: type[ModelT], fields: frozenset[str]) -> type[ModelT]: - selected: dict[str, Any] = { - n: (model.model_fields[n].annotation, model.model_fields[n]) for n in fields - } - built = create_model( - f"{model.__name__}Projection", __config__=model.model_config, **selected - ) - return cast("type[ModelT]", built) From 67542ba8acb150d45f7a70487e088ff4cc344d0f Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Tue, 2 Jun 2026 15:39:06 -0700 Subject: [PATCH 264/591] Initial Contributions route setup --- .../domains/contributions/dependencies.py | 17 +++++ .../domains/contributions/models.py | 63 +++++++++++++++++++ .../domains/contributions/repository.py | 24 +++++++ .../domains/contributions/router.py | 20 ++++++ 4 files changed, 124 insertions(+) create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/contributions/dependencies.py diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/dependencies.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/dependencies.py new file mode 100644 index 0000000000..6296439f7b --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/dependencies.py @@ -0,0 +1,17 @@ +from typing import Annotated + +from fastapi import Depends + +from mpcontribs_api.dependencies import UserDep +from mpcontribs_api.domains.contributions.repository import ( + MongoDbContributionRepository, +) + + +def get_scoped_contributions(user: UserDep) -> MongoDbContributionRepository: + return MongoDbContributionRepository(user) + + +ContributionDep = Annotated[ + MongoDbContributionRepository, Depends(get_scoped_contributions) +] diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py index e69de29bb2..2f3839c951 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py @@ -0,0 +1,63 @@ +from datetime import datetime +from typing import Any + +from beanie import Document, Link +from fastapi_filter.contrib.beanie import Filter + +from src.mpcontribs_api.domains.attachments.models import Attachment +from src.mpcontribs_api.domains.structures.models import Structure +from src.mpcontribs_api.domains.tables.models import Table +from src.mpcontribs_api.projection import SparseFieldsModel +from src.mpcontribs_api.types import ShortStr + + +class Contribution(Document): + project: str + identifier: str + formula: str + is_public: bool = False + last_modified: datetime + needs_build: bool = True + data: dict[str, Any] + structures: list[Link[Structure]] | None = None + tables: list[Link[Table]] | None = None + attachments: list[Link[Attachment]] | None = None + + +class ContributionOut(SparseFieldsModel): + project: str | None = None + identifier: str | None = None + formula: str | None = None + is_public: bool | None = None + last_modified: datetime | None = None + needs_build: bool | None = None + data: dict[str, Any] | None = None + structures: list[Link[Structure]] | None = None + tables: list[Link[Table]] | None = None + attachments: list[Link[Attachment]] | None = None + + +class ContributionFilter(Filter): + id: str | None = None + id__in: list[str] | None = None + id__neq: str | None = None + + identifier: str | None = None + identifier__in: list[ShortStr] | None = None + identifier__neq: ShortStr | None = None + identifier__ilike: str | None = None + + formula: str | None = None + formula__in: list[ShortStr] | None = None + formula__neq: ShortStr | None = None + formula__ilike: str | None = None + + is_public: bool | None = None + + needs_build: bool | None = None + + # sorting + order_by: list[str] | None = None + + class Constants(Filter.Constants): + model = Contribution diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py index e69de29bb2..452b2977ab 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py @@ -0,0 +1,24 @@ +from typing import Any + +from src.mpcontribs_api.auth import User + + +class MongoDbContributionRepository: + def __init__(self, user: User) -> None: + """Initializes an instance based on the current user + + Args: + user (User): the current user requesting resources + """ + self._scope = self._build_scope(user) + + @staticmethod + def _build_scope(user: User) -> dict[str, Any]: + """Provides scope based on current user's permitted groups and publicly released data.""" + if user.is_admin: + return {} + ors: list[dict[str, Any]] = [{"is_public": True}] + if not user.is_anonymous: + if user.groups: + ors.append({"_id": {"$in": sorted(user.groups)}}) + return {"$or": ors} diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py index e69de29bb2..2b1f988675 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py @@ -0,0 +1,20 @@ +from typing import Annotated + +from fastapi import APIRouter, Query +from fastapi_filter import FilterDepends + +from src.mpcontribs_api.domains.contributions.dependencies import ContributionDep +from src.mpcontribs_api.domains.contributions.models import ContributionFilter +from src.mpcontribs_api.pagination import CursorParams + +router = APIRouter() + + +@router.get("") +async def get_contribution( + repo: ContributionDep, + pagination: Annotated[CursorParams, Query()], + filter: ContributionFilter = FilterDepends(ContributionFilter), + fields: Annotated[str | None, Query(alias="_fields")] = None, +): + pass From b190011657d19bb5bed973351652711655a5b288 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Tue, 2 Jun 2026 16:28:36 -0700 Subject: [PATCH 265/591] Added stub methods --- .../domains/contributions/router.py | 76 ++++++++++++++++++- 1 file changed, 73 insertions(+), 3 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py index 2b1f988675..fc89c610b6 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py @@ -1,20 +1,90 @@ -from typing import Annotated +from typing import Annotated, Literal from fastapi import APIRouter, Query from fastapi_filter import FilterDepends from src.mpcontribs_api.domains.contributions.dependencies import ContributionDep -from src.mpcontribs_api.domains.contributions.models import ContributionFilter +from src.mpcontribs_api.domains.contributions.models import ( + ContributionFilter, + ContributionIn, + ContributionPatch, +) from src.mpcontribs_api.pagination import CursorParams router = APIRouter() @router.get("") -async def get_contribution( +async def get_contributions( repo: ContributionDep, pagination: Annotated[CursorParams, Query()], filter: ContributionFilter = FilterDepends(ContributionFilter), fields: Annotated[str | None, Query(alias="_fields")] = None, ): pass + + +@router.delete("") +async def delete_contributions( + repo: ContributionDep, + filter: ContributionFilter = FilterDepends(ContributionFilter), +): + pass + + +@router.post("") +async def insert_contributions( + repo: ContributionDep, + contributions: list[ContributionIn], +): + pass + + +@router.put("") +async def upsert_contributions( + repo: ContributionDep, + contributions: list[ContributionIn], + filter: ContributionFilter = FilterDepends(ContributionFilter), +): + pass + + +@router.get("download/{mime}") +async def download_contributions( + repo: ContributionDep, + format: Literal["json", "csv", "parquet"] = "parquet", + filter: ContributionFilter = FilterDepends(ContributionFilter), + fields: Annotated[str | None, Query(alias="_fields")] = None, +): + pass + + +@router.delete("{id}") +async def delete_contribtion_by_id( + repo: ContributionDep, + id: str, +): + pass + + +@router.get("{id}") +async def get_contribution_by_id( + repo: ContributionDep, + id: str, + fields: Annotated[str | None, Query(alias="_fields")] = None, +): + pass + + +@router.put("{id}") +async def upsert_contribution_by_id( + repo: ContributionDep, id: str, contribution: ContributionIn +): + pass + + +@router.patch("{id}") +async def update_contribution_by_id( + repo: ContributionDep, id: str, update: ContributionPatch +): + pass From f570a742b33531b7a785924a23185cdb134d7d2a Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Tue, 2 Jun 2026 16:29:47 -0700 Subject: [PATCH 266/591] Added base contributions class and ContributionPatch. Contribution now sets last_modified on any modification result --- .../domains/contributions/models.py | 60 +++++++++++++++++-- 1 file changed, 54 insertions(+), 6 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py index 2f3839c951..2a88d69007 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py @@ -1,8 +1,18 @@ -from datetime import datetime +from datetime import UTC, datetime from typing import Any -from beanie import Document, Link +from beanie import ( + Document, + Insert, + Link, + Replace, + Save, + SaveChanges, + Update, + before_event, +) from fastapi_filter.contrib.beanie import Filter +from pydantic import Field from src.mpcontribs_api.domains.attachments.models import Attachment from src.mpcontribs_api.domains.structures.models import Structure @@ -11,18 +21,45 @@ from src.mpcontribs_api.types import ShortStr -class Contribution(Document): +class ContributionBase(Document): project: str identifier: str formula: str - is_public: bool = False - last_modified: datetime - needs_build: bool = True data: dict[str, Any] + + # TODO: Verify that this should default to True and be passed by users + needs_build: bool = True + last_modified: datetime = Field(default_factory=lambda: datetime.now(UTC)) structures: list[Link[Structure]] | None = None tables: list[Link[Table]] | None = None attachments: list[Link[Attachment]] | None = None + class Settings: + name = "contributions" + keep_nulls = False + + +class Contribution(ContributionBase): + is_public: bool + # needs_build: bool = True + + @classmethod + def from_contribution_in(cls, data: ContributionIn) -> Contribution: + return cls.model_validate( + { + **data.model_dump(exclude={"is_public"}), + "is_public": False, + } + ) + + @before_event(Insert, Replace, Update, Save, SaveChanges) + def set_last_modified(self): + self.last_modified = datetime.now(UTC) + + +class ContributionIn(ContributionBase): + pass + class ContributionOut(SparseFieldsModel): project: str | None = None @@ -37,6 +74,17 @@ class ContributionOut(SparseFieldsModel): attachments: list[Link[Attachment]] | None = None +class ContributionPatch(SparseFieldsModel): + project: str | None = None + identifier: str | None = None + formula: str | None = None + needs_build: bool | None = None + data: dict[str, Any] | None = None + structures: list[Link[Structure]] | None = None + tables: list[Link[Table]] | None = None + attachments: list[Link[Attachment]] | None = None + + class ContributionFilter(Filter): id: str | None = None id__in: list[str] | None = None From 743e32de7293ca8654f3a12a637859714041ecdc Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Tue, 2 Jun 2026 16:30:28 -0700 Subject: [PATCH 267/591] Added settings to Project to name proper collection and prevent nulls from populating --- mpcontribs-api/src/mpcontribs_api/domains/projects/models.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py index c8bafda1a2..7a3af99e10 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py @@ -63,6 +63,10 @@ class Project(DocumentWithSoftDelete): def from_project_in(cls, data: ProjectIn) -> Project: return cls(**data.model_dump()) + class Settings: + name = "projects" + keep_nulls = False + class ProjectOut(SparseFieldsModel): """Full response of all public-facing fields.""" From d339fed9c5c32734a2c6f6374c2fce48147005b2 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Tue, 2 Jun 2026 16:30:52 -0700 Subject: [PATCH 268/591] Added contributions router --- mpcontribs-api/src/mpcontribs_api/api/v1/router.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mpcontribs-api/src/mpcontribs_api/api/v1/router.py b/mpcontribs-api/src/mpcontribs_api/api/v1/router.py index 289b2159df..6b946e1e73 100644 --- a/mpcontribs-api/src/mpcontribs_api/api/v1/router.py +++ b/mpcontribs-api/src/mpcontribs_api/api/v1/router.py @@ -1,7 +1,9 @@ from fastapi import APIRouter +from mpcontribs_api.domains.contributions.router import router as contributions_router from mpcontribs_api.domains.projects.router import router as projects_router router = APIRouter(prefix="/api/v1") router.include_router(projects_router, prefix="/projects") +router.include_router(contributions_router, prefix="/contributions") From fe471f4e79063a4cd6066d087130fd464893650e Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Tue, 2 Jun 2026 16:50:24 -0700 Subject: [PATCH 269/591] Sketched out endpoints and repo methods --- .../domains/contributions/repository.py | 42 ++++++++++++++++++- .../domains/contributions/router.py | 23 +++++----- 2 files changed, 54 insertions(+), 11 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py index 452b2977ab..397aeef1fb 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py @@ -1,6 +1,12 @@ -from typing import Any +from typing import Any, Literal from src.mpcontribs_api.auth import User +from src.mpcontribs_api.domains.contributions.models import ( + ContributionFilter, + ContributionIn, + ContributionPatch, +) +from src.mpcontribs_api.pagination import CursorParams class MongoDbContributionRepository: @@ -22,3 +28,37 @@ def _build_scope(user: User) -> dict[str, Any]: if user.groups: ors.append({"_id": {"$in": sorted(user.groups)}}) return {"$or": ors} + + async def get_contributions( + self, pagination: CursorParams, filter: ContributionFilter, fields: str | None + ): + pass + + async def delete_contributions(self, filter: ContributionFilter): + pass + + async def insert_contributions(self, contributions: list[ContributionIn]): + pass + + async def upsert_contributions(self, contributions: list[ContributionIn]): + pass + + async def download_contributions( + self, + format: Literal["json", "csv", "parquet"], + filter: ContributionFilter, + fields: str | None, + ): + pass + + async def delete_contribution_by_id(self, id: str): + pass + + async def get_contribution_by_id(self, id: str, fields: str | None): + pass + + async def upsert_contribution_by_id(self, id: str, contribution: ContributionIn): + pass + + async def update_contribution_by_id(self, id: str, update: ContributionPatch): + pass diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py index fc89c610b6..51a3a760a0 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py @@ -21,7 +21,9 @@ async def get_contributions( filter: ContributionFilter = FilterDepends(ContributionFilter), fields: Annotated[str | None, Query(alias="_fields")] = None, ): - pass + return await repo.get_contributions( + pagination=pagination, filter=filter, fields=fields + ) @router.delete("") @@ -29,7 +31,7 @@ async def delete_contributions( repo: ContributionDep, filter: ContributionFilter = FilterDepends(ContributionFilter), ): - pass + return await repo.delete_contributions(filter=filter) @router.post("") @@ -37,16 +39,15 @@ async def insert_contributions( repo: ContributionDep, contributions: list[ContributionIn], ): - pass + return await repo.insert_contributions(contributions=contributions) @router.put("") async def upsert_contributions( repo: ContributionDep, contributions: list[ContributionIn], - filter: ContributionFilter = FilterDepends(ContributionFilter), ): - pass + return await repo.upsert_contributions(contributions=contributions) @router.get("download/{mime}") @@ -56,7 +57,9 @@ async def download_contributions( filter: ContributionFilter = FilterDepends(ContributionFilter), fields: Annotated[str | None, Query(alias="_fields")] = None, ): - pass + return await repo.download_contributions( + format=format, filter=filter, fields=fields + ) @router.delete("{id}") @@ -64,7 +67,7 @@ async def delete_contribtion_by_id( repo: ContributionDep, id: str, ): - pass + return await repo.delete_contribution_by_id(id=id) @router.get("{id}") @@ -73,18 +76,18 @@ async def get_contribution_by_id( id: str, fields: Annotated[str | None, Query(alias="_fields")] = None, ): - pass + return await repo.get_contribution_by_id(id=id, fields=fields) @router.put("{id}") async def upsert_contribution_by_id( repo: ContributionDep, id: str, contribution: ContributionIn ): - pass + return await repo.upsert_contribution_by_id(id=id, contribution=contribution) @router.patch("{id}") async def update_contribution_by_id( repo: ContributionDep, id: str, update: ContributionPatch ): - pass + return await repo.update_contribution_by_id(id=id, update=update) From 598bcbb44aa58ca883a80d74330636cf11c8cf93 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 3 Jun 2026 10:11:10 -0700 Subject: [PATCH 270/591] Mostly formatting and type checking changes. Added stub files for component attachments. Added project-level claude.md. Added just file for development ease. --- mpcontribs-api/.gitignore | 1 + mpcontribs-api/CLAUDE.md | 85 + mpcontribs-api/gunicorn.conf.py | 9 +- mpcontribs-api/justfile | 5 + mpcontribs-api/main.py | 6 +- mpcontribs-api/maintenance.py | 3 +- mpcontribs-api/pyproject.toml | 35 +- mpcontribs-api/scripts/healthchecks.py | 1 + mpcontribs-api/src/mpcontribs_api/app.py | 2 +- mpcontribs-api/src/mpcontribs_api/config.py | 17 +- .../src/mpcontribs_api/dependencies.py | 10 +- .../domains/attachments/models.py | 5 + .../domains/contributions/dependencies.py | 4 +- .../domains/contributions/repository.py | 6 +- .../domains/contributions/router.py | 16 +- .../mpcontribs_api/domains/projects/models.py | 2 +- .../domains/projects/repository.py | 29 +- .../domains/structures/models.py | 5 + .../mpcontribs_api/domains/tables/models.py | 5 + .../src/mpcontribs_api/exceptions.py | 4 +- mpcontribs-api/src/mpcontribs_api/logging.py | 6 +- .../src/mpcontribs_api/old/__init__.py | 17 +- .../old/attachments/__init__.py | 3 +- .../old/attachments/document.py | 36 +- .../mpcontribs_api/old/attachments/views.py | 11 +- .../src/mpcontribs_api/old/config.py | 11 +- .../old/contributions/document.py | 66 +- .../old/contributions/generate_formulae.py | 8 +- .../mpcontribs_api/old/contributions/views.py | 41 +- mpcontribs-api/src/mpcontribs_api/old/core.py | 52 +- .../mpcontribs_api/old/notebooks/__init__.py | 4 +- .../mpcontribs_api/old/notebooks/document.py | 29 +- .../src/mpcontribs_api/old/notebooks/views.py | 57 +- .../mpcontribs_api/old/projects/document.py | 76 +- .../src/mpcontribs_api/old/projects/views.py | 20 +- .../mpcontribs_api/old/structures/document.py | 8 +- .../mpcontribs_api/old/structures/views.py | 9 +- .../src/mpcontribs_api/old/tables/__init__.py | 3 +- .../src/mpcontribs_api/old/tables/document.py | 10 +- .../src/mpcontribs_api/old/tables/views.py | 11 +- .../src/mpcontribs_api/pagination.py | 7 +- .../src/mpcontribs_api/projection.py | 36 +- mpcontribs-api/src/mpcontribs_api/types.py | 4 +- mpcontribs-api/supervisord/conf.py | 5 +- mpcontribs-api/uv.lock | 1579 +---------------- 45 files changed, 425 insertions(+), 1934 deletions(-) create mode 100644 mpcontribs-api/.gitignore create mode 100644 mpcontribs-api/CLAUDE.md create mode 100644 mpcontribs-api/justfile create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/structures/models.py create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/tables/models.py diff --git a/mpcontribs-api/.gitignore b/mpcontribs-api/.gitignore new file mode 100644 index 0000000000..ce7322d6e6 --- /dev/null +++ b/mpcontribs-api/.gitignore @@ -0,0 +1 @@ +src/mpcontribs_api/old diff --git a/mpcontribs-api/CLAUDE.md b/mpcontribs-api/CLAUDE.md new file mode 100644 index 0000000000..61a9534f67 --- /dev/null +++ b/mpcontribs-api/CLAUDE.md @@ -0,0 +1,85 @@ +# CLAUDE.md + +This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository. + +This is a complete rewrite of the MPContribs API server. +The core of the package is FastAPI, Pydantic, and Beanie. +Developer experience and process efficiency are top priorities. + +## Commands + +```bash +# Format, fix, and lint (preferred) +just fmt + +# Run tests +uv run pytest + +# Run tests by marker +uv run pytest -m base +uv run pytest -m extra + +# Run tests in parallel +uv run pytest -n auto + +# Type check +uv run basedpyright +``` + +## Environment + +Copy `.env.example` to `.env`. Key variables (all prefixed `MPCONTRIBS_`): + +- `MONGO__URI` — MongoDB Atlas URI +- `MONGO__DB_NAME` — database name +- `KONG__GATEWAY_SECRET` — shared secret for verifying requests came through Kong +- `ENVIRONMENT` — `dev` or `prod` (controls log format and debug mode) + +## Architecture + +### Domain structure + +Each resource lives in `src/mpcontribs_api/domains//` with four files: + +- `models.py` — Beanie `Document` subclass (DB model) + Pydantic output/input/patch/filter models +- `repository.py` — `MongoDbRepository` encapsulating all database access +- `router.py` — `APIRouter` with CRUD endpoint handlers +- `dependencies.py` — `Dep` type alias (`Annotated[MongoDbRepository, Depends(...)]`) + +Routers are registered in `src/mpcontribs_api/api/v1/router.py`. + +### Authentication and authorization + +Kong injects user identity via headers; `auth.py` parses them into a frozen `User` model. The dependency chain is: + +- `UserDep` — any caller (anonymous or authenticated) +- `AuthedDep` — requires authenticated user (raises 401 otherwise) +- `require_role(role)` — factory returning a dependency that requires a specific group membership + +All database access goes through a repository instantiated with the current `User`. The repository's `_scope` dict is injected into every MongoDB query automatically: + +- **Admins** (members of `mongo.admin_group`): no filter applied +- **Authenticated users**: see public+approved data, own resources (`owner == username`), and group resources +- **Anonymous**: public + approved only + +`verify_gateway()` in `dependencies.py` validates the `x-gateway-secret` header to ensure Kong was the actual caller. + +### Repository pattern + +Repositories take a `User` at construction time and expose typed async methods (`get_*`, `insert_*`, `patch_*`, `upsert_*`, `delete_*`). They never leak the scope logic to routers — routers only call repository methods. + +### Sparse field selection + +The `_fields` query parameter (handled in `projection.py`) lets callers request specific fields (comma-separated, dotted for nesting). `SparseFieldsModel` dynamically creates a trimmed Pydantic model via `create_model()` and converts field paths to MongoDB projection syntax. Results are cached with `@lru_cache`. + +### Cursor-based pagination + +`Page[T]` in `pagination.py` contains `items` and a `next_cursor` (base64-encoded last item ID). Pagination is forward-only and stateless. Default page size is 20; max is 100. + +### Exception hierarchy + +`exceptions.py` defines `AppError` subclasses (`NotFoundError`, `ConflictError`, `ValidationError`, `AuthenticationError`, `PermissionError`, `GatewayError`). All carry `status_code`, `error_code`, `message`, and a `context` dict. Handlers in `app.py` convert them to a uniform JSON shape; internal context is logged but not sent to clients. + +### Observability + +`logging.py` configures structlog with per-request context vars (request_id, method, path, consumer_id) bound by the middleware in `middleware.py`. OpenTelemetry traces are exported via OTLP/gRPC and trace/span IDs are injected into every log line. diff --git a/mpcontribs-api/gunicorn.conf.py b/mpcontribs-api/gunicorn.conf.py index d6d1693c1c..548ba7f767 100644 --- a/mpcontribs-api/gunicorn.conf.py +++ b/mpcontribs-api/gunicorn.conf.py @@ -1,14 +1,17 @@ -import ddtrace.auto # noqa: F401 import os +import ddtrace.auto # noqa: F401 + bind = "0.0.0.0:{}".format(os.getenv("API_PORT")) worker_class = "gevent" workers = os.getenv("NWORKERS") statsd_host = "{}:8125".format(os.getenv("DD_AGENT_HOST")) accesslog = "-" errorlog = "-" -access_log_format = '{}/{}: %(h)s %(t)s %(m)s %(U)s?%(q)s %(H)s %(s)s %(b)s "%(f)s" "%(a)s" %(D)s %(p)s %({{x-consumer-id}}i)s'.format( - os.getenv("SUPERVISOR_GROUP_NAME"), os.getenv("SUPERVISOR_PROCESS_NAME") +access_log_format = ( + '{}/{}: %(h)s %(t)s %(m)s %(U)s?%(q)s %(H)s %(s)s %(b)s "%(f)s" "%(a)s" %(D)s %(p)s %({{x-consumer-id}}i)s'.format( + os.getenv("SUPERVISOR_GROUP_NAME"), os.getenv("SUPERVISOR_PROCESS_NAME") + ) ) max_requests = os.getenv("MAX_REQUESTS") max_requests_jitter = os.getenv("MAX_REQUESTS_JITTER") diff --git a/mpcontribs-api/justfile b/mpcontribs-api/justfile new file mode 100644 index 0000000000..fa1e0c572d --- /dev/null +++ b/mpcontribs-api/justfile @@ -0,0 +1,5 @@ +# Format, fix, and lint all source code +fmt: + uv run ruff format src/ + -uv run ruff check --fix --unsafe-fixes src/ + -uv run pydocstringformatter --write src/ diff --git a/mpcontribs-api/main.py b/mpcontribs-api/main.py index a4c111b228..d9d5a740c0 100755 --- a/mpcontribs-api/main.py +++ b/mpcontribs-api/main.py @@ -1,9 +1,9 @@ #!/usr/bin/env python -import os -import requests -import boto3 import logging +import os +import boto3 +import requests from supervisor.options import ClientOptions from supervisor.supervisorctl import Controller diff --git a/mpcontribs-api/maintenance.py b/mpcontribs-api/maintenance.py index 6ff4b5f8aa..10d84a8d35 100644 --- a/mpcontribs-api/maintenance.py +++ b/mpcontribs-api/maintenance.py @@ -1,9 +1,8 @@ from boltons.iterutils import remap from mongoengine.queryset.visitor import Q - from mpcontribs.api import enter -from mpcontribs.api.projects.document import Projects from mpcontribs.api.contributions.document import Contributions +from mpcontribs.api.projects.document import Projects def visit(path, key, value): diff --git a/mpcontribs-api/pyproject.toml b/mpcontribs-api/pyproject.toml index 3db7b16a0a..66062c39a5 100644 --- a/mpcontribs-api/pyproject.toml +++ b/mpcontribs-api/pyproject.toml @@ -77,10 +77,10 @@ Documentation = "https://docs.materialsproject.org/services/mpcontribs" [dependency-groups] dev = [ - "flake8>=7.3.0", + "ruff>=0.9.0", + "basedpyright>=1.29.0", + "pydocstringformatter>=0.7.0", "pytest>=9.0.3", - "pytest-flake8>=1.3.0", - "pytest-pycodestyle>=2.5.0", "pytest-xdist>=3.8.0", ] @@ -90,22 +90,19 @@ markers = [ "extra: all extra views", ] -[tool.pycodestyle] -count = true -ignore = ["E121","E123","E126","E133","E226","E241","E242","E704","W503","W504","W505","E741","W605"] -max-line-length = 120 -statistics = true -exclude = ["flasgger","flask-mongorest"] +[tool.ruff] +line-length = 120 +exclude = ["src/mpcontribs_api/old"] -[tool.flake8] -exclude = [".git","__pycache__","tests","flasgger","flask-mongorest"] -extend-ignore = ["E741",] -max-line-length = 120 +[tool.ruff.lint] +select = ["E", "F", "W", "I", "B", "UP"] +ignore = ["E741", "B008"] -[tool.pydocstyle] -ignore = ["D105","D2","D4"] +[tool.pydocstringformatter] +max-line-length = 120 +exclude = ["src/mpcontribs_api/old"] -[tool.mypy] -ignore_missing_imports = true -namespace_packages = true -python_version = 3.14 +[tool.basedpyright] +pythonVersion = "3.14" +typeCheckingMode = "standard" +ignore = ["src/mpcontribs_api/old"] diff --git a/mpcontribs-api/scripts/healthchecks.py b/mpcontribs-api/scripts/healthchecks.py index e0b3396162..ff30095730 100644 --- a/mpcontribs-api/scripts/healthchecks.py +++ b/mpcontribs-api/scripts/healthchecks.py @@ -1,5 +1,6 @@ import os import sys + import requests for deployment in os.environ.get("DEPLOYMENTS", "ml:10002").split(","): diff --git a/mpcontribs-api/src/mpcontribs_api/app.py b/mpcontribs-api/src/mpcontribs_api/app.py index 292395b94f..3830a3d582 100644 --- a/mpcontribs-api/src/mpcontribs_api/app.py +++ b/mpcontribs-api/src/mpcontribs_api/app.py @@ -1,8 +1,8 @@ from __future__ import annotations import logging +from collections.abc import AsyncGenerator from contextlib import asynccontextmanager -from typing import AsyncGenerator from beanie import init_beanie from fastapi import Depends, FastAPI diff --git a/mpcontribs-api/src/mpcontribs_api/config.py b/mpcontribs-api/src/mpcontribs_api/config.py index 7308337823..824ede959c 100644 --- a/mpcontribs-api/src/mpcontribs_api/config.py +++ b/mpcontribs-api/src/mpcontribs_api/config.py @@ -20,33 +20,32 @@ class MongoSettings(BaseModel): Provided defaults are the defaults of AsyncMongoClient """ - uri: SecretStr = Field( - description="The full uri from MongoDB (username and password included)" - ) + uri: SecretStr = Field(description="The full uri from MongoDB (username and password included)") db_name: str max_pool_size: int = Field( default=100, - description="Maximum number of allowed concurrent connection to each server. Can be '0' or 'None', both of which allow any number of connections", + description="Maximum number of allowed concurrent connection to each server. Can be '0' or 'None', both of " + "which allow any number of connections", ) min_pool_size: int = Field( default=0, description="Minimum number of concurent connections that the pool will maintain connected to each server", ) - datetime_conversion: Literal[ - "datetime_ms", "datetime", "datetime_auto", "datetime_clamp" - ] = Field( + datetime_conversion: Literal["datetime_ms", "datetime", "datetime_auto", "datetime_clamp"] = Field( default="datetime", description="Specifies how UTC datetimes should be decoded within BSON", ) server_selection_timeout_ms: int = Field( default=30000, - description="Controls how long (in milliseconds) the driver will wait to find an available, appropriate server to carry out a database operation;" + description="Controls how long (in milliseconds) the driver will wait to find an available, appropriate server" + "to carry out a database operation;" "while it is waiting, multiple server monitoring operations may be carried out", ) admin_group: str = Field( default="admin", - description="Name of admin group to consider in requests to MongoDB. Not directly passed to Mongo, but consumed by auth.", + description="Name of admin group to consider in requests to MongoDB. Not directly passed to Mongo, but consumed" + "by auth.", ) diff --git a/mpcontribs-api/src/mpcontribs_api/dependencies.py b/mpcontribs-api/src/mpcontribs_api/dependencies.py index ad120b8201..41a67d5f4c 100644 --- a/mpcontribs-api/src/mpcontribs_api/dependencies.py +++ b/mpcontribs-api/src/mpcontribs_api/dependencies.py @@ -17,10 +17,8 @@ def verify_gateway(x_gateway_secret: Annotated[str | None, Header()] = None) -> None: - """Ensures the current access attempt is coming through Kong""" - if x_gateway_secret is None or not hmac.compare_digest( - x_gateway_secret, str(settings.kong.gateway_secret) - ): + """Ensures the current access attempt is coming through Kong.""" + if x_gateway_secret is None or not hmac.compare_digest(x_gateway_secret, str(settings.kong.gateway_secret)): raise GatewayError("direct access not permitted") @@ -43,9 +41,7 @@ def get_user(request: Request) -> User: if explicit_anon or username is None: user = User() # anonymous = all defaults else: - groups = _split(h.get("x-authenticated-groups")) | _split( - h.get("x-consumer-groups") - ) + groups = _split(h.get("x-authenticated-groups")) | _split(h.get("x-consumer-groups")) user = User( consumer_id=h.get("x-consumer-id"), username=username, diff --git a/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py b/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py new file mode 100644 index 0000000000..ef24f2ad42 --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py @@ -0,0 +1,5 @@ +from beanie import Document + + +class Attachment(Document): + pass diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/dependencies.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/dependencies.py index 6296439f7b..3227039e95 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/dependencies.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/dependencies.py @@ -12,6 +12,4 @@ def get_scoped_contributions(user: UserDep) -> MongoDbContributionRepository: return MongoDbContributionRepository(user) -ContributionDep = Annotated[ - MongoDbContributionRepository, Depends(get_scoped_contributions) -] +ContributionDep = Annotated[MongoDbContributionRepository, Depends(get_scoped_contributions)] diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py index 397aeef1fb..4cfa191b3a 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py @@ -11,7 +11,7 @@ class MongoDbContributionRepository: def __init__(self, user: User) -> None: - """Initializes an instance based on the current user + """Initializes an instance based on the current user. Args: user (User): the current user requesting resources @@ -29,9 +29,7 @@ def _build_scope(user: User) -> dict[str, Any]: ors.append({"_id": {"$in": sorted(user.groups)}}) return {"$or": ors} - async def get_contributions( - self, pagination: CursorParams, filter: ContributionFilter, fields: str | None - ): + async def get_contributions(self, pagination: CursorParams, filter: ContributionFilter, fields: str | None): pass async def delete_contributions(self, filter: ContributionFilter): diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py index 51a3a760a0..cbd5837505 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py @@ -21,9 +21,7 @@ async def get_contributions( filter: ContributionFilter = FilterDepends(ContributionFilter), fields: Annotated[str | None, Query(alias="_fields")] = None, ): - return await repo.get_contributions( - pagination=pagination, filter=filter, fields=fields - ) + return await repo.get_contributions(pagination=pagination, filter=filter, fields=fields) @router.delete("") @@ -57,9 +55,7 @@ async def download_contributions( filter: ContributionFilter = FilterDepends(ContributionFilter), fields: Annotated[str | None, Query(alias="_fields")] = None, ): - return await repo.download_contributions( - format=format, filter=filter, fields=fields - ) + return await repo.download_contributions(format=format, filter=filter, fields=fields) @router.delete("{id}") @@ -80,14 +76,10 @@ async def get_contribution_by_id( @router.put("{id}") -async def upsert_contribution_by_id( - repo: ContributionDep, id: str, contribution: ContributionIn -): +async def upsert_contribution_by_id(repo: ContributionDep, id: str, contribution: ContributionIn): return await repo.upsert_contribution_by_id(id=id, contribution=contribution) @router.patch("{id}") -async def update_contribution_by_id( - repo: ContributionDep, id: str, update: ContributionPatch -): +async def update_contribution_by_id(repo: ContributionDep, id: str, update: ContributionPatch): return await repo.update_contribution_by_id(id=id, update=update) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py index 7a3af99e10..9f78c568f9 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py @@ -130,7 +130,7 @@ class ProjectIn(Project): class ProjectPatch(BaseModel): - """Nullable Project representation of user-supplied data for partial update (patch)""" + """Nullable Project representation of user-supplied data for partial update (patch).""" title: ShortStr | None = None authors: str | None = None diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py index e91dfc5450..2a13f3c2ec 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py @@ -31,16 +31,17 @@ class HasId(BaseModel): class MongoDbProjectRepository: - """A repository layer for access to MongoDB + """A repository layer for access to MongoDB. This is the layer that directly interacts with database operations Attributes: - _scope (dict[str, Any]): additional terms to inject into mongo queries to enforce user authorization on resources + _scope (dict[str, Any]): additional terms to inject into mongo queries to enforce user authorization on + resources """ def __init__(self, user: User) -> None: - """Initializes an instance based on the current user + """Initializes an instance based on the current user. Args: user (User): the current user requesting resources @@ -61,11 +62,12 @@ def _build_scope(user: User) -> dict[str, Any]: # Brendan TODO: figure out return type async def get_project_by_id(self, id: str, fields: frozenset[str] | None): - """Finds a single project by ID + """Finds a single project by ID. Args: id (str): the id of the project to find - fields (frozenset[str] | None): a BaseModel to use for projection. If none, the document is returned without projection + fields (frozenset[str] | None): a BaseModel to use for projection. If none, the document is returned without + projection Returns: ProjectOut: a projection of ProjectOut containing 'fields' from requested id @@ -77,7 +79,8 @@ async def get_project_by_id(self, id: str, fields: frozenset[str] | None): projection_model=ProjectOut.projection(fields), ) - # Brendan TODO: Does not handle compound pagination/sorting (can only paginate on _id, so passing sort arguments does nothing) + # Brendan TODO: Does not handle compound pagination/sorting + # can only paginate on _id, so passing sort arguments does nothing async def get_project( self, filter: ProjectFilter, @@ -91,18 +94,14 @@ async def get_project( Args: filter (ProjectFilter): the query to filter the collection by pagination (CursorParams): parameters for pagination using a cursor - fields (frozenset[str] | None): the fields to use for projection. If none, the document is returned without projection + fields (frozenset[str] | None): the fields to use for projection. If none, the document is returned without + projection """ proj = ProjectOut.projection(fields) query = filter.filter(Project.find(self._scope)) if pagination.cursor is not None: query = query.find(Project.id > decode_cursor(pagination.cursor)) - docs = ( - await query.sort(Project.id) - .limit(pagination.limit + 1) - .project(proj) - .to_list() - ) + docs = await query.sort(Project.id).limit(pagination.limit + 1).project(proj).to_list() has_more = len(docs) > pagination.limit items = docs[: pagination.limit] next_cursor = encode_cursor(str(items[-1].id)) if has_more and items else None @@ -120,9 +119,7 @@ async def insert_project(self, project: ProjectIn) -> Project: id_exists = await Project.find_one(Project.id == project.id) # Brendan TODO: if id_exists: - raise ConflictError( - f"Cannot insert project.\n Project with ID {project.id} exists" - ) + raise ConflictError(f"Cannot insert project.\n Project with ID {project.id} exists") full_project = Project.from_project_in(project) await full_project.insert() return full_project diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py new file mode 100644 index 0000000000..c42ae0436d --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py @@ -0,0 +1,5 @@ +from beanie import Document + + +class Structure(Document): + pass diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py new file mode 100644 index 0000000000..b58aede0a9 --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py @@ -0,0 +1,5 @@ +from beanie import Document + + +class Table(Document): + pass diff --git a/mpcontribs-api/src/mpcontribs_api/exceptions.py b/mpcontribs-api/src/mpcontribs_api/exceptions.py index e495708aba..ab157afd2b 100644 --- a/mpcontribs-api/src/mpcontribs_api/exceptions.py +++ b/mpcontribs-api/src/mpcontribs_api/exceptions.py @@ -106,9 +106,7 @@ async def _handle_unexpected(request: Request, exc: Exception) -> JSONResponse: async def _handle_validation(request, exc): return JSONResponse( status_code=422, - content=_error_body( - "validation_error", "Request validation failed", errors=exc.errors() - ), + content=_error_body("validation_error", "Request validation failed", errors=exc.errors()), ) # Unify http exceptions from starlette with our exception format diff --git a/mpcontribs-api/src/mpcontribs_api/logging.py b/mpcontribs-api/src/mpcontribs_api/logging.py index 6f28d284ba..e33fc30dd0 100644 --- a/mpcontribs-api/src/mpcontribs_api/logging.py +++ b/mpcontribs-api/src/mpcontribs_api/logging.py @@ -13,7 +13,8 @@ def add_otel_trace_context(_, __, event_dict): # If context is not the sentinel span (ie. we have an active span) if ctx.is_valid: # Convert to OTel-expected ids - # ctx ids are formatted as 128-bit (trace_id) and 64-bit (span_id) long numbers. OTel expects them as 0-padded hex numbers + # ctx ids are formatted as 128-bit (trace_id) and 64-bit (span_id) long numbers. + # OTel expects them as 0-padded hex numbers event_dict["trace_id"] = format(ctx.trace_id, "032x") # 32 digits event_dict["span_id"] = format(ctx.span_id, "016x") # 16 digits return event_dict @@ -43,8 +44,7 @@ def configure_logging(settings: Settings) -> None: # Handles internal logs emitted by structlog logger structlog.configure( - processors=shared_processors - + [structlog.stdlib.ProcessorFormatter.wrap_for_formatter], + processors=shared_processors + [structlog.stdlib.ProcessorFormatter.wrap_for_formatter], logger_factory=structlog.stdlib.LoggerFactory(), wrapper_class=structlog.make_filtering_bound_logger(log_level), cache_logger_on_first_use=True, diff --git a/mpcontribs-api/src/mpcontribs_api/old/__init__.py b/mpcontribs-api/src/mpcontribs_api/old/__init__.py index 753302b759..937d821e9b 100644 --- a/mpcontribs-api/src/mpcontribs_api/old/__init__.py +++ b/mpcontribs-api/src/mpcontribs_api/old/__init__.py @@ -1,5 +1,4 @@ -# -*- coding: utf-8 -*- -"""Flask App for MPContribs API""" +"""Flask App for MPContribs API.""" import logging import os @@ -53,9 +52,7 @@ "OTHERS": [ops.Boolean, ops.Exists], } FILTERS["STRINGS"] = [ops.In, ops.Exact, ops.IExact, ops.Ne] + FILTERS["LONG_STRINGS"] -FILTERS["ALL"] = ( - FILTERS["STRINGS"] + FILTERS["NUMBERS"] + FILTERS["DATES"] + FILTERS["OTHERS"] -) +FILTERS["ALL"] = FILTERS["STRINGS"] + FILTERS["NUMBERS"] + FILTERS["DATES"] + FILTERS["OTHERS"] class CustomLoggerAdapter(logging.LoggerAdapter): @@ -129,14 +126,14 @@ def send_email(to, subject, html): def get_collections(db): - """get list of collections in DB""" + """Get list of collections in DB.""" conn = db.app.extensions["mongoengine"][db]["conn"] dbname = db.app.config.get("MPCONTRIBS_DB") return conn[dbname].list_collection_names() def get_resource_as_string(name, charset="utf-8"): - """http://flask.pocoo.org/snippets/77/""" + """Http://flask.pocoo.org/snippets/77/.""" with current_app.open_resource(name) as f: return f.read().decode(charset) @@ -162,7 +159,7 @@ def create_kernel_connection(kernel_id): def get_kernels(): - """retrieve list of kernels from KernelGateway service""" + """Retrieve list of kernels from KernelGateway service.""" try: r = requests.get(get_kernel_endpoint(), timeout=2) except ConnectionError, Timeout: @@ -191,7 +188,7 @@ def get_consumer(): def create_app(): - """create flask app""" + """Create flask app.""" app = Flask(__name__) app.config.from_pyfile("config.py", silent=True) app.config["USTS"] = URLSafeTimedSerializer(app.secret_key) @@ -206,7 +203,7 @@ def create_app(): Marshmallow(app) MongoEngine(app) Swagger(app, template=app.config.get("TEMPLATE")) - setattr(app, "kernels", get_kernels()) + app.kernels = get_kernels() # NOTE: hard-code to avoid pre-generating for new deployment # collections = get_collections(db) diff --git a/mpcontribs-api/src/mpcontribs_api/old/attachments/__init__.py b/mpcontribs-api/src/mpcontribs_api/old/attachments/__init__.py index 4d321d0bf1..dc0093eef0 100644 --- a/mpcontribs-api/src/mpcontribs_api/old/attachments/__init__.py +++ b/mpcontribs-api/src/mpcontribs_api/old/attachments/__init__.py @@ -1,2 +1 @@ -# -*- coding: utf-8 -*- -"""document and views for attachments collection""" +"""Document and views for attachments collection.""" diff --git a/mpcontribs-api/src/mpcontribs_api/old/attachments/document.py b/mpcontribs-api/src/mpcontribs_api/old/attachments/document.py index 52e91702e3..6e4c8e89e4 100644 --- a/mpcontribs-api/src/mpcontribs_api/old/attachments/document.py +++ b/mpcontribs-api/src/mpcontribs_api/old/attachments/document.py @@ -1,18 +1,16 @@ -# -*- coding: utf-8 -*- -import os -import boto3 import binascii +import os +from base64 import b64decode, b64encode +import boto3 +from filetype.types.archive import Gz +from filetype.types.image import Gif, Jpeg, Png, Tiff from flask import request -from base64 import b64decode, b64encode from flask_mongoengine.documents import DynamicDocument -from mongoengine import signals, ValidationError +from mongoengine import ValidationError, signals from mongoengine.fields import StringField from mongoengine.queryset.manager import queryset_manager -from filetype.types.archive import Gz -from filetype.types.image import Jpeg, Png, Gif, Tiff - -from mpcontribs.api.contributions.document import get_resource, get_md5, COMPONENTS +from mpcontribs.api.contributions.document import COMPONENTS, get_md5, get_resource MAX_BYTES = 2.4 * 1024 * 1024 BUCKET = os.environ.get("S3_ATTACHMENTS_BUCKET", "mpcontribs-attachments") @@ -26,9 +24,7 @@ class Attachments(DynamicDocument): name = StringField(required=True, help_text="file name") md5 = StringField(regex=r"^[a-z0-9]{32}$", unique=True, help_text="md5 sum") - mime = StringField( - required=True, choices=SUPPORTED_MIMES, help_text="attachment mime type" - ) + mime = StringField(required=True, choices=SUPPORTED_MIMES, help_text="attachment mime type") content = StringField(required=True, help_text="base64-encoded attachment content") meta = {"collection": "attachments", "indexes": ["name", "mime", "md5"]} @@ -45,9 +41,7 @@ def post_init(cls, sender, document, **kwargs): if "content" in requested_fields: if not document.md5: # document.reload("md5") # TODO AttributeError: _changed_fields - raise ValueError( - "Please also request md5 field to retrieve attachment content!" - ) + raise ValueError("Please also request md5 field to retrieve attachment content!") retr = s3_client.get_object(Bucket=BUCKET, Key=document.md5) document.content = b64encode(retr["Body"].read()).decode("utf-8") @@ -71,9 +65,7 @@ def pre_save_post_validation(cls, sender, document, **kwargs): size = len(content) if size > MAX_BYTES: - raise ValidationError( - f"Attachment {document.name} too large ({size} > {MAX_BYTES})!" - ) + raise ValidationError(f"Attachment {document.name} too large ({size} > {MAX_BYTES})!") # md5 resource = get_resource("attachments") @@ -87,13 +79,9 @@ def pre_save_post_validation(cls, sender, document, **kwargs): Metadata={"name": document.name}, Body=content, ) - document.content = str( - size - ) # set to something useful to distinguish in post_init + document.content = str(size) # set to something useful to distinguish in post_init signals.post_init.connect(Attachments.post_init, sender=Attachments) signals.pre_delete.connect(Attachments.pre_delete, sender=Attachments) -signals.pre_save_post_validation.connect( - Attachments.pre_save_post_validation, sender=Attachments -) +signals.pre_save_post_validation.connect(Attachments.pre_save_post_validation, sender=Attachments) diff --git a/mpcontribs-api/src/mpcontribs_api/old/attachments/views.py b/mpcontribs-api/src/mpcontribs_api/old/attachments/views.py index ae1e8c16a9..bf4f8e20f6 100644 --- a/mpcontribs-api/src/mpcontribs_api/old/attachments/views.py +++ b/mpcontribs-api/src/mpcontribs_api/old/attachments/views.py @@ -1,14 +1,13 @@ -# -*- coding: utf-8 -*- import os + import flask_mongorest -from flask_mongorest.resources import Resource -from flask_mongorest import operators as ops -from flask_mongorest.methods import Fetch, BulkFetch, Download from flask import Blueprint - +from flask_mongorest import operators as ops +from flask_mongorest.methods import BulkFetch, Download, Fetch +from flask_mongorest.resources import Resource from mpcontribs.api import FILTERS -from mpcontribs.api.core import SwaggerView from mpcontribs.api.attachments.document import Attachments +from mpcontribs.api.core import SwaggerView templates = os.path.join(os.path.dirname(flask_mongorest.__file__), "templates") attachments = Blueprint("attachments", __name__, template_folder=templates) diff --git a/mpcontribs-api/src/mpcontribs_api/old/config.py b/mpcontribs-api/src/mpcontribs_api/old/config.py index e9539ed081..52a569ce94 100644 --- a/mpcontribs-api/src/mpcontribs_api/old/config.py +++ b/mpcontribs-api/src/mpcontribs_api/old/config.py @@ -1,15 +1,12 @@ -# -*- coding: utf-8 -*- -"""configuration module for MPContribs Flask API""" +"""Configuration module for MPContribs Flask API.""" -import os -import json import gzip +import json +import os from mpcontribs.api import __version__ -formulae_path = os.path.join( - os.path.dirname(__file__), "contributions", "formulae.json.gz" -) +formulae_path = os.path.join(os.path.dirname(__file__), "contributions", "formulae.json.gz") with gzip.open(formulae_path) as f: FORMULAE = json.load(f) diff --git a/mpcontribs-api/src/mpcontribs_api/old/contributions/document.py b/mpcontribs-api/src/mpcontribs_api/old/contributions/document.py index db434cdf89..0f3c3870fb 100644 --- a/mpcontribs-api/src/mpcontribs_api/old/contributions/document.py +++ b/mpcontribs-api/src/mpcontribs_api/old/contributions/document.py @@ -1,29 +1,33 @@ -# -*- coding: utf-8 -*- -import json import itertools - +import json +from datetime import datetime +from decimal import Decimal from hashlib import md5 +from importlib import import_module +from itertools import permutations from math import isnan -from bson.dbref import DBRef -from datetime import datetime -from flask import current_app + from atlasq import AtlasManager, AtlasQ -from itertools import permutations -from importlib import import_module +from boltons.iterutils import remap +from bson.dbref import DBRef from fastnumbers import isfloat -from mongoengine import CASCADE, signals, DynamicDocument +from flask import current_app +from mongoengine import CASCADE, DynamicDocument, signals +from mongoengine.fields import ( + BooleanField, + DateTimeField, + DictField, + LazyReferenceField, + ListField, + ReferenceField, + StringField, +) from mongoengine.queryset.manager import queryset_manager -from mongoengine.fields import StringField, BooleanField, DictField -from mongoengine.fields import LazyReferenceField, ReferenceField -from mongoengine.fields import DateTimeField, ListField -from boltons.iterutils import remap -from decimal import Decimal +from mpcontribs.api import delimiter, enter, valid_dict from pint import UnitRegistry from pint.errors import DimensionalityError -from uncertainties import ufloat_fromstr from pymatgen.core import Composition, Element - -from mpcontribs.api import enter, valid_dict, delimiter +from uncertainties import ufloat_fromstr quantity_keys = {"display", "value", "error", "unit"} max_dgts = 6 @@ -142,17 +146,11 @@ def get_md5(resource, obj, fields): class Contributions(DynamicDocument): - project = LazyReferenceField( - "Projects", required=True, passthrough=True, reverse_delete_rule=CASCADE - ) + project = LazyReferenceField("Projects", required=True, passthrough=True, reverse_delete_rule=CASCADE) identifier = StringField(required=True, help_text="material/composition identifier") formula = StringField(help_text="formula (set dynamically if not provided)") - is_public = BooleanField( - required=True, default=True, help_text="public/private contribution" - ) - last_modified = DateTimeField( - required=True, default=datetime.utcnow, help_text="time of last modification" - ) + is_public = BooleanField(required=True, default=True, help_text="public/private contribution") + last_modified = DateTimeField(required=True, default=datetime.utcnow, help_text="time of last modification") needs_build = BooleanField(default=True, help_text="needs notebook build?") data = DictField( default=dict, @@ -160,13 +158,9 @@ class Contributions(DynamicDocument): pullout_key="display", help_text="simple free-form data", ) - structures = ListField( - ReferenceField("Structures", null=True), default=list, max_length=10 - ) + structures = ListField(ReferenceField("Structures", null=True), default=list, max_length=10) tables = ListField(ReferenceField("Tables", null=True), default=list, max_length=10) - attachments = ListField( - ReferenceField("Attachments", null=True), default=list, max_length=10 - ) + attachments = ListField(ReferenceField("Attachments", null=True), default=list, max_length=10) notebook = ReferenceField("Notebooks") atlas = AtlasManager("formula_autocomplete") meta = { @@ -282,9 +276,7 @@ def make_quantities(path, key, value): qq = q.value.to(column.unit) q = new_error_units(q, qq) except DimensionalityError: - raise ValueError( - f"Can't convert [{q.units}] to [{column.unit}] for {field}!" - ) + raise ValueError(f"Can't convert [{q.units}] to [{column.unit}] for {field}!") else: # try compact representation qq = q.value.to_compact() @@ -327,7 +319,5 @@ def pre_delete(cls, sender, document, **kwargs): signals.post_init.connect(Contributions.post_init, sender=Contributions) -signals.pre_save_post_validation.connect( - Contributions.pre_save_post_validation, sender=Contributions -) +signals.pre_save_post_validation.connect(Contributions.pre_save_post_validation, sender=Contributions) signals.pre_delete.connect(Contributions.pre_delete, sender=Contributions) diff --git a/mpcontribs-api/src/mpcontribs_api/old/contributions/generate_formulae.py b/mpcontribs-api/src/mpcontribs_api/old/contributions/generate_formulae.py index f625ff27be..8ddd8c04d2 100644 --- a/mpcontribs-api/src/mpcontribs_api/old/contributions/generate_formulae.py +++ b/mpcontribs-api/src/mpcontribs_api/old/contributions/generate_formulae.py @@ -1,14 +1,12 @@ -# -*- coding: utf-8 -*- -import os import json +import os + from pymatgen.ext.matproj import MPRester data = {} with MPRester() as mpr: - for i, d in enumerate( - mpr.query(criteria={}, properties=["task_ids", "pretty_formula"]) - ): + for _i, d in enumerate(mpr.query(criteria={}, properties=["task_ids", "pretty_formula"])): for task_id in d["task_ids"]: data[task_id] = d["pretty_formula"] diff --git a/mpcontribs-api/src/mpcontribs_api/old/contributions/views.py b/mpcontribs-api/src/mpcontribs_api/old/contributions/views.py index f78af3d671..4b99248f00 100644 --- a/mpcontribs-api/src/mpcontribs_api/old/contributions/views.py +++ b/mpcontribs-api/src/mpcontribs_api/old/contributions/views.py @@ -1,37 +1,34 @@ -# -*- coding: utf-8 -*- -import re import os -import flask_mongorest - +import re from itertools import permutations -from css_html_js_minify import html_minify -from json2html import Json2Html -from boltons.iterutils import remap -from werkzeug.exceptions import Unauthorized -from pymatgen.core.composition import Composition, CompositionError -from flask import Blueprint, render_template, jsonify, abort, request -from flask_mongorest.resources import Resource +import flask_mongorest +from boltons.iterutils import remap +from css_html_js_minify import html_minify +from flask import Blueprint, abort, jsonify, render_template, request from flask_mongorest import operators as ops +from flask_mongorest.exceptions import UnknownFieldError from flask_mongorest.methods import ( - Fetch, - Delete, - Update, - BulkFetch, BulkCreate, - BulkUpdate, BulkDelete, + BulkFetch, + BulkUpdate, + Delete, Download, + Fetch, + Update, ) -from flask_mongorest.exceptions import UnknownFieldError - -from mpcontribs.api import enter, FILTERS -from mpcontribs.api.core import SwaggerView +from flask_mongorest.resources import Resource +from json2html import Json2Html +from mpcontribs.api import FILTERS, enter +from mpcontribs.api.attachments.views import AttachmentsResource from mpcontribs.api.contributions.document import Contributions +from mpcontribs.api.core import SwaggerView +from mpcontribs.api.notebooks.views import NotebooksResource from mpcontribs.api.structures.views import StructuresResource from mpcontribs.api.tables.views import TablesResource -from mpcontribs.api.attachments.views import AttachmentsResource -from mpcontribs.api.notebooks.views import NotebooksResource +from pymatgen.core.composition import Composition, CompositionError +from werkzeug.exceptions import Unauthorized templates = os.path.join(os.path.dirname(flask_mongorest.__file__), "templates") contributions = Blueprint("contributions", __name__, template_folder=templates) diff --git a/mpcontribs-api/src/mpcontribs_api/old/core.py b/mpcontribs-api/src/mpcontribs_api/old/core.py index a4a600db19..289fd80363 100644 --- a/mpcontribs-api/src/mpcontribs_api/old/core.py +++ b/mpcontribs-api/src/mpcontribs_api/old/core.py @@ -1,18 +1,18 @@ import os -import yaml - from copy import deepcopy -from re import Pattern from importlib import import_module +from re import Pattern + +import yaml from flasgger.marshmallow_apispec import SwaggerView as OriginalSwaggerView from flasgger.marshmallow_apispec import schema2jsonschema -from marshmallow_mongoengine import ModelSchema from flask_mongorest.views import ResourceView +from marshmallow_mongoengine import ModelSchema from mongoengine.queryset import DoesNotExist from mongoengine.queryset.visitor import Q -from werkzeug.exceptions import Unauthorized +from mpcontribs.api import get_logger, is_gunicorn from mpcontribs.api.config import DOC_DIR -from mpcontribs.api import is_gunicorn, get_logger +from werkzeug.exceptions import Unauthorized logger = get_logger(__name__) @@ -102,9 +102,7 @@ def get_specs(klass, method, collection): doc_name = collection[:-1].capitalize() fields_param = None if klass.resource.fields is not None: - fields_avail = ( - klass.resource.fields + klass.resource.get_optional_fields() + ["_all"] - ) + fields_avail = klass.resource.fields + klass.resource.get_optional_fields() + ["_all"] description = f"List of fields to include in response ({fields_avail})." description += " Use dot-notation for nested subfields." fields_param = { @@ -145,10 +143,7 @@ def get_specs(klass, method, collection): order_params = [] if klass.resource.allowed_ordering: - allowed_ordering = [ - o.pattern if isinstance(o, Pattern) else o - for o in klass.resource.allowed_ordering - ] + allowed_ordering = [o.pattern if isinstance(o, Pattern) else o for o in klass.resource.allowed_ordering] order_params = [ { "name": "_sort", @@ -405,10 +400,10 @@ def get_specs(klass, method, collection): class SwaggerView(OriginalSwaggerView, ResourceView): - """A class-based view defining additional methods""" + """A class-based view defining additional methods.""" def __init_subclass__(cls, **kwargs): - """initialize Schema, decorators, definitions, and tags""" + """Initialize Schema, decorators, definitions, and tags.""" super().__init_subclass__(**kwargs) if not __name__ == cls.__module__: @@ -447,9 +442,7 @@ def __init_subclass__(cls, **kwargs): if is_gunicorn: with open(file_path, "w") as f: yaml.dump(spec, f) - logger.debug( - f"{cls.tags[0]}.{method.__name__} written to {file_path}" - ) + logger.debug(f"{cls.tags[0]}.{method.__name__} written to {file_path}") def get_groups(self, request): groups = request.headers.get("X-Authenticated-Groups", "").split(",") @@ -467,9 +460,7 @@ def is_anonymous(self, request): return is_anonymous def is_external(self, request): - return request.headers.get( - "X-Forwarded-Host" - ) is not None and not request.headers.get("Origin") + return request.headers.get("X-Forwarded-Host") is not None and not request.headers.get("Origin") def is_admin(self, request): groups = self.get_groups(request) @@ -502,7 +493,7 @@ def is_admin_or_project_user(self, request, obj): def get_projects(self): # project is LazyReferenceFields (multiple queries) module = import_module("mpcontribs.api.projects.document") - Projects = getattr(module, "Projects") + Projects = module.Projects exclude = list(Projects._fields.keys()) only = ["name", "owner", "is_public", "is_approved"] return Projects.objects.exclude(*exclude).only(*only) @@ -584,9 +575,7 @@ def has_read_permission(self, request, qs): if q and "project" in q and "$in" in q["project"]: names = q.pop("project").pop("$in") - qfilter = self.get_projects_filter( - username, groups, filter_names=names - ) + qfilter = self.get_projects_filter(username, groups, filter_names=names) return qs.filter(qfilter) else: # get component Object IDs for queryset @@ -608,23 +597,16 @@ def qfilter(qs): # get list of readable contributions and their component Object IDs module = import_module("mpcontribs.api.contributions.document") - Contributions = getattr(module, "Contributions") + Contributions = module.Contributions qfilter = self.get_projects_filter(username, groups) component = component[:-1] if component == "notebooks" else component qfilter &= Q(**{f"{component}__in": ids}) - contribs = ( - Contributions.objects(qfilter).only(component).limit(len(ids)) - ) + contribs = Contributions.objects(qfilter).only(component).limit(len(ids)) # return new queryset using "ids__in" readable_ids = ( [getattr(contrib, component).id for contrib in contribs] if component == "notebook" - else [ - dbref.id - for contrib in contribs - for dbref in getattr(contrib, component) - if dbref.id in ids - ] + else [dbref.id for contrib in contribs for dbref in getattr(contrib, component) if dbref.id in ids] ) if not readable_ids: return qs.none() diff --git a/mpcontribs-api/src/mpcontribs_api/old/notebooks/__init__.py b/mpcontribs-api/src/mpcontribs_api/old/notebooks/__init__.py index 2db2955a69..85f493d150 100644 --- a/mpcontribs-api/src/mpcontribs_api/old/notebooks/__init__.py +++ b/mpcontribs-api/src/mpcontribs_api/old/notebooks/__init__.py @@ -1,8 +1,8 @@ -# -*- coding: utf-8 -*- from uuid import uuid1 + from flask import current_app -from tornado.escape import json_encode, json_decode from mpcontribs.api import create_kernel_connection, get_logger +from tornado.escape import json_decode, json_encode logger = get_logger(__name__) diff --git a/mpcontribs-api/src/mpcontribs_api/old/notebooks/document.py b/mpcontribs-api/src/mpcontribs_api/old/notebooks/document.py index 37615c7862..dd112f19f2 100644 --- a/mpcontribs-api/src/mpcontribs_api/old/notebooks/document.py +++ b/mpcontribs-api/src/mpcontribs_api/old/notebooks/document.py @@ -1,13 +1,12 @@ -# -*- coding: utf-8 -*- -import os -import boto3 import hashlib - -from io import BytesIO -from mongoengine import signals +import os from base64 import b64decode, b64encode +from io import BytesIO + +import boto3 from flask_mongoengine.documents import Document -from mongoengine.fields import DictField, StringField, IntField, ListField +from mongoengine import signals +from mongoengine.fields import DictField, IntField, ListField, StringField from mongoengine.queryset.manager import queryset_manager BUCKET = os.environ.get("S3_IMAGES_BUCKET", "mpcontribs-images") @@ -33,27 +32,19 @@ class LanguageInfo(DictField): nbconvert_exporter = StringField() pygments_lexer = StringField() version = StringField() - codemirror_mode = DictField( - CodemirrorMode(), default=CodemirrorMode, help_text="codemirror" - ) + codemirror_mode = DictField(CodemirrorMode(), default=CodemirrorMode, help_text="codemirror") class Metadata(DictField): - kernelspec = DictField( - Kernelspec(), required=True, help_text="kernelspec", default=Kernelspec - ) - language_info = DictField( - LanguageInfo(), required=True, help_text="language info", default=LanguageInfo - ) + kernelspec = DictField(Kernelspec(), required=True, help_text="kernelspec", default=Kernelspec) + language_info = DictField(LanguageInfo(), required=True, help_text="language info", default=LanguageInfo) class Cell(DictField): cell_type = StringField(required=True, default="code", help_text="cell type") metadata = DictField(help_text="cell metadata") source = StringField(required=True, default="print('hello')", help_text="source") - outputs = ListField( - DictField(), required=True, help_text="outputs", default=lambda: [DictField()] - ) + outputs = ListField(DictField(), required=True, help_text="outputs", default=lambda: [DictField()]) execution_count = IntField(help_text="exec count") diff --git a/mpcontribs-api/src/mpcontribs_api/old/notebooks/views.py b/mpcontribs-api/src/mpcontribs_api/old/notebooks/views.py index 93ea20e6b9..a0d7ec2749 100644 --- a/mpcontribs-api/src/mpcontribs_api/old/notebooks/views.py +++ b/mpcontribs-api/src/mpcontribs_api/old/notebooks/views.py @@ -1,27 +1,24 @@ -# -*- coding: utf-8 -*- import os import time -import requests -import flask_mongorest -from rq import get_current_job -from rq.job import Job -from gevent import sleep -from nbformat import v4 as nbf -from flask_rq2 import RQ -from flask import Blueprint, request, abort, jsonify, current_app +import flask_mongorest +import requests +from flask import Blueprint, abort, current_app, jsonify, request from flask_mongorest import operators as ops -from flask_mongorest.methods import Fetch, BulkFetch +from flask_mongorest.methods import BulkFetch, Fetch from flask_mongorest.resources import Resource +from flask_rq2 import RQ +from gevent import sleep from mongoengine.errors import DoesNotExist from mongoengine.queryset.visitor import Q - from mpcontribs.api import get_kernel_endpoint, get_logger -from mpcontribs.api.core import SwaggerView from mpcontribs.api.contributions.document import Contributions -from mpcontribs.api.notebooks.document import Notebooks +from mpcontribs.api.core import SwaggerView from mpcontribs.api.notebooks import run_cells - +from mpcontribs.api.notebooks.document import Notebooks +from nbformat import v4 as nbf +from rq import get_current_job +from rq.job import Job logger = get_logger(__name__) templates = os.path.join(os.path.dirname(flask_mongorest.__file__), "templates") @@ -99,19 +96,13 @@ def build(): def restart_kernels(): - """use to avoid run-away memory""" + """Use to avoid run-away memory.""" kernel_ids = [k for k, v in current_app.kernels.items() if v is None] for kernel_id in kernel_ids: kernel_url = get_kernel_endpoint(kernel_id) + "/restart" requests.post(kernel_url, json={}) - cells = [ - nbf.new_code_cell( - "\n".join( - ["from mpcontribs.client import Client", "print('client imported')"] - ) - ) - ] + cells = [nbf.new_code_cell("\n".join(["from mpcontribs.client import Client", "print('client imported')"]))] run_cells(kernel_id, "import_client", cells) @@ -140,7 +131,7 @@ def result(job_id): @rq.job() def make(projects=None, cids=None, force=False): - """build the notebook / details page""" + """Build the notebook / details page.""" start = time.perf_counter() remaining_time = rq.default_timeout - 5 mask = ["id", "needs_build", "notebook"] @@ -180,11 +171,7 @@ def make(projects=None, cids=None, force=False): start = time.perf_counter() - if ( - not force - and document.notebook - and not getattr(document, "needs_build", True) - ): + if not force and document.notebook and not getattr(document, "needs_build", True): continue if document.notebook: @@ -216,23 +203,13 @@ def make(projects=None, cids=None, force=False): ] ) ), - nbf.new_code_cell( - "\n".join( - [f'c = client.get_contribution("{document.id}")', "c.display()"] - ) - ), + nbf.new_code_cell("\n".join([f'c = client.get_contribution("{document.id}")', "c.display()"])), ] if document.tables: cells.append(nbf.new_markdown_cell("## Tables")) for table in document.tables: - cells.append( - nbf.new_code_cell( - "\n".join( - [f't = client.get_table("{table.id}")', "t.display()"] - ) - ) - ) + cells.append(nbf.new_code_cell("\n".join([f't = client.get_table("{table.id}")', "t.display()"]))) if document.structures: cells.append(nbf.new_markdown_cell("## Structures")) diff --git a/mpcontribs-api/src/mpcontribs_api/old/projects/document.py b/mpcontribs-api/src/mpcontribs_api/old/projects/document.py index e172e924b1..45c3319d50 100644 --- a/mpcontribs-api/src/mpcontribs_api/old/projects/document.py +++ b/mpcontribs-api/src/mpcontribs_api/old/projects/document.py @@ -1,33 +1,31 @@ -# -*- coding: utf-8 -*- import urllib - +from collections import ChainMap from math import isnan + from atlasq import AtlasManager, AtlasQ -from flatten_dict import flatten from boltons.iterutils import remap -from collections import ChainMap -from flask import current_app, render_template, url_for, request -from mongoengine import Document +from flask import current_app, render_template, request, url_for +from flatten_dict import flatten from marshmallow import ValidationError from marshmallow.fields import String from marshmallow.validate import Email as EmailValidator from marshmallow_mongoengine.conversion import params from marshmallow_mongoengine.conversion.fields import register_field -from mongoengine import EmbeddedDocument, signals -from mongoengine.queryset.manager import queryset_manager +from mongoengine import Document, EmbeddedDocument, signals from mongoengine.fields import ( - StringField, BooleanField, + DecimalField, DictField, - URLField, EmailField, - DecimalField, + EmbeddedDocumentField, + EmbeddedDocumentListField, FloatField, IntField, - EmbeddedDocumentListField, - EmbeddedDocumentField, + StringField, + URLField, ) -from mpcontribs.api import send_email, valid_key, valid_dict, delimiter, enter +from mongoengine.queryset.manager import queryset_manager +from mpcontribs.api import delimiter, enter, send_email, valid_dict, valid_key PROVIDERS = {"github", "google", "facebook", "microsoft", "amazon", "portier"} MAX_COLUMNS = 160 @@ -46,7 +44,7 @@ def visit(path, key, value): class ProviderEmailField(EmailField): - """Field to validate usernames of format :""" + """Field to validate usernames of format :.""" def validate(self, value): if value.count(":") != 1: @@ -128,9 +126,7 @@ class Projects(Document): primary_key=True, help_text=f"project name/slug (valid format: `{__project_regex__}`)", ) - is_public = BooleanField( - required=True, default=False, help_text="public/private project" - ) + is_public = BooleanField(required=True, default=False, help_text="public/private project") title = StringField( min_length=5, max_length=30, @@ -168,15 +164,9 @@ class Projects(Document): help_text="license (see https://materialsproject.org/about/terms)", ) other = DictField(validation=valid_dict, null=True, help_text="other information") - owner = ProviderEmailField( - unique_with="name", help_text="owner / corresponding email" - ) - is_approved = BooleanField( - required=True, default=False, help_text="project approved?" - ) - unique_identifiers = BooleanField( - required=True, default=True, help_text="identifiers unique?" - ) + owner = ProviderEmailField(unique_with="name", help_text="owner / corresponding email") + is_approved = BooleanField(required=True, default=False, help_text="project approved?") + unique_identifiers = BooleanField(required=True, default=True, help_text="identifiers unique?") columns = EmbeddedDocumentListField(Column, max_length=MAX_COLUMNS) stats = EmbeddedDocumentField(Stats, required=True, default=Stats) atlas = AtlasManager("mpcontribs-dev-project-search") @@ -187,9 +177,7 @@ class Projects(Document): @queryset_manager def objects(doc_cls, queryset): - return queryset.only( - "name", "is_public", "title", "owner", "is_approved", "unique_identifiers" - ) + return queryset.only("name", "is_public", "title", "owner", "is_approved", "unique_identifiers") @classmethod def atlas_filter(cls, term): @@ -205,12 +193,8 @@ def post_save(cls, sender, document, **kwargs): ts = current_app.config["USTS"] email_project = [document.owner, document.name] token = ts.dumps(email_project) - link = url_for( - "projects.applications", token=token, _scheme=scheme, _external=True - ) - url = url_for( - "projectsFetch", pk=document.name, _scheme=scheme, _external=True - ) + link = url_for("projects.applications", token=token, _scheme=scheme, _external=True) + url = url_for("projectsFetch", pk=document.name, _scheme=scheme, _external=True) url += "?_fields=_all" html = render_template("admin_email.html", url=url, link=link) send_email(admin_email, f'New project "{document.name}"', html) @@ -231,14 +215,10 @@ def post_save(cls, sender, document, **kwargs): owner_email = document.owner.split(":", 1)[1] send_email(owner_email, subject, html) - if ( - "columns" in delta_set - or "columns" in delta_unset - or (not delta_set and not delta_unset) - ): + if "columns" in delta_set or "columns" in delta_unset or (not delta_set and not delta_unset): from mpcontribs.api.contributions.document import ( - Contributions, COMPONENTS, + Contributions, ) columns = {} @@ -258,9 +238,7 @@ def post_save(cls, sender, document, **kwargs): ] result = Contributions.objects.aggregate(pipeline) merged = ChainMap(*result) - flat = flatten( - remap(merged, visit=visit, enter=enter), reducer="dot" - ) + flat = flatten(remap(merged, visit=visit, enter=enter), reducer="dot") for k, v in flat.items(): if k.startswith("data."): @@ -303,9 +281,7 @@ def post_save(cls, sender, document, **kwargs): project_stage[component] = {"$size": f"${component}"} # filter/forward number columns - min_max_paths = [ - path for path, col in columns.items() if col["unit"] != "NaN" - ] + min_max_paths = [path for path, col in columns.items() if col["unit"] != "NaN"] for path in min_max_paths: field = f"{path}{delimiter}value" project_stage[field] = { @@ -379,9 +355,7 @@ def post_delete(cls, sender, document, **kwargs): send_email(owner_email, subject, html) -register_field( - ProviderEmailField, ProviderEmail, available_params=(params.LengthParam,) -) +register_field(ProviderEmailField, ProviderEmail, available_params=(params.LengthParam,)) signals.post_save.connect(Projects.post_save, sender=Projects) signals.post_delete.connect(Projects.post_delete, sender=Projects) Projects.atlas.index._set_indexed_fields({"type": "document", "dynamic": True}) diff --git a/mpcontribs-api/src/mpcontribs_api/old/projects/views.py b/mpcontribs-api/src/mpcontribs_api/old/projects/views.py index 3b2dfa1110..4bba5c4b01 100644 --- a/mpcontribs-api/src/mpcontribs_api/old/projects/views.py +++ b/mpcontribs-api/src/mpcontribs_api/old/projects/views.py @@ -1,17 +1,15 @@ -# -*- coding: utf-8 -*- import os -import flask_mongorest -from mongoengine.queryset import DoesNotExist -from flask import Blueprint, current_app, url_for, jsonify, abort, request -from flask_mongorest.resources import Resource +import flask_mongorest +from flask import Blueprint, abort, current_app, jsonify, request, url_for from flask_mongorest import operators as ops -from flask_mongorest.methods import Fetch, Create, Delete, Update, BulkFetch -from werkzeug.exceptions import Unauthorized - +from flask_mongorest.methods import BulkFetch, Create, Delete, Fetch, Update +from flask_mongorest.resources import Resource +from mongoengine.queryset import DoesNotExist from mpcontribs.api import FILTERS from mpcontribs.api.core import SwaggerView -from mpcontribs.api.projects.document import Projects, Column, Reference, Stats +from mpcontribs.api.projects.document import Column, Projects, Reference, Stats +from werkzeug.exceptions import Unauthorized templates = os.path.join(os.path.dirname(flask_mongorest.__file__), "templates") projects = Blueprint("projects", __name__, template_folder=templates) @@ -114,9 +112,7 @@ def has_change_permission(self, request, obj): return True if not self.is_project_user(request, obj): - raise Unauthorized( - "Only project owners and collaborators can edit projects." - ) + raise Unauthorized("Only project owners and collaborators can edit projects.") update = request.json if "is_approved" in update: diff --git a/mpcontribs-api/src/mpcontribs_api/old/structures/document.py b/mpcontribs-api/src/mpcontribs_api/old/structures/document.py index 29b8a333d3..c28c9458f5 100644 --- a/mpcontribs-api/src/mpcontribs_api/old/structures/document.py +++ b/mpcontribs-api/src/mpcontribs_api/old/structures/document.py @@ -1,9 +1,9 @@ -# -*- coding: utf-8 -*- import json from hashlib import md5 + from flask_mongoengine.documents import Document from mongoengine import signals -from mongoengine.fields import StringField, FloatField, ListField, DictField +from mongoengine.fields import DictField, FloatField, ListField, StringField from mongoengine.queryset.manager import queryset_manager from pymatgen.core import Structure from pymatgen.io.cif import CifWriter @@ -48,6 +48,4 @@ def pre_save_post_validation(cls, sender, document, **kwargs): document.cif = writer.__str__() -signals.pre_save_post_validation.connect( - Structures.pre_save_post_validation, sender=Structures -) +signals.pre_save_post_validation.connect(Structures.pre_save_post_validation, sender=Structures) diff --git a/mpcontribs-api/src/mpcontribs_api/old/structures/views.py b/mpcontribs-api/src/mpcontribs_api/old/structures/views.py index e30996dd59..00fa873568 100644 --- a/mpcontribs-api/src/mpcontribs_api/old/structures/views.py +++ b/mpcontribs-api/src/mpcontribs_api/old/structures/views.py @@ -1,11 +1,10 @@ -# -*- coding: utf-8 -*- import os + import flask_mongorest -from flask_mongorest.resources import Resource -from flask_mongorest import operators as ops -from flask_mongorest.methods import Fetch, BulkFetch, Download from flask import Blueprint - +from flask_mongorest import operators as ops +from flask_mongorest.methods import BulkFetch, Download, Fetch +from flask_mongorest.resources import Resource from mpcontribs.api import FILTERS from mpcontribs.api.core import SwaggerView from mpcontribs.api.structures.document import Structures diff --git a/mpcontribs-api/src/mpcontribs_api/old/tables/__init__.py b/mpcontribs-api/src/mpcontribs_api/old/tables/__init__.py index e809e59329..b6d53222f4 100644 --- a/mpcontribs-api/src/mpcontribs_api/old/tables/__init__.py +++ b/mpcontribs-api/src/mpcontribs_api/old/tables/__init__.py @@ -1,2 +1 @@ -# -*- coding: utf-8 -*- -"""document and views for tables collection""" +"""Document and views for tables collection.""" diff --git a/mpcontribs-api/src/mpcontribs_api/old/tables/document.py b/mpcontribs-api/src/mpcontribs_api/old/tables/document.py index c73aee76fb..1bbeb86084 100644 --- a/mpcontribs-api/src/mpcontribs_api/old/tables/document.py +++ b/mpcontribs-api/src/mpcontribs_api/old/tables/document.py @@ -1,14 +1,12 @@ -# -*- coding: utf-8 -*- from flask_mongoengine.documents import DynamicDocument -from mongoengine import signals, EmbeddedDocument -from mongoengine.fields import StringField, ListField, IntField, EmbeddedDocumentField +from mongoengine import EmbeddedDocument, signals +from mongoengine.fields import EmbeddedDocumentField, IntField, ListField, StringField from mongoengine.queryset.manager import queryset_manager - from mpcontribs.api.contributions.document import ( + COMPONENTS, format_cell, - get_resource, get_md5, - COMPONENTS, + get_resource, ) diff --git a/mpcontribs-api/src/mpcontribs_api/old/tables/views.py b/mpcontribs-api/src/mpcontribs_api/old/tables/views.py index 0e7f4a6d83..5306003d06 100644 --- a/mpcontribs-api/src/mpcontribs_api/old/tables/views.py +++ b/mpcontribs-api/src/mpcontribs_api/old/tables/views.py @@ -1,15 +1,14 @@ -# -*- coding: utf-8 -*- import os + import flask_mongorest -from flask_mongorest.resources import Resource +from flask import Blueprint from flask_mongorest import operators as ops -from flask_mongorest.methods import Fetch, BulkFetch, Download from flask_mongorest.exceptions import UnknownFieldError -from flask import Blueprint - +from flask_mongorest.methods import BulkFetch, Download, Fetch +from flask_mongorest.resources import Resource from mpcontribs.api import FILTERS from mpcontribs.api.core import SwaggerView -from mpcontribs.api.tables.document import Tables, Attributes, Labels +from mpcontribs.api.tables.document import Attributes, Labels, Tables templates = os.path.join(os.path.dirname(flask_mongorest.__file__), "templates") tables = Blueprint("tables", __name__, template_folder=templates) diff --git a/mpcontribs-api/src/mpcontribs_api/pagination.py b/mpcontribs-api/src/mpcontribs_api/pagination.py index 2d7cd85580..2e7929d7d8 100644 --- a/mpcontribs-api/src/mpcontribs_api/pagination.py +++ b/mpcontribs-api/src/mpcontribs_api/pagination.py @@ -4,7 +4,7 @@ class CursorParams(BaseModel): - """Models parameters used in cursor-based pagination""" + """Models parameters used in cursor-based pagination.""" # None == First page cursor: str | None = None @@ -17,7 +17,8 @@ class Page[T](BaseModel): Attributes: items (list[T]): the items returned for the given page - next_cursor (str): the base64-encoded value of the first id on the next page. If None, then no more pages are available + next_cursor (str): the base64-encoded value of the first id on the next page. If None, then no more pages are + available """ items: list[T] @@ -33,4 +34,4 @@ def decode_cursor(cursor: str) -> str: try: return base64.urlsafe_b64decode(cursor.encode()).decode() except ValueError, UnicodeDecodeError: - raise ValueError("malformed cursor") + raise ValueError("malformed cursor") from None diff --git a/mpcontribs-api/src/mpcontribs_api/projection.py b/mpcontribs-api/src/mpcontribs_api/projection.py index b1a5d47f15..f09875b9c4 100644 --- a/mpcontribs-api/src/mpcontribs_api/projection.py +++ b/mpcontribs-api/src/mpcontribs_api/projection.py @@ -1,7 +1,8 @@ """Handles the projection of '_fields' from query params. This includes arbitrarily specifying nested structures with '.' -Ie. data.band_gap.something will be properly retrieved and populated into the response model that subclasses SparseFieldsModel +Ie. data.band_gap.something will be properly retrieved and populated into the response model that subclasses + SparseFieldsModel """ from __future__ import annotations @@ -88,14 +89,9 @@ def _validate_path(model: type[BaseModel], path: str) -> None: """Raise if the dotted path is not a selectable field path on the model.""" for step in _walk_path(model, path): if step.kind == "unknown": - raise ValidationError( - f"unknown field in _fields: {path!r} (no field {step.segment!r})" - ) + raise ValidationError(f"unknown field in _fields: {path!r} (no field {step.segment!r})") if step.kind in ("scalar", "list") and not step.is_last: - raise ValidationError( - f"cannot select subfields of {step.kind} field " - f"{step.segment!r} in _fields: {path!r}" - ) + raise ValidationError(f"cannot select subfields of {step.kind} field {step.segment!r} in _fields: {path!r}") def _collapse(paths: frozenset[str]) -> frozenset[str]: @@ -130,15 +126,9 @@ def _backs_mongo_id(field: FieldInfo) -> bool: def _optional_field(source_field: FieldInfo, annotation: Any) -> tuple[Any, FieldInfo]: """Build an optional create_model field definition, preserving the source field's aliases.""" - validation_alias = ( - source_field.validation_alias - if isinstance(source_field.validation_alias, str) - else None - ) + validation_alias = source_field.validation_alias if isinstance(source_field.validation_alias, str) else None serialization_alias = ( - source_field.serialization_alias - if isinstance(source_field.serialization_alias, str) - else None + source_field.serialization_alias if isinstance(source_field.serialization_alias, str) else None ) optional_annotation: Any = annotation | None return optional_annotation, FieldInfo( @@ -149,7 +139,7 @@ def _optional_field(source_field: FieldInfo, annotation: Any) -> tuple[Any, Fiel @lru_cache(maxsize=128) -def _build_model(model: type[ModelT], paths: frozenset[str]) -> type[ModelT]: +def _build_model[ModelT: BaseModel](model: type[ModelT], paths: frozenset[str]) -> type[ModelT]: """Recursively build the partial response model covering the requested paths.""" nested_paths_by_root: dict[str, set[str]] = {} for path in paths: @@ -163,9 +153,7 @@ def _build_model(model: type[ModelT], paths: frozenset[str]) -> type[ModelT]: source_field = model.model_fields[root] kind, nested_model = _classify(source_field.annotation) if not nested_paths: - field_definitions[root] = _optional_field( - source_field, source_field.annotation - ) + field_definitions[root] = _optional_field(source_field, source_field.annotation) elif kind == "model" and nested_model is not None: partial_nested = _build_model(nested_model, frozenset(nested_paths)) field_definitions[root] = _optional_field(source_field, partial_nested) @@ -183,13 +171,13 @@ def _build_model(model: type[ModelT], paths: frozenset[str]) -> type[ModelT]: @lru_cache(maxsize=128) -def _build_projection(model: type[ModelT], paths: frozenset[str]) -> type[ModelT]: +def _build_projection[ModelT: BaseModel](model: type[ModelT], paths: frozenset[str]) -> type[ModelT]: """Build the partial model and attach its explicit dotted Mongo projection.""" projection: dict[str, int] = {"_id": 1} for path in paths: projection[_mongo_key(model, path)] = 1 partial_model = _build_model(model, paths) - setattr(partial_model, "Settings", type("Settings", (), {"projection": projection})) + partial_model.Settings = type("Settings", (), {"projection": projection}) return partial_model @@ -210,9 +198,7 @@ class SparseFieldsModel(BaseModel): @classmethod def _identity_fields(cls) -> frozenset[str]: """Field names backing Mongo ``_id``, always forced into a projection.""" - return frozenset( - name for name, field in cls.model_fields.items() if _backs_mongo_id(field) - ) + return frozenset(name for name, field in cls.model_fields.items() if _backs_mongo_id(field)) @classmethod def field_names(cls) -> frozenset[str]: diff --git a/mpcontribs-api/src/mpcontribs_api/types.py b/mpcontribs-api/src/mpcontribs_api/types.py index 8d3b6a11fb..933b4bfbc4 100644 --- a/mpcontribs-api/src/mpcontribs_api/types.py +++ b/mpcontribs-api/src/mpcontribs_api/types.py @@ -14,9 +14,7 @@ def _validate_prefixed_email(v: str) -> str: v = v.strip() if not _EMAIL_RE.match(v): - raise ValidationError( - "must match ':@', e.g. 'google:name@gmail.com'" - ) + raise ValidationError("must match ':@', e.g. 'google:name@gmail.com'") return v diff --git a/mpcontribs-api/supervisord/conf.py b/mpcontribs-api/supervisord/conf.py index 321c06a52f..3e1c5d128f 100644 --- a/mpcontribs-api/supervisord/conf.py +++ b/mpcontribs-api/supervisord/conf.py @@ -1,4 +1,5 @@ import os + from jinja2 import Environment, FileSystemLoader DIR = os.path.abspath(os.path.dirname(__file__)) @@ -28,9 +29,7 @@ "reload": int(not PRODUCTION), "node_env": "production" if PRODUCTION else "development", "flask_log_level": "INFO" if PRODUCTION else "DEBUG", - "jupyter_gateway_host": f"localhost:{KG_PORT}" - if PRODUCTION - else f"kernel-gateway:{KG_PORT}", + "jupyter_gateway_host": f"localhost:{KG_PORT}" if PRODUCTION else f"kernel-gateway:{KG_PORT}", "dd_agent_host": "localhost" if PRODUCTION else "datadog", "mpcontribs_api_host": "localhost" if PRODUCTION else "contribs-apis", } diff --git a/mpcontribs-api/uv.lock b/mpcontribs-api/uv.lock index 8bc0ab7fde..4d386f1cc8 100644 --- a/mpcontribs-api/uv.lock +++ b/mpcontribs-api/uv.lock @@ -1,15 +1,9 @@ version = 1 revision = 3 -requires-python = ">=3.11" +requires-python = ">=3.14" resolution-markers = [ - "python_full_version >= '3.14' and sys_platform == 'win32'", - "python_full_version >= '3.14' and sys_platform != 'win32'", - "python_full_version == '3.13.*' and sys_platform == 'win32'", - "python_full_version == '3.13.*' and sys_platform != 'win32'", - "python_full_version == '3.12.*' and sys_platform == 'win32'", - "python_full_version == '3.12.*' and sys_platform != 'win32'", - "python_full_version < '3.12' and sys_platform == 'win32'", - "python_full_version < '3.12' and sys_platform != 'win32'", + "sys_platform == 'win32'", + "sys_platform != 'win32'", ] [[package]] @@ -36,7 +30,6 @@ version = "4.13.0" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "idna" }, - { name = "typing-extensions", marker = "python_full_version < '3.13'" }, ] sdist = { url = "https://files.pythonhosted.org/packages/19/14/2c5dd9f512b66549ae92767a9c7b330ae88e1932ca57876909410251fe13/anyio-4.13.0.tar.gz", hash = "sha256:334b70e641fd2221c1505b3890c69882fe4a2df910cba14d97019b90b24439dc", size = 231622, upload-time = "2026-03-24T12:59:09.671Z" } wheels = [ @@ -144,15 +137,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/d2/39/e7eaf1799466a4aef85b6a4fe7bd175ad2b1c6345066aa33f1f58d4b18d0/asttokens-3.0.1-py3-none-any.whl", hash = "sha256:15a3ebc0f43c2d0a50eeafea25e19046c68398e487b9f1f5b517f7c0f40f976a", size = 27047, upload-time = "2025-11-15T16:43:16.109Z" }, ] -[[package]] -name = "async-timeout" -version = "5.0.1" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/a5/ae/136395dfbfe00dfc94da3f3e136d0b13f394cba8f4841120e34226265780/async_timeout-5.0.1.tar.gz", hash = "sha256:d9321a7a3d5a6a5e187e824d2fa0793ce379a202935782d555d6e9d2735677d3", size = 9274, upload-time = "2024-11-06T16:41:39.6Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/fe/ba/e2081de779ca30d473f21f5b30e0e737c438205440784c7dfc81efc2b029/async_timeout-5.0.1-py3-none-any.whl", hash = "sha256:39e3809566ff85354557ec2398b55e096c8364bacac9405a7a1fa429e77fe76c", size = 6233, upload-time = "2024-11-06T16:41:37.9Z" }, -] - [[package]] name = "atlasq-tschaume" version = "0.11.1.dev2" @@ -176,73 +160,15 @@ wheels = [ ] [[package]] -name = "backports-zstd" -version = "1.5.0" +name = "basedpyright" +version = "1.39.6" source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/d4/05/480d439b482edf59b786bc19b474d990c61942e372f5de3dc14acac8154d/backports_zstd-1.5.0.tar.gz", hash = "sha256:a5e622a82eb183b4fbe18032755ce0a15fa9a82f2adb9b621620b91247aaedb7", size = 998556, upload-time = "2026-05-11T19:54:24.923Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/26/bc/083c0ebee316f4863ed288c4a5eaa1e98be115e82deb8855da8bab1c7701/backports_zstd-1.5.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:fbaa5502617dc4f04327c7a2951f0fcdca7aaef93ddf32c15dc8b620208174fa", size = 436838, upload-time = "2026-05-11T19:52:24.349Z" }, - { url = "https://files.pythonhosted.org/packages/cd/e5/bf778667fff6598dbd0791745123ed964aee94753ae8e4e92aa1e07417b6/backports_zstd-1.5.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:204f00d62e95aab987c7c019452b2373bdefb17252443765f2ede7f15b6e669a", size = 363215, upload-time = "2026-05-11T19:52:25.887Z" }, - { url = "https://files.pythonhosted.org/packages/63/a5/4fae78734dbefcb4b5386137c807e2107c4bc94e85c0d9eaae79206dde84/backports_zstd-1.5.0-cp311-cp311-manylinux2010_i686.manylinux_2_12_i686.manylinux_2_28_i686.whl", hash = "sha256:2c77c0d4c330afd26d2a98f3d689ab922ec3f046014a1614ddcaad437666ac05", size = 507161, upload-time = "2026-05-11T19:52:27.48Z" }, - { url = "https://files.pythonhosted.org/packages/d8/ec/b64409f0cf56fb65181d6f5d9130058f19d5c3c9f8c581a5e2bd62642630/backports_zstd-1.5.0-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:6bb2f2d2c07358edeaa251cf804b993e9f0d5d93af8a7ea2414d80ff3c105e95", size = 476728, upload-time = "2026-05-11T19:52:29.182Z" }, - { url = "https://files.pythonhosted.org/packages/4d/10/4c1693cb4e129585a6e4cb565106cad7347e61c43c8375b9e9cadb00eb06/backports_zstd-1.5.0-cp311-cp311-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:cb89f554abcebcb2c487024e63be8059083775c5fd351fec0cc2dc3e9f528714", size = 582388, upload-time = "2026-05-11T19:52:30.908Z" }, - { url = "https://files.pythonhosted.org/packages/45/b9/dc748a0e7d21ce2228241f6e8af96d297c80ab69c4c49429309b8fa3beb8/backports_zstd-1.5.0-cp311-cp311-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:ea969758af743000d822fc3a69dc9de059bbbb8d07d2f13e06ff49ac63cce74f", size = 642091, upload-time = "2026-05-11T19:52:32.397Z" }, - { url = "https://files.pythonhosted.org/packages/de/5f/02366ddae6e008d53df71605e4e3ca8dcea5d1dfcba29040b46883a23127/backports_zstd-1.5.0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:775ad82d268923639bc924013fc61561df376c148506b241f0f80718b5bb3a2f", size = 492256, upload-time = "2026-05-11T19:52:34.441Z" }, - { url = "https://files.pythonhosted.org/packages/c0/c7/c5e7824c17abc87dbb24c7c90dc43054d701533cf04d3531cb9b7105cdac/backports_zstd-1.5.0-cp311-cp311-manylinux_2_34_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:663128370bbc2ebcc436b8977bc434a7bf29919d92d91fee05ed6fb0fa807646", size = 566214, upload-time = "2026-05-11T19:52:35.962Z" }, - { url = "https://files.pythonhosted.org/packages/12/7b/ee7368c4ad8f5e00b3fd84fc566fb7714aa766c5672500793990e19efa00/backports_zstd-1.5.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:572c76832e9a24da4084befa52c23f4c03fede2aa250ae6250cbc5a11b980f69", size = 482666, upload-time = "2026-05-11T19:52:37.675Z" }, - { url = "https://files.pythonhosted.org/packages/77/36/2826f9f04b6c91d5f707f49188ac6f5ec7487b36d73caedfa20db3307826/backports_zstd-1.5.0-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:9410bcbcd3afd787a15a276d68f954d1703788c780faa421183a61d39da8b862", size = 510594, upload-time = "2026-05-11T19:52:39.501Z" }, - { url = "https://files.pythonhosted.org/packages/84/3b/95342baf0e301b7d06c6862389f8520a9d71f073a6c1a5b86182e7d89148/backports_zstd-1.5.0-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:0fab15e6895bef621041dd82d6306ffa24889257dd902c4b98b88e4260b3465d", size = 586713, upload-time = "2026-05-11T19:52:41.461Z" }, - { url = "https://files.pythonhosted.org/packages/bc/32/73d2b8f572960307406b084bb8932f4ebd9fcedb05d1502e04fecf25970a/backports_zstd-1.5.0-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:2ffde637b6d0082f1c3356657002469cf199c7c12d50d9822a55b13425c778d3", size = 564037, upload-time = "2026-05-11T19:52:43.15Z" }, - { url = "https://files.pythonhosted.org/packages/8f/a4/6e319fa7fa5851c3ca9701cbded9522c16018432a01a33a95cc0fccb6b4a/backports_zstd-1.5.0-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:c01d377c1489cb2230bf6a9ff01c73c42863cc96ee648c49923d4f6d4ea4e2d5", size = 632626, upload-time = "2026-05-11T19:52:45.017Z" }, - { url = "https://files.pythonhosted.org/packages/67/5c/10df0444db05f9276b286d230a3d6948ad47c593fc22925b8fe551d34b26/backports_zstd-1.5.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:4080bb9c8a51bb2bf8caf8018d78278cd49eb924cb06a54f56a411095e2ac912", size = 496270, upload-time = "2026-05-11T19:52:46.558Z" }, - { url = "https://files.pythonhosted.org/packages/f1/ad/6cd1de5cd858ac653833098f13a4643a4c9db484072350d3dbf299cc46f1/backports_zstd-1.5.0-cp311-cp311-win32.whl", hash = "sha256:9f4fe3fd82c8c6e8a9fdc5c71f92f9fe2442d02e7f59fddef25a955e189e3f38", size = 289754, upload-time = "2026-05-11T19:52:48.232Z" }, - { url = "https://files.pythonhosted.org/packages/1d/1b/df94ad1cb79705d717f7e1063da642c538a6d7ce6443c8e60355fa507ea4/backports_zstd-1.5.0-cp311-cp311-win_amd64.whl", hash = "sha256:e7c0372fa036751109604c70a8c87e59faaacc195d519c8cb9e0e527ee2b5478", size = 314829, upload-time = "2026-05-11T19:52:50.031Z" }, - { url = "https://files.pythonhosted.org/packages/e8/e7/24e60da7cc89b9ed1c5b474678e316dd0ddfe7cd1de39b23d04452ca5946/backports_zstd-1.5.0-cp311-cp311-win_arm64.whl", hash = "sha256:264a66137555bb4648f7e64cfc514d820758072684f373269fcdd2e8d4a90306", size = 291497, upload-time = "2026-05-11T19:52:51.729Z" }, - { url = "https://files.pythonhosted.org/packages/24/71/29ed213344f8f62b7520745d7df3752d88db456aff9d8b706bdf5eb99a3c/backports_zstd-1.5.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:1858cacdb3e50105a1b60acdc3dd5b18650077d12dce243e19d5c88e8172bd71", size = 437170, upload-time = "2026-05-11T19:52:53.204Z" }, - { url = "https://files.pythonhosted.org/packages/d0/e3/a58a3eb8fc54d4e3e4f684ed7b1f688da02e5bda5ae5e2809e94cf2ead2f/backports_zstd-1.5.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:ccffc0a1974ecc2cc42afa4c15f56d036a4b2bae0abc46e6ba9b3358d9b1c037", size = 363265, upload-time = "2026-05-11T19:52:55.153Z" }, - { url = "https://files.pythonhosted.org/packages/3f/03/9d13840d206dec1c4698c803f61c58379b3578cb9dc6140ba5fa4ce2f31d/backports_zstd-1.5.0-cp312-cp312-manylinux2010_i686.manylinux_2_12_i686.manylinux_2_28_i686.whl", hash = "sha256:ab3430ab4d4ac3fb1bc1e4174d137731e51363b6abd5e51a1599690fe9c7d61d", size = 507527, upload-time = "2026-05-11T19:52:57.256Z" }, - { url = "https://files.pythonhosted.org/packages/6a/8f/8dc4b5736dca218cbca9609549a8f6dc202990abdb49afdc6112442f5360/backports_zstd-1.5.0-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:c737c1cb4a10c2d0f6cba9a347522858094f0a737b4558c67a777bcaa4a795cd", size = 477352, upload-time = "2026-05-11T19:52:59.425Z" }, - { url = "https://files.pythonhosted.org/packages/96/2c/65a66976a761b5b62eacbaed5ed418c694b24b5c480399315d799751de62/backports_zstd-1.5.0-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:0379c66510681a6b2780d3f3ef2cff54d01204b52448d64bde1855d40f856a04", size = 582799, upload-time = "2026-05-11T19:53:01.303Z" }, - { url = "https://files.pythonhosted.org/packages/d3/e9/ee93a66cd28cb3ad7f3c04d1105325a5428671b18bd41ba9ed8b43bc44cf/backports_zstd-1.5.0-cp312-cp312-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:7c7474b291e264c9609358d3875cf539623f7a65339c2b533020992b1a4c095b", size = 641530, upload-time = "2026-05-11T19:53:03.082Z" }, - { url = "https://files.pythonhosted.org/packages/e4/4b/2cecd4d6679f175f28ae02022bd2050ff4023e38902fae104dbe2e231911/backports_zstd-1.5.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:bb73c22444617bc5a3abf32dd27b3f2085898cfe3b95e6855300e9189898a3bd", size = 495324, upload-time = "2026-05-11T19:53:05.005Z" }, - { url = "https://files.pythonhosted.org/packages/4d/20/ee21e4e791e31f38f7a70b3961eb64b350d9be802a335e7a04c02b41b197/backports_zstd-1.5.0-cp312-cp312-manylinux_2_34_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:6cd7f6c33afd89354f74469e315e72754e3040f91f7b685061e225d9e36e3e8e", size = 569796, upload-time = "2026-05-11T19:53:07.011Z" }, - { url = "https://files.pythonhosted.org/packages/76/da/86c9a2ea384885b60638b3e47113198449568d0e36ef3834d1f969623092/backports_zstd-1.5.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:2106309071f279b38d3663c55c7fed192733b4f332b50eb3fa707e54bad6967a", size = 483367, upload-time = "2026-05-11T19:53:08.674Z" }, - { url = "https://files.pythonhosted.org/packages/5d/f0/c95c6e4dd28fc314547782a482839e422283d62c2aaf45d30672109a4a1e/backports_zstd-1.5.0-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:56fffa80be74cb11ac843333bbdc56e466c87967706886b3efd6b16d83830d90", size = 510976, upload-time = "2026-05-11T19:53:10.339Z" }, - { url = "https://files.pythonhosted.org/packages/0e/a2/72777b7e1872228a13b09b0bf77ae6cf626008d462cc2e1a0ae64721fd55/backports_zstd-1.5.0-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:5e8b8251eec80e67e30ec79dfc5b3b1ada069b9ac48b56b102f3e2c6f8281062", size = 587190, upload-time = "2026-05-11T19:53:12.205Z" }, - { url = "https://files.pythonhosted.org/packages/f5/a1/db5d1aee59da308eadeaa189764a4ec68e98495c309a13dcb8da5718fef1/backports_zstd-1.5.0-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:f334dd17ffead361aa9090e40151bd123507ce213a62733121b7145c6711cbde", size = 567395, upload-time = "2026-05-11T19:53:14.245Z" }, - { url = "https://files.pythonhosted.org/packages/00/0f/39ca1a6e8c5c2dc81da9e06c44d1990cc464f4b16dae214e877afd7adfc0/backports_zstd-1.5.0-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:78cbfd061255fef6de5070a54e0f9c00e8aabad5c99dd2ad884a3a7d1acc09ae", size = 632048, upload-time = "2026-05-11T19:53:16.234Z" }, - { url = "https://files.pythonhosted.org/packages/73/fd/a438ee4fc615016dbe96112b709b6805ee19eb215f46e208c8fbce086d8d/backports_zstd-1.5.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:2f55d70df44f49d599e20033013bc1ae705202735c45d4bca8eb963b225e15fd", size = 499833, upload-time = "2026-05-11T19:53:17.85Z" }, - { url = "https://files.pythonhosted.org/packages/f7/42/f544fde4de32687e28c514288ae3c11106ba644e9dd580992cbd704bbb49/backports_zstd-1.5.0-cp312-cp312-win32.whl", hash = "sha256:a8b096e0383a3bcab34f8c97b79e1a52051189d11258bbc2bc1145997a15dd1d", size = 289876, upload-time = "2026-05-11T19:53:19.486Z" }, - { url = "https://files.pythonhosted.org/packages/ad/31/9c29cd3175892e5ee909f5e8d14707fa07815301ff24b5c697d1cea62a77/backports_zstd-1.5.0-cp312-cp312-win_amd64.whl", hash = "sha256:e2802899ba4ef1a062ffe4bb1292c5df32011a54b4c3004c54f46ec975f39554", size = 314933, upload-time = "2026-05-11T19:53:20.942Z" }, - { url = "https://files.pythonhosted.org/packages/11/ee/1a50acd6446c0d57c4f93ad6ce68e1a631ad920737a6b2d0bbbc47de7f42/backports_zstd-1.5.0-cp312-cp312-win_arm64.whl", hash = "sha256:3c0353e66942afbd45518788cfbd1e9e117828ceb390fa50517f46f291850d8e", size = 291665, upload-time = "2026-05-11T19:53:22.686Z" }, - { url = "https://files.pythonhosted.org/packages/c6/e6/252521e3a847eb200bc0a1d528542d651b9c8dc7953e231c39ed2890d5ff/backports_zstd-1.5.0-cp313-cp313-android_21_arm64_v8a.whl", hash = "sha256:02a57ee8598dd863c0b11c7af00042ce6bc045bf6f4249fa4c322c62614ca1fd", size = 400134, upload-time = "2026-05-11T19:53:24.28Z" }, - { url = "https://files.pythonhosted.org/packages/36/43/27ef105ffa2da3d52218d4a7b2e14037974283953b3ee790358af6e9b4df/backports_zstd-1.5.0-cp313-cp313-android_21_x86_64.whl", hash = "sha256:c56c11eb3173d540e1fb0216f7ab477cbd3a204eca41f5f329059ee8a5d2ad47", size = 454225, upload-time = "2026-05-11T19:53:25.874Z" }, - { url = "https://files.pythonhosted.org/packages/0e/c9/cdcba1244347500d00567ce2cd6bf04c92d1b0fb6405fb8e13c07715eb46/backports_zstd-1.5.0-cp313-cp313-ios_13_0_arm64_iphoneos.whl", hash = "sha256:ef98f632026aa8e6ce05d786977092798efbe78677aa71219f22d31787809c90", size = 357229, upload-time = "2026-05-11T19:53:27.661Z" }, - { url = "https://files.pythonhosted.org/packages/df/da/cea04dab3ffb940bde9a59866bde6f2594a7b3ef2948a63fb3898f73d311/backports_zstd-1.5.0-cp313-cp313-ios_13_0_arm64_iphonesimulator.whl", hash = "sha256:c3712300b18f9d07f788b03594b2f34dfad89d77df96938a640c5007522a6b69", size = 365907, upload-time = "2026-05-11T19:53:29.241Z" }, - { url = "https://files.pythonhosted.org/packages/da/c4/6a71df2e65033f9b7d8017d77ea2bb572fc2ebc814ea383fdcda4187597a/backports_zstd-1.5.0-cp313-cp313-ios_13_0_x86_64_iphonesimulator.whl", hash = "sha256:bdbc75d1f54df70b65bcfbc8aa0cac21475f79665bb045960af606dc07b56090", size = 446453, upload-time = "2026-05-11T19:53:30.888Z" }, - { url = "https://files.pythonhosted.org/packages/66/e7/f98ad1a6a249c27884df9d28cf6ebc3c368e0e3288a741c1d51a572bb3d7/backports_zstd-1.5.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:93d306300d25e59f1cbe98cda494bf295be03a20e8b2c5602ee5ddc03ded29f2", size = 436634, upload-time = "2026-05-11T19:53:32.484Z" }, - { url = "https://files.pythonhosted.org/packages/ba/42/d0393ecc64e2ab6ae1b5ca7edbe26e3fe5196885f15d6cc4bce7254e29cd/backports_zstd-1.5.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:305d2e4ae9a595d0fd9d5bea5a7a2163306c6c4dcc5eec35ecd5008219d4580e", size = 362867, upload-time = "2026-05-11T19:53:34.385Z" }, - { url = "https://files.pythonhosted.org/packages/41/fe/87aa9404763bada695d06e5cb9d0575bae033cbf3a2e4e3bd648760178f7/backports_zstd-1.5.0-cp313-cp313-manylinux2010_i686.manylinux_2_12_i686.manylinux_2_28_i686.whl", hash = "sha256:c8f0967bf8d806b250fb1e905a6b8190e7ae83656d5308989243f84e01fa3774", size = 506844, upload-time = "2026-05-11T19:53:36.023Z" }, - { url = "https://files.pythonhosted.org/packages/56/94/3af7ce637d148e0b0acb1298b61afe9a934ed425bad9ff05e87afbf6766d/backports_zstd-1.5.0-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:76b7314ca9a253171e3e9524960e9e6411997323cf10aecbbc330faa7a90278d", size = 476975, upload-time = "2026-05-11T19:53:37.885Z" }, - { url = "https://files.pythonhosted.org/packages/aa/6c/dc2aa1b48296ac6effc3bacb5a3061d40ed74bf73082dfe38eed2ba8362b/backports_zstd-1.5.0-cp313-cp313-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:b1d0bf16bba86b1071731ced389f184e8de61c1afcafa584244f7f726632f92f", size = 582496, upload-time = "2026-05-11T19:53:39.812Z" }, - { url = "https://files.pythonhosted.org/packages/f6/38/dd49d3dd27eda9b165ccd63d70538fea016a3e9e42923bbbc1d89fae8a43/backports_zstd-1.5.0-cp313-cp313-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:96709d27d406008575ef759405169d538040156704b457d8c0ac035127a46b67", size = 643257, upload-time = "2026-05-11T19:53:41.819Z" }, - { url = "https://files.pythonhosted.org/packages/59/75/78e819272450aec2462f97a1bceb90bde481f9dba435bf9e76d580b4dec4/backports_zstd-1.5.0-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:5737402c29b2bd5bc661d4cde08aed531ed326f2b59a7ad98dc07650dc99a2c9", size = 491958, upload-time = "2026-05-11T19:53:43.501Z" }, - { url = "https://files.pythonhosted.org/packages/62/ae/d860f9cf21cb59d583a12166353bf71a439538e2b669f4a7736e400ca596/backports_zstd-1.5.0-cp313-cp313-manylinux_2_34_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:2b65f37ddd375114dbf84658e7dd168e10f5a93394940bfefa7fafc2d3234450", size = 567198, upload-time = "2026-05-11T19:53:45.226Z" }, - { url = "https://files.pythonhosted.org/packages/38/7c/b175d4c9ff60f964c8f6dd43211de905227cfde5a41eb5f654df58483025/backports_zstd-1.5.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:4fae7825dde4f81c28b4c66b1e997f893e296c3f1668351952b3ed085eb9f8cd", size = 482792, upload-time = "2026-05-11T19:53:47.323Z" }, - { url = "https://files.pythonhosted.org/packages/eb/e3/f7b50cf891a10da5f9c412ed4a9c4a772df4d4186d98a41e75c9b462f148/backports_zstd-1.5.0-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:3aa10e77c0e712d2dfb950910b50591c2fb11f0f1328814e23acc0b4950766df", size = 510363, upload-time = "2026-05-11T19:53:49.523Z" }, - { url = "https://files.pythonhosted.org/packages/be/50/e7841fd4a65661d527697a0e2dab97295868965ccd4e3e12474472719a60/backports_zstd-1.5.0-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:518b2ef54ce0fee6d29379cfd64ef66e639456f1b18943466e929b19677f135f", size = 586917, upload-time = "2026-05-11T19:53:51.741Z" }, - { url = "https://files.pythonhosted.org/packages/c6/7c/57e985dbd621f0307b8c57cabb258eb976793f2aeaf8a5bc020e15b4a793/backports_zstd-1.5.0-cp313-cp313-musllinux_1_2_riscv64.whl", hash = "sha256:673a1e5fdaa6cb0c7a967eb33066b6dd564871b3498a93e11e2972998047d11f", size = 565004, upload-time = "2026-05-11T19:53:53.774Z" }, - { url = "https://files.pythonhosted.org/packages/2f/8f/855ffcd1ee0fcf44c3fe62e36db8e7362292d450cc7c4b3f43edccbcd37a/backports_zstd-1.5.0-cp313-cp313-musllinux_1_2_s390x.whl", hash = "sha256:1277c07ff2d731586aa05aebd946a1b30184620d886a735dd5d5bf94a4a1061e", size = 633737, upload-time = "2026-05-11T19:53:56.036Z" }, - { url = "https://files.pythonhosted.org/packages/20/39/c4129a03d268699200dfebe1ccab97c7c332d2794571afb372a62e4ed098/backports_zstd-1.5.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:aff334c7c38b4aea2a899f3138a99c1d58f0686ad7815c74bff506ecf4333296", size = 496309, upload-time = "2026-05-11T19:53:57.591Z" }, - { url = "https://files.pythonhosted.org/packages/8e/33/34152316dd244dcd43d5300ded3cf6e1b46d343e4e92620c23e533fa91df/backports_zstd-1.5.0-cp313-cp313-win32.whl", hash = "sha256:b932834c4d85360f46d1e7fbf3eee1e26ba594e0eb5c3ee1281e89bc1d48d06f", size = 289560, upload-time = "2026-05-11T19:53:59.274Z" }, - { url = "https://files.pythonhosted.org/packages/71/c5/f759bc87fd77c88f4fdad2d878535fb7e9537c6a05876d206e6690bf33c6/backports_zstd-1.5.0-cp313-cp313-win_amd64.whl", hash = "sha256:c71dfbeced720326a8917a6edf921c568dc2396228c6432205c6d7e7fe7f3707", size = 314812, upload-time = "2026-05-11T19:54:00.909Z" }, - { url = "https://files.pythonhosted.org/packages/47/96/d7970dbb2fef34b549b34146090f48f41903cc7268b1ed1c7542eaa1852e/backports_zstd-1.5.0-cp313-cp313-win_arm64.whl", hash = "sha256:7b5798b20ffff71ee4620a01f56fe0b50271724b4251db08c90a069446cc4752", size = 291411, upload-time = "2026-05-11T19:54:02.541Z" }, - { url = "https://files.pythonhosted.org/packages/89/92/8e8769e1e3ebec16d39f455e317a0f137a191b1f122853d0377c660666ce/backports_zstd-1.5.0-pp311-pypy311_pp73-macosx_10_15_x86_64.whl", hash = "sha256:0ca2d4ac4901eada2cfb86fda692e5d4a1e09485d9f2ec5777dc6cd3154b3b46", size = 410809, upload-time = "2026-05-11T19:54:14.117Z" }, - { url = "https://files.pythonhosted.org/packages/63/5c/741a2923020c45b85cad4dffffcb86dbfa2d4aaed27f18ee793428ef4c24/backports_zstd-1.5.0-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:20796211a623ec6e0061cef4d7cca760e9e0a0a951bb30dc9ba89ed4a3fea5e4", size = 340342, upload-time = "2026-05-11T19:54:16.165Z" }, - { url = "https://files.pythonhosted.org/packages/c8/3b/68c4fe8a551d3f47ed75ddcf15dc7c777bb9d869fc0e0f5b7cacc9f158f5/backports_zstd-1.5.0-pp311-pypy311_pp73-manylinux2010_i686.manylinux_2_12_i686.manylinux_2_28_i686.whl", hash = "sha256:5232cd2a58c60da4ceb0e09e42dbc579b92dda4a9301a756af0c738223a23487", size = 421476, upload-time = "2026-05-11T19:54:17.709Z" }, - { url = "https://files.pythonhosted.org/packages/a8/4d/ab5dcd6ab9a7ac02ec42c4507211da7dadb9498abb655115c296077e2b8b/backports_zstd-1.5.0-pp311-pypy311_pp73-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:012d88a9ae08f331e1adc03dfbda4ff2ae7f76ea62455975827b215677a11aec", size = 395020, upload-time = "2026-05-11T19:54:19.566Z" }, - { url = "https://files.pythonhosted.org/packages/55/aa/ec512a0d14552bbb4e75693f7065434b865956abd045ceb67f0574146241/backports_zstd-1.5.0-pp311-pypy311_pp73-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:cbb7d79f8e43b6e0e17616961e425b9f8b32d9933e1db69242baa6e21f44a978", size = 414985, upload-time = "2026-05-11T19:54:21.136Z" }, - { url = "https://files.pythonhosted.org/packages/aa/31/759d077aa680555e17c9d2bb09edf4c3428d895fe5d35a8df67684401b84/backports_zstd-1.5.0-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:6172dcdd664ef243e55a35e6b45f1c866767c61043f0ddcd908abd14df662065", size = 300853, upload-time = "2026-05-11T19:54:23.1Z" }, +dependencies = [ + { name = "nodejs-wheel-binaries" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/7a/1a/48296b4479ccc9051eb9617a6507a69a68f5b68693fb6a118cfe08199270/basedpyright-1.39.6.tar.gz", hash = "sha256:d00ec5f8ba4e1a67dfc2fa3a9474229c89f61f207d14c02d320db78f57aa16ef", size = 25504244, upload-time = "2026-05-24T07:44:41.864Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/d4/07/6d1b3192715d42e8c9887876684a941eff28ec5d79c23a0f3758377e2182/basedpyright-1.39.6-py3-none-any.whl", hash = "sha256:5e0b9befbae6b26d0fbcc6645ac26923725e749d1224539e24f05ab07f9365ad", size = 13182122, upload-time = "2026-05-24T07:44:47.086Z" }, ] [[package]] @@ -352,36 +278,6 @@ version = "1.2.0" source = { registry = "https://pypi.org/simple" } sdist = { url = "https://files.pythonhosted.org/packages/f7/16/c92ca344d646e71a43b8bb353f0a6490d7f6e06210f8554c8f874e454285/brotli-1.2.0.tar.gz", hash = "sha256:e310f77e41941c13340a95976fe66a8a95b01e783d430eeaf7a2f87e0a57dd0a", size = 7388632, upload-time = "2025-11-05T18:39:42.86Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/7a/ef/f285668811a9e1ddb47a18cb0b437d5fc2760d537a2fe8a57875ad6f8448/brotli-1.2.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:15b33fe93cedc4caaff8a0bd1eb7e3dab1c61bb22a0bf5bdfdfd97cd7da79744", size = 863110, upload-time = "2025-11-05T18:38:12.978Z" }, - { url = "https://files.pythonhosted.org/packages/50/62/a3b77593587010c789a9d6eaa527c79e0848b7b860402cc64bc0bc28a86c/brotli-1.2.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:898be2be399c221d2671d29eed26b6b2713a02c2119168ed914e7d00ceadb56f", size = 445438, upload-time = "2025-11-05T18:38:14.208Z" }, - { url = "https://files.pythonhosted.org/packages/cd/e1/7fadd47f40ce5549dc44493877db40292277db373da5053aff181656e16e/brotli-1.2.0-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:350c8348f0e76fff0a0fd6c26755d2653863279d086d3aa2c290a6a7251135dd", size = 1534420, upload-time = "2025-11-05T18:38:15.111Z" }, - { url = "https://files.pythonhosted.org/packages/12/8b/1ed2f64054a5a008a4ccd2f271dbba7a5fb1a3067a99f5ceadedd4c1d5a7/brotli-1.2.0-cp311-cp311-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:2e1ad3fda65ae0d93fec742a128d72e145c9c7a99ee2fcd667785d99eb25a7fe", size = 1632619, upload-time = "2025-11-05T18:38:16.094Z" }, - { url = "https://files.pythonhosted.org/packages/89/5a/7071a621eb2d052d64efd5da2ef55ecdac7c3b0c6e4f9d519e9c66d987ef/brotli-1.2.0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:40d918bce2b427a0c4ba189df7a006ac0c7277c180aee4617d99e9ccaaf59e6a", size = 1426014, upload-time = "2025-11-05T18:38:17.177Z" }, - { url = "https://files.pythonhosted.org/packages/26/6d/0971a8ea435af5156acaaccec1a505f981c9c80227633851f2810abd252a/brotli-1.2.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:2a7f1d03727130fc875448b65b127a9ec5d06d19d0148e7554384229706f9d1b", size = 1489661, upload-time = "2025-11-05T18:38:18.41Z" }, - { url = "https://files.pythonhosted.org/packages/f3/75/c1baca8b4ec6c96a03ef8230fab2a785e35297632f402ebb1e78a1e39116/brotli-1.2.0-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:9c79f57faa25d97900bfb119480806d783fba83cd09ee0b33c17623935b05fa3", size = 1599150, upload-time = "2025-11-05T18:38:19.792Z" }, - { url = "https://files.pythonhosted.org/packages/0d/1a/23fcfee1c324fd48a63d7ebf4bac3a4115bdb1b00e600f80f727d850b1ae/brotli-1.2.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:844a8ceb8483fefafc412f85c14f2aae2fb69567bf2a0de53cdb88b73e7c43ae", size = 1493505, upload-time = "2025-11-05T18:38:20.913Z" }, - { url = "https://files.pythonhosted.org/packages/36/e5/12904bbd36afeef53d45a84881a4810ae8810ad7e328a971ebbfd760a0b3/brotli-1.2.0-cp311-cp311-win32.whl", hash = "sha256:aa47441fa3026543513139cb8926a92a8e305ee9c71a6209ef7a97d91640ea03", size = 334451, upload-time = "2025-11-05T18:38:21.94Z" }, - { url = "https://files.pythonhosted.org/packages/02/8b/ecb5761b989629a4758c394b9301607a5880de61ee2ee5fe104b87149ebc/brotli-1.2.0-cp311-cp311-win_amd64.whl", hash = "sha256:022426c9e99fd65d9475dce5c195526f04bb8be8907607e27e747893f6ee3e24", size = 369035, upload-time = "2025-11-05T18:38:22.941Z" }, - { url = "https://files.pythonhosted.org/packages/11/ee/b0a11ab2315c69bb9b45a2aaed022499c9c24a205c3a49c3513b541a7967/brotli-1.2.0-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:35d382625778834a7f3061b15423919aa03e4f5da34ac8e02c074e4b75ab4f84", size = 861543, upload-time = "2025-11-05T18:38:24.183Z" }, - { url = "https://files.pythonhosted.org/packages/e1/2f/29c1459513cd35828e25531ebfcbf3e92a5e49f560b1777a9af7203eb46e/brotli-1.2.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:7a61c06b334bd99bc5ae84f1eeb36bfe01400264b3c352f968c6e30a10f9d08b", size = 444288, upload-time = "2025-11-05T18:38:25.139Z" }, - { url = "https://files.pythonhosted.org/packages/3d/6f/feba03130d5fceadfa3a1bb102cb14650798c848b1df2a808356f939bb16/brotli-1.2.0-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:acec55bb7c90f1dfc476126f9711a8e81c9af7fb617409a9ee2953115343f08d", size = 1528071, upload-time = "2025-11-05T18:38:26.081Z" }, - { url = "https://files.pythonhosted.org/packages/2b/38/f3abb554eee089bd15471057ba85f47e53a44a462cfce265d9bf7088eb09/brotli-1.2.0-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:260d3692396e1895c5034f204f0db022c056f9e2ac841593a4cf9426e2a3faca", size = 1626913, upload-time = "2025-11-05T18:38:27.284Z" }, - { url = "https://files.pythonhosted.org/packages/03/a7/03aa61fbc3c5cbf99b44d158665f9b0dd3d8059be16c460208d9e385c837/brotli-1.2.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:072e7624b1fc4d601036ab3f4f27942ef772887e876beff0301d261210bca97f", size = 1419762, upload-time = "2025-11-05T18:38:28.295Z" }, - { url = "https://files.pythonhosted.org/packages/21/1b/0374a89ee27d152a5069c356c96b93afd1b94eae83f1e004b57eb6ce2f10/brotli-1.2.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:adedc4a67e15327dfdd04884873c6d5a01d3e3b6f61406f99b1ed4865a2f6d28", size = 1484494, upload-time = "2025-11-05T18:38:29.29Z" }, - { url = "https://files.pythonhosted.org/packages/cf/57/69d4fe84a67aef4f524dcd075c6eee868d7850e85bf01d778a857d8dbe0a/brotli-1.2.0-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:7a47ce5c2288702e09dc22a44d0ee6152f2c7eda97b3c8482d826a1f3cfc7da7", size = 1593302, upload-time = "2025-11-05T18:38:30.639Z" }, - { url = "https://files.pythonhosted.org/packages/d5/3b/39e13ce78a8e9a621c5df3aeb5fd181fcc8caba8c48a194cd629771f6828/brotli-1.2.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:af43b8711a8264bb4e7d6d9a6d004c3a2019c04c01127a868709ec29962b6036", size = 1487913, upload-time = "2025-11-05T18:38:31.618Z" }, - { url = "https://files.pythonhosted.org/packages/62/28/4d00cb9bd76a6357a66fcd54b4b6d70288385584063f4b07884c1e7286ac/brotli-1.2.0-cp312-cp312-win32.whl", hash = "sha256:e99befa0b48f3cd293dafeacdd0d191804d105d279e0b387a32054c1180f3161", size = 334362, upload-time = "2025-11-05T18:38:32.939Z" }, - { url = "https://files.pythonhosted.org/packages/1c/4e/bc1dcac9498859d5e353c9b153627a3752868a9d5f05ce8dedd81a2354ab/brotli-1.2.0-cp312-cp312-win_amd64.whl", hash = "sha256:b35c13ce241abdd44cb8ca70683f20c0c079728a36a996297adb5334adfc1c44", size = 369115, upload-time = "2025-11-05T18:38:33.765Z" }, - { url = "https://files.pythonhosted.org/packages/6c/d4/4ad5432ac98c73096159d9ce7ffeb82d151c2ac84adcc6168e476bb54674/brotli-1.2.0-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:9e5825ba2c9998375530504578fd4d5d1059d09621a02065d1b6bfc41a8e05ab", size = 861523, upload-time = "2025-11-05T18:38:34.67Z" }, - { url = "https://files.pythonhosted.org/packages/91/9f/9cc5bd03ee68a85dc4bc89114f7067c056a3c14b3d95f171918c088bf88d/brotli-1.2.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:0cf8c3b8ba93d496b2fae778039e2f5ecc7cff99df84df337ca31d8f2252896c", size = 444289, upload-time = "2025-11-05T18:38:35.6Z" }, - { url = "https://files.pythonhosted.org/packages/2e/b6/fe84227c56a865d16a6614e2c4722864b380cb14b13f3e6bef441e73a85a/brotli-1.2.0-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:c8565e3cdc1808b1a34714b553b262c5de5fbda202285782173ec137fd13709f", size = 1528076, upload-time = "2025-11-05T18:38:36.639Z" }, - { url = "https://files.pythonhosted.org/packages/55/de/de4ae0aaca06c790371cf6e7ee93a024f6b4bb0568727da8c3de112e726c/brotli-1.2.0-cp313-cp313-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:26e8d3ecb0ee458a9804f47f21b74845cc823fd1bb19f02272be70774f56e2a6", size = 1626880, upload-time = "2025-11-05T18:38:37.623Z" }, - { url = "https://files.pythonhosted.org/packages/5f/16/a1b22cbea436642e071adcaf8d4b350a2ad02f5e0ad0da879a1be16188a0/brotli-1.2.0-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:67a91c5187e1eec76a61625c77a6c8c785650f5b576ca732bd33ef58b0dff49c", size = 1419737, upload-time = "2025-11-05T18:38:38.729Z" }, - { url = "https://files.pythonhosted.org/packages/46/63/c968a97cbb3bdbf7f974ef5a6ab467a2879b82afbc5ffb65b8acbb744f95/brotli-1.2.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:4ecdb3b6dc36e6d6e14d3a1bdc6c1057c8cbf80db04031d566eb6080ce283a48", size = 1484440, upload-time = "2025-11-05T18:38:39.916Z" }, - { url = "https://files.pythonhosted.org/packages/06/9d/102c67ea5c9fc171f423e8399e585dabea29b5bc79b05572891e70013cdd/brotli-1.2.0-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:3e1b35d56856f3ed326b140d3c6d9db91740f22e14b06e840fe4bb1923439a18", size = 1593313, upload-time = "2025-11-05T18:38:41.24Z" }, - { url = "https://files.pythonhosted.org/packages/9e/4a/9526d14fa6b87bc827ba1755a8440e214ff90de03095cacd78a64abe2b7d/brotli-1.2.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:54a50a9dad16b32136b2241ddea9e4df159b41247b2ce6aac0b3276a66a8f1e5", size = 1487945, upload-time = "2025-11-05T18:38:42.277Z" }, - { url = "https://files.pythonhosted.org/packages/5b/e8/3fe1ffed70cbef83c5236166acaed7bb9c766509b157854c80e2f766b38c/brotli-1.2.0-cp313-cp313-win32.whl", hash = "sha256:1b1d6a4efedd53671c793be6dd760fcf2107da3a52331ad9ea429edf0902f27a", size = 334368, upload-time = "2025-11-05T18:38:43.345Z" }, - { url = "https://files.pythonhosted.org/packages/ff/91/e739587be970a113b37b821eae8097aac5a48e5f0eca438c22e4c7dd8648/brotli-1.2.0-cp313-cp313-win_amd64.whl", hash = "sha256:b63daa43d82f0cdabf98dee215b375b4058cce72871fd07934f179885aad16e8", size = 369116, upload-time = "2025-11-05T18:38:44.609Z" }, { url = "https://files.pythonhosted.org/packages/17/e1/298c2ddf786bb7347a1cd71d63a347a79e5712a7c0cba9e3c3458ebd976f/brotli-1.2.0-cp314-cp314-macosx_10_15_universal2.whl", hash = "sha256:6c12dad5cd04530323e723787ff762bac749a7b256a5bece32b2243dd5c27b21", size = 863080, upload-time = "2025-11-05T18:38:45.503Z" }, { url = "https://files.pythonhosted.org/packages/84/0c/aac98e286ba66868b2b3b50338ffbd85a35c7122e9531a73a37a29763d38/brotli-1.2.0-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:3219bd9e69868e57183316ee19c84e03e8f8b5a1d1f2667e1aa8c2f91cb061ac", size = 445453, upload-time = "2025-11-05T18:38:46.433Z" }, { url = "https://files.pythonhosted.org/packages/ec/f1/0ca1f3f99ae300372635ab3fe2f7a79fa335fee3d874fa7f9e68575e0e62/brotli-1.2.0-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:963a08f3bebd8b75ac57661045402da15991468a621f014be54e50f53a58d19e", size = 1528168, upload-time = "2025-11-05T18:38:47.371Z" }, @@ -413,10 +309,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/99/39/e7410db7f6f56de57744ea52a115084ceb2735f4d44973f349bb92136586/brotlicffi-1.2.0.1-cp38-abi3-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:6f3314a3476f59e5443f9f72a6dff16edc0c3463c9b318feaef04ae3e4683f5a", size = 1536838, upload-time = "2026-03-05T19:54:00.705Z" }, { url = "https://files.pythonhosted.org/packages/a6/75/6e7977d1935fc3fbb201cbd619be8f2c7aea25d40a096967132854b34708/brotlicffi-1.2.0.1-cp38-abi3-win32.whl", hash = "sha256:82ea52e2b5d3145b6c406ebd3efb0d55db718b7ad996bd70c62cec0439de1187", size = 343337, upload-time = "2026-03-05T19:54:02.446Z" }, { url = "https://files.pythonhosted.org/packages/d8/ef/e7e485ce5e4ba3843a0a92feb767c7b6098fd6e65ce752918074d175ae71/brotlicffi-1.2.0.1-cp38-abi3-win_amd64.whl", hash = "sha256:da2e82a08e7778b8bc539d27ca03cdd684113e81394bfaaad8d0dfc6a17ddede", size = 379026, upload-time = "2026-03-05T19:54:04.322Z" }, - { url = "https://files.pythonhosted.org/packages/7f/53/6262c2256513e6f530d81642477cb19367270922063eaa2d7b781d8c723d/brotlicffi-1.2.0.1-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:e015af99584c6db1490a69a210c765953e473e63adc2d891ac3062a737c9e851", size = 402265, upload-time = "2026-03-05T19:54:05.858Z" }, - { url = "https://files.pythonhosted.org/packages/1f/d9/d5340b43cf5fbe7fe5a083d237e5338cc1caa73bea523be1c5e452c26290/brotlicffi-1.2.0.1-pp311-pypy311_pp73-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:37cb587d32bf7168e2218c455e22e409ad1f3157c6c71945879a311f3e6b6abf", size = 406710, upload-time = "2026-03-05T19:54:07.272Z" }, - { url = "https://files.pythonhosted.org/packages/a3/82/dbced4c1e0792efdf23fd90ff6d2a320c64ff4dfef7aacc85c04fde9ddd2/brotlicffi-1.2.0.1-pp311-pypy311_pp73-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:9d6ba65dd528892b4d9960beba2ae011a753620bcfc66cf6fa3cee18d7b0baa4", size = 402787, upload-time = "2026-03-05T19:54:08.73Z" }, - { url = "https://files.pythonhosted.org/packages/ef/6f/534205ba7590c9a8716a614f270c5c2ec419b5b7079b3f9cd31b7b5580de/brotlicffi-1.2.0.1-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:f2a5575653b0672638ba039b82fda56854934d7a6a24d4b8b5033f73ab43cbc1", size = 375108, upload-time = "2026-03-05T19:54:10.079Z" }, ] [[package]] @@ -446,43 +338,6 @@ dependencies = [ ] sdist = { url = "https://files.pythonhosted.org/packages/eb/56/b1ba7935a17738ae8453301356628e8147c79dbb825bcbc73dc7401f9846/cffi-2.0.0.tar.gz", hash = "sha256:44d1b5909021139fe36001ae048dbdde8214afa20200eda0f64c068cac5d5529", size = 523588, upload-time = "2025-09-08T23:24:04.541Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/12/4a/3dfd5f7850cbf0d06dc84ba9aa00db766b52ca38d8b86e3a38314d52498c/cffi-2.0.0-cp311-cp311-macosx_10_13_x86_64.whl", hash = "sha256:b4c854ef3adc177950a8dfc81a86f5115d2abd545751a304c5bcf2c2c7283cfe", size = 184344, upload-time = "2025-09-08T23:22:26.456Z" }, - { url = "https://files.pythonhosted.org/packages/4f/8b/f0e4c441227ba756aafbe78f117485b25bb26b1c059d01f137fa6d14896b/cffi-2.0.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:2de9a304e27f7596cd03d16f1b7c72219bd944e99cc52b84d0145aefb07cbd3c", size = 180560, upload-time = "2025-09-08T23:22:28.197Z" }, - { url = "https://files.pythonhosted.org/packages/b1/b7/1200d354378ef52ec227395d95c2576330fd22a869f7a70e88e1447eb234/cffi-2.0.0-cp311-cp311-manylinux1_i686.manylinux2014_i686.manylinux_2_17_i686.manylinux_2_5_i686.whl", hash = "sha256:baf5215e0ab74c16e2dd324e8ec067ef59e41125d3eade2b863d294fd5035c92", size = 209613, upload-time = "2025-09-08T23:22:29.475Z" }, - { url = "https://files.pythonhosted.org/packages/b8/56/6033f5e86e8cc9bb629f0077ba71679508bdf54a9a5e112a3c0b91870332/cffi-2.0.0-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:730cacb21e1bdff3ce90babf007d0a0917cc3e6492f336c2f0134101e0944f93", size = 216476, upload-time = "2025-09-08T23:22:31.063Z" }, - { url = "https://files.pythonhosted.org/packages/dc/7f/55fecd70f7ece178db2f26128ec41430d8720f2d12ca97bf8f0a628207d5/cffi-2.0.0-cp311-cp311-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:6824f87845e3396029f3820c206e459ccc91760e8fa24422f8b0c3d1731cbec5", size = 203374, upload-time = "2025-09-08T23:22:32.507Z" }, - { url = "https://files.pythonhosted.org/packages/84/ef/a7b77c8bdc0f77adc3b46888f1ad54be8f3b7821697a7b89126e829e676a/cffi-2.0.0-cp311-cp311-manylinux2014_s390x.manylinux_2_17_s390x.whl", hash = "sha256:9de40a7b0323d889cf8d23d1ef214f565ab154443c42737dfe52ff82cf857664", size = 202597, upload-time = "2025-09-08T23:22:34.132Z" }, - { url = "https://files.pythonhosted.org/packages/d7/91/500d892b2bf36529a75b77958edfcd5ad8e2ce4064ce2ecfeab2125d72d1/cffi-2.0.0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:8941aaadaf67246224cee8c3803777eed332a19d909b47e29c9842ef1e79ac26", size = 215574, upload-time = "2025-09-08T23:22:35.443Z" }, - { url = "https://files.pythonhosted.org/packages/44/64/58f6255b62b101093d5df22dcb752596066c7e89dd725e0afaed242a61be/cffi-2.0.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:a05d0c237b3349096d3981b727493e22147f934b20f6f125a3eba8f994bec4a9", size = 218971, upload-time = "2025-09-08T23:22:36.805Z" }, - { url = "https://files.pythonhosted.org/packages/ab/49/fa72cebe2fd8a55fbe14956f9970fe8eb1ac59e5df042f603ef7c8ba0adc/cffi-2.0.0-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:94698a9c5f91f9d138526b48fe26a199609544591f859c870d477351dc7b2414", size = 211972, upload-time = "2025-09-08T23:22:38.436Z" }, - { url = "https://files.pythonhosted.org/packages/0b/28/dd0967a76aab36731b6ebfe64dec4e981aff7e0608f60c2d46b46982607d/cffi-2.0.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:5fed36fccc0612a53f1d4d9a816b50a36702c28a2aa880cb8a122b3466638743", size = 217078, upload-time = "2025-09-08T23:22:39.776Z" }, - { url = "https://files.pythonhosted.org/packages/2b/c0/015b25184413d7ab0a410775fdb4a50fca20f5589b5dab1dbbfa3baad8ce/cffi-2.0.0-cp311-cp311-win32.whl", hash = "sha256:c649e3a33450ec82378822b3dad03cc228b8f5963c0c12fc3b1e0ab940f768a5", size = 172076, upload-time = "2025-09-08T23:22:40.95Z" }, - { url = "https://files.pythonhosted.org/packages/ae/8f/dc5531155e7070361eb1b7e4c1a9d896d0cb21c49f807a6c03fd63fc877e/cffi-2.0.0-cp311-cp311-win_amd64.whl", hash = "sha256:66f011380d0e49ed280c789fbd08ff0d40968ee7b665575489afa95c98196ab5", size = 182820, upload-time = "2025-09-08T23:22:42.463Z" }, - { url = "https://files.pythonhosted.org/packages/95/5c/1b493356429f9aecfd56bc171285a4c4ac8697f76e9bbbbb105e537853a1/cffi-2.0.0-cp311-cp311-win_arm64.whl", hash = "sha256:c6638687455baf640e37344fe26d37c404db8b80d037c3d29f58fe8d1c3b194d", size = 177635, upload-time = "2025-09-08T23:22:43.623Z" }, - { url = "https://files.pythonhosted.org/packages/ea/47/4f61023ea636104d4f16ab488e268b93008c3d0bb76893b1b31db1f96802/cffi-2.0.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:6d02d6655b0e54f54c4ef0b94eb6be0607b70853c45ce98bd278dc7de718be5d", size = 185271, upload-time = "2025-09-08T23:22:44.795Z" }, - { url = "https://files.pythonhosted.org/packages/df/a2/781b623f57358e360d62cdd7a8c681f074a71d445418a776eef0aadb4ab4/cffi-2.0.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:8eca2a813c1cb7ad4fb74d368c2ffbbb4789d377ee5bb8df98373c2cc0dee76c", size = 181048, upload-time = "2025-09-08T23:22:45.938Z" }, - { url = "https://files.pythonhosted.org/packages/ff/df/a4f0fbd47331ceeba3d37c2e51e9dfc9722498becbeec2bd8bc856c9538a/cffi-2.0.0-cp312-cp312-manylinux1_i686.manylinux2014_i686.manylinux_2_17_i686.manylinux_2_5_i686.whl", hash = "sha256:21d1152871b019407d8ac3985f6775c079416c282e431a4da6afe7aefd2bccbe", size = 212529, upload-time = "2025-09-08T23:22:47.349Z" }, - { url = "https://files.pythonhosted.org/packages/d5/72/12b5f8d3865bf0f87cf1404d8c374e7487dcf097a1c91c436e72e6badd83/cffi-2.0.0-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:b21e08af67b8a103c71a250401c78d5e0893beff75e28c53c98f4de42f774062", size = 220097, upload-time = "2025-09-08T23:22:48.677Z" }, - { url = "https://files.pythonhosted.org/packages/c2/95/7a135d52a50dfa7c882ab0ac17e8dc11cec9d55d2c18dda414c051c5e69e/cffi-2.0.0-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:1e3a615586f05fc4065a8b22b8152f0c1b00cdbc60596d187c2a74f9e3036e4e", size = 207983, upload-time = "2025-09-08T23:22:50.06Z" }, - { url = "https://files.pythonhosted.org/packages/3a/c8/15cb9ada8895957ea171c62dc78ff3e99159ee7adb13c0123c001a2546c1/cffi-2.0.0-cp312-cp312-manylinux2014_s390x.manylinux_2_17_s390x.whl", hash = "sha256:81afed14892743bbe14dacb9e36d9e0e504cd204e0b165062c488942b9718037", size = 206519, upload-time = "2025-09-08T23:22:51.364Z" }, - { url = "https://files.pythonhosted.org/packages/78/2d/7fa73dfa841b5ac06c7b8855cfc18622132e365f5b81d02230333ff26e9e/cffi-2.0.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:3e17ed538242334bf70832644a32a7aae3d83b57567f9fd60a26257e992b79ba", size = 219572, upload-time = "2025-09-08T23:22:52.902Z" }, - { url = "https://files.pythonhosted.org/packages/07/e0/267e57e387b4ca276b90f0434ff88b2c2241ad72b16d31836adddfd6031b/cffi-2.0.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:3925dd22fa2b7699ed2617149842d2e6adde22b262fcbfada50e3d195e4b3a94", size = 222963, upload-time = "2025-09-08T23:22:54.518Z" }, - { url = "https://files.pythonhosted.org/packages/b6/75/1f2747525e06f53efbd878f4d03bac5b859cbc11c633d0fb81432d98a795/cffi-2.0.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:2c8f814d84194c9ea681642fd164267891702542f028a15fc97d4674b6206187", size = 221361, upload-time = "2025-09-08T23:22:55.867Z" }, - { url = "https://files.pythonhosted.org/packages/7b/2b/2b6435f76bfeb6bbf055596976da087377ede68df465419d192acf00c437/cffi-2.0.0-cp312-cp312-win32.whl", hash = "sha256:da902562c3e9c550df360bfa53c035b2f241fed6d9aef119048073680ace4a18", size = 172932, upload-time = "2025-09-08T23:22:57.188Z" }, - { url = "https://files.pythonhosted.org/packages/f8/ed/13bd4418627013bec4ed6e54283b1959cf6db888048c7cf4b4c3b5b36002/cffi-2.0.0-cp312-cp312-win_amd64.whl", hash = "sha256:da68248800ad6320861f129cd9c1bf96ca849a2771a59e0344e88681905916f5", size = 183557, upload-time = "2025-09-08T23:22:58.351Z" }, - { url = "https://files.pythonhosted.org/packages/95/31/9f7f93ad2f8eff1dbc1c3656d7ca5bfd8fb52c9d786b4dcf19b2d02217fa/cffi-2.0.0-cp312-cp312-win_arm64.whl", hash = "sha256:4671d9dd5ec934cb9a73e7ee9676f9362aba54f7f34910956b84d727b0d73fb6", size = 177762, upload-time = "2025-09-08T23:22:59.668Z" }, - { url = "https://files.pythonhosted.org/packages/4b/8d/a0a47a0c9e413a658623d014e91e74a50cdd2c423f7ccfd44086ef767f90/cffi-2.0.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:00bdf7acc5f795150faa6957054fbbca2439db2f775ce831222b66f192f03beb", size = 185230, upload-time = "2025-09-08T23:23:00.879Z" }, - { url = "https://files.pythonhosted.org/packages/4a/d2/a6c0296814556c68ee32009d9c2ad4f85f2707cdecfd7727951ec228005d/cffi-2.0.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:45d5e886156860dc35862657e1494b9bae8dfa63bf56796f2fb56e1679fc0bca", size = 181043, upload-time = "2025-09-08T23:23:02.231Z" }, - { url = "https://files.pythonhosted.org/packages/b0/1e/d22cc63332bd59b06481ceaac49d6c507598642e2230f201649058a7e704/cffi-2.0.0-cp313-cp313-manylinux1_i686.manylinux2014_i686.manylinux_2_17_i686.manylinux_2_5_i686.whl", hash = "sha256:07b271772c100085dd28b74fa0cd81c8fb1a3ba18b21e03d7c27f3436a10606b", size = 212446, upload-time = "2025-09-08T23:23:03.472Z" }, - { url = "https://files.pythonhosted.org/packages/a9/f5/a2c23eb03b61a0b8747f211eb716446c826ad66818ddc7810cc2cc19b3f2/cffi-2.0.0-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:d48a880098c96020b02d5a1f7d9251308510ce8858940e6fa99ece33f610838b", size = 220101, upload-time = "2025-09-08T23:23:04.792Z" }, - { url = "https://files.pythonhosted.org/packages/f2/7f/e6647792fc5850d634695bc0e6ab4111ae88e89981d35ac269956605feba/cffi-2.0.0-cp313-cp313-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:f93fd8e5c8c0a4aa1f424d6173f14a892044054871c771f8566e4008eaa359d2", size = 207948, upload-time = "2025-09-08T23:23:06.127Z" }, - { url = "https://files.pythonhosted.org/packages/cb/1e/a5a1bd6f1fb30f22573f76533de12a00bf274abcdc55c8edab639078abb6/cffi-2.0.0-cp313-cp313-manylinux2014_s390x.manylinux_2_17_s390x.whl", hash = "sha256:dd4f05f54a52fb558f1ba9f528228066954fee3ebe629fc1660d874d040ae5a3", size = 206422, upload-time = "2025-09-08T23:23:07.753Z" }, - { url = "https://files.pythonhosted.org/packages/98/df/0a1755e750013a2081e863e7cd37e0cdd02664372c754e5560099eb7aa44/cffi-2.0.0-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:c8d3b5532fc71b7a77c09192b4a5a200ea992702734a2e9279a37f2478236f26", size = 219499, upload-time = "2025-09-08T23:23:09.648Z" }, - { url = "https://files.pythonhosted.org/packages/50/e1/a969e687fcf9ea58e6e2a928ad5e2dd88cc12f6f0ab477e9971f2309b57c/cffi-2.0.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:d9b29c1f0ae438d5ee9acb31cadee00a58c46cc9c0b2f9038c6b0b3470877a8c", size = 222928, upload-time = "2025-09-08T23:23:10.928Z" }, - { url = "https://files.pythonhosted.org/packages/36/54/0362578dd2c9e557a28ac77698ed67323ed5b9775ca9d3fe73fe191bb5d8/cffi-2.0.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:6d50360be4546678fc1b79ffe7a66265e28667840010348dd69a314145807a1b", size = 221302, upload-time = "2025-09-08T23:23:12.42Z" }, - { url = "https://files.pythonhosted.org/packages/eb/6d/bf9bda840d5f1dfdbf0feca87fbdb64a918a69bca42cfa0ba7b137c48cb8/cffi-2.0.0-cp313-cp313-win32.whl", hash = "sha256:74a03b9698e198d47562765773b4a8309919089150a0bb17d829ad7b44b60d27", size = 172909, upload-time = "2025-09-08T23:23:14.32Z" }, - { url = "https://files.pythonhosted.org/packages/37/18/6519e1ee6f5a1e579e04b9ddb6f1676c17368a7aba48299c3759bbc3c8b3/cffi-2.0.0-cp313-cp313-win_amd64.whl", hash = "sha256:19f705ada2530c1167abacb171925dd886168931e0a7b78f5bffcae5c6b5be75", size = 183402, upload-time = "2025-09-08T23:23:15.535Z" }, - { url = "https://files.pythonhosted.org/packages/cb/0e/02ceeec9a7d6ee63bb596121c2c8e9b3a9e150936f4fbef6ca1943e6137c/cffi-2.0.0-cp313-cp313-win_arm64.whl", hash = "sha256:256f80b80ca3853f90c21b23ee78cd008713787b1b1e93eae9f3d6a7134abd91", size = 177780, upload-time = "2025-09-08T23:23:16.761Z" }, { url = "https://files.pythonhosted.org/packages/92/c4/3ce07396253a83250ee98564f8d7e9789fab8e58858f35d07a9a2c78de9f/cffi-2.0.0-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:fc33c5141b55ed366cfaad382df24fe7dcbc686de5be719b207bb248e3053dc5", size = 185320, upload-time = "2025-09-08T23:23:18.087Z" }, { url = "https://files.pythonhosted.org/packages/59/dd/27e9fa567a23931c838c6b02d0764611c62290062a6d4e8ff7863daf9730/cffi-2.0.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:c654de545946e0db659b3400168c9ad31b5d29593291482c43e3564effbcee13", size = 181487, upload-time = "2025-09-08T23:23:19.622Z" }, { url = "https://files.pythonhosted.org/packages/d6/43/0e822876f87ea8a4ef95442c3d766a06a51fc5298823f884ef87aaad168c/cffi-2.0.0-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:24b6f81f1983e6df8db3adc38562c83f7d4a0c36162885ec7f7b77c7dcbec97b", size = 220049, upload-time = "2025-09-08T23:23:20.853Z" }, @@ -513,54 +368,6 @@ version = "3.4.7" source = { registry = "https://pypi.org/simple" } sdist = { url = "https://files.pythonhosted.org/packages/e7/a1/67fe25fac3c7642725500a3f6cfe5821ad557c3abb11c9d20d12c7008d3e/charset_normalizer-3.4.7.tar.gz", hash = "sha256:ae89db9e5f98a11a4bf50407d4363e7b09b31e55bc117b4f7d80aab97ba009e5", size = 144271, upload-time = "2026-04-02T09:28:39.342Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/c2/d7/b5b7020a0565c2e9fa8c09f4b5fa6232feb326b8c20081ccded47ea368fd/charset_normalizer-3.4.7-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:7641bb8895e77f921102f72833904dcd9901df5d6d72a2ab8f31d04b7e51e4e7", size = 309705, upload-time = "2026-04-02T09:26:02.191Z" }, - { url = "https://files.pythonhosted.org/packages/5a/53/58c29116c340e5456724ecd2fff4196d236b98f3da97b404bc5e51ac3493/charset_normalizer-3.4.7-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:202389074300232baeb53ae2569a60901f7efadd4245cf3a3bf0617d60b439d7", size = 206419, upload-time = "2026-04-02T09:26:03.583Z" }, - { url = "https://files.pythonhosted.org/packages/b2/02/e8146dc6591a37a00e5144c63f29fb7c97a734ea8a111190783c0e60ab63/charset_normalizer-3.4.7-cp311-cp311-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:30b8d1d8c52a48c2c5690e152c169b673487a2a58de1ec7393196753063fcd5e", size = 227901, upload-time = "2026-04-02T09:26:04.738Z" }, - { url = "https://files.pythonhosted.org/packages/fb/73/77486c4cd58f1267bf17db420e930c9afa1b3be3fe8c8b8ebbebc9624359/charset_normalizer-3.4.7-cp311-cp311-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:532bc9bf33a68613fd7d65e4b1c71a6a38d7d42604ecf239c77392e9b4e8998c", size = 222742, upload-time = "2026-04-02T09:26:06.36Z" }, - { url = "https://files.pythonhosted.org/packages/a1/fa/f74eb381a7d94ded44739e9d94de18dc5edc9c17fb8c11f0a6890696c0a9/charset_normalizer-3.4.7-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:2fe249cb4651fd12605b7288b24751d8bfd46d35f12a20b1ba33dea122e690df", size = 214061, upload-time = "2026-04-02T09:26:08.347Z" }, - { url = "https://files.pythonhosted.org/packages/dc/92/42bd3cefcf7687253fb86694b45f37b733c97f59af3724f356fa92b8c344/charset_normalizer-3.4.7-cp311-cp311-manylinux_2_31_armv7l.whl", hash = "sha256:65bcd23054beab4d166035cabbc868a09c1a49d1efe458fe8e4361215df40265", size = 199239, upload-time = "2026-04-02T09:26:09.823Z" }, - { url = "https://files.pythonhosted.org/packages/4c/3d/069e7184e2aa3b3cddc700e3dd267413dc259854adc3380421c805c6a17d/charset_normalizer-3.4.7-cp311-cp311-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:08e721811161356f97b4059a9ba7bafb23ea5ee2255402c42881c214e173c6b4", size = 210173, upload-time = "2026-04-02T09:26:10.953Z" }, - { url = "https://files.pythonhosted.org/packages/62/51/9d56feb5f2e7074c46f93e0ebdbe61f0848ee246e2f0d89f8e20b89ebb8f/charset_normalizer-3.4.7-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:e060d01aec0a910bdccb8be71faf34e7799ce36950f8294c8bf612cba65a2c9e", size = 209841, upload-time = "2026-04-02T09:26:12.142Z" }, - { url = "https://files.pythonhosted.org/packages/d2/59/893d8f99cc4c837dda1fe2f1139079703deb9f321aabcb032355de13b6c7/charset_normalizer-3.4.7-cp311-cp311-musllinux_1_2_armv7l.whl", hash = "sha256:38c0109396c4cfc574d502df99742a45c72c08eff0a36158b6f04000043dbf38", size = 200304, upload-time = "2026-04-02T09:26:13.711Z" }, - { url = "https://files.pythonhosted.org/packages/7d/1d/ee6f3be3464247578d1ed5c46de545ccc3d3ff933695395c402c21fa6b77/charset_normalizer-3.4.7-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:1c2a768fdd44ee4a9339a9b0b130049139b8ce3c01d2ce09f67f5a68048d477c", size = 229455, upload-time = "2026-04-02T09:26:14.941Z" }, - { url = "https://files.pythonhosted.org/packages/54/bb/8fb0a946296ea96a488928bdce8ef99023998c48e4713af533e9bb98ef07/charset_normalizer-3.4.7-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:1a87ca9d5df6fe460483d9a5bbf2b18f620cbed41b432e2bddb686228282d10b", size = 210036, upload-time = "2026-04-02T09:26:16.478Z" }, - { url = "https://files.pythonhosted.org/packages/9a/bc/015b2387f913749f82afd4fcba07846d05b6d784dd16123cb66860e0237d/charset_normalizer-3.4.7-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:d635aab80466bc95771bb78d5370e74d36d1fe31467b6b29b8b57b2a3cd7d22c", size = 224739, upload-time = "2026-04-02T09:26:17.751Z" }, - { url = "https://files.pythonhosted.org/packages/17/ab/63133691f56baae417493cba6b7c641571a2130eb7bceba6773367ab9ec5/charset_normalizer-3.4.7-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:ae196f021b5e7c78e918242d217db021ed2a6ace2bc6ae94c0fc596221c7f58d", size = 216277, upload-time = "2026-04-02T09:26:18.981Z" }, - { url = "https://files.pythonhosted.org/packages/06/6d/3be70e827977f20db77c12a97e6a9f973631a45b8d186c084527e53e77a4/charset_normalizer-3.4.7-cp311-cp311-win32.whl", hash = "sha256:adb2597b428735679446b46c8badf467b4ca5f5056aae4d51a19f9570301b1ad", size = 147819, upload-time = "2026-04-02T09:26:20.295Z" }, - { url = "https://files.pythonhosted.org/packages/20/d9/5f67790f06b735d7c7637171bbfd89882ad67201891b7275e51116ed8207/charset_normalizer-3.4.7-cp311-cp311-win_amd64.whl", hash = "sha256:8e385e4267ab76874ae30db04c627faaaf0b509e1ccc11a95b3fc3e83f855c00", size = 159281, upload-time = "2026-04-02T09:26:21.74Z" }, - { url = "https://files.pythonhosted.org/packages/ca/83/6413f36c5a34afead88ce6f66684d943d91f233d76dd083798f9602b75ae/charset_normalizer-3.4.7-cp311-cp311-win_arm64.whl", hash = "sha256:d4a48e5b3c2a489fae013b7589308a40146ee081f6f509e047e0e096084ceca1", size = 147843, upload-time = "2026-04-02T09:26:22.901Z" }, - { url = "https://files.pythonhosted.org/packages/0c/eb/4fc8d0a7110eb5fc9cc161723a34a8a6c200ce3b4fbf681bc86feee22308/charset_normalizer-3.4.7-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:eca9705049ad3c7345d574e3510665cb2cf844c2f2dcfe675332677f081cbd46", size = 311328, upload-time = "2026-04-02T09:26:24.331Z" }, - { url = "https://files.pythonhosted.org/packages/f8/e3/0fadc706008ac9d7b9b5be6dc767c05f9d3e5df51744ce4cc9605de7b9f4/charset_normalizer-3.4.7-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:6178f72c5508bfc5fd446a5905e698c6212932f25bcdd4b47a757a50605a90e2", size = 208061, upload-time = "2026-04-02T09:26:25.568Z" }, - { url = "https://files.pythonhosted.org/packages/42/f0/3dd1045c47f4a4604df85ec18ad093912ae1344ac706993aff91d38773a2/charset_normalizer-3.4.7-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:e1421b502d83040e6d7fb2fb18dff63957f720da3d77b2fbd3187ceb63755d7b", size = 229031, upload-time = "2026-04-02T09:26:26.865Z" }, - { url = "https://files.pythonhosted.org/packages/dc/67/675a46eb016118a2fbde5a277a5d15f4f69d5f3f5f338e5ee2f8948fcf43/charset_normalizer-3.4.7-cp312-cp312-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:edac0f1ab77644605be2cbba52e6b7f630731fc42b34cb0f634be1a6eface56a", size = 225239, upload-time = "2026-04-02T09:26:28.044Z" }, - { url = "https://files.pythonhosted.org/packages/4b/f8/d0118a2f5f23b02cd166fa385c60f9b0d4f9194f574e2b31cef350ad7223/charset_normalizer-3.4.7-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:5649fd1c7bade02f320a462fdefd0b4bd3ce036065836d4f42e0de958038e116", size = 216589, upload-time = "2026-04-02T09:26:29.239Z" }, - { url = "https://files.pythonhosted.org/packages/b1/f1/6d2b0b261b6c4ceef0fcb0d17a01cc5bc53586c2d4796fa04b5c540bc13d/charset_normalizer-3.4.7-cp312-cp312-manylinux_2_31_armv7l.whl", hash = "sha256:203104ed3e428044fd943bc4bf45fa73c0730391f9621e37fe39ecf477b128cb", size = 202733, upload-time = "2026-04-02T09:26:30.5Z" }, - { url = "https://files.pythonhosted.org/packages/6f/c0/7b1f943f7e87cc3db9626ba17807d042c38645f0a1d4415c7a14afb5591f/charset_normalizer-3.4.7-cp312-cp312-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:298930cec56029e05497a76988377cbd7457ba864beeea92ad7e844fe74cd1f1", size = 212652, upload-time = "2026-04-02T09:26:31.709Z" }, - { url = "https://files.pythonhosted.org/packages/38/dd/5a9ab159fe45c6e72079398f277b7d2b523e7f716acc489726115a910097/charset_normalizer-3.4.7-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:708838739abf24b2ceb208d0e22403dd018faeef86ddac04319a62ae884c4f15", size = 211229, upload-time = "2026-04-02T09:26:33.282Z" }, - { url = "https://files.pythonhosted.org/packages/d5/ff/531a1cad5ca855d1c1a8b69cb71abfd6d85c0291580146fda7c82857caa1/charset_normalizer-3.4.7-cp312-cp312-musllinux_1_2_armv7l.whl", hash = "sha256:0f7eb884681e3938906ed0434f20c63046eacd0111c4ba96f27b76084cd679f5", size = 203552, upload-time = "2026-04-02T09:26:34.845Z" }, - { url = "https://files.pythonhosted.org/packages/c1/4c/a5fb52d528a8ca41f7598cb619409ece30a169fbdf9cdce592e53b46c3a6/charset_normalizer-3.4.7-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:4dc1e73c36828f982bfe79fadf5919923f8a6f4df2860804db9a98c48824ce8d", size = 230806, upload-time = "2026-04-02T09:26:36.152Z" }, - { url = "https://files.pythonhosted.org/packages/59/7a/071feed8124111a32b316b33ae4de83d36923039ef8cf48120266844285b/charset_normalizer-3.4.7-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:aed52fea0513bac0ccde438c188c8a471c4e0f457c2dd20cdbf6ea7a450046c7", size = 212316, upload-time = "2026-04-02T09:26:37.672Z" }, - { url = "https://files.pythonhosted.org/packages/fd/35/f7dba3994312d7ba508e041eaac39a36b120f32d4c8662b8814dab876431/charset_normalizer-3.4.7-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:fea24543955a6a729c45a73fe90e08c743f0b3334bbf3201e6c4bc1b0c7fa464", size = 227274, upload-time = "2026-04-02T09:26:38.93Z" }, - { url = "https://files.pythonhosted.org/packages/8a/2d/a572df5c9204ab7688ec1edc895a73ebded3b023bb07364710b05dd1c9be/charset_normalizer-3.4.7-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:bb6d88045545b26da47aa879dd4a89a71d1dce0f0e549b1abcb31dfe4a8eac49", size = 218468, upload-time = "2026-04-02T09:26:40.17Z" }, - { url = "https://files.pythonhosted.org/packages/86/eb/890922a8b03a568ca2f336c36585a4713c55d4d67bf0f0c78924be6315ca/charset_normalizer-3.4.7-cp312-cp312-win32.whl", hash = "sha256:2257141f39fe65a3fdf38aeccae4b953e5f3b3324f4ff0daf9f15b8518666a2c", size = 148460, upload-time = "2026-04-02T09:26:41.416Z" }, - { url = "https://files.pythonhosted.org/packages/35/d9/0e7dffa06c5ab081f75b1b786f0aefc88365825dfcd0ac544bdb7b2b6853/charset_normalizer-3.4.7-cp312-cp312-win_amd64.whl", hash = "sha256:5ed6ab538499c8644b8a3e18debabcd7ce684f3fa91cf867521a7a0279cab2d6", size = 159330, upload-time = "2026-04-02T09:26:42.554Z" }, - { url = "https://files.pythonhosted.org/packages/9e/5d/481bcc2a7c88ea6b0878c299547843b2521ccbc40980cb406267088bc701/charset_normalizer-3.4.7-cp312-cp312-win_arm64.whl", hash = "sha256:56be790f86bfb2c98fb742ce566dfb4816e5a83384616ab59c49e0604d49c51d", size = 147828, upload-time = "2026-04-02T09:26:44.075Z" }, - { url = "https://files.pythonhosted.org/packages/c1/3b/66777e39d3ae1ddc77ee606be4ec6d8cbd4c801f65e5a1b6f2b11b8346dd/charset_normalizer-3.4.7-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:f496c9c3cc02230093d8330875c4c3cdfc3b73612a5fd921c65d39cbcef08063", size = 309627, upload-time = "2026-04-02T09:26:45.198Z" }, - { url = "https://files.pythonhosted.org/packages/2e/4e/b7f84e617b4854ade48a1b7915c8ccfadeba444d2a18c291f696e37f0d3b/charset_normalizer-3.4.7-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:0ea948db76d31190bf08bd371623927ee1339d5f2a0b4b1b4a4439a65298703c", size = 207008, upload-time = "2026-04-02T09:26:46.824Z" }, - { url = "https://files.pythonhosted.org/packages/c4/bb/ec73c0257c9e11b268f018f068f5d00aa0ef8c8b09f7753ebd5f2880e248/charset_normalizer-3.4.7-cp313-cp313-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:a277ab8928b9f299723bc1a2dabb1265911b1a76341f90a510368ca44ad9ab66", size = 228303, upload-time = "2026-04-02T09:26:48.397Z" }, - { url = "https://files.pythonhosted.org/packages/85/fb/32d1f5033484494619f701e719429c69b766bfc4dbc61aa9e9c8c166528b/charset_normalizer-3.4.7-cp313-cp313-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:3bec022aec2c514d9cf199522a802bd007cd588ab17ab2525f20f9c34d067c18", size = 224282, upload-time = "2026-04-02T09:26:49.684Z" }, - { url = "https://files.pythonhosted.org/packages/fa/07/330e3a0dda4c404d6da83b327270906e9654a24f6c546dc886a0eb0ffb23/charset_normalizer-3.4.7-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:e044c39e41b92c845bc815e5ae4230804e8e7bc29e399b0437d64222d92809dd", size = 215595, upload-time = "2026-04-02T09:26:50.915Z" }, - { url = "https://files.pythonhosted.org/packages/e3/7c/fc890655786e423f02556e0216d4b8c6bcb6bdfa890160dc66bf52dee468/charset_normalizer-3.4.7-cp313-cp313-manylinux_2_31_armv7l.whl", hash = "sha256:f495a1652cf3fbab2eb0639776dad966c2fb874d79d87ca07f9d5f059b8bd215", size = 201986, upload-time = "2026-04-02T09:26:52.197Z" }, - { url = "https://files.pythonhosted.org/packages/d8/97/bfb18b3db2aed3b90cf54dc292ad79fdd5ad65c4eae454099475cbeadd0d/charset_normalizer-3.4.7-cp313-cp313-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:e712b419df8ba5e42b226c510472b37bd57b38e897d3eca5e8cfd410a29fa859", size = 211711, upload-time = "2026-04-02T09:26:53.49Z" }, - { url = "https://files.pythonhosted.org/packages/6f/a5/a581c13798546a7fd557c82614a5c65a13df2157e9ad6373166d2a3e645d/charset_normalizer-3.4.7-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:7804338df6fcc08105c7745f1502ba68d900f45fd770d5bdd5288ddccb8a42d8", size = 210036, upload-time = "2026-04-02T09:26:54.975Z" }, - { url = "https://files.pythonhosted.org/packages/8c/bf/b3ab5bcb478e4193d517644b0fb2bf5497fbceeaa7a1bc0f4d5b50953861/charset_normalizer-3.4.7-cp313-cp313-musllinux_1_2_armv7l.whl", hash = "sha256:481551899c856c704d58119b5025793fa6730adda3571971af568f66d2424bb5", size = 202998, upload-time = "2026-04-02T09:26:56.303Z" }, - { url = "https://files.pythonhosted.org/packages/e7/4e/23efd79b65d314fa320ec6017b4b5834d5c12a58ba4610aa353af2e2f577/charset_normalizer-3.4.7-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:f59099f9b66f0d7145115e6f80dd8b1d847176df89b234a5a6b3f00437aa0832", size = 230056, upload-time = "2026-04-02T09:26:57.554Z" }, - { url = "https://files.pythonhosted.org/packages/b9/9f/1e1941bc3f0e01df116e68dc37a55c4d249df5e6fa77f008841aef68264f/charset_normalizer-3.4.7-cp313-cp313-musllinux_1_2_riscv64.whl", hash = "sha256:f59ad4c0e8f6bba240a9bb85504faa1ab438237199d4cce5f622761507b8f6a6", size = 211537, upload-time = "2026-04-02T09:26:58.843Z" }, - { url = "https://files.pythonhosted.org/packages/80/0f/088cbb3020d44428964a6c97fe1edfb1b9550396bf6d278330281e8b709c/charset_normalizer-3.4.7-cp313-cp313-musllinux_1_2_s390x.whl", hash = "sha256:3dedcc22d73ec993f42055eff4fcfed9318d1eeb9a6606c55892a26964964e48", size = 226176, upload-time = "2026-04-02T09:27:00.437Z" }, - { url = "https://files.pythonhosted.org/packages/6a/9f/130394f9bbe06f4f63e22641d32fc9b202b7e251c9aef4db044324dac493/charset_normalizer-3.4.7-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:64f02c6841d7d83f832cd97ccf8eb8a906d06eb95d5276069175c696b024b60a", size = 217723, upload-time = "2026-04-02T09:27:02.021Z" }, - { url = "https://files.pythonhosted.org/packages/73/55/c469897448a06e49f8fa03f6caae97074fde823f432a98f979cc42b90e69/charset_normalizer-3.4.7-cp313-cp313-win32.whl", hash = "sha256:4042d5c8f957e15221d423ba781e85d553722fc4113f523f2feb7b188cc34c5e", size = 148085, upload-time = "2026-04-02T09:27:03.192Z" }, - { url = "https://files.pythonhosted.org/packages/5d/78/1b74c5bbb3f99b77a1715c91b3e0b5bdb6fe302d95ace4f5b1bec37b0167/charset_normalizer-3.4.7-cp313-cp313-win_amd64.whl", hash = "sha256:3946fa46a0cf3e4c8cb1cc52f56bb536310d34f25f01ca9b6c16afa767dab110", size = 158819, upload-time = "2026-04-02T09:27:04.454Z" }, - { url = "https://files.pythonhosted.org/packages/68/86/46bd42279d323deb8687c4a5a811fd548cb7d1de10cf6535d099877a9a9f/charset_normalizer-3.4.7-cp313-cp313-win_arm64.whl", hash = "sha256:80d04837f55fc81da168b98de4f4b797ef007fc8a79ab71c6ec9bc4dd662b15b", size = 147915, upload-time = "2026-04-02T09:27:05.971Z" }, { url = "https://files.pythonhosted.org/packages/97/c8/c67cb8c70e19ef1960b97b22ed2a1567711de46c4ddf19799923adc836c2/charset_normalizer-3.4.7-cp314-cp314-macosx_10_15_universal2.whl", hash = "sha256:c36c333c39be2dbca264d7803333c896ab8fa7d4d6f0ab7edb7dfd7aea6e98c0", size = 309234, upload-time = "2026-04-02T09:27:07.194Z" }, { url = "https://files.pythonhosted.org/packages/99/85/c091fdee33f20de70d6c8b522743b6f831a2f1cd3ff86de4c6a827c48a76/charset_normalizer-3.4.7-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:1c2aed2e5e41f24ea8ef1590b8e848a79b56f3a5564a65ceec43c9d692dc7d8a", size = 208042, upload-time = "2026-04-02T09:27:08.749Z" }, { url = "https://files.pythonhosted.org/packages/87/1c/ab2ce611b984d2fd5d86a5a8a19c1ae26acac6bad967da4967562c75114d/charset_normalizer-3.4.7-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:54523e136b8948060c0fa0bc7b1b50c32c186f2fceee897a495406bb6e311d2b", size = 228706, upload-time = "2026-04-02T09:27:09.951Z" }, @@ -635,50 +442,6 @@ dependencies = [ ] sdist = { url = "https://files.pythonhosted.org/packages/58/01/1253e6698a07380cd31a736d248a3f2a50a7c88779a1813da27503cadc2a/contourpy-1.3.3.tar.gz", hash = "sha256:083e12155b210502d0bca491432bb04d56dc3432f95a979b429f2848c3dbe880", size = 13466174, upload-time = "2025-07-26T12:03:12.549Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/91/2e/c4390a31919d8a78b90e8ecf87cd4b4c4f05a5b48d05ec17db8e5404c6f4/contourpy-1.3.3-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:709a48ef9a690e1343202916450bc48b9e51c049b089c7f79a267b46cffcdaa1", size = 288773, upload-time = "2025-07-26T12:01:02.277Z" }, - { url = "https://files.pythonhosted.org/packages/0d/44/c4b0b6095fef4dc9c420e041799591e3b63e9619e3044f7f4f6c21c0ab24/contourpy-1.3.3-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:23416f38bfd74d5d28ab8429cc4d63fa67d5068bd711a85edb1c3fb0c3e2f381", size = 270149, upload-time = "2025-07-26T12:01:04.072Z" }, - { url = "https://files.pythonhosted.org/packages/30/2e/dd4ced42fefac8470661d7cb7e264808425e6c5d56d175291e93890cce09/contourpy-1.3.3-cp311-cp311-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:929ddf8c4c7f348e4c0a5a3a714b5c8542ffaa8c22954862a46ca1813b667ee7", size = 329222, upload-time = "2025-07-26T12:01:05.688Z" }, - { url = "https://files.pythonhosted.org/packages/f2/74/cc6ec2548e3d276c71389ea4802a774b7aa3558223b7bade3f25787fafc2/contourpy-1.3.3-cp311-cp311-manylinux_2_26_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:9e999574eddae35f1312c2b4b717b7885d4edd6cb46700e04f7f02db454e67c1", size = 377234, upload-time = "2025-07-26T12:01:07.054Z" }, - { url = "https://files.pythonhosted.org/packages/03/b3/64ef723029f917410f75c09da54254c5f9ea90ef89b143ccadb09df14c15/contourpy-1.3.3-cp311-cp311-manylinux_2_26_s390x.manylinux_2_28_s390x.whl", hash = "sha256:0bf67e0e3f482cb69779dd3061b534eb35ac9b17f163d851e2a547d56dba0a3a", size = 380555, upload-time = "2025-07-26T12:01:08.801Z" }, - { url = "https://files.pythonhosted.org/packages/5f/4b/6157f24ca425b89fe2eb7e7be642375711ab671135be21e6faa100f7448c/contourpy-1.3.3-cp311-cp311-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:51e79c1f7470158e838808d4a996fa9bac72c498e93d8ebe5119bc1e6becb0db", size = 355238, upload-time = "2025-07-26T12:01:10.319Z" }, - { url = "https://files.pythonhosted.org/packages/98/56/f914f0dd678480708a04cfd2206e7c382533249bc5001eb9f58aa693e200/contourpy-1.3.3-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:598c3aaece21c503615fd59c92a3598b428b2f01bfb4b8ca9c4edeecc2438620", size = 1326218, upload-time = "2025-07-26T12:01:12.659Z" }, - { url = "https://files.pythonhosted.org/packages/fb/d7/4a972334a0c971acd5172389671113ae82aa7527073980c38d5868ff1161/contourpy-1.3.3-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:322ab1c99b008dad206d406bb61d014cf0174df491ae9d9d0fac6a6fda4f977f", size = 1392867, upload-time = "2025-07-26T12:01:15.533Z" }, - { url = "https://files.pythonhosted.org/packages/75/3e/f2cc6cd56dc8cff46b1a56232eabc6feea52720083ea71ab15523daab796/contourpy-1.3.3-cp311-cp311-win32.whl", hash = "sha256:fd907ae12cd483cd83e414b12941c632a969171bf90fc937d0c9f268a31cafff", size = 183677, upload-time = "2025-07-26T12:01:17.088Z" }, - { url = "https://files.pythonhosted.org/packages/98/4b/9bd370b004b5c9d8045c6c33cf65bae018b27aca550a3f657cdc99acdbd8/contourpy-1.3.3-cp311-cp311-win_amd64.whl", hash = "sha256:3519428f6be58431c56581f1694ba8e50626f2dd550af225f82fb5f5814d2a42", size = 225234, upload-time = "2025-07-26T12:01:18.256Z" }, - { url = "https://files.pythonhosted.org/packages/d9/b6/71771e02c2e004450c12b1120a5f488cad2e4d5b590b1af8bad060360fe4/contourpy-1.3.3-cp311-cp311-win_arm64.whl", hash = "sha256:15ff10bfada4bf92ec8b31c62bf7c1834c244019b4a33095a68000d7075df470", size = 193123, upload-time = "2025-07-26T12:01:19.848Z" }, - { url = "https://files.pythonhosted.org/packages/be/45/adfee365d9ea3d853550b2e735f9d66366701c65db7855cd07621732ccfc/contourpy-1.3.3-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:b08a32ea2f8e42cf1d4be3169a98dd4be32bafe4f22b6c4cb4ba810fa9e5d2cb", size = 293419, upload-time = "2025-07-26T12:01:21.16Z" }, - { url = "https://files.pythonhosted.org/packages/53/3e/405b59cfa13021a56bba395a6b3aca8cec012b45bf177b0eaf7a202cde2c/contourpy-1.3.3-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:556dba8fb6f5d8742f2923fe9457dbdd51e1049c4a43fd3986a0b14a1d815fc6", size = 273979, upload-time = "2025-07-26T12:01:22.448Z" }, - { url = "https://files.pythonhosted.org/packages/d4/1c/a12359b9b2ca3a845e8f7f9ac08bdf776114eb931392fcad91743e2ea17b/contourpy-1.3.3-cp312-cp312-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:92d9abc807cf7d0e047b95ca5d957cf4792fcd04e920ca70d48add15c1a90ea7", size = 332653, upload-time = "2025-07-26T12:01:24.155Z" }, - { url = "https://files.pythonhosted.org/packages/63/12/897aeebfb475b7748ea67b61e045accdfcf0d971f8a588b67108ed7f5512/contourpy-1.3.3-cp312-cp312-manylinux_2_26_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:b2e8faa0ed68cb29af51edd8e24798bb661eac3bd9f65420c1887b6ca89987c8", size = 379536, upload-time = "2025-07-26T12:01:25.91Z" }, - { url = "https://files.pythonhosted.org/packages/43/8a/a8c584b82deb248930ce069e71576fc09bd7174bbd35183b7943fb1064fd/contourpy-1.3.3-cp312-cp312-manylinux_2_26_s390x.manylinux_2_28_s390x.whl", hash = "sha256:626d60935cf668e70a5ce6ff184fd713e9683fb458898e4249b63be9e28286ea", size = 384397, upload-time = "2025-07-26T12:01:27.152Z" }, - { url = "https://files.pythonhosted.org/packages/cc/8f/ec6289987824b29529d0dfda0d74a07cec60e54b9c92f3c9da4c0ac732de/contourpy-1.3.3-cp312-cp312-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:4d00e655fcef08aba35ec9610536bfe90267d7ab5ba944f7032549c55a146da1", size = 362601, upload-time = "2025-07-26T12:01:28.808Z" }, - { url = "https://files.pythonhosted.org/packages/05/0a/a3fe3be3ee2dceb3e615ebb4df97ae6f3828aa915d3e10549ce016302bd1/contourpy-1.3.3-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:451e71b5a7d597379ef572de31eeb909a87246974d960049a9848c3bc6c41bf7", size = 1331288, upload-time = "2025-07-26T12:01:31.198Z" }, - { url = "https://files.pythonhosted.org/packages/33/1d/acad9bd4e97f13f3e2b18a3977fe1b4a37ecf3d38d815333980c6c72e963/contourpy-1.3.3-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:459c1f020cd59fcfe6650180678a9993932d80d44ccde1fa1868977438f0b411", size = 1403386, upload-time = "2025-07-26T12:01:33.947Z" }, - { url = "https://files.pythonhosted.org/packages/cf/8f/5847f44a7fddf859704217a99a23a4f6417b10e5ab1256a179264561540e/contourpy-1.3.3-cp312-cp312-win32.whl", hash = "sha256:023b44101dfe49d7d53932be418477dba359649246075c996866106da069af69", size = 185018, upload-time = "2025-07-26T12:01:35.64Z" }, - { url = "https://files.pythonhosted.org/packages/19/e8/6026ed58a64563186a9ee3f29f41261fd1828f527dd93d33b60feca63352/contourpy-1.3.3-cp312-cp312-win_amd64.whl", hash = "sha256:8153b8bfc11e1e4d75bcb0bff1db232f9e10b274e0929de9d608027e0d34ff8b", size = 226567, upload-time = "2025-07-26T12:01:36.804Z" }, - { url = "https://files.pythonhosted.org/packages/d1/e2/f05240d2c39a1ed228d8328a78b6f44cd695f7ef47beb3e684cf93604f86/contourpy-1.3.3-cp312-cp312-win_arm64.whl", hash = "sha256:07ce5ed73ecdc4a03ffe3e1b3e3c1166db35ae7584be76f65dbbe28a7791b0cc", size = 193655, upload-time = "2025-07-26T12:01:37.999Z" }, - { url = "https://files.pythonhosted.org/packages/68/35/0167aad910bbdb9599272bd96d01a9ec6852f36b9455cf2ca67bd4cc2d23/contourpy-1.3.3-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:177fb367556747a686509d6fef71d221a4b198a3905fe824430e5ea0fda54eb5", size = 293257, upload-time = "2025-07-26T12:01:39.367Z" }, - { url = "https://files.pythonhosted.org/packages/96/e4/7adcd9c8362745b2210728f209bfbcf7d91ba868a2c5f40d8b58f54c509b/contourpy-1.3.3-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:d002b6f00d73d69333dac9d0b8d5e84d9724ff9ef044fd63c5986e62b7c9e1b1", size = 274034, upload-time = "2025-07-26T12:01:40.645Z" }, - { url = "https://files.pythonhosted.org/packages/73/23/90e31ceeed1de63058a02cb04b12f2de4b40e3bef5e082a7c18d9c8ae281/contourpy-1.3.3-cp313-cp313-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:348ac1f5d4f1d66d3322420f01d42e43122f43616e0f194fc1c9f5d830c5b286", size = 334672, upload-time = "2025-07-26T12:01:41.942Z" }, - { url = "https://files.pythonhosted.org/packages/ed/93/b43d8acbe67392e659e1d984700e79eb67e2acb2bd7f62012b583a7f1b55/contourpy-1.3.3-cp313-cp313-manylinux_2_26_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:655456777ff65c2c548b7c454af9c6f33f16c8884f11083244b5819cc214f1b5", size = 381234, upload-time = "2025-07-26T12:01:43.499Z" }, - { url = "https://files.pythonhosted.org/packages/46/3b/bec82a3ea06f66711520f75a40c8fc0b113b2a75edb36aa633eb11c4f50f/contourpy-1.3.3-cp313-cp313-manylinux_2_26_s390x.manylinux_2_28_s390x.whl", hash = "sha256:644a6853d15b2512d67881586bd03f462c7ab755db95f16f14d7e238f2852c67", size = 385169, upload-time = "2025-07-26T12:01:45.219Z" }, - { url = "https://files.pythonhosted.org/packages/4b/32/e0f13a1c5b0f8572d0ec6ae2f6c677b7991fafd95da523159c19eff0696a/contourpy-1.3.3-cp313-cp313-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:4debd64f124ca62069f313a9cb86656ff087786016d76927ae2cf37846b006c9", size = 362859, upload-time = "2025-07-26T12:01:46.519Z" }, - { url = "https://files.pythonhosted.org/packages/33/71/e2a7945b7de4e58af42d708a219f3b2f4cff7386e6b6ab0a0fa0033c49a9/contourpy-1.3.3-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:a15459b0f4615b00bbd1e91f1b9e19b7e63aea7483d03d804186f278c0af2659", size = 1332062, upload-time = "2025-07-26T12:01:48.964Z" }, - { url = "https://files.pythonhosted.org/packages/12/fc/4e87ac754220ccc0e807284f88e943d6d43b43843614f0a8afa469801db0/contourpy-1.3.3-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:ca0fdcd73925568ca027e0b17ab07aad764be4706d0a925b89227e447d9737b7", size = 1403932, upload-time = "2025-07-26T12:01:51.979Z" }, - { url = "https://files.pythonhosted.org/packages/a6/2e/adc197a37443f934594112222ac1aa7dc9a98faf9c3842884df9a9d8751d/contourpy-1.3.3-cp313-cp313-win32.whl", hash = "sha256:b20c7c9a3bf701366556e1b1984ed2d0cedf999903c51311417cf5f591d8c78d", size = 185024, upload-time = "2025-07-26T12:01:53.245Z" }, - { url = "https://files.pythonhosted.org/packages/18/0b/0098c214843213759692cc638fce7de5c289200a830e5035d1791d7a2338/contourpy-1.3.3-cp313-cp313-win_amd64.whl", hash = "sha256:1cadd8b8969f060ba45ed7c1b714fe69185812ab43bd6b86a9123fe8f99c3263", size = 226578, upload-time = "2025-07-26T12:01:54.422Z" }, - { url = "https://files.pythonhosted.org/packages/8a/9a/2f6024a0c5995243cd63afdeb3651c984f0d2bc727fd98066d40e141ad73/contourpy-1.3.3-cp313-cp313-win_arm64.whl", hash = "sha256:fd914713266421b7536de2bfa8181aa8c699432b6763a0ea64195ebe28bff6a9", size = 193524, upload-time = "2025-07-26T12:01:55.73Z" }, - { url = "https://files.pythonhosted.org/packages/c0/b3/f8a1a86bd3298513f500e5b1f5fd92b69896449f6cab6a146a5d52715479/contourpy-1.3.3-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:88df9880d507169449d434c293467418b9f6cbe82edd19284aa0409e7fdb933d", size = 306730, upload-time = "2025-07-26T12:01:57.051Z" }, - { url = "https://files.pythonhosted.org/packages/3f/11/4780db94ae62fc0c2053909b65dc3246bd7cecfc4f8a20d957ad43aa4ad8/contourpy-1.3.3-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:d06bb1f751ba5d417047db62bca3c8fde202b8c11fb50742ab3ab962c81e8216", size = 287897, upload-time = "2025-07-26T12:01:58.663Z" }, - { url = "https://files.pythonhosted.org/packages/ae/15/e59f5f3ffdd6f3d4daa3e47114c53daabcb18574a26c21f03dc9e4e42ff0/contourpy-1.3.3-cp313-cp313t-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:e4e6b05a45525357e382909a4c1600444e2a45b4795163d3b22669285591c1ae", size = 326751, upload-time = "2025-07-26T12:02:00.343Z" }, - { url = "https://files.pythonhosted.org/packages/0f/81/03b45cfad088e4770b1dcf72ea78d3802d04200009fb364d18a493857210/contourpy-1.3.3-cp313-cp313t-manylinux_2_26_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:ab3074b48c4e2cf1a960e6bbeb7f04566bf36b1861d5c9d4d8ac04b82e38ba20", size = 375486, upload-time = "2025-07-26T12:02:02.128Z" }, - { url = "https://files.pythonhosted.org/packages/0c/ba/49923366492ffbdd4486e970d421b289a670ae8cf539c1ea9a09822b371a/contourpy-1.3.3-cp313-cp313t-manylinux_2_26_s390x.manylinux_2_28_s390x.whl", hash = "sha256:6c3d53c796f8647d6deb1abe867daeb66dcc8a97e8455efa729516b997b8ed99", size = 388106, upload-time = "2025-07-26T12:02:03.615Z" }, - { url = "https://files.pythonhosted.org/packages/9f/52/5b00ea89525f8f143651f9f03a0df371d3cbd2fccd21ca9b768c7a6500c2/contourpy-1.3.3-cp313-cp313t-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:50ed930df7289ff2a8d7afeb9603f8289e5704755c7e5c3bbd929c90c817164b", size = 352548, upload-time = "2025-07-26T12:02:05.165Z" }, - { url = "https://files.pythonhosted.org/packages/32/1d/a209ec1a3a3452d490f6b14dd92e72280c99ae3d1e73da74f8277d4ee08f/contourpy-1.3.3-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:4feffb6537d64b84877da813a5c30f1422ea5739566abf0bd18065ac040e120a", size = 1322297, upload-time = "2025-07-26T12:02:07.379Z" }, - { url = "https://files.pythonhosted.org/packages/bc/9e/46f0e8ebdd884ca0e8877e46a3f4e633f6c9c8c4f3f6e72be3fe075994aa/contourpy-1.3.3-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:2b7e9480ffe2b0cd2e787e4df64270e3a0440d9db8dc823312e2c940c167df7e", size = 1391023, upload-time = "2025-07-26T12:02:10.171Z" }, - { url = "https://files.pythonhosted.org/packages/b9/70/f308384a3ae9cd2209e0849f33c913f658d3326900d0ff5d378d6a1422d2/contourpy-1.3.3-cp313-cp313t-win32.whl", hash = "sha256:283edd842a01e3dcd435b1c5116798d661378d83d36d337b8dde1d16a5fc9ba3", size = 196157, upload-time = "2025-07-26T12:02:11.488Z" }, - { url = "https://files.pythonhosted.org/packages/b2/dd/880f890a6663b84d9e34a6f88cded89d78f0091e0045a284427cb6b18521/contourpy-1.3.3-cp313-cp313t-win_amd64.whl", hash = "sha256:87acf5963fc2b34825e5b6b048f40e3635dd547f590b04d2ab317c2619ef7ae8", size = 240570, upload-time = "2025-07-26T12:02:12.754Z" }, - { url = "https://files.pythonhosted.org/packages/80/99/2adc7d8ffead633234817ef8e9a87115c8a11927a94478f6bb3d3f4d4f7d/contourpy-1.3.3-cp313-cp313t-win_arm64.whl", hash = "sha256:3c30273eb2a55024ff31ba7d052dde990d7d8e5450f4bbb6e913558b3d6c2301", size = 199713, upload-time = "2025-07-26T12:02:14.4Z" }, { url = "https://files.pythonhosted.org/packages/72/8b/4546f3ab60f78c514ffb7d01a0bd743f90de36f0019d1be84d0a708a580a/contourpy-1.3.3-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:fde6c716d51c04b1c25d0b90364d0be954624a0ee9d60e23e850e8d48353d07a", size = 292189, upload-time = "2025-07-26T12:02:16.095Z" }, { url = "https://files.pythonhosted.org/packages/fd/e1/3542a9cb596cadd76fcef413f19c79216e002623158befe6daa03dbfa88c/contourpy-1.3.3-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:cbedb772ed74ff5be440fa8eee9bd49f64f6e3fc09436d9c7d8f1c287b121d77", size = 273251, upload-time = "2025-07-26T12:02:17.524Z" }, { url = "https://files.pythonhosted.org/packages/b1/71/f93e1e9471d189f79d0ce2497007731c1e6bf9ef6d1d61b911430c3db4e5/contourpy-1.3.3-cp314-cp314-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:22e9b1bd7a9b1d652cd77388465dc358dafcd2e217d35552424aa4f996f524f5", size = 335810, upload-time = "2025-07-26T12:02:18.9Z" }, @@ -701,11 +464,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/93/8a/68a4ec5c55a2971213d29a9374913f7e9f18581945a7a31d1a39b5d2dfe5/contourpy-1.3.3-cp314-cp314t-win32.whl", hash = "sha256:e74a9a0f5e3fff48fb5a7f2fd2b9b70a3fe014a67522f79b7cca4c0c7e43c9ae", size = 202428, upload-time = "2025-07-26T12:02:48.691Z" }, { url = "https://files.pythonhosted.org/packages/fa/96/fd9f641ffedc4fa3ace923af73b9d07e869496c9cc7a459103e6e978992f/contourpy-1.3.3-cp314-cp314t-win_amd64.whl", hash = "sha256:13b68d6a62db8eafaebb8039218921399baf6e47bf85006fd8529f2a08ef33fc", size = 250331, upload-time = "2025-07-26T12:02:50.137Z" }, { url = "https://files.pythonhosted.org/packages/ae/8c/469afb6465b853afff216f9528ffda78a915ff880ed58813ba4faf4ba0b6/contourpy-1.3.3-cp314-cp314t-win_arm64.whl", hash = "sha256:b7448cb5a725bb1e35ce88771b86fba35ef418952474492cf7c764059933ff8b", size = 203831, upload-time = "2025-07-26T12:02:51.449Z" }, - { url = "https://files.pythonhosted.org/packages/a5/29/8dcfe16f0107943fa92388c23f6e05cff0ba58058c4c95b00280d4c75a14/contourpy-1.3.3-pp311-pypy311_pp73-macosx_10_15_x86_64.whl", hash = "sha256:cd5dfcaeb10f7b7f9dc8941717c6c2ade08f587be2226222c12b25f0483ed497", size = 278809, upload-time = "2025-07-26T12:02:52.74Z" }, - { url = "https://files.pythonhosted.org/packages/85/a9/8b37ef4f7dafeb335daee3c8254645ef5725be4d9c6aa70b50ec46ef2f7e/contourpy-1.3.3-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:0c1fc238306b35f246d61a1d416a627348b5cf0648648a031e14bb8705fcdfe8", size = 261593, upload-time = "2025-07-26T12:02:54.037Z" }, - { url = "https://files.pythonhosted.org/packages/0a/59/ebfb8c677c75605cc27f7122c90313fd2f375ff3c8d19a1694bda74aaa63/contourpy-1.3.3-pp311-pypy311_pp73-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:70f9aad7de812d6541d29d2bbf8feb22ff7e1c299523db288004e3157ff4674e", size = 302202, upload-time = "2025-07-26T12:02:55.947Z" }, - { url = "https://files.pythonhosted.org/packages/3c/37/21972a15834d90bfbfb009b9d004779bd5a07a0ec0234e5ba8f64d5736f4/contourpy-1.3.3-pp311-pypy311_pp73-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:5ed3657edf08512fc3fe81b510e35c2012fbd3081d2e26160f27ca28affec989", size = 329207, upload-time = "2025-07-26T12:02:57.468Z" }, - { url = "https://files.pythonhosted.org/packages/0c/58/bd257695f39d05594ca4ad60df5bcb7e32247f9951fd09a9b8edb82d1daa/contourpy-1.3.3-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:3d1a3799d62d45c18bafd41c5fa05120b96a28079f2393af559b843d1a966a77", size = 225315, upload-time = "2025-07-26T12:02:58.801Z" }, ] [[package]] @@ -714,51 +472,6 @@ version = "2.11.0" source = { registry = "https://pypi.org/simple" } sdist = { url = "https://files.pythonhosted.org/packages/14/12/34bf6e840a79130dfd0da7badfb6f7810b8fcfd60e75b0539372667b41b6/cramjam-2.11.0.tar.gz", hash = "sha256:5c82500ed91605c2d9781380b378397012e25127e89d64f460fea6aeac4389b4", size = 99100, upload-time = "2025-07-27T21:25:07.559Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/d0/89/8001f6a9b6b6e9fa69bec5319789083475d6f26d52aaea209d3ebf939284/cramjam-2.11.0-cp311-cp311-macosx_10_12_x86_64.macosx_11_0_arm64.macosx_10_12_universal2.whl", hash = "sha256:04cfa39118570e70e920a9b75c733299784b6d269733dbc791d9aaed6edd2615", size = 3559272, upload-time = "2025-07-27T21:22:01.988Z" }, - { url = "https://files.pythonhosted.org/packages/0b/f3/001d00070ca92e5fbe6aacc768e455568b0cde46b0eb944561a4ea132300/cramjam-2.11.0-cp311-cp311-macosx_10_12_x86_64.whl", hash = "sha256:66a18f68506290349a256375d7aa2f645b9f7993c10fc4cc211db214e4e61d2b", size = 1861743, upload-time = "2025-07-27T21:22:03.754Z" }, - { url = "https://files.pythonhosted.org/packages/c9/35/041a3af01bf3f6158f120070f798546d4383b962b63c35cd91dcbf193e17/cramjam-2.11.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:50e7d65533857736cd56f6509cf2c4866f28ad84dd15b5bdbf2f8a81e77fa28a", size = 1699631, upload-time = "2025-07-27T21:22:05.192Z" }, - { url = "https://files.pythonhosted.org/packages/17/eb/5358b238808abebd0c949c42635c3751204ca7cf82b29b984abe9f5e33c8/cramjam-2.11.0-cp311-cp311-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:1f71989668458fc327ac15396db28d92df22f8024bb12963929798b2729d2df5", size = 2025603, upload-time = "2025-07-27T21:22:06.726Z" }, - { url = "https://files.pythonhosted.org/packages/0e/79/19dba7c03a27408d8d11b5a7a4a7908459cfd4e6f375b73264dc66517bf6/cramjam-2.11.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ee77ac543f1e2b22af1e8be3ae589f729491b6090582340aacd77d1d757d9569", size = 1766283, upload-time = "2025-07-27T21:22:08.568Z" }, - { url = "https://files.pythonhosted.org/packages/a4/ad/40e4b3408501d886d082db465c33971655fe82573c535428e52ab905f4d0/cramjam-2.11.0-cp311-cp311-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:ad52784120e7e4d8a0b5b0517d185b8bf7f74f5e17272857ddc8951a628d9be1", size = 1854407, upload-time = "2025-07-27T21:22:10.518Z" }, - { url = "https://files.pythonhosted.org/packages/36/6e/c1b60ceb6d7ea6ff8b0bf197520aefe23f878bf2bfb0de65f2b0c2f82cd1/cramjam-2.11.0-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:4b86f8e6d9c1b3f9a75b2af870c93ceee0f1b827cd2507387540e053b35d7459", size = 2035793, upload-time = "2025-07-27T21:22:12.504Z" }, - { url = "https://files.pythonhosted.org/packages/9c/ad/32a8d5f4b1e3717787945ec6d71bd1c6e6bccba4b7e903fc0d9d4e4b08c3/cramjam-2.11.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:320d61938950d95da2371b46c406ec433e7955fae9f396c8e1bf148ffc187d11", size = 2067499, upload-time = "2025-07-27T21:22:14.067Z" }, - { url = "https://files.pythonhosted.org/packages/ff/cd/3b5a662736ea62ff7fa4c4a10a85e050bfdaad375cc53dc80427e8afe41c/cramjam-2.11.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:41eafc8c1653a35a5c7e75ad48138f9f60085cc05cd99d592e5298552d944e9f", size = 1981853, upload-time = "2025-07-27T21:22:15.908Z" }, - { url = "https://files.pythonhosted.org/packages/26/8e/1dbcfaaa7a702ee82ee683ec3a81656934dd7e04a7bc4ee854033686f98a/cramjam-2.11.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:03a7316c6bf763dfa34279335b27702321da44c455a64de58112968c0818ec4a", size = 2034514, upload-time = "2025-07-27T21:22:17.352Z" }, - { url = "https://files.pythonhosted.org/packages/50/62/f11709bfdce74af79a88b410dcb76dedc97612166e759136931bf63cfd7b/cramjam-2.11.0-cp311-cp311-musllinux_1_1_armv7l.whl", hash = "sha256:244c2ed8bd7ccbb294a2abe7ca6498db7e89d7eb5e744691dc511a7dc82e65ca", size = 2155343, upload-time = "2025-07-27T21:22:18.854Z" }, - { url = "https://files.pythonhosted.org/packages/8a/6d/3b98b61841a5376d9a9b8468ae58753a8e6cf22be9534a0fa5af4d8621cc/cramjam-2.11.0-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:405f8790bad36ce0b4bbdb964ad51507bfc7942c78447f25cb828b870a1d86a0", size = 2169367, upload-time = "2025-07-27T21:22:20.389Z" }, - { url = "https://files.pythonhosted.org/packages/11/72/bd5db5c49dbebc8b002f1c4983101b28d2e7fc9419753db1c31ec22b03ef/cramjam-2.11.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:6b1b751a5411032b08fb3ac556160229ca01c6bbe4757bb3a9a40b951ebaac23", size = 2159334, upload-time = "2025-07-27T21:22:22.254Z" }, - { url = "https://files.pythonhosted.org/packages/34/32/203c57acdb6eea727e7078b2219984e64ed4ad043c996ed56321301ba167/cramjam-2.11.0-cp311-cp311-win32.whl", hash = "sha256:5251585608778b9ac8effed544933df7ad85b4ba21ee9738b551f17798b215ac", size = 1605313, upload-time = "2025-07-27T21:22:24.126Z" }, - { url = "https://files.pythonhosted.org/packages/a9/bd/102d6deb87a8524ac11cddcd31a7612b8f20bf9b473c3c645045e3b957c7/cramjam-2.11.0-cp311-cp311-win_amd64.whl", hash = "sha256:dca88bc8b68ce6d35dafd8c4d5d59a238a56c43fa02b74c2ce5f9dfb0d1ccb46", size = 1710991, upload-time = "2025-07-27T21:22:25.661Z" }, - { url = "https://files.pythonhosted.org/packages/0b/0d/7c84c913a5fae85b773a9dcf8874390f9d68ba0fcc6630efa7ff1541b950/cramjam-2.11.0-cp312-cp312-macosx_10_12_x86_64.macosx_11_0_arm64.macosx_10_12_universal2.whl", hash = "sha256:dba5c14b8b4f73ea1e65720f5a3fe4280c1d27761238378be8274135c60bbc6e", size = 3553368, upload-time = "2025-07-27T21:22:27.162Z" }, - { url = "https://files.pythonhosted.org/packages/2b/cc/4f6d185d8a744776f53035e72831ff8eefc2354f46ab836f4bd3c4f6c138/cramjam-2.11.0-cp312-cp312-macosx_10_12_x86_64.whl", hash = "sha256:11eb40722b3fcf3e6890fba46c711bf60f8dc26360a24876c85e52d76c33b25b", size = 1860014, upload-time = "2025-07-27T21:22:28.738Z" }, - { url = "https://files.pythonhosted.org/packages/1c/a8/626c76263085c6d5ded0e71823b411e9522bfc93ba6cc59855a5869296e7/cramjam-2.11.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:aeb26e2898994b6e8319f19a4d37c481512acdcc6d30e1b5ecc9d8ec57e835cb", size = 1693512, upload-time = "2025-07-27T21:22:30.999Z" }, - { url = "https://files.pythonhosted.org/packages/e9/52/0851a16a62447532e30ba95a80e638926fdea869a34b4b5b9d0a020083ba/cramjam-2.11.0-cp312-cp312-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:4f8d82081ed7d8fe52c982bd1f06e4c7631a73fe1fb6d4b3b3f2404f87dc40fe", size = 2025285, upload-time = "2025-07-27T21:22:32.954Z" }, - { url = "https://files.pythonhosted.org/packages/98/76/122e444f59dbc216451d8e3d8282c9665dc79eaf822f5f1470066be1b695/cramjam-2.11.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:092a3ec26e0a679305018380e4f652eae1b6dfe3fc3b154ee76aa6b92221a17c", size = 1761327, upload-time = "2025-07-27T21:22:34.484Z" }, - { url = "https://files.pythonhosted.org/packages/a3/bc/3a0189aef1af2b29632c039c19a7a1b752bc21a4053582a5464183a0ad3d/cramjam-2.11.0-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:529d6d667c65fd105d10bd83d1cd3f9869f8fd6c66efac9415c1812281196a92", size = 1854075, upload-time = "2025-07-27T21:22:36.157Z" }, - { url = "https://files.pythonhosted.org/packages/2e/80/8a6343b13778ce52d94bb8d5365a30c3aa951276b1857201fe79d7e2ad25/cramjam-2.11.0-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:555eb9c90c450e0f76e27d9ff064e64a8b8c6478ab1a5594c91b7bc5c82fd9f0", size = 2032710, upload-time = "2025-07-27T21:22:38.17Z" }, - { url = "https://files.pythonhosted.org/packages/df/6b/cd1778a207c29eda10791e3dfa018b588001928086e179fc71254793c625/cramjam-2.11.0-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:5edf4c9e32493035b514cf2ba0c969d81ccb31de63bd05490cc8bfe3b431674e", size = 2068353, upload-time = "2025-07-27T21:22:39.615Z" }, - { url = "https://files.pythonhosted.org/packages/dc/f0/5c2a5cd5711032f3b191ca50cb786c17689b4a9255f9f768866e6c9f04d9/cramjam-2.11.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2fa2fe41f48c4d58d923803383b0737f048918b5a0d10390de9628bb6272b107", size = 1978104, upload-time = "2025-07-27T21:22:41.106Z" }, - { url = "https://files.pythonhosted.org/packages/f9/8b/b363a5fb2c3347504fe9a64f8d0f1e276844f0e532aa7162c061cd1ffee4/cramjam-2.11.0-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:9ca14cf1cabdb0b77d606db1bb9e9ca593b1dbd421fcaf251ec9a5431ec449f3", size = 2030779, upload-time = "2025-07-27T21:22:42.969Z" }, - { url = "https://files.pythonhosted.org/packages/78/7b/d83dad46adb6c988a74361f81ad9c5c22642be53ad88616a19baedd06243/cramjam-2.11.0-cp312-cp312-musllinux_1_1_armv7l.whl", hash = "sha256:309e95bf898829476bccf4fd2c358ec00e7ff73a12f95a3cdeeba4bb1d3683d5", size = 2155297, upload-time = "2025-07-27T21:22:44.6Z" }, - { url = "https://files.pythonhosted.org/packages/1a/be/60d9be4cb33d8740a4aa94c7513f2ef3c4eba4fd13536f086facbafade71/cramjam-2.11.0-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:86dca35d2f15ef22922411496c220f3c9e315d5512f316fe417461971cc1648d", size = 2169255, upload-time = "2025-07-27T21:22:46.534Z" }, - { url = "https://files.pythonhosted.org/packages/11/b0/4a595f01a243aec8ad272b160b161c44351190c35d98d7787919d962e9e5/cramjam-2.11.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:193c6488bd2f514cbc0bef5c18fad61a5f9c8d059dd56edf773b3b37f0e85496", size = 2155651, upload-time = "2025-07-27T21:22:48.46Z" }, - { url = "https://files.pythonhosted.org/packages/38/47/7776659aaa677046b77f527106e53ddd47373416d8fcdb1e1a881ec5dc06/cramjam-2.11.0-cp312-cp312-win32.whl", hash = "sha256:514e2c008a8b4fa823122ca3ecab896eac41d9aa0f5fc881bd6264486c204e32", size = 1603568, upload-time = "2025-07-27T21:22:50.084Z" }, - { url = "https://files.pythonhosted.org/packages/75/b1/d53002729cfd94c5844ddfaf1233c86d29f2dbfc1b764a6562c41c044199/cramjam-2.11.0-cp312-cp312-win_amd64.whl", hash = "sha256:53fed080476d5f6ad7505883ec5d1ec28ba36c2273db3b3e92d7224fe5e463db", size = 1709287, upload-time = "2025-07-27T21:22:51.534Z" }, - { url = "https://files.pythonhosted.org/packages/0a/8b/406c5dc0f8e82385519d8c299c40fd6a56d97eca3fcd6f5da8dad48de75b/cramjam-2.11.0-cp313-cp313-macosx_10_12_x86_64.macosx_11_0_arm64.macosx_10_12_universal2.whl", hash = "sha256:2c289729cc1c04e88bafa48b51082fb462b0a57dbc96494eab2be9b14dca62af", size = 3553330, upload-time = "2025-07-27T21:22:53.124Z" }, - { url = "https://files.pythonhosted.org/packages/00/ad/4186884083d6e4125b285903e17841827ab0d6d0cffc86216d27ed91e91d/cramjam-2.11.0-cp313-cp313-macosx_10_12_x86_64.whl", hash = "sha256:045201ee17147e36cf43d8ae2fa4b4836944ac672df5874579b81cf6d40f1a1f", size = 1859756, upload-time = "2025-07-27T21:22:54.821Z" }, - { url = "https://files.pythonhosted.org/packages/54/01/91b485cf76a7efef638151e8a7d35784dae2c4ff221b1aec2c083e4b106d/cramjam-2.11.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:619cd195d74c9e1d2a3ad78d63451d35379c84bd851aec552811e30842e1c67a", size = 1693609, upload-time = "2025-07-27T21:22:56.331Z" }, - { url = "https://files.pythonhosted.org/packages/cd/84/d0c80d279b2976870fc7d10f15dcb90a3c10c06566c6964b37c152694974/cramjam-2.11.0-cp313-cp313-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:6eb3ae5ab72edb2ed68bdc0f5710f0a6cad7fd778a610ec2c31ee15e32d3921e", size = 2024912, upload-time = "2025-07-27T21:22:57.915Z" }, - { url = "https://files.pythonhosted.org/packages/d6/70/88f2a5cb904281ed5d3c111b8f7d5366639817a5470f059bcd26833fc870/cramjam-2.11.0-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:df7da3f4b19e3078f9635f132d31b0a8196accb2576e3213ddd7a77f93317c20", size = 1760715, upload-time = "2025-07-27T21:22:59.528Z" }, - { url = "https://files.pythonhosted.org/packages/b2/06/cf5b02081132537d28964fb385fcef9ed9f8a017dd7d8c59d317e53ba50d/cramjam-2.11.0-cp313-cp313-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:57286b289cd557ac76c24479d8ecfb6c3d5b854cce54ccc7671f9a2f5e2a2708", size = 1853782, upload-time = "2025-07-27T21:23:01.07Z" }, - { url = "https://files.pythonhosted.org/packages/57/27/63525087ed40a53d1867021b9c4858b80cc86274ffe7225deed067d88d92/cramjam-2.11.0-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:28952fbbf8b32c0cb7fa4be9bcccfca734bf0d0989f4b509dc7f2f70ba79ae06", size = 2032354, upload-time = "2025-07-27T21:23:03.021Z" }, - { url = "https://files.pythonhosted.org/packages/c3/ef/dbba082c6ebfb6410da4dd39a64e654d7194fcfd4567f85991a83fa4ec32/cramjam-2.11.0-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:78ed2e4099812a438b545dfbca1928ec825e743cd253bc820372d6ef8c3adff4", size = 2068007, upload-time = "2025-07-27T21:23:04.526Z" }, - { url = "https://files.pythonhosted.org/packages/35/ce/d902b9358a46a086938feae83b2251720e030f06e46006f4c1fc0ac9da20/cramjam-2.11.0-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7d9aecd5c3845d415bd6c9957c93de8d93097e269137c2ecb0e5a5256374bdc8", size = 1977485, upload-time = "2025-07-27T21:23:06.058Z" }, - { url = "https://files.pythonhosted.org/packages/e8/03/982f54553244b0afcbdb2ad2065d460f0ab05a72a96896a969a1ca136a1e/cramjam-2.11.0-cp313-cp313-musllinux_1_1_aarch64.whl", hash = "sha256:362fcf4d6f5e1242a4540812455f5a594949190f6fbc04f2ffbfd7ae0266d788", size = 2030447, upload-time = "2025-07-27T21:23:07.679Z" }, - { url = "https://files.pythonhosted.org/packages/74/5f/748e54cdb665ec098ec519e23caacc65fc5ae58718183b071e33fc1c45b4/cramjam-2.11.0-cp313-cp313-musllinux_1_1_armv7l.whl", hash = "sha256:13240b3dea41b1174456cb9426843b085dc1a2bdcecd9ee2d8f65ac5703374b0", size = 2154949, upload-time = "2025-07-27T21:23:09.366Z" }, - { url = "https://files.pythonhosted.org/packages/69/81/c4e6cb06ed69db0dc81f9a8b1dc74995ebd4351e7a1877143f7031ff2700/cramjam-2.11.0-cp313-cp313-musllinux_1_1_i686.whl", hash = "sha256:c54eed83726269594b9086d827decc7d2015696e31b99bf9b69b12d9063584fe", size = 2168925, upload-time = "2025-07-27T21:23:10.976Z" }, - { url = "https://files.pythonhosted.org/packages/13/5b/966365523ce8290a08e163e3b489626c5adacdff2b3da9da1b0823dfb14e/cramjam-2.11.0-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:f8195006fdd0fc0a85b19df3d64a3ef8a240e483ae1dfc7ac6a4316019eb5df2", size = 2154950, upload-time = "2025-07-27T21:23:12.514Z" }, - { url = "https://files.pythonhosted.org/packages/3a/7d/7f8eb5c534b72b32c6eb79d74585bfee44a9a5647a14040bb65c31c2572d/cramjam-2.11.0-cp313-cp313-win32.whl", hash = "sha256:ccf30e3fe6d770a803dcdf3bb863fa44ba5dc2664d4610ba2746a3c73599f2e4", size = 1603199, upload-time = "2025-07-27T21:23:14.38Z" }, - { url = "https://files.pythonhosted.org/packages/37/05/47b5e0bf7c41a3b1cdd3b7c2147f880c93226a6bef1f5d85183040cbdece/cramjam-2.11.0-cp313-cp313-win_amd64.whl", hash = "sha256:ee36348a204f0a68b03400f4736224e9f61d1c6a1582d7f875c1ca56f0254268", size = 1708924, upload-time = "2025-07-27T21:23:16.332Z" }, { url = "https://files.pythonhosted.org/packages/de/07/a1051cdbbe6d723df16d756b97f09da7c1adb69e29695c58f0392bc12515/cramjam-2.11.0-cp314-cp314-macosx_10_12_x86_64.macosx_11_0_arm64.macosx_10_12_universal2.whl", hash = "sha256:7ba5e38c9fbd06f086f4a5a64a1a5b7b417cd3f8fc07a20e5c03651f72f36100", size = 3554141, upload-time = "2025-07-27T21:23:17.938Z" }, { url = "https://files.pythonhosted.org/packages/74/66/58487d2e16ef3d04f51a7c7f0e69823e806744b4c21101e89da4873074bc/cramjam-2.11.0-cp314-cp314-macosx_10_12_x86_64.whl", hash = "sha256:b8adeee57b41fe08e4520698a4b0bd3cc76dbd81f99424b806d70a5256a391d3", size = 1860353, upload-time = "2025-07-27T21:23:19.593Z" }, { url = "https://files.pythonhosted.org/packages/67/b4/67f6254d166ffbcc9d5fa1b56876eaa920c32ebc8e9d3d525b27296b693b/cramjam-2.11.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:b96a74fa03a636c8a7d76f700d50e9a8bc17a516d6a72d28711225d641e30968", size = 1693832, upload-time = "2025-07-27T21:23:21.185Z" }, @@ -789,12 +502,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/4b/85/3be6f0a1398f976070672be64f61895f8839857618a2d8cc0d3ab529d3dc/cramjam-2.11.0-cp314-cp314t-musllinux_1_1_x86_64.whl", hash = "sha256:d388bd5723732c3afe1dd1d181e4213cc4e1be210b080572e7d5749f6e955656", size = 2160229, upload-time = "2025-07-27T21:24:06.729Z" }, { url = "https://files.pythonhosted.org/packages/57/5e/66cfc3635511b20014bbb3f2ecf0095efb3049e9e96a4a9e478e4f3d7b78/cramjam-2.11.0-cp314-cp314t-win32.whl", hash = "sha256:0a70ff17f8e1d13f322df616505550f0f4c39eda62290acb56f069d4857037c8", size = 1610267, upload-time = "2025-07-27T21:24:08.428Z" }, { url = "https://files.pythonhosted.org/packages/ce/c6/c71e82e041c95ffe6a92ac707785500aa2a515a4339c2c7dd67e3c449249/cramjam-2.11.0-cp314-cp314t-win_amd64.whl", hash = "sha256:028400d699442d40dbda02f74158c73d05cb76587a12490d0bfedd958fd49188", size = 1713108, upload-time = "2025-07-27T21:24:10.147Z" }, - { url = "https://files.pythonhosted.org/packages/81/da/b3301962ccd6fce9fefa1ecd8ea479edaeaa38fadb1f34d5391d2587216a/cramjam-2.11.0-pp311-pypy311_pp73-macosx_10_12_x86_64.macosx_11_0_arm64.macosx_10_12_universal2.whl", hash = "sha256:52d5db3369f95b27b9f3c14d067acb0b183333613363ed34268c9e04560f997f", size = 3573546, upload-time = "2025-07-27T21:24:52.944Z" }, - { url = "https://files.pythonhosted.org/packages/b6/c2/410ddb8ad4b9dfb129284666293cb6559479645da560f7077dc19d6bee9e/cramjam-2.11.0-pp311-pypy311_pp73-macosx_10_12_x86_64.whl", hash = "sha256:4820516366d455b549a44d0e2210ee7c4575882dda677564ce79092588321d54", size = 1873654, upload-time = "2025-07-27T21:24:54.958Z" }, - { url = "https://files.pythonhosted.org/packages/d5/99/f68a443c64f7ce7aff5bed369b0aa5b2fac668fa3dfd441837e316e97a1f/cramjam-2.11.0-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:d9e5db525dc0a950a825202f84ee68d89a072479e07da98795a3469df942d301", size = 1702846, upload-time = "2025-07-27T21:24:57.124Z" }, - { url = "https://files.pythonhosted.org/packages/6c/02/0ff358ab773def1ee3383587906c453d289953171e9c92db84fdd01bf172/cramjam-2.11.0-pp311-pypy311_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:62ab4971199b2270005359cdc379bc5736071dc7c9a228581c5122d9ffaac50c", size = 1773683, upload-time = "2025-07-27T21:24:59.28Z" }, - { url = "https://files.pythonhosted.org/packages/e9/31/3298e15f87c9cf2aabdbdd90b153d8644cf989cb42a45d68a1b71e1f7aaf/cramjam-2.11.0-pp311-pypy311_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:24758375cc5414d3035ca967ebb800e8f24604ececcba3c67d6f0218201ebf2d", size = 1994136, upload-time = "2025-07-27T21:25:01.565Z" }, - { url = "https://files.pythonhosted.org/packages/c7/90/20d1747255f1ee69a412e319da51ea594c18cca195e7a4d4c713f045eff5/cramjam-2.11.0-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:6c2eea545fef1065c7dd4eda991666fd9c783fbc1d226592ccca8d8891c02f23", size = 1714982, upload-time = "2025-07-27T21:25:05.79Z" }, ] [[package]] @@ -854,12 +561,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/1e/75/a2e55f99c16fcac7b5d6c1eb19ad8e00799854d6be5ca845f9259eae1681/cryptography-48.0.0-cp39-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:a5da777e32ffed6f85a7b2b3f7c5cbc88c146bfcd0a1d7baf5fcc6c52ee35dd4", size = 4960575, upload-time = "2026-05-04T22:59:09.851Z" }, { url = "https://files.pythonhosted.org/packages/b8/23/6e6f32143ab5d8b36ca848a502c4bcd477ae75b9e1677e3530d669062578/cryptography-48.0.0-cp39-abi3-win32.whl", hash = "sha256:77a2ccbbe917f6710e05ba9adaa25fb5075620bf3ea6fb751997875aff4ae4bd", size = 3279117, upload-time = "2026-05-04T22:59:12.019Z" }, { url = "https://files.pythonhosted.org/packages/9d/9a/0fea98a70cf1749d41d738836f6349d97945f7c89433a259a6c2642eefeb/cryptography-48.0.0-cp39-abi3-win_amd64.whl", hash = "sha256:16cd65b9330583e4619939b3a3843eec1e6e789744bb01e7c7e2e62e33c239c8", size = 3792100, upload-time = "2026-05-04T22:59:14.884Z" }, - { url = "https://files.pythonhosted.org/packages/be/d2/024b5e06be9d44cb021fb0e1a03d34d63989cf56a0fe62f3dfbab695b9b4/cryptography-48.0.0-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:84cf79f0dc8b36ac5da873481716e87aef31fcfa0444f9e1d8b4b2cece142855", size = 3950391, upload-time = "2026-05-04T22:59:17.415Z" }, - { url = "https://files.pythonhosted.org/packages/bc/17/3861e17c56fa0fd37491a14a8673fdb77c57fc5693cafe745ea8b06dba75/cryptography-48.0.0-pp311-pypy311_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:fdfef35d751d510fcef5252703621574364fec16418c4a1e5e1055248401054b", size = 4637126, upload-time = "2026-05-04T22:59:20.197Z" }, - { url = "https://files.pythonhosted.org/packages/f0/0a/7e226dbff530f21480727eb764973a7bff2b912f8e15cd4f129e71b56d1d/cryptography-48.0.0-pp311-pypy311_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:0890f502ddf7d9c6426129c3f49f5c0a39278ed7cd6322c8755ffca6ee675a13", size = 4667270, upload-time = "2026-05-04T22:59:22.647Z" }, - { url = "https://files.pythonhosted.org/packages/3b/f2/5a72274ca9f1b2a8b44a662ee0bf1b435909deb473d6f97bcd035bcdbc71/cryptography-48.0.0-pp311-pypy311_pp73-manylinux_2_34_aarch64.whl", hash = "sha256:ecde28a596bead48b0cfd2a1b4416c3d43074c2d785e3a398d7ec1fc4d0f7fbb", size = 4636797, upload-time = "2026-05-04T22:59:24.912Z" }, - { url = "https://files.pythonhosted.org/packages/b4/e1/48cedb2fe63626e91ded1edad159e2a4fb8b6906c4425eb7749673077ce7/cryptography-48.0.0-pp311-pypy311_pp73-manylinux_2_34_x86_64.whl", hash = "sha256:4defde8685ae324a9eb9d818717e93b4638ef67070ac9bc15b8ca85f63048355", size = 4666800, upload-time = "2026-05-04T22:59:27.474Z" }, - { url = "https://files.pythonhosted.org/packages/a2/ca/7e8365deec19afb2b2c7be7c1c0aa8f99633b54e90c570999acda93260fc/cryptography-48.0.0-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:db63bf618e5dea46c07de12e900fe1cdd2541e6dc9dbae772a70b7d4d4765f6a", size = 3739536, upload-time = "2026-05-04T22:59:29.61Z" }, ] [[package]] @@ -907,33 +608,6 @@ dependencies = [ ] sdist = { url = "https://files.pythonhosted.org/packages/bc/d0/0690d1b88b936ab31219ca9078859316185989be0d186ff33896f3191d39/ddtrace-4.3.0.tar.gz", hash = "sha256:366bc941a20137e6f5bff22aefd6a221ca15f1b087c31bf28fce448619f443b4", size = 7085760, upload-time = "2026-01-27T20:55:27.878Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/62/92/a4335be1b8ccebca11c2fc30dbd38e7c31f20025ac5fa29c781fcf7e839f/ddtrace-4.3.0-cp311-cp311-macosx_14_0_arm64.whl", hash = "sha256:c41f5598ec26fc75a12f88131f14cf8728fbef3a5077ab3092b66f65a56f0cfd", size = 6646276, upload-time = "2026-01-27T20:53:26.621Z" }, - { url = "https://files.pythonhosted.org/packages/79/04/c82807bfe651fb2fe04cb3a097a8988638a8ffe31f38a34f7a9cdd8ed227/ddtrace-4.3.0-cp311-cp311-macosx_14_0_x86_64.whl", hash = "sha256:0971a52d0474a1a5c417aa628ccb81a3f530acc7b054cd2040740bc200193068", size = 7046186, upload-time = "2026-01-27T20:53:28.498Z" }, - { url = "https://files.pythonhosted.org/packages/fc/d6/5091e3dcb0e3b15f11165faab3c0cfff91d1fe69b1adf34843246e04c891/ddtrace-4.3.0-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:2a5e2903d6634adf685939ca7ede2aa900a1315911f14e3081399e3dcad32b15", size = 7728637, upload-time = "2026-01-27T20:53:30.407Z" }, - { url = "https://files.pythonhosted.org/packages/d6/e0/c5438aca0281bd511260d55d361fca9904d988896baee2e09eb456ca3c42/ddtrace-4.3.0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:ce7adf94dc12edff5ddecd9a0ec751f99148578798142bb228f7b3713505d1f7", size = 8008249, upload-time = "2026-01-27T20:53:32.623Z" }, - { url = "https://files.pythonhosted.org/packages/0a/49/aa3452696bed00632ca9dd4a99bf1fca9342c0a386b2ff4e3fbc683cd9f6/ddtrace-4.3.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:6bb56dfda0b69e324d8b90efdff6b506cd86cadbb336d7e265deb11886eb1322", size = 8736182, upload-time = "2026-01-27T20:53:35.08Z" }, - { url = "https://files.pythonhosted.org/packages/48/bf/7d1da3d02b7ff0d10fea86494a60cc0720e33d4f1a85e5fa1274e9b03a64/ddtrace-4.3.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:a9ba79cb934286d43ad4314269af5c63057d63aadcf1a9d201feb2a02077e98c", size = 9066094, upload-time = "2026-01-27T20:53:37.646Z" }, - { url = "https://files.pythonhosted.org/packages/df/81/e814aedec968a43c6408054eef53b5a5d2ff54d80db2199b60478aa671d9/ddtrace-4.3.0-cp311-cp311-win32.whl", hash = "sha256:557775da26e9cb3d4b5e742028a566a6910f85cfc23b111d265e44358dd32860", size = 5114320, upload-time = "2026-01-27T20:53:39.924Z" }, - { url = "https://files.pythonhosted.org/packages/a3/7d/c891543ff0f581e6ae63a5c12b9b521ee2485ff9837a7bbe5aa13e534f9c/ddtrace-4.3.0-cp311-cp311-win_amd64.whl", hash = "sha256:456cc48ac86736452a803f914ebe7f73e32504c2490ef0ae4973e84b6a9571fc", size = 5652238, upload-time = "2026-01-27T20:53:42.351Z" }, - { url = "https://files.pythonhosted.org/packages/66/cb/71f7f34a63ebbfb86fd7511d900d2b4f3b94e4d1a6fb81b2e0f41e84918b/ddtrace-4.3.0-cp311-cp311-win_arm64.whl", hash = "sha256:f7d606f5510ef0ffcc1d42ecc5ecb8700060d6e456148d46d079b47e7f55f863", size = 5368001, upload-time = "2026-01-27T20:53:44.443Z" }, - { url = "https://files.pythonhosted.org/packages/65/21/7ad3a13b5cb21b951d399995e587c04ae72bd7e09741a535221b31aa943a/ddtrace-4.3.0-cp312-cp312-macosx_14_0_arm64.whl", hash = "sha256:ef5ae88f516654b37fcc8fc7154ffa9d1e8eb8b3be6d6f08f87f681e35937ef7", size = 6903861, upload-time = "2026-01-27T20:53:46.975Z" }, - { url = "https://files.pythonhosted.org/packages/fa/f2/837756c6ca7f45a6e7f9bcea31ae31df8707604a7aec09b4fec810abf01b/ddtrace-4.3.0-cp312-cp312-macosx_14_0_x86_64.whl", hash = "sha256:7c4ca32b1a92a1ef116711e20bbd1cdf65056be9a64585fc41354dacf4c7ca33", size = 7327605, upload-time = "2026-01-27T20:53:49.077Z" }, - { url = "https://files.pythonhosted.org/packages/c8/8f/01a89d5e5495fd804af898e6d7d867dd7345fc6303c4e78e556a8345f34a/ddtrace-4.3.0-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:feaf7921c3795ae1dd0f12640d3f8ec5f9ac19697b55a54876e90ec4330c628a", size = 7722066, upload-time = "2026-01-27T20:53:51.752Z" }, - { url = "https://files.pythonhosted.org/packages/a6/21/4999eebbbfd3d36edaeaafa270b8f3cf592417d92a5ea7b752e61af4b869/ddtrace-4.3.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:0b527de8ff70105909e2d99dd81374162158a280f562dea244a1c36939ea0d8a", size = 8009324, upload-time = "2026-01-27T20:53:53.968Z" }, - { url = "https://files.pythonhosted.org/packages/8d/f8/b4c2c844912c9ce54ec3d78efcc83186a39f80a9145d008fd7323eefea96/ddtrace-4.3.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:4c35c3b42cd304056c65d95f4b63a0580aa4ff29efb18965f7ed2fa3ad8e4374", size = 8733732, upload-time = "2026-01-27T20:53:56.607Z" }, - { url = "https://files.pythonhosted.org/packages/10/ec/0a756896dd47098178e96b43ce198b90def45ff5b94c4166bbb6b8795c60/ddtrace-4.3.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:9aa6e2014ad16a5a7c28cc0ff3eb4f4cd2396dc7d9e811db7f778b9d75a09268", size = 9073645, upload-time = "2026-01-27T20:53:59.498Z" }, - { url = "https://files.pythonhosted.org/packages/42/89/4bc918d8f5792d58e5eaa3c67fe18b22cfd9c5bc5eeb334c5c3c6d9e44b7/ddtrace-4.3.0-cp312-cp312-win32.whl", hash = "sha256:cd64c7cebcb58c32e5e8e6bfda11ba50b7f0e2c74d54ecdd8c945eaa2a92f6f8", size = 5110045, upload-time = "2026-01-27T20:54:01.898Z" }, - { url = "https://files.pythonhosted.org/packages/2c/9b/cfbb354d991b9be5fea026ad2fee918bb8da1ff649635e7de05e64458460/ddtrace-4.3.0-cp312-cp312-win_amd64.whl", hash = "sha256:4bf62878d3a0f20dc2645aff7698bbe8f57a6f39008279601f2af95f4f3d0ee4", size = 5645713, upload-time = "2026-01-27T20:54:04.305Z" }, - { url = "https://files.pythonhosted.org/packages/cb/f5/e44a66e21f0bb5ba3cdc34a22e244badc7ad92ef01e60410a22794b92ebf/ddtrace-4.3.0-cp312-cp312-win_arm64.whl", hash = "sha256:418ce112d1c85786e589ecd22a6f2dedf1ecb8efb21a703b18dfb5d2b6182a34", size = 5360067, upload-time = "2026-01-27T20:54:06.458Z" }, - { url = "https://files.pythonhosted.org/packages/bb/79/92140484e68bf202431b2644616c97e726180e396f2818889ce22d9ec7a7/ddtrace-4.3.0-cp313-cp313-macosx_14_0_arm64.whl", hash = "sha256:8c84bd599d661ed6424460e3c6111065c5a7c978d28f5d47cb06369ea58e6a07", size = 6639422, upload-time = "2026-01-27T20:54:09.134Z" }, - { url = "https://files.pythonhosted.org/packages/b9/c7/d95dbc4953ad5d4c1d424547e5df397098429bf0e147968e943d6e0f3623/ddtrace-4.3.0-cp313-cp313-macosx_14_0_x86_64.whl", hash = "sha256:e1a8227d354d044b737def7711c275085e9b765c4d93f84e522d93675e03c318", size = 7045829, upload-time = "2026-01-27T20:54:12.636Z" }, - { url = "https://files.pythonhosted.org/packages/23/3d/714a0875ade37153da0450b07a2bd0eb810ad0f2078c8876ea4af75881cf/ddtrace-4.3.0-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:c4cd4d89339adf4a9c114282d03f4db498b0092d56bee145ddb99033fb51be18", size = 7714579, upload-time = "2026-01-27T20:54:14.812Z" }, - { url = "https://files.pythonhosted.org/packages/2a/1c/f89d6c7de4640239618cae7df96c46099e5ba53168ce5641b40cd302092b/ddtrace-4.3.0-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:6c9ec118e2a41da593ec2d2f6365ba104aaf3b46296e0a4c30556aed26615ac5", size = 7998564, upload-time = "2026-01-27T20:54:18.854Z" }, - { url = "https://files.pythonhosted.org/packages/b7/43/f22586a3851b674c4e61cd630682fa47f5a724fb7686f87a415d93f355fd/ddtrace-4.3.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:aa168e581431a3b3ee9c04d76922cae2f3fdfb4520927add5a844e7e2ebb807e", size = 8729607, upload-time = "2026-01-27T20:54:21.319Z" }, - { url = "https://files.pythonhosted.org/packages/02/9d/b1a92066fc2668f715ca77292d73ae1554290edb5ffac710dbc84aa1777a/ddtrace-4.3.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:eed721dcd5cf1f4f4309a28efa5e1cb7d7da129fd51a3e093422fe064bd451f1", size = 9065926, upload-time = "2026-01-27T20:54:24.447Z" }, - { url = "https://files.pythonhosted.org/packages/72/92/6bf49559d2fe06589d7cc967085fc878ec652172a8d203ed22f8c6ab71e0/ddtrace-4.3.0-cp313-cp313-win32.whl", hash = "sha256:9917c49b33f32c524f74813cb03461c207324711b0a2d359e3a3822181cb5643", size = 5107720, upload-time = "2026-01-27T20:54:27.614Z" }, - { url = "https://files.pythonhosted.org/packages/2d/94/37a07b2576dfbbef5034e595be385ab325eebfd735e0eda80cf5ae0facd1/ddtrace-4.3.0-cp313-cp313-win_amd64.whl", hash = "sha256:ea86989b93af5d415ba1457d3c363a59665a907807a51072b43abf5901872078", size = 5643119, upload-time = "2026-01-27T20:54:31.537Z" }, - { url = "https://files.pythonhosted.org/packages/c6/1d/d4466708a5ace94a655f3af804c1a666bc05b6463c5892e561eca0497922/ddtrace-4.3.0-cp313-cp313-win_arm64.whl", hash = "sha256:e983bc15b5eabd9e25b02617702e8621c014c71dc123a117079d3ced29446433", size = 5357966, upload-time = "2026-01-27T20:54:35.411Z" }, { url = "https://files.pythonhosted.org/packages/82/75/10b07479800a5a8947fd0e79001b009bded2a17ea5af96865d677eb91a98/ddtrace-4.3.0-cp314-cp314-macosx_14_0_arm64.whl", hash = "sha256:e26eb6de7eda425d75f5a1f55e55ad2d13e56f51b43c4b656478367a6692e0bd", size = 6904866, upload-time = "2026-01-27T20:54:38.633Z" }, { url = "https://files.pythonhosted.org/packages/0e/b2/37f8cf8f57d17f350d2ab86ee814fc5b6c600d0ea2ee2ea8f96be1178cd0/ddtrace-4.3.0-cp314-cp314-macosx_14_0_x86_64.whl", hash = "sha256:f7ce739a6ef9b4d210a746327d377234b1996080028eddbe9c6a1f35193c348e", size = 7329967, upload-time = "2026-01-27T20:54:41.296Z" }, { url = "https://files.pythonhosted.org/packages/19/c7/61b9a857f7b43234b896fd5e80d994f9efa007b0980887bf6d4d48ab6c20/ddtrace-4.3.0-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:0dff123cc9e39ff393c164198bb166270bcc826a87009af9b4f1431653aef531", size = 7721410, upload-time = "2026-01-27T20:54:43.85Z" }, @@ -951,18 +625,6 @@ version = "1.8.20" source = { registry = "https://pypi.org/simple" } sdist = { url = "https://files.pythonhosted.org/packages/e0/b7/cd8080344452e4874aae67c40d8940e2b4d47b01601a8fd9f44786c757c7/debugpy-1.8.20.tar.gz", hash = "sha256:55bc8701714969f1ab89a6d5f2f3d40c36f91b2cbe2f65d98bf8196f6a6a2c33", size = 1645207, upload-time = "2026-01-29T23:03:28.199Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/51/56/c3baf5cbe4dd77427fd9aef99fcdade259ad128feeb8a786c246adb838e5/debugpy-1.8.20-cp311-cp311-macosx_15_0_universal2.whl", hash = "sha256:eada6042ad88fa1571b74bd5402ee8b86eded7a8f7b827849761700aff171f1b", size = 2208318, upload-time = "2026-01-29T23:03:36.481Z" }, - { url = "https://files.pythonhosted.org/packages/9a/7d/4fa79a57a8e69fe0d9763e98d1110320f9ecd7f1f362572e3aafd7417c9d/debugpy-1.8.20-cp311-cp311-manylinux_2_34_x86_64.whl", hash = "sha256:7de0b7dfeedc504421032afba845ae2a7bcc32ddfb07dae2c3ca5442f821c344", size = 3171493, upload-time = "2026-01-29T23:03:37.775Z" }, - { url = "https://files.pythonhosted.org/packages/7d/f2/1e8f8affe51e12a26f3a8a8a4277d6e60aa89d0a66512f63b1e799d424a4/debugpy-1.8.20-cp311-cp311-win32.whl", hash = "sha256:773e839380cf459caf73cc533ea45ec2737a5cc184cf1b3b796cd4fd98504fec", size = 5209240, upload-time = "2026-01-29T23:03:39.109Z" }, - { url = "https://files.pythonhosted.org/packages/d5/92/1cb532e88560cbee973396254b21bece8c5d7c2ece958a67afa08c9f10dc/debugpy-1.8.20-cp311-cp311-win_amd64.whl", hash = "sha256:1f7650546e0eded1902d0f6af28f787fa1f1dbdbc97ddabaf1cd963a405930cb", size = 5233481, upload-time = "2026-01-29T23:03:40.659Z" }, - { url = "https://files.pythonhosted.org/packages/14/57/7f34f4736bfb6e00f2e4c96351b07805d83c9a7b33d28580ae01374430f7/debugpy-1.8.20-cp312-cp312-macosx_15_0_universal2.whl", hash = "sha256:4ae3135e2089905a916909ef31922b2d733d756f66d87345b3e5e52b7a55f13d", size = 2550686, upload-time = "2026-01-29T23:03:42.023Z" }, - { url = "https://files.pythonhosted.org/packages/ab/78/b193a3975ca34458f6f0e24aaf5c3e3da72f5401f6054c0dfd004b41726f/debugpy-1.8.20-cp312-cp312-manylinux_2_34_x86_64.whl", hash = "sha256:88f47850a4284b88bd2bfee1f26132147d5d504e4e86c22485dfa44b97e19b4b", size = 4310588, upload-time = "2026-01-29T23:03:43.314Z" }, - { url = "https://files.pythonhosted.org/packages/c1/55/f14deb95eaf4f30f07ef4b90a8590fc05d9e04df85ee379712f6fb6736d7/debugpy-1.8.20-cp312-cp312-win32.whl", hash = "sha256:4057ac68f892064e5f98209ab582abfee3b543fb55d2e87610ddc133a954d390", size = 5331372, upload-time = "2026-01-29T23:03:45.526Z" }, - { url = "https://files.pythonhosted.org/packages/a1/39/2bef246368bd42f9bd7cba99844542b74b84dacbdbea0833e610f384fee8/debugpy-1.8.20-cp312-cp312-win_amd64.whl", hash = "sha256:a1a8f851e7cf171330679ef6997e9c579ef6dd33c9098458bd9986a0f4ca52e3", size = 5372835, upload-time = "2026-01-29T23:03:47.245Z" }, - { url = "https://files.pythonhosted.org/packages/15/e2/fc500524cc6f104a9d049abc85a0a8b3f0d14c0a39b9c140511c61e5b40b/debugpy-1.8.20-cp313-cp313-macosx_15_0_universal2.whl", hash = "sha256:5dff4bb27027821fdfcc9e8f87309a28988231165147c31730128b1c983e282a", size = 2539560, upload-time = "2026-01-29T23:03:48.738Z" }, - { url = "https://files.pythonhosted.org/packages/90/83/fb33dcea789ed6018f8da20c5a9bc9d82adc65c0c990faed43f7c955da46/debugpy-1.8.20-cp313-cp313-manylinux_2_34_x86_64.whl", hash = "sha256:84562982dd7cf5ebebfdea667ca20a064e096099997b175fe204e86817f64eaf", size = 4293272, upload-time = "2026-01-29T23:03:50.169Z" }, - { url = "https://files.pythonhosted.org/packages/a6/25/b1e4a01bfb824d79a6af24b99ef291e24189080c93576dfd9b1a2815cd0f/debugpy-1.8.20-cp313-cp313-win32.whl", hash = "sha256:da11dea6447b2cadbf8ce2bec59ecea87cc18d2c574980f643f2d2dfe4862393", size = 5331208, upload-time = "2026-01-29T23:03:51.547Z" }, - { url = "https://files.pythonhosted.org/packages/13/f7/a0b368ce54ffff9e9028c098bd2d28cfc5b54f9f6c186929083d4c60ba58/debugpy-1.8.20-cp313-cp313-win_amd64.whl", hash = "sha256:eb506e45943cab2efb7c6eafdd65b842f3ae779f020c82221f55aca9de135ed7", size = 5372930, upload-time = "2026-01-29T23:03:53.585Z" }, { url = "https://files.pythonhosted.org/packages/33/2e/f6cb9a8a13f5058f0a20fe09711a7b726232cd5a78c6a7c05b2ec726cff9/debugpy-1.8.20-cp314-cp314-macosx_15_0_universal2.whl", hash = "sha256:9c74df62fc064cd5e5eaca1353a3ef5a5d50da5eb8058fcef63106f7bebe6173", size = 2538066, upload-time = "2026-01-29T23:03:54.999Z" }, { url = "https://files.pythonhosted.org/packages/c5/56/6ddca50b53624e1ca3ce1d1e49ff22db46c47ea5fb4c0cc5c9b90a616364/debugpy-1.8.20-cp314-cp314-manylinux_2_34_x86_64.whl", hash = "sha256:077a7447589ee9bc1ff0cdf443566d0ecf540ac8aa7333b775ebcb8ce9f4ecad", size = 4269425, upload-time = "2026-01-29T23:03:56.518Z" }, { url = "https://files.pythonhosted.org/packages/c5/d9/d64199c14a0d4c476df46c82470a3ce45c8d183a6796cfb5e66533b3663c/debugpy-1.8.20-cp314-cp314-win32.whl", hash = "sha256:352036a99dd35053b37b7803f748efc456076f929c6a895556932eaf2d23b07f", size = 5331407, upload-time = "2026-01-29T23:03:58.481Z" }, @@ -1076,41 +738,6 @@ name = "fastnumbers" version = "5.1.1" source = { registry = "https://pypi.org/simple" } sdist = { url = "https://files.pythonhosted.org/packages/75/bf/c69642300a98e8b61047fa17ee7c925a8e65a12e194e98dda7ec1eefaf4b/fastnumbers-5.1.1.tar.gz", hash = "sha256:183fa021cdc052edaeede5c23e3086461deb7562b567614edf71b29515f5fa4b", size = 193827, upload-time = "2024-12-15T07:28:51.124Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/f9/2d/79b651d72295541d06f9f413767a901726e7de7748f908db6d5962f2afbe/fastnumbers-5.1.1-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:ac49a019283a737b887f5fa50e8d1670cfd2f685256a7f31a8da33b70df701e1", size = 304396, upload-time = "2024-12-15T07:26:49.733Z" }, - { url = "https://files.pythonhosted.org/packages/ee/41/b41ca8b75a0760b81b9a5e859ea1c366f644e119615fe3feb1e30ade1652/fastnumbers-5.1.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:a00d105ba2484360d39cf514a16e97e1f66cf053fcc7afd16f95dbbb6de8ed9d", size = 171738, upload-time = "2024-12-15T07:26:52.336Z" }, - { url = "https://files.pythonhosted.org/packages/ff/c3/bdc36067cf111cd2f84e7877e0cbdf3bed5fb179fc2f6c969e79ff9fa693/fastnumbers-5.1.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:216cb1e3f600ff91164c85379241a4f77ed7d1f8e65ffae4ccf3ef34662b9d8a", size = 170015, upload-time = "2024-12-15T07:26:55.003Z" }, - { url = "https://files.pythonhosted.org/packages/b5/6e/7235825baa8b60286c5b0ae605f778db9047be14529f44cc31159014806d/fastnumbers-5.1.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:feb3f3114a3a847f0896ca3d563bf61e3a95ebf51d2308170aed5a7aad88fec3", size = 1664356, upload-time = "2024-12-15T07:26:56.893Z" }, - { url = "https://files.pythonhosted.org/packages/de/6e/fe8c4bde25d38862e98843b50c891068865d75113b2701436a7a4f950231/fastnumbers-5.1.1-cp311-cp311-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b65dfb82b3a5cdd0ac53227b5caae47d98034ae4a8966de89e2ac58639ba14a4", size = 1686830, upload-time = "2024-12-15T07:26:59.857Z" }, - { url = "https://files.pythonhosted.org/packages/f2/37/47727d28780978ba8969524ee2e0545f74080383497574e7df17ff41a19a/fastnumbers-5.1.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:cf7e72ea226a8a1289045f5dfc86d685c2890322f754f8f8eabcb30cf2bef9f2", size = 1675741, upload-time = "2024-12-15T07:27:02.966Z" }, - { url = "https://files.pythonhosted.org/packages/11/fc/0e8da8c4692ba6a4f7d91e62bf6579fcd0fa8a72fe6f768d5244cf70f3fb/fastnumbers-5.1.1-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:18160ce6b574e230204774d12a8a00bb5868dc22bf28e445117ca26a8b9a6fff", size = 2424526, upload-time = "2024-12-15T07:27:04.638Z" }, - { url = "https://files.pythonhosted.org/packages/9c/a4/48f03bca7f8c3d326d8b1c6b1d0fc94630f12a1be414d25049272dfb62e9/fastnumbers-5.1.1-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:1681e2b37628ea5a3dc43dfc0a4e3f6eebf388d76c91f69b48e9fe1431c2d9ea", size = 2575006, upload-time = "2024-12-15T07:27:07.765Z" }, - { url = "https://files.pythonhosted.org/packages/6b/38/c5361fdf085a78d934e6d503e94fed183db436aa9958816783b0b7a2d192/fastnumbers-5.1.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:1ab4faa10b35dc3ea53d83a4107a3b338a39cf500d2f6e0a44f930ad694fa0a9", size = 2516000, upload-time = "2024-12-15T07:27:09.443Z" }, - { url = "https://files.pythonhosted.org/packages/46/16/34109c8a27e016799b2538a03184d4d59a66787432b8d5bf5d1fbc403ac5/fastnumbers-5.1.1-cp311-cp311-win32.whl", hash = "sha256:98b9da1a3565f939800b99471e1cb678744e3dd761571bc0b2b03794dd884039", size = 117636, upload-time = "2024-12-15T07:27:12.234Z" }, - { url = "https://files.pythonhosted.org/packages/a1/3a/899bf5fe59aaee646b453b106c1d0cf978574732f0650b99ba004c261059/fastnumbers-5.1.1-cp311-cp311-win_amd64.whl", hash = "sha256:62c97b9141b052ecbebee1e9fbdfa7db67685602cf847bb7620eb71e5afe18b5", size = 126010, upload-time = "2024-12-15T07:27:14.667Z" }, - { url = "https://files.pythonhosted.org/packages/bf/8c/69a7884c3584bd92daac3b923fb49a10b2ee018d7259e8f0be03ea301f96/fastnumbers-5.1.1-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:e57b377419c89c23cd411abe19b911fea3879db71733751f4dd0f4504d623325", size = 305660, upload-time = "2024-12-15T07:27:16.025Z" }, - { url = "https://files.pythonhosted.org/packages/51/27/207a1b9298380e971abd7640021b71b72fda844e5d5931e85031bc6db6b2/fastnumbers-5.1.1-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:d80ecd57144c20140383ada74c7ee0f8464940d8931c04d4bdd73917200e82ef", size = 172460, upload-time = "2024-12-15T07:27:17.431Z" }, - { url = "https://files.pythonhosted.org/packages/bf/91/8601841ee9cad8628a5386131c53891777836cc6ad678bcff90d8210bd40/fastnumbers-5.1.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:12270ace75facc55426e81e94ab81e8ac0449b78775c2255af3d4a901e90b6f3", size = 170666, upload-time = "2024-12-15T07:27:19.148Z" }, - { url = "https://files.pythonhosted.org/packages/ac/00/4a3e50b1bdf6aa3b48d78ac111b9ddf61401087b1d00249f9b16ba181eb1/fastnumbers-5.1.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:68e8e2da55134e6f3680ced0799eaad00db2ed7e31b7b12e412c7af834927d15", size = 1667289, upload-time = "2024-12-15T07:27:20.501Z" }, - { url = "https://files.pythonhosted.org/packages/fc/53/d0ecbb31cd60c0bf9ef4ba4de1f56d9665bea4a142a649aa6d9316afdc40/fastnumbers-5.1.1-cp312-cp312-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3898a65a4658c9f94e4765d0a9403e9dc2b84ce707fd464b6457c809f4ca0379", size = 1690950, upload-time = "2024-12-15T07:27:22.323Z" }, - { url = "https://files.pythonhosted.org/packages/ea/0b/a7b94e4317e18939807615e7c14072f0e307fc0ba83d1548df8e4f8f07da/fastnumbers-5.1.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:95289b099deb8b3d7083866648865d542abeee722ede0dea188809ddfb0942d1", size = 1679465, upload-time = "2024-12-15T07:27:24.42Z" }, - { url = "https://files.pythonhosted.org/packages/2b/33/efe5b3a25cb35dd6da48a06c44b22b164bd5d245ade0e85423b03cc574d7/fastnumbers-5.1.1-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:95682f60228f035ea83cb3ba102e5ca1e980cccedc7532b39e05fff93ea0ec64", size = 2435702, upload-time = "2024-12-15T07:27:27.334Z" }, - { url = "https://files.pythonhosted.org/packages/6a/43/ebf6f98789108a507b28bc1c88e0328ba6ab4f46331ffae1704141909643/fastnumbers-5.1.1-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:e9683a12e357034fb0d4cfb291bb799b16c791bb224b9c05a39dfefcfc2e673d", size = 2590379, upload-time = "2024-12-15T07:27:29.033Z" }, - { url = "https://files.pythonhosted.org/packages/a1/09/02723ada3b2e4aec94bd7f48bc6f1053a5a4157d872e4279a3fbd078219e/fastnumbers-5.1.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:c092c186d36e8d27aee8e864e03aaaf219a51ee940d4a6356964d89ce8f34058", size = 2521780, upload-time = "2024-12-15T07:27:31.227Z" }, - { url = "https://files.pythonhosted.org/packages/fd/e6/2604e241c405db3540e3e7c35d025275b560e1b6eec6f78e72cc2d220351/fastnumbers-5.1.1-cp312-cp312-win32.whl", hash = "sha256:60e9d5515dfc2898a1a6f93dac7ef3406a2b122ff37eaa732b57df3bc7c93862", size = 117125, upload-time = "2024-12-15T07:27:33.751Z" }, - { url = "https://files.pythonhosted.org/packages/53/02/f3b4ce4f9c7ae2b88a825a52dcb0a9b8b13b70bdcf5066c8598252a04acd/fastnumbers-5.1.1-cp312-cp312-win_amd64.whl", hash = "sha256:070b81b10207b2f7c3bd98c1825f3c0adb6c7e18238f851572d51c882877bc02", size = 127192, upload-time = "2024-12-15T07:27:35.454Z" }, - { url = "https://files.pythonhosted.org/packages/3d/82/c37be55714cc97d68f8430726cd4880cf8d82da316fc4cad820480a274c8/fastnumbers-5.1.1-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:7109d06161000a75d8e4a2f4eb6ed3cb19d3472f5497e64b9df70f4e8ea22090", size = 305660, upload-time = "2024-12-15T07:27:38.306Z" }, - { url = "https://files.pythonhosted.org/packages/93/00/480be84bfc962ceb3cf39058acd09cd5011de6f0496bfc5fd112455d6804/fastnumbers-5.1.1-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:544e905de42679e3e80cdfb5f0f8185b498a206d33a9365f896d8842b9544550", size = 172457, upload-time = "2024-12-15T07:27:39.764Z" }, - { url = "https://files.pythonhosted.org/packages/89/16/de7c3e2b9a604bfdb0f3a905152e64c53064022e432b46f4626c931698a0/fastnumbers-5.1.1-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:e8e40437eafef22aa5ebc80f44d0f9cdf984538b3c05f57500b24695ed63b8b2", size = 170661, upload-time = "2024-12-15T07:27:41.526Z" }, - { url = "https://files.pythonhosted.org/packages/3b/62/247856faac56f08094be27db152604c10c1419feeb8d998495d2929a8fea/fastnumbers-5.1.1-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2b1831fe49d44a91e2803db231696979e6ae1d30e67679c201b7c69cfb815a19", size = 1667006, upload-time = "2024-12-15T07:27:47.52Z" }, - { url = "https://files.pythonhosted.org/packages/4b/a7/1071c2a49c1079f57c9a647352e819e08679f6187b10ad395c1c02885587/fastnumbers-5.1.1-cp313-cp313-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:9421b79e788cc9ec9266c6cfa8306d1e17f4abf0d1c1fb173d4328cc57955b61", size = 1690719, upload-time = "2024-12-15T07:27:49.222Z" }, - { url = "https://files.pythonhosted.org/packages/2f/72/bd9e62e5b0303e1c0a9682b4de3e65b0c1a8eec2ef721fe0b26829a9879e/fastnumbers-5.1.1-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:517e91bd9fd0e664eb8a81759c79e38675a94bfac8892dbc274f7430ae5be451", size = 1679059, upload-time = "2024-12-15T07:27:51.186Z" }, - { url = "https://files.pythonhosted.org/packages/92/b1/8218c61638873d74eb7518cf4bac2d7192a328efbdc780fd8a05d91008aa/fastnumbers-5.1.1-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:4479d85f246728ea5737b28ed3730cc4dbc1002bcf788ce32f9ffcb730150fa3", size = 2436131, upload-time = "2024-12-15T07:27:54.837Z" }, - { url = "https://files.pythonhosted.org/packages/f6/2b/06e947b27ca76b4ebf30363500719f27d8cdbf4b286760e3ef941b3d1308/fastnumbers-5.1.1-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:c738099125cbb0a559a59c14165090a545a892f16db102aa1f5fb930fa1a2b13", size = 2590343, upload-time = "2024-12-15T07:27:57.974Z" }, - { url = "https://files.pythonhosted.org/packages/58/41/cf5333d1013ba5afb21b40565d1c1ed0114d97b7e0ef230659ead17b870e/fastnumbers-5.1.1-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:ca0a72d750d5d78857fa5c7f9ff4645c86793b7a63ae0b6b32ef1a27af9ae398", size = 2521775, upload-time = "2024-12-15T07:27:59.694Z" }, - { url = "https://files.pythonhosted.org/packages/2c/14/fb3e0c1b92dc633da708c7438c564bdfb8c4757ad0ce1f4bf80f3fa7d0b9/fastnumbers-5.1.1-cp313-cp313-win32.whl", hash = "sha256:dc2442ceb236f4680c87aa54d1f94bd8fc4b6db8dc9ac94e602da0924aac279f", size = 117134, upload-time = "2024-12-15T07:28:01.359Z" }, - { url = "https://files.pythonhosted.org/packages/5d/af/47ce3856e5d6a10aae37dbf903c295c36702bf78d1f30c7c213460f46453/fastnumbers-5.1.1-cp313-cp313-win_amd64.whl", hash = "sha256:91a69ce09fb5079bd680464b2d850be82f5516ed67360381c9d9935431c31bc4", size = 127195, upload-time = "2024-12-15T07:28:02.617Z" }, -] [[package]] name = "filetype" @@ -1121,20 +748,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/18/79/1b8fa1bb3568781e84c9200f951c735f3f157429f44be0495da55894d620/filetype-1.2.0-py2.py3-none-any.whl", hash = "sha256:7ce71b6880181241cf7ac8697a2f1eb6a8bd9b429f7ad6d27b8db9ba5f1c2d25", size = 19970, upload-time = "2022-11-02T17:34:01.425Z" }, ] -[[package]] -name = "flake8" -version = "7.3.0" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "mccabe" }, - { name = "pycodestyle" }, - { name = "pyflakes" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/9b/af/fbfe3c4b5a657d79e5c47a2827a362f9e1b763336a52f926126aa6dc7123/flake8-7.3.0.tar.gz", hash = "sha256:fe044858146b9fc69b551a4b490d69cf960fcb78ad1edcb84e7fbb1b4a8e3872", size = 48326, upload-time = "2025-06-20T19:31:35.838Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/9f/56/13ab06b4f93ca7cac71078fbe37fcea175d3216f31f85c3168a6bbd0bb9a/flake8-7.3.0-py2.py3-none-any.whl", hash = "sha256:b9696257b9ce8beb888cdbe31cf885c90d31928fe202be0889a7cdafad32f01e", size = 57922, upload-time = "2025-06-20T19:31:34.425Z" }, -] - [[package]] name = "flasgger-tschaume" version = "0.9.7" @@ -1172,7 +785,6 @@ name = "flask-compress" version = "1.24" source = { registry = "https://pypi.org/simple" } dependencies = [ - { name = "backports-zstd", marker = "python_full_version < '3.14'" }, { name = "brotli", marker = "platform_python_implementation != 'PyPy'" }, { name = "brotlicffi", marker = "platform_python_implementation == 'PyPy'" }, { name = "flask" }, @@ -1298,30 +910,6 @@ version = "4.63.0" source = { registry = "https://pypi.org/simple" } sdist = { url = "https://files.pythonhosted.org/packages/84/69/c97f2c18e0db87d2c7b15da1974dace76ae938f1cfa22e2727a648b7ed43/fonttools-4.63.0.tar.gz", hash = "sha256:caeb583deeb5168e694b65cda8b4ee62abedfa66cf88488734466f2366b9c4e0", size = 3597189, upload-time = "2026-05-14T12:04:30.958Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/75/2b/a7f1545bdf5da69c4bda0cea2a5781f0ad2a6623e0277267672db43c5fe6/fonttools-4.63.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:2b8ae05d9eacf6081414d759c0a352769ac28ce31280d6bb8e77b03f9e3c449f", size = 2881793, upload-time = "2026-05-14T12:02:56.645Z" }, - { url = "https://files.pythonhosted.org/packages/49/50/965308c703f085f225db2886813b27e015b8b3438c350b22dd65b52c2a2c/fonttools-4.63.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:79cdc9f567aec74a72918fd060283911406750cbc9fd28c1316023deb6ce31a9", size = 2428130, upload-time = "2026-05-14T12:02:58.891Z" }, - { url = "https://files.pythonhosted.org/packages/d8/38/6937fbd7f2dc3a6b48725851bc2c15ec949b9af14d9bbcb5fe83cdf9bdf9/fonttools-4.63.0-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:2c14b4fd138c4bafcca294765c547914e1aa431ae1ca94ab99d8db08c958bd3b", size = 5111952, upload-time = "2026-05-14T12:03:01.263Z" }, - { url = "https://files.pythonhosted.org/packages/0b/43/a81f20050a3115b57d62c8e781446949512eac36690dc384ccea65ff4cc1/fonttools-4.63.0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:d76ac49f929aecaf82d83250b8347e099d7aecba0f4726c1d9b6df3b8bb5fe18", size = 5082308, upload-time = "2026-05-14T12:03:03.211Z" }, - { url = "https://files.pythonhosted.org/packages/67/00/cdd9d4944ca6ae280d01e69cc37bde3bf663630b837a6fc6d2cd65d80e0e/fonttools-4.63.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:dcf076a4474fe0d7367e5bbf5b052c7284fa1feca729c04176ce513521afd8a0", size = 5087932, upload-time = "2026-05-14T12:03:05.147Z" }, - { url = "https://files.pythonhosted.org/packages/f5/f1/0aa0dbea778c75adbef223c42019fd47d22262b905974d62d829545d485f/fonttools-4.63.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:7dd683fef0663e9f0f45cf541d788d24caa3ec9db50796b588e1757d8b3bc007", size = 5213271, upload-time = "2026-05-14T12:03:07.238Z" }, - { url = "https://files.pythonhosted.org/packages/a8/99/253e4056e1f0e67b9390125a154b73b5eb73ad521bece95c004858fdeec2/fonttools-4.63.0-cp311-cp311-win32.whl", hash = "sha256:afefc1ed0a59785a7fb06ea7e1678e849c193e1e387db783579bc7b3056fcfcb", size = 2304473, upload-time = "2026-05-14T12:03:09.271Z" }, - { url = "https://files.pythonhosted.org/packages/08/60/defa5e69641db890a63be281f41345f4c33b157824eaf0b9fad3e08b0dcb/fonttools-4.63.0-cp311-cp311-win_amd64.whl", hash = "sha256:063e08bd17bd5a90127a14123de0d6a952dbc847695fd98b63c043d58057f90c", size = 2356389, upload-time = "2026-05-14T12:03:11.53Z" }, - { url = "https://files.pythonhosted.org/packages/08/ef/b3c6b9b5be2f82416d73fe2ed2e96e2793cd80e7510bd6a17ca79cdd88ec/fonttools-4.63.0-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:37dd23e621e3b0aef1baa70a303b80aaf38449632cfc8fd2a55fb285bbccfc02", size = 2881131, upload-time = "2026-05-14T12:03:13.386Z" }, - { url = "https://files.pythonhosted.org/packages/44/a0/c815bea63117fa63e4e1c01f8a1110d2112fa003f838e6467094ec2432ce/fonttools-4.63.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:a9faff9e0c1f76f9fd55899d2ce785832efebab37eb8ae13995853aef178bef0", size = 2426704, upload-time = "2026-05-14T12:03:15.801Z" }, - { url = "https://files.pythonhosted.org/packages/44/04/0b91d8e916e92ad1fac9e4624760baf0fd5ff2ead614c2f68fb21373f03f/fonttools-4.63.0-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:ef3048ef05dbb552b89817713d9cac912e00d0fde4a3105c00d29e52e10c89af", size = 5044298, upload-time = "2026-05-14T12:03:18.085Z" }, - { url = "https://files.pythonhosted.org/packages/77/c7/2342da9830e3e9d4870305ca5d2091d2a83284f2953079b7bdd3b5e029d8/fonttools-4.63.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:58dc6bb86a78d782f00f9190ca02c119cf5bbe2807536e361e18d42019f877d8", size = 4999800, upload-time = "2026-05-14T12:03:20.161Z" }, - { url = "https://files.pythonhosted.org/packages/e6/6d/67fe16c48d7ce050979b33f47e0d28a318f02da030602e944c34f7a16ef3/fonttools-4.63.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:ee08ebfa58f6e1aeff5697ab9582105bb620008c1caafb681e4c557e7483027b", size = 4982666, upload-time = "2026-05-14T12:03:22.87Z" }, - { url = "https://files.pythonhosted.org/packages/f2/00/3bbab338c07c71fa56269953845e92c951a61457bbbb0f1022551ea266d9/fonttools-4.63.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:27fdc65af8da6f88b9c6121c47a464cbe359fcfff7ff6fc2d37a1f395d755b78", size = 5133598, upload-time = "2026-05-14T12:03:25.168Z" }, - { url = "https://files.pythonhosted.org/packages/62/f2/aa27c7f98db5b064883dadcc5283947e81e034de42e22a33675878d98b54/fonttools-4.63.0-cp312-cp312-win32.whl", hash = "sha256:af2fd1664d00a397d75f806985ddb36282091c2131a73a6485c23b4a34722263", size = 2292575, upload-time = "2026-05-14T12:03:27.496Z" }, - { url = "https://files.pythonhosted.org/packages/87/36/cccb9bc2a6ab63d1b2980374f0dca72ce95ae267c9b4cfe77455bb70d0d4/fonttools-4.63.0-cp312-cp312-win_amd64.whl", hash = "sha256:59ac449f8cca9b4ffa08d2e7bbadad87ce710d69d1eda5c3c1ce579baa987272", size = 2343211, upload-time = "2026-05-14T12:03:30.057Z" }, - { url = "https://files.pythonhosted.org/packages/0f/8d/d8fec3dcde2963f8c908fb315e5ff2cd0ac34f82394bbbf73a2aa5145ce3/fonttools-4.63.0-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:cd7e9857e5e63738b9d9fd707bc1f59c8b09e5177726d23664db393c59bb08bd", size = 2876062, upload-time = "2026-05-14T12:03:32.554Z" }, - { url = "https://files.pythonhosted.org/packages/ef/71/d935dc54e4ff121bfdd11e08702db63a7e6f25af21d8a3d7b7212df53641/fonttools-4.63.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:c2a2a42198b696a6f48fad91709afb55176e66a5e566131219dba372fb7f8c59", size = 2424594, upload-time = "2026-05-14T12:03:34.86Z" }, - { url = "https://files.pythonhosted.org/packages/8e/40/e76320afa1df918e146155ef239b1719ee266092e96f5423bfd075affba1/fonttools-4.63.0-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:1e874792a8212b44583ea02189d9e693906b2f78b261f372f95d6c563210ac1d", size = 5024840, upload-time = "2026-05-14T12:03:36.745Z" }, - { url = "https://files.pythonhosted.org/packages/ce/36/0b805d8c485f872f65a509cbe3b58a5d0d17bee855333b54a150c79d3061/fonttools-4.63.0-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:22135da48a348785c5e2d5d2d9d6bec5ed44adacbaeb9db12d9493bf6c6bfa68", size = 4975801, upload-time = "2026-05-14T12:03:38.833Z" }, - { url = "https://files.pythonhosted.org/packages/c8/26/2cee03d0aa083ab022da5c07aff9ed3f689da1defb81ad6917c9627896da/fonttools-4.63.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:ccf41f2efdf56994d22d73bef4ced1052161958169428d06ba9724ea9e9a64be", size = 4965009, upload-time = "2026-05-14T12:03:41.494Z" }, - { url = "https://files.pythonhosted.org/packages/7e/48/cc4b66d9058c0d0982c833fad10127c4b0e9324606aafa41382295ca4102/fonttools-4.63.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:9ced0bd02ac751dd6319b0da88aaef24414e3b0dbc32bb4f24944821a3741a27", size = 5105892, upload-time = "2026-05-14T12:03:43.525Z" }, - { url = "https://files.pythonhosted.org/packages/d8/1f/a98a30a814b9ddef3a2e706025f90b9e0bc94890e6cb15254bc86547d11a/fonttools-4.63.0-cp313-cp313-win32.whl", hash = "sha256:85be818f5506e8a7753153def2c9550178f0ecae6a47b5e0e8dbb23f7cc90380", size = 2291313, upload-time = "2026-05-14T12:03:45.594Z" }, - { url = "https://files.pythonhosted.org/packages/92/46/5177b01f3b4abfdd4409f31cca4ab279c9343a26efbe9ec78c97fc612e02/fonttools-4.63.0-cp313-cp313-win_amd64.whl", hash = "sha256:ba04cb5891d4c0c21b6da95eda8d7b090021508a294fff33464fc7d241e0856b", size = 2342299, upload-time = "2026-05-14T12:03:47.414Z" }, { url = "https://files.pythonhosted.org/packages/27/d2/23d25e3f247b328be58d04a4c9f894178a0d1eda7d42867cfb388adaf416/fonttools-4.63.0-cp314-cp314-macosx_10_15_universal2.whl", hash = "sha256:fd1e3094f42d806d3d7c79162fc59e5910fcbe3a7360c385b8da969bc4493745", size = 2875338, upload-time = "2026-05-14T12:03:50.052Z" }, { url = "https://files.pythonhosted.org/packages/cd/58/7dfa0c761cb3b2964e2a84c4dc986c926a87de0cb9fb60d5b28ded3f2914/fonttools-4.63.0-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:6e528da43bc3791085f8cb6141b1d13e459226790240340fcbb4625649238b03", size = 2422661, upload-time = "2026-05-14T12:03:52.154Z" }, { url = "https://files.pythonhosted.org/packages/dd/87/64cfa18a7a1621d17b7f4502b2b0ed8a135a90c3db51ea590ee99043e76b/fonttools-4.63.0-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:6b2248c5decb223562f7902ff6325077a073f608ee8e33e88ad88db734eb9f49", size = 5010526, upload-time = "2026-05-14T12:03:54.647Z" }, @@ -1374,32 +962,6 @@ dependencies = [ ] sdist = { url = "https://files.pythonhosted.org/packages/c4/cb/98aa3a299e2fc4a2372b5d124863e02965b64579ffc29fe54d0641e65b2f/gevent-26.5.0.tar.gz", hash = "sha256:1655eb04c1e20d71b2aa4a3c7528162dd58ff6cc46a037af1f01f534c80fefba", size = 6712354, upload-time = "2026-05-20T21:22:45.132Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/2a/ea/ea87c08931c9e4c6c40bb05a2cb19c2d6f93fe6e0052f9152ea5ade6d037/gevent-26.5.0-cp311-cp311-manylinux_2_28_aarch64.whl", hash = "sha256:cd3dc60581687e2618286108f8e2f820d8446be4b34131065011c066e911d39c", size = 1768295, upload-time = "2026-05-20T21:17:29.438Z" }, - { url = "https://files.pythonhosted.org/packages/da/92/1d0e7287ae55700a8d25153ac736896bd9bcc3f85a12d374ef398db4b33c/gevent-26.5.0-cp311-cp311-manylinux_2_28_ppc64le.whl", hash = "sha256:dc7fa28b2d627f8e87595f39043b6dec71e8e7fb97e685e5506c47cf3ff8cb2e", size = 1862627, upload-time = "2026-05-20T21:15:59.365Z" }, - { url = "https://files.pythonhosted.org/packages/3a/4c/7f5ed67e52dfdef4ff91ae1a6fb28186d52e2496962edc8f17bdea9ab2c0/gevent-26.5.0-cp311-cp311-manylinux_2_28_s390x.whl", hash = "sha256:68c5fc21cef80268cdff88a4ae6c025fabb019b071f6f8ee4d20a7bccbddb873", size = 1804690, upload-time = "2026-05-20T21:30:51.713Z" }, - { url = "https://files.pythonhosted.org/packages/4c/75/0f5da6ca045f8a052203e1810058029f4b682507a789b413cac7d28bae28/gevent-26.5.0-cp311-cp311-manylinux_2_28_x86_64.whl", hash = "sha256:d325502eb0695708ef8c899f605573ed6847f3961f8159627dba267fbf3ce457", size = 2119054, upload-time = "2026-05-20T20:35:22.678Z" }, - { url = "https://files.pythonhosted.org/packages/6e/f1/fcff7f7fad2bb33f3742db6b2145825a2191c0cd31d75789b0741fd28faf/gevent-26.5.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:a11daf3a588b932c8bf965fb18444c69aff48badec88435e988cf8d67137075a", size = 1778784, upload-time = "2026-05-20T21:16:38.182Z" }, - { url = "https://files.pythonhosted.org/packages/98/57/151314f00bdc6ba77333febb3e9dc97fdf94d79426559b4fa8332f0c2b6e/gevent-26.5.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:1101b5ef82a3fb178550cfd80f32293dc8dd2f3d0828292223ebba29d6f76e33", size = 2145373, upload-time = "2026-05-20T20:43:27.255Z" }, - { url = "https://files.pythonhosted.org/packages/1a/b5/7a02f711db62cbed1c1a00e1f9ff50eef95ccc78d4c04a0f93636655d1b7/gevent-26.5.0-cp311-cp311-win_amd64.whl", hash = "sha256:5233109ad4f3af16393ba9888f238919a05ce15ce68d6831ac8a0da8dfb750ae", size = 1696576, upload-time = "2026-05-20T20:15:49.62Z" }, - { url = "https://files.pythonhosted.org/packages/f8/9b/5022adc310697ef25c6fb22eb9bf0ebcad3427b51776e882709de9a8b6d7/gevent-26.5.0-cp311-cp311-win_arm64.whl", hash = "sha256:3be804565168ffacebeb21af9f1cd689831a89f0f12fc0c3f423c730c3c9eb31", size = 1552095, upload-time = "2026-05-20T20:16:54.81Z" }, - { url = "https://files.pythonhosted.org/packages/37/0b/1a530b2db55c97cc0cf44116201f538f3033c04c1d2aca143979b412f4be/gevent-26.5.0-cp312-cp312-macosx_11_0_universal2.whl", hash = "sha256:e80ad2a8a1e8bdaa5605e3bf4929e0cebf9ea7b8237c83362f7257698bb14280", size = 2929714, upload-time = "2026-05-20T20:13:24.656Z" }, - { url = "https://files.pythonhosted.org/packages/b9/df/32fe851ed5f68493f354e09b19bdebae0de1185be4db0b2988e71e737fd3/gevent-26.5.0-cp312-cp312-manylinux_2_28_aarch64.whl", hash = "sha256:fe42c037253580a3386fce275f8a2a845e540f5a729916934a732f13d42e72cc", size = 1784838, upload-time = "2026-05-20T21:17:31.063Z" }, - { url = "https://files.pythonhosted.org/packages/e5/9a/21332674f9a10e8cdf13b41b52e9d663647a1c6e1dc3c62b07c0aeefd360/gevent-26.5.0-cp312-cp312-manylinux_2_28_ppc64le.whl", hash = "sha256:9f463c7d6f69d13b6fe8e3b832a6175a6e95328a940f38495d25496d1ae8ad88", size = 1880440, upload-time = "2026-05-20T21:16:00.881Z" }, - { url = "https://files.pythonhosted.org/packages/9f/b1/5f8a4196113cf7f3fdd987b483f7e6b10c28ea3930c4727e31ba8cce51b6/gevent-26.5.0-cp312-cp312-manylinux_2_28_s390x.whl", hash = "sha256:96d5e96b1b14a4c1023dcfcc114533217f13febc3b6169254f23fc18d19fee29", size = 1831592, upload-time = "2026-05-20T21:30:53.832Z" }, - { url = "https://files.pythonhosted.org/packages/4e/69/1559b1f6b5107a9118fccd300240879bd581b6d87b03d568d0d155ea702c/gevent-26.5.0-cp312-cp312-manylinux_2_28_x86_64.whl", hash = "sha256:bccff69c462e3650a0fd1d4e9cfc8b6effe15f3e9b1cad20a7bb5ce14b057efd", size = 2114915, upload-time = "2026-05-20T20:35:25.041Z" }, - { url = "https://files.pythonhosted.org/packages/e4/32/602c499d54472f64e5cdf6013aeab5ce6aa6fed005387e8b4f2d22f5dc8d/gevent-26.5.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:f519139354d5ca7625df9ddb1b2ffada885c14abc5b4dbae3682e967ddf79669", size = 1796906, upload-time = "2026-05-20T21:16:39.65Z" }, - { url = "https://files.pythonhosted.org/packages/f9/3c/2fe77ee6e3d381b3c50c0b7d6c4c08c08b8ff5e8c0d9dd51a3b426d61eec/gevent-26.5.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:0bf57df54f1c66273bf3601c2a1e41b12138fe848933718369663bc54f177ca2", size = 2140806, upload-time = "2026-05-20T20:43:28.895Z" }, - { url = "https://files.pythonhosted.org/packages/22/d5/4620797bbd9c88f4541188efc138b0d615f9834db540da36a2249ee929c5/gevent-26.5.0-cp312-cp312-win_amd64.whl", hash = "sha256:e49ce0de007dfd7412edbc2b5d41cce33b049bb1b7086f50be5a09e601bde603", size = 1699995, upload-time = "2026-05-20T20:15:39.311Z" }, - { url = "https://files.pythonhosted.org/packages/cb/83/ac3477dfc0f9fd80c88110102c73cefc35dcded2b248544f45a8fa5412df/gevent-26.5.0-cp312-cp312-win_arm64.whl", hash = "sha256:5c5ff29495a2eed2a244de8150f21893d6c1b15d8b4b5719ab4bbfa06db1e28f", size = 1547433, upload-time = "2026-05-20T20:15:51.656Z" }, - { url = "https://files.pythonhosted.org/packages/7d/47/5b992ab9c8037633cfd0fe698a97a878f59d8eb53c381e91e9a1a76fd215/gevent-26.5.0-cp313-cp313-macosx_11_0_universal2.whl", hash = "sha256:9b4d3f34c913d1a6bec6d030365a517f3b527a9773b12e58cf56c3339bbe96e6", size = 2952523, upload-time = "2026-05-20T20:13:04.698Z" }, - { url = "https://files.pythonhosted.org/packages/74/11/c7dfc773eb43331a682efed610b49df6e976331f1b0e1c592a0c35d29872/gevent-26.5.0-cp313-cp313-manylinux_2_28_aarch64.whl", hash = "sha256:1d8da4e799431feeb4c9e441ac7431f0baabb9106976790d884289d08ac08359", size = 1787044, upload-time = "2026-05-20T21:17:32.845Z" }, - { url = "https://files.pythonhosted.org/packages/ae/28/9812933dac93560f46910a9e834805fe76f822c408bd1c20cdf299d7c311/gevent-26.5.0-cp313-cp313-manylinux_2_28_ppc64le.whl", hash = "sha256:51becdb4c30a8f45c1c028ad7a97bf5a1ed141f74b159a31aa9cc6aa1e6263a6", size = 1882342, upload-time = "2026-05-20T21:16:02.645Z" }, - { url = "https://files.pythonhosted.org/packages/96/4b/514f248f69b2230b69b0bb17f4158b0b05dd4b2cb469a60ab206e9fe7496/gevent-26.5.0-cp313-cp313-manylinux_2_28_s390x.whl", hash = "sha256:c42bbcd3d453b08ad8915fd3feaf3d44a3562cdf1c7b208f9837149711e16d9d", size = 1834136, upload-time = "2026-05-20T21:30:55.739Z" }, - { url = "https://files.pythonhosted.org/packages/53/67/f5f30716efca99b6200ae89a9303a7e94dae085b7de6f6d0033c52a37f4b/gevent-26.5.0-cp313-cp313-manylinux_2_28_x86_64.whl", hash = "sha256:bd3445e4fbeeb46690ed8efe94b8d1d46b14aa04af8866ae7a8da5997828d1c6", size = 2115349, upload-time = "2026-05-20T20:35:28.132Z" }, - { url = "https://files.pythonhosted.org/packages/09/d8/60e8809bde7986e6c4e6d106080b3603fa09b3bb0255fed1a4d8282e3ca2/gevent-26.5.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:b573d5b2826edc705f31f07da6889ad483a6a0d64944ebd8d32205f7c5bf46fb", size = 1799443, upload-time = "2026-05-20T21:16:41.928Z" }, - { url = "https://files.pythonhosted.org/packages/f8/41/b388b2b1f0a026ea30687e51ddf81dbb783dfb55fac0a16708d2821d99e5/gevent-26.5.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:4d53b1b28f2082a151bded2850b53f6baed02f742d2a1584029e8bd42d457fb4", size = 2141117, upload-time = "2026-05-20T20:43:30.694Z" }, - { url = "https://files.pythonhosted.org/packages/b1/f3/ac9a4b0de487e390c5d53a908a9347c0df0102de2bbf3e8603087769191d/gevent-26.5.0-cp313-cp313-win_amd64.whl", hash = "sha256:23569ce0c254eb821fc3dcfe250843dde8b3180b09bae9e222e41aa3fa4885b7", size = 1699862, upload-time = "2026-05-20T20:15:33.642Z" }, - { url = "https://files.pythonhosted.org/packages/2a/cf/1ef1fc9b390563c0f97702f94a557d1649b7bbb5724f9b86c2122747e92f/gevent-26.5.0-cp313-cp313-win_arm64.whl", hash = "sha256:40cdcdb2e404b6c82b82a4576bdb33958f23fc2deb0d933e9e022b362001e647", size = 1545341, upload-time = "2026-05-20T20:16:26.229Z" }, { url = "https://files.pythonhosted.org/packages/17/55/7d98d3888e7bb9ad4656420dec69232ecbbea48792aff9295d0ad7cf8435/gevent-26.5.0-cp314-cp314-macosx_11_0_universal2.whl", hash = "sha256:75a0050e4b87f08ddee7e56f59e6014cd7fcdc3153046c09a847940515d12c85", size = 2968223, upload-time = "2026-05-20T20:13:17.223Z" }, { url = "https://files.pythonhosted.org/packages/f8/b4/e8e116fcbcb9dc0bf3acc50037f86e1204c217c8ed5defde68be11b3aab6/gevent-26.5.0-cp314-cp314-manylinux_2_28_aarch64.whl", hash = "sha256:fd1a0b83a04e19378d9466ae0ee2b5937cf1d7fbfdcb916b2aea82179a208574", size = 1793926, upload-time = "2026-05-20T21:17:34.321Z" }, { url = "https://files.pythonhosted.org/packages/28/07/7b267e9754b661defb93542e97731a4df21f8a40dc0f6c853faa717cf124/gevent-26.5.0-cp314-cp314-manylinux_2_28_ppc64le.whl", hash = "sha256:4c964c15076e76391d523ec24202f579a2535f7e301a40efb1656ae046d3eb69", size = 1887632, upload-time = "2026-05-20T21:16:04.158Z" }, @@ -1438,36 +1000,6 @@ version = "3.5.1" source = { registry = "https://pypi.org/simple" } sdist = { url = "https://files.pythonhosted.org/packages/6d/6e/802acd792aebb2256fbbee8cacf2727faaeb6f240ac11008f09eae4414bc/greenlet-3.5.1.tar.gz", hash = "sha256:5a56aeb7d5d9cc4b3a735efb5095bd4b4f6f0e4f93e5ca876d0e2315137b7829", size = 197356, upload-time = "2026-05-20T15:05:03.917Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/42/3c/ff890b466eaba2b0f5e6bdfff025f8c75f41b8ffdc3dbc3d24ad261e764a/greenlet-3.5.1-cp311-cp311-macosx_11_0_universal2.whl", hash = "sha256:73f78f9b9f0a5c06e5c946ba1e8e36f5114923b6be109ee618c54f079c3ea14f", size = 284764, upload-time = "2026-05-20T13:09:10.204Z" }, - { url = "https://files.pythonhosted.org/packages/81/0e/5e5457be3d256918f6a4756f073548a3f0190836e2cc94aa6d0d617a940b/greenlet-3.5.1-cp311-cp311-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:a0cbed8bb44e23c5b199f888f4e4ce096b45ad9f25ff74a7ad0213875e936bb2", size = 603479, upload-time = "2026-05-20T14:00:04.757Z" }, - { url = "https://files.pythonhosted.org/packages/6d/e1/f89a21d58d308298e6f275f13a1b472ed96c680b601a371b08be6a725989/greenlet-3.5.1-cp311-cp311-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:a203a8bd0acb0701653d3bbb26e404854a68674139ed5cbb778830f42b09bb33", size = 615495, upload-time = "2026-05-20T14:05:40.87Z" }, - { url = "https://files.pythonhosted.org/packages/2c/f2/8fd452fd81adb9ec79c8275c1375702ab0fd6bee4952da12eaa09b9508d8/greenlet-3.5.1-cp311-cp311-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:6ebeb75c81211f5c702576cf81f315e77e23cfdb2c7c6fcb9dd143e6de35c360", size = 623515, upload-time = "2026-05-20T14:09:07.853Z" }, - { url = "https://files.pythonhosted.org/packages/75/de/af6cef182862d2ccd6975440d21c9058a77c3f9b469abf94e322dfd2e0e3/greenlet-3.5.1-cp311-cp311-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:8a271fcd66c74615cda6a964fda3f304267a12e50a084472218a39bb0376f563", size = 614754, upload-time = "2026-05-20T13:14:24.947Z" }, - { url = "https://files.pythonhosted.org/packages/ec/bc/c318aa9f3ffc77320fddcee3d892be957b42e2ff947198d9450b004f3a38/greenlet-3.5.1-cp311-cp311-manylinux_2_39_riscv64.whl", hash = "sha256:017a544f0385d441e88714160d089d6900ef46c9eff9d99b6715a5ef2d127747", size = 418439, upload-time = "2026-05-20T14:01:38.446Z" }, - { url = "https://files.pythonhosted.org/packages/1a/c6/50e520283a9f19388a7326b05f9e8637e566003475eacaadad04f558c68d/greenlet-3.5.1-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:ded7b068c7c31c1a8657d4fd42d886b3e051ae29f88b80c5ff9d502257b0f071", size = 1574097, upload-time = "2026-05-20T14:02:24.003Z" }, - { url = "https://files.pythonhosted.org/packages/21/1c/13abd1f4860d987fa5e1170a01930d6e6cd40d328de487a3c9fdaff0ffd0/greenlet-3.5.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:d0932b81d72f552ded9d810d00021b64d89f2195a91ce115b893f943b7a4ab3c", size = 1641058, upload-time = "2026-05-20T13:14:31.83Z" }, - { url = "https://files.pythonhosted.org/packages/f5/56/5f332b7705545eac2dc01b4e9254d24a793f2656d55d5cc6b94ee59d22ae/greenlet-3.5.1-cp311-cp311-win_amd64.whl", hash = "sha256:88e300d136eac057b2397aa1cfd7328b4c87c7eb66a09c7bc6a1292234db474e", size = 238089, upload-time = "2026-05-20T13:14:03.229Z" }, - { url = "https://files.pythonhosted.org/packages/d9/a9/a3c2fa886c5b94863fb0e61b3bc14610b7aa94cf4f17f8741b11708305fc/greenlet-3.5.1-cp311-cp311-win_arm64.whl", hash = "sha256:cc6ab7e555c8a112ad3a76e368e86e12a2754bcae1652a5602e133ec7b635523", size = 234989, upload-time = "2026-05-20T13:08:27.715Z" }, - { url = "https://files.pythonhosted.org/packages/c4/37/4549f149c9797c21b32c2683c33522af22522099de128b2406672526d005/greenlet-3.5.1-cp312-cp312-macosx_11_0_universal2.whl", hash = "sha256:fa4f98af3a528f0c3fd592a26df7f376f93329c8f4d987f6bb979057af8bf5e2", size = 286220, upload-time = "2026-05-20T13:07:28.463Z" }, - { url = "https://files.pythonhosted.org/packages/38/ff/a4f436709716965eaab9f36ea7b906c8a927fbe32fb1372a2071d964f6b1/greenlet-3.5.1-cp312-cp312-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:ffea73584b216150eab159b6d12348fb253e68757974de1e2c40d8a318ac89ed", size = 601585, upload-time = "2026-05-20T14:00:06.141Z" }, - { url = "https://files.pythonhosted.org/packages/65/ad/54bc3fcee3ad368a61b19b67d88117f7a8c29727bf71fffdeda81fbd946e/greenlet-3.5.1-cp312-cp312-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:1072b4f9edcc1e192d9283a66a3e68d6b84c561de33a83d7858beb9ba1effe10", size = 614215, upload-time = "2026-05-20T14:05:42.675Z" }, - { url = "https://files.pythonhosted.org/packages/7c/6c/de5b1b388cd2d9fbdfeab324863daba37d54e6e233ddbefd70b385a8c591/greenlet-3.5.1-cp312-cp312-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:89101bfd5011e069be974903cb3a4e4523845e4ece2d62dcd8d358933c0ef249", size = 620094, upload-time = "2026-05-20T14:09:09.18Z" }, - { url = "https://files.pythonhosted.org/packages/40/69/b91cda0647df839483201545913514c2827ebea5e5ccdf931842763bc127/greenlet-3.5.1-cp312-cp312-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:add5217d68b31130f0beca584d7fef4878327d2e31642b66618a14eef312b63b", size = 611358, upload-time = "2026-05-20T13:14:26.37Z" }, - { url = "https://files.pythonhosted.org/packages/4a/43/1204baffab8a6476464795a7ccf394a3248d4f22c9f87173a15b36b6d971/greenlet-3.5.1-cp312-cp312-manylinux_2_39_riscv64.whl", hash = "sha256:e6cd99ea59dd5d89f0c956606571d79bfe6f68c9eb7f4a4083a41a7f1587edee", size = 422782, upload-time = "2026-05-20T14:01:39.597Z" }, - { url = "https://files.pythonhosted.org/packages/59/90/3cf77e080350cd02fa307bb2abf05df48f4482c240275bbd2c203ba8bb1c/greenlet-3.5.1-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:a5ea42a752d47a145eae922b605cd1634665ac3d5ec1e72402d5048e8d60d207", size = 1570475, upload-time = "2026-05-20T14:02:25.29Z" }, - { url = "https://files.pythonhosted.org/packages/65/2c/18cece62045e74598c3c393f70dce4a63f56222015ba29a5d4eeb04f764c/greenlet-3.5.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:c5551170cf4f5ff5623e9af81323751979fee2c731e2287b61f73cd27257b823", size = 1635625, upload-time = "2026-05-20T13:14:34.027Z" }, - { url = "https://files.pythonhosted.org/packages/30/f5/310d104ddf41eb5a70f4c268d22508dfb0c3c8e86fec152be34d0d2ed819/greenlet-3.5.1-cp312-cp312-win_amd64.whl", hash = "sha256:3c8bb982ad117d29478ef8f5533e97df21f1e2befd17a299257b0c96d1371c0b", size = 238791, upload-time = "2026-05-20T13:10:39.018Z" }, - { url = "https://files.pythonhosted.org/packages/62/90/ceca11f504cd23a8047a3dea31919adc48df9b626dd0c13f0d858734fdfd/greenlet-3.5.1-cp312-cp312-win_arm64.whl", hash = "sha256:80eb4b04dadc4e67df3fae179a32c4706a3f495bc7f22fc8a81115d5f5512188", size = 235580, upload-time = "2026-05-20T13:08:45.056Z" }, - { url = "https://files.pythonhosted.org/packages/27/69/7f7e5372d998b81001899b1c0823c957aa413ba0f2662e65821611cc31e4/greenlet-3.5.1-cp313-cp313-macosx_11_0_universal2.whl", hash = "sha256:51518ff74664078fc51bffcc6fc529b0df5ae58da192691cee765d45ce944a2b", size = 285060, upload-time = "2026-05-20T13:08:51.899Z" }, - { url = "https://files.pythonhosted.org/packages/b1/bf/387f9b6b865fd2ae0d0be09e0004827295a01b71be76ed350dd1e28a91a4/greenlet-3.5.1-cp313-cp313-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:1ffdb3c0bb002c99cd8f298957e046c3dbf6006b5b7cdf11a4e19194624a0a0a", size = 604370, upload-time = "2026-05-20T14:00:07.492Z" }, - { url = "https://files.pythonhosted.org/packages/32/f5/169ce3d4e4c67291bd18f8cbe0299c9f3e45102c7f1fb3c14780c93e4532/greenlet-3.5.1-cp313-cp313-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:7715a5a2c3378ba602c3a440558261e13a820bb53a82693aacd7b7f6d964e283", size = 616987, upload-time = "2026-05-20T14:05:44.237Z" }, - { url = "https://files.pythonhosted.org/packages/19/ba/c24110c55dffa55aa6e1d98b45310da33801aeba7686ff0190fe5d46fd32/greenlet-3.5.1-cp313-cp313-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:d40a890035c0058cadbdc4af7569800fd28a0e527a0fdbb7b5f9418f176846ce", size = 622911, upload-time = "2026-05-20T14:09:10.598Z" }, - { url = "https://files.pythonhosted.org/packages/ee/e5/7f2e41d5273be07e77560d61ea4e56485b4d6c316d2a84518c62d1364061/greenlet-3.5.1-cp313-cp313-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:dc71ff466927a201b08305acac451ebe1aedfcea002f62f1f2f2ac2ac1e6a135", size = 613911, upload-time = "2026-05-20T13:14:27.539Z" }, - { url = "https://files.pythonhosted.org/packages/ec/7b/d20db2e8a5ad6c038702f3179b136f93f0a3d1a21a0c0777f3e470cdf4b2/greenlet-3.5.1-cp313-cp313-manylinux_2_39_riscv64.whl", hash = "sha256:67821bb03e4e98664490edb787ff6af501194c29bbee0f5c1dfdcf1dc3d9d436", size = 425228, upload-time = "2026-05-20T14:01:40.837Z" }, - { url = "https://files.pythonhosted.org/packages/c5/a4/fbdc67579b73615a1f91615e814303cc71e06128f7baaba87be79b8fb90c/greenlet-3.5.1-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:cd443683db272ebaaca03af98c0b063ab30db70ea8a31a1559f35e3f7b744ccd", size = 1570689, upload-time = "2026-05-20T14:02:27.225Z" }, - { url = "https://files.pythonhosted.org/packages/e6/b4/77abbe35078be39718a46cd49caf16bceb35662f97a34101dca28aa98e47/greenlet-3.5.1-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:089fff7a6ce8d9316d1f65ebc00273a56be258c1725b32b94de90a3a979557e1", size = 1635602, upload-time = "2026-05-20T13:14:36.344Z" }, - { url = "https://files.pythonhosted.org/packages/37/f7/129f27ca700845b8ee8ca88ce7f43435a1239c2eddb7677fc938822762cf/greenlet-3.5.1-cp313-cp313-win_amd64.whl", hash = "sha256:110a1ca7b49b014b097f6078272c3f4ed31af45b254de5228b79adba879f6af9", size = 238683, upload-time = "2026-05-20T13:11:50.57Z" }, - { url = "https://files.pythonhosted.org/packages/6d/5c/a485a36e87df8d8fd0632ee01511244f5156a20ed3746cc6599340326395/greenlet-3.5.1-cp313-cp313-win_arm64.whl", hash = "sha256:f16ba1efc0715b680a18b8123d90dad887c6112ae3555b4b5c32c149540c6b4e", size = 235499, upload-time = "2026-05-20T13:12:42.028Z" }, { url = "https://files.pythonhosted.org/packages/8a/cb/c62454606daf5640369c94d8a9dd540599b1bfc090e2d2180cb77f4038d2/greenlet-3.5.1-cp314-cp314-macosx_11_0_universal2.whl", hash = "sha256:d8ab31c9de8651a2facdd5c5bb0011f2380dd1a7af78ce2adf4b56095294fc07", size = 285579, upload-time = "2026-05-20T13:08:56.396Z" }, { url = "https://files.pythonhosted.org/packages/ec/71/c4270398c2eba968a6071af1dfbdcaeee6ec1c24bc8b435b8cc452700da6/greenlet-3.5.1-cp314-cp314-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:5e300185139abc337ade480c327183adf42a875ac7181bfe66d7d4efea31fbea", size = 651106, upload-time = "2026-05-20T14:00:09.448Z" }, { url = "https://files.pythonhosted.org/packages/1a/ab/71e34b78a44ec271fb5f550c17bc46d301ddc5953890d935f270b0dcdb5a/greenlet-3.5.1-cp314-cp314-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:7ffdb990dcaa0234cf9845aead5df2e3c3a8b6507d409274dd87e0d5ab05ffc2", size = 663478, upload-time = "2026-05-20T14:05:45.88Z" }, @@ -1518,36 +1050,6 @@ dependencies = [ ] sdist = { url = "https://files.pythonhosted.org/packages/b7/48/af6173dbca4454f4637a4678b67f52ca7e0c1ed7d5894d89d434fecede05/grpcio-1.80.0.tar.gz", hash = "sha256:29aca15edd0688c22ba01d7cc01cb000d72b2033f4a3c72a81a19b56fd143257", size = 12978905, upload-time = "2026-03-30T08:49:10.502Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/5d/db/1d56e5f5823257b291962d6c0ce106146c6447f405b60b234c4f222a7cde/grpcio-1.80.0-cp311-cp311-linux_armv7l.whl", hash = "sha256:dfab85db094068ff42e2a3563f60ab3dddcc9d6488a35abf0132daec13209c8a", size = 6055009, upload-time = "2026-03-30T08:46:46.265Z" }, - { url = "https://files.pythonhosted.org/packages/6e/18/c83f3cad64c5ca63bca7e91e5e46b0d026afc5af9d0a9972472ceba294b3/grpcio-1.80.0-cp311-cp311-macosx_11_0_universal2.whl", hash = "sha256:5c07e82e822e1161354e32da2662f741a4944ea955f9f580ec8fb409dd6f6060", size = 12035295, upload-time = "2026-03-30T08:46:49.099Z" }, - { url = "https://files.pythonhosted.org/packages/0f/8e/e14966b435be2dda99fbe89db9525ea436edc79780431a1c2875a3582644/grpcio-1.80.0-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:ba0915d51fd4ced2db5ff719f84e270afe0e2d4c45a7bdb1e8d036e4502928c2", size = 6610297, upload-time = "2026-03-30T08:46:52.123Z" }, - { url = "https://files.pythonhosted.org/packages/cc/26/d5eb38f42ce0e3fdc8174ea4d52036ef8d58cc4426cb800f2610f625dd75/grpcio-1.80.0-cp311-cp311-manylinux2014_i686.manylinux_2_17_i686.whl", hash = "sha256:3cb8130ba457d2aa09fa6b7c3ed6b6e4e6a2685fce63cb803d479576c4d80e21", size = 7300208, upload-time = "2026-03-30T08:46:54.859Z" }, - { url = "https://files.pythonhosted.org/packages/25/51/bd267c989f85a17a5b3eea65a6feb4ff672af41ca614e5a0279cc0ea381c/grpcio-1.80.0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:09e5e478b3d14afd23f12e49e8b44c8684ac3c5f08561c43a5b9691c54d136ab", size = 6813442, upload-time = "2026-03-30T08:46:57.056Z" }, - { url = "https://files.pythonhosted.org/packages/9e/d9/d80eef735b19e9169e30164bbf889b46f9df9127598a83d174eb13a48b26/grpcio-1.80.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:00168469238b022500e486c1c33916acf2f2a9b2c022202cf8a1885d2e3073c1", size = 7414743, upload-time = "2026-03-30T08:46:59.682Z" }, - { url = "https://files.pythonhosted.org/packages/de/f2/567f5bd5054398ed6b0509b9a30900376dcf2786bd936812098808b49d8d/grpcio-1.80.0-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:8502122a3cc1714038e39a0b071acb1207ca7844208d5ea0d091317555ee7106", size = 8426046, upload-time = "2026-03-30T08:47:02.474Z" }, - { url = "https://files.pythonhosted.org/packages/62/29/73ef0141b4732ff5eacd68430ff2512a65c004696997f70476a83e548e7e/grpcio-1.80.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:ce1794f4ea6cc3ca29463f42d665c32ba1b964b48958a66497917fe9069f26e6", size = 7851641, upload-time = "2026-03-30T08:47:05.462Z" }, - { url = "https://files.pythonhosted.org/packages/46/69/abbfa360eb229a8623bab5f5a4f8105e445bd38ce81a89514ba55d281ad0/grpcio-1.80.0-cp311-cp311-win32.whl", hash = "sha256:51b4a7189b0bef2aa30adce3c78f09c83526cf3dddb24c6a96555e3b97340440", size = 4154368, upload-time = "2026-03-30T08:47:08.027Z" }, - { url = "https://files.pythonhosted.org/packages/6f/d4/ae92206d01183b08613e846076115f5ac5991bae358d2a749fa864da5699/grpcio-1.80.0-cp311-cp311-win_amd64.whl", hash = "sha256:02e64bb0bb2da14d947a49e6f120a75e947250aebe65f9629b62bb1f5c14e6e9", size = 4894235, upload-time = "2026-03-30T08:47:10.839Z" }, - { url = "https://files.pythonhosted.org/packages/5c/e8/a2b749265eb3415abc94f2e619bbd9e9707bebdda787e61c593004ec927a/grpcio-1.80.0-cp312-cp312-linux_armv7l.whl", hash = "sha256:c624cc9f1008361014378c9d776de7182b11fe8b2e5a81bc69f23a295f2a1ad0", size = 6015616, upload-time = "2026-03-30T08:47:13.428Z" }, - { url = "https://files.pythonhosted.org/packages/3e/97/b1282161a15d699d1e90c360df18d19165a045ce1c343c7f313f5e8a0b77/grpcio-1.80.0-cp312-cp312-macosx_11_0_universal2.whl", hash = "sha256:f49eddcac43c3bf350c0385366a58f36bed8cc2c0ec35ef7b74b49e56552c0c2", size = 12014204, upload-time = "2026-03-30T08:47:15.873Z" }, - { url = "https://files.pythonhosted.org/packages/6e/5e/d319c6e997b50c155ac5a8cb12f5173d5b42677510e886d250d50264949d/grpcio-1.80.0-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:d334591df610ab94714048e0d5b4f3dd5ad1bee74dfec11eee344220077a79de", size = 6563866, upload-time = "2026-03-30T08:47:18.588Z" }, - { url = "https://files.pythonhosted.org/packages/ae/f6/fdd975a2cb4d78eb67769a7b3b3830970bfa2e919f1decf724ae4445f42c/grpcio-1.80.0-cp312-cp312-manylinux2014_i686.manylinux_2_17_i686.whl", hash = "sha256:0cb517eb1d0d0aaf1d87af7cc5b801d686557c1d88b2619f5e31fab3c2315921", size = 7273060, upload-time = "2026-03-30T08:47:21.113Z" }, - { url = "https://files.pythonhosted.org/packages/db/f0/a3deb5feba60d9538a962913e37bd2e69a195f1c3376a3dd44fe0427e996/grpcio-1.80.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:4e78c4ac0d97dc2e569b2f4bcbbb447491167cb358d1a389fc4af71ab6f70411", size = 6782121, upload-time = "2026-03-30T08:47:23.827Z" }, - { url = "https://files.pythonhosted.org/packages/ca/84/36c6dcfddc093e108141f757c407902a05085e0c328007cb090d56646cdf/grpcio-1.80.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:2ed770b4c06984f3b47eb0517b1c69ad0b84ef3f40128f51448433be904634cd", size = 7383811, upload-time = "2026-03-30T08:47:26.517Z" }, - { url = "https://files.pythonhosted.org/packages/7c/ef/f3a77e3dc5b471a0ec86c564c98d6adfa3510d38f8ee99010410858d591e/grpcio-1.80.0-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:256507e2f524092f1473071a05e65a5b10d84b82e3ff24c5b571513cfaa61e2f", size = 8393860, upload-time = "2026-03-30T08:47:29.439Z" }, - { url = "https://files.pythonhosted.org/packages/9b/8d/9d4d27ed7f33d109c50d6b5ce578a9914aa68edab75d65869a17e630a8d1/grpcio-1.80.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:9a6284a5d907c37db53350645567c522be314bac859a64a7a5ca63b77bb7958f", size = 7830132, upload-time = "2026-03-30T08:47:33.254Z" }, - { url = "https://files.pythonhosted.org/packages/14/e4/9990b41c6d7a44e1e9dee8ac11d7a9802ba1378b40d77468a7761d1ad288/grpcio-1.80.0-cp312-cp312-win32.whl", hash = "sha256:c71309cfce2f22be26aa4a847357c502db6c621f1a49825ae98aa0907595b193", size = 4140904, upload-time = "2026-03-30T08:47:35.319Z" }, - { url = "https://files.pythonhosted.org/packages/2f/2c/296f6138caca1f4b92a31ace4ae1b87dab692fc16a7a3417af3bb3c805bf/grpcio-1.80.0-cp312-cp312-win_amd64.whl", hash = "sha256:9fe648599c0e37594c4809d81a9e77bd138cc82eb8baa71b6a86af65426723ff", size = 4880944, upload-time = "2026-03-30T08:47:37.831Z" }, - { url = "https://files.pythonhosted.org/packages/2f/3a/7c3c25789e3f069e581dc342e03613c5b1cb012c4e8c7d9d5cf960a75856/grpcio-1.80.0-cp313-cp313-linux_armv7l.whl", hash = "sha256:e9e408fc016dffd20661f0126c53d8a31c2821b5c13c5d67a0f5ed5de93319ad", size = 6017243, upload-time = "2026-03-30T08:47:40.075Z" }, - { url = "https://files.pythonhosted.org/packages/04/19/21a9806eb8240e174fd1ab0cd5b9aa948bb0e05c2f2f55f9d5d7405e6d08/grpcio-1.80.0-cp313-cp313-macosx_11_0_universal2.whl", hash = "sha256:92d787312e613754d4d8b9ca6d3297e69994a7912a32fa38c4c4e01c272974b0", size = 12010840, upload-time = "2026-03-30T08:47:43.11Z" }, - { url = "https://files.pythonhosted.org/packages/18/3a/23347d35f76f639e807fb7a36fad3068aed100996849a33809591f26eca6/grpcio-1.80.0-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:8ac393b58aa16991a2f1144ec578084d544038c12242da3a215966b512904d0f", size = 6567644, upload-time = "2026-03-30T08:47:46.806Z" }, - { url = "https://files.pythonhosted.org/packages/ff/40/96e07ecb604a6a67ae6ab151e3e35b132875d98bc68ec65f3e5ab3e781d7/grpcio-1.80.0-cp313-cp313-manylinux2014_i686.manylinux_2_17_i686.whl", hash = "sha256:68e5851ac4b9afe07e7f84483803ad167852570d65326b34d54ca560bfa53fb6", size = 7277830, upload-time = "2026-03-30T08:47:49.643Z" }, - { url = "https://files.pythonhosted.org/packages/9b/e2/da1506ecea1f34a5e365964644b35edef53803052b763ca214ba3870c856/grpcio-1.80.0-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:873ff5d17d68992ef6605330127425d2fc4e77e612fa3c3e0ed4e668685e3140", size = 6783216, upload-time = "2026-03-30T08:47:52.817Z" }, - { url = "https://files.pythonhosted.org/packages/44/83/3b20ff58d0c3b7f6caaa3af9a4174d4023701df40a3f39f7f1c8e7c48f9d/grpcio-1.80.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:2bea16af2750fd0a899bf1abd9022244418b55d1f37da2202249ba4ba673838d", size = 7385866, upload-time = "2026-03-30T08:47:55.687Z" }, - { url = "https://files.pythonhosted.org/packages/47/45/55c507599c5520416de5eefecc927d6a0d7af55e91cfffb2e410607e5744/grpcio-1.80.0-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:ba0db34f7e1d803a878284cd70e4c63cb6ae2510ba51937bf8f45ba997cefcf7", size = 8391602, upload-time = "2026-03-30T08:47:58.303Z" }, - { url = "https://files.pythonhosted.org/packages/10/bb/dd06f4c24c01db9cf11341b547d0a016b2c90ed7dbbb086a5710df7dd1d7/grpcio-1.80.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:8eb613f02d34721f1acf3626dfdb3545bd3c8505b0e52bf8b5710a28d02e8aa7", size = 7826752, upload-time = "2026-03-30T08:48:01.311Z" }, - { url = "https://files.pythonhosted.org/packages/f9/1e/9d67992ba23371fd63d4527096eb8c6b76d74d52b500df992a3343fd7251/grpcio-1.80.0-cp313-cp313-win32.whl", hash = "sha256:93b6f823810720912fd131f561f91f5fed0fda372b6b7028a2681b8194d5d294", size = 4142310, upload-time = "2026-03-30T08:48:04.594Z" }, - { url = "https://files.pythonhosted.org/packages/cf/e6/283326a27da9e2c3038bc93eeea36fb118ce0b2d03922a9cda6688f53c5b/grpcio-1.80.0-cp313-cp313-win_amd64.whl", hash = "sha256:e172cf795a3ba5246d3529e4d34c53db70e888fa582a8ffebd2e6e48bc0cba50", size = 4882833, upload-time = "2026-03-30T08:48:07.363Z" }, { url = "https://files.pythonhosted.org/packages/c5/6d/e65307ce20f5a09244ba9e9d8476e99fb039de7154f37fb85f26978b59c3/grpcio-1.80.0-cp314-cp314-linux_armv7l.whl", hash = "sha256:3d4147a97c8344d065d01bbf8b6acec2cf86fb0400d40696c8bdad34a64ffc0e", size = 6017376, upload-time = "2026-03-30T08:48:10.005Z" }, { url = "https://files.pythonhosted.org/packages/69/10/9cef5d9650c72625a699c549940f0abb3c4bfdb5ed45a5ce431f92f31806/grpcio-1.80.0-cp314-cp314-macosx_11_0_universal2.whl", hash = "sha256:d8e11f167935b3eb089ac9038e1a063e6d7dbe995c0bb4a661e614583352e76f", size = 12018133, upload-time = "2026-03-30T08:48:12.927Z" }, { url = "https://files.pythonhosted.org/packages/04/82/983aabaad82ba26113caceeb9091706a0696b25da004fe3defb5b346e15b/grpcio-1.80.0-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:f14b618fc30de822681ee986cfdcc2d9327229dc4c98aed16896761cacd468b9", size = 6574748, upload-time = "2026-03-30T08:48:16.386Z" }, @@ -1635,7 +1137,6 @@ dependencies = [ { name = "pygments" }, { name = "stack-data" }, { name = "traitlets" }, - { name = "typing-extensions", marker = "python_full_version < '3.12'" }, ] sdist = { url = "https://files.pythonhosted.org/packages/cd/c4/87cda5842cf5c31837c06ddb588e11c3c35d8ece89b7a0108c06b8c9b00a/ipython-9.13.0.tar.gz", hash = "sha256:7e834b6afc99f020e3f05966ced34792f40267d64cb1ea9043886dab0dde5967", size = 4430549, upload-time = "2026-04-24T12:24:55.221Z" } wheels = [ @@ -1845,7 +1346,6 @@ dependencies = [ { name = "jupyter-server-terminals" }, { name = "nbconvert" }, { name = "nbformat" }, - { name = "overrides", marker = "python_full_version < '3.12'" }, { name = "packaging" }, { name = "prometheus-client" }, { name = "pywinpty", marker = "os_name == 'nt'" }, @@ -1889,65 +1389,6 @@ version = "1.5.0" source = { registry = "https://pypi.org/simple" } sdist = { url = "https://files.pythonhosted.org/packages/d0/67/9c61eccb13f0bdca9307614e782fec49ffdde0f7a2314935d489fa93cd9c/kiwisolver-1.5.0.tar.gz", hash = "sha256:d4193f3d9dc3f6f79aaed0e5637f45d98850ebf01f7ca20e69457f3e8946b66a", size = 103482, upload-time = "2026-03-09T13:15:53.382Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/12/dd/a495a9c104be1c476f0386e714252caf2b7eca883915422a64c50b88c6f5/kiwisolver-1.5.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:9eed0f7edbb274413b6ee781cca50541c8c0facd3d6fd289779e494340a2b85c", size = 122798, upload-time = "2026-03-09T13:12:58.963Z" }, - { url = "https://files.pythonhosted.org/packages/11/60/37b4047a2af0cf5ef6d8b4b26e91829ae6fc6a2d1f74524bcb0e7cd28a32/kiwisolver-1.5.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:3c4923e404d6bcd91b6779c009542e5647fef32e4a5d75e115e3bbac6f2335eb", size = 66216, upload-time = "2026-03-09T13:13:00.155Z" }, - { url = "https://files.pythonhosted.org/packages/0a/aa/510dc933d87767584abfe03efa445889996c70c2990f6f87c3ebaa0a18c5/kiwisolver-1.5.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:0df54df7e686afa55e6f21fb86195224a6d9beb71d637e8d7920c95cf0f89aac", size = 63911, upload-time = "2026-03-09T13:13:01.671Z" }, - { url = "https://files.pythonhosted.org/packages/80/46/bddc13df6c2a40741e0cc7865bb1c9ed4796b6760bd04ce5fae3928ef917/kiwisolver-1.5.0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:2517e24d7315eb51c10664cdb865195df38ab74456c677df67bb47f12d088a27", size = 1438209, upload-time = "2026-03-09T13:13:03.385Z" }, - { url = "https://files.pythonhosted.org/packages/fd/d6/76621246f5165e5372f02f5e6f3f48ea336a8f9e96e43997d45b240ed8cd/kiwisolver-1.5.0-cp311-cp311-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:ff710414307fefa903e0d9bdf300972f892c23477829f49504e59834f4195398", size = 1248888, upload-time = "2026-03-09T13:13:05.231Z" }, - { url = "https://files.pythonhosted.org/packages/b2/c1/31559ec6fb39a5b48035ce29bb63ade628f321785f38c384dee3e2c08bc1/kiwisolver-1.5.0-cp311-cp311-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:6176c1811d9d5a04fa391c490cc44f451e240697a16977f11c6f722efb9041db", size = 1266304, upload-time = "2026-03-09T13:13:06.743Z" }, - { url = "https://files.pythonhosted.org/packages/5e/ef/1cb8276f2d29cc6a41e0a042f27946ca347d3a4a75acf85d0a16aa6dcc82/kiwisolver-1.5.0-cp311-cp311-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:50847dca5d197fcbd389c805aa1a1cf32f25d2e7273dc47ab181a517666b68cc", size = 1319650, upload-time = "2026-03-09T13:13:08.607Z" }, - { url = "https://files.pythonhosted.org/packages/4c/e4/5ba3cecd7ce6236ae4a80f67e5d5531287337d0e1f076ca87a5abe4cd5d0/kiwisolver-1.5.0-cp311-cp311-manylinux_2_39_riscv64.whl", hash = "sha256:01808c6d15f4c3e8559595d6d1fe6411c68e4a3822b4b9972b44473b24f4e679", size = 970949, upload-time = "2026-03-09T13:13:10.299Z" }, - { url = "https://files.pythonhosted.org/packages/5a/69/dc61f7ae9a2f071f26004ced87f078235b5507ab6e5acd78f40365655034/kiwisolver-1.5.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:f1f9f4121ec58628c96baa3de1a55a4e3a333c5102c8e94b64e23bf7b2083309", size = 2199125, upload-time = "2026-03-09T13:13:11.841Z" }, - { url = "https://files.pythonhosted.org/packages/e5/7b/abbe0f1b5afa85f8d084b73e90e5f801c0939eba16ac2e49af7c61a6c28d/kiwisolver-1.5.0-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:b7d335370ae48a780c6e6a6bbfa97342f563744c39c35562f3f367665f5c1de2", size = 2293783, upload-time = "2026-03-09T13:13:14.399Z" }, - { url = "https://files.pythonhosted.org/packages/8a/80/5908ae149d96d81580d604c7f8aefd0e98f4fd728cf172f477e9f2a81744/kiwisolver-1.5.0-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:800ee55980c18545af444d93fdd60c56b580db5cc54867d8cbf8a1dc0829938c", size = 1960726, upload-time = "2026-03-09T13:13:16.047Z" }, - { url = "https://files.pythonhosted.org/packages/84/08/a78cb776f8c085b7143142ce479859cfec086bd09ee638a317040b6ef420/kiwisolver-1.5.0-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:c438f6ca858697c9ab67eb28246c92508af972e114cac34e57a6d4ba17a3ac08", size = 2464738, upload-time = "2026-03-09T13:13:17.897Z" }, - { url = "https://files.pythonhosted.org/packages/b1/e1/65584da5356ed6cb12c63791a10b208860ac40a83de165cb6a6751a686e3/kiwisolver-1.5.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:8c63c91f95173f9c2a67c7c526b2cea976828a0e7fced9cdcead2802dc10f8a4", size = 2270718, upload-time = "2026-03-09T13:13:19.421Z" }, - { url = "https://files.pythonhosted.org/packages/be/6c/28f17390b62b8f2f520e2915095b3c94d88681ecf0041e75389d9667f202/kiwisolver-1.5.0-cp311-cp311-win_amd64.whl", hash = "sha256:beb7f344487cdcb9e1efe4b7a29681b74d34c08f0043a327a74da852a6749e7b", size = 73480, upload-time = "2026-03-09T13:13:20.818Z" }, - { url = "https://files.pythonhosted.org/packages/d8/0e/2ee5debc4f77a625778fec5501ff3e8036fe361b7ee28ae402a485bb9694/kiwisolver-1.5.0-cp311-cp311-win_arm64.whl", hash = "sha256:ad4ae4ffd1ee9cd11357b4c66b612da9888f4f4daf2f36995eda64bd45370cac", size = 64930, upload-time = "2026-03-09T13:13:21.997Z" }, - { url = "https://files.pythonhosted.org/packages/4d/b2/818b74ebea34dabe6d0c51cb1c572e046730e64844da6ed646d5298c40ce/kiwisolver-1.5.0-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:4e9750bc21b886308024f8a54ccb9a2cc38ac9fa813bf4348434e3d54f337ff9", size = 123158, upload-time = "2026-03-09T13:13:23.127Z" }, - { url = "https://files.pythonhosted.org/packages/bf/d9/405320f8077e8e1c5c4bd6adc45e1e6edf6d727b6da7f2e2533cf58bff71/kiwisolver-1.5.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:72ec46b7eba5b395e0a7b63025490d3214c11013f4aacb4f5e8d6c3041829588", size = 66388, upload-time = "2026-03-09T13:13:24.765Z" }, - { url = "https://files.pythonhosted.org/packages/99/9f/795fedf35634f746151ca8839d05681ceb6287fbed6cc1c9bf235f7887c2/kiwisolver-1.5.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:ed3a984b31da7481b103f68776f7128a89ef26ed40f4dc41a2223cda7fb24819", size = 64068, upload-time = "2026-03-09T13:13:25.878Z" }, - { url = "https://files.pythonhosted.org/packages/c4/13/680c54afe3e65767bed7ec1a15571e1a2f1257128733851ade24abcefbcc/kiwisolver-1.5.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:bb5136fb5352d3f422df33f0c879a1b0c204004324150cc3b5e3c4f310c9049f", size = 1477934, upload-time = "2026-03-09T13:13:27.166Z" }, - { url = "https://files.pythonhosted.org/packages/c8/2f/cebfcdb60fd6a9b0f6b47a9337198bcbad6fbe15e68189b7011fd914911f/kiwisolver-1.5.0-cp312-cp312-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:b2af221f268f5af85e776a73d62b0845fc8baf8ef0abfae79d29c77d0e776aaf", size = 1278537, upload-time = "2026-03-09T13:13:28.707Z" }, - { url = "https://files.pythonhosted.org/packages/f2/0d/9b782923aada3fafb1d6b84e13121954515c669b18af0c26e7d21f579855/kiwisolver-1.5.0-cp312-cp312-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:b0f172dc8ffaccb8522d7c5d899de00133f2f1ca7b0a49b7da98e901de87bf2d", size = 1296685, upload-time = "2026-03-09T13:13:30.528Z" }, - { url = "https://files.pythonhosted.org/packages/27/70/83241b6634b04fe44e892688d5208332bde130f38e610c0418f9ede47ded/kiwisolver-1.5.0-cp312-cp312-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:6ab8ba9152203feec73758dad83af9a0bbe05001eb4639e547207c40cfb52083", size = 1346024, upload-time = "2026-03-09T13:13:32.818Z" }, - { url = "https://files.pythonhosted.org/packages/e4/db/30ed226fb271ae1a6431fc0fe0edffb2efe23cadb01e798caeb9f2ceae8f/kiwisolver-1.5.0-cp312-cp312-manylinux_2_39_riscv64.whl", hash = "sha256:cdee07c4d7f6d72008d3f73b9bf027f4e11550224c7c50d8df1ae4a37c1402a6", size = 987241, upload-time = "2026-03-09T13:13:34.435Z" }, - { url = "https://files.pythonhosted.org/packages/ec/bd/c314595208e4c9587652d50959ead9e461995389664e490f4dce7ff0f782/kiwisolver-1.5.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:7c60d3c9b06fb23bd9c6139281ccbdc384297579ae037f08ae90c69f6845c0b1", size = 2227742, upload-time = "2026-03-09T13:13:36.4Z" }, - { url = "https://files.pythonhosted.org/packages/c1/43/0499cec932d935229b5543d073c2b87c9c22846aab48881e9d8d6e742a2d/kiwisolver-1.5.0-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:e315e5ec90d88e140f57696ff85b484ff68bb311e36f2c414aa4286293e6dee0", size = 2323966, upload-time = "2026-03-09T13:13:38.204Z" }, - { url = "https://files.pythonhosted.org/packages/3d/6f/79b0d760907965acfd9d61826a3d41f8f093c538f55cd2633d3f0db269f6/kiwisolver-1.5.0-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:1465387ac63576c3e125e5337a6892b9e99e0627d52317f3ca79e6930d889d15", size = 1977417, upload-time = "2026-03-09T13:13:39.966Z" }, - { url = "https://files.pythonhosted.org/packages/ab/31/01d0537c41cb75a551a438c3c7a80d0c60d60b81f694dac83dd436aec0d0/kiwisolver-1.5.0-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:530a3fd64c87cffa844d4b6b9768774763d9caa299e9b75d8eca6a4423b31314", size = 2491238, upload-time = "2026-03-09T13:13:41.698Z" }, - { url = "https://files.pythonhosted.org/packages/e4/34/8aefdd0be9cfd00a44509251ba864f5caf2991e36772e61c408007e7f417/kiwisolver-1.5.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:1d9daea4ea6b9be74fe2f01f7fbade8d6ffab263e781274cffca0dba9be9eec9", size = 2294947, upload-time = "2026-03-09T13:13:43.343Z" }, - { url = "https://files.pythonhosted.org/packages/ad/cf/0348374369ca588f8fe9c338fae49fa4e16eeb10ffb3d012f23a54578a9e/kiwisolver-1.5.0-cp312-cp312-win_amd64.whl", hash = "sha256:f18c2d9782259a6dc132fdc7a63c168cbc74b35284b6d75c673958982a378384", size = 73569, upload-time = "2026-03-09T13:13:45.792Z" }, - { url = "https://files.pythonhosted.org/packages/28/26/192b26196e2316e2bd29deef67e37cdf9870d9af8e085e521afff0fed526/kiwisolver-1.5.0-cp312-cp312-win_arm64.whl", hash = "sha256:f7c7553b13f69c1b29a5bde08ddc6d9d0c8bfb84f9ed01c30db25944aeb852a7", size = 64997, upload-time = "2026-03-09T13:13:46.878Z" }, - { url = "https://files.pythonhosted.org/packages/9d/69/024d6711d5ba575aa65d5538042e99964104e97fa153a9f10bc369182bc2/kiwisolver-1.5.0-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:fd40bb9cd0891c4c3cb1ddf83f8bbfa15731a248fdc8162669405451e2724b09", size = 123166, upload-time = "2026-03-09T13:13:48.032Z" }, - { url = "https://files.pythonhosted.org/packages/ce/48/adbb40df306f587054a348831220812b9b1d787aff714cfbc8556e38fccd/kiwisolver-1.5.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:c0e1403fd7c26d77c1f03e096dc58a5c726503fa0db0456678b8668f76f521e3", size = 66395, upload-time = "2026-03-09T13:13:49.365Z" }, - { url = "https://files.pythonhosted.org/packages/a8/3a/d0a972b34e1c63e2409413104216cd1caa02c5a37cb668d1687d466c1c45/kiwisolver-1.5.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:dda366d548e89a90d88a86c692377d18d8bd64b39c1fb2b92cb31370e2896bbd", size = 64065, upload-time = "2026-03-09T13:13:50.562Z" }, - { url = "https://files.pythonhosted.org/packages/2b/0a/7b98e1e119878a27ba8618ca1e18b14f992ff1eda40f47bccccf4de44121/kiwisolver-1.5.0-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:332b4f0145c30b5f5ad9374881133e5aa64320428a57c2c2b61e9d891a51c2f3", size = 1477903, upload-time = "2026-03-09T13:13:52.084Z" }, - { url = "https://files.pythonhosted.org/packages/18/d8/55638d89ffd27799d5cc3d8aa28e12f4ce7a64d67b285114dbedc8ea4136/kiwisolver-1.5.0-cp313-cp313-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:0c50b89ffd3e1a911c69a1dd3de7173c0cd10b130f56222e57898683841e4f96", size = 1278751, upload-time = "2026-03-09T13:13:54.673Z" }, - { url = "https://files.pythonhosted.org/packages/b8/97/b4c8d0d18421ecceba20ad8701358453b88e32414e6f6950b5a4bad54e65/kiwisolver-1.5.0-cp313-cp313-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:4db576bb8c3ef9365f8b40fe0f671644de6736ae2c27a2c62d7d8a1b4329f099", size = 1296793, upload-time = "2026-03-09T13:13:56.287Z" }, - { url = "https://files.pythonhosted.org/packages/c4/10/f862f94b6389d8957448ec9df59450b81bec4abb318805375c401a1e6892/kiwisolver-1.5.0-cp313-cp313-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:0b85aad90cea8ac6797a53b5d5f2e967334fa4d1149f031c4537569972596cb8", size = 1346041, upload-time = "2026-03-09T13:13:58.269Z" }, - { url = "https://files.pythonhosted.org/packages/a3/6a/f1650af35821eaf09de398ec0bc2aefc8f211f0cda50204c9f1673741ba9/kiwisolver-1.5.0-cp313-cp313-manylinux_2_39_riscv64.whl", hash = "sha256:d36ca54cb4c6c4686f7cbb7b817f66f5911c12ddb519450bbe86707155028f87", size = 987292, upload-time = "2026-03-09T13:13:59.871Z" }, - { url = "https://files.pythonhosted.org/packages/de/19/d7fb82984b9238115fe629c915007be608ebd23dc8629703d917dbfaffd4/kiwisolver-1.5.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:38f4a703656f493b0ad185211ccfca7f0386120f022066b018eb5296d8613e23", size = 2227865, upload-time = "2026-03-09T13:14:01.401Z" }, - { url = "https://files.pythonhosted.org/packages/7f/b9/46b7f386589fd222dac9e9de9c956ce5bcefe2ee73b4e79891381dda8654/kiwisolver-1.5.0-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:3ac2360e93cb41be81121755c6462cff3beaa9967188c866e5fce5cf13170859", size = 2324369, upload-time = "2026-03-09T13:14:02.972Z" }, - { url = "https://files.pythonhosted.org/packages/92/8b/95e237cf3d9c642960153c769ddcbe278f182c8affb20cecc1cc983e7cc5/kiwisolver-1.5.0-cp313-cp313-musllinux_1_2_riscv64.whl", hash = "sha256:c95cab08d1965db3d84a121f1c7ce7479bdd4072c9b3dafd8fecce48a2e6b902", size = 1977989, upload-time = "2026-03-09T13:14:04.503Z" }, - { url = "https://files.pythonhosted.org/packages/1b/95/980c9df53501892784997820136c01f62bc1865e31b82b9560f980c0e649/kiwisolver-1.5.0-cp313-cp313-musllinux_1_2_s390x.whl", hash = "sha256:fc20894c3d21194d8041a28b65622d5b86db786da6e3cfe73f0c762951a61167", size = 2491645, upload-time = "2026-03-09T13:14:06.106Z" }, - { url = "https://files.pythonhosted.org/packages/cb/32/900647fd0840abebe1561792c6b31e6a7c0e278fc3973d30572a965ca14c/kiwisolver-1.5.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:7a32f72973f0f950c1920475d5c5ea3d971b81b6f0ec53b8d0a956cc965f22e0", size = 2295237, upload-time = "2026-03-09T13:14:08.891Z" }, - { url = "https://files.pythonhosted.org/packages/be/8a/be60e3bbcf513cc5a50f4a3e88e1dcecebb79c1ad607a7222877becaa101/kiwisolver-1.5.0-cp313-cp313-win_amd64.whl", hash = "sha256:0bf3acf1419fa93064a4c2189ac0b58e3be7872bf6ee6177b0d4c63dc4cea276", size = 73573, upload-time = "2026-03-09T13:14:12.327Z" }, - { url = "https://files.pythonhosted.org/packages/4d/d2/64be2e429eb4fca7f7e1c52a91b12663aeaf25de3895e5cca0f47ef2a8d0/kiwisolver-1.5.0-cp313-cp313-win_arm64.whl", hash = "sha256:fa8eb9ecdb7efb0b226acec134e0d709e87a909fa4971a54c0c4f6e88635484c", size = 64998, upload-time = "2026-03-09T13:14:13.469Z" }, - { url = "https://files.pythonhosted.org/packages/b0/69/ce68dd0c85755ae2de490bf015b62f2cea5f6b14ff00a463f9d0774449ff/kiwisolver-1.5.0-cp313-cp313t-macosx_10_13_universal2.whl", hash = "sha256:db485b3847d182b908b483b2ed133c66d88d49cacf98fd278fadafe11b4478d1", size = 125700, upload-time = "2026-03-09T13:14:14.636Z" }, - { url = "https://files.pythonhosted.org/packages/74/aa/937aac021cf9d4349990d47eb319309a51355ed1dbdc9c077cdc9224cb11/kiwisolver-1.5.0-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:be12f931839a3bdfe28b584db0e640a65a8bcbc24560ae3fdb025a449b3d754e", size = 67537, upload-time = "2026-03-09T13:14:15.808Z" }, - { url = "https://files.pythonhosted.org/packages/ee/20/3a87fbece2c40ad0f6f0aefa93542559159c5f99831d596050e8afae7a9f/kiwisolver-1.5.0-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:16b85d37c2cbb3253226d26e64663f755d88a03439a9c47df6246b35defbdfb7", size = 65514, upload-time = "2026-03-09T13:14:18.035Z" }, - { url = "https://files.pythonhosted.org/packages/f0/7f/f943879cda9007c45e1f7dba216d705c3a18d6b35830e488b6c6a4e7cdf0/kiwisolver-1.5.0-cp313-cp313t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:4432b835675f0ea7414aab3d37d119f7226d24869b7a829caeab49ebda407b0c", size = 1584848, upload-time = "2026-03-09T13:14:19.745Z" }, - { url = "https://files.pythonhosted.org/packages/37/f8/4d4f85cc1870c127c88d950913370dd76138482161cd07eabbc450deff01/kiwisolver-1.5.0-cp313-cp313t-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:1b0feb50971481a2cc44d94e88bdb02cdd497618252ae226b8eb1201b957e368", size = 1391542, upload-time = "2026-03-09T13:14:21.54Z" }, - { url = "https://files.pythonhosted.org/packages/04/0b/65dd2916c84d252b244bd405303220f729e7c17c9d7d33dca6feeff9ffc4/kiwisolver-1.5.0-cp313-cp313t-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:56fa888f10d0f367155e76ce849fa1166fc9730d13bd2d65a2aa13b6f5424489", size = 1404447, upload-time = "2026-03-09T13:14:23.205Z" }, - { url = "https://files.pythonhosted.org/packages/39/5c/2606a373247babce9b1d056c03a04b65f3cf5290a8eac5d7bdead0a17e21/kiwisolver-1.5.0-cp313-cp313t-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:940dda65d5e764406b9fb92761cbf462e4e63f712ab60ed98f70552e496f3bf1", size = 1455918, upload-time = "2026-03-09T13:14:24.74Z" }, - { url = "https://files.pythonhosted.org/packages/d5/d1/c6078b5756670658e9192a2ef11e939c92918833d2745f85cd14a6004bdf/kiwisolver-1.5.0-cp313-cp313t-manylinux_2_39_riscv64.whl", hash = "sha256:89fc958c702ee9a745e4700378f5d23fddbc46ff89e8fdbf5395c24d5c1452a3", size = 1072856, upload-time = "2026-03-09T13:14:26.597Z" }, - { url = "https://files.pythonhosted.org/packages/cb/c8/7def6ddf16eb2b3741d8b172bdaa9af882b03c78e9b0772975408801fa63/kiwisolver-1.5.0-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:9027d773c4ff81487181a925945743413f6069634d0b122d0b37684ccf4f1e18", size = 2333580, upload-time = "2026-03-09T13:14:28.237Z" }, - { url = "https://files.pythonhosted.org/packages/9e/87/2ac1fce0eb1e616fcd3c35caa23e665e9b1948bb984f4764790924594128/kiwisolver-1.5.0-cp313-cp313t-musllinux_1_2_ppc64le.whl", hash = "sha256:5b233ea3e165e43e35dba1d2b8ecc21cf070b45b65ae17dd2747d2713d942021", size = 2423018, upload-time = "2026-03-09T13:14:30.018Z" }, - { url = "https://files.pythonhosted.org/packages/67/13/c6700ccc6cc218716bfcda4935e4b2997039869b4ad8a94f364c5a3b8e63/kiwisolver-1.5.0-cp313-cp313t-musllinux_1_2_riscv64.whl", hash = "sha256:ce9bf03dad3b46408c08649c6fbd6ca28a9fce0eb32fdfffa6775a13103b5310", size = 2062804, upload-time = "2026-03-09T13:14:32.888Z" }, - { url = "https://files.pythonhosted.org/packages/1b/bd/877056304626943ff0f1f44c08f584300c199b887cb3176cd7e34f1515f1/kiwisolver-1.5.0-cp313-cp313t-musllinux_1_2_s390x.whl", hash = "sha256:fc4d3f1fb9ca0ae9f97b095963bc6326f1dbfd3779d6679a1e016b9baaa153d3", size = 2597482, upload-time = "2026-03-09T13:14:34.971Z" }, - { url = "https://files.pythonhosted.org/packages/75/19/c60626c47bf0f8ac5dcf72c6c98e266d714f2fbbfd50cf6dab5ede3aaa50/kiwisolver-1.5.0-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:f443b4825c50a51ee68585522ab4a1d1257fac65896f282b4c6763337ac9f5d2", size = 2394328, upload-time = "2026-03-09T13:14:36.816Z" }, - { url = "https://files.pythonhosted.org/packages/47/84/6a6d5e5bb8273756c27b7d810d47f7ef2f1f9b9fd23c9ee9a3f8c75c9cef/kiwisolver-1.5.0-cp313-cp313t-win_arm64.whl", hash = "sha256:893ff3a711d1b515ba9da14ee090519bad4610ed1962fbe298a434e8c5f8db53", size = 68410, upload-time = "2026-03-09T13:14:38.695Z" }, { url = "https://files.pythonhosted.org/packages/e4/d7/060f45052f2a01ad5762c8fdecd6d7a752b43400dc29ff75cd47225a40fd/kiwisolver-1.5.0-cp314-cp314-macosx_10_15_universal2.whl", hash = "sha256:8df31fe574b8b3993cc61764f40941111b25c2d9fea13d3ce24a49907cd2d615", size = 123231, upload-time = "2026-03-09T13:14:41.323Z" }, { url = "https://files.pythonhosted.org/packages/c2/a7/78da680eadd06ff35edef6ef68a1ad273bad3e2a0936c9a885103230aece/kiwisolver-1.5.0-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:1d49a49ac4cbfb7c1375301cd1ec90169dfeae55ff84710d782260ce77a75a02", size = 66489, upload-time = "2026-03-09T13:14:42.534Z" }, { url = "https://files.pythonhosted.org/packages/49/b2/97980f3ad4fae37dd7fe31626e2bf75fbf8bdf5d303950ec1fab39a12da8/kiwisolver-1.5.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:0cbe94b69b819209a62cb27bdfa5dc2a8977d8de2f89dfd97ba4f53ed3af754e", size = 64063, upload-time = "2026-03-09T13:14:44.759Z" }, @@ -1978,15 +1419,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/07/18/43a5f24608d8c313dd189cf838c8e68d75b115567c6279de7796197cfb6a/kiwisolver-1.5.0-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:e7a116ae737f0000343218c4edf5bd45893bfeaff0993c0b215d7124c9f77646", size = 2394403, upload-time = "2026-03-09T13:15:31.517Z" }, { url = "https://files.pythonhosted.org/packages/3b/b5/98222136d839b8afabcaa943b09bd05888c2d36355b7e448550211d1fca4/kiwisolver-1.5.0-cp314-cp314t-win_amd64.whl", hash = "sha256:1dd9b0b119a350976a6d781e7278ec7aca0b201e1a9e2d23d9804afecb6ca681", size = 79687, upload-time = "2026-03-09T13:15:33.204Z" }, { url = "https://files.pythonhosted.org/packages/99/a2/ca7dc962848040befed12732dff6acae7fb3c4f6fc4272b3f6c9a30b8713/kiwisolver-1.5.0-cp314-cp314t-win_arm64.whl", hash = "sha256:58f812017cd2985c21fbffb4864d59174d4903dd66fa23815e74bbc7a0e2dd57", size = 70032, upload-time = "2026-03-09T13:15:34.411Z" }, - { url = "https://files.pythonhosted.org/packages/1c/fa/2910df836372d8761bb6eff7d8bdcb1613b5c2e03f260efe7abe34d388a7/kiwisolver-1.5.0-graalpy312-graalpy250_312_native-macosx_10_13_x86_64.whl", hash = "sha256:5ae8e62c147495b01a0f4765c878e9bfdf843412446a247e28df59936e99e797", size = 130262, upload-time = "2026-03-09T13:15:35.629Z" }, - { url = "https://files.pythonhosted.org/packages/0f/41/c5f71f9f00aabcc71fee8b7475e3f64747282580c2fe748961ba29b18385/kiwisolver-1.5.0-graalpy312-graalpy250_312_native-macosx_11_0_arm64.whl", hash = "sha256:f6764a4ccab3078db14a632420930f6186058750df066b8ea2a7106df91d3203", size = 138036, upload-time = "2026-03-09T13:15:36.894Z" }, - { url = "https://files.pythonhosted.org/packages/fa/06/7399a607f434119c6e1fdc8ec89a8d51ccccadf3341dee4ead6bd14caaf5/kiwisolver-1.5.0-graalpy312-graalpy250_312_native-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:c31c13da98624f957b0fb1b5bae5383b2333c2c3f6793d9825dd5ce79b525cb7", size = 194295, upload-time = "2026-03-09T13:15:38.22Z" }, - { url = "https://files.pythonhosted.org/packages/b5/91/53255615acd2a1eaca307ede3c90eb550bae9c94581f8c00081b6b1c8f44/kiwisolver-1.5.0-graalpy312-graalpy250_312_native-win_amd64.whl", hash = "sha256:1f1489f769582498610e015a8ef2d36f28f505ab3096d0e16b4858a9ec214f57", size = 75987, upload-time = "2026-03-09T13:15:39.65Z" }, - { url = "https://files.pythonhosted.org/packages/e9/eb/5fcbbbf9a0e2c3a35effb88831a483345326bbc3a030a3b5b69aee647f84/kiwisolver-1.5.0-pp311-pypy311_pp73-macosx_10_15_x86_64.whl", hash = "sha256:ec4c85dc4b687c7f7f15f553ff26a98bfe8c58f5f7f0ac8905f0ba4c7be60232", size = 59532, upload-time = "2026-03-09T13:15:47.047Z" }, - { url = "https://files.pythonhosted.org/packages/c3/9b/e17104555bb4db148fd52327feea1e96be4b88e8e008b029002c281a21ab/kiwisolver-1.5.0-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:12e91c215a96e39f57989c8912ae761286ac5a9584d04030ceb3368a357f017a", size = 57420, upload-time = "2026-03-09T13:15:48.199Z" }, - { url = "https://files.pythonhosted.org/packages/48/44/2b5b95b7aa39fb2d8d9d956e0f3d5d45aef2ae1d942d4c3ffac2f9cfed1a/kiwisolver-1.5.0-pp311-pypy311_pp73-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:be4a51a55833dc29ab5d7503e7bcb3b3af3402d266018137127450005cdfe737", size = 79892, upload-time = "2026-03-09T13:15:49.694Z" }, - { url = "https://files.pythonhosted.org/packages/52/7d/7157f9bba6b455cfb4632ed411e199fc8b8977642c2b12082e1bd9e6d173/kiwisolver-1.5.0-pp311-pypy311_pp73-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:daae526907e262de627d8f70058a0f64acc9e2641c164c99c8f594b34a799a16", size = 77603, upload-time = "2026-03-09T13:15:50.945Z" }, - { url = "https://files.pythonhosted.org/packages/0a/dd/8050c947d435c8d4bc94e3252f4d8bb8a76cfb424f043a8680be637a57f1/kiwisolver-1.5.0-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:59cd8683f575d96df5bb48f6add94afc055012c29e28124fcae2b63661b9efb1", size = 73558, upload-time = "2026-03-09T13:15:52.112Z" }, ] [[package]] @@ -2016,58 +1448,6 @@ version = "6.1.1" source = { registry = "https://pypi.org/simple" } sdist = { url = "https://files.pythonhosted.org/packages/05/3b/aab6728cae887456f409b4d75e8a01856e4f04bd510de38052a47768b680/lxml-6.1.1.tar.gz", hash = "sha256:ba96ae44888e0185281e937633a743ea90d5a196c6000f82565ebb0580012d40", size = 4197430, upload-time = "2026-05-18T19:19:06.424Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/62/b0/83f481780d1548750b8ce2ec824073deef2f452d9cd1a6faff8507e3d16d/lxml-6.1.1-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:53b7d2b7a10b1c35c0a5e21e9224accf60c1bbfba523990732e521b2b73adef2", size = 8526461, upload-time = "2026-05-18T19:17:25.862Z" }, - { url = "https://files.pythonhosted.org/packages/b9/d5/30fa0f808002c7329397bfbb24e306789c0b29f04aa5842c07b174b4216f/lxml-6.1.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:ff3f333630ab480244a1bff72043e511a91eb22e7595dead8653ee5612dd8f3d", size = 4595375, upload-time = "2026-05-18T19:17:34.555Z" }, - { url = "https://files.pythonhosted.org/packages/4f/d2/edb71cf0e561581a7c5eb2626244320eb04e9f8ce6d563184fd668b45073/lxml-6.1.1-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:a4bbea04c97f6d78a48e3fbc1cb9116d2780b1b39e03a23f6eb9b603fd61f510", size = 4923654, upload-time = "2026-05-18T19:17:42.917Z" }, - { url = "https://files.pythonhosted.org/packages/4c/77/1bc7eeb0de4577d783fb625aa092cc9357883bba35845a3666bf1259f3dc/lxml-6.1.1-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:db1d75f6617a49c1c01bc7023713e0ff59ab32c9579ae62a7674c0e34f3b0b0a", size = 5067921, upload-time = "2026-05-18T19:17:49.175Z" }, - { url = "https://files.pythonhosted.org/packages/1b/3c/c0690d74bd2bc17bc03b5b0d093569ead597dd0bfa088bf99eef8c24e19c/lxml-6.1.1-cp311-cp311-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:3a12689be69a28ddaa0ab99a5a1137da2afd5f8f16df7b5680b66f616d3eda1d", size = 5002456, upload-time = "2026-05-18T19:17:59.715Z" }, - { url = "https://files.pythonhosted.org/packages/66/8d/d1b3271af0c0f1e27e8472a849e4d2c65bc7766884b9ad2da9e76e145c88/lxml-6.1.1-cp311-cp311-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:18b73c339ae29b90fd2d06e58ebd555a751bde9cd6bbd36cc0281b9a2c94e9d8", size = 5202776, upload-time = "2026-05-18T19:18:08.924Z" }, - { url = "https://files.pythonhosted.org/packages/7a/45/689824ffb237fd10125ad273f32b28ff04dc6203c2822c85ff65a93df65e/lxml-6.1.1-cp311-cp311-manylinux_2_28_i686.whl", hash = "sha256:752d3bbfe874715ccd0aec7f88d7fc623c0f1fd7aa7b3238a084e017bad2a009", size = 5329945, upload-time = "2026-05-18T19:18:13.673Z" }, - { url = "https://files.pythonhosted.org/packages/5d/c0/ef73af53767e958fd87d437c170f272e2f6e6c0f854939f133a895f1e711/lxml-6.1.1-cp311-cp311-manylinux_2_31_armv7l.whl", hash = "sha256:6b1761fbf9ec984e2e9d9c589ef5f5fd684b7c19f92aadd567a26c5224958db6", size = 4659237, upload-time = "2026-05-18T19:18:18.657Z" }, - { url = "https://files.pythonhosted.org/packages/a0/5e/e1158e40397585e91cb0472374a1f63d0926a1ddeaa92f13d1a1ffe306d5/lxml-6.1.1-cp311-cp311-manylinux_2_38_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:d680fbcb768404c601ecb43519ecd8461f6954cb11c06a78962f666832ccfca8", size = 5265904, upload-time = "2026-05-18T19:18:24.883Z" }, - { url = "https://files.pythonhosted.org/packages/a0/16/8687e5d1400ed1c0bc41dace232ebb7553952b618ea1f2e5fb6e2cfbbe23/lxml-6.1.1-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:162af1091cd785f2f27e62d3547ae9bc58ec5c86dd314d67021fd02463708d83", size = 5045225, upload-time = "2026-05-18T19:17:20.073Z" }, - { url = "https://files.pythonhosted.org/packages/ca/18/d877bd1ae2e5ffdfd4836565aba350db31feb2f2656d6ce70316ed66a05e/lxml-6.1.1-cp311-cp311-musllinux_1_2_armv7l.whl", hash = "sha256:e9308ff8241c532df3f3e570f9a5aeed6c853f888512ba4b75638d7c11c95ef6", size = 4712721, upload-time = "2026-05-18T19:17:40.512Z" }, - { url = "https://files.pythonhosted.org/packages/44/4d/1f44fd1d770b10dacbf6b5c6e520f4d6e0708744930f719dc04e67cab981/lxml-6.1.1-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:5f6994074ebae6ffb04447268e37dc16edc304f9859cf91acb86e0af6c1b395c", size = 5252549, upload-time = "2026-05-18T19:17:51.236Z" }, - { url = "https://files.pythonhosted.org/packages/64/5d/1d66b84f850089254c230ef6ea6b267a5a54e2e179a5d960036a05d501d7/lxml-6.1.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:80c2dfadb855da477cf73373ad29a333535dedb9b12bad02c9814c8e2b43bf08", size = 5226877, upload-time = "2026-05-18T19:18:00.875Z" }, - { url = "https://files.pythonhosted.org/packages/ad/00/84c4b5302d42a2d0184f38d538c8a197f33b52a50bd4f7bcfe990bce3036/lxml-6.1.1-cp311-cp311-win32.whl", hash = "sha256:30a89d3ac8faec007453fb541f3f46807eeec88edd5826f6e3fe001752a2c621", size = 3594072, upload-time = "2026-05-18T19:17:12.714Z" }, - { url = "https://files.pythonhosted.org/packages/61/9d/2e2f7d876349f45e0f3e29f72da311668853d59b58d473a2dea4f0160135/lxml-6.1.1-cp311-cp311-win_amd64.whl", hash = "sha256:abbefa31eee84842140f67acef1c828e28bba8bbf0c3bc6e5492a9af88152c28", size = 4025469, upload-time = "2026-05-18T19:17:50.566Z" }, - { url = "https://files.pythonhosted.org/packages/b0/d5/570e6390e4110331e6208b2ba83d1482cc9146808ee118b22824a34c1070/lxml-6.1.1-cp311-cp311-win_arm64.whl", hash = "sha256:dcb292aa7fe485ceff7af4f92e46c5af397daec5dff64871a528f0fc47a3cc5b", size = 3667640, upload-time = "2026-05-19T19:22:48.293Z" }, - { url = "https://files.pythonhosted.org/packages/6a/6e/c4add832b6fc1e887125b96f880d7b9b70aae5248718e046b1704bcac4b9/lxml-6.1.1-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:104c09bda8d2a562824c0e319d0768ce26a779b7601e0931d33b09b53c392ef7", size = 8570821, upload-time = "2026-05-18T19:17:42.068Z" }, - { url = "https://files.pythonhosted.org/packages/22/00/ff3009c88e65de8011630acf8ab5a09cb2becd2aaf47fba2f3449f6224e9/lxml-6.1.1-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:25c6997a9a534e016695a0ba06b2f07945de682731ff01065b6d5a4474179da1", size = 4624252, upload-time = "2026-05-18T19:17:47.897Z" }, - { url = "https://files.pythonhosted.org/packages/42/95/bb63f0fd62e554fe078e1fb3c8fe9083c14ddc7ad7fa178d10e57e071ac7/lxml-6.1.1-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:c921ba5c51e4e9f63b8b00267d06566e1f63407408a0496da2d1d0bfc819c7fc", size = 4930746, upload-time = "2026-05-18T19:18:29.637Z" }, - { url = "https://files.pythonhosted.org/packages/eb/99/0013e8d9b5960f4f041cf0b73e2f80c23eb5205b1f7bfb20203243651359/lxml-6.1.1-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:54a7f95e4de5fb94e2f9f4b9055c6ba33bf3d628fd77a1d647c5923caa2cdcdc", size = 5093723, upload-time = "2026-05-18T19:18:34.168Z" }, - { url = "https://files.pythonhosted.org/packages/29/91/317b332636bfc7bddcff828d41b3307f50043f4b237e40849c333d80fa1a/lxml-6.1.1-cp312-cp312-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:96f2ec43df44b1f76249ee0a615334f9b5b060e1c8bd90e706dad2d14d02f383", size = 5005557, upload-time = "2026-05-18T19:18:39.798Z" }, - { url = "https://files.pythonhosted.org/packages/42/2f/cc9bf06afe70f9c9093ae60855d9759da9db601ec4080f7473319666ffd7/lxml-6.1.1-cp312-cp312-manylinux_2_26_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:70ef8a7e102a1508f8121aae5b0867abd663f72c14f0a9c937e6554cb4587b7b", size = 5631036, upload-time = "2026-05-18T19:18:44.858Z" }, - { url = "https://files.pythonhosted.org/packages/08/f6/af32e23e563971ffb0fb86be52bc5be5c2c118858ffc119bf6a9039b173d/lxml-6.1.1-cp312-cp312-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:ebe6af670449830d6d9b752c256a983291c766a1365ba5d5460048f9e33a7818", size = 5240367, upload-time = "2026-05-18T19:18:49.217Z" }, - { url = "https://files.pythonhosted.org/packages/78/83/8555d40948b09ce86f1bd0c68a7ac31d07b1929f92cc1b074006c97ef2d2/lxml-6.1.1-cp312-cp312-manylinux_2_28_i686.whl", hash = "sha256:27acc820660aaffa4f7c087f29120e12980f7779d56d8492d263170111284740", size = 5350171, upload-time = "2026-05-18T19:18:52.779Z" }, - { url = "https://files.pythonhosted.org/packages/63/75/5d92da93729b7bad783689e6496049fa40927b45bec7bf183c981de3ca70/lxml-6.1.1-cp312-cp312-manylinux_2_31_armv7l.whl", hash = "sha256:1db753c9115ec7100d073b744d17e25e88a8f90f5c39b2f5dd878149af59671f", size = 4694874, upload-time = "2026-05-18T19:18:55.139Z" }, - { url = "https://files.pythonhosted.org/packages/c5/b5/3aad415a9a25b822e783f15deeb4dffccf5113030f1afa2222dd929313d9/lxml-6.1.1-cp312-cp312-manylinux_2_38_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:c4f469aebd783bb741c2ecb2a681008fd26bfe5c16a9a72ed5467f834e810df2", size = 5244492, upload-time = "2026-05-18T19:19:01.28Z" }, - { url = "https://files.pythonhosted.org/packages/f1/a1/5fcf7eb9904b80086aa47dcf0027de07b1bb990afad2e6823144c368ae04/lxml-6.1.1-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:766b010012d59470072c1816b5b6c69f1d243e5db36ea5968e94accf430a4635", size = 5048232, upload-time = "2026-05-18T19:18:12.67Z" }, - { url = "https://files.pythonhosted.org/packages/77/74/1f601b63c7a69fcdf10fa9b148c81da8442204194f6c55509cc485c786b9/lxml-6.1.1-cp312-cp312-musllinux_1_2_armv7l.whl", hash = "sha256:b8d812c6011c08b8111a15e54dd990b8923692d80adf35488bee34026c35accf", size = 4777023, upload-time = "2026-05-18T19:18:15.928Z" }, - { url = "https://files.pythonhosted.org/packages/a2/b9/7a78f51aec95b1bf780d78e12705a9f6533284f8693dc5c0e6724fa53d3f/lxml-6.1.1-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:fe0306bd29505a9177aac19f1877174b0e7422c222a59f70b2cd41633448c3dc", size = 5645773, upload-time = "2026-05-18T19:18:23.223Z" }, - { url = "https://files.pythonhosted.org/packages/a5/6e/98a7b7ad54e4e74fa1f20fff776913980619d0ebe5558232d7da6580bdd8/lxml-6.1.1-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:5ba186ad207446c65d3bb3d3e0412b032b1d9f595e59861e2354798c5703d955", size = 5233088, upload-time = "2026-05-18T19:18:31.433Z" }, - { url = "https://files.pythonhosted.org/packages/65/d1/bc0ed2427bf609f2ee10da303a6a226f9c8bce94f945dc29a32ce55de6e4/lxml-6.1.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:aa366a1e55b8ebfe8ca8ddc3cfe75c8ebade181aeb0f661d0cb05986b647f72a", size = 5260995, upload-time = "2026-05-18T19:18:37.091Z" }, - { url = "https://files.pythonhosted.org/packages/69/8b/6772e1a4b513fc50a8d931f19edde0e13ae6918510a1e13ff67864f3e5ed/lxml-6.1.1-cp312-cp312-win32.whl", hash = "sha256:126c93f7f56f0eda92f6d8c619edc463a4f23d9252f1c9d0405a76f25fa9f11a", size = 3596382, upload-time = "2026-05-18T19:17:18.37Z" }, - { url = "https://files.pythonhosted.org/packages/1b/89/45198e9624762af2dfd2cb8782598477ceb29f6e59caab560388ae1f4ec1/lxml-6.1.1-cp312-cp312-win_amd64.whl", hash = "sha256:26e6eda8d38c1fcab1090dd196ee87cbd13788e531937610e2589085de074e77", size = 3997255, upload-time = "2026-05-18T19:17:56.781Z" }, - { url = "https://files.pythonhosted.org/packages/90/a9/7a54b6834088d9ae528a7b780584ba6a39a9457b0ac330479f20ffbc9449/lxml-6.1.1-cp312-cp312-win_arm64.whl", hash = "sha256:6540377fbd53fe1b629172288c464fb18db11ce1fa7dc15891da10aa9dcc3e7f", size = 3659610, upload-time = "2026-05-19T19:22:50.843Z" }, - { url = "https://files.pythonhosted.org/packages/a5/eb/7e6f37c5584ccbb2ff267f56fd0339016938c1c8684cfefab9b33ffc2f36/lxml-6.1.1-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:68a9198d0fc122d14bb76837de9aa80cf84caed990b5b237f532ed87d3706736", size = 8559780, upload-time = "2026-05-18T19:17:57.661Z" }, - { url = "https://files.pythonhosted.org/packages/a1/36/587c2521cf23a2cd6c9c22108aa7528f683a1f195ed7ccd23a4b1786ad36/lxml-6.1.1-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:7d47866cb32fb503450b6edc9df355d10dc49836af2e89901bd6ac6b0896d9d9", size = 4618006, upload-time = "2026-05-18T19:18:04.452Z" }, - { url = "https://files.pythonhosted.org/packages/6e/ca/ab7bfe2bf4c972af5e7878262845ead3a24a929a9b04bc11c7c1ece6c82a/lxml-6.1.1-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:eb7c9811bfaa8b1ed5ed319f5d370dfbcaa59d52ea64be2a5a85e18195930354", size = 4924139, upload-time = "2026-05-18T19:19:04.873Z" }, - { url = "https://files.pythonhosted.org/packages/6b/55/a0c72851dfee5ecc689f949723a73dea457758912542cb955b108eaf0d8f/lxml-6.1.1-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:762ff394d5bd56da0cf034a23dcce4e13923f15321a2adfa2ac00201dc6d3fca", size = 5082329, upload-time = "2026-05-18T19:19:09.728Z" }, - { url = "https://files.pythonhosted.org/packages/f0/b6/0608f7d61a3b96cc67e5648a3d906e31a5082093e10e7be65b3886289938/lxml-6.1.1-cp313-cp313-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:a088f287f7d8275a33c07f2cac6c50b9319309a0200a39e7e75d80c707723099", size = 4993564, upload-time = "2026-05-18T19:19:13.608Z" }, - { url = "https://files.pythonhosted.org/packages/4c/66/ae227524b066d29d55bf0b453d93d2d793c40218657d643dcbbca13b8faf/lxml-6.1.1-cp313-cp313-manylinux_2_26_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:e902da4b04e6b52e5893900d4b8ab46068f75f3561f01bf1080957f9fd932ed6", size = 5613467, upload-time = "2026-05-18T19:19:16.228Z" }, - { url = "https://files.pythonhosted.org/packages/a6/76/dbe4a00b50385e40194231dcfe5a12c059de7cf90e89c83407d2b085b719/lxml-6.1.1-cp313-cp313-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:1d4962d4c66bf830a7e59ed6cfc17d148149898a3aefa8ec6e59763e6e3ed085", size = 5228304, upload-time = "2026-05-18T19:19:19.354Z" }, - { url = "https://files.pythonhosted.org/packages/1c/01/00b1b8442ed2041793336868ba0b9ea4b13d7da7c085c6404c207a63bf79/lxml-6.1.1-cp313-cp313-manylinux_2_28_i686.whl", hash = "sha256:581d4c8ae690a6609e64862dd6b7c2489635c2d13907fc2b20f2bc200ff1d21e", size = 5341607, upload-time = "2026-05-18T19:19:22.297Z" }, - { url = "https://files.pythonhosted.org/packages/63/36/1ad29931e9a4638bb707869f01d423a6c815f82152138d1a40dfcfde2b95/lxml-6.1.1-cp313-cp313-manylinux_2_31_armv7l.whl", hash = "sha256:876e1ff5930ed8bf295ec5ef9a8155e9b6b1876bbf1deed8b3a8069311875a8f", size = 4700168, upload-time = "2026-05-18T19:19:25.133Z" }, - { url = "https://files.pythonhosted.org/packages/3c/d1/a9536cecf9be18a0dc72d32bead283a2332d1ffebd2dd3ac70ce444686e5/lxml-6.1.1-cp313-cp313-manylinux_2_38_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:9eb9b5a968f6e0f6d640092a567e14529ff8cea2e29d00da6f78a79fa49f013c", size = 5232487, upload-time = "2026-05-18T19:19:28.603Z" }, - { url = "https://files.pythonhosted.org/packages/0e/77/b4fb1e03bf5d130e879214d3100092e386418807fb74dd0adc4b0a48f351/lxml-6.1.1-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:aa49e06d94aba782c6a02eecb7e507969e7e7a41b267f1b359bb35585f295d5b", size = 5044231, upload-time = "2026-05-18T19:18:42.246Z" }, - { url = "https://files.pythonhosted.org/packages/26/4c/d00daeeb0a5530c4028a9232aa1b93db3ef4ed2158c116ea73c79a9765b3/lxml-6.1.1-cp313-cp313-musllinux_1_2_armv7l.whl", hash = "sha256:70cdfd80589d59e43e18005dd7244e8895e93db8ab6a620b7e23df5445a4e3d2", size = 4769450, upload-time = "2026-05-18T19:18:48.013Z" }, - { url = "https://files.pythonhosted.org/packages/ed/6a/715a3a8d156ce42f29cf014706f5410c2ff3b02267774110fc23266409fe/lxml-6.1.1-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:aad9aa39483ed8ec44d6d2e59e5b98a0d80676ef0d92f44bfc374836111f62f5", size = 5635874, upload-time = "2026-05-18T19:18:51.914Z" }, - { url = "https://files.pythonhosted.org/packages/45/37/0544bc21dde2a88f3a17b504e6fc79c0e01d25a33c2f6079724e9e72b9c7/lxml-6.1.1-cp313-cp313-musllinux_1_2_riscv64.whl", hash = "sha256:d49514be2f28d895c38cf9d2b72d7b9a07d00314519f456c0b50b53cfcf4c785", size = 5223987, upload-time = "2026-05-18T19:18:59.715Z" }, - { url = "https://files.pythonhosted.org/packages/4d/f8/f6a5e8185bcb28c2befae3d31f8e3df3b811cb0f47746517a81279fcafe1/lxml-6.1.1-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:47402e62c52ff5988c1e8c6c63177f5708bccf48e366dea4e3dcf1e645e04947", size = 5250276, upload-time = "2026-05-18T19:19:03.834Z" }, - { url = "https://files.pythonhosted.org/packages/c7/f2/1a2b9f1b7a49d45495369be7ef9ad05b262930f2eab3e3145706fca8083f/lxml-6.1.1-cp313-cp313-win32.whl", hash = "sha256:3483644525531e1d5762b0c44a8e18b6efba321b6dcf8a8952de10b037618bca", size = 3596903, upload-time = "2026-05-18T19:17:29.863Z" }, - { url = "https://files.pythonhosted.org/packages/e6/99/f4ffb024f238eec2131aaa09f3278fb6129cf892741bf68e1fc1afb8c100/lxml-6.1.1-cp313-cp313-win_amd64.whl", hash = "sha256:a10bd2fd62e8ce916ececb342f348f190724a098c1faa056fdfb2a22ad5e8660", size = 3995869, upload-time = "2026-05-18T19:18:02.596Z" }, - { url = "https://files.pythonhosted.org/packages/d1/53/70eb8c5c6037f27448f1e3c54ebede9545a801ae63f0a7254afca4fe8e45/lxml-6.1.1-cp313-cp313-win_arm64.whl", hash = "sha256:424aa57aca0897eb922aef34395bd1289b3b6f04e6bae20ea123c0c7e333cffc", size = 3658490, upload-time = "2026-05-19T19:22:53.846Z" }, { url = "https://files.pythonhosted.org/packages/13/e2/2e325795566de01d0d7c3bb57d3c370616b2d07b01214e84eec5d3b10963/lxml-6.1.1-cp314-cp314-macosx_10_15_universal2.whl", hash = "sha256:19b7ab10b210b0b3ad7985d9ac4eb66ab09a90b20fe6e2f7ba55d01a234345d0", size = 8577146, upload-time = "2026-05-18T19:18:17.765Z" }, { url = "https://files.pythonhosted.org/packages/93/cf/5630b5e4be7d2e6bee8efe83865c925221103cf0221303b104ce134b01e2/lxml-6.1.1-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:c08e5c694306507275f2290073350c4f32e383db15213b2c69e7ff39c1193840", size = 4623866, upload-time = "2026-05-18T19:18:30.669Z" }, { url = "https://files.pythonhosted.org/packages/d2/51/3904907c063451cf8d4a5c9fe0cad95fa1f4ec57f4e3884fa0731bd7a305/lxml-6.1.1-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:74a9717fd0d82effef5c2854f0d917231d5324b5a3eb7275c43ac9fa32f97a14", size = 4950022, upload-time = "2026-05-18T19:19:31.958Z" }, @@ -2104,12 +1484,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/ce/68/b30e913340c380ddac9580c6e6230991fc37240ec4f64704833e4f3e2769/lxml-6.1.1-cp314-cp314t-win32.whl", hash = "sha256:649dda677cf3bd6ac9ae14007ba0c824ded8ce5808b53fc7431d9140399118c1", size = 3897345, upload-time = "2026-05-18T19:17:33.562Z" }, { url = "https://files.pythonhosted.org/packages/3c/4e/9eb2af5335545f9fbcd7af57bcf87c6025d31eaa31b14ec184a6c8675328/lxml-6.1.1-cp314-cp314t-win_amd64.whl", hash = "sha256:793033d6c5cdf33a573f910d9bea14ef8f5771820411d118da8e1182edb53d5e", size = 4393350, upload-time = "2026-05-18T19:18:10.076Z" }, { url = "https://files.pythonhosted.org/packages/7f/2c/0f1e93c636720e8a3eb59af2bfda99d98b55891e1c53bc30c2e0e865f01b/lxml-6.1.1-cp314-cp314t-win_arm64.whl", hash = "sha256:58bb955caba94e467d2a96da17660d2d704e0675894cba21ab8a775b8621fd1c", size = 3817223, upload-time = "2026-05-19T19:22:56.823Z" }, - { url = "https://files.pythonhosted.org/packages/b5/32/86a3f0f724a3a402d4627937a7fc27b160e45e7012b4adf47f6e1e844511/lxml-6.1.1-pp311-pypy311_pp73-macosx_10_15_x86_64.whl", hash = "sha256:31033dc34636ea6b7d5cc11b1ddbda78a14de858ba9d3e1ed4b69a3085bc521e", size = 3930127, upload-time = "2026-05-18T19:19:02.27Z" }, - { url = "https://files.pythonhosted.org/packages/40/44/d832e82af08723761556d004b1d04d281c09f9a8cecd7d3148548c9941a3/lxml-6.1.1-pp311-pypy311_pp73-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:3893c14c4b6ac5b2d54ba8cf03e99fe5104e592de491f19bd6b82756c09f8004", size = 4210769, upload-time = "2026-05-18T19:20:41.427Z" }, - { url = "https://files.pythonhosted.org/packages/6d/39/0dc5949f759ed7d951e0bb8c2f2d9d7aca1908d22352fa84a8afd2ea54af/lxml-6.1.1-pp311-pypy311_pp73-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:c07da4cebf6889f03ebac8d238f62318e29f495de0aa18a51ea14e61ae907e2e", size = 4318163, upload-time = "2026-05-18T19:20:44.702Z" }, - { url = "https://files.pythonhosted.org/packages/e6/fb/8ab3845fe046ba4cbf74536bcf6801a774b7caf4350de1c5d37f1f0a9e90/lxml-6.1.1-pp311-pypy311_pp73-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:f6f0ce10945fab9c4c06ce14e22af9059d1a87493a9af4501a5b0b9187e21cf2", size = 4250945, upload-time = "2026-05-18T19:20:47.385Z" }, - { url = "https://files.pythonhosted.org/packages/68/1b/7553ab136894374ffae8851ec06f98f511cd8e66246e41b6be059d0a7289/lxml-6.1.1-pp311-pypy311_pp73-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:f8844cd288697c6425c9beba919302241e3278871dc6519515e72b04e987abcf", size = 4401664, upload-time = "2026-05-18T19:20:50.489Z" }, - { url = "https://files.pythonhosted.org/packages/db/a4/441aee36c6f6b249823d20fd91f9be9ab89d7c5a8ae542a4a4ca6d342d56/lxml-6.1.1-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:ed21202aec73cda4d55d1ce57b389aadb90ffb044e6cd1080b8347efe1b1ec84", size = 3508989, upload-time = "2026-05-18T19:18:38.158Z" }, ] [[package]] @@ -2118,50 +1492,6 @@ version = "3.0.3" source = { registry = "https://pypi.org/simple" } sdist = { url = "https://files.pythonhosted.org/packages/7e/99/7690b6d4034fffd95959cbe0c02de8deb3098cc577c67bb6a24fe5d7caa7/markupsafe-3.0.3.tar.gz", hash = "sha256:722695808f4b6457b320fdc131280796bdceb04ab50fe1795cd540799ebe1698", size = 80313, upload-time = "2025-09-27T18:37:40.426Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/08/db/fefacb2136439fc8dd20e797950e749aa1f4997ed584c62cfb8ef7c2be0e/markupsafe-3.0.3-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:1cc7ea17a6824959616c525620e387f6dd30fec8cb44f649e31712db02123dad", size = 11631, upload-time = "2025-09-27T18:36:18.185Z" }, - { url = "https://files.pythonhosted.org/packages/e1/2e/5898933336b61975ce9dc04decbc0a7f2fee78c30353c5efba7f2d6ff27a/markupsafe-3.0.3-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:4bd4cd07944443f5a265608cc6aab442e4f74dff8088b0dfc8238647b8f6ae9a", size = 12058, upload-time = "2025-09-27T18:36:19.444Z" }, - { url = "https://files.pythonhosted.org/packages/1d/09/adf2df3699d87d1d8184038df46a9c80d78c0148492323f4693df54e17bb/markupsafe-3.0.3-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:6b5420a1d9450023228968e7e6a9ce57f65d148ab56d2313fcd589eee96a7a50", size = 24287, upload-time = "2025-09-27T18:36:20.768Z" }, - { url = "https://files.pythonhosted.org/packages/30/ac/0273f6fcb5f42e314c6d8cd99effae6a5354604d461b8d392b5ec9530a54/markupsafe-3.0.3-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:0bf2a864d67e76e5c9a34dc26ec616a66b9888e25e7b9460e1c76d3293bd9dbf", size = 22940, upload-time = "2025-09-27T18:36:22.249Z" }, - { url = "https://files.pythonhosted.org/packages/19/ae/31c1be199ef767124c042c6c3e904da327a2f7f0cd63a0337e1eca2967a8/markupsafe-3.0.3-cp311-cp311-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:bc51efed119bc9cfdf792cdeaa4d67e8f6fcccab66ed4bfdd6bde3e59bfcbb2f", size = 21887, upload-time = "2025-09-27T18:36:23.535Z" }, - { url = "https://files.pythonhosted.org/packages/b2/76/7edcab99d5349a4532a459e1fe64f0b0467a3365056ae550d3bcf3f79e1e/markupsafe-3.0.3-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:068f375c472b3e7acbe2d5318dea141359e6900156b5b2ba06a30b169086b91a", size = 23692, upload-time = "2025-09-27T18:36:24.823Z" }, - { url = "https://files.pythonhosted.org/packages/a4/28/6e74cdd26d7514849143d69f0bf2399f929c37dc2b31e6829fd2045b2765/markupsafe-3.0.3-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:7be7b61bb172e1ed687f1754f8e7484f1c8019780f6f6b0786e76bb01c2ae115", size = 21471, upload-time = "2025-09-27T18:36:25.95Z" }, - { url = "https://files.pythonhosted.org/packages/62/7e/a145f36a5c2945673e590850a6f8014318d5577ed7e5920a4b3448e0865d/markupsafe-3.0.3-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:f9e130248f4462aaa8e2552d547f36ddadbeaa573879158d721bbd33dfe4743a", size = 22923, upload-time = "2025-09-27T18:36:27.109Z" }, - { url = "https://files.pythonhosted.org/packages/0f/62/d9c46a7f5c9adbeeeda52f5b8d802e1094e9717705a645efc71b0913a0a8/markupsafe-3.0.3-cp311-cp311-win32.whl", hash = "sha256:0db14f5dafddbb6d9208827849fad01f1a2609380add406671a26386cdf15a19", size = 14572, upload-time = "2025-09-27T18:36:28.045Z" }, - { url = "https://files.pythonhosted.org/packages/83/8a/4414c03d3f891739326e1783338e48fb49781cc915b2e0ee052aa490d586/markupsafe-3.0.3-cp311-cp311-win_amd64.whl", hash = "sha256:de8a88e63464af587c950061a5e6a67d3632e36df62b986892331d4620a35c01", size = 15077, upload-time = "2025-09-27T18:36:29.025Z" }, - { url = "https://files.pythonhosted.org/packages/35/73/893072b42e6862f319b5207adc9ae06070f095b358655f077f69a35601f0/markupsafe-3.0.3-cp311-cp311-win_arm64.whl", hash = "sha256:3b562dd9e9ea93f13d53989d23a7e775fdfd1066c33494ff43f5418bc8c58a5c", size = 13876, upload-time = "2025-09-27T18:36:29.954Z" }, - { url = "https://files.pythonhosted.org/packages/5a/72/147da192e38635ada20e0a2e1a51cf8823d2119ce8883f7053879c2199b5/markupsafe-3.0.3-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:d53197da72cc091b024dd97249dfc7794d6a56530370992a5e1a08983ad9230e", size = 11615, upload-time = "2025-09-27T18:36:30.854Z" }, - { url = "https://files.pythonhosted.org/packages/9a/81/7e4e08678a1f98521201c3079f77db69fb552acd56067661f8c2f534a718/markupsafe-3.0.3-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:1872df69a4de6aead3491198eaf13810b565bdbeec3ae2dc8780f14458ec73ce", size = 12020, upload-time = "2025-09-27T18:36:31.971Z" }, - { url = "https://files.pythonhosted.org/packages/1e/2c/799f4742efc39633a1b54a92eec4082e4f815314869865d876824c257c1e/markupsafe-3.0.3-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:3a7e8ae81ae39e62a41ec302f972ba6ae23a5c5396c8e60113e9066ef893da0d", size = 24332, upload-time = "2025-09-27T18:36:32.813Z" }, - { url = "https://files.pythonhosted.org/packages/3c/2e/8d0c2ab90a8c1d9a24f0399058ab8519a3279d1bd4289511d74e909f060e/markupsafe-3.0.3-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:d6dd0be5b5b189d31db7cda48b91d7e0a9795f31430b7f271219ab30f1d3ac9d", size = 22947, upload-time = "2025-09-27T18:36:33.86Z" }, - { url = "https://files.pythonhosted.org/packages/2c/54/887f3092a85238093a0b2154bd629c89444f395618842e8b0c41783898ea/markupsafe-3.0.3-cp312-cp312-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:94c6f0bb423f739146aec64595853541634bde58b2135f27f61c1ffd1cd4d16a", size = 21962, upload-time = "2025-09-27T18:36:35.099Z" }, - { url = "https://files.pythonhosted.org/packages/c9/2f/336b8c7b6f4a4d95e91119dc8521402461b74a485558d8f238a68312f11c/markupsafe-3.0.3-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:be8813b57049a7dc738189df53d69395eba14fb99345e0a5994914a3864c8a4b", size = 23760, upload-time = "2025-09-27T18:36:36.001Z" }, - { url = "https://files.pythonhosted.org/packages/32/43/67935f2b7e4982ffb50a4d169b724d74b62a3964bc1a9a527f5ac4f1ee2b/markupsafe-3.0.3-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:83891d0e9fb81a825d9a6d61e3f07550ca70a076484292a70fde82c4b807286f", size = 21529, upload-time = "2025-09-27T18:36:36.906Z" }, - { url = "https://files.pythonhosted.org/packages/89/e0/4486f11e51bbba8b0c041098859e869e304d1c261e59244baa3d295d47b7/markupsafe-3.0.3-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:77f0643abe7495da77fb436f50f8dab76dbc6e5fd25d39589a0f1fe6548bfa2b", size = 23015, upload-time = "2025-09-27T18:36:37.868Z" }, - { url = "https://files.pythonhosted.org/packages/2f/e1/78ee7a023dac597a5825441ebd17170785a9dab23de95d2c7508ade94e0e/markupsafe-3.0.3-cp312-cp312-win32.whl", hash = "sha256:d88b440e37a16e651bda4c7c2b930eb586fd15ca7406cb39e211fcff3bf3017d", size = 14540, upload-time = "2025-09-27T18:36:38.761Z" }, - { url = "https://files.pythonhosted.org/packages/aa/5b/bec5aa9bbbb2c946ca2733ef9c4ca91c91b6a24580193e891b5f7dbe8e1e/markupsafe-3.0.3-cp312-cp312-win_amd64.whl", hash = "sha256:26a5784ded40c9e318cfc2bdb30fe164bdb8665ded9cd64d500a34fb42067b1c", size = 15105, upload-time = "2025-09-27T18:36:39.701Z" }, - { url = "https://files.pythonhosted.org/packages/e5/f1/216fc1bbfd74011693a4fd837e7026152e89c4bcf3e77b6692fba9923123/markupsafe-3.0.3-cp312-cp312-win_arm64.whl", hash = "sha256:35add3b638a5d900e807944a078b51922212fb3dedb01633a8defc4b01a3c85f", size = 13906, upload-time = "2025-09-27T18:36:40.689Z" }, - { url = "https://files.pythonhosted.org/packages/38/2f/907b9c7bbba283e68f20259574b13d005c121a0fa4c175f9bed27c4597ff/markupsafe-3.0.3-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:e1cf1972137e83c5d4c136c43ced9ac51d0e124706ee1c8aa8532c1287fa8795", size = 11622, upload-time = "2025-09-27T18:36:41.777Z" }, - { url = "https://files.pythonhosted.org/packages/9c/d9/5f7756922cdd676869eca1c4e3c0cd0df60ed30199ffd775e319089cb3ed/markupsafe-3.0.3-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:116bb52f642a37c115f517494ea5feb03889e04df47eeff5b130b1808ce7c219", size = 12029, upload-time = "2025-09-27T18:36:43.257Z" }, - { url = "https://files.pythonhosted.org/packages/00/07/575a68c754943058c78f30db02ee03a64b3c638586fba6a6dd56830b30a3/markupsafe-3.0.3-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:133a43e73a802c5562be9bbcd03d090aa5a1fe899db609c29e8c8d815c5f6de6", size = 24374, upload-time = "2025-09-27T18:36:44.508Z" }, - { url = "https://files.pythonhosted.org/packages/a9/21/9b05698b46f218fc0e118e1f8168395c65c8a2c750ae2bab54fc4bd4e0e8/markupsafe-3.0.3-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:ccfcd093f13f0f0b7fdd0f198b90053bf7b2f02a3927a30e63f3ccc9df56b676", size = 22980, upload-time = "2025-09-27T18:36:45.385Z" }, - { url = "https://files.pythonhosted.org/packages/7f/71/544260864f893f18b6827315b988c146b559391e6e7e8f7252839b1b846a/markupsafe-3.0.3-cp313-cp313-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:509fa21c6deb7a7a273d629cf5ec029bc209d1a51178615ddf718f5918992ab9", size = 21990, upload-time = "2025-09-27T18:36:46.916Z" }, - { url = "https://files.pythonhosted.org/packages/c2/28/b50fc2f74d1ad761af2f5dcce7492648b983d00a65b8c0e0cb457c82ebbe/markupsafe-3.0.3-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:a4afe79fb3de0b7097d81da19090f4df4f8d3a2b3adaa8764138aac2e44f3af1", size = 23784, upload-time = "2025-09-27T18:36:47.884Z" }, - { url = "https://files.pythonhosted.org/packages/ed/76/104b2aa106a208da8b17a2fb72e033a5a9d7073c68f7e508b94916ed47a9/markupsafe-3.0.3-cp313-cp313-musllinux_1_2_riscv64.whl", hash = "sha256:795e7751525cae078558e679d646ae45574b47ed6e7771863fcc079a6171a0fc", size = 21588, upload-time = "2025-09-27T18:36:48.82Z" }, - { url = "https://files.pythonhosted.org/packages/b5/99/16a5eb2d140087ebd97180d95249b00a03aa87e29cc224056274f2e45fd6/markupsafe-3.0.3-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:8485f406a96febb5140bfeca44a73e3ce5116b2501ac54fe953e488fb1d03b12", size = 23041, upload-time = "2025-09-27T18:36:49.797Z" }, - { url = "https://files.pythonhosted.org/packages/19/bc/e7140ed90c5d61d77cea142eed9f9c303f4c4806f60a1044c13e3f1471d0/markupsafe-3.0.3-cp313-cp313-win32.whl", hash = "sha256:bdd37121970bfd8be76c5fb069c7751683bdf373db1ed6c010162b2a130248ed", size = 14543, upload-time = "2025-09-27T18:36:51.584Z" }, - { url = "https://files.pythonhosted.org/packages/05/73/c4abe620b841b6b791f2edc248f556900667a5a1cf023a6646967ae98335/markupsafe-3.0.3-cp313-cp313-win_amd64.whl", hash = "sha256:9a1abfdc021a164803f4d485104931fb8f8c1efd55bc6b748d2f5774e78b62c5", size = 15113, upload-time = "2025-09-27T18:36:52.537Z" }, - { url = "https://files.pythonhosted.org/packages/f0/3a/fa34a0f7cfef23cf9500d68cb7c32dd64ffd58a12b09225fb03dd37d5b80/markupsafe-3.0.3-cp313-cp313-win_arm64.whl", hash = "sha256:7e68f88e5b8799aa49c85cd116c932a1ac15caaa3f5db09087854d218359e485", size = 13911, upload-time = "2025-09-27T18:36:53.513Z" }, - { url = "https://files.pythonhosted.org/packages/e4/d7/e05cd7efe43a88a17a37b3ae96e79a19e846f3f456fe79c57ca61356ef01/markupsafe-3.0.3-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:218551f6df4868a8d527e3062d0fb968682fe92054e89978594c28e642c43a73", size = 11658, upload-time = "2025-09-27T18:36:54.819Z" }, - { url = "https://files.pythonhosted.org/packages/99/9e/e412117548182ce2148bdeacdda3bb494260c0b0184360fe0d56389b523b/markupsafe-3.0.3-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:3524b778fe5cfb3452a09d31e7b5adefeea8c5be1d43c4f810ba09f2ceb29d37", size = 12066, upload-time = "2025-09-27T18:36:55.714Z" }, - { url = "https://files.pythonhosted.org/packages/bc/e6/fa0ffcda717ef64a5108eaa7b4f5ed28d56122c9a6d70ab8b72f9f715c80/markupsafe-3.0.3-cp313-cp313t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:4e885a3d1efa2eadc93c894a21770e4bc67899e3543680313b09f139e149ab19", size = 25639, upload-time = "2025-09-27T18:36:56.908Z" }, - { url = "https://files.pythonhosted.org/packages/96/ec/2102e881fe9d25fc16cb4b25d5f5cde50970967ffa5dddafdb771237062d/markupsafe-3.0.3-cp313-cp313t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:8709b08f4a89aa7586de0aadc8da56180242ee0ada3999749b183aa23df95025", size = 23569, upload-time = "2025-09-27T18:36:57.913Z" }, - { url = "https://files.pythonhosted.org/packages/4b/30/6f2fce1f1f205fc9323255b216ca8a235b15860c34b6798f810f05828e32/markupsafe-3.0.3-cp313-cp313t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:b8512a91625c9b3da6f127803b166b629725e68af71f8184ae7e7d54686a56d6", size = 23284, upload-time = "2025-09-27T18:36:58.833Z" }, - { url = "https://files.pythonhosted.org/packages/58/47/4a0ccea4ab9f5dcb6f79c0236d954acb382202721e704223a8aafa38b5c8/markupsafe-3.0.3-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:9b79b7a16f7fedff2495d684f2b59b0457c3b493778c9eed31111be64d58279f", size = 24801, upload-time = "2025-09-27T18:36:59.739Z" }, - { url = "https://files.pythonhosted.org/packages/6a/70/3780e9b72180b6fecb83a4814d84c3bf4b4ae4bf0b19c27196104149734c/markupsafe-3.0.3-cp313-cp313t-musllinux_1_2_riscv64.whl", hash = "sha256:12c63dfb4a98206f045aa9563db46507995f7ef6d83b2f68eda65c307c6829eb", size = 22769, upload-time = "2025-09-27T18:37:00.719Z" }, - { url = "https://files.pythonhosted.org/packages/98/c5/c03c7f4125180fc215220c035beac6b9cb684bc7a067c84fc69414d315f5/markupsafe-3.0.3-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:8f71bc33915be5186016f675cd83a1e08523649b0e33efdb898db577ef5bb009", size = 23642, upload-time = "2025-09-27T18:37:01.673Z" }, - { url = "https://files.pythonhosted.org/packages/80/d6/2d1b89f6ca4bff1036499b1e29a1d02d282259f3681540e16563f27ebc23/markupsafe-3.0.3-cp313-cp313t-win32.whl", hash = "sha256:69c0b73548bc525c8cb9a251cddf1931d1db4d2258e9599c28c07ef3580ef354", size = 14612, upload-time = "2025-09-27T18:37:02.639Z" }, - { url = "https://files.pythonhosted.org/packages/2b/98/e48a4bfba0a0ffcf9925fe2d69240bfaa19c6f7507b8cd09c70684a53c1e/markupsafe-3.0.3-cp313-cp313t-win_amd64.whl", hash = "sha256:1b4b79e8ebf6b55351f0d91fe80f893b4743f104bff22e90697db1590e47a218", size = 15200, upload-time = "2025-09-27T18:37:03.582Z" }, - { url = "https://files.pythonhosted.org/packages/0e/72/e3cc540f351f316e9ed0f092757459afbc595824ca724cbc5a5d4263713f/markupsafe-3.0.3-cp313-cp313t-win_arm64.whl", hash = "sha256:ad2cf8aa28b8c020ab2fc8287b0f823d0a7d8630784c31e9ee5edea20f406287", size = 13973, upload-time = "2025-09-27T18:37:04.929Z" }, { url = "https://files.pythonhosted.org/packages/33/8a/8e42d4838cd89b7dde187011e97fe6c3af66d8c044997d2183fbd6d31352/markupsafe-3.0.3-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:eaa9599de571d72e2daf60164784109f19978b327a3910d3e9de8c97b5b70cfe", size = 11619, upload-time = "2025-09-27T18:37:06.342Z" }, { url = "https://files.pythonhosted.org/packages/b5/64/7660f8a4a8e53c924d0fa05dc3a55c9cee10bbd82b11c5afb27d44b096ce/markupsafe-3.0.3-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:c47a551199eb8eb2121d4f0f15ae0f923d31350ab9280078d1e5f12b249e0026", size = 12029, upload-time = "2025-09-27T18:37:07.213Z" }, { url = "https://files.pythonhosted.org/packages/da/ef/e648bfd021127bef5fa12e1720ffed0c6cbb8310c8d9bea7266337ff06de/markupsafe-3.0.3-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:f34c41761022dd093b4b6896d4810782ffbabe30f2d443ff5f083e0cbbb8c737", size = 24408, upload-time = "2025-09-27T18:37:09.572Z" }, @@ -2228,34 +1558,6 @@ dependencies = [ ] sdist = { url = "https://files.pythonhosted.org/packages/63/1b/4be5be87d43d327a0cf4de1a56e86f7f84c89312452406cf122efe2839e6/matplotlib-3.10.9.tar.gz", hash = "sha256:fd66508e8c6877d98e586654b608a0456db8d7e8a546eb1e2600efd957302358", size = 34811233, upload-time = "2026-04-24T00:14:13.539Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/4c/8c/290f021104741fea63769c31494f5324c0cd249bf536a65a4350767b1f22/matplotlib-3.10.9-cp311-cp311-macosx_10_12_x86_64.whl", hash = "sha256:68cfdcede415f7c8f5577b03303dd94526cdb6d11036cecdc205e08733b2d2bb", size = 8306860, upload-time = "2026-04-24T00:12:01.207Z" }, - { url = "https://files.pythonhosted.org/packages/51/18/325cd32ece1120d1da51cc4e4294c6580190699490183fc2fe8cb6d61ec5/matplotlib-3.10.9-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:dfca0129678bd56379db26c52b5d77ed7de314c047492fbdc763aa7501710cfb", size = 8199254, upload-time = "2026-04-24T00:12:04.239Z" }, - { url = "https://files.pythonhosted.org/packages/79/db/e28c1b83e3680740aa78925f5fb2ae4d16207207419ad75ea9fe604f8676/matplotlib-3.10.9-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:8e436d155fa8a3399dc62683f8f5d0e2e50d25d0144a73edd73f82eec8f4abfb", size = 8777092, upload-time = "2026-04-24T00:12:06.793Z" }, - { url = "https://files.pythonhosted.org/packages/55/fa/3ce7adfe9ba101748f465211660d9c6374c876b671bdb8c2bb6d347e8b94/matplotlib-3.10.9-cp311-cp311-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:56fc0bd271b00025c6edfdc7c2dcd247372c8e1544971d62e1dc7c17367e8bf9", size = 9595691, upload-time = "2026-04-24T00:12:09.706Z" }, - { url = "https://files.pythonhosted.org/packages/36/c4/6960a76686ed668f2c60f84e9799ba4c0d56abdb36b1577b60c1d061d1ec/matplotlib-3.10.9-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:a5a6104ed666402ba5106d7f36e0e0cdca4e8d7fa4d39708ca88019e2835a2eb", size = 9659771, upload-time = "2026-04-24T00:12:12.766Z" }, - { url = "https://files.pythonhosted.org/packages/7e/0d/271aace3342157c64700c9ff4c59c7b392f3dbab393692e8db6fbe7ab96c/matplotlib-3.10.9-cp311-cp311-win_amd64.whl", hash = "sha256:d730e984eddf56974c3e72b6129c7ca462ac38dc624338f4b0b23eb23ecba00f", size = 8205112, upload-time = "2026-04-24T00:12:15.773Z" }, - { url = "https://files.pythonhosted.org/packages/e2/ee/cb57ad4754f3e7b9174ce6ce66d9205fb827067e48a9f58ac09d7e7d6b77/matplotlib-3.10.9-cp311-cp311-win_arm64.whl", hash = "sha256:51bf0ddbdc598e060d46c16b5590708f81a1624cefbaaf62f6a81bf9285b8c80", size = 8132310, upload-time = "2026-04-24T00:12:18.645Z" }, - { url = "https://files.pythonhosted.org/packages/35/c6/5581e26c72233ebb2a2a6fed2d24fb7c66b4700120b813f51b0555acf0b6/matplotlib-3.10.9-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:f0c3c28d9fbcc1fe7a03be236d73430cf6409c41fb2383a7ac52fe932b072cb1", size = 8319908, upload-time = "2026-04-24T00:12:21.323Z" }, - { url = "https://files.pythonhosted.org/packages/b7/18/4880dd762e40cd360c1bf06e890c5a97b997e91cb324602b1a19950ad5ce/matplotlib-3.10.9-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:41cb28c2bd769aa3e98322c6ab09854cbcc52ab69d2759d681bba3e327b2b320", size = 8216016, upload-time = "2026-04-24T00:12:23.4Z" }, - { url = "https://files.pythonhosted.org/packages/32/91/d024616abdba99e83120e07a20658976f6a343646710760c4a51df126029/matplotlib-3.10.9-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:ae20801130378b82d647ff5047c07316295b68dc054ca6b3c13519d0ea624285", size = 8789336, upload-time = "2026-04-24T00:12:26.096Z" }, - { url = "https://files.pythonhosted.org/packages/5c/04/030a2f61ef2158f5e4c259487a92ac877732499fb33d871585d89e03c42d/matplotlib-3.10.9-cp312-cp312-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:6c63ebcd8b4b169eb2f5c200552ae6b8be8999a005b6b507ed76fb8d7d674fe2", size = 9604602, upload-time = "2026-04-24T00:12:29.052Z" }, - { url = "https://files.pythonhosted.org/packages/fc/c2/541e4d09d87bb6b5830fc28b4c887a9a8cf4e1c6cee698a8c05552ae2003/matplotlib-3.10.9-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:d75d11c949914165976c621b2324f9ef162af7ebf4b057ddf95dd1dba7e5edcf", size = 9670966, upload-time = "2026-04-24T00:12:32.131Z" }, - { url = "https://files.pythonhosted.org/packages/04/a1/4571fc46e7702de8d0c2dc54ad1b2f8e29328dea3ee90831181f7353d93c/matplotlib-3.10.9-cp312-cp312-win_amd64.whl", hash = "sha256:d091f9d758b34aaaaa6331d13574bf01891d903b3dec59bfff458ef7551de5d6", size = 8217462, upload-time = "2026-04-24T00:12:35.226Z" }, - { url = "https://files.pythonhosted.org/packages/4b/d0/2269edb12aa30c13c8bcc9382892e39943ce1d28aab4ec296e0381798e81/matplotlib-3.10.9-cp312-cp312-win_arm64.whl", hash = "sha256:10cc5ce06d10231c36f40e875f3c7e8050362a4ee8f0ee5d29a6b3277d57bb42", size = 8136688, upload-time = "2026-04-24T00:12:37.442Z" }, - { url = "https://files.pythonhosted.org/packages/aa/d3/8d4f6afbecb49fc04e060a57c0fce39ea51cc163a6bd87303ccd698e4fa6/matplotlib-3.10.9-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:b580440f1ff81a0e34122051a3dfabb7e4b7f9e380629929bde0eff9af72165f", size = 8320331, upload-time = "2026-04-24T00:12:39.688Z" }, - { url = "https://files.pythonhosted.org/packages/63/d9/9e14bc7564bf92d5ffa801ae5fac819ce74b925dfb55e3ebde61a3bbad3e/matplotlib-3.10.9-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:b1b745c489cd1a77a0dc1120a05dc87af9798faebc913601feb8c73d89bf2d1e", size = 8216461, upload-time = "2026-04-24T00:12:42.494Z" }, - { url = "https://files.pythonhosted.org/packages/8a/17/4402d0d14ccf1dfc70932600b68097fbbf9c898a4871d2cbbe79c7801a32/matplotlib-3.10.9-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:8f3bcac1ca5ed000a6f4337d47ba67dfddf37ed6a46c15fd7f014997f7bf865f", size = 8790091, upload-time = "2026-04-24T00:12:44.789Z" }, - { url = "https://files.pythonhosted.org/packages/3e/0b/322aeec06dd9b91411f92028b37d447342770a24392aa4813e317064dad5/matplotlib-3.10.9-cp313-cp313-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:7a8d66a55def891c33147ba3ba9bfcabf0b526a43764c818acbb4525e5ed0838", size = 9605027, upload-time = "2026-04-24T00:12:47.583Z" }, - { url = "https://files.pythonhosted.org/packages/74/88/5f13482f55e7b00bcfc09838b093c2456e1379978d2a146844aae05350ad/matplotlib-3.10.9-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:d843374407c4017a6403b59c6c81606773d136f3259d5b6da3131bc814542cc2", size = 9671269, upload-time = "2026-04-24T00:12:50.878Z" }, - { url = "https://files.pythonhosted.org/packages/c5/e0/0840fd2f93da988ec660b8ad1984abe9f25d2aed22a5e394ff1c68c88307/matplotlib-3.10.9-cp313-cp313-win_amd64.whl", hash = "sha256:f4399f64b3e94cd500195490972ae1ee81170df1636fa15364d157d5bdd7b921", size = 8217588, upload-time = "2026-04-24T00:12:53.784Z" }, - { url = "https://files.pythonhosted.org/packages/47/b9/d706d06dd605c49b9f83a2aed8c13e3e5db70697d7a80b7e3d7915de6b17/matplotlib-3.10.9-cp313-cp313-win_arm64.whl", hash = "sha256:ba7b3b8ef09eab7df0e86e9ae086faa433efbfbdb46afcb3aa16aabf779469a8", size = 8136913, upload-time = "2026-04-24T00:12:56.501Z" }, - { url = "https://files.pythonhosted.org/packages/9b/45/6e32d96978264c8ca8c4b1010adb955a1a49cfaf314e212bbc8908f04a61/matplotlib-3.10.9-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:09218df8a93712bd6ea133e83a153c755448cf7868316c531cffcc43f69d1cc9", size = 8368019, upload-time = "2026-04-24T00:12:58.896Z" }, - { url = "https://files.pythonhosted.org/packages/86/0a/c8e3d3bba245f0f7fc424937f8ff7ef77291a36af3edb97ccd78aa93d84f/matplotlib-3.10.9-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:82368699727bfb7b0182e1aa13082e3c08e092fa1a25d3e1fd92405bff96f6d4", size = 8264645, upload-time = "2026-04-24T00:13:01.406Z" }, - { url = "https://files.pythonhosted.org/packages/3d/aa/5bf5a14fe4fed73a4209a155606f8096ff797aad89c6c35179026571133e/matplotlib-3.10.9-cp313-cp313t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:3225f4e1edcb8c86c884ddf79ebe20ecd0a67d30188f279897554ccd8fded4dc", size = 8802194, upload-time = "2026-04-24T00:13:03.702Z" }, - { url = "https://files.pythonhosted.org/packages/dd/5e/b4be852d6bba6fd15893fadf91ff26ae49cb91aac789e95dde9d342e664f/matplotlib-3.10.9-cp313-cp313t-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:de2445a0c6690d21b7eb6ce071cebad6d40a2e9bdf10d039074a96ba19797b99", size = 9622684, upload-time = "2026-04-24T00:13:06.647Z" }, - { url = "https://files.pythonhosted.org/packages/4c/3d/ed428c971139112ef730f62770654d609467346d09d4b62617e1afd68a5a/matplotlib-3.10.9-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:b2b9516251cb89ff618d757daec0e2ed1bf21248013844a853d87ef85ab3081d", size = 9680790, upload-time = "2026-04-24T00:13:10.009Z" }, - { url = "https://files.pythonhosted.org/packages/e7/09/052e884aaf2b985c63cb79f715f1d5b6a3eaa7de78f6a52b9dbc077d5b53/matplotlib-3.10.9-cp313-cp313t-win_amd64.whl", hash = "sha256:e9fae004b941b23ff2edcf1567a857ed77bafc8086ffa258190462328434faf8", size = 8287571, upload-time = "2026-04-24T00:13:13.087Z" }, - { url = "https://files.pythonhosted.org/packages/f4/38/ae27288e788c35a4250491422f3db7750366fc8c97d6f36fbdecfc1f5518/matplotlib-3.10.9-cp313-cp313t-win_arm64.whl", hash = "sha256:6b63d9c7c769b88ab81e10dc86e4e0607cf56817b9f9e6cf24b2a5f1693b8e38", size = 8188292, upload-time = "2026-04-24T00:13:15.546Z" }, { url = "https://files.pythonhosted.org/packages/d6/e6/3bd8afd04949f02eabc1c17115ea5255e19cacd4d06fc5abdde4eeb0052c/matplotlib-3.10.9-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:172db52c9e683f5d12eaf57f0f54834190e12581fe1cc2a19595a8f5acb4e77d", size = 8321276, upload-time = "2026-04-24T00:13:18.318Z" }, { url = "https://files.pythonhosted.org/packages/41/86/86231232fff41c9f8e4a1a7d7a597d349a02527109c3af7d618366122139/matplotlib-3.10.9-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:97e35e8d39ccc85859095e01a53847432ba9a53ddf7986f7a54a11b73d0e143f", size = 8218218, upload-time = "2026-04-24T00:13:20.974Z" }, { url = "https://files.pythonhosted.org/packages/85/8f/becc9722cafc64f5d2eb0b7c1bf5f585271c618a45dbd8fabeb021f898b6/matplotlib-3.10.9-cp314-cp314-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:aba1615dabe83188e19d4f75a253c6a08423e04c1425e64039f800050a69de6b", size = 9608145, upload-time = "2026-04-24T00:13:23.228Z" }, @@ -2270,9 +1572,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/67/b2/ef8d6bb59b0edb6c16c968b70f548aa13b54348972def5aa6ac85df67145/matplotlib-3.10.9-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:4e42042d54db34fda4e95a7bd3e5789c2a995d2dad3eb8850232ee534092fbbf", size = 9680884, upload-time = "2026-04-24T00:13:48.066Z" }, { url = "https://files.pythonhosted.org/packages/61/1c/d21bfeb9931881ebe96bcfcff27c7ae4b160ae0ec291a714c42641a56d75/matplotlib-3.10.9-cp314-cp314t-win_amd64.whl", hash = "sha256:c27df8b3848f32a83d1767566595e43cfaa4460380974da06f4279a7ec143c39", size = 8432333, upload-time = "2026-04-24T00:13:51.008Z" }, { url = "https://files.pythonhosted.org/packages/78/23/92493c3e6e1b635ccfff146f7b99e674808787915420373ac399283764c2/matplotlib-3.10.9-cp314-cp314t-win_arm64.whl", hash = "sha256:a49f1eadc84ca85fd72fa4e89e70e61bf86452df6f971af04b12c60761a0772c", size = 8324785, upload-time = "2026-04-24T00:13:53.633Z" }, - { url = "https://files.pythonhosted.org/packages/63/e2/9f66ca6a651a52abfe0d4964ce01439ed34f3f1e119de10ff3a07f403043/matplotlib-3.10.9-pp311-pypy311_pp73-macosx_10_15_x86_64.whl", hash = "sha256:42fb814efabe95c06c1994d8ab5a8385f43a249e23badd3ba931d4308e5bca20", size = 8304420, upload-time = "2026-04-24T00:14:04.57Z" }, - { url = "https://files.pythonhosted.org/packages/e8/e8/467c03568218792906aa87b5e7bb379b605e056ed0c74fe00c051786d925/matplotlib-3.10.9-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:f76e640a5268850bfda54b5131b1b1941cc685e42c5fa98ed9f2d64038308cba", size = 8197981, upload-time = "2026-04-24T00:14:07.233Z" }, - { url = "https://files.pythonhosted.org/packages/6f/87/afead29192170917537934c6aff4b008c805fff7b1ccea0c79120d96beda/matplotlib-3.10.9-pp311-pypy311_pp73-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:3fc0364dfbe1d07f6d15c5ebd0c5bf89e126916e5a8667dd4a7a6e84c36653d4", size = 8774002, upload-time = "2026-04-24T00:14:09.816Z" }, ] [[package]] @@ -2287,15 +1586,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/41/09/5b161152e2d90f7b87f781c2e1267494aef9c32498df793f73ad0a0a494a/matplotlib_inline-0.2.2-py3-none-any.whl", hash = "sha256:3c821cf1c209f59fb2d2d64abbf5b23b67bcb2210d663f9918dd851c6da1fcf6", size = 9534, upload-time = "2026-05-08T17:33:32.055Z" }, ] -[[package]] -name = "mccabe" -version = "0.7.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/e7/ff/0ffefdcac38932a54d2b5eed4e0ba8a408f215002cd178ad1df0f2806ff8/mccabe-0.7.0.tar.gz", hash = "sha256:348e0240c33b60bbdf4e523192ef919f28cb2c3d7d5c7794f74009290f236325", size = 9658, upload-time = "2022-01-24T01:14:51.113Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/27/1a/1f68f9ba0c207934b35b86a8ca3aad8395a3d6dd7921c0686e23853ff5a9/mccabe-0.7.0-py2.py3-none-any.whl", hash = "sha256:6c2d30ab6be0e4a46919781807b4f0d834ebdd6c6e3dca0bda5a15f863427b6e", size = 7350, upload-time = "2022-01-24T01:14:49.62Z" }, -] - [[package]] name = "mimerender-pr36" version = "0.0.2" @@ -2403,11 +1693,11 @@ dependencies = [ [package.dev-dependencies] dev = [ - { name = "flake8" }, + { name = "basedpyright" }, + { name = "pydocstringformatter" }, { name = "pytest" }, - { name = "pytest-flake8" }, - { name = "pytest-pycodestyle" }, { name = "pytest-xdist" }, + { name = "ruff" }, ] [package.metadata] @@ -2460,11 +1750,11 @@ requires-dist = [ [package.metadata.requires-dev] dev = [ - { name = "flake8", specifier = ">=7.3.0" }, + { name = "basedpyright", specifier = ">=1.29.0" }, + { name = "pydocstringformatter", specifier = ">=0.7.0" }, { name = "pytest", specifier = ">=9.0.3" }, - { name = "pytest-flake8", specifier = ">=1.3.0" }, - { name = "pytest-pycodestyle", specifier = ">=2.5.0" }, { name = "pytest-xdist", specifier = ">=3.8.0" }, + { name = "ruff", specifier = ">=0.9.0" }, ] [[package]] @@ -2573,6 +1863,22 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/9e/c9/b2622292ea83fbb4ec318f5b9ab867d0a28ab43c5717bb85b0a5f6b3b0a4/networkx-3.6.1-py3-none-any.whl", hash = "sha256:d47fbf302e7d9cbbb9e2555a0d267983d2aa476bac30e90dfbe5669bd57f3762", size = 2068504, upload-time = "2025-12-08T17:02:38.159Z" }, ] +[[package]] +name = "nodejs-wheel-binaries" +version = "24.16.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/a3/22/2a5beb4e21417c73233d9f65cf6f3e96e891b80d2f550a8f630ebc6b88c6/nodejs_wheel_binaries-24.16.0.tar.gz", hash = "sha256:c973cb69dc5fd16e6f6dc6e579e2c3d5534e2a1f57619dddf5ba070efa7dde37", size = 8056, upload-time = "2026-05-30T16:52:09.807Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/83/d1/68b43b53cd0fa83ae6fd406705023ca988d9e0ca41c724d82e66fbeb2ef6/nodejs_wheel_binaries-24.16.0-py2.py3-none-macosx_13_0_arm64.whl", hash = "sha256:d9f8f677dcf30e37ac244f07869726abe043f01eb0f45722b1df31cc2af7093c", size = 55666374, upload-time = "2026-05-30T16:51:39.588Z" }, + { url = "https://files.pythonhosted.org/packages/e9/b2/40a989159599080da485de966c4c2d207e852ac7aa7864702626d96c8bf5/nodejs_wheel_binaries-24.16.0-py2.py3-none-macosx_13_0_x86_64.whl", hash = "sha256:3d0370fe7120ce9697a4f60d40480d2bd8808d9f30131458d5afc0040d4e5a51", size = 55838487, upload-time = "2026-05-30T16:51:43.383Z" }, + { url = "https://files.pythonhosted.org/packages/d7/a7/cd42174fb5ff6faff7fa8d326a18914d8f232098ab5de055b57c16fa13ca/nodejs_wheel_binaries-24.16.0-py2.py3-none-manylinux_2_28_aarch64.whl", hash = "sha256:85dc92bbb79c851569c5925dcc2a4c915a034efab375f99e4e7e6bbe9cca8342", size = 60179540, upload-time = "2026-05-30T16:51:47.036Z" }, + { url = "https://files.pythonhosted.org/packages/2b/95/c8a1f9ae140aa28df8744d984d01d4b3af7cdd6555af12127f40ceb45a7d/nodejs_wheel_binaries-24.16.0-py2.py3-none-manylinux_2_28_x86_64.whl", hash = "sha256:2f3036292811514ba847b3708492644764f88a833ac425c5f55007014308ddfd", size = 60716262, upload-time = "2026-05-30T16:51:50.711Z" }, + { url = "https://files.pythonhosted.org/packages/64/c9/7c35b3737f59e36d0249c265397b7bff570519b95301d6e16ea361e904ad/nodejs_wheel_binaries-24.16.0-py2.py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:db8a8a76ebd2b28ecbfc9ad464baa3707241b9e050a30e2efdf6f60c0f886502", size = 62230592, upload-time = "2026-05-30T16:51:55Z" }, + { url = "https://files.pythonhosted.org/packages/04/96/d931255cf9d11a84d6b54d882dba7434646467d568ccf070ea3418638df3/nodejs_wheel_binaries-24.16.0-py2.py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:f1a3d8f7b4491cbbd023ba3fc4e901fcca2d9fb80d57f24ba3890de8b1dbac03", size = 62841759, upload-time = "2026-05-30T16:51:59.407Z" }, + { url = "https://files.pythonhosted.org/packages/a2/7b/8b7a3f41bc255411be30b6d7d288aab8ffd9ea2055db8555ced3548007b9/nodejs_wheel_binaries-24.16.0-py2.py3-none-win_amd64.whl", hash = "sha256:bb136be9944f0662dcf1120f45193a6b75b13fac378971a95cc42c9f879a81aa", size = 42027734, upload-time = "2026-05-30T16:52:03.348Z" }, + { url = "https://files.pythonhosted.org/packages/17/66/1ed71f1f529b8ca727d42c7ceb9db0bef145ce4a13dfc86fb50aa44f3be6/nodejs_wheel_binaries-24.16.0-py2.py3-none-win_arm64.whl", hash = "sha256:8308940b5edd0a50dc5267ea36ba21c9f668e83fe0d9f293937174d3a7e31c36", size = 39714528, upload-time = "2026-05-30T16:52:06.421Z" }, +] + [[package]] name = "notebook" version = "6.5.7" @@ -2618,49 +1924,6 @@ version = "2.4.6" source = { registry = "https://pypi.org/simple" } sdist = { url = "https://files.pythonhosted.org/packages/d0/ad/fed0499ce6a338d2a03ebae59cd15093910c8875328855781952abf6c2fe/numpy-2.4.6.tar.gz", hash = "sha256:f3a3570c4a2a16746ac2c31a7c7c7b0c186b95ce902e33db6f28094ed7387dda", size = 20735807, upload-time = "2026-05-18T23:37:14.07Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/b3/49/ec46835a70be8fa6446c495126ac84fdb28cb2558e1620ffb87a10c8b64c/numpy-2.4.6-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:0280e0356c0829a18d9de1cb7eee50ec22ca639878d7240307ca0943d73cd2c4", size = 16969194, upload-time = "2026-05-18T23:33:13.503Z" }, - { url = "https://files.pythonhosted.org/packages/0e/0d/f5957185c0ee2f3e12f78715aa9e3b353fd83633316c8532b38faa37e3f6/numpy-2.4.6-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:110f8b71aacb688ec69062bb7f6938a0f8acb01b7c1c4beb453c65b6d234584d", size = 14964111, upload-time = "2026-05-18T23:33:17.795Z" }, - { url = "https://files.pythonhosted.org/packages/ad/40/40a40ee0ddf7ceb782c49af278894b686e586d65d8c1889c8b5da01a3d7d/numpy-2.4.6-cp311-cp311-macosx_14_0_arm64.whl", hash = "sha256:4cfe66903cc32a9921a6733d96b19bb6abf310397581bbad89c228f5abaf0ee8", size = 5469159, upload-time = "2026-05-18T23:33:20.654Z" }, - { url = "https://files.pythonhosted.org/packages/63/13/f9a8046535cb21deae82f8d03de9617e08882d274fad2539630761888228/numpy-2.4.6-cp311-cp311-macosx_14_0_x86_64.whl", hash = "sha256:8155154c7c691289fe18f510b5d4657c68c67989f293f0535a91360392ff6538", size = 6798936, upload-time = "2026-05-18T23:33:22.987Z" }, - { url = "https://files.pythonhosted.org/packages/33/a8/6fa8c1a345a8c85dbb21932c447bee07c30a2c2a3f31e369c0a84b300147/numpy-2.4.6-cp311-cp311-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:0ab0a9c4ffb1a6d95ef519fe4247dba8eb6b18ad93999f76b7f657039acabd47", size = 15966692, upload-time = "2026-05-18T23:33:26.62Z" }, - { url = "https://files.pythonhosted.org/packages/02/03/74fe2a4cb3817d94d86402f2506554130a2f01414e299b5a843e5a8a957f/numpy-2.4.6-cp311-cp311-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:89cd468399cfd2504718f0ba50e410dca55a170b61a02ad92bb18c8a65186e93", size = 16918164, upload-time = "2026-05-18T23:33:29.955Z" }, - { url = "https://files.pythonhosted.org/packages/c5/80/3615be3313f7e7696609bc194b9f0101da809df79e859bdb84e0cd043f46/numpy-2.4.6-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:c2d37ab77531417474168eb79d6d80b14f821a966818505d03013d0833edb7a8", size = 17322877, upload-time = "2026-05-18T23:33:34.724Z" }, - { url = "https://files.pythonhosted.org/packages/ca/ac/a691e0fe2675e370d0e08ff905adc49a1c8830e8cae03efe4477e92cd55d/numpy-2.4.6-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:f407cb6b8e9d6d8c626bc73c945db1706035af8fd632295547bf1c9e46d092d6", size = 18651487, upload-time = "2026-05-18T23:33:38.217Z" }, - { url = "https://files.pythonhosted.org/packages/15/a7/9bc1cd626d7bf6869bfedf27b91b6ab5dd607758bf8e959d6fa80c6a59cb/numpy-2.4.6-cp311-cp311-win32.whl", hash = "sha256:ddea102b48f9e339f3948bf22040944184627a30fdf7f858667673b9c5f033c8", size = 6233945, upload-time = "2026-05-18T23:33:41.331Z" }, - { url = "https://files.pythonhosted.org/packages/c5/31/7fc6239c12bce7e931463251cca4426c465e1876ba3cc785402ef4dd8f4e/numpy-2.4.6-cp311-cp311-win_amd64.whl", hash = "sha256:1e254a00cdf42b1e4d5b3d68d33af63268d41340d8885df2ab6470f2e1500147", size = 12608406, upload-time = "2026-05-18T23:33:44.131Z" }, - { url = "https://files.pythonhosted.org/packages/27/83/140f85a466595a16382996a1bf06b2b54bcd597488921b0c9daaeeda72af/numpy-2.4.6-cp311-cp311-win_arm64.whl", hash = "sha256:ed9749eef4cbd126da3dc1d6bcb3a57f5eb7ac6a6484146bdbf743f552dfc577", size = 10479528, upload-time = "2026-05-18T23:33:50.725Z" }, - { url = "https://files.pythonhosted.org/packages/95/2a/3d7b5ac8aac24feaf9ad7ed58f45b0bbc06d37e4338ae84c9f2298b570f9/numpy-2.4.6-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:001fbb8e08d942dd57599e781f2472269ee7f2755fae407b4f67b2f0b17da3f1", size = 16689119, upload-time = "2026-05-18T23:33:54.065Z" }, - { url = "https://files.pythonhosted.org/packages/ea/12/92c4c131527599e8288d6918e888d88726f84d805d784b771f32408aeaef/numpy-2.4.6-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:ebfb099f8dcf083deef3ac1ca4c1503f387cf76296fcb3816b66f5ecb5f54fdb", size = 14699246, upload-time = "2026-05-18T23:33:57.621Z" }, - { url = "https://files.pythonhosted.org/packages/ad/fe/c0a6b7b2ca128a8fb228575147073b660656734b8ebe4d76c8fd748dcc79/numpy-2.4.6-cp312-cp312-macosx_14_0_arm64.whl", hash = "sha256:3213d622a0283a39a93d188f3cf72b26862df52fbb4ca3697f51705016523d41", size = 5204410, upload-time = "2026-05-18T23:34:00.302Z" }, - { url = "https://files.pythonhosted.org/packages/f3/d4/9770d14ba719432bb90a421bfd443872ed0f70f7264b64bec12ea363d5fd/numpy-2.4.6-cp312-cp312-macosx_14_0_x86_64.whl", hash = "sha256:357cc07a6d7b0b182ff02249616a03742827ebb1277546b5c7cd7f7620a45698", size = 6551240, upload-time = "2026-05-18T23:34:02.852Z" }, - { url = "https://files.pythonhosted.org/packages/c9/c6/50a46a6205feba2343f1d6d17438107c5dc491ed1c736e6ea68689fd906b/numpy-2.4.6-cp312-cp312-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:5f9fb9157b4ce2971008323afe46053787b526ef624fea915b261468a8421a0f", size = 15671012, upload-time = "2026-05-18T23:34:05.485Z" }, - { url = "https://files.pythonhosted.org/packages/99/60/14115e6364fa676c5397c2ad3004e527e9aa487abf5d0706ec81bbd08529/numpy-2.4.6-cp312-cp312-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:90f9849678c75fe7afa2d348ac842c168b0a4d3d61919687216dfc547976d853", size = 16645538, upload-time = "2026-05-18T23:34:09.265Z" }, - { url = "https://files.pythonhosted.org/packages/ae/c5/693cbe59e57db94d2231fa519ca3978dc9e19da5a8f088588f5c6e947ff2/numpy-2.4.6-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:c1a2af6c6ef86344a6b0db6b97834208bf598db514f2b155042439b62605601a", size = 17020706, upload-time = "2026-05-18T23:34:13.053Z" }, - { url = "https://files.pythonhosted.org/packages/ef/fc/85b7c4eff9b4966ade25c2273cf7e7012e92366c032058653934b37de044/numpy-2.4.6-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:e5805d5a22fd19c8ccff10a9561f9df94436b0545619ea579db2d3c35294bce2", size = 18368541, upload-time = "2026-05-18T23:34:17.024Z" }, - { url = "https://files.pythonhosted.org/packages/f6/81/e1b27545deedce7f4a0b348618c6b62d74e36a4dc9ccd42f3eb2f85eee32/numpy-2.4.6-cp312-cp312-win32.whl", hash = "sha256:e3eeb0aabd6bd5ce64faae67e9935203a6991b4bc2a485a767fbafb2c5125f45", size = 5962825, upload-time = "2026-05-18T23:34:20.3Z" }, - { url = "https://files.pythonhosted.org/packages/ab/ca/feab00bd44aa5fe1ad2c18f08b4d3bb92e26484b0b1d1443897809ed528c/numpy-2.4.6-cp312-cp312-win_amd64.whl", hash = "sha256:d8e8286dd7cea7895157318d1b91cdacac64c479f3cbc8dce548331728484751", size = 12321687, upload-time = "2026-05-18T23:34:23.095Z" }, - { url = "https://files.pythonhosted.org/packages/63/cf/5a6d34850a39d1093558564f77ee8e8e0bee5061151b8f05a55711001ec7/numpy-2.4.6-cp312-cp312-win_arm64.whl", hash = "sha256:4081eb135ac24158bd51cdfbef16f1c64df7063b1143f24731387137c092bec8", size = 10221482, upload-time = "2026-05-18T23:34:25.876Z" }, - { url = "https://files.pythonhosted.org/packages/fb/82/bdab26d7438c6791ca31b7c024ca37c1eab8b726ba236129005cd4a06e45/numpy-2.4.6-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:511dbaf848decaaaf4b4ca48032619fb3138710c4bf7da7617765edad1ef96b0", size = 16684648, upload-time = "2026-05-18T23:34:29.41Z" }, - { url = "https://files.pythonhosted.org/packages/1b/30/a80189bcc7f5e4258b3fbc3968d909d1756f54d023299ecc39ad6fdb9ef8/numpy-2.4.6-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:bf162abab1c1a736333192707cef898e735a5ca00f38f27eeedf44b39d9e85eb", size = 14693902, upload-time = "2026-05-18T23:34:33.013Z" }, - { url = "https://files.pythonhosted.org/packages/97/12/70b5d0d7c15e1ebb8a6a84a8caa1d19e181d84fb58bb6d70aca29099dec1/numpy-2.4.6-cp313-cp313-macosx_14_0_arm64.whl", hash = "sha256:043191bfa8eab18c776647b62723ac9dddece59743b13f49b2016094129c2b3f", size = 5198992, upload-time = "2026-05-18T23:34:36.132Z" }, - { url = "https://files.pythonhosted.org/packages/ba/8c/ebd2a8f8a83541f8d38cc5667e8c2b69cecfd30da6e45693e8158857d44b/numpy-2.4.6-cp313-cp313-macosx_14_0_x86_64.whl", hash = "sha256:6180d8b35af935aed8ece3a85e0a43f87393ae0ac87c8d2c8bd2c993f7270ef3", size = 6546944, upload-time = "2026-05-18T23:34:38.484Z" }, - { url = "https://files.pythonhosted.org/packages/bb/c5/7b863a97a91671a0338f4253bd3b5a3d3852f0692dae91711c9f4a10e787/numpy-2.4.6-cp313-cp313-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:72fbe16c6fac95aedf5937fa873445cec2110be35d8a4e9433d7501fd98dae6b", size = 15669392, upload-time = "2026-05-18T23:34:41.257Z" }, - { url = "https://files.pythonhosted.org/packages/a5/9d/3584b9984ca4c047aea75214ce1a4c4c73d849bd71b604264b7f5653f8a8/numpy-2.4.6-cp313-cp313-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:a7830bab239b79cda9c08c2da014761cafb48da6150e1da17ac06283f43b6089", size = 16633220, upload-time = "2026-05-18T23:34:45.075Z" }, - { url = "https://files.pythonhosted.org/packages/05/ae/7c67fba23bd98caec7c99261f3a16072ade14813486b0282cb29846de832/numpy-2.4.6-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:ef4aea96ce4d3b074422cb4f2f64e216bf9e213004bb58ecfdf50ea02ea8eb9a", size = 17020800, upload-time = "2026-05-18T23:34:49.065Z" }, - { url = "https://files.pythonhosted.org/packages/d9/5d/3b6725cb31d983c5e66916f5d36f6d7e5521129e4c4404d64f918292a5b6/numpy-2.4.6-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:dfa20cc6ca228e6b155b11da03825975ce66aea520985dbbddf0f2a5a495c605", size = 18357600, upload-time = "2026-05-18T23:34:52.709Z" }, - { url = "https://files.pythonhosted.org/packages/f7/da/2ccc6c2fe8898dee01d90c75c5f5f914a23daf99e3e0f59516a08760c8b5/numpy-2.4.6-cp313-cp313-win32.whl", hash = "sha256:56b39e5e0622a09a25bf5baf62f4bcf0cb8a41ae6e2819cf49bbc5a74c083f91", size = 5961134, upload-time = "2026-05-18T23:34:55.618Z" }, - { url = "https://files.pythonhosted.org/packages/b5/cd/9cc4dc876fb065d5c220aae4d5e14826b2715331bb7618ce1fb07a679d99/numpy-2.4.6-cp313-cp313-win_amd64.whl", hash = "sha256:c4fc99836233ea196540b17ab0983aff60ed07941751930f5f4d05bc3b3b7359", size = 12318598, upload-time = "2026-05-18T23:34:58.928Z" }, - { url = "https://files.pythonhosted.org/packages/39/1e/c0bcba1f8694116485fe28fd1be698c278fcda4141c5b0e53a2aed8b12a8/numpy-2.4.6-cp313-cp313-win_arm64.whl", hash = "sha256:a7c711e21628b52034bb5ab8d1bce291f752fcc5e92accc615778acee1ff4778", size = 10222272, upload-time = "2026-05-18T23:35:02.167Z" }, - { url = "https://files.pythonhosted.org/packages/63/6d/cc5619247c8f4204e507f5883528372e4ac4bb189e579fb859a12e480b1f/numpy-2.4.6-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:112b06a867b235ef466ed3508ddf0238050df9c727cafb5301ac385b899189a1", size = 14821197, upload-time = "2026-05-18T23:35:05.468Z" }, - { url = "https://files.pythonhosted.org/packages/00/58/f1c39161c87d9e9bed660f1ed4bafc0e403d5ec9650b6dd77aead07d489b/numpy-2.4.6-cp313-cp313t-macosx_14_0_arm64.whl", hash = "sha256:eaf7fa2de5c0be8ae6ff8e9bea2ccd725e980541244521d8d4b5f3354a27babe", size = 5326287, upload-time = "2026-05-18T23:35:08.693Z" }, - { url = "https://files.pythonhosted.org/packages/af/57/3917ab0fd97f271a8694513581b8a36c655f111c446852c302f04ccdb6fc/numpy-2.4.6-cp313-cp313t-macosx_14_0_x86_64.whl", hash = "sha256:7265a2f3d436e54ef9f2b52b5c937e6be778781bd97a590319d7348f1c1ca997", size = 6646763, upload-time = "2026-05-18T23:35:11.459Z" }, - { url = "https://files.pythonhosted.org/packages/eb/0f/037e64c494b67581ae18193d770adef354c41f3f2c8ebf865602d949bf8f/numpy-2.4.6-cp313-cp313t-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:f74a575920ab21fe304421a3fc28793d82e299cae9eccb37084e9fc7f3617c20", size = 15728070, upload-time = "2026-05-18T23:35:14.79Z" }, - { url = "https://files.pythonhosted.org/packages/21/a6/5d2bae9c9542eb4df16dc9c46dc79c186e9bad53805dfa5399a6023c6db0/numpy-2.4.6-cp313-cp313t-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:ede83e07a75dd06bc501566c1eca2afc0d61677c1472ac9ad93fdee6e638a48d", size = 16681752, upload-time = "2026-05-18T23:35:18.836Z" }, - { url = "https://files.pythonhosted.org/packages/92/14/23d1dfb410ae362cd59ce53e936b1513d545eb40db3949ced632e19a459e/numpy-2.4.6-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:68bb27509ac1b9a3443094260f6326150663b06abe40b73a2f81160623da5b67", size = 17086024, upload-time = "2026-05-18T23:35:22.52Z" }, - { url = "https://files.pythonhosted.org/packages/4b/6e/23595a2c642cdf3bc567877064bdd7f91c8b0038a4453cf2daf7248eafe9/numpy-2.4.6-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:a0df0043bdb289bde1f62da130d20df23d58b45429f752bc7a8fc5325a225ecd", size = 18403398, upload-time = "2026-05-18T23:35:26.398Z" }, - { url = "https://files.pythonhosted.org/packages/8a/90/0ac3bc947217e66dec77e7cbc6a1979d1af70b6461b82f620d3bccd5e4c8/numpy-2.4.6-cp313-cp313t-win32.whl", hash = "sha256:29a287e0cf63ff528da061de6b9f64a4618da591ca1046aafc54062e40ca7eab", size = 6084971, upload-time = "2026-05-18T23:35:29.387Z" }, - { url = "https://files.pythonhosted.org/packages/77/71/5673e351671a1d2bd6063b91b44f70c0affea7d1516fa7a6572941ba4aa1/numpy-2.4.6-cp313-cp313t-win_amd64.whl", hash = "sha256:25c692919ac5a01f170a3bfcd62d745b24fd095c353d50812637d6fcab442e75", size = 12458532, upload-time = "2026-05-18T23:35:32.175Z" }, - { url = "https://files.pythonhosted.org/packages/3f/88/19d3503c5046e688f049274b27a3ef3d771152fa80d3ba3d01a3dff61abe/numpy-2.4.6-cp313-cp313t-win_arm64.whl", hash = "sha256:1e978ec1e8bd0e0e4de6bb75de9d30cbb74db6b6a2bb727618613703ca0167dd", size = 10291881, upload-time = "2026-05-18T23:35:35.465Z" }, { url = "https://files.pythonhosted.org/packages/f8/91/3ab2044d05fd16d343c5ac2e69b127f1b2854040dd20b193257c78028bd3/numpy-2.4.6-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:06ca2f61ec4385a07a6977c55ba998a4466c123642b4a32694d3128fce18c079", size = 16683458, upload-time = "2026-05-18T23:35:38.353Z" }, { url = "https://files.pythonhosted.org/packages/8e/62/764ce66fa4147ae6d73071a3abf804ffe606f174618697c571acdf26a7c9/numpy-2.4.6-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:38efbc8de75c7a0fc1ac190162d892787f3f47b57cc291231aafee36b80982b7", size = 14704559, upload-time = "2026-05-18T23:35:42.14Z" }, { url = "https://files.pythonhosted.org/packages/60/61/23f27c172f022e04025b7dc2367f4d63c1a398120607ec896228649a6f48/numpy-2.4.6-cp314-cp314-macosx_14_0_arm64.whl", hash = "sha256:d581b735e177fdcdce6fed8e7e8880a3fb6ee4e3653a3ac6af01c6f4c03effc5", size = 5209716, upload-time = "2026-05-18T23:35:45.377Z" }, @@ -2682,13 +1945,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/9c/50/0753655aa844c99cd9e018aacf76f130f1bd81d881bb74bc0aef5d73a8ba/numpy-2.4.6-cp314-cp314t-win32.whl", hash = "sha256:260a5d70215b61ab4fadf5c7baacd64821842975eea312125ed3c39a6391b063", size = 6156982, upload-time = "2026-05-18T23:36:40.817Z" }, { url = "https://files.pythonhosted.org/packages/b2/d4/7c67becf668f973cb490cec3e98dfd799d866f9c989a54d355672cfa0db6/numpy-2.4.6-cp314-cp314t-win_amd64.whl", hash = "sha256:81a1cca95ed5bb92aa8b10dd2cdc9a0d3853a50fad926c28b5d7e8ea54389627", size = 12638908, upload-time = "2026-05-18T23:36:43.996Z" }, { url = "https://files.pythonhosted.org/packages/43/bb/e1c71a4295b1b1d1393d50dbb4f2a36283c6859d9d3892e84f00ec5a91d5/numpy-2.4.6-cp314-cp314t-win_arm64.whl", hash = "sha256:0c9136e14ed34a9e343a31c533d78a9813a69a3148332bce5e9821cb2f996e66", size = 10565867, upload-time = "2026-05-18T23:36:47.114Z" }, - { url = "https://files.pythonhosted.org/packages/de/12/b422cc84439adc0d00de605bf4a308890ae5c26f2c71fbd73e5d08fbb0dd/numpy-2.4.6-pp311-pypy311_pp73-macosx_10_15_x86_64.whl", hash = "sha256:55cced7c52e981362f708ad635198e97a752dfba412cc03c23bbf3bd8d5cd662", size = 16847511, upload-time = "2026-05-18T23:36:50.673Z" }, - { url = "https://files.pythonhosted.org/packages/44/53/f481bef68011740f8849418d82db07230e825013f31f4eef5ba5b805316a/numpy-2.4.6-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:d6da64deb6b8ed903e7560180a92f2d804ee1ba5eeb849ac2748b8c1aba1f6d7", size = 14889064, upload-time = "2026-05-18T23:36:53.879Z" }, - { url = "https://files.pythonhosted.org/packages/7f/57/42ed575c10ced8af951d426bc4e1f8aff16fd851db33f067036215a7f860/numpy-2.4.6-pp311-pypy311_pp73-macosx_14_0_arm64.whl", hash = "sha256:68a5124b13fa6cc2086764a20005d30bc0548146f7f5322f02fce212ca14317f", size = 5394157, upload-time = "2026-05-18T23:36:57.194Z" }, - { url = "https://files.pythonhosted.org/packages/6a/ef/f66cc724fcc36c1e364c67f51ae9146090b8b584f27d58b97fdae3edd737/numpy-2.4.6-pp311-pypy311_pp73-macosx_14_0_x86_64.whl", hash = "sha256:948424b06129ce883307e8cff868c31396d8dc7630a59c61d70d98dbe70f222c", size = 6708728, upload-time = "2026-05-18T23:36:59.575Z" }, - { url = "https://files.pythonhosted.org/packages/1a/9c/c531f2293b91265d8b48e9b329f54fdd7ffae73cb4134ea10cca4237e9cc/numpy-2.4.6-pp311-pypy311_pp73-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:5dbbdb29840ca3d91ee0fece42fc29278886d908280bfec0a5846c6f901a3eb0", size = 15798374, upload-time = "2026-05-18T23:37:02.674Z" }, - { url = "https://files.pythonhosted.org/packages/1a/b0/413077f6b1153ed3cba361401c6783bbad6114804a000cc22eb71c13e190/numpy-2.4.6-pp311-pypy311_pp73-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:8ad03c0965fb3c692200e74d458ca28c1dbb4ce96f9a479a8aa041ad5fabca02", size = 16747286, upload-time = "2026-05-18T23:37:06.327Z" }, - { url = "https://files.pythonhosted.org/packages/15/ce/e5ec180bc41812edcd8daeb8639d205622c0e8c02259d8ab25a0201b3c2a/numpy-2.4.6-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:2803abfebfc990042cd494d8ce2d5f82e9d847af6d35ec486923aa19dbad5e73", size = 12504263, upload-time = "2026-05-18T23:37:09.715Z" }, ] [[package]] @@ -2848,51 +2104,6 @@ version = "3.11.9" source = { registry = "https://pypi.org/simple" } sdist = { url = "https://files.pythonhosted.org/packages/7e/0c/964746fcafbd16f8ff53219ad9f6b412b34f345c75f384ad434ceaadb538/orjson-3.11.9.tar.gz", hash = "sha256:4fef17e1f8722c11587a6ef18e35902450221da0028e65dbaaa543619e68e48f", size = 5599163, upload-time = "2026-05-06T15:11:08.309Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/1e/51/3fb9e65ae76ee97bd611869a503fa3fc0a6e81dd8b737cf3003f682df7ff/orjson-3.11.9-cp311-cp311-macosx_10_15_x86_64.macosx_11_0_arm64.macosx_10_15_universal2.whl", hash = "sha256:f01c4818b3fc9b0da8e096722a84318071eaa118df35f6ed2344da0e73a5444f", size = 228522, upload-time = "2026-05-06T15:09:35.362Z" }, - { url = "https://files.pythonhosted.org/packages/16/fa/9d54b07cb3f3b0bfd57841478e42d7a0ece4a9f49f9907eecf5a45461687/orjson-3.11.9-cp311-cp311-macosx_15_0_arm64.whl", hash = "sha256:3ebca4179031ee716ed076ffadc29428e900512f6fccee8614c9983157fcf19c", size = 128463, upload-time = "2026-05-06T15:09:37.063Z" }, - { url = "https://files.pythonhosted.org/packages/88/b1/6ceafc2eefd0a553e3be77ce6c49d107e772485d9568629376171c50e634/orjson-3.11.9-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:48ee05097750de0ff69ed5b7bbcf0732182fd57a24043dcc2a1da780a5ead3a5", size = 132306, upload-time = "2026-05-06T15:09:38.299Z" }, - { url = "https://files.pythonhosted.org/packages/ea/76/f11311285324a40aab1e3031385c50b635a7cd0734fdaf60c7e89a696f60/orjson-3.11.9-cp311-cp311-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:a6082706765a95a6680d812e1daf1c0cfe8adec7831b3ff3b625693f3b461b1c", size = 127988, upload-time = "2026-05-06T15:09:39.597Z" }, - { url = "https://files.pythonhosted.org/packages/9e/85/0ef63bcf1337f44031ce9b91b1919563f62a37527b3ea4368bb15a22e5d7/orjson-3.11.9-cp311-cp311-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:277fefe9d76ee17eb14debf399e3533d4d63b5f677a4d3719eb763536af1f4bd", size = 135188, upload-time = "2026-05-06T15:09:40.957Z" }, - { url = "https://files.pythonhosted.org/packages/05/94/b0d27090ea8a2095db3c2bd1b1c96f96f19bbb494d7fef33130e846e613d/orjson-3.11.9-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:03db380e3780fa0015ed776a90f20e8e20bb11dde13b216ce19e5718e3dfba62", size = 145937, upload-time = "2026-05-06T15:09:42.249Z" }, - { url = "https://files.pythonhosted.org/packages/09/eb/75d50c29c05b8054013e221e598820a365c8e64065312e75e202ed880709/orjson-3.11.9-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:33d7d766701847dc6729846362dc27895d2f2d2251264f9d10e7cb9878194877", size = 132758, upload-time = "2026-05-06T15:09:43.945Z" }, - { url = "https://files.pythonhosted.org/packages/49/bd/360686f39348aa88827cb6fbf7dc606fd41c831a35235e1abf1db8e3a9e6/orjson-3.11.9-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:147302878da387104b66bb4a8b0227d1d487e976ce41a8501916161072ed87b1", size = 133971, upload-time = "2026-05-06T15:09:45.239Z" }, - { url = "https://files.pythonhosted.org/packages/0e/30/3178eb16f3221aeef068b6f1f1ebe05f656ea5c6dffe9f6c917329fe17a3/orjson-3.11.9-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:3513550321f8c8c811a7c3297b8a630e82dc08e4c10216d07703c997776236cd", size = 141685, upload-time = "2026-05-06T15:09:46.858Z" }, - { url = "https://files.pythonhosted.org/packages/5f/f1/ff2f19ed0225f9680fafa42febca3570dd59444ebf190980738d376214c2/orjson-3.11.9-cp311-cp311-musllinux_1_2_armv7l.whl", hash = "sha256:c5d001196b89fa9cf0a4ab79766cd835b991a166e4b621ba95089edc50c429ff", size = 415167, upload-time = "2026-05-06T15:09:48.312Z" }, - { url = "https://files.pythonhosted.org/packages/9b/61/863bddf0da6e9e586765414debd54b4e58db05f560902b6d00658cb88636/orjson-3.11.9-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:16969c9d369c98eb084889c6e4d2d39b77c7eb38ceccf8da2a9fff62ae908980", size = 147913, upload-time = "2026-05-06T15:09:49.733Z" }, - { url = "https://files.pythonhosted.org/packages/b6/8a/4081492586d75b073d60c5271a8d0f05a0955cabf1e34c8473f6fcd84235/orjson-3.11.9-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:63e0efbc991250c0b3143488fa57d95affcabbfc63c99c48d625dd37779aafe2", size = 136959, upload-time = "2026-05-06T15:09:51.311Z" }, - { url = "https://files.pythonhosted.org/packages/0d/bd/70b6ab193594d7abb875320c0a7c8335e846f28968c432c31042409c3c8d/orjson-3.11.9-cp311-cp311-win32.whl", hash = "sha256:14ed654580c1ed2bc217352ec82f91b047aef82951aa71c7f64e0dcb03c0e180", size = 131533, upload-time = "2026-05-06T15:09:52.637Z" }, - { url = "https://files.pythonhosted.org/packages/3f/17/1a1a228183d62d1b77e2c30d210f47dd4768b310ebe1607c63e3c0e3a71e/orjson-3.11.9-cp311-cp311-win_amd64.whl", hash = "sha256:57ea77fb70a448ce87d18fca050193202a3da5e54598f6501ca5476fb66cfe02", size = 127106, upload-time = "2026-05-06T15:09:54.204Z" }, - { url = "https://files.pythonhosted.org/packages/b8/95/285de5fa296d09681ee9c546cd4a8aeb773b701cf343dc125994f4d52953/orjson-3.11.9-cp311-cp311-win_arm64.whl", hash = "sha256:19b72ed11572a2ee51a67a903afbe5af504f84ed6f529c0fe44b0ab3fb5cc697", size = 126848, upload-time = "2026-05-06T15:09:55.551Z" }, - { url = "https://files.pythonhosted.org/packages/16/6d/11867a3ffa3a3608d84a4de51ef4dd0896d6b5cc9132fbe1daf593e677bc/orjson-3.11.9-cp312-cp312-macosx_10_15_x86_64.macosx_11_0_arm64.macosx_10_15_universal2.whl", hash = "sha256:9ef6fe90aadef185c7b128859f40beb24720b4ecea95379fc9000931179c3a49", size = 228515, upload-time = "2026-05-06T15:09:57.265Z" }, - { url = "https://files.pythonhosted.org/packages/24/75/05912954c8b288f34fcf5cd4b9b071cb4f6e77b9961e175e56ebb258089f/orjson-3.11.9-cp312-cp312-macosx_15_0_arm64.whl", hash = "sha256:e5c9b8f28e726e97d97696c826bc7bea5d71cecd63576dba92924a32c1961291", size = 128409, upload-time = "2026-05-06T15:09:59.063Z" }, - { url = "https://files.pythonhosted.org/packages/ab/86/1c3a47df3bc8191ea9ac51603bbb872a95167a364320c269f2557911f406/orjson-3.11.9-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:26a473dbb4162108b27901492546f83c76fdcea3d0eadff00ae7a07e18dcce09", size = 132106, upload-time = "2026-05-06T15:10:00.798Z" }, - { url = "https://files.pythonhosted.org/packages/d7/cf/b33b5f3e695ae7d63feef9d915c37cc3b8f465493dcd4f8e0b4c697a2366/orjson-3.11.9-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:011382e2a60fda9d46f1cdee31068cfc52ffe952b587d683ec0463002802a0f4", size = 127864, upload-time = "2026-05-06T15:10:02.15Z" }, - { url = "https://files.pythonhosted.org/packages/31/6a/6cf69385a58208024fcb8c014e2141b8ce838aba6492b589f8acfff97fab/orjson-3.11.9-cp312-cp312-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c2d3dc759490128c5c1711a53eeaa8ee1d437fd0038ffd2b6008abf46db3f882", size = 135213, upload-time = "2026-05-06T15:10:03.515Z" }, - { url = "https://files.pythonhosted.org/packages/e8/f8/0b1bd3e8f2efcdd376af5c8cfd79eaf13f018080c0089c80ebd724e3c7fb/orjson-3.11.9-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:d8ea516b3726d190e1b4297e6f4e7a8650347ae053868a18163b4dd3641d1fff", size = 145994, upload-time = "2026-05-06T15:10:05.083Z" }, - { url = "https://files.pythonhosted.org/packages/f3/59/dab79f61044c529d2c81aecdc589b1f833a1c8dec11ba3b1c2498a02ca7e/orjson-3.11.9-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:380cdce7ba24989af81d0a7013d0aaec5d0e2a21734c0e2681b1bc4f141957fe", size = 132744, upload-time = "2026-05-06T15:10:06.853Z" }, - { url = "https://files.pythonhosted.org/packages/0e/a4/82b7a2fe5d8a67a59ed831b24d59a3d46ea7d207b66e1602d376541d94a6/orjson-3.11.9-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:be4fa4f0af7fa18951f7ab3fc2148e223af211bf03f59e1c6034ec3f97f21d61", size = 134014, upload-time = "2026-05-06T15:10:08.213Z" }, - { url = "https://files.pythonhosted.org/packages/50/c7/375e83a76851b73b2e39f3bcf0e5a19e2b89bad13e5bca97d0b293d27f24/orjson-3.11.9-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:a8f5f8bc7ce7d59f08d9f99fa510c06496164a24cb5f3d34537dbd9ca30132e2", size = 141509, upload-time = "2026-05-06T15:10:09.595Z" }, - { url = "https://files.pythonhosted.org/packages/7f/7c/49d5d82a3d3097f641f094f552131f1e2723b0b8cb0fa2874ab65ecfffa6/orjson-3.11.9-cp312-cp312-musllinux_1_2_armv7l.whl", hash = "sha256:4d7fde5501b944f83b3e665e1b31343ff6e154b15560a16b7130ea1e594a4206", size = 415127, upload-time = "2026-05-06T15:10:11.049Z" }, - { url = "https://files.pythonhosted.org/packages/3a/dc/7446c538590d55f455647e5f3c61fc33f7108714e7afcffa6a2a033f8350/orjson-3.11.9-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:cde1a448023ba7d5bb4c01c5afb48894380b5e4956e0627266526587ef4e535f", size = 148025, upload-time = "2026-05-06T15:10:12.842Z" }, - { url = "https://files.pythonhosted.org/packages/df/e5/4d2d8af06f788329b4f78f8cc3679bb395392fcaa1e4d8d3c33e85308fa4/orjson-3.11.9-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:71e63adb0e1f1ed5d9e168f50a91ceb93ae6420731d222dc7da5c69409aa47aa", size = 136943, upload-time = "2026-05-06T15:10:14.405Z" }, - { url = "https://files.pythonhosted.org/packages/06/69/850264ccf6d80f6b174620d30a87f65c9b1490aba33fe6b62798e618cad3/orjson-3.11.9-cp312-cp312-win32.whl", hash = "sha256:2d057a602cdd19a0ad680417527c45b6961a095081c0f46fe0e03e304aac6470", size = 131606, upload-time = "2026-05-06T15:10:15.791Z" }, - { url = "https://files.pythonhosted.org/packages/b9/d5/973a43fc9c55e20f2051e9830997649f669be0cb3ca52192087c0143f118/orjson-3.11.9-cp312-cp312-win_amd64.whl", hash = "sha256:59e403b1cc5a676da8eaf31f6254801b7341b3e29efa85f92b48d272637e77be", size = 127101, upload-time = "2026-05-06T15:10:17.129Z" }, - { url = "https://files.pythonhosted.org/packages/fe/ae/495470f0e4a18f73fa10b7f6b84b464ec4cc5291c4e0c7c2a6c400bef006/orjson-3.11.9-cp312-cp312-win_arm64.whl", hash = "sha256:9af678d6488357948f1f84c6cd1c1d397c014e1ae2f98ae082a44eb48f602624", size = 126736, upload-time = "2026-05-06T15:10:18.645Z" }, - { url = "https://files.pythonhosted.org/packages/32/33/93fcc25907235c344ae73122f8a4e01d2d393ef062b4af7d2e2487a32c37/orjson-3.11.9-cp313-cp313-macosx_10_15_x86_64.macosx_11_0_arm64.macosx_10_15_universal2.whl", hash = "sha256:4bab1b2d6141fe7b32ae71dac905666ece4f94936efbfb13d55bb7739a3a6021", size = 228458, upload-time = "2026-05-06T15:10:20.079Z" }, - { url = "https://files.pythonhosted.org/packages/8f/27/b1e6dadb3c080313c03fdd8067b85e6a0460c7d8d6a1c3984ef77b904e4d/orjson-3.11.9-cp313-cp313-macosx_15_0_arm64.whl", hash = "sha256:844417969855fc7a41be124aafe83dc424592a7f77cd4501900c67307122b92c", size = 128368, upload-time = "2026-05-06T15:10:21.549Z" }, - { url = "https://files.pythonhosted.org/packages/21/0f/c9ede0bf052f6b4051e64a7d4fa91b725cccf8321a6a786e86eb03519f00/orjson-3.11.9-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ffe02797b5e9f3a9d8292ddcd289b474ad13e81ad83cd1891a240811f1d2cb81", size = 132070, upload-time = "2026-05-06T15:10:23.371Z" }, - { url = "https://files.pythonhosted.org/packages/fd/26/d398e28048dc18205bbe812f2c88cb9b40313db2470778e25964796458fe/orjson-3.11.9-cp313-cp313-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:0e4eed3b200023042814d2fc8a5d2e880f13b52e1ed2485e83da4f3962f7dc1a", size = 127892, upload-time = "2026-05-06T15:10:24.714Z" }, - { url = "https://files.pythonhosted.org/packages/66/60/52b0054c4c700d5aa7fc5b7ca96917400d8f061307778578e67a10e25852/orjson-3.11.9-cp313-cp313-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:8aff7da9952a5ad1cef8e68017724d96c7b9a66e99e91d6252e1b133d67a7b10", size = 135217, upload-time = "2026-05-06T15:10:26.084Z" }, - { url = "https://files.pythonhosted.org/packages/d5/97/1e3dc2b2a28b7b2528f403d2fc1d79ec5f39af3bc143ab65d3ec26426385/orjson-3.11.9-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:4d4e98d6f3b8afed8bc8cd9718ec0cdf46661826beefb53fe8eafb37f2bf0362", size = 145980, upload-time = "2026-05-06T15:10:28.062Z" }, - { url = "https://files.pythonhosted.org/packages/fc/39/31fbfe7850f2de32dee7e7e5c09f26d403ab01e440ac96001c6b01ad3c99/orjson-3.11.9-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:3a81d52442a7c99b3662333235b3adf96a1715864658b35bb797212be7bddb97", size = 132738, upload-time = "2026-05-06T15:10:29.727Z" }, - { url = "https://files.pythonhosted.org/packages/a1/08/dca0082dd2a194acb93e5457e73455388e2e2ca464a2672449a9ddbb679d/orjson-3.11.9-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4e39364e726a8fff737309aff059ff67d8a8c8d5b677be7bb49a8b3e84b7e218", size = 134033, upload-time = "2026-05-06T15:10:31.152Z" }, - { url = "https://files.pythonhosted.org/packages/11/d4/5bdb0626801230139987385554c5d4c42255218ac906525bf4347f22cd95/orjson-3.11.9-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:4fd66214623f1b17501df9f0543bef0b833979ab5b6ded1e1d123222866aa8c9", size = 141492, upload-time = "2026-05-06T15:10:32.641Z" }, - { url = "https://files.pythonhosted.org/packages/fa/88/a21fb53b3ede6703aede6dce4710ed4111e5b201cfa6bbff5e544f9d47d7/orjson-3.11.9-cp313-cp313-musllinux_1_2_armv7l.whl", hash = "sha256:8ecc30f10465fa1e0ce13fd01d9e22c316e5053a719a8d915d4545a09a5ff677", size = 415087, upload-time = "2026-05-06T15:10:34.438Z" }, - { url = "https://files.pythonhosted.org/packages/3d/57/1b30daf70f0d8180e9a73cefbfbdd99e4bf19eb020466502b01fba7e0e50/orjson-3.11.9-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:97db4c94a7db398a5bd636273324f0b3fd58b350bbbac8bb380ceb825a9b40f4", size = 148031, upload-time = "2026-05-06T15:10:36.358Z" }, - { url = "https://files.pythonhosted.org/packages/04/83/45fbb6d962e260807f99441db9613cee868ceda4baceda59b3720a563f97/orjson-3.11.9-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:9f78cf8fec5bd627f4082b8dfeac7871b43d7f3274904492a43dab39f18a19a0", size = 136915, upload-time = "2026-05-06T15:10:38.013Z" }, - { url = "https://files.pythonhosted.org/packages/5f/cc/2d10025f9056d376e4127ec05a5808b218d46f035fdc08178a5411b34250/orjson-3.11.9-cp313-cp313-win32.whl", hash = "sha256:d4087e5c0209a0a8efe4de3303c234b9c44d1174161dcd851e8eea07c7560b32", size = 131613, upload-time = "2026-05-06T15:10:39.569Z" }, - { url = "https://files.pythonhosted.org/packages/67/bd/2775ff28bfe883b9aa1ff348300542eb2ef1ee18d8ae0e3a49846817a865/orjson-3.11.9-cp313-cp313-win_amd64.whl", hash = "sha256:051b102c93b4f634e89f3866b07b9a9a98915ada541f4ec30f177067b2694979", size = 127086, upload-time = "2026-05-06T15:10:41.262Z" }, - { url = "https://files.pythonhosted.org/packages/91/2b/d26799e580939e32a7da9a39531bc9e58e15ca32ffaa6a8cb3e9bb0d22cd/orjson-3.11.9-cp313-cp313-win_arm64.whl", hash = "sha256:cce9127885941bd28f080cecf1f1d288336b7e0d812c345b08be88b572796254", size = 126696, upload-time = "2026-05-06T15:10:42.651Z" }, { url = "https://files.pythonhosted.org/packages/8e/eb/5da01e356015aee6ecfa1187ced87aef51364e306f5e695dd52719bf0e78/orjson-3.11.9-cp314-cp314-macosx_10_15_x86_64.macosx_11_0_arm64.macosx_10_15_universal2.whl", hash = "sha256:b6ef1979adc4bc243523f1a2ba91418030a8e29b0a99cbe7e0e2d6807d4dce6e", size = 228465, upload-time = "2026-05-06T15:10:44.097Z" }, { url = "https://files.pythonhosted.org/packages/64/62/3e0e0c14c957133bcd855395c62b55ed4e3b0af23ffea11b032cb1dcbdb1/orjson-3.11.9-cp314-cp314-macosx_15_0_arm64.whl", hash = "sha256:f36b7f32c7c0db4a719f1fc5824db4a9c6f8bd1a354debb91faf26ebf3a4c71e", size = 128364, upload-time = "2026-05-06T15:10:45.839Z" }, { url = "https://files.pythonhosted.org/packages/5a/5a/07d8aa117211a8ed7630bda80c8c0b14d04e0f8dcf99bcf49656e4a710eb/orjson-3.11.9-cp314-cp314-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:08f4d8ebb44925c794e535b2bebc507cebf32209df81de22ae285fb0d8d66de0", size = 132063, upload-time = "2026-05-06T15:10:47.267Z" }, @@ -2910,15 +2121,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/16/21/5a3f1e8913103b703a436a5664238e5b965ec392b555fe68943ea3691e6b/orjson-3.11.9-cp314-cp314-win_arm64.whl", hash = "sha256:eebdbdeef0094e4f5aefa20dcd4eb2368ab5e7a3b4edea27f1e7b2892e009cf9", size = 126687, upload-time = "2026-05-06T15:11:06.602Z" }, ] -[[package]] -name = "overrides" -version = "7.7.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/36/86/b585f53236dec60aba864e050778b25045f857e17f6e5ea0ae95fe80edd2/overrides-7.7.0.tar.gz", hash = "sha256:55158fa3d93b98cc75299b1e67078ad9003ca27945c76162c1c0766d6f91820a", size = 22812, upload-time = "2024-01-27T21:01:33.423Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/2c/ab/fc8290c6a4c722e5514d80f62b2dc4c4df1a68a41d1364e625c35990fcf3/overrides-7.7.0-py3-none-any.whl", hash = "sha256:c7ed9d062f78b8e4c1a7b70bd8796b35ead4d9f510227ef9c5dc7626c60d7e49", size = 17832, upload-time = "2024-01-27T21:01:31.393Z" }, -] - [[package]] name = "packaging" version = "26.2" @@ -2948,37 +2150,6 @@ dependencies = [ ] sdist = { url = "https://files.pythonhosted.org/packages/f8/87/4341c6252d1c47b08768c3d25ac487362bf403f0313ddae4a2a26c9b1b4c/pandas-3.0.3.tar.gz", hash = "sha256:696a4a00a2a2a35d4e5deb3fc946641b96c944f02230e4f76137fe35d806c4fc", size = 4651414, upload-time = "2026-05-11T18:54:29.21Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/42/16/b5c76b838fd9bf6ce84d3a53346b8874ec05c5f0040d75ef2c320100cd2a/pandas-3.0.3-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:455f6f8139d4282188f526868dbc3c828470e88a3d9d59a891bd46a455f21b98", size = 10338495, upload-time = "2026-05-11T18:52:11.558Z" }, - { url = "https://files.pythonhosted.org/packages/5a/b0/a4ffc4ae74d2d822200dcc46898987d8eb6032d1e2b219cae39da6f5cbcc/pandas-3.0.3-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:4e15135e2ee5df1063313e2425ceef8ac0f4ae775893815b0923651b806a5639", size = 9938250, upload-time = "2026-05-11T18:52:17.005Z" }, - { url = "https://files.pythonhosted.org/packages/2e/b2/3323601a52caee42c019e370090ca4544b241437240ca04f786cce82b0cf/pandas-3.0.3-cp311-cp311-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:05f1f1752b8533ea03f7f39a9c15b1a058d067bb48f4748948e7a8691e0510f2", size = 10770558, upload-time = "2026-05-11T18:52:19.865Z" }, - { url = "https://files.pythonhosted.org/packages/32/f1/bbecd2f867b97abebe0f9b53d750f862251b40337e061b36676ded3d920f/pandas-3.0.3-cp311-cp311-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:8a1e45c80cceb3b4a21bc5939d52e8cbd8d9b7305309219d59e9754d9ce09e27", size = 11274611, upload-time = "2026-05-11T18:52:22.622Z" }, - { url = "https://files.pythonhosted.org/packages/7f/4f/eafabf2d5fae5adf143b4d18d3706c5efdc368a7c4eb1ee8a3eddabbd0f6/pandas-3.0.3-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:14da8316da4d0c5a77618425996bfb1248ca87fc2c1486e6fde4652bd18b5824", size = 11784670, upload-time = "2026-05-11T18:52:25.4Z" }, - { url = "https://files.pythonhosted.org/packages/49/44/1eb20389301b57b19cc099a1c2f662501f72f08a65f912d05822613c1532/pandas-3.0.3-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:a55066a0505dae0ba2b50a46637db34b46f9094c65c5d4800794ef6335010938", size = 12353708, upload-time = "2026-05-11T18:52:28.139Z" }, - { url = "https://files.pythonhosted.org/packages/eb/62/c321f13b5ba1819fc8dca456c7fce578da2dcfecff1abbf0eaddf8406c0f/pandas-3.0.3-cp311-cp311-win_amd64.whl", hash = "sha256:6674ab18ad8c57802867264b00e15e7bb904700cdd9046e3b2fa1fce237439ea", size = 9907609, upload-time = "2026-05-11T18:52:30.982Z" }, - { url = "https://files.pythonhosted.org/packages/53/85/1b7f563ebc6357c27233a02a96b589bcce1fa9c6eb89fb4f0e56421d277e/pandas-3.0.3-cp311-cp311-win_arm64.whl", hash = "sha256:5cc09a68b3120e0f54870dede8287a7bb1fa463907e4fcec1ea77cab6179bf7a", size = 9165596, upload-time = "2026-05-11T18:52:33.334Z" }, - { url = "https://files.pythonhosted.org/packages/24/f1/392f8c5bfc16f66a0d2d41561c01627c228fe7ed2a0d056ef11315042570/pandas-3.0.3-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:fed2ff7fd9779120e388e285fc029bd5cf9490cdd2e4166a9ee22c0e49a9ab09", size = 10357846, upload-time = "2026-05-11T18:52:36.143Z" }, - { url = "https://files.pythonhosted.org/packages/cf/3d/b16412745651e855f357e5e66930248688378853a6e2698a214e331fba1f/pandas-3.0.3-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:b168fc218fd80a6cbdbdbc1a97ddc7889ed057d7eb45f50d866ceab5f39904c4", size = 9899550, upload-time = "2026-05-11T18:52:38.976Z" }, - { url = "https://files.pythonhosted.org/packages/31/a8/fa2535168fffcedf67f4f6de28d2dd903a747ca7c8ea6989451aaeb3a92f/pandas-3.0.3-cp312-cp312-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:0383c72c75cdcca61a9e116e611143902dbfd08bff356829c2f6d1cf40a9ca8c", size = 10412965, upload-time = "2026-05-11T18:52:41.915Z" }, - { url = "https://files.pythonhosted.org/packages/65/b6/09b01cdbc15224e2850365192d17b7bdebb8bdbd8780ed221fcdf0d9a515/pandas-3.0.3-cp312-cp312-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:6dc0b3fd2169c9157deed50b4d519553a3655c8c6a96027136d654592be973a9", size = 10894600, upload-time = "2026-05-11T18:52:45.02Z" }, - { url = "https://files.pythonhosted.org/packages/c9/a4/2eb28f2fccb4ced4a2c79ab2a5dee9ade1ebf44922ebad6fea158c9f95d4/pandas-3.0.3-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:7e65d5407dc0b394f509699650e4a2ec01c0514f21850f453fa60f3be79a5dbf", size = 11422824, upload-time = "2026-05-11T18:52:48.058Z" }, - { url = "https://files.pythonhosted.org/packages/f8/45/830bb57f533a4604b355e07edcb8ea18cf88b5f94e5fca92f27052d7c597/pandas-3.0.3-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:f8894dc474d648fe7b6ff0ca9b0bd73950d19952bc1a6534540762c5d79d305c", size = 11950889, upload-time = "2026-05-11T18:52:50.905Z" }, - { url = "https://files.pythonhosted.org/packages/b9/c5/fc1b368f303087d20e8c9bf3d6ceb186263cfac0ade735cd938538bea839/pandas-3.0.3-cp312-cp312-win_amd64.whl", hash = "sha256:c7be265b62cef88e253a941e4698604973736dcfe242fdb5198f0f7bc473cdcc", size = 9755463, upload-time = "2026-05-11T18:52:53.386Z" }, - { url = "https://files.pythonhosted.org/packages/86/bd/fda8f9705b1b09c6ebe14bfc0fa0e4ec8584d54ea673628f157ff55131af/pandas-3.0.3-cp312-cp312-win_arm64.whl", hash = "sha256:557409bc4178e70ee8d9ddb494798e51ebf6ea59330f6be22c51bab2a7db6c49", size = 9066158, upload-time = "2026-05-11T18:52:56.038Z" }, - { url = "https://files.pythonhosted.org/packages/c5/90/62d8302883c44308c477e222c3daf7c813a34c8e96985882fbd53d964352/pandas-3.0.3-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:67b3b64c11910cfa29f4e94a14d3bff9ee693b6fc76055e7cad549cee0aec5fa", size = 10331071, upload-time = "2026-05-11T18:52:58.838Z" }, - { url = "https://files.pythonhosted.org/packages/7f/ae/6a6493c783a101f165e4356953ba3c74d6f77f0042fa7d753da9dfbb640c/pandas-3.0.3-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:39436b377d56d2a2e52d0395bdbee171f01068e99af5250509aceeb929f765c7", size = 9875690, upload-time = "2026-05-11T18:53:01.431Z" }, - { url = "https://files.pythonhosted.org/packages/62/7c/5df8e9f56c69a2769fbe9382a5ef8f2658c007e376434e1e2cbb57ad895f/pandas-3.0.3-cp313-cp313-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:d4be06d68f9ddcfc645b87534911da79a8fbffc7573c80e0edcf42a5020624d8", size = 10381634, upload-time = "2026-05-11T18:53:04.393Z" }, - { url = "https://files.pythonhosted.org/packages/99/68/1237369725aa617bb358263d535803e3053fdbc593513ec5ed9c9896b5b6/pandas-3.0.3-cp313-cp313-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:a4eeb6830daf35a71cc09649bd823e2b542dac246cdee9614c6e4bd65028cd6a", size = 10891243, upload-time = "2026-05-11T18:53:07.643Z" }, - { url = "https://files.pythonhosted.org/packages/25/93/77d108e8af7222b4a503ebde0e30215b1c2e4f8e53a526431890f22d5586/pandas-3.0.3-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:1928e07221f82db493cd4af1e23c1bfca524a19a4699887975bff68f49a72bfb", size = 11388659, upload-time = "2026-05-11T18:53:10.634Z" }, - { url = "https://files.pythonhosted.org/packages/d0/bd/eff5b4399f332ac386c853f6cd2bd3fa2ca0061b9f36ecd9c4d7c4265649/pandas-3.0.3-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:51b1fe551acb77dac643c6fda86084d8d446c10fe64b06a9cc29c4cc8540e7f2", size = 11942880, upload-time = "2026-05-11T18:53:13.536Z" }, - { url = "https://files.pythonhosted.org/packages/2c/20/559ace4200982c3887d0b86bfd0d856a2143ef8ddab63cc07934951a964c/pandas-3.0.3-cp313-cp313-win_amd64.whl", hash = "sha256:a82d532a3351d435432cd913edbccaf8b8e01d4dd0e5ced5a8d2e8ecd94c7e44", size = 9757091, upload-time = "2026-05-11T18:53:16.306Z" }, - { url = "https://files.pythonhosted.org/packages/3a/66/69055a09fe200f29f922a3eeec4804611900b95f52d932ece3393c3c0c19/pandas-3.0.3-cp313-cp313-win_arm64.whl", hash = "sha256:275c14e0fce14a2ec20eee474aecd305478ea3c1e6f6a9d8fe219a165542717e", size = 9057282, upload-time = "2026-05-11T18:53:18.768Z" }, - { url = "https://files.pythonhosted.org/packages/57/0e/efe801b0e6811e8e650cd21b7f2608e30f08a7067e2bf6e8752b0d56ee3c/pandas-3.0.3-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:46997386d528eb40376ecd6b033cf4a8a1e5282580f68f43de875b78cba2199d", size = 10767016, upload-time = "2026-05-11T18:53:21.227Z" }, - { url = "https://files.pythonhosted.org/packages/ea/dc/eb55135a1d5f0f0519f28da1f609a206d2cad1f9c35c32d51e38dd7261ae/pandas-3.0.3-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:261e308dfb22448384b7580cf719d2f998fe2966c92893c3e77d14008af1f066", size = 10420210, upload-time = "2026-05-11T18:53:23.982Z" }, - { url = "https://files.pythonhosted.org/packages/c6/3e/b1d5d955ce33ffecb407465a60bc32769d74fcf68224b7ae67ae11d4dea4/pandas-3.0.3-cp313-cp313t-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:dd1a5d1def6a46002e964510bdc67c368aa0951df5d1d9f8365336f5a1f490cd", size = 10336126, upload-time = "2026-05-11T18:53:26.731Z" }, - { url = "https://files.pythonhosted.org/packages/f5/76/a01261711ab60a22d71b862f0de20e4c504bf80457270ad8cb42110f6abc/pandas-3.0.3-cp313-cp313t-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:d72828c20c6d6e83e1e22a6a3b47b326b71664112fa9705dcbccfd7a39b62085", size = 10728051, upload-time = "2026-05-11T18:53:29.125Z" }, - { url = "https://files.pythonhosted.org/packages/e9/21/ea191195e587b18cf682e97f433f81b2d0fbe341380e80a3e0d6e4403c8e/pandas-3.0.3-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:d26cbe1fcfc12e8fd900e2454163e466b2d3af84f7c75481df7683ffc073d870", size = 11350796, upload-time = "2026-05-11T18:53:32.056Z" }, - { url = "https://files.pythonhosted.org/packages/64/69/f0eaaf54939f0e8c6768fd06be9af2cef9b36048b96dfb9e1b2c685a807e/pandas-3.0.3-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:3e91cec1879ada0624fc3dc9953c5cbd60208e59c0db28f540c5d6d47502422f", size = 11799741, upload-time = "2026-05-11T18:53:34.985Z" }, - { url = "https://files.pythonhosted.org/packages/45/a4/865e0e510cae5fc2194de4db28be638952de942571ba9125934fd9c01d47/pandas-3.0.3-cp313-cp313t-win_amd64.whl", hash = "sha256:08d789b41f87e0905880e293cedf6197ce71fe67cc081358b1e148a491b9bd13", size = 10499958, upload-time = "2026-05-11T18:53:37.857Z" }, { url = "https://files.pythonhosted.org/packages/86/54/effdcc3c0ff7a08037889200e148ebe94c16c4f653be078c7b3675955df1/pandas-3.0.3-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:3650109c0f22879df8bd6179ab9ee3d7f1d1d4e7e0094a3f0032d9f51e2e64ac", size = 10336065, upload-time = "2026-05-11T18:53:41.099Z" }, { url = "https://files.pythonhosted.org/packages/68/10/bf2d6738d72748b961a3751ab89522d58c54efc36a8e1a12161216cd45cf/pandas-3.0.3-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:bab900348131a7db1f69a7309ef141fd5680f1487094193bcbbb61791573bf8f", size = 9926101, upload-time = "2026-05-11T18:53:43.515Z" }, { url = "https://files.pythonhosted.org/packages/ae/e9/e35cf11c8a136e757b956f5f0efdcaa50aecde85ea055f1898dfc68262f3/pandas-3.0.3-cp314-cp314-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:ba7e08b9ac1d54569cd1e256e3668975ed624d6826f7b68df0342b012007bddb", size = 10457553, upload-time = "2026-05-11T18:53:46.394Z" }, @@ -3033,53 +2204,6 @@ version = "12.2.0" source = { registry = "https://pypi.org/simple" } sdist = { url = "https://files.pythonhosted.org/packages/8c/21/c2bcdd5906101a30244eaffc1b6e6ce71a31bd0742a01eb89e660ebfac2d/pillow-12.2.0.tar.gz", hash = "sha256:a830b1a40919539d07806aa58e1b114df53ddd43213d9c8b75847eee6c0182b5", size = 46987819, upload-time = "2026-04-01T14:46:17.687Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/68/e1/748f5663efe6edcfc4e74b2b93edfb9b8b99b67f21a854c3ae416500a2d9/pillow-12.2.0-cp311-cp311-macosx_10_10_x86_64.whl", hash = "sha256:8be29e59487a79f173507c30ddf57e733a357f67881430449bb32614075a40ab", size = 5354347, upload-time = "2026-04-01T14:42:44.255Z" }, - { url = "https://files.pythonhosted.org/packages/47/a1/d5ff69e747374c33a3b53b9f98cca7889fce1fd03d79cdc4e1bccc6c5a87/pillow-12.2.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:71cde9a1e1551df7d34a25462fc60325e8a11a82cc2e2f54578e5e9a1e153d65", size = 4695873, upload-time = "2026-04-01T14:42:46.452Z" }, - { url = "https://files.pythonhosted.org/packages/df/21/e3fbdf54408a973c7f7f89a23b2cb97a7ef30c61ab4142af31eee6aebc88/pillow-12.2.0-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:f490f9368b6fc026f021db16d7ec2fbf7d89e2edb42e8ec09d2c60505f5729c7", size = 6280168, upload-time = "2026-04-01T14:42:49.228Z" }, - { url = "https://files.pythonhosted.org/packages/d3/f1/00b7278c7dd52b17ad4329153748f87b6756ec195ff786c2bdf12518337d/pillow-12.2.0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:8bd7903a5f2a4545f6fd5935c90058b89d30045568985a71c79f5fd6edf9b91e", size = 8088188, upload-time = "2026-04-01T14:42:51.735Z" }, - { url = "https://files.pythonhosted.org/packages/ad/cf/220a5994ef1b10e70e85748b75649d77d506499352be135a4989c957b701/pillow-12.2.0-cp311-cp311-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:3997232e10d2920a68d25191392e3a4487d8183039e1c74c2297f00ed1c50705", size = 6394401, upload-time = "2026-04-01T14:42:54.343Z" }, - { url = "https://files.pythonhosted.org/packages/e9/bd/e51a61b1054f09437acfbc2ff9106c30d1eb76bc1453d428399946781253/pillow-12.2.0-cp311-cp311-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:e74473c875d78b8e9d5da2a70f7099549f9eb37ded4e2f6a463e60125bccd176", size = 7079655, upload-time = "2026-04-01T14:42:56.954Z" }, - { url = "https://files.pythonhosted.org/packages/6b/3d/45132c57d5fb4b5744567c3817026480ac7fc3ce5d4c47902bc0e7f6f853/pillow-12.2.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:56a3f9c60a13133a98ecff6197af34d7824de9b7b38c3654861a725c970c197b", size = 6503105, upload-time = "2026-04-01T14:42:59.847Z" }, - { url = "https://files.pythonhosted.org/packages/7d/2e/9df2fc1e82097b1df3dce58dc43286aa01068e918c07574711fcc53e6fb4/pillow-12.2.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:90e6f81de50ad6b534cab6e5aef77ff6e37722b2f5d908686f4a5c9eba17a909", size = 7203402, upload-time = "2026-04-01T14:43:02.664Z" }, - { url = "https://files.pythonhosted.org/packages/bd/2e/2941e42858ebb67e50ae741473de81c2984e6eff7b397017623c676e2e8d/pillow-12.2.0-cp311-cp311-win32.whl", hash = "sha256:8c984051042858021a54926eb597d6ee3012393ce9c181814115df4c60b9a808", size = 6378149, upload-time = "2026-04-01T14:43:05.274Z" }, - { url = "https://files.pythonhosted.org/packages/69/42/836b6f3cd7f3e5fa10a1f1a5420447c17966044c8fbf589cc0452d5502db/pillow-12.2.0-cp311-cp311-win_amd64.whl", hash = "sha256:6e6b2a0c538fc200b38ff9eb6628228b77908c319a005815f2dde585a0664b60", size = 7082626, upload-time = "2026-04-01T14:43:08.557Z" }, - { url = "https://files.pythonhosted.org/packages/c2/88/549194b5d6f1f494b485e493edc6693c0a16f4ada488e5bd974ed1f42fad/pillow-12.2.0-cp311-cp311-win_arm64.whl", hash = "sha256:9a8a34cc89c67a65ea7437ce257cea81a9dad65b29805f3ecee8c8fe8ff25ffe", size = 2463531, upload-time = "2026-04-01T14:43:10.743Z" }, - { url = "https://files.pythonhosted.org/packages/58/be/7482c8a5ebebbc6470b3eb791812fff7d5e0216c2be3827b30b8bb6603ed/pillow-12.2.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:2d192a155bbcec180f8564f693e6fd9bccff5a7af9b32e2e4bf8c9c69dbad6b5", size = 5308279, upload-time = "2026-04-01T14:43:13.246Z" }, - { url = "https://files.pythonhosted.org/packages/d8/95/0a351b9289c2b5cbde0bacd4a83ebc44023e835490a727b2a3bd60ddc0f4/pillow-12.2.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:f3f40b3c5a968281fd507d519e444c35f0ff171237f4fdde090dd60699458421", size = 4695490, upload-time = "2026-04-01T14:43:15.584Z" }, - { url = "https://files.pythonhosted.org/packages/de/af/4e8e6869cbed569d43c416fad3dc4ecb944cb5d9492defaed89ddd6fe871/pillow-12.2.0-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:03e7e372d5240cc23e9f07deca4d775c0817bffc641b01e9c3af208dbd300987", size = 6284462, upload-time = "2026-04-01T14:43:18.268Z" }, - { url = "https://files.pythonhosted.org/packages/e9/9e/c05e19657fd57841e476be1ab46c4d501bffbadbafdc31a6d665f8b737b6/pillow-12.2.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:b86024e52a1b269467a802258c25521e6d742349d760728092e1bc2d135b4d76", size = 8094744, upload-time = "2026-04-01T14:43:20.716Z" }, - { url = "https://files.pythonhosted.org/packages/2b/54/1789c455ed10176066b6e7e6da1b01e50e36f94ba584dc68d9eebfe9156d/pillow-12.2.0-cp312-cp312-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:7371b48c4fa448d20d2714c9a1f775a81155050d383333e0a6c15b1123dda005", size = 6398371, upload-time = "2026-04-01T14:43:23.443Z" }, - { url = "https://files.pythonhosted.org/packages/43/e3/fdc657359e919462369869f1c9f0e973f353f9a9ee295a39b1fea8ee1a77/pillow-12.2.0-cp312-cp312-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:62f5409336adb0663b7caa0da5c7d9e7bdbaae9ce761d34669420c2a801b2780", size = 7087215, upload-time = "2026-04-01T14:43:26.758Z" }, - { url = "https://files.pythonhosted.org/packages/8b/f8/2f6825e441d5b1959d2ca5adec984210f1ec086435b0ed5f52c19b3b8a6e/pillow-12.2.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:01afa7cf67f74f09523699b4e88c73fb55c13346d212a59a2db1f86b0a63e8c5", size = 6509783, upload-time = "2026-04-01T14:43:29.56Z" }, - { url = "https://files.pythonhosted.org/packages/67/f9/029a27095ad20f854f9dba026b3ea6428548316e057e6fc3545409e86651/pillow-12.2.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:fc3d34d4a8fbec3e88a79b92e5465e0f9b842b628675850d860b8bd300b159f5", size = 7212112, upload-time = "2026-04-01T14:43:32.091Z" }, - { url = "https://files.pythonhosted.org/packages/be/42/025cfe05d1be22dbfdb4f264fe9de1ccda83f66e4fc3aac94748e784af04/pillow-12.2.0-cp312-cp312-win32.whl", hash = "sha256:58f62cc0f00fd29e64b29f4fd923ffdb3859c9f9e6105bfc37ba1d08994e8940", size = 6378489, upload-time = "2026-04-01T14:43:34.601Z" }, - { url = "https://files.pythonhosted.org/packages/5d/7b/25a221d2c761c6a8ae21bfa3874988ff2583e19cf8a27bf2fee358df7942/pillow-12.2.0-cp312-cp312-win_amd64.whl", hash = "sha256:7f84204dee22a783350679a0333981df803dac21a0190d706a50475e361c93f5", size = 7084129, upload-time = "2026-04-01T14:43:37.213Z" }, - { url = "https://files.pythonhosted.org/packages/10/e1/542a474affab20fd4a0f1836cb234e8493519da6b76899e30bcc5d990b8b/pillow-12.2.0-cp312-cp312-win_arm64.whl", hash = "sha256:af73337013e0b3b46f175e79492d96845b16126ddf79c438d7ea7ff27783a414", size = 2463612, upload-time = "2026-04-01T14:43:39.421Z" }, - { url = "https://files.pythonhosted.org/packages/4a/01/53d10cf0dbad820a8db274d259a37ba50b88b24768ddccec07355382d5ad/pillow-12.2.0-cp313-cp313-ios_13_0_arm64_iphoneos.whl", hash = "sha256:8297651f5b5679c19968abefd6bb84d95fe30ef712eb1b2d9b2d31ca61267f4c", size = 4100837, upload-time = "2026-04-01T14:43:41.506Z" }, - { url = "https://files.pythonhosted.org/packages/0f/98/f3a6657ecb698c937f6c76ee564882945f29b79bad496abcba0e84659ec5/pillow-12.2.0-cp313-cp313-ios_13_0_arm64_iphonesimulator.whl", hash = "sha256:50d8520da2a6ce0af445fa6d648c4273c3eeefbc32d7ce049f22e8b5c3daecc2", size = 4176528, upload-time = "2026-04-01T14:43:43.773Z" }, - { url = "https://files.pythonhosted.org/packages/69/bc/8986948f05e3ea490b8442ea1c1d4d990b24a7e43d8a51b2c7d8b1dced36/pillow-12.2.0-cp313-cp313-ios_13_0_x86_64_iphonesimulator.whl", hash = "sha256:766cef22385fa1091258ad7e6216792b156dc16d8d3fa607e7545b2b72061f1c", size = 3640401, upload-time = "2026-04-01T14:43:45.87Z" }, - { url = "https://files.pythonhosted.org/packages/34/46/6c717baadcd62bc8ed51d238d521ab651eaa74838291bda1f86fe1f864c9/pillow-12.2.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:5d2fd0fa6b5d9d1de415060363433f28da8b1526c1c129020435e186794b3795", size = 5308094, upload-time = "2026-04-01T14:43:48.438Z" }, - { url = "https://files.pythonhosted.org/packages/71/43/905a14a8b17fdb1ccb58d282454490662d2cb89a6bfec26af6d3520da5ec/pillow-12.2.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:56b25336f502b6ed02e889f4ece894a72612fe885889a6e8c4c80239ff6e5f5f", size = 4695402, upload-time = "2026-04-01T14:43:51.292Z" }, - { url = "https://files.pythonhosted.org/packages/73/dd/42107efcb777b16fa0393317eac58f5b5cf30e8392e266e76e51cff28c3d/pillow-12.2.0-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:f1c943e96e85df3d3478f7b691f229887e143f81fedab9b20205349ab04d73ed", size = 6280005, upload-time = "2026-04-01T14:43:54.242Z" }, - { url = "https://files.pythonhosted.org/packages/a8/68/b93e09e5e8549019e61acf49f65b1a8530765a7f812c77a7461bca7e4494/pillow-12.2.0-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:03f6fab9219220f041c74aeaa2939ff0062bd5c364ba9ce037197f4c6d498cd9", size = 8090669, upload-time = "2026-04-01T14:43:57.335Z" }, - { url = "https://files.pythonhosted.org/packages/4b/6e/3ccb54ce8ec4ddd1accd2d89004308b7b0b21c4ac3d20fa70af4760a4330/pillow-12.2.0-cp313-cp313-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:5cdfebd752ec52bf5bb4e35d9c64b40826bc5b40a13df7c3cda20a2c03a0f5ed", size = 6395194, upload-time = "2026-04-01T14:43:59.864Z" }, - { url = "https://files.pythonhosted.org/packages/67/ee/21d4e8536afd1a328f01b359b4d3997b291ffd35a237c877b331c1c3b71c/pillow-12.2.0-cp313-cp313-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:eedf4b74eda2b5a4b2b2fb4c006d6295df3bf29e459e198c90ea48e130dc75c3", size = 7082423, upload-time = "2026-04-01T14:44:02.74Z" }, - { url = "https://files.pythonhosted.org/packages/78/5f/e9f86ab0146464e8c133fe85df987ed9e77e08b29d8d35f9f9f4d6f917ba/pillow-12.2.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:00a2865911330191c0b818c59103b58a5e697cae67042366970a6b6f1b20b7f9", size = 6505667, upload-time = "2026-04-01T14:44:05.381Z" }, - { url = "https://files.pythonhosted.org/packages/ed/1e/409007f56a2fdce61584fd3acbc2bbc259857d555196cedcadc68c015c82/pillow-12.2.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:1e1757442ed87f4912397c6d35a0db6a7b52592156014706f17658ff58bbf795", size = 7208580, upload-time = "2026-04-01T14:44:08.39Z" }, - { url = "https://files.pythonhosted.org/packages/23/c4/7349421080b12fb35414607b8871e9534546c128a11965fd4a7002ccfbee/pillow-12.2.0-cp313-cp313-win32.whl", hash = "sha256:144748b3af2d1b358d41286056d0003f47cb339b8c43a9ea42f5fea4d8c66b6e", size = 6375896, upload-time = "2026-04-01T14:44:11.197Z" }, - { url = "https://files.pythonhosted.org/packages/3f/82/8a3739a5e470b3c6cbb1d21d315800d8e16bff503d1f16b03a4ec3212786/pillow-12.2.0-cp313-cp313-win_amd64.whl", hash = "sha256:390ede346628ccc626e5730107cde16c42d3836b89662a115a921f28440e6a3b", size = 7081266, upload-time = "2026-04-01T14:44:13.947Z" }, - { url = "https://files.pythonhosted.org/packages/c3/25/f968f618a062574294592f668218f8af564830ccebdd1fa6200f598e65c5/pillow-12.2.0-cp313-cp313-win_arm64.whl", hash = "sha256:8023abc91fba39036dbce14a7d6535632f99c0b857807cbbbf21ecc9f4717f06", size = 2463508, upload-time = "2026-04-01T14:44:16.312Z" }, - { url = "https://files.pythonhosted.org/packages/4d/a4/b342930964e3cb4dce5038ae34b0eab4653334995336cd486c5a8c25a00c/pillow-12.2.0-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:042db20a421b9bafecc4b84a8b6e444686bd9d836c7fd24542db3e7df7baad9b", size = 5309927, upload-time = "2026-04-01T14:44:18.89Z" }, - { url = "https://files.pythonhosted.org/packages/9f/de/23198e0a65a9cf06123f5435a5d95cea62a635697f8f03d134d3f3a96151/pillow-12.2.0-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:dd025009355c926a84a612fecf58bb315a3f6814b17ead51a8e48d3823d9087f", size = 4698624, upload-time = "2026-04-01T14:44:21.115Z" }, - { url = "https://files.pythonhosted.org/packages/01/a6/1265e977f17d93ea37aa28aa81bad4fa597933879fac2520d24e021c8da3/pillow-12.2.0-cp313-cp313t-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:88ddbc66737e277852913bd1e07c150cc7bb124539f94c4e2df5344494e0a612", size = 6321252, upload-time = "2026-04-01T14:44:23.663Z" }, - { url = "https://files.pythonhosted.org/packages/3c/83/5982eb4a285967baa70340320be9f88e57665a387e3a53a7f0db8231a0cd/pillow-12.2.0-cp313-cp313t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:d362d1878f00c142b7e1a16e6e5e780f02be8195123f164edf7eddd911eefe7c", size = 8126550, upload-time = "2026-04-01T14:44:26.772Z" }, - { url = "https://files.pythonhosted.org/packages/4e/48/6ffc514adce69f6050d0753b1a18fd920fce8cac87620d5a31231b04bfc5/pillow-12.2.0-cp313-cp313t-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:2c727a6d53cb0018aadd8018c2b938376af27914a68a492f59dfcaca650d5eea", size = 6433114, upload-time = "2026-04-01T14:44:29.615Z" }, - { url = "https://files.pythonhosted.org/packages/36/a3/f9a77144231fb8d40ee27107b4463e205fa4677e2ca2548e14da5cf18dce/pillow-12.2.0-cp313-cp313t-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:efd8c21c98c5cc60653bcb311bef2ce0401642b7ce9d09e03a7da87c878289d4", size = 7115667, upload-time = "2026-04-01T14:44:32.773Z" }, - { url = "https://files.pythonhosted.org/packages/c1/fc/ac4ee3041e7d5a565e1c4fd72a113f03b6394cc72ab7089d27608f8aaccb/pillow-12.2.0-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:9f08483a632889536b8139663db60f6724bfcb443c96f1b18855860d7d5c0fd4", size = 6538966, upload-time = "2026-04-01T14:44:35.252Z" }, - { url = "https://files.pythonhosted.org/packages/c0/a8/27fb307055087f3668f6d0a8ccb636e7431d56ed0750e07a60547b1e083e/pillow-12.2.0-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:dac8d77255a37e81a2efcbd1fc05f1c15ee82200e6c240d7e127e25e365c39ea", size = 7238241, upload-time = "2026-04-01T14:44:37.875Z" }, - { url = "https://files.pythonhosted.org/packages/ad/4b/926ab182c07fccae9fcb120043464e1ff1564775ec8864f21a0ebce6ac25/pillow-12.2.0-cp313-cp313t-win32.whl", hash = "sha256:ee3120ae9dff32f121610bb08e4313be87e03efeadfc6c0d18f89127e24d0c24", size = 6379592, upload-time = "2026-04-01T14:44:40.336Z" }, - { url = "https://files.pythonhosted.org/packages/c2/c4/f9e476451a098181b30050cc4c9a3556b64c02cf6497ea421ac047e89e4b/pillow-12.2.0-cp313-cp313t-win_amd64.whl", hash = "sha256:325ca0528c6788d2a6c3d40e3568639398137346c3d6e66bb61db96b96511c98", size = 7085542, upload-time = "2026-04-01T14:44:43.251Z" }, - { url = "https://files.pythonhosted.org/packages/00/a4/285f12aeacbe2d6dc36c407dfbbe9e96d4a80b0fb710a337f6d2ad978c75/pillow-12.2.0-cp313-cp313t-win_arm64.whl", hash = "sha256:2e5a76d03a6c6dcef67edabda7a52494afa4035021a79c8558e14af25313d453", size = 2465765, upload-time = "2026-04-01T14:44:45.996Z" }, { url = "https://files.pythonhosted.org/packages/bf/98/4595daa2365416a86cb0d495248a393dfc84e96d62ad080c8546256cb9c0/pillow-12.2.0-cp314-cp314-ios_13_0_arm64_iphoneos.whl", hash = "sha256:3adc9215e8be0448ed6e814966ecf3d9952f0ea40eb14e89a102b87f450660d8", size = 4100848, upload-time = "2026-04-01T14:44:48.48Z" }, { url = "https://files.pythonhosted.org/packages/0b/79/40184d464cf89f6663e18dfcf7ca21aae2491fff1a16127681bf1fa9b8cf/pillow-12.2.0-cp314-cp314-ios_13_0_arm64_iphonesimulator.whl", hash = "sha256:6a9adfc6d24b10f89588096364cc726174118c62130c817c2837c60cf08a392b", size = 4176515, upload-time = "2026-04-01T14:44:51.353Z" }, { url = "https://files.pythonhosted.org/packages/b0/63/703f86fd4c422a9cf722833670f4f71418fb116b2853ff7da722ea43f184/pillow-12.2.0-cp314-cp314-ios_13_0_x86_64_iphonesimulator.whl", hash = "sha256:6a6e67ea2e6feda684ed370f9a1c52e7a243631c025ba42149a2cc5934dec295", size = 3640159, upload-time = "2026-04-01T14:44:53.588Z" }, @@ -3105,13 +2229,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/c9/e4/4b64a97d71b2a83158134abbb2f5bd3f8a2ea691361282f010998f339ec7/pillow-12.2.0-cp314-cp314t-win32.whl", hash = "sha256:6bb77b2dcb06b20f9f4b4a8454caa581cd4dd0643a08bacf821216a16d9c8354", size = 6482084, upload-time = "2026-04-01T14:45:47.568Z" }, { url = "https://files.pythonhosted.org/packages/ba/13/306d275efd3a3453f72114b7431c877d10b1154014c1ebbedd067770d629/pillow-12.2.0-cp314-cp314t-win_amd64.whl", hash = "sha256:6562ace0d3fb5f20ed7290f1f929cae41b25ae29528f2af1722966a0a02e2aa1", size = 7225152, upload-time = "2026-04-01T14:45:50.032Z" }, { url = "https://files.pythonhosted.org/packages/ff/6e/cf826fae916b8658848d7b9f38d88da6396895c676e8086fc0988073aaf8/pillow-12.2.0-cp314-cp314t-win_arm64.whl", hash = "sha256:aa88ccfe4e32d362816319ed727a004423aab09c5cea43c01a4b435643fa34eb", size = 2556579, upload-time = "2026-04-01T14:45:52.529Z" }, - { url = "https://files.pythonhosted.org/packages/4e/b7/2437044fb910f499610356d1352e3423753c98e34f915252aafecc64889f/pillow-12.2.0-pp311-pypy311_pp73-macosx_10_15_x86_64.whl", hash = "sha256:0538bd5e05efec03ae613fd89c4ce0368ecd2ba239cc25b9f9be7ed426b0af1f", size = 5273969, upload-time = "2026-04-01T14:45:55.538Z" }, - { url = "https://files.pythonhosted.org/packages/f6/f4/8316e31de11b780f4ac08ef3654a75555e624a98db1056ecb2122d008d5a/pillow-12.2.0-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:394167b21da716608eac917c60aa9b969421b5dcbbe02ae7f013e7b85811c69d", size = 4659674, upload-time = "2026-04-01T14:45:58.093Z" }, - { url = "https://files.pythonhosted.org/packages/d4/37/664fca7201f8bb2aa1d20e2c3d5564a62e6ae5111741966c8319ca802361/pillow-12.2.0-pp311-pypy311_pp73-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:5d04bfa02cc2d23b497d1e90a0f927070043f6cbf303e738300532379a4b4e0f", size = 5288479, upload-time = "2026-04-01T14:46:01.141Z" }, - { url = "https://files.pythonhosted.org/packages/49/62/5b0ed78fce87346be7a5cfcfaaad91f6a1f98c26f86bdbafa2066c647ef6/pillow-12.2.0-pp311-pypy311_pp73-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:0c838a5125cee37e68edec915651521191cef1e6aa336b855f495766e77a366e", size = 7032230, upload-time = "2026-04-01T14:46:03.874Z" }, - { url = "https://files.pythonhosted.org/packages/c3/28/ec0fc38107fc32536908034e990c47914c57cd7c5a3ece4d8d8f7ffd7e27/pillow-12.2.0-pp311-pypy311_pp73-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:4a6c9fa44005fa37a91ebfc95d081e8079757d2e904b27103f4f5fa6f0bf78c0", size = 5355404, upload-time = "2026-04-01T14:46:06.33Z" }, - { url = "https://files.pythonhosted.org/packages/5e/8b/51b0eddcfa2180d60e41f06bd6d0a62202b20b59c68f5a132e615b75aecf/pillow-12.2.0-pp311-pypy311_pp73-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:25373b66e0dd5905ed63fa3cae13c82fbddf3079f2c8bf15c6fb6a35586324c1", size = 6002215, upload-time = "2026-04-01T14:46:08.83Z" }, - { url = "https://files.pythonhosted.org/packages/bc/60/5382c03e1970de634027cee8e1b7d39776b778b81812aaf45b694dfe9e28/pillow-12.2.0-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:bfa9c230d2fe991bed5318a5f119bd6780cda2915cca595393649fc118ab895e", size = 7080946, upload-time = "2026-04-01T14:46:11.734Z" }, ] [[package]] @@ -3202,12 +2319,6 @@ version = "7.2.2" source = { registry = "https://pypi.org/simple" } sdist = { url = "https://files.pythonhosted.org/packages/aa/c6/d1ddf4abb55e93cebc4f2ed8b5d6dbad109ecb8d63748dd2b20ab5e57ebe/psutil-7.2.2.tar.gz", hash = "sha256:0746f5f8d406af344fd547f1c8daa5f5c33dbc293bb8d6a16d80b4bb88f59372", size = 493740, upload-time = "2026-01-28T18:14:54.428Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/51/08/510cbdb69c25a96f4ae523f733cdc963ae654904e8db864c07585ef99875/psutil-7.2.2-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:2edccc433cbfa046b980b0df0171cd25bcaeb3a68fe9022db0979e7aa74a826b", size = 130595, upload-time = "2026-01-28T18:14:57.293Z" }, - { url = "https://files.pythonhosted.org/packages/d6/f5/97baea3fe7a5a9af7436301f85490905379b1c6f2dd51fe3ecf24b4c5fbf/psutil-7.2.2-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:e78c8603dcd9a04c7364f1a3e670cea95d51ee865e4efb3556a3a63adef958ea", size = 131082, upload-time = "2026-01-28T18:14:59.732Z" }, - { url = "https://files.pythonhosted.org/packages/37/d6/246513fbf9fa174af531f28412297dd05241d97a75911ac8febefa1a53c6/psutil-7.2.2-cp313-cp313t-manylinux2010_x86_64.manylinux_2_12_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:1a571f2330c966c62aeda00dd24620425d4b0cc86881c89861fbc04549e5dc63", size = 181476, upload-time = "2026-01-28T18:15:01.884Z" }, - { url = "https://files.pythonhosted.org/packages/b8/b5/9182c9af3836cca61696dabe4fd1304e17bc56cb62f17439e1154f225dd3/psutil-7.2.2-cp313-cp313t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:917e891983ca3c1887b4ef36447b1e0873e70c933afc831c6b6da078ba474312", size = 184062, upload-time = "2026-01-28T18:15:04.436Z" }, - { url = "https://files.pythonhosted.org/packages/16/ba/0756dca669f5a9300d0cbcbfae9a4c30e446dfc7440ffe43ded5724bfd93/psutil-7.2.2-cp313-cp313t-win_amd64.whl", hash = "sha256:ab486563df44c17f5173621c7b198955bd6b613fb87c71c161f827d3fb149a9b", size = 139893, upload-time = "2026-01-28T18:15:06.378Z" }, - { url = "https://files.pythonhosted.org/packages/1c/61/8fa0e26f33623b49949346de05ec1ddaad02ed8ba64af45f40a147dbfa97/psutil-7.2.2-cp313-cp313t-win_arm64.whl", hash = "sha256:ae0aefdd8796a7737eccea863f80f81e468a1e4cf14d926bd9b6f5f2d5f90ca9", size = 135589, upload-time = "2026-01-28T18:15:08.03Z" }, { url = "https://files.pythonhosted.org/packages/81/69/ef179ab5ca24f32acc1dac0c247fd6a13b501fd5534dbae0e05a1c48b66d/psutil-7.2.2-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:eed63d3b4d62449571547b60578c5b2c4bcccc5387148db46e0c2313dad0ee00", size = 130664, upload-time = "2026-01-28T18:15:09.469Z" }, { url = "https://files.pythonhosted.org/packages/7b/64/665248b557a236d3fa9efc378d60d95ef56dd0a490c2cd37dafc7660d4a9/psutil-7.2.2-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:7b6d09433a10592ce39b13d7be5a54fbac1d1228ed29abc880fb23df7cb694c9", size = 131087, upload-time = "2026-01-28T18:15:11.724Z" }, { url = "https://files.pythonhosted.org/packages/d5/2e/e6782744700d6759ebce3043dcfa661fb61e2fb752b91cdeae9af12c2178/psutil-7.2.2-cp314-cp314t-manylinux2010_x86_64.manylinux_2_12_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:1fa4ecf83bcdf6e6c8f4449aff98eefb5d0604bf88cb883d7da3d8d2d909546a", size = 182383, upload-time = "2026-01-28T18:15:13.445Z" }, @@ -3230,39 +2341,6 @@ version = "2.9.12" source = { registry = "https://pypi.org/simple" } sdist = { url = "https://files.pythonhosted.org/packages/2a/60/a3624f79acea344c16fbef3a94d28b89a8042ddfb8f3e4ca83f538671409/psycopg2_binary-2.9.12.tar.gz", hash = "sha256:5ac9444edc768c02a6b6a591f070b8aae28ff3a99be57560ac996001580f294c", size = 379686, upload-time = "2026-04-21T09:40:34.304Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/d5/19/d4ce60954f3bb9d8e3bc5e5c4d1f2487de2d3851bf2391d54954c9df12a6/psycopg2_binary-2.9.12-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:5c8ce6c61bd1b1f6b9c24ee32211599f6166af2c55abb19456090a21fd16554b", size = 3712338, upload-time = "2026-04-20T23:34:03.961Z" }, - { url = "https://files.pythonhosted.org/packages/53/71/c85409ee0d78890f0660eff262e815e7dd2bb741a17611d82e9e8cd9dc5e/psycopg2_binary-2.9.12-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:b4a9eaa6e7f4ff91bec10aa3fb296878e75187bced5cc4bafe17dc40915e1326", size = 3822407, upload-time = "2026-04-20T23:34:05.977Z" }, - { url = "https://files.pythonhosted.org/packages/3c/ed/60486c2c7f0d4d1ede2bfb1ed27e2498477ce646bc7f6b2759906303117e/psycopg2_binary-2.9.12-cp311-cp311-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:c6528cefc8e50fcc6f4a107e27a672058b36cc5736d665476aeb413ba88dbb06", size = 4578425, upload-time = "2026-04-20T23:34:08.246Z" }, - { url = "https://files.pythonhosted.org/packages/0b/b9/656cb03fad9f4f49f2145c334b1126ee75189929ca4e6187d485a2d59951/psycopg2_binary-2.9.12-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:e4e184b1fb6072bf05388aa41c697e1b2d01b3473f107e7ec44f186a32cfd0b8", size = 4273709, upload-time = "2026-04-20T23:34:10.974Z" }, - { url = "https://files.pythonhosted.org/packages/99/66/08cf0da0e25cc6fb142c89be45fc8418792858f0c4cbff5e24530ff02cd6/psycopg2_binary-2.9.12-cp311-cp311-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:4766ab678563054d3f1d064a4db19cc4b5f9e3a8d9018592a8285cf200c248f3", size = 5893779, upload-time = "2026-04-20T23:34:13.905Z" }, - { url = "https://files.pythonhosted.org/packages/17/d7/eecd9ce8e146d3721115d82d3836efdbb712187e4590325df549989d18f4/psycopg2_binary-2.9.12-cp311-cp311-manylinux_2_38_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:5a0253224780c978746cb9be55a946bcdaf40fe3519c0f622924cdabdafe2c39", size = 4109308, upload-time = "2026-04-20T23:34:16.761Z" }, - { url = "https://files.pythonhosted.org/packages/b6/2e/b1dc289b362cc8d45697b57eefbd673186f49a4ea0906928988e3affcc98/psycopg2_binary-2.9.12-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:0dc9228d47c46bda253d2ecd6bb93b56a9f2d7ad33b684a1fa3622bf74ffe30c", size = 3654405, upload-time = "2026-04-20T23:34:19.303Z" }, - { url = "https://files.pythonhosted.org/packages/eb/e4/4c4aea6473214dbdbd0fbba11aa4691e76dc01722c55724c5951719865ff/psycopg2_binary-2.9.12-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:f921f3cd87035ef7df233383011d7a53ea1d346224752c1385f1edfd790ceb6a", size = 3299187, upload-time = "2026-04-20T23:34:21.206Z" }, - { url = "https://files.pythonhosted.org/packages/ba/5d/b03b99986446a4f57b170ed9a2579fb7ff9783ca0fa5226b19db99737fee/psycopg2_binary-2.9.12-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:3d999bd982a723113c1a45b55a7a6a90d64d0ed2278020ed625c490ff7bef96c", size = 3047716, upload-time = "2026-04-20T23:34:23.077Z" }, - { url = "https://files.pythonhosted.org/packages/14/86/382ee4afbd1d97500c9d2862b20c2fdeddf4b7335e984df3fb4309f64108/psycopg2_binary-2.9.12-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:29d4d134bd0ab46ffb04e94aa3c5fa3ef582e9026609165e2f758ff76fc3a3be", size = 3349237, upload-time = "2026-04-20T23:34:25.211Z" }, - { url = "https://files.pythonhosted.org/packages/a8/16/9a57c75ba1eda7165c017342f526810d5f5a12647dde749c99ae9a7141d7/psycopg2_binary-2.9.12-cp311-cp311-win_amd64.whl", hash = "sha256:cb4a1dacdd48077150dc762a9e5ddbf32c256d66cb46f80839391aa458774936", size = 2757036, upload-time = "2026-04-20T23:34:27.77Z" }, - { url = "https://files.pythonhosted.org/packages/e2/9f/ef4ef3c8e15083df90ca35265cfd1a081a2f0cc07bb229c6314c6af817f4/psycopg2_binary-2.9.12-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:5cdc05117180c5fa9c40eea8ea559ce64d73824c39d928b7da9fb5f6a9392433", size = 3712459, upload-time = "2026-04-20T23:34:30.549Z" }, - { url = "https://files.pythonhosted.org/packages/b5/01/3dd14e46ba48c1e1a6ec58ee599fa1b5efa00c246d5046cd903d0eeb1af1/psycopg2_binary-2.9.12-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:d3227a3bc228c10d21011a99245edca923e4e8bf461857e869a507d9a41fe9f6", size = 3822936, upload-time = "2026-04-20T23:34:32.77Z" }, - { url = "https://files.pythonhosted.org/packages/a6/f7/0640e4901119d8a9f7a1784b927f494e2198e213ceb593753d1f2c8b1b30/psycopg2_binary-2.9.12-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:995ce929eede89db6254b50827e2b7fd61e50d11f0b116b29fffe4a2e53c4580", size = 4578676, upload-time = "2026-04-20T23:34:35.18Z" }, - { url = "https://files.pythonhosted.org/packages/b0/55/44df3965b5f297c50cc0b1b594a31c67d6127a9d133045b8a66611b14dfb/psycopg2_binary-2.9.12-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:9fe06d93e72f1c048e731a2e3e7854a5bfaa58fc736068df90b352cefe66f03f", size = 4274917, upload-time = "2026-04-20T23:34:37.982Z" }, - { url = "https://files.pythonhosted.org/packages/b0/4b/74535248b1eac0c9336862e8617c765ac94dac76f9e25d7c4a79588c8907/psycopg2_binary-2.9.12-cp312-cp312-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:40e7b28b63aaf737cb3a1edc3a9bbc9a9f4ad3dcb7152e8c1130e4050eddcb7d", size = 5894843, upload-time = "2026-04-20T23:34:40.856Z" }, - { url = "https://files.pythonhosted.org/packages/f2/ba/f1bf8d2ae71868ad800b661099086ee52bc0f8d9f05be1acd8ebb06757cc/psycopg2_binary-2.9.12-cp312-cp312-manylinux_2_38_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:89d19a9f7899e8eb0656a2b3a08e0da04c720a06db6e0033eab5928aabe60fa9", size = 4110556, upload-time = "2026-04-20T23:34:44.016Z" }, - { url = "https://files.pythonhosted.org/packages/45/46/c15706c338403b7c420bcc0c2905aad116cc064545686d8bf85f1999ea00/psycopg2_binary-2.9.12-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:612b965daee295ae2da8f8218ce1d274645dc76ef3f1abf6a0a94fd57eff876d", size = 3655714, upload-time = "2026-04-20T23:34:46.233Z" }, - { url = "https://files.pythonhosted.org/packages/b3/7c/a2d5dc09b64a4564db242a0fe418fde7d33f6f8259dd2c5b9d7def00fb5a/psycopg2_binary-2.9.12-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:b9a339b79d37c1b45f3235265f07cdeb0cb5ad7acd2ac7720a5920989c17c24e", size = 3301154, upload-time = "2026-04-20T23:34:49.528Z" }, - { url = "https://files.pythonhosted.org/packages/c0/e8/cc8c9a4ce71461f9ec548d38cadc41dc184b34c73e6455450775a9334ccd/psycopg2_binary-2.9.12-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:3471336e1acfd9c7fe507b8bad5af9317b6a89294f9eb37bd9a030bb7bebcdc6", size = 3048882, upload-time = "2026-04-20T23:34:51.86Z" }, - { url = "https://files.pythonhosted.org/packages/19/6a/31e2296bc0787c5ab75d3d118e40b239db8151b5192b90b77c72bc9256e9/psycopg2_binary-2.9.12-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:7af18183109e23502c8b2ae7f6926c0882766f35b5175a4cd737ad825e4d7a1b", size = 3351298, upload-time = "2026-04-20T23:34:54.124Z" }, - { url = "https://files.pythonhosted.org/packages/5f/a8/75f4e3e11203b590150abed2cf7794b9c9c9f7eceddae955191138b44dde/psycopg2_binary-2.9.12-cp312-cp312-win_amd64.whl", hash = "sha256:398fcd4db988c7d7d3713e2b8e18939776fd3fb447052daae4f24fa39daede4c", size = 2757230, upload-time = "2026-04-20T23:34:56.242Z" }, - { url = "https://files.pythonhosted.org/packages/91/bb/4608c96f970f6e0c56572e87027ef4404f709382a3503e9934526d7ba051/psycopg2_binary-2.9.12-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:7c729a73c7b1b84de3582f73cdd27d905121dc2c531f3d9a3c32a3011033b965", size = 3712419, upload-time = "2026-04-20T23:34:58.754Z" }, - { url = "https://files.pythonhosted.org/packages/5e/af/48f76af9d50d61cf390f8cd657b503168b089e2e9298e48465d029fcc713/psycopg2_binary-2.9.12-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:4413d0caef93c5cf50b96863df4c2efe8c269bf2267df353225595e7e15e8df7", size = 3822990, upload-time = "2026-04-20T23:35:00.821Z" }, - { url = "https://files.pythonhosted.org/packages/7a/df/aba0f99397cd811d32e06fc0cc781f1f3ce98bc0e729cb423925085d781a/psycopg2_binary-2.9.12-cp313-cp313-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:4dfcf8e45ebb0c663be34a3442f65e17311f3367089cd4e5e3a3e8e62c978777", size = 4578696, upload-time = "2026-04-20T23:35:03.409Z" }, - { url = "https://files.pythonhosted.org/packages/95/9c/eaa74021ac4e4d5c2f83d82fc6615a63f4fe6c94dc4e94c3990427053f67/psycopg2_binary-2.9.12-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:c41321a14dd74aceb6a9a643b9253a334521babfa763fa873e33d89cfa122fb5", size = 4274982, upload-time = "2026-04-20T23:35:05.583Z" }, - { url = "https://files.pythonhosted.org/packages/35/ed/c25deff98bd26187ba48b3b250a3ffc3037c46c5b89362534a15d200e0db/psycopg2_binary-2.9.12-cp313-cp313-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:83946ba43979ebfdc99a3cd0ee775c89f221df026984ba19d46133d8d75d3cd9", size = 5894867, upload-time = "2026-04-20T23:35:07.902Z" }, - { url = "https://files.pythonhosted.org/packages/9a/81/8d0e21ca77373c6c9589e5c4528f6e8f0c08c62cafc76fb0bddb7a2cee22/psycopg2_binary-2.9.12-cp313-cp313-manylinux_2_38_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:411e85815652d13560fbe731878daa5d92378c4995a22302071890ec3397d019", size = 4110578, upload-time = "2026-04-20T23:35:10.149Z" }, - { url = "https://files.pythonhosted.org/packages/00/fc/f481e2435bd8f742d0123309174aae4165160ad3ef17c1b99c3622c241d2/psycopg2_binary-2.9.12-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:1c8ad4c08e00f7679559eaed7aff1edfffc60c086b976f93972f686384a95e2c", size = 3655816, upload-time = "2026-04-20T23:35:12.56Z" }, - { url = "https://files.pythonhosted.org/packages/53/79/b9f46466bdbe9f239c96cde8be33c1aace4842f06013b47b730dc9759187/psycopg2_binary-2.9.12-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:00814e40fa23c2b37ef0a1e3c749d89982c73a9cb5046137f0752a22d432e82f", size = 3301307, upload-time = "2026-04-20T23:35:15.029Z" }, - { url = "https://files.pythonhosted.org/packages/3f/19/7dc003b32fe35024df89b658104f7c8538a8b2dcbde7a4e746ce929742e7/psycopg2_binary-2.9.12-cp313-cp313-musllinux_1_2_riscv64.whl", hash = "sha256:98062447aebc20ed20add1f547a364fd0ef8933640d5372ff1873f8deb9b61be", size = 3048968, upload-time = "2026-04-20T23:35:16.757Z" }, - { url = "https://files.pythonhosted.org/packages/91/58/2dbd7db5c604d45f4950d988506aae672a14126ec22998ced5021cbb76bb/psycopg2_binary-2.9.12-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:66a7685d7e548f10fb4ce32fb01a7b7f4aa702134de92a292c7bd9e0d3dbd290", size = 3351369, upload-time = "2026-04-20T23:35:18.933Z" }, - { url = "https://files.pythonhosted.org/packages/42/ee/dee8dcaad07f735824de3d6563bc67119fa6c28257b17977a8d624f02fab/psycopg2_binary-2.9.12-cp313-cp313-win_amd64.whl", hash = "sha256:b6937f5fe4e180aeee87de907a2fa982ded6f7f15d7218f78a083e4e1d68f2a0", size = 2757347, upload-time = "2026-04-20T23:35:21.283Z" }, { url = "https://files.pythonhosted.org/packages/13/1b/708c0dca874acfad6d65314271859899a79007686f3a1f74e82a2ed4b645/psycopg2_binary-2.9.12-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:6f3b3de8a74ef8db215f22edffb19e32dc6fa41340456de7ec99efdc8a7b3ec2", size = 3712428, upload-time = "2026-04-20T23:35:23.453Z" }, { url = "https://files.pythonhosted.org/packages/d6/39/ddbea9d4b4de6aca9431b6ed253f530f8a02d3b8f9bcfd0dbfe2b3de6fe4/psycopg2_binary-2.9.12-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:1006fb62f0f0bc5ce256a832356c6262e91be43f5e4eb15b5eaf38079464caf2", size = 3823184, upload-time = "2026-04-20T23:35:25.92Z" }, { url = "https://files.pythonhosted.org/packages/bf/a0/bc2fef74b106fa345567122a0659e6d94512ed7dc0131ec44c9e5aba3725/psycopg2_binary-2.9.12-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:840066105706cd2eb29b9a1c2329620056582a4bf3e8169dec5c447042d0869f", size = 4579157, upload-time = "2026-04-20T23:35:28.542Z" }, @@ -3294,15 +2372,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/8e/37/efad0257dc6e593a18957422533ff0f87ede7c9c6ea010a2177d738fb82f/pure_eval-0.2.3-py3-none-any.whl", hash = "sha256:1db8e35b67b3d218d818ae653e27f06c3aa420901fa7b081ca98cbedc874e0d0", size = 11842, upload-time = "2024-07-21T12:58:20.04Z" }, ] -[[package]] -name = "pycodestyle" -version = "2.14.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/11/e0/abfd2a0d2efe47670df87f3e3a0e2edda42f055053c85361f19c0e2c1ca8/pycodestyle-2.14.0.tar.gz", hash = "sha256:c4b5b517d278089ff9d0abdec919cd97262a3367449ea1c8b49b91529167b783", size = 39472, upload-time = "2025-06-20T18:49:48.75Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/d7/27/a58ddaf8c588a3ef080db9d0b7e0b97215cee3a45df74f3a94dbbf5c893a/pycodestyle-2.14.0-py2.py3-none-any.whl", hash = "sha256:dd6bf7cb4ee77f8e016f9c8e74a35ddd9f67e1d5fd4184d86c3b98e07099f42d", size = 31594, upload-time = "2025-06-20T18:49:47.491Z" }, -] - [[package]] name = "pycparser" version = "3.0" @@ -3336,51 +2405,6 @@ dependencies = [ ] sdist = { url = "https://files.pythonhosted.org/packages/9d/56/921726b776ace8d8f5db44c4ef961006580d91dc52b803c489fafd1aa249/pydantic_core-2.46.4.tar.gz", hash = "sha256:62f875393d7f270851f20523dd2e29f082bcc82292d66db2b64ea71f64b6e1c1", size = 471464, upload-time = "2026-05-06T13:37:06.98Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/5c/fa/6d7708d2cfc1a832acb6aeb0cd16e801902df8a0f583bb3b4b527fde022e/pydantic_core-2.46.4-cp311-cp311-macosx_10_12_x86_64.whl", hash = "sha256:0e96592440881c74a213e5ad528e2b24d3d4f940de2766bed9010ab1d9e51594", size = 2111872, upload-time = "2026-05-06T13:40:27.596Z" }, - { url = "https://files.pythonhosted.org/packages/ae/6f/aa064a3e74b5745afbdf250594f38e7ead05e2d651bcb35994b9417a0d4d/pydantic_core-2.46.4-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:e0d65b8c354be7fb5f720c3caa8bc940bc2d20ce749c8e06135f07f8ed95dd7c", size = 1948255, upload-time = "2026-05-06T13:39:12.574Z" }, - { url = "https://files.pythonhosted.org/packages/43/3a/41114a9f7569b84b4d84e7a018c57c56347dac30c0d4a872946ec4e36c46/pydantic_core-2.46.4-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7bfb192b3f4b9e8a89b6277b6ce787564f62cfd272055f6e685726b111dc7826", size = 1972827, upload-time = "2026-05-06T13:38:19.841Z" }, - { url = "https://files.pythonhosted.org/packages/ef/25/1ab42e8048fe551934d9884e8d64daa7e990ad386f310a15981aeb6a5b08/pydantic_core-2.46.4-cp311-cp311-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:9037063db01f09b09e237c282b6792bd4da634b5402c4e7f0c61effed7701a04", size = 2041051, upload-time = "2026-05-06T13:38:10.447Z" }, - { url = "https://files.pythonhosted.org/packages/94/c2/1a934597ddf08da410385b3b7aae91956a5a76c635effef456074fad7e88/pydantic_core-2.46.4-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:fc010ab034c8c7452522748bf937df58020d256ccae0874463d1f4d01758af8e", size = 2221314, upload-time = "2026-05-06T13:40:13.089Z" }, - { url = "https://files.pythonhosted.org/packages/02/6d/9e8ad178c9c4df27ad3c8f25d1fe2a7ab0d2ba0559fad4aee5d3d1f16771/pydantic_core-2.46.4-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:8c5dac79fa1614d1e06ca695109c6105923bd9c7d1d6c918d4e637b7e6b32fd3", size = 2285146, upload-time = "2026-05-06T13:38:59.224Z" }, - { url = "https://files.pythonhosted.org/packages/80/50/540cd3aeefc041beb111125c4bff779831a2111fc6b15a9138cda277d32c/pydantic_core-2.46.4-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f9fa868638bf362d3d138ea55829cefb3d5f4b0d7f142234382a15e2485dbec4", size = 2089685, upload-time = "2026-05-06T13:38:17.762Z" }, - { url = "https://files.pythonhosted.org/packages/6b/a4/b440ad35f05f6a38f89fa0f149accb3f0e02be94ca5e15f3c449a61b4bc9/pydantic_core-2.46.4-cp311-cp311-manylinux_2_31_riscv64.whl", hash = "sha256:17299feefe090f2caa5b8e37222bb5f663e4935a8bfa6931d4102e5df1a9f398", size = 2115420, upload-time = "2026-05-06T13:37:58.195Z" }, - { url = "https://files.pythonhosted.org/packages/99/61/de4f55db8dfd57bfdfa9a12ec90fe1b57c4f41062f7ca86f08586b3e0ac0/pydantic_core-2.46.4-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:4c63ebc82684aa89d9a3bcbd13d515b3be44250dc68dd3bd81526c1cb31286c3", size = 2165122, upload-time = "2026-05-06T13:37:01.167Z" }, - { url = "https://files.pythonhosted.org/packages/f7/52/7c529d7bdb2d1068bd52f51fe32572c8301f9a4febf1948f10639f1436f5/pydantic_core-2.46.4-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:aaa2a54443eff1950ba5ddc6b6ccda0d9c84a364276a62f969bdf2a390650848", size = 2182573, upload-time = "2026-05-06T13:38:45.04Z" }, - { url = "https://files.pythonhosted.org/packages/37/b3/7c40325848ba78247f2812dcf9c7274e38cd801820ca6dd9fe63bcfb0eb4/pydantic_core-2.46.4-cp311-cp311-musllinux_1_1_armv7l.whl", hash = "sha256:18e5ceec2ab67e6d5f1a9085e5a24c9c4e2ac4545730bfe668680bca05e555f3", size = 2317139, upload-time = "2026-05-06T13:37:15.539Z" }, - { url = "https://files.pythonhosted.org/packages/d9/37/f913f81a657c865b75da6c0dbed79876073c2a43b5bd9edbe8da785e4d49/pydantic_core-2.46.4-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:a0f62d0a58f4e7da165457e995725421e0064f2255d8eccebc49f41bbc23b109", size = 2360433, upload-time = "2026-05-06T13:37:30.099Z" }, - { url = "https://files.pythonhosted.org/packages/c4/67/6acaa1be2567f9256b056d8477158cac7240813956ce86e49deae8e173b4/pydantic_core-2.46.4-cp311-cp311-win32.whl", hash = "sha256:041bde0a48fd37cf71cab1c9d56d3e8625a3793fef1f7dd232b3ff37e978ecda", size = 1985513, upload-time = "2026-05-06T13:38:15.669Z" }, - { url = "https://files.pythonhosted.org/packages/aa/e6/c505f83dfeda9a2e5c995cfd872949e4d05e12f7feb3dca72f633daefa94/pydantic_core-2.46.4-cp311-cp311-win_amd64.whl", hash = "sha256:6f2eeda33a839975441c86a4119e1383c50b47faf0cbb5176985565c6bb02c33", size = 2071114, upload-time = "2026-05-06T13:40:35.416Z" }, - { url = "https://files.pythonhosted.org/packages/0f/da/7a263a96d965d9d0df5e8de8a475f33495451117035b09acb110288c381f/pydantic_core-2.46.4-cp311-cp311-win_arm64.whl", hash = "sha256:14f4c5d6db102bd796a627bbb3a17b4cf4574b9ae861d8b7c9a9661c6dd3362d", size = 2044298, upload-time = "2026-05-06T13:38:29.754Z" }, - { url = "https://files.pythonhosted.org/packages/ce/8c/af022f0af448d7747c5154288d46b5f2bc5f17366eaa0e23e9aa04d59f3b/pydantic_core-2.46.4-cp312-cp312-macosx_10_12_x86_64.whl", hash = "sha256:3245406455a5d98187ec35530fd772b1d799b26667980872c8d4614991e2c4a2", size = 2106158, upload-time = "2026-05-06T13:38:57.215Z" }, - { url = "https://files.pythonhosted.org/packages/19/95/6195171e385007300f0f5574592e467c568becce2d937a0b6804f218bc49/pydantic_core-2.46.4-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:962ccbab7b642487b1d8b7df90ef677e03134cf1fd8880bf698649b22a69371f", size = 1951724, upload-time = "2026-05-06T13:37:02.697Z" }, - { url = "https://files.pythonhosted.org/packages/8e/bc/f47d1ff9cbb1620e1b5b697eef06010035735f07820180e74178226b27b3/pydantic_core-2.46.4-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8233f2947cf85404441fd7e0085f53b10c93e0ee78611099b5c7237e36aacbf7", size = 1975742, upload-time = "2026-05-06T13:37:09.448Z" }, - { url = "https://files.pythonhosted.org/packages/5b/11/9b9a5b0306345664a2da6410877af6e8082481b5884b3ddd78d47c6013ce/pydantic_core-2.46.4-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:3a233125ac121aa3ffba9a2b59edfc4a985a76092dc8279586ab4b71390875e7", size = 2052418, upload-time = "2026-05-06T13:37:38.234Z" }, - { url = "https://files.pythonhosted.org/packages/f1/b7/a65fec226f5d78fc39f4a13c4cc0c768c22b113438f60c14adc9d2865038/pydantic_core-2.46.4-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:5b712b53160b79a5850310b912a5ef8e57e56947c8ad690c227f5c9d7e561712", size = 2232274, upload-time = "2026-05-06T13:38:27.753Z" }, - { url = "https://files.pythonhosted.org/packages/68/f0/92039db98b907ef49269a8271f67db9cb78ae2fc68062ef7e4e77adb5f61/pydantic_core-2.46.4-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9401557acd873c3a7f3eb9383edef8ac4968f9510e340f4808d427e75667e7b4", size = 2309940, upload-time = "2026-05-06T13:38:05.353Z" }, - { url = "https://files.pythonhosted.org/packages/5f/97/2aab507d3d00ca626e8e57c1eac6a79e4e5fbcc63eb99733ff55d1717f65/pydantic_core-2.46.4-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:926c9541b14b12b1681dca8a0b75feb510b06c6341b70a8e500c2fdcff837cce", size = 2094516, upload-time = "2026-05-06T13:39:10.577Z" }, - { url = "https://files.pythonhosted.org/packages/22/37/a8aca44d40d737dde2bc05b3c6c07dff0de07ce6f82e9f3167aeaf4d5dea/pydantic_core-2.46.4-cp312-cp312-manylinux_2_31_riscv64.whl", hash = "sha256:56cb4851bcaf3d117eddcef4fe66afd750a50274b0da8e22be256d10e5611987", size = 2136854, upload-time = "2026-05-06T13:40:22.59Z" }, - { url = "https://files.pythonhosted.org/packages/24/99/fcef1b79238c06a8cbec70819ac722ba76e02bc8ada9b0fd66eba40da01b/pydantic_core-2.46.4-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:c68fcd102d71ea85c5b2dfac3f4f8476eff42a9e078fd5faefff6d145063536b", size = 2180306, upload-time = "2026-05-06T13:40:10.666Z" }, - { url = "https://files.pythonhosted.org/packages/ae/6c/fc44000918855b42779d007ae63b0532794739027b2f417321cddbc44f6a/pydantic_core-2.46.4-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:b2f69dec1725e79a012d920df1707de5caf7ed5e08f3be4435e25803efc47458", size = 2190044, upload-time = "2026-05-06T13:40:43.231Z" }, - { url = "https://files.pythonhosted.org/packages/6b/65/d9cadc9f1920d7a127ad2edba16c1db7916e59719285cd6c94600b0080ba/pydantic_core-2.46.4-cp312-cp312-musllinux_1_1_armv7l.whl", hash = "sha256:8d0820e8192167f80d88d64038e609c31452eeca865b4e1d9950a27a4609b00b", size = 2329133, upload-time = "2026-05-06T13:39:57.365Z" }, - { url = "https://files.pythonhosted.org/packages/d0/cf/c873d91679f3a30bcf5e7ac280ce5573483e72295307685120d0d5ad3416/pydantic_core-2.46.4-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:fbdb89b3e1c94a30cc5edfce477c6e6a5dc4d8f84665b455c27582f211a1c72c", size = 2374464, upload-time = "2026-05-06T13:38:06.976Z" }, - { url = "https://files.pythonhosted.org/packages/47/bd/6f2fc8188f31bf10590f1e98e7b306336161fac930a8c514cd7bd828c7dc/pydantic_core-2.46.4-cp312-cp312-win32.whl", hash = "sha256:9aa768456404a8bf48a4406685ac2bec8e72b62c69313734fa3b73cf33b3a894", size = 1974823, upload-time = "2026-05-06T13:40:47.985Z" }, - { url = "https://files.pythonhosted.org/packages/40/8c/985c1d41ea1107c2534abd9870e4ed5c8e7669b5c308297835c001e7a1c4/pydantic_core-2.46.4-cp312-cp312-win_amd64.whl", hash = "sha256:e9c26f834c65f5752f3f06cb08cb86a913ceb7274d0db6e267808a708b46bc89", size = 2072919, upload-time = "2026-05-06T13:39:21.153Z" }, - { url = "https://files.pythonhosted.org/packages/c4/ba/f463d006e0c47373ca7ec5e1a261c59dc01ef4d62b2657af925fb0deee3a/pydantic_core-2.46.4-cp312-cp312-win_arm64.whl", hash = "sha256:4fc73cb559bdb54b1134a706a2802a4cddd27a0633f5abb7e53056268751ac6a", size = 2027604, upload-time = "2026-05-06T13:39:03.753Z" }, - { url = "https://files.pythonhosted.org/packages/51/a2/5d30b469c5267a17b39dec53208222f76a8d351dfac4af661888c5aee77d/pydantic_core-2.46.4-cp313-cp313-macosx_10_12_x86_64.whl", hash = "sha256:5d5902252db0d3cedf8d4a1bc68f70eeb430f7e4c7104c8c476753519b423008", size = 2106306, upload-time = "2026-05-06T13:37:48.029Z" }, - { url = "https://files.pythonhosted.org/packages/c1/81/4fa520eaffa8bd7d1525e644cd6d39e7d60b1592bc5b516693c7340b50f1/pydantic_core-2.46.4-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:c94f0688e7b8d0a67abf40e57a7eaaecd17cc9586706a31b76c031f63df052b4", size = 1951906, upload-time = "2026-05-06T13:37:17.012Z" }, - { url = "https://files.pythonhosted.org/packages/03/d5/fd02da45b659668b05923b17ba3a0100a0a3d5541e3bd8fcc4ecb711309e/pydantic_core-2.46.4-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f027324c56cd5406ca49c124b0db10e56c69064fec039acc571c29020cc87c76", size = 1976802, upload-time = "2026-05-06T13:37:35.113Z" }, - { url = "https://files.pythonhosted.org/packages/21/f2/95727e1368be3d3ed485eaab7adbd7dda408f33f7a36e8b48e0144002b91/pydantic_core-2.46.4-cp313-cp313-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:e739fee756ba1010f8bcccb534252e85a35fe45ae92c295a06059ce58b74ccd3", size = 2052446, upload-time = "2026-05-06T13:37:12.313Z" }, - { url = "https://files.pythonhosted.org/packages/9c/86/5d99feea3f77c7234b8718075b23db11532773c1a0dbd9b9490215dc2eeb/pydantic_core-2.46.4-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:9d56801be94b86a9da183e5f3766e6310752b99ff647e38b09a9500d88e46e76", size = 2232757, upload-time = "2026-05-06T13:39:01.149Z" }, - { url = "https://files.pythonhosted.org/packages/d2/3a/508ac615935ef7588cf6d9e9b91309fdc2da751af865e02a9098de88258c/pydantic_core-2.46.4-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2412e734dcb48da14d4e4006b82b46b74f2518b8a26ee7e58c6844a6cd6d03c4", size = 2309275, upload-time = "2026-05-06T13:37:41.406Z" }, - { url = "https://files.pythonhosted.org/packages/07/f8/41db9de19d7987d6b04715a02b3b40aea467000275d9d758ffaa31af7d50/pydantic_core-2.46.4-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9551187363ffc0de2a00b2e47c25aeaeb1020b69b668762966df15fc5659dd5a", size = 2094467, upload-time = "2026-05-06T13:39:18.847Z" }, - { url = "https://files.pythonhosted.org/packages/2c/e2/f35033184cb11d0052daf4416e8e10a502ea2ac006fc4f459aee872727d1/pydantic_core-2.46.4-cp313-cp313-manylinux_2_31_riscv64.whl", hash = "sha256:0186750b482eefa11d7f435892b09c5c606193ef3375bcf94aa00ae6bfb66262", size = 2134417, upload-time = "2026-05-06T13:40:17.944Z" }, - { url = "https://files.pythonhosted.org/packages/7e/7b/6ceeb1cc90e193862f444ebe373d8fdf613f0a82572dde03fb10734c6c71/pydantic_core-2.46.4-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:5855698a4856556d86e8e6cd8434bc3ac0314ee8e12089ae0e143f64c6256e4e", size = 2179782, upload-time = "2026-05-06T13:40:32.618Z" }, - { url = "https://files.pythonhosted.org/packages/5a/f2/c8d7773ede6af08036423a00ae0ceffce266c3c52a096c435d68c896083f/pydantic_core-2.46.4-cp313-cp313-musllinux_1_1_aarch64.whl", hash = "sha256:cbaf13819775b7f769bf4a1f066cb6df7a28d4480081a589828ef190226881cd", size = 2188782, upload-time = "2026-05-06T13:36:51.018Z" }, - { url = "https://files.pythonhosted.org/packages/59/31/0c864784e31f09f05cdd87606f08923b9c9e7f6e51dd27f20f62f975ce9f/pydantic_core-2.46.4-cp313-cp313-musllinux_1_1_armv7l.whl", hash = "sha256:633147d34cf4550417f12e2b1a0383973bdf5cdfde212cb09e9a581cf10820be", size = 2328334, upload-time = "2026-05-06T13:40:37.764Z" }, - { url = "https://files.pythonhosted.org/packages/c2/eb/4f6c8a41efa30baa755590f4141abf3a8c370fab610915733e74134a7270/pydantic_core-2.46.4-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:82cf5301172168103724d49a1444d3378cb20cdee30b116a1bd6031236298a5d", size = 2372986, upload-time = "2026-05-06T13:39:34.152Z" }, - { url = "https://files.pythonhosted.org/packages/5b/24/b375a480d53113860c299764bfe9f349a3dc9108b3adc0d7f0d786492ebf/pydantic_core-2.46.4-cp313-cp313-win32.whl", hash = "sha256:9fa8ae11da9e2b3126c6426f147e0fba88d96d65921799bb30c6abd1cb2c97fb", size = 1973693, upload-time = "2026-05-06T13:37:55.072Z" }, - { url = "https://files.pythonhosted.org/packages/7e/e8/cff247591966f2d22ec8c003cd7587e27b7ba7b81ab2fb888e3ab75dc285/pydantic_core-2.46.4-cp313-cp313-win_amd64.whl", hash = "sha256:6b3ace8194b0e5204818c92802dcdca7fc6d88aabbb799d7c795540d9cd6d292", size = 2071819, upload-time = "2026-05-06T13:38:49.139Z" }, - { url = "https://files.pythonhosted.org/packages/c6/1a/f4aee670d5670e9e148e0c82c7db98d780be566c6e6a97ee8035528ca0b3/pydantic_core-2.46.4-cp313-cp313-win_arm64.whl", hash = "sha256:184c081504d17f1c1066e430e117142b2c77d9448a97f7b65c6ac9fd9aee238d", size = 2027411, upload-time = "2026-05-06T13:40:45.796Z" }, { url = "https://files.pythonhosted.org/packages/8d/74/228a26ddad29c6672b805d9fd78e8d251cd04004fa7eed0e622096cd0250/pydantic_core-2.46.4-cp314-cp314-macosx_10_12_x86_64.whl", hash = "sha256:428e04521a40150c85216fc8b85e8d39fece235a9cf5e383761238c7fa9b96fb", size = 2102079, upload-time = "2026-05-06T13:38:41.019Z" }, { url = "https://files.pythonhosted.org/packages/ad/1f/8970b150a4b4365623ae00fc88603491f763c627311ae8031e3111356d6e/pydantic_core-2.46.4-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:23ace664830ee0bfe014a0c7bc248b1f7f25ed7ad103852c317624a1083af462", size = 1952179, upload-time = "2026-05-06T13:36:59.812Z" }, { url = "https://files.pythonhosted.org/packages/95/30/5211a831ae054928054b2f79731661087a2bc5c01e825c672b3a4a8f1b3e/pydantic_core-2.46.4-cp314-cp314-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ce5c1d2a8b27468f433ca974829c44060b8097eedc39933e3c206a90ee49c4a9", size = 1978926, upload-time = "2026-05-06T13:37:39.933Z" }, @@ -3411,22 +2435,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/30/a6/9f9f380dbb301f67023bf8f707aaa75daadf84f7152d95c410fd7e81d994/pydantic_core-2.46.4-cp314-cp314t-win32.whl", hash = "sha256:e846ae7835bf0703ae43f534ab79a867146dadd59dc9ca5c8b53d5c8f7c9ef02", size = 1955575, upload-time = "2026-05-06T13:38:51.116Z" }, { url = "https://files.pythonhosted.org/packages/40/1f/f1eb9eb350e795d1af8586289746f5c5677d16043040d63710e22abc43c9/pydantic_core-2.46.4-cp314-cp314t-win_amd64.whl", hash = "sha256:2108ba5c1c1eca18030634489dc544844144ee36357f2f9f780b93e7ddbb44b5", size = 2051624, upload-time = "2026-05-06T13:38:21.672Z" }, { url = "https://files.pythonhosted.org/packages/f6/d2/42dd53d0a85c27606f316d3aa5d2869c4e8470a5ed6dec30e4a1abe19192/pydantic_core-2.46.4-cp314-cp314t-win_arm64.whl", hash = "sha256:4fcbe087dbc2068af7eda3aa87634eba216dbda64d1ae73c8684b621d33f6596", size = 2017325, upload-time = "2026-05-06T13:40:52.723Z" }, - { url = "https://files.pythonhosted.org/packages/ee/a4/73995fd4ebbb46ba0ee51e6fa049b8f02c40daebb762208feda8a6b7894d/pydantic_core-2.46.4-graalpy311-graalpy242_311_native-macosx_10_12_x86_64.whl", hash = "sha256:14d4edf427bdcf950a8a02d7cb44a08614388dd6e1bdcbf4f67504fa7887da9c", size = 2111589, upload-time = "2026-05-06T13:37:10.817Z" }, - { url = "https://files.pythonhosted.org/packages/fb/7f/f37d3a5e8bfcc2e403f5c57a730f2d815693fb42119e8ea48b3789335af1/pydantic_core-2.46.4-graalpy311-graalpy242_311_native-macosx_11_0_arm64.whl", hash = "sha256:0ce40cd7b21210e99342afafbd4d0f76d784eb5b1d60f3bdc566be4983c6c73b", size = 1944552, upload-time = "2026-05-06T13:36:56.717Z" }, - { url = "https://files.pythonhosted.org/packages/15/3c/d7eb777b3ff43e8433a4efb39a17aa8fd98a4ee8561a24a67ef5db07b2d6/pydantic_core-2.46.4-graalpy311-graalpy242_311_native-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:90884113d8b48f760e9587002789ddd741e76ab9f89518cd1e43b1f1a52ec44b", size = 1982984, upload-time = "2026-05-06T13:39:06.207Z" }, - { url = "https://files.pythonhosted.org/packages/63/87/70b9f40170a81afd55ca26c9b2acb25c20d64bcfbf888fafecb3ba077d4c/pydantic_core-2.46.4-graalpy311-graalpy242_311_native-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:66ce7632c22d837c95301830e111ad0128a32b8207533b60896a96c4915192ea", size = 2138417, upload-time = "2026-05-06T13:39:45.476Z" }, - { url = "https://files.pythonhosted.org/packages/9d/1d/8987ad40f65ae1432753072f214fb5c74fe47ffbd0698bb9cbbb585664f8/pydantic_core-2.46.4-graalpy312-graalpy250_312_native-macosx_10_12_x86_64.whl", hash = "sha256:1d8ba486450b14f3b1d63bc521d410ec7565e52f887b9fb671791886436a42f7", size = 2095527, upload-time = "2026-05-06T13:39:52.283Z" }, - { url = "https://files.pythonhosted.org/packages/64/d3/84c282a7eee1d3ac4c0377546ef5a1ea436ce26840d9ac3b7ed54a377507/pydantic_core-2.46.4-graalpy312-graalpy250_312_native-macosx_11_0_arm64.whl", hash = "sha256:3009f12e4e90b7f88b4f9adb1b0c4a3d58fe7820f3238c190047209d148026df", size = 1936024, upload-time = "2026-05-06T13:40:15.671Z" }, - { url = "https://files.pythonhosted.org/packages/d7/ca/eac61596cdeb4d7e174d3dc0bd8a6238f14f75f97a24e7b7db4c7e7340a0/pydantic_core-2.46.4-graalpy312-graalpy250_312_native-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ad785e92e6dc634c21555edc8bd6b64957ab844541bcb96a1366c202951ae526", size = 1990696, upload-time = "2026-05-06T13:38:34.717Z" }, - { url = "https://files.pythonhosted.org/packages/fa/c3/7c8b240552251faf6b3a957db200fcfbbcec36763c050428b601e0c9b83b/pydantic_core-2.46.4-graalpy312-graalpy250_312_native-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:00c603d540afdd6b80eb39f078f33ebd46211f02f33e34a32d9f053bba711de0", size = 2147590, upload-time = "2026-05-06T13:39:29.883Z" }, - { url = "https://files.pythonhosted.org/packages/11/cb/428de0385b6c8d44b716feba566abfacfbd23ee3c4439faa789a1456242f/pydantic_core-2.46.4-pp311-pypy311_pp73-macosx_10_12_x86_64.whl", hash = "sha256:0c563b08bca408dc7f65f700633d8442fffb2421fc47b8101377e9fd65051ff0", size = 2112782, upload-time = "2026-05-06T13:37:04.016Z" }, - { url = "https://files.pythonhosted.org/packages/0b/b5/6a17bdadd0fc1f170adfd05a20d37c832f52b117b4d9131da1f41bb097ce/pydantic_core-2.46.4-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:db06ffe51636ffe9ca531fe9023dd64bdd794be8754cb5df57c5498ae5b518a7", size = 1952146, upload-time = "2026-05-06T13:39:43.092Z" }, - { url = "https://files.pythonhosted.org/packages/2a/dc/03734d80e362cd43ef65428e9de77c730ce7f2f11c60d2b1e1b39f0fbf99/pydantic_core-2.46.4-pp311-pypy311_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:133878133d271ade3d41d1bfb2a45ec38dbdbda40bc065921c6b04e4630127e2", size = 2134492, upload-time = "2026-05-06T13:36:58.124Z" }, - { url = "https://files.pythonhosted.org/packages/de/df/5e5ffc085ed07cc22d298134d3d911c63e91f6a0eb91fe646750a3209910/pydantic_core-2.46.4-pp311-pypy311_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:9bc519fbf2b7578398853d815009ae5e4d4603d12f4e3f91da8c06852d3da3e9", size = 2156604, upload-time = "2026-05-06T13:37:49.88Z" }, - { url = "https://files.pythonhosted.org/packages/81/44/6e112a4253e56f5705467cbab7ab5e91ee7398ba3d56d358635958893d3e/pydantic_core-2.46.4-pp311-pypy311_pp73-musllinux_1_1_aarch64.whl", hash = "sha256:c7a7bd4e39e8e4c12c39cd480356842b6a8a06e41b23a55a5e3e191718838ddf", size = 2183828, upload-time = "2026-05-06T13:37:43.053Z" }, - { url = "https://files.pythonhosted.org/packages/ac/ad/5565071e937d8e752842ac241463944c9eb14c87e2d269f2658a5bd05e98/pydantic_core-2.46.4-pp311-pypy311_pp73-musllinux_1_1_armv7l.whl", hash = "sha256:d396ec2b979760aaf3218e76c24e65bd0aca24983298653b3a9d7a45f9e47b30", size = 2310000, upload-time = "2026-05-06T13:37:56.694Z" }, - { url = "https://files.pythonhosted.org/packages/4f/c3/66883a5cec183e7fba4d024b4cbbe61851a63750ef606b0afecc46d1f2bf/pydantic_core-2.46.4-pp311-pypy311_pp73-musllinux_1_1_x86_64.whl", hash = "sha256:86e1a4418c6cd97d60c95c71164158eaf7324fae7b0923264016baa993eba6fc", size = 2361286, upload-time = "2026-05-06T13:40:05.667Z" }, - { url = "https://files.pythonhosted.org/packages/4b/2d/69abac8f838090bbecd5df894befb2c2619e7996a98ddb949db9f3b93225/pydantic_core-2.46.4-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:d51026d73fcfd93610abc7b27789c26b313920fcfb20e27462d74a7f8b06e983", size = 2193071, upload-time = "2026-05-06T13:38:08.682Z" }, ] [[package]] @@ -3444,12 +2452,12 @@ wheels = [ ] [[package]] -name = "pyflakes" -version = "3.4.0" +name = "pydocstringformatter" +version = "0.7.5" source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/45/dc/fd034dc20b4b264b3d015808458391acbf9df40b1e54750ef175d39180b1/pyflakes-3.4.0.tar.gz", hash = "sha256:b24f96fafb7d2ab0ec5075b7350b3d2d2218eab42003821c06344973d3ea2f58", size = 64669, upload-time = "2025-06-20T18:45:27.834Z" } +sdist = { url = "https://files.pythonhosted.org/packages/b0/37/f6d5ff68893c8b4ae194d6dd9df31be2cceacfae5256c840b9e216fd20de/pydocstringformatter-0.7.5.tar.gz", hash = "sha256:e9cbd134d6279360fd2bcaad94680cec02aa20a22560375c5ffd495fcfbcf92d", size = 30474, upload-time = "2025-07-12T10:12:46.089Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/c2/2f/81d580a0fb83baeb066698975cb14a618bdbed7720678566f1b046a95fe8/pyflakes-3.4.0-py2.py3-none-any.whl", hash = "sha256:f742a7dbd0d9cb9ea41e9a24a918996e8170c799fa528688d40dd582c8265f4f", size = 63551, upload-time = "2025-06-20T18:45:26.937Z" }, + { url = "https://files.pythonhosted.org/packages/81/ed/e70e413b537b7809badcd275a5f050301dafbe54efd1ae9d392ed2943c40/pydocstringformatter-0.7.5-py3-none-any.whl", hash = "sha256:7daed355f11244f64571d119e49e7328365ea9b545f88256a47b550f213d23eb", size = 31433, upload-time = "2025-07-12T10:12:44.619Z" }, ] [[package]] @@ -3499,21 +2507,6 @@ dependencies = [ ] sdist = { url = "https://files.pythonhosted.org/packages/74/ed/b52bb7ab2b9ca0e69ea54b919ddba13c5636b960f7b9f4fab0d0aa0a502b/pymatgen_core-2026.5.18.tar.gz", hash = "sha256:bdbe8c591bbac7ed65922d710e94b661bb540baae27217ceadd59e31e9c3ff07", size = 2860012, upload-time = "2026-05-18T23:39:30.786Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/9d/14/1f02bea594033a000c68980a362ae670be7832e72281c8acbad35fbfb218/pymatgen_core-2026.5.18-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:d712b5098a281f6f499f039b079d9c45d8d45d83d378de42261c5aa9333e3ce1", size = 2923247, upload-time = "2026-05-18T23:39:28.443Z" }, - { url = "https://files.pythonhosted.org/packages/0d/bd/fc63c1c6be5bf0aeb810f12374f14ad3a0bad7b14736649e2ebe960f51d0/pymatgen_core-2026.5.18-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:69a51c5332bc9666f05f07d3e0a5f9eef28c44681bfe05781628b9e2846df07b", size = 4434150, upload-time = "2026-05-19T02:15:06.754Z" }, - { url = "https://files.pythonhosted.org/packages/f5/c0/9a6668d441d51f87eebd3263cd49399179f980764d3ab0d3b9d1faa1e0fe/pymatgen_core-2026.5.18-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:f31bbf0821eeb5570defaa511e2152480cc39e1127d78551f01343a961e165f6", size = 4462716, upload-time = "2026-05-19T02:15:08.724Z" }, - { url = "https://files.pythonhosted.org/packages/c9/a2/6671b3059d1e87964cd8589ec622958ecd4755b84078b092d2e679999e4e/pymatgen_core-2026.5.18-cp311-cp311-win32.whl", hash = "sha256:f0956528c54ced5bbf648f947f05935ab8159656a8df24cf22cb251ec9d74a5d", size = 2858798, upload-time = "2026-05-19T02:15:10.602Z" }, - { url = "https://files.pythonhosted.org/packages/75/26/86520647872bdae9669009beaa01250d37ad6e1b3942a9c88c6610c757c0/pymatgen_core-2026.5.18-cp311-cp311-win_amd64.whl", hash = "sha256:d0b5991048433a0cfd153eb0bb5920740042ea67521d78a04de5390f70461b2a", size = 2900587, upload-time = "2026-05-19T02:15:12.385Z" }, - { url = "https://files.pythonhosted.org/packages/23/00/35ccf35580d6caa1a88ea427df9e23628d64aef53b5752d377581f013098/pymatgen_core-2026.5.18-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:26709975fb33070fdf1b1bde301694ef5774d39b91d6dc7b27876bf30fb068ad", size = 2927363, upload-time = "2026-05-19T02:15:14.143Z" }, - { url = "https://files.pythonhosted.org/packages/23/06/2931ca449754e2b7d895d2185c99515b0d12a3c44a2e05142cc756e2d137/pymatgen_core-2026.5.18-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:938688b6d897183f9612122cdeee7613967e189932842eaf40008210d257e5aa", size = 4434814, upload-time = "2026-05-19T02:15:15.673Z" }, - { url = "https://files.pythonhosted.org/packages/ca/21/a54cf445b00d6bdf71fafc35079f4e810755947d0f4758447dfe12ac44b6/pymatgen_core-2026.5.18-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:070230f3ecaec435f5896d9579f614e14020cc079e6443c15b9ea971841812c0", size = 4481429, upload-time = "2026-05-19T02:15:17.313Z" }, - { url = "https://files.pythonhosted.org/packages/4d/22/5c8c8abd8367e387ec97c32c8504c1f1ef821fc41e8bd325fe40c6aa866f/pymatgen_core-2026.5.18-cp312-cp312-win32.whl", hash = "sha256:21615334c07d2211f2c9420181cab3f1aace66a7a3673f8cdbbeb27741681ed0", size = 2857740, upload-time = "2026-05-19T02:15:19.333Z" }, - { url = "https://files.pythonhosted.org/packages/26/6e/c0502db344f707469683c26bb685f918b6bdfb79211a2fa9fafe63636d3c/pymatgen_core-2026.5.18-cp312-cp312-win_amd64.whl", hash = "sha256:46e87242e881b44034cf9a9480c0bbc39f566c2918126689aa6898b3538e18ec", size = 2900927, upload-time = "2026-05-19T02:15:21.179Z" }, - { url = "https://files.pythonhosted.org/packages/7d/93/bb20fe038df5c36214fcded3c1b23623fdc00465bf300a1e3603dadf42c2/pymatgen_core-2026.5.18-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:531ab9284e48890bd29a537f6183c52fd9e5488cb86d125ac2c7ebe0a2bfd239", size = 2925181, upload-time = "2026-05-19T02:15:23.288Z" }, - { url = "https://files.pythonhosted.org/packages/81/d8/7a6eab09b88ca5a4997e19f080cb43eccbda1f70fcd213b14df36db14616/pymatgen_core-2026.5.18-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:1f5eced053f989fb5818ced84cc26dc88a06522740c24a0b410674b386ad331d", size = 4416899, upload-time = "2026-05-19T02:15:25.216Z" }, - { url = "https://files.pythonhosted.org/packages/9d/5b/17bdac8864553080fe076cd511052dc031bf7f422ebf14d3bc801a1f0874/pymatgen_core-2026.5.18-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:123be72bb2df4f22534f0926c2ffc188594251f2998ab7d9df6f76db81ae466b", size = 4462454, upload-time = "2026-05-19T02:15:27.151Z" }, - { url = "https://files.pythonhosted.org/packages/08/cd/a8850adb8ba26fe77ac0b4efa77f4c03ebfa1e673c388c8cd0dac8d752b1/pymatgen_core-2026.5.18-cp313-cp313-win32.whl", hash = "sha256:12391b53f98c6bae5a4875c1efc558f303857e06347580f31e3d79c2353c86e8", size = 2857426, upload-time = "2026-05-19T02:15:29.062Z" }, - { url = "https://files.pythonhosted.org/packages/cd/41/57d429a2a8f7a9599735823580da304e30066ac9029f78a8af88ae041990/pymatgen_core-2026.5.18-cp313-cp313-win_amd64.whl", hash = "sha256:417a4410537b49cd7d4970518ece69182ba7cae0c71e7f7fb9bd15b896e059f4", size = 2900292, upload-time = "2026-05-19T02:15:30.528Z" }, { url = "https://files.pythonhosted.org/packages/24/cf/c075084fc03fbb11ccc9a5d07d37163eb2dfaf6b6981cbec7c1f7955bd6b/pymatgen_core-2026.5.18-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:41f390215a28ba9c5fba5ccf414a0dca6824a4d463d09008eacc59dfe89c5f45", size = 2927369, upload-time = "2026-05-19T02:15:32.055Z" }, { url = "https://files.pythonhosted.org/packages/b7/30/45cb3d86a9b9ff20fee497e5fe3a10e922785fa269d597a76c19066d4207/pymatgen_core-2026.5.18-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:31833fa81a264842e782039f4cf46a9ceaacb485639ea3d4606f3d06e1d1d6d6", size = 4413086, upload-time = "2026-05-19T02:15:34.007Z" }, { url = "https://files.pythonhosted.org/packages/19/b8/548cf1d1b78e03535fa2b2fe90860946ed45c1b29befd3d1fe43fc87a005/pymatgen_core-2026.5.18-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:7199b2f7ae7e0ba5ae3af23f5d16e13ae69a37d4015d94d4f62d5ada544fb4eb", size = 4448826, upload-time = "2026-05-19T02:15:35.761Z" }, @@ -3530,36 +2523,6 @@ dependencies = [ ] sdist = { url = "https://files.pythonhosted.org/packages/ca/64/50be6fbac9c79fe2e4c17401a467da2d8764d82833d83cec325afe5cab32/pymongo-4.17.0.tar.gz", hash = "sha256:70ffa08ba641468cc068cf46c06b34f01a8ce3489f6411309fcb5ceabe6b2fc0", size = 2523370, upload-time = "2026-04-20T16:39:53.524Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/c4/e2/336d86f221cf1b56b2ed9330d4a3b98f9f38f0b37829ae9a9184617d5419/pymongo-4.17.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:4141e6c6a339789b2974efa00ecd9409101672d77a0e3ee2cc3839eedf8ec4df", size = 874668, upload-time = "2026-04-20T16:37:41.39Z" }, - { url = "https://files.pythonhosted.org/packages/34/8e/75d3c6c935d187ab59c61e9c15d9aab3f274b563eaf1706e8cae5f508dec/pymongo-4.17.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:e68c76b84e0c132d9dbf9307f12ff8185702328187a87b9aca8c941303873433", size = 875294, upload-time = "2026-04-20T16:37:43.432Z" }, - { url = "https://files.pythonhosted.org/packages/5f/ec/62e855744489dbcd54fd778aae4d80fa4c4819e8fb228ca0cf6f21a03997/pymongo-4.17.0-cp311-cp311-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:ba2195d4f386f839a52a23ea1cfd60ffaaba78a3d7841db51b7e433001139918", size = 1496233, upload-time = "2026-04-20T16:37:45.518Z" }, - { url = "https://files.pythonhosted.org/packages/82/e8/93e4e5e5ce8fdf8929dabeefe24aafa5ce046028eed0dfa8eeb936e72c49/pymongo-4.17.0-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:8446ff4bfcb6ec2a2e50998c860986a1e992136f998b7f53e7a717fb8aa5a0b9", size = 1522927, upload-time = "2026-04-20T16:37:47.492Z" }, - { url = "https://files.pythonhosted.org/packages/f7/ca/425dc1d21e0f17bdea0072fc463f662f7fa06d2852af52975c9eced3c07c/pymongo-4.17.0-cp311-cp311-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:2a0d5ac205728c86e0a02192f1aa5f865b0d7d51f8df6101c01a69a7fc620d72", size = 1583468, upload-time = "2026-04-20T16:37:49.221Z" }, - { url = "https://files.pythonhosted.org/packages/b3/9d/f08b07eeffda1a43c1759f0fa625e88ae12360996eb56d42aad832fa7dff/pymongo-4.17.0-cp311-cp311-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:485c8a8eaa4c739f00a331fc73757898ee7c092c214a79e63866ff76aaf282ff", size = 1572787, upload-time = "2026-04-20T16:37:51.061Z" }, - { url = "https://files.pythonhosted.org/packages/e9/c2/6855a07aafa7b894929af23675b6fb9634800ce43122b76a62f6eeb8da2a/pymongo-4.17.0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:b2dfcc795f5b9fedbe179a11fdf6051581479d196582a3fe819a92a00e9b9969", size = 1526184, upload-time = "2026-04-20T16:37:53.358Z" }, - { url = "https://files.pythonhosted.org/packages/4e/05/c952bac7db71c1942ea3559fcd308b49754cc5004b455935fb4000d1f37b/pymongo-4.17.0-cp311-cp311-win32.whl", hash = "sha256:c2292144505fb12156b981bd440f3dc994a883da06ac726c0c8692ccdbc1c510", size = 852621, upload-time = "2026-04-20T16:37:55.28Z" }, - { url = "https://files.pythonhosted.org/packages/11/c0/c04da9f4c0c6252404598f4e394b862a58a9e866822a70ae261c8a018fdf/pymongo-4.17.0-cp311-cp311-win_amd64.whl", hash = "sha256:2e190827834fce70ecdf9d46796c6dbc0ce08ea87dc2ff5bc6f3f5579b605cb9", size = 867852, upload-time = "2026-04-20T16:37:57.233Z" }, - { url = "https://files.pythonhosted.org/packages/1d/b2/c7b4870fbeef471e947d3e014676f5910d02e0197074d692ebcf24ec049a/pymongo-4.17.0-cp311-cp311-win_arm64.whl", hash = "sha256:a8f9c40a09bb7d4b9fc8b1da65ecf6efa79bda5cb2756f39d9b6940fac1d19ae", size = 855019, upload-time = "2026-04-20T16:37:58.983Z" }, - { url = "https://files.pythonhosted.org/packages/98/90/60bcb508840135d5ee46b51b1a950f548338aa8145a8366dbe6639ae51ac/pymongo-4.17.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:d53ffa94b2340dbf6b055e09a0090618c60482c158ecfc9565642fc996bf0944", size = 930529, upload-time = "2026-04-20T16:38:00.936Z" }, - { url = "https://files.pythonhosted.org/packages/a6/e9/313840f1e52c6dfac47f704428cbfbce59956ebe7633bffc92b03f74f0ad/pymongo-4.17.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:6fe0de9d0f6791abce3471230b32b4817bf89d27b1182b6a550e1ec0fa72aa9a", size = 930665, upload-time = "2026-04-20T16:38:02.915Z" }, - { url = "https://files.pythonhosted.org/packages/78/35/9d3565ea45b1606f635c1e2cd2563c28d66caafdc50f7ad7d979fcd1b363/pymongo-4.17.0-cp312-cp312-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:e537e95514dae1aaa718f481ec03151a0f0394bcd05f1322896d8fc1330cb729", size = 1762369, upload-time = "2026-04-20T16:38:05.375Z" }, - { url = "https://files.pythonhosted.org/packages/95/ee/149b0d4b1a11c38bff6f14c23d5814c9b0843fd6dc38ad40596bdb1a62d2/pymongo-4.17.0-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:37a8385c29881b43eab31f584100fa0eaddedd5607adf010147ba1810118be90", size = 1798044, upload-time = "2026-04-20T16:38:07.195Z" }, - { url = "https://files.pythonhosted.org/packages/7b/d4/4cee4a7b8d8f6f0550ef6cd2fea42455c5ed619a220cb6ba4fb40d6a5bc8/pymongo-4.17.0-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:f3ee3d241ed77a4fc99ce3cff3b289c3ebce37f61fdd7349d3592c23b82c8784", size = 1878567, upload-time = "2026-04-20T16:38:09.121Z" }, - { url = "https://files.pythonhosted.org/packages/45/ef/7fe366c84952619ee2f69973566c214775e083dd4df465751912153e4b72/pymongo-4.17.0-cp312-cp312-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:9eb5d63a3c518cb0804ed678f5e2b875af032d89a7cf57a57360322cf6a4d222", size = 1864881, upload-time = "2026-04-20T16:38:10.896Z" }, - { url = "https://files.pythonhosted.org/packages/2f/35/b577d82c6d1be7aee7ac7e249bc86f7847998345042e5f8360de238e177b/pymongo-4.17.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:8e97e03fa13327c87e3fdc5656acd01e71817f0c1dc3221cd8f30de136bf4ec3", size = 1800349, upload-time = "2026-04-20T16:38:13.589Z" }, - { url = "https://files.pythonhosted.org/packages/b8/69/dafcf04f66e130ddd91aeb92e7a692480eda46dcd04ec1dbe82c06619e10/pymongo-4.17.0-cp312-cp312-win32.whl", hash = "sha256:6877214bff5f06f6884a9fc8d9016a4a7a5f51f537f5c51ac3a576f93e7dfb32", size = 900518, upload-time = "2026-04-20T16:38:15.541Z" }, - { url = "https://files.pythonhosted.org/packages/11/35/5c9262a459f988b4eb2605f70815240b77a0d4131136c4326d18f1822b89/pymongo-4.17.0-cp312-cp312-win_amd64.whl", hash = "sha256:9828485f72f63c7d802e0ec41f71906f633c2692621ab3af55ca990186b091b1", size = 920335, upload-time = "2026-04-20T16:38:17.665Z" }, - { url = "https://files.pythonhosted.org/packages/8d/da/e9c7265ee176faccf4e52c4797837e794d93569a1046f6b19a4acc36e5ad/pymongo-4.17.0-cp312-cp312-win_arm64.whl", hash = "sha256:1195370a77baf003b59b10e91ecc4706297197f0dd9d29c840cc556dc08f7cee", size = 903289, upload-time = "2026-04-20T16:38:19.33Z" }, - { url = "https://files.pythonhosted.org/packages/2a/6b/c1206879708b94e82fcd8b9653440ec271f79a3674d122192df383047f5a/pymongo-4.17.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:809ec74de3b9148ae43fa8df9faf53470f511c8d384f13b99d6f671f2a379f15", size = 985829, upload-time = "2026-04-20T16:38:21.031Z" }, - { url = "https://files.pythonhosted.org/packages/cb/cf/bb044ed85160e5c40f568c7c4f4e8ea16f40764ff5d302e5befbe8f6f814/pymongo-4.17.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:a431b737816bf4cddd4fa0fcef04e424ad36b7692734a64150f872fb8f3208be", size = 985899, upload-time = "2026-04-20T16:38:23.409Z" }, - { url = "https://files.pythonhosted.org/packages/74/0a/f6dfd5ea3901e5d6888da8de8ba728971a1d447debab681cfc56f90d1208/pymongo-4.17.0-cp313-cp313-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:e4fab10f8403169ce92f3cea921609d9ee81107306caae06c08f592d4b8ad2b5", size = 2028569, upload-time = "2026-04-20T16:38:25.343Z" }, - { url = "https://files.pythonhosted.org/packages/4a/c5/081f59a1c02ae8c0dc73ae58e563838c44eec81aeafa7d0b93a637841c9b/pymongo-4.17.0-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:20323b0b1c1d33770ad1fc68d429c757734ce9ad3594421c3d6618f10572b1b9", size = 2072916, upload-time = "2026-04-20T16:38:27.291Z" }, - { url = "https://files.pythonhosted.org/packages/31/42/6e41d434297ffe8b30d9c3717916591a4a7be9075a0dcc2fafdfaaaa62ed/pymongo-4.17.0-cp313-cp313-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:5a5de048e6da5c18e27cc2437e8c15b3b0cdc8385c15b41178b0caa3322a09c2", size = 2173234, upload-time = "2026-04-20T16:38:29.474Z" }, - { url = "https://files.pythonhosted.org/packages/3d/cf/1e4a7db352ef9485831c7268dfe8402f0117b32a9ad54b16e810699e3617/pymongo-4.17.0-cp313-cp313-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:dff3de1294fbbc1db0ba6b511f77b8e540601d092538a31312e99c8a91a78b1e", size = 2156784, upload-time = "2026-04-20T16:38:32.134Z" }, - { url = "https://files.pythonhosted.org/packages/12/10/6195be29962a61ebb5f4bd9e4c7519890b172f7968a0a0d880398c6ddb02/pymongo-4.17.0-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:faf03e4c2aafd6de626dbd30ba246d369ae33f47f10629d1bbe40f72115027a6", size = 2074446, upload-time = "2026-04-20T16:38:34.004Z" }, - { url = "https://files.pythonhosted.org/packages/37/48/33410b8819837ed370c738587306bdf060b59cef11823be212f4a07703c5/pymongo-4.17.0-cp313-cp313-win32.whl", hash = "sha256:c9786665926a09630c5d420c79762cfadbff35a9438bcbc4c81a9fb5ab9228b7", size = 948435, upload-time = "2026-04-20T16:38:35.922Z" }, - { url = "https://files.pythonhosted.org/packages/6f/77/c0ed522f798a286b99acaa7914ed8d9c80ab091f97f57c59ffed72906e5e/pymongo-4.17.0-cp313-cp313-win_amd64.whl", hash = "sha256:5960519b4d7168f1ecdd3ea10c81b2aedeb9423651aca953cfbc8e76705d3b38", size = 972847, upload-time = "2026-04-20T16:38:37.888Z" }, - { url = "https://files.pythonhosted.org/packages/97/f0/c39480a2db385fde23861d0c8acda41cdaf1d43e46579db72c5c013a2e81/pymongo-4.17.0-cp313-cp313-win_arm64.whl", hash = "sha256:0ff6bd2f735ab5356541e3e57d5b7dbfbc3f2ee1ccb10b6b0f82d58af69d1d8e", size = 951575, upload-time = "2026-04-20T16:38:40.544Z" }, { url = "https://files.pythonhosted.org/packages/da/49/2b0250762a89737ed6f9cea238331baca061b89a8ddd10dd17fee52c3970/pymongo-4.17.0-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:ff5aa3f1c7e3f08eb0e7a016c91ba468b1850ccfd63d9b1f12f56350f4974cef", size = 1040945, upload-time = "2026-04-20T16:38:42.783Z" }, { url = "https://files.pythonhosted.org/packages/89/1c/7a9b5447a08be20e84b6e5b17330917e8d6d9507daa3cd099a9309f11ad7/pymongo-4.17.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:e816db649ba5d7de0568cf3a9f287a9dc9aad21cf0ca667ab156a7ef47fca0b0", size = 1041187, upload-time = "2026-04-20T16:38:45.358Z" }, { url = "https://files.pythonhosted.org/packages/78/a1/71704f61632dfc90407a5834fe5f6132854937c4a3648f6c05c351d85a45/pymongo-4.17.0-cp314-cp314-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:12c4fded3a9f1d6a687e36ebd384ac6d00b9b00de1969aa74048e7051ec2a713", size = 2294806, upload-time = "2026-04-20T16:38:47.734Z" }, @@ -3588,7 +2551,6 @@ version = "26.2.0" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "cryptography" }, - { name = "typing-extensions", marker = "python_full_version < '3.13'" }, ] sdist = { url = "https://files.pythonhosted.org/packages/1a/51/27a5ad5f939d08f690a326ef9582cda7140555180db71695f6fb747d6a36/pyopenssl-26.2.0.tar.gz", hash = "sha256:8c6fcecd1183a7fc897548dfe388b0cdb7f37e018200d8409cf33959dbe35387", size = 182195, upload-time = "2026-05-04T23:06:09.72Z" } wheels = [ @@ -3620,29 +2582,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/d4/24/a372aaf5c9b7208e7112038812994107bc65a84cd00e0354a88c2c77a617/pytest-9.0.3-py3-none-any.whl", hash = "sha256:2c5efc453d45394fdd706ade797c0a81091eccd1d6e4bccfcd476e2b8e0ab5d9", size = 375249, upload-time = "2026-04-07T17:16:16.13Z" }, ] -[[package]] -name = "pytest-flake8" -version = "1.3.0" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "flake8" }, - { name = "pytest" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/4f/83/3b0154ccd60191e24b75c99c5e7c6dcfb1d2fd81dd47528523b38fed6ac6/pytest_flake8-1.3.0.tar.gz", hash = "sha256:88fb35562ce32d915c6ba41ef0d5e1cfcdd8ff884a32b7d46aa99fc77a3d1fe6", size = 13340, upload-time = "2024-11-09T00:09:09.249Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/7d/ca/163e24b6d92ba3e92245a6a23e88b946c29ff5294b2f4bc24c7a6171a13d/pytest_flake8-1.3.0-py3-none-any.whl", hash = "sha256:de10517c59fce25c0a7abb2a2b2a9d0b0ceb59ff0add7fa8e654d613bb25e218", size = 5966, upload-time = "2024-11-09T00:09:08.227Z" }, -] - -[[package]] -name = "pytest-pycodestyle" -version = "2.5.0" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "pycodestyle" }, - { name = "pytest" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/0f/60/634e069a52137207b988359319c7030b25195f014822724f259325fa3af5/pytest_pycodestyle-2.5.0.tar.gz", hash = "sha256:dd0060039e12a59b521da8e57e17133c965566dd8d17631e589e7545238829ac", size = 5859, upload-time = "2025-07-20T03:18:12.504Z" } - [[package]] name = "pytest-xdist" version = "3.8.0" @@ -3722,14 +2661,6 @@ version = "3.0.3" source = { registry = "https://pypi.org/simple" } sdist = { url = "https://files.pythonhosted.org/packages/f7/54/37c7370ba91f579235049dc26cd2c5e657d2a943e01820844ffc81f32176/pywinpty-3.0.3.tar.gz", hash = "sha256:523441dc34d231fb361b4b00f8c99d3f16de02f5005fd544a0183112bcc22412", size = 31309, upload-time = "2026-02-04T21:51:09.524Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/79/c3/3e75075c7f71735f22b66fab0481f2c98e3a4d58cba55cb50ba29114bcf6/pywinpty-3.0.3-cp311-cp311-win_amd64.whl", hash = "sha256:dff25a9a6435f527d7c65608a7e62783fc12076e7d44487a4911ee91be5a8ac8", size = 2114430, upload-time = "2026-02-04T21:54:19.485Z" }, - { url = "https://files.pythonhosted.org/packages/8d/1e/8a54166a8c5e4f5cb516514bdf4090be4d51a71e8d9f6d98c0aa00fe45d4/pywinpty-3.0.3-cp311-cp311-win_arm64.whl", hash = "sha256:fbc1e230e5b193eef4431cba3f39996a288f9958f9c9f092c8a961d930ee8f68", size = 236191, upload-time = "2026-02-04T21:50:36.239Z" }, - { url = "https://files.pythonhosted.org/packages/7c/d4/aeb5e1784d2c5bff6e189138a9ca91a090117459cea0c30378e1f2db3d54/pywinpty-3.0.3-cp312-cp312-win_amd64.whl", hash = "sha256:c9081df0e49ffa86d15db4a6ba61530630e48707f987df42c9d3313537e81fc0", size = 2113098, upload-time = "2026-02-04T21:54:37.711Z" }, - { url = "https://files.pythonhosted.org/packages/b9/53/7278223c493ccfe4883239cf06c823c56460a8010e0fc778eef67858dc14/pywinpty-3.0.3-cp312-cp312-win_arm64.whl", hash = "sha256:15e79d870e18b678fb8a5a6105fd38496b55697c66e6fc0378236026bc4d59e9", size = 234901, upload-time = "2026-02-04T21:53:31.35Z" }, - { url = "https://files.pythonhosted.org/packages/e5/cb/58d6ed3fd429c96a90ef01ac9a617af10a6d41469219c25e7dc162abbb71/pywinpty-3.0.3-cp313-cp313-win_amd64.whl", hash = "sha256:9c91dbb026050c77bdcef964e63a4f10f01a639113c4d3658332614544c467ab", size = 2112686, upload-time = "2026-02-04T21:52:03.035Z" }, - { url = "https://files.pythonhosted.org/packages/fd/50/724ed5c38c504d4e58a88a072776a1e880d970789deaeb2b9f7bd9a5141a/pywinpty-3.0.3-cp313-cp313-win_arm64.whl", hash = "sha256:fe1f7911805127c94cf51f89ab14096c6f91ffdcacf993d2da6082b2142a2523", size = 234591, upload-time = "2026-02-04T21:52:29.821Z" }, - { url = "https://files.pythonhosted.org/packages/f7/ad/90a110538696b12b39fd8758a06d70ded899308198ad2305ac68e361126e/pywinpty-3.0.3-cp313-cp313t-win_amd64.whl", hash = "sha256:3f07a6cf1c1d470d284e614733c3d0f726d2c85e78508ea10a403140c3c0c18a", size = 2112360, upload-time = "2026-02-04T21:55:33.397Z" }, - { url = "https://files.pythonhosted.org/packages/44/0f/7ffa221757a220402bc79fda44044c3f2cc57338d878ab7d622add6f4581/pywinpty-3.0.3-cp313-cp313t-win_arm64.whl", hash = "sha256:15c7c0b6f8e9d87aabbaff76468dabf6e6121332c40fc1d83548d02a9d6a3759", size = 233107, upload-time = "2026-02-04T21:51:45.455Z" }, { url = "https://files.pythonhosted.org/packages/28/88/2ff917caff61e55f38bcdb27de06ee30597881b2cae44fbba7627be015c4/pywinpty-3.0.3-cp314-cp314-win_amd64.whl", hash = "sha256:d4b6b7b0fe0cdcd02e956bd57cfe9f4e5a06514eecf3b5ae174da4f951b58be9", size = 2113282, upload-time = "2026-02-04T21:52:08.188Z" }, { url = "https://files.pythonhosted.org/packages/63/32/40a775343ace542cc43ece3f1d1fce454021521ecac41c4c4573081c2336/pywinpty-3.0.3-cp314-cp314-win_arm64.whl", hash = "sha256:34789d685fc0d547ce0c8a65e5a70e56f77d732fa6e03c8f74fefb8cbb252019", size = 234207, upload-time = "2026-02-04T21:51:58.687Z" }, { url = "https://files.pythonhosted.org/packages/8d/54/5d5e52f4cb75028104ca6faf36c10f9692389b1986d34471663b4ebebd6d/pywinpty-3.0.3-cp314-cp314t-win_amd64.whl", hash = "sha256:0c37e224a47a971d1a6e08649a1714dac4f63c11920780977829ed5c8cadead1", size = 2112910, upload-time = "2026-02-04T21:52:30.976Z" }, @@ -3742,35 +2673,6 @@ version = "6.0.3" source = { registry = "https://pypi.org/simple" } sdist = { url = "https://files.pythonhosted.org/packages/05/8e/961c0007c59b8dd7729d542c61a4d537767a59645b82a0b521206e1e25c2/pyyaml-6.0.3.tar.gz", hash = "sha256:d76623373421df22fb4cf8817020cbb7ef15c725b9d5e45f17e189bfc384190f", size = 130960, upload-time = "2025-09-25T21:33:16.546Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/6d/16/a95b6757765b7b031c9374925bb718d55e0a9ba8a1b6a12d25962ea44347/pyyaml-6.0.3-cp311-cp311-macosx_10_13_x86_64.whl", hash = "sha256:44edc647873928551a01e7a563d7452ccdebee747728c1080d881d68af7b997e", size = 185826, upload-time = "2025-09-25T21:31:58.655Z" }, - { url = "https://files.pythonhosted.org/packages/16/19/13de8e4377ed53079ee996e1ab0a9c33ec2faf808a4647b7b4c0d46dd239/pyyaml-6.0.3-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:652cb6edd41e718550aad172851962662ff2681490a8a711af6a4d288dd96824", size = 175577, upload-time = "2025-09-25T21:32:00.088Z" }, - { url = "https://files.pythonhosted.org/packages/0c/62/d2eb46264d4b157dae1275b573017abec435397aa59cbcdab6fc978a8af4/pyyaml-6.0.3-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:10892704fc220243f5305762e276552a0395f7beb4dbf9b14ec8fd43b57f126c", size = 775556, upload-time = "2025-09-25T21:32:01.31Z" }, - { url = "https://files.pythonhosted.org/packages/10/cb/16c3f2cf3266edd25aaa00d6c4350381c8b012ed6f5276675b9eba8d9ff4/pyyaml-6.0.3-cp311-cp311-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:850774a7879607d3a6f50d36d04f00ee69e7fc816450e5f7e58d7f17f1ae5c00", size = 882114, upload-time = "2025-09-25T21:32:03.376Z" }, - { url = "https://files.pythonhosted.org/packages/71/60/917329f640924b18ff085ab889a11c763e0b573da888e8404ff486657602/pyyaml-6.0.3-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:b8bb0864c5a28024fac8a632c443c87c5aa6f215c0b126c449ae1a150412f31d", size = 806638, upload-time = "2025-09-25T21:32:04.553Z" }, - { url = "https://files.pythonhosted.org/packages/dd/6f/529b0f316a9fd167281a6c3826b5583e6192dba792dd55e3203d3f8e655a/pyyaml-6.0.3-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:1d37d57ad971609cf3c53ba6a7e365e40660e3be0e5175fa9f2365a379d6095a", size = 767463, upload-time = "2025-09-25T21:32:06.152Z" }, - { url = "https://files.pythonhosted.org/packages/f2/6a/b627b4e0c1dd03718543519ffb2f1deea4a1e6d42fbab8021936a4d22589/pyyaml-6.0.3-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:37503bfbfc9d2c40b344d06b2199cf0e96e97957ab1c1b546fd4f87e53e5d3e4", size = 794986, upload-time = "2025-09-25T21:32:07.367Z" }, - { url = "https://files.pythonhosted.org/packages/45/91/47a6e1c42d9ee337c4839208f30d9f09caa9f720ec7582917b264defc875/pyyaml-6.0.3-cp311-cp311-win32.whl", hash = "sha256:8098f252adfa6c80ab48096053f512f2321f0b998f98150cea9bd23d83e1467b", size = 142543, upload-time = "2025-09-25T21:32:08.95Z" }, - { url = "https://files.pythonhosted.org/packages/da/e3/ea007450a105ae919a72393cb06f122f288ef60bba2dc64b26e2646fa315/pyyaml-6.0.3-cp311-cp311-win_amd64.whl", hash = "sha256:9f3bfb4965eb874431221a3ff3fdcddc7e74e3b07799e0e84ca4a0f867d449bf", size = 158763, upload-time = "2025-09-25T21:32:09.96Z" }, - { url = "https://files.pythonhosted.org/packages/d1/33/422b98d2195232ca1826284a76852ad5a86fe23e31b009c9886b2d0fb8b2/pyyaml-6.0.3-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:7f047e29dcae44602496db43be01ad42fc6f1cc0d8cd6c83d342306c32270196", size = 182063, upload-time = "2025-09-25T21:32:11.445Z" }, - { url = "https://files.pythonhosted.org/packages/89/a0/6cf41a19a1f2f3feab0e9c0b74134aa2ce6849093d5517a0c550fe37a648/pyyaml-6.0.3-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:fc09d0aa354569bc501d4e787133afc08552722d3ab34836a80547331bb5d4a0", size = 173973, upload-time = "2025-09-25T21:32:12.492Z" }, - { url = "https://files.pythonhosted.org/packages/ed/23/7a778b6bd0b9a8039df8b1b1d80e2e2ad78aa04171592c8a5c43a56a6af4/pyyaml-6.0.3-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:9149cad251584d5fb4981be1ecde53a1ca46c891a79788c0df828d2f166bda28", size = 775116, upload-time = "2025-09-25T21:32:13.652Z" }, - { url = "https://files.pythonhosted.org/packages/65/30/d7353c338e12baef4ecc1b09e877c1970bd3382789c159b4f89d6a70dc09/pyyaml-6.0.3-cp312-cp312-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:5fdec68f91a0c6739b380c83b951e2c72ac0197ace422360e6d5a959d8d97b2c", size = 844011, upload-time = "2025-09-25T21:32:15.21Z" }, - { url = "https://files.pythonhosted.org/packages/8b/9d/b3589d3877982d4f2329302ef98a8026e7f4443c765c46cfecc8858c6b4b/pyyaml-6.0.3-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:ba1cc08a7ccde2d2ec775841541641e4548226580ab850948cbfda66a1befcdc", size = 807870, upload-time = "2025-09-25T21:32:16.431Z" }, - { url = "https://files.pythonhosted.org/packages/05/c0/b3be26a015601b822b97d9149ff8cb5ead58c66f981e04fedf4e762f4bd4/pyyaml-6.0.3-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:8dc52c23056b9ddd46818a57b78404882310fb473d63f17b07d5c40421e47f8e", size = 761089, upload-time = "2025-09-25T21:32:17.56Z" }, - { url = "https://files.pythonhosted.org/packages/be/8e/98435a21d1d4b46590d5459a22d88128103f8da4c2d4cb8f14f2a96504e1/pyyaml-6.0.3-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:41715c910c881bc081f1e8872880d3c650acf13dfa8214bad49ed4cede7c34ea", size = 790181, upload-time = "2025-09-25T21:32:18.834Z" }, - { url = "https://files.pythonhosted.org/packages/74/93/7baea19427dcfbe1e5a372d81473250b379f04b1bd3c4c5ff825e2327202/pyyaml-6.0.3-cp312-cp312-win32.whl", hash = "sha256:96b533f0e99f6579b3d4d4995707cf36df9100d67e0c8303a0c55b27b5f99bc5", size = 137658, upload-time = "2025-09-25T21:32:20.209Z" }, - { url = "https://files.pythonhosted.org/packages/86/bf/899e81e4cce32febab4fb42bb97dcdf66bc135272882d1987881a4b519e9/pyyaml-6.0.3-cp312-cp312-win_amd64.whl", hash = "sha256:5fcd34e47f6e0b794d17de1b4ff496c00986e1c83f7ab2fb8fcfe9616ff7477b", size = 154003, upload-time = "2025-09-25T21:32:21.167Z" }, - { url = "https://files.pythonhosted.org/packages/1a/08/67bd04656199bbb51dbed1439b7f27601dfb576fb864099c7ef0c3e55531/pyyaml-6.0.3-cp312-cp312-win_arm64.whl", hash = "sha256:64386e5e707d03a7e172c0701abfb7e10f0fb753ee1d773128192742712a98fd", size = 140344, upload-time = "2025-09-25T21:32:22.617Z" }, - { url = "https://files.pythonhosted.org/packages/d1/11/0fd08f8192109f7169db964b5707a2f1e8b745d4e239b784a5a1dd80d1db/pyyaml-6.0.3-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:8da9669d359f02c0b91ccc01cac4a67f16afec0dac22c2ad09f46bee0697eba8", size = 181669, upload-time = "2025-09-25T21:32:23.673Z" }, - { url = "https://files.pythonhosted.org/packages/b1/16/95309993f1d3748cd644e02e38b75d50cbc0d9561d21f390a76242ce073f/pyyaml-6.0.3-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:2283a07e2c21a2aa78d9c4442724ec1eb15f5e42a723b99cb3d822d48f5f7ad1", size = 173252, upload-time = "2025-09-25T21:32:25.149Z" }, - { url = "https://files.pythonhosted.org/packages/50/31/b20f376d3f810b9b2371e72ef5adb33879b25edb7a6d072cb7ca0c486398/pyyaml-6.0.3-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:ee2922902c45ae8ccada2c5b501ab86c36525b883eff4255313a253a3160861c", size = 767081, upload-time = "2025-09-25T21:32:26.575Z" }, - { url = "https://files.pythonhosted.org/packages/49/1e/a55ca81e949270d5d4432fbbd19dfea5321eda7c41a849d443dc92fd1ff7/pyyaml-6.0.3-cp313-cp313-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:a33284e20b78bd4a18c8c2282d549d10bc8408a2a7ff57653c0cf0b9be0afce5", size = 841159, upload-time = "2025-09-25T21:32:27.727Z" }, - { url = "https://files.pythonhosted.org/packages/74/27/e5b8f34d02d9995b80abcef563ea1f8b56d20134d8f4e5e81733b1feceb2/pyyaml-6.0.3-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:0f29edc409a6392443abf94b9cf89ce99889a1dd5376d94316ae5145dfedd5d6", size = 801626, upload-time = "2025-09-25T21:32:28.878Z" }, - { url = "https://files.pythonhosted.org/packages/f9/11/ba845c23988798f40e52ba45f34849aa8a1f2d4af4b798588010792ebad6/pyyaml-6.0.3-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:f7057c9a337546edc7973c0d3ba84ddcdf0daa14533c2065749c9075001090e6", size = 753613, upload-time = "2025-09-25T21:32:30.178Z" }, - { url = "https://files.pythonhosted.org/packages/3d/e0/7966e1a7bfc0a45bf0a7fb6b98ea03fc9b8d84fa7f2229e9659680b69ee3/pyyaml-6.0.3-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:eda16858a3cab07b80edaf74336ece1f986ba330fdb8ee0d6c0d68fe82bc96be", size = 794115, upload-time = "2025-09-25T21:32:31.353Z" }, - { url = "https://files.pythonhosted.org/packages/de/94/980b50a6531b3019e45ddeada0626d45fa85cbe22300844a7983285bed3b/pyyaml-6.0.3-cp313-cp313-win32.whl", hash = "sha256:d0eae10f8159e8fdad514efdc92d74fd8d682c933a6dd088030f3834bc8e6b26", size = 137427, upload-time = "2025-09-25T21:32:32.58Z" }, - { url = "https://files.pythonhosted.org/packages/97/c9/39d5b874e8b28845e4ec2202b5da735d0199dbe5b8fb85f91398814a9a46/pyyaml-6.0.3-cp313-cp313-win_amd64.whl", hash = "sha256:79005a0d97d5ddabfeeea4cf676af11e647e41d81c9a7722a193022accdb6b7c", size = 154090, upload-time = "2025-09-25T21:32:33.659Z" }, - { url = "https://files.pythonhosted.org/packages/73/e8/2bdf3ca2090f68bb3d75b44da7bbc71843b19c9f2b9cb9b0f4ab7a5a4329/pyyaml-6.0.3-cp313-cp313-win_arm64.whl", hash = "sha256:5498cd1645aa724a7c71c8f378eb29ebe23da2fc0d7a08071d89469bf1d2defb", size = 140246, upload-time = "2025-09-25T21:32:34.663Z" }, { url = "https://files.pythonhosted.org/packages/9d/8c/f4bd7f6465179953d3ac9bc44ac1a8a3e6122cf8ada906b4f96c60172d43/pyyaml-6.0.3-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:8d1fab6bb153a416f9aeb4b8763bc0f22a5586065f86f7664fc23339fc1c1fac", size = 181814, upload-time = "2025-09-25T21:32:35.712Z" }, { url = "https://files.pythonhosted.org/packages/bd/9c/4d95bb87eb2063d20db7b60faa3840c1b18025517ae857371c4dd55a6b3a/pyyaml-6.0.3-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:34d5fcd24b8445fadc33f9cf348c1047101756fd760b4dacb5c3e99755703310", size = 173809, upload-time = "2025-09-25T21:32:36.789Z" }, { url = "https://files.pythonhosted.org/packages/92/b5/47e807c2623074914e29dabd16cbbdd4bf5e9b2db9f8090fa64411fc5382/pyyaml-6.0.3-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:501a031947e3a9025ed4405a168e6ef5ae3126c59f90ce0cd6f2bfc477be31b7", size = 766454, upload-time = "2025-09-25T21:32:37.966Z" }, @@ -3800,16 +2702,6 @@ dependencies = [ ] sdist = { url = "https://files.pythonhosted.org/packages/04/0b/3c9baedbdf613ecaa7aa07027780b8867f57b6293b6ee50de316c9f3222b/pyzmq-27.1.0.tar.gz", hash = "sha256:ac0765e3d44455adb6ddbf4417dcce460fc40a05978c08efdf2948072f6db540", size = 281750, upload-time = "2025-09-08T23:10:18.157Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/06/5d/305323ba86b284e6fcb0d842d6adaa2999035f70f8c38a9b6d21ad28c3d4/pyzmq-27.1.0-cp311-cp311-macosx_10_15_universal2.whl", hash = "sha256:226b091818d461a3bef763805e75685e478ac17e9008f49fce2d3e52b3d58b86", size = 1333328, upload-time = "2025-09-08T23:07:45.946Z" }, - { url = "https://files.pythonhosted.org/packages/bd/a0/fc7e78a23748ad5443ac3275943457e8452da67fda347e05260261108cbc/pyzmq-27.1.0-cp311-cp311-manylinux2014_i686.manylinux_2_17_i686.whl", hash = "sha256:0790a0161c281ca9723f804871b4027f2e8b5a528d357c8952d08cd1a9c15581", size = 908803, upload-time = "2025-09-08T23:07:47.551Z" }, - { url = "https://files.pythonhosted.org/packages/7e/22/37d15eb05f3bdfa4abea6f6d96eb3bb58585fbd3e4e0ded4e743bc650c97/pyzmq-27.1.0-cp311-cp311-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:c895a6f35476b0c3a54e3eb6ccf41bf3018de937016e6e18748317f25d4e925f", size = 668836, upload-time = "2025-09-08T23:07:49.436Z" }, - { url = "https://files.pythonhosted.org/packages/b1/c4/2a6fe5111a01005fc7af3878259ce17684fabb8852815eda6225620f3c59/pyzmq-27.1.0-cp311-cp311-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:5bbf8d3630bf96550b3be8e1fc0fea5cbdc8d5466c1192887bd94869da17a63e", size = 857038, upload-time = "2025-09-08T23:07:51.234Z" }, - { url = "https://files.pythonhosted.org/packages/cb/eb/bfdcb41d0db9cd233d6fb22dc131583774135505ada800ebf14dfb0a7c40/pyzmq-27.1.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:15c8bd0fe0dabf808e2d7a681398c4e5ded70a551ab47482067a572c054c8e2e", size = 1657531, upload-time = "2025-09-08T23:07:52.795Z" }, - { url = "https://files.pythonhosted.org/packages/ab/21/e3180ca269ed4a0de5c34417dfe71a8ae80421198be83ee619a8a485b0c7/pyzmq-27.1.0-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:bafcb3dd171b4ae9f19ee6380dfc71ce0390fefaf26b504c0e5f628d7c8c54f2", size = 2034786, upload-time = "2025-09-08T23:07:55.047Z" }, - { url = "https://files.pythonhosted.org/packages/3b/b1/5e21d0b517434b7f33588ff76c177c5a167858cc38ef740608898cd329f2/pyzmq-27.1.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:e829529fcaa09937189178115c49c504e69289abd39967cd8a4c215761373394", size = 1894220, upload-time = "2025-09-08T23:07:57.172Z" }, - { url = "https://files.pythonhosted.org/packages/03/f2/44913a6ff6941905efc24a1acf3d3cb6146b636c546c7406c38c49c403d4/pyzmq-27.1.0-cp311-cp311-win32.whl", hash = "sha256:6df079c47d5902af6db298ec92151db82ecb557af663098b92f2508c398bb54f", size = 567155, upload-time = "2025-09-08T23:07:59.05Z" }, - { url = "https://files.pythonhosted.org/packages/23/6d/d8d92a0eb270a925c9b4dd039c0b4dc10abc2fcbc48331788824ef113935/pyzmq-27.1.0-cp311-cp311-win_amd64.whl", hash = "sha256:190cbf120fbc0fc4957b56866830def56628934a9d112aec0e2507aa6a032b97", size = 633428, upload-time = "2025-09-08T23:08:00.663Z" }, - { url = "https://files.pythonhosted.org/packages/ae/14/01afebc96c5abbbd713ecfc7469cfb1bc801c819a74ed5c9fad9a48801cb/pyzmq-27.1.0-cp311-cp311-win_arm64.whl", hash = "sha256:eca6b47df11a132d1745eb3b5b5e557a7dae2c303277aa0e69c6ba91b8736e07", size = 559497, upload-time = "2025-09-08T23:08:02.15Z" }, { url = "https://files.pythonhosted.org/packages/92/e7/038aab64a946d535901103da16b953c8c9cc9c961dadcbf3609ed6428d23/pyzmq-27.1.0-cp312-abi3-macosx_10_15_universal2.whl", hash = "sha256:452631b640340c928fa343801b0d07eb0c3789a5ffa843f6e1a9cee0ba4eb4fc", size = 1306279, upload-time = "2025-09-08T23:08:03.807Z" }, { url = "https://files.pythonhosted.org/packages/e8/5e/c3c49fdd0f535ef45eefcc16934648e9e59dace4a37ee88fc53f6cd8e641/pyzmq-27.1.0-cp312-abi3-manylinux2014_i686.manylinux_2_17_i686.whl", hash = "sha256:1c179799b118e554b66da67d88ed66cd37a169f1f23b5d9f0a231b4e8d44a113", size = 895645, upload-time = "2025-09-08T23:08:05.301Z" }, { url = "https://files.pythonhosted.org/packages/f8/e5/b0b2504cb4e903a74dcf1ebae157f9e20ebb6ea76095f6cfffea28c42ecd/pyzmq-27.1.0-cp312-abi3-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:3837439b7f99e60312f0c926a6ad437b067356dc2bc2ec96eb395fd0fe804233", size = 652574, upload-time = "2025-09-08T23:08:06.828Z" }, @@ -3820,18 +2712,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/e6/2f/104c0a3c778d7c2ab8190e9db4f62f0b6957b53c9d87db77c284b69f33ea/pyzmq-27.1.0-cp312-abi3-win32.whl", hash = "sha256:250e5436a4ba13885494412b3da5d518cd0d3a278a1ae640e113c073a5f88edd", size = 559184, upload-time = "2025-09-08T23:08:15.163Z" }, { url = "https://files.pythonhosted.org/packages/fc/7f/a21b20d577e4100c6a41795842028235998a643b1ad406a6d4163ea8f53e/pyzmq-27.1.0-cp312-abi3-win_amd64.whl", hash = "sha256:9ce490cf1d2ca2ad84733aa1d69ce6855372cb5ce9223802450c9b2a7cba0ccf", size = 619480, upload-time = "2025-09-08T23:08:17.192Z" }, { url = "https://files.pythonhosted.org/packages/78/c2/c012beae5f76b72f007a9e91ee9401cb88c51d0f83c6257a03e785c81cc2/pyzmq-27.1.0-cp312-abi3-win_arm64.whl", hash = "sha256:75a2f36223f0d535a0c919e23615fc85a1e23b71f40c7eb43d7b1dedb4d8f15f", size = 552993, upload-time = "2025-09-08T23:08:18.926Z" }, - { url = "https://files.pythonhosted.org/packages/60/cb/84a13459c51da6cec1b7b1dc1a47e6db6da50b77ad7fd9c145842750a011/pyzmq-27.1.0-cp313-cp313-android_24_arm64_v8a.whl", hash = "sha256:93ad4b0855a664229559e45c8d23797ceac03183c7b6f5b4428152a6b06684a5", size = 1122436, upload-time = "2025-09-08T23:08:20.801Z" }, - { url = "https://files.pythonhosted.org/packages/dc/b6/94414759a69a26c3dd674570a81813c46a078767d931a6c70ad29fc585cb/pyzmq-27.1.0-cp313-cp313-android_24_x86_64.whl", hash = "sha256:fbb4f2400bfda24f12f009cba62ad5734148569ff4949b1b6ec3b519444342e6", size = 1156301, upload-time = "2025-09-08T23:08:22.47Z" }, - { url = "https://files.pythonhosted.org/packages/a5/ad/15906493fd40c316377fd8a8f6b1f93104f97a752667763c9b9c1b71d42d/pyzmq-27.1.0-cp313-cp313t-macosx_10_15_universal2.whl", hash = "sha256:e343d067f7b151cfe4eb3bb796a7752c9d369eed007b91231e817071d2c2fec7", size = 1341197, upload-time = "2025-09-08T23:08:24.286Z" }, - { url = "https://files.pythonhosted.org/packages/14/1d/d343f3ce13db53a54cb8946594e567410b2125394dafcc0268d8dda027e0/pyzmq-27.1.0-cp313-cp313t-manylinux2014_i686.manylinux_2_17_i686.whl", hash = "sha256:08363b2011dec81c354d694bdecaef4770e0ae96b9afea70b3f47b973655cc05", size = 897275, upload-time = "2025-09-08T23:08:26.063Z" }, - { url = "https://files.pythonhosted.org/packages/69/2d/d83dd6d7ca929a2fc67d2c3005415cdf322af7751d773524809f9e585129/pyzmq-27.1.0-cp313-cp313t-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:d54530c8c8b5b8ddb3318f481297441af102517602b569146185fa10b63f4fa9", size = 660469, upload-time = "2025-09-08T23:08:27.623Z" }, - { url = "https://files.pythonhosted.org/packages/3e/cd/9822a7af117f4bc0f1952dbe9ef8358eb50a24928efd5edf54210b850259/pyzmq-27.1.0-cp313-cp313t-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:6f3afa12c392f0a44a2414056d730eebc33ec0926aae92b5ad5cf26ebb6cc128", size = 847961, upload-time = "2025-09-08T23:08:29.672Z" }, - { url = "https://files.pythonhosted.org/packages/9a/12/f003e824a19ed73be15542f172fd0ec4ad0b60cf37436652c93b9df7c585/pyzmq-27.1.0-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:c65047adafe573ff023b3187bb93faa583151627bc9c51fc4fb2c561ed689d39", size = 1650282, upload-time = "2025-09-08T23:08:31.349Z" }, - { url = "https://files.pythonhosted.org/packages/d5/4a/e82d788ed58e9a23995cee70dbc20c9aded3d13a92d30d57ec2291f1e8a3/pyzmq-27.1.0-cp313-cp313t-musllinux_1_2_i686.whl", hash = "sha256:90e6e9441c946a8b0a667356f7078d96411391a3b8f80980315455574177ec97", size = 2024468, upload-time = "2025-09-08T23:08:33.543Z" }, - { url = "https://files.pythonhosted.org/packages/d9/94/2da0a60841f757481e402b34bf4c8bf57fa54a5466b965de791b1e6f747d/pyzmq-27.1.0-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:add071b2d25f84e8189aaf0882d39a285b42fa3853016ebab234a5e78c7a43db", size = 1885394, upload-time = "2025-09-08T23:08:35.51Z" }, - { url = "https://files.pythonhosted.org/packages/4f/6f/55c10e2e49ad52d080dc24e37adb215e5b0d64990b57598abc2e3f01725b/pyzmq-27.1.0-cp313-cp313t-win32.whl", hash = "sha256:7ccc0700cfdf7bd487bea8d850ec38f204478681ea02a582a8da8171b7f90a1c", size = 574964, upload-time = "2025-09-08T23:08:37.178Z" }, - { url = "https://files.pythonhosted.org/packages/87/4d/2534970ba63dd7c522d8ca80fb92777f362c0f321900667c615e2067cb29/pyzmq-27.1.0-cp313-cp313t-win_amd64.whl", hash = "sha256:8085a9fba668216b9b4323be338ee5437a235fe275b9d1610e422ccc279733e2", size = 641029, upload-time = "2025-09-08T23:08:40.595Z" }, - { url = "https://files.pythonhosted.org/packages/f6/fa/f8aea7a28b0641f31d40dea42d7ef003fded31e184ef47db696bc74cd610/pyzmq-27.1.0-cp313-cp313t-win_arm64.whl", hash = "sha256:6bb54ca21bcfe361e445256c15eedf083f153811c37be87e0514934d6913061e", size = 561541, upload-time = "2025-09-08T23:08:42.668Z" }, { url = "https://files.pythonhosted.org/packages/87/45/19efbb3000956e82d0331bafca5d9ac19ea2857722fa2caacefb6042f39d/pyzmq-27.1.0-cp314-cp314t-macosx_10_15_universal2.whl", hash = "sha256:ce980af330231615756acd5154f29813d553ea555485ae712c491cd483df6b7a", size = 1341197, upload-time = "2025-09-08T23:08:44.973Z" }, { url = "https://files.pythonhosted.org/packages/48/43/d72ccdbf0d73d1343936296665826350cb1e825f92f2db9db3e61c2162a2/pyzmq-27.1.0-cp314-cp314t-manylinux2014_i686.manylinux_2_17_i686.whl", hash = "sha256:1779be8c549e54a1c38f805e56d2a2e5c009d26de10921d7d51cfd1c8d4632ea", size = 897175, upload-time = "2025-09-08T23:08:46.601Z" }, { url = "https://files.pythonhosted.org/packages/2f/2e/a483f73a10b65a9ef0161e817321d39a770b2acf8bcf3004a28d90d14a94/pyzmq-27.1.0-cp314-cp314t-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:7200bb0f03345515df50d99d3db206a0a6bee1955fbb8c453c76f5bf0e08fb96", size = 660427, upload-time = "2025-09-08T23:08:48.187Z" }, @@ -3842,20 +2722,12 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/c4/59/a5f38970f9bf07cee96128de79590bb354917914a9be11272cfc7ff26af0/pyzmq-27.1.0-cp314-cp314t-win32.whl", hash = "sha256:1f0b2a577fd770aa6f053211a55d1c47901f4d537389a034c690291485e5fe92", size = 587472, upload-time = "2025-09-08T23:08:58.18Z" }, { url = "https://files.pythonhosted.org/packages/70/d8/78b1bad170f93fcf5e3536e70e8fadac55030002275c9a29e8f5719185de/pyzmq-27.1.0-cp314-cp314t-win_amd64.whl", hash = "sha256:19c9468ae0437f8074af379e986c5d3d7d7bfe033506af442e8c879732bedbe0", size = 661401, upload-time = "2025-09-08T23:08:59.802Z" }, { url = "https://files.pythonhosted.org/packages/81/d6/4bfbb40c9a0b42fc53c7cf442f6385db70b40f74a783130c5d0a5aa62228/pyzmq-27.1.0-cp314-cp314t-win_arm64.whl", hash = "sha256:dc5dbf68a7857b59473f7df42650c621d7e8923fb03fa74a526890f4d33cc4d7", size = 575170, upload-time = "2025-09-08T23:09:01.418Z" }, - { url = "https://files.pythonhosted.org/packages/4c/c6/c4dcdecdbaa70969ee1fdced6d7b8f60cfabe64d25361f27ac4665a70620/pyzmq-27.1.0-pp311-pypy311_pp73-macosx_10_15_x86_64.whl", hash = "sha256:18770c8d3563715387139060d37859c02ce40718d1faf299abddcdcc6a649066", size = 836265, upload-time = "2025-09-08T23:09:49.376Z" }, - { url = "https://files.pythonhosted.org/packages/3e/79/f38c92eeaeb03a2ccc2ba9866f0439593bb08c5e3b714ac1d553e5c96e25/pyzmq-27.1.0-pp311-pypy311_pp73-manylinux2014_i686.manylinux_2_17_i686.whl", hash = "sha256:ac25465d42f92e990f8d8b0546b01c391ad431c3bf447683fdc40565941d0604", size = 800208, upload-time = "2025-09-08T23:09:51.073Z" }, - { url = "https://files.pythonhosted.org/packages/49/0e/3f0d0d335c6b3abb9b7b723776d0b21fa7f3a6c819a0db6097059aada160/pyzmq-27.1.0-pp311-pypy311_pp73-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:53b40f8ae006f2734ee7608d59ed661419f087521edbfc2149c3932e9c14808c", size = 567747, upload-time = "2025-09-08T23:09:52.698Z" }, - { url = "https://files.pythonhosted.org/packages/a1/cf/f2b3784d536250ffd4be70e049f3b60981235d70c6e8ce7e3ef21e1adb25/pyzmq-27.1.0-pp311-pypy311_pp73-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:f605d884e7c8be8fe1aa94e0a783bf3f591b84c24e4bc4f3e7564c82ac25e271", size = 747371, upload-time = "2025-09-08T23:09:54.563Z" }, - { url = "https://files.pythonhosted.org/packages/01/1b/5dbe84eefc86f48473947e2f41711aded97eecef1231f4558f1f02713c12/pyzmq-27.1.0-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:c9f7f6e13dff2e44a6afeaf2cf54cee5929ad64afaf4d40b50f93c58fc687355", size = 544862, upload-time = "2025-09-08T23:09:56.509Z" }, ] [[package]] name = "redis" version = "8.0.0" source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "async-timeout", marker = "python_full_version < '3.11.3'" }, -] sdist = { url = "https://files.pythonhosted.org/packages/53/ae/ed461cca5780b5fc8b9fe8ca0ed98d89508645fb9d880c24cc42c087678f/redis-8.0.0.tar.gz", hash = "sha256:a00c5355432051ac14e593b8b197fc76c887ee12d55a0984f69328a1115fdc49", size = 5101591, upload-time = "2026-05-28T12:45:13.5Z" } wheels = [ { url = "https://files.pythonhosted.org/packages/27/e3/b519734372d305bd547534a9f32e4ce9f98552af753dce72cf3483a0ff0b/redis-8.0.0-py3-none-any.whl", hash = "sha256:c938c18338585009f0bc310f4c7e4e4b4d37639356c4ac072cedf3af570c8dc7", size = 499870, upload-time = "2026-05-28T12:45:11.697Z" }, @@ -3868,7 +2740,6 @@ source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "attrs" }, { name = "rpds-py" }, - { name = "typing-extensions", marker = "python_full_version < '3.13'" }, ] sdist = { url = "https://files.pythonhosted.org/packages/22/f5/df4e9027acead3ecc63e50fe1e36aca1523e1719559c499951bb4b53188f/referencing-0.37.0.tar.gz", hash = "sha256:44aefc3142c5b842538163acb373e24cce6632bd54bdb01b21ad5863489f50d8", size = 78036, upload-time = "2025-10-13T15:30:48.871Z" } wheels = [ @@ -3881,70 +2752,6 @@ version = "2026.5.9" source = { registry = "https://pypi.org/simple" } sdist = { url = "https://files.pythonhosted.org/packages/dc/0e/49aee608ad09480e7fd276898c99ec6192985fa331abe4eb3a986094490b/regex-2026.5.9.tar.gz", hash = "sha256:a8234aa23ec39894bfe4a3f1b85616a7032481964a13ac6fc9f10de4f6fca270", size = 416074, upload-time = "2026-05-09T23:15:19.37Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/c2/dc/c1f2df4027e82fc54b5a473e4b250f5139faca49a0fbe29a48668d228f34/regex-2026.5.9-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:ccf5249114cc3e772ecdd88a98a86eca0fd74c61ce32a94743758c083fc05d48", size = 489445, upload-time = "2026-05-09T23:12:06.111Z" }, - { url = "https://files.pythonhosted.org/packages/03/d2/59f01110660081cce9c0bc30ebd0b5ee250dacf658e3248ed92f01e0e8ee/regex-2026.5.9-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:46f1326ca6e65b0879d23ca302c0f2415aad42ff0309b9c818e7949fe19a41d8", size = 291271, upload-time = "2026-05-09T23:12:07.731Z" }, - { url = "https://files.pythonhosted.org/packages/58/b6/14b2c84ff90ddb370c81d27503f4a0fcf071496416f4855f6cc8c5d81c35/regex-2026.5.9-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:ef31cbfe458e21c6122ba8150ff060e0c7789ed0d26eb423f25472584920b555", size = 289212, upload-time = "2026-05-09T23:12:09.266Z" }, - { url = "https://files.pythonhosted.org/packages/03/d0/4db86529117320de0c84afd90e70bb47434625875e34fcef9d8c127c5b16/regex-2026.5.9-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:992604d02e6d9c6d786c24a706a71ecffe1020fc1ef264044474cd81fa2c3919", size = 792310, upload-time = "2026-05-09T23:12:11.416Z" }, - { url = "https://files.pythonhosted.org/packages/07/78/fe4800cd322f862ecffd2d553409b20d80650e5ed71b9d178f853d020b82/regex-2026.5.9-cp311-cp311-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:c9411dd64ca95477225734a93dfc8583b51916b8d5942f99d6cac21e09965451", size = 861721, upload-time = "2026-05-09T23:12:13.681Z" }, - { url = "https://files.pythonhosted.org/packages/b5/d0/b3618a895dd8feb897c61bb2954edd265e1767d82a01d53065d5871127a3/regex-2026.5.9-cp311-cp311-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:3dd4a3ff360dfb836fecdb93a4598f9d6e2ac81e3e397125145c6221bf58cf4c", size = 906460, upload-time = "2026-05-09T23:12:15.443Z" }, - { url = "https://files.pythonhosted.org/packages/33/6f/1481597e859ef19508b345eec4afd1416ed6e6b459c75a64026ef193aecf/regex-2026.5.9-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:2a661a7d270a61f7cf460caee8b9fa2d5ef9e5c681234bcb9e0fe14f488e7dfc", size = 799843, upload-time = "2026-05-09T23:12:16.892Z" }, - { url = "https://files.pythonhosted.org/packages/73/59/955734c803f59108deccba3597ae440c76b62a652733c0006e6243758420/regex-2026.5.9-cp311-cp311-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:f079e50a0d3cc3cd5091fa9ff45869a2e6b2cd35895731edafb0327901a8d86d", size = 773610, upload-time = "2026-05-09T23:12:19.127Z" }, - { url = "https://files.pythonhosted.org/packages/68/8f/70c04a236d651c81881dac42ef8538bddda6121434509d0a22d9e601503b/regex-2026.5.9-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:4ebe8f0b5ec5a5024dc4a4c59f444c4e9afc5f2abdbb8962065b75d27fb971f9", size = 781645, upload-time = "2026-05-09T23:12:20.806Z" }, - { url = "https://files.pythonhosted.org/packages/1d/96/05c7434d88185e5d27fe54aeb74df86bd77cd79f52f0b4eae54faa8fea70/regex-2026.5.9-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:97cf3bc1b7d7d2306772ec07366c80d9df00ff79e79cea32898883a646d2fae2", size = 854473, upload-time = "2026-05-09T23:12:22.465Z" }, - { url = "https://files.pythonhosted.org/packages/4e/c1/6e3d8202d981f3117004bf341ee74893ba4ba8a9fbaf4b94615846550a08/regex-2026.5.9-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:0f9eede6a5cbdc02d4978090186390936e1776a7d1359b21e41014c609880bcf", size = 763311, upload-time = "2026-05-09T23:12:24.351Z" }, - { url = "https://files.pythonhosted.org/packages/93/c7/e7737f1526b3fb32bd4c337fd6c71c3ebb5c8296fc34d11197e0955d2e35/regex-2026.5.9-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:01f0f5f55f4b64dacec85dc116d3c05fd23ad3ff037bbc73a2085775953c2611", size = 844593, upload-time = "2026-05-09T23:12:26.341Z" }, - { url = "https://files.pythonhosted.org/packages/a5/27/0daffb1a535bb39f422c3d200f4ab023c71110ad66a32b366bee708baba0/regex-2026.5.9-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:1268eddd8486dc561d08eee1156e40aa3a8fe10f4bdec8fa653b455fcbffd12c", size = 789167, upload-time = "2026-05-09T23:12:27.975Z" }, - { url = "https://files.pythonhosted.org/packages/ce/fc/294fe4fac4f2ed67207b17471815870c1c45b3a489e08e0ac96daea16ef6/regex-2026.5.9-cp311-cp311-win32.whl", hash = "sha256:8676474c07469d6f33dd1085ca2cd45f65785f32518f2b20e36d9953ca07f994", size = 266249, upload-time = "2026-05-09T23:12:30.141Z" }, - { url = "https://files.pythonhosted.org/packages/d0/b0/8dce459f6245bcf8f6e9f23ac9569f1a0f15c131cc0745e82b43226204cf/regex-2026.5.9-cp311-cp311-win_amd64.whl", hash = "sha256:246de9d60aa3f8538b519834dd95cbf276ea263d6a7bd5a3666dc3fa0230505b", size = 278423, upload-time = "2026-05-09T23:12:31.676Z" }, - { url = "https://files.pythonhosted.org/packages/db/8d/f9aeff6ad63a3ef720386f2907e6d34a35a510a6e498ebad28b0fb3f6ab6/regex-2026.5.9-cp311-cp311-win_arm64.whl", hash = "sha256:d726ca3f0d76969bf1e8e477d160d3d666bbf999f6860bd314889e5345782046", size = 270420, upload-time = "2026-05-09T23:12:33.194Z" }, - { url = "https://files.pythonhosted.org/packages/50/9b/6550044bc44e17c84d312c031c2ec42fbdb6a4ec4e29093be3a172d08772/regex-2026.5.9-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:57eeeb05db7979413dec5438f2db21d7ecbba787cde7a711df1a6f6df672aa06", size = 490451, upload-time = "2026-05-09T23:12:34.72Z" }, - { url = "https://files.pythonhosted.org/packages/1e/95/fc7ba4303b5a0f92446a12ee6778ef2c6c799233f5060042a31bf390cfe9/regex-2026.5.9-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:398c521292f4c7fb807001dcd54694d3a1fcafc179a36ad9cc56f98df85930b6", size = 292112, upload-time = "2026-05-09T23:12:36.285Z" }, - { url = "https://files.pythonhosted.org/packages/54/4b/ee27938d1b2c443e89a9a10e00d2d19aa5ee300cd3d61140644e93bb083e/regex-2026.5.9-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:f7a7c26137296beba7784de6eba69c6a93a63ccebc385e4962fe67e267a91225", size = 289599, upload-time = "2026-05-09T23:12:38.089Z" }, - { url = "https://files.pythonhosted.org/packages/d8/dd/ba103dc19614e25f3880800ca67ce093d6e21b325d72b8383c7bf906e9fa/regex-2026.5.9-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:6441cc660d76107934a09c22167200839a0e89604a6297f78a974e66e931d2c0", size = 796732, upload-time = "2026-05-09T23:12:40.062Z" }, - { url = "https://files.pythonhosted.org/packages/cf/e7/f035b4fd858b050b0080bf302968dc0f59ba34e391872d54936758e6844e/regex-2026.5.9-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:91328f1c23d47595ca3ef0a7557fa129c5a23404b775c770697d2f35b33e0107", size = 865440, upload-time = "2026-05-09T23:12:42.059Z" }, - { url = "https://files.pythonhosted.org/packages/0a/51/8cd301ecc899aea28124357f729f4272f44de7806fc7ca02490bfbe253e8/regex-2026.5.9-cp312-cp312-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:93a7860539414dddaefba2b40f8771765ae17949d4c7182b876ce429e11a8309", size = 912329, upload-time = "2026-05-09T23:12:44.373Z" }, - { url = "https://files.pythonhosted.org/packages/cc/1e/3fbe2fa1e8cebd62f3bb7d3321cff1640aca2e240b51d9bd624aad949260/regex-2026.5.9-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:dd2810d22146b6d838acc5ec15602cb6b47920aa4e33015df3868eedfd20bab8", size = 801239, upload-time = "2026-05-09T23:12:46.268Z" }, - { url = "https://files.pythonhosted.org/packages/17/2f/6f6008682bf2cf98040a0d3153a8e557b6ab728d7713d045cee4ce544ab8/regex-2026.5.9-cp312-cp312-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:daff2bdbaf1d23e52fdff7c0b7bc2048b68f978df6a4d107ac981f94caef2e66", size = 777054, upload-time = "2026-05-09T23:12:48.051Z" }, - { url = "https://files.pythonhosted.org/packages/19/2b/eee0d20a6842ba04df4b8847a920b57ef56853f14ef85405473e586b605a/regex-2026.5.9-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:4eeb011098fcb77af513dcef521a3dbecbf8849b1e38940759d293b7a93f5026", size = 785098, upload-time = "2026-05-09T23:12:49.851Z" }, - { url = "https://files.pythonhosted.org/packages/4a/98/6fc1e6410feefb92159edaed5041992bfe390e8d26c721865434acbca558/regex-2026.5.9-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:ea9c8ecfa1b73c73b626534d6626e5340d429630943672b8480724f44e84b962", size = 860095, upload-time = "2026-05-09T23:12:51.666Z" }, - { url = "https://files.pythonhosted.org/packages/18/a3/bd855e0f2cb1a978ecf6fa6bb69632dd9c3f6ea3b81cde62fde14c9daec7/regex-2026.5.9-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:cd2846168eb9ee3c513902bc8225409cb1caab31d04728b145171fa1625d9621", size = 765762, upload-time = "2026-05-09T23:12:53.413Z" }, - { url = "https://files.pythonhosted.org/packages/dc/66/0ae8c092e60b14c79d24f8e0b7f0aea5bfbffdcab00b5483d13404d3c3a5/regex-2026.5.9-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:39617fb0cde9c0e6306dc70e3bfc096f3da793219879f7ae7aa341a69fbdcf6d", size = 852100, upload-time = "2026-05-09T23:12:55.256Z" }, - { url = "https://files.pythonhosted.org/packages/21/de/8dfde60fc1b21c946a893ba273403b72617edb261370cb1087099a83f088/regex-2026.5.9-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:fd03c4f0e33280d15cae17159b899245d6b7c53d21def19b263b39655061f5ce", size = 789479, upload-time = "2026-05-09T23:12:57.573Z" }, - { url = "https://files.pythonhosted.org/packages/c3/1c/bdcc98f9a4af4fdd166c74941174619ccff4726d3ce32faa8e9a2ecd38dd/regex-2026.5.9-cp312-cp312-win32.whl", hash = "sha256:164eba9b755ea6f244b0d881196fbc1fac09714e9782c9e2732b813142033c8e", size = 266699, upload-time = "2026-05-09T23:12:59.14Z" }, - { url = "https://files.pythonhosted.org/packages/78/87/240d36864f9e48ace85f72e79ced97ceb7f27ce87739a947dcb834b4e6bc/regex-2026.5.9-cp312-cp312-win_amd64.whl", hash = "sha256:86f40a5d6444db30a125c9c9177e6b25dad981cbc37451fd838f145e6edac92e", size = 277783, upload-time = "2026-05-09T23:13:00.789Z" }, - { url = "https://files.pythonhosted.org/packages/4f/b5/7b30f312b0669dff5beebe5b0989dc2d1a312b1a44fab852199c387a5b96/regex-2026.5.9-cp312-cp312-win_arm64.whl", hash = "sha256:96f5f58b54a063d7ea9dca08e1cf57bfe10499c4d579ee672da284f57f5f0070", size = 270513, upload-time = "2026-05-09T23:13:02.426Z" }, - { url = "https://files.pythonhosted.org/packages/aa/da/797e91ecec6f84135da778ddce78c20e0af5d2a15c26f87a81bc3eadb6db/regex-2026.5.9-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:d626b84406444b165fc0ba981604edea39f0588ff1f92baa23fe50799ea9afdb", size = 490303, upload-time = "2026-05-09T23:13:04.382Z" }, - { url = "https://files.pythonhosted.org/packages/44/da/bf30abaaa737b58f4a4b8c4a03659e02fd92092c822e0197ed9e0daab917/regex-2026.5.9-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:d7bdc0ab8f3dd7e1b4f9ab88634e13374669db86bb3c72e8292f07ae313f539f", size = 292019, upload-time = "2026-05-09T23:13:06.022Z" }, - { url = "https://files.pythonhosted.org/packages/2d/e7/d0eaf5713828417b9e5648cf81fa9bacd4961f6ab98c380c2034f8716e35/regex-2026.5.9-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:a8820737949116ffff55fe18f9fc644530063ba6ebfcb8314239416e78f1347c", size = 289468, upload-time = "2026-05-09T23:13:08.214Z" }, - { url = "https://files.pythonhosted.org/packages/d3/9b/b3fdd62b003baa1a9b593cd8c8699c9651c2e80cc21a5c715707983c42d7/regex-2026.5.9-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:aa0fbdbac82cb3e4450d0ccde7d7a35607f4cb2dd9fba4b8b69bfaf8c9fa6aed", size = 796749, upload-time = "2026-05-09T23:13:10.573Z" }, - { url = "https://files.pythonhosted.org/packages/d4/30/66ab84588765f5b4b271a9ca09ef7ce2b87caa95176ec3d2ad65d7bc4902/regex-2026.5.9-cp313-cp313-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:57e8915c7986aa33d25e4d3629cef711cd2863f2961b10409f0c04cb8b7d9020", size = 865445, upload-time = "2026-05-09T23:13:12.523Z" }, - { url = "https://files.pythonhosted.org/packages/1a/89/f05169e8588aac365f35ffc7f3bc3184f095ef4cfded7cfaa3c7fd5dbd89/regex-2026.5.9-cp313-cp313-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:508f56a89ba9cb26e4168cbc37dbd60a28d82430a9e18ad1d25fe0883c314ca2", size = 912322, upload-time = "2026-05-09T23:13:14.281Z" }, - { url = "https://files.pythonhosted.org/packages/30/e1/c93444052cf41581f3c884ab3fb5823daf0992f11cd4388d4275ca610558/regex-2026.5.9-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:b6d189041f15691cfa2b6c4290448ec221244d225b3f5fe9e7771b34ffcdf6e2", size = 801269, upload-time = "2026-05-09T23:13:16.569Z" }, - { url = "https://files.pythonhosted.org/packages/50/fe/0cf96b882f540e62e8b9956599798203d599c44cf4c77917ca27400ff69b/regex-2026.5.9-cp313-cp313-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:e82db382b44d0111b22601c509c89f64434816c9e0eef9d1989cda8cc6ff1c04", size = 777085, upload-time = "2026-05-09T23:13:18.675Z" }, - { url = "https://files.pythonhosted.org/packages/23/5c/d78d4924e7fc875557b9e9b768423925fdfaac5549d06da7810019a9bd26/regex-2026.5.9-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:2acfb48634f64996b57f90f39afa692ff362162722581921fe92239a59960f3c", size = 785153, upload-time = "2026-05-09T23:13:20.525Z" }, - { url = "https://files.pythonhosted.org/packages/bf/e0/5214774090e7b4524dcea3e3c4aa74141d43043f8beb49c1599db1c8b53a/regex-2026.5.9-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:d29eebfc9525db68cad3c97eedd7f754fa265aa5cd0cf4f863b2421e1b48fc9f", size = 860164, upload-time = "2026-05-09T23:13:22.263Z" }, - { url = "https://files.pythonhosted.org/packages/6e/e1/4a57a83350319b1271f0d7a249b8672513ed928b237a741631270de6caea/regex-2026.5.9-cp313-cp313-musllinux_1_2_riscv64.whl", hash = "sha256:debb893095e944091c16e641a6e33c1b0f4cb61ab945ec5afbf53ce7068834d8", size = 765731, upload-time = "2026-05-09T23:13:24.277Z" }, - { url = "https://files.pythonhosted.org/packages/12/f4/499e74a20c156fc75836ee04a72a38d1a063978f600937f9760467beb1b0/regex-2026.5.9-cp313-cp313-musllinux_1_2_s390x.whl", hash = "sha256:d659eee77986549c9ea45b861c7567e44d6287c3dc9a4565478853f7b9fe2ff6", size = 852062, upload-time = "2026-05-09T23:13:26.125Z" }, - { url = "https://files.pythonhosted.org/packages/5b/92/7eebc0d0a01e78629695f342ba17e0deaff8fb45e79cc0d7b98287da6e3e/regex-2026.5.9-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:2efa205e6d98b24d1f3ab395c11aa15cdf10935bca283d0285e0499c284fba21", size = 789577, upload-time = "2026-05-09T23:13:27.814Z" }, - { url = "https://files.pythonhosted.org/packages/05/a4/018e71f7d2ad48c1ebe6d3ae0026f9b7cb4802fd15c7cc02fdf724355102/regex-2026.5.9-cp313-cp313-win32.whl", hash = "sha256:f3844f134e834076677dd369976e9f5068679fcb8e50102fdf6b7ac96a3ec127", size = 266691, upload-time = "2026-05-09T23:13:29.549Z" }, - { url = "https://files.pythonhosted.org/packages/e6/1d/861a93719fb9ee7dbfc3761b3797b7a3e112a5d42c6129459d2d741be9b5/regex-2026.5.9-cp313-cp313-win_amd64.whl", hash = "sha256:3527bb4942d2c14552155406cdedd906567456821848aed1cb4933a391bf5eca", size = 277747, upload-time = "2026-05-09T23:13:31.859Z" }, - { url = "https://files.pythonhosted.org/packages/d9/c6/0a2436ae4da1ba76e51cb98943c6838a9a721faa40ebe2dce07694ae34e3/regex-2026.5.9-cp313-cp313-win_arm64.whl", hash = "sha256:56a33f191f17d8c417f99945ebdc1e691d3af9605d86ec68c7e54a57e3e17af6", size = 270500, upload-time = "2026-05-09T23:13:33.525Z" }, - { url = "https://files.pythonhosted.org/packages/e8/e9/d21346f7b60ed58789371358ed66b09d00f832e1bd7c06e55d9da5679882/regex-2026.5.9-cp313-cp313t-macosx_10_13_universal2.whl", hash = "sha256:01f28d868834624c934b8d2e0aa1c8341337e37831f4a012f18a5afcba4cbaf3", size = 494172, upload-time = "2026-05-09T23:13:35.935Z" }, - { url = "https://files.pythonhosted.org/packages/c4/43/fd1177a2032037c681baecdb3422ee4e1424aec4e4f470ef47793d325274/regex-2026.5.9-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:48036f6374aaa79eb3b754ec29c61d1c6b1606749d705a13f8854fa2539671f6", size = 293952, upload-time = "2026-05-09T23:13:38.307Z" }, - { url = "https://files.pythonhosted.org/packages/f2/7d/9fbf919768368d3f8a4f6c692cf2aa61e482b2b81ec6a298ace4cbf02480/regex-2026.5.9-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:b96350aa424e79d4fd6b567b344dcbe2b2d6bfc48dfe7717587e1fa6d43da6ff", size = 292314, upload-time = "2026-05-09T23:13:40.353Z" }, - { url = "https://files.pythonhosted.org/packages/e2/6c/e41bfeecb589716843e7c4df09ba46ff2a42961457afece19059d85caeef/regex-2026.5.9-cp313-cp313t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:8f3af7a4903c5c04a11a196a5aa75cdd7dd3f8508132f9fb3259d9f5908e3b88", size = 811681, upload-time = "2026-05-09T23:13:42.543Z" }, - { url = "https://files.pythonhosted.org/packages/87/83/a5c1c525fba0aa656e88ad0face0b1829788ef4c2fb6b26df58aa1151b84/regex-2026.5.9-cp313-cp313t-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:7e87577720152d2caae19fe2baaf1f8d5ca12091e9e229f03915c37d1e4b9178", size = 871135, upload-time = "2026-05-09T23:13:44.326Z" }, - { url = "https://files.pythonhosted.org/packages/18/d4/80882e799e440dd878b0979cbebf8fa4d54624a332c83037c7a701649e3f/regex-2026.5.9-cp313-cp313t-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:c8b9b9d294cfea3cd19c718ade7cc93492b2c4991abd9a68d0b3477ae6d8e100", size = 917265, upload-time = "2026-05-09T23:13:47.295Z" }, - { url = "https://files.pythonhosted.org/packages/ae/ff/8db60211e2286e396aad7dc7725356c502bff0901ea05bd6cdc2e1a042b9/regex-2026.5.9-cp313-cp313t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:728d8bfd28a8845c8b6bc5dc7ce010453d206396786c0765c2740cb65f37791e", size = 816311, upload-time = "2026-05-09T23:13:49.885Z" }, - { url = "https://files.pythonhosted.org/packages/4c/47/742ef579c61730f8d268e5cf1f9ce0e37e2ea041ad0f5644724f2378e463/regex-2026.5.9-cp313-cp313t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:7e30b874d341fac767d7df5a0870540541c2c054b80cfaac116e8d367a8a7ff2", size = 785498, upload-time = "2026-05-09T23:13:52.25Z" }, - { url = "https://files.pythonhosted.org/packages/7f/ab/cb0999802dcb0fb95b1ab005e8d4163d8afdd67efc2cb6b6630ac13f8cb1/regex-2026.5.9-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:fd190e88a895a8901325fad284a3f74ea52b1da8525b76cc811fa9b1edf0ce2b", size = 801348, upload-time = "2026-05-09T23:13:54.127Z" }, - { url = "https://files.pythonhosted.org/packages/7d/62/8ca59a24c55bc34d166eefaf3717bd77772f329fdbf984d86581e0a3571c/regex-2026.5.9-cp313-cp313t-musllinux_1_2_ppc64le.whl", hash = "sha256:8e76e8161ad00694cfce6767d5dea860c6391ac5b83e5c3a39661e696f11fc7e", size = 866493, upload-time = "2026-05-09T23:13:56.067Z" }, - { url = "https://files.pythonhosted.org/packages/8d/3d/30f2ae62cef3278bb5bb821f467277a55fb73f01032cf85997e15e8289a8/regex-2026.5.9-cp313-cp313t-musllinux_1_2_riscv64.whl", hash = "sha256:ddda5340e6c01a293027dd46232fa79eaff1b48058ce7a98f572b6445b088041", size = 772811, upload-time = "2026-05-09T23:13:57.867Z" }, - { url = "https://files.pythonhosted.org/packages/d8/ae/7d2089bcd78ad0c0161bc684339df50032acb438a7bd3305e7ddb1193cec/regex-2026.5.9-cp313-cp313t-musllinux_1_2_s390x.whl", hash = "sha256:205109e96b3cf5adf8f4cd62bedde9487feb282b9497a3535451e5a24cd706a0", size = 856584, upload-time = "2026-05-09T23:13:59.679Z" }, - { url = "https://files.pythonhosted.org/packages/a9/29/92ff47f75990131ea4f24ba17819e5a9d141e10819807e09addd73409af6/regex-2026.5.9-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:dfbe4579b9f08036aa7d101d1835437a20783574ac66327e6b29b4018a138081", size = 803453, upload-time = "2026-05-09T23:14:01.978Z" }, - { url = "https://files.pythonhosted.org/packages/04/99/eff29f1037dcab36702c9ee5d6858cf1ce2336ea8ea2987f64245b99ea5e/regex-2026.5.9-cp313-cp313t-win32.whl", hash = "sha256:ed2c9e8068b614c574d8d30e543d617cf5379b0535d46f97ef00e904745a08b5", size = 269951, upload-time = "2026-05-09T23:14:03.661Z" }, - { url = "https://files.pythonhosted.org/packages/0e/9d/8870b8981d27b22cda77bb26a5ac7ebfa9c7d9e0dea195a834a82380e748/regex-2026.5.9-cp313-cp313t-win_amd64.whl", hash = "sha256:b46b0f094dc1d3b90356c85a0bd2c9bafc4a6a190b9d6f8ddd5a033b6e088ed4", size = 281240, upload-time = "2026-05-09T23:14:05.56Z" }, - { url = "https://files.pythonhosted.org/packages/72/b1/3379415e8f135c13ac551353397cc4fe97b4978f3cac73c5fcbcded548b8/regex-2026.5.9-cp313-cp313t-win_arm64.whl", hash = "sha256:872acc074bd29ffc9913ecdfedf6ea77502312ca44a4aa0d3779089c6069d8de", size = 272383, upload-time = "2026-05-09T23:14:07.843Z" }, { url = "https://files.pythonhosted.org/packages/13/3e/9c3cd292d8808b3645a2ce517e200179b6d0e903f176300bd8b542e14de5/regex-2026.5.9-cp314-cp314-macosx_10_13_universal2.whl", hash = "sha256:1bd7587a2948b4085195d5a3374eaf4a425dc3e55784c038175355ecf3bbbf8a", size = 490376, upload-time = "2026-05-09T23:14:09.64Z" }, { url = "https://files.pythonhosted.org/packages/60/70/d43ee8a2ca0a8b68d167f21658b85520ac0574617c7f320367c5047f7556/regex-2026.5.9-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:dea2e88e1cce4522496cce630e11e67b98b7076620bc4336c3f674bc21a375f4", size = 291964, upload-time = "2026-05-09T23:14:11.424Z" }, { url = "https://files.pythonhosted.org/packages/21/91/9d50b433828d8e74196904e168a43abf1e6e88b2a15d47ed742456720c37/regex-2026.5.9-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:2099f7e7ff7b6aa3192312650a56e91cc091e49d50b04e4f6f8b6e28b3b27f1c", size = 289682, upload-time = "2026-05-09T23:14:13.123Z" }, @@ -4033,65 +2840,6 @@ version = "2026.5.1" source = { registry = "https://pypi.org/simple" } sdist = { url = "https://files.pythonhosted.org/packages/2e/43/25a8dcd3feedd735039a8f0b5b7e3b118232b5eae288c4fd9ab200d41094/rpds_py-2026.5.1.tar.gz", hash = "sha256:07b24fea40541e28570e5b795a4a38fbdcd12550c06bd0748005ecc8116ca256", size = 64459, upload-time = "2026-05-28T12:02:13.232Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/4f/a0/acf8b6fc20bfdcd3a45bd3f57680fb198e157b7e997b9123b10763798bd2/rpds_py-2026.5.1-cp311-cp311-macosx_10_12_x86_64.whl", hash = "sha256:3397a5ed7174dc2786bb214030232fc36fe8e5584fec43a9952cc542b1a12036", size = 355609, upload-time = "2026-05-28T11:58:50.78Z" }, - { url = "https://files.pythonhosted.org/packages/b6/95/f8203fd997484b1690a6869cd0e503b6c3c6be55b0ecc36d1a491fe742f0/rpds_py-2026.5.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:99ab6ba7bfa2cb0f96a04e3652355bf04e3f51aceb1e943b8541dab7ba4828cc", size = 348460, upload-time = "2026-05-28T11:58:52.374Z" }, - { url = "https://files.pythonhosted.org/packages/33/8c/b47326ad2f0be545a5e5c1a55937a12afaea7d392ba2837bb9680f57e6c9/rpds_py-2026.5.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d0efbe45632665e53e3db8fe1e5692db58fc5cb9bab4459d570b83efefe11164", size = 381031, upload-time = "2026-05-28T11:58:53.775Z" }, - { url = "https://files.pythonhosted.org/packages/22/0b/e83bbd97ffac6f6389b605cd4e1c8ac5761dc7e977769c9255d8c5adb7bd/rpds_py-2026.5.1-cp311-cp311-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:01d17b29c0c23d82b1f4751147ec49cf451f1fc2554eb9ef5f957e55d2656ead", size = 387121, upload-time = "2026-05-28T11:58:55.243Z" }, - { url = "https://files.pythonhosted.org/packages/fd/0e/d285d1bc8864245919c61e1ca82263e4a66d337759c3a4cef72766ff9afc/rpds_py-2026.5.1-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:7559f72b94ae52659086c595dfa017cde03155f7832071d30959049052cb3ece", size = 501026, upload-time = "2026-05-28T11:58:56.788Z" }, - { url = "https://files.pythonhosted.org/packages/86/06/ccb2109a1e543437b5e43816f2b43b9554cc6783145528a4e3711e05c011/rpds_py-2026.5.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9e25b7088f9ccbfc0dfcaa52bf969300ca229e10ecf758974ebcbb080a4b37bb", size = 391865, upload-time = "2026-05-28T11:58:58.298Z" }, - { url = "https://files.pythonhosted.org/packages/3d/33/237173db1cfef10105b3839a24de00eb8d2a523711add4632447cdf0aedd/rpds_py-2026.5.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:613fc4ee9eaef26dc5840666214dd6fbcebcf32f46e76f4abc473059f4e13dda", size = 378012, upload-time = "2026-05-28T11:58:59.589Z" }, - { url = "https://files.pythonhosted.org/packages/97/64/1eae54e34d5161f9969295e80bd6b62a55f2b6ac5f2a5b60d02c2140e758/rpds_py-2026.5.1-cp311-cp311-manylinux_2_31_riscv64.whl", hash = "sha256:85264a90ff4c05c1568dd65f5921c837614b67c60358fb4c17df3b7f2e90690a", size = 391111, upload-time = "2026-05-28T11:59:01.104Z" }, - { url = "https://files.pythonhosted.org/packages/d8/34/5bb334a5a0f65d77869217c4654f34c78a7d11b93938a3c076a2edeafc52/rpds_py-2026.5.1-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:fe71bca7d547acb17027c7fd1624ff8aae623499c498d3e7011182c4de5c25e0", size = 409225, upload-time = "2026-05-28T11:59:02.433Z" }, - { url = "https://files.pythonhosted.org/packages/16/0f/007ec21283b5b040b4ec3bd95e0402591e22bfa7d5c93dfe01c465c2d2d7/rpds_py-2026.5.1-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:a05fa4f41f37ec97c9c260441a940450a192f78d774d2b097eee1379f1e1246a", size = 556487, upload-time = "2026-05-28T11:59:04.012Z" }, - { url = "https://files.pythonhosted.org/packages/ff/10/5437c94508169b6b22d8418fef7a66e9ffb5f3b9e9c94460f2eedafe06ff/rpds_py-2026.5.1-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:df1d2a1996755b24b9ecee92cb4d36c28f86f464a6a173349c26bab41e94b8c2", size = 620798, upload-time = "2026-05-28T11:59:05.485Z" }, - { url = "https://files.pythonhosted.org/packages/e0/d5/9937dce4d6bda74157b954e7d1460db05a22f5929dccfeeba1ed27a93df0/rpds_py-2026.5.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:8895840ac4809e5f60c88fd07617cd71326e73d6e5a8aa783c5c0f7c24985de2", size = 584053, upload-time = "2026-05-28T11:59:06.837Z" }, - { url = "https://files.pythonhosted.org/packages/6c/31/750617dd0ae1752471bf43f9e41d263398fae7cde7849d23b8574a70e617/rpds_py-2026.5.1-cp311-cp311-win32.whl", hash = "sha256:3684a59b158a7683aaeb8e25352e9a9dd2122cec78f2d8530266e4f91b4c7b3f", size = 214390, upload-time = "2026-05-28T11:59:08.402Z" }, - { url = "https://files.pythonhosted.org/packages/3c/bb/3dcab0e1d9516303f2eb672a5d6f62eca5a69e2886301e9c8c54b520c39b/rpds_py-2026.5.1-cp311-cp311-win_amd64.whl", hash = "sha256:7bd530e6a530bb3ea892f194fafa455f3516ac25ecf7143fd33c09be62b0470a", size = 231097, upload-time = "2026-05-28T11:59:09.786Z" }, - { url = "https://files.pythonhosted.org/packages/49/d6/c6bbf5cb1cf12b9732df8074b57f6ef8341ba884c95d40632ae8bddb44e4/rpds_py-2026.5.1-cp311-cp311-win_arm64.whl", hash = "sha256:0a5ae4dbe43c1076983b72616496919872ae7bbe7a1e21cc48336bc3154d130b", size = 226361, upload-time = "2026-05-28T11:59:11.079Z" }, - { url = "https://files.pythonhosted.org/packages/d4/e7/a78582dc57caa592dcc7d4fb69b61390561e908eb3d2f5df5928a8e354c0/rpds_py-2026.5.1-cp312-cp312-macosx_10_12_x86_64.whl", hash = "sha256:3abe24a66e57adcfa645d718063a5fa5103ecc71ddbf26d78af8f9368018ff1d", size = 353040, upload-time = "2026-05-28T11:59:12.531Z" }, - { url = "https://files.pythonhosted.org/packages/a3/43/35e3f136343aef451e545ce8c38d36c2f93c0ed88703db8b64ba2b205c68/rpds_py-2026.5.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:58b1d94308ddf0b1982f61f2eb54bf92997c9ece8a8093ef014250f4a517906c", size = 345775, upload-time = "2026-05-28T11:59:13.827Z" }, - { url = "https://files.pythonhosted.org/packages/20/e1/0f2160c5982d3157734d5cb3ed63d8b2d583a73c9864f77b666449f32cf8/rpds_py-2026.5.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0fa92420128dadce7f54bd73ba1825a273e9268fe9e35dbf7e6362890efa4e08", size = 376329, upload-time = "2026-05-28T11:59:15.271Z" }, - { url = "https://files.pythonhosted.org/packages/d0/11/ee0ba42aff83bf4effdbc576673c6be64c5e173978c3f6d537e94482f77d/rpds_py-2026.5.1-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:ca653c6546386227cd9800d1bef6a348099acf8db4250341da6d90f663d6dfcb", size = 383539, upload-time = "2026-05-28T11:59:16.665Z" }, - { url = "https://files.pythonhosted.org/packages/11/df/d94aa6a499d4ac40afe2d7620f2c597fd3c0f182e854ad7cf3f596a81cb6/rpds_py-2026.5.1-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:66c93681c4729e4e3ecba31b8179fae083ff3118841672835140338b4b9867c1", size = 494674, upload-time = "2026-05-28T11:59:17.991Z" }, - { url = "https://files.pythonhosted.org/packages/1f/75/33d30f43bb2f458de11979486a591b1bf6e5651765ed1704c6197c2dc773/rpds_py-2026.5.1-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:40ff257542e04796880e011e15cd4dc21c2599975df2aaa8f2c8495ca574e1a5", size = 389268, upload-time = "2026-05-28T11:59:19.434Z" }, - { url = "https://files.pythonhosted.org/packages/f4/1e/2c9096fc19d5fd084b0184ca2b651e659aa0a37e6fdbecf6ece47f147fe1/rpds_py-2026.5.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b6825cc329b290e93c5f6a9be2393118a763f6ccf6abd83704e0c102ca583644", size = 376280, upload-time = "2026-05-28T11:59:21Z" }, - { url = "https://files.pythonhosted.org/packages/b9/e5/61ec9f8be8211ea7f48448195549e4aaf02004083475493b0e137702ecb2/rpds_py-2026.5.1-cp312-cp312-manylinux_2_31_riscv64.whl", hash = "sha256:de42116e69cb53b911cc34aee5ab98f36c597b822545045d49e938818b99e5e4", size = 387233, upload-time = "2026-05-28T11:59:22.454Z" }, - { url = "https://files.pythonhosted.org/packages/0d/ca/bcec1005c4f4a234f92a29078631fee49206c7265ccae966f18fd332e80e/rpds_py-2026.5.1-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:c0f920015df2a504bebaba6d4c31ccf3fcf942f92655c086da30b671aad19aa6", size = 405009, upload-time = "2026-05-28T11:59:23.845Z" }, - { url = "https://files.pythonhosted.org/packages/72/e6/4d5718c5cf26c522dc7c9999e238da1e77380b81d0c5d1df11e271ddfeb1/rpds_py-2026.5.1-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:0408a24e44feb919423dc6d9da677cb5cddb894d2ca9e763967d156d9c60fab4", size = 553113, upload-time = "2026-05-28T11:59:25.184Z" }, - { url = "https://files.pythonhosted.org/packages/d4/25/2ee807bdb3e1f0b7eddf7782acd5665a8b5205a331a7d7244a52c4812fd9/rpds_py-2026.5.1-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:cea68bcd53467561ae2f96a6bdad1544299ba97b5b0ddcd5ac3d376e5c781c24", size = 618838, upload-time = "2026-05-28T11:59:26.749Z" }, - { url = "https://files.pythonhosted.org/packages/6a/c1/7d4c26f167f8c41501cc073d30ee22082b16ce358cf5b00ec97cbc7804ea/rpds_py-2026.5.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:4be8b1d2a705cc37d08256004e1d07de143fa0075c8e85a3df020b776f62b732", size = 582436, upload-time = "2026-05-28T11:59:28.11Z" }, - { url = "https://files.pythonhosted.org/packages/04/1d/9d12b0a337bab46f4769f8857f4007e3b2d639e14f9a44a0efe157696e64/rpds_py-2026.5.1-cp312-cp312-win32.whl", hash = "sha256:6736718bd4fc49cbcb538ba30516fdbef161522acefb739657d48b97bd864fed", size = 212734, upload-time = "2026-05-28T11:59:29.689Z" }, - { url = "https://files.pythonhosted.org/packages/c5/93/e4116f2de7f56bc7406a76033dc501811ddeb22b7f056b92d632871ebb0c/rpds_py-2026.5.1-cp312-cp312-win_amd64.whl", hash = "sha256:0a7d1eec967df0e9b22614a5e177622e0c89611d03727fa0cb48e45028907870", size = 229045, upload-time = "2026-05-28T11:59:31.033Z" }, - { url = "https://files.pythonhosted.org/packages/cb/53/6c3419d85eb2ec5938a37627c585b42d76a63bb731d6e42ed4b079ebf486/rpds_py-2026.5.1-cp312-cp312-win_arm64.whl", hash = "sha256:1841d067089e117142d79b98aa0df2f08b52f2ecc1819dd2700636c0db74a473", size = 223967, upload-time = "2026-05-28T11:59:32.318Z" }, - { url = "https://files.pythonhosted.org/packages/6c/32/14c961ad295f490eb0849ada8b79683e93a59b9de3afdd983eaf55fa6867/rpds_py-2026.5.1-cp313-cp313-macosx_10_12_x86_64.whl", hash = "sha256:efef4ac29c6ff495531eb17ee705b62841ecaa291b7c7077e848ea03e237164d", size = 352787, upload-time = "2026-05-28T11:59:33.655Z" }, - { url = "https://files.pythonhosted.org/packages/ca/bb/d1b85117967c11191441a7274ae616c65d93901d082c588f89a50a8da5ae/rpds_py-2026.5.1-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:c39f5b67a8a2e67179ada2a954227d670fe65fa9098457f698f56ddf248709b3", size = 345179, upload-time = "2026-05-28T11:59:35Z" }, - { url = "https://files.pythonhosted.org/packages/7c/46/d84105f062e626a1b233f863907288a4708c2d833b8b4c6fb2764bc080c0/rpds_py-2026.5.1-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b5c30f3f04eef4fbd362226a6f31d7c8895ca4fbb6e0b790f6890a98d8da8559", size = 376173, upload-time = "2026-05-28T11:59:36.43Z" }, - { url = "https://files.pythonhosted.org/packages/e2/ae/469d7959ce5b1201e1de135dc735b86db3b35dd0d1734f6a44246d5f061c/rpds_py-2026.5.1-cp313-cp313-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:277f6c82f0580848796c7ecc8a7173aa3bfb928e4ff831261c2f60a81dc270db", size = 383162, upload-time = "2026-05-28T11:59:37.995Z" }, - { url = "https://files.pythonhosted.org/packages/dc/a2/57853d31a1116a561aa072794602ad3f6341e18d70a8523f1bd5b9fc1e5a/rpds_py-2026.5.1-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:63c2c4c213f1a4e3f3de28ecab029dbdee976324e729c0d7a55211be72576b02", size = 495093, upload-time = "2026-05-28T11:59:39.453Z" }, - { url = "https://files.pythonhosted.org/packages/99/63/3a8eabcad9314b7daf5c65f451d2c33d989235cd8a5762186cf2c3f5a4f8/rpds_py-2026.5.1-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:3350ec808fb538fe71a1f94dfaa0e29c598dfad805ce49f0caec5ae3183c652b", size = 389829, upload-time = "2026-05-28T11:59:40.896Z" }, - { url = "https://files.pythonhosted.org/packages/4b/25/05678d97fc25e2622df14dc530fb82023174ecfff6733991ed0d78f167bd/rpds_py-2026.5.1-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b1b964e3ab599e718dc46c018d104b1ebc007cbc6567d827c94a687fca56d77e", size = 374786, upload-time = "2026-05-28T11:59:42.626Z" }, - { url = "https://files.pythonhosted.org/packages/88/d1/8c90b6431e80a3b91b284a5c7c8c0c4f9c006444d90477a740d6e0f9c694/rpds_py-2026.5.1-cp313-cp313-manylinux_2_31_riscv64.whl", hash = "sha256:19cb09fab7b7fc96b2a6e28f2e34b72a3705ff27b37edb77455316e5d3f3dc9b", size = 386920, upload-time = "2026-05-28T11:59:44.124Z" }, - { url = "https://files.pythonhosted.org/packages/ff/99/4638f672ab356682d633ee0da9255f5b67ce6efd0b85eb94ad3e255e65a5/rpds_py-2026.5.1-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:abe76bcdba31e576cb83eeb8797aa0d882b738fef6dc65d0601fc753806a5b46", size = 405059, upload-time = "2026-05-28T11:59:47.177Z" }, - { url = "https://files.pythonhosted.org/packages/66/3f/3546524b6eb4cc2e1f363a3d638fa52f6c24faae3500c25fb488b02f1740/rpds_py-2026.5.1-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:8bff7073db3899158fff55ebf57b113a67030af26f80a18978f9f0aa60250ddf", size = 553030, upload-time = "2026-05-28T11:59:48.603Z" }, - { url = "https://files.pythonhosted.org/packages/c6/c3/7b3388c796fcf471bd17194242d4dc1a7608567c0fa422bcc1c5e79f9c1e/rpds_py-2026.5.1-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:8ba264fa49be666cd9cc56bf34ec7002fb3d27a4aee5bcb4d43d0d18feb1bb6f", size = 618975, upload-time = "2026-05-28T11:59:50.314Z" }, - { url = "https://files.pythonhosted.org/packages/61/1e/a3cb07f2795075d1d88efddae2f541359fde5f08c81ee114c29c2949c90a/rpds_py-2026.5.1-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:4860b603ddda0475a8885499b3729e90229d480105b42651962a5397d995fa89", size = 581178, upload-time = "2026-05-28T11:59:51.673Z" }, - { url = "https://files.pythonhosted.org/packages/a1/74/e758c03a5ef46f04c37f2651a2893db846d569ba8a7bca469d4b58939bcd/rpds_py-2026.5.1-cp313-cp313-win32.whl", hash = "sha256:7944270ae71383f6e2657dd7d5ce4eeb4ac2d0059a6738f0510583d462ab4842", size = 212481, upload-time = "2026-05-28T11:59:53.148Z" }, - { url = "https://files.pythonhosted.org/packages/70/ec/a2aca432db9c7359b40fa393eeeaa0d166c2f70175be956e75fa24197c44/rpds_py-2026.5.1-cp313-cp313-win_amd64.whl", hash = "sha256:88647f43a73c4e01be19b04ceef0c8d3a1958153604d13c773becd8016f2a0cf", size = 228519, upload-time = "2026-05-28T11:59:54.505Z" }, - { url = "https://files.pythonhosted.org/packages/29/60/a73bfdd45b096574556acf303bbd9fa9eed36ca8a818b514e2a5d5fe2b9d/rpds_py-2026.5.1-cp313-cp313-win_arm64.whl", hash = "sha256:453895624ecf7db7063b1004e44037522bbaef9ff6a945e59bc71662d7a03abd", size = 223446, upload-time = "2026-05-28T11:59:56.081Z" }, - { url = "https://files.pythonhosted.org/packages/18/e2/408105fd611823f00882aea810f3989a30d26b1bab8b6beb20f98c724e0e/rpds_py-2026.5.1-cp313-cp313t-macosx_10_12_x86_64.whl", hash = "sha256:b4e4bc98639ec915f512fde3aa7a95e0041d95d9c3cc86eea841fa63cb1e8600", size = 355287, upload-time = "2026-05-28T11:59:57.448Z" }, - { url = "https://files.pythonhosted.org/packages/8d/58/5c4a43436843c90d0f6d19f82c200c80e3843ca9fa07b237623327f6d384/rpds_py-2026.5.1-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:cacedb7a6e167680acba45ad5716e89067d225dc80da0d7040cae8c81d4572fa", size = 347033, upload-time = "2026-05-28T11:59:58.881Z" }, - { url = "https://files.pythonhosted.org/packages/fb/c2/1a71acdacaf4e259b10278fb87b039ded3cf80041bcd89dd8a3ea702ded6/rpds_py-2026.5.1-cp313-cp313t-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:68700371c5d7ae1412862ddfa719090925c93ecf351c566d66f09d04b136ea00", size = 376891, upload-time = "2026-05-28T12:00:00.516Z" }, - { url = "https://files.pythonhosted.org/packages/c2/c8/535f3d9b65addd8e28aa87b83c6e526799c3717a88273db8ea795beeef7a/rpds_py-2026.5.1-cp313-cp313t-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:296c799becfa849c779c8725494fe9ed94959ed886787df4364b058465bad7f0", size = 385646, upload-time = "2026-05-28T12:00:02.394Z" }, - { url = "https://files.pythonhosted.org/packages/1c/91/dc033f313345c354ade914dbe73cdb90b615a4409ea02430d5356794f3d8/rpds_py-2026.5.1-cp313-cp313t-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:d3858b908218ee108d0bbfb2095ccc237648053c9bf98affad7cb079acaf1d97", size = 498830, upload-time = "2026-05-28T12:00:04.189Z" }, - { url = "https://files.pythonhosted.org/packages/27/fc/90fcbea459dbb8ddc18a2e0fd1de9412b48bc84ffff2db771cf714bacfd6/rpds_py-2026.5.1-cp313-cp313t-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:4fb8d2e7cb2f850b169806d61d1b991738acec96500a75c30f49caf064ce7cef", size = 392830, upload-time = "2026-05-28T12:00:05.797Z" }, - { url = "https://files.pythonhosted.org/packages/b2/1d/46cd11a228c9750684a798d98f878be6f614aa762438da7378f035e79e35/rpds_py-2026.5.1-cp313-cp313t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:27b74c10ed6a8f190f4287f53bcfea348b92a84a9c9f70d30183d1e6172d580d", size = 379613, upload-time = "2026-05-28T12:00:07.433Z" }, - { url = "https://files.pythonhosted.org/packages/24/4a/d9b0c6af3a1de03eb93741bbe8be2bdce84d8fda8224f3005451d86df389/rpds_py-2026.5.1-cp313-cp313t-manylinux_2_31_riscv64.whl", hash = "sha256:b9a6528956191c48c52294a592dbd4a8386d7048bdb25c0efcb6b966466c6d83", size = 388183, upload-time = "2026-05-28T12:00:09.227Z" }, - { url = "https://files.pythonhosted.org/packages/c5/b4/db7aaabdda6d020afc87d981bcc2f57a434c7dec60ecfc2ab3dd50b20351/rpds_py-2026.5.1-cp313-cp313t-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:af03e34e860047bc7a352b842856fcf78798fbb81132cc98bd2f907ab4eb9cd2", size = 408578, upload-time = "2026-05-28T12:00:10.779Z" }, - { url = "https://files.pythonhosted.org/packages/08/d6/070f6a41cbb343e2ac4171859bf3f3623e0ab002f72619d6d505313ec2de/rpds_py-2026.5.1-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:fea6e836d10abbe191d557d33bd58bd5987725fe63aa1eefe557d230209855bd", size = 553573, upload-time = "2026-05-28T12:00:12.443Z" }, - { url = "https://files.pythonhosted.org/packages/75/ab/1a71ea3589c4345dac0a0518f0e6a031cb42689277851b683c46d27463a5/rpds_py-2026.5.1-cp313-cp313t-musllinux_1_2_i686.whl", hash = "sha256:fc0c0f878ea770a0a8a462456c5ad36fc9fe6358e6b76fdadc7f17575e0b8bf1", size = 620861, upload-time = "2026-05-28T12:00:14.09Z" }, - { url = "https://files.pythonhosted.org/packages/8a/22/9bf80a56069c0c443fcfefac639a86a744550a2898817a6dfd3e26654924/rpds_py-2026.5.1-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:e0b360f316d966b048b085857630b3cc51f3db2f07b06f440eac8f695374d1e3", size = 585633, upload-time = "2026-05-28T12:00:15.66Z" }, - { url = "https://files.pythonhosted.org/packages/da/68/3b2c0a75c9e04125696f84ebdbbf304acf5a40b58ba4481cdb98a922c3ba/rpds_py-2026.5.1-cp313-cp313t-win32.whl", hash = "sha256:a2999883eedf72fdfb7520b92c7d4ec2572a71ff40239377aa604cc529eecafc", size = 210074, upload-time = "2026-05-28T12:00:17.291Z" }, - { url = "https://files.pythonhosted.org/packages/e7/8b/609157d5a25d37d4f29f92840ba531f416907c34ae5c5739dd21fc2bef98/rpds_py-2026.5.1-cp313-cp313t-win_amd64.whl", hash = "sha256:e07be2a9d7122bd6e82dea89814ef8dc893feb1aae97fec1630f3263bbb30e55", size = 228635, upload-time = "2026-05-28T12:00:18.73Z" }, { url = "https://files.pythonhosted.org/packages/d4/6f/19c1918a4b590d8de87e712e4abe4b3875771eff60216fb6153cf6665c68/rpds_py-2026.5.1-cp314-cp314-macosx_10_12_x86_64.whl", hash = "sha256:1f2c391c3059798093b65df23aca2cac150460ae9c630d99dec83d703d9485b9", size = 349756, upload-time = "2026-05-28T12:00:20.217Z" }, { url = "https://files.pythonhosted.org/packages/e5/60/a06fe7da34eca79dacbf958a2ba0c6eea85bc2b29de20080bf40f72f66fa/rpds_py-2026.5.1-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:413b424f7c4ee65ab5e5be91f5731be0f8b41a1ee2b12dfe810d716312e95a78", size = 343831, upload-time = "2026-05-28T12:00:21.711Z" }, { url = "https://files.pythonhosted.org/packages/bf/ec/b2333b97b90e2a6ef6ca8ad386ee284968e74bcfe113b3f1a8d9036429a9/rpds_py-2026.5.1-cp314-cp314-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2c595a1d9255dce0599e13130d1440ab2506654f2b50294226ee06402f8fef63", size = 375127, upload-time = "2026-05-28T12:00:23.326Z" }, @@ -4150,18 +2898,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/77/65/38ab2f90df44c2febfb63cc10ced40763d9b4bc94d173e734528663fe7f5/rpds_py-2026.5.1-cp315-cp315t-musllinux_1_2_x86_64.whl", hash = "sha256:b1be5c35683684d5331b93600c210e8367c254683d8a6df6bd21bd2da3a334fb", size = 581839, upload-time = "2026-05-28T12:01:48.109Z" }, { url = "https://files.pythonhosted.org/packages/15/2d/ce1f605fe036aadd460e5822e578c6c7ec3a860936cca37d6e0f299daa77/rpds_py-2026.5.1-cp315-cp315t-win32.whl", hash = "sha256:75808f6c38ce7749bb68cc2770161aae5045e6c6f6781a9782e74b93304399df", size = 207866, upload-time = "2026-05-28T12:01:49.648Z" }, { url = "https://files.pythonhosted.org/packages/79/cb/966040123eb102371559746908ef2c9471f4d43e17ec9a645a2258dab64b/rpds_py-2026.5.1-cp315-cp315t-win_amd64.whl", hash = "sha256:90bd6630002a1c7f09e7843dd79f0d24f3d2897cc25a753480917865d14f15b3", size = 225441, upload-time = "2026-05-28T12:01:51.408Z" }, - { url = "https://files.pythonhosted.org/packages/42/56/3fe0fb34820ff667be791b3a3c22b85e8bcba54e9c832f47438c191fa7be/rpds_py-2026.5.1-pp311-pypy311_pp73-macosx_10_12_x86_64.whl", hash = "sha256:edf2765d84e42447f112ad877af8fe1db0089aaec5b28e88d6eab45e7fe99cea", size = 357151, upload-time = "2026-05-28T12:01:53.43Z" }, - { url = "https://files.pythonhosted.org/packages/8b/f2/3eb9ccdb9f143b8c9b003978898cb497f942a324c077401e6b8834238e63/rpds_py-2026.5.1-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:ad3773236e95f7f33991eb125224b7da66f206504d032a253a02da7e134519fb", size = 350195, upload-time = "2026-05-28T12:01:54.901Z" }, - { url = "https://files.pythonhosted.org/packages/a7/24/dbda232bc4f3ed732120692ab0d2c8402cb020516556d8bee622dcef2413/rpds_py-2026.5.1-pp311-pypy311_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a04df86b3f0fade39ec8fd0e0aab089b1da9fbd2b48df778a57ef96f5e7d38df", size = 381850, upload-time = "2026-05-28T12:01:56.601Z" }, - { url = "https://files.pythonhosted.org/packages/40/30/32e769839a358f78810c234f160f2cc21d1e4e47e1c0e0e0d535be5a0219/rpds_py-2026.5.1-pp311-pypy311_pp73-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:6142dbd80c4df62a5d899f0d616d417f84e0bc8d32526c8e5589019d75d028a7", size = 387899, upload-time = "2026-05-28T12:01:58.212Z" }, - { url = "https://files.pythonhosted.org/packages/ab/86/ec84d243aadb3b34b71dd26a010d0930b2d284ff5fc9a69fec53810ee6fd/rpds_py-2026.5.1-pp311-pypy311_pp73-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:0b35217adefe87f2fe4db7e9766cabe84744bfe9616d9667be18988928c7f2dc", size = 501618, upload-time = "2026-05-28T12:01:59.888Z" }, - { url = "https://files.pythonhosted.org/packages/74/25/b60e52686bbff777a64f9e4f4d3dd57980dc846913777177a2c92e4937aa/rpds_py-2026.5.1-pp311-pypy311_pp73-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b95d5e11fc712b752081183a55a244c03cd00570489edd7014d8899f8ceb8162", size = 394003, upload-time = "2026-05-28T12:02:01.482Z" }, - { url = "https://files.pythonhosted.org/packages/9b/c7/b3a6a588cc2219510ef3f42e207483a93950bedd1e3a0fd4015c95cff9e5/rpds_py-2026.5.1-pp311-pypy311_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:141c9498daf2ace9eda35d2b0e376f9ea8b058d84f2aef4f96fccfd449a2f251", size = 379778, upload-time = "2026-05-28T12:02:03.197Z" }, - { url = "https://files.pythonhosted.org/packages/31/00/c7dba3fc8a3da8cb3f6db1eb3386be4d79c2e97c6890d20eb9ac66ae8c43/rpds_py-2026.5.1-pp311-pypy311_pp73-manylinux_2_31_riscv64.whl", hash = "sha256:6f249f8b860a200ad35193af961183ebe9132710484e6f6ce0cf89fd83c63a9a", size = 392359, upload-time = "2026-05-28T12:02:04.817Z" }, - { url = "https://files.pythonhosted.org/packages/93/dd/472ba494c70753f93745992c99855bee0636daf74e6984e5e003f150316f/rpds_py-2026.5.1-pp311-pypy311_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:e4abbf391a70be864920858bf360f4fb380577c9a0f732438a1996726e2c195b", size = 412820, upload-time = "2026-05-28T12:02:06.401Z" }, - { url = "https://files.pythonhosted.org/packages/1d/6f/93831a3bfe789542ed0c1d0d74b78b440f055d6dc3ea4640eba2d95e6e23/rpds_py-2026.5.1-pp311-pypy311_pp73-musllinux_1_2_aarch64.whl", hash = "sha256:c74005a7bb87752acf351c93897ec63ad77a07a0da7ecad9c050e32e7286ba34", size = 557243, upload-time = "2026-05-28T12:02:08.013Z" }, - { url = "https://files.pythonhosted.org/packages/1f/ff/0b3d604614ffc77522c6b288fdbce68957eb583da1002aa65ba38ac0ee40/rpds_py-2026.5.1-pp311-pypy311_pp73-musllinux_1_2_i686.whl", hash = "sha256:8213afbe8a3a906fb9acb2014423fe3359ee783d0bf90995f70623a3217bfa6c", size = 623541, upload-time = "2026-05-28T12:02:09.661Z" }, - { url = "https://files.pythonhosted.org/packages/ea/ea/e7b0251441da9adfeaebcf29601d10f2a1455fcf0772fae9e7e19032bd96/rpds_py-2026.5.1-pp311-pypy311_pp73-musllinux_1_2_x86_64.whl", hash = "sha256:8c43a8a973270fd173bf48cdf80bbe66312421cba68d40845034f174f2389049", size = 586326, upload-time = "2026-05-28T12:02:11.47Z" }, ] [[package]] @@ -4201,6 +2937,31 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/b8/0c/51f6841f1d84f404f92463fc2b1ba0da357ca1e3db6b7fbda26956c3b82a/ruamel_yaml-0.19.1-py3-none-any.whl", hash = "sha256:27592957fedf6e0b62f281e96effd28043345e0e66001f97683aa9a40c667c93", size = 118102, upload-time = "2026-01-02T16:50:29.201Z" }, ] +[[package]] +name = "ruff" +version = "0.15.15" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/84/6f/a76f7d96e5c962f5b69cee865e49c15c1116897c01990faa8a57edb62e7f/ruff-0.15.15.tar.gz", hash = "sha256:b8dff018130b46d8e5bf0f926ef6b60cf871d6d5ae45fc9334e09632daa741d6", size = 4706985, upload-time = "2026-05-28T14:16:57.784Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/fa/9d/3a45c05b8ab04b4705989de70a79008e27c8003296a0feaee9edc18dd7e9/ruff-0.15.15-py3-none-linux_armv6l.whl", hash = "sha256:cf93e5388f412e1b108b1f8b34a6e036b70fe8aff89393befad96fe48670311b", size = 10710652, upload-time = "2026-05-28T14:16:06.701Z" }, + { url = "https://files.pythonhosted.org/packages/05/66/da974431624bf3b49f6ee1f9543c02d929ff1cba78b0d5a79c38cf21f744/ruff-0.15.15-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:ac5a646d1f6a7dadd5d50842dae2c1f9862ac887ef5d1b1375e02def791fde6e", size = 11096615, upload-time = "2026-05-28T14:16:23.313Z" }, + { url = "https://files.pythonhosted.org/packages/8c/09/7443452e5d290230a712103f2fdceeef7184f3ec99a2bd01c8be78aaceb5/ruff-0.15.15-py3-none-macosx_11_0_arm64.whl", hash = "sha256:77d955a431430c66f72dd94e379ad38a16daea3d25094872ac4edf9e797be530", size = 10436683, upload-time = "2026-05-28T14:16:40.974Z" }, + { url = "https://files.pythonhosted.org/packages/53/01/d330c26a57fa4f3943a14424904027428315b700fe4d14a84bb123a649e5/ruff-0.15.15-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7614ee79c69788cf6cedd568069ade9cecc22a1ad20494efe8d0c9ebb4b622d4", size = 10769064, upload-time = "2026-05-28T14:16:28.905Z" }, + { url = "https://files.pythonhosted.org/packages/1d/85/cc8770f8bdff541b1da8392d1634141fe4a0e3f4ee596605959b7906c27f/ruff-0.15.15-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:3cdb1679e06a1f6b47bc384714ae96f6e2fb65ca441eb78c43d2ca554176ce1f", size = 10511987, upload-time = "2026-05-28T14:16:43.732Z" }, + { url = "https://files.pythonhosted.org/packages/7c/29/8c190c1472b63013583ba391f3342036e02010544c1270455ed8e519bdf3/ruff-0.15.15-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2728b93d7b23a603ea2c0ac6eb73d760bd38ec9de35f35fb41e18f7a3fee7622", size = 11275100, upload-time = "2026-05-28T14:16:55.244Z" }, + { url = "https://files.pythonhosted.org/packages/9f/6b/7e145ce2cc8e63d6834eca03d83a0e18d121def5c69f91b4cf4011ed4879/ruff-0.15.15-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:be582fcc0db438902c7792b08d6ddf6c9b9e21addaa10092c2c741cfb09e5a45", size = 12176903, upload-time = "2026-05-28T14:16:14.368Z" }, + { url = "https://files.pythonhosted.org/packages/80/a3/d5974637f68e451f7fadf015cf3101d1cd7d8ba5027cffe0b9e3826ebe6b/ruff-0.15.15-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:7aa77465b8ecaf1a27bea098d696f7fed5e1eccbd10b321b682d6de586ae5627", size = 11404550, upload-time = "2026-05-28T14:16:20.138Z" }, + { url = "https://files.pythonhosted.org/packages/fe/1c/e6e5e568f22be4fb05d6244234aba384c06b451252453b821e1a529263cf/ruff-0.15.15-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:48decfa11d740de4889de623be1463308346312f2409a56e24aa280c86162dc4", size = 11382027, upload-time = "2026-05-28T14:16:46.615Z" }, + { url = "https://files.pythonhosted.org/packages/1d/01/170921b49fcd2e8858825593f91cf7146c3e40a5c3e6df763e4bb0484dde/ruff-0.15.15-py3-none-manylinux_2_31_riscv64.whl", hash = "sha256:a5015088452ca0081387063649ec67f06d3d1d6b8b936a1f836b5e9657ecd48c", size = 11366041, upload-time = "2026-05-28T14:16:26.247Z" }, + { url = "https://files.pythonhosted.org/packages/87/54/a7bad711d7de93254e15e06a4c375b89a03d18de45d3e5dcc86a4472fb1a/ruff-0.15.15-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:f5294aab6356c81600fcdea3a62bb1b924dfd5e91767c12318d3f68f86af57cd", size = 10741795, upload-time = "2026-05-28T14:16:17.11Z" }, + { url = "https://files.pythonhosted.org/packages/c9/31/38c075963668f8b41c6914ee0f6f318727fbe30ab9145cb29e6df464c5fa/ruff-0.15.15-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:db5bd4d802415cca656dc1616070b725952d6ae95eb5d4831e49fbd94a38f75f", size = 10511117, upload-time = "2026-05-28T14:16:31.767Z" }, + { url = "https://files.pythonhosted.org/packages/9d/96/6ff689e1f7e375d1d97075eca022f74c2bab59554a432fe4d2e6f091986a/ruff-0.15.15-py3-none-musllinux_1_2_i686.whl", hash = "sha256:587a6278ed42059191c1a466e490bd7930fb50bd2e255398bc29616c895a61cb", size = 10994867, upload-time = "2026-05-28T14:16:35.149Z" }, + { url = "https://files.pythonhosted.org/packages/c3/c2/5dce0ab9f92a8d534fa62b9bf9caca3eddb8c1a81b616f5e195ada4f0d6e/ruff-0.15.15-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:df0c1c084f5f4be9812f61518a45c440d3c30d69ce4bf6c5270e66d38338f02a", size = 11482101, upload-time = "2026-05-28T14:16:49.598Z" }, + { url = "https://files.pythonhosted.org/packages/b1/c0/1003b60edd697c649faf61f1a34094b1abb38fb3d1181e3f895781250a08/ruff-0.15.15-py3-none-win32.whl", hash = "sha256:29428ea79694afbe756d45fd59b36f22b6b020dc0443cf7de0173046236964b9", size = 10716774, upload-time = "2026-05-28T14:16:52.337Z" }, + { url = "https://files.pythonhosted.org/packages/02/a8/1269eddd6945a06c23f055ef7848886e37cf9d6a8bebb386a3115f01470c/ruff-0.15.15-py3-none-win_amd64.whl", hash = "sha256:8df0323902e15e24bc4bf246da830573d3cf3352bd0b9a164eab335d111ff4a4", size = 11868463, upload-time = "2026-05-28T14:16:11.333Z" }, + { url = "https://files.pythonhosted.org/packages/4e/b2/920464c907b191e37469d477a1aa8bc048b8f36c4c1610dfa4ab87b39e18/ruff-0.15.15-py3-none-win_arm64.whl", hash = "sha256:3c8ceca6792f38196b8f589bc92eccd03eef286602da92e5dc05cc42ef6441b7", size = 11138498, upload-time = "2026-05-28T14:16:38.425Z" }, +] + [[package]] name = "s3transfer" version = "0.17.1" @@ -4222,46 +2983,6 @@ dependencies = [ ] sdist = { url = "https://files.pythonhosted.org/packages/7a/97/5a3609c4f8d58b039179648e62dd220f89864f56f7357f5d4f45c29eb2cc/scipy-1.17.1.tar.gz", hash = "sha256:95d8e012d8cb8816c226aef832200b1d45109ed4464303e997c5b13122b297c0", size = 30573822, upload-time = "2026-02-23T00:26:24.851Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/df/75/b4ce781849931fef6fd529afa6b63711d5a733065722d0c3e2724af9e40a/scipy-1.17.1-cp311-cp311-macosx_10_14_x86_64.whl", hash = "sha256:1f95b894f13729334fb990162e911c9e5dc1ab390c58aa6cbecb389c5b5e28ec", size = 31613675, upload-time = "2026-02-23T00:16:00.13Z" }, - { url = "https://files.pythonhosted.org/packages/f7/58/bccc2861b305abdd1b8663d6130c0b3d7cc22e8d86663edbc8401bfd40d4/scipy-1.17.1-cp311-cp311-macosx_12_0_arm64.whl", hash = "sha256:e18f12c6b0bc5a592ed23d3f7b891f68fd7f8241d69b7883769eb5d5dfb52696", size = 28162057, upload-time = "2026-02-23T00:16:09.456Z" }, - { url = "https://files.pythonhosted.org/packages/6d/ee/18146b7757ed4976276b9c9819108adbc73c5aad636e5353e20746b73069/scipy-1.17.1-cp311-cp311-macosx_14_0_arm64.whl", hash = "sha256:a3472cfbca0a54177d0faa68f697d8ba4c80bbdc19908c3465556d9f7efce9ee", size = 20334032, upload-time = "2026-02-23T00:16:17.358Z" }, - { url = "https://files.pythonhosted.org/packages/ec/e6/cef1cf3557f0c54954198554a10016b6a03b2ec9e22a4e1df734936bd99c/scipy-1.17.1-cp311-cp311-macosx_14_0_x86_64.whl", hash = "sha256:766e0dc5a616d026a3a1cffa379af959671729083882f50307e18175797b3dfd", size = 22709533, upload-time = "2026-02-23T00:16:25.791Z" }, - { url = "https://files.pythonhosted.org/packages/4d/60/8804678875fc59362b0fb759ab3ecce1f09c10a735680318ac30da8cd76b/scipy-1.17.1-cp311-cp311-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:744b2bf3640d907b79f3fd7874efe432d1cf171ee721243e350f55234b4cec4c", size = 33062057, upload-time = "2026-02-23T00:16:36.931Z" }, - { url = "https://files.pythonhosted.org/packages/09/7d/af933f0f6e0767995b4e2d705a0665e454d1c19402aa7e895de3951ebb04/scipy-1.17.1-cp311-cp311-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:43af8d1f3bea642559019edfe64e9b11192a8978efbd1539d7bc2aaa23d92de4", size = 35349300, upload-time = "2026-02-23T00:16:49.108Z" }, - { url = "https://files.pythonhosted.org/packages/b4/3d/7ccbbdcbb54c8fdc20d3b6930137c782a163fa626f0aef920349873421ba/scipy-1.17.1-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:cd96a1898c0a47be4520327e01f874acfd61fb48a9420f8aa9f6483412ffa444", size = 35127333, upload-time = "2026-02-23T00:17:01.293Z" }, - { url = "https://files.pythonhosted.org/packages/e8/19/f926cb11c42b15ba08e3a71e376d816ac08614f769b4f47e06c3580c836a/scipy-1.17.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:4eb6c25dd62ee8d5edf68a8e1c171dd71c292fdae95d8aeb3dd7d7de4c364082", size = 37741314, upload-time = "2026-02-23T00:17:12.576Z" }, - { url = "https://files.pythonhosted.org/packages/95/da/0d1df507cf574b3f224ccc3d45244c9a1d732c81dcb26b1e8a766ae271a8/scipy-1.17.1-cp311-cp311-win_amd64.whl", hash = "sha256:d30e57c72013c2a4fe441c2fcb8e77b14e152ad48b5464858e07e2ad9fbfceff", size = 36607512, upload-time = "2026-02-23T00:17:23.424Z" }, - { url = "https://files.pythonhosted.org/packages/68/7f/bdd79ceaad24b671543ffe0ef61ed8e659440eb683b66f033454dcee90eb/scipy-1.17.1-cp311-cp311-win_arm64.whl", hash = "sha256:9ecb4efb1cd6e8c4afea0daa91a87fbddbce1b99d2895d151596716c0b2e859d", size = 24599248, upload-time = "2026-02-23T00:17:34.561Z" }, - { url = "https://files.pythonhosted.org/packages/35/48/b992b488d6f299dbe3f11a20b24d3dda3d46f1a635ede1c46b5b17a7b163/scipy-1.17.1-cp312-cp312-macosx_10_14_x86_64.whl", hash = "sha256:35c3a56d2ef83efc372eaec584314bd0ef2e2f0d2adb21c55e6ad5b344c0dcb8", size = 31610954, upload-time = "2026-02-23T00:17:49.855Z" }, - { url = "https://files.pythonhosted.org/packages/b2/02/cf107b01494c19dc100f1d0b7ac3cc08666e96ba2d64db7626066cee895e/scipy-1.17.1-cp312-cp312-macosx_12_0_arm64.whl", hash = "sha256:fcb310ddb270a06114bb64bbe53c94926b943f5b7f0842194d585c65eb4edd76", size = 28172662, upload-time = "2026-02-23T00:18:01.64Z" }, - { url = "https://files.pythonhosted.org/packages/cf/a9/599c28631bad314d219cf9ffd40e985b24d603fc8a2f4ccc5ae8419a535b/scipy-1.17.1-cp312-cp312-macosx_14_0_arm64.whl", hash = "sha256:cc90d2e9c7e5c7f1a482c9875007c095c3194b1cfedca3c2f3291cdc2bc7c086", size = 20344366, upload-time = "2026-02-23T00:18:12.015Z" }, - { url = "https://files.pythonhosted.org/packages/35/f5/906eda513271c8deb5af284e5ef0206d17a96239af79f9fa0aebfe0e36b4/scipy-1.17.1-cp312-cp312-macosx_14_0_x86_64.whl", hash = "sha256:c80be5ede8f3f8eded4eff73cc99a25c388ce98e555b17d31da05287015ffa5b", size = 22704017, upload-time = "2026-02-23T00:18:21.502Z" }, - { url = "https://files.pythonhosted.org/packages/da/34/16f10e3042d2f1d6b66e0428308ab52224b6a23049cb2f5c1756f713815f/scipy-1.17.1-cp312-cp312-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:e19ebea31758fac5893a2ac360fedd00116cbb7628e650842a6691ba7ca28a21", size = 32927842, upload-time = "2026-02-23T00:18:35.367Z" }, - { url = "https://files.pythonhosted.org/packages/01/8e/1e35281b8ab6d5d72ebe9911edcdffa3f36b04ed9d51dec6dd140396e220/scipy-1.17.1-cp312-cp312-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:02ae3b274fde71c5e92ac4d54bc06c42d80e399fec704383dcd99b301df37458", size = 35235890, upload-time = "2026-02-23T00:18:49.188Z" }, - { url = "https://files.pythonhosted.org/packages/c5/5c/9d7f4c88bea6e0d5a4f1bc0506a53a00e9fcb198de372bfe4d3652cef482/scipy-1.17.1-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:8a604bae87c6195d8b1045eddece0514d041604b14f2727bbc2b3020172045eb", size = 35003557, upload-time = "2026-02-23T00:18:54.74Z" }, - { url = "https://files.pythonhosted.org/packages/65/94/7698add8f276dbab7a9de9fb6b0e02fc13ee61d51c7c3f85ac28b65e1239/scipy-1.17.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:f590cd684941912d10becc07325a3eeb77886fe981415660d9265c4c418d0bea", size = 37625856, upload-time = "2026-02-23T00:19:00.307Z" }, - { url = "https://files.pythonhosted.org/packages/a2/84/dc08d77fbf3d87d3ee27f6a0c6dcce1de5829a64f2eae85a0ecc1f0daa73/scipy-1.17.1-cp312-cp312-win_amd64.whl", hash = "sha256:41b71f4a3a4cab9d366cd9065b288efc4d4f3c0b37a91a8e0947fb5bd7f31d87", size = 36549682, upload-time = "2026-02-23T00:19:07.67Z" }, - { url = "https://files.pythonhosted.org/packages/bc/98/fe9ae9ffb3b54b62559f52dedaebe204b408db8109a8c66fdd04869e6424/scipy-1.17.1-cp312-cp312-win_arm64.whl", hash = "sha256:f4115102802df98b2b0db3cce5cb9b92572633a1197c77b7553e5203f284a5b3", size = 24547340, upload-time = "2026-02-23T00:19:12.024Z" }, - { url = "https://files.pythonhosted.org/packages/76/27/07ee1b57b65e92645f219b37148a7e7928b82e2b5dbeccecb4dff7c64f0b/scipy-1.17.1-cp313-cp313-macosx_10_14_x86_64.whl", hash = "sha256:5e3c5c011904115f88a39308379c17f91546f77c1667cea98739fe0fccea804c", size = 31590199, upload-time = "2026-02-23T00:19:17.192Z" }, - { url = "https://files.pythonhosted.org/packages/ec/ae/db19f8ab842e9b724bf5dbb7db29302a91f1e55bc4d04b1025d6d605a2c5/scipy-1.17.1-cp313-cp313-macosx_12_0_arm64.whl", hash = "sha256:6fac755ca3d2c3edcb22f479fceaa241704111414831ddd3bc6056e18516892f", size = 28154001, upload-time = "2026-02-23T00:19:22.241Z" }, - { url = "https://files.pythonhosted.org/packages/5b/58/3ce96251560107b381cbd6e8413c483bbb1228a6b919fa8652b0d4090e7f/scipy-1.17.1-cp313-cp313-macosx_14_0_arm64.whl", hash = "sha256:7ff200bf9d24f2e4d5dc6ee8c3ac64d739d3a89e2326ba68aaf6c4a2b838fd7d", size = 20325719, upload-time = "2026-02-23T00:19:26.329Z" }, - { url = "https://files.pythonhosted.org/packages/b2/83/15087d945e0e4d48ce2377498abf5ad171ae013232ae31d06f336e64c999/scipy-1.17.1-cp313-cp313-macosx_14_0_x86_64.whl", hash = "sha256:4b400bdc6f79fa02a4d86640310dde87a21fba0c979efff5248908c6f15fad1b", size = 22683595, upload-time = "2026-02-23T00:19:30.304Z" }, - { url = "https://files.pythonhosted.org/packages/b4/e0/e58fbde4a1a594c8be8114eb4aac1a55bcd6587047efc18a61eb1f5c0d30/scipy-1.17.1-cp313-cp313-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:2b64ca7d4aee0102a97f3ba22124052b4bd2152522355073580bf4845e2550b6", size = 32896429, upload-time = "2026-02-23T00:19:35.536Z" }, - { url = "https://files.pythonhosted.org/packages/f5/5f/f17563f28ff03c7b6799c50d01d5d856a1d55f2676f537ca8d28c7f627cd/scipy-1.17.1-cp313-cp313-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:581b2264fc0aa555f3f435a5944da7504ea3a065d7029ad60e7c3d1ae09c5464", size = 35203952, upload-time = "2026-02-23T00:19:42.259Z" }, - { url = "https://files.pythonhosted.org/packages/8d/a5/9afd17de24f657fdfe4df9a3f1ea049b39aef7c06000c13db1530d81ccca/scipy-1.17.1-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:beeda3d4ae615106d7094f7e7cef6218392e4465cc95d25f900bebabfded0950", size = 34979063, upload-time = "2026-02-23T00:19:47.547Z" }, - { url = "https://files.pythonhosted.org/packages/8b/13/88b1d2384b424bf7c924f2038c1c409f8d88bb2a8d49d097861dd64a57b2/scipy-1.17.1-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:6609bc224e9568f65064cfa72edc0f24ee6655b47575954ec6339534b2798369", size = 37598449, upload-time = "2026-02-23T00:19:53.238Z" }, - { url = "https://files.pythonhosted.org/packages/35/e5/d6d0e51fc888f692a35134336866341c08655d92614f492c6860dc45bb2c/scipy-1.17.1-cp313-cp313-win_amd64.whl", hash = "sha256:37425bc9175607b0268f493d79a292c39f9d001a357bebb6b88fdfaff13f6448", size = 36510943, upload-time = "2026-02-23T00:20:50.89Z" }, - { url = "https://files.pythonhosted.org/packages/2a/fd/3be73c564e2a01e690e19cc618811540ba5354c67c8680dce3281123fb79/scipy-1.17.1-cp313-cp313-win_arm64.whl", hash = "sha256:5cf36e801231b6a2059bf354720274b7558746f3b1a4efb43fcf557ccd484a87", size = 24545621, upload-time = "2026-02-23T00:20:55.871Z" }, - { url = "https://files.pythonhosted.org/packages/6f/6b/17787db8b8114933a66f9dcc479a8272e4b4da75fe03b0c282f7b0ade8cd/scipy-1.17.1-cp313-cp313t-macosx_10_14_x86_64.whl", hash = "sha256:d59c30000a16d8edc7e64152e30220bfbd724c9bbb08368c054e24c651314f0a", size = 31936708, upload-time = "2026-02-23T00:19:58.694Z" }, - { url = "https://files.pythonhosted.org/packages/38/2e/524405c2b6392765ab1e2b722a41d5da33dc5c7b7278184a8ad29b6cb206/scipy-1.17.1-cp313-cp313t-macosx_12_0_arm64.whl", hash = "sha256:010f4333c96c9bb1a4516269e33cb5917b08ef2166d5556ca2fd9f082a9e6ea0", size = 28570135, upload-time = "2026-02-23T00:20:03.934Z" }, - { url = "https://files.pythonhosted.org/packages/fd/c3/5bd7199f4ea8556c0c8e39f04ccb014ac37d1468e6cfa6a95c6b3562b76e/scipy-1.17.1-cp313-cp313t-macosx_14_0_arm64.whl", hash = "sha256:2ceb2d3e01c5f1d83c4189737a42d9cb2fc38a6eeed225e7515eef71ad301dce", size = 20741977, upload-time = "2026-02-23T00:20:07.935Z" }, - { url = "https://files.pythonhosted.org/packages/d9/b8/8ccd9b766ad14c78386599708eb745f6b44f08400a5fd0ade7cf89b6fc93/scipy-1.17.1-cp313-cp313t-macosx_14_0_x86_64.whl", hash = "sha256:844e165636711ef41f80b4103ed234181646b98a53c8f05da12ca5ca289134f6", size = 23029601, upload-time = "2026-02-23T00:20:12.161Z" }, - { url = "https://files.pythonhosted.org/packages/6d/a0/3cb6f4d2fb3e17428ad2880333cac878909ad1a89f678527b5328b93c1d4/scipy-1.17.1-cp313-cp313t-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:158dd96d2207e21c966063e1635b1063cd7787b627b6f07305315dd73d9c679e", size = 33019667, upload-time = "2026-02-23T00:20:17.208Z" }, - { url = "https://files.pythonhosted.org/packages/f3/c3/2d834a5ac7bf3a0c806ad1508efc02dda3c8c61472a56132d7894c312dea/scipy-1.17.1-cp313-cp313t-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:74cbb80d93260fe2ffa334efa24cb8f2f0f622a9b9febf8b483c0b865bfb3475", size = 35264159, upload-time = "2026-02-23T00:20:23.087Z" }, - { url = "https://files.pythonhosted.org/packages/4d/77/d3ed4becfdbd217c52062fafe35a72388d1bd82c2d0ba5ca19d6fcc93e11/scipy-1.17.1-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:dbc12c9f3d185f5c737d801da555fb74b3dcfa1a50b66a1a93e09190f41fab50", size = 35102771, upload-time = "2026-02-23T00:20:28.636Z" }, - { url = "https://files.pythonhosted.org/packages/bd/12/d19da97efde68ca1ee5538bb261d5d2c062f0c055575128f11a2730e3ac1/scipy-1.17.1-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:94055a11dfebe37c656e70317e1996dc197e1a15bbcc351bcdd4610e128fe1ca", size = 37665910, upload-time = "2026-02-23T00:20:34.743Z" }, - { url = "https://files.pythonhosted.org/packages/06/1c/1172a88d507a4baaf72c5a09bb6c018fe2ae0ab622e5830b703a46cc9e44/scipy-1.17.1-cp313-cp313t-win_amd64.whl", hash = "sha256:e30bdeaa5deed6bc27b4cc490823cd0347d7dae09119b8803ae576ea0ce52e4c", size = 36562980, upload-time = "2026-02-23T00:20:40.575Z" }, - { url = "https://files.pythonhosted.org/packages/70/b0/eb757336e5a76dfa7911f63252e3b7d1de00935d7705cf772db5b45ec238/scipy-1.17.1-cp313-cp313t-win_arm64.whl", hash = "sha256:a720477885a9d2411f94a93d16f9d89bad0f28ca23c3f8daa521e2dcc3f44d49", size = 24856543, upload-time = "2026-02-23T00:20:45.313Z" }, { url = "https://files.pythonhosted.org/packages/cf/83/333afb452af6f0fd70414dc04f898647ee1423979ce02efa75c3b0f2c28e/scipy-1.17.1-cp314-cp314-macosx_10_14_x86_64.whl", hash = "sha256:a48a72c77a310327f6a3a920092fa2b8fd03d7deaa60f093038f22d98e096717", size = 31584510, upload-time = "2026-02-23T00:21:01.015Z" }, { url = "https://files.pythonhosted.org/packages/ed/a6/d05a85fd51daeb2e4ea71d102f15b34fedca8e931af02594193ae4fd25f7/scipy-1.17.1-cp314-cp314-macosx_12_0_arm64.whl", hash = "sha256:45abad819184f07240d8a696117a7aacd39787af9e0b719d00285549ed19a1e9", size = 28170131, upload-time = "2026-02-23T00:21:05.888Z" }, { url = "https://files.pythonhosted.org/packages/db/7b/8624a203326675d7746a254083a187398090a179335b2e4a20e2ddc46e83/scipy-1.17.1-cp314-cp314-macosx_14_0_arm64.whl", hash = "sha256:3fd1fcdab3ea951b610dc4cef356d416d5802991e7e32b5254828d342f7b7e0b", size = 20342032, upload-time = "2026-02-23T00:21:09.904Z" }, @@ -4299,46 +3020,6 @@ version = "1.3.7" source = { registry = "https://pypi.org/simple" } sdist = { url = "https://files.pythonhosted.org/packages/8d/48/49393a96a2eef1ab418b17475fb92b8fcfad83d099e678751b05472e69de/setproctitle-1.3.7.tar.gz", hash = "sha256:bc2bc917691c1537d5b9bca1468437176809c7e11e5694ca79a9ca12345dcb9e", size = 27002, upload-time = "2025-09-05T12:51:25.278Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/04/cd/1b7ba5cad635510720ce19d7122154df96a2387d2a74217be552887c93e5/setproctitle-1.3.7-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:a600eeb4145fb0ee6c287cb82a2884bd4ec5bbb076921e287039dcc7b7cc6dd0", size = 18085, upload-time = "2025-09-05T12:49:22.183Z" }, - { url = "https://files.pythonhosted.org/packages/8f/1a/b2da0a620490aae355f9d72072ac13e901a9fec809a6a24fc6493a8f3c35/setproctitle-1.3.7-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:97a090fed480471bb175689859532709e28c085087e344bca45cf318034f70c4", size = 13097, upload-time = "2025-09-05T12:49:23.322Z" }, - { url = "https://files.pythonhosted.org/packages/18/2e/bd03ff02432a181c1787f6fc2a678f53b7dacdd5ded69c318fe1619556e8/setproctitle-1.3.7-cp311-cp311-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:1607b963e7b53e24ec8a2cb4e0ab3ae591d7c6bf0a160feef0551da63452b37f", size = 32191, upload-time = "2025-09-05T12:49:24.567Z" }, - { url = "https://files.pythonhosted.org/packages/28/78/1e62fc0937a8549f2220445ed2175daacee9b6764c7963b16148119b016d/setproctitle-1.3.7-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:a20fb1a3974e2dab857870cf874b325b8705605cb7e7e8bcbb915bca896f52a9", size = 33203, upload-time = "2025-09-05T12:49:25.871Z" }, - { url = "https://files.pythonhosted.org/packages/a0/3c/65edc65db3fa3df400cf13b05e9d41a3c77517b4839ce873aa6b4043184f/setproctitle-1.3.7-cp311-cp311-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:f8d961bba676e07d77665204f36cffaa260f526e7b32d07ab3df6a2c1dfb44ba", size = 34963, upload-time = "2025-09-05T12:49:27.044Z" }, - { url = "https://files.pythonhosted.org/packages/a1/32/89157e3de997973e306e44152522385f428e16f92f3cf113461489e1e2ee/setproctitle-1.3.7-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:db0fd964fbd3a9f8999b502f65bd2e20883fdb5b1fae3a424e66db9a793ed307", size = 32398, upload-time = "2025-09-05T12:49:28.909Z" }, - { url = "https://files.pythonhosted.org/packages/4a/18/77a765a339ddf046844cb4513353d8e9dcd8183da9cdba6e078713e6b0b2/setproctitle-1.3.7-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:db116850fcf7cca19492030f8d3b4b6e231278e8fe097a043957d22ce1bdf3ee", size = 33657, upload-time = "2025-09-05T12:49:30.323Z" }, - { url = "https://files.pythonhosted.org/packages/6b/63/f0b6205c64d74d2a24a58644a38ec77bdbaa6afc13747e75973bf8904932/setproctitle-1.3.7-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:316664d8b24a5c91ee244460bdaf7a74a707adaa9e14fbe0dc0a53168bb9aba1", size = 31836, upload-time = "2025-09-05T12:49:32.309Z" }, - { url = "https://files.pythonhosted.org/packages/ba/51/e1277f9ba302f1a250bbd3eedbbee747a244b3cc682eb58fb9733968f6d8/setproctitle-1.3.7-cp311-cp311-win32.whl", hash = "sha256:b74774ca471c86c09b9d5037c8451fff06bb82cd320d26ae5a01c758088c0d5d", size = 12556, upload-time = "2025-09-05T12:49:33.529Z" }, - { url = "https://files.pythonhosted.org/packages/b6/7b/822a23f17e9003dfdee92cd72758441ca2a3680388da813a371b716fb07f/setproctitle-1.3.7-cp311-cp311-win_amd64.whl", hash = "sha256:acb9097213a8dd3410ed9f0dc147840e45ca9797785272928d4be3f0e69e3be4", size = 13243, upload-time = "2025-09-05T12:49:34.553Z" }, - { url = "https://files.pythonhosted.org/packages/fb/f0/2dc88e842077719d7384d86cc47403e5102810492b33680e7dadcee64cd8/setproctitle-1.3.7-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:2dc99aec591ab6126e636b11035a70991bc1ab7a261da428491a40b84376654e", size = 18049, upload-time = "2025-09-05T12:49:36.241Z" }, - { url = "https://files.pythonhosted.org/packages/f0/b4/50940504466689cda65680c9e9a1e518e5750c10490639fa687489ac7013/setproctitle-1.3.7-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:cdd8aa571b7aa39840fdbea620e308a19691ff595c3a10231e9ee830339dd798", size = 13079, upload-time = "2025-09-05T12:49:38.088Z" }, - { url = "https://files.pythonhosted.org/packages/d0/99/71630546b9395b095f4082be41165d1078204d1696c2d9baade3de3202d0/setproctitle-1.3.7-cp312-cp312-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:2906b6c7959cdb75f46159bf0acd8cc9906cf1361c9e1ded0d065fe8f9039629", size = 32932, upload-time = "2025-09-05T12:49:39.271Z" }, - { url = "https://files.pythonhosted.org/packages/50/22/cee06af4ffcfb0e8aba047bd44f5262e644199ae7527ae2c1f672b86495c/setproctitle-1.3.7-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:6915964a6dda07920a1159321dcd6d94fc7fc526f815ca08a8063aeca3c204f1", size = 33736, upload-time = "2025-09-05T12:49:40.565Z" }, - { url = "https://files.pythonhosted.org/packages/5c/00/a5949a8bb06ef5e7df214fc393bb2fb6aedf0479b17214e57750dfdd0f24/setproctitle-1.3.7-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:cff72899861c765bd4021d1ff1c68d60edc129711a2fdba77f9cb69ef726a8b6", size = 35605, upload-time = "2025-09-05T12:49:42.362Z" }, - { url = "https://files.pythonhosted.org/packages/b0/3a/50caca532a9343828e3bf5778c7a84d6c737a249b1796d50dd680290594d/setproctitle-1.3.7-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:b7cb05bd446687ff816a3aaaf831047fc4c364feff7ada94a66024f1367b448c", size = 33143, upload-time = "2025-09-05T12:49:43.515Z" }, - { url = "https://files.pythonhosted.org/packages/ca/14/b843a251296ce55e2e17c017d6b9f11ce0d3d070e9265de4ecad948b913d/setproctitle-1.3.7-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:3a57b9a00de8cae7e2a1f7b9f0c2ac7b69372159e16a7708aa2f38f9e5cc987a", size = 34434, upload-time = "2025-09-05T12:49:45.31Z" }, - { url = "https://files.pythonhosted.org/packages/c8/b7/06145c238c0a6d2c4bc881f8be230bb9f36d2bf51aff7bddcb796d5eed67/setproctitle-1.3.7-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:d8828b356114f6b308b04afe398ed93803d7fca4a955dd3abe84430e28d33739", size = 32795, upload-time = "2025-09-05T12:49:46.419Z" }, - { url = "https://files.pythonhosted.org/packages/ef/dc/ef76a81fac9bf27b84ed23df19c1f67391a753eed6e3c2254ebcb5133f56/setproctitle-1.3.7-cp312-cp312-win32.whl", hash = "sha256:b0304f905efc845829ac2bc791ddebb976db2885f6171f4a3de678d7ee3f7c9f", size = 12552, upload-time = "2025-09-05T12:49:47.635Z" }, - { url = "https://files.pythonhosted.org/packages/e2/5b/a9fe517912cd6e28cf43a212b80cb679ff179a91b623138a99796d7d18a0/setproctitle-1.3.7-cp312-cp312-win_amd64.whl", hash = "sha256:9888ceb4faea3116cf02a920ff00bfbc8cc899743e4b4ac914b03625bdc3c300", size = 13247, upload-time = "2025-09-05T12:49:49.16Z" }, - { url = "https://files.pythonhosted.org/packages/5d/2f/fcedcade3b307a391b6e17c774c6261a7166aed641aee00ed2aad96c63ce/setproctitle-1.3.7-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:c3736b2a423146b5e62230502e47e08e68282ff3b69bcfe08a322bee73407922", size = 18047, upload-time = "2025-09-05T12:49:50.271Z" }, - { url = "https://files.pythonhosted.org/packages/23/ae/afc141ca9631350d0a80b8f287aac79a76f26b6af28fd8bf92dae70dc2c5/setproctitle-1.3.7-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:3384e682b158d569e85a51cfbde2afd1ab57ecf93ea6651fe198d0ba451196ee", size = 13073, upload-time = "2025-09-05T12:49:51.46Z" }, - { url = "https://files.pythonhosted.org/packages/87/ed/0a4f00315bc02510395b95eec3d4aa77c07192ee79f0baae77ea7b9603d8/setproctitle-1.3.7-cp313-cp313-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:0564a936ea687cd24dffcea35903e2a20962aa6ac20e61dd3a207652401492dd", size = 33284, upload-time = "2025-09-05T12:49:52.741Z" }, - { url = "https://files.pythonhosted.org/packages/fc/e4/adf3c4c0a2173cb7920dc9df710bcc67e9bcdbf377e243b7a962dc31a51a/setproctitle-1.3.7-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:a5d1cb3f81531f0eb40e13246b679a1bdb58762b170303463cb06ecc296f26d0", size = 34104, upload-time = "2025-09-05T12:49:54.416Z" }, - { url = "https://files.pythonhosted.org/packages/52/4f/6daf66394152756664257180439d37047aa9a1cfaa5e4f5ed35e93d1dc06/setproctitle-1.3.7-cp313-cp313-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:a7d159e7345f343b44330cbba9194169b8590cb13dae940da47aa36a72aa9929", size = 35982, upload-time = "2025-09-05T12:49:56.295Z" }, - { url = "https://files.pythonhosted.org/packages/1b/62/f2c0595403cf915db031f346b0e3b2c0096050e90e0be658a64f44f4278a/setproctitle-1.3.7-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:0b5074649797fd07c72ca1f6bff0406f4a42e1194faac03ecaab765ce605866f", size = 33150, upload-time = "2025-09-05T12:49:58.025Z" }, - { url = "https://files.pythonhosted.org/packages/a0/29/10dd41cde849fb2f9b626c846b7ea30c99c81a18a5037a45cc4ba33c19a7/setproctitle-1.3.7-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:61e96febced3f61b766115381d97a21a6265a0f29188a791f6df7ed777aef698", size = 34463, upload-time = "2025-09-05T12:49:59.424Z" }, - { url = "https://files.pythonhosted.org/packages/71/3c/cedd8eccfaf15fb73a2c20525b68c9477518917c9437737fa0fda91e378f/setproctitle-1.3.7-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:047138279f9463f06b858e579cc79580fbf7a04554d24e6bddf8fe5dddbe3d4c", size = 32848, upload-time = "2025-09-05T12:50:01.107Z" }, - { url = "https://files.pythonhosted.org/packages/d1/3e/0a0e27d1c9926fecccfd1f91796c244416c70bf6bca448d988638faea81d/setproctitle-1.3.7-cp313-cp313-win32.whl", hash = "sha256:7f47accafac7fe6535ba8ba9efd59df9d84a6214565108d0ebb1199119c9cbbd", size = 12544, upload-time = "2025-09-05T12:50:15.81Z" }, - { url = "https://files.pythonhosted.org/packages/36/1b/6bf4cb7acbbd5c846ede1c3f4d6b4ee52744d402e43546826da065ff2ab7/setproctitle-1.3.7-cp313-cp313-win_amd64.whl", hash = "sha256:fe5ca35aeec6dc50cabab9bf2d12fbc9067eede7ff4fe92b8f5b99d92e21263f", size = 13235, upload-time = "2025-09-05T12:50:16.89Z" }, - { url = "https://files.pythonhosted.org/packages/e6/a4/d588d3497d4714750e3eaf269e9e8985449203d82b16b933c39bd3fc52a1/setproctitle-1.3.7-cp313-cp313t-macosx_10_13_universal2.whl", hash = "sha256:10e92915c4b3086b1586933a36faf4f92f903c5554f3c34102d18c7d3f5378e9", size = 18058, upload-time = "2025-09-05T12:50:02.501Z" }, - { url = "https://files.pythonhosted.org/packages/05/77/7637f7682322a7244e07c373881c7e982567e2cb1dd2f31bd31481e45500/setproctitle-1.3.7-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:de879e9c2eab637f34b1a14c4da1e030c12658cdc69ee1b3e5be81b380163ce5", size = 13072, upload-time = "2025-09-05T12:50:03.601Z" }, - { url = "https://files.pythonhosted.org/packages/52/09/f366eca0973cfbac1470068d1313fa3fe3de4a594683385204ec7f1c4101/setproctitle-1.3.7-cp313-cp313t-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:c18246d88e227a5b16248687514f95642505000442165f4b7db354d39d0e4c29", size = 34490, upload-time = "2025-09-05T12:50:04.948Z" }, - { url = "https://files.pythonhosted.org/packages/71/36/611fc2ed149fdea17c3677e1d0df30d8186eef9562acc248682b91312706/setproctitle-1.3.7-cp313-cp313t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:7081f193dab22df2c36f9fc6d113f3793f83c27891af8fe30c64d89d9a37e152", size = 35267, upload-time = "2025-09-05T12:50:06.015Z" }, - { url = "https://files.pythonhosted.org/packages/88/a4/64e77d0671446bd5a5554387b69e1efd915274686844bea733714c828813/setproctitle-1.3.7-cp313-cp313t-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:9cc9b901ce129350637426a89cfd650066a4adc6899e47822e2478a74023ff7c", size = 37376, upload-time = "2025-09-05T12:50:07.484Z" }, - { url = "https://files.pythonhosted.org/packages/89/bc/ad9c664fe524fb4a4b2d3663661a5c63453ce851736171e454fa2cdec35c/setproctitle-1.3.7-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:80e177eff2d1ec172188d0d7fd9694f8e43d3aab76a6f5f929bee7bf7894e98b", size = 33963, upload-time = "2025-09-05T12:50:09.056Z" }, - { url = "https://files.pythonhosted.org/packages/ab/01/a36de7caf2d90c4c28678da1466b47495cbbad43badb4e982d8db8167ed4/setproctitle-1.3.7-cp313-cp313t-musllinux_1_2_ppc64le.whl", hash = "sha256:23e520776c445478a67ee71b2a3c1ffdafbe1f9f677239e03d7e2cc635954e18", size = 35550, upload-time = "2025-09-05T12:50:10.791Z" }, - { url = "https://files.pythonhosted.org/packages/dd/68/17e8aea0ed5ebc17fbf03ed2562bfab277c280e3625850c38d92a7b5fcd9/setproctitle-1.3.7-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:5fa1953126a3b9bd47049d58c51b9dac72e78ed120459bd3aceb1bacee72357c", size = 33727, upload-time = "2025-09-05T12:50:12.032Z" }, - { url = "https://files.pythonhosted.org/packages/b2/33/90a3bf43fe3a2242b4618aa799c672270250b5780667898f30663fd94993/setproctitle-1.3.7-cp313-cp313t-win32.whl", hash = "sha256:4a5e212bf438a4dbeece763f4962ad472c6008ff6702e230b4f16a037e2f6f29", size = 12549, upload-time = "2025-09-05T12:50:13.074Z" }, - { url = "https://files.pythonhosted.org/packages/0b/0e/50d1f07f3032e1f23d814ad6462bc0a138f369967c72494286b8a5228e40/setproctitle-1.3.7-cp313-cp313t-win_amd64.whl", hash = "sha256:cf2727b733e90b4f874bac53e3092aa0413fe1ea6d4f153f01207e6ce65034d9", size = 13243, upload-time = "2025-09-05T12:50:14.146Z" }, { url = "https://files.pythonhosted.org/packages/89/c7/43ac3a98414f91d1b86a276bc2f799ad0b4b010e08497a95750d5bc42803/setproctitle-1.3.7-cp314-cp314-macosx_10_13_universal2.whl", hash = "sha256:80c36c6a87ff72eabf621d0c79b66f3bdd0ecc79e873c1e9f0651ee8bf215c63", size = 18052, upload-time = "2025-09-05T12:50:17.928Z" }, { url = "https://files.pythonhosted.org/packages/cd/2c/dc258600a25e1a1f04948073826bebc55e18dbd99dc65a576277a82146fa/setproctitle-1.3.7-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:b53602371a52b91c80aaf578b5ada29d311d12b8a69c0c17fbc35b76a1fd4f2e", size = 13071, upload-time = "2025-09-05T12:50:19.061Z" }, { url = "https://files.pythonhosted.org/packages/ab/26/8e3bb082992f19823d831f3d62a89409deb6092e72fc6940962983ffc94f/setproctitle-1.3.7-cp314-cp314-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:fcb966a6c57cf07cc9448321a08f3be6b11b7635be502669bc1d8745115d7e7f", size = 33180, upload-time = "2025-09-05T12:50:20.395Z" }, @@ -4359,9 +3040,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/e7/e3/54b496ac724e60e61cc3447f02690105901ca6d90da0377dffe49ff99fc7/setproctitle-1.3.7-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:1fae595d032b30dab4d659bece20debd202229fce12b55abab978b7f30783d73", size = 33958, upload-time = "2025-09-05T12:50:39.841Z" }, { url = "https://files.pythonhosted.org/packages/ea/a8/c84bb045ebf8c6fdc7f7532319e86f8380d14bbd3084e6348df56bdfe6fd/setproctitle-1.3.7-cp314-cp314t-win32.whl", hash = "sha256:02432f26f5d1329ab22279ff863c83589894977063f59e6c4b4845804a08f8c2", size = 12745, upload-time = "2025-09-05T12:50:41.377Z" }, { url = "https://files.pythonhosted.org/packages/08/b6/3a5a4f9952972791a9114ac01dfc123f0df79903577a3e0a7a404a695586/setproctitle-1.3.7-cp314-cp314t-win_amd64.whl", hash = "sha256:cbc388e3d86da1f766d8fc2e12682e446064c01cea9f88a88647cfe7c011de6a", size = 13469, upload-time = "2025-09-05T12:50:42.67Z" }, - { url = "https://files.pythonhosted.org/packages/c3/5b/5e1c117ac84e3cefcf8d7a7f6b2461795a87e20869da065a5c087149060b/setproctitle-1.3.7-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:b1cac6a4b0252b8811d60b6d8d0f157c0fdfed379ac89c25a914e6346cf355a1", size = 12587, upload-time = "2025-09-05T12:51:21.195Z" }, - { url = "https://files.pythonhosted.org/packages/73/02/b9eadc226195dcfa90eed37afe56b5dd6fa2f0e5220ab8b7867b8862b926/setproctitle-1.3.7-pp311-pypy311_pp73-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:f1704c9e041f2b1dc38f5be4552e141e1432fba3dd52c72eeffd5bc2db04dc65", size = 14286, upload-time = "2025-09-05T12:51:22.61Z" }, - { url = "https://files.pythonhosted.org/packages/28/26/1be1d2a53c2a91ec48fa2ff4a409b395f836798adf194d99de9c059419ea/setproctitle-1.3.7-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:b08b61976ffa548bd5349ce54404bf6b2d51bd74d4f1b241ed1b0f25bce09c3a", size = 13282, upload-time = "2025-09-05T12:51:24.094Z" }, ] [[package]] @@ -4388,25 +3066,9 @@ version = "2.7.0" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "numpy" }, - { name = "typing-extensions", marker = "python_full_version < '3.13'" }, ] sdist = { url = "https://files.pythonhosted.org/packages/a9/06/7964acb4c444191376bd87f91579475fbe7623ca943cce40cee8fb7f2c36/spglib-2.7.0.tar.gz", hash = "sha256:c40907a42c9dc45572f46740bf95412f84fb0eda30267e31665d104a4bde6627", size = 2366134, upload-time = "2025-12-29T09:48:26.42Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/44/a8/d841ae7743c58227af277f7f16aa844376fa11c426090d6ae35e7e93af76/spglib-2.7.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:3cf0ff80c01d8631ef4b9f1b78da79ff2044834e6e2d870f7f20c8579c921136", size = 910793, upload-time = "2025-12-29T09:47:32.063Z" }, - { url = "https://files.pythonhosted.org/packages/e8/02/11baf94cf682cdaafa046b72d4b2adcf944e19e2b2741454e329dedb2fc2/spglib-2.7.0-cp311-cp311-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:a7b29d2cfca6ac53e927686ca0b91257126e47f6abfa26451723a5cd40070352", size = 944977, upload-time = "2025-12-29T09:47:33.638Z" }, - { url = "https://files.pythonhosted.org/packages/ce/fa/6d1bc8f8cb08945ca8c37c95b42bf336b6b9a8a737eced1ce64f0cebe9ce/spglib-2.7.0-cp311-cp311-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:f892ecce2dd1bc636b14a4e5bc13aabb73b008bd37a4d23636882c8971c432a0", size = 960531, upload-time = "2025-12-29T09:47:36.932Z" }, - { url = "https://files.pythonhosted.org/packages/b0/79/2fd5e33b431cd0afcdd441bd10704c11cdf74c09b721249297284e5bf0b2/spglib-2.7.0-cp311-cp311-win_amd64.whl", hash = "sha256:468879702577124dcde0607a75396576e256f1cfa2d8fe48da4a928fbb27abc6", size = 669827, upload-time = "2025-12-29T09:47:38.47Z" }, - { url = "https://files.pythonhosted.org/packages/f7/e9/4e07c9c1bda40df54e09bd686eae0dc13d46e76a5ef4d43582971a86eb32/spglib-2.7.0-cp311-cp311-win_arm64.whl", hash = "sha256:ceb6730a2324d0c83579c803f3782e28bd41e79bbfe0c3dfdbf30e3d3a6320e5", size = 649076, upload-time = "2025-12-29T09:47:40.367Z" }, - { url = "https://files.pythonhosted.org/packages/68/0e/36720beeca8452530e50ab8a16b91e8721e34c0f97fd25e9c4ddd8b9324b/spglib-2.7.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:ef70132e23dfcc7ab6813742e0edab3f9906e61cd11c857f014bd5610a8bc88c", size = 911009, upload-time = "2025-12-29T09:47:42.238Z" }, - { url = "https://files.pythonhosted.org/packages/47/a0/24df91cbde6a3237d54cfb21602cc8ebb4102cd4e3ec9497c66135c2b190/spglib-2.7.0-cp312-cp312-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:59f134e74f7f488de4bf5579ee6a35af25cb2c478c138de664fea1e14f3efbaf", size = 946821, upload-time = "2025-12-29T09:47:44.548Z" }, - { url = "https://files.pythonhosted.org/packages/67/4c/75ac6f7ade28019b216c7333322f2886e1c0105202cd74506f530664bf26/spglib-2.7.0-cp312-cp312-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:6913906fd9108e7bb2ce06a810513a95a82d801530f10230979bf3427bb7e771", size = 962531, upload-time = "2025-12-29T09:47:46.3Z" }, - { url = "https://files.pythonhosted.org/packages/a7/5f/4e283139af178bb445eedff281a90e66ceff1b814ace70a9d90a2197acc3/spglib-2.7.0-cp312-cp312-win_amd64.whl", hash = "sha256:d5729ff0040baae764c17249302cd99f0eb4e73449612a8c69d3e60a215f062e", size = 671111, upload-time = "2025-12-29T09:47:48.14Z" }, - { url = "https://files.pythonhosted.org/packages/a5/b9/20e52d46e33bf69ceba4fc86602f006c06ce4ab10e3c930f4722fb270b02/spglib-2.7.0-cp312-cp312-win_arm64.whl", hash = "sha256:54f4b6e789475384c62e759c618172707f261c0eae8017949fe4994b6b8cc779", size = 646679, upload-time = "2025-12-29T09:47:49.376Z" }, - { url = "https://files.pythonhosted.org/packages/2c/1c/a0fe8c0523a0e7d608f49f09895e5c599329265c9bfacd269a21458b7564/spglib-2.7.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:ab061ea6a3c3c25a1d0018b09c333c0458792036d3f45d892bd52793ed1f1bda", size = 911085, upload-time = "2025-12-29T09:47:51.606Z" }, - { url = "https://files.pythonhosted.org/packages/2a/34/cb3c522c4aaf6ce319b37bbec71d373b9e2cf0bcfe7d42c365cd6c113b4b/spglib-2.7.0-cp313-cp313-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:be28673e90f7a6c7770f73c57e529d2bdbb373d06d26ee5e90991b548e9238aa", size = 946857, upload-time = "2025-12-29T09:47:53.059Z" }, - { url = "https://files.pythonhosted.org/packages/9e/64/3b1213f2f655ff143ed142292b47ec3f1f9bda8641e659a7e33c4cf0e8a9/spglib-2.7.0-cp313-cp313-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:f627a4ed6f2396ed6e3e8eaf33a53ad143c8ffb8756a84a640f4569ac5ffa2a7", size = 962470, upload-time = "2025-12-29T09:47:54.878Z" }, - { url = "https://files.pythonhosted.org/packages/5c/3a/c51883ce739a00f9f60196f3dcb4ed91b690299a4ec64defd8ec5b2c5899/spglib-2.7.0-cp313-cp313-win_amd64.whl", hash = "sha256:c76411bc1b96cd87c8733994747c7692512b583bb4ef89a65463ff4255221c11", size = 671073, upload-time = "2025-12-29T09:47:56.887Z" }, - { url = "https://files.pythonhosted.org/packages/35/78/3f9ec6ae93a48527dce0eceb6eeab74e6ad1fb2977adb5cbdfc03d43193c/spglib-2.7.0-cp313-cp313-win_arm64.whl", hash = "sha256:0d8ecf030d13d67c4cc272423e5652b74eda57f86a0b118e007f6d12974cc256", size = 646711, upload-time = "2025-12-29T09:47:58.697Z" }, { url = "https://files.pythonhosted.org/packages/1b/47/86e3c15c3e1c252bde40a794eea4742c142f23fc5f9c3d7551f083c1fa20/spglib-2.7.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:95e3dd7ef992ff8a88f6ef2e5909aaa60ecb479004cc1f73c1e6285d54227960", size = 911712, upload-time = "2025-12-29T09:48:01.14Z" }, { url = "https://files.pythonhosted.org/packages/05/61/ab2447bb47fa69934adc2fc2d13f771dedd3b2fd3171c95307446c948f01/spglib-2.7.0-cp314-cp314-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:97e0fcea2db3915bd973fdd2cc0a757b1f99bda71ce815da333d75ad1ffc3eb1", size = 947528, upload-time = "2025-12-29T09:48:03.258Z" }, { url = "https://files.pythonhosted.org/packages/9d/69/898d9e005131b0b1c7e5dce2b79f36aeb20ec4d3a88cca596b522a0fa4df/spglib-2.7.0-cp314-cp314-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:39b978c08ef2ebc0eaba833c488fc4c0f9b1fc0f50d4a8584f176741eea69376", size = 962474, upload-time = "2025-12-29T09:48:05.617Z" }, @@ -4438,7 +3100,6 @@ version = "1.2.0" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "anyio" }, - { name = "typing-extensions", marker = "python_full_version < '3.13'" }, ] sdist = { url = "https://files.pythonhosted.org/packages/c5/bf/616a066c2760f6c2b1ae3437cc28149734d069fbb46511712beae118a68c/starlette-1.2.0.tar.gz", hash = "sha256:3c5a6b23fff42492914e93890bb80cbfea72dbf37de268eec06185d62a4ca553", size = 2668923, upload-time = "2026-05-28T11:42:50.568Z" } wheels = [ @@ -4671,50 +3332,6 @@ version = "2.2.1" source = { registry = "https://pypi.org/simple" } sdist = { url = "https://files.pythonhosted.org/packages/2d/9f/06263fcd8ad6c405f05a3905fd7a84dd3176eb5ad46e44bccc0cd16348bb/wrapt-2.2.1.tar.gz", hash = "sha256:6744f504375775d7609c82c8d3d94af1c9a6f05586984536905908ba905277b9", size = 127620, upload-time = "2026-05-22T14:49:43.056Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/5f/ac/4370bde262c0e633e6c4f0e56d55095710024cf9a5cecc20c59a10de483c/wrapt-2.2.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:dd57607acc85678925940bd5df0385ff8332083a32fa8d7a43f8767f4997263c", size = 80321, upload-time = "2026-05-22T14:47:43.996Z" }, - { url = "https://files.pythonhosted.org/packages/eb/79/b8ff3a61e71babf58a8cf4c0d63358e8bad383e15bf7f35e62d2f6b6e4a4/wrapt-2.2.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:1ae574d65c9fa8e86f64f6a7c2668f9fcd507b183e0e577619f504b883cb0a6c", size = 81216, upload-time = "2026-05-22T14:47:45.243Z" }, - { url = "https://files.pythonhosted.org/packages/6e/fd/c0cac1f77c9c4f6fe58a920ca632ce379bb8be928720e11e8d73de28a5e9/wrapt-2.2.1-cp311-cp311-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:9a04c28c10ba7fd12842b109d2edb0678872a2fe65277ca4ff06a0d61edee245", size = 159208, upload-time = "2026-05-22T14:47:47.176Z" }, - { url = "https://files.pythonhosted.org/packages/d9/4f/744132a7b2fbefa6b81118ec5942eca5fc2e9a129f9055a0c5e46885a549/wrapt-2.2.1-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:3e2f02472a1cbbf3884b365714a810b5947134a95ad6952b554cb8cce9d492b0", size = 160322, upload-time = "2026-05-22T14:47:49.04Z" }, - { url = "https://files.pythonhosted.org/packages/d6/95/b7cd9a22a06cf93e6482904ee6afc956248983553593fd1009296d1b3b31/wrapt-2.2.1-cp311-cp311-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:ac2745950b2bff80219c15ebf2fa9d8427eba7e249739f97e55c9d169e47e9e1", size = 153243, upload-time = "2026-05-22T14:47:50.386Z" }, - { url = "https://files.pythonhosted.org/packages/4c/4a/eb79423192015f46f0db2872e7e04a3dde8d359b83411e8959e7c9287eaa/wrapt-2.2.1-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:67a97e5b6c457f0cd3cfc19ebb2d84463e60c3ece754cc831e4281a3ca29bb18", size = 159231, upload-time = "2026-05-22T14:47:51.753Z" }, - { url = "https://files.pythonhosted.org/packages/ec/dc/435015b58ce33c6fc4104158fa91ddb0e809ab03a5751fb7465d1d461456/wrapt-2.2.1-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:c803a3d331796255af51ba2c79ed0ac8275865b516c09e61f248d1e7aff31ce9", size = 152351, upload-time = "2026-05-22T14:47:53.214Z" }, - { url = "https://files.pythonhosted.org/packages/77/ac/5d203f98df8fd136b95c5227139aea02d34505e18baf812d0c005df61963/wrapt-2.2.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:9b984d1eb252145d6302c1dbd5e87fc6d404d45531447c84eadec04bf1fcb027", size = 158347, upload-time = "2026-05-22T14:47:54.982Z" }, - { url = "https://files.pythonhosted.org/packages/52/2f/a92427dbdc74e54c1674abbed27e61b2cb5e7a94441b8c1270c70671d928/wrapt-2.2.1-cp311-cp311-win32.whl", hash = "sha256:8a983a603a18c8708f024f7f6991b2e66159219abbf894634c5056243c55f3cd", size = 77562, upload-time = "2026-05-22T14:47:56.275Z" }, - { url = "https://files.pythonhosted.org/packages/c8/56/987b9c13b3e1c1a3c6de71284076f996b79caec90e75a87c044a40c23db9/wrapt-2.2.1-cp311-cp311-win_amd64.whl", hash = "sha256:9c210a6994b21aa9b29e81c8d11560e8fdab54c117e9cff37870d0a27bde1343", size = 80616, upload-time = "2026-05-22T14:47:57.854Z" }, - { url = "https://files.pythonhosted.org/packages/7e/25/d01f560888d99d94a959c85533de349ce68d71ace3f2591d6ea8f632cfed/wrapt-2.2.1-cp311-cp311-win_arm64.whl", hash = "sha256:401229e9d63ca09f9b8891ecf83798d26c11bbb445d11ed9f1836b6d4585b38a", size = 79025, upload-time = "2026-05-22T14:47:59.089Z" }, - { url = "https://files.pythonhosted.org/packages/89/0c/bfae7b9401583b6d05938cd16dedc43857d96da2f8a3d50d78cc515bf6ff/wrapt-2.2.1-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:3ffad790d9d11d8ecf9f17c4bb671a5b4089e4d8b575c46c5129597f41f836b0", size = 81021, upload-time = "2026-05-22T14:48:00.313Z" }, - { url = "https://files.pythonhosted.org/packages/26/58/80f6a6599f933f4caecc1cb3ee88a04faf81e8b9bddbd6109c688dd63e0f/wrapt-2.2.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:628f5220c7a904d5fc78f7075c8d7871433eb6d035c94728a22fdf85f193d2a8", size = 81692, upload-time = "2026-05-22T14:48:01.49Z" }, - { url = "https://files.pythonhosted.org/packages/17/93/fb357cc7847c58a8ae790be718903afa81a28d23e642c843dc4129e8a0b2/wrapt-2.2.1-cp312-cp312-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:61acce4257a9883669703c525447c5b4c392edf0f987ae77ec32668440158f0e", size = 169364, upload-time = "2026-05-22T14:48:02.791Z" }, - { url = "https://files.pythonhosted.org/packages/aa/0b/76b601ee309a8bd556af0eecb184394c20b3c49aa9c8e085aa1ffacc2568/wrapt-2.2.1-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:727ab4244622cd6ad2390f322642090c877d2e83a608d2653a7643ae5368d926", size = 171079, upload-time = "2026-05-22T14:48:04.22Z" }, - { url = "https://files.pythonhosted.org/packages/cd/87/ee3f32d5658e3e26d3e0e457922b47a36dd3bfbdfee7f97bb3e802344a66/wrapt-2.2.1-cp312-cp312-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:03df9ebed4c73ab93fa8c07e3d41d818dfca1852b15731a3de59457b27814624", size = 160205, upload-time = "2026-05-22T14:48:05.553Z" }, - { url = "https://files.pythonhosted.org/packages/b1/d0/ae2fd64277a67f5d7bffcf2d05eea1e476263fb2a072baf0b0129ab85984/wrapt-2.2.1-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:0d9ff006f420b2ec8296aa56ade43ea7da3e997e85769f0aafc5e0661aacb710", size = 168922, upload-time = "2026-05-22T14:48:07.132Z" }, - { url = "https://files.pythonhosted.org/packages/b1/f3/2d541a060c5bbafb9400bca4917e4d78bfd1f239f404782c86831a8f6b29/wrapt-2.2.1-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:844c858fc3bb7eacc0ba8efa904935d16aac6a4470948ad1e7e55c9f5a2a665f", size = 158388, upload-time = "2026-05-22T14:48:08.629Z" }, - { url = "https://files.pythonhosted.org/packages/1d/68/8d92c8800c57e93cb116ae9e9d6cbafc34fade5ee9f9107b6f203fb4dc35/wrapt-2.2.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:87bacdaf225117a342a20d9c03438d701c02112f6e3f351ce9b7f32354f14797", size = 167682, upload-time = "2026-05-22T14:48:10.042Z" }, - { url = "https://files.pythonhosted.org/packages/30/72/83ea3790ea352439442349388e29ff07b76e0686265f9088bbb505d1608d/wrapt-2.2.1-cp312-cp312-win32.whl", hash = "sha256:2f8c90c8afde51969487be4e1343ae049b268854877d415c2510baf833775052", size = 77857, upload-time = "2026-05-22T14:48:11.782Z" }, - { url = "https://files.pythonhosted.org/packages/ef/cb/99450668dd3502d62a54a1c8aa56e44f34cb8c1261b381cfe2e7926c3b75/wrapt-2.2.1-cp312-cp312-win_amd64.whl", hash = "sha256:6ce32763ac31ce94fe9aada947e479b1975012bff166da409b4b9e4e376cf7e5", size = 80825, upload-time = "2026-05-22T14:48:13.046Z" }, - { url = "https://files.pythonhosted.org/packages/e6/3a/87512881be64e743f9ee4c66f4cbe8e884974bef2a5989af71f999653ac7/wrapt-2.2.1-cp312-cp312-win_arm64.whl", hash = "sha256:8d1b4d0e0c2119587a31f5c029abd547e0c81d93b89d394566fe1588659eb579", size = 79087, upload-time = "2026-05-22T14:48:14.323Z" }, - { url = "https://files.pythonhosted.org/packages/88/d1/a1b08f8f4fac8cbb156fa51cf64ee2c7f7f74f9875ba3cf70b3c58368694/wrapt-2.2.1-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:d2beb1c7cab10603aecdc42f8edd6ff013f9a32e4543474e38e6b77ce9975aeb", size = 80831, upload-time = "2026-05-22T14:48:15.598Z" }, - { url = "https://files.pythonhosted.org/packages/54/ce/57890814991446a845e09b3445ce8b694f27eb0577004f2c2a36a9772ed4/wrapt-2.2.1-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:e0cb7e4dd71f4c32e5e84843cd3c4cd65dda034314004bbe1d7f99af2426ab80", size = 81375, upload-time = "2026-05-22T14:48:17.071Z" }, - { url = "https://files.pythonhosted.org/packages/38/65/08d7a6c76ac4493bdb668205ee9c1de1bd5daca61717c3e9aa49b4c01499/wrapt-2.2.1-cp313-cp313-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:95821352042722cd9f1108874579a47989d0a7e12a37d87d2fc4af20fd99ab8a", size = 167417, upload-time = "2026-05-22T14:48:18.303Z" }, - { url = "https://files.pythonhosted.org/packages/62/ce/f1ccbee7a1bfe5cdc6b3da6bab4b45713d628b9294da32a39f563d648140/wrapt-2.2.1-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:abd621552ede77c4c69be7fac44ba911225b0c812b6ba604e5964cf98085b474", size = 166948, upload-time = "2026-05-22T14:48:19.768Z" }, - { url = "https://files.pythonhosted.org/packages/86/2a/f85d48d1cd4869aee6704028d257d740a47c1c467b457ce396b4b5b55d07/wrapt-2.2.1-cp313-cp313-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:e3677c7146ce694874941ba82b57092cc4875445aadf29d72807351023105143", size = 158148, upload-time = "2026-05-22T14:48:21.96Z" }, - { url = "https://files.pythonhosted.org/packages/fe/5c/93939ad11d4a12358ab1aab219a2ef5efa5612e0db6b9fc65af8af1a891b/wrapt-2.2.1-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:9a5934eaea872e17936b5f45501eba5ab0bce9a74122e172b663d7c28c459c4a", size = 165905, upload-time = "2026-05-22T14:48:23.373Z" }, - { url = "https://files.pythonhosted.org/packages/e0/22/b8c2aa89862ff58605934d7abf4b70e6a5a1c33df96656f49035ccdf1c8a/wrapt-2.2.1-cp313-cp313-musllinux_1_2_riscv64.whl", hash = "sha256:f5b9daf6b629fce418e0cc3dd0436eac045188fa35deadb7a7f3941d5b8203f9", size = 156712, upload-time = "2026-05-22T14:48:24.767Z" }, - { url = "https://files.pythonhosted.org/packages/5d/78/bf00a7b02239c12bb02ddcc3c0b971bfcc36e578c5a44f1ccfef5b458545/wrapt-2.2.1-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:f53ac9f3ef573326d009ed809beff4efcac6451931c2b8132586da4b9e53ff31", size = 166560, upload-time = "2026-05-22T14:48:26.83Z" }, - { url = "https://files.pythonhosted.org/packages/fe/93/6390ca9c5b787683cef588d04f57c8d41b9a2323b5597a65f18638c90ef2/wrapt-2.2.1-cp313-cp313-win32.whl", hash = "sha256:1ffa9cfd4bdb581539951b14ae661ff20ed0c3599b3e911a131ee0ec5ac11337", size = 77817, upload-time = "2026-05-22T14:48:28.221Z" }, - { url = "https://files.pythonhosted.org/packages/97/73/ce10f0e71c0cfaa1a65faadb8efd4852028b3bb9ba28932b8889df769d38/wrapt-2.2.1-cp313-cp313-win_amd64.whl", hash = "sha256:368eac1e20fd0bb03dd3cc42bf9887154c3861b60989389ccb5fac032617d215", size = 80736, upload-time = "2026-05-22T14:48:30.139Z" }, - { url = "https://files.pythonhosted.org/packages/c7/4c/89f4a6818fafbbd840330e4fa3873073e1bfc166133a64cac7f8fde7a5e3/wrapt-2.2.1-cp313-cp313-win_arm64.whl", hash = "sha256:c754dafdf5aaf0b401b644a90a30046929a0dd1a536e0ff0ec959a59155d9c7f", size = 79099, upload-time = "2026-05-22T14:48:31.405Z" }, - { url = "https://files.pythonhosted.org/packages/bf/f2/9a8741c46f8c208ac0a45b25ba170bcb4fb72a2781d5fb97dbd7b6be73cb/wrapt-2.2.1-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:ed928d0fda15fc0adc8d13305c8b3c0f2fba5b0669950c9e6d019d9162a3b3e8", size = 82802, upload-time = "2026-05-22T14:48:33.307Z" }, - { url = "https://files.pythonhosted.org/packages/9c/0d/e9c855716a3705eef1416456bdf062b60620726fdc59428ff670fc3c60dc/wrapt-2.2.1-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:fafb4e739e43544d12cb4abd1605fd4683b6ca6a9ad682b7fd8f4d21973eafa8", size = 83329, upload-time = "2026-05-22T14:48:34.593Z" }, - { url = "https://files.pythonhosted.org/packages/3b/d6/a88f1c13112b7831adac75cea65d8310e0d696d570c8961844c90a57b865/wrapt-2.2.1-cp313-cp313t-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:74d6a0c31472fe5d814917266b9f46495d7c61ed890af08b468acea92fb89a8d", size = 202937, upload-time = "2026-05-22T14:48:35.859Z" }, - { url = "https://files.pythonhosted.org/packages/42/65/e29d54aef06a4d898a5b8a25589a0b3769bde454f922fad8f6f89fbfb650/wrapt-2.2.1-cp313-cp313t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:ab5be648d5a0b86b7438864f8df3c705a65cef35a2fd3e5561e3e203167e0f27", size = 209997, upload-time = "2026-05-22T14:48:38.153Z" }, - { url = "https://files.pythonhosted.org/packages/2a/91/e4454263516cf0e12640912fbca9a83654e424f0a6ddb79f5cd7ce14bf33/wrapt-2.2.1-cp313-cp313t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:9d8f204c8e3a8bf9ece17e0a83d137fd807440977f8a5e762d59306795011440", size = 194856, upload-time = "2026-05-22T14:48:39.69Z" }, - { url = "https://files.pythonhosted.org/packages/de/d0/fe0ee202286afdf4a7f77dd29f195703145764d572aec209c5086e57d924/wrapt-2.2.1-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:d047f6498c973874ba08ac3f97c69a2c4b2211c8de6f4c205f75cb1c9522596e", size = 205654, upload-time = "2026-05-22T14:48:43.456Z" }, - { url = "https://files.pythonhosted.org/packages/23/b6/87d860dfc6460c246af70b1fd5c8b76df77571b42a493459423ded94fd7d/wrapt-2.2.1-cp313-cp313t-musllinux_1_2_riscv64.whl", hash = "sha256:7a4fdb9326aab4a5a477a1640e5ad786a8495901009d7e7b038371edd23a9d2b", size = 192206, upload-time = "2026-05-22T14:48:44.858Z" }, - { url = "https://files.pythonhosted.org/packages/df/46/3eea8cde077d985f239a38c0257087b8064fd9ee9b1a99e282d2c86da4ef/wrapt-2.2.1-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:c8cc5094b08abeae52da9c73c8a32003623be691a5193df2f4e3eac3d557c394", size = 198428, upload-time = "2026-05-22T14:48:46.319Z" }, - { url = "https://files.pythonhosted.org/packages/18/dc/b927ee9c7fc67adc3a5658f246a0d275425eb840ba36e7b702e70f18bde8/wrapt-2.2.1-cp313-cp313t-win32.whl", hash = "sha256:9907a4402ab6db12b7077a0ea5d7a4d028ecb22c8eee2b53527080d347cd1562", size = 79448, upload-time = "2026-05-22T14:48:47.901Z" }, - { url = "https://files.pythonhosted.org/packages/ec/b3/fd30b473fe498c70e6b9a5f328b8d3fbaf1b8c3c481465f59724bba8eb70/wrapt-2.2.1-cp313-cp313t-win_amd64.whl", hash = "sha256:5590d63f5243251641cf543009b4c9314a79d0598fdb8a8e4cfc918494536c53", size = 83021, upload-time = "2026-05-22T14:48:49.201Z" }, - { url = "https://files.pythonhosted.org/packages/ee/f3/96c39153a8737a6e9aa85adef254ac4195bea3f2d24efc60472ccc3c9e2e/wrapt-2.2.1-cp313-cp313t-win_arm64.whl", hash = "sha256:c318a64b53d97b841d7b5e637517e50a27be64bc695128422953d4b21710954e", size = 80295, upload-time = "2026-05-22T14:48:50.479Z" }, { url = "https://files.pythonhosted.org/packages/0a/a3/11d7f34ebbf3231bc907a3e6d5ee051b14d034c1bc7b65a97d5cc00516df/wrapt-2.2.1-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:6f56a647e4eaf5f0ca40330fb070f566bdf9f7b0db89a1af20d71c28dcd7a0ab", size = 80879, upload-time = "2026-05-22T14:48:51.802Z" }, { url = "https://files.pythonhosted.org/packages/13/3c/b74cfd984cef560b900fb1a727af20352d89e1f06bf2e1114dd3f00f5f5a/wrapt-2.2.1-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:64b7deeda4b70408e382328d8bbe52a256fe9bc63ae3db86d804608367e5422c", size = 81462, upload-time = "2026-05-22T14:48:53.18Z" }, { url = "https://files.pythonhosted.org/packages/15/a3/7c8f704b8dc07dfe0a5d01c2edbfd88317aa8e5e3fa7c743eb7a085ae767/wrapt-2.2.1-cp314-cp314-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:b9cf53ba90717db2e292401de290776c498d4bbfb0d4a559ca2895db8b9dcb5c", size = 167251, upload-time = "2026-05-22T14:48:54.562Z" }, @@ -4755,27 +3372,6 @@ version = "8.5" source = { registry = "https://pypi.org/simple" } sdist = { url = "https://files.pythonhosted.org/packages/08/dc/50550cfcbb2ea3cbca5f1d7ed05c8aa840f831a0f2d63aec0a953f7c590e/zope_interface-8.5.tar.gz", hash = "sha256:7a3ba1c5877f0f3e3906b02ddf793abed2becc2948116414ce0e1dd820b68d6d", size = 257957, upload-time = "2026-05-26T06:50:14.574Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/ce/f1/83ad110fb847413affe71609bb50e59e1aa082e1236030122227c7c283d3/zope_interface-8.5-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:afc66ccaef2a3c0bef6ca02aad40d29a39276389dad16a8eac36f9f385e4d057", size = 211426, upload-time = "2026-05-26T06:49:12.595Z" }, - { url = "https://files.pythonhosted.org/packages/bb/a7/6b6e0c31ac240cb9fc015ae9ed45ca54be886c18fcf7bfa2377a4d7a8785/zope_interface-8.5-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:c28044972187245d7a309e4699319bfdbd2ffcbf7176d1d4ddf5adffb2dea80f", size = 211850, upload-time = "2026-05-26T06:49:14.474Z" }, - { url = "https://files.pythonhosted.org/packages/37/36/7599ecabcf80ce4fef2e1ef3c5ac0d4696b61f03f724cc44022f4d226af9/zope_interface-8.5-cp311-cp311-manylinux1_i686.manylinux2014_i686.manylinux_2_17_i686.manylinux_2_5_i686.whl", hash = "sha256:03bbecc7982af713d7499d4084bc03916413d17ffd45f89009348cc0c1d9e376", size = 260711, upload-time = "2026-05-26T06:49:16.568Z" }, - { url = "https://files.pythonhosted.org/packages/03/3e/1774b0ee46ccbb5498ee3c33ece40315b6ef58bc71957be94bd345340bc1/zope_interface-8.5-cp311-cp311-manylinux1_x86_64.manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:bf917009a4a7457c7290225a019f4a0aa706d96accd2cfdba2418d3bc1fcde2f", size = 265277, upload-time = "2026-05-26T06:49:18.656Z" }, - { url = "https://files.pythonhosted.org/packages/b6/09/e533b2ffabaae4e5d5730d6768a591cf335defe8e37bec2ad905d09be656/zope_interface-8.5-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:31cff25b2aaedb5267e6e77b1e9be6b0ec4f622032de8a069202b8ffacda7dc2", size = 266369, upload-time = "2026-05-26T06:49:20.174Z" }, - { url = "https://files.pythonhosted.org/packages/49/4a/3ebe6a4c122b2d5340db45cbe7e490663d3228b172710ec71060cd5d541e/zope_interface-8.5-cp311-cp311-win_amd64.whl", hash = "sha256:17a3114bbdddb5e75e5784cdf318944636190cbbc72d357ef9fb1a8b0351f955", size = 215161, upload-time = "2026-05-26T06:49:21.799Z" }, - { url = "https://files.pythonhosted.org/packages/d2/59/056ad97af5b16db1975ee98ec7ab03d2ce3f3355efad904ced1dbce0e39f/zope_interface-8.5-cp311-cp311-win_arm64.whl", hash = "sha256:aab6bb5bee10f38ea688b95ba054396b67f613552d2c8378be7fcb2d2fba7646", size = 213481, upload-time = "2026-05-26T06:49:25.085Z" }, - { url = "https://files.pythonhosted.org/packages/97/cc/b84123a948f3162a34623e188922827cd845244fdd043ed20f8d02228caa/zope_interface-8.5-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:8e6ee90c2e6de7c37058d5fa41f123c8b13a312db8d1e0fb5840d7f4bcdff9c9", size = 212165, upload-time = "2026-05-26T06:49:26.566Z" }, - { url = "https://files.pythonhosted.org/packages/4e/78/cbceec44f1b27208a76c1a688c131302685852406a23df5aab68324109cc/zope_interface-8.5-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:c1adc90d3576b3b4c4de4953e6002c37bef28b78d7fa54c1bbfd0c50f022fe7c", size = 212341, upload-time = "2026-05-26T06:49:28.182Z" }, - { url = "https://files.pythonhosted.org/packages/e1/c3/005032195ff3b210c139b7c560ed5c534e844b0907d8e44d2b3d8919305e/zope_interface-8.5-cp312-cp312-manylinux1_i686.manylinux2014_i686.manylinux_2_17_i686.manylinux_2_5_i686.whl", hash = "sha256:e6347b8d8d12c5eca6502450a92be30079b7acfade2c4f693efa0deb8871b06e", size = 265296, upload-time = "2026-05-26T06:49:29.741Z" }, - { url = "https://files.pythonhosted.org/packages/c5/66/1036543d6a66bc04c19df3cf650f3ad938a002ab0a443c24e23e8de5e8b9/zope_interface-8.5-cp312-cp312-manylinux1_x86_64.manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:5e970dabea777a24b0b0bbf9dae3ab75ce8b2d8e948edf4875627034b21f3560", size = 270689, upload-time = "2026-05-26T06:49:31.767Z" }, - { url = "https://files.pythonhosted.org/packages/30/4c/8b56259558cace4414e753ca6740396a1f59d4a95ddb55b4658600408670/zope_interface-8.5-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:f0b48ccadaa9839e09ff81e969703cecb3f402c813bfe8b958652e699bea69f5", size = 270280, upload-time = "2026-05-26T06:49:33.489Z" }, - { url = "https://files.pythonhosted.org/packages/f9/ea/649908c83aa8fdb7faf2ddca4d3cf6fb8f2157121267dc56e8f72681e26c/zope_interface-8.5-cp312-cp312-win_amd64.whl", hash = "sha256:e0e311f1277468c08fd59a2b41f71b43d25dff639789d364747acd1705c0df6e", size = 215019, upload-time = "2026-05-26T06:49:35.607Z" }, - { url = "https://files.pythonhosted.org/packages/9f/97/da13037b4c563e4df32eedbc819f8c00b754af494f68211e3dffd48d52da/zope_interface-8.5-cp312-cp312-win_arm64.whl", hash = "sha256:652b73107a04159ec6c020db6c1543d4f1e8f4d069bd2aac88a947820923517b", size = 213569, upload-time = "2026-05-26T06:49:37.317Z" }, - { url = "https://files.pythonhosted.org/packages/f4/8c/4c15755d701f2ec0e80d64a18e1ebaf5be2c584c0ec153fd516f5d13eada/zope_interface-8.5-cp313-cp313-macosx_10_9_x86_64.whl", hash = "sha256:28e80457c134d1fa57a7d758004dece348654e1b1467ac22dcdc20fc1d127c52", size = 212512, upload-time = "2026-05-26T06:49:38.996Z" }, - { url = "https://files.pythonhosted.org/packages/9a/2e/4360c54c465db042cc8fbeeec92abac28b4cedbf6ba63c1f092fd08a190f/zope_interface-8.5-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:09495ce9d559c06b70f2d4855b3e4f48a822a9ddc8be1d30c5b4e5be14ae1ace", size = 212541, upload-time = "2026-05-26T06:49:41.186Z" }, - { url = "https://files.pythonhosted.org/packages/aa/a5/692a2b8d70f78e848793231d5fae5fecbf8d0cccd73430fdc34802a6d3c1/zope_interface-8.5-cp313-cp313-manylinux1_i686.manylinux2014_i686.manylinux_2_17_i686.manylinux_2_5_i686.whl", hash = "sha256:7849ad8fa90763cc1087f4dda78ca3a233e950b3e08fac7079297c9cafbbd7bb", size = 265191, upload-time = "2026-05-26T06:49:43.449Z" }, - { url = "https://files.pythonhosted.org/packages/70/8d/454a9cfc7a050c394ab4f11b3371f7897828b7415e096afff724637e65e0/zope_interface-8.5-cp313-cp313-manylinux1_x86_64.manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:5578c9421ca409a1f39f153d6f7803e4cde01da592ec75a9ac5e1b777d18d33b", size = 270626, upload-time = "2026-05-26T06:49:45.425Z" }, - { url = "https://files.pythonhosted.org/packages/51/8c/db8409cfa3575b8e9b4800babd7d49f8228433cd1f0c56814bd0ada49c33/zope_interface-8.5-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:e1bd7d96b4ca5fa311f54c9eac16dce4886b428c1531dbe06067763ccdf123b4", size = 270444, upload-time = "2026-05-26T06:49:47.025Z" }, - { url = "https://files.pythonhosted.org/packages/4a/df/a386940e41469ef615e100a216d8b386521e9e598817147f87932ca203c4/zope_interface-8.5-cp313-cp313-win_amd64.whl", hash = "sha256:0c8123d2a4dfde2a613c7cb772605477724782c20bc2e0ad1d9435376a6a44a3", size = 215021, upload-time = "2026-05-26T06:49:48.478Z" }, - { url = "https://files.pythonhosted.org/packages/89/75/477eb5669b6b2a7a843decd1a075e9b1971a8720017654143a7183abd3d9/zope_interface-8.5-cp313-cp313-win_arm64.whl", hash = "sha256:6d02be14f3173c6c7288bc2fdf530090c01c3cf8764ad46c68024686f364278e", size = 213610, upload-time = "2026-05-26T06:49:50.01Z" }, { url = "https://files.pythonhosted.org/packages/d4/19/5032e954827fdf02db2d2f49737ac4378bb9cfc2cd95a8f2e2a5ae2ec01a/zope_interface-8.5-cp314-cp314-macosx_10_9_x86_64.whl", hash = "sha256:ffaecf013251a89d0de6feb49a46eba48ad8cbbf8a40aeb6045e459e7bec6784", size = 212597, upload-time = "2026-05-26T06:49:51.63Z" }, { url = "https://files.pythonhosted.org/packages/f1/53/3ef644012cf8a6a234a2d6134aab5a5c65ac5467c86296865501d4fbc406/zope_interface-8.5-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:126fa9d1c52295ae076d4cf968634f0a1826afa408a20808b57ff72877b8f69f", size = 212626, upload-time = "2026-05-26T06:49:53.236Z" }, { url = "https://files.pythonhosted.org/packages/32/67/bc8b4f465d388039255003e230c284a175cedf1203c692f23cb7bff64efe/zope_interface-8.5-cp314-cp314-manylinux1_i686.manylinux2014_i686.manylinux_2_17_i686.manylinux_2_5_i686.whl", hash = "sha256:3090e3a663d20194756a59a272e0c8508b889341e31d5894223331fe6b4f9b21", size = 266827, upload-time = "2026-05-26T06:49:54.873Z" }, @@ -4797,57 +3393,6 @@ version = "0.25.0" source = { registry = "https://pypi.org/simple" } sdist = { url = "https://files.pythonhosted.org/packages/fd/aa/3e0508d5a5dd96529cdc5a97011299056e14c6505b678fd58938792794b1/zstandard-0.25.0.tar.gz", hash = "sha256:7713e1179d162cf5c7906da876ec2ccb9c3a9dcbdffef0cc7f70c3667a205f0b", size = 711513, upload-time = "2025-09-14T22:15:54.002Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/2a/83/c3ca27c363d104980f1c9cee1101cc8ba724ac8c28a033ede6aab89585b1/zstandard-0.25.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:933b65d7680ea337180733cf9e87293cc5500cc0eb3fc8769f4d3c88d724ec5c", size = 795254, upload-time = "2025-09-14T22:16:26.137Z" }, - { url = "https://files.pythonhosted.org/packages/ac/4d/e66465c5411a7cf4866aeadc7d108081d8ceba9bc7abe6b14aa21c671ec3/zstandard-0.25.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:a3f79487c687b1fc69f19e487cd949bf3aae653d181dfb5fde3bf6d18894706f", size = 640559, upload-time = "2025-09-14T22:16:27.973Z" }, - { url = "https://files.pythonhosted.org/packages/12/56/354fe655905f290d3b147b33fe946b0f27e791e4b50a5f004c802cb3eb7b/zstandard-0.25.0-cp311-cp311-manylinux2010_i686.manylinux2014_i686.manylinux_2_12_i686.manylinux_2_17_i686.whl", hash = "sha256:0bbc9a0c65ce0eea3c34a691e3c4b6889f5f3909ba4822ab385fab9057099431", size = 5348020, upload-time = "2025-09-14T22:16:29.523Z" }, - { url = "https://files.pythonhosted.org/packages/3b/13/2b7ed68bd85e69a2069bcc72141d378f22cae5a0f3b353a2c8f50ef30c1b/zstandard-0.25.0-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:01582723b3ccd6939ab7b3a78622c573799d5d8737b534b86d0e06ac18dbde4a", size = 5058126, upload-time = "2025-09-14T22:16:31.811Z" }, - { url = "https://files.pythonhosted.org/packages/c9/dd/fdaf0674f4b10d92cb120ccff58bbb6626bf8368f00ebfd2a41ba4a0dc99/zstandard-0.25.0-cp311-cp311-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:5f1ad7bf88535edcf30038f6919abe087f606f62c00a87d7e33e7fc57cb69fcc", size = 5405390, upload-time = "2025-09-14T22:16:33.486Z" }, - { url = "https://files.pythonhosted.org/packages/0f/67/354d1555575bc2490435f90d67ca4dd65238ff2f119f30f72d5cde09c2ad/zstandard-0.25.0-cp311-cp311-manylinux2014_s390x.manylinux_2_17_s390x.whl", hash = "sha256:06acb75eebeedb77b69048031282737717a63e71e4ae3f77cc0c3b9508320df6", size = 5452914, upload-time = "2025-09-14T22:16:35.277Z" }, - { url = "https://files.pythonhosted.org/packages/bb/1f/e9cfd801a3f9190bf3e759c422bbfd2247db9d7f3d54a56ecde70137791a/zstandard-0.25.0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:9300d02ea7c6506f00e627e287e0492a5eb0371ec1670ae852fefffa6164b072", size = 5559635, upload-time = "2025-09-14T22:16:37.141Z" }, - { url = "https://files.pythonhosted.org/packages/21/88/5ba550f797ca953a52d708c8e4f380959e7e3280af029e38fbf47b55916e/zstandard-0.25.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:bfd06b1c5584b657a2892a6014c2f4c20e0db0208c159148fa78c65f7e0b0277", size = 5048277, upload-time = "2025-09-14T22:16:38.807Z" }, - { url = "https://files.pythonhosted.org/packages/46/c0/ca3e533b4fa03112facbe7fbe7779cb1ebec215688e5df576fe5429172e0/zstandard-0.25.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:f373da2c1757bb7f1acaf09369cdc1d51d84131e50d5fa9863982fd626466313", size = 5574377, upload-time = "2025-09-14T22:16:40.523Z" }, - { url = "https://files.pythonhosted.org/packages/12/9b/3fb626390113f272abd0799fd677ea33d5fc3ec185e62e6be534493c4b60/zstandard-0.25.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:6c0e5a65158a7946e7a7affa6418878ef97ab66636f13353b8502d7ea03c8097", size = 4961493, upload-time = "2025-09-14T22:16:43.3Z" }, - { url = "https://files.pythonhosted.org/packages/cb/d3/23094a6b6a4b1343b27ae68249daa17ae0651fcfec9ed4de09d14b940285/zstandard-0.25.0-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:c8e167d5adf59476fa3e37bee730890e389410c354771a62e3c076c86f9f7778", size = 5269018, upload-time = "2025-09-14T22:16:45.292Z" }, - { url = "https://files.pythonhosted.org/packages/8c/a7/bb5a0c1c0f3f4b5e9d5b55198e39de91e04ba7c205cc46fcb0f95f0383c1/zstandard-0.25.0-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:98750a309eb2f020da61e727de7d7ba3c57c97cf6213f6f6277bb7fb42a8e065", size = 5443672, upload-time = "2025-09-14T22:16:47.076Z" }, - { url = "https://files.pythonhosted.org/packages/27/22/503347aa08d073993f25109c36c8d9f029c7d5949198050962cb568dfa5e/zstandard-0.25.0-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:22a086cff1b6ceca18a8dd6096ec631e430e93a8e70a9ca5efa7561a00f826fa", size = 5822753, upload-time = "2025-09-14T22:16:49.316Z" }, - { url = "https://files.pythonhosted.org/packages/e2/be/94267dc6ee64f0f8ba2b2ae7c7a2df934a816baaa7291db9e1aa77394c3c/zstandard-0.25.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:72d35d7aa0bba323965da807a462b0966c91608ef3a48ba761678cb20ce5d8b7", size = 5366047, upload-time = "2025-09-14T22:16:51.328Z" }, - { url = "https://files.pythonhosted.org/packages/7b/a3/732893eab0a3a7aecff8b99052fecf9f605cf0fb5fb6d0290e36beee47a4/zstandard-0.25.0-cp311-cp311-win32.whl", hash = "sha256:f5aeea11ded7320a84dcdd62a3d95b5186834224a9e55b92ccae35d21a8b63d4", size = 436484, upload-time = "2025-09-14T22:16:55.005Z" }, - { url = "https://files.pythonhosted.org/packages/43/a3/c6155f5c1cce691cb80dfd38627046e50af3ee9ddc5d0b45b9b063bfb8c9/zstandard-0.25.0-cp311-cp311-win_amd64.whl", hash = "sha256:daab68faadb847063d0c56f361a289c4f268706b598afbf9ad113cbe5c38b6b2", size = 506183, upload-time = "2025-09-14T22:16:52.753Z" }, - { url = "https://files.pythonhosted.org/packages/8c/3e/8945ab86a0820cc0e0cdbf38086a92868a9172020fdab8a03ac19662b0e5/zstandard-0.25.0-cp311-cp311-win_arm64.whl", hash = "sha256:22a06c5df3751bb7dc67406f5374734ccee8ed37fc5981bf1ad7041831fa1137", size = 462533, upload-time = "2025-09-14T22:16:53.878Z" }, - { url = "https://files.pythonhosted.org/packages/82/fc/f26eb6ef91ae723a03e16eddb198abcfce2bc5a42e224d44cc8b6765e57e/zstandard-0.25.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:7b3c3a3ab9daa3eed242d6ecceead93aebbb8f5f84318d82cee643e019c4b73b", size = 795738, upload-time = "2025-09-14T22:16:56.237Z" }, - { url = "https://files.pythonhosted.org/packages/aa/1c/d920d64b22f8dd028a8b90e2d756e431a5d86194caa78e3819c7bf53b4b3/zstandard-0.25.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:913cbd31a400febff93b564a23e17c3ed2d56c064006f54efec210d586171c00", size = 640436, upload-time = "2025-09-14T22:16:57.774Z" }, - { url = "https://files.pythonhosted.org/packages/53/6c/288c3f0bd9fcfe9ca41e2c2fbfd17b2097f6af57b62a81161941f09afa76/zstandard-0.25.0-cp312-cp312-manylinux2010_i686.manylinux2014_i686.manylinux_2_12_i686.manylinux_2_17_i686.whl", hash = "sha256:011d388c76b11a0c165374ce660ce2c8efa8e5d87f34996aa80f9c0816698b64", size = 5343019, upload-time = "2025-09-14T22:16:59.302Z" }, - { url = "https://files.pythonhosted.org/packages/1e/15/efef5a2f204a64bdb5571e6161d49f7ef0fffdbca953a615efbec045f60f/zstandard-0.25.0-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:6dffecc361d079bb48d7caef5d673c88c8988d3d33fb74ab95b7ee6da42652ea", size = 5063012, upload-time = "2025-09-14T22:17:01.156Z" }, - { url = "https://files.pythonhosted.org/packages/b7/37/a6ce629ffdb43959e92e87ebdaeebb5ac81c944b6a75c9c47e300f85abdf/zstandard-0.25.0-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:7149623bba7fdf7e7f24312953bcf73cae103db8cae49f8154dd1eadc8a29ecb", size = 5394148, upload-time = "2025-09-14T22:17:03.091Z" }, - { url = "https://files.pythonhosted.org/packages/e3/79/2bf870b3abeb5c070fe2d670a5a8d1057a8270f125ef7676d29ea900f496/zstandard-0.25.0-cp312-cp312-manylinux2014_s390x.manylinux_2_17_s390x.whl", hash = "sha256:6a573a35693e03cf1d67799fd01b50ff578515a8aeadd4595d2a7fa9f3ec002a", size = 5451652, upload-time = "2025-09-14T22:17:04.979Z" }, - { url = "https://files.pythonhosted.org/packages/53/60/7be26e610767316c028a2cbedb9a3beabdbe33e2182c373f71a1c0b88f36/zstandard-0.25.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:5a56ba0db2d244117ed744dfa8f6f5b366e14148e00de44723413b2f3938a902", size = 5546993, upload-time = "2025-09-14T22:17:06.781Z" }, - { url = "https://files.pythonhosted.org/packages/85/c7/3483ad9ff0662623f3648479b0380d2de5510abf00990468c286c6b04017/zstandard-0.25.0-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:10ef2a79ab8e2974e2075fb984e5b9806c64134810fac21576f0668e7ea19f8f", size = 5046806, upload-time = "2025-09-14T22:17:08.415Z" }, - { url = "https://files.pythonhosted.org/packages/08/b3/206883dd25b8d1591a1caa44b54c2aad84badccf2f1de9e2d60a446f9a25/zstandard-0.25.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:aaf21ba8fb76d102b696781bddaa0954b782536446083ae3fdaa6f16b25a1c4b", size = 5576659, upload-time = "2025-09-14T22:17:10.164Z" }, - { url = "https://files.pythonhosted.org/packages/9d/31/76c0779101453e6c117b0ff22565865c54f48f8bd807df2b00c2c404b8e0/zstandard-0.25.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:1869da9571d5e94a85a5e8d57e4e8807b175c9e4a6294e3b66fa4efb074d90f6", size = 4953933, upload-time = "2025-09-14T22:17:11.857Z" }, - { url = "https://files.pythonhosted.org/packages/18/e1/97680c664a1bf9a247a280a053d98e251424af51f1b196c6d52f117c9720/zstandard-0.25.0-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:809c5bcb2c67cd0ed81e9229d227d4ca28f82d0f778fc5fea624a9def3963f91", size = 5268008, upload-time = "2025-09-14T22:17:13.627Z" }, - { url = "https://files.pythonhosted.org/packages/1e/73/316e4010de585ac798e154e88fd81bb16afc5c5cb1a72eeb16dd37e8024a/zstandard-0.25.0-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:f27662e4f7dbf9f9c12391cb37b4c4c3cb90ffbd3b1fb9284dadbbb8935fa708", size = 5433517, upload-time = "2025-09-14T22:17:16.103Z" }, - { url = "https://files.pythonhosted.org/packages/5b/60/dd0f8cfa8129c5a0ce3ea6b7f70be5b33d2618013a161e1ff26c2b39787c/zstandard-0.25.0-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:99c0c846e6e61718715a3c9437ccc625de26593fea60189567f0118dc9db7512", size = 5814292, upload-time = "2025-09-14T22:17:17.827Z" }, - { url = "https://files.pythonhosted.org/packages/fc/5f/75aafd4b9d11b5407b641b8e41a57864097663699f23e9ad4dbb91dc6bfe/zstandard-0.25.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:474d2596a2dbc241a556e965fb76002c1ce655445e4e3bf38e5477d413165ffa", size = 5360237, upload-time = "2025-09-14T22:17:19.954Z" }, - { url = "https://files.pythonhosted.org/packages/ff/8d/0309daffea4fcac7981021dbf21cdb2e3427a9e76bafbcdbdf5392ff99a4/zstandard-0.25.0-cp312-cp312-win32.whl", hash = "sha256:23ebc8f17a03133b4426bcc04aabd68f8236eb78c3760f12783385171b0fd8bd", size = 436922, upload-time = "2025-09-14T22:17:24.398Z" }, - { url = "https://files.pythonhosted.org/packages/79/3b/fa54d9015f945330510cb5d0b0501e8253c127cca7ebe8ba46a965df18c5/zstandard-0.25.0-cp312-cp312-win_amd64.whl", hash = "sha256:ffef5a74088f1e09947aecf91011136665152e0b4b359c42be3373897fb39b01", size = 506276, upload-time = "2025-09-14T22:17:21.429Z" }, - { url = "https://files.pythonhosted.org/packages/ea/6b/8b51697e5319b1f9ac71087b0af9a40d8a6288ff8025c36486e0c12abcc4/zstandard-0.25.0-cp312-cp312-win_arm64.whl", hash = "sha256:181eb40e0b6a29b3cd2849f825e0fa34397f649170673d385f3598ae17cca2e9", size = 462679, upload-time = "2025-09-14T22:17:23.147Z" }, - { url = "https://files.pythonhosted.org/packages/35/0b/8df9c4ad06af91d39e94fa96cc010a24ac4ef1378d3efab9223cc8593d40/zstandard-0.25.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:ec996f12524f88e151c339688c3897194821d7f03081ab35d31d1e12ec975e94", size = 795735, upload-time = "2025-09-14T22:17:26.042Z" }, - { url = "https://files.pythonhosted.org/packages/3f/06/9ae96a3e5dcfd119377ba33d4c42a7d89da1efabd5cb3e366b156c45ff4d/zstandard-0.25.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:a1a4ae2dec3993a32247995bdfe367fc3266da832d82f8438c8570f989753de1", size = 640440, upload-time = "2025-09-14T22:17:27.366Z" }, - { url = "https://files.pythonhosted.org/packages/d9/14/933d27204c2bd404229c69f445862454dcc101cd69ef8c6068f15aaec12c/zstandard-0.25.0-cp313-cp313-manylinux2010_i686.manylinux2014_i686.manylinux_2_12_i686.manylinux_2_17_i686.whl", hash = "sha256:e96594a5537722fdfb79951672a2a63aec5ebfb823e7560586f7484819f2a08f", size = 5343070, upload-time = "2025-09-14T22:17:28.896Z" }, - { url = "https://files.pythonhosted.org/packages/6d/db/ddb11011826ed7db9d0e485d13df79b58586bfdec56e5c84a928a9a78c1c/zstandard-0.25.0-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:bfc4e20784722098822e3eee42b8e576b379ed72cca4a7cb856ae733e62192ea", size = 5063001, upload-time = "2025-09-14T22:17:31.044Z" }, - { url = "https://files.pythonhosted.org/packages/db/00/87466ea3f99599d02a5238498b87bf84a6348290c19571051839ca943777/zstandard-0.25.0-cp313-cp313-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:457ed498fc58cdc12fc48f7950e02740d4f7ae9493dd4ab2168a47c93c31298e", size = 5394120, upload-time = "2025-09-14T22:17:32.711Z" }, - { url = "https://files.pythonhosted.org/packages/2b/95/fc5531d9c618a679a20ff6c29e2b3ef1d1f4ad66c5e161ae6ff847d102a9/zstandard-0.25.0-cp313-cp313-manylinux2014_s390x.manylinux_2_17_s390x.whl", hash = "sha256:fd7a5004eb1980d3cefe26b2685bcb0b17989901a70a1040d1ac86f1d898c551", size = 5451230, upload-time = "2025-09-14T22:17:34.41Z" }, - { url = "https://files.pythonhosted.org/packages/63/4b/e3678b4e776db00f9f7b2fe58e547e8928ef32727d7a1ff01dea010f3f13/zstandard-0.25.0-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:8e735494da3db08694d26480f1493ad2cf86e99bdd53e8e9771b2752a5c0246a", size = 5547173, upload-time = "2025-09-14T22:17:36.084Z" }, - { url = "https://files.pythonhosted.org/packages/4e/d5/ba05ed95c6b8ec30bd468dfeab20589f2cf709b5c940483e31d991f2ca58/zstandard-0.25.0-cp313-cp313-musllinux_1_1_aarch64.whl", hash = "sha256:3a39c94ad7866160a4a46d772e43311a743c316942037671beb264e395bdd611", size = 5046736, upload-time = "2025-09-14T22:17:37.891Z" }, - { url = "https://files.pythonhosted.org/packages/50/d5/870aa06b3a76c73eced65c044b92286a3c4e00554005ff51962deef28e28/zstandard-0.25.0-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:172de1f06947577d3a3005416977cce6168f2261284c02080e7ad0185faeced3", size = 5576368, upload-time = "2025-09-14T22:17:40.206Z" }, - { url = "https://files.pythonhosted.org/packages/5d/35/398dc2ffc89d304d59bc12f0fdd931b4ce455bddf7038a0a67733a25f550/zstandard-0.25.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:3c83b0188c852a47cd13ef3bf9209fb0a77fa5374958b8c53aaa699398c6bd7b", size = 4954022, upload-time = "2025-09-14T22:17:41.879Z" }, - { url = "https://files.pythonhosted.org/packages/9a/5c/36ba1e5507d56d2213202ec2b05e8541734af5f2ce378c5d1ceaf4d88dc4/zstandard-0.25.0-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:1673b7199bbe763365b81a4f3252b8e80f44c9e323fc42940dc8843bfeaf9851", size = 5267889, upload-time = "2025-09-14T22:17:43.577Z" }, - { url = "https://files.pythonhosted.org/packages/70/e8/2ec6b6fb7358b2ec0113ae202647ca7c0e9d15b61c005ae5225ad0995df5/zstandard-0.25.0-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:0be7622c37c183406f3dbf0cba104118eb16a4ea7359eeb5752f0794882fc250", size = 5433952, upload-time = "2025-09-14T22:17:45.271Z" }, - { url = "https://files.pythonhosted.org/packages/7b/01/b5f4d4dbc59ef193e870495c6f1275f5b2928e01ff5a81fecb22a06e22fb/zstandard-0.25.0-cp313-cp313-musllinux_1_2_s390x.whl", hash = "sha256:5f5e4c2a23ca271c218ac025bd7d635597048b366d6f31f420aaeb715239fc98", size = 5814054, upload-time = "2025-09-14T22:17:47.08Z" }, - { url = "https://files.pythonhosted.org/packages/b2/e5/fbd822d5c6f427cf158316d012c5a12f233473c2f9c5fe5ab1ae5d21f3d8/zstandard-0.25.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:4f187a0bb61b35119d1926aee039524d1f93aaf38a9916b8c4b78ac8514a0aaf", size = 5360113, upload-time = "2025-09-14T22:17:48.893Z" }, - { url = "https://files.pythonhosted.org/packages/8e/e0/69a553d2047f9a2c7347caa225bb3a63b6d7704ad74610cb7823baa08ed7/zstandard-0.25.0-cp313-cp313-win32.whl", hash = "sha256:7030defa83eef3e51ff26f0b7bfb229f0204b66fe18e04359ce3474ac33cbc09", size = 436936, upload-time = "2025-09-14T22:17:52.658Z" }, - { url = "https://files.pythonhosted.org/packages/d9/82/b9c06c870f3bd8767c201f1edbdf9e8dc34be5b0fbc5682c4f80fe948475/zstandard-0.25.0-cp313-cp313-win_amd64.whl", hash = "sha256:1f830a0dac88719af0ae43b8b2d6aef487d437036468ef3c2ea59c51f9d55fd5", size = 506232, upload-time = "2025-09-14T22:17:50.402Z" }, - { url = "https://files.pythonhosted.org/packages/d4/57/60c3c01243bb81d381c9916e2a6d9e149ab8627c0c7d7abb2d73384b3c0c/zstandard-0.25.0-cp313-cp313-win_arm64.whl", hash = "sha256:85304a43f4d513f5464ceb938aa02c1e78c2943b29f44a750b48b25ac999a049", size = 462671, upload-time = "2025-09-14T22:17:51.533Z" }, { url = "https://files.pythonhosted.org/packages/3d/5c/f8923b595b55fe49e30612987ad8bf053aef555c14f05bb659dd5dbe3e8a/zstandard-0.25.0-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:e29f0cf06974c899b2c188ef7f783607dbef36da4c242eb6c82dcd8b512855e3", size = 795887, upload-time = "2025-09-14T22:17:54.198Z" }, { url = "https://files.pythonhosted.org/packages/8d/09/d0a2a14fc3439c5f874042dca72a79c70a532090b7ba0003be73fee37ae2/zstandard-0.25.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:05df5136bc5a011f33cd25bc9f506e7426c0c9b3f9954f056831ce68f3b6689f", size = 640658, upload-time = "2025-09-14T22:17:55.423Z" }, { url = "https://files.pythonhosted.org/packages/5d/7c/8b6b71b1ddd517f68ffb55e10834388d4f793c49c6b83effaaa05785b0b4/zstandard-0.25.0-cp314-cp314-manylinux2010_i686.manylinux_2_12_i686.manylinux_2_28_i686.whl", hash = "sha256:f604efd28f239cc21b3adb53eb061e2a205dc164be408e553b41ba2ffe0ca15c", size = 5379849, upload-time = "2025-09-14T22:17:57.372Z" }, From 859328e9b32560792ae0a2dc94ce9c2139f0eeb3 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 3 Jun 2026 13:23:27 -0700 Subject: [PATCH 271/591] Abstracted repository and models --- .../mpcontribs_api/domains/_shared/models.py | 38 +++++++++ .../domains/_shared/repository.py | 79 +++++++++++++++++++ 2 files changed, 117 insertions(+) create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py new file mode 100644 index 0000000000..1fec00611b --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py @@ -0,0 +1,38 @@ +from typing import Annotated, Any, Self + +from beanie import DocumentWithSoftDelete +from pydantic import Field + +from src.mpcontribs_api.projection import SparseFieldsModel + + +class BaseDocumentWithInput[TId](DocumentWithSoftDelete): + """A stored resource document with a required ``id`` and an input counterpart. + + Subclasses bind their id type as ``TId``. The ``id`` is declared here as required and non-null so + the repository can always read and key on it, while ``TId`` lets each resource pick its own id + type (``ShortStr`` for projects, ``PydanticObjectId`` for contributions). ``from_input_model`` + translates a validated input payload into a full document; the base param is intentionally ``Any`` + so each resource's override can declare its concrete input model without violating LSP (input + models subclass their document, so they can't be bound as a class type parameter). Soft-delete + behavior is inherited from ``DocumentWithSoftDelete``. + """ + + # Required, non-null, resource-specific id. Overrides Document's optional ``PydanticObjectId`` id. + id: TId = Field(alias="_id") # pyright: ignore[reportGeneralTypeIssues, reportIncompatibleVariableOverride] + + @classmethod + def from_input_model(cls, data: Any) -> Self: + """Translate a validated input payload into a full stored document.""" + return cls(**data.model_dump()) + + +class DocumentOut[TId](SparseFieldsModel): + """Base output model for resources addressed by an ``_id``. + + Mirrors :class:`BaseDocumentWithInput`: subclasses bind their id type as ``TId`` so each resource + owns its id type, while the field (optional, since projections may omit it) and its alias wiring + are declared once here for the repository to read off any resource's output model. + """ + + id: Annotated[TId | None, Field(alias="_id", serialization_alias="id")] = None diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py new file mode 100644 index 0000000000..c5c6395a73 --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py @@ -0,0 +1,79 @@ +from abc import ABC, abstractmethod +from typing import Any + +from fastapi_filter.contrib.beanie import Filter +from pydantic import BaseModel + +from src.mpcontribs_api.auth import User +from src.mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut +from src.mpcontribs_api.exceptions import ConflictError +from src.mpcontribs_api.pagination import CursorParams, Page, decode_cursor, encode_cursor + + +class MongoDbRepository[TDoc: BaseDocumentWithInput, TIn: BaseModel, TOut: DocumentOut](ABC): + """Base repository encapsulating shared MongoDB access patterns. + + Subclasses bind the document, input, and output types as type parameters, set the matching + ``document_model`` / ``out_model`` class attributes, and implement ``_build_scope`` to enforce + per-user authorization. Shared query logic (scoping, projection, cursor pagination, insertion) + lives here; resource-specific operations stay on the concrete subclasses where they keep their + precise types. + + Attributes: + document_model: the ``BaseDocumentWithInput`` subclass this repository operates on + out_model: the ``SparseFieldsModel`` subclass used to build projections for reads + _scope (dict[str, Any]): terms injected into every query to enforce user authorization + """ + + document_model: type[TDoc] + out_model: type[TOut] + + def __init__(self, user: User) -> None: + """Initializes an instance based on the current user. + + Args: + user (User): the current user requesting resources + """ + self._scope = self._build_scope(user) + + @staticmethod + @abstractmethod + def _build_scope(user: User) -> dict[str, Any]: + """Provides scope based on current user's permitted groups and publicly released data.""" + ... + + async def get_many( + self, + pagination: CursorParams, + filter: Filter, + fields: frozenset[str] | None, + ) -> Page[TOut]: + """Return a scoped, filtered, cursor-paginated page of projected documents. + + Args: + pagination (CursorParams): forward-only cursor parameters + filter (Filter): the fastapi-filter query to apply on top of the user scope + fields (frozenset[str] | None): fields to project; if None the full document is returned + """ + projection = self.out_model.projection(fields) + query = filter.filter(self.document_model.find(self._scope)) + if pagination.cursor is not None: + query = query.find(self.document_model.id > decode_cursor(pagination.cursor)) # pyright: ignore[reportOptionalOperand] + docs = await query.sort(self.document_model.id).limit(pagination.limit + 1).project(projection).to_list() # pyright: ignore[reportArgumentType] + has_more = len(docs) > pagination.limit + items = docs[: pagination.limit] + next_cursor = encode_cursor(str(items[-1].id)) if has_more and items else None + return Page(items=items, next_cursor=next_cursor) + + async def insert_one(self, in_resource: TIn) -> TDoc: + """Insert a new document built from its input model, rejecting duplicate ids. + + Args: + in_resource (TIn): the validated input payload to translate and store + """ + document = self.document_model.from_input_model(in_resource) + existing = await self.document_model.find_one(self.document_model.id == document.id) + if existing: + raise ConflictError(f"Cannot insert document.\n Document with ID {document.id} exists") + await document.insert() + return document From 4ce0a8d98df1ba3ff15fbab7690d7631ea7ea65d Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 3 Jun 2026 13:23:51 -0700 Subject: [PATCH 272/591] Implemented classes and methods with new abstractions --- .../domains/contributions/models.py | 15 ++++--- .../domains/contributions/repository.py | 23 +++++----- .../domains/contributions/router.py | 4 +- .../mpcontribs_api/domains/projects/models.py | 19 ++++---- .../domains/projects/repository.py | 43 ++++++------------- 5 files changed, 47 insertions(+), 57 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py index 2a88d69007..ba5015b142 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py @@ -2,9 +2,9 @@ from typing import Any from beanie import ( - Document, Insert, Link, + PydanticObjectId, Replace, Save, SaveChanges, @@ -14,6 +14,7 @@ from fastapi_filter.contrib.beanie import Filter from pydantic import Field +from src.mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut from src.mpcontribs_api.domains.attachments.models import Attachment from src.mpcontribs_api.domains.structures.models import Structure from src.mpcontribs_api.domains.tables.models import Table @@ -21,7 +22,7 @@ from src.mpcontribs_api.types import ShortStr -class ContributionBase(Document): +class ContributionBase(BaseDocumentWithInput[PydanticObjectId]): project: str identifier: str formula: str @@ -44,7 +45,7 @@ class Contribution(ContributionBase): # needs_build: bool = True @classmethod - def from_contribution_in(cls, data: ContributionIn) -> Contribution: + def from_input_model(cls, data: ContributionIn) -> Contribution: return cls.model_validate( { **data.model_dump(exclude={"is_public"}), @@ -61,7 +62,7 @@ class ContributionIn(ContributionBase): pass -class ContributionOut(SparseFieldsModel): +class ContributionOut(DocumentOut[PydanticObjectId]): project: str | None = None identifier: str | None = None formula: str | None = None @@ -86,9 +87,9 @@ class ContributionPatch(SparseFieldsModel): class ContributionFilter(Filter): - id: str | None = None - id__in: list[str] | None = None - id__neq: str | None = None + id: PydanticObjectId | None = None + id__in: list[PydanticObjectId] | None = None + id__neq: PydanticObjectId | None = None identifier: str | None = None identifier__in: list[ShortStr] | None = None diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py index 4cfa191b3a..8819c4ffb2 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py @@ -1,22 +1,20 @@ from typing import Any, Literal from src.mpcontribs_api.auth import User +from src.mpcontribs_api.domains._shared.repository import MongoDbRepository from src.mpcontribs_api.domains.contributions.models import ( + Contribution, ContributionFilter, ContributionIn, + ContributionOut, ContributionPatch, ) from src.mpcontribs_api.pagination import CursorParams -class MongoDbContributionRepository: - def __init__(self, user: User) -> None: - """Initializes an instance based on the current user. - - Args: - user (User): the current user requesting resources - """ - self._scope = self._build_scope(user) +class MongoDbContributionRepository(MongoDbRepository[Contribution, ContributionIn, ContributionOut]): + document_model = Contribution + out_model = ContributionOut @staticmethod def _build_scope(user: User) -> dict[str, Any]: @@ -29,8 +27,13 @@ def _build_scope(user: User) -> dict[str, Any]: ors.append({"_id": {"$in": sorted(user.groups)}}) return {"$or": ors} - async def get_contributions(self, pagination: CursorParams, filter: ContributionFilter, fields: str | None): - pass + async def get_contributions( + self, + pagination: CursorParams, + filter: ContributionFilter, + fields: frozenset[str] | None, + ): + return await self.get_many(pagination=pagination, filter=filter, fields=fields) async def delete_contributions(self, filter: ContributionFilter): pass diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py index cbd5837505..f2923c40ff 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py @@ -7,6 +7,7 @@ from src.mpcontribs_api.domains.contributions.models import ( ContributionFilter, ContributionIn, + ContributionOut, ContributionPatch, ) from src.mpcontribs_api.pagination import CursorParams @@ -21,7 +22,8 @@ async def get_contributions( filter: ContributionFilter = FilterDepends(ContributionFilter), fields: Annotated[str | None, Query(alias="_fields")] = None, ): - return await repo.get_contributions(pagination=pagination, filter=filter, fields=fields) + field_set = ContributionOut.parse_fields(fields) + return await repo.get_contributions(pagination=pagination, filter=filter, fields=field_set) @router.delete("") diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py index 9f78c568f9..0a1bca7479 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py @@ -1,12 +1,11 @@ from __future__ import annotations -from typing import Annotated, Any, Literal +from typing import Any, Literal -from beanie import DocumentWithSoftDelete from fastapi_filter.contrib.beanie import Filter from pydantic import BaseModel, ConfigDict, Field, HttpUrl -from src.mpcontribs_api.projection import SparseFieldsModel +from src.mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut from src.mpcontribs_api.types import PrefixedEmail, ShortStr @@ -36,12 +35,13 @@ class Reference(BaseModel): url: HttpUrl -class Project(DocumentWithSoftDelete): - """Document model of what is actually stored.""" +class Project(BaseDocumentWithInput[ShortStr]): + """Document model of what is actually stored. + + Binds ``id`` to ``ShortStr`` (a meaningful string id, always supplied) via the generic base. + """ # Required - # meaningful string id, always supplied - id: ShortStr = Field(alias="_id") # pyright: ignore[reportGeneralTypeIssues, reportIncompatibleVariableOverride] title: ShortStr authors: str description: str @@ -60,7 +60,7 @@ class Project(DocumentWithSoftDelete): # Empty method for now. Keeping for business logic later @classmethod - def from_project_in(cls, data: ProjectIn) -> Project: + def from_input_model(cls, data: ProjectIn) -> Project: return cls(**data.model_dump()) class Settings: @@ -68,11 +68,10 @@ class Settings: keep_nulls = False -class ProjectOut(SparseFieldsModel): +class ProjectOut(DocumentOut[ShortStr]): """Full response of all public-facing fields.""" model_config = ConfigDict(extra="ignore") - id: Annotated[ShortStr | None, Field(alias="_id", serialization_alias="id")] = None authors: str | None = None description: str | None = None title: ShortStr | None = None diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py index 2a13f3c2ec..4da3a634a0 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py @@ -5,6 +5,7 @@ from pydantic import BaseModel from src.mpcontribs_api.auth import User +from src.mpcontribs_api.domains._shared.repository import MongoDbRepository from src.mpcontribs_api.domains.projects.models import ( Project, ProjectFilter, @@ -15,9 +16,6 @@ from src.mpcontribs_api.exceptions import ConflictError, NotFoundError from src.mpcontribs_api.pagination import ( CursorParams, - Page, - decode_cursor, - encode_cursor, ) @@ -30,7 +28,7 @@ class HasId(BaseModel): M = TypeVar("M", bound=BaseModel) -class MongoDbProjectRepository: +class MongoDbProjectRepository(MongoDbRepository[Project, ProjectIn, ProjectOut]): """A repository layer for access to MongoDB. This is the layer that directly interacts with database operations @@ -40,13 +38,8 @@ class MongoDbProjectRepository: resources """ - def __init__(self, user: User) -> None: - """Initializes an instance based on the current user. - - Args: - user (User): the current user requesting resources - """ - self._scope = self._build_scope(user) + document_model = Project + out_model = ProjectOut @staticmethod def _build_scope(user: User) -> dict[str, Any]: @@ -73,10 +66,10 @@ async def get_project_by_id(self, id: str, fields: frozenset[str] | None): ProjectOut: a projection of ProjectOut containing 'fields' from requested id """ # TODO: Verify that self._scope and Project.id == id get combined properly - return await Project.find_one( + return await self.document_model.find_one( self._scope, - Project.id == id, - projection_model=ProjectOut.projection(fields), + self.document_model.id == id, + projection_model=self.out_model.projection(fields), ) # Brendan TODO: Does not handle compound pagination/sorting @@ -97,15 +90,7 @@ async def get_project( fields (frozenset[str] | None): the fields to use for projection. If none, the document is returned without projection """ - proj = ProjectOut.projection(fields) - query = filter.filter(Project.find(self._scope)) - if pagination.cursor is not None: - query = query.find(Project.id > decode_cursor(pagination.cursor)) - docs = await query.sort(Project.id).limit(pagination.limit + 1).project(proj).to_list() - has_more = len(docs) > pagination.limit - items = docs[: pagination.limit] - next_cursor = encode_cursor(str(items[-1].id)) if has_more and items else None - return Page(items=items, next_cursor=next_cursor) + return await self.get_many(pagination=pagination, filter=filter, fields=fields) async def insert_project(self, project: ProjectIn) -> Project: """Inserst a new project. @@ -116,11 +101,11 @@ async def insert_project(self, project: ProjectIn) -> Project: Returns: Project: the project after succesful insertion """ - id_exists = await Project.find_one(Project.id == project.id) + id_exists = await self.document_model.find_one(self.document_model.id == project.id) # Brendan TODO: if id_exists: raise ConflictError(f"Cannot insert project.\n Project with ID {project.id} exists") - full_project = Project.from_project_in(project) + full_project = self.document_model.from_input_model(project) await full_project.insert() return full_project @@ -141,7 +126,7 @@ async def patch_project(self, id: str, update: ProjectPatch) -> Project: update_data = update.model_dump(exclude_unset=True) # If update is empty, return the model anyways (consistent behavior) if not update_data: - existing = await Project.get(id) + existing = await self.document_model.get(id) if existing is None: raise NotFoundError(f"Project with id {id} not found") return existing @@ -149,7 +134,7 @@ async def patch_project(self, id: str, update: ProjectPatch) -> Project: # Otherwise, update the fields fully (set) # Brendan TODO: Set will replace an entire field # - if we want to append to a list (ie. add a reference) we ned Push/AddToSet - query = Project.find_one(Project.id == id).update( + query = self.document_model.find_one(self.document_model.id == id).update( Set(update_data), response_type=UpdateResponse.NEW_DOCUMENT, ) @@ -164,7 +149,7 @@ async def delete_project(self, id: str): Args: id (str): the id of the project to delete """ - await Project.find_one(Project.id == id).delete() + await self.document_model.find_one(self.document_model.id == id).delete() async def upsert_project(self, id: str, data: ProjectIn) -> Project: """Upsert a project by provided id. @@ -180,6 +165,6 @@ async def upsert_project(self, id: str, data: ProjectIn) -> Project: Returns: Project: the full document that either replaced an old one or was inserted """ - project = Project.from_project_in(data) + project = self.document_model.from_input_model(data) project.id = id return await project.save() From cf6d658d34b5a84397a71d2b4d9c5940c66c9239 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 3 Jun 2026 13:34:47 -0700 Subject: [PATCH 273/591] Implemented delete_contributions --- .../src/mpcontribs_api/domains/contributions/repository.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py index 8819c4ffb2..29306b3e4e 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py @@ -36,7 +36,8 @@ async def get_contributions( return await self.get_many(pagination=pagination, filter=filter, fields=fields) async def delete_contributions(self, filter: ContributionFilter): - pass + docs = filter.filter(self.document_model.find(self._scope)) + await docs.delete() async def insert_contributions(self, contributions: list[ContributionIn]): pass From 2f28e69f46b3590c66fcfd3a40734652e235ddac Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 3 Jun 2026 13:43:14 -0700 Subject: [PATCH 274/591] Added linked-document filtering for contributions --- .../src/mpcontribs_api/domains/attachments/models.py | 5 +++++ .../mpcontribs_api/domains/contributions/models.py | 11 ++++++++--- .../src/mpcontribs_api/domains/structures/models.py | 5 +++++ .../src/mpcontribs_api/domains/tables/models.py | 5 +++++ 4 files changed, 23 insertions(+), 3 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py b/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py index ef24f2ad42..91f5081983 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py @@ -1,5 +1,10 @@ from beanie import Document +from fastapi_filter.contrib.beanie import Filter class Attachment(Document): pass + + +class AttachmentFilter(Filter): + pass diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py index ba5015b142..9da39c1f4f 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py @@ -11,13 +11,14 @@ Update, before_event, ) +from fastapi_filter import FilterDepends, with_prefix from fastapi_filter.contrib.beanie import Filter from pydantic import Field from src.mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut -from src.mpcontribs_api.domains.attachments.models import Attachment -from src.mpcontribs_api.domains.structures.models import Structure -from src.mpcontribs_api.domains.tables.models import Table +from src.mpcontribs_api.domains.attachments.models import Attachment, AttachmentFilter +from src.mpcontribs_api.domains.structures.models import Structure, StructureFilter +from src.mpcontribs_api.domains.tables.models import Table, TableFilter from src.mpcontribs_api.projection import SparseFieldsModel from src.mpcontribs_api.types import ShortStr @@ -105,6 +106,10 @@ class ContributionFilter(Filter): needs_build: bool | None = None + table: TableFilter | None = FilterDepends(with_prefix("tables", TableFilter)) + attachment: AttachmentFilter | None = FilterDepends(with_prefix("attachments", AttachmentFilter)) + structure: StructureFilter | None = FilterDepends(with_prefix("structures", StructureFilter)) + # sorting order_by: list[str] | None = None diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py index c42ae0436d..e31eff9eaf 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py @@ -1,5 +1,10 @@ from beanie import Document +from fastapi_filter.contrib.beanie import Filter class Structure(Document): pass + + +class StructureFilter(Filter): + pass diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py index b58aede0a9..803693afff 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py @@ -1,5 +1,10 @@ from beanie import Document +from fastapi_filter.contrib.beanie import Filter class Table(Document): pass + + +class TableFilter(Filter): + pass From 7e829bb10c63aa42f754fc915a71f9f5638160cc Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 3 Jun 2026 14:28:54 -0700 Subject: [PATCH 275/591] Anyonymous users can no longer be admin. Fixed imports --- mpcontribs-api/src/mpcontribs_api/auth.py | 14 ++++++++++++-- mpcontribs-api/src/mpcontribs_api/dependencies.py | 2 +- mpcontribs-api/src/mpcontribs_api/types.py | 2 +- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/auth.py b/mpcontribs-api/src/mpcontribs_api/auth.py index 2e59670686..e12b45c75a 100644 --- a/mpcontribs-api/src/mpcontribs_api/auth.py +++ b/mpcontribs-api/src/mpcontribs_api/auth.py @@ -1,4 +1,6 @@ -from pydantic import BaseModel, ConfigDict +from typing import Any + +from pydantic import BaseModel, ConfigDict, model_validator from src.mpcontribs_api.config import get_settings @@ -21,13 +23,21 @@ class User(BaseModel): username: str | None = None groups: frozenset[str] = frozenset() + @model_validator(mode="before") + @classmethod + def drop_admin_on_anonymous(cls, config: dict[str, Any]) -> dict[str, Any]: + if not config.get("username"): + groups = config.get("groups", frozenset()) + config["groups"] = frozenset(g for g in groups if g != ADMIN_GROUP) + return config + @property def is_anonymous(self) -> bool: return self.username is None @property def is_admin(self) -> bool: - return ADMIN_GROUP in self.groups + return (not self.is_anonymous) and (ADMIN_GROUP in self.groups) def has_role(self, role: str) -> bool: return role in self.groups diff --git a/mpcontribs-api/src/mpcontribs_api/dependencies.py b/mpcontribs-api/src/mpcontribs_api/dependencies.py index 41a67d5f4c..a0738c7b6d 100644 --- a/mpcontribs-api/src/mpcontribs_api/dependencies.py +++ b/mpcontribs-api/src/mpcontribs_api/dependencies.py @@ -5,7 +5,7 @@ from fastapi import Depends, Header, Request from pymongo.asynchronous.database import AsyncDatabase -from mpcontribs_api.auth import User +from src.mpcontribs_api.auth import User from src.mpcontribs_api.config import get_settings from src.mpcontribs_api.exceptions import ( AuthenticationError, diff --git a/mpcontribs-api/src/mpcontribs_api/types.py b/mpcontribs-api/src/mpcontribs_api/types.py index 933b4bfbc4..ab5b81af90 100644 --- a/mpcontribs-api/src/mpcontribs_api/types.py +++ b/mpcontribs-api/src/mpcontribs_api/types.py @@ -1,6 +1,6 @@ +import re from typing import Annotated -from pandas.core.arrays.string_arrow import re from pydantic import BeforeValidator, Field from src.mpcontribs_api.exceptions import ValidationError From 2f3b450c77aef631b007104243ff0e8607017dbc Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 3 Jun 2026 14:30:19 -0700 Subject: [PATCH 276/591] Added unit tests --- mpcontribs-api/pyproject.toml | 3 +- mpcontribs-api/tests/__init__.py | 0 mpcontribs-api/tests/conftest.py | 35 ++ mpcontribs-api/tests/unit/__init__.py | 0 mpcontribs-api/tests/unit/domains/__init__.py | 0 .../unit/domains/test_contributions_models.py | 180 ++++++++++ .../unit/domains/test_projects_models.py | 234 +++++++++++++ mpcontribs-api/tests/unit/test_auth.py | 91 +++++ .../tests/unit/test_dependencies.py | 121 +++++++ mpcontribs-api/tests/unit/test_exceptions.py | 154 ++++++++ mpcontribs-api/tests/unit/test_pagination.py | 102 ++++++ mpcontribs-api/tests/unit/test_projection.py | 328 ++++++++++++++++++ mpcontribs-api/tests/unit/test_types.py | 101 ++++++ 13 files changed, 1348 insertions(+), 1 deletion(-) create mode 100644 mpcontribs-api/tests/__init__.py create mode 100644 mpcontribs-api/tests/conftest.py create mode 100644 mpcontribs-api/tests/unit/__init__.py create mode 100644 mpcontribs-api/tests/unit/domains/__init__.py create mode 100644 mpcontribs-api/tests/unit/domains/test_contributions_models.py create mode 100644 mpcontribs-api/tests/unit/domains/test_projects_models.py create mode 100644 mpcontribs-api/tests/unit/test_auth.py create mode 100644 mpcontribs-api/tests/unit/test_dependencies.py create mode 100644 mpcontribs-api/tests/unit/test_exceptions.py create mode 100644 mpcontribs-api/tests/unit/test_pagination.py create mode 100644 mpcontribs-api/tests/unit/test_projection.py create mode 100644 mpcontribs-api/tests/unit/test_types.py diff --git a/mpcontribs-api/pyproject.toml b/mpcontribs-api/pyproject.toml index 66062c39a5..a081905744 100644 --- a/mpcontribs-api/pyproject.toml +++ b/mpcontribs-api/pyproject.toml @@ -84,7 +84,8 @@ dev = [ "pytest-xdist>=3.8.0", ] -[tool.pytest] +[tool.pytest.ini_options] +pythonpath = ["."] markers = [ "base: basic resource testing", "extra: all extra views", diff --git a/mpcontribs-api/tests/__init__.py b/mpcontribs-api/tests/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/mpcontribs-api/tests/conftest.py b/mpcontribs-api/tests/conftest.py new file mode 100644 index 0000000000..b8ae1606bf --- /dev/null +++ b/mpcontribs-api/tests/conftest.py @@ -0,0 +1,35 @@ +"""Shared pytest configuration and fixtures. + +Environment variables for Settings are set at module level (before any source +imports) so that auth.py and config.py can load successfully without a real +.env file. +""" + +import os +from unittest.mock import MagicMock, patch + +import pytest + +# Must be set before any source import that calls get_settings(). +os.environ.setdefault("MPCONTRIBS_ENVIRONMENT", "dev") +os.environ.setdefault("MPCONTRIBS_MONGO__URI", "mongodb://localhost:27017") +os.environ.setdefault("MPCONTRIBS_MONGO__DB_NAME", "testdb") +os.environ.setdefault("MPCONTRIBS_KONG__GATEWAY_SECRET", "test-gateway-secret") +os.environ.setdefault("MPCONTRIBS_REDIS__ADDRESS", "redis://localhost:6379") +os.environ.setdefault("MPCONTRIBS_REDIS__URL", "redis://localhost:6379") +os.environ.setdefault("MPCONTRIBS_MAIL_DEFAULT_SENDER", "test@example.com") +os.environ.setdefault("MPCONTRIBS_VERSION", "0.0.0-test") + + +@pytest.fixture(autouse=True, scope="session") +def _mock_beanie_collection(): + """Prevent CollectionWasNotInitialized for unit tests. + + Beanie Documents call get_pymongo_collection() in __init__ to assert the + collection has been set up via init_beanie(). Unit tests don't need a real + DB, so we stub that check out for the entire session. + """ + import beanie + + with patch.object(beanie.Document, "get_pymongo_collection", return_value=MagicMock()): + yield diff --git a/mpcontribs-api/tests/unit/__init__.py b/mpcontribs-api/tests/unit/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/mpcontribs-api/tests/unit/domains/__init__.py b/mpcontribs-api/tests/unit/domains/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/mpcontribs-api/tests/unit/domains/test_contributions_models.py b/mpcontribs-api/tests/unit/domains/test_contributions_models.py new file mode 100644 index 0000000000..c00c7fe8d1 --- /dev/null +++ b/mpcontribs-api/tests/unit/domains/test_contributions_models.py @@ -0,0 +1,180 @@ +from datetime import UTC, datetime + +import pytest +from beanie import PydanticObjectId +from pydantic import ValidationError as PydanticValidationError + +from src.mpcontribs_api.domains.contributions.models import ( + Contribution, + ContributionIn, + ContributionOut, + ContributionPatch, +) + +# --------------------------------------------------------------------------- +# Helpers +# --------------------------------------------------------------------------- + + +def _make_contribution_in(**overrides) -> ContributionIn: + """Build a minimal valid ContributionIn for testing.""" + defaults: dict = { + "_id": PydanticObjectId(), + "project": "test-project", + "identifier": "mp-1234", + "formula": "Fe2O3", + "data": {"band_gap": {"value": 2.1, "unit": "eV"}}, + } + defaults.update(overrides) + return ContributionIn(**defaults) + + +# --------------------------------------------------------------------------- +# ContributionBase field validation +# --------------------------------------------------------------------------- + + +class TestContributionBase: + def test_required_fields_set_correctly(self): + contrib = ContributionIn( + **{ + "_id": PydanticObjectId(), + "project": "mp-project", + "identifier": "mp-001", + "formula": "Fe2O3", + "data": {}, + } + ) + assert contrib.project == "mp-project" + assert contrib.identifier == "mp-001" + assert contrib.formula == "Fe2O3" + assert contrib.data == {} + + def test_defaults(self): + contrib = _make_contribution_in() + assert contrib.needs_build is True + assert contrib.structures is None + assert contrib.tables is None + assert contrib.attachments is None + + def test_last_modified_defaults_to_now(self): + before = datetime.now(UTC) + contrib = _make_contribution_in() + after = datetime.now(UTC) + assert before <= contrib.last_modified <= after + + def test_missing_project_raises(self): + with pytest.raises(PydanticValidationError): + ContributionIn( + **{ + "_id": PydanticObjectId(), + "identifier": "mp-001", + "formula": "Fe", + "data": {}, + } + ) + + def test_missing_formula_raises(self): + with pytest.raises(PydanticValidationError): + ContributionIn( + **{ + "_id": PydanticObjectId(), + "project": "proj", + "identifier": "mp-001", + "data": {}, + } + ) + + def test_data_can_be_empty_dict(self): + contrib = _make_contribution_in(data={}) + assert contrib.data == {} + + def test_data_accepts_nested_structure(self): + nested = {"band_gap": {"value": 1.5, "unit": "eV"}, "volume": 42.3} + contrib = _make_contribution_in(data=nested) + assert contrib.data["band_gap"]["value"] == 1.5 + + +# --------------------------------------------------------------------------- +# Contribution.from_input_model +# --------------------------------------------------------------------------- + + +class TestContributionFromInputModel: + def test_is_public_forced_to_false(self): + contrib_in = _make_contribution_in() + contribution = Contribution.from_input_model(contrib_in) + assert contribution.is_public is False + + def test_is_public_false_even_if_input_had_is_public(self): + # ContributionIn (ContributionBase) has no is_public field, but we ensure + # from_input_model always sets it to False on the resulting Contribution. + contrib_in = _make_contribution_in() + contribution = Contribution.from_input_model(contrib_in) + assert contribution.is_public is False + + def test_fields_carried_over(self): + contrib_in = _make_contribution_in(project="my-project", formula="SiO2") + contribution = Contribution.from_input_model(contrib_in) + assert contribution.project == "my-project" + assert contribution.formula == "SiO2" + + def test_data_carried_over(self): + data = {"key": "value"} + contrib_in = _make_contribution_in(data=data) + contribution = Contribution.from_input_model(contrib_in) + assert contribution.data == data + + +# --------------------------------------------------------------------------- +# ContributionOut — optional fields +# --------------------------------------------------------------------------- + + +class TestContributionOut: + def test_all_fields_optional(self): + out = ContributionOut() + assert out.id is None + assert out.project is None + assert out.formula is None + assert out.is_public is None + assert out.data is None + + def test_partial_population(self): + out = ContributionOut(project="mp-proj", formula="Li2O") + assert out.project == "mp-proj" + assert out.formula == "Li2O" + assert out.identifier is None + + def test_is_public_field(self): + out = ContributionOut(is_public=True) + assert out.is_public is True + + def test_data_field(self): + data = {"energy": -3.5} + out = ContributionOut(data=data) + assert out.data == data + + +# --------------------------------------------------------------------------- +# ContributionPatch — sparse update model +# --------------------------------------------------------------------------- + + +class TestContributionPatch: + def test_all_fields_optional(self): + patch = ContributionPatch() + assert patch.project is None + assert patch.identifier is None + assert patch.formula is None + assert patch.data is None + + def test_partial_patch(self): + patch = ContributionPatch(formula="Li2O", needs_build=False) + assert patch.formula == "Li2O" + assert patch.needs_build is False + assert patch.project is None + + def test_data_can_be_set(self): + patch = ContributionPatch(data={"new_key": 42}) + assert patch.data == {"new_key": 42} diff --git a/mpcontribs-api/tests/unit/domains/test_projects_models.py b/mpcontribs-api/tests/unit/domains/test_projects_models.py new file mode 100644 index 0000000000..63d5252925 --- /dev/null +++ b/mpcontribs-api/tests/unit/domains/test_projects_models.py @@ -0,0 +1,234 @@ +import pytest +from pydantic import ValidationError as PydanticValidationError + +from src.mpcontribs_api.domains.projects.models import ( + Column, + Project, + ProjectIn, + ProjectOut, + ProjectPatch, + Reference, + Stats, +) + +# --------------------------------------------------------------------------- +# Column +# --------------------------------------------------------------------------- + + +class TestColumn: + def test_path_only(self): + col = Column(path="data.band_gap") + assert col.path == "data.band_gap" + assert col.min is None + assert col.max is None + assert col.unit is None + + def test_full_column(self): + col = Column(path="data.band_gap", min=0.0, max=10.0, unit="eV") + assert col.min == 0.0 + assert col.max == 10.0 + assert col.unit == "eV" + + def test_segments_single(self): + col = Column(path="energy") + assert col.segments == ("energy",) + + def test_segments_dotted(self): + col = Column(path="data.band_gap.value") + assert col.segments == ("data", "band_gap", "value") + + def test_segments_two_level(self): + col = Column(path="data.volume") + assert col.segments == ("data", "volume") + + +# --------------------------------------------------------------------------- +# Stats +# --------------------------------------------------------------------------- + + +class TestStats: + def test_valid_stats(self): + stats = Stats(columns=3, contributions=100, tables=5, structures=10, attachments=2, size=1024.5) + assert stats.columns == 3 + assert stats.contributions == 100 + assert stats.size == 1024.5 + + def test_zero_values_allowed(self): + stats = Stats(columns=0, contributions=0, tables=0, structures=0, attachments=0, size=0.0) + assert stats.contributions == 0 + + def test_missing_field_raises(self): + with pytest.raises(PydanticValidationError): + Stats(columns=1, contributions=2, tables=3, structures=4, attachments=5) # missing size + + +# --------------------------------------------------------------------------- +# Reference +# --------------------------------------------------------------------------- + + +class TestReference: + def test_valid_reference(self): + ref = Reference(label="Paper", url="https://doi.org/10.1000/xyz") + assert ref.label == "Paper" + assert str(ref.url).startswith("https://doi.org") + + def test_invalid_url_raises(self): + with pytest.raises(PydanticValidationError): + Reference(label="Paper", url="not-a-url") + + def test_missing_label_raises(self): + with pytest.raises(PydanticValidationError): + Reference(url="https://example.com") # type: ignore[call-arg] + + +# --------------------------------------------------------------------------- +# ProjectOut — optional fields, extra ignored +# --------------------------------------------------------------------------- + + +class TestProjectOut: + def test_all_fields_optional(self): + out = ProjectOut() + assert out.id is None + assert out.title is None + assert out.authors is None + assert out.stats is None + + def test_extra_fields_ignored(self): + out = ProjectOut(title="My Project", _unknown_field="ignored") # type: ignore[call-arg] + assert out.title == "My Project" + + def test_with_stats(self): + stats = Stats(columns=1, contributions=2, tables=0, structures=0, attachments=0, size=512.0) + out = ProjectOut(title="My Project", stats=stats) + assert out.stats is not None + assert out.stats.contributions == 2 + + def test_boolean_fields(self): + out = ProjectOut(is_public=True, is_approved=False) + assert out.is_public is True + assert out.is_approved is False + + def test_license_values(self): + out_cca4 = ProjectOut(license="CCA4") + out_ccpd = ProjectOut(license="CCPD") + assert out_cca4.license == "CCA4" + assert out_ccpd.license == "CCPD" + + def test_invalid_license_raises(self): + with pytest.raises(PydanticValidationError): + ProjectOut(license="MIT") + + +# --------------------------------------------------------------------------- +# ProjectOut — field projection helpers (inherited from SparseFieldsModel) +# --------------------------------------------------------------------------- + + +class TestProjectOutProjection: + def test_parse_fields_none_returns_none(self): + assert ProjectOut.parse_fields(None) is None + + def test_parse_fields_valid_field(self): + result = ProjectOut.parse_fields("title") + assert result is not None + assert "title" in result + + def test_parse_fields_multiple_fields(self): + result = ProjectOut.parse_fields("title,authors,is_public") + assert result is not None + assert "title" in result + assert "authors" in result + assert "is_public" in result + + def test_parse_fields_unknown_raises(self): + from src.mpcontribs_api.exceptions import ValidationError as AppValidationError + + with pytest.raises(AppValidationError): + ProjectOut.parse_fields("nonexistent_field") + + def test_projection_none_returns_self(self): + assert ProjectOut.projection(None) is ProjectOut + + def test_projection_with_fields(self): + fields = ProjectOut.parse_fields("title,authors") + projected = ProjectOut.projection(fields) + assert projected is not ProjectOut + assert hasattr(projected.Settings, "projection") + + +# --------------------------------------------------------------------------- +# ProjectPatch +# --------------------------------------------------------------------------- + + +class TestProjectPatch: + def test_all_optional(self): + patch = ProjectPatch() + assert patch.title is None + assert patch.authors is None + assert patch.owner is None + + def test_partial_update(self): + patch = ProjectPatch(title="Updated Title", is_public=True) + assert patch.title == "Updated Title" + assert patch.is_public is True + + def test_invalid_short_str_for_title_raises(self): + with pytest.raises(PydanticValidationError): + ProjectPatch(title="ab") # too short + + def test_default_lists_are_empty(self): + patch = ProjectPatch() + assert patch.references == [] + assert patch.columns == [] + + def test_invalid_license_raises(self): + with pytest.raises(PydanticValidationError): + ProjectPatch(license="GPL") + + +# --------------------------------------------------------------------------- +# Project.from_input_model (smoke-test via ProjectIn) +# --------------------------------------------------------------------------- + + +VALID_STATS = Stats(columns=0, contributions=0, tables=0, structures=0, attachments=0, size=0.0) + + +class TestProjectFromInputModel: + def _make_input(self, **overrides): + defaults = { + "_id": "test-proj", + "title": "Test Project", + "authors": "Alice, Bob", + "description": "A test project", + "owner": "google:alice@example.com", + "unique_identifiers": True, + "stats": VALID_STATS, + } + defaults.update(overrides) + return ProjectIn(**defaults) + + def test_from_input_model_creates_project(self): + project_in = self._make_input() + project = Project.from_input_model(project_in) + assert isinstance(project, Project) + assert project.id == "test-proj" + assert project.title == "Test Project" + + def test_from_input_model_preserves_owner(self): + project_in = self._make_input(owner="github:bob@github.com") + project = Project.from_input_model(project_in) + assert project.owner == "github:bob@github.com" + + def test_from_input_model_defaults(self): + project_in = self._make_input() + project = Project.from_input_model(project_in) + assert project.is_public is False + assert project.is_approved is False + assert project.references == [] + assert project.columns == [] diff --git a/mpcontribs-api/tests/unit/test_auth.py b/mpcontribs-api/tests/unit/test_auth.py new file mode 100644 index 0000000000..99cdbdb008 --- /dev/null +++ b/mpcontribs-api/tests/unit/test_auth.py @@ -0,0 +1,91 @@ +import pytest + +from src.mpcontribs_api.auth import ADMIN_GROUP, User + + +class TestUserIsAnonymous: + def test_no_username_is_anonymous(self): + user = User() + assert user.is_anonymous is True + + def test_username_none_is_anonymous(self): + user = User(username=None) + assert user.is_anonymous is True + + def test_with_username_not_anonymous(self): + user = User(username="google:alice@example.com") + assert user.is_anonymous is False + + +class TestUserIsAdmin: + def test_no_groups_not_admin(self): + user = User(username="google:alice@example.com") + assert user.is_admin is False + + def test_admin_group_is_admin(self): + user = User(username="google:alice@example.com", groups=frozenset({ADMIN_GROUP})) + assert user.is_admin is True + + def test_other_group_not_admin(self): + user = User(username="google:alice@example.com", groups=frozenset({"editors"})) + assert user.is_admin is False + + def test_admin_group_among_many_is_admin(self): + user = User(username="google:alice@example.com", groups=frozenset({"editors", ADMIN_GROUP, "viewers"})) + assert user.is_admin is True + + def test_anonymous_cannot_be_admin(self): + # Even if groups include admin, anonymous user (no username) is still anonymous + user = User(groups=frozenset({ADMIN_GROUP})) + assert user.is_anonymous is True + # But is_admin only checks groups, not username + assert user.is_admin is False + + +class TestUserHasRole: + def test_has_role_in_groups(self): + user = User(username="google:alice@example.com", groups=frozenset({"editors", "viewers"})) + assert user.has_role("editors") is True + + def test_has_role_not_in_groups(self): + user = User(username="google:alice@example.com", groups=frozenset({"editors"})) + assert user.has_role("viewers") is False + + def test_has_role_empty_groups(self): + user = User(username="google:alice@example.com") + assert user.has_role("editors") is False + + def test_has_role_case_sensitive(self): + user = User(username="google:alice@example.com", groups=frozenset({"Editors"})) + assert user.has_role("editors") is False + assert user.has_role("Editors") is True + + +class TestUserImmutability: + def test_user_is_frozen(self): + user = User(username="google:alice@example.com") + with pytest.raises(Exception): + user.username = "google:bob@example.com" # type: ignore[misc] + + def test_groups_default_empty_frozenset(self): + user = User() + assert user.groups == frozenset() + + def test_consumer_id_default_none(self): + user = User() + assert user.consumer_id is None + + +class TestUserConstruction: + def test_full_user(self): + user = User( + consumer_id="kong-consumer-123", + username="google:alice@example.com", + groups=frozenset({"editors", "mp-team"}), + ) + assert user.consumer_id == "kong-consumer-123" + assert user.username == "google:alice@example.com" + assert "editors" in user.groups + assert "admin" not in user.groups + assert user.is_admin is False + assert user.is_anonymous is False diff --git a/mpcontribs-api/tests/unit/test_dependencies.py b/mpcontribs-api/tests/unit/test_dependencies.py new file mode 100644 index 0000000000..93eb0b27ad --- /dev/null +++ b/mpcontribs-api/tests/unit/test_dependencies.py @@ -0,0 +1,121 @@ +from unittest.mock import MagicMock + +import pytest + +from src.mpcontribs_api.auth import User +from src.mpcontribs_api.dependencies import _split, get_user, require_user +from src.mpcontribs_api.exceptions import AuthenticationError + +# --------------------------------------------------------------------------- +# _split +# --------------------------------------------------------------------------- + + +class TestSplit: + def test_none_returns_empty_set(self): + assert _split(None) == set() + + def test_empty_string_returns_empty_set(self): + assert _split("") == set() + + def test_whitespace_only_returns_empty_set(self): + assert _split(" ") == set() + + def test_single_value(self): + assert _split("editors") == {"editors"} + + def test_multiple_values(self): + assert _split("editors,viewers,admins") == {"editors", "viewers", "admins"} + + def test_strips_whitespace(self): + assert _split(" editors , viewers ") == {"editors", "viewers"} + + def test_skips_empty_parts(self): + assert _split("editors,,viewers") == {"editors", "viewers"} + + def test_single_space_comma_separated(self): + assert _split("a, b, c") == {"a", "b", "c"} + + +# --------------------------------------------------------------------------- +# get_user — builds User from request headers +# --------------------------------------------------------------------------- + + +def _make_request(**headers: str) -> MagicMock: + """Build a mock Request whose .headers dict returns the given values.""" + request = MagicMock() + request.headers = headers + return request + + +class TestGetUser: + def test_no_headers_returns_anonymous(self): + request = _make_request() + user = get_user(request) + assert user.is_anonymous is True + + def test_explicit_anon_header_returns_anonymous(self): + request = _make_request(**{"x-anonymous-consumer": "true", "x-consumer-username": "alice"}) + user = get_user(request) + assert user.is_anonymous is True + + def test_explicit_anon_case_insensitive(self): + request = _make_request(**{"x-anonymous-consumer": "True", "x-consumer-username": "alice"}) + user = get_user(request) + assert user.is_anonymous is True + + def test_authenticated_user(self): + request = _make_request( + **{ + "x-consumer-username": "google:alice@example.com", + "x-consumer-id": "kong-123", + "x-authenticated-groups": "editors", + "x-consumer-groups": "mp-team", + } + ) + user = get_user(request) + assert user.is_anonymous is False + assert user.username == "google:alice@example.com" + assert user.consumer_id == "kong-123" + assert "editors" in user.groups + assert "mp-team" in user.groups + + def test_authenticated_user_no_groups(self): + request = _make_request(**{"x-consumer-username": "google:alice@example.com"}) + user = get_user(request) + assert user.is_anonymous is False + assert user.groups == frozenset() + + def test_groups_merged_from_both_headers(self): + request = _make_request( + **{ + "x-consumer-username": "google:alice@example.com", + "x-authenticated-groups": "a,b", + "x-consumer-groups": "c,d", + } + ) + user = get_user(request) + assert user.groups == frozenset({"a", "b", "c", "d"}) + + def test_missing_username_returns_anonymous(self): + request = _make_request(**{"x-consumer-id": "kong-123"}) + user = get_user(request) + assert user.is_anonymous is True + + +# --------------------------------------------------------------------------- +# require_user +# --------------------------------------------------------------------------- + + +class TestRequireUser: + def test_authenticated_user_passes_through(self): + authed = User(username="google:alice@example.com", groups=frozenset()) + result = require_user(authed) + assert result is authed + + def test_anonymous_raises_authentication_error(self): + anon = User() + with pytest.raises(AuthenticationError): + require_user(anon) diff --git a/mpcontribs-api/tests/unit/test_exceptions.py b/mpcontribs-api/tests/unit/test_exceptions.py new file mode 100644 index 0000000000..552bf7778e --- /dev/null +++ b/mpcontribs-api/tests/unit/test_exceptions.py @@ -0,0 +1,154 @@ +import pytest + +from src.mpcontribs_api.exceptions import ( + AppError, + AuthenticationError, + ConflictError, + GatewayError, + NotFoundError, + PermissionError, + ValidationError, + _error_body, +) + + +class TestErrorBody: + def test_minimal_body(self): + body = _error_body("not_found", "Resource not found") + assert body == {"error": {"code": "not_found", "message": "Resource not found"}} + + def test_body_with_context(self): + body = _error_body("not_found", "Resource not found", resource_id="abc", resource_type="project") + assert body["error"]["code"] == "not_found" + assert body["error"]["message"] == "Resource not found" + assert body["error"]["detail"] == {"resource_id": "abc", "resource_type": "project"} + + def test_no_detail_key_without_context(self): + body = _error_body("conflict", "Duplicate id") + assert "detail" not in body["error"] + + def test_detail_present_with_context(self): + body = _error_body("conflict", "Duplicate id", existing_id="xyz") + assert "detail" in body["error"] + + +class TestAppError: + def test_default_status_and_code(self): + err = AppError() + assert err.status_code == 500 + assert err.error_code == "internal_error" + + def test_default_message_is_class_name(self): + err = AppError() + assert err.message == "AppError" + + def test_custom_message(self): + err = AppError("something went wrong") + assert err.message == "something went wrong" + + def test_context_stored(self): + err = AppError("msg", user="alice", action="delete") + assert err.context == {"user": "alice", "action": "delete"} + + def test_is_exception(self): + err = AppError("oops") + assert isinstance(err, Exception) + + def test_str_is_message(self): + err = AppError("oops") + assert str(err) == "oops" + + +class TestNotFoundError: + def test_status_code(self): + assert NotFoundError.status_code == 404 + + def test_error_code(self): + assert NotFoundError.error_code == "not_found" + + def test_message_defaults_to_class_name(self): + err = NotFoundError() + assert err.message == "NotFoundError" + + def test_custom_message(self): + err = NotFoundError("project 'foo' not found") + assert err.message == "project 'foo' not found" + + def test_is_app_error(self): + assert issubclass(NotFoundError, AppError) + + +class TestConflictError: + def test_status_code(self): + assert ConflictError.status_code == 409 + + def test_error_code(self): + assert ConflictError.error_code == "conflict" + + def test_is_app_error(self): + assert issubclass(ConflictError, AppError) + + +class TestValidationError: + def test_status_code(self): + assert ValidationError.status_code == 422 + + def test_error_code(self): + assert ValidationError.error_code == "validation_error" + + def test_is_app_error(self): + assert issubclass(ValidationError, AppError) + + +class TestPermissionError: + def test_status_code(self): + assert PermissionError.status_code == 403 + + def test_error_code(self): + assert PermissionError.error_code == "permission_denied" + + def test_context_kwargs(self): + err = PermissionError(required_role="admin") + assert err.context == {"required_role": "admin"} + + def test_is_app_error(self): + assert issubclass(PermissionError, AppError) + + +class TestAuthenticationError: + def test_status_code(self): + assert AuthenticationError.status_code == 401 + + def test_error_code(self): + assert AuthenticationError.error_code == "authentication_error" + + def test_is_app_error(self): + assert issubclass(AuthenticationError, AppError) + + +class TestGatewayError: + def test_status_code(self): + assert GatewayError.status_code == 403 + + def test_error_code(self): + assert GatewayError.error_code == "gateway_error" + + def test_is_app_error(self): + assert issubclass(GatewayError, AppError) + + +class TestExceptionRaising: + def test_not_found_can_be_raised_and_caught(self): + with pytest.raises(NotFoundError) as exc_info: + raise NotFoundError("project not found") + assert exc_info.value.message == "project not found" + assert exc_info.value.status_code == 404 + + def test_app_error_catches_subclasses(self): + with pytest.raises(AppError): + raise ConflictError("duplicate") + + def test_context_available_after_raise(self): + with pytest.raises(ValidationError) as exc_info: + raise ValidationError("bad field", field="email", value="oops") + assert exc_info.value.context == {"field": "email", "value": "oops"} diff --git a/mpcontribs-api/tests/unit/test_pagination.py b/mpcontribs-api/tests/unit/test_pagination.py new file mode 100644 index 0000000000..78dc41f732 --- /dev/null +++ b/mpcontribs-api/tests/unit/test_pagination.py @@ -0,0 +1,102 @@ +import base64 + +import pytest +from pydantic import ValidationError as PydanticValidationError + +from src.mpcontribs_api.pagination import ( + CursorParams, + Page, + decode_cursor, + encode_cursor, +) + + +class TestEncodeCursor: + def test_roundtrip(self): + original = "some-mongo-id-abc123" + assert decode_cursor(encode_cursor(original)) == original + + def test_returns_string(self): + result = encode_cursor("abc") + assert isinstance(result, str) + + def test_uses_urlsafe_base64(self): + # urlsafe_b64encode uses - and _ instead of + and / + result = encode_cursor("test-id") + decoded_bytes = base64.urlsafe_b64decode(result.encode()) + assert decoded_bytes.decode() == "test-id" + + def test_empty_string(self): + assert decode_cursor(encode_cursor("")) == "" + + def test_encodes_unicode(self): + original = "projet-données" + assert decode_cursor(encode_cursor(original)) == original + + +class TestDecodeCursor: + def test_valid_cursor(self): + encoded = base64.urlsafe_b64encode(b"abc123").decode() + assert decode_cursor(encoded) == "abc123" + + def test_invalid_base64_raises_value_error(self): + with pytest.raises(ValueError, match="malformed cursor"): + decode_cursor("!!!not-valid-base64!!!") + + def test_non_utf8_bytes_raises_value_error(self): + # Encode raw bytes that aren't valid UTF-8 + bad = base64.urlsafe_b64encode(b"\xff\xfe").decode() + with pytest.raises(ValueError, match="malformed cursor"): + decode_cursor(bad) + + +class TestCursorParams: + def test_defaults(self): + params = CursorParams() + assert params.cursor is None + assert params.limit == 20 + + def test_cursor_set(self): + params = CursorParams(cursor="abc123") + assert params.cursor == "abc123" + + def test_limit_minimum(self): + params = CursorParams(limit=1) + assert params.limit == 1 + + def test_limit_maximum(self): + params = CursorParams(limit=100) + assert params.limit == 100 + + def test_limit_below_minimum_raises(self): + with pytest.raises(PydanticValidationError): + CursorParams(limit=0) + + def test_limit_above_maximum_raises(self): + with pytest.raises(PydanticValidationError): + CursorParams(limit=101) + + def test_custom_limit(self): + params = CursorParams(limit=50) + assert params.limit == 50 + + +class TestPage: + def test_items_and_no_next_cursor(self): + page: Page[str] = Page(items=["a", "b", "c"]) + assert page.items == ["a", "b", "c"] + assert page.next_cursor is None + + def test_with_next_cursor(self): + cursor = encode_cursor("last-id") + page: Page[str] = Page(items=["a"], next_cursor=cursor) + assert page.next_cursor == cursor + + def test_empty_items(self): + page: Page[str] = Page(items=[]) + assert page.items == [] + assert page.next_cursor is None + + def test_generic_item_types(self): + page: Page[int] = Page(items=[1, 2, 3]) + assert page.items == [1, 2, 3] diff --git a/mpcontribs-api/tests/unit/test_projection.py b/mpcontribs-api/tests/unit/test_projection.py new file mode 100644 index 0000000000..3889ce682f --- /dev/null +++ b/mpcontribs-api/tests/unit/test_projection.py @@ -0,0 +1,328 @@ +from typing import Any + +import pytest +from pydantic import BaseModel, Field + +from src.mpcontribs_api.exceptions import ValidationError as AppValidationError +from src.mpcontribs_api.projection import ( + SparseFieldsModel, + _classify, + _collapse, + _unwrap_optional, + _validate_path, + _walk_path, +) + +# --------------------------------------------------------------------------- +# Helpers — simple models used across tests +# --------------------------------------------------------------------------- + + +class Address(BaseModel): + street: str + city: str + country: str | None = None + + +class Simple(SparseFieldsModel): + name: str + age: int + score: float | None = None + tags: list[str] = Field(default_factory=list) + metadata: dict[str, Any] = Field(default_factory=dict) + address: Address | None = None + + +# --------------------------------------------------------------------------- +# _unwrap_optional +# --------------------------------------------------------------------------- + + +class TestUnwrapOptional: + def test_strips_none(self): + result = _unwrap_optional(str | None) + assert result is str + + def test_plain_annotation_unchanged(self): + result = _unwrap_optional(str) + assert result is str + + def test_optional_model(self): + result = _unwrap_optional(Address | None) + assert result is Address + + def test_union_without_none_unchanged(self): + # int | str has no None — returned as-is + result = _unwrap_optional(int | str) + assert result == (int | str) + + +# --------------------------------------------------------------------------- +# _classify +# --------------------------------------------------------------------------- + + +class TestClassify: + def test_base_model_subclass(self): + kind, model = _classify(Address) + assert kind == "model" + assert model is Address + + def test_optional_model(self): + kind, model = _classify(Address | None) + assert kind == "model" + assert model is Address + + def test_dict_annotation(self): + kind, model = _classify(dict) + assert kind == "dict" + assert model is None + + def test_dict_generic(self): + kind, model = _classify(dict[str, Any]) + assert kind == "dict" + assert model is None + + def test_list_annotation(self): + kind, model = _classify(list[str]) + assert kind == "list" + assert model is None + + def test_scalar_str(self): + kind, model = _classify(str) + assert kind == "scalar" + assert model is None + + def test_scalar_int(self): + kind, model = _classify(int) + assert kind == "scalar" + assert model is None + + def test_any(self): + kind, model = _classify(Any) + assert kind == "dict" + assert model is None + + +# --------------------------------------------------------------------------- +# _collapse +# --------------------------------------------------------------------------- + + +class TestCollapse: + def test_no_overlap(self): + paths = frozenset({"name", "age"}) + assert _collapse(paths) == paths + + def test_parent_subsumes_child(self): + paths = frozenset({"address", "address.city"}) + assert _collapse(paths) == frozenset({"address"}) + + def test_child_without_parent_kept(self): + paths = frozenset({"address.city"}) + assert _collapse(paths) == paths + + def test_multiple_children_of_same_parent(self): + paths = frozenset({"address", "address.city", "address.street"}) + assert _collapse(paths) == frozenset({"address"}) + + def test_disjoint_nested_paths(self): + paths = frozenset({"address.city", "name"}) + assert _collapse(paths) == paths + + def test_single_path(self): + paths = frozenset({"name"}) + assert _collapse(paths) == paths + + def test_empty(self): + assert _collapse(frozenset()) == frozenset() + + +# --------------------------------------------------------------------------- +# _walk_path +# --------------------------------------------------------------------------- + + +class TestWalkPath: + def test_scalar_field(self): + steps = list(_walk_path(Simple, "name")) + assert len(steps) == 1 + assert steps[0].segment == "name" + assert steps[0].kind == "scalar" + assert steps[0].is_last is True + + def test_nested_model_field(self): + steps = list(_walk_path(Simple, "address.city")) + assert steps[0].segment == "address" + assert steps[0].kind == "model" + assert steps[0].is_last is False + assert steps[1].segment == "city" + assert steps[1].kind == "scalar" + assert steps[1].is_last is True + + def test_unknown_field(self): + steps = list(_walk_path(Simple, "nonexistent")) + assert steps[0].kind == "unknown" + + def test_dict_field_goes_opaque(self): + steps = list(_walk_path(Simple, "metadata.arbitrary_key")) + assert steps[0].kind == "dict" + assert steps[1].kind == "opaque" + + +# --------------------------------------------------------------------------- +# _validate_path +# --------------------------------------------------------------------------- + + +class TestValidatePath: + def test_valid_scalar_path(self): + _validate_path(Simple, "name") # should not raise + + def test_valid_nested_path(self): + _validate_path(Simple, "address.city") # should not raise + + def test_valid_dict_path(self): + _validate_path(Simple, "metadata.anything") # opaque — allowed + + def test_unknown_top_level_raises(self): + with pytest.raises(AppValidationError, match="unknown field"): + _validate_path(Simple, "nonexistent") + + def test_subfield_of_scalar_raises(self): + with pytest.raises(AppValidationError, match="cannot select subfields"): + _validate_path(Simple, "name.sub") + + def test_subfield_of_list_raises(self): + with pytest.raises(AppValidationError, match="cannot select subfields"): + _validate_path(Simple, "tags.sub") + + +# --------------------------------------------------------------------------- +# SparseFieldsModel.field_names +# --------------------------------------------------------------------------- + + +class TestFieldNames: + def test_returns_top_level_fields(self): + names = Simple.field_names() + assert "name" in names + assert "age" in names + assert "address" in names + assert "metadata" in names + + def test_does_not_include_nested(self): + names = Simple.field_names() + assert "city" not in names + assert "street" not in names + + +# --------------------------------------------------------------------------- +# SparseFieldsModel.parse_fields +# --------------------------------------------------------------------------- + + +class TestParseFields: + def test_none_returns_none(self): + assert Simple.parse_fields(None) is None + + def test_empty_string_returns_none(self): + assert Simple.parse_fields("") is None + + def test_single_valid_field(self): + result = Simple.parse_fields("name") + assert result is not None + assert "name" in result + + def test_multiple_fields(self): + result = Simple.parse_fields("name,age") + assert result is not None + assert "name" in result + assert "age" in result + + def test_whitespace_stripped(self): + result = Simple.parse_fields(" name , age ") + assert result is not None + assert "name" in result + assert "age" in result + + def test_nested_field(self): + result = Simple.parse_fields("address.city") + assert result is not None + assert "address.city" in result + + def test_parent_collapses_child(self): + result = Simple.parse_fields("address,address.city") + assert result is not None + assert "address" in result + assert "address.city" not in result + + def test_unknown_field_raises(self): + with pytest.raises(AppValidationError, match="unknown field"): + Simple.parse_fields("nonexistent") + + def test_scalar_subfield_raises(self): + with pytest.raises(AppValidationError, match="cannot select subfields"): + Simple.parse_fields("name.sub") + + def test_sparse_always_always_included(self): + class WithAlways(SparseFieldsModel): + id: str | None = None + name: str | None = None + sparse_always = frozenset({"id"}) + + result = WithAlways.parse_fields("name") + assert result is not None + assert "id" in result + assert "name" in result + + +# --------------------------------------------------------------------------- +# SparseFieldsModel.projection +# --------------------------------------------------------------------------- + + +class TestProjection: + def test_none_fields_returns_self(self): + assert Simple.projection(None) is Simple + + def test_with_fields_returns_different_model(self): + fields = Simple.parse_fields("name") + result = Simple.projection(fields) + assert result is not Simple + + def test_projected_model_has_settings_with_projection(self): + fields = Simple.parse_fields("name") + projected = Simple.projection(fields) + assert hasattr(projected, "Settings") + assert hasattr(projected.Settings, "projection") + + def test_projection_includes_id(self): + fields = Simple.parse_fields("name") + projected = Simple.projection(fields) + assert "_id" in projected.Settings.projection + + def test_projection_caching(self): + fields = Simple.parse_fields("name") + first = Simple.projection(fields) + second = Simple.projection(fields) + assert first is second + + +# --------------------------------------------------------------------------- +# SparseFieldsModel._identity_fields +# --------------------------------------------------------------------------- + + +class TestIdentityFields: + def test_field_with_id_alias_detected(self): + class WithId(SparseFieldsModel): + id: str | None = Field(default=None, alias="_id", serialization_alias="id") + name: str | None = None + + identity = WithId._identity_fields() + assert "id" in identity + + def test_no_id_field_returns_empty(self): + identity = Simple._identity_fields() + assert identity == frozenset() diff --git a/mpcontribs-api/tests/unit/test_types.py b/mpcontribs-api/tests/unit/test_types.py new file mode 100644 index 0000000000..3925b9af29 --- /dev/null +++ b/mpcontribs-api/tests/unit/test_types.py @@ -0,0 +1,101 @@ +import pytest +from pydantic import BaseModel +from pydantic import ValidationError as PydanticValidationError + +from src.mpcontribs_api.exceptions import ValidationError as AppValidationError +from src.mpcontribs_api.types import PrefixedEmail, ShortStr, _validate_prefixed_email + + +class ShortStrModel(BaseModel): + value: ShortStr + + +class PrefixedEmailModel(BaseModel): + email: PrefixedEmail + + +class TestShortStr: + def test_valid_3_chars(self): + m = ShortStrModel(value="abc") + assert m.value == "abc" + + def test_valid_30_chars(self): + m = ShortStrModel(value="a" * 30) + assert m.value == "a" * 30 + + def test_valid_mid_length(self): + m = ShortStrModel(value="test-project") + assert m.value == "test-project" + + def test_too_short_raises(self): + with pytest.raises(PydanticValidationError): + ShortStrModel(value="ab") + + def test_empty_raises(self): + with pytest.raises(PydanticValidationError): + ShortStrModel(value="") + + def test_too_long_raises(self): + with pytest.raises(PydanticValidationError): + ShortStrModel(value="a" * 31) + + def test_exactly_31_chars_raises(self): + with pytest.raises(PydanticValidationError): + ShortStrModel(value="a" * 31) + + +class TestValidatePrefixedEmail: + def test_valid_format(self): + assert _validate_prefixed_email("google:alice@example.com") == "google:alice@example.com" + + def test_strips_surrounding_whitespace(self): + assert _validate_prefixed_email(" google:alice@example.com ") == "google:alice@example.com" + + def test_no_colon_raises(self): + with pytest.raises(AppValidationError): + _validate_prefixed_email("googlealice@example.com") + + def test_no_at_sign_raises(self): + with pytest.raises(AppValidationError): + _validate_prefixed_email("google:aliceexample.com") + + def test_no_domain_raises(self): + with pytest.raises(AppValidationError): + _validate_prefixed_email("google:alice@") + + def test_no_tld_raises(self): + with pytest.raises(AppValidationError): + _validate_prefixed_email("google:alice@example") + + def test_empty_provider_raises(self): + with pytest.raises(AppValidationError): + _validate_prefixed_email(":alice@example.com") + + def test_empty_name_raises(self): + with pytest.raises(AppValidationError): + _validate_prefixed_email("google:@example.com") + + def test_multiple_at_signs_raises(self): + with pytest.raises(AppValidationError): + _validate_prefixed_email("google:alice@@example.com") + + def test_multiple_colons_raises(self): + # The regex requires no colon in provider or local part + with pytest.raises(AppValidationError): + _validate_prefixed_email("goo:gle:alice@example.com") + + +class TestPrefixedEmailModel: + def test_valid_email(self): + m = PrefixedEmailModel(email="github:bob@github.com") + assert m.email == "github:bob@github.com" + + def test_invalid_email_raises_app_validation_error(self): + # BeforeValidator raises AppValidationError; Pydantic does not wrap + # non-standard exceptions (ValueError/TypeError/AssertionError) from validators. + with pytest.raises(AppValidationError): + PrefixedEmailModel(email="not-an-email") + + def test_whitespace_stripped(self): + m = PrefixedEmailModel(email=" orcid:12345@orcid.org ") + assert m.email == "orcid:12345@orcid.org" From 36b079cc217948104937a430d7a259529c0a4417 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 3 Jun 2026 15:13:22 -0700 Subject: [PATCH 277/591] added check fix for normal fixes --- mpcontribs-api/justfile | 1 + 1 file changed, 1 insertion(+) diff --git a/mpcontribs-api/justfile b/mpcontribs-api/justfile index fa1e0c572d..20950b1243 100644 --- a/mpcontribs-api/justfile +++ b/mpcontribs-api/justfile @@ -1,5 +1,6 @@ # Format, fix, and lint all source code fmt: uv run ruff format src/ + -uv run ruff check --fix src/ -uv run ruff check --fix --unsafe-fixes src/ -uv run pydocstringformatter --write src/ From f77985f099288674b4771ee67254f55b5c085edc Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 3 Jun 2026 15:18:38 -0700 Subject: [PATCH 278/591] Various small fixes in function signatures and usages --- mpcontribs-api/src/mpcontribs_api/api/v1/router.py | 6 +++--- mpcontribs-api/src/mpcontribs_api/app.py | 8 ++++---- mpcontribs-api/src/mpcontribs_api/dependencies.py | 4 +++- .../mpcontribs_api/domains/contributions/dependencies.py | 4 ++-- .../src/mpcontribs_api/domains/contributions/router.py | 4 ++-- .../src/mpcontribs_api/domains/projects/dependencies.py | 4 ++-- .../src/mpcontribs_api/domains/projects/router.py | 4 ++-- 7 files changed, 18 insertions(+), 16 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/api/v1/router.py b/mpcontribs-api/src/mpcontribs_api/api/v1/router.py index 6b946e1e73..0204a7ff14 100644 --- a/mpcontribs-api/src/mpcontribs_api/api/v1/router.py +++ b/mpcontribs-api/src/mpcontribs_api/api/v1/router.py @@ -1,9 +1,9 @@ from fastapi import APIRouter -from mpcontribs_api.domains.contributions.router import router as contributions_router -from mpcontribs_api.domains.projects.router import router as projects_router +from src.mpcontribs_api.domains.contributions.router import router as contributions_router +from src.mpcontribs_api.domains.projects.router import router as projects_router -router = APIRouter(prefix="/api/v1") +router = APIRouter() router.include_router(projects_router, prefix="/projects") router.include_router(contributions_router, prefix="/contributions") diff --git a/mpcontribs-api/src/mpcontribs_api/app.py b/mpcontribs-api/src/mpcontribs_api/app.py index 3830a3d582..5f9ac141e2 100644 --- a/mpcontribs-api/src/mpcontribs_api/app.py +++ b/mpcontribs-api/src/mpcontribs_api/app.py @@ -9,12 +9,12 @@ from pymongo import AsyncMongoClient from starlette.middleware.base import BaseHTTPMiddleware -from mpcontribs_api.api.v1.router import router as v1_router -from mpcontribs_api.config import Settings, get_settings -from mpcontribs_api.exceptions import register_exception_handlers -from mpcontribs_api.logging import configure_logging +from src.mpcontribs_api.api.v1.router import router as v1_router +from src.mpcontribs_api.config import Settings, get_settings from src.mpcontribs_api.dependencies import verify_gateway from src.mpcontribs_api.domains.projects.models import Project +from src.mpcontribs_api.exceptions import register_exception_handlers +from src.mpcontribs_api.logging import configure_logging from src.mpcontribs_api.middleware import bind_request_context logger = logging.getLogger(__name__) diff --git a/mpcontribs-api/src/mpcontribs_api/dependencies.py b/mpcontribs-api/src/mpcontribs_api/dependencies.py index a0738c7b6d..ea68181859 100644 --- a/mpcontribs-api/src/mpcontribs_api/dependencies.py +++ b/mpcontribs-api/src/mpcontribs_api/dependencies.py @@ -18,7 +18,9 @@ def verify_gateway(x_gateway_secret: Annotated[str | None, Header()] = None) -> None: """Ensures the current access attempt is coming through Kong.""" - if x_gateway_secret is None or not hmac.compare_digest(x_gateway_secret, str(settings.kong.gateway_secret)): + if x_gateway_secret is None or not hmac.compare_digest( + x_gateway_secret, settings.kong.gateway_secret.get_secret_value() + ): raise GatewayError("direct access not permitted") diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/dependencies.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/dependencies.py index 3227039e95..e02de68368 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/dependencies.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/dependencies.py @@ -2,8 +2,8 @@ from fastapi import Depends -from mpcontribs_api.dependencies import UserDep -from mpcontribs_api.domains.contributions.repository import ( +from src.mpcontribs_api.dependencies import UserDep +from src.mpcontribs_api.domains.contributions.repository import ( MongoDbContributionRepository, ) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py index f2923c40ff..d2b89b6241 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py @@ -1,6 +1,6 @@ from typing import Annotated, Literal -from fastapi import APIRouter, Query +from fastapi import APIRouter, Depends, Query from fastapi_filter import FilterDepends from src.mpcontribs_api.domains.contributions.dependencies import ContributionDep @@ -18,7 +18,7 @@ @router.get("") async def get_contributions( repo: ContributionDep, - pagination: Annotated[CursorParams, Query()], + pagination: Annotated[CursorParams, Depends()], filter: ContributionFilter = FilterDepends(ContributionFilter), fields: Annotated[str | None, Query(alias="_fields")] = None, ): diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/dependencies.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/dependencies.py index 94535cc67d..48e257df60 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/dependencies.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/dependencies.py @@ -2,8 +2,8 @@ from fastapi import Depends -from mpcontribs_api.dependencies import UserDep -from mpcontribs_api.domains.projects.repository import ( +from src.mpcontribs_api.dependencies import UserDep +from src.mpcontribs_api.domains.projects.repository import ( MongoDbProjectRepository, ) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py index b059c69747..cc2a24483c 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py @@ -1,6 +1,6 @@ from typing import Annotated -from fastapi import APIRouter, Query, Response, status +from fastapi import APIRouter, Depends, Query, Response, status from fastapi_filter import FilterDepends from starlette.status import HTTP_204_NO_CONTENT @@ -20,7 +20,7 @@ @router.get("", response_model=None) async def get_project( repo: ProjectDep, - pagination: Annotated[CursorParams, Query()], + pagination: Annotated[CursorParams, Depends()], filter: ProjectFilter = FilterDepends(ProjectFilter), fields: Annotated[str | None, Query(alias="_fields")] = None, ): From 953c83c30361dbfd479d93ac5c2730b4f17f22c9 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 3 Jun 2026 15:39:07 -0700 Subject: [PATCH 279/591] Added integration tests --- mpcontribs-api/pyproject.toml | 1 + mpcontribs-api/tests/integration/__init__.py | 0 mpcontribs-api/tests/integration/conftest.py | 149 ++++++++++ .../tests/integration/test_contributions.py | 131 +++++++++ .../tests/integration/test_error_handlers.py | 184 ++++++++++++ .../tests/integration/test_gateway.py | 67 +++++ .../tests/integration/test_projects.py | 271 ++++++++++++++++++ mpcontribs-api/uv.lock | 48 ++++ 8 files changed, 851 insertions(+) create mode 100644 mpcontribs-api/tests/integration/__init__.py create mode 100644 mpcontribs-api/tests/integration/conftest.py create mode 100644 mpcontribs-api/tests/integration/test_contributions.py create mode 100644 mpcontribs-api/tests/integration/test_error_handlers.py create mode 100644 mpcontribs-api/tests/integration/test_gateway.py create mode 100644 mpcontribs-api/tests/integration/test_projects.py diff --git a/mpcontribs-api/pyproject.toml b/mpcontribs-api/pyproject.toml index a081905744..bc30e6b02b 100644 --- a/mpcontribs-api/pyproject.toml +++ b/mpcontribs-api/pyproject.toml @@ -82,6 +82,7 @@ dev = [ "pydocstringformatter>=0.7.0", "pytest>=9.0.3", "pytest-xdist>=3.8.0", + "httpx2>=0.28.0", ] [tool.pytest.ini_options] diff --git a/mpcontribs-api/tests/integration/__init__.py b/mpcontribs-api/tests/integration/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/mpcontribs-api/tests/integration/conftest.py b/mpcontribs-api/tests/integration/conftest.py new file mode 100644 index 0000000000..e699ca5663 --- /dev/null +++ b/mpcontribs-api/tests/integration/conftest.py @@ -0,0 +1,149 @@ +"""Integration test infrastructure. + +make_test_app() builds a real FastAPI application (routers, middleware, +exception handlers) but with: + - A no-op lifespan so no MongoDB connection is attempted. + - The verify_gateway dependency absent at the app level; tests that want to + check gateway enforcement use the gateway_app fixture instead. + +Fixtures follow the pattern: + test_app (session) — base app, no dependency overrides + client (function) — TestClient wrapping test_app; overrides are set per-test + and cleared on teardown to avoid bleed between tests. +""" + +from contextlib import asynccontextmanager +from unittest.mock import AsyncMock, MagicMock + +import pytest +from fastapi import FastAPI +from fastapi.testclient import TestClient +from starlette.middleware.base import BaseHTTPMiddleware + +from src.mpcontribs_api.exceptions import register_exception_handlers +from src.mpcontribs_api.middleware import bind_request_context + +# --------------------------------------------------------------------------- +# Header constants used across test modules +# --------------------------------------------------------------------------- + +GATEWAY_SECRET = "test-gateway-secret" +GATEWAY_HEADERS = {"x-gateway-secret": GATEWAY_SECRET} + +ANON_HEADERS: dict[str, str] = {} + +AUTHED_HEADERS = { + "x-consumer-username": "google:alice@example.com", + "x-consumer-id": "test-consumer-id", + "x-authenticated-groups": "mp-team", +} + +ADMIN_HEADERS = { + "x-consumer-username": "google:admin@example.com", + "x-consumer-id": "test-admin-id", + "x-authenticated-groups": "admin", +} + + +# --------------------------------------------------------------------------- +# App factories +# --------------------------------------------------------------------------- + + +def make_test_app() -> FastAPI: + """Build a fully-wired FastAPI app suitable for integration tests. + + Uses a no-op lifespan so no MongoDB connection is required. The + verify_gateway dependency is NOT added at the app level here — tests that + need gateway enforcement should use make_gateway_app() instead. + """ + + @asynccontextmanager + async def _noop_lifespan(app: FastAPI): + app.state.db = MagicMock() + yield + + app = FastAPI(title="mpcontribs-test", lifespan=_noop_lifespan) + app.add_middleware(BaseHTTPMiddleware, dispatch=bind_request_context) + register_exception_handlers(app) + + from src.mpcontribs_api.api.v1.router import router as v1_router + + app.include_router(v1_router, prefix="/api/v1") + return app + + +def make_gateway_app() -> FastAPI: + """Like make_test_app() but with real gateway enforcement. + + Used by gateway-specific tests to exercise the actual x-gateway-secret + header validation through the full HTTP cycle. + """ + from fastapi import Depends + + from src.mpcontribs_api.dependencies import verify_gateway + + @asynccontextmanager + async def _noop_lifespan(app: FastAPI): + app.state.db = MagicMock() + yield + + app = FastAPI( + title="mpcontribs-gateway-test", + lifespan=_noop_lifespan, + dependencies=[Depends(verify_gateway)], + ) + app.add_middleware(BaseHTTPMiddleware, dispatch=bind_request_context) + register_exception_handlers(app) + + from src.mpcontribs_api.api.v1.router import router as v1_router + + app.include_router(v1_router, prefix="/api/v1") + return app + + +# --------------------------------------------------------------------------- +# Shared fixtures +# --------------------------------------------------------------------------- + + +@pytest.fixture(scope="session") +def test_app() -> FastAPI: + return make_test_app() + + +@pytest.fixture(scope="session") +def gateway_app() -> FastAPI: + return make_gateway_app() + + +@pytest.fixture +def client(test_app: FastAPI): + """Function-scoped client; dependency overrides are cleared after each test.""" + with TestClient(test_app, raise_server_exceptions=False) as c: + yield c + test_app.dependency_overrides.clear() + + +@pytest.fixture +def gateway_client(gateway_app: FastAPI): + with TestClient(gateway_app, raise_server_exceptions=False) as c: + yield c + gateway_app.dependency_overrides.clear() + + +# --------------------------------------------------------------------------- +# Mock repository factories +# --------------------------------------------------------------------------- + + +@pytest.fixture +def mock_project_repo() -> AsyncMock: + """Fully async mock of MongoDbProjectRepository.""" + return AsyncMock() + + +@pytest.fixture +def mock_contribution_repo() -> AsyncMock: + """Fully async mock of MongoDbContributionRepository.""" + return AsyncMock() diff --git a/mpcontribs-api/tests/integration/test_contributions.py b/mpcontribs-api/tests/integration/test_contributions.py new file mode 100644 index 0000000000..c1efc24aee --- /dev/null +++ b/mpcontribs-api/tests/integration/test_contributions.py @@ -0,0 +1,131 @@ +"""Integration tests for /api/v1/contributions routes. + +Uses an AsyncMock repository override so no database is required. Tests cover +the implemented GET and DELETE batch endpoints; stub endpoints (POST, PUT, +single-resource) are verified to exist and wire through to the repo. +""" + +import pytest + +from src.mpcontribs_api.domains.contributions.dependencies import get_scoped_contributions +from src.mpcontribs_api.domains.contributions.models import ContributionOut +from src.mpcontribs_api.pagination import Page +from tests.integration.conftest import ANON_HEADERS, AUTHED_HEADERS + +# --------------------------------------------------------------------------- +# Fixture: inject mock repo for each test +# --------------------------------------------------------------------------- + + +@pytest.fixture +def contribution_repo(test_app, mock_contribution_repo): + test_app.dependency_overrides[get_scoped_contributions] = lambda: mock_contribution_repo + yield mock_contribution_repo + test_app.dependency_overrides.pop(get_scoped_contributions, None) + + +SAMPLE_CONTRIBUTION = ContributionOut( + project="mp-project", + identifier="mp-001", + formula="Fe2O3", + is_public=True, + data={"band_gap": 2.1}, +) + + +# --------------------------------------------------------------------------- +# GET /api/v1/contributions +# --------------------------------------------------------------------------- + + +class TestListContributions: + def test_empty_page_returns_200(self, client, contribution_repo): + contribution_repo.get_contributions.return_value = Page(items=[], next_cursor=None) + r = client.get("/api/v1/contributions", headers=AUTHED_HEADERS) + assert r.status_code == 200 + + def test_response_has_page_shape(self, client, contribution_repo): + contribution_repo.get_contributions.return_value = Page(items=[], next_cursor=None) + body = client.get("/api/v1/contributions", headers=AUTHED_HEADERS).json() + assert "items" in body + assert "next_cursor" in body + + def test_items_in_response(self, client, contribution_repo): + contribution_repo.get_contributions.return_value = Page( + items=[SAMPLE_CONTRIBUTION], next_cursor=None + ) + body = client.get("/api/v1/contributions", headers=AUTHED_HEADERS).json() + assert len(body["items"]) == 1 + + def test_repo_called_with_pagination(self, client, contribution_repo): + contribution_repo.get_contributions.return_value = Page(items=[], next_cursor=None) + client.get("/api/v1/contributions", params={"limit": 10}, headers=AUTHED_HEADERS) + _, kwargs = contribution_repo.get_contributions.call_args + assert kwargs["pagination"].limit == 10 + + def test_fields_forwarded(self, client, contribution_repo): + contribution_repo.get_contributions.return_value = Page(items=[], next_cursor=None) + client.get("/api/v1/contributions", params={"_fields": "formula"}, headers=AUTHED_HEADERS) + _, kwargs = contribution_repo.get_contributions.call_args + assert kwargs["fields"] is not None + assert "formula" in kwargs["fields"] + + def test_invalid_fields_returns_422(self, client, contribution_repo): + contribution_repo.get_contributions.return_value = Page(items=[], next_cursor=None) + r = client.get("/api/v1/contributions", params={"_fields": "bad_field"}, headers=AUTHED_HEADERS) + assert r.status_code == 422 + + def test_anonymous_can_list(self, client, contribution_repo): + contribution_repo.get_contributions.return_value = Page(items=[], next_cursor=None) + r = client.get("/api/v1/contributions", headers=ANON_HEADERS) + assert r.status_code == 200 + + def test_filter_param_forwarded_to_repo(self, client, contribution_repo): + contribution_repo.get_contributions.return_value = Page(items=[], next_cursor=None) + client.get("/api/v1/contributions", params={"formula": "Fe2O3"}, headers=AUTHED_HEADERS) + contribution_repo.get_contributions.assert_called_once() + + +# --------------------------------------------------------------------------- +# DELETE /api/v1/contributions (batch) +# --------------------------------------------------------------------------- + + +class TestDeleteContributions: + def test_batch_delete_returns_200(self, client, contribution_repo): + contribution_repo.delete_contributions.return_value = None + r = client.delete("/api/v1/contributions", headers=AUTHED_HEADERS) + assert r.status_code == 200 + + def test_repo_delete_called(self, client, contribution_repo): + contribution_repo.delete_contributions.return_value = None + client.delete("/api/v1/contributions", headers=AUTHED_HEADERS) + contribution_repo.delete_contributions.assert_called_once() + + def test_filter_forwarded_to_repo(self, client, contribution_repo): + contribution_repo.delete_contributions.return_value = None + client.delete("/api/v1/contributions", params={"is_public": "true"}, headers=AUTHED_HEADERS) + _, kwargs = contribution_repo.delete_contributions.call_args + assert kwargs["filter"] is not None + + +# --------------------------------------------------------------------------- +# Stub endpoints — verify they exist and wire to the repo +# --------------------------------------------------------------------------- + + +class TestStubEndpoints: + """These endpoints are stubs in the repo but the routes must be wired.""" + + def test_post_contributions_route_exists(self, client, contribution_repo): + contribution_repo.insert_contributions.return_value = None + r = client.post("/api/v1/contributions", json=[], headers=AUTHED_HEADERS) + # Should reach the route (not 404/405) even if the handler is a stub + assert r.status_code != 404 + assert r.status_code != 405 + + def test_put_contributions_route_exists(self, client, contribution_repo): + contribution_repo.upsert_contributions.return_value = None + r = client.put("/api/v1/contributions", json=[], headers=AUTHED_HEADERS) + assert r.status_code != 404 + assert r.status_code != 405 diff --git a/mpcontribs-api/tests/integration/test_error_handlers.py b/mpcontribs-api/tests/integration/test_error_handlers.py new file mode 100644 index 0000000000..246452a23b --- /dev/null +++ b/mpcontribs-api/tests/integration/test_error_handlers.py @@ -0,0 +1,184 @@ +"""Integration tests for exception handlers registered in app.py. + +Tests exercise the full HTTP cycle to verify that AppError subclasses and +framework errors (RequestValidationError, HTTPException) all produce the +uniform JSON envelope: {"error": {"code": "...", "message": "..."}}. +""" + +import pytest +from fastapi import FastAPI +from fastapi.testclient import TestClient + +from src.mpcontribs_api.exceptions import ( + AuthenticationError, + ConflictError, + NotFoundError, + PermissionError, + ValidationError, +) +from tests.integration.conftest import AUTHED_HEADERS, make_test_app + +# --------------------------------------------------------------------------- +# Helper: mount a /probe route that raises a specific AppError +# --------------------------------------------------------------------------- + + +def _app_with_probe(exc: Exception) -> FastAPI: + """Create a test app with a GET /probe route that raises `exc`.""" + app = make_test_app() + + @app.get("/probe") + async def _probe(): + raise exc + + return app + + +def _client(app: FastAPI) -> TestClient: + return TestClient(app, raise_server_exceptions=False) + + +# --------------------------------------------------------------------------- +# Unknown route — Starlette HTTPException(404) → {"error": {"code": "http_error"}} +# --------------------------------------------------------------------------- + + +class TestUnknownRoute: + def test_status_404(self, client): + r = client.get("/no/such/route", headers=AUTHED_HEADERS) + assert r.status_code == 404 + + def test_error_envelope(self, client): + r = client.get("/no/such/route", headers=AUTHED_HEADERS) + body = r.json() + assert "error" in body + assert body["error"]["code"] == "http_error" + assert "message" in body["error"] + + +# --------------------------------------------------------------------------- +# Request body validation — FastAPI RequestValidationError → 422 +# --------------------------------------------------------------------------- + + +class TestRequestValidation: + def test_missing_required_body_field(self, client): + # PUT /api/v1/projects/{id} requires a ProjectIn body + r = client.put( + "/api/v1/projects/my-proj", + json={"title": "Missing required fields"}, + headers=AUTHED_HEADERS, + ) + assert r.status_code == 422 + + def test_validation_error_envelope(self, client): + r = client.put( + "/api/v1/projects/my-proj", + json={"title": "Missing required fields"}, + headers=AUTHED_HEADERS, + ) + body = r.json() + assert body["error"]["code"] == "validation_error" + assert "errors" in body["error"]["detail"] + + def test_non_json_body(self, client): + r = client.put( + "/api/v1/projects/my-proj", + content=b"not json at all", + headers={**AUTHED_HEADERS, "content-type": "application/json"}, + ) + assert r.status_code == 422 + + +# --------------------------------------------------------------------------- +# AppError subclasses — verify status codes and envelope shapes +# --------------------------------------------------------------------------- + + +class TestNotFoundError: + def setup_method(self): + self._app = _app_with_probe(NotFoundError("project 'foo' not found")) + self._client = _client(self._app) + + def test_status_404(self): + assert self._client.get("/probe").status_code == 404 + + def test_error_code(self): + assert self._client.get("/probe").json()["error"]["code"] == "not_found" + + def test_message(self): + assert "foo" in self._client.get("/probe").json()["error"]["message"] + + +class TestConflictError: + def setup_method(self): + self._app = _app_with_probe(ConflictError("duplicate id")) + self._client = _client(self._app) + + def test_status_409(self): + assert self._client.get("/probe").status_code == 409 + + def test_error_code(self): + assert self._client.get("/probe").json()["error"]["code"] == "conflict" + + +class TestValidationErrorHandler: + def setup_method(self): + self._app = _app_with_probe(ValidationError("bad field value")) + self._client = _client(self._app) + + def test_status_422(self): + assert self._client.get("/probe").status_code == 422 + + def test_error_code(self): + assert self._client.get("/probe").json()["error"]["code"] == "validation_error" + + +class TestPermissionErrorHandler: + def setup_method(self): + self._app = _app_with_probe(PermissionError(required_role="admin")) + self._client = _client(self._app) + + def test_status_403(self): + assert self._client.get("/probe").status_code == 403 + + def test_error_code(self): + assert self._client.get("/probe").json()["error"]["code"] == "permission_denied" + + +class TestAuthenticationErrorHandler: + def setup_method(self): + self._app = _app_with_probe(AuthenticationError("login required")) + self._client = _client(self._app) + + def test_status_401(self): + assert self._client.get("/probe").status_code == 401 + + def test_error_code(self): + assert self._client.get("/probe").json()["error"]["code"] == "authentication_error" + + +# --------------------------------------------------------------------------- +# Envelope shape invariants — all error responses share the same top-level key +# --------------------------------------------------------------------------- + + +class TestEnvelopeShape: + @pytest.mark.parametrize( + "exc, expected_status", + [ + (NotFoundError("x"), 404), + (ConflictError("x"), 409), + (ValidationError("x"), 422), + (PermissionError(), 403), + (AuthenticationError("x"), 401), + ], + ) + def test_always_has_error_key(self, exc, expected_status): + app = _app_with_probe(exc) + r = _client(app).get("/probe") + assert r.status_code == expected_status + body = r.json() + assert "error" in body + assert "code" in body["error"] + assert "message" in body["error"] diff --git a/mpcontribs-api/tests/integration/test_gateway.py b/mpcontribs-api/tests/integration/test_gateway.py new file mode 100644 index 0000000000..0a8a4ce16e --- /dev/null +++ b/mpcontribs-api/tests/integration/test_gateway.py @@ -0,0 +1,67 @@ +"""Integration tests for the Kong gateway secret verification. + +verify_gateway() is applied as an app-level dependency in production. The +gateway_app fixture (from conftest) keeps that dependency active so we can +test enforcement through the full HTTP cycle without a real database. + +The correct header value is the plain secret configured in settings +(MPCONTRIBS_KONG__GATEWAY_SECRET=test-gateway-secret, set in the root +conftest.py). The mock project/contribution repos are also overridden here so +that a passing gateway request reaches a route and returns a non-gateway error. +""" + +from unittest.mock import AsyncMock + +import pytest + +from src.mpcontribs_api.domains.contributions.dependencies import get_scoped_contributions +from src.mpcontribs_api.domains.projects.dependencies import get_scoped_projects +from src.mpcontribs_api.pagination import Page +from tests.integration.conftest import GATEWAY_SECRET + + +@pytest.fixture(autouse=True) +def _stub_repos(gateway_app): + """Inject no-op mock repos so gateway-passing requests don't hit Beanie.""" + proj_repo = AsyncMock() + proj_repo.get_project.return_value = Page(items=[], next_cursor=None) + contrib_repo = AsyncMock() + contrib_repo.get_contributions.return_value = Page(items=[], next_cursor=None) + + gateway_app.dependency_overrides[get_scoped_projects] = lambda: proj_repo + gateway_app.dependency_overrides[get_scoped_contributions] = lambda: contrib_repo + yield + gateway_app.dependency_overrides.clear() + + +class TestGatewayEnforcement: + def test_missing_header_returns_403(self, gateway_client): + r = gateway_client.get("/api/v1/projects") + assert r.status_code == 403 + + def test_wrong_secret_returns_403(self, gateway_client): + r = gateway_client.get("/api/v1/projects", headers={"x-gateway-secret": "wrong-secret"}) + assert r.status_code == 403 + + def test_missing_header_error_code(self, gateway_client): + r = gateway_client.get("/api/v1/projects") + assert r.json()["error"]["code"] == "gateway_error" + + def test_correct_secret_passes_gateway(self, gateway_client): + r = gateway_client.get( + "/api/v1/projects", + headers={"x-gateway-secret": GATEWAY_SECRET}, + ) + # Request reached the route — not 403 + assert r.status_code != 403 + + def test_correct_secret_on_contributions(self, gateway_client): + r = gateway_client.get( + "/api/v1/contributions", + headers={"x-gateway-secret": GATEWAY_SECRET}, + ) + assert r.status_code != 403 + + def test_empty_string_secret_returns_403(self, gateway_client): + r = gateway_client.get("/api/v1/projects", headers={"x-gateway-secret": ""}) + assert r.status_code == 403 diff --git a/mpcontribs-api/tests/integration/test_projects.py b/mpcontribs-api/tests/integration/test_projects.py new file mode 100644 index 0000000000..57feeba04f --- /dev/null +++ b/mpcontribs-api/tests/integration/test_projects.py @@ -0,0 +1,271 @@ +"""Integration tests for /api/v1/projects routes. + +The project repository is overridden with an AsyncMock for each test so no +MongoDB connection is needed. Tests verify: + - HTTP status codes + - Response JSON shapes (Page envelope, ProjectOut fields) + - That the correct repository method is called + - That query parameters (_fields, pagination, filters) are forwarded + - Error handling (NotFoundError → 404, etc.) +""" + + +import pytest + +from src.mpcontribs_api.domains.projects.dependencies import get_scoped_projects +from src.mpcontribs_api.domains.projects.models import ProjectOut, Stats +from src.mpcontribs_api.exceptions import ConflictError, NotFoundError +from src.mpcontribs_api.pagination import Page +from tests.integration.conftest import ANON_HEADERS, AUTHED_HEADERS + +# --------------------------------------------------------------------------- +# Shared sample data +# --------------------------------------------------------------------------- + +SAMPLE_STATS = Stats(columns=1, contributions=5, tables=0, structures=0, attachments=0, size=128.0) + +SAMPLE_PROJECT = ProjectOut.model_validate( + { + "_id": "mp-sample", + "title": "Sample Project", + "authors": "Alice, Bob", + "description": "A sample", + "is_public": True, + "is_approved": True, + "stats": SAMPLE_STATS, + } +) + + +# --------------------------------------------------------------------------- +# Fixture: inject mock repo into the test_app for the duration of each test +# --------------------------------------------------------------------------- + + +@pytest.fixture +def project_repo(test_app, mock_project_repo): + test_app.dependency_overrides[get_scoped_projects] = lambda: mock_project_repo + yield mock_project_repo + test_app.dependency_overrides.pop(get_scoped_projects, None) + + +# --------------------------------------------------------------------------- +# GET /api/v1/projects +# --------------------------------------------------------------------------- + + +class TestListProjects: + def test_empty_page_returns_200(self, client, project_repo): + project_repo.get_project.return_value = Page(items=[], next_cursor=None) + r = client.get("/api/v1/projects", headers=AUTHED_HEADERS) + assert r.status_code == 200 + + def test_response_has_items_and_cursor(self, client, project_repo): + project_repo.get_project.return_value = Page(items=[], next_cursor=None) + body = client.get("/api/v1/projects", headers=AUTHED_HEADERS).json() + assert "items" in body + assert "next_cursor" in body + + def test_items_returned_in_response(self, client, project_repo): + project_repo.get_project.return_value = Page(items=[SAMPLE_PROJECT], next_cursor=None) + body = client.get("/api/v1/projects", headers=AUTHED_HEADERS).json() + assert len(body["items"]) == 1 + + def test_next_cursor_set_when_more_pages(self, client, project_repo): + from src.mpcontribs_api.pagination import encode_cursor + cursor = encode_cursor("mp-sample") + project_repo.get_project.return_value = Page(items=[SAMPLE_PROJECT], next_cursor=cursor) + body = client.get("/api/v1/projects", headers=AUTHED_HEADERS).json() + assert body["next_cursor"] == cursor + + def test_repo_get_project_called(self, client, project_repo): + project_repo.get_project.return_value = Page(items=[], next_cursor=None) + client.get("/api/v1/projects", headers=AUTHED_HEADERS) + project_repo.get_project.assert_called_once() + + def test_anonymous_user_reaches_route(self, client, project_repo): + project_repo.get_project.return_value = Page(items=[], next_cursor=None) + r = client.get("/api/v1/projects", headers=ANON_HEADERS) + assert r.status_code == 200 + + def test_invalid_fields_param_returns_422(self, client, project_repo): + project_repo.get_project.return_value = Page(items=[], next_cursor=None) + r = client.get("/api/v1/projects", params={"_fields": "nonexistent_field"}, headers=AUTHED_HEADERS) + assert r.status_code == 422 + + def test_limit_param_forwarded(self, client, project_repo): + project_repo.get_project.return_value = Page(items=[], next_cursor=None) + client.get("/api/v1/projects", params={"limit": 5}, headers=AUTHED_HEADERS) + _, kwargs = project_repo.get_project.call_args + assert kwargs["pagination"].limit == 5 + + def test_limit_above_max_returns_422(self, client, project_repo): + r = client.get("/api/v1/projects", params={"limit": 999}, headers=AUTHED_HEADERS) + assert r.status_code == 422 + + def test_valid_fields_param_forwarded(self, client, project_repo): + project_repo.get_project.return_value = Page(items=[], next_cursor=None) + client.get("/api/v1/projects", params={"_fields": "title,authors"}, headers=AUTHED_HEADERS) + _, kwargs = project_repo.get_project.call_args + assert kwargs["fields"] is not None + assert "title" in kwargs["fields"] + + +# --------------------------------------------------------------------------- +# GET /api/v1/projects/{id} +# --------------------------------------------------------------------------- + + +class TestGetProjectById: + def test_found_returns_200(self, client, project_repo): + project_repo.get_project_by_id.return_value = SAMPLE_PROJECT + r = client.get("/api/v1/projects/mp-sample", headers=AUTHED_HEADERS) + assert r.status_code == 200 + + def test_response_contains_project_data(self, client, project_repo): + project_repo.get_project_by_id.return_value = SAMPLE_PROJECT + body = client.get("/api/v1/projects/mp-sample", headers=AUTHED_HEADERS).json() + assert body["id"] == "mp-sample" + assert body["title"] == "Sample Project" + + def test_not_found_returns_404(self, client, project_repo): + project_repo.get_project_by_id.side_effect = NotFoundError("project not found") + r = client.get("/api/v1/projects/nonexistent", headers=AUTHED_HEADERS) + assert r.status_code == 404 + + def test_not_found_error_code(self, client, project_repo): + project_repo.get_project_by_id.side_effect = NotFoundError("project not found") + body = client.get("/api/v1/projects/nonexistent", headers=AUTHED_HEADERS).json() + assert body["error"]["code"] == "not_found" + + def test_id_forwarded_to_repo(self, client, project_repo): + project_repo.get_project_by_id.return_value = SAMPLE_PROJECT + client.get("/api/v1/projects/my-specific-id", headers=AUTHED_HEADERS) + _, kwargs = project_repo.get_project_by_id.call_args + assert kwargs["id"] == "my-specific-id" + + def test_fields_param_forwarded(self, client, project_repo): + project_repo.get_project_by_id.return_value = SAMPLE_PROJECT + client.get("/api/v1/projects/mp-sample", params={"_fields": "title"}, headers=AUTHED_HEADERS) + _, kwargs = project_repo.get_project_by_id.call_args + assert kwargs["fields"] is not None + assert "title" in kwargs["fields"] + + def test_no_fields_param_passes_none(self, client, project_repo): + project_repo.get_project_by_id.return_value = SAMPLE_PROJECT + client.get("/api/v1/projects/mp-sample", headers=AUTHED_HEADERS) + _, kwargs = project_repo.get_project_by_id.call_args + assert kwargs["fields"] is None + + +# --------------------------------------------------------------------------- +# PATCH /api/v1/projects/{id} +# --------------------------------------------------------------------------- + + +class TestPatchProject: + def test_valid_patch_returns_200(self, client, project_repo): + project_repo.patch_project.return_value = SAMPLE_PROJECT + r = client.patch( + "/api/v1/projects/mp-sample", + json={"title": "Updated Title"}, + headers=AUTHED_HEADERS, + ) + assert r.status_code == 200 + + def test_patch_response_is_project_out(self, client, project_repo): + updated = ProjectOut(id="mp-sample", title="Updated Title") + project_repo.patch_project.return_value = updated + body = client.patch( + "/api/v1/projects/mp-sample", + json={"title": "Updated Title"}, + headers=AUTHED_HEADERS, + ).json() + assert body["title"] == "Updated Title" + + def test_not_found_returns_404(self, client, project_repo): + project_repo.patch_project.side_effect = NotFoundError("not found") + r = client.patch( + "/api/v1/projects/missing", + json={"title": "x" * 5}, + headers=AUTHED_HEADERS, + ) + assert r.status_code == 404 + + def test_invalid_title_too_short_returns_422(self, client, project_repo): + r = client.patch( + "/api/v1/projects/mp-sample", + json={"title": "ab"}, + headers=AUTHED_HEADERS, + ) + assert r.status_code == 422 + + def test_id_and_update_forwarded_to_repo(self, client, project_repo): + project_repo.patch_project.return_value = SAMPLE_PROJECT + client.patch( + "/api/v1/projects/mp-sample", + json={"title": "New Name"}, + headers=AUTHED_HEADERS, + ) + _, kwargs = project_repo.patch_project.call_args + assert kwargs["id"] == "mp-sample" + assert kwargs["update"].title == "New Name" + + +# --------------------------------------------------------------------------- +# DELETE /api/v1/projects/{id} +# --------------------------------------------------------------------------- + + +class TestDeleteProject: + def test_delete_returns_204(self, client, project_repo): + project_repo.delete_project.return_value = None + r = client.delete("/api/v1/projects/mp-sample", headers=AUTHED_HEADERS) + assert r.status_code == 204 + + def test_delete_response_has_no_body(self, client, project_repo): + project_repo.delete_project.return_value = None + r = client.delete("/api/v1/projects/mp-sample", headers=AUTHED_HEADERS) + assert r.content == b"" + + def test_id_forwarded_to_repo(self, client, project_repo): + project_repo.delete_project.return_value = None + client.delete("/api/v1/projects/mp-sample", headers=AUTHED_HEADERS) + _, kwargs = project_repo.delete_project.call_args + assert kwargs["id"] == "mp-sample" + + +# --------------------------------------------------------------------------- +# PUT /api/v1/projects/{id} +# --------------------------------------------------------------------------- + + +class TestUpsertProject: + def _valid_body(self, **overrides): + body = { + "_id": "mp-sample", + "title": "Test Project", + "authors": "Alice", + "description": "A project", + "owner": "google:alice@example.com", + "unique_identifiers": True, + "stats": {"columns": 0, "contributions": 0, "tables": 0, "structures": 0, "attachments": 0, "size": 0.0}, + } + body.update(overrides) + return body + + def test_valid_upsert_returns_200(self, client, project_repo): + project_repo.upsert_project.return_value = SAMPLE_PROJECT + r = client.put("/api/v1/projects/mp-sample", json=self._valid_body(), headers=AUTHED_HEADERS) + assert r.status_code == 200 + + def test_conflict_returns_409(self, client, project_repo): + project_repo.upsert_project.side_effect = ConflictError("already exists") + r = client.put("/api/v1/projects/mp-sample", json=self._valid_body(), headers=AUTHED_HEADERS) + assert r.status_code == 409 + + def test_missing_required_field_returns_422(self, client, project_repo): + body = self._valid_body() + del body["title"] + r = client.put("/api/v1/projects/mp-sample", json=body, headers=AUTHED_HEADERS) + assert r.status_code == 422 diff --git a/mpcontribs-api/uv.lock b/mpcontribs-api/uv.lock index 4d386f1cc8..70edad087f 100644 --- a/mpcontribs-api/uv.lock +++ b/mpcontribs-api/uv.lock @@ -1079,6 +1079,43 @@ gevent = [ { name = "gevent" }, ] +[[package]] +name = "h11" +version = "0.16.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/01/ee/02a2c011bdab74c6fb3c75474d40b3052059d95df7e73351460c8588d963/h11-0.16.0.tar.gz", hash = "sha256:4e35b956cf45792e4caa5885e69fba00bdbc6ffafbfa020300e549b208ee5ff1", size = 101250, upload-time = "2025-04-24T03:35:25.427Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/04/4b/29cac41a4d98d144bf5f6d33995617b185d14b22401f75ca86f384e87ff1/h11-0.16.0-py3-none-any.whl", hash = "sha256:63cf8bbe7522de3bf65932fda1d9c2772064ffb3dae62d55932da54b31cb6c86", size = 37515, upload-time = "2025-04-24T03:35:24.344Z" }, +] + +[[package]] +name = "httpcore2" +version = "2.3.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "h11" }, + { name = "truststore" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/e6/34/18f1c596e677962f040284246f393b10a1f8ce440b3a7e69c637d0f1c7ad/httpcore2-2.3.0.tar.gz", hash = "sha256:07327e251560960eea8e969d92d4c6a325feb13cca39e25340731336c3baf924", size = 64300, upload-time = "2026-06-01T13:15:02.998Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/c2/dd/3357218c69360d1cecc196c230c9a1d5c9afd5dba362056e23e60a5e64e5/httpcore2-2.3.0-py3-none-any.whl", hash = "sha256:477e9e334f74e5240dcac002e890580f36a57d40ff0fb14cc9655731d23b8415", size = 80024, upload-time = "2026-06-01T13:15:00.001Z" }, +] + +[[package]] +name = "httpx2" +version = "2.3.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "anyio" }, + { name = "httpcore2" }, + { name = "idna" }, + { name = "truststore" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/9f/9a/cca0b9145f13d8ae34b885ae28d403a1469a433abc78e0f94f4ce94e650b/httpx2-2.3.0.tar.gz", hash = "sha256:227e7c41d95a76d4077a52640564132777215fc3394e07b66a3116c33d668fa9", size = 81115, upload-time = "2026-06-01T13:15:04.324Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/87/ce/ae2911859847f9ba1d6b23027e53481cbeb50b93234f355a968d300ca2cb/httpx2-2.3.0-py3-none-any.whl", hash = "sha256:6f393663bdf6dbe7fe90118e3eb5b2bd024a675cae0390ac08cec9198812d8b7", size = 74538, upload-time = "2026-06-01T13:15:01.566Z" }, +] + [[package]] name = "idna" version = "3.17" @@ -1694,6 +1731,7 @@ dependencies = [ [package.dev-dependencies] dev = [ { name = "basedpyright" }, + { name = "httpx2" }, { name = "pydocstringformatter" }, { name = "pytest" }, { name = "pytest-xdist" }, @@ -1751,6 +1789,7 @@ requires-dist = [ [package.metadata.requires-dev] dev = [ { name = "basedpyright", specifier = ">=1.29.0" }, + { name = "httpx2", specifier = ">=0.28.0" }, { name = "pydocstringformatter", specifier = ">=0.7.0" }, { name = "pytest", specifier = ">=9.0.3" }, { name = "pytest-xdist", specifier = ">=3.8.0" }, @@ -3209,6 +3248,15 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/da/98/a9937a969d018a23badfea0b381f66783649d48e0ea6c41923265c3cbeb3/traitlets-5.15.0-py3-none-any.whl", hash = "sha256:fb36a18867a6803deab09f3c5e0fa81bb7b26a5c9e82501c9933f759166eff40", size = 85877, upload-time = "2026-05-06T08:05:55.853Z" }, ] +[[package]] +name = "truststore" +version = "0.10.4" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/53/a3/1585216310e344e8102c22482f6060c7a6ea0322b63e026372e6dcefcfd6/truststore-0.10.4.tar.gz", hash = "sha256:9d91bd436463ad5e4ee4aba766628dd6cd7010cf3e2461756b3303710eebc301", size = 26169, upload-time = "2025-08-12T18:49:02.73Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/19/97/56608b2249fe206a67cd573bc93cd9896e1efb9e98bce9c163bcdc704b88/truststore-0.10.4-py3-none-any.whl", hash = "sha256:adaeaecf1cbb5f4de3b1959b42d41f6fab57b2b1666adb59e89cb0b53361d981", size = 18660, upload-time = "2025-08-12T18:49:01.46Z" }, +] + [[package]] name = "typing-extensions" version = "4.15.0" From 082a6960824dafe08cfa460b478c516c7211e67b Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 3 Jun 2026 15:39:26 -0700 Subject: [PATCH 280/591] Added test commands to justfile --- mpcontribs-api/justfile | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/mpcontribs-api/justfile b/mpcontribs-api/justfile index 20950b1243..8c5f82188d 100644 --- a/mpcontribs-api/justfile +++ b/mpcontribs-api/justfile @@ -4,3 +4,12 @@ fmt: -uv run ruff check --fix src/ -uv run ruff check --fix --unsafe-fixes src/ -uv run pydocstringformatter --write src/ + +test suite="all": + #!/usr/bin/env bash + case "{{suite}}" in + all|a) uv run pytest tests/ ;; + integration|i) uv run pytest tests/integration/ ;; + unit|u) uv run pytest tests/unit/ ;; + *) echo "unknown suite '{{suite}}' — use: all/a, integration/i, unit/u" && exit 1 ;; + esac From 9c4775cad6d693140366d7b92fd7f0ae9d3c035e Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 3 Jun 2026 16:02:30 -0700 Subject: [PATCH 281/591] Added tests to live dev db --- mpcontribs-api/justfile | 13 +- mpcontribs-api/pyproject.toml | 6 +- mpcontribs-api/tests/conftest.py | 23 +- .../tests/integration/db/__init__.py | 0 .../tests/integration/db/conftest.py | 90 ++++++ .../db/test_projects_repository.py | 306 ++++++++++++++++++ .../tests/integration/test_contributions.py | 4 +- .../tests/integration/test_projects.py | 2 +- mpcontribs-api/tests/unit/conftest.py | 18 ++ mpcontribs-api/uv.lock | 14 + 10 files changed, 448 insertions(+), 28 deletions(-) create mode 100644 mpcontribs-api/tests/integration/db/__init__.py create mode 100644 mpcontribs-api/tests/integration/db/conftest.py create mode 100644 mpcontribs-api/tests/integration/db/test_projects_repository.py create mode 100644 mpcontribs-api/tests/unit/conftest.py diff --git a/mpcontribs-api/justfile b/mpcontribs-api/justfile index 8c5f82188d..929f75df5f 100644 --- a/mpcontribs-api/justfile +++ b/mpcontribs-api/justfile @@ -1,15 +1,16 @@ # Format, fix, and lint all source code fmt: - uv run ruff format src/ - -uv run ruff check --fix src/ - -uv run ruff check --fix --unsafe-fixes src/ - -uv run pydocstringformatter --write src/ + uv run ruff format + -uv run ruff check --fix + -uv run ruff check --fix --unsafe-fixes + -uv run pydocstringformatter --write test suite="all": #!/usr/bin/env bash case "{{suite}}" in all|a) uv run pytest tests/ ;; - integration|i) uv run pytest tests/integration/ ;; + integration|i) uv run pytest tests/integration/ -m "not db" ;; unit|u) uv run pytest tests/unit/ ;; - *) echo "unknown suite '{{suite}}' — use: all/a, integration/i, unit/u" && exit 1 ;; + db|d) uv run pytest tests/integration/db/ -m db ;; + *) echo "unknown suite '{{suite}}' — use: all/a, integration/i, unit/u, db/d" && exit 1 ;; esac diff --git a/mpcontribs-api/pyproject.toml b/mpcontribs-api/pyproject.toml index bc30e6b02b..49480c94b3 100644 --- a/mpcontribs-api/pyproject.toml +++ b/mpcontribs-api/pyproject.toml @@ -83,18 +83,22 @@ dev = [ "pytest>=9.0.3", "pytest-xdist>=3.8.0", "httpx2>=0.28.0", + "pytest-asyncio>=1.4.0", ] [tool.pytest.ini_options] pythonpath = ["."] +asyncio_mode = "auto" +asyncio_default_fixture_loop_scope = "session" markers = [ "base: basic resource testing", "extra: all extra views", + "db: requires a live MongoDB connection (set MPCONTRIBS_MONGO__URI)", ] [tool.ruff] line-length = 120 -exclude = ["src/mpcontribs_api/old"] +exclude = ["src/mpcontribs_api/old", "tests/"] [tool.ruff.lint] select = ["E", "F", "W", "I", "B", "UP"] diff --git a/mpcontribs-api/tests/conftest.py b/mpcontribs-api/tests/conftest.py index b8ae1606bf..42f8eef4ed 100644 --- a/mpcontribs-api/tests/conftest.py +++ b/mpcontribs-api/tests/conftest.py @@ -6,11 +6,14 @@ """ import os -from unittest.mock import MagicMock, patch -import pytest +from dotenv import load_dotenv -# Must be set before any source import that calls get_settings(). +# Load .env *before* setdefault calls so real credentials take precedence. +# load_dotenv is a no-op when .env doesn't exist (CI / pure unit-test runs). +load_dotenv() + +# Fallbacks for any value not supplied by .env (CI, unit-only runs, etc.) os.environ.setdefault("MPCONTRIBS_ENVIRONMENT", "dev") os.environ.setdefault("MPCONTRIBS_MONGO__URI", "mongodb://localhost:27017") os.environ.setdefault("MPCONTRIBS_MONGO__DB_NAME", "testdb") @@ -19,17 +22,3 @@ os.environ.setdefault("MPCONTRIBS_REDIS__URL", "redis://localhost:6379") os.environ.setdefault("MPCONTRIBS_MAIL_DEFAULT_SENDER", "test@example.com") os.environ.setdefault("MPCONTRIBS_VERSION", "0.0.0-test") - - -@pytest.fixture(autouse=True, scope="session") -def _mock_beanie_collection(): - """Prevent CollectionWasNotInitialized for unit tests. - - Beanie Documents call get_pymongo_collection() in __init__ to assert the - collection has been set up via init_beanie(). Unit tests don't need a real - DB, so we stub that check out for the entire session. - """ - import beanie - - with patch.object(beanie.Document, "get_pymongo_collection", return_value=MagicMock()): - yield diff --git a/mpcontribs-api/tests/integration/db/__init__.py b/mpcontribs-api/tests/integration/db/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/mpcontribs-api/tests/integration/db/conftest.py b/mpcontribs-api/tests/integration/db/conftest.py new file mode 100644 index 0000000000..d471c60315 --- /dev/null +++ b/mpcontribs-api/tests/integration/db/conftest.py @@ -0,0 +1,90 @@ +"""Fixtures for tests that require a live MongoDB connection. + +Connection settings come from the .env file (MPCONTRIBS_MONGO__URI and +MPCONTRIBS_MONGO__DB_NAME). All tests in this directory are marked `db` +automatically; run them with `just test db` or skip them with `-m "not db"`. + +Data isolation: the `clean_projects` and `clean_contributions` fixtures +(autouse) delete all documents from the test collections before each test. +This is intentionally destructive — point MPCONTRIBS_MONGO__DB_NAME at a +dedicated test database, not a shared or production one. +""" + +import pytest +import pytest_asyncio +from beanie import init_beanie +from pymongo import AsyncMongoClient + +from src.mpcontribs_api.config import get_settings +from src.mpcontribs_api.domains.contributions.models import Contribution +from src.mpcontribs_api.domains.projects.models import Project + +# --------------------------------------------------------------------------- +# Auto-mark all tests in this directory as @pytest.mark.db +# --------------------------------------------------------------------------- + +pytestmark = [ + pytest.mark.db, + pytest.mark.asyncio(loop_scope="session"), +] + + +def pytest_collection_modifyitems(items): + for item in items: + if "integration/db" in str(item.fspath): + item.add_marker(pytest.mark.db) + item.add_marker(pytest.mark.asyncio(loop_scope="session")) + + +# --------------------------------------------------------------------------- +# Session-scoped MongoDB connection + Beanie initialization +# --------------------------------------------------------------------------- + + +@pytest_asyncio.fixture(scope="session") +async def mongo_client(): + """Connect to the Atlas dev instance; skip if unreachable.""" + settings = get_settings() + client = AsyncMongoClient( + settings.mongo.uri.get_secret_value(), + serverSelectionTimeoutMS=5_000, + ) + try: + await client.admin.command("ping") + except Exception as exc: + pytest.skip(f"MongoDB not reachable: {exc}") + yield client + await client.close() + + +@pytest_asyncio.fixture(scope="session") +async def db(mongo_client): + """Database handle with Beanie initialised against the test database.""" + settings = get_settings() + database = mongo_client[settings.mongo.db_name] + # Only initialise concrete documents (stubs like Structure/Table/Attachment + # have no Settings.name yet and cause Beanie to fall back to the base class). + await init_beanie( + database=database, + document_models=[Project, Contribution], + ) + yield database + + +# --------------------------------------------------------------------------- +# Per-test collection cleanup (autouse so every test starts clean) +# --------------------------------------------------------------------------- + + +@pytest_asyncio.fixture(autouse=True) +async def clean_projects(db): + await db["projects"].delete_many({}) + yield + await db["projects"].delete_many({}) + + +@pytest_asyncio.fixture(autouse=True) +async def clean_contributions(db): + await db["contributions"].delete_many({}) + yield + await db["contributions"].delete_many({}) diff --git a/mpcontribs-api/tests/integration/db/test_projects_repository.py b/mpcontribs-api/tests/integration/db/test_projects_repository.py new file mode 100644 index 0000000000..2d68568804 --- /dev/null +++ b/mpcontribs-api/tests/integration/db/test_projects_repository.py @@ -0,0 +1,306 @@ +import pytest + +from src.mpcontribs_api.auth import User +from src.mpcontribs_api.domains.projects.models import Project, ProjectIn, ProjectOut, ProjectPatch, Stats +from src.mpcontribs_api.domains.projects.repository import MongoDbProjectRepository +from src.mpcontribs_api.exceptions import ConflictError, NotFoundError +from src.mpcontribs_api.pagination import CursorParams + +"""Database integration tests for MongoDbProjectRepository. + +These tests require a live MongoDB connection (see conftest.py). They exercise +the real Beanie/MongoDB layer — query scoping, field projection, cursor +pagination, soft-delete, conflict detection, patch, and upsert — none of which +can be verified with mock repositories. + +Run with: just test db +Skip with: uv run pytest -m "not db" +""" + + +# All tests in this module share the session event loop so they can reuse the +# session-scoped AsyncMongoClient initialised in conftest. Beanie's internal +# collection references are loop-bound, so mixing loops causes errors. +pytestmark = [pytest.mark.db, pytest.mark.asyncio(loop_scope="session")] + + +# --------------------------------------------------------------------------- +# Helpers +# --------------------------------------------------------------------------- + +STATS = Stats(columns=0, contributions=0, tables=0, structures=0, attachments=0, size=0.0) + +ADMIN = User(username="google:admin@example.com", groups=frozenset({"admin"})) +ALICE = User(username="google:alice@example.com", groups=frozenset({"mp-team"})) +ANON = User() + + +def _repo(user: User) -> MongoDbProjectRepository: + return MongoDbProjectRepository(user) + + +def _project_in(id: str, **overrides) -> ProjectIn: + defaults = { + "_id": id, + "title": id[:30], + "authors": "Test Author", + "description": "Test description", + "owner": "google:alice@example.com", + "unique_identifiers": True, + "stats": STATS, + } + defaults.update(overrides) + return ProjectIn(**defaults) + + +async def _insert(id: str, **overrides) -> Project: + project_in = _project_in(id, **overrides) + return await _repo(ADMIN).insert_project(project_in) + + +# --------------------------------------------------------------------------- +# insert_project +# --------------------------------------------------------------------------- + + +class TestInsertProject: + async def test_inserted_project_is_retrievable(self, db): + await _insert("ins-basic") + found = await Project.find_one(Project.id == "ins-basic") + assert found is not None + assert found.id == "ins-basic" + + async def test_duplicate_id_raises_conflict(self, db): + await _insert("ins-dup") + with pytest.raises(ConflictError): + await _insert("ins-dup") + + async def test_default_not_public(self, db): + await _insert("ins-priv") + found = await Project.find_one(Project.id == "ins-priv") + assert found.is_public is False + + async def test_explicit_public(self, db): + await _insert("ins-pub", is_public=True, is_approved=True) + found = await Project.find_one(Project.id == "ins-pub") + assert found.is_public is True + + +# --------------------------------------------------------------------------- +# Authorization scoping (_build_scope) +# --------------------------------------------------------------------------- + + +class TestAuthorizationScope: + async def test_admin_sees_all(self, db): + await _insert("scope-priv", is_public=False) + await _insert("scope-pub", is_public=True, is_approved=True) + page = await _repo(ADMIN).get_project(filter=_noop_filter(), pagination=CursorParams(), fields=None) + ids = {p.id for p in page.items} + assert "scope-priv" in ids + assert "scope-pub" in ids + + async def test_anonymous_only_sees_public_approved(self, db): + await _insert("anon-priv", is_public=False) + await _insert("anon-pub", is_public=True, is_approved=True) + await _insert("anon-pub-unapproved", is_public=True, is_approved=False) + page = await _repo(ANON).get_project(filter=_noop_filter(), pagination=CursorParams(), fields=None) + ids = {p.id for p in page.items} + assert "anon-pub" in ids + assert "anon-priv" not in ids + assert "anon-pub-unapproved" not in ids + + async def test_authenticated_sees_own_and_public(self, db): + await _insert("auth-alice-priv", owner="google:alice@example.com", is_public=False) + await _insert("auth-bob-priv", owner="google:bob@example.com", is_public=False) + await _insert("auth-pub", is_public=True, is_approved=True) + page = await _repo(ALICE).get_project(filter=_noop_filter(), pagination=CursorParams(), fields=None) + ids = {p.id for p in page.items} + assert "auth-alice-priv" in ids + assert "auth-pub" in ids + assert "auth-bob-priv" not in ids + + +def _noop_filter(): + from src.mpcontribs_api.domains.projects.models import ProjectFilter + + return ProjectFilter() + + +# --------------------------------------------------------------------------- +# get_project_by_id +# --------------------------------------------------------------------------- + + +class TestGetProjectById: + async def test_returns_project_for_valid_id(self, db): + await _insert("get-by-id") + result = await _repo(ADMIN).get_project_by_id(id="get-by-id", fields=None) + assert result is not None + assert result.id == "get-by-id" + + async def test_returns_none_for_missing_id(self, db): + result = await _repo(ADMIN).get_project_by_id(id="does-not-exist", fields=None) + assert result is None + + async def test_admin_can_get_private_project(self, db): + await _insert("get-priv", is_public=False) + result = await _repo(ADMIN).get_project_by_id(id="get-priv", fields=None) + assert result is not None + + async def test_anon_cannot_get_private_project(self, db): + await _insert("get-priv-anon", is_public=False) + result = await _repo(ANON).get_project_by_id(id="get-priv-anon", fields=None) + assert result is None + + +# --------------------------------------------------------------------------- +# Field projection +# --------------------------------------------------------------------------- + + +class TestFieldProjection: + async def test_projection_returns_only_requested_fields(self, db): + await _insert("proj-fields", is_public=True, is_approved=True) + fields = ProjectOut.parse_fields("title") + page = await _repo(ADMIN).get_project(filter=_noop_filter(), pagination=CursorParams(), fields=fields) + assert len(page.items) == 1 + item = page.items[0] + assert item.title == "proj-fields" + # authors was not requested — absent from the projected model entirely + assert not hasattr(item, "authors") + + async def test_no_projection_returns_all_fields(self, db): + await _insert("proj-all", is_public=True, is_approved=True) + page = await _repo(ADMIN).get_project(filter=_noop_filter(), pagination=CursorParams(), fields=None) + item = page.items[0] + assert item.title is not None + assert item.authors is not None + + +# --------------------------------------------------------------------------- +# Cursor-based pagination +# --------------------------------------------------------------------------- + + +class TestPagination: + async def test_limit_is_respected(self, db): + for i in range(5): + await _insert(f"pag-limit-{i:02d}", is_public=True, is_approved=True) + page = await _repo(ADMIN).get_project(filter=_noop_filter(), pagination=CursorParams(limit=3), fields=None) + assert len(page.items) == 3 + + async def test_next_cursor_set_when_more_items(self, db): + for i in range(4): + await _insert(f"pag-cursor-{i:02d}", is_public=True, is_approved=True) + page = await _repo(ADMIN).get_project(filter=_noop_filter(), pagination=CursorParams(limit=2), fields=None) + assert page.next_cursor is not None + + async def test_next_cursor_none_on_last_page(self, db): + for i in range(3): + await _insert(f"pag-last-{i:02d}", is_public=True, is_approved=True) + page = await _repo(ADMIN).get_project(filter=_noop_filter(), pagination=CursorParams(limit=10), fields=None) + assert page.next_cursor is None + + async def test_cursor_fetches_next_page(self, db): + for i in range(4): + await _insert(f"pag-next-{i:02d}", is_public=True, is_approved=True) + page1 = await _repo(ADMIN).get_project(filter=_noop_filter(), pagination=CursorParams(limit=2), fields=None) + assert page1.next_cursor is not None + page2 = await _repo(ADMIN).get_project( + filter=_noop_filter(), pagination=CursorParams(limit=2, cursor=page1.next_cursor), fields=None + ) + ids1 = {p.id for p in page1.items} + ids2 = {p.id for p in page2.items} + assert ids1.isdisjoint(ids2), "pages must not overlap" + + async def test_all_items_covered_across_pages(self, db): + for i in range(5): + await _insert(f"pag-all-{i:02d}", is_public=True, is_approved=True) + all_ids: set[str] = set() + cursor = None + while True: + page = await _repo(ADMIN).get_project( + filter=_noop_filter(), pagination=CursorParams(limit=2, cursor=cursor), fields=None + ) + all_ids.update(p.id for p in page.items) + cursor = page.next_cursor + if cursor is None: + break + assert all(f"pag-all-{i:02d}" in all_ids for i in range(5)) + + +# --------------------------------------------------------------------------- +# patch_project +# --------------------------------------------------------------------------- + + +class TestPatchProject: + async def test_updates_single_field(self, db): + await _insert("patch-me") + patch = ProjectPatch(title="Updated Title") + await _repo(ADMIN).patch_project(id="patch-me", update=patch) + found = await Project.find_one(Project.id == "patch-me") + assert found.title == "Updated Title" + + async def test_unset_fields_not_overwritten(self, db): + await _insert("patch-preserve") + original = await Project.find_one(Project.id == "patch-preserve") + patch = ProjectPatch(title="New Title") + await _repo(ADMIN).patch_project(id="patch-preserve", update=patch) + found = await Project.find_one(Project.id == "patch-preserve") + assert found.authors == original.authors + + async def test_not_found_raises(self, db): + patch = ProjectPatch(title="Won't work") + with pytest.raises(NotFoundError): + await _repo(ADMIN).patch_project(id="no-such-id", update=patch) + + async def test_empty_patch_returns_existing(self, db): + await _insert("patch-empty") + result = await _repo(ADMIN).patch_project(id="patch-empty", update=ProjectPatch()) + assert result.id == "patch-empty" + + +# --------------------------------------------------------------------------- +# delete_project (soft-delete via DocumentWithSoftDelete) +# --------------------------------------------------------------------------- + + +class TestDeleteProject: + async def test_deleted_project_not_in_default_query(self, db): + await _insert("del-me", is_public=True, is_approved=True) + await _repo(ADMIN).delete_project(id="del-me") + page = await _repo(ADMIN).get_project(filter=_noop_filter(), pagination=CursorParams(), fields=None) + ids = {p.id for p in page.items} + assert "del-me" not in ids + + async def test_delete_nonexistent_is_silent(self, db): + # delete_project does find_one().delete() — no error if not found + await _repo(ADMIN).delete_project(id="ghost-id") + + +# --------------------------------------------------------------------------- +# upsert_project +# --------------------------------------------------------------------------- + + +class TestUpsertProject: + async def test_upsert_creates_new_project(self, db): + data = _project_in("upsert-new") + await _repo(ADMIN).upsert_project(id="upsert-new", data=data) + found = await Project.find_one(Project.id == "upsert-new") + assert found is not None + + async def test_upsert_updates_existing_project(self, db): + await _insert("upsert-existing") + data = _project_in("upsert-existing", title="Replaced Title") + await _repo(ADMIN).upsert_project(id="upsert-existing", data=data) + found = await Project.find_one(Project.id == "upsert-existing") + assert found.title == "Replaced Title" + + async def test_upsert_uses_path_id_not_body_id(self, db): + data = _project_in("body-id") + await _repo(ADMIN).upsert_project(id="path-id", data=data) + found = await Project.find_one(Project.id == "path-id") + assert found is not None diff --git a/mpcontribs-api/tests/integration/test_contributions.py b/mpcontribs-api/tests/integration/test_contributions.py index c1efc24aee..9d5074e7ab 100644 --- a/mpcontribs-api/tests/integration/test_contributions.py +++ b/mpcontribs-api/tests/integration/test_contributions.py @@ -51,9 +51,7 @@ def test_response_has_page_shape(self, client, contribution_repo): assert "next_cursor" in body def test_items_in_response(self, client, contribution_repo): - contribution_repo.get_contributions.return_value = Page( - items=[SAMPLE_CONTRIBUTION], next_cursor=None - ) + contribution_repo.get_contributions.return_value = Page(items=[SAMPLE_CONTRIBUTION], next_cursor=None) body = client.get("/api/v1/contributions", headers=AUTHED_HEADERS).json() assert len(body["items"]) == 1 diff --git a/mpcontribs-api/tests/integration/test_projects.py b/mpcontribs-api/tests/integration/test_projects.py index 57feeba04f..7042ca82bb 100644 --- a/mpcontribs-api/tests/integration/test_projects.py +++ b/mpcontribs-api/tests/integration/test_projects.py @@ -9,7 +9,6 @@ - Error handling (NotFoundError → 404, etc.) """ - import pytest from src.mpcontribs_api.domains.projects.dependencies import get_scoped_projects @@ -73,6 +72,7 @@ def test_items_returned_in_response(self, client, project_repo): def test_next_cursor_set_when_more_pages(self, client, project_repo): from src.mpcontribs_api.pagination import encode_cursor + cursor = encode_cursor("mp-sample") project_repo.get_project.return_value = Page(items=[SAMPLE_PROJECT], next_cursor=cursor) body = client.get("/api/v1/projects", headers=AUTHED_HEADERS).json() diff --git a/mpcontribs-api/tests/unit/conftest.py b/mpcontribs-api/tests/unit/conftest.py new file mode 100644 index 0000000000..ab2b86c434 --- /dev/null +++ b/mpcontribs-api/tests/unit/conftest.py @@ -0,0 +1,18 @@ +"""Unit-test-only fixtures. + +The Beanie collection mock lives here (not the root conftest) so it is +applied only to unit tests and does not interfere with DB integration tests +that need real Beanie initialization. +""" + +from unittest.mock import MagicMock, patch + +import pytest + + +@pytest.fixture(autouse=True, scope="session") +def _mock_beanie_collection(): + import beanie + + with patch.object(beanie.Document, "get_pymongo_collection", return_value=MagicMock()): + yield diff --git a/mpcontribs-api/uv.lock b/mpcontribs-api/uv.lock index 70edad087f..f5cba271a7 100644 --- a/mpcontribs-api/uv.lock +++ b/mpcontribs-api/uv.lock @@ -1734,6 +1734,7 @@ dev = [ { name = "httpx2" }, { name = "pydocstringformatter" }, { name = "pytest" }, + { name = "pytest-asyncio" }, { name = "pytest-xdist" }, { name = "ruff" }, ] @@ -1792,6 +1793,7 @@ dev = [ { name = "httpx2", specifier = ">=0.28.0" }, { name = "pydocstringformatter", specifier = ">=0.7.0" }, { name = "pytest", specifier = ">=9.0.3" }, + { name = "pytest-asyncio", specifier = ">=1.4.0" }, { name = "pytest-xdist", specifier = ">=3.8.0" }, { name = "ruff", specifier = ">=0.9.0" }, ] @@ -2621,6 +2623,18 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/d4/24/a372aaf5c9b7208e7112038812994107bc65a84cd00e0354a88c2c77a617/pytest-9.0.3-py3-none-any.whl", hash = "sha256:2c5efc453d45394fdd706ade797c0a81091eccd1d6e4bccfcd476e2b8e0ab5d9", size = 375249, upload-time = "2026-04-07T17:16:16.13Z" }, ] +[[package]] +name = "pytest-asyncio" +version = "1.4.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "pytest" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/43/7c/d36d04db312ecf4298932ef77e6e4a9e8ad017906e24e34f0b0c361a2473/pytest_asyncio-1.4.0.tar.gz", hash = "sha256:c6c0d2259945122819f171a32ecea2c349ead889ee28176caaf492143424be42", size = 58514, upload-time = "2026-05-26T09:56:04.083Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/03/e2/08a497ef684b88559c9cc5f4ad53a37e7b99e727094a86d6ea32536d5d3c/pytest_asyncio-1.4.0-py3-none-any.whl", hash = "sha256:933ca923a23075a87fb7070c0ec272a6848489824d887c85c812670932835aa1", size = 16930, upload-time = "2026-05-26T09:56:02.576Z" }, +] + [[package]] name = "pytest-xdist" version = "3.8.0" From c03fbd7fb36f00da36db617641cab5227b405e99 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 3 Jun 2026 16:17:59 -0700 Subject: [PATCH 282/591] Fixed importing from src --- .../src/mpcontribs_api/api/v1/router.py | 4 +-- mpcontribs-api/src/mpcontribs_api/app.py | 36 +++++++++---------- mpcontribs-api/src/mpcontribs_api/auth.py | 2 +- .../src/mpcontribs_api/dependencies.py | 6 ++-- .../mpcontribs_api/domains/_shared/models.py | 2 +- .../domains/_shared/repository.py | 8 ++--- .../domains/contributions/dependencies.py | 4 +-- .../domains/contributions/models.py | 12 +++---- .../domains/contributions/repository.py | 8 ++--- .../domains/contributions/router.py | 6 ++-- .../domains/projects/dependencies.py | 4 +-- .../mpcontribs_api/domains/projects/models.py | 4 +-- .../domains/projects/repository.py | 10 +++--- .../mpcontribs_api/domains/projects/router.py | 6 ++-- mpcontribs-api/src/mpcontribs_api/logging.py | 2 +- .../src/mpcontribs_api/projection.py | 2 +- mpcontribs-api/src/mpcontribs_api/types.py | 2 +- 17 files changed, 57 insertions(+), 61 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/api/v1/router.py b/mpcontribs-api/src/mpcontribs_api/api/v1/router.py index 0204a7ff14..c8cb430867 100644 --- a/mpcontribs-api/src/mpcontribs_api/api/v1/router.py +++ b/mpcontribs-api/src/mpcontribs_api/api/v1/router.py @@ -1,7 +1,7 @@ from fastapi import APIRouter -from src.mpcontribs_api.domains.contributions.router import router as contributions_router -from src.mpcontribs_api.domains.projects.router import router as projects_router +from mpcontribs_api.domains.contributions.router import router as contributions_router +from mpcontribs_api.domains.projects.router import router as projects_router router = APIRouter() diff --git a/mpcontribs-api/src/mpcontribs_api/app.py b/mpcontribs-api/src/mpcontribs_api/app.py index 5f9ac141e2..a0d9fe091d 100644 --- a/mpcontribs-api/src/mpcontribs_api/app.py +++ b/mpcontribs-api/src/mpcontribs_api/app.py @@ -9,37 +9,37 @@ from pymongo import AsyncMongoClient from starlette.middleware.base import BaseHTTPMiddleware -from src.mpcontribs_api.api.v1.router import router as v1_router -from src.mpcontribs_api.config import Settings, get_settings -from src.mpcontribs_api.dependencies import verify_gateway -from src.mpcontribs_api.domains.projects.models import Project -from src.mpcontribs_api.exceptions import register_exception_handlers -from src.mpcontribs_api.logging import configure_logging -from src.mpcontribs_api.middleware import bind_request_context +from mpcontribs_api.api.v1.router import router as v1_router +from mpcontribs_api.config import Settings, get_settings +from mpcontribs_api.dependencies import verify_gateway +from mpcontribs_api.domains.contributions.models import Contribution +from mpcontribs_api.domains.projects.models import Project +from mpcontribs_api.exceptions import register_exception_handlers +from mpcontribs_api.logging import configure_logging +from mpcontribs_api.middleware import bind_request_context logger = logging.getLogger(__name__) -async def _build_lifespan(settings: Settings): +def _build_lifespan(settings: Settings): @asynccontextmanager async def lifespan(app: FastAPI) -> AsyncGenerator[None]: # --- startup --- client = AsyncMongoClient( - str(settings.mongo.uri), + settings.mongo.uri.get_secret_value(), maxPoolSize=settings.mongo.max_pool_size, minPoolSize=settings.mongo.min_pool_size, serverSelectionTimeoutMS=settings.mongo.server_selection_timeout_ms, uuidRepresentation="standard", ) - # Fail fast in prod if the DB is unreachable. Cheap, one round-trip. + # Fail fast if the DB is unreachable. Cheap, one round-trip. await client.admin.command("ping") logger.info("connected to mongo", extra={"db": settings.mongo.db_name}) app.state.mongo_client = client app.state.db = client[settings.mongo.db_name] - # Initialize beanie with document classes and a database - await init_beanie(database=client.db_name, document_models=[Project]) + await init_beanie(database=client[settings.mongo.db_name], document_models=[Project, Contribution]) try: yield @@ -51,28 +51,24 @@ async def lifespan(app: FastAPI) -> AsyncGenerator[None]: return lifespan -async def create_app(settings: Settings | None = None) -> FastAPI: +def create_app(settings: Settings | None = None) -> FastAPI: settings = settings or get_settings() configure_logging(settings) app = FastAPI( title="mpcontribs-api", version=settings.version, - debug=False if settings.environment == "prod" else True, - # Would be nice to implement eventually - # default_response_class=DefaultResponse, - lifespan=await _build_lifespan(settings), + debug=settings.environment != "prod", + lifespan=_build_lifespan(settings), dependencies=[Depends(verify_gateway)], ) - # Add request context to logs app.add_middleware(BaseHTTPMiddleware, dispatch=bind_request_context) - # Bind exception handlers so the app understands how to handle them register_exception_handlers(app) app.include_router(v1_router, prefix="/api/v1") return app -# For `uvicorn mpcontribs_api.app:app`. Tests use create_app() directly. +# For `uvicorn src.mpcontribs_api.app:app` app = create_app() diff --git a/mpcontribs-api/src/mpcontribs_api/auth.py b/mpcontribs-api/src/mpcontribs_api/auth.py index e12b45c75a..bab11f1bb4 100644 --- a/mpcontribs-api/src/mpcontribs_api/auth.py +++ b/mpcontribs-api/src/mpcontribs_api/auth.py @@ -2,7 +2,7 @@ from pydantic import BaseModel, ConfigDict, model_validator -from src.mpcontribs_api.config import get_settings +from mpcontribs_api.config import get_settings settings = get_settings() diff --git a/mpcontribs-api/src/mpcontribs_api/dependencies.py b/mpcontribs-api/src/mpcontribs_api/dependencies.py index ea68181859..9ee67828fd 100644 --- a/mpcontribs-api/src/mpcontribs_api/dependencies.py +++ b/mpcontribs-api/src/mpcontribs_api/dependencies.py @@ -5,9 +5,9 @@ from fastapi import Depends, Header, Request from pymongo.asynchronous.database import AsyncDatabase -from src.mpcontribs_api.auth import User -from src.mpcontribs_api.config import get_settings -from src.mpcontribs_api.exceptions import ( +from mpcontribs_api.auth import User +from mpcontribs_api.config import get_settings +from mpcontribs_api.exceptions import ( AuthenticationError, GatewayError, PermissionError, diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py index 1fec00611b..f3bac721f9 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py @@ -3,7 +3,7 @@ from beanie import DocumentWithSoftDelete from pydantic import Field -from src.mpcontribs_api.projection import SparseFieldsModel +from mpcontribs_api.projection import SparseFieldsModel class BaseDocumentWithInput[TId](DocumentWithSoftDelete): diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py index c5c6395a73..846874f326 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py @@ -4,10 +4,10 @@ from fastapi_filter.contrib.beanie import Filter from pydantic import BaseModel -from src.mpcontribs_api.auth import User -from src.mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut -from src.mpcontribs_api.exceptions import ConflictError -from src.mpcontribs_api.pagination import CursorParams, Page, decode_cursor, encode_cursor +from mpcontribs_api.auth import User +from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut +from mpcontribs_api.exceptions import ConflictError +from mpcontribs_api.pagination import CursorParams, Page, decode_cursor, encode_cursor class MongoDbRepository[TDoc: BaseDocumentWithInput, TIn: BaseModel, TOut: DocumentOut](ABC): diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/dependencies.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/dependencies.py index e02de68368..3227039e95 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/dependencies.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/dependencies.py @@ -2,8 +2,8 @@ from fastapi import Depends -from src.mpcontribs_api.dependencies import UserDep -from src.mpcontribs_api.domains.contributions.repository import ( +from mpcontribs_api.dependencies import UserDep +from mpcontribs_api.domains.contributions.repository import ( MongoDbContributionRepository, ) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py index 9da39c1f4f..1763589c5e 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py @@ -15,12 +15,12 @@ from fastapi_filter.contrib.beanie import Filter from pydantic import Field -from src.mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut -from src.mpcontribs_api.domains.attachments.models import Attachment, AttachmentFilter -from src.mpcontribs_api.domains.structures.models import Structure, StructureFilter -from src.mpcontribs_api.domains.tables.models import Table, TableFilter -from src.mpcontribs_api.projection import SparseFieldsModel -from src.mpcontribs_api.types import ShortStr +from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut +from mpcontribs_api.domains.attachments.models import Attachment, AttachmentFilter +from mpcontribs_api.domains.structures.models import Structure, StructureFilter +from mpcontribs_api.domains.tables.models import Table, TableFilter +from mpcontribs_api.projection import SparseFieldsModel +from mpcontribs_api.types import ShortStr class ContributionBase(BaseDocumentWithInput[PydanticObjectId]): diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py index 29306b3e4e..bff75ebd21 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py @@ -1,15 +1,15 @@ from typing import Any, Literal -from src.mpcontribs_api.auth import User -from src.mpcontribs_api.domains._shared.repository import MongoDbRepository -from src.mpcontribs_api.domains.contributions.models import ( +from mpcontribs_api.auth import User +from mpcontribs_api.domains._shared.repository import MongoDbRepository +from mpcontribs_api.domains.contributions.models import ( Contribution, ContributionFilter, ContributionIn, ContributionOut, ContributionPatch, ) -from src.mpcontribs_api.pagination import CursorParams +from mpcontribs_api.pagination import CursorParams class MongoDbContributionRepository(MongoDbRepository[Contribution, ContributionIn, ContributionOut]): diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py index d2b89b6241..86eab65f98 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py @@ -3,14 +3,14 @@ from fastapi import APIRouter, Depends, Query from fastapi_filter import FilterDepends -from src.mpcontribs_api.domains.contributions.dependencies import ContributionDep -from src.mpcontribs_api.domains.contributions.models import ( +from mpcontribs_api.domains.contributions.dependencies import ContributionDep +from mpcontribs_api.domains.contributions.models import ( ContributionFilter, ContributionIn, ContributionOut, ContributionPatch, ) -from src.mpcontribs_api.pagination import CursorParams +from mpcontribs_api.pagination import CursorParams router = APIRouter() diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/dependencies.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/dependencies.py index 48e257df60..94535cc67d 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/dependencies.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/dependencies.py @@ -2,8 +2,8 @@ from fastapi import Depends -from src.mpcontribs_api.dependencies import UserDep -from src.mpcontribs_api.domains.projects.repository import ( +from mpcontribs_api.dependencies import UserDep +from mpcontribs_api.domains.projects.repository import ( MongoDbProjectRepository, ) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py index 0a1bca7479..90748d400c 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py @@ -5,8 +5,8 @@ from fastapi_filter.contrib.beanie import Filter from pydantic import BaseModel, ConfigDict, Field, HttpUrl -from src.mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut -from src.mpcontribs_api.types import PrefixedEmail, ShortStr +from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut +from mpcontribs_api.types import PrefixedEmail, ShortStr class Column(BaseModel): diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py index 4da3a634a0..7fbdcd91bd 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py @@ -4,17 +4,17 @@ from beanie.operators import Set from pydantic import BaseModel -from src.mpcontribs_api.auth import User -from src.mpcontribs_api.domains._shared.repository import MongoDbRepository -from src.mpcontribs_api.domains.projects.models import ( +from mpcontribs_api.auth import User +from mpcontribs_api.domains._shared.repository import MongoDbRepository +from mpcontribs_api.domains.projects.models import ( Project, ProjectFilter, ProjectIn, ProjectOut, ProjectPatch, ) -from src.mpcontribs_api.exceptions import ConflictError, NotFoundError -from src.mpcontribs_api.pagination import ( +from mpcontribs_api.exceptions import ConflictError, NotFoundError +from mpcontribs_api.pagination import ( CursorParams, ) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py index cc2a24483c..0fd1f4064f 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py @@ -4,14 +4,14 @@ from fastapi_filter import FilterDepends from starlette.status import HTTP_204_NO_CONTENT -from src.mpcontribs_api.domains.projects.dependencies import ProjectDep -from src.mpcontribs_api.domains.projects.models import ( +from mpcontribs_api.domains.projects.dependencies import ProjectDep +from mpcontribs_api.domains.projects.models import ( ProjectFilter, ProjectIn, ProjectOut, ProjectPatch, ) -from src.mpcontribs_api.pagination import CursorParams +from mpcontribs_api.pagination import CursorParams router = APIRouter() diff --git a/mpcontribs-api/src/mpcontribs_api/logging.py b/mpcontribs-api/src/mpcontribs_api/logging.py index e33fc30dd0..ef7f6e6fb8 100644 --- a/mpcontribs-api/src/mpcontribs_api/logging.py +++ b/mpcontribs-api/src/mpcontribs_api/logging.py @@ -4,7 +4,7 @@ import structlog from opentelemetry import trace -from src.mpcontribs_api.config import Settings +from mpcontribs_api.config import Settings def add_otel_trace_context(_, __, event_dict): diff --git a/mpcontribs-api/src/mpcontribs_api/projection.py b/mpcontribs-api/src/mpcontribs_api/projection.py index f09875b9c4..0c24a147da 100644 --- a/mpcontribs-api/src/mpcontribs_api/projection.py +++ b/mpcontribs-api/src/mpcontribs_api/projection.py @@ -24,7 +24,7 @@ from pydantic import BaseModel, create_model from pydantic.fields import FieldInfo -from src.mpcontribs_api.exceptions import ValidationError +from mpcontribs_api.exceptions import ValidationError ModelT = TypeVar("ModelT", bound=BaseModel) diff --git a/mpcontribs-api/src/mpcontribs_api/types.py b/mpcontribs-api/src/mpcontribs_api/types.py index ab5b81af90..e1e189b535 100644 --- a/mpcontribs-api/src/mpcontribs_api/types.py +++ b/mpcontribs-api/src/mpcontribs_api/types.py @@ -3,7 +3,7 @@ from pydantic import BeforeValidator, Field -from src.mpcontribs_api.exceptions import ValidationError +from mpcontribs_api.exceptions import ValidationError ShortStr = Annotated[str, Field(min_length=3, max_length=30)] From 0bf2d36e5d00d59622c104f9eb53d735bb77b338 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 3 Jun 2026 16:40:26 -0700 Subject: [PATCH 283/591] OpenAPI UI improvement. Added app info and tags to routers --- mpcontribs-api/src/mpcontribs_api/_openapi.py | 44 +++++++++++++++++++ mpcontribs-api/src/mpcontribs_api/app.py | 9 ++++ .../domains/contributions/router.py | 2 +- .../mpcontribs_api/domains/projects/router.py | 2 +- 4 files changed, 55 insertions(+), 2 deletions(-) create mode 100644 mpcontribs-api/src/mpcontribs_api/_openapi.py diff --git a/mpcontribs-api/src/mpcontribs_api/_openapi.py b/mpcontribs-api/src/mpcontribs_api/_openapi.py new file mode 100644 index 0000000000..8a19e24d44 --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/_openapi.py @@ -0,0 +1,44 @@ +openapi_tags = [ + { + "name": "projects", + "description": "contain provenance information about contributed datasets. Deleting projects will also delete" + "all contributions including tables, structures, attachments, notebooks and cards for the project. Only users" + "who have been added to a project can update its contents. While unpublished, only users on the project can" + "retrieve its data or view it on the Portal. Making a project public does not automatically publish all its" + "contributions, tables, attachments, and structures. These are separately set to public individually or in" + "bulk.", + }, + { + "name": "contributions", + "description": "contain simple hierarchical data which will show up as cards on the MP details page for MP" + "material(s). Tables (rows and columns), structures, and attachments can be added to a contribution." + "Each contribution uses `mp-id` or composition as identifier to associate its data with the according entries" + "on MP. Only admins or users on the project can create, update or delete contributions, and while unpublished," + "retrieve its data or view it on the Portal. Contribution components (tables, structures, and attachments) are" + "deleted along with a contribution.", + }, + # TODO: Check that this is the right link + { + "name": "structures", + "description": "are [pymatgen structures](https://pymatgen.org/pymatgen.electronic_structure.html) which can be" + "added to a contribution.", + }, + { + "name": "tables", + "description": "are simple spreadsheet-type tables with columns and rows saved as" + "[Polars DataFrames](https://docs.pola.rs/api/python/stable/reference/dataframe/index.html) which can be added" + "to a contribution.", + }, + { + "name": "attachments", + "description": "are files saved as objects in AWS S3 and not accessible for querying (only retrieval) which can" + "be added to a contribution.", + }, + { + "name": "notebooks", + "description": "are" + "[Jupyter notebook](https://jupyter-notebook.readthedocs.io/en/stable/notebook.html#notebook-documents)" + "documents generated and saved when a contribution is saved. They form the basis for Contribution Details Pages" + "on the Portal.", + }, +] diff --git a/mpcontribs-api/src/mpcontribs_api/app.py b/mpcontribs-api/src/mpcontribs_api/app.py index a0d9fe091d..31b2818215 100644 --- a/mpcontribs-api/src/mpcontribs_api/app.py +++ b/mpcontribs-api/src/mpcontribs_api/app.py @@ -17,6 +17,7 @@ from mpcontribs_api.exceptions import register_exception_handlers from mpcontribs_api.logging import configure_logging from mpcontribs_api.middleware import bind_request_context +from src.mpcontribs_api._openapi import openapi_tags logger = logging.getLogger(__name__) @@ -61,6 +62,14 @@ def create_app(settings: Settings | None = None) -> FastAPI: debug=settings.environment != "prod", lifespan=_build_lifespan(settings), dependencies=[Depends(verify_gateway)], + terms_of_service="https://materialsproject.org/terms", + contact={ + "name": "MPContribs", + "url": "https://mpcontribs.org/", + "email": "contribs@materialsproject.org", + }, + # openapi_url="/api/v1/openapi.json", + openapi_tags=openapi_tags, ) app.add_middleware(BaseHTTPMiddleware, dispatch=bind_request_context) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py index 86eab65f98..9485c7868e 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py @@ -12,7 +12,7 @@ ) from mpcontribs_api.pagination import CursorParams -router = APIRouter() +router = APIRouter(tags=["contributions"]) @router.get("") diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py index 0fd1f4064f..284bec3e30 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py @@ -13,7 +13,7 @@ ) from mpcontribs_api.pagination import CursorParams -router = APIRouter() +router = APIRouter(tags=["projects"]) # Brendan TODO: Add in option to select ProjectSummary or ProjectOut From 4f93e2f48443e5e9eae26ffcbf5cf550789e58c8 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 4 Jun 2026 09:33:50 -0700 Subject: [PATCH 284/591] Moved more openapi info dicts to _openapi --- mpcontribs-api/src/mpcontribs_api/_openapi.py | 11 +++++++++++ mpcontribs-api/src/mpcontribs_api/app.py | 11 ++++------- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/_openapi.py b/mpcontribs-api/src/mpcontribs_api/_openapi.py index 8a19e24d44..4c3c99b5c6 100644 --- a/mpcontribs-api/src/mpcontribs_api/_openapi.py +++ b/mpcontribs-api/src/mpcontribs_api/_openapi.py @@ -42,3 +42,14 @@ "on the Portal.", }, ] + +contact_info = { + "name": "MPContribs", + "url": "https://mpcontribs.org/", + "email": "contribs@materialsproject.org", +} + +license_info = { + "name": "Creative Commons Attribution 4.0 International License", + "url": "https://creativecommons.org/licenses/by/4.0/", +} diff --git a/mpcontribs-api/src/mpcontribs_api/app.py b/mpcontribs-api/src/mpcontribs_api/app.py index 31b2818215..e4edc07444 100644 --- a/mpcontribs-api/src/mpcontribs_api/app.py +++ b/mpcontribs-api/src/mpcontribs_api/app.py @@ -9,6 +9,7 @@ from pymongo import AsyncMongoClient from starlette.middleware.base import BaseHTTPMiddleware +from mpcontribs_api._openapi import contact_info, license_info, openapi_tags from mpcontribs_api.api.v1.router import router as v1_router from mpcontribs_api.config import Settings, get_settings from mpcontribs_api.dependencies import verify_gateway @@ -17,7 +18,6 @@ from mpcontribs_api.exceptions import register_exception_handlers from mpcontribs_api.logging import configure_logging from mpcontribs_api.middleware import bind_request_context -from src.mpcontribs_api._openapi import openapi_tags logger = logging.getLogger(__name__) @@ -58,16 +58,14 @@ def create_app(settings: Settings | None = None) -> FastAPI: app = FastAPI( title="mpcontribs-api", + description="Operations to contribute, update and retrieve materials data on Materials Project", version=settings.version, debug=settings.environment != "prod", lifespan=_build_lifespan(settings), dependencies=[Depends(verify_gateway)], terms_of_service="https://materialsproject.org/terms", - contact={ - "name": "MPContribs", - "url": "https://mpcontribs.org/", - "email": "contribs@materialsproject.org", - }, + license_info=license_info, + contact=contact_info, # openapi_url="/api/v1/openapi.json", openapi_tags=openapi_tags, ) @@ -79,5 +77,4 @@ def create_app(settings: Settings | None = None) -> FastAPI: return app -# For `uvicorn src.mpcontribs_api.app:app` app = create_app() From c12ffaeeb30f2f2819db4a137edc59eac82275b9 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 4 Jun 2026 09:34:14 -0700 Subject: [PATCH 285/591] Changed imports so they resolve --- mpcontribs-api/justfile | 4 + mpcontribs-api/pyproject.toml | 4 +- mpcontribs-api/tests/integration/conftest.py | 35 +- .../tests/integration/db/conftest.py | 17 +- .../db/test_projects_repository.py | 12 +- .../tests/integration/test_contributions.py | 6 +- .../tests/integration/test_error_handlers.py | 2 +- .../tests/integration/test_gateway.py | 6 +- .../tests/integration/test_projects.py | 10 +- .../unit/domains/test_contributions_models.py | 2 +- .../unit/domains/test_projects_models.py | 4 +- mpcontribs-api/tests/unit/test_auth.py | 2 +- .../tests/unit/test_dependencies.py | 6 +- mpcontribs-api/tests/unit/test_exceptions.py | 2 +- mpcontribs-api/tests/unit/test_pagination.py | 2 +- mpcontribs-api/tests/unit/test_projection.py | 4 +- mpcontribs-api/tests/unit/test_types.py | 4 +- mpcontribs-api/uv.lock | 437 +++++++++++++++++- 18 files changed, 514 insertions(+), 45 deletions(-) diff --git a/mpcontribs-api/justfile b/mpcontribs-api/justfile index 929f75df5f..afb9e566c1 100644 --- a/mpcontribs-api/justfile +++ b/mpcontribs-api/justfile @@ -1,3 +1,7 @@ +# Run the dev server (auto-reloads on file changes) +dev: + uv run fastapi dev src/mpcontribs_api/app.py + # Format, fix, and lint all source code fmt: uv run ruff format diff --git a/mpcontribs-api/pyproject.toml b/mpcontribs-api/pyproject.toml index 49480c94b3..25417e864f 100644 --- a/mpcontribs-api/pyproject.toml +++ b/mpcontribs-api/pyproject.toml @@ -58,7 +58,7 @@ dependencies = [ "uncertainties", "websocket_client", "zstandard", - "fastapi>=0.136.3", + "fastapi[standard]>=0.136.3", "pymongo>=4.17.0", "pydantic-settings>=2.14.1", "structlog>=25.5.0", @@ -87,7 +87,7 @@ dev = [ ] [tool.pytest.ini_options] -pythonpath = ["."] +pythonpath = ["src"] asyncio_mode = "auto" asyncio_default_fixture_loop_scope = "session" markers = [ diff --git a/mpcontribs-api/tests/integration/conftest.py b/mpcontribs-api/tests/integration/conftest.py index e699ca5663..3404c9d28a 100644 --- a/mpcontribs-api/tests/integration/conftest.py +++ b/mpcontribs-api/tests/integration/conftest.py @@ -13,21 +13,42 @@ """ from contextlib import asynccontextmanager -from unittest.mock import AsyncMock, MagicMock +from unittest.mock import AsyncMock, MagicMock, patch import pytest from fastapi import FastAPI from fastapi.testclient import TestClient from starlette.middleware.base import BaseHTTPMiddleware -from src.mpcontribs_api.exceptions import register_exception_handlers -from src.mpcontribs_api.middleware import bind_request_context +from mpcontribs_api.exceptions import register_exception_handlers +from mpcontribs_api.middleware import bind_request_context + + +@pytest.fixture(autouse=True, scope="session") +def _mock_beanie_collection(): + """Stub Beanie's collection check for mock-based integration tests. + + FastAPI parses request bodies into Beanie Document subclasses (e.g. + ProjectIn), which calls get_pymongo_collection() in __init__. Without a + real init_beanie() these raise CollectionWasNotInitialized. + + The tests/integration/db/ conftest overrides this fixture with a no-op so + DB tests still get the real Beanie collection after init_beanie(). + """ + import beanie + + with patch.object(beanie.Document, "get_pymongo_collection", return_value=MagicMock()): + yield # --------------------------------------------------------------------------- # Header constants used across test modules # --------------------------------------------------------------------------- -GATEWAY_SECRET = "test-gateway-secret" +from mpcontribs_api.config import get_settings + +# Read the real secret from settings (from .env or the root conftest fallback) +# so gateway tests always use whatever the live server will accept. +GATEWAY_SECRET = get_settings().kong.gateway_secret.get_secret_value() GATEWAY_HEADERS = {"x-gateway-secret": GATEWAY_SECRET} ANON_HEADERS: dict[str, str] = {} @@ -67,7 +88,7 @@ async def _noop_lifespan(app: FastAPI): app.add_middleware(BaseHTTPMiddleware, dispatch=bind_request_context) register_exception_handlers(app) - from src.mpcontribs_api.api.v1.router import router as v1_router + from mpcontribs_api.api.v1.router import router as v1_router app.include_router(v1_router, prefix="/api/v1") return app @@ -81,7 +102,7 @@ def make_gateway_app() -> FastAPI: """ from fastapi import Depends - from src.mpcontribs_api.dependencies import verify_gateway + from mpcontribs_api.dependencies import verify_gateway @asynccontextmanager async def _noop_lifespan(app: FastAPI): @@ -96,7 +117,7 @@ async def _noop_lifespan(app: FastAPI): app.add_middleware(BaseHTTPMiddleware, dispatch=bind_request_context) register_exception_handlers(app) - from src.mpcontribs_api.api.v1.router import router as v1_router + from mpcontribs_api.api.v1.router import router as v1_router app.include_router(v1_router, prefix="/api/v1") return app diff --git a/mpcontribs-api/tests/integration/db/conftest.py b/mpcontribs-api/tests/integration/db/conftest.py index d471c60315..419cbd7876 100644 --- a/mpcontribs-api/tests/integration/db/conftest.py +++ b/mpcontribs-api/tests/integration/db/conftest.py @@ -15,9 +15,9 @@ from beanie import init_beanie from pymongo import AsyncMongoClient -from src.mpcontribs_api.config import get_settings -from src.mpcontribs_api.domains.contributions.models import Contribution -from src.mpcontribs_api.domains.projects.models import Project +from mpcontribs_api.config import get_settings +from mpcontribs_api.domains.contributions.models import Contribution +from mpcontribs_api.domains.projects.models import Project # --------------------------------------------------------------------------- # Auto-mark all tests in this directory as @pytest.mark.db @@ -29,6 +29,17 @@ ] +@pytest.fixture(scope="session") +def _mock_beanie_collection(): + """Override the parent integration conftest's Beanie mock. + + DB tests initialise Beanie for real via init_beanie(), so the mock must not + intercept get_pymongo_collection(). Defining this fixture here (same name, + no patch) causes pytest to use this no-op instead of the parent's version. + """ + yield + + def pytest_collection_modifyitems(items): for item in items: if "integration/db" in str(item.fspath): diff --git a/mpcontribs-api/tests/integration/db/test_projects_repository.py b/mpcontribs-api/tests/integration/db/test_projects_repository.py index 2d68568804..a37877621b 100644 --- a/mpcontribs-api/tests/integration/db/test_projects_repository.py +++ b/mpcontribs-api/tests/integration/db/test_projects_repository.py @@ -1,10 +1,10 @@ import pytest -from src.mpcontribs_api.auth import User -from src.mpcontribs_api.domains.projects.models import Project, ProjectIn, ProjectOut, ProjectPatch, Stats -from src.mpcontribs_api.domains.projects.repository import MongoDbProjectRepository -from src.mpcontribs_api.exceptions import ConflictError, NotFoundError -from src.mpcontribs_api.pagination import CursorParams +from mpcontribs_api.auth import User +from mpcontribs_api.domains.projects.models import Project, ProjectIn, ProjectOut, ProjectPatch, Stats +from mpcontribs_api.domains.projects.repository import MongoDbProjectRepository +from mpcontribs_api.exceptions import ConflictError, NotFoundError +from mpcontribs_api.pagination import CursorParams """Database integration tests for MongoDbProjectRepository. @@ -122,7 +122,7 @@ async def test_authenticated_sees_own_and_public(self, db): def _noop_filter(): - from src.mpcontribs_api.domains.projects.models import ProjectFilter + from mpcontribs_api.domains.projects.models import ProjectFilter return ProjectFilter() diff --git a/mpcontribs-api/tests/integration/test_contributions.py b/mpcontribs-api/tests/integration/test_contributions.py index 9d5074e7ab..8deb915059 100644 --- a/mpcontribs-api/tests/integration/test_contributions.py +++ b/mpcontribs-api/tests/integration/test_contributions.py @@ -7,9 +7,9 @@ import pytest -from src.mpcontribs_api.domains.contributions.dependencies import get_scoped_contributions -from src.mpcontribs_api.domains.contributions.models import ContributionOut -from src.mpcontribs_api.pagination import Page +from mpcontribs_api.domains.contributions.dependencies import get_scoped_contributions +from mpcontribs_api.domains.contributions.models import ContributionOut +from mpcontribs_api.pagination import Page from tests.integration.conftest import ANON_HEADERS, AUTHED_HEADERS # --------------------------------------------------------------------------- diff --git a/mpcontribs-api/tests/integration/test_error_handlers.py b/mpcontribs-api/tests/integration/test_error_handlers.py index 246452a23b..63d83f09be 100644 --- a/mpcontribs-api/tests/integration/test_error_handlers.py +++ b/mpcontribs-api/tests/integration/test_error_handlers.py @@ -9,7 +9,7 @@ from fastapi import FastAPI from fastapi.testclient import TestClient -from src.mpcontribs_api.exceptions import ( +from mpcontribs_api.exceptions import ( AuthenticationError, ConflictError, NotFoundError, diff --git a/mpcontribs-api/tests/integration/test_gateway.py b/mpcontribs-api/tests/integration/test_gateway.py index 0a8a4ce16e..b43b372268 100644 --- a/mpcontribs-api/tests/integration/test_gateway.py +++ b/mpcontribs-api/tests/integration/test_gateway.py @@ -14,9 +14,9 @@ import pytest -from src.mpcontribs_api.domains.contributions.dependencies import get_scoped_contributions -from src.mpcontribs_api.domains.projects.dependencies import get_scoped_projects -from src.mpcontribs_api.pagination import Page +from mpcontribs_api.domains.contributions.dependencies import get_scoped_contributions +from mpcontribs_api.domains.projects.dependencies import get_scoped_projects +from mpcontribs_api.pagination import Page from tests.integration.conftest import GATEWAY_SECRET diff --git a/mpcontribs-api/tests/integration/test_projects.py b/mpcontribs-api/tests/integration/test_projects.py index 7042ca82bb..c40ef19b2f 100644 --- a/mpcontribs-api/tests/integration/test_projects.py +++ b/mpcontribs-api/tests/integration/test_projects.py @@ -11,10 +11,10 @@ import pytest -from src.mpcontribs_api.domains.projects.dependencies import get_scoped_projects -from src.mpcontribs_api.domains.projects.models import ProjectOut, Stats -from src.mpcontribs_api.exceptions import ConflictError, NotFoundError -from src.mpcontribs_api.pagination import Page +from mpcontribs_api.domains.projects.dependencies import get_scoped_projects +from mpcontribs_api.domains.projects.models import ProjectOut, Stats +from mpcontribs_api.exceptions import ConflictError, NotFoundError +from mpcontribs_api.pagination import Page from tests.integration.conftest import ANON_HEADERS, AUTHED_HEADERS # --------------------------------------------------------------------------- @@ -71,7 +71,7 @@ def test_items_returned_in_response(self, client, project_repo): assert len(body["items"]) == 1 def test_next_cursor_set_when_more_pages(self, client, project_repo): - from src.mpcontribs_api.pagination import encode_cursor + from mpcontribs_api.pagination import encode_cursor cursor = encode_cursor("mp-sample") project_repo.get_project.return_value = Page(items=[SAMPLE_PROJECT], next_cursor=cursor) diff --git a/mpcontribs-api/tests/unit/domains/test_contributions_models.py b/mpcontribs-api/tests/unit/domains/test_contributions_models.py index c00c7fe8d1..9b08da5121 100644 --- a/mpcontribs-api/tests/unit/domains/test_contributions_models.py +++ b/mpcontribs-api/tests/unit/domains/test_contributions_models.py @@ -4,7 +4,7 @@ from beanie import PydanticObjectId from pydantic import ValidationError as PydanticValidationError -from src.mpcontribs_api.domains.contributions.models import ( +from mpcontribs_api.domains.contributions.models import ( Contribution, ContributionIn, ContributionOut, diff --git a/mpcontribs-api/tests/unit/domains/test_projects_models.py b/mpcontribs-api/tests/unit/domains/test_projects_models.py index 63d5252925..66984c0067 100644 --- a/mpcontribs-api/tests/unit/domains/test_projects_models.py +++ b/mpcontribs-api/tests/unit/domains/test_projects_models.py @@ -1,7 +1,7 @@ import pytest from pydantic import ValidationError as PydanticValidationError -from src.mpcontribs_api.domains.projects.models import ( +from mpcontribs_api.domains.projects.models import ( Column, Project, ProjectIn, @@ -145,7 +145,7 @@ def test_parse_fields_multiple_fields(self): assert "is_public" in result def test_parse_fields_unknown_raises(self): - from src.mpcontribs_api.exceptions import ValidationError as AppValidationError + from mpcontribs_api.exceptions import ValidationError as AppValidationError with pytest.raises(AppValidationError): ProjectOut.parse_fields("nonexistent_field") diff --git a/mpcontribs-api/tests/unit/test_auth.py b/mpcontribs-api/tests/unit/test_auth.py index 99cdbdb008..ee14b1a6be 100644 --- a/mpcontribs-api/tests/unit/test_auth.py +++ b/mpcontribs-api/tests/unit/test_auth.py @@ -1,6 +1,6 @@ import pytest -from src.mpcontribs_api.auth import ADMIN_GROUP, User +from mpcontribs_api.auth import ADMIN_GROUP, User class TestUserIsAnonymous: diff --git a/mpcontribs-api/tests/unit/test_dependencies.py b/mpcontribs-api/tests/unit/test_dependencies.py index 93eb0b27ad..af8c03bf13 100644 --- a/mpcontribs-api/tests/unit/test_dependencies.py +++ b/mpcontribs-api/tests/unit/test_dependencies.py @@ -2,9 +2,9 @@ import pytest -from src.mpcontribs_api.auth import User -from src.mpcontribs_api.dependencies import _split, get_user, require_user -from src.mpcontribs_api.exceptions import AuthenticationError +from mpcontribs_api.auth import User +from mpcontribs_api.dependencies import _split, get_user, require_user +from mpcontribs_api.exceptions import AuthenticationError # --------------------------------------------------------------------------- # _split diff --git a/mpcontribs-api/tests/unit/test_exceptions.py b/mpcontribs-api/tests/unit/test_exceptions.py index 552bf7778e..77d085f102 100644 --- a/mpcontribs-api/tests/unit/test_exceptions.py +++ b/mpcontribs-api/tests/unit/test_exceptions.py @@ -1,6 +1,6 @@ import pytest -from src.mpcontribs_api.exceptions import ( +from mpcontribs_api.exceptions import ( AppError, AuthenticationError, ConflictError, diff --git a/mpcontribs-api/tests/unit/test_pagination.py b/mpcontribs-api/tests/unit/test_pagination.py index 78dc41f732..f3456e82ae 100644 --- a/mpcontribs-api/tests/unit/test_pagination.py +++ b/mpcontribs-api/tests/unit/test_pagination.py @@ -3,7 +3,7 @@ import pytest from pydantic import ValidationError as PydanticValidationError -from src.mpcontribs_api.pagination import ( +from mpcontribs_api.pagination import ( CursorParams, Page, decode_cursor, diff --git a/mpcontribs-api/tests/unit/test_projection.py b/mpcontribs-api/tests/unit/test_projection.py index 3889ce682f..c003af591f 100644 --- a/mpcontribs-api/tests/unit/test_projection.py +++ b/mpcontribs-api/tests/unit/test_projection.py @@ -3,8 +3,8 @@ import pytest from pydantic import BaseModel, Field -from src.mpcontribs_api.exceptions import ValidationError as AppValidationError -from src.mpcontribs_api.projection import ( +from mpcontribs_api.exceptions import ValidationError as AppValidationError +from mpcontribs_api.projection import ( SparseFieldsModel, _classify, _collapse, diff --git a/mpcontribs-api/tests/unit/test_types.py b/mpcontribs-api/tests/unit/test_types.py index 3925b9af29..64b0102cdd 100644 --- a/mpcontribs-api/tests/unit/test_types.py +++ b/mpcontribs-api/tests/unit/test_types.py @@ -2,8 +2,8 @@ from pydantic import BaseModel from pydantic import ValidationError as PydanticValidationError -from src.mpcontribs_api.exceptions import ValidationError as AppValidationError -from src.mpcontribs_api.types import PrefixedEmail, ShortStr, _validate_prefixed_email +from mpcontribs_api.exceptions import ValidationError as AppValidationError +from mpcontribs_api.types import PrefixedEmail, ShortStr, _validate_prefixed_email class ShortStrModel(BaseModel): diff --git a/mpcontribs-api/uv.lock b/mpcontribs-api/uv.lock index f5cba271a7..32a4220bac 100644 --- a/mpcontribs-api/uv.lock +++ b/mpcontribs-api/uv.lock @@ -650,6 +650,15 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/07/6c/aa3f2f849e01cb6a001cd8554a88d4c77c5c1a31c95bdf1cf9301e6d9ef4/defusedxml-0.7.1-py2.py3-none-any.whl", hash = "sha256:a352e7e428770286cc899e2542b6cdaedb2b4953ff269a210103ec58f6198a61", size = 25604, upload-time = "2021-03-08T10:59:24.45Z" }, ] +[[package]] +name = "detect-installer" +version = "0.1.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/5f/ce/6897d812825e9d4c53e3c7112726e800cc5231b013b2223bf64f653ff362/detect_installer-0.1.0.tar.gz", hash = "sha256:00ad7ba0a36e3cf7d08a40d3643011746dbc112597c7d475cc91c416710ca4e7", size = 3049, upload-time = "2026-02-23T10:40:22.567Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/cc/34/8cc73273414405086c58852916e4031812a6a30fe04c057e37ad99397b7f/detect_installer-0.1.0-py3-none-any.whl", hash = "sha256:034fb20fd665c36e6ba52b8821525ea07fb4f7f938cac459df889fb33801528a", size = 4539, upload-time = "2026-02-23T10:40:23.807Z" }, +] + [[package]] name = "dnspython" version = "2.8.0" @@ -659,6 +668,19 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/ba/5a/18ad964b0086c6e62e2e7500f7edc89e3faa45033c71c1893d34eed2b2de/dnspython-2.8.0-py3-none-any.whl", hash = "sha256:01d9bbc4a2d76bf0db7c1f729812ded6d912bd318d3b1cf81d30c0f845dbf3af", size = 331094, upload-time = "2025-09-07T18:57:58.071Z" }, ] +[[package]] +name = "email-validator" +version = "2.3.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "dnspython" }, + { name = "idna" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/f5/22/900cb125c76b7aaa450ce02fd727f452243f2e91a61af068b40adba60ea9/email_validator-2.3.0.tar.gz", hash = "sha256:9fc05c37f2f6cf439ff414f8fc46d917929974a82244c20eb10231ba60c54426", size = 51238, upload-time = "2025-08-26T13:09:06.831Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/de/15/545e2b6cf2e3be84bc1ed85613edd75b8aea69807a71c26f4ca6a9258e82/email_validator-2.3.0-py3-none-any.whl", hash = "sha256:80f13f623413e6b197ae73bb10bf4eb0908faf509ad8362c5edeb0be7fd450b4", size = 35604, upload-time = "2025-08-26T13:09:05.858Z" }, +] + [[package]] name = "entrypoints" version = "0.4" @@ -711,6 +733,59 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/e0/82/45359b62a067409bd929ae8a56b8ed13e5a8c8a61194b3c236920999ab83/fastapi-0.136.3-py3-none-any.whl", hash = "sha256:3d2a69bdf04b7e9f3afa292c3bc7a98816bbfafa10bc9b45f3f3700d2f761620", size = 117481, upload-time = "2026-05-23T18:53:16.924Z" }, ] +[package.optional-dependencies] +standard = [ + { name = "email-validator" }, + { name = "fastapi-cli", extra = ["standard"] }, + { name = "fastar" }, + { name = "httpx" }, + { name = "jinja2" }, + { name = "pydantic-extra-types" }, + { name = "pydantic-settings" }, + { name = "python-multipart" }, + { name = "uvicorn", extra = ["standard"] }, +] + +[[package]] +name = "fastapi-cli" +version = "0.0.24" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "rich-toolkit" }, + { name = "typer" }, + { name = "uvicorn", extra = ["standard"] }, +] +sdist = { url = "https://files.pythonhosted.org/packages/6e/58/74797ae9e4610cfa0c6b34c8309096d3b20bb29be3b8b5fbf1004d10fa5f/fastapi_cli-0.0.24.tar.gz", hash = "sha256:1afc9c9e21d7ebc8a3ca5e31790cd8d837742be7e4f8b9236e99cb3451f0de00", size = 19043, upload-time = "2026-02-24T10:45:10.476Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/c7/4b/68f9fe268e535d79c76910519530026a4f994ce07189ac0dded45c6af825/fastapi_cli-0.0.24-py3-none-any.whl", hash = "sha256:4a1f78ed798f106b4fee85ca93b85d8fe33c0a3570f775964d37edb80b8f0edc", size = 12304, upload-time = "2026-02-24T10:45:09.552Z" }, +] + +[package.optional-dependencies] +standard = [ + { name = "fastapi-cloud-cli" }, + { name = "uvicorn", extra = ["standard"] }, +] + +[[package]] +name = "fastapi-cloud-cli" +version = "0.19.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "detect-installer" }, + { name = "fastar" }, + { name = "httpx" }, + { name = "pydantic", extra = ["email"] }, + { name = "rich-toolkit" }, + { name = "rignore" }, + { name = "sentry-sdk" }, + { name = "typer" }, + { name = "uvicorn", extra = ["standard"] }, +] +sdist = { url = "https://files.pythonhosted.org/packages/a7/7c/f194925af8fabdb0b7a886a1b89087c0b7f327f99e79497a882aa94c1e34/fastapi_cloud_cli-0.19.0.tar.gz", hash = "sha256:f97b31c2ad6af3832eb4065870bdca3365b6e827a0ccf6eeb15e477bc1662b13", size = 57476, upload-time = "2026-06-01T08:24:03.407Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/bf/e6/1a2ec890fc273b9da2b173ca45f692a2e24a369bdd39ea7812c1d8a799e5/fastapi_cloud_cli-0.19.0-py3-none-any.whl", hash = "sha256:a2dfc4074c321e63ec88589cc1f90573d4b5bf980ddc44a7033e6f3cd8e96628", size = 38239, upload-time = "2026-06-01T08:24:02.437Z" }, +] + [[package]] name = "fastapi-filter" version = "2.0.1" @@ -724,6 +799,46 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/5e/88/afc022ad64d12f730141fc50758ecf9d60de5fed11335dc16e3127617f05/fastapi_filter-2.0.1-py3-none-any.whl", hash = "sha256:711d48707ec62f7c9e12a7713fc0f6a99858a9e3741b4d108102d5599e77197d", size = 11586, upload-time = "2024-12-07T17:30:05.375Z" }, ] +[[package]] +name = "fastar" +version = "0.11.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/03/0f/0aeb3fc50046617702acc0078b277b58367fd62eb727b9ec733ae0e8bbcc/fastar-0.11.0.tar.gz", hash = "sha256:aa7f100f7313c03fdb20f1385927ba95671071ba308ad0c1763fef295e1895ce", size = 70238, upload-time = "2026-04-13T17:11:17.143Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/7a/cd/3644c48ecac456f928c12d47ec3bed36c36555b17c3859856f1ff860265d/fastar-0.11.0-cp314-cp314-macosx_10_12_x86_64.whl", hash = "sha256:71375bd6f03c2a43eb47bd949ea38ff45434917f9cdac79675c5b9f60de4fa73", size = 707860, upload-time = "2026-04-13T17:10:00.371Z" }, + { url = "https://files.pythonhosted.org/packages/69/ca/dee04476ae3626b2b040a60ad84628f77e1ffd8444232f2426b0ca1e0d7e/fastar-0.11.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:eddfd9cab16e19ae247fe44bf992cb403ccfe27d3931d6de29a4695d95ad386c", size = 628216, upload-time = "2026-04-13T17:09:45.355Z" }, + { url = "https://files.pythonhosted.org/packages/dc/5e/9395c7353d079cb4f5be0f7982ce0dc9f2e7dec5fd175eef466729d6023a/fastar-0.11.0-cp314-cp314-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:7c371f1d4386c699018bb64eb2fa785feacf32785559049d2bb72fe4af023f53", size = 864378, upload-time = "2026-04-13T17:09:14.611Z" }, + { url = "https://files.pythonhosted.org/packages/fa/ba/1e4f67148223ff219612b6281a6000357abbcc2417964fa5c83f11d68fce/fastar-0.11.0-cp314-cp314-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cad7fa41e3e66554387481c1a09365e4638becd322904932674159d5f4046728", size = 760921, upload-time = "2026-04-13T17:07:59.138Z" }, + { url = "https://files.pythonhosted.org/packages/0f/82/09d11fb6d12f17993ffaf32ffd30c3c121a11e2966e84f19fb6f66430118/fastar-0.11.0-cp314-cp314-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:cf36652fa71b83761717c9899b98732498f8a2cb6327ff16bbf07f6be85c3437", size = 757012, upload-time = "2026-04-13T17:08:14.186Z" }, + { url = "https://files.pythonhosted.org/packages/52/1f/5aeeacc4cb65615e2c9292cd9c5b0cd6fb6d2e6ee472ca6adc6c1b1b22ef/fastar-0.11.0-cp314-cp314-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:f68ff8c17833053da4841720e95edde80ce45bb994b6b7d51418dddaac70ee47", size = 924510, upload-time = "2026-04-13T17:08:28.741Z" }, + { url = "https://files.pythonhosted.org/packages/bb/1a/1e5bdabbeaf2e856928956292609f2ff6a650f94480fb8afaca30229e483/fastar-0.11.0-cp314-cp314-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:4563ed37a12ea1cdc398af8571258d24b988bf342b7b3bf5451bd5891243280c", size = 816602, upload-time = "2026-04-13T17:08:59.461Z" }, + { url = "https://files.pythonhosted.org/packages/87/24/f960147910da3bed41a3adfcb026e17d5f50f4cf467a3324237a7088f61a/fastar-0.11.0-cp314-cp314-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:cee63c9875cba3b70dc44338c560facc5d6e763047dcc4a30501f9a68cf5f890", size = 819452, upload-time = "2026-04-13T17:09:29.926Z" }, + { url = "https://files.pythonhosted.org/packages/cc/f4/3e77d7901d5707fd7f8a352e153c8ae09ea974e6fabad0b7c4eb9944b8d4/fastar-0.11.0-cp314-cp314-manylinux_2_31_riscv64.whl", hash = "sha256:bd76bfffae6d0a91f4ac4a612f721e7aec108db97dccdd120ae063cd66959f27", size = 885254, upload-time = "2026-04-13T17:08:44.285Z" }, + { url = "https://files.pythonhosted.org/packages/47/01/1585edd5ec47782ae93cd94edf05828e0ab02ef00aec00aea4194a600464/fastar-0.11.0-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:8f5b707501ec01c1bc0518f741f01d322e50c9adc19a451aa24f67a2316e9397", size = 971496, upload-time = "2026-04-13T17:10:17.024Z" }, + { url = "https://files.pythonhosted.org/packages/f1/e9/6874c9d1236ded565a0bed54b320ac9f165f287b1d89490fb70f9f323c81/fastar-0.11.0-cp314-cp314-musllinux_1_2_armv7l.whl", hash = "sha256:37c0b5a88a657839aad98b0a6c9e4ac4c2c15d6b49c44ee3935c6b08e9d3e479", size = 1034685, upload-time = "2026-04-13T17:10:34.063Z" }, + { url = "https://files.pythonhosted.org/packages/14/d8/4ab20613ce2983427aee958e39be878dba874aa227c530a845e32429c4f6/fastar-0.11.0-cp314-cp314-musllinux_1_2_i686.whl", hash = "sha256:6c55f536c62a6efb180c1af0d5182948bff576bbfe6276e8e1359c9c7d2215d8", size = 1072675, upload-time = "2026-04-13T17:10:50.53Z" }, + { url = "https://files.pythonhosted.org/packages/1f/ae/5ac3b7c20ce4b08f011dd2b979f96caabe64f9b10b157f211ea91bdfadca/fastar-0.11.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:3082eeca59e189b9039335862f4c2780c0c8871d656bfdf559db4414a105b251", size = 1029330, upload-time = "2026-04-13T17:11:08.138Z" }, + { url = "https://files.pythonhosted.org/packages/8a/e7/37cd6a1d4e288292170b64e19d79ecce2a7de8bb76790323399a2abc4619/fastar-0.11.0-cp314-cp314-win32.whl", hash = "sha256:b201a0a4e29f9fec2a177e13154b8725ec65ab9f83bd6415483efaa2aa18344b", size = 453940, upload-time = "2026-04-13T17:11:48.713Z" }, + { url = "https://files.pythonhosted.org/packages/ff/1c/795c878b1ee29d79021cf8ed81f18f2b25ccde58453b0d34b9bdc7e025ea/fastar-0.11.0-cp314-cp314-win_amd64.whl", hash = "sha256:868fddb26072a43e870a8819134b9f80ee602931be5a76e6fb873e04da343637", size = 486334, upload-time = "2026-04-13T17:11:34.882Z" }, + { url = "https://files.pythonhosted.org/packages/ff/a4/113f104301df8bddcc0b3775b611a30cb7610baa3add933c7ccac9386467/fastar-0.11.0-cp314-cp314-win_arm64.whl", hash = "sha256:3db39c9cc42abb0c780a26b299f24dfbc8be455985e969e15336d70d7b2f833b", size = 461534, upload-time = "2026-04-13T17:11:24.329Z" }, + { url = "https://files.pythonhosted.org/packages/5a/a6/5c5f2c2c8e0c63e56a5636ebc7721589c889e94c0092cec7eb28ae7207e6/fastar-0.11.0-cp314-cp314t-macosx_10_12_x86_64.whl", hash = "sha256:49c3299dec5e125e7ebaa27545714da9c7391777366015427e0ae62d548b442b", size = 707156, upload-time = "2026-04-13T17:10:02.176Z" }, + { url = "https://files.pythonhosted.org/packages/df/f7/982c01b61f0fc135ad2b16d01e6d0ee53cf8791e68827f5f7c5a65b2e5b1/fastar-0.11.0-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:3328ed1ed56d31f5198350b17dd60449b8d6b9d47abb4688bab6aef4450a165b", size = 627032, upload-time = "2026-04-13T17:09:46.978Z" }, + { url = "https://files.pythonhosted.org/packages/2b/c3/38f1dac77ae0c71c37b176277c96d830796b8ce2fe69705f917829b53829/fastar-0.11.0-cp314-cp314t-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:bd3eca3bbfec84a614bcb4143b4ad4f784d0895babc26cfc88436af88ca23c7a", size = 864403, upload-time = "2026-04-13T17:09:16.58Z" }, + { url = "https://files.pythonhosted.org/packages/6e/f0/e69c363bdb3e5a5848e937b662b5469581ee6682c51bc1c0556494773929/fastar-0.11.0-cp314-cp314t-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ff86a967acb0d621dd24063dda090daa67bf4993b9570e97fe156de88a9006ca", size = 759480, upload-time = "2026-04-13T17:08:00.599Z" }, + { url = "https://files.pythonhosted.org/packages/3b/29/4d8737590c2a6357d614d7cc7288e8f68e7e449680b8922997cc4349e65e/fastar-0.11.0-cp314-cp314t-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:86eaf7c0e985d93a7734168be2fb232b2a8cca53e41431c2782d7c12b12c03b1", size = 756219, upload-time = "2026-04-13T17:08:15.699Z" }, + { url = "https://files.pythonhosted.org/packages/bb/ec/400de7b3b7d48801908f19cf5462177104395799472671b3e8152b2b04ca/fastar-0.11.0-cp314-cp314t-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:91f07b0b8eb67e2f177733a1f884edad7dfb9f8977ffef15927b20cb9604027d", size = 923669, upload-time = "2026-04-13T17:08:30.574Z" }, + { url = "https://files.pythonhosted.org/packages/5d/01/8926c53da923fed7ab4b96e7fbf7f73b663beb4f02095b654d6fab46f9ad/fastar-0.11.0-cp314-cp314t-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f85c896885eb4abf1a635d54dea22cac6ae48d04fc2ea26ae652fcf1febe1220", size = 815729, upload-time = "2026-04-13T17:09:01.204Z" }, + { url = "https://files.pythonhosted.org/packages/89/f0/5fef4c7946e352651b504b1a4235dac3505e7cfd24020788ab50552e84bf/fastar-0.11.0-cp314-cp314t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:075c07095c8de4b774ba8f28b9c0a02b1a2cd254da50cbe464dd3bb2432e9158", size = 819812, upload-time = "2026-04-13T17:09:31.907Z" }, + { url = "https://files.pythonhosted.org/packages/b3/c8/0ebc3298b4a45e7bddc50b169ae6a6f5b80c939394d4befe6e60de535ee7/fastar-0.11.0-cp314-cp314t-manylinux_2_31_riscv64.whl", hash = "sha256:07f028933820c65750baf3383b807ecce1cd9385cf00ce192b79d263ad6b856c", size = 884074, upload-time = "2026-04-13T17:08:45.802Z" }, + { url = "https://files.pythonhosted.org/packages/ae/9f/7baa4cdff8d6fbca41fa5c764b48a941fed8a9ec6c4cc92de65895a28299/fastar-0.11.0-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:039f875efa0f01fa43c20bf4e2fc7305489c61d0ac76eda991acfba7820a0e63", size = 969450, upload-time = "2026-04-13T17:10:18.667Z" }, + { url = "https://files.pythonhosted.org/packages/d4/dc/1ebbfb58a47056ba866494f19efbcdd2ba2897096b94f36e796594b4d05b/fastar-0.11.0-cp314-cp314t-musllinux_1_2_armv7l.whl", hash = "sha256:fff12452a9a5c6814a012445f26365541cc3d99dcca61f09762e6a389f7a32ea", size = 1033775, upload-time = "2026-04-13T17:10:36.165Z" }, + { url = "https://files.pythonhosted.org/packages/c2/5f/ce4e3914066f08c99eb8c32952cc07c1a013e81b1db1b0f598130bf6b974/fastar-0.11.0-cp314-cp314t-musllinux_1_2_i686.whl", hash = "sha256:2bf733e09f942b6fa876efe30a90508d1f4caef5630c00fb2a84fba355873712", size = 1072158, upload-time = "2026-04-13T17:10:52.497Z" }, + { url = "https://files.pythonhosted.org/packages/03/2a/6bca72992c84151c387cc6558f3867f5ebe5fb3684ee6fa9b76280ba4b8e/fastar-0.11.0-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:d1531fa848fdd3677d2dce0a4b436ea64d9ae38fb8babe2ddbc180dd153cb7a3", size = 1028577, upload-time = "2026-04-13T17:11:09.934Z" }, + { url = "https://files.pythonhosted.org/packages/83/18/7a7c15657a3da5569b26fc51cde6a80f8d84cb54b3b1aea6d74a103db4ad/fastar-0.11.0-cp314-cp314t-win32.whl", hash = "sha256:5744551bc67c6fc6581cbd0e34a0fd6e2cd0bd30b43e94b1c3119cf35064b162", size = 453601, upload-time = "2026-04-13T17:11:53.726Z" }, + { url = "https://files.pythonhosted.org/packages/6d/d8/331b59a6de279f3ad75c10c02c40a12f21d64a437d9c3d6f1af2dcbd7a76/fastar-0.11.0-cp314-cp314t-win_amd64.whl", hash = "sha256:f4ce44e3b56c47cf38244b98d29f269b259740a580c47a2552efa5b96a5458fb", size = 486436, upload-time = "2026-04-13T17:11:40.089Z" }, + { url = "https://files.pythonhosted.org/packages/6b/fd/5390ec4f49100f3ecb9968a392f9e6d039f1e3fe0ecd28443716ff01e589/fastar-0.11.0-cp314-cp314t-win_arm64.whl", hash = "sha256:76c1359314355eafbc6989f20fb1ad565a3d10200117923b9da765a17e2f6f11", size = 461049, upload-time = "2026-04-13T17:11:25.918Z" }, +] + [[package]] name = "fastjsonschema" version = "2.21.2" @@ -1088,6 +1203,19 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/04/4b/29cac41a4d98d144bf5f6d33995617b185d14b22401f75ca86f384e87ff1/h11-0.16.0-py3-none-any.whl", hash = "sha256:63cf8bbe7522de3bf65932fda1d9c2772064ffb3dae62d55932da54b31cb6c86", size = 37515, upload-time = "2025-04-24T03:35:24.344Z" }, ] +[[package]] +name = "httpcore" +version = "1.0.9" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "certifi" }, + { name = "h11" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/06/94/82699a10bca87a5556c9c59b5963f2d039dbd239f25bc2a63907a05a14cb/httpcore-1.0.9.tar.gz", hash = "sha256:6e34463af53fd2ab5d807f399a9b45ea31c3dfa2276f15a2c3f00afff6e176e8", size = 85484, upload-time = "2025-04-24T22:06:22.219Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/7e/f5/f66802a942d491edb555dd61e3a9961140fd64c90bce1eafd741609d334d/httpcore-1.0.9-py3-none-any.whl", hash = "sha256:2d400746a40668fc9dec9810239072b40b4484b640a8c38fd654a024c7a1bf55", size = 78784, upload-time = "2025-04-24T22:06:20.566Z" }, +] + [[package]] name = "httpcore2" version = "2.3.0" @@ -1101,6 +1229,43 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/c2/dd/3357218c69360d1cecc196c230c9a1d5c9afd5dba362056e23e60a5e64e5/httpcore2-2.3.0-py3-none-any.whl", hash = "sha256:477e9e334f74e5240dcac002e890580f36a57d40ff0fb14cc9655731d23b8415", size = 80024, upload-time = "2026-06-01T13:15:00.001Z" }, ] +[[package]] +name = "httptools" +version = "0.8.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/43/e5/d471fcb0e14523fe1c3f4ba58ca52480e7bd70ad7109a3846bc75892f7fb/httptools-0.8.0.tar.gz", hash = "sha256:6b2a32f18d97e16e90827d7a819ffa8dbd8cc245fc4e1fa9d1095b54ef4bd999", size = 271342, upload-time = "2026-05-25T22:17:48.841Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/1a/12/fa3fbf5f9517b273edea2dc982aa82a8c634091e67c590792b729017bc6f/httptools-0.8.0-cp314-cp314-macosx_10_13_universal2.whl", hash = "sha256:de242a49b5d18e0a8776e654e9f6bf6d89f3875a5c35b425a0e7ce940feb3fd6", size = 206183, upload-time = "2026-05-25T22:17:24.004Z" }, + { url = "https://files.pythonhosted.org/packages/30/fc/5e7c4cb443370f2090a3aba0453a07384d29ff66b7435bb90e77e1037599/httptools-0.8.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:159e9ab5f701ccd42e555a12f1ad8ff69702910fc1c996cf2bb66e5fcb7a231b", size = 112079, upload-time = "2026-05-25T22:17:25.216Z" }, + { url = "https://files.pythonhosted.org/packages/ba/53/771bd891eb0f236f32145d6a1775777ec85745f3cc983a1f23d1a3b8ddfe/httptools-0.8.0-cp314-cp314-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:c4a9f1707e4823d54dfec6c33fa3697d302aed536ed352a7ebb5a061ddb869d0", size = 481596, upload-time = "2026-05-25T22:17:26.186Z" }, + { url = "https://files.pythonhosted.org/packages/62/42/94e15bc68ce3d423243c45d7f1b0c7561f13844f97dc52ae23182fb65628/httptools-0.8.0-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:d76ad7b951387e3632c8716a9bb03ac5b45c5f16119aa409db0459520887944e", size = 480865, upload-time = "2026-05-25T22:17:27.542Z" }, + { url = "https://files.pythonhosted.org/packages/1c/7c/fe2980fc03723272e30f135b62360b075f513dfe7cc73aef36c7f04012bd/httptools-0.8.0-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:a3b7387147361c3fd47a0bde763c5c91b5b4cd4dc9989b8ece84ff436c99843b", size = 463189, upload-time = "2026-05-25T22:17:28.546Z" }, + { url = "https://files.pythonhosted.org/packages/15/1b/47fc5fff68acd1bfa20b4734059c9a06cadb88119dcd5258b5b0d21d91c8/httptools-0.8.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:f256d6ce930c52ca1cb2a960b7da03548c454e7d28b06059ad41bfe789036ce0", size = 466610, upload-time = "2026-05-25T22:17:29.816Z" }, + { url = "https://files.pythonhosted.org/packages/60/bd/07b13c93ffd9bec9546e0d43f8e19378dd696dbd278511406bc07371ef1f/httptools-0.8.0-cp314-cp314-win_amd64.whl", hash = "sha256:19d1ee275bb59ba2643ba9a3a1e51cc0c788caf2b8df506368e03f56fdd08527", size = 92705, upload-time = "2026-05-25T22:17:31.133Z" }, + { url = "https://files.pythonhosted.org/packages/fd/c4/121648f68ce066d7bd762d6b6d97e620847642d38d54f3d90ff11d947629/httptools-0.8.0-cp314-cp314t-macosx_10_13_universal2.whl", hash = "sha256:de1ed58a974e75d56560acc7e7fed01a454994429456f65209789992e41f2568", size = 215023, upload-time = "2026-05-25T22:17:32.401Z" }, + { url = "https://files.pythonhosted.org/packages/b9/b0/312a062ae741ae3e8baa8c8bf20be81b2e67337b259ab4349bebc7b6142e/httptools-0.8.0-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:e93c227b595c6926c1acee96891dd9da4be338cfbe82e5cd3bb9d8dd7dc4ac0b", size = 117405, upload-time = "2026-05-25T22:17:33.742Z" }, + { url = "https://files.pythonhosted.org/packages/fc/37/fccd705f795386bb05bf413012fecff2a33e5aa8c2f069096de3e9fd8702/httptools-0.8.0-cp314-cp314t-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:2a021c3a8e65cc125390d72f59b968afca3bdcaff25bd67965e0a055a14946ca", size = 558497, upload-time = "2026-05-25T22:17:34.732Z" }, + { url = "https://files.pythonhosted.org/packages/bd/39/f172e8003576de35f5ba77ff417cf0e34429d35dc014deef15afa337a72c/httptools-0.8.0-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:48774d39cbb70e2b1f71f88852a3087ae1d3a1eb80482bb48c13067ab080c14f", size = 571585, upload-time = "2026-05-25T22:17:35.813Z" }, + { url = "https://files.pythonhosted.org/packages/3e/b9/f5564760af99f3dbbf3f9104dc00e5da27e96cf433c6bdcf77617f70bf3f/httptools-0.8.0-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:88eead8ec8680a9f146c655bc88445a325bd7921cfd8194c7337e9467282427d", size = 543297, upload-time = "2026-05-25T22:17:37.08Z" }, + { url = "https://files.pythonhosted.org/packages/99/67/8d9f2c313618e161b82f3873188e7196126da1d6e29688df40eb3997c77a/httptools-0.8.0-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:2c032fa028f46871ec7e1fc59fc15e8023eab3e6bbe6ece786a1611719a5d081", size = 539535, upload-time = "2026-05-25T22:17:38.032Z" }, + { url = "https://files.pythonhosted.org/packages/48/63/b906c01e53f50d432c0defe43ce52764a111dc1bdd028bafbeb54dcfd008/httptools-0.8.0-cp314-cp314t-win_amd64.whl", hash = "sha256:384c17174464c8e873398b7af24f0b1f44d992c820328413951a625323155d77", size = 108209, upload-time = "2026-05-25T22:17:39.473Z" }, +] + +[[package]] +name = "httpx" +version = "0.28.1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "anyio" }, + { name = "certifi" }, + { name = "httpcore" }, + { name = "idna" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/b1/df/48c586a5fe32a0f01324ee087459e112ebb7224f646c0b5023f5e79e9956/httpx-0.28.1.tar.gz", hash = "sha256:75e98c5f16b0f35b567856f597f06ff2270a374470a5c2392242528e3e3e42fc", size = 141406, upload-time = "2024-12-06T15:37:23.222Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/2a/39/e50c7c3a983047577ee07d2a9e53faf5a69493943ec3f6a384bdc792deb2/httpx-0.28.1-py3-none-any.whl", hash = "sha256:d909fcccc110f8c7faf814ca82a9a4d816bc5a6dbfea25d6591d6985b8ba59ad", size = 73517, upload-time = "2024-12-06T15:37:21.509Z" }, +] + [[package]] name = "httpx2" version = "2.3.0" @@ -1523,6 +1688,18 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/7f/2c/0f1e93c636720e8a3eb59af2bfda99d98b55891e1c53bc30c2e0e865f01b/lxml-6.1.1-cp314-cp314t-win_arm64.whl", hash = "sha256:58bb955caba94e467d2a96da17660d2d704e0675894cba21ab8a775b8621fd1c", size = 3817223, upload-time = "2026-05-19T19:22:56.823Z" }, ] +[[package]] +name = "markdown-it-py" +version = "4.2.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "mdurl" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/06/ff/7841249c247aa650a76b9ee4bbaeae59370dc8bfd2f6c01f3630c35eb134/markdown_it_py-4.2.0.tar.gz", hash = "sha256:04a21681d6fbb623de53f6f364d352309d4094dd4194040a10fd51833e418d49", size = 82454, upload-time = "2026-05-07T12:08:28.36Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/b3/81/4da04ced5a082363ecfa159c010d200ecbd959ae410c10c0264a38cac0f5/markdown_it_py-4.2.0-py3-none-any.whl", hash = "sha256:9f7ebbcd14fe59494226453aed97c1070d83f8d24b6fc3a3bcf9a38092641c4a", size = 91687, upload-time = "2026-05-07T12:08:27.182Z" }, +] + [[package]] name = "markupsafe" version = "3.0.3" @@ -1623,6 +1800,15 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/41/09/5b161152e2d90f7b87f781c2e1267494aef9c32498df793f73ad0a0a494a/matplotlib_inline-0.2.2-py3-none-any.whl", hash = "sha256:3c821cf1c209f59fb2d2d64abbf5b23b67bcb2210d663f9918dd851c6da1fcf6", size = 9534, upload-time = "2026-05-08T17:33:32.055Z" }, ] +[[package]] +name = "mdurl" +version = "0.1.2" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/d6/54/cfe61301667036ec958cb99bd3efefba235e65cdeb9c84d24a8293ba1d90/mdurl-0.1.2.tar.gz", hash = "sha256:bb413d29f5eea38f31dd4754dd7377d4465116fb207585f97bf925588687c1ba", size = 8729, upload-time = "2022-08-14T12:40:10.846Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/b3/38/89ba8ad64ae25be8de66a6d463314cf1eb366222074cfda9ee839c56a4b4/mdurl-0.1.2-py3-none-any.whl", hash = "sha256:84008a41e51615a49fc9966191ff91509e3c40b939176e643fd50a5c2196b8f8", size = 9979, upload-time = "2022-08-14T12:40:09.779Z" }, +] + [[package]] name = "mimerender-pr36" version = "0.0.2" @@ -1691,7 +1877,7 @@ dependencies = [ { name = "dateparser" }, { name = "ddtrace" }, { name = "dnspython" }, - { name = "fastapi" }, + { name = "fastapi", extra = ["standard"] }, { name = "fastapi-filter" }, { name = "filetype" }, { name = "flasgger-tschaume" }, @@ -1750,7 +1936,7 @@ requires-dist = [ { name = "dateparser" }, { name = "ddtrace", specifier = "==4.3.0" }, { name = "dnspython" }, - { name = "fastapi", specifier = ">=0.136.3" }, + { name = "fastapi", extras = ["standard"], specifier = ">=0.136.3" }, { name = "fastapi-filter", specifier = ">=2.0.1" }, { name = "filetype" }, { name = "flasgger-tschaume", specifier = ">=0.9.7" }, @@ -2437,6 +2623,11 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/fd/7b/122376b1fd3c62c1ed9dc80c931ace4844b3c55407b6fb2d199377c9736f/pydantic-2.13.4-py3-none-any.whl", hash = "sha256:45a282cde31d808236fd7ea9d919b128653c8b38b393d1c4ab335c62924d9aba", size = 472262, upload-time = "2026-05-06T13:43:02.641Z" }, ] +[package.optional-dependencies] +email = [ + { name = "email-validator" }, +] + [[package]] name = "pydantic-core" version = "2.46.4" @@ -2478,6 +2669,19 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/f6/d2/42dd53d0a85c27606f316d3aa5d2869c4e8470a5ed6dec30e4a1abe19192/pydantic_core-2.46.4-cp314-cp314t-win_arm64.whl", hash = "sha256:4fcbe087dbc2068af7eda3aa87634eba216dbda64d1ae73c8684b621d33f6596", size = 2017325, upload-time = "2026-05-06T13:40:52.723Z" }, ] +[[package]] +name = "pydantic-extra-types" +version = "2.11.1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "pydantic" }, + { name = "typing-extensions" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/66/71/dba38ee2651f84f7842206adbd2233d8bbdb59fb85e9fa14232486a8c471/pydantic_extra_types-2.11.1.tar.gz", hash = "sha256:46792d2307383859e923d8fcefa82108b1a141f8a9c0198982b3832ab5ef1049", size = 172002, upload-time = "2026-03-16T08:08:03.92Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/17/c1/3226e6d7f5a4f736f38ac11a6fbb262d701889802595cdb0f53a885ac2e0/pydantic_extra_types-2.11.1-py3-none-any.whl", hash = "sha256:1722ea2bddae5628ace25f2aa685b69978ef533123e5638cfbddb999e0100ec1", size = 79526, upload-time = "2026-03-16T08:08:02.533Z" }, +] + [[package]] name = "pydantic-settings" version = "2.14.1" @@ -2687,6 +2891,15 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/65/d9/1093a9d6d22d04d433003c96b9b1d46741b43fee5b11ece5098297737fce/python_mimeparse-2.0.0-py3-none-any.whl", hash = "sha256:574062a06f2e1d416535c8d3b83ccc6ebe95941e74e2c5939fc010a12e37cc09", size = 5576, upload-time = "2024-08-25T13:38:13.372Z" }, ] +[[package]] +name = "python-multipart" +version = "0.0.30" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/4b/82/c8cd43a6e0719bf5a3b034f6726dd701f75829c08944c83d4b95d02ed0e8/python_multipart-0.0.30.tar.gz", hash = "sha256:0edfe0475c1f46ddd3ff7785a626f6118af32bdcf359bb21260367313bb32118", size = 46316, upload-time = "2026-05-31T19:24:55.198Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/1c/fd/0318007beb234790993d3ec5afd051d1dbceb733e81e3afe2b981ece3f37/python_multipart-0.0.30-py3-none-any.whl", hash = "sha256:830964def8c90607ac5daa00514e3987815865713ade8d20febc9177ac0c3c5b", size = 29730, upload-time = "2026-05-31T19:24:53.814Z" }, +] + [[package]] name = "python-snappy" version = "0.7.3" @@ -2887,6 +3100,71 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/7e/71/44ce230e1b7fadd372515a97e32a83011f906ddded8d03e3c6aafbdedbb7/rfc3987_syntax-1.1.0-py3-none-any.whl", hash = "sha256:6c3d97604e4c5ce9f714898e05401a0445a641cfa276432b0a648c80856f6a3f", size = 8046, upload-time = "2025-07-18T01:05:03.843Z" }, ] +[[package]] +name = "rich" +version = "15.0.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "markdown-it-py" }, + { name = "pygments" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/c0/8f/0722ca900cc807c13a6a0c696dacf35430f72e0ec571c4275d2371fca3e9/rich-15.0.0.tar.gz", hash = "sha256:edd07a4824c6b40189fb7ac9bc4c52536e9780fbbfbddf6f1e2502c31b068c36", size = 230680, upload-time = "2026-04-12T08:24:00.75Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/82/3b/64d4899d73f91ba49a8c18a8ff3f0ea8f1c1d75481760df8c68ef5235bf5/rich-15.0.0-py3-none-any.whl", hash = "sha256:33bd4ef74232fb73fe9279a257718407f169c09b78a87ad3d296f548e27de0bb", size = 310654, upload-time = "2026-04-12T08:24:02.83Z" }, +] + +[[package]] +name = "rich-toolkit" +version = "0.20.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "click" }, + { name = "rich" }, + { name = "typing-extensions" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/c3/49/d7a4fd4f39c195b73f78694af3e812943a4181a8d48a11035425d0f6d71f/rich_toolkit-0.20.0.tar.gz", hash = "sha256:bb05382554d4f46865dfca2fccccf30768ef37e0347207d00f034d9b36b25021", size = 203144, upload-time = "2026-06-02T21:11:38.48Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/67/b5/6b6efd9e305653fae68ed0b712bc659cd3c5541ec54416e6bb14af52acca/rich_toolkit-0.20.0-py3-none-any.whl", hash = "sha256:906e5b8741fafc46159c5f719fd30fd3c9dd8f2c31b8161dc8c612f98b8da01a", size = 35379, upload-time = "2026-06-02T21:11:37.564Z" }, +] + +[[package]] +name = "rignore" +version = "0.7.6" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/e5/f5/8bed2310abe4ae04b67a38374a4d311dd85220f5d8da56f47ae9361be0b0/rignore-0.7.6.tar.gz", hash = "sha256:00d3546cd793c30cb17921ce674d2c8f3a4b00501cb0e3dd0e82217dbeba2671", size = 57140, upload-time = "2025-11-05T21:41:21.968Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/9a/b9/1f5bd82b87e5550cd843ceb3768b4a8ef274eb63f29333cf2f29644b3d75/rignore-0.7.6-cp314-cp314-macosx_10_12_x86_64.whl", hash = "sha256:8e41be9fa8f2f47239ded8920cc283699a052ac4c371f77f5ac017ebeed75732", size = 882632, upload-time = "2025-11-05T20:42:44.063Z" }, + { url = "https://files.pythonhosted.org/packages/e9/6b/07714a3efe4a8048864e8a5b7db311ba51b921e15268b17defaebf56d3db/rignore-0.7.6-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:6dc1e171e52cefa6c20e60c05394a71165663b48bca6c7666dee4f778f2a7d90", size = 820760, upload-time = "2025-11-05T20:42:27.885Z" }, + { url = "https://files.pythonhosted.org/packages/ac/0f/348c829ea2d8d596e856371b14b9092f8a5dfbb62674ec9b3f67e4939a9d/rignore-0.7.6-cp314-cp314-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0ce2268837c3600f82ab8db58f5834009dc638ee17103582960da668963bebc5", size = 899044, upload-time = "2025-11-05T20:40:55.336Z" }, + { url = "https://files.pythonhosted.org/packages/f0/30/2e1841a19b4dd23878d73edd5d82e998a83d5ed9570a89675f140ca8b2ad/rignore-0.7.6-cp314-cp314-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:690a3e1b54bfe77e89c4bacb13f046e642f8baadafc61d68f5a726f324a76ab6", size = 874144, upload-time = "2025-11-05T20:41:10.195Z" }, + { url = "https://files.pythonhosted.org/packages/c2/bf/0ce9beb2e5f64c30e3580bef09f5829236889f01511a125f98b83169b993/rignore-0.7.6-cp314-cp314-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:09d12ac7a0b6210c07bcd145007117ebd8abe99c8eeb383e9e4673910c2754b2", size = 1168062, upload-time = "2025-11-05T20:41:26.511Z" }, + { url = "https://files.pythonhosted.org/packages/b9/8b/571c178414eb4014969865317da8a02ce4cf5241a41676ef91a59aab24de/rignore-0.7.6-cp314-cp314-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2a2b2b74a8c60203b08452479b90e5ce3dbe96a916214bc9eb2e5af0b6a9beb0", size = 942542, upload-time = "2025-11-05T20:41:41.838Z" }, + { url = "https://files.pythonhosted.org/packages/19/62/7a3cf601d5a45137a7e2b89d10c05b5b86499190c4b7ca5c3c47d79ee519/rignore-0.7.6-cp314-cp314-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8fc5a531ef02131e44359419a366bfac57f773ea58f5278c2cdd915f7d10ea94", size = 958739, upload-time = "2025-11-05T20:42:12.463Z" }, + { url = "https://files.pythonhosted.org/packages/5f/1f/4261f6a0d7caf2058a5cde2f5045f565ab91aa7badc972b57d19ce58b14e/rignore-0.7.6-cp314-cp314-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:b7a1f77d9c4cd7e76229e252614d963442686bfe12c787a49f4fe481df49e7a9", size = 984138, upload-time = "2025-11-05T20:41:56.775Z" }, + { url = "https://files.pythonhosted.org/packages/2b/bf/628dfe19c75e8ce1f45f7c248f5148b17dfa89a817f8e3552ab74c3ae812/rignore-0.7.6-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:ead81f728682ba72b5b1c3d5846b011d3e0174da978de87c61645f2ed36659a7", size = 1079299, upload-time = "2025-11-05T21:40:16.639Z" }, + { url = "https://files.pythonhosted.org/packages/af/a5/be29c50f5c0c25c637ed32db8758fdf5b901a99e08b608971cda8afb293b/rignore-0.7.6-cp314-cp314-musllinux_1_2_armv7l.whl", hash = "sha256:12ffd50f520c22ffdabed8cd8bfb567d9ac165b2b854d3e679f4bcaef11a9441", size = 1139618, upload-time = "2025-11-05T21:40:34.507Z" }, + { url = "https://files.pythonhosted.org/packages/2a/40/3c46cd7ce4fa05c20b525fd60f599165e820af66e66f2c371cd50644558f/rignore-0.7.6-cp314-cp314-musllinux_1_2_i686.whl", hash = "sha256:e5a16890fbe3c894f8ca34b0fcacc2c200398d4d46ae654e03bc9b3dbf2a0a72", size = 1117626, upload-time = "2025-11-05T21:40:51.494Z" }, + { url = "https://files.pythonhosted.org/packages/8c/b9/aea926f263b8a29a23c75c2e0d8447965eb1879d3feb53cfcf84db67ed58/rignore-0.7.6-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:3abab3bf99e8a77488ef6c7c9a799fac22224c28fe9f25cc21aa7cc2b72bfc0b", size = 1128144, upload-time = "2025-11-05T21:41:09.169Z" }, + { url = "https://files.pythonhosted.org/packages/a4/f6/0d6242f8d0df7f2ecbe91679fefc1f75e7cd2072cb4f497abaab3f0f8523/rignore-0.7.6-cp314-cp314-win32.whl", hash = "sha256:eeef421c1782953c4375aa32f06ecae470c1285c6381eee2a30d2e02a5633001", size = 646385, upload-time = "2025-11-05T21:41:55.105Z" }, + { url = "https://files.pythonhosted.org/packages/d5/38/c0dcd7b10064f084343d6af26fe9414e46e9619c5f3224b5272e8e5d9956/rignore-0.7.6-cp314-cp314-win_amd64.whl", hash = "sha256:6aeed503b3b3d5af939b21d72a82521701a4bd3b89cd761da1e7dc78621af304", size = 725738, upload-time = "2025-11-05T21:41:39.736Z" }, + { url = "https://files.pythonhosted.org/packages/d9/7a/290f868296c1ece914d565757ab363b04730a728b544beb567ceb3b2d96f/rignore-0.7.6-cp314-cp314-win_arm64.whl", hash = "sha256:104f215b60b3c984c386c3e747d6ab4376d5656478694e22c7bd2f788ddd8304", size = 656008, upload-time = "2025-11-05T21:41:29.028Z" }, + { url = "https://files.pythonhosted.org/packages/ca/d2/3c74e3cd81fe8ea08a8dcd2d755c09ac2e8ad8fe409508904557b58383d3/rignore-0.7.6-cp314-cp314t-macosx_10_12_x86_64.whl", hash = "sha256:bb24a5b947656dd94cb9e41c4bc8b23cec0c435b58be0d74a874f63c259549e8", size = 882835, upload-time = "2025-11-05T20:42:45.443Z" }, + { url = "https://files.pythonhosted.org/packages/77/61/a772a34b6b63154877433ac2d048364815b24c2dd308f76b212c408101a2/rignore-0.7.6-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:5b1e33c9501cefe24b70a1eafd9821acfd0ebf0b35c3a379430a14df089993e3", size = 820301, upload-time = "2025-11-05T20:42:29.226Z" }, + { url = "https://files.pythonhosted.org/packages/71/30/054880b09c0b1b61d17eeb15279d8bf729c0ba52b36c3ada52fb827cbb3c/rignore-0.7.6-cp314-cp314t-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:bec3994665a44454df86deb762061e05cd4b61e3772f5b07d1882a8a0d2748d5", size = 897611, upload-time = "2025-11-05T20:40:56.475Z" }, + { url = "https://files.pythonhosted.org/packages/1e/40/b2d1c169f833d69931bf232600eaa3c7998ba4f9a402e43a822dad2ea9f2/rignore-0.7.6-cp314-cp314t-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:26cba2edfe3cff1dfa72bddf65d316ddebf182f011f2f61538705d6dbaf54986", size = 873875, upload-time = "2025-11-05T20:41:11.561Z" }, + { url = "https://files.pythonhosted.org/packages/55/59/ca5ae93d83a1a60e44b21d87deb48b177a8db1b85e82fc8a9abb24a8986d/rignore-0.7.6-cp314-cp314t-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ffa86694fec604c613696cb91e43892aa22e1fec5f9870e48f111c603e5ec4e9", size = 1167245, upload-time = "2025-11-05T20:41:28.29Z" }, + { url = "https://files.pythonhosted.org/packages/a5/52/cf3dce392ba2af806cba265aad6bcd9c48bb2a6cb5eee448d3319f6e505b/rignore-0.7.6-cp314-cp314t-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:48efe2ed95aa8104145004afb15cdfa02bea5cdde8b0344afeb0434f0d989aa2", size = 941750, upload-time = "2025-11-05T20:41:43.111Z" }, + { url = "https://files.pythonhosted.org/packages/ec/be/3f344c6218d779395e785091d05396dfd8b625f6aafbe502746fcd880af2/rignore-0.7.6-cp314-cp314t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8dcae43eb44b7f2457fef7cc87f103f9a0013017a6f4e62182c565e924948f21", size = 958896, upload-time = "2025-11-05T20:42:13.784Z" }, + { url = "https://files.pythonhosted.org/packages/c9/34/d3fa71938aed7d00dcad87f0f9bcb02ad66c85d6ffc83ba31078ce53646a/rignore-0.7.6-cp314-cp314t-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:2cd649a7091c0dad2f11ef65630d30c698d505cbe8660dd395268e7c099cc99f", size = 983992, upload-time = "2025-11-05T20:41:58.022Z" }, + { url = "https://files.pythonhosted.org/packages/24/a4/52a697158e9920705bdbd0748d59fa63e0f3233fb92e9df9a71afbead6ca/rignore-0.7.6-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:42de84b0289d478d30ceb7ae59023f7b0527786a9a5b490830e080f0e4ea5aeb", size = 1078181, upload-time = "2025-11-05T21:40:18.151Z" }, + { url = "https://files.pythonhosted.org/packages/ac/65/aa76dbcdabf3787a6f0fd61b5cc8ed1e88580590556d6c0207960d2384bb/rignore-0.7.6-cp314-cp314t-musllinux_1_2_armv7l.whl", hash = "sha256:875a617e57b53b4acbc5a91de418233849711c02e29cc1f4f9febb2f928af013", size = 1139232, upload-time = "2025-11-05T21:40:35.966Z" }, + { url = "https://files.pythonhosted.org/packages/08/44/31b31a49b3233c6842acc1c0731aa1e7fb322a7170612acf30327f700b44/rignore-0.7.6-cp314-cp314t-musllinux_1_2_i686.whl", hash = "sha256:8703998902771e96e49968105207719f22926e4431b108450f3f430b4e268b7c", size = 1117349, upload-time = "2025-11-05T21:40:53.013Z" }, + { url = "https://files.pythonhosted.org/packages/e9/ae/1b199a2302c19c658cf74e5ee1427605234e8c91787cfba0015f2ace145b/rignore-0.7.6-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:602ef33f3e1b04c1e9a10a3c03f8bc3cef2d2383dcc250d309be42b49923cabc", size = 1127702, upload-time = "2025-11-05T21:41:10.881Z" }, + { url = "https://files.pythonhosted.org/packages/fc/d3/18210222b37e87e36357f7b300b7d98c6dd62b133771e71ae27acba83a4f/rignore-0.7.6-cp314-cp314t-win32.whl", hash = "sha256:c1d8f117f7da0a4a96a8daef3da75bc090e3792d30b8b12cfadc240c631353f9", size = 647033, upload-time = "2025-11-05T21:42:00.095Z" }, + { url = "https://files.pythonhosted.org/packages/3e/87/033eebfbee3ec7d92b3bb1717d8f68c88e6fc7de54537040f3b3a405726f/rignore-0.7.6-cp314-cp314t-win_amd64.whl", hash = "sha256:ca36e59408bec81de75d307c568c2d0d410fb880b1769be43611472c61e85c96", size = 725647, upload-time = "2025-11-05T21:41:44.449Z" }, + { url = "https://files.pythonhosted.org/packages/79/62/b88e5879512c55b8ee979c666ee6902adc4ed05007226de266410ae27965/rignore-0.7.6-cp314-cp314t-win_arm64.whl", hash = "sha256:b83adabeb3e8cf662cabe1931b83e165b88c526fa6af6b3aa90429686e474896", size = 656035, upload-time = "2025-11-05T21:41:31.13Z" }, +] + [[package]] name = "rpds-py" version = "2026.5.1" @@ -3067,6 +3345,19 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/1c/78/504fdd027da3b84ff1aecd9f6957e65f35134534ccc6da8628eb71e76d3f/send2trash-2.1.0-py3-none-any.whl", hash = "sha256:0da2f112e6d6bb22de6aa6daa7e144831a4febf2a87261451c4ad849fe9a873c", size = 17610, upload-time = "2026-01-14T06:27:35.218Z" }, ] +[[package]] +name = "sentry-sdk" +version = "2.61.1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "certifi" }, + { name = "urllib3" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/63/3b/4bc6b348bbd331daa14d4babe9f2b99bc854f4da41560eefb9488d78481d/sentry_sdk-2.61.1.tar.gz", hash = "sha256:9c6adccb3feefa9ba032c8d295ca477575c2f11896046a2b0ad686c47c4af555", size = 459429, upload-time = "2026-06-01T07:24:18.875Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/df/54/c9218db183846e08efaf68534889ef42e499dde432778881104a42f7071b/sentry_sdk-2.61.1-py3-none-any.whl", hash = "sha256:fa36eaf4b8ad708f718500d4bdcc1532637526a22beb874d88cbc0a46458b5ae", size = 483735, upload-time = "2026-06-01T07:24:17.027Z" }, +] + [[package]] name = "setproctitle" version = "1.3.7" @@ -3095,6 +3386,15 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/08/b6/3a5a4f9952972791a9114ac01dfc123f0df79903577a3e0a7a404a695586/setproctitle-1.3.7-cp314-cp314t-win_amd64.whl", hash = "sha256:cbc388e3d86da1f766d8fc2e12682e446064c01cea9f88a88647cfe7c011de6a", size = 13469, upload-time = "2025-09-05T12:50:42.67Z" }, ] +[[package]] +name = "shellingham" +version = "1.5.4" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/58/15/8b3609fd3830ef7b27b655beb4b4e9c62313a4e8da8c676e142cc210d58e/shellingham-1.5.4.tar.gz", hash = "sha256:8dbca0739d487e5bd35ab3ca4b36e11c4078f3a234bfce294b0a0291363404de", size = 10310, upload-time = "2023-10-24T04:13:40.426Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/e0/f9/0595336914c5619e5f28a1fb793285925a8cd4b432c9da0a987836c7f822/shellingham-1.5.4-py2.py3-none-any.whl", hash = "sha256:7ecfff8f2fd72616f7481040475a65b2bf8af90a56c89140852d1120324e8686", size = 9755, upload-time = "2023-10-24T04:13:38.866Z" }, +] + [[package]] name = "six" version = "1.17.0" @@ -3271,6 +3571,21 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/19/97/56608b2249fe206a67cd573bc93cd9896e1efb9e98bce9c163bcdc704b88/truststore-0.10.4-py3-none-any.whl", hash = "sha256:adaeaecf1cbb5f4de3b1959b42d41f6fab57b2b1666adb59e89cb0b53361d981", size = 18660, upload-time = "2025-08-12T18:49:01.46Z" }, ] +[[package]] +name = "typer" +version = "0.26.7" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "annotated-doc" }, + { name = "colorama", marker = "sys_platform == 'win32'" }, + { name = "rich" }, + { name = "shellingham" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/5e/ed/ef06584ccdd5c410df0837951ecd7e15d9a6144ea1bd4c73cecab1a89891/typer-0.26.7.tar.gz", hash = "sha256:e314a34c617e419c091b2830dda3ea1f257134ff593061a8f5b9717ab8dddb3a", size = 201709, upload-time = "2026-06-03T07:18:06.843Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/24/25/2201973529af2c954de0bb725323c3aaed6d7f0ceee8f550dec9185df013/typer-0.26.7-py3-none-any.whl", hash = "sha256:5c87cfbc5d34491c5346ebf49c23e18d56ccb863268d3a8d592b26087c2f5e58", size = 122456, upload-time = "2026-06-03T07:18:05.732Z" }, +] + [[package]] name = "typing-extensions" version = "4.15.0" @@ -3340,6 +3655,97 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/7f/3e/5db95bcf282c52709639744ca2a8b149baccf648e39c8cc87553df9eae0c/urllib3-2.7.0-py3-none-any.whl", hash = "sha256:9fb4c81ebbb1ce9531cce37674bbc6f1360472bc18ca9a553ede278ef7276897", size = 131087, upload-time = "2026-05-07T16:13:17.151Z" }, ] +[[package]] +name = "uvicorn" +version = "0.49.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "click" }, + { name = "h11" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/c4/1f/fa18009dea8469069cca78a4e877a008ab78f08b064bfc9ab891579077ff/uvicorn-0.49.0.tar.gz", hash = "sha256:ebf4271aa580d9de97f93192d4595176df6e91f9aae919ca73e4fc07df1e66a3", size = 91284, upload-time = "2026-06-03T22:01:30.448Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/88/fa/e1388bbcf24ef3274f45c0c1c7b501fd14971037c1b6ee23610553307497/uvicorn-0.49.0-py3-none-any.whl", hash = "sha256:ba3d14c3ee7e41c6c654c46c9eb489d33213cdd30aa1696eab1374337c13f68f", size = 71376, upload-time = "2026-06-03T22:01:29.037Z" }, +] + +[package.optional-dependencies] +standard = [ + { name = "colorama", marker = "sys_platform == 'win32'" }, + { name = "httptools" }, + { name = "python-dotenv" }, + { name = "pyyaml" }, + { name = "uvloop", marker = "platform_python_implementation != 'PyPy' and sys_platform != 'cygwin' and sys_platform != 'win32'" }, + { name = "watchfiles" }, + { name = "websockets" }, +] + +[[package]] +name = "uvloop" +version = "0.22.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/06/f0/18d39dbd1971d6d62c4629cc7fa67f74821b0dc1f5a77af43719de7936a7/uvloop-0.22.1.tar.gz", hash = "sha256:6c84bae345b9147082b17371e3dd5d42775bddce91f885499017f4607fdaf39f", size = 2443250, upload-time = "2025-10-16T22:17:19.342Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/90/cd/b62bdeaa429758aee8de8b00ac0dd26593a9de93d302bff3d21439e9791d/uvloop-0.22.1-cp314-cp314-macosx_10_13_universal2.whl", hash = "sha256:3879b88423ec7e97cd4eba2a443aa26ed4e59b45e6b76aabf13fe2f27023a142", size = 1362067, upload-time = "2025-10-16T22:16:44.503Z" }, + { url = "https://files.pythonhosted.org/packages/0d/f8/a132124dfda0777e489ca86732e85e69afcd1ff7686647000050ba670689/uvloop-0.22.1-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:4baa86acedf1d62115c1dc6ad1e17134476688f08c6efd8a2ab076e815665c74", size = 752423, upload-time = "2025-10-16T22:16:45.968Z" }, + { url = "https://files.pythonhosted.org/packages/a3/94/94af78c156f88da4b3a733773ad5ba0b164393e357cc4bd0ab2e2677a7d6/uvloop-0.22.1-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:297c27d8003520596236bdb2335e6b3f649480bd09e00d1e3a99144b691d2a35", size = 4272437, upload-time = "2025-10-16T22:16:47.451Z" }, + { url = "https://files.pythonhosted.org/packages/b5/35/60249e9fd07b32c665192cec7af29e06c7cd96fa1d08b84f012a56a0b38e/uvloop-0.22.1-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:c1955d5a1dd43198244d47664a5858082a3239766a839b2102a269aaff7a4e25", size = 4292101, upload-time = "2025-10-16T22:16:49.318Z" }, + { url = "https://files.pythonhosted.org/packages/02/62/67d382dfcb25d0a98ce73c11ed1a6fba5037a1a1d533dcbb7cab033a2636/uvloop-0.22.1-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:b31dc2fccbd42adc73bc4e7cdbae4fc5086cf378979e53ca5d0301838c5682c6", size = 4114158, upload-time = "2025-10-16T22:16:50.517Z" }, + { url = "https://files.pythonhosted.org/packages/f0/7a/f1171b4a882a5d13c8b7576f348acfe6074d72eaf52cccef752f748d4a9f/uvloop-0.22.1-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:93f617675b2d03af4e72a5333ef89450dfaa5321303ede6e67ba9c9d26878079", size = 4177360, upload-time = "2025-10-16T22:16:52.646Z" }, + { url = "https://files.pythonhosted.org/packages/79/7b/b01414f31546caf0919da80ad57cbfe24c56b151d12af68cee1b04922ca8/uvloop-0.22.1-cp314-cp314t-macosx_10_13_universal2.whl", hash = "sha256:37554f70528f60cad66945b885eb01f1bb514f132d92b6eeed1c90fd54ed6289", size = 1454790, upload-time = "2025-10-16T22:16:54.355Z" }, + { url = "https://files.pythonhosted.org/packages/d4/31/0bb232318dd838cad3fa8fb0c68c8b40e1145b32025581975e18b11fab40/uvloop-0.22.1-cp314-cp314t-macosx_10_13_x86_64.whl", hash = "sha256:b76324e2dc033a0b2f435f33eb88ff9913c156ef78e153fb210e03c13da746b3", size = 796783, upload-time = "2025-10-16T22:16:55.906Z" }, + { url = "https://files.pythonhosted.org/packages/42/38/c9b09f3271a7a723a5de69f8e237ab8e7803183131bc57c890db0b6bb872/uvloop-0.22.1-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:badb4d8e58ee08dad957002027830d5c3b06aea446a6a3744483c2b3b745345c", size = 4647548, upload-time = "2025-10-16T22:16:57.008Z" }, + { url = "https://files.pythonhosted.org/packages/c1/37/945b4ca0ac27e3dc4952642d4c900edd030b3da6c9634875af6e13ae80e5/uvloop-0.22.1-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:b91328c72635f6f9e0282e4a57da7470c7350ab1c9f48546c0f2866205349d21", size = 4467065, upload-time = "2025-10-16T22:16:58.206Z" }, + { url = "https://files.pythonhosted.org/packages/97/cc/48d232f33d60e2e2e0b42f4e73455b146b76ebe216487e862700457fbf3c/uvloop-0.22.1-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:daf620c2995d193449393d6c62131b3fbd40a63bf7b307a1527856ace637fe88", size = 4328384, upload-time = "2025-10-16T22:16:59.36Z" }, + { url = "https://files.pythonhosted.org/packages/e4/16/c1fd27e9549f3c4baf1dc9c20c456cd2f822dbf8de9f463824b0c0357e06/uvloop-0.22.1-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:6cde23eeda1a25c75b2e07d39970f3374105d5eafbaab2a4482be82f272d5a5e", size = 4296730, upload-time = "2025-10-16T22:17:00.744Z" }, +] + +[[package]] +name = "watchfiles" +version = "1.2.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "anyio" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/cd/41/5e1a4bb12aac5f1493fa1bdc11154eca3b258ca4eba65d39c473fe19d8e9/watchfiles-1.2.0.tar.gz", hash = "sha256:c995fba777f1ea992f090f9236e9284cf7a5d1a0130dd5a3d82c598cacd76838", size = 108252, upload-time = "2026-05-18T04:32:04.251Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/e7/54/a9c7ea9a82a4ac65e7004c0a03920b5cdd2f9c3b678757d9cd425aa51d53/watchfiles-1.2.0-cp314-cp314-macosx_10_12_x86_64.whl", hash = "sha256:b8c8358484d5fa12ef34f05b7f4168eaf1932f408725ff6d023c33ec17bd79d4", size = 400205, upload-time = "2026-05-18T04:32:05.153Z" }, + { url = "https://files.pythonhosted.org/packages/aa/5d/c9ab3534374a4a67450696905d6ef16a04405448b8dc52bd752ae50423d4/watchfiles-1.2.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:9f04b092229ad2c50126dd3c922c8822e51e605993764a33058d4a791ab42281", size = 392508, upload-time = "2026-05-18T04:30:54.849Z" }, + { url = "https://files.pythonhosted.org/packages/26/ca/1ad30103535cf0cecd7b993e8d50edc5351b1820e38f2d22e3df58962feb/watchfiles-1.2.0-cp314-cp314-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7a7ce236284f002a156f70add88efe5c70879cccbb658be0822c54b1306fc09d", size = 452448, upload-time = "2026-05-18T04:30:53.727Z" }, + { url = "https://files.pythonhosted.org/packages/37/a1/ceee2cdf2afbd715fa07758d39c9859513eae411b23196f7fd039e5feedd/watchfiles-1.2.0-cp314-cp314-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:b9909cc2b48468b575eefa944919e1fe8a36c5849d5c7c168f80a8c1db69398e", size = 459605, upload-time = "2026-05-18T04:30:23.312Z" }, + { url = "https://files.pythonhosted.org/packages/e8/f6/421e30fd1cb3907a84ed92ab3f1983e37ba2dca015e9a894a048418417a2/watchfiles-1.2.0-cp314-cp314-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:0a37faaed405c67e28e6be45a1fa4f206ef5a2860f27c237db9fa30704c38242", size = 490757, upload-time = "2026-05-18T04:30:47.358Z" }, + { url = "https://files.pythonhosted.org/packages/41/b0/55ed1b97ed08be7bba6f9a541cac15f2a858e1d74d2b07b6da70a82aab00/watchfiles-1.2.0-cp314-cp314-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:9649193aa27bd9ff2e80ff29bfaa93085496c7a3a377592823cc58b77ee88add", size = 568672, upload-time = "2026-05-18T04:30:38.915Z" }, + { url = "https://files.pythonhosted.org/packages/d1/cf/d8ae8a80dd7bafab395ea7681c10237311bbf34d37704a8c744e7cf31fc7/watchfiles-1.2.0-cp314-cp314-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:4e4ff8e37f99cf1da89e255e07c9c4b37c214038c4283707bdec308cb1b0ea1f", size = 464197, upload-time = "2026-05-18T04:30:09.914Z" }, + { url = "https://files.pythonhosted.org/packages/7c/8a/3076c496ca8dafe0e8cd03fcebdfc47be4b1174b4e5b24ff6e396e6b3af2/watchfiles-1.2.0-cp314-cp314-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:054dc20fd2e3132b4c3883b4a00d72fd6e1f56fdaf89fccd12e8057d74cd74d7", size = 453181, upload-time = "2026-05-18T04:30:14.829Z" }, + { url = "https://files.pythonhosted.org/packages/e5/10/9745e17c98e7b8a86454df0a3c7b5686bd650383f1e9f26e4ebcbd6cc0c0/watchfiles-1.2.0-cp314-cp314-manylinux_2_31_riscv64.whl", hash = "sha256:e140ed30ebde76796b686e67c182cff10ea2fbab186fafd1560f74bb5a473a6e", size = 465109, upload-time = "2026-05-18T04:30:28.123Z" }, + { url = "https://files.pythonhosted.org/packages/8f/95/8ef4a95481d3e0cb52d62a06fa6e972e81424be2d9698b91a2fecca9904c/watchfiles-1.2.0-cp314-cp314-musllinux_1_1_aarch64.whl", hash = "sha256:bb7e52ecf68ba46d22df23467b87cffeb2146908aa523ebfe803019618cfda06", size = 630653, upload-time = "2026-05-18T04:31:49.304Z" }, + { url = "https://files.pythonhosted.org/packages/fd/e4/3b3bf36b0f829b50c6ebcb8d031583863c59f923d6a6af3d485e470d0fac/watchfiles-1.2.0-cp314-cp314-musllinux_1_1_x86_64.whl", hash = "sha256:23282a321c8baf9b3a3c4afff673f9fe65eb7fdc2338d765ccad9d3d1916a5ba", size = 657838, upload-time = "2026-05-18T04:31:06.497Z" }, + { url = "https://files.pythonhosted.org/packages/21/b1/6cbbb50c1f3002ab568777d44aa21206dfb8807a840990c4037523b51812/watchfiles-1.2.0-cp314-cp314-win32.whl", hash = "sha256:c0db965c5f79aa49fe672d297cf1febc5ad149b658594944f49a54a2b96270a7", size = 275108, upload-time = "2026-05-18T04:30:06.891Z" }, + { url = "https://files.pythonhosted.org/packages/92/45/190ce6db8dcb4536682cf75d3889ff1a27182a58cb519d343cb6d9ea63d8/watchfiles-1.2.0-cp314-cp314-win_amd64.whl", hash = "sha256:71283b39fd17e5408eb123bd37aeecfd9d54c81fc184421943208aadb879d103", size = 288441, upload-time = "2026-05-18T04:32:12.901Z" }, + { url = "https://files.pythonhosted.org/packages/74/0d/3eae1c2313ab08378431d907c3f8095ecca00f3eda33111cf4f0f2591799/watchfiles-1.2.0-cp314-cp314-win_arm64.whl", hash = "sha256:c5c19526f4e54a00f2666a6c0e9e40d582c09e865055ea7378bf0009aab857b3", size = 280684, upload-time = "2026-05-18T04:31:26.902Z" }, + { url = "https://files.pythonhosted.org/packages/b1/75/fb64e6c25d6b5ca636d03df34ffb1c6e9873303e76d27967e045f8df088f/watchfiles-1.2.0-cp314-cp314t-macosx_10_12_x86_64.whl", hash = "sha256:d73a585accffa5ae39c17264c36ec3166d2fad7000c780f5ef83b2722afb9dd2", size = 398857, upload-time = "2026-05-18T04:32:17.108Z" }, + { url = "https://files.pythonhosted.org/packages/73/4e/9f7adf01754cbf81843722ccfec169d8f26c69778281a302855cecd2ee08/watchfiles-1.2.0-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:ae99b14c5f21e026e0e9d96f40e07d8570ebee6cafd9d8fc318354606daa7a28", size = 392413, upload-time = "2026-05-18T04:31:07.911Z" }, + { url = "https://files.pythonhosted.org/packages/47/c8/bec626bcc2d69f44b9acb24ce7d60ed7b16b73628eea747fcbd169d8edda/watchfiles-1.2.0-cp314-cp314t-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4429f3b105524a10b72c3a819b091c495d2811d419c1e1e8df773a5a5974f831", size = 452409, upload-time = "2026-05-18T04:31:20.142Z" }, + { url = "https://files.pythonhosted.org/packages/00/b7/b6362068e81e7c556d155a34c35d40ac3ef42d747b06d7f6e5bf58e359c2/watchfiles-1.2.0-cp314-cp314t-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:43d818978d06062d9b22c4fab2ebe44cf5213d42dc8e62bda8c2760cfa2eeb33", size = 458827, upload-time = "2026-05-18T04:32:06.219Z" }, + { url = "https://files.pythonhosted.org/packages/67/f8/9a813fa42afb1e0b4625e75f0479826644d3ee8dc287e093799bc01f390c/watchfiles-1.2.0-cp314-cp314t-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b9f732dc58b2dbe69e464ccf8fff7a03b0dd0be439da4c0720d3558527d3d6b4", size = 490104, upload-time = "2026-05-18T04:31:56.034Z" }, + { url = "https://files.pythonhosted.org/packages/2f/bf/27dfb6094ca4c9aad21298b5525b6c53cb36121ee454331d05161e58d130/watchfiles-1.2.0-cp314-cp314t-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:8f200104103feb097de4cab8fe4f5dd18a2026934c7dea98c55a2f5fd6d5a33b", size = 571360, upload-time = "2026-05-18T04:31:57.133Z" }, + { url = "https://files.pythonhosted.org/packages/fb/39/44a096d67270ea93df91d33877dbe91fbda3aa4f8ec2edf799d93eda8736/watchfiles-1.2.0-cp314-cp314t-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:63ac26eefbf4af1741247d6fb68b11c49a25b2f7413fbd318a83a12aaa9cf666", size = 464644, upload-time = "2026-05-18T04:30:57.33Z" }, + { url = "https://files.pythonhosted.org/packages/0e/80/c7472203bad6268e3ef1ad260739704847898938ad7ea8b63a5131f46b50/watchfiles-1.2.0-cp314-cp314t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0c4997d4e4a55f0d02b6cde327322daf3a0400e5df6c6b15948994bf72497925", size = 454771, upload-time = "2026-05-18T04:30:48.736Z" }, + { url = "https://files.pythonhosted.org/packages/51/cf/3b10b268b4b7f0fc26e9debb5eef1998b515887840f444cd3ec80c688755/watchfiles-1.2.0-cp314-cp314t-manylinux_2_31_riscv64.whl", hash = "sha256:4c887eba18b7945ac73067a8b4a66f21cd46c2539b2bc68588f7be6c7eb6d26b", size = 463494, upload-time = "2026-05-18T04:31:33.826Z" }, + { url = "https://files.pythonhosted.org/packages/3d/3e/a4302545cd589262a0dc7d140e86f7688eba3f9c72776c27f7e23b8864c4/watchfiles-1.2.0-cp314-cp314t-musllinux_1_1_aarch64.whl", hash = "sha256:3416ff151bb6b5a8d8d11664974fbef4d9305b9b2957839ab5a270468fd8df30", size = 629383, upload-time = "2026-05-18T04:31:15.596Z" }, + { url = "https://files.pythonhosted.org/packages/db/99/d5649df0a9a410d45b7c882304d0b790903ac9b6e8f2cfd12114e0c6b9f2/watchfiles-1.2.0-cp314-cp314t-musllinux_1_1_x86_64.whl", hash = "sha256:0e831a271c035d89789cffc386b6aa1375f39f1cd25eb7ca0997e4970d152fc5", size = 656093, upload-time = "2026-05-18T04:31:58.707Z" }, + { url = "https://files.pythonhosted.org/packages/92/b9/362702539275019a54dd2e94511b31a9b89c5f9e6a21966de7eb692549fc/watchfiles-1.2.0-cp315-cp315-macosx_10_12_x86_64.whl", hash = "sha256:37a6721cdf3f65dbb13aa9503510ccb4451603ac837e44d265d7992a597e1374", size = 400109, upload-time = "2026-05-18T04:31:16.879Z" }, + { url = "https://files.pythonhosted.org/packages/8f/75/71d5ba62db781e5587bded1d944c675374bc4aa37ff33d5018d98e8b6538/watchfiles-1.2.0-cp315-cp315-macosx_11_0_arm64.whl", hash = "sha256:2b37d10b5a63bd4d87e18472d80fa525bd670586fae62e5dd580452764879b65", size = 392167, upload-time = "2026-05-18T04:31:28.058Z" }, + { url = "https://files.pythonhosted.org/packages/3c/01/c66dd95d0423fe30d31820e2d1d5bda773764131bbb6ac0cb1cf303ac328/watchfiles-1.2.0-cp315-cp315-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0a105bc2283f67e8fbec74253ec2d94925de92ed72c0393f1206bf326b7b7b69", size = 452372, upload-time = "2026-05-18T04:31:00.836Z" }, + { url = "https://files.pythonhosted.org/packages/91/15/2fe99557e72f85627c6a8eed50d889e8d101623e060a22ad75b875cb932d/watchfiles-1.2.0-cp315-cp315-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:5327989a465505f05cfe06f04fa9d0c2fd5432bb243e10e6f012b1bdca3c8579", size = 459596, upload-time = "2026-05-18T04:31:34.96Z" }, + { url = "https://files.pythonhosted.org/packages/ed/23/d4acfa0023367428ed48351b3b9b267893037b6cadae55620c61c24bcfd4/watchfiles-1.2.0-cp315-cp315-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ecb47f183a8025b2aa18b546725c3657e542112ae9c0613a2af79b4fa8d04ad7", size = 490869, upload-time = "2026-05-18T04:31:59.923Z" }, + { url = "https://files.pythonhosted.org/packages/a4/5f/3164cbdce06c9fb95c4f7b9e2f9760b5e2797af43a9ecc317ef42a23a278/watchfiles-1.2.0-cp315-cp315-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:8520a4ab0e37f770afc34459c4f8f7019e153f9124dc101c15538365875d1ab2", size = 571641, upload-time = "2026-05-18T04:32:00.948Z" }, + { url = "https://files.pythonhosted.org/packages/41/e6/85d3731c55e65cd7690f3f803d24c139588aaf863e4bf2148fe7a7fa1a19/watchfiles-1.2.0-cp315-cp315-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:71cd71740ed2c15211ebb237ced4e39a1cdf6f80566e5fe95428da1626f4fde6", size = 464444, upload-time = "2026-05-18T04:30:34.298Z" }, + { url = "https://files.pythonhosted.org/packages/f4/7d/562641012b8b09872742c3b8adf9629ec479fd78f8d68ae4a0c13da8add6/watchfiles-1.2.0-cp315-cp315-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f88af53d6ddaf72179ef613ddc905e6f4785f712b49b80b3bef9f3525e6194b4", size = 453593, upload-time = "2026-05-18T04:31:23.464Z" }, + { url = "https://files.pythonhosted.org/packages/56/fe/cb8ef3d6f929d14158fdaaad9925985b7310abc9384dcd4d82dd0016fb59/watchfiles-1.2.0-cp315-cp315-manylinux_2_31_riscv64.whl", hash = "sha256:cee9d5efd929efdac5f7e58f72b3376f676b64050a91c5b99a7094c5b2317488", size = 465096, upload-time = "2026-05-18T04:31:30.384Z" }, + { url = "https://files.pythonhosted.org/packages/25/91/80908e835e100527a9267147b08c0eee1fa6ab0ffec15edc04d1d44885f7/watchfiles-1.2.0-cp315-cp315-musllinux_1_1_aarch64.whl", hash = "sha256:b718bf356bbc15e559bd8ef41782b573b8ae0e3f177ab244b440568d7ea02cfb", size = 630638, upload-time = "2026-05-18T04:30:49.89Z" }, + { url = "https://files.pythonhosted.org/packages/46/4b/95ab2f256bb4af3cb2eb23b9317bda984ee6e0f11733a5c004a6c95b06e3/watchfiles-1.2.0-cp315-cp315-musllinux_1_1_x86_64.whl", hash = "sha256:922c0e019fe68b3ae392965a766b02a71ba1168c932cebc3733cd52c5fe5b377", size = 657684, upload-time = "2026-05-18T04:31:32.027Z" }, +] + [[package]] name = "wcwidth" version = "0.7.0" @@ -3376,6 +3782,33 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/34/db/b10e48aa8fff7407e67470363eac595018441cf32d5e1001567a7aeba5d2/websocket_client-1.9.0-py3-none-any.whl", hash = "sha256:af248a825037ef591efbf6ed20cc5faa03d3b47b9e5a2230a529eeee1c1fc3ef", size = 82616, upload-time = "2025-10-07T21:16:34.951Z" }, ] +[[package]] +name = "websockets" +version = "16.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/04/24/4b2031d72e840ce4c1ccb255f693b15c334757fc50023e4db9537080b8c4/websockets-16.0.tar.gz", hash = "sha256:5f6261a5e56e8d5c42a4497b364ea24d94d9563e8fbd44e78ac40879c60179b5", size = 179346, upload-time = "2026-01-10T09:23:47.181Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/f3/1d/e88022630271f5bd349ed82417136281931e558d628dd52c4d8621b4a0b2/websockets-16.0-cp314-cp314-macosx_10_15_universal2.whl", hash = "sha256:8cc451a50f2aee53042ac52d2d053d08bf89bcb31ae799cb4487587661c038a0", size = 177406, upload-time = "2026-01-10T09:23:12.178Z" }, + { url = "https://files.pythonhosted.org/packages/f2/78/e63be1bf0724eeb4616efb1ae1c9044f7c3953b7957799abb5915bffd38e/websockets-16.0-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:daa3b6ff70a9241cf6c7fc9e949d41232d9d7d26fd3522b1ad2b4d62487e9904", size = 175085, upload-time = "2026-01-10T09:23:13.511Z" }, + { url = "https://files.pythonhosted.org/packages/bb/f4/d3c9220d818ee955ae390cf319a7c7a467beceb24f05ee7aaaa2414345ba/websockets-16.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:fd3cb4adb94a2a6e2b7c0d8d05cb94e6f1c81a0cf9dc2694fb65c7e8d94c42e4", size = 175328, upload-time = "2026-01-10T09:23:14.727Z" }, + { url = "https://files.pythonhosted.org/packages/63/bc/d3e208028de777087e6fb2b122051a6ff7bbcca0d6df9d9c2bf1dd869ae9/websockets-16.0-cp314-cp314-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:781caf5e8eee67f663126490c2f96f40906594cb86b408a703630f95550a8c3e", size = 185044, upload-time = "2026-01-10T09:23:15.939Z" }, + { url = "https://files.pythonhosted.org/packages/ad/6e/9a0927ac24bd33a0a9af834d89e0abc7cfd8e13bed17a86407a66773cc0e/websockets-16.0-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:caab51a72c51973ca21fa8a18bd8165e1a0183f1ac7066a182ff27107b71e1a4", size = 186279, upload-time = "2026-01-10T09:23:17.148Z" }, + { url = "https://files.pythonhosted.org/packages/b9/ca/bf1c68440d7a868180e11be653c85959502efd3a709323230314fda6e0b3/websockets-16.0-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:19c4dc84098e523fd63711e563077d39e90ec6702aff4b5d9e344a60cb3c0cb1", size = 185711, upload-time = "2026-01-10T09:23:18.372Z" }, + { url = "https://files.pythonhosted.org/packages/c4/f8/fdc34643a989561f217bb477cbc47a3a07212cbda91c0e4389c43c296ebf/websockets-16.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:a5e18a238a2b2249c9a9235466b90e96ae4795672598a58772dd806edc7ac6d3", size = 184982, upload-time = "2026-01-10T09:23:19.652Z" }, + { url = "https://files.pythonhosted.org/packages/dd/d1/574fa27e233764dbac9c52730d63fcf2823b16f0856b3329fc6268d6ae4f/websockets-16.0-cp314-cp314-win32.whl", hash = "sha256:a069d734c4a043182729edd3e9f247c3b2a4035415a9172fd0f1b71658a320a8", size = 177915, upload-time = "2026-01-10T09:23:21.458Z" }, + { url = "https://files.pythonhosted.org/packages/8a/f1/ae6b937bf3126b5134ce1f482365fde31a357c784ac51852978768b5eff4/websockets-16.0-cp314-cp314-win_amd64.whl", hash = "sha256:c0ee0e63f23914732c6d7e0cce24915c48f3f1512ec1d079ed01fc629dab269d", size = 178381, upload-time = "2026-01-10T09:23:22.715Z" }, + { url = "https://files.pythonhosted.org/packages/06/9b/f791d1db48403e1f0a27577a6beb37afae94254a8c6f08be4a23e4930bc0/websockets-16.0-cp314-cp314t-macosx_10_15_universal2.whl", hash = "sha256:a35539cacc3febb22b8f4d4a99cc79b104226a756aa7400adc722e83b0d03244", size = 177737, upload-time = "2026-01-10T09:23:24.523Z" }, + { url = "https://files.pythonhosted.org/packages/bd/40/53ad02341fa33b3ce489023f635367a4ac98b73570102ad2cdd770dacc9a/websockets-16.0-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:b784ca5de850f4ce93ec85d3269d24d4c82f22b7212023c974c401d4980ebc5e", size = 175268, upload-time = "2026-01-10T09:23:25.781Z" }, + { url = "https://files.pythonhosted.org/packages/74/9b/6158d4e459b984f949dcbbb0c5d270154c7618e11c01029b9bbd1bb4c4f9/websockets-16.0-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:569d01a4e7fba956c5ae4fc988f0d4e187900f5497ce46339c996dbf24f17641", size = 175486, upload-time = "2026-01-10T09:23:27.033Z" }, + { url = "https://files.pythonhosted.org/packages/e5/2d/7583b30208b639c8090206f95073646c2c9ffd66f44df967981a64f849ad/websockets-16.0-cp314-cp314t-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:50f23cdd8343b984957e4077839841146f67a3d31ab0d00e6b824e74c5b2f6e8", size = 185331, upload-time = "2026-01-10T09:23:28.259Z" }, + { url = "https://files.pythonhosted.org/packages/45/b0/cce3784eb519b7b5ad680d14b9673a31ab8dcb7aad8b64d81709d2430aa8/websockets-16.0-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:152284a83a00c59b759697b7f9e9cddf4e3c7861dd0d964b472b70f78f89e80e", size = 186501, upload-time = "2026-01-10T09:23:29.449Z" }, + { url = "https://files.pythonhosted.org/packages/19/60/b8ebe4c7e89fb5f6cdf080623c9d92789a53636950f7abacfc33fe2b3135/websockets-16.0-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:bc59589ab64b0022385f429b94697348a6a234e8ce22544e3681b2e9331b5944", size = 186062, upload-time = "2026-01-10T09:23:31.368Z" }, + { url = "https://files.pythonhosted.org/packages/88/a8/a080593f89b0138b6cba1b28f8df5673b5506f72879322288b031337c0b8/websockets-16.0-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:32da954ffa2814258030e5a57bc73a3635463238e797c7375dc8091327434206", size = 185356, upload-time = "2026-01-10T09:23:32.627Z" }, + { url = "https://files.pythonhosted.org/packages/c2/b6/b9afed2afadddaf5ebb2afa801abf4b0868f42f8539bfe4b071b5266c9fe/websockets-16.0-cp314-cp314t-win32.whl", hash = "sha256:5a4b4cc550cb665dd8a47f868c8d04c8230f857363ad3c9caf7a0c3bf8c61ca6", size = 178085, upload-time = "2026-01-10T09:23:33.816Z" }, + { url = "https://files.pythonhosted.org/packages/9f/3e/28135a24e384493fa804216b79a6a6759a38cc4ff59118787b9fb693df93/websockets-16.0-cp314-cp314t-win_amd64.whl", hash = "sha256:b14dc141ed6d2dde437cddb216004bcac6a1df0935d79656387bd41632ba0bbd", size = 178531, upload-time = "2026-01-10T09:23:35.016Z" }, + { url = "https://files.pythonhosted.org/packages/6f/28/258ebab549c2bf3e64d2b0217b973467394a9cea8c42f70418ca2c5d0d2e/websockets-16.0-py3-none-any.whl", hash = "sha256:1637db62fad1dc833276dded54215f2c7fa46912301a24bd94d45d46a011ceec", size = 171598, upload-time = "2026-01-10T09:23:45.395Z" }, +] + [[package]] name = "werkzeug" version = "3.1.8" From 26570e77fa56dfca8d491352576f4f28e9721181 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 4 Jun 2026 09:36:02 -0700 Subject: [PATCH 286/591] Removed old repo --- .../src/mpcontribs_api/old/__init__.py | 254 ------- .../old/attachments/__init__.py | 1 - .../old/attachments/document.py | 87 --- .../mpcontribs_api/old/attachments/views.py | 38 -- .../src/mpcontribs_api/old/config.py | 125 ---- .../old/contributions/__init__.py | 0 .../old/contributions/document.py | 323 --------- .../old/contributions/formulae.json.gz | 3 - .../old/contributions/generate_formulae.py | 15 - .../mpcontribs_api/old/contributions/views.py | 224 ------- mpcontribs-api/src/mpcontribs_api/old/core.py | 629 ------------------ .../src/mpcontribs_api/old/dashboard.cfg | 7 - .../mpcontribs_api/old/notebooks/__init__.py | 65 -- .../mpcontribs_api/old/notebooks/document.py | 106 --- .../src/mpcontribs_api/old/notebooks/views.py | 301 --------- .../mpcontribs_api/old/projects/__init__.py | 0 .../mpcontribs_api/old/projects/document.py | 361 ---------- .../src/mpcontribs_api/old/projects/views.py | 179 ----- .../mpcontribs_api/old/structures/__init__.py | 0 .../mpcontribs_api/old/structures/document.py | 51 -- .../mpcontribs_api/old/structures/views.py | 38 -- .../src/mpcontribs_api/old/tables/__init__.py | 1 - .../src/mpcontribs_api/old/tables/document.py | 62 -- .../src/mpcontribs_api/old/tables/views.py | 75 --- .../old/templates/admin_email.html | 1 - .../old/templates/card_bootstrap.html | 46 -- .../old/templates/card_bulma.html | 60 -- .../old/templates/owner_email.html | 1 - 28 files changed, 3053 deletions(-) delete mode 100644 mpcontribs-api/src/mpcontribs_api/old/__init__.py delete mode 100644 mpcontribs-api/src/mpcontribs_api/old/attachments/__init__.py delete mode 100644 mpcontribs-api/src/mpcontribs_api/old/attachments/document.py delete mode 100644 mpcontribs-api/src/mpcontribs_api/old/attachments/views.py delete mode 100644 mpcontribs-api/src/mpcontribs_api/old/config.py delete mode 100644 mpcontribs-api/src/mpcontribs_api/old/contributions/__init__.py delete mode 100644 mpcontribs-api/src/mpcontribs_api/old/contributions/document.py delete mode 100644 mpcontribs-api/src/mpcontribs_api/old/contributions/formulae.json.gz delete mode 100644 mpcontribs-api/src/mpcontribs_api/old/contributions/generate_formulae.py delete mode 100644 mpcontribs-api/src/mpcontribs_api/old/contributions/views.py delete mode 100644 mpcontribs-api/src/mpcontribs_api/old/core.py delete mode 100644 mpcontribs-api/src/mpcontribs_api/old/dashboard.cfg delete mode 100644 mpcontribs-api/src/mpcontribs_api/old/notebooks/__init__.py delete mode 100644 mpcontribs-api/src/mpcontribs_api/old/notebooks/document.py delete mode 100644 mpcontribs-api/src/mpcontribs_api/old/notebooks/views.py delete mode 100644 mpcontribs-api/src/mpcontribs_api/old/projects/__init__.py delete mode 100644 mpcontribs-api/src/mpcontribs_api/old/projects/document.py delete mode 100644 mpcontribs-api/src/mpcontribs_api/old/projects/views.py delete mode 100644 mpcontribs-api/src/mpcontribs_api/old/structures/__init__.py delete mode 100644 mpcontribs-api/src/mpcontribs_api/old/structures/document.py delete mode 100644 mpcontribs-api/src/mpcontribs_api/old/structures/views.py delete mode 100644 mpcontribs-api/src/mpcontribs_api/old/tables/__init__.py delete mode 100644 mpcontribs-api/src/mpcontribs_api/old/tables/document.py delete mode 100644 mpcontribs-api/src/mpcontribs_api/old/tables/views.py delete mode 100644 mpcontribs-api/src/mpcontribs_api/old/templates/admin_email.html delete mode 100644 mpcontribs-api/src/mpcontribs_api/old/templates/card_bootstrap.html delete mode 100644 mpcontribs-api/src/mpcontribs_api/old/templates/card_bulma.html delete mode 100644 mpcontribs-api/src/mpcontribs_api/old/templates/owner_email.html diff --git a/mpcontribs-api/src/mpcontribs_api/old/__init__.py b/mpcontribs-api/src/mpcontribs_api/old/__init__.py deleted file mode 100644 index 937d821e9b..0000000000 --- a/mpcontribs-api/src/mpcontribs_api/old/__init__.py +++ /dev/null @@ -1,254 +0,0 @@ -"""Flask App for MPContribs API.""" - -import logging -import os -import smtplib -from email.message import EmailMessage -from importlib import import_module -from importlib.metadata import version -from string import punctuation, whitespace - -import flask_mongorest.operators as ops -import requests -from boltons.iterutils import default_enter, remap -from flasgger.base import Swagger -from flask import Flask, current_app, jsonify, request -from flask_compress import Compress -from flask_marshmallow import Marshmallow -from flask_mongoengine import MongoEngine -from flask_mongorest import register_class -from flask_sse import sse -from itsdangerous import URLSafeTimedSerializer -from mongoengine import ValidationError -from mongoengine.base.datastructures import BaseDict -from notebook.gateway.managers import GatewayClient -from notebook.utils import url_path_join -from requests.exceptions import ConnectionError, Timeout -from websocket import create_connection - -try: - __version__ = version("mpcontribs-api") -except Exception: - # package is not installed - pass - -delimiter, max_depth = ".", 7 # = MAX_NESTING + 2 from client -invalidChars = set(punctuation.replace("*", "").replace("|", "") + whitespace) -is_gunicorn = "gunicorn" in os.environ.get("SERVER_SOFTWARE", "") -SMTP_HOST, SMTP_PORT = os.environ.get("SMTP_SERVER", "localhost:587").split(":") - -# NOTE not including Size below (special for arrays) -FILTERS = { - "LONG_STRINGS": [ - ops.Contains, - ops.IContains, - ops.Startswith, - ops.IStartswith, - ops.Endswith, - ops.IEndswith, - ], - "NUMBERS": [ops.Lt, ops.Lte, ops.Gt, ops.Gte, ops.Range], - "DATES": [ops.Before, ops.After], - "OTHERS": [ops.Boolean, ops.Exists], -} -FILTERS["STRINGS"] = [ops.In, ops.Exact, ops.IExact, ops.Ne] + FILTERS["LONG_STRINGS"] -FILTERS["ALL"] = FILTERS["STRINGS"] + FILTERS["NUMBERS"] + FILTERS["DATES"] + FILTERS["OTHERS"] - - -class CustomLoggerAdapter(logging.LoggerAdapter): - def process(self, msg, kwargs): - prefix = self.extra.get("prefix") - return f"[{prefix}] {msg}" if prefix else msg, kwargs - - -def get_logger(name): - logger = logging.getLogger(name) - process = os.environ.get("SUPERVISOR_PROCESS_NAME") - group = os.environ.get("SUPERVISOR_GROUP_NAME") - cfg = {"prefix": f"{group}/{process}"} if process and group else {} - logger.setLevel("DEBUG" if os.environ.get("FLASK_DEBUG") else "INFO") - return CustomLoggerAdapter(logger, cfg) - - -logger = get_logger(__name__) - - -def enter(path, key, value): - if isinstance(value, BaseDict): - return dict(), value.items() - elif isinstance(value, list): - dot_path = delimiter.join(list(path) + [key]) - raise ValidationError(f"lists not allowed ({dot_path})!") - - return default_enter(path, key, value) - - -def valid_key(key): - if not key.isascii(): - raise ValidationError(f"non-ascii character(s) in {key}") - - for char in key: - if char in invalidChars: - raise ValidationError(f"invalid character {char} in {key}") - - if key.count("|") > 1: - raise ValidationError(f"Only one `|` allowed in {key}. Consider nesting.") - - -def visit(path, key, value): - key = key.strip() - - if len(path) + 1 > max_depth: - dot_path = delimiter.join(list(path) + [key]) - raise ValidationError(f"max nesting ({max_depth}) exceeded for {dot_path}") - - valid_key(key) - return key, value - - -def valid_dict(dct): - remap(dct, visit=visit, enter=enter) - - -def send_email(to, subject, html): - msg = EmailMessage() - msg.set_content(html) - msg["Subject"] = subject - msg["From"] = current_app.config["MAIL_DEFAULT_SENDER"] - msg["To"] = to - - # NOTE boto3 SES client can't connect to VPC endpoint yet - with smtplib.SMTP(host=SMTP_HOST, port=int(SMTP_PORT)) as ses_client: - ses_client.starttls() - ses_client.login(os.environ["SMTP_USERNAME"], os.environ["SMTP_PASSWORD"]) - ses_client.send_message(msg) - logger.warning(f"Email with subject `{subject}` sent to `{to}`") - - -def get_collections(db): - """Get list of collections in DB.""" - conn = db.app.extensions["mongoengine"][db]["conn"] - dbname = db.app.config.get("MPCONTRIBS_DB") - return conn[dbname].list_collection_names() - - -def get_resource_as_string(name, charset="utf-8"): - """Http://flask.pocoo.org/snippets/77/.""" - with current_app.open_resource(name) as f: - return f.read().decode(charset) - - -def get_kernel_endpoint(kernel_id=None, ws=False): - gw_client = GatewayClient.instance() - base_url = gw_client.ws_url if ws else gw_client.url - - if not base_url: - raise ConnectionError("base URL for Kernel Gateway not set") - - base_endpoint = url_path_join(base_url, gw_client.kernels_endpoint) - - if isinstance(kernel_id, str) and kernel_id: - return url_path_join(base_endpoint, kernel_id) - - return base_endpoint - - -def create_kernel_connection(kernel_id): - url = get_kernel_endpoint(kernel_id, ws=True) + "/channels" - return create_connection(url, skip_utf8_validation=True) - - -def get_kernels(): - """Retrieve list of kernels from KernelGateway service.""" - try: - r = requests.get(get_kernel_endpoint(), timeout=2) - except ConnectionError, Timeout: - logger.warning("Kernel Gateway NOT AVAILABLE") - return None - - response = r.json() - nkernels = 3 # reserve 3 kernels for each deployment - idx = int(os.environ.get("DEPLOYMENT", 1)) - - if len(response) < nkernels * (idx + 1): - logger.error("NOT ENOUGH KERNELS AVAILABLE") - return None - - return {kernel["id"]: None for kernel in response[idx : idx + 3]} - - -def get_consumer(): - groups = request.headers.get("X-Authenticated-Groups", "").split(",") - groups += request.headers.get("X-Consumer-Groups", "").split(",") - return { - "username": request.headers.get("X-Consumer-Username"), - "apikey": request.headers.get("X-Consumer-Custom-Id"), - "groups": ",".join(set(groups)), - } - - -def create_app(): - """Create flask app.""" - app = Flask(__name__) - app.config.from_pyfile("config.py", silent=True) - app.config["USTS"] = URLSafeTimedSerializer(app.secret_key) - app.jinja_env.globals["get_resource_as_string"] = get_resource_as_string - app.jinja_env.lstrip_blocks = True - app.jinja_env.trim_blocks = True - app.json.sort_keys = False - MPCONTRIBS_API_HOST = app.config.get("MPCONTRIBS_API_HOST") - app.config["TEMPLATE"]["schemes"] = ["http"] if app.debug else ["https"] - logger.info("database: " + app.config["MPCONTRIBS_DB"]) - Compress(app) - Marshmallow(app) - MongoEngine(app) - Swagger(app, template=app.config.get("TEMPLATE")) - app.kernels = get_kernels() - - # NOTE: hard-code to avoid pre-generating for new deployment - # collections = get_collections(db) - collections = [ - "projects", - "contributions", - "tables", - "attachments", - "structures", - "notebooks", - ] - - for collection in collections: - module_path = ".".join(["mpcontribs", "api", collection, "views"]) - try: - module = import_module(module_path) - except ModuleNotFoundError as ex: - logger.error(f"API module {module_path}: {ex}") - continue - - try: - blueprint = getattr(module, collection) - app.register_blueprint(blueprint, url_prefix="/" + collection) - klass = getattr(module, collection.capitalize() + "View") - register_class(app, klass, name=collection) - logger.info(f"{collection} registered") - except AttributeError as ex: - logger.error(f"Failed to register {module_path}: {collection} {ex}") - - if getattr(app, "kernels", None): - from mpcontribs.api.notebooks.views import rq - - rq.init_app(app) - - def healthcheck(): - return jsonify({"version": app.config["VERSION"]}) - - if is_gunicorn and MPCONTRIBS_API_HOST: - app.register_blueprint(sse, url_prefix="/stream") - app.add_url_rule("/healthcheck", view_func=healthcheck) - - @app.after_request - def add_header(response): - response.headers["X-Consumer-Id"] = request.headers.get("X-Consumer-Id") - return response - - logger.info("app created.") - return app diff --git a/mpcontribs-api/src/mpcontribs_api/old/attachments/__init__.py b/mpcontribs-api/src/mpcontribs_api/old/attachments/__init__.py deleted file mode 100644 index dc0093eef0..0000000000 --- a/mpcontribs-api/src/mpcontribs_api/old/attachments/__init__.py +++ /dev/null @@ -1 +0,0 @@ -"""Document and views for attachments collection.""" diff --git a/mpcontribs-api/src/mpcontribs_api/old/attachments/document.py b/mpcontribs-api/src/mpcontribs_api/old/attachments/document.py deleted file mode 100644 index 6e4c8e89e4..0000000000 --- a/mpcontribs-api/src/mpcontribs_api/old/attachments/document.py +++ /dev/null @@ -1,87 +0,0 @@ -import binascii -import os -from base64 import b64decode, b64encode - -import boto3 -from filetype.types.archive import Gz -from filetype.types.image import Gif, Jpeg, Png, Tiff -from flask import request -from flask_mongoengine.documents import DynamicDocument -from mongoengine import ValidationError, signals -from mongoengine.fields import StringField -from mongoengine.queryset.manager import queryset_manager -from mpcontribs.api.contributions.document import COMPONENTS, get_md5, get_resource - -MAX_BYTES = 2.4 * 1024 * 1024 -BUCKET = os.environ.get("S3_ATTACHMENTS_BUCKET", "mpcontribs-attachments") -S3_ATTACHMENTS_URL = f"https://{BUCKET}.s3.amazonaws.com" -SUPPORTED_FILETYPES = (Gz, Jpeg, Png, Gif, Tiff) -SUPPORTED_MIMES = [t().mime for t in SUPPORTED_FILETYPES] - -s3_client = boto3.client("s3") - - -class Attachments(DynamicDocument): - name = StringField(required=True, help_text="file name") - md5 = StringField(regex=r"^[a-z0-9]{32}$", unique=True, help_text="md5 sum") - mime = StringField(required=True, choices=SUPPORTED_MIMES, help_text="attachment mime type") - content = StringField(required=True, help_text="base64-encoded attachment content") - meta = {"collection": "attachments", "indexes": ["name", "mime", "md5"]} - - @queryset_manager - def objects(doc_cls, queryset): - return queryset.only("name", "md5", "mime") - - @classmethod - def post_init(cls, sender, document, **kwargs): - if document.id and document._data.get("content"): - res = get_resource("attachments") - requested_fields = res.get_requested_fields(params=request.args) - - if "content" in requested_fields: - if not document.md5: - # document.reload("md5") # TODO AttributeError: _changed_fields - raise ValueError("Please also request md5 field to retrieve attachment content!") - - retr = s3_client.get_object(Bucket=BUCKET, Key=document.md5) - document.content = b64encode(retr["Body"].read()).decode("utf-8") - - @classmethod - def pre_delete(cls, sender, document, **kwargs): - s3_client.delete_object(Bucket=BUCKET, Key=document.md5) - - @classmethod - def pre_save_post_validation(cls, sender, document, **kwargs): - if document.md5: - return # attachment already cross-referenced to existing one - - # b64 decode - try: - content = b64decode(document.content, validate=True) - except binascii.Error: - raise ValidationError(f"Attachment {document.name} not base64 encoded!") - - # check size - size = len(content) - - if size > MAX_BYTES: - raise ValidationError(f"Attachment {document.name} too large ({size} > {MAX_BYTES})!") - - # md5 - resource = get_resource("attachments") - document.md5 = get_md5(resource, document, COMPONENTS["attachments"]) - - # save to S3 and unset content - s3_client.put_object( - Bucket=BUCKET, - Key=document.md5, - ContentType=document.mime, - Metadata={"name": document.name}, - Body=content, - ) - document.content = str(size) # set to something useful to distinguish in post_init - - -signals.post_init.connect(Attachments.post_init, sender=Attachments) -signals.pre_delete.connect(Attachments.pre_delete, sender=Attachments) -signals.pre_save_post_validation.connect(Attachments.pre_save_post_validation, sender=Attachments) diff --git a/mpcontribs-api/src/mpcontribs_api/old/attachments/views.py b/mpcontribs-api/src/mpcontribs_api/old/attachments/views.py deleted file mode 100644 index bf4f8e20f6..0000000000 --- a/mpcontribs-api/src/mpcontribs_api/old/attachments/views.py +++ /dev/null @@ -1,38 +0,0 @@ -import os - -import flask_mongorest -from flask import Blueprint -from flask_mongorest import operators as ops -from flask_mongorest.methods import BulkFetch, Download, Fetch -from flask_mongorest.resources import Resource -from mpcontribs.api import FILTERS -from mpcontribs.api.attachments.document import Attachments -from mpcontribs.api.core import SwaggerView - -templates = os.path.join(os.path.dirname(flask_mongorest.__file__), "templates") -attachments = Blueprint("attachments", __name__, template_folder=templates) - - -class AttachmentsResource(Resource): - document = Attachments - filters = { - "id": [ops.In, ops.Exact], - "md5": [ops.In, ops.Exact], - "name": FILTERS["STRINGS"], - "mime": FILTERS["STRINGS"], - } - fields = ["id", "name", "mime", "md5"] - allowed_ordering = ["name", "mime"] - paginate = True - default_limit = 10 - max_limit = 100 - download_formats = ["json", "csv"] - - @staticmethod - def get_optional_fields(): - return ["content"] - - -class AttachmentsView(SwaggerView): - resource = AttachmentsResource - methods = [Fetch, BulkFetch, Download] diff --git a/mpcontribs-api/src/mpcontribs_api/old/config.py b/mpcontribs-api/src/mpcontribs_api/old/config.py deleted file mode 100644 index 52a569ce94..0000000000 --- a/mpcontribs-api/src/mpcontribs_api/old/config.py +++ /dev/null @@ -1,125 +0,0 @@ -"""Configuration module for MPContribs Flask API.""" - -import gzip -import json -import os - -from mpcontribs.api import __version__ - -formulae_path = os.path.join(os.path.dirname(__file__), "contributions", "formulae.json.gz") - -with gzip.open(formulae_path) as f: - FORMULAE = json.load(f) - -VERSION = __version__ - -JSON_ADD_STATUS = False -SECRET_KEY = "super-secret" # TODO in local prod config - -MAIL_DEFAULT_SENDER = os.environ.get("MAIL_DEFAULT_SENDER") -MPCONTRIBS_DB = os.environ.get("MPCONTRIBS_DB_NAME", "mpcontribs") -MPCONTRIBS_MONGO_HOST = os.environ.get("MPCONTRIBS_MONGO_HOST") -MPCONTRIBS_API_HOST = os.environ.get("MPCONTRIBS_API_HOST") -MONGODB_SETTINGS = { - # Changed in version 3.9: retryWrites now defaults to True. - "host": f"mongodb+srv://{MPCONTRIBS_MONGO_HOST}/{MPCONTRIBS_DB}", - "connect": False, - "db": MPCONTRIBS_DB, - "compressors": ["snappy", "zstd", "zlib"], -} -REDIS_ADDRESS = os.environ.get("REDIS_ADDRESS", "redis") -REDIS_URL = RQ_REDIS_URL = RQ_DASHBOARD_REDIS_URL = f"redis://{REDIS_ADDRESS}" -DOC_DIR = os.path.join(os.path.dirname(__file__), f"swagger-{MPCONTRIBS_DB}") - -SWAGGER = { - "swagger_ui_bundle_js": "//unpkg.com/swagger-ui-dist@3/swagger-ui-bundle.js", - "swagger_ui_standalone_preset_js": "//unpkg.com/swagger-ui-dist@3/swagger-ui-standalone-preset.js", - "jquery_js": "//unpkg.com/jquery@2.2.4/dist/jquery.min.js", - "swagger_ui_css": "//unpkg.com/swagger-ui-dist@3/swagger-ui.css", - "uiversion": 3, - "hide_top_bar": True, - "doc_expansion": "none", - "doc_dir": DOC_DIR, - "specs": [ - { - "endpoint": "apispec", - "route": "/apispec.json", - "rule_filter": lambda rule: True, # all in - "model_filter": lambda tag: True, # all in - } - ], - "specs_route": "/", -} - -TEMPLATE = { - "swagger": "2.0", - "info": { - "title": "MPContribs API", - "description": "Operations to contribute, update and retrieve materials data on Materials Project", - "termsOfService": "https://materialsproject.org/terms", - "version": VERSION, - "contact": { - "name": "MPContribs", - "email": "contribs@materialsproject.org", - "url": "https://mpcontribs.org", - }, - "license": { - "name": "Creative Commons Attribution 4.0 International License", - "url": "https://creativecommons.org/licenses/by/4.0/", - }, - }, - "tags": [ - { - "name": "projects", - "description": "contain provenance information about contributed datasets. \ - Deleting projects will also delete all contributions including tables, structures, attachments, notebooks \ - and cards for the project. Only users who have been added to a project can update its contents. While \ - unpublished, only users on the project can retrieve its data or view it on the \ - Portal. Making a project public does not automatically publish all \ - its contributions, tables, attachments, and structures. These are separately set to public individually or in bulk." - "", - }, - { - "name": "contributions", - "description": "contain simple hierarchical data which will show up as cards on the MP details \ - page for MP material(s). Tables (rows and columns), structures, and attachments can be added to a \ - contribution. Each contribution uses `mp-id` or composition as identifier to associate its data with the \ - according entries on MP. Only admins or users on the project can create, update or delete contributions, and \ - while unpublished, retrieve its data or view it on the Portal. \ - Contribution components (tables, structures, and attachments) are deleted along with a contribution.", - }, - { - "name": "structures", - "description": 'are \ - pymatgen structures which \ - can be added to a contribution.', - }, - { - "name": "tables", - "description": 'are simple spreadsheet-type tables with columns and rows saved as Pandas \ - DataFrames \ - which can be added to a contribution.', - }, - { - "name": "attachments", - "description": "are files saved as objects in AWS S3 and not accessible for querying (only retrieval) \ - which can be added to a contribution.", - }, - { - "name": "notebooks", - "description": 'are Jupyter \ - notebook \ - documents generated and saved when a contribution is saved. They form the basis for Contribution \ - Details Pages on the Portal.', - }, - ], - "securityDefinitions": { - "ApiKeyAuth": { - "description": "MP API key to authorize requests", - "name": "X-API-KEY", - "in": "header", - "type": "apiKey", - } - }, - "security": [{"ApiKeyAuth": []}], -} diff --git a/mpcontribs-api/src/mpcontribs_api/old/contributions/__init__.py b/mpcontribs-api/src/mpcontribs_api/old/contributions/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/mpcontribs-api/src/mpcontribs_api/old/contributions/document.py b/mpcontribs-api/src/mpcontribs_api/old/contributions/document.py deleted file mode 100644 index 0f3c3870fb..0000000000 --- a/mpcontribs-api/src/mpcontribs_api/old/contributions/document.py +++ /dev/null @@ -1,323 +0,0 @@ -import itertools -import json -from datetime import datetime -from decimal import Decimal -from hashlib import md5 -from importlib import import_module -from itertools import permutations -from math import isnan - -from atlasq import AtlasManager, AtlasQ -from boltons.iterutils import remap -from bson.dbref import DBRef -from fastnumbers import isfloat -from flask import current_app -from mongoengine import CASCADE, DynamicDocument, signals -from mongoengine.fields import ( - BooleanField, - DateTimeField, - DictField, - LazyReferenceField, - ListField, - ReferenceField, - StringField, -) -from mongoengine.queryset.manager import queryset_manager -from mpcontribs.api import delimiter, enter, valid_dict -from pint import UnitRegistry -from pint.errors import DimensionalityError -from pymatgen.core import Composition, Element -from uncertainties import ufloat_fromstr - -quantity_keys = {"display", "value", "error", "unit"} -max_dgts = 6 -ureg = UnitRegistry( - autoconvert_offset_to_baseunit=True, - preprocessors=[ - lambda s: s.replace("%%", " permille "), - lambda s: s.replace("%", " percent "), - ], -) -ureg.formatter.default_format = "~,P" - -if "percent" not in ureg: - # percent is native in pint >= 0.21 - ureg.define("percent = 0.01 = %") -if "permille" not in ureg: - # permille is native in pint >= 0.24.2 - ureg.define("permille = 0.001 = ‰ = %%") -if "ppm" not in ureg: - # ppm is native in pint >= 0.21 - ureg.define("ppm = 1e-6") -ureg.define("ppb = 1e-9") -ureg.define("atom = 1") -ureg.define("bohr_magneton = e * hbar / (2 * m_e) = µᵇ = µ_B = mu_B") -ureg.define("electron_mass = 9.1093837015e-31 kg = mₑ = m_e") -ureg.define("sccm = cm³/min") - -COMPONENTS = { - "structures": ["lattice", "sites", "charge"], - "tables": ["index", "columns", "data"], - "attachments": ["mime", "content"], -} - - -def grouper(n, iterable): - it = iter(iterable) - while True: - chunk = tuple(itertools.islice(it, n)) - if not chunk: - return - yield chunk - - -def format_cell(cell): - cell = cell.strip() - if not cell or cell.count(" ") > 1: - return cell - - q = get_quantity(cell) - if not q or isnan(q.magnitude.nominal_value): - return cell - - q = truncate_digits(q) - try: - return str(q.magnitude.nominal_value) if isnan(q.magnitude.std_dev) else str(q) - except Exception: - return cell - - -def new_error_units(measurement, quantity): - if quantity.units == measurement.value.units: - return measurement - - error = measurement.error.to(quantity.units) - return ureg.Measurement(quantity, error) - - -def get_quantity(s): - # 5, 5 eV, 5+/-1 eV, 5(1) eV - # set uncertainty to nan if not provided - parts = s.split() - parts += [None] * (2 - len(parts)) - if isfloat(parts[0]): - parts[0] += "+/-nan" - - try: - parts[0] = ufloat_fromstr(parts[0]) - return ureg.Measurement(*parts) - except ValueError: - return None - - -def truncate_digits(q): - if isnan(q.magnitude.nominal_value): - return q - - v = Decimal(str(q.magnitude.nominal_value)) - vt = v.as_tuple() - - if vt.exponent >= 0: - return q - - dgts = len(vt.digits) - dgts = max_dgts if dgts > max_dgts else dgts - s = f"{v:.{dgts}g}" - if not isnan(q.magnitude.std_dev): - s += f"+/-{q.magnitude.std_dev:.{dgts}g}" - - if q.units: - s += f" {q.units}" - - return get_quantity(s) - - -def get_resource(component): - klass = component.capitalize() - vmodule = import_module(f"mpcontribs.api.{component}.views") - Resource = getattr(vmodule, f"{klass}Resource") - return Resource() - - -def get_md5(resource, obj, fields): - d = resource.serialize(obj, fields=fields) - s = json.dumps(d, sort_keys=True).encode("utf-8") - return md5(s).hexdigest() - - -class Contributions(DynamicDocument): - project = LazyReferenceField("Projects", required=True, passthrough=True, reverse_delete_rule=CASCADE) - identifier = StringField(required=True, help_text="material/composition identifier") - formula = StringField(help_text="formula (set dynamically if not provided)") - is_public = BooleanField(required=True, default=True, help_text="public/private contribution") - last_modified = DateTimeField(required=True, default=datetime.utcnow, help_text="time of last modification") - needs_build = BooleanField(default=True, help_text="needs notebook build?") - data = DictField( - default=dict, - validation=valid_dict, - pullout_key="display", - help_text="simple free-form data", - ) - structures = ListField(ReferenceField("Structures", null=True), default=list, max_length=10) - tables = ListField(ReferenceField("Tables", null=True), default=list, max_length=10) - attachments = ListField(ReferenceField("Attachments", null=True), default=list, max_length=10) - notebook = ReferenceField("Notebooks") - atlas = AtlasManager("formula_autocomplete") - meta = { - "collection": "contributions", - "indexes": [ - "project", - "identifier", - "formula", - "is_public", - "last_modified", - "needs_build", - "notebook", - {"fields": [(r"data.$**", 1)]}, - # can only use wildcardProjection option with wildcard index on all document fields - {"fields": [(r"$**", 1)], "wildcardProjection": {"project": 1}}, - ] - + list(COMPONENTS.keys()), - } - - @queryset_manager - def objects(doc_cls, queryset): - return queryset.no_dereference().only( - "project", - "identifier", - "formula", - "is_public", - "last_modified", - "needs_build", - ) - - @classmethod - def atlas_filter(cls, term): - try: - comp = Composition(term) - except Exception: - raise ValueError(f"{term} is not a valid composition") - - try: - for element in comp.elements: - Element(element) - except Exception: - raise ValueError(f"{element} not a valid element") - - ind_str = [] - - if len(comp) == 1: - d = comp.get_integer_formula_and_factor() - ind_str.append(d[0] + str(int(d[1])) if d[1] != 1 else d[0]) - else: - for i, j in comp.reduced_composition.items(): - ind_str.append(i.name + str(int(j)) if j != 1 else i.name) - - final_terms = ["".join(entry) for entry in permutations(ind_str)] - return AtlasQ(formula=final_terms[0]) # TODO formula__in=final_terms - - @classmethod - def post_init(cls, sender, document, **kwargs): - # replace existing components with according ObjectIds - for component, fields in COMPONENTS.items(): - lst = document._data.get(component) - if lst and lst[0].id is None: # id is None for incoming POST - resource = get_resource(component) - for i, o in enumerate(lst): - digest = get_md5(resource, o, fields) - objs = resource.document.objects(md5=digest) - exclude = list(resource.document._fields.keys()) - obj = objs.exclude(*exclude).only("id").first() - if obj: - lst[i] = obj.to_dbref() - - @classmethod - def pre_save_post_validation(cls, sender, document, **kwargs): - # set formula field - if hasattr(document, "formula") and not document.formula: - formulae = current_app.config["FORMULAE"] - document.formula = formulae.get(document.identifier, document.identifier) - - # project is LazyReferenceField & load columns due to custom queryset manager - project = document.project.fetch().reload("columns") - columns = {col.path: col for col in project.columns} - - # run data through Pint Quantities and save as dicts - def make_quantities(path, key, value): - key = key.strip() - if key in quantity_keys or not isinstance(value, (str, int, float)): - return key, value - - # can't be a quantity if contains 2+ spaces - str_value = str(value).strip() - if str_value.count(" ") > 1: - return key, value - - # don't parse if column.unit indicates string type - field = delimiter.join(["data"] + list(path) + [key]) - if field in columns: - if columns[field].unit == "NaN": - return key, str_value - - # parse as quantity - q = get_quantity(str_value) - if q is None or not q._magnitude: - return key, value - - # silently ignore "nan" - if isnan(q.magnitude.nominal_value): - return False - - # ensure that the same units are used across contributions - if field in columns: - column = columns[field] - if column.unit != str(q.value.units): - try: - qq = q.value.to(column.unit) - q = new_error_units(q, qq) - except DimensionalityError: - raise ValueError(f"Can't convert [{q.units}] to [{column.unit}] for {field}!") - else: - # try compact representation - qq = q.value.to_compact() - q = new_error_units(q, qq) - - # reduce dimensionality if possible - if not q.check(0): - qq = q.value.to_reduced_units() - q = new_error_units(q, qq) - - # significant digits - q = truncate_digits(q) - - # return new value dict - display = str(q.value) if isnan(q.magnitude.std_dev) else str(q) - value = { - "display": display, - "value": q.magnitude.nominal_value, - "error": q.magnitude.std_dev, - "unit": str(q.units), - } - return key, value - - document.data = remap(document.data, visit=make_quantities, enter=enter) - document.last_modified = datetime.utcnow() - document.needs_build = True - - @classmethod - def pre_delete(cls, sender, document, **kwargs): - args = list(COMPONENTS.keys()) - document.reload(*args) - - for component in COMPONENTS.keys(): - # check if other contributions exist before deletion - # and make sure component still exists (getattr converts ref to object) - for obj in getattr(document, component): - q = {component: obj.id} - if sender.objects(**q).count() < 2 and not isinstance(obj, DBRef): - obj.delete() - - -signals.post_init.connect(Contributions.post_init, sender=Contributions) -signals.pre_save_post_validation.connect(Contributions.pre_save_post_validation, sender=Contributions) -signals.pre_delete.connect(Contributions.pre_delete, sender=Contributions) diff --git a/mpcontribs-api/src/mpcontribs_api/old/contributions/formulae.json.gz b/mpcontribs-api/src/mpcontribs_api/old/contributions/formulae.json.gz deleted file mode 100644 index 5f6945aaa0..0000000000 --- a/mpcontribs-api/src/mpcontribs_api/old/contributions/formulae.json.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:358326e2613ac16500283f85c3cc3780567a568cc3efa5431bde7e50f1978135 -size 5418887 diff --git a/mpcontribs-api/src/mpcontribs_api/old/contributions/generate_formulae.py b/mpcontribs-api/src/mpcontribs_api/old/contributions/generate_formulae.py deleted file mode 100644 index 8ddd8c04d2..0000000000 --- a/mpcontribs-api/src/mpcontribs_api/old/contributions/generate_formulae.py +++ /dev/null @@ -1,15 +0,0 @@ -import json -import os - -from pymatgen.ext.matproj import MPRester - -data = {} - -with MPRester() as mpr: - for _i, d in enumerate(mpr.query(criteria={}, properties=["task_ids", "pretty_formula"])): - for task_id in d["task_ids"]: - data[task_id] = d["pretty_formula"] - -out = os.path.join(os.path.dirname(__file__), "formulae.json") -with open(out, "w") as f: - json.dump(data, f) diff --git a/mpcontribs-api/src/mpcontribs_api/old/contributions/views.py b/mpcontribs-api/src/mpcontribs_api/old/contributions/views.py deleted file mode 100644 index 4b99248f00..0000000000 --- a/mpcontribs-api/src/mpcontribs_api/old/contributions/views.py +++ /dev/null @@ -1,224 +0,0 @@ -import os -import re -from itertools import permutations - -import flask_mongorest -from boltons.iterutils import remap -from css_html_js_minify import html_minify -from flask import Blueprint, abort, jsonify, render_template, request -from flask_mongorest import operators as ops -from flask_mongorest.exceptions import UnknownFieldError -from flask_mongorest.methods import ( - BulkCreate, - BulkDelete, - BulkFetch, - BulkUpdate, - Delete, - Download, - Fetch, - Update, -) -from flask_mongorest.resources import Resource -from json2html import Json2Html -from mpcontribs.api import FILTERS, enter -from mpcontribs.api.attachments.views import AttachmentsResource -from mpcontribs.api.contributions.document import Contributions -from mpcontribs.api.core import SwaggerView -from mpcontribs.api.notebooks.views import NotebooksResource -from mpcontribs.api.structures.views import StructuresResource -from mpcontribs.api.tables.views import TablesResource -from pymatgen.core.composition import Composition, CompositionError -from werkzeug.exceptions import Unauthorized - -templates = os.path.join(os.path.dirname(flask_mongorest.__file__), "templates") -contributions = Blueprint("contributions", __name__, template_folder=templates) -exclude = r'[^$.\s_~`^&(){}[\]\\;\'"/]' -j2h = Json2Html() -MAX_UNAPPROVED_CONTRIBS = 500 - - -def visit(path, key, value): - if isinstance(value, dict) and "display" in value: - return key, value["display"] - return True - - -class ContributionsResource(Resource): - document = Contributions - related_resources = { - "structures": StructuresResource, - "tables": TablesResource, - "attachments": AttachmentsResource, - "notebook": NotebooksResource, - } - save_related_fields = ["structures", "tables", "attachments", "notebook"] - filters = { - "id": [ops.In, ops.Exact], - "project": FILTERS["STRINGS"], - "identifier": FILTERS["STRINGS"], - "formula": FILTERS["STRINGS"], - "is_public": [ops.Boolean], - "last_modified": FILTERS["DATES"], - "needs_build": [ops.Boolean], - re.compile(r"^data__((?!__).)*$"): FILTERS["ALL"], - "structures": [ops.Size], - "tables": [ops.Size], - "attachments": [ops.Size], - } - fields = [ - "id", - "project", - "identifier", - "formula", - "is_public", - "last_modified", - "needs_build", - ] - allowed_ordering = [ - "id", - "project", - "identifier", - "formula", - "is_public", - "last_modified", - "needs_build", - re.compile(r"^data(__(" + exclude + ")+){1,4}$"), - ] - paginate = True - default_limit = 200 - max_limit = 1500 - download_formats = ["json", "csv"] - - @staticmethod - def get_optional_fields(): - return [ - "data", - "structures", - "tables", - "attachments", - "notebook", - "card_bootstrap", - "card_bulma", - ] - - def value_for_field(self, obj, field): - if field.startswith("card_"): - _, fmt = field.rsplit("_", 1) - if fmt not in ["bootstrap", "bulma"]: - raise UnknownFieldError - - if obj.project is None or not obj.data: - # try data reload to account for custom queryset manager - obj.reload("id", "project", "data") - - # obj.project is LazyReference & Projects uses custom queryset manager - DocType = obj.project.document_type - exclude = list(DocType._fields.keys()) - only = ["title", "references", "description", "authors"] - pk = obj.project.pk - project = DocType.objects.exclude(*exclude).only(*only).with_id(pk) - ctx = { - "cid": str(obj.id), - "title": project.title, - "references": project.references[:5], - "landing_page": f"/projects/{project.id}/", - "more": f"/contributions/{obj.id}", - } - ctx["descriptions"] = project.description.strip().split(".", 1) - authors = [a.strip() for a in project.authors.split(",") if a] - ctx["authors"] = {"main": authors[0], "etal": authors[1:]} - ctx["data"] = j2h.convert( - json=remap(obj.data, visit=visit, enter=enter), - table_attributes='class="table is-narrow is-fullwidth has-background-light"', - ) - return html_minify(render_template(f"card_{fmt}.html", **ctx)) - else: - raise UnknownFieldError - - -class ContributionsView(SwaggerView): - resource = ContributionsResource - methods = [ - Fetch, - Delete, - Update, - BulkFetch, - BulkCreate, - BulkUpdate, - BulkDelete, - Download, - ] - - def has_add_permission(self, req, obj): - # limit the number of contributions for unapproved projects - if not self.is_admin_or_project_user(req, obj): - return False - - if not obj.project.is_approved: - nr_contribs = Contributions.objects(project=obj.project.id).count() - if nr_contribs > MAX_UNAPPROVED_CONTRIBS: - msg = f"Reached {MAX_UNAPPROVED_CONTRIBS} for unapproved project {obj.project.id}." - msg += " Please reach out to contribs@materialsproject.org." - raise Unauthorized(f"Can't add {obj.identifier}: {msg}") - - query = dict(project=obj.project.id, identifier=obj.identifier) - if obj.project.unique_identifiers and Contributions.objects(**query).count(): - raise Unauthorized(f"{obj.identifier} already added for {obj.project.id}") - - return True - - -@contributions.route("/search") -def search(): - formula = request.args.get("formula") - if not formula: - abort(404, description="Missing formula param.") - - try: - comp = Composition(formula) - except CompositionError, ValueError: - abort(400, description="Invalid formula provided.") - - ind_str = [] - - if len(comp) == 1: - d = comp.get_integer_formula_and_factor() - ind_str.append(d[0] + str(int(d[1])) if d[1] != 1 else d[0]) - else: - for i, j in comp.reduced_composition.items(): - ind_str.append(i.name + str(int(j)) if j != 1 else i.name) - - final_terms = ["".join(entry) for entry in permutations(ind_str)] - limit = request.args.get("limit", ContributionsResource.default_limit) - - pipeline = [ - { - "$search": { - "index": "formula_autocomplete", - "text": {"path": "formula", "query": final_terms}, - } - }, - {"$project": {"formula": 1, "length": {"$strLenCP": "$formula"}, "project": 1}}, - {"$match": {"length": {"$gte": len(final_terms[0])}}}, - {"$limit": limit}, - {"$sort": {"length": 1}}, - ] - - results = [] - - try: - for contrib in Contributions.objects().aggregate(pipeline, maxTimeMS=15000): - results.append( - { - "id": str(contrib["_id"]), - "formula": contrib["formula"], - "project": contrib["project"], - } - ) - except Exception: - abort( - 500, - description="Can't complete search. Please try a different formula or try again later.", - ) - - return jsonify(results) diff --git a/mpcontribs-api/src/mpcontribs_api/old/core.py b/mpcontribs-api/src/mpcontribs_api/old/core.py deleted file mode 100644 index 289fd80363..0000000000 --- a/mpcontribs-api/src/mpcontribs_api/old/core.py +++ /dev/null @@ -1,629 +0,0 @@ -import os -from copy import deepcopy -from importlib import import_module -from re import Pattern - -import yaml -from flasgger.marshmallow_apispec import SwaggerView as OriginalSwaggerView -from flasgger.marshmallow_apispec import schema2jsonschema -from flask_mongorest.views import ResourceView -from marshmallow_mongoengine import ModelSchema -from mongoengine.queryset import DoesNotExist -from mongoengine.queryset.visitor import Q -from mpcontribs.api import get_logger, is_gunicorn -from mpcontribs.api.config import DOC_DIR -from werkzeug.exceptions import Unauthorized - -logger = get_logger(__name__) - - -def get_limit_params(resource, method): - default = resource.default_limit - bulk = {"BulkUpdate", "BulkDelete"} - maximum = resource.bulk_update_limit if method in bulk else resource.max_limit - return [ - { - "name": "_skip", - "in": "query", - "type": "integer", - "description": "number of items to skip", - }, - { - "name": "_limit", - "in": "query", - "type": "integer", - "default": default, - "maximum": maximum, - "description": "maximum number of items to return", - }, - { - "name": "page", - "in": "query", - "type": "integer", - "description": "page number to return (in batches of `per_page/_limit`; alternative to `_skip`)", - }, - { - "name": "per_page", - "in": "query", - "type": "integer", - "default": default, - "maximum": maximum, - "description": "maximum number of items to return per page (same as `_limit`)", - }, - ] - - -def get_filter_params(name, filters): - filter_params = [] - is_pattern = isinstance(name, Pattern) - label = name.pattern if is_pattern else name - for op in filters: - if op.op == "exact" and not is_pattern: - name = label - description = f"filter {label}" - else: - suffix = op.suf if hasattr(op, "suf") else op.op - name = f"{label}__{suffix}" - description = f"filter {label} via ${op.op}" - - filter_params.append( - { - "name": name, - "in": "query", - "type": op.typ, - "description": description, - } - ) - if op.typ == "array": - filter_params[-1]["items"] = {"type": "string"} - if hasattr(op, "fmt"): - filter_params[-1]["format"] = op.fmt - - if op.allow_negation: - suffix = "not__" - suffix += op.suf if hasattr(op, "suf") else op.op - name = f"{label}__{suffix}" - description = f"filter {label} via ${op.op}" - param = deepcopy(filter_params[-1]) - param["name"] = name - param["description"] = description - filter_params.append(param) - - return filter_params - - -def get_specs(klass, method, collection): - method_name = method.__name__ if hasattr(method, "__name__") else method - default_response = { - "description": "Error", - "schema": {"type": "object", "properties": {"error": {"type": "string"}}}, - } - id_field = klass.resource.document._meta["id_field"].capitalize() - doc_name = collection[:-1].capitalize() - fields_param = None - if klass.resource.fields is not None: - fields_avail = klass.resource.fields + klass.resource.get_optional_fields() + ["_all"] - description = f"List of fields to include in response ({fields_avail})." - description += " Use dot-notation for nested subfields." - fields_param = { - "name": "_fields", - "in": "query", - "default": klass.resource.fields, - "type": "array", - "items": {"type": "string"}, - "description": description, - } - - field_pagination_params = [] - for field, limits in klass.resource.fields_to_paginate.items(): - field_pagination_params.append( - { - "name": f"{field}_page", - "in": "query", - "default": 1, - "type": "integer", - "description": f"page to retrieve for {field} field", - } - ) - field_pagination_params.append( - { - "name": f"{field}_per_page", - "in": "query", - "default": limits[0], - "maximum": limits[1], - "type": "integer", - "description": f"number of items to retrieve per page for {field} field", - } - ) - - filter_params = [] - if hasattr(klass.resource, "filters"): - for k, v in klass.resource.filters.items(): - filter_params += get_filter_params(k, v) - - order_params = [] - if klass.resource.allowed_ordering: - allowed_ordering = [o.pattern if isinstance(o, Pattern) else o for o in klass.resource.allowed_ordering] - order_params = [ - { - "name": "_sort", - "in": "query", - "type": "string", - "description": f"sort {collection} via {allowed_ordering}. Prepend +/- for asc/desc.", - } - ] - - spec = None - if method_name == "Fetch": - params = [ - { - "name": "pk", - "in": "path", - "type": "string", - "required": True, - "description": f"{collection[:-1]} (primary key)", - } - ] - if fields_param is not None: - params.append(fields_param) - params += field_pagination_params - spec = { - "summary": f"Retrieve a {collection[:-1]}.", - "operationId": f"get{doc_name}By{id_field}", - "parameters": params, - "responses": { - 200: { - "description": f"single {collection} entry", - "schema": {"$ref": f"#/definitions/{klass.schema_name}"}, - }, - "default": default_response, - }, - } - - elif method_name == "BulkFetch": - params = [fields_param] if fields_param is not None else [] - params += field_pagination_params - params += order_params - params += filter_params - schema_props = { - "data": { - "type": "array", - "items": {"$ref": f"#/definitions/{klass.schema_name}"}, - } - } - if klass.resource.paginate: - schema_props["has_more"] = {"type": "boolean"} - schema_props["total_count"] = {"type": "integer"} - schema_props["total_pages"] = {"type": "integer"} - params += get_limit_params(klass.resource, method_name) - spec = { - "summary": f"Filter and retrieve {collection}.", - "operationId": f"query{doc_name}s", - "parameters": params, - "responses": { - 200: { - "description": f"list of {collection}", - "schema": {"type": "object", "properties": schema_props}, - }, - "default": default_response, - }, - } - - elif method_name == "Download": - params = [ - { - "name": "short_mime", - "in": "path", - "type": "string", - "required": True, - "description": "MIME Download Type: gz", - "default": "gz", - }, - { - "name": "format", - "in": "query", - "type": "string", - "required": True, - "description": f"download {collection} in different formats: {klass.resource.download_formats}", - }, - ] - params += [fields_param] if fields_param is not None else [] - params += order_params - params += filter_params - if klass.resource.paginate: - params += get_limit_params(klass.resource, method_name) - spec = { - "summary": f"Filter and download {collection}.", - "operationId": f"download{doc_name}s", - "parameters": params, - "produces": ["application/gzip"], - "responses": { - 200: { - "description": f"{collection} download", - "schema": {"type": "file"}, - }, - "default": default_response, - }, - } - - elif method_name == "Create": - spec = { - "summary": f"Create a new {collection[:-1]}.", - "operationId": f"create{doc_name}", - "parameters": [ - { - "name": f"{collection[:-1]}", - "in": "body", - "description": f"The object to use for {collection[:-1]} creation", - "schema": {"$ref": f"#/definitions/{klass.schema_name}"}, - } - ], - "responses": { - 200: { - "description": f"{collection[:-1]} created", - "schema": {"$ref": f"#/definitions/{klass.schema_name}"}, - }, - "default": default_response, - }, - } - - elif method_name == "BulkCreate": - spec = { - "summary": f"Create new {collection[:-1]}(s).", - "operationId": f"create{doc_name}s", - "parameters": [ - { - "name": f"{collection}", - "in": "body", - "description": f"The objects to use for {collection[:-1]} creation", - "schema": { - "type": "array", - "items": {"$ref": f"#/definitions/{klass.schema_name}"}, - }, - } - ], - "responses": { - 200: { - "description": f"{collection} created", - "schema": { - "type": "object", - "properties": { - "count": {"type": "integer"}, - "data": { - "type": "array", - "items": {"$ref": f"#/definitions/{klass.schema_name}"}, - }, - }, - }, - }, - "default": default_response, - }, - } - - elif method_name == "Update": - spec = { - "summary": f"Update a {collection[:-1]}.", - "operationId": f"update{doc_name}By{id_field}", - "parameters": [ - { - "name": "pk", - "in": "path", - "type": "string", - "required": True, - "description": f"The {collection[:-1]} (primary key) to update", - }, - { - "name": f"{collection[:-1]}", - "in": "body", - "description": f"The object to use for {collection[:-1]} update", - "schema": {"type": "object"}, - }, - ], - "responses": { - 200: { - "description": f"{collection[:-1]} updated", - "schema": {"$ref": f"#/definitions/{klass.schema_name}"}, - }, - "default": default_response, - }, - } - elif method_name == "BulkUpdate": - params = filter_params - params.append( - { - "name": f"{collection}", - "in": "body", - "description": f"The object to use for {collection} bulk update", - "schema": {"type": "object"}, - } - ) - schema_props = {"count": {"type": "integer"}} - if klass.resource.paginate: - schema_props["has_more"] = {"type": "boolean"} - schema_props["total_count"] = {"type": "integer"} - schema_props["total_pages"] = {"type": "integer"} - params += get_limit_params(klass.resource, method_name) - spec = { - "summary": f"Filter and update {collection}.", - "operationId": f"update{doc_name}s", - "parameters": params, - "responses": { - 200: { - "description": f"Number of {collection} updated", - "schema": {"type": "object", "properties": schema_props}, - }, - "default": default_response, - }, - } - - elif method_name == "BulkDelete": - params = filter_params - schema_props = {"count": {"type": "integer"}} - if klass.resource.paginate: - schema_props["has_more"] = {"type": "boolean"} - schema_props["total_count"] = {"type": "integer"} - schema_props["total_pages"] = {"type": "integer"} - params += get_limit_params(klass.resource, method_name) - spec = { - "summary": f"Filter and delete {collection}.", - "operationId": f"delete{doc_name}s", - "parameters": params, - "responses": { - 200: { - "description": f"Number of {collection} deleted", - "schema": {"type": "object", "properties": schema_props}, - }, - "default": default_response, - }, - } - - elif method_name == "Delete": - spec = { - "summary": f"Delete a {collection[:-1]}.", - "operationId": f"delete{doc_name}By{id_field}", - "parameters": [ - { - "name": "pk", - "in": "path", - "type": "string", - "required": True, - "description": f"The {collection[:-1]} (primary key) to delete", - } - ], - "responses": { - 200: {"description": f"{collection[:-1]} deleted"}, - "default": default_response, - }, - } - - return spec - - -class SwaggerView(OriginalSwaggerView, ResourceView): - """A class-based view defining additional methods.""" - - def __init_subclass__(cls, **kwargs): - """Initialize Schema, decorators, definitions, and tags.""" - super().__init_subclass__(**kwargs) - - if not __name__ == cls.__module__: - # e.g.: cls.__module__ = mpcontribs.api.projects.views - views_path = cls.__module__.split(".") - doc_path = ".".join(views_path[:-1] + ["document"]) - cls.tags = [views_path[-2]] - doc_filepath = doc_path.replace(".", os.sep) + ".py" - if os.path.exists(doc_filepath): - cls.doc_name = cls.tags[0].capitalize() - Model = getattr(import_module(doc_path), cls.doc_name) - cls.schema_name = cls.doc_name + "Schema" - cls.Schema = type( - cls.schema_name, - (ModelSchema, object), - { - "Meta": type( - "Meta", - (object,), - dict(model=Model, ordered=True, model_build_obj=False), - ) - }, - ) - cls.definitions = {cls.schema_name: schema2jsonschema(cls.Schema)} - cls.resource.schema = cls.Schema - - # write flask-mongorest swagger specs - for method in cls.methods: - spec = get_specs(cls, method, cls.tags[0]) - if spec: - dir_path = os.path.join(DOC_DIR, cls.tags[0]) - file_path = os.path.join(dir_path, method.__name__ + ".yml") - if not os.path.exists(file_path): - os.makedirs(dir_path, exist_ok=True) - - if is_gunicorn: - with open(file_path, "w") as f: - yaml.dump(spec, f) - logger.debug(f"{cls.tags[0]}.{method.__name__} written to {file_path}") - - def get_groups(self, request): - groups = request.headers.get("X-Authenticated-Groups", "").split(",") - groups += request.headers.get("X-Consumer-Groups", "").split(",") - return set(grp.strip() for grp in groups if grp) - - def is_anonymous(self, request): - if not request.headers.get("X-Consumer-Username", ""): - return True - - is_anonymous = request.headers.get("X-Anonymous-Consumer", False) - if isinstance(is_anonymous, str): - is_anonymous = False if is_anonymous == "false" else True - - return is_anonymous - - def is_external(self, request): - return request.headers.get("X-Forwarded-Host") is not None and not request.headers.get("Origin") - - def is_admin(self, request): - groups = self.get_groups(request) - admin_group = os.environ.get("ADMIN_GROUP", "admin") - return admin_group in groups - - def is_project_user(self, request, obj): - if hasattr(obj, "owner"): - owner = obj.owner - project = obj.name - elif hasattr(obj, "project"): - owner = obj.project.owner - project = obj.project.name - else: - raise Unauthorized(f"Unable to authorize {obj}") - - groups = self.get_groups(request) - username = request.headers.get("X-Consumer-Username") - return project in groups or owner == username - - def is_admin_or_project_user(self, request, obj): - if self.is_anonymous(request): - return False - - if self.is_admin(request): - return True - - return self.is_project_user(request, obj) - - def get_projects(self): - # project is LazyReferenceFields (multiple queries) - module = import_module("mpcontribs.api.projects.document") - Projects = module.Projects - exclude = list(Projects._fields.keys()) - only = ["name", "owner", "is_public", "is_approved"] - return Projects.objects.exclude(*exclude).only(*only) - - def get_projects_filter(self, username, groups, filter_names=None): - projects = self.get_projects() - if filter_names: - projects = projects.filter(name__in=filter_names) - - q = {"private": [], "public": []} - - for project in projects: - if project.owner == username or project.name in groups: - q["private"].append(project.name) - elif project.is_public and project.is_approved: - q["public"].append(project.name) - - # reduced query - qfilter = Q() - if q["private"]: - qfilter |= Q(project__in=q["private"]) - if q["public"]: - qfilter |= Q(project__in=q["public"], is_public=True) - - return qfilter - - def has_read_permission(self, request, qs): - if self.is_admin(request): - return qs # admins can read all entries - - groups = self.get_groups(request) - is_anonymous = self.is_anonymous(request) - is_external = self.is_external(request) - username = request.headers.get("X-Consumer-Username") - approved_public_filter = Q(is_public=True, is_approved=True) - - if request.path.startswith("/projects/"): - # external or internal requests can both read full project info - # anonymous requests can only read public approved projects - if is_anonymous: - return qs.filter(approved_public_filter) - - # authenticated requests can read approved public or accessible non-public projects - qfilter = approved_public_filter | Q(owner=username) - if groups: - qfilter |= Q(name__in=list(groups)) - - return qs.filter(qfilter) - else: - # contributions are set private/public independent from projects - # anonymous requests: - # - external: only meta-data of public contributions in approved public projects - # - internal: full public contributions in approved public projects - # authenticated requests: - # - private contributions in a public project are only accessible to owner/group - # - any contributions in a private project are only accessible to owner/group - component = request.path.split("/")[1] - - if component == "contributions": - q = qs._query - if is_anonymous and is_external: - qs = qs.exclude("data") - - if q and "project" in q and isinstance(q["project"], str): - projects = self.get_projects() - try: - project = projects.get(name=q["project"]) - except DoesNotExist: - return qs.none() - - if project.owner == username or project.name in groups: - return qs - elif project.is_public and project.is_approved: - return qs.filter(is_public=True) - else: - return qs.none() - else: - names = None - if q and "project" in q and "$in" in q["project"]: - names = q.pop("project").pop("$in") - - qfilter = self.get_projects_filter(username, groups, filter_names=names) - return qs.filter(qfilter) - else: - # get component Object IDs for queryset - pk = request.view_args.get("pk") - from mpcontribs.api.contributions.document import get_resource - - resource = get_resource(component) - - def qfilter(qs): - return qs.clone() - - if pk: - ids = [resource.get_object(pk, qfilter=qfilter).id] - else: - ids = [o.id for o in resource.get_objects(qfilter=qfilter)[0]] - - if not ids: - return qs.none() - - # get list of readable contributions and their component Object IDs - module = import_module("mpcontribs.api.contributions.document") - Contributions = module.Contributions - qfilter = self.get_projects_filter(username, groups) - component = component[:-1] if component == "notebooks" else component - qfilter &= Q(**{f"{component}__in": ids}) - contribs = Contributions.objects(qfilter).only(component).limit(len(ids)) - # return new queryset using "ids__in" - readable_ids = ( - [getattr(contrib, component).id for contrib in contribs] - if component == "notebook" - else [dbref.id for contrib in contribs for dbref in getattr(contrib, component) if dbref.id in ids] - ) - if not readable_ids: - return qs.none() - - qs._query_obj = Q(id__in=readable_ids) - # exclude optional fields if anonymous external request - if is_anonymous and is_external: - exclude = resource.get_optional_fields() - qs = qs.exclude(*exclude) - - return qs - - def has_add_permission(self, request, obj): - return self.is_admin_or_project_user(request, obj) - - def has_change_permission(self, request, obj): - return self.is_admin_or_project_user(request, obj) - - def has_delete_permission(self, request, obj): - return self.is_admin_or_project_user(request, obj) diff --git a/mpcontribs-api/src/mpcontribs_api/old/dashboard.cfg b/mpcontribs-api/src/mpcontribs_api/old/dashboard.cfg deleted file mode 100644 index ef84c47162..0000000000 --- a/mpcontribs-api/src/mpcontribs_api/old/dashboard.cfg +++ /dev/null @@ -1,7 +0,0 @@ -[dashboard] -SAMPLING_PERIOD=20 -MONITOR_LEVEL=3 -ENABLE_LOGGING=True - -[visualization] -TIMEZONE=America/New_York diff --git a/mpcontribs-api/src/mpcontribs_api/old/notebooks/__init__.py b/mpcontribs-api/src/mpcontribs_api/old/notebooks/__init__.py deleted file mode 100644 index 85f493d150..0000000000 --- a/mpcontribs-api/src/mpcontribs_api/old/notebooks/__init__.py +++ /dev/null @@ -1,65 +0,0 @@ -from uuid import uuid1 - -from flask import current_app -from mpcontribs.api import create_kernel_connection, get_logger -from tornado.escape import json_decode, json_encode - -logger = get_logger(__name__) - - -def run_cells(kernel_id, cid, cells): - logger.debug(f"running {cid} on {kernel_id}") - ws = create_kernel_connection(kernel_id) - outputs = {} - - for idx, cell in enumerate(cells): - if cell["cell_type"] == "code": - ws.send( - json_encode( - { - "header": { - "username": cid, - "version": "5.3", - "session": "", - "msg_id": f"{cid}-{idx}-{uuid1()}", - "msg_type": "execute_request", - }, - "parent_header": {}, - "channel": "shell", - "content": { - "code": cell["source"], - "silent": False, - "store_history": False, - "user_expressions": {}, - "allow_stdin": False, - "stop_on_error": True, - }, - "metadata": {}, - "buffers": [], - } - ) - ) - - outputs[idx] = [] - status = None - while status is None or status == "busy" or not len(outputs[idx]): - msg = ws.recv() - msg = json_decode(msg) - msg_type = msg["msg_type"] - if msg_type == "status": - status = msg["content"]["execution_state"] - elif msg_type in ["stream", "display_data", "execute_result"]: - # display_data/execute_result required fields: - # "output_type", "data", "metadata" - # stream required fields: "output_type", "name", "text" - output = msg["content"] - output.pop("transient", None) - output["output_type"] = msg_type - msg_idx = msg["parent_header"]["msg_id"].split("-")[1] - outputs[int(msg_idx)].append(output) - elif msg_type == "error": - tb = msg["content"]["traceback"] - raise ValueError(tb) - - ws.close() - return outputs diff --git a/mpcontribs-api/src/mpcontribs_api/old/notebooks/document.py b/mpcontribs-api/src/mpcontribs_api/old/notebooks/document.py deleted file mode 100644 index dd112f19f2..0000000000 --- a/mpcontribs-api/src/mpcontribs_api/old/notebooks/document.py +++ /dev/null @@ -1,106 +0,0 @@ -import hashlib -import os -from base64 import b64decode, b64encode -from io import BytesIO - -import boto3 -from flask_mongoengine.documents import Document -from mongoengine import signals -from mongoengine.fields import DictField, IntField, ListField, StringField -from mongoengine.queryset.manager import queryset_manager - -BUCKET = os.environ.get("S3_IMAGES_BUCKET", "mpcontribs-images") -S3_DOWNLOAD_URL = f"https://{BUCKET}.s3.amazonaws.com" -s3_client = boto3.client("s3") - - -class Kernelspec(DictField): - name = StringField(required=True, default="python3") - display_name = StringField(required=True, default="Python 3") - language = StringField() - - -class CodemirrorMode(DictField): - name = StringField(required=True, default="ipython") - version = IntField(required=True, default=3) - - -class LanguageInfo(DictField): - name = StringField(required=True, default="python") - file_extension = StringField() - mimetype = StringField() - nbconvert_exporter = StringField() - pygments_lexer = StringField() - version = StringField() - codemirror_mode = DictField(CodemirrorMode(), default=CodemirrorMode, help_text="codemirror") - - -class Metadata(DictField): - kernelspec = DictField(Kernelspec(), required=True, help_text="kernelspec", default=Kernelspec) - language_info = DictField(LanguageInfo(), required=True, help_text="language info", default=LanguageInfo) - - -class Cell(DictField): - cell_type = StringField(required=True, default="code", help_text="cell type") - metadata = DictField(help_text="cell metadata") - source = StringField(required=True, default="print('hello')", help_text="source") - outputs = ListField(DictField(), required=True, help_text="outputs", default=lambda: [DictField()]) - execution_count = IntField(help_text="exec count") - - -class Notebooks(Document): - nbformat = IntField(default=4, help_text="nbformat version") - nbformat_minor = IntField(default=4, help_text="nbformat minor version") - metadata = DictField(Metadata(), help_text="notebook metadata") - cells = ListField(Cell(), max_length=30, help_text="cells") - meta = {"collection": "notebooks"} - - problem_key = "application/vnd.plotly.v1+json" - escaped_key = problem_key.replace(".", "~dot~") - - @queryset_manager - def objects(doc_cls, queryset): - return queryset.only("nbformat", "nbformat_minor") - - @classmethod - def post_init(cls, sender, document, **kwargs): - if document.id: - document.transform(incoming=False) - - def transform(self, incoming=True): - if incoming: - old_key = self.problem_key - new_key = self.escaped_key - else: - old_key = self.escaped_key - new_key = self.problem_key - - for cell in self.cells: - for output in cell.get("outputs", []): - data = output.get("data", {}) - if old_key in data: - output["data"][new_key] = output["data"].pop(old_key) - - if "image/png" in data: - if incoming: - contents = data.pop("image/png") # base64 encoded - key = hashlib.sha1(contents.encode("utf-8")).hexdigest() - s3_client.put_object( - Bucket=BUCKET, - Key=key, - ContentType="image/png", - Body=b64decode(contents), - ) - data["image/png"] = key - elif len(data["image/png"]) == 40: - key = data.pop("image/png") - # TODO catch key doesn't exist - retr = s3_client.get_object(Bucket=BUCKET, Key=key) - gzip_buffer = BytesIO(retr["Body"].read()) - data["image/png"] = b64encode(gzip_buffer.getvalue()).decode() - - def clean(self): - self.transform() - - -signals.post_init.connect(Notebooks.post_init, sender=Notebooks) diff --git a/mpcontribs-api/src/mpcontribs_api/old/notebooks/views.py b/mpcontribs-api/src/mpcontribs_api/old/notebooks/views.py deleted file mode 100644 index a0d7ec2749..0000000000 --- a/mpcontribs-api/src/mpcontribs_api/old/notebooks/views.py +++ /dev/null @@ -1,301 +0,0 @@ -import os -import time - -import flask_mongorest -import requests -from flask import Blueprint, abort, current_app, jsonify, request -from flask_mongorest import operators as ops -from flask_mongorest.methods import BulkFetch, Fetch -from flask_mongorest.resources import Resource -from flask_rq2 import RQ -from gevent import sleep -from mongoengine.errors import DoesNotExist -from mongoengine.queryset.visitor import Q -from mpcontribs.api import get_kernel_endpoint, get_logger -from mpcontribs.api.contributions.document import Contributions -from mpcontribs.api.core import SwaggerView -from mpcontribs.api.notebooks import run_cells -from mpcontribs.api.notebooks.document import Notebooks -from nbformat import v4 as nbf -from rq import get_current_job -from rq.job import Job - -logger = get_logger(__name__) -templates = os.path.join(os.path.dirname(flask_mongorest.__file__), "templates") -notebooks = Blueprint("notebooks", __name__, template_folder=templates) - -MPCONTRIBS_API_HOST = os.environ.get("MPCONTRIBS_API_HOST", "default") -ADMIN_GROUP = os.environ.get("ADMIN_GROUP", "admin") - -rq = RQ() -rq.default_queue = f"notebooks_{MPCONTRIBS_API_HOST}" -rq.queues = [rq.default_queue] - - -class NotebooksResource(Resource): - document = Notebooks - filters = {"id": [ops.In, ops.Exact]} - fields = ["id", "nbformat", "nbformat_minor"] - paginate = True - default_limit = 10 - max_limit = 100 - - @staticmethod - def get_optional_fields(): - return ["metadata", "cells"] - - -class NotebooksView(SwaggerView): - resource = NotebooksResource - methods = [Fetch, BulkFetch] - - -def execute_cells(cid, cells): - ntries = 0 - while ntries < 5: - for kernel_id, running_cid in current_app.kernels.items(): - if running_cid is None: - current_app.kernels[kernel_id] = cid - try: - outputs = run_cells(kernel_id, cid, cells) - except: - current_app.kernels[kernel_id] = None - raise - - current_app.kernels[kernel_id] = None - return outputs - else: - logger.warning(f"{kernel_id} busy with {running_cid}") - - logger.warning("WAITING for a kernel to become available") - sleep(5) - ntries += 1 - - -@notebooks.route("/build") -def build(): - if not getattr(current_app, "kernels", None): - abort(404, description="No kernels available.") - - cids = request.args.get("cids") - projects = request.args.get("projects") - force = bool(request.args.get("force", 0)) - kwargs = dict(force=force) - - if projects: - kwargs["projects"] = projects.split(",") - - if cids: - kwargs["cids"] = cids.split(",") - - if len(kwargs.get("cids", [])) == 1: - return jsonify(make(**kwargs)) - - job = make.queue(**kwargs) - return job.id - - -def restart_kernels(): - """Use to avoid run-away memory.""" - kernel_ids = [k for k, v in current_app.kernels.items() if v is None] - - for kernel_id in kernel_ids: - kernel_url = get_kernel_endpoint(kernel_id) + "/restart" - requests.post(kernel_url, json={}) - cells = [nbf.new_code_cell("\n".join(["from mpcontribs.client import Client", "print('client imported')"]))] - run_cells(kernel_id, "import_client", cells) - - -@notebooks.route("/result", defaults={"job_id": None}) -@notebooks.route("/result/") -def result(job_id): - if not current_app.kernels: - abort(404, description="No kernels available.") - - if not job_id: - job_id = f"cron-{current_app.cron_job_id}" - - try: - job = Job.fetch(job_id, connection=rq.connection) - except Exception as exception: - abort(404, description=exception) - - if not job.is_finished: - return job.get_status() - elif not job.result: - description = f"No result for job_id {job.id} (exc: {job.exc_info})." - abort(404, description=description) - - return jsonify(job.result) - - -@rq.job() -def make(projects=None, cids=None, force=False): - """Build the notebook / details page.""" - start = time.perf_counter() - remaining_time = rq.default_timeout - 5 - mask = ["id", "needs_build", "notebook"] - query = Q() - - if projects: - query &= Q(project__in=projects) - if cids: - query &= Q(id__in=cids) - if not force: - query &= Q(needs_build=True) | Q(needs_build__exists=False) - - job = get_current_job() - ret = {"input": {"projects": projects, "cids": cids, "force": force}} - if job: - ret["job"] = { - "id": job.id, - "enqueued_at": job.enqueued_at.isoformat(), - "started_at": job.started_at.isoformat(), - } - - exclude = list(Contributions._fields.keys()) - documents = Contributions.objects(query).exclude(*exclude).only(*mask) - total = documents.count() - count = 0 - - for idx, document in enumerate(documents): - stop = time.perf_counter() - remaining_time -= stop - start - - if remaining_time < 0: - if job: - restart_kernels() - - ret["result"] = {"status": "TIMEOUT", "count": count, "total": total} - return ret - - start = time.perf_counter() - - if not force and document.notebook and not getattr(document, "needs_build", True): - continue - - if document.notebook: - try: - nb = Notebooks.objects.get(id=document.notebook.id) - nb.delete() - document.update(unset__notebook="") - logger.debug(f"Notebook {document.notebook.id} deleted.") - except DoesNotExist: - pass - - cid = str(document.id) - logger.debug(f"prep notebook for {cid} ...") - document.reload("tables", "structures", "attachments") - - cells = [ - # define client only once in kernel - # avoids API calls for regex expansion for query parameters - nbf.new_code_cell( - "\n".join( - [ - "if 'client' not in locals():", - "\tclient = Client(", - f'\t\theaders={{"X-Authenticated-Groups": "{ADMIN_GROUP}"}},', - f'\t\thost="{MPCONTRIBS_API_HOST}"', - "\t)", - "print(client.get_totals())", - # return something. See while loop in `run_cells` - ] - ) - ), - nbf.new_code_cell("\n".join([f'c = client.get_contribution("{document.id}")', "c.display()"])), - ] - - if document.tables: - cells.append(nbf.new_markdown_cell("## Tables")) - for table in document.tables: - cells.append(nbf.new_code_cell("\n".join([f't = client.get_table("{table.id}")', "t.display()"]))) - - if document.structures: - cells.append(nbf.new_markdown_cell("## Structures")) - for structure in document.structures: - cells.append( - nbf.new_code_cell( - "\n".join( - [ - f's = client.get_structure("{structure.id}")', - "s.display()", - ] - ) - ) - ) - - if document.attachments: - cells.append(nbf.new_markdown_cell("## Attachments")) - for attachment in document.attachments: - cells.append( - nbf.new_code_cell( - "\n".join( - [ - f'a = client.get_attachment("{attachment.id}")', - "a.info()", - ] - ) - ) - ) - - try: - outputs = execute_cells(cid, cells) - except Exception as e: - if job: - restart_kernels() - - ret["result"] = { - "status": "ERROR", - "cid": cid, - "count": count, - "total": total, - "exc": str(e), - } - return ret - - if not outputs: - if job: - restart_kernels() - - ret["result"] = { - "status": "ERROR: NO OUTPUTS", - "cid": cid, - "count": count, - "total": total, - } - return ret - - for idx, output in outputs.items(): - cells[idx]["outputs"] = output - - doc = nbf.new_notebook() - doc["cells"] = [ - nbf.new_code_cell("from mpcontribs.client import Client"), - nbf.new_code_cell("client = Client()"), - ] - doc["cells"] += cells[1:] # skip localhost Client - - try: - nb = Notebooks(**doc).save() - document.update(notebook=nb, needs_build=False) - except Exception as e: - if job: - restart_kernels() - - ret["result"] = { - "status": "ERROR", - "cid": cid, - "count": count, - "total": total, - "exc": str(e), - } - return ret - - count += 1 - - if total and job: - restart_kernels() - - ret["result"] = {"status": "COMPLETED", "count": count, "total": total} - return ret diff --git a/mpcontribs-api/src/mpcontribs_api/old/projects/__init__.py b/mpcontribs-api/src/mpcontribs_api/old/projects/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/mpcontribs-api/src/mpcontribs_api/old/projects/document.py b/mpcontribs-api/src/mpcontribs_api/old/projects/document.py deleted file mode 100644 index 45c3319d50..0000000000 --- a/mpcontribs-api/src/mpcontribs_api/old/projects/document.py +++ /dev/null @@ -1,361 +0,0 @@ -import urllib -from collections import ChainMap -from math import isnan - -from atlasq import AtlasManager, AtlasQ -from boltons.iterutils import remap -from flask import current_app, render_template, request, url_for -from flatten_dict import flatten -from marshmallow import ValidationError -from marshmallow.fields import String -from marshmallow.validate import Email as EmailValidator -from marshmallow_mongoengine.conversion import params -from marshmallow_mongoengine.conversion.fields import register_field -from mongoengine import Document, EmbeddedDocument, signals -from mongoengine.fields import ( - BooleanField, - DecimalField, - DictField, - EmailField, - EmbeddedDocumentField, - EmbeddedDocumentListField, - FloatField, - IntField, - StringField, - URLField, -) -from mongoengine.queryset.manager import queryset_manager -from mpcontribs.api import delimiter, enter, send_email, valid_dict, valid_key - -PROVIDERS = {"github", "google", "facebook", "microsoft", "amazon", "portier"} -MAX_COLUMNS = 160 - - -def visit(path, key, value): - from mpcontribs.api.contributions.document import quantity_keys - - # pull out units - if isinstance(value, dict) and "unit" in value: - return key, value["unit"] - elif isinstance(value, (str, bool)) and key not in quantity_keys: - return key, None - - return True - - -class ProviderEmailField(EmailField): - """Field to validate usernames of format :.""" - - def validate(self, value): - if value.count(":") != 1: - self.error(self.error_msg % value) - - provider, email = value.split(":", 1) - - if provider not in PROVIDERS: - self.error("{} {}".format(self.error_msg % value, "(invalid provider)")) - - super().validate(email) - - -class ProviderEmailValidator(EmailValidator): - def __call__(self, value): - message = self._format_error(value) - - if value.count(":") != 1: - raise ValidationError(message) - - provider, email = value.split(":", 1) - - if provider not in PROVIDERS: - raise ValidationError(message) - - super().__call__(email) - return value - - -class ProviderEmail(String): - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - validator = ProviderEmailValidator(error="Not a valid MP username ({input}).") - self.validators.insert(0, validator) - - -def dict_wo_nans(d): - return {k: v for k, v in d.items() if k in ["min", "max"] and not isnan(v)} - - -class Column(EmbeddedDocument): - path = StringField(required=True, help_text="column path in dot-notation") - min = FloatField(required=True, default=float("nan"), help_text="column minimum") - max = FloatField(required=True, default=float("nan"), help_text="column maximum") - unit = StringField(required=True, default="NaN", help_text="column unit") - - def __eq__(self, other): - if isinstance(other, self.__class__): - return dict_wo_nans(self._data) == dict_wo_nans(other._data) - return False - - -class Reference(EmbeddedDocument): - label = StringField( - required=True, - min_length=3, - max_length=20, - help_text="label", - validation=valid_key, - ) - url = URLField(required=True, help_text="URL") - - -class Stats(EmbeddedDocument): - columns = IntField(required=True, default=0, help_text="#columns") - contributions = IntField(required=True, default=0, help_text="#contributions") - tables = IntField(required=True, default=0, help_text="#tables") - structures = IntField(required=True, default=0, help_text="#structures") - attachments = IntField(required=True, default=0, help_text="#attachments") - size = DecimalField(required=True, default=0, precision=1, help_text="size in MB") - - -class Projects(Document): - __project_regex__ = "^[a-zA-Z0-9_]{3,31}$" - name = StringField( - min_length=3, - max_length=30, - regex=__project_regex__, - primary_key=True, - help_text=f"project name/slug (valid format: `{__project_regex__}`)", - ) - is_public = BooleanField(required=True, default=False, help_text="public/private project") - title = StringField( - min_length=5, - max_length=30, - required=True, - unique=True, - help_text="short title for the project/dataset", - ) - long_title = StringField( - min_length=5, - max_length=55, - help_text="optional full title for the project/dataset", - ) - authors = StringField( - required=True, - help_text="comma-separated list of authors", - # TODO change to EmbeddedDocumentListField - ) - description = StringField( - min_length=5, - max_length=2000, - required=True, - help_text="brief description of the project", - ) - references = EmbeddedDocumentListField( - Reference, - required=True, - min_length=1, - max_length=20, - help_text="list of references", - ) - license = StringField( - choices=["CCA4", "CCPD"], - default="CCA4", - required=True, - help_text="license (see https://materialsproject.org/about/terms)", - ) - other = DictField(validation=valid_dict, null=True, help_text="other information") - owner = ProviderEmailField(unique_with="name", help_text="owner / corresponding email") - is_approved = BooleanField(required=True, default=False, help_text="project approved?") - unique_identifiers = BooleanField(required=True, default=True, help_text="identifiers unique?") - columns = EmbeddedDocumentListField(Column, max_length=MAX_COLUMNS) - stats = EmbeddedDocumentField(Stats, required=True, default=Stats) - atlas = AtlasManager("mpcontribs-dev-project-search") - meta = { - "collection": "projects", - "indexes": ["is_public", "title", "owner", "is_approved", "unique_identifiers"], - } - - @queryset_manager - def objects(doc_cls, queryset): - return queryset.only("name", "is_public", "title", "owner", "is_approved", "unique_identifiers") - - @classmethod - def atlas_filter(cls, term): - # NOTE dynamic index, use `name` as placeholder for wildcard path - return AtlasQ(name=term) - - @classmethod - def post_save(cls, sender, document, **kwargs): - admin_email = current_app.config["MAIL_DEFAULT_SENDER"] - scheme = "http" if current_app.config["DEBUG"] else "https" - - if kwargs.get("created"): - ts = current_app.config["USTS"] - email_project = [document.owner, document.name] - token = ts.dumps(email_project) - link = url_for("projects.applications", token=token, _scheme=scheme, _external=True) - url = url_for("projectsFetch", pk=document.name, _scheme=scheme, _external=True) - url += "?_fields=_all" - html = render_template("admin_email.html", url=url, link=link) - send_email(admin_email, f'New project "{document.name}"', html) - else: - delta_set, delta_unset = document._delta() - - if "is_approved" in delta_set and document.is_approved: - subject = f'Your project "{document.name}" has been approved' - netloc = urllib.parse.urlparse(request.url).netloc.replace("-api", "") - portal = f"{scheme}://{netloc}" - html = render_template( - "owner_email.html", - approved=True, - admin_email=admin_email, - host=portal, - project=document.name, - ) - owner_email = document.owner.split(":", 1)[1] - send_email(owner_email, subject, html) - - if "columns" in delta_set or "columns" in delta_unset or (not delta_set and not delta_unset): - from mpcontribs.api.contributions.document import ( - COMPONENTS, - Contributions, - ) - - columns = {} - ncontribs = Contributions.objects(project=document.id).count() - - if "columns" in delta_set: - # document.columns updated by the user as intended - for col in document.columns: - columns[col.path] = col - elif "columns" in delta_unset or ncontribs: - # document.columns unset by user to reinit all columns from DB - # -> get paths and units across all contributions from DB - pipeline = [ - {"$match": {"project": document.id}}, - {"$sample": {"size": 1000}}, - {"$project": {"data": 1}}, - ] - result = Contributions.objects.aggregate(pipeline) - merged = ChainMap(*result) - flat = flatten(remap(merged, visit=visit, enter=enter), reducer="dot") - - for k, v in flat.items(): - if k.startswith("data."): - columns[k] = Column(path=k) - if v is not None: - columns[k].unit = v - - # start pipeline for stats: match project - pipeline = [{"$match": {"project": document.id}}] - - # resolve/lookup component fields - # NOTE also includes dynamic document fields - # for component in COMPONENTS.keys(): - # pipeline.append( - # { - # "$lookup": { - # "from": component, - # "localField": component, - # "foreignField": "_id", - # "as": component, - # } - # } - # ) - - # document size and attachment content size - project_stage = { - # "_id": 0, - # "size": {"$bsonSize": "$$ROOT"}, - # "contents": { - # "$map": { # attachment sizes - # "input": "$attachments", - # "as": "attm", - # "in": {"$toInt": "$$attm.content"}, - # } - # }, - } - - # number of components - for component in COMPONENTS.keys(): - project_stage[component] = {"$size": f"${component}"} - - # filter/forward number columns - min_max_paths = [path for path, col in columns.items() if col["unit"] != "NaN"] - for path in min_max_paths: - field = f"{path}{delimiter}value" - project_stage[field] = { - "$cond": { - "if": {"$isNumber": f"${field}"}, - "then": f"${field}", - "else": "$$REMOVE", - } - } - - # add project stage to pipeline - pipeline.append({"$project": project_stage}) - - # forward fields and sum attachment contents - project_stage_2 = {k: 1 for k in project_stage.keys()} - # project_stage_2["contents"] = {"$sum": "$contents"} - pipeline.append({"$project": project_stage_2}) - - # total size and total number of components - group_stage = { - "_id": None, - # "size": {"$sum": {"$add": ["$size", "$contents"]}}, - } - for component in COMPONENTS.keys(): - group_stage[component] = {"$sum": f"${component}"} - - # determine min/max for columns - for path in min_max_paths: - field = f"{path}{delimiter}value" - for k in ["min", "max"]: - clean_path = path.replace(delimiter, "__") - key = f"{clean_path}__{k}" - group_stage[key] = {f"${k}": f"${field}"} - - # append group stage and run pipeline - pipeline.append({"$group": group_stage}) - result = list(Contributions.objects.aggregate(pipeline)) - - # set min/max for columns - min_max = {} if not result else result[0] - for clean_path in min_max_paths: - for k in ["min", "max"]: - path = clean_path.replace(delimiter, "__") - m = min_max.get(f"{path}__{k}") - if m is not None: - setattr(columns[clean_path], k, m) - - # prep and save stats - stats_kwargs = {"columns": len(columns), "contributions": ncontribs} - if result and result[0]: - # stats_kwargs["size"] = result[0]["size"] / 1024 / 1024 - for component in COMPONENTS.keys(): - stats_kwargs[component] = result[0].get(component, 0) - if stats_kwargs[component] > 0: - columns[component] = Column(path=component) - - stats = Stats(**stats_kwargs) - document.update(stats=stats, columns=columns.values()) - - @classmethod - def post_delete(cls, sender, document, **kwargs): - admin_email = current_app.config["MAIL_DEFAULT_SENDER"] - subject = f'Your project "{document.name}" has been deleted' - html = render_template( - "owner_email.html", - approved=False, - admin_email=admin_email, - project=document.name, - ) - owner_email = document.owner.split(":", 1)[1] - send_email(owner_email, subject, html) - - -register_field(ProviderEmailField, ProviderEmail, available_params=(params.LengthParam,)) -signals.post_save.connect(Projects.post_save, sender=Projects) -signals.post_delete.connect(Projects.post_delete, sender=Projects) -Projects.atlas.index._set_indexed_fields({"type": "document", "dynamic": True}) diff --git a/mpcontribs-api/src/mpcontribs_api/old/projects/views.py b/mpcontribs-api/src/mpcontribs_api/old/projects/views.py deleted file mode 100644 index 4bba5c4b01..0000000000 --- a/mpcontribs-api/src/mpcontribs_api/old/projects/views.py +++ /dev/null @@ -1,179 +0,0 @@ -import os - -import flask_mongorest -from flask import Blueprint, abort, current_app, jsonify, request, url_for -from flask_mongorest import operators as ops -from flask_mongorest.methods import BulkFetch, Create, Delete, Fetch, Update -from flask_mongorest.resources import Resource -from mongoengine.queryset import DoesNotExist -from mpcontribs.api import FILTERS -from mpcontribs.api.core import SwaggerView -from mpcontribs.api.projects.document import Column, Projects, Reference, Stats -from werkzeug.exceptions import Unauthorized - -templates = os.path.join(os.path.dirname(flask_mongorest.__file__), "templates") -projects = Blueprint("projects", __name__, template_folder=templates) -MAX_PROJECTS = int(os.environ.get("MAX_PROJECTS", 3)) - - -class ColumnResource(Resource): - document = Column - - -class ReferenceResource(Resource): - document = Reference - - -class StatsResource(Resource): - document = Stats - - -class ProjectsResource(Resource): - document = Projects - related_resources = { - "columns": ColumnResource, - "references": ReferenceResource, - "stats": StatsResource, - } - filters = { - "name": FILTERS["STRINGS"], - "is_public": [ops.Boolean], - "title": FILTERS["STRINGS"], - "long_title": FILTERS["LONG_STRINGS"], - "authors": FILTERS["LONG_STRINGS"], - "description": FILTERS["LONG_STRINGS"], - "owner": FILTERS["STRINGS"], - "license": FILTERS["STRINGS"], - "is_approved": [ops.Boolean], - "unique_identifiers": [ops.Boolean], - "columns": [ops.Size], - "stats__columns": FILTERS["NUMBERS"], - "stats__contributions": FILTERS["NUMBERS"], - "stats__tables": FILTERS["NUMBERS"], - "stats__structures": FILTERS["NUMBERS"], - "stats__attachments": FILTERS["NUMBERS"], - "stats__size": FILTERS["NUMBERS"], - } - fields = [ - "name", - "is_public", - "title", - "owner", - "is_approved", - "unique_identifiers", - ] - allowed_ordering = ["name", "is_public", "title"] - paginate = True - default_limit = 100 - max_limit = 500 - - @staticmethod - def get_optional_fields(): - return [ - "long_title", - "authors", - "description", - "references", - "license", - "other", - "columns", - "stats", - ] - - -class ProjectsView(SwaggerView): - resource = ProjectsResource - methods = [Fetch, Create, Delete, Update, BulkFetch] - - def has_add_permission(self, request, obj): - if self.is_anonymous(request): - return False - - obj.owner = request.headers.get("X-Consumer-Username") - if self.is_admin(request): - return True - - data = request.json - if "is_approved" in data or "is_public" in data: - raise Unauthorized("Projects cannot be approved or published on creation.") - - # limit the number of projects a user can own - nr_projects = Projects.objects(owner=obj.owner).count() - if nr_projects > MAX_PROJECTS: - raise Unauthorized(f"{obj.owner} already owns {nr_projects} projects.") - - return True - - def has_change_permission(self, request, obj): - if self.is_anonymous(request): - return False - - if self.is_admin(request): - return True - - if not self.is_project_user(request, obj): - raise Unauthorized("Only project owners and collaborators can edit projects.") - - update = request.json - if "is_approved" in update: - raise Unauthorized("Only admins can (un)approve projects.") - - if "is_public" in update and not obj.is_approved: - raise Unauthorized("Projects can only be published after admin approval.") - - return True - - -@projects.route("/applications/", defaults={"action": None}) -@projects.route("/applications//") -def applications(token, action): - ts = current_app.config["USTS"] - owner, project = ts.loads(token) - - try: - obj = Projects.objects.get(name=project, owner=owner, is_approved=False) - except DoesNotExist: - return f"{project} for {owner} already approved or denied." - - actions = ["approve", "deny"] - if action not in actions: - response = f"

{project}

    " - scheme = "http" if current_app.config["DEBUG"] else "https" - for a in actions: - u = url_for( - "projects.applications", - token=token, - action=a, - _scheme=scheme, - _external=True, - ) - response += f'
  • {a}
    • ' - return response + "
" - - if action == "approve": - obj.reload(*obj._fields.keys()) - obj.is_approved = True - obj.save() # post_save (created=False) sends notification when `is_approved` set - else: - obj.delete() # post_delete signal sends notification - - return f"{project} {action.replace('y', 'ie')}d and {owner} notified." - - -@projects.route("/search") -def search(): - term = request.args.get("term") - if not term: - abort(404, description="Missing search term.") - - pipeline = [ - { - "$search": { - "index": "mpcontribs-dev-project-search", - "text": {"path": {"wildcard": "*"}, "query": term}, - } - }, - {"$project": {"_id": 1}}, - ] - result = [p["_id"] for p in Projects.objects().aggregate(pipeline)] - return jsonify(result) diff --git a/mpcontribs-api/src/mpcontribs_api/old/structures/__init__.py b/mpcontribs-api/src/mpcontribs_api/old/structures/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/mpcontribs-api/src/mpcontribs_api/old/structures/document.py b/mpcontribs-api/src/mpcontribs_api/old/structures/document.py deleted file mode 100644 index c28c9458f5..0000000000 --- a/mpcontribs-api/src/mpcontribs_api/old/structures/document.py +++ /dev/null @@ -1,51 +0,0 @@ -import json -from hashlib import md5 - -from flask_mongoengine.documents import Document -from mongoengine import signals -from mongoengine.fields import DictField, FloatField, ListField, StringField -from mongoengine.queryset.manager import queryset_manager -from pymatgen.core import Structure -from pymatgen.io.cif import CifWriter -from pymatgen.symmetry.analyzer import SymmetryUndeterminedError - - -class Structures(Document): - name = StringField(required=True, help_text="name") - lattice = DictField(required=True, help_text="lattice") - sites = ListField(DictField(), required=True, help_text="sites") - charge = FloatField(null=True, help_text="charge") - md5 = StringField(regex=r"^[a-z0-9]{32}$", unique=True, help_text="md5 sum") - cif = StringField(help_text="CIF string") - meta = {"collection": "structures", "indexes": ["name", "md5"]} - - @queryset_manager - def objects(doc_cls, queryset): - return queryset.only("name", "md5") - - @classmethod - def pre_save_post_validation(cls, sender, document, **kwargs): - from mpcontribs.api.structures.views import StructuresResource - - resource = StructuresResource() - d = resource.serialize(document, fields=["lattice", "sites", "charge"]) - s = json.dumps(d, sort_keys=True).encode("utf-8") - document.md5 = md5(s).hexdigest() - structure = Structure.from_dict(d) - writer = None - - for symprec_log in range(-10, 0, 3): - try: - writer = CifWriter(structure, symprec=10**symprec_log) - break - except SymmetryUndeterminedError: - continue - - if not writer: - # save CIF string without symmetry information - writer = CifWriter(structure) - - document.cif = writer.__str__() - - -signals.pre_save_post_validation.connect(Structures.pre_save_post_validation, sender=Structures) diff --git a/mpcontribs-api/src/mpcontribs_api/old/structures/views.py b/mpcontribs-api/src/mpcontribs_api/old/structures/views.py deleted file mode 100644 index 00fa873568..0000000000 --- a/mpcontribs-api/src/mpcontribs_api/old/structures/views.py +++ /dev/null @@ -1,38 +0,0 @@ -import os - -import flask_mongorest -from flask import Blueprint -from flask_mongorest import operators as ops -from flask_mongorest.methods import BulkFetch, Download, Fetch -from flask_mongorest.resources import Resource -from mpcontribs.api import FILTERS -from mpcontribs.api.core import SwaggerView -from mpcontribs.api.structures.document import Structures - -templates = os.path.join(os.path.dirname(flask_mongorest.__file__), "templates") -structures = Blueprint("structures", __name__, template_folder=templates) - - -class StructuresResource(Resource): - document = Structures - filters = { - "id": [ops.In, ops.Exact], - "md5": [ops.In, ops.Exact], - "name": FILTERS["STRINGS"], - "sites": [ops.Size], - } - fields = ["id", "name", "md5"] - allowed_ordering = ["name"] - paginate = True - default_limit = 10 - max_limit = 100 - download_formats = ["json", "csv"] - - @staticmethod - def get_optional_fields(): - return ["lattice", "sites", "charge", "cif"] - - -class StructuresView(SwaggerView): - resource = StructuresResource - methods = [Fetch, BulkFetch, Download] diff --git a/mpcontribs-api/src/mpcontribs_api/old/tables/__init__.py b/mpcontribs-api/src/mpcontribs_api/old/tables/__init__.py deleted file mode 100644 index b6d53222f4..0000000000 --- a/mpcontribs-api/src/mpcontribs_api/old/tables/__init__.py +++ /dev/null @@ -1 +0,0 @@ -"""Document and views for tables collection.""" diff --git a/mpcontribs-api/src/mpcontribs_api/old/tables/document.py b/mpcontribs-api/src/mpcontribs_api/old/tables/document.py deleted file mode 100644 index 1bbeb86084..0000000000 --- a/mpcontribs-api/src/mpcontribs_api/old/tables/document.py +++ /dev/null @@ -1,62 +0,0 @@ -from flask_mongoengine.documents import DynamicDocument -from mongoengine import EmbeddedDocument, signals -from mongoengine.fields import EmbeddedDocumentField, IntField, ListField, StringField -from mongoengine.queryset.manager import queryset_manager -from mpcontribs.api.contributions.document import ( - COMPONENTS, - format_cell, - get_md5, - get_resource, -) - - -class Labels(EmbeddedDocument): - index = StringField(help_text="index name / x-axis label") - value = StringField(help_text="columns name / y-axis label") - variable = StringField(help_text="legend name") - - -class Attributes(EmbeddedDocument): - title = StringField(help_text="title") - labels = EmbeddedDocumentField(Labels) - - -class Tables(DynamicDocument): - name = StringField(required=True, help_text="name / title") - attrs = EmbeddedDocumentField(Attributes) - index = ListField(StringField(), required=True, help_text="index column") - columns = ListField(StringField(), required=True, help_text="column names/headers") - data = ListField(ListField(StringField()), required=True, help_text="table rows") - md5 = StringField(regex=r"^[a-z0-9]{32}$", unique=True, help_text="md5 sum") - total_data_rows = IntField(help_text="total number of rows") - meta = { - "collection": "tables", - "indexes": [ - "name", - "columns", - "md5", - "attrs.title", - "attrs.labels.index", - "attrs.labels.value", - "attrs.labels.variable", - ], - } - - @queryset_manager - def objects(doc_cls, queryset): - return queryset.only("name", "md5", "attrs", "columns", "total_data_rows") - - @classmethod - def post_init(cls, sender, document, **kwargs): - document.data = [[format_cell(cell) for cell in row] for row in document.data] - - @classmethod - def pre_save_post_validation(cls, sender, document, **kwargs): - # significant digits, md5 and total_data_rows - resource = get_resource("tables") - document.md5 = get_md5(resource, document, COMPONENTS["tables"]) - document.total_data_rows = len(document.data) - - -signals.post_init.connect(Tables.post_init, sender=Tables) -signals.pre_save_post_validation.connect(Tables.pre_save_post_validation, sender=Tables) diff --git a/mpcontribs-api/src/mpcontribs_api/old/tables/views.py b/mpcontribs-api/src/mpcontribs_api/old/tables/views.py deleted file mode 100644 index 5306003d06..0000000000 --- a/mpcontribs-api/src/mpcontribs_api/old/tables/views.py +++ /dev/null @@ -1,75 +0,0 @@ -import os - -import flask_mongorest -from flask import Blueprint -from flask_mongorest import operators as ops -from flask_mongorest.exceptions import UnknownFieldError -from flask_mongorest.methods import BulkFetch, Download, Fetch -from flask_mongorest.resources import Resource -from mpcontribs.api import FILTERS -from mpcontribs.api.core import SwaggerView -from mpcontribs.api.tables.document import Attributes, Labels, Tables - -templates = os.path.join(os.path.dirname(flask_mongorest.__file__), "templates") -tables = Blueprint("tables", __name__, template_folder=templates) - - -class LabelsResource(Resource): - document = Labels - - -class AttributesResource(Resource): - document = Attributes - related_resources = {"labels": LabelsResource} - - -class TablesResource(Resource): - document = Tables - related_resources = {"attrs": AttributesResource} - filters = { - "id": [ops.In, ops.Exact], - "md5": [ops.In, ops.Exact], - "name": FILTERS["STRINGS"], - "columns": [ops.Size], - "attrs__title": FILTERS["STRINGS"], - "attrs__labels__index": FILTERS["STRINGS"], - "attrs__labels__value": FILTERS["STRINGS"], - "attrs__labels__variable": FILTERS["STRINGS"], - } - fields = [ - "id", - "name", - "md5", - "attrs", - "columns", - "total_data_rows", - "total_data_pages", - ] - allowed_ordering = ["name", "total_data_rows"] - paginate = True - default_limit = 10 - max_limit = 100 - fields_to_paginate = {"data": [20, 1000]} - download_formats = ["json", "csv"] - - @staticmethod - def get_optional_fields(): - return ["index", "data"] - - def value_for_field(self, obj, field): - if field == "total_data_pages": - if obj.total_data_rows is None: - return None - - per_page_default = self.fields_to_paginate["data"][0] - per_page = int(self.params.get("data_per_page", per_page_default)) - total_data_pages = int(obj.total_data_rows / per_page) - total_data_pages += bool(obj.total_data_rows % per_page) - return total_data_pages - else: - raise UnknownFieldError - - -class TablesView(SwaggerView): - resource = TablesResource - methods = [Fetch, BulkFetch, Download] diff --git a/mpcontribs-api/src/mpcontribs_api/old/templates/admin_email.html b/mpcontribs-api/src/mpcontribs_api/old/templates/admin_email.html deleted file mode 100644 index 30267cf34c..0000000000 --- a/mpcontribs-api/src/mpcontribs_api/old/templates/admin_email.html +++ /dev/null @@ -1 +0,0 @@ -Go to {{url}} for more info about the project. Approve or deny this request: {{link}}. A notification email with your decision will automatically be sent to the user. diff --git a/mpcontribs-api/src/mpcontribs_api/old/templates/card_bootstrap.html b/mpcontribs-api/src/mpcontribs_api/old/templates/card_bootstrap.html deleted file mode 100644 index b8a9045604..0000000000 --- a/mpcontribs-api/src/mpcontribs_api/old/templates/card_bootstrap.html +++ /dev/null @@ -1,46 +0,0 @@ -
-
-
-

- {{ title }} - {% if references %} - - {% for ref in references %} - [{{ref.label}}] - {% endfor %} - - {% endif %} - Details -

- {{ authors.main }} - {% if authors.etal %} - et al. - - {% endif %} -
- -
-
-
- {{ descriptions.0 }}. - {% if descriptions.1 %} - More » - - {% endif %} -
-
{{ data|safe }}
-
-
- -
diff --git a/mpcontribs-api/src/mpcontribs_api/old/templates/card_bulma.html b/mpcontribs-api/src/mpcontribs_api/old/templates/card_bulma.html deleted file mode 100644 index ce4a01d929..0000000000 --- a/mpcontribs-api/src/mpcontribs_api/old/templates/card_bulma.html +++ /dev/null @@ -1,60 +0,0 @@ -
-
-
- {% if references %} - - {% endif %} -
- - {{ title }} - - - - - - -
-
- {{ authors.main }} - {% if authors.etal %} - et al. - - {% endif %} -
-
- {{ descriptions.0 }}. - {% if descriptions.1 %} - More » - - {% endif %} -
-
- {{ data|safe }} -
-
- -
- -
diff --git a/mpcontribs-api/src/mpcontribs_api/old/templates/owner_email.html b/mpcontribs-api/src/mpcontribs_api/old/templates/owner_email.html deleted file mode 100644 index 2eb526dce9..0000000000 --- a/mpcontribs-api/src/mpcontribs_api/old/templates/owner_email.html +++ /dev/null @@ -1 +0,0 @@ -Your project "{{project}}" has been {% if approved %}approved. You can now add all your contributions and publish the project.{% else %}denied and deleted.{% endif %} From 743e6e42f790e9fd262381c1164a3c62a30e6b46 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 4 Jun 2026 09:39:45 -0700 Subject: [PATCH 287/591] Fixed basedpyright not knowing proper import path. Removed old ignores to 'old' folder. Added bfoley as author :) --- mpcontribs-api/pyproject.toml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mpcontribs-api/pyproject.toml b/mpcontribs-api/pyproject.toml index 25417e864f..89cf4d6f06 100644 --- a/mpcontribs-api/pyproject.toml +++ b/mpcontribs-api/pyproject.toml @@ -21,8 +21,9 @@ requires-python = ">=3.14" description="API for community-contributed Materials Project data" license = "BSD-3-Clause-LBNL" authors = [ - {name = "Patrick Huck", email = "phuck@lbl.gov"}, - {name = "The Materials Project", email="feedback@materialsproject.org"}, + {name="Patrick Huck", email="phuck@lbl.gov"}, + {name="Brendan Foley", email="bfoley@lbl.gov"}, + {name="The Materials Project", email="feedback@materialsproject.org"}, ] dependencies = [ "numpy", @@ -98,7 +99,7 @@ markers = [ [tool.ruff] line-length = 120 -exclude = ["src/mpcontribs_api/old", "tests/"] +exclude = ["tests/"] [tool.ruff.lint] select = ["E", "F", "W", "I", "B", "UP"] @@ -106,9 +107,8 @@ ignore = ["E741", "B008"] [tool.pydocstringformatter] max-line-length = 120 -exclude = ["src/mpcontribs_api/old"] [tool.basedpyright] pythonVersion = "3.14" typeCheckingMode = "standard" -ignore = ["src/mpcontribs_api/old"] +extraPaths = ["src"] From 78da4ebd9a8398ea084f1d62d80ef3e4a60c237a Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 4 Jun 2026 10:33:32 -0700 Subject: [PATCH 288/591] Removed dependencies. Some temporarily --- mpcontribs-api/pyproject.toml | 41 +- mpcontribs-api/uv.lock | 2159 ++------------------------------- 2 files changed, 91 insertions(+), 2109 deletions(-) diff --git a/mpcontribs-api/pyproject.toml b/mpcontribs-api/pyproject.toml index 89cf4d6f06..f0e1650603 100644 --- a/mpcontribs-api/pyproject.toml +++ b/mpcontribs-api/pyproject.toml @@ -26,39 +26,16 @@ authors = [ {name="The Materials Project", email="feedback@materialsproject.org"}, ] dependencies = [ - "numpy", - "apispec<6", - "asn1crypto", - "blinker", - "boltons", - "css-html-js-minify", - "dateparser", - "ddtrace==4.3.0", - "dnspython", - "filetype", - "flasgger-tschaume>=0.9.7", - "flask-compress", - "flask-marshmallow", - "flask-mongorest-mpcontribs>=3.2.1", - "Flask-RQ2", - "gunicorn[gevent]==24.1.1", - "jinja2", - "json2html", - "marshmallow<4", - "more-itertools", - "nbformat", - "notebook<7", - "pint>=0.24", - "psycopg2-binary", + #"jinja2", + #"pint>=0.24", + # "psycopg2-binary", "pymatgen", - "pyopenssl", - "python-snappy", - "rq<=2.3.2", # see https://github.com/rq/Flask-RQ2/issues/620 - "supervisor", - "setproctitle", - "uncertainties", - "websocket_client", - "zstandard", + #"rq<=2.3.2", # see https://github.com/rq/Flask-RQ2/issues/620 + #"supervisor", + # "setproctitle", + # "uncertainties", + # "websocket_client", + # "zstandard", "fastapi[standard]>=0.136.3", "pymongo>=4.17.0", "pydantic-settings>=2.14.1", diff --git a/mpcontribs-api/uv.lock b/mpcontribs-api/uv.lock index 32a4220bac..328dc52913 100644 --- a/mpcontribs-api/uv.lock +++ b/mpcontribs-api/uv.lock @@ -36,80 +36,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/da/42/e921fccf5015463e32a3cf6ee7f980a6ed0f395ceeaa45060b61d86486c2/anyio-4.13.0-py3-none-any.whl", hash = "sha256:08b310f9e24a9594186fd75b4f73f4a4152069e3853f1ed8bfbf58369f4ad708", size = 114353, upload-time = "2026-03-24T12:59:08.246Z" }, ] -[[package]] -name = "apispec" -version = "5.2.2" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/39/bb/2910f46ecba16334c19e4f02906b1fdb0e69f9c3fd9a21afcf86c45ba89e/apispec-5.2.2.tar.gz", hash = "sha256:6ea6542e1ebffe9fd95ba01ef3f51351eac6c200a974562c7473059b9cd20aa7", size = 75729, upload-time = "2022-05-12T22:18:20.648Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/7b/bf/8ab9b532c9a22e9cc4920ed7436fde5f207807346564b95d9782f1e2aa5e/apispec-5.2.2-py3-none-any.whl", hash = "sha256:f5f0d6b452c3e4a0e0922dce8815fac89dc4dbc758acef21fb9e01584d6602a5", size = 29618, upload-time = "2022-05-12T22:18:19.235Z" }, -] - -[[package]] -name = "appnope" -version = "0.1.4" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/35/5d/752690df9ef5b76e169e68d6a129fa6d08a7100ca7f754c89495db3c6019/appnope-0.1.4.tar.gz", hash = "sha256:1de3860566df9caf38f01f86f65e0e13e379af54f9e4bee1e66b48f2efffd1ee", size = 4170, upload-time = "2024-02-06T09:43:11.258Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/81/29/5ecc3a15d5a33e31b26c11426c45c501e439cb865d0bff96315d86443b78/appnope-0.1.4-py2.py3-none-any.whl", hash = "sha256:502575ee11cd7a28c0205f379b525beefebab9d161b7c964670864014ed7213c", size = 4321, upload-time = "2024-02-06T09:43:09.663Z" }, -] - -[[package]] -name = "argon2-cffi" -version = "25.1.0" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "argon2-cffi-bindings" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/0e/89/ce5af8a7d472a67cc819d5d998aa8c82c5d860608c4db9f46f1162d7dab9/argon2_cffi-25.1.0.tar.gz", hash = "sha256:694ae5cc8a42f4c4e2bf2ca0e64e51e23a040c6a517a85074683d3959e1346c1", size = 45706, upload-time = "2025-06-03T06:55:32.073Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/4f/d3/a8b22fa575b297cd6e3e3b0155c7e25db170edf1c74783d6a31a2490b8d9/argon2_cffi-25.1.0-py3-none-any.whl", hash = "sha256:fdc8b074db390fccb6eb4a3604ae7231f219aa669a2652e0f20e16ba513d5741", size = 14657, upload-time = "2025-06-03T06:55:30.804Z" }, -] - -[[package]] -name = "argon2-cffi-bindings" -version = "25.1.0" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "cffi" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/5c/2d/db8af0df73c1cf454f71b2bbe5e356b8c1f8041c979f505b3d3186e520a9/argon2_cffi_bindings-25.1.0.tar.gz", hash = "sha256:b957f3e6ea4d55d820e40ff76f450952807013d361a65d7f28acc0acbf29229d", size = 1783441, upload-time = "2025-07-30T10:02:05.147Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/60/97/3c0a35f46e52108d4707c44b95cfe2afcafc50800b5450c197454569b776/argon2_cffi_bindings-25.1.0-cp314-cp314t-macosx_10_13_universal2.whl", hash = "sha256:3d3f05610594151994ca9ccb3c771115bdb4daef161976a266f0dd8aa9996b8f", size = 54393, upload-time = "2025-07-30T10:01:40.97Z" }, - { url = "https://files.pythonhosted.org/packages/9d/f4/98bbd6ee89febd4f212696f13c03ca302b8552e7dbf9c8efa11ea4a388c3/argon2_cffi_bindings-25.1.0-cp314-cp314t-macosx_10_13_x86_64.whl", hash = "sha256:8b8efee945193e667a396cbc7b4fb7d357297d6234d30a489905d96caabde56b", size = 29328, upload-time = "2025-07-30T10:01:41.916Z" }, - { url = "https://files.pythonhosted.org/packages/43/24/90a01c0ef12ac91a6be05969f29944643bc1e5e461155ae6559befa8f00b/argon2_cffi_bindings-25.1.0-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:3c6702abc36bf3ccba3f802b799505def420a1b7039862014a65db3205967f5a", size = 31269, upload-time = "2025-07-30T10:01:42.716Z" }, - { url = "https://files.pythonhosted.org/packages/d4/d3/942aa10782b2697eee7af5e12eeff5ebb325ccfb86dd8abda54174e377e4/argon2_cffi_bindings-25.1.0-cp314-cp314t-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:a1c70058c6ab1e352304ac7e3b52554daadacd8d453c1752e547c76e9c99ac44", size = 86558, upload-time = "2025-07-30T10:01:43.943Z" }, - { url = "https://files.pythonhosted.org/packages/0d/82/b484f702fec5536e71836fc2dbc8c5267b3f6e78d2d539b4eaa6f0db8bf8/argon2_cffi_bindings-25.1.0-cp314-cp314t-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:e2fd3bfbff3c5d74fef31a722f729bf93500910db650c925c2d6ef879a7e51cb", size = 92364, upload-time = "2025-07-30T10:01:44.887Z" }, - { url = "https://files.pythonhosted.org/packages/c9/c1/a606ff83b3f1735f3759ad0f2cd9e038a0ad11a3de3b6c673aa41c24bb7b/argon2_cffi_bindings-25.1.0-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:c4f9665de60b1b0e99bcd6be4f17d90339698ce954cfd8d9cf4f91c995165a92", size = 85637, upload-time = "2025-07-30T10:01:46.225Z" }, - { url = "https://files.pythonhosted.org/packages/44/b4/678503f12aceb0262f84fa201f6027ed77d71c5019ae03b399b97caa2f19/argon2_cffi_bindings-25.1.0-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:ba92837e4a9aa6a508c8d2d7883ed5a8f6c308c89a4790e1e447a220deb79a85", size = 91934, upload-time = "2025-07-30T10:01:47.203Z" }, - { url = "https://files.pythonhosted.org/packages/f0/c7/f36bd08ef9bd9f0a9cff9428406651f5937ce27b6c5b07b92d41f91ae541/argon2_cffi_bindings-25.1.0-cp314-cp314t-win32.whl", hash = "sha256:84a461d4d84ae1295871329b346a97f68eade8c53b6ed9a7ca2d7467f3c8ff6f", size = 28158, upload-time = "2025-07-30T10:01:48.341Z" }, - { url = "https://files.pythonhosted.org/packages/b3/80/0106a7448abb24a2c467bf7d527fe5413b7fdfa4ad6d6a96a43a62ef3988/argon2_cffi_bindings-25.1.0-cp314-cp314t-win_amd64.whl", hash = "sha256:b55aec3565b65f56455eebc9b9f34130440404f27fe21c3b375bf1ea4d8fbae6", size = 32597, upload-time = "2025-07-30T10:01:49.112Z" }, - { url = "https://files.pythonhosted.org/packages/05/b8/d663c9caea07e9180b2cb662772865230715cbd573ba3b5e81793d580316/argon2_cffi_bindings-25.1.0-cp314-cp314t-win_arm64.whl", hash = "sha256:87c33a52407e4c41f3b70a9c2d3f6056d88b10dad7695be708c5021673f55623", size = 28231, upload-time = "2025-07-30T10:01:49.92Z" }, - { url = "https://files.pythonhosted.org/packages/1d/57/96b8b9f93166147826da5f90376e784a10582dd39a393c99bb62cfcf52f0/argon2_cffi_bindings-25.1.0-cp39-abi3-macosx_10_9_universal2.whl", hash = "sha256:aecba1723ae35330a008418a91ea6cfcedf6d31e5fbaa056a166462ff066d500", size = 54121, upload-time = "2025-07-30T10:01:50.815Z" }, - { url = "https://files.pythonhosted.org/packages/0a/08/a9bebdb2e0e602dde230bdde8021b29f71f7841bd54801bcfd514acb5dcf/argon2_cffi_bindings-25.1.0-cp39-abi3-macosx_10_9_x86_64.whl", hash = "sha256:2630b6240b495dfab90aebe159ff784d08ea999aa4b0d17efa734055a07d2f44", size = 29177, upload-time = "2025-07-30T10:01:51.681Z" }, - { url = "https://files.pythonhosted.org/packages/b6/02/d297943bcacf05e4f2a94ab6f462831dc20158614e5d067c35d4e63b9acb/argon2_cffi_bindings-25.1.0-cp39-abi3-macosx_11_0_arm64.whl", hash = "sha256:7aef0c91e2c0fbca6fc68e7555aa60ef7008a739cbe045541e438373bc54d2b0", size = 31090, upload-time = "2025-07-30T10:01:53.184Z" }, - { url = "https://files.pythonhosted.org/packages/c1/93/44365f3d75053e53893ec6d733e4a5e3147502663554b4d864587c7828a7/argon2_cffi_bindings-25.1.0-cp39-abi3-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:1e021e87faa76ae0d413b619fe2b65ab9a037f24c60a1e6cc43457ae20de6dc6", size = 81246, upload-time = "2025-07-30T10:01:54.145Z" }, - { url = "https://files.pythonhosted.org/packages/09/52/94108adfdd6e2ddf58be64f959a0b9c7d4ef2fa71086c38356d22dc501ea/argon2_cffi_bindings-25.1.0-cp39-abi3-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:d3e924cfc503018a714f94a49a149fdc0b644eaead5d1f089330399134fa028a", size = 87126, upload-time = "2025-07-30T10:01:55.074Z" }, - { url = "https://files.pythonhosted.org/packages/72/70/7a2993a12b0ffa2a9271259b79cc616e2389ed1a4d93842fac5a1f923ffd/argon2_cffi_bindings-25.1.0-cp39-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:c87b72589133f0346a1cb8d5ecca4b933e3c9b64656c9d175270a000e73b288d", size = 80343, upload-time = "2025-07-30T10:01:56.007Z" }, - { url = "https://files.pythonhosted.org/packages/78/9a/4e5157d893ffc712b74dbd868c7f62365618266982b64accab26bab01edc/argon2_cffi_bindings-25.1.0-cp39-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:1db89609c06afa1a214a69a462ea741cf735b29a57530478c06eb81dd403de99", size = 86777, upload-time = "2025-07-30T10:01:56.943Z" }, - { url = "https://files.pythonhosted.org/packages/74/cd/15777dfde1c29d96de7f18edf4cc94c385646852e7c7b0320aa91ccca583/argon2_cffi_bindings-25.1.0-cp39-abi3-win32.whl", hash = "sha256:473bcb5f82924b1becbb637b63303ec8d10e84c8d241119419897a26116515d2", size = 27180, upload-time = "2025-07-30T10:01:57.759Z" }, - { url = "https://files.pythonhosted.org/packages/e2/c6/a759ece8f1829d1f162261226fbfd2c6832b3ff7657384045286d2afa384/argon2_cffi_bindings-25.1.0-cp39-abi3-win_amd64.whl", hash = "sha256:a98cd7d17e9f7ce244c0803cad3c23a7d379c301ba618a5fa76a67d116618b98", size = 31715, upload-time = "2025-07-30T10:01:58.56Z" }, - { url = "https://files.pythonhosted.org/packages/42/b9/f8d6fa329ab25128b7e98fd83a3cb34d9db5b059a9847eddb840a0af45dd/argon2_cffi_bindings-25.1.0-cp39-abi3-win_arm64.whl", hash = "sha256:b0fdbcf513833809c882823f98dc2f931cf659d9a1429616ac3adebb49f5db94", size = 27149, upload-time = "2025-07-30T10:01:59.329Z" }, -] - -[[package]] -name = "arrow" -version = "1.4.0" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "python-dateutil" }, - { name = "tzdata" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/b9/33/032cdc44182491aa708d06a68b62434140d8c50820a087fac7af37703357/arrow-1.4.0.tar.gz", hash = "sha256:ed0cc050e98001b8779e84d461b0098c4ac597e88704a655582b21d116e526d7", size = 152931, upload-time = "2025-10-18T17:46:46.761Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/ed/c9/d7977eaacb9df673210491da99e6a247e93df98c715fc43fd136ce1d3d33/arrow-1.4.0-py3-none-any.whl", hash = "sha256:749f0769958ebdc79c173ff0b0670d59051a535fa26e8eba02953dc19eb43205", size = 68797, upload-time = "2025-10-18T17:46:45.663Z" }, -] - [[package]] name = "asgiref" version = "3.11.1" @@ -119,46 +45,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/5c/0a/a72d10ed65068e115044937873362e6e32fab1b7dce0046aeb224682c989/asgiref-3.11.1-py3-none-any.whl", hash = "sha256:e8667a091e69529631969fd45dc268fa79b99c92c5fcdda727757e52146ec133", size = 24345, upload-time = "2026-02-03T13:30:13.039Z" }, ] -[[package]] -name = "asn1crypto" -version = "1.5.1" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/de/cf/d547feed25b5244fcb9392e288ff9fdc3280b10260362fc45d37a798a6ee/asn1crypto-1.5.1.tar.gz", hash = "sha256:13ae38502be632115abf8a24cbe5f4da52e3b5231990aff31123c805306ccb9c", size = 121080, upload-time = "2022-03-15T14:46:52.889Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/c9/7f/09065fd9e27da0eda08b4d6897f1c13535066174cc023af248fc2a8d5e5a/asn1crypto-1.5.1-py2.py3-none-any.whl", hash = "sha256:db4e40728b728508912cbb3d44f19ce188f218e9eba635821bb4b68564f8fd67", size = 105045, upload-time = "2022-03-15T14:46:51.055Z" }, -] - -[[package]] -name = "asttokens" -version = "3.0.1" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/be/a5/8e3f9b6771b0b408517c82d97aed8f2036509bc247d46114925e32fe33f0/asttokens-3.0.1.tar.gz", hash = "sha256:71a4ee5de0bde6a31d64f6b13f2293ac190344478f081c3d1bccfcf5eacb0cb7", size = 62308, upload-time = "2025-11-15T16:43:48.578Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/d2/39/e7eaf1799466a4aef85b6a4fe7bd175ad2b1c6345066aa33f1f58d4b18d0/asttokens-3.0.1-py3-none-any.whl", hash = "sha256:15a3ebc0f43c2d0a50eeafea25e19046c68398e487b9f1f5b517f7c0f40f976a", size = 27047, upload-time = "2025-11-15T16:43:16.109Z" }, -] - -[[package]] -name = "atlasq-tschaume" -version = "0.11.1.dev2" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "mongoengine" }, - { name = "requests" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/8c/5f/91e3d9c1712c8e235c95c86eeb265bb106802f5bcbe334e28f605f55b018/atlasq-tschaume-0.11.1.dev2.tar.gz", hash = "sha256:9393356edebae037b1b47e16d73a7a04969451eaa3e38f1bdc20d1d9b08ece68", size = 38083, upload-time = "2023-04-14T21:06:57.344Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/a5/8c/83b96f52f5a5b8e418bf4cbf9089cfbea33fc0b809c28fd5a9b9393b67ba/atlasq_tschaume-0.11.1.dev2-py3-none-any.whl", hash = "sha256:f38813972c8c379964f09200fa89f9ae909ccbf5b3483bb6a77d5bf34720dde0", size = 15748, upload-time = "2023-04-14T21:06:54.943Z" }, -] - -[[package]] -name = "attrs" -version = "26.1.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/9a/8e/82a0fe20a541c03148528be8cac2408564a6c9a0cc7e9171802bc1d26985/attrs-26.1.0.tar.gz", hash = "sha256:d03ceb89cb322a8fd706d4fb91940737b6642aa36998fe130a9bc96c985eff32", size = 952055, upload-time = "2026-03-19T14:22:25.026Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/64/b4/17d4b0b2a2dc85a6df63d1157e028ed19f90d4cd97c36717afef2bc2f395/attrs-26.1.0-py3-none-any.whl", hash = "sha256:c647aa4a12dfbad9333ca4e71fe62ddc36f4e63b2d260a37a8b83d2f043ac309", size = 67548, upload-time = "2026-03-19T14:22:23.645Z" }, -] - [[package]] name = "basedpyright" version = "1.39.6" @@ -187,19 +73,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/00/b5/1c6c404bcce8fa53d3f422dce6e58bff99c3e3cb2a3c49d519e3e5822125/beanie-2.1.0-py3-none-any.whl", hash = "sha256:077381dad0e0129fd4dc38cdaa3d85cb517da7338e3d893a689314884df4379b", size = 92697, upload-time = "2026-03-26T01:27:02.191Z" }, ] -[[package]] -name = "beautifulsoup4" -version = "4.14.3" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "soupsieve" }, - { name = "typing-extensions" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/c3/b0/1c6a16426d389813b48d95e26898aff79abbde42ad353958ad95cc8c9b21/beautifulsoup4-4.14.3.tar.gz", hash = "sha256:6292b1c5186d356bba669ef9f7f051757099565ad9ada5dd630bd9de5fa7fb86", size = 627737, upload-time = "2025-11-30T15:08:26.084Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/1a/39/47f9197bdd44df24d67ac8893641e16f386c984a0619ef2ee4c51fbbc019/beautifulsoup4-4.14.3-py3-none-any.whl", hash = "sha256:0918bfe44902e6ad8d57732ba310582e98da931428d231a5ecb9e7c703a735bb", size = 107721, upload-time = "2025-11-30T15:08:24.087Z" }, -] - [[package]] name = "bibtexparser" version = "1.4.4" @@ -209,117 +82,6 @@ dependencies = [ ] sdist = { url = "https://files.pythonhosted.org/packages/44/1c/577d3ce406e88f370e80a6ebf76ae52a2866521e0b585e8ec612759894f1/bibtexparser-1.4.4.tar.gz", hash = "sha256:093b6c824f7a71d3a748867c4057b71f77c55b8dbc07efc993b781771520d8fb", size = 55594, upload-time = "2026-01-29T18:58:01.366Z" } -[[package]] -name = "bleach" -version = "6.3.0" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "webencodings" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/07/18/3c8523962314be6bf4c8989c79ad9531c825210dd13a8669f6b84336e8bd/bleach-6.3.0.tar.gz", hash = "sha256:6f3b91b1c0a02bb9a78b5a454c92506aa0fdf197e1d5e114d2e00c6f64306d22", size = 203533, upload-time = "2025-10-27T17:57:39.211Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/cd/3a/577b549de0cc09d95f11087ee63c739bba856cd3952697eec4c4bb91350a/bleach-6.3.0-py3-none-any.whl", hash = "sha256:fe10ec77c93ddf3d13a73b035abaac7a9f5e436513864ccdad516693213c65d6", size = 164437, upload-time = "2025-10-27T17:57:37.538Z" }, -] - -[package.optional-dependencies] -css = [ - { name = "tinycss2" }, -] - -[[package]] -name = "blinker" -version = "1.9.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/21/28/9b3f50ce0e048515135495f198351908d99540d69bfdc8c1d15b73dc55ce/blinker-1.9.0.tar.gz", hash = "sha256:b4ce2265a7abece45e7cc896e98dbebe6cead56bcf805a3d23136d145f5445bf", size = 22460, upload-time = "2024-11-08T17:25:47.436Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/10/cb/f2ad4230dc2eb1a74edf38f1a38b9b52277f75bef262d8908e60d957e13c/blinker-1.9.0-py3-none-any.whl", hash = "sha256:ba0efaa9080b619ff2f3459d1d500c57bddea4a6b424b60a91141db6fd2f08bc", size = 8458, upload-time = "2024-11-08T17:25:46.184Z" }, -] - -[[package]] -name = "boltons" -version = "25.0.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/63/54/71a94d8e02da9a865587fb3fff100cb0fc7aa9f4d5ed9ed3a591216ddcc7/boltons-25.0.0.tar.gz", hash = "sha256:e110fbdc30b7b9868cb604e3f71d4722dd8f4dcb4a5ddd06028ba8f1ab0b5ace", size = 246294, upload-time = "2025-02-03T05:57:59.129Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/45/7f/0e961cf3908bc4c1c3e027de2794f867c6c89fb4916fc7dba295a0e80a2d/boltons-25.0.0-py3-none-any.whl", hash = "sha256:dc9fb38bf28985715497d1b54d00b62ea866eca3938938ea9043e254a3a6ca62", size = 194210, upload-time = "2025-02-03T05:57:56.705Z" }, -] - -[[package]] -name = "boto3" -version = "1.43.16" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "botocore" }, - { name = "jmespath" }, - { name = "s3transfer" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/48/4f/f13d80d377b54dd2973e243e4eb7ce748706cd53876361cc72506006fd8b/boto3-1.43.16.tar.gz", hash = "sha256:6c337bbe608aacc7d335c79e671f0c893870293b74d652f7a7af22ccd0dfef16", size = 113152, upload-time = "2026-05-27T19:31:39.899Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/af/c0/7d687e40f4b7046ede66026ecd1b0a93d47afe26d9170f5926a1605c8641/boto3-1.43.16-py3-none-any.whl", hash = "sha256:dffc8a3cd3edbc0ad95b9c6b983e873b76ede46d3aa0709f94db253f2ff2388f", size = 140537, upload-time = "2026-05-27T19:31:36.453Z" }, -] - -[[package]] -name = "botocore" -version = "1.43.16" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "jmespath" }, - { name = "python-dateutil" }, - { name = "urllib3" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/a1/74/140451a1fe027cb5e387cc7b1ec56224616ca742c330f1492f71c5cba3fb/botocore-1.43.16.tar.gz", hash = "sha256:813dae233d8b365c19aaf7865b32070e34d7e793654881bf86ecbbef3f4ad5c6", size = 15388648, upload-time = "2026-05-27T19:31:25.172Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/46/8f/25933240485c0662bb3fa430ed0c6b8b8124ab3bc136154c07ce12644cb0/botocore-1.43.16-py3-none-any.whl", hash = "sha256:8ab05b1346d26a3c6d69c7338051f07bd4739a090f414d2cff43c0dbc1e18ca7", size = 15067437, upload-time = "2026-05-27T19:31:19.212Z" }, -] - -[[package]] -name = "brotli" -version = "1.2.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/f7/16/c92ca344d646e71a43b8bb353f0a6490d7f6e06210f8554c8f874e454285/brotli-1.2.0.tar.gz", hash = "sha256:e310f77e41941c13340a95976fe66a8a95b01e783d430eeaf7a2f87e0a57dd0a", size = 7388632, upload-time = "2025-11-05T18:39:42.86Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/17/e1/298c2ddf786bb7347a1cd71d63a347a79e5712a7c0cba9e3c3458ebd976f/brotli-1.2.0-cp314-cp314-macosx_10_15_universal2.whl", hash = "sha256:6c12dad5cd04530323e723787ff762bac749a7b256a5bece32b2243dd5c27b21", size = 863080, upload-time = "2025-11-05T18:38:45.503Z" }, - { url = "https://files.pythonhosted.org/packages/84/0c/aac98e286ba66868b2b3b50338ffbd85a35c7122e9531a73a37a29763d38/brotli-1.2.0-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:3219bd9e69868e57183316ee19c84e03e8f8b5a1d1f2667e1aa8c2f91cb061ac", size = 445453, upload-time = "2025-11-05T18:38:46.433Z" }, - { url = "https://files.pythonhosted.org/packages/ec/f1/0ca1f3f99ae300372635ab3fe2f7a79fa335fee3d874fa7f9e68575e0e62/brotli-1.2.0-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:963a08f3bebd8b75ac57661045402da15991468a621f014be54e50f53a58d19e", size = 1528168, upload-time = "2025-11-05T18:38:47.371Z" }, - { url = "https://files.pythonhosted.org/packages/d6/a6/2ebfc8f766d46df8d3e65b880a2e220732395e6d7dc312c1e1244b0f074a/brotli-1.2.0-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:9322b9f8656782414b37e6af884146869d46ab85158201d82bab9abbcb971dc7", size = 1627098, upload-time = "2025-11-05T18:38:48.385Z" }, - { url = "https://files.pythonhosted.org/packages/f3/2f/0976d5b097ff8a22163b10617f76b2557f15f0f39d6a0fe1f02b1a53e92b/brotli-1.2.0-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:cf9cba6f5b78a2071ec6fb1e7bd39acf35071d90a81231d67e92d637776a6a63", size = 1419861, upload-time = "2025-11-05T18:38:49.372Z" }, - { url = "https://files.pythonhosted.org/packages/9c/97/d76df7176a2ce7616ff94c1fb72d307c9a30d2189fe877f3dd99af00ea5a/brotli-1.2.0-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:7547369c4392b47d30a3467fe8c3330b4f2e0f7730e45e3103d7d636678a808b", size = 1484594, upload-time = "2025-11-05T18:38:50.655Z" }, - { url = "https://files.pythonhosted.org/packages/d3/93/14cf0b1216f43df5609f5b272050b0abd219e0b54ea80b47cef9867b45e7/brotli-1.2.0-cp314-cp314-musllinux_1_2_ppc64le.whl", hash = "sha256:fc1530af5c3c275b8524f2e24841cbe2599d74462455e9bae5109e9ff42e9361", size = 1593455, upload-time = "2025-11-05T18:38:51.624Z" }, - { url = "https://files.pythonhosted.org/packages/b3/73/3183c9e41ca755713bdf2cc1d0810df742c09484e2e1ddd693bee53877c1/brotli-1.2.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:d2d085ded05278d1c7f65560aae97b3160aeb2ea2c0b3e26204856beccb60888", size = 1488164, upload-time = "2025-11-05T18:38:53.079Z" }, - { url = "https://files.pythonhosted.org/packages/64/6a/0c78d8f3a582859236482fd9fa86a65a60328a00983006bcf6d83b7b2253/brotli-1.2.0-cp314-cp314-win32.whl", hash = "sha256:832c115a020e463c2f67664560449a7bea26b0c1fdd690352addad6d0a08714d", size = 339280, upload-time = "2025-11-05T18:38:54.02Z" }, - { url = "https://files.pythonhosted.org/packages/f5/10/56978295c14794b2c12007b07f3e41ba26acda9257457d7085b0bb3bb90c/brotli-1.2.0-cp314-cp314-win_amd64.whl", hash = "sha256:e7c0af964e0b4e3412a0ebf341ea26ec767fa0b4cf81abb5e897c9338b5ad6a3", size = 375639, upload-time = "2025-11-05T18:38:55.67Z" }, -] - -[[package]] -name = "brotlicffi" -version = "1.2.0.1" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "cffi" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/8a/b6/017dc5f852ed9b8735af77774509271acbf1de02d238377667145fcee01d/brotlicffi-1.2.0.1.tar.gz", hash = "sha256:c20d5c596278307ad06414a6d95a892377ea274a5c6b790c2548c009385d621c", size = 478156, upload-time = "2026-03-05T19:54:11.547Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/ef/f9/dfa56316837fa798eac19358351e974de8e1e2ca9475af4cb90293cd6576/brotlicffi-1.2.0.1-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:2c85e65913cf2b79c57a3fdd05b98d9731d9255dc0cb696b09376cc091b9cddd", size = 433046, upload-time = "2026-03-05T19:53:46.209Z" }, - { url = "https://files.pythonhosted.org/packages/4a/f5/f8f492158c76b0d940388801f04f747028971ad5774287bded5f1e53f08d/brotlicffi-1.2.0.1-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:535f2d05d0273408abc13fc0eebb467afac17b0ad85090c8913690d40207dac5", size = 1541126, upload-time = "2026-03-05T19:53:48.248Z" }, - { url = "https://files.pythonhosted.org/packages/3b/e1/ff87af10ac419600c63e9287a0649c673673ae6b4f2bcf48e96cb2f89f60/brotlicffi-1.2.0.1-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:ce17eb798ca59ecec67a9bb3fd7a4304e120d1cd02953ce522d959b9a84d58ac", size = 1541983, upload-time = "2026-03-05T19:53:50.317Z" }, - { url = "https://files.pythonhosted.org/packages/47/c0/80ecd9bd45776109fab14040e478bf63e456967c9ddee2353d8330ed8de1/brotlicffi-1.2.0.1-cp314-cp314t-win32.whl", hash = "sha256:3c9544f83cb715d95d7eab3af4adbbef8b2093ad6382288a83b3a25feb1a57ec", size = 349047, upload-time = "2026-03-05T19:53:52.215Z" }, - { url = "https://files.pythonhosted.org/packages/ab/98/13e5b250236a281b6cd9e92a01ee1ae231029fa78faee932ef3766e1cb24/brotlicffi-1.2.0.1-cp314-cp314t-win_amd64.whl", hash = "sha256:625f8115d32ae9c0740d01ea51518437c3fbaa3e78d41cb18459f6f7ac326000", size = 385652, upload-time = "2026-03-05T19:53:53.892Z" }, - { url = "https://files.pythonhosted.org/packages/9a/9f/b98dcd4af47994cee97aebac866996a006a2e5fc1fd1e2b82a8ad95cf09c/brotlicffi-1.2.0.1-cp38-abi3-macosx_11_0_arm64.whl", hash = "sha256:91ba5f0ccc040f6ff8f7efaf839f797723d03ed46acb8ae9408f99ffd2572cf4", size = 432608, upload-time = "2026-03-05T19:53:56.736Z" }, - { url = "https://files.pythonhosted.org/packages/b1/7a/ac4ee56595a061e3718a6d1ea7e921f4df156894acffb28ed88a1fd52022/brotlicffi-1.2.0.1-cp38-abi3-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:be9a670c6811af30a4bd42d7116dc5895d3b41beaa8ed8a89050447a0181f5ce", size = 1534257, upload-time = "2026-03-05T19:53:58.667Z" }, - { url = "https://files.pythonhosted.org/packages/99/39/e7410db7f6f56de57744ea52a115084ceb2735f4d44973f349bb92136586/brotlicffi-1.2.0.1-cp38-abi3-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:6f3314a3476f59e5443f9f72a6dff16edc0c3463c9b318feaef04ae3e4683f5a", size = 1536838, upload-time = "2026-03-05T19:54:00.705Z" }, - { url = "https://files.pythonhosted.org/packages/a6/75/6e7977d1935fc3fbb201cbd619be8f2c7aea25d40a096967132854b34708/brotlicffi-1.2.0.1-cp38-abi3-win32.whl", hash = "sha256:82ea52e2b5d3145b6c406ebd3efb0d55db718b7ad996bd70c62cec0439de1187", size = 343337, upload-time = "2026-03-05T19:54:02.446Z" }, - { url = "https://files.pythonhosted.org/packages/d8/ef/e7e485ce5e4ba3843a0a92feb767c7b6098fd6e65ce752918074d175ae71/brotlicffi-1.2.0.1-cp38-abi3-win_amd64.whl", hash = "sha256:da2e82a08e7778b8bc539d27ca03cdd684113e81394bfaaad8d0dfc6a17ddede", size = 379026, upload-time = "2026-03-05T19:54:04.322Z" }, -] - -[[package]] -name = "bytecode" -version = "0.17.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/98/c4/4818b392104bd426171fc2ce9c79c8edb4019ba6505747626d0f7107766c/bytecode-0.17.0.tar.gz", hash = "sha256:0c37efa5bd158b1b873f530cceea2c645611d55bd2dc2a4758b09f185749b6fd", size = 105863, upload-time = "2025-09-03T19:55:45.703Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/ce/80/379e685099841f8501a19fb58b496512ef432331fed38276c3938ab09d8e/bytecode-0.17.0-py3-none-any.whl", hash = "sha256:64fb10cde1db7ef5cc39bd414ecebd54ba3b40e1c4cf8121ca5e72f170916ff8", size = 43045, upload-time = "2025-09-03T19:55:43.879Z" }, -] - [[package]] name = "certifi" version = "2026.5.20" @@ -329,39 +91,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/59/8c/57e832b7af6d7c5abe66eb3fbe3a3a32f4d11ea23a1aa7131371035be991/certifi-2026.5.20-py3-none-any.whl", hash = "sha256:3c52e209ba0a4ad7aebe60436a4ab349c39e1e602e8c134221e546902ad25897", size = 134134, upload-time = "2026-05-20T11:46:48.578Z" }, ] -[[package]] -name = "cffi" -version = "2.0.0" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "pycparser", marker = "implementation_name != 'PyPy'" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/eb/56/b1ba7935a17738ae8453301356628e8147c79dbb825bcbc73dc7401f9846/cffi-2.0.0.tar.gz", hash = "sha256:44d1b5909021139fe36001ae048dbdde8214afa20200eda0f64c068cac5d5529", size = 523588, upload-time = "2025-09-08T23:24:04.541Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/92/c4/3ce07396253a83250ee98564f8d7e9789fab8e58858f35d07a9a2c78de9f/cffi-2.0.0-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:fc33c5141b55ed366cfaad382df24fe7dcbc686de5be719b207bb248e3053dc5", size = 185320, upload-time = "2025-09-08T23:23:18.087Z" }, - { url = "https://files.pythonhosted.org/packages/59/dd/27e9fa567a23931c838c6b02d0764611c62290062a6d4e8ff7863daf9730/cffi-2.0.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:c654de545946e0db659b3400168c9ad31b5d29593291482c43e3564effbcee13", size = 181487, upload-time = "2025-09-08T23:23:19.622Z" }, - { url = "https://files.pythonhosted.org/packages/d6/43/0e822876f87ea8a4ef95442c3d766a06a51fc5298823f884ef87aaad168c/cffi-2.0.0-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:24b6f81f1983e6df8db3adc38562c83f7d4a0c36162885ec7f7b77c7dcbec97b", size = 220049, upload-time = "2025-09-08T23:23:20.853Z" }, - { url = "https://files.pythonhosted.org/packages/b4/89/76799151d9c2d2d1ead63c2429da9ea9d7aac304603de0c6e8764e6e8e70/cffi-2.0.0-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:12873ca6cb9b0f0d3a0da705d6086fe911591737a59f28b7936bdfed27c0d47c", size = 207793, upload-time = "2025-09-08T23:23:22.08Z" }, - { url = "https://files.pythonhosted.org/packages/bb/dd/3465b14bb9e24ee24cb88c9e3730f6de63111fffe513492bf8c808a3547e/cffi-2.0.0-cp314-cp314-manylinux2014_s390x.manylinux_2_17_s390x.whl", hash = "sha256:d9b97165e8aed9272a6bb17c01e3cc5871a594a446ebedc996e2397a1c1ea8ef", size = 206300, upload-time = "2025-09-08T23:23:23.314Z" }, - { url = "https://files.pythonhosted.org/packages/47/d9/d83e293854571c877a92da46fdec39158f8d7e68da75bf73581225d28e90/cffi-2.0.0-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:afb8db5439b81cf9c9d0c80404b60c3cc9c3add93e114dcae767f1477cb53775", size = 219244, upload-time = "2025-09-08T23:23:24.541Z" }, - { url = "https://files.pythonhosted.org/packages/2b/0f/1f177e3683aead2bb00f7679a16451d302c436b5cbf2505f0ea8146ef59e/cffi-2.0.0-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:737fe7d37e1a1bffe70bd5754ea763a62a066dc5913ca57e957824b72a85e205", size = 222828, upload-time = "2025-09-08T23:23:26.143Z" }, - { url = "https://files.pythonhosted.org/packages/c6/0f/cafacebd4b040e3119dcb32fed8bdef8dfe94da653155f9d0b9dc660166e/cffi-2.0.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:38100abb9d1b1435bc4cc340bb4489635dc2f0da7456590877030c9b3d40b0c1", size = 220926, upload-time = "2025-09-08T23:23:27.873Z" }, - { url = "https://files.pythonhosted.org/packages/3e/aa/df335faa45b395396fcbc03de2dfcab242cd61a9900e914fe682a59170b1/cffi-2.0.0-cp314-cp314-win32.whl", hash = "sha256:087067fa8953339c723661eda6b54bc98c5625757ea62e95eb4898ad5e776e9f", size = 175328, upload-time = "2025-09-08T23:23:44.61Z" }, - { url = "https://files.pythonhosted.org/packages/bb/92/882c2d30831744296ce713f0feb4c1cd30f346ef747b530b5318715cc367/cffi-2.0.0-cp314-cp314-win_amd64.whl", hash = "sha256:203a48d1fb583fc7d78a4c6655692963b860a417c0528492a6bc21f1aaefab25", size = 185650, upload-time = "2025-09-08T23:23:45.848Z" }, - { url = "https://files.pythonhosted.org/packages/9f/2c/98ece204b9d35a7366b5b2c6539c350313ca13932143e79dc133ba757104/cffi-2.0.0-cp314-cp314-win_arm64.whl", hash = "sha256:dbd5c7a25a7cb98f5ca55d258b103a2054f859a46ae11aaf23134f9cc0d356ad", size = 180687, upload-time = "2025-09-08T23:23:47.105Z" }, - { url = "https://files.pythonhosted.org/packages/3e/61/c768e4d548bfa607abcda77423448df8c471f25dbe64fb2ef6d555eae006/cffi-2.0.0-cp314-cp314t-macosx_10_13_x86_64.whl", hash = "sha256:9a67fc9e8eb39039280526379fb3a70023d77caec1852002b4da7e8b270c4dd9", size = 188773, upload-time = "2025-09-08T23:23:29.347Z" }, - { url = "https://files.pythonhosted.org/packages/2c/ea/5f76bce7cf6fcd0ab1a1058b5af899bfbef198bea4d5686da88471ea0336/cffi-2.0.0-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:7a66c7204d8869299919db4d5069a82f1561581af12b11b3c9f48c584eb8743d", size = 185013, upload-time = "2025-09-08T23:23:30.63Z" }, - { url = "https://files.pythonhosted.org/packages/be/b4/c56878d0d1755cf9caa54ba71e5d049479c52f9e4afc230f06822162ab2f/cffi-2.0.0-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:7cc09976e8b56f8cebd752f7113ad07752461f48a58cbba644139015ac24954c", size = 221593, upload-time = "2025-09-08T23:23:31.91Z" }, - { url = "https://files.pythonhosted.org/packages/e0/0d/eb704606dfe8033e7128df5e90fee946bbcb64a04fcdaa97321309004000/cffi-2.0.0-cp314-cp314t-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:92b68146a71df78564e4ef48af17551a5ddd142e5190cdf2c5624d0c3ff5b2e8", size = 209354, upload-time = "2025-09-08T23:23:33.214Z" }, - { url = "https://files.pythonhosted.org/packages/d8/19/3c435d727b368ca475fb8742ab97c9cb13a0de600ce86f62eab7fa3eea60/cffi-2.0.0-cp314-cp314t-manylinux2014_s390x.manylinux_2_17_s390x.whl", hash = "sha256:b1e74d11748e7e98e2f426ab176d4ed720a64412b6a15054378afdb71e0f37dc", size = 208480, upload-time = "2025-09-08T23:23:34.495Z" }, - { url = "https://files.pythonhosted.org/packages/d0/44/681604464ed9541673e486521497406fadcc15b5217c3e326b061696899a/cffi-2.0.0-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:28a3a209b96630bca57cce802da70c266eb08c6e97e5afd61a75611ee6c64592", size = 221584, upload-time = "2025-09-08T23:23:36.096Z" }, - { url = "https://files.pythonhosted.org/packages/25/8e/342a504ff018a2825d395d44d63a767dd8ebc927ebda557fecdaca3ac33a/cffi-2.0.0-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:7553fb2090d71822f02c629afe6042c299edf91ba1bf94951165613553984512", size = 224443, upload-time = "2025-09-08T23:23:37.328Z" }, - { url = "https://files.pythonhosted.org/packages/e1/5e/b666bacbbc60fbf415ba9988324a132c9a7a0448a9a8f125074671c0f2c3/cffi-2.0.0-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:6c6c373cfc5c83a975506110d17457138c8c63016b563cc9ed6e056a82f13ce4", size = 223437, upload-time = "2025-09-08T23:23:38.945Z" }, - { url = "https://files.pythonhosted.org/packages/a0/1d/ec1a60bd1a10daa292d3cd6bb0b359a81607154fb8165f3ec95fe003b85c/cffi-2.0.0-cp314-cp314t-win32.whl", hash = "sha256:1fc9ea04857caf665289b7a75923f2c6ed559b8298a1b8c49e59f7dd95c8481e", size = 180487, upload-time = "2025-09-08T23:23:40.423Z" }, - { url = "https://files.pythonhosted.org/packages/bf/41/4c1168c74fac325c0c8156f04b6749c8b6a8f405bbf91413ba088359f60d/cffi-2.0.0-cp314-cp314t-win_amd64.whl", hash = "sha256:d68b6cef7827e8641e8ef16f4494edda8b36104d79773a334beaa1e3521430f6", size = 191726, upload-time = "2025-09-08T23:23:41.742Z" }, - { url = "https://files.pythonhosted.org/packages/ae/3a/dbeec9d1ee0844c679f6bb5d6ad4e9f198b1224f4e7a32825f47f6192b0c/cffi-2.0.0-cp314-cp314t-win_arm64.whl", hash = "sha256:0a1527a803f0a659de1af2e1fd700213caba79377e27e4693648c2923da066f9", size = 184195, upload-time = "2025-09-08T23:23:43.004Z" }, -] - [[package]] name = "charset-normalizer" version = "3.4.7" @@ -424,15 +153,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/d1/d6/3965ed04c63042e047cb6a3e6ed1a63a35087b6a609aa3a15ed8ac56c221/colorama-0.4.6-py2.py3-none-any.whl", hash = "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6", size = 25335, upload-time = "2022-10-25T02:36:20.889Z" }, ] -[[package]] -name = "comm" -version = "0.2.3" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/4c/13/7d740c5849255756bc17888787313b61fd38a0a8304fc4f073dfc46122aa/comm-0.2.3.tar.gz", hash = "sha256:2dc8048c10962d55d7ad693be1e7045d891b7ce8d999c97963a5e3e99c055971", size = 6319, upload-time = "2025-07-25T14:02:04.452Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/60/97/891a0971e1e4a8c5d2b20bbe0e524dc04548d2307fee33cdeba148fd4fc7/comm-0.2.3-py3-none-any.whl", hash = "sha256:c615d91d75f7f04f095b30d1c1711babd43bdc6419c1be9886a85f2f4e489417", size = 7294, upload-time = "2025-07-25T14:02:02.896Z" }, -] - [[package]] name = "contourpy" version = "1.3.3" @@ -466,112 +186,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/ae/8c/469afb6465b853afff216f9528ffda78a915ff880ed58813ba4faf4ba0b6/contourpy-1.3.3-cp314-cp314t-win_arm64.whl", hash = "sha256:b7448cb5a725bb1e35ce88771b86fba35ef418952474492cf7c764059933ff8b", size = 203831, upload-time = "2025-07-26T12:02:51.449Z" }, ] -[[package]] -name = "cramjam" -version = "2.11.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/14/12/34bf6e840a79130dfd0da7badfb6f7810b8fcfd60e75b0539372667b41b6/cramjam-2.11.0.tar.gz", hash = "sha256:5c82500ed91605c2d9781380b378397012e25127e89d64f460fea6aeac4389b4", size = 99100, upload-time = "2025-07-27T21:25:07.559Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/de/07/a1051cdbbe6d723df16d756b97f09da7c1adb69e29695c58f0392bc12515/cramjam-2.11.0-cp314-cp314-macosx_10_12_x86_64.macosx_11_0_arm64.macosx_10_12_universal2.whl", hash = "sha256:7ba5e38c9fbd06f086f4a5a64a1a5b7b417cd3f8fc07a20e5c03651f72f36100", size = 3554141, upload-time = "2025-07-27T21:23:17.938Z" }, - { url = "https://files.pythonhosted.org/packages/74/66/58487d2e16ef3d04f51a7c7f0e69823e806744b4c21101e89da4873074bc/cramjam-2.11.0-cp314-cp314-macosx_10_12_x86_64.whl", hash = "sha256:b8adeee57b41fe08e4520698a4b0bd3cc76dbd81f99424b806d70a5256a391d3", size = 1860353, upload-time = "2025-07-27T21:23:19.593Z" }, - { url = "https://files.pythonhosted.org/packages/67/b4/67f6254d166ffbcc9d5fa1b56876eaa920c32ebc8e9d3d525b27296b693b/cramjam-2.11.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:b96a74fa03a636c8a7d76f700d50e9a8bc17a516d6a72d28711225d641e30968", size = 1693832, upload-time = "2025-07-27T21:23:21.185Z" }, - { url = "https://files.pythonhosted.org/packages/55/a3/4e0b31c0d454ae70c04684ed7c13d3c67b4c31790c278c1e788cb804fa4a/cramjam-2.11.0-cp314-cp314-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:c3811a56fa32e00b377ef79121c0193311fd7501f0fb378f254c7f083cc1fbe0", size = 2027080, upload-time = "2025-07-27T21:23:23.303Z" }, - { url = "https://files.pythonhosted.org/packages/d9/c7/5e8eed361d1d3b8be14f38a54852c5370cc0ceb2c2d543b8ba590c34f080/cramjam-2.11.0-cp314-cp314-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c5d927e87461f8a0d448e4ab5eb2bca9f31ca5d8ea86d70c6f470bb5bc666d7e", size = 1761543, upload-time = "2025-07-27T21:23:24.991Z" }, - { url = "https://files.pythonhosted.org/packages/09/0c/06b7f8b0ce9fde89470505116a01fc0b6cb92d406c4fb1e46f168b5d3fa5/cramjam-2.11.0-cp314-cp314-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:f1f5c450121430fd89cb5767e0a9728ecc65997768fd4027d069cb0368af62f9", size = 1854636, upload-time = "2025-07-27T21:23:26.987Z" }, - { url = "https://files.pythonhosted.org/packages/6f/c6/6ebc02c9d5acdf4e5f2b1ec6e1252bd5feee25762246798ae823b3347457/cramjam-2.11.0-cp314-cp314-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:724aa7490be50235d97f07e2ca10067927c5d7f336b786ddbc868470e822aa25", size = 2032715, upload-time = "2025-07-27T21:23:28.603Z" }, - { url = "https://files.pythonhosted.org/packages/a2/77/a122971c23f5ca4b53e4322c647ac7554626c95978f92d19419315dddd05/cramjam-2.11.0-cp314-cp314-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:54c4637122e7cfd7aac5c1d3d4c02364f446d6923ea34cf9d0e8816d6e7a4936", size = 2069039, upload-time = "2025-07-27T21:23:30.319Z" }, - { url = "https://files.pythonhosted.org/packages/19/0f/f6121b90b86b9093c066889274d26a1de3f29969d45c2ed1ecbe2033cb78/cramjam-2.11.0-cp314-cp314-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:17eb39b1696179fb471eea2de958fa21f40a2cd8bf6b40d428312d5541e19dc4", size = 1979566, upload-time = "2025-07-27T21:23:32.002Z" }, - { url = "https://files.pythonhosted.org/packages/e0/a3/f95bc57fd7f4166ce6da816cfa917fb7df4bb80e669eb459d85586498414/cramjam-2.11.0-cp314-cp314-musllinux_1_1_aarch64.whl", hash = "sha256:36aa5a798aa34e11813a80425a30d8e052d8de4a28f27bfc0368cfc454d1b403", size = 2030905, upload-time = "2025-07-27T21:23:33.696Z" }, - { url = "https://files.pythonhosted.org/packages/fc/52/e429de4e8bc86ee65e090dae0f87f45abd271742c63fb2d03c522ffde28a/cramjam-2.11.0-cp314-cp314-musllinux_1_1_armv7l.whl", hash = "sha256:449fca52774dc0199545fbf11f5128933e5a6833946707885cf7be8018017839", size = 2155592, upload-time = "2025-07-27T21:23:35.375Z" }, - { url = "https://files.pythonhosted.org/packages/6c/6c/65a7a0207787ad39ad804af4da7f06a60149de19481d73d270b540657234/cramjam-2.11.0-cp314-cp314-musllinux_1_1_i686.whl", hash = "sha256:d87d37b3d476f4f7623c56a232045d25bd9b988314702ea01bd9b4a94948a778", size = 2170839, upload-time = "2025-07-27T21:23:37.197Z" }, - { url = "https://files.pythonhosted.org/packages/b2/c5/5c5db505ba692bc844246b066e23901d5905a32baf2f33719c620e65887f/cramjam-2.11.0-cp314-cp314-musllinux_1_1_x86_64.whl", hash = "sha256:26cb45c47d71982d76282e303931c6dd4baee1753e5d48f9a89b3a63e690b3a3", size = 2157236, upload-time = "2025-07-27T21:23:38.854Z" }, - { url = "https://files.pythonhosted.org/packages/b0/22/88e6693e60afe98901e5bbe91b8dea193e3aa7f42e2770f9c3339f5c1065/cramjam-2.11.0-cp314-cp314-win32.whl", hash = "sha256:4efe919d443c2fd112fe25fe636a52f9628250c9a50d9bddb0488d8a6c09acc6", size = 1604136, upload-time = "2025-07-27T21:23:40.56Z" }, - { url = "https://files.pythonhosted.org/packages/cc/f8/01618801cd59ccedcc99f0f96d20be67d8cfc3497da9ccaaad6b481781dd/cramjam-2.11.0-cp314-cp314-win_amd64.whl", hash = "sha256:ccec3524ea41b9abd5600e3e27001fd774199dbb4f7b9cb248fcee37d4bda84c", size = 1710272, upload-time = "2025-07-27T21:23:42.236Z" }, - { url = "https://files.pythonhosted.org/packages/40/81/6cdb3ed222d13ae86bda77aafe8d50566e81a1169d49ed195b6263610704/cramjam-2.11.0-cp314-cp314t-macosx_10_12_x86_64.macosx_11_0_arm64.macosx_10_12_universal2.whl", hash = "sha256:966ac9358b23d21ecd895c418c048e806fd254e46d09b1ff0cdad2eba195ea3e", size = 3559671, upload-time = "2025-07-27T21:23:44.504Z" }, - { url = "https://files.pythonhosted.org/packages/cb/43/52b7e54fe5ba1ef0270d9fdc43dabd7971f70ea2d7179be918c997820247/cramjam-2.11.0-cp314-cp314t-macosx_10_12_x86_64.whl", hash = "sha256:387f09d647a0d38dcb4539f8a14281f8eb6bb1d3e023471eb18a5974b2121c86", size = 1867876, upload-time = "2025-07-27T21:23:46.987Z" }, - { url = "https://files.pythonhosted.org/packages/9d/28/30d5b8d10acd30db3193bc562a313bff722888eaa45cfe32aa09389f2b24/cramjam-2.11.0-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:665b0d8fbbb1a7f300265b43926457ec78385200133e41fef19d85790fc1e800", size = 1695562, upload-time = "2025-07-27T21:23:48.644Z" }, - { url = "https://files.pythonhosted.org/packages/d9/86/ec806f986e01b896a650655024ea52a13e25c3ac8a3a382f493089483cdc/cramjam-2.11.0-cp314-cp314t-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:ca905387c7a371531b9622d93471be4d745ef715f2890c3702479cd4fc85aa51", size = 2025056, upload-time = "2025-07-27T21:23:50.404Z" }, - { url = "https://files.pythonhosted.org/packages/09/43/c2c17586b90848d29d63181f7d14b8bd3a7d00975ad46e3edf2af8af7e1f/cramjam-2.11.0-cp314-cp314t-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3c1aa56aef2c8af55a21ed39040a94a12b53fb23beea290f94d19a76027e2ffb", size = 1764084, upload-time = "2025-07-27T21:23:52.265Z" }, - { url = "https://files.pythonhosted.org/packages/2b/a9/68bc334fadb434a61df10071dc8606702aa4f5b6cdb2df62474fc21d2845/cramjam-2.11.0-cp314-cp314t-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:e5db59c1cdfaa2ab85cc988e602d6919495f735ca8a5fd7603608eb1e23c26d5", size = 1854859, upload-time = "2025-07-27T21:23:54.085Z" }, - { url = "https://files.pythonhosted.org/packages/5b/4e/b48e67835b5811ec5e9cb2e2bcba9c3fd76dab3e732569fe801b542c6ca9/cramjam-2.11.0-cp314-cp314t-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:b1f893014f00fe5e89a660a032e813bf9f6d91de74cd1490cdb13b2b59d0c9a3", size = 2035970, upload-time = "2025-07-27T21:23:55.758Z" }, - { url = "https://files.pythonhosted.org/packages/c4/70/d2ac33d572b4d90f7f0f2c8a1d60fb48f06b128fdc2c05f9b49891bb0279/cramjam-2.11.0-cp314-cp314t-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c26a1eb487947010f5de24943bd7c422dad955b2b0f8650762539778c380ca89", size = 2069320, upload-time = "2025-07-27T21:23:57.494Z" }, - { url = "https://files.pythonhosted.org/packages/1d/4c/85cec77af4a74308ba5fca8e296c4e2f80ec465c537afc7ab1e0ca2f9a00/cramjam-2.11.0-cp314-cp314t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7d5c8bfb438d94e7b892d1426da5fc4b4a5370cc360df9b8d9d77c33b896c37e", size = 1982668, upload-time = "2025-07-27T21:23:59.126Z" }, - { url = "https://files.pythonhosted.org/packages/55/45/938546d1629e008cc3138df7c424ef892719b1796ff408a2ab8550032e5e/cramjam-2.11.0-cp314-cp314t-musllinux_1_1_aarch64.whl", hash = "sha256:cb1fb8c9337ab0da25a01c05d69a0463209c347f16512ac43be5986f3d1ebaf4", size = 2034028, upload-time = "2025-07-27T21:24:00.865Z" }, - { url = "https://files.pythonhosted.org/packages/01/76/b5a53e20505555f1640e66dcf70394bcf51a1a3a072aa18ea35135a0f9ed/cramjam-2.11.0-cp314-cp314t-musllinux_1_1_armv7l.whl", hash = "sha256:1f6449f6de52dde3e2f1038284910c8765a397a25e2d05083870f3f5e7fc682c", size = 2155513, upload-time = "2025-07-27T21:24:02.92Z" }, - { url = "https://files.pythonhosted.org/packages/84/12/8d3f6ceefae81bbe45a347fdfa2219d9f3ac75ebc304f92cd5fcb4fbddc5/cramjam-2.11.0-cp314-cp314t-musllinux_1_1_i686.whl", hash = "sha256:382dec4f996be48ed9c6958d4e30c2b89435d7c2c4dbf32480b3b8886293dd65", size = 2170035, upload-time = "2025-07-27T21:24:04.558Z" }, - { url = "https://files.pythonhosted.org/packages/4b/85/3be6f0a1398f976070672be64f61895f8839857618a2d8cc0d3ab529d3dc/cramjam-2.11.0-cp314-cp314t-musllinux_1_1_x86_64.whl", hash = "sha256:d388bd5723732c3afe1dd1d181e4213cc4e1be210b080572e7d5749f6e955656", size = 2160229, upload-time = "2025-07-27T21:24:06.729Z" }, - { url = "https://files.pythonhosted.org/packages/57/5e/66cfc3635511b20014bbb3f2ecf0095efb3049e9e96a4a9e478e4f3d7b78/cramjam-2.11.0-cp314-cp314t-win32.whl", hash = "sha256:0a70ff17f8e1d13f322df616505550f0f4c39eda62290acb56f069d4857037c8", size = 1610267, upload-time = "2025-07-27T21:24:08.428Z" }, - { url = "https://files.pythonhosted.org/packages/ce/c6/c71e82e041c95ffe6a92ac707785500aa2a515a4339c2c7dd67e3c449249/cramjam-2.11.0-cp314-cp314t-win_amd64.whl", hash = "sha256:028400d699442d40dbda02f74158c73d05cb76587a12490d0bfedd958fd49188", size = 1713108, upload-time = "2025-07-27T21:24:10.147Z" }, -] - -[[package]] -name = "crontab" -version = "1.0.5" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/d6/36/a255b6f5a2e22df03fd2b2f3088974b44b8c9e9407e26b44742cb7cfbf5b/crontab-1.0.5.tar.gz", hash = "sha256:f80e01b4f07219763a9869f926dd17147278e7965a928089bca6d3dc80ae46d5", size = 21963, upload-time = "2025-07-09T17:09:38.264Z" } - -[[package]] -name = "cryptography" -version = "48.0.0" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "cffi", marker = "platform_python_implementation != 'PyPy'" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/9f/a9/db8f313fdcd85d767d4973515e1db101f9c71f95fced83233de224673757/cryptography-48.0.0.tar.gz", hash = "sha256:5c3932f4436d1cccb036cb0eaef46e6e2db91035166f1ad6505c3c9d5a635920", size = 832984, upload-time = "2026-05-04T22:59:38.133Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/df/3d/01f6dd9190170a5a241e0e98c2d04be3664a9e6f5b9b872cde63aff1c3dd/cryptography-48.0.0-cp311-abi3-macosx_10_9_universal2.whl", hash = "sha256:0c558d2cdffd8f4bbb30fc7134c74d2ca9a476f830bb053074498fbc86f41ed6", size = 8001587, upload-time = "2026-05-04T22:57:36.803Z" }, - { url = "https://files.pythonhosted.org/packages/b2/6e/e90527eef33f309beb811cf7c982c3aeffcce8e3edb178baa4ca3ae4a6fa/cryptography-48.0.0-cp311-abi3-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:f5333311663ea94f75dd408665686aaf426563556bb5283554a3539177e03b8c", size = 4690433, upload-time = "2026-05-04T22:57:40.373Z" }, - { url = "https://files.pythonhosted.org/packages/90/04/673510ed51ddff56575f306cf1617d80411ee76831ccd3097599140efdfe/cryptography-48.0.0-cp311-abi3-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:7995ef305d7165c3f11ae07f2517e5a4f1d5c18da1376a0a9ed496336b69e5f3", size = 4710620, upload-time = "2026-05-04T22:57:42.935Z" }, - { url = "https://files.pythonhosted.org/packages/14/d5/e9c4ef932c8d800490c34d8bd589d64a31d5890e27ec9e9ad532be893294/cryptography-48.0.0-cp311-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:40ba1f85eaa6959837b1d51c9767e230e14612eea4ef110ee8854ada22da1bf5", size = 4696283, upload-time = "2026-05-04T22:57:45.294Z" }, - { url = "https://files.pythonhosted.org/packages/0c/29/174b9dfb60b12d59ecfc6cfa04bc88c21b42a54f01b8aae09bb6e51e4c7f/cryptography-48.0.0-cp311-abi3-manylinux_2_28_ppc64le.whl", hash = "sha256:369a6348999f94bbd53435c894377b20ab95f25a9065c283570e70150d8abc3c", size = 5296573, upload-time = "2026-05-04T22:57:47.933Z" }, - { url = "https://files.pythonhosted.org/packages/95/38/0d29a6fd7d0d1373f0c0c88a04ba20e359b257753ac497564cd660fc1d55/cryptography-48.0.0-cp311-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:a0e692c683f4df67815a2d258b324e66f4738bd7a96a218c826dce4f4bd05d8f", size = 4743677, upload-time = "2026-05-04T22:57:50.067Z" }, - { url = "https://files.pythonhosted.org/packages/30/be/eef653013d5c63b6a490529e0316f9ac14a37602965d4903efed1399f32b/cryptography-48.0.0-cp311-abi3-manylinux_2_31_armv7l.whl", hash = "sha256:18349bbc56f4743c8b12dc32e2bccb2cf83ee8b69a3bba74ef8ae857e26b3d25", size = 4330808, upload-time = "2026-05-04T22:57:52.301Z" }, - { url = "https://files.pythonhosted.org/packages/84/9e/500463e87abb7a0a0f9f256ec21123ecde0a7b5541a15e840ea54551fd81/cryptography-48.0.0-cp311-abi3-manylinux_2_34_aarch64.whl", hash = "sha256:7e8eac43dfca5c4cccc6dad9a80504436fca53bb9bc3100a2386d730fbe6b602", size = 4695941, upload-time = "2026-05-04T22:57:54.603Z" }, - { url = "https://files.pythonhosted.org/packages/e3/dc/7303087450c2ec9e7fbb750e17c2abfbc658f23cbd0e54009509b7cc4091/cryptography-48.0.0-cp311-abi3-manylinux_2_34_ppc64le.whl", hash = "sha256:9ccdac7d40688ecb5a3b4a604b8a88c8002e3442d6c60aead1db2a89a041560c", size = 5252579, upload-time = "2026-05-04T22:57:57.207Z" }, - { url = "https://files.pythonhosted.org/packages/d0/c0/7101d3b7215edcdc90c45da544961fd8ed2d6448f77577460fa75a8443f7/cryptography-48.0.0-cp311-abi3-manylinux_2_34_x86_64.whl", hash = "sha256:bd72e68b06bb1e96913f97dd4901119bc17f39d4586a5adf2d3e47bc2b9d58b5", size = 4743326, upload-time = "2026-05-04T22:57:59.535Z" }, - { url = "https://files.pythonhosted.org/packages/ac/d8/5b833bad13016f562ab9d063d68199a4bd121d18458e439515601d3357ec/cryptography-48.0.0-cp311-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:59baa2cb386c4f0b9905bd6eb4c2a79a69a128408fd31d32ca4d7102d4156321", size = 4826672, upload-time = "2026-05-04T22:58:01.996Z" }, - { url = "https://files.pythonhosted.org/packages/98/e1/7074eb8bf3c135558c73fc2bcf0f5633f912e6fb87e868a55c454080ef09/cryptography-48.0.0-cp311-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:9249e3cd978541d665967ac2cb2787fd6a62bddf1e75b3e347a594d7dacf4f74", size = 4972574, upload-time = "2026-05-04T22:58:03.968Z" }, - { url = "https://files.pythonhosted.org/packages/04/70/e5a1b41d325f797f39427aa44ef8baf0be500065ab6d8e10369d850d4a4f/cryptography-48.0.0-cp311-abi3-win32.whl", hash = "sha256:9c459db21422be75e2809370b829a87eb37f74cd785fc4aa9ea1e5f43b47cda4", size = 3294868, upload-time = "2026-05-04T22:58:06.467Z" }, - { url = "https://files.pythonhosted.org/packages/f4/ac/8ac51b4a5fc5932eb7ee5c517ba7dc8cd834f0048962b6b352f00f41ebf9/cryptography-48.0.0-cp311-abi3-win_amd64.whl", hash = "sha256:5b012212e08b8dd5edc78ef54da83dd9892fd9105323b3993eff6bea65dc21d7", size = 3817107, upload-time = "2026-05-04T22:58:08.845Z" }, - { url = "https://files.pythonhosted.org/packages/6b/84/70e3feea9feea87fd7cbe77efb2712ae1e3e6edf10749dc6e95f4e60e455/cryptography-48.0.0-cp314-cp314t-macosx_10_9_universal2.whl", hash = "sha256:3cb07a3ed6431663cd321ea8a000a1314c74211f823e4177fefa2255e057d1ec", size = 7986556, upload-time = "2026-05-04T22:58:11.172Z" }, - { url = "https://files.pythonhosted.org/packages/89/6e/18e07a618bb5442ba10cf4df16e99c071365528aa570dfcb8c02e25a303b/cryptography-48.0.0-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:8c7378637d7d88016fa6791c159f698b3d3eed28ebf844ac36b9dc04a14dae18", size = 4684776, upload-time = "2026-05-04T22:58:13.712Z" }, - { url = "https://files.pythonhosted.org/packages/be/6a/4ea3b4c6c6759794d5ee2103c304a5076dc4b19ae1f9fe47dba439e159e9/cryptography-48.0.0-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:cc90c0b39b2e3c65ef52c804b72e3c58f8a04ab2a1871272798e5f9572c17d20", size = 4698121, upload-time = "2026-05-04T22:58:16.448Z" }, - { url = "https://files.pythonhosted.org/packages/2f/59/6ff6ad6cae03bb887da2a5860b2c9805f8dac969ef01ce563336c49bd1d1/cryptography-48.0.0-cp314-cp314t-manylinux_2_28_aarch64.whl", hash = "sha256:76341972e1eff8b4bea859f09c0d3e64b96ce931b084f9b9b7db8ef364c30eff", size = 4690042, upload-time = "2026-05-04T22:58:18.544Z" }, - { url = "https://files.pythonhosted.org/packages/ca/b4/fc334ed8cfd705aca282fe4d8f5ae64a8e0f74932e9feecb344610cf6e4d/cryptography-48.0.0-cp314-cp314t-manylinux_2_28_ppc64le.whl", hash = "sha256:55b7718303bf06a5753dcdccf2f3945cf18ad7bffde41b61226e4db31ab89a9c", size = 5282526, upload-time = "2026-05-04T22:58:20.75Z" }, - { url = "https://files.pythonhosted.org/packages/11/08/9f8c5386cc4cd90d8255c7cdd0f5baf459a08502a09de30dc51f553d38dc/cryptography-48.0.0-cp314-cp314t-manylinux_2_28_x86_64.whl", hash = "sha256:a64697c641c7b1b2178e573cbc31c7c6684cd56883a478d75143dbb7118036db", size = 4733116, upload-time = "2026-05-04T22:58:23.627Z" }, - { url = "https://files.pythonhosted.org/packages/b8/77/99307d7574045699f8805aa500fa0fb83422d115b5400a064ddd306d7750/cryptography-48.0.0-cp314-cp314t-manylinux_2_31_armv7l.whl", hash = "sha256:561215ea3879cb1cbbf272867e2efda62476f240fb58c64de6b393ae19246741", size = 4316030, upload-time = "2026-05-04T22:58:25.581Z" }, - { url = "https://files.pythonhosted.org/packages/fd/36/a608b98337af3cb2aff4818e406649d30572b7031918b04c87d979495348/cryptography-48.0.0-cp314-cp314t-manylinux_2_34_aarch64.whl", hash = "sha256:ad64688338ed4bc1a6618076ba75fd7194a5f1797ac60b47afe926285adb3166", size = 4689640, upload-time = "2026-05-04T22:58:27.747Z" }, - { url = "https://files.pythonhosted.org/packages/dd/a6/825010a291b4438aecc1f568bc428189fc1175515223632477c07dc0a6df/cryptography-48.0.0-cp314-cp314t-manylinux_2_34_ppc64le.whl", hash = "sha256:906cbf0670286c6e0044156bc7d4af9cbb0ef6db9f73e52c3ec56ba6bdde5336", size = 5237657, upload-time = "2026-05-04T22:58:29.848Z" }, - { url = "https://files.pythonhosted.org/packages/b9/09/4e76a09b4caa29aad535ddc806f5d4c5d01885bd978bd984fbc6ca032cae/cryptography-48.0.0-cp314-cp314t-manylinux_2_34_x86_64.whl", hash = "sha256:ea8990436d914540a40ab24b6a77c0969695ed52f4a4874c5137ccf7045a7057", size = 4732362, upload-time = "2026-05-04T22:58:32.009Z" }, - { url = "https://files.pythonhosted.org/packages/18/78/444fa04a77d0cb95f417dda20d450e13c56ba8e5220fc892a1658f44f882/cryptography-48.0.0-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:c18684a7f0cc9a3cb60328f496b8e3372def7c5d2df39ac267878b05565aaaae", size = 4819580, upload-time = "2026-05-04T22:58:34.254Z" }, - { url = "https://files.pythonhosted.org/packages/38/85/ea67067c70a1fd4be2c63d35eeed82658023021affccc7b17705f8527dd2/cryptography-48.0.0-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:9be5aafa5736574f8f15f262adc81b2a9869e2cfe9014d52a44633905b40d52c", size = 4963283, upload-time = "2026-05-04T22:58:36.376Z" }, - { url = "https://files.pythonhosted.org/packages/75/54/cc6d0f3deac3e81c7f847e8a189a12b6cdd65059b43dad25d4316abd849a/cryptography-48.0.0-cp314-cp314t-win32.whl", hash = "sha256:c17dfe85494deaeddc5ce251aebd1d60bbe6afc8b62071bb0b469431a000124f", size = 3270954, upload-time = "2026-05-04T22:58:38.791Z" }, - { url = "https://files.pythonhosted.org/packages/49/67/cc947e288c0758a4e5473d1dcb743037ab7785541265a969240b8885441a/cryptography-48.0.0-cp314-cp314t-win_amd64.whl", hash = "sha256:27241b1dc9962e056062a8eef1991d02c3a24569c95975bd2322a8a52c6e5e12", size = 3797313, upload-time = "2026-05-04T22:58:40.746Z" }, - { url = "https://files.pythonhosted.org/packages/f2/63/61d4a4e1c6b6bab6ce1e213cd36a24c415d90e76d78c5eb8577c5541d2e8/cryptography-48.0.0-cp39-abi3-macosx_10_9_universal2.whl", hash = "sha256:58d00498e8933e4a194f3076aee1b4a97dfec1a6da444535755822fe5d8b0b86", size = 7983482, upload-time = "2026-05-04T22:58:43.769Z" }, - { url = "https://files.pythonhosted.org/packages/d5/ac/f5b5995b87770c693e2596559ffafe195b4033a57f14a82268a2842953f3/cryptography-48.0.0-cp39-abi3-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:614d0949f4790582d2cc25553abd09dd723025f0c0e7c67376a1d77196743d6e", size = 4683266, upload-time = "2026-05-04T22:58:46.064Z" }, - { url = "https://files.pythonhosted.org/packages/ec/c6/8b14f67e18338fbc4adb76f66c001f5c3610b3e2d1837f268f47a347dbbb/cryptography-48.0.0-cp39-abi3-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:7ce4bfae76319a532a2dc68f82cc32f5676ee792a983187dac07183690e5c66f", size = 4696228, upload-time = "2026-05-04T22:58:48.22Z" }, - { url = "https://files.pythonhosted.org/packages/ea/73/f808fbae9514bd91b47875b003f13e284c8c6bdfd904b7944e803937eec1/cryptography-48.0.0-cp39-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:2eb992bbd4661238c5a397594c83f5b4dc2bc5b848c365c8f991b6780efcc5c7", size = 4689097, upload-time = "2026-05-04T22:58:50.9Z" }, - { url = "https://files.pythonhosted.org/packages/93/01/d86632d7d28db8ae83221995752eeb6639ffb374c2d22955648cf8d52797/cryptography-48.0.0-cp39-abi3-manylinux_2_28_ppc64le.whl", hash = "sha256:22a5cb272895dce158b2cacdfdc3debd299019659f42947dbdac6f32d68fe832", size = 5283582, upload-time = "2026-05-04T22:58:53.017Z" }, - { url = "https://files.pythonhosted.org/packages/02/e1/50edc7a50334807cc4791fc4a0ce7468b4a1416d9138eab358bfc9a3d70b/cryptography-48.0.0-cp39-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:2b4d59804e8408e2fea7d1fbaf218e5ec984325221db76e6a241a9abd6cdd95c", size = 4730479, upload-time = "2026-05-04T22:58:55.611Z" }, - { url = "https://files.pythonhosted.org/packages/6f/af/99a582b1b1641ff5911ac559beb45097cf79efd4ead4657f578ef1af2d47/cryptography-48.0.0-cp39-abi3-manylinux_2_31_armv7l.whl", hash = "sha256:984a20b0f62a26f48a3396c72e4bc34c66e356d356bf370053066b3b6d54634a", size = 4326481, upload-time = "2026-05-04T22:58:57.607Z" }, - { url = "https://files.pythonhosted.org/packages/90/ee/89aa26a06ef0a7d7611788ffd571a7c50e368cc6a4d5eef8b4884e866edb/cryptography-48.0.0-cp39-abi3-manylinux_2_34_aarch64.whl", hash = "sha256:5a5ed8fde7a1d09376ca0b40e68cd59c69fe23b1f9768bd5824f54681626032a", size = 4688713, upload-time = "2026-05-04T22:59:00.077Z" }, - { url = "https://files.pythonhosted.org/packages/70/ba/bcb1b0bb7a33d4c7c0c4d4c7874b4a62ae4f56113a5f4baefa362dfb1f0f/cryptography-48.0.0-cp39-abi3-manylinux_2_34_ppc64le.whl", hash = "sha256:8cd666227ef7af430aa5914a9910e0ddd703e75f039cef0825cd0da71b6b711a", size = 5238165, upload-time = "2026-05-04T22:59:02.317Z" }, - { url = "https://files.pythonhosted.org/packages/c9/70/ca4003b1ce5ca3dc3186ada51908c8a9b9ff7d5cab83cc0d43ee14ec144f/cryptography-48.0.0-cp39-abi3-manylinux_2_34_x86_64.whl", hash = "sha256:9071196d81abc88b3516ac8cdfad32e2b66dd4a5393a8e68a961e9161ddc6239", size = 4729947, upload-time = "2026-05-04T22:59:05.255Z" }, - { url = "https://files.pythonhosted.org/packages/44/a0/4ec7cf774207905aef1a8d11c3750d5a1db805eb380ee4e16df317870128/cryptography-48.0.0-cp39-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:1e2d54c8be6152856a36f0882ab231e70f8ec7f14e93cf87db8a2ed056bf160c", size = 4822059, upload-time = "2026-05-04T22:59:07.802Z" }, - { url = "https://files.pythonhosted.org/packages/1e/75/a2e55f99c16fcac7b5d6c1eb19ad8e00799854d6be5ca845f9259eae1681/cryptography-48.0.0-cp39-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:a5da777e32ffed6f85a7b2b3f7c5cbc88c146bfcd0a1d7baf5fcc6c52ee35dd4", size = 4960575, upload-time = "2026-05-04T22:59:09.851Z" }, - { url = "https://files.pythonhosted.org/packages/b8/23/6e6f32143ab5d8b36ca848a502c4bcd477ae75b9e1677e3530d669062578/cryptography-48.0.0-cp39-abi3-win32.whl", hash = "sha256:77a2ccbbe917f6710e05ba9adaa25fb5075620bf3ea6fb751997875aff4ae4bd", size = 3279117, upload-time = "2026-05-04T22:59:12.019Z" }, - { url = "https://files.pythonhosted.org/packages/9d/9a/0fea98a70cf1749d41d738836f6349d97945f7c89433a259a6c2642eefeb/cryptography-48.0.0-cp39-abi3-win_amd64.whl", hash = "sha256:16cd65b9330583e4619939b3a3843eec1e6e789744bb01e7c7e2e62e33c239c8", size = 3792100, upload-time = "2026-05-04T22:59:14.884Z" }, -] - -[[package]] -name = "css-html-js-minify" -version = "2.5.5" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/75/61/f52e5225abe8e36ed5396e5ae3074df5f4ef994b540e9b4fd55a39b03cfd/css-html-js-minify-2.5.5.zip", hash = "sha256:4a9f11f7e0496f5284d12111f3ba4ff5ff2023d12f15d195c9c48bd97013746c", size = 33156, upload-time = "2018-04-14T15:10:29.53Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/e8/21/1260081a2c67105a3bd0f8692ff3c80b5f0cb5fe9f3f8fd4a990f17b8a39/css_html_js_minify-2.5.5-py2.py3-none-any.whl", hash = "sha256:3da9d35ac0db8ca648c1b543e0e801d7ca0bab9e6bfd8418fee59d5ae001727a", size = 40527, upload-time = "2018-04-14T15:10:26.667Z" }, -] - [[package]] name = "cycler" version = "0.12.1" @@ -581,75 +195,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/e7/05/c19819d5e3d95294a6f5947fb9b9629efb316b96de511b418c53d245aae6/cycler-0.12.1-py3-none-any.whl", hash = "sha256:85cef7cff222d8644161529808465972e51340599459b8ac3ccbac5a854e0d30", size = 8321, upload-time = "2023-10-07T05:32:16.783Z" }, ] -[[package]] -name = "dateparser" -version = "1.4.0" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "python-dateutil" }, - { name = "pytz" }, - { name = "regex" }, - { name = "tzlocal" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/46/2d/a0ccdb78788064fa0dc901b8524e50615c42be1d78b78d646d0b28d09180/dateparser-1.4.0.tar.gz", hash = "sha256:97a21840d5ecdf7630c584f673338a5afac5dfe84f647baf4d7e8df98f9354a4", size = 321512, upload-time = "2026-03-26T09:56:10.292Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/b4/0b/3c3bb7cbe757279e693a0be6049048012f794d01f81099609ecd53b899f0/dateparser-1.4.0-py3-none-any.whl", hash = "sha256:7902b8e85d603494bf70a5a0b1decdddb2270b9c6e6b2bc8a57b93476c0df378", size = 300379, upload-time = "2026-03-26T09:56:08.409Z" }, -] - -[[package]] -name = "ddtrace" -version = "4.3.0" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "bytecode" }, - { name = "envier" }, - { name = "opentelemetry-api" }, - { name = "wrapt" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/bc/d0/0690d1b88b936ab31219ca9078859316185989be0d186ff33896f3191d39/ddtrace-4.3.0.tar.gz", hash = "sha256:366bc941a20137e6f5bff22aefd6a221ca15f1b087c31bf28fce448619f443b4", size = 7085760, upload-time = "2026-01-27T20:55:27.878Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/82/75/10b07479800a5a8947fd0e79001b009bded2a17ea5af96865d677eb91a98/ddtrace-4.3.0-cp314-cp314-macosx_14_0_arm64.whl", hash = "sha256:e26eb6de7eda425d75f5a1f55e55ad2d13e56f51b43c4b656478367a6692e0bd", size = 6904866, upload-time = "2026-01-27T20:54:38.633Z" }, - { url = "https://files.pythonhosted.org/packages/0e/b2/37f8cf8f57d17f350d2ab86ee814fc5b6c600d0ea2ee2ea8f96be1178cd0/ddtrace-4.3.0-cp314-cp314-macosx_14_0_x86_64.whl", hash = "sha256:f7ce739a6ef9b4d210a746327d377234b1996080028eddbe9c6a1f35193c348e", size = 7329967, upload-time = "2026-01-27T20:54:41.296Z" }, - { url = "https://files.pythonhosted.org/packages/19/c7/61b9a857f7b43234b896fd5e80d994f9efa007b0980887bf6d4d48ab6c20/ddtrace-4.3.0-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:0dff123cc9e39ff393c164198bb166270bcc826a87009af9b4f1431653aef531", size = 7721410, upload-time = "2026-01-27T20:54:43.85Z" }, - { url = "https://files.pythonhosted.org/packages/e1/38/c2e18f707ec222aa33af297dba967b2423559b058b92bfd0e6fd00c74a14/ddtrace-4.3.0-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:80a75fdf1d1717ea6e9d32d33019d0e76c2a38ea55b03dcbb45ad1af5f19079a", size = 8001195, upload-time = "2026-01-27T20:54:46.63Z" }, - { url = "https://files.pythonhosted.org/packages/32/2c/5912ad2ec39f8fa9250fa3f862156de00dbce86a702bf6e78f95f6ef1de7/ddtrace-4.3.0-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:074ac2d7a5f7dfa719b36a442b9b08842e698aa50061812a917c92141e020e1c", size = 8738876, upload-time = "2026-01-27T20:54:49.294Z" }, - { url = "https://files.pythonhosted.org/packages/af/0c/5a4098c258da2cc97160fb1735f57bad6048c6c980d24ecf8e58232fb15d/ddtrace-4.3.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:7c2a15dd28081ab305f9b7463446fa1bb4d3339744b8bff044837039726b1115", size = 9070879, upload-time = "2026-01-27T20:54:52.155Z" }, - { url = "https://files.pythonhosted.org/packages/a1/0b/60ab4556ef979a2d8b48328d778c2f521648f9ebf0518175d6cb61ae60ea/ddtrace-4.3.0-cp314-cp314-win32.whl", hash = "sha256:ce347b54d57686a90f36fb419f778379a00ce5d5ba6aacb79ccfde6c5f3e05b4", size = 5199611, upload-time = "2026-01-27T20:54:55.326Z" }, - { url = "https://files.pythonhosted.org/packages/0b/9d/dd17ae53fa30abc5ec0d4e53fd78768fef745acd3c2cc5067b75eb49af69/ddtrace-4.3.0-cp314-cp314-win_amd64.whl", hash = "sha256:cbeb4e4d2ec5eab248e34432f24e7d318f55031d3a6d39b540ebdebf51e55080", size = 5774168, upload-time = "2026-01-27T20:54:58.196Z" }, - { url = "https://files.pythonhosted.org/packages/3a/29/85c3372abf028f4c8da9f485bc814100e04c6e1b1b92db49bcb497ef0023/ddtrace-4.3.0-cp314-cp314-win_arm64.whl", hash = "sha256:d4b1c98336fd7b096b0b3a7baa095efba67919e6b4cafafe2cae16b17306dc30", size = 5500574, upload-time = "2026-01-27T20:55:00.865Z" }, -] - -[[package]] -name = "debugpy" -version = "1.8.20" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/e0/b7/cd8080344452e4874aae67c40d8940e2b4d47b01601a8fd9f44786c757c7/debugpy-1.8.20.tar.gz", hash = "sha256:55bc8701714969f1ab89a6d5f2f3d40c36f91b2cbe2f65d98bf8196f6a6a2c33", size = 1645207, upload-time = "2026-01-29T23:03:28.199Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/33/2e/f6cb9a8a13f5058f0a20fe09711a7b726232cd5a78c6a7c05b2ec726cff9/debugpy-1.8.20-cp314-cp314-macosx_15_0_universal2.whl", hash = "sha256:9c74df62fc064cd5e5eaca1353a3ef5a5d50da5eb8058fcef63106f7bebe6173", size = 2538066, upload-time = "2026-01-29T23:03:54.999Z" }, - { url = "https://files.pythonhosted.org/packages/c5/56/6ddca50b53624e1ca3ce1d1e49ff22db46c47ea5fb4c0cc5c9b90a616364/debugpy-1.8.20-cp314-cp314-manylinux_2_34_x86_64.whl", hash = "sha256:077a7447589ee9bc1ff0cdf443566d0ecf540ac8aa7333b775ebcb8ce9f4ecad", size = 4269425, upload-time = "2026-01-29T23:03:56.518Z" }, - { url = "https://files.pythonhosted.org/packages/c5/d9/d64199c14a0d4c476df46c82470a3ce45c8d183a6796cfb5e66533b3663c/debugpy-1.8.20-cp314-cp314-win32.whl", hash = "sha256:352036a99dd35053b37b7803f748efc456076f929c6a895556932eaf2d23b07f", size = 5331407, upload-time = "2026-01-29T23:03:58.481Z" }, - { url = "https://files.pythonhosted.org/packages/e0/d9/1f07395b54413432624d61524dfd98c1a7c7827d2abfdb8829ac92638205/debugpy-1.8.20-cp314-cp314-win_amd64.whl", hash = "sha256:a98eec61135465b062846112e5ecf2eebb855305acc1dfbae43b72903b8ab5be", size = 5372521, upload-time = "2026-01-29T23:03:59.864Z" }, - { url = "https://files.pythonhosted.org/packages/e0/c3/7f67dea8ccf8fdcb9c99033bbe3e90b9e7395415843accb81428c441be2d/debugpy-1.8.20-py2.py3-none-any.whl", hash = "sha256:5be9bed9ae3be00665a06acaa48f8329d2b9632f15fd09f6a9a8c8d9907e54d7", size = 5337658, upload-time = "2026-01-29T23:04:17.404Z" }, -] - -[[package]] -name = "decorator" -version = "5.3.1" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/60/8b/32f9823da46cde7df2087faa08cd98d01b908f8dcab982cdba9c84e85355/decorator-5.3.1.tar.gz", hash = "sha256:4cbcdd55a6efadb9dbea26b858f4fb3264567b52d69ca0d25b721b553f60ea82", size = 58084, upload-time = "2026-05-18T06:03:28.057Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/05/7f/798705f5296a58ca505d600456748d1be48078eac8a7050d8a98bc9edb89/decorator-5.3.1-py3-none-any.whl", hash = "sha256:f47fe6fdbd2edd623ecfe36875d37aba411624e2670dd395dddae1358689bb3c", size = 10365, upload-time = "2026-05-18T06:03:26.517Z" }, -] - -[[package]] -name = "defusedxml" -version = "0.7.1" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/0f/d5/c66da9b79e5bdb124974bfe172b4daf3c984ebd9c2a06e2b8a4dc7331c72/defusedxml-0.7.1.tar.gz", hash = "sha256:1bb3032db185915b62d7c6209c5a8792be6a32ab2fedacc84e01b52c51aa3e69", size = 75520, upload-time = "2021-03-08T10:59:26.269Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/07/6c/aa3f2f849e01cb6a001cd8554a88d4c77c5c1a31c95bdf1cf9301e6d9ef4/defusedxml-0.7.1-py2.py3-none-any.whl", hash = "sha256:a352e7e428770286cc899e2542b6cdaedb2b4953ff269a210103ec58f6198a61", size = 25604, upload-time = "2021-03-08T10:59:24.45Z" }, -] - [[package]] name = "detect-installer" version = "0.1.0" @@ -681,24 +226,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/de/15/545e2b6cf2e3be84bc1ed85613edd75b8aea69807a71c26f4ca6a9258e82/email_validator-2.3.0-py3-none-any.whl", hash = "sha256:80f13f623413e6b197ae73bb10bf4eb0908faf509ad8362c5edeb0be7fd450b4", size = 35604, upload-time = "2025-08-26T13:09:05.858Z" }, ] -[[package]] -name = "entrypoints" -version = "0.4" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/ea/8d/a7121ffe5f402dc015277d2d31eb82d2187334503a011c18f2e78ecbb9b2/entrypoints-0.4.tar.gz", hash = "sha256:b706eddaa9218a19ebcd67b56818f05bb27589b1ca9e8d797b74affad4ccacd4", size = 13974, upload-time = "2022-02-02T21:30:28.172Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/35/a8/365059bbcd4572cbc41de17fd5b682be5868b218c3c5479071865cab9078/entrypoints-0.4-py3-none-any.whl", hash = "sha256:f174b5ff827504fd3cd97cc3f8649f3693f51538c7e4bdf3ef002c8429d42f9f", size = 5294, upload-time = "2022-02-02T21:30:26.024Z" }, -] - -[[package]] -name = "envier" -version = "0.6.1" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/19/e7/4fe4d3f6e21213cea9bcddc36ba60e6ae4003035f9ce8055e6a9f0322ddb/envier-0.6.1.tar.gz", hash = "sha256:3309a01bb3d8850c9e7a31a5166d5a836846db2faecb79b9cb32654dd50ca9f9", size = 10063, upload-time = "2024-10-22T09:56:47.226Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/56/e9/30493b1cc967f7c07869de4b2ab3929151a58e6bb04495015554d24b61db/envier-0.6.1-py3-none-any.whl", hash = "sha256:73609040a76be48bbcb97074d9969666484aa0de706183a6e9ef773156a8a6a9", size = 10638, upload-time = "2024-10-22T09:56:45.968Z" }, -] - [[package]] name = "execnet" version = "2.1.2" @@ -708,15 +235,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/ab/84/02fc1827e8cdded4aa65baef11296a9bbe595c474f0d6d758af082d849fd/execnet-2.1.2-py3-none-any.whl", hash = "sha256:67fba928dd5a544b783f6056f449e5e3931a5c378b128bc18501f7ea79e296ec", size = 40708, upload-time = "2025-11-12T09:56:36.333Z" }, ] -[[package]] -name = "executing" -version = "2.2.1" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/cc/28/c14e053b6762b1044f34a13aab6859bbf40456d37d23aa286ac24cfd9a5d/executing-2.2.1.tar.gz", hash = "sha256:3632cc370565f6648cc328b32435bd120a1e4ebb20c77e3fdde9a13cd1e533c4", size = 1129488, upload-time = "2025-09-01T09:48:10.866Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/c1/ea/53f2148663b321f21b5a606bd5f191517cf40b7072c0497d3c92c4a13b1e/executing-2.2.1-py2.py3-none-any.whl", hash = "sha256:760643d3452b4d777d295bb167ccc74c64a81df23fb5e08eff250c425a4b2017", size = 28317, upload-time = "2025-09-01T09:48:08.5Z" }, -] - [[package]] name = "fastapi" version = "0.136.3" @@ -839,186 +357,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/6b/fd/5390ec4f49100f3ecb9968a392f9e6d039f1e3fe0ecd28443716ff01e589/fastar-0.11.0-cp314-cp314t-win_arm64.whl", hash = "sha256:76c1359314355eafbc6989f20fb1ad565a3d10200117923b9da765a17e2f6f11", size = 461049, upload-time = "2026-04-13T17:11:25.918Z" }, ] -[[package]] -name = "fastjsonschema" -version = "2.21.2" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/20/b5/23b216d9d985a956623b6bd12d4086b60f0059b27799f23016af04a74ea1/fastjsonschema-2.21.2.tar.gz", hash = "sha256:b1eb43748041c880796cd077f1a07c3d94e93ae84bba5ed36800a33554ae05de", size = 374130, upload-time = "2025-08-14T18:49:36.666Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/cb/a8/20d0723294217e47de6d9e2e40fd4a9d2f7c4b6ef974babd482a59743694/fastjsonschema-2.21.2-py3-none-any.whl", hash = "sha256:1c797122d0a86c5cace2e54bf4e819c36223b552017172f32c5c024a6b77e463", size = 24024, upload-time = "2025-08-14T18:49:34.776Z" }, -] - -[[package]] -name = "fastnumbers" -version = "5.1.1" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/75/bf/c69642300a98e8b61047fa17ee7c925a8e65a12e194e98dda7ec1eefaf4b/fastnumbers-5.1.1.tar.gz", hash = "sha256:183fa021cdc052edaeede5c23e3086461deb7562b567614edf71b29515f5fa4b", size = 193827, upload-time = "2024-12-15T07:28:51.124Z" } - -[[package]] -name = "filetype" -version = "1.2.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/bb/29/745f7d30d47fe0f251d3ad3dc2978a23141917661998763bebb6da007eb1/filetype-1.2.0.tar.gz", hash = "sha256:66b56cd6474bf41d8c54660347d37afcc3f7d1970648de365c102ef77548aadb", size = 998020, upload-time = "2022-11-02T17:34:04.141Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/18/79/1b8fa1bb3568781e84c9200f951c735f3f157429f44be0495da55894d620/filetype-1.2.0-py2.py3-none-any.whl", hash = "sha256:7ce71b6880181241cf7ac8697a2f1eb6a8bd9b429f7ad6d27b8db9ba5f1c2d25", size = 19970, upload-time = "2022-11-02T17:34:01.425Z" }, -] - -[[package]] -name = "flasgger-tschaume" -version = "0.9.7" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "flask" }, - { name = "jsonschema" }, - { name = "mistune" }, - { name = "pyyaml" }, - { name = "six" }, - { name = "werkzeug" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/ad/9a/94f78b4865f30402dd56f343d0d7487b2d6fce3137a3579a18aa49981bd8/flasgger-tschaume-0.9.7.tar.gz", hash = "sha256:139bd4686387e69019af2a86c0eacbd00bf30df0c7470ea55120646cab2ae446", size = 4227116, upload-time = "2022-10-21T23:24:14.25Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/97/a7/f6b8b0d622449b0e63869d64c3ad19d67b5e86e1bad60e3c34cbb9dc2ca6/flasgger_tschaume-0.9.7-py2.py3-none-any.whl", hash = "sha256:ee0c55f76c5884704649d139f042050af5d6f1d5a60cae167e3123735720302c", size = 3864468, upload-time = "2022-10-21T23:24:11.541Z" }, -] - -[[package]] -name = "flask" -version = "2.2.5" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "click" }, - { name = "itsdangerous" }, - { name = "jinja2" }, - { name = "werkzeug" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/5f/76/a4d2c4436dda4b0a12c71e075c508ea7988a1066b06a575f6afe4fecc023/Flask-2.2.5.tar.gz", hash = "sha256:edee9b0a7ff26621bd5a8c10ff484ae28737a2410d99b0bb9a6850c7fb977aa0", size = 697814, upload-time = "2023-05-02T14:42:36.742Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/9f/1a/8b6d48162861009d1e017a9740431c78d860809773b66cac220a11aa3310/Flask-2.2.5-py3-none-any.whl", hash = "sha256:58107ed83443e86067e41eff4631b058178191a355886f8e479e347fa1285fdf", size = 101817, upload-time = "2023-05-02T14:42:34.858Z" }, -] - -[[package]] -name = "flask-compress" -version = "1.24" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "brotli", marker = "platform_python_implementation != 'PyPy'" }, - { name = "brotlicffi", marker = "platform_python_implementation == 'PyPy'" }, - { name = "flask" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/c2/de/2ae0118051b38ab53437328074a696f3ee7d61e15bf7454b78a3088e5bc3/flask_compress-1.24.tar.gz", hash = "sha256:14097cefe59ecb3e466d52a6aeb62f34f125a9f7dadf1f33a53e430ce4a50f31", size = 21089, upload-time = "2026-03-31T15:01:39.005Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/4c/0f/fe51e0b2301bbd429af44273a923ff92127b18d13abba5ae5a1d60e8e497/flask_compress-1.24-py3-none-any.whl", hash = "sha256:1e63668eb6e3242bd4f6ad98825a924e3984409be90c125477893d586007d00c", size = 11033, upload-time = "2026-03-31T15:01:37.302Z" }, -] - -[[package]] -name = "flask-marshmallow" -version = "1.4.0" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "flask" }, - { name = "marshmallow" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/09/43/6e5c19e8abc01f5daf1d3c8ad169c495335390572b8bead3f7e7302131c6/flask_marshmallow-1.4.0.tar.gz", hash = "sha256:98c90a253052c72d2ddddc925539ac33bbd780c6fba86478ffe18e3b89d8b471", size = 40970, upload-time = "2026-02-04T16:07:59.916Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/70/9b/7d0605c6f90d640547c3c9a0b95bc3bb17e252ae0f46f1dbfa90d2e06518/flask_marshmallow-1.4.0-py3-none-any.whl", hash = "sha256:b758fc2c428d0cbee6fd0ccf0d55524fe9e426a86a177dcc0fc8cd71ad4b7c59", size = 12254, upload-time = "2026-02-04T16:07:58.878Z" }, -] - -[[package]] -name = "flask-mongoengine-tschaume" -version = "1.1.0" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "flask" }, - { name = "mongoengine" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/46/e9/224508e946b975dab42f185ecca6c044a465ebd6fdc23bdc27a85330ea0c/flask-mongoengine-tschaume-1.1.0.tar.gz", hash = "sha256:0c020feb12bb0317a4848e7b191489f89ad0589c9728d4907f5e9635474dd055", size = 235159, upload-time = "2022-10-25T00:40:12.334Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/9f/5b/d947b061b81b25ee061f1eae068c98d0491f990d24d3ad9f16de9c05cd56/flask_mongoengine_tschaume-1.1.0-py3-none-any.whl", hash = "sha256:01fcb556bb616bc4b4bbe83fb019787dc58e565790226182bf9a60ed9fada65d", size = 33610, upload-time = "2022-10-25T00:40:10.809Z" }, -] - -[[package]] -name = "flask-mongorest-mpcontribs" -version = "3.3.0" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "atlasq-tschaume" }, - { name = "boto3" }, - { name = "fastnumbers" }, - { name = "flask-mongoengine-tschaume" }, - { name = "flask-sse" }, - { name = "flatten-dict" }, - { name = "marshmallow-mongoengine" }, - { name = "mimerender-pr36" }, - { name = "orjson" }, - { name = "pymongo" }, - { name = "python-dateutil" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/73/57/9eafaa2bfe95d9a4b05e8d505cc17e89fbdfcc14feeddc4a2a13eac9a710/flask-mongorest-mpcontribs-3.3.0.tar.gz", hash = "sha256:2db7fc6f341b2cea6c302ed5557941a1d89531e1cd92a8235eba3ac9e1cc6ea2", size = 46223, upload-time = "2023-04-14T21:22:32.787Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/b6/a4/95bbdee9e63c2bed78bb77f98f1fbb4971964383a3b6aa4c526da2852229/flask_mongorest_mpcontribs-3.3.0-py3-none-any.whl", hash = "sha256:f76dc8ef915f1b4ee896110ecbcc4a75a8cb7f33f4ce4387f4b4e2a0b646fa83", size = 26389, upload-time = "2023-04-14T21:22:31.273Z" }, -] - -[[package]] -name = "flask-rq2" -version = "18.3" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "flask" }, - { name = "redis" }, - { name = "rq" }, - { name = "rq-scheduler" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/3a/73/edea2742650daa2b1589e8cb592abe7da5d8ce530642e62f047b205580b7/Flask-RQ2-18.3.tar.gz", hash = "sha256:3ef6395065255447f8e1516ccca24858ba87da1d71a6975e0e3b55256bf04967", size = 29105, upload-time = "2018-12-20T10:53:32.738Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/61/47/341667d55567995f6a54096e4156edaaad645dd7c90133e646ed9ba56968/Flask_RQ2-18.3-py2.py3-none-any.whl", hash = "sha256:abe1e52d3b98abe37e85830a614ba6af864516f1b6cf2229f352f8500eafc5fd", size = 12999, upload-time = "2018-12-20T10:53:31.409Z" }, -] - -[[package]] -name = "flask-sse" -version = "1.0.0" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "flask" }, - { name = "redis" }, - { name = "six" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/38/31/82586853cb1c0fcc2b8b533891606a779acc0da7d4cda5c8d7f2c2b05a29/Flask-SSE-1.0.0.tar.gz", hash = "sha256:4f84714c2549a45e4f17bfc5f68ee8a9f298b22740a6844404d1c74551f2090d", size = 16190, upload-time = "2021-01-10T18:01:46.269Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/71/83/f9fe86f554a153fdd300fb8027121d508a2177605bd158d967ddd7325948/Flask_SSE-1.0.0-py2.py3-none-any.whl", hash = "sha256:f86d7ecff0607333755c444130c395e7a133fb7ae6cf76fbd29b1da36d34776b", size = 4952, upload-time = "2021-01-10T18:01:44.985Z" }, -] - -[[package]] -name = "flatten-dict" -version = "0.5.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/0b/d0/34bf1bafa4d54e4ec20ca40856e991ffe7fdfd53831a2a36a7eb356508c8/flatten_dict-0.5.0.tar.gz", hash = "sha256:ca89664d0bc9552d525ee756726b5a755c17f65b5bf23d0a1f07841f181428b7", size = 9476, upload-time = "2026-04-28T14:23:44.979Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/72/9f/485516087cd8c44183aaf9ab850247a28e2e4a42a4d62eab77c21f673450/flatten_dict-0.5.0-py3-none-any.whl", hash = "sha256:c4bd2010052e4d33241433720d054322403fa7ad914fdc5cb1b31a713d4c561e", size = 9869, upload-time = "2026-04-28T14:23:45.695Z" }, -] - -[[package]] -name = "flexcache" -version = "0.3" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "typing-extensions" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/55/b0/8a21e330561c65653d010ef112bf38f60890051d244ede197ddaa08e50c1/flexcache-0.3.tar.gz", hash = "sha256:18743bd5a0621bfe2cf8d519e4c3bfdf57a269c15d1ced3fb4b64e0ff4600656", size = 15816, upload-time = "2024-03-09T03:21:07.555Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/27/cd/c883e1a7c447479d6e13985565080e3fea88ab5a107c21684c813dba1875/flexcache-0.3-py3-none-any.whl", hash = "sha256:d43c9fea82336af6e0115e308d9d33a185390b8346a017564611f1466dcd2e32", size = 13263, upload-time = "2024-03-09T03:21:05.635Z" }, -] - -[[package]] -name = "flexparser" -version = "0.4" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "typing-extensions" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/82/99/b4de7e39e8eaf8207ba1a8fa2241dd98b2ba72ae6e16960d8351736d8702/flexparser-0.4.tar.gz", hash = "sha256:266d98905595be2ccc5da964fe0a2c3526fbbffdc45b65b3146d75db992ef6b2", size = 31799, upload-time = "2024-11-07T02:00:56.249Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/fe/5e/3be305568fe5f34448807976dc82fc151d76c3e0e03958f34770286278c1/flexparser-0.4-py3-none-any.whl", hash = "sha256:3738b456192dcb3e15620f324c447721023c0293f6af9955b481e91d00179846", size = 27625, upload-time = "2024-11-07T02:00:54.523Z" }, -] - [[package]] name = "fonttools" version = "4.63.0" @@ -1044,59 +382,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/2c/47/c99d5268f354002ce80f8d029cd9d7d872969da1de8b93d32de4dc56d6f4/fonttools-4.63.0-py3-none-any.whl", hash = "sha256:445af2eab030a16b9171ea8bdda7ebf7d96bda2df88ee182a464252f6e05e20d", size = 1164562, upload-time = "2026-05-14T12:04:29.092Z" }, ] -[[package]] -name = "fqdn" -version = "1.5.1" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/30/3e/a80a8c077fd798951169626cde3e239adeba7dab75deb3555716415bd9b0/fqdn-1.5.1.tar.gz", hash = "sha256:105ed3677e767fb5ca086a0c1f4bb66ebc3c100be518f0e0d755d9eae164d89f", size = 6015, upload-time = "2021-03-11T07:16:29.08Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/cf/58/8acf1b3e91c58313ce5cb67df61001fc9dcd21be4fadb76c1a2d540e09ed/fqdn-1.5.1-py3-none-any.whl", hash = "sha256:3a179af3761e4df6eb2e026ff9e1a3033d3587bf980a0b1b2e1e5d08d7358014", size = 9121, upload-time = "2021-03-11T07:16:28.351Z" }, -] - -[[package]] -name = "freezegun" -version = "1.5.5" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "python-dateutil" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/95/dd/23e2f4e357f8fd3bdff613c1fe4466d21bfb00a6177f238079b17f7b1c84/freezegun-1.5.5.tar.gz", hash = "sha256:ac7742a6cc6c25a2c35e9292dfd554b897b517d2dec26891a2e8debf205cb94a", size = 35914, upload-time = "2025-08-09T10:39:08.338Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/5e/2e/b41d8a1a917d6581fc27a35d05561037b048e47df50f27f8ac9c7e27a710/freezegun-1.5.5-py3-none-any.whl", hash = "sha256:cd557f4a75cf074e84bc374249b9dd491eaeacd61376b9eb3c423282211619d2", size = 19266, upload-time = "2025-08-09T10:39:06.636Z" }, -] - -[[package]] -name = "gevent" -version = "26.5.0" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "cffi", marker = "platform_python_implementation == 'CPython' and sys_platform == 'win32'" }, - { name = "greenlet", marker = "platform_python_implementation == 'CPython'" }, - { name = "zope-event" }, - { name = "zope-interface" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/c4/cb/98aa3a299e2fc4a2372b5d124863e02965b64579ffc29fe54d0641e65b2f/gevent-26.5.0.tar.gz", hash = "sha256:1655eb04c1e20d71b2aa4a3c7528162dd58ff6cc46a037af1f01f534c80fefba", size = 6712354, upload-time = "2026-05-20T21:22:45.132Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/17/55/7d98d3888e7bb9ad4656420dec69232ecbbea48792aff9295d0ad7cf8435/gevent-26.5.0-cp314-cp314-macosx_11_0_universal2.whl", hash = "sha256:75a0050e4b87f08ddee7e56f59e6014cd7fcdc3153046c09a847940515d12c85", size = 2968223, upload-time = "2026-05-20T20:13:17.223Z" }, - { url = "https://files.pythonhosted.org/packages/f8/b4/e8e116fcbcb9dc0bf3acc50037f86e1204c217c8ed5defde68be11b3aab6/gevent-26.5.0-cp314-cp314-manylinux_2_28_aarch64.whl", hash = "sha256:fd1a0b83a04e19378d9466ae0ee2b5937cf1d7fbfdcb916b2aea82179a208574", size = 1793926, upload-time = "2026-05-20T21:17:34.321Z" }, - { url = "https://files.pythonhosted.org/packages/28/07/7b267e9754b661defb93542e97731a4df21f8a40dc0f6c853faa717cf124/gevent-26.5.0-cp314-cp314-manylinux_2_28_ppc64le.whl", hash = "sha256:4c964c15076e76391d523ec24202f579a2535f7e301a40efb1656ae046d3eb69", size = 1887632, upload-time = "2026-05-20T21:16:04.158Z" }, - { url = "https://files.pythonhosted.org/packages/5c/50/b47d29e99449bd13b557ffa451401dc13d397a9923f562ef90a4e8514502/gevent-26.5.0-cp314-cp314-manylinux_2_28_s390x.whl", hash = "sha256:45d5438d1c84da5df7e832434627624709543630977332bb4e2d05ecca362cc9", size = 1838688, upload-time = "2026-05-20T21:30:57.979Z" }, - { url = "https://files.pythonhosted.org/packages/8b/eb/5b54ccff11bc7d7bebd40a24571ccc115d5cdae4f6c32ab457b43b436e42/gevent-26.5.0-cp314-cp314-manylinux_2_28_x86_64.whl", hash = "sha256:354f35924113abc954819216c2a6ee16751958c615681e0490946e31b437bd2f", size = 2120351, upload-time = "2026-05-20T20:35:32.699Z" }, - { url = "https://files.pythonhosted.org/packages/9c/70/30fd325c30e04b1e5174c61945e17421d53ddb2450366cc52cef234f8c4b/gevent-26.5.0-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:a47cd2d32f6404212d374ad8014a3491d7477dcf0cc09c5a2308ad6d325fd663", size = 1806684, upload-time = "2026-05-20T21:16:43.87Z" }, - { url = "https://files.pythonhosted.org/packages/cd/e8/fbf911ac3f9524ecfaed174d100fde671904ab8db92ceaf07faaebd13386/gevent-26.5.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:032157cebdedb84f2f52cdd980f2f5f2623eed6a8f083aadf44b44c47f628642", size = 2146606, upload-time = "2026-05-20T20:43:32.216Z" }, - { url = "https://files.pythonhosted.org/packages/9e/4d/284fcbbfde66fd978c2980c1fbe0eabd586af6e4b728649e9cf459e8b38f/gevent-26.5.0-cp314-cp314-win_amd64.whl", hash = "sha256:9c414935ba5fc88359110968851d3616f119082c937390d00a1c0f4f59be814f", size = 1722497, upload-time = "2026-05-20T20:16:44.274Z" }, - { url = "https://files.pythonhosted.org/packages/15/d2/9f66eb53434704402be0ba733bf3320bf589671a4b76fac52a7d6077e972/gevent-26.5.0-cp314-cp314-win_arm64.whl", hash = "sha256:2a0f5993a04b95a35b3a118b1a58ba272833f9b547b774001dea29f90620882f", size = 1574249, upload-time = "2026-05-20T20:15:50.873Z" }, - { url = "https://files.pythonhosted.org/packages/dc/d5/b4c50adb761878e3c96642b9f79bf44cee3120f3df55cd40876f51d89866/gevent-26.5.0-cp315-cp315-macosx_11_0_universal2.whl", hash = "sha256:2e117df896a2660c9ebd4e2b5afc02dfd6e2ddf9b495e787e67c72d105432b09", size = 2971993, upload-time = "2026-05-20T20:12:50.845Z" }, - { url = "https://files.pythonhosted.org/packages/03/83/71c2a945e80198422d1d93dbe67355f249fb456b451bf9201199d3ef6a1a/gevent-26.5.0-cp315-cp315-manylinux_2_28_aarch64.whl", hash = "sha256:af5ffe9c11ffb8a39b6bef2e8b722aa2043ae4980977915c6aa8c68b4bc26e46", size = 1796658, upload-time = "2026-05-20T21:17:35.968Z" }, - { url = "https://files.pythonhosted.org/packages/42/96/548ca77aed5cb9a44e855a6c23ebceeb3554a0ea9ca0c01c311878899a3e/gevent-26.5.0-cp315-cp315-manylinux_2_28_ppc64le.whl", hash = "sha256:7da34aef7e87c43dd3662e5785e79ed505c01399a7cb42876d2d8925969fd75f", size = 1891473, upload-time = "2026-05-20T21:16:05.657Z" }, - { url = "https://files.pythonhosted.org/packages/f6/4f/f48bd47d5287afb0fbcc56165f3ed47583f1803bad401653fe27e71ade2d/gevent-26.5.0-cp315-cp315-manylinux_2_28_s390x.whl", hash = "sha256:1c6293a7046bcc6f3d8972a74b19cd7a4cfd02d3881edf0fcf827aa514bd247b", size = 1841429, upload-time = "2026-05-20T21:30:59.907Z" }, - { url = "https://files.pythonhosted.org/packages/a0/72/1925215fc720d2561fa3ec8d4af5f098f8d0cbfa76a45fafed6e5ade7718/gevent-26.5.0-cp315-cp315-manylinux_2_28_x86_64.whl", hash = "sha256:d3bde0f140a275b2fa88e4b6516bda85551930e10bc2fd95e18c1b7d11cb780c", size = 2123895, upload-time = "2026-05-20T20:35:34.964Z" }, - { url = "https://files.pythonhosted.org/packages/83/59/0f584f6b1170c9a6abd9b70ccf5e9cc5ead34eabafabc0e21876ef0fe6f7/gevent-26.5.0-cp315-cp315-musllinux_1_2_aarch64.whl", hash = "sha256:e29fb4b17d9958ec8cb7f6339a111b29bc23f2c2efbef86189d1248bb4862d17", size = 1809047, upload-time = "2026-05-20T21:16:45.977Z" }, - { url = "https://files.pythonhosted.org/packages/82/88/61e854bfd98ac22eac78a97fc6db10de0f9ace46514072b435c217168729/gevent-26.5.0-cp315-cp315-musllinux_1_2_x86_64.whl", hash = "sha256:b2239df2f7570efa03736678f3f053bb1bdd22a8a16cd28a2feb7d32ea5f533f", size = 2150764, upload-time = "2026-05-20T20:43:33.781Z" }, - { url = "https://files.pythonhosted.org/packages/b9/f5/af048b97433d7f9a7df7f5510b2c46918b7d073dcfb3bf6d0ef0e5a83dcc/gevent-26.5.0-cp315-cp315-win_amd64.whl", hash = "sha256:aae214952fd38d27a42dc416bb70193962ec932384b63445d29bbb5817a1c042", size = 1722600, upload-time = "2026-05-20T20:19:56.81Z" }, - { url = "https://files.pythonhosted.org/packages/11/95/fb74a2299c6a2d78d9de12deaaac640ab5d2ef96a8e0f97a3ff84b9ca84b/gevent-26.5.0-cp315-cp315-win_arm64.whl", hash = "sha256:f7067564f139e33bf26a31ee3b13d168d76eb99a44b85ced626652b158baa80c", size = 1574406, upload-time = "2026-05-20T20:17:12.125Z" }, -] - [[package]] name = "googleapis-common-protos" version = "1.75.0" @@ -1109,53 +394,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/e7/c8/e2645aa8ed02fd4c7a2f59d68783b65b1f3cbdfe39a6308e156509d1fee8/googleapis_common_protos-1.75.0-py3-none-any.whl", hash = "sha256:961ed60399c457ceb0ee8f285a84c870aabc9c6a832b9d37bb281b5bebde43ed", size = 300631, upload-time = "2026-05-07T08:03:30.345Z" }, ] -[[package]] -name = "greenlet" -version = "3.5.1" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/6d/6e/802acd792aebb2256fbbee8cacf2727faaeb6f240ac11008f09eae4414bc/greenlet-3.5.1.tar.gz", hash = "sha256:5a56aeb7d5d9cc4b3a735efb5095bd4b4f6f0e4f93e5ca876d0e2315137b7829", size = 197356, upload-time = "2026-05-20T15:05:03.917Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/8a/cb/c62454606daf5640369c94d8a9dd540599b1bfc090e2d2180cb77f4038d2/greenlet-3.5.1-cp314-cp314-macosx_11_0_universal2.whl", hash = "sha256:d8ab31c9de8651a2facdd5c5bb0011f2380dd1a7af78ce2adf4b56095294fc07", size = 285579, upload-time = "2026-05-20T13:08:56.396Z" }, - { url = "https://files.pythonhosted.org/packages/ec/71/c4270398c2eba968a6071af1dfbdcaeee6ec1c24bc8b435b8cc452700da6/greenlet-3.5.1-cp314-cp314-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:5e300185139abc337ade480c327183adf42a875ac7181bfe66d7d4efea31fbea", size = 651106, upload-time = "2026-05-20T14:00:09.448Z" }, - { url = "https://files.pythonhosted.org/packages/1a/ab/71e34b78a44ec271fb5f550c17bc46d301ddc5953890d935f270b0dcdb5a/greenlet-3.5.1-cp314-cp314-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:7ffdb990dcaa0234cf9845aead5df2e3c3a8b6507d409274dd87e0d5ab05ffc2", size = 663478, upload-time = "2026-05-20T14:05:45.88Z" }, - { url = "https://files.pythonhosted.org/packages/c6/2d/2d80842910da44f78c286532d084b8a5c3717c844ae80ceb3858738ae89a/greenlet-3.5.1-cp314-cp314-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:6c09df69dc1712d131332054a858a3e5cca400967fa3a672e2324fbb0971448c", size = 667767, upload-time = "2026-05-20T14:09:12.15Z" }, - { url = "https://files.pythonhosted.org/packages/77/96/4efd6fa5c62c85426a0c19077a586258ebc3a2a146ff2493e4312a697a22/greenlet-3.5.1-cp314-cp314-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:2f82b3597e9d83b63408affed0b48fd0f54935edac4302237b9a837be0dae33c", size = 660800, upload-time = "2026-05-20T13:14:29.129Z" }, - { url = "https://files.pythonhosted.org/packages/e9/d3/dad2eecedfbb1ed7050a20dcfae40c1442b74bc7423608be2c7e03ee7133/greenlet-3.5.1-cp314-cp314-manylinux_2_39_riscv64.whl", hash = "sha256:a4764e0bfc6a4d114c865b32520805c16a990ef5f286a514413b05d5ecd6a23d", size = 470786, upload-time = "2026-05-20T14:01:42.064Z" }, - { url = "https://files.pythonhosted.org/packages/7a/e0/6c71401a25cac7000261304e866a2f2cc04dc74810d40e2f118aa4799495/greenlet-3.5.1-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:c0141e37414c10164e702b8fb1473304221ad98f71600850c6ef7ff4880feba0", size = 1617518, upload-time = "2026-05-20T14:02:28.662Z" }, - { url = "https://files.pythonhosted.org/packages/41/26/c5c06643e8c0af9e7bf18e16cb51d0ab7625155f0392e1c9015d66d556cd/greenlet-3.5.1-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:50ae25a67bea74ea41fb14b960bc532df73eb713417b2d61892dced82fe8d3bc", size = 1681593, upload-time = "2026-05-20T13:14:39.417Z" }, - { url = "https://files.pythonhosted.org/packages/8a/bd/e11a108317485075e68af9d23039619b86b28130c3b50d227d42edece64b/greenlet-3.5.1-cp314-cp314-win_amd64.whl", hash = "sha256:8a17c42330e261299766b75ac1ea32caa437a9453c8f65d16a13140db378ecd3", size = 239800, upload-time = "2026-05-20T13:09:30.128Z" }, - { url = "https://files.pythonhosted.org/packages/47/f8/8e8e8417b7bf28639a5a56356ef934d0375e1d0c70a57e04d7701e870ffe/greenlet-3.5.1-cp314-cp314-win_arm64.whl", hash = "sha256:7b5f5fae05b8ac6d176a61b60c394a8cbdc2b5b91b81793066e68745cf165e54", size = 236862, upload-time = "2026-05-20T13:09:10.498Z" }, - { url = "https://files.pythonhosted.org/packages/90/12/41bf27fde4d3605d3773ae57751eda182b8be2f5398011c041173b1d9534/greenlet-3.5.1-cp314-cp314t-macosx_11_0_universal2.whl", hash = "sha256:ea8da1e900d758d078810d4255d8c6aa572181896a31ec79d779eb79c3adc9ad", size = 293637, upload-time = "2026-05-20T13:12:35.529Z" }, - { url = "https://files.pythonhosted.org/packages/44/44/ba14b23e9757707050c2f397d305bbcae62e5d7cad122f8b6baec5ae4a1f/greenlet-3.5.1-cp314-cp314t-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:a19570c52a21420dcbc94e661994bc325c0b5b11304540fed514586da5dc8f2e", size = 650840, upload-time = "2026-05-20T14:00:11.079Z" }, - { url = "https://files.pythonhosted.org/packages/a8/37/5ddc2b686a6844f91abecef43411842426da2e1573f60b49ecf2547f4ae1/greenlet-3.5.1-cp314-cp314t-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:3d955c89b75eeca4723d7cc14135f393cd47c32e2a6cb4a8e4c6e760a26b0986", size = 656416, upload-time = "2026-05-20T14:05:47.118Z" }, - { url = "https://files.pythonhosted.org/packages/8c/46/5987dcd1a2570ba84f3b187536b2ca3ae97613387e57f5cfa99df068fe5e/greenlet-3.5.1-cp314-cp314t-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:ea37d5a157eb9493820d3792ac4ece28619a394391d2b9f2f78057d396ff0f0f", size = 656607, upload-time = "2026-05-20T14:09:13.949Z" }, - { url = "https://files.pythonhosted.org/packages/e1/f0/d17510297c35a2992712f0bf84de3779749999f7d3d63aa1f09db7c62dbe/greenlet-3.5.1-cp314-cp314t-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:de2daaaebd1a5aa88c49045b6baf9310b3263796bd88db713edf37cf53e7bb4e", size = 654397, upload-time = "2026-05-20T13:14:30.696Z" }, - { url = "https://files.pythonhosted.org/packages/2c/c1/6da0a9ddcc29d7e51ef14883fa3dc1e53b3f4ffba00582106c7bf55da1d8/greenlet-3.5.1-cp314-cp314t-manylinux_2_39_riscv64.whl", hash = "sha256:8d8a23250ea3ec7b36de8fa4b541e9e2db3ee82915cc060ab0631609ad8b28de", size = 488287, upload-time = "2026-05-20T14:01:43.143Z" }, - { url = "https://files.pythonhosted.org/packages/37/eb/147387705bb89092645b012586e7273cb5ed3c90ef7eaf3a69173eaf0209/greenlet-3.5.1-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:3bfbd69cc349e43bf3a8ae1c85548ff0718efc887615c2db16c3833d7b0b072d", size = 1614469, upload-time = "2026-05-20T14:02:30.192Z" }, - { url = "https://files.pythonhosted.org/packages/a6/4e/37ee0da7732b7aa9896f17e15579a9df34b9fcb9dd494f0adfa749af6623/greenlet-3.5.1-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:4378720dd888136c27215a0214d32a4d37c3852765d45bc37aad0623423cfd78", size = 1675115, upload-time = "2026-05-20T13:14:40.972Z" }, - { url = "https://files.pythonhosted.org/packages/57/f3/97dfcf4a6eb5077f8a672234216fb5923eb89f2cab7081cb10b2cf75b605/greenlet-3.5.1-cp314-cp314t-win_amd64.whl", hash = "sha256:45718441607f9325d948db98cbc691276059316d0358c188c246da4e1d4d23d2", size = 245246, upload-time = "2026-05-20T13:12:22.646Z" }, - { url = "https://files.pythonhosted.org/packages/5d/73/d7f72e34b582f694f4a9b248162db7b09cc458a259ba8f0c0bfa1a34ea7d/greenlet-3.5.1-cp315-cp315-macosx_11_0_universal2.whl", hash = "sha256:2baee5ca02031757ffe8cc3d69f0cc0aec7065ce362622da74f32d3bcab1c541", size = 285575, upload-time = "2026-05-20T13:12:07.043Z" }, - { url = "https://files.pythonhosted.org/packages/df/59/fa9c6e87dc8ad27a95dabe2f29f372b733d05a8a67470f6c901ed9975655/greenlet-3.5.1-cp315-cp315-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:9b1ec3274918a81d3ea778b9e75b56b72b33f300edb6cf7f3a7fe1dae56683de", size = 656428, upload-time = "2026-05-20T14:00:12.556Z" }, - { url = "https://files.pythonhosted.org/packages/f6/f9/e753408871eaa61dfe35e619cfc67512b036fde99893685d50eea9e07146/greenlet-3.5.1-cp315-cp315-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:111e2390ffffc47d5840b01711dd7fac07d4c09283d0283e7f3264b14e284c64", size = 667064, upload-time = "2026-05-20T14:05:48.662Z" }, - { url = "https://files.pythonhosted.org/packages/dc/74/807a047255bf1e09303627c46dc043dca596b6958a354d904f32ab382005/greenlet-3.5.1-cp315-cp315-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:10a9a1c0bfbc93d41156ffcb90c75fbc05544054faf15dcc1fdf9765f8b607f0", size = 672962, upload-time = "2026-05-20T14:09:15.532Z" }, - { url = "https://files.pythonhosted.org/packages/96/27/5565b5b40389f1c7753003a07e21892fda8660926787036d5bc0308b8113/greenlet-3.5.1-cp315-cp315-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:e630136e905fe5ff43e86945ae41220b6d1470956a39220e708110ac48d01ea5", size = 665697, upload-time = "2026-05-20T13:14:32.943Z" }, - { url = "https://files.pythonhosted.org/packages/76/32/19d4e13225193c29b13e308015223f7d75fd3d8623d49dd19040d2ce8ec1/greenlet-3.5.1-cp315-cp315-manylinux_2_39_riscv64.whl", hash = "sha256:ef08c1567c78074b22d1a200183d52d04a14df447bf70bcbb6a3507a48e776fc", size = 476047, upload-time = "2026-05-20T14:01:44.39Z" }, - { url = "https://files.pythonhosted.org/packages/cf/82/e7de4178c0c2d1c9a5a3be3cc0b33e46a85b3ee4a77c071bf7ad8600e079/greenlet-3.5.1-cp315-cp315-musllinux_1_2_aarch64.whl", hash = "sha256:975eac34b44a7077ca4d421348455b94f0f518246a7f14bc6d2fdcfe5b584368", size = 1621256, upload-time = "2026-05-20T14:02:31.91Z" }, - { url = "https://files.pythonhosted.org/packages/00/10/f2dddcf7dacac17dfc68691809589adad06135eb28930429cf58a6467a2f/greenlet-3.5.1-cp315-cp315-musllinux_1_2_x86_64.whl", hash = "sha256:9ab3c3a0b2ae6198e67c898dad5215a49f9ae0d0081b3c3ec59f333e39eeca26", size = 1685956, upload-time = "2026-05-20T13:14:42.55Z" }, - { url = "https://files.pythonhosted.org/packages/22/17/4a232b32133230ada52f70e9d7f5b65b0caef8772f01849bd8d149e7e4ca/greenlet-3.5.1-cp315-cp315-win_amd64.whl", hash = "sha256:cbfc69be86e10dcfef5b1e6269d1d6926552aa89ee39e1de3353360c1b6989ab", size = 239802, upload-time = "2026-05-20T13:13:15.481Z" }, - { url = "https://files.pythonhosted.org/packages/c2/ae/4e623a7e6d4d2a5f4cb8e4c82de4169fc637942caae68d6e676b8a128ac5/greenlet-3.5.1-cp315-cp315-win_arm64.whl", hash = "sha256:92fd6d44ac5e5a887c8a5dc4a8ba0ba908527c31c12f78c6bc7dcfe8aab279f6", size = 236853, upload-time = "2026-05-20T13:15:37.301Z" }, - { url = "https://files.pythonhosted.org/packages/7a/57/816d9cff29119da3505b3d6a5e14a8af89006ac36f47f891ff293ee05af1/greenlet-3.5.1-cp315-cp315t-macosx_11_0_universal2.whl", hash = "sha256:a6fdf2433a5441ef9a95464f7c3e674775da1c8c1177fff311cee1acad4626ed", size = 293877, upload-time = "2026-05-20T13:10:19.078Z" }, - { url = "https://files.pythonhosted.org/packages/23/a1/59b0a7c7d140ff1a75626680b9a9899b79a9176cab298b394968fb023295/greenlet-3.5.1-cp315-cp315t-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:7546556f0d649f99f6a361098a55f761181bb2ea12ff150bb16d26092ad88244", size = 655333, upload-time = "2026-05-20T14:00:14.758Z" }, - { url = "https://files.pythonhosted.org/packages/72/1b/5efe127597625042218939d01855109f352779050768b670b52edcc16a6c/greenlet-3.5.1-cp315-cp315t-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:d5ee3ea898009fa898f85f9982255d35278c477bebe185beca249cab42d4526c", size = 659443, upload-time = "2026-05-20T14:05:50.159Z" }, - { url = "https://files.pythonhosted.org/packages/c9/9d/1dcdf7b95ab3cf8c7b6d7277c18a5e167312f2b362ddfcc5d5e6d8d84b43/greenlet-3.5.1-cp315-cp315t-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:a57b0d05a0448eed231d59c0ceb287dde984551e54cbc51ac2d4865712838e9c", size = 659998, upload-time = "2026-05-20T14:09:16.912Z" }, - { url = "https://files.pythonhosted.org/packages/6c/6d/c404246ea4d22d097a7426d0efb5b781bd7eb67715f09e79001bd552ab18/greenlet-3.5.1-cp315-cp315t-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:a5c81f74d204d3edd136ebfd50dce53acbb776995d721a0fe801626cfc93b8cd", size = 658356, upload-time = "2026-05-20T13:14:35.091Z" }, - { url = "https://files.pythonhosted.org/packages/05/7e/c4959664fc231d587d66d8e81f2095e98056ba1954beafdcbe635e251052/greenlet-3.5.1-cp315-cp315t-manylinux_2_39_riscv64.whl", hash = "sha256:b0703c2cef53e01baec47f7a3868009913ad71ec678bbecb42a6f40895e4ce62", size = 494470, upload-time = "2026-05-20T14:01:45.611Z" }, - { url = "https://files.pythonhosted.org/packages/51/02/f8ee37fb6d2219329f350af241c27fcf12df57e723d11f6fc6d3bacdadaa/greenlet-3.5.1-cp315-cp315t-musllinux_1_2_aarch64.whl", hash = "sha256:2c18ef16bf6d4dd410e4dd52996888ea1497be26892fe5bbc73580aba4287b8e", size = 1619216, upload-time = "2026-05-20T14:02:33.403Z" }, - { url = "https://files.pythonhosted.org/packages/93/c5/3dc9475ace2c7a3680da12372cddd7f1ac874eb410a1ac48d3e9dab83782/greenlet-3.5.1-cp315-cp315t-musllinux_1_2_x86_64.whl", hash = "sha256:17d86354f0ae6b61bf9be5148d0dd34e06c3cb7c602c671f79f29ac3b150e659", size = 1678427, upload-time = "2026-05-20T13:14:43.71Z" }, - { url = "https://files.pythonhosted.org/packages/df/4e/750c15c317a41ffb36f0bf40b933e3d744a7dede61889f74443ea69690cf/greenlet-3.5.1-cp315-cp315t-win_amd64.whl", hash = "sha256:e7516cf6ae6b8a582c2770a0caed47b8a48373ed732c33d69a72913ae6ac923e", size = 245225, upload-time = "2026-05-20T13:13:59.366Z" }, - { url = "https://files.pythonhosted.org/packages/4f/fd/d3baea2eeb7b617efd47e87ca06e2ec2c6118d303aa9e918e0ce16eadc10/greenlet-3.5.1-cp315-cp315t-win_arm64.whl", hash = "sha256:5028648bf2253ec4745add746129d3904121fa7fe871a76bed23c5720573ce0a", size = 239590, upload-time = "2026-05-20T13:13:37.382Z" }, -] - [[package]] name = "grpcio" version = "1.80.0" @@ -1172,417 +410,135 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/e8/43/f437a78f7f4f1d311804189e8f11fb311a01049b2e08557c1068d470cb2e/grpcio-1.80.0-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:2dcc70e9f0ba987526e8e8603a610fb4f460e42899e74e7a518bf3c68fe1bf05", size = 6785372, upload-time = "2026-03-30T08:48:22.373Z" }, { url = "https://files.pythonhosted.org/packages/93/3d/f6558e9c6296cb4227faa5c43c54a34c68d32654b829f53288313d16a86e/grpcio-1.80.0-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:448c884b668b868562b1bda833c5fce6272d26e1926ec46747cda05741d302c1", size = 7395268, upload-time = "2026-03-30T08:48:25.638Z" }, { url = "https://files.pythonhosted.org/packages/06/21/0fdd77e84720b08843c371a2efa6f2e19dbebf56adc72df73d891f5506f0/grpcio-1.80.0-cp314-cp314-musllinux_1_2_i686.whl", hash = "sha256:a1dc80fe55685b4a543555e6eef975303b36c8db1023b1599b094b92aa77965f", size = 8392000, upload-time = "2026-03-30T08:48:28.974Z" }, - { url = "https://files.pythonhosted.org/packages/f5/68/67f4947ed55d2e69f2cc199ab9fd85e0a0034d813bbeef84df6d2ba4d4b7/grpcio-1.80.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:31b9ac4ad1aa28ffee5503821fafd09e4da0a261ce1c1281c6c8da0423c83b6e", size = 7828477, upload-time = "2026-03-30T08:48:32.054Z" }, - { url = "https://files.pythonhosted.org/packages/44/b6/8d4096691b2e385e8271911a0de4f35f0a6c7d05aff7098e296c3de86939/grpcio-1.80.0-cp314-cp314-win32.whl", hash = "sha256:367ce30ba67d05e0592470428f0ec1c31714cab9ef19b8f2e37be1f4c7d32fae", size = 4218563, upload-time = "2026-03-30T08:48:34.538Z" }, - { url = "https://files.pythonhosted.org/packages/e5/8c/bbe6baf2557262834f2070cf668515fa308b2d38a4bbf771f8f7872a7036/grpcio-1.80.0-cp314-cp314-win_amd64.whl", hash = "sha256:3b01e1f5464c583d2f567b2e46ff0d516ef979978f72091fd81f5ab7fa6e2e7f", size = 5019457, upload-time = "2026-03-30T08:48:37.308Z" }, -] - -[[package]] -name = "gunicorn" -version = "24.1.1" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "packaging" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/78/0a/10739c03537ec5b131a867bf94df2e412b437696c7e5d26970e2198a80d2/gunicorn-24.1.1.tar.gz", hash = "sha256:f006d110e5cb3102859b4f5cd48335dbd9cc28d0d27cd24ddbdafa6c60929408", size = 287567, upload-time = "2026-01-24T01:15:31.359Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/96/90/cfe637677916fc6f53cd2b05d5746e249f683e1fa14c9e745a88c66f7290/gunicorn-24.1.1-py3-none-any.whl", hash = "sha256:757f6b621fc4f7581a90600b2cd9df593461f06a41d7259cb9b94499dc4095a8", size = 114920, upload-time = "2026-01-24T01:15:29.656Z" }, -] - -[package.optional-dependencies] -gevent = [ - { name = "gevent" }, -] - -[[package]] -name = "h11" -version = "0.16.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/01/ee/02a2c011bdab74c6fb3c75474d40b3052059d95df7e73351460c8588d963/h11-0.16.0.tar.gz", hash = "sha256:4e35b956cf45792e4caa5885e69fba00bdbc6ffafbfa020300e549b208ee5ff1", size = 101250, upload-time = "2025-04-24T03:35:25.427Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/04/4b/29cac41a4d98d144bf5f6d33995617b185d14b22401f75ca86f384e87ff1/h11-0.16.0-py3-none-any.whl", hash = "sha256:63cf8bbe7522de3bf65932fda1d9c2772064ffb3dae62d55932da54b31cb6c86", size = 37515, upload-time = "2025-04-24T03:35:24.344Z" }, -] - -[[package]] -name = "httpcore" -version = "1.0.9" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "certifi" }, - { name = "h11" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/06/94/82699a10bca87a5556c9c59b5963f2d039dbd239f25bc2a63907a05a14cb/httpcore-1.0.9.tar.gz", hash = "sha256:6e34463af53fd2ab5d807f399a9b45ea31c3dfa2276f15a2c3f00afff6e176e8", size = 85484, upload-time = "2025-04-24T22:06:22.219Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/7e/f5/f66802a942d491edb555dd61e3a9961140fd64c90bce1eafd741609d334d/httpcore-1.0.9-py3-none-any.whl", hash = "sha256:2d400746a40668fc9dec9810239072b40b4484b640a8c38fd654a024c7a1bf55", size = 78784, upload-time = "2025-04-24T22:06:20.566Z" }, -] - -[[package]] -name = "httpcore2" -version = "2.3.0" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "h11" }, - { name = "truststore" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/e6/34/18f1c596e677962f040284246f393b10a1f8ce440b3a7e69c637d0f1c7ad/httpcore2-2.3.0.tar.gz", hash = "sha256:07327e251560960eea8e969d92d4c6a325feb13cca39e25340731336c3baf924", size = 64300, upload-time = "2026-06-01T13:15:02.998Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/c2/dd/3357218c69360d1cecc196c230c9a1d5c9afd5dba362056e23e60a5e64e5/httpcore2-2.3.0-py3-none-any.whl", hash = "sha256:477e9e334f74e5240dcac002e890580f36a57d40ff0fb14cc9655731d23b8415", size = 80024, upload-time = "2026-06-01T13:15:00.001Z" }, -] - -[[package]] -name = "httptools" -version = "0.8.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/43/e5/d471fcb0e14523fe1c3f4ba58ca52480e7bd70ad7109a3846bc75892f7fb/httptools-0.8.0.tar.gz", hash = "sha256:6b2a32f18d97e16e90827d7a819ffa8dbd8cc245fc4e1fa9d1095b54ef4bd999", size = 271342, upload-time = "2026-05-25T22:17:48.841Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/1a/12/fa3fbf5f9517b273edea2dc982aa82a8c634091e67c590792b729017bc6f/httptools-0.8.0-cp314-cp314-macosx_10_13_universal2.whl", hash = "sha256:de242a49b5d18e0a8776e654e9f6bf6d89f3875a5c35b425a0e7ce940feb3fd6", size = 206183, upload-time = "2026-05-25T22:17:24.004Z" }, - { url = "https://files.pythonhosted.org/packages/30/fc/5e7c4cb443370f2090a3aba0453a07384d29ff66b7435bb90e77e1037599/httptools-0.8.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:159e9ab5f701ccd42e555a12f1ad8ff69702910fc1c996cf2bb66e5fcb7a231b", size = 112079, upload-time = "2026-05-25T22:17:25.216Z" }, - { url = "https://files.pythonhosted.org/packages/ba/53/771bd891eb0f236f32145d6a1775777ec85745f3cc983a1f23d1a3b8ddfe/httptools-0.8.0-cp314-cp314-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:c4a9f1707e4823d54dfec6c33fa3697d302aed536ed352a7ebb5a061ddb869d0", size = 481596, upload-time = "2026-05-25T22:17:26.186Z" }, - { url = "https://files.pythonhosted.org/packages/62/42/94e15bc68ce3d423243c45d7f1b0c7561f13844f97dc52ae23182fb65628/httptools-0.8.0-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:d76ad7b951387e3632c8716a9bb03ac5b45c5f16119aa409db0459520887944e", size = 480865, upload-time = "2026-05-25T22:17:27.542Z" }, - { url = "https://files.pythonhosted.org/packages/1c/7c/fe2980fc03723272e30f135b62360b075f513dfe7cc73aef36c7f04012bd/httptools-0.8.0-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:a3b7387147361c3fd47a0bde763c5c91b5b4cd4dc9989b8ece84ff436c99843b", size = 463189, upload-time = "2026-05-25T22:17:28.546Z" }, - { url = "https://files.pythonhosted.org/packages/15/1b/47fc5fff68acd1bfa20b4734059c9a06cadb88119dcd5258b5b0d21d91c8/httptools-0.8.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:f256d6ce930c52ca1cb2a960b7da03548c454e7d28b06059ad41bfe789036ce0", size = 466610, upload-time = "2026-05-25T22:17:29.816Z" }, - { url = "https://files.pythonhosted.org/packages/60/bd/07b13c93ffd9bec9546e0d43f8e19378dd696dbd278511406bc07371ef1f/httptools-0.8.0-cp314-cp314-win_amd64.whl", hash = "sha256:19d1ee275bb59ba2643ba9a3a1e51cc0c788caf2b8df506368e03f56fdd08527", size = 92705, upload-time = "2026-05-25T22:17:31.133Z" }, - { url = "https://files.pythonhosted.org/packages/fd/c4/121648f68ce066d7bd762d6b6d97e620847642d38d54f3d90ff11d947629/httptools-0.8.0-cp314-cp314t-macosx_10_13_universal2.whl", hash = "sha256:de1ed58a974e75d56560acc7e7fed01a454994429456f65209789992e41f2568", size = 215023, upload-time = "2026-05-25T22:17:32.401Z" }, - { url = "https://files.pythonhosted.org/packages/b9/b0/312a062ae741ae3e8baa8c8bf20be81b2e67337b259ab4349bebc7b6142e/httptools-0.8.0-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:e93c227b595c6926c1acee96891dd9da4be338cfbe82e5cd3bb9d8dd7dc4ac0b", size = 117405, upload-time = "2026-05-25T22:17:33.742Z" }, - { url = "https://files.pythonhosted.org/packages/fc/37/fccd705f795386bb05bf413012fecff2a33e5aa8c2f069096de3e9fd8702/httptools-0.8.0-cp314-cp314t-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:2a021c3a8e65cc125390d72f59b968afca3bdcaff25bd67965e0a055a14946ca", size = 558497, upload-time = "2026-05-25T22:17:34.732Z" }, - { url = "https://files.pythonhosted.org/packages/bd/39/f172e8003576de35f5ba77ff417cf0e34429d35dc014deef15afa337a72c/httptools-0.8.0-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:48774d39cbb70e2b1f71f88852a3087ae1d3a1eb80482bb48c13067ab080c14f", size = 571585, upload-time = "2026-05-25T22:17:35.813Z" }, - { url = "https://files.pythonhosted.org/packages/3e/b9/f5564760af99f3dbbf3f9104dc00e5da27e96cf433c6bdcf77617f70bf3f/httptools-0.8.0-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:88eead8ec8680a9f146c655bc88445a325bd7921cfd8194c7337e9467282427d", size = 543297, upload-time = "2026-05-25T22:17:37.08Z" }, - { url = "https://files.pythonhosted.org/packages/99/67/8d9f2c313618e161b82f3873188e7196126da1d6e29688df40eb3997c77a/httptools-0.8.0-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:2c032fa028f46871ec7e1fc59fc15e8023eab3e6bbe6ece786a1611719a5d081", size = 539535, upload-time = "2026-05-25T22:17:38.032Z" }, - { url = "https://files.pythonhosted.org/packages/48/63/b906c01e53f50d432c0defe43ce52764a111dc1bdd028bafbeb54dcfd008/httptools-0.8.0-cp314-cp314t-win_amd64.whl", hash = "sha256:384c17174464c8e873398b7af24f0b1f44d992c820328413951a625323155d77", size = 108209, upload-time = "2026-05-25T22:17:39.473Z" }, -] - -[[package]] -name = "httpx" -version = "0.28.1" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "anyio" }, - { name = "certifi" }, - { name = "httpcore" }, - { name = "idna" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/b1/df/48c586a5fe32a0f01324ee087459e112ebb7224f646c0b5023f5e79e9956/httpx-0.28.1.tar.gz", hash = "sha256:75e98c5f16b0f35b567856f597f06ff2270a374470a5c2392242528e3e3e42fc", size = 141406, upload-time = "2024-12-06T15:37:23.222Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/2a/39/e50c7c3a983047577ee07d2a9e53faf5a69493943ec3f6a384bdc792deb2/httpx-0.28.1-py3-none-any.whl", hash = "sha256:d909fcccc110f8c7faf814ca82a9a4d816bc5a6dbfea25d6591d6985b8ba59ad", size = 73517, upload-time = "2024-12-06T15:37:21.509Z" }, -] - -[[package]] -name = "httpx2" -version = "2.3.0" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "anyio" }, - { name = "httpcore2" }, - { name = "idna" }, - { name = "truststore" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/9f/9a/cca0b9145f13d8ae34b885ae28d403a1469a433abc78e0f94f4ce94e650b/httpx2-2.3.0.tar.gz", hash = "sha256:227e7c41d95a76d4077a52640564132777215fc3394e07b66a3116c33d668fa9", size = 81115, upload-time = "2026-06-01T13:15:04.324Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/87/ce/ae2911859847f9ba1d6b23027e53481cbeb50b93234f355a968d300ca2cb/httpx2-2.3.0-py3-none-any.whl", hash = "sha256:6f393663bdf6dbe7fe90118e3eb5b2bd024a675cae0390ac08cec9198812d8b7", size = 74538, upload-time = "2026-06-01T13:15:01.566Z" }, -] - -[[package]] -name = "idna" -version = "3.17" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/b9/28/99c51f664567218d824af024c0251650fb27e4ca066df188dab0769c5b91/idna-3.17.tar.gz", hash = "sha256:5eb0cb53bc467c12eadcf6de83163ad8527cec9416f44b9b61b19caedad2b87f", size = 196048, upload-time = "2026-05-28T14:32:38.55Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/de/a7/f76514cc40ad6234098ecdebda08732d75964776c51a42845b7da10649e2/idna-3.17-py3-none-any.whl", hash = "sha256:466e48829084efe2548012b855df21540b96f2e20e51bd124c851536556a592c", size = 65316, upload-time = "2026-05-28T14:32:37.035Z" }, -] - -[[package]] -name = "iniconfig" -version = "2.3.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/72/34/14ca021ce8e5dfedc35312d08ba8bf51fdd999c576889fc2c24cb97f4f10/iniconfig-2.3.0.tar.gz", hash = "sha256:c76315c77db068650d49c5b56314774a7804df16fee4402c1f19d6d15d8c4730", size = 20503, upload-time = "2025-10-18T21:55:43.219Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/cb/b1/3846dd7f199d53cb17f49cba7e651e9ce294d8497c8c150530ed11865bb8/iniconfig-2.3.0-py3-none-any.whl", hash = "sha256:f631c04d2c48c52b84d0d0549c99ff3859c98df65b3101406327ecc7d53fbf12", size = 7484, upload-time = "2025-10-18T21:55:41.639Z" }, -] - -[[package]] -name = "ipykernel" -version = "6.29.5" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "appnope", marker = "sys_platform == 'darwin'" }, - { name = "comm" }, - { name = "debugpy" }, - { name = "ipython" }, - { name = "jupyter-client" }, - { name = "jupyter-core" }, - { name = "matplotlib-inline" }, - { name = "nest-asyncio" }, - { name = "packaging" }, - { name = "psutil" }, - { name = "pyzmq" }, - { name = "tornado" }, - { name = "traitlets" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/e9/5c/67594cb0c7055dc50814b21731c22a601101ea3b1b50a9a1b090e11f5d0f/ipykernel-6.29.5.tar.gz", hash = "sha256:f093a22c4a40f8828f8e330a9c297cb93dcab13bd9678ded6de8e5cf81c56215", size = 163367, upload-time = "2024-07-01T14:07:22.543Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/94/5c/368ae6c01c7628438358e6d337c19b05425727fbb221d2a3c4303c372f42/ipykernel-6.29.5-py3-none-any.whl", hash = "sha256:afdb66ba5aa354b09b91379bac28ae4afebbb30e8b39510c9690afb7a10421b5", size = 117173, upload-time = "2024-07-01T14:07:19.603Z" }, -] - -[[package]] -name = "ipython" -version = "9.13.0" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "colorama", marker = "sys_platform == 'win32'" }, - { name = "decorator" }, - { name = "ipython-pygments-lexers" }, - { name = "jedi" }, - { name = "matplotlib-inline" }, - { name = "pexpect", marker = "sys_platform != 'emscripten' and sys_platform != 'win32'" }, - { name = "prompt-toolkit" }, - { name = "psutil" }, - { name = "pygments" }, - { name = "stack-data" }, - { name = "traitlets" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/cd/c4/87cda5842cf5c31837c06ddb588e11c3c35d8ece89b7a0108c06b8c9b00a/ipython-9.13.0.tar.gz", hash = "sha256:7e834b6afc99f020e3f05966ced34792f40267d64cb1ea9043886dab0dde5967", size = 4430549, upload-time = "2026-04-24T12:24:55.221Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/b9/86/3060e8029b7cc505cce9a0137431dda81d0a3fde93a8f0f50ee0bf37a795/ipython-9.13.0-py3-none-any.whl", hash = "sha256:57f9d4639e20818d328d287c7b549af3d05f12486ea8f2e7f73e52a36ec4d201", size = 627274, upload-time = "2026-04-24T12:24:53.038Z" }, -] - -[[package]] -name = "ipython-genutils" -version = "0.2.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/e8/69/fbeffffc05236398ebfcfb512b6d2511c622871dca1746361006da310399/ipython_genutils-0.2.0.tar.gz", hash = "sha256:eb2e116e75ecef9d4d228fdc66af54269afa26ab4463042e33785b887c628ba8", size = 22208, upload-time = "2017-03-13T22:12:26.393Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/fa/bc/9bd3b5c2b4774d5f33b2d544f1460be9df7df2fe42f352135381c347c69a/ipython_genutils-0.2.0-py2.py3-none-any.whl", hash = "sha256:72dd37233799e619666c9f639a9da83c34013a73e8bbc79a7a6348d93c61fab8", size = 26343, upload-time = "2017-03-13T22:12:25.412Z" }, -] - -[[package]] -name = "ipython-pygments-lexers" -version = "1.1.1" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "pygments" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/ef/4c/5dd1d8af08107f88c7f741ead7a40854b8ac24ddf9ae850afbcf698aa552/ipython_pygments_lexers-1.1.1.tar.gz", hash = "sha256:09c0138009e56b6854f9535736f4171d855c8c08a563a0dcd8022f78355c7e81", size = 8393, upload-time = "2025-01-17T11:24:34.505Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/d9/33/1f075bf72b0b747cb3288d011319aaf64083cf2efef8354174e3ed4540e2/ipython_pygments_lexers-1.1.1-py3-none-any.whl", hash = "sha256:a9462224a505ade19a605f71f8fa63c2048833ce50abc86768a0d81d876dc81c", size = 8074, upload-time = "2025-01-17T11:24:33.271Z" }, -] - -[[package]] -name = "isoduration" -version = "20.11.0" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "arrow" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/7c/1a/3c8edc664e06e6bd06cce40c6b22da5f1429aa4224d0c590f3be21c91ead/isoduration-20.11.0.tar.gz", hash = "sha256:ac2f9015137935279eac671f94f89eb00584f940f5dc49462a0c4ee692ba1bd9", size = 11649, upload-time = "2020-11-01T11:00:00.312Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/7b/55/e5326141505c5d5e34c5e0935d2908a74e4561eca44108fbfb9c13d2911a/isoduration-20.11.0-py3-none-any.whl", hash = "sha256:b2904c2a4228c3d44f409c8ae8e2370eb21a26f7ac2ec5446df141dde3452042", size = 11321, upload-time = "2020-11-01T10:59:58.02Z" }, -] - -[[package]] -name = "itsdangerous" -version = "2.2.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/9c/cb/8ac0172223afbccb63986cc25049b154ecfb5e85932587206f42317be31d/itsdangerous-2.2.0.tar.gz", hash = "sha256:e0050c0b7da1eea53ffaf149c0cfbb5c6e2e2b69c4bef22c81fa6eb73e5f6173", size = 54410, upload-time = "2024-04-16T21:28:15.614Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/04/96/92447566d16df59b2a776c0fb82dbc4d9e07cd95062562af01e408583fc4/itsdangerous-2.2.0-py3-none-any.whl", hash = "sha256:c6242fc49e35958c8b15141343aa660db5fc54d4f13a1db01a3f5891b98700ef", size = 16234, upload-time = "2024-04-16T21:28:14.499Z" }, -] - -[[package]] -name = "jedi" -version = "0.20.0" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "parso" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/46/b7/a3635f6a2d7cf5b5dd98064fc1d5fbbafcb25477bcea204a3a92145d158b/jedi-0.20.0.tar.gz", hash = "sha256:c3f4ccbd276696f4b19c54618d4fb18f9fc24b0aef02acf704b23f487daa1011", size = 3119416, upload-time = "2026-05-01T23:38:47.814Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/9a/93/242e2eab5fe682ffcb8b0084bde703a41d51e17ee0f3a31ff0d9d813620a/jedi-0.20.0-py2.py3-none-any.whl", hash = "sha256:7bdd9c2634f56713299976f4cbd59cb3fa92165cc5e05ea811fb253480728b67", size = 4884812, upload-time = "2026-05-01T23:38:43.919Z" }, -] - -[[package]] -name = "jinja2" -version = "3.1.6" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "markupsafe" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/df/bf/f7da0350254c0ed7c72f3e33cef02e048281fec7ecec5f032d4aac52226b/jinja2-3.1.6.tar.gz", hash = "sha256:0137fb05990d35f1275a587e9aee6d56da821fc83491a0fb838183be43f66d6d", size = 245115, upload-time = "2025-03-05T20:05:02.478Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/62/a1/3d680cbfd5f4b8f15abc1d571870c5fc3e594bb582bc3b64ea099db13e56/jinja2-3.1.6-py3-none-any.whl", hash = "sha256:85ece4451f492d0c13c5dd7c13a64681a86afae63a5f347908daf103ce6d2f67", size = 134899, upload-time = "2025-03-05T20:05:00.369Z" }, + { url = "https://files.pythonhosted.org/packages/f5/68/67f4947ed55d2e69f2cc199ab9fd85e0a0034d813bbeef84df6d2ba4d4b7/grpcio-1.80.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:31b9ac4ad1aa28ffee5503821fafd09e4da0a261ce1c1281c6c8da0423c83b6e", size = 7828477, upload-time = "2026-03-30T08:48:32.054Z" }, + { url = "https://files.pythonhosted.org/packages/44/b6/8d4096691b2e385e8271911a0de4f35f0a6c7d05aff7098e296c3de86939/grpcio-1.80.0-cp314-cp314-win32.whl", hash = "sha256:367ce30ba67d05e0592470428f0ec1c31714cab9ef19b8f2e37be1f4c7d32fae", size = 4218563, upload-time = "2026-03-30T08:48:34.538Z" }, + { url = "https://files.pythonhosted.org/packages/e5/8c/bbe6baf2557262834f2070cf668515fa308b2d38a4bbf771f8f7872a7036/grpcio-1.80.0-cp314-cp314-win_amd64.whl", hash = "sha256:3b01e1f5464c583d2f567b2e46ff0d516ef979978f72091fd81f5ab7fa6e2e7f", size = 5019457, upload-time = "2026-03-30T08:48:37.308Z" }, ] [[package]] -name = "jmespath" -version = "1.1.0" +name = "h11" +version = "0.16.0" source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/d3/59/322338183ecda247fb5d1763a6cbe46eff7222eaeebafd9fa65d4bf5cb11/jmespath-1.1.0.tar.gz", hash = "sha256:472c87d80f36026ae83c6ddd0f1d05d4e510134ed462851fd5f754c8c3cbb88d", size = 27377, upload-time = "2026-01-22T16:35:26.279Z" } +sdist = { url = "https://files.pythonhosted.org/packages/01/ee/02a2c011bdab74c6fb3c75474d40b3052059d95df7e73351460c8588d963/h11-0.16.0.tar.gz", hash = "sha256:4e35b956cf45792e4caa5885e69fba00bdbc6ffafbfa020300e549b208ee5ff1", size = 101250, upload-time = "2025-04-24T03:35:25.427Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/14/2f/967ba146e6d58cf6a652da73885f52fc68001525b4197effc174321d70b4/jmespath-1.1.0-py3-none-any.whl", hash = "sha256:a5663118de4908c91729bea0acadca56526eb2698e83de10cd116ae0f4e97c64", size = 20419, upload-time = "2026-01-22T16:35:24.919Z" }, + { url = "https://files.pythonhosted.org/packages/04/4b/29cac41a4d98d144bf5f6d33995617b185d14b22401f75ca86f384e87ff1/h11-0.16.0-py3-none-any.whl", hash = "sha256:63cf8bbe7522de3bf65932fda1d9c2772064ffb3dae62d55932da54b31cb6c86", size = 37515, upload-time = "2025-04-24T03:35:24.344Z" }, ] [[package]] -name = "joblib" -version = "1.5.3" +name = "httpcore" +version = "1.0.9" source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/41/f2/d34e8b3a08a9cc79a50b2208a93dce981fe615b64d5a4d4abee421d898df/joblib-1.5.3.tar.gz", hash = "sha256:8561a3269e6801106863fd0d6d84bb737be9e7631e33aaed3fb9ce5953688da3", size = 331603, upload-time = "2025-12-15T08:41:46.427Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/7b/91/984aca2ec129e2757d1e4e3c81c3fcda9d0f85b74670a094cc443d9ee949/joblib-1.5.3-py3-none-any.whl", hash = "sha256:5fc3c5039fc5ca8c0276333a188bbd59d6b7ab37fe6632daa76bc7f9ec18e713", size = 309071, upload-time = "2025-12-15T08:41:44.973Z" }, +dependencies = [ + { name = "certifi" }, + { name = "h11" }, ] - -[[package]] -name = "json2html" -version = "1.3.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/01/d5/40b617ee19d2d79f606ed37f8a81e51158f126d2af67270c68f2b47ae0d5/json2html-1.3.0.tar.gz", hash = "sha256:8951a53662ae9cfd812685facdba693fc950ffc1c1fd1a8a2d3cf4c34600689c", size = 6977, upload-time = "2019-07-03T20:50:03.023Z" } - -[[package]] -name = "jsonpointer" -version = "3.1.1" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/18/c7/af399a2e7a67fd18d63c40c5e62d3af4e67b836a2107468b6a5ea24c4304/jsonpointer-3.1.1.tar.gz", hash = "sha256:0b801c7db33a904024f6004d526dcc53bbb8a4a0f4e32bfd10beadf60adf1900", size = 9068, upload-time = "2026-03-23T22:32:32.458Z" } +sdist = { url = "https://files.pythonhosted.org/packages/06/94/82699a10bca87a5556c9c59b5963f2d039dbd239f25bc2a63907a05a14cb/httpcore-1.0.9.tar.gz", hash = "sha256:6e34463af53fd2ab5d807f399a9b45ea31c3dfa2276f15a2c3f00afff6e176e8", size = 85484, upload-time = "2025-04-24T22:06:22.219Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/9e/6a/a83720e953b1682d2d109d3c2dbb0bc9bf28cc1cbc205be4ef4be5da709d/jsonpointer-3.1.1-py3-none-any.whl", hash = "sha256:8ff8b95779d071ba472cf5bc913028df06031797532f08a7d5b602d8b2a488ca", size = 7659, upload-time = "2026-03-23T22:32:31.568Z" }, + { url = "https://files.pythonhosted.org/packages/7e/f5/f66802a942d491edb555dd61e3a9961140fd64c90bce1eafd741609d334d/httpcore-1.0.9-py3-none-any.whl", hash = "sha256:2d400746a40668fc9dec9810239072b40b4484b640a8c38fd654a024c7a1bf55", size = 78784, upload-time = "2025-04-24T22:06:20.566Z" }, ] [[package]] -name = "jsonschema" -version = "4.26.0" +name = "httpcore2" +version = "2.3.0" source = { registry = "https://pypi.org/simple" } dependencies = [ - { name = "attrs" }, - { name = "jsonschema-specifications" }, - { name = "referencing" }, - { name = "rpds-py" }, + { name = "h11" }, + { name = "truststore" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/b3/fc/e067678238fa451312d4c62bf6e6cf5ec56375422aee02f9cb5f909b3047/jsonschema-4.26.0.tar.gz", hash = "sha256:0c26707e2efad8aa1bfc5b7ce170f3fccc2e4918ff85989ba9ffa9facb2be326", size = 366583, upload-time = "2026-01-07T13:41:07.246Z" } +sdist = { url = "https://files.pythonhosted.org/packages/e6/34/18f1c596e677962f040284246f393b10a1f8ce440b3a7e69c637d0f1c7ad/httpcore2-2.3.0.tar.gz", hash = "sha256:07327e251560960eea8e969d92d4c6a325feb13cca39e25340731336c3baf924", size = 64300, upload-time = "2026-06-01T13:15:02.998Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/69/90/f63fb5873511e014207a475e2bb4e8b2e570d655b00ac19a9a0ca0a385ee/jsonschema-4.26.0-py3-none-any.whl", hash = "sha256:d489f15263b8d200f8387e64b4c3a75f06629559fb73deb8fdfb525f2dab50ce", size = 90630, upload-time = "2026-01-07T13:41:05.306Z" }, -] - -[package.optional-dependencies] -format-nongpl = [ - { name = "fqdn" }, - { name = "idna" }, - { name = "isoduration" }, - { name = "jsonpointer" }, - { name = "rfc3339-validator" }, - { name = "rfc3986-validator" }, - { name = "rfc3987-syntax" }, - { name = "uri-template" }, - { name = "webcolors" }, + { url = "https://files.pythonhosted.org/packages/c2/dd/3357218c69360d1cecc196c230c9a1d5c9afd5dba362056e23e60a5e64e5/httpcore2-2.3.0-py3-none-any.whl", hash = "sha256:477e9e334f74e5240dcac002e890580f36a57d40ff0fb14cc9655731d23b8415", size = 80024, upload-time = "2026-06-01T13:15:00.001Z" }, ] [[package]] -name = "jsonschema-specifications" -version = "2025.9.1" +name = "httptools" +version = "0.8.0" source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "referencing" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/19/74/a633ee74eb36c44aa6d1095e7cc5569bebf04342ee146178e2d36600708b/jsonschema_specifications-2025.9.1.tar.gz", hash = "sha256:b540987f239e745613c7a9176f3edb72b832a4ac465cf02712288397832b5e8d", size = 32855, upload-time = "2025-09-08T01:34:59.186Z" } +sdist = { url = "https://files.pythonhosted.org/packages/43/e5/d471fcb0e14523fe1c3f4ba58ca52480e7bd70ad7109a3846bc75892f7fb/httptools-0.8.0.tar.gz", hash = "sha256:6b2a32f18d97e16e90827d7a819ffa8dbd8cc245fc4e1fa9d1095b54ef4bd999", size = 271342, upload-time = "2026-05-25T22:17:48.841Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/41/45/1a4ed80516f02155c51f51e8cedb3c1902296743db0bbc66608a0db2814f/jsonschema_specifications-2025.9.1-py3-none-any.whl", hash = "sha256:98802fee3a11ee76ecaca44429fda8a41bff98b00a0f2838151b113f210cc6fe", size = 18437, upload-time = "2025-09-08T01:34:57.871Z" }, + { url = "https://files.pythonhosted.org/packages/1a/12/fa3fbf5f9517b273edea2dc982aa82a8c634091e67c590792b729017bc6f/httptools-0.8.0-cp314-cp314-macosx_10_13_universal2.whl", hash = "sha256:de242a49b5d18e0a8776e654e9f6bf6d89f3875a5c35b425a0e7ce940feb3fd6", size = 206183, upload-time = "2026-05-25T22:17:24.004Z" }, + { url = "https://files.pythonhosted.org/packages/30/fc/5e7c4cb443370f2090a3aba0453a07384d29ff66b7435bb90e77e1037599/httptools-0.8.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:159e9ab5f701ccd42e555a12f1ad8ff69702910fc1c996cf2bb66e5fcb7a231b", size = 112079, upload-time = "2026-05-25T22:17:25.216Z" }, + { url = "https://files.pythonhosted.org/packages/ba/53/771bd891eb0f236f32145d6a1775777ec85745f3cc983a1f23d1a3b8ddfe/httptools-0.8.0-cp314-cp314-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:c4a9f1707e4823d54dfec6c33fa3697d302aed536ed352a7ebb5a061ddb869d0", size = 481596, upload-time = "2026-05-25T22:17:26.186Z" }, + { url = "https://files.pythonhosted.org/packages/62/42/94e15bc68ce3d423243c45d7f1b0c7561f13844f97dc52ae23182fb65628/httptools-0.8.0-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:d76ad7b951387e3632c8716a9bb03ac5b45c5f16119aa409db0459520887944e", size = 480865, upload-time = "2026-05-25T22:17:27.542Z" }, + { url = "https://files.pythonhosted.org/packages/1c/7c/fe2980fc03723272e30f135b62360b075f513dfe7cc73aef36c7f04012bd/httptools-0.8.0-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:a3b7387147361c3fd47a0bde763c5c91b5b4cd4dc9989b8ece84ff436c99843b", size = 463189, upload-time = "2026-05-25T22:17:28.546Z" }, + { url = "https://files.pythonhosted.org/packages/15/1b/47fc5fff68acd1bfa20b4734059c9a06cadb88119dcd5258b5b0d21d91c8/httptools-0.8.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:f256d6ce930c52ca1cb2a960b7da03548c454e7d28b06059ad41bfe789036ce0", size = 466610, upload-time = "2026-05-25T22:17:29.816Z" }, + { url = "https://files.pythonhosted.org/packages/60/bd/07b13c93ffd9bec9546e0d43f8e19378dd696dbd278511406bc07371ef1f/httptools-0.8.0-cp314-cp314-win_amd64.whl", hash = "sha256:19d1ee275bb59ba2643ba9a3a1e51cc0c788caf2b8df506368e03f56fdd08527", size = 92705, upload-time = "2026-05-25T22:17:31.133Z" }, + { url = "https://files.pythonhosted.org/packages/fd/c4/121648f68ce066d7bd762d6b6d97e620847642d38d54f3d90ff11d947629/httptools-0.8.0-cp314-cp314t-macosx_10_13_universal2.whl", hash = "sha256:de1ed58a974e75d56560acc7e7fed01a454994429456f65209789992e41f2568", size = 215023, upload-time = "2026-05-25T22:17:32.401Z" }, + { url = "https://files.pythonhosted.org/packages/b9/b0/312a062ae741ae3e8baa8c8bf20be81b2e67337b259ab4349bebc7b6142e/httptools-0.8.0-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:e93c227b595c6926c1acee96891dd9da4be338cfbe82e5cd3bb9d8dd7dc4ac0b", size = 117405, upload-time = "2026-05-25T22:17:33.742Z" }, + { url = "https://files.pythonhosted.org/packages/fc/37/fccd705f795386bb05bf413012fecff2a33e5aa8c2f069096de3e9fd8702/httptools-0.8.0-cp314-cp314t-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:2a021c3a8e65cc125390d72f59b968afca3bdcaff25bd67965e0a055a14946ca", size = 558497, upload-time = "2026-05-25T22:17:34.732Z" }, + { url = "https://files.pythonhosted.org/packages/bd/39/f172e8003576de35f5ba77ff417cf0e34429d35dc014deef15afa337a72c/httptools-0.8.0-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:48774d39cbb70e2b1f71f88852a3087ae1d3a1eb80482bb48c13067ab080c14f", size = 571585, upload-time = "2026-05-25T22:17:35.813Z" }, + { url = "https://files.pythonhosted.org/packages/3e/b9/f5564760af99f3dbbf3f9104dc00e5da27e96cf433c6bdcf77617f70bf3f/httptools-0.8.0-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:88eead8ec8680a9f146c655bc88445a325bd7921cfd8194c7337e9467282427d", size = 543297, upload-time = "2026-05-25T22:17:37.08Z" }, + { url = "https://files.pythonhosted.org/packages/99/67/8d9f2c313618e161b82f3873188e7196126da1d6e29688df40eb3997c77a/httptools-0.8.0-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:2c032fa028f46871ec7e1fc59fc15e8023eab3e6bbe6ece786a1611719a5d081", size = 539535, upload-time = "2026-05-25T22:17:38.032Z" }, + { url = "https://files.pythonhosted.org/packages/48/63/b906c01e53f50d432c0defe43ce52764a111dc1bdd028bafbeb54dcfd008/httptools-0.8.0-cp314-cp314t-win_amd64.whl", hash = "sha256:384c17174464c8e873398b7af24f0b1f44d992c820328413951a625323155d77", size = 108209, upload-time = "2026-05-25T22:17:39.473Z" }, ] [[package]] -name = "jupyter-client" -version = "7.4.9" +name = "httpx" +version = "0.28.1" source = { registry = "https://pypi.org/simple" } dependencies = [ - { name = "entrypoints" }, - { name = "jupyter-core" }, - { name = "nest-asyncio" }, - { name = "python-dateutil" }, - { name = "pyzmq" }, - { name = "tornado" }, - { name = "traitlets" }, + { name = "anyio" }, + { name = "certifi" }, + { name = "httpcore" }, + { name = "idna" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/1e/33/71778cdd2c69445bcd3bb6029da2e43cc9b5cbbeef4f4982ef3aaf396650/jupyter_client-7.4.9.tar.gz", hash = "sha256:52be28e04171f07aed8f20e1616a5a552ab9fee9cbbe6c1896ae170c3880d392", size = 329115, upload-time = "2023-01-12T20:05:10.58Z" } +sdist = { url = "https://files.pythonhosted.org/packages/b1/df/48c586a5fe32a0f01324ee087459e112ebb7224f646c0b5023f5e79e9956/httpx-0.28.1.tar.gz", hash = "sha256:75e98c5f16b0f35b567856f597f06ff2270a374470a5c2392242528e3e3e42fc", size = 141406, upload-time = "2024-12-06T15:37:23.222Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/fd/a7/ef3b7c8b9d6730a21febdd0809084e4cea6d2a7e43892436adecdd0acbd4/jupyter_client-7.4.9-py3-none-any.whl", hash = "sha256:214668aaea208195f4c13d28eb272ba79f945fc0cf3f11c7092c20b2ca1980e7", size = 133492, upload-time = "2023-01-12T20:05:08.044Z" }, + { url = "https://files.pythonhosted.org/packages/2a/39/e50c7c3a983047577ee07d2a9e53faf5a69493943ec3f6a384bdc792deb2/httpx-0.28.1-py3-none-any.whl", hash = "sha256:d909fcccc110f8c7faf814ca82a9a4d816bc5a6dbfea25d6591d6985b8ba59ad", size = 73517, upload-time = "2024-12-06T15:37:21.509Z" }, ] [[package]] -name = "jupyter-core" -version = "5.9.1" +name = "httpx2" +version = "2.3.0" source = { registry = "https://pypi.org/simple" } dependencies = [ - { name = "platformdirs" }, - { name = "traitlets" }, + { name = "anyio" }, + { name = "httpcore2" }, + { name = "idna" }, + { name = "truststore" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/02/49/9d1284d0dc65e2c757b74c6687b6d319b02f822ad039e5c512df9194d9dd/jupyter_core-5.9.1.tar.gz", hash = "sha256:4d09aaff303b9566c3ce657f580bd089ff5c91f5f89cf7d8846c3cdf465b5508", size = 89814, upload-time = "2025-10-16T19:19:18.444Z" } +sdist = { url = "https://files.pythonhosted.org/packages/9f/9a/cca0b9145f13d8ae34b885ae28d403a1469a433abc78e0f94f4ce94e650b/httpx2-2.3.0.tar.gz", hash = "sha256:227e7c41d95a76d4077a52640564132777215fc3394e07b66a3116c33d668fa9", size = 81115, upload-time = "2026-06-01T13:15:04.324Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/e7/e7/80988e32bf6f73919a113473a604f5a8f09094de312b9d52b79c2df7612b/jupyter_core-5.9.1-py3-none-any.whl", hash = "sha256:ebf87fdc6073d142e114c72c9e29a9d7ca03fad818c5d300ce2adc1fb0743407", size = 29032, upload-time = "2025-10-16T19:19:16.783Z" }, + { url = "https://files.pythonhosted.org/packages/87/ce/ae2911859847f9ba1d6b23027e53481cbeb50b93234f355a968d300ca2cb/httpx2-2.3.0-py3-none-any.whl", hash = "sha256:6f393663bdf6dbe7fe90118e3eb5b2bd024a675cae0390ac08cec9198812d8b7", size = 74538, upload-time = "2026-06-01T13:15:01.566Z" }, ] [[package]] -name = "jupyter-events" -version = "0.12.1" +name = "idna" +version = "3.17" source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "jsonschema", extra = ["format-nongpl"] }, - { name = "packaging" }, - { name = "python-json-logger" }, - { name = "pyyaml" }, - { name = "referencing" }, - { name = "rfc3339-validator" }, - { name = "rfc3986-validator" }, - { name = "traitlets" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/18/f8/475c4241b2b75af0deaae453ed003c6c851766dbc44d332d8baf245dc931/jupyter_events-0.12.1.tar.gz", hash = "sha256:faff25f77218335752f35f23c5fe6e4a392a7bd99a5939ccb9b8fbf594636cf3", size = 62854, upload-time = "2026-04-20T23:17:50.66Z" } +sdist = { url = "https://files.pythonhosted.org/packages/b9/28/99c51f664567218d824af024c0251650fb27e4ca066df188dab0769c5b91/idna-3.17.tar.gz", hash = "sha256:5eb0cb53bc467c12eadcf6de83163ad8527cec9416f44b9b61b19caedad2b87f", size = 196048, upload-time = "2026-05-28T14:32:38.55Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/eb/6c/6fcde0c8f616ed360ffd3587f7db9e225a7e62b583a04494d2f069cf64ea/jupyter_events-0.12.1-py3-none-any.whl", hash = "sha256:c366585253f537a627da52fa7ca7410c5b5301fe893f511e7b077c2d93ec8bcf", size = 19512, upload-time = "2026-04-20T23:17:48.927Z" }, + { url = "https://files.pythonhosted.org/packages/de/a7/f76514cc40ad6234098ecdebda08732d75964776c51a42845b7da10649e2/idna-3.17-py3-none-any.whl", hash = "sha256:466e48829084efe2548012b855df21540b96f2e20e51bd124c851536556a592c", size = 65316, upload-time = "2026-05-28T14:32:37.035Z" }, ] [[package]] -name = "jupyter-server" -version = "2.18.2" +name = "iniconfig" +version = "2.3.0" source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "anyio" }, - { name = "argon2-cffi" }, - { name = "jinja2" }, - { name = "jupyter-client" }, - { name = "jupyter-core" }, - { name = "jupyter-events" }, - { name = "jupyter-server-terminals" }, - { name = "nbconvert" }, - { name = "nbformat" }, - { name = "packaging" }, - { name = "prometheus-client" }, - { name = "pywinpty", marker = "os_name == 'nt'" }, - { name = "pyzmq" }, - { name = "send2trash" }, - { name = "terminado" }, - { name = "tornado" }, - { name = "traitlets" }, - { name = "websocket-client" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/ca/15/1eacb0fcb79ef86e8a0a79a708e6ad7435f6f223097dd29a4ce861fabc44/jupyter_server-2.18.2.tar.gz", hash = "sha256:06b4f40d8a7a00bb39d5216859c81374a0e7cfefe6d8a5a7facc5a5c37c679a7", size = 753177, upload-time = "2026-05-06T07:04:36.274Z" } +sdist = { url = "https://files.pythonhosted.org/packages/72/34/14ca021ce8e5dfedc35312d08ba8bf51fdd999c576889fc2c24cb97f4f10/iniconfig-2.3.0.tar.gz", hash = "sha256:c76315c77db068650d49c5b56314774a7804df16fee4402c1f19d6d15d8c4730", size = 20503, upload-time = "2025-10-18T21:55:43.219Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/e2/50/ecf4f70d65bdb7519b28a33d1b2fee8a4b4ba1ae1a92f15d97e877c5de21/jupyter_server-2.18.2-py3-none-any.whl", hash = "sha256:fa5e46539ded65791838035a2b6001f13e54d5f64b8b3752eb1e91fdd641a5b8", size = 391907, upload-time = "2026-05-06T07:04:34.014Z" }, + { url = "https://files.pythonhosted.org/packages/cb/b1/3846dd7f199d53cb17f49cba7e651e9ce294d8497c8c150530ed11865bb8/iniconfig-2.3.0-py3-none-any.whl", hash = "sha256:f631c04d2c48c52b84d0d0549c99ff3859c98df65b3101406327ecc7d53fbf12", size = 7484, upload-time = "2025-10-18T21:55:41.639Z" }, ] [[package]] -name = "jupyter-server-terminals" -version = "0.5.4" +name = "jinja2" +version = "3.1.6" source = { registry = "https://pypi.org/simple" } dependencies = [ - { name = "pywinpty", marker = "os_name == 'nt'" }, - { name = "terminado" }, + { name = "markupsafe" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/f4/a7/bcd0a9b0cbba88986fe944aaaf91bfda603e5a50bda8ed15123f381a3b2f/jupyter_server_terminals-0.5.4.tar.gz", hash = "sha256:bbda128ed41d0be9020349f9f1f2a4ab9952a73ed5f5ac9f1419794761fb87f5", size = 31770, upload-time = "2026-01-14T16:53:20.213Z" } +sdist = { url = "https://files.pythonhosted.org/packages/df/bf/f7da0350254c0ed7c72f3e33cef02e048281fec7ecec5f032d4aac52226b/jinja2-3.1.6.tar.gz", hash = "sha256:0137fb05990d35f1275a587e9aee6d56da821fc83491a0fb838183be43f66d6d", size = 245115, upload-time = "2025-03-05T20:05:02.478Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/d1/2d/6674563f71c6320841fc300911a55143925112a72a883e2ca71fba4c618d/jupyter_server_terminals-0.5.4-py3-none-any.whl", hash = "sha256:55be353fc74a80bc7f3b20e6be50a55a61cd525626f578dcb66a5708e2007d14", size = 13704, upload-time = "2026-01-14T16:53:18.738Z" }, + { url = "https://files.pythonhosted.org/packages/62/a1/3d680cbfd5f4b8f15abc1d571870c5fc3e594bb582bc3b64ea099db13e56/jinja2-3.1.6-py3-none-any.whl", hash = "sha256:85ece4451f492d0c13c5dd7c13a64681a86afae63a5f347908daf103ce6d2f67", size = 134899, upload-time = "2025-03-05T20:05:00.369Z" }, ] [[package]] -name = "jupyterlab-pygments" -version = "0.3.0" +name = "joblib" +version = "1.5.3" source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/90/51/9187be60d989df97f5f0aba133fa54e7300f17616e065d1ada7d7646b6d6/jupyterlab_pygments-0.3.0.tar.gz", hash = "sha256:721aca4d9029252b11cfa9d185e5b5af4d54772bb8072f9b7036f4170054d35d", size = 512900, upload-time = "2023-11-23T09:26:37.44Z" } +sdist = { url = "https://files.pythonhosted.org/packages/41/f2/d34e8b3a08a9cc79a50b2208a93dce981fe615b64d5a4d4abee421d898df/joblib-1.5.3.tar.gz", hash = "sha256:8561a3269e6801106863fd0d6d84bb737be9e7631e33aaed3fb9ce5953688da3", size = 331603, upload-time = "2025-12-15T08:41:46.427Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/b1/dd/ead9d8ea85bf202d90cc513b533f9c363121c7792674f78e0d8a854b63b4/jupyterlab_pygments-0.3.0-py3-none-any.whl", hash = "sha256:841a89020971da1d8693f1a99997aefc5dc424bb1b251fd6322462a1b8842780", size = 15884, upload-time = "2023-11-23T09:26:34.325Z" }, + { url = "https://files.pythonhosted.org/packages/7b/91/984aca2ec129e2757d1e4e3c81c3fcda9d0f85b74670a094cc443d9ee949/joblib-1.5.3-py3-none-any.whl", hash = "sha256:5fc3c5039fc5ca8c0276333a188bbd59d6b7ab37fe6632daa76bc7f9ec18e713", size = 309071, upload-time = "2025-12-15T08:41:44.973Z" }, ] [[package]] @@ -1623,15 +579,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/99/a2/ca7dc962848040befed12732dff6acae7fb3c4f6fc4272b3f6c9a30b8713/kiwisolver-1.5.0-cp314-cp314t-win_arm64.whl", hash = "sha256:58f812017cd2985c21fbffb4864d59174d4903dd66fa23815e74bbc7a0e2dd57", size = 70032, upload-time = "2026-03-09T13:15:34.411Z" }, ] -[[package]] -name = "lark" -version = "1.3.1" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/da/34/28fff3ab31ccff1fd4f6c7c7b0ceb2b6968d8ea4950663eadcb5720591a0/lark-1.3.1.tar.gz", hash = "sha256:b426a7a6d6d53189d318f2b6236ab5d6429eaf09259f1ca33eb716eed10d2905", size = 382732, upload-time = "2025-10-27T18:25:56.653Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/82/3d/14ce75ef66813643812f3093ab17e46d3a206942ce7376d31ec2d36229e7/lark-1.3.1-py3-none-any.whl", hash = "sha256:c629b661023a014c37da873b4ff58a817398d12635d3bbb2c5a03be7fe5d1e12", size = 113151, upload-time = "2025-10-27T18:25:54.882Z" }, -] - [[package]] name = "lazy-model" version = "0.4.0" @@ -1730,31 +677,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/70/bc/6f1c2f612465f5fa89b95bead1f44dcb607670fd42891d8fdcd5d039f4f4/markupsafe-3.0.3-cp314-cp314t-win_arm64.whl", hash = "sha256:32001d6a8fc98c8cb5c947787c5d08b0a50663d139f1305bac5885d98d9b40fa", size = 14146, upload-time = "2025-09-27T18:37:28.327Z" }, ] -[[package]] -name = "marshmallow" -version = "3.26.2" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "packaging" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/55/79/de6c16cc902f4fc372236926b0ce2ab7845268dcc30fb2fbb7f71b418631/marshmallow-3.26.2.tar.gz", hash = "sha256:bbe2adb5a03e6e3571b573f42527c6fe926e17467833660bebd11593ab8dfd57", size = 222095, upload-time = "2025-12-22T06:53:53.309Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/be/2f/5108cb3ee4ba6501748c4908b908e55f42a5b66245b4cfe0c99326e1ef6e/marshmallow-3.26.2-py3-none-any.whl", hash = "sha256:013fa8a3c4c276c24d26d84ce934dc964e2aa794345a0f8c7e5a7191482c8a73", size = 50964, upload-time = "2025-12-22T06:53:51.801Z" }, -] - -[[package]] -name = "marshmallow-mongoengine" -version = "0.31.2" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "marshmallow" }, - { name = "mongoengine" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/63/72/5cabacd62c5b4f81a1e955e0c54bb86d1289621e384f522552806f9ee101/marshmallow-mongoengine-0.31.2.tar.gz", hash = "sha256:a708732456e1a36139c6ce52910b57cf2a54e7206c5c635a48dba9e3e157d6db", size = 11377, upload-time = "2023-03-14T05:42:51.825Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/c4/ef/ec8be29d7f6dec0bae9391e8fae352a3d5b2ddb9be84a7d611a5b0e5c1de/marshmallow_mongoengine-0.31.2-py2.py3-none-any.whl", hash = "sha256:51de7614ce9002f9f679aebb6df7488297e791fbd07d9f14b963e9c7bce604ca", size = 12237, upload-time = "2023-03-14T05:42:50.515Z" }, -] - [[package]] name = "matplotlib" version = "3.10.9" @@ -1788,18 +710,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/78/23/92493c3e6e1b635ccfff146f7b99e674808787915420373ac399283764c2/matplotlib-3.10.9-cp314-cp314t-win_arm64.whl", hash = "sha256:a49f1eadc84ca85fd72fa4e89e70e61bf86452df6f971af04b12c60761a0772c", size = 8324785, upload-time = "2026-04-24T00:13:53.633Z" }, ] -[[package]] -name = "matplotlib-inline" -version = "0.2.2" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "traitlets" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/bd/c0/9f7c9a46090390368a4d7bcb76bb87a4a36c421e4c0792cdb53486ffac7a/matplotlib_inline-0.2.2.tar.gz", hash = "sha256:72f3fe8fce36b70d4a5b612f899090cd0401deddc4ea90e1572b9f4bfb058c79", size = 8150, upload-time = "2026-05-08T17:33:33.49Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/41/09/5b161152e2d90f7b87f781c2e1267494aef9c32498df793f73ad0a0a494a/matplotlib_inline-0.2.2-py3-none-any.whl", hash = "sha256:3c821cf1c209f59fb2d2d64abbf5b23b67bcb2210d663f9918dd851c6da1fcf6", size = 9534, upload-time = "2026-05-08T17:33:32.055Z" }, -] - [[package]] name = "mdurl" version = "0.1.2" @@ -1809,39 +719,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/b3/38/89ba8ad64ae25be8de66a6d463314cf1eb366222074cfda9ee839c56a4b4/mdurl-0.1.2-py3-none-any.whl", hash = "sha256:84008a41e51615a49fc9966191ff91509e3c40b939176e643fd50a5c2196b8f8", size = 9979, upload-time = "2022-08-14T12:40:09.779Z" }, ] -[[package]] -name = "mimerender-pr36" -version = "0.0.2" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "python-mimeparse" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/23/39/25559ff5440e17aad0191e3034afa6e023150bc1e79edacb9268c22131f6/mimerender-pr36-0.0.2.tar.gz", hash = "sha256:2d1f7bc4080132da7040518b2d613eb5e49b583231a9b2be3ac040860c233d80", size = 19309, upload-time = "2021-08-07T05:53:35.754Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/48/d5/4f84e7b14f115d49bde75babd13e67ec3b19d077bffc937cab2fc524eac5/mimerender_pr36-0.0.2-py3-none-any.whl", hash = "sha256:260eceeca204d11a4b43cc5d1fe60d757048e6b3dd51b87b64c68c153faadacc", size = 6621, upload-time = "2021-08-07T05:53:33.338Z" }, -] - -[[package]] -name = "mistune" -version = "3.2.1" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/ca/84/620cc3f7e3adf6f5067e10f4dbae71295d8f9e16d5d3f9ef97c40f2f592c/mistune-3.2.1.tar.gz", hash = "sha256:7c8e5501d38bac1582e067e46c8343f17d57ea1aaa735823f3aba1fd59c88a28", size = 98003, upload-time = "2026-05-03T14:33:22.312Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/2a/7f/a946aa4f8752b37102b41e64dca18a1976ac705c3a0d1dfe74d820a02552/mistune-3.2.1-py3-none-any.whl", hash = "sha256:78cdb0ba5e938053ccf63651b352508d2efa9411dc8810bfb05f2dc5140c0048", size = 53749, upload-time = "2026-05-03T14:33:20.551Z" }, -] - -[[package]] -name = "mongoengine" -version = "0.29.3" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "pymongo" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/b4/76/160e35d90a671913146b884b1ca586909036dd56070600035821870b1aad/mongoengine-0.29.3.tar.gz", hash = "sha256:4267702aea433012845cb12b6334bff86a0a3084b5d141c1e4553ea20374a9b4", size = 188213, upload-time = "2026-03-10T15:19:17.946Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/c7/b5/214ea32710fa3ad7c13820cbb9f9a457d4809a5d54995e0d081f33c75116/mongoengine-0.29.3-py3-none-any.whl", hash = "sha256:2d5a216cf2368867d43e5321b13044ecc3e72c3f19ace21b1c5e7403951ca685", size = 112513, upload-time = "2026-03-10T15:19:16.619Z" }, -] - [[package]] name = "monty" version = "2026.5.18" @@ -1855,63 +732,22 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/f3/63/86120977f920798494c522c26899ffacde6d848e1eb018403f1d08044d0d/monty-2026.5.18-py3-none-any.whl", hash = "sha256:dd108b5c3cceb1f61de1a854db8ffda3dc7c2a2d4025b24cf397ade1121e7904", size = 59998, upload-time = "2026-05-18T03:21:00.059Z" }, ] -[[package]] -name = "more-itertools" -version = "11.1.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/de/1d/f4da6f02cdffe04d6362210b807146a26044c88d839208aec273bb0d9184/more_itertools-11.1.0.tar.gz", hash = "sha256:48e8f4d9e7e5878571ecf6f2b4e57634f93cd474cc8cfbd2376f2d11b396e30d", size = 145772, upload-time = "2026-05-22T14:14:29.909Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/e8/3d/1087453384dbde46a8c7f9356eead2c58be8a7bf156bca40243377c85715/more_itertools-11.1.0-py3-none-any.whl", hash = "sha256:4b65538ae22f6fed0ce4874efd317463a7489796a0939fa66824dd542125a192", size = 72226, upload-time = "2026-05-22T14:14:28.824Z" }, -] - [[package]] name = "mpcontribs-api" source = { editable = "." } dependencies = [ - { name = "apispec" }, - { name = "asn1crypto" }, { name = "beanie" }, - { name = "blinker" }, - { name = "boltons" }, - { name = "css-html-js-minify" }, - { name = "dateparser" }, - { name = "ddtrace" }, - { name = "dnspython" }, { name = "fastapi", extra = ["standard"] }, { name = "fastapi-filter" }, - { name = "filetype" }, - { name = "flasgger-tschaume" }, - { name = "flask-compress" }, - { name = "flask-marshmallow" }, - { name = "flask-mongorest-mpcontribs" }, - { name = "flask-rq2" }, - { name = "gunicorn", extra = ["gevent"] }, - { name = "jinja2" }, - { name = "json2html" }, - { name = "marshmallow" }, - { name = "more-itertools" }, - { name = "nbformat" }, - { name = "notebook" }, - { name = "numpy" }, { name = "opentelemetry-api" }, { name = "opentelemetry-exporter-otlp-proto-grpc" }, { name = "opentelemetry-instrumentation-fastapi" }, { name = "opentelemetry-instrumentation-pymongo" }, { name = "opentelemetry-sdk" }, - { name = "pint" }, - { name = "psycopg2-binary" }, { name = "pydantic-settings" }, { name = "pymatgen" }, { name = "pymongo" }, - { name = "pyopenssl" }, - { name = "python-snappy" }, - { name = "rq" }, - { name = "setproctitle" }, { name = "structlog" }, - { name = "supervisor" }, - { name = "uncertainties" }, - { name = "websocket-client" }, - { name = "zstandard" }, ] [package.dev-dependencies] @@ -1927,50 +763,18 @@ dev = [ [package.metadata] requires-dist = [ - { name = "apispec", specifier = "<6" }, - { name = "asn1crypto" }, { name = "beanie", specifier = ">=2.1.0" }, - { name = "blinker" }, - { name = "boltons" }, - { name = "css-html-js-minify" }, - { name = "dateparser" }, - { name = "ddtrace", specifier = "==4.3.0" }, - { name = "dnspython" }, { name = "fastapi", extras = ["standard"], specifier = ">=0.136.3" }, { name = "fastapi-filter", specifier = ">=2.0.1" }, - { name = "filetype" }, - { name = "flasgger-tschaume", specifier = ">=0.9.7" }, - { name = "flask-compress" }, - { name = "flask-marshmallow" }, - { name = "flask-mongorest-mpcontribs", specifier = ">=3.2.1" }, - { name = "flask-rq2" }, - { name = "gunicorn", extras = ["gevent"], specifier = "==24.1.1" }, - { name = "jinja2" }, - { name = "json2html" }, - { name = "marshmallow", specifier = "<4" }, - { name = "more-itertools" }, - { name = "nbformat" }, - { name = "notebook", specifier = "<7" }, - { name = "numpy" }, { name = "opentelemetry-api", specifier = ">=1.42.1" }, { name = "opentelemetry-exporter-otlp-proto-grpc", specifier = ">=1.42.1" }, { name = "opentelemetry-instrumentation-fastapi", specifier = ">=0.63b1" }, { name = "opentelemetry-instrumentation-pymongo", specifier = ">=0.63b1" }, { name = "opentelemetry-sdk", specifier = ">=1.42.1" }, - { name = "pint", specifier = ">=0.24" }, - { name = "psycopg2-binary" }, { name = "pydantic-settings", specifier = ">=2.14.1" }, { name = "pymatgen" }, { name = "pymongo", specifier = ">=4.17.0" }, - { name = "pyopenssl" }, - { name = "python-snappy" }, - { name = "rq", specifier = "<=2.3.2" }, - { name = "setproctitle" }, { name = "structlog", specifier = ">=25.5.0" }, - { name = "supervisor" }, - { name = "uncertainties" }, - { name = "websocket-client" }, - { name = "zstandard" }, ] [package.metadata.requires-dev] @@ -2002,85 +806,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/1d/77/928ea2e70641ca177a11140062cc5840d421795f2e82749d408d0cce900a/narwhals-2.21.2-py3-none-any.whl", hash = "sha256:7bb57c3700486039215455b9bf2d64261915cc0fd845cc30272d631df696b251", size = 451201, upload-time = "2026-05-16T08:49:05.536Z" }, ] -[[package]] -name = "nbclassic" -version = "1.3.3" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "ipykernel" }, - { name = "ipython-genutils" }, - { name = "nest-asyncio" }, - { name = "notebook-shim" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/ec/cc/a495b5eb9a964b70c6ae8c861168b78386d2520fd89c68390932f96400b2/nbclassic-1.3.3.tar.gz", hash = "sha256:434228763f8cee754318cd6dfa42370db191af630dabab8e30bafc8c1aa3eee6", size = 64116062, upload-time = "2025-09-16T20:33:15.967Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/3d/fd/dfb6db427bb4e0a50c9802b11df0b69d9364192f3db999849cde9209c8d0/nbclassic-1.3.3-py3-none-any.whl", hash = "sha256:dcee5149aa6aa01846c7458d6394b29b325213b5e118ee14c80d689122e0e4f2", size = 11527229, upload-time = "2025-09-16T20:33:08.625Z" }, -] - -[[package]] -name = "nbclient" -version = "0.10.4" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "jupyter-client" }, - { name = "jupyter-core" }, - { name = "nbformat" }, - { name = "traitlets" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/56/91/1c1d5a4b9a9ebba2b4e32b8c852c2975c872aec1fe42ab5e516b2cecd193/nbclient-0.10.4.tar.gz", hash = "sha256:1e54091b16e6da39e297b0ece3e10f6f29f4ac4e8ee515d29f8a7099bd6553c9", size = 62554, upload-time = "2025-12-23T07:45:46.369Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/83/a0/5b0c2f11142ed1dddec842457d3f65eaf71a0080894eb6f018755b319c3a/nbclient-0.10.4-py3-none-any.whl", hash = "sha256:9162df5a7373d70d606527300a95a975a47c137776cd942e52d9c7e29ff83440", size = 25465, upload-time = "2025-12-23T07:45:44.51Z" }, -] - -[[package]] -name = "nbconvert" -version = "7.17.1" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "beautifulsoup4" }, - { name = "bleach", extra = ["css"] }, - { name = "defusedxml" }, - { name = "jinja2" }, - { name = "jupyter-core" }, - { name = "jupyterlab-pygments" }, - { name = "markupsafe" }, - { name = "mistune" }, - { name = "nbclient" }, - { name = "nbformat" }, - { name = "packaging" }, - { name = "pandocfilters" }, - { name = "pygments" }, - { name = "traitlets" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/01/b1/708e53fe2e429c103c6e6e159106bcf0357ac41aa4c28772bd8402339051/nbconvert-7.17.1.tar.gz", hash = "sha256:34d0d0a7e73ce3cbab6c5aae8f4f468797280b01fd8bd2ca746da8569eddd7d2", size = 865311, upload-time = "2026-04-08T00:44:14.914Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/67/f8/bb0a9d5f46819c821dc1f004aa2cc29b1d91453297dbf5ff20470f00f193/nbconvert-7.17.1-py3-none-any.whl", hash = "sha256:aa85c087b435e7bf1ffd03319f658e285f2b89eccab33bc1ba7025495ab3e7c8", size = 261927, upload-time = "2026-04-08T00:44:12.845Z" }, -] - -[[package]] -name = "nbformat" -version = "5.10.4" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "fastjsonschema" }, - { name = "jsonschema" }, - { name = "jupyter-core" }, - { name = "traitlets" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/6d/fd/91545e604bc3dad7dca9ed03284086039b294c6b3d75c0d2fa45f9e9caf3/nbformat-5.10.4.tar.gz", hash = "sha256:322168b14f937a5d11362988ecac2a4952d3d8e3a2cbeb2319584631226d5b3a", size = 142749, upload-time = "2024-04-04T11:20:37.371Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/a9/82/0340caa499416c78e5d8f5f05947ae4bc3cba53c9f038ab6e9ed964e22f1/nbformat-5.10.4-py3-none-any.whl", hash = "sha256:3b48d6c8fbca4b299bf3982ea7db1af21580e4fec269ad087b9e81588891200b", size = 78454, upload-time = "2024-04-04T11:20:34.895Z" }, -] - -[[package]] -name = "nest-asyncio" -version = "1.6.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/83/f8/51569ac65d696c8ecbee95938f89d4abf00f47d58d48f6fbabfe8f0baefe/nest_asyncio-1.6.0.tar.gz", hash = "sha256:6f172d5449aca15afd6c646851f4e31e02c598d553a667e38cafa997cfec55fe", size = 7418, upload-time = "2024-01-21T14:25:19.227Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/a0/c4/c2971a3ba4c6103a3d10c4b0f24f461ddc027f0f09763220cf35ca1401b3/nest_asyncio-1.6.0-py3-none-any.whl", hash = "sha256:87af6efd6b5e897c81050477ef65c62e2b2f35d51703cae01aff2905b1852e1c", size = 5195, upload-time = "2024-01-21T14:25:17.223Z" }, -] - [[package]] name = "networkx" version = "3.6.1" @@ -2106,45 +831,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/17/66/1ed71f1f529b8ca727d42c7ceb9db0bef145ce4a13dfc86fb50aa44f3be6/nodejs_wheel_binaries-24.16.0-py2.py3-none-win_arm64.whl", hash = "sha256:8308940b5edd0a50dc5267ea36ba21c9f668e83fe0d9f293937174d3a7e31c36", size = 39714528, upload-time = "2026-05-30T16:52:06.421Z" }, ] -[[package]] -name = "notebook" -version = "6.5.7" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "argon2-cffi" }, - { name = "ipykernel" }, - { name = "ipython-genutils" }, - { name = "jinja2" }, - { name = "jupyter-client" }, - { name = "jupyter-core" }, - { name = "nbclassic" }, - { name = "nbconvert" }, - { name = "nbformat" }, - { name = "nest-asyncio" }, - { name = "prometheus-client" }, - { name = "pyzmq" }, - { name = "send2trash" }, - { name = "terminado" }, - { name = "tornado" }, - { name = "traitlets" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/05/bc/b025bac523640c13b0c1150466475eac3d79acbf187ef6c1967596c41c43/notebook-6.5.7.tar.gz", hash = "sha256:04eb9011dfac634fbd4442adaf0a8c27cd26beef831fe1d19faf930c327768e4", size = 5786526, upload-time = "2024-05-01T17:42:26.956Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/af/9c/0620631da9d7013e95a8f985043cad229a0d8fb537a7e3f8ff8467565a8c/notebook-6.5.7-py3-none-any.whl", hash = "sha256:a6afa9a4ff4d149a0771ff8b8c881a7a73b3835f9add0606696d6e9d98ac1cd0", size = 529829, upload-time = "2024-05-01T17:42:22.403Z" }, -] - -[[package]] -name = "notebook-shim" -version = "0.2.4" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "jupyter-server" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/54/d2/92fa3243712b9a3e8bafaf60aac366da1cada3639ca767ff4b5b3654ec28/notebook_shim-0.2.4.tar.gz", hash = "sha256:b4b2cfa1b65d98307ca24361f5b30fe785b53c3fd07b7a47e89acb5e6ac638cb", size = 13167, upload-time = "2024-02-14T23:35:18.353Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/f9/33/bd5b9137445ea4b680023eb0469b2bb969d61303dedb2aac6560ff3d14a1/notebook_shim-0.2.4-py3-none-any.whl", hash = "sha256:411a5be4e9dc882a074ccbcae671eda64cceb068767e9a3419096986560e1cef", size = 13307, upload-time = "2024-02-14T23:35:16.286Z" }, -] - [[package]] name = "numpy" version = "2.4.6" @@ -2395,36 +1081,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/0f/54/68a0978d1ef8502b8492099beaa6e7a0c1b32e3b5d4f677f5810cb08711c/pandas-3.0.3-cp314-cp314t-win_arm64.whl", hash = "sha256:b2c95f8bfc1ee412bf482605d7bfd30c12d1d26bd59fdd91efeef1d4718decb1", size = 9466464, upload-time = "2026-05-11T18:54:22.754Z" }, ] -[[package]] -name = "pandocfilters" -version = "1.5.1" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/70/6f/3dd4940bbe001c06a65f88e36bad298bc7a0de5036115639926b0c5c0458/pandocfilters-1.5.1.tar.gz", hash = "sha256:002b4a555ee4ebc03f8b66307e287fa492e4a77b4ea14d3f934328297bb4939e", size = 8454, upload-time = "2024-01-18T20:08:13.726Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/ef/af/4fbc8cab944db5d21b7e2a5b8e9211a03a79852b1157e2c102fcc61ac440/pandocfilters-1.5.1-py2.py3-none-any.whl", hash = "sha256:93be382804a9cdb0a7267585f157e5d1731bbe5545a85b268d6f5fe6232de2bc", size = 8663, upload-time = "2024-01-18T20:08:11.28Z" }, -] - -[[package]] -name = "parso" -version = "0.8.7" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/30/4b/90c937815137d43ce71ba043cd3566221e9df6b9c805f24b5d138c9d40a7/parso-0.8.7.tar.gz", hash = "sha256:eaaac4c9fdd5e9e8852dc778d2d7405897ec510f2a298071453e5e3a07914bb1", size = 401824, upload-time = "2026-05-01T23:13:02.138Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/99/5d/8268b644392ee874ee82a635cd0df1773de230bde356c38de28e298392cc/parso-0.8.7-py2.py3-none-any.whl", hash = "sha256:a8926eb2a1b915486941fdbd31e86a4baf88fe8c210f25f2f35ecec5b574ca1c", size = 107025, upload-time = "2026-05-01T23:12:58.867Z" }, -] - -[[package]] -name = "pexpect" -version = "4.9.0" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "ptyprocess", marker = "sys_platform != 'win32'" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/42/92/cc564bf6381ff43ce1f4d06852fc19a2f11d180f23dc32d9588bee2f149d/pexpect-4.9.0.tar.gz", hash = "sha256:ee7d41123f3c9911050ea2c2dac107568dc43b2d3b0c7557a33212c398ead30f", size = 166450, upload-time = "2023-11-25T09:07:26.339Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/9e/c3/059298687310d527a58bb01f3b1965787ee3b40dce76752eda8b44e9a2c5/pexpect-4.9.0-py2.py3-none-any.whl", hash = "sha256:7236d1e080e4936be2dc3e326cec0af72acf9212a7e1d060210e70a47e253523", size = 63772, upload-time = "2023-11-25T06:56:14.81Z" }, -] - [[package]] name = "pillow" version = "12.2.0" @@ -2444,42 +1100,18 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/5f/f7/769d5632ffb0988f1c5e7660b3e731e30f7f8ec4318e94d0a5d674eb65a4/pillow-12.2.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:deede7c263feb25dba4e82ea23058a235dcc2fe1f6021025dc71f2b618e26104", size = 7209321, upload-time = "2026-04-01T14:45:15.122Z" }, { url = "https://files.pythonhosted.org/packages/6a/7a/c253e3c645cd47f1aceea6a8bacdba9991bf45bb7dfe927f7c893e89c93c/pillow-12.2.0-cp314-cp314-win32.whl", hash = "sha256:632ff19b2778e43162304d50da0181ce24ac5bb8180122cbe1bf4673428328c7", size = 6479723, upload-time = "2026-04-01T14:45:17.797Z" }, { url = "https://files.pythonhosted.org/packages/cd/8b/601e6566b957ca50e28725cb6c355c59c2c8609751efbecd980db44e0349/pillow-12.2.0-cp314-cp314-win_amd64.whl", hash = "sha256:4e6c62e9d237e9b65fac06857d511e90d8461a32adcc1b9065ea0c0fa3a28150", size = 7217400, upload-time = "2026-04-01T14:45:20.529Z" }, - { url = "https://files.pythonhosted.org/packages/d6/94/220e46c73065c3e2951bb91c11a1fb636c8c9ad427ac3ce7d7f3359b9b2f/pillow-12.2.0-cp314-cp314-win_arm64.whl", hash = "sha256:b1c1fbd8a5a1af3412a0810d060a78b5136ec0836c8a4ef9aa11807f2a22f4e1", size = 2554835, upload-time = "2026-04-01T14:45:23.162Z" }, - { url = "https://files.pythonhosted.org/packages/b6/ab/1b426a3974cb0e7da5c29ccff4807871d48110933a57207b5a676cccc155/pillow-12.2.0-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:57850958fe9c751670e49b2cecf6294acc99e562531f4bd317fa5ddee2068463", size = 5314225, upload-time = "2026-04-01T14:45:25.637Z" }, - { url = "https://files.pythonhosted.org/packages/19/1e/dce46f371be2438eecfee2a1960ee2a243bbe5e961890146d2dee1ff0f12/pillow-12.2.0-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:d5d38f1411c0ed9f97bcb49b7bd59b6b7c314e0e27420e34d99d844b9ce3b6f3", size = 4698541, upload-time = "2026-04-01T14:45:28.355Z" }, - { url = "https://files.pythonhosted.org/packages/55/c3/7fbecf70adb3a0c33b77a300dc52e424dc22ad8cdc06557a2e49523b703d/pillow-12.2.0-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:5c0a9f29ca8e79f09de89293f82fc9b0270bb4af1d58bc98f540cc4aedf03166", size = 6322251, upload-time = "2026-04-01T14:45:30.924Z" }, - { url = "https://files.pythonhosted.org/packages/1c/3c/7fbc17cfb7e4fe0ef1642e0abc17fc6c94c9f7a16be41498e12e2ba60408/pillow-12.2.0-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:1610dd6c61621ae1cf811bef44d77e149ce3f7b95afe66a4512f8c59f25d9ebe", size = 8127807, upload-time = "2026-04-01T14:45:33.908Z" }, - { url = "https://files.pythonhosted.org/packages/ff/c3/a8ae14d6defd2e448493ff512fae903b1e9bd40b72efb6ec55ce0048c8ce/pillow-12.2.0-cp314-cp314t-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:0a34329707af4f73cf1782a36cd2289c0368880654a2c11f027bcee9052d35dd", size = 6433935, upload-time = "2026-04-01T14:45:36.623Z" }, - { url = "https://files.pythonhosted.org/packages/6e/32/2880fb3a074847ac159d8f902cb43278a61e85f681661e7419e6596803ed/pillow-12.2.0-cp314-cp314t-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:8e9c4f5b3c546fa3458a29ab22646c1c6c787ea8f5ef51300e5a60300736905e", size = 7116720, upload-time = "2026-04-01T14:45:39.258Z" }, - { url = "https://files.pythonhosted.org/packages/46/87/495cc9c30e0129501643f24d320076f4cc54f718341df18cc70ec94c44e1/pillow-12.2.0-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:fb043ee2f06b41473269765c2feae53fc2e2fbf96e5e22ca94fb5ad677856f06", size = 6540498, upload-time = "2026-04-01T14:45:41.879Z" }, - { url = "https://files.pythonhosted.org/packages/18/53/773f5edca692009d883a72211b60fdaf8871cbef075eaa9d577f0a2f989e/pillow-12.2.0-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:f278f034eb75b4e8a13a54a876cc4a5ab39173d2cdd93a638e1b467fc545ac43", size = 7239413, upload-time = "2026-04-01T14:45:44.705Z" }, - { url = "https://files.pythonhosted.org/packages/c9/e4/4b64a97d71b2a83158134abbb2f5bd3f8a2ea691361282f010998f339ec7/pillow-12.2.0-cp314-cp314t-win32.whl", hash = "sha256:6bb77b2dcb06b20f9f4b4a8454caa581cd4dd0643a08bacf821216a16d9c8354", size = 6482084, upload-time = "2026-04-01T14:45:47.568Z" }, - { url = "https://files.pythonhosted.org/packages/ba/13/306d275efd3a3453f72114b7431c877d10b1154014c1ebbedd067770d629/pillow-12.2.0-cp314-cp314t-win_amd64.whl", hash = "sha256:6562ace0d3fb5f20ed7290f1f929cae41b25ae29528f2af1722966a0a02e2aa1", size = 7225152, upload-time = "2026-04-01T14:45:50.032Z" }, - { url = "https://files.pythonhosted.org/packages/ff/6e/cf826fae916b8658848d7b9f38d88da6396895c676e8086fc0988073aaf8/pillow-12.2.0-cp314-cp314t-win_arm64.whl", hash = "sha256:aa88ccfe4e32d362816319ed727a004423aab09c5cea43c01a4b435643fa34eb", size = 2556579, upload-time = "2026-04-01T14:45:52.529Z" }, -] - -[[package]] -name = "pint" -version = "0.25.3" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "flexcache" }, - { name = "flexparser" }, - { name = "platformdirs" }, - { name = "typing-extensions" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/52/9d/b1379cdbd33a49d17d627bc24e2b63cca06a1c5343b38072d2889499e82e/pint-0.25.3.tar.gz", hash = "sha256:f8f5df6cf65314d74da1ade1bf96f8e3e4d0c41b51577ac53c49e7d44ca5acee", size = 255106, upload-time = "2026-03-19T21:57:08.72Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/1b/dd/a9fe6a0a09512da23951c68bf36466aeecd89def3183dc095edbc807ddc5/pint-0.25.3-py3-none-any.whl", hash = "sha256:27eb25143bd5de9fcc4d5a4b484f16faf6b4615aa93ece6b3373a8c1a3c1b97d", size = 307488, upload-time = "2026-03-19T21:57:07.022Z" }, -] - -[[package]] -name = "platformdirs" -version = "4.10.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/d7/47/e4501f49c178ae1d9f4a75073fda4204f52647993f075a9db4d14930e0c5/platformdirs-4.10.0.tar.gz", hash = "sha256:31e761a6a0ca04faf7353ea759bdba55652be214725111e5aac52dfa29d4bef7", size = 31224, upload-time = "2026-05-28T03:32:53.587Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/81/e6/cd9575ac904136b3cbf7aa7ee819ef86eedb7274e46f230e94ea4342e729/platformdirs-4.10.0-py3-none-any.whl", hash = "sha256:fb516cdb12eb0d857d0cd85a7c57cea4d060bee4578d6cf5a14dfdf8cbf8784a", size = 22743, upload-time = "2026-05-28T03:32:52.175Z" }, + { url = "https://files.pythonhosted.org/packages/d6/94/220e46c73065c3e2951bb91c11a1fb636c8c9ad427ac3ce7d7f3359b9b2f/pillow-12.2.0-cp314-cp314-win_arm64.whl", hash = "sha256:b1c1fbd8a5a1af3412a0810d060a78b5136ec0836c8a4ef9aa11807f2a22f4e1", size = 2554835, upload-time = "2026-04-01T14:45:23.162Z" }, + { url = "https://files.pythonhosted.org/packages/b6/ab/1b426a3974cb0e7da5c29ccff4807871d48110933a57207b5a676cccc155/pillow-12.2.0-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:57850958fe9c751670e49b2cecf6294acc99e562531f4bd317fa5ddee2068463", size = 5314225, upload-time = "2026-04-01T14:45:25.637Z" }, + { url = "https://files.pythonhosted.org/packages/19/1e/dce46f371be2438eecfee2a1960ee2a243bbe5e961890146d2dee1ff0f12/pillow-12.2.0-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:d5d38f1411c0ed9f97bcb49b7bd59b6b7c314e0e27420e34d99d844b9ce3b6f3", size = 4698541, upload-time = "2026-04-01T14:45:28.355Z" }, + { url = "https://files.pythonhosted.org/packages/55/c3/7fbecf70adb3a0c33b77a300dc52e424dc22ad8cdc06557a2e49523b703d/pillow-12.2.0-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:5c0a9f29ca8e79f09de89293f82fc9b0270bb4af1d58bc98f540cc4aedf03166", size = 6322251, upload-time = "2026-04-01T14:45:30.924Z" }, + { url = "https://files.pythonhosted.org/packages/1c/3c/7fbc17cfb7e4fe0ef1642e0abc17fc6c94c9f7a16be41498e12e2ba60408/pillow-12.2.0-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:1610dd6c61621ae1cf811bef44d77e149ce3f7b95afe66a4512f8c59f25d9ebe", size = 8127807, upload-time = "2026-04-01T14:45:33.908Z" }, + { url = "https://files.pythonhosted.org/packages/ff/c3/a8ae14d6defd2e448493ff512fae903b1e9bd40b72efb6ec55ce0048c8ce/pillow-12.2.0-cp314-cp314t-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:0a34329707af4f73cf1782a36cd2289c0368880654a2c11f027bcee9052d35dd", size = 6433935, upload-time = "2026-04-01T14:45:36.623Z" }, + { url = "https://files.pythonhosted.org/packages/6e/32/2880fb3a074847ac159d8f902cb43278a61e85f681661e7419e6596803ed/pillow-12.2.0-cp314-cp314t-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:8e9c4f5b3c546fa3458a29ab22646c1c6c787ea8f5ef51300e5a60300736905e", size = 7116720, upload-time = "2026-04-01T14:45:39.258Z" }, + { url = "https://files.pythonhosted.org/packages/46/87/495cc9c30e0129501643f24d320076f4cc54f718341df18cc70ec94c44e1/pillow-12.2.0-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:fb043ee2f06b41473269765c2feae53fc2e2fbf96e5e22ca94fb5ad677856f06", size = 6540498, upload-time = "2026-04-01T14:45:41.879Z" }, + { url = "https://files.pythonhosted.org/packages/18/53/773f5edca692009d883a72211b60fdaf8871cbef075eaa9d577f0a2f989e/pillow-12.2.0-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:f278f034eb75b4e8a13a54a876cc4a5ab39173d2cdd93a638e1b467fc545ac43", size = 7239413, upload-time = "2026-04-01T14:45:44.705Z" }, + { url = "https://files.pythonhosted.org/packages/c9/e4/4b64a97d71b2a83158134abbb2f5bd3f8a2ea691361282f010998f339ec7/pillow-12.2.0-cp314-cp314t-win32.whl", hash = "sha256:6bb77b2dcb06b20f9f4b4a8454caa581cd4dd0643a08bacf821216a16d9c8354", size = 6482084, upload-time = "2026-04-01T14:45:47.568Z" }, + { url = "https://files.pythonhosted.org/packages/ba/13/306d275efd3a3453f72114b7431c877d10b1154014c1ebbedd067770d629/pillow-12.2.0-cp314-cp314t-win_amd64.whl", hash = "sha256:6562ace0d3fb5f20ed7290f1f929cae41b25ae29528f2af1722966a0a02e2aa1", size = 7225152, upload-time = "2026-04-01T14:45:50.032Z" }, + { url = "https://files.pythonhosted.org/packages/ff/6e/cf826fae916b8658848d7b9f38d88da6396895c676e8086fc0988073aaf8/pillow-12.2.0-cp314-cp314t-win_arm64.whl", hash = "sha256:aa88ccfe4e32d362816319ed727a004423aab09c5cea43c01a4b435643fa34eb", size = 2556579, upload-time = "2026-04-01T14:45:52.529Z" }, ] [[package]] @@ -2504,27 +1136,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/54/20/4d324d65cc6d9205fabedc306948156824eb9f0ee1633355a8f7ec5c66bf/pluggy-1.6.0-py3-none-any.whl", hash = "sha256:e920276dd6813095e9377c0bc5566d94c932c33b27a3e3945d8389c374dd4746", size = 20538, upload-time = "2025-05-15T12:30:06.134Z" }, ] -[[package]] -name = "prometheus-client" -version = "0.25.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/1b/fb/d9aa83ffe43ce1f19e557c0971d04b90561b0cfd50762aafb01968285553/prometheus_client-0.25.0.tar.gz", hash = "sha256:5e373b75c31afb3c86f1a52fa1ad470c9aace18082d39ec0d2f918d11cc9ba28", size = 86035, upload-time = "2026-04-09T19:53:42.359Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/8d/9b/d4b1e644385499c8346fa9b622a3f030dce14cd6ef8a1871c221a17a67e7/prometheus_client-0.25.0-py3-none-any.whl", hash = "sha256:d5aec89e349a6ec230805d0df882f3807f74fd6c1a2fa86864e3c2279059fed1", size = 64154, upload-time = "2026-04-09T19:53:41.324Z" }, -] - -[[package]] -name = "prompt-toolkit" -version = "3.0.52" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "wcwidth" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/a1/96/06e01a7b38dce6fe1db213e061a4602dd6032a8a97ef6c1a862537732421/prompt_toolkit-3.0.52.tar.gz", hash = "sha256:28cde192929c8e7321de85de1ddbe736f1375148b02f2e17edd840042b1be855", size = 434198, upload-time = "2025-08-27T15:24:02.057Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/84/03/0d3ce49e2505ae70cf43bc5bb3033955d2fc9f932163e84dc0779cc47f48/prompt_toolkit-3.0.52-py3-none-any.whl", hash = "sha256:9aac639a3bbd33284347de5ad8d68ecc044b91a762dc39b7c21095fcd6a19955", size = 391431, upload-time = "2025-08-27T15:23:59.498Z" }, -] - [[package]] name = "protobuf" version = "6.33.6" @@ -2540,74 +1151,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/c4/72/02445137af02769918a93807b2b7890047c32bfb9f90371cbc12688819eb/protobuf-6.33.6-py3-none-any.whl", hash = "sha256:77179e006c476e69bf8e8ce866640091ec42e1beb80b213c3900006ecfba6901", size = 170656, upload-time = "2026-03-18T19:04:59.826Z" }, ] -[[package]] -name = "psutil" -version = "7.2.2" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/aa/c6/d1ddf4abb55e93cebc4f2ed8b5d6dbad109ecb8d63748dd2b20ab5e57ebe/psutil-7.2.2.tar.gz", hash = "sha256:0746f5f8d406af344fd547f1c8daa5f5c33dbc293bb8d6a16d80b4bb88f59372", size = 493740, upload-time = "2026-01-28T18:14:54.428Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/81/69/ef179ab5ca24f32acc1dac0c247fd6a13b501fd5534dbae0e05a1c48b66d/psutil-7.2.2-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:eed63d3b4d62449571547b60578c5b2c4bcccc5387148db46e0c2313dad0ee00", size = 130664, upload-time = "2026-01-28T18:15:09.469Z" }, - { url = "https://files.pythonhosted.org/packages/7b/64/665248b557a236d3fa9efc378d60d95ef56dd0a490c2cd37dafc7660d4a9/psutil-7.2.2-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:7b6d09433a10592ce39b13d7be5a54fbac1d1228ed29abc880fb23df7cb694c9", size = 131087, upload-time = "2026-01-28T18:15:11.724Z" }, - { url = "https://files.pythonhosted.org/packages/d5/2e/e6782744700d6759ebce3043dcfa661fb61e2fb752b91cdeae9af12c2178/psutil-7.2.2-cp314-cp314t-manylinux2010_x86_64.manylinux_2_12_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:1fa4ecf83bcdf6e6c8f4449aff98eefb5d0604bf88cb883d7da3d8d2d909546a", size = 182383, upload-time = "2026-01-28T18:15:13.445Z" }, - { url = "https://files.pythonhosted.org/packages/57/49/0a41cefd10cb7505cdc04dab3eacf24c0c2cb158a998b8c7b1d27ee2c1f5/psutil-7.2.2-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:e452c464a02e7dc7822a05d25db4cde564444a67e58539a00f929c51eddda0cf", size = 185210, upload-time = "2026-01-28T18:15:16.002Z" }, - { url = "https://files.pythonhosted.org/packages/dd/2c/ff9bfb544f283ba5f83ba725a3c5fec6d6b10b8f27ac1dc641c473dc390d/psutil-7.2.2-cp314-cp314t-win_amd64.whl", hash = "sha256:c7663d4e37f13e884d13994247449e9f8f574bc4655d509c3b95e9ec9e2b9dc1", size = 141228, upload-time = "2026-01-28T18:15:18.385Z" }, - { url = "https://files.pythonhosted.org/packages/f2/fc/f8d9c31db14fcec13748d373e668bc3bed94d9077dbc17fb0eebc073233c/psutil-7.2.2-cp314-cp314t-win_arm64.whl", hash = "sha256:11fe5a4f613759764e79c65cf11ebdf26e33d6dd34336f8a337aa2996d71c841", size = 136284, upload-time = "2026-01-28T18:15:19.912Z" }, - { url = "https://files.pythonhosted.org/packages/e7/36/5ee6e05c9bd427237b11b3937ad82bb8ad2752d72c6969314590dd0c2f6e/psutil-7.2.2-cp36-abi3-macosx_10_9_x86_64.whl", hash = "sha256:ed0cace939114f62738d808fdcecd4c869222507e266e574799e9c0faa17d486", size = 129090, upload-time = "2026-01-28T18:15:22.168Z" }, - { url = "https://files.pythonhosted.org/packages/80/c4/f5af4c1ca8c1eeb2e92ccca14ce8effdeec651d5ab6053c589b074eda6e1/psutil-7.2.2-cp36-abi3-macosx_11_0_arm64.whl", hash = "sha256:1a7b04c10f32cc88ab39cbf606e117fd74721c831c98a27dc04578deb0c16979", size = 129859, upload-time = "2026-01-28T18:15:23.795Z" }, - { url = "https://files.pythonhosted.org/packages/b5/70/5d8df3b09e25bce090399cf48e452d25c935ab72dad19406c77f4e828045/psutil-7.2.2-cp36-abi3-manylinux2010_x86_64.manylinux_2_12_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:076a2d2f923fd4821644f5ba89f059523da90dc9014e85f8e45a5774ca5bc6f9", size = 155560, upload-time = "2026-01-28T18:15:25.976Z" }, - { url = "https://files.pythonhosted.org/packages/63/65/37648c0c158dc222aba51c089eb3bdfa238e621674dc42d48706e639204f/psutil-7.2.2-cp36-abi3-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:b0726cecd84f9474419d67252add4ac0cd9811b04d61123054b9fb6f57df6e9e", size = 156997, upload-time = "2026-01-28T18:15:27.794Z" }, - { url = "https://files.pythonhosted.org/packages/8e/13/125093eadae863ce03c6ffdbae9929430d116a246ef69866dad94da3bfbc/psutil-7.2.2-cp36-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:fd04ef36b4a6d599bbdb225dd1d3f51e00105f6d48a28f006da7f9822f2606d8", size = 148972, upload-time = "2026-01-28T18:15:29.342Z" }, - { url = "https://files.pythonhosted.org/packages/04/78/0acd37ca84ce3ddffaa92ef0f571e073faa6d8ff1f0559ab1272188ea2be/psutil-7.2.2-cp36-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:b58fabe35e80b264a4e3bb23e6b96f9e45a3df7fb7eed419ac0e5947c61e47cc", size = 148266, upload-time = "2026-01-28T18:15:31.597Z" }, - { url = "https://files.pythonhosted.org/packages/b4/90/e2159492b5426be0c1fef7acba807a03511f97c5f86b3caeda6ad92351a7/psutil-7.2.2-cp37-abi3-win_amd64.whl", hash = "sha256:eb7e81434c8d223ec4a219b5fc1c47d0417b12be7ea866e24fb5ad6e84b3d988", size = 137737, upload-time = "2026-01-28T18:15:33.849Z" }, - { url = "https://files.pythonhosted.org/packages/8c/c7/7bb2e321574b10df20cbde462a94e2b71d05f9bbda251ef27d104668306a/psutil-7.2.2-cp37-abi3-win_arm64.whl", hash = "sha256:8c233660f575a5a89e6d4cb65d9f938126312bca76d8fe087b947b3a1aaac9ee", size = 134617, upload-time = "2026-01-28T18:15:36.514Z" }, -] - -[[package]] -name = "psycopg2-binary" -version = "2.9.12" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/2a/60/a3624f79acea344c16fbef3a94d28b89a8042ddfb8f3e4ca83f538671409/psycopg2_binary-2.9.12.tar.gz", hash = "sha256:5ac9444edc768c02a6b6a591f070b8aae28ff3a99be57560ac996001580f294c", size = 379686, upload-time = "2026-04-21T09:40:34.304Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/13/1b/708c0dca874acfad6d65314271859899a79007686f3a1f74e82a2ed4b645/psycopg2_binary-2.9.12-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:6f3b3de8a74ef8db215f22edffb19e32dc6fa41340456de7ec99efdc8a7b3ec2", size = 3712428, upload-time = "2026-04-20T23:35:23.453Z" }, - { url = "https://files.pythonhosted.org/packages/d6/39/ddbea9d4b4de6aca9431b6ed253f530f8a02d3b8f9bcfd0dbfe2b3de6fe4/psycopg2_binary-2.9.12-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:1006fb62f0f0bc5ce256a832356c6262e91be43f5e4eb15b5eaf38079464caf2", size = 3823184, upload-time = "2026-04-20T23:35:25.92Z" }, - { url = "https://files.pythonhosted.org/packages/bf/a0/bc2fef74b106fa345567122a0659e6d94512ed7dc0131ec44c9e5aba3725/psycopg2_binary-2.9.12-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:840066105706cd2eb29b9a1c2329620056582a4bf3e8169dec5c447042d0869f", size = 4579157, upload-time = "2026-04-20T23:35:28.542Z" }, - { url = "https://files.pythonhosted.org/packages/57/d7/d4e3b2005d3de607ca4fbb0e8742e248056e52184a6b94ebda3c1c2c329b/psycopg2_binary-2.9.12-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:863f5d12241ebe1c76a72a04c2113b6dc905f90b9cef0e9be0efd994affd9354", size = 4274970, upload-time = "2026-04-20T23:35:30.418Z" }, - { url = "https://files.pythonhosted.org/packages/2e/42/c9853f8db3967fe08bcde11f53d53b85d351750cae726ce001cb68afa9c1/psycopg2_binary-2.9.12-cp314-cp314-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:a99eaab34a9010f1a086b126de467466620a750634d114d20455f3a824aae033", size = 5895175, upload-time = "2026-04-20T23:35:33.584Z" }, - { url = "https://files.pythonhosted.org/packages/eb/fd/b82b5601a97630308bef079f545ffec481bbbc795c2ba5ec416a01d03f60/psycopg2_binary-2.9.12-cp314-cp314-manylinux_2_38_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:ffdd7dc5463ccd61845ac37b7012d0f35a1548df9febe14f8dd549be4a0bc81e", size = 4110658, upload-time = "2026-04-20T23:35:35.638Z" }, - { url = "https://files.pythonhosted.org/packages/62/8c/32ca69b0389ef25dd22937bf9e8fbe2ce27aea20b05ded48c4ce4cb42475/psycopg2_binary-2.9.12-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:54a0dfecab1b48731f934e06139dfe11e24219fb6d0ceb32177cf0375f14c7b5", size = 3656251, upload-time = "2026-04-20T23:35:37.854Z" }, - { url = "https://files.pythonhosted.org/packages/c4/29/96992a2b59e3b9d730fcf9612d0a387305025dc867a9fc490a9e496e074e/psycopg2_binary-2.9.12-cp314-cp314-musllinux_1_2_ppc64le.whl", hash = "sha256:96937c9c5d891f772430f418a7a8b4691a90c3e6b93cf72b5bd7cad8cbca32a5", size = 3301810, upload-time = "2026-04-20T23:35:39.927Z" }, - { url = "https://files.pythonhosted.org/packages/56/ad/44b06659949b243ae10112cd3b20a197f9bf3e81d5651379b9eb889bfaad/psycopg2_binary-2.9.12-cp314-cp314-musllinux_1_2_riscv64.whl", hash = "sha256:77b348775efd4cdab410ec6609d81ccecd1139c90265fa583a7255c8064bc03d", size = 3048977, upload-time = "2026-04-20T23:35:41.806Z" }, - { url = "https://files.pythonhosted.org/packages/1d/f2/10a1bcebadb6aa55e280e1f58975c36a7b560ea525184c7aa4064c466633/psycopg2_binary-2.9.12-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:527e6342b3e44c2f0544f6b8e927d60de7f163f5723b8f1dfa7d2a84298738cd", size = 3351466, upload-time = "2026-04-20T23:35:43.993Z" }, - { url = "https://files.pythonhosted.org/packages/20/be/b732c8418ffa5bcfda002890f5dc4c869fc17db66ff11f53b17cfe44afc0/psycopg2_binary-2.9.12-cp314-cp314-win_amd64.whl", hash = "sha256:f12ae41fcafadb39b2785e64a40f9db05d6de2ac114077457e0e7c597f3af980", size = 2848762, upload-time = "2026-04-20T23:35:46.421Z" }, -] - -[[package]] -name = "ptyprocess" -version = "0.7.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/20/e5/16ff212c1e452235a90aeb09066144d0c5a6a8c0834397e03f5224495c4e/ptyprocess-0.7.0.tar.gz", hash = "sha256:5c5d0a3b48ceee0b48485e0c26037c0acd7d29765ca3fbb5cb3831d347423220", size = 70762, upload-time = "2020-12-28T15:15:30.155Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/22/a6/858897256d0deac81a172289110f31629fc4cee19b6f01283303e18c8db3/ptyprocess-0.7.0-py2.py3-none-any.whl", hash = "sha256:4b41f3967fce3af57cc7e94b888626c18bf37a083e3651ca8feeb66d492fef35", size = 13993, upload-time = "2020-12-28T15:15:28.35Z" }, -] - -[[package]] -name = "pure-eval" -version = "0.2.3" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/cd/05/0a34433a064256a578f1783a10da6df098ceaa4a57bbeaa96a6c0352786b/pure_eval-0.2.3.tar.gz", hash = "sha256:5f4e983f40564c576c7c8635ae88db5956bb2229d7e9237d03b3c0b0190eaf42", size = 19752, upload-time = "2024-07-21T12:58:21.801Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/8e/37/efad0257dc6e593a18957422533ff0f87ede7c9c6ea010a2177d738fb82f/pure_eval-0.2.3-py3-none-any.whl", hash = "sha256:1db8e35b67b3d218d818ae653e27f06c3aa420901fa7b081ca98cbedc874e0d0", size = 11842, upload-time = "2024-07-21T12:58:20.04Z" }, -] - -[[package]] -name = "pycparser" -version = "3.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/1b/7d/92392ff7815c21062bea51aa7b87d45576f649f16458d78b7cf94b9ab2e6/pycparser-3.0.tar.gz", hash = "sha256:600f49d217304a5902ac3c37e1281c9fe94e4d0489de643a9504c5cdfdfc6b29", size = 103492, upload-time = "2026-01-21T14:26:51.89Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/0c/c3/44f3fbbfa403ea2a7c779186dc20772604442dde72947e7d01069cbe98e3/pycparser-3.0-py3-none-any.whl", hash = "sha256:b727414169a36b7d524c1c3e31839a521725078d7b2ff038656844266160a992", size = 48172, upload-time = "2026-01-21T14:26:50.693Z" }, -] - [[package]] name = "pydantic" version = "2.13.4" @@ -2790,18 +1333,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/dc/cb/d9780b66939c4fc1f024bcc7be23a2abcfe06a9745ca8fa76dc73395482e/pymongo-4.17.0-cp314-cp314t-win_arm64.whl", hash = "sha256:9543d8f84c2e5608565c08ac679774811e6730770d8a645439b073422a4276fb", size = 1058526, upload-time = "2026-04-20T16:39:27.924Z" }, ] -[[package]] -name = "pyopenssl" -version = "26.2.0" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "cryptography" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/1a/51/27a5ad5f939d08f690a326ef9582cda7140555180db71695f6fb747d6a36/pyopenssl-26.2.0.tar.gz", hash = "sha256:8c6fcecd1183a7fc897548dfe388b0cdb7f37e018200d8409cf33959dbe35387", size = 182195, upload-time = "2026-05-04T23:06:09.72Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/73/b8/a0e2790ae249d6f38c9f66de7a211621a7ab2650217bcd04e1262f578a56/pyopenssl-26.2.0-py3-none-any.whl", hash = "sha256:4f9d971bc5298b8bc1fab282803da04bf000c755d4ad9d99b52de2569ca19a70", size = 55823, upload-time = "2026-05-04T23:06:08.395Z" }, -] - [[package]] name = "pyparsing" version = "3.3.2" @@ -2873,24 +1404,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/0b/d7/1959b9648791274998a9c3526f6d0ec8fd2233e4d4acce81bbae76b44b2a/python_dotenv-1.2.2-py3-none-any.whl", hash = "sha256:1d8214789a24de455a8b8bd8ae6fe3c6b69a5e3d64aa8a8e5d68e694bbcb285a", size = 22101, upload-time = "2026-03-01T16:00:25.09Z" }, ] -[[package]] -name = "python-json-logger" -version = "4.1.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/f7/ff/3cc9165fd44106973cd7ac9facb674a65ed853494592541d339bdc9a30eb/python_json_logger-4.1.0.tar.gz", hash = "sha256:b396b9e3ed782b09ff9d6e4f1683d46c83ad0d35d2e407c09a9ebbf038f88195", size = 17573, upload-time = "2026-03-29T04:39:56.805Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/27/be/0631a861af4d1c875f096c07d34e9a63639560a717130e7a87cbc82b7e3f/python_json_logger-4.1.0-py3-none-any.whl", hash = "sha256:132994765cf75bf44554be9aa49b06ef2345d23661a96720262716438141b6b2", size = 15021, upload-time = "2026-03-29T04:39:55.266Z" }, -] - -[[package]] -name = "python-mimeparse" -version = "2.0.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/cd/85/c40f2e0b2128905f6c34894be01803c114f2b2efab0e8b4c3dca5e56b999/python_mimeparse-2.0.0.tar.gz", hash = "sha256:5b9a9dcf7aa82465e31bd667f5cb7000604811dce83554f1c8a43693a32cb303", size = 7162, upload-time = "2024-08-25T13:38:14.966Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/65/d9/1093a9d6d22d04d433003c96b9b1d46741b43fee5b11ece5098297737fce/python_mimeparse-2.0.0-py3-none-any.whl", hash = "sha256:574062a06f2e1d416535c8d3b83ccc6ebe95941e74e2c5939fc010a12e37cc09", size = 5576, upload-time = "2024-08-25T13:38:13.372Z" }, -] - [[package]] name = "python-multipart" version = "0.0.30" @@ -2900,39 +1413,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/1c/fd/0318007beb234790993d3ec5afd051d1dbceb733e81e3afe2b981ece3f37/python_multipart-0.0.30-py3-none-any.whl", hash = "sha256:830964def8c90607ac5daa00514e3987815865713ade8d20febc9177ac0c3c5b", size = 29730, upload-time = "2026-05-31T19:24:53.814Z" }, ] -[[package]] -name = "python-snappy" -version = "0.7.3" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "cramjam" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/39/66/9185fbb6605ba92716d9f77fbb13c97eb671cd13c3ad56bd154016fbf08b/python_snappy-0.7.3.tar.gz", hash = "sha256:40216c1badfb2d38ac781ecb162a1d0ec40f8ee9747e610bcfefdfa79486cee3", size = 9337, upload-time = "2024-08-29T13:16:05.705Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/86/c1/0ee413ddd639aebf22c85d6db39f136ccc10e6a4b4dd275a92b5c839de8d/python_snappy-0.7.3-py3-none-any.whl", hash = "sha256:074c0636cfcd97e7251330f428064050ac81a52c62ed884fc2ddebbb60ed7f50", size = 9155, upload-time = "2024-08-29T13:16:04.773Z" }, -] - -[[package]] -name = "pytz" -version = "2026.2" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/ff/46/dd499ec9038423421951e4fad73051febaa13d2df82b4064f87af8b8c0c3/pytz-2026.2.tar.gz", hash = "sha256:0e60b47b29f21574376f218fe21abc009894a2321ea16c6754f3cad6eb7cdd6a", size = 320861, upload-time = "2026-05-04T01:35:29.667Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/ec/dd/96da98f892250475bdf2328112d7468abdd4acc7b902b6af23f4ed958ea0/pytz-2026.2-py2.py3-none-any.whl", hash = "sha256:04156e608bee23d3792fd45c94ae47fae1036688e75032eea2e3bf0323d1f126", size = 510141, upload-time = "2026-05-04T01:35:27.408Z" }, -] - -[[package]] -name = "pywinpty" -version = "3.0.3" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/f7/54/37c7370ba91f579235049dc26cd2c5e657d2a943e01820844ffc81f32176/pywinpty-3.0.3.tar.gz", hash = "sha256:523441dc34d231fb361b4b00f8c99d3f16de02f5005fd544a0183112bcc22412", size = 31309, upload-time = "2026-02-04T21:51:09.524Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/28/88/2ff917caff61e55f38bcdb27de06ee30597881b2cae44fbba7627be015c4/pywinpty-3.0.3-cp314-cp314-win_amd64.whl", hash = "sha256:d4b6b7b0fe0cdcd02e956bd57cfe9f4e5a06514eecf3b5ae174da4f951b58be9", size = 2113282, upload-time = "2026-02-04T21:52:08.188Z" }, - { url = "https://files.pythonhosted.org/packages/63/32/40a775343ace542cc43ece3f1d1fce454021521ecac41c4c4573081c2336/pywinpty-3.0.3-cp314-cp314-win_arm64.whl", hash = "sha256:34789d685fc0d547ce0c8a65e5a70e56f77d732fa6e03c8f74fefb8cbb252019", size = 234207, upload-time = "2026-02-04T21:51:58.687Z" }, - { url = "https://files.pythonhosted.org/packages/8d/54/5d5e52f4cb75028104ca6faf36c10f9692389b1986d34471663b4ebebd6d/pywinpty-3.0.3-cp314-cp314t-win_amd64.whl", hash = "sha256:0c37e224a47a971d1a6e08649a1714dac4f63c11920780977829ed5c8cadead1", size = 2112910, upload-time = "2026-02-04T21:52:30.976Z" }, - { url = "https://files.pythonhosted.org/packages/0a/44/dcd184824e21d4620b06c7db9fbb15c3ad0a0f1fa2e6de79969fb82647ec/pywinpty-3.0.3-cp314-cp314t-win_arm64.whl", hash = "sha256:c4e9c3dff7d86ba81937438d5819f19f385a39d8f592d4e8af67148ceb4f6ab5", size = 233425, upload-time = "2026-02-04T21:51:56.754Z" }, -] - [[package]] name = "pyyaml" version = "6.0.3" @@ -2959,99 +1439,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/f1/12/de94a39c2ef588c7e6455cfbe7343d3b2dc9d6b6b2f40c4c6565744c873d/pyyaml-6.0.3-cp314-cp314t-win_arm64.whl", hash = "sha256:ebc55a14a21cb14062aa4162f906cd962b28e2e9ea38f9b4391244cd8de4ae0b", size = 149341, upload-time = "2025-09-25T21:32:56.828Z" }, ] -[[package]] -name = "pyzmq" -version = "27.1.0" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "cffi", marker = "implementation_name == 'pypy'" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/04/0b/3c9baedbdf613ecaa7aa07027780b8867f57b6293b6ee50de316c9f3222b/pyzmq-27.1.0.tar.gz", hash = "sha256:ac0765e3d44455adb6ddbf4417dcce460fc40a05978c08efdf2948072f6db540", size = 281750, upload-time = "2025-09-08T23:10:18.157Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/92/e7/038aab64a946d535901103da16b953c8c9cc9c961dadcbf3609ed6428d23/pyzmq-27.1.0-cp312-abi3-macosx_10_15_universal2.whl", hash = "sha256:452631b640340c928fa343801b0d07eb0c3789a5ffa843f6e1a9cee0ba4eb4fc", size = 1306279, upload-time = "2025-09-08T23:08:03.807Z" }, - { url = "https://files.pythonhosted.org/packages/e8/5e/c3c49fdd0f535ef45eefcc16934648e9e59dace4a37ee88fc53f6cd8e641/pyzmq-27.1.0-cp312-abi3-manylinux2014_i686.manylinux_2_17_i686.whl", hash = "sha256:1c179799b118e554b66da67d88ed66cd37a169f1f23b5d9f0a231b4e8d44a113", size = 895645, upload-time = "2025-09-08T23:08:05.301Z" }, - { url = "https://files.pythonhosted.org/packages/f8/e5/b0b2504cb4e903a74dcf1ebae157f9e20ebb6ea76095f6cfffea28c42ecd/pyzmq-27.1.0-cp312-abi3-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:3837439b7f99e60312f0c926a6ad437b067356dc2bc2ec96eb395fd0fe804233", size = 652574, upload-time = "2025-09-08T23:08:06.828Z" }, - { url = "https://files.pythonhosted.org/packages/f8/9b/c108cdb55560eaf253f0cbdb61b29971e9fb34d9c3499b0e96e4e60ed8a5/pyzmq-27.1.0-cp312-abi3-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:43ad9a73e3da1fab5b0e7e13402f0b2fb934ae1c876c51d0afff0e7c052eca31", size = 840995, upload-time = "2025-09-08T23:08:08.396Z" }, - { url = "https://files.pythonhosted.org/packages/c2/bb/b79798ca177b9eb0825b4c9998c6af8cd2a7f15a6a1a4272c1d1a21d382f/pyzmq-27.1.0-cp312-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:0de3028d69d4cdc475bfe47a6128eb38d8bc0e8f4d69646adfbcd840facbac28", size = 1642070, upload-time = "2025-09-08T23:08:09.989Z" }, - { url = "https://files.pythonhosted.org/packages/9c/80/2df2e7977c4ede24c79ae39dcef3899bfc5f34d1ca7a5b24f182c9b7a9ca/pyzmq-27.1.0-cp312-abi3-musllinux_1_2_i686.whl", hash = "sha256:cf44a7763aea9298c0aa7dbf859f87ed7012de8bda0f3977b6fb1d96745df856", size = 2021121, upload-time = "2025-09-08T23:08:11.907Z" }, - { url = "https://files.pythonhosted.org/packages/46/bd/2d45ad24f5f5ae7e8d01525eb76786fa7557136555cac7d929880519e33a/pyzmq-27.1.0-cp312-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:f30f395a9e6fbca195400ce833c731e7b64c3919aa481af4d88c3759e0cb7496", size = 1878550, upload-time = "2025-09-08T23:08:13.513Z" }, - { url = "https://files.pythonhosted.org/packages/e6/2f/104c0a3c778d7c2ab8190e9db4f62f0b6957b53c9d87db77c284b69f33ea/pyzmq-27.1.0-cp312-abi3-win32.whl", hash = "sha256:250e5436a4ba13885494412b3da5d518cd0d3a278a1ae640e113c073a5f88edd", size = 559184, upload-time = "2025-09-08T23:08:15.163Z" }, - { url = "https://files.pythonhosted.org/packages/fc/7f/a21b20d577e4100c6a41795842028235998a643b1ad406a6d4163ea8f53e/pyzmq-27.1.0-cp312-abi3-win_amd64.whl", hash = "sha256:9ce490cf1d2ca2ad84733aa1d69ce6855372cb5ce9223802450c9b2a7cba0ccf", size = 619480, upload-time = "2025-09-08T23:08:17.192Z" }, - { url = "https://files.pythonhosted.org/packages/78/c2/c012beae5f76b72f007a9e91ee9401cb88c51d0f83c6257a03e785c81cc2/pyzmq-27.1.0-cp312-abi3-win_arm64.whl", hash = "sha256:75a2f36223f0d535a0c919e23615fc85a1e23b71f40c7eb43d7b1dedb4d8f15f", size = 552993, upload-time = "2025-09-08T23:08:18.926Z" }, - { url = "https://files.pythonhosted.org/packages/87/45/19efbb3000956e82d0331bafca5d9ac19ea2857722fa2caacefb6042f39d/pyzmq-27.1.0-cp314-cp314t-macosx_10_15_universal2.whl", hash = "sha256:ce980af330231615756acd5154f29813d553ea555485ae712c491cd483df6b7a", size = 1341197, upload-time = "2025-09-08T23:08:44.973Z" }, - { url = "https://files.pythonhosted.org/packages/48/43/d72ccdbf0d73d1343936296665826350cb1e825f92f2db9db3e61c2162a2/pyzmq-27.1.0-cp314-cp314t-manylinux2014_i686.manylinux_2_17_i686.whl", hash = "sha256:1779be8c549e54a1c38f805e56d2a2e5c009d26de10921d7d51cfd1c8d4632ea", size = 897175, upload-time = "2025-09-08T23:08:46.601Z" }, - { url = "https://files.pythonhosted.org/packages/2f/2e/a483f73a10b65a9ef0161e817321d39a770b2acf8bcf3004a28d90d14a94/pyzmq-27.1.0-cp314-cp314t-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:7200bb0f03345515df50d99d3db206a0a6bee1955fbb8c453c76f5bf0e08fb96", size = 660427, upload-time = "2025-09-08T23:08:48.187Z" }, - { url = "https://files.pythonhosted.org/packages/f5/d2/5f36552c2d3e5685abe60dfa56f91169f7a2d99bbaf67c5271022ab40863/pyzmq-27.1.0-cp314-cp314t-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:01c0e07d558b06a60773744ea6251f769cd79a41a97d11b8bf4ab8f034b0424d", size = 847929, upload-time = "2025-09-08T23:08:49.76Z" }, - { url = "https://files.pythonhosted.org/packages/c4/2a/404b331f2b7bf3198e9945f75c4c521f0c6a3a23b51f7a4a401b94a13833/pyzmq-27.1.0-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:80d834abee71f65253c91540445d37c4c561e293ba6e741b992f20a105d69146", size = 1650193, upload-time = "2025-09-08T23:08:51.7Z" }, - { url = "https://files.pythonhosted.org/packages/1c/0b/f4107e33f62a5acf60e3ded67ed33d79b4ce18de432625ce2fc5093d6388/pyzmq-27.1.0-cp314-cp314t-musllinux_1_2_i686.whl", hash = "sha256:544b4e3b7198dde4a62b8ff6685e9802a9a1ebf47e77478a5eb88eca2a82f2fd", size = 2024388, upload-time = "2025-09-08T23:08:53.393Z" }, - { url = "https://files.pythonhosted.org/packages/0d/01/add31fe76512642fd6e40e3a3bd21f4b47e242c8ba33efb6809e37076d9b/pyzmq-27.1.0-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:cedc4c68178e59a4046f97eca31b148ddcf51e88677de1ef4e78cf06c5376c9a", size = 1885316, upload-time = "2025-09-08T23:08:55.702Z" }, - { url = "https://files.pythonhosted.org/packages/c4/59/a5f38970f9bf07cee96128de79590bb354917914a9be11272cfc7ff26af0/pyzmq-27.1.0-cp314-cp314t-win32.whl", hash = "sha256:1f0b2a577fd770aa6f053211a55d1c47901f4d537389a034c690291485e5fe92", size = 587472, upload-time = "2025-09-08T23:08:58.18Z" }, - { url = "https://files.pythonhosted.org/packages/70/d8/78b1bad170f93fcf5e3536e70e8fadac55030002275c9a29e8f5719185de/pyzmq-27.1.0-cp314-cp314t-win_amd64.whl", hash = "sha256:19c9468ae0437f8074af379e986c5d3d7d7bfe033506af442e8c879732bedbe0", size = 661401, upload-time = "2025-09-08T23:08:59.802Z" }, - { url = "https://files.pythonhosted.org/packages/81/d6/4bfbb40c9a0b42fc53c7cf442f6385db70b40f74a783130c5d0a5aa62228/pyzmq-27.1.0-cp314-cp314t-win_arm64.whl", hash = "sha256:dc5dbf68a7857b59473f7df42650c621d7e8923fb03fa74a526890f4d33cc4d7", size = 575170, upload-time = "2025-09-08T23:09:01.418Z" }, -] - -[[package]] -name = "redis" -version = "8.0.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/53/ae/ed461cca5780b5fc8b9fe8ca0ed98d89508645fb9d880c24cc42c087678f/redis-8.0.0.tar.gz", hash = "sha256:a00c5355432051ac14e593b8b197fc76c887ee12d55a0984f69328a1115fdc49", size = 5101591, upload-time = "2026-05-28T12:45:13.5Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/27/e3/b519734372d305bd547534a9f32e4ce9f98552af753dce72cf3483a0ff0b/redis-8.0.0-py3-none-any.whl", hash = "sha256:c938c18338585009f0bc310f4c7e4e4b4d37639356c4ac072cedf3af570c8dc7", size = 499870, upload-time = "2026-05-28T12:45:11.697Z" }, -] - -[[package]] -name = "referencing" -version = "0.37.0" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "attrs" }, - { name = "rpds-py" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/22/f5/df4e9027acead3ecc63e50fe1e36aca1523e1719559c499951bb4b53188f/referencing-0.37.0.tar.gz", hash = "sha256:44aefc3142c5b842538163acb373e24cce6632bd54bdb01b21ad5863489f50d8", size = 78036, upload-time = "2025-10-13T15:30:48.871Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/2c/58/ca301544e1fa93ed4f80d724bf5b194f6e4b945841c5bfd555878eea9fcb/referencing-0.37.0-py3-none-any.whl", hash = "sha256:381329a9f99628c9069361716891d34ad94af76e461dcb0335825aecc7692231", size = 26766, upload-time = "2025-10-13T15:30:47.625Z" }, -] - -[[package]] -name = "regex" -version = "2026.5.9" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/dc/0e/49aee608ad09480e7fd276898c99ec6192985fa331abe4eb3a986094490b/regex-2026.5.9.tar.gz", hash = "sha256:a8234aa23ec39894bfe4a3f1b85616a7032481964a13ac6fc9f10de4f6fca270", size = 416074, upload-time = "2026-05-09T23:15:19.37Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/13/3e/9c3cd292d8808b3645a2ce517e200179b6d0e903f176300bd8b542e14de5/regex-2026.5.9-cp314-cp314-macosx_10_13_universal2.whl", hash = "sha256:1bd7587a2948b4085195d5a3374eaf4a425dc3e55784c038175355ecf3bbbf8a", size = 490376, upload-time = "2026-05-09T23:14:09.64Z" }, - { url = "https://files.pythonhosted.org/packages/60/70/d43ee8a2ca0a8b68d167f21658b85520ac0574617c7f320367c5047f7556/regex-2026.5.9-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:dea2e88e1cce4522496cce630e11e67b98b7076620bc4336c3f674bc21a375f4", size = 291964, upload-time = "2026-05-09T23:14:11.424Z" }, - { url = "https://files.pythonhosted.org/packages/21/91/9d50b433828d8e74196904e168a43abf1e6e88b2a15d47ed742456720c37/regex-2026.5.9-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:2099f7e7ff7b6aa3192312650a56e91cc091e49d50b04e4f6f8b6e28b3b27f1c", size = 289682, upload-time = "2026-05-09T23:14:13.123Z" }, - { url = "https://files.pythonhosted.org/packages/3e/d2/b835e3cafbb9d977736912436259ff551d60919f7d7b3d37d46659c63564/regex-2026.5.9-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:ecd353045824e4477562a2ac718c25799cdaaa41f7aa925a806a8a3e6848a5b9", size = 796996, upload-time = "2026-05-09T23:14:14.923Z" }, - { url = "https://files.pythonhosted.org/packages/2c/a6/9f992d00019166b9de01c546dd4549bc679f2a68df11b877740b0760b7c2/regex-2026.5.9-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:65c8c8c37377794bd5b2f3ebe51919042bf17aec802e23c833d89782ed0c78af", size = 866089, upload-time = "2026-05-09T23:14:17.757Z" }, - { url = "https://files.pythonhosted.org/packages/e0/08/4d32af657e049b19cb62b02e46e38fe1518797bfb2203ee93a510b21b0dc/regex-2026.5.9-cp314-cp314-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:5b73ab8afcf66c622db143d1c6fda4e58e4d537ee4f125229ad47b1ab80f34c0", size = 911530, upload-time = "2026-05-09T23:14:20.353Z" }, - { url = "https://files.pythonhosted.org/packages/d9/27/2af43dd1dc201d1fecefda64a45f4ad0995855b92724f795a777b402ee69/regex-2026.5.9-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:0de5cf193997384ed2ca6f1cd4f78055b255d93d82d5a8cd6ba0d11c10b167e4", size = 800643, upload-time = "2026-05-09T23:14:22.265Z" }, - { url = "https://files.pythonhosted.org/packages/a4/dd/23a249047013b5321d4a60c4d2437462086f601b061776a525e5fba2a59f/regex-2026.5.9-cp314-cp314-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:d641a8c9a61618047796d572a39a79b26167b0411d2c3031937b2fe2d081e2cf", size = 777223, upload-time = "2026-05-09T23:14:24.179Z" }, - { url = "https://files.pythonhosted.org/packages/94/6a/e85ed9538cd19586d0465076a4578a12e093ce776d15f3f8ce92733a8dd6/regex-2026.5.9-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:24b2355ef5cc9aa5b8f07d17704face1c166fdcc2290fa7bd6e6c925655a8346", size = 785760, upload-time = "2026-05-09T23:14:26.065Z" }, - { url = "https://files.pythonhosted.org/packages/2a/c4/f25473209438638e947c55f9156fd8f236f74169229028cc99116380868e/regex-2026.5.9-cp314-cp314-musllinux_1_2_ppc64le.whl", hash = "sha256:a24852d3c29ad9e47593593d8a247c44ccc3d0548ef12c822d6ed0810affe676", size = 860891, upload-time = "2026-05-09T23:14:28.17Z" }, - { url = "https://files.pythonhosted.org/packages/f9/f7/f4f86e3c74419c37370e91f150ae0c2ef7d34b2e0e4cdd5da046a02e4022/regex-2026.5.9-cp314-cp314-musllinux_1_2_riscv64.whl", hash = "sha256:916714069da19329ef7de197dcbc77bb3104145c7c2c864dbfbe318f46b88b14", size = 765891, upload-time = "2026-05-09T23:14:30.06Z" }, - { url = "https://files.pythonhosted.org/packages/26/70/704d8e13765939146b1cd0ef4e2feb71d7929727d2290f026eed10095955/regex-2026.5.9-cp314-cp314-musllinux_1_2_s390x.whl", hash = "sha256:fa411799ca8da32a8d38d020a88faa5b6f91657d284761352940ecf9f7c3bbdd", size = 851380, upload-time = "2026-05-09T23:14:32.123Z" }, - { url = "https://files.pythonhosted.org/packages/26/29/1a13582a8460038edc38e49f64ceb0dd7c60f5caba77571f4bf6601965d9/regex-2026.5.9-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:1e6da47d679b7010ef27556b6e0f99771b744936db1792a10ceac6547ae1503e", size = 789350, upload-time = "2026-05-09T23:14:34.799Z" }, - { url = "https://files.pythonhosted.org/packages/73/56/3dcafe34fc72e271d62ad9a291801e88a1457bb251c132f15fcc2e5aad1a/regex-2026.5.9-cp314-cp314-win32.whl", hash = "sha256:98bd73080e8756255137e1bd3f3f00295bbc5aa383c0e0f973920e9134d7c4ad", size = 272130, upload-time = "2026-05-09T23:14:36.729Z" }, - { url = "https://files.pythonhosted.org/packages/d0/9c/02eebf0be95efe416c664db7fb8b6b05b7a0b06a7544f2884f2558b0526f/regex-2026.5.9-cp314-cp314-win_amd64.whl", hash = "sha256:ff8d372ac2acdc048d1c19916f27ee61bc5722728458ba6ca5052f2c72d51763", size = 280999, upload-time = "2026-05-09T23:14:39.126Z" }, - { url = "https://files.pythonhosted.org/packages/70/5a/1dd1abee76cb7a846a0bcf42fdc87e5720c3c33c24f3e37814310a513d9f/regex-2026.5.9-cp314-cp314-win_arm64.whl", hash = "sha256:e1d93bf647916292e8edcec150c07ddf3dc50179ccaf770c04a7f9e452155372", size = 273500, upload-time = "2026-05-09T23:14:41.059Z" }, - { url = "https://files.pythonhosted.org/packages/86/c1/c5f619b0057a7965cb78ec559c1d7a45ce8c99a35bea95483d64959a93d9/regex-2026.5.9-cp314-cp314t-macosx_10_13_universal2.whl", hash = "sha256:83d0ee4a57d1c87cb549e195ec300b8f0ec3a82eba66d835e4e2ed8634fe4499", size = 494269, upload-time = "2026-05-09T23:14:42.869Z" }, - { url = "https://files.pythonhosted.org/packages/05/2c/5d01f1aee33de4bbe60c8452945bfc8477ca7c5ae4450f6bfe711036cb36/regex-2026.5.9-cp314-cp314t-macosx_10_13_x86_64.whl", hash = "sha256:d3d7eb5c9a7f6df82ed3cfac9beb93882a5cbcb5b8b157b56cb2b3b276574ac1", size = 293954, upload-time = "2026-05-09T23:14:44.822Z" }, - { url = "https://files.pythonhosted.org/packages/7a/fe/e8988b2ae2108c6ef71bd4aa8d87fbe257976dd0810e826cd75f701c68b6/regex-2026.5.9-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:075160bf16658e16d35233300b8453aac25de4cbea808d22348b6979668e924d", size = 292405, upload-time = "2026-05-09T23:14:47.211Z" }, - { url = "https://files.pythonhosted.org/packages/79/34/d2b0937faa7859263f7f0a3c6b103a1296306be6952dc173d0154e9a2f49/regex-2026.5.9-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:45375819235558a4ff1c4971dc32881f022613abdb180128f5cb4768c1765a1c", size = 811855, upload-time = "2026-05-09T23:14:49.21Z" }, - { url = "https://files.pythonhosted.org/packages/80/fe/daf53a47457a8486db66c66c01ceb9c2303eecee3f87197f1e77eb1a736d/regex-2026.5.9-cp314-cp314t-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:ead4b163ac30a29574510cd4b3e2e985ac5290c05fc7095557d6a5f403fc31b5", size = 871189, upload-time = "2026-05-09T23:14:51.555Z" }, - { url = "https://files.pythonhosted.org/packages/1c/75/058fc4470cbfbf57d800aff1a0022b929a3f9fa553ee10a0cdf2070eb31f/regex-2026.5.9-cp314-cp314t-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:8c6e4218fbdfbcd4f6c19efca40930d24a621bf4b48cb76bc6640543bd28ef20", size = 917485, upload-time = "2026-05-09T23:14:53.633Z" }, - { url = "https://files.pythonhosted.org/packages/88/e7/179cfda3a28bc843b5c6cfe7f79f23489c791ed95f151083803660878432/regex-2026.5.9-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:6351571c8a42b505eb555c0dc47d740d0fb66977dc142919eea6f4325b7c56a0", size = 816369, upload-time = "2026-05-09T23:14:56.198Z" }, - { url = "https://files.pythonhosted.org/packages/41/90/6f0cc422071688266d344fca8462d787cba0a2c144acb25721f9a61ec265/regex-2026.5.9-cp314-cp314t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:002205cafd2a9e78c6290c7d1df277bf3277b3b7a30e0b4bb0dac2e2e3f7cb2d", size = 785869, upload-time = "2026-05-09T23:14:58.602Z" }, - { url = "https://files.pythonhosted.org/packages/02/67/a31f1760f09c27b251ef39e9beb541f462cf977381d067faa764c2c0e393/regex-2026.5.9-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:8abd33fef90b2a9efac5557d6033ca82d1195ed3a15fea5af15ba7b463c6a63b", size = 801427, upload-time = "2026-05-09T23:15:00.642Z" }, - { url = "https://files.pythonhosted.org/packages/e3/c4/1a80654597b6bc1e1ea0494824c31200e8a956abe290afae9b19a166a148/regex-2026.5.9-cp314-cp314t-musllinux_1_2_ppc64le.whl", hash = "sha256:31037c82eccb44b7ea2e9e221d7c01429430e989a1f4b91ea5a855f6017b509a", size = 866482, upload-time = "2026-05-09T23:15:03.384Z" }, - { url = "https://files.pythonhosted.org/packages/d1/11/960724e06482c08466ff5611e242e86f80062949cdf6b4b9cc317b9dd93d/regex-2026.5.9-cp314-cp314t-musllinux_1_2_riscv64.whl", hash = "sha256:5604dfd046dc37eca90250fc3be938b076c8059fa772ac0ed6f499b0f0fb0415", size = 773022, upload-time = "2026-05-09T23:15:05.625Z" }, - { url = "https://files.pythonhosted.org/packages/50/a8/a9979c3e7918280e93159ebcab5ef1a65116dd4f3bd6091be0eae4a126e8/regex-2026.5.9-cp314-cp314t-musllinux_1_2_s390x.whl", hash = "sha256:0e1b1b4e496afbb24f4a62aba855ee4f88f25578927697b340702e48c9ee6bc2", size = 856642, upload-time = "2026-05-09T23:15:07.966Z" }, - { url = "https://files.pythonhosted.org/packages/fe/d4/a9b732f2f0072c0ab12227483abb24fffcb9f73f8a2b203df0a6d0434735/regex-2026.5.9-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:be3372b9df6ddecff6486d37e19095a7b4973137caf5512407a89f4455361f41", size = 803552, upload-time = "2026-05-09T23:15:10.215Z" }, - { url = "https://files.pythonhosted.org/packages/d5/fe/1b3113817447a1d4155e4ac76d2e072f42c0bcba2f43fa8a0e756ea2cd91/regex-2026.5.9-cp314-cp314t-win32.whl", hash = "sha256:3ddd90103f9e5c471c49c7852ecc1fe27c7e45eb99e977aefe7caa4e779f4f58", size = 275746, upload-time = "2026-05-09T23:15:12.609Z" }, - { url = "https://files.pythonhosted.org/packages/92/73/93d42045302636c91f2e5ef588b65b84b01428f28ec77de256b1dfdfbe5c/regex-2026.5.9-cp314-cp314t-win_amd64.whl", hash = "sha256:ca518ed29c46eecba6010b15f1b9a479314d2de409536e71b6a13aa04e3b8a77", size = 285685, upload-time = "2026-05-09T23:15:15.086Z" }, - { url = "https://files.pythonhosted.org/packages/da/80/35b4c33c804a165a7f55289afda3ea9e3eb6d15800341a2d66455c0f1f30/regex-2026.5.9-cp314-cp314t-win_arm64.whl", hash = "sha256:5e41809d2683fcde7d5a8c87a6567ba1fb1ce0de9f31bff578de00a4b2d76daa", size = 275713, upload-time = "2026-05-09T23:15:16.98Z" }, -] - [[package]] name = "requests" version = "2.34.2" @@ -3067,39 +1454,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/a0/f4/c67b0b3f1b9245e8d266f0f112c500d50e5b4e83cb6f3b71b6528104182a/requests-2.34.2-py3-none-any.whl", hash = "sha256:2a0d60c172f83ac6ab31e4554906c0f3b3588d37b5cb939b1c061f4907e278e0", size = 73075, upload-time = "2026-05-14T19:25:26.443Z" }, ] -[[package]] -name = "rfc3339-validator" -version = "0.1.4" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "six" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/28/ea/a9387748e2d111c3c2b275ba970b735e04e15cdb1eb30693b6b5708c4dbd/rfc3339_validator-0.1.4.tar.gz", hash = "sha256:138a2abdf93304ad60530167e51d2dfb9549521a836871b88d7f4695d0022f6b", size = 5513, upload-time = "2021-05-12T16:37:54.178Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/7b/44/4e421b96b67b2daff264473f7465db72fbdf36a07e05494f50300cc7b0c6/rfc3339_validator-0.1.4-py2.py3-none-any.whl", hash = "sha256:24f6ec1eda14ef823da9e36ec7113124b39c04d50a4d3d3a3c2859577e7791fa", size = 3490, upload-time = "2021-05-12T16:37:52.536Z" }, -] - -[[package]] -name = "rfc3986-validator" -version = "0.1.1" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/da/88/f270de456dd7d11dcc808abfa291ecdd3f45ff44e3b549ffa01b126464d0/rfc3986_validator-0.1.1.tar.gz", hash = "sha256:3d44bde7921b3b9ec3ae4e3adca370438eccebc676456449b145d533b240d055", size = 6760, upload-time = "2019-10-28T16:00:19.144Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/9e/51/17023c0f8f1869d8806b979a2bffa3f861f26a3f1a66b094288323fba52f/rfc3986_validator-0.1.1-py2.py3-none-any.whl", hash = "sha256:2f235c432ef459970b4306369336b9d5dbdda31b510ca1e327636e01f528bfa9", size = 4242, upload-time = "2019-10-28T16:00:13.976Z" }, -] - -[[package]] -name = "rfc3987-syntax" -version = "1.1.0" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "lark" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/2c/06/37c1a5557acf449e8e406a830a05bf885ac47d33270aec454ef78675008d/rfc3987_syntax-1.1.0.tar.gz", hash = "sha256:717a62cbf33cffdd16dfa3a497d81ce48a660ea691b1ddd7be710c22f00b4a0d", size = 14239, upload-time = "2025-07-18T01:05:05.015Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/7e/71/44ce230e1b7fadd372515a97e32a83011f906ddded8d03e3c6aafbdedbb7/rfc3987_syntax-1.1.0-py3-none-any.whl", hash = "sha256:6c3d97604e4c5ce9f714898e05401a0445a641cfa276432b0a648c80856f6a3f", size = 8046, upload-time = "2025-07-18T01:05:03.843Z" }, -] - [[package]] name = "rich" version = "15.0.0" @@ -3165,100 +1519,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/79/62/b88e5879512c55b8ee979c666ee6902adc4ed05007226de266410ae27965/rignore-0.7.6-cp314-cp314t-win_arm64.whl", hash = "sha256:b83adabeb3e8cf662cabe1931b83e165b88c526fa6af6b3aa90429686e474896", size = 656035, upload-time = "2025-11-05T21:41:31.13Z" }, ] -[[package]] -name = "rpds-py" -version = "2026.5.1" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/2e/43/25a8dcd3feedd735039a8f0b5b7e3b118232b5eae288c4fd9ab200d41094/rpds_py-2026.5.1.tar.gz", hash = "sha256:07b24fea40541e28570e5b795a4a38fbdcd12550c06bd0748005ecc8116ca256", size = 64459, upload-time = "2026-05-28T12:02:13.232Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/d4/6f/19c1918a4b590d8de87e712e4abe4b3875771eff60216fb6153cf6665c68/rpds_py-2026.5.1-cp314-cp314-macosx_10_12_x86_64.whl", hash = "sha256:1f2c391c3059798093b65df23aca2cac150460ae9c630d99dec83d703d9485b9", size = 349756, upload-time = "2026-05-28T12:00:20.217Z" }, - { url = "https://files.pythonhosted.org/packages/e5/60/a06fe7da34eca79dacbf958a2ba0c6eea85bc2b29de20080bf40f72f66fa/rpds_py-2026.5.1-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:413b424f7c4ee65ab5e5be91f5731be0f8b41a1ee2b12dfe810d716312e95a78", size = 343831, upload-time = "2026-05-28T12:00:21.711Z" }, - { url = "https://files.pythonhosted.org/packages/bf/ec/b2333b97b90e2a6ef6ca8ad386ee284968e74bcfe113b3f1a8d9036429a9/rpds_py-2026.5.1-cp314-cp314-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2c595a1d9255dce0599e13130d1440ab2506654f2b50294226ee06402f8fef63", size = 375127, upload-time = "2026-05-28T12:00:23.326Z" }, - { url = "https://files.pythonhosted.org/packages/14/7f/e00aae54067f2b488c4637961d5f58204d470795fc791085fa3f15060d2e/rpds_py-2026.5.1-cp314-cp314-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:1c27c5f6102eac8c03e7595a00827a53b271ba40a53b59ff8709170e0855ea4a", size = 379034, upload-time = "2026-05-28T12:00:24.89Z" }, - { url = "https://files.pythonhosted.org/packages/be/cc/423999bbb8ae8dc93c77fc1d5e984ade5eb89d237d3bb884ccfa72ae2890/rpds_py-2026.5.1-cp314-cp314-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:6c7fcf61d44cacecaf3aea542b0e053db77972a4573e7ceda16fb2b399161195", size = 490823, upload-time = "2026-05-28T12:00:26.676Z" }, - { url = "https://files.pythonhosted.org/packages/0f/aa/c671bf660f12e68d3c52ff86c7066ed1372df5a0f4f2ff584e419b8207e7/rpds_py-2026.5.1-cp314-cp314-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2c817a189d4ee14290420e5ff051e4dd6baa13f3edf84685071dee07a6d538ee", size = 388144, upload-time = "2026-05-28T12:00:28.577Z" }, - { url = "https://files.pythonhosted.org/packages/19/c8/d63bb75b68afe77b229e3021c6031bcaf01da5db5b0e69d0d10f9ba679a7/rpds_py-2026.5.1-cp314-cp314-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:21846aac0ed2e0589f38c12dc44e77bb64e494b771eadbcf169cba00566ba7ba", size = 371959, upload-time = "2026-05-28T12:00:30.304Z" }, - { url = "https://files.pythonhosted.org/packages/82/35/c51122014d8274ff37dc606d60049c3db7d83da02b5b282511e5a906a9a6/rpds_py-2026.5.1-cp314-cp314-manylinux_2_31_riscv64.whl", hash = "sha256:b317c87a13f769a4e787819bd508aaa5d69aa09b0880de9af6d3a8a54571cdec", size = 383558, upload-time = "2026-05-28T12:00:31.764Z" }, - { url = "https://files.pythonhosted.org/packages/e3/f9/2790cb99c136a5363acdeacf5c27c56f3de0d4118a1f48fca83404c99c89/rpds_py-2026.5.1-cp314-cp314-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:ce87129d9f2c14fa6c4a8601fb80eb4488c80d38a20cd13758ef11123e14995d", size = 402789, upload-time = "2026-05-28T12:00:33.247Z" }, - { url = "https://files.pythonhosted.org/packages/e5/1b/e4fb584f8c75d35c38150ff6a332cda949e6f97acba1f4fd123b14ab56fe/rpds_py-2026.5.1-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:9cdddb6c1207d284d94fd1530adf57fbd797fe7c4b8704ba85f49414f2557e7d", size = 551405, upload-time = "2026-05-28T12:00:34.819Z" }, - { url = "https://files.pythonhosted.org/packages/d8/f7/a6731b4216cb3793ea1af5391da240f5683dacc0d13e034fe5fc3503f240/rpds_py-2026.5.1-cp314-cp314-musllinux_1_2_i686.whl", hash = "sha256:4e237e139f94d3c036fd28eb9f564c99055476ff4ff05cd42be55ce349b5aa02", size = 616975, upload-time = "2026-05-28T12:00:36.268Z" }, - { url = "https://files.pythonhosted.org/packages/2c/ea/2e051a81d95d8e63f4b35a1c463a87e8766bc3d083c067c5dfb6bf220747/rpds_py-2026.5.1-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:ed0954b524873214369184a9c82b0eaa45a3fbb9a798cd95b17e0d98499e7ea0", size = 578701, upload-time = "2026-05-28T12:00:37.82Z" }, - { url = "https://files.pythonhosted.org/packages/65/56/b5f6fdb2083e32bca8a8993d89e70db114b4756c9e2c38421328126689d2/rpds_py-2026.5.1-cp314-cp314-win32.whl", hash = "sha256:2d88621d6a7d4dfa633d21abe90f280bb205274e16b1d1e61c6ad4640b2453b7", size = 209806, upload-time = "2026-05-28T12:00:39.492Z" }, - { url = "https://files.pythonhosted.org/packages/fb/80/65a5aa96c155e611d1ed844e4e1f57f3e36b021f396d9f8585d756e6b90d/rpds_py-2026.5.1-cp314-cp314-win_amd64.whl", hash = "sha256:cef8ac28d26f4dda3533060c20fbf80a325458fa9fd23ea72a73cdfa8e978838", size = 225985, upload-time = "2026-05-28T12:00:40.94Z" }, - { url = "https://files.pythonhosted.org/packages/27/7c/ad185212e87b05f196daef92bc5f3caf07298eb47c295b5585c3dd3093ac/rpds_py-2026.5.1-cp314-cp314-win_arm64.whl", hash = "sha256:eaaea962c68cdc68d4a533ba985ab8e9484277910bbfaa2ab3ef7732667bfed8", size = 221219, upload-time = "2026-05-28T12:00:43.15Z" }, - { url = "https://files.pythonhosted.org/packages/23/58/e14ae18759020334646b031e708ab4158d653a938822bfb7b95ef2e93aa3/rpds_py-2026.5.1-cp314-cp314t-macosx_10_12_x86_64.whl", hash = "sha256:21942f52dbbd5f8758bf021213d28bd45c39e873e65e2407faf5f1846f5761ad", size = 352148, upload-time = "2026-05-28T12:00:44.638Z" }, - { url = "https://files.pythonhosted.org/packages/31/9b/5f4a1e2f960bca3ac5d052b139dd31eed97b259f9d909173821760d542e8/rpds_py-2026.5.1-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:f414556f6e3958300ff941e40c9f97e3dc9774ddd1b3434c475d73dd354bbed3", size = 345196, upload-time = "2026-05-28T12:00:46.14Z" }, - { url = "https://files.pythonhosted.org/packages/1a/71/1d9574d6a2fa20ab60eaa55c7467f5aa20cbc770f341a05f09c0876f59e2/rpds_py-2026.5.1-cp314-cp314t-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ef1013a8625c74043210190b246f5b1551e09757c1f356c6e4160ef96c5bc081", size = 374981, upload-time = "2026-05-28T12:00:47.531Z" }, - { url = "https://files.pythonhosted.org/packages/0c/9a/37e99f4915a80aa71670263c1267f7ae0af95f53a3f61e6c3bdc016d4515/rpds_py-2026.5.1-cp314-cp314t-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:cc68e231a77a5f0d774ae278a1f8e55c0456501820847c1e4efb3829f3441df6", size = 379961, upload-time = "2026-05-28T12:00:49.216Z" }, - { url = "https://files.pythonhosted.org/packages/a8/ff/6e73f74b89d2e0715e0fc86b7dde893f9a61ae2f9b256ff3bdfe41ac4e94/rpds_py-2026.5.1-cp314-cp314t-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:9baffb505aff33acc69b422a19f77806680f3c8632227d79f48de8a810d1c2c5", size = 495965, upload-time = "2026-05-28T12:00:51.111Z" }, - { url = "https://files.pythonhosted.org/packages/ea/e0/425faba25f59d74d4638b267f7c7a80e8649d2ef4db10a19b0c4a71e6e6f/rpds_py-2026.5.1-cp314-cp314t-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b8d2f912928d426e8cfa396f7f3f8d29a59e6689c86dcca3c420730c1096322b", size = 389526, upload-time = "2026-05-28T12:00:52.77Z" }, - { url = "https://files.pythonhosted.org/packages/c6/76/7a41960e3fddae47fab43a28684d5da981401dffd88253de0944148654cb/rpds_py-2026.5.1-cp314-cp314t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:90f628283be835db980c941767d41c9a27b5239e54ba0a9c1335247e82406964", size = 376190, upload-time = "2026-05-28T12:00:54.215Z" }, - { url = "https://files.pythonhosted.org/packages/27/60/5f38dc70824fc6951b51d35377e577a3a3a4c81a6769cc5a2de25ebe0ad1/rpds_py-2026.5.1-cp314-cp314t-manylinux_2_31_riscv64.whl", hash = "sha256:1ebb2f0ab7e16132995a72de805170e0203df0c3dd22e1ef1cd1fdd90bd7a131", size = 383921, upload-time = "2026-05-28T12:00:55.673Z" }, - { url = "https://files.pythonhosted.org/packages/60/1a/d60a38caa1505f4b9483c3fbbde12c94e1079154f4f401a6da96f7e77621/rpds_py-2026.5.1-cp314-cp314t-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:f3df3d16ded76f1f8c9cdebd0e1ea55fdf4c23b812de189814da7cf229c22a81", size = 404766, upload-time = "2026-05-28T12:00:57.518Z" }, - { url = "https://files.pythonhosted.org/packages/87/ff/602fd3f174d6425f0bce05ad0dfbec0e96b38d0f7d08a79af5aa20083885/rpds_py-2026.5.1-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:9af8905b8f854990e40d5206aa5ac58d9b0fe0b7f351ff2bb086c20f6c8c6a47", size = 551343, upload-time = "2026-05-28T12:00:58.978Z" }, - { url = "https://files.pythonhosted.org/packages/b8/c1/1be13327acdbead3eca1fde03b6a34dbb011f1e864e217f0d32cc1779a7f/rpds_py-2026.5.1-cp314-cp314t-musllinux_1_2_i686.whl", hash = "sha256:036a36a87fb1cd3b214d11c4b3c4f7d2ddad933625dca1c900b56a057c07740a", size = 618502, upload-time = "2026-05-28T12:01:00.656Z" }, - { url = "https://files.pythonhosted.org/packages/f3/d7/afb49b49d7f2be8b7ba1a9f0977fa5168003437b93086726f066544e8351/rpds_py-2026.5.1-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:62ae3853454fe9ef283a03c96c2d835d39e84b14643a9d62c82ef0fb87d702ca", size = 581916, upload-time = "2026-05-28T12:01:02.22Z" }, - { url = "https://files.pythonhosted.org/packages/25/d1/dbef8c1f8a10f07beb62b5f054e20099fd9924b3ec001b8f0b6ac7813a85/rpds_py-2026.5.1-cp314-cp314t-win32.whl", hash = "sha256:6c3d771a46ec18b12af06ce36243a9a80b07a5d0515236332d90863ca8bb326a", size = 207855, upload-time = "2026-05-28T12:01:03.821Z" }, - { url = "https://files.pythonhosted.org/packages/2a/72/bfa4e61ab8e7dc1c8adf397e05e6cbdd4239357bd72b248d3de662f23915/rpds_py-2026.5.1-cp314-cp314t-win_amd64.whl", hash = "sha256:c93c629be4636cf54337bd5f06c104d55e42ced54d681f6fe21ae510a65116f6", size = 225422, upload-time = "2026-05-28T12:01:05.194Z" }, - { url = "https://files.pythonhosted.org/packages/27/3a/7b5da92b640f67b6717ccafc83cdd06bfa7ff2395c3685c68922bb54d703/rpds_py-2026.5.1-cp315-cp315-macosx_10_12_x86_64.whl", hash = "sha256:3574b55c604b8f75dacb007136508bbc0db406e626301778096a133327e7f2fb", size = 349576, upload-time = "2026-05-28T12:01:06.722Z" }, - { url = "https://files.pythonhosted.org/packages/d7/8a/2aafd7ad355a1bd48ca76e2262b74b15e6432b5a1efe150efd4d779cd55d/rpds_py-2026.5.1-cp315-cp315-macosx_11_0_arm64.whl", hash = "sha256:94068eb3ae6d43f5a786b7db96a406a34e6d5c24489feef32fd6e8946ea7b291", size = 343640, upload-time = "2026-05-28T12:01:08.441Z" }, - { url = "https://files.pythonhosted.org/packages/f7/7d/6c9523c1abbe840a1b7fba3c516d48e1d3487cc80fea4366c4071cf56784/rpds_py-2026.5.1-cp315-cp315-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f3a5b10e8ce894825f380a8f1b6444cf73c294dfea62afbb2d13e3a9e630cec1", size = 375322, upload-time = "2026-05-28T12:01:09.934Z" }, - { url = "https://files.pythonhosted.org/packages/5a/5d/0b7b03fb1dc509321f01de3149784ab773e34c8573022029af8076afcb9c/rpds_py-2026.5.1-cp315-cp315-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:fc09f82e63d4bcd58149572f857a431bae851dc747e313c3b5bdf7abb907fda8", size = 379066, upload-time = "2026-05-28T12:01:11.48Z" }, - { url = "https://files.pythonhosted.org/packages/d7/e2/8ef6012999ebf1cb1c22f876d9ce5e63d960fd4631d2af3202d3f480aa25/rpds_py-2026.5.1-cp315-cp315-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:e10464d17df3b582745c25cec695cb9558bca2cb6ddb631aee1787fc72c767b2", size = 494586, upload-time = "2026-05-28T12:01:13.051Z" }, - { url = "https://files.pythonhosted.org/packages/80/af/1eeb029bec67582c226b7809172207cd005073af4ebd906e65ff494f4983/rpds_py-2026.5.1-cp315-cp315-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:ba05adbf15d994c38ec0b7ab32e858e5110c21e9009a00a86545fd220f84e038", size = 388415, upload-time = "2026-05-28T12:01:14.631Z" }, - { url = "https://files.pythonhosted.org/packages/18/23/ffbe10711c4d766c1cab0557d6906c074f795814863c67b351355d29354a/rpds_py-2026.5.1-cp315-cp315-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:77c004fdc7b891967106f78ddfd7b076bfe6813c6139c6fff6aed3bcaa960b26", size = 372427, upload-time = "2026-05-28T12:01:16.153Z" }, - { url = "https://files.pythonhosted.org/packages/bd/3a/30ba4a6ad457e5b070c18d742a33fb77d8d922b565cc881f8a5313d63bfe/rpds_py-2026.5.1-cp315-cp315-manylinux_2_31_riscv64.whl", hash = "sha256:83bcf894486c9d78dd290d3c0124ff6dd8875d3025e2090a8ec49fcc37c55fdd", size = 383615, upload-time = "2026-05-28T12:01:17.809Z" }, - { url = "https://files.pythonhosted.org/packages/d3/69/62e242b53ce39c0814bd24e1a6e6eba6c92be716277745f317f9540a2e7b/rpds_py-2026.5.1-cp315-cp315-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:c3df104083952a0e0c6f10de33e440eabe98fb6317d23e1a58c68f6df08d01b9", size = 402786, upload-time = "2026-05-28T12:01:19.419Z" }, - { url = "https://files.pythonhosted.org/packages/38/c1/a770b9c186928a1ed0f7e6d7ae50e7f3950ed23e3f9e366dbc8e38cb55de/rpds_py-2026.5.1-cp315-cp315-musllinux_1_2_aarch64.whl", hash = "sha256:980450826cf22e133c57e0835070bdd0dd3f73b9b708c3ce223def2cb9469e14", size = 551583, upload-time = "2026-05-28T12:01:21.013Z" }, - { url = "https://files.pythonhosted.org/packages/21/7c/68e8579b95375b70d2a963103c42e705856cdb98569258bd807f4423891c/rpds_py-2026.5.1-cp315-cp315-musllinux_1_2_i686.whl", hash = "sha256:205dde846f24332ab0c1188699a043b8d165b79bb84529ce272c45048ff6be01", size = 616941, upload-time = "2026-05-28T12:01:22.548Z" }, - { url = "https://files.pythonhosted.org/packages/70/a1/a6135aed5730ff03ab957182259987ac11e55fb392a28dc6f0592048a280/rpds_py-2026.5.1-cp315-cp315-musllinux_1_2_x86_64.whl", hash = "sha256:3966b82dd563176396df030f3dd52a6e54cb69b718e95e78bd555ed3d1e0185d", size = 578349, upload-time = "2026-05-28T12:01:24.118Z" }, - { url = "https://files.pythonhosted.org/packages/09/6e/f24201a76a84e6c49d0bdfdfcb735210e21701e9b21c5bfc0ba497dd62f6/rpds_py-2026.5.1-cp315-cp315-win32.whl", hash = "sha256:7818f8d0a415be74d2be3590b0a1c1f463a642f4d0217e7d10602dceef5b79aa", size = 209922, upload-time = "2026-05-28T12:01:25.522Z" }, - { url = "https://files.pythonhosted.org/packages/9e/e4/966bc240bb0485fc265278f6de44d05834bf0b3618886e0b22e33d54c49a/rpds_py-2026.5.1-cp315-cp315-win_amd64.whl", hash = "sha256:b3cc20c0d800af78fd0fac68086e28c1856cec51ea528bb81ea851aa40d39325", size = 226003, upload-time = "2026-05-28T12:01:27.062Z" }, - { url = "https://files.pythonhosted.org/packages/5c/5c/a15a59269cd5e74472734516c73795c15eccfc841b3d4b0228c3f53f19d0/rpds_py-2026.5.1-cp315-cp315-win_arm64.whl", hash = "sha256:3609e9939a8a76cd904cf98a3f1f13b5dc7e150adeaee89e0ea09652ea213e16", size = 221245, upload-time = "2026-05-28T12:01:28.51Z" }, - { url = "https://files.pythonhosted.org/packages/e0/22/135ce03804e179a71ceb13be095deda4a279bc88f7a6b8fa161c5ad44e12/rpds_py-2026.5.1-cp315-cp315t-macosx_10_12_x86_64.whl", hash = "sha256:5d333a7127d4b307601ac37792bee01bb95c867cbfacf21b6375b804d6bbd723", size = 352015, upload-time = "2026-05-28T12:01:30.214Z" }, - { url = "https://files.pythonhosted.org/packages/3b/5f/f1f6d2652eb9d848f6eb369d8db83a2da6249bb49ad2c2a48f45d54538d3/rpds_py-2026.5.1-cp315-cp315t-macosx_11_0_arm64.whl", hash = "sha256:b5f077b44a4f7808520f66dae234988d867deb9aed9be5da057ce9ba831b2a41", size = 345016, upload-time = "2026-05-28T12:01:31.656Z" }, - { url = "https://files.pythonhosted.org/packages/88/66/b74182775691ea2290c99e52ac8d5db844e56fbec90ce421f107658c8314/rpds_py-2026.5.1-cp315-cp315t-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:55d8f9b7b78c9538fc9e04e82ec0e888ff0c3cffcfad152c77e57cd09351a98a", size = 374775, upload-time = "2026-05-28T12:01:33.136Z" }, - { url = "https://files.pythonhosted.org/packages/ff/8f/15e5a61d9f0a43902d36561d4f07cae6ae9f4716be825159fd72717f33af/rpds_py-2026.5.1-cp315-cp315t-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:e3a8ae58895ac107ed934a6bf51e5846f95c53b9b940c2c6d310838fd5846358", size = 380270, upload-time = "2026-05-28T12:01:34.574Z" }, - { url = "https://files.pythonhosted.org/packages/02/c3/f859b12763a80540cdf2af0f15b19904cf756a71d7bdd3f82ff3e5b1bbf9/rpds_py-2026.5.1-cp315-cp315t-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:0957cf3c2b8632ec7aaebffebea8005b353cc2a237b6e2ae3c2cac0820704cfb", size = 495285, upload-time = "2026-05-28T12:01:36.127Z" }, - { url = "https://files.pythonhosted.org/packages/1c/c7/ff27c2ac8411d30b03b1829fd88cae8dad1a4d0da48dd25e57c4038042e6/rpds_py-2026.5.1-cp315-cp315t-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c396c1304de421050b3681ea70f371874b54d41b0151e96109758144c231e30b", size = 389581, upload-time = "2026-05-28T12:01:37.635Z" }, - { url = "https://files.pythonhosted.org/packages/6e/67/fe92ee32a6cc05c77228a2f8b1762e7124f386ec20ff83d0757b762d58d0/rpds_py-2026.5.1-cp315-cp315t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:aad1bff7f666b9598e573815affd666aac6a13a585dde336f843e33350c7fadc", size = 376041, upload-time = "2026-05-28T12:01:39.307Z" }, - { url = "https://files.pythonhosted.org/packages/f8/91/b4d6685c27aba55bd82f25b278be8237038117d05f9659a6213ad3408130/rpds_py-2026.5.1-cp315-cp315t-manylinux_2_31_riscv64.whl", hash = "sha256:656a042550878f12d45752452d47094b7cfe5ad1e9d7b87b5a22ad3ae5ff8015", size = 383946, upload-time = "2026-05-28T12:01:41.043Z" }, - { url = "https://files.pythonhosted.org/packages/bd/79/2c1d832a53c8e0f8e98fc970ec257b950fecd4f62be2ab7182b500a0cbc8/rpds_py-2026.5.1-cp315-cp315t-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:73c4bd4f70294737b5206a3e8e30ccadbf8a60301831c8ea23eec5dbeea1ecfa", size = 405526, upload-time = "2026-05-28T12:01:43.032Z" }, - { url = "https://files.pythonhosted.org/packages/78/c4/c98117b03c6a8581ab2c2dfccfe9a5ad82bd8128a3c28b46a6ad2d97c393/rpds_py-2026.5.1-cp315-cp315t-musllinux_1_2_aarch64.whl", hash = "sha256:43bca78665423cabae77146f2fe7ce55272b6c8d55d82cca83effd42c7e13972", size = 551165, upload-time = "2026-05-28T12:01:44.648Z" }, - { url = "https://files.pythonhosted.org/packages/3b/c1/bc479ca069200af730881b1bd525e3114b2b391a351509fcb1b772f28086/rpds_py-2026.5.1-cp315-cp315t-musllinux_1_2_i686.whl", hash = "sha256:42d0f20e85e549c870749d0e247f0c10d318a45b7e9676d575d2dcb04a1b2e66", size = 618778, upload-time = "2026-05-28T12:01:46.337Z" }, - { url = "https://files.pythonhosted.org/packages/77/65/38ab2f90df44c2febfb63cc10ced40763d9b4bc94d173e734528663fe7f5/rpds_py-2026.5.1-cp315-cp315t-musllinux_1_2_x86_64.whl", hash = "sha256:b1be5c35683684d5331b93600c210e8367c254683d8a6df6bd21bd2da3a334fb", size = 581839, upload-time = "2026-05-28T12:01:48.109Z" }, - { url = "https://files.pythonhosted.org/packages/15/2d/ce1f605fe036aadd460e5822e578c6c7ec3a860936cca37d6e0f299daa77/rpds_py-2026.5.1-cp315-cp315t-win32.whl", hash = "sha256:75808f6c38ce7749bb68cc2770161aae5045e6c6f6781a9782e74b93304399df", size = 207866, upload-time = "2026-05-28T12:01:49.648Z" }, - { url = "https://files.pythonhosted.org/packages/79/cb/966040123eb102371559746908ef2c9471f4d43e17ec9a645a2258dab64b/rpds_py-2026.5.1-cp315-cp315t-win_amd64.whl", hash = "sha256:90bd6630002a1c7f09e7843dd79f0d24f3d2897cc25a753480917865d14f15b3", size = 225441, upload-time = "2026-05-28T12:01:51.408Z" }, -] - -[[package]] -name = "rq" -version = "2.3.2" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "click" }, - { name = "redis" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/43/8d/bb57bca979f48869aea0b7b9752b0887848a7098352753021fdcbdaf0efb/rq-2.3.2.tar.gz", hash = "sha256:5bd212992724428ec1689736abde783d245e7856bca39d89845884f5d580f5f1", size = 649216, upload-time = "2025-04-13T10:07:41.383Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/3f/bf/08d99660c138354a83105efa64988ee4adc8ddc6c74866f29508aaff00f7/rq-2.3.2-py3-none-any.whl", hash = "sha256:bf4dc622a7b9d5f7d4a39444f26d89ce6de8a1d6db61b21060612114dbf8d5ff", size = 100389, upload-time = "2025-04-13T10:07:38.965Z" }, -] - -[[package]] -name = "rq-scheduler" -version = "0.14.0" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "crontab" }, - { name = "freezegun" }, - { name = "python-dateutil" }, - { name = "rq" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/a0/4e/977bbcc1f3b25ed9ea60ec968b13f7147661defe5b2f9272b44fdb1c5549/rq-scheduler-0.14.0.tar.gz", hash = "sha256:2d5a14a1ab217f8693184ebaa1fe03838edcbc70b4f76572721c0b33058cd023", size = 16582, upload-time = "2024-10-29T13:30:32.641Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/bb/d0/28cedca9f3b321f30e69d644c2dcd7097ec21570ec9606fde56750621300/rq_scheduler-0.14.0-py2.py3-none-any.whl", hash = "sha256:d4ec221a3d8c11b3ff55e041f09d9af1e17f3253db737b6b97e86ab20fc3dc0d", size = 13874, upload-time = "2024-10-29T13:30:30.449Z" }, -] - [[package]] name = "ruamel-yaml" version = "0.19.1" @@ -3293,18 +1553,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/4e/b2/920464c907b191e37469d477a1aa8bc048b8f36c4c1610dfa4ab87b39e18/ruff-0.15.15-py3-none-win_arm64.whl", hash = "sha256:3c8ceca6792f38196b8f589bc92eccd03eef286602da92e5dc05cc42ef6441b7", size = 11138498, upload-time = "2026-05-28T14:16:38.425Z" }, ] -[[package]] -name = "s3transfer" -version = "0.17.1" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "botocore" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/11/b3/bcdc2f58fa92592db511beda154c2c08d28f21f6c4637f06a42a24b10c21/s3transfer-0.17.1.tar.gz", hash = "sha256:042dd5e3b1b512355e35a23f0223e426b7042e80b97830ea2680ddce327fc45e", size = 159439, upload-time = "2026-05-26T19:45:01.714Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/85/dd/904873250a6554fbae40cddbf9198e3cc37a2f1319d5e1a5ce82fe269c17/s3transfer-0.17.1-py3-none-any.whl", hash = "sha256:5b9827d1044159bbb01b86ef8902760ea39281927f5de31de75e1d657177bf4c", size = 88264, upload-time = "2026-05-26T19:45:00.452Z" }, -] - [[package]] name = "scipy" version = "1.17.1" @@ -3336,15 +1584,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/07/39/338d9219c4e87f3e708f18857ecd24d22a0c3094752393319553096b98af/scipy-1.17.1-cp314-cp314t-win_arm64.whl", hash = "sha256:200e1050faffacc162be6a486a984a0497866ec54149a01270adc8a59b7c7d21", size = 25489165, upload-time = "2026-02-23T00:22:29.563Z" }, ] -[[package]] -name = "send2trash" -version = "2.1.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/c5/f0/184b4b5f8d00f2a92cf96eec8967a3d550b52cf94362dad1100df9e48d57/send2trash-2.1.0.tar.gz", hash = "sha256:1c72b39f09457db3c05ce1d19158c2cbef4c32b8bedd02c155e49282b7ea7459", size = 17255, upload-time = "2026-01-14T06:27:36.056Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/1c/78/504fdd027da3b84ff1aecd9f6957e65f35134534ccc6da8628eb71e76d3f/send2trash-2.1.0-py3-none-any.whl", hash = "sha256:0da2f112e6d6bb22de6aa6daa7e144831a4febf2a87261451c4ad849fe9a873c", size = 17610, upload-time = "2026-01-14T06:27:35.218Z" }, -] - [[package]] name = "sentry-sdk" version = "2.61.1" @@ -3358,34 +1597,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/df/54/c9218db183846e08efaf68534889ef42e499dde432778881104a42f7071b/sentry_sdk-2.61.1-py3-none-any.whl", hash = "sha256:fa36eaf4b8ad708f718500d4bdcc1532637526a22beb874d88cbc0a46458b5ae", size = 483735, upload-time = "2026-06-01T07:24:17.027Z" }, ] -[[package]] -name = "setproctitle" -version = "1.3.7" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/8d/48/49393a96a2eef1ab418b17475fb92b8fcfad83d099e678751b05472e69de/setproctitle-1.3.7.tar.gz", hash = "sha256:bc2bc917691c1537d5b9bca1468437176809c7e11e5694ca79a9ca12345dcb9e", size = 27002, upload-time = "2025-09-05T12:51:25.278Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/89/c7/43ac3a98414f91d1b86a276bc2f799ad0b4b010e08497a95750d5bc42803/setproctitle-1.3.7-cp314-cp314-macosx_10_13_universal2.whl", hash = "sha256:80c36c6a87ff72eabf621d0c79b66f3bdd0ecc79e873c1e9f0651ee8bf215c63", size = 18052, upload-time = "2025-09-05T12:50:17.928Z" }, - { url = "https://files.pythonhosted.org/packages/cd/2c/dc258600a25e1a1f04948073826bebc55e18dbd99dc65a576277a82146fa/setproctitle-1.3.7-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:b53602371a52b91c80aaf578b5ada29d311d12b8a69c0c17fbc35b76a1fd4f2e", size = 13071, upload-time = "2025-09-05T12:50:19.061Z" }, - { url = "https://files.pythonhosted.org/packages/ab/26/8e3bb082992f19823d831f3d62a89409deb6092e72fc6940962983ffc94f/setproctitle-1.3.7-cp314-cp314-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:fcb966a6c57cf07cc9448321a08f3be6b11b7635be502669bc1d8745115d7e7f", size = 33180, upload-time = "2025-09-05T12:50:20.395Z" }, - { url = "https://files.pythonhosted.org/packages/f1/af/ae692a20276d1159dd0cf77b0bcf92cbb954b965655eb4a69672099bb214/setproctitle-1.3.7-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:46178672599b940368d769474fe13ecef1b587d58bb438ea72b9987f74c56ea5", size = 34043, upload-time = "2025-09-05T12:50:22.454Z" }, - { url = "https://files.pythonhosted.org/packages/34/b2/6a092076324dd4dac1a6d38482bedebbff5cf34ef29f58585ec76e47bc9d/setproctitle-1.3.7-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:7f9e9e3ff135cbcc3edd2f4cf29b139f4aca040d931573102742db70ff428c17", size = 35892, upload-time = "2025-09-05T12:50:23.937Z" }, - { url = "https://files.pythonhosted.org/packages/1c/1a/8836b9f28cee32859ac36c3df85aa03e1ff4598d23ea17ca2e96b5845a8f/setproctitle-1.3.7-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:14c7eba8d90c93b0e79c01f0bd92a37b61983c27d6d7d5a3b5defd599113d60e", size = 32898, upload-time = "2025-09-05T12:50:25.617Z" }, - { url = "https://files.pythonhosted.org/packages/ef/22/8fabdc24baf42defb599714799d8445fe3ae987ec425a26ec8e80ea38f8e/setproctitle-1.3.7-cp314-cp314-musllinux_1_2_ppc64le.whl", hash = "sha256:9e64e98077fb30b6cf98073d6c439cd91deb8ebbf8fc62d9dbf52bd38b0c6ac0", size = 34308, upload-time = "2025-09-05T12:50:26.827Z" }, - { url = "https://files.pythonhosted.org/packages/15/1b/b9bee9de6c8cdcb3b3a6cb0b3e773afdb86bbbc1665a3bfa424a4294fda2/setproctitle-1.3.7-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:b91387cc0f02a00ac95dcd93f066242d3cca10ff9e6153de7ee07069c6f0f7c8", size = 32536, upload-time = "2025-09-05T12:50:28.5Z" }, - { url = "https://files.pythonhosted.org/packages/37/0c/75e5f2685a5e3eda0b39a8b158d6d8895d6daf3ba86dec9e3ba021510272/setproctitle-1.3.7-cp314-cp314-win32.whl", hash = "sha256:52b054a61c99d1b72fba58b7f5486e04b20fefc6961cd76722b424c187f362ed", size = 12731, upload-time = "2025-09-05T12:50:43.955Z" }, - { url = "https://files.pythonhosted.org/packages/d2/ae/acddbce90d1361e1786e1fb421bc25baeb0c22ef244ee5d0176511769ec8/setproctitle-1.3.7-cp314-cp314-win_amd64.whl", hash = "sha256:5818e4080ac04da1851b3ec71e8a0f64e3748bf9849045180566d8b736702416", size = 13464, upload-time = "2025-09-05T12:50:45.057Z" }, - { url = "https://files.pythonhosted.org/packages/01/6d/20886c8ff2e6d85e3cabadab6aab9bb90acaf1a5cfcb04d633f8d61b2626/setproctitle-1.3.7-cp314-cp314t-macosx_10_13_universal2.whl", hash = "sha256:6fc87caf9e323ac426910306c3e5d3205cd9f8dcac06d233fcafe9337f0928a3", size = 18062, upload-time = "2025-09-05T12:50:29.78Z" }, - { url = "https://files.pythonhosted.org/packages/9a/60/26dfc5f198715f1343b95c2f7a1c16ae9ffa45bd89ffd45a60ed258d24ea/setproctitle-1.3.7-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:6134c63853d87a4897ba7d5cc0e16abfa687f6c66fc09f262bb70d67718f2309", size = 13075, upload-time = "2025-09-05T12:50:31.604Z" }, - { url = "https://files.pythonhosted.org/packages/21/9c/980b01f50d51345dd513047e3ba9e96468134b9181319093e61db1c47188/setproctitle-1.3.7-cp314-cp314t-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:1403d2abfd32790b6369916e2313dffbe87d6b11dca5bbd898981bcde48e7a2b", size = 34744, upload-time = "2025-09-05T12:50:32.777Z" }, - { url = "https://files.pythonhosted.org/packages/86/b4/82cd0c86e6d1c4538e1a7eb908c7517721513b801dff4ba3f98ef816a240/setproctitle-1.3.7-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:e7c5bfe4228ea22373e3025965d1a4116097e555ee3436044f5c954a5e63ac45", size = 35589, upload-time = "2025-09-05T12:50:34.13Z" }, - { url = "https://files.pythonhosted.org/packages/8a/4f/9f6b2a7417fd45673037554021c888b31247f7594ff4bd2239918c5cd6d0/setproctitle-1.3.7-cp314-cp314t-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:585edf25e54e21a94ccb0fe81ad32b9196b69ebc4fc25f81da81fb8a50cca9e4", size = 37698, upload-time = "2025-09-05T12:50:35.524Z" }, - { url = "https://files.pythonhosted.org/packages/20/92/927b7d4744aac214d149c892cb5fa6dc6f49cfa040cb2b0a844acd63dcaf/setproctitle-1.3.7-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:96c38cdeef9036eb2724c2210e8d0b93224e709af68c435d46a4733a3675fee1", size = 34201, upload-time = "2025-09-05T12:50:36.697Z" }, - { url = "https://files.pythonhosted.org/packages/0a/0c/fd4901db5ba4b9d9013e62f61d9c18d52290497f956745cd3e91b0d80f90/setproctitle-1.3.7-cp314-cp314t-musllinux_1_2_ppc64le.whl", hash = "sha256:45e3ef48350abb49cf937d0a8ba15e42cee1e5ae13ca41a77c66d1abc27a5070", size = 35801, upload-time = "2025-09-05T12:50:38.314Z" }, - { url = "https://files.pythonhosted.org/packages/e7/e3/54b496ac724e60e61cc3447f02690105901ca6d90da0377dffe49ff99fc7/setproctitle-1.3.7-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:1fae595d032b30dab4d659bece20debd202229fce12b55abab978b7f30783d73", size = 33958, upload-time = "2025-09-05T12:50:39.841Z" }, - { url = "https://files.pythonhosted.org/packages/ea/a8/c84bb045ebf8c6fdc7f7532319e86f8380d14bbd3084e6348df56bdfe6fd/setproctitle-1.3.7-cp314-cp314t-win32.whl", hash = "sha256:02432f26f5d1329ab22279ff863c83589894977063f59e6c4b4845804a08f8c2", size = 12745, upload-time = "2025-09-05T12:50:41.377Z" }, - { url = "https://files.pythonhosted.org/packages/08/b6/3a5a4f9952972791a9114ac01dfc123f0df79903577a3e0a7a404a695586/setproctitle-1.3.7-cp314-cp314t-win_amd64.whl", hash = "sha256:cbc388e3d86da1f766d8fc2e12682e446064c01cea9f88a88647cfe7c011de6a", size = 13469, upload-time = "2025-09-05T12:50:42.67Z" }, -] - [[package]] name = "shellingham" version = "1.5.4" @@ -3404,15 +1615,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/b7/ce/149a00dd41f10bc29e5921b496af8b574d8413afcd5e30dfa0ed46c2cc5e/six-1.17.0-py2.py3-none-any.whl", hash = "sha256:4721f391ed90541fddacab5acf947aa0d3dc7d27b2e1e8eda2be8970586c3274", size = 11050, upload-time = "2024-12-04T17:35:26.475Z" }, ] -[[package]] -name = "soupsieve" -version = "2.8.4" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/47/2c/0a5f6f8ee0d5589e48c7640213ed5175d52cf540a06725b628cc1a45d6ce/soupsieve-2.8.4.tar.gz", hash = "sha256:e121fd02e975c695e4e9e8774a5ee35d74714b59307868dcc5319ad2d9e3328e", size = 121110, upload-time = "2026-05-24T13:55:57.154Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/5e/f5/0c41cb68dcae6b7de4fac4188a3a9589e21fb31df21ea3a2e888db95e6c9/soupsieve-2.8.4-py3-none-any.whl", hash = "sha256:e7e6b0769c8f51ed59acab6e994b00621096cfb1c640a7509295987388fbaf65", size = 37304, upload-time = "2026-05-24T13:55:55.406Z" }, -] - [[package]] name = "spglib" version = "2.7.0" @@ -3433,20 +1635,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/28/97/459b37c3802633f77c883883c75f5d4429b601ae8d930410b999c4e1dafb/spglib-2.7.0-cp314-cp314t-win_amd64.whl", hash = "sha256:cb77daaf9dd5d48d523a888f37cebd47fa63ff28dfcf1aac2b031b914f9ed55a", size = 696536, upload-time = "2025-12-29T09:48:13.885Z" }, ] -[[package]] -name = "stack-data" -version = "0.6.3" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "asttokens" }, - { name = "executing" }, - { name = "pure-eval" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/28/e3/55dcc2cfbc3ca9c29519eb6884dd1415ecb53b0e934862d3559ddcb7e20b/stack_data-0.6.3.tar.gz", hash = "sha256:836a778de4fec4dcd1dcd89ed8abff8a221f58308462e1c4aa2a3cf30148f0b9", size = 44707, upload-time = "2023-09-30T13:58:05.479Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/f1/7b/ce1eafaf1a76852e2ec9b22edecf1daa58175c090266e9f6c64afcd81d91/stack_data-0.6.3-py3-none-any.whl", hash = "sha256:d5558e0c25a4cb0853cddad3d77da9891a08cb85dd9f9f91b9f8cd66e511e695", size = 24521, upload-time = "2023-09-30T13:58:03.53Z" }, -] - [[package]] name = "starlette" version = "1.2.0" @@ -3468,15 +1656,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/a8/45/a132b9074aa18e799b891b91ad72133c98d8042c70f6240e4c5f9dabee2f/structlog-25.5.0-py3-none-any.whl", hash = "sha256:a8453e9b9e636ec59bd9e79bbd4a72f025981b3ba0f5837aebf48f02f37a7f9f", size = 72510, upload-time = "2025-10-27T08:28:21.535Z" }, ] -[[package]] -name = "supervisor" -version = "4.3.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/a9/b5/37e7a3706de436a8a2d75334711dad1afb4ddffab09f25e31d89e467542f/supervisor-4.3.0.tar.gz", hash = "sha256:4a2bf149adf42997e1bb44b70c43b613275ec9852c3edacca86a9166b27e945e", size = 468912, upload-time = "2025-08-23T18:25:02.418Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/0e/65/5e726c372da8a5e35022a94388b12252710aad0c2351699c3d76ae8dba78/supervisor-4.3.0-py2.py3-none-any.whl", hash = "sha256:0bcb763fddafba410f35cbde226aa7f8514b9fb82eb05a0c85f6588d1c13f8db", size = 320736, upload-time = "2025-08-23T18:25:00.767Z" }, -] - [[package]] name = "sympy" version = "1.14.0" @@ -3498,49 +1677,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/99/55/db07de81b5c630da5cbf5c7df646580ca26dfaefa593667fc6f2fe016d2e/tabulate-0.10.0-py3-none-any.whl", hash = "sha256:f0b0622e567335c8fabaaa659f1b33bcb6ddfe2e496071b743aa113f8774f2d3", size = 39814, upload-time = "2026-03-04T18:55:31.284Z" }, ] -[[package]] -name = "terminado" -version = "0.18.1" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "ptyprocess", marker = "os_name != 'nt'" }, - { name = "pywinpty", marker = "os_name == 'nt'" }, - { name = "tornado" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/8a/11/965c6fd8e5cc254f1fe142d547387da17a8ebfd75a3455f637c663fb38a0/terminado-0.18.1.tar.gz", hash = "sha256:de09f2c4b85de4765f7714688fff57d3e75bad1f909b589fde880460c753fd2e", size = 32701, upload-time = "2024-03-12T14:34:39.026Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/6a/9e/2064975477fdc887e47ad42157e214526dcad8f317a948dee17e1659a62f/terminado-0.18.1-py3-none-any.whl", hash = "sha256:a4468e1b37bb318f8a86514f65814e1afc977cf29b3992a4500d9dd305dcceb0", size = 14154, upload-time = "2024-03-12T14:34:36.569Z" }, -] - -[[package]] -name = "tinycss2" -version = "1.4.0" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "webencodings" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/7a/fd/7a5ee21fd08ff70d3d33a5781c255cbe779659bd03278feb98b19ee550f4/tinycss2-1.4.0.tar.gz", hash = "sha256:10c0972f6fc0fbee87c3edb76549357415e94548c1ae10ebccdea16fb404a9b7", size = 87085, upload-time = "2024-10-24T14:58:29.895Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/e6/34/ebdc18bae6aa14fbee1a08b63c015c72b64868ff7dae68808ab500c492e2/tinycss2-1.4.0-py3-none-any.whl", hash = "sha256:3a49cf47b7675da0b15d0c6e1df8df4ebd96e9394bb905a5775adb0d884c5289", size = 26610, upload-time = "2024-10-24T14:58:28.029Z" }, -] - -[[package]] -name = "tornado" -version = "6.5.6" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/50/57/6d7303a77ae439d9189108f76c0c4fd89ee5e2cc8387bffb55232565c4ed/tornado-6.5.6.tar.gz", hash = "sha256:9a365179fe8ff6b8766f602c0f67c185d778193e9bdd828b19f0b6ed7764177d", size = 518139, upload-time = "2026-05-27T15:35:54.646Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/1b/0d/b4f481e18c5a51864e6d12b9a05ecf72919696680b747c958c3fc1f4fbae/tornado-6.5.6-cp39-abi3-macosx_10_9_universal2.whl", hash = "sha256:65fcfaafb079435c2c19dc9e07c0f1cf0fa9051759ed0a7d0a3ba7ea7f64919c", size = 447737, upload-time = "2026-05-27T15:35:38.122Z" }, - { url = "https://files.pythonhosted.org/packages/9e/9c/5430c39fcab1144d35860f457b15e9c08b4bc7ac86764354204e983d6183/tornado-6.5.6-cp39-abi3-macosx_10_9_x86_64.whl", hash = "sha256:38bc01b4acacded2de63ae78023548e41ebe6fbed3ec05a796d7ae3ad893887e", size = 445899, upload-time = "2026-05-27T15:35:40.519Z" }, - { url = "https://files.pythonhosted.org/packages/8b/79/fa7e14a2f939c807a8d30619b4eb604eab219601b78792516ebe22d40cf9/tornado-6.5.6-cp39-abi3-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:b942e6a137fda31ff54bf8e6e2c8d1c37f1f50583f3ed53fb840b53b9601d104", size = 448964, upload-time = "2026-05-27T15:35:42.106Z" }, - { url = "https://files.pythonhosted.org/packages/a7/71/bd67d5f5199f937dafe03a49a37989f60f600ff6fef34c79412a829d97bd/tornado-6.5.6-cp39-abi3-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:8666946e70171b8c3f1fc9b7876fac492e84822c4c7f3746f4e8f8bc9ac92a79", size = 449935, upload-time = "2026-05-27T15:35:43.906Z" }, - { url = "https://files.pythonhosted.org/packages/cc/a4/c24388c9cf5b3c3a513b56a158af9f23092c9a2810d789e294310797df21/tornado-6.5.6-cp39-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:1c34cfab7ad6d104f052f55de06d39bbafc5885cfeb4da688803308dbcfa90b7", size = 449767, upload-time = "2026-05-27T15:35:45.793Z" }, - { url = "https://files.pythonhosted.org/packages/a5/eb/6a07ad550c3f7b37244bd0becdf293ec3d3e961783d8b720a97df50de1b2/tornado-6.5.6-cp39-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:385f35e4e22fb52551dfcda4cdc8c30c61c2c001aef5ddad99cdfe116952efd3", size = 449174, upload-time = "2026-05-27T15:35:47.485Z" }, - { url = "https://files.pythonhosted.org/packages/bb/84/3469e098dccdb6763130e06aacd786bb4363fca7b590a55c101ddf34ed30/tornado-6.5.6-cp39-abi3-win32.whl", hash = "sha256:db475f1b67b2809b10bb16264829087724ca8d24fe4ed47f7b8675cae453ef86", size = 450230, upload-time = "2026-05-27T15:35:49.322Z" }, - { url = "https://files.pythonhosted.org/packages/d2/3c/273a04e0b9dd9016f1685cca0c1c8795a71ac88a34a8c889a0b443483226/tornado-6.5.6-cp39-abi3-win_amd64.whl", hash = "sha256:6739bf1e8eb09230f1280ddbd3236f0309db70f2c551a8dbc40f62babdf82f79", size = 450667, upload-time = "2026-05-27T15:35:51.194Z" }, - { url = "https://files.pythonhosted.org/packages/02/98/0cffe22a224f60c5fb1e3aa0b76f9da2e1ca78b0e9545e3d077c68ce60a7/tornado-6.5.6-cp39-abi3-win_arm64.whl", hash = "sha256:2543597b24a695d72338a9a77818362d72387c03ae173f1f169eadc5c91466ac", size = 449690, upload-time = "2026-05-27T15:35:52.902Z" }, -] - [[package]] name = "tqdm" version = "4.67.3" @@ -3553,15 +1689,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/16/e1/3079a9ff9b8e11b846c6ac5c8b5bfb7ff225eee721825310c91b3b50304f/tqdm-4.67.3-py3-none-any.whl", hash = "sha256:ee1e4c0e59148062281c49d80b25b67771a127c85fc9676d3be5f243206826bf", size = 78374, upload-time = "2026-02-03T17:35:50.982Z" }, ] -[[package]] -name = "traitlets" -version = "5.15.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/1b/22/40f55b26baeab80c2d7b3f1db0682f8954e4617fee7d90ce634022ef05c6/traitlets-5.15.0.tar.gz", hash = "sha256:4fead733f81cf1c4c938e06f8ca4633896833c9d89eff878159457f4d4392971", size = 163197, upload-time = "2026-05-06T08:05:58.016Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/da/98/a9937a969d018a23badfea0b381f66783649d48e0ea6c41923265c3cbeb3/traitlets-5.15.0-py3-none-any.whl", hash = "sha256:fb36a18867a6803deab09f3c5e0fa81bb7b26a5c9e82501c9933f759166eff40", size = 85877, upload-time = "2026-05-06T08:05:55.853Z" }, -] - [[package]] name = "truststore" version = "0.10.4" @@ -3616,18 +1743,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/ce/e4/dccd7f47c4b64213ac01ef921a1337ee6e30e8c6466046018326977efd95/tzdata-2026.2-py2.py3-none-any.whl", hash = "sha256:bbe9af844f658da81a5f95019480da3a89415801f6cc966806612cc7169bffe7", size = 349321, upload-time = "2026-04-24T15:22:05.876Z" }, ] -[[package]] -name = "tzlocal" -version = "5.3.1" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "tzdata", marker = "sys_platform == 'win32'" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/8b/2e/c14812d3d4d9cd1773c6be938f89e5735a1f11a9f184ac3639b93cef35d5/tzlocal-5.3.1.tar.gz", hash = "sha256:cceffc7edecefea1f595541dbd6e990cb1ea3d19bf01b2809f362a03dd7921fd", size = 30761, upload-time = "2025-03-05T21:17:41.549Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/c2/14/e2a54fabd4f08cd7af1c07030603c3356b74da07f7cc056e600436edfa17/tzlocal-5.3.1-py3-none-any.whl", hash = "sha256:eb1a66c3ef5847adf7a834f1be0800581b683b5608e74f86ecbcef8ab91bb85d", size = 18026, upload-time = "2025-03-05T21:17:39.857Z" }, -] - [[package]] name = "uncertainties" version = "3.2.3" @@ -3637,15 +1752,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/8f/5e/f1e1dd319e35e962a4e00b33150a8868b6329cc1d19fd533436ba5488f09/uncertainties-3.2.3-py3-none-any.whl", hash = "sha256:313353900d8f88b283c9bad81e7d2b2d3d4bcc330cbace35403faaed7e78890a", size = 60118, upload-time = "2025-04-21T19:58:26.864Z" }, ] -[[package]] -name = "uri-template" -version = "1.3.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/31/c7/0336f2bd0bcbada6ccef7aaa25e443c118a704f828a0620c6fa0207c1b64/uri-template-1.3.0.tar.gz", hash = "sha256:0e00f8eb65e18c7de20d595a14336e9f337ead580c70934141624b6d1ffdacc7", size = 21678, upload-time = "2023-06-21T01:49:05.374Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/e7/00/3fca040d7cf8a32776d3d81a00c8ee7457e00f80c649f1e4a863c8321ae9/uri_template-1.3.0-py3-none-any.whl", hash = "sha256:a44a133ea12d44a0c0f06d7d42a52d71282e77e2f937d8abd5655b8d56fc1363", size = 11140, upload-time = "2023-06-21T01:49:03.467Z" }, -] - [[package]] name = "urllib3" version = "2.7.0" @@ -3746,42 +1852,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/46/4b/95ab2f256bb4af3cb2eb23b9317bda984ee6e0f11733a5c004a6c95b06e3/watchfiles-1.2.0-cp315-cp315-musllinux_1_1_x86_64.whl", hash = "sha256:922c0e019fe68b3ae392965a766b02a71ba1168c932cebc3733cd52c5fe5b377", size = 657684, upload-time = "2026-05-18T04:31:32.027Z" }, ] -[[package]] -name = "wcwidth" -version = "0.7.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/2c/ee/afaf0f85a9a18fe47a67f1e4422ed6cf1fe642f0ae0a2f81166231303c52/wcwidth-0.7.0.tar.gz", hash = "sha256:90e3a7ea092341c44b99562e75d09e4d5160fe7a3974c6fb842a101a95e7eed0", size = 182132, upload-time = "2026-05-02T16:04:12.653Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/41/52/e465037f5375f43533d1a80b6923955201596a99142ed524d77b571a1418/wcwidth-0.7.0-py3-none-any.whl", hash = "sha256:5d69154c429a82910e241c738cd0e2976fac8a2dd47a1a805f4afed1c0f136f2", size = 110825, upload-time = "2026-05-02T16:04:11.033Z" }, -] - -[[package]] -name = "webcolors" -version = "25.10.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/1d/7a/eb316761ec35664ea5174709a68bbd3389de60d4a1ebab8808bfc264ed67/webcolors-25.10.0.tar.gz", hash = "sha256:62abae86504f66d0f6364c2a8520de4a0c47b80c03fc3a5f1815fedbef7c19bf", size = 53491, upload-time = "2025-10-31T07:51:03.977Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/e2/cc/e097523dd85c9cf5d354f78310927f1656c422bd7b2613b2db3e3f9a0f2c/webcolors-25.10.0-py3-none-any.whl", hash = "sha256:032c727334856fc0b968f63daa252a1ac93d33db2f5267756623c210e57a4f1d", size = 14905, upload-time = "2025-10-31T07:51:01.778Z" }, -] - -[[package]] -name = "webencodings" -version = "0.5.1" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/0b/02/ae6ceac1baeda530866a85075641cec12989bd8d31af6d5ab4a3e8c92f47/webencodings-0.5.1.tar.gz", hash = "sha256:b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923", size = 9721, upload-time = "2017-04-05T20:21:34.189Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/f4/24/2a3e3df732393fed8b3ebf2ec078f05546de641fe1b667ee316ec1dcf3b7/webencodings-0.5.1-py2.py3-none-any.whl", hash = "sha256:a0af1213f3c2226497a97e2b3aa01a7e4bee4f403f95be16fc9acd2947514a78", size = 11774, upload-time = "2017-04-05T20:21:32.581Z" }, -] - -[[package]] -name = "websocket-client" -version = "1.9.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/2c/41/aa4bf9664e4cda14c3b39865b12251e8e7d239f4cd0e3cc1b6c2ccde25c1/websocket_client-1.9.0.tar.gz", hash = "sha256:9e813624b6eb619999a97dc7958469217c3176312b3a16a4bd1bc7e08a46ec98", size = 70576, upload-time = "2025-10-07T21:16:36.495Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/34/db/b10e48aa8fff7407e67470363eac595018441cf32d5e1001567a7aeba5d2/websocket_client-1.9.0-py3-none-any.whl", hash = "sha256:af248a825037ef591efbf6ed20cc5faa03d3b47b9e5a2230a529eeee1c1fc3ef", size = 82616, upload-time = "2025-10-07T21:16:34.951Z" }, -] - [[package]] name = "websockets" version = "16.0" @@ -3809,18 +1879,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/6f/28/258ebab549c2bf3e64d2b0217b973467394a9cea8c42f70418ca2c5d0d2e/websockets-16.0-py3-none-any.whl", hash = "sha256:1637db62fad1dc833276dded54215f2c7fa46912301a24bd94d45d46a011ceec", size = 171598, upload-time = "2026-01-10T09:23:45.395Z" }, ] -[[package]] -name = "werkzeug" -version = "3.1.8" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "markupsafe" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/dd/b2/381be8cfdee792dd117872481b6e378f85c957dd7c5bca38897b08f765fd/werkzeug-3.1.8.tar.gz", hash = "sha256:9bad61a4268dac112f1c5cd4630a56ede601b6ed420300677a869083d70a4c44", size = 875852, upload-time = "2026-04-02T18:49:14.268Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/93/8c/2e650f2afeb7ee576912636c23ddb621c91ac6a98e66dc8d29c3c69446e1/werkzeug-3.1.8-py3-none-any.whl", hash = "sha256:63a77fb8892bf28ebc3178683445222aa500e48ebad5ec77b0ad80f8726b1f50", size = 226459, upload-time = "2026-04-02T18:49:12.72Z" }, -] - [[package]] name = "wrapt" version = "2.2.1" @@ -3851,56 +1909,3 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/9f/c0/782b86e28d1ceebeb74cccea12d2cd3d2ba0bd68e3dec20b1bc5873f6127/wrapt-2.2.1-cp314-cp314t-win_arm64.whl", hash = "sha256:f70db64e8266d7c45d3b735f2e08eeb434b5e03da9a479ae42b2e2e486a21a00", size = 80722, upload-time = "2026-05-22T14:49:23.59Z" }, { url = "https://files.pythonhosted.org/packages/53/46/29ac9daf11a86c22a8c38cd9236c62928ccae83f7ceb06bd3b0467cf9d05/wrapt-2.2.1-py3-none-any.whl", hash = "sha256:3aafea2975caef8ca49400640dde02cc7426e798f24870ed01f490bc3cffd32f", size = 61000, upload-time = "2026-05-22T14:49:41.593Z" }, ] - -[[package]] -name = "zope-event" -version = "6.2" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/93/41/faa10af34d48d9cd6fa0249a1162943ad84a9590bd1a06939981e6640416/zope_event-6.2.tar.gz", hash = "sha256:b97d5d6327067ee6b9dfcbdf606ade9ade70991e19c162e808ea39e5fcf0f8d3", size = 18958, upload-time = "2026-04-28T06:24:10.578Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/9e/33/848922889e946d4befc415c219fe516af75c49555d8e736e183bfd30db42/zope_event-6.2-py3-none-any.whl", hash = "sha256:5e755153ac4faf64c10a4b6dd3307680166a3edf65b38df22df592610f8fa874", size = 6525, upload-time = "2026-04-28T06:24:09.176Z" }, -] - -[[package]] -name = "zope-interface" -version = "8.5" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/08/dc/50550cfcbb2ea3cbca5f1d7ed05c8aa840f831a0f2d63aec0a953f7c590e/zope_interface-8.5.tar.gz", hash = "sha256:7a3ba1c5877f0f3e3906b02ddf793abed2becc2948116414ce0e1dd820b68d6d", size = 257957, upload-time = "2026-05-26T06:50:14.574Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/d4/19/5032e954827fdf02db2d2f49737ac4378bb9cfc2cd95a8f2e2a5ae2ec01a/zope_interface-8.5-cp314-cp314-macosx_10_9_x86_64.whl", hash = "sha256:ffaecf013251a89d0de6feb49a46eba48ad8cbbf8a40aeb6045e459e7bec6784", size = 212597, upload-time = "2026-05-26T06:49:51.63Z" }, - { url = "https://files.pythonhosted.org/packages/f1/53/3ef644012cf8a6a234a2d6134aab5a5c65ac5467c86296865501d4fbc406/zope_interface-8.5-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:126fa9d1c52295ae076d4cf968634f0a1826afa408a20808b57ff72877b8f69f", size = 212626, upload-time = "2026-05-26T06:49:53.236Z" }, - { url = "https://files.pythonhosted.org/packages/32/67/bc8b4f465d388039255003e230c284a175cedf1203c692f23cb7bff64efe/zope_interface-8.5-cp314-cp314-manylinux1_i686.manylinux2014_i686.manylinux_2_17_i686.manylinux_2_5_i686.whl", hash = "sha256:3090e3a663d20194756a59a272e0c8508b889341e31d5894223331fe6b4f9b21", size = 266827, upload-time = "2026-05-26T06:49:54.873Z" }, - { url = "https://files.pythonhosted.org/packages/a7/eb/37d05b935ede53d79690fecc8d201440084418e590bcfc05f384451c7593/zope_interface-8.5-cp314-cp314-manylinux1_x86_64.manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:9342fb74e2afefdb081bf1df727d209ea56995c6e13f5a0540e6d7aff4beafb8", size = 270139, upload-time = "2026-05-26T06:49:57.116Z" }, - { url = "https://files.pythonhosted.org/packages/8b/0b/fd0c54579e2ce8dc6cf1a757903f3374bc6fbda929a46af9e0f53cb0e5f0/zope_interface-8.5-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:6c54725d818f1b57a7efb8b16528326e1f3c257b602b32393fd255c45af8799d", size = 270338, upload-time = "2026-05-26T06:49:58.698Z" }, - { url = "https://files.pythonhosted.org/packages/c1/1d/c420dcd777bb761067ea92879ac766694a5ca78608185f1aecea64cbfc11/zope_interface-8.5-cp314-cp314-win_amd64.whl", hash = "sha256:29d74febbae1afeb6834c4ccbf42e242a673c860060f09e53142825270456140", size = 215789, upload-time = "2026-05-26T06:50:00.405Z" }, - { url = "https://files.pythonhosted.org/packages/62/94/50b5eb8f94e527edceac14f9955e58917424ea79bb572ddc18548561cbc2/zope_interface-8.5-cp314-cp314-win_arm64.whl", hash = "sha256:633c8c49396f38df030340797c533e9fe460d1b5d1e42d88e55e938e525f548c", size = 213757, upload-time = "2026-05-26T06:50:01.973Z" }, - { url = "https://files.pythonhosted.org/packages/17/6f/5d5f32c4dfcdb16ce2ec5363da686840f13c13e1a1214cb70b49e1cd6d9f/zope_interface-8.5-cp314-cp314t-macosx_10_9_x86_64.whl", hash = "sha256:133999820fdbae513c36c03d6f29ef87317aaa3edef39112222b155083664714", size = 213591, upload-time = "2026-05-26T06:50:03.529Z" }, - { url = "https://files.pythonhosted.org/packages/f3/55/de0c3459ff717fce3342f9a29464c281fdeb0d36c3171ee88d119d5f0650/zope_interface-8.5-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:8bd75c96966e573232f0599deaff717564828031c7f05563ccc1ac35c5ee0304", size = 213733, upload-time = "2026-05-26T06:50:05.101Z" }, - { url = "https://files.pythonhosted.org/packages/c2/95/d97430abd5ae9677e8b9295b58720c0064a5b557dbb6b8bf5928484cf0d8/zope_interface-8.5-cp314-cp314t-manylinux1_i686.manylinux2014_i686.manylinux_2_17_i686.manylinux_2_5_i686.whl", hash = "sha256:14b0e9799351d4c34fe99afd67f0cdd76e55ba15c66a98699d5fc22ea8241e08", size = 294905, upload-time = "2026-05-26T06:50:07.384Z" }, - { url = "https://files.pythonhosted.org/packages/41/ec/a0f8f3dad6e74992f4654bdd94802be0929eabca7b871cac3b6fbb5e961b/zope_interface-8.5-cp314-cp314t-manylinux1_x86_64.manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:0cd6a732ac84b94eb1ef9222a117347a27efd294ee16810ffdf7ecd307677ed5", size = 300885, upload-time = "2026-05-26T06:50:08.997Z" }, - { url = "https://files.pythonhosted.org/packages/0f/da/6881b48803a0ee8d23eb5efa30fce3ed218a2bd9de5758ce489d224fee81/zope_interface-8.5-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:798b7c87d0e59a7d5d086d642208d0d8700ff0d55c4029134b3c479c3bfb110f", size = 304672, upload-time = "2026-05-26T06:50:10.563Z" }, - { url = "https://files.pythonhosted.org/packages/2e/0e/b4c01320859ff1d585438bc231fd60bd258d096359bccf6654fecdf0cffb/zope_interface-8.5-cp314-cp314t-win_amd64.whl", hash = "sha256:0fc3a9d45f114d27eaa1e53beeb144533689edca8a9f66505b1e8e8b3f075e42", size = 217241, upload-time = "2026-05-26T06:50:12.171Z" }, -] - -[[package]] -name = "zstandard" -version = "0.25.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/fd/aa/3e0508d5a5dd96529cdc5a97011299056e14c6505b678fd58938792794b1/zstandard-0.25.0.tar.gz", hash = "sha256:7713e1179d162cf5c7906da876ec2ccb9c3a9dcbdffef0cc7f70c3667a205f0b", size = 711513, upload-time = "2025-09-14T22:15:54.002Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/3d/5c/f8923b595b55fe49e30612987ad8bf053aef555c14f05bb659dd5dbe3e8a/zstandard-0.25.0-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:e29f0cf06974c899b2c188ef7f783607dbef36da4c242eb6c82dcd8b512855e3", size = 795887, upload-time = "2025-09-14T22:17:54.198Z" }, - { url = "https://files.pythonhosted.org/packages/8d/09/d0a2a14fc3439c5f874042dca72a79c70a532090b7ba0003be73fee37ae2/zstandard-0.25.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:05df5136bc5a011f33cd25bc9f506e7426c0c9b3f9954f056831ce68f3b6689f", size = 640658, upload-time = "2025-09-14T22:17:55.423Z" }, - { url = "https://files.pythonhosted.org/packages/5d/7c/8b6b71b1ddd517f68ffb55e10834388d4f793c49c6b83effaaa05785b0b4/zstandard-0.25.0-cp314-cp314-manylinux2010_i686.manylinux_2_12_i686.manylinux_2_28_i686.whl", hash = "sha256:f604efd28f239cc21b3adb53eb061e2a205dc164be408e553b41ba2ffe0ca15c", size = 5379849, upload-time = "2025-09-14T22:17:57.372Z" }, - { url = "https://files.pythonhosted.org/packages/a4/86/a48e56320d0a17189ab7a42645387334fba2200e904ee47fc5a26c1fd8ca/zstandard-0.25.0-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:223415140608d0f0da010499eaa8ccdb9af210a543fac54bce15babbcfc78439", size = 5058095, upload-time = "2025-09-14T22:17:59.498Z" }, - { url = "https://files.pythonhosted.org/packages/f8/ad/eb659984ee2c0a779f9d06dbfe45e2dc39d99ff40a319895df2d3d9a48e5/zstandard-0.25.0-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:2e54296a283f3ab5a26fc9b8b5d4978ea0532f37b231644f367aa588930aa043", size = 5551751, upload-time = "2025-09-14T22:18:01.618Z" }, - { url = "https://files.pythonhosted.org/packages/61/b3/b637faea43677eb7bd42ab204dfb7053bd5c4582bfe6b1baefa80ac0c47b/zstandard-0.25.0-cp314-cp314-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:ca54090275939dc8ec5dea2d2afb400e0f83444b2fc24e07df7fdef677110859", size = 6364818, upload-time = "2025-09-14T22:18:03.769Z" }, - { url = "https://files.pythonhosted.org/packages/31/dc/cc50210e11e465c975462439a492516a73300ab8caa8f5e0902544fd748b/zstandard-0.25.0-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:e09bb6252b6476d8d56100e8147b803befa9a12cea144bbe629dd508800d1ad0", size = 5560402, upload-time = "2025-09-14T22:18:05.954Z" }, - { url = "https://files.pythonhosted.org/packages/c9/ae/56523ae9c142f0c08efd5e868a6da613ae76614eca1305259c3bf6a0ed43/zstandard-0.25.0-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:a9ec8c642d1ec73287ae3e726792dd86c96f5681eb8df274a757bf62b750eae7", size = 4955108, upload-time = "2025-09-14T22:18:07.68Z" }, - { url = "https://files.pythonhosted.org/packages/98/cf/c899f2d6df0840d5e384cf4c4121458c72802e8bda19691f3b16619f51e9/zstandard-0.25.0-cp314-cp314-musllinux_1_2_i686.whl", hash = "sha256:a4089a10e598eae6393756b036e0f419e8c1d60f44a831520f9af41c14216cf2", size = 5269248, upload-time = "2025-09-14T22:18:09.753Z" }, - { url = "https://files.pythonhosted.org/packages/1b/c0/59e912a531d91e1c192d3085fc0f6fb2852753c301a812d856d857ea03c6/zstandard-0.25.0-cp314-cp314-musllinux_1_2_ppc64le.whl", hash = "sha256:f67e8f1a324a900e75b5e28ffb152bcac9fbed1cc7b43f99cd90f395c4375344", size = 5430330, upload-time = "2025-09-14T22:18:11.966Z" }, - { url = "https://files.pythonhosted.org/packages/a0/1d/7e31db1240de2df22a58e2ea9a93fc6e38cc29353e660c0272b6735d6669/zstandard-0.25.0-cp314-cp314-musllinux_1_2_s390x.whl", hash = "sha256:9654dbc012d8b06fc3d19cc825af3f7bf8ae242226df5f83936cb39f5fdc846c", size = 5811123, upload-time = "2025-09-14T22:18:13.907Z" }, - { url = "https://files.pythonhosted.org/packages/f6/49/fac46df5ad353d50535e118d6983069df68ca5908d4d65b8c466150a4ff1/zstandard-0.25.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:4203ce3b31aec23012d3a4cf4a2ed64d12fea5269c49aed5e4c3611b938e4088", size = 5359591, upload-time = "2025-09-14T22:18:16.465Z" }, - { url = "https://files.pythonhosted.org/packages/c2/38/f249a2050ad1eea0bb364046153942e34abba95dd5520af199aed86fbb49/zstandard-0.25.0-cp314-cp314-win32.whl", hash = "sha256:da469dc041701583e34de852d8634703550348d5822e66a0c827d39b05365b12", size = 444513, upload-time = "2025-09-14T22:18:20.61Z" }, - { url = "https://files.pythonhosted.org/packages/3a/43/241f9615bcf8ba8903b3f0432da069e857fc4fd1783bd26183db53c4804b/zstandard-0.25.0-cp314-cp314-win_amd64.whl", hash = "sha256:c19bcdd826e95671065f8692b5a4aa95c52dc7a02a4c5a0cac46deb879a017a2", size = 516118, upload-time = "2025-09-14T22:18:17.849Z" }, - { url = "https://files.pythonhosted.org/packages/f0/ef/da163ce2450ed4febf6467d77ccb4cd52c4c30ab45624bad26ca0a27260c/zstandard-0.25.0-cp314-cp314-win_arm64.whl", hash = "sha256:d7541afd73985c630bafcd6338d2518ae96060075f9463d7dc14cfb33514383d", size = 476940, upload-time = "2025-09-14T22:18:19.088Z" }, -] From 971b2559398fbee888348f82e80130b9f83afc7b Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 4 Jun 2026 10:34:10 -0700 Subject: [PATCH 289/591] Reordered deps --- mpcontribs-api/pyproject.toml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mpcontribs-api/pyproject.toml b/mpcontribs-api/pyproject.toml index f0e1650603..6305ba69e1 100644 --- a/mpcontribs-api/pyproject.toml +++ b/mpcontribs-api/pyproject.toml @@ -26,17 +26,17 @@ authors = [ {name="The Materials Project", email="feedback@materialsproject.org"}, ] dependencies = [ - #"jinja2", - #"pint>=0.24", + # "jinja2", + # "pint>=0.24", # "psycopg2-binary", - "pymatgen", - #"rq<=2.3.2", # see https://github.com/rq/Flask-RQ2/issues/620 - #"supervisor", + # "rq<=2.3.2", # see https://github.com/rq/Flask-RQ2/issues/620 + # "supervisor", # "setproctitle", # "uncertainties", # "websocket_client", # "zstandard", "fastapi[standard]>=0.136.3", + "pymatgen", "pymongo>=4.17.0", "pydantic-settings>=2.14.1", "structlog>=25.5.0", From 3705410a8936bbc40e99326551519b061e9b26a2 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 4 Jun 2026 11:11:08 -0700 Subject: [PATCH 290/591] fields argument in routers now expects a list instead of comma delimited string --- .../domains/contributions/models.py | 12 ++++++++ .../domains/contributions/router.py | 3 +- .../mpcontribs_api/domains/projects/models.py | 4 +++ .../mpcontribs_api/domains/projects/router.py | 7 +++-- .../src/mpcontribs_api/projection.py | 8 +++--- mpcontribs-api/src/mpcontribs_api/types.py | 2 ++ .../db/test_projects_repository.py | 2 +- .../tests/integration/test_contributions.py | 2 +- .../tests/integration/test_projects.py | 7 +++-- .../unit/domains/test_projects_models.py | 8 +++--- mpcontribs-api/tests/unit/test_projection.py | 28 +++++++++---------- 11 files changed, 52 insertions(+), 31 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py index 1763589c5e..fdf221c565 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py @@ -75,6 +75,18 @@ class ContributionOut(DocumentOut[PydanticObjectId]): tables: list[Link[Table]] | None = None attachments: list[Link[Attachment]] | None = None + @staticmethod + def default_fields() -> list[str]: + return [ + "id", + "project", + "identifier", + "formula", + "is_public", + "last_modified", + "needs_build", + ] + class ContributionPatch(SparseFieldsModel): project: str | None = None diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py index 9485c7868e..cd58d7c063 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py @@ -11,6 +11,7 @@ ContributionPatch, ) from mpcontribs_api.pagination import CursorParams +from mpcontribs_api.types import FieldSelector router = APIRouter(tags=["contributions"]) @@ -20,7 +21,7 @@ async def get_contributions( repo: ContributionDep, pagination: Annotated[CursorParams, Depends()], filter: ContributionFilter = FilterDepends(ContributionFilter), - fields: Annotated[str | None, Query(alias="_fields")] = None, + fields: FieldSelector = ContributionOut.default_fields(), ): field_set = ContributionOut.parse_fields(fields) return await repo.get_contributions(pagination=pagination, filter=filter, fields=field_set) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py index 90748d400c..c54c763e68 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py @@ -86,6 +86,10 @@ class ProjectOut(DocumentOut[ShortStr]): columns: list[Column] | None = None license: Literal["CCA4", "CCPD"] | None = None + @staticmethod + def default_fields() -> list[str]: + return ["id", "is_public", "title", "owner", "is_approved", "unique_identifiers"] + class ProjectFilter(Filter): """Filter fields allowed in requests.""" diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py index 284bec3e30..003e905a1d 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py @@ -1,6 +1,6 @@ from typing import Annotated -from fastapi import APIRouter, Depends, Query, Response, status +from fastapi import APIRouter, Depends, Response, status from fastapi_filter import FilterDepends from starlette.status import HTTP_204_NO_CONTENT @@ -12,6 +12,7 @@ ProjectPatch, ) from mpcontribs_api.pagination import CursorParams +from mpcontribs_api.types import FieldSelector router = APIRouter(tags=["projects"]) @@ -22,7 +23,7 @@ async def get_project( repo: ProjectDep, pagination: Annotated[CursorParams, Depends()], filter: ProjectFilter = FilterDepends(ProjectFilter), - fields: Annotated[str | None, Query(alias="_fields")] = None, + fields: FieldSelector = ProjectOut.default_fields(), ): """Return paginated projects matching a filter. @@ -42,7 +43,7 @@ async def get_project( async def get_project_by_id( id: str, repo: ProjectDep, - fields: Annotated[str | None, Query(alias="_fields")] = None, + fields: FieldSelector = ProjectOut.default_fields(), ): """Gets a single project by its ID. diff --git a/mpcontribs-api/src/mpcontribs_api/projection.py b/mpcontribs-api/src/mpcontribs_api/projection.py index 0c24a147da..0346a1f210 100644 --- a/mpcontribs-api/src/mpcontribs_api/projection.py +++ b/mpcontribs-api/src/mpcontribs_api/projection.py @@ -206,12 +206,12 @@ def field_names(cls) -> frozenset[str]: return frozenset(cls.model_fields) @classmethod - def parse_fields(cls, raw: str | None) -> frozenset[str] | None: + def parse_fields(cls, raw: list | None) -> frozenset[str] | None: """Validate and normalise a raw ``_fields`` value into a set of paths. Args: - raw: The comma-separated ``_fields`` value, or None when the query - parameter was omitted. + raw (list): The list of field paths from the ``_fields`` query parameter, + or None when the query parameter was omitted. Returns: None when every field should be returned (parameter omitted), @@ -224,7 +224,7 @@ def parse_fields(cls, raw: str | None) -> frozenset[str] | None: """ if not raw: return None # None == all fields - requested = frozenset(name.strip() for name in raw.split(",") if name.strip()) + requested = frozenset(name.strip() for name in raw if name.strip()) for path in requested: _validate_path(cls, path) return _collapse(requested | cls.sparse_always | cls._identity_fields()) diff --git a/mpcontribs-api/src/mpcontribs_api/types.py b/mpcontribs-api/src/mpcontribs_api/types.py index e1e189b535..8285acb265 100644 --- a/mpcontribs-api/src/mpcontribs_api/types.py +++ b/mpcontribs-api/src/mpcontribs_api/types.py @@ -1,12 +1,14 @@ import re from typing import Annotated +from fastapi import Query from pydantic import BeforeValidator, Field from mpcontribs_api.exceptions import ValidationError ShortStr = Annotated[str, Field(min_length=3, max_length=30)] +FieldSelector = Annotated[list[str] | None, Query(alias="_fields")] _EMAIL_RE = re.compile(r"^[^:@\s]+:[^:@\s]+@[^@\s]+\.[^@\s]+$") diff --git a/mpcontribs-api/tests/integration/db/test_projects_repository.py b/mpcontribs-api/tests/integration/db/test_projects_repository.py index a37877621b..e2b8c190ea 100644 --- a/mpcontribs-api/tests/integration/db/test_projects_repository.py +++ b/mpcontribs-api/tests/integration/db/test_projects_repository.py @@ -162,7 +162,7 @@ async def test_anon_cannot_get_private_project(self, db): class TestFieldProjection: async def test_projection_returns_only_requested_fields(self, db): await _insert("proj-fields", is_public=True, is_approved=True) - fields = ProjectOut.parse_fields("title") + fields = ProjectOut.parse_fields(["title"]) page = await _repo(ADMIN).get_project(filter=_noop_filter(), pagination=CursorParams(), fields=fields) assert len(page.items) == 1 item = page.items[0] diff --git a/mpcontribs-api/tests/integration/test_contributions.py b/mpcontribs-api/tests/integration/test_contributions.py index 8deb915059..06634a684b 100644 --- a/mpcontribs-api/tests/integration/test_contributions.py +++ b/mpcontribs-api/tests/integration/test_contributions.py @@ -63,7 +63,7 @@ def test_repo_called_with_pagination(self, client, contribution_repo): def test_fields_forwarded(self, client, contribution_repo): contribution_repo.get_contributions.return_value = Page(items=[], next_cursor=None) - client.get("/api/v1/contributions", params={"_fields": "formula"}, headers=AUTHED_HEADERS) + client.get("/api/v1/contributions", params={"_fields": ["formula"]}, headers=AUTHED_HEADERS) _, kwargs = contribution_repo.get_contributions.call_args assert kwargs["fields"] is not None assert "formula" in kwargs["fields"] diff --git a/mpcontribs-api/tests/integration/test_projects.py b/mpcontribs-api/tests/integration/test_projects.py index c40ef19b2f..858bdd0ac0 100644 --- a/mpcontribs-api/tests/integration/test_projects.py +++ b/mpcontribs-api/tests/integration/test_projects.py @@ -105,7 +105,7 @@ def test_limit_above_max_returns_422(self, client, project_repo): def test_valid_fields_param_forwarded(self, client, project_repo): project_repo.get_project.return_value = Page(items=[], next_cursor=None) - client.get("/api/v1/projects", params={"_fields": "title,authors"}, headers=AUTHED_HEADERS) + client.get("/api/v1/projects", params=[("_fields", "title"), ("_fields", "authors")], headers=AUTHED_HEADERS) _, kwargs = project_repo.get_project.call_args assert kwargs["fields"] is not None assert "title" in kwargs["fields"] @@ -151,11 +151,12 @@ def test_fields_param_forwarded(self, client, project_repo): assert kwargs["fields"] is not None assert "title" in kwargs["fields"] - def test_no_fields_param_passes_none(self, client, project_repo): + def test_no_fields_param_uses_default_fields(self, client, project_repo): project_repo.get_project_by_id.return_value = SAMPLE_PROJECT client.get("/api/v1/projects/mp-sample", headers=AUTHED_HEADERS) _, kwargs = project_repo.get_project_by_id.call_args - assert kwargs["fields"] is None + assert kwargs["fields"] is not None + assert "title" in kwargs["fields"] # --------------------------------------------------------------------------- diff --git a/mpcontribs-api/tests/unit/domains/test_projects_models.py b/mpcontribs-api/tests/unit/domains/test_projects_models.py index 66984c0067..56b062ba76 100644 --- a/mpcontribs-api/tests/unit/domains/test_projects_models.py +++ b/mpcontribs-api/tests/unit/domains/test_projects_models.py @@ -133,12 +133,12 @@ def test_parse_fields_none_returns_none(self): assert ProjectOut.parse_fields(None) is None def test_parse_fields_valid_field(self): - result = ProjectOut.parse_fields("title") + result = ProjectOut.parse_fields(["title"]) assert result is not None assert "title" in result def test_parse_fields_multiple_fields(self): - result = ProjectOut.parse_fields("title,authors,is_public") + result = ProjectOut.parse_fields(["title", "authors", "is_public"]) assert result is not None assert "title" in result assert "authors" in result @@ -148,13 +148,13 @@ def test_parse_fields_unknown_raises(self): from mpcontribs_api.exceptions import ValidationError as AppValidationError with pytest.raises(AppValidationError): - ProjectOut.parse_fields("nonexistent_field") + ProjectOut.parse_fields(["nonexistent_field"]) def test_projection_none_returns_self(self): assert ProjectOut.projection(None) is ProjectOut def test_projection_with_fields(self): - fields = ProjectOut.parse_fields("title,authors") + fields = ProjectOut.parse_fields(["title", "authors"]) projected = ProjectOut.projection(fields) assert projected is not ProjectOut assert hasattr(projected.Settings, "projection") diff --git a/mpcontribs-api/tests/unit/test_projection.py b/mpcontribs-api/tests/unit/test_projection.py index c003af591f..a8c627155a 100644 --- a/mpcontribs-api/tests/unit/test_projection.py +++ b/mpcontribs-api/tests/unit/test_projection.py @@ -226,44 +226,44 @@ class TestParseFields: def test_none_returns_none(self): assert Simple.parse_fields(None) is None - def test_empty_string_returns_none(self): - assert Simple.parse_fields("") is None + def test_empty_list_returns_none(self): + assert Simple.parse_fields([]) is None def test_single_valid_field(self): - result = Simple.parse_fields("name") + result = Simple.parse_fields(["name"]) assert result is not None assert "name" in result def test_multiple_fields(self): - result = Simple.parse_fields("name,age") + result = Simple.parse_fields(["name", "age"]) assert result is not None assert "name" in result assert "age" in result def test_whitespace_stripped(self): - result = Simple.parse_fields(" name , age ") + result = Simple.parse_fields([" name ", " age "]) assert result is not None assert "name" in result assert "age" in result def test_nested_field(self): - result = Simple.parse_fields("address.city") + result = Simple.parse_fields(["address.city"]) assert result is not None assert "address.city" in result def test_parent_collapses_child(self): - result = Simple.parse_fields("address,address.city") + result = Simple.parse_fields(["address", "address.city"]) assert result is not None assert "address" in result assert "address.city" not in result def test_unknown_field_raises(self): with pytest.raises(AppValidationError, match="unknown field"): - Simple.parse_fields("nonexistent") + Simple.parse_fields(["nonexistent"]) def test_scalar_subfield_raises(self): with pytest.raises(AppValidationError, match="cannot select subfields"): - Simple.parse_fields("name.sub") + Simple.parse_fields(["name.sub"]) def test_sparse_always_always_included(self): class WithAlways(SparseFieldsModel): @@ -271,7 +271,7 @@ class WithAlways(SparseFieldsModel): name: str | None = None sparse_always = frozenset({"id"}) - result = WithAlways.parse_fields("name") + result = WithAlways.parse_fields(["name"]) assert result is not None assert "id" in result assert "name" in result @@ -287,23 +287,23 @@ def test_none_fields_returns_self(self): assert Simple.projection(None) is Simple def test_with_fields_returns_different_model(self): - fields = Simple.parse_fields("name") + fields = Simple.parse_fields(["name"]) result = Simple.projection(fields) assert result is not Simple def test_projected_model_has_settings_with_projection(self): - fields = Simple.parse_fields("name") + fields = Simple.parse_fields(["name"]) projected = Simple.projection(fields) assert hasattr(projected, "Settings") assert hasattr(projected.Settings, "projection") def test_projection_includes_id(self): - fields = Simple.parse_fields("name") + fields = Simple.parse_fields(["name"]) projected = Simple.projection(fields) assert "_id" in projected.Settings.projection def test_projection_caching(self): - fields = Simple.parse_fields("name") + fields = Simple.parse_fields(["name"]) first = Simple.projection(fields) second = Simple.projection(fields) assert first is second From b3339a532ed4758868a836f18559cbd385a3629a Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 4 Jun 2026 13:15:06 -0700 Subject: [PATCH 291/591] Fleshed out contribution repo methods --- .../domains/contributions/repository.py | 72 ++++++++++++++++--- .../domains/contributions/router.py | 12 ++-- 2 files changed, 71 insertions(+), 13 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py index bff75ebd21..ed3ded6f5a 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py @@ -1,5 +1,9 @@ +import asyncio from typing import Any, Literal +from beanie import UpdateResponse +from beanie.operators import Set + from mpcontribs_api.auth import User from mpcontribs_api.domains._shared.repository import MongoDbRepository from mpcontribs_api.domains.contributions.models import ( @@ -9,6 +13,7 @@ ContributionOut, ContributionPatch, ) +from mpcontribs_api.exceptions import NotFoundError from mpcontribs_api.pagination import CursorParams @@ -40,27 +45,78 @@ async def delete_contributions(self, filter: ContributionFilter): await docs.delete() async def insert_contributions(self, contributions: list[ContributionIn]): - pass + full_docs = [self.document_model.from_input_model(contrib) for contrib in contributions] + # ordered=False lets Mongo keep inserting if a document fails + return await self.document_model.insert_many(full_docs, ordered=False) async def upsert_contributions(self, contributions: list[ContributionIn]): - pass + # Handles upserting a document - no upsert_many command + async def _upsert(contrib: ContributionIn): + existing = await self.document_model.find_one( + self._scope, + self.document_model.project == contrib.project, + self.document_model.identifier == contrib.identifier, + ) + doc = self.document_model.from_input_model(contrib) + # Update + if existing is not None: + update_data = doc.model_dump(exclude={"id"}, exclude_none=True) + await existing.update(Set(update_data)) + return existing + # Insert + await doc.insert() + return doc + + # Asynchronously run upsert on each contribution + return await asyncio.gather(*[_upsert(c) for c in contributions]) async def download_contributions( self, format: Literal["json", "csv", "parquet"], filter: ContributionFilter, - fields: str | None, + fields: frozenset[str] | None, ): pass async def delete_contribution_by_id(self, id: str): - pass + await self.document_model.find_one(self._scope, self.document_model.id == id).delete() - async def get_contribution_by_id(self, id: str, fields: str | None): - pass + async def get_contribution_by_id(self, id: str, fields: frozenset[str] | None): + return await self.document_model.find_one( + self._scope, + self.document_model.id == id, + projection_model=self.out_model.projection(fields), + ) async def upsert_contribution_by_id(self, id: str, contribution: ContributionIn): - pass + doc = self.document_model.from_input_model(contribution) + return self.document_model.find_one( + self._scope, + self.document_model.id == id, + ).upsert( + Set(doc.model_dump(exclude={"id"}, exclude_none=True)), + on_insert=doc, + response_type=UpdateResponse.NEW_DOCUMENT, + ) async def update_contribution_by_id(self, id: str, update: ContributionPatch): - pass + # Only retain set fields (patch) + update_data = update.model_dump(exclude_unset=True) + # If update is empty, return the model anyways (consistent behavior) + if not update_data: + existing = await self.document_model.get(id) + if existing is None: + raise NotFoundError(f"Contribution with id {id} not found") + return existing + + # Otherwise, update the fields fully (set) + # Brendan TODO: Set will replace an entire field + # - if we want to append to a list (ie. add a reference) we ned Push/AddToSet + query = self.document_model.find_one(self.document_model.id == id).update( + Set(update_data), + response_type=UpdateResponse.NEW_DOCUMENT, + ) + updated = await query # pyright: ignore[reportGeneralTypeIssues] # beanie UpdateQuery is awaitable, but pyright doesn't see it + if updated is None: + raise NotFoundError(f"Contribution with id {id} not found") + return updated diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py index cd58d7c063..268cc5380f 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py @@ -1,6 +1,6 @@ from typing import Annotated, Literal -from fastapi import APIRouter, Depends, Query +from fastapi import APIRouter, Depends from fastapi_filter import FilterDepends from mpcontribs_api.domains.contributions.dependencies import ContributionDep @@ -56,9 +56,10 @@ async def download_contributions( repo: ContributionDep, format: Literal["json", "csv", "parquet"] = "parquet", filter: ContributionFilter = FilterDepends(ContributionFilter), - fields: Annotated[str | None, Query(alias="_fields")] = None, + fields: FieldSelector = ContributionOut.default_fields(), ): - return await repo.download_contributions(format=format, filter=filter, fields=fields) + selected = ContributionOut.parse_fields(fields) + return await repo.download_contributions(format=format, filter=filter, fields=selected) @router.delete("{id}") @@ -73,9 +74,10 @@ async def delete_contribtion_by_id( async def get_contribution_by_id( repo: ContributionDep, id: str, - fields: Annotated[str | None, Query(alias="_fields")] = None, + fields: FieldSelector = ContributionOut.default_fields(), ): - return await repo.get_contribution_by_id(id=id, fields=fields) + selected = ContributionOut.parse_fields(fields) + return await repo.get_contribution_by_id(id=id, fields=selected) @router.put("{id}") From 9ad757a9a0c37be3f1816c6c119d0a14ef1adc9f Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 4 Jun 2026 13:59:52 -0700 Subject: [PATCH 292/591] Pulled repeated repo logic into parent class --- mpcontribs-api/src/mpcontribs_api/app.py | 5 +- .../domains/_shared/repository.py | 87 +++++++++-- .../domains/contributions/repository.py | 102 ++++++++----- .../domains/contributions/router.py | 4 +- .../domains/projects/repository.py | 139 ++++-------------- .../mpcontribs_api/domains/projects/router.py | 16 +- .../db/test_projects_repository.py | 50 +++---- .../tests/integration/test_gateway.py | 2 +- .../tests/integration/test_projects.py | 46 +++--- 9 files changed, 228 insertions(+), 223 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/app.py b/mpcontribs-api/src/mpcontribs_api/app.py index e4edc07444..9152c464f6 100644 --- a/mpcontribs-api/src/mpcontribs_api/app.py +++ b/mpcontribs-api/src/mpcontribs_api/app.py @@ -1,6 +1,5 @@ from __future__ import annotations -import logging from collections.abc import AsyncGenerator from contextlib import asynccontextmanager @@ -16,10 +15,10 @@ from mpcontribs_api.domains.contributions.models import Contribution from mpcontribs_api.domains.projects.models import Project from mpcontribs_api.exceptions import register_exception_handlers -from mpcontribs_api.logging import configure_logging +from mpcontribs_api.logging import configure_logging, get_logger from mpcontribs_api.middleware import bind_request_context -logger = logging.getLogger(__name__) +logger = get_logger(__name__) def _build_lifespan(settings: Settings): diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py index 846874f326..8595c65341 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py @@ -1,23 +1,33 @@ from abc import ABC, abstractmethod from typing import Any +from beanie import UpdateResponse +from beanie.operators import Set from fastapi_filter.contrib.beanie import Filter from pydantic import BaseModel from mpcontribs_api.auth import User from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut -from mpcontribs_api.exceptions import ConflictError +from mpcontribs_api.exceptions import ConflictError, NotFoundError from mpcontribs_api.pagination import CursorParams, Page, decode_cursor, encode_cursor -class MongoDbRepository[TDoc: BaseDocumentWithInput, TIn: BaseModel, TOut: DocumentOut](ABC): +class MongoDbRepository[ + TDoc: BaseDocumentWithInput, + TIn: BaseModel, + TOut: DocumentOut, + TFilter: Filter, + TPatch: BaseModel, +](ABC): """Base repository encapsulating shared MongoDB access patterns. - Subclasses bind the document, input, and output types as type parameters, set the matching - ``document_model`` / ``out_model`` class attributes, and implement ``_build_scope`` to enforce - per-user authorization. Shared query logic (scoping, projection, cursor pagination, insertion) - lives here; resource-specific operations stay on the concrete subclasses where they keep their - precise types. + Subclasses bind the document, input, output, filter, and patch types as type parameters, set + the matching ``document_model`` / ``out_model`` class attributes, and implement ``_build_scope`` + to enforce per-user authorization. Shared CRUD logic (scoping, projection, cursor pagination, + insertion, single-document read/patch/delete) lives here so it exists in exactly one place and + cannot drift between resources. Subclasses expose domain-named methods that either forward to a + base method (vocabulary + concrete types for routers, no logic) or implement a genuinely + different shape (bulk insert, compound-key upsert, download). Attributes: document_model: the ``BaseDocumentWithInput`` subclass this repository operates on @@ -42,17 +52,21 @@ def _build_scope(user: User) -> dict[str, Any]: """Provides scope based on current user's permitted groups and publicly released data.""" ... + def _not_found(self, id: str) -> str: + """Build a not-found message naming this repository's resource.""" + return f"{self.document_model.__name__} with id {id} not found" + async def get_many( self, pagination: CursorParams, - filter: Filter, + filter: TFilter, fields: frozenset[str] | None, ) -> Page[TOut]: """Return a scoped, filtered, cursor-paginated page of projected documents. Args: pagination (CursorParams): forward-only cursor parameters - filter (Filter): the fastapi-filter query to apply on top of the user scope + filter (TFilter): the fastapi-filter query to apply on top of the user scope fields (frozenset[str] | None): fields to project; if None the full document is returned """ projection = self.out_model.projection(fields) @@ -65,6 +79,19 @@ async def get_many( next_cursor = encode_cursor(str(items[-1].id)) if has_more and items else None return Page(items=items, next_cursor=next_cursor) + async def get_by_id(self, id: str, fields: frozenset[str] | None): + """Return a single scoped document by id, projected to the requested fields. + + Args: + id (str): the id of the document to find + fields (frozenset[str] | None): fields to project; if None the full document is returned + """ + return await self.document_model.find_one( + self._scope, + self.document_model.id == id, + projection_model=self.out_model.projection(fields), + ) + async def insert_one(self, in_resource: TIn) -> TDoc: """Insert a new document built from its input model, rejecting duplicate ids. @@ -77,3 +104,45 @@ async def insert_one(self, in_resource: TIn) -> TDoc: raise ConflictError(f"Cannot insert document.\n Document with ID {document.id} exists") await document.insert() return document + + async def delete_by_id(self, id: str) -> None: + """Delete a single scoped document by id. + + Scoping ensures callers cannot delete documents they are not permitted to see. + + Args: + id (str): the id of the document to delete + """ + await self.document_model.find_one(self._scope, self.document_model.id == id).delete() + + async def patch(self, id: str, update: TPatch) -> TDoc: + """Partially update a single scoped document by id. + + Only fields explicitly set on ``update`` are applied. An empty patch is a no-op that still + returns the existing document for consistent behavior. Scoping ensures callers cannot patch + documents they are not permitted to see. + + Args: + id (str): the id of the document to update + update (TPatch): the partial update to apply; unset fields are dropped + """ + # Only retain set fields (patch) + update_data = update.model_dump(exclude_unset=True) + # If update is empty, return the model anyways (consistent behavior) + if not update_data: + existing = await self.document_model.find_one(self._scope, self.document_model.id == id) + if existing is None: + raise NotFoundError(self._not_found(id)) + return existing + + # Otherwise, update the fields fully (set) + # Brendan TODO: Set will replace an entire field + # - if we want to append to a list (ie. add a reference) we ned Push/AddToSet + query = self.document_model.find_one(self._scope, self.document_model.id == id).update( + Set(update_data), + response_type=UpdateResponse.NEW_DOCUMENT, + ) + updated = await query # pyright: ignore[reportGeneralTypeIssues] # beanie UpdateQuery is awaitable, but pyright doesn't see it + if updated is None: + raise NotFoundError(self._not_found(id)) + return updated diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py index ed3ded6f5a..75527899d4 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py @@ -13,11 +13,20 @@ ContributionOut, ContributionPatch, ) -from mpcontribs_api.exceptions import NotFoundError from mpcontribs_api.pagination import CursorParams -class MongoDbContributionRepository(MongoDbRepository[Contribution, ContributionIn, ContributionOut]): +class MongoDbContributionRepository( + MongoDbRepository[Contribution, ContributionIn, ContributionOut, ContributionFilter, ContributionPatch] +): + """A repository layer for access to MongoDB. + + Shared CRUD logic lives on :class:`MongoDbRepository`; the methods here are domain-named + forwarders that give routers a consistent vocabulary and concrete types, plus the operations + whose shape is genuinely contribution-specific (filtered delete, bulk insert, compound-key and + id-keyed upsert, download). + """ + document_model = Contribution out_model = ContributionOut @@ -38,18 +47,55 @@ async def get_contributions( filter: ContributionFilter, fields: frozenset[str] | None, ): + """Query the Contribution collection, scoped to the current user. See ``get_many``.""" return await self.get_many(pagination=pagination, filter=filter, fields=fields) + async def get_contribution_by_id(self, id: str, fields: frozenset[str] | None): + """Find a single contribution by id, scoped to the current user. See ``get_by_id``.""" + return await self.get_by_id(id, fields) + + async def patch_contribution_by_id(self, id: str, update: ContributionPatch): + """Partially update a contribution by id, scoped to the current user. See ``patch``.""" + return await self.patch(id, update) + + async def delete_contribution_by_id(self, id: str) -> None: + """Delete a contribution by id, scoped to the current user. See ``delete_by_id``.""" + await self.delete_by_id(id) + async def delete_contributions(self, filter: ContributionFilter): + """Bulk deletion of Contributions described by the filter + + Args: + filter (ContribtionFilter): the filter to use to identify contributions to delete + """ docs = filter.filter(self.document_model.find(self._scope)) await docs.delete() async def insert_contributions(self, contributions: list[ContributionIn]): + """Bulk insertion of Contributions + + Args: + contributions (list[ContributionIn]): the list of contributions to be inserted + + Returns: + list[ContributionOut]: the inserted documents + """ full_docs = [self.document_model.from_input_model(contrib) for contrib in contributions] # ordered=False lets Mongo keep inserting if a document fails return await self.document_model.insert_many(full_docs, ordered=False) async def upsert_contributions(self, contributions: list[ContributionIn]): + """Upserts contributions. + + For each Contribution, if Contribution with identical identifiers exist, update, otherwise insert + + Args: + contributions (list[ContributionIn]): the list of contributions to be upserted + + Returns: + list[ContributionOut]: the list of upserted documents + """ + # Handles upserting a document - no upsert_many command async def _upsert(contrib: ContributionIn): existing = await self.document_model.find_one( @@ -70,25 +116,17 @@ async def _upsert(contrib: ContributionIn): # Asynchronously run upsert on each contribution return await asyncio.gather(*[_upsert(c) for c in contributions]) - async def download_contributions( - self, - format: Literal["json", "csv", "parquet"], - filter: ContributionFilter, - fields: frozenset[str] | None, - ): - pass + async def upsert_contribution_by_id(self, id: str, contribution: ContributionIn): + """Upserts a single Contribution. - async def delete_contribution_by_id(self, id: str): - await self.document_model.find_one(self._scope, self.document_model.id == id).delete() + If Contributions with identical identifiers exist, update, otherwise insert - async def get_contribution_by_id(self, id: str, fields: frozenset[str] | None): - return await self.document_model.find_one( - self._scope, - self.document_model.id == id, - projection_model=self.out_model.projection(fields), - ) + Args: + id (str): the id of the Contribution to upsert + contribution (ContributionIn): the Contribution to be upserted - async def upsert_contribution_by_id(self, id: str, contribution: ContributionIn): + Returns: + ContributionOut: the upserted document""" doc = self.document_model.from_input_model(contribution) return self.document_model.find_one( self._scope, @@ -99,24 +137,10 @@ async def upsert_contribution_by_id(self, id: str, contribution: ContributionIn) response_type=UpdateResponse.NEW_DOCUMENT, ) - async def update_contribution_by_id(self, id: str, update: ContributionPatch): - # Only retain set fields (patch) - update_data = update.model_dump(exclude_unset=True) - # If update is empty, return the model anyways (consistent behavior) - if not update_data: - existing = await self.document_model.get(id) - if existing is None: - raise NotFoundError(f"Contribution with id {id} not found") - return existing - - # Otherwise, update the fields fully (set) - # Brendan TODO: Set will replace an entire field - # - if we want to append to a list (ie. add a reference) we ned Push/AddToSet - query = self.document_model.find_one(self.document_model.id == id).update( - Set(update_data), - response_type=UpdateResponse.NEW_DOCUMENT, - ) - updated = await query # pyright: ignore[reportGeneralTypeIssues] # beanie UpdateQuery is awaitable, but pyright doesn't see it - if updated is None: - raise NotFoundError(f"Contribution with id {id} not found") - return updated + async def download_contributions( + self, + format: Literal["json", "csv", "parquet"], + filter: ContributionFilter, + fields: frozenset[str] | None, + ): + pass diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py index 268cc5380f..0af605ab51 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py @@ -86,5 +86,5 @@ async def upsert_contribution_by_id(repo: ContributionDep, id: str, contribution @router.patch("{id}") -async def update_contribution_by_id(repo: ContributionDep, id: str, update: ContributionPatch): - return await repo.update_contribution_by_id(id=id, update=update) +async def patch_contribution_by_id(repo: ContributionDep, id: str, update: ContributionPatch): + return await repo.patch_contribution_by_id(id=id, update=update) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py index 7fbdcd91bd..a29bd3ec3c 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py @@ -1,8 +1,4 @@ -from typing import Any, TypeVar - -from beanie import UpdateResponse -from beanie.operators import Set -from pydantic import BaseModel +from typing import Any from mpcontribs_api.auth import User from mpcontribs_api.domains._shared.repository import MongoDbRepository @@ -13,29 +9,20 @@ ProjectOut, ProjectPatch, ) -from mpcontribs_api.exceptions import ConflictError, NotFoundError -from mpcontribs_api.pagination import ( - CursorParams, -) - - -# Type checking to get around pyright issues -class HasId(BaseModel): - id: str +from mpcontribs_api.pagination import CursorParams -V = TypeVar("V", bound=HasId) -M = TypeVar("M", bound=BaseModel) - - -class MongoDbProjectRepository(MongoDbRepository[Project, ProjectIn, ProjectOut]): +class MongoDbProjectRepository(MongoDbRepository[Project, ProjectIn, ProjectOut, ProjectFilter, ProjectPatch]): """A repository layer for access to MongoDB. - This is the layer that directly interacts with database operations + This is the layer that directly interacts with database operations. Shared CRUD logic lives on + :class:`MongoDbRepository`; the methods here are domain-named forwarders that give routers a + consistent vocabulary and concrete types, plus the operations whose shape is genuinely + project-specific (id-keyed upsert). Attributes: - _scope (dict[str, Any]): additional terms to inject into mongo queries to enforce user authorization on - resources + _scope (dict[str, Any]): additional terms to inject into mongo queries to enforce user + authorization on resources """ document_model = Project @@ -53,114 +40,40 @@ def _build_scope(user: User) -> dict[str, Any]: ors.append({"_id": {"$in": sorted(user.groups)}}) return {"$or": ors} - # Brendan TODO: figure out return type - async def get_project_by_id(self, id: str, fields: frozenset[str] | None): - """Finds a single project by ID. - - Args: - id (str): the id of the project to find - fields (frozenset[str] | None): a BaseModel to use for projection. If none, the document is returned without - projection - - Returns: - ProjectOut: a projection of ProjectOut containing 'fields' from requested id - """ - # TODO: Verify that self._scope and Project.id == id get combined properly - return await self.document_model.find_one( - self._scope, - self.document_model.id == id, - projection_model=self.out_model.projection(fields), - ) - - # Brendan TODO: Does not handle compound pagination/sorting - # can only paginate on _id, so passing sort arguments does nothing - async def get_project( + async def get_projects( self, filter: ProjectFilter, pagination: CursorParams, fields: frozenset[str] | None, ): - """Query the Project collection using filtering. - - Only considers the Projects that the User has access to. - - Args: - filter (ProjectFilter): the query to filter the collection by - pagination (CursorParams): parameters for pagination using a cursor - fields (frozenset[str] | None): the fields to use for projection. If none, the document is returned without - projection - """ + """Query the Project collection, scoped to the current user. See ``get_many``.""" return await self.get_many(pagination=pagination, filter=filter, fields=fields) - async def insert_project(self, project: ProjectIn) -> Project: - """Inserst a new project. - - Args: - project (ProjectIn): the project to be inserted - - Returns: - Project: the project after succesful insertion - """ - id_exists = await self.document_model.find_one(self.document_model.id == project.id) - # Brendan TODO: - if id_exists: - raise ConflictError(f"Cannot insert project.\n Project with ID {project.id} exists") - full_project = self.document_model.from_input_model(project) - await full_project.insert() - return full_project - - async def patch_project(self, id: str, update: ProjectPatch) -> Project: - """Partial update to project identified with 'id'. - - Note: overwrites fields with given values - arrays are not appended to. + async def get_project_by_id(self, id: str, fields: frozenset[str] | None): + """Find a single project by id, scoped to the current user. See ``get_by_id``.""" + return await self.get_by_id(id, fields) - Args: - id (str): the id of the project to update - update (ProjectPatch): the partial update to apply - unset fields are dropped - - Note: If fields are intentionally set to None, None is applied to the field. + async def insert_project(self, project: ProjectIn) -> Project: + """Insert a new project, rejecting a duplicate id. See ``insert_one``.""" + return await self.insert_one(project) - Returns: - The Project with updates applied - """ - # Only retain set fields (patch) - update_data = update.model_dump(exclude_unset=True) - # If update is empty, return the model anyways (consistent behavior) - if not update_data: - existing = await self.document_model.get(id) - if existing is None: - raise NotFoundError(f"Project with id {id} not found") - return existing - - # Otherwise, update the fields fully (set) - # Brendan TODO: Set will replace an entire field - # - if we want to append to a list (ie. add a reference) we ned Push/AddToSet - query = self.document_model.find_one(self.document_model.id == id).update( - Set(update_data), - response_type=UpdateResponse.NEW_DOCUMENT, - ) - updated = await query # pyright: ignore[reportGeneralTypeIssues] # beanie UpdateQuery is awaitable, but pyright doesn't see it - if updated is None: - raise NotFoundError(f"Project with id {id} not found") - return updated - - async def delete_project(self, id: str): - """Delete project by id. + async def patch_project_by_id(self, id: str, update: ProjectPatch) -> Project: + """Partially update a project by id, scoped to the current user. See ``patch``.""" + return await self.patch(id, update) - Args: - id (str): the id of the project to delete - """ - await self.document_model.find_one(self.document_model.id == id).delete() + async def delete_project_by_id(self, id: str) -> None: + """Delete a project by id, scoped to the current user. See ``delete_by_id``.""" + await self.delete_by_id(id) - async def upsert_project(self, id: str, data: ProjectIn) -> Project: + async def upsert_project_by_id(self, id: str, data: ProjectIn) -> Project: """Upsert a project by provided id. Upsert: Update document if id is found, otherwise insert new document using id. Note: Relies on the path param 'id' for finding, rather than the body's id. Args: - repo (ProjectDep): the project repo we depend on - id (str): the id of the project to retrieve - project (ProjectIn): the data of the project to upsert + id (str): the id of the project to upsert + data (ProjectIn): the data of the project to upsert Returns: Project: the full document that either replaced an old one or was inserted diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py index 003e905a1d..9e16ff6568 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py @@ -19,7 +19,7 @@ # Brendan TODO: Add in option to select ProjectSummary or ProjectOut @router.get("", response_model=None) -async def get_project( +async def get_projects( repo: ProjectDep, pagination: Annotated[CursorParams, Depends()], filter: ProjectFilter = FilterDepends(ProjectFilter), @@ -36,7 +36,7 @@ async def get_project( list[ProjectSummary]: a list of smaller project payloads """ selected = ProjectOut.parse_fields(fields) - return await repo.get_project(filter=filter, pagination=pagination, fields=selected) + return await repo.get_projects(filter=filter, pagination=pagination, fields=selected) @router.get("/{id}", response_model=ProjectOut) @@ -60,7 +60,7 @@ async def get_project_by_id( @router.put("/{id}", response_model=ProjectOut) -async def upsert_project( +async def upsert_project_by_id( repo: ProjectDep, id: str, project: ProjectIn, @@ -78,11 +78,11 @@ async def upsert_project( Returns: ProjectOut: the full document that either replaced an old one or was inserted """ - return await repo.upsert_project(id=id, data=project) + return await repo.upsert_project_by_id(id=id, data=project) @router.patch("/{id}", response_model=ProjectOut) -async def patch_project( +async def patch_project_by_id( repo: ProjectDep, id: str, update: ProjectPatch, @@ -100,11 +100,11 @@ async def patch_project( Returns: ProjectOut: the full Project with updates applied """ - return await repo.patch_project(id=id, update=update) + return await repo.patch_project_by_id(id=id, update=update) @router.delete("/{id}", status_code=status.HTTP_204_NO_CONTENT) -async def delete_project( +async def delete_project_by_id( repo: ProjectDep, id: str, ): @@ -116,5 +116,5 @@ async def delete_project( Returns: Response: a response with the 204 response code (rather than FastAPIs default 200) """ - await repo.delete_project(id=id) + await repo.delete_project_by_id(id=id) return Response(status_code=HTTP_204_NO_CONTENT) diff --git a/mpcontribs-api/tests/integration/db/test_projects_repository.py b/mpcontribs-api/tests/integration/db/test_projects_repository.py index e2b8c190ea..e7dfdbf397 100644 --- a/mpcontribs-api/tests/integration/db/test_projects_repository.py +++ b/mpcontribs-api/tests/integration/db/test_projects_repository.py @@ -95,7 +95,7 @@ class TestAuthorizationScope: async def test_admin_sees_all(self, db): await _insert("scope-priv", is_public=False) await _insert("scope-pub", is_public=True, is_approved=True) - page = await _repo(ADMIN).get_project(filter=_noop_filter(), pagination=CursorParams(), fields=None) + page = await _repo(ADMIN).get_projects(filter=_noop_filter(), pagination=CursorParams(), fields=None) ids = {p.id for p in page.items} assert "scope-priv" in ids assert "scope-pub" in ids @@ -104,7 +104,7 @@ async def test_anonymous_only_sees_public_approved(self, db): await _insert("anon-priv", is_public=False) await _insert("anon-pub", is_public=True, is_approved=True) await _insert("anon-pub-unapproved", is_public=True, is_approved=False) - page = await _repo(ANON).get_project(filter=_noop_filter(), pagination=CursorParams(), fields=None) + page = await _repo(ANON).get_projects(filter=_noop_filter(), pagination=CursorParams(), fields=None) ids = {p.id for p in page.items} assert "anon-pub" in ids assert "anon-priv" not in ids @@ -114,7 +114,7 @@ async def test_authenticated_sees_own_and_public(self, db): await _insert("auth-alice-priv", owner="google:alice@example.com", is_public=False) await _insert("auth-bob-priv", owner="google:bob@example.com", is_public=False) await _insert("auth-pub", is_public=True, is_approved=True) - page = await _repo(ALICE).get_project(filter=_noop_filter(), pagination=CursorParams(), fields=None) + page = await _repo(ALICE).get_projects(filter=_noop_filter(), pagination=CursorParams(), fields=None) ids = {p.id for p in page.items} assert "auth-alice-priv" in ids assert "auth-pub" in ids @@ -163,7 +163,7 @@ class TestFieldProjection: async def test_projection_returns_only_requested_fields(self, db): await _insert("proj-fields", is_public=True, is_approved=True) fields = ProjectOut.parse_fields(["title"]) - page = await _repo(ADMIN).get_project(filter=_noop_filter(), pagination=CursorParams(), fields=fields) + page = await _repo(ADMIN).get_projects(filter=_noop_filter(), pagination=CursorParams(), fields=fields) assert len(page.items) == 1 item = page.items[0] assert item.title == "proj-fields" @@ -172,7 +172,7 @@ async def test_projection_returns_only_requested_fields(self, db): async def test_no_projection_returns_all_fields(self, db): await _insert("proj-all", is_public=True, is_approved=True) - page = await _repo(ADMIN).get_project(filter=_noop_filter(), pagination=CursorParams(), fields=None) + page = await _repo(ADMIN).get_projects(filter=_noop_filter(), pagination=CursorParams(), fields=None) item = page.items[0] assert item.title is not None assert item.authors is not None @@ -187,27 +187,27 @@ class TestPagination: async def test_limit_is_respected(self, db): for i in range(5): await _insert(f"pag-limit-{i:02d}", is_public=True, is_approved=True) - page = await _repo(ADMIN).get_project(filter=_noop_filter(), pagination=CursorParams(limit=3), fields=None) + page = await _repo(ADMIN).get_projects(filter=_noop_filter(), pagination=CursorParams(limit=3), fields=None) assert len(page.items) == 3 async def test_next_cursor_set_when_more_items(self, db): for i in range(4): await _insert(f"pag-cursor-{i:02d}", is_public=True, is_approved=True) - page = await _repo(ADMIN).get_project(filter=_noop_filter(), pagination=CursorParams(limit=2), fields=None) + page = await _repo(ADMIN).get_projects(filter=_noop_filter(), pagination=CursorParams(limit=2), fields=None) assert page.next_cursor is not None async def test_next_cursor_none_on_last_page(self, db): for i in range(3): await _insert(f"pag-last-{i:02d}", is_public=True, is_approved=True) - page = await _repo(ADMIN).get_project(filter=_noop_filter(), pagination=CursorParams(limit=10), fields=None) + page = await _repo(ADMIN).get_projects(filter=_noop_filter(), pagination=CursorParams(limit=10), fields=None) assert page.next_cursor is None async def test_cursor_fetches_next_page(self, db): for i in range(4): await _insert(f"pag-next-{i:02d}", is_public=True, is_approved=True) - page1 = await _repo(ADMIN).get_project(filter=_noop_filter(), pagination=CursorParams(limit=2), fields=None) + page1 = await _repo(ADMIN).get_projects(filter=_noop_filter(), pagination=CursorParams(limit=2), fields=None) assert page1.next_cursor is not None - page2 = await _repo(ADMIN).get_project( + page2 = await _repo(ADMIN).get_projects( filter=_noop_filter(), pagination=CursorParams(limit=2, cursor=page1.next_cursor), fields=None ) ids1 = {p.id for p in page1.items} @@ -220,7 +220,7 @@ async def test_all_items_covered_across_pages(self, db): all_ids: set[str] = set() cursor = None while True: - page = await _repo(ADMIN).get_project( + page = await _repo(ADMIN).get_projects( filter=_noop_filter(), pagination=CursorParams(limit=2, cursor=cursor), fields=None ) all_ids.update(p.id for p in page.items) @@ -231,7 +231,7 @@ async def test_all_items_covered_across_pages(self, db): # --------------------------------------------------------------------------- -# patch_project +# patch_project_by_id # --------------------------------------------------------------------------- @@ -239,7 +239,7 @@ class TestPatchProject: async def test_updates_single_field(self, db): await _insert("patch-me") patch = ProjectPatch(title="Updated Title") - await _repo(ADMIN).patch_project(id="patch-me", update=patch) + await _repo(ADMIN).patch_project_by_id(id="patch-me", update=patch) found = await Project.find_one(Project.id == "patch-me") assert found.title == "Updated Title" @@ -247,60 +247,60 @@ async def test_unset_fields_not_overwritten(self, db): await _insert("patch-preserve") original = await Project.find_one(Project.id == "patch-preserve") patch = ProjectPatch(title="New Title") - await _repo(ADMIN).patch_project(id="patch-preserve", update=patch) + await _repo(ADMIN).patch_project_by_id(id="patch-preserve", update=patch) found = await Project.find_one(Project.id == "patch-preserve") assert found.authors == original.authors async def test_not_found_raises(self, db): patch = ProjectPatch(title="Won't work") with pytest.raises(NotFoundError): - await _repo(ADMIN).patch_project(id="no-such-id", update=patch) + await _repo(ADMIN).patch_project_by_id(id="no-such-id", update=patch) async def test_empty_patch_returns_existing(self, db): await _insert("patch-empty") - result = await _repo(ADMIN).patch_project(id="patch-empty", update=ProjectPatch()) + result = await _repo(ADMIN).patch_project_by_id(id="patch-empty", update=ProjectPatch()) assert result.id == "patch-empty" # --------------------------------------------------------------------------- -# delete_project (soft-delete via DocumentWithSoftDelete) +# delete_project_by_id (soft-delete via DocumentWithSoftDelete) # --------------------------------------------------------------------------- class TestDeleteProject: async def test_deleted_project_not_in_default_query(self, db): await _insert("del-me", is_public=True, is_approved=True) - await _repo(ADMIN).delete_project(id="del-me") - page = await _repo(ADMIN).get_project(filter=_noop_filter(), pagination=CursorParams(), fields=None) + await _repo(ADMIN).delete_project_by_id(id="del-me") + page = await _repo(ADMIN).get_projects(filter=_noop_filter(), pagination=CursorParams(), fields=None) ids = {p.id for p in page.items} assert "del-me" not in ids async def test_delete_nonexistent_is_silent(self, db): - # delete_project does find_one().delete() — no error if not found - await _repo(ADMIN).delete_project(id="ghost-id") + # delete_project_by_id does find_one().delete() — no error if not found + await _repo(ADMIN).delete_project_by_id(id="ghost-id") # --------------------------------------------------------------------------- -# upsert_project +# upsert_project_by_id # --------------------------------------------------------------------------- class TestUpsertProject: async def test_upsert_creates_new_project(self, db): data = _project_in("upsert-new") - await _repo(ADMIN).upsert_project(id="upsert-new", data=data) + await _repo(ADMIN).upsert_project_by_id(id="upsert-new", data=data) found = await Project.find_one(Project.id == "upsert-new") assert found is not None async def test_upsert_updates_existing_project(self, db): await _insert("upsert-existing") data = _project_in("upsert-existing", title="Replaced Title") - await _repo(ADMIN).upsert_project(id="upsert-existing", data=data) + await _repo(ADMIN).upsert_project_by_id(id="upsert-existing", data=data) found = await Project.find_one(Project.id == "upsert-existing") assert found.title == "Replaced Title" async def test_upsert_uses_path_id_not_body_id(self, db): data = _project_in("body-id") - await _repo(ADMIN).upsert_project(id="path-id", data=data) + await _repo(ADMIN).upsert_project_by_id(id="path-id", data=data) found = await Project.find_one(Project.id == "path-id") assert found is not None diff --git a/mpcontribs-api/tests/integration/test_gateway.py b/mpcontribs-api/tests/integration/test_gateway.py index b43b372268..98540efbc6 100644 --- a/mpcontribs-api/tests/integration/test_gateway.py +++ b/mpcontribs-api/tests/integration/test_gateway.py @@ -24,7 +24,7 @@ def _stub_repos(gateway_app): """Inject no-op mock repos so gateway-passing requests don't hit Beanie.""" proj_repo = AsyncMock() - proj_repo.get_project.return_value = Page(items=[], next_cursor=None) + proj_repo.get_projects.return_value = Page(items=[], next_cursor=None) contrib_repo = AsyncMock() contrib_repo.get_contributions.return_value = Page(items=[], next_cursor=None) diff --git a/mpcontribs-api/tests/integration/test_projects.py b/mpcontribs-api/tests/integration/test_projects.py index 858bdd0ac0..571f91b81e 100644 --- a/mpcontribs-api/tests/integration/test_projects.py +++ b/mpcontribs-api/tests/integration/test_projects.py @@ -55,18 +55,18 @@ def project_repo(test_app, mock_project_repo): class TestListProjects: def test_empty_page_returns_200(self, client, project_repo): - project_repo.get_project.return_value = Page(items=[], next_cursor=None) + project_repo.get_projects.return_value = Page(items=[], next_cursor=None) r = client.get("/api/v1/projects", headers=AUTHED_HEADERS) assert r.status_code == 200 def test_response_has_items_and_cursor(self, client, project_repo): - project_repo.get_project.return_value = Page(items=[], next_cursor=None) + project_repo.get_projects.return_value = Page(items=[], next_cursor=None) body = client.get("/api/v1/projects", headers=AUTHED_HEADERS).json() assert "items" in body assert "next_cursor" in body def test_items_returned_in_response(self, client, project_repo): - project_repo.get_project.return_value = Page(items=[SAMPLE_PROJECT], next_cursor=None) + project_repo.get_projects.return_value = Page(items=[SAMPLE_PROJECT], next_cursor=None) body = client.get("/api/v1/projects", headers=AUTHED_HEADERS).json() assert len(body["items"]) == 1 @@ -74,29 +74,29 @@ def test_next_cursor_set_when_more_pages(self, client, project_repo): from mpcontribs_api.pagination import encode_cursor cursor = encode_cursor("mp-sample") - project_repo.get_project.return_value = Page(items=[SAMPLE_PROJECT], next_cursor=cursor) + project_repo.get_projects.return_value = Page(items=[SAMPLE_PROJECT], next_cursor=cursor) body = client.get("/api/v1/projects", headers=AUTHED_HEADERS).json() assert body["next_cursor"] == cursor def test_repo_get_project_called(self, client, project_repo): - project_repo.get_project.return_value = Page(items=[], next_cursor=None) + project_repo.get_projects.return_value = Page(items=[], next_cursor=None) client.get("/api/v1/projects", headers=AUTHED_HEADERS) - project_repo.get_project.assert_called_once() + project_repo.get_projects.assert_called_once() def test_anonymous_user_reaches_route(self, client, project_repo): - project_repo.get_project.return_value = Page(items=[], next_cursor=None) + project_repo.get_projects.return_value = Page(items=[], next_cursor=None) r = client.get("/api/v1/projects", headers=ANON_HEADERS) assert r.status_code == 200 def test_invalid_fields_param_returns_422(self, client, project_repo): - project_repo.get_project.return_value = Page(items=[], next_cursor=None) + project_repo.get_projects.return_value = Page(items=[], next_cursor=None) r = client.get("/api/v1/projects", params={"_fields": "nonexistent_field"}, headers=AUTHED_HEADERS) assert r.status_code == 422 def test_limit_param_forwarded(self, client, project_repo): - project_repo.get_project.return_value = Page(items=[], next_cursor=None) + project_repo.get_projects.return_value = Page(items=[], next_cursor=None) client.get("/api/v1/projects", params={"limit": 5}, headers=AUTHED_HEADERS) - _, kwargs = project_repo.get_project.call_args + _, kwargs = project_repo.get_projects.call_args assert kwargs["pagination"].limit == 5 def test_limit_above_max_returns_422(self, client, project_repo): @@ -104,9 +104,9 @@ def test_limit_above_max_returns_422(self, client, project_repo): assert r.status_code == 422 def test_valid_fields_param_forwarded(self, client, project_repo): - project_repo.get_project.return_value = Page(items=[], next_cursor=None) + project_repo.get_projects.return_value = Page(items=[], next_cursor=None) client.get("/api/v1/projects", params=[("_fields", "title"), ("_fields", "authors")], headers=AUTHED_HEADERS) - _, kwargs = project_repo.get_project.call_args + _, kwargs = project_repo.get_projects.call_args assert kwargs["fields"] is not None assert "title" in kwargs["fields"] @@ -166,7 +166,7 @@ def test_no_fields_param_uses_default_fields(self, client, project_repo): class TestPatchProject: def test_valid_patch_returns_200(self, client, project_repo): - project_repo.patch_project.return_value = SAMPLE_PROJECT + project_repo.patch_project_by_id.return_value = SAMPLE_PROJECT r = client.patch( "/api/v1/projects/mp-sample", json={"title": "Updated Title"}, @@ -176,7 +176,7 @@ def test_valid_patch_returns_200(self, client, project_repo): def test_patch_response_is_project_out(self, client, project_repo): updated = ProjectOut(id="mp-sample", title="Updated Title") - project_repo.patch_project.return_value = updated + project_repo.patch_project_by_id.return_value = updated body = client.patch( "/api/v1/projects/mp-sample", json={"title": "Updated Title"}, @@ -185,7 +185,7 @@ def test_patch_response_is_project_out(self, client, project_repo): assert body["title"] == "Updated Title" def test_not_found_returns_404(self, client, project_repo): - project_repo.patch_project.side_effect = NotFoundError("not found") + project_repo.patch_project_by_id.side_effect = NotFoundError("not found") r = client.patch( "/api/v1/projects/missing", json={"title": "x" * 5}, @@ -202,13 +202,13 @@ def test_invalid_title_too_short_returns_422(self, client, project_repo): assert r.status_code == 422 def test_id_and_update_forwarded_to_repo(self, client, project_repo): - project_repo.patch_project.return_value = SAMPLE_PROJECT + project_repo.patch_project_by_id.return_value = SAMPLE_PROJECT client.patch( "/api/v1/projects/mp-sample", json={"title": "New Name"}, headers=AUTHED_HEADERS, ) - _, kwargs = project_repo.patch_project.call_args + _, kwargs = project_repo.patch_project_by_id.call_args assert kwargs["id"] == "mp-sample" assert kwargs["update"].title == "New Name" @@ -220,19 +220,19 @@ def test_id_and_update_forwarded_to_repo(self, client, project_repo): class TestDeleteProject: def test_delete_returns_204(self, client, project_repo): - project_repo.delete_project.return_value = None + project_repo.delete_project_by_id.return_value = None r = client.delete("/api/v1/projects/mp-sample", headers=AUTHED_HEADERS) assert r.status_code == 204 def test_delete_response_has_no_body(self, client, project_repo): - project_repo.delete_project.return_value = None + project_repo.delete_project_by_id.return_value = None r = client.delete("/api/v1/projects/mp-sample", headers=AUTHED_HEADERS) assert r.content == b"" def test_id_forwarded_to_repo(self, client, project_repo): - project_repo.delete_project.return_value = None + project_repo.delete_project_by_id.return_value = None client.delete("/api/v1/projects/mp-sample", headers=AUTHED_HEADERS) - _, kwargs = project_repo.delete_project.call_args + _, kwargs = project_repo.delete_project_by_id.call_args assert kwargs["id"] == "mp-sample" @@ -256,12 +256,12 @@ def _valid_body(self, **overrides): return body def test_valid_upsert_returns_200(self, client, project_repo): - project_repo.upsert_project.return_value = SAMPLE_PROJECT + project_repo.upsert_project_by_id.return_value = SAMPLE_PROJECT r = client.put("/api/v1/projects/mp-sample", json=self._valid_body(), headers=AUTHED_HEADERS) assert r.status_code == 200 def test_conflict_returns_409(self, client, project_repo): - project_repo.upsert_project.side_effect = ConflictError("already exists") + project_repo.upsert_project_by_id.side_effect = ConflictError("already exists") r = client.put("/api/v1/projects/mp-sample", json=self._valid_body(), headers=AUTHED_HEADERS) assert r.status_code == 409 From be0d20b5b9c5ba9376f1e1492c13e1d31e64e826 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 4 Jun 2026 14:16:51 -0700 Subject: [PATCH 293/591] Changed logging middleware to allow contextvars being passed upwards --- mpcontribs-api/src/mpcontribs_api/app.py | 5 ++-- .../src/mpcontribs_api/middleware.py | 29 ++++++++++++++----- mpcontribs-api/tests/integration/conftest.py | 7 ++--- 3 files changed, 26 insertions(+), 15 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/app.py b/mpcontribs-api/src/mpcontribs_api/app.py index 9152c464f6..dcdf7af0de 100644 --- a/mpcontribs-api/src/mpcontribs_api/app.py +++ b/mpcontribs-api/src/mpcontribs_api/app.py @@ -6,7 +6,6 @@ from beanie import init_beanie from fastapi import Depends, FastAPI from pymongo import AsyncMongoClient -from starlette.middleware.base import BaseHTTPMiddleware from mpcontribs_api._openapi import contact_info, license_info, openapi_tags from mpcontribs_api.api.v1.router import router as v1_router @@ -16,7 +15,7 @@ from mpcontribs_api.domains.projects.models import Project from mpcontribs_api.exceptions import register_exception_handlers from mpcontribs_api.logging import configure_logging, get_logger -from mpcontribs_api.middleware import bind_request_context +from mpcontribs_api.middleware import RequestContextMiddleware logger = get_logger(__name__) @@ -69,7 +68,7 @@ def create_app(settings: Settings | None = None) -> FastAPI: openapi_tags=openapi_tags, ) - app.add_middleware(BaseHTTPMiddleware, dispatch=bind_request_context) + app.add_middleware(RequestContextMiddleware) register_exception_handlers(app) app.include_router(v1_router, prefix="/api/v1") diff --git a/mpcontribs-api/src/mpcontribs_api/middleware.py b/mpcontribs-api/src/mpcontribs_api/middleware.py index d4e0bf8e45..e68462ff8e 100644 --- a/mpcontribs-api/src/mpcontribs_api/middleware.py +++ b/mpcontribs-api/src/mpcontribs_api/middleware.py @@ -1,13 +1,26 @@ import uuid import structlog +from starlette.types import ASGIApp, Receive, Scope, Send -async def bind_request_context(request, call_next): - structlog.contextvars.clear_contextvars() - structlog.contextvars.bind_contextvars( - request_id=request.headers.get("x-request-id", str(uuid.uuid4())), - method=request.method, - path=request.url.path, - ) - return await call_next(request) +class RequestContextMiddleware: + def __init__(self, app: ASGIApp) -> None: + self.app = app + + async def __call__(self, scope: Scope, receive: Receive, send: Send) -> None: + if scope["type"] != "http": + await self.app(scope, receive, send) + return + + headers = dict(scope.get("headers", [])) + raw_request_id = headers.get(b"x-request-id", b"") + request_id = raw_request_id.decode() if raw_request_id else str(uuid.uuid4()) + + structlog.contextvars.clear_contextvars() + structlog.contextvars.bind_contextvars( + request_id=request_id, + method=scope["method"], + path=scope["path"], + ) + await self.app(scope, receive, send) diff --git a/mpcontribs-api/tests/integration/conftest.py b/mpcontribs-api/tests/integration/conftest.py index 3404c9d28a..38b7782765 100644 --- a/mpcontribs-api/tests/integration/conftest.py +++ b/mpcontribs-api/tests/integration/conftest.py @@ -18,10 +18,9 @@ import pytest from fastapi import FastAPI from fastapi.testclient import TestClient -from starlette.middleware.base import BaseHTTPMiddleware from mpcontribs_api.exceptions import register_exception_handlers -from mpcontribs_api.middleware import bind_request_context +from mpcontribs_api.middleware import RequestContextMiddleware @pytest.fixture(autouse=True, scope="session") @@ -85,7 +84,7 @@ async def _noop_lifespan(app: FastAPI): yield app = FastAPI(title="mpcontribs-test", lifespan=_noop_lifespan) - app.add_middleware(BaseHTTPMiddleware, dispatch=bind_request_context) + app.add_middleware(RequestContextMiddleware) register_exception_handlers(app) from mpcontribs_api.api.v1.router import router as v1_router @@ -114,7 +113,7 @@ async def _noop_lifespan(app: FastAPI): lifespan=_noop_lifespan, dependencies=[Depends(verify_gateway)], ) - app.add_middleware(BaseHTTPMiddleware, dispatch=bind_request_context) + app.add_middleware(RequestContextMiddleware) register_exception_handlers(app) from mpcontribs_api.api.v1.router import router as v1_router From 76cbc52bbe77dc1b899ab324b2975a1e26d2a8f7 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 4 Jun 2026 14:32:12 -0700 Subject: [PATCH 294/591] basedpyright ignores tests --- mpcontribs-api/pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/mpcontribs-api/pyproject.toml b/mpcontribs-api/pyproject.toml index 6305ba69e1..3ff97de127 100644 --- a/mpcontribs-api/pyproject.toml +++ b/mpcontribs-api/pyproject.toml @@ -89,3 +89,4 @@ max-line-length = 120 pythonVersion = "3.14" typeCheckingMode = "standard" extraPaths = ["src"] +ignore=["tests/"] From b6a99ed5e11000e93eb8915ed790f075ccd89478 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 4 Jun 2026 14:54:30 -0700 Subject: [PATCH 295/591] Infra changes for rewrite --- .claude/worktrees/unify-component-service | 1 + mpcontribs-api/Dockerfile | 46 +- mpcontribs-api/gunicorn.conf.py | 19 - mpcontribs-api/maintenance.py | 41 -- mpcontribs-api/requirements/deployment.txt | 551 --------------- .../requirements/ubuntu-latest_py3.11.txt | 548 --------------- .../ubuntu-latest_py3.11_extras.txt | 648 ------------------ .../requirements/ubuntu-latest_py3.12.txt | 545 --------------- .../ubuntu-latest_py3.12_extras.txt | 645 ----------------- mpcontribs-api/scripts/start.sh | 9 +- mpcontribs-api/scripts/start_rq.sh | 16 - 11 files changed, 18 insertions(+), 3051 deletions(-) create mode 160000 .claude/worktrees/unify-component-service delete mode 100644 mpcontribs-api/gunicorn.conf.py delete mode 100644 mpcontribs-api/maintenance.py delete mode 100644 mpcontribs-api/requirements/deployment.txt delete mode 100644 mpcontribs-api/requirements/ubuntu-latest_py3.11.txt delete mode 100644 mpcontribs-api/requirements/ubuntu-latest_py3.11_extras.txt delete mode 100644 mpcontribs-api/requirements/ubuntu-latest_py3.12.txt delete mode 100644 mpcontribs-api/requirements/ubuntu-latest_py3.12_extras.txt delete mode 100755 mpcontribs-api/scripts/start_rq.sh diff --git a/.claude/worktrees/unify-component-service b/.claude/worktrees/unify-component-service new file mode 160000 index 0000000000..7d84eafaec --- /dev/null +++ b/.claude/worktrees/unify-component-service @@ -0,0 +1 @@ +Subproject commit 7d84eafaec7223ee57b2b626f02815075a8dfc47 diff --git a/mpcontribs-api/Dockerfile b/mpcontribs-api/Dockerfile index 65fd6470b7..2e755f13cc 100644 --- a/mpcontribs-api/Dockerfile +++ b/mpcontribs-api/Dockerfile @@ -1,58 +1,42 @@ -FROM materialsproject/devops:python-3.1113.17 AS base -RUN apt-get update && apt-get install -y --no-install-recommends supervisor libopenblas-dev libpq-dev vim && apt-get clean +# NOTE: base image must be updated to Python 3.14 to satisfy requires-python in pyproject.toml +FROM materialsproject/devops:python-3.1113.4 AS base +RUN apt-get update && apt-get install -y --no-install-recommends supervisor libopenblas-dev vim && apt-get clean WORKDIR /app FROM base AS builder -RUN apt-get update && apt-get install -y --no-install-recommends gcc git g++ libsnappy-dev wget liblapack-dev && apt-get clean -ENV PIP_FLAGS "--no-cache-dir --compile" -COPY requirements/deployment.txt ./requirements.txt -RUN pip install $PIP_FLAGS -r requirements.txt -COPY pyproject.toml . -COPY mpcontribs mpcontribs +RUN apt-get update && apt-get install -y --no-install-recommends gcc git g++ wget liblapack-dev && apt-get clean +RUN pip install uv +COPY pyproject.toml uv.lock . +COPY src src ARG CONTRIBS_VERSION -RUN SETUPTOOLS_SCM_PRETEND_VERSION=${CONTRIBS_VERSION} pip install $PIP_FLAGS --no-deps . -#ENV SETUPTOOLS_SCM_PRETEND_VERSION 0.0.0 -#COPY marshmallow-mongoengine marshmallow-mongoengine -#RUN cd marshmallow-mongoengine && pip install $PIP_FLAGS --no-deps -e . -#COPY mimerender mimerender -#RUN cd mimerender && pip install $PIP_FLAGS --no-deps -e . -#COPY flask-mongorest flask-mongorest -#RUN cd flask-mongorest && pip install $PIP_FLAGS --no-deps -e . -#COPY AtlasQ AtlasQ -#RUN cd AtlasQ && pip install $PIP_FLAGS --no-deps -e . +RUN SETUPTOOLS_SCM_PRETEND_VERSION=${CONTRIBS_VERSION} uv sync --frozen --no-dev RUN wget -q https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh && \ - chmod +x wait-for-it.sh && mv wait-for-it.sh /usr/local/bin/ && \ - wget -q https://github.com/materialsproject/MPContribs/blob/master/mpcontribs-api/mpcontribs/api/contributions/formulae.json.gz?raw=true \ - -O mpcontribs/api/contributions/formulae.json.gz + chmod +x wait-for-it.sh && mv wait-for-it.sh /usr/local/bin/ FROM base ARG BUILDARCH ENV BUILDARCH=x86_64 -COPY --from=builder /usr/local/lib/python3.11/site-packages /usr/local/lib/python3.11/site-packages -COPY --from=builder /usr/local/bin /usr/local/bin -COPY --from=builder /usr/lib/$BUILDARCH-linux-gnu/libsnappy* /usr/lib/$BUILDARCH-linux-gnu/ +COPY --from=builder /app/.venv /app/.venv +COPY --from=builder /usr/local/bin/wait-for-it.sh /usr/local/bin/ -COPY --from=builder /app/mpcontribs/api /app/mpcontribs/api WORKDIR /app RUN mkdir -p /var/log/supervisor COPY supervisord supervisord COPY scripts scripts COPY main.py . -COPY maintenance.py . COPY docker-entrypoint.sh . -COPY gunicorn.conf.py . -RUN chmod +x main.py scripts/start.sh scripts/start_rq.sh docker-entrypoint.sh +RUN chmod +x main.py scripts/start.sh docker-entrypoint.sh ARG VERSION -ENV DD_SERVICE=contribs-apis \ +ENV PATH="/app/.venv/bin:$PATH" \ + DD_SERVICE=contribs-apis \ DD_ENV=prod \ DD_VERSION=$VERSION \ DD_TRACE_HOST=localhost:8126 \ - DD_TRACE_OTEL_ENABLED=false \ DD_MAIN_PACKAGE=mpcontribs-api -LABEL com.datadoghq.ad.logs='[{"source": "gunicorn", "service": "contribs-apis"}]' +LABEL com.datadoghq.ad.logs='[{"source": "uvicorn", "service": "contribs-apis"}]' EXPOSE 10000 10002 10003 10005 20000 ENTRYPOINT ["/app/docker-entrypoint.sh"] CMD ["/usr/bin/supervisord", "-c", "supervisord.conf"] diff --git a/mpcontribs-api/gunicorn.conf.py b/mpcontribs-api/gunicorn.conf.py deleted file mode 100644 index 548ba7f767..0000000000 --- a/mpcontribs-api/gunicorn.conf.py +++ /dev/null @@ -1,19 +0,0 @@ -import os - -import ddtrace.auto # noqa: F401 - -bind = "0.0.0.0:{}".format(os.getenv("API_PORT")) -worker_class = "gevent" -workers = os.getenv("NWORKERS") -statsd_host = "{}:8125".format(os.getenv("DD_AGENT_HOST")) -accesslog = "-" -errorlog = "-" -access_log_format = ( - '{}/{}: %(h)s %(t)s %(m)s %(U)s?%(q)s %(H)s %(s)s %(b)s "%(f)s" "%(a)s" %(D)s %(p)s %({{x-consumer-id}}i)s'.format( - os.getenv("SUPERVISOR_GROUP_NAME"), os.getenv("SUPERVISOR_PROCESS_NAME") - ) -) -max_requests = os.getenv("MAX_REQUESTS") -max_requests_jitter = os.getenv("MAX_REQUESTS_JITTER") -proc_name = os.getenv("SUPERVISOR_PROCESS_NAME") -reload = bool(os.getenv("RELOAD", False)) diff --git a/mpcontribs-api/maintenance.py b/mpcontribs-api/maintenance.py deleted file mode 100644 index 10d84a8d35..0000000000 --- a/mpcontribs-api/maintenance.py +++ /dev/null @@ -1,41 +0,0 @@ -from boltons.iterutils import remap -from mongoengine.queryset.visitor import Q -from mpcontribs.api import enter -from mpcontribs.api.contributions.document import Contributions -from mpcontribs.api.projects.document import Projects - - -def visit(path, key, value): - if isinstance(value, dict) and "display" in value: - return key, value["display"] - return True - - -def fix_units(name): - # make sure correct units are indicated in project.columns before running this - fields = list(Contributions._fields.keys()) - project = Projects.objects.with_id(name).reload("columns") - query = Q() - - for column in project.columns: - if column.unit and column.unit != "NaN": - path = column.path.replace(".", "__") - q = {f"{path}__unit__ne": column["unit"]} - query |= Q(**q) - - contribs = Contributions.objects(Q(project=name) & query).only(*fields) - num = contribs.count() - print(name, num) - - for idx, contrib in enumerate(contribs): - contrib.data = remap(contrib.data, visit=visit, enter=enter) # pull out display - contrib.save(signal_kwargs={"skip": True}) # reparse display with intended unit - - if idx and not idx % 250: - print(idx) - - -# additional maintenance functions -# TODO generate JSON/CSV project downloads -# TODO clean dangling notebooks -# TODO update_projects/stats diff --git a/mpcontribs-api/requirements/deployment.txt b/mpcontribs-api/requirements/deployment.txt deleted file mode 100644 index f9433f3e53..0000000000 --- a/mpcontribs-api/requirements/deployment.txt +++ /dev/null @@ -1,551 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.11 -# by the following command: -# -# pip-compile --output-file=MPContribs/mpcontribs-api/requirements/deployment.txt MPContribs/mpcontribs-api/pyproject.toml python/requirements.txt -# -anyio==4.13.0 - # via jupyter-server -apispec==5.2.2 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -argon2-cffi==25.1.0 - # via - # jupyter-server - # notebook -argon2-cffi-bindings==25.1.0 - # via argon2-cffi -arrow==1.4.0 - # via isoduration -asn1crypto==1.5.1 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -asttokens==3.0.1 - # via stack-data -atlasq-tschaume==0.11.1.dev2 - # via flask-mongorest-mpcontribs -attrs==26.1.0 - # via - # jsonschema - # referencing -backports-zstd==1.6.0 - # via flask-compress -beautifulsoup4==4.15.0 - # via nbconvert -bibtexparser==1.4.4 - # via pymatgen-core -bleach[css]==6.4.0 - # via nbconvert -blinker==1.9.0 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -boltons==25.0.0 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -boto3==1.43.30 - # via flask-mongorest-mpcontribs -botocore==1.43.30 - # via - # boto3 - # s3transfer -brotli==1.2.0 - # via flask-compress -bytecode==0.18.1 - # via ddtrace -certifi==2026.5.20 - # via requests -cffi==2.0.0 - # via - # argon2-cffi-bindings - # cryptography -charset-normalizer==3.4.7 - # via requests -click==8.4.1 - # via - # flask - # rq -comm==0.2.3 - # via ipykernel -contourpy==1.3.3 - # via matplotlib -cramjam==2.11.0 - # via python-snappy -crontab==1.0.5 - # via rq-scheduler -cryptography==49.0.0 - # via pyopenssl -css-html-js-minify==2.5.5 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -cycler==0.12.1 - # via matplotlib -dateparser==1.4.1 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -ddtrace==4.3.0 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -debugpy==1.8.21 - # via ipykernel -decorator==5.3.1 - # via ipython -defusedxml==0.7.1 - # via nbconvert -dnspython==2.8.0 - # via - # mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) - # pymongo -entrypoints==0.4 - # via jupyter-client -envier==0.6.1 - # via ddtrace -executing==2.2.1 - # via stack-data -fastjsonschema==2.21.2 - # via nbformat -fastnumbers==5.1.1 - # via flask-mongorest-mpcontribs -filetype==1.2.0 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -flasgger-tschaume==0.9.7 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -flask==3.1.3 - # via - # flasgger-tschaume - # flask-compress - # flask-marshmallow - # flask-mongoengine-tschaume - # flask-rq2 - # flask-sse -flask-compress==1.24 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -flask-marshmallow==1.4.0 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -flask-mongoengine-tschaume==1.1.0 - # via flask-mongorest-mpcontribs -flask-mongorest-mpcontribs==3.3.0 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -flask-rq2==18.3 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -flask-sse==1.0.0 - # via flask-mongorest-mpcontribs -flatten-dict==0.5.0 - # via flask-mongorest-mpcontribs -flexcache==0.3 - # via pint -flexparser==0.4 - # via pint -fonttools==4.63.0 - # via matplotlib -fqdn==1.5.1 - # via jsonschema -freezegun==1.5.5 - # via rq-scheduler -gevent==26.5.0 - # via gunicorn -greenlet==3.5.1 - # via gevent -gunicorn[gevent]==24.1.1 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -idna==3.18 - # via - # anyio - # jsonschema - # requests -ipykernel==6.29.5 - # via - # nbclassic - # notebook -ipython==9.14.1 - # via ipykernel -ipython-genutils==0.2.0 - # via - # nbclassic - # notebook -ipython-pygments-lexers==1.1.1 - # via ipython -isoduration==20.11.0 - # via jsonschema -itsdangerous==2.2.0 - # via flask -jedi==0.20.0 - # via ipython -jinja2==3.1.6 - # via - # flask - # jupyter-server - # mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) - # nbconvert - # notebook -jmespath==1.1.0 - # via - # boto3 - # botocore -joblib==1.5.3 - # via pymatgen-core -json2html==1.3.0 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -jsonpointer==3.1.1 - # via jsonschema -jsonschema[format-nongpl]==4.26.0 - # via - # flasgger-tschaume - # jupyter-events - # nbformat -jsonschema-specifications==2025.9.1 - # via jsonschema -jupyter-client==7.4.9 - # via - # ipykernel - # jupyter-server - # nbclient - # notebook -jupyter-core==5.9.1 - # via - # ipykernel - # jupyter-client - # jupyter-server - # nbclient - # nbconvert - # nbformat - # notebook -jupyter-events==0.12.1 - # via jupyter-server -jupyter-server==2.20.0 - # via notebook-shim -jupyter-server-terminals==0.5.4 - # via jupyter-server -jupyterlab-pygments==0.3.0 - # via nbconvert -kiwisolver==1.5.0 - # via matplotlib -lark==1.3.1 - # via rfc3987-syntax -lxml==6.1.1 - # via pymatgen-core -markupsafe==3.0.3 - # via - # jinja2 - # nbconvert - # werkzeug -marshmallow==3.26.2 - # via - # flask-marshmallow - # marshmallow-mongoengine - # mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -marshmallow-mongoengine==0.31.2 - # via flask-mongorest-mpcontribs -matplotlib==3.11.0 - # via - # -r python/requirements.txt - # pymatgen-core -matplotlib-inline==0.2.2 - # via - # ipykernel - # ipython -mimerender-pr36==0.0.2 - # via flask-mongorest-mpcontribs -mistune==3.2.1 - # via - # flasgger-tschaume - # nbconvert -mongoengine==0.29.3 - # via - # atlasq-tschaume - # flask-mongoengine-tschaume - # marshmallow-mongoengine -monty==2026.5.18 - # via pymatgen-core -more-itertools==11.1.0 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -mpmath==1.3.0 - # via sympy -narwhals==2.22.1 - # via plotly -nbclassic==1.3.3 - # via notebook -nbclient==0.11.0 - # via nbconvert -nbconvert==7.17.1 - # via - # jupyter-server - # notebook -nbformat==5.10.4 - # via - # jupyter-server - # mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) - # nbclient - # nbconvert - # notebook -nest-asyncio==1.6.0 - # via - # ipykernel - # jupyter-client - # nbclassic - # notebook -networkx==3.6.1 - # via pymatgen-core -notebook==6.5.7 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -notebook-shim==0.2.4 - # via nbclassic -numpy==2.4.6 - # via - # -r python/requirements.txt - # contourpy - # matplotlib - # monty - # mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) - # pandas - # pymatgen-core - # scipy - # spglib -opentelemetry-api==1.42.1 - # via ddtrace -orjson==3.11.9 - # via - # flask-mongorest-mpcontribs - # pymatgen-core -overrides==7.7.0 - # via jupyter-server -packaging==26.2 - # via - # gunicorn - # ipykernel - # jupyter-events - # jupyter-server - # marshmallow - # matplotlib - # nbconvert - # plotly -palettable==3.3.3 - # via pymatgen-core -pandas==3.0.3 - # via - # -r python/requirements.txt - # pymatgen-core -pandocfilters==1.5.1 - # via nbconvert -parso==0.8.7 - # via jedi -pexpect==4.9.0 - # via ipython -pillow==12.2.0 - # via matplotlib -pint==0.25.3 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -platformdirs==4.10.0 - # via - # jupyter-core - # pint -plotly==6.8.0 - # via pymatgen-core -prometheus-client==0.25.0 - # via - # jupyter-server - # notebook -prompt-toolkit==3.0.52 - # via ipython -psutil==7.2.2 - # via - # ipykernel - # ipython -psycopg2-binary==2.9.12 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -ptyprocess==0.7.0 - # via - # pexpect - # terminado -pure-eval==0.2.3 - # via stack-data -pycparser==3.0 - # via cffi -pygments==2.20.0 - # via - # ipython - # ipython-pygments-lexers - # nbconvert -pymatgen==2026.5.4 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -pymatgen-core==2026.5.18 - # via pymatgen -pymongo==4.17.0 - # via - # flask-mongorest-mpcontribs - # mongoengine -pyopenssl==26.3.0 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -pyparsing==3.3.2 - # via - # bibtexparser - # matplotlib -python-dateutil==2.9.0.post0 - # via - # arrow - # botocore - # dateparser - # flask-mongorest-mpcontribs - # freezegun - # jupyter-client - # matplotlib - # pandas - # rq-scheduler -python-json-logger==4.1.0 - # via jupyter-events -python-mimeparse==2.0.0 - # via mimerender-pr36 -python-snappy==0.7.3 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -pytz==2026.2 - # via dateparser -pyyaml==6.0.3 - # via - # flasgger-tschaume - # jupyter-events -pyzmq==27.1.0 - # via - # ipykernel - # jupyter-client - # jupyter-server - # notebook -redis==8.0.0 - # via - # flask-rq2 - # flask-sse - # rq -referencing==0.37.0 - # via - # jsonschema - # jsonschema-specifications - # jupyter-events -regex==2026.5.9 - # via dateparser -requests==2.34.2 - # via - # atlasq-tschaume - # pymatgen-core -rfc3339-validator==0.1.4 - # via - # jsonschema - # jupyter-events -rfc3986-validator==0.1.1 - # via - # jsonschema - # jupyter-events -rfc3987-syntax==1.1.0 - # via jsonschema -rpds-py==2026.5.1 - # via - # jsonschema - # referencing -rq==2.3.2 - # via - # flask-rq2 - # mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) - # rq-scheduler -rq-scheduler==0.14.0 - # via flask-rq2 -ruamel-yaml==0.19.1 - # via monty -s3transfer==0.18.0 - # via boto3 -scipy==1.17.1 - # via - # -r python/requirements.txt - # pymatgen-core -send2trash==2.1.0 - # via - # jupyter-server - # notebook -setproctitle==1.3.7 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -six==1.17.0 - # via - # flasgger-tschaume - # flask-sse - # python-dateutil - # rfc3339-validator -soupsieve==2.8.4 - # via beautifulsoup4 -spglib==2.7.0 - # via pymatgen-core -stack-data==0.6.3 - # via ipython -supervisor==4.3.0 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -sympy==1.14.0 - # via pymatgen-core -tabulate==0.10.0 - # via pymatgen-core -terminado==0.18.1 - # via - # jupyter-server - # jupyter-server-terminals - # notebook -tinycss2==1.5.1 - # via bleach -tornado==6.5.7 - # via - # ipykernel - # jupyter-client - # jupyter-server - # notebook - # terminado -tqdm==4.68.2 - # via pymatgen-core -traitlets==5.15.1 - # via - # ipykernel - # ipython - # jupyter-client - # jupyter-core - # jupyter-events - # jupyter-server - # matplotlib-inline - # nbclient - # nbconvert - # nbformat - # notebook -typing-extensions==4.15.0 - # via - # anyio - # beautifulsoup4 - # flexcache - # flexparser - # ipython - # opentelemetry-api - # pint - # pyopenssl - # referencing - # spglib -tzdata==2026.2 - # via arrow -tzlocal==5.4 - # via dateparser -uncertainties==3.2.3 - # via - # mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) - # pymatgen-core -uri-template==1.3.0 - # via jsonschema -urllib3==2.7.0 - # via - # botocore - # requests -wcwidth==0.8.1 - # via prompt-toolkit -webcolors==25.10.0 - # via jsonschema -webencodings==0.5.1 - # via - # bleach - # tinycss2 -websocket-client==1.9.0 - # via - # jupyter-server - # mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -werkzeug==3.1.8 - # via - # flasgger-tschaume - # flask -wrapt==2.2.1 - # via ddtrace -zope-event==6.2 - # via gevent -zope-interface==8.5 - # via gevent -zstandard==0.25.0 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) diff --git a/mpcontribs-api/requirements/ubuntu-latest_py3.11.txt b/mpcontribs-api/requirements/ubuntu-latest_py3.11.txt deleted file mode 100644 index 7a7c79fd0f..0000000000 --- a/mpcontribs-api/requirements/ubuntu-latest_py3.11.txt +++ /dev/null @@ -1,548 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.11 -# by the following command: -# -# pip-compile --output-file=requirements/ubuntu-latest_py3.11.txt -# -anyio==4.13.0 - # via jupyter-server -apispec==5.2.2 - # via mpcontribs-api (pyproject.toml) -argon2-cffi==25.1.0 - # via - # jupyter-server - # notebook -argon2-cffi-bindings==25.1.0 - # via argon2-cffi -arrow==1.4.0 - # via isoduration -asn1crypto==1.5.1 - # via mpcontribs-api (pyproject.toml) -asttokens==3.0.1 - # via stack-data -atlasq-tschaume==0.11.1.dev2 - # via flask-mongorest-mpcontribs -attrs==26.1.0 - # via - # jsonschema - # referencing -backports-zstd==1.5.0 - # via flask-compress -beautifulsoup4==4.14.3 - # via nbconvert -bibtexparser==1.4.4 - # via pymatgen-core -bleach[css]==6.4.0 - # via nbconvert -blinker==1.9.0 - # via mpcontribs-api (pyproject.toml) -boltons==25.0.0 - # via mpcontribs-api (pyproject.toml) -boto3==1.43.9 - # via flask-mongorest-mpcontribs -botocore==1.43.9 - # via - # boto3 - # s3transfer -brotli==1.2.0 - # via flask-compress -bytecode==0.17.0 - # via ddtrace -certifi==2026.4.22 - # via requests -cffi==2.0.0 - # via - # argon2-cffi-bindings - # cryptography -charset-normalizer==3.4.7 - # via requests -click==8.4.0 - # via - # flask - # rq -comm==0.2.3 - # via ipykernel -contourpy==1.3.3 - # via matplotlib -cramjam==2.11.0 - # via python-snappy -crontab==1.0.5 - # via rq-scheduler -cryptography==49.0.0 - # via pyopenssl -css-html-js-minify==2.5.5 - # via mpcontribs-api (pyproject.toml) -cycler==0.12.1 - # via matplotlib -dateparser==1.4.0 - # via mpcontribs-api (pyproject.toml) -ddtrace==4.3.0 - # via mpcontribs-api (pyproject.toml) -debugpy==1.8.20 - # via ipykernel -decorator==5.3.1 - # via ipython -defusedxml==0.7.1 - # via nbconvert -dnspython==2.8.0 - # via - # mpcontribs-api (pyproject.toml) - # pymongo -entrypoints==0.4 - # via jupyter-client -envier==0.6.1 - # via ddtrace -executing==2.2.1 - # via stack-data -fastjsonschema==2.21.2 - # via nbformat -fastnumbers==5.1.1 - # via flask-mongorest-mpcontribs -filetype==1.2.0 - # via mpcontribs-api (pyproject.toml) -flasgger-tschaume==0.9.7 - # via mpcontribs-api (pyproject.toml) -flask==3.1.3 - # via - # flasgger-tschaume - # flask-compress - # flask-marshmallow - # flask-mongoengine-tschaume - # flask-rq2 - # flask-sse -flask-compress==1.24 - # via mpcontribs-api (pyproject.toml) -flask-marshmallow==1.4.0 - # via mpcontribs-api (pyproject.toml) -flask-mongoengine-tschaume==1.1.0 - # via flask-mongorest-mpcontribs -flask-mongorest-mpcontribs==3.3.0 - # via mpcontribs-api (pyproject.toml) -flask-rq2==18.3 - # via mpcontribs-api (pyproject.toml) -flask-sse==1.0.0 - # via flask-mongorest-mpcontribs -flatten-dict==0.5.0 - # via flask-mongorest-mpcontribs -flexcache==0.3 - # via pint -flexparser==0.4 - # via pint -fonttools==4.63.0 - # via matplotlib -fqdn==1.5.1 - # via jsonschema -freezegun==1.5.5 - # via rq-scheduler -gevent==26.4.0 - # via gunicorn -greenlet==3.5.0 - # via gevent -gunicorn[gevent]==24.1.1 - # via mpcontribs-api (pyproject.toml) -idna==3.18 - # via - # anyio - # jsonschema - # requests -importlib-metadata==8.7.1 - # via opentelemetry-api -ipykernel==6.29.5 - # via - # nbclassic - # notebook -ipython==9.13.0 - # via ipykernel -ipython-genutils==0.2.0 - # via - # nbclassic - # notebook -ipython-pygments-lexers==1.1.1 - # via ipython -isoduration==20.11.0 - # via jsonschema -itsdangerous==2.2.0 - # via flask -jedi==0.20.0 - # via ipython -jinja2==3.1.6 - # via - # flask - # jupyter-server - # mpcontribs-api (pyproject.toml) - # nbconvert - # notebook -jmespath==1.1.0 - # via - # boto3 - # botocore -joblib==1.5.3 - # via pymatgen-core -json2html==1.3.0 - # via mpcontribs-api (pyproject.toml) -jsonpointer==3.1.1 - # via jsonschema -jsonschema[format-nongpl]==4.26.0 - # via - # flasgger-tschaume - # jupyter-events - # nbformat -jsonschema-specifications==2025.9.1 - # via jsonschema -jupyter-client==7.4.9 - # via - # ipykernel - # jupyter-server - # nbclient - # notebook -jupyter-core==5.9.1 - # via - # ipykernel - # jupyter-client - # jupyter-server - # nbclient - # nbconvert - # nbformat - # notebook -jupyter-events==0.12.1 - # via jupyter-server -jupyter-server==2.20.0 - # via notebook-shim -jupyter-server-terminals==0.5.4 - # via jupyter-server -jupyterlab-pygments==0.3.0 - # via nbconvert -kiwisolver==1.5.0 - # via matplotlib -lark==1.3.1 - # via rfc3987-syntax -lxml==6.1.0 - # via pymatgen-core -markupsafe==3.0.3 - # via - # jinja2 - # nbconvert - # werkzeug -marshmallow==3.26.2 - # via - # flask-marshmallow - # marshmallow-mongoengine - # mpcontribs-api (pyproject.toml) -marshmallow-mongoengine==0.31.2 - # via flask-mongorest-mpcontribs -matplotlib==3.10.9 - # via pymatgen-core -matplotlib-inline==0.2.2 - # via - # ipykernel - # ipython -mimerender-pr36==0.0.2 - # via flask-mongorest-mpcontribs -mistune==3.2.1 - # via - # flasgger-tschaume - # nbconvert -mongoengine==0.29.3 - # via - # atlasq-tschaume - # flask-mongoengine-tschaume - # marshmallow-mongoengine -monty==2026.5.18 - # via pymatgen-core -more-itertools==11.0.2 - # via mpcontribs-api (pyproject.toml) -mpmath==1.3.0 - # via sympy -narwhals==2.21.2 - # via plotly -nbclassic==1.3.3 - # via notebook -nbclient==0.10.4 - # via nbconvert -nbconvert==7.17.1 - # via - # jupyter-server - # notebook -nbformat==5.10.4 - # via - # jupyter-server - # mpcontribs-api (pyproject.toml) - # nbclient - # nbconvert - # notebook -nest-asyncio==1.6.0 - # via - # ipykernel - # jupyter-client - # nbclassic - # notebook -networkx==3.6.1 - # via pymatgen-core -notebook==6.5.7 - # via mpcontribs-api (pyproject.toml) -notebook-shim==0.2.4 - # via nbclassic -numpy==2.4.5 - # via - # contourpy - # matplotlib - # monty - # mpcontribs-api (pyproject.toml) - # pandas - # pymatgen-core - # scipy - # spglib -opentelemetry-api==1.41.1 - # via ddtrace -orjson==3.11.9 - # via - # flask-mongorest-mpcontribs - # pymatgen-core -overrides==7.7.0 - # via jupyter-server -packaging==26.2 - # via - # gunicorn - # ipykernel - # jupyter-events - # jupyter-server - # marshmallow - # matplotlib - # nbconvert - # plotly -palettable==3.3.3 - # via pymatgen-core -pandas==3.0.3 - # via pymatgen-core -pandocfilters==1.5.1 - # via nbconvert -parso==0.8.7 - # via jedi -pexpect==4.9.0 - # via ipython -pillow==12.2.0 - # via matplotlib -pint==0.25.3 - # via mpcontribs-api (pyproject.toml) -platformdirs==4.9.6 - # via - # jupyter-core - # pint -plotly==6.7.0 - # via pymatgen-core -prometheus-client==0.25.0 - # via - # jupyter-server - # notebook -prompt-toolkit==3.0.52 - # via ipython -psutil==7.2.2 - # via - # ipykernel - # ipython -psycopg2-binary==2.9.12 - # via mpcontribs-api (pyproject.toml) -ptyprocess==0.7.0 - # via - # pexpect - # terminado -pure-eval==0.2.3 - # via stack-data -pycparser==3.0 - # via cffi -pygments==2.20.0 - # via - # ipython - # ipython-pygments-lexers - # nbconvert -pymatgen==2026.5.4 - # via mpcontribs-api (pyproject.toml) -pymatgen-core==2026.5.17 - # via pymatgen -pymongo==4.17.0 - # via - # flask-mongorest-mpcontribs - # mongoengine -pyopenssl==26.2.0 - # via mpcontribs-api (pyproject.toml) -pyparsing==3.3.2 - # via - # bibtexparser - # matplotlib -python-dateutil==2.9.0.post0 - # via - # arrow - # botocore - # dateparser - # flask-mongorest-mpcontribs - # freezegun - # jupyter-client - # matplotlib - # pandas - # rq-scheduler -python-json-logger==4.1.0 - # via jupyter-events -python-mimeparse==2.0.0 - # via mimerender-pr36 -python-snappy==0.7.3 - # via mpcontribs-api (pyproject.toml) -pytz==2026.2 - # via dateparser -pyyaml==6.0.3 - # via - # flasgger-tschaume - # jupyter-events -pyzmq==27.1.0 - # via - # ipykernel - # jupyter-client - # jupyter-server - # notebook -redis==7.4.0 - # via - # flask-rq2 - # flask-sse - # rq -referencing==0.37.0 - # via - # jsonschema - # jsonschema-specifications - # jupyter-events -regex==2026.5.9 - # via dateparser -requests==2.34.2 - # via - # atlasq-tschaume - # pymatgen-core -rfc3339-validator==0.1.4 - # via - # jsonschema - # jupyter-events -rfc3986-validator==0.1.1 - # via - # jsonschema - # jupyter-events -rfc3987-syntax==1.1.0 - # via jsonschema -rpds-py==0.30.0 - # via - # jsonschema - # referencing -rq==2.3.2 - # via - # flask-rq2 - # mpcontribs-api (pyproject.toml) - # rq-scheduler -rq-scheduler==0.14.0 - # via flask-rq2 -ruamel-yaml==0.19.1 - # via monty -s3transfer==0.17.0 - # via boto3 -scipy==1.17.1 - # via pymatgen-core -send2trash==2.1.0 - # via - # jupyter-server - # notebook -setproctitle==1.3.7 - # via mpcontribs-api (pyproject.toml) -six==1.17.0 - # via - # flasgger-tschaume - # flask-sse - # python-dateutil - # rfc3339-validator -soupsieve==2.8.3 - # via beautifulsoup4 -spglib==2.7.0 - # via pymatgen-core -stack-data==0.6.3 - # via ipython -supervisor==4.3.0 - # via mpcontribs-api (pyproject.toml) -sympy==1.14.0 - # via pymatgen-core -tabulate==0.10.0 - # via pymatgen-core -terminado==0.18.1 - # via - # jupyter-server - # jupyter-server-terminals - # notebook -tinycss2==1.4.0 - # via bleach -tornado==6.5.7 - # via - # ipykernel - # jupyter-client - # jupyter-server - # notebook - # terminado -tqdm==4.67.3 - # via pymatgen-core -traitlets==5.15.0 - # via - # ipykernel - # ipython - # jupyter-client - # jupyter-core - # jupyter-events - # jupyter-server - # matplotlib-inline - # nbclient - # nbconvert - # nbformat - # notebook -typing-extensions==4.15.0 - # via - # anyio - # beautifulsoup4 - # flexcache - # flexparser - # ipython - # opentelemetry-api - # pint - # pyopenssl - # referencing - # spglib -tzdata==2026.2 - # via arrow -tzlocal==5.3.1 - # via dateparser -uncertainties==3.2.3 - # via - # mpcontribs-api (pyproject.toml) - # pymatgen-core -uri-template==1.3.0 - # via jsonschema -urllib3==2.7.0 - # via - # botocore - # requests -wcwidth==0.7.0 - # via prompt-toolkit -webcolors==25.10.0 - # via jsonschema -webencodings==0.5.1 - # via - # bleach - # tinycss2 -websocket-client==1.9.0 - # via - # jupyter-server - # mpcontribs-api (pyproject.toml) -werkzeug==3.1.8 - # via - # flasgger-tschaume - # flask -wrapt==2.1.2 - # via ddtrace -zipp==3.23.1 - # via importlib-metadata -zope-event==6.2 - # via gevent -zope-interface==8.4 - # via gevent -zstandard==0.25.0 - # via mpcontribs-api (pyproject.toml) diff --git a/mpcontribs-api/requirements/ubuntu-latest_py3.11_extras.txt b/mpcontribs-api/requirements/ubuntu-latest_py3.11_extras.txt deleted file mode 100644 index 6387c63ec8..0000000000 --- a/mpcontribs-api/requirements/ubuntu-latest_py3.11_extras.txt +++ /dev/null @@ -1,648 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.11 -# by the following command: -# -# pip-compile --all-extras --output-file=requirements/ubuntu-latest_py3.11_extras.txt -# -anyio==4.13.0 - # via jupyter-server -apispec==5.2.2 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -argon2-cffi==25.1.0 - # via - # jupyter-server - # notebook -argon2-cffi-bindings==25.1.0 - # via argon2-cffi -arrow==1.4.0 - # via isoduration -asn1crypto==1.5.1 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -asttokens==3.0.1 - # via stack-data -atlasq-tschaume==0.11.1.dev2 - # via flask-mongorest-mpcontribs -attrs==26.1.0 - # via - # jsonschema - # referencing -backports-zstd==1.5.0 - # via flask-compress -beautifulsoup4==4.14.3 - # via nbconvert -bibtexparser==1.4.4 - # via pymatgen-core -bleach[css]==6.3.0 - # via nbconvert -blinker==1.9.0 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -boltons==25.0.0 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -boto3==1.43.9 - # via flask-mongorest-mpcontribs -botocore==1.43.9 - # via - # boto3 - # s3transfer -brotli==1.2.0 - # via flask-compress -bytecode==0.17.0 - # via ddtrace -certifi==2026.4.22 - # via requests -cffi==2.0.0 - # via - # argon2-cffi-bindings - # cryptography -charset-normalizer==3.4.7 - # via requests -click==8.4.0 - # via - # flask - # rq -comm==0.2.3 - # via ipykernel -contourpy==1.3.3 - # via matplotlib -cramjam==2.11.0 - # via python-snappy -crontab==1.0.5 - # via rq-scheduler -cryptography==48.0.0 - # via pyopenssl -css-html-js-minify==2.5.5 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -cycler==0.12.1 - # via matplotlib -dateparser==1.4.0 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -ddtrace==4.3.0 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -debugpy==1.8.20 - # via ipykernel -decorator==5.3.1 - # via ipython -defusedxml==0.7.1 - # via nbconvert -dnspython==2.8.0 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) - # pymongo -entrypoints==0.4 - # via jupyter-client -envier==0.6.1 - # via ddtrace -execnet==2.1.2 - # via pytest-xdist -executing==2.2.1 - # via stack-data -fastjsonschema==2.21.2 - # via nbformat -fastnumbers==5.1.1 - # via flask-mongorest-mpcontribs -filetype==1.2.0 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -flake8==7.3.0 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) - # pytest-flake8 -flasgger-tschaume==0.9.7 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -flask==2.2.5 - # via - # flasgger-tschaume - # flask-compress - # flask-marshmallow - # flask-mongoengine-tschaume - # flask-rq2 - # flask-sse -flask-compress==1.24 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -flask-marshmallow==1.4.0 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -flask-mongoengine-tschaume==1.1.0 - # via flask-mongorest-mpcontribs -flask-mongorest-mpcontribs==3.3.0 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -flask-rq2==18.3 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -flask-sse==1.0.0 - # via flask-mongorest-mpcontribs -flatten-dict==0.5.0 - # via flask-mongorest-mpcontribs -flexcache==0.3 - # via pint -flexparser==0.4 - # via pint -fonttools==4.63.0 - # via matplotlib -fqdn==1.5.1 - # via jsonschema -freezegun==1.5.5 - # via rq-scheduler -gevent==26.4.0 - # via gunicorn -greenlet==3.5.0 - # via gevent -gunicorn[gevent]==24.1.1 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -idna==3.15 - # via - # anyio - # jsonschema - # requests -importlib-metadata==8.7.1 - # via opentelemetry-api -iniconfig==2.3.0 - # via pytest -ipykernel==6.29.5 - # via - # nbclassic - # notebook -ipython==9.13.0 - # via ipykernel -ipython-genutils==0.2.0 - # via - # nbclassic - # notebook -ipython-pygments-lexers==1.1.1 - # via ipython -isoduration==20.11.0 - # via jsonschema -itsdangerous==2.2.0 - # via flask -jedi==0.20.0 - # via ipython -jinja2==3.1.6 - # via - # flask - # jupyter-server - # mpcontribs-api - # mpcontribs-api (pyproject.toml) - # nbconvert - # notebook -jmespath==1.1.0 - # via - # boto3 - # botocore -joblib==1.5.3 - # via pymatgen-core -json2html==1.3.0 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -jsonpointer==3.1.1 - # via jsonschema -jsonschema[format-nongpl]==4.26.0 - # via - # flasgger-tschaume - # jupyter-events - # nbformat -jsonschema-specifications==2025.9.1 - # via jsonschema -jupyter-client==7.4.9 - # via - # ipykernel - # jupyter-server - # nbclient - # notebook -jupyter-core==5.9.1 - # via - # ipykernel - # jupyter-client - # jupyter-server - # nbclient - # nbconvert - # nbformat - # notebook -jupyter-events==0.12.1 - # via jupyter-server -jupyter-server==2.18.2 - # via notebook-shim -jupyter-server-terminals==0.5.4 - # via jupyter-server -jupyterlab-pygments==0.3.0 - # via nbconvert -kiwisolver==1.5.0 - # via matplotlib -lark==1.3.1 - # via rfc3987-syntax -lxml==6.1.0 - # via pymatgen-core -markupsafe==3.0.3 - # via - # jinja2 - # nbconvert - # werkzeug -marshmallow==3.26.2 - # via - # flask-marshmallow - # marshmallow-mongoengine - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -marshmallow-mongoengine==0.31.2 - # via flask-mongorest-mpcontribs -matplotlib==3.10.9 - # via pymatgen-core -matplotlib-inline==0.2.2 - # via - # ipykernel - # ipython -mccabe==0.7.0 - # via flake8 -mimerender-pr36==0.0.2 - # via flask-mongorest-mpcontribs -mistune==3.2.1 - # via - # flasgger-tschaume - # nbconvert -mongoengine==0.29.3 - # via - # atlasq-tschaume - # flask-mongoengine-tschaume - # marshmallow-mongoengine -monty==2026.5.18 - # via pymatgen-core -more-itertools==11.0.2 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -mpcontribs-api[dev] @ file:///home/runner/work/MPContribs/MPContribs/mpcontribs-api - # via mpcontribs-api (pyproject.toml) -mpmath==1.3.0 - # via sympy -narwhals==2.21.2 - # via plotly -nbclassic==1.3.3 - # via notebook -nbclient==0.10.4 - # via nbconvert -nbconvert==7.17.1 - # via - # jupyter-server - # notebook -nbformat==5.10.4 - # via - # jupyter-server - # mpcontribs-api - # mpcontribs-api (pyproject.toml) - # nbclient - # nbconvert - # notebook -nest-asyncio==1.6.0 - # via - # ipykernel - # jupyter-client - # nbclassic - # notebook -networkx==3.6.1 - # via pymatgen-core -notebook==6.5.7 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -notebook-shim==0.2.4 - # via nbclassic -numpy==2.4.5 - # via - # contourpy - # matplotlib - # monty - # mpcontribs-api - # mpcontribs-api (pyproject.toml) - # pandas - # pymatgen-core - # scipy - # spglib -opentelemetry-api==1.41.1 - # via ddtrace -orjson==3.11.9 - # via - # flask-mongorest-mpcontribs - # pymatgen-core -overrides==7.7.0 - # via jupyter-server -packaging==26.2 - # via - # gunicorn - # ipykernel - # jupyter-events - # jupyter-server - # marshmallow - # matplotlib - # nbconvert - # plotly - # pytest -palettable==3.3.3 - # via pymatgen-core -pandas==3.0.3 - # via pymatgen-core -pandocfilters==1.5.1 - # via nbconvert -parso==0.8.7 - # via jedi -pexpect==4.9.0 - # via ipython -pillow==12.2.0 - # via matplotlib -pint==0.25.3 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -platformdirs==4.9.6 - # via - # jupyter-core - # pint -plotly==6.7.0 - # via pymatgen-core -pluggy==1.6.0 - # via pytest -prometheus-client==0.25.0 - # via - # jupyter-server - # notebook -prompt-toolkit==3.0.52 - # via ipython -psutil==7.2.2 - # via - # ipykernel - # ipython -psycopg2-binary==2.9.12 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -ptyprocess==0.7.0 - # via - # pexpect - # terminado -pure-eval==0.2.3 - # via stack-data -pycodestyle==2.14.0 - # via - # flake8 - # pytest-pycodestyle -pycparser==3.0 - # via cffi -pyflakes==3.4.0 - # via flake8 -pygments==2.20.0 - # via - # ipython - # ipython-pygments-lexers - # nbconvert - # pytest -pymatgen==2026.5.4 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -pymatgen-core==2026.5.17 - # via pymatgen -pymongo==4.17.0 - # via - # flask-mongorest-mpcontribs - # mongoengine -pyopenssl==26.2.0 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -pyparsing==3.3.2 - # via - # bibtexparser - # matplotlib -pytest==9.0.3 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) - # pytest-flake8 - # pytest-pycodestyle - # pytest-xdist -pytest-flake8==1.3.0 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -pytest-pycodestyle==2.5.0 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -pytest-xdist==3.8.0 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -python-dateutil==2.9.0.post0 - # via - # arrow - # botocore - # dateparser - # flask-mongorest-mpcontribs - # freezegun - # jupyter-client - # matplotlib - # pandas - # rq-scheduler -python-json-logger==4.1.0 - # via jupyter-events -python-mimeparse==2.0.0 - # via mimerender-pr36 -python-snappy==0.7.3 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -pytz==2026.2 - # via dateparser -pyyaml==6.0.3 - # via - # flasgger-tschaume - # jupyter-events -pyzmq==27.1.0 - # via - # ipykernel - # jupyter-client - # jupyter-server - # notebook -redis==7.4.0 - # via - # flask-rq2 - # flask-sse - # rq -referencing==0.37.0 - # via - # jsonschema - # jsonschema-specifications - # jupyter-events -regex==2026.5.9 - # via dateparser -requests==2.34.2 - # via - # atlasq-tschaume - # pymatgen-core -rfc3339-validator==0.1.4 - # via - # jsonschema - # jupyter-events -rfc3986-validator==0.1.1 - # via - # jsonschema - # jupyter-events -rfc3987-syntax==1.1.0 - # via jsonschema -rpds-py==0.30.0 - # via - # jsonschema - # referencing -rq==2.3.2 - # via - # flask-rq2 - # mpcontribs-api - # mpcontribs-api (pyproject.toml) - # rq-scheduler -rq-scheduler==0.14.0 - # via flask-rq2 -ruamel-yaml==0.19.1 - # via monty -s3transfer==0.17.0 - # via boto3 -scipy==1.17.1 - # via pymatgen-core -send2trash==2.1.0 - # via - # jupyter-server - # notebook -setproctitle==1.3.7 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -six==1.17.0 - # via - # flasgger-tschaume - # flask-sse - # python-dateutil - # rfc3339-validator -soupsieve==2.8.3 - # via beautifulsoup4 -spglib==2.7.0 - # via pymatgen-core -stack-data==0.6.3 - # via ipython -supervisor==4.3.0 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -sympy==1.14.0 - # via pymatgen-core -tabulate==0.10.0 - # via pymatgen-core -terminado==0.18.1 - # via - # jupyter-server - # jupyter-server-terminals - # notebook -tinycss2==1.4.0 - # via bleach -tornado==6.5.5 - # via - # ipykernel - # jupyter-client - # jupyter-server - # notebook - # terminado -tqdm==4.67.3 - # via pymatgen-core -traitlets==5.15.0 - # via - # ipykernel - # ipython - # jupyter-client - # jupyter-core - # jupyter-events - # jupyter-server - # matplotlib-inline - # nbclient - # nbconvert - # nbformat - # notebook -typing-extensions==4.15.0 - # via - # anyio - # beautifulsoup4 - # flexcache - # flexparser - # ipython - # opentelemetry-api - # pint - # pyopenssl - # referencing - # spglib -tzdata==2026.2 - # via arrow -tzlocal==5.3.1 - # via dateparser -uncertainties==3.2.3 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) - # pymatgen-core -uri-template==1.3.0 - # via jsonschema -urllib3==2.7.0 - # via - # botocore - # requests -wcwidth==0.7.0 - # via prompt-toolkit -webcolors==25.10.0 - # via jsonschema -webencodings==0.5.1 - # via - # bleach - # tinycss2 -websocket-client==1.9.0 - # via - # jupyter-server - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -werkzeug==3.1.8 - # via - # flasgger-tschaume - # flask -wrapt==2.1.2 - # via ddtrace -zipp==3.23.1 - # via importlib-metadata -zope-event==6.2 - # via gevent -zope-interface==8.4 - # via gevent -zstandard==0.25.0 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) diff --git a/mpcontribs-api/requirements/ubuntu-latest_py3.12.txt b/mpcontribs-api/requirements/ubuntu-latest_py3.12.txt deleted file mode 100644 index 01f644f090..0000000000 --- a/mpcontribs-api/requirements/ubuntu-latest_py3.12.txt +++ /dev/null @@ -1,545 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.12 -# by the following command: -# -# pip-compile --output-file=requirements/ubuntu-latest_py3.12.txt -# -anyio==4.13.0 - # via jupyter-server -apispec==5.2.2 - # via mpcontribs-api (pyproject.toml) -argon2-cffi==25.1.0 - # via - # jupyter-server - # notebook -argon2-cffi-bindings==25.1.0 - # via argon2-cffi -arrow==1.4.0 - # via isoduration -asn1crypto==1.5.1 - # via mpcontribs-api (pyproject.toml) -asttokens==3.0.1 - # via stack-data -atlasq-tschaume==0.11.1.dev2 - # via flask-mongorest-mpcontribs -attrs==26.1.0 - # via - # jsonschema - # referencing -backports-zstd==1.5.0 - # via flask-compress -beautifulsoup4==4.14.3 - # via nbconvert -bibtexparser==1.4.4 - # via pymatgen-core -bleach[css]==6.4.0 - # via nbconvert -blinker==1.9.0 - # via mpcontribs-api (pyproject.toml) -boltons==25.0.0 - # via mpcontribs-api (pyproject.toml) -boto3==1.43.9 - # via flask-mongorest-mpcontribs -botocore==1.43.9 - # via - # boto3 - # s3transfer -brotli==1.2.0 - # via flask-compress -bytecode==0.17.0 - # via ddtrace -certifi==2026.4.22 - # via requests -cffi==2.0.0 - # via - # argon2-cffi-bindings - # cryptography -charset-normalizer==3.4.7 - # via requests -click==8.4.0 - # via - # flask - # rq -comm==0.2.3 - # via ipykernel -contourpy==1.3.3 - # via matplotlib -cramjam==2.11.0 - # via python-snappy -crontab==1.0.5 - # via rq-scheduler -cryptography==49.0.0 - # via pyopenssl -css-html-js-minify==2.5.5 - # via mpcontribs-api (pyproject.toml) -cycler==0.12.1 - # via matplotlib -dateparser==1.4.0 - # via mpcontribs-api (pyproject.toml) -ddtrace==4.3.0 - # via mpcontribs-api (pyproject.toml) -debugpy==1.8.20 - # via ipykernel -decorator==5.3.1 - # via ipython -defusedxml==0.7.1 - # via nbconvert -dnspython==2.8.0 - # via - # mpcontribs-api (pyproject.toml) - # pymongo -entrypoints==0.4 - # via jupyter-client -envier==0.6.1 - # via ddtrace -executing==2.2.1 - # via stack-data -fastjsonschema==2.21.2 - # via nbformat -fastnumbers==5.1.1 - # via flask-mongorest-mpcontribs -filetype==1.2.0 - # via mpcontribs-api (pyproject.toml) -flasgger-tschaume==0.9.7 - # via mpcontribs-api (pyproject.toml) -flask==3.1.3 - # via - # flasgger-tschaume - # flask-compress - # flask-marshmallow - # flask-mongoengine-tschaume - # flask-rq2 - # flask-sse -flask-compress==1.24 - # via mpcontribs-api (pyproject.toml) -flask-marshmallow==1.4.0 - # via mpcontribs-api (pyproject.toml) -flask-mongoengine-tschaume==1.1.0 - # via flask-mongorest-mpcontribs -flask-mongorest-mpcontribs==3.3.0 - # via mpcontribs-api (pyproject.toml) -flask-rq2==18.3 - # via mpcontribs-api (pyproject.toml) -flask-sse==1.0.0 - # via flask-mongorest-mpcontribs -flatten-dict==0.5.0 - # via flask-mongorest-mpcontribs -flexcache==0.3 - # via pint -flexparser==0.4 - # via pint -fonttools==4.63.0 - # via matplotlib -fqdn==1.5.1 - # via jsonschema -freezegun==1.5.5 - # via rq-scheduler -gevent==26.4.0 - # via gunicorn -greenlet==3.5.0 - # via gevent -gunicorn[gevent]==24.1.1 - # via mpcontribs-api (pyproject.toml) -idna==3.18 - # via - # anyio - # jsonschema - # requests -importlib-metadata==8.7.1 - # via opentelemetry-api -ipykernel==6.29.5 - # via - # nbclassic - # notebook -ipython==9.13.0 - # via ipykernel -ipython-genutils==0.2.0 - # via - # nbclassic - # notebook -ipython-pygments-lexers==1.1.1 - # via ipython -isoduration==20.11.0 - # via jsonschema -itsdangerous==2.2.0 - # via flask -jedi==0.20.0 - # via ipython -jinja2==3.1.6 - # via - # flask - # jupyter-server - # mpcontribs-api (pyproject.toml) - # nbconvert - # notebook -jmespath==1.1.0 - # via - # boto3 - # botocore -joblib==1.5.3 - # via pymatgen-core -json2html==1.3.0 - # via mpcontribs-api (pyproject.toml) -jsonpointer==3.1.1 - # via jsonschema -jsonschema[format-nongpl]==4.26.0 - # via - # flasgger-tschaume - # jupyter-events - # nbformat -jsonschema-specifications==2025.9.1 - # via jsonschema -jupyter-client==7.4.9 - # via - # ipykernel - # jupyter-server - # nbclient - # notebook -jupyter-core==5.9.1 - # via - # ipykernel - # jupyter-client - # jupyter-server - # nbclient - # nbconvert - # nbformat - # notebook -jupyter-events==0.12.1 - # via jupyter-server -jupyter-server==2.20.0 - # via notebook-shim -jupyter-server-terminals==0.5.4 - # via jupyter-server -jupyterlab-pygments==0.3.0 - # via nbconvert -kiwisolver==1.5.0 - # via matplotlib -lark==1.3.1 - # via rfc3987-syntax -lxml==6.1.0 - # via pymatgen-core -markupsafe==3.0.3 - # via - # jinja2 - # nbconvert - # werkzeug -marshmallow==3.26.2 - # via - # flask-marshmallow - # marshmallow-mongoengine - # mpcontribs-api (pyproject.toml) -marshmallow-mongoengine==0.31.2 - # via flask-mongorest-mpcontribs -matplotlib==3.10.9 - # via pymatgen-core -matplotlib-inline==0.2.2 - # via - # ipykernel - # ipython -mimerender-pr36==0.0.2 - # via flask-mongorest-mpcontribs -mistune==3.2.1 - # via - # flasgger-tschaume - # nbconvert -mongoengine==0.29.3 - # via - # atlasq-tschaume - # flask-mongoengine-tschaume - # marshmallow-mongoengine -monty==2026.5.18 - # via pymatgen-core -more-itertools==11.0.2 - # via mpcontribs-api (pyproject.toml) -mpmath==1.3.0 - # via sympy -narwhals==2.21.2 - # via plotly -nbclassic==1.3.3 - # via notebook -nbclient==0.10.4 - # via nbconvert -nbconvert==7.17.1 - # via - # jupyter-server - # notebook -nbformat==5.10.4 - # via - # jupyter-server - # mpcontribs-api (pyproject.toml) - # nbclient - # nbconvert - # notebook -nest-asyncio==1.6.0 - # via - # ipykernel - # jupyter-client - # nbclassic - # notebook -networkx==3.6.1 - # via pymatgen-core -notebook==6.5.7 - # via mpcontribs-api (pyproject.toml) -notebook-shim==0.2.4 - # via nbclassic -numpy==2.4.5 - # via - # contourpy - # matplotlib - # monty - # mpcontribs-api (pyproject.toml) - # pandas - # pymatgen-core - # scipy - # spglib -opentelemetry-api==1.41.1 - # via ddtrace -orjson==3.11.9 - # via - # flask-mongorest-mpcontribs - # pymatgen-core -packaging==26.2 - # via - # gunicorn - # ipykernel - # jupyter-events - # jupyter-server - # marshmallow - # matplotlib - # nbconvert - # plotly -palettable==3.3.3 - # via pymatgen-core -pandas==3.0.3 - # via pymatgen-core -pandocfilters==1.5.1 - # via nbconvert -parso==0.8.7 - # via jedi -pexpect==4.9.0 - # via ipython -pillow==12.2.0 - # via matplotlib -pint==0.25.3 - # via mpcontribs-api (pyproject.toml) -platformdirs==4.9.6 - # via - # jupyter-core - # pint -plotly==6.7.0 - # via pymatgen-core -prometheus-client==0.25.0 - # via - # jupyter-server - # notebook -prompt-toolkit==3.0.52 - # via ipython -psutil==7.2.2 - # via - # ipykernel - # ipython -psycopg2-binary==2.9.12 - # via mpcontribs-api (pyproject.toml) -ptyprocess==0.7.0 - # via - # pexpect - # terminado -pure-eval==0.2.3 - # via stack-data -pycparser==3.0 - # via cffi -pygments==2.20.0 - # via - # ipython - # ipython-pygments-lexers - # nbconvert -pymatgen==2026.5.4 - # via mpcontribs-api (pyproject.toml) -pymatgen-core==2026.5.17 - # via pymatgen -pymongo==4.17.0 - # via - # flask-mongorest-mpcontribs - # mongoengine -pyopenssl==26.2.0 - # via mpcontribs-api (pyproject.toml) -pyparsing==3.3.2 - # via - # bibtexparser - # matplotlib -python-dateutil==2.9.0.post0 - # via - # arrow - # botocore - # dateparser - # flask-mongorest-mpcontribs - # freezegun - # jupyter-client - # matplotlib - # pandas - # rq-scheduler -python-json-logger==4.1.0 - # via jupyter-events -python-mimeparse==2.0.0 - # via mimerender-pr36 -python-snappy==0.7.3 - # via mpcontribs-api (pyproject.toml) -pytz==2026.2 - # via dateparser -pyyaml==6.0.3 - # via - # flasgger-tschaume - # jupyter-events -pyzmq==27.1.0 - # via - # ipykernel - # jupyter-client - # jupyter-server - # notebook -redis==7.4.0 - # via - # flask-rq2 - # flask-sse - # rq -referencing==0.37.0 - # via - # jsonschema - # jsonschema-specifications - # jupyter-events -regex==2026.5.9 - # via dateparser -requests==2.34.2 - # via - # atlasq-tschaume - # pymatgen-core -rfc3339-validator==0.1.4 - # via - # jsonschema - # jupyter-events -rfc3986-validator==0.1.1 - # via - # jsonschema - # jupyter-events -rfc3987-syntax==1.1.0 - # via jsonschema -rpds-py==0.30.0 - # via - # jsonschema - # referencing -rq==2.3.2 - # via - # flask-rq2 - # mpcontribs-api (pyproject.toml) - # rq-scheduler -rq-scheduler==0.14.0 - # via flask-rq2 -ruamel-yaml==0.19.1 - # via monty -s3transfer==0.17.0 - # via boto3 -scipy==1.17.1 - # via pymatgen-core -send2trash==2.1.0 - # via - # jupyter-server - # notebook -setproctitle==1.3.7 - # via mpcontribs-api (pyproject.toml) -six==1.17.0 - # via - # flasgger-tschaume - # flask-sse - # python-dateutil - # rfc3339-validator -soupsieve==2.8.3 - # via beautifulsoup4 -spglib==2.7.0 - # via pymatgen-core -stack-data==0.6.3 - # via ipython -supervisor==4.3.0 - # via mpcontribs-api (pyproject.toml) -sympy==1.14.0 - # via pymatgen-core -tabulate==0.10.0 - # via pymatgen-core -terminado==0.18.1 - # via - # jupyter-server - # jupyter-server-terminals - # notebook -tinycss2==1.4.0 - # via bleach -tornado==6.5.7 - # via - # ipykernel - # jupyter-client - # jupyter-server - # notebook - # terminado -tqdm==4.67.3 - # via pymatgen-core -traitlets==5.15.0 - # via - # ipykernel - # ipython - # jupyter-client - # jupyter-core - # jupyter-events - # jupyter-server - # matplotlib-inline - # nbclient - # nbconvert - # nbformat - # notebook -typing-extensions==4.15.0 - # via - # anyio - # beautifulsoup4 - # flexcache - # flexparser - # opentelemetry-api - # pint - # pyopenssl - # referencing - # spglib -tzdata==2026.2 - # via arrow -tzlocal==5.3.1 - # via dateparser -uncertainties==3.2.3 - # via - # mpcontribs-api (pyproject.toml) - # pymatgen-core -uri-template==1.3.0 - # via jsonschema -urllib3==2.7.0 - # via - # botocore - # requests -wcwidth==0.7.0 - # via prompt-toolkit -webcolors==25.10.0 - # via jsonschema -webencodings==0.5.1 - # via - # bleach - # tinycss2 -websocket-client==1.9.0 - # via - # jupyter-server - # mpcontribs-api (pyproject.toml) -werkzeug==3.1.8 - # via - # flasgger-tschaume - # flask -wrapt==2.1.2 - # via ddtrace -zipp==3.23.1 - # via importlib-metadata -zope-event==6.2 - # via gevent -zope-interface==8.4 - # via gevent -zstandard==0.25.0 - # via mpcontribs-api (pyproject.toml) diff --git a/mpcontribs-api/requirements/ubuntu-latest_py3.12_extras.txt b/mpcontribs-api/requirements/ubuntu-latest_py3.12_extras.txt deleted file mode 100644 index cd894fd1d1..0000000000 --- a/mpcontribs-api/requirements/ubuntu-latest_py3.12_extras.txt +++ /dev/null @@ -1,645 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.12 -# by the following command: -# -# pip-compile --all-extras --output-file=requirements/ubuntu-latest_py3.12_extras.txt -# -anyio==4.13.0 - # via jupyter-server -apispec==5.2.2 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -argon2-cffi==25.1.0 - # via - # jupyter-server - # notebook -argon2-cffi-bindings==25.1.0 - # via argon2-cffi -arrow==1.4.0 - # via isoduration -asn1crypto==1.5.1 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -asttokens==3.0.1 - # via stack-data -atlasq-tschaume==0.11.1.dev2 - # via flask-mongorest-mpcontribs -attrs==26.1.0 - # via - # jsonschema - # referencing -backports-zstd==1.5.0 - # via flask-compress -beautifulsoup4==4.14.3 - # via nbconvert -bibtexparser==1.4.4 - # via pymatgen-core -bleach[css]==6.3.0 - # via nbconvert -blinker==1.9.0 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -boltons==25.0.0 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -boto3==1.43.9 - # via flask-mongorest-mpcontribs -botocore==1.43.9 - # via - # boto3 - # s3transfer -brotli==1.2.0 - # via flask-compress -bytecode==0.17.0 - # via ddtrace -certifi==2026.4.22 - # via requests -cffi==2.0.0 - # via - # argon2-cffi-bindings - # cryptography -charset-normalizer==3.4.7 - # via requests -click==8.4.0 - # via - # flask - # rq -comm==0.2.3 - # via ipykernel -contourpy==1.3.3 - # via matplotlib -cramjam==2.11.0 - # via python-snappy -crontab==1.0.5 - # via rq-scheduler -cryptography==48.0.0 - # via pyopenssl -css-html-js-minify==2.5.5 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -cycler==0.12.1 - # via matplotlib -dateparser==1.4.0 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -ddtrace==4.3.0 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -debugpy==1.8.20 - # via ipykernel -decorator==5.3.1 - # via ipython -defusedxml==0.7.1 - # via nbconvert -dnspython==2.8.0 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) - # pymongo -entrypoints==0.4 - # via jupyter-client -envier==0.6.1 - # via ddtrace -execnet==2.1.2 - # via pytest-xdist -executing==2.2.1 - # via stack-data -fastjsonschema==2.21.2 - # via nbformat -fastnumbers==5.1.1 - # via flask-mongorest-mpcontribs -filetype==1.2.0 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -flake8==7.3.0 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) - # pytest-flake8 -flasgger-tschaume==0.9.7 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -flask==2.2.5 - # via - # flasgger-tschaume - # flask-compress - # flask-marshmallow - # flask-mongoengine-tschaume - # flask-rq2 - # flask-sse -flask-compress==1.24 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -flask-marshmallow==1.4.0 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -flask-mongoengine-tschaume==1.1.0 - # via flask-mongorest-mpcontribs -flask-mongorest-mpcontribs==3.3.0 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -flask-rq2==18.3 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -flask-sse==1.0.0 - # via flask-mongorest-mpcontribs -flatten-dict==0.5.0 - # via flask-mongorest-mpcontribs -flexcache==0.3 - # via pint -flexparser==0.4 - # via pint -fonttools==4.63.0 - # via matplotlib -fqdn==1.5.1 - # via jsonschema -freezegun==1.5.5 - # via rq-scheduler -gevent==26.4.0 - # via gunicorn -greenlet==3.5.0 - # via gevent -gunicorn[gevent]==24.1.1 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -idna==3.15 - # via - # anyio - # jsonschema - # requests -importlib-metadata==8.7.1 - # via opentelemetry-api -iniconfig==2.3.0 - # via pytest -ipykernel==6.29.5 - # via - # nbclassic - # notebook -ipython==9.13.0 - # via ipykernel -ipython-genutils==0.2.0 - # via - # nbclassic - # notebook -ipython-pygments-lexers==1.1.1 - # via ipython -isoduration==20.11.0 - # via jsonschema -itsdangerous==2.2.0 - # via flask -jedi==0.20.0 - # via ipython -jinja2==3.1.6 - # via - # flask - # jupyter-server - # mpcontribs-api - # mpcontribs-api (pyproject.toml) - # nbconvert - # notebook -jmespath==1.1.0 - # via - # boto3 - # botocore -joblib==1.5.3 - # via pymatgen-core -json2html==1.3.0 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -jsonpointer==3.1.1 - # via jsonschema -jsonschema[format-nongpl]==4.26.0 - # via - # flasgger-tschaume - # jupyter-events - # nbformat -jsonschema-specifications==2025.9.1 - # via jsonschema -jupyter-client==7.4.9 - # via - # ipykernel - # jupyter-server - # nbclient - # notebook -jupyter-core==5.9.1 - # via - # ipykernel - # jupyter-client - # jupyter-server - # nbclient - # nbconvert - # nbformat - # notebook -jupyter-events==0.12.1 - # via jupyter-server -jupyter-server==2.18.2 - # via notebook-shim -jupyter-server-terminals==0.5.4 - # via jupyter-server -jupyterlab-pygments==0.3.0 - # via nbconvert -kiwisolver==1.5.0 - # via matplotlib -lark==1.3.1 - # via rfc3987-syntax -lxml==6.1.0 - # via pymatgen-core -markupsafe==3.0.3 - # via - # jinja2 - # nbconvert - # werkzeug -marshmallow==3.26.2 - # via - # flask-marshmallow - # marshmallow-mongoengine - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -marshmallow-mongoengine==0.31.2 - # via flask-mongorest-mpcontribs -matplotlib==3.10.9 - # via pymatgen-core -matplotlib-inline==0.2.2 - # via - # ipykernel - # ipython -mccabe==0.7.0 - # via flake8 -mimerender-pr36==0.0.2 - # via flask-mongorest-mpcontribs -mistune==3.2.1 - # via - # flasgger-tschaume - # nbconvert -mongoengine==0.29.3 - # via - # atlasq-tschaume - # flask-mongoengine-tschaume - # marshmallow-mongoengine -monty==2026.5.18 - # via pymatgen-core -more-itertools==11.0.2 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -mpcontribs-api[dev] @ file:///home/runner/work/MPContribs/MPContribs/mpcontribs-api - # via mpcontribs-api (pyproject.toml) -mpmath==1.3.0 - # via sympy -narwhals==2.21.2 - # via plotly -nbclassic==1.3.3 - # via notebook -nbclient==0.10.4 - # via nbconvert -nbconvert==7.17.1 - # via - # jupyter-server - # notebook -nbformat==5.10.4 - # via - # jupyter-server - # mpcontribs-api - # mpcontribs-api (pyproject.toml) - # nbclient - # nbconvert - # notebook -nest-asyncio==1.6.0 - # via - # ipykernel - # jupyter-client - # nbclassic - # notebook -networkx==3.6.1 - # via pymatgen-core -notebook==6.5.7 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -notebook-shim==0.2.4 - # via nbclassic -numpy==2.4.5 - # via - # contourpy - # matplotlib - # monty - # mpcontribs-api - # mpcontribs-api (pyproject.toml) - # pandas - # pymatgen-core - # scipy - # spglib -opentelemetry-api==1.41.1 - # via ddtrace -orjson==3.11.9 - # via - # flask-mongorest-mpcontribs - # pymatgen-core -packaging==26.2 - # via - # gunicorn - # ipykernel - # jupyter-events - # jupyter-server - # marshmallow - # matplotlib - # nbconvert - # plotly - # pytest -palettable==3.3.3 - # via pymatgen-core -pandas==3.0.3 - # via pymatgen-core -pandocfilters==1.5.1 - # via nbconvert -parso==0.8.7 - # via jedi -pexpect==4.9.0 - # via ipython -pillow==12.2.0 - # via matplotlib -pint==0.25.3 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -platformdirs==4.9.6 - # via - # jupyter-core - # pint -plotly==6.7.0 - # via pymatgen-core -pluggy==1.6.0 - # via pytest -prometheus-client==0.25.0 - # via - # jupyter-server - # notebook -prompt-toolkit==3.0.52 - # via ipython -psutil==7.2.2 - # via - # ipykernel - # ipython -psycopg2-binary==2.9.12 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -ptyprocess==0.7.0 - # via - # pexpect - # terminado -pure-eval==0.2.3 - # via stack-data -pycodestyle==2.14.0 - # via - # flake8 - # pytest-pycodestyle -pycparser==3.0 - # via cffi -pyflakes==3.4.0 - # via flake8 -pygments==2.20.0 - # via - # ipython - # ipython-pygments-lexers - # nbconvert - # pytest -pymatgen==2026.5.4 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -pymatgen-core==2026.5.17 - # via pymatgen -pymongo==4.17.0 - # via - # flask-mongorest-mpcontribs - # mongoengine -pyopenssl==26.2.0 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -pyparsing==3.3.2 - # via - # bibtexparser - # matplotlib -pytest==9.0.3 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) - # pytest-flake8 - # pytest-pycodestyle - # pytest-xdist -pytest-flake8==1.3.0 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -pytest-pycodestyle==2.5.0 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -pytest-xdist==3.8.0 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -python-dateutil==2.9.0.post0 - # via - # arrow - # botocore - # dateparser - # flask-mongorest-mpcontribs - # freezegun - # jupyter-client - # matplotlib - # pandas - # rq-scheduler -python-json-logger==4.1.0 - # via jupyter-events -python-mimeparse==2.0.0 - # via mimerender-pr36 -python-snappy==0.7.3 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -pytz==2026.2 - # via dateparser -pyyaml==6.0.3 - # via - # flasgger-tschaume - # jupyter-events -pyzmq==27.1.0 - # via - # ipykernel - # jupyter-client - # jupyter-server - # notebook -redis==7.4.0 - # via - # flask-rq2 - # flask-sse - # rq -referencing==0.37.0 - # via - # jsonschema - # jsonschema-specifications - # jupyter-events -regex==2026.5.9 - # via dateparser -requests==2.34.2 - # via - # atlasq-tschaume - # pymatgen-core -rfc3339-validator==0.1.4 - # via - # jsonschema - # jupyter-events -rfc3986-validator==0.1.1 - # via - # jsonschema - # jupyter-events -rfc3987-syntax==1.1.0 - # via jsonschema -rpds-py==0.30.0 - # via - # jsonschema - # referencing -rq==2.3.2 - # via - # flask-rq2 - # mpcontribs-api - # mpcontribs-api (pyproject.toml) - # rq-scheduler -rq-scheduler==0.14.0 - # via flask-rq2 -ruamel-yaml==0.19.1 - # via monty -s3transfer==0.17.0 - # via boto3 -scipy==1.17.1 - # via pymatgen-core -send2trash==2.1.0 - # via - # jupyter-server - # notebook -setproctitle==1.3.7 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -six==1.17.0 - # via - # flasgger-tschaume - # flask-sse - # python-dateutil - # rfc3339-validator -soupsieve==2.8.3 - # via beautifulsoup4 -spglib==2.7.0 - # via pymatgen-core -stack-data==0.6.3 - # via ipython -supervisor==4.3.0 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -sympy==1.14.0 - # via pymatgen-core -tabulate==0.10.0 - # via pymatgen-core -terminado==0.18.1 - # via - # jupyter-server - # jupyter-server-terminals - # notebook -tinycss2==1.4.0 - # via bleach -tornado==6.5.5 - # via - # ipykernel - # jupyter-client - # jupyter-server - # notebook - # terminado -tqdm==4.67.3 - # via pymatgen-core -traitlets==5.15.0 - # via - # ipykernel - # ipython - # jupyter-client - # jupyter-core - # jupyter-events - # jupyter-server - # matplotlib-inline - # nbclient - # nbconvert - # nbformat - # notebook -typing-extensions==4.15.0 - # via - # anyio - # beautifulsoup4 - # flexcache - # flexparser - # opentelemetry-api - # pint - # pyopenssl - # referencing - # spglib -tzdata==2026.2 - # via arrow -tzlocal==5.3.1 - # via dateparser -uncertainties==3.2.3 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) - # pymatgen-core -uri-template==1.3.0 - # via jsonschema -urllib3==2.7.0 - # via - # botocore - # requests -wcwidth==0.7.0 - # via prompt-toolkit -webcolors==25.10.0 - # via jsonschema -webencodings==0.5.1 - # via - # bleach - # tinycss2 -websocket-client==1.9.0 - # via - # jupyter-server - # mpcontribs-api - # mpcontribs-api (pyproject.toml) -werkzeug==3.1.8 - # via - # flasgger-tschaume - # flask -wrapt==2.1.2 - # via ddtrace -zipp==3.23.1 - # via importlib-metadata -zope-event==6.2 - # via gevent -zope-interface==8.4 - # via gevent -zstandard==0.25.0 - # via - # mpcontribs-api - # mpcontribs-api (pyproject.toml) diff --git a/mpcontribs-api/scripts/start.sh b/mpcontribs-api/scripts/start.sh index dc4022f9b5..59eefed59c 100755 --- a/mpcontribs-api/scripts/start.sh +++ b/mpcontribs-api/scripts/start.sh @@ -8,15 +8,10 @@ sleep $zzz PMGRC=$HOME/.pmgrc.yaml [[ ! -e "$PMGRC" ]] && echo "PMG_DUMMY_VAR: dummy" >"$PMGRC" -STATS_ARG="" -SERVER_APP="mpcontribs.api:create_app()" -WAIT_FOR="wait-for-it.sh $JUPYTER_GATEWAY_HOST -q -t 50" - set -x if [[ -n "$DD_TRACE_HOST" ]]; then - wait-for-it.sh "$DD_TRACE_HOST" -q -s -t 10 && STATS_ARG="--statsd-host $DD_AGENT_HOST:8125" || echo "WARNING: datadog agent unreachable" + wait-for-it.sh "$DD_TRACE_HOST" -q -s -t 10 || echo "WARNING: datadog agent unreachable" fi -[[ -n "$STATS_ARG" ]] && CMD="ddtrace-run gunicorn $STATS_ARG" || CMD="gunicorn" -exec $WAIT_FOR -- $CMD $SERVER_APP +exec uvicorn mpcontribs_api.app:app --host 0.0.0.0 --port "$API_PORT" diff --git a/mpcontribs-api/scripts/start_rq.sh b/mpcontribs-api/scripts/start_rq.sh deleted file mode 100755 index 812ef8be4d..0000000000 --- a/mpcontribs-api/scripts/start_rq.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash - -set -e -zzz=$((DEPLOYMENT * 60)) -echo "$SUPERVISOR_PROCESS_NAME: waiting for $zzz seconds before start..." -sleep $zzz - -CMD="flask rq $1" -set -x - -if [[ -n "$DD_TRACE_HOST" ]]; then - wait-for-it.sh "$DD_TRACE_HOST" -q -s -t 10 && CMD="ddtrace-run $CMD" || echo "WARNING: datadog agent unreachable" -fi - -exec wait-for-it.sh "$JUPYTER_GATEWAY_HOST" -q -s -t 50 -- \ - wait-for-it.sh "$MPCONTRIBS_API_HOST" -q -s -t 15 -- $CMD From 14437758c9fafd168e187b4c589a0cbd261f4e71 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 4 Jun 2026 15:07:46 -0700 Subject: [PATCH 296/591] Added healthcheck endpoint --- mpcontribs-api/src/mpcontribs_api/app.py | 7 +++--- .../domains/healthcheck/router.py | 23 +++++++++++++++++++ 2 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/healthcheck/router.py diff --git a/mpcontribs-api/src/mpcontribs_api/app.py b/mpcontribs-api/src/mpcontribs_api/app.py index dcdf7af0de..afc2b8aa9b 100644 --- a/mpcontribs-api/src/mpcontribs_api/app.py +++ b/mpcontribs-api/src/mpcontribs_api/app.py @@ -12,6 +12,7 @@ from mpcontribs_api.config import Settings, get_settings from mpcontribs_api.dependencies import verify_gateway from mpcontribs_api.domains.contributions.models import Contribution +from mpcontribs_api.domains.healthcheck.router import router as healthcheck_router from mpcontribs_api.domains.projects.models import Project from mpcontribs_api.exceptions import register_exception_handlers from mpcontribs_api.logging import configure_logging, get_logger @@ -31,7 +32,7 @@ async def lifespan(app: FastAPI) -> AsyncGenerator[None]: serverSelectionTimeoutMS=settings.mongo.server_selection_timeout_ms, uuidRepresentation="standard", ) - # Fail fast if the DB is unreachable. Cheap, one round-trip. + # Fail fast if the DB is unreachable await client.admin.command("ping") logger.info("connected to mongo", extra={"db": settings.mongo.db_name}) @@ -60,7 +61,6 @@ def create_app(settings: Settings | None = None) -> FastAPI: version=settings.version, debug=settings.environment != "prod", lifespan=_build_lifespan(settings), - dependencies=[Depends(verify_gateway)], terms_of_service="https://materialsproject.org/terms", license_info=license_info, contact=contact_info, @@ -70,7 +70,8 @@ def create_app(settings: Settings | None = None) -> FastAPI: app.add_middleware(RequestContextMiddleware) register_exception_handlers(app) - app.include_router(v1_router, prefix="/api/v1") + app.include_router(healthcheck_router, prefix="/health") + app.include_router(v1_router, prefix="/api/v1", dependencies=[Depends(verify_gateway)]) return app diff --git a/mpcontribs-api/src/mpcontribs_api/domains/healthcheck/router.py b/mpcontribs-api/src/mpcontribs_api/domains/healthcheck/router.py new file mode 100644 index 0000000000..ef751c4d84 --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/domains/healthcheck/router.py @@ -0,0 +1,23 @@ +from fastapi import APIRouter, HTTPException, status +from pydantic import BaseModel + +from mpcontribs_api.dependencies import DbDep + +router = APIRouter(tags=["health"]) + + +class HealthStatus(BaseModel): + status: str + mongo: str + + +@router.get("", response_model=HealthStatus, summary="Service health") +async def healthcheck(db: DbDep) -> HealthStatus: + try: + await db.client.admin.command("ping") + except Exception: + raise HTTPException( + status_code=status.HTTP_503_SERVICE_UNAVAILABLE, + detail={"status": "unhealthy", "mongo": "unreachable"}, + ) from None + return HealthStatus(status="healthy", mongo="ok") From 06cf530cf8fe139a9636997355707fb04fd8e19b Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Fri, 5 Jun 2026 11:42:39 -0700 Subject: [PATCH 297/591] Forward username and is_admin values for logging --- .../src/mpcontribs_api/dependencies.py | 6 +++- mpcontribs-api/src/mpcontribs_api/types.py | 35 +++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/mpcontribs-api/src/mpcontribs_api/dependencies.py b/mpcontribs-api/src/mpcontribs_api/dependencies.py index 9ee67828fd..b34fe1567c 100644 --- a/mpcontribs-api/src/mpcontribs_api/dependencies.py +++ b/mpcontribs-api/src/mpcontribs_api/dependencies.py @@ -49,7 +49,11 @@ def get_user(request: Request) -> User: username=username, groups=frozenset(groups), ) - structlog.contextvars.bind_contextvars(consumer_id=user.consumer_id or "anonymous") + structlog.contextvars.bind_contextvars( + username=user.username, + consumer_id=user.consumer_id, + is_admin=user.is_admin, + ) return user diff --git a/mpcontribs-api/src/mpcontribs_api/types.py b/mpcontribs-api/src/mpcontribs_api/types.py index 8285acb265..0507663843 100644 --- a/mpcontribs-api/src/mpcontribs_api/types.py +++ b/mpcontribs-api/src/mpcontribs_api/types.py @@ -21,3 +21,38 @@ def _validate_prefixed_email(v: str) -> str: PrefixedEmail = Annotated[str, BeforeValidator(_validate_prefixed_email)] + + +def _file_name_like_str(v: str) -> str: + v = v.strip() + parts = v.split(".") + if len(parts) > 1 and parts[-1]: + return v + raise ValidationError(f"attachment name '{v}' not valid. Must end with file extension (e.g. '.gz')") + + +FileLike = Annotated[str, BeforeValidator(_file_name_like_str)] + + +_MD5 = re.compile(r"^[a-f0-9]{32}$") + + +def _md5_like(v: str) -> str: + v = v.strip().lower() + if not _MD5.match(v): + raise ValidationError("must be a 32-character MD5 hex digest") + return v + + +MD5Hash = Annotated[str, BeforeValidator(_md5_like)] + + +def _mime_like(v: str) -> str: + v = v.strip().lower() + parts = v.split("/") + if len(parts) == 2 and parts[0] == "application" and parts[1].strip(): + return v + raise ValidationError(f"improper mime value {v} - must be formatted as 'application/*file_ext*'") + + +MimeFormat = Annotated[str, BeforeValidator(_mime_like)] From 9b24a72690245524ceb052e90f7efd1fc1108dbe Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Fri, 5 Jun 2026 12:22:27 -0700 Subject: [PATCH 298/591] Convert ids coming into Contributions to PydanticObjectIds --- .../domains/_shared/repository.py | 17 ++++++++++++----- .../domains/contributions/repository.py | 8 ++++---- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py index 8595c65341..82d645aad6 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py @@ -1,14 +1,15 @@ from abc import ABC, abstractmethod from typing import Any -from beanie import UpdateResponse +from beanie import PydanticObjectId, UpdateResponse from beanie.operators import Set +from bson.errors import InvalidId from fastapi_filter.contrib.beanie import Filter from pydantic import BaseModel from mpcontribs_api.auth import User from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut -from mpcontribs_api.exceptions import ConflictError, NotFoundError +from mpcontribs_api.exceptions import ConflictError, NotFoundError, ValidationError from mpcontribs_api.pagination import CursorParams, Page, decode_cursor, encode_cursor @@ -52,6 +53,12 @@ def _build_scope(user: User) -> dict[str, Any]: """Provides scope based on current user's permitted groups and publicly released data.""" ... + def _convert_object_id(self, id: str) -> PydanticObjectId: + try: + return PydanticObjectId(id) + except InvalidId: + raise ValidationError(f"Incorrect Id format: {id}. Must be MongoDB ObjectId format.") from None + def _not_found(self, id: str) -> str: """Build a not-found message naming this repository's resource.""" return f"{self.document_model.__name__} with id {id} not found" @@ -79,7 +86,7 @@ async def get_many( next_cursor = encode_cursor(str(items[-1].id)) if has_more and items else None return Page(items=items, next_cursor=next_cursor) - async def get_by_id(self, id: str, fields: frozenset[str] | None): + async def get_by_id(self, id: Any, fields: frozenset[str] | None): """Return a single scoped document by id, projected to the requested fields. Args: @@ -105,7 +112,7 @@ async def insert_one(self, in_resource: TIn) -> TDoc: await document.insert() return document - async def delete_by_id(self, id: str) -> None: + async def delete_by_id(self, id: Any) -> None: """Delete a single scoped document by id. Scoping ensures callers cannot delete documents they are not permitted to see. @@ -115,7 +122,7 @@ async def delete_by_id(self, id: str) -> None: """ await self.document_model.find_one(self._scope, self.document_model.id == id).delete() - async def patch(self, id: str, update: TPatch) -> TDoc: + async def patch(self, id: Any, update: TPatch) -> TDoc: """Partially update a single scoped document by id. Only fields explicitly set on ``update`` are applied. An empty patch is a no-op that still diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py index 75527899d4..48072b81fc 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py @@ -52,15 +52,15 @@ async def get_contributions( async def get_contribution_by_id(self, id: str, fields: frozenset[str] | None): """Find a single contribution by id, scoped to the current user. See ``get_by_id``.""" - return await self.get_by_id(id, fields) + return await self.get_by_id(self._convert_object_id(id), fields) async def patch_contribution_by_id(self, id: str, update: ContributionPatch): """Partially update a contribution by id, scoped to the current user. See ``patch``.""" - return await self.patch(id, update) + return await self.patch(self._convert_object_id(id), update) async def delete_contribution_by_id(self, id: str) -> None: """Delete a contribution by id, scoped to the current user. See ``delete_by_id``.""" - await self.delete_by_id(id) + await self.delete_by_id(self._convert_object_id(id)) async def delete_contributions(self, filter: ContributionFilter): """Bulk deletion of Contributions described by the filter @@ -130,7 +130,7 @@ async def upsert_contribution_by_id(self, id: str, contribution: ContributionIn) doc = self.document_model.from_input_model(contribution) return self.document_model.find_one( self._scope, - self.document_model.id == id, + self.document_model.id == self._convert_object_id(id), ).upsert( Set(doc.model_dump(exclude={"id"}, exclude_none=True)), on_insert=doc, From dd4a69025f0d7b745ef35ebe8f811e08db9e67c4 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Fri, 5 Jun 2026 12:27:29 -0700 Subject: [PATCH 299/591] Fleshed out Contribution component models --- .../domains/attachments/models.py | 36 ++++- .../domains/structures/models.py | 90 +++++++++++- .../mpcontribs_api/domains/tables/models.py | 131 +++++++++++++++++- 3 files changed, 246 insertions(+), 11 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py b/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py index 91f5081983..13544412b5 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py @@ -1,10 +1,38 @@ -from beanie import Document +from beanie import PydanticObjectId from fastapi_filter.contrib.beanie import Filter +from mpcontribs_api.domains._shared.models import BaseDocumentWithInput +from mpcontribs_api.types import FileLike, MD5Hash, MimeFormat -class Attachment(Document): - pass + +class Attachment(BaseDocumentWithInput[PydanticObjectId]): + name: FileLike + md5: MD5Hash + mime: MimeFormat + content: int + + class Settings: + name = "attachments" class AttachmentFilter(Filter): - pass + id: PydanticObjectId | None = None + id__in: list[PydanticObjectId] | None = None + id__neq: PydanticObjectId | None = None + + md5: MD5Hash | None = None + md5__in: list[MD5Hash] | None = None + md5__neq: MD5Hash | None = None + + name: str | None = None + name__in: list[str] | None = None + name__neq: str | None = None + name__ilike: str | None = None + + mime: MimeFormat | None = None + mime__in: list[MimeFormat] | None = None + mime__neq: MimeFormat | None = None + mime__ilike: MimeFormat | None = None + + class Constants(Filter.Constants): + model = Attachment diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py index e31eff9eaf..6d83c72108 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py @@ -1,10 +1,94 @@ -from beanie import Document +import polars as pl +from beanie import PydanticObjectId from fastapi_filter.contrib.beanie import Filter +from pydantic import BaseModel, ConfigDict, field_serializer, field_validator +from pymatgen.core import Element +from mpcontribs_api.domains._shared.models import BaseDocumentWithInput +from mpcontribs_api.types import MD5Hash -class Structure(Document): + +class SiteProperties(BaseModel): + magmom: float + + +class Species(BaseModel): + element: Element + occu: int + + +class Lattice(BaseModel): + model_config = ConfigDict(arbitrary_types_allowed=True) + matrix: pl.DataFrame + pbc: list[bool] + a: float + b: float + c: float + alpha: float + beta: float + gamma: float + volume: float + + @field_validator("matrix", mode="before") + @classmethod + def coerce_matrix(cls, v: object) -> pl.DataFrame: + if isinstance(v, pl.DataFrame): + return v + if isinstance(v, dict): + return pl.DataFrame(v) + # MongoDB returns rows as a list of lists + if isinstance(v, list): + return pl.DataFrame(v) + raise ValueError(f"cannot coerce {type(v)} to pl.DataFrame") + + @field_serializer("matrix") + def serialize_matrix(self, matrix: pl.DataFrame) -> dict: + return matrix.to_dict(as_series=False) + + +class Site(BaseModel): + species: list[Species] + abc: list[float] + properties: SiteProperties + label: str + xyz: list[float] + + +# Some things in Emmet-core that could assist in translating the pymatgen string to BaseModel +# In Mongo it is a single long string, but we could try to parse it into something typed +# It looks like it has some fields, then a table for n_atom_site_* with the subsequent lines being tab/space delimited +# rows +class Cif(BaseModel): pass +class Structure(BaseDocumentWithInput[PydanticObjectId]): + name: str + md5: MD5Hash + lattice: Lattice + sites: list[Site] + charge: float | None + cif: str # Cif + + class Settings: + name = "structures" + + class StructureFilter(Filter): - pass + id: PydanticObjectId | None = None + id__in: list[PydanticObjectId] | None = None + id__neq: PydanticObjectId | None = None + + md5: MD5Hash | None = None + md5__in: list[MD5Hash] | None = None + md5__neq: MD5Hash | None = None + + name: str | None = None + name__in: list[str] | None = None + name__neq: str | None = None + name__ilike: str | None = None + + # sites + + class Constants(Filter.Constants): + model = Structure diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py index 803693afff..d37ccb1c55 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py @@ -1,10 +1,133 @@ -from beanie import Document +import polars as pl +from beanie import PydanticObjectId from fastapi_filter.contrib.beanie import Filter +from pydantic import ( + BaseModel, + ConfigDict, + ValidationError, + field_serializer, + field_validator, + model_validator, +) +from mpcontribs_api.domains._shared.models import BaseDocumentWithInput +from mpcontribs_api.types import MD5Hash -class Table(Document): - pass + +class Labels(BaseModel): + index: str + value: str + variable: str + + +class Attributes(BaseModel): + title: str + labels: Labels + + +class Table(BaseDocumentWithInput[PydanticObjectId]): + model_config = ConfigDict(arbitrary_types_allowed=True) + + name: str + md5: MD5Hash + attrs: Attributes + total_data_rows: int + data: pl.DataFrame + + class Settings: + name = "tables" + + @field_validator("data", mode="before") + @classmethod + def coerce_data(cls, v: object) -> pl.DataFrame: + if isinstance(v, pl.DataFrame): + return v + if isinstance(v, dict): + return pl.DataFrame(v) + raise ValueError(f"cannot coerce {type(v)} to pl.DataFrame") + + @field_serializer("data") + def serialize_data(self, data: pl.DataFrame) -> dict: + return data.to_dict(as_series=False) + + +class TableIn(Table): + @model_validator(mode="after") + def data_dimensions(self): + if len(self.data) != self.total_data_rows: + raise ValidationError( + f"`total_data_rows` ({self.total_data_rows}) does not match number of rows in `data` ({len(self.data)})" + ) + return self + + @staticmethod + def _check_column_collision(columns: list[str], index_name: str) -> None: + if index_name in columns: + raise ValidationError(f"column name collision: {index_name!r} already in columns") + + @staticmethod + def _check_index_data_lengths(index: list, data: list[list]) -> None: + if len(index) != len(data): + raise ValidationError(f"length mismatch between `index` ({len(index)}) and `data` ({len(data)})") + + @staticmethod + def _check_declared_row_count(declared: int, data: list[list]) -> None: + if declared != len(data): + raise ValidationError( + f"`total_data_rows` ({declared}) does not match length of `data` ({len(data)}) in source document" + ) + + @classmethod + def _validate_input(cls, doc, index_name: str) -> None: + cls._check_column_collision(doc["columns"], index_name) + cls._check_index_data_lengths(doc["index"], doc["data"]) + cls._check_declared_row_count(doc["total_data_rows"], doc["data"]) + + @classmethod + def from_input(cls, doc, index_name: str = "index"): + cls._validate_input(doc, index_name) + + columns = [index_name, *doc["columns"]] + + # Strict=false since we explicitly handle our own errors + rows = [[idx, *row] for idx, row in zip(doc["index"], doc["data"], strict=False)] + df = pl.DataFrame(rows, schema=columns, orient="row") + + return cls( + _id=doc["id"], + name=doc["name"], + md5=doc["md5"], + attrs=doc["attrs"], + data=df, + total_data_rows=doc["total_data_rows"], + ) class TableFilter(Filter): - pass + id: PydanticObjectId | None = None + id__in: list[PydanticObjectId] | None = None + id__neq: PydanticObjectId | None = None + + md5: MD5Hash | None = None + md5__in: list[MD5Hash] | None = None + md5__neq: MD5Hash | None = None + + name: str | None = None + name__in: list[str] | None = None + name__neq: str | None = None + name__ilike: str | None = None + + # Columns + # Attrs + + class Constants(Filter.Constants): + model = Table + + +class TableOut(BaseModel): + """Metadata-only table as embedded in contribution responses (no data).""" + + attrs: Attributes + columns: list[str] + total_data_rows: int + total_data_pages: int = 1 From 4b8ce429fe1d1bd532e7bbd3392d8660fa93b199 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Fri, 5 Jun 2026 12:37:36 -0700 Subject: [PATCH 300/591] Init component models --- mpcontribs-api/src/mpcontribs_api/app.py | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/mpcontribs-api/src/mpcontribs_api/app.py b/mpcontribs-api/src/mpcontribs_api/app.py index afc2b8aa9b..8431f9ba6d 100644 --- a/mpcontribs-api/src/mpcontribs_api/app.py +++ b/mpcontribs-api/src/mpcontribs_api/app.py @@ -11,9 +11,12 @@ from mpcontribs_api.api.v1.router import router as v1_router from mpcontribs_api.config import Settings, get_settings from mpcontribs_api.dependencies import verify_gateway +from mpcontribs_api.domains.attachments.models import Attachment from mpcontribs_api.domains.contributions.models import Contribution from mpcontribs_api.domains.healthcheck.router import router as healthcheck_router from mpcontribs_api.domains.projects.models import Project +from mpcontribs_api.domains.structures.models import Structure +from mpcontribs_api.domains.tables.models import Table from mpcontribs_api.exceptions import register_exception_handlers from mpcontribs_api.logging import configure_logging, get_logger from mpcontribs_api.middleware import RequestContextMiddleware @@ -39,7 +42,16 @@ async def lifespan(app: FastAPI) -> AsyncGenerator[None]: app.state.mongo_client = client app.state.db = client[settings.mongo.db_name] - await init_beanie(database=client[settings.mongo.db_name], document_models=[Project, Contribution]) + await init_beanie( + database=client[settings.mongo.db_name], + document_models=[ + Project, + Contribution, + Attachment, + Structure, + Table, + ], + ) try: yield From 4d7d8bf6b5a48ba726cac572e55b3b1edb97d2e2 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Fri, 5 Jun 2026 13:00:09 -0700 Subject: [PATCH 301/591] Bulk upload of contributions with components now bulk inserts components first --- .../domains/attachments/models.py | 4 + .../domains/contributions/models.py | 18 ++-- .../domains/contributions/repository.py | 88 ++++++++++++++++--- .../domains/structures/models.py | 4 + 4 files changed, 94 insertions(+), 20 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py b/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py index 13544412b5..7364e626c0 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py @@ -15,6 +15,10 @@ class Settings: name = "attachments" +class AttachmentIn(Attachment): + pass + + class AttachmentFilter(Filter): id: PydanticObjectId | None = None id__in: list[PydanticObjectId] | None = None diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py index fdf221c565..7a66701b29 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py @@ -16,9 +16,9 @@ from pydantic import Field from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut -from mpcontribs_api.domains.attachments.models import Attachment, AttachmentFilter -from mpcontribs_api.domains.structures.models import Structure, StructureFilter -from mpcontribs_api.domains.tables.models import Table, TableFilter +from mpcontribs_api.domains.attachments.models import Attachment, AttachmentFilter, AttachmentIn +from mpcontribs_api.domains.structures.models import Structure, StructureFilter, StructureIn +from mpcontribs_api.domains.tables.models import Table, TableFilter, TableIn from mpcontribs_api.projection import SparseFieldsModel from mpcontribs_api.types import ShortStr @@ -32,9 +32,6 @@ class ContributionBase(BaseDocumentWithInput[PydanticObjectId]): # TODO: Verify that this should default to True and be passed by users needs_build: bool = True last_modified: datetime = Field(default_factory=lambda: datetime.now(UTC)) - structures: list[Link[Structure]] | None = None - tables: list[Link[Table]] | None = None - attachments: list[Link[Attachment]] | None = None class Settings: name = "contributions" @@ -43,13 +40,16 @@ class Settings: class Contribution(ContributionBase): is_public: bool + structures: list[Link[Structure]] | None = None + tables: list[Link[Table]] | None = None + attachments: list[Link[Attachment]] | None = None # needs_build: bool = True @classmethod def from_input_model(cls, data: ContributionIn) -> Contribution: return cls.model_validate( { - **data.model_dump(exclude={"is_public"}), + **data.model_dump(exclude={"is_public", "structures", "tables", "attachments"}), "is_public": False, } ) @@ -60,7 +60,9 @@ def set_last_modified(self): class ContributionIn(ContributionBase): - pass + structures: list[StructureIn] | None = None + tables: list[TableIn] | None = None + attachments: list[AttachmentIn] | None = None class ContributionOut(DocumentOut[PydanticObjectId]): diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py index 48072b81fc..ace0f1f16b 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py @@ -1,11 +1,12 @@ import asyncio -from typing import Any, Literal +from typing import Any, Literal, cast -from beanie import UpdateResponse +from beanie import Link, UpdateResponse from beanie.operators import Set from mpcontribs_api.auth import User from mpcontribs_api.domains._shared.repository import MongoDbRepository +from mpcontribs_api.domains.attachments.models import Attachment from mpcontribs_api.domains.contributions.models import ( Contribution, ContributionFilter, @@ -13,6 +14,8 @@ ContributionOut, ContributionPatch, ) +from mpcontribs_api.domains.structures.models import Structure +from mpcontribs_api.domains.tables.models import Table from mpcontribs_api.pagination import CursorParams @@ -71,8 +74,56 @@ async def delete_contributions(self, filter: ContributionFilter): docs = filter.filter(self.document_model.find(self._scope)) await docs.delete() + @staticmethod + async def _insert_components( + contributions: list[ContributionIn], + ) -> tuple[list[Structure], list[Table], list[Attachment], list[slice], list[slice], list[slice]]: + """Bulk-insert all component documents (structures, tables, attachments) for a batch of + ContributionIn objects, and return the inserted documents alongside per-contribution slices + so callers can re-attach them as Links. + + Returns a tuple of: + (structures, tables, attachments, struct_slices, table_slices, attach_slices) + where each slice[i] selects the components belonging to contributions[i]. + """ + all_structures: list[Structure] = [] + all_tables: list[Table] = [] + all_attachments: list[Attachment] = [] + struct_slices: list[slice] = [] + table_slices: list[slice] = [] + attach_slices: list[slice] = [] + + for contrib in contributions: + s0 = len(all_structures) + if contrib.structures: + all_structures.extend(Structure.model_validate(s.model_dump()) for s in contrib.structures) + struct_slices.append(slice(s0, len(all_structures))) + + t0 = len(all_tables) + if contrib.tables: + all_tables.extend(Table.model_validate(t.model_dump()) for t in contrib.tables) + table_slices.append(slice(t0, len(all_tables))) + + a0 = len(all_attachments) + if contrib.attachments: + all_attachments.extend(Attachment.model_validate(a.model_dump()) for a in contrib.attachments) + attach_slices.append(slice(a0, len(all_attachments))) + + if all_structures: + await Structure.insert_many(all_structures, ordered=False) + if all_tables: + await Table.insert_many(all_tables, ordered=False) + if all_attachments: + await Attachment.insert_many(all_attachments, ordered=False) + + return all_structures, all_tables, all_attachments, struct_slices, table_slices, attach_slices + async def insert_contributions(self, contributions: list[ContributionIn]): - """Bulk insertion of Contributions + """Bulk insertion of Contributions. + + Component documents (structures, tables, attachments) embedded in each ContributionIn are + bulk-inserted first; the resulting IDs are then stored as Links on the Contribution before + the contributions themselves are bulk-inserted. Args: contributions (list[ContributionIn]): the list of contributions to be inserted @@ -80,14 +131,25 @@ async def insert_contributions(self, contributions: list[ContributionIn]): Returns: list[ContributionOut]: the inserted documents """ - full_docs = [self.document_model.from_input_model(contrib) for contrib in contributions] - # ordered=False lets Mongo keep inserting if a document fails + structures, tables, attachments, struct_slices, table_slices, attach_slices = ( + await self._insert_components(contributions) + ) + + full_docs: list[Contribution] = [] + for i, contrib in enumerate(contributions): + doc = self.document_model.from_input_model(contrib) + doc.structures = cast(list[Link[Structure]] | None, structures[struct_slices[i]] or None) + doc.tables = cast(list[Link[Table]] | None, tables[table_slices[i]] or None) + doc.attachments = cast(list[Link[Attachment]] | None, attachments[attach_slices[i]] or None) + full_docs.append(doc) + return await self.document_model.insert_many(full_docs, ordered=False) async def upsert_contributions(self, contributions: list[ContributionIn]): """Upserts contributions. - For each Contribution, if Contribution with identical identifiers exist, update, otherwise insert + Component documents are bulk-inserted first (same as insert_contributions), then each + Contribution is upserted by (project, identifier). Args: contributions (list[ContributionIn]): the list of contributions to be upserted @@ -95,26 +157,28 @@ async def upsert_contributions(self, contributions: list[ContributionIn]): Returns: list[ContributionOut]: the list of upserted documents """ + structures, tables, attachments, struct_slices, table_slices, attach_slices = ( + await self._insert_components(contributions) + ) - # Handles upserting a document - no upsert_many command - async def _upsert(contrib: ContributionIn): + async def _upsert(contrib: ContributionIn, i: int): existing = await self.document_model.find_one( self._scope, self.document_model.project == contrib.project, self.document_model.identifier == contrib.identifier, ) doc = self.document_model.from_input_model(contrib) - # Update + doc.structures = cast(list[Link[Structure]] | None, structures[struct_slices[i]] or None) + doc.tables = cast(list[Link[Table]] | None, tables[table_slices[i]] or None) + doc.attachments = cast(list[Link[Attachment]] | None, attachments[attach_slices[i]] or None) if existing is not None: update_data = doc.model_dump(exclude={"id"}, exclude_none=True) await existing.update(Set(update_data)) return existing - # Insert await doc.insert() return doc - # Asynchronously run upsert on each contribution - return await asyncio.gather(*[_upsert(c) for c in contributions]) + return await asyncio.gather(*[_upsert(c, i) for i, c in enumerate(contributions)]) async def upsert_contribution_by_id(self, id: str, contribution: ContributionIn): """Upserts a single Contribution. diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py index 6d83c72108..bb102642e2 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py @@ -74,6 +74,10 @@ class Settings: name = "structures" +class StructureIn(Structure): + pass + + class StructureFilter(Filter): id: PydanticObjectId | None = None id__in: list[PydanticObjectId] | None = None From bfceb62ba498db5b0512087facaa0d02c5ab1688 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Fri, 5 Jun 2026 13:16:10 -0700 Subject: [PATCH 302/591] Made component repositories to pull insert logic out of contributions repo --- .../domains/attachments/models.py | 14 +++++- .../domains/attachments/repository.py | 29 +++++++++++ .../domains/contributions/repository.py | 49 +++++++++---------- .../domains/structures/models.py | 12 ++++- .../domains/structures/repository.py | 29 +++++++++++ .../mpcontribs_api/domains/tables/models.py | 12 ++++- .../domains/tables/repository.py | 29 +++++++++++ 7 files changed, 146 insertions(+), 28 deletions(-) create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/attachments/repository.py create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/structures/repository.py create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py diff --git a/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py b/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py index 7364e626c0..a71e5d8996 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py @@ -1,7 +1,8 @@ from beanie import PydanticObjectId from fastapi_filter.contrib.beanie import Filter -from mpcontribs_api.domains._shared.models import BaseDocumentWithInput +from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut +from mpcontribs_api.projection import SparseFieldsModel from mpcontribs_api.types import FileLike, MD5Hash, MimeFormat @@ -19,6 +20,17 @@ class AttachmentIn(Attachment): pass +class AttachmentOut(DocumentOut[PydanticObjectId]): + name: FileLike | None = None + md5: MD5Hash | None = None + mime: MimeFormat | None = None + + +class AttachmentPatch(SparseFieldsModel): + name: FileLike | None = None + mime: MimeFormat | None = None + + class AttachmentFilter(Filter): id: PydanticObjectId | None = None id__in: list[PydanticObjectId] | None = None diff --git a/mpcontribs-api/src/mpcontribs_api/domains/attachments/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/attachments/repository.py new file mode 100644 index 0000000000..c26dd9b0f1 --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/domains/attachments/repository.py @@ -0,0 +1,29 @@ +from typing import Any + +from mpcontribs_api.auth import User +from mpcontribs_api.domains._shared.repository import MongoDbRepository +from mpcontribs_api.domains.attachments.models import ( + Attachment, + AttachmentFilter, + AttachmentIn, + AttachmentOut, + AttachmentPatch, +) + + +class MongoDbAttachmentRepository( + MongoDbRepository[Attachment, AttachmentIn, AttachmentOut, AttachmentFilter, AttachmentPatch] +): + document_model = Attachment + out_model = AttachmentOut + + @staticmethod + def _build_scope(user: User) -> dict[str, Any]: + return {} + + async def insert_attachments(self, attachments: list[AttachmentIn]) -> list[Attachment]: + if not attachments: + return [] + docs = [Attachment.model_validate(a.model_dump()) for a in attachments] + await Attachment.insert_many(docs, ordered=False) + return docs diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py index ace0f1f16b..c629aae822 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py @@ -6,7 +6,8 @@ from mpcontribs_api.auth import User from mpcontribs_api.domains._shared.repository import MongoDbRepository -from mpcontribs_api.domains.attachments.models import Attachment +from mpcontribs_api.domains.attachments.models import Attachment, AttachmentIn +from mpcontribs_api.domains.attachments.repository import MongoDbAttachmentRepository from mpcontribs_api.domains.contributions.models import ( Contribution, ContributionFilter, @@ -14,8 +15,10 @@ ContributionOut, ContributionPatch, ) -from mpcontribs_api.domains.structures.models import Structure -from mpcontribs_api.domains.tables.models import Table +from mpcontribs_api.domains.structures.models import Structure, StructureIn +from mpcontribs_api.domains.structures.repository import MongoDbStructureRepository +from mpcontribs_api.domains.tables.models import Table, TableIn +from mpcontribs_api.domains.tables.repository import MongoDbTableRepository from mpcontribs_api.pagination import CursorParams @@ -33,6 +36,10 @@ class MongoDbContributionRepository( document_model = Contribution out_model = ContributionOut + def __init__(self, user: User) -> None: + super().__init__(user) + self._user = user + @staticmethod def _build_scope(user: User) -> dict[str, Any]: """Provides scope based on current user's permitted groups and publicly released data.""" @@ -74,49 +81,41 @@ async def delete_contributions(self, filter: ContributionFilter): docs = filter.filter(self.document_model.find(self._scope)) await docs.delete() - @staticmethod async def _insert_components( + self, contributions: list[ContributionIn], ) -> tuple[list[Structure], list[Table], list[Attachment], list[slice], list[slice], list[slice]]: - """Bulk-insert all component documents (structures, tables, attachments) for a batch of - ContributionIn objects, and return the inserted documents alongside per-contribution slices - so callers can re-attach them as Links. + """Bulk-insert component documents for a batch and return per-contribution slices. - Returns a tuple of: + Returns: (structures, tables, attachments, struct_slices, table_slices, attach_slices) - where each slice[i] selects the components belonging to contributions[i]. + where slice[i] selects the components belonging to contributions[i]. """ - all_structures: list[Structure] = [] - all_tables: list[Table] = [] - all_attachments: list[Attachment] = [] + all_structures: list[StructureIn] = [] + all_tables: list[TableIn] = [] + all_attachments: list[AttachmentIn] = [] struct_slices: list[slice] = [] table_slices: list[slice] = [] attach_slices: list[slice] = [] for contrib in contributions: s0 = len(all_structures) - if contrib.structures: - all_structures.extend(Structure.model_validate(s.model_dump()) for s in contrib.structures) + all_structures.extend(contrib.structures or []) struct_slices.append(slice(s0, len(all_structures))) t0 = len(all_tables) - if contrib.tables: - all_tables.extend(Table.model_validate(t.model_dump()) for t in contrib.tables) + all_tables.extend(contrib.tables or []) table_slices.append(slice(t0, len(all_tables))) a0 = len(all_attachments) - if contrib.attachments: - all_attachments.extend(Attachment.model_validate(a.model_dump()) for a in contrib.attachments) + all_attachments.extend(contrib.attachments or []) attach_slices.append(slice(a0, len(all_attachments))) - if all_structures: - await Structure.insert_many(all_structures, ordered=False) - if all_tables: - await Table.insert_many(all_tables, ordered=False) - if all_attachments: - await Attachment.insert_many(all_attachments, ordered=False) + structures = await MongoDbStructureRepository(self._user).insert_structures(all_structures) + tables = await MongoDbTableRepository(self._user).insert_tables(all_tables) + attachments = await MongoDbAttachmentRepository(self._user).insert_attachments(all_attachments) - return all_structures, all_tables, all_attachments, struct_slices, table_slices, attach_slices + return structures, tables, attachments, struct_slices, table_slices, attach_slices async def insert_contributions(self, contributions: list[ContributionIn]): """Bulk insertion of Contributions. diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py index bb102642e2..e770dc87f2 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py @@ -4,7 +4,8 @@ from pydantic import BaseModel, ConfigDict, field_serializer, field_validator from pymatgen.core import Element -from mpcontribs_api.domains._shared.models import BaseDocumentWithInput +from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut +from mpcontribs_api.projection import SparseFieldsModel from mpcontribs_api.types import MD5Hash @@ -78,6 +79,15 @@ class StructureIn(Structure): pass +class StructureOut(DocumentOut[PydanticObjectId]): + name: str | None = None + md5: MD5Hash | None = None + + +class StructurePatch(SparseFieldsModel): + name: str | None = None + + class StructureFilter(Filter): id: PydanticObjectId | None = None id__in: list[PydanticObjectId] | None = None diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/repository.py new file mode 100644 index 0000000000..3216b3c2c2 --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/domains/structures/repository.py @@ -0,0 +1,29 @@ +from typing import Any + +from mpcontribs_api.auth import User +from mpcontribs_api.domains._shared.repository import MongoDbRepository +from mpcontribs_api.domains.structures.models import ( + Structure, + StructureFilter, + StructureIn, + StructureOut, + StructurePatch, +) + + +class MongoDbStructureRepository( + MongoDbRepository[Structure, StructureIn, StructureOut, StructureFilter, StructurePatch] +): + document_model = Structure + out_model = StructureOut + + @staticmethod + def _build_scope(user: User) -> dict[str, Any]: + return {} + + async def insert_structures(self, structures: list[StructureIn]) -> list[Structure]: + if not structures: + return [] + docs = [Structure.model_validate(s.model_dump()) for s in structures] + await Structure.insert_many(docs, ordered=False) + return docs diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py index d37ccb1c55..a6a61fdc9d 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py @@ -10,7 +10,8 @@ model_validator, ) -from mpcontribs_api.domains._shared.models import BaseDocumentWithInput +from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut +from mpcontribs_api.projection import SparseFieldsModel from mpcontribs_api.types import MD5Hash @@ -131,3 +132,12 @@ class TableOut(BaseModel): columns: list[str] total_data_rows: int total_data_pages: int = 1 + + +class TableDocumentOut(DocumentOut[PydanticObjectId]): + name: str | None = None + md5: MD5Hash | None = None + + +class TablePatch(SparseFieldsModel): + name: str | None = None diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py new file mode 100644 index 0000000000..b85e40325c --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py @@ -0,0 +1,29 @@ +from typing import Any + +from mpcontribs_api.auth import User +from mpcontribs_api.domains._shared.repository import MongoDbRepository +from mpcontribs_api.domains.tables.models import ( + Table, + TableDocumentOut, + TableFilter, + TableIn, + TablePatch, +) + + +class MongoDbTableRepository( + MongoDbRepository[Table, TableIn, TableDocumentOut, TableFilter, TablePatch] +): + document_model = Table + out_model = TableDocumentOut + + @staticmethod + def _build_scope(user: User) -> dict[str, Any]: + return {} + + async def insert_tables(self, tables: list[TableIn]) -> list[Table]: + if not tables: + return [] + docs = [Table.model_validate(t.model_dump()) for t in tables] + await Table.insert_many(docs, ordered=False) + return docs From b1dc49b82dd4641ae4d6b5bad5aee51996dc3c16 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Fri, 5 Jun 2026 15:09:09 -0700 Subject: [PATCH 303/591] Moved cross-repo insert logic into service layer --- .../domains/contributions/dependencies.py | 16 +++ .../domains/contributions/repository.py | 125 ++++-------------- .../domains/contributions/router.py | 10 +- .../domains/contributions/service.py | 125 ++++++++++++++++++ 4 files changed, 169 insertions(+), 107 deletions(-) create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/dependencies.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/dependencies.py index 3227039e95..ec995e4542 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/dependencies.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/dependencies.py @@ -3,9 +3,13 @@ from fastapi import Depends from mpcontribs_api.dependencies import UserDep +from mpcontribs_api.domains.attachments.repository import MongoDbAttachmentRepository from mpcontribs_api.domains.contributions.repository import ( MongoDbContributionRepository, ) +from mpcontribs_api.domains.contributions.service import ContributionService +from mpcontribs_api.domains.structures.repository import MongoDbStructureRepository +from mpcontribs_api.domains.tables.repository import MongoDbTableRepository def get_scoped_contributions(user: UserDep) -> MongoDbContributionRepository: @@ -13,3 +17,15 @@ def get_scoped_contributions(user: UserDep) -> MongoDbContributionRepository: ContributionDep = Annotated[MongoDbContributionRepository, Depends(get_scoped_contributions)] + + +def get_contribution_service(user: UserDep) -> ContributionService: + return ContributionService( + contributions=MongoDbContributionRepository(user), + structures=MongoDbStructureRepository(user), + attachments=MongoDbAttachmentRepository(user), + tables=MongoDbTableRepository(user), + ) + + +ContributionServiceDep = Annotated[ContributionService, Depends(get_contribution_service)] diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py index c629aae822..638cfedfd4 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py @@ -1,13 +1,10 @@ -import asyncio -from typing import Any, Literal, cast +from typing import Any, Literal -from beanie import Link, UpdateResponse +from beanie import UpdateResponse from beanie.operators import Set from mpcontribs_api.auth import User from mpcontribs_api.domains._shared.repository import MongoDbRepository -from mpcontribs_api.domains.attachments.models import Attachment, AttachmentIn -from mpcontribs_api.domains.attachments.repository import MongoDbAttachmentRepository from mpcontribs_api.domains.contributions.models import ( Contribution, ContributionFilter, @@ -15,10 +12,6 @@ ContributionOut, ContributionPatch, ) -from mpcontribs_api.domains.structures.models import Structure, StructureIn -from mpcontribs_api.domains.structures.repository import MongoDbStructureRepository -from mpcontribs_api.domains.tables.models import Table, TableIn -from mpcontribs_api.domains.tables.repository import MongoDbTableRepository from mpcontribs_api.pagination import CursorParams @@ -29,8 +22,8 @@ class MongoDbContributionRepository( Shared CRUD logic lives on :class:`MongoDbRepository`; the methods here are domain-named forwarders that give routers a consistent vocabulary and concrete types, plus the operations - whose shape is genuinely contribution-specific (filtered delete, bulk insert, compound-key and - id-keyed upsert, download). + whose shape is genuinely contribution-specific (filtered delete, id-keyed upsert, download). + Multi-collection orchestration (component inserts) lives in ``ContributionService``. """ document_model = Contribution @@ -81,103 +74,31 @@ async def delete_contributions(self, filter: ContributionFilter): docs = filter.filter(self.document_model.find(self._scope)) await docs.delete() - async def _insert_components( - self, - contributions: list[ContributionIn], - ) -> tuple[list[Structure], list[Table], list[Attachment], list[slice], list[slice], list[slice]]: - """Bulk-insert component documents for a batch and return per-contribution slices. + async def insert_many_contributions(self, docs: list[Contribution]): + """Bulk-insert pre-built Contribution documents. - Returns: - (structures, tables, attachments, struct_slices, table_slices, attach_slices) - where slice[i] selects the components belonging to contributions[i]. + Used by ``ContributionService`` after it has resolved component Links. The service is + responsible for ensuring each document is fully formed; this method is a thin + collection-level wrapper. """ - all_structures: list[StructureIn] = [] - all_tables: list[TableIn] = [] - all_attachments: list[AttachmentIn] = [] - struct_slices: list[slice] = [] - table_slices: list[slice] = [] - attach_slices: list[slice] = [] - - for contrib in contributions: - s0 = len(all_structures) - all_structures.extend(contrib.structures or []) - struct_slices.append(slice(s0, len(all_structures))) - - t0 = len(all_tables) - all_tables.extend(contrib.tables or []) - table_slices.append(slice(t0, len(all_tables))) - - a0 = len(all_attachments) - all_attachments.extend(contrib.attachments or []) - attach_slices.append(slice(a0, len(all_attachments))) - - structures = await MongoDbStructureRepository(self._user).insert_structures(all_structures) - tables = await MongoDbTableRepository(self._user).insert_tables(all_tables) - attachments = await MongoDbAttachmentRepository(self._user).insert_attachments(all_attachments) + return await self.document_model.insert_many(docs, ordered=False) - return structures, tables, attachments, struct_slices, table_slices, attach_slices + async def insert_contribution(self, doc: Contribution) -> Contribution: + """Insert a single pre-built Contribution document.""" + await doc.insert() + return doc - async def insert_contributions(self, contributions: list[ContributionIn]): - """Bulk insertion of Contributions. - - Component documents (structures, tables, attachments) embedded in each ContributionIn are - bulk-inserted first; the resulting IDs are then stored as Links on the Contribution before - the contributions themselves are bulk-inserted. - - Args: - contributions (list[ContributionIn]): the list of contributions to be inserted - - Returns: - list[ContributionOut]: the inserted documents - """ - structures, tables, attachments, struct_slices, table_slices, attach_slices = ( - await self._insert_components(contributions) - ) - - full_docs: list[Contribution] = [] - for i, contrib in enumerate(contributions): - doc = self.document_model.from_input_model(contrib) - doc.structures = cast(list[Link[Structure]] | None, structures[struct_slices[i]] or None) - doc.tables = cast(list[Link[Table]] | None, tables[table_slices[i]] or None) - doc.attachments = cast(list[Link[Attachment]] | None, attachments[attach_slices[i]] or None) - full_docs.append(doc) - - return await self.document_model.insert_many(full_docs, ordered=False) - - async def upsert_contributions(self, contributions: list[ContributionIn]): - """Upserts contributions. - - Component documents are bulk-inserted first (same as insert_contributions), then each - Contribution is upserted by (project, identifier). - - Args: - contributions (list[ContributionIn]): the list of contributions to be upserted - - Returns: - list[ContributionOut]: the list of upserted documents - """ - structures, tables, attachments, struct_slices, table_slices, attach_slices = ( - await self._insert_components(contributions) + async def find_one_contribution(self, project: str, identifier: str) -> Contribution | None: + """Find a single contribution by (project, identifier), scoped to the current user.""" + return await self.document_model.find_one( + self._scope, + self.document_model.project == project, + self.document_model.identifier == identifier, ) - async def _upsert(contrib: ContributionIn, i: int): - existing = await self.document_model.find_one( - self._scope, - self.document_model.project == contrib.project, - self.document_model.identifier == contrib.identifier, - ) - doc = self.document_model.from_input_model(contrib) - doc.structures = cast(list[Link[Structure]] | None, structures[struct_slices[i]] or None) - doc.tables = cast(list[Link[Table]] | None, tables[table_slices[i]] or None) - doc.attachments = cast(list[Link[Attachment]] | None, attachments[attach_slices[i]] or None) - if existing is not None: - update_data = doc.model_dump(exclude={"id"}, exclude_none=True) - await existing.update(Set(update_data)) - return existing - await doc.insert() - return doc - - return await asyncio.gather(*[_upsert(c, i) for i, c in enumerate(contributions)]) + async def update_contribution(self, doc: Contribution, update_data: dict[str, Any]) -> None: + """Apply a partial update to an existing Contribution document.""" + await doc.update(Set(update_data)) async def upsert_contribution_by_id(self, id: str, contribution: ContributionIn): """Upserts a single Contribution. diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py index 0af605ab51..cfc7db4eff 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py @@ -3,7 +3,7 @@ from fastapi import APIRouter, Depends from fastapi_filter import FilterDepends -from mpcontribs_api.domains.contributions.dependencies import ContributionDep +from mpcontribs_api.domains.contributions.dependencies import ContributionDep, ContributionServiceDep from mpcontribs_api.domains.contributions.models import ( ContributionFilter, ContributionIn, @@ -37,18 +37,18 @@ async def delete_contributions( @router.post("") async def insert_contributions( - repo: ContributionDep, + service: ContributionServiceDep, contributions: list[ContributionIn], ): - return await repo.insert_contributions(contributions=contributions) + return await service.insert_contributions(contributions=contributions) @router.put("") async def upsert_contributions( - repo: ContributionDep, + service: ContributionServiceDep, contributions: list[ContributionIn], ): - return await repo.upsert_contributions(contributions=contributions) + return await service.upsert_contributions(contributions=contributions) @router.get("download/{mime}") diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py new file mode 100644 index 0000000000..c0dfb57053 --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py @@ -0,0 +1,125 @@ +import asyncio +from typing import cast + +from beanie import Link + +from mpcontribs_api.domains.attachments.models import Attachment, AttachmentIn +from mpcontribs_api.domains.attachments.repository import MongoDbAttachmentRepository +from mpcontribs_api.domains.contributions.models import Contribution, ContributionIn +from mpcontribs_api.domains.contributions.repository import MongoDbContributionRepository +from mpcontribs_api.domains.structures.models import Structure, StructureIn +from mpcontribs_api.domains.structures.repository import MongoDbStructureRepository +from mpcontribs_api.domains.tables.models import Table, TableIn +from mpcontribs_api.domains.tables.repository import MongoDbTableRepository +from mpcontribs_api.exceptions import ValidationError + + +class ContributionService: + def __init__( + self, + contributions: MongoDbContributionRepository, + structures: MongoDbStructureRepository, + attachments: MongoDbAttachmentRepository, + tables: MongoDbTableRepository, + ): + self._contributions = contributions + self._structures = structures + self._attachments = attachments + self._tables = tables + + async def _insert_components( + self, + contributions: list[ContributionIn], + ) -> tuple[list[Structure], list[Table], list[Attachment], list[slice], list[slice], list[slice]]: + """Bulk-insert component documents for a batch and return per-contribution slices. + + Returns: + (structures, tables, attachments, struct_slices, table_slices, attach_slices) + where slice[i] selects the components belonging to contributions[i]. + """ + all_structures: list[StructureIn] = [] + all_tables: list[TableIn] = [] + all_attachments: list[AttachmentIn] = [] + struct_slices: list[slice] = [] + table_slices: list[slice] = [] + attach_slices: list[slice] = [] + + for contrib in contributions: + s0 = len(all_structures) + all_structures.extend(contrib.structures or []) + struct_slices.append(slice(s0, len(all_structures))) + + t0 = len(all_tables) + all_tables.extend(contrib.tables or []) + table_slices.append(slice(t0, len(all_tables))) + + a0 = len(all_attachments) + all_attachments.extend(contrib.attachments or []) + attach_slices.append(slice(a0, len(all_attachments))) + + structures = await self._structures.insert_structures(all_structures) + tables = await self._tables.insert_tables(all_tables) + attachments = await self._attachments.insert_attachments(all_attachments) + + return structures, tables, attachments, struct_slices, table_slices, attach_slices + + async def insert_contributions(self, contributions: list[ContributionIn]): + """Bulk insertion of Contributions with nested components. + + Components embedded in each ContributionIn are bulk-inserted first; the resulting IDs + are stored as Links before the contributions themselves are bulk-inserted. + + Args: + contributions: contributions to insert, may include nested structures/tables/attachments + + Returns: + list[Contribution]: inserted documents + """ + structures, tables, attachments, struct_slices, table_slices, attach_slices = ( + await self._insert_components(contributions) + ) + + full_docs: list[Contribution] = [] + for i, contrib in enumerate(contributions): + doc = Contribution.from_input_model(contrib) + doc.structures = cast(list[Link[Structure]] | None, structures[struct_slices[i]] or None) + doc.tables = cast(list[Link[Table]] | None, tables[table_slices[i]] or None) + doc.attachments = cast(list[Link[Attachment]] | None, attachments[attach_slices[i]] or None) + full_docs.append(doc) + + return await self._contributions.insert_many_contributions(full_docs) + + async def upsert_contributions(self, contributions: list[ContributionIn]): + """Upsert contributions by (project, identifier). + + Components (structures, tables, attachments) must be managed via their respective + services. If any contribution in the batch carries components, the entire request is + rejected before any database writes occur. + + Args: + contributions: contributions to upsert; must not include nested components + + Returns: + list[Contribution]: upserted documents + """ + indices_with_components = [ + i + for i, c in enumerate(contributions) + if c.structures or c.tables or c.attachments + ] + if indices_with_components: + raise ValidationError( + "Components must be managed via their respective services, not via contribution upsert.", + contribution_indices=indices_with_components, + ) + + async def _upsert(contrib: ContributionIn): + doc = Contribution.from_input_model(contrib) + existing = await self._contributions.find_one_contribution(contrib.project, contrib.identifier) + if existing is not None: + update_data = doc.model_dump(exclude={"id"}, exclude_none=True) + await self._contributions.update_contribution(existing, update_data) + return existing + return await self._contributions.insert_contribution(doc) + + return await asyncio.gather(*[_upsert(c) for c in contributions]) From 051e91a9abee7a6ac6b30d534755a1a8a18a2005 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Fri, 5 Jun 2026 18:59:51 -0700 Subject: [PATCH 304/591] Documents now handle decoding cursor to accomodate differing id types (OId vs str) --- .../mpcontribs_api/domains/_shared/models.py | 7 +- .../domains/_shared/repository.py | 4 +- .../domains/contributions/service.py | 10 +- .../mpcontribs_api/domains/projects/models.py | 5 + .../domains/tables/repository.py | 4 +- .../db/test_contributions_repository.py | 487 +++++++++++++++ .../unit/domains/test_contribution_service.py | 569 ++++++++++++++++++ .../unit/domains/test_contributions_models.py | 45 ++ 8 files changed, 1118 insertions(+), 13 deletions(-) create mode 100644 mpcontribs-api/tests/integration/db/test_contributions_repository.py create mode 100644 mpcontribs-api/tests/unit/domains/test_contribution_service.py diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py index f3bac721f9..f76377c4e0 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py @@ -1,8 +1,9 @@ from typing import Annotated, Any, Self -from beanie import DocumentWithSoftDelete +from beanie import DocumentWithSoftDelete, PydanticObjectId from pydantic import Field +from mpcontribs_api import pagination from mpcontribs_api.projection import SparseFieldsModel @@ -26,6 +27,10 @@ def from_input_model(cls, data: Any) -> Self: """Translate a validated input payload into a full stored document.""" return cls(**data.model_dump()) + @staticmethod + def decode_cursor(cursor: str) -> str | PydanticObjectId: + return PydanticObjectId(pagination.decode_cursor(cursor=cursor)) + class DocumentOut[TId](SparseFieldsModel): """Base output model for resources addressed by an ``_id``. diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py index 82d645aad6..e062af187c 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py @@ -10,7 +10,7 @@ from mpcontribs_api.auth import User from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut from mpcontribs_api.exceptions import ConflictError, NotFoundError, ValidationError -from mpcontribs_api.pagination import CursorParams, Page, decode_cursor, encode_cursor +from mpcontribs_api.pagination import CursorParams, Page, encode_cursor class MongoDbRepository[ @@ -79,7 +79,7 @@ async def get_many( projection = self.out_model.projection(fields) query = filter.filter(self.document_model.find(self._scope)) if pagination.cursor is not None: - query = query.find(self.document_model.id > decode_cursor(pagination.cursor)) # pyright: ignore[reportOptionalOperand] + query = query.find(self.document_model.id > self.document_model.decode_cursor(cursor=pagination.cursor)) # pyright: ignore[reportOptionalOperand] docs = await query.sort(self.document_model.id).limit(pagination.limit + 1).project(projection).to_list() # pyright: ignore[reportArgumentType] has_more = len(docs) > pagination.limit items = docs[: pagination.limit] diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py index c0dfb57053..5d8056bc46 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py @@ -75,8 +75,8 @@ async def insert_contributions(self, contributions: list[ContributionIn]): Returns: list[Contribution]: inserted documents """ - structures, tables, attachments, struct_slices, table_slices, attach_slices = ( - await self._insert_components(contributions) + structures, tables, attachments, struct_slices, table_slices, attach_slices = await self._insert_components( + contributions ) full_docs: list[Contribution] = [] @@ -102,11 +102,7 @@ async def upsert_contributions(self, contributions: list[ContributionIn]): Returns: list[Contribution]: upserted documents """ - indices_with_components = [ - i - for i, c in enumerate(contributions) - if c.structures or c.tables or c.attachments - ] + indices_with_components = [i for i, c in enumerate(contributions) if c.structures or c.tables or c.attachments] if indices_with_components: raise ValidationError( "Components must be managed via their respective services, not via contribution upsert.", diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py index c54c763e68..9086ad8391 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py @@ -5,6 +5,7 @@ from fastapi_filter.contrib.beanie import Filter from pydantic import BaseModel, ConfigDict, Field, HttpUrl +from mpcontribs_api import pagination from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut from mpcontribs_api.types import PrefixedEmail, ShortStr @@ -63,6 +64,10 @@ class Project(BaseDocumentWithInput[ShortStr]): def from_input_model(cls, data: ProjectIn) -> Project: return cls(**data.model_dump()) + @staticmethod + def decode_cursor(cursor: str) -> str: + return pagination.decode_cursor(cursor) + class Settings: name = "projects" keep_nulls = False diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py index b85e40325c..37ba36526b 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py @@ -11,9 +11,7 @@ ) -class MongoDbTableRepository( - MongoDbRepository[Table, TableIn, TableDocumentOut, TableFilter, TablePatch] -): +class MongoDbTableRepository(MongoDbRepository[Table, TableIn, TableDocumentOut, TableFilter, TablePatch]): document_model = Table out_model = TableDocumentOut diff --git a/mpcontribs-api/tests/integration/db/test_contributions_repository.py b/mpcontribs-api/tests/integration/db/test_contributions_repository.py new file mode 100644 index 0000000000..396043a0f2 --- /dev/null +++ b/mpcontribs-api/tests/integration/db/test_contributions_repository.py @@ -0,0 +1,487 @@ +"""Database integration tests for MongoDbContributionRepository. + +These tests require a live MongoDB connection (see conftest.py). They exercise +the real Beanie/MongoDB layer: query scoping, field projection, cursor +pagination, bulk insert, single insert, find-one, update, delete-by-id, and +bulk delete — none of which can be verified with mocks. + +Run with: uv run pytest -m db +Skip with: uv run pytest -m "not db" +""" + +import pytest +from beanie import PydanticObjectId + +from mpcontribs_api.auth import User +from mpcontribs_api.domains.contributions.models import ( + Contribution, + ContributionFilter, + ContributionIn, + ContributionOut, + ContributionPatch, +) +from mpcontribs_api.domains.contributions.repository import MongoDbContributionRepository +from mpcontribs_api.exceptions import ValidationError +from mpcontribs_api.pagination import CursorParams + +pytestmark = [pytest.mark.db, pytest.mark.asyncio(loop_scope="session")] + + +# --------------------------------------------------------------------------- +# Helpers +# --------------------------------------------------------------------------- + +ADMIN = User(username="google:admin@example.com", groups=frozenset({"admin"})) +ALICE = User(username="google:alice@example.com", groups=frozenset({"mp-team"})) +BOB = User(username="google:bob@example.com", groups=frozenset()) +ANON = User() + + +def _repo(user: User = ADMIN) -> MongoDbContributionRepository: + return MongoDbContributionRepository(user) + + +def _contrib_in(project: str = "test-proj", identifier: str = "mp-1", **overrides) -> ContributionIn: + defaults: dict = { + "_id": PydanticObjectId(), + "project": project, + "identifier": identifier, + "formula": "Fe2O3", + "data": {"band_gap": 2.1}, + } + defaults.update(overrides) + return ContributionIn(**defaults) + + +async def _insert(project="test-proj", identifier="mp-1", is_public: bool = False, **overrides) -> Contribution: + # Build a Contribution directly so is_public can be set explicitly. + # from_input_model() always forces is_public=False, which is correct for + # user-submitted data but inconvenient for test setup. + doc = Contribution( + _id=PydanticObjectId(), + project=project, + identifier=identifier, + formula=overrides.pop("formula", "Fe2O3"), + data=overrides.pop("data", {"band_gap": 2.1}), + is_public=is_public, + **overrides, + ) + await doc.insert() + return doc + + +def _noop_filter() -> ContributionFilter: + return ContributionFilter() + + +# --------------------------------------------------------------------------- +# insert_contribution (single) +# --------------------------------------------------------------------------- + + +class TestInsertContribution: + async def test_inserted_document_is_retrievable(self, db): + doc = await _insert(identifier="ins-basic") + found = await Contribution.find_one(Contribution.id == doc.id) + assert found is not None + assert found.identifier == "ins-basic" + + async def test_is_public_defaults_to_false(self, db): + doc = await _insert(identifier="ins-priv") + found = await Contribution.find_one(Contribution.id == doc.id) + assert found.is_public is False + + async def test_fields_are_persisted(self, db): + doc = await _insert(project="proj-x", identifier="ins-fields", formula="Li2O", data={"x": 1}) + found = await Contribution.find_one(Contribution.id == doc.id) + assert found.project == "proj-x" + assert found.formula == "Li2O" + assert found.data == {"x": 1} + + async def test_insert_via_repo(self, db): + ci = _contrib_in(identifier="ins-via-repo") + doc = Contribution.from_input_model(ci) + result = await _repo().insert_contribution(doc) + found = await Contribution.find_one(Contribution.id == result.id) + assert found is not None + assert found.identifier == "ins-via-repo" + + +# --------------------------------------------------------------------------- +# insert_many_contributions (bulk) +# --------------------------------------------------------------------------- + + +class TestInsertManyContributions: + async def test_all_docs_persisted(self, db): + docs = [Contribution.from_input_model(_contrib_in(identifier=f"bulk-{i}")) for i in range(5)] + await _repo().insert_many_contributions(docs) + for doc in docs: + found = await Contribution.find_one(Contribution.id == doc.id) + assert found is not None + + async def test_returns_insert_result(self, db): + docs = [Contribution.from_input_model(_contrib_in(identifier=f"bulk-ret-{i}")) for i in range(3)] + result = await _repo().insert_many_contributions(docs) + assert result is not None + + async def test_empty_list_raises_type_error(self, db): + # Motor's insert_many requires at least one document; callers are + # responsible for guarding against empty batches. + with pytest.raises(TypeError, match="non-empty"): + await _repo().insert_many_contributions([]) + + +# --------------------------------------------------------------------------- +# get_contributions (scoped list + pagination + projection) +# --------------------------------------------------------------------------- + + +class TestGetContributions: + async def test_admin_sees_private_and_public(self, db): + p = await _insert(identifier="ga-pub", is_public=True) + pr = await _insert(identifier="ga-priv", is_public=False) + page = await _repo(ADMIN).get_contributions( + pagination=CursorParams(), filter=_noop_filter(), fields=None + ) + ids = {str(c.id) for c in page.items} + assert str(p.id) in ids + assert str(pr.id) in ids + + async def test_anonymous_sees_only_public(self, db): + pub = await _insert(identifier="anon-pub", is_public=True) + priv = await _insert(identifier="anon-priv", is_public=False) + page = await _repo(ANON).get_contributions( + pagination=CursorParams(), filter=_noop_filter(), fields=None + ) + ids = {str(c.id) for c in page.items} + assert str(pub.id) in ids + assert str(priv.id) not in ids + + async def test_authenticated_non_admin_sees_public(self, db): + pub = await _insert(identifier="alice-pub", is_public=True) + priv = await _insert(identifier="alice-priv", is_public=False) + page = await _repo(ALICE).get_contributions( + pagination=CursorParams(), filter=_noop_filter(), fields=None + ) + ids = {str(c.id) for c in page.items} + assert str(pub.id) in ids + assert str(priv.id) not in ids + + async def test_response_is_page_shape(self, db): + await _insert(identifier="pg-shape") + page = await _repo(ADMIN).get_contributions( + pagination=CursorParams(), filter=_noop_filter(), fields=None + ) + assert hasattr(page, "items") + assert hasattr(page, "next_cursor") + + async def test_limit_respected(self, db): + for i in range(5): + await _insert(identifier=f"lim-{i:02d}", is_public=True) + page = await _repo(ADMIN).get_contributions( + pagination=CursorParams(limit=3), filter=_noop_filter(), fields=None + ) + assert len(page.items) <= 3 + + async def test_cursor_paginates_forward(self, db): + for i in range(4): + await _insert(identifier=f"cur-{i:02d}", is_public=True) + p1 = await _repo(ADMIN).get_contributions( + pagination=CursorParams(limit=2), filter=_noop_filter(), fields=None + ) + assert p1.next_cursor is not None + p2 = await _repo(ADMIN).get_contributions( + pagination=CursorParams(limit=2, cursor=p1.next_cursor), filter=_noop_filter(), fields=None + ) + ids1 = {str(c.id) for c in p1.items} + ids2 = {str(c.id) for c in p2.items} + assert ids1.isdisjoint(ids2) + + async def test_all_items_covered_across_pages(self, db): + for i in range(5): + await _insert(identifier=f"all-pg-{i:02d}", is_public=True) + identifiers: set[str] = set() + cursor = None + while True: + page = await _repo(ADMIN).get_contributions( + pagination=CursorParams(limit=2, cursor=cursor), filter=_noop_filter(), fields=None + ) + identifiers.update(c.identifier for c in page.items if c.identifier) + cursor = page.next_cursor + if cursor is None: + break + assert all(f"all-pg-{i:02d}" in identifiers for i in range(5)) + + async def test_next_cursor_none_on_last_page(self, db): + for i in range(2): + await _insert(identifier=f"last-pg-{i:02d}", is_public=True) + page = await _repo(ADMIN).get_contributions( + pagination=CursorParams(limit=100), filter=_noop_filter(), fields=None + ) + assert page.next_cursor is None + + async def test_projection_returns_only_requested_fields(self, db): + await _insert(identifier="proj-fields", is_public=True) + fields = ContributionOut.parse_fields(["formula"]) + page = await _repo(ADMIN).get_contributions( + pagination=CursorParams(), filter=_noop_filter(), fields=fields + ) + assert len(page.items) >= 1 + item = page.items[0] + assert item.formula is not None + assert not hasattr(item, "data") + + async def test_filter_by_formula(self, db): + await _insert(identifier="flt-fe", formula="Fe2O3", is_public=True) + await _insert(identifier="flt-li", formula="Li2O", is_public=True) + f = ContributionFilter(formula="Fe2O3") + page = await _repo(ADMIN).get_contributions( + pagination=CursorParams(), filter=f, fields=None + ) + formulas = {c.formula for c in page.items} + assert formulas == {"Fe2O3"} + + async def test_filter_by_identifier_ilike(self, db): + await _insert(identifier="ilike-abc", is_public=True) + await _insert(identifier="ilike-xyz", is_public=True) + f = ContributionFilter(identifier__ilike="ilike-a") + page = await _repo(ADMIN).get_contributions( + pagination=CursorParams(), filter=f, fields=None + ) + identifiers = {c.identifier for c in page.items} + assert "ilike-abc" in identifiers + assert "ilike-xyz" not in identifiers + + async def test_filter_by_is_public(self, db): + await _insert(identifier="pub-only-pub", is_public=True) + await _insert(identifier="pub-only-priv", is_public=False) + f = ContributionFilter(is_public=True) + page = await _repo(ADMIN).get_contributions( + pagination=CursorParams(), filter=f, fields=None + ) + assert all(c.is_public is True for c in page.items) + + async def test_filter_by_needs_build(self, db): + await _insert(identifier="nb-true", needs_build=True, is_public=True) + await _insert(identifier="nb-false", needs_build=False, is_public=True) + f = ContributionFilter(needs_build=False) + page = await _repo(ADMIN).get_contributions( + pagination=CursorParams(), filter=f, fields=None + ) + identifiers = {c.identifier for c in page.items} + assert "nb-false" in identifiers + assert "nb-true" not in identifiers + + +# --------------------------------------------------------------------------- +# get_contribution_by_id +# --------------------------------------------------------------------------- + + +class TestGetContributionById: + async def test_returns_doc_for_valid_id(self, db): + doc = await _insert(identifier="get-id") + result = await _repo(ADMIN).get_contribution_by_id(str(doc.id), fields=None) + assert result is not None + assert result.identifier == "get-id" + + async def test_returns_none_for_missing_id(self, db): + result = await _repo(ADMIN).get_contribution_by_id(str(PydanticObjectId()), fields=None) + assert result is None + + async def test_admin_can_get_private_doc(self, db): + doc = await _insert(identifier="get-priv", is_public=False) + result = await _repo(ADMIN).get_contribution_by_id(str(doc.id), fields=None) + assert result is not None + + async def test_anon_cannot_get_private_doc(self, db): + doc = await _insert(identifier="get-anon-priv", is_public=False) + result = await _repo(ANON).get_contribution_by_id(str(doc.id), fields=None) + assert result is None + + async def test_anon_can_get_public_doc(self, db): + doc = await _insert(identifier="get-anon-pub", is_public=True) + result = await _repo(ANON).get_contribution_by_id(str(doc.id), fields=None) + assert result is not None + + async def test_raises_validation_error_for_bad_id_format(self, db): + with pytest.raises(ValidationError): + await _repo(ADMIN).get_contribution_by_id("not-an-objectid", fields=None) + + async def test_projection_limits_fields(self, db): + doc = await _insert(identifier="get-proj", is_public=True) + fields = ContributionOut.parse_fields(["formula"]) + result = await _repo(ADMIN).get_contribution_by_id(str(doc.id), fields=fields) + assert result is not None + assert result.formula == "Fe2O3" + assert not hasattr(result, "data") + + +# --------------------------------------------------------------------------- +# find_one_contribution (by project + identifier) +# --------------------------------------------------------------------------- + + +class TestFindOneContribution: + async def test_finds_existing_doc(self, db): + await _insert(project="find-proj", identifier="find-id") + result = await _repo(ADMIN).find_one_contribution("find-proj", "find-id") + assert result is not None + assert result.project == "find-proj" + assert result.identifier == "find-id" + + async def test_returns_none_for_missing_combination(self, db): + await _insert(project="miss-proj", identifier="miss-id") + result = await _repo(ADMIN).find_one_contribution("miss-proj", "wrong-id") + assert result is None + + async def test_scope_prevents_anon_finding_private(self, db): + await _insert(project="anon-scope", identifier="priv-doc", is_public=False) + result = await _repo(ANON).find_one_contribution("anon-scope", "priv-doc") + assert result is None + + async def test_scope_allows_anon_finding_public(self, db): + await _insert(project="anon-scope-pub", identifier="pub-doc", is_public=True) + result = await _repo(ANON).find_one_contribution("anon-scope-pub", "pub-doc") + assert result is not None + + async def test_project_identifier_combination_is_unique_lookup(self, db): + await _insert(project="same-proj", identifier="id-a") + await _insert(project="same-proj", identifier="id-b") + result = await _repo(ADMIN).find_one_contribution("same-proj", "id-a") + assert result is not None + assert result.identifier == "id-a" + + +# --------------------------------------------------------------------------- +# update_contribution +# --------------------------------------------------------------------------- + + +class TestUpdateContribution: + async def test_updates_single_field(self, db): + doc = await _insert(identifier="upd-formula") + await _repo(ADMIN).update_contribution(doc, {"formula": "SiO2"}) + found = await Contribution.find_one(Contribution.id == doc.id) + assert found.formula == "SiO2" + + async def test_updates_data_field(self, db): + doc = await _insert(identifier="upd-data") + await _repo(ADMIN).update_contribution(doc, {"data": {"energy": -5.0}}) + found = await Contribution.find_one(Contribution.id == doc.id) + assert found.data == {"energy": -5.0} + + async def test_unrelated_fields_unchanged(self, db): + doc = await _insert(identifier="upd-preserve", formula="Fe2O3") + await _repo(ADMIN).update_contribution(doc, {"needs_build": False}) + found = await Contribution.find_one(Contribution.id == doc.id) + assert found.formula == "Fe2O3" + + async def test_update_sets_last_modified(self, db): + doc = await _insert(identifier="upd-lm") + original_lm = doc.last_modified + await _repo(ADMIN).update_contribution(doc, {"formula": "Al2O3"}) + found = await Contribution.find_one(Contribution.id == doc.id) + # MongoDB may return naive UTC datetimes; strip timezone before comparing. + def _naive(dt): + return dt.replace(tzinfo=None) if dt.tzinfo else dt + assert _naive(found.last_modified) >= _naive(original_lm) + + +# --------------------------------------------------------------------------- +# patch_contribution_by_id +# --------------------------------------------------------------------------- + + +class TestPatchContributionById: + async def test_updates_formula(self, db): + doc = await _insert(identifier="patch-formula") + await _repo(ADMIN).patch_contribution_by_id(str(doc.id), ContributionPatch(formula="Li2O")) + found = await Contribution.find_one(Contribution.id == doc.id) + assert found.formula == "Li2O" + + async def test_unset_fields_not_overwritten(self, db): + doc = await _insert(identifier="patch-preserve", formula="Fe2O3") + await _repo(ADMIN).patch_contribution_by_id(str(doc.id), ContributionPatch(needs_build=False)) + found = await Contribution.find_one(Contribution.id == doc.id) + assert found.formula == "Fe2O3" + + async def test_empty_patch_is_a_noop(self, db): + doc = await _insert(identifier="patch-empty", formula="Fe2O3") + result = await _repo(ADMIN).patch_contribution_by_id(str(doc.id), ContributionPatch()) + assert result is not None + found = await Contribution.find_one(Contribution.id == doc.id) + assert found.formula == "Fe2O3" + + async def test_raises_validation_error_for_bad_id(self, db): + with pytest.raises(ValidationError): + await _repo(ADMIN).patch_contribution_by_id("bad-id", ContributionPatch(formula="X")) + + async def test_anon_cannot_patch_private_doc(self, db): + from mpcontribs_api.exceptions import NotFoundError + doc = await _insert(identifier="patch-anon-priv", is_public=False) + with pytest.raises(NotFoundError): + await _repo(ANON).patch_contribution_by_id(str(doc.id), ContributionPatch(formula="X")) + + +# --------------------------------------------------------------------------- +# delete_contribution_by_id +# --------------------------------------------------------------------------- + + +class TestDeleteContributionById: + async def test_deleted_doc_not_found_afterwards(self, db): + doc = await _insert(identifier="del-me") + await _repo(ADMIN).delete_contribution_by_id(str(doc.id)) + found = await Contribution.find_one(Contribution.id == doc.id) + assert found is None + + async def test_delete_nonexistent_is_silent(self, db): + await _repo(ADMIN).delete_contribution_by_id(str(PydanticObjectId())) + + async def test_raises_validation_error_for_bad_id(self, db): + with pytest.raises(ValidationError): + await _repo(ADMIN).delete_contribution_by_id("not-an-id") + + async def test_anon_cannot_delete_private_doc(self, db): + doc = await _insert(identifier="del-anon-priv", is_public=False) + await _repo(ANON).delete_contribution_by_id(str(doc.id)) + # Scope prevents anonymous from seeing the doc, so it is never deleted. + still_there = await Contribution.find_one(Contribution.id == doc.id) + assert still_there is not None + + +# --------------------------------------------------------------------------- +# delete_contributions (bulk with filter) +# --------------------------------------------------------------------------- + + +class TestDeleteContributions: + async def test_bulk_delete_all(self, db): + for i in range(3): + await _insert(identifier=f"bdel-{i:02d}") + await _repo(ADMIN).delete_contributions(_noop_filter()) + remaining = await Contribution.find().to_list() + assert len(remaining) == 0 + + async def test_bulk_delete_with_filter(self, db): + await _insert(identifier="bdel-keep", formula="Li2O") + await _insert(identifier="bdel-drop", formula="Fe2O3") + f = ContributionFilter(formula="Fe2O3") + await _repo(ADMIN).delete_contributions(f) + remaining = await Contribution.find().to_list() + assert len(remaining) == 1 + assert remaining[0].identifier == "bdel-keep" + + async def test_bulk_delete_empty_collection_is_silent(self, db): + await _repo(ADMIN).delete_contributions(_noop_filter()) + + async def test_scope_limits_what_anon_can_delete(self, db): + await _insert(identifier="bdel-scope-pub", is_public=True) + await _insert(identifier="bdel-scope-priv", is_public=False) + await _repo(ANON).delete_contributions(_noop_filter()) + # Anonymous scope: only public visible, so only the public doc is deleted. + remaining = await Contribution.find().to_list() + identifiers = {d.identifier for d in remaining} + assert "bdel-scope-priv" in identifiers diff --git a/mpcontribs-api/tests/unit/domains/test_contribution_service.py b/mpcontribs-api/tests/unit/domains/test_contribution_service.py new file mode 100644 index 0000000000..e122159622 --- /dev/null +++ b/mpcontribs-api/tests/unit/domains/test_contribution_service.py @@ -0,0 +1,569 @@ +"""Unit tests for ContributionService. + +All database access is replaced with AsyncMock repositories so no MongoDB +connection is needed. These tests verify: + - _insert_components: slice bookkeeping and delegation to component repos + - insert_contributions: Link wiring and bulk-insert delegation + - upsert_contributions: guard against components, insert vs update branching +""" + +from unittest.mock import AsyncMock, MagicMock + +import polars as pl +import pytest +from beanie import PydanticObjectId +from pymatgen.core import Element + +from mpcontribs_api.domains.attachments.models import Attachment, AttachmentIn +from mpcontribs_api.domains.contributions.models import Contribution, ContributionIn +from mpcontribs_api.domains.contributions.service import ContributionService +from mpcontribs_api.domains.structures.models import ( + Lattice, + Site, + SiteProperties, + Species, + Structure, + StructureIn, +) +from mpcontribs_api.domains.tables.models import Attributes, Labels, Table, TableIn +from mpcontribs_api.exceptions import ValidationError + +pytestmark = pytest.mark.asyncio + + +# --------------------------------------------------------------------------- +# Helpers +# --------------------------------------------------------------------------- + + +def _oid() -> PydanticObjectId: + return PydanticObjectId() + + +def _attachment_in(**overrides) -> AttachmentIn: + defaults = { + "_id": _oid(), + "name": "data.gz", + "md5": "a" * 32, + "mime": "application/gzip", + "content": 0, + } + defaults.update(overrides) + return AttachmentIn(**defaults) + + +def _table_in(**overrides) -> TableIn: + defaults = { + "_id": _oid(), + "name": "test-table", + "md5": "b" * 32, + "attrs": Attributes(title="T", labels=Labels(index="x", value="y", variable="z")), + "total_data_rows": 1, + "data": pl.DataFrame({"col": [1.0]}), + } + defaults.update(overrides) + return TableIn(**defaults) + + +def _structure_in(**overrides) -> StructureIn: + defaults = { + "_id": _oid(), + "name": "test-struct", + "md5": "c" * 32, + "lattice": Lattice( + matrix=pl.DataFrame([[1.0, 0.0, 0.0], [0.0, 1.0, 0.0], [0.0, 0.0, 1.0]]), + pbc=[True, True, True], + a=1.0, b=1.0, c=1.0, + alpha=90.0, beta=90.0, gamma=90.0, + volume=1.0, + ), + "sites": [ + Site( + species=[Species(element=Element("Fe"), occu=1)], + abc=[0.0, 0.0, 0.0], + properties=SiteProperties(magmom=0.0), + label="Fe", + xyz=[0.0, 0.0, 0.0], + ) + ], + "charge": None, + "cif": "", + } + defaults.update(overrides) + return StructureIn(**defaults) + + +def _contrib_in(project="proj", identifier="mp-1", formula="Fe2O3", **kwargs) -> ContributionIn: + return ContributionIn( + _id=_oid(), + project=project, + identifier=identifier, + formula=formula, + data={}, + **kwargs, + ) + + +def _make_service( + contributions=None, + structures=None, + tables=None, + attachments=None, +) -> tuple[ContributionService, AsyncMock, AsyncMock, AsyncMock, AsyncMock]: + contrib_repo = contributions or AsyncMock() + struct_repo = structures or AsyncMock() + table_repo = tables or AsyncMock() + attach_repo = attachments or AsyncMock() + svc = ContributionService( + contributions=contrib_repo, + structures=struct_repo, + tables=table_repo, + attachments=attach_repo, + ) + return svc, contrib_repo, struct_repo, table_repo, attach_repo + + +def _fake_structure() -> Structure: + s = MagicMock(spec=Structure) + s.id = _oid() + return s + + +def _fake_table() -> Table: + t = MagicMock(spec=Table) + t.id = _oid() + return t + + +def _fake_attachment() -> Attachment: + a = MagicMock(spec=Attachment) + a.id = _oid() + return a + + +# --------------------------------------------------------------------------- +# _insert_components +# --------------------------------------------------------------------------- + + +class TestInsertComponents: + async def test_empty_batch_calls_repos_with_empty_lists(self): + svc, _, struct_repo, table_repo, attach_repo = _make_service() + struct_repo.insert_structures.return_value = [] + table_repo.insert_tables.return_value = [] + attach_repo.insert_attachments.return_value = [] + + structures, tables, attachments, ss, ts, ats = await svc._insert_components([]) + + struct_repo.insert_structures.assert_called_once_with([]) + table_repo.insert_tables.assert_called_once_with([]) + attach_repo.insert_attachments.assert_called_once_with([]) + assert structures == [] + assert tables == [] + assert attachments == [] + assert ss == [] + assert ts == [] + assert ats == [] + + async def test_single_contrib_no_components_produces_empty_slices(self): + svc, _, struct_repo, table_repo, attach_repo = _make_service() + struct_repo.insert_structures.return_value = [] + table_repo.insert_tables.return_value = [] + attach_repo.insert_attachments.return_value = [] + + contrib = _contrib_in() + _, _, _, ss, ts, ats = await svc._insert_components([contrib]) + + assert ss == [slice(0, 0)] + assert ts == [slice(0, 0)] + assert ats == [slice(0, 0)] + + async def test_slices_are_contiguous_and_non_overlapping(self): + svc, _, struct_repo, table_repo, attach_repo = _make_service() + + struct_repo.insert_structures.return_value = [_fake_structure()] * 3 + table_repo.insert_tables.return_value = [] + attach_repo.insert_attachments.return_value = [] + + contrib_a = _contrib_in(identifier="a", structures=[_structure_in()]) + contrib_b = _contrib_in(identifier="b", structures=[_structure_in(), _structure_in()]) + contrib_c = _contrib_in(identifier="c") + + _, _, _, ss, _, _ = await svc._insert_components([contrib_a, contrib_b, contrib_c]) + + assert ss[0] == slice(0, 1) # contrib_a: 1 structure + assert ss[1] == slice(1, 3) # contrib_b: 2 structures + assert ss[2] == slice(3, 3) # contrib_c: 0 structures + + async def test_all_component_types_collected_and_dispatched(self): + svc, _, struct_repo, table_repo, attach_repo = _make_service() + + struct_repo.insert_structures.return_value = [_fake_structure()] + table_repo.insert_tables.return_value = [_fake_table()] + attach_repo.insert_attachments.return_value = [_fake_attachment()] + + contrib = _contrib_in( + structures=[_structure_in()], + tables=[_table_in()], + attachments=[_attachment_in()], + ) + + await svc._insert_components([contrib]) + + struct_repo.insert_structures.assert_called_once() + table_repo.insert_tables.assert_called_once() + attach_repo.insert_attachments.assert_called_once() + # Verify correct counts were forwarded + assert len(struct_repo.insert_structures.call_args[0][0]) == 1 + assert len(table_repo.insert_tables.call_args[0][0]) == 1 + assert len(attach_repo.insert_attachments.call_args[0][0]) == 1 + + async def test_multiple_contribs_components_concatenated_before_insert(self): + svc, _, struct_repo, table_repo, attach_repo = _make_service() + + struct_repo.insert_structures.return_value = [_fake_structure()] * 3 + table_repo.insert_tables.return_value = [] + attach_repo.insert_attachments.return_value = [] + + c1 = _contrib_in(identifier="c1", structures=[_structure_in()]) + c2 = _contrib_in(identifier="c2", structures=[_structure_in(), _structure_in()]) + + await svc._insert_components([c1, c2]) + + struct_repo.insert_structures.assert_called_once() + assert len(struct_repo.insert_structures.call_args[0][0]) == 3 + + +# --------------------------------------------------------------------------- +# insert_contributions +# --------------------------------------------------------------------------- + + +class TestInsertContributions: + async def test_delegates_to_insert_many(self): + svc, contrib_repo, struct_repo, table_repo, attach_repo = _make_service() + + struct_repo.insert_structures.return_value = [] + table_repo.insert_tables.return_value = [] + attach_repo.insert_attachments.return_value = [] + contrib_repo.insert_many_contributions.return_value = MagicMock() + + contribs = [_contrib_in(identifier=f"mp-{i}") for i in range(3)] + await svc.insert_contributions(contribs) + + contrib_repo.insert_many_contributions.assert_called_once() + inserted_docs = contrib_repo.insert_many_contributions.call_args[0][0] + assert len(inserted_docs) == 3 + + async def test_is_public_forced_false_on_all_docs(self): + svc, contrib_repo, struct_repo, table_repo, attach_repo = _make_service() + + struct_repo.insert_structures.return_value = [] + table_repo.insert_tables.return_value = [] + attach_repo.insert_attachments.return_value = [] + contrib_repo.insert_many_contributions.return_value = MagicMock() + + contribs = [_contrib_in(identifier="mp-1")] + await svc.insert_contributions(contribs) + + docs = contrib_repo.insert_many_contributions.call_args[0][0] + assert all(d.is_public is False for d in docs) + + async def test_structure_links_wired_correctly(self): + svc, contrib_repo, struct_repo, table_repo, attach_repo = _make_service() + + fake_struct = _fake_structure() + struct_repo.insert_structures.return_value = [fake_struct] + table_repo.insert_tables.return_value = [] + attach_repo.insert_attachments.return_value = [] + contrib_repo.insert_many_contributions.return_value = MagicMock() + + contrib = _contrib_in(structures=[_structure_in()]) + await svc.insert_contributions([contrib]) + + doc = contrib_repo.insert_many_contributions.call_args[0][0][0] + assert doc.structures == [fake_struct] + + async def test_table_links_wired_correctly(self): + svc, contrib_repo, struct_repo, table_repo, attach_repo = _make_service() + + fake_table = _fake_table() + struct_repo.insert_structures.return_value = [] + table_repo.insert_tables.return_value = [fake_table] + attach_repo.insert_attachments.return_value = [] + contrib_repo.insert_many_contributions.return_value = MagicMock() + + contrib = _contrib_in(tables=[_table_in()]) + await svc.insert_contributions([contrib]) + + doc = contrib_repo.insert_many_contributions.call_args[0][0][0] + assert doc.tables == [fake_table] + + async def test_attachment_links_wired_correctly(self): + svc, contrib_repo, struct_repo, table_repo, attach_repo = _make_service() + + fake_attach = _fake_attachment() + struct_repo.insert_structures.return_value = [] + table_repo.insert_tables.return_value = [] + attach_repo.insert_attachments.return_value = [fake_attach] + contrib_repo.insert_many_contributions.return_value = MagicMock() + + contrib = _contrib_in(attachments=[_attachment_in()]) + await svc.insert_contributions([contrib]) + + doc = contrib_repo.insert_many_contributions.call_args[0][0][0] + assert doc.attachments == [fake_attach] + + async def test_no_components_sets_links_to_none(self): + svc, contrib_repo, struct_repo, table_repo, attach_repo = _make_service() + + struct_repo.insert_structures.return_value = [] + table_repo.insert_tables.return_value = [] + attach_repo.insert_attachments.return_value = [] + contrib_repo.insert_many_contributions.return_value = MagicMock() + + await svc.insert_contributions([_contrib_in()]) + + doc = contrib_repo.insert_many_contributions.call_args[0][0][0] + assert doc.structures is None + assert doc.tables is None + assert doc.attachments is None + + async def test_each_contrib_gets_only_its_own_components(self): + """Components belonging to contrib A must not bleed into contrib B.""" + svc, contrib_repo, struct_repo, table_repo, attach_repo = _make_service() + + s_a, s_b1, s_b2 = _fake_structure(), _fake_structure(), _fake_structure() + struct_repo.insert_structures.return_value = [s_a, s_b1, s_b2] + table_repo.insert_tables.return_value = [] + attach_repo.insert_attachments.return_value = [] + contrib_repo.insert_many_contributions.return_value = MagicMock() + + c_a = _contrib_in(identifier="a", structures=[_structure_in()]) + c_b = _contrib_in(identifier="b", structures=[_structure_in(), _structure_in()]) + + await svc.insert_contributions([c_a, c_b]) + + docs = contrib_repo.insert_many_contributions.call_args[0][0] + assert docs[0].structures == [s_a] + assert docs[1].structures == [s_b1, s_b2] + + async def test_empty_batch_still_calls_insert_many(self): + svc, contrib_repo, struct_repo, table_repo, attach_repo = _make_service() + + struct_repo.insert_structures.return_value = [] + table_repo.insert_tables.return_value = [] + attach_repo.insert_attachments.return_value = [] + contrib_repo.insert_many_contributions.return_value = MagicMock() + + await svc.insert_contributions([]) + + contrib_repo.insert_many_contributions.assert_called_once_with([]) + + +# --------------------------------------------------------------------------- +# upsert_contributions — guard clause +# --------------------------------------------------------------------------- + + +class TestUpsertContributionsGuard: + async def test_raises_validation_error_when_any_contrib_has_structures(self): + svc, *_ = _make_service() + contrib = _contrib_in(structures=[_structure_in()]) + with pytest.raises(ValidationError): + await svc.upsert_contributions([contrib]) + + async def test_raises_validation_error_when_any_contrib_has_tables(self): + svc, *_ = _make_service() + contrib = _contrib_in(tables=[_table_in()]) + with pytest.raises(ValidationError): + await svc.upsert_contributions([contrib]) + + async def test_raises_validation_error_when_any_contrib_has_attachments(self): + svc, *_ = _make_service() + contrib = _contrib_in(attachments=[_attachment_in()]) + with pytest.raises(ValidationError): + await svc.upsert_contributions([contrib]) + + async def test_error_reports_indices_of_offending_contribs(self): + svc, *_ = _make_service() + clean = _contrib_in(identifier="clean") + dirty = _contrib_in(identifier="dirty", structures=[_structure_in()]) + with pytest.raises(ValidationError) as exc_info: + await svc.upsert_contributions([clean, dirty]) + assert exc_info.value.context.get("contribution_indices") == [1] + + async def test_multiple_offenders_all_indices_reported(self): + svc, *_ = _make_service() + contribs = [ + _contrib_in(identifier="c0", structures=[_structure_in()]), + _contrib_in(identifier="c1"), + _contrib_in(identifier="c2", tables=[_table_in()]), + ] + with pytest.raises(ValidationError) as exc_info: + await svc.upsert_contributions(contribs) + assert exc_info.value.context.get("contribution_indices") == [0, 2] + + async def test_raises_before_any_db_write(self): + svc, contrib_repo, *_ = _make_service() + dirty = _contrib_in(structures=[_structure_in()]) + with pytest.raises(ValidationError): + await svc.upsert_contributions([dirty]) + contrib_repo.find_one_contribution.assert_not_called() + contrib_repo.insert_contribution.assert_not_called() + contrib_repo.update_contribution.assert_not_called() + + +# --------------------------------------------------------------------------- +# upsert_contributions — insert path (no existing doc) +# --------------------------------------------------------------------------- + + +class TestUpsertContributionsInsertPath: + async def test_insert_called_when_no_existing_doc(self): + svc, contrib_repo, *_ = _make_service() + contrib_repo.find_one_contribution.return_value = None + inserted = MagicMock(spec=Contribution) + contrib_repo.insert_contribution.return_value = inserted + + result = await svc.upsert_contributions([_contrib_in()]) + + contrib_repo.insert_contribution.assert_called_once() + assert result[0] is inserted + + async def test_new_doc_is_public_false(self): + svc, contrib_repo, *_ = _make_service() + contrib_repo.find_one_contribution.return_value = None + + captured = [] + + async def _capture(doc): + captured.append(doc) + return doc + + contrib_repo.insert_contribution.side_effect = _capture + + await svc.upsert_contributions([_contrib_in()]) + + assert len(captured) == 1 + assert captured[0].is_public is False + + async def test_find_uses_project_and_identifier(self): + svc, contrib_repo, *_ = _make_service() + contrib_repo.find_one_contribution.return_value = None + contrib_repo.insert_contribution.return_value = MagicMock(spec=Contribution) + + contrib = _contrib_in(project="my-proj", identifier="mp-99") + await svc.upsert_contributions([contrib]) + + contrib_repo.find_one_contribution.assert_called_once_with("my-proj", "mp-99") + + async def test_update_not_called_on_insert_path(self): + svc, contrib_repo, *_ = _make_service() + contrib_repo.find_one_contribution.return_value = None + contrib_repo.insert_contribution.return_value = MagicMock(spec=Contribution) + + await svc.upsert_contributions([_contrib_in()]) + + contrib_repo.update_contribution.assert_not_called() + + +# --------------------------------------------------------------------------- +# upsert_contributions — update path (existing doc found) +# --------------------------------------------------------------------------- + + +class TestUpsertContributionsUpdatePath: + async def test_update_called_when_existing_doc_found(self): + svc, contrib_repo, *_ = _make_service() + existing = MagicMock(spec=Contribution) + contrib_repo.find_one_contribution.return_value = existing + contrib_repo.update_contribution.return_value = None + + await svc.upsert_contributions([_contrib_in()]) + + contrib_repo.update_contribution.assert_called_once() + + async def test_returns_existing_doc_on_update(self): + svc, contrib_repo, *_ = _make_service() + existing = MagicMock(spec=Contribution) + contrib_repo.find_one_contribution.return_value = existing + contrib_repo.update_contribution.return_value = None + + result = await svc.upsert_contributions([_contrib_in()]) + + assert result[0] is existing + + async def test_insert_not_called_on_update_path(self): + svc, contrib_repo, *_ = _make_service() + existing = MagicMock(spec=Contribution) + contrib_repo.find_one_contribution.return_value = existing + contrib_repo.update_contribution.return_value = None + + await svc.upsert_contributions([_contrib_in()]) + + contrib_repo.insert_contribution.assert_not_called() + + async def test_update_data_excludes_id(self): + svc, contrib_repo, *_ = _make_service() + existing = MagicMock(spec=Contribution) + contrib_repo.find_one_contribution.return_value = existing + contrib_repo.update_contribution.return_value = None + + await svc.upsert_contributions([_contrib_in(formula="SiO2")]) + + update_data = contrib_repo.update_contribution.call_args[0][1] + assert "id" not in update_data + + async def test_update_data_excludes_none_fields(self): + svc, contrib_repo, *_ = _make_service() + existing = MagicMock(spec=Contribution) + contrib_repo.find_one_contribution.return_value = existing + contrib_repo.update_contribution.return_value = None + + await svc.upsert_contributions([_contrib_in(formula="SiO2")]) + + update_data = contrib_repo.update_contribution.call_args[0][1] + assert all(v is not None for v in update_data.values()) + + +# --------------------------------------------------------------------------- +# upsert_contributions — concurrent batch behavior +# --------------------------------------------------------------------------- + + +class TestUpsertContributionsBatch: + async def test_all_contribs_processed(self): + svc, contrib_repo, *_ = _make_service() + contrib_repo.find_one_contribution.return_value = None + contrib_repo.insert_contribution.return_value = MagicMock(spec=Contribution) + + contribs = [_contrib_in(identifier=f"mp-{i}") for i in range(5)] + results = await svc.upsert_contributions(contribs) + + assert len(results) == 5 + assert contrib_repo.insert_contribution.call_count == 5 + + async def test_mixed_insert_and_update_batch(self): + svc, contrib_repo, *_ = _make_service() + existing = MagicMock(spec=Contribution) + + async def _find(project, identifier): + return existing if identifier == "mp-0" else None + + contrib_repo.find_one_contribution.side_effect = _find + contrib_repo.update_contribution.return_value = None + contrib_repo.insert_contribution.return_value = MagicMock(spec=Contribution) + + contribs = [_contrib_in(identifier=f"mp-{i}") for i in range(3)] + await svc.upsert_contributions(contribs) + + assert contrib_repo.update_contribution.call_count == 1 + assert contrib_repo.insert_contribution.call_count == 2 + + async def test_empty_batch_returns_empty_list(self): + svc, *_ = _make_service() + results = await svc.upsert_contributions([]) + assert results == [] + + diff --git a/mpcontribs-api/tests/unit/domains/test_contributions_models.py b/mpcontribs-api/tests/unit/domains/test_contributions_models.py index 9b08da5121..f6ce20b89d 100644 --- a/mpcontribs-api/tests/unit/domains/test_contributions_models.py +++ b/mpcontribs-api/tests/unit/domains/test_contributions_models.py @@ -4,6 +4,9 @@ from beanie import PydanticObjectId from pydantic import ValidationError as PydanticValidationError +from mpcontribs_api.auth import User +from mpcontribs_api.domains.contributions.repository import MongoDbContributionRepository + from mpcontribs_api.domains.contributions.models import ( Contribution, ContributionIn, @@ -178,3 +181,45 @@ def test_partial_patch(self): def test_data_can_be_set(self): patch = ContributionPatch(data={"new_key": 42}) assert patch.data == {"new_key": 42} + + +# --------------------------------------------------------------------------- +# MongoDbContributionRepository._build_scope (pure logic, no DB needed) +# --------------------------------------------------------------------------- + +_ADMIN = User(username="google:admin@example.com", groups=frozenset({"admin"})) +_ALICE = User(username="google:alice@example.com", groups=frozenset({"mp-team"})) +_ANON = User() + + +class TestContributionRepoScope: + def test_admin_scope_is_empty(self): + assert MongoDbContributionRepository._build_scope(_ADMIN) == {} + + def test_anon_scope_has_or_clause(self): + scope = MongoDbContributionRepository._build_scope(_ANON) + assert "$or" in scope + + def test_anon_scope_includes_is_public_true(self): + ors = MongoDbContributionRepository._build_scope(_ANON)["$or"] + assert any(c == {"is_public": True} for c in ors) + + def test_anon_scope_has_no_group_id_clause(self): + ors = MongoDbContributionRepository._build_scope(_ANON)["$or"] + assert not any("_id" in c for c in ors) + + def test_authed_user_scope_includes_is_public(self): + ors = MongoDbContributionRepository._build_scope(_ALICE)["$or"] + assert any(c == {"is_public": True} for c in ors) + + def test_authed_user_with_groups_has_group_id_clause(self): + user = User(username="u@example.com", groups=frozenset({"g1", "g2"})) + ors = MongoDbContributionRepository._build_scope(user)["$or"] + group_clause = next((c for c in ors if "_id" in c), None) + assert group_clause is not None + assert set(group_clause["_id"]["$in"]) == {"g1", "g2"} + + def test_authed_user_no_groups_has_no_group_id_clause(self): + user = User(username="u@example.com", groups=frozenset()) + ors = MongoDbContributionRepository._build_scope(user)["$or"] + assert not any("_id" in c for c in ors) From d453458ef86982dec8f34e128c479a0e19b37a75 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Fri, 5 Jun 2026 19:31:15 -0700 Subject: [PATCH 305/591] Added docstrings --- mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py | 1 + .../src/mpcontribs_api/domains/_shared/repository.py | 3 ++- mpcontribs-api/src/mpcontribs_api/domains/projects/models.py | 4 ++++ mpcontribs-api/src/mpcontribs_api/pagination.py | 5 +++++ 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py index f76377c4e0..3f82b2455e 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py @@ -29,6 +29,7 @@ def from_input_model(cls, data: Any) -> Self: @staticmethod def decode_cursor(cursor: str) -> str | PydanticObjectId: + """Decodes the cursor the an ObjectId""" return PydanticObjectId(pagination.decode_cursor(cursor=cursor)) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py index e062af187c..3610b15a76 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py @@ -54,10 +54,11 @@ def _build_scope(user: User) -> dict[str, Any]: ... def _convert_object_id(self, id: str) -> PydanticObjectId: + """Converts the string representation of an ObjectId to an ObjectId""" try: return PydanticObjectId(id) except InvalidId: - raise ValidationError(f"Incorrect Id format: {id}. Must be MongoDB ObjectId format.") from None + raise ValidationError("Incorrect Id format. Must be MongoDB ObjectId format.", id=id) from None def _not_found(self, id: str) -> str: """Build a not-found message naming this repository's resource.""" diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py index 9086ad8391..15a4758879 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py @@ -66,6 +66,10 @@ def from_input_model(cls, data: ProjectIn) -> Project: @staticmethod def decode_cursor(cursor: str) -> str: + """Decodes cursor and returns it as a str. + + Needs override over parent class since Project.id is a simple str + """ return pagination.decode_cursor(cursor) class Settings: diff --git a/mpcontribs-api/src/mpcontribs_api/pagination.py b/mpcontribs-api/src/mpcontribs_api/pagination.py index 2e7929d7d8..e978a613f9 100644 --- a/mpcontribs-api/src/mpcontribs_api/pagination.py +++ b/mpcontribs-api/src/mpcontribs_api/pagination.py @@ -27,10 +27,15 @@ class Page[T](BaseModel): def encode_cursor(last_id: str) -> str: + """Base64 encodes a cursor for pagination + + Uses base64 instead of raw str to prevent manual tampering from users + """ return base64.urlsafe_b64encode(last_id.encode()).decode() def decode_cursor(cursor: str) -> str: + """Base64 decodes a cursor for pagination""" try: return base64.urlsafe_b64decode(cursor.encode()).decode() except ValueError, UnicodeDecodeError: From 3c486da9fc43a80a8cc7eec204c6b4b78e1efe24 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 8 Jun 2026 11:19:35 -0700 Subject: [PATCH 306/591] Inserting many contributions now uses multi-document transactions rather than unsafe raw async --- mpcontribs-api/src/mpcontribs_api/config.py | 37 +- .../src/mpcontribs_api/dependencies.py | 8 + .../mpcontribs_api/domains/_shared/bulk.py | 39 ++ .../domains/attachments/repository.py | 19 +- .../domains/contributions/dependencies.py | 5 +- .../domains/contributions/models.py | 12 + .../domains/contributions/repository.py | 25 +- .../domains/contributions/router.py | 4 +- .../domains/contributions/service.py | 245 ++++++++--- .../domains/structures/repository.py | 19 +- .../domains/tables/repository.py | 19 +- .../unit/domains/test_contribution_service.py | 392 +++++++++++------- 12 files changed, 594 insertions(+), 230 deletions(-) create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/_shared/bulk.py diff --git a/mpcontribs-api/src/mpcontribs_api/config.py b/mpcontribs-api/src/mpcontribs_api/config.py index 824ede959c..c60545f086 100644 --- a/mpcontribs-api/src/mpcontribs_api/config.py +++ b/mpcontribs-api/src/mpcontribs_api/config.py @@ -1,7 +1,7 @@ from functools import lru_cache from typing import Literal -from pydantic import BaseModel, Field, SecretStr +from pydantic import BaseModel, Field, SecretStr, model_validator from pydantic_settings import BaseSettings, SettingsConfigDict @@ -29,7 +29,7 @@ class MongoSettings(BaseModel): ) min_pool_size: int = Field( default=0, - description="Minimum number of concurent connections that the pool will maintain connected to each server", + description="Minimum number of concurent connections that the pool will maintain connected to each server ", ) datetime_conversion: Literal["datetime_ms", "datetime", "datetime_auto", "datetime_clamp"] = Field( default="datetime", @@ -37,17 +37,44 @@ class MongoSettings(BaseModel): ) server_selection_timeout_ms: int = Field( default=30000, - description="Controls how long (in milliseconds) the driver will wait to find an available, appropriate server" + description="Controls how long (in milliseconds) the driver will wait to find an available, appropriate server " "to carry out a database operation;" "while it is waiting, multiple server monitoring operations may be carried out", ) admin_group: str = Field( default="admin", - description="Name of admin group to consider in requests to MongoDB. Not directly passed to Mongo, but consumed" - "by auth.", + description="Name of admin group to consider in requests to MongoDB. Not directly passed to Mongo, but " + "consumed by auth.", ) + # TODO: Tune default + max_concurrent_transactions: int = Field( + default=16, + description="Upper bound on per-contribution transactions running in parallel during a bulk insert. Clamped at " + "construction to max_pool_size // 2 so reads on the same request can still acquire connections.", + ) + # TODO: Tune default + max_components_per_contribution: int = Field( + default=500, + description="Hard ceiling on structures + tables + attachments for a single contribution. Anything larger is " + "rejected upfront so we don't burn a transaction slot on a request guaranteed to exceed " + "transactionLifetimeLimitSeconds (default 60s).", + ) + # TODO: Tune default + component_insert_chunk_size: int = Field( + default=100, + description="Batch size used by component repositories when chunking insert_many calls inside a transaction.", + ) + + @model_validator(mode="after") + def _clamp_max_concurrent_transactions(self): + if self.max_pool_size: + cap = max(1, self.max_pool_size // 2) + if self.max_concurrent_transactions > cap: + self.max_concurrent_transactions = cap + return self + class Settings(BaseSettings): model_config = SettingsConfigDict( diff --git a/mpcontribs-api/src/mpcontribs_api/dependencies.py b/mpcontribs-api/src/mpcontribs_api/dependencies.py index b34fe1567c..83e31ba38a 100644 --- a/mpcontribs-api/src/mpcontribs_api/dependencies.py +++ b/mpcontribs-api/src/mpcontribs_api/dependencies.py @@ -3,6 +3,7 @@ import structlog from fastapi import Depends, Header, Request +from pymongo import AsyncMongoClient from pymongo.asynchronous.database import AsyncDatabase from mpcontribs_api.auth import User @@ -31,6 +32,13 @@ def get_db(request: Request) -> AsyncDatabase: DbDep = Annotated[AsyncDatabase, Depends(get_db)] +def get_mongo_client(request: Request) -> AsyncMongoClient: + return request.app.state.mongo_client + + +MongoClientDep = Annotated[AsyncMongoClient, Depends(get_mongo_client)] + + def _split(raw: str | None) -> set[str]: return {g.strip() for g in (raw or "").split(",") if g.strip()} diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/bulk.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/bulk.py new file mode 100644 index 0000000000..c76784e241 --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/bulk.py @@ -0,0 +1,39 @@ +from typing import Any + +from pydantic import BaseModel + +from mpcontribs_api.exceptions import AppError + + +class BulkFailure(BaseModel): + """A single failed item in a bulk write, identified by its position in the input batch.""" + + index: int + identifier: dict[str, Any] | None = None + error_code: str + message: str + + +class BulkWriteSummary[T](BaseModel): + """Result of a bulk write that supports per-item failure reporting. + + ``total`` is the size of the input batch (succeeded + failed). ``succeeded`` carries the + fully inserted documents; ``failed`` carries one ``BulkFailure`` per rejected item, with + enough context for the caller to retry just those items. + """ + + total: int + succeeded: list[T] + failed: list[BulkFailure] + + +def bulk_failure_from_exception(index: int, identifier: dict[str, Any] | None, exc: BaseException) -> BulkFailure: + """Translate any exception into a BulkFailure entry. + + ``AppError`` subclasses contribute their ``error_code`` and ``message``; everything else + collapses to ``internal_error`` with the exception class name in the message so we don't + leak tracebacks or framework internals to the client. + """ + if isinstance(exc, AppError): + return BulkFailure(index=index, identifier=identifier, error_code=exc.error_code, message=exc.message) + return BulkFailure(index=index, identifier=identifier, error_code="internal_error", message=type(exc).__name__) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/attachments/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/attachments/repository.py index c26dd9b0f1..e3c7fbb9e5 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/attachments/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/attachments/repository.py @@ -1,6 +1,9 @@ from typing import Any +from pymongo.asynchronous.client_session import AsyncClientSession + from mpcontribs_api.auth import User +from mpcontribs_api.config import get_settings from mpcontribs_api.domains._shared.repository import MongoDbRepository from mpcontribs_api.domains.attachments.models import ( Attachment, @@ -21,9 +24,21 @@ class MongoDbAttachmentRepository( def _build_scope(user: User) -> dict[str, Any]: return {} - async def insert_attachments(self, attachments: list[AttachmentIn]) -> list[Attachment]: + async def insert_attachments( + self, + attachments: list[AttachmentIn], + session: AsyncClientSession | None = None, + ) -> list[Attachment]: + """Bulk-insert attachments, chunked to fit within a transaction's payload budget. + + Args: + attachments: attachments to insert + session: optional client session; pass when inserting inside a transaction + """ if not attachments: return [] docs = [Attachment.model_validate(a.model_dump()) for a in attachments] - await Attachment.insert_many(docs, ordered=False) + chunk_size = get_settings().mongo.component_insert_chunk_size + for start in range(0, len(docs), chunk_size): + await Attachment.insert_many(docs[start : start + chunk_size], ordered=False, session=session) return docs diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/dependencies.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/dependencies.py index ec995e4542..b049f32c2c 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/dependencies.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/dependencies.py @@ -2,7 +2,7 @@ from fastapi import Depends -from mpcontribs_api.dependencies import UserDep +from mpcontribs_api.dependencies import MongoClientDep, UserDep from mpcontribs_api.domains.attachments.repository import MongoDbAttachmentRepository from mpcontribs_api.domains.contributions.repository import ( MongoDbContributionRepository, @@ -19,8 +19,9 @@ def get_scoped_contributions(user: UserDep) -> MongoDbContributionRepository: ContributionDep = Annotated[MongoDbContributionRepository, Depends(get_scoped_contributions)] -def get_contribution_service(user: UserDep) -> ContributionService: +def get_contribution_service(user: UserDep, client: MongoClientDep) -> ContributionService: return ContributionService( + client=client, contributions=MongoDbContributionRepository(user), structures=MongoDbStructureRepository(user), attachments=MongoDbAttachmentRepository(user), diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py index 7a66701b29..ab0f52cdac 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py @@ -64,6 +64,18 @@ class ContributionIn(ContributionBase): tables: list[TableIn] | None = None attachments: list[AttachmentIn] | None = None + def has_components(self) -> bool: + """Returns ``True`` if the contribution has any components (structures, tables, attachments)""" + return bool(self.structures or self.tables or self.attachments) + + def component_count(self) -> int: + """Returns the total number of components (structures, tables, attachments) in the contribution""" + return len(self.structures or []) + len(self.tables or []) + len(self.attachments or []) + + def identifiers(self) -> dict[str, str]: + """Returns a dict of unique identifiers for a contribution (outside of id).""" + return {"project": self.project, "identifier": self.identifier} + class ContributionOut(DocumentOut[PydanticObjectId]): project: str | None = None diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py index 638cfedfd4..5134669a0c 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py @@ -2,6 +2,7 @@ from beanie import UpdateResponse from beanie.operators import Set +from pymongo.asynchronous.client_session import AsyncClientSession from mpcontribs_api.auth import User from mpcontribs_api.domains._shared.repository import MongoDbRepository @@ -74,18 +75,26 @@ async def delete_contributions(self, filter: ContributionFilter): docs = filter.filter(self.document_model.find(self._scope)) await docs.delete() - async def insert_many_contributions(self, docs: list[Contribution]): + async def insert_many_contributions( + self, + docs: list[Contribution], + session: AsyncClientSession | None = None, + ): """Bulk-insert pre-built Contribution documents. - Used by ``ContributionService`` after it has resolved component Links. The service is - responsible for ensuring each document is fully formed; this method is a thin - collection-level wrapper. + Used by the ``ContributionService`` no-component fast path. On partial failure pymongo + raises ``BulkWriteError`` whose ``details["writeErrors"]`` carries per-index error info + that the service maps back into a ``BulkWriteSummary``. """ - return await self.document_model.insert_many(docs, ordered=False) + return await self.document_model.insert_many(docs, ordered=False, session=session) - async def insert_contribution(self, doc: Contribution) -> Contribution: - """Insert a single pre-built Contribution document.""" - await doc.insert() + async def insert_contribution( + self, + doc: Contribution, + session: AsyncClientSession | None = None, + ) -> Contribution: + """Insert a single pre-built Contribution document, optionally in a transaction.""" + await doc.insert(session=session) return doc async def find_one_contribution(self, project: str, identifier: str) -> Contribution | None: diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py index cfc7db4eff..b64a6bcf5c 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py @@ -3,8 +3,10 @@ from fastapi import APIRouter, Depends from fastapi_filter import FilterDepends +from mpcontribs_api.domains._shared.bulk import BulkWriteSummary from mpcontribs_api.domains.contributions.dependencies import ContributionDep, ContributionServiceDep from mpcontribs_api.domains.contributions.models import ( + Contribution, ContributionFilter, ContributionIn, ContributionOut, @@ -35,7 +37,7 @@ async def delete_contributions( return await repo.delete_contributions(filter=filter) -@router.post("") +@router.post("", response_model=BulkWriteSummary[Contribution]) async def insert_contributions( service: ContributionServiceDep, contributions: list[ContributionIn], diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py index 5d8056bc46..a74ddcf4f9 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py @@ -1,93 +1,242 @@ import asyncio +from collections import defaultdict from typing import cast +import structlog from beanie import Link +from pymongo import AsyncMongoClient +from pymongo.asynchronous.client_session import AsyncClientSession +from pymongo.errors import BulkWriteError -from mpcontribs_api.domains.attachments.models import Attachment, AttachmentIn +from mpcontribs_api.config import MongoSettings, get_settings +from mpcontribs_api.domains._shared.bulk import BulkFailure, BulkWriteSummary, bulk_failure_from_exception +from mpcontribs_api.domains.attachments.models import Attachment from mpcontribs_api.domains.attachments.repository import MongoDbAttachmentRepository from mpcontribs_api.domains.contributions.models import Contribution, ContributionIn from mpcontribs_api.domains.contributions.repository import MongoDbContributionRepository -from mpcontribs_api.domains.structures.models import Structure, StructureIn +from mpcontribs_api.domains.structures.models import Structure from mpcontribs_api.domains.structures.repository import MongoDbStructureRepository -from mpcontribs_api.domains.tables.models import Table, TableIn +from mpcontribs_api.domains.tables.models import Table from mpcontribs_api.domains.tables.repository import MongoDbTableRepository -from mpcontribs_api.exceptions import ValidationError +from mpcontribs_api.exceptions import AppError, ValidationError + +logger = structlog.get_logger(__name__) class ContributionService: def __init__( self, + client: AsyncMongoClient, contributions: MongoDbContributionRepository, structures: MongoDbStructureRepository, attachments: MongoDbAttachmentRepository, tables: MongoDbTableRepository, + settings: MongoSettings | None = None, ): + self._client = client self._contributions = contributions self._structures = structures self._attachments = attachments self._tables = tables + self._settings = settings or get_settings().mongo - async def _insert_components( + async def insert_contributions( self, contributions: list[ContributionIn], - ) -> tuple[list[Structure], list[Table], list[Attachment], list[slice], list[slice], list[slice]]: - """Bulk-insert component documents for a batch and return per-contribution slices. + ) -> BulkWriteSummary[Contribution]: + """Bulk insert contributions, atomically per top-level contribution. + + Contributions carrying no components are inserted in one ``insert_many`` (no transaction); + contributions with components run inside their own MongoDB transaction so the contribution + and its components commit or roll back together. Concurrent transactions are bounded by + ``settings.mongo.max_concurrent_transactions``. Per-item failures are returned in the + summary's ``failed`` list; the request as a whole does not raise on partial failure. + + Args: + contributions: contributions to insert; may include nested structures/tables/attachments Returns: - (structures, tables, attachments, struct_slices, table_slices, attach_slices) - where slice[i] selects the components belonging to contributions[i]. + BulkWriteSummary[Contribution]: per-item outcome, sized to ``len(contributions)`` + + Raises: + ValidationError: if duplicate keys (project-identifier) are found in ``contributions`` """ - all_structures: list[StructureIn] = [] - all_tables: list[TableIn] = [] - all_attachments: list[AttachmentIn] = [] - struct_slices: list[slice] = [] - table_slices: list[slice] = [] - attach_slices: list[slice] = [] + if not contributions: + return BulkWriteSummary[Contribution](total=0, succeeded=[], failed=[]) - for contrib in contributions: - s0 = len(all_structures) - all_structures.extend(contrib.structures or []) - struct_slices.append(slice(s0, len(all_structures))) + self._reject_duplicate_keys(contributions) - t0 = len(all_tables) - all_tables.extend(contrib.tables or []) - table_slices.append(slice(t0, len(all_tables))) + oversize_failures, remaining_indices = self._split_oversize(contributions) + no_comp_indices = [i for i in remaining_indices if not contributions[i].has_components()] + with_comp_indices = [i for i in remaining_indices if contributions[i].has_components()] - a0 = len(all_attachments) - all_attachments.extend(contrib.attachments or []) - attach_slices.append(slice(a0, len(all_attachments))) + no_comp_succeeded, no_comp_failed = await self._insert_no_components( + indices=no_comp_indices, + contributions=contributions, + ) + with_comp_succeeded, with_comp_failed = await self._insert_with_components( + indices=with_comp_indices, + contributions=contributions, + ) + + succeeded = [doc for _, doc in sorted(no_comp_succeeded + with_comp_succeeded, key=lambda p: p[0])] + failed = sorted( + oversize_failures + no_comp_failed + with_comp_failed, + key=lambda f: f.index, + ) + return BulkWriteSummary[Contribution](total=len(contributions), succeeded=succeeded, failed=failed) - structures = await self._structures.insert_structures(all_structures) - tables = await self._tables.insert_tables(all_tables) - attachments = await self._attachments.insert_attachments(all_attachments) + def _reject_duplicate_keys(self, contributions: list[ContributionIn]) -> None: + """Reject the whole batch if any (project, identifier) appears more than once. - return structures, tables, attachments, struct_slices, table_slices, attach_slices + Mongo would surface this as a write conflict per item; catching it upfront keeps a guaranteed + failure from consuming a transaction slot and gives the caller all offending indices at once. + """ + seen: dict[tuple[str, str], list[int]] = defaultdict(list) + for i, c in enumerate(contributions): + seen[(c.project, c.identifier)].append(i) + duplicates = sorted(i for indices in seen.values() if len(indices) > 1 for i in indices) + if duplicates: + raise ValidationError( + "Duplicate (project, identifier) pairs in batch", + contribution_indices=duplicates, + ) - async def insert_contributions(self, contributions: list[ContributionIn]): - """Bulk insertion of Contributions with nested components. + def _split_oversize(self, contributions: list[ContributionIn]) -> tuple[list[BulkFailure], list[int]]: + """Reject contributions whose component count exceeds the per-contribution ceiling. - Components embedded in each ContributionIn are bulk-inserted first; the resulting IDs - are stored as Links before the contributions themselves are bulk-inserted. + Returns the failure entries for the oversize items and the indices of the remaining items + that should proceed to Mongo. Doing this upfront avoids burning a transaction slot on a + request guaranteed to exceed transactionLifetimeLimitSeconds. + """ + cap = self._settings.max_components_per_contribution + oversize: list[BulkFailure] = [] + remaining: list[int] = [] + for i, contrib in enumerate(contributions): + count = contrib.component_count() + if count > cap: + oversize.append( + BulkFailure( + index=i, + identifier=contrib.identifiers(), + error_code="validation_error", + message=f"contribution has {count} components, exceeds cap of {cap}", + ) + ) + else: + remaining.append(i) + return oversize, remaining - Args: - contributions: contributions to insert, may include nested structures/tables/attachments + async def _insert_no_components( + self, + indices: list[int], + contributions: list[ContributionIn], + ) -> tuple[list[tuple[int, Contribution]], list[BulkFailure]]: + """Single-collection bulk insert for component-free contributions. - Returns: - list[Contribution]: inserted documents + Uses ``ordered=False`` so a single bad item doesn't sink the rest of the batch. pymongo + raises ``BulkWriteError`` with per-index error info on partial failure; we map that back + onto the original input indices. """ - structures, tables, attachments, struct_slices, table_slices, attach_slices = await self._insert_components( - contributions - ) + if not indices: + return [], [] + docs = [Contribution.from_input_model(contributions[i]) for i in indices] + try: + await self._contributions.insert_many_contributions(docs) + return list(zip(indices, docs, strict=False)), [] + except BulkWriteError as exc: + return self._partition_bulk_write_error(indices, docs, contributions, exc) - full_docs: list[Contribution] = [] - for i, contrib in enumerate(contributions): - doc = Contribution.from_input_model(contrib) - doc.structures = cast(list[Link[Structure]] | None, structures[struct_slices[i]] or None) - doc.tables = cast(list[Link[Table]] | None, tables[table_slices[i]] or None) - doc.attachments = cast(list[Link[Attachment]] | None, attachments[attach_slices[i]] or None) - full_docs.append(doc) + @staticmethod + def _partition_bulk_write_error( + indices: list[int], + docs: list[Contribution], + contributions: list[ContributionIn], + exc: BulkWriteError, + ) -> tuple[list[tuple[int, Contribution]], list[BulkFailure]]: + """Map pymongo's per-position writeErrors back to the caller's original input indices.""" + write_errors = exc.details.get("writeErrors", []) if exc.details else [] + failed_positions = {err.get("index"): err for err in write_errors} + succeeded: list[tuple[int, Contribution]] = [] + failed: list[BulkFailure] = [] + for position, (orig_index, doc) in enumerate(zip(indices, docs, strict=False)): + err = failed_positions.get(position) + if err is None: + succeeded.append((orig_index, doc)) + else: + failed.append( + BulkFailure( + index=orig_index, + identifier=contributions[orig_index].identifiers(), + error_code="conflict" if err.get("code") == 11000 else "write_error", + message=err.get("errmsg", "write failed"), + ) + ) + return succeeded, failed + + async def _insert_with_components( + self, + indices: list[int], + contributions: list[ContributionIn], + ) -> tuple[list[tuple[int, Contribution]], list[BulkFailure]]: + """Per-contribution transaction path, bounded by ``max_concurrent_transactions``.""" + if not indices: + return [], [] + sem = asyncio.Semaphore(self._settings.max_concurrent_transactions) + + async def _bounded(orig_index: int) -> Contribution | BulkFailure: + async with sem: + return await self._insert_one_with_components(orig_index, contributions[orig_index]) + + results = await asyncio.gather(*[_bounded(i) for i in indices]) + succeeded: list[tuple[int, Contribution]] = [] + failed: list[BulkFailure] = [] + for orig_index, outcome in zip(indices, results, strict=True): + if isinstance(outcome, BulkFailure): + failed.append(outcome) + else: + succeeded.append((orig_index, outcome)) + return succeeded, failed + + async def _insert_one_with_components( + self, + index: int, + contrib: ContributionIn, + ) -> Contribution | BulkFailure: + """Run a single contribution + its components inside a transaction. + + Uses ``session.with_transaction`` so transient txn errors (write conflicts, primary step- + downs) get pymongo's retry treatment. Any exception is converted to a ``BulkFailure`` so + the surrounding ``asyncio.gather`` sees a normal return value for every coroutine. + """ + try: + async with self._client.start_session() as session: + + async def _txn(s: AsyncClientSession) -> Contribution: + return await self._do_insert(contrib, s) + + return await session.with_transaction(_txn) + except AppError as exc: + return bulk_failure_from_exception(index, contrib.identifiers(), exc) + except Exception as exc: + logger.error("insert_contribution_failed", index=index, identifier=contrib.identifiers(), exc_info=True) + return bulk_failure_from_exception(index, contrib.identifiers(), exc) + + async def _do_insert(self, contrib: ContributionIn, session: AsyncClientSession) -> Contribution: + """Insert components then the contribution itself, all in the given session. + + Components are inserted sequentially because a session is single-threaded — sharing it + across concurrent awaits would corrupt the wire protocol. + """ + structures = await self._structures.insert_structures(contrib.structures or [], session=session) + tables = await self._tables.insert_tables(contrib.tables or [], session=session) + attachments = await self._attachments.insert_attachments(contrib.attachments or [], session=session) - return await self._contributions.insert_many_contributions(full_docs) + doc = Contribution.from_input_model(contrib) + doc.structures = cast(list[Link[Structure]] | None, structures or None) + doc.tables = cast(list[Link[Table]] | None, tables or None) + doc.attachments = cast(list[Link[Attachment]] | None, attachments or None) + return await self._contributions.insert_contribution(doc, session=session) async def upsert_contributions(self, contributions: list[ContributionIn]): """Upsert contributions by (project, identifier). diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/repository.py index 3216b3c2c2..96feb08545 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/structures/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/structures/repository.py @@ -1,6 +1,9 @@ from typing import Any +from pymongo.asynchronous.client_session import AsyncClientSession + from mpcontribs_api.auth import User +from mpcontribs_api.config import get_settings from mpcontribs_api.domains._shared.repository import MongoDbRepository from mpcontribs_api.domains.structures.models import ( Structure, @@ -21,9 +24,21 @@ class MongoDbStructureRepository( def _build_scope(user: User) -> dict[str, Any]: return {} - async def insert_structures(self, structures: list[StructureIn]) -> list[Structure]: + async def insert_structures( + self, + structures: list[StructureIn], + session: AsyncClientSession | None = None, + ) -> list[Structure]: + """Bulk-insert structures, chunked to fit within a transaction's payload budget. + + Args: + structures: structures to insert + session: optional client session; pass when inserting inside a transaction + """ if not structures: return [] docs = [Structure.model_validate(s.model_dump()) for s in structures] - await Structure.insert_many(docs, ordered=False) + chunk_size = get_settings().mongo.component_insert_chunk_size + for start in range(0, len(docs), chunk_size): + await Structure.insert_many(docs[start : start + chunk_size], ordered=False, session=session) return docs diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py index 37ba36526b..a0adc06a1e 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py @@ -1,6 +1,9 @@ from typing import Any +from pymongo.asynchronous.client_session import AsyncClientSession + from mpcontribs_api.auth import User +from mpcontribs_api.config import get_settings from mpcontribs_api.domains._shared.repository import MongoDbRepository from mpcontribs_api.domains.tables.models import ( Table, @@ -19,9 +22,21 @@ class MongoDbTableRepository(MongoDbRepository[Table, TableIn, TableDocumentOut, def _build_scope(user: User) -> dict[str, Any]: return {} - async def insert_tables(self, tables: list[TableIn]) -> list[Table]: + async def insert_tables( + self, + tables: list[TableIn], + session: AsyncClientSession | None = None, + ) -> list[Table]: + """Bulk-insert tables, chunked to fit within a transaction's payload budget. + + Args: + tables: tables to insert + session: optional client session; pass when inserting inside a transaction + """ if not tables: return [] docs = [Table.model_validate(t.model_dump()) for t in tables] - await Table.insert_many(docs, ordered=False) + chunk_size = get_settings().mongo.component_insert_chunk_size + for start in range(0, len(docs), chunk_size): + await Table.insert_many(docs[start : start + chunk_size], ordered=False, session=session) return docs diff --git a/mpcontribs-api/tests/unit/domains/test_contribution_service.py b/mpcontribs-api/tests/unit/domains/test_contribution_service.py index e122159622..b6460143ba 100644 --- a/mpcontribs-api/tests/unit/domains/test_contribution_service.py +++ b/mpcontribs-api/tests/unit/domains/test_contribution_service.py @@ -2,8 +2,8 @@ All database access is replaced with AsyncMock repositories so no MongoDB connection is needed. These tests verify: - - _insert_components: slice bookkeeping and delegation to component repos - - insert_contributions: Link wiring and bulk-insert delegation + - insert_contributions: pre-checks, no-component fast path, per-contribution txn path, + partial-failure summary - upsert_contributions: guard against components, insert vs update branching """ @@ -13,7 +13,9 @@ import pytest from beanie import PydanticObjectId from pymatgen.core import Element +from pymongo.errors import BulkWriteError +from mpcontribs_api.config import MongoSettings from mpcontribs_api.domains.attachments.models import Attachment, AttachmentIn from mpcontribs_api.domains.contributions.models import Contribution, ContributionIn from mpcontribs_api.domains.contributions.service import ContributionService @@ -26,7 +28,7 @@ StructureIn, ) from mpcontribs_api.domains.tables.models import Attributes, Labels, Table, TableIn -from mpcontribs_api.exceptions import ValidationError +from mpcontribs_api.exceptions import ConflictError, ValidationError pytestmark = pytest.mark.asyncio @@ -104,23 +106,66 @@ def _contrib_in(project="proj", identifier="mp-1", formula="Fe2O3", **kwargs) -> ) +def _make_mongo_settings( + *, + max_components_per_contribution: int = 500, + max_concurrent_transactions: int = 8, + component_insert_chunk_size: int = 100, +) -> MongoSettings: + return MongoSettings.model_validate({ + "uri": "mongodb://test", + "db_name": "test", + "max_pool_size": 100, + "max_components_per_contribution": max_components_per_contribution, + "max_concurrent_transactions": max_concurrent_transactions, + "component_insert_chunk_size": component_insert_chunk_size, + }) + + +def _make_fake_client() -> tuple[AsyncMock, MagicMock]: + """Return a fake AsyncMongoClient whose start_session() yields a session that drives + with_transaction(callback) by simply awaiting callback(session). + + Returns: + (client, session): the session is exposed so tests can assert on it. + """ + session = MagicMock(name="session") + + async def _with_transaction(callback): + return await callback(session) + + session.with_transaction = AsyncMock(side_effect=_with_transaction) + session.__aenter__ = AsyncMock(return_value=session) + session.__aexit__ = AsyncMock(return_value=None) + + client = MagicMock(name="client") + client.start_session = MagicMock(return_value=session) + return client, session + + def _make_service( contributions=None, structures=None, tables=None, attachments=None, -) -> tuple[ContributionService, AsyncMock, AsyncMock, AsyncMock, AsyncMock]: + client=None, + settings: MongoSettings | None = None, +) -> tuple[ContributionService, AsyncMock, AsyncMock, AsyncMock, AsyncMock, MagicMock]: contrib_repo = contributions or AsyncMock() struct_repo = structures or AsyncMock() table_repo = tables or AsyncMock() attach_repo = attachments or AsyncMock() + if client is None: + client, _ = _make_fake_client() svc = ContributionService( + client=client, contributions=contrib_repo, structures=struct_repo, tables=table_repo, attachments=attach_repo, + settings=settings or _make_mongo_settings(), ) - return svc, contrib_repo, struct_repo, table_repo, attach_repo + return svc, contrib_repo, struct_repo, table_repo, attach_repo, client def _fake_structure() -> Structure: @@ -142,223 +187,250 @@ def _fake_attachment() -> Attachment: # --------------------------------------------------------------------------- -# _insert_components +# insert_contributions — pre-checks (cheap, no DB) # --------------------------------------------------------------------------- -class TestInsertComponents: - async def test_empty_batch_calls_repos_with_empty_lists(self): - svc, _, struct_repo, table_repo, attach_repo = _make_service() - struct_repo.insert_structures.return_value = [] - table_repo.insert_tables.return_value = [] - attach_repo.insert_attachments.return_value = [] - - structures, tables, attachments, ss, ts, ats = await svc._insert_components([]) - - struct_repo.insert_structures.assert_called_once_with([]) - table_repo.insert_tables.assert_called_once_with([]) - attach_repo.insert_attachments.assert_called_once_with([]) - assert structures == [] - assert tables == [] - assert attachments == [] - assert ss == [] - assert ts == [] - assert ats == [] - - async def test_single_contrib_no_components_produces_empty_slices(self): - svc, _, struct_repo, table_repo, attach_repo = _make_service() - struct_repo.insert_structures.return_value = [] - table_repo.insert_tables.return_value = [] - attach_repo.insert_attachments.return_value = [] - - contrib = _contrib_in() - _, _, _, ss, ts, ats = await svc._insert_components([contrib]) +class TestInsertContributionsPreChecks: + async def test_empty_batch_returns_empty_summary_no_db(self): + svc, contrib_repo, struct_repo, table_repo, attach_repo, client = _make_service() - assert ss == [slice(0, 0)] - assert ts == [slice(0, 0)] - assert ats == [slice(0, 0)] + summary = await svc.insert_contributions([]) - async def test_slices_are_contiguous_and_non_overlapping(self): - svc, _, struct_repo, table_repo, attach_repo = _make_service() + assert summary.total == 0 + assert summary.succeeded == [] + assert summary.failed == [] + contrib_repo.insert_many_contributions.assert_not_called() + contrib_repo.insert_contribution.assert_not_called() + client.start_session.assert_not_called() - struct_repo.insert_structures.return_value = [_fake_structure()] * 3 - table_repo.insert_tables.return_value = [] - attach_repo.insert_attachments.return_value = [] + async def test_duplicate_project_identifier_raises_validation_error(self): + svc, contrib_repo, _, _, _, client = _make_service() + contribs = [ + _contrib_in(project="p", identifier="dup"), + _contrib_in(project="p", identifier="dup"), + ] + with pytest.raises(ValidationError) as exc_info: + await svc.insert_contributions(contribs) + assert exc_info.value.context.get("contribution_indices") == [0, 1] + contrib_repo.insert_many_contributions.assert_not_called() + client.start_session.assert_not_called() + + async def test_oversize_contribution_goes_to_failures_without_db(self): + settings = _make_mongo_settings(max_components_per_contribution=1) + svc, contrib_repo, struct_repo, _, _, client = _make_service(settings=settings) + contrib_repo.insert_many_contributions.return_value = None + + good = _contrib_in(identifier="ok") + oversize = _contrib_in(identifier="big", structures=[_structure_in(), _structure_in()]) + + summary = await svc.insert_contributions([good, oversize]) + + assert summary.total == 2 + assert len(summary.failed) == 1 + assert summary.failed[0].index == 1 + assert summary.failed[0].error_code == "validation_error" + # Oversize never reached the component repo + struct_repo.insert_structures.assert_not_called() + # And the in-pool contribution did go through the no-component fast path + contrib_repo.insert_many_contributions.assert_called_once() - contrib_a = _contrib_in(identifier="a", structures=[_structure_in()]) - contrib_b = _contrib_in(identifier="b", structures=[_structure_in(), _structure_in()]) - contrib_c = _contrib_in(identifier="c") - _, _, _, ss, _, _ = await svc._insert_components([contrib_a, contrib_b, contrib_c]) +# --------------------------------------------------------------------------- +# insert_contributions — no-component fast path +# --------------------------------------------------------------------------- - assert ss[0] == slice(0, 1) # contrib_a: 1 structure - assert ss[1] == slice(1, 3) # contrib_b: 2 structures - assert ss[2] == slice(3, 3) # contrib_c: 0 structures - async def test_all_component_types_collected_and_dispatched(self): - svc, _, struct_repo, table_repo, attach_repo = _make_service() +class TestInsertContributionsNoComponentPath: + async def test_all_no_components_uses_single_insert_many(self): + svc, contrib_repo, _, _, _, client = _make_service() + contrib_repo.insert_many_contributions.return_value = None - struct_repo.insert_structures.return_value = [_fake_structure()] - table_repo.insert_tables.return_value = [_fake_table()] - attach_repo.insert_attachments.return_value = [_fake_attachment()] - - contrib = _contrib_in( - structures=[_structure_in()], - tables=[_table_in()], - attachments=[_attachment_in()], - ) + contribs = [_contrib_in(identifier=f"mp-{i}") for i in range(3)] + summary = await svc.insert_contributions(contribs) - await svc._insert_components([contrib]) + contrib_repo.insert_many_contributions.assert_called_once() + # Zero transactions opened + client.start_session.assert_not_called() + contrib_repo.insert_contribution.assert_not_called() + assert summary.total == 3 + assert len(summary.succeeded) == 3 + assert summary.failed == [] - struct_repo.insert_structures.assert_called_once() - table_repo.insert_tables.assert_called_once() - attach_repo.insert_attachments.assert_called_once() - # Verify correct counts were forwarded - assert len(struct_repo.insert_structures.call_args[0][0]) == 1 - assert len(table_repo.insert_tables.call_args[0][0]) == 1 - assert len(attach_repo.insert_attachments.call_args[0][0]) == 1 + async def test_is_public_forced_false_on_inserted_docs(self): + svc, contrib_repo, _, _, _, _ = _make_service() + contrib_repo.insert_many_contributions.return_value = None - async def test_multiple_contribs_components_concatenated_before_insert(self): - svc, _, struct_repo, table_repo, attach_repo = _make_service() + await svc.insert_contributions([_contrib_in()]) - struct_repo.insert_structures.return_value = [_fake_structure()] * 3 - table_repo.insert_tables.return_value = [] - attach_repo.insert_attachments.return_value = [] + docs = contrib_repo.insert_many_contributions.call_args[0][0] + assert all(d.is_public is False for d in docs) - c1 = _contrib_in(identifier="c1", structures=[_structure_in()]) - c2 = _contrib_in(identifier="c2", structures=[_structure_in(), _structure_in()]) + async def test_bulk_write_error_partitions_succeeded_and_failed(self): + svc, contrib_repo, _, _, _, _ = _make_service() + # writeErrors index refers to position in the docs list (post-partition); both 2 and 5 + # exercise the mapping back to original input indices. + bulk_err = BulkWriteError({ + "writeErrors": [ + {"index": 2, "code": 11000, "errmsg": "duplicate key"}, + {"index": 5, "code": 11000, "errmsg": "duplicate key"}, + ] + }) + contrib_repo.insert_many_contributions.side_effect = bulk_err - await svc._insert_components([c1, c2]) + contribs = [_contrib_in(identifier=f"mp-{i}") for i in range(6)] + summary = await svc.insert_contributions(contribs) - struct_repo.insert_structures.assert_called_once() - assert len(struct_repo.insert_structures.call_args[0][0]) == 3 + assert summary.total == 6 + assert sorted(f.index for f in summary.failed) == [2, 5] + assert all(f.error_code == "conflict" for f in summary.failed) + # The 4 unaffected contributions succeed + assert len(summary.succeeded) == 4 # --------------------------------------------------------------------------- -# insert_contributions +# insert_contributions — per-contribution transaction path # --------------------------------------------------------------------------- -class TestInsertContributions: - async def test_delegates_to_insert_many(self): - svc, contrib_repo, struct_repo, table_repo, attach_repo = _make_service() +class TestInsertContributionsTransactionPath: + async def test_with_components_opens_session_per_contribution(self): + svc, contrib_repo, struct_repo, table_repo, attach_repo, client = _make_service() - struct_repo.insert_structures.return_value = [] + struct_repo.insert_structures.return_value = [_fake_structure()] table_repo.insert_tables.return_value = [] attach_repo.insert_attachments.return_value = [] - contrib_repo.insert_many_contributions.return_value = MagicMock() - contribs = [_contrib_in(identifier=f"mp-{i}") for i in range(3)] - await svc.insert_contributions(contribs) + async def _insert(doc, session=None): + return doc - contrib_repo.insert_many_contributions.assert_called_once() - inserted_docs = contrib_repo.insert_many_contributions.call_args[0][0] - assert len(inserted_docs) == 3 + contrib_repo.insert_contribution.side_effect = _insert - async def test_is_public_forced_false_on_all_docs(self): - svc, contrib_repo, struct_repo, table_repo, attach_repo = _make_service() + contribs = [_contrib_in(identifier=f"c{i}", structures=[_structure_in()]) for i in range(3)] + summary = await svc.insert_contributions(contribs) - struct_repo.insert_structures.return_value = [] - table_repo.insert_tables.return_value = [] - attach_repo.insert_attachments.return_value = [] - contrib_repo.insert_many_contributions.return_value = MagicMock() + assert client.start_session.call_count == 3 + assert summary.total == 3 + assert len(summary.succeeded) == 3 + assert summary.failed == [] - contribs = [_contrib_in(identifier="mp-1")] - await svc.insert_contributions(contribs) + async def test_session_threaded_to_all_repo_calls(self): + client, session = _make_fake_client() + svc, contrib_repo, struct_repo, table_repo, attach_repo, _ = _make_service(client=client) - docs = contrib_repo.insert_many_contributions.call_args[0][0] - assert all(d.is_public is False for d in docs) + struct_repo.insert_structures.return_value = [_fake_structure()] + table_repo.insert_tables.return_value = [_fake_table()] + attach_repo.insert_attachments.return_value = [_fake_attachment()] - async def test_structure_links_wired_correctly(self): - svc, contrib_repo, struct_repo, table_repo, attach_repo = _make_service() + async def _insert(doc, session=None): + return doc - fake_struct = _fake_structure() - struct_repo.insert_structures.return_value = [fake_struct] - table_repo.insert_tables.return_value = [] - attach_repo.insert_attachments.return_value = [] - contrib_repo.insert_many_contributions.return_value = MagicMock() + contrib_repo.insert_contribution.side_effect = _insert - contrib = _contrib_in(structures=[_structure_in()]) + contrib = _contrib_in( + structures=[_structure_in()], + tables=[_table_in()], + attachments=[_attachment_in()], + ) await svc.insert_contributions([contrib]) - doc = contrib_repo.insert_many_contributions.call_args[0][0][0] - assert doc.structures == [fake_struct] + assert struct_repo.insert_structures.call_args.kwargs["session"] is session + assert table_repo.insert_tables.call_args.kwargs["session"] is session + assert attach_repo.insert_attachments.call_args.kwargs["session"] is session + assert contrib_repo.insert_contribution.call_args.kwargs["session"] is session - async def test_table_links_wired_correctly(self): - svc, contrib_repo, struct_repo, table_repo, attach_repo = _make_service() + async def test_failure_on_second_of_three_yields_summary(self): + svc, contrib_repo, struct_repo, table_repo, attach_repo, _ = _make_service() - fake_table = _fake_table() - struct_repo.insert_structures.return_value = [] - table_repo.insert_tables.return_value = [fake_table] + struct_repo.insert_structures.return_value = [_fake_structure()] + table_repo.insert_tables.return_value = [] attach_repo.insert_attachments.return_value = [] - contrib_repo.insert_many_contributions.return_value = MagicMock() - - contrib = _contrib_in(tables=[_table_in()]) - await svc.insert_contributions([contrib]) - - doc = contrib_repo.insert_many_contributions.call_args[0][0][0] - assert doc.tables == [fake_table] - async def test_attachment_links_wired_correctly(self): - svc, contrib_repo, struct_repo, table_repo, attach_repo = _make_service() + async def _insert(doc, session=None): + # Fail the second contribution by inspecting the doc identifier + if doc.identifier == "fail": + raise ConflictError("conflict on insert") + return doc - fake_attach = _fake_attachment() - struct_repo.insert_structures.return_value = [] - table_repo.insert_tables.return_value = [] - attach_repo.insert_attachments.return_value = [fake_attach] - contrib_repo.insert_many_contributions.return_value = MagicMock() + contrib_repo.insert_contribution.side_effect = _insert - contrib = _contrib_in(attachments=[_attachment_in()]) - await svc.insert_contributions([contrib]) + contribs = [ + _contrib_in(identifier="ok-1", structures=[_structure_in()]), + _contrib_in(identifier="fail", structures=[_structure_in()]), + _contrib_in(identifier="ok-2", structures=[_structure_in()]), + ] + summary = await svc.insert_contributions(contribs) - doc = contrib_repo.insert_many_contributions.call_args[0][0][0] - assert doc.attachments == [fake_attach] + assert summary.total == 3 + assert len(summary.succeeded) == 2 + assert len(summary.failed) == 1 + assert summary.failed[0].index == 1 + assert summary.failed[0].error_code == "conflict" - async def test_no_components_sets_links_to_none(self): - svc, contrib_repo, struct_repo, table_repo, attach_repo = _make_service() + async def test_component_links_wired_per_contribution(self): + svc, contrib_repo, struct_repo, table_repo, attach_repo, _ = _make_service() - struct_repo.insert_structures.return_value = [] + struct_a, struct_b = _fake_structure(), _fake_structure() + struct_calls = iter([[struct_a], [struct_b]]) + struct_repo.insert_structures.side_effect = lambda *_args, **_kwargs: next(struct_calls) table_repo.insert_tables.return_value = [] attach_repo.insert_attachments.return_value = [] - contrib_repo.insert_many_contributions.return_value = MagicMock() - await svc.insert_contributions([_contrib_in()]) + captured: list[Contribution] = [] - doc = contrib_repo.insert_many_contributions.call_args[0][0][0] - assert doc.structures is None - assert doc.tables is None - assert doc.attachments is None + async def _insert(doc, session=None): + captured.append(doc) + return doc - async def test_each_contrib_gets_only_its_own_components(self): - """Components belonging to contrib A must not bleed into contrib B.""" - svc, contrib_repo, struct_repo, table_repo, attach_repo = _make_service() + contrib_repo.insert_contribution.side_effect = _insert - s_a, s_b1, s_b2 = _fake_structure(), _fake_structure(), _fake_structure() - struct_repo.insert_structures.return_value = [s_a, s_b1, s_b2] - table_repo.insert_tables.return_value = [] - attach_repo.insert_attachments.return_value = [] - contrib_repo.insert_many_contributions.return_value = MagicMock() + contribs = [ + _contrib_in(identifier="a", structures=[_structure_in()]), + _contrib_in(identifier="b", structures=[_structure_in()]), + ] + await svc.insert_contributions(contribs) - c_a = _contrib_in(identifier="a", structures=[_structure_in()]) - c_b = _contrib_in(identifier="b", structures=[_structure_in(), _structure_in()]) + captured_by_id = {c.identifier: c for c in captured} + assert captured_by_id["a"].structures == [struct_a] + assert captured_by_id["b"].structures == [struct_b] - await svc.insert_contributions([c_a, c_b]) - docs = contrib_repo.insert_many_contributions.call_args[0][0] - assert docs[0].structures == [s_a] - assert docs[1].structures == [s_b1, s_b2] +# --------------------------------------------------------------------------- +# insert_contributions — mixed batch (partitioned across paths) +# --------------------------------------------------------------------------- + - async def test_empty_batch_still_calls_insert_many(self): - svc, contrib_repo, struct_repo, table_repo, attach_repo = _make_service() +class TestInsertContributionsMixedBatch: + async def test_mixed_batch_routes_correctly(self): + svc, contrib_repo, struct_repo, table_repo, attach_repo, client = _make_service() - struct_repo.insert_structures.return_value = [] + struct_repo.insert_structures.return_value = [_fake_structure()] table_repo.insert_tables.return_value = [] attach_repo.insert_attachments.return_value = [] - contrib_repo.insert_many_contributions.return_value = MagicMock() + contrib_repo.insert_many_contributions.return_value = None + + async def _insert(doc, session=None): + return doc - await svc.insert_contributions([]) + contrib_repo.insert_contribution.side_effect = _insert - contrib_repo.insert_many_contributions.assert_called_once_with([]) + contribs = [ + _contrib_in(identifier="bare-1"), + _contrib_in(identifier="with-1", structures=[_structure_in()]), + _contrib_in(identifier="bare-2"), + _contrib_in(identifier="with-2", structures=[_structure_in()]), + ] + summary = await svc.insert_contributions(contribs) + + # No-component path: single batched call + contrib_repo.insert_many_contributions.assert_called_once() + assert len(contrib_repo.insert_many_contributions.call_args[0][0]) == 2 + # With-component path: one session per item + assert client.start_session.call_count == 2 + assert contrib_repo.insert_contribution.call_count == 2 + assert summary.total == 4 + assert len(summary.succeeded) == 4 + assert summary.failed == [] # --------------------------------------------------------------------------- From 5ed2439cbc97ddf6b93bdcc8edc186da2b054126 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 8 Jun 2026 11:40:24 -0700 Subject: [PATCH 307/591] upsert_contributions uses semaphore --- .../domains/contributions/service.py | 38 ++++++++++++------- .../unit/domains/test_contribution_service.py | 2 +- 2 files changed, 26 insertions(+), 14 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py index a74ddcf4f9..d67c659ee8 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py @@ -238,33 +238,45 @@ async def _do_insert(self, contrib: ContributionIn, session: AsyncClientSession) doc.attachments = cast(list[Link[Attachment]] | None, attachments or None) return await self._contributions.insert_contribution(doc, session=session) - async def upsert_contributions(self, contributions: list[ContributionIn]): - """Upsert contributions by (project, identifier). + async def upsert_contributions(self, contributions: list[ContributionIn]) -> list[Contribution]: + """Upsert contributions by their identifying fields, bounded by a concurrency cap. Components (structures, tables, attachments) must be managed via their respective services. If any contribution in the batch carries components, the entire request is rejected before any database writes occur. + Each item is looked up by ``ContributionIn.identifiers()``; an existing document is + partially updated (None fields are dropped), a missing one is inserted. Concurrent + upserts are capped by ``settings.mongo.max_concurrent_transactions`` so a large batch + cannot exhaust the connection pool. + Args: contributions: contributions to upsert; must not include nested components Returns: - list[Contribution]: upserted documents + list[Contribution]: upserted documents in input order """ - indices_with_components = [i for i, c in enumerate(contributions) if c.structures or c.tables or c.attachments] + indices_with_components = [i for i, c in enumerate(contributions) if c.has_components()] if indices_with_components: raise ValidationError( "Components must be managed via their respective services, not via contribution upsert.", contribution_indices=indices_with_components, ) - async def _upsert(contrib: ContributionIn): - doc = Contribution.from_input_model(contrib) - existing = await self._contributions.find_one_contribution(contrib.project, contrib.identifier) - if existing is not None: - update_data = doc.model_dump(exclude={"id"}, exclude_none=True) - await self._contributions.update_contribution(existing, update_data) - return existing - return await self._contributions.insert_contribution(doc) + sem = asyncio.Semaphore(self._settings.max_concurrent_transactions) + + async def _bounded_upsert(contrib: ContributionIn) -> Contribution: + async with sem: + return await self._upsert_one(contrib) + + return await asyncio.gather(*[_bounded_upsert(c) for c in contributions]) - return await asyncio.gather(*[_upsert(c) for c in contributions]) + async def _upsert_one(self, contrib: ContributionIn) -> Contribution: + """Partial-update if a document with the same identifiers exists, otherwise insert.""" + doc = Contribution.from_input_model(contrib) + existing = await self._contributions.find_one_contribution(**contrib.identifiers()) + if existing is not None: + update_data = doc.model_dump(exclude={"id"}, exclude_none=True) + await self._contributions.update_contribution(existing, update_data) + return existing + return await self._contributions.insert_contribution(doc) diff --git a/mpcontribs-api/tests/unit/domains/test_contribution_service.py b/mpcontribs-api/tests/unit/domains/test_contribution_service.py index b6460143ba..e23f5443fa 100644 --- a/mpcontribs-api/tests/unit/domains/test_contribution_service.py +++ b/mpcontribs-api/tests/unit/domains/test_contribution_service.py @@ -528,7 +528,7 @@ async def test_find_uses_project_and_identifier(self): contrib = _contrib_in(project="my-proj", identifier="mp-99") await svc.upsert_contributions([contrib]) - contrib_repo.find_one_contribution.assert_called_once_with("my-proj", "mp-99") + contrib_repo.find_one_contribution.assert_called_once_with(project="my-proj", identifier="mp-99") async def test_update_not_called_on_insert_path(self): svc, contrib_repo, *_ = _make_service() From b19afad11ac3b781b496149b0df4bcd542fe0de0 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 8 Jun 2026 11:45:55 -0700 Subject: [PATCH 308/591] Added project_identifier index on ContributionsBase --- .../src/mpcontribs_api/domains/contributions/models.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py index ab0f52cdac..f0586dabff 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py @@ -14,6 +14,7 @@ from fastapi_filter import FilterDepends, with_prefix from fastapi_filter.contrib.beanie import Filter from pydantic import Field +from pymongo import ASCENDING, IndexModel from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut from mpcontribs_api.domains.attachments.models import Attachment, AttachmentFilter, AttachmentIn @@ -36,6 +37,13 @@ class ContributionBase(BaseDocumentWithInput[PydanticObjectId]): class Settings: name = "contributions" keep_nulls = False + indexes = [ + IndexModel( + keys=[("project", ASCENDING), ("identifier", ASCENDING)], + name="project_idenfitier", + unique=True, + ) + ] class Contribution(ContributionBase): From 7e8ed872a18dcf05568eff0337d2e822c59f34e7 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 8 Jun 2026 13:44:49 -0700 Subject: [PATCH 309/591] clamp max_concurrent_transactions --- mpcontribs-api/src/mpcontribs_api/config.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/config.py b/mpcontribs-api/src/mpcontribs_api/config.py index c60545f086..428ce887ec 100644 --- a/mpcontribs-api/src/mpcontribs_api/config.py +++ b/mpcontribs-api/src/mpcontribs_api/config.py @@ -68,11 +68,14 @@ class MongoSettings(BaseModel): ) @model_validator(mode="after") - def _clamp_max_concurrent_transactions(self): + def _clamp_concurrency(self): if self.max_pool_size: - cap = max(1, self.max_pool_size // 2) - if self.max_concurrent_transactions > cap: - self.max_concurrent_transactions = cap + per_request_cap = max(1, self.max_pool_size // 2) + if self.max_concurrent_transactions > per_request_cap: + self.max_concurrent_transactions = per_request_cap + global_cap = max(1, self.max_pool_size - 10) + if self.max_global_concurrent_writes > global_cap: + self.max_global_concurrent_writes = global_cap return self From 10873515a73c5fb153c871c6ddfae7e575a98b3c Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 8 Jun 2026 13:45:16 -0700 Subject: [PATCH 310/591] Atomically upsert a contribution by identifiers rather than _id --- .../domains/contributions/repository.py | 31 +++ .../domains/contributions/service.py | 22 +- .../unit/domains/test_contribution_service.py | 198 ++++++++---------- 3 files changed, 125 insertions(+), 126 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py index 5134669a0c..f7ffdd88b7 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py @@ -109,6 +109,37 @@ async def update_contribution(self, doc: Contribution, update_data: dict[str, An """Apply a partial update to an existing Contribution document.""" await doc.update(Set(update_data)) + async def upsert_contribution_by_identifiers( + self, + identifiers: dict[str, str], + contribution: ContributionIn, + ) -> Contribution: + """Atomically upsert a Contribution by its identifying fields. + + Relies on the unique index over those fields so that concurrent requests targeting the + same key cannot both win the insert branch. Fields the caller did not set are not touched + (partial update). On insert a fresh Contribution document is written with ``is_public=False``. + + Args: + identifiers: the fields ContributionIn.identifiers() returns (project, identifier) + contribution: the input payload to upsert + + Returns: + Contribution: the document as it stands after the operation + """ + doc = self.document_model.from_input_model(contribution) + update_data = doc.model_dump(exclude={"id"}, exclude_none=True) + query = self.document_model.find_one( + self._scope, + self.document_model.project == identifiers["project"], + self.document_model.identifier == identifiers["identifier"], + ).upsert( + Set(update_data), + on_insert=doc, + response_type=UpdateResponse.NEW_DOCUMENT, + ) + return await query # pyright: ignore[reportGeneralTypeIssues] # beanie UpdateQuery is awaitable, but pyright doesn't see it + async def upsert_contribution_by_id(self, id: str, contribution: ContributionIn): """Upserts a single Contribution. diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py index d67c659ee8..01c59f34ac 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py @@ -239,16 +239,16 @@ async def _do_insert(self, contrib: ContributionIn, session: AsyncClientSession) return await self._contributions.insert_contribution(doc, session=session) async def upsert_contributions(self, contributions: list[ContributionIn]) -> list[Contribution]: - """Upsert contributions by their identifying fields, bounded by a concurrency cap. + """Upsert contributions by their identifying fields, bounded by concurrency caps. Components (structures, tables, attachments) must be managed via their respective services. If any contribution in the batch carries components, the entire request is rejected before any database writes occur. - Each item is looked up by ``ContributionIn.identifiers()``; an existing document is - partially updated (None fields are dropped), a missing one is inserted. Concurrent - upserts are capped by ``settings.mongo.max_concurrent_transactions`` so a large batch - cannot exhaust the connection pool. + Each item is upserted atomically by ``ContributionIn.identifiers()`` via a single + ``findOneAndUpdate(..., upsert=True)`` so two requests targeting the same key cannot + race past the find branch — the unique index over those fields is the tiebreaker. + Concurrent upserts within a batch are bounded by ``settings.mongo.max_concurrent_transactions`` Args: contributions: contributions to upsert; must not include nested components @@ -267,16 +267,6 @@ async def upsert_contributions(self, contributions: list[ContributionIn]) -> lis async def _bounded_upsert(contrib: ContributionIn) -> Contribution: async with sem: - return await self._upsert_one(contrib) + return await self._contributions.upsert_contribution_by_identifiers(contrib.identifiers(), contrib) return await asyncio.gather(*[_bounded_upsert(c) for c in contributions]) - - async def _upsert_one(self, contrib: ContributionIn) -> Contribution: - """Partial-update if a document with the same identifiers exists, otherwise insert.""" - doc = Contribution.from_input_model(contrib) - existing = await self._contributions.find_one_contribution(**contrib.identifiers()) - if existing is not None: - update_data = doc.model_dump(exclude={"id"}, exclude_none=True) - await self._contributions.update_contribution(existing, update_data) - return existing - return await self._contributions.insert_contribution(doc) diff --git a/mpcontribs-api/tests/unit/domains/test_contribution_service.py b/mpcontribs-api/tests/unit/domains/test_contribution_service.py index e23f5443fa..b1050e0727 100644 --- a/mpcontribs-api/tests/unit/domains/test_contribution_service.py +++ b/mpcontribs-api/tests/unit/domains/test_contribution_service.py @@ -7,6 +7,7 @@ - upsert_contributions: guard against components, insert vs update branching """ +import asyncio from unittest.mock import AsyncMock, MagicMock import polars as pl @@ -150,6 +151,7 @@ def _make_service( attachments=None, client=None, settings: MongoSettings | None = None, + write_slots: asyncio.Semaphore | None = None, ) -> tuple[ContributionService, AsyncMock, AsyncMock, AsyncMock, AsyncMock, MagicMock]: contrib_repo = contributions or AsyncMock() struct_repo = structures or AsyncMock() @@ -163,6 +165,7 @@ def _make_service( structures=struct_repo, tables=table_repo, attachments=attach_repo, + write_slots=write_slots or asyncio.Semaphore(50), settings=settings or _make_mongo_settings(), ) return svc, contrib_repo, struct_repo, table_repo, attach_repo, client @@ -481,161 +484,136 @@ async def test_raises_before_any_db_write(self): dirty = _contrib_in(structures=[_structure_in()]) with pytest.raises(ValidationError): await svc.upsert_contributions([dirty]) + contrib_repo.upsert_contribution_by_identifiers.assert_not_called() contrib_repo.find_one_contribution.assert_not_called() contrib_repo.insert_contribution.assert_not_called() contrib_repo.update_contribution.assert_not_called() # --------------------------------------------------------------------------- -# upsert_contributions — insert path (no existing doc) +# upsert_contributions — atomic dispatch # --------------------------------------------------------------------------- -class TestUpsertContributionsInsertPath: - async def test_insert_called_when_no_existing_doc(self): +class TestUpsertContributionsAtomic: + async def test_calls_atomic_repo_method_once_per_item(self): svc, contrib_repo, *_ = _make_service() - contrib_repo.find_one_contribution.return_value = None - inserted = MagicMock(spec=Contribution) - contrib_repo.insert_contribution.return_value = inserted + contrib_repo.upsert_contribution_by_identifiers.return_value = MagicMock(spec=Contribution) - result = await svc.upsert_contributions([_contrib_in()]) - - contrib_repo.insert_contribution.assert_called_once() - assert result[0] is inserted - - async def test_new_doc_is_public_false(self): - svc, contrib_repo, *_ = _make_service() - contrib_repo.find_one_contribution.return_value = None - - captured = [] - - async def _capture(doc): - captured.append(doc) - return doc - - contrib_repo.insert_contribution.side_effect = _capture - - await svc.upsert_contributions([_contrib_in()]) + contribs = [_contrib_in(identifier=f"mp-{i}") for i in range(3)] + results = await svc.upsert_contributions(contribs) - assert len(captured) == 1 - assert captured[0].is_public is False + assert len(results) == 3 + assert contrib_repo.upsert_contribution_by_identifiers.call_count == 3 + # The legacy read-then-write path must not be used + contrib_repo.find_one_contribution.assert_not_called() + contrib_repo.update_contribution.assert_not_called() + contrib_repo.insert_contribution.assert_not_called() - async def test_find_uses_project_and_identifier(self): + async def test_passes_identifiers_dict_and_input_to_repo(self): svc, contrib_repo, *_ = _make_service() - contrib_repo.find_one_contribution.return_value = None - contrib_repo.insert_contribution.return_value = MagicMock(spec=Contribution) + contrib_repo.upsert_contribution_by_identifiers.return_value = MagicMock(spec=Contribution) contrib = _contrib_in(project="my-proj", identifier="mp-99") await svc.upsert_contributions([contrib]) - contrib_repo.find_one_contribution.assert_called_once_with(project="my-proj", identifier="mp-99") + call = contrib_repo.upsert_contribution_by_identifiers.call_args + assert call.args[0] == {"project": "my-proj", "identifier": "mp-99"} + assert call.args[1] is contrib - async def test_update_not_called_on_insert_path(self): + async def test_returns_repo_results_in_input_order(self): svc, contrib_repo, *_ = _make_service() - contrib_repo.find_one_contribution.return_value = None - contrib_repo.insert_contribution.return_value = MagicMock(spec=Contribution) + docs = [MagicMock(spec=Contribution, name=f"doc-{i}") for i in range(3)] + returned = {} - await svc.upsert_contributions([_contrib_in()]) - - contrib_repo.update_contribution.assert_not_called() - - -# --------------------------------------------------------------------------- -# upsert_contributions — update path (existing doc found) -# --------------------------------------------------------------------------- - - -class TestUpsertContributionsUpdatePath: - async def test_update_called_when_existing_doc_found(self): - svc, contrib_repo, *_ = _make_service() - existing = MagicMock(spec=Contribution) - contrib_repo.find_one_contribution.return_value = existing - contrib_repo.update_contribution.return_value = None - - await svc.upsert_contributions([_contrib_in()]) - - contrib_repo.update_contribution.assert_called_once() + async def _upsert(identifiers, contrib): + doc = docs[int(contrib.identifier.split("-")[1])] + returned[contrib.identifier] = doc + return doc - async def test_returns_existing_doc_on_update(self): - svc, contrib_repo, *_ = _make_service() - existing = MagicMock(spec=Contribution) - contrib_repo.find_one_contribution.return_value = existing - contrib_repo.update_contribution.return_value = None + contrib_repo.upsert_contribution_by_identifiers.side_effect = _upsert - result = await svc.upsert_contributions([_contrib_in()]) + contribs = [_contrib_in(identifier=f"mp-{i}") for i in range(3)] + results = await svc.upsert_contributions(contribs) - assert result[0] is existing + assert results == [returned["mp-0"], returned["mp-1"], returned["mp-2"]] - async def test_insert_not_called_on_update_path(self): + async def test_empty_batch_returns_empty_list(self): svc, contrib_repo, *_ = _make_service() - existing = MagicMock(spec=Contribution) - contrib_repo.find_one_contribution.return_value = existing - contrib_repo.update_contribution.return_value = None - - await svc.upsert_contributions([_contrib_in()]) - - contrib_repo.insert_contribution.assert_not_called() + results = await svc.upsert_contributions([]) + assert results == [] + contrib_repo.upsert_contribution_by_identifiers.assert_not_called() - async def test_update_data_excludes_id(self): + async def test_same_key_concurrent_upserts_both_go_through_atomic_call(self): + """Race-safety regression: two items with the same (project, identifier) in one batch + must both reach the atomic repo method. The repo (via the unique index) is the + tiebreaker — the service must not pre-deduplicate or otherwise swallow one. + """ svc, contrib_repo, *_ = _make_service() - existing = MagicMock(spec=Contribution) - contrib_repo.find_one_contribution.return_value = existing - contrib_repo.update_contribution.return_value = None + contrib_repo.upsert_contribution_by_identifiers.return_value = MagicMock(spec=Contribution) - await svc.upsert_contributions([_contrib_in(formula="SiO2")]) + contribs = [ + _contrib_in(project="p", identifier="same"), + _contrib_in(project="p", identifier="same"), + ] + results = await svc.upsert_contributions(contribs) - update_data = contrib_repo.update_contribution.call_args[0][1] - assert "id" not in update_data + assert len(results) == 2 + assert contrib_repo.upsert_contribution_by_identifiers.call_count == 2 - async def test_update_data_excludes_none_fields(self): - svc, contrib_repo, *_ = _make_service() - existing = MagicMock(spec=Contribution) - contrib_repo.find_one_contribution.return_value = existing - contrib_repo.update_contribution.return_value = None - await svc.upsert_contributions([_contrib_in(formula="SiO2")]) +# --------------------------------------------------------------------------- +# Process-wide write_slots semaphore is honored +# --------------------------------------------------------------------------- - update_data = contrib_repo.update_contribution.call_args[0][1] - assert all(v is not None for v in update_data.values()) +class TestProcessWideWriteSlots: + async def test_upsert_acquires_global_write_slot(self): + write_slots = asyncio.Semaphore(1) + svc, contrib_repo, *_ = _make_service(write_slots=write_slots) -# --------------------------------------------------------------------------- -# upsert_contributions — concurrent batch behavior -# --------------------------------------------------------------------------- + in_flight = 0 + peak = 0 + async def _upsert(identifiers, contrib): + nonlocal in_flight, peak + in_flight += 1 + peak = max(peak, in_flight) + await asyncio.sleep(0) # let other coroutines try to enter + in_flight -= 1 + return MagicMock(spec=Contribution) -class TestUpsertContributionsBatch: - async def test_all_contribs_processed(self): - svc, contrib_repo, *_ = _make_service() - contrib_repo.find_one_contribution.return_value = None - contrib_repo.insert_contribution.return_value = MagicMock(spec=Contribution) + contrib_repo.upsert_contribution_by_identifiers.side_effect = _upsert contribs = [_contrib_in(identifier=f"mp-{i}") for i in range(5)] - results = await svc.upsert_contributions(contribs) + await svc.upsert_contributions(contribs) - assert len(results) == 5 - assert contrib_repo.insert_contribution.call_count == 5 + assert peak == 1 # global semaphore of 1 must serialize all 5 - async def test_mixed_insert_and_update_batch(self): - svc, contrib_repo, *_ = _make_service() - existing = MagicMock(spec=Contribution) + async def test_insert_with_components_acquires_global_write_slot(self): + write_slots = asyncio.Semaphore(1) + svc, contrib_repo, struct_repo, table_repo, attach_repo, _ = _make_service(write_slots=write_slots) - async def _find(project, identifier): - return existing if identifier == "mp-0" else None + struct_repo.insert_structures.return_value = [_fake_structure()] + table_repo.insert_tables.return_value = [] + attach_repo.insert_attachments.return_value = [] - contrib_repo.find_one_contribution.side_effect = _find - contrib_repo.update_contribution.return_value = None - contrib_repo.insert_contribution.return_value = MagicMock(spec=Contribution) + in_flight = 0 + peak = 0 - contribs = [_contrib_in(identifier=f"mp-{i}") for i in range(3)] - await svc.upsert_contributions(contribs) + async def _insert(doc, session=None): + nonlocal in_flight, peak + in_flight += 1 + peak = max(peak, in_flight) + await asyncio.sleep(0) + in_flight -= 1 + return doc - assert contrib_repo.update_contribution.call_count == 1 - assert contrib_repo.insert_contribution.call_count == 2 + contrib_repo.insert_contribution.side_effect = _insert - async def test_empty_batch_returns_empty_list(self): - svc, *_ = _make_service() - results = await svc.upsert_contributions([]) - assert results == [] + contribs = [_contrib_in(identifier=f"c{i}", structures=[_structure_in()]) for i in range(4)] + await svc.insert_contributions(contribs) + + assert peak == 1 From 6d981d24c1f559c29d0a34ac32a5a3285ede5f5c Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 8 Jun 2026 17:03:54 -0700 Subject: [PATCH 311/591] Contributions delete children on bulk delete --- .../mpcontribs_api/domains/_shared/bulk.py | 5 ++ .../domains/_shared/repository.py | 6 +- .../domains/contributions/repository.py | 15 +++-- .../domains/contributions/service.py | 57 +++++++++++++++++-- 4 files changed, 71 insertions(+), 12 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/bulk.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/bulk.py index c76784e241..718e2c580f 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/bulk.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/bulk.py @@ -27,6 +27,11 @@ class BulkWriteSummary[T](BaseModel): failed: list[BulkFailure] +class BulkDeleteSummary[T](BaseModel): + num_deleted: int + num_children_deleted: int + + def bulk_failure_from_exception(index: int, identifier: dict[str, Any] | None, exc: BaseException) -> BulkFailure: """Translate any exception into a BulkFailure entry. diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py index 3610b15a76..e87b395fef 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py @@ -66,9 +66,9 @@ def _not_found(self, id: str) -> str: async def get_many( self, - pagination: CursorParams, filter: TFilter, - fields: frozenset[str] | None, + fields: frozenset[str] | None = None, + pagination: CursorParams | None = None, ) -> Page[TOut]: """Return a scoped, filtered, cursor-paginated page of projected documents. @@ -77,6 +77,8 @@ async def get_many( filter (TFilter): the fastapi-filter query to apply on top of the user scope fields (frozenset[str] | None): fields to project; if None the full document is returned """ + pagination = pagination or CursorParams() + projection = self.out_model.projection(fields) query = filter.filter(self.document_model.find(self._scope)) if pagination.cursor is not None: diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py index f7ffdd88b7..7654c4997f 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py @@ -3,6 +3,7 @@ from beanie import UpdateResponse from beanie.operators import Set from pymongo.asynchronous.client_session import AsyncClientSession +from pymongo.results import DeleteResult from mpcontribs_api.auth import User from mpcontribs_api.domains._shared.repository import MongoDbRepository @@ -47,9 +48,9 @@ def _build_scope(user: User) -> dict[str, Any]: async def get_contributions( self, - pagination: CursorParams, filter: ContributionFilter, - fields: frozenset[str] | None, + pagination: CursorParams | None = None, + fields: frozenset[str] | None = None, ): """Query the Contribution collection, scoped to the current user. See ``get_many``.""" return await self.get_many(pagination=pagination, filter=filter, fields=fields) @@ -66,14 +67,16 @@ async def delete_contribution_by_id(self, id: str) -> None: """Delete a contribution by id, scoped to the current user. See ``delete_by_id``.""" await self.delete_by_id(self._convert_object_id(id)) - async def delete_contributions(self, filter: ContributionFilter): - """Bulk deletion of Contributions described by the filter + async def delete_contributions( + self, + filter: ContributionFilter, + ) -> DeleteResult | None: + """Bulk deletion of Contributions described by the filter. Args: filter (ContribtionFilter): the filter to use to identify contributions to delete """ - docs = filter.filter(self.document_model.find(self._scope)) - await docs.delete() + return await filter.filter(self.document_model.find(self._scope)).delete_many() async def insert_many_contributions( self, diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py index 01c59f34ac..f2ef09de0b 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py @@ -3,22 +3,28 @@ from typing import cast import structlog -from beanie import Link +from beanie import Link, PydanticObjectId from pymongo import AsyncMongoClient from pymongo.asynchronous.client_session import AsyncClientSession from pymongo.errors import BulkWriteError from mpcontribs_api.config import MongoSettings, get_settings -from mpcontribs_api.domains._shared.bulk import BulkFailure, BulkWriteSummary, bulk_failure_from_exception +from mpcontribs_api.domains._shared.bulk import ( + BulkDeleteSummary, + BulkFailure, + BulkWriteSummary, + bulk_failure_from_exception, +) from mpcontribs_api.domains.attachments.models import Attachment from mpcontribs_api.domains.attachments.repository import MongoDbAttachmentRepository -from mpcontribs_api.domains.contributions.models import Contribution, ContributionIn +from mpcontribs_api.domains.contributions.models import Contribution, ContributionFilter, ContributionIn from mpcontribs_api.domains.contributions.repository import MongoDbContributionRepository from mpcontribs_api.domains.structures.models import Structure from mpcontribs_api.domains.structures.repository import MongoDbStructureRepository from mpcontribs_api.domains.tables.models import Table from mpcontribs_api.domains.tables.repository import MongoDbTableRepository from mpcontribs_api.exceptions import AppError, ValidationError +from mpcontribs_api.pagination import CursorParams logger = structlog.get_logger(__name__) @@ -35,6 +41,11 @@ def __init__( ): self._client = client self._contributions = contributions + self._children = { + "structures": structures, + "attachments": attachments, + "tables": tables, + } self._structures = structures self._attachments = attachments self._tables = tables @@ -44,7 +55,7 @@ async def insert_contributions( self, contributions: list[ContributionIn], ) -> BulkWriteSummary[Contribution]: - """Bulk insert contributions, atomically per top-level contribution. + """Atomic bulk insert contributions, atomically per top-level contribution. Contributions carrying no components are inserted in one ``insert_many`` (no transaction); contributions with components run inside their own MongoDB transaction so the contribution @@ -270,3 +281,41 @@ async def _bounded_upsert(contrib: ContributionIn) -> Contribution: return await self._contributions.upsert_contribution_by_identifiers(contrib.identifiers(), contrib) return await asyncio.gather(*[_bounded_upsert(c) for c in contributions]) + + async def delete_contributions(self, filter: ContributionFilter) -> BulkDeleteSummary: + """Delete a contribution and all of its child components + + Doesn't guarantee complete atomicity, but prevents orphaned children by deleting components first. + + Args: + filter (ContributionFilter): the Contribution-specific query to apply on top of the user scope + + + Returns: + BulkDeleteSummary: a summary of how many documents and child documents were deleted + """ + num_deleted_components = 0 + num_deleted_contributions = 0 + # Loop through cursor rather than materialize arbitrary number of Contributions + while True: + page = await self._contributions.get_contributions( + pagination=CursorParams(cursor=None, limit=100), + filter=filter, + ) + # For each component type, gather ObjectIds then bulk delete them + # - components first so no children are left orphaned + for field, repo in self._children.items(): + ids = [link.ref.id for c in page.items for link in getattr(c, field)] + if ids: + deleted_components = await repo.delete_by_ids(ids) + num_deleted_components += deleted_components.deleted_count if deleted_components else 0 + + # Delete Contributions in this batch by ID + # need to make a new filter so we don't eagerly delete all contributions before their components are deleted + deleted_contribs = await self._contributions.delete_contributions( + ContributionFilter(id__in=[cast(PydanticObjectId, c.id) for c in page.items]) + ) + num_deleted_contributions += deleted_contribs.deleted_count if deleted_contribs else 0 + if not page.items: + break + return BulkDeleteSummary(num_deleted=num_deleted_contributions, num_children_deleted=num_deleted_components) From 17346208935c6df5b3afa49852cb254e8fb3320b Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 8 Jun 2026 17:07:54 -0700 Subject: [PATCH 312/591] Deleting contribution by id deletes all children --- .../src/mpcontribs_api/domains/contributions/models.py | 6 +++++- .../src/mpcontribs_api/domains/contributions/router.py | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py index f0586dabff..0d3b0cb27a 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py @@ -13,7 +13,7 @@ ) from fastapi_filter import FilterDepends, with_prefix from fastapi_filter.contrib.beanie import Filter -from pydantic import Field +from pydantic import Field, field_validator from pymongo import ASCENDING, IndexModel from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut @@ -149,3 +149,7 @@ class ContributionFilter(Filter): class Constants(Filter.Constants): model = Contribution + + @field_validator("id", mode="before") + def convert_str_to_OId(self, v: str): + return PydanticObjectId(v) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py index b64a6bcf5c..52e8e3bb4c 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py @@ -66,10 +66,10 @@ async def download_contributions( @router.delete("{id}") async def delete_contribtion_by_id( - repo: ContributionDep, + service: ContributionServiceDep, id: str, ): - return await repo.delete_contribution_by_id(id=id) + return await service.delete_contributions(ContributionFilter.model_validate({"id": id})) @router.get("{id}") From 603a315a8f61ec053ed23ac59f74aba4dd8a2846 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Tue, 9 Jun 2026 10:13:16 -0700 Subject: [PATCH 313/591] Further parameterized the AsyncMongoClient --- mpcontribs-api/src/mpcontribs_api/app.py | 9 ++++++- mpcontribs-api/src/mpcontribs_api/config.py | 24 ++++++++++++++++++- .../domains/contributions/router.py | 1 + 3 files changed, 32 insertions(+), 2 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/app.py b/mpcontribs-api/src/mpcontribs_api/app.py index 8431f9ba6d..05e2645401 100644 --- a/mpcontribs-api/src/mpcontribs_api/app.py +++ b/mpcontribs-api/src/mpcontribs_api/app.py @@ -30,9 +30,16 @@ async def lifespan(app: FastAPI) -> AsyncGenerator[None]: # --- startup --- client = AsyncMongoClient( settings.mongo.uri.get_secret_value(), + appname=settings.mongo.app_name, maxPoolSize=settings.mongo.max_pool_size, minPoolSize=settings.mongo.min_pool_size, + maxIdleTimeMS=settings.mongo.max_idle_time_ms, + timeoutMS=settings.mongo.timeout_ms, serverSelectionTimeoutMS=settings.mongo.server_selection_timeout_ms, + retryWrite=True, + retryReads=True, + compressors=settings.mongo.compressors, + readPreference=settings.mongo.read_preference, uuidRepresentation="standard", ) # Fail fast if the DB is unreachable @@ -56,7 +63,7 @@ async def lifespan(app: FastAPI) -> AsyncGenerator[None]: try: yield finally: - # --- shutdown --- + # shutdown await client.close() logger.info("mongo client closed") diff --git a/mpcontribs-api/src/mpcontribs_api/config.py b/mpcontribs-api/src/mpcontribs_api/config.py index 428ce887ec..3055103fd7 100644 --- a/mpcontribs-api/src/mpcontribs_api/config.py +++ b/mpcontribs-api/src/mpcontribs_api/config.py @@ -22,6 +22,11 @@ class MongoSettings(BaseModel): uri: SecretStr = Field(description="The full uri from MongoDB (username and password included)") db_name: str + app_name: str = Field( + default="MPContribs_FastAPI_Server", + description="The name of the application that created this AsyncMongoClient instance. The server will log this " + "value upon establishing each connection. It is also recorded in the slow query log and profile collections.", + ) max_pool_size: int = Field( default=100, description="Maximum number of allowed concurrent connection to each server. Can be '0' or 'None', both of " @@ -36,7 +41,7 @@ class MongoSettings(BaseModel): description="Specifies how UTC datetimes should be decoded within BSON", ) server_selection_timeout_ms: int = Field( - default=30000, + default=30_000, description="Controls how long (in milliseconds) the driver will wait to find an available, appropriate server " "to carry out a database operation;" "while it is waiting, multiple server monitoring operations may be carried out", @@ -48,6 +53,18 @@ class MongoSettings(BaseModel): "consumed by auth.", ) + compressors: str = Field( + default="snappy,zstd,zlib", + description="Comma separated list of compressors for wire protocol compression. Compression support must also " + "be enabled on the server", + ) + + read_preference: str = Field( + default="primary", + description="The replica set read preference for this client. One of primary, primaryPreferred, secondary, " + "secondaryPreferred, or nearest", + ) + # TODO: Tune default max_concurrent_transactions: int = Field( default=16, @@ -66,6 +83,11 @@ class MongoSettings(BaseModel): default=100, description="Batch size used by component repositories when chunking insert_many calls inside a transaction.", ) + max_idle_time_ms: int = Field( + default=30_000, + description="The maximum allowed time a single connection is allowed to sit idle", + ) + timeout_ms: int = Field(default=60_000, description="The end-to-end allowed time for an operation") @model_validator(mode="after") def _clamp_concurrency(self): diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py index 52e8e3bb4c..348bfa73c8 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py @@ -37,6 +37,7 @@ async def delete_contributions( return await repo.delete_contributions(filter=filter) +# TODO: Might want to take contributions in from request body and run model_validate_json on it (much faster) @router.post("", response_model=BulkWriteSummary[Contribution]) async def insert_contributions( service: ContributionServiceDep, From c11acf76b4ea7bfcf9fd18a28d7e5514fcada594 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Tue, 9 Jun 2026 10:15:05 -0700 Subject: [PATCH 314/591] Fixed spacing issues --- mpcontribs-api/src/mpcontribs_api/_openapi.py | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/_openapi.py b/mpcontribs-api/src/mpcontribs_api/_openapi.py index 4c3c99b5c6..49b3f813ca 100644 --- a/mpcontribs-api/src/mpcontribs_api/_openapi.py +++ b/mpcontribs-api/src/mpcontribs_api/_openapi.py @@ -1,45 +1,45 @@ openapi_tags = [ { "name": "projects", - "description": "contain provenance information about contributed datasets. Deleting projects will also delete" - "all contributions including tables, structures, attachments, notebooks and cards for the project. Only users" - "who have been added to a project can update its contents. While unpublished, only users on the project can" - "retrieve its data or view it on the Portal. Making a project public does not automatically publish all its" - "contributions, tables, attachments, and structures. These are separately set to public individually or in" + "description": "contain provenance information about contributed datasets. Deleting projects will also delete " + "all contributions including tables, structures, attachments, notebooks and cards for the project. Only users " + "who have been added to a project can update its contents. While unpublished, only users on the project can " + "retrieve its data or view it on the Portal. Making a project public does not automatically publish all its " + "contributions, tables, attachments, and structures. These are separately set to public individually or in " "bulk.", }, { "name": "contributions", - "description": "contain simple hierarchical data which will show up as cards on the MP details page for MP" - "material(s). Tables (rows and columns), structures, and attachments can be added to a contribution." - "Each contribution uses `mp-id` or composition as identifier to associate its data with the according entries" - "on MP. Only admins or users on the project can create, update or delete contributions, and while unpublished," - "retrieve its data or view it on the Portal. Contribution components (tables, structures, and attachments) are" + "description": "contain simple hierarchical data which will show up as cards on the MP details page for MP " + "material(s). Tables (rows and columns), structures, and attachments can be added to a contribution. " + "Each contribution uses `mp-id` or composition as identifier to associate its data with the according entries " + "on MP. Only admins or users on the project can create, update or delete contributions, and while unpublished, " + "retrieve its data or view it on the Portal. Contribution components (tables, structures, and attachments) are " "deleted along with a contribution.", }, # TODO: Check that this is the right link { "name": "structures", - "description": "are [pymatgen structures](https://pymatgen.org/pymatgen.electronic_structure.html) which can be" - "added to a contribution.", + "description": "are [pymatgen structures](https://pymatgen.org/pymatgen.electronic_structure.html) which can " + " be added to a contribution.", }, { "name": "tables", - "description": "are simple spreadsheet-type tables with columns and rows saved as" - "[Polars DataFrames](https://docs.pola.rs/api/python/stable/reference/dataframe/index.html) which can be added" + "description": "are simple spreadsheet-type tables with columns and rows saved as " + "[Polars DataFrames](https://docs.pola.rs/api/python/stable/reference/dataframe/index.html) which can be added " "to a contribution.", }, { "name": "attachments", - "description": "are files saved as objects in AWS S3 and not accessible for querying (only retrieval) which can" - "be added to a contribution.", + "description": "are files saved as objects in AWS S3 and not accessible for querying (only retrieval) which " + "can be added to a contribution.", }, { "name": "notebooks", "description": "are" - "[Jupyter notebook](https://jupyter-notebook.readthedocs.io/en/stable/notebook.html#notebook-documents)" - "documents generated and saved when a contribution is saved. They form the basis for Contribution Details Pages" - "on the Portal.", + "[Jupyter notebook](https://jupyter-notebook.readthedocs.io/en/stable/notebook.html#notebook-documents) " + "documents generated and saved when a contribution is saved. They form the basis for Contribution Details " + "Pages on the Portal.", }, ] From ebcaa1de0f24d5acb85cf9030f61c350cc18a535 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Tue, 9 Jun 2026 13:59:07 -0700 Subject: [PATCH 315/591] Added table routes --- .../domains/tables/dependencies.py | 13 +++++ .../mpcontribs_api/domains/tables/models.py | 26 +++++++-- .../domains/tables/repository.py | 34 ++++++++++-- .../mpcontribs_api/domains/tables/router.py | 53 +++++++++++++++++++ 4 files changed, 118 insertions(+), 8 deletions(-) create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/tables/dependencies.py create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/tables/router.py diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/dependencies.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/dependencies.py new file mode 100644 index 0000000000..84e6a46ab7 --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/dependencies.py @@ -0,0 +1,13 @@ +from typing import Annotated + +from fastapi import Depends + +from mpcontribs_api.dependencies import UserDep +from mpcontribs_api.domains.tables.repository import MongoDbTableRepository + + +def get_scoped_tables(user: UserDep) -> MongoDbTableRepository: + return MongoDbTableRepository(user) + + +TableDep = Annotated[MongoDbTableRepository, Depends(get_scoped_tables)] diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py index a6a61fdc9d..f0234f833a 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py @@ -1,3 +1,5 @@ +from typing import Any + import polars as pl from beanie import PydanticObjectId from fastapi_filter.contrib.beanie import Filter @@ -11,8 +13,8 @@ ) from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut +from mpcontribs_api.domains._shared.types import MD5Hash from mpcontribs_api.projection import SparseFieldsModel -from mpcontribs_api.types import MD5Hash class Labels(BaseModel): @@ -125,7 +127,7 @@ class Constants(Filter.Constants): model = Table -class TableOut(BaseModel): +class TableSummaryOut(BaseModel): """Metadata-only table as embedded in contribution responses (no data).""" attrs: Attributes @@ -134,9 +136,27 @@ class TableOut(BaseModel): total_data_pages: int = 1 -class TableDocumentOut(DocumentOut[PydanticObjectId]): +class TableOut(DocumentOut[PydanticObjectId]): name: str | None = None md5: MD5Hash | None = None + attrs: Attributes | None = None + columns: list[Any] | None = None + total_data_rows: int | None = None + total_data_pages: int | None = None + index: list[Any] | None = None + data: pl.DataFrame | None = None + + @staticmethod + def default_fields() -> list[str]: + return [ + "id", + "name", + "md5", + "attrs", + "columns", + "total_data_rows", + "total_data_pages", + ] class TablePatch(SparseFieldsModel): diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py index a0adc06a1e..1887eeb2e5 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py @@ -5,18 +5,20 @@ from mpcontribs_api.auth import User from mpcontribs_api.config import get_settings from mpcontribs_api.domains._shared.repository import MongoDbRepository +from mpcontribs_api.domains._shared.types import DownloadFormat from mpcontribs_api.domains.tables.models import ( Table, - TableDocumentOut, TableFilter, TableIn, + TableOut, TablePatch, ) +from mpcontribs_api.pagination import CursorParams, Page -class MongoDbTableRepository(MongoDbRepository[Table, TableIn, TableDocumentOut, TableFilter, TablePatch]): +class MongoDbTableRepository(MongoDbRepository[Table, TableIn, TableOut, TableFilter, TablePatch]): document_model = Table - out_model = TableDocumentOut + out_model = TableOut @staticmethod def _build_scope(user: User) -> dict[str, Any]: @@ -35,8 +37,30 @@ async def insert_tables( """ if not tables: return [] - docs = [Table.model_validate(t.model_dump()) for t in tables] + docs = [self.document_model.model_validate(t.model_dump()) for t in tables] chunk_size = get_settings().mongo.component_insert_chunk_size for start in range(0, len(docs), chunk_size): - await Table.insert_many(docs[start : start + chunk_size], ordered=False, session=session) + await self.document_model.insert_many(docs[start : start + chunk_size], ordered=False, session=session) return docs + + async def get_tables( + self, + filter: TableFilter, + pagination: CursorParams, + fields: frozenset[str] | None, + ) -> Page[TableOut]: + """Query the Table collection, scoped to the current user. See ``get_many``.""" + return await self.get_many(pagination=pagination, filter=filter, fields=fields) + + async def get_table_by_id(self, id: str, fields: frozenset[str] | None): + """Find a single table by id, scoped to the current user. See ``get_by_id``.""" + return await self.get_by_id(id, fields) + + async def download_tables( + self, + format: DownloadFormat, + short_mime: str, + filter: TableFilter, + fields: frozenset[str] | None, + ): + pass diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py new file mode 100644 index 0000000000..78e5f51a10 --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py @@ -0,0 +1,53 @@ +from typing import Annotated + +from fastapi import APIRouter, Depends +from fastapi_filter import FilterDepends + +from mpcontribs_api.domains._shared.bulk import BulkWriteSummary +from mpcontribs_api.domains._shared.types import DownloadFormat, FieldSelector +from mpcontribs_api.domains.tables.dependencies import TableDep +from mpcontribs_api.domains.tables.models import Table, TableFilter, TableIn, TableOut +from mpcontribs_api.pagination import CursorParams, Page + +router = APIRouter(tags=["components", "tables"]) + + +@router.get("", response_model=Page[TableOut]) +async def get_tables( + repo: TableDep, + pagination: Annotated[CursorParams, Depends()], + filter: TableFilter = FilterDepends(TableFilter), + fields: FieldSelector = TableOut.default_fields(), +): + selected = TableOut.parse_fields(fields) + return await repo.get_tables(filter=filter, fields=selected, pagination=pagination) + + +@router.get("{pk}", response_model=TableOut) +async def get_table( + repo: TableDep, + pk: str, + fields: FieldSelector = TableOut.default_fields(), +): + selected = TableOut.parse_fields(fields) + return await repo.get_table_by_id(id=pk, fields=selected) + + +@router.get("/download/{short_mime}") +async def download_table( + repo: TableDep, + format: DownloadFormat, + short_mime: str = "gz", + filter: TableFilter = FilterDepends(TableFilter), + fields: FieldSelector = TableOut.default_fields(), +): + selected = TableOut.parse_fields(fields) + return await repo.download_tables(format=format, short_mime=short_mime, filter=filter, fields=selected) + + +@router.post("", response_model=BulkWriteSummary[Table]) +async def insert_tables( + repo: TableDep, + tables: list[TableIn], +): + return await repo.insert_tables(tables=tables) From 4bd74f1283ea20dbb6f08ca159839981e888b595 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Tue, 9 Jun 2026 13:59:26 -0700 Subject: [PATCH 316/591] Moved types to shared domains --- .../src/mpcontribs_api/{ => domains/_shared}/types.py | 8 +++++++- .../src/mpcontribs_api/domains/attachments/models.py | 2 +- .../src/mpcontribs_api/domains/contributions/models.py | 2 +- .../src/mpcontribs_api/domains/contributions/router.py | 2 +- .../src/mpcontribs_api/domains/projects/models.py | 2 +- .../src/mpcontribs_api/domains/projects/router.py | 2 +- .../src/mpcontribs_api/domains/structures/models.py | 2 +- mpcontribs-api/tests/unit/test_types.py | 2 +- 8 files changed, 14 insertions(+), 8 deletions(-) rename mpcontribs-api/src/mpcontribs_api/{ => domains/_shared}/types.py (92%) diff --git a/mpcontribs-api/src/mpcontribs_api/types.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py similarity index 92% rename from mpcontribs-api/src/mpcontribs_api/types.py rename to mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py index 0507663843..60aee2e4bc 100644 --- a/mpcontribs-api/src/mpcontribs_api/types.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py @@ -1,5 +1,6 @@ import re -from typing import Annotated +from enum import StrEnum +from typing import Annotated, Literal from fastapi import Query from pydantic import BeforeValidator, Field @@ -56,3 +57,8 @@ def _mime_like(v: str) -> str: MimeFormat = Annotated[str, BeforeValidator(_mime_like)] + + +class DownloadFormat(StrEnum): + JSON = "json" + CSV = "csv" diff --git a/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py b/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py index a71e5d8996..e32c8af0d9 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py @@ -2,8 +2,8 @@ from fastapi_filter.contrib.beanie import Filter from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut +from mpcontribs_api.domains._shared.types import FileLike, MD5Hash, MimeFormat from mpcontribs_api.projection import SparseFieldsModel -from mpcontribs_api.types import FileLike, MD5Hash, MimeFormat class Attachment(BaseDocumentWithInput[PydanticObjectId]): diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py index 0d3b0cb27a..f612b0eb21 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py @@ -17,11 +17,11 @@ from pymongo import ASCENDING, IndexModel from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut +from mpcontribs_api.domains._shared.types import ShortStr from mpcontribs_api.domains.attachments.models import Attachment, AttachmentFilter, AttachmentIn from mpcontribs_api.domains.structures.models import Structure, StructureFilter, StructureIn from mpcontribs_api.domains.tables.models import Table, TableFilter, TableIn from mpcontribs_api.projection import SparseFieldsModel -from mpcontribs_api.types import ShortStr class ContributionBase(BaseDocumentWithInput[PydanticObjectId]): diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py index 348bfa73c8..ce2050e107 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py @@ -4,6 +4,7 @@ from fastapi_filter import FilterDepends from mpcontribs_api.domains._shared.bulk import BulkWriteSummary +from mpcontribs_api.domains._shared.types import FieldSelector from mpcontribs_api.domains.contributions.dependencies import ContributionDep, ContributionServiceDep from mpcontribs_api.domains.contributions.models import ( Contribution, @@ -13,7 +14,6 @@ ContributionPatch, ) from mpcontribs_api.pagination import CursorParams -from mpcontribs_api.types import FieldSelector router = APIRouter(tags=["contributions"]) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py index 15a4758879..84082b58cf 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py @@ -7,7 +7,7 @@ from mpcontribs_api import pagination from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut -from mpcontribs_api.types import PrefixedEmail, ShortStr +from mpcontribs_api.domains._shared.types import PrefixedEmail, ShortStr class Column(BaseModel): diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py index 9e16ff6568..a89a67ba28 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py @@ -4,6 +4,7 @@ from fastapi_filter import FilterDepends from starlette.status import HTTP_204_NO_CONTENT +from mpcontribs_api.domains._shared.types import FieldSelector from mpcontribs_api.domains.projects.dependencies import ProjectDep from mpcontribs_api.domains.projects.models import ( ProjectFilter, @@ -12,7 +13,6 @@ ProjectPatch, ) from mpcontribs_api.pagination import CursorParams -from mpcontribs_api.types import FieldSelector router = APIRouter(tags=["projects"]) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py index e770dc87f2..7dfce210ad 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py @@ -5,8 +5,8 @@ from pymatgen.core import Element from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut +from mpcontribs_api.domains._shared.types import MD5Hash from mpcontribs_api.projection import SparseFieldsModel -from mpcontribs_api.types import MD5Hash class SiteProperties(BaseModel): diff --git a/mpcontribs-api/tests/unit/test_types.py b/mpcontribs-api/tests/unit/test_types.py index 64b0102cdd..46c43d8bf8 100644 --- a/mpcontribs-api/tests/unit/test_types.py +++ b/mpcontribs-api/tests/unit/test_types.py @@ -3,7 +3,7 @@ from pydantic import ValidationError as PydanticValidationError from mpcontribs_api.exceptions import ValidationError as AppValidationError -from mpcontribs_api.types import PrefixedEmail, ShortStr, _validate_prefixed_email +from mpcontribs_api.domains._shared.types import PrefixedEmail, ShortStr, _validate_prefixed_email class ShortStrModel(BaseModel): From 5a2798500487f9e4cc659b2e3eaed8b226faeb96 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Tue, 9 Jun 2026 13:59:41 -0700 Subject: [PATCH 317/591] Removed unused import --- mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py index 60aee2e4bc..64931df487 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py @@ -1,6 +1,6 @@ import re from enum import StrEnum -from typing import Annotated, Literal +from typing import Annotated from fastapi import Query from pydantic import BeforeValidator, Field From b1677cea6ab2a759362c2215f7f7f185113799a3 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 10 Jun 2026 12:08:06 -0700 Subject: [PATCH 318/591] Added session to delete_by_id and made a DeleteResponse model --- .../src/mpcontribs_api/domains/_shared/models.py | 6 +++++- .../mpcontribs_api/domains/_shared/repository.py | 13 +++++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py index 3f82b2455e..48c3bfeec5 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py @@ -1,7 +1,7 @@ from typing import Annotated, Any, Self from beanie import DocumentWithSoftDelete, PydanticObjectId -from pydantic import Field +from pydantic import BaseModel, Field from mpcontribs_api import pagination from mpcontribs_api.projection import SparseFieldsModel @@ -42,3 +42,7 @@ class DocumentOut[TId](SparseFieldsModel): """ id: Annotated[TId | None, Field(alias="_id", serialization_alias="id")] = None + + +class DeleteResponse(BaseModel): + num_deleted: int diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py index e87b395fef..d7222db7f9 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py @@ -6,9 +6,10 @@ from bson.errors import InvalidId from fastapi_filter.contrib.beanie import Filter from pydantic import BaseModel +from pymongo.asynchronous.client_session import AsyncClientSession from mpcontribs_api.auth import User -from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut +from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DeleteResponse, DocumentOut from mpcontribs_api.exceptions import ConflictError, NotFoundError, ValidationError from mpcontribs_api.pagination import CursorParams, Page, encode_cursor @@ -89,7 +90,7 @@ async def get_many( next_cursor = encode_cursor(str(items[-1].id)) if has_more and items else None return Page(items=items, next_cursor=next_cursor) - async def get_by_id(self, id: Any, fields: frozenset[str] | None): + async def get_by_id(self, id: Any, fields: frozenset[str] | None) -> TDoc | TOut | None: """Return a single scoped document by id, projected to the requested fields. Args: @@ -115,7 +116,7 @@ async def insert_one(self, in_resource: TIn) -> TDoc: await document.insert() return document - async def delete_by_id(self, id: Any) -> None: + async def delete_by_id(self, id: Any, session: AsyncClientSession | None = None) -> DeleteResponse: """Delete a single scoped document by id. Scoping ensures callers cannot delete documents they are not permitted to see. @@ -123,7 +124,11 @@ async def delete_by_id(self, id: Any) -> None: Args: id (str): the id of the document to delete """ - await self.document_model.find_one(self._scope, self.document_model.id == id).delete() + doc = await self.document_model.find_one(self._scope, self.document_model.id == id, session=session) + if not doc: + raise NotFoundError("Document with id not found", id=id) + await doc.delete(session=session) + return DeleteResponse(num_deleted=1) async def patch(self, id: Any, update: TPatch) -> TDoc: """Partially update a single scoped document by id. From 9b2987d9381484c07fe71ee40e73bafdf0142feb Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 10 Jun 2026 12:08:30 -0700 Subject: [PATCH 319/591] Fleshed out basic CRUD operations for Tables --- .../domains/tables/repository.py | 61 ++++++++++++++++++- .../mpcontribs_api/domains/tables/router.py | 25 ++++++++ 2 files changed, 85 insertions(+), 1 deletion(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py index 1887eeb2e5..4a9f7952b9 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py @@ -4,6 +4,7 @@ from mpcontribs_api.auth import User from mpcontribs_api.config import get_settings +from mpcontribs_api.domains._shared.models import DeleteResponse from mpcontribs_api.domains._shared.repository import MongoDbRepository from mpcontribs_api.domains._shared.types import DownloadFormat from mpcontribs_api.domains.tables.models import ( @@ -13,6 +14,7 @@ TableOut, TablePatch, ) +from mpcontribs_api.exceptions import AppError from mpcontribs_api.pagination import CursorParams, Page @@ -24,6 +26,7 @@ class MongoDbTableRepository(MongoDbRepository[Table, TableIn, TableOut, TableFi def _build_scope(user: User) -> dict[str, Any]: return {} + # TODO: Returned docs don't have IDs assigned to them async def insert_tables( self, tables: list[TableIn], @@ -43,6 +46,24 @@ async def insert_tables( await self.document_model.insert_many(docs[start : start + chunk_size], ordered=False, session=session) return docs + async def insert_table(self, table: TableIn) -> Table: + """Insert a single table. + + Args: + table (TableIn): the table to insert + + Returns: + Table: the table actually in the database + + Raises: + AppError: If insert_one returns None, raises + """ + doc = self.document_model.model_validate(table.model_dump()) + full_doc = await self.document_model.insert_one(doc) + if not full_doc: + raise AppError("Error inserting Table", table=table) + return full_doc + async def get_tables( self, filter: TableFilter, @@ -52,7 +73,7 @@ async def get_tables( """Query the Table collection, scoped to the current user. See ``get_many``.""" return await self.get_many(pagination=pagination, filter=filter, fields=fields) - async def get_table_by_id(self, id: str, fields: frozenset[str] | None): + async def get_table_by_id(self, id: str, fields: frozenset[str] | None) -> Table | TableOut | None: """Find a single table by id, scoped to the current user. See ``get_by_id``.""" return await self.get_by_id(id, fields) @@ -64,3 +85,41 @@ async def download_tables( fields: frozenset[str] | None, ): pass + + async def delete_tables( + self, + filter: TableFilter, + session: AsyncClientSession | None = None, + ) -> DeleteResponse: + """Deletes all tables matching ``filter``. + + Args: + filter (TableFilter): the query to filter tables by + session (AsyncClientSession | None): the current session, used to guarantee transactions + + Returns: + DeleteResponse: A report of the deletion + """ + query = filter.filter(self.document_model.find(self._scope, session=session)) + result = await query.delete(session=session) + return DeleteResponse(num_deleted=result.deleted_count if result else 0) + + async def delete_table_by_id( + self, + id: str, + session: AsyncClientSession | None = None, + ) -> DeleteResponse: + """Deletes a single table by Id. + + Args: + id (str): the str representation of the Table's ObjectId + session (AsyncClientSession | None): the current session, used to guarantee transactions + + Returns: + DeleteResponse: A report of the deletion + """ + return await self.delete_by_id(id=id, session=session) + + async def patch_table_by_id(self, id: str, update: TablePatch) -> Table: + """Partially update a Table by id, scoped to the current user. See ``patch``.""" + return await self.patch(self._convert_object_id(id), update) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py index 78e5f51a10..49c2cecfe3 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py @@ -4,6 +4,7 @@ from fastapi_filter import FilterDepends from mpcontribs_api.domains._shared.bulk import BulkWriteSummary +from mpcontribs_api.domains._shared.models import DeleteResponse from mpcontribs_api.domains._shared.types import DownloadFormat, FieldSelector from mpcontribs_api.domains.tables.dependencies import TableDep from mpcontribs_api.domains.tables.models import Table, TableFilter, TableIn, TableOut @@ -51,3 +52,27 @@ async def insert_tables( tables: list[TableIn], ): return await repo.insert_tables(tables=tables) + + +@router.delete("", response_model=DeleteResponse) +async def delete_tables( + repo: TableDep, + filter: TableFilter = FilterDepends(TableFilter) +): + return await repo.delete_tables(filter=filter) + + +@router.delete("/{id}", response_model=DeleteResponse) +async def delete_table_by_id( + repo: TableDep, + id: str +): + return await repo.delete_table_by_id(id=id) + + +@router.patch("{id}") +async def patch_table_by_id( + repo: TableDep, + id: str +) + return await repo.patch_table_by_id(id=id) From 55f3eeb974d6b0586a946f7b409f164ad187361a Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 10 Jun 2026 12:09:24 -0700 Subject: [PATCH 320/591] Added missing update to patch endpoint --- mpcontribs-api/src/mpcontribs_api/domains/tables/router.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py index 49c2cecfe3..e6f5667b7f 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py @@ -7,7 +7,7 @@ from mpcontribs_api.domains._shared.models import DeleteResponse from mpcontribs_api.domains._shared.types import DownloadFormat, FieldSelector from mpcontribs_api.domains.tables.dependencies import TableDep -from mpcontribs_api.domains.tables.models import Table, TableFilter, TableIn, TableOut +from mpcontribs_api.domains.tables.models import Table, TableFilter, TableIn, TableOut, TablePatch from mpcontribs_api.pagination import CursorParams, Page router = APIRouter(tags=["components", "tables"]) @@ -73,6 +73,7 @@ async def delete_table_by_id( @router.patch("{id}") async def patch_table_by_id( repo: TableDep, - id: str + id: str, + update: TablePatch ) - return await repo.patch_table_by_id(id=id) + return await repo.patch_table_by_id(id=id, update=update) From e1694827834c62aa82e310838b1748c5f8b79a1c Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 10 Jun 2026 12:10:10 -0700 Subject: [PATCH 321/591] Added missing colon in patch function def --- .../src/mpcontribs_api/domains/tables/router.py | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py index e6f5667b7f..142916b066 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py @@ -55,18 +55,12 @@ async def insert_tables( @router.delete("", response_model=DeleteResponse) -async def delete_tables( - repo: TableDep, - filter: TableFilter = FilterDepends(TableFilter) -): +async def delete_tables(repo: TableDep, filter: TableFilter = FilterDepends(TableFilter)): return await repo.delete_tables(filter=filter) @router.delete("/{id}", response_model=DeleteResponse) -async def delete_table_by_id( - repo: TableDep, - id: str -): +async def delete_table_by_id(repo: TableDep, id: str): return await repo.delete_table_by_id(id=id) @@ -74,6 +68,6 @@ async def delete_table_by_id( async def patch_table_by_id( repo: TableDep, id: str, - update: TablePatch -) + update: TablePatch, +): return await repo.patch_table_by_id(id=id, update=update) From c0d59fdafd048093fe24490cd4d2e148d2ecf0ba Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 10 Jun 2026 15:42:51 -0700 Subject: [PATCH 322/591] Fleshed out streaming download to user with compression --- mpcontribs-api/src/mpcontribs_api/app.py | 1 + .../mpcontribs_api/domains/_shared/types.py | 2 +- .../mpcontribs_api/domains/tables/models.py | 8 +++ .../domains/tables/repository.py | 57 +++++++++++++++++-- .../mpcontribs_api/domains/tables/router.py | 28 ++++++--- 5 files changed, 84 insertions(+), 12 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/app.py b/mpcontribs-api/src/mpcontribs_api/app.py index 05e2645401..89b1b95fa8 100644 --- a/mpcontribs-api/src/mpcontribs_api/app.py +++ b/mpcontribs-api/src/mpcontribs_api/app.py @@ -87,6 +87,7 @@ def create_app(settings: Settings | None = None) -> FastAPI: openapi_tags=openapi_tags, ) + # Add request context to the logger app.add_middleware(RequestContextMiddleware) register_exception_handlers(app) app.include_router(healthcheck_router, prefix="/health") diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py index 64931df487..ce11e17164 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py @@ -60,5 +60,5 @@ def _mime_like(v: str) -> str: class DownloadFormat(StrEnum): - JSON = "json" + JSONL = "jsonl" CSV = "csv" diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py index f0234f833a..b0bc6ab4aa 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py @@ -126,6 +126,14 @@ class TableFilter(Filter): class Constants(Filter.Constants): model = Table + @field_serializer("id", "id__in", "id__neq") + def id_to_str(self, v: PydanticObjectId | list[PydanticObjectId] | None) -> str | list[str] | None: + if v is None: + return None + if isinstance(v, list): + return sorted(str(o) for o in v) + return str(v) + class TableSummaryOut(BaseModel): """Metadata-only table as embedded in contribution responses (no data).""" diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py index 4a9f7952b9..2d90e199b3 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py @@ -1,4 +1,8 @@ -from typing import Any +import hashlib +import json +import zlib +from collections.abc import AsyncIterable +from typing import Any, Literal from pymongo.asynchronous.client_session import AsyncClientSession @@ -77,14 +81,59 @@ async def get_table_by_id(self, id: str, fields: frozenset[str] | None) -> Table """Find a single table by id, scoped to the current user. See ``get_by_id``.""" return await self.get_by_id(id, fields) + def _hash_payload(self, payload: dict[str, Any], *, separators: tuple[str, str] = (",", ":")) -> str: + canonical = json.dumps( + payload, + sort_keys=True, + separators=separators, + ensure_ascii=True, + ) + return hashlib.sha256(canonical.encode("utf-8")).hexdigest() + async def download_tables( self, format: DownloadFormat, - short_mime: str, + short_mime: Literal["gz", None], + ignore_cache: bool, filter: TableFilter, fields: frozenset[str] | None, - ): - pass + ) -> AsyncIterable[bytes]: + # Hash parameters to generate key for cache + payload = { + "format": format, + "short_mime": short_mime, + "filter": filter.model_dump(), + "fields": sorted(fields) if fields else None, + } + _ = self._hash_payload(payload) + + # Check S3 for the cached file + # TODO: Implement + if not ignore_cache: + pass + + # If not found in cache, build from MongoDB and save to cache + query = filter.filter(self.document_model.find(self._scope)) + query = filter.sort(query) + + # Compress using gzip level 9 and stream out + compressor = zlib.compressobj(9, zlib.DEFLATED, 16 + zlib.MAX_WBITS) + buf = bytearray() + async for table in query: + # TODO: We might think about skipping validation to save time + out = self.out_model.model_validate(table, from_attributes=True) + line = out.model_dump_json().encode() + b"\n" + chunk = compressor.compress(line) + if chunk: + # TODO: Cache in S3 as multi-part upload so we stream to user and to S3 simultaneously, + # can then remove buf + buf += chunk + yield chunk + tail = compressor.flush() + if tail: + # TODO: Final upload final part to S3 in multi-part upload, remove buf + buf += tail + yield tail async def delete_tables( self, diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py index 142916b066..c26ce8dc0a 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py @@ -1,6 +1,7 @@ -from typing import Annotated +from typing import Annotated, Literal -from fastapi import APIRouter, Depends +from fastapi import APIRouter, Depends, Response +from fastapi.responses import StreamingResponse from fastapi_filter import FilterDepends from mpcontribs_api.domains._shared.bulk import BulkWriteSummary @@ -34,16 +35,29 @@ async def get_table( return await repo.get_table_by_id(id=pk, fields=selected) -@router.get("/download/{short_mime}") +@router.get("download/{short_mime}") async def download_table( repo: TableDep, + response: Response, format: DownloadFormat, - short_mime: str = "gz", + short_mime: Literal["gz", None] = "gz", + ignore_cache: bool = False, filter: TableFilter = FilterDepends(TableFilter), fields: FieldSelector = TableOut.default_fields(), -): +) -> StreamingResponse: selected = TableOut.parse_fields(fields) - return await repo.download_tables(format=format, short_mime=short_mime, filter=filter, fields=selected) + body = repo.download_tables( + format=format, + short_mime=short_mime, + ignore_cache=ignore_cache, + filter=filter, + fields=selected, + ) + return StreamingResponse( + body, + media_type="application/gzip", + headers={"Content-Disposition": 'attachment; filename="tables.jsonl.gz"'}, + ) @router.post("", response_model=BulkWriteSummary[Table]) @@ -59,7 +73,7 @@ async def delete_tables(repo: TableDep, filter: TableFilter = FilterDepends(Tabl return await repo.delete_tables(filter=filter) -@router.delete("/{id}", response_model=DeleteResponse) +@router.delete("{id}", response_model=DeleteResponse) async def delete_table_by_id(repo: TableDep, id: str): return await repo.delete_table_by_id(id=id) From 6489838ba097936312f8afce3f0ca1d35cac690c Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 10 Jun 2026 15:55:24 -0700 Subject: [PATCH 323/591] Removed unused response paramter from download_table --- mpcontribs-api/src/mpcontribs_api/domains/tables/router.py | 1 - 1 file changed, 1 deletion(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py index c26ce8dc0a..f7d7e003ef 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py @@ -38,7 +38,6 @@ async def get_table( @router.get("download/{short_mime}") async def download_table( repo: TableDep, - response: Response, format: DownloadFormat, short_mime: Literal["gz", None] = "gz", ignore_cache: bool = False, From f9c83790f4b7a65babfb5567697331d7a32331be Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 10 Jun 2026 16:25:20 -0700 Subject: [PATCH 324/591] Added shared repository for components --- .../domains/_shared/components.py | 172 ++++++++++++++++++ 1 file changed, 172 insertions(+) create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py new file mode 100644 index 0000000000..6044d07466 --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py @@ -0,0 +1,172 @@ +import hashlib +import json +import zlib +from collections.abc import AsyncIterable +from typing import Any, Literal + +from fastapi_filter.contrib.beanie import Filter +from pydantic import BaseModel +from pymongo.asynchronous.client_session import AsyncClientSession + +from mpcontribs_api.auth import User +from mpcontribs_api.config import get_settings +from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DeleteResponse, DocumentOut +from mpcontribs_api.domains._shared.repository import MongoDbRepository +from mpcontribs_api.domains._shared.types import DownloadFormat +from mpcontribs_api.exceptions import AppError +from mpcontribs_api.pagination import CursorParams, Page + + +class MongoDbComponentsRepository[ + TDoc: BaseDocumentWithInput, + TIn: BaseModel, + TOut: DocumentOut, + TFilter: Filter, # not FilterDepends — see below + TPatch: BaseModel, +](MongoDbRepository[TDoc, TIn, TOut, TFilter, TPatch]): + @staticmethod + def _build_scope(user: User) -> dict[str, Any]: + return {} + + # TODO: Returned docs don't have IDs assigned to them + async def insert_components( + self, + components: list[TIn], + session: AsyncClientSession | None = None, + ) -> list[TDoc]: + """Bulk-insert components, chunked to fit within a transaction's payload budget. + + Args: + components (list[TIn]): components to insert + session (AsyncClientSession): optional client session; pass when inserting inside a transaction + """ + if not components: + return [] + docs = [self.document_model.model_validate(t.model_dump()) for t in components] + chunk_size = get_settings().mongo.component_insert_chunk_size + for start in range(0, len(docs), chunk_size): + await self.document_model.insert_many(docs[start : start + chunk_size], ordered=False, session=session) + return docs + + async def insert_component(self, component: TIn) -> TDoc: + """Insert a single component. + + Args: + component (TIn): the table to insert + + Returns: + TDpc: the component actually in the database + + Raises: + AppError: If insert_one returns None, raises + """ + doc = self.document_model.model_validate(component.model_dump()) + full_doc = await self.document_model.insert_one(doc) + if not full_doc: + raise AppError("Error inserting Table", table=component) + return full_doc + + async def get_components( + self, + filter: TFilter, + pagination: CursorParams, + fields: frozenset[str] | None, + ) -> Page[TOut]: + """Query the component collection, scoped to the current user. See ``get_many``.""" + return await self.get_many(pagination=pagination, filter=filter, fields=fields) + + async def get_component_by_id(self, id: str, fields: frozenset[str] | None) -> TDoc | TOut | None: + """Find a single table by id, scoped to the current user. See ``get_by_id``.""" + return await self.get_by_id(id, fields) + + def _hash_payload(self, payload: dict[str, Any], *, separators: tuple[str, str] = (",", ":")) -> str: + canonical = json.dumps( + payload, + sort_keys=True, + separators=separators, + ensure_ascii=True, + ) + return hashlib.sha256(canonical.encode("utf-8")).hexdigest() + + async def download_components( + self, + format: DownloadFormat, + short_mime: Literal["gz", None], + ignore_cache: bool, + filter: TFilter, + fields: frozenset[str] | None, + ) -> AsyncIterable[bytes]: + # Hash parameters to generate key for cache + payload = { + "format": format, + "short_mime": short_mime, + "filter": filter.model_dump(), + "fields": sorted(fields) if fields else None, + } + _ = self._hash_payload(payload) + + # Check S3 for the cached file + # TODO: Implement + if not ignore_cache: + pass + + # If not found in cache, build from MongoDB and save to cache + query = filter.filter(self.document_model.find(self._scope)) + query = filter.sort(query) + + # Compress using gzip level 9 and stream out + compressor = zlib.compressobj(9, zlib.DEFLATED, 16 + zlib.MAX_WBITS) + buf = bytearray() + async for table in query: + # TODO: We might think about skipping validation to save time + out = self.out_model.model_validate(table, from_attributes=True) + line = out.model_dump_json().encode() + b"\n" + chunk = compressor.compress(line) + if chunk: + # TODO: Cache in S3 as multi-part upload so we stream to user and to S3 simultaneously, + # can then remove buf + buf += chunk + yield chunk + tail = compressor.flush() + if tail: + # TODO: Final upload final part to S3 in multi-part upload, remove buf + buf += tail + yield tail + + async def delete_components( + self, + filter: TFilter, + session: AsyncClientSession | None = None, + ) -> DeleteResponse: + """Deletes all components matching ``filter``. + + Args: + filter (TFilter): the query to filter components by + session (AsyncClientSession | None): the current session, used to guarantee transactions + + Returns: + DeleteResponse: A report of the deletion + """ + query = filter.filter(self.document_model.find(self._scope, session=session)) + result = await query.delete(session=session) + return DeleteResponse(num_deleted=result.deleted_count if result else 0) + + async def delete_component_by_id( + self, + id: str, + session: AsyncClientSession | None = None, + ) -> DeleteResponse: + """Deletes a single component by Id. + + Args: + id (str): the str representation of the component's ObjectId + session (AsyncClientSession | None): the current session, used to guarantee transactions + + Returns: + DeleteResponse: A report of the deletion + """ + return await self.delete_by_id(id=id, session=session) + + async def patch_component_by_id(self, id: str, update: TPatch) -> TDoc: + """Partially update a component by id, scoped to the current user. See ``patch``.""" + return await self.patch(self._convert_object_id(id), update) From 6c3227302207964034fd4ede0e89007f5ea735db Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 10 Jun 2026 16:25:53 -0700 Subject: [PATCH 325/591] Added Structures endpoint and refatored to use shared components repo --- .../domains/structures/dependencies.py | 13 +++ .../domains/structures/models.py | 10 ++ .../domains/structures/repository.py | 105 +++++++++++++++--- .../domains/structures/router.py | 87 +++++++++++++++ .../domains/tables/repository.py | 105 ++++-------------- .../mpcontribs_api/domains/tables/router.py | 4 +- 6 files changed, 222 insertions(+), 102 deletions(-) create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/structures/dependencies.py create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/structures/router.py diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/dependencies.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/dependencies.py new file mode 100644 index 0000000000..deb8fc7567 --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/domains/structures/dependencies.py @@ -0,0 +1,13 @@ +from typing import Annotated + +from fastapi import Depends + +from mpcontribs_api.dependencies import UserDep +from mpcontribs_api.domains.structures.repository import MongoDbStructureRepository + + +def get_scoped_tables(user: UserDep) -> MongoDbStructureRepository: + return MongoDbStructureRepository(user) + + +StructureDep = Annotated[MongoDbStructureRepository, Depends(get_scoped_tables)] diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py index 7dfce210ad..4b148bf288 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py @@ -83,9 +83,19 @@ class StructureOut(DocumentOut[PydanticObjectId]): name: str | None = None md5: MD5Hash | None = None + @staticmethod + def default_fields() -> list[str]: + return [ + "id", + "name", + "md5", + ] + class StructurePatch(SparseFieldsModel): name: str | None = None + lattice: Lattice | None = None + sites: Site | None = None class StructureFilter(Filter): diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/repository.py index 96feb08545..65ddbd866c 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/structures/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/structures/repository.py @@ -1,10 +1,11 @@ -from typing import Any +from collections.abc import AsyncIterable +from typing import Literal from pymongo.asynchronous.client_session import AsyncClientSession -from mpcontribs_api.auth import User -from mpcontribs_api.config import get_settings -from mpcontribs_api.domains._shared.repository import MongoDbRepository +from mpcontribs_api.domains._shared.components import MongoDbComponentsRepository +from mpcontribs_api.domains._shared.models import DeleteResponse +from mpcontribs_api.domains._shared.types import DownloadFormat from mpcontribs_api.domains.structures.models import ( Structure, StructureFilter, @@ -12,18 +13,15 @@ StructureOut, StructurePatch, ) +from mpcontribs_api.pagination import CursorParams, Page class MongoDbStructureRepository( - MongoDbRepository[Structure, StructureIn, StructureOut, StructureFilter, StructurePatch] + MongoDbComponentsRepository[Structure, StructureIn, StructureOut, StructureFilter, StructurePatch] ): document_model = Structure out_model = StructureOut - @staticmethod - def _build_scope(user: User) -> dict[str, Any]: - return {} - async def insert_structures( self, structures: list[StructureIn], @@ -33,12 +31,85 @@ async def insert_structures( Args: structures: structures to insert - session: optional client session; pass when inserting inside a transaction + session: optional client session; pass when inserStructureIng inside a transaction + """ + return await self.insert_structures(structures=structures, session=session) + + async def insert_structure(self, structure: StructureIn) -> Structure: + """Insert a single structure. + + Args: + structure (StructureIn): the table to insert + + Returns: + TDpc: the structure actually in the database + + Raises: + AppError: If insert_one returns None, raises """ - if not structures: - return [] - docs = [Structure.model_validate(s.model_dump()) for s in structures] - chunk_size = get_settings().mongo.component_insert_chunk_size - for start in range(0, len(docs), chunk_size): - await Structure.insert_many(docs[start : start + chunk_size], ordered=False, session=session) - return docs + return await self.insert_component(component=structure) + + async def get_structures( + self, + filter: StructureFilter, + pagination: CursorParams, + fields: frozenset[str] | None, + ) -> Page[StructureOut]: + """Query the structure collection, scoped to the current user. See ``get_many``.""" + return await self.get_components(pagination=pagination, filter=filter, fields=fields) + + async def get_structure_by_id(self, id: str, fields: frozenset[str] | None) -> Structure | StructureOut | None: + """Find a single table by id, scoped to the current user. See ``get_by_id``.""" + return await self.get_component_by_id(id, fields) + + async def download_structures( + self, + format: DownloadFormat, + short_mime: Literal["gz", None], + ignore_cache: bool, + filter: StructureFilter, + fields: frozenset[str] | None, + ) -> AsyncIterable[bytes]: + return self.download_components( + format=format, + short_mime=short_mime, + ignore_cache=ignore_cache, + filter=filter, + fields=fields, + ) + + async def delete_structures( + self, + filter: StructureFilter, + session: AsyncClientSession | None = None, + ) -> DeleteResponse: + """Deletes all structures matching ``filter``. + + Args: + filter (StructureFilter): the query to filter structures by + session (AsyncClientSession | None): the current session, used to guarantee transactions + + Returns: + DeleteResponse: A report of the deletion + """ + return await self.delete_components(filter=filter, session=session) + + async def delete_structure_by_id( + self, + id: str, + session: AsyncClientSession | None = None, + ) -> DeleteResponse: + """Deletes a single structure by Id. + + Args: + id (str): the str representation of the structure's ObjectId + session (AsyncClientSession | None): the current session, used to guarantee transactions + + Returns: + DeleteResponse: A report of the deletion + """ + return await self.delete_component_by_id(id=id, session=session) + + async def patch_structure_by_id(self, id: str, update: StructurePatch) -> Structure: + """Partially update a structure by id, scoped to the current user. See ``patch``.""" + return await self.patch_component_by_id(id=id, update=update) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py new file mode 100644 index 0000000000..e793e666d6 --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py @@ -0,0 +1,87 @@ +from typing import Annotated, Literal + +from fastapi import APIRouter, Depends, Response +from fastapi.responses import StreamingResponse +from fastapi_filter import FilterDepends + +from mpcontribs_api.domains._shared.bulk import BulkWriteSummary +from mpcontribs_api.domains._shared.models import DeleteResponse +from mpcontribs_api.domains._shared.types import DownloadFormat, FieldSelector +from mpcontribs_api.domains.structures.dependencies import StructureDep +from mpcontribs_api.domains.structures.models import StructureFilter, StructureIn, StructureOut, StructurePatch +from mpcontribs_api.pagination import CursorParams, Page + +router = APIRouter(tags=["components", "structures"]) + + +@router.get("", response_model=Page[StructureOut]) +async def get_structures( + repo: StructureDep, + pagination: Annotated[CursorParams, Depends()], + filter: StructureFilter = FilterDepends(StructureFilter), + fields: FieldSelector = StructureOut.default_fields(), +): + selected = StructureOut.parse_fields(fields) + return await repo.get_structures(filter=filter, fields=selected, pagination=pagination) + + +@router.get("{pk}", response_model=StructureOut) +async def get_structure( + repo: StructureDep, + pk: str, + fields: FieldSelector = StructureOut.default_fields(), +): + selected = StructureOut.parse_fields(fields) + return await repo.get_structure_by_id(id=pk, fields=selected) + + +@router.get("download/{short_mime}") +async def download_structure( + repo: StructureDep, + response: Response, + format: DownloadFormat, + short_mime: Literal["gz", None] = "gz", + ignore_cache: bool = False, + filter: StructureFilter = FilterDepends(StructureFilter), + fields: FieldSelector = StructureOut.default_fields(), +) -> StreamingResponse: + selected = StructureOut.parse_fields(fields) + body = await repo.download_structures( + format=format, + short_mime=short_mime, + ignore_cache=ignore_cache, + filter=filter, + fields=selected, + ) + return StreamingResponse( + body, + media_type="application/gzip", + headers={"Content-Disposition": 'attachment; filename="structures.jsonl.gz"'}, + ) + + +@router.post("", response_model=BulkWriteSummary[StructureOut]) +async def insert_structures( + repo: StructureDep, + structures: list[StructureIn], +): + return await repo.insert_structures(structures=structures) + + +@router.delete("", response_model=DeleteResponse) +async def delete_structures(repo: StructureDep, filter: StructureFilter = FilterDepends(StructureFilter)): + return await repo.delete_structures(filter=filter) + + +@router.delete("{id}", response_model=DeleteResponse) +async def delete_structure_by_id(repo: StructureDep, id: str): + return await repo.delete_structure_by_id(id=id) + + +@router.patch("{id}") +async def patch_structure_by_id( + repo: StructureDep, + id: str, + update: StructurePatch, +): + return await repo.patch_structure_by_id(id=id, update=update) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py index 2d90e199b3..1184ded32b 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py @@ -1,15 +1,10 @@ -import hashlib -import json -import zlib from collections.abc import AsyncIterable -from typing import Any, Literal +from typing import Literal from pymongo.asynchronous.client_session import AsyncClientSession -from mpcontribs_api.auth import User -from mpcontribs_api.config import get_settings +from mpcontribs_api.domains._shared.components import MongoDbComponentsRepository from mpcontribs_api.domains._shared.models import DeleteResponse -from mpcontribs_api.domains._shared.repository import MongoDbRepository from mpcontribs_api.domains._shared.types import DownloadFormat from mpcontribs_api.domains.tables.models import ( Table, @@ -18,19 +13,13 @@ TableOut, TablePatch, ) -from mpcontribs_api.exceptions import AppError from mpcontribs_api.pagination import CursorParams, Page -class MongoDbTableRepository(MongoDbRepository[Table, TableIn, TableOut, TableFilter, TablePatch]): +class MongoDbTableRepository(MongoDbComponentsRepository[Table, TableIn, TableOut, TableFilter, TablePatch]): document_model = Table out_model = TableOut - @staticmethod - def _build_scope(user: User) -> dict[str, Any]: - return {} - - # TODO: Returned docs don't have IDs assigned to them async def insert_tables( self, tables: list[TableIn], @@ -40,15 +29,9 @@ async def insert_tables( Args: tables: tables to insert - session: optional client session; pass when inserting inside a transaction + session: optional client session; pass when inserTableIng inside a transaction """ - if not tables: - return [] - docs = [self.document_model.model_validate(t.model_dump()) for t in tables] - chunk_size = get_settings().mongo.component_insert_chunk_size - for start in range(0, len(docs), chunk_size): - await self.document_model.insert_many(docs[start : start + chunk_size], ordered=False, session=session) - return docs + return await self.insert_tables(tables=tables, session=session) async def insert_table(self, table: TableIn) -> Table: """Insert a single table. @@ -57,16 +40,12 @@ async def insert_table(self, table: TableIn) -> Table: table (TableIn): the table to insert Returns: - Table: the table actually in the database + TDpc: the table actually in the database Raises: AppError: If insert_one returns None, raises """ - doc = self.document_model.model_validate(table.model_dump()) - full_doc = await self.document_model.insert_one(doc) - if not full_doc: - raise AppError("Error inserting Table", table=table) - return full_doc + return await self.insert_component(component=table) async def get_tables( self, @@ -74,21 +53,12 @@ async def get_tables( pagination: CursorParams, fields: frozenset[str] | None, ) -> Page[TableOut]: - """Query the Table collection, scoped to the current user. See ``get_many``.""" - return await self.get_many(pagination=pagination, filter=filter, fields=fields) + """Query the table collection, scoped to the current user. See ``get_many``.""" + return await self.get_components(pagination=pagination, filter=filter, fields=fields) async def get_table_by_id(self, id: str, fields: frozenset[str] | None) -> Table | TableOut | None: """Find a single table by id, scoped to the current user. See ``get_by_id``.""" - return await self.get_by_id(id, fields) - - def _hash_payload(self, payload: dict[str, Any], *, separators: tuple[str, str] = (",", ":")) -> str: - canonical = json.dumps( - payload, - sort_keys=True, - separators=separators, - ensure_ascii=True, - ) - return hashlib.sha256(canonical.encode("utf-8")).hexdigest() + return await self.get_component_by_id(id, fields) async def download_tables( self, @@ -98,42 +68,13 @@ async def download_tables( filter: TableFilter, fields: frozenset[str] | None, ) -> AsyncIterable[bytes]: - # Hash parameters to generate key for cache - payload = { - "format": format, - "short_mime": short_mime, - "filter": filter.model_dump(), - "fields": sorted(fields) if fields else None, - } - _ = self._hash_payload(payload) - - # Check S3 for the cached file - # TODO: Implement - if not ignore_cache: - pass - - # If not found in cache, build from MongoDB and save to cache - query = filter.filter(self.document_model.find(self._scope)) - query = filter.sort(query) - - # Compress using gzip level 9 and stream out - compressor = zlib.compressobj(9, zlib.DEFLATED, 16 + zlib.MAX_WBITS) - buf = bytearray() - async for table in query: - # TODO: We might think about skipping validation to save time - out = self.out_model.model_validate(table, from_attributes=True) - line = out.model_dump_json().encode() + b"\n" - chunk = compressor.compress(line) - if chunk: - # TODO: Cache in S3 as multi-part upload so we stream to user and to S3 simultaneously, - # can then remove buf - buf += chunk - yield chunk - tail = compressor.flush() - if tail: - # TODO: Final upload final part to S3 in multi-part upload, remove buf - buf += tail - yield tail + return self.download_components( + format=format, + short_mime=short_mime, + ignore_cache=ignore_cache, + filter=filter, + fields=fields, + ) async def delete_tables( self, @@ -149,9 +90,7 @@ async def delete_tables( Returns: DeleteResponse: A report of the deletion """ - query = filter.filter(self.document_model.find(self._scope, session=session)) - result = await query.delete(session=session) - return DeleteResponse(num_deleted=result.deleted_count if result else 0) + return await self.delete_components(filter=filter, session=session) async def delete_table_by_id( self, @@ -161,14 +100,14 @@ async def delete_table_by_id( """Deletes a single table by Id. Args: - id (str): the str representation of the Table's ObjectId + id (str): the str representation of the table's ObjectId session (AsyncClientSession | None): the current session, used to guarantee transactions Returns: DeleteResponse: A report of the deletion """ - return await self.delete_by_id(id=id, session=session) + return await self.delete_component_by_id(id=id, session=session) async def patch_table_by_id(self, id: str, update: TablePatch) -> Table: - """Partially update a Table by id, scoped to the current user. See ``patch``.""" - return await self.patch(self._convert_object_id(id), update) + """Partially update a table by id, scoped to the current user. See ``patch``.""" + return await self.patch_component_by_id(id=id, update=update) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py index f7d7e003ef..239bd45b25 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py @@ -1,6 +1,6 @@ from typing import Annotated, Literal -from fastapi import APIRouter, Depends, Response +from fastapi import APIRouter, Depends from fastapi.responses import StreamingResponse from fastapi_filter import FilterDepends @@ -45,7 +45,7 @@ async def download_table( fields: FieldSelector = TableOut.default_fields(), ) -> StreamingResponse: selected = TableOut.parse_fields(fields) - body = repo.download_tables( + body = await repo.download_tables( format=format, short_mime=short_mime, ignore_cache=ignore_cache, From 04bad378ee59dcb01503f3261f7dd459de4313b8 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 10 Jun 2026 16:31:21 -0700 Subject: [PATCH 326/591] Added Attachments endpoint --- .../domains/attachments/dependencies.py | 13 +++ .../domains/attachments/repository.py | 105 +++++++++++++++--- .../domains/attachments/router.py | 87 +++++++++++++++ .../domains/structures/repository.py | 2 +- 4 files changed, 189 insertions(+), 18 deletions(-) create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/attachments/dependencies.py create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py diff --git a/mpcontribs-api/src/mpcontribs_api/domains/attachments/dependencies.py b/mpcontribs-api/src/mpcontribs_api/domains/attachments/dependencies.py new file mode 100644 index 0000000000..59d6923ff0 --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/domains/attachments/dependencies.py @@ -0,0 +1,13 @@ +from typing import Annotated + +from fastapi import Depends + +from mpcontribs_api.dependencies import UserDep +from mpcontribs_api.domains.attachments.repository import MongoDbAttachmentRepository + + +def get_scoped_attachments(user: UserDep) -> MongoDbAttachmentRepository: + return MongoDbAttachmentRepository(user) + + +AttachmentDep = Annotated[MongoDbAttachmentRepository, Depends(get_scoped_attachments)] diff --git a/mpcontribs-api/src/mpcontribs_api/domains/attachments/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/attachments/repository.py index e3c7fbb9e5..62d0a5032b 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/attachments/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/attachments/repository.py @@ -1,10 +1,11 @@ -from typing import Any +from collections.abc import AsyncIterable +from typing import Literal from pymongo.asynchronous.client_session import AsyncClientSession -from mpcontribs_api.auth import User -from mpcontribs_api.config import get_settings -from mpcontribs_api.domains._shared.repository import MongoDbRepository +from mpcontribs_api.domains._shared.components import MongoDbComponentsRepository +from mpcontribs_api.domains._shared.models import DeleteResponse +from mpcontribs_api.domains._shared.types import DownloadFormat from mpcontribs_api.domains.attachments.models import ( Attachment, AttachmentFilter, @@ -12,18 +13,15 @@ AttachmentOut, AttachmentPatch, ) +from mpcontribs_api.pagination import CursorParams, Page class MongoDbAttachmentRepository( - MongoDbRepository[Attachment, AttachmentIn, AttachmentOut, AttachmentFilter, AttachmentPatch] + MongoDbComponentsRepository[Attachment, AttachmentIn, AttachmentOut, AttachmentFilter, AttachmentPatch] ): document_model = Attachment out_model = AttachmentOut - @staticmethod - def _build_scope(user: User) -> dict[str, Any]: - return {} - async def insert_attachments( self, attachments: list[AttachmentIn], @@ -33,12 +31,85 @@ async def insert_attachments( Args: attachments: attachments to insert - session: optional client session; pass when inserting inside a transaction + session: optional client session; pass when inserAttachmentIng inside a transaction + """ + return await self.insert_components(components=attachments, session=session) + + async def insert_attachment(self, attachment: AttachmentIn) -> Attachment: + """Insert a single attachment. + + Args: + attachment (AttachmentIn): the table to insert + + Returns: + TDpc: the attachment actually in the database + + Raises: + AppError: If insert_one returns None, raises """ - if not attachments: - return [] - docs = [Attachment.model_validate(a.model_dump()) for a in attachments] - chunk_size = get_settings().mongo.component_insert_chunk_size - for start in range(0, len(docs), chunk_size): - await Attachment.insert_many(docs[start : start + chunk_size], ordered=False, session=session) - return docs + return await self.insert_component(component=attachment) + + async def get_attachments( + self, + filter: AttachmentFilter, + pagination: CursorParams, + fields: frozenset[str] | None, + ) -> Page[AttachmentOut]: + """Query the attachment collection, scoped to the current user. See ``get_many``.""" + return await self.get_components(pagination=pagination, filter=filter, fields=fields) + + async def get_attachment_by_id(self, id: str, fields: frozenset[str] | None) -> Attachment | AttachmentOut | None: + """Find a single table by id, scoped to the current user. See ``get_by_id``.""" + return await self.get_component_by_id(id, fields) + + async def download_attachments( + self, + format: DownloadFormat, + short_mime: Literal["gz", None], + ignore_cache: bool, + filter: AttachmentFilter, + fields: frozenset[str] | None, + ) -> AsyncIterable[bytes]: + return self.download_components( + format=format, + short_mime=short_mime, + ignore_cache=ignore_cache, + filter=filter, + fields=fields, + ) + + async def delete_attachments( + self, + filter: AttachmentFilter, + session: AsyncClientSession | None = None, + ) -> DeleteResponse: + """Deletes all attachments matching ``filter``. + + Args: + filter (AttachmentFilter): the query to filter attachments by + session (AsyncClientSession | None): the current session, used to guarantee transactions + + Returns: + DeleteResponse: A report of the deletion + """ + return await self.delete_components(filter=filter, session=session) + + async def delete_attachment_by_id( + self, + id: str, + session: AsyncClientSession | None = None, + ) -> DeleteResponse: + """Deletes a single attachment by Id. + + Args: + id (str): the str representation of the attachment's ObjectId + session (AsyncClientSession | None): the current session, used to guarantee transactions + + Returns: + DeleteResponse: A report of the deletion + """ + return await self.delete_component_by_id(id=id, session=session) + + async def patch_attachment_by_id(self, id: str, update: AttachmentPatch) -> Attachment: + """Partially update a attachment by id, scoped to the current user. See ``patch``.""" + return await self.patch_component_by_id(id=id, update=update) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py b/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py new file mode 100644 index 0000000000..e793e666d6 --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py @@ -0,0 +1,87 @@ +from typing import Annotated, Literal + +from fastapi import APIRouter, Depends, Response +from fastapi.responses import StreamingResponse +from fastapi_filter import FilterDepends + +from mpcontribs_api.domains._shared.bulk import BulkWriteSummary +from mpcontribs_api.domains._shared.models import DeleteResponse +from mpcontribs_api.domains._shared.types import DownloadFormat, FieldSelector +from mpcontribs_api.domains.structures.dependencies import StructureDep +from mpcontribs_api.domains.structures.models import StructureFilter, StructureIn, StructureOut, StructurePatch +from mpcontribs_api.pagination import CursorParams, Page + +router = APIRouter(tags=["components", "structures"]) + + +@router.get("", response_model=Page[StructureOut]) +async def get_structures( + repo: StructureDep, + pagination: Annotated[CursorParams, Depends()], + filter: StructureFilter = FilterDepends(StructureFilter), + fields: FieldSelector = StructureOut.default_fields(), +): + selected = StructureOut.parse_fields(fields) + return await repo.get_structures(filter=filter, fields=selected, pagination=pagination) + + +@router.get("{pk}", response_model=StructureOut) +async def get_structure( + repo: StructureDep, + pk: str, + fields: FieldSelector = StructureOut.default_fields(), +): + selected = StructureOut.parse_fields(fields) + return await repo.get_structure_by_id(id=pk, fields=selected) + + +@router.get("download/{short_mime}") +async def download_structure( + repo: StructureDep, + response: Response, + format: DownloadFormat, + short_mime: Literal["gz", None] = "gz", + ignore_cache: bool = False, + filter: StructureFilter = FilterDepends(StructureFilter), + fields: FieldSelector = StructureOut.default_fields(), +) -> StreamingResponse: + selected = StructureOut.parse_fields(fields) + body = await repo.download_structures( + format=format, + short_mime=short_mime, + ignore_cache=ignore_cache, + filter=filter, + fields=selected, + ) + return StreamingResponse( + body, + media_type="application/gzip", + headers={"Content-Disposition": 'attachment; filename="structures.jsonl.gz"'}, + ) + + +@router.post("", response_model=BulkWriteSummary[StructureOut]) +async def insert_structures( + repo: StructureDep, + structures: list[StructureIn], +): + return await repo.insert_structures(structures=structures) + + +@router.delete("", response_model=DeleteResponse) +async def delete_structures(repo: StructureDep, filter: StructureFilter = FilterDepends(StructureFilter)): + return await repo.delete_structures(filter=filter) + + +@router.delete("{id}", response_model=DeleteResponse) +async def delete_structure_by_id(repo: StructureDep, id: str): + return await repo.delete_structure_by_id(id=id) + + +@router.patch("{id}") +async def patch_structure_by_id( + repo: StructureDep, + id: str, + update: StructurePatch, +): + return await repo.patch_structure_by_id(id=id, update=update) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/repository.py index 65ddbd866c..92155dd028 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/structures/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/structures/repository.py @@ -33,7 +33,7 @@ async def insert_structures( structures: structures to insert session: optional client session; pass when inserStructureIng inside a transaction """ - return await self.insert_structures(structures=structures, session=session) + return await self.insert_components(components=structures, session=session) async def insert_structure(self, structure: StructureIn) -> Structure: """Insert a single structure. From 91c5719abc3f5c318cb4324900995f4c557f66ac Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 10 Jun 2026 16:32:31 -0700 Subject: [PATCH 327/591] Removed get and patch capabilities from attachment endpoint --- .../domains/attachments/repository.py | 31 ------------------- .../domains/attachments/router.py | 20 +----------- 2 files changed, 1 insertion(+), 50 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/attachments/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/attachments/repository.py index 62d0a5032b..f830b5d35a 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/attachments/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/attachments/repository.py @@ -22,33 +22,6 @@ class MongoDbAttachmentRepository( document_model = Attachment out_model = AttachmentOut - async def insert_attachments( - self, - attachments: list[AttachmentIn], - session: AsyncClientSession | None = None, - ) -> list[Attachment]: - """Bulk-insert attachments, chunked to fit within a transaction's payload budget. - - Args: - attachments: attachments to insert - session: optional client session; pass when inserAttachmentIng inside a transaction - """ - return await self.insert_components(components=attachments, session=session) - - async def insert_attachment(self, attachment: AttachmentIn) -> Attachment: - """Insert a single attachment. - - Args: - attachment (AttachmentIn): the table to insert - - Returns: - TDpc: the attachment actually in the database - - Raises: - AppError: If insert_one returns None, raises - """ - return await self.insert_component(component=attachment) - async def get_attachments( self, filter: AttachmentFilter, @@ -109,7 +82,3 @@ async def delete_attachment_by_id( DeleteResponse: A report of the deletion """ return await self.delete_component_by_id(id=id, session=session) - - async def patch_attachment_by_id(self, id: str, update: AttachmentPatch) -> Attachment: - """Partially update a attachment by id, scoped to the current user. See ``patch``.""" - return await self.patch_component_by_id(id=id, update=update) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py b/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py index e793e666d6..68108a87a6 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py @@ -4,11 +4,10 @@ from fastapi.responses import StreamingResponse from fastapi_filter import FilterDepends -from mpcontribs_api.domains._shared.bulk import BulkWriteSummary from mpcontribs_api.domains._shared.models import DeleteResponse from mpcontribs_api.domains._shared.types import DownloadFormat, FieldSelector from mpcontribs_api.domains.structures.dependencies import StructureDep -from mpcontribs_api.domains.structures.models import StructureFilter, StructureIn, StructureOut, StructurePatch +from mpcontribs_api.domains.structures.models import StructureFilter, StructureOut from mpcontribs_api.pagination import CursorParams, Page router = APIRouter(tags=["components", "structures"]) @@ -60,14 +59,6 @@ async def download_structure( ) -@router.post("", response_model=BulkWriteSummary[StructureOut]) -async def insert_structures( - repo: StructureDep, - structures: list[StructureIn], -): - return await repo.insert_structures(structures=structures) - - @router.delete("", response_model=DeleteResponse) async def delete_structures(repo: StructureDep, filter: StructureFilter = FilterDepends(StructureFilter)): return await repo.delete_structures(filter=filter) @@ -76,12 +67,3 @@ async def delete_structures(repo: StructureDep, filter: StructureFilter = Filter @router.delete("{id}", response_model=DeleteResponse) async def delete_structure_by_id(repo: StructureDep, id: str): return await repo.delete_structure_by_id(id=id) - - -@router.patch("{id}") -async def patch_structure_by_id( - repo: StructureDep, - id: str, - update: StructurePatch, -): - return await repo.patch_structure_by_id(id=id, update=update) From dec71bcbfb0e353cb15414d92077ad4c4f9763e4 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 10 Jun 2026 16:33:34 -0700 Subject: [PATCH 328/591] Removed logic for inserting attachments during contribution insert --- .../src/mpcontribs_api/domains/contributions/service.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py index f2ef09de0b..147afa8ee0 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py @@ -15,7 +15,6 @@ BulkWriteSummary, bulk_failure_from_exception, ) -from mpcontribs_api.domains.attachments.models import Attachment from mpcontribs_api.domains.attachments.repository import MongoDbAttachmentRepository from mpcontribs_api.domains.contributions.models import Contribution, ContributionFilter, ContributionIn from mpcontribs_api.domains.contributions.repository import MongoDbContributionRepository @@ -241,12 +240,10 @@ async def _do_insert(self, contrib: ContributionIn, session: AsyncClientSession) """ structures = await self._structures.insert_structures(contrib.structures or [], session=session) tables = await self._tables.insert_tables(contrib.tables or [], session=session) - attachments = await self._attachments.insert_attachments(contrib.attachments or [], session=session) doc = Contribution.from_input_model(contrib) doc.structures = cast(list[Link[Structure]] | None, structures or None) doc.tables = cast(list[Link[Table]] | None, tables or None) - doc.attachments = cast(list[Link[Attachment]] | None, attachments or None) return await self._contributions.insert_contribution(doc, session=session) async def upsert_contributions(self, contributions: list[ContributionIn]) -> list[Contribution]: From 918e8b7a98df0682fc088e6d5bfb1866c46c422f Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 10 Jun 2026 16:57:48 -0700 Subject: [PATCH 329/591] Moved _children to a property --- .../domains/contributions/service.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py index 147afa8ee0..63ccd0d732 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py @@ -15,6 +15,7 @@ BulkWriteSummary, bulk_failure_from_exception, ) +from mpcontribs_api.domains._shared.repository import MongoDbRepository from mpcontribs_api.domains.attachments.repository import MongoDbAttachmentRepository from mpcontribs_api.domains.contributions.models import Contribution, ContributionFilter, ContributionIn from mpcontribs_api.domains.contributions.repository import MongoDbContributionRepository @@ -40,16 +41,19 @@ def __init__( ): self._client = client self._contributions = contributions - self._children = { - "structures": structures, - "attachments": attachments, - "tables": tables, - } self._structures = structures self._attachments = attachments self._tables = tables self._settings = settings or get_settings().mongo + @property + def _children(self) -> dict[str, MongoDbRepository]: + return { + "structures": self._structures, + "attachments": self._attachments, + "tables": self._tables, + } + async def insert_contributions( self, contributions: list[ContributionIn], @@ -304,7 +308,7 @@ async def delete_contributions(self, filter: ContributionFilter) -> BulkDeleteSu for field, repo in self._children.items(): ids = [link.ref.id for c in page.items for link in getattr(c, field)] if ids: - deleted_components = await repo.delete_by_ids(ids) + deleted_components = await repo.delete_by_ids(ids) # pyright: ignore[reportAttributeAccessIssue] num_deleted_components += deleted_components.deleted_count if deleted_components else 0 # Delete Contributions in this batch by ID From ab90d9a52098094207031df95b335302a5ca9511 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 10 Jun 2026 17:00:54 -0700 Subject: [PATCH 330/591] Added attachments, structures, and tables routers to main router --- mpcontribs-api/src/mpcontribs_api/api/v1/router.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/mpcontribs-api/src/mpcontribs_api/api/v1/router.py b/mpcontribs-api/src/mpcontribs_api/api/v1/router.py index c8cb430867..099d88ccc4 100644 --- a/mpcontribs-api/src/mpcontribs_api/api/v1/router.py +++ b/mpcontribs-api/src/mpcontribs_api/api/v1/router.py @@ -1,9 +1,15 @@ from fastapi import APIRouter +from mpcontribs_api.domains.attachments.router import router as attachments_router from mpcontribs_api.domains.contributions.router import router as contributions_router from mpcontribs_api.domains.projects.router import router as projects_router +from mpcontribs_api.domains.structures.router import router as structures_router +from mpcontribs_api.domains.tables.router import router as tables_router router = APIRouter() -router.include_router(projects_router, prefix="/projects") +router.include_router(attachments_router, prefix="/attachments") router.include_router(contributions_router, prefix="/contributions") +router.include_router(projects_router, prefix="/projects") +router.include_router(structures_router, prefix="/structures") +router.include_router(tables_router, prefix="/tables") From 2f317811dcf029edf04df118c895f76678ae55fc Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 11 Jun 2026 09:31:19 -0700 Subject: [PATCH 331/591] Made PolarsFrame type to handle coercion and serialization --- mpcontribs-api/src/mpcontribs_api/app.py | 2 +- mpcontribs-api/src/mpcontribs_api/config.py | 4 +++ .../mpcontribs_api/domains/_shared/types.py | 27 ++++++++++++++++++- .../domains/contributions/models.py | 2 +- .../domains/structures/models.py | 23 +++------------- .../mpcontribs_api/domains/tables/models.py | 21 +++------------ 6 files changed, 39 insertions(+), 40 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/app.py b/mpcontribs-api/src/mpcontribs_api/app.py index 89b1b95fa8..c2371d7ae9 100644 --- a/mpcontribs-api/src/mpcontribs_api/app.py +++ b/mpcontribs-api/src/mpcontribs_api/app.py @@ -36,7 +36,7 @@ async def lifespan(app: FastAPI) -> AsyncGenerator[None]: maxIdleTimeMS=settings.mongo.max_idle_time_ms, timeoutMS=settings.mongo.timeout_ms, serverSelectionTimeoutMS=settings.mongo.server_selection_timeout_ms, - retryWrite=True, + retryWrites=True, retryReads=True, compressors=settings.mongo.compressors, readPreference=settings.mongo.read_preference, diff --git a/mpcontribs-api/src/mpcontribs_api/config.py b/mpcontribs-api/src/mpcontribs_api/config.py index 3055103fd7..6a7e3a673c 100644 --- a/mpcontribs-api/src/mpcontribs_api/config.py +++ b/mpcontribs-api/src/mpcontribs_api/config.py @@ -36,6 +36,10 @@ class MongoSettings(BaseModel): default=0, description="Minimum number of concurent connections that the pool will maintain connected to each server ", ) + max_global_concurrent_writes: int = Field( + default=100, + description="Maximum number of writes allowed to happen simultaneously. Key for bulk write efficiency.", + ) datetime_conversion: Literal["datetime_ms", "datetime", "datetime_auto", "datetime_clamp"] = Field( default="datetime", description="Specifies how UTC datetimes should be decoded within BSON", diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py index ce11e17164..999439d4c4 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py @@ -2,8 +2,9 @@ from enum import StrEnum from typing import Annotated +import polars as pl from fastapi import Query -from pydantic import BeforeValidator, Field +from pydantic import BeforeValidator, Field, PlainSerializer, WithJsonSchema from mpcontribs_api.exceptions import ValidationError @@ -62,3 +63,27 @@ def _mime_like(v: str) -> str: class DownloadFormat(StrEnum): JSONL = "jsonl" CSV = "csv" + + +def _coerce_frame(v: object) -> pl.DataFrame: + if isinstance(v, pl.DataFrame): + return v + if isinstance(v, dict): + return pl.DataFrame(v) + raise ValueError(f"cannot coerce {type(v)} to pl.DataFrame") + + +def _serialize_frame(data: pl.DataFrame) -> dict: + return data.to_dict(as_series=False) + + +PolarsFrame = Annotated[ + pl.DataFrame, + BeforeValidator(_coerce_frame), + PlainSerializer(_serialize_frame, return_type=dict), + WithJsonSchema( + {"type": "array", "items": {"type": "array", "items": {"type": "number"}}}, + mode="validation", + ), + WithJsonSchema({"type": "object"}, mode="serialization"), +] diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py index f612b0eb21..b8b19d22f4 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py @@ -151,5 +151,5 @@ class Constants(Filter.Constants): model = Contribution @field_validator("id", mode="before") - def convert_str_to_OId(self, v: str): + def convert_str_to_oid(cls, v: str): return PydanticObjectId(v) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py index 4b148bf288..82ecc93589 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py @@ -1,11 +1,10 @@ -import polars as pl from beanie import PydanticObjectId from fastapi_filter.contrib.beanie import Filter -from pydantic import BaseModel, ConfigDict, field_serializer, field_validator +from pydantic import BaseModel, ConfigDict from pymatgen.core import Element from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut -from mpcontribs_api.domains._shared.types import MD5Hash +from mpcontribs_api.domains._shared.types import MD5Hash, PolarsFrame from mpcontribs_api.projection import SparseFieldsModel @@ -20,7 +19,7 @@ class Species(BaseModel): class Lattice(BaseModel): model_config = ConfigDict(arbitrary_types_allowed=True) - matrix: pl.DataFrame + matrix: PolarsFrame pbc: list[bool] a: float b: float @@ -30,22 +29,6 @@ class Lattice(BaseModel): gamma: float volume: float - @field_validator("matrix", mode="before") - @classmethod - def coerce_matrix(cls, v: object) -> pl.DataFrame: - if isinstance(v, pl.DataFrame): - return v - if isinstance(v, dict): - return pl.DataFrame(v) - # MongoDB returns rows as a list of lists - if isinstance(v, list): - return pl.DataFrame(v) - raise ValueError(f"cannot coerce {type(v)} to pl.DataFrame") - - @field_serializer("matrix") - def serialize_matrix(self, matrix: pl.DataFrame) -> dict: - return matrix.to_dict(as_series=False) - class Site(BaseModel): species: list[Species] diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py index b0bc6ab4aa..e9d9797e9e 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py @@ -8,12 +8,11 @@ ConfigDict, ValidationError, field_serializer, - field_validator, model_validator, ) from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut -from mpcontribs_api.domains._shared.types import MD5Hash +from mpcontribs_api.domains._shared.types import MD5Hash, PolarsFrame from mpcontribs_api.projection import SparseFieldsModel @@ -35,24 +34,11 @@ class Table(BaseDocumentWithInput[PydanticObjectId]): md5: MD5Hash attrs: Attributes total_data_rows: int - data: pl.DataFrame + data: PolarsFrame class Settings: name = "tables" - @field_validator("data", mode="before") - @classmethod - def coerce_data(cls, v: object) -> pl.DataFrame: - if isinstance(v, pl.DataFrame): - return v - if isinstance(v, dict): - return pl.DataFrame(v) - raise ValueError(f"cannot coerce {type(v)} to pl.DataFrame") - - @field_serializer("data") - def serialize_data(self, data: pl.DataFrame) -> dict: - return data.to_dict(as_series=False) - class TableIn(Table): @model_validator(mode="after") @@ -145,6 +131,7 @@ class TableSummaryOut(BaseModel): class TableOut(DocumentOut[PydanticObjectId]): + model_config = ConfigDict(arbitrary_types_allowed=True) name: str | None = None md5: MD5Hash | None = None attrs: Attributes | None = None @@ -152,7 +139,7 @@ class TableOut(DocumentOut[PydanticObjectId]): total_data_rows: int | None = None total_data_pages: int | None = None index: list[Any] | None = None - data: pl.DataFrame | None = None + data: PolarsFrame | None = None @staticmethod def default_fields() -> list[str]: From 1d4f130ad4ac07e019daed65cede6ed381b046fc Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 11 Jun 2026 09:33:13 -0700 Subject: [PATCH 332/591] Removed 'components' tag from components routers --- mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py | 2 +- mpcontribs-api/src/mpcontribs_api/domains/structures/router.py | 2 +- mpcontribs-api/src/mpcontribs_api/domains/tables/router.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py b/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py index 68108a87a6..2b535917f3 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py @@ -10,7 +10,7 @@ from mpcontribs_api.domains.structures.models import StructureFilter, StructureOut from mpcontribs_api.pagination import CursorParams, Page -router = APIRouter(tags=["components", "structures"]) +router = APIRouter(tags=["attachments"]) @router.get("", response_model=Page[StructureOut]) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py index e793e666d6..f16302e9df 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py @@ -11,7 +11,7 @@ from mpcontribs_api.domains.structures.models import StructureFilter, StructureIn, StructureOut, StructurePatch from mpcontribs_api.pagination import CursorParams, Page -router = APIRouter(tags=["components", "structures"]) +router = APIRouter(tags=["structures"]) @router.get("", response_model=Page[StructureOut]) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py index 239bd45b25..b72a752c77 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py @@ -11,7 +11,7 @@ from mpcontribs_api.domains.tables.models import Table, TableFilter, TableIn, TableOut, TablePatch from mpcontribs_api.pagination import CursorParams, Page -router = APIRouter(tags=["components", "tables"]) +router = APIRouter(tags=["tables"]) @router.get("", response_model=Page[TableOut]) From cfa54f10de5a39dae50e2dbc280e613c564ae239 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 11 Jun 2026 10:04:16 -0700 Subject: [PATCH 333/591] Added additional logging context to each request --- mpcontribs-api/src/mpcontribs_api/_openapi.py | 7 ---- mpcontribs-api/src/mpcontribs_api/app.py | 5 +++ mpcontribs-api/src/mpcontribs_api/auth.py | 9 +++++ .../src/mpcontribs_api/middleware.py | 35 +++++++++++++++---- 4 files changed, 42 insertions(+), 14 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/_openapi.py b/mpcontribs-api/src/mpcontribs_api/_openapi.py index 49b3f813ca..b041f048d9 100644 --- a/mpcontribs-api/src/mpcontribs_api/_openapi.py +++ b/mpcontribs-api/src/mpcontribs_api/_openapi.py @@ -34,13 +34,6 @@ "description": "are files saved as objects in AWS S3 and not accessible for querying (only retrieval) which " "can be added to a contribution.", }, - { - "name": "notebooks", - "description": "are" - "[Jupyter notebook](https://jupyter-notebook.readthedocs.io/en/stable/notebook.html#notebook-documents) " - "documents generated and saved when a contribution is saved. They form the basis for Contribution Details " - "Pages on the Portal.", - }, ] contact_info = { diff --git a/mpcontribs-api/src/mpcontribs_api/app.py b/mpcontribs-api/src/mpcontribs_api/app.py index c2371d7ae9..1056b92a86 100644 --- a/mpcontribs-api/src/mpcontribs_api/app.py +++ b/mpcontribs-api/src/mpcontribs_api/app.py @@ -9,6 +9,7 @@ from mpcontribs_api._openapi import contact_info, license_info, openapi_tags from mpcontribs_api.api.v1.router import router as v1_router +from mpcontribs_api.auth import api_key_scheme from mpcontribs_api.config import Settings, get_settings from mpcontribs_api.dependencies import verify_gateway from mpcontribs_api.domains.attachments.models import Attachment @@ -85,6 +86,10 @@ def create_app(settings: Settings | None = None) -> FastAPI: contact=contact_info, # openapi_url="/api/v1/openapi.json", openapi_tags=openapi_tags, + swagger_ui_parameters={ + "docExpansion": "none", + }, + dependencies=[Depends(api_key_scheme)], ) # Add request context to the logger diff --git a/mpcontribs-api/src/mpcontribs_api/auth.py b/mpcontribs-api/src/mpcontribs_api/auth.py index bab11f1bb4..d5336b2fb6 100644 --- a/mpcontribs-api/src/mpcontribs_api/auth.py +++ b/mpcontribs-api/src/mpcontribs_api/auth.py @@ -1,11 +1,20 @@ from typing import Any +from fastapi.security import APIKeyHeader from pydantic import BaseModel, ConfigDict, model_validator from mpcontribs_api.config import get_settings settings = get_settings() + +api_key_scheme = APIKeyHeader( + name="X-API-KEY", + auto_error=False, + description="MP API key to authorize requests", +) + + ADMIN_GROUP = settings.mongo.admin_group diff --git a/mpcontribs-api/src/mpcontribs_api/middleware.py b/mpcontribs-api/src/mpcontribs_api/middleware.py index e68462ff8e..c6fa240125 100644 --- a/mpcontribs-api/src/mpcontribs_api/middleware.py +++ b/mpcontribs-api/src/mpcontribs_api/middleware.py @@ -1,8 +1,20 @@ import uuid +from collections.abc import Iterable import structlog from starlette.types import ASGIApp, Receive, Scope, Send +# Lowercased ASGI byte header name -> structlog context key. +_LOGGED_HEADERS: dict[bytes, str] = { + b"user-agent": "user_agent", + b"accept": "accept", + b"accept-language": "accept_language", + b"accept-encoding": "accept_encoding", + b"referer": "referer", + b"content-type": "content_type", + b"content-length": "content_length", +} + class RequestContextMiddleware: def __init__(self, app: ASGIApp) -> None: @@ -13,14 +25,23 @@ async def __call__(self, scope: Scope, receive: Receive, send: Send) -> None: await self.app(scope, receive, send) return - headers = dict(scope.get("headers", [])) - raw_request_id = headers.get(b"x-request-id", b"") + raw_headers: Iterable[tuple[bytes, bytes]] = scope["headers"] + headers = {name: value for name, value in raw_headers} + + raw_request_id = headers.get(b"x-request-id") request_id = raw_request_id.decode() if raw_request_id else str(uuid.uuid4()) + context: dict[str, str] = { + "request_id": request_id, + "method": scope["method"], + "path": scope["path"], + } + for header_name, log_key in _LOGGED_HEADERS.items(): + value = headers.get(header_name) + if value is not None: + context[log_key] = value.decode("latin-1") + structlog.contextvars.clear_contextvars() - structlog.contextvars.bind_contextvars( - request_id=request_id, - method=scope["method"], - path=scope["path"], - ) + structlog.contextvars.bind_contextvars(**context) + await self.app(scope, receive, send) From 7ac7a57cc3f6ee3c121ce60676639591fc3b1dbd Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 11 Jun 2026 10:09:03 -0700 Subject: [PATCH 334/591] Removed unused gateway secret check --- mpcontribs-api/src/mpcontribs_api/_openapi.py | 1 - mpcontribs-api/src/mpcontribs_api/app.py | 3 +-- mpcontribs-api/src/mpcontribs_api/dependencies.py | 12 +----------- 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/_openapi.py b/mpcontribs-api/src/mpcontribs_api/_openapi.py index b041f048d9..fcd06c91cc 100644 --- a/mpcontribs-api/src/mpcontribs_api/_openapi.py +++ b/mpcontribs-api/src/mpcontribs_api/_openapi.py @@ -17,7 +17,6 @@ "retrieve its data or view it on the Portal. Contribution components (tables, structures, and attachments) are " "deleted along with a contribution.", }, - # TODO: Check that this is the right link { "name": "structures", "description": "are [pymatgen structures](https://pymatgen.org/pymatgen.electronic_structure.html) which can " diff --git a/mpcontribs-api/src/mpcontribs_api/app.py b/mpcontribs-api/src/mpcontribs_api/app.py index 1056b92a86..ca5cb8b588 100644 --- a/mpcontribs-api/src/mpcontribs_api/app.py +++ b/mpcontribs-api/src/mpcontribs_api/app.py @@ -11,7 +11,6 @@ from mpcontribs_api.api.v1.router import router as v1_router from mpcontribs_api.auth import api_key_scheme from mpcontribs_api.config import Settings, get_settings -from mpcontribs_api.dependencies import verify_gateway from mpcontribs_api.domains.attachments.models import Attachment from mpcontribs_api.domains.contributions.models import Contribution from mpcontribs_api.domains.healthcheck.router import router as healthcheck_router @@ -96,7 +95,7 @@ def create_app(settings: Settings | None = None) -> FastAPI: app.add_middleware(RequestContextMiddleware) register_exception_handlers(app) app.include_router(healthcheck_router, prefix="/health") - app.include_router(v1_router, prefix="/api/v1", dependencies=[Depends(verify_gateway)]) + app.include_router(v1_router, prefix="/api/v1") return app diff --git a/mpcontribs-api/src/mpcontribs_api/dependencies.py b/mpcontribs-api/src/mpcontribs_api/dependencies.py index 83e31ba38a..3b68834e8a 100644 --- a/mpcontribs-api/src/mpcontribs_api/dependencies.py +++ b/mpcontribs-api/src/mpcontribs_api/dependencies.py @@ -1,8 +1,7 @@ -import hmac from typing import Annotated import structlog -from fastapi import Depends, Header, Request +from fastapi import Depends, Request from pymongo import AsyncMongoClient from pymongo.asynchronous.database import AsyncDatabase @@ -10,21 +9,12 @@ from mpcontribs_api.config import get_settings from mpcontribs_api.exceptions import ( AuthenticationError, - GatewayError, PermissionError, ) settings = get_settings() -def verify_gateway(x_gateway_secret: Annotated[str | None, Header()] = None) -> None: - """Ensures the current access attempt is coming through Kong.""" - if x_gateway_secret is None or not hmac.compare_digest( - x_gateway_secret, settings.kong.gateway_secret.get_secret_value() - ): - raise GatewayError("direct access not permitted") - - def get_db(request: Request) -> AsyncDatabase: return request.app.state.db From 30db0423d3f41ae8582b852ff2d7d807288ac25e Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 11 Jun 2026 10:16:13 -0700 Subject: [PATCH 335/591] Moved router tagging to the api router --- mpcontribs-api/src/mpcontribs_api/api/v1/router.py | 10 +++++----- .../src/mpcontribs_api/domains/attachments/router.py | 2 +- .../src/mpcontribs_api/domains/contributions/router.py | 2 +- .../src/mpcontribs_api/domains/projects/router.py | 2 +- .../src/mpcontribs_api/domains/structures/router.py | 2 +- .../src/mpcontribs_api/domains/tables/router.py | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/api/v1/router.py b/mpcontribs-api/src/mpcontribs_api/api/v1/router.py index 099d88ccc4..13dab175ce 100644 --- a/mpcontribs-api/src/mpcontribs_api/api/v1/router.py +++ b/mpcontribs-api/src/mpcontribs_api/api/v1/router.py @@ -8,8 +8,8 @@ router = APIRouter() -router.include_router(attachments_router, prefix="/attachments") -router.include_router(contributions_router, prefix="/contributions") -router.include_router(projects_router, prefix="/projects") -router.include_router(structures_router, prefix="/structures") -router.include_router(tables_router, prefix="/tables") +router.include_router(attachments_router, prefix="/attachments", tags=["attachments"]) +router.include_router(contributions_router, prefix="/contributions", tags=["contributions"]) +router.include_router(projects_router, prefix="/projects", tags=["projects"]) +router.include_router(structures_router, prefix="/structures", tags=["structures"]) +router.include_router(tables_router, prefix="/tables", tags=["tables"]) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py b/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py index 2b535917f3..50bba3df61 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py @@ -10,7 +10,7 @@ from mpcontribs_api.domains.structures.models import StructureFilter, StructureOut from mpcontribs_api.pagination import CursorParams, Page -router = APIRouter(tags=["attachments"]) +router = APIRouter() @router.get("", response_model=Page[StructureOut]) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py index ce2050e107..3d52abe2df 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py @@ -15,7 +15,7 @@ ) from mpcontribs_api.pagination import CursorParams -router = APIRouter(tags=["contributions"]) +router = APIRouter() @router.get("") diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py index a89a67ba28..4b0f3704f1 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py @@ -14,7 +14,7 @@ ) from mpcontribs_api.pagination import CursorParams -router = APIRouter(tags=["projects"]) +router = APIRouter() # Brendan TODO: Add in option to select ProjectSummary or ProjectOut diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py index f16302e9df..a76113cb16 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py @@ -11,7 +11,7 @@ from mpcontribs_api.domains.structures.models import StructureFilter, StructureIn, StructureOut, StructurePatch from mpcontribs_api.pagination import CursorParams, Page -router = APIRouter(tags=["structures"]) +router = APIRouter() @router.get("", response_model=Page[StructureOut]) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py index b72a752c77..3c5dbf80be 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py @@ -11,7 +11,7 @@ from mpcontribs_api.domains.tables.models import Table, TableFilter, TableIn, TableOut, TablePatch from mpcontribs_api.pagination import CursorParams, Page -router = APIRouter(tags=["tables"]) +router = APIRouter() @router.get("", response_model=Page[TableOut]) From 566ade4d961d4484154d025e492355c3543fdf2e Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 11 Jun 2026 10:57:08 -0700 Subject: [PATCH 336/591] Updated tests to account for new code --- mpcontribs-api/.env.example | 4 +- mpcontribs-api/tests/integration/conftest.py | 34 -------- .../db/test_contributions_repository.py | 10 ++- .../db/test_projects_repository.py | 7 +- .../tests/integration/test_gateway.py | 67 ---------------- .../unit/domains/test_contribution_service.py | 80 +++++++++---------- 6 files changed, 49 insertions(+), 153 deletions(-) delete mode 100644 mpcontribs-api/tests/integration/test_gateway.py diff --git a/mpcontribs-api/.env.example b/mpcontribs-api/.env.example index f560aed0dd..dd2540996c 100644 --- a/mpcontribs-api/.env.example +++ b/mpcontribs-api/.env.example @@ -3,9 +3,9 @@ MPCONTRIBS_ENVIRONMENT=dev MPCONTRIBS_MONGO__URI=mongodb+srv://:@host.hash.mongodb.net/?appName=database-name MPCONTRIBS_MONGO__DB_NAME=database-name -MPCONTRIBS_REDIS_ADDRESS=redis-address +MPCONTRIBS_REDIS_ADDRESS=redis-address # placeholder; not used yet MPCONTRIBS_REDIS_URL=redis-url -MPCONTRIBS_MAIL_DEFAULT_SENDER=mail-default-sender +MPCONTRIBS_MAIL_DEFAULT_SENDER=mail-default-sender # placeholder; not used yet MPCONTRIBS_VERSION=version diff --git a/mpcontribs-api/tests/integration/conftest.py b/mpcontribs-api/tests/integration/conftest.py index 38b7782765..a906f94a27 100644 --- a/mpcontribs-api/tests/integration/conftest.py +++ b/mpcontribs-api/tests/integration/conftest.py @@ -93,35 +93,6 @@ async def _noop_lifespan(app: FastAPI): return app -def make_gateway_app() -> FastAPI: - """Like make_test_app() but with real gateway enforcement. - - Used by gateway-specific tests to exercise the actual x-gateway-secret - header validation through the full HTTP cycle. - """ - from fastapi import Depends - - from mpcontribs_api.dependencies import verify_gateway - - @asynccontextmanager - async def _noop_lifespan(app: FastAPI): - app.state.db = MagicMock() - yield - - app = FastAPI( - title="mpcontribs-gateway-test", - lifespan=_noop_lifespan, - dependencies=[Depends(verify_gateway)], - ) - app.add_middleware(RequestContextMiddleware) - register_exception_handlers(app) - - from mpcontribs_api.api.v1.router import router as v1_router - - app.include_router(v1_router, prefix="/api/v1") - return app - - # --------------------------------------------------------------------------- # Shared fixtures # --------------------------------------------------------------------------- @@ -132,11 +103,6 @@ def test_app() -> FastAPI: return make_test_app() -@pytest.fixture(scope="session") -def gateway_app() -> FastAPI: - return make_gateway_app() - - @pytest.fixture def client(test_app: FastAPI): """Function-scoped client; dependency overrides are cleared after each test.""" diff --git a/mpcontribs-api/tests/integration/db/test_contributions_repository.py b/mpcontribs-api/tests/integration/db/test_contributions_repository.py index 396043a0f2..0aa09fda9d 100644 --- a/mpcontribs-api/tests/integration/db/test_contributions_repository.py +++ b/mpcontribs-api/tests/integration/db/test_contributions_repository.py @@ -21,7 +21,7 @@ ContributionPatch, ) from mpcontribs_api.domains.contributions.repository import MongoDbContributionRepository -from mpcontribs_api.exceptions import ValidationError +from mpcontribs_api.exceptions import NotFoundError, ValidationError from mpcontribs_api.pagination import CursorParams pytestmark = [pytest.mark.db, pytest.mark.asyncio(loop_scope="session")] @@ -437,8 +437,9 @@ async def test_deleted_doc_not_found_afterwards(self, db): found = await Contribution.find_one(Contribution.id == doc.id) assert found is None - async def test_delete_nonexistent_is_silent(self, db): - await _repo(ADMIN).delete_contribution_by_id(str(PydanticObjectId())) + async def test_delete_nonexistent_throws_error(self, db): + with pytest.raises(NotFoundError, match="not found"): + await _repo(ADMIN).delete_contribution_by_id(str(PydanticObjectId())) async def test_raises_validation_error_for_bad_id(self, db): with pytest.raises(ValidationError): @@ -446,7 +447,8 @@ async def test_raises_validation_error_for_bad_id(self, db): async def test_anon_cannot_delete_private_doc(self, db): doc = await _insert(identifier="del-anon-priv", is_public=False) - await _repo(ANON).delete_contribution_by_id(str(doc.id)) + with pytest.raises(NotFoundError, match="not found"): + await _repo(ANON).delete_contribution_by_id(str(doc.id)) # Scope prevents anonymous from seeing the doc, so it is never deleted. still_there = await Contribution.find_one(Contribution.id == doc.id) assert still_there is not None diff --git a/mpcontribs-api/tests/integration/db/test_projects_repository.py b/mpcontribs-api/tests/integration/db/test_projects_repository.py index e7dfdbf397..5affc40aec 100644 --- a/mpcontribs-api/tests/integration/db/test_projects_repository.py +++ b/mpcontribs-api/tests/integration/db/test_projects_repository.py @@ -275,9 +275,10 @@ async def test_deleted_project_not_in_default_query(self, db): ids = {p.id for p in page.items} assert "del-me" not in ids - async def test_delete_nonexistent_is_silent(self, db): - # delete_project_by_id does find_one().delete() — no error if not found - await _repo(ADMIN).delete_project_by_id(id="ghost-id") + async def test_delete_nonexistent_throws_error(self, db): + # delete_project_by_id does find_one().delete() — Error if not found + with pytest.raises(NotFoundError, match="not found"): + await _repo(ADMIN).delete_project_by_id(id="ghost-id") # --------------------------------------------------------------------------- diff --git a/mpcontribs-api/tests/integration/test_gateway.py b/mpcontribs-api/tests/integration/test_gateway.py deleted file mode 100644 index 98540efbc6..0000000000 --- a/mpcontribs-api/tests/integration/test_gateway.py +++ /dev/null @@ -1,67 +0,0 @@ -"""Integration tests for the Kong gateway secret verification. - -verify_gateway() is applied as an app-level dependency in production. The -gateway_app fixture (from conftest) keeps that dependency active so we can -test enforcement through the full HTTP cycle without a real database. - -The correct header value is the plain secret configured in settings -(MPCONTRIBS_KONG__GATEWAY_SECRET=test-gateway-secret, set in the root -conftest.py). The mock project/contribution repos are also overridden here so -that a passing gateway request reaches a route and returns a non-gateway error. -""" - -from unittest.mock import AsyncMock - -import pytest - -from mpcontribs_api.domains.contributions.dependencies import get_scoped_contributions -from mpcontribs_api.domains.projects.dependencies import get_scoped_projects -from mpcontribs_api.pagination import Page -from tests.integration.conftest import GATEWAY_SECRET - - -@pytest.fixture(autouse=True) -def _stub_repos(gateway_app): - """Inject no-op mock repos so gateway-passing requests don't hit Beanie.""" - proj_repo = AsyncMock() - proj_repo.get_projects.return_value = Page(items=[], next_cursor=None) - contrib_repo = AsyncMock() - contrib_repo.get_contributions.return_value = Page(items=[], next_cursor=None) - - gateway_app.dependency_overrides[get_scoped_projects] = lambda: proj_repo - gateway_app.dependency_overrides[get_scoped_contributions] = lambda: contrib_repo - yield - gateway_app.dependency_overrides.clear() - - -class TestGatewayEnforcement: - def test_missing_header_returns_403(self, gateway_client): - r = gateway_client.get("/api/v1/projects") - assert r.status_code == 403 - - def test_wrong_secret_returns_403(self, gateway_client): - r = gateway_client.get("/api/v1/projects", headers={"x-gateway-secret": "wrong-secret"}) - assert r.status_code == 403 - - def test_missing_header_error_code(self, gateway_client): - r = gateway_client.get("/api/v1/projects") - assert r.json()["error"]["code"] == "gateway_error" - - def test_correct_secret_passes_gateway(self, gateway_client): - r = gateway_client.get( - "/api/v1/projects", - headers={"x-gateway-secret": GATEWAY_SECRET}, - ) - # Request reached the route — not 403 - assert r.status_code != 403 - - def test_correct_secret_on_contributions(self, gateway_client): - r = gateway_client.get( - "/api/v1/contributions", - headers={"x-gateway-secret": GATEWAY_SECRET}, - ) - assert r.status_code != 403 - - def test_empty_string_secret_returns_403(self, gateway_client): - r = gateway_client.get("/api/v1/projects", headers={"x-gateway-secret": ""}) - assert r.status_code == 403 diff --git a/mpcontribs-api/tests/unit/domains/test_contribution_service.py b/mpcontribs-api/tests/unit/domains/test_contribution_service.py index b1050e0727..e72f59a824 100644 --- a/mpcontribs-api/tests/unit/domains/test_contribution_service.py +++ b/mpcontribs-api/tests/unit/domains/test_contribution_service.py @@ -165,7 +165,6 @@ def _make_service( structures=struct_repo, tables=table_repo, attachments=attach_repo, - write_slots=write_slots or asyncio.Semaphore(50), settings=settings or _make_mongo_settings(), ) return svc, contrib_repo, struct_repo, table_repo, attach_repo, client @@ -319,11 +318,10 @@ async def _insert(doc, session=None): async def test_session_threaded_to_all_repo_calls(self): client, session = _make_fake_client() - svc, contrib_repo, struct_repo, table_repo, attach_repo, _ = _make_service(client=client) + svc, contrib_repo, struct_repo, table_repo, _, _ = _make_service(client=client) struct_repo.insert_structures.return_value = [_fake_structure()] table_repo.insert_tables.return_value = [_fake_table()] - attach_repo.insert_attachments.return_value = [_fake_attachment()] async def _insert(doc, session=None): return doc @@ -336,10 +334,8 @@ async def _insert(doc, session=None): attachments=[_attachment_in()], ) await svc.insert_contributions([contrib]) - assert struct_repo.insert_structures.call_args.kwargs["session"] is session assert table_repo.insert_tables.call_args.kwargs["session"] is session - assert attach_repo.insert_attachments.call_args.kwargs["session"] is session assert contrib_repo.insert_contribution.call_args.kwargs["session"] is session async def test_failure_on_second_of_three_yields_summary(self): @@ -567,53 +563,51 @@ async def test_same_key_concurrent_upserts_both_go_through_atomic_call(self): # --------------------------------------------------------------------------- -class TestProcessWideWriteSlots: - async def test_upsert_acquires_global_write_slot(self): - write_slots = asyncio.Semaphore(1) - svc, contrib_repo, *_ = _make_service(write_slots=write_slots) - - in_flight = 0 - peak = 0 - - async def _upsert(identifiers, contrib): - nonlocal in_flight, peak - in_flight += 1 - peak = max(peak, in_flight) - await asyncio.sleep(0) # let other coroutines try to enter - in_flight -= 1 - return MagicMock(spec=Contribution) +# class TestProcessWideWriteSlots: +# async def test_upsert_acquires_global_write_slot(self): +# write_slots = asyncio.Semaphore(1) +# svc, contrib_repo, *_ = _make_service(write_slots=write_slots) - contrib_repo.upsert_contribution_by_identifiers.side_effect = _upsert +# in_flight = 0 +# peak = 0 - contribs = [_contrib_in(identifier=f"mp-{i}") for i in range(5)] - await svc.upsert_contributions(contribs) +# async def _upsert(identifiers, contrib): +# nonlocal in_flight, peak +# in_flight += 1 +# peak = max(peak, in_flight) +# await asyncio.sleep(0) # let other coroutines try to enter +# in_flight -= 1 +# return MagicMock(spec=Contribution) - assert peak == 1 # global semaphore of 1 must serialize all 5 +# contrib_repo.upsert_contribution_by_identifiers.side_effect = _upsert - async def test_insert_with_components_acquires_global_write_slot(self): - write_slots = asyncio.Semaphore(1) - svc, contrib_repo, struct_repo, table_repo, attach_repo, _ = _make_service(write_slots=write_slots) +# contribs = [_contrib_in(identifier=f"mp-{i}") for i in range(5)] +# await svc.upsert_contributions(contribs) - struct_repo.insert_structures.return_value = [_fake_structure()] - table_repo.insert_tables.return_value = [] - attach_repo.insert_attachments.return_value = [] +# assert peak == 1 # global semaphore of 1 must serialize all 5 - in_flight = 0 - peak = 0 +# async def test_insert_with_components_acquires_global_write_slot(self): +# write_slots = asyncio.Semaphore(1) +# svc, contrib_repo, struct_repo, table_repo, attach_repo, _ = _make_service(write_slots=write_slots) - async def _insert(doc, session=None): - nonlocal in_flight, peak - in_flight += 1 - peak = max(peak, in_flight) - await asyncio.sleep(0) - in_flight -= 1 - return doc +# struct_repo.insert_structures.return_value = [_fake_structure()] +# table_repo.insert_tables.return_value = [] +# attach_repo.insert_attachments.return_value = [] - contrib_repo.insert_contribution.side_effect = _insert +# in_flight = 0 +# peak = 0 - contribs = [_contrib_in(identifier=f"c{i}", structures=[_structure_in()]) for i in range(4)] - await svc.insert_contributions(contribs) +# async def _insert(doc, session=None): +# nonlocal in_flight, peak +# in_flight += 1 +# peak = max(peak, in_flight) +# await asyncio.sleep(0) +# in_flight -= 1 +# return doc - assert peak == 1 +# contrib_repo.insert_contribution.side_effect = _insert +# contribs = [_contrib_in(identifier=f"c{i}", structures=[_structure_in()]) for i in range(4)] +# await svc.insert_contributions(contribs) +# assert peak == 1 From 4d32dea35d77f8dab04ddbdd36aee534eff0ddd7 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 11 Jun 2026 11:30:04 -0700 Subject: [PATCH 337/591] Changed exception handling and modified variable names to be descriptive rather than one letter --- .../domains/contributions/service.py | 8 ++--- .../src/mpcontribs_api/exceptions.py | 32 +++++++++++-------- 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py index 63ccd0d732..34994a73c0 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py @@ -103,13 +103,13 @@ async def insert_contributions( def _reject_duplicate_keys(self, contributions: list[ContributionIn]) -> None: """Reject the whole batch if any (project, identifier) appears more than once. - Mongo would surface this as a write conflict per item; catching it upfront keeps a guaranteed + Mongo would surface this as a duplicate key error; catching it upfront keeps a guaranteed failure from consuming a transaction slot and gives the caller all offending indices at once. """ seen: dict[tuple[str, str], list[int]] = defaultdict(list) - for i, c in enumerate(contributions): - seen[(c.project, c.identifier)].append(i) - duplicates = sorted(i for indices in seen.values() if len(indices) > 1 for i in indices) + for index, contribution in enumerate(contributions): + seen[(contribution.project, contribution.identifier)].append(index) + duplicates = sorted(index for indices in seen.values() if len(indices) > 1 for index in indices) if duplicates: raise ValidationError( "Duplicate (project, identifier) pairs in batch", diff --git a/mpcontribs-api/src/mpcontribs_api/exceptions.py b/mpcontribs-api/src/mpcontribs_api/exceptions.py index ab157afd2b..fc0d1fbb7d 100644 --- a/mpcontribs-api/src/mpcontribs_api/exceptions.py +++ b/mpcontribs-api/src/mpcontribs_api/exceptions.py @@ -1,9 +1,11 @@ from __future__ import annotations +from collections.abc import Sequence from typing import Any import structlog from fastapi import FastAPI, Request +from fastapi.encoders import jsonable_encoder from fastapi.exceptions import RequestValidationError from fastapi.responses import JSONResponse from starlette.exceptions import HTTPException as StarletteHTTPException @@ -54,11 +56,6 @@ class AuthenticationError(AppError): error_code = "authentication_error" -class GatewayError(AppError): - status_code = 403 - error_code = "gateway_error" - - def _error_body(error_code: str, message: str, **public_context) -> dict: body: dict[str, Any] = {"error": {"code": error_code, "message": message}} if public_context: @@ -66,6 +63,11 @@ def _error_body(error_code: str, message: str, **public_context) -> dict: return body +def _sanitize_validation_errors(errors: Sequence[Any]) -> list[dict[str, Any]]: + """Drop the echoed input value and pydantic doc URL from each error.""" + return [{key: value for key, value in error.items() if key not in ("input", "url")} for error in errors] + + def register_exception_handlers(app: FastAPI) -> None: """Register all exception handlers to the app. @@ -75,12 +77,10 @@ def register_exception_handlers(app: FastAPI) -> None: @app.exception_handler(AppError) async def _handle_app_error(request: Request, exc: AppError) -> JSONResponse: - log = logger.error if exc.status_code >= 500 else logger.info - log( - exc.error_code, - status_code=exc.status_code, - **exc.context, # full context to logs - ) + if exc.status_code >= 500: + logger.error(exc.error_code, status_code=exc.status_code, exc_info=exc, **exc.context) + else: + logger.info(exc.error_code, status_code=exc.status_code, **exc.context) return JSONResponse( status_code=exc.status_code, content=_error_body( @@ -88,7 +88,7 @@ async def _handle_app_error(request: Request, exc: AppError) -> JSONResponse: exc.message, # NOTE: not leaking context to client yet # - need to make client-safe (no leakage of secrets) on a per-exception type basis - # **exc.contrxt + # **exc.context ), ) @@ -103,10 +103,14 @@ async def _handle_unexpected(request: Request, exc: Exception) -> JSONResponse: # Unify validation errors from pydantic with our exception format @app.exception_handler(RequestValidationError) - async def _handle_validation(request, exc): + async def _handle_validation(_request: Request, exc: RequestValidationError) -> JSONResponse: return JSONResponse( status_code=422, - content=_error_body("validation_error", "Request validation failed", errors=exc.errors()), + content=_error_body( + "validation_error", + "Request validation failed", + errors=jsonable_encoder(_sanitize_validation_errors(exc.errors())), + ), ) # Unify http exceptions from starlette with our exception format From d153928ba255912961ef594ddc4e141fe5793dad Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 11 Jun 2026 11:41:36 -0700 Subject: [PATCH 338/591] Removed old settings reference and scoped contribution access to project user.groups --- mpcontribs-api/src/mpcontribs_api/config.py | 3 --- .../src/mpcontribs_api/domains/contributions/repository.py | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/config.py b/mpcontribs-api/src/mpcontribs_api/config.py index 6a7e3a673c..b3891611ac 100644 --- a/mpcontribs-api/src/mpcontribs_api/config.py +++ b/mpcontribs-api/src/mpcontribs_api/config.py @@ -99,9 +99,6 @@ def _clamp_concurrency(self): per_request_cap = max(1, self.max_pool_size // 2) if self.max_concurrent_transactions > per_request_cap: self.max_concurrent_transactions = per_request_cap - global_cap = max(1, self.max_pool_size - 10) - if self.max_global_concurrent_writes > global_cap: - self.max_global_concurrent_writes = global_cap return self diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py index 7654c4997f..a412225313 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py @@ -43,7 +43,7 @@ def _build_scope(user: User) -> dict[str, Any]: ors: list[dict[str, Any]] = [{"is_public": True}] if not user.is_anonymous: if user.groups: - ors.append({"_id": {"$in": sorted(user.groups)}}) + ors.append({"project": {"$in": sorted(user.groups)}}) return {"$or": ors} async def get_contributions( From 84ca1d1544bbec1355ee967e91b2bf81b1393ea0 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 11 Jun 2026 13:07:58 -0700 Subject: [PATCH 339/591] DeleteResponse now consumes a DeleteResult to allow for easier expansion later. MongoDbRepo now allows deleting multiple ids at once --- .../mpcontribs_api/domains/_shared/models.py | 5 +++++ .../domains/_shared/repository.py | 20 ++++++++++++++++++- .../domains/contributions/service.py | 4 ++-- 3 files changed, 26 insertions(+), 3 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py index 48c3bfeec5..655629ed1e 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py @@ -2,6 +2,7 @@ from beanie import DocumentWithSoftDelete, PydanticObjectId from pydantic import BaseModel, Field +from pymongo.results import DeleteResult from mpcontribs_api import pagination from mpcontribs_api.projection import SparseFieldsModel @@ -46,3 +47,7 @@ class DocumentOut[TId](SparseFieldsModel): class DeleteResponse(BaseModel): num_deleted: int + + @classmethod + def from_delete_result(cls, delete_result: DeleteResult) -> Self: + return cls(num_deleted=delete_result.deleted_count) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py index d7222db7f9..1d9e0a4f71 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py @@ -2,7 +2,7 @@ from typing import Any from beanie import PydanticObjectId, UpdateResponse -from beanie.operators import Set +from beanie.operators import In, Set from bson.errors import InvalidId from fastapi_filter.contrib.beanie import Filter from pydantic import BaseModel @@ -130,6 +130,24 @@ async def delete_by_id(self, id: Any, session: AsyncClientSession | None = None) await doc.delete(session=session) return DeleteResponse(num_deleted=1) + async def delete_by_ids(self, ids: list[Any], session: AsyncClientSession | None = None) -> DeleteResponse: + """Delete multiple documents by id. + + Args: + ids (list[Any]): list of ids to delete + session: the session to perform the deletes within + + Returns: + DeleteResponse: the result of the deletion + """ + docs = self.document_model.find(In(self.document_model.id, ids), session=session) + if not docs: + raise NotFoundError("No documents with specified ids found", ids=ids) + delete_result = await docs.delete_many(session=session) + if not delete_result: + raise ValidationError("DeleteResult not returned internally") + return DeleteResponse.from_delete_result(delete_result) + async def patch(self, id: Any, update: TPatch) -> TDoc: """Partially update a single scoped document by id. diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py index 34994a73c0..4d7cf1a562 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py @@ -308,8 +308,8 @@ async def delete_contributions(self, filter: ContributionFilter) -> BulkDeleteSu for field, repo in self._children.items(): ids = [link.ref.id for c in page.items for link in getattr(c, field)] if ids: - deleted_components = await repo.delete_by_ids(ids) # pyright: ignore[reportAttributeAccessIssue] - num_deleted_components += deleted_components.deleted_count if deleted_components else 0 + deleted_components = await repo.delete_by_ids(ids) + num_deleted_components += deleted_components.num_deleted if deleted_components else 0 # Delete Contributions in this batch by ID # need to make a new filter so we don't eagerly delete all contributions before their components are deleted From 09669795822e161c631be8dbcb869ffae0444f23 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 11 Jun 2026 13:08:16 -0700 Subject: [PATCH 340/591] Removed vestigial GatewayError references --- mpcontribs-api/CLAUDE.md | 2 +- .../tests/unit/domains/test_contributions_models.py | 4 ++-- mpcontribs-api/tests/unit/test_exceptions.py | 12 ------------ 3 files changed, 3 insertions(+), 15 deletions(-) diff --git a/mpcontribs-api/CLAUDE.md b/mpcontribs-api/CLAUDE.md index 61a9534f67..3797e1dcf4 100644 --- a/mpcontribs-api/CLAUDE.md +++ b/mpcontribs-api/CLAUDE.md @@ -78,7 +78,7 @@ The `_fields` query parameter (handled in `projection.py`) lets callers request ### Exception hierarchy -`exceptions.py` defines `AppError` subclasses (`NotFoundError`, `ConflictError`, `ValidationError`, `AuthenticationError`, `PermissionError`, `GatewayError`). All carry `status_code`, `error_code`, `message`, and a `context` dict. Handlers in `app.py` convert them to a uniform JSON shape; internal context is logged but not sent to clients. +`exceptions.py` defines `AppError` subclasses (`NotFoundError`, `ConflictError`, `ValidationError`, `AuthenticationError`, `PermissionError`). All carry `status_code`, `error_code`, `message`, and a `context` dict. Handlers in `app.py` convert them to a uniform JSON shape; internal context is logged but not sent to clients. ### Observability diff --git a/mpcontribs-api/tests/unit/domains/test_contributions_models.py b/mpcontribs-api/tests/unit/domains/test_contributions_models.py index f6ce20b89d..98d2a3d48b 100644 --- a/mpcontribs-api/tests/unit/domains/test_contributions_models.py +++ b/mpcontribs-api/tests/unit/domains/test_contributions_models.py @@ -215,9 +215,9 @@ def test_authed_user_scope_includes_is_public(self): def test_authed_user_with_groups_has_group_id_clause(self): user = User(username="u@example.com", groups=frozenset({"g1", "g2"})) ors = MongoDbContributionRepository._build_scope(user)["$or"] - group_clause = next((c for c in ors if "_id" in c), None) + group_clause = next((c for c in ors if "project" in c), None) assert group_clause is not None - assert set(group_clause["_id"]["$in"]) == {"g1", "g2"} + assert set(group_clause["project"]["$in"]) == {"g1", "g2"} def test_authed_user_no_groups_has_no_group_id_clause(self): user = User(username="u@example.com", groups=frozenset()) diff --git a/mpcontribs-api/tests/unit/test_exceptions.py b/mpcontribs-api/tests/unit/test_exceptions.py index 77d085f102..a01d033051 100644 --- a/mpcontribs-api/tests/unit/test_exceptions.py +++ b/mpcontribs-api/tests/unit/test_exceptions.py @@ -4,7 +4,6 @@ AppError, AuthenticationError, ConflictError, - GatewayError, NotFoundError, PermissionError, ValidationError, @@ -126,17 +125,6 @@ def test_is_app_error(self): assert issubclass(AuthenticationError, AppError) -class TestGatewayError: - def test_status_code(self): - assert GatewayError.status_code == 403 - - def test_error_code(self): - assert GatewayError.error_code == "gateway_error" - - def test_is_app_error(self): - assert issubclass(GatewayError, AppError) - - class TestExceptionRaising: def test_not_found_can_be_raised_and_caught(self): with pytest.raises(NotFoundError) as exc_info: From b47ceff105831279a63bc6373b6c0bd7cd3e1a0d Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 11 Jun 2026 13:22:51 -0700 Subject: [PATCH 341/591] Contribution.data validation for depth <= 7 --- .../domains/contributions/models.py | 29 +++++++++++++++---- .../domains/contributions/service.py | 1 + 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py index b8b19d22f4..6ee908c68d 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py @@ -1,5 +1,5 @@ from datetime import UTC, datetime -from typing import Any +from typing import Annotated, Any from beanie import ( Insert, @@ -13,7 +13,7 @@ ) from fastapi_filter import FilterDepends, with_prefix from fastapi_filter.contrib.beanie import Filter -from pydantic import Field, field_validator +from pydantic import BeforeValidator, Field, field_validator from pymongo import ASCENDING, IndexModel from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut @@ -21,14 +21,32 @@ from mpcontribs_api.domains.attachments.models import Attachment, AttachmentFilter, AttachmentIn from mpcontribs_api.domains.structures.models import Structure, StructureFilter, StructureIn from mpcontribs_api.domains.tables.models import Table, TableFilter, TableIn +from mpcontribs_api.exceptions import ValidationError from mpcontribs_api.projection import SparseFieldsModel +def _get_dict_depth(x) -> int: + if isinstance(x, dict): + return 1 + max((_get_dict_depth(v) for v in x.values()), default=0) + elif isinstance(x, list): + return max((_get_dict_depth(item) for item in x), default=0) + return 0 + + +def _validate_data_depth(data: dict[str, Any] | None) -> dict[str, Any] | None: + if not data: + return None + depth = _get_dict_depth(data) + if depth > 7: + raise ValidationError("Depth of Contribution.data must be <= 7.", depth=depth) + return data + + class ContributionBase(BaseDocumentWithInput[PydanticObjectId]): project: str identifier: str formula: str - data: dict[str, Any] + data: Annotated[dict[str, Any], BeforeValidator(_validate_data_depth)] # TODO: Verify that this should default to True and be passed by users needs_build: bool = True @@ -92,7 +110,7 @@ class ContributionOut(DocumentOut[PydanticObjectId]): is_public: bool | None = None last_modified: datetime | None = None needs_build: bool | None = None - data: dict[str, Any] | None = None + data: Annotated[dict[str, Any] | None, BeforeValidator(_validate_data_depth)] = None structures: list[Link[Structure]] | None = None tables: list[Link[Table]] | None = None attachments: list[Link[Attachment]] | None = None @@ -115,7 +133,7 @@ class ContributionPatch(SparseFieldsModel): identifier: str | None = None formula: str | None = None needs_build: bool | None = None - data: dict[str, Any] | None = None + data: Annotated[dict[str, Any] | None, BeforeValidator(_validate_data_depth)] = None structures: list[Link[Structure]] | None = None tables: list[Link[Table]] | None = None attachments: list[Link[Attachment]] | None = None @@ -151,5 +169,6 @@ class Constants(Filter.Constants): model = Contribution @field_validator("id", mode="before") + @classmethod def convert_str_to_oid(cls, v: str): return PydanticObjectId(v) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py index 4d7cf1a562..4b4c6ba0a4 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py @@ -299,6 +299,7 @@ async def delete_contributions(self, filter: ContributionFilter) -> BulkDeleteSu num_deleted_contributions = 0 # Loop through cursor rather than materialize arbitrary number of Contributions while True: + # Since we are deleting everything matching filter, we can continuously get the 1st page page = await self._contributions.get_contributions( pagination=CursorParams(cursor=None, limit=100), filter=filter, From d2fd1504f210727411844b67662a449e8f96d55e Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 11 Jun 2026 13:24:45 -0700 Subject: [PATCH 342/591] Disallow lists in Contribution.data --- .../src/mpcontribs_api/domains/contributions/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py index 6ee908c68d..f8b60918fe 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py @@ -29,7 +29,7 @@ def _get_dict_depth(x) -> int: if isinstance(x, dict): return 1 + max((_get_dict_depth(v) for v in x.values()), default=0) elif isinstance(x, list): - return max((_get_dict_depth(item) for item in x), default=0) + raise ValidationError("List encountered in Contribution.data") return 0 From 1146274abcacc690f12cd1dd923351bb97fb3c16 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 11 Jun 2026 14:30:02 -0700 Subject: [PATCH 343/591] Added more validation to Contribution.data dict --- .../domains/contributions/models.py | 42 ++++++++++++++++--- .../unit/domains/test_contributions_models.py | 32 ++++++++++++++ 2 files changed, 69 insertions(+), 5 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py index f8b60918fe..4f506e0b77 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py @@ -1,3 +1,4 @@ +import re from datetime import UTC, datetime from typing import Annotated, Any @@ -29,12 +30,12 @@ def _get_dict_depth(x) -> int: if isinstance(x, dict): return 1 + max((_get_dict_depth(v) for v in x.values()), default=0) elif isinstance(x, list): - raise ValidationError("List encountered in Contribution.data") + return max((_get_dict_depth(item) for item in x), default=0) return 0 def _validate_data_depth(data: dict[str, Any] | None) -> dict[str, Any] | None: - if not data: + if data is None: return None depth = _get_dict_depth(data) if depth > 7: @@ -42,11 +43,34 @@ def _validate_data_depth(data: dict[str, Any] | None) -> dict[str, Any] | None: return data +# Forbid punctuation, excluding: '*', '/' and exactly 1 '|' anywhere in string +_DATA_PUNCTUATION_PATTERN = re.compile(r"(?![^|]*\|[^|]*\|)[^\x21-\x29\x2B-\x2E\x3A-\x40\x5B-\x5E\x60\x7B\x7D-\x7E]*") + + +def _validate_keys(data: dict[str, Any] | None) -> dict[str, Any] | None: + if data is None: + return None + if not all(isinstance(k, str) and k.isascii() for k in data.keys()): + raise ValidationError("Non-ASCII key found in Contribution.data. All dict keys must be only ASCII") + if any(_DATA_PUNCTUATION_PATTERN.fullmatch(k) is None for k in data.keys()): + raise ValidationError( + "Punctuation found in Contribution.data keys. Only '_', '*', '/', and at most 1 '|' permitted." + ) + for v in data.values(): + if isinstance(v, dict): + _validate_keys(v) + return data + + class ContributionBase(BaseDocumentWithInput[PydanticObjectId]): project: str identifier: str formula: str - data: Annotated[dict[str, Any], BeforeValidator(_validate_data_depth)] + data: Annotated[ + dict[str, Any], + BeforeValidator(_validate_data_depth), + BeforeValidator(_validate_keys), + ] # TODO: Verify that this should default to True and be passed by users needs_build: bool = True @@ -110,7 +134,11 @@ class ContributionOut(DocumentOut[PydanticObjectId]): is_public: bool | None = None last_modified: datetime | None = None needs_build: bool | None = None - data: Annotated[dict[str, Any] | None, BeforeValidator(_validate_data_depth)] = None + data: Annotated[ + dict[str, Any] | None, + BeforeValidator(_validate_data_depth), + BeforeValidator(_validate_keys), + ] = None structures: list[Link[Structure]] | None = None tables: list[Link[Table]] | None = None attachments: list[Link[Attachment]] | None = None @@ -133,7 +161,11 @@ class ContributionPatch(SparseFieldsModel): identifier: str | None = None formula: str | None = None needs_build: bool | None = None - data: Annotated[dict[str, Any] | None, BeforeValidator(_validate_data_depth)] = None + data: Annotated[ + dict[str, Any] | None, + BeforeValidator(_validate_data_depth), + BeforeValidator(_validate_keys), + ] = None structures: list[Link[Structure]] | None = None tables: list[Link[Table]] | None = None attachments: list[Link[Attachment]] | None = None diff --git a/mpcontribs-api/tests/unit/domains/test_contributions_models.py b/mpcontribs-api/tests/unit/domains/test_contributions_models.py index 98d2a3d48b..fc217492f5 100644 --- a/mpcontribs-api/tests/unit/domains/test_contributions_models.py +++ b/mpcontribs-api/tests/unit/domains/test_contributions_models.py @@ -13,6 +13,7 @@ ContributionOut, ContributionPatch, ) +from mpcontribs_api.exceptions import ValidationError # --------------------------------------------------------------------------- # Helpers @@ -97,6 +98,37 @@ def test_data_accepts_nested_structure(self): contrib = _make_contribution_in(data=nested) assert contrib.data["band_gap"]["value"] == 1.5 + def test_data_depth_validation(self): + max_nesting = {"lvl_1": {"lvl_2": {"lvl_3": {"lvl_4": {"lvl_5": {"lvl_6": {"lvl_7": "pass"}}}}}}} + invalid_nesting = {"lvl_1": {"lvl_2": {"lvl_3": {"lvl_4": {"lvl_5": {"lvl_6": {"lvl_7": {"lvl_8": "fail"}}}}}}}} + _make_contribution_in(data=max_nesting) + assert True + with pytest.raises(ValidationError, match="Depth of Contribution.data"): + _make_contribution_in(data=invalid_nesting) + + def test_data_key_validation(self): + valid_punctuation = {"test*/|": "pass"} + invalid_punctuation = {"test.": "fail"} + too_many_pipes = {"test||": "fail"} + non_ascii = {"ΔE": "fail"} + _make_contribution_in(data=valid_punctuation) + assert True + with pytest.raises(ValidationError, match="Punctuation found in Contribution.data keys"): + _make_contribution_in(data=invalid_punctuation) + with pytest.raises(ValidationError, match="Punctuation found in Contribution.data keys"): + _make_contribution_in(data=too_many_pipes) + with pytest.raises(ValidationError, match="Non-ASCII key found in Contribution.data"): + _make_contribution_in(data=non_ascii) + + # There isn't currently value validation. This is to check that that is true + def test_data_value_validation(self): + pipes_in_values = {"test": "pass||"} + punctuation_in_values = {"test": "pass."} + ascii_in_values = {"test": "Δ"} + _make_contribution_in(data=pipes_in_values) + _make_contribution_in(data=punctuation_in_values) + _make_contribution_in(data=ascii_in_values) + assert True # --------------------------------------------------------------------------- # Contribution.from_input_model From 48ab295cff2cd1de07735a77b2494a3868c4f3c1 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Fri, 12 Jun 2026 10:31:06 -0700 Subject: [PATCH 344/591] Removed useless thin wrapper method --- .../mpcontribs_api/domains/_shared/components.py | 14 +++----------- .../domains/attachments/repository.py | 2 +- .../domains/structures/repository.py | 2 +- .../mpcontribs_api/domains/tables/repository.py | 2 +- 4 files changed, 6 insertions(+), 14 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py index 6044d07466..381747ecd0 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py @@ -28,7 +28,7 @@ class MongoDbComponentsRepository[ def _build_scope(user: User) -> dict[str, Any]: return {} - # TODO: Returned docs don't have IDs assigned to them + # TODO: The docs I return don't have ID yet, since they were created locally async def insert_components( self, components: list[TIn], @@ -42,6 +42,7 @@ async def insert_components( """ if not components: return [] + docs = [self.document_model.model_validate(t.model_dump()) for t in components] chunk_size = get_settings().mongo.component_insert_chunk_size for start in range(0, len(docs), chunk_size): @@ -55,7 +56,7 @@ async def insert_component(self, component: TIn) -> TDoc: component (TIn): the table to insert Returns: - TDpc: the component actually in the database + TDoc: the component actually in the database Raises: AppError: If insert_one returns None, raises @@ -66,15 +67,6 @@ async def insert_component(self, component: TIn) -> TDoc: raise AppError("Error inserting Table", table=component) return full_doc - async def get_components( - self, - filter: TFilter, - pagination: CursorParams, - fields: frozenset[str] | None, - ) -> Page[TOut]: - """Query the component collection, scoped to the current user. See ``get_many``.""" - return await self.get_many(pagination=pagination, filter=filter, fields=fields) - async def get_component_by_id(self, id: str, fields: frozenset[str] | None) -> TDoc | TOut | None: """Find a single table by id, scoped to the current user. See ``get_by_id``.""" return await self.get_by_id(id, fields) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/attachments/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/attachments/repository.py index f830b5d35a..b076eddcfa 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/attachments/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/attachments/repository.py @@ -29,7 +29,7 @@ async def get_attachments( fields: frozenset[str] | None, ) -> Page[AttachmentOut]: """Query the attachment collection, scoped to the current user. See ``get_many``.""" - return await self.get_components(pagination=pagination, filter=filter, fields=fields) + return await self.get_many(pagination=pagination, filter=filter, fields=fields) async def get_attachment_by_id(self, id: str, fields: frozenset[str] | None) -> Attachment | AttachmentOut | None: """Find a single table by id, scoped to the current user. See ``get_by_id``.""" diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/repository.py index 92155dd028..ac654b7588 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/structures/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/structures/repository.py @@ -56,7 +56,7 @@ async def get_structures( fields: frozenset[str] | None, ) -> Page[StructureOut]: """Query the structure collection, scoped to the current user. See ``get_many``.""" - return await self.get_components(pagination=pagination, filter=filter, fields=fields) + return await self.get_many(pagination=pagination, filter=filter, fields=fields) async def get_structure_by_id(self, id: str, fields: frozenset[str] | None) -> Structure | StructureOut | None: """Find a single table by id, scoped to the current user. See ``get_by_id``.""" diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py index 1184ded32b..5b3337524a 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py @@ -54,7 +54,7 @@ async def get_tables( fields: frozenset[str] | None, ) -> Page[TableOut]: """Query the table collection, scoped to the current user. See ``get_many``.""" - return await self.get_components(pagination=pagination, filter=filter, fields=fields) + return await self.get_many(pagination=pagination, filter=filter, fields=fields) async def get_table_by_id(self, id: str, fields: frozenset[str] | None) -> Table | TableOut | None: """Find a single table by id, scoped to the current user. See ``get_by_id``.""" From 9264bc3c6f5a1a2df6e4f049ff829f0b7157e151 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Fri, 12 Jun 2026 12:19:30 -0700 Subject: [PATCH 345/591] Inserting many components now validates by md5 hash and returns documents with their id --- .../domains/_shared/components.py | 49 ++++++++++++++----- .../mpcontribs_api/domains/_shared/models.py | 25 +++++++++- .../mpcontribs_api/domains/_shared/types.py | 2 +- .../domains/attachments/models.py | 7 ++- .../domains/structures/models.py | 7 ++- .../mpcontribs_api/domains/tables/models.py | 7 ++- .../domains/tables/repository.py | 2 +- 7 files changed, 72 insertions(+), 27 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py index 381747ecd0..a57ee7b940 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py @@ -4,22 +4,23 @@ from collections.abc import AsyncIterable from typing import Any, Literal +from beanie import PydanticObjectId +from beanie.operators import In from fastapi_filter.contrib.beanie import Filter from pydantic import BaseModel from pymongo.asynchronous.client_session import AsyncClientSession from mpcontribs_api.auth import User from mpcontribs_api.config import get_settings -from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DeleteResponse, DocumentOut +from mpcontribs_api.domains._shared.models import Component, DeleteResponse, DocumentOut from mpcontribs_api.domains._shared.repository import MongoDbRepository from mpcontribs_api.domains._shared.types import DownloadFormat from mpcontribs_api.exceptions import AppError -from mpcontribs_api.pagination import CursorParams, Page class MongoDbComponentsRepository[ - TDoc: BaseDocumentWithInput, - TIn: BaseModel, + TDoc: Component, + TIn: Component, TOut: DocumentOut, TFilter: Filter, # not FilterDepends — see below TPatch: BaseModel, @@ -28,7 +29,6 @@ class MongoDbComponentsRepository[ def _build_scope(user: User) -> dict[str, Any]: return {} - # TODO: The docs I return don't have ID yet, since they were created locally async def insert_components( self, components: list[TIn], @@ -40,14 +40,39 @@ async def insert_components( components (list[TIn]): components to insert session (AsyncClientSession): optional client session; pass when inserting inside a transaction """ - if not components: - return [] - - docs = [self.document_model.model_validate(t.model_dump()) for t in components] + by_md5 = {comp.md5: comp for comp in components} + + # Full fetch so existing docs come back with their ids + existing_docs = await self.document_model.find( + In(self.document_model.md5, list(by_md5.keys())), + session=session, + ).to_list() + existing_by_md5 = {doc.md5: doc for doc in existing_docs} + + # Assign ids manually: insert_many won't populate id back onto these + # objects, and get_dict drops id when it's None. + new_docs: list[TDoc] = [] + for md5, comp in by_md5.items(): + if md5 in existing_by_md5: + continue + doc = self.document_model.model_validate(comp.model_dump()) + doc.id = PydanticObjectId() + new_docs.append(doc) + + # TODO: Might want to delegate this logic to a higher level. This method might want to simply insert everything + # its given + # Insert by chunks chunk_size = get_settings().mongo.component_insert_chunk_size - for start in range(0, len(docs), chunk_size): - await self.document_model.insert_many(docs[start : start + chunk_size], ordered=False, session=session) - return docs + for start in range(0, len(new_docs), chunk_size): + await self.document_model.insert_many( + new_docs[start : start + chunk_size], + ordered=False, + session=session, + ) + + # Return a list of documents reflecting what was stored/found + resolved = existing_by_md5 | {doc.md5: doc for doc in new_docs} + return [resolved[md5] for md5 in by_md5] async def insert_component(self, component: TIn) -> TDoc: """Insert a single component. diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py index 655629ed1e..2d44eb7308 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py @@ -1,10 +1,15 @@ -from typing import Annotated, Any, Self +import hashlib +import json +import unicodedata +from collections.abc import Mapping +from typing import Annotated, Any, ClassVar, Self from beanie import DocumentWithSoftDelete, PydanticObjectId from pydantic import BaseModel, Field from pymongo.results import DeleteResult from mpcontribs_api import pagination +from mpcontribs_api.domains._shared.types import MD5Hash from mpcontribs_api.projection import SparseFieldsModel @@ -51,3 +56,21 @@ class DeleteResponse(BaseModel): @classmethod def from_delete_result(cls, delete_result: DeleteResult) -> Self: return cls(num_deleted=delete_result.deleted_count) + + +def canonical_md5(payload: Mapping[str, Any]) -> str: + """MD5 hex digest of a content mapping, stable across processes/hosts.""" + text = json.dumps(payload, sort_keys=True, separators=(",", ":"), ensure_ascii=False) + normalized = unicodedata.normalize("NFC", text) + return hashlib.md5(normalized.encode("utf-8")).hexdigest() + + +class Component(BaseDocumentWithInput[PydanticObjectId]): + name: str + md5: MD5Hash + + hash_fields: ClassVar[frozenset[str]] + + def compute_md5(self) -> str: + payload = self.model_dump(mode="json", include=set(self.hash_fields), by_alias=False) + return canonical_md5(payload) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py index 999439d4c4..cb85f71197 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py @@ -42,7 +42,7 @@ def _file_name_like_str(v: str) -> str: def _md5_like(v: str) -> str: v = v.strip().lower() if not _MD5.match(v): - raise ValidationError("must be a 32-character MD5 hex digest") + raise ValidationError("must be a 32-character MD5 hex digest", md5=v) return v diff --git a/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py b/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py index e32c8af0d9..ee00288fdb 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py @@ -1,14 +1,13 @@ from beanie import PydanticObjectId from fastapi_filter.contrib.beanie import Filter -from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut +from mpcontribs_api.domains._shared.models import Component, DocumentOut from mpcontribs_api.domains._shared.types import FileLike, MD5Hash, MimeFormat from mpcontribs_api.projection import SparseFieldsModel -class Attachment(BaseDocumentWithInput[PydanticObjectId]): - name: FileLike - md5: MD5Hash +class Attachment(Component): + hash_fields = frozenset({"mime", "content"}) mime: MimeFormat content: int diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py index 82ecc93589..0b097c9e9f 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py @@ -3,7 +3,7 @@ from pydantic import BaseModel, ConfigDict from pymatgen.core import Element -from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut +from mpcontribs_api.domains._shared.models import Component, DocumentOut from mpcontribs_api.domains._shared.types import MD5Hash, PolarsFrame from mpcontribs_api.projection import SparseFieldsModel @@ -46,9 +46,8 @@ class Cif(BaseModel): pass -class Structure(BaseDocumentWithInput[PydanticObjectId]): - name: str - md5: MD5Hash +class Structure(Component): + hash_fields = frozenset({"lattice", "sites", "charge"}) lattice: Lattice sites: list[Site] charge: float | None diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py index e9d9797e9e..deb7bcfbf4 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py @@ -11,7 +11,7 @@ model_validator, ) -from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut +from mpcontribs_api.domains._shared.models import Component, DocumentOut from mpcontribs_api.domains._shared.types import MD5Hash, PolarsFrame from mpcontribs_api.projection import SparseFieldsModel @@ -27,11 +27,10 @@ class Attributes(BaseModel): labels: Labels -class Table(BaseDocumentWithInput[PydanticObjectId]): +class Table(Component): model_config = ConfigDict(arbitrary_types_allowed=True) + hash_fields = frozenset({"index", "columns", "data"}) - name: str - md5: MD5Hash attrs: Attributes total_data_rows: int data: PolarsFrame diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py index 5b3337524a..d21145029e 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py @@ -31,7 +31,7 @@ async def insert_tables( tables: tables to insert session: optional client session; pass when inserTableIng inside a transaction """ - return await self.insert_tables(tables=tables, session=session) + return await self.insert_components(components=tables, session=session) async def insert_table(self, table: TableIn) -> Table: """Insert a single table. From 79eaf7891739ef0b00b0e3ea45e7953e3d407d2b Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Fri, 12 Jun 2026 12:29:13 -0700 Subject: [PATCH 346/591] Component.insert_component delegates to insert_components --- .../domains/_shared/components.py | 36 ++++++++++--------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py index a57ee7b940..4946e10cf3 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py @@ -14,7 +14,7 @@ from mpcontribs_api.config import get_settings from mpcontribs_api.domains._shared.models import Component, DeleteResponse, DocumentOut from mpcontribs_api.domains._shared.repository import MongoDbRepository -from mpcontribs_api.domains._shared.types import DownloadFormat +from mpcontribs_api.domains._shared.types import DownloadFormat, MD5Hash from mpcontribs_api.exceptions import AppError @@ -29,6 +29,22 @@ class MongoDbComponentsRepository[ def _build_scope(user: User) -> dict[str, Any]: return {} + async def _check_existing( + self, + components: list[TIn] | TIn, + session: AsyncClientSession | None = None, + ) -> tuple[dict[MD5Hash, TIn], dict[str, TDoc]]: + if not isinstance(components, list): + components = [components] + by_md5 = {comp.md5: comp for comp in components} + + # Full fetch so existing docs come back with their ids + existing_docs = await self.document_model.find( + In(self.document_model.md5, list(by_md5.keys())), + session=session, + ).to_list() + return (by_md5, {doc.md5: doc for doc in existing_docs}) + async def insert_components( self, components: list[TIn], @@ -40,15 +56,7 @@ async def insert_components( components (list[TIn]): components to insert session (AsyncClientSession): optional client session; pass when inserting inside a transaction """ - by_md5 = {comp.md5: comp for comp in components} - - # Full fetch so existing docs come back with their ids - existing_docs = await self.document_model.find( - In(self.document_model.md5, list(by_md5.keys())), - session=session, - ).to_list() - existing_by_md5 = {doc.md5: doc for doc in existing_docs} - + by_md5, existing_by_md5 = await self._check_existing(components=components, session=session) # Assign ids manually: insert_many won't populate id back onto these # objects, and get_dict drops id when it's None. new_docs: list[TDoc] = [] @@ -74,7 +82,7 @@ async def insert_components( resolved = existing_by_md5 | {doc.md5: doc for doc in new_docs} return [resolved[md5] for md5 in by_md5] - async def insert_component(self, component: TIn) -> TDoc: + async def insert_component(self, component: TIn, *, session: AsyncClientSession | None = None) -> TDoc: """Insert a single component. Args: @@ -86,11 +94,7 @@ async def insert_component(self, component: TIn) -> TDoc: Raises: AppError: If insert_one returns None, raises """ - doc = self.document_model.model_validate(component.model_dump()) - full_doc = await self.document_model.insert_one(doc) - if not full_doc: - raise AppError("Error inserting Table", table=component) - return full_doc + return (await self.insert_components(components=[component], session=session))[0] async def get_component_by_id(self, id: str, fields: frozenset[str] | None) -> TDoc | TOut | None: """Find a single table by id, scoped to the current user. See ``get_by_id``.""" From e204aec421ce2f8412dc5ca8d968289d5af8b52a Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Fri, 12 Jun 2026 13:37:18 -0700 Subject: [PATCH 347/591] Attachments document model now verifies extension of file. Modified imports. --- .../mpcontribs_api/domains/_shared/components.py | 1 - .../mpcontribs_api/domains/attachments/models.py | 15 +++++++++++++++ .../domains/contributions/models.py | 9 ++++++++- .../src/mpcontribs_api/domains/tables/models.py | 2 +- 4 files changed, 24 insertions(+), 3 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py index 4946e10cf3..3611b30b13 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py @@ -15,7 +15,6 @@ from mpcontribs_api.domains._shared.models import Component, DeleteResponse, DocumentOut from mpcontribs_api.domains._shared.repository import MongoDbRepository from mpcontribs_api.domains._shared.types import DownloadFormat, MD5Hash -from mpcontribs_api.exceptions import AppError class MongoDbComponentsRepository[ diff --git a/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py b/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py index ee00288fdb..7e65dd1ee6 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py @@ -1,10 +1,14 @@ from beanie import PydanticObjectId from fastapi_filter.contrib.beanie import Filter +from pydantic import field_validator from mpcontribs_api.domains._shared.models import Component, DocumentOut from mpcontribs_api.domains._shared.types import FileLike, MD5Hash, MimeFormat +from mpcontribs_api.exceptions import ValidationError from mpcontribs_api.projection import SparseFieldsModel +ACCEPTED_FORMATS = ["jpg", "jpeg", "png", "csv", "parquet", "gz"] + class Attachment(Component): hash_fields = frozenset({"mime", "content"}) @@ -14,6 +18,17 @@ class Attachment(Component): class Settings: name = "attachments" + @field_validator("name", mode="before") + @classmethod + def _name_with_extension(cls, v: str) -> str: + parts = v.strip().split(".") + if parts[-1].lower() not in ACCEPTED_FORMATS: + raise ValidationError( + f"Attachment extension not in allowed formats: {ACCEPTED_FORMATS}", + found_extension=parts[-1], + ) + return v + class AttachmentIn(Attachment): pass diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py index 4f506e0b77..49bdcff722 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py @@ -12,6 +12,7 @@ Update, before_event, ) +from bson.errors import InvalidId from fastapi_filter import FilterDepends, with_prefix from fastapi_filter.contrib.beanie import Filter from pydantic import BeforeValidator, Field, field_validator @@ -203,4 +204,10 @@ class Constants(Filter.Constants): @field_validator("id", mode="before") @classmethod def convert_str_to_oid(cls, v: str): - return PydanticObjectId(v) + try: + return PydanticObjectId(v) + except InvalidId as err: + raise ValidationError( + "Invalid ObjectId format. Must be 12-byte input or a 24-character hex string", + oid=v, + ) from err diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py index deb7bcfbf4..65985b362e 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py @@ -6,13 +6,13 @@ from pydantic import ( BaseModel, ConfigDict, - ValidationError, field_serializer, model_validator, ) from mpcontribs_api.domains._shared.models import Component, DocumentOut from mpcontribs_api.domains._shared.types import MD5Hash, PolarsFrame +from mpcontribs_api.exceptions import ValidationError from mpcontribs_api.projection import SparseFieldsModel From 5a18b4be8cf8ef2538b51b74565bbadadeeec30e Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Fri, 12 Jun 2026 13:37:30 -0700 Subject: [PATCH 348/591] Greatly expanded unit testing --- .../unit/domains/test_attachments_models.py | 151 ++++++++++ .../unit/domains/test_contributions_models.py | 30 ++ .../unit/domains/test_projects_models.py | 22 ++ .../tests/unit/domains/test_shared_bulk.py | 122 +++++++++ .../tests/unit/domains/test_shared_models.py | 122 +++++++++ .../unit/domains/test_structures_models.py | 226 +++++++++++++++ .../tests/unit/domains/test_tables_models.py | 259 ++++++++++++++++++ mpcontribs-api/tests/unit/test_config.py | 198 +++++++++++++ mpcontribs-api/tests/unit/test_exceptions.py | 32 +++ .../tests/unit/test_types_components.py | 213 ++++++++++++++ 10 files changed, 1375 insertions(+) create mode 100644 mpcontribs-api/tests/unit/domains/test_attachments_models.py create mode 100644 mpcontribs-api/tests/unit/domains/test_shared_bulk.py create mode 100644 mpcontribs-api/tests/unit/domains/test_shared_models.py create mode 100644 mpcontribs-api/tests/unit/domains/test_structures_models.py create mode 100644 mpcontribs-api/tests/unit/domains/test_tables_models.py create mode 100644 mpcontribs-api/tests/unit/test_config.py create mode 100644 mpcontribs-api/tests/unit/test_types_components.py diff --git a/mpcontribs-api/tests/unit/domains/test_attachments_models.py b/mpcontribs-api/tests/unit/domains/test_attachments_models.py new file mode 100644 index 0000000000..6f281c1a7a --- /dev/null +++ b/mpcontribs-api/tests/unit/domains/test_attachments_models.py @@ -0,0 +1,151 @@ +"""Unit tests for domains/attachments/models.py.""" + +import pytest +from beanie import PydanticObjectId +from pydantic import ValidationError as PydanticValidationError + +from mpcontribs_api.domains.attachments.models import ( + Attachment, + AttachmentFilter, + AttachmentIn, + AttachmentOut, + AttachmentPatch, +) +from mpcontribs_api.exceptions import ValidationError as AppValidationError + +# --------------------------------------------------------------------------- +# Helpers +# --------------------------------------------------------------------------- + + +def _payload(**overrides) -> dict: + payload = { + "_id": PydanticObjectId(), + "name": "spectrum.json.gz", + "md5": "c" * 32, + "mime": "application/gzip", + "content": 1, + } + payload.update(overrides) + return payload + + +# --------------------------------------------------------------------------- +# Attachment / AttachmentIn +# --------------------------------------------------------------------------- + + +class TestAttachment: + def test_valid_construction(self): + attachment = Attachment(**_payload()) + assert attachment.name == "spectrum.json.gz" + assert attachment.content == 1 + + def test_collection_name(self): + assert Attachment.Settings.name == "attachments" + + def test_name_requires_extension(self): + with pytest.raises(AppValidationError): + Attachment(**_payload(name="noextension")) + + def test_md5_normalized(self): + attachment = Attachment(**_payload(md5="C" * 32)) + assert attachment.md5 == "c" * 32 + + def test_invalid_md5_raises(self): + with pytest.raises(AppValidationError): + Attachment(**_payload(md5="zz")) + + def test_invalid_mime_raises(self): + with pytest.raises(AppValidationError): + Attachment(**_payload(mime="text/plain")) + + def test_missing_content_raises(self): + payload = _payload() + del payload["content"] + with pytest.raises(PydanticValidationError): + Attachment(**payload) + + def test_attachment_in_is_attachment(self): + # Input models subclass their document so from_input_model can dump them 1:1. + assert issubclass(AttachmentIn, Attachment) + assert isinstance(AttachmentIn(**_payload()), Attachment) + + +# --------------------------------------------------------------------------- +# AttachmentOut +# --------------------------------------------------------------------------- + + +class TestAttachmentOut: + def test_all_fields_optional(self): + out = AttachmentOut() + assert out.id is None + assert out.name is None + assert out.md5 is None + assert out.mime is None + + def test_partial_population(self): + out = AttachmentOut(name="a.gz") + assert out.name == "a.gz" + assert out.md5 is None + + def test_populates_id_from_mongo_alias(self): + oid = PydanticObjectId() + out = AttachmentOut.model_validate({"_id": oid, "md5": "d" * 32}) + assert out.id == oid + + def test_validators_still_apply_when_value_given(self): + with pytest.raises(AppValidationError): + AttachmentOut(mime="text/plain") + + +# --------------------------------------------------------------------------- +# AttachmentPatch +# --------------------------------------------------------------------------- + + +class TestAttachmentPatch: + def test_all_fields_optional(self): + patch = AttachmentPatch() + assert patch.name is None + assert patch.mime is None + + def test_partial_patch_excludes_unset(self): + patch = AttachmentPatch(name="renamed.gz") + assert patch.model_dump(exclude_unset=True) == {"name": "renamed.gz"} + + def test_invalid_name_raises(self): + with pytest.raises(AppValidationError): + AttachmentPatch(name="noextension") + + def test_invalid_mime_raises(self): + with pytest.raises(AppValidationError): + AttachmentPatch(mime="bogus") + + +# --------------------------------------------------------------------------- +# AttachmentFilter +# --------------------------------------------------------------------------- + + +class TestAttachmentFilter: + def test_empty_filter(self): + filter = AttachmentFilter() + assert filter.id is None + assert filter.md5 is None + assert filter.name__ilike is None + + def test_constants_bind_attachment_model(self): + assert AttachmentFilter.Constants.model is Attachment + + def test_md5_value_validated(self): + assert AttachmentFilter(md5="E" * 32).md5 == "e" * 32 + + def test_invalid_md5_raises(self): + with pytest.raises(AppValidationError): + AttachmentFilter(md5="nothex") + + def test_id_in_accepts_object_ids(self): + oids = [PydanticObjectId(), PydanticObjectId()] + assert AttachmentFilter(id__in=oids).id__in == oids diff --git a/mpcontribs-api/tests/unit/domains/test_contributions_models.py b/mpcontribs-api/tests/unit/domains/test_contributions_models.py index fc217492f5..dcda47b93c 100644 --- a/mpcontribs-api/tests/unit/domains/test_contributions_models.py +++ b/mpcontribs-api/tests/unit/domains/test_contributions_models.py @@ -9,6 +9,7 @@ from mpcontribs_api.domains.contributions.models import ( Contribution, + ContributionFilter, ContributionIn, ContributionOut, ContributionPatch, @@ -255,3 +256,32 @@ def test_authed_user_no_groups_has_no_group_id_clause(self): user = User(username="u@example.com", groups=frozenset()) ors = MongoDbContributionRepository._build_scope(user)["$or"] assert not any("_id" in c for c in ors) + + +# --------------------------------------------------------------------------- +# ContributionFilter.convert_str_to_oid +# --------------------------------------------------------------------------- + + +class TestContributionFilterIdValidator: + def test_empty_filter_id_is_none(self): + assert ContributionFilter().id is None + + def test_str_converted_to_object_id(self): + oid = PydanticObjectId() + filter = ContributionFilter(id=str(oid)) + assert isinstance(filter.id, PydanticObjectId) + assert filter.id == oid + + def test_object_id_passthrough(self): + oid = PydanticObjectId() + assert ContributionFilter(id=oid).id == oid + + # RED: a malformed id currently leaks bson.errors.InvalidId (not a + # ValueError subclass), which the exception handlers don't map — so + # `DELETE /contributions/{bad-id}` would 500 instead of 422. Intended + # behavior is a controlled validation error, matching how + # MongoDbRepository._convert_object_id handles the same input. + def test_malformed_id_raises_validation_error(self): + with pytest.raises(ValidationError): + ContributionFilter(id="not-an-object-id") diff --git a/mpcontribs-api/tests/unit/domains/test_projects_models.py b/mpcontribs-api/tests/unit/domains/test_projects_models.py index 56b062ba76..b874091e73 100644 --- a/mpcontribs-api/tests/unit/domains/test_projects_models.py +++ b/mpcontribs-api/tests/unit/domains/test_projects_models.py @@ -232,3 +232,25 @@ def test_from_input_model_defaults(self): assert project.is_approved is False assert project.references == [] assert project.columns == [] + + +# --------------------------------------------------------------------------- +# Project.decode_cursor (string-id override) +# --------------------------------------------------------------------------- + + +class TestProjectDecodeCursor: + def test_round_trips_string_id(self): + from mpcontribs_api.pagination import encode_cursor + + assert Project.decode_cursor(encode_cursor("my-project")) == "my-project" + + def test_returns_plain_str_not_object_id(self): + from mpcontribs_api.pagination import encode_cursor + + decoded = Project.decode_cursor(encode_cursor("solar-cells")) + assert type(decoded) is str + + def test_malformed_cursor_raises_value_error(self): + with pytest.raises(ValueError): + Project.decode_cursor("!!!not-base64!!!") diff --git a/mpcontribs-api/tests/unit/domains/test_shared_bulk.py b/mpcontribs-api/tests/unit/domains/test_shared_bulk.py new file mode 100644 index 0000000000..46ad0b1646 --- /dev/null +++ b/mpcontribs-api/tests/unit/domains/test_shared_bulk.py @@ -0,0 +1,122 @@ +"""Unit tests for domains/_shared/bulk.py.""" + +from beanie import PydanticObjectId + +from mpcontribs_api.domains._shared.bulk import ( + BulkDeleteSummary, + BulkFailure, + BulkWriteSummary, + bulk_failure_from_exception, +) +from mpcontribs_api.exceptions import ConflictError, NotFoundError, ValidationError + +# --------------------------------------------------------------------------- +# BulkFailure +# --------------------------------------------------------------------------- + + +class TestBulkFailure: + def test_required_fields(self): + failure = BulkFailure(index=3, error_code="conflict", message="duplicate") + assert failure.index == 3 + assert failure.error_code == "conflict" + assert failure.message == "duplicate" + + def test_identifier_defaults_to_none(self): + failure = BulkFailure(index=0, error_code="x", message="y") + assert failure.identifier is None + + def test_identifier_carries_arbitrary_dict(self): + identifier = {"project": "proj", "identifier": "mp-1"} + failure = BulkFailure(index=0, identifier=identifier, error_code="x", message="y") + assert failure.identifier == identifier + + +# --------------------------------------------------------------------------- +# BulkWriteSummary +# --------------------------------------------------------------------------- + + +class TestBulkWriteSummary: + def test_fields(self): + summary = BulkWriteSummary[int](total=3, succeeded=[1, 2], failed=[]) + assert summary.total == 3 + assert summary.succeeded == [1, 2] + assert summary.failed == [] + + def test_failed_items_typed(self): + failure = BulkFailure(index=1, error_code="validation_error", message="bad") + summary = BulkWriteSummary[int](total=2, succeeded=[1], failed=[failure]) + assert summary.failed[0].index == 1 + + def test_empty_summary(self): + summary = BulkWriteSummary[int](total=0, succeeded=[], failed=[]) + assert summary.total == 0 + + def test_serialization_shape(self): + failure = BulkFailure(index=0, error_code="conflict", message="dup") + summary = BulkWriteSummary[int](total=1, succeeded=[], failed=[failure]) + dumped = summary.model_dump() + assert dumped == { + "total": 1, + "succeeded": [], + "failed": [{"index": 0, "identifier": None, "error_code": "conflict", "message": "dup"}], + } + + +# --------------------------------------------------------------------------- +# BulkDeleteSummary +# --------------------------------------------------------------------------- + + +class TestBulkDeleteSummary: + def test_fields(self): + summary = BulkDeleteSummary(num_deleted=5, num_children_deleted=12) + assert summary.num_deleted == 5 + assert summary.num_children_deleted == 12 + + def test_zero_counts(self): + summary = BulkDeleteSummary(num_deleted=0, num_children_deleted=0) + assert summary.model_dump() == {"num_deleted": 0, "num_children_deleted": 0} + + +# --------------------------------------------------------------------------- +# bulk_failure_from_exception +# --------------------------------------------------------------------------- + + +class TestBulkFailureFromException: + def test_app_error_uses_its_error_code_and_message(self): + failure = bulk_failure_from_exception(2, None, ConflictError("already exists")) + assert failure.index == 2 + assert failure.error_code == "conflict" + assert failure.message == "already exists" + + def test_not_found_error(self): + failure = bulk_failure_from_exception(0, None, NotFoundError("gone")) + assert failure.error_code == "not_found" + + def test_validation_error(self): + failure = bulk_failure_from_exception(0, None, ValidationError("bad payload")) + assert failure.error_code == "validation_error" + assert failure.message == "bad payload" + + def test_app_error_default_message_is_class_name(self): + failure = bulk_failure_from_exception(0, None, ConflictError()) + assert failure.message == "ConflictError" + + def test_generic_exception_collapses_to_internal_error(self): + failure = bulk_failure_from_exception(1, None, RuntimeError("secret traceback details")) + assert failure.error_code == "internal_error" + + def test_generic_exception_message_is_class_name_only(self): + # Internals must not leak to the client; only the exception class name survives. + failure = bulk_failure_from_exception(1, None, RuntimeError("secret traceback details")) + assert failure.message == "RuntimeError" + assert "secret" not in failure.message + + def test_identifier_threaded_through(self): + identifier = {"id": str(PydanticObjectId())} + failure = bulk_failure_from_exception(4, identifier, ValueError("x")) + assert failure.identifier == identifier + assert failure.index == 4 diff --git a/mpcontribs-api/tests/unit/domains/test_shared_models.py b/mpcontribs-api/tests/unit/domains/test_shared_models.py new file mode 100644 index 0000000000..aaa267779f --- /dev/null +++ b/mpcontribs-api/tests/unit/domains/test_shared_models.py @@ -0,0 +1,122 @@ +"""Unit tests for domains/_shared/models.py. + +Uses Attachment as the concrete BaseDocumentWithInput subclass since it is the +simplest document in the codebase; from_input_model business-logic overrides +are covered per-domain (e.g. test_contributions_models.py). +""" + +import pytest +from beanie import PydanticObjectId +from pymongo.results import DeleteResult + +from mpcontribs_api.domains._shared.models import ( + BaseDocumentWithInput, + DeleteResponse, + DocumentOut, +) +from mpcontribs_api.domains.attachments.models import Attachment, AttachmentIn +from mpcontribs_api.pagination import encode_cursor + +# --------------------------------------------------------------------------- +# Helpers +# --------------------------------------------------------------------------- + + +def _attachment_in(**overrides) -> AttachmentIn: + payload = { + "_id": PydanticObjectId(), + "name": "data.csv.gz", + "md5": "a" * 32, + "mime": "application/gzip", + "content": 1, + } + payload.update(overrides) + return AttachmentIn(**payload) + + +class _OidOut(DocumentOut[PydanticObjectId]): + name: str | None = None + + +# --------------------------------------------------------------------------- +# BaseDocumentWithInput.from_input_model +# --------------------------------------------------------------------------- + + +class TestFromInputModel: + def test_returns_document_class_instance(self): + doc = Attachment.from_input_model(_attachment_in()) + assert isinstance(doc, Attachment) + + def test_all_fields_carried_over(self): + oid = PydanticObjectId() + doc = Attachment.from_input_model(_attachment_in(_id=oid, name="x.gz")) + assert doc.id == oid + assert doc.name == "x.gz" + assert doc.md5 == "a" * 32 + assert doc.mime == "application/gzip" + assert doc.content == 1 + + +# --------------------------------------------------------------------------- +# BaseDocumentWithInput.decode_cursor +# --------------------------------------------------------------------------- + + +class TestDecodeCursor: + def test_round_trips_object_id(self): + oid = PydanticObjectId() + decoded = BaseDocumentWithInput.decode_cursor(encode_cursor(str(oid))) + assert decoded == oid + + def test_returns_pydantic_object_id(self): + cursor = encode_cursor(str(PydanticObjectId())) + assert isinstance(BaseDocumentWithInput.decode_cursor(cursor), PydanticObjectId) + + def test_malformed_base64_raises_value_error(self): + with pytest.raises(ValueError): + BaseDocumentWithInput.decode_cursor("!!!not-base64!!!") + + def test_callable_off_concrete_subclass(self): + oid = PydanticObjectId() + assert Attachment.decode_cursor(encode_cursor(str(oid))) == oid + + +# --------------------------------------------------------------------------- +# DocumentOut +# --------------------------------------------------------------------------- + + +class TestDocumentOut: + def test_id_defaults_to_none(self): + assert _OidOut().id is None + + def test_populates_from_mongo_alias(self): + oid = PydanticObjectId() + out = _OidOut.model_validate({"_id": oid}) + assert out.id == oid + + def test_serializes_under_id_not_underscore_id(self): + oid = PydanticObjectId() + dumped = _OidOut.model_validate({"_id": oid, "name": "n"}).model_dump(by_alias=True) + assert dumped["id"] == oid + assert "_id" not in dumped + + +# --------------------------------------------------------------------------- +# DeleteResponse.from_delete_result +# --------------------------------------------------------------------------- + + +class TestDeleteResponse: + def test_from_delete_result(self): + result = DeleteResult({"n": 3}, acknowledged=True) + assert DeleteResponse.from_delete_result(result).num_deleted == 3 + + def test_zero_deleted(self): + result = DeleteResult({"n": 0}, acknowledged=True) + assert DeleteResponse.from_delete_result(result).num_deleted == 0 + + def test_serialization_shape(self): + result = DeleteResult({"n": 7}, acknowledged=True) + assert DeleteResponse.from_delete_result(result).model_dump() == {"num_deleted": 7} diff --git a/mpcontribs-api/tests/unit/domains/test_structures_models.py b/mpcontribs-api/tests/unit/domains/test_structures_models.py new file mode 100644 index 0000000000..479aebf5bf --- /dev/null +++ b/mpcontribs-api/tests/unit/domains/test_structures_models.py @@ -0,0 +1,226 @@ +"""Unit tests for domains/structures/models.py.""" + +import polars as pl +import pytest +from beanie import PydanticObjectId +from pydantic import ValidationError as PydanticValidationError +from pymatgen.core import Element + +from mpcontribs_api.domains.structures.models import ( + Lattice, + SiteProperties, + Species, + Structure, + StructureFilter, + StructureIn, + StructureOut, + StructurePatch, +) +from mpcontribs_api.exceptions import ValidationError as AppValidationError + +# --------------------------------------------------------------------------- +# Helpers +# --------------------------------------------------------------------------- + + +def _lattice_payload(**overrides) -> dict: + payload = { + "matrix": {"x": [1.0, 0.0, 0.0], "y": [0.0, 1.0, 0.0], "z": [0.0, 0.0, 1.0]}, + "pbc": [True, True, True], + "a": 1.0, + "b": 1.0, + "c": 1.0, + "alpha": 90.0, + "beta": 90.0, + "gamma": 90.0, + "volume": 1.0, + } + payload.update(overrides) + return payload + + +def _site_payload(**overrides) -> dict: + payload = { + "species": [{"element": "Fe", "occu": 1}], + "abc": [0.0, 0.0, 0.0], + "properties": {"magmom": 2.2}, + "label": "Fe", + "xyz": [0.0, 0.0, 0.0], + } + payload.update(overrides) + return payload + + +def _structure_payload(**overrides) -> dict: + payload = { + "_id": PydanticObjectId(), + "name": "Fe2O3", + "md5": "f" * 32, + "lattice": _lattice_payload(), + "sites": [_site_payload()], + "charge": 0.0, + "cif": "data_Fe2O3\n_cell_length_a 1.0\n", + } + payload.update(overrides) + return payload + + +# --------------------------------------------------------------------------- +# Leaf models +# --------------------------------------------------------------------------- + + +class TestSiteProperties: + def test_valid(self): + assert SiteProperties(magmom=1.5).magmom == 1.5 + + def test_missing_magmom_raises(self): + with pytest.raises(PydanticValidationError): + SiteProperties() + + +class TestSpecies: + def test_element_coerced_from_symbol(self): + species = Species(element="Fe", occu=1) + assert species.element is Element.Fe + assert species.occu == 1 + + def test_invalid_symbol_raises(self): + with pytest.raises(PydanticValidationError): + Species(element="Xx", occu=1) + + def test_element_enum_passthrough(self): + assert Species(element=Element.O, occu=2).element is Element.O + + +class TestLattice: + def test_valid_construction(self): + lattice = Lattice(**_lattice_payload()) + assert isinstance(lattice.matrix, pl.DataFrame) + assert lattice.pbc == [True, True, True] + assert lattice.volume == 1.0 + + def test_matrix_coerced_from_dict(self): + lattice = Lattice(**_lattice_payload()) + assert lattice.matrix.columns == ["x", "y", "z"] + + def test_missing_angles_raise(self): + payload = _lattice_payload() + del payload["alpha"] + with pytest.raises(PydanticValidationError): + Lattice(**payload) + + +# --------------------------------------------------------------------------- +# Structure / StructureIn +# --------------------------------------------------------------------------- + + +class TestStructure: + def test_valid_construction(self): + structure = Structure(**_structure_payload()) + assert structure.name == "Fe2O3" + assert len(structure.sites) == 1 + assert structure.sites[0].species[0].element is Element.Fe + + def test_collection_name(self): + assert Structure.Settings.name == "structures" + + def test_charge_is_required_but_nullable(self): + assert Structure(**_structure_payload(charge=None)).charge is None + payload = _structure_payload() + del payload["charge"] + with pytest.raises(PydanticValidationError): + Structure(**payload) + + def test_invalid_md5_raises(self): + with pytest.raises(AppValidationError): + Structure(**_structure_payload(md5="nope")) + + def test_cif_kept_as_raw_string(self): + structure = Structure(**_structure_payload()) + assert structure.cif.startswith("data_Fe2O3") + + def test_structure_in_is_structure(self): + assert issubclass(StructureIn, Structure) + assert isinstance(StructureIn(**_structure_payload()), Structure) + + def test_from_input_model_round_trip(self): + oid = PydanticObjectId() + doc = Structure.from_input_model(StructureIn(**_structure_payload(_id=oid))) + assert isinstance(doc, Structure) + assert doc.id == oid + assert doc.md5 == "f" * 32 + + +# --------------------------------------------------------------------------- +# StructureOut +# --------------------------------------------------------------------------- + + +class TestStructureOut: + def test_all_fields_optional(self): + out = StructureOut() + assert out.id is None + assert out.name is None + assert out.md5 is None + + def test_default_fields(self): + assert StructureOut.default_fields() == ["id", "name", "md5"] + + def test_default_fields_parseable(self): + # The route default must survive parse_fields without raising. + parsed = StructureOut.parse_fields(StructureOut.default_fields()) + assert parsed == frozenset({"id", "name", "md5"}) + + def test_populates_id_from_mongo_alias(self): + oid = PydanticObjectId() + assert StructureOut.model_validate({"_id": oid}).id == oid + + +# --------------------------------------------------------------------------- +# StructurePatch +# --------------------------------------------------------------------------- + + +class TestStructurePatch: + # NOTE: StructurePatch.sites is annotated `Site | None` (singular) while + # Structure.sites is `list[Site]`. A patch produced from this model can + # therefore write a non-list into a list field. Likely a typo; tests below + # pin the current shape so the fix surfaces here when made. + def test_all_fields_optional(self): + patch = StructurePatch() + assert patch.name is None + assert patch.lattice is None + assert patch.sites is None + + def test_partial_patch_excludes_unset(self): + patch = StructurePatch(name="renamed") + assert patch.model_dump(exclude_unset=True) == {"name": "renamed"} + + def test_lattice_patchable(self): + patch = StructurePatch(lattice=_lattice_payload()) + assert patch.lattice is not None + assert patch.lattice.volume == 1.0 + + +# --------------------------------------------------------------------------- +# StructureFilter +# --------------------------------------------------------------------------- + + +class TestStructureFilter: + def test_empty_filter(self): + filter = StructureFilter() + assert filter.id is None + assert filter.name__ilike is None + + def test_constants_bind_structure_model(self): + assert StructureFilter.Constants.model is Structure + + def test_md5_value_validated(self): + assert StructureFilter(md5="A" * 32).md5 == "a" * 32 + + def test_invalid_md5_raises(self): + with pytest.raises(AppValidationError): + StructureFilter(md5="short") diff --git a/mpcontribs-api/tests/unit/domains/test_tables_models.py b/mpcontribs-api/tests/unit/domains/test_tables_models.py new file mode 100644 index 0000000000..5a10b3f160 --- /dev/null +++ b/mpcontribs-api/tests/unit/domains/test_tables_models.py @@ -0,0 +1,259 @@ +"""Unit tests for domains/tables/models.py. + +NOTE ON RED TESTS: tables/models.py imports ``ValidationError`` from pydantic +and raises it with a plain string (``raise ValidationError("...")``). Pydantic +v2's ValidationError cannot be constructed that way, so every failing +validation path currently crashes with +``TypeError: ValidationError.__new__() missing 1 required positional argument`` +instead of raising a controlled error. The intended behavior — consistent with +domains/_shared/types.py and the 422 exception handler — is the domain +``mpcontribs_api.exceptions.ValidationError``. The tests in +TestTableInValidationFailures assert the intended behavior and are expected to +FAIL until the import in tables/models.py is fixed. +""" + +import polars as pl +import pytest +from beanie import PydanticObjectId + +from mpcontribs_api.domains.tables.models import ( + Attributes, + Labels, + Table, + TableFilter, + TableIn, + TableOut, + TablePatch, + TableSummaryOut, +) +from mpcontribs_api.exceptions import ValidationError as AppValidationError + +# --------------------------------------------------------------------------- +# Helpers +# --------------------------------------------------------------------------- + +ATTRS = {"title": "Band gaps", "labels": {"index": "T", "value": "gap", "variable": "method"}} + + +def _table_payload(**overrides) -> dict: + payload = { + "_id": PydanticObjectId(), + "name": "bandgaps", + "md5": "d" * 32, + "attrs": ATTRS, + "total_data_rows": 2, + "data": {"T": [100, 200], "gap": [1.1, 1.2]}, + } + payload.update(overrides) + return payload + + +def _source_doc(**overrides) -> dict: + """A source document for TableIn.from_input.""" + doc = { + "id": PydanticObjectId(), + "name": "bandgaps", + "md5": "d" * 32, + "attrs": ATTRS, + "columns": ["gap", "method"], + "index": [100, 200], + "data": [[1.1, "GGA"], [1.2, "HSE"]], + "total_data_rows": 2, + } + doc.update(overrides) + return doc + + +# --------------------------------------------------------------------------- +# Leaf models +# --------------------------------------------------------------------------- + + +class TestLabels: + def test_valid(self): + labels = Labels(index="T", value="gap", variable="method") + assert labels.index == "T" + + def test_missing_field_raises(self): + with pytest.raises(Exception): + Labels(index="T", value="gap") + + +class TestAttributes: + def test_valid(self): + attrs = Attributes(**ATTRS) + assert attrs.title == "Band gaps" + assert attrs.labels.variable == "method" + + +# --------------------------------------------------------------------------- +# Table +# --------------------------------------------------------------------------- + + +class TestTable: + def test_valid_construction(self): + table = Table(**_table_payload()) + assert isinstance(table.data, pl.DataFrame) + assert table.total_data_rows == 2 + + def test_collection_name(self): + assert Table.Settings.name == "tables" + + def test_md5_normalized(self): + assert Table(**_table_payload(md5="D" * 32)).md5 == "d" * 32 + + def test_data_serializes_to_column_dict(self): + table = Table(**_table_payload()) + assert table.model_dump()["data"] == {"T": [100, 200], "gap": [1.1, 1.2]} + + +# --------------------------------------------------------------------------- +# TableIn: happy paths +# --------------------------------------------------------------------------- + + +class TestTableInHappyPath: + def test_matching_row_count_validates(self): + table = TableIn(**_table_payload()) + assert len(table.data) == table.total_data_rows + + def test_from_input_builds_dataframe_with_index_column(self): + table = TableIn.from_input(_source_doc()) + assert table.data.columns == ["index", "gap", "method"] + assert table.data["index"].to_list() == [100, 200] + + def test_from_input_custom_index_name(self): + table = TableIn.from_input(_source_doc(), index_name="T") + assert table.data.columns == ["T", "gap", "method"] + + def test_from_input_carries_metadata(self): + doc = _source_doc() + table = TableIn.from_input(doc) + assert table.id == doc["id"] + assert table.name == "bandgaps" + assert table.md5 == "d" * 32 + assert table.total_data_rows == 2 + + def test_from_input_rows_zip_index_with_data(self): + table = TableIn.from_input(_source_doc()) + assert table.data["gap"].to_list() == [1.1, 1.2] + assert table.data["method"].to_list() == ["GGA", "HSE"] + + +# --------------------------------------------------------------------------- +# TableIn: validation failures (RED — see module docstring) +# --------------------------------------------------------------------------- + + +class TestTableInValidationFailures: + """All four tests assert the INTENDED domain ValidationError. + + They fail today because tables/models.py raises pydantic's ValidationError + with a string, which crashes with TypeError before any error can surface. + Fix: import ValidationError from mpcontribs_api.exceptions instead. + """ + + def test_row_count_mismatch_raises_validation_error(self): + with pytest.raises(AppValidationError): + TableIn(**_table_payload(total_data_rows=5)) + + def test_from_input_column_collision_raises_validation_error(self): + # index_name defaults to "index"; a source column named "index" collides. + with pytest.raises(AppValidationError): + TableIn.from_input(_source_doc(columns=["index", "gap"])) + + def test_from_input_index_data_length_mismatch_raises_validation_error(self): + with pytest.raises(AppValidationError): + TableIn.from_input(_source_doc(index=[100, 200, 300])) + + def test_from_input_declared_row_count_mismatch_raises_validation_error(self): + with pytest.raises(AppValidationError): + TableIn.from_input(_source_doc(total_data_rows=99)) + + +# --------------------------------------------------------------------------- +# TableFilter +# --------------------------------------------------------------------------- + + +class TestTableFilter: + def test_empty_filter(self): + filter = TableFilter() + assert filter.id is None + assert filter.name__ilike is None + + def test_constants_bind_table_model(self): + assert TableFilter.Constants.model is Table + + def test_id_serializes_to_str(self): + oid = PydanticObjectId() + assert TableFilter(id=oid).model_dump()["id"] == str(oid) + + def test_id_in_serializes_to_sorted_strs(self): + first, second = PydanticObjectId(), PydanticObjectId() + dumped = TableFilter(id__in=[second, first]).model_dump() + assert dumped["id__in"] == sorted([str(first), str(second)]) + + def test_none_ids_serialize_to_none(self): + dumped = TableFilter().model_dump() + assert dumped["id"] is None + assert dumped["id__in"] is None + + def test_md5_value_validated(self): + assert TableFilter(md5="B" * 32).md5 == "b" * 32 + + def test_invalid_md5_raises(self): + with pytest.raises(AppValidationError): + TableFilter(md5="short") + + +# --------------------------------------------------------------------------- +# TableSummaryOut / TableOut / TablePatch +# --------------------------------------------------------------------------- + + +class TestTableSummaryOut: + def test_valid(self): + summary = TableSummaryOut(attrs=ATTRS, columns=["gap"], total_data_rows=10) + assert summary.total_data_pages == 1 + + def test_explicit_pages(self): + summary = TableSummaryOut(attrs=ATTRS, columns=["gap"], total_data_rows=10, total_data_pages=3) + assert summary.total_data_pages == 3 + + +class TestTableOut: + def test_all_fields_optional(self): + out = TableOut() + assert out.id is None + assert out.data is None + assert out.attrs is None + + def test_default_fields(self): + assert TableOut.default_fields() == [ + "id", + "name", + "md5", + "attrs", + "columns", + "total_data_rows", + "total_data_pages", + ] + + def test_default_fields_parseable(self): + # The route default must survive parse_fields without raising. + parsed = TableOut.parse_fields(TableOut.default_fields()) + assert "attrs" in parsed + + def test_data_coerced_when_present(self): + out = TableOut(data={"a": [1]}) + assert isinstance(out.data, pl.DataFrame) + + +class TestTablePatch: + def test_name_optional(self): + assert TablePatch().name is None + + def test_partial_patch_excludes_unset(self): + assert TablePatch(name="renamed").model_dump(exclude_unset=True) == {"name": "renamed"} diff --git a/mpcontribs-api/tests/unit/test_config.py b/mpcontribs-api/tests/unit/test_config.py new file mode 100644 index 0000000000..e06f59edab --- /dev/null +++ b/mpcontribs-api/tests/unit/test_config.py @@ -0,0 +1,198 @@ +"""Unit tests for config.py: MongoSettings clamping, Settings env loading, get_settings caching.""" + +import pytest +from pydantic import SecretStr +from pydantic import ValidationError as PydanticValidationError + +from mpcontribs_api.config import ( + KongSettings, + MongoSettings, + RedisSettings, + Settings, + get_settings, +) + +# --------------------------------------------------------------------------- +# Helpers +# --------------------------------------------------------------------------- + +REQUIRED_ENV = { + "MPCONTRIBS_ENVIRONMENT": "dev", + "MPCONTRIBS_MONGO__URI": "mongodb://user:pass@localhost:27017", + "MPCONTRIBS_MONGO__DB_NAME": "mpcontribs-test", + "MPCONTRIBS_KONG__GATEWAY_SECRET": "kong-secret", + "MPCONTRIBS_REDIS__ADDRESS": "redis://localhost:6379", + "MPCONTRIBS_REDIS__URL": "redis://localhost:6379/0", + "MPCONTRIBS_MAIL_DEFAULT_SENDER": "noreply@materialsproject.org", + "MPCONTRIBS_VERSION": "0.0.0-test", +} + + +def _set_required_env(monkeypatch: pytest.MonkeyPatch) -> None: + for key, value in REQUIRED_ENV.items(): + monkeypatch.setenv(key, value) + + +def _mongo(**overrides) -> MongoSettings: + return MongoSettings(uri=SecretStr("mongodb://localhost"), db_name="db", **overrides) + + +# --------------------------------------------------------------------------- +# MongoSettings defaults +# --------------------------------------------------------------------------- + + +class TestMongoSettingsDefaults: + def test_minimal_construction(self): + settings = _mongo() + assert settings.db_name == "db" + assert settings.uri.get_secret_value() == "mongodb://localhost" + + def test_uri_is_secret(self): + settings = _mongo() + assert "mongodb://localhost" not in repr(settings.uri) + + def test_default_pool_sizes(self): + settings = _mongo() + assert settings.max_pool_size == 100 + assert settings.min_pool_size == 0 + + def test_default_admin_group(self): + assert _mongo().admin_group == "admin" + + def test_default_component_limits(self): + settings = _mongo() + assert settings.max_components_per_contribution == 500 + assert settings.component_insert_chunk_size == 100 + + def test_invalid_datetime_conversion_raises(self): + with pytest.raises(PydanticValidationError): + _mongo(datetime_conversion="not-a-mode") + + def test_missing_uri_raises(self): + with pytest.raises(PydanticValidationError): + MongoSettings(db_name="db") + + +# --------------------------------------------------------------------------- +# MongoSettings._clamp_concurrency +# --------------------------------------------------------------------------- + + +class TestClampConcurrency: + def test_default_not_clamped(self): + # max_pool_size=100 -> cap 50; default max_concurrent_transactions=16 stays. + assert _mongo().max_concurrent_transactions == 16 + + def test_clamped_to_half_pool_size(self): + settings = _mongo(max_pool_size=10, max_concurrent_transactions=16) + assert settings.max_concurrent_transactions == 5 + + def test_exactly_at_cap_not_clamped(self): + settings = _mongo(max_pool_size=32, max_concurrent_transactions=16) + assert settings.max_concurrent_transactions == 16 + + def test_pool_size_one_clamps_to_one(self): + settings = _mongo(max_pool_size=1, max_concurrent_transactions=16) + assert settings.max_concurrent_transactions == 1 + + def test_unbounded_pool_skips_clamping(self): + # max_pool_size=0 means "unlimited" to PyMongo; clamping is skipped. + settings = _mongo(max_pool_size=0, max_concurrent_transactions=999) + assert settings.max_concurrent_transactions == 999 + + def test_below_cap_unchanged(self): + settings = _mongo(max_pool_size=10, max_concurrent_transactions=2) + assert settings.max_concurrent_transactions == 2 + + +# --------------------------------------------------------------------------- +# Sub-settings secrets +# --------------------------------------------------------------------------- + + +class TestSubSettingsSecrets: + def test_kong_secret_masked(self): + kong = KongSettings(gateway_secret=SecretStr("s3cret")) + assert kong.gateway_secret.get_secret_value() == "s3cret" + assert "s3cret" not in repr(kong) + + def test_redis_secrets_masked(self): + redis = RedisSettings(address=SecretStr("redis://h"), url=SecretStr("redis://h/0")) + assert redis.address.get_secret_value() == "redis://h" + assert "redis://h" not in repr(redis) + + +# --------------------------------------------------------------------------- +# Settings: env var loading +# --------------------------------------------------------------------------- + + +class TestSettingsEnvLoading: + def test_loads_from_env(self, monkeypatch): + _set_required_env(monkeypatch) + settings = Settings() + assert settings.environment == "dev" + assert settings.version == "0.0.0-test" + assert settings.mail_default_sender == "noreply@materialsproject.org" + + def test_nested_delimiter_populates_mongo(self, monkeypatch): + _set_required_env(monkeypatch) + settings = Settings() + assert settings.mongo.db_name == "mpcontribs-test" + assert settings.mongo.uri.get_secret_value() == "mongodb://user:pass@localhost:27017" + + def test_nested_delimiter_populates_kong_and_redis(self, monkeypatch): + _set_required_env(monkeypatch) + settings = Settings() + assert settings.kong.gateway_secret.get_secret_value() == "kong-secret" + assert settings.redis.url.get_secret_value() == "redis://localhost:6379/0" + + def test_nested_field_override(self, monkeypatch): + _set_required_env(monkeypatch) + monkeypatch.setenv("MPCONTRIBS_MONGO__MAX_POOL_SIZE", "10") + settings = Settings() + assert settings.mongo.max_pool_size == 10 + # Clamp validator runs on env-loaded values too. + assert settings.mongo.max_concurrent_transactions == 5 + + def test_invalid_environment_raises(self, monkeypatch): + _set_required_env(monkeypatch) + monkeypatch.setenv("MPCONTRIBS_ENVIRONMENT", "staging") + with pytest.raises(PydanticValidationError): + Settings() + + def test_missing_required_env_raises(self, monkeypatch): + for key in REQUIRED_ENV: + monkeypatch.delenv(key, raising=False) + with pytest.raises(PydanticValidationError): + Settings() + + +# --------------------------------------------------------------------------- +# get_settings caching +# --------------------------------------------------------------------------- + + +class TestGetSettingsCaching: + @pytest.fixture(autouse=True) + def _clear_cache(self): + get_settings.cache_clear() + yield + get_settings.cache_clear() + + def test_returns_settings_instance(self, monkeypatch): + _set_required_env(monkeypatch) + assert isinstance(get_settings(), Settings) + + def test_same_instance_returned(self, monkeypatch): + _set_required_env(monkeypatch) + assert get_settings() is get_settings() + + def test_env_changes_ignored_until_cache_cleared(self, monkeypatch): + _set_required_env(monkeypatch) + first = get_settings() + monkeypatch.setenv("MPCONTRIBS_VERSION", "9.9.9") + assert get_settings().version == first.version + get_settings.cache_clear() + assert get_settings().version == "9.9.9" diff --git a/mpcontribs-api/tests/unit/test_exceptions.py b/mpcontribs-api/tests/unit/test_exceptions.py index a01d033051..894dfec0c1 100644 --- a/mpcontribs-api/tests/unit/test_exceptions.py +++ b/mpcontribs-api/tests/unit/test_exceptions.py @@ -8,6 +8,7 @@ PermissionError, ValidationError, _error_body, + _sanitize_validation_errors, ) @@ -140,3 +141,34 @@ def test_context_available_after_raise(self): with pytest.raises(ValidationError) as exc_info: raise ValidationError("bad field", field="email", value="oops") assert exc_info.value.context == {"field": "email", "value": "oops"} + + +# --------------------------------------------------------------------------- +# _sanitize_validation_errors +# --------------------------------------------------------------------------- + + +class TestSanitizeValidationErrors: + def test_drops_input_and_url_keys(self): + errors = [ + {"type": "missing", "loc": ("body", "name"), "msg": "Field required", "input": {"secret": 1}, "url": "https://errors.pydantic.dev/x"} + ] + sanitized = _sanitize_validation_errors(errors) + assert sanitized == [{"type": "missing", "loc": ("body", "name"), "msg": "Field required"}] + + def test_echoed_input_never_survives(self): + errors = [{"msg": "bad", "input": "user-supplied-payload"}] + assert "input" not in _sanitize_validation_errors(errors)[0] + + def test_multiple_errors_all_sanitized(self): + errors = [ + {"msg": "a", "input": 1, "url": "u"}, + {"msg": "b", "input": 2}, + {"msg": "c"}, + ] + sanitized = _sanitize_validation_errors(errors) + assert all("input" not in e and "url" not in e for e in sanitized) + assert [e["msg"] for e in sanitized] == ["a", "b", "c"] + + def test_empty_sequence(self): + assert _sanitize_validation_errors([]) == [] diff --git a/mpcontribs-api/tests/unit/test_types_components.py b/mpcontribs-api/tests/unit/test_types_components.py new file mode 100644 index 0000000000..a0730f6b67 --- /dev/null +++ b/mpcontribs-api/tests/unit/test_types_components.py @@ -0,0 +1,213 @@ +"""Unit tests for component-related shared types in domains/_shared/types.py. + +Covers FileLike, MD5Hash, MimeFormat, DownloadFormat, and the PolarsFrame +annotated type (coercion + serialization). ShortStr and PrefixedEmail are +covered in test_types.py. +""" + +import polars as pl +import pytest +from pydantic import BaseModel, ConfigDict + +from mpcontribs_api.domains._shared.types import ( + DownloadFormat, + FileLike, + MD5Hash, + MimeFormat, + PolarsFrame, + _coerce_frame, + _serialize_frame, +) +from mpcontribs_api.exceptions import ValidationError as AppValidationError + + +class FileLikeModel(BaseModel): + name: FileLike + + +class MD5Model(BaseModel): + digest: MD5Hash + + +class MimeModel(BaseModel): + mime: MimeFormat + + +class FrameModel(BaseModel): + model_config = ConfigDict(arbitrary_types_allowed=True) + data: PolarsFrame + + +# --------------------------------------------------------------------------- +# FileLike / _file_name_like_str +# --------------------------------------------------------------------------- + + +class TestFileLike: + def test_simple_extension(self): + assert FileLikeModel(name="archive.gz").name == "archive.gz" + + def test_multiple_dots_valid(self): + assert FileLikeModel(name="data.tar.gz").name == "data.tar.gz" + + def test_strips_surrounding_whitespace(self): + assert FileLikeModel(name=" notes.txt ").name == "notes.txt" + + def test_no_extension_raises(self): + with pytest.raises(AppValidationError): + FileLikeModel(name="noextension") + + def test_trailing_dot_raises(self): + with pytest.raises(AppValidationError): + FileLikeModel(name="name.") + + def test_empty_string_raises(self): + with pytest.raises(AppValidationError): + FileLikeModel(name="") + + def test_leading_dot_file_is_accepted(self): + # Documents current behavior: dotfiles split into ["", "ext"], which + # has a non-empty last part and therefore passes. + assert FileLikeModel(name=".gitignore").name == ".gitignore" + + +# --------------------------------------------------------------------------- +# MD5Hash / _md5_like +# --------------------------------------------------------------------------- + + +class TestMD5Hash: + def test_valid_lowercase_hex(self): + assert MD5Model(digest="a" * 32).digest == "a" * 32 + + def test_uppercase_normalized_to_lowercase(self): + assert MD5Model(digest="ABCDEF" + "0" * 26).digest == "abcdef" + "0" * 26 + + def test_strips_whitespace(self): + assert MD5Model(digest=f" {'b' * 32} ").digest == "b" * 32 + + def test_too_short_raises(self): + with pytest.raises(AppValidationError): + MD5Model(digest="a" * 31) + + def test_too_long_raises(self): + with pytest.raises(AppValidationError): + MD5Model(digest="a" * 33) + + def test_non_hex_characters_raise(self): + with pytest.raises(AppValidationError): + MD5Model(digest="g" * 32) + + def test_empty_raises(self): + with pytest.raises(AppValidationError): + MD5Model(digest="") + + +# --------------------------------------------------------------------------- +# MimeFormat / _mime_like +# --------------------------------------------------------------------------- + + +class TestMimeFormat: + def test_valid_application_mime(self): + assert MimeModel(mime="application/gzip").mime == "application/gzip" + + def test_uppercase_normalized(self): + assert MimeModel(mime="APPLICATION/JSON").mime == "application/json" + + def test_strips_whitespace(self): + assert MimeModel(mime=" application/zip ").mime == "application/zip" + + def test_non_application_prefix_raises(self): + with pytest.raises(AppValidationError): + MimeModel(mime="text/plain") + + def test_empty_subtype_raises(self): + with pytest.raises(AppValidationError): + MimeModel(mime="application/") + + def test_missing_slash_raises(self): + with pytest.raises(AppValidationError): + MimeModel(mime="applicationgzip") + + def test_extra_slash_raises(self): + with pytest.raises(AppValidationError): + MimeModel(mime="application/x/y") + + +# --------------------------------------------------------------------------- +# DownloadFormat +# --------------------------------------------------------------------------- + + +class TestDownloadFormat: + def test_members(self): + assert {f.value for f in DownloadFormat} == {"jsonl", "csv"} + + def test_constructible_from_value(self): + assert DownloadFormat("jsonl") is DownloadFormat.JSONL + assert DownloadFormat("csv") is DownloadFormat.CSV + + def test_str_enum_compares_to_plain_str(self): + assert DownloadFormat.CSV == "csv" + + def test_invalid_value_raises(self): + with pytest.raises(ValueError): + DownloadFormat("parquet") + + +# --------------------------------------------------------------------------- +# PolarsFrame: _coerce_frame / _serialize_frame +# --------------------------------------------------------------------------- + + +class TestCoerceFrame: + def test_dataframe_passthrough_is_same_object(self): + df = pl.DataFrame({"a": [1, 2]}) + assert _coerce_frame(df) is df + + def test_dict_coerced_to_dataframe(self): + result = _coerce_frame({"a": [1, 2], "b": [3.0, 4.0]}) + assert isinstance(result, pl.DataFrame) + assert result.columns == ["a", "b"] + assert result.height == 2 + + def test_unsupported_type_raises_value_error(self): + with pytest.raises(ValueError, match="cannot coerce"): + _coerce_frame([[1, 2], [3, 4]]) + + def test_none_raises_value_error(self): + with pytest.raises(ValueError, match="cannot coerce"): + _coerce_frame(None) + + +class TestSerializeFrame: + def test_round_trips_to_column_dict(self): + df = pl.DataFrame({"x": [1, 2], "y": [10, 20]}) + assert _serialize_frame(df) == {"x": [1, 2], "y": [10, 20]} + + def test_empty_frame(self): + assert _serialize_frame(pl.DataFrame({"x": []})) == {"x": []} + + +class TestPolarsFrameAnnotated: + def test_model_accepts_dict(self): + m = FrameModel(data={"a": [1, 2]}) + assert isinstance(m.data, pl.DataFrame) + assert m.data["a"].to_list() == [1, 2] + + def test_model_accepts_dataframe(self): + df = pl.DataFrame({"a": [1]}) + assert FrameModel(data=df).data is df + + def test_model_dump_serializes_to_dict(self): + m = FrameModel(data={"a": [1, 2]}) + assert m.model_dump() == {"data": {"a": [1, 2]}} + + def test_model_dump_json_round_trip(self): + m = FrameModel(data={"a": [1, 2]}) + assert m.model_dump_json() == '{"data":{"a":[1,2]}}' + + def test_invalid_payload_fails_validation(self): + with pytest.raises(Exception): + FrameModel(data=42) From 20a9b6b5c6ef90de2171aae58de15a387c7b96ca Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Fri, 12 Jun 2026 14:52:52 -0700 Subject: [PATCH 349/591] Fixed domain routers not prefixing '/' --- .../domains/attachments/models.py | 4 ++ .../domains/attachments/router.py | 56 +++++++++---------- .../domains/contributions/router.py | 10 ++-- .../domains/structures/router.py | 8 +-- .../mpcontribs_api/domains/tables/router.py | 8 +-- 5 files changed, 45 insertions(+), 41 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py b/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py index 7e65dd1ee6..dd03082b22 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py @@ -39,6 +39,10 @@ class AttachmentOut(DocumentOut[PydanticObjectId]): md5: MD5Hash | None = None mime: MimeFormat | None = None + @staticmethod + def default_fields() -> list[str]: + return ["id", "name", "md5", "mime"] + class AttachmentPatch(SparseFieldsModel): name: FileLike | None = None diff --git a/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py b/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py index 50bba3df61..53ab425aee 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py @@ -6,46 +6,46 @@ from mpcontribs_api.domains._shared.models import DeleteResponse from mpcontribs_api.domains._shared.types import DownloadFormat, FieldSelector -from mpcontribs_api.domains.structures.dependencies import StructureDep -from mpcontribs_api.domains.structures.models import StructureFilter, StructureOut +from mpcontribs_api.domains.attachments.dependencies import AttachmentDep +from mpcontribs_api.domains.attachments.models import AttachmentFilter, AttachmentOut from mpcontribs_api.pagination import CursorParams, Page router = APIRouter() -@router.get("", response_model=Page[StructureOut]) -async def get_structures( - repo: StructureDep, +@router.get("", response_model=Page[AttachmentOut]) +async def get_attachments( + repo: AttachmentDep, pagination: Annotated[CursorParams, Depends()], - filter: StructureFilter = FilterDepends(StructureFilter), - fields: FieldSelector = StructureOut.default_fields(), + filter: AttachmentFilter = FilterDepends(AttachmentFilter), + fields: FieldSelector = AttachmentOut.default_fields(), ): - selected = StructureOut.parse_fields(fields) - return await repo.get_structures(filter=filter, fields=selected, pagination=pagination) + selected = AttachmentOut.parse_fields(fields) + return await repo.get_attachments(filter=filter, fields=selected, pagination=pagination) -@router.get("{pk}", response_model=StructureOut) -async def get_structure( - repo: StructureDep, +@router.get("/{pk}", response_model=AttachmentOut) +async def get_attachment( + repo: AttachmentDep, pk: str, - fields: FieldSelector = StructureOut.default_fields(), + fields: FieldSelector = AttachmentOut.default_fields(), ): - selected = StructureOut.parse_fields(fields) - return await repo.get_structure_by_id(id=pk, fields=selected) + selected = AttachmentOut.parse_fields(fields) + return await repo.get_attachment_by_id(id=pk, fields=selected) -@router.get("download/{short_mime}") -async def download_structure( - repo: StructureDep, +@router.get("/download/{short_mime}") +async def download_attachment( + repo: AttachmentDep, response: Response, format: DownloadFormat, short_mime: Literal["gz", None] = "gz", ignore_cache: bool = False, - filter: StructureFilter = FilterDepends(StructureFilter), - fields: FieldSelector = StructureOut.default_fields(), + filter: AttachmentFilter = FilterDepends(AttachmentFilter), + fields: FieldSelector = AttachmentOut.default_fields(), ) -> StreamingResponse: - selected = StructureOut.parse_fields(fields) - body = await repo.download_structures( + selected = AttachmentOut.parse_fields(fields) + body = await repo.download_attachments( format=format, short_mime=short_mime, ignore_cache=ignore_cache, @@ -55,15 +55,15 @@ async def download_structure( return StreamingResponse( body, media_type="application/gzip", - headers={"Content-Disposition": 'attachment; filename="structures.jsonl.gz"'}, + headers={"Content-Disposition": 'attachment; filename="attachments.jsonl.gz"'}, ) @router.delete("", response_model=DeleteResponse) -async def delete_structures(repo: StructureDep, filter: StructureFilter = FilterDepends(StructureFilter)): - return await repo.delete_structures(filter=filter) +async def delete_attachments(repo: AttachmentDep, filter: AttachmentFilter = FilterDepends(AttachmentFilter)): + return await repo.delete_attachments(filter=filter) -@router.delete("{id}", response_model=DeleteResponse) -async def delete_structure_by_id(repo: StructureDep, id: str): - return await repo.delete_structure_by_id(id=id) +@router.delete("/{id}", response_model=DeleteResponse) +async def delete_attachment_by_id(repo: AttachmentDep, id: str): + return await repo.delete_attachment_by_id(id=id) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py index 3d52abe2df..0fff612ddc 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py @@ -54,7 +54,7 @@ async def upsert_contributions( return await service.upsert_contributions(contributions=contributions) -@router.get("download/{mime}") +@router.get("/download/{mime}") async def download_contributions( repo: ContributionDep, format: Literal["json", "csv", "parquet"] = "parquet", @@ -65,7 +65,7 @@ async def download_contributions( return await repo.download_contributions(format=format, filter=filter, fields=selected) -@router.delete("{id}") +@router.delete("/{id}") async def delete_contribtion_by_id( service: ContributionServiceDep, id: str, @@ -73,7 +73,7 @@ async def delete_contribtion_by_id( return await service.delete_contributions(ContributionFilter.model_validate({"id": id})) -@router.get("{id}") +@router.get("/{id}") async def get_contribution_by_id( repo: ContributionDep, id: str, @@ -83,11 +83,11 @@ async def get_contribution_by_id( return await repo.get_contribution_by_id(id=id, fields=selected) -@router.put("{id}") +@router.put("/{id}") async def upsert_contribution_by_id(repo: ContributionDep, id: str, contribution: ContributionIn): return await repo.upsert_contribution_by_id(id=id, contribution=contribution) -@router.patch("{id}") +@router.patch("/{id}") async def patch_contribution_by_id(repo: ContributionDep, id: str, update: ContributionPatch): return await repo.patch_contribution_by_id(id=id, update=update) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py index a76113cb16..4f1286c980 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py @@ -25,7 +25,7 @@ async def get_structures( return await repo.get_structures(filter=filter, fields=selected, pagination=pagination) -@router.get("{pk}", response_model=StructureOut) +@router.get("/{pk}", response_model=StructureOut) async def get_structure( repo: StructureDep, pk: str, @@ -35,7 +35,7 @@ async def get_structure( return await repo.get_structure_by_id(id=pk, fields=selected) -@router.get("download/{short_mime}") +@router.get("/download/{short_mime}") async def download_structure( repo: StructureDep, response: Response, @@ -73,12 +73,12 @@ async def delete_structures(repo: StructureDep, filter: StructureFilter = Filter return await repo.delete_structures(filter=filter) -@router.delete("{id}", response_model=DeleteResponse) +@router.delete("/{id}", response_model=DeleteResponse) async def delete_structure_by_id(repo: StructureDep, id: str): return await repo.delete_structure_by_id(id=id) -@router.patch("{id}") +@router.patch("/{id}") async def patch_structure_by_id( repo: StructureDep, id: str, diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py index 3c5dbf80be..265961da88 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py @@ -25,7 +25,7 @@ async def get_tables( return await repo.get_tables(filter=filter, fields=selected, pagination=pagination) -@router.get("{pk}", response_model=TableOut) +@router.get("/{pk}", response_model=TableOut) async def get_table( repo: TableDep, pk: str, @@ -35,7 +35,7 @@ async def get_table( return await repo.get_table_by_id(id=pk, fields=selected) -@router.get("download/{short_mime}") +@router.get("/download/{short_mime}") async def download_table( repo: TableDep, format: DownloadFormat, @@ -72,12 +72,12 @@ async def delete_tables(repo: TableDep, filter: TableFilter = FilterDepends(Tabl return await repo.delete_tables(filter=filter) -@router.delete("{id}", response_model=DeleteResponse) +@router.delete("/{id}", response_model=DeleteResponse) async def delete_table_by_id(repo: TableDep, id: str): return await repo.delete_table_by_id(id=id) -@router.patch("{id}") +@router.patch("/{id}") async def patch_table_by_id( repo: TableDep, id: str, From 8d5287b2546d31ec4cb53fc05d154d19cacaa80a Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Fri, 12 Jun 2026 14:53:16 -0700 Subject: [PATCH 350/591] Added more thorough integration test coverage --- mpcontribs-api/tests/integration/conftest.py | 24 ++ .../integration/test_component_routes.py | 212 ++++++++++++++++++ .../integration/test_contributions_routes.py | 208 +++++++++++++++++ .../tests/integration/test_healthcheck.py | 86 +++++++ .../unit/domains/test_contribution_service.py | 207 +++++++++++++++++ 5 files changed, 737 insertions(+) create mode 100644 mpcontribs-api/tests/integration/test_component_routes.py create mode 100644 mpcontribs-api/tests/integration/test_contributions_routes.py create mode 100644 mpcontribs-api/tests/integration/test_healthcheck.py diff --git a/mpcontribs-api/tests/integration/conftest.py b/mpcontribs-api/tests/integration/conftest.py index a906f94a27..eef129b066 100644 --- a/mpcontribs-api/tests/integration/conftest.py +++ b/mpcontribs-api/tests/integration/conftest.py @@ -133,3 +133,27 @@ def mock_project_repo() -> AsyncMock: def mock_contribution_repo() -> AsyncMock: """Fully async mock of MongoDbContributionRepository.""" return AsyncMock() + + +@pytest.fixture +def mock_structure_repo() -> AsyncMock: + """Fully async mock of MongoDbStructureRepository.""" + return AsyncMock() + + +@pytest.fixture +def mock_table_repo() -> AsyncMock: + """Fully async mock of MongoDbTableRepository.""" + return AsyncMock() + + +@pytest.fixture +def mock_attachment_repo() -> AsyncMock: + """Fully async mock of MongoDbAttachmentRepository.""" + return AsyncMock() + + +@pytest.fixture +def mock_contribution_service() -> AsyncMock: + """Fully async mock of ContributionService.""" + return AsyncMock() diff --git a/mpcontribs-api/tests/integration/test_component_routes.py b/mpcontribs-api/tests/integration/test_component_routes.py new file mode 100644 index 0000000000..4c62cf47a6 --- /dev/null +++ b/mpcontribs-api/tests/integration/test_component_routes.py @@ -0,0 +1,212 @@ +"""Integration tests for component routers: /structures, /tables, /attachments. + +All use AsyncMock repositories via dependency_overrides, so no DB is required — +the same pattern as test_projects.py / test_contributions.py. + +THREE BUG CLASSES ARE PINNED TO INTENDED BEHAVIOR (these tests are RED): +""" + +import pytest +from beanie import PydanticObjectId + +from mpcontribs_api.domains._shared.models import DeleteResponse +from mpcontribs_api.domains.attachments.dependencies import get_scoped_attachments +from mpcontribs_api.domains.structures.dependencies import get_scoped_tables as get_scoped_structures +from mpcontribs_api.domains.structures.models import StructureOut +from mpcontribs_api.domains.tables.dependencies import get_scoped_tables +from mpcontribs_api.domains.tables.models import TableOut +from mpcontribs_api.pagination import Page + +# --------------------------------------------------------------------------- +# Fixtures: inject mock repos per domain +# --------------------------------------------------------------------------- + + +@pytest.fixture +def structure_repo(test_app, mock_structure_repo): + test_app.dependency_overrides[get_scoped_structures] = lambda: mock_structure_repo + yield mock_structure_repo + test_app.dependency_overrides.pop(get_scoped_structures, None) + + +@pytest.fixture +def table_repo(test_app, mock_table_repo): + test_app.dependency_overrides[get_scoped_tables] = lambda: mock_table_repo + yield mock_table_repo + test_app.dependency_overrides.pop(get_scoped_tables, None) + + +@pytest.fixture +def attachment_repo(test_app, mock_attachment_repo): + test_app.dependency_overrides[get_scoped_attachments] = lambda: mock_attachment_repo + yield mock_attachment_repo + test_app.dependency_overrides.pop(get_scoped_attachments, None) + + +SAMPLE_STRUCTURE = StructureOut(name="Fe2O3.cif", md5="a" * 32) +SAMPLE_TABLE = TableOut(name="bandgaps", md5="b" * 32) + + +# =========================================================================== +# STRUCTURES +# =========================================================================== + + +class TestStructuresList: + def test_empty_page_returns_200(self, client, structure_repo): + structure_repo.get_structures.return_value = Page(items=[], next_cursor=None) + assert client.get("/api/v1/structures").status_code == 200 + + def test_page_shape(self, client, structure_repo): + structure_repo.get_structures.return_value = Page(items=[SAMPLE_STRUCTURE], next_cursor="c") + body = client.get("/api/v1/structures").json() + assert "items" in body + assert body["next_cursor"] == "c" + + def test_repo_called_with_pagination(self, client, structure_repo): + structure_repo.get_structures.return_value = Page(items=[], next_cursor=None) + client.get("/api/v1/structures?limit=5") + kwargs = structure_repo.get_structures.call_args.kwargs + assert kwargs["pagination"].limit == 5 + + def test_invalid_fields_returns_422(self, client, structure_repo): + structure_repo.get_structures.return_value = Page(items=[], next_cursor=None) + assert client.get("/api/v1/structures?_fields=not_a_field").status_code == 422 + + def test_valid_fields_forwarded(self, client, structure_repo): + structure_repo.get_structures.return_value = Page(items=[], next_cursor=None) + client.get("/api/v1/structures?_fields=name") + # parse_fields always includes the id identity field. + assert structure_repo.get_structures.call_args.kwargs["fields"] == frozenset({"id", "name"}) + + +class TestStructuresDelete: + def test_batch_delete_returns_200(self, client, structure_repo): + structure_repo.delete_structures.return_value = DeleteResponse(num_deleted=3) + r = client.delete("/api/v1/structures") + assert r.status_code == 200 + assert r.json() == {"num_deleted": 3} + + def test_repo_delete_called(self, client, structure_repo): + structure_repo.delete_structures.return_value = DeleteResponse(num_deleted=0) + client.delete("/api/v1/structures") + structure_repo.delete_structures.assert_awaited_once() + + +class TestStructuresInsert: + def test_post_route_exists(self, client, structure_repo): + # Empty body -> handler invoked; repo returns a summary-shaped object. + structure_repo.insert_structures.return_value = {"total": 0, "succeeded": [], "failed": []} + r = client.post("/api/v1/structures", json=[]) + assert r.status_code != 404 + + def test_post_forwards_to_repo(self, client, structure_repo): + structure_repo.insert_structures.return_value = {"total": 0, "succeeded": [], "failed": []} + client.post("/api/v1/structures", json=[]) + structure_repo.insert_structures.assert_awaited_once() + + +class TestStructuresByIdRouting: + def test_get_by_id_conventional_path(self, client, structure_repo): + structure_repo.get_structure_by_id.return_value = SAMPLE_STRUCTURE + assert client.get(f"/api/v1/structures/{PydanticObjectId()}").status_code == 200 + + def test_delete_by_id_conventional_path(self, client, structure_repo): + structure_repo.delete_structure_by_id.return_value = DeleteResponse(num_deleted=1) + assert client.delete(f"/api/v1/structures/{PydanticObjectId()}").status_code == 200 + + def test_patch_by_id_conventional_path(self, client, structure_repo): + structure_repo.patch_structure_by_id.return_value = SAMPLE_STRUCTURE + r = client.patch(f"/api/v1/structures/{PydanticObjectId()}", json={"name": "renamed"}) + assert r.status_code == 200 + + def test_download_conventional_path(self, client, structure_repo): + structure_repo.download_structures.return_value = iter([b"x"]) + assert client.get("/api/v1/structures/download/gz?format=csv").status_code == 200 + + +# =========================================================================== +# TABLES +# =========================================================================== + + +class TestTablesList: + def test_empty_page_returns_200(self, client, table_repo): + table_repo.get_tables.return_value = Page(items=[], next_cursor=None) + assert client.get("/api/v1/tables").status_code == 200 + + def test_page_shape(self, client, table_repo): + table_repo.get_tables.return_value = Page(items=[SAMPLE_TABLE], next_cursor=None) + assert "items" in client.get("/api/v1/tables").json() + + def test_invalid_fields_returns_422(self, client, table_repo): + table_repo.get_tables.return_value = Page(items=[], next_cursor=None) + assert client.get("/api/v1/tables?_fields=nope").status_code == 422 + + def test_default_fields_accepted(self, client, table_repo): + table_repo.get_tables.return_value = Page(items=[], next_cursor=None) + assert client.get("/api/v1/tables").status_code == 200 + + +class TestTablesDelete: + def test_batch_delete_returns_200(self, client, table_repo): + table_repo.delete_tables.return_value = DeleteResponse(num_deleted=2) + assert client.delete("/api/v1/tables").json() == {"num_deleted": 2} + + +class TestTablesInsert: + def test_post_forwards_to_repo(self, client, table_repo): + table_repo.insert_tables.return_value = {"total": 0, "succeeded": [], "failed": []} + client.post("/api/v1/tables", json=[]) + table_repo.insert_tables.assert_awaited_once() + + +class TestTablesByIdRouting: + """RED: same glued-path bug as structures.""" + + def test_get_by_id_conventional_path(self, client, table_repo): + table_repo.get_table_by_id.return_value = SAMPLE_TABLE + assert client.get(f"/api/v1/tables/{PydanticObjectId()}").status_code == 200 + + def test_delete_by_id_conventional_path(self, client, table_repo): + table_repo.delete_table_by_id.return_value = DeleteResponse(num_deleted=1) + assert client.delete(f"/api/v1/tables/{PydanticObjectId()}").status_code == 200 + + def test_patch_by_id_conventional_path(self, client, table_repo): + table_repo.patch_table_by_id.return_value = SAMPLE_TABLE + r = client.patch(f"/api/v1/tables/{PydanticObjectId()}", json={"name": "x"}) + assert r.status_code == 200 + + +# =========================================================================== +# ATTACHMENTS (RED: router is a copy of structures, wrong repo + methods) +# =========================================================================== + + +class TestAttachmentsRouterWiring: + """RED: attachments/router.py wires StructureDep and calls structure repo + methods. With the attachment repo overridden, the structure-named methods + don't exist on it, so these assertions can't pass until the router is + rewritten against the attachment domain. + """ + + def test_list_calls_attachment_repo(self, client, attachment_repo): + attachment_repo.get_attachments.return_value = Page(items=[], next_cursor=None) + r = client.get("/api/v1/attachments") + assert r.status_code == 200 + attachment_repo.get_attachments.assert_awaited_once() + + def test_get_by_id_calls_attachment_repo(self, client, attachment_repo): + attachment_repo.get_attachment_by_id.return_value = None + client.get(f"/api/v1/attachments/{PydanticObjectId()}") + attachment_repo.get_attachment_by_id.assert_awaited_once() + + def test_delete_by_id_calls_attachment_repo(self, client, attachment_repo): + attachment_repo.delete_attachment_by_id.return_value = DeleteResponse(num_deleted=1) + client.delete(f"/api/v1/attachments/{PydanticObjectId()}") + attachment_repo.delete_attachment_by_id.assert_awaited_once() + + def test_batch_delete_calls_attachment_repo(self, client, attachment_repo): + attachment_repo.delete_attachments.return_value = DeleteResponse(num_deleted=0) + client.delete("/api/v1/attachments") + attachment_repo.delete_attachments.assert_awaited_once() diff --git a/mpcontribs-api/tests/integration/test_contributions_routes.py b/mpcontribs-api/tests/integration/test_contributions_routes.py new file mode 100644 index 0000000000..af1e32cdde --- /dev/null +++ b/mpcontribs-api/tests/integration/test_contributions_routes.py @@ -0,0 +1,208 @@ +"""Integration tests for previously-untested /contributions routes. + +test_contributions.py covers GET list and DELETE batch plus stub-existence of +POST/PUT. This file covers the behavior of POST, PUT, the single-resource +routes, and download — all via AsyncMock repo/service overrides. + +RED behavior pinned here: + +1. Glued path params (same class as the component routers). Single-resource + contribution routes mount as ``/contributions{id}`` not + ``/contributions/{id}``; the ``...ByIdRouting`` tests assert the + conventional ``/{id}`` form. + +2. Download route shape. The route is declared ``download/{mime}`` but the + handler reads ``format`` from the query and never uses the ``mime`` path + param, while structures/tables use ``download/{short_mime}`` with a + ``DownloadFormat`` enum. test_download_route_conventional_path asserts the + conventional ``/download/...`` path resolves. +""" + +import pytest +from beanie import PydanticObjectId + +from mpcontribs_api.domains._shared.bulk import BulkDeleteSummary, BulkWriteSummary +from mpcontribs_api.domains.contributions.dependencies import ( + get_contribution_service, + get_scoped_contributions, +) +from mpcontribs_api.domains.contributions.models import ContributionOut + +# --------------------------------------------------------------------------- +# Fixtures +# --------------------------------------------------------------------------- + + +@pytest.fixture +def contribution_repo(test_app, mock_contribution_repo): + test_app.dependency_overrides[get_scoped_contributions] = lambda: mock_contribution_repo + yield mock_contribution_repo + test_app.dependency_overrides.pop(get_scoped_contributions, None) + + +@pytest.fixture +def contribution_service(test_app, mock_contribution_service): + test_app.dependency_overrides[get_contribution_service] = lambda: mock_contribution_service + yield mock_contribution_service + test_app.dependency_overrides.pop(get_contribution_service, None) + + +def _valid_contribution_body(**overrides) -> dict: + # ContributionIn inherits a required _id from BaseDocumentWithInput, so a + # client-supplied object id is part of the create contract (mirrors the + # service unit tests, which always pass _id). + body = { + "_id": str(PydanticObjectId()), + "project": "test-project", + "identifier": "mp-1234", + "formula": "Fe2O3", + "data": {"band_gap": 2.1}, + } + body.update(overrides) + return body + + +SAMPLE_OUT = ContributionOut(project="p", identifier="mp-1", formula="Fe2O3") + + +# =========================================================================== +# POST /contributions (bulk insert via service) +# =========================================================================== + + +class TestInsertContributions: + def test_empty_list_returns_200(self, client, contribution_service): + contribution_service.insert_contributions.return_value = BulkWriteSummary( + total=0, succeeded=[], failed=[] + ) + r = client.post("/api/v1/contributions", json=[]) + assert r.status_code == 200 + + def test_response_has_summary_shape(self, client, contribution_service): + contribution_service.insert_contributions.return_value = BulkWriteSummary( + total=0, succeeded=[], failed=[] + ) + body = client.post("/api/v1/contributions", json=[]).json() + assert set(body) == {"total", "succeeded", "failed"} + + def test_service_receives_parsed_contributions(self, client, contribution_service): + contribution_service.insert_contributions.return_value = BulkWriteSummary( + total=1, succeeded=[], failed=[] + ) + client.post("/api/v1/contributions", json=[_valid_contribution_body()]) + contributions = contribution_service.insert_contributions.call_args.kwargs["contributions"] + assert len(contributions) == 1 + assert contributions[0].project == "test-project" + + def test_malformed_body_returns_422(self, client, contribution_service): + # Missing required 'formula'. + r = client.post( + "/api/v1/contributions", + json=[{"_id": str(PydanticObjectId()), "project": "p", "identifier": "mp-1"}], + ) + assert r.status_code == 422 + contribution_service.insert_contributions.assert_not_called() + + def test_non_list_body_returns_422(self, client, contribution_service): + r = client.post("/api/v1/contributions", json=_valid_contribution_body()) + assert r.status_code == 422 + + +# =========================================================================== +# PUT /contributions (bulk upsert via service) +# =========================================================================== + + +class TestUpsertContributions: + def test_empty_list_returns_200(self, client, contribution_service): + contribution_service.upsert_contributions.return_value = [] + assert client.put("/api/v1/contributions", json=[]).status_code == 200 + + def test_service_receives_parsed_contributions(self, client, contribution_service): + contribution_service.upsert_contributions.return_value = [] + client.put("/api/v1/contributions", json=[_valid_contribution_body()]) + contributions = contribution_service.upsert_contributions.call_args.kwargs["contributions"] + assert contributions[0].identifier == "mp-1234" + + def test_malformed_body_returns_422(self, client, contribution_service): + r = client.put( + "/api/v1/contributions", + json=[{"_id": str(PydanticObjectId()), "project": "p"}], + ) + assert r.status_code == 422 + contribution_service.upsert_contributions.assert_not_called() + + +# =========================================================================== +# Single-resource routes (RED: glued path params) +# =========================================================================== + + +class TestContributionByIdRouting: + """RED: routes mount as /contributions{id} not /contributions/{id}.""" + + def test_get_by_id_conventional_path(self, client, contribution_repo): + contribution_repo.get_contribution_by_id.return_value = SAMPLE_OUT + assert client.get(f"/api/v1/contributions/{PydanticObjectId()}").status_code == 200 + + def test_patch_by_id_conventional_path(self, client, contribution_repo): + contribution_repo.patch_contribution_by_id.return_value = SAMPLE_OUT + r = client.patch(f"/api/v1/contributions/{PydanticObjectId()}", json={"formula": "H2O"}) + assert r.status_code == 200 + + def test_put_by_id_conventional_path(self, client, contribution_repo): + contribution_repo.upsert_contribution_by_id.return_value = SAMPLE_OUT + r = client.put(f"/api/v1/contributions/{PydanticObjectId()}", json=_valid_contribution_body()) + assert r.status_code == 200 + + def test_delete_by_id_conventional_path(self, client, contribution_service): + contribution_service.delete_contributions.return_value = BulkDeleteSummary( + num_deleted=1, num_children_deleted=0 + ) + assert client.delete(f"/api/v1/contributions/{PydanticObjectId()}").status_code == 200 + + def test_download_route_conventional_path(self, client, contribution_repo): + # NOTE: this stays red even after the leading-slash fix. The route is + # declared download/{mime} and the handler ignores the mime path param + # while reading `format` from the query — diverging from structures/ + # tables, which use download/{short_mime} + a DownloadFormat enum and + # work. Reconciling the contributions download route with the other + # domains is a separate fix from the glued-path one. + contribution_repo.download_contributions.return_value = iter([b"x"]) + assert client.get("/api/v1/contributions/download/parquet").status_code == 200 + + +# =========================================================================== +# Single-resource behavior (independent of the routing bug, via current paths) +# =========================================================================== + + +class TestDeleteContributionByIdWiring: + """delete_contribtion_by_id builds a ContributionFilter from the id and + delegates to the service. These use the CURRENT (glued) path so the handler + is reached today, isolating the wiring assertion from the routing bug. + + PAIRING NOTE: when the glued-path bug is fixed (leading slash added), these + two tests must be updated to the conventional ``/contributions/{id}`` path — + at that point the TestContributionByIdRouting.test_delete_by_id_conventional_path + test goes green and supersedes them. They are expected to PASS today. + """ + + def test_delete_delegates_to_service(self, client, contribution_service): + contribution_service.delete_contributions.return_value = BulkDeleteSummary( + num_deleted=1, num_children_deleted=2 + ) + oid = PydanticObjectId() + # NOTE: glued path is intentional here — see module docstring. + r = client.delete(f"/api/v1/contributions/{oid}") + assert r.status_code == 200 + contribution_service.delete_contributions.assert_awaited_once() + + def test_delete_builds_filter_from_path_id(self, client, contribution_service): + contribution_service.delete_contributions.return_value = BulkDeleteSummary( + num_deleted=1, num_children_deleted=0 + ) + oid = PydanticObjectId() + client.delete(f"/api/v1/contributions/{oid}") + passed_filter = contribution_service.delete_contributions.call_args.args[0] + assert passed_filter.id == oid diff --git a/mpcontribs-api/tests/integration/test_healthcheck.py b/mpcontribs-api/tests/integration/test_healthcheck.py new file mode 100644 index 0000000000..7dfc8bb0f9 --- /dev/null +++ b/mpcontribs-api/tests/integration/test_healthcheck.py @@ -0,0 +1,86 @@ +"""Integration tests for the /health router. + +The healthcheck router is mounted by create_app() at /health, but the shared +make_test_app() fixture only mounts the v1 router. So this module builds its +own minimal app that mounts the healthcheck router and overrides the DbDep +dependency with a mock whose admin.command("ping") can be made to succeed or +fail. +""" + +from unittest.mock import AsyncMock, MagicMock + +import pytest +from fastapi import FastAPI +from fastapi.testclient import TestClient + +from mpcontribs_api.dependencies import get_db +from mpcontribs_api.domains.healthcheck.router import router as healthcheck_router +from mpcontribs_api.exceptions import register_exception_handlers + + +def _make_db(ping_ok: bool) -> MagicMock: + """Build a mock AsyncDatabase whose client.admin.command is awaitable.""" + db = MagicMock(name="db") + if ping_ok: + db.client.admin.command = AsyncMock(return_value={"ok": 1}) + else: + db.client.admin.command = AsyncMock(side_effect=ConnectionError("mongo down")) + return db + + +@pytest.fixture +def health_app() -> FastAPI: + app = FastAPI() + register_exception_handlers(app) + app.include_router(healthcheck_router, prefix="/health") + return app + + +def _client(app: FastAPI, db: MagicMock) -> TestClient: + app.dependency_overrides[get_db] = lambda: db + return TestClient(app, raise_server_exceptions=False) + + +# --------------------------------------------------------------------------- +# Healthy path +# --------------------------------------------------------------------------- + + +class TestHealthcheckHealthy: + def test_returns_200(self, health_app): + r = _client(health_app, _make_db(ping_ok=True)).get("/health") + assert r.status_code == 200 + + def test_body_reports_healthy(self, health_app): + r = _client(health_app, _make_db(ping_ok=True)).get("/health") + assert r.json() == {"status": "healthy", "mongo": "ok"} + + def test_pings_mongo(self, health_app): + db = _make_db(ping_ok=True) + _client(health_app, db).get("/health") + db.client.admin.command.assert_awaited_once_with("ping") + + +# --------------------------------------------------------------------------- +# Unhealthy path (DB unreachable) +# --------------------------------------------------------------------------- + + +class TestHealthcheckUnhealthy: + def test_returns_503(self, health_app): + r = _client(health_app, _make_db(ping_ok=False)).get("/health") + assert r.status_code == 503 + + def test_body_reports_unreachable(self, health_app): + # The StarletteHTTPException handler reshapes the response into the + # standard error envelope, stringifying the detail dict into `message`. + r = _client(health_app, _make_db(ping_ok=False)).get("/health") + message = r.json()["error"]["message"] + assert "unhealthy" in message + assert "unreachable" in message + + def test_ping_failure_does_not_leak_exception_text(self, health_app): + # The raised HTTPException carries a controlled detail dict, not the + # underlying "mongo down" ConnectionError message. + r = _client(health_app, _make_db(ping_ok=False)).get("/health") + assert "mongo down" not in r.text diff --git a/mpcontribs-api/tests/unit/domains/test_contribution_service.py b/mpcontribs-api/tests/unit/domains/test_contribution_service.py index e72f59a824..e1419e5e50 100644 --- a/mpcontribs-api/tests/unit/domains/test_contribution_service.py +++ b/mpcontribs-api/tests/unit/domains/test_contribution_service.py @@ -611,3 +611,210 @@ async def test_same_key_concurrent_upserts_both_go_through_atomic_call(self): # await svc.insert_contributions(contribs) # assert peak == 1 + + +# --------------------------------------------------------------------------- +# delete_contributions — cascade delete (components-first), cursor loop +# --------------------------------------------------------------------------- + +from types import SimpleNamespace # noqa: E402 + +from mpcontribs_api.domains._shared.models import DeleteResponse # noqa: E402 +from mpcontribs_api.domains.contributions.models import ContributionFilter # noqa: E402 +from mpcontribs_api.pagination import Page # noqa: E402 + + +def _link(ref_id: PydanticObjectId) -> SimpleNamespace: + """Minimal stand-in for a Beanie Link: only ``.ref.id`` is read by the service.""" + return SimpleNamespace(ref=SimpleNamespace(id=ref_id)) + + +def _contrib_doc(structures=None, attachments=None, tables=None, id_=None) -> SimpleNamespace: + """A contribution page item exposing the attributes delete_contributions reads.""" + return SimpleNamespace( + id=id_ or _oid(), + structures=[_link(s) for s in (structures or [])], + attachments=[_link(a) for a in (attachments or [])], + tables=[_link(t) for t in (tables or [])], + ) + + +def _page(items) -> Page: + return Page(items=items, next_cursor=None) + + +def _delete_result(n: int) -> SimpleNamespace: + """Stand-in for pymongo DeleteResult (only ``.deleted_count`` is read).""" + return SimpleNamespace(deleted_count=n) + + +def _noop_filter() -> ContributionFilter: + return ContributionFilter() + + +class TestDeleteContributionsEmpty: + async def test_empty_match_returns_zero_summary(self): + svc, contrib_repo, *_ = _make_service() + contrib_repo.get_contributions.return_value = _page([]) + contrib_repo.delete_contributions.return_value = _delete_result(0) + + summary = await svc.delete_contributions(_noop_filter()) + + assert summary.num_deleted == 0 + assert summary.num_children_deleted == 0 + + async def test_empty_match_does_not_call_child_repos(self): + svc, contrib_repo, struct_repo, table_repo, attach_repo, _ = _make_service() + contrib_repo.get_contributions.return_value = _page([]) + contrib_repo.delete_contributions.return_value = _delete_result(0) + + await svc.delete_contributions(_noop_filter()) + + struct_repo.delete_by_ids.assert_not_called() + table_repo.delete_by_ids.assert_not_called() + attach_repo.delete_by_ids.assert_not_called() + + async def test_empty_match_terminates_after_one_page(self): + svc, contrib_repo, *_ = _make_service() + contrib_repo.get_contributions.return_value = _page([]) + contrib_repo.delete_contributions.return_value = _delete_result(0) + + await svc.delete_contributions(_noop_filter()) + + assert contrib_repo.get_contributions.await_count == 1 + + +class TestDeleteContributionsSinglePage: + async def test_deletes_contributions_then_terminates(self): + svc, contrib_repo, *_ = _make_service() + docs = [_contrib_doc() for _ in range(3)] + # First call returns the page; second returns empty so the loop ends. + contrib_repo.get_contributions.side_effect = [_page(docs), _page([])] + contrib_repo.delete_contributions.side_effect = [_delete_result(3), _delete_result(0)] + + summary = await svc.delete_contributions(_noop_filter()) + + assert summary.num_deleted == 3 + + async def test_no_components_means_no_child_deletes(self): + svc, contrib_repo, struct_repo, table_repo, attach_repo, _ = _make_service() + contrib_repo.get_contributions.side_effect = [_page([_contrib_doc()]), _page([])] + contrib_repo.delete_contributions.side_effect = [_delete_result(1), _delete_result(0)] + + summary = await svc.delete_contributions(_noop_filter()) + + struct_repo.delete_by_ids.assert_not_called() + table_repo.delete_by_ids.assert_not_called() + attach_repo.delete_by_ids.assert_not_called() + assert summary.num_children_deleted == 0 + + async def test_components_deleted_before_contributions(self): + # Records call order across repos to assert children go first. + order: list[str] = [] + svc, contrib_repo, struct_repo, table_repo, attach_repo, _ = _make_service() + + doc = _contrib_doc(structures=[_oid()], tables=[_oid()], attachments=[_oid()]) + contrib_repo.get_contributions.side_effect = [_page([doc]), _page([])] + + def _make_child_recorder(name): + async def _record(ids, *a, **k): + order.append(name) + return DeleteResponse(num_deleted=1) + + return _record + + struct_repo.delete_by_ids.side_effect = _make_child_recorder("structures") + table_repo.delete_by_ids.side_effect = _make_child_recorder("tables") + attach_repo.delete_by_ids.side_effect = _make_child_recorder("attachments") + + async def _record_contrib(_filter, *a, **k): + order.append("contributions") + return _delete_result(1) + + contrib_repo.delete_contributions.side_effect = _record_contrib + + await svc.delete_contributions(_noop_filter()) + + # The loop makes a final pass on the empty page that still issues one + # (no-op) contribution delete before breaking, so there are two + # "contributions" entries. The invariant under test: all three child + # deletes happen before the first contribution delete. + first_contrib = order.index("contributions") + assert set(order[:first_contrib]) == {"structures", "tables", "attachments"} + + async def test_child_ids_collected_from_links(self): + svc, contrib_repo, struct_repo, *_ = _make_service() + s1, s2 = _oid(), _oid() + doc = _contrib_doc(structures=[s1, s2]) + contrib_repo.get_contributions.side_effect = [_page([doc]), _page([])] + struct_repo.delete_by_ids.return_value = DeleteResponse(num_deleted=2) + contrib_repo.delete_contributions.side_effect = [_delete_result(1), _delete_result(0)] + + await svc.delete_contributions(_noop_filter()) + + called_ids = struct_repo.delete_by_ids.await_args.args[0] + assert set(called_ids) == {s1, s2} + + async def test_child_counts_accumulated_across_types(self): + svc, contrib_repo, struct_repo, table_repo, attach_repo, _ = _make_service() + doc = _contrib_doc(structures=[_oid()], tables=[_oid(), _oid()], attachments=[_oid()]) + contrib_repo.get_contributions.side_effect = [_page([doc]), _page([])] + struct_repo.delete_by_ids.return_value = DeleteResponse(num_deleted=1) + table_repo.delete_by_ids.return_value = DeleteResponse(num_deleted=2) + attach_repo.delete_by_ids.return_value = DeleteResponse(num_deleted=1) + contrib_repo.delete_contributions.side_effect = [_delete_result(1), _delete_result(0)] + + summary = await svc.delete_contributions(_noop_filter()) + + assert summary.num_children_deleted == 4 + + async def test_contributions_deleted_by_id_in_of_page(self): + svc, contrib_repo, *_ = _make_service() + ids = [_oid(), _oid()] + docs = [_contrib_doc(id_=i) for i in ids] + contrib_repo.get_contributions.side_effect = [_page(docs), _page([])] + contrib_repo.delete_contributions.side_effect = [_delete_result(2), _delete_result(0)] + + await svc.delete_contributions(_noop_filter()) + + first_call_filter = contrib_repo.delete_contributions.await_args_list[0].args[0] + assert set(first_call_filter.id__in) == set(ids) + + +class TestDeleteContributionsMultiPage: + async def test_loops_until_page_empty(self): + svc, contrib_repo, *_ = _make_service() + contrib_repo.get_contributions.side_effect = [ + _page([_contrib_doc() for _ in range(2)]), + _page([_contrib_doc()]), + _page([]), + ] + contrib_repo.delete_contributions.side_effect = [ + _delete_result(2), + _delete_result(1), + _delete_result(0), + ] + + summary = await svc.delete_contributions(_noop_filter()) + + assert summary.num_deleted == 3 + assert contrib_repo.get_contributions.await_count == 3 + + async def test_children_accumulate_across_pages(self): + svc, contrib_repo, struct_repo, *_ = _make_service() + contrib_repo.get_contributions.side_effect = [ + _page([_contrib_doc(structures=[_oid()])]), + _page([_contrib_doc(structures=[_oid()])]), + _page([]), + ] + struct_repo.delete_by_ids.return_value = DeleteResponse(num_deleted=1) + contrib_repo.delete_contributions.side_effect = [ + _delete_result(1), + _delete_result(1), + _delete_result(0), + ] + + summary = await svc.delete_contributions(_noop_filter()) + + assert summary.num_children_deleted == 2 + assert struct_repo.delete_by_ids.await_count == 2 From d45aa54c6220ec5dee76bb41a30136b9bd97606c Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 15 Jun 2026 10:06:26 -0700 Subject: [PATCH 351/591] Moved download logic to base shared repository --- .../domains/_shared/components.py | 62 +------------------ .../domains/_shared/repository.py | 59 ++++++++++++++++++ .../mpcontribs_api/domains/_shared/types.py | 4 ++ .../domains/attachments/repository.py | 7 +-- .../domains/attachments/router.py | 6 +- .../domains/contributions/repository.py | 20 ++++-- .../domains/contributions/router.py | 28 ++++++--- .../domains/structures/repository.py | 7 +-- .../domains/structures/router.py | 9 ++- .../domains/tables/repository.py | 7 +-- .../mpcontribs_api/domains/tables/router.py | 6 +- .../integration/test_component_routes.py | 10 --- .../integration/test_contributions_routes.py | 31 +--------- 13 files changed, 121 insertions(+), 135 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py index 3611b30b13..78527413d6 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py @@ -1,8 +1,4 @@ -import hashlib -import json -import zlib -from collections.abc import AsyncIterable -from typing import Any, Literal +from typing import Any from beanie import PydanticObjectId from beanie.operators import In @@ -14,7 +10,7 @@ from mpcontribs_api.config import get_settings from mpcontribs_api.domains._shared.models import Component, DeleteResponse, DocumentOut from mpcontribs_api.domains._shared.repository import MongoDbRepository -from mpcontribs_api.domains._shared.types import DownloadFormat, MD5Hash +from mpcontribs_api.domains._shared.types import MD5Hash class MongoDbComponentsRepository[ @@ -99,60 +95,6 @@ async def get_component_by_id(self, id: str, fields: frozenset[str] | None) -> T """Find a single table by id, scoped to the current user. See ``get_by_id``.""" return await self.get_by_id(id, fields) - def _hash_payload(self, payload: dict[str, Any], *, separators: tuple[str, str] = (",", ":")) -> str: - canonical = json.dumps( - payload, - sort_keys=True, - separators=separators, - ensure_ascii=True, - ) - return hashlib.sha256(canonical.encode("utf-8")).hexdigest() - - async def download_components( - self, - format: DownloadFormat, - short_mime: Literal["gz", None], - ignore_cache: bool, - filter: TFilter, - fields: frozenset[str] | None, - ) -> AsyncIterable[bytes]: - # Hash parameters to generate key for cache - payload = { - "format": format, - "short_mime": short_mime, - "filter": filter.model_dump(), - "fields": sorted(fields) if fields else None, - } - _ = self._hash_payload(payload) - - # Check S3 for the cached file - # TODO: Implement - if not ignore_cache: - pass - - # If not found in cache, build from MongoDB and save to cache - query = filter.filter(self.document_model.find(self._scope)) - query = filter.sort(query) - - # Compress using gzip level 9 and stream out - compressor = zlib.compressobj(9, zlib.DEFLATED, 16 + zlib.MAX_WBITS) - buf = bytearray() - async for table in query: - # TODO: We might think about skipping validation to save time - out = self.out_model.model_validate(table, from_attributes=True) - line = out.model_dump_json().encode() + b"\n" - chunk = compressor.compress(line) - if chunk: - # TODO: Cache in S3 as multi-part upload so we stream to user and to S3 simultaneously, - # can then remove buf - buf += chunk - yield chunk - tail = compressor.flush() - if tail: - # TODO: Final upload final part to S3 in multi-part upload, remove buf - buf += tail - yield tail - async def delete_components( self, filter: TFilter, diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py index 1d9e0a4f71..875c5ee50c 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py @@ -1,4 +1,8 @@ +import hashlib +import json +import zlib from abc import ABC, abstractmethod +from collections.abc import AsyncIterable from typing import Any from beanie import PydanticObjectId, UpdateResponse @@ -10,6 +14,7 @@ from mpcontribs_api.auth import User from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DeleteResponse, DocumentOut +from mpcontribs_api.domains._shared.types import DownloadFormat, ShortMimeFormat from mpcontribs_api.exceptions import ConflictError, NotFoundError, ValidationError from mpcontribs_api.pagination import CursorParams, Page, encode_cursor @@ -179,3 +184,57 @@ async def patch(self, id: Any, update: TPatch) -> TDoc: if updated is None: raise NotFoundError(self._not_found(id)) return updated + + def _hash_payload(self, payload: dict[str, Any], *, separators: tuple[str, str] = (",", ":")) -> str: + canonical = json.dumps( + payload, + sort_keys=True, + separators=separators, + ensure_ascii=True, + ) + return hashlib.sha256(canonical.encode("utf-8")).hexdigest() + + async def download( + self, + format: DownloadFormat, + short_mime: ShortMimeFormat, + ignore_cache: bool, + filter: TFilter, + fields: frozenset[str] | None, + ) -> AsyncIterable[bytes]: + # Hash parameters to generate key for cache + payload = { + "format": format, + "short_mime": short_mime, + "filter": filter.model_dump(), + "fields": sorted(fields) if fields else None, + } + _ = self._hash_payload(payload) + + # Check S3 for the cached file + # TODO: Implement + if not ignore_cache: + pass + + # If not found in cache, build from MongoDB and save to cache + query = filter.filter(self.document_model.find(self._scope)) + query = filter.sort(query) + + # Compress using gzip level 9 and stream out + compressor = zlib.compressobj(9, zlib.DEFLATED, 16 + zlib.MAX_WBITS) + buf = bytearray() + async for table in query: + # TODO: We might think about skipping validation to save time + out = self.out_model.model_validate(table, from_attributes=True) + line = out.model_dump_json().encode() + b"\n" + chunk = compressor.compress(line) + if chunk: + # TODO: Cache in S3 as multi-part upload so we stream to user and to S3 simultaneously, + # can then remove buf + buf += chunk + yield chunk + tail = compressor.flush() + if tail: + # TODO: Final upload final part to S3 in multi-part upload, remove buf + buf += tail + yield tail diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py index cb85f71197..a734377f5e 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py @@ -65,6 +65,10 @@ class DownloadFormat(StrEnum): CSV = "csv" +class ShortMimeFormat(StrEnum): + GZ = "gz" + + def _coerce_frame(v: object) -> pl.DataFrame: if isinstance(v, pl.DataFrame): return v diff --git a/mpcontribs-api/src/mpcontribs_api/domains/attachments/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/attachments/repository.py index b076eddcfa..8d5fb5c686 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/attachments/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/attachments/repository.py @@ -1,11 +1,10 @@ from collections.abc import AsyncIterable -from typing import Literal from pymongo.asynchronous.client_session import AsyncClientSession from mpcontribs_api.domains._shared.components import MongoDbComponentsRepository from mpcontribs_api.domains._shared.models import DeleteResponse -from mpcontribs_api.domains._shared.types import DownloadFormat +from mpcontribs_api.domains._shared.types import DownloadFormat, ShortMimeFormat from mpcontribs_api.domains.attachments.models import ( Attachment, AttachmentFilter, @@ -38,12 +37,12 @@ async def get_attachment_by_id(self, id: str, fields: frozenset[str] | None) -> async def download_attachments( self, format: DownloadFormat, - short_mime: Literal["gz", None], + short_mime: ShortMimeFormat, ignore_cache: bool, filter: AttachmentFilter, fields: frozenset[str] | None, ) -> AsyncIterable[bytes]: - return self.download_components( + return self.download( format=format, short_mime=short_mime, ignore_cache=ignore_cache, diff --git a/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py b/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py index 53ab425aee..36bccec993 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py @@ -1,11 +1,11 @@ -from typing import Annotated, Literal +from typing import Annotated from fastapi import APIRouter, Depends, Response from fastapi.responses import StreamingResponse from fastapi_filter import FilterDepends from mpcontribs_api.domains._shared.models import DeleteResponse -from mpcontribs_api.domains._shared.types import DownloadFormat, FieldSelector +from mpcontribs_api.domains._shared.types import DownloadFormat, FieldSelector, ShortMimeFormat from mpcontribs_api.domains.attachments.dependencies import AttachmentDep from mpcontribs_api.domains.attachments.models import AttachmentFilter, AttachmentOut from mpcontribs_api.pagination import CursorParams, Page @@ -39,7 +39,7 @@ async def download_attachment( repo: AttachmentDep, response: Response, format: DownloadFormat, - short_mime: Literal["gz", None] = "gz", + short_mime: ShortMimeFormat = ShortMimeFormat.GZ, ignore_cache: bool = False, filter: AttachmentFilter = FilterDepends(AttachmentFilter), fields: FieldSelector = AttachmentOut.default_fields(), diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py index a412225313..a82be85583 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py @@ -1,4 +1,5 @@ -from typing import Any, Literal +from collections.abc import AsyncIterable +from typing import Any from beanie import UpdateResponse from beanie.operators import Set @@ -7,6 +8,7 @@ from mpcontribs_api.auth import User from mpcontribs_api.domains._shared.repository import MongoDbRepository +from mpcontribs_api.domains._shared.types import DownloadFormat, ShortMimeFormat from mpcontribs_api.domains.contributions.models import ( Contribution, ContributionFilter, @@ -24,7 +26,7 @@ class MongoDbContributionRepository( Shared CRUD logic lives on :class:`MongoDbRepository`; the methods here are domain-named forwarders that give routers a consistent vocabulary and concrete types, plus the operations - whose shape is genuinely contribution-specific (filtered delete, id-keyed upsert, download). + whose shape is contribution-specific (filtered delete, id-keyed upsert, download). Multi-collection orchestration (component inserts) lives in ``ContributionService``. """ @@ -166,8 +168,16 @@ async def upsert_contribution_by_id(self, id: str, contribution: ContributionIn) async def download_contributions( self, - format: Literal["json", "csv", "parquet"], + format: DownloadFormat, + short_mime: ShortMimeFormat, + ignore_cache: bool, filter: ContributionFilter, fields: frozenset[str] | None, - ): - pass + ) -> AsyncIterable[bytes]: + return self.download( + format=format, + short_mime=short_mime, + ignore_cache=ignore_cache, + filter=filter, + fields=fields, + ) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py index 0fff612ddc..967dd69926 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py @@ -1,10 +1,11 @@ -from typing import Annotated, Literal +from typing import Annotated from fastapi import APIRouter, Depends +from fastapi.responses import StreamingResponse from fastapi_filter import FilterDepends from mpcontribs_api.domains._shared.bulk import BulkWriteSummary -from mpcontribs_api.domains._shared.types import FieldSelector +from mpcontribs_api.domains._shared.types import DownloadFormat, FieldSelector, ShortMimeFormat from mpcontribs_api.domains.contributions.dependencies import ContributionDep, ContributionServiceDep from mpcontribs_api.domains.contributions.models import ( Contribution, @@ -25,8 +26,8 @@ async def get_contributions( filter: ContributionFilter = FilterDepends(ContributionFilter), fields: FieldSelector = ContributionOut.default_fields(), ): - field_set = ContributionOut.parse_fields(fields) - return await repo.get_contributions(pagination=pagination, filter=filter, fields=field_set) + selected = ContributionOut.parse_fields(fields) + return await repo.get_contributions(pagination=pagination, filter=filter, fields=selected) @router.delete("") @@ -54,15 +55,28 @@ async def upsert_contributions( return await service.upsert_contributions(contributions=contributions) -@router.get("/download/{mime}") +@router.get("/download/{short_mime}") async def download_contributions( repo: ContributionDep, - format: Literal["json", "csv", "parquet"] = "parquet", + short_mime: ShortMimeFormat = ShortMimeFormat.GZ, + format: DownloadFormat = DownloadFormat.JSONL, + ignore_cache: bool = False, filter: ContributionFilter = FilterDepends(ContributionFilter), fields: FieldSelector = ContributionOut.default_fields(), ): selected = ContributionOut.parse_fields(fields) - return await repo.download_contributions(format=format, filter=filter, fields=selected) + body = await repo.download_contributions( + format=format, + short_mime=short_mime, + ignore_cache=ignore_cache, + filter=filter, + fields=selected, + ) + return StreamingResponse( + body, + media_type="application/gzip", + headers={"Content-Disposition": 'attachment; filename="attachments.jsonl.gz"'}, + ) @router.delete("/{id}") diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/repository.py index ac654b7588..796b9bc5b0 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/structures/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/structures/repository.py @@ -1,11 +1,10 @@ from collections.abc import AsyncIterable -from typing import Literal from pymongo.asynchronous.client_session import AsyncClientSession from mpcontribs_api.domains._shared.components import MongoDbComponentsRepository from mpcontribs_api.domains._shared.models import DeleteResponse -from mpcontribs_api.domains._shared.types import DownloadFormat +from mpcontribs_api.domains._shared.types import DownloadFormat, ShortMimeFormat from mpcontribs_api.domains.structures.models import ( Structure, StructureFilter, @@ -65,12 +64,12 @@ async def get_structure_by_id(self, id: str, fields: frozenset[str] | None) -> S async def download_structures( self, format: DownloadFormat, - short_mime: Literal["gz", None], + short_mime: ShortMimeFormat, ignore_cache: bool, filter: StructureFilter, fields: frozenset[str] | None, ) -> AsyncIterable[bytes]: - return self.download_components( + return self.download( format=format, short_mime=short_mime, ignore_cache=ignore_cache, diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py index 4f1286c980..be153b0ed6 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py @@ -1,12 +1,12 @@ -from typing import Annotated, Literal +from typing import Annotated -from fastapi import APIRouter, Depends, Response +from fastapi import APIRouter, Depends from fastapi.responses import StreamingResponse from fastapi_filter import FilterDepends from mpcontribs_api.domains._shared.bulk import BulkWriteSummary from mpcontribs_api.domains._shared.models import DeleteResponse -from mpcontribs_api.domains._shared.types import DownloadFormat, FieldSelector +from mpcontribs_api.domains._shared.types import DownloadFormat, FieldSelector, ShortMimeFormat from mpcontribs_api.domains.structures.dependencies import StructureDep from mpcontribs_api.domains.structures.models import StructureFilter, StructureIn, StructureOut, StructurePatch from mpcontribs_api.pagination import CursorParams, Page @@ -38,9 +38,8 @@ async def get_structure( @router.get("/download/{short_mime}") async def download_structure( repo: StructureDep, - response: Response, format: DownloadFormat, - short_mime: Literal["gz", None] = "gz", + short_mime: ShortMimeFormat = ShortMimeFormat.GZ, ignore_cache: bool = False, filter: StructureFilter = FilterDepends(StructureFilter), fields: FieldSelector = StructureOut.default_fields(), diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py index d21145029e..4b1a95fadf 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py @@ -1,11 +1,10 @@ from collections.abc import AsyncIterable -from typing import Literal from pymongo.asynchronous.client_session import AsyncClientSession from mpcontribs_api.domains._shared.components import MongoDbComponentsRepository from mpcontribs_api.domains._shared.models import DeleteResponse -from mpcontribs_api.domains._shared.types import DownloadFormat +from mpcontribs_api.domains._shared.types import DownloadFormat, ShortMimeFormat from mpcontribs_api.domains.tables.models import ( Table, TableFilter, @@ -63,12 +62,12 @@ async def get_table_by_id(self, id: str, fields: frozenset[str] | None) -> Table async def download_tables( self, format: DownloadFormat, - short_mime: Literal["gz", None], + short_mime: ShortMimeFormat, ignore_cache: bool, filter: TableFilter, fields: frozenset[str] | None, ) -> AsyncIterable[bytes]: - return self.download_components( + return self.download( format=format, short_mime=short_mime, ignore_cache=ignore_cache, diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py index 265961da88..24d8cdc7d9 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py @@ -1,4 +1,4 @@ -from typing import Annotated, Literal +from typing import Annotated from fastapi import APIRouter, Depends from fastapi.responses import StreamingResponse @@ -6,7 +6,7 @@ from mpcontribs_api.domains._shared.bulk import BulkWriteSummary from mpcontribs_api.domains._shared.models import DeleteResponse -from mpcontribs_api.domains._shared.types import DownloadFormat, FieldSelector +from mpcontribs_api.domains._shared.types import DownloadFormat, FieldSelector, ShortMimeFormat from mpcontribs_api.domains.tables.dependencies import TableDep from mpcontribs_api.domains.tables.models import Table, TableFilter, TableIn, TableOut, TablePatch from mpcontribs_api.pagination import CursorParams, Page @@ -39,7 +39,7 @@ async def get_table( async def download_table( repo: TableDep, format: DownloadFormat, - short_mime: Literal["gz", None] = "gz", + short_mime: ShortMimeFormat = ShortMimeFormat.GZ, ignore_cache: bool = False, filter: TableFilter = FilterDepends(TableFilter), fields: FieldSelector = TableOut.default_fields(), diff --git a/mpcontribs-api/tests/integration/test_component_routes.py b/mpcontribs-api/tests/integration/test_component_routes.py index 4c62cf47a6..e340ccf71d 100644 --- a/mpcontribs-api/tests/integration/test_component_routes.py +++ b/mpcontribs-api/tests/integration/test_component_routes.py @@ -2,8 +2,6 @@ All use AsyncMock repositories via dependency_overrides, so no DB is required — the same pattern as test_projects.py / test_contributions.py. - -THREE BUG CLASSES ARE PINNED TO INTENDED BEHAVIOR (these tests are RED): """ import pytest @@ -162,8 +160,6 @@ def test_post_forwards_to_repo(self, client, table_repo): class TestTablesByIdRouting: - """RED: same glued-path bug as structures.""" - def test_get_by_id_conventional_path(self, client, table_repo): table_repo.get_table_by_id.return_value = SAMPLE_TABLE assert client.get(f"/api/v1/tables/{PydanticObjectId()}").status_code == 200 @@ -184,12 +180,6 @@ def test_patch_by_id_conventional_path(self, client, table_repo): class TestAttachmentsRouterWiring: - """RED: attachments/router.py wires StructureDep and calls structure repo - methods. With the attachment repo overridden, the structure-named methods - don't exist on it, so these assertions can't pass until the router is - rewritten against the attachment domain. - """ - def test_list_calls_attachment_repo(self, client, attachment_repo): attachment_repo.get_attachments.return_value = Page(items=[], next_cursor=None) r = client.get("/api/v1/attachments") diff --git a/mpcontribs-api/tests/integration/test_contributions_routes.py b/mpcontribs-api/tests/integration/test_contributions_routes.py index af1e32cdde..716298b00b 100644 --- a/mpcontribs-api/tests/integration/test_contributions_routes.py +++ b/mpcontribs-api/tests/integration/test_contributions_routes.py @@ -3,19 +3,6 @@ test_contributions.py covers GET list and DELETE batch plus stub-existence of POST/PUT. This file covers the behavior of POST, PUT, the single-resource routes, and download — all via AsyncMock repo/service overrides. - -RED behavior pinned here: - -1. Glued path params (same class as the component routers). Single-resource - contribution routes mount as ``/contributions{id}`` not - ``/contributions/{id}``; the ``...ByIdRouting`` tests assert the - conventional ``/{id}`` form. - -2. Download route shape. The route is declared ``download/{mime}`` but the - handler reads ``format`` from the query and never uses the ``mime`` path - param, while structures/tables use ``download/{short_mime}`` with a - ``DownloadFormat`` enum. test_download_route_conventional_path asserts the - conventional ``/download/...`` path resolves. """ import pytest @@ -162,14 +149,8 @@ def test_delete_by_id_conventional_path(self, client, contribution_service): assert client.delete(f"/api/v1/contributions/{PydanticObjectId()}").status_code == 200 def test_download_route_conventional_path(self, client, contribution_repo): - # NOTE: this stays red even after the leading-slash fix. The route is - # declared download/{mime} and the handler ignores the mime path param - # while reading `format` from the query — diverging from structures/ - # tables, which use download/{short_mime} + a DownloadFormat enum and - # work. Reconciling the contributions download route with the other - # domains is a separate fix from the glued-path one. contribution_repo.download_contributions.return_value = iter([b"x"]) - assert client.get("/api/v1/contributions/download/parquet").status_code == 200 + assert client.get("/api/v1/contributions/download/gz").status_code == 200 # =========================================================================== @@ -178,16 +159,6 @@ def test_download_route_conventional_path(self, client, contribution_repo): class TestDeleteContributionByIdWiring: - """delete_contribtion_by_id builds a ContributionFilter from the id and - delegates to the service. These use the CURRENT (glued) path so the handler - is reached today, isolating the wiring assertion from the routing bug. - - PAIRING NOTE: when the glued-path bug is fixed (leading slash added), these - two tests must be updated to the conventional ``/contributions/{id}`` path — - at that point the TestContributionByIdRouting.test_delete_by_id_conventional_path - test goes green and supersedes them. They are expected to PASS today. - """ - def test_delete_delegates_to_service(self, client, contribution_service): contribution_service.delete_contributions.return_value = BulkDeleteSummary( num_deleted=1, num_children_deleted=2 From 69b20f96c7b15085eeda6207c1600f5a37e451ff Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 15 Jun 2026 10:58:50 -0700 Subject: [PATCH 352/591] Added csv serialization for downloads --- .../domains/_shared/components.py | 5 +- .../domains/_shared/repository.py | 54 ++++++++++++++----- 2 files changed, 43 insertions(+), 16 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py index 78527413d6..bc184d5e23 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py @@ -34,6 +34,7 @@ async def _check_existing( by_md5 = {comp.md5: comp for comp in components} # Full fetch so existing docs come back with their ids + # TODO: Most likely does a COLLSCAN - see if we can project to get a COVERED QUERY existing_docs = await self.document_model.find( In(self.document_model.md5, list(by_md5.keys())), session=session, @@ -62,8 +63,8 @@ async def insert_components( doc.id = PydanticObjectId() new_docs.append(doc) - # TODO: Might want to delegate this logic to a higher level. This method might want to simply insert everything - # its given + # TODO: Might want to delegate this logic to a higher level + # - This method might want to simply insert everything it's given # Insert by chunks chunk_size = get_settings().mongo.component_insert_chunk_size for start in range(0, len(new_docs), chunk_size): diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py index 875c5ee50c..fa2b7ea312 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py @@ -1,8 +1,10 @@ +import csv import hashlib +import io import json import zlib from abc import ABC, abstractmethod -from collections.abc import AsyncIterable +from collections.abc import AsyncIterable, AsyncIterator, Callable from typing import Any from beanie import PydanticObjectId, UpdateResponse @@ -194,6 +196,34 @@ def _hash_payload(self, payload: dict[str, Any], *, separators: tuple[str, str] ) return hashlib.sha256(canonical.encode("utf-8")).hexdigest() + def _get_serializer( + self, format: DownloadFormat, fields: frozenset[str] | None + ) -> Callable[[AsyncIterable[TOut]], AsyncIterable[bytes]]: + if format == DownloadFormat.JSONL: + return self._serialize_jsonl + if format == DownloadFormat.CSV: + return lambda rows: self._serialize_csv(rows, fields) + + @staticmethod + async def _serialize_jsonl(rows: AsyncIterable) -> AsyncIterator[bytes]: + async for out in rows: + yield out.model_dump_json().encode() + b"\n" + + @staticmethod + async def _serialize_csv(rows: AsyncIterable, fields: frozenset[str] | None) -> AsyncIterator[bytes]: + buf = io.StringIO() + writer: csv.DictWriter | None = None + async for out in rows: + row = out.model_dump(mode="json") + if writer is None: + cols = sorted(fields) if fields else list(row.keys()) + writer = csv.DictWriter(buf, fieldnames=cols, extrasaction="ignore") + writer.writeheader() + writer.writerow(row) + yield buf.getvalue().encode() + buf.seek(0) + buf.truncate(0) + async def download( self, format: DownloadFormat, @@ -220,21 +250,17 @@ async def download( query = filter.filter(self.document_model.find(self._scope)) query = filter.sort(query) + serializer = self._get_serializer(format, fields) + # Compress using gzip level 9 and stream out compressor = zlib.compressobj(9, zlib.DEFLATED, 16 + zlib.MAX_WBITS) - buf = bytearray() - async for table in query: - # TODO: We might think about skipping validation to save time - out = self.out_model.model_validate(table, from_attributes=True) - line = out.model_dump_json().encode() + b"\n" + + async def rows() -> AsyncIterator[TOut]: + async for table in query: + # TODO: We might think about skipping validation to save time + yield self.out_model.model_validate(table, from_attributes=True) + + async for line in serializer(rows()): chunk = compressor.compress(line) if chunk: - # TODO: Cache in S3 as multi-part upload so we stream to user and to S3 simultaneously, - # can then remove buf - buf += chunk yield chunk - tail = compressor.flush() - if tail: - # TODO: Final upload final part to S3 in multi-part upload, remove buf - buf += tail - yield tail From 942ef121e4d1b0ecec6b45900413882605e29bff Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 15 Jun 2026 11:48:39 -0700 Subject: [PATCH 353/591] Added tests to cover downloads --- .../tests/integration/db/conftest.py | 16 +- .../db/test_components_repository.py | 198 ++++++++++ .../tests/integration/db/test_download.py | 162 ++++++++ .../integration/test_component_routes.py | 68 ++++ .../integration/test_contributions_routes.py | 74 ++++ .../test_shared_repository_download.py | 352 ++++++++++++++++++ 6 files changed, 867 insertions(+), 3 deletions(-) create mode 100644 mpcontribs-api/tests/integration/db/test_components_repository.py create mode 100644 mpcontribs-api/tests/integration/db/test_download.py create mode 100644 mpcontribs-api/tests/unit/domains/test_shared_repository_download.py diff --git a/mpcontribs-api/tests/integration/db/conftest.py b/mpcontribs-api/tests/integration/db/conftest.py index 419cbd7876..9de472f15b 100644 --- a/mpcontribs-api/tests/integration/db/conftest.py +++ b/mpcontribs-api/tests/integration/db/conftest.py @@ -16,8 +16,11 @@ from pymongo import AsyncMongoClient from mpcontribs_api.config import get_settings +from mpcontribs_api.domains.attachments.models import Attachment from mpcontribs_api.domains.contributions.models import Contribution from mpcontribs_api.domains.projects.models import Project +from mpcontribs_api.domains.structures.models import Structure +from mpcontribs_api.domains.tables.models import Table # --------------------------------------------------------------------------- # Auto-mark all tests in this directory as @pytest.mark.db @@ -73,11 +76,9 @@ async def db(mongo_client): """Database handle with Beanie initialised against the test database.""" settings = get_settings() database = mongo_client[settings.mongo.db_name] - # Only initialise concrete documents (stubs like Structure/Table/Attachment - # have no Settings.name yet and cause Beanie to fall back to the base class). await init_beanie( database=database, - document_models=[Project, Contribution], + document_models=[Project, Contribution, Structure, Table, Attachment], ) yield database @@ -99,3 +100,12 @@ async def clean_contributions(db): await db["contributions"].delete_many({}) yield await db["contributions"].delete_many({}) + + +@pytest_asyncio.fixture(autouse=True) +async def clean_components(db): + for collection in ("structures", "tables", "attachments"): + await db[collection].delete_many({}) + yield + for collection in ("structures", "tables", "attachments"): + await db[collection].delete_many({}) diff --git a/mpcontribs-api/tests/integration/db/test_components_repository.py b/mpcontribs-api/tests/integration/db/test_components_repository.py new file mode 100644 index 0000000000..e2fee93871 --- /dev/null +++ b/mpcontribs-api/tests/integration/db/test_components_repository.py @@ -0,0 +1,198 @@ +"""Database integration tests for MongoDbComponentsRepository (live MongoDB). + +The component repository's md5-dedupe insert, chunked ``insert_many``, filtered +delete, delete-by-id and patch logic lives on the shared +``MongoDbComponentsRepository`` and had no direct coverage. These tests exercise +it through ``MongoDbAttachmentRepository`` (the simplest concrete component) against +real Beanie/MongoDB. + +Run with: uv run pytest -m db +Skip with: uv run pytest -m "not db" +""" + +import gzip + +import pytest +from beanie import PydanticObjectId + +from mpcontribs_api.auth import User +from mpcontribs_api.config import get_settings +from mpcontribs_api.domains._shared.types import DownloadFormat, ShortMimeFormat +from mpcontribs_api.domains.attachments.models import ( + Attachment, + AttachmentFilter, + AttachmentIn, + AttachmentPatch, +) +from mpcontribs_api.domains.attachments.repository import MongoDbAttachmentRepository + +pytestmark = [pytest.mark.db, pytest.mark.asyncio(loop_scope="session")] + + +# --------------------------------------------------------------------------- +# Helpers +# --------------------------------------------------------------------------- + +USER = User(username="google:alice@example.com", groups=frozenset({"mp-team"})) + + +def _repo() -> MongoDbAttachmentRepository: + return MongoDbAttachmentRepository(USER) + + +def _attachment(md5: str, name: str = "data.csv", content: int = 1) -> AttachmentIn: + return AttachmentIn( + _id=PydanticObjectId(), + name=name, + md5=md5, + mime="application/gzip", + content=content, + ) + + +async def _count() -> int: + return await Attachment.find_all().count() + + +# --------------------------------------------------------------------------- +# insert_components: md5 dedupe +# --------------------------------------------------------------------------- + + +class TestInsertComponentsDedupe: + async def test_duplicate_md5_in_batch_inserted_once(self, db): + # Two inputs share an md5; only one document should be written. + await _repo().insert_components([_attachment("a" * 32), _attachment("a" * 32), _attachment("b" * 32)]) + assert await _count() == 2 + + async def test_returns_one_doc_per_unique_md5(self, db): + result = await _repo().insert_components([_attachment("a" * 32), _attachment("a" * 32)]) + assert len(result) == 1 + + async def test_existing_md5_not_reinserted(self, db): + await _repo().insert_components([_attachment("a" * 32)]) + # Re-submit the existing md5 alongside a new one. + await _repo().insert_components([_attachment("a" * 32), _attachment("b" * 32)]) + assert await _count() == 2 + + async def test_existing_doc_returned_with_original_id(self, db): + first = await _repo().insert_components([_attachment("a" * 32)]) + again = await _repo().insert_components([_attachment("a" * 32)]) + assert again[0].id == first[0].id + + async def test_inserted_docs_have_ids(self, db): + result = await _repo().insert_components([_attachment("a" * 32), _attachment("b" * 32)]) + assert all(doc.id is not None for doc in result) + + +# --------------------------------------------------------------------------- +# insert_components: chunking +# --------------------------------------------------------------------------- + + +class TestInsertComponentsChunking: + async def test_all_docs_persisted_across_multiple_chunks(self, db, monkeypatch): + # Force a chunk size smaller than the batch so the chunking loop runs >1 time. + monkeypatch.setattr(get_settings().mongo, "component_insert_chunk_size", 2) + # md5 must be 32-char hex; build distinct values explicitly. + attachments = [_attachment(format(i, "032x")) for i in range(5)] + result = await _repo().insert_components(attachments) + assert len(result) == 5 + assert await _count() == 5 + + +# --------------------------------------------------------------------------- +# insert_component (single) +# --------------------------------------------------------------------------- + + +class TestInsertComponent: + async def test_single_insert_persists(self, db): + doc = await _repo().insert_component(_attachment("c" * 32)) + found = await Attachment.find_one(Attachment.id == doc.id) + assert found is not None + assert found.md5 == "c" * 32 + + +# --------------------------------------------------------------------------- +# delete_components / delete_component_by_id +# --------------------------------------------------------------------------- + + +class TestDeleteComponents: + async def test_filtered_delete_removes_only_matches(self, db): + await _repo().insert_components([_attachment("a" * 32), _attachment("b" * 32)]) + result = await _repo().delete_components(AttachmentFilter(md5="a" * 32)) + assert result.num_deleted == 1 + remaining = {doc.md5 async for doc in Attachment.find_all()} + assert remaining == {"b" * 32} + + async def test_delete_by_id_removes_one(self, db): + """RED: delete_component_by_id never matches a string id. + + Routers pass the id through as a path string, but ``delete_component_by_id`` + forwards it straight to ``delete_by_id`` without converting to a + ``PydanticObjectId`` (unlike ``patch_component_by_id``, which calls + ``_convert_object_id``). ``Attachment.id == ""`` then never matches + the ObjectId-typed ``_id``, so the delete raises NotFoundError and component + delete-by-id is effectively broken. + """ + [doc] = await _repo().insert_components([_attachment("a" * 32)]) + result = await _repo().delete_component_by_id(str(doc.id)) + assert result.num_deleted == 1 + assert await _count() == 0 + + async def test_delete_by_unknown_id_raises(self, db): + from mpcontribs_api.exceptions import NotFoundError + + with pytest.raises(NotFoundError): + await _repo().delete_component_by_id(str(PydanticObjectId())) + + +# --------------------------------------------------------------------------- +# patch_component_by_id +# --------------------------------------------------------------------------- + + +class TestPatchComponent: + async def test_patch_updates_field(self, db): + [doc] = await _repo().insert_components([_attachment("a" * 32, name="data.csv")]) + updated = await _repo().patch_component_by_id(str(doc.id), AttachmentPatch(name="renamed.png")) + assert updated.name == "renamed.png" + + async def test_empty_patch_returns_existing(self, db): + [doc] = await _repo().insert_components([_attachment("a" * 32, name="data.csv")]) + updated = await _repo().patch_component_by_id(str(doc.id), AttachmentPatch()) + assert updated.id == doc.id + + +# --------------------------------------------------------------------------- +# Component download round-trip +# --------------------------------------------------------------------------- + + +class TestComponentDownload: + async def test_jsonl_download_round_trips(self, db): + """RED: component downloads are doubly broken. + + 1. ``MongoDbRepository.download`` calls ``filter.sort(query)``, but the + component filters (Attachment/Structure/Table) don't define an + ``order_by`` field, so ``sort`` raises ``AttributeError`` before any + bytes are streamed. (ContributionFilter does define ``order_by``, which + is why contribution downloads get past this point.) + 2. Even once ordering is added, the compressor is never flushed (see + tests/integration/db/test_download.py), so the gzip member is truncated. + + When both are fixed this verifies the component download path end to end. + """ + await _repo().insert_components([_attachment("a" * 32), _attachment("b" * 32)]) + stream = await _repo().download_attachments( + format=DownloadFormat.JSONL, + short_mime=ShortMimeFormat.GZ, + ignore_cache=True, + filter=AttachmentFilter(), + fields=None, + ) + chunks = [c async for c in stream] + decompressed = gzip.decompress(b"".join(chunks)) + assert decompressed.count(b"\n") == 2 diff --git a/mpcontribs-api/tests/integration/db/test_download.py b/mpcontribs-api/tests/integration/db/test_download.py new file mode 100644 index 0000000000..90f6bff6c1 --- /dev/null +++ b/mpcontribs-api/tests/integration/db/test_download.py @@ -0,0 +1,162 @@ +"""Database integration tests for the download pipeline (live MongoDB). + +These exercise ``MongoDbContributionRepository.download_contributions`` against +real Beanie/MongoDB: the scoped+sorted query, projection, JSONL/CSV serialization +and gzip streaming, end to end. + +Most round-trip tests gzip-*decompress* the streamed bytes and compare to the +seeded data. They are RED today: ``MongoDbRepository.download`` never calls +``compressor.flush()``, so the streamed gzip member is truncated (missing trailing +data + CRC/ISIZE footer) and ``gzip.decompress`` raises. Once ``flush()`` is added +these same tests also verify scope filtering and field projection on real data. + +Run with: uv run pytest -m db +Skip with: uv run pytest -m "not db" +""" + +import csv +import gzip +import io + +import pytest +from beanie import PydanticObjectId + +from mpcontribs_api.auth import User +from mpcontribs_api.domains.contributions.models import Contribution, ContributionFilter +from mpcontribs_api.domains.contributions.repository import MongoDbContributionRepository + +pytestmark = [pytest.mark.db, pytest.mark.asyncio(loop_scope="session")] + + +# --------------------------------------------------------------------------- +# Helpers +# --------------------------------------------------------------------------- + +ADMIN = User(username="google:admin@example.com", groups=frozenset({"admin"})) +ALICE = User(username="google:alice@example.com", groups=frozenset({"mp-team"})) +ANON = User() + + +def _repo(user: User = ADMIN) -> MongoDbContributionRepository: + return MongoDbContributionRepository(user) + + +async def _insert(project: str, identifier: str, is_public: bool, **overrides) -> Contribution: + doc = Contribution( + _id=PydanticObjectId(), + project=project, + identifier=identifier, + formula=overrides.pop("formula", "Fe2O3"), + data=overrides.pop("data", {"band_gap": 2.1}), + is_public=is_public, + **overrides, + ) + await doc.insert() + return doc + + +async def _seed_scope_fixture() -> None: + """Three contributions spanning the three scope buckets.""" + await _insert("pub-proj", "mp-public", is_public=True) + await _insert("mp-team", "mp-group", is_public=False) + await _insert("secret", "mp-private", is_public=False) + + +async def _collect(stream) -> bytes: + chunks: list[bytes] = [] + async for chunk in stream: + chunks.append(chunk) + return b"".join(chunks) + + +async def _download_bytes(repo: MongoDbContributionRepository, *, format="jsonl", fields=None, filter=None) -> bytes: + from mpcontribs_api.domains._shared.types import DownloadFormat, ShortMimeFormat + + stream = await repo.download_contributions( + format=DownloadFormat(format), + short_mime=ShortMimeFormat.GZ, + ignore_cache=True, + filter=filter or ContributionFilter(), + fields=fields, + ) + return gzip.decompress(await _collect(stream)) + + +def _parse_jsonl(raw: bytes) -> list[dict]: + import json + + return [json.loads(line) for line in raw.splitlines() if line] + + +def _parse_csv(raw: bytes) -> list[dict]: + return list(csv.DictReader(io.StringIO(raw.decode()))) + + +# --------------------------------------------------------------------------- +# JSONL round-trip + scope +# --------------------------------------------------------------------------- + + +class TestDownloadJsonl: + async def test_admin_downloads_all_rows(self, db): + await _seed_scope_fixture() + rows = _parse_jsonl(await _download_bytes(_repo(ADMIN))) + assert {r["identifier"] for r in rows} == {"mp-public", "mp-group", "mp-private"} + + async def test_anonymous_sees_only_public(self, db): + await _seed_scope_fixture() + rows = _parse_jsonl(await _download_bytes(_repo(ANON))) + assert {r["identifier"] for r in rows} == {"mp-public"} + + async def test_group_member_sees_public_and_group(self, db): + await _seed_scope_fixture() + rows = _parse_jsonl(await _download_bytes(_repo(ALICE))) + assert {r["identifier"] for r in rows} == {"mp-public", "mp-group"} + + async def test_rows_carry_expected_fields(self, db): + await _insert("pub-proj", "mp-1", is_public=True, formula="Li2O") + rows = _parse_jsonl(await _download_bytes(_repo(ADMIN))) + assert rows[0]["formula"] == "Li2O" + assert rows[0]["project"] == "pub-proj" + + +# --------------------------------------------------------------------------- +# Filtering +# --------------------------------------------------------------------------- + + +class TestDownloadFiltering: + async def test_filter_limits_returned_rows(self, db): + await _insert("pub-proj", "keep-me", is_public=True) + await _insert("pub-proj", "drop-me", is_public=True) + rows = _parse_jsonl( + await _download_bytes(_repo(ADMIN), filter=ContributionFilter(identifier="keep-me")) + ) + assert {r["identifier"] for r in rows} == {"keep-me"} + + async def test_empty_result_is_valid_empty_gzip(self, db): + # No documents match -> the stream is genuinely empty and decompresses to b"". + # (This path never enters the compress loop, so the missing-flush bug doesn't bite.) + raw = await _download_bytes(_repo(ADMIN), filter=ContributionFilter(identifier="no-such-id")) + assert raw == b"" + + +# --------------------------------------------------------------------------- +# CSV round-trip + field projection +# --------------------------------------------------------------------------- + + +class TestDownloadCsv: + async def test_csv_has_header_and_rows(self, db): + await _insert("pub-proj", "mp-1", is_public=True) + await _insert("pub-proj", "mp-2", is_public=True) + rows = _parse_csv(await _download_bytes(_repo(ADMIN), format="csv")) + assert len(rows) == 2 + + async def test_csv_projects_only_requested_fields(self, db): + await _insert("pub-proj", "mp-1", is_public=True) + fields = frozenset({"id", "identifier"}) + rows = _parse_csv(await _download_bytes(_repo(ADMIN), format="csv", fields=fields)) + # Only the requested columns (plus the always-present id) appear. + assert set(rows[0].keys()) <= {"id", "identifier"} + assert rows[0]["identifier"] == "mp-1" diff --git a/mpcontribs-api/tests/integration/test_component_routes.py b/mpcontribs-api/tests/integration/test_component_routes.py index e340ccf71d..6e4975202d 100644 --- a/mpcontribs-api/tests/integration/test_component_routes.py +++ b/mpcontribs-api/tests/integration/test_component_routes.py @@ -200,3 +200,71 @@ def test_batch_delete_calls_attachment_repo(self, client, attachment_repo): attachment_repo.delete_attachments.return_value = DeleteResponse(num_deleted=0) client.delete("/api/v1/attachments") attachment_repo.delete_attachments.assert_awaited_once() + + +# =========================================================================== +# Component downloads: /{resource}/download/{short_mime} +# +# Parametrised over the three component resources so download behavior is held +# to the same contract everywhere. Each entry is +# (url_prefix, repo_fixture_name, download_method, expected_stem). +# =========================================================================== + +_DOWNLOAD_CASES = [ + ("structures", "structure_repo", "download_structures", "structures"), + ("tables", "table_repo", "download_tables", "tables"), + ("attachments", "attachment_repo", "download_attachments", "attachments"), +] + + +@pytest.fixture +def download_target(request): + """Resolve a (prefix, repo, method_name, stem) case into a wired repo mock.""" + prefix, repo_fixture, method, stem = request.param + repo = request.getfixturevalue(repo_fixture) + getattr(repo, method).return_value = iter([b"x"]) + return prefix, repo, method, stem + + +@pytest.mark.parametrize("download_target", _DOWNLOAD_CASES, indirect=True) +class TestComponentDownloads: + def test_csv_returns_200(self, client, download_target): + prefix, *_ = download_target + assert client.get(f"/api/v1/{prefix}/download/gz?format=csv").status_code == 200 + + def test_jsonl_returns_200(self, client, download_target): + prefix, *_ = download_target + assert client.get(f"/api/v1/{prefix}/download/gz?format=jsonl").status_code == 200 + + def test_body_is_streamed_bytes(self, client, download_target): + prefix, repo, method, _ = download_target + getattr(repo, method).return_value = iter([b"ab", b"cd"]) + assert client.get(f"/api/v1/{prefix}/download/gz?format=jsonl").content == b"abcd" + + def test_format_is_required(self, client, download_target): + # Component download routes give `format` no default, unlike contributions. + prefix, *_ = download_target + assert client.get(f"/api/v1/{prefix}/download/gz").status_code == 422 + + def test_invalid_short_mime_returns_422(self, client, download_target): + prefix, *_ = download_target + assert client.get(f"/api/v1/{prefix}/download/zip?format=jsonl").status_code == 422 + + def test_invalid_format_returns_422(self, client, download_target): + prefix, *_ = download_target + assert client.get(f"/api/v1/{prefix}/download/gz?format=xml").status_code == 422 + + def test_format_forwarded_to_repo(self, client, download_target): + prefix, repo, method, _ = download_target + client.get(f"/api/v1/{prefix}/download/gz?format=csv") + assert getattr(repo, method).call_args.kwargs["format"] == "csv" + + def test_csv_filename_uses_csv_extension(self, client, download_target): + """RED: a CSV download should be named *.csv.gz, not *.jsonl.gz. + + Every component router hardcodes the ``.jsonl.gz`` extension regardless of + the requested ``format``, so CSV downloads are mislabelled. + """ + prefix, *_ = download_target + cd = client.get(f"/api/v1/{prefix}/download/gz?format=csv").headers["content-disposition"] + assert ".csv.gz" in cd diff --git a/mpcontribs-api/tests/integration/test_contributions_routes.py b/mpcontribs-api/tests/integration/test_contributions_routes.py index 716298b00b..e78fdb2136 100644 --- a/mpcontribs-api/tests/integration/test_contributions_routes.py +++ b/mpcontribs-api/tests/integration/test_contributions_routes.py @@ -14,6 +14,7 @@ get_scoped_contributions, ) from mpcontribs_api.domains.contributions.models import ContributionOut +from mpcontribs_api.exceptions import NotFoundError # --------------------------------------------------------------------------- # Fixtures @@ -177,3 +178,76 @@ def test_delete_builds_filter_from_path_id(self, client, contribution_service): client.delete(f"/api/v1/contributions/{oid}") passed_filter = contribution_service.delete_contributions.call_args.args[0] assert passed_filter.id == oid + + +# =========================================================================== +# GET /contributions/download/{short_mime} +# =========================================================================== + + +class TestDownloadContributions: + def test_default_format_jsonl_returns_200(self, client, contribution_repo): + # The contributions route gives `format` a default of JSONL, so it works + # with the param omitted (component routes require it — see test_component_routes). + contribution_repo.download_contributions.return_value = iter([b"x"]) + assert client.get("/api/v1/contributions/download/gz").status_code == 200 + + def test_csv_format_returns_200(self, client, contribution_repo): + contribution_repo.download_contributions.return_value = iter([b"x"]) + assert client.get("/api/v1/contributions/download/gz?format=csv").status_code == 200 + + def test_body_is_streamed_bytes(self, client, contribution_repo): + contribution_repo.download_contributions.return_value = iter([b"abc", b"def"]) + assert client.get("/api/v1/contributions/download/gz").content == b"abcdef" + + def test_invalid_short_mime_returns_422(self, client, contribution_repo): + contribution_repo.download_contributions.return_value = iter([b"x"]) + # Only 'gz' is a valid ShortMimeFormat. + assert client.get("/api/v1/contributions/download/zip").status_code == 422 + + def test_invalid_format_returns_422(self, client, contribution_repo): + contribution_repo.download_contributions.return_value = iter([b"x"]) + assert client.get("/api/v1/contributions/download/gz?format=xml").status_code == 422 + + def test_format_forwarded_to_repo(self, client, contribution_repo): + contribution_repo.download_contributions.return_value = iter([b"x"]) + client.get("/api/v1/contributions/download/gz?format=csv") + assert contribution_repo.download_contributions.call_args.kwargs["format"] == "csv" + + def test_fields_parsed_and_forwarded(self, client, contribution_repo): + contribution_repo.download_contributions.return_value = iter([b"x"]) + client.get("/api/v1/contributions/download/gz?_fields=project") + forwarded = contribution_repo.download_contributions.call_args.kwargs["fields"] + assert "project" in forwarded + + def test_invalid_fields_returns_422(self, client, contribution_repo): + contribution_repo.download_contributions.return_value = iter([b"x"]) + assert client.get("/api/v1/contributions/download/gz?_fields=not_a_field").status_code == 422 + + def test_filename_names_the_contributions_resource(self, client, contribution_repo): + """RED: the attachment filename should reference contributions, not attachments. + + The route hardcodes ``filename="attachments.jsonl.gz"`` (copy-paste from the + attachments router), so a contributions download saves under the wrong name. + """ + contribution_repo.download_contributions.return_value = iter([b"x"]) + cd = client.get("/api/v1/contributions/download/gz").headers["content-disposition"] + assert "contributions" in cd + + def test_csv_filename_uses_csv_extension(self, client, contribution_repo): + """RED: a CSV download should be named *.csv.gz, not *.jsonl.gz. + + The filename extension is hardcoded to ``.jsonl.gz`` regardless of the + requested ``format``, so CSV downloads are mislabelled as JSONL. + """ + contribution_repo.download_contributions.return_value = iter([b"x"]) + cd = client.get("/api/v1/contributions/download/gz?format=csv").headers["content-disposition"] + assert ".csv.gz" in cd + + def test_repo_error_surfaces_as_uniform_json(self, client, contribution_repo): + # An AppError raised while the repo builds the download surfaces through the + # registered exception handler as the uniform error envelope (not a 500 traceback). + contribution_repo.download_contributions.side_effect = NotFoundError("nothing to download") + r = client.get("/api/v1/contributions/download/gz") + assert r.status_code == 404 + assert r.json()["error"]["code"] == "not_found" diff --git a/mpcontribs-api/tests/unit/domains/test_shared_repository_download.py b/mpcontribs-api/tests/unit/domains/test_shared_repository_download.py new file mode 100644 index 0000000000..622ae03593 --- /dev/null +++ b/mpcontribs-api/tests/unit/domains/test_shared_repository_download.py @@ -0,0 +1,352 @@ +"""Unit tests for the download/serialization core on MongoDbRepository. + +The download pipeline (``_serialize_jsonl``, ``_serialize_csv``, ``_get_serializer``, +``_hash_payload``, ``download``) had no direct coverage — only the route happy-path +was exercised via mocked repos. These tests drive a minimal concrete repository +subclass with a fake output model and a fake query so the serialization and gzip +streaming logic can be verified without a database. + +Several tests assert the *correct* behavior the pipeline should have and therefore +fail against the current implementation (red). Each is marked in its docstring with +the bug it pins: + + * download() never calls ``compressor.flush()`` -> the streamed gzip member is + truncated (missing trailing data + CRC/size footer), so it cannot be decompressed. + * ``_get_serializer`` has no fallback branch -> an unsupported format returns None + and the caller crashes with a TypeError instead of a clear error. + * ``_hash_payload`` calls ``json.dumps`` with no ``default=`` -> a filter carrying + an ObjectId/datetime raises TypeError before the download can even start. + * ``_serialize_csv`` writes Python ``repr`` for dict/nested values rather than JSON. +""" + +import csv +import gzip +import io +import json +from collections.abc import AsyncIterable, AsyncIterator +from datetime import datetime, timezone +from types import SimpleNamespace +from typing import Any +from unittest.mock import MagicMock + +import pytest +from beanie import PydanticObjectId +from pydantic import BaseModel + +from mpcontribs_api.auth import User +from mpcontribs_api.domains._shared.repository import MongoDbRepository +from mpcontribs_api.domains._shared.types import DownloadFormat, ShortMimeFormat + +# --------------------------------------------------------------------------- +# Test doubles +# --------------------------------------------------------------------------- + + +class _Out(BaseModel): + """Minimal output model with scalar fields.""" + + a: int + b: str + + +class _OutWithData(BaseModel): + """Output model whose ``data`` column holds a nested dict (CSV edge case).""" + + name: str + data: dict + + +class _FakeQuery: + """Async-iterable stand-in for a Beanie find() query.""" + + def __init__(self, rows: list[Any]) -> None: + self._rows = rows + + async def __aiter__(self) -> AsyncIterator[Any]: + for row in self._rows: + yield row + + +class _FakeFilter: + """Stand-in for a fastapi-filter Filter. + + ``filter()`` ignores the base query and returns a fake query over the seeded + rows; ``sort()`` is a passthrough; ``model_dump()`` returns the configured + payload (used by ``download`` when building the cache key). + """ + + def __init__(self, rows: list[Any], dump: dict[str, Any] | None = None) -> None: + self._rows = rows + self._dump = {} if dump is None else dump + + def filter(self, _base: Any) -> _FakeQuery: + return _FakeQuery(self._rows) + + def sort(self, query: _FakeQuery) -> _FakeQuery: + return query + + def model_dump(self) -> dict[str, Any]: + return self._dump + + +class _FakeRepo(MongoDbRepository): + """Concrete repository binding just enough to exercise the shared download core.""" + + document_model = MagicMock() + out_model = _Out + + @staticmethod + def _build_scope(user: User) -> dict[str, Any]: + return {} + + +def _repo(out_model: type[BaseModel] = _Out) -> _FakeRepo: + repo = _FakeRepo(User()) + repo.out_model = out_model # type: ignore[assignment] + repo.document_model = MagicMock() # type: ignore[assignment] + return repo + + +async def _aiter(items: list[Any]) -> AsyncIterator[Any]: + for item in items: + yield item + + +async def _collect(stream: AsyncIterable[bytes]) -> bytes: + chunks: list[bytes] = [] + async for chunk in stream: + chunks.append(chunk) + return b"".join(chunks) + + +# =========================================================================== +# _serialize_jsonl +# =========================================================================== + + +class TestSerializeJsonl: + async def test_one_line_per_row(self): + rows = [_Out(a=1, b="x"), _Out(a=2, b="y")] + out = await _collect(MongoDbRepository._serialize_jsonl(_aiter(rows))) + assert out.count(b"\n") == 2 + + async def test_each_line_round_trips_to_row(self): + rows = [_Out(a=1, b="x"), _Out(a=2, b="y")] + out = await _collect(MongoDbRepository._serialize_jsonl(_aiter(rows))) + parsed = [json.loads(line) for line in out.splitlines()] + assert parsed == [{"a": 1, "b": "x"}, {"a": 2, "b": "y"}] + + async def test_every_line_terminated_with_newline(self): + rows = [_Out(a=1, b="x"), _Out(a=2, b="y")] + out = await _collect(MongoDbRepository._serialize_jsonl(_aiter(rows))) + assert out.endswith(b"\n") + + async def test_empty_input_yields_nothing(self): + out = await _collect(MongoDbRepository._serialize_jsonl(_aiter([]))) + assert out == b"" + + async def test_unicode_payload_preserved(self): + rows = [_Out(a=1, b="café—ü")] + out = await _collect(MongoDbRepository._serialize_jsonl(_aiter(rows))) + assert json.loads(out)["b"] == "café—ü" + + +# =========================================================================== +# _serialize_csv +# =========================================================================== + + +def _parse_csv(raw: bytes) -> list[dict[str, str]]: + return list(csv.DictReader(io.StringIO(raw.decode()))) + + +class TestSerializeCsv: + async def test_header_written_once(self): + rows = [_Out(a=1, b="x"), _Out(a=2, b="y")] + raw = await _collect(MongoDbRepository._serialize_csv(_aiter(rows), None)) + # Header appears exactly once even across multiple rows. + assert raw.decode().count("a,b") == 1 + + async def test_columns_default_to_first_row_keys_when_no_fields(self): + rows = [_Out(a=1, b="x")] + raw = await _collect(MongoDbRepository._serialize_csv(_aiter(rows), None)) + reader = csv.reader(io.StringIO(raw.decode())) + assert next(reader) == ["a", "b"] + + async def test_columns_follow_sorted_fields_when_given(self): + rows = [_Out(a=1, b="x")] + raw = await _collect(MongoDbRepository._serialize_csv(_aiter(rows), frozenset({"b", "a"}))) + reader = csv.reader(io.StringIO(raw.decode())) + assert next(reader) == ["a", "b"] + + async def test_extra_fields_are_ignored(self): + # 'b' is not in the requested field set -> dropped from output. + rows = [_Out(a=1, b="x")] + raw = await _collect(MongoDbRepository._serialize_csv(_aiter(rows), frozenset({"a"}))) + parsed = _parse_csv(raw) + assert parsed == [{"a": "1"}] + + async def test_all_rows_emitted(self): + rows = [_Out(a=i, b=str(i)) for i in range(5)] + raw = await _collect(MongoDbRepository._serialize_csv(_aiter(rows), None)) + assert len(_parse_csv(raw)) == 5 + + async def test_no_row_bleed_between_chunks(self): + # Each yielded chunk after the header must contain exactly one row, proving + # the shared StringIO buffer is truncated between iterations. + rows = [_Out(a=1, b="x"), _Out(a=2, b="y")] + chunks = [c async for c in MongoDbRepository._serialize_csv(_aiter(rows), None)] + # First chunk: header + row 1; subsequent chunks: one row each. + assert b"2,y" not in chunks[0] + + async def test_empty_input_yields_no_bytes(self): + raw = await _collect(MongoDbRepository._serialize_csv(_aiter([]), None)) + assert raw == b"" + + async def test_dict_value_serialized_as_json(self): + """RED: dict-valued columns should be emitted as JSON, not Python repr. + + ``model_dump(mode="json")`` leaves nested dicts as dict objects; csv then + writes ``str(dict)`` (single-quoted Python repr) which is not valid JSON and + cannot be round-tripped by consumers. The column should hold JSON instead. + """ + rows = [_OutWithData(name="r1", data={"k": "v", "n": 1})] + raw = await _collect(MongoDbRepository._serialize_csv(_aiter(rows), None)) + cell = _parse_csv(raw)[0]["data"] + assert json.loads(cell) == {"k": "v", "n": 1} + + +# =========================================================================== +# _get_serializer +# =========================================================================== + + +class TestGetSerializer: + def test_jsonl_returns_jsonl_serializer(self): + repo = _repo() + assert repo._get_serializer(DownloadFormat.JSONL, None) is MongoDbRepository._serialize_jsonl + + async def test_csv_serializer_is_callable_and_serializes(self): + repo = _repo() + serializer = repo._get_serializer(DownloadFormat.CSV, frozenset({"a"})) + raw = await _collect(serializer(_aiter([_Out(a=1, b="x")]))) + assert _parse_csv(raw) == [{"a": "1"}] + + def test_unsupported_format_raises(self): + """RED: an unknown format should raise, not fall through returning None. + + Today ``_get_serializer`` has no else branch, so an unsupported value + returns None and the caller blows up with an opaque ``TypeError: 'NoneType' + object is not callable`` deep in ``download``. It should raise a clear error. + """ + repo = _repo() + with pytest.raises((ValueError, KeyError, NotImplementedError)): + repo._get_serializer("xml", None) # type: ignore[arg-type] + + +# =========================================================================== +# _hash_payload +# =========================================================================== + + +class TestHashPayload: + def test_is_deterministic(self): + repo = _repo() + payload = {"format": "jsonl", "fields": ["a", "b"]} + assert repo._hash_payload(payload) == repo._hash_payload(payload) + + def test_independent_of_key_order(self): + repo = _repo() + assert repo._hash_payload({"a": 1, "b": 2}) == repo._hash_payload({"b": 2, "a": 1}) + + def test_sensitive_to_value_changes(self): + repo = _repo() + assert repo._hash_payload({"a": 1}) != repo._hash_payload({"a": 2}) + + def test_returns_sha256_hex(self): + repo = _repo() + digest = repo._hash_payload({"a": 1}) + assert len(digest) == 64 + assert all(c in "0123456789abcdef" for c in digest) + + def test_object_id_filter_is_hashable(self): + """RED: filters carrying an ObjectId must hash without raising. + + ``download`` hashes ``filter.model_dump()`` which, for an ``id__in`` filter, + contains PydanticObjectId values. ``json.dumps`` without ``default=`` raises + ``TypeError`` on these, so any filtered download by id crashes before it starts. + """ + repo = _repo() + payload = {"filter": {"id__in": [PydanticObjectId(), PydanticObjectId()]}} + digest = repo._hash_payload(payload) + assert len(digest) == 64 + + def test_datetime_filter_is_hashable(self): + """RED: filters carrying a datetime must hash without raising (see above).""" + repo = _repo() + payload = {"filter": {"created__gte": datetime(2024, 1, 1, tzinfo=timezone.utc)}} + digest = repo._hash_payload(payload) + assert len(digest) == 64 + + +# =========================================================================== +# download (end-to-end: query -> serialize -> gzip stream) +# =========================================================================== + + +class TestDownload: + async def test_jsonl_stream_decompresses_to_rows(self): + """RED: the gzip stream must decompress cleanly. + + ``download`` builds a zlib gzip compressor but never calls ``flush()`` after + the final chunk, so the trailing buffered bytes and the gzip footer (CRC32 + + ISIZE) are never emitted. ``gzip.decompress`` therefore raises on the + truncated member. When fixed, the decompressed bytes equal the JSONL payload. + """ + repo = _repo(_Out) + filter = _FakeFilter(rows=[SimpleNamespace(a=1, b="x"), SimpleNamespace(a=2, b="y")]) + stream = repo.download( + format=DownloadFormat.JSONL, + short_mime=ShortMimeFormat.GZ, + ignore_cache=True, + filter=filter, # type: ignore[arg-type] + fields=None, + ) + compressed = await _collect(stream) + decompressed = gzip.decompress(compressed) + parsed = [json.loads(line) for line in decompressed.splitlines()] + assert parsed == [{"a": 1, "b": "x"}, {"a": 2, "b": "y"}] + + async def test_csv_stream_decompresses_to_rows(self): + """RED: same flush bug, exercised through the CSV serializer.""" + repo = _repo(_Out) + filter = _FakeFilter(rows=[SimpleNamespace(a=1, b="x"), SimpleNamespace(a=2, b="y")]) + stream = repo.download( + format=DownloadFormat.CSV, + short_mime=ShortMimeFormat.GZ, + ignore_cache=True, + filter=filter, # type: ignore[arg-type] + fields=frozenset({"a", "b"}), + ) + compressed = await _collect(stream) + decompressed = gzip.decompress(compressed) + assert _parse_csv(decompressed) == [{"a": "1", "b": "x"}, {"a": "2", "b": "y"}] + + async def test_empty_result_is_valid_empty_gzip(self): + """A download with no matching rows yields zero bytes, which gzip treats as empty. + + Unlike the non-empty cases (which hit the missing-``flush()`` bug), an empty + result never enters the compress loop, so the stream is genuinely empty and + ``gzip.decompress(b"")`` returns ``b""``. Guards that empty downloads stay valid. + """ + repo = _repo(_Out) + filter = _FakeFilter(rows=[]) + stream = repo.download( + format=DownloadFormat.JSONL, + short_mime=ShortMimeFormat.GZ, + ignore_cache=True, + filter=filter, # type: ignore[arg-type] + fields=None, + ) + compressed = await _collect(stream) + assert gzip.decompress(compressed) == b"" From b78b0d05a154c35dd831c05e49f0f6d656c45a06 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 15 Jun 2026 12:13:47 -0700 Subject: [PATCH 354/591] Fixed gzip missing final packet; improved CSV serialization; improved download filenames --- .../mpcontribs_api/domains/_shared/components.py | 2 +- .../mpcontribs_api/domains/_shared/repository.py | 16 +++++++++++++++- .../src/mpcontribs_api/domains/_shared/types.py | 10 ++++++++++ .../mpcontribs_api/domains/attachments/models.py | 3 +++ .../mpcontribs_api/domains/attachments/router.py | 10 ++++++++-- .../domains/contributions/router.py | 10 ++++++++-- .../mpcontribs_api/domains/structures/models.py | 3 +++ .../mpcontribs_api/domains/structures/router.py | 10 ++++++++-- .../src/mpcontribs_api/domains/tables/models.py | 3 +++ .../src/mpcontribs_api/domains/tables/router.py | 10 ++++++++-- 10 files changed, 67 insertions(+), 10 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py index bc184d5e23..a0904df163 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py @@ -128,7 +128,7 @@ async def delete_component_by_id( Returns: DeleteResponse: A report of the deletion """ - return await self.delete_by_id(id=id, session=session) + return await self.delete_by_id(id=self._convert_object_id(id), session=session) async def patch_component_by_id(self, id: str, update: TPatch) -> TDoc: """Partially update a component by id, scoped to the current user. See ``patch``.""" diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py index fa2b7ea312..0b75a95c1d 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py @@ -193,6 +193,7 @@ def _hash_payload(self, payload: dict[str, Any], *, separators: tuple[str, str] sort_keys=True, separators=separators, ensure_ascii=True, + default=str, # filters may carry ObjectId/datetime values; stringify for a stable key ) return hashlib.sha256(canonical.encode("utf-8")).hexdigest() @@ -209,6 +210,13 @@ async def _serialize_jsonl(rows: AsyncIterable) -> AsyncIterator[bytes]: async for out in rows: yield out.model_dump_json().encode() + b"\n" + @staticmethod + def _csv_cell(value: Any) -> Any: + """Render a cell value for CSV: scalars as-is, dict/list as JSON (not Python repr).""" + if value is None or isinstance(value, (str, int, float, bool)): + return value + return json.dumps(value, ensure_ascii=False, separators=(",", ":")) + @staticmethod async def _serialize_csv(rows: AsyncIterable, fields: frozenset[str] | None) -> AsyncIterator[bytes]: buf = io.StringIO() @@ -219,7 +227,7 @@ async def _serialize_csv(rows: AsyncIterable, fields: frozenset[str] | None) -> cols = sorted(fields) if fields else list(row.keys()) writer = csv.DictWriter(buf, fieldnames=cols, extrasaction="ignore") writer.writeheader() - writer.writerow(row) + writer.writerow({key: MongoDbRepository._csv_cell(value) for key, value in row.items()}) yield buf.getvalue().encode() buf.seek(0) buf.truncate(0) @@ -264,3 +272,9 @@ async def rows() -> AsyncIterator[TOut]: chunk = compressor.compress(line) if chunk: yield chunk + + # Flush the remaining buffered bytes and the gzip footer + # Without this the stream is a truncated gzip that cannot be decompressed. + tail = compressor.flush() + if tail: + yield tail diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py index a734377f5e..9f7c2ef72f 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py @@ -69,6 +69,16 @@ class ShortMimeFormat(StrEnum): GZ = "gz" +# Not exactly a type, but used to coerce a str to a desired format (pseudo-type) +def download_filename(resource: str, format: DownloadFormat, short_mime: ShortMimeFormat) -> str: + """Build a download filename reflecting the resource, payload format, and compression. + + e.g. ``download_filename("contributions", DownloadFormat.CSV, ShortMimeFormat.GZ)`` + -> ``"contributions.csv.gz"``. + """ + return f"{resource}.{format.value}.{short_mime.value}" + + def _coerce_frame(v: object) -> pl.DataFrame: if isinstance(v, pl.DataFrame): return v diff --git a/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py b/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py index dd03082b22..3f949dfe74 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py @@ -68,5 +68,8 @@ class AttachmentFilter(Filter): mime__neq: MimeFormat | None = None mime__ilike: MimeFormat | None = None + # sorting + order_by: list[str] | None = None + class Constants(Filter.Constants): model = Attachment diff --git a/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py b/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py index 36bccec993..01ad34b71b 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py @@ -5,7 +5,12 @@ from fastapi_filter import FilterDepends from mpcontribs_api.domains._shared.models import DeleteResponse -from mpcontribs_api.domains._shared.types import DownloadFormat, FieldSelector, ShortMimeFormat +from mpcontribs_api.domains._shared.types import ( + DownloadFormat, + FieldSelector, + ShortMimeFormat, + download_filename, +) from mpcontribs_api.domains.attachments.dependencies import AttachmentDep from mpcontribs_api.domains.attachments.models import AttachmentFilter, AttachmentOut from mpcontribs_api.pagination import CursorParams, Page @@ -52,10 +57,11 @@ async def download_attachment( filter=filter, fields=selected, ) + filename = download_filename("attachments", format, short_mime) return StreamingResponse( body, media_type="application/gzip", - headers={"Content-Disposition": 'attachment; filename="attachments.jsonl.gz"'}, + headers={"Content-Disposition": f'attachment; filename="{filename}"'}, ) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py index 967dd69926..80ee24c4f7 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py @@ -5,7 +5,12 @@ from fastapi_filter import FilterDepends from mpcontribs_api.domains._shared.bulk import BulkWriteSummary -from mpcontribs_api.domains._shared.types import DownloadFormat, FieldSelector, ShortMimeFormat +from mpcontribs_api.domains._shared.types import ( + DownloadFormat, + FieldSelector, + ShortMimeFormat, + download_filename, +) from mpcontribs_api.domains.contributions.dependencies import ContributionDep, ContributionServiceDep from mpcontribs_api.domains.contributions.models import ( Contribution, @@ -72,10 +77,11 @@ async def download_contributions( filter=filter, fields=selected, ) + filename = download_filename("contributions", format, short_mime) return StreamingResponse( body, media_type="application/gzip", - headers={"Content-Disposition": 'attachment; filename="attachments.jsonl.gz"'}, + headers={"Content-Disposition": f'attachment; filename="{filename}"'}, ) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py index 0b097c9e9f..b462d70aea 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py @@ -96,5 +96,8 @@ class StructureFilter(Filter): # sites + # sorting + order_by: list[str] | None = None + class Constants(Filter.Constants): model = Structure diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py index be153b0ed6..d3d51a7f2b 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py @@ -6,7 +6,12 @@ from mpcontribs_api.domains._shared.bulk import BulkWriteSummary from mpcontribs_api.domains._shared.models import DeleteResponse -from mpcontribs_api.domains._shared.types import DownloadFormat, FieldSelector, ShortMimeFormat +from mpcontribs_api.domains._shared.types import ( + DownloadFormat, + FieldSelector, + ShortMimeFormat, + download_filename, +) from mpcontribs_api.domains.structures.dependencies import StructureDep from mpcontribs_api.domains.structures.models import StructureFilter, StructureIn, StructureOut, StructurePatch from mpcontribs_api.pagination import CursorParams, Page @@ -52,10 +57,11 @@ async def download_structure( filter=filter, fields=selected, ) + filename = download_filename("structures", format, short_mime) return StreamingResponse( body, media_type="application/gzip", - headers={"Content-Disposition": 'attachment; filename="structures.jsonl.gz"'}, + headers={"Content-Disposition": f'attachment; filename="{filename}"'}, ) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py index 65985b362e..6ea93ed2be 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py @@ -108,6 +108,9 @@ class TableFilter(Filter): # Columns # Attrs + # sorting + order_by: list[str] | None = None + class Constants(Filter.Constants): model = Table diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py index 24d8cdc7d9..42cddd4654 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py @@ -6,7 +6,12 @@ from mpcontribs_api.domains._shared.bulk import BulkWriteSummary from mpcontribs_api.domains._shared.models import DeleteResponse -from mpcontribs_api.domains._shared.types import DownloadFormat, FieldSelector, ShortMimeFormat +from mpcontribs_api.domains._shared.types import ( + DownloadFormat, + FieldSelector, + ShortMimeFormat, + download_filename, +) from mpcontribs_api.domains.tables.dependencies import TableDep from mpcontribs_api.domains.tables.models import Table, TableFilter, TableIn, TableOut, TablePatch from mpcontribs_api.pagination import CursorParams, Page @@ -52,10 +57,11 @@ async def download_table( filter=filter, fields=selected, ) + filename = download_filename("tables", format, short_mime) return StreamingResponse( body, media_type="application/gzip", - headers={"Content-Disposition": 'attachment; filename="tables.jsonl.gz"'}, + headers={"Content-Disposition": f'attachment; filename="{filename}"'}, ) From 14eb001dc926f566daba45ffcafdfc85d9c4b6db Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 15 Jun 2026 12:47:28 -0700 Subject: [PATCH 355/591] Moved DataFormat decision to a match statement --- .../src/mpcontribs_api/domains/_shared/repository.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py index 0b75a95c1d..cc7771d1b1 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py @@ -200,10 +200,11 @@ def _hash_payload(self, payload: dict[str, Any], *, separators: tuple[str, str] def _get_serializer( self, format: DownloadFormat, fields: frozenset[str] | None ) -> Callable[[AsyncIterable[TOut]], AsyncIterable[bytes]]: - if format == DownloadFormat.JSONL: - return self._serialize_jsonl - if format == DownloadFormat.CSV: - return lambda rows: self._serialize_csv(rows, fields) + match format: + case DownloadFormat.JSONL: + return self._serialize_jsonl + case DownloadFormat.CSV: + return lambda rows: self._serialize_csv(rows, fields) @staticmethod async def _serialize_jsonl(rows: AsyncIterable) -> AsyncIterator[bytes]: From c2e7816b7d5d6a8707da64eb6cf768f50ec8e734 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 15 Jun 2026 12:47:48 -0700 Subject: [PATCH 356/591] Removed module-level docstrings --- mpcontribs-api/tests/conftest.py | 7 -- mpcontribs-api/tests/integration/conftest.py | 14 ---- .../tests/integration/db/conftest.py | 12 ---- .../db/test_components_repository.py | 35 +--------- .../db/test_contributions_repository.py | 11 ---- .../tests/integration/db/test_download.py | 16 ----- .../db/test_projects_repository.py | 12 ---- .../integration/test_component_routes.py | 12 +--- .../tests/integration/test_contributions.py | 7 -- .../integration/test_contributions_routes.py | 19 +----- .../tests/integration/test_error_handlers.py | 7 -- .../tests/integration/test_healthcheck.py | 9 --- .../tests/integration/test_projects.py | 11 ---- mpcontribs-api/tests/unit/conftest.py | 7 -- .../unit/domains/test_attachments_models.py | 2 - .../unit/domains/test_contribution_service.py | 9 --- .../tests/unit/domains/test_shared_bulk.py | 2 - .../tests/unit/domains/test_shared_models.py | 7 -- .../test_shared_repository_download.py | 64 ++++++------------- .../unit/domains/test_structures_models.py | 2 - .../tests/unit/domains/test_tables_models.py | 14 ---- mpcontribs-api/tests/unit/test_config.py | 2 - .../tests/unit/test_types_components.py | 7 -- 23 files changed, 26 insertions(+), 262 deletions(-) diff --git a/mpcontribs-api/tests/conftest.py b/mpcontribs-api/tests/conftest.py index 42f8eef4ed..b6d47ba59d 100644 --- a/mpcontribs-api/tests/conftest.py +++ b/mpcontribs-api/tests/conftest.py @@ -1,10 +1,3 @@ -"""Shared pytest configuration and fixtures. - -Environment variables for Settings are set at module level (before any source -imports) so that auth.py and config.py can load successfully without a real -.env file. -""" - import os from dotenv import load_dotenv diff --git a/mpcontribs-api/tests/integration/conftest.py b/mpcontribs-api/tests/integration/conftest.py index eef129b066..00e130edaf 100644 --- a/mpcontribs-api/tests/integration/conftest.py +++ b/mpcontribs-api/tests/integration/conftest.py @@ -1,17 +1,3 @@ -"""Integration test infrastructure. - -make_test_app() builds a real FastAPI application (routers, middleware, -exception handlers) but with: - - A no-op lifespan so no MongoDB connection is attempted. - - The verify_gateway dependency absent at the app level; tests that want to - check gateway enforcement use the gateway_app fixture instead. - -Fixtures follow the pattern: - test_app (session) — base app, no dependency overrides - client (function) — TestClient wrapping test_app; overrides are set per-test - and cleared on teardown to avoid bleed between tests. -""" - from contextlib import asynccontextmanager from unittest.mock import AsyncMock, MagicMock, patch diff --git a/mpcontribs-api/tests/integration/db/conftest.py b/mpcontribs-api/tests/integration/db/conftest.py index 9de472f15b..beab815b9f 100644 --- a/mpcontribs-api/tests/integration/db/conftest.py +++ b/mpcontribs-api/tests/integration/db/conftest.py @@ -1,15 +1,3 @@ -"""Fixtures for tests that require a live MongoDB connection. - -Connection settings come from the .env file (MPCONTRIBS_MONGO__URI and -MPCONTRIBS_MONGO__DB_NAME). All tests in this directory are marked `db` -automatically; run them with `just test db` or skip them with `-m "not db"`. - -Data isolation: the `clean_projects` and `clean_contributions` fixtures -(autouse) delete all documents from the test collections before each test. -This is intentionally destructive — point MPCONTRIBS_MONGO__DB_NAME at a -dedicated test database, not a shared or production one. -""" - import pytest import pytest_asyncio from beanie import init_beanie diff --git a/mpcontribs-api/tests/integration/db/test_components_repository.py b/mpcontribs-api/tests/integration/db/test_components_repository.py index e2fee93871..62748248d7 100644 --- a/mpcontribs-api/tests/integration/db/test_components_repository.py +++ b/mpcontribs-api/tests/integration/db/test_components_repository.py @@ -1,15 +1,3 @@ -"""Database integration tests for MongoDbComponentsRepository (live MongoDB). - -The component repository's md5-dedupe insert, chunked ``insert_many``, filtered -delete, delete-by-id and patch logic lives on the shared -``MongoDbComponentsRepository`` and had no direct coverage. These tests exercise -it through ``MongoDbAttachmentRepository`` (the simplest concrete component) against -real Beanie/MongoDB. - -Run with: uv run pytest -m db -Skip with: uv run pytest -m "not db" -""" - import gzip import pytest @@ -128,15 +116,7 @@ async def test_filtered_delete_removes_only_matches(self, db): assert remaining == {"b" * 32} async def test_delete_by_id_removes_one(self, db): - """RED: delete_component_by_id never matches a string id. - - Routers pass the id through as a path string, but ``delete_component_by_id`` - forwards it straight to ``delete_by_id`` without converting to a - ``PydanticObjectId`` (unlike ``patch_component_by_id``, which calls - ``_convert_object_id``). ``Attachment.id == ""`` then never matches - the ObjectId-typed ``_id``, so the delete raises NotFoundError and component - delete-by-id is effectively broken. - """ + """delete_component_by_id matches a string id by converting it to ObjectId.""" [doc] = await _repo().insert_components([_attachment("a" * 32)]) result = await _repo().delete_component_by_id(str(doc.id)) assert result.num_deleted == 1 @@ -173,18 +153,7 @@ async def test_empty_patch_returns_existing(self, db): class TestComponentDownload: async def test_jsonl_download_round_trips(self, db): - """RED: component downloads are doubly broken. - - 1. ``MongoDbRepository.download`` calls ``filter.sort(query)``, but the - component filters (Attachment/Structure/Table) don't define an - ``order_by`` field, so ``sort`` raises ``AttributeError`` before any - bytes are streamed. (ContributionFilter does define ``order_by``, which - is why contribution downloads get past this point.) - 2. Even once ordering is added, the compressor is never flushed (see - tests/integration/db/test_download.py), so the gzip member is truncated. - - When both are fixed this verifies the component download path end to end. - """ + """Component downloads stream a decompressable gzip of all rows.""" await _repo().insert_components([_attachment("a" * 32), _attachment("b" * 32)]) stream = await _repo().download_attachments( format=DownloadFormat.JSONL, diff --git a/mpcontribs-api/tests/integration/db/test_contributions_repository.py b/mpcontribs-api/tests/integration/db/test_contributions_repository.py index 0aa09fda9d..83fdaa2880 100644 --- a/mpcontribs-api/tests/integration/db/test_contributions_repository.py +++ b/mpcontribs-api/tests/integration/db/test_contributions_repository.py @@ -1,14 +1,3 @@ -"""Database integration tests for MongoDbContributionRepository. - -These tests require a live MongoDB connection (see conftest.py). They exercise -the real Beanie/MongoDB layer: query scoping, field projection, cursor -pagination, bulk insert, single insert, find-one, update, delete-by-id, and -bulk delete — none of which can be verified with mocks. - -Run with: uv run pytest -m db -Skip with: uv run pytest -m "not db" -""" - import pytest from beanie import PydanticObjectId diff --git a/mpcontribs-api/tests/integration/db/test_download.py b/mpcontribs-api/tests/integration/db/test_download.py index 90f6bff6c1..d229de1814 100644 --- a/mpcontribs-api/tests/integration/db/test_download.py +++ b/mpcontribs-api/tests/integration/db/test_download.py @@ -1,19 +1,3 @@ -"""Database integration tests for the download pipeline (live MongoDB). - -These exercise ``MongoDbContributionRepository.download_contributions`` against -real Beanie/MongoDB: the scoped+sorted query, projection, JSONL/CSV serialization -and gzip streaming, end to end. - -Most round-trip tests gzip-*decompress* the streamed bytes and compare to the -seeded data. They are RED today: ``MongoDbRepository.download`` never calls -``compressor.flush()``, so the streamed gzip member is truncated (missing trailing -data + CRC/ISIZE footer) and ``gzip.decompress`` raises. Once ``flush()`` is added -these same tests also verify scope filtering and field projection on real data. - -Run with: uv run pytest -m db -Skip with: uv run pytest -m "not db" -""" - import csv import gzip import io diff --git a/mpcontribs-api/tests/integration/db/test_projects_repository.py b/mpcontribs-api/tests/integration/db/test_projects_repository.py index 5affc40aec..ef629cb576 100644 --- a/mpcontribs-api/tests/integration/db/test_projects_repository.py +++ b/mpcontribs-api/tests/integration/db/test_projects_repository.py @@ -6,18 +6,6 @@ from mpcontribs_api.exceptions import ConflictError, NotFoundError from mpcontribs_api.pagination import CursorParams -"""Database integration tests for MongoDbProjectRepository. - -These tests require a live MongoDB connection (see conftest.py). They exercise -the real Beanie/MongoDB layer — query scoping, field projection, cursor -pagination, soft-delete, conflict detection, patch, and upsert — none of which -can be verified with mock repositories. - -Run with: just test db -Skip with: uv run pytest -m "not db" -""" - - # All tests in this module share the session event loop so they can reuse the # session-scoped AsyncMongoClient initialised in conftest. Beanie's internal # collection references are loop-bound, so mixing loops causes errors. diff --git a/mpcontribs-api/tests/integration/test_component_routes.py b/mpcontribs-api/tests/integration/test_component_routes.py index 6e4975202d..0d9f2487ae 100644 --- a/mpcontribs-api/tests/integration/test_component_routes.py +++ b/mpcontribs-api/tests/integration/test_component_routes.py @@ -1,9 +1,3 @@ -"""Integration tests for component routers: /structures, /tables, /attachments. - -All use AsyncMock repositories via dependency_overrides, so no DB is required — -the same pattern as test_projects.py / test_contributions.py. -""" - import pytest from beanie import PydanticObjectId @@ -260,11 +254,7 @@ def test_format_forwarded_to_repo(self, client, download_target): assert getattr(repo, method).call_args.kwargs["format"] == "csv" def test_csv_filename_uses_csv_extension(self, client, download_target): - """RED: a CSV download should be named *.csv.gz, not *.jsonl.gz. - - Every component router hardcodes the ``.jsonl.gz`` extension regardless of - the requested ``format``, so CSV downloads are mislabelled. - """ + """A CSV download is named *.csv.gz, matching the requested format.""" prefix, *_ = download_target cd = client.get(f"/api/v1/{prefix}/download/gz?format=csv").headers["content-disposition"] assert ".csv.gz" in cd diff --git a/mpcontribs-api/tests/integration/test_contributions.py b/mpcontribs-api/tests/integration/test_contributions.py index 06634a684b..7f61ac4bb2 100644 --- a/mpcontribs-api/tests/integration/test_contributions.py +++ b/mpcontribs-api/tests/integration/test_contributions.py @@ -1,10 +1,3 @@ -"""Integration tests for /api/v1/contributions routes. - -Uses an AsyncMock repository override so no database is required. Tests cover -the implemented GET and DELETE batch endpoints; stub endpoints (POST, PUT, -single-resource) are verified to exist and wire through to the repo. -""" - import pytest from mpcontribs_api.domains.contributions.dependencies import get_scoped_contributions diff --git a/mpcontribs-api/tests/integration/test_contributions_routes.py b/mpcontribs-api/tests/integration/test_contributions_routes.py index e78fdb2136..0b975ad5a8 100644 --- a/mpcontribs-api/tests/integration/test_contributions_routes.py +++ b/mpcontribs-api/tests/integration/test_contributions_routes.py @@ -1,10 +1,3 @@ -"""Integration tests for previously-untested /contributions routes. - -test_contributions.py covers GET list and DELETE batch plus stub-existence of -POST/PUT. This file covers the behavior of POST, PUT, the single-resource -routes, and download — all via AsyncMock repo/service overrides. -""" - import pytest from beanie import PydanticObjectId @@ -225,21 +218,13 @@ def test_invalid_fields_returns_422(self, client, contribution_repo): assert client.get("/api/v1/contributions/download/gz?_fields=not_a_field").status_code == 422 def test_filename_names_the_contributions_resource(self, client, contribution_repo): - """RED: the attachment filename should reference contributions, not attachments. - - The route hardcodes ``filename="attachments.jsonl.gz"`` (copy-paste from the - attachments router), so a contributions download saves under the wrong name. - """ + """The attachment filename references the contributions resource.""" contribution_repo.download_contributions.return_value = iter([b"x"]) cd = client.get("/api/v1/contributions/download/gz").headers["content-disposition"] assert "contributions" in cd def test_csv_filename_uses_csv_extension(self, client, contribution_repo): - """RED: a CSV download should be named *.csv.gz, not *.jsonl.gz. - - The filename extension is hardcoded to ``.jsonl.gz`` regardless of the - requested ``format``, so CSV downloads are mislabelled as JSONL. - """ + """A CSV download is named *.csv.gz, matching the requested format.""" contribution_repo.download_contributions.return_value = iter([b"x"]) cd = client.get("/api/v1/contributions/download/gz?format=csv").headers["content-disposition"] assert ".csv.gz" in cd diff --git a/mpcontribs-api/tests/integration/test_error_handlers.py b/mpcontribs-api/tests/integration/test_error_handlers.py index 63d83f09be..a092cec2ad 100644 --- a/mpcontribs-api/tests/integration/test_error_handlers.py +++ b/mpcontribs-api/tests/integration/test_error_handlers.py @@ -1,10 +1,3 @@ -"""Integration tests for exception handlers registered in app.py. - -Tests exercise the full HTTP cycle to verify that AppError subclasses and -framework errors (RequestValidationError, HTTPException) all produce the -uniform JSON envelope: {"error": {"code": "...", "message": "..."}}. -""" - import pytest from fastapi import FastAPI from fastapi.testclient import TestClient diff --git a/mpcontribs-api/tests/integration/test_healthcheck.py b/mpcontribs-api/tests/integration/test_healthcheck.py index 7dfc8bb0f9..cec2824171 100644 --- a/mpcontribs-api/tests/integration/test_healthcheck.py +++ b/mpcontribs-api/tests/integration/test_healthcheck.py @@ -1,12 +1,3 @@ -"""Integration tests for the /health router. - -The healthcheck router is mounted by create_app() at /health, but the shared -make_test_app() fixture only mounts the v1 router. So this module builds its -own minimal app that mounts the healthcheck router and overrides the DbDep -dependency with a mock whose admin.command("ping") can be made to succeed or -fail. -""" - from unittest.mock import AsyncMock, MagicMock import pytest diff --git a/mpcontribs-api/tests/integration/test_projects.py b/mpcontribs-api/tests/integration/test_projects.py index 571f91b81e..634a17e7cb 100644 --- a/mpcontribs-api/tests/integration/test_projects.py +++ b/mpcontribs-api/tests/integration/test_projects.py @@ -1,14 +1,3 @@ -"""Integration tests for /api/v1/projects routes. - -The project repository is overridden with an AsyncMock for each test so no -MongoDB connection is needed. Tests verify: - - HTTP status codes - - Response JSON shapes (Page envelope, ProjectOut fields) - - That the correct repository method is called - - That query parameters (_fields, pagination, filters) are forwarded - - Error handling (NotFoundError → 404, etc.) -""" - import pytest from mpcontribs_api.domains.projects.dependencies import get_scoped_projects diff --git a/mpcontribs-api/tests/unit/conftest.py b/mpcontribs-api/tests/unit/conftest.py index ab2b86c434..d730154a08 100644 --- a/mpcontribs-api/tests/unit/conftest.py +++ b/mpcontribs-api/tests/unit/conftest.py @@ -1,10 +1,3 @@ -"""Unit-test-only fixtures. - -The Beanie collection mock lives here (not the root conftest) so it is -applied only to unit tests and does not interfere with DB integration tests -that need real Beanie initialization. -""" - from unittest.mock import MagicMock, patch import pytest diff --git a/mpcontribs-api/tests/unit/domains/test_attachments_models.py b/mpcontribs-api/tests/unit/domains/test_attachments_models.py index 6f281c1a7a..1a0c82ebfc 100644 --- a/mpcontribs-api/tests/unit/domains/test_attachments_models.py +++ b/mpcontribs-api/tests/unit/domains/test_attachments_models.py @@ -1,5 +1,3 @@ -"""Unit tests for domains/attachments/models.py.""" - import pytest from beanie import PydanticObjectId from pydantic import ValidationError as PydanticValidationError diff --git a/mpcontribs-api/tests/unit/domains/test_contribution_service.py b/mpcontribs-api/tests/unit/domains/test_contribution_service.py index e1419e5e50..e2943e9412 100644 --- a/mpcontribs-api/tests/unit/domains/test_contribution_service.py +++ b/mpcontribs-api/tests/unit/domains/test_contribution_service.py @@ -1,12 +1,3 @@ -"""Unit tests for ContributionService. - -All database access is replaced with AsyncMock repositories so no MongoDB -connection is needed. These tests verify: - - insert_contributions: pre-checks, no-component fast path, per-contribution txn path, - partial-failure summary - - upsert_contributions: guard against components, insert vs update branching -""" - import asyncio from unittest.mock import AsyncMock, MagicMock diff --git a/mpcontribs-api/tests/unit/domains/test_shared_bulk.py b/mpcontribs-api/tests/unit/domains/test_shared_bulk.py index 46ad0b1646..32b900839c 100644 --- a/mpcontribs-api/tests/unit/domains/test_shared_bulk.py +++ b/mpcontribs-api/tests/unit/domains/test_shared_bulk.py @@ -1,5 +1,3 @@ -"""Unit tests for domains/_shared/bulk.py.""" - from beanie import PydanticObjectId from mpcontribs_api.domains._shared.bulk import ( diff --git a/mpcontribs-api/tests/unit/domains/test_shared_models.py b/mpcontribs-api/tests/unit/domains/test_shared_models.py index aaa267779f..0b67d8edd4 100644 --- a/mpcontribs-api/tests/unit/domains/test_shared_models.py +++ b/mpcontribs-api/tests/unit/domains/test_shared_models.py @@ -1,10 +1,3 @@ -"""Unit tests for domains/_shared/models.py. - -Uses Attachment as the concrete BaseDocumentWithInput subclass since it is the -simplest document in the codebase; from_input_model business-logic overrides -are covered per-domain (e.g. test_contributions_models.py). -""" - import pytest from beanie import PydanticObjectId from pymongo.results import DeleteResult diff --git a/mpcontribs-api/tests/unit/domains/test_shared_repository_download.py b/mpcontribs-api/tests/unit/domains/test_shared_repository_download.py index 622ae03593..857be36613 100644 --- a/mpcontribs-api/tests/unit/domains/test_shared_repository_download.py +++ b/mpcontribs-api/tests/unit/domains/test_shared_repository_download.py @@ -1,24 +1,3 @@ -"""Unit tests for the download/serialization core on MongoDbRepository. - -The download pipeline (``_serialize_jsonl``, ``_serialize_csv``, ``_get_serializer``, -``_hash_payload``, ``download``) had no direct coverage — only the route happy-path -was exercised via mocked repos. These tests drive a minimal concrete repository -subclass with a fake output model and a fake query so the serialization and gzip -streaming logic can be verified without a database. - -Several tests assert the *correct* behavior the pipeline should have and therefore -fail against the current implementation (red). Each is marked in its docstring with -the bug it pins: - - * download() never calls ``compressor.flush()`` -> the streamed gzip member is - truncated (missing trailing data + CRC/size footer), so it cannot be decompressed. - * ``_get_serializer`` has no fallback branch -> an unsupported format returns None - and the caller crashes with a TypeError instead of a clear error. - * ``_hash_payload`` calls ``json.dumps`` with no ``default=`` -> a filter carrying - an ObjectId/datetime raises TypeError before the download can even start. - * ``_serialize_csv`` writes Python ``repr`` for dict/nested values rather than JSON. -""" - import csv import gzip import io @@ -204,11 +183,11 @@ async def test_empty_input_yields_no_bytes(self): assert raw == b"" async def test_dict_value_serialized_as_json(self): - """RED: dict-valued columns should be emitted as JSON, not Python repr. + """Dict-valued columns are emitted as JSON, not Python repr. - ``model_dump(mode="json")`` leaves nested dicts as dict objects; csv then - writes ``str(dict)`` (single-quoted Python repr) which is not valid JSON and - cannot be round-tripped by consumers. The column should hold JSON instead. + ``model_dump(mode="json")`` leaves nested dicts as dict objects; the serializer + JSON-encodes them so the cell is valid JSON a consumer can round-trip (rather + than ``str(dict)``, the single-quoted Python repr). """ rows = [_OutWithData(name="r1", data={"k": "v", "n": 1})] raw = await _collect(MongoDbRepository._serialize_csv(_aiter(rows), None)) @@ -232,16 +211,15 @@ async def test_csv_serializer_is_callable_and_serializes(self): raw = await _collect(serializer(_aiter([_Out(a=1, b="x")]))) assert _parse_csv(raw) == [{"a": "1"}] - def test_unsupported_format_raises(self): - """RED: an unknown format should raise, not fall through returning None. + def test_enum_rejects_arbitrary_string(self): + """Arbitrary strings can't reach _get_serializer: the StrEnum rejects them. - Today ``_get_serializer`` has no else branch, so an unsupported value - returns None and the caller blows up with an opaque ``TypeError: 'NoneType' - object is not callable`` deep in ``download``. It should raise a clear error. + ``_get_serializer`` takes a ``DownloadFormat``, and the enum refuses any value + outside its members at construction time, so an unsupported format is stopped + at the type boundary rather than falling through to a None serializer. """ - repo = _repo() - with pytest.raises((ValueError, KeyError, NotImplementedError)): - repo._get_serializer("xml", None) # type: ignore[arg-type] + with pytest.raises(ValueError): + DownloadFormat("xml") # =========================================================================== @@ -270,11 +248,11 @@ def test_returns_sha256_hex(self): assert all(c in "0123456789abcdef" for c in digest) def test_object_id_filter_is_hashable(self): - """RED: filters carrying an ObjectId must hash without raising. + """Filters carrying an ObjectId hash without raising. ``download`` hashes ``filter.model_dump()`` which, for an ``id__in`` filter, - contains PydanticObjectId values. ``json.dumps`` without ``default=`` raises - ``TypeError`` on these, so any filtered download by id crashes before it starts. + contains PydanticObjectId values. ``_hash_payload`` passes ``default=str`` so + these stringify into a stable key instead of raising ``TypeError``. """ repo = _repo() payload = {"filter": {"id__in": [PydanticObjectId(), PydanticObjectId()]}} @@ -282,7 +260,7 @@ def test_object_id_filter_is_hashable(self): assert len(digest) == 64 def test_datetime_filter_is_hashable(self): - """RED: filters carrying a datetime must hash without raising (see above).""" + """Filters carrying a datetime hash without raising (see above).""" repo = _repo() payload = {"filter": {"created__gte": datetime(2024, 1, 1, tzinfo=timezone.utc)}} digest = repo._hash_payload(payload) @@ -296,12 +274,12 @@ def test_datetime_filter_is_hashable(self): class TestDownload: async def test_jsonl_stream_decompresses_to_rows(self): - """RED: the gzip stream must decompress cleanly. + """The gzip stream decompresses cleanly to the JSONL payload. - ``download`` builds a zlib gzip compressor but never calls ``flush()`` after - the final chunk, so the trailing buffered bytes and the gzip footer (CRC32 + - ISIZE) are never emitted. ``gzip.decompress`` therefore raises on the - truncated member. When fixed, the decompressed bytes equal the JSONL payload. + ``download`` flushes the zlib gzip compressor after the final chunk so the + trailing buffered bytes and the gzip footer (CRC32 + ISIZE) are emitted. + Regression guard: without the flush the member is truncated and + ``gzip.decompress`` raises. """ repo = _repo(_Out) filter = _FakeFilter(rows=[SimpleNamespace(a=1, b="x"), SimpleNamespace(a=2, b="y")]) @@ -318,7 +296,7 @@ async def test_jsonl_stream_decompresses_to_rows(self): assert parsed == [{"a": 1, "b": "x"}, {"a": 2, "b": "y"}] async def test_csv_stream_decompresses_to_rows(self): - """RED: same flush bug, exercised through the CSV serializer.""" + """Same gzip flush guard, exercised through the CSV serializer.""" repo = _repo(_Out) filter = _FakeFilter(rows=[SimpleNamespace(a=1, b="x"), SimpleNamespace(a=2, b="y")]) stream = repo.download( diff --git a/mpcontribs-api/tests/unit/domains/test_structures_models.py b/mpcontribs-api/tests/unit/domains/test_structures_models.py index 479aebf5bf..5e2744c019 100644 --- a/mpcontribs-api/tests/unit/domains/test_structures_models.py +++ b/mpcontribs-api/tests/unit/domains/test_structures_models.py @@ -1,5 +1,3 @@ -"""Unit tests for domains/structures/models.py.""" - import polars as pl import pytest from beanie import PydanticObjectId diff --git a/mpcontribs-api/tests/unit/domains/test_tables_models.py b/mpcontribs-api/tests/unit/domains/test_tables_models.py index 5a10b3f160..48804a0379 100644 --- a/mpcontribs-api/tests/unit/domains/test_tables_models.py +++ b/mpcontribs-api/tests/unit/domains/test_tables_models.py @@ -1,17 +1,3 @@ -"""Unit tests for domains/tables/models.py. - -NOTE ON RED TESTS: tables/models.py imports ``ValidationError`` from pydantic -and raises it with a plain string (``raise ValidationError("...")``). Pydantic -v2's ValidationError cannot be constructed that way, so every failing -validation path currently crashes with -``TypeError: ValidationError.__new__() missing 1 required positional argument`` -instead of raising a controlled error. The intended behavior — consistent with -domains/_shared/types.py and the 422 exception handler — is the domain -``mpcontribs_api.exceptions.ValidationError``. The tests in -TestTableInValidationFailures assert the intended behavior and are expected to -FAIL until the import in tables/models.py is fixed. -""" - import polars as pl import pytest from beanie import PydanticObjectId diff --git a/mpcontribs-api/tests/unit/test_config.py b/mpcontribs-api/tests/unit/test_config.py index e06f59edab..2c8c58f685 100644 --- a/mpcontribs-api/tests/unit/test_config.py +++ b/mpcontribs-api/tests/unit/test_config.py @@ -1,5 +1,3 @@ -"""Unit tests for config.py: MongoSettings clamping, Settings env loading, get_settings caching.""" - import pytest from pydantic import SecretStr from pydantic import ValidationError as PydanticValidationError diff --git a/mpcontribs-api/tests/unit/test_types_components.py b/mpcontribs-api/tests/unit/test_types_components.py index a0730f6b67..eb4308989c 100644 --- a/mpcontribs-api/tests/unit/test_types_components.py +++ b/mpcontribs-api/tests/unit/test_types_components.py @@ -1,10 +1,3 @@ -"""Unit tests for component-related shared types in domains/_shared/types.py. - -Covers FileLike, MD5Hash, MimeFormat, DownloadFormat, and the PolarsFrame -annotated type (coercion + serialization). ShortStr and PrefixedEmail are -covered in test_types.py. -""" - import polars as pl import pytest from pydantic import BaseModel, ConfigDict From 52b504d62118f239298755f479b3c11fe0867856 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 15 Jun 2026 15:09:27 -0700 Subject: [PATCH 357/591] Setup app to use aioboto3 and load defaults from env --- mpcontribs-api/pyproject.toml | 2 + mpcontribs-api/src/mpcontribs_api/app.py | 100 +++-- mpcontribs-api/src/mpcontribs_api/config.py | 19 + mpcontribs-api/uv.lock | 471 ++++++++++++++++++-- 4 files changed, 526 insertions(+), 66 deletions(-) diff --git a/mpcontribs-api/pyproject.toml b/mpcontribs-api/pyproject.toml index 3ff97de127..6366b03a84 100644 --- a/mpcontribs-api/pyproject.toml +++ b/mpcontribs-api/pyproject.toml @@ -47,6 +47,8 @@ dependencies = [ "opentelemetry-instrumentation-pymongo>=0.63b1", "beanie>=2.1.0", "fastapi-filter>=2.0.1", + "aioboto3>=15.5.0", + "types-aiobotocore[s3]>=3.7.0", ] [project.urls] diff --git a/mpcontribs-api/src/mpcontribs_api/app.py b/mpcontribs-api/src/mpcontribs_api/app.py index ca5cb8b588..7def06bc74 100644 --- a/mpcontribs-api/src/mpcontribs_api/app.py +++ b/mpcontribs-api/src/mpcontribs_api/app.py @@ -1,11 +1,15 @@ from __future__ import annotations from collections.abc import AsyncGenerator -from contextlib import asynccontextmanager +from contextlib import AbstractAsyncContextManager, AsyncExitStack, asynccontextmanager +from typing import cast +import aioboto3 from beanie import init_beanie +from botocore.config import Config from fastapi import Depends, FastAPI from pymongo import AsyncMongoClient +from types_aiobotocore_s3 import S3Client from mpcontribs_api._openapi import contact_info, license_info, openapi_tags from mpcontribs_api.api.v1.router import router as v1_router @@ -24,48 +28,66 @@ logger = get_logger(__name__) +async def _setup_mongo(app: FastAPI, settings: Settings, stack: AsyncExitStack) -> None: + """Setting up app-wide access to MongoDB via AsyncMongoClient and Beanie""" + client = AsyncMongoClient( + settings.mongo.uri.get_secret_value(), + appname=settings.mongo.app_name, + maxPoolSize=settings.mongo.max_pool_size, + minPoolSize=settings.mongo.min_pool_size, + maxIdleTimeMS=settings.mongo.max_idle_time_ms, + timeoutMS=settings.mongo.timeout_ms, + serverSelectionTimeoutMS=settings.mongo.server_selection_timeout_ms, + retryWrites=True, + retryReads=True, + compressors=settings.mongo.compressors, + readPreference=settings.mongo.read_preference, + uuidRepresentation="standard", + ) + # Fail fast if the DB is unreachable + await client.admin.command("ping") + logger.info("connected to mongo", extra={"db": settings.mongo.db_name}) + stack.push_async_callback(client.close) + + app.state.mongo_client = client + app.state.db = client[settings.mongo.db_name] + await init_beanie( + database=client[settings.mongo.db_name], + document_models=[ + Project, + Contribution, + Attachment, + Structure, + Table, + ], + ) + + +async def _setup_s3(app: FastAPI, settings: Settings, stack: AsyncExitStack) -> None: + """Setting up app-wide access to AWS S3 via aioboto3""" + session = aioboto3.Session() + cm = cast( + AbstractAsyncContextManager[S3Client], + session.client( + "s3", + region_name=settings.aws.region, + config=Config(max_pool_connections=settings.aws.max_pool_connections), + ), + ) + s3 = await stack.enter_async_context(cm) + app.state.boto_session = session + app.state.s3 = s3 + logger.info("connected to s3") + + def _build_lifespan(settings: Settings): @asynccontextmanager async def lifespan(app: FastAPI) -> AsyncGenerator[None]: - # --- startup --- - client = AsyncMongoClient( - settings.mongo.uri.get_secret_value(), - appname=settings.mongo.app_name, - maxPoolSize=settings.mongo.max_pool_size, - minPoolSize=settings.mongo.min_pool_size, - maxIdleTimeMS=settings.mongo.max_idle_time_ms, - timeoutMS=settings.mongo.timeout_ms, - serverSelectionTimeoutMS=settings.mongo.server_selection_timeout_ms, - retryWrites=True, - retryReads=True, - compressors=settings.mongo.compressors, - readPreference=settings.mongo.read_preference, - uuidRepresentation="standard", - ) - # Fail fast if the DB is unreachable - await client.admin.command("ping") - logger.info("connected to mongo", extra={"db": settings.mongo.db_name}) - - app.state.mongo_client = client - app.state.db = client[settings.mongo.db_name] - - await init_beanie( - database=client[settings.mongo.db_name], - document_models=[ - Project, - Contribution, - Attachment, - Structure, - Table, - ], - ) - - try: + async with AsyncExitStack() as stack: + await _setup_mongo(app, settings, stack) + await _setup_s3(app, settings, stack) yield - finally: - # shutdown - await client.close() - logger.info("mongo client closed") + # stack unwinds in reverse: s3 closed, then mongo return lifespan diff --git a/mpcontribs-api/src/mpcontribs_api/config.py b/mpcontribs-api/src/mpcontribs_api/config.py index b3891611ac..9d744c53b2 100644 --- a/mpcontribs-api/src/mpcontribs_api/config.py +++ b/mpcontribs-api/src/mpcontribs_api/config.py @@ -14,6 +14,19 @@ class KongSettings(BaseModel): gateway_secret: SecretStr +class AwsSettings(BaseModel): + """AWS Settings + + Primarily used for S3 access + """ + + region: str = Field("east1", description="The region to connect to") + max_pool_connections: int = Field( + 10, + description="The maximum number of connections the app is allowed to have to S3", + ) + + class MongoSettings(BaseModel): """MongoDB settings. @@ -111,10 +124,16 @@ class Settings(BaseSettings): environment: Literal["dev", "prod"] + # MPContribs_mongo__* mongo: MongoSettings + # MPContribs_aws__* + aws: AwsSettings + + # MPContribs_kong__* kong: KongSettings + # MPContribs_redis__* redis: RedisSettings # SMTP Settings diff --git a/mpcontribs-api/uv.lock b/mpcontribs-api/uv.lock index 328dc52913..b874098fbc 100644 --- a/mpcontribs-api/uv.lock +++ b/mpcontribs-api/uv.lock @@ -6,6 +6,139 @@ resolution-markers = [ "sys_platform != 'win32'", ] +[[package]] +name = "aioboto3" +version = "15.5.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "aiobotocore", extra = ["boto3"] }, + { name = "aiofiles" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/a2/01/92e9ab00f36e2899315f49eefcd5b4685fbb19016c7f19a9edf06da80bb0/aioboto3-15.5.0.tar.gz", hash = "sha256:ea8d8787d315594842fbfcf2c4dce3bac2ad61be275bc8584b2ce9a3402a6979", size = 255069, upload-time = "2025-10-30T13:37:16.122Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/e5/3e/e8f5b665bca646d43b916763c901e00a07e40f7746c9128bdc912a089424/aioboto3-15.5.0-py3-none-any.whl", hash = "sha256:cc880c4d6a8481dd7e05da89f41c384dbd841454fc1998ae25ca9c39201437a6", size = 35913, upload-time = "2025-10-30T13:37:14.549Z" }, +] + +[[package]] +name = "aiobotocore" +version = "2.25.1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "aiohttp" }, + { name = "aioitertools" }, + { name = "botocore" }, + { name = "jmespath" }, + { name = "multidict" }, + { name = "python-dateutil" }, + { name = "wrapt" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/62/94/2e4ec48cf1abb89971cb2612d86f979a6240520f0a659b53a43116d344dc/aiobotocore-2.25.1.tar.gz", hash = "sha256:ea9be739bfd7ece8864f072ec99bb9ed5c7e78ebb2b0b15f29781fbe02daedbc", size = 120560, upload-time = "2025-10-28T22:33:21.787Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/95/2a/d275ec4ce5cd0096665043995a7d76f5d0524853c76a3d04656de49f8808/aiobotocore-2.25.1-py3-none-any.whl", hash = "sha256:eb6daebe3cbef5b39a0bb2a97cffbe9c7cb46b2fcc399ad141f369f3c2134b1f", size = 86039, upload-time = "2025-10-28T22:33:19.949Z" }, +] + +[package.optional-dependencies] +boto3 = [ + { name = "boto3" }, +] + +[[package]] +name = "aiofiles" +version = "25.1.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/41/c3/534eac40372d8ee36ef40df62ec129bee4fdb5ad9706e58a29be53b2c970/aiofiles-25.1.0.tar.gz", hash = "sha256:a8d728f0a29de45dc521f18f07297428d56992a742f0cd2701ba86e44d23d5b2", size = 46354, upload-time = "2025-10-09T20:51:04.358Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/bc/8a/340a1555ae33d7354dbca4faa54948d76d89a27ceef032c8c3bc661d003e/aiofiles-25.1.0-py3-none-any.whl", hash = "sha256:abe311e527c862958650f9438e859c1fa7568a141b22abcd015e120e86a85695", size = 14668, upload-time = "2025-10-09T20:51:03.174Z" }, +] + +[[package]] +name = "aiohappyeyeballs" +version = "2.6.2" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/33/c6/61a2d7b7572279226bb2e7f61d7a19ca7c90da0329c93fa0d560cbf288d8/aiohappyeyeballs-2.6.2.tar.gz", hash = "sha256:e202810ee718bd01fc6ef49e8ea53d023d5cb6b581076d7925aa499fa55dbe64", size = 22591, upload-time = "2026-05-20T15:12:24.631Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/5f/fc/a7bf5b6e4e617b45f90f2d9d2a68519c249c81dd4fc2658c7a2a61c4f4b7/aiohappyeyeballs-2.6.2-py3-none-any.whl", hash = "sha256:4708045e2d7a6c6bdf8aafa8ed39649eaf926a4543b54560659129e3365953c4", size = 15062, upload-time = "2026-05-20T15:12:23.328Z" }, +] + +[[package]] +name = "aiohttp" +version = "3.14.1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "aiohappyeyeballs" }, + { name = "aiosignal" }, + { name = "attrs" }, + { name = "frozenlist" }, + { name = "multidict" }, + { name = "propcache" }, + { name = "yarl" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/82/78/8ea7308cac6934de8c74a14f3d5f65d1c89287426688be79538d0e5c013d/aiohttp-3.14.1.tar.gz", hash = "sha256:307f2cff90a764d329e77040603fa032db89c5c24fdad50c4c15334cba744035", size = 7955794, upload-time = "2026-06-07T21:09:35.529Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/c4/a1/5fafa04e1ca91ddb47608699d60649c1c6db3cf41c99e78fc4056f9513db/aiohttp-3.14.1-cp314-cp314-android_24_arm64_v8a.whl", hash = "sha256:7c106c26852ca1c2047c6b80384f17100b4e439af276f21ef3d4e2f450ae7e15", size = 508531, upload-time = "2026-06-07T21:08:02.093Z" }, + { url = "https://files.pythonhosted.org/packages/fa/2e/bfa02f699d87ffc86d5959270b28f1cb410add3ccaced8ed2e0b8a5238fc/aiohttp-3.14.1-cp314-cp314-android_24_x86_64.whl", hash = "sha256:20205f7f5ade7aaec9f4b500549bbc071b046453aed72f9c06dcab87896a83e8", size = 514718, upload-time = "2026-06-07T21:08:04.476Z" }, + { url = "https://files.pythonhosted.org/packages/85/a5/9594ad6289eebbc97d167c44213d557807f90e59115caad24de21ad2c3b1/aiohttp-3.14.1-cp314-cp314-ios_13_0_arm64_iphoneos.whl", hash = "sha256:62a759436b29e677181a9e76bab8b8f689a29cb9c535f45f7c48c9c830d3f8c3", size = 487918, upload-time = "2026-06-07T21:08:06.377Z" }, + { url = "https://files.pythonhosted.org/packages/b4/61/16a32c36c3c49edec122a3dc811f2057df2f94d3b14aa107c8017d981618/aiohttp-3.14.1-cp314-cp314-ios_13_0_arm64_iphonesimulator.whl", hash = "sha256:2964cbf553df4d7a57348da44d961d871895fc1ee4e8c322b2a95612c7b17fba", size = 494014, upload-time = "2026-06-07T21:08:08.263Z" }, + { url = "https://files.pythonhosted.org/packages/9b/89/3ebcf96ed99c05bec9c434aaac6963fd3cbab4a786ae739908a144d9ce44/aiohttp-3.14.1-cp314-cp314-ios_13_0_x86_64_iphonesimulator.whl", hash = "sha256:237651caadc3a59badd39319c54642b5299e9cc98a3a194310e55d5bb9f5e397", size = 502398, upload-time = "2026-06-07T21:08:10.244Z" }, + { url = "https://files.pythonhosted.org/packages/fd/3d/b74870a0c2d40c355928cd5b96c7a11fa821b8a40fc41365e64479b151fb/aiohttp-3.14.1-cp314-cp314-macosx_10_15_universal2.whl", hash = "sha256:896e12dfdbbab9d8f7e16d2b28c6769a60126fa92095d1ebf9473d02593a2448", size = 758018, upload-time = "2026-06-07T21:08:12.447Z" }, + { url = "https://files.pythonhosted.org/packages/d3/66/f42f5c984d99e49c6cff5f26f590750f2e2f7ef1fcfb99966ab5be1b632e/aiohttp-3.14.1-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:d03f281ed22579314ba00821ce20115a7c0ac430660b4cc05704a3f818b3e004", size = 512462, upload-time = "2026-06-07T21:08:14.624Z" }, + { url = "https://files.pythonhosted.org/packages/e9/a7/248e1aebe0c7810b0271e021a0f2a5eb6e78a051885b3c9df49f42a5802d/aiohttp-3.14.1-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:07eabb979d236335fed927e137a928c9adfb7df3b9ec7aa31726f133a62be983", size = 512824, upload-time = "2026-06-07T21:08:16.572Z" }, + { url = "https://files.pythonhosted.org/packages/26/97/2aa0e5ba0727dc3bd5aaebb7ccbc510f7dfb7fb961ec87497cd496635ab1/aiohttp-3.14.1-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:4fe1f1087cbadb280b5e1bb054a4f00d1423c74d6626c5e48400d871d34ecefe", size = 1749898, upload-time = "2026-06-07T21:08:18.635Z" }, + { url = "https://files.pythonhosted.org/packages/00/8d/e97f6c96c891d457c8479d92a514ba194d0412f981d72c70341ee18488ed/aiohttp-3.14.1-cp314-cp314-manylinux2014_armv7l.manylinux_2_17_armv7l.manylinux_2_31_armv7l.whl", hash = "sha256:367a9314fdc79dab0fac96e216cb41dd73c85bdca85306ce8999118ba7e0f333", size = 1710114, upload-time = "2026-06-07T21:08:20.892Z" }, + { url = "https://files.pythonhosted.org/packages/6f/e6/aa8d7e863048c8fceb5cd6ce74017311cec3ead07847387e12265fb4444e/aiohttp-3.14.1-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:a24f677ebe83749039e7bdf862ff0bbb16818ae4193d4ef96505e269375bcce0", size = 1802541, upload-time = "2026-06-07T21:08:23.044Z" }, + { url = "https://files.pythonhosted.org/packages/83/a8/72193137de57fda4ebfae4563182d082c8856e3b6e9871d0b46f028fb369/aiohttp-3.14.1-cp314-cp314-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:c83afe0ba876be7e943d2e0ba645809ad441575d2840c895c21ee5de93b9377a", size = 1875776, upload-time = "2026-06-07T21:08:25.288Z" }, + { url = "https://files.pythonhosted.org/packages/a0/18/938441025db6769a3464596b2410af3afde0b21eb2f204c6f766f68af4bd/aiohttp-3.14.1-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:634e385930fb6d2d479cf3aa66515955863b77a5e3c2b5894ca259a25b308602", size = 1760329, upload-time = "2026-06-07T21:08:27.363Z" }, + { url = "https://files.pythonhosted.org/packages/60/29/bf2496b4065e76e09fe48015aaffe5ce161d8f089b06ac6982070f653076/aiohttp-3.14.1-cp314-cp314-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:eeea07c4397bbc57719c4eed8f9c284874d4f175f9b6d57f7a1546b976d455ca", size = 1587293, upload-time = "2026-06-07T21:08:29.805Z" }, + { url = "https://files.pythonhosted.org/packages/49/a2/2136674d52123b1354bd05dd5753c318db47dc0c927cc70b27bab3755456/aiohttp-3.14.1-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:335c0cc3e3545ce98dcb9cfcb836f40c3411f43fa03dab757597d80c89af8a35", size = 1714756, upload-time = "2026-06-07T21:08:32.094Z" }, + { url = "https://files.pythonhosted.org/packages/a7/b9/e5fd2e6f915503081c0f9b1e8540947037929c70c191da2e4d54b31a21a1/aiohttp-3.14.1-cp314-cp314-musllinux_1_2_armv7l.whl", hash = "sha256:ae6be797afdef264e8a84864a85b196ca06045586481b3df8a967322fd2fa844", size = 1721052, upload-time = "2026-06-07T21:08:34.167Z" }, + { url = "https://files.pythonhosted.org/packages/63/5a/2833e324a2263e104e31e2e91bc5bbee81bc499afd32203faee048a883f0/aiohttp-3.14.1-cp314-cp314-musllinux_1_2_ppc64le.whl", hash = "sha256:8560b4d712474335d08907db7973f71912d3a9a8f1dee992ec06b5d2fe359496", size = 1766888, upload-time = "2026-06-07T21:08:36.95Z" }, + { url = "https://files.pythonhosted.org/packages/57/fa/dea6511870913162f3b2e8c42a7614eb203a4540b8c2da43e0bfb0548f3c/aiohttp-3.14.1-cp314-cp314-musllinux_1_2_riscv64.whl", hash = "sha256:2b7edd08e0a5deb1e8564a2fcd8f4561014a3f05252334671bbf55ddd47db0e5", size = 1581679, upload-time = "2026-06-07T21:08:39.292Z" }, + { url = "https://files.pythonhosted.org/packages/14/bd/3cf0d55e71784b33534e9710a67d382d900598b4787fbce6cc7317f8c42a/aiohttp-3.14.1-cp314-cp314-musllinux_1_2_s390x.whl", hash = "sha256:b6ff7fcee63287ae57b5df3e4f5957ce032122802509246dec1a5bcc55904c95", size = 1782021, upload-time = "2026-06-07T21:08:41.407Z" }, + { url = "https://files.pythonhosted.org/packages/c1/af/14bb5843eccbe234f4dfb78ab73e549d99727247e62ae5d62cbd22eaf5b0/aiohttp-3.14.1-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:6ffbb2f4ec1ceaff7e07d43922954da26b223d188bf30658e561b98e23089444", size = 1742574, upload-time = "2026-06-07T21:08:43.795Z" }, + { url = "https://files.pythonhosted.org/packages/f2/1e/fbeb7af9210a67ac0f9c9bec0f8f4568497924e33137a3d5b48e1cf85f3f/aiohttp-3.14.1-cp314-cp314-win32.whl", hash = "sha256:a9875b46d910cff3ea2f5962f9d266b465459fe634e22556ab9bd6fc1192eea0", size = 457773, upload-time = "2026-06-07T21:08:46.168Z" }, + { url = "https://files.pythonhosted.org/packages/f0/2b/13e8d741a9ec5db7d900c060554cf8352ab85e44e2a4469ebb9d377bda17/aiohttp-3.14.1-cp314-cp314-win_amd64.whl", hash = "sha256:af8b4b81a960eeaf1234971ac3cd0ba5901f3cd42eae42a46b4d089a8b492719", size = 485001, upload-time = "2026-06-07T21:08:48.401Z" }, + { url = "https://files.pythonhosted.org/packages/df/30/491acfa2c4d6c3ff59c49a14fc1b50be3241e25bbb0c84c09e2da4d11395/aiohttp-3.14.1-cp314-cp314-win_arm64.whl", hash = "sha256:cf4491381b1b57425c315a56a439251b1bdac07b2275f19a8c44bc57744532ec", size = 453809, upload-time = "2026-06-07T21:08:50.7Z" }, + { url = "https://files.pythonhosted.org/packages/34/e3/19dbe1a1f4cc6230eb9e314de7fe68053b0992f9302b27d12141a0b5db53/aiohttp-3.14.1-cp314-cp314t-macosx_10_15_universal2.whl", hash = "sha256:819c054312f1af92947e6a55883d1b66feefab11531a7fc45e0fb9b63880b5c2", size = 793320, upload-time = "2026-06-07T21:08:52.775Z" }, + { url = "https://files.pythonhosted.org/packages/7f/20/1b7182219ba1b108430d6e4dc53d25ae02dcfcf5a045b33af4e8c5167527/aiohttp-3.14.1-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:10ee9c1753a8f706345b22496c79fbddb5be0599e0823f3738b1534058e25340", size = 529077, upload-time = "2026-06-07T21:08:55Z" }, + { url = "https://files.pythonhosted.org/packages/b9/c8/14ce60ec31a2e5f5274bb17d383a6f7a3aabca31ac04eee05585bbadab16/aiohttp-3.14.1-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:1601cc37baf5750ccacae618ec2daf020769581695550e3b654a911f859c563d", size = 532476, upload-time = "2026-06-07T21:08:57.176Z" }, + { url = "https://files.pythonhosted.org/packages/7e/02/9ac85e081e53da2e061b02fa7758fe0a12d17b8ce2d1f5e6c7cb76730328/aiohttp-3.14.1-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:4d6e0ac9da31c9c04c84e1c0182ad8d6df35965a85cae29cd71d089621b3ae94", size = 1922347, upload-time = "2026-06-07T21:08:59.563Z" }, + { url = "https://files.pythonhosted.org/packages/c0/3e/d3ba07a0ab38b5389e10bec4362d21e10a4f667cba2d79ba30837b3a5059/aiohttp-3.14.1-cp314-cp314t-manylinux2014_armv7l.manylinux_2_17_armv7l.manylinux_2_31_armv7l.whl", hash = "sha256:9e8f2d660c350b3d0e259c7a7e3d9b7fc8b41210cbcc3d4a7076ff0a5e5c2fdc", size = 1786465, upload-time = "2026-06-07T21:09:01.909Z" }, + { url = "https://files.pythonhosted.org/packages/0b/cb/e2ee978a00cfb2df829704a69528b18154eba5939f45bc1efa8f33aee4c5/aiohttp-3.14.1-cp314-cp314t-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:4691802dda97be727f79d86818acaad7eb8e9252626a1d6b519fedbb92d5e251", size = 1909423, upload-time = "2026-06-07T21:09:04.357Z" }, + { url = "https://files.pythonhosted.org/packages/73/5d/1430334858b1022b58ae50399a918f0bd6fe8fa7fa183598d657ff61e040/aiohttp-3.14.1-cp314-cp314t-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:c389c482a7e9b9dc3ee2701ac46c4125297a3818875b9c305ddb603c04828fd1", size = 2001906, upload-time = "2026-06-07T21:09:06.722Z" }, + { url = "https://files.pythonhosted.org/packages/66/4e/560c7472d3d198a23aa5c8b19a5115bf6a9b77b7d3e4bb363da320430ad2/aiohttp-3.14.1-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:fc0cacab7ba4e56f0f81c82a98c09bed2f39c940107b03a34b168bdf7597edd3", size = 1877095, upload-time = "2026-06-07T21:09:09.011Z" }, + { url = "https://files.pythonhosted.org/packages/0d/f1/4745806578d447db4a784a8591e2dae3afdfc2bcb96f8f81271b13df6543/aiohttp-3.14.1-cp314-cp314t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:979ed4717f59b8bb12e3963378fa285d93d367e15bcd66c721311826d3c44a6c", size = 1676222, upload-time = "2026-06-07T21:09:11.461Z" }, + { url = "https://files.pythonhosted.org/packages/6a/c9/48255813cca749a229ef0ab476004ec623728ad79a9c0840616f6c076325/aiohttp-3.14.1-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:38e1e7daaea81df51c952e18483f323d878499a1e2bfe564790e0f9701d6f203", size = 1842922, upload-time = "2026-06-07T21:09:14.118Z" }, + { url = "https://files.pythonhosted.org/packages/3d/c0/bbd054e2bee909f529523a5af3891052606af5143c09f5f183ec3b234676/aiohttp-3.14.1-cp314-cp314t-musllinux_1_2_armv7l.whl", hash = "sha256:4132e72c608fe9fecb8f409113567605915b83e9bdd3ea56538d2f9cd35002f1", size = 1825035, upload-time = "2026-06-07T21:09:16.447Z" }, + { url = "https://files.pythonhosted.org/packages/a8/ae/90395d4376deceb74e09ec26b6adf7d2015a6f8802d6d84446af860fef04/aiohttp-3.14.1-cp314-cp314t-musllinux_1_2_ppc64le.whl", hash = "sha256:eefd9cc9b6d4a2db5f00a26bc3e4f9acf71926a6ec557cd56c9c6f27c290b665", size = 1849512, upload-time = "2026-06-07T21:09:18.742Z" }, + { url = "https://files.pythonhosted.org/packages/93/bd/fb25f3049957553d4ce0ba6ae480aa2f592a6985497fca590837d16c1be0/aiohttp-3.14.1-cp314-cp314t-musllinux_1_2_riscv64.whl", hash = "sha256:b165790117eea512d7f3fb22f1f6dad3d55a7189571993eb015591c1401276d1", size = 1668571, upload-time = "2026-06-07T21:09:21.458Z" }, + { url = "https://files.pythonhosted.org/packages/3f/22/7f73303d64dd567ff3addca90b556690ed1233a47b8f55d242fb90af3681/aiohttp-3.14.1-cp314-cp314t-musllinux_1_2_s390x.whl", hash = "sha256:ed09c7eb1c391271c2ed0314a51903e72a3acb653d5ccfc264cdf3ef11f8269d", size = 1881159, upload-time = "2026-06-07T21:09:23.813Z" }, + { url = "https://files.pythonhosted.org/packages/44/be/0474c5a8b5640e1e4aa1923430a91f4151be82e511373fe764189b89aef5/aiohttp-3.14.1-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:99abd37084b82f5830c635fddd0b4993b9742a66eb746dacf433c8590e8f9e3c", size = 1841409, upload-time = "2026-06-07T21:09:26.207Z" }, + { url = "https://files.pythonhosted.org/packages/7b/3c/bb4a7cba26956cb3da4553cc2056cf67be5b5ff6e6d8fa4fbdff73bfb7ae/aiohttp-3.14.1-cp314-cp314t-win32.whl", hash = "sha256:47ddf841cdecc810749921d25606dee45857d12d2ad5ddb7b5bd7eab12e4b365", size = 494166, upload-time = "2026-06-07T21:09:28.505Z" }, + { url = "https://files.pythonhosted.org/packages/8a/84/ec80c2c1f66a952555a9f86df6b33af65108a6febfa0471b69013a12f807/aiohttp-3.14.1-cp314-cp314t-win_amd64.whl", hash = "sha256:5e78b522b7a6e27e0b25d19b247b75039ac4c94f99823e3c9e53ae1603a9f7e9", size = 530255, upload-time = "2026-06-07T21:09:30.843Z" }, + { url = "https://files.pythonhosted.org/packages/2a/71/6e22be134a4061ada85a92951b842f2657f17d926b727f3f94c56ae963d6/aiohttp-3.14.1-cp314-cp314t-win_arm64.whl", hash = "sha256:90d53f1609c29ccc2193945ef732428382a28f78d0456ae4d3daf0d48b74f0f6", size = 469640, upload-time = "2026-06-07T21:09:33.028Z" }, +] + +[[package]] +name = "aioitertools" +version = "0.13.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/fd/3c/53c4a17a05fb9ea2313ee1777ff53f5e001aefd5cc85aa2f4c2d982e1e38/aioitertools-0.13.0.tar.gz", hash = "sha256:620bd241acc0bbb9ec819f1ab215866871b4bbd1f73836a55f799200ee86950c", size = 19322, upload-time = "2025-11-06T22:17:07.609Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/10/a1/510b0a7fadc6f43a6ce50152e69dbd86415240835868bb0bd9b5b88b1e06/aioitertools-0.13.0-py3-none-any.whl", hash = "sha256:0be0292b856f08dfac90e31f4739432f4cb6d7520ab9eb73e143f4f2fa5259be", size = 24182, upload-time = "2025-11-06T22:17:06.502Z" }, +] + +[[package]] +name = "aiosignal" +version = "1.4.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "frozenlist" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/61/62/06741b579156360248d1ec624842ad0edf697050bbaf7c3e46394e106ad1/aiosignal-1.4.0.tar.gz", hash = "sha256:f47eecd9468083c2029cc99945502cb7708b082c232f9aca65da147157b251c7", size = 25007, upload-time = "2025-07-03T22:54:43.528Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/fb/76/641ae371508676492379f16e2fa48f4e2c11741bd63c48be4b12a6b09cba/aiosignal-1.4.0-py3-none-any.whl", hash = "sha256:053243f8b92b990551949e63930a839ff0cf0b0ebbe0597b0f3fb19e1a0fe82e", size = 7490, upload-time = "2025-07-03T22:54:42.156Z" }, +] + [[package]] name = "annotated-doc" version = "0.0.4" @@ -45,6 +178,15 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/5c/0a/a72d10ed65068e115044937873362e6e32fab1b7dce0046aeb224682c989/asgiref-3.11.1-py3-none-any.whl", hash = "sha256:e8667a091e69529631969fd45dc268fa79b99c92c5fcdda727757e52146ec133", size = 24345, upload-time = "2026-02-03T13:30:13.039Z" }, ] +[[package]] +name = "attrs" +version = "26.1.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/9a/8e/82a0fe20a541c03148528be8cac2408564a6c9a0cc7e9171802bc1d26985/attrs-26.1.0.tar.gz", hash = "sha256:d03ceb89cb322a8fd706d4fb91940737b6642aa36998fe130a9bc96c985eff32", size = 952055, upload-time = "2026-03-19T14:22:25.026Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/64/b4/17d4b0b2a2dc85a6df63d1157e028ed19f90d4cd97c36717afef2bc2f395/attrs-26.1.0-py3-none-any.whl", hash = "sha256:c647aa4a12dfbad9333ca4e71fe62ddc36f4e63b2d260a37a8b83d2f043ac309", size = 67548, upload-time = "2026-03-19T14:22:23.645Z" }, +] + [[package]] name = "basedpyright" version = "1.39.6" @@ -82,6 +224,46 @@ dependencies = [ ] sdist = { url = "https://files.pythonhosted.org/packages/44/1c/577d3ce406e88f370e80a6ebf76ae52a2866521e0b585e8ec612759894f1/bibtexparser-1.4.4.tar.gz", hash = "sha256:093b6c824f7a71d3a748867c4057b71f77c55b8dbc07efc993b781771520d8fb", size = 55594, upload-time = "2026-01-29T18:58:01.366Z" } +[[package]] +name = "boto3" +version = "1.40.61" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "botocore" }, + { name = "jmespath" }, + { name = "s3transfer" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/ed/f9/6ef8feb52c3cce5ec3967a535a6114b57ac7949fd166b0f3090c2b06e4e5/boto3-1.40.61.tar.gz", hash = "sha256:d6c56277251adf6c2bdd25249feae625abe4966831676689ff23b4694dea5b12", size = 111535, upload-time = "2025-10-28T19:26:57.247Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/61/24/3bf865b07d15fea85b63504856e137029b6acbc73762496064219cdb265d/boto3-1.40.61-py3-none-any.whl", hash = "sha256:6b9c57b2a922b5d8c17766e29ed792586a818098efe84def27c8f582b33f898c", size = 139321, upload-time = "2025-10-28T19:26:55.007Z" }, +] + +[[package]] +name = "botocore" +version = "1.40.61" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "jmespath" }, + { name = "python-dateutil" }, + { name = "urllib3" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/28/a3/81d3a47c2dbfd76f185d3b894f2ad01a75096c006a2dd91f237dca182188/botocore-1.40.61.tar.gz", hash = "sha256:a2487ad69b090f9cccd64cf07c7021cd80ee9c0655ad974f87045b02f3ef52cd", size = 14393956, upload-time = "2025-10-28T19:26:46.108Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/38/c5/f6ce561004db45f0b847c2cd9b19c67c6bf348a82018a48cb718be6b58b0/botocore-1.40.61-py3-none-any.whl", hash = "sha256:17ebae412692fd4824f99cde0f08d50126dc97954008e5ba2b522eb049238aa7", size = 14055973, upload-time = "2025-10-28T19:26:42.15Z" }, +] + +[[package]] +name = "botocore-stubs" +version = "1.43.14" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "types-awscrt" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/7f/81/79693e833291c00dc89ee610e5e915381b6f08233912e28df50106840780/botocore_stubs-1.43.14.tar.gz", hash = "sha256:9e3bc1fdd51da7473f0df726c82747a1b0ae913449d629659765c247fecc2039", size = 42738, upload-time = "2026-05-25T06:06:37.484Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/89/ca/f017727b11895908c5dedc829cf2ec35e0c4b2a26ba875db325fef2cefdf/botocore_stubs-1.43.14-py3-none-any.whl", hash = "sha256:fb98f1475c92fd718644e786b5c543a20f1b1f610e89e0a7191c3f1f429c75aa", size = 67093, upload-time = "2026-05-25T06:06:34.532Z" }, +] + [[package]] name = "certifi" version = "2026.5.20" @@ -382,6 +564,47 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/2c/47/c99d5268f354002ce80f8d029cd9d7d872969da1de8b93d32de4dc56d6f4/fonttools-4.63.0-py3-none-any.whl", hash = "sha256:445af2eab030a16b9171ea8bdda7ebf7d96bda2df88ee182a464252f6e05e20d", size = 1164562, upload-time = "2026-05-14T12:04:29.092Z" }, ] +[[package]] +name = "frozenlist" +version = "1.8.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/2d/f5/c831fac6cc817d26fd54c7eaccd04ef7e0288806943f7cc5bbf69f3ac1f0/frozenlist-1.8.0.tar.gz", hash = "sha256:3ede829ed8d842f6cd48fc7081d7a41001a56f1f38603f9d49bf3020d59a31ad", size = 45875, upload-time = "2025-10-06T05:38:17.865Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/f1/c8/85da824b7e7b9b6e7f7705b2ecaf9591ba6f79c1177f324c2735e41d36a2/frozenlist-1.8.0-cp314-cp314-macosx_10_13_universal2.whl", hash = "sha256:cee686f1f4cadeb2136007ddedd0aaf928ab95216e7691c63e50a8ec066336d0", size = 86127, upload-time = "2025-10-06T05:37:08.438Z" }, + { url = "https://files.pythonhosted.org/packages/8e/e8/a1185e236ec66c20afd72399522f142c3724c785789255202d27ae992818/frozenlist-1.8.0-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:119fb2a1bd47307e899c2fac7f28e85b9a543864df47aa7ec9d3c1b4545f096f", size = 49698, upload-time = "2025-10-06T05:37:09.48Z" }, + { url = "https://files.pythonhosted.org/packages/a1/93/72b1736d68f03fda5fdf0f2180fb6caaae3894f1b854d006ac61ecc727ee/frozenlist-1.8.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:4970ece02dbc8c3a92fcc5228e36a3e933a01a999f7094ff7c23fbd2beeaa67c", size = 49749, upload-time = "2025-10-06T05:37:10.569Z" }, + { url = "https://files.pythonhosted.org/packages/a7/b2/fabede9fafd976b991e9f1b9c8c873ed86f202889b864756f240ce6dd855/frozenlist-1.8.0-cp314-cp314-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:cba69cb73723c3f329622e34bdbf5ce1f80c21c290ff04256cff1cd3c2036ed2", size = 231298, upload-time = "2025-10-06T05:37:11.993Z" }, + { url = "https://files.pythonhosted.org/packages/3a/3b/d9b1e0b0eed36e70477ffb8360c49c85c8ca8ef9700a4e6711f39a6e8b45/frozenlist-1.8.0-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:778a11b15673f6f1df23d9586f83c4846c471a8af693a22e066508b77d201ec8", size = 232015, upload-time = "2025-10-06T05:37:13.194Z" }, + { url = "https://files.pythonhosted.org/packages/dc/94/be719d2766c1138148564a3960fc2c06eb688da592bdc25adcf856101be7/frozenlist-1.8.0-cp314-cp314-manylinux2014_armv7l.manylinux_2_17_armv7l.manylinux_2_31_armv7l.whl", hash = "sha256:0325024fe97f94c41c08872db482cf8ac4800d80e79222c6b0b7b162d5b13686", size = 225038, upload-time = "2025-10-06T05:37:14.577Z" }, + { url = "https://files.pythonhosted.org/packages/e4/09/6712b6c5465f083f52f50cf74167b92d4ea2f50e46a9eea0523d658454ae/frozenlist-1.8.0-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:97260ff46b207a82a7567b581ab4190bd4dfa09f4db8a8b49d1a958f6aa4940e", size = 240130, upload-time = "2025-10-06T05:37:15.781Z" }, + { url = "https://files.pythonhosted.org/packages/f8/d4/cd065cdcf21550b54f3ce6a22e143ac9e4836ca42a0de1022da8498eac89/frozenlist-1.8.0-cp314-cp314-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:54b2077180eb7f83dd52c40b2750d0a9f175e06a42e3213ce047219de902717a", size = 242845, upload-time = "2025-10-06T05:37:17.037Z" }, + { url = "https://files.pythonhosted.org/packages/62/c3/f57a5c8c70cd1ead3d5d5f776f89d33110b1addae0ab010ad774d9a44fb9/frozenlist-1.8.0-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:2f05983daecab868a31e1da44462873306d3cbfd76d1f0b5b69c473d21dbb128", size = 229131, upload-time = "2025-10-06T05:37:18.221Z" }, + { url = "https://files.pythonhosted.org/packages/6c/52/232476fe9cb64f0742f3fde2b7d26c1dac18b6d62071c74d4ded55e0ef94/frozenlist-1.8.0-cp314-cp314-musllinux_1_2_armv7l.whl", hash = "sha256:33f48f51a446114bc5d251fb2954ab0164d5be02ad3382abcbfe07e2531d650f", size = 240542, upload-time = "2025-10-06T05:37:19.771Z" }, + { url = "https://files.pythonhosted.org/packages/5f/85/07bf3f5d0fb5414aee5f47d33c6f5c77bfe49aac680bfece33d4fdf6a246/frozenlist-1.8.0-cp314-cp314-musllinux_1_2_ppc64le.whl", hash = "sha256:154e55ec0655291b5dd1b8731c637ecdb50975a2ae70c606d100750a540082f7", size = 237308, upload-time = "2025-10-06T05:37:20.969Z" }, + { url = "https://files.pythonhosted.org/packages/11/99/ae3a33d5befd41ac0ca2cc7fd3aa707c9c324de2e89db0e0f45db9a64c26/frozenlist-1.8.0-cp314-cp314-musllinux_1_2_s390x.whl", hash = "sha256:4314debad13beb564b708b4a496020e5306c7333fa9a3ab90374169a20ffab30", size = 238210, upload-time = "2025-10-06T05:37:22.252Z" }, + { url = "https://files.pythonhosted.org/packages/b2/60/b1d2da22f4970e7a155f0adde9b1435712ece01b3cd45ba63702aea33938/frozenlist-1.8.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:073f8bf8becba60aa931eb3bc420b217bb7d5b8f4750e6f8b3be7f3da85d38b7", size = 231972, upload-time = "2025-10-06T05:37:23.5Z" }, + { url = "https://files.pythonhosted.org/packages/3f/ab/945b2f32de889993b9c9133216c068b7fcf257d8595a0ac420ac8677cab0/frozenlist-1.8.0-cp314-cp314-win32.whl", hash = "sha256:bac9c42ba2ac65ddc115d930c78d24ab8d4f465fd3fc473cdedfccadb9429806", size = 40536, upload-time = "2025-10-06T05:37:25.581Z" }, + { url = "https://files.pythonhosted.org/packages/59/ad/9caa9b9c836d9ad6f067157a531ac48b7d36499f5036d4141ce78c230b1b/frozenlist-1.8.0-cp314-cp314-win_amd64.whl", hash = "sha256:3e0761f4d1a44f1d1a47996511752cf3dcec5bbdd9cc2b4fe595caf97754b7a0", size = 44330, upload-time = "2025-10-06T05:37:26.928Z" }, + { url = "https://files.pythonhosted.org/packages/82/13/e6950121764f2676f43534c555249f57030150260aee9dcf7d64efda11dd/frozenlist-1.8.0-cp314-cp314-win_arm64.whl", hash = "sha256:d1eaff1d00c7751b7c6662e9c5ba6eb2c17a2306ba5e2a37f24ddf3cc953402b", size = 40627, upload-time = "2025-10-06T05:37:28.075Z" }, + { url = "https://files.pythonhosted.org/packages/c0/c7/43200656ecc4e02d3f8bc248df68256cd9572b3f0017f0a0c4e93440ae23/frozenlist-1.8.0-cp314-cp314t-macosx_10_13_universal2.whl", hash = "sha256:d3bb933317c52d7ea5004a1c442eef86f426886fba134ef8cf4226ea6ee1821d", size = 89238, upload-time = "2025-10-06T05:37:29.373Z" }, + { url = "https://files.pythonhosted.org/packages/d1/29/55c5f0689b9c0fb765055629f472c0de484dcaf0acee2f7707266ae3583c/frozenlist-1.8.0-cp314-cp314t-macosx_10_13_x86_64.whl", hash = "sha256:8009897cdef112072f93a0efdce29cd819e717fd2f649ee3016efd3cd885a7ed", size = 50738, upload-time = "2025-10-06T05:37:30.792Z" }, + { url = "https://files.pythonhosted.org/packages/ba/7d/b7282a445956506fa11da8c2db7d276adcbf2b17d8bb8407a47685263f90/frozenlist-1.8.0-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:2c5dcbbc55383e5883246d11fd179782a9d07a986c40f49abe89ddf865913930", size = 51739, upload-time = "2025-10-06T05:37:32.127Z" }, + { url = "https://files.pythonhosted.org/packages/62/1c/3d8622e60d0b767a5510d1d3cf21065b9db874696a51ea6d7a43180a259c/frozenlist-1.8.0-cp314-cp314t-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:39ecbc32f1390387d2aa4f5a995e465e9e2f79ba3adcac92d68e3e0afae6657c", size = 284186, upload-time = "2025-10-06T05:37:33.21Z" }, + { url = "https://files.pythonhosted.org/packages/2d/14/aa36d5f85a89679a85a1d44cd7a6657e0b1c75f61e7cad987b203d2daca8/frozenlist-1.8.0-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:92db2bf818d5cc8d9c1f1fc56b897662e24ea5adb36ad1f1d82875bd64e03c24", size = 292196, upload-time = "2025-10-06T05:37:36.107Z" }, + { url = "https://files.pythonhosted.org/packages/05/23/6bde59eb55abd407d34f77d39a5126fb7b4f109a3f611d3929f14b700c66/frozenlist-1.8.0-cp314-cp314t-manylinux2014_armv7l.manylinux_2_17_armv7l.manylinux_2_31_armv7l.whl", hash = "sha256:2dc43a022e555de94c3b68a4ef0b11c4f747d12c024a520c7101709a2144fb37", size = 273830, upload-time = "2025-10-06T05:37:37.663Z" }, + { url = "https://files.pythonhosted.org/packages/d2/3f/22cff331bfad7a8afa616289000ba793347fcd7bc275f3b28ecea2a27909/frozenlist-1.8.0-cp314-cp314t-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:cb89a7f2de3602cfed448095bab3f178399646ab7c61454315089787df07733a", size = 294289, upload-time = "2025-10-06T05:37:39.261Z" }, + { url = "https://files.pythonhosted.org/packages/a4/89/5b057c799de4838b6c69aa82b79705f2027615e01be996d2486a69ca99c4/frozenlist-1.8.0-cp314-cp314t-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:33139dc858c580ea50e7e60a1b0ea003efa1fd42e6ec7fdbad78fff65fad2fd2", size = 300318, upload-time = "2025-10-06T05:37:43.213Z" }, + { url = "https://files.pythonhosted.org/packages/30/de/2c22ab3eb2a8af6d69dc799e48455813bab3690c760de58e1bf43b36da3e/frozenlist-1.8.0-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:168c0969a329b416119507ba30b9ea13688fafffac1b7822802537569a1cb0ef", size = 282814, upload-time = "2025-10-06T05:37:45.337Z" }, + { url = "https://files.pythonhosted.org/packages/59/f7/970141a6a8dbd7f556d94977858cfb36fa9b66e0892c6dd780d2219d8cd8/frozenlist-1.8.0-cp314-cp314t-musllinux_1_2_armv7l.whl", hash = "sha256:28bd570e8e189d7f7b001966435f9dac6718324b5be2990ac496cf1ea9ddb7fe", size = 291762, upload-time = "2025-10-06T05:37:46.657Z" }, + { url = "https://files.pythonhosted.org/packages/c1/15/ca1adae83a719f82df9116d66f5bb28bb95557b3951903d39135620ef157/frozenlist-1.8.0-cp314-cp314t-musllinux_1_2_ppc64le.whl", hash = "sha256:b2a095d45c5d46e5e79ba1e5b9cb787f541a8dee0433836cea4b96a2c439dcd8", size = 289470, upload-time = "2025-10-06T05:37:47.946Z" }, + { url = "https://files.pythonhosted.org/packages/ac/83/dca6dc53bf657d371fbc88ddeb21b79891e747189c5de990b9dfff2ccba1/frozenlist-1.8.0-cp314-cp314t-musllinux_1_2_s390x.whl", hash = "sha256:eab8145831a0d56ec9c4139b6c3e594c7a83c2c8be25d5bcf2d86136a532287a", size = 289042, upload-time = "2025-10-06T05:37:49.499Z" }, + { url = "https://files.pythonhosted.org/packages/96/52/abddd34ca99be142f354398700536c5bd315880ed0a213812bc491cff5e4/frozenlist-1.8.0-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:974b28cf63cc99dfb2188d8d222bc6843656188164848c4f679e63dae4b0708e", size = 283148, upload-time = "2025-10-06T05:37:50.745Z" }, + { url = "https://files.pythonhosted.org/packages/af/d3/76bd4ed4317e7119c2b7f57c3f6934aba26d277acc6309f873341640e21f/frozenlist-1.8.0-cp314-cp314t-win32.whl", hash = "sha256:342c97bf697ac5480c0a7ec73cd700ecfa5a8a40ac923bd035484616efecc2df", size = 44676, upload-time = "2025-10-06T05:37:52.222Z" }, + { url = "https://files.pythonhosted.org/packages/89/76/c615883b7b521ead2944bb3480398cbb07e12b7b4e4d073d3752eb721558/frozenlist-1.8.0-cp314-cp314t-win_amd64.whl", hash = "sha256:06be8f67f39c8b1dc671f5d83aaefd3358ae5cdcf8314552c57e7ed3e6475bdd", size = 49451, upload-time = "2025-10-06T05:37:53.425Z" }, + { url = "https://files.pythonhosted.org/packages/e0/a3/5982da14e113d07b325230f95060e2169f5311b1017ea8af2a29b374c289/frozenlist-1.8.0-cp314-cp314t-win_arm64.whl", hash = "sha256:102e6314ca4da683dca92e3b1355490fed5f313b768500084fbe6371fddfdb79", size = 42507, upload-time = "2025-10-06T05:37:54.513Z" }, + { url = "https://files.pythonhosted.org/packages/9a/9a/e35b4a917281c0b8419d4207f4334c8e8c5dbf4f3f5f9ada73958d937dcc/frozenlist-1.8.0-py3-none-any.whl", hash = "sha256:0c18a16eab41e82c295618a77502e17b195883241c563b00f0aa5106fc4eaa0d", size = 13409, upload-time = "2025-10-06T05:38:16.721Z" }, +] + [[package]] name = "googleapis-common-protos" version = "1.75.0" @@ -532,6 +755,15 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/62/a1/3d680cbfd5f4b8f15abc1d571870c5fc3e594bb582bc3b64ea099db13e56/jinja2-3.1.6-py3-none-any.whl", hash = "sha256:85ece4451f492d0c13c5dd7c13a64681a86afae63a5f347908daf103ce6d2f67", size = 134899, upload-time = "2025-03-05T20:05:00.369Z" }, ] +[[package]] +name = "jmespath" +version = "1.1.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/d3/59/322338183ecda247fb5d1763a6cbe46eff7222eaeebafd9fa65d4bf5cb11/jmespath-1.1.0.tar.gz", hash = "sha256:472c87d80f36026ae83c6ddd0f1d05d4e510134ed462851fd5f754c8c3cbb88d", size = 27377, upload-time = "2026-01-22T16:35:26.279Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/14/2f/967ba146e6d58cf6a652da73885f52fc68001525b4197effc174321d70b4/jmespath-1.1.0-py3-none-any.whl", hash = "sha256:a5663118de4908c91729bea0acadca56526eb2698e83de10cd116ae0f4e97c64", size = 20419, upload-time = "2026-01-22T16:35:24.919Z" }, +] + [[package]] name = "joblib" version = "1.5.3" @@ -736,6 +968,7 @@ wheels = [ name = "mpcontribs-api" source = { editable = "." } dependencies = [ + { name = "aioboto3" }, { name = "beanie" }, { name = "fastapi", extra = ["standard"] }, { name = "fastapi-filter" }, @@ -748,6 +981,7 @@ dependencies = [ { name = "pymatgen" }, { name = "pymongo" }, { name = "structlog" }, + { name = "types-aiobotocore", extra = ["s3"] }, ] [package.dev-dependencies] @@ -763,6 +997,7 @@ dev = [ [package.metadata] requires-dist = [ + { name = "aioboto3", specifier = ">=15.5.0" }, { name = "beanie", specifier = ">=2.1.0" }, { name = "fastapi", extras = ["standard"], specifier = ">=0.136.3" }, { name = "fastapi-filter", specifier = ">=2.0.1" }, @@ -775,6 +1010,7 @@ requires-dist = [ { name = "pymatgen" }, { name = "pymongo", specifier = ">=4.17.0" }, { name = "structlog", specifier = ">=25.5.0" }, + { name = "types-aiobotocore", extras = ["s3"], specifier = ">=3.7.0" }, ] [package.metadata.requires-dev] @@ -797,6 +1033,51 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/43/e3/7d92a15f894aa0c9c4b49b8ee9ac9850d6e63b03c9c32c0367a13ae62209/mpmath-1.3.0-py3-none-any.whl", hash = "sha256:a0b2b9fe80bbcd81a6647ff13108738cfb482d481d826cc0e02f5b35e5c88d2c", size = 536198, upload-time = "2023-03-07T16:47:09.197Z" }, ] +[[package]] +name = "multidict" +version = "6.7.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/1a/c2/c2d94cbe6ac1753f3fc980da97b3d930efe1da3af3c9f5125354436c073d/multidict-6.7.1.tar.gz", hash = "sha256:ec6652a1bee61c53a3e5776b6049172c53b6aaba34f18c9ad04f82712bac623d", size = 102010, upload-time = "2026-01-26T02:46:45.979Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/91/cc/db74228a8be41884a567e88a62fd589a913708fcf180d029898c17a9a371/multidict-6.7.1-cp314-cp314-macosx_10_15_universal2.whl", hash = "sha256:8f333ec9c5eb1b7105e3b84b53141e66ca05a19a605368c55450b6ba208cb9ee", size = 75190, upload-time = "2026-01-26T02:45:10.651Z" }, + { url = "https://files.pythonhosted.org/packages/d5/22/492f2246bb5b534abd44804292e81eeaf835388901f0c574bac4eeec73c5/multidict-6.7.1-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:a407f13c188f804c759fc6a9f88286a565c242a76b27626594c133b82883b5c2", size = 44486, upload-time = "2026-01-26T02:45:11.938Z" }, + { url = "https://files.pythonhosted.org/packages/f1/4f/733c48f270565d78b4544f2baddc2fb2a245e5a8640254b12c36ac7ac68e/multidict-6.7.1-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:0e161ddf326db5577c3a4cc2d8648f81456e8a20d40415541587a71620d7a7d1", size = 43219, upload-time = "2026-01-26T02:45:14.346Z" }, + { url = "https://files.pythonhosted.org/packages/24/bb/2c0c2287963f4259c85e8bcbba9182ced8d7fca65c780c38e99e61629d11/multidict-6.7.1-cp314-cp314-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:1e3a8bb24342a8201d178c3b4984c26ba81a577c80d4d525727427460a50c22d", size = 245132, upload-time = "2026-01-26T02:45:15.712Z" }, + { url = "https://files.pythonhosted.org/packages/a7/f9/44d4b3064c65079d2467888794dea218d1601898ac50222ab8a9a8094460/multidict-6.7.1-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:97231140a50f5d447d3164f994b86a0bed7cd016e2682f8650d6a9158e14fd31", size = 252420, upload-time = "2026-01-26T02:45:17.293Z" }, + { url = "https://files.pythonhosted.org/packages/8b/13/78f7275e73fa17b24c9a51b0bd9d73ba64bb32d0ed51b02a746eb876abe7/multidict-6.7.1-cp314-cp314-manylinux2014_armv7l.manylinux_2_17_armv7l.manylinux_2_31_armv7l.whl", hash = "sha256:6b10359683bd8806a200fd2909e7c8ca3a7b24ec1d8132e483d58e791d881048", size = 233510, upload-time = "2026-01-26T02:45:19.356Z" }, + { url = "https://files.pythonhosted.org/packages/4b/25/8167187f62ae3cbd52da7893f58cb036b47ea3fb67138787c76800158982/multidict-6.7.1-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:283ddac99f7ac25a4acadbf004cb5ae34480bbeb063520f70ce397b281859362", size = 264094, upload-time = "2026-01-26T02:45:20.834Z" }, + { url = "https://files.pythonhosted.org/packages/a1/e7/69a3a83b7b030cf283fb06ce074a05a02322359783424d7edf0f15fe5022/multidict-6.7.1-cp314-cp314-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:538cec1e18c067d0e6103aa9a74f9e832904c957adc260e61cd9d8cf0c3b3d37", size = 260786, upload-time = "2026-01-26T02:45:22.818Z" }, + { url = "https://files.pythonhosted.org/packages/fe/3b/8ec5074bcfc450fe84273713b4b0a0dd47c0249358f5d82eb8104ffe2520/multidict-6.7.1-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:7eee46ccb30ff48a1e35bb818cc90846c6be2b68240e42a78599166722cea709", size = 248483, upload-time = "2026-01-26T02:45:24.368Z" }, + { url = "https://files.pythonhosted.org/packages/48/5a/d5a99e3acbca0e29c5d9cba8f92ceb15dce78bab963b308ae692981e3a5d/multidict-6.7.1-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:fa263a02f4f2dd2d11a7b1bb4362aa7cb1049f84a9235d31adf63f30143469a0", size = 248403, upload-time = "2026-01-26T02:45:25.982Z" }, + { url = "https://files.pythonhosted.org/packages/35/48/e58cd31f6c7d5102f2a4bf89f96b9cf7e00b6c6f3d04ecc44417c00a5a3c/multidict-6.7.1-cp314-cp314-musllinux_1_2_armv7l.whl", hash = "sha256:2e1425e2f99ec5bd36c15a01b690a1a2456209c5deed58f95469ffb46039ccbb", size = 240315, upload-time = "2026-01-26T02:45:27.487Z" }, + { url = "https://files.pythonhosted.org/packages/94/33/1cd210229559cb90b6786c30676bb0c58249ff42f942765f88793b41fdce/multidict-6.7.1-cp314-cp314-musllinux_1_2_i686.whl", hash = "sha256:497394b3239fc6f0e13a78a3e1b61296e72bf1c5f94b4c4eb80b265c37a131cd", size = 245528, upload-time = "2026-01-26T02:45:28.991Z" }, + { url = "https://files.pythonhosted.org/packages/64/f2/6e1107d226278c876c783056b7db43d800bb64c6131cec9c8dfb6903698e/multidict-6.7.1-cp314-cp314-musllinux_1_2_ppc64le.whl", hash = "sha256:233b398c29d3f1b9676b4b6f75c518a06fcb2ea0b925119fb2c1bc35c05e1601", size = 258784, upload-time = "2026-01-26T02:45:30.503Z" }, + { url = "https://files.pythonhosted.org/packages/4d/c1/11f664f14d525e4a1b5327a82d4de61a1db604ab34c6603bb3c2cc63ad34/multidict-6.7.1-cp314-cp314-musllinux_1_2_s390x.whl", hash = "sha256:93b1818e4a6e0930454f0f2af7dfce69307ca03cdcfb3739bf4d91241967b6c1", size = 251980, upload-time = "2026-01-26T02:45:32.603Z" }, + { url = "https://files.pythonhosted.org/packages/e1/9f/75a9ac888121d0c5bbd4ecf4eead45668b1766f6baabfb3b7f66a410e231/multidict-6.7.1-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:f33dc2a3abe9249ea5d8360f969ec7f4142e7ac45ee7014d8f8d5acddf178b7b", size = 243602, upload-time = "2026-01-26T02:45:34.043Z" }, + { url = "https://files.pythonhosted.org/packages/9a/e7/50bf7b004cc8525d80dbbbedfdc7aed3e4c323810890be4413e589074032/multidict-6.7.1-cp314-cp314-win32.whl", hash = "sha256:3ab8b9d8b75aef9df299595d5388b14530839f6422333357af1339443cff777d", size = 40930, upload-time = "2026-01-26T02:45:36.278Z" }, + { url = "https://files.pythonhosted.org/packages/e0/bf/52f25716bbe93745595800f36fb17b73711f14da59ed0bb2eba141bc9f0f/multidict-6.7.1-cp314-cp314-win_amd64.whl", hash = "sha256:5e01429a929600e7dab7b166062d9bb54a5eed752384c7384c968c2afab8f50f", size = 45074, upload-time = "2026-01-26T02:45:37.546Z" }, + { url = "https://files.pythonhosted.org/packages/97/ab/22803b03285fa3a525f48217963da3a65ae40f6a1b6f6cf2768879e208f9/multidict-6.7.1-cp314-cp314-win_arm64.whl", hash = "sha256:4885cb0e817aef5d00a2e8451d4665c1808378dc27c2705f1bf4ef8505c0d2e5", size = 42471, upload-time = "2026-01-26T02:45:38.889Z" }, + { url = "https://files.pythonhosted.org/packages/e0/6d/f9293baa6146ba9507e360ea0292b6422b016907c393e2f63fc40ab7b7b5/multidict-6.7.1-cp314-cp314t-macosx_10_15_universal2.whl", hash = "sha256:0458c978acd8e6ea53c81eefaddbbee9c6c5e591f41b3f5e8e194780fe026581", size = 82401, upload-time = "2026-01-26T02:45:40.254Z" }, + { url = "https://files.pythonhosted.org/packages/7a/68/53b5494738d83558d87c3c71a486504d8373421c3e0dbb6d0db48ad42ee0/multidict-6.7.1-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:c0abd12629b0af3cf590982c0b413b1e7395cd4ec026f30986818ab95bfaa94a", size = 48143, upload-time = "2026-01-26T02:45:41.635Z" }, + { url = "https://files.pythonhosted.org/packages/37/e8/5284c53310dcdc99ce5d66563f6e5773531a9b9fe9ec7a615e9bc306b05f/multidict-6.7.1-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:14525a5f61d7d0c94b368a42cff4c9a4e7ba2d52e2672a7b23d84dc86fb02b0c", size = 46507, upload-time = "2026-01-26T02:45:42.99Z" }, + { url = "https://files.pythonhosted.org/packages/e4/fc/6800d0e5b3875568b4083ecf5f310dcf91d86d52573160834fb4bfcf5e4f/multidict-6.7.1-cp314-cp314t-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:17307b22c217b4cf05033dabefe68255a534d637c6c9b0cc8382718f87be4262", size = 239358, upload-time = "2026-01-26T02:45:44.376Z" }, + { url = "https://files.pythonhosted.org/packages/41/75/4ad0973179361cdf3a113905e6e088173198349131be2b390f9fa4da5fc6/multidict-6.7.1-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:7a7e590ff876a3eaf1c02a4dfe0724b6e69a9e9de6d8f556816f29c496046e59", size = 246884, upload-time = "2026-01-26T02:45:47.167Z" }, + { url = "https://files.pythonhosted.org/packages/c3/9c/095bb28b5da139bd41fb9a5d5caff412584f377914bd8787c2aa98717130/multidict-6.7.1-cp314-cp314t-manylinux2014_armv7l.manylinux_2_17_armv7l.manylinux_2_31_armv7l.whl", hash = "sha256:5fa6a95dfee63893d80a34758cd0e0c118a30b8dcb46372bf75106c591b77889", size = 225878, upload-time = "2026-01-26T02:45:48.698Z" }, + { url = "https://files.pythonhosted.org/packages/07/d0/c0a72000243756e8f5a277b6b514fa005f2c73d481b7d9e47cd4568aa2e4/multidict-6.7.1-cp314-cp314t-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:a0543217a6a017692aa6ae5cc39adb75e587af0f3a82288b1492eb73dd6cc2a4", size = 253542, upload-time = "2026-01-26T02:45:50.164Z" }, + { url = "https://files.pythonhosted.org/packages/c0/6b/f69da15289e384ecf2a68837ec8b5ad8c33e973aa18b266f50fe55f24b8c/multidict-6.7.1-cp314-cp314t-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:f99fe611c312b3c1c0ace793f92464d8cd263cc3b26b5721950d977b006b6c4d", size = 252403, upload-time = "2026-01-26T02:45:51.779Z" }, + { url = "https://files.pythonhosted.org/packages/a2/76/b9669547afa5a1a25cd93eaca91c0da1c095b06b6d2d8ec25b713588d3a1/multidict-6.7.1-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:9004d8386d133b7e6135679424c91b0b854d2d164af6ea3f289f8f2761064609", size = 244889, upload-time = "2026-01-26T02:45:53.27Z" }, + { url = "https://files.pythonhosted.org/packages/7e/a9/a50d2669e506dad33cfc45b5d574a205587b7b8a5f426f2fbb2e90882588/multidict-6.7.1-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:e628ef0e6859ffd8273c69412a2465c4be4a9517d07261b33334b5ec6f3c7489", size = 241982, upload-time = "2026-01-26T02:45:54.919Z" }, + { url = "https://files.pythonhosted.org/packages/c5/bb/1609558ad8b456b4827d3c5a5b775c93b87878fd3117ed3db3423dfbce1b/multidict-6.7.1-cp314-cp314t-musllinux_1_2_armv7l.whl", hash = "sha256:841189848ba629c3552035a6a7f5bf3b02eb304e9fea7492ca220a8eda6b0e5c", size = 232415, upload-time = "2026-01-26T02:45:56.981Z" }, + { url = "https://files.pythonhosted.org/packages/d8/59/6f61039d2aa9261871e03ab9dc058a550d240f25859b05b67fd70f80d4b3/multidict-6.7.1-cp314-cp314t-musllinux_1_2_i686.whl", hash = "sha256:ce1bbd7d780bb5a0da032e095c951f7014d6b0a205f8318308140f1a6aba159e", size = 240337, upload-time = "2026-01-26T02:45:58.698Z" }, + { url = "https://files.pythonhosted.org/packages/a1/29/fdc6a43c203890dc2ae9249971ecd0c41deaedfe00d25cb6564b2edd99eb/multidict-6.7.1-cp314-cp314t-musllinux_1_2_ppc64le.whl", hash = "sha256:b26684587228afed0d50cf804cc71062cc9c1cdf55051c4c6345d372947b268c", size = 248788, upload-time = "2026-01-26T02:46:00.862Z" }, + { url = "https://files.pythonhosted.org/packages/a9/14/a153a06101323e4cf086ecee3faadba52ff71633d471f9685c42e3736163/multidict-6.7.1-cp314-cp314t-musllinux_1_2_s390x.whl", hash = "sha256:9f9af11306994335398293f9958071019e3ab95e9a707dc1383a35613f6abcb9", size = 242842, upload-time = "2026-01-26T02:46:02.824Z" }, + { url = "https://files.pythonhosted.org/packages/41/5f/604ae839e64a4a6efc80db94465348d3b328ee955e37acb24badbcd24d83/multidict-6.7.1-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:b4938326284c4f1224178a560987b6cf8b4d38458b113d9b8c1db1a836e640a2", size = 240237, upload-time = "2026-01-26T02:46:05.898Z" }, + { url = "https://files.pythonhosted.org/packages/5f/60/c3a5187bf66f6fb546ff4ab8fb5a077cbdd832d7b1908d4365c7f74a1917/multidict-6.7.1-cp314-cp314t-win32.whl", hash = "sha256:98655c737850c064a65e006a3df7c997cd3b220be4ec8fe26215760b9697d4d7", size = 48008, upload-time = "2026-01-26T02:46:07.468Z" }, + { url = "https://files.pythonhosted.org/packages/0c/f7/addf1087b860ac60e6f382240f64fb99f8bfb532bb06f7c542b83c29ca61/multidict-6.7.1-cp314-cp314t-win_amd64.whl", hash = "sha256:497bde6223c212ba11d462853cfa4f0ae6ef97465033e7dc9940cdb3ab5b48e5", size = 53542, upload-time = "2026-01-26T02:46:08.809Z" }, + { url = "https://files.pythonhosted.org/packages/4c/81/4629d0aa32302ef7b2ec65c75a728cc5ff4fa410c50096174c1632e70b3e/multidict-6.7.1-cp314-cp314t-win_arm64.whl", hash = "sha256:2bbd113e0d4af5db41d5ebfe9ccaff89de2120578164f86a5d17d5a576d1e5b2", size = 44719, upload-time = "2026-01-26T02:46:11.146Z" }, + { url = "https://files.pythonhosted.org/packages/81/08/7036c080d7117f28a4af526d794aab6a84463126db031b007717c1a6676e/multidict-6.7.1-py3-none-any.whl", hash = "sha256:55d97cc6dae627efa6a6e548885712d4864b81110ac76fa4e534c03819fa4a56", size = 12319, upload-time = "2026-01-26T02:46:44.004Z" }, +] + [[package]] name = "narwhals" version = "2.21.2" @@ -1136,6 +1417,49 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/54/20/4d324d65cc6d9205fabedc306948156824eb9f0ee1633355a8f7ec5c66bf/pluggy-1.6.0-py3-none-any.whl", hash = "sha256:e920276dd6813095e9377c0bc5566d94c932c33b27a3e3945d8389c374dd4746", size = 20538, upload-time = "2025-05-15T12:30:06.134Z" }, ] +[[package]] +name = "propcache" +version = "0.5.2" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/ec/44/c87281c333769159c50594f22610f77398a47ccbfbbf23074e744e86f87c/propcache-0.5.2.tar.gz", hash = "sha256:01c4fc7480cd0598bb4b57022df55b9ca296da7fc5a8760bd8451a7e63a7d427", size = 50208, upload-time = "2026-05-08T21:02:12.199Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/e2/ea/23ee535d90ce8bcc465a3028eb3cc0ce3bd1005f4bb27710b30587de798d/propcache-0.5.2-cp314-cp314-macosx_10_15_universal2.whl", hash = "sha256:46088abff4cba581dea21ae0467a480526cb25aa5f3c269e909f800328bc3999", size = 94662, upload-time = "2026-05-08T21:01:22.683Z" }, + { url = "https://files.pythonhosted.org/packages/b5/06/c5a52f419b5d8972f8d46a7577476090d8e3263ff589ce40b5ca4968d5be/propcache-0.5.2-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:fc88b26f08d634f7bc819a7852e5214f5802641ab8d9fd5326892292eee1993e", size = 53928, upload-time = "2026-05-08T21:01:23.986Z" }, + { url = "https://files.pythonhosted.org/packages/63/b1/4260d67d6bd85e58a66b72d54ce15d5de789b6f3870cc6bedf8ff9667401/propcache-0.5.2-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:97797ebb098e670a2f92dd66f32897e30d7615b14e7f59711de23e30a9072539", size = 54650, upload-time = "2026-05-08T21:01:25.305Z" }, + { url = "https://files.pythonhosted.org/packages/70/06/2f46c318e3307cd7a6a7481def374ce838c0fe20084b39dd54b0879d0e99/propcache-0.5.2-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:ba57fffe4ac99c5d30076161b5866336d97600769bad35cc68f7774b15298a4e", size = 59912, upload-time = "2026-05-08T21:01:26.545Z" }, + { url = "https://files.pythonhosted.org/packages/4c/29/fe1aebec2ce57ab985a9c382bded1124431f85078113aa222c5d278430d4/propcache-0.5.2-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:583c19759d9eec1e5b69e2fbef36a7d9c326041be9746cb822d335c8cedc2979", size = 63300, upload-time = "2026-05-08T21:01:27.937Z" }, + { url = "https://files.pythonhosted.org/packages/b4/18/2334b26768b6c82be8c69e83671b767d5ef426aa09b0cba6c2ea47816774/propcache-0.5.2-cp314-cp314-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:d0326e2e5e1f3163fa306c834e48e8d490e5fae607a097a40c0648109b47ba80", size = 64208, upload-time = "2026-05-08T21:01:29.484Z" }, + { url = "https://files.pythonhosted.org/packages/2b/76/7f1bfd6afff4c5e38e36a3c6d68eb5f4b7311ea80baf693db78d95b603c4/propcache-0.5.2-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:e00820e192c8dbebcafb383ebbf99030895f09905e7a0eb2e0340a0bcc2bc825", size = 61633, upload-time = "2026-05-08T21:01:31.068Z" }, + { url = "https://files.pythonhosted.org/packages/c4/46/b3ff8aba2b4953a3e50de2cf72f1b5748b8eca93b15f3dc2c84339084c09/propcache-0.5.2-cp314-cp314-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:c66afea89b1e43725731d2004732a046fe6fe955d51f952c3e95a7314a284a39", size = 61724, upload-time = "2026-05-08T21:01:32.374Z" }, + { url = "https://files.pythonhosted.org/packages/c5/01/814cfcafbcff954f94c01cf30e097ddc88a076b5440fbcf4570753437d40/propcache-0.5.2-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:d4dc37dec6c6cdad0b57881a5658fd14fbf53e333b1a86cf86559f190e1d9ec4", size = 60069, upload-time = "2026-05-08T21:01:33.67Z" }, + { url = "https://files.pythonhosted.org/packages/da/68/5c6f7622d510cc666a300687e06fd060c1a43361c0c9b20d284f06d8096a/propcache-0.5.2-cp314-cp314-musllinux_1_2_armv7l.whl", hash = "sha256:5570dbcc97571c15f68068e529c92715a12f8d54030e272d264b377e22bd17a5", size = 57099, upload-time = "2026-05-08T21:01:34.915Z" }, + { url = "https://files.pythonhosted.org/packages/55/27/9cb0b4c679124085327957d42521c99dba04c88c90c3e55a6f0b633ebccc/propcache-0.5.2-cp314-cp314-musllinux_1_2_ppc64le.whl", hash = "sha256:f814362777a9f841adddb200ecdf8f5cb1e5a3c4b7a86378edbd6ccb26edd702", size = 63391, upload-time = "2026-05-08T21:01:36.231Z" }, + { url = "https://files.pythonhosted.org/packages/f0/9d/7258aaa5bdf60fc6f27591eef6fe52768cb0beda7140be477c8b12c9794a/propcache-0.5.2-cp314-cp314-musllinux_1_2_riscv64.whl", hash = "sha256:196913dea116aeb5a2ba95af4ddcb7ea85559ae07d8eee8751688310d09168c3", size = 61626, upload-time = "2026-05-08T21:01:37.545Z" }, + { url = "https://files.pythonhosted.org/packages/8e/0d/41c602003e8a9b16fe1e7eadf62c7bfba9d5474370b24200bf48b315f45f/propcache-0.5.2-cp314-cp314-musllinux_1_2_s390x.whl", hash = "sha256:6e7b8719005dd1175be4ab1cd25e9b98659a5e0347331506ec6760d2773a7fb5", size = 64781, upload-time = "2026-05-08T21:01:38.83Z" }, + { url = "https://files.pythonhosted.org/packages/8b/f3/38e66b1856e9bd079deea015bc4a55f7767c0e4db2f7dcf69e7e680ba4ce/propcache-0.5.2-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:51f96d685ab16e88cab128cd37a52c5da540809c8b879fa047731bfcb4ad35a4", size = 62570, upload-time = "2026-05-08T21:01:40.415Z" }, + { url = "https://files.pythonhosted.org/packages/95/ca/bbfe9b910ce57dde8bb4876b4520fc02a4e89497c10de26be936758a3aaa/propcache-0.5.2-cp314-cp314-win32.whl", hash = "sha256:cc6fc3cc62e8501d3ed62894425040d2728ecddb1ed072737a5c70bd537aa9f0", size = 39436, upload-time = "2026-05-08T21:01:41.654Z" }, + { url = "https://files.pythonhosted.org/packages/61/d2/45c9defbaa1ea297035d9d4cce9e8f80daafbf19319c6007f157c6256ea9/propcache-0.5.2-cp314-cp314-win_amd64.whl", hash = "sha256:81e3a30b0bb60caa22033dd0f8a3618d1d67356212514f62c57db75cb0ef410c", size = 42373, upload-time = "2026-05-08T21:01:43.041Z" }, + { url = "https://files.pythonhosted.org/packages/44/68/9ea5103f41d5217d7d6ec24db90018e23aebec070c3f9a6e54d12b841fd8/propcache-0.5.2-cp314-cp314-win_arm64.whl", hash = "sha256:0d2c9bf8528f135dbb805ce027567e09164f7efa51a2be07458a2c0420f292d0", size = 38554, upload-time = "2026-05-08T21:01:44.336Z" }, + { url = "https://files.pythonhosted.org/packages/8a/81/fadf555f42d3b762eea8a53950b0489fdc0aa9da5f8ed9e10ce0a4e01b48/propcache-0.5.2-cp314-cp314t-macosx_10_15_universal2.whl", hash = "sha256:4bc8ff1feffc6a61c7002ffe84634c41b822e104990ae009f44a0834430070bb", size = 99395, upload-time = "2026-05-08T21:01:45.883Z" }, + { url = "https://files.pythonhosted.org/packages/f5/c9/c61e134a686949cf7971af3a390148b1156f7be81c73bc0cd12c873e2d48/propcache-0.5.2-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:79aa3ff0a9b566633b642fa9caf7e21ed1c13d6feca718187873f199e1514078", size = 56653, upload-time = "2026-05-08T21:01:47.307Z" }, + { url = "https://files.pythonhosted.org/packages/cb/73/daf935ea7048ddd7ec8eec5345b4a40b619d2d178b3c0a0900796bc3c794/propcache-0.5.2-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:1b31822f4474c4036bae62de9402710051d431a606d6a0f907fec79935a071aa", size = 56914, upload-time = "2026-05-08T21:01:48.573Z" }, + { url = "https://files.pythonhosted.org/packages/79/9f/aba959b435ea18617edd7cf0a7ad0b9c574b8fc7e3d2cd55fb59cb255d33/propcache-0.5.2-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:13fef48778b5a2a756523fdb781326b028ca75e32858b04f2cdd19f394564917", size = 62567, upload-time = "2026-05-08T21:01:49.903Z" }, + { url = "https://files.pythonhosted.org/packages/6c/a1/859942de9a791ff42f6141736f5b37749b8f53e65edfa49638c67dd67e6a/propcache-0.5.2-cp314-cp314t-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:8b73ab70f1a3351fbc71f663b3e645af6dd0329100c353081cf69c37433fc6fe", size = 65542, upload-time = "2026-05-08T21:01:51.204Z" }, + { url = "https://files.pythonhosted.org/packages/b5/61/315bc0fd6c0fc7f80a528b8afd209e5fc4a875ea79571b91b8f50f442907/propcache-0.5.2-cp314-cp314t-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:5538d2c13d93e4698af7e092b57bc7298fd35d1d58e656ae18f23ee0d0378e03", size = 66845, upload-time = "2026-05-08T21:01:52.539Z" }, + { url = "https://files.pythonhosted.org/packages/47/f7/9f8122e3132e8e354ac41975ef8f1099be7d5a16bc7ae562734e993665c0/propcache-0.5.2-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:cd645f03898405cabe694fb8bc35241e3a9c332ec85627584fe3de201452b335", size = 63985, upload-time = "2026-05-08T21:01:53.847Z" }, + { url = "https://files.pythonhosted.org/packages/c8/54/c317819ec157cbf6f35df9df9657a6f82daf34d5faf15948b2f639c2192e/propcache-0.5.2-cp314-cp314t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:a473b3440261e0c60706e732b2ed2f517857344fc21bf48fdfe211e2d98eb285", size = 63999, upload-time = "2026-05-08T21:01:55.179Z" }, + { url = "https://files.pythonhosted.org/packages/5a/56/387e3f7dfce0a9233df41fb888aa1c30222cb4bbbf09537c02dd9bd85fe2/propcache-0.5.2-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:7afa37062e6650640e932e4cc9297d81f9f42d9944029cc386b8247dea4da837", size = 62779, upload-time = "2026-05-08T21:01:57.489Z" }, + { url = "https://files.pythonhosted.org/packages/a1/9c/596784cb5824ed61ee960d3f8655a3f0993e107c6e98ab6c818b7fb92ccb/propcache-0.5.2-cp314-cp314t-musllinux_1_2_armv7l.whl", hash = "sha256:8a90efd5777e996e42d568db9ac740b944d691e565cbfd31b2f7832f9184b2b8", size = 59796, upload-time = "2026-05-08T21:01:58.736Z" }, + { url = "https://files.pythonhosted.org/packages/c2/3d/1a6cfa1726a48542c1e8784a0761421476a5b68e09b7f36bf95eb954aaba/propcache-0.5.2-cp314-cp314t-musllinux_1_2_ppc64le.whl", hash = "sha256:f19bb891234d72535764d703bfed1153cc34f4214d5bd7150aee1eec9e8f4366", size = 66023, upload-time = "2026-05-08T21:02:00.228Z" }, + { url = "https://files.pythonhosted.org/packages/e4/0e/05fd6990369477076e4e280bcb970de760fddf0161a46e988bc95f7940ec/propcache-0.5.2-cp314-cp314t-musllinux_1_2_riscv64.whl", hash = "sha256:32775082acd2d807ee3db715c7770d38767b817870acfa08c29e057f3c4d5b56", size = 64448, upload-time = "2026-05-08T21:02:01.888Z" }, + { url = "https://files.pythonhosted.org/packages/cd/86/5f8da315a4309c62c10c0b2516b17492d5d3bbe1bb862b96604db67e2a37/propcache-0.5.2-cp314-cp314t-musllinux_1_2_s390x.whl", hash = "sha256:9282fb1a3bccd038da9f768b927b24a0c753e466c086b7c4f3c6982851eefb2d", size = 67329, upload-time = "2026-05-08T21:02:03.484Z" }, + { url = "https://files.pythonhosted.org/packages/da/d3/3368efe79ab21f0cdf86ef49895811c9cc933131d4cde1f28a624e22e712/propcache-0.5.2-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:cc49723e2f60d6b32a0f0b08a3fd6d13203c07f1cd9566cfce0f12a917c967a2", size = 65172, upload-time = "2026-05-08T21:02:04.745Z" }, + { url = "https://files.pythonhosted.org/packages/d5/07/127e8b0bacfb325396196f9d976a22453049b89b9b2b08477cc3145faa44/propcache-0.5.2-cp314-cp314t-win32.whl", hash = "sha256:2d7aa89ebca5acc98cba9d1472d976e394782f587bad6661003602a619fd1821", size = 43813, upload-time = "2026-05-08T21:02:06.025Z" }, + { url = "https://files.pythonhosted.org/packages/88/fb/46dad6c0ae49ed230ab1b16c890c2b6314e2403e6c412976f4a72d64a527/propcache-0.5.2-cp314-cp314t-win_amd64.whl", hash = "sha256:d447bb0b3054be5818458fbb171208b1d9ff11eba14e18ca18b90cbb45767370", size = 47764, upload-time = "2026-05-08T21:02:07.353Z" }, + { url = "https://files.pythonhosted.org/packages/e7/c4/a47d0a63aa309d10d59ede6e9d4cff03a344a79d1f0f4cd0cd74997b53e0/propcache-0.5.2-cp314-cp314t-win_arm64.whl", hash = "sha256:fe67a3d11cd9b4efabfa45c3d00ffba2b26811442a73a581a94b67c2b5faccf6", size = 41140, upload-time = "2026-05-08T21:02:09.065Z" }, + { url = "https://files.pythonhosted.org/packages/3a/ed/1cdcab6ba3d6ab7feca11fc14f0eeea80755bb53ef4e892079f31b10a25f/propcache-0.5.2-py3-none-any.whl", hash = "sha256:be1ddfcbb376e3de5d2e2db1d58d6d67463e6b4f9f040c000de8e300295465fe", size = 14036, upload-time = "2026-05-08T21:02:10.673Z" }, +] + [[package]] name = "protobuf" version = "6.33.6" @@ -1553,6 +1877,18 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/4e/b2/920464c907b191e37469d477a1aa8bc048b8f36c4c1610dfa4ab87b39e18/ruff-0.15.15-py3-none-win_arm64.whl", hash = "sha256:3c8ceca6792f38196b8f589bc92eccd03eef286602da92e5dc05cc42ef6441b7", size = 11138498, upload-time = "2026-05-28T14:16:38.425Z" }, ] +[[package]] +name = "s3transfer" +version = "0.14.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "botocore" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/62/74/8d69dcb7a9efe8baa2046891735e5dfe433ad558ae23d9e3c14c633d1d58/s3transfer-0.14.0.tar.gz", hash = "sha256:eff12264e7c8b4985074ccce27a3b38a485bb7f7422cc8046fee9be4983e4125", size = 151547, upload-time = "2025-09-09T19:23:31.089Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/48/f0/ae7ca09223a81a1d890b2557186ea015f6e0502e9b8cb8e1813f1d8cfa4e/s3transfer-0.14.0-py3-none-any.whl", hash = "sha256:ea3b790c7077558ed1f02a3072fb3cb992bbbd253392f4b6e9e8976941c7d456", size = 85712, upload-time = "2025-09-09T19:23:30.041Z" }, +] + [[package]] name = "scipy" version = "1.17.1" @@ -1713,6 +2049,41 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/24/25/2201973529af2c954de0bb725323c3aaed6d7f0ceee8f550dec9185df013/typer-0.26.7-py3-none-any.whl", hash = "sha256:5c87cfbc5d34491c5346ebf49c23e18d56ccb863268d3a8d592b26087c2f5e58", size = 122456, upload-time = "2026-06-03T07:18:05.732Z" }, ] +[[package]] +name = "types-aiobotocore" +version = "3.7.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "botocore-stubs" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/76/e8/ef1fcb876937dbdddc0f01b5df4ed53f33b166a6367d80a9014d5e5f091d/types_aiobotocore-3.7.0.tar.gz", hash = "sha256:fe35de52c12e5fdb89ca60b3989766e7fe827e3d2e95fcf4583e91581945205c", size = 87992, upload-time = "2026-05-10T03:19:32.353Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/f9/68/0cdfd7df415ee3e769c8e8f9bd8013c64c88cdd7306f72453a02123c58f9/types_aiobotocore-3.7.0-py3-none-any.whl", hash = "sha256:ff4139b3eae22d242b6b39ba56048344b2b86f67daeeca4680da1a6e191681fd", size = 54804, upload-time = "2026-05-10T03:19:29.487Z" }, +] + +[package.optional-dependencies] +s3 = [ + { name = "types-aiobotocore-s3" }, +] + +[[package]] +name = "types-aiobotocore-s3" +version = "3.7.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/94/ce/5b7baa06cde79ab5f083f56f060ccd2b60f6249127d70bbb8a37aafbdcd4/types_aiobotocore_s3-3.7.0.tar.gz", hash = "sha256:6ec738853dbba9133707991b98ea4dab19f7c62e02b3cca016e6cd8e3d684576", size = 77662, upload-time = "2026-05-10T03:17:35.088Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/e9/ac/67240c3804a3e1c1e8f0f402155d7ed5351faf7a2085136083e5ca3f26b8/types_aiobotocore_s3-3.7.0-py3-none-any.whl", hash = "sha256:5dbb5479ece3e1aceaccac224fc3dd1ab7d912c4457419bd19e88a0a5b3844fc", size = 85450, upload-time = "2026-05-10T03:17:33.061Z" }, +] + +[[package]] +name = "types-awscrt" +version = "0.34.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/3e/59/44409a8fc06b444ab1a6f71dcb29d49a6e17e02424345eb51b051bebb345/types_awscrt-0.34.1.tar.gz", hash = "sha256:559aa04250f6a419a617dfb788f3e10903aaf74700ef23e521b64a411b83b803", size = 19062, upload-time = "2026-06-05T04:40:10.689Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/e4/b1/214b12162b452ed6acd230065e6c587cde6b96871e3ce6d653f40888f8df/types_awscrt-0.34.1-py3-none-any.whl", hash = "sha256:20c752b6031544d8f694803c35174aee129f1be5ddf886ae46d22f7ffd9b7d75", size = 45688, upload-time = "2026-06-05T04:40:09.198Z" }, +] + [[package]] name = "typing-extensions" version = "4.15.0" @@ -1881,31 +2252,77 @@ wheels = [ [[package]] name = "wrapt" -version = "2.2.1" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/2d/9f/06263fcd8ad6c405f05a3905fd7a84dd3176eb5ad46e44bccc0cd16348bb/wrapt-2.2.1.tar.gz", hash = "sha256:6744f504375775d7609c82c8d3d94af1c9a6f05586984536905908ba905277b9", size = 127620, upload-time = "2026-05-22T14:49:43.056Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/0a/a3/11d7f34ebbf3231bc907a3e6d5ee051b14d034c1bc7b65a97d5cc00516df/wrapt-2.2.1-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:6f56a647e4eaf5f0ca40330fb070f566bdf9f7b0db89a1af20d71c28dcd7a0ab", size = 80879, upload-time = "2026-05-22T14:48:51.802Z" }, - { url = "https://files.pythonhosted.org/packages/13/3c/b74cfd984cef560b900fb1a727af20352d89e1f06bf2e1114dd3f00f5f5a/wrapt-2.2.1-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:64b7deeda4b70408e382328d8bbe52a256fe9bc63ae3db86d804608367e5422c", size = 81462, upload-time = "2026-05-22T14:48:53.18Z" }, - { url = "https://files.pythonhosted.org/packages/15/a3/7c8f704b8dc07dfe0a5d01c2edbfd88317aa8e5e3fa7c743eb7a085ae767/wrapt-2.2.1-cp314-cp314-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:b9cf53ba90717db2e292401de290776c498d4bbfb0d4a559ca2895db8b9dcb5c", size = 167251, upload-time = "2026-05-22T14:48:54.562Z" }, - { url = "https://files.pythonhosted.org/packages/80/85/a34d1888d97247da6c2ff6118c3a721c73ed8cc4dd198c00208bb73b6f80/wrapt-2.2.1-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:cf3638274ab9d9b724c9baa0b4c04e132cd6faefb78b4dd3dd1a02a4bdaad41e", size = 166316, upload-time = "2026-05-22T14:48:56.065Z" }, - { url = "https://files.pythonhosted.org/packages/e9/d7/72ffaeb01eebc704afe3fb99e840480f4bda45f0fa66e3381b6a39251c8f/wrapt-2.2.1-cp314-cp314-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:aed9658797d0b45d6c49adcfc6b41f66e6f2d0c6de3ec79e16cf4b1855df240f", size = 157952, upload-time = "2026-05-22T14:48:57.924Z" }, - { url = "https://files.pythonhosted.org/packages/24/5b/36f5d6b024e4edfdd90b140742d11ebcf7836daf5c9daf326c55c24db412/wrapt-2.2.1-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:1d676ee388bc42a04d56dd7deb5605244dac2e35cc2fadbb43c9fa25bbd93508", size = 166130, upload-time = "2026-05-22T14:48:59.384Z" }, - { url = "https://files.pythonhosted.org/packages/81/06/9296d9e97bfdef5483dfcc859d57b095b257144b2bc5300ab521e06f4bc7/wrapt-2.2.1-cp314-cp314-musllinux_1_2_riscv64.whl", hash = "sha256:e395f7bc31851ef9b612050368cb446e9bc14cd7454b025018980349caf25ae5", size = 156604, upload-time = "2026-05-22T14:49:00.921Z" }, - { url = "https://files.pythonhosted.org/packages/53/37/16953929ed6776175720e58fc966e779926d8d71e2c7b2273230590ca71f/wrapt-2.2.1-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:5f1845c2a8cc1180ccccfa45785dd06f562730d19ef75be180334254012b6283", size = 166007, upload-time = "2026-05-22T14:49:02.332Z" }, - { url = "https://files.pythonhosted.org/packages/b9/73/20ee58c0612dae7c31131a7095345812ed2c7b389019e175f68cde34e5b4/wrapt-2.2.1-cp314-cp314-win32.whl", hash = "sha256:436addbc4bb4fc0a88c702577f51195d7d73683a7f3e0e5b253d8404d7847243", size = 78327, upload-time = "2026-05-22T14:49:03.722Z" }, - { url = "https://files.pythonhosted.org/packages/22/b3/ef7c3295d02e0448a71c639a36a057f46d524d057c9486291a7a3039e65c/wrapt-2.2.1-cp314-cp314-win_amd64.whl", hash = "sha256:50972a1d974ea07725a7f6b1cec5f8759008afd030a0024843ebe7d52de47f2b", size = 81144, upload-time = "2026-05-22T14:49:05.093Z" }, - { url = "https://files.pythonhosted.org/packages/ac/dc/7bdf336953f99f4ceb0a584bb8870e42c8f26f93ea10c87834dad62f1668/wrapt-2.2.1-cp314-cp314-win_arm64.whl", hash = "sha256:1c9934ea5d92957e3cd0adbc0845539dccfd62710ebe16195a8c66c53954db36", size = 79569, upload-time = "2026-05-22T14:49:06.413Z" }, - { url = "https://files.pythonhosted.org/packages/6a/6d/6dfae80150ff1919c356d1dd528f049bcdfaae29b4d284bc957e022caef4/wrapt-2.2.1-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:17de18fc12cea55b8a9587314cb830573e37fb33b247a7515696350863714188", size = 82892, upload-time = "2026-05-22T14:49:07.925Z" }, - { url = "https://files.pythonhosted.org/packages/82/7b/4e34766a7d7804ffce9e71befe47e9b3225dc350c49c94493c4ab39fd3a5/wrapt-2.2.1-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:a9dec1aca52dddde7df94818310fa2fe79739c8f385b2014c4cb1035f5508199", size = 83333, upload-time = "2026-05-22T14:49:09.257Z" }, - { url = "https://files.pythonhosted.org/packages/9d/57/0b34db3e8de44ccfece62d7b337abd1631dd810f5adc5f3db571727836b5/wrapt-2.2.1-cp314-cp314t-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:69f2e9244542cb34dd59c7f073445b9e54ad9f3fce8d93606c368a1b499fc413", size = 202899, upload-time = "2026-05-22T14:49:10.572Z" }, - { url = "https://files.pythonhosted.org/packages/e5/45/ac0c459f154b99d92789a6cba7ca727185b83513b986f8ec7fe2aacddcbf/wrapt-2.2.1-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:2d83966dc7f4f45e8b97b5933685ac2e6e67fc0e19246ea314bceb9a8970c956", size = 209986, upload-time = "2026-05-22T14:49:12.229Z" }, - { url = "https://files.pythonhosted.org/packages/b7/e4/77e37ff33ad018fa81ade52c25fa327b80b56f81d734279a63614fcb4cbc/wrapt-2.2.1-cp314-cp314t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:78b0aa6bfb7be8deed0ab23e7aa028cc5210c29bc2d32a04d52b50e517a7307e", size = 194893, upload-time = "2026-05-22T14:49:14.139Z" }, - { url = "https://files.pythonhosted.org/packages/dd/9d/7ea651d1ab032fc5fa222fbec91d0f8a1397f6ae04ebb93fa7219aa921d7/wrapt-2.2.1-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:05d5cb74d1b232ec8cfa130a8f900708699ff2491d97b8f85a4cdc5996294b85", size = 205636, upload-time = "2026-05-22T14:49:15.714Z" }, - { url = "https://files.pythonhosted.org/packages/09/af/8e88031a701275b9085c54e64bc88c0b1cd55c77eadd400691c371cd76c4/wrapt-2.2.1-cp314-cp314t-musllinux_1_2_riscv64.whl", hash = "sha256:f6518b94edb9150452e9aba08027d4cc293433753ec1fbefb4629a21cbc74181", size = 192267, upload-time = "2026-05-22T14:49:17.283Z" }, - { url = "https://files.pythonhosted.org/packages/bf/a8/e657ca876b06710194f243d81c4b0896ade646e244bdbec2d87c8c56a8bd/wrapt-2.2.1-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:ed55af48b3eb28f43228ca2306788892bcb629eb2b5c4876e2a3659872c2f17a", size = 198378, upload-time = "2026-05-22T14:49:18.785Z" }, - { url = "https://files.pythonhosted.org/packages/c8/59/822efe4ea722a3961331bfa35b7d90937790d2c20f0616de1997ccc3aebd/wrapt-2.2.1-cp314-cp314t-win32.whl", hash = "sha256:2e08688ab16525897da6589d56d0aebaf417bbe91c2d8e3b96203b1efa596e85", size = 80226, upload-time = "2026-05-22T14:49:20.264Z" }, - { url = "https://files.pythonhosted.org/packages/ab/31/2a7dc5f6abb2fca0b6e1610e120419f603650aceb4f1d3ac4cae0354e162/wrapt-2.2.1-cp314-cp314t-win_amd64.whl", hash = "sha256:fd0135d34387f5fd087d9be368ea77ea89cf2451dc1cd1c622d35021bcb3ab50", size = 83835, upload-time = "2026-05-22T14:49:21.634Z" }, - { url = "https://files.pythonhosted.org/packages/9f/c0/782b86e28d1ceebeb74cccea12d2cd3d2ba0bd68e3dec20b1bc5873f6127/wrapt-2.2.1-cp314-cp314t-win_arm64.whl", hash = "sha256:f70db64e8266d7c45d3b735f2e08eeb434b5e03da9a479ae42b2e2e486a21a00", size = 80722, upload-time = "2026-05-22T14:49:23.59Z" }, - { url = "https://files.pythonhosted.org/packages/53/46/29ac9daf11a86c22a8c38cd9236c62928ccae83f7ceb06bd3b0467cf9d05/wrapt-2.2.1-py3-none-any.whl", hash = "sha256:3aafea2975caef8ca49400640dde02cc7426e798f24870ed01f490bc3cffd32f", size = 61000, upload-time = "2026-05-22T14:49:41.593Z" }, +version = "1.17.3" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/95/8f/aeb76c5b46e273670962298c23e7ddde79916cb74db802131d49a85e4b7d/wrapt-1.17.3.tar.gz", hash = "sha256:f66eb08feaa410fe4eebd17f2a2c8e2e46d3476e9f8c783daa8e09e0faa666d0", size = 55547, upload-time = "2025-08-12T05:53:21.714Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/02/a2/cd864b2a14f20d14f4c496fab97802001560f9f41554eef6df201cd7f76c/wrapt-1.17.3-cp314-cp314-macosx_10_13_universal2.whl", hash = "sha256:cf30f6e3c077c8e6a9a7809c94551203c8843e74ba0c960f4a98cd80d4665d39", size = 54132, upload-time = "2025-08-12T05:51:49.864Z" }, + { url = "https://files.pythonhosted.org/packages/d5/46/d011725b0c89e853dc44cceb738a307cde5d240d023d6d40a82d1b4e1182/wrapt-1.17.3-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:e228514a06843cae89621384cfe3a80418f3c04aadf8a3b14e46a7be704e4235", size = 39091, upload-time = "2025-08-12T05:51:38.935Z" }, + { url = "https://files.pythonhosted.org/packages/2e/9e/3ad852d77c35aae7ddebdbc3b6d35ec8013af7d7dddad0ad911f3d891dae/wrapt-1.17.3-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:5ea5eb3c0c071862997d6f3e02af1d055f381b1d25b286b9d6644b79db77657c", size = 39172, upload-time = "2025-08-12T05:51:59.365Z" }, + { url = "https://files.pythonhosted.org/packages/c3/f7/c983d2762bcce2326c317c26a6a1e7016f7eb039c27cdf5c4e30f4160f31/wrapt-1.17.3-cp314-cp314-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:281262213373b6d5e4bb4353bc36d1ba4084e6d6b5d242863721ef2bf2c2930b", size = 87163, upload-time = "2025-08-12T05:52:40.965Z" }, + { url = "https://files.pythonhosted.org/packages/e4/0f/f673f75d489c7f22d17fe0193e84b41540d962f75fce579cf6873167c29b/wrapt-1.17.3-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:dc4a8d2b25efb6681ecacad42fca8859f88092d8732b170de6a5dddd80a1c8fa", size = 87963, upload-time = "2025-08-12T05:52:20.326Z" }, + { url = "https://files.pythonhosted.org/packages/df/61/515ad6caca68995da2fac7a6af97faab8f78ebe3bf4f761e1b77efbc47b5/wrapt-1.17.3-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:373342dd05b1d07d752cecbec0c41817231f29f3a89aa8b8843f7b95992ed0c7", size = 86945, upload-time = "2025-08-12T05:52:21.581Z" }, + { url = "https://files.pythonhosted.org/packages/d3/bd/4e70162ce398462a467bc09e768bee112f1412e563620adc353de9055d33/wrapt-1.17.3-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:d40770d7c0fd5cbed9d84b2c3f2e156431a12c9a37dc6284060fb4bec0b7ffd4", size = 86857, upload-time = "2025-08-12T05:52:43.043Z" }, + { url = "https://files.pythonhosted.org/packages/2b/b8/da8560695e9284810b8d3df8a19396a6e40e7518059584a1a394a2b35e0a/wrapt-1.17.3-cp314-cp314-win32.whl", hash = "sha256:fbd3c8319de8e1dc79d346929cd71d523622da527cca14e0c1d257e31c2b8b10", size = 37178, upload-time = "2025-08-12T05:53:12.605Z" }, + { url = "https://files.pythonhosted.org/packages/db/c8/b71eeb192c440d67a5a0449aaee2310a1a1e8eca41676046f99ed2487e9f/wrapt-1.17.3-cp314-cp314-win_amd64.whl", hash = "sha256:e1a4120ae5705f673727d3253de3ed0e016f7cd78dc463db1b31e2463e1f3cf6", size = 39310, upload-time = "2025-08-12T05:53:11.106Z" }, + { url = "https://files.pythonhosted.org/packages/45/20/2cda20fd4865fa40f86f6c46ed37a2a8356a7a2fde0773269311f2af56c7/wrapt-1.17.3-cp314-cp314-win_arm64.whl", hash = "sha256:507553480670cab08a800b9463bdb881b2edeed77dc677b0a5915e6106e91a58", size = 37266, upload-time = "2025-08-12T05:52:56.531Z" }, + { url = "https://files.pythonhosted.org/packages/77/ed/dd5cf21aec36c80443c6f900449260b80e2a65cf963668eaef3b9accce36/wrapt-1.17.3-cp314-cp314t-macosx_10_13_universal2.whl", hash = "sha256:ed7c635ae45cfbc1a7371f708727bf74690daedc49b4dba310590ca0bd28aa8a", size = 56544, upload-time = "2025-08-12T05:51:51.109Z" }, + { url = "https://files.pythonhosted.org/packages/8d/96/450c651cc753877ad100c7949ab4d2e2ecc4d97157e00fa8f45df682456a/wrapt-1.17.3-cp314-cp314t-macosx_10_13_x86_64.whl", hash = "sha256:249f88ed15503f6492a71f01442abddd73856a0032ae860de6d75ca62eed8067", size = 40283, upload-time = "2025-08-12T05:51:39.912Z" }, + { url = "https://files.pythonhosted.org/packages/d1/86/2fcad95994d9b572db57632acb6f900695a648c3e063f2cd344b3f5c5a37/wrapt-1.17.3-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:5a03a38adec8066d5a37bea22f2ba6bbf39fcdefbe2d91419ab864c3fb515454", size = 40366, upload-time = "2025-08-12T05:52:00.693Z" }, + { url = "https://files.pythonhosted.org/packages/64/0e/f4472f2fdde2d4617975144311f8800ef73677a159be7fe61fa50997d6c0/wrapt-1.17.3-cp314-cp314t-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:5d4478d72eb61c36e5b446e375bbc49ed002430d17cdec3cecb36993398e1a9e", size = 108571, upload-time = "2025-08-12T05:52:44.521Z" }, + { url = "https://files.pythonhosted.org/packages/cc/01/9b85a99996b0a97c8a17484684f206cbb6ba73c1ce6890ac668bcf3838fb/wrapt-1.17.3-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:223db574bb38637e8230eb14b185565023ab624474df94d2af18f1cdb625216f", size = 113094, upload-time = "2025-08-12T05:52:22.618Z" }, + { url = "https://files.pythonhosted.org/packages/25/02/78926c1efddcc7b3aa0bc3d6b33a822f7d898059f7cd9ace8c8318e559ef/wrapt-1.17.3-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:e405adefb53a435f01efa7ccdec012c016b5a1d3f35459990afc39b6be4d5056", size = 110659, upload-time = "2025-08-12T05:52:24.057Z" }, + { url = "https://files.pythonhosted.org/packages/dc/ee/c414501ad518ac3e6fe184753632fe5e5ecacdcf0effc23f31c1e4f7bfcf/wrapt-1.17.3-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:88547535b787a6c9ce4086917b6e1d291aa8ed914fdd3a838b3539dc95c12804", size = 106946, upload-time = "2025-08-12T05:52:45.976Z" }, + { url = "https://files.pythonhosted.org/packages/be/44/a1bd64b723d13bb151d6cc91b986146a1952385e0392a78567e12149c7b4/wrapt-1.17.3-cp314-cp314t-win32.whl", hash = "sha256:41b1d2bc74c2cac6f9074df52b2efbef2b30bdfe5f40cb78f8ca22963bc62977", size = 38717, upload-time = "2025-08-12T05:53:15.214Z" }, + { url = "https://files.pythonhosted.org/packages/79/d9/7cfd5a312760ac4dd8bf0184a6ee9e43c33e47f3dadc303032ce012b8fa3/wrapt-1.17.3-cp314-cp314t-win_amd64.whl", hash = "sha256:73d496de46cd2cdbdbcce4ae4bcdb4afb6a11234a1df9c085249d55166b95116", size = 41334, upload-time = "2025-08-12T05:53:14.178Z" }, + { url = "https://files.pythonhosted.org/packages/46/78/10ad9781128ed2f99dbc474f43283b13fea8ba58723e98844367531c18e9/wrapt-1.17.3-cp314-cp314t-win_arm64.whl", hash = "sha256:f38e60678850c42461d4202739f9bf1e3a737c7ad283638251e79cc49effb6b6", size = 38471, upload-time = "2025-08-12T05:52:57.784Z" }, + { url = "https://files.pythonhosted.org/packages/1f/f6/a933bd70f98e9cf3e08167fc5cd7aaaca49147e48411c0bd5ae701bb2194/wrapt-1.17.3-py3-none-any.whl", hash = "sha256:7171ae35d2c33d326ac19dd8facb1e82e5fd04ef8c6c0e394d7af55a55051c22", size = 23591, upload-time = "2025-08-12T05:53:20.674Z" }, +] + +[[package]] +name = "yarl" +version = "1.24.2" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "idna" }, + { name = "multidict" }, + { name = "propcache" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/79/12/1e8f37460ea0f7eb59c221fdaf0ed75e7ac43e97f8093b9c6f411df50a78/yarl-1.24.2.tar.gz", hash = "sha256:9ac374123c6fd7abf64d1fec93962b0bd4ee2c19751755a762a72dd96c0378f8", size = 210798, upload-time = "2026-05-19T21:31:05.599Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/40/0e/e08087695fc12789263821c5dc0f8dc52b5b17efd0887cacf419f8a43ba3/yarl-1.24.2-cp314-cp314-macosx_10_15_universal2.whl", hash = "sha256:f9312b3c02d9b3d23840f67952913c9c8721d7f1b7db305289faefa878f364c2", size = 129670, upload-time = "2026-05-19T21:29:56.631Z" }, + { url = "https://files.pythonhosted.org/packages/3a/98/ab4b5ed1b1b5cd973c8a3eb994c3a6aefb6ce6d399e21bb5f0316c33815c/yarl-1.24.2-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:a4f4d6cd615823bfc7fb7e9b5987c3f41666371d870d51058f77e2680fbe9630", size = 91916, upload-time = "2026-05-19T21:29:58.645Z" }, + { url = "https://files.pythonhosted.org/packages/ba/b1/5297bb6a7df4782f7605bffc43b31f5044070935fbbcaa6c705a07e6ac65/yarl-1.24.2-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:0c3063e5c0a8e8e62fae6c2596fa01da1561e4cd1da6fec5789f5cf99a8aefd8", size = 91625, upload-time = "2026-05-19T21:30:00.412Z" }, + { url = "https://files.pythonhosted.org/packages/02/a7/45baabfff76829264e623b185cff0c340d7e11bf3e1cd9ea37e7d17934bd/yarl-1.24.2-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:fecd17873a096036c1c87ab3486f1aef7f269ada7f23f7f856f93b1cc7744f14", size = 104574, upload-time = "2026-05-19T21:30:02.544Z" }, + { url = "https://files.pythonhosted.org/packages/f3/40/3a5ab144d3d650ca37d4f4b57e56169be8af3ca34c448793e064b30baaed/yarl-1.24.2-cp314-cp314-manylinux2014_armv7l.manylinux_2_17_armv7l.manylinux_2_31_armv7l.whl", hash = "sha256:a46d1ab4ba4d32e6dc80daf8a28ce0bd83d08df52fbc32f3e288663427734535", size = 97534, upload-time = "2026-05-19T21:30:04.319Z" }, + { url = "https://files.pythonhosted.org/packages/9c/b5/5658fef3681fb5776b4513b052bec750009f47b3a592251c705d75375798/yarl-1.24.2-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:73e68edf6dfd5f73f9ca127d84e2a6f9213c65bdffb736bda19524c0564fcd14", size = 111481, upload-time = "2026-05-19T21:30:05.988Z" }, + { url = "https://files.pythonhosted.org/packages/4c/06/fdcd7dde037f00866dce123ed4ba23dba94beb56fc4cf561668d27be37f2/yarl-1.24.2-cp314-cp314-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:a296ca617f2d25fbceafb962b88750d627e5984e75732c712154d058ae8d79a3", size = 111529, upload-time = "2026-05-19T21:30:07.738Z" }, + { url = "https://files.pythonhosted.org/packages/c2/53/d81269aaafccea0d33396c03035de997b743f11e648e6e27a0df99c72980/yarl-1.24.2-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:e51b2cf5ec89a8b8470177641ed62a3ba22d74e1e898e06ad53aa77972487208", size = 107338, upload-time = "2026-05-19T21:30:09.713Z" }, + { url = "https://files.pythonhosted.org/packages/ae/04/23049463f729bd899df203a7960505a75333edd499cda8aa1d5a82b64df5/yarl-1.24.2-cp314-cp314-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:310fc687f7b2044ec54e372c8cbe923bb88f5c37bded0d3079e5791c2fc3cf50", size = 106147, upload-time = "2026-05-19T21:30:11.365Z" }, + { url = "https://files.pythonhosted.org/packages/14/18/04a4b5830b43ed5e4c5015b40e9f6241ad91487d71611061b4e111d6ac80/yarl-1.24.2-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:297a2fe352ecf858b30a98f87948746ec16f001d279f84aebdbd3bd965e2f1bd", size = 104272, upload-time = "2026-05-19T21:30:12.978Z" }, + { url = "https://files.pythonhosted.org/packages/5a/f7/8cffdf319aee7a7c1dbd07b61d91c3e3fda460c7a93b5f93e445f3806c4c/yarl-1.24.2-cp314-cp314-musllinux_1_2_armv7l.whl", hash = "sha256:2a263e76b97bc42bdcd7c5f4953dec1f7cd62a1112fa7f869e57255229390d67", size = 99962, upload-time = "2026-05-19T21:30:15.001Z" }, + { url = "https://files.pythonhosted.org/packages/d7/39/b3cce3b7dbef64ac700ad4cea156a207d01bede0f507587616c364b5468e/yarl-1.24.2-cp314-cp314-musllinux_1_2_ppc64le.whl", hash = "sha256:822519b64cf0b474f1a0aaef1dc621438ea46bb77c94df97a5b4d213a7d8a8b1", size = 111063, upload-time = "2026-05-19T21:30:16.683Z" }, + { url = "https://files.pythonhosted.org/packages/a1/ea/100818505e7ebf165c7242ff17fdf7d9fee79e27234aeca871c1082920d7/yarl-1.24.2-cp314-cp314-musllinux_1_2_riscv64.whl", hash = "sha256:b6067060d9dc594899ba83e6db6c48c68d1e494a6dab158156ed86977ca7bcb1", size = 105438, upload-time = "2026-05-19T21:30:18.769Z" }, + { url = "https://files.pythonhosted.org/packages/8f/d2/e075a0b32aa6625087de9e653087df0759fed5de4a435fef594181102a77/yarl-1.24.2-cp314-cp314-musllinux_1_2_s390x.whl", hash = "sha256:0063adad533e57171b79db3943b229d40dfafeeee579767f96541f106bac5f1b", size = 111458, upload-time = "2026-05-19T21:30:21.024Z" }, + { url = "https://files.pythonhosted.org/packages/e6/5c/ceea7ba98b65c8eb8d947fdc52f9bedfcd43c6a57c9e3c90c17be8f324a3/yarl-1.24.2-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:ee8e3fb34513e8dc082b586ef4910c98335d43a6fab688cd44d4851bacfce3e8", size = 107589, upload-time = "2026-05-19T21:30:23.412Z" }, + { url = "https://files.pythonhosted.org/packages/fa/d9/5582d57e2b2db9b85eb6663a22efdd78e08805f3f5389566e9fcad254d1b/yarl-1.24.2-cp314-cp314-win_amd64.whl", hash = "sha256:afb00d7fd8e0f285ca29a44cc50df2d622ff2f7a6d933fa641577b5f9d5f3db0", size = 94424, upload-time = "2026-05-19T21:30:25.425Z" }, + { url = "https://files.pythonhosted.org/packages/92/10/7dc07a0e22806a9280f42a57361395506e800c64e22737cd7b0886feab42/yarl-1.24.2-cp314-cp314-win_arm64.whl", hash = "sha256:68cf6eacd6028ef1142bc4b48376b81566385ca6f9e7dde3b0fa91be08ffcb57", size = 88690, upload-time = "2026-05-19T21:30:27.623Z" }, + { url = "https://files.pythonhosted.org/packages/9e/13/d5b8e2c8667db955bcb3de233f18798fefe7edf1d7429c2c9d4f9c401114/yarl-1.24.2-cp314-cp314t-macosx_10_15_universal2.whl", hash = "sha256:221ce1dd921ac4f603957f17d7c18c5cc0797fbb52f156941f92e04605d1d67b", size = 136248, upload-time = "2026-05-19T21:30:29.297Z" }, + { url = "https://files.pythonhosted.org/packages/de/46/a4a97c05c9c9b8fd266bb2a0df12992c7fbd02391eb9640583411b6dab32/yarl-1.24.2-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:5f3224db28173a00d7afacdee07045cc4673dfab2b15492c7ae10deddbece761", size = 95084, upload-time = "2026-05-19T21:30:31.031Z" }, + { url = "https://files.pythonhosted.org/packages/95/b2/845cf2074a015e6fe0d0808cf1a2d9e868386c4220d657ebd8302b199043/yarl-1.24.2-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:c557165320d6244ebe3a02431b2a201a20080e02f41f0cfa0ccc47a183765da8", size = 95272, upload-time = "2026-05-19T21:30:33.062Z" }, + { url = "https://files.pythonhosted.org/packages/fe/16/e69d4aa244aef45235ddfebc0e04036a6829842bc5a6a795aedc6c998d23/yarl-1.24.2-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:904065e6e85b1fa54d0d87438bd58c14c0bad97aad654ad1077fd9d87e8478ed", size = 101497, upload-time = "2026-05-19T21:30:34.842Z" }, + { url = "https://files.pythonhosted.org/packages/15/94/c07107715d621076863ee88b3ddf183fa5e9d4aba5769623c9979828410a/yarl-1.24.2-cp314-cp314t-manylinux2014_armv7l.manylinux_2_17_armv7l.manylinux_2_31_armv7l.whl", hash = "sha256:8cec2a38d70edc10e0e856ceda886af5327a017ccbde8e1de1bd44d300357543", size = 94002, upload-time = "2026-05-19T21:30:37.724Z" }, + { url = "https://files.pythonhosted.org/packages/a9/35/fc1bbdd895b5e4010b8fdd037f7ed3aa289d3863e08231b30231ca9a0815/yarl-1.24.2-cp314-cp314t-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:e7484b9361ed222ee1ca5b4337aa4cbdcc4618ce5aff57d9ef1582fd95893fc0", size = 106524, upload-time = "2026-05-19T21:30:40.196Z" }, + { url = "https://files.pythonhosted.org/packages/1f/f2/32b66d0a4ba47c296cf86d03e2c67bff58399fe6d6d84d5205c04c66cc6d/yarl-1.24.2-cp314-cp314t-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:84f9670b89f34db07f81e53aee83e0b938a3412329d51c8f922488be7fcc4024", size = 106165, upload-time = "2026-05-19T21:30:41.888Z" }, + { url = "https://files.pythonhosted.org/packages/95/47/37cb5ff50c5e825d4d38e81bb04d1b7e96bf960f7ab89f9850b162f3f114/yarl-1.24.2-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:abb2759733d63a28b4956500a5dd57140f26486c92b2caedfb964ab7d9b79dbf", size = 103010, upload-time = "2026-05-19T21:30:43.985Z" }, + { url = "https://files.pythonhosted.org/packages/6f/d2/4597912315096f7bb359e46e13bf8b60994fcbb2db29b804c0902ef4eff5/yarl-1.24.2-cp314-cp314t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:081c2bf54efe03774d0311172bc04fedf9ca01e644d4cd8c805688e527209bdc", size = 101128, upload-time = "2026-05-19T21:30:46.291Z" }, + { url = "https://files.pythonhosted.org/packages/b9/d5/c8e86e120521e646013d02a8e3b8884392e28494be8f392366e50d208efc/yarl-1.24.2-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:86746bef442aa479107fe28132e1277237f9c24c2f00b0b0cf22b3ee0904f2bb", size = 101382, upload-time = "2026-05-19T21:30:48.085Z" }, + { url = "https://files.pythonhosted.org/packages/fa/98/70b229236118f89dbeb739b76f10225bbf53b5497725502594c9a01d699a/yarl-1.24.2-cp314-cp314t-musllinux_1_2_armv7l.whl", hash = "sha256:2d07d21d0bc4b17558e8de0b02fbfdf1e347d3bb3699edd00bb92e7c57925420", size = 95964, upload-time = "2026-05-19T21:30:49.785Z" }, + { url = "https://files.pythonhosted.org/packages/87/f8/56c386981e3c8648d279fdef2397ffec577e8320fd5649745e34d54faeb7/yarl-1.24.2-cp314-cp314t-musllinux_1_2_ppc64le.whl", hash = "sha256:4fb1ac3fc5fecd8ae7453ea237e4d22b49befa70266dfe1629924245c21a0c7f", size = 106204, upload-time = "2026-05-19T21:30:51.862Z" }, + { url = "https://files.pythonhosted.org/packages/1a/1e/765afe97811ca35933e2a7de70ac57b1997ea2e4ee895719ee7a231fb7e5/yarl-1.24.2-cp314-cp314t-musllinux_1_2_riscv64.whl", hash = "sha256:4da31a5512ed1729ca8d8aacde3f7faeb8843cde3165d6bcf7f88f74f17bb8aa", size = 101510, upload-time = "2026-05-19T21:30:53.62Z" }, + { url = "https://files.pythonhosted.org/packages/ee/78/393913f4b9039e1edd09ae8a9bbb9d539be909a8abf6d8a2084585bed4b7/yarl-1.24.2-cp314-cp314t-musllinux_1_2_s390x.whl", hash = "sha256:533ded4dceb5f1f3da7906244f4e82cf46cfd40d84c69a1faf5ac506aa65ecbe", size = 105584, upload-time = "2026-05-19T21:30:55.962Z" }, + { url = "https://files.pythonhosted.org/packages/78/87/deb17b7049bbe74ea11a713b86f8f27800cc1c8648b0b797243ebb4830ba/yarl-1.24.2-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:7b3a85525f6e7eeabcfdd372862b21ee1915db1b498a04e8bf0e389b607ff0bd", size = 103410, upload-time = "2026-05-19T21:30:57.962Z" }, + { url = "https://files.pythonhosted.org/packages/8f/be/f9f7594e23b5b93affff0318e4593c1920331bcaefda326cabcad94296a1/yarl-1.24.2-cp314-cp314t-win_amd64.whl", hash = "sha256:a7624b1ca46ca5d7b864ef0d2f8efe3091454085ee1855b4e992314529972215", size = 102980, upload-time = "2026-05-19T21:30:59.735Z" }, + { url = "https://files.pythonhosted.org/packages/65/a4/ba80dccd3593ff1f01051a818694d07b58cb8232677ee9a22a5a1f93a9fc/yarl-1.24.2-cp314-cp314t-win_arm64.whl", hash = "sha256:e434a45ce2e7a947f951fc5a8944c8cc080b7e59f9c50ae80fd39107cf88126d", size = 91219, upload-time = "2026-05-19T21:31:01.934Z" }, + { url = "https://files.pythonhosted.org/packages/fd/4d/4b880086bd0d3e034d25647be1d830afc3e3f610e98c4ab3490af6b1b6d5/yarl-1.24.2-py3-none-any.whl", hash = "sha256:2783d9226db8797636cd6896e4de81feed252d1db72265686c9558d97a4d94b9", size = 53576, upload-time = "2026-05-19T21:31:03.909Z" }, ] From 1072f87e0f971f63a1e446e0df011bdfc85f2676 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Tue, 16 Jun 2026 09:19:47 -0700 Subject: [PATCH 358/591] Added dependencies for boto and S3 --- .../src/mpcontribs_api/dependencies.py | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/dependencies.py b/mpcontribs-api/src/mpcontribs_api/dependencies.py index 3b68834e8a..308b53e3ba 100644 --- a/mpcontribs-api/src/mpcontribs_api/dependencies.py +++ b/mpcontribs-api/src/mpcontribs_api/dependencies.py @@ -1,19 +1,19 @@ +from contextlib import AbstractAsyncContextManager from typing import Annotated +import aioboto3 import structlog from fastapi import Depends, Request from pymongo import AsyncMongoClient from pymongo.asynchronous.database import AsyncDatabase +from types_aiobotocore_s3 import S3Client from mpcontribs_api.auth import User -from mpcontribs_api.config import get_settings from mpcontribs_api.exceptions import ( AuthenticationError, PermissionError, ) -settings = get_settings() - def get_db(request: Request) -> AsyncDatabase: return request.app.state.db @@ -22,6 +22,20 @@ def get_db(request: Request) -> AsyncDatabase: DbDep = Annotated[AsyncDatabase, Depends(get_db)] +def get_boto(request: Request) -> aioboto3.Session: + return request.app.state.boto_session + + +BotoDep = Annotated[aioboto3.Session, Depends(get_boto)] + + +def get_s3(request: Request) -> AbstractAsyncContextManager[S3Client]: + return request.app.state.s3 + + +S3Dep = Annotated[AbstractAsyncContextManager[S3Client], Depends(get_s3)] + + def get_mongo_client(request: Request) -> AsyncMongoClient: return request.app.state.mongo_client From 0f47dcd20f521fdb8d5830ebf924d7f1a2256de1 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Tue, 16 Jun 2026 15:56:13 -0700 Subject: [PATCH 359/591] Changed filename to authz to clarify that it is authorization --- mpcontribs-api/src/mpcontribs_api/{auth.py => authz.py} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename mpcontribs-api/src/mpcontribs_api/{auth.py => authz.py} (100%) diff --git a/mpcontribs-api/src/mpcontribs_api/auth.py b/mpcontribs-api/src/mpcontribs_api/authz.py similarity index 100% rename from mpcontribs-api/src/mpcontribs_api/auth.py rename to mpcontribs-api/src/mpcontribs_api/authz.py From 2895bb4d81874e87cf210c1b724b2184631ee3ab Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Tue, 16 Jun 2026 15:57:29 -0700 Subject: [PATCH 360/591] Added S3Dep and s3 reliance to download methods; modified auth import to authz --- mpcontribs-api/src/mpcontribs_api/app.py | 2 +- mpcontribs-api/src/mpcontribs_api/config.py | 16 ++++++++++------ .../src/mpcontribs_api/dependencies.py | 2 +- .../domains/_shared/components.py | 2 +- .../domains/_shared/repository.py | 18 ++++++++++++++++-- .../domains/attachments/repository.py | 6 ++++++ .../domains/attachments/router.py | 6 ++++-- .../domains/contributions/repository.py | 10 +++++++++- .../domains/contributions/router.py | 4 ++++ .../domains/contributions/service.py | 6 ++++-- .../domains/projects/repository.py | 2 +- .../domains/structures/repository.py | 7 +++++++ .../domains/structures/router.py | 7 +++++++ .../domains/tables/repository.py | 8 ++++++++ .../mpcontribs_api/domains/tables/router.py | 7 +++++++ 15 files changed, 86 insertions(+), 17 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/app.py b/mpcontribs-api/src/mpcontribs_api/app.py index 7def06bc74..6c7aaee09b 100644 --- a/mpcontribs-api/src/mpcontribs_api/app.py +++ b/mpcontribs-api/src/mpcontribs_api/app.py @@ -13,7 +13,7 @@ from mpcontribs_api._openapi import contact_info, license_info, openapi_tags from mpcontribs_api.api.v1.router import router as v1_router -from mpcontribs_api.auth import api_key_scheme +from mpcontribs_api.authz import api_key_scheme from mpcontribs_api.config import Settings, get_settings from mpcontribs_api.domains.attachments.models import Attachment from mpcontribs_api.domains.contributions.models import Contribution diff --git a/mpcontribs-api/src/mpcontribs_api/config.py b/mpcontribs-api/src/mpcontribs_api/config.py index 9d744c53b2..b1c25ff3e5 100644 --- a/mpcontribs-api/src/mpcontribs_api/config.py +++ b/mpcontribs-api/src/mpcontribs_api/config.py @@ -10,8 +10,8 @@ class RedisSettings(BaseModel): url: SecretStr -class KongSettings(BaseModel): - gateway_secret: SecretStr +# class KongSettings(BaseModel): +# gateway_secret: SecretStr class AwsSettings(BaseModel): @@ -20,9 +20,9 @@ class AwsSettings(BaseModel): Primarily used for S3 access """ - region: str = Field("east1", description="The region to connect to") + region: str = Field(default="us-east-1", description="The region to connect to") max_pool_connections: int = Field( - 10, + default=10, description="The maximum number of connections the app is allowed to have to S3", ) @@ -33,8 +33,11 @@ class MongoSettings(BaseModel): Provided defaults are the defaults of AsyncMongoClient """ + # Required uri: SecretStr = Field(description="The full uri from MongoDB (username and password included)") db_name: str + + # Optional app_name: str = Field( default="MPContribs_FastAPI_Server", description="The name of the application that created this AsyncMongoClient instance. The server will log this " @@ -125,13 +128,14 @@ class Settings(BaseSettings): environment: Literal["dev", "prod"] # MPContribs_mongo__* + # requires uri and db_name mongo: MongoSettings # MPContribs_aws__* - aws: AwsSettings + aws: AwsSettings = Field(default_factory=AwsSettings) # MPContribs_kong__* - kong: KongSettings + # kong: KongSettings # MPContribs_redis__* redis: RedisSettings diff --git a/mpcontribs-api/src/mpcontribs_api/dependencies.py b/mpcontribs-api/src/mpcontribs_api/dependencies.py index 308b53e3ba..db663769db 100644 --- a/mpcontribs-api/src/mpcontribs_api/dependencies.py +++ b/mpcontribs-api/src/mpcontribs_api/dependencies.py @@ -8,7 +8,7 @@ from pymongo.asynchronous.database import AsyncDatabase from types_aiobotocore_s3 import S3Client -from mpcontribs_api.auth import User +from mpcontribs_api.authz import User from mpcontribs_api.exceptions import ( AuthenticationError, PermissionError, diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py index a0904df163..cf13c22579 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py @@ -6,7 +6,7 @@ from pydantic import BaseModel from pymongo.asynchronous.client_session import AsyncClientSession -from mpcontribs_api.auth import User +from mpcontribs_api.authz import User from mpcontribs_api.config import get_settings from mpcontribs_api.domains._shared.models import Component, DeleteResponse, DocumentOut from mpcontribs_api.domains._shared.repository import MongoDbRepository diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py index cc7771d1b1..4da5b2d736 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py @@ -5,6 +5,7 @@ import zlib from abc import ABC, abstractmethod from collections.abc import AsyncIterable, AsyncIterator, Callable +from contextlib import AbstractAsyncContextManager from typing import Any from beanie import PydanticObjectId, UpdateResponse @@ -13,8 +14,9 @@ from fastapi_filter.contrib.beanie import Filter from pydantic import BaseModel from pymongo.asynchronous.client_session import AsyncClientSession +from types_aiobotocore_s3 import S3Client -from mpcontribs_api.auth import User +from mpcontribs_api.authz import User from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DeleteResponse, DocumentOut from mpcontribs_api.domains._shared.types import DownloadFormat, ShortMimeFormat from mpcontribs_api.exceptions import ConflictError, NotFoundError, ValidationError @@ -233,6 +235,14 @@ async def _serialize_csv(rows: AsyncIterable, fields: frozenset[str] | None) -> buf.seek(0) buf.truncate(0) + async def _s3_object_exists(self, bucket_name: str, key_name: str, s3: AbstractAsyncContextManager[S3Client]): + async with s3 as s3_client: + try: + await s3_client.head_object(Bucket=bucket_name, Key=key_name) + return True + except Exception: + return False + async def download( self, format: DownloadFormat, @@ -240,6 +250,9 @@ async def download( ignore_cache: bool, filter: TFilter, fields: frozenset[str] | None, + s3: AbstractAsyncContextManager[S3Client], + bucket_name: str, + key_name: str, ) -> AsyncIterable[bytes]: # Hash parameters to generate key for cache payload = { @@ -252,7 +265,8 @@ async def download( # Check S3 for the cached file # TODO: Implement - if not ignore_cache: + if not ignore_cache and self._s3_object_exists(bucket_name=bucket_name, key_name=key_name, s3=s3): + # Download from either presigned url or bytes pass # If not found in cache, build from MongoDB and save to cache diff --git a/mpcontribs-api/src/mpcontribs_api/domains/attachments/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/attachments/repository.py index 8d5fb5c686..1769465780 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/attachments/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/attachments/repository.py @@ -1,6 +1,8 @@ from collections.abc import AsyncIterable +from contextlib import AbstractAsyncContextManager from pymongo.asynchronous.client_session import AsyncClientSession +from types_aiobotocore_s3 import S3Client from mpcontribs_api.domains._shared.components import MongoDbComponentsRepository from mpcontribs_api.domains._shared.models import DeleteResponse @@ -41,6 +43,7 @@ async def download_attachments( ignore_cache: bool, filter: AttachmentFilter, fields: frozenset[str] | None, + s3: AbstractAsyncContextManager[S3Client], ) -> AsyncIterable[bytes]: return self.download( format=format, @@ -48,6 +51,9 @@ async def download_attachments( ignore_cache=ignore_cache, filter=filter, fields=fields, + s3=s3, + bucket_name="attachments", + key_name="", ) async def delete_attachments( diff --git a/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py b/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py index 01ad34b71b..cadeb62fe1 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py @@ -1,9 +1,10 @@ from typing import Annotated -from fastapi import APIRouter, Depends, Response +from fastapi import APIRouter, Depends from fastapi.responses import StreamingResponse from fastapi_filter import FilterDepends +from mpcontribs_api.dependencies import S3Dep from mpcontribs_api.domains._shared.models import DeleteResponse from mpcontribs_api.domains._shared.types import ( DownloadFormat, @@ -42,8 +43,8 @@ async def get_attachment( @router.get("/download/{short_mime}") async def download_attachment( repo: AttachmentDep, - response: Response, format: DownloadFormat, + s3: S3Dep, short_mime: ShortMimeFormat = ShortMimeFormat.GZ, ignore_cache: bool = False, filter: AttachmentFilter = FilterDepends(AttachmentFilter), @@ -56,6 +57,7 @@ async def download_attachment( ignore_cache=ignore_cache, filter=filter, fields=selected, + s3=s3, ) filename = download_filename("attachments", format, short_mime) return StreamingResponse( diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py index a82be85583..a281d039af 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py @@ -1,12 +1,14 @@ from collections.abc import AsyncIterable +from contextlib import AbstractAsyncContextManager from typing import Any from beanie import UpdateResponse from beanie.operators import Set from pymongo.asynchronous.client_session import AsyncClientSession from pymongo.results import DeleteResult +from types_aiobotocore_s3 import S3Client -from mpcontribs_api.auth import User +from mpcontribs_api.authz import User from mpcontribs_api.domains._shared.repository import MongoDbRepository from mpcontribs_api.domains._shared.types import DownloadFormat, ShortMimeFormat from mpcontribs_api.domains.contributions.models import ( @@ -173,6 +175,9 @@ async def download_contributions( ignore_cache: bool, filter: ContributionFilter, fields: frozenset[str] | None, + key_name: str, + s3: AbstractAsyncContextManager[S3Client], + bucket_name: str = "contributions", ) -> AsyncIterable[bytes]: return self.download( format=format, @@ -180,4 +185,7 @@ async def download_contributions( ignore_cache=ignore_cache, filter=filter, fields=fields, + bucket_name=bucket_name, + key_name=key_name, + s3=s3, ) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py index 80ee24c4f7..06d68f3700 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py @@ -4,6 +4,7 @@ from fastapi.responses import StreamingResponse from fastapi_filter import FilterDepends +from mpcontribs_api.dependencies import S3Dep from mpcontribs_api.domains._shared.bulk import BulkWriteSummary from mpcontribs_api.domains._shared.types import ( DownloadFormat, @@ -63,6 +64,7 @@ async def upsert_contributions( @router.get("/download/{short_mime}") async def download_contributions( repo: ContributionDep, + s3: S3Dep, short_mime: ShortMimeFormat = ShortMimeFormat.GZ, format: DownloadFormat = DownloadFormat.JSONL, ignore_cache: bool = False, @@ -76,6 +78,8 @@ async def download_contributions( ignore_cache=ignore_cache, filter=filter, fields=selected, + s3=s3, + key_name="", # TODO: Temp ) filename = download_filename("contributions", format, short_mime) return StreamingResponse( diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py index 4b4c6ba0a4..df9e1dc647 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py @@ -108,7 +108,8 @@ def _reject_duplicate_keys(self, contributions: list[ContributionIn]) -> None: """ seen: dict[tuple[str, str], list[int]] = defaultdict(list) for index, contribution in enumerate(contributions): - seen[(contribution.project, contribution.identifier)].append(index) + ids = contribution.identifiers() + seen[tuple(**ids)].append(index) duplicates = sorted(index for indices in seen.values() if len(indices) > 1 for index in indices) if duplicates: raise ValidationError( @@ -134,7 +135,8 @@ def _split_oversize(self, contributions: list[ContributionIn]) -> tuple[list[Bul index=i, identifier=contrib.identifiers(), error_code="validation_error", - message=f"contribution has {count} components, exceeds cap of {cap}", + message=f"contribution has {count} components, exceeds cap of {cap}. " + "Recommend inserting the component alone, followed by bulk inserts of components", ) ) else: diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py index a29bd3ec3c..2705963d07 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py @@ -1,6 +1,6 @@ from typing import Any -from mpcontribs_api.auth import User +from mpcontribs_api.authz import User from mpcontribs_api.domains._shared.repository import MongoDbRepository from mpcontribs_api.domains.projects.models import ( Project, diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/repository.py index 796b9bc5b0..6d279f79ec 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/structures/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/structures/repository.py @@ -2,6 +2,7 @@ from pymongo.asynchronous.client_session import AsyncClientSession +from mpcontribs_api.dependencies import S3Dep from mpcontribs_api.domains._shared.components import MongoDbComponentsRepository from mpcontribs_api.domains._shared.models import DeleteResponse from mpcontribs_api.domains._shared.types import DownloadFormat, ShortMimeFormat @@ -68,6 +69,9 @@ async def download_structures( ignore_cache: bool, filter: StructureFilter, fields: frozenset[str] | None, + s3: S3Dep, + bucket_name: str, + key_name: str, ) -> AsyncIterable[bytes]: return self.download( format=format, @@ -75,6 +79,9 @@ async def download_structures( ignore_cache=ignore_cache, filter=filter, fields=fields, + s3=s3, + key_name=key_name, + bucket_name=bucket_name, ) async def delete_structures( diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py index d3d51a7f2b..13684d4b53 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py @@ -4,6 +4,7 @@ from fastapi.responses import StreamingResponse from fastapi_filter import FilterDepends +from mpcontribs_api.dependencies import S3Dep from mpcontribs_api.domains._shared.bulk import BulkWriteSummary from mpcontribs_api.domains._shared.models import DeleteResponse from mpcontribs_api.domains._shared.types import ( @@ -44,6 +45,9 @@ async def get_structure( async def download_structure( repo: StructureDep, format: DownloadFormat, + s3: S3Dep, + key_name: str, + bucket_name: str = "structures", short_mime: ShortMimeFormat = ShortMimeFormat.GZ, ignore_cache: bool = False, filter: StructureFilter = FilterDepends(StructureFilter), @@ -56,6 +60,9 @@ async def download_structure( ignore_cache=ignore_cache, filter=filter, fields=selected, + key_name=key_name, + bucket_name=bucket_name, + s3=s3, ) filename = download_filename("structures", format, short_mime) return StreamingResponse( diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py index 4b1a95fadf..e9462384e2 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py @@ -1,6 +1,8 @@ from collections.abc import AsyncIterable +from contextlib import AbstractAsyncContextManager from pymongo.asynchronous.client_session import AsyncClientSession +from types_aiobotocore_s3 import S3Client from mpcontribs_api.domains._shared.components import MongoDbComponentsRepository from mpcontribs_api.domains._shared.models import DeleteResponse @@ -66,6 +68,9 @@ async def download_tables( ignore_cache: bool, filter: TableFilter, fields: frozenset[str] | None, + s3: AbstractAsyncContextManager[S3Client], + bucket_name: str, + key_name: str, ) -> AsyncIterable[bytes]: return self.download( format=format, @@ -73,6 +78,9 @@ async def download_tables( ignore_cache=ignore_cache, filter=filter, fields=fields, + s3=s3, + bucket_name=bucket_name, + key_name=key_name, ) async def delete_tables( diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py index 42cddd4654..3f24588ff2 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py @@ -4,6 +4,7 @@ from fastapi.responses import StreamingResponse from fastapi_filter import FilterDepends +from mpcontribs_api.dependencies import S3Dep from mpcontribs_api.domains._shared.bulk import BulkWriteSummary from mpcontribs_api.domains._shared.models import DeleteResponse from mpcontribs_api.domains._shared.types import ( @@ -43,11 +44,14 @@ async def get_table( @router.get("/download/{short_mime}") async def download_table( repo: TableDep, + s3: S3Dep, + key_name: str, format: DownloadFormat, short_mime: ShortMimeFormat = ShortMimeFormat.GZ, ignore_cache: bool = False, filter: TableFilter = FilterDepends(TableFilter), fields: FieldSelector = TableOut.default_fields(), + bucket_name: str = "tables", ) -> StreamingResponse: selected = TableOut.parse_fields(fields) body = await repo.download_tables( @@ -56,6 +60,9 @@ async def download_table( ignore_cache=ignore_cache, filter=filter, fields=selected, + s3=s3, + bucket_name=bucket_name, + key_name=key_name, ) filename = download_filename("tables", format, short_mime) return StreamingResponse( From c492b89588eab8b557c156cb3ed2bd0e1f7e73cb Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Tue, 16 Jun 2026 15:57:53 -0700 Subject: [PATCH 361/591] Updated auth import to authz --- .../tests/integration/db/test_components_repository.py | 2 +- .../tests/integration/db/test_contributions_repository.py | 2 +- mpcontribs-api/tests/integration/db/test_download.py | 2 +- mpcontribs-api/tests/integration/db/test_projects_repository.py | 2 +- mpcontribs-api/tests/unit/domains/test_contributions_models.py | 2 +- .../tests/unit/domains/test_shared_repository_download.py | 2 +- mpcontribs-api/tests/unit/test_auth.py | 2 +- mpcontribs-api/tests/unit/test_dependencies.py | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/mpcontribs-api/tests/integration/db/test_components_repository.py b/mpcontribs-api/tests/integration/db/test_components_repository.py index 62748248d7..d18a51c836 100644 --- a/mpcontribs-api/tests/integration/db/test_components_repository.py +++ b/mpcontribs-api/tests/integration/db/test_components_repository.py @@ -3,7 +3,7 @@ import pytest from beanie import PydanticObjectId -from mpcontribs_api.auth import User +from mpcontribs_api.authz import User from mpcontribs_api.config import get_settings from mpcontribs_api.domains._shared.types import DownloadFormat, ShortMimeFormat from mpcontribs_api.domains.attachments.models import ( diff --git a/mpcontribs-api/tests/integration/db/test_contributions_repository.py b/mpcontribs-api/tests/integration/db/test_contributions_repository.py index 83fdaa2880..4ed3b7a5b7 100644 --- a/mpcontribs-api/tests/integration/db/test_contributions_repository.py +++ b/mpcontribs-api/tests/integration/db/test_contributions_repository.py @@ -1,7 +1,7 @@ import pytest from beanie import PydanticObjectId -from mpcontribs_api.auth import User +from mpcontribs_api.authz import User from mpcontribs_api.domains.contributions.models import ( Contribution, ContributionFilter, diff --git a/mpcontribs-api/tests/integration/db/test_download.py b/mpcontribs-api/tests/integration/db/test_download.py index d229de1814..e5ddd363b7 100644 --- a/mpcontribs-api/tests/integration/db/test_download.py +++ b/mpcontribs-api/tests/integration/db/test_download.py @@ -5,7 +5,7 @@ import pytest from beanie import PydanticObjectId -from mpcontribs_api.auth import User +from mpcontribs_api.authz import User from mpcontribs_api.domains.contributions.models import Contribution, ContributionFilter from mpcontribs_api.domains.contributions.repository import MongoDbContributionRepository diff --git a/mpcontribs-api/tests/integration/db/test_projects_repository.py b/mpcontribs-api/tests/integration/db/test_projects_repository.py index ef629cb576..fc6dac2463 100644 --- a/mpcontribs-api/tests/integration/db/test_projects_repository.py +++ b/mpcontribs-api/tests/integration/db/test_projects_repository.py @@ -1,6 +1,6 @@ import pytest -from mpcontribs_api.auth import User +from mpcontribs_api.authz import User from mpcontribs_api.domains.projects.models import Project, ProjectIn, ProjectOut, ProjectPatch, Stats from mpcontribs_api.domains.projects.repository import MongoDbProjectRepository from mpcontribs_api.exceptions import ConflictError, NotFoundError diff --git a/mpcontribs-api/tests/unit/domains/test_contributions_models.py b/mpcontribs-api/tests/unit/domains/test_contributions_models.py index dcda47b93c..acabd18254 100644 --- a/mpcontribs-api/tests/unit/domains/test_contributions_models.py +++ b/mpcontribs-api/tests/unit/domains/test_contributions_models.py @@ -4,7 +4,7 @@ from beanie import PydanticObjectId from pydantic import ValidationError as PydanticValidationError -from mpcontribs_api.auth import User +from mpcontribs_api.authz import User from mpcontribs_api.domains.contributions.repository import MongoDbContributionRepository from mpcontribs_api.domains.contributions.models import ( diff --git a/mpcontribs-api/tests/unit/domains/test_shared_repository_download.py b/mpcontribs-api/tests/unit/domains/test_shared_repository_download.py index 857be36613..90fb4be133 100644 --- a/mpcontribs-api/tests/unit/domains/test_shared_repository_download.py +++ b/mpcontribs-api/tests/unit/domains/test_shared_repository_download.py @@ -12,7 +12,7 @@ from beanie import PydanticObjectId from pydantic import BaseModel -from mpcontribs_api.auth import User +from mpcontribs_api.authz import User from mpcontribs_api.domains._shared.repository import MongoDbRepository from mpcontribs_api.domains._shared.types import DownloadFormat, ShortMimeFormat diff --git a/mpcontribs-api/tests/unit/test_auth.py b/mpcontribs-api/tests/unit/test_auth.py index ee14b1a6be..6651c7d81e 100644 --- a/mpcontribs-api/tests/unit/test_auth.py +++ b/mpcontribs-api/tests/unit/test_auth.py @@ -1,6 +1,6 @@ import pytest -from mpcontribs_api.auth import ADMIN_GROUP, User +from mpcontribs_api.authz import ADMIN_GROUP, User class TestUserIsAnonymous: diff --git a/mpcontribs-api/tests/unit/test_dependencies.py b/mpcontribs-api/tests/unit/test_dependencies.py index af8c03bf13..80c089b60a 100644 --- a/mpcontribs-api/tests/unit/test_dependencies.py +++ b/mpcontribs-api/tests/unit/test_dependencies.py @@ -2,7 +2,7 @@ import pytest -from mpcontribs_api.auth import User +from mpcontribs_api.authz import User from mpcontribs_api.dependencies import _split, get_user, require_user from mpcontribs_api.exceptions import AuthenticationError From 7b42af3d22f3d1695decdf3b19dd084327e2b33b Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Tue, 16 Jun 2026 16:05:06 -0700 Subject: [PATCH 362/591] Uncommented kong in settings --- mpcontribs-api/src/mpcontribs_api/config.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/config.py b/mpcontribs-api/src/mpcontribs_api/config.py index b1c25ff3e5..74fe28dc28 100644 --- a/mpcontribs-api/src/mpcontribs_api/config.py +++ b/mpcontribs-api/src/mpcontribs_api/config.py @@ -10,8 +10,8 @@ class RedisSettings(BaseModel): url: SecretStr -# class KongSettings(BaseModel): -# gateway_secret: SecretStr +class KongSettings(BaseModel): + gateway_secret: SecretStr class AwsSettings(BaseModel): @@ -135,7 +135,7 @@ class Settings(BaseSettings): aws: AwsSettings = Field(default_factory=AwsSettings) # MPContribs_kong__* - # kong: KongSettings + kong: KongSettings # MPContribs_redis__* redis: RedisSettings From 463d913a4f391c19fbed60bf2f9325a44a8eef14 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Tue, 16 Jun 2026 16:44:54 -0700 Subject: [PATCH 363/591] Modified S3Dep to return the client rather than a generator; moved key_name and bucket_name out of router function defs since they are in flux --- mpcontribs-api/src/mpcontribs_api/config.py | 4 ++ .../src/mpcontribs_api/dependencies.py | 5 +- .../domains/contributions/service.py | 9 ++- .../domains/healthcheck/router.py | 20 +++++- .../domains/structures/router.py | 6 +- .../mpcontribs_api/domains/tables/router.py | 6 +- mpcontribs-api/tests/integration/conftest.py | 1 + .../db/test_components_repository.py | 2 + .../tests/integration/db/test_download.py | 3 + .../tests/integration/test_healthcheck.py | 63 ++++++++++++++++--- .../test_shared_repository_download.py | 9 +++ 11 files changed, 103 insertions(+), 25 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/config.py b/mpcontribs-api/src/mpcontribs_api/config.py index 74fe28dc28..aab677eb74 100644 --- a/mpcontribs-api/src/mpcontribs_api/config.py +++ b/mpcontribs-api/src/mpcontribs_api/config.py @@ -25,6 +25,10 @@ class AwsSettings(BaseModel): default=10, description="The maximum number of connections the app is allowed to have to S3", ) + health_bucket: str = Field( + default="contributions", + description="The S3 bucket probed by the healthcheck to verify connectivity", + ) class MongoSettings(BaseModel): diff --git a/mpcontribs-api/src/mpcontribs_api/dependencies.py b/mpcontribs-api/src/mpcontribs_api/dependencies.py index db663769db..1d55c2e5b7 100644 --- a/mpcontribs-api/src/mpcontribs_api/dependencies.py +++ b/mpcontribs-api/src/mpcontribs_api/dependencies.py @@ -1,4 +1,3 @@ -from contextlib import AbstractAsyncContextManager from typing import Annotated import aioboto3 @@ -29,11 +28,11 @@ def get_boto(request: Request) -> aioboto3.Session: BotoDep = Annotated[aioboto3.Session, Depends(get_boto)] -def get_s3(request: Request) -> AbstractAsyncContextManager[S3Client]: +def get_s3(request: Request) -> S3Client: return request.app.state.s3 -S3Dep = Annotated[AbstractAsyncContextManager[S3Client], Depends(get_s3)] +S3Dep = Annotated[S3Client, Depends(get_s3)] def get_mongo_client(request: Request) -> AsyncMongoClient: diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py index df9e1dc647..70122f1000 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py @@ -101,15 +101,18 @@ async def insert_contributions( return BulkWriteSummary[Contribution](total=len(contributions), succeeded=succeeded, failed=failed) def _reject_duplicate_keys(self, contributions: list[ContributionIn]) -> None: - """Reject the whole batch if any (project, identifier) appears more than once. + """Reject the whole batch if any identifying key appears more than once. Mongo would surface this as a duplicate key error; catching it upfront keeps a guaranteed failure from consuming a transaction slot and gives the caller all offending indices at once. + + The dedup key is derived from every value in ``identifiers()`` so adding a field to the + uniqueness contract there flows through here automatically. """ - seen: dict[tuple[str, str], list[int]] = defaultdict(list) + seen: dict[tuple[str, ...], list[int]] = defaultdict(list) for index, contribution in enumerate(contributions): ids = contribution.identifiers() - seen[tuple(**ids)].append(index) + seen[tuple(ids.values())].append(index) duplicates = sorted(index for indices in seen.values() if len(indices) > 1 for index in indices) if duplicates: raise ValidationError( diff --git a/mpcontribs-api/src/mpcontribs_api/domains/healthcheck/router.py b/mpcontribs-api/src/mpcontribs_api/domains/healthcheck/router.py index ef751c4d84..e099971ab6 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/healthcheck/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/healthcheck/router.py @@ -1,18 +1,23 @@ +from botocore.exceptions import BotoCoreError, ClientError from fastapi import APIRouter, HTTPException, status from pydantic import BaseModel -from mpcontribs_api.dependencies import DbDep +from mpcontribs_api.config import get_settings +from mpcontribs_api.dependencies import DbDep, S3Dep router = APIRouter(tags=["health"]) +settings = get_settings() + class HealthStatus(BaseModel): status: str mongo: str + s3: str @router.get("", response_model=HealthStatus, summary="Service health") -async def healthcheck(db: DbDep) -> HealthStatus: +async def healthcheck(db: DbDep, s3_client: S3Dep) -> HealthStatus: try: await db.client.admin.command("ping") except Exception: @@ -20,4 +25,13 @@ async def healthcheck(db: DbDep) -> HealthStatus: status_code=status.HTTP_503_SERVICE_UNAVAILABLE, detail={"status": "unhealthy", "mongo": "unreachable"}, ) from None - return HealthStatus(status="healthy", mongo="ok") + + try: + await s3_client.head_bucket(Bucket=settings.aws.health_bucket) + except (ClientError, BotoCoreError): + raise HTTPException( + status_code=status.HTTP_503_SERVICE_UNAVAILABLE, + detail={"status": "unhealthy", "s3": "unreachable"}, + ) from None + + return HealthStatus(status="healthy", mongo="ok", s3="ok") diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py index 13684d4b53..619d5d7308 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py @@ -46,8 +46,6 @@ async def download_structure( repo: StructureDep, format: DownloadFormat, s3: S3Dep, - key_name: str, - bucket_name: str = "structures", short_mime: ShortMimeFormat = ShortMimeFormat.GZ, ignore_cache: bool = False, filter: StructureFilter = FilterDepends(StructureFilter), @@ -60,8 +58,8 @@ async def download_structure( ignore_cache=ignore_cache, filter=filter, fields=selected, - key_name=key_name, - bucket_name=bucket_name, + key_name="", # TODO: Temp + bucket_name="structures", s3=s3, ) filename = download_filename("structures", format, short_mime) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py index 3f24588ff2..13e3233ce7 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py @@ -45,13 +45,11 @@ async def get_table( async def download_table( repo: TableDep, s3: S3Dep, - key_name: str, format: DownloadFormat, short_mime: ShortMimeFormat = ShortMimeFormat.GZ, ignore_cache: bool = False, filter: TableFilter = FilterDepends(TableFilter), fields: FieldSelector = TableOut.default_fields(), - bucket_name: str = "tables", ) -> StreamingResponse: selected = TableOut.parse_fields(fields) body = await repo.download_tables( @@ -61,8 +59,8 @@ async def download_table( filter=filter, fields=selected, s3=s3, - bucket_name=bucket_name, - key_name=key_name, + bucket_name="tables", + key_name="", # TODO: Temp ) filename = download_filename("tables", format, short_mime) return StreamingResponse( diff --git a/mpcontribs-api/tests/integration/conftest.py b/mpcontribs-api/tests/integration/conftest.py index 00e130edaf..3cc292882c 100644 --- a/mpcontribs-api/tests/integration/conftest.py +++ b/mpcontribs-api/tests/integration/conftest.py @@ -67,6 +67,7 @@ def make_test_app() -> FastAPI: @asynccontextmanager async def _noop_lifespan(app: FastAPI): app.state.db = MagicMock() + app.state.s3 = MagicMock() yield app = FastAPI(title="mpcontribs-test", lifespan=_noop_lifespan) diff --git a/mpcontribs-api/tests/integration/db/test_components_repository.py b/mpcontribs-api/tests/integration/db/test_components_repository.py index d18a51c836..96ad7bcd51 100644 --- a/mpcontribs-api/tests/integration/db/test_components_repository.py +++ b/mpcontribs-api/tests/integration/db/test_components_repository.py @@ -1,4 +1,5 @@ import gzip +from unittest.mock import MagicMock import pytest from beanie import PydanticObjectId @@ -161,6 +162,7 @@ async def test_jsonl_download_round_trips(self, db): ignore_cache=True, filter=AttachmentFilter(), fields=None, + s3=MagicMock(), ) chunks = [c async for c in stream] decompressed = gzip.decompress(b"".join(chunks)) diff --git a/mpcontribs-api/tests/integration/db/test_download.py b/mpcontribs-api/tests/integration/db/test_download.py index e5ddd363b7..6800689aa6 100644 --- a/mpcontribs-api/tests/integration/db/test_download.py +++ b/mpcontribs-api/tests/integration/db/test_download.py @@ -1,6 +1,7 @@ import csv import gzip import io +from unittest.mock import MagicMock import pytest from beanie import PydanticObjectId @@ -62,6 +63,8 @@ async def _download_bytes(repo: MongoDbContributionRepository, *, format="jsonl" ignore_cache=True, filter=filter or ContributionFilter(), fields=fields, + key_name="", + s3=MagicMock(), ) return gzip.decompress(await _collect(stream)) diff --git a/mpcontribs-api/tests/integration/test_healthcheck.py b/mpcontribs-api/tests/integration/test_healthcheck.py index cec2824171..a7810fcefc 100644 --- a/mpcontribs-api/tests/integration/test_healthcheck.py +++ b/mpcontribs-api/tests/integration/test_healthcheck.py @@ -1,10 +1,11 @@ from unittest.mock import AsyncMock, MagicMock import pytest +from botocore.exceptions import ClientError from fastapi import FastAPI from fastapi.testclient import TestClient -from mpcontribs_api.dependencies import get_db +from mpcontribs_api.dependencies import get_db, get_s3 from mpcontribs_api.domains.healthcheck.router import router as healthcheck_router from mpcontribs_api.exceptions import register_exception_handlers @@ -19,6 +20,18 @@ def _make_db(ping_ok: bool) -> MagicMock: return db +def _make_s3(head_ok: bool) -> MagicMock: + """Build a mock S3 client whose head_bucket is awaitable.""" + s3 = MagicMock(name="s3") + if head_ok: + s3.head_bucket = AsyncMock(return_value={}) + else: + s3.head_bucket = AsyncMock( + side_effect=ClientError({"Error": {"Code": "503", "Message": "s3 down"}}, "HeadBucket") + ) + return s3 + + @pytest.fixture def health_app() -> FastAPI: app = FastAPI() @@ -27,8 +40,9 @@ def health_app() -> FastAPI: return app -def _client(app: FastAPI, db: MagicMock) -> TestClient: +def _client(app: FastAPI, db: MagicMock, s3: MagicMock | None = None) -> TestClient: app.dependency_overrides[get_db] = lambda: db + app.dependency_overrides[get_s3] = lambda: s3 if s3 is not None else _make_s3(head_ok=True) return TestClient(app, raise_server_exceptions=False) @@ -39,25 +53,30 @@ def _client(app: FastAPI, db: MagicMock) -> TestClient: class TestHealthcheckHealthy: def test_returns_200(self, health_app): - r = _client(health_app, _make_db(ping_ok=True)).get("/health") + r = _client(health_app, _make_db(ping_ok=True), _make_s3(head_ok=True)).get("/health") assert r.status_code == 200 def test_body_reports_healthy(self, health_app): - r = _client(health_app, _make_db(ping_ok=True)).get("/health") - assert r.json() == {"status": "healthy", "mongo": "ok"} + r = _client(health_app, _make_db(ping_ok=True), _make_s3(head_ok=True)).get("/health") + assert r.json() == {"status": "healthy", "mongo": "ok", "s3": "ok"} def test_pings_mongo(self, health_app): db = _make_db(ping_ok=True) - _client(health_app, db).get("/health") + _client(health_app, db, _make_s3(head_ok=True)).get("/health") db.client.admin.command.assert_awaited_once_with("ping") + def test_probes_s3(self, health_app): + s3 = _make_s3(head_ok=True) + _client(health_app, _make_db(ping_ok=True), s3).get("/health") + s3.head_bucket.assert_awaited_once() + # --------------------------------------------------------------------------- -# Unhealthy path (DB unreachable) +# Unhealthy path (Mongo unreachable) # --------------------------------------------------------------------------- -class TestHealthcheckUnhealthy: +class TestHealthcheckMongoUnhealthy: def test_returns_503(self, health_app): r = _client(health_app, _make_db(ping_ok=False)).get("/health") assert r.status_code == 503 @@ -75,3 +94,31 @@ def test_ping_failure_does_not_leak_exception_text(self, health_app): # underlying "mongo down" ConnectionError message. r = _client(health_app, _make_db(ping_ok=False)).get("/health") assert "mongo down" not in r.text + + def test_s3_not_probed_when_mongo_down(self, health_app): + # Mongo is checked first; a failure short-circuits before S3 is touched. + s3 = _make_s3(head_ok=True) + _client(health_app, _make_db(ping_ok=False), s3).get("/health") + s3.head_bucket.assert_not_awaited() + + +# --------------------------------------------------------------------------- +# Unhealthy path (S3 unreachable) +# --------------------------------------------------------------------------- + + +class TestHealthcheckS3Unhealthy: + def test_returns_503(self, health_app): + r = _client(health_app, _make_db(ping_ok=True), _make_s3(head_ok=False)).get("/health") + assert r.status_code == 503 + + def test_body_reports_unreachable(self, health_app): + r = _client(health_app, _make_db(ping_ok=True), _make_s3(head_ok=False)).get("/health") + message = r.json()["error"]["message"] + assert "unhealthy" in message + assert "unreachable" in message + + def test_s3_failure_does_not_leak_exception_text(self, health_app): + # The controlled detail dict is returned, not the underlying boto error text. + r = _client(health_app, _make_db(ping_ok=True), _make_s3(head_ok=False)).get("/health") + assert "s3 down" not in r.text diff --git a/mpcontribs-api/tests/unit/domains/test_shared_repository_download.py b/mpcontribs-api/tests/unit/domains/test_shared_repository_download.py index 90fb4be133..8f87b219f8 100644 --- a/mpcontribs-api/tests/unit/domains/test_shared_repository_download.py +++ b/mpcontribs-api/tests/unit/domains/test_shared_repository_download.py @@ -289,6 +289,9 @@ async def test_jsonl_stream_decompresses_to_rows(self): ignore_cache=True, filter=filter, # type: ignore[arg-type] fields=None, + s3=MagicMock(), + bucket_name="test-bucket", + key_name="test-key", ) compressed = await _collect(stream) decompressed = gzip.decompress(compressed) @@ -305,6 +308,9 @@ async def test_csv_stream_decompresses_to_rows(self): ignore_cache=True, filter=filter, # type: ignore[arg-type] fields=frozenset({"a", "b"}), + s3=MagicMock(), + bucket_name="test-bucket", + key_name="test-key", ) compressed = await _collect(stream) decompressed = gzip.decompress(compressed) @@ -325,6 +331,9 @@ async def test_empty_result_is_valid_empty_gzip(self): ignore_cache=True, filter=filter, # type: ignore[arg-type] fields=None, + s3=MagicMock(), + bucket_name="test-bucket", + key_name="test-key", ) compressed = await _collect(stream) assert gzip.decompress(compressed) == b"" From 8aef24ce7ca1ab5bfd5ee74474435d4f550d234d Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 17 Jun 2026 09:05:45 -0700 Subject: [PATCH 364/591] Removed kong settings, since they are unused --- mpcontribs-api/src/mpcontribs_api/config.py | 7 ------- mpcontribs-api/tests/conftest.py | 1 - mpcontribs-api/tests/integration/conftest.py | 5 ----- mpcontribs-api/tests/unit/test_config.py | 10 +--------- 4 files changed, 1 insertion(+), 22 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/config.py b/mpcontribs-api/src/mpcontribs_api/config.py index aab677eb74..780a75cb94 100644 --- a/mpcontribs-api/src/mpcontribs_api/config.py +++ b/mpcontribs-api/src/mpcontribs_api/config.py @@ -10,10 +10,6 @@ class RedisSettings(BaseModel): url: SecretStr -class KongSettings(BaseModel): - gateway_secret: SecretStr - - class AwsSettings(BaseModel): """AWS Settings @@ -138,9 +134,6 @@ class Settings(BaseSettings): # MPContribs_aws__* aws: AwsSettings = Field(default_factory=AwsSettings) - # MPContribs_kong__* - kong: KongSettings - # MPContribs_redis__* redis: RedisSettings diff --git a/mpcontribs-api/tests/conftest.py b/mpcontribs-api/tests/conftest.py index b6d47ba59d..80d67d3f56 100644 --- a/mpcontribs-api/tests/conftest.py +++ b/mpcontribs-api/tests/conftest.py @@ -10,7 +10,6 @@ os.environ.setdefault("MPCONTRIBS_ENVIRONMENT", "dev") os.environ.setdefault("MPCONTRIBS_MONGO__URI", "mongodb://localhost:27017") os.environ.setdefault("MPCONTRIBS_MONGO__DB_NAME", "testdb") -os.environ.setdefault("MPCONTRIBS_KONG__GATEWAY_SECRET", "test-gateway-secret") os.environ.setdefault("MPCONTRIBS_REDIS__ADDRESS", "redis://localhost:6379") os.environ.setdefault("MPCONTRIBS_REDIS__URL", "redis://localhost:6379") os.environ.setdefault("MPCONTRIBS_MAIL_DEFAULT_SENDER", "test@example.com") diff --git a/mpcontribs-api/tests/integration/conftest.py b/mpcontribs-api/tests/integration/conftest.py index 3cc292882c..db15f2fa3a 100644 --- a/mpcontribs-api/tests/integration/conftest.py +++ b/mpcontribs-api/tests/integration/conftest.py @@ -31,11 +31,6 @@ def _mock_beanie_collection(): from mpcontribs_api.config import get_settings -# Read the real secret from settings (from .env or the root conftest fallback) -# so gateway tests always use whatever the live server will accept. -GATEWAY_SECRET = get_settings().kong.gateway_secret.get_secret_value() -GATEWAY_HEADERS = {"x-gateway-secret": GATEWAY_SECRET} - ANON_HEADERS: dict[str, str] = {} AUTHED_HEADERS = { diff --git a/mpcontribs-api/tests/unit/test_config.py b/mpcontribs-api/tests/unit/test_config.py index 2c8c58f685..3db14f7685 100644 --- a/mpcontribs-api/tests/unit/test_config.py +++ b/mpcontribs-api/tests/unit/test_config.py @@ -3,7 +3,6 @@ from pydantic import ValidationError as PydanticValidationError from mpcontribs_api.config import ( - KongSettings, MongoSettings, RedisSettings, Settings, @@ -18,7 +17,6 @@ "MPCONTRIBS_ENVIRONMENT": "dev", "MPCONTRIBS_MONGO__URI": "mongodb://user:pass@localhost:27017", "MPCONTRIBS_MONGO__DB_NAME": "mpcontribs-test", - "MPCONTRIBS_KONG__GATEWAY_SECRET": "kong-secret", "MPCONTRIBS_REDIS__ADDRESS": "redis://localhost:6379", "MPCONTRIBS_REDIS__URL": "redis://localhost:6379/0", "MPCONTRIBS_MAIL_DEFAULT_SENDER": "noreply@materialsproject.org", @@ -110,11 +108,6 @@ def test_below_cap_unchanged(self): class TestSubSettingsSecrets: - def test_kong_secret_masked(self): - kong = KongSettings(gateway_secret=SecretStr("s3cret")) - assert kong.gateway_secret.get_secret_value() == "s3cret" - assert "s3cret" not in repr(kong) - def test_redis_secrets_masked(self): redis = RedisSettings(address=SecretStr("redis://h"), url=SecretStr("redis://h/0")) assert redis.address.get_secret_value() == "redis://h" @@ -140,10 +133,9 @@ def test_nested_delimiter_populates_mongo(self, monkeypatch): assert settings.mongo.db_name == "mpcontribs-test" assert settings.mongo.uri.get_secret_value() == "mongodb://user:pass@localhost:27017" - def test_nested_delimiter_populates_kong_and_redis(self, monkeypatch): + def test_nested_delimiter_populates_and_redis(self, monkeypatch): _set_required_env(monkeypatch) settings = Settings() - assert settings.kong.gateway_secret.get_secret_value() == "kong-secret" assert settings.redis.url.get_secret_value() == "redis://localhost:6379/0" def test_nested_field_override(self, monkeypatch): From fa2a4f777fafebc4a6b1051642997d2d9285b28d Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 17 Jun 2026 10:21:34 -0700 Subject: [PATCH 365/591] Made a shared ComponentService to ensure deletion only occurs when no contributions reference the component in question --- .../mpcontribs_api/domains/_shared/models.py | 12 ++ .../domains/_shared/repository.py | 15 ++ .../mpcontribs_api/domains/_shared/service.py | 74 +++++++++ .../domains/attachments/dependencies.py | 9 ++ .../domains/attachments/router.py | 16 +- .../domains/attachments/service.py | 9 ++ .../domains/contributions/models.py | 7 +- .../domains/contributions/repository.py | 41 ++++- .../domains/structures/dependencies.py | 9 ++ .../domains/structures/router.py | 16 +- .../domains/structures/service.py | 9 ++ .../domains/tables/dependencies.py | 9 ++ .../mpcontribs_api/domains/tables/router.py | 16 +- .../mpcontribs_api/domains/tables/service.py | 9 ++ .../integration/test_component_routes.py | 77 ++++++--- .../unit/domains/test_component_service.py | 146 ++++++++++++++++++ 16 files changed, 426 insertions(+), 48 deletions(-) create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/_shared/service.py create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/attachments/service.py create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/structures/service.py create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/tables/service.py create mode 100644 mpcontribs-api/tests/unit/domains/test_component_service.py diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py index 2d44eb7308..2c0a258153 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py @@ -58,6 +58,18 @@ def from_delete_result(cls, delete_result: DeleteResult) -> Self: return cls(num_deleted=delete_result.deleted_count) +class ComponentDeleteResponse(DeleteResponse): + """Result of a component delete that may leave referenced components in place. + + ``num_deleted`` (inherited) counts components actually removed; ``referenced_ids`` are the + component ids skipped because a contribution still references them, and ``num_skipped`` is + their count. + """ + + referenced_ids: list[PydanticObjectId] = Field(default_factory=list) + num_skipped: int = 0 + + def canonical_md5(payload: Mapping[str, Any]) -> str: """MD5 hex digest of a content mapping, stable across processes/hosts.""" text = json.dumps(payload, sort_keys=True, separators=(",", ":"), ensure_ascii=False) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py index 4da5b2d736..f194d4dd5c 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py @@ -112,6 +112,21 @@ async def get_by_id(self, id: Any, fields: frozenset[str] | None) -> TDoc | TOut projection_model=self.out_model.projection(fields), ) + async def list_ids(self, filter: TFilter, session: AsyncClientSession | None = None) -> list[Any]: + """Return just the ids of scoped documents matching ``filter``. + + Projects to ``{"_id": 1}`` so the lookup can be served as a covered query from the + default ``_id`` index without materializing full documents. + + Args: + filter (TFilter): the fastapi-filter query to apply on top of the user scope + session (AsyncClientSession | None): optional client session for transactions + """ + projection = self.out_model.projection(frozenset({"id"})) + query = filter.filter(self.document_model.find(self._scope, session=session)) + docs = await query.project(projection).to_list() + return [doc.id for doc in docs] + async def insert_one(self, in_resource: TIn) -> TDoc: """Insert a new document built from its input model, rejecting duplicate ids. diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/service.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/service.py new file mode 100644 index 0000000000..cbe6e9bad5 --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/service.py @@ -0,0 +1,74 @@ +from typing import ClassVar + +from fastapi_filter.contrib.beanie import Filter + +from mpcontribs_api.domains._shared.components import MongoDbComponentsRepository +from mpcontribs_api.domains._shared.models import ComponentDeleteResponse +from mpcontribs_api.domains.contributions.repository import MongoDbContributionRepository +from mpcontribs_api.exceptions import NotFoundError + + +class ComponentService[TRepo: MongoDbComponentsRepository, TFilter: Filter]: + """Service layer for shared logic for components. + + Components carry no scope of their own; a user's access is derived from the contributions + that reference them. Deletion therefore applies two gates: + + 1. **Access (scoped):** candidates are restricted to components reachable via a contribution + in the user's scope. A component the user cannot reach is treated as not found. + 2. **Integrity (global):** any reachable candidate still referenced by *any* contribution is + skipped; the rest are deleted. + """ + + ref_field: ClassVar[str] + + def __init__( + self, + components: TRepo, + contributions: MongoDbContributionRepository, + ) -> None: + self._components = components + self._contributions = contributions + + async def delete(self, filter: TFilter) -> ComponentDeleteResponse: + """Delete components matching ``filter`` that are reachable and globally unreferenced. + + Args: + filter (TFilter): the component-specific query to apply + + Returns: + ComponentDeleteResponse: count deleted, plus the ids skipped because a contribution + still references them + """ + candidate_ids = await self._components.list_ids(filter) + reachable = await self._contributions.referenced_component_ids(self.ref_field, candidate_ids, scoped=True) + if not reachable: + return ComponentDeleteResponse(num_deleted=0) + referenced = await self._contributions.referenced_component_ids(self.ref_field, list(reachable), scoped=False) + deletable = [cid for cid in reachable if cid not in referenced] + num_deleted = (await self._components.delete_by_ids(deletable)).num_deleted if deletable else 0 + return ComponentDeleteResponse( + num_deleted=num_deleted, + num_skipped=len(referenced), + referenced_ids=sorted(referenced), + ) + + async def delete_by_id(self, id: str) -> ComponentDeleteResponse: + """Delete a single component by id, subject to the access and integrity gates. + + Args: + id (str): the str representation of the component's ObjectId + + Returns: + ComponentDeleteResponse: the deletion result, or a skipped result if still referenced + + Raises: + NotFoundError: if the component is not reachable via any in-scope contribution + """ + oid = self._components._convert_object_id(id) + if not await self._contributions.referenced_component_ids(self.ref_field, [oid], scoped=True): + raise NotFoundError(self._components._not_found(id)) + if await self._contributions.referenced_component_ids(self.ref_field, [oid], scoped=False): + return ComponentDeleteResponse(num_deleted=0, num_skipped=1, referenced_ids=[oid]) + deleted = await self._components.delete_by_id(oid) + return ComponentDeleteResponse(num_deleted=deleted.num_deleted) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/attachments/dependencies.py b/mpcontribs-api/src/mpcontribs_api/domains/attachments/dependencies.py index 59d6923ff0..bbe1e2ecad 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/attachments/dependencies.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/attachments/dependencies.py @@ -4,6 +4,8 @@ from mpcontribs_api.dependencies import UserDep from mpcontribs_api.domains.attachments.repository import MongoDbAttachmentRepository +from mpcontribs_api.domains.attachments.service import AttachmentService +from mpcontribs_api.domains.contributions.repository import MongoDbContributionRepository def get_scoped_attachments(user: UserDep) -> MongoDbAttachmentRepository: @@ -11,3 +13,10 @@ def get_scoped_attachments(user: UserDep) -> MongoDbAttachmentRepository: AttachmentDep = Annotated[MongoDbAttachmentRepository, Depends(get_scoped_attachments)] + + +def get_attachment_service(user: UserDep) -> AttachmentService: + return AttachmentService(MongoDbAttachmentRepository(user), MongoDbContributionRepository(user)) + + +AttachmentServiceDep = Annotated[AttachmentService, Depends(get_attachment_service)] diff --git a/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py b/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py index cadeb62fe1..da19777979 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py @@ -5,14 +5,14 @@ from fastapi_filter import FilterDepends from mpcontribs_api.dependencies import S3Dep -from mpcontribs_api.domains._shared.models import DeleteResponse +from mpcontribs_api.domains._shared.models import ComponentDeleteResponse from mpcontribs_api.domains._shared.types import ( DownloadFormat, FieldSelector, ShortMimeFormat, download_filename, ) -from mpcontribs_api.domains.attachments.dependencies import AttachmentDep +from mpcontribs_api.domains.attachments.dependencies import AttachmentDep, AttachmentServiceDep from mpcontribs_api.domains.attachments.models import AttachmentFilter, AttachmentOut from mpcontribs_api.pagination import CursorParams, Page @@ -67,11 +67,11 @@ async def download_attachment( ) -@router.delete("", response_model=DeleteResponse) -async def delete_attachments(repo: AttachmentDep, filter: AttachmentFilter = FilterDepends(AttachmentFilter)): - return await repo.delete_attachments(filter=filter) +@router.delete("", response_model=ComponentDeleteResponse) +async def delete_attachments(service: AttachmentServiceDep, filter: AttachmentFilter = FilterDepends(AttachmentFilter)): + return await service.delete(filter=filter) -@router.delete("/{id}", response_model=DeleteResponse) -async def delete_attachment_by_id(repo: AttachmentDep, id: str): - return await repo.delete_attachment_by_id(id=id) +@router.delete("/{id}", response_model=ComponentDeleteResponse) +async def delete_attachment_by_id(service: AttachmentServiceDep, id: str): + return await service.delete_by_id(id=id) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/attachments/service.py b/mpcontribs-api/src/mpcontribs_api/domains/attachments/service.py new file mode 100644 index 0000000000..a508c1422e --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/domains/attachments/service.py @@ -0,0 +1,9 @@ +from mpcontribs_api.domains._shared.service import ComponentService +from mpcontribs_api.domains.attachments.models import AttachmentFilter +from mpcontribs_api.domains.attachments.repository import MongoDbAttachmentRepository + + +class AttachmentService(ComponentService[MongoDbAttachmentRepository, AttachmentFilter]): + """Defines which field on a Contribtution to look in for the references.""" + + ref_field = "attachments" diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py index 49bdcff722..8c1a7f45b8 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py @@ -85,7 +85,12 @@ class Settings: keys=[("project", ASCENDING), ("identifier", ASCENDING)], name="project_idenfitier", unique=True, - ) + ), + # Multikey indexes over each Link field's DBRef id so the component-delete + # reference check (referenced_component_ids) is index-served, not a COLLSCAN. + IndexModel(keys=[("structures.$id", ASCENDING)], name="ref_structures"), + IndexModel(keys=[("tables.$id", ASCENDING)], name="ref_tables"), + IndexModel(keys=[("attachments.$id", ASCENDING)], name="ref_attachments"), ] diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py index a281d039af..cc816441fc 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py @@ -2,7 +2,7 @@ from contextlib import AbstractAsyncContextManager from typing import Any -from beanie import UpdateResponse +from beanie import PydanticObjectId, UpdateResponse from beanie.operators import Set from pymongo.asynchronous.client_session import AsyncClientSession from pymongo.results import DeleteResult @@ -112,6 +112,45 @@ async def find_one_contribution(self, project: str, identifier: str) -> Contribu self.document_model.identifier == identifier, ) + async def referenced_component_ids( + self, + ref_field: str, + ids: list[PydanticObjectId], + *, + scoped: bool, + ) -> set[PydanticObjectId]: + """Return the subset of ``ids`` referenced by contributions through ``ref_field``. + + Beanie stores each ``Link`` as a DBRef (``{"$ref": ..., "$id": ObjectId}``), so a + component is referenced when its id appears under ``.$id`` on any matching + contribution. + + Args: + ref_field: the contribution link field to inspect ("structures" | "tables" | + "attachments"). Always a fixed class-attr at the call site, never user input. + ids: candidate component ids to test + scoped: when ``True`` the user scope is applied (access gate / reachability); when + ``False`` the check spans every contribution (global integrity check) + + Returns: + set[PydanticObjectId]: the ids in ``ids`` that are still referenced + """ + if not ids: + return set() + key = f"{ref_field}.$id" + query: dict[str, Any] = {key: {"$in": ids}} + if scoped and self._scope: + query = {"$and": [self._scope, query]} + target = set(ids) + referenced: set[PydanticObjectId] = set() + collection = self.document_model.get_pymongo_collection() + async for doc in collection.find(query, {ref_field: 1}): + for ref in doc.get(ref_field) or []: + rid = ref.id if hasattr(ref, "id") else ref.get("$id") + if rid in target: + referenced.add(rid) + return referenced + async def update_contribution(self, doc: Contribution, update_data: dict[str, Any]) -> None: """Apply a partial update to an existing Contribution document.""" await doc.update(Set(update_data)) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/dependencies.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/dependencies.py index deb8fc7567..68a21c7f85 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/structures/dependencies.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/structures/dependencies.py @@ -3,7 +3,9 @@ from fastapi import Depends from mpcontribs_api.dependencies import UserDep +from mpcontribs_api.domains.contributions.repository import MongoDbContributionRepository from mpcontribs_api.domains.structures.repository import MongoDbStructureRepository +from mpcontribs_api.domains.structures.service import StructureService def get_scoped_tables(user: UserDep) -> MongoDbStructureRepository: @@ -11,3 +13,10 @@ def get_scoped_tables(user: UserDep) -> MongoDbStructureRepository: StructureDep = Annotated[MongoDbStructureRepository, Depends(get_scoped_tables)] + + +def get_structure_service(user: UserDep) -> StructureService: + return StructureService(MongoDbStructureRepository(user), MongoDbContributionRepository(user)) + + +StructureServiceDep = Annotated[StructureService, Depends(get_structure_service)] diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py index 619d5d7308..66d77f2caa 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py @@ -6,14 +6,14 @@ from mpcontribs_api.dependencies import S3Dep from mpcontribs_api.domains._shared.bulk import BulkWriteSummary -from mpcontribs_api.domains._shared.models import DeleteResponse +from mpcontribs_api.domains._shared.models import ComponentDeleteResponse from mpcontribs_api.domains._shared.types import ( DownloadFormat, FieldSelector, ShortMimeFormat, download_filename, ) -from mpcontribs_api.domains.structures.dependencies import StructureDep +from mpcontribs_api.domains.structures.dependencies import StructureDep, StructureServiceDep from mpcontribs_api.domains.structures.models import StructureFilter, StructureIn, StructureOut, StructurePatch from mpcontribs_api.pagination import CursorParams, Page @@ -78,14 +78,14 @@ async def insert_structures( return await repo.insert_structures(structures=structures) -@router.delete("", response_model=DeleteResponse) -async def delete_structures(repo: StructureDep, filter: StructureFilter = FilterDepends(StructureFilter)): - return await repo.delete_structures(filter=filter) +@router.delete("", response_model=ComponentDeleteResponse) +async def delete_structures(service: StructureServiceDep, filter: StructureFilter = FilterDepends(StructureFilter)): + return await service.delete(filter=filter) -@router.delete("/{id}", response_model=DeleteResponse) -async def delete_structure_by_id(repo: StructureDep, id: str): - return await repo.delete_structure_by_id(id=id) +@router.delete("/{id}", response_model=ComponentDeleteResponse) +async def delete_structure_by_id(service: StructureServiceDep, id: str): + return await service.delete_by_id(id=id) @router.patch("/{id}") diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/service.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/service.py new file mode 100644 index 0000000000..5e8336094b --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/domains/structures/service.py @@ -0,0 +1,9 @@ +from mpcontribs_api.domains._shared.service import ComponentService +from mpcontribs_api.domains.structures.models import StructureFilter +from mpcontribs_api.domains.structures.repository import MongoDbStructureRepository + + +class StructureService(ComponentService[MongoDbStructureRepository, StructureFilter]): + """Defines which field on a Contribtution to look in for the references.""" + + ref_field = "structures" diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/dependencies.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/dependencies.py index 84e6a46ab7..a1441f836f 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/dependencies.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/dependencies.py @@ -3,7 +3,9 @@ from fastapi import Depends from mpcontribs_api.dependencies import UserDep +from mpcontribs_api.domains.contributions.repository import MongoDbContributionRepository from mpcontribs_api.domains.tables.repository import MongoDbTableRepository +from mpcontribs_api.domains.tables.service import TableService def get_scoped_tables(user: UserDep) -> MongoDbTableRepository: @@ -11,3 +13,10 @@ def get_scoped_tables(user: UserDep) -> MongoDbTableRepository: TableDep = Annotated[MongoDbTableRepository, Depends(get_scoped_tables)] + + +def get_table_service(user: UserDep) -> TableService: + return TableService(MongoDbTableRepository(user), MongoDbContributionRepository(user)) + + +TableServiceDep = Annotated[TableService, Depends(get_table_service)] diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py index 13e3233ce7..9239c78a0a 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py @@ -6,14 +6,14 @@ from mpcontribs_api.dependencies import S3Dep from mpcontribs_api.domains._shared.bulk import BulkWriteSummary -from mpcontribs_api.domains._shared.models import DeleteResponse +from mpcontribs_api.domains._shared.models import ComponentDeleteResponse from mpcontribs_api.domains._shared.types import ( DownloadFormat, FieldSelector, ShortMimeFormat, download_filename, ) -from mpcontribs_api.domains.tables.dependencies import TableDep +from mpcontribs_api.domains.tables.dependencies import TableDep, TableServiceDep from mpcontribs_api.domains.tables.models import Table, TableFilter, TableIn, TableOut, TablePatch from mpcontribs_api.pagination import CursorParams, Page @@ -78,14 +78,14 @@ async def insert_tables( return await repo.insert_tables(tables=tables) -@router.delete("", response_model=DeleteResponse) -async def delete_tables(repo: TableDep, filter: TableFilter = FilterDepends(TableFilter)): - return await repo.delete_tables(filter=filter) +@router.delete("", response_model=ComponentDeleteResponse) +async def delete_tables(service: TableServiceDep, filter: TableFilter = FilterDepends(TableFilter)): + return await service.delete(filter=filter) -@router.delete("/{id}", response_model=DeleteResponse) -async def delete_table_by_id(repo: TableDep, id: str): - return await repo.delete_table_by_id(id=id) +@router.delete("/{id}", response_model=ComponentDeleteResponse) +async def delete_table_by_id(service: TableServiceDep, id: str): + return await service.delete_by_id(id=id) @router.patch("/{id}") diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/service.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/service.py new file mode 100644 index 0000000000..d6784c61d0 --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/service.py @@ -0,0 +1,9 @@ +from mpcontribs_api.domains._shared.service import ComponentService +from mpcontribs_api.domains.tables.models import TableFilter +from mpcontribs_api.domains.tables.repository import MongoDbTableRepository + + +class TableService(ComponentService[MongoDbTableRepository, TableFilter]): + """Defines which field on a Contribtution to look in for the references.""" + + ref_field = "tables" diff --git a/mpcontribs-api/tests/integration/test_component_routes.py b/mpcontribs-api/tests/integration/test_component_routes.py index 0d9f2487ae..abee2bd829 100644 --- a/mpcontribs-api/tests/integration/test_component_routes.py +++ b/mpcontribs-api/tests/integration/test_component_routes.py @@ -1,11 +1,14 @@ +from unittest.mock import AsyncMock + import pytest from beanie import PydanticObjectId -from mpcontribs_api.domains._shared.models import DeleteResponse -from mpcontribs_api.domains.attachments.dependencies import get_scoped_attachments +from mpcontribs_api.domains._shared.models import ComponentDeleteResponse +from mpcontribs_api.domains.attachments.dependencies import get_attachment_service, get_scoped_attachments from mpcontribs_api.domains.structures.dependencies import get_scoped_tables as get_scoped_structures +from mpcontribs_api.domains.structures.dependencies import get_structure_service from mpcontribs_api.domains.structures.models import StructureOut -from mpcontribs_api.domains.tables.dependencies import get_scoped_tables +from mpcontribs_api.domains.tables.dependencies import get_scoped_tables, get_table_service from mpcontribs_api.domains.tables.models import TableOut from mpcontribs_api.pagination import Page @@ -35,6 +38,32 @@ def attachment_repo(test_app, mock_attachment_repo): test_app.dependency_overrides.pop(get_scoped_attachments, None) +# Delete endpoints route through the component service (not the repo), so they are +# overridden separately from the read/insert/patch endpoints above. +@pytest.fixture +def structure_service(test_app): + mock = AsyncMock() + test_app.dependency_overrides[get_structure_service] = lambda: mock + yield mock + test_app.dependency_overrides.pop(get_structure_service, None) + + +@pytest.fixture +def table_service(test_app): + mock = AsyncMock() + test_app.dependency_overrides[get_table_service] = lambda: mock + yield mock + test_app.dependency_overrides.pop(get_table_service, None) + + +@pytest.fixture +def attachment_service(test_app): + mock = AsyncMock() + test_app.dependency_overrides[get_attachment_service] = lambda: mock + yield mock + test_app.dependency_overrides.pop(get_attachment_service, None) + + SAMPLE_STRUCTURE = StructureOut(name="Fe2O3.cif", md5="a" * 32) SAMPLE_TABLE = TableOut(name="bandgaps", md5="b" * 32) @@ -73,16 +102,16 @@ def test_valid_fields_forwarded(self, client, structure_repo): class TestStructuresDelete: - def test_batch_delete_returns_200(self, client, structure_repo): - structure_repo.delete_structures.return_value = DeleteResponse(num_deleted=3) + def test_batch_delete_returns_200(self, client, structure_service): + structure_service.delete.return_value = ComponentDeleteResponse(num_deleted=3) r = client.delete("/api/v1/structures") assert r.status_code == 200 - assert r.json() == {"num_deleted": 3} + assert r.json() == {"num_deleted": 3, "num_skipped": 0, "referenced_ids": []} - def test_repo_delete_called(self, client, structure_repo): - structure_repo.delete_structures.return_value = DeleteResponse(num_deleted=0) + def test_service_delete_called(self, client, structure_service): + structure_service.delete.return_value = ComponentDeleteResponse(num_deleted=0) client.delete("/api/v1/structures") - structure_repo.delete_structures.assert_awaited_once() + structure_service.delete.assert_awaited_once() class TestStructuresInsert: @@ -103,8 +132,8 @@ def test_get_by_id_conventional_path(self, client, structure_repo): structure_repo.get_structure_by_id.return_value = SAMPLE_STRUCTURE assert client.get(f"/api/v1/structures/{PydanticObjectId()}").status_code == 200 - def test_delete_by_id_conventional_path(self, client, structure_repo): - structure_repo.delete_structure_by_id.return_value = DeleteResponse(num_deleted=1) + def test_delete_by_id_conventional_path(self, client, structure_service): + structure_service.delete_by_id.return_value = ComponentDeleteResponse(num_deleted=1) assert client.delete(f"/api/v1/structures/{PydanticObjectId()}").status_code == 200 def test_patch_by_id_conventional_path(self, client, structure_repo): @@ -141,9 +170,13 @@ def test_default_fields_accepted(self, client, table_repo): class TestTablesDelete: - def test_batch_delete_returns_200(self, client, table_repo): - table_repo.delete_tables.return_value = DeleteResponse(num_deleted=2) - assert client.delete("/api/v1/tables").json() == {"num_deleted": 2} + def test_batch_delete_returns_200(self, client, table_service): + table_service.delete.return_value = ComponentDeleteResponse(num_deleted=2) + assert client.delete("/api/v1/tables").json() == { + "num_deleted": 2, + "num_skipped": 0, + "referenced_ids": [], + } class TestTablesInsert: @@ -158,8 +191,8 @@ def test_get_by_id_conventional_path(self, client, table_repo): table_repo.get_table_by_id.return_value = SAMPLE_TABLE assert client.get(f"/api/v1/tables/{PydanticObjectId()}").status_code == 200 - def test_delete_by_id_conventional_path(self, client, table_repo): - table_repo.delete_table_by_id.return_value = DeleteResponse(num_deleted=1) + def test_delete_by_id_conventional_path(self, client, table_service): + table_service.delete_by_id.return_value = ComponentDeleteResponse(num_deleted=1) assert client.delete(f"/api/v1/tables/{PydanticObjectId()}").status_code == 200 def test_patch_by_id_conventional_path(self, client, table_repo): @@ -185,15 +218,15 @@ def test_get_by_id_calls_attachment_repo(self, client, attachment_repo): client.get(f"/api/v1/attachments/{PydanticObjectId()}") attachment_repo.get_attachment_by_id.assert_awaited_once() - def test_delete_by_id_calls_attachment_repo(self, client, attachment_repo): - attachment_repo.delete_attachment_by_id.return_value = DeleteResponse(num_deleted=1) + def test_delete_by_id_calls_attachment_service(self, client, attachment_service): + attachment_service.delete_by_id.return_value = ComponentDeleteResponse(num_deleted=1) client.delete(f"/api/v1/attachments/{PydanticObjectId()}") - attachment_repo.delete_attachment_by_id.assert_awaited_once() + attachment_service.delete_by_id.assert_awaited_once() - def test_batch_delete_calls_attachment_repo(self, client, attachment_repo): - attachment_repo.delete_attachments.return_value = DeleteResponse(num_deleted=0) + def test_batch_delete_calls_attachment_service(self, client, attachment_service): + attachment_service.delete.return_value = ComponentDeleteResponse(num_deleted=0) client.delete("/api/v1/attachments") - attachment_repo.delete_attachments.assert_awaited_once() + attachment_service.delete.assert_awaited_once() # =========================================================================== diff --git a/mpcontribs-api/tests/unit/domains/test_component_service.py b/mpcontribs-api/tests/unit/domains/test_component_service.py new file mode 100644 index 0000000000..5a67e925ff --- /dev/null +++ b/mpcontribs-api/tests/unit/domains/test_component_service.py @@ -0,0 +1,146 @@ +from unittest.mock import AsyncMock, MagicMock + +import pytest +from beanie import PydanticObjectId + +from mpcontribs_api.domains._shared.models import ComponentDeleteResponse, DeleteResponse +from mpcontribs_api.domains.attachments.models import AttachmentFilter +from mpcontribs_api.domains.attachments.service import AttachmentService +from mpcontribs_api.exceptions import NotFoundError + +pytestmark = pytest.mark.asyncio + + +def _oid() -> PydanticObjectId: + return PydanticObjectId() + + +def _make_service( + *, + candidate_ids: list[PydanticObjectId], + reachable: set[PydanticObjectId], + referenced: set[PydanticObjectId], +) -> tuple[AttachmentService, AsyncMock, AsyncMock]: + """Build an AttachmentService over mocked component + contribution repos. + + ``referenced_component_ids`` returns ``reachable`` for scoped checks (access gate) and + ``referenced`` for unscoped checks (global integrity), keyed off the ``scoped`` kwarg. + """ + components = AsyncMock(name="components") + components.list_ids = AsyncMock(return_value=candidate_ids) + components.delete_by_ids = AsyncMock(side_effect=lambda ids: DeleteResponse(num_deleted=len(ids))) + components.delete_by_id = AsyncMock(return_value=DeleteResponse(num_deleted=1)) + components._convert_object_id = MagicMock(side_effect=lambda s: PydanticObjectId(s)) + components._not_found = MagicMock(return_value="not found") + + contributions = AsyncMock(name="contributions") + + async def _referenced(ref_field, ids, *, scoped): + pool = reachable if scoped else referenced + return {i for i in ids if i in pool} + + contributions.referenced_component_ids = AsyncMock(side_effect=_referenced) + + return AttachmentService(components, contributions), components, contributions + + +# --------------------------------------------------------------------------- +# delete(filter) +# --------------------------------------------------------------------------- + + +async def test_delete_reachable_and_unreferenced_deletes_all(): + a, b = _oid(), _oid() + svc, components, contributions = _make_service( + candidate_ids=[a, b], reachable={a, b}, referenced=set() + ) + + result = await svc.delete(AttachmentFilter()) + + assert isinstance(result, ComponentDeleteResponse) + assert result.num_deleted == 2 + assert result.num_skipped == 0 + assert result.referenced_ids == [] + components.delete_by_ids.assert_awaited_once() + assert set(components.delete_by_ids.await_args.args[0]) == {a, b} + + +async def test_delete_skips_globally_referenced(): + a, b = _oid(), _oid() + svc, components, _ = _make_service(candidate_ids=[a, b], reachable={a, b}, referenced={b}) + + result = await svc.delete(AttachmentFilter()) + + assert result.num_deleted == 1 + assert result.num_skipped == 1 + assert result.referenced_ids == [b] + assert components.delete_by_ids.await_args.args[0] == [a] + + +async def test_delete_not_reachable_deletes_nothing(): + a = _oid() + svc, components, contributions = _make_service(candidate_ids=[a], reachable=set(), referenced={a}) + + result = await svc.delete(AttachmentFilter()) + + assert result.num_deleted == 0 + assert result.num_skipped == 0 + components.delete_by_ids.assert_not_awaited() + # global check is skipped once the access gate yields nothing + assert contributions.referenced_component_ids.await_count == 1 + assert contributions.referenced_component_ids.await_args.kwargs["scoped"] is True + + +async def test_delete_empty_candidate_set(): + svc, components, _ = _make_service(candidate_ids=[], reachable=set(), referenced=set()) + + result = await svc.delete(AttachmentFilter()) + + assert result.num_deleted == 0 + components.delete_by_ids.assert_not_awaited() + + +async def test_delete_checks_scoped_before_global(): + a = _oid() + svc, _, contributions = _make_service(candidate_ids=[a], reachable={a}, referenced=set()) + + await svc.delete(AttachmentFilter()) + + scoped_flags = [c.kwargs["scoped"] for c in contributions.referenced_component_ids.await_args_list] + assert scoped_flags == [True, False] + + +# --------------------------------------------------------------------------- +# delete_by_id(id) +# --------------------------------------------------------------------------- + + +async def test_delete_by_id_not_reachable_raises_not_found(): + oid = _oid() + svc, _, _ = _make_service(candidate_ids=[], reachable=set(), referenced=set()) + + with pytest.raises(NotFoundError): + await svc.delete_by_id(str(oid)) + + +async def test_delete_by_id_referenced_is_skipped(): + oid = _oid() + svc, components, _ = _make_service(candidate_ids=[], reachable={oid}, referenced={oid}) + + result = await svc.delete_by_id(str(oid)) + + assert result.num_deleted == 0 + assert result.num_skipped == 1 + assert result.referenced_ids == [oid] + components.delete_by_id.assert_not_awaited() + + +async def test_delete_by_id_reachable_and_unreferenced_deletes(): + oid = _oid() + svc, components, _ = _make_service(candidate_ids=[], reachable={oid}, referenced=set()) + + result = await svc.delete_by_id(str(oid)) + + assert result.num_deleted == 1 + assert result.num_skipped == 0 + components.delete_by_id.assert_awaited_once_with(oid) From 5593c2b96ba2ec21dad7abb728af187bef519884 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 17 Jun 2026 10:22:54 -0700 Subject: [PATCH 366/591] Added .claude/ to gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index dea1ffa5db..2b2a23208d 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,4 @@ mpcontribs-portal/supervisord.conf **/.DS_Store .venv/ .env +.claude/ From 93c4e93c12e930344da38c315b2492454b51f5ff Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 17 Jun 2026 10:54:15 -0700 Subject: [PATCH 367/591] Moved component repo and service logic into a shared service. Component-specific repos still exist to declare their document and out_model types, but have no subclass-specific logic --- .../mpcontribs_api/domains/_shared/service.py | 99 ++++++++++-- .../domains/attachments/dependencies.py | 22 ++- .../domains/attachments/repository.py | 74 --------- .../domains/attachments/router.py | 14 +- .../domains/attachments/service.py | 9 -- .../domains/contributions/service.py | 4 +- .../domains/structures/dependencies.py | 22 ++- .../domains/structures/repository.py | 106 ------------ .../domains/structures/router.py | 24 ++- .../domains/structures/service.py | 9 -- .../domains/tables/dependencies.py | 22 ++- .../domains/tables/repository.py | 107 ------------- .../mpcontribs_api/domains/tables/router.py | 24 ++- .../mpcontribs_api/domains/tables/service.py | 9 -- mpcontribs-api/tests/integration/conftest.py | 18 --- .../db/test_components_repository.py | 4 +- .../integration/test_component_routes.py | 151 ++++++++---------- .../unit/domains/test_component_service.py | 9 +- .../unit/domains/test_contribution_service.py | 40 ++--- 19 files changed, 251 insertions(+), 516 deletions(-) delete mode 100644 mpcontribs-api/src/mpcontribs_api/domains/attachments/service.py delete mode 100644 mpcontribs-api/src/mpcontribs_api/domains/structures/service.py delete mode 100644 mpcontribs-api/src/mpcontribs_api/domains/tables/service.py diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/service.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/service.py index cbe6e9bad5..f7c8d05e98 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/service.py @@ -1,18 +1,38 @@ -from typing import ClassVar +from collections.abc import AsyncIterable +from contextlib import AbstractAsyncContextManager from fastapi_filter.contrib.beanie import Filter +from pydantic import BaseModel +from pymongo.asynchronous.client_session import AsyncClientSession +from types_aiobotocore_s3 import S3Client from mpcontribs_api.domains._shared.components import MongoDbComponentsRepository -from mpcontribs_api.domains._shared.models import ComponentDeleteResponse +from mpcontribs_api.domains._shared.models import Component, ComponentDeleteResponse, DocumentOut +from mpcontribs_api.domains._shared.types import DownloadFormat, ShortMimeFormat from mpcontribs_api.domains.contributions.repository import MongoDbContributionRepository from mpcontribs_api.exceptions import NotFoundError +from mpcontribs_api.pagination import CursorParams, Page -class ComponentService[TRepo: MongoDbComponentsRepository, TFilter: Filter]: - """Service layer for shared logic for components. +class ComponentService[ + TDoc: Component, + TIn: Component, + TOut: DocumentOut, + TFilter: Filter, + TPatch: BaseModel, +]: + """Service layer for all shared component logic. - Components carry no scope of their own; a user's access is derived from the contributions - that reference them. Deletion therefore applies two gates: + Components (attachments, structures, tables) share the same access model and CRUD surface, so a + single configurable service handles every domain rather than a per-domain subclass. Each domain + is distinguished only by: + + - ``ref_field``: the field on a contribution that references this component type + (``"attachments"`` / ``"structures"`` / ``"tables"``) + - ``bucket_name``: the S3 bucket downloads are cached in (defaults to ``ref_field``) + + Reads, inserts, patches, and downloads forward to the components repository. Deletion is the only + operation with cross-repository logic, applying two gates: 1. **Access (scoped):** candidates are restricted to components reachable via a contribution in the user's scope. A component the user cannot reach is treated as not found. @@ -20,15 +40,68 @@ class ComponentService[TRepo: MongoDbComponentsRepository, TFilter: Filter]: skipped; the rest are deleted. """ - ref_field: ClassVar[str] - def __init__( self, - components: TRepo, + components: MongoDbComponentsRepository[TDoc, TIn, TOut, TFilter, TPatch], contributions: MongoDbContributionRepository, + *, + ref_field: str, + bucket_name: str | None = None, ) -> None: self._components = components self._contributions = contributions + self._ref_field = ref_field + self._bucket_name = bucket_name or ref_field + + async def get_many( + self, + filter: TFilter, + pagination: CursorParams, + fields: frozenset[str] | None, + ) -> Page[TOut]: + """Return a scoped, filtered, cursor-paginated page of components. See ``get_many``.""" + return await self._components.get_many(pagination=pagination, filter=filter, fields=fields) + + async def get_by_id(self, id: str, fields: frozenset[str] | None) -> TDoc | TOut | None: + """Find a single component by id, scoped to the current user. See ``get_component_by_id``.""" + return await self._components.get_component_by_id(id, fields) + + async def insert( + self, + components: list[TIn], + session: AsyncClientSession | None = None, + ) -> list[TDoc]: + """Bulk-insert components, deduplicated by content hash. See ``insert_components``.""" + return await self._components.insert_components(components=components, session=session) + + async def patch_by_id(self, id: str, update: TPatch) -> TDoc: + """Partially update a component by id, scoped to the current user. See ``patch_component_by_id``.""" + return await self._components.patch_component_by_id(id=id, update=update) + + async def download( + self, + format: DownloadFormat, + short_mime: ShortMimeFormat, + ignore_cache: bool, + filter: TFilter, + fields: frozenset[str] | None, + s3: AbstractAsyncContextManager[S3Client], + ) -> AsyncIterable[bytes]: + """Stream a gzip-compressed export of matching components. See ``download``. + + The S3 cache location is owned by the service: ``bucket_name`` defaults to ``ref_field`` and + ``key_name`` is currently unused. + """ + return self._components.download( + format=format, + short_mime=short_mime, + ignore_cache=ignore_cache, + filter=filter, + fields=fields, + s3=s3, + bucket_name=self._bucket_name, + key_name="", # TODO: Temp + ) async def delete(self, filter: TFilter) -> ComponentDeleteResponse: """Delete components matching ``filter`` that are reachable and globally unreferenced. @@ -41,10 +114,10 @@ async def delete(self, filter: TFilter) -> ComponentDeleteResponse: still references them """ candidate_ids = await self._components.list_ids(filter) - reachable = await self._contributions.referenced_component_ids(self.ref_field, candidate_ids, scoped=True) + reachable = await self._contributions.referenced_component_ids(self._ref_field, candidate_ids, scoped=True) if not reachable: return ComponentDeleteResponse(num_deleted=0) - referenced = await self._contributions.referenced_component_ids(self.ref_field, list(reachable), scoped=False) + referenced = await self._contributions.referenced_component_ids(self._ref_field, list(reachable), scoped=False) deletable = [cid for cid in reachable if cid not in referenced] num_deleted = (await self._components.delete_by_ids(deletable)).num_deleted if deletable else 0 return ComponentDeleteResponse( @@ -66,9 +139,9 @@ async def delete_by_id(self, id: str) -> ComponentDeleteResponse: NotFoundError: if the component is not reachable via any in-scope contribution """ oid = self._components._convert_object_id(id) - if not await self._contributions.referenced_component_ids(self.ref_field, [oid], scoped=True): + if not await self._contributions.referenced_component_ids(self._ref_field, [oid], scoped=True): raise NotFoundError(self._components._not_found(id)) - if await self._contributions.referenced_component_ids(self.ref_field, [oid], scoped=False): + if await self._contributions.referenced_component_ids(self._ref_field, [oid], scoped=False): return ComponentDeleteResponse(num_deleted=0, num_skipped=1, referenced_ids=[oid]) deleted = await self._components.delete_by_id(oid) return ComponentDeleteResponse(num_deleted=deleted.num_deleted) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/attachments/dependencies.py b/mpcontribs-api/src/mpcontribs_api/domains/attachments/dependencies.py index bbe1e2ecad..966284a52f 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/attachments/dependencies.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/attachments/dependencies.py @@ -3,20 +3,26 @@ from fastapi import Depends from mpcontribs_api.dependencies import UserDep +from mpcontribs_api.domains._shared.service import ComponentService +from mpcontribs_api.domains.attachments.models import ( + Attachment, + AttachmentFilter, + AttachmentIn, + AttachmentOut, + AttachmentPatch, +) from mpcontribs_api.domains.attachments.repository import MongoDbAttachmentRepository -from mpcontribs_api.domains.attachments.service import AttachmentService from mpcontribs_api.domains.contributions.repository import MongoDbContributionRepository - -def get_scoped_attachments(user: UserDep) -> MongoDbAttachmentRepository: - return MongoDbAttachmentRepository(user) - - -AttachmentDep = Annotated[MongoDbAttachmentRepository, Depends(get_scoped_attachments)] +AttachmentService = ComponentService[Attachment, AttachmentIn, AttachmentOut, AttachmentFilter, AttachmentPatch] def get_attachment_service(user: UserDep) -> AttachmentService: - return AttachmentService(MongoDbAttachmentRepository(user), MongoDbContributionRepository(user)) + return ComponentService( + MongoDbAttachmentRepository(user), + MongoDbContributionRepository(user), + ref_field="attachments", + ) AttachmentServiceDep = Annotated[AttachmentService, Depends(get_attachment_service)] diff --git a/mpcontribs-api/src/mpcontribs_api/domains/attachments/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/attachments/repository.py index 1769465780..6297b117f8 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/attachments/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/attachments/repository.py @@ -1,12 +1,4 @@ -from collections.abc import AsyncIterable -from contextlib import AbstractAsyncContextManager - -from pymongo.asynchronous.client_session import AsyncClientSession -from types_aiobotocore_s3 import S3Client - from mpcontribs_api.domains._shared.components import MongoDbComponentsRepository -from mpcontribs_api.domains._shared.models import DeleteResponse -from mpcontribs_api.domains._shared.types import DownloadFormat, ShortMimeFormat from mpcontribs_api.domains.attachments.models import ( Attachment, AttachmentFilter, @@ -14,7 +6,6 @@ AttachmentOut, AttachmentPatch, ) -from mpcontribs_api.pagination import CursorParams, Page class MongoDbAttachmentRepository( @@ -22,68 +13,3 @@ class MongoDbAttachmentRepository( ): document_model = Attachment out_model = AttachmentOut - - async def get_attachments( - self, - filter: AttachmentFilter, - pagination: CursorParams, - fields: frozenset[str] | None, - ) -> Page[AttachmentOut]: - """Query the attachment collection, scoped to the current user. See ``get_many``.""" - return await self.get_many(pagination=pagination, filter=filter, fields=fields) - - async def get_attachment_by_id(self, id: str, fields: frozenset[str] | None) -> Attachment | AttachmentOut | None: - """Find a single table by id, scoped to the current user. See ``get_by_id``.""" - return await self.get_component_by_id(id, fields) - - async def download_attachments( - self, - format: DownloadFormat, - short_mime: ShortMimeFormat, - ignore_cache: bool, - filter: AttachmentFilter, - fields: frozenset[str] | None, - s3: AbstractAsyncContextManager[S3Client], - ) -> AsyncIterable[bytes]: - return self.download( - format=format, - short_mime=short_mime, - ignore_cache=ignore_cache, - filter=filter, - fields=fields, - s3=s3, - bucket_name="attachments", - key_name="", - ) - - async def delete_attachments( - self, - filter: AttachmentFilter, - session: AsyncClientSession | None = None, - ) -> DeleteResponse: - """Deletes all attachments matching ``filter``. - - Args: - filter (AttachmentFilter): the query to filter attachments by - session (AsyncClientSession | None): the current session, used to guarantee transactions - - Returns: - DeleteResponse: A report of the deletion - """ - return await self.delete_components(filter=filter, session=session) - - async def delete_attachment_by_id( - self, - id: str, - session: AsyncClientSession | None = None, - ) -> DeleteResponse: - """Deletes a single attachment by Id. - - Args: - id (str): the str representation of the attachment's ObjectId - session (AsyncClientSession | None): the current session, used to guarantee transactions - - Returns: - DeleteResponse: A report of the deletion - """ - return await self.delete_component_by_id(id=id, session=session) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py b/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py index da19777979..8e4298a97e 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py @@ -12,7 +12,7 @@ ShortMimeFormat, download_filename, ) -from mpcontribs_api.domains.attachments.dependencies import AttachmentDep, AttachmentServiceDep +from mpcontribs_api.domains.attachments.dependencies import AttachmentServiceDep from mpcontribs_api.domains.attachments.models import AttachmentFilter, AttachmentOut from mpcontribs_api.pagination import CursorParams, Page @@ -21,28 +21,28 @@ @router.get("", response_model=Page[AttachmentOut]) async def get_attachments( - repo: AttachmentDep, + service: AttachmentServiceDep, pagination: Annotated[CursorParams, Depends()], filter: AttachmentFilter = FilterDepends(AttachmentFilter), fields: FieldSelector = AttachmentOut.default_fields(), ): selected = AttachmentOut.parse_fields(fields) - return await repo.get_attachments(filter=filter, fields=selected, pagination=pagination) + return await service.get_many(filter=filter, fields=selected, pagination=pagination) @router.get("/{pk}", response_model=AttachmentOut) async def get_attachment( - repo: AttachmentDep, + service: AttachmentServiceDep, pk: str, fields: FieldSelector = AttachmentOut.default_fields(), ): selected = AttachmentOut.parse_fields(fields) - return await repo.get_attachment_by_id(id=pk, fields=selected) + return await service.get_by_id(id=pk, fields=selected) @router.get("/download/{short_mime}") async def download_attachment( - repo: AttachmentDep, + service: AttachmentServiceDep, format: DownloadFormat, s3: S3Dep, short_mime: ShortMimeFormat = ShortMimeFormat.GZ, @@ -51,7 +51,7 @@ async def download_attachment( fields: FieldSelector = AttachmentOut.default_fields(), ) -> StreamingResponse: selected = AttachmentOut.parse_fields(fields) - body = await repo.download_attachments( + body = await service.download( format=format, short_mime=short_mime, ignore_cache=ignore_cache, diff --git a/mpcontribs-api/src/mpcontribs_api/domains/attachments/service.py b/mpcontribs-api/src/mpcontribs_api/domains/attachments/service.py deleted file mode 100644 index a508c1422e..0000000000 --- a/mpcontribs-api/src/mpcontribs_api/domains/attachments/service.py +++ /dev/null @@ -1,9 +0,0 @@ -from mpcontribs_api.domains._shared.service import ComponentService -from mpcontribs_api.domains.attachments.models import AttachmentFilter -from mpcontribs_api.domains.attachments.repository import MongoDbAttachmentRepository - - -class AttachmentService(ComponentService[MongoDbAttachmentRepository, AttachmentFilter]): - """Defines which field on a Contribtution to look in for the references.""" - - ref_field = "attachments" diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py index 70122f1000..dc7b1930a6 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py @@ -247,8 +247,8 @@ async def _do_insert(self, contrib: ContributionIn, session: AsyncClientSession) Components are inserted sequentially because a session is single-threaded — sharing it across concurrent awaits would corrupt the wire protocol. """ - structures = await self._structures.insert_structures(contrib.structures or [], session=session) - tables = await self._tables.insert_tables(contrib.tables or [], session=session) + structures = await self._structures.insert_components(contrib.structures or [], session=session) + tables = await self._tables.insert_components(contrib.tables or [], session=session) doc = Contribution.from_input_model(contrib) doc.structures = cast(list[Link[Structure]] | None, structures or None) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/dependencies.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/dependencies.py index 68a21c7f85..488e513146 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/structures/dependencies.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/structures/dependencies.py @@ -3,20 +3,26 @@ from fastapi import Depends from mpcontribs_api.dependencies import UserDep +from mpcontribs_api.domains._shared.service import ComponentService from mpcontribs_api.domains.contributions.repository import MongoDbContributionRepository +from mpcontribs_api.domains.structures.models import ( + Structure, + StructureFilter, + StructureIn, + StructureOut, + StructurePatch, +) from mpcontribs_api.domains.structures.repository import MongoDbStructureRepository -from mpcontribs_api.domains.structures.service import StructureService - -def get_scoped_tables(user: UserDep) -> MongoDbStructureRepository: - return MongoDbStructureRepository(user) - - -StructureDep = Annotated[MongoDbStructureRepository, Depends(get_scoped_tables)] +StructureService = ComponentService[Structure, StructureIn, StructureOut, StructureFilter, StructurePatch] def get_structure_service(user: UserDep) -> StructureService: - return StructureService(MongoDbStructureRepository(user), MongoDbContributionRepository(user)) + return ComponentService( + MongoDbStructureRepository(user), + MongoDbContributionRepository(user), + ref_field="structures", + ) StructureServiceDep = Annotated[StructureService, Depends(get_structure_service)] diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/repository.py index 6d279f79ec..ab74497850 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/structures/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/structures/repository.py @@ -1,11 +1,4 @@ -from collections.abc import AsyncIterable - -from pymongo.asynchronous.client_session import AsyncClientSession - -from mpcontribs_api.dependencies import S3Dep from mpcontribs_api.domains._shared.components import MongoDbComponentsRepository -from mpcontribs_api.domains._shared.models import DeleteResponse -from mpcontribs_api.domains._shared.types import DownloadFormat, ShortMimeFormat from mpcontribs_api.domains.structures.models import ( Structure, StructureFilter, @@ -13,7 +6,6 @@ StructureOut, StructurePatch, ) -from mpcontribs_api.pagination import CursorParams, Page class MongoDbStructureRepository( @@ -21,101 +13,3 @@ class MongoDbStructureRepository( ): document_model = Structure out_model = StructureOut - - async def insert_structures( - self, - structures: list[StructureIn], - session: AsyncClientSession | None = None, - ) -> list[Structure]: - """Bulk-insert structures, chunked to fit within a transaction's payload budget. - - Args: - structures: structures to insert - session: optional client session; pass when inserStructureIng inside a transaction - """ - return await self.insert_components(components=structures, session=session) - - async def insert_structure(self, structure: StructureIn) -> Structure: - """Insert a single structure. - - Args: - structure (StructureIn): the table to insert - - Returns: - TDpc: the structure actually in the database - - Raises: - AppError: If insert_one returns None, raises - """ - return await self.insert_component(component=structure) - - async def get_structures( - self, - filter: StructureFilter, - pagination: CursorParams, - fields: frozenset[str] | None, - ) -> Page[StructureOut]: - """Query the structure collection, scoped to the current user. See ``get_many``.""" - return await self.get_many(pagination=pagination, filter=filter, fields=fields) - - async def get_structure_by_id(self, id: str, fields: frozenset[str] | None) -> Structure | StructureOut | None: - """Find a single table by id, scoped to the current user. See ``get_by_id``.""" - return await self.get_component_by_id(id, fields) - - async def download_structures( - self, - format: DownloadFormat, - short_mime: ShortMimeFormat, - ignore_cache: bool, - filter: StructureFilter, - fields: frozenset[str] | None, - s3: S3Dep, - bucket_name: str, - key_name: str, - ) -> AsyncIterable[bytes]: - return self.download( - format=format, - short_mime=short_mime, - ignore_cache=ignore_cache, - filter=filter, - fields=fields, - s3=s3, - key_name=key_name, - bucket_name=bucket_name, - ) - - async def delete_structures( - self, - filter: StructureFilter, - session: AsyncClientSession | None = None, - ) -> DeleteResponse: - """Deletes all structures matching ``filter``. - - Args: - filter (StructureFilter): the query to filter structures by - session (AsyncClientSession | None): the current session, used to guarantee transactions - - Returns: - DeleteResponse: A report of the deletion - """ - return await self.delete_components(filter=filter, session=session) - - async def delete_structure_by_id( - self, - id: str, - session: AsyncClientSession | None = None, - ) -> DeleteResponse: - """Deletes a single structure by Id. - - Args: - id (str): the str representation of the structure's ObjectId - session (AsyncClientSession | None): the current session, used to guarantee transactions - - Returns: - DeleteResponse: A report of the deletion - """ - return await self.delete_component_by_id(id=id, session=session) - - async def patch_structure_by_id(self, id: str, update: StructurePatch) -> Structure: - """Partially update a structure by id, scoped to the current user. See ``patch``.""" - return await self.patch_component_by_id(id=id, update=update) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py index 66d77f2caa..0057c4a5d2 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py @@ -13,7 +13,7 @@ ShortMimeFormat, download_filename, ) -from mpcontribs_api.domains.structures.dependencies import StructureDep, StructureServiceDep +from mpcontribs_api.domains.structures.dependencies import StructureServiceDep from mpcontribs_api.domains.structures.models import StructureFilter, StructureIn, StructureOut, StructurePatch from mpcontribs_api.pagination import CursorParams, Page @@ -22,28 +22,28 @@ @router.get("", response_model=Page[StructureOut]) async def get_structures( - repo: StructureDep, + service: StructureServiceDep, pagination: Annotated[CursorParams, Depends()], filter: StructureFilter = FilterDepends(StructureFilter), fields: FieldSelector = StructureOut.default_fields(), ): selected = StructureOut.parse_fields(fields) - return await repo.get_structures(filter=filter, fields=selected, pagination=pagination) + return await service.get_many(filter=filter, fields=selected, pagination=pagination) @router.get("/{pk}", response_model=StructureOut) async def get_structure( - repo: StructureDep, + service: StructureServiceDep, pk: str, fields: FieldSelector = StructureOut.default_fields(), ): selected = StructureOut.parse_fields(fields) - return await repo.get_structure_by_id(id=pk, fields=selected) + return await service.get_by_id(id=pk, fields=selected) @router.get("/download/{short_mime}") async def download_structure( - repo: StructureDep, + service: StructureServiceDep, format: DownloadFormat, s3: S3Dep, short_mime: ShortMimeFormat = ShortMimeFormat.GZ, @@ -52,14 +52,12 @@ async def download_structure( fields: FieldSelector = StructureOut.default_fields(), ) -> StreamingResponse: selected = StructureOut.parse_fields(fields) - body = await repo.download_structures( + body = await service.download( format=format, short_mime=short_mime, ignore_cache=ignore_cache, filter=filter, fields=selected, - key_name="", # TODO: Temp - bucket_name="structures", s3=s3, ) filename = download_filename("structures", format, short_mime) @@ -72,10 +70,10 @@ async def download_structure( @router.post("", response_model=BulkWriteSummary[StructureOut]) async def insert_structures( - repo: StructureDep, + service: StructureServiceDep, structures: list[StructureIn], ): - return await repo.insert_structures(structures=structures) + return await service.insert(components=structures) @router.delete("", response_model=ComponentDeleteResponse) @@ -90,8 +88,8 @@ async def delete_structure_by_id(service: StructureServiceDep, id: str): @router.patch("/{id}") async def patch_structure_by_id( - repo: StructureDep, + service: StructureServiceDep, id: str, update: StructurePatch, ): - return await repo.patch_structure_by_id(id=id, update=update) + return await service.patch_by_id(id=id, update=update) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/service.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/service.py deleted file mode 100644 index 5e8336094b..0000000000 --- a/mpcontribs-api/src/mpcontribs_api/domains/structures/service.py +++ /dev/null @@ -1,9 +0,0 @@ -from mpcontribs_api.domains._shared.service import ComponentService -from mpcontribs_api.domains.structures.models import StructureFilter -from mpcontribs_api.domains.structures.repository import MongoDbStructureRepository - - -class StructureService(ComponentService[MongoDbStructureRepository, StructureFilter]): - """Defines which field on a Contribtution to look in for the references.""" - - ref_field = "structures" diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/dependencies.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/dependencies.py index a1441f836f..323a4443df 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/dependencies.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/dependencies.py @@ -3,20 +3,26 @@ from fastapi import Depends from mpcontribs_api.dependencies import UserDep +from mpcontribs_api.domains._shared.service import ComponentService from mpcontribs_api.domains.contributions.repository import MongoDbContributionRepository +from mpcontribs_api.domains.tables.models import ( + Table, + TableFilter, + TableIn, + TableOut, + TablePatch, +) from mpcontribs_api.domains.tables.repository import MongoDbTableRepository -from mpcontribs_api.domains.tables.service import TableService - -def get_scoped_tables(user: UserDep) -> MongoDbTableRepository: - return MongoDbTableRepository(user) - - -TableDep = Annotated[MongoDbTableRepository, Depends(get_scoped_tables)] +TableService = ComponentService[Table, TableIn, TableOut, TableFilter, TablePatch] def get_table_service(user: UserDep) -> TableService: - return TableService(MongoDbTableRepository(user), MongoDbContributionRepository(user)) + return ComponentService( + MongoDbTableRepository(user), + MongoDbContributionRepository(user), + ref_field="tables", + ) TableServiceDep = Annotated[TableService, Depends(get_table_service)] diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py index e9462384e2..a6bda17912 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/repository.py @@ -1,12 +1,4 @@ -from collections.abc import AsyncIterable -from contextlib import AbstractAsyncContextManager - -from pymongo.asynchronous.client_session import AsyncClientSession -from types_aiobotocore_s3 import S3Client - from mpcontribs_api.domains._shared.components import MongoDbComponentsRepository -from mpcontribs_api.domains._shared.models import DeleteResponse -from mpcontribs_api.domains._shared.types import DownloadFormat, ShortMimeFormat from mpcontribs_api.domains.tables.models import ( Table, TableFilter, @@ -14,107 +6,8 @@ TableOut, TablePatch, ) -from mpcontribs_api.pagination import CursorParams, Page class MongoDbTableRepository(MongoDbComponentsRepository[Table, TableIn, TableOut, TableFilter, TablePatch]): document_model = Table out_model = TableOut - - async def insert_tables( - self, - tables: list[TableIn], - session: AsyncClientSession | None = None, - ) -> list[Table]: - """Bulk-insert tables, chunked to fit within a transaction's payload budget. - - Args: - tables: tables to insert - session: optional client session; pass when inserTableIng inside a transaction - """ - return await self.insert_components(components=tables, session=session) - - async def insert_table(self, table: TableIn) -> Table: - """Insert a single table. - - Args: - table (TableIn): the table to insert - - Returns: - TDpc: the table actually in the database - - Raises: - AppError: If insert_one returns None, raises - """ - return await self.insert_component(component=table) - - async def get_tables( - self, - filter: TableFilter, - pagination: CursorParams, - fields: frozenset[str] | None, - ) -> Page[TableOut]: - """Query the table collection, scoped to the current user. See ``get_many``.""" - return await self.get_many(pagination=pagination, filter=filter, fields=fields) - - async def get_table_by_id(self, id: str, fields: frozenset[str] | None) -> Table | TableOut | None: - """Find a single table by id, scoped to the current user. See ``get_by_id``.""" - return await self.get_component_by_id(id, fields) - - async def download_tables( - self, - format: DownloadFormat, - short_mime: ShortMimeFormat, - ignore_cache: bool, - filter: TableFilter, - fields: frozenset[str] | None, - s3: AbstractAsyncContextManager[S3Client], - bucket_name: str, - key_name: str, - ) -> AsyncIterable[bytes]: - return self.download( - format=format, - short_mime=short_mime, - ignore_cache=ignore_cache, - filter=filter, - fields=fields, - s3=s3, - bucket_name=bucket_name, - key_name=key_name, - ) - - async def delete_tables( - self, - filter: TableFilter, - session: AsyncClientSession | None = None, - ) -> DeleteResponse: - """Deletes all tables matching ``filter``. - - Args: - filter (TableFilter): the query to filter tables by - session (AsyncClientSession | None): the current session, used to guarantee transactions - - Returns: - DeleteResponse: A report of the deletion - """ - return await self.delete_components(filter=filter, session=session) - - async def delete_table_by_id( - self, - id: str, - session: AsyncClientSession | None = None, - ) -> DeleteResponse: - """Deletes a single table by Id. - - Args: - id (str): the str representation of the table's ObjectId - session (AsyncClientSession | None): the current session, used to guarantee transactions - - Returns: - DeleteResponse: A report of the deletion - """ - return await self.delete_component_by_id(id=id, session=session) - - async def patch_table_by_id(self, id: str, update: TablePatch) -> Table: - """Partially update a table by id, scoped to the current user. See ``patch``.""" - return await self.patch_component_by_id(id=id, update=update) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py index 9239c78a0a..505f021eff 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py @@ -13,7 +13,7 @@ ShortMimeFormat, download_filename, ) -from mpcontribs_api.domains.tables.dependencies import TableDep, TableServiceDep +from mpcontribs_api.domains.tables.dependencies import TableServiceDep from mpcontribs_api.domains.tables.models import Table, TableFilter, TableIn, TableOut, TablePatch from mpcontribs_api.pagination import CursorParams, Page @@ -22,28 +22,28 @@ @router.get("", response_model=Page[TableOut]) async def get_tables( - repo: TableDep, + service: TableServiceDep, pagination: Annotated[CursorParams, Depends()], filter: TableFilter = FilterDepends(TableFilter), fields: FieldSelector = TableOut.default_fields(), ): selected = TableOut.parse_fields(fields) - return await repo.get_tables(filter=filter, fields=selected, pagination=pagination) + return await service.get_many(filter=filter, fields=selected, pagination=pagination) @router.get("/{pk}", response_model=TableOut) async def get_table( - repo: TableDep, + service: TableServiceDep, pk: str, fields: FieldSelector = TableOut.default_fields(), ): selected = TableOut.parse_fields(fields) - return await repo.get_table_by_id(id=pk, fields=selected) + return await service.get_by_id(id=pk, fields=selected) @router.get("/download/{short_mime}") async def download_table( - repo: TableDep, + service: TableServiceDep, s3: S3Dep, format: DownloadFormat, short_mime: ShortMimeFormat = ShortMimeFormat.GZ, @@ -52,15 +52,13 @@ async def download_table( fields: FieldSelector = TableOut.default_fields(), ) -> StreamingResponse: selected = TableOut.parse_fields(fields) - body = await repo.download_tables( + body = await service.download( format=format, short_mime=short_mime, ignore_cache=ignore_cache, filter=filter, fields=selected, s3=s3, - bucket_name="tables", - key_name="", # TODO: Temp ) filename = download_filename("tables", format, short_mime) return StreamingResponse( @@ -72,10 +70,10 @@ async def download_table( @router.post("", response_model=BulkWriteSummary[Table]) async def insert_tables( - repo: TableDep, + service: TableServiceDep, tables: list[TableIn], ): - return await repo.insert_tables(tables=tables) + return await service.insert(components=tables) @router.delete("", response_model=ComponentDeleteResponse) @@ -90,8 +88,8 @@ async def delete_table_by_id(service: TableServiceDep, id: str): @router.patch("/{id}") async def patch_table_by_id( - repo: TableDep, + service: TableServiceDep, id: str, update: TablePatch, ): - return await repo.patch_table_by_id(id=id, update=update) + return await service.patch_by_id(id=id, update=update) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/service.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/service.py deleted file mode 100644 index d6784c61d0..0000000000 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/service.py +++ /dev/null @@ -1,9 +0,0 @@ -from mpcontribs_api.domains._shared.service import ComponentService -from mpcontribs_api.domains.tables.models import TableFilter -from mpcontribs_api.domains.tables.repository import MongoDbTableRepository - - -class TableService(ComponentService[MongoDbTableRepository, TableFilter]): - """Defines which field on a Contribtution to look in for the references.""" - - ref_field = "tables" diff --git a/mpcontribs-api/tests/integration/conftest.py b/mpcontribs-api/tests/integration/conftest.py index db15f2fa3a..1ee624cca0 100644 --- a/mpcontribs-api/tests/integration/conftest.py +++ b/mpcontribs-api/tests/integration/conftest.py @@ -117,24 +117,6 @@ def mock_contribution_repo() -> AsyncMock: return AsyncMock() -@pytest.fixture -def mock_structure_repo() -> AsyncMock: - """Fully async mock of MongoDbStructureRepository.""" - return AsyncMock() - - -@pytest.fixture -def mock_table_repo() -> AsyncMock: - """Fully async mock of MongoDbTableRepository.""" - return AsyncMock() - - -@pytest.fixture -def mock_attachment_repo() -> AsyncMock: - """Fully async mock of MongoDbAttachmentRepository.""" - return AsyncMock() - - @pytest.fixture def mock_contribution_service() -> AsyncMock: """Fully async mock of ContributionService.""" diff --git a/mpcontribs-api/tests/integration/db/test_components_repository.py b/mpcontribs-api/tests/integration/db/test_components_repository.py index 96ad7bcd51..5639553c9d 100644 --- a/mpcontribs-api/tests/integration/db/test_components_repository.py +++ b/mpcontribs-api/tests/integration/db/test_components_repository.py @@ -156,13 +156,15 @@ class TestComponentDownload: async def test_jsonl_download_round_trips(self, db): """Component downloads stream a decompressable gzip of all rows.""" await _repo().insert_components([_attachment("a" * 32), _attachment("b" * 32)]) - stream = await _repo().download_attachments( + stream = _repo().download( format=DownloadFormat.JSONL, short_mime=ShortMimeFormat.GZ, ignore_cache=True, filter=AttachmentFilter(), fields=None, s3=MagicMock(), + bucket_name="attachments", + key_name="", ) chunks = [c async for c in stream] decompressed = gzip.decompress(b"".join(chunks)) diff --git a/mpcontribs-api/tests/integration/test_component_routes.py b/mpcontribs-api/tests/integration/test_component_routes.py index abee2bd829..09ecdfece2 100644 --- a/mpcontribs-api/tests/integration/test_component_routes.py +++ b/mpcontribs-api/tests/integration/test_component_routes.py @@ -4,42 +4,19 @@ from beanie import PydanticObjectId from mpcontribs_api.domains._shared.models import ComponentDeleteResponse -from mpcontribs_api.domains.attachments.dependencies import get_attachment_service, get_scoped_attachments -from mpcontribs_api.domains.structures.dependencies import get_scoped_tables as get_scoped_structures +from mpcontribs_api.domains.attachments.dependencies import get_attachment_service from mpcontribs_api.domains.structures.dependencies import get_structure_service from mpcontribs_api.domains.structures.models import StructureOut -from mpcontribs_api.domains.tables.dependencies import get_scoped_tables, get_table_service +from mpcontribs_api.domains.tables.dependencies import get_table_service from mpcontribs_api.domains.tables.models import TableOut from mpcontribs_api.pagination import Page # --------------------------------------------------------------------------- -# Fixtures: inject mock repos per domain +# Fixtures: every component endpoint routes through the unified ComponentService, +# so each domain has a single mock service override. # --------------------------------------------------------------------------- -@pytest.fixture -def structure_repo(test_app, mock_structure_repo): - test_app.dependency_overrides[get_scoped_structures] = lambda: mock_structure_repo - yield mock_structure_repo - test_app.dependency_overrides.pop(get_scoped_structures, None) - - -@pytest.fixture -def table_repo(test_app, mock_table_repo): - test_app.dependency_overrides[get_scoped_tables] = lambda: mock_table_repo - yield mock_table_repo - test_app.dependency_overrides.pop(get_scoped_tables, None) - - -@pytest.fixture -def attachment_repo(test_app, mock_attachment_repo): - test_app.dependency_overrides[get_scoped_attachments] = lambda: mock_attachment_repo - yield mock_attachment_repo - test_app.dependency_overrides.pop(get_scoped_attachments, None) - - -# Delete endpoints route through the component service (not the repo), so they are -# overridden separately from the read/insert/patch endpoints above. @pytest.fixture def structure_service(test_app): mock = AsyncMock() @@ -74,31 +51,31 @@ def attachment_service(test_app): class TestStructuresList: - def test_empty_page_returns_200(self, client, structure_repo): - structure_repo.get_structures.return_value = Page(items=[], next_cursor=None) + def test_empty_page_returns_200(self, client, structure_service): + structure_service.get_many.return_value = Page(items=[], next_cursor=None) assert client.get("/api/v1/structures").status_code == 200 - def test_page_shape(self, client, structure_repo): - structure_repo.get_structures.return_value = Page(items=[SAMPLE_STRUCTURE], next_cursor="c") + def test_page_shape(self, client, structure_service): + structure_service.get_many.return_value = Page(items=[SAMPLE_STRUCTURE], next_cursor="c") body = client.get("/api/v1/structures").json() assert "items" in body assert body["next_cursor"] == "c" - def test_repo_called_with_pagination(self, client, structure_repo): - structure_repo.get_structures.return_value = Page(items=[], next_cursor=None) + def test_service_called_with_pagination(self, client, structure_service): + structure_service.get_many.return_value = Page(items=[], next_cursor=None) client.get("/api/v1/structures?limit=5") - kwargs = structure_repo.get_structures.call_args.kwargs + kwargs = structure_service.get_many.call_args.kwargs assert kwargs["pagination"].limit == 5 - def test_invalid_fields_returns_422(self, client, structure_repo): - structure_repo.get_structures.return_value = Page(items=[], next_cursor=None) + def test_invalid_fields_returns_422(self, client, structure_service): + structure_service.get_many.return_value = Page(items=[], next_cursor=None) assert client.get("/api/v1/structures?_fields=not_a_field").status_code == 422 - def test_valid_fields_forwarded(self, client, structure_repo): - structure_repo.get_structures.return_value = Page(items=[], next_cursor=None) + def test_valid_fields_forwarded(self, client, structure_service): + structure_service.get_many.return_value = Page(items=[], next_cursor=None) client.get("/api/v1/structures?_fields=name") # parse_fields always includes the id identity field. - assert structure_repo.get_structures.call_args.kwargs["fields"] == frozenset({"id", "name"}) + assert structure_service.get_many.call_args.kwargs["fields"] == frozenset({"id", "name"}) class TestStructuresDelete: @@ -115,34 +92,34 @@ def test_service_delete_called(self, client, structure_service): class TestStructuresInsert: - def test_post_route_exists(self, client, structure_repo): - # Empty body -> handler invoked; repo returns a summary-shaped object. - structure_repo.insert_structures.return_value = {"total": 0, "succeeded": [], "failed": []} + def test_post_route_exists(self, client, structure_service): + # Empty body -> handler invoked; service returns a summary-shaped object. + structure_service.insert.return_value = {"total": 0, "succeeded": [], "failed": []} r = client.post("/api/v1/structures", json=[]) assert r.status_code != 404 - def test_post_forwards_to_repo(self, client, structure_repo): - structure_repo.insert_structures.return_value = {"total": 0, "succeeded": [], "failed": []} + def test_post_forwards_to_service(self, client, structure_service): + structure_service.insert.return_value = {"total": 0, "succeeded": [], "failed": []} client.post("/api/v1/structures", json=[]) - structure_repo.insert_structures.assert_awaited_once() + structure_service.insert.assert_awaited_once() class TestStructuresByIdRouting: - def test_get_by_id_conventional_path(self, client, structure_repo): - structure_repo.get_structure_by_id.return_value = SAMPLE_STRUCTURE + def test_get_by_id_conventional_path(self, client, structure_service): + structure_service.get_by_id.return_value = SAMPLE_STRUCTURE assert client.get(f"/api/v1/structures/{PydanticObjectId()}").status_code == 200 def test_delete_by_id_conventional_path(self, client, structure_service): structure_service.delete_by_id.return_value = ComponentDeleteResponse(num_deleted=1) assert client.delete(f"/api/v1/structures/{PydanticObjectId()}").status_code == 200 - def test_patch_by_id_conventional_path(self, client, structure_repo): - structure_repo.patch_structure_by_id.return_value = SAMPLE_STRUCTURE + def test_patch_by_id_conventional_path(self, client, structure_service): + structure_service.patch_by_id.return_value = SAMPLE_STRUCTURE r = client.patch(f"/api/v1/structures/{PydanticObjectId()}", json={"name": "renamed"}) assert r.status_code == 200 - def test_download_conventional_path(self, client, structure_repo): - structure_repo.download_structures.return_value = iter([b"x"]) + def test_download_conventional_path(self, client, structure_service): + structure_service.download.return_value = iter([b"x"]) assert client.get("/api/v1/structures/download/gz?format=csv").status_code == 200 @@ -152,20 +129,20 @@ def test_download_conventional_path(self, client, structure_repo): class TestTablesList: - def test_empty_page_returns_200(self, client, table_repo): - table_repo.get_tables.return_value = Page(items=[], next_cursor=None) + def test_empty_page_returns_200(self, client, table_service): + table_service.get_many.return_value = Page(items=[], next_cursor=None) assert client.get("/api/v1/tables").status_code == 200 - def test_page_shape(self, client, table_repo): - table_repo.get_tables.return_value = Page(items=[SAMPLE_TABLE], next_cursor=None) + def test_page_shape(self, client, table_service): + table_service.get_many.return_value = Page(items=[SAMPLE_TABLE], next_cursor=None) assert "items" in client.get("/api/v1/tables").json() - def test_invalid_fields_returns_422(self, client, table_repo): - table_repo.get_tables.return_value = Page(items=[], next_cursor=None) + def test_invalid_fields_returns_422(self, client, table_service): + table_service.get_many.return_value = Page(items=[], next_cursor=None) assert client.get("/api/v1/tables?_fields=nope").status_code == 422 - def test_default_fields_accepted(self, client, table_repo): - table_repo.get_tables.return_value = Page(items=[], next_cursor=None) + def test_default_fields_accepted(self, client, table_service): + table_service.get_many.return_value = Page(items=[], next_cursor=None) assert client.get("/api/v1/tables").status_code == 200 @@ -180,43 +157,43 @@ def test_batch_delete_returns_200(self, client, table_service): class TestTablesInsert: - def test_post_forwards_to_repo(self, client, table_repo): - table_repo.insert_tables.return_value = {"total": 0, "succeeded": [], "failed": []} + def test_post_forwards_to_service(self, client, table_service): + table_service.insert.return_value = {"total": 0, "succeeded": [], "failed": []} client.post("/api/v1/tables", json=[]) - table_repo.insert_tables.assert_awaited_once() + table_service.insert.assert_awaited_once() class TestTablesByIdRouting: - def test_get_by_id_conventional_path(self, client, table_repo): - table_repo.get_table_by_id.return_value = SAMPLE_TABLE + def test_get_by_id_conventional_path(self, client, table_service): + table_service.get_by_id.return_value = SAMPLE_TABLE assert client.get(f"/api/v1/tables/{PydanticObjectId()}").status_code == 200 def test_delete_by_id_conventional_path(self, client, table_service): table_service.delete_by_id.return_value = ComponentDeleteResponse(num_deleted=1) assert client.delete(f"/api/v1/tables/{PydanticObjectId()}").status_code == 200 - def test_patch_by_id_conventional_path(self, client, table_repo): - table_repo.patch_table_by_id.return_value = SAMPLE_TABLE + def test_patch_by_id_conventional_path(self, client, table_service): + table_service.patch_by_id.return_value = SAMPLE_TABLE r = client.patch(f"/api/v1/tables/{PydanticObjectId()}", json={"name": "x"}) assert r.status_code == 200 # =========================================================================== -# ATTACHMENTS (RED: router is a copy of structures, wrong repo + methods) +# ATTACHMENTS # =========================================================================== class TestAttachmentsRouterWiring: - def test_list_calls_attachment_repo(self, client, attachment_repo): - attachment_repo.get_attachments.return_value = Page(items=[], next_cursor=None) + def test_list_calls_attachment_service(self, client, attachment_service): + attachment_service.get_many.return_value = Page(items=[], next_cursor=None) r = client.get("/api/v1/attachments") assert r.status_code == 200 - attachment_repo.get_attachments.assert_awaited_once() + attachment_service.get_many.assert_awaited_once() - def test_get_by_id_calls_attachment_repo(self, client, attachment_repo): - attachment_repo.get_attachment_by_id.return_value = None + def test_get_by_id_calls_attachment_service(self, client, attachment_service): + attachment_service.get_by_id.return_value = None client.get(f"/api/v1/attachments/{PydanticObjectId()}") - attachment_repo.get_attachment_by_id.assert_awaited_once() + attachment_service.get_by_id.assert_awaited_once() def test_delete_by_id_calls_attachment_service(self, client, attachment_service): attachment_service.delete_by_id.return_value = ComponentDeleteResponse(num_deleted=1) @@ -234,23 +211,23 @@ def test_batch_delete_calls_attachment_service(self, client, attachment_service) # # Parametrised over the three component resources so download behavior is held # to the same contract everywhere. Each entry is -# (url_prefix, repo_fixture_name, download_method, expected_stem). +# (url_prefix, service_fixture_name, expected_stem). # =========================================================================== _DOWNLOAD_CASES = [ - ("structures", "structure_repo", "download_structures", "structures"), - ("tables", "table_repo", "download_tables", "tables"), - ("attachments", "attachment_repo", "download_attachments", "attachments"), + ("structures", "structure_service", "structures"), + ("tables", "table_service", "tables"), + ("attachments", "attachment_service", "attachments"), ] @pytest.fixture def download_target(request): - """Resolve a (prefix, repo, method_name, stem) case into a wired repo mock.""" - prefix, repo_fixture, method, stem = request.param - repo = request.getfixturevalue(repo_fixture) - getattr(repo, method).return_value = iter([b"x"]) - return prefix, repo, method, stem + """Resolve a (prefix, service_fixture, stem) case into a wired service mock.""" + prefix, service_fixture, stem = request.param + service = request.getfixturevalue(service_fixture) + service.download.return_value = iter([b"x"]) + return prefix, service, stem @pytest.mark.parametrize("download_target", _DOWNLOAD_CASES, indirect=True) @@ -264,8 +241,8 @@ def test_jsonl_returns_200(self, client, download_target): assert client.get(f"/api/v1/{prefix}/download/gz?format=jsonl").status_code == 200 def test_body_is_streamed_bytes(self, client, download_target): - prefix, repo, method, _ = download_target - getattr(repo, method).return_value = iter([b"ab", b"cd"]) + prefix, service, _ = download_target + service.download.return_value = iter([b"ab", b"cd"]) assert client.get(f"/api/v1/{prefix}/download/gz?format=jsonl").content == b"abcd" def test_format_is_required(self, client, download_target): @@ -281,10 +258,10 @@ def test_invalid_format_returns_422(self, client, download_target): prefix, *_ = download_target assert client.get(f"/api/v1/{prefix}/download/gz?format=xml").status_code == 422 - def test_format_forwarded_to_repo(self, client, download_target): - prefix, repo, method, _ = download_target + def test_format_forwarded_to_service(self, client, download_target): + prefix, service, _ = download_target client.get(f"/api/v1/{prefix}/download/gz?format=csv") - assert getattr(repo, method).call_args.kwargs["format"] == "csv" + assert service.download.call_args.kwargs["format"] == "csv" def test_csv_filename_uses_csv_extension(self, client, download_target): """A CSV download is named *.csv.gz, matching the requested format.""" diff --git a/mpcontribs-api/tests/unit/domains/test_component_service.py b/mpcontribs-api/tests/unit/domains/test_component_service.py index 5a67e925ff..090716b402 100644 --- a/mpcontribs-api/tests/unit/domains/test_component_service.py +++ b/mpcontribs-api/tests/unit/domains/test_component_service.py @@ -4,8 +4,8 @@ from beanie import PydanticObjectId from mpcontribs_api.domains._shared.models import ComponentDeleteResponse, DeleteResponse +from mpcontribs_api.domains._shared.service import ComponentService from mpcontribs_api.domains.attachments.models import AttachmentFilter -from mpcontribs_api.domains.attachments.service import AttachmentService from mpcontribs_api.exceptions import NotFoundError pytestmark = pytest.mark.asyncio @@ -20,8 +20,8 @@ def _make_service( candidate_ids: list[PydanticObjectId], reachable: set[PydanticObjectId], referenced: set[PydanticObjectId], -) -> tuple[AttachmentService, AsyncMock, AsyncMock]: - """Build an AttachmentService over mocked component + contribution repos. +) -> tuple[ComponentService, AsyncMock, AsyncMock]: + """Build a ComponentService over mocked component + contribution repos. ``referenced_component_ids`` returns ``reachable`` for scoped checks (access gate) and ``referenced`` for unscoped checks (global integrity), keyed off the ``scoped`` kwarg. @@ -41,7 +41,8 @@ async def _referenced(ref_field, ids, *, scoped): contributions.referenced_component_ids = AsyncMock(side_effect=_referenced) - return AttachmentService(components, contributions), components, contributions + service = ComponentService(components, contributions, ref_field="attachments") + return service, components, contributions # --------------------------------------------------------------------------- diff --git a/mpcontribs-api/tests/unit/domains/test_contribution_service.py b/mpcontribs-api/tests/unit/domains/test_contribution_service.py index e2943e9412..69720ecbc0 100644 --- a/mpcontribs-api/tests/unit/domains/test_contribution_service.py +++ b/mpcontribs-api/tests/unit/domains/test_contribution_service.py @@ -224,7 +224,7 @@ async def test_oversize_contribution_goes_to_failures_without_db(self): assert summary.failed[0].index == 1 assert summary.failed[0].error_code == "validation_error" # Oversize never reached the component repo - struct_repo.insert_structures.assert_not_called() + struct_repo.insert_components.assert_not_called() # And the in-pool contribution did go through the no-component fast path contrib_repo.insert_many_contributions.assert_called_once() @@ -290,9 +290,9 @@ class TestInsertContributionsTransactionPath: async def test_with_components_opens_session_per_contribution(self): svc, contrib_repo, struct_repo, table_repo, attach_repo, client = _make_service() - struct_repo.insert_structures.return_value = [_fake_structure()] - table_repo.insert_tables.return_value = [] - attach_repo.insert_attachments.return_value = [] + struct_repo.insert_components.return_value = [_fake_structure()] + table_repo.insert_components.return_value = [] + attach_repo.insert_components.return_value = [] async def _insert(doc, session=None): return doc @@ -311,8 +311,8 @@ async def test_session_threaded_to_all_repo_calls(self): client, session = _make_fake_client() svc, contrib_repo, struct_repo, table_repo, _, _ = _make_service(client=client) - struct_repo.insert_structures.return_value = [_fake_structure()] - table_repo.insert_tables.return_value = [_fake_table()] + struct_repo.insert_components.return_value = [_fake_structure()] + table_repo.insert_components.return_value = [_fake_table()] async def _insert(doc, session=None): return doc @@ -325,16 +325,16 @@ async def _insert(doc, session=None): attachments=[_attachment_in()], ) await svc.insert_contributions([contrib]) - assert struct_repo.insert_structures.call_args.kwargs["session"] is session - assert table_repo.insert_tables.call_args.kwargs["session"] is session + assert struct_repo.insert_components.call_args.kwargs["session"] is session + assert table_repo.insert_components.call_args.kwargs["session"] is session assert contrib_repo.insert_contribution.call_args.kwargs["session"] is session async def test_failure_on_second_of_three_yields_summary(self): svc, contrib_repo, struct_repo, table_repo, attach_repo, _ = _make_service() - struct_repo.insert_structures.return_value = [_fake_structure()] - table_repo.insert_tables.return_value = [] - attach_repo.insert_attachments.return_value = [] + struct_repo.insert_components.return_value = [_fake_structure()] + table_repo.insert_components.return_value = [] + attach_repo.insert_components.return_value = [] async def _insert(doc, session=None): # Fail the second contribution by inspecting the doc identifier @@ -362,9 +362,9 @@ async def test_component_links_wired_per_contribution(self): struct_a, struct_b = _fake_structure(), _fake_structure() struct_calls = iter([[struct_a], [struct_b]]) - struct_repo.insert_structures.side_effect = lambda *_args, **_kwargs: next(struct_calls) - table_repo.insert_tables.return_value = [] - attach_repo.insert_attachments.return_value = [] + struct_repo.insert_components.side_effect = lambda *_args, **_kwargs: next(struct_calls) + table_repo.insert_components.return_value = [] + attach_repo.insert_components.return_value = [] captured: list[Contribution] = [] @@ -394,9 +394,9 @@ class TestInsertContributionsMixedBatch: async def test_mixed_batch_routes_correctly(self): svc, contrib_repo, struct_repo, table_repo, attach_repo, client = _make_service() - struct_repo.insert_structures.return_value = [_fake_structure()] - table_repo.insert_tables.return_value = [] - attach_repo.insert_attachments.return_value = [] + struct_repo.insert_components.return_value = [_fake_structure()] + table_repo.insert_components.return_value = [] + attach_repo.insert_components.return_value = [] contrib_repo.insert_many_contributions.return_value = None async def _insert(doc, session=None): @@ -581,9 +581,9 @@ async def test_same_key_concurrent_upserts_both_go_through_atomic_call(self): # write_slots = asyncio.Semaphore(1) # svc, contrib_repo, struct_repo, table_repo, attach_repo, _ = _make_service(write_slots=write_slots) -# struct_repo.insert_structures.return_value = [_fake_structure()] -# table_repo.insert_tables.return_value = [] -# attach_repo.insert_attachments.return_value = [] +# struct_repo.insert_components.return_value = [_fake_structure()] +# table_repo.insert_components.return_value = [] +# attach_repo.insert_components.return_value = [] # in_flight = 0 # peak = 0 From 787a0341b6fa16a2b020b8b8712ab102f7bb5fa5 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 17 Jun 2026 11:40:14 -0700 Subject: [PATCH 368/591] Added download tests, removed config test raising on creating Settings empty - we have defaults now --- .../test_shared_repository_download.py | 36 ++++++++++++------- mpcontribs-api/tests/unit/test_config.py | 6 ---- 2 files changed, 23 insertions(+), 19 deletions(-) diff --git a/mpcontribs-api/tests/unit/domains/test_shared_repository_download.py b/mpcontribs-api/tests/unit/domains/test_shared_repository_download.py index 8f87b219f8..b32417ef32 100644 --- a/mpcontribs-api/tests/unit/domains/test_shared_repository_download.py +++ b/mpcontribs-api/tests/unit/domains/test_shared_repository_download.py @@ -201,26 +201,36 @@ async def test_dict_value_serialized_as_json(self): class TestGetSerializer: - def test_jsonl_returns_jsonl_serializer(self): + @pytest.mark.parametrize("format", list(DownloadFormat)) + async def test_every_format_dispatches_to_a_usable_serializer(self, format: DownloadFormat): + """Every ``DownloadFormat`` member maps to a serializer of the expected shape. + + ``_get_serializer`` has no default case, so an unhandled member would silently + return ``None``. Parametrizing over every member guarantees the match stays + exhaustive: adding a format without a matching case fails here rather than at + request time. The returned object is uniformly a callable taking the row stream + and yielding ``bytes``, regardless of which format produced it. + """ + repo = _repo() + serializer = repo._get_serializer(format, None) + assert callable(serializer) + raw = await _collect(serializer(_aiter([_Out(a=1, b="x")]))) + assert isinstance(raw, bytes) and raw + + async def test_jsonl_dispatches_to_jsonl_output(self): repo = _repo() - assert repo._get_serializer(DownloadFormat.JSONL, None) is MongoDbRepository._serialize_jsonl + serializer = repo._get_serializer(DownloadFormat.JSONL, None) + raw = await _collect(serializer(_aiter([_Out(a=1, b="x")]))) + assert json.loads(raw) == {"a": 1, "b": "x"} - async def test_csv_serializer_is_callable_and_serializes(self): + async def test_csv_dispatches_to_csv_output_and_threads_fields(self): + # The fields passed to _get_serializer must reach the CSV serializer: 'b' is + # dropped because only 'a' was requested. repo = _repo() serializer = repo._get_serializer(DownloadFormat.CSV, frozenset({"a"})) raw = await _collect(serializer(_aiter([_Out(a=1, b="x")]))) assert _parse_csv(raw) == [{"a": "1"}] - def test_enum_rejects_arbitrary_string(self): - """Arbitrary strings can't reach _get_serializer: the StrEnum rejects them. - - ``_get_serializer`` takes a ``DownloadFormat``, and the enum refuses any value - outside its members at construction time, so an unsupported format is stopped - at the type boundary rather than falling through to a None serializer. - """ - with pytest.raises(ValueError): - DownloadFormat("xml") - # =========================================================================== # _hash_payload diff --git a/mpcontribs-api/tests/unit/test_config.py b/mpcontribs-api/tests/unit/test_config.py index 3db14f7685..fe88f30076 100644 --- a/mpcontribs-api/tests/unit/test_config.py +++ b/mpcontribs-api/tests/unit/test_config.py @@ -152,12 +152,6 @@ def test_invalid_environment_raises(self, monkeypatch): with pytest.raises(PydanticValidationError): Settings() - def test_missing_required_env_raises(self, monkeypatch): - for key in REQUIRED_ENV: - monkeypatch.delenv(key, raising=False) - with pytest.raises(PydanticValidationError): - Settings() - # --------------------------------------------------------------------------- # get_settings caching From 6b899f04bcfca4502ebc7d76f746d2364df74774 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 17 Jun 2026 11:49:48 -0700 Subject: [PATCH 369/591] Reverted non-API changes to master versions --- .../mpcontribs/ingester/cli.py | 4 +- .../mpcontribs/ingester/webui.py | 11 +- .../mpcontribs/io/core/components/tdata.py | 2 +- mpcontribs-io/mpcontribs/io/core/utils.py | 5 +- mpcontribs-kernel-gateway/make_seed.py | 1 + mpcontribs-lux/mpcontribs/lux/autogen.py | 4 +- .../lux/projects/alab/schemas/base.py | 2 +- .../esoteric_ephemera/test_schemas.py | 1 + mpcontribs-portal/maintenance.py | 10 +- .../mpcontribs/portal/middleware.py | 3 +- mpcontribs-portal/mpcontribs/portal/urls.py | 4 +- mpcontribs-portal/mpcontribs/portal/views.py | 10 +- .../users/als_beamline/scripts/__main__.py | 3 +- .../als_beamline/scripts/translate_PyPt.py | 3 + .../dilute_solute_diffusion/pre_submission.py | 10 +- .../users/martin_lab/martin_lab.ipynb | 2 +- .../mpcontribs/users/qmcdb/main/views.py | 5 +- .../mpcontribs/users/qmcdb/records/views.py | 7 +- .../users/redox_thermo_csp/pre_submission.py | 9 +- .../redox_thermo_csp/update_energy_data.py | 3 +- .../screening_inorganic_pv/pre_submission.py | 8 +- .../mpcontribs/users/swf/pre_submission.py | 8 +- mpcontribs-portal/mpcontribs/users/utils.py | 8 +- .../2dmatpedia.ipynb | 96 +++--- .../Broberg_benchmark_defects.ipynb | 165 ++++++---- .../ExpXAS.ipynb | 74 +++-- .../ForbiddenTransitions.ipynb | 164 +++------- .../HFP2023.ipynb | 72 ++--- .../MnO2_phase_selection.ipynb | 79 +++-- .../attachments.ipynb | 18 +- .../bioi_defects.ipynb | 32 +- .../contribs.materialsproject.org/cards.ipynb | 28 +- .../carrier_transport.ipynb | 232 +++++++-------- .../defect_genome_pcfc_materials.ipynb | 70 ++--- .../deltaHvacancy.ipynb | 62 ++-- .../dilute_solute_diffusion.ipynb | 93 ++---- .../download.ipynb | 21 +- .../contribs.materialsproject.org/dtu.ipynb | 51 ++-- .../ediffcrystalprediction.ipynb | 29 +- .../esters.ipynb | 27 +- .../experimental_thermo.ipynb | 281 ++++++++---------- .../experimental_thermoelectrics.ipynb | 152 ++-------- .../ferroelectrics.ipynb | 169 +++++------ .../contribs.materialsproject.org/gbdb.ipynb | 32 +- .../get_started.ipynb | 74 ++--- .../intermatch.ipynb | 9 +- .../ion_ref_data.ipynb | 117 +++----- .../jarvis_dft.ipynb | 77 +++-- .../jarvis_dft_2023.ipynb | 156 +++++----- .../matscholar.ipynb | 33 +- .../melting_points.ipynb | 22 +- .../mg_cathode_screening_2022.ipynb | 252 +++++++--------- .../mofexplorer.ipynb | 14 +- .../ocp/ocp-update.ipynb | 13 +- .../ocp/ocp-upload.ipynb | 30 +- .../open_catalyst_project.ipynb | 59 ++-- .../perovskites_diffusion.ipynb | 21 +- .../pycroscopy.ipynb | 57 ++-- .../pydatarecognition.ipynb | 53 ++-- .../qsgw_band_structures.ipynb | 164 +++++----- .../screening_inorganic_pv.ipynb | 20 +- .../silicon_defects.ipynb | 44 ++- .../simple_test.ipynb | 108 ++++--- .../springer_materials.ipynb | 43 ++- .../contribs.materialsproject.org/swf.ipynb | 24 +- .../transparent_conductors.ipynb | 141 ++++----- .../genesis_efrc_minipipes.ipynb | 32 +- .../get_started.ipynb | 171 ++++++----- .../ml.materialsproject.org/get_started.ipynb | 123 ++++---- mpcontribs-portal/supervisord/conf.py | 2 +- mpcontribs-portal/wsgi.py | 1 + mpcontribs-serverless/make_download/app.py | 18 +- 72 files changed, 1703 insertions(+), 2245 deletions(-) diff --git a/mpcontribs-ingester/mpcontribs/ingester/cli.py b/mpcontribs-ingester/mpcontribs/ingester/cli.py index 53267ef457..53965cc507 100644 --- a/mpcontribs-ingester/mpcontribs/ingester/cli.py +++ b/mpcontribs-ingester/mpcontribs/ingester/cli.py @@ -1,8 +1,6 @@ # -*- coding: utf-8 -*- # http://flask.pocoo.org/docs/0.10/patterns/appdispatch/ -import os -import argparse -import string +import os, argparse, string from werkzeug.serving import run_simple from werkzeug.wsgi import DispatcherMiddleware, SharedDataMiddleware from flask import Flask diff --git a/mpcontribs-ingester/mpcontribs/ingester/webui.py b/mpcontribs-ingester/mpcontribs/ingester/webui.py index c0b4debe56..5d4f711563 100644 --- a/mpcontribs-ingester/mpcontribs/ingester/webui.py +++ b/mpcontribs-ingester/mpcontribs/ingester/webui.py @@ -1,14 +1,7 @@ from __future__ import unicode_literals, print_function, absolute_import -import json -import os -import socket -import codecs -import time -import psutil -import sys -import warnings -import multiprocessing +import json, os, socket, codecs, time, psutil +import sys, warnings, multiprocessing from tempfile import gettempdir from flask import render_template, request, Response, Blueprint, current_app from flask import url_for, redirect, make_response, stream_with_context, jsonify diff --git a/mpcontribs-io/mpcontribs/io/core/components/tdata.py b/mpcontribs-io/mpcontribs/io/core/components/tdata.py index 365c9d6221..17293619a7 100644 --- a/mpcontribs-io/mpcontribs/io/core/components/tdata.py +++ b/mpcontribs-io/mpcontribs/io/core/components/tdata.py @@ -105,7 +105,7 @@ def to_backgrid_dict(self): composition = get_composition_from_string(cell) composition = pmg_util.string.unicodeify(composition) table["rows"][row_index][col] = composition - except CompositionError, ValueError, OverflowError: + except (CompositionError, ValueError, OverflowError): try: # https://stackoverflow.com/a/38020041 result = urlparse(cell) diff --git a/mpcontribs-io/mpcontribs/io/core/utils.py b/mpcontribs-io/mpcontribs/io/core/utils.py index b86075c234..1def24772d 100644 --- a/mpcontribs-io/mpcontribs/io/core/utils.py +++ b/mpcontribs-io/mpcontribs/io/core/utils.py @@ -1,6 +1,5 @@ # -*- coding: utf-8 -*- """module defines utility methods for MPContribs core.io library""" - from __future__ import unicode_literals from decimal import Decimal, DecimalException, InvalidOperation import six @@ -83,7 +82,7 @@ def normalize_root_level(title): try: composition = get_composition_from_string(title) return False, composition - except CompositionError, KeyError, TypeError, ValueError: + except (CompositionError, KeyError, TypeError, ValueError): if mp_id_pattern.match(title.lower()): return False, title.lower() return True, title @@ -158,6 +157,6 @@ def read_csv(body, is_data_section=True, **kwargs): squeeze=True, converters=converters, encoding="utf8", - **options, + **options ).dropna(how="all") ) diff --git a/mpcontribs-kernel-gateway/make_seed.py b/mpcontribs-kernel-gateway/make_seed.py index 28aa21e0d1..f92a5df7c9 100644 --- a/mpcontribs-kernel-gateway/make_seed.py +++ b/mpcontribs-kernel-gateway/make_seed.py @@ -1,4 +1,5 @@ # -*- coding: utf-8 -*- +import ddtrace.auto import nbformat as nbf nb = nbf.v4.new_notebook() diff --git a/mpcontribs-lux/mpcontribs/lux/autogen.py b/mpcontribs-lux/mpcontribs/lux/autogen.py index 727e72f37f..aeee406c21 100644 --- a/mpcontribs-lux/mpcontribs/lux/autogen.py +++ b/mpcontribs-lux/mpcontribs/lux/autogen.py @@ -100,7 +100,7 @@ def pydantic_model(self) -> Type[BaseModel]: self.file_name, orient=orient, lines=self.fmt == "jsonl" ) break - except Exception: + except Exception as exc: continue else: raise ValueError( @@ -118,7 +118,7 @@ def pydantic_model(self) -> Type[BaseModel]: } return create_model( - f"{self.file_name.name.split('.', 1)[0]}", + f"{self.file_name.name.split('.',1)[0]}", **model_fields, ) diff --git a/mpcontribs-lux/mpcontribs/lux/projects/alab/schemas/base.py b/mpcontribs-lux/mpcontribs/lux/projects/alab/schemas/base.py index b26e3d23e9..d514463dd4 100644 --- a/mpcontribs-lux/mpcontribs/lux/projects/alab/schemas/base.py +++ b/mpcontribs-lux/mpcontribs/lux/projects/alab/schemas/base.py @@ -24,7 +24,7 @@ def ExcludeFromUpload(default: Any = None, description: str = "", **kwargs) -> A default=default, description=description, json_schema_extra={"exclude_from_upload": True}, - **kwargs, + **kwargs ) diff --git a/mpcontribs-lux/tests/projects/esoteric_ephemera/test_schemas.py b/mpcontribs-lux/tests/projects/esoteric_ephemera/test_schemas.py index 0d74c5213c..70b6ec8019 100644 --- a/mpcontribs-lux/tests/projects/esoteric_ephemera/test_schemas.py +++ b/mpcontribs-lux/tests/projects/esoteric_ephemera/test_schemas.py @@ -2,6 +2,7 @@ import gzip import json +from pathlib import Path import numpy as np import pytest diff --git a/mpcontribs-portal/maintenance.py b/mpcontribs-portal/maintenance.py index fd878968f1..618bf78625 100644 --- a/mpcontribs-portal/maintenance.py +++ b/mpcontribs-portal/maintenance.py @@ -12,11 +12,9 @@ def generate_downloads(names=None): q = {"name__in": names} if names else {} client = Client(host=os.environ["MPCONTRIBS_API_HOST"], headers=HEADERS) - projects = ( - client.projects.queryProjects(_fields=["name", "stats"], **q) - .result() - .get("data", []) - ) + projects = client.projects.queryProjects( + _fields=["name", "stats"], **q + ).result().get("data", []) skip = {"columns", "contributions"} print("PROJECTS", len(projects)) @@ -30,7 +28,7 @@ def generate_downloads(names=None): print(name, json.loads(resp.content)) if include: - for r in range(1, len(include) + 1): + for r in range(1, len(include)+1): for combo in combinations(include, r): resp = make_download(client, query, combo) print(name, combo, json.loads(resp.content)) diff --git a/mpcontribs-portal/mpcontribs/portal/middleware.py b/mpcontribs-portal/mpcontribs/portal/middleware.py index d41258cd54..d9777c3d61 100644 --- a/mpcontribs-portal/mpcontribs/portal/middleware.py +++ b/mpcontribs-portal/mpcontribs/portal/middleware.py @@ -1,8 +1,9 @@ class MyMiddleware: + def __init__(self, get_response): self.get_response = get_response def __call__(self, request): response = self.get_response(request) - response["X-Consumer-Id"] = request.META.get("HTTP_X_CONSUMER_ID") + response['X-Consumer-Id'] = request.META.get("HTTP_X_CONSUMER_ID") return response diff --git a/mpcontribs-portal/mpcontribs/portal/urls.py b/mpcontribs-portal/mpcontribs/portal/urls.py index cb074fad97..fb87ece834 100644 --- a/mpcontribs-portal/mpcontribs/portal/urls.py +++ b/mpcontribs-portal/mpcontribs/portal/urls.py @@ -25,7 +25,7 @@ url( r"^contributions/download/create/?$", views.create_download, - name="create_download", + name="create_download" ), url( r"^contributions/component/(?P[a-f\d]{24})$", @@ -53,7 +53,7 @@ url(r"^Fe-Co-V/?$", RedirectView.as_view(url="/projects/swf")), url( r"^ScreeningInorganicPV/?$", - RedirectView.as_view(url="/projects/screening_inorganic_pv"), + RedirectView.as_view(url="/projects/screening_inorganic_pv") ), url( r"^(?P[a-zA-Z0-9_]{3,31})/?$", diff --git a/mpcontribs-portal/mpcontribs/portal/views.py b/mpcontribs-portal/mpcontribs/portal/views.py index f8aa3d9762..566a6b6542 100644 --- a/mpcontribs-portal/mpcontribs/portal/views.py +++ b/mpcontribs-portal/mpcontribs/portal/views.py @@ -12,6 +12,8 @@ from redis import Redis from io import BytesIO from copy import deepcopy +from pathlib import Path +from shutil import make_archive, rmtree from nbconvert import HTMLExporter from bravado.exception import HTTPNotFound from json2html import Json2Html @@ -53,7 +55,7 @@ def get_consumer(request): ] headers = {} for name in names: - key = f"HTTP_{name.upper().replace('-', '_')}" + key = f'HTTP_{name.upper().replace("-", "_")}' value = request.META.get(key) if value is not None: headers[name] = value @@ -124,7 +126,7 @@ def landingpage(request, project): ctx["columns"] = ["identifier", "id", "formula"] + [ col["path"] if col["unit"] == "NaN" - else f"{col['path']} [{col['unit']}]" + else f'{col["path"]} [{col["unit"]}]' for col in prov["columns"] ] ctx["search_columns"] = ["identifier", "formula"] + [ @@ -137,7 +139,7 @@ def landingpage(request, project): ] ctx["ranges"] = json.dumps( { - f"{col['path']} [{col['unit']}]": [col["min"], col["max"]] + f'{col["path"]} [{col["unit"]}]': [col["min"], col["max"]] for col in prov["columns"] if col["unit"] != "NaN" } @@ -164,7 +166,7 @@ def apply(request): if headers.get("X-Anonymous-Consumer", False): ctx["alert"] = f""" - Please log in to apply for a project. + Please log in to apply for a project. """.strip() return render(request, "apply.html", ctx.flatten()) diff --git a/mpcontribs-portal/mpcontribs/users/als_beamline/scripts/__main__.py b/mpcontribs-portal/mpcontribs/users/als_beamline/scripts/__main__.py index 4fc72ada4a..bcd0122bda 100644 --- a/mpcontribs-portal/mpcontribs/users/als_beamline/scripts/__main__.py +++ b/mpcontribs-portal/mpcontribs/users/als_beamline/scripts/__main__.py @@ -1,5 +1,4 @@ -import argparse -import os +import argparse, os from mpcontribs.io.archieml.mpfile import MPFile from pre_submission import * diff --git a/mpcontribs-portal/mpcontribs/users/als_beamline/scripts/translate_PyPt.py b/mpcontribs-portal/mpcontribs/users/als_beamline/scripts/translate_PyPt.py index 232914ab86..995f5d045d 100644 --- a/mpcontribs-portal/mpcontribs/users/als_beamline/scripts/translate_PyPt.py +++ b/mpcontribs-portal/mpcontribs/users/als_beamline/scripts/translate_PyPt.py @@ -1,3 +1,6 @@ +import pandas as pd +import os +from scipy.interpolate import interp2d def get_translate(workdir=None): diff --git a/mpcontribs-portal/mpcontribs/users/dilute_solute_diffusion/pre_submission.py b/mpcontribs-portal/mpcontribs/users/dilute_solute_diffusion/pre_submission.py index daaac921db..045f5bd71f 100644 --- a/mpcontribs-portal/mpcontribs/users/dilute_solute_diffusion/pre_submission.py +++ b/mpcontribs-portal/mpcontribs/users/dilute_solute_diffusion/pre_submission.py @@ -1,6 +1,4 @@ -import os -import json -import requests +import os, json, requests, sys from pandas import read_excel, isnull, ExcelWriter, Series from mpcontribs.io.core.recdict import RecursiveDict from mpcontribs.io.core.utils import clean_value, nest_dict @@ -23,6 +21,7 @@ def run(mpfile, hosts=None, download=False): fpath = f"{project}.xlsx" if download or not os.path.exists(fpath): + figshare_id = 1546772 url = "https://api.figshare.com/v2/articles/{}".format(figshare_id) print("get figshare article {}".format(figshare_id)) @@ -61,7 +60,7 @@ def run(mpfile, hosts=None, download=False): if hosts is not None: if isinstance(hosts, int) and idx + 1 > hosts: break - elif isinstance(hosts, list) and host not in hosts: + elif isinstance(hosts, list) and not host in hosts: continue print("get mp-id for {}".format(host)) @@ -134,6 +133,7 @@ def run(mpfile, hosts=None, download=False): mpfile.add_data_table(mpid, df_D0_Q, "D₀_Q") if hdata["Host"]["crystal_structure"] == "BCC": + print("add table for hop activation barriers for {} (BCC)".format(mpid)) columns_E = ( ["Hop activation barrier, E_{} [eV]".format(i) for i in range(2, 5)] @@ -169,6 +169,7 @@ def run(mpfile, hosts=None, download=False): mpfile.add_data_table(mpid, df_v, "hop_attempt_frequencies") elif hdata["Host"]["crystal_structure"] == "FCC": + print("add table for hop activation barriers for {} (FCC)".format(mpid)) columns_E = [ "Hop activation barrier, E_{} [eV]".format(i) for i in range(5) @@ -190,6 +191,7 @@ def run(mpfile, hosts=None, download=False): mpfile.add_data_table(mpid, df_v, "hop_attempt_frequencies") elif hdata["Host"]["crystal_structure"] == "HCP": + print("add table for hop activation barriers for {} (HCP)".format(mpid)) columns_E = [ "Hop activation barrier, E_X [eV]", diff --git a/mpcontribs-portal/mpcontribs/users/martin_lab/martin_lab.ipynb b/mpcontribs-portal/mpcontribs/users/martin_lab/martin_lab.ipynb index c1813d0517..63ddffaa99 100644 --- a/mpcontribs-portal/mpcontribs/users/martin_lab/martin_lab.ipynb +++ b/mpcontribs-portal/mpcontribs/users/martin_lab/martin_lab.ipynb @@ -20,7 +20,7 @@ }, "outputs": [], "source": [ - "mpfile = MPFile.from_file(\"MPContribs/mpcontribs/users/martin_lab/mpfile_init.txt\")" + "mpfile = MPFile.from_file('MPContribs/mpcontribs/users/martin_lab/mpfile_init.txt')" ] }, { diff --git a/mpcontribs-portal/mpcontribs/users/qmcdb/main/views.py b/mpcontribs-portal/mpcontribs/users/qmcdb/main/views.py index cd80073db9..4e4c20ac48 100644 --- a/mpcontribs-portal/mpcontribs/users/qmcdb/main/views.py +++ b/mpcontribs-portal/mpcontribs/users/qmcdb/main/views.py @@ -1,5 +1,8 @@ from django.shortcuts import render -from records.forms import MaterialQueryForm +from django.http import HttpResponseRedirect +from django.contrib.auth.decorators import login_required +from records.forms import MaterialQueryForm, MaterialSubmissionForm +from records.tables import QMCDBSetTable from records.models import QMCDBSet from django.utils.safestring import mark_safe from django.utils.html import escape diff --git a/mpcontribs-portal/mpcontribs/users/qmcdb/records/views.py b/mpcontribs-portal/mpcontribs/users/qmcdb/records/views.py index 589ef8e3e7..c0f0cc1372 100644 --- a/mpcontribs-portal/mpcontribs/users/qmcdb/records/views.py +++ b/mpcontribs-portal/mpcontribs/users/qmcdb/records/views.py @@ -1,13 +1,18 @@ from __future__ import division from django.shortcuts import render from django.http import HttpResponseRedirect, HttpResponse +from django.contrib.auth.decorators import login_required from rest_framework import status from rest_framework.decorators import api_view from rest_framework.response import Response -from records.forms import MaterialSubmissionForm +from records.forms import MaterialQueryForm, MaterialSubmissionForm from records.models import QMCDBSet from records.serializers import QMCDBSetSerializer +from rest_framework.renderers import JSONRenderer +from rest_framework.parsers import JSONParser +from django.utils.six import BytesIO from django.utils.safestring import mark_safe +import numpy as np def manual_qmc_record_submission(request): diff --git a/mpcontribs-portal/mpcontribs/users/redox_thermo_csp/pre_submission.py b/mpcontribs-portal/mpcontribs/users/redox_thermo_csp/pre_submission.py index e95fd1f18c..15cfaf4de7 100644 --- a/mpcontribs-portal/mpcontribs/users/redox_thermo_csp/pre_submission.py +++ b/mpcontribs-portal/mpcontribs/users/redox_thermo_csp/pre_submission.py @@ -1,17 +1,16 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -import os -import json -import re -import sys +import os, json, re, sys from glob import glob from datetime import datetime from itertools import groupby import pandas as pd +from mpcontribs.io.core.utils import get_composition_from_string from mpcontribs.io.core.recdict import RecursiveDict -from mpcontribs.io.core.utils import clean_value, read_csv +from mpcontribs.io.core.utils import clean_value, read_csv, nest_dict from mpcontribs.io.core.components import Table from mpcontribs.users.utils import duplicate_check +from mpcontribs.users.redox_thermo_csp.utils import redenth_act, get_debye_temp def get_fit_pars(sample_number): diff --git a/mpcontribs-portal/mpcontribs/users/redox_thermo_csp/update_energy_data.py b/mpcontribs-portal/mpcontribs/users/redox_thermo_csp/update_energy_data.py index 3701993937..b2eed60d99 100644 --- a/mpcontribs-portal/mpcontribs/users/redox_thermo_csp/update_energy_data.py +++ b/mpcontribs-portal/mpcontribs/users/redox_thermo_csp/update_energy_data.py @@ -2,6 +2,7 @@ import datetime import os import shutil +import numpy as np from energy_analysis import EnergyAnalysis as enera from views import unstable_phases as unst @@ -20,7 +21,7 @@ new_energy_data = old_energy_data for db_id in paramlist: - if "Exp" not in db_id: + if not "Exp" in db_id: print(db_id) data_source = "Theo" # updates only theoretical data celsius = "True" # always True, parameter input in K currently disabled diff --git a/mpcontribs-portal/mpcontribs/users/screening_inorganic_pv/pre_submission.py b/mpcontribs-portal/mpcontribs/users/screening_inorganic_pv/pre_submission.py index 610f864cc7..454a5597e3 100644 --- a/mpcontribs-portal/mpcontribs/users/screening_inorganic_pv/pre_submission.py +++ b/mpcontribs-portal/mpcontribs/users/screening_inorganic_pv/pre_submission.py @@ -1,6 +1,5 @@ # -*- coding: utf-8 -*- -import os -import json +import os, json from pandas import DataFrame from mpcontribs.io.core.recdict import RecursiveDict from mpcontribs.io.core.utils import clean_value @@ -13,7 +12,6 @@ db = client["mpcontribs"] print(db.contributions.count_documents({"project": "screening_inorganic_pv"})) - # @duplicate_check def run(mpfile, **kwargs): @@ -48,11 +46,11 @@ def run(mpfile, **kwargs): rd = RecursiveDict({"formula": formula}) for k, v in config.items(): value = clean_value(d[k], v[1], max_dgts=4) - if "." not in v[0]: + if not "." in v[0]: rd[v[0]] = value else: keys = v[0].split(".") - if keys[0] not in rd: + if not keys[0] in rd: rd[keys[0]] = RecursiveDict({keys[1]: value}) else: rd[keys[0]][keys[1]] = value diff --git a/mpcontribs-portal/mpcontribs/users/swf/pre_submission.py b/mpcontribs-portal/mpcontribs/users/swf/pre_submission.py index 705329fbe8..6c46bc0c1a 100644 --- a/mpcontribs-portal/mpcontribs/users/swf/pre_submission.py +++ b/mpcontribs-portal/mpcontribs/users/swf/pre_submission.py @@ -1,30 +1,32 @@ from mpcontribs.config import mp_level01_titles +from mpcontribs.io.core.recdict import RecursiveDict from mpcontribs.io.core.utils import clean_value, get_composition_from_string from mpcontribs.users.utils import duplicate_check def round_to_100_percent(number_set, digit_after_decimal=1): unround_numbers = [ - x / float(sum(number_set)) * 100 * 10**digit_after_decimal for x in number_set + x / float(sum(number_set)) * 100 * 10 ** digit_after_decimal for x in number_set ] decimal_part_with_index = sorted( [(index, unround_numbers[index] % 1) for index in range(len(unround_numbers))], key=lambda y: y[1], reverse=True, ) - remainder = 100 * 10**digit_after_decimal - sum(map(int, unround_numbers)) + remainder = 100 * 10 ** digit_after_decimal - sum(map(int, unround_numbers)) index = 0 while remainder > 0: unround_numbers[decimal_part_with_index[index][0]] += 1 remainder -= 1 index = (index + 1) % len(number_set) - return [int(x) / float(10**digit_after_decimal) for x in unround_numbers] + return [int(x) / float(10 ** digit_after_decimal) for x in unround_numbers] @duplicate_check def run(mpfile, **kwargs): import pymatgen import pandas as pd + from mpcontribs.users.swf.rest.rester import SwfRester # load data from google sheet google_sheet = mpfile.document[mp_level01_titles[0]].pop("google_sheet") diff --git a/mpcontribs-portal/mpcontribs/users/utils.py b/mpcontribs-portal/mpcontribs/users/utils.py index 86f141c1bd..4cf02217e9 100644 --- a/mpcontribs-portal/mpcontribs/users/utils.py +++ b/mpcontribs-portal/mpcontribs/users/utils.py @@ -1,5 +1,4 @@ -import inspect -import os +import inspect, os from typing import Any, Dict @@ -46,10 +45,7 @@ def wrapper(*args, **kwargs): # https://stackoverflow.com/a/55545369 -def unflatten( - d: Dict[str, Any], - base: Dict[str, Any] = None, -) -> Dict[str, Any]: +def unflatten(d: Dict[str, Any], base: Dict[str, Any] = None,) -> Dict[str, Any]: """Convert any keys containing dotted paths to nested dicts >>> unflatten({'a': 12, 'b': 13, 'c': 14}) # no expansion diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/2dmatpedia.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/2dmatpedia.ipynb index 7f82cf7085..daf3c45748 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/2dmatpedia.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/2dmatpedia.ipynb @@ -6,10 +6,9 @@ "metadata": {}, "outputs": [], "source": [ - "import os\n", - "import gzip\n", - "import json\n", + "import os, gzip, json\n", "from mpcontribs.client import Client\n", + "from pymatgen.core import Structure\n", "from pymatgen.ext.matproj import MPRester\n", "from urllib.request import urlretrieve\n", "from monty.json import MontyDecoder" @@ -21,7 +20,7 @@ "metadata": {}, "outputs": [], "source": [ - "name = \"2dmatpedia\"\n", + "name = '2dmatpedia'\n", "client = Client()\n", "mpr = MPRester()" ] @@ -62,20 +61,20 @@ " \"Eˣ\": \"exfoliation energy\",\n", " \"E\": \"energy\",\n", " \"Eᵛᵈʷ\": \"van-der-Waals energy\",\n", - " \"µ\": \"total magnetization\",\n", + " \"µ\": \"total magnetization\"\n", "}\n", "\n", "project = {\n", - " \"is_public\": True,\n", - " \"title\": \"2DMatPedia\",\n", - " \"long_title\": \"2D Materials Encyclopedia\",\n", - " \"owner\": \"migueldiascosta@nus.edu.sg\",\n", - " \"authors\": \"M. Dias Costa, F.Y. Ping, Z. Jun\",\n", - " \"description\": description,\n", - " \"references\": [\n", - " {\"label\": \"WWW\", \"url\": \"http://www.2dmatpedia.org\"},\n", - " {\"label\": \"PRL\", \"url\": \"https://doi.org/10.1103/PhysRevLett.118.106101\"},\n", - " ],\n", + " 'is_public': True,\n", + " 'title': '2DMatPedia',\n", + " 'long_title': '2D Materials Encyclopedia',\n", + " 'owner': 'migueldiascosta@nus.edu.sg',\n", + " 'authors': 'M. Dias Costa, F.Y. Ping, Z. Jun',\n", + " 'description': description,\n", + " 'references': [\n", + " {'label': 'WWW', 'url': 'http://www.2dmatpedia.org'},\n", + " {'label': 'PRL', 'url': 'https://doi.org/10.1103/PhysRevLett.118.106101'}\n", + " ]\n", "}\n", "\n", "# client.projects.update_entry(pk=name, project=project).result()\n", @@ -90,18 +89,21 @@ "outputs": [], "source": [ "columns = {\n", - " \"material_id\": {\"name\": \"details\"},\n", - " \"source_id\": {\"name\": \"source\"},\n", - " \"discovery_process\": {\"name\": \"process\"},\n", - " \"bandgap\": {\"name\": \"ΔE\", \"unit\": \"eV\"},\n", - " \"decomposition_energy\": {\"name\": \"Eᵈ\", \"unit\": \"eV/atom\"},\n", - " \"exfoliation_energy_per_atom\": {\"name\": \"Eˣ\", \"unit\": \"eV/atom\"},\n", - " \"energy_per_atom\": {\"name\": \"E\", \"unit\": \"eV/atom\"},\n", - " \"energy_vdw_per_atom\": {\"name\": \"Eᵛᵈʷ\", \"unit\": \"eV/atom\"},\n", - " \"total_magnetization\": {\"name\": \"µ\", \"unit\": \"µᵇ\"},\n", + " 'material_id': {'name': 'details'},\n", + " 'source_id': {'name': 'source'},\n", + " 'discovery_process': {'name': 'process'},\n", + " 'bandgap': {'name': 'ΔE', 'unit': 'eV'},\n", + " 'decomposition_energy': {'name': 'Eᵈ', 'unit': 'eV/atom'},\n", + " 'exfoliation_energy_per_atom': {'name': 'Eˣ', 'unit': 'eV/atom'},\n", + " 'energy_per_atom': {'name': 'E', 'unit': 'eV/atom'},\n", + " 'energy_vdw_per_atom': {'name': 'Eᵛᵈʷ', 'unit': 'eV/atom'},\n", + " 'total_magnetization': {'name': 'µ', 'unit': 'µᵇ'} \n", "}\n", "\n", - "init_columns = {v[\"name\"]: v.get(\"unit\") for v in columns.values()}\n", + "init_columns = {\n", + " v[\"name\"]: v.get(\"unit\")\n", + " for v in columns.values()\n", + "}\n", "init_columns[\"structures\"] = None\n", "\n", "# client.init_columns(name, init_columns)\n", @@ -123,13 +125,13 @@ "source": [ "db_json = \"http://www.2dmatpedia.org/static/db.json.gz\"\n", "raw_data = [] # as read from raw files\n", - "dbfile = db_json.rsplit(\"/\")[-1]\n", + "dbfile = db_json.rsplit('/')[-1]\n", "\n", "if not os.path.exists(dbfile):\n", - " print(\"downloading\", dbfile, \"...\")\n", + " print('downloading', dbfile, '...')\n", " urlretrieve(db_json, dbfile)\n", "\n", - "with gzip.open(dbfile, \"rb\") as f:\n", + "with gzip.open(dbfile, 'rb') as f:\n", " for line in f:\n", " raw_data.append(json.loads(line, cls=MontyDecoder))\n", "\n", @@ -144,23 +146,23 @@ "source": [ "details_url = \"http://www.2dmatpedia.org/2dmaterials/doc/\"\n", "contributions = []\n", - "prefixes = {\"mp\", \"mvc\", \"2dm\"}\n", + "prefixes = {'mp', 'mvc', '2dm'}\n", "\n", "for rd in raw_data:\n", - " source_id = rd[\"source_id\"]\n", - " prefix = source_id.split(\"-\")[0]\n", - "\n", + " source_id = rd['source_id']\n", + " prefix = source_id.split('-')[0]\n", + " \n", " if prefix not in prefixes:\n", " continue\n", - "\n", - " identifier = rd[\"material_id\"] if prefix == \"2dm\" else source_id\n", + " \n", + " identifier = rd['material_id'] if prefix == \"2dm\" else source_id \n", " d = {}\n", - "\n", + " \n", " for k, col in columns.items():\n", " value = rd.get(k)\n", " if not value:\n", " continue\n", - "\n", + " \n", " unit = col.get(\"unit\")\n", "\n", " if k == \"material_id\" or (k == \"source_id\" and rd[k].startswith(\"2dm\")):\n", @@ -173,11 +175,8 @@ " d[col[\"name\"]] = value\n", "\n", " contrib = {\n", - " \"project\": name,\n", - " \"is_public\": True,\n", - " \"identifier\": identifier,\n", - " \"data\": d,\n", - " \"structures\": [rd[\"structure\"]],\n", + " 'project': name, 'is_public': True, 'identifier': identifier,\n", + " 'data': d, 'structures': [rd[\"structure\"]]\n", " }\n", "\n", " contributions.append(contrib)\n", @@ -202,18 +201,13 @@ "# client.init_columns(name, init_columns)\n", "# do manual dupe check (due to unique_identifiers=False) and submit missing contributions\n", "all_ids = client.get_all_ids(\n", - " query={\"project\": name},\n", - " data_id_fields={name: \"details\"},\n", + " query={\"project\": name}, data_id_fields={name: \"details\"}\n", " # TODO use fmt=\"map\" for update\n", ").get(name)\n", - "client.submit_contributions(\n", - " [\n", - " contrib\n", - " for contrib in contributions\n", - " if contrib[\"data\"][\"details\"] not in all_ids[\"details_set\"]\n", - " ],\n", - " per_page=30,\n", - ")" + "client.submit_contributions([\n", + " contrib for contrib in contributions\n", + " if contrib[\"data\"][\"details\"] not in all_ids[\"details_set\"]\n", + "], per_page=30)" ] }, { diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/Broberg_benchmark_defects.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/Broberg_benchmark_defects.ipynb index 0e1ea669f2..4a51055e57 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/Broberg_benchmark_defects.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/Broberg_benchmark_defects.ipynb @@ -37,9 +37,7 @@ "source": [ "# load data\n", "drivedir = Path(\"/Users/patrick/GoogleDriveLBNL/My Drive/\")\n", - "datadir = drivedir / Path(\n", - " \"MaterialsProject/gitrepos/mpcontribs-data/Broberg_benchmark_defects\"\n", - ")\n", + "datadir = drivedir / Path(\"MaterialsProject/gitrepos/mpcontribs-data/Broberg_benchmark_defects\")\n", "df_bulk = read_excel(datadir / \"bulk_data.xlsx\")\n", "df_defect = read_excel(datadir / \"defect_level_data.xlsx\")\n", "df_transition = read_excel(datadir / \"transition_level_data.xlsx\")" @@ -54,10 +52,10 @@ "source": [ "# clean DOIs column\n", "def clean_dois(s):\n", - " return \",\".join(\n", - " [doi.strip().replace(\"https://doi.org/\", \"\") for doi in s.split(\",\")]\n", - " )\n", - "\n", + " return \",\".join([\n", + " doi.strip().replace(\"https://doi.org/\", \"\")\n", + " for doi in s.split(\",\")\n", + " ])\n", "\n", "df_bulk[\"DOI\"] = df_bulk[\"DOI\"].apply(clean_dois)" ] @@ -76,13 +74,12 @@ " formula, system, symmetry = name.split(\"_\")\n", " print(formula, system, symmetry)\n", " doc = mpr.summary.search(\n", - " formula=formula,\n", - " crystal_system=system.capitalize(),\n", + " formula=formula, crystal_system=system.capitalize(),\n", " fields=[\"material_id\", \"formula_pretty\", \"crystal_system\", \"symmetry\"],\n", - " sort_fields=\"energy_above_hull\",\n", + " sort_fields=\"energy_above_hull\"\n", " )[0]\n", " mpids.append(doc.material_id)\n", - "\n", + " \n", "df_bulk[\"mp-id\"] = mpids" ] }, @@ -99,82 +96,133 @@ " \"mp-id\": {\"name\": \"identifier\"},\n", " \"Bulk Name\": {\"name\": \"info.bulk\", \"unit\": None},\n", " \"DOI\": {\"name\": \"info.DOIs\", \"unit\": None},\n", - " \"GGA-PBE gap\": {\"name\": \"PBE.gap\", \"unit\": \"eV\"},\n", - " \"GGA-PBE Elt A\": {\"name\": \"PBE.elements.A.name\", \"unit\": None},\n", + " \"GGA-PBE gap\": {\n", + " \"name\": \"PBE.gap\",\n", + " \"unit\": \"eV\"\n", + " },\n", + " \"GGA-PBE Elt A\": {\n", + " \"name\": \"PBE.elements.A.name\",\n", + " \"unit\": None\n", + " },\n", " \"GGA-PBE Elt A chemical potential\": {\n", " \"name\": \"PBE.elements.A.chempot\",\n", - " \"unit\": \"eV\",\n", + " \"unit\": \"eV\"\n", + " },\n", + " \"GGA-PBE Elt B\": {\n", + " \"name\": \"PBE.elements.B.name\",\n", + " \"unit\": None\n", " },\n", - " \"GGA-PBE Elt B\": {\"name\": \"PBE.elements.B.name\", \"unit\": None},\n", " \"GGA-PBE Elt B chemical potential\": {\n", " \"name\": \"PBE.elements.B.chempot\",\n", - " \"unit\": \"eV\",\n", + " \"unit\": \"eV\"\n", + " },\n", + " \"GGA-PBE Elt C\": {\n", + " \"name\": \"PBE.elements.C.name\",\n", + " \"unit\": None\n", " },\n", - " \"GGA-PBE Elt C\": {\"name\": \"PBE.elements.C.name\", \"unit\": None},\n", " \"GGA-PBE Elt C chemical potential\": {\n", " \"name\": \"PBE.elements.C.chempot\",\n", - " \"unit\": \"eV\",\n", + " \"unit\": \"eV\"\n", + " },\n", + " \"GGA-PBE Elt D\": {\n", + " \"name\": \"PBE.elements.D.name\",\n", + " \"unit\": None\n", " },\n", - " \"GGA-PBE Elt D\": {\"name\": \"PBE.elements.D.name\", \"unit\": None},\n", " \"GGA-PBE Elt D chemical potential\": {\n", " \"name\": \"PBE.elements.D.chempot\",\n", - " \"unit\": \"eV\",\n", + " \"unit\": \"eV\"\n", + " },\n", + " \"GGA-PBE Elt E\": {\n", + " \"name\": \"PBE.elements.E.name\",\n", + " \"unit\": None\n", " },\n", - " \"GGA-PBE Elt E\": {\"name\": \"PBE.elements.E.name\", \"unit\": None},\n", " \"GGA-PBE Elt E chemical potential\": {\n", " \"name\": \"PBE.elements.E.chempot\",\n", - " \"unit\": \"eV\",\n", + " \"unit\": \"eV\"\n", + " },\n", + " \"Auto HSE06 gap\": {\n", + " \"name\": \"HSE06.gap\",\n", + " \"unit\": \"eV\"\n", + " },\n", + " \"FL no_bes\": {\n", + " \"name\": \"fermi.noBES\",\n", + " \"unit\": \"eV\"\n", + " },\n", + " \"FL bes\": {\n", + " \"name\": \"fermi.BES\",\n", + " \"unit\": \"eV\"\n", + " },\n", + " \"FL bes_free\": {\n", + " \"name\": \"fermi.freeBES\",\n", + " \"unit\": \"eV\"\n", + " },\n", + " \"lower dopability no_bes\": {\n", + " \"name\": \"fermi.dopability.noBES.lower\",\n", + " \"unit\": \"eV\"\n", + " },\n", + " \"upper dopability no_bes\": {\n", + " \"name\": \"fermi.dopability.noBES.upper\",\n", + " \"unit\": \"eV\"\n", + " },\n", + " \"lower dopability bes\": {\n", + " \"name\": \"fermi.dopability.BES.lower\",\n", + " \"unit\": \"eV\"\n", + " },\n", + " \"upper dopability bes\": {\n", + " \"name\": \"fermi.dopability.BES.upper\",\n", + " \"unit\": \"eV\"\n", " },\n", - " \"Auto HSE06 gap\": {\"name\": \"HSE06.gap\", \"unit\": \"eV\"},\n", - " \"FL no_bes\": {\"name\": \"fermi.noBES\", \"unit\": \"eV\"},\n", - " \"FL bes\": {\"name\": \"fermi.BES\", \"unit\": \"eV\"},\n", - " \"FL bes_free\": {\"name\": \"fermi.freeBES\", \"unit\": \"eV\"},\n", - " \"lower dopability no_bes\": {\"name\": \"fermi.dopability.noBES.lower\", \"unit\": \"eV\"},\n", - " \"upper dopability no_bes\": {\"name\": \"fermi.dopability.noBES.upper\", \"unit\": \"eV\"},\n", - " \"lower dopability bes\": {\"name\": \"fermi.dopability.BES.lower\", \"unit\": \"eV\"},\n", - " \"upper dopability bes\": {\"name\": \"fermi.dopability.BES.upper\", \"unit\": \"eV\"},\n", " \"lower dopability bes_free\": {\n", " \"name\": \"fermi.dopability.freeBES.lower\",\n", - " \"unit\": \"eV\",\n", + " \"unit\": \"eV\"\n", " },\n", " \"upper dopability bes_free\": {\n", " \"name\": \"fermi.dopability.freeBES.upper\",\n", - " \"unit\": \"eV\",\n", + " \"unit\": \"eV\"\n", " },\n", " \"hybrid-published gap\": {\"name\": \"hybrid.gap\", \"unit\": \"eV\"},\n", " \"FL hybrid-published\": {\"name\": \"hybrid.fermi\", \"unit\": \"eV\"},\n", - " \"lower dopability hybrid-published\": {\n", - " \"name\": \"hybrid.dopability.lower\",\n", - " \"unit\": \"eV\",\n", - " },\n", - " \"upper dopability hybrid-published\": {\n", - " \"name\": \"hybrid.dopability.upper\",\n", - " \"unit\": \"eV\",\n", + " \"lower dopability hybrid-published\": {\"name\": \"hybrid.dopability.lower\", \"unit\": \"eV\"},\n", + " \"upper dopability hybrid-published\": {\"name\": \"hybrid.dopability.upper\", \"unit\": \"eV\"},\n", + " \"hybrid-published Elt A\": {\n", + " \"name\": \"hybrid.elements.A.name\",\n", + " \"unit\": None\n", " },\n", - " \"hybrid-published Elt A\": {\"name\": \"hybrid.elements.A.name\", \"unit\": None},\n", " \"hybrid-published Elt A chemical potential\": {\n", " \"name\": \"hybrid.elements.A.chempot\",\n", - " \"unit\": \"eV\",\n", + " \"unit\": \"eV\"\n", + " },\n", + " \"hybrid-published Elt B\": {\n", + " \"name\": \"hybrid.elements.B.name\",\n", + " \"unit\": None\n", " },\n", - " \"hybrid-published Elt B\": {\"name\": \"hybrid.elements.B.name\", \"unit\": None},\n", " \"hybrid-published Elt B chemical potential\": {\n", " \"name\": \"hybrid.elements.B.chempot\",\n", - " \"unit\": \"eV\",\n", + " \"unit\": \"eV\"\n", + " },\n", + " \"hybrid-published Elt C\": {\n", + " \"name\": \"hybrid.elements.C.name\",\n", + " \"unit\": None\n", " },\n", - " \"hybrid-published Elt C\": {\"name\": \"hybrid.elements.C.name\", \"unit\": None},\n", " \"hybrid-published Elt C chemical potential\": {\n", " \"name\": \"hybrid.elements.C.chempot\",\n", - " \"unit\": \"eV\",\n", + " \"unit\": \"eV\"\n", + " },\n", + " \"hybrid-published Elt D\": {\n", + " \"name\": \"hybrid.elements.D.name\",\n", + " \"unit\": None\n", " },\n", - " \"hybrid-published Elt D\": {\"name\": \"hybrid.elements.D.name\", \"unit\": None},\n", " \"hybrid-published Elt D chemical potential\": {\n", " \"name\": \"hybrid.elements.D.chempot\",\n", - " \"unit\": \"eV\",\n", + " \"unit\": \"eV\"\n", + " },\n", + " \"hybrid-published Elt E\": {\n", + " \"name\": \"hybrid.elements.E.name\",\n", + " \"unit\": None\n", " },\n", - " \"hybrid-published Elt E\": {\"name\": \"hybrid.elements.E.name\", \"unit\": None},\n", " \"hybrid-published Elt E chemical potential\": {\n", " \"name\": \"hybrid.elements.E.chempot\",\n", - " \"unit\": \"eV\",\n", + " \"unit\": \"eV\"\n", " },\n", "}" ] @@ -202,15 +250,13 @@ "def apply_unit(cell, unit):\n", " if isinstance(cell, str) and cell.strip() == \"-\":\n", " return \"\"\n", - "\n", + " \n", " return f\"{cell} {unit}\" if unit and cell else cell\n", "\n", - "\n", "def apply_units(column):\n", " unit = columns_map_bulk[column.name].get(\"unit\")\n", " return column.apply(apply_unit, args=(unit,))\n", "\n", - "\n", "df_bulk = df_bulk.apply(apply_units)" ] }, @@ -244,7 +290,7 @@ " contrib = {\n", " \"identifier\": identifier,\n", " \"data\": unflatten(data, splitter=\"dot\"),\n", - " \"attachments\": [],\n", + " \"attachments\": []\n", " }\n", " bulk_name = data[\"info.bulk\"]\n", " formula, system, symmetry = bulk_name.split(\"_\")\n", @@ -268,8 +314,8 @@ " ]\n", " contrib[\"attachments\"].append(Attachment.from_data(\"transitions\", transitions))\n", " contributions.append(contrib)\n", - "\n", - "\n", + " \n", + " \n", "contributions[0]" ] }, @@ -281,12 +327,7 @@ "outputs": [], "source": [ "# initialize columns (including units)\n", - "columns = {\n", - " \"info.bulk\": None,\n", - " \"info.formula\": None,\n", - " \"info.system\": None,\n", - " \"info.symmetry\": None,\n", - "}\n", + "columns = {\"info.bulk\": None, \"info.formula\": None, \"info.system\": None, \"info.symmetry\": None}\n", "\n", "for col in columns_map_bulk.values():\n", " if \".\" in col[\"name\"]:\n", @@ -304,7 +345,7 @@ "client.init_columns(columns)\n", "client.submit_contributions(contributions)\n", "# this shouldn't be necessary but need to re-init columns likely due to bug in API server\n", - "client.init_columns(columns)" + "client.init_columns(columns) " ] } ], diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ExpXAS.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ExpXAS.ipynb index abe2f054f3..d2fdf9ba09 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ExpXAS.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ExpXAS.ipynb @@ -10,7 +10,8 @@ "from mpcontribs.client import Client\n", "from pathlib import Path\n", "from pandas import read_csv\n", - "import pandas as pd" + "import pandas as pd\n", + "import numpy as np" ] }, { @@ -31,9 +32,7 @@ "metadata": {}, "outputs": [], "source": [ - "indir = Path(\n", - " \"/Users/patrick/GoogleDriveLBNL/MaterialsProject/gitrepos/mpcontribs-data/ExpXAS\"\n", - ")\n", + "indir = Path(\"/Users/patrick/GoogleDriveLBNL/MaterialsProject/gitrepos/mpcontribs-data/ExpXAS\")\n", "ref_path = indir / \"reference.data\"\n", "spec_path = indir / \"spectrum.mu\"" ] @@ -47,13 +46,10 @@ "source": [ "# add project-wide meta data to \"Other Info\" dropdown\n", "client.projects.update_entry(\n", - " pk=name,\n", - " project={\n", - " \"other\": {\n", - " \"facility\": \"NSLS-II\",\n", - " \"beamline\": \"ISS (8-ID)\",\n", - " }\n", - " },\n", + " pk=name, project={\"other\": {\n", + " 'facility': 'NSLS-II',\n", + " 'beamline': 'ISS (8-ID)',\n", + " }}\n", ").result()" ] }, @@ -65,12 +61,8 @@ "outputs": [], "source": [ "index = \"energy [eV]\"\n", - "ref = read_csv(\n", - " ref_path, sep=\" \", skiprows=[0, 1], index_col=0, names=[index, \"reference\"]\n", - ")\n", - "spec = read_csv(\n", - " spec_path, sep=\" \", skiprows=[0, 1], index_col=0, names=[index, \"spectrum\"]\n", - ")" + "ref = read_csv(ref_path, sep=\" \", skiprows=[0, 1], index_col=0, names=[index, \"reference\"])\n", + "spec = read_csv(spec_path, sep=\" \", skiprows=[0, 1], index_col=0, names=[index, \"spectrum\"])" ] }, { @@ -83,7 +75,7 @@ "df = pd.concat([ref, spec], axis=1)\n", "df.columns.name = \"type\"\n", "df.attrs[\"title\"] = \"Fe XAS\"\n", - "df.attrs[\"labels\"] = {\"value\": \"flattened normalized μ(E)\"}\n", + "df.attrs[\"labels\"] = {\"value\": \"flattened normalized μ(E)\"} \n", "df.attrs[\"name\"] = \"Fe-XAS\"" ] }, @@ -100,30 +92,30 @@ " \"project\": name,\n", " \"identifier\": \"mp-1279742\", # assign to mp-id or use custom identifier?\n", " \"data\": {\n", - " \"meta\": {\n", - " \"year\": 2020,\n", - " \"cycle\": 1,\n", - " \"SAF\": 304823,\n", - " \"proposal\": 305112,\n", - " \"PI\": \"M. Liu\",\n", - " },\n", - " \"measurement\": {\n", - " \"method\": \"XAS\",\n", - " \"name\": \"FeO\",\n", - " \"composition\": \"Fe\",\n", - " \"element\": \"Fe\",\n", - " \"edge\": \"K\",\n", - " \"E₀\": \"7112 eV\", # submit numbers with units as space-separated strings\n", - " \"scanID\": 77303,\n", - " \"UID\": \"de753795-be14-402e-9a3f-5089a44ff67c\", # could be linked to BNL raw data\n", + " 'meta': {\n", + " 'year': 2020,\n", + " 'cycle': 1,\n", + " 'SAF': 304823,\n", + " 'proposal': 305112,\n", + " 'PI': 'M. Liu',\n", " },\n", - " \"time\": {\n", - " \"start\": \"01/31/2020 17:20:43\", # TODO parse as datetime\n", - " \"stop\": \"01/31/2020 17:21:44\",\n", - " \"total\": \"1 h\",\n", + " 'measurement': {\n", + " 'method': 'XAS',\n", + " 'name': 'FeO',\n", + " 'composition': 'Fe',\n", + " 'element': 'Fe',\n", + " 'edge': 'K',\n", + " 'E₀': '7112 eV', # submit numbers with units as space-separated strings\n", + " 'scanID': 77303,\n", + " 'UID': 'de753795-be14-402e-9a3f-5089a44ff67c', # could be linked to BNL raw data\n", " },\n", + " 'time': {\n", + " 'start': '01/31/2020 17:20:43', # TODO parse as datetime\n", + " 'stop': '01/31/2020 17:21:44',\n", + " 'total': '1 h'\n", + " } \n", " },\n", - " \"tables\": [df],\n", + " \"tables\": [df]\n", "}" ] }, @@ -145,7 +137,9 @@ "metadata": {}, "outputs": [], "source": [ - "all_ids = client.get_all_ids({\"project\": name}, include=[\"tables\"]).get(name, {})\n", + "all_ids = client.get_all_ids(\n", + " {\"project\": name}, include=[\"tables\"]\n", + ").get(name, {})\n", "cids = list(all_ids[\"ids\"])\n", "tids = list(all_ids[\"tables\"][\"ids\"])\n", "cids, tids" diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ForbiddenTransitions.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ForbiddenTransitions.ipynb index ac6c0e7b3b..35ee2fa6d4 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ForbiddenTransitions.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ForbiddenTransitions.ipynb @@ -23,9 +23,7 @@ "metadata": {}, "outputs": [], "source": [ - "data_dir = Path(\n", - " \"/Users/patrick/GoogleDriveLBNL/My Drive/MaterialsProject/gitrepos/mpcontribs-data/ForbiddenTransitions\"\n", - ")" + "data_dir = Path(\"/Users/patrick/GoogleDriveLBNL/My Drive/MaterialsProject/gitrepos/mpcontribs-data/ForbiddenTransitions\")" ] }, { @@ -58,114 +56,37 @@ "source": [ "columns_map = {\n", " # root level\n", - " \"Materials Project ID (mpid)\": {\n", - " \"name\": \"identifier\",\n", - " \"description\": \"Materials Project ID as of May 30, 2023\",\n", - " },\n", - " \"Formula\": {\n", - " \"name\": \"formula\",\n", - " \"description\": \"Chemical formula (from pretty_formula on MP)\",\n", - " },\n", + " \"Materials Project ID (mpid)\": {\"name\": \"identifier\", \"description\": \"Materials Project ID as of May 30, 2023\"},\n", + " \"Formula\": {\"name\": \"formula\", \"description\": \"Chemical formula (from pretty_formula on MP)\"},\n", " # info\n", - " \"Space group\": {\n", - " \"name\": \"info.spacegroup\",\n", - " \"description\": \"Space group symbol from MP\",\n", - " },\n", - " \"# ICSD entries\": {\n", - " \"name\": \"info.numICSDs\",\n", - " \"unit\": \"\",\n", - " \"description\": \"Number of ICSD entries that structure-match to this compound (queried from the Materials Project)\",\n", - " },\n", - " \"Calculation origin\": {\n", - " \"name\": \"info.origin\",\n", - " \"description\": \"The source of the calculation; note that some of these calculations derive from Fabini et al. 2019 (10.1021/acs.chemmater.8b04542) and the associated MPContribs data set)\",\n", - " },\n", + " \"Space group\": {\"name\": \"info.spacegroup\", \"description\": \"Space group symbol from MP\"},\n", + " \"# ICSD entries\": {\"name\": \"info.numICSDs\", \"unit\": \"\", \"description\": \"Number of ICSD entries that structure-match to this compound (queried from the Materials Project)\"},\n", + " \"Calculation origin\": {\"name\": \"info.origin\", \"description\": \"The source of the calculation; note that some of these calculations derive from Fabini et al. 2019 (10.1021/acs.chemmater.8b04542) and the associated MPContribs data set)\"},\n", " # chemical properties\n", - " \"$t_\\mathrm{IPR}^\\mathrm{d}$\": {\n", - " \"name\": \"properties.chemical.IPR\",\n", - " \"description\": \"Inverse participation ratio of the direct VBM and CBM states, used as a proxy for localization of states at the band edges (a high IPR indicates strong localization), as defined by Wegner in 1980 (10.1007/BF01325284) and implemented by Xiong, et al. in 2023 (10.1126/sciadv.adh8617) (see manuscript for details)\",\n", - " },\n", - " \"$σ^\\mathrm{d}$\": {\n", - " \"name\": \"properties.chemical.sigma\",\n", - " \"unit\": \"\",\n", - " \"description\": \"Orbital similarity of the direct VBM and CBM states, derived from the dominant contributors to the density of states at the direct VBM and CBM to describe the similarity of CB-edge and VB-edge orbital contributions (see manuscript for details)\",\n", - " },\n", + " \"$t_\\mathrm{IPR}^\\mathrm{d}$\": {\"name\": \"properties.chemical.IPR\", \"description\": \"Inverse participation ratio of the direct VBM and CBM states, used as a proxy for localization of states at the band edges (a high IPR indicates strong localization), as defined by Wegner in 1980 (10.1007/BF01325284) and implemented by Xiong, et al. in 2023 (10.1126/sciadv.adh8617) (see manuscript for details)\"},\n", + " \"$σ^\\mathrm{d}$\": {\"name\": \"properties.chemical.sigma\", \"unit\": \"\", \"description\": \"Orbital similarity of the direct VBM and CBM states, derived from the dominant contributors to the density of states at the direct VBM and CBM to describe the similarity of CB-edge and VB-edge orbital contributions (see manuscript for details)\"},\n", " # other properties\n", - " \"$E_\\mathrm{hull}$ (eV/at.)\": {\n", - " \"name\": \"properties.other.hull\",\n", - " \"unit\": \"eV/atom\",\n", - " \"description\": \"Energy above the convex hull, computed using GGA (or GGA+U when appropriate) and MP compatability scheme\",\n", - " },\n", - " \"Synthesized?\": {\n", - " \"name\": \"properties.other.synthesized\",\n", - " \"description\": \"Whether a given compound has been synthesized in any form (queried from the Materials Project)\",\n", - " },\n", + " \"$E_\\mathrm{hull}$ (eV/at.)\": {\"name\": \"properties.other.hull\", \"unit\": \"eV/atom\", \"description\": \"Energy above the convex hull, computed using GGA (or GGA+U when appropriate) and MP compatability scheme\"},\n", + " \"Synthesized?\": {\"name\": \"properties.other.synthesized\", \"description\": \"Whether a given compound has been synthesized in any form (queried from the Materials Project)\"},\n", " # optical properties\n", - " \"$E_\\mathrm{G}^\\mathrm{GGA}$ (eV)\": {\n", - " \"name\": \"properties.optical.bandgaps.GGA\",\n", - " \"unit\": \"eV\",\n", - " \"description\": \"Fundamental band gap computed using GGA (or GGA+U when appropriate)\",\n", - " },\n", - " \"$E_\\mathrm{G}^\\mathrm{d,GGA}$ (eV)\": {\n", - " \"name\": \"properties.optical.bandgaps.GGA|d\",\n", - " \"unit\": \"eV\",\n", - " \"description\": \"Direct band gap computed using GGA (or GGA+U when appropriate)\",\n", - " },\n", - " \"$E_\\mathrm{G}^\\mathrm{da,GGA}$ (eV)\": {\n", - " \"name\": \"properties.optical.bandgaps.GGA|da\",\n", - " \"unit\": \"eV\",\n", - " \"description\": \"Direct allowed band gap computed using GGA (or GGA+U when appropriate), defined as the energy at which dipole transition matrix elements become significant (see manuscript for details)\",\n", - " },\n", - " \"$E_\\mathrm{edge}^\\mathrm{da,GGA}$ (eV)\": {\n", - " \"name\": \"properties.optical.energy|edge.GGA|da\",\n", - " \"unit\": \"eV\",\n", - " \"description\": \"Absorption edge energy, defined as the approximate energy at which the absorption coefficient rises to 1e4 cm-1 and becomes significant (see manuscript for details)\",\n", - " },\n", - " \"$Δ^\\mathrm{d,GGA}$\": {\n", - " \"name\": \"properties.optical.delta.GGA|d\",\n", - " \"unit\": \"\",\n", - " \"description\": \"Forbidden energy difference, defined as the energy difference between the direct band gap and direct allowed band gap, such that a value greater than zero indicates the presence of forbidden or weak transitions\",\n", - " },\n", - " \"$Δ_\\mathrm{edge}^\\mathrm{d,GGA}$\": {\n", - " \"name\": \"properties.optical.delta|edge.GGA|d\",\n", - " \"unit\": \"\",\n", - " \"description\": \"Edge energy difference, defined as defined as the energy difference between the direct band gap and the absorption edge energy\",\n", - " },\n", - " \"$α_\\mathrm{avg.vis}^\\mathrm{GGA}$ (cm$^{-1}$)\": {\n", - " \"name\": \"properties.optical.alpha|vis\",\n", - " \"unit\": \"cm⁻¹\",\n", - " \"description\": \"Average GGA absorption coefficient in the visible regime, using an empirical gap correction from Morales et al. 2017 (10.1021/acs.jpcc.7b07421) (see manuscript for details; caution that this should be recalculated if using a scissor shift!)\",\n", - " },\n", - " \"Optical type\": {\n", - " \"name\": \"properties.optical.type\",\n", - " \"description\": \"Optical type categorization (OT 1\\u20134), following the classification outlined by Yu and Zunger in 2012 (10.1103/PhysRevLett.108.068701)\",\n", - " },\n", + " \"$E_\\mathrm{G}^\\mathrm{GGA}$ (eV)\": {\"name\": \"properties.optical.bandgaps.GGA\", \"unit\": \"eV\", \"description\": \"Fundamental band gap computed using GGA (or GGA+U when appropriate)\"},\n", + " \"$E_\\mathrm{G}^\\mathrm{d,GGA}$ (eV)\": {\"name\": \"properties.optical.bandgaps.GGA|d\", \"unit\": \"eV\", \"description\": \"Direct band gap computed using GGA (or GGA+U when appropriate)\"},\n", + " \"$E_\\mathrm{G}^\\mathrm{da,GGA}$ (eV)\": {\"name\": \"properties.optical.bandgaps.GGA|da\", \"unit\": \"eV\", \"description\": \"Direct allowed band gap computed using GGA (or GGA+U when appropriate), defined as the energy at which dipole transition matrix elements become significant (see manuscript for details)\"},\n", + " \"$E_\\mathrm{edge}^\\mathrm{da,GGA}$ (eV)\": {\"name\": \"properties.optical.energy|edge.GGA|da\", \"unit\": \"eV\", \"description\": \"Absorption edge energy, defined as the approximate energy at which the absorption coefficient rises to 1e4 cm-1 and becomes significant (see manuscript for details)\"},\n", + " \"$Δ^\\mathrm{d,GGA}$\": {\"name\": \"properties.optical.delta.GGA|d\", \"unit\": \"\", \"description\": \"Forbidden energy difference, defined as the energy difference between the direct band gap and direct allowed band gap, such that a value greater than zero indicates the presence of forbidden or weak transitions\"},\n", + " \"$Δ_\\mathrm{edge}^\\mathrm{d,GGA}$\": {\"name\": \"properties.optical.delta|edge.GGA|d\", \"unit\": \"\", \"description\": \"Edge energy difference, defined as defined as the energy difference between the direct band gap and the absorption edge energy\"},\n", + " \"$α_\\mathrm{avg.vis}^\\mathrm{GGA}$ (cm$^{-1}$)\": {\"name\": \"properties.optical.alpha|vis\", \"unit\": \"cm⁻¹\", \"description\": \"Average GGA absorption coefficient in the visible regime, using an empirical gap correction from Morales et al. 2017 (10.1021/acs.jpcc.7b07421) (see manuscript for details; caution that this should be recalculated if using a scissor shift!)\"},\n", + " \"Optical type\": {\"name\": \"properties.optical.type\", \"description\": \"Optical type categorization (OT 1\\u20134), following the classification outlined by Yu and Zunger in 2012 (10.1103/PhysRevLett.108.068701)\"},\n", " # transport properties\n", - " \"$m^*_\\mathrm{e}$\": {\n", - " \"name\": \"properties.transport.effmass.electron\",\n", - " \"unit\": \"mₑ\",\n", - " \"description\": \"Electron effective mass, computed using the BoltzTraP2 package assuming dopings of 10^18 cm-3 (see manuscript for details)\",\n", - " },\n", - " \"$m^*_\\mathrm{h}$\": {\n", - " \"name\": \"properties.transport.effmass.hole\",\n", - " \"unit\": \"mₑ\",\n", - " \"description\": \"Hole effective mass, computed using the BoltzTraP2 package assuming dopings of 10^18 cm-3 (see manuscript for details)\",\n", - " },\n", + " \"$m^*_\\mathrm{e}$\": {\"name\": \"properties.transport.effmass.electron\", \"unit\": \"mₑ\", \"description\": \"Electron effective mass, computed using the BoltzTraP2 package assuming dopings of 10^18 cm-3 (see manuscript for details)\"},\n", + " \"$m^*_\\mathrm{h}$\": {\"name\": \"properties.transport.effmass.hole\", \"unit\": \"mₑ\", \"description\": \"Hole effective mass, computed using the BoltzTraP2 package assuming dopings of 10^18 cm-3 (see manuscript for details)\"},\n", "}\n", "\n", "legend = {v[\"name\"]: v[\"description\"] for v in columns_map.values()}\n", - "legend[\"tables.corrected\"] = (\n", - " \"Absorption coefficient computed with the IPA and a GGA functional, using the empirical gap correction from Morales et al. 2017 (10.1021/acs.jpcc.7b07421) (see manuscript for details)\"\n", - ")\n", - "legend[\"tables.uncorrected\"] = (\n", - " \"Absorption coefficient computed with the IPA and a GGA functional (without any empirical gap correction as in alpha; see manuscript for details)\"\n", - ")\n", + "legend[\"tables.corrected\"] = \"Absorption coefficient computed with the IPA and a GGA functional, using the empirical gap correction from Morales et al. 2017 (10.1021/acs.jpcc.7b07421) (see manuscript for details)\"\n", + "legend[\"tables.uncorrected\"] = \"Absorption coefficient computed with the IPA and a GGA functional (without any empirical gap correction as in alpha; see manuscript for details)\"\n", "\n", - "columns = {\n", - " v[\"name\"]: v.get(\"unit\")\n", - " for v in columns_map.values()\n", - " if v[\"name\"] not in [\"identifier\", \"formula\"]\n", - "}" + "columns = {v[\"name\"]: v.get(\"unit\") for v in columns_map.values() if v[\"name\"] not in [\"identifier\", \"formula\"]}" ] }, { @@ -193,7 +114,7 @@ " for k, v in record.items():\n", " if not isinstance(v, str) and isnan(v):\n", " continue\n", - "\n", + " \n", " key = columns_map[k][\"name\"]\n", " unit = columns_map[k].get(\"unit\")\n", " val = v\n", @@ -201,38 +122,29 @@ " val = \"Yes\" if v else \"No\"\n", " elif unit:\n", " val = f\"{v} {unit}\"\n", - "\n", + " \n", " clean[key] = val\n", "\n", - " contrib = {\n", - " \"identifier\": clean.pop(\"identifier\"),\n", - " \"formula\": clean.pop(\"formula\"),\n", - " \"tables\": [],\n", - " }\n", + " contrib = {\"identifier\": clean.pop(\"identifier\"), \"formula\": clean.pop(\"formula\"), \"tables\": []}\n", " contrib[\"data\"] = unflatten(clean, splitter=\"dot\")\n", "\n", " spectrum = spectra.get(contrib[\"identifier\"])\n", " if spectrum:\n", " spectrum.pop(\"mpid\", None)\n", " spectrum.pop(\"formula\", None)\n", - " table = (\n", - " pd.DataFrame(data=spectrum)\n", - " .rename(\n", - " columns={\n", - " \"energy\": \"energy [eV]\",\n", - " \"alpha\": \"α\",\n", - " \"alpha_uncorr\": \"α|uncorrected\",\n", - " }\n", - " )\n", - " .set_index(\"energy [eV]\")\n", - " )\n", + " table = pd.DataFrame(data=spectrum).rename(\n", + " columns={\"energy\": \"energy [eV]\", \"alpha\": \"α\", \"alpha_uncorr\": \"α|uncorrected\"}\n", + " ).set_index(\"energy [eV]\")\n", " table.attrs = {\n", " \"name\": \"absorption coefficients\",\n", " \"title\": \"Energy-dependent Absorption Coefficients\",\n", - " \"labels\": {\"value\": \"absorption coefficient [cm⁻¹]\", \"variable\": \"method\"},\n", + " \"labels\": {\n", + " \"value\": \"absorption coefficient [cm⁻¹]\",\n", + " \"variable\": \"method\"\n", + " }\n", " }\n", " contrib[\"tables\"].append(table)\n", - "\n", + " \n", " contributions.append(contrib)\n", "\n", "len(contributions)" @@ -291,7 +203,7 @@ "query = {\n", " \"data__properties__other__synthesized__exact\": \"Yes\",\n", " \"data__properties__optical__type__contains\": \"ia\",\n", - " \"data__properties__optical__bandgaps__GGA__value__gt\": 3,\n", + " \"data__properties__optical__bandgaps__GGA__value__gt\": 3\n", "}\n", "client.count(query=query)" ] @@ -303,9 +215,7 @@ "metadata": {}, "outputs": [], "source": [ - "contribs = client.query_contributions(\n", - " query=query, fields=[\"identifier\", \"data.properties.other\"], paginate=True\n", - ")\n", + "contribs = client.query_contributions(query=query, fields=[\"identifier\", \"data.properties.other\"], paginate=True)\n", "contribs[\"data\"][0][\"data\"]" ] }, @@ -317,7 +227,7 @@ "outputs": [], "source": [ "contribs = client.download_contributions(query=query, include=[\"tables\"])\n", - "contribs[0][\"tables\"][0] # DataFrame" + "contribs[0][\"tables\"][0] # DataFrame" ] } ], diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/HFP2023.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/HFP2023.ipynb index d4b05adf45..9b0f05ceb1 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/HFP2023.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/HFP2023.ipynb @@ -9,12 +9,15 @@ "source": [ "%env MPRESTER_MUTE_PROGRESS_BARS 1\n", "# pip install mpcontribs-client mp_api pandas flatten_dict\n", + "import os\n", "import gzip\n", "import json\n", "\n", "from pathlib import Path\n", "from mpcontribs.client import Client\n", + "from mp_api.client import MPRester\n", "from pymatgen.core import Structure\n", + "from pandas import read_csv\n", "from flatten_dict import flatten, unflatten" ] }, @@ -46,10 +49,7 @@ "metadata": {}, "outputs": [], "source": [ - "lookup = {\n", - " doc[\"formula_pretty\"] + \"_\" + str(doc[\"symmetry\"][\"number\"]): doc[\"task_id\"]\n", - " for doc in tasks\n", - "}" + "lookup = {doc[\"formula_pretty\"] + \"_\" + str(doc[\"symmetry\"][\"number\"]): doc[\"task_id\"] for doc in tasks}" ] }, { @@ -88,7 +88,7 @@ "def make_gzip(p_in):\n", " p_out = str(p_in) + \".gz\"\n", " if not Path(p_out).exists():\n", - " with p_in.open(\"rb\") as f_in, gzip.open(p_out, \"wb\") as f_out:\n", + " with p_in.open('rb') as f_in, gzip.open(p_out, 'wb') as f_out:\n", " f_out.writelines(f_in)" ] }, @@ -100,37 +100,41 @@ "outputs": [], "source": [ "columns = {\n", - " \"polarization\": {\"v1\": \"C/m²\", \"v2\": \"C/m²\", \"v3\": \"C/m²\", \"mag\": \"C/m²\"},\n", + " \"polarization\": {\n", + " \"v1\": \"C/m²\",\n", + " \"v2\": \"C/m²\",\n", + " \"v3\": \"C/m²\",\n", + " \"mag\": \"C/m²\"\n", + " },\n", " \"mechanic\": {\n", " \"moduli.bulk\": \"N/m²\",\n", " \"moduli.young\": \"N/m²\",\n", " \"moduli.shear\": \"N/m²\",\n", - " \"ratios.pugh\": \"\", # dimensionless number\n", + " \"ratios.pugh\": \"\", # dimensionless number\n", " \"ratios.poisson\": \"\",\n", " \"compressibility\": \"m²/N\",\n", - " \"unknown\": \"\",\n", - " },\n", + " \"unknown\": \"\"\n", + " }\n", "}\n", "\n", - "\n", "def make_data(key, vals):\n", " cols = columns[key]\n", " dct = {}\n", - "\n", + " \n", " for k, v in dict(zip(cols.keys(), vals)).items():\n", " unit = cols[k]\n", - " dct[k] = f\"{v} {unit}\" if unit else v # 5.5 eV, 100 N/m2\n", - "\n", + " dct[k] = f\"{v} {unit}\" if unit else v # 5.5 eV, 100 N/m2\n", + " \n", " return unflatten(dct, splitter=\"dot\")\n", "\n", "\n", "contributions = []\n", "\n", - "for subdir in datadir.glob(\"**/*\"): # looping over subdirectories (DMP-Co)\n", + "for subdir in datadir.glob('**/*'): # looping over subdirectories (DMP-Co)\n", " if subdir.is_file():\n", " continue\n", - "\n", - " identifier = subdir.name # default to subdir as identifier\n", + " \n", + " identifier = subdir.name # default to subdir as identifier\n", " cifs = list(subdir.glob(\"*.cif\"))\n", "\n", " if cifs:\n", @@ -150,7 +154,7 @@ " # _, spacegroup_number = structure.get_space_group_info()\n", " # chemsys = composition.chemical_system\n", "\n", - " # # 1) try formula and space group\n", + " # # 1) try formula and space group \n", " # docs = search(formula=formula, spacegroup_number=spacegroup_number)\n", " # if not docs:\n", " # # 2) try formula\n", @@ -167,19 +171,17 @@ " formula, _ = composition.get_reduced_formula_and_factor()\n", " _, spacegroup_number = structure.get_space_group_info()\n", " identifier = lookup[f\"{formula}_{spacegroup_number}\"]\n", - " print(identifier) # \"link to MP\"\n", - "\n", + " print(identifier) # \"link to MP\"\n", + " \n", " # make sure everything's gzipped\n", " for p in subdir.glob(\"*.*\"):\n", " if p.suffix in {\".txt\", \".vasp\", \".cif\"}:\n", " make_gzip(p)\n", - "\n", + " \n", " # init contribution; add all files as attachments; add structure\n", " contrib = {\n", - " \"identifier\": identifier,\n", - " \"formula\": formula,\n", - " \"data\": {},\n", - " \"attachments\": list(subdir.glob(\"*.gz\")),\n", + " \"identifier\": identifier, \"formula\": formula, \"data\": {},\n", + " \"attachments\": list(subdir.glob(\"*.gz\"))\n", " }\n", " if identifier.startswith(\"mp-\"):\n", " contrib[\"structures\"] = [structure]\n", @@ -192,16 +194,16 @@ " contrib[\"data\"][\"polarization\"] = make_data(\"polarization\", values)\n", " elif len(values) == 7:\n", " contrib[\"data\"][\"mechanic\"] = make_data(\"mechanic\", values)\n", - "\n", - " # # option to add tensors to `data`\n", - " # for fn in subdir.glob(\"*.txt\"):\n", - " # stem = fn.stem.lower()\n", - " # if stem.endswith(\"_tensor\"):\n", - " # field = \".\".join(stem.split(\"_\")[:-1])\n", - " # df = read_csv(fn, sep=\"\\t\", header=0, names=range(1, 7))\n", - " # df.index = range(1,4)\n", - " # contrib[\"data\"][field] = df.T.to_dict()\n", - "\n", + " \n", + "# # option to add tensors to `data` \n", + "# for fn in subdir.glob(\"*.txt\"):\n", + "# stem = fn.stem.lower()\n", + "# if stem.endswith(\"_tensor\"):\n", + "# field = \".\".join(stem.split(\"_\")[:-1])\n", + "# df = read_csv(fn, sep=\"\\t\", header=0, names=range(1, 7))\n", + "# df.index = range(1,4)\n", + "# contrib[\"data\"][field] = df.T.to_dict()\n", + " \n", " contributions.append(contrib)" ] }, @@ -227,7 +229,7 @@ "client.init_columns(columns)\n", "client.submit_contributions(contributions)\n", "# this shouldn't be necessary but need to re-init columns likely due to bug in API server\n", - "client.init_columns(columns)" + "client.init_columns(columns) " ] } ], diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/MnO2_phase_selection.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/MnO2_phase_selection.ipynb index 613e73e740..d6c63cb805 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/MnO2_phase_selection.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/MnO2_phase_selection.ipynb @@ -6,8 +6,7 @@ "metadata": {}, "outputs": [], "source": [ - "import json\n", - "import os\n", + "import json, os\n", "from mpcontribs.client import Client\n", "from pymatgen.core import Composition, Structure\n", "from pymatgen.ext.matproj import MPRester\n", @@ -20,7 +19,7 @@ "metadata": {}, "outputs": [], "source": [ - "name = \"MnO2_phase_selection\"\n", + "name = 'MnO2_phase_selection'\n", "client = Client()\n", "mpr = MPRester()" ] @@ -48,13 +47,13 @@ "outputs": [], "source": [ "phase_names = {\n", - " \"beta\": \"Pyrolusite\",\n", - " \"gamma\": \"Intergrowth\",\n", - " \"ramsdellite\": \"Ramsdellite\",\n", - " \"alpha\": \"Hollandite\",\n", - " \"lambda\": \"Spinel\",\n", - " \"delta\": \"Layered\",\n", - " \"other\": \"Other\",\n", + " 'beta': 'Pyrolusite',\n", + " 'gamma': 'Intergrowth',\n", + " 'ramsdellite': 'Ramsdellite',\n", + " 'alpha': 'Hollandite',\n", + " 'lambda': 'Spinel',\n", + " 'delta': 'Layered',\n", + " 'other': 'Other',\n", "}" ] }, @@ -64,9 +63,9 @@ "metadata": {}, "outputs": [], "source": [ - "client.projects.update_entry(\n", - " pk=name, project={\"other.phase−names\": phase_names}\n", - ").result()" + "client.projects.update_entry(pk=name, project={\n", + " 'other.phase−names': phase_names\n", + "}).result()" ] }, { @@ -85,10 +84,8 @@ "# mp_contrib_phases: data/MPContrib_formatted_entries.json\n", "# hull_states: data/MPContrib_hull_entries.json\n", "data = {}\n", - "for fn in os.scandir(\n", - " \"/Users/patrick/gitrepos/mp/MPContribs/mpcontribs-data/MnO2_phase_selection\"\n", - "):\n", - " with open(fn, \"r\") as f:\n", + "for fn in os.scandir('/Users/patrick/gitrepos/mp/MPContribs/mpcontribs-data/MnO2_phase_selection'):\n", + " with open(fn, 'r') as f:\n", " data[fn.name] = json.load(f)" ] }, @@ -99,10 +96,8 @@ "outputs": [], "source": [ "other = [\n", - " [\"LiMnO2\", -3.064, \"Y\", \"--\"],\n", - " [\"KMnO2\", -2.222, \"Y\", \"--\"],\n", - " [\"Ca0.5MnO2\", -2.941, \"Y\", \"--\"],\n", - " [\"Na0.5MnO2\", -1.415, \"Y\", \"--\"],\n", + " ['LiMnO2', -3.064, 'Y', '--'], ['KMnO2', -2.222, 'Y', '--'],\n", + " ['Ca0.5MnO2', -2.941, 'Y', '--'], ['Na0.5MnO2', -1.415, 'Y', '--']\n", "]" ] }, @@ -114,43 +109,43 @@ "source": [ "identifiers, contributions = set(), []\n", "\n", - "for hstate in tqdm(data[\"MPContrib_hull_entries.json\"]):\n", - " contrib = {\"project\": name, \"is_public\": True, \"structures\": []}\n", - " phase = hstate[\"phase\"]\n", - " composition = Composition.from_dict(hstate[\"c\"])\n", - " structure = Structure.from_dict(hstate[\"s\"])\n", + "for hstate in tqdm(data['MPContrib_hull_entries.json']):\n", + " contrib = {'project': name, 'is_public': True, 'structures': []}\n", + " phase = hstate['phase']\n", + " composition = Composition.from_dict(hstate['c'])\n", + " structure = Structure.from_dict(hstate['s'])\n", " mpids = mpr.find_structure(structure)\n", " comp = composition.get_integer_formula_and_factor()[0]\n", " identifier = mpids[0] if mpids else comp\n", - " contrib[\"identifier\"] = identifier\n", - "\n", + " contrib['identifier'] = identifier\n", + " \n", " if identifier in identifiers:\n", " continue\n", - "\n", + " \n", " phase_name = phase_names[phase]\n", - " phase_data = data[\"MPContrib_formatted_entries.json\"].get(phase_name, other)\n", + " phase_data = data['MPContrib_formatted_entries.json'].get(phase_name, other)\n", " if not phase_data:\n", " # print('no data found for', composition, phase_name)\n", " continue\n", "\n", " for iv, values in enumerate(phase_data):\n", " if Composition(values[0]) == composition:\n", - " contrib[\"data\"] = {\"GS\": values[2], \"ΔH\": f\"{values[1]} eV/mol\"}\n", + " contrib['data'] = {'GS': values[2], 'ΔH': f'{values[1]} eV/mol'}\n", " if not isinstance(values[3], str):\n", - " contrib[\"data\"][\"ΔHʰ\"] = f\"{values[3]} eV/mol\"\n", + " contrib['data']['ΔHʰ'] = f'{values[3]} eV/mol'\n", " break\n", " else:\n", " # print('no data found for', composition, phase)\n", " continue\n", "\n", - " contrib[\"structures\"].append(structure)\n", + " contrib['structures'].append(structure)\n", " contributions.append(contrib)\n", " identifiers.add(identifier)\n", "\n", "# make sure that contributions with all columns come first\n", - "contributions = [\n", - " d for d in sorted(contributions, key=lambda x: len(x[\"data\"]), reverse=True)\n", - "]\n", + "contributions = [d for d in sorted(\n", + " contributions, key=lambda x: len(x[\"data\"]), reverse=True\n", + ")]\n", "len(contributions)" ] }, @@ -189,18 +184,14 @@ "query = {\n", " \"project\": name,\n", " \"formula__contains\": \"Mg\",\n", - " # \"data__GS__contains\": \"Y\",\n", + "# \"data__GS__contains\": \"Y\",\n", " \"data__ΔHʰ__value__lte\": -100,\n", " \"_order_by\": \"data__ΔH__value\",\n", " \"order\": \"desc\",\n", " \"_fields\": [\n", - " \"id\",\n", - " \"identifier\",\n", - " \"formula\",\n", - " \"data.GS\",\n", - " \"data.ΔH.value\",\n", - " \"data.ΔHʰ.value\",\n", - " ],\n", + " \"id\", \"identifier\", \"formula\",\n", + " \"data.GS\", \"data.ΔH.value\", \"data.ΔHʰ.value\"\n", + " ]\n", "}\n", "client.contributions.get_entries(**query).result()" ] diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/attachments.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/attachments.ipynb index 05dab6fcb5..d13b8dffe5 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/attachments.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/attachments.ipynb @@ -33,15 +33,13 @@ "path_gz = downloads / \"2021-02-19_scan_mpids_changed.json.gz\"\n", "path_img = downloads / \"IMG-20210224-WA0010.jpg\"\n", "\n", - "attachment = Attachment.from_data(\"other\", {\"hello\": \"world\", \"test\": [1, 2, 4]})\n", + "attachment = Attachment.from_data(\"other\", {\"hello\": \"world\", \"test\": [1,2,4]})\n", "\n", - "contributions = [\n", - " {\n", - " \"project\": name,\n", - " \"identifier\": \"mp-2\",\n", - " \"attachments\": [path_gz, path_img, attachment],\n", - " }\n", - "]" + "contributions = [{\n", + " \"project\": name,\n", + " \"identifier\": \"mp-2\",\n", + " \"attachments\": [path_gz, path_img, attachment]\n", + "}]" ] }, { @@ -103,9 +101,7 @@ "metadata": {}, "outputs": [], "source": [ - "attms = client.attachments.get_entries(\n", - " md5__in=md5s, mime__contains=\"jpeg\", _fields=[\"id\"]\n", - ").result()\n", + "attms = client.attachments.get_entries(md5__in=md5s, mime__contains=\"jpeg\", _fields=[\"id\"]).result()\n", "aid = attms[\"data\"][0][\"id\"]" ] }, diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/bioi_defects.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/bioi_defects.ipynb index fbe85e3950..2cc3b702f9 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/bioi_defects.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/bioi_defects.ipynb @@ -40,29 +40,25 @@ "metadata": {}, "outputs": [], "source": [ - "df1 = read_csv(\n", - " StringIO(\"\"\"\n", + "df1 = read_csv(StringIO(\"\"\"\n", "BiOI thickness [nm],Peak EQE [%],Integrated J|SC [mA/cm²],Measured J|SC [mA/cm²], Average J|SC [mA/cm²]\n", "440,79.5,6.4,6.2,5.5\n", "570,80.2,6.4,5.8,5.6\n", "720,72.6,6.5,6.6,6.3\n", "1090,46.4,3.5,3.9,4.0\n", "1670,17.6,1.3,0.6,0.4\n", - "\"\"\")\n", - ")\n", + "\"\"\"))\n", "df1.set_index(\"BiOI thickness [nm]\", inplace=True)\n", "df1.attrs[\"name\"] = \"Currents vs BiOI thickness\"\n", "\n", - "df2 = read_csv(\n", - " StringIO(\"\"\"\n", + "df2 = read_csv(StringIO(\"\"\"\n", "layer,VB-Eᶠ [eV],WF [eV],VB [eV],Eᵍ [eV],CB [eV]\n", "NiOₓ on ITO,0.6,4.8,5.4,3.6,1.8\n", "220 nm BiOI on NiOₓ|ITO,1.3,4.6,5.9,1.9,4.0\n", "440 nm BiOI on NiOₓ|ITO,1.1,5.0,6.1,1.9,4.2\n", "720 nm BiOI on NiOₓ|ITO,0.9,5.1,6.0,1.9,4.1\n", "ZnO on BiOI|NiOₓ|ITO,2.8,4.5,7.3,3.5,3.8\n", - "\"\"\")\n", - ")\n", + "\"\"\"))\n", "df2.set_index(\"layer\", inplace=True)\n", "df2.attrs[\"name\"] = \"Voltages vs layer\"" ] @@ -74,18 +70,14 @@ "metadata": {}, "outputs": [], "source": [ - "contributions = [\n", - " {\n", - " \"project\": name,\n", - " \"identifier\": \"mp-22987\",\n", - " \"is_public\": True,\n", - " \"data\": {\n", - " \"rev\": {\"J\": \"6.3 mA/cm²\", \"V\": \"0.75 V\", \"FF\": \"39 %\", \"PCE\": \"1.79 %\"},\n", - " \"fwd\": {\"J\": \"6.3 mA/cm²\", \"V\": \"0.75 V\", \"FF\": \"37 %\", \"PCE\": \"1.74 %\"},\n", - " },\n", - " \"tables\": [df1, df2],\n", - " }\n", - "]" + "contributions = [{\n", + " \"project\": name, \"identifier\": \"mp-22987\", \"is_public\": True,\n", + " \"data\": {\n", + " \"rev\": {\"J\": \"6.3 mA/cm²\", \"V\": \"0.75 V\", \"FF\": \"39 %\", \"PCE\": \"1.79 %\"},\n", + " \"fwd\": {\"J\": \"6.3 mA/cm²\", \"V\": \"0.75 V\", \"FF\": \"37 %\", \"PCE\": \"1.74 %\"},\n", + " },\n", + " \"tables\": [df1, df2]\n", + "}]" ] }, { diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/cards.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/cards.ipynb index a8dc009b76..e67952d37e 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/cards.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/cards.ipynb @@ -28,12 +28,7 @@ "metadata": {}, "outputs": [], "source": [ - "COMPONENTS = [\n", - " \"data\",\n", - " \"tables\",\n", - " \"structures\",\n", - " \"attachments\",\n", - "] # supported contribution components\n", + "COMPONENTS = [\"data\", \"tables\", \"structures\", \"attachments\"] # supported contribution components\n", "identifier = \"mp-2715\" # \"mp-6340\"" ] }, @@ -66,8 +61,7 @@ "# basic project info for all projects\n", "names = list(all_ids.keys())\n", "projects = client.projects.get_entries(\n", - " name__in=names,\n", - " _fields=[\"name\", \"long_title\", \"authors\", \"description\", \"references\"],\n", + " name__in=names, _fields=[\"name\", \"long_title\", \"authors\", \"description\", \"references\"]\n", ").result()" ] }, @@ -78,7 +72,7 @@ "metadata": {}, "outputs": [], "source": [ - "projects # [\"total_count\"] # total number of projects for this identifier" + "projects#[\"total_count\"] # total number of projects for this identifier" ] }, { @@ -96,8 +90,8 @@ "metadata": {}, "outputs": [], "source": [ - "name = \"carrier_transport\" # names[0] # selected project\n", - "ids = list(all_ids[name][\"ids\"]) # list of contribution ObjectIDs" + "name = \"carrier_transport\" #names[0] # selected project\n", + "ids = list(all_ids[name][\"ids\"]) # list of contribution ObjectIDs" ] }, { @@ -130,10 +124,8 @@ "metadata": {}, "outputs": [], "source": [ - "data_columns = {} # potential data columns in dot-notation and their units\n", - "root_data_columns = defaultdict(\n", - " set\n", - ") # potential root-level data columns and their (list of) unit(s)\n", + "data_columns = {} # potential data columns in dot-notation and their units\n", + "root_data_columns = defaultdict(set) # potential root-level data columns and their (list of) unit(s)\n", "has_component = {c: False for c in COMPONENTS} # potentially available components\n", "\n", "for column in info[\"columns\"]:\n", @@ -214,10 +206,10 @@ "outputs": [], "source": [ "# retrieve full sub-tree of values for the selected root data column\n", - "root_column = \"PF\" # list(root_data_columns.keys())[0]\n", + "root_column = \"PF\" # list(root_data_columns.keys())[0]\n", "fields = [\n", " f\"data.{col}\" if unit is None else f\"data.{col}.display\"\n", - " for col, unit in data_columns.items()\n", + " for col, unit in data_columns.items() \n", " if col.startswith(root_column)\n", "]\n", "resp = client.contributions.get_entry(pk=cid, _fields=fields).result()" @@ -259,7 +251,7 @@ "metadata": {}, "outputs": [], "source": [ - "resp[component] # use this to show list of available tables (and table ObjectIDs)" + "resp[component] # use this to show list of available tables (and table ObjectIDs)" ] }, { diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/carrier_transport.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/carrier_transport.ipynb index fb0a3b5397..68e1c4f64d 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/carrier_transport.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/carrier_transport.ipynb @@ -7,15 +7,15 @@ "outputs": [], "source": [ "from mpcontribs.client import Client\n", - "import gzip\n", - "import json\n", - "import os\n", + "import gzip, json, os\n", "import numpy as np\n", "from pandas import DataFrame\n", + "from collections import defaultdict\n", "from tqdm.notebook import tqdm\n", "from unflatten import unflatten\n", + "from pathlib import Path\n", "\n", - "name = \"carrier_transport\"" + "name = 'carrier_transport'" ] }, { @@ -50,26 +50,26 @@ " \"functional\": \"Type of DFT functional \\\n", " (GGA: generalized gradient approximation, GGA+U: GGA + U approximation)\",\n", " \"metal\": \"If True, crystal is a metal\",\n", - " \"ΔE\": \"Band gap in eV\",\n", - " \"V\": \"Unit cell volume, in cubic angstrom\",\n", - " \"mₑᶜ\": \"Eigenvalues (ε₁, ε₂, ε₃) of the conductivity effective mass and their average (ε̄)\",\n", - " \"S\": \"Average eigenvalue of the Seebeck coefficient\",\n", - " \"σ\": \"Average eigenvalue of the conductivity\",\n", - " \"κₑ\": \"Average eigenvalue of the electrical thermal conductivity\",\n", - " \"PF\": \"Average eigenvalue of the Power Factor\",\n", - " \"Sᵉ\": \"Value (v), temperature (T), and doping level (c) at the \\\n", - " maximum of the average eigenvalue of the Seebeck coefficient\",\n", - " \"σᵉ\": \"Value (v), temperature (T), and doping level (c) at the \\\n", - " maximum of the average eigenvalue of the conductivity\",\n", - " \"κₑᵉ\": \"Value (v), temperature (T), and doping level (c) at the \\\n", - " maximum of the average eigenvalue of the electrical thermal conductivity\",\n", - " \"PFᵉ\": \"Value (v), temperature (T), and doping level (c) at the \\\n", - " maximum of the average eigenvalue of the Power Factor\",\n", + " 'ΔE': 'Band gap in eV',\n", + " 'V' : \"Unit cell volume, in cubic angstrom\",\n", + " 'mₑᶜ': 'Eigenvalues (ε₁, ε₂, ε₃) of the conductivity effective mass and their average (ε̄)',\n", + " 'S': 'Average eigenvalue of the Seebeck coefficient',\n", + " 'σ' : 'Average eigenvalue of the conductivity',\n", + " 'κₑ' : 'Average eigenvalue of the electrical thermal conductivity',\n", + " 'PF': 'Average eigenvalue of the Power Factor',\n", + " 'Sᵉ': 'Value (v), temperature (T), and doping level (c) at the \\\n", + " maximum of the average eigenvalue of the Seebeck coefficient', \n", + " 'σᵉ': 'Value (v), temperature (T), and doping level (c) at the \\\n", + " maximum of the average eigenvalue of the conductivity',\n", + " 'κₑᵉ': 'Value (v), temperature (T), and doping level (c) at the \\\n", + " maximum of the average eigenvalue of the electrical thermal conductivity',\n", + " 'PFᵉ': 'Value (v), temperature (T), and doping level (c) at the \\\n", + " maximum of the average eigenvalue of the Power Factor',\n", "}\n", "\n", "references = [\n", " {\"label\": \"SData\", \"url\": \"https://doi.org/10.1038/sdata.2017.85\"},\n", - " {\"label\": \"Dryad\", \"url\": \"https://doi.org/10.5061/dryad.gn001\"},\n", + " {\"label\": \"Dryad\", \"url\": \"https://doi.org/10.5061/dryad.gn001\"}\n", "]\n", "\n", "# with Client() as client:\n", @@ -88,13 +88,13 @@ }, "outputs": [], "source": [ - "eigs_keys = [\"ε₁\", \"ε₂\", \"ε₃\", \"ε̄\"]\n", + "eigs_keys = ['ε₁', 'ε₂', 'ε₃', 'ε̄']\n", "prop_defs = {\n", - " \"mₑᶜ\": \"mₑ\",\n", - " \"S\": \"µV/K\",\n", - " \"σ\": \"1/fΩ/m/s\",\n", - " \"κₑ\": \"GW/K/m/s\",\n", - " \"PF\": \"GW/K²/m/s\",\n", + " 'mₑᶜ': \"mₑ\",\n", + " 'S': \"µV/K\",\n", + " 'σ': \"1/fΩ/m/s\",\n", + " 'κₑ': \"GW/K/m/s\",\n", + " 'PF': \"GW/K²/m/s\"\n", "}\n", "ext_defs = {\"T\": \"K\", \"c\": \"µm⁻³\"}\n", "columns = {\"task\": None, \"functional\": None, \"metal\": None, \"ΔE\": \"eV\", \"V\": \"ų\"}\n", @@ -110,15 +110,15 @@ "for kk, unit in prop_defs.items():\n", " if kk.startswith(\"mₑ\"):\n", " continue\n", - "\n", + " \n", " for k in [\"p\", \"n\"]:\n", " path = f\"{kk}ᵉ.{k}\"\n", " columns[f\"{path}.v\"] = unit\n", "\n", " for a, b in ext_defs.items():\n", " columns[f\"{path}.{a}\"] = b\n", - "\n", - "\n", + " \n", + " \n", "columns[\"tables\"] = None\n", "\n", "# with Client() as client:\n", @@ -138,13 +138,13 @@ "metadata": {}, "outputs": [], "source": [ - "input_dir = \"/project/projectdirs/matgen/fricci/transport_data/coarse\"\n", + "input_dir = '/project/projectdirs/matgen/fricci/transport_data/coarse'\n", "# input_dir = '/Users/patrick/gitrepos/mp/mpcontribs-data/transport_coarse'\n", - "props_map = { # original units\n", - " \"cond_eff_mass\": {\"name\": \"mₑᶜ\", \"unit\": \"mₑ\"},\n", - " \"seebeck_doping\": {\"name\": \"S\", \"unit\": \"µV/K\"},\n", - " \"cond_doping\": {\"name\": \"σ\", \"unit\": \"1/Ω/m/s\"},\n", - " \"kappa_doping\": {\"name\": \"κₑ\", \"unit\": \"W/K/m/s\"},\n", + "props_map = { # original units\n", + " 'cond_eff_mass': {\"name\": 'mₑᶜ', \"unit\": \"mₑ\"},\n", + " 'seebeck_doping': {\"name\": 'S', \"unit\": \"µV/K\"},\n", + " 'cond_doping': {\"name\": 'σ', \"unit\": \"1/Ω/m/s\"},\n", + " 'kappa_doping': {\"name\": 'κₑ', \"unit\": \"W/K/m/s\"},\n", "}" ] }, @@ -170,74 +170,70 @@ "title_prefix = \"Temperature- and Doping-Level-Dependence\"\n", "\n", "titles = {\n", - " \"S\": \"Seebeck Coefficient\",\n", - " \"σ\": \"Conductivity\",\n", - " \"κₑ\": \"Electrical Thermal Conductivity\",\n", - " \"PF\": \"Power Factor\",\n", + " 'S': \"Seebeck Coefficient\",\n", + " 'σ': \"Conductivity\",\n", + " 'κₑ': \"Electrical Thermal Conductivity\",\n", + " 'PF': \"Power Factor\"\n", "}\n", "\n", "with Client() as client:\n", - " identifiers = (\n", - " client.get_all_ids(dict(project=name)).get(name, {}).get(\"identifiers\", [])\n", - " )\n", - "\n", + " identifiers = client.get_all_ids(dict(project=name)).get(name, {}).get(\"identifiers\", [])\n", + " \n", "print(\"#contribs:\", len(identifiers))\n", "\n", "for obj in tqdm(files):\n", - " identifier = obj.name.split(\".\", 1)[0].rsplit(\"_\", 1)[-1]\n", - " valid = bool(identifier.startswith(\"mp-\") or identifier.startswith(\"mvc-\"))\n", + " identifier = obj.name.split('.', 1)[0].rsplit('_', 1)[-1]\n", + " valid = bool(identifier.startswith('mp-') or identifier.startswith('mvc-'))\n", "\n", " if not valid:\n", - " print(identifier, \"not valid\")\n", + " print(identifier, 'not valid')\n", " continue\n", "\n", " if identifier in identifiers:\n", " continue\n", "\n", - " with gzip.open(obj.path, \"rb\") as input_file:\n", + " with gzip.open(obj.path, 'rb') as input_file:\n", " data = json.loads(input_file.read())\n", - " task_type = \"GGA+U\" if \"GGA+U\" in data[\"gap\"] else \"GGA\"\n", - " gap = data[\"gap\"][task_type]\n", + " task_type = 'GGA+U' if 'GGA+U' in data['gap'] else 'GGA'\n", + " gap = data['gap'][task_type]\n", "\n", " cdata = {\n", - " \"task\": data[\"task_id\"][task_type],\n", + " \"task\": data['task_id'][task_type],\n", " \"functional\": task_type,\n", - " \"metal\": \"Yes\" if gap < 0.1 else \"No\",\n", + " \"metal\": 'Yes' if gap < 0.1 else 'No',\n", " \"ΔE\": f\"{gap} eV\",\n", - " \"V\": f\"{data['volume']} ų\",\n", + " \"V\": f\"{data['volume']} ų\"\n", " }\n", "\n", - " tables = []\n", + " tables = [] \n", " S2arr = []\n", "\n", - " for doping_type in [\"p\", \"n\"]:\n", + " for doping_type in ['p', 'n']:\n", + "\n", " for key, v in props_map.items():\n", " prop = data[task_type][key].get(doping_type, {})\n", - " d = prop.get(\"300\", {}).get(\"1e+18\", {})\n", + " d = prop.get('300', {}).get('1e+18', {})\n", " unit = v[\"unit\"]\n", "\n", " if d:\n", - " eigs = d if isinstance(d, list) else d[\"eigs\"]\n", + " eigs = d if isinstance(d, list) else d['eigs']\n", " k = f\"{v['name']}.{doping_type}\"\n", " value = f\"{np.mean(eigs)} {unit}\"\n", "\n", - " if key == \"cond_eff_mass\":\n", + " if key == 'cond_eff_mass':\n", " cdata[k] = {eigs_keys[-1]: value}\n", " for neig, eig in enumerate(eigs):\n", " cdata[k][eigs_keys[neig]] = f\"{eig} {unit}\"\n", " else:\n", " cdata[k] = value\n", - " if key == \"seebeck_doping\":\n", - " S2 = np.dot(d[\"tensor\"], d[\"tensor\"])\n", - " elif key == \"cond_doping\":\n", - " pf = (\n", - " np.mean(np.linalg.eigh(np.dot(S2, d[\"tensor\"]))[0])\n", - " * 1e-8\n", - " )\n", + " if key == 'seebeck_doping':\n", + " S2 = np.dot(d['tensor'], d['tensor'])\n", + " elif key == 'cond_doping':\n", + " pf = np.mean(np.linalg.eigh(np.dot(S2, d['tensor']))[0]) * 1e-8\n", " cdata[f\"PF.{doping_type}\"] = f\"{pf} µW/cm/K²/s\"\n", "\n", " if key != \"cond_eff_mass\":\n", - " prop_averages, dopings, cols = [], None, [\"T [K]\"]\n", + " prop_averages, dopings, cols = [], None, ['T [K]']\n", " pf_averages = []\n", " temps = sorted(map(int, prop.keys()))\n", "\n", @@ -249,31 +245,28 @@ " dopings = sorted(map(float, prop[str(temp)].keys()))\n", "\n", " for idop, doping in enumerate(dopings):\n", - " doping_str = f\"{doping:.0e}\"\n", + " doping_str = f'{doping:.0e}'\n", " if len(cols) <= len(dopings):\n", - " cols.append(f\"{doping_str}\".replace(\"+\", \"\"))\n", + " cols.append(f'{doping_str}'.replace(\"+\", \"\"))\n", "\n", " d = prop[str(temp)][doping_str]\n", " row.append(np.mean(d[\"eigs\"]))\n", - " tensor = d[\"tensor\"]\n", + " tensor = d['tensor']\n", "\n", - " if key == \"seebeck_doping\":\n", + " if key == 'seebeck_doping':\n", " S2arr.append(np.dot(tensor, tensor))\n", - " elif key == \"cond_doping\":\n", + " elif key == 'cond_doping': \n", " S2idx = it * len(dopings) + idop\n", - " pf = (\n", - " np.mean(\n", - " np.linalg.eigh(np.dot(S2arr[S2idx], tensor))[0]\n", - " )\n", - " * 1e-8\n", - " )\n", + " pf = np.mean(np.linalg.eigh(\n", + " np.dot(S2arr[S2idx], tensor)\n", + " )[0]) * 1e-8\n", " row_pf.append(pf)\n", "\n", " prop_averages.append(row)\n", " pf_averages.append(row_pf)\n", "\n", " df_data = [np.array(prop_averages)]\n", - " if key == \"cond_doping\":\n", + " if key == 'cond_doping':\n", " df_data.append(np.array(pf_averages))\n", "\n", " for ii, np_prop_averages in enumerate(df_data):\n", @@ -282,42 +275,36 @@ "\n", " df = DataFrame(np_prop_averages, columns=cols)\n", " df.set_index(\"T [K]\", inplace=True)\n", - " df.columns.name = columns_name # legend name\n", - " df.attrs[\"name\"] = (\n", - " f\"{nm}({doping_type})\" # -> used as title by default\n", - " )\n", - " df.attrs[\"title\"] = (\n", - " f\"{title_prefix} of {doping_type}-type {titles[nm]}\"\n", - " )\n", + " df.columns.name = columns_name # legend name\n", + " df.attrs[\"name\"] = f'{nm}({doping_type})' # -> used as title by default\n", + " df.attrs[\"title\"] = f'{title_prefix} of {doping_type}-type {titles[nm]}'\n", " df.attrs[\"labels\"] = {\n", - " \"value\": f\"{nm}({doping_type}) [{u}]\", # y-axis label\n", - " # \"variable\": columns_name # alternative for df.columns.name\n", + " \"value\": f'{nm}({doping_type}) [{u}]', # y-axis label\n", + " #\"variable\": columns_name # alternative for df.columns.name\n", " }\n", " tables.append(df)\n", "\n", - " arr_prop_avg = np_prop_averages[:, 1:] # [:,[4,8,12]]\n", + " arr_prop_avg = np_prop_averages[:,1:] #[:,[4,8,12]]\n", " max_v = np.max(arr_prop_avg)\n", "\n", - " if key[0] == \"s\" and doping_type == \"n\":\n", + " if key[0] == 's' and doping_type == 'n':\n", " max_v = np.min(arr_prop_avg)\n", - " if key[0] == \"k\":\n", + " if key[0] == 'k':\n", " max_v = np.min(arr_prop_avg)\n", "\n", - " arg_max = np.argwhere(arr_prop_avg == max_v)[0]\n", - " elabel = f\"{nm}ᵉ\"\n", - " cdata[f\"{elabel}.{doping_type}\"] = unflatten(\n", - " {\n", - " \"v\": f\"{max_v} {u}\",\n", - " \"T\": f\"{temps[arg_max[0]]} K\",\n", - " \"c\": f\"{dopings[arg_max[1]]} cm⁻³\",\n", - " }\n", - " )\n", - "\n", - " contrib = {\"project\": name, \"identifier\": identifier, \"is_public\": True}\n", + " arg_max = np.argwhere(arr_prop_avg==max_v)[0]\n", + " elabel = f'{nm}ᵉ'\n", + " cdata[f'{elabel}.{doping_type}'] = unflatten({\n", + " 'v': f\"{max_v} {u}\",\n", + " 'T': f\"{temps[arg_max[0]]} K\",\n", + " 'c': f\"{dopings[arg_max[1]]} cm⁻³\"\n", + " })\n", + "\n", + " contrib = {'project': name, 'identifier': identifier, 'is_public': True}\n", " contrib[\"data\"] = unflatten(cdata)\n", " contrib[\"tables\"] = tables\n", " contributions.append(contrib)\n", - "\n", + " \n", "len(contributions)" ] }, @@ -348,7 +335,7 @@ "\n", "with open(\"carrier_transport_p-type-update.json\", \"r\") as f:\n", " contributions = json.load(f)\n", - "\n", + " \n", "len(contributions)" ] }, @@ -363,10 +350,7 @@ "name = \"carrier_transport\"\n", "\n", "with Client() as client:\n", - " query = {\n", - " \"project\": name,\n", - " \"data__functional__exact\": \"\",\n", - " } # data.functional not set after rename type -> functional\n", + " query = {\"project\": name, \"data__functional__exact\": \"\"} # data.functional not set after rename type -> functional\n", " ids_map = client.get_all_ids(query, fmt=\"map\").get(name)\n", "\n", "len(ids_map) # = number of contributions to be updated" @@ -385,17 +369,15 @@ "for contrib in contributions:\n", " pk = ids_map.get(contrib[\"identifier\"], {}).get(\"id\")\n", " if pk:\n", - " submit.append(\n", - " {\n", - " \"data\": {\n", - " k: {kk: vv for kk, vv in v.items() if kk == \"p\"}\n", - " if isinstance(v, dict)\n", - " else v\n", - " for k, v in contrib[\"data\"].items()\n", - " if k == \"functional\" or \"ᵉ\" in k\n", - " }\n", - " }\n", - " )\n", + " submit.append({\"data\": {\n", + " k: {\n", + " kk: vv\n", + " for kk, vv in v.items()\n", + " if kk == \"p\"\n", + " } if isinstance(v, dict) else v\n", + " for k, v in contrib[\"data\"].items()\n", + " if k == \"functional\" or \"ᵉ\" in k\n", + " }})\n", " submit[-1][\"id\"] = pk\n", "\n", "len(submit)" @@ -411,8 +393,8 @@ "outputs": [], "source": [ "with Client() as client:\n", - " # client.delete_contributions(name)\n", - " # client.init_columns(name, columns)\n", + " #client.delete_contributions(name)\n", + " #client.init_columns(name, columns)\n", " client.submit_contributions(submit, ignore_dupes=True)" ] }, @@ -433,19 +415,19 @@ "\n", "query = {\n", " \"project\": \"carrier_transport\",\n", - " # \"formula_contains\": \"ZnS\",\n", - " # \"identifier__in\": [\"mp-10695\", \"mp-760381\"], # ZnS, CuS\n", + "# \"formula_contains\": \"ZnS\",\n", + "# \"identifier__in\": [\"mp-10695\", \"mp-760381\"], # ZnS, CuS\n", " \"data__functional__exact\": \"GGA+U\",\n", " \"data__metal__contains\": \"Y\",\n", " \"data__mₑᶜ__p__ε̄__value__gte\": 1000,\n", " \"_order_by\": \"data__mₑᶜ__p__ε̄__value\",\n", " \"order\": \"desc\",\n", - " \"_fields\": [\"id\", \"identifier\", \"formula\", \"data.mₑᶜ.p.ε̄.value\"],\n", + " \"_fields\": [\"id\", \"identifier\", \"formula\", \"data.mₑᶜ.p.ε̄.value\"]\n", "}\n", "\n", "with Client() as client:\n", " result = client.contributions.get_entries(**query).result()\n", - "\n", + " \n", "result" ] }, @@ -479,8 +461,8 @@ "}\n", "\n", "print(client.get_totals(query=query))\n", - "query[\"format\"] = \"json\" # \"csv\" or \"json\"\n", - "client.download_contributions(query) # , include=[\"tables\"])" + "query[\"format\"] = \"json\" # \"csv\" or \"json\"\n", + "client.download_contributions(query) #, include=[\"tables\"])" ] }, { diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/defect_genome_pcfc_materials.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/defect_genome_pcfc_materials.ipynb index 2858dba84d..eb10604712 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/defect_genome_pcfc_materials.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/defect_genome_pcfc_materials.ipynb @@ -18,7 +18,7 @@ "metadata": {}, "outputs": [], "source": [ - "name = \"defect_genome_pcfc_materials\"\n", + "name = 'defect_genome_pcfc_materials'\n", "client = Client()\n", "mpr = MPRester()" ] @@ -45,15 +45,9 @@ "metadata": {}, "outputs": [], "source": [ - "client.projects.update_entry(\n", - " pk=name,\n", - " project={\n", - " \"references[0]\": {\n", - " \"label\": \"ACS\",\n", - " \"url\": \"https://doi.org/10.1021/acs.jpcc.7b08716\",\n", - " }\n", - " },\n", - ").result()" + "client.projects.update_entry(pk=name, project={\n", + " \"references[0]\": {\"label\": \"ACS\", \"url\": \"https://doi.org/10.1021/acs.jpcc.7b08716\"}\n", + "}).result()" ] }, { @@ -69,16 +63,12 @@ "metadata": {}, "outputs": [], "source": [ - "df = read_excel(\n", - " \"/Users/patrick/gitrepos/mp/MPContribs/mpcontribs-data/DefectGenome_JPCC-data_MP.xlsx\"\n", - ")\n", - "df.columns = MultiIndex.from_arrays(\n", - " [\n", - " [\"\", \"\", \"\", \"Eᶠ\", \"Eᶠ\", \"Eᶠ\", \"Eᶠ\", \"ΔEᵢ\"],\n", - " [\"A\", \"B\", \"a\", \"ABO₃\", \"Yᴮ\", \"Vᴼ\", \"Hᵢ\", \"Yᴮ−Hᵢ\"],\n", - " ]\n", - ")\n", - "units = {\"A\": \"\", \"B\": \"\", \"a\": \"Å\"}\n", + "df = read_excel('/Users/patrick/gitrepos/mp/MPContribs/mpcontribs-data/DefectGenome_JPCC-data_MP.xlsx')\n", + "df.columns = MultiIndex.from_arrays([\n", + " ['', '', '', 'Eᶠ', 'Eᶠ', 'Eᶠ', 'Eᶠ', 'ΔEᵢ'],\n", + " ['A', 'B', 'a', 'ABO₃', 'Yᴮ', 'Vᴼ', 'Hᵢ', 'Yᴮ−Hᵢ']\n", + "])\n", + "units = {'A': '', 'B': '', 'a': 'Å'}\n", "df" ] }, @@ -91,35 +81,33 @@ "contributions = []\n", "for idx, row in df.iterrows():\n", " A, B = row[df.columns[0]], row[df.columns[1]]\n", - " formula = f\"{A}{B}O3\"\n", + " formula = f'{A}{B}O3'\n", " data = mpr.get_data(formula, prop=\"volume\")\n", "\n", " if len(data) > 1:\n", - " volume = row[df.columns[2]] ** 3\n", + " volume = row[df.columns[2]]**3\n", " for d in data:\n", - " d[\"dV\"] = abs(d[\"volume\"] - volume)\n", - " data = sorted(data, key=lambda item: item[\"dV\"])\n", + " d['dV'] = abs(d['volume']-volume)\n", + " data = sorted(data, key=lambda item: item['dV'])\n", " elif not data:\n", - " print(formula, \"not found on MP\")\n", + " print(formula, 'not found on MP')\n", " continue\n", "\n", - " identifier = data[0][\"material_id\"]\n", - " # print(idx, formula, identifier)\n", - "\n", + " identifier = data[0]['material_id']\n", + " #print(idx, formula, identifier)\n", + " \n", " data = {}\n", " for col in df.columns:\n", " flat_col = \".\".join([c for c in col if c])\n", - " unit = units.get(flat_col, \"eV\")\n", - " data[flat_col] = f\"{row[col]} {unit}\" if unit else row[col]\n", + " unit = units.get(flat_col, 'eV')\n", + " data[flat_col] = f'{row[col]} {unit}' if unit else row[col]\n", "\n", " contrib = {\n", - " \"project\": name,\n", - " \"identifier\": identifier,\n", - " \"is_public\": True,\n", - " \"data\": unflatten(data),\n", + " 'project': name, 'identifier': identifier, 'is_public': True,\n", + " 'data': unflatten(data)\n", " }\n", " contributions.append(contrib)\n", - "\n", + " \n", "len(contributions)" ] }, @@ -155,20 +143,16 @@ "source": [ "query = {\n", " \"project\": name,\n", - " # \"formula__contains\": \"Mg\",\n", + "# \"formula__contains\": \"Mg\",\n", " \"data__A__contains\": \"Mg\",\n", " \"data__a__value__lte\": 4.1,\n", " \"data__Eᶠ__ABO₃__value__lte\": 3.2,\n", " \"_order_by\": \"data__a__value\",\n", " \"order\": \"desc\",\n", " \"_fields\": [\n", - " \"id\",\n", - " \"identifier\",\n", - " \"formula\",\n", - " \"data.A\",\n", - " \"data.a.value\",\n", - " \"data.Eᶠ.ABO₃.value\",\n", - " ],\n", + " \"id\", \"identifier\", \"formula\",\n", + " \"data.A\", \"data.a.value\", \"data.Eᶠ.ABO₃.value\"\n", + " ] \n", "}\n", "client.contributions.get_entries(**query).result()" ] diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/deltaHvacancy.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/deltaHvacancy.ipynb index 5688c7c429..523de5837a 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/deltaHvacancy.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/deltaHvacancy.ipynb @@ -37,9 +37,7 @@ "outputs": [], "source": [ "# allow non-unique identifiers (disables duplicate checking)\n", - "client.projects.updateProjectByName(\n", - " pk=client.project, project={\"unique_identifiers\": False}\n", - ").result()" + "client.projects.updateProjectByName(pk=client.project, project={\"unique_identifiers\": False}).result()" ] }, { @@ -52,15 +50,12 @@ "# set \"other\" field in project info to explain data columns\n", "# appears on hover in contribution section on materials details pages\n", "client.projects.updateProjectByName(\n", - " pk=client.project,\n", - " project={\n", - " \"other\": {\n", - " \"dH\": \"vacancy formation enthalpy in eV\",\n", - " \"dH|atom\": \"vacancy formation enthalpy in eV/atom\",\n", - " \"m\": \"electron effective mass in mₑ\",\n", - " # TODO add more as needed\n", - " }\n", - " },\n", + " pk=client.project, project={\"other\": {\n", + " \"dH\": \"vacancy formation enthalpy in eV\",\n", + " \"dH|atom\": \"vacancy formation enthalpy in eV/atom\",\n", + " \"m\": \"electron effective mass in mₑ\"\n", + " # TODO add more as needed\n", + " }}\n", ").result()" ] }, @@ -73,33 +68,28 @@ "source": [ "# load data\n", "drivedir = Path(\"/Users/patrick/GoogleDriveLBNL/My Drive/\")\n", - "datadir = drivedir / Path(\n", - " \"MaterialsProject/gitrepos/mpcontribs-data/deltaHvacancy/nrel_matdb\"\n", - ")\n", + "datadir = drivedir / Path(\"MaterialsProject/gitrepos/mpcontribs-data/deltaHvacancy/nrel_matdb\")\n", "\n", "columns_map = {\n", " \"formula\": {\"name\": \"formula\"},\n", - " \"defectname\": {\"name\": \"defect\"}, # string\n", - " \"site\": {\"name\": \"site\", \"unit\": \"\"}, # dimensionless\n", + " \"defectname\": {\"name\": \"defect\"}, # string\n", + " \"site\": {\"name\": \"site\", \"unit\": \"\"}, # dimensionless\n", " \"charge\": {\"name\": \"charge\", \"unit\": \"\"},\n", " \"dH_eV\": {\"name\": \"dH\", \"unit\": \"eV\"},\n", " \"dH_eV_per_atom\": {\"name\": \"dH|atom\", \"unit\": \"eV/atom\"},\n", " \"bandgap_eV\": {\"name\": \"bandgap\", \"unit\": \"eV\"},\n", " \"electron_effective_mass\": {\"name\": \"m\", \"unit\": \"mₑ\"},\n", - " \"level_theory\": {\"name\": \"theory\"},\n", + " \"level_theory\": {\"name\": \"theory\"}\n", "}\n", "new_column_names = {k: v[\"name\"] for k, v in columns_map.items()}\n", "\n", - "\n", "def apply_unit(cell, unit):\n", " return f\"{cell} {unit}\" if unit and cell else cell\n", "\n", - "\n", "def apply_units(column):\n", " unit = columns_map[column.name].get(\"unit\")\n", " return column.apply(apply_unit, args=(unit,))\n", "\n", - "\n", "contributions = []\n", "\n", "# NOTE make sure all `_oxstate` and `_POSCAR_wyck` files are gzipped\n", @@ -108,27 +98,19 @@ " prefix, nrel_matdb_id, _ = path.name.split(\".\")\n", " stem = f\"{path.parent}{os.sep}{prefix}.{nrel_matdb_id}\"\n", " poscar_file = f\"{stem}_POSCAR_wyck.gz\"\n", - " structure = Structure.from_file(poscar_file, \"POSCAR\")\n", + " structure = Structure.from_file(poscar_file, 'POSCAR')\n", " mpid = mpr.find_structure(structure)\n", " identifier = mpid if mpid else nrel_matdb_id\n", " attachments = [Path(poscar_file), Path(f\"{stem}_oxstate.gz\")]\n", - " df = (\n", - " read_csv(path)\n", - " .dropna(axis=1, how=\"all\")\n", - " .apply(apply_units)\n", - " .rename(columns=new_column_names)\n", - " )\n", - "\n", + " df = read_csv(path).dropna(axis=1, how=\"all\").apply(apply_units).rename(columns=new_column_names)\n", + " \n", " for record in df.to_dict(orient=\"records\"):\n", - " data = {k: v for k, v in record.items() if v} # clean record\n", - " contributions.append(\n", - " {\n", - " \"identifier\": identifier,\n", - " \"data\": unflatten(data, splitter=\"dot\"),\n", - " \"structures\": [structure],\n", - " \"attachments\": attachments, # duplicates linked internally\n", - " }\n", - " )\n", + " data = {k: v for k, v in record.items() if v} # clean record\n", + " contributions.append({\n", + " \"identifier\": identifier,\n", + " \"data\": unflatten(data, splitter=\"dot\"),\n", + " \"structures\": [structure], \"attachments\": attachments, # duplicates linked internally\n", + " })\n", " contributions[-1][\"data\"][\"nrel|id\"] = nrel_matdb_id\n", "\n", "contributions[0]" @@ -155,11 +137,11 @@ "metadata": {}, "outputs": [], "source": [ - "client.delete_contributions() # easier to delete everything for small projects\n", + "client.delete_contributions() # easier to delete everything for small projects\n", "client.init_columns(columns)\n", "client.submit_contributions(contributions, ignore_dupes=True)\n", "# this shouldn't be necessary but need to re-init columns likely due to bug in API server\n", - "client.init_columns(columns)" + "client.init_columns(columns) " ] } ], diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/dilute_solute_diffusion.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/dilute_solute_diffusion.ipynb index b03877f2ea..3ce892c236 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/dilute_solute_diffusion.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/dilute_solute_diffusion.ipynb @@ -28,16 +28,12 @@ "metadata": {}, "outputs": [], "source": [ - "import os\n", - "import json\n", - "import requests\n", + "import os, json, requests, sys\n", "from pandas import read_excel, isnull, ExcelWriter, Series\n", "from mp_api.client import MPRester\n", "from pathlib import Path\n", "\n", - "data_dir = Path(\n", - " \"/Users/patrick/GoogleDriveLBNL/My Drive/MaterialsProject/gitrepos/mpcontribs-data/\"\n", - ")\n", + "data_dir = Path(\"/Users/patrick/GoogleDriveLBNL/My Drive/MaterialsProject/gitrepos/mpcontribs-data/\")\n", "zfile = data_dir / name / \"z.json\"\n", "z = json.load(zfile.open())\n", "mpr = MPRester(\"bmdNL4cV6Ei0CqhUAhK6JwFSZ6XMH0Gz\")\n", @@ -65,7 +61,7 @@ " for sheet, df in df_dct.items():\n", " df.to_excel(writer, sheet)\n", " else:\n", - " print(\"no excel sheet found on figshare\")\n", + " print(\"no excel sheet found on figshare\") \n", "else:\n", " df_dct = read_excel(fpath, sheet_name=None, engine=\"openpyxl\")\n", "\n", @@ -82,10 +78,8 @@ "# function to search MP via its summary API endpoint\n", "def search(formula=None, spacegroup_number=None, chemsys=None):\n", " return mpr.summary.search(\n", - " formula=formula,\n", - " chemsys=chemsys,\n", - " spacegroup_number=spacegroup_number,\n", - " fields=[\"material_id\"], # , sort_fields=\"energy_above_hull\"\n", + " formula=formula, chemsys=chemsys, spacegroup_number=spacegroup_number,\n", + " fields=[\"material_id\"]#, sort_fields=\"energy_above_hull\"\n", " )" ] }, @@ -96,12 +90,7 @@ "metadata": {}, "outputs": [], "source": [ - "host_info = (\n", - " df_dct[\"Host Information\"]\n", - " .set_index(\"Host element name\")\n", - " .dropna()\n", - " .drop(\"Unnamed: 0\", axis=1)\n", - ")\n", + "host_info = df_dct[\"Host Information\"].set_index(\"Host element name\").dropna().drop(\"Unnamed: 0\", axis=1)\n", "hosts = None\n", "host_info" ] @@ -119,7 +108,7 @@ " if hosts is not None:\n", " if isinstance(hosts, int) and idx + 1 > hosts:\n", " break\n", - " elif isinstance(hosts, list) and host not in hosts:\n", + " elif isinstance(hosts, list) and not host in hosts:\n", " continue\n", "\n", " print(\"get mp-id for {}\".format(host))\n", @@ -156,7 +145,7 @@ " df = df.drop(rows)\n", "\n", " contrib[\"data\"] = hdata\n", - "\n", + " \n", " print(\"add table for D₀/Q data for {}\".format(mpid))\n", " df = df.set_index(df[\"Solute element number\"])\n", " df = df.drop(\"Solute element number\", axis=1)\n", @@ -193,8 +182,8 @@ " \"title\": \"D₀/Q by Solute\",\n", " \"labels\": {\n", " \"value\": \"D₀/Q\",\n", - " # \"variable\": \"method\"\n", - " },\n", + " #\"variable\": \"method\"\n", + " }\n", " }\n", " contrib[\"tables\"] = [df_D0_Q]\n", "\n", @@ -242,8 +231,11 @@ " contrib[\"tables\"].append(df_v)\n", "\n", " elif hdata[\"Host\"][\"crystal_structure\"] == \"FCC\":\n", + "\n", " print(\"add table for hop activation barriers for {} (FCC)\".format(mpid))\n", - " columns_E = [\"Hop activation barrier, E_{} [eV]\".format(i) for i in range(5)]\n", + " columns_E = [\n", + " \"Hop activation barrier, E_{} [eV]\".format(i) for i in range(5)\n", + " ]\n", " df_E = df[[\"Solute element name\"] + columns_E]\n", " df_E.columns = [\"Solute\"] + [\n", " \"E{} [eV]\".format(i) for i in [\"₀\", \"₁\", \"₂\", \"₃\", \"₄\"]\n", @@ -255,7 +247,9 @@ " contrib[\"tables\"].append(df_E)\n", "\n", " print(\"add table for hop attempt frequencies for {} (FCC)\".format(mpid))\n", - " columns_v = [\"Hop attempt frequency, v_{} [THz]\".format(i) for i in range(5)]\n", + " columns_v = [\n", + " \"Hop attempt frequency, v_{} [THz]\".format(i) for i in range(5)\n", + " ]\n", " df_v = df[[\"Solute element name\"] + columns_v]\n", " df_v.columns = [\"Solute\"] + [\n", " \"v{} [THz]\".format(i) for i in [\"₀\", \"₁\", \"₂\", \"₃\", \"₄\"]\n", @@ -267,6 +261,7 @@ " contrib[\"tables\"].append(df_v)\n", "\n", " elif hdata[\"Host\"][\"crystal_structure\"] == \"HCP\":\n", + "\n", " print(\"add table for hop activation barriers for {} (HCP)\".format(mpid))\n", " columns_E = [\n", " \"Hop activation barrier, E_X [eV]\",\n", @@ -322,55 +317,23 @@ "from flatten_dict import flatten, unflatten\n", "\n", "columns_map = {\n", - " \"Host.crystal_structure\": {\n", - " \"name\": \"host.symmetry\",\n", - " \"description\": \"host crystal structure\",\n", - " },\n", - " \"Host.melting_temperature\": {\n", - " \"name\": \"host.temperature|melt\",\n", - " \"unit\": \"K\",\n", - " \"description\": \"host melting temperature\",\n", - " },\n", - " \"Host.vacancy_formation_energy\": {\n", - " \"name\": \"host.energy|formation\",\n", - " \"unit\": \"eV\",\n", - " \"description\": \"host vacancy formation energy\",\n", - " },\n", - " \"Host.lattice_constant\": {\n", - " \"name\": \"host.lattice\",\n", - " \"unit\": \"Å\",\n", - " \"description\": \"host lattice constant\",\n", - " },\n", - " \"Host.self-diffusion_correction_shift\": {\n", - " \"name\": \"host.shift\",\n", - " \"unit\": \"eV\",\n", - " \"description\": \"host self diffusion correction shift\",\n", - " },\n", - " \"note\": {\n", - " \"name\": \"excluded\",\n", - " \"description\": \"solutes were calculated but either did not converge or relaxed into the neighboring vacancy, making it ineligible for the analytical multi-frequency formalism\",\n", - " },\n", + " \"Host.crystal_structure\": {\"name\": \"host.symmetry\", \"description\": \"host crystal structure\"},\n", + " \"Host.melting_temperature\": {\"name\": \"host.temperature|melt\", \"unit\": \"K\", \"description\": \"host melting temperature\"},\n", + " \"Host.vacancy_formation_energy\": {\"name\": \"host.energy|formation\", \"unit\": \"eV\", \"description\": \"host vacancy formation energy\"},\n", + " \"Host.lattice_constant\": {\"name\": \"host.lattice\", \"unit\": \"Å\", \"description\": \"host lattice constant\"},\n", + " \"Host.self-diffusion_correction_shift\": {\"name\": \"host.shift\", \"unit\": \"eV\", \"description\": \"host self diffusion correction shift\"},\n", + " \"note\": {\"name\": \"excluded\", \"description\": \"solutes were calculated but either did not converge or relaxed into the neighboring vacancy, making it ineligible for the analytical multi-frequency formalism\"},\n", "}\n", "columns = {col[\"name\"]: col.get(\"unit\") for col in columns_map.values()}\n", "clean_contributions = []\n", "\n", "for contrib in contributions:\n", - " clean_contrib = {\n", - " \"identifier\": contrib[\"identifier\"],\n", - " \"formula\": contrib[\"formula\"],\n", - " \"tables\": contrib[\"tables\"],\n", - " }\n", + " clean_contrib = {\"identifier\": contrib[\"identifier\"], \"formula\": contrib[\"formula\"], \"tables\": contrib[\"tables\"]}\n", " data = {}\n", " for k, v in flatten(contrib[\"data\"], reducer=\"dot\").items():\n", - " data[columns_map[k][\"name\"]] = (\n", - " v.replace(\"The\", \"\")\n", - " .replace(columns_map[k][\"description\"], \"\")\n", - " .replace(\n", - " \"solutes were calculated but either did not converge or relaxed into the neighboring vacancy, making the solute ineligible for the analytical multi-frequency formalism\",\n", - " \"\",\n", - " )\n", - " .strip()\n", - " )\n", + " data[columns_map[k][\"name\"]] = v.replace(\"The\", \"\").replace(columns_map[k][\"description\"], \"\").replace(\n", + " \"solutes were calculated but either did not converge or relaxed into the neighboring vacancy, making the solute ineligible for the analytical multi-frequency formalism\", \"\"\n", + " ).strip()\n", "\n", " clean_contrib[\"data\"] = unflatten(data, splitter=\"dot\")\n", " clean_contributions.append(clean_contrib)\n", diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/download.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/download.ipynb index a18a25b20b..0d17143395 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/download.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/download.ipynb @@ -28,22 +28,17 @@ "metadata": {}, "outputs": [], "source": [ - "fields = [\n", - " \"id\",\n", - " \"identifier\",\n", - " \"formula\",\n", - " \"data.mₑᶜ.p.ε̄.value\",\n", - "] # which fields to retrieve\n", - "sort = \"-data__mₑᶜ__p__ε̄__value\" # field to sort by (NOTE `__value`!); use +/- for asc/desc\n", + "fields = [\"id\", \"identifier\", \"formula\", \"data.mₑᶜ.p.ε̄.value\"] # which fields to retrieve\n", + "sort = \"-data__mₑᶜ__p__ε̄__value\" # field to sort by (NOTE `__value`!); use +/- for asc/desc\n", "# see https://contribs-api.materialsproject.org/#/contributions/get_entries for available query parameters\n", "query = {\n", - " # \"formula_contains\": \"ZnS\",\n", - " # \"identifier__in\": [\"mp-10695\", \"mp-760381\"], # ZnS, CuS\n", + "# \"formula_contains\": \"ZnS\",\n", + "# \"identifier__in\": [\"mp-10695\", \"mp-760381\"], # ZnS, CuS\n", " \"data__functional__exact\": \"GGA+U\",\n", " \"data__metal__contains\": \"Y\",\n", " \"data__mₑᶜ__p__ε̄__value__gte\": 1000,\n", "}\n", - "client.get_totals(query=query) # lightweight call to count results" + "client.get_totals(query=query) # lightweight call to count results" ] }, { @@ -67,11 +62,11 @@ "source": [ "query[\"_fields\"] = fields\n", "query[\"sort\"] = sort\n", - "query[\"format\"] = \"csv\" # \"csv\" or \"json\"\n", + "query[\"format\"] = \"csv\" # \"csv\" or \"json\"\n", "client.download_contributions(\n", " query=query,\n", - " outdir=\"mpcontribs-downloads/my-query\", # change outdir for different queries\n", - " # include=[\"tables\"] # include the tables in the download\n", + " outdir=\"mpcontribs-downloads/my-query\", # change outdir for different queries\n", + " #include=[\"tables\"] # include the tables in the download\n", ")" ] } diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/dtu.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/dtu.ipynb index c1e375138f..a2322b1827 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/dtu.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/dtu.ipynb @@ -19,9 +19,9 @@ "metadata": {}, "outputs": [], "source": [ - "name = \"dtu\"\n", + "name = 'dtu'\n", "client = Client()\n", - "db = \"https://cmr.fysik.dtu.dk/_downloads/mp_gllbsc.db\"" + "db = 'https://cmr.fysik.dtu.dk/_downloads/mp_gllbsc.db'" ] }, { @@ -62,13 +62,13 @@ "outputs": [], "source": [ "dbdir = \"/Users/patrick/gitrepos/mp/MPContribs/mpcontribs-data\"\n", - "dbfile = db.rsplit(\"/\", 1)[-1]\n", + "dbfile = db.rsplit('/', 1)[-1]\n", "dbpath = os.path.join(dbdir, dbfile)\n", "if not os.path.exists(dbpath):\n", - " urlretrieve(db, dbpath)\n", + " urlretrieve(db, dbpath) \n", "\n", "con = connect(dbpath)\n", - "nr_mpids = con.count(selection=\"mpid\")\n", + "nr_mpids = con.count(selection='mpid')\n", "print(nr_mpids)" ] }, @@ -81,27 +81,23 @@ "contributions = []\n", "\n", "with tqdm(total=nr_mpids) as pbar:\n", - " for row in con.select(\"mpid\"):\n", - " contributions.append(\n", - " {\n", - " \"project\": name,\n", - " \"identifier\": f\"mp-{row.mpid}\",\n", - " \"is_public\": True,\n", - " \"data\": {\n", - " \"ΔE\": {\n", - " \"KS\": { # kohn-sham band gap\n", - " \"indirect\": f\"{row.gllbsc_ind_gap - row.gllbsc_disc} eV\",\n", - " \"direct\": f\"{row.gllbsc_dir_gap - row.gllbsc_disc} eV\",\n", - " },\n", - " \"QP\": { # quasi particle band gap\n", - " \"indirect\": f\"{row.gllbsc_ind_gap} eV\",\n", - " \"direct\": f\"{row.gllbsc_dir_gap} eV\",\n", - " },\n", + " for row in con.select('mpid'):\n", + " contributions.append({\n", + " 'project': name, 'identifier': f'mp-{row.mpid}', 'is_public': True,\n", + " 'data': {\n", + " 'ΔE': {\n", + " 'KS': { # kohn-sham band gap\n", + " 'indirect': f'{row.gllbsc_ind_gap - row.gllbsc_disc} eV',\n", + " 'direct': f'{row.gllbsc_dir_gap - row.gllbsc_disc} eV' \n", " },\n", - " \"C\": f\"{row.gllbsc_disc} eV\", # derivative discontinuity\n", + " 'QP': { # quasi particle band gap\n", + " 'indirect': f'{row.gllbsc_ind_gap} eV',\n", + " 'direct': f'{row.gllbsc_dir_gap} eV' \n", + " }\n", " },\n", + " 'C': f'{row.gllbsc_disc} eV' # derivative discontinuity\n", " }\n", - " )\n", + " })\n", " pbar.update(1)" ] }, @@ -143,12 +139,9 @@ " \"_order_by\": \"data__C__value\",\n", " \"order\": \"desc\",\n", " \"_fields\": [\n", - " \"id\",\n", - " \"identifier\",\n", - " \"formula\",\n", - " \"data.C.value\",\n", - " \"data.ΔE.QP.direct.value\",\n", - " ],\n", + " \"id\", \"identifier\", \"formula\",\n", + " \"data.C.value\", \"data.ΔE.QP.direct.value\"\n", + " ]\n", "}\n", "client.contributions.get_entries(**query).result()" ] diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ediffcrystalprediction.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ediffcrystalprediction.ipynb index 09c4ce91c7..9b0ad6bbb8 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ediffcrystalprediction.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ediffcrystalprediction.ipynb @@ -59,16 +59,10 @@ "metadata": {}, "outputs": [], "source": [ - "df_red = pd.DataFrame(\n", - " [\n", - " [t] + za\n", - " for t, za in zip(\n", - " df_uniq[\"thickness\"].to_list(),\n", - " df_uniq[\"zone_axes\"].map(convert_zone_axes).to_list(),\n", - " )\n", - " ],\n", - " columns=[\"thickness [nm]\", \"a [Å]\", \"b [Å]\", \"c [Å]\"],\n", - ")" + "df_red = pd.DataFrame([[t]+za for t, za in zip(\n", + " df_uniq[\"thickness\"].to_list(),\n", + " df_uniq[\"zone_axes\"].map(convert_zone_axes).to_list()\n", + ")], columns=[\"thickness [nm]\", \"a [Å]\", \"b [Å]\", \"c [Å]\"])" ] }, { @@ -91,16 +85,11 @@ "# TODO think of any columns to add in the `data` component\n", "# e.g. direct link to output directory or file/object in OpenData Browser, or\n", "# \"things\" that might be interesting for a general MP user to search across contributions\n", - "contribs = [\n", - " {\n", - " \"identifier\": \"mp-126\",\n", - " \"formula\": \"Pt\",\n", - " \"data\": {\n", - " \"url\": \"https://materialsproject-contribs.s3.amazonaws.com/index.html\"\n", - " },\n", - " \"tables\": [df_red],\n", - " }\n", - "]" + "contribs = [{\n", + " \"identifier\": \"mp-126\", \"formula\": \"Pt\",\n", + " \"data\": {\"url\": \"https://materialsproject-contribs.s3.amazonaws.com/index.html\"},\n", + " \"tables\": [df_red]\n", + "}]" ] }, { diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/esters.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/esters.ipynb index b35396ff28..4328ceba83 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/esters.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/esters.ipynb @@ -17,7 +17,7 @@ "metadata": {}, "outputs": [], "source": [ - "name = \"esters\"\n", + "name = 'esters'\n", "client = Client()\n", "mpr = MPRester()" ] @@ -36,7 +36,7 @@ "outputs": [], "source": [ "# client.projects.update_entry(pk=name, project={'long_title': 'Improved c-axis parameter for BiSe'}).result()\n", - "client.get_project(name) # .display()" + "client.get_project(name)#.display()" ] }, { @@ -52,17 +52,13 @@ "metadata": {}, "outputs": [], "source": [ - "path = \"/Users/patrick/gitrepos/mp/MPContribs/mpcontribs-data/CONTCAR\"\n", + "path = '/Users/patrick/gitrepos/mp/MPContribs/mpcontribs-data/CONTCAR'\n", "structure = Structure.from_file(path)\n", "mpids = mpr.find_structure(structure)\n", - "contributions = [\n", - " {\n", - " \"project\": name,\n", - " \"identifier\": mpids[0],\n", - " \"is_public\": True,\n", - " \"structures\": [structure],\n", - " }\n", - "]" + "contributions = [{\n", + " 'project': name, 'identifier': mpids[0], 'is_public': True,\n", + " 'structures': [structure]\n", + "}]" ] }, { @@ -95,12 +91,9 @@ "metadata": {}, "outputs": [], "source": [ - "structures = list(\n", - " client.get_all_ids({\"project\": name}, include=[\"structures\"])\n", - " .get(name, {})\n", - " .get(\"structures\", {})\n", - " .get(\"ids\", set())\n", - ")\n", + "structures = list(client.get_all_ids(\n", + " {\"project\": name}, include=[\"structures\"]\n", + ").get(name, {}).get(\"structures\", {}).get(\"ids\", set()))\n", "sid = structures[0]" ] }, diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/experimental_thermo.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/experimental_thermo.ipynb index 8353c4de4b..a02e07d84a 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/experimental_thermo.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/experimental_thermo.ipynb @@ -27,7 +27,7 @@ "metadata": {}, "outputs": [], "source": [ - "PROJECT = \"Corrections\"" + "PROJECT = 'Corrections'" ] }, { @@ -48,6 +48,8 @@ "from pathlib import Path\n", "import re\n", "from tqdm import tqdm\n", + "import numpy as np\n", + "import xlrd\n", "from monty.serialization import loadfn, dumpfn" ] }, @@ -67,9 +69,9 @@ "workdir = Path(re.sub(r\"(?<={})[\\w\\W]*\".format(PROJECT), \"\", str(Path.cwd())))\n", "os.chdir(workdir)\n", "\n", - "data_dir = workdir / \"2_raw data\"\n", - "pipeline_dir = workdir / \"3_data analysis\" / \"2_pipeline\"\n", - "output_dir = workdir / \"3_data analysis\" / \"3_output\"" + "data_dir = workdir / '2_raw data'\n", + "pipeline_dir = workdir / '3_data analysis' / '2_pipeline'\n", + "output_dir = workdir / '3_data analysis' / '3_output'" ] }, { @@ -94,9 +96,8 @@ "outputs": [], "source": [ "from mpcontribs.client import Client\n", - "\n", - "name = \"experimental_thermo\" # this should be your project, see from the project URL\n", - "client = Client() # uses MPCONTRIBS_API_KEY envvar" + "name = 'experimental_thermo' # this should be your project, see from the project URL\n", + "client = Client() # uses MPCONTRIBS_API_KEY envvar" ] }, { @@ -106,19 +107,17 @@ "outputs": [], "source": [ "client.projects.update_entry(\n", - " pk=\"experimental_thermo\",\n", - " project={\n", - " \"other\": {\n", - " \"ΔHᶠ\": \"Enthalpy of formation from the elements. Polynomial: H° − H°298.15= A*t + B*t^2/2 + C*t^3/3 + D*t^4/4 − E/t + F − H\",\n", - " \"ΔGᶠ\": \"Gibbs free energy of formation from the elements.\",\n", - " \"S\": \"Absolute entropy. Polynomial: S° = A*ln(t) + B*t + C*t^2/2 + D*t^3/3 − E/(2*t^2) + G\",\n", - " \"Cₚ\": \"Specific heat capacity. Polynomial: Cp° = A + B*t + C*t^2 + D*t^3 + E/t^2\",\n", - " \"polynomial\": \"Coefficients for polynomials used to calculate temperature-dependent values of ΔHᶠ, S, or Cₚ.\",\n", - " \"ΔT\": \"Range of temperatures over which polynomial coefficients are valid.\",\n", - " \"composition\": \"String representation of pymatgen Composition of the material.\",\n", - " \"phase\": \"Material phase, e.g. 'gas', 'liquid', 'solid', 'monoclinic', etc.\",\n", - " }\n", - " },\n", + " pk=\"experimental_thermo\", project={\"other\": \n", + " {\"ΔHᶠ\": \"Enthalpy of formation from the elements. Polynomial: H° − H°298.15= A*t + B*t^2/2 + C*t^3/3 + D*t^4/4 − E/t + F − H\",\n", + " \"ΔGᶠ\": \"Gibbs free energy of formation from the elements.\",\n", + " \"S\": \"Absolute entropy. Polynomial: S° = A*ln(t) + B*t + C*t^2/2 + D*t^3/3 − E/(2*t^2) + G\",\n", + " \"Cₚ\": \"Specific heat capacity. Polynomial: Cp° = A + B*t + C*t^2 + D*t^3 + E/t^2\",\n", + " \"polynomial\": \"Coefficients for polynomials used to calculate temperature-dependent values of ΔHᶠ, S, or Cₚ.\",\n", + " \"ΔT\": \"Range of temperatures over which polynomial coefficients are valid.\",\n", + " \"composition\": \"String representation of pymatgen Composition of the material.\",\n", + " \"phase\": \"Material phase, e.g. 'gas', 'liquid', 'solid', 'monoclinic', etc.\"\n", + " }\n", + " }\n", ").result()" ] }, @@ -129,10 +128,8 @@ "outputs": [], "source": [ "client.projects.update_entry(\n", - " pk=\"experimental_thermo\",\n", - " project={\n", - " \"authors\": \"Various authors (see references). Data compiled by the Materials Project team.\"\n", - " },\n", + " pk=\"experimental_thermo\", project={\"authors\": \"Various authors (see references). Data compiled by the Materials Project team.\"\n", + " }\n", ").result()" ] }, @@ -143,7 +140,8 @@ "outputs": [], "source": [ "client.projects.update_entry(\n", - " pk=\"experimental_thermo\", project={\"title\": \"Thermochemistry Data\"}\n", + " pk=\"experimental_thermo\", project={\"title\": \"Thermochemistry Data\"\n", + " }\n", ").result()" ] }, @@ -154,7 +152,8 @@ "outputs": [], "source": [ "client.projects.update_entry(\n", - " pk=\"experimental_thermo\", project={\"unique_identifiers\": True}\n", + " pk=\"experimental_thermo\", project={\"unique_identifiers\": True\n", + " }\n", ").result()" ] }, @@ -165,16 +164,9 @@ "outputs": [], "source": [ "client.projects.update_entry(\n", - " pk=\"experimental_thermo\",\n", - " project={\n", - " \"references\": [\n", - " {\n", - " \"label\": \"Kubaschewski\",\n", - " \"url\": \"https://www.worldcat.org/title/materials-thermochemistry/oclc/26724109\",\n", - " },\n", - " {\"label\": \"NIST\", \"url\": \"https://janaf.nist.gov/\"},\n", - " ]\n", - " },\n", + " pk=\"experimental_thermo\", project={\"references\": [\n", + " {\"label\":\"Kubaschewski\", \"url\":\"https://www.worldcat.org/title/materials-thermochemistry/oclc/26724109\"},\n", + " {\"label\":\"NIST\", \"url\":\"https://janaf.nist.gov/\"},]}\n", ").result()" ] }, @@ -229,9 +221,11 @@ " {\"path\": \"data.ΔT.G.max\", \"unit\": \"degK\"},\n", " {\"path\": \"data.ΔT.H.max\", \"unit\": \"degK\"},\n", " {\"path\": \"data.method\", \"unit\": \"kJ/mol\"},\n", - " {\"path\": \"data.reference\", \"unit\": \"kJ/mol\"},\n", + " {\"path\": \"data.reference\", \"unit\": \"kJ/mol\"}, \n", "]\n", - "client.projects.update_entry(pk=name, project={\"columns\": columns}).result()" + "client.projects.update_entry(\n", + " pk=name, project={\"columns\": columns}\n", + ").result()" ] }, { @@ -338,7 +332,7 @@ "metadata": {}, "outputs": [], "source": [ - "# all_thermo = []\n", + "#all_thermo = []\n", "with MPRester() as a:\n", " for f in tqdm(ternary_plus):\n", " all_thermo.extend(a.get_exp_thermo_data(f))" @@ -350,7 +344,7 @@ "metadata": {}, "outputs": [], "source": [ - "dumpfn(all_thermo, output_dir / \"2020-08-07 all MP Thermo data.json\")" + "dumpfn(all_thermo, output_dir / '2020-08-07 all MP Thermo data.json')" ] }, { @@ -359,7 +353,7 @@ "metadata": {}, "outputs": [], "source": [ - "all_thermo = loadfn(output_dir / \"2020-08-07 all MP Thermo data.json\")" + "all_thermo = loadfn(output_dir / '2020-08-07 all MP Thermo data.json')" ] }, { @@ -385,7 +379,6 @@ "outputs": [], "source": [ "import pandas as pd\n", - "\n", "mpthermo_df = pd.DataFrame([t.as_dict() for t in all_thermo])" ] }, @@ -396,8 +389,8 @@ "outputs": [], "source": [ "# drop the unneeded columns\n", - "mpthermo_df = mpthermo_df.drop(\"@module\", axis=1)\n", - "mpthermo_df = mpthermo_df.drop(\"@class\", axis=1)" + "mpthermo_df = mpthermo_df.drop('@module', axis=1)\n", + "mpthermo_df = mpthermo_df.drop('@class', axis=1)" ] }, { @@ -458,11 +451,10 @@ "source": [ "from pymatgen import Composition\n", "\n", - "\n", "def create_dict(data):\n", " ret = {}\n", " comp = Composition(data.formula.unique()[0])\n", - "\n", + " \n", " ret[\"project\"] = name\n", " ret[\"is_public\"] = False\n", " ret[\"identifier\"] = comp.reduced_formula\n", @@ -471,13 +463,14 @@ " ret[\"data\"][\"composition\"] = str(comp)\n", " ret[\"data\"][\"phase\"] = data.phaseinfo.unique()[0]\n", " ret[\"data\"][\"reference\"] = data.ref.unique()[0]\n", - "\n", + " \n", " for t in data.type.unique():\n", + " \n", " # set the base dictionary key\n", " if t in [\"A\", \"B\", \"C\", \"D\", \"E\", \"F\", \"G\", \"H\"]:\n", " if not ret[\"data\"].get(\"polynomial\"):\n", " ret[\"data\"][\"polynomial\"] = {}\n", - "\n", + " \n", " if not ret[\"data\"].get(\"ΔT\"):\n", " ret[\"data\"][\"ΔT\"] = {}\n", "\n", @@ -485,61 +478,50 @@ " col = t\n", " unit = \"dimensionless\"\n", " base_dict[col] = {}\n", - " ret[\"data\"][\"ΔT\"][col] = {\n", - " \"min\": \"{} K\".format(\n", - " data[data[\"type\"] == t][\"temp_range\"].values[0][0]\n", - " ),\n", - " \"max\": \"{} K\".format(\n", - " data[data[\"type\"] == t][\"temp_range\"].values[0][1]\n", - " ),\n", - " }\n", - "\n", + " ret[\"data\"][\"ΔT\"][col] = {\"min\": \"{} K\".format(data[data[\"type\"]==t][\"temp_range\"].values[0][0]),\n", + " \"max\": \"{} K\".format(data[data[\"type\"]==t][\"temp_range\"].values[0][1])}\n", + " \n", " else:\n", - " if data[data[\"type\"] == t][\"temp_range\"].values[0] == [298, 298]:\n", + " if data[data[\"type\"]==t][\"temp_range\"].values[0] == [298, 298]:\n", " if not ret[\"data\"].get(\"298K\"):\n", - " ret[\"data\"][\"298K\"] = {}\n", + " ret[\"data\"][\"298K\"]= {}\n", " base_dict = ret[\"data\"][\"298K\"]\n", " else:\n", - " print(\n", - " \"Type: {}, T: {}\".format(\n", - " t, data[data[\"type\"] == t][\"temp_range\"].values[0]\n", - " )\n", - " )\n", - "\n", + " print(\"Type: {}, T: {}\".format(t, data[data[\"type\"]==t][\"temp_range\"].values[0]))\n", + " \n", " if t == \"S\":\n", - " unit = \"kJ/degK/mol\"\n", + " unit = 'kJ/degK/mol'\n", " col = \"S\"\n", - " elif t == \"fH\":\n", + " elif t ==\"fH\":\n", " col = \"ΔHᶠ\"\n", " unit = \"kJ/mol\"\n", " else:\n", " col = t\n", " unit = \"dimensionless\"\n", - "\n", + " \n", " base_dict[col] = {}\n", "\n", " # find value, uncertainty, method, unit\n", - " base_dict[col] = \"{:0.5g} {}\".format(\n", - " data[data[\"type\"] == t][\"value\"].values[0], unit\n", - " )\n", - "\n", - " if data[data[\"type\"] == t][\"method\"].values[0] != \"\":\n", + " base_dict[col]= \"{:0.5g} {}\".format(data[data[\"type\"]==t][\"value\"].values[0], unit)\n", + " \n", + " if data[data[\"type\"]==t][\"method\"].values[0] != \"\":\n", " if not ret[\"data\"].get(\"method\"):\n", " ret[\"data\"][\"method\"] = {}\n", - " ret[\"data\"][\"method\"][col] = data[data[\"type\"] == t][\"method\"].values[0]\n", - "\n", - " # if not np.isnan(data[data[\"type\"]==t][\"uncertainty\"].values[0]):\n", - " # base_dict[col][\"uncertainty\"] = data[data[\"type\"]==t][\"uncertainty\"].values[0]\n", - "\n", - " # if t in [\"S\", \"fH\"]:\n", - " # base_dict[col][\"units\"] = unit\n", + " ret[\"data\"][\"method\"][col] = data[data[\"type\"]==t][\"method\"].values[0]\n", + " \n", + "# if not np.isnan(data[data[\"type\"]==t][\"uncertainty\"].values[0]):\n", + "# base_dict[col][\"uncertainty\"] = data[data[\"type\"]==t][\"uncertainty\"].values[0]\n", + " \n", + " \n", + " \n", + "# if t in [\"S\", \"fH\"]:\n", + "# base_dict[col][\"units\"] = unit\n", "\n", + " \n", " return ret\n", + " \n", "\n", - "\n", - "new_df = mpthermo_df.groupby([\"formula\", \"compound_name\", \"phaseinfo\", \"ref\"]).apply(\n", - " create_dict\n", - ")\n", + "new_df = mpthermo_df.groupby([\"formula\",\"compound_name\",\"phaseinfo\",\"ref\"]).apply(create_dict)\n", "mpthermo_contribs = list(new_df)" ] }, @@ -570,16 +552,16 @@ "from itertools import groupby\n", "\n", "for formula, group in groupby(mpthermo_contribs, key=lambda d: d[\"identifier\"]):\n", - " new_dict = {}\n", + " new_dict ={}\n", " new_dict[\"project\"] = name\n", " new_dict[\"is_public\"] = False\n", " new_dict[\"identifier\"] = formula\n", " new_dict[\"data\"] = {}\n", - "\n", + " \n", " for d in group:\n", " if not new_dict.get(\"composition\"):\n", " new_dict[\"composition\"] = d[\"data\"][\"composition\"]\n", - "\n", + " \n", " del d[\"data\"][\"composition\"]\n", "\n", " phase = d[\"data\"].get(\"phase\", \"n/a\")\n", @@ -600,7 +582,6 @@ "outputs": [], "source": [ "import pprint\n", - "\n", "pprint.pprint(reshaped[0])" ] }, @@ -625,10 +606,7 @@ "outputs": [], "source": [ "import pandas\n", - "\n", - "janaf_df = pandas.read_csv(\n", - " data_dir / \"2020-08-10 JANAF data from Ayush/mpcontribs_janaf_thermo.csv\"\n", - ")" + "janaf_df= pandas.read_csv(data_dir / \"2020-08-10 JANAF data from Ayush/mpcontribs_janaf_thermo.csv\")" ] }, { @@ -654,43 +632,41 @@ "outputs": [], "source": [ "def create_dict(data):\n", - "\n", + " \n", " ret = {}\n", " ret[\"project\"] = name\n", - " ret[\"is_public\"] = False\n", + " ret[\"is_public\"] = False \n", " ret[\"data\"] = {}\n", - "\n", + " \n", " try:\n", " comp = Composition(data.Formula.unique()[0])\n", " ret[\"identifier\"] = comp.reduced_formula\n", " ret[\"data\"][\"composition\"] = str(comp)\n", " except:\n", - " print(\"problem\")\n", + " print('problem')\n", " ret[\"identifier\"] = data.Formula.unique()[0]\n", " ret[\"data\"][\"composition\"] = data.Formula.unique()[0]\n", - "\n", + " \n", " ret[\"data\"][\"compound\"] = data.Name.unique()[0]\n", " ret[\"data\"][\"phase\"] = data.Phase.unique()[0]\n", - " ret[\"data\"][\"reference\"] = data.Link.unique()[0].replace(\"txt\", \"html\")\n", - "\n", - " ret[\"data\"][\"0K\"] = {\n", - " \"ΔHᶠ\": \"{:0.6g} {}\".format(data[\"DeltaH_0\"].values[0] / 1000, \"kJ/mol\"),\n", - " \"ΔGᶠ\": \"{:0.6g} {}\".format(data[\"DeltaG_0\"].values[0] / 1000, \"kJ/mol\"),\n", - " \"S\": \"{:0.6g} {}\".format(data[\"S_0\"].values[0], \"J/degK/mol\"),\n", - " \"Cₚ\": \"{:0.6g} {}\".format(data[\"Cp_0\"].values[0], \"J/degK/mol\"),\n", - " }\n", - "\n", - " ret[\"data\"][\"298K\"] = {\n", - " \"ΔHᶠ\": \"{:0.6g} {}\".format(data[\"DeltaH_298\"].values[0] / 1000, \"kJ/mol\"),\n", - " \"ΔGᶠ\": \"{:0.6g} {}\".format(data[\"DeltaG_298\"].values[0] / 1000, \"kJ/mol\"),\n", - " \"S\": \"{:0.6g} {}\".format(data[\"S_298\"].values[0], \"J/degK/mol\"),\n", - " \"Cₚ\": \"{:0.6g} {}\".format(data[\"Cp_298\"].values[0], \"J/degK/mol\"),\n", - " }\n", + " ret[\"data\"][\"reference\"] = data.Link.unique()[0].replace('txt','html')\n", + " \n", + " ret[\"data\"][\"0K\"] = {\"ΔHᶠ\": \"{:0.6g} {}\".format(data[\"DeltaH_0\"].values[0]/1000, \"kJ/mol\"),\n", + " \"ΔGᶠ\": \"{:0.6g} {}\".format(data[\"DeltaG_0\"].values[0]/1000, \"kJ/mol\"),\n", + " \"S\": \"{:0.6g} {}\".format(data[\"S_0\"].values[0], \"J/degK/mol\"),\n", + " \"Cₚ\": \"{:0.6g} {}\".format(data[\"Cp_0\"].values[0], \"J/degK/mol\"),\n", + " }\n", + " \n", + " ret[\"data\"][\"298K\"] = {\"ΔHᶠ\": \"{:0.6g} {}\".format(data[\"DeltaH_298\"].values[0]/1000, \"kJ/mol\"),\n", + " \"ΔGᶠ\": \"{:0.6g} {}\".format(data[\"DeltaG_298\"].values[0]/1000, \"kJ/mol\"),\n", + " \"S\": \"{:0.6g} {}\".format(data[\"S_298\"].values[0], \"J/degK/mol\"),\n", + " \"Cₚ\": \"{:0.6g} {}\".format(data[\"Cp_298\"].values[0], \"J/degK/mol\"),\n", + " }\n", "\n", " return ret\n", + " \n", "\n", - "\n", - "new_df = janaf_df.groupby([\"Formula\", \"Name\", \"Phase\"]).apply(create_dict)\n", + "new_df = janaf_df.groupby([\"Formula\",\"Name\",\"Phase\"]).apply(create_dict)\n", "janaf_contribs = list(new_df)" ] }, @@ -721,18 +697,19 @@ "from itertools import groupby\n", "\n", "for formula, group in groupby(janaf_contribs, key=lambda d: d[\"identifier\"]):\n", - " new_dict = {}\n", + " new_dict ={}\n", " new_dict[\"project\"] = name\n", " new_dict[\"is_public\"] = False\n", " new_dict[\"identifier\"] = formula\n", " new_dict[\"data\"] = {}\n", - "\n", + " \n", " for d in group:\n", " if not new_dict.get(\"composition\"):\n", " new_dict[\"composition\"] = d[\"data\"][\"composition\"]\n", - "\n", + " \n", + " \n", " del d[\"data\"][\"composition\"]\n", - "\n", + " \n", " phase = d[\"data\"].get(\"phase\", \"n/a\")\n", " if phase == \"\":\n", " phase = \"n/a\"\n", @@ -740,7 +717,7 @@ " new_dict[\"data\"][phase] = d[\"data\"]\n", " if phase != \"n/a\":\n", " del new_dict[\"data\"][phase][\"phase\"]\n", - "\n", + " \n", " reshaped_janaf.append(new_dict)" ] }, @@ -751,7 +728,6 @@ "outputs": [], "source": [ "import pprint\n", - "\n", "pprint.pprint(reshaped_janaf[0])" ] }, @@ -762,7 +738,6 @@ "outputs": [], "source": [ "import pprint\n", - "\n", "pprint.pprint(reshaped[0])" ] }, @@ -781,20 +756,16 @@ "source": [ "all_contribs = reshaped[:]\n", "\n", - "count = 0\n", + "count=0\n", "for d in reshaped_janaf:\n", " # is this identifier already in mp thermo?\n", " if d[\"identifier\"] in [e[\"identifier\"] for e in reshaped]:\n", " # add the new NIST phases\n", " target_entry = [e for e in reshaped if e[\"identifier\"] == d[\"identifier\"]][0]\n", - " for k, v in d[\"data\"].items():\n", + " for k,v in d[\"data\"].items():\n", " if target_entry[\"data\"].get(k):\n", - " print(\n", - " \"Warning: phase {} already exists for id {} in MP Thermo data! Skipping.\".format(\n", - " k, d[\"identifier\"]\n", - " )\n", - " )\n", - " count += 1\n", + " print(\"Warning: phase {} already exists for id {} in MP Thermo data! Skipping.\".format(k, d[\"identifier\"]))\n", + " count+=1\n", " continue\n", " target_entry[\"data\"][k] = v\n", " else:\n", @@ -837,19 +808,18 @@ "metadata": {}, "outputs": [], "source": [ - "replace = {\n", - " \"#-qtz\": \"βqtz\",\n", - " \"a\": \"α\",\n", - " \"a -cris\": \"αcrys\",\n", - " \"a -qtz\": \"αqtz\",\n", - " \"nit.ba\": \"nitba\",\n", - " \"orth./1\": \"orth\",\n", - " \"ortho\": \"orth\",\n", - " \"r.tet\": \"rtet\",\n", - " \"tet/cu\": \"tetcu\",\n", - " \"n/a\": \"none\",\n", - " \"cr,l\": \"crl\",\n", - "}" + "replace = {\"#-qtz\":\"βqtz\",\n", + " \"a\": \"α\",\n", + " \"a -cris\":\"αcrys\",\n", + " \"a -qtz\":\"αqtz\",\n", + " \"nit.ba\": \"nitba\",\n", + " \"orth./1\":\"orth\",\n", + " \"ortho\":\"orth\",\n", + " \"r.tet\":\"rtet\",\n", + " \"tet/cu\":\"tetcu\",\n", + " \"n/a\":\"none\",\n", + " \"cr,l\":\"crl\"\n", + " }" ] }, { @@ -889,18 +859,20 @@ "new_contribs = []\n", "for d in all_contribs:\n", " # unpack each identifier into unique identifiers with formula+phase\n", - " for k, v in d[\"data\"].items():\n", - " new_d = {}\n", - " if k == \"composition\":\n", + " for k,v in d[\"data\"].items():\n", + " new_d={}\n", + " if k == 'composition':\n", " continue\n", - " new_d[\"identifier\"] = str(d[\"identifier\"] + \"-\" + k)\n", + " new_d[\"identifier\"] = str(d[\"identifier\"]+\"-\"+k)\n", " new_d[\"formula\"] = d[\"identifier\"]\n", " new_d[\"is_public\"] = True\n", " new_d[\"project\"] = d[\"project\"]\n", " new_d[\"data\"] = v\n", " new_d[\"data\"][\"phase\"] = k\n", " new_d[\"data\"][\"composition\"] = d[\"data\"][\"composition\"]\n", - " new_contribs.append(new_d)" + " new_contribs.append(new_d)\n", + "\n", + " " ] }, { @@ -954,7 +926,7 @@ "source": [ "for d in new_contribs:\n", " if d[\"data\"].get(\"0K\"):\n", - " if all([\"nan\" in v for k, v in d[\"data\"][\"0K\"].items()]):\n", + " if all([\"nan\" in v for k,v in d[\"data\"][\"0K\"].items()]):\n", " del d[\"data\"][\"0K\"]\n", " print(\"deleted {}\".format(d[\"identifier\"]))" ] @@ -967,7 +939,7 @@ "source": [ "for d in new_contribs:\n", " if d[\"data\"].get(\"298K\"):\n", - " if all([\"nan\" in v for k, v in d[\"data\"][\"298K\"].items()]):\n", + " if all([\"nan\" in v for k,v in d[\"data\"][\"298K\"].items()]):\n", " del d[\"data\"][\"298K\"]\n", " print(\"deleted {}\".format(d[\"identifier\"]))" ] @@ -980,7 +952,7 @@ "source": [ "for d in new_contribs:\n", " if d[\"data\"].get(\"298K\"):\n", - " if all([\"nan\" in v or \"0 \" in v for k, v in d[\"data\"][\"298K\"].items()]):\n", + " if all([\"nan\" in v or \"0 \" in v for k,v in d[\"data\"][\"298K\"].items()]):\n", " del d[\"data\"][\"298K\"]\n", " print(\"deleted {}\".format(d[\"identifier\"]))" ] @@ -993,7 +965,7 @@ "source": [ "for d in new_contribs:\n", " if d[\"data\"].get(\"0K\"):\n", - " if all([\"nan\" in v or \"0 \" in v for k, v in d[\"data\"][\"0K\"].items()]):\n", + " if all([\"nan\" in v or \"0 \" in v for k,v in d[\"data\"][\"0K\"].items()]):\n", " del d[\"data\"][\"0K\"]\n", " print(\"deleted {}\".format(d[\"identifier\"]))" ] @@ -1033,7 +1005,7 @@ "source": [ "# need to delete contributions first due to unique_identifiers=False\n", "client.delete_contributions(name)\n", - "# client.submit_contributions(new_contribs, per_page=10)#, skip_dupe_check=True)" + "#client.submit_contributions(new_contribs, per_page=10)#, skip_dupe_check=True)" ] }, { @@ -1054,10 +1026,9 @@ "def chunks(lst, n):\n", " \"\"\"Yield successive n-sized chunks from lst.\"\"\"\n", " for i in range(0, len(lst), n):\n", - " yield lst[i : i + n]\n", - "\n", + " yield lst[i:i + n]\n", "\n", - "for chunk in tqdm(chunks(new_contribs, 10, total=len(new_contribs) / 10)):\n", + "for chunk in tqdm(chunks(new_contribs, 10, total=len(new_contribs)/10)):\n", " try:\n", " client.contributions.create_entries(contributions=chunk).result()\n", " except:\n", diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/experimental_thermoelectrics.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/experimental_thermoelectrics.ipynb index 7526af6ba1..fc639fd76a 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/experimental_thermoelectrics.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/experimental_thermoelectrics.ipynb @@ -11,7 +11,7 @@ "from mp_api.client import MPRester\n", "import pandas as pd\n", "import os\n", - "from flatten_dict import unflatten\n", + "from flatten_dict import unflatten, flatten\n", "from math import isnan" ] }, @@ -69,7 +69,7 @@ " title=\"Experimental Thermoelectrics\",\n", " authors=\"R. Seshradi\",\n", " description=\"Data-Driven Review of Thermoelectric Materials: Performance and Resource Considerations.\",\n", - " url=\"https://pubs.acs.org/doi/10.1021/cm400893e\",\n", + " url=\"https://pubs.acs.org/doi/10.1021/cm400893e\"\n", " )" ] }, @@ -101,124 +101,39 @@ "outputs": [], "source": [ "columns_map = {\n", - " \"T (K)\": {\n", - " \"name\": \"temperature\",\n", - " \"unit\": \"K\",\n", - " \"description\": \"Temperature in Kelvin\",\n", - " },\n", - " \"Z*10^-4 reported\": {\n", - " \"name\": \"Z\",\n", - " \"unit\": \"\",\n", - " \"description\": \"reported Z\",\n", - " \"scale\": 1e4,\n", - " },\n", - " \"Resist. (Ohm.cm)\": {\n", - " \"name\": \"resistivity.RT\",\n", - " \"unit\": \"Ω·cm\",\n", - " \"description\": \"Resistivity at room temperature in Ωcm\",\n", - " },\n", - " \"Resist. (400K)\": {\n", - " \"name\": \"resistivity.400K\",\n", - " \"unit\": \"Ω·cm\",\n", - " \"description\": \"Resistivity at 400K in Ωcm\",\n", - " },\n", - " \"Seebeck (uV/K)\": {\n", - " \"name\": \"seebeck.RT\",\n", - " \"unit\": \"µV/K\",\n", - " \"description\": \"Seebeck coefficient at room temperature in µV/K\",\n", - " },\n", - " \"Seebeck (400K)\": {\n", - " \"name\": \"seebeck.400K\",\n", - " \"unit\": \"µV/K\",\n", - " \"description\": \"Seebeck coefficient at 400K in µV/K\",\n", - " },\n", + " \"T (K)\": {\"name\": \"temperature\", \"unit\": \"K\", \"description\": \"Temperature in Kelvin\"},\n", + " \"Z*10^-4 reported\": {\"name\": \"Z\", \"unit\": \"\", \"description\": \"reported Z\", \"scale\": 1e4},\n", + " \"Resist. (Ohm.cm)\": {\"name\": \"resistivity.RT\", \"unit\": \"Ω·cm\", \"description\": \"Resistivity at room temperature in Ωcm\"},\n", + " \"Resist. (400K)\": {\"name\": \"resistivity.400K\", \"unit\": \"Ω·cm\", \"description\": \"Resistivity at 400K in Ωcm\"},\n", + " \"Seebeck (uV/K)\": {\"name\": \"seebeck.RT\", \"unit\": \"µV/K\", \"description\": \"Seebeck coefficient at room temperature in µV/K\"},\n", + " \"Seebeck (400K)\": {\"name\": \"seebeck.400K\", \"unit\": \"µV/K\", \"description\": \"Seebeck coefficient at 400K in µV/K\"},\n", " \"kappa (W/mK)\": {\"name\": \"kappa.mean\", \"unit\": \"W/mK\", \"description\": \"TODO\"},\n", " \"kappaZT\": {\"name\": \"kappa.ZT\", \"unit\": \"\", \"description\": \"TODO\"},\n", - " \"Pf (W/K^2/m)\": {\n", - " \"name\": \"Pf\",\n", - " \"unit\": \"W/K²/m\",\n", - " \"description\": \"Power Factor in W/K²/m\",\n", - " },\n", - " \"Power Factor*T (W/mK)\": {\n", - " \"name\": \"PfT\",\n", - " \"unit\": \"W/K/m\",\n", - " \"description\": \"Power Factor times Temperature in W/K/m\",\n", - " },\n", + " \"Pf (W/K^2/m)\": {\"name\": \"Pf\", \"unit\": \"W/K²/m\", \"description\": \"Power Factor in W/K²/m\"},\n", + " \"Power Factor*T (W/mK)\": {\"name\": \"PfT\", \"unit\": \"W/K/m\", \"description\": \"Power Factor times Temperature in W/K/m\"},\n", " \"ZT\": {\"name\": \"ZT\", \"unit\": \"\", \"description\": \"ZT\"},\n", " \"x\": {\"name\": \"x\", \"unit\": \"\", \"description\": \"TODO\"},\n", " \"series\": {\"name\": \"series\", \"unit\": None, \"description\": \"TODO\"},\n", " \"T Max\": {\"name\": \"Tmax\", \"unit\": \"K\", \"description\": \"TODO\"},\n", " \"family\": {\"name\": \"family\", \"unit\": None, \"description\": \"TODO\"},\n", - " \"Conduct. (S/cm)\": {\n", - " \"name\": \"conductivity\",\n", - " \"unit\": \"S/cm\",\n", - " \"description\": \"Conductivity in S/cm\",\n", - " },\n", + " \"Conduct. (S/cm)\": {\"name\": \"conductivity\", \"unit\": \"S/cm\", \"description\": \"Conductivity in S/cm\"},\n", " \"S^2\": {\"name\": \"S2\", \"unit\": \"\", \"description\": \"S²\"},\n", " \"ke/ktotal\": {\"name\": \"ke|rel\", \"unit\": \"\", \"description\": \"ke/ktotal\"},\n", " \"space group\": {\"name\": \"spacegroup\", \"unit\": \"\", \"description\": \"space group\"},\n", - " \"# symmetry elements\": {\n", - " \"name\": \"nsymelems\",\n", - " \"unit\": \"\",\n", - " \"description\": \"number of symmetry elements\",\n", - " },\n", - " \"preparative route\": {\n", - " \"name\": \"route\",\n", - " \"unit\": None,\n", - " \"description\": \"Preparative Route\",\n", - " },\n", + " \"# symmetry elements\": {\"name\": \"nsymelems\", \"unit\": \"\", \"description\": \"number of symmetry elements\"},\n", + " \"preparative route\": {\"name\": \"route\", \"unit\": None, \"description\": \"Preparative Route\"},\n", " \"final form\": {\"name\": \"final\", \"unit\": None, \"description\": \"Final Form\"},\n", " \"Authors\": {\"name\": \"authors.main\", \"unit\": None, \"description\": \"Authors\"},\n", - " \"Author of Unit Cell\": {\n", - " \"name\": \"authors.cell\",\n", - " \"unit\": None,\n", - " \"description\": \"Author of Unit Cell\",\n", - " },\n", - " \"DOI\": {\n", - " \"name\": \"dois.main\",\n", - " \"unit\": None,\n", - " \"description\": \"Digital Object Identifier (DOI)\",\n", - " },\n", - " \"Unit Cell DOI\": {\n", - " \"name\": \"dois.cell\",\n", - " \"unit\": None,\n", - " \"description\": \"Unit Cell DOI\",\n", - " },\n", - " \"ICSD of structure\": {\n", - " \"name\": \"icsd.number\",\n", - " \"unit\": \"\",\n", - " \"description\": \"ICSD of structure\",\n", - " },\n", - " \"temp of ICSD (K)\": {\n", - " \"name\": \"icsd.temperature\",\n", - " \"unit\": \"K\",\n", - " \"description\": \"temp of ICSD (K)\",\n", - " },\n", - " \"Cell Volume (A^3)\": {\n", - " \"name\": \"volume.cell\",\n", - " \"unit\": \"ų\",\n", - " \"description\": \"Cell Volume in ų\",\n", - " },\n", - " \"average atomic volume\": {\n", - " \"name\": \"volume.atomic\",\n", - " \"unit\": \"\",\n", - " \"description\": \"average atomic volume\",\n", - " },\n", - " \"Formula Units per Cell\": {\n", - " \"name\": \"units\",\n", - " \"unit\": \"\",\n", - " \"description\": \"Formula Units per Cell\",\n", - " },\n", - " \"Atoms per formula unit\": {\n", - " \"name\": \"natoms.formunit\",\n", - " \"unit\": \"\",\n", - " \"description\": \"Atoms per formula unit\",\n", - " },\n", - " \"total atoms per unit cell\": {\n", - " \"name\": \"natoms.total\",\n", - " \"unit\": \"\",\n", - " \"description\": \"total atoms per unit cell\",\n", - " },\n", + " \"Author of Unit Cell\": {\"name\": \"authors.cell\", \"unit\": None, \"description\": \"Author of Unit Cell\"},\n", + " \"DOI\": {\"name\": \"dois.main\", \"unit\": None, \"description\": \"Digital Object Identifier (DOI)\"},\n", + " \"Unit Cell DOI\": {\"name\": \"dois.cell\", \"unit\": None, \"description\": \"Unit Cell DOI\"},\n", + " \"ICSD of structure\": {\"name\": \"icsd.number\", \"unit\": \"\", \"description\": \"ICSD of structure\"},\n", + " \"temp of ICSD (K)\": {\"name\": \"icsd.temperature\", \"unit\": \"K\", \"description\": \"temp of ICSD (K)\"},\n", + " \"Cell Volume (A^3)\": {\"name\": \"volume.cell\", \"unit\": \"ų\", \"description\": \"Cell Volume in ų\"},\n", + " \"average atomic volume\": {\"name\": \"volume.atomic\", \"unit\": \"\", \"description\": \"average atomic volume\"},\n", + " \"Formula Units per Cell\": {\"name\": \"units\", \"unit\": \"\", \"description\": \"Formula Units per Cell\"},\n", + " \"Atoms per formula unit\": {\"name\": \"natoms.formunit\", \"unit\": \"\", \"description\": \"Atoms per formula unit\"},\n", + " \"total atoms per unit cell\": {\"name\": \"natoms.total\", \"unit\": \"\", \"description\": \"total atoms per unit cell\"}\n", "}\n", "skip = (\"Unnamed:\", \"Comments\")\n", "# for col in df.columns:\n", @@ -236,15 +151,14 @@ "outputs": [], "source": [ "import csv\n", - "\n", "field_names = [\"column\", \"name\", \"unit\", \"scale\", \"description\"]\n", "csvlines = []\n", "for k, v in columns_map.items():\n", " line = {\"column\": k}\n", " line.update(v)\n", " csvlines.append(line)\n", - "\n", - "with open(f\"{name}_columns.csv\", \"w\") as csvfile:\n", + " \n", + "with open(f'{name}_columns.csv', 'w') as csvfile:\n", " writer = csv.DictWriter(csvfile, fieldnames=field_names)\n", " writer.writeheader()\n", " writer.writerows(csvlines)" @@ -257,9 +171,9 @@ "metadata": {}, "outputs": [], "source": [ - "other = unflatten(\n", - " {col[\"name\"]: col[\"description\"] for col in columns_map.values()}, splitter=\"dot\"\n", - ")\n", + "other = unflatten({\n", + " col[\"name\"]: col[\"description\"] for col in columns_map.values()\n", + "}, splitter=\"dot\")\n", "client.update_project({\"other\": other})" ] }, @@ -323,7 +237,7 @@ " formula = record.pop(\"Formula\")\n", " if not isinstance(formula, str) and isnan(formula):\n", " continue\n", - "\n", + " \n", " clean = {}\n", " for k, v in record.items():\n", " if k.startswith(skip) or k not in columns_map:\n", @@ -332,14 +246,14 @@ " # remove NaNs (tip: skip any unset/empty keys)\n", " if not isinstance(v, str) and isnan(v):\n", " continue\n", - " # convert boolean values to Yes/No, and append units\n", + " # convert boolean values to Yes/No, and append units \n", " key = columns_map[k][\"name\"]\n", " unit = columns_map[k].get(\"unit\")\n", " scale = columns_map[k].get(\"scale\")\n", " val = v\n", " if scale is not None and isinstance(scale, (float, int)):\n", " val *= scale\n", - "\n", + " \n", " if isinstance(v, bool):\n", " val = \"Yes\" if v else \"No\"\n", " elif isinstance(v, int) and not unit:\n", @@ -352,7 +266,7 @@ " icsd = clean.get(\"icsd.number\")\n", " if not icsd:\n", " continue\n", - "\n", + " \n", " identifier = icsd_lookup.get(icsd)\n", " if not identifier:\n", " continue\n", @@ -374,7 +288,7 @@ "client.delete_contributions() # remove all contributions from project\n", "client.init_columns(columns)\n", "client.submit_contributions(contributions)\n", - "client.init_columns(columns) # shouldn't be needed but ensures all columns appear\n", + "client.init_columns(columns) # shouldn't be needed but ensures all columns appear\n", "# client.make_public()" ] }, diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ferroelectrics.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ferroelectrics.ipynb index 813671be85..458b629c00 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ferroelectrics.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ferroelectrics.ipynb @@ -11,9 +11,10 @@ "source": [ "import json\n", "import numpy as np\n", - "from mpcontribs.client import Client\n", + "from mpcontribs.client import Client, Attachment\n", "from pathlib import Path\n", - "from flatten_dict import flatten, unflatten" + "from flatten_dict import flatten, unflatten\n", + "from pymatgen.core import Structure" ] }, { @@ -63,7 +64,7 @@ "\n", "with distortions_file.open() as f:\n", " distortions = json.load(f)\n", - "\n", + " \n", "with workflow_data_file.open() as f:\n", " workflow_data = json.load(f)" ] @@ -81,47 +82,30 @@ " \"bilbao_nonpolar_spacegroup\": {\"name\": \"bilbao.spacegroup.nonpolar\", \"unit\": \"\"},\n", " \"bilbao_polar_spacegroup\": {\"name\": \"bilbao.spacegroup.polar\", \"unit\": \"\"},\n", " \"polarization_change_norm\": {\"name\": \"polarization.norm\", \"unit\": \"µC/cm²\"},\n", - " \"polarization_change\": {\n", - " \"name\": \"polarization.vector\",\n", - " \"unit\": \"µC/cm²\",\n", - " \"fields\": [\"a\", \"b\", \"c\"],\n", - " },\n", - " \"polarization_quanta\": {\n", - " \"name\": \"polarization.quanta\",\n", - " \"unit\": \"µC/cm²\",\n", - " \"fields\": [\"a\", \"b\", \"c\"],\n", - " },\n", - " \"energies\": {\"name\": \"energy|diff\", \"unit\": \"eV\"},\n", + " \"polarization_change\": {\"name\": \"polarization.vector\", \"unit\": \"µC/cm²\", \"fields\": [\"a\", \"b\", \"c\"]},\n", + " \"polarization_quanta\": {\"name\":\"polarization.quanta\", \"unit\":\"µC/cm²\", \"fields\": [\"a\", \"b\", \"c\"]},\n", + " \"energies\": {\"name\":\"energy|diff\", \"unit\":\"eV\"},\n", " \"search_id\": {\"name\": \"workflow.id|search\", \"unit\": \"\"},\n", - " \"workflow_status\": {\"name\": \"workflow.status\", \"unit\": None},\n", - " \"category\": {\"name\": \"workflow.category\", \"unit\": None}, # dynamic\n", + " \"workflow_status\": {\"name\": \"workflow.status\",\"unit\":None},\n", + " \"category\": {\"name\": \"workflow.category\", \"unit\": None}, # dynamic\n", " \"distortion.dmax\": {\"name\": \"distortion.dmax.before\", \"unit\": \"Å\"},\n", " \"calculated_max_distance\": {\"name\": \"distortion.dmax.after\", \"unit\": \"Å\"},\n", - " # \"distortion.delta\": {\"name\": \"distortion.delta\", \"unit\": \"\"},\n", - " # \"distortion.dav\": {\"name\": \"distortion.dav\", \"unit\": \"\"},\n", - " # \"distortion.s\": {\"name\": \"distortion.s\", \"unit\": \"\"},\n", + "# \"distortion.delta\": {\"name\": \"distortion.delta\", \"unit\": \"\"},\n", + "# \"distortion.dav\": {\"name\": \"distortion.dav\", \"unit\": \"\"},\n", + "# \"distortion.s\": {\"name\": \"distortion.s\", \"unit\": \"\"},\n", " \"bandgaps\": {\"name\": \"bandgap\", \"unit\": \"eV\"},\n", - " # \"nonpolar_band_gap\": {\"name\": \"nonpolar.bandgap\", \"unit\": \"eV\"},\n", + "# \"nonpolar_band_gap\": {\"name\": \"nonpolar.bandgap\", \"unit\": \"eV\"},\n", " \"nonpolar_icsd\": {\"name\": \"nonpolar.icsd\", \"unit\": \"\"},\n", " \"nonpolar_id\": {\"name\": \"nonpolar.mpid\", \"unit\": None},\n", " \"nonpolar_spacegroup\": {\"name\": \"nonpolar.spacegroup\", \"unit\": \"\"},\n", - " # \"polar_band_gap\": {\"name\": \"polar.bandgap\", \"unit\": \"eV\"},\n", + "# \"polar_band_gap\": {\"name\": \"polar.bandgap\", \"unit\": \"eV\"},\n", " \"polar_icsd\": {\"name\": \"polar.icsd\", \"unit\": \"\"},\n", " \"polar_id\": {\"name\": \"polar.mpid\", \"unit\": None},\n", - " \"polar_spacegroup\": {\"name\": \"polar.spacegroup\", \"unit\": \"\"},\n", - " \"energies_per_atom_max_spline_jumps\": {\n", - " \"name\": \"energies.jumps|max\",\n", - " \"unit\": \"eV/atom\",\n", - " },\n", + " \"polar_spacegroup\": {\"name\": \"polar.spacegroup\", \"unit\": \"\"}, \n", + " \"energies_per_atom_max_spline_jumps\": {\"name\": \"energies.jumps|max\", \"unit\": \"eV/atom\"},\n", " \"energies_per_atom_smoothness\": {\"name\": \"energies.smoothness\", \"unit\": \"eV/atom\"},\n", - " \"polarization_max_spline_jumps\": {\n", - " \"name\": \"polarizations.jumps\",\n", - " \"fields\": {\"max\": \"µC/cm²\", \"index\": \"\"},\n", - " },\n", - " \"polarization_smoothness\": {\n", - " \"name\": \"polarizations.smoothness\",\n", - " \"fields\": {\"max\": \"µC/cm²\", \"index\": \"\"},\n", - " },\n", + " \"polarization_max_spline_jumps\": {\"name\": \"polarizations.jumps\", \"fields\": {\"max\": \"µC/cm²\", \"index\": \"\"}},\n", + " \"polarization_smoothness\": {\"name\": \"polarizations.smoothness\", \"fields\": {\"max\": \"µC/cm²\", \"index\": \"\"}},\n", "}" ] }, @@ -133,36 +117,27 @@ "outputs": [], "source": [ "def get_category(wf):\n", - " if (\n", - " wf[\"polarization_len\"] == 10\n", - " and \"polarization_max_spline_jumps\" in wf\n", - " and np.all(np.array(wf[\"polarization_max_spline_jumps\"]) <= 1)\n", - " and wf[\"energies_per_atom_max_spline_jumps\"] <= 1e-2\n", - " ):\n", + " if (wf['polarization_len'] == 10 and\n", + " 'polarization_max_spline_jumps' in wf and\n", + " np.all(np.array(wf['polarization_max_spline_jumps']) <= 1) and\n", + " wf['energies_per_atom_max_spline_jumps'] <= 1e-2):\n", " return \"smooth\"\n", - "\n", - " elif (\n", - " wf[\"polarization_len\"] == 10\n", - " and \"polarization_change_norm\" in wf\n", - " and \"polarization_max_spline_jumps\" in wf\n", - " and (\n", - " wf[\"energies_per_atom_max_spline_jumps\"] > 1e-2\n", - " or np.any(np.array(wf[\"polarization_max_spline_jumps\"]) > 1)\n", - " )\n", - " ):\n", + " \n", + " elif (wf['polarization_len'] == 10 and\n", + " 'polarization_change_norm' in wf and\n", + " 'polarization_max_spline_jumps' in wf and\n", + " (wf['energies_per_atom_max_spline_jumps'] > 1e-2 or\n", + " np.any(np.array(wf['polarization_max_spline_jumps']) > 1))):\n", " return \"unsmooth\"\n", - "\n", - " elif (\n", - " wf[\"static_len\"] == 10\n", - " and \"polarization_change_norm\" not in wf\n", - " and wf[\"workflow_status\"] in (\"COMPLETED\", \"DEFUSED\")\n", - " ):\n", + " \n", + " elif (wf['static_len'] == 10 and\n", + " 'polarization_change_norm' not in wf and\n", + " wf['workflow_status'] in (\"COMPLETED\",\"DEFUSED\")):\n", " return \"static\"\n", - "\n", - " elif (wf[\"polarization_len\"] < 10 or \"polarization_change_norm\" not in wf) and (\n", - " (wf[\"workflow_status\"] == \"DEFUSED\" and wf[\"static_len\"] < 10)\n", - " or wf[\"workflow_status\"] in (\"FIZZLED\", \"RUNNING\")\n", - " ):\n", + " \n", + " elif ((wf['polarization_len'] < 10 or 'polarization_change_norm' not in wf) and\n", + " ((wf['workflow_status'] == \"DEFUSED\" and wf['static_len'] < 10) or\n", + " wf['workflow_status'] in (\"FIZZLED\",\"RUNNING\"))):\n", " return \"incomplete\"" ] }, @@ -180,24 +155,22 @@ "for distortion in distortions:\n", " k1, k2 = distortion[\"nonpolar_id\"], distortion[\"polar_id\"]\n", " key = f\"{k1}_{k2}\"\n", - " contribs_distortions[key] = {\"data\": {}} # , \"structures\": [], \"attachments\": []}\n", - "\n", + " contribs_distortions[key] = {\"data\": {}}#, \"structures\": [], \"attachments\": []}\n", + " \n", " for k, v in flatten(distortion, reducer=\"dot\", max_flatten_depth=2).items():\n", " if k.endswith(\"_pre\") or k.startswith(\"_id\"):\n", - " continue\n", + " continue \n", " elif not isinstance(v, (dict, list)):\n", " conf = columns.get(k)\n", " if conf:\n", " name, unit = conf[\"name\"], conf[\"unit\"]\n", - " dec = conf.get(\"dec\", \"\")\n", - " contribs_distortions[key][\"data\"][name] = (\n", - " f\"{float(v):{dec}} {unit}\" if unit else v\n", - " )\n", + " dec = conf.get('dec', '')\n", + " contribs_distortions[key][\"data\"][name] = f\"{float(v):{dec}} {unit}\" if unit else v\n", "# elif isinstance(v, dict) and \"@class\" in v and v[\"@class\"] == \"Structure\":\n", "# structure = Structure.from_dict(v)\n", "# structure.name = k\n", "# contribs_distortions[key][\"structures\"].append(structure)\n", - "\n", + " \n", "# attm = Attachment.from_data(\"distortion\", distortion)\n", "# contribs_distortions[key][\"attachments\"].append(attm)" ] @@ -228,53 +201,49 @@ "\n", "for wf in workflow_data:\n", " k1, k2 = wf[\"nonpolar_id\"], wf[\"polar_id\"]\n", - " key = f\"{k1}_{k2}\" # NOTE could also use search_id for this\n", + " key = f\"{k1}_{k2}\" # NOTE could also use search_id for this\n", " distortion = contribs_distortions[key]\n", " contrib = {\n", - " \"identifier\": wf[\"wfid\"],\n", - " \"formula\": wf[\"pretty_formula\"],\n", + " \"identifier\": wf[\"wfid\"], \"formula\": wf[\"pretty_formula\"],\n", " \"data\": contribs_distortions[key][\"data\"],\n", - " # \"structures\": contribs_distortions[key][\"structures\"],\n", - " # \"attachments\": contribs_distortions[key][\"attachments\"]\n", + "# \"structures\": contribs_distortions[key][\"structures\"],\n", + "# \"attachments\": contribs_distortions[key][\"attachments\"]\n", " }\n", - " contrib[\"data\"][\"workflow.category\"] = get_category(wf)\n", + " contrib['data']['workflow.category'] = get_category(wf)\n", " if ids and wf[\"wfid\"] in ids:\n", " contrib[\"id\"] = ids[wf[\"wfid\"]]\n", - "\n", - " # for k in structure_keys:\n", - " # if k in wf:\n", - " # structure = Structure.from_dict(wf[k])\n", - " # structure.name = k\n", - " # contrib[\"structures\"].append(structure)\n", - "\n", + " \n", + "# for k in structure_keys:\n", + "# if k in wf:\n", + "# structure = Structure.from_dict(wf[k])\n", + "# structure.name = k\n", + "# contrib[\"structures\"].append(structure)\n", + " \n", " for k, v in flatten(wf, reducer=\"dot\").items():\n", " conf = columns.get(k)\n", - " if conf and k.startswith(\"polarization\") and isinstance(v, list):\n", + " if conf and k.startswith('polarization') and isinstance(v, list):\n", " name, fields = conf[\"name\"], conf[\"fields\"]\n", " contrib[\"data\"].setdefault(name, {})\n", - " if \"unit\" not in conf:\n", + " if not \"unit\" in conf:\n", " vmax, unit = max(v), fields[\"max\"]\n", - " contrib[\"data\"][name][\"max\"] = f\"{round(vmax, 3)} {unit}\" if unit else v\n", - " contrib[\"data\"][name][\"index\"] = v.index(vmax)\n", + " contrib[\"data\"][name]['max'] = f\"{round(vmax, 3)} {unit}\" if unit else v\n", + " contrib[\"data\"][name]['index'] = v.index(vmax)\n", " else:\n", " unit = conf[\"unit\"]\n", " contrib[\"data\"][name] = {\n", - " i: f\"{j} {unit}\" for i, j in zip(conf[\"fields\"], v[0])\n", + " i: f\"{j} {unit}\"\n", + " for i, j in zip(conf[\"fields\"], v[0])\n", " }\n", - " elif conf and k == \"energies_per_atom\":\n", + " elif conf and k == 'energies_per_atom':\n", " name, unit = conf[\"name\"], conf[\"unit\"]\n", " ediff = v[0] - v[-1]\n", - " contrib[\"data\"][name] = f\"{ediff:.3g} {unit}\"\n", - " elif conf and k == \"bandgaps\":\n", + " contrib[\"data\"][name] = f\"{ediff:.3g} {unit}\" \n", + " elif conf and k == 'bandgaps':\n", " name, unit = conf[\"name\"], conf[\"unit\"]\n", " contrib[\"data\"].setdefault(name, {})\n", " contrib[\"data\"][name][\"nonpolar\"] = f\"{v[0]:.3g} {unit}\"\n", " contrib[\"data\"][name][\"polar\"] = f\"{v[-1]:.3g} {unit}\"\n", - " elif (\n", - " k.startswith((\"_id\", \"cid\"))\n", - " or isinstance(v, list)\n", - " or k.startswith(structure_keys)\n", - " ):\n", + " elif k.startswith((\"_id\", \"cid\")) or isinstance(v, list) or k.startswith(structure_keys):\n", " continue\n", " elif conf:\n", " name, unit = conf[\"name\"], conf[\"unit\"]\n", @@ -282,12 +251,12 @@ " contrib[\"data\"][name] = f\"{v:.1g} {unit}\" if unit else v\n", " else:\n", " contrib[\"data\"][name] = f\"{v:.3g} {unit}\" if unit else v\n", - "\n", - " # attm = Attachment.from_data(\"workflow\", wf)\n", - " # contrib[\"attachments\"].append(attm)\n", + " \n", + "# attm = Attachment.from_data(\"workflow\", wf)\n", + "# contrib[\"attachments\"].append(attm)\n", " contrib[\"data\"] = unflatten(contrib[\"data\"], splitter=\"dot\")\n", " contributions.append(contrib)\n", - "\n", + " \n", "len(contributions)" ] }, @@ -324,7 +293,7 @@ "metadata": {}, "outputs": [], "source": [ - "# client.delete_contributions()\n", + "#client.delete_contributions()\n", "client.init_columns({})\n", "client.init_columns(columns_map)" ] diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/gbdb.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/gbdb.ipynb index 809d45d359..315384b0ea 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/gbdb.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/gbdb.ipynb @@ -24,7 +24,7 @@ "metadata": {}, "outputs": [], "source": [ - "client = Client(project=\"gbdb\") # set your API key via the `apikey` keyword argument" + "client = Client(project=\"gbdb\") # set your API key via the `apikey` keyword argument" ] }, { @@ -53,7 +53,7 @@ " \"repetitions\": \"number of repetitions of the base structure in x/y direction\",\n", " \"temperature\": \"temperature of MD simulation in Kelvin\",\n", " \"steps\": \"number of steps of MD simulation\",\n", - " \"potential\": \"classical potential used\",\n", + " \"potential\": \"classical potential used\"\n", "}\n", "client.update_project({\"other\": other})" ] @@ -75,8 +75,8 @@ "source": [ "# initialize columns\n", "columns = {\n", - " \"element\": None, # string\n", - " \"indices.h\": \"\", # dimensionless\n", + " \"element\": None, # string\n", + " \"indices.h\": \"\", # dimensionless\n", " \"indices.k\": \"\",\n", " \"indices.l\": \"\",\n", " \"boundary\": None,\n", @@ -88,7 +88,7 @@ " \"repetitions.y\": \"\",\n", " \"temperature\": \"K\",\n", " \"steps\": \"\",\n", - " \"potential\": None,\n", + " \"potential\": None\n", "}\n", "client.init_columns(columns)" ] @@ -107,7 +107,7 @@ " spec = [elem for i in range(dump.natoms)]\n", " df = dump.data.copy()\n", " df.drop(df.tail(1).index, inplace=True)\n", - " pos = df[[\"x\", \"y\", \"z\"]].to_numpy()\n", + " pos = df[['x', 'y', 'z']].to_numpy()\n", " return Structure(lattice=lat, species=spec, coords=pos, coords_are_cartesian=True)" ] }, @@ -120,16 +120,14 @@ "source": [ "# prep contributions\n", "contributions = []\n", - "indir = Path(\n", - " \"/Users/patrick/GoogleDriveLBNL/My Drive/MaterialsProject/gitrepos/mpcontribs-data/gbdb\"\n", - ")\n", + "indir = Path(\"/Users/patrick/GoogleDriveLBNL/My Drive/MaterialsProject/gitrepos/mpcontribs-data/gbdb\")\n", "keys = list(k for k in columns.keys() if not k.startswith(\"indices\"))\n", "keys.insert(1, \"indices\")\n", "\n", "for path in indir.glob(\"lammps_*\"):\n", " identifier = hashlib.md5(path.name.encode(\"utf-8\")).hexdigest()\n", " contrib = {\"identifier\": identifier, \"data\": {}}\n", - "\n", + " \n", " for idx, part in enumerate(path.name.split(\"_\")[1:]):\n", " if idx == 1:\n", " contrib[\"data\"][\"indices\"] = {k: int(v) for k, v in zip(\"hkl\", part)}\n", @@ -137,7 +135,7 @@ " key = keys[idx]\n", " unit = columns[key]\n", " contrib[\"data\"][key] = f\"{part} {unit}\" if unit else part\n", - "\n", + " \n", " contrib[\"data\"] = unflatten(contrib[\"data\"], splitter=\"dot\")\n", " structure = get_structure(contrib[\"data\"][\"element\"], path)\n", " contrib[\"formula\"] = structure.composition.reduced_formula\n", @@ -170,9 +168,7 @@ "source": [ "# submit contributions\n", "client.submit_contributions(contributions)\n", - "client.init_columns(\n", - " columns\n", - ") # this should not be needed but doesn't hurt, possible API bug" + "client.init_columns(columns) # this should not be needed but doesn't hurt, possible API bug" ] }, { @@ -190,7 +186,7 @@ "metadata": {}, "outputs": [], "source": [ - "# client._reinit() # only needed if data just uploaded\n", + "#client._reinit() # only needed if data just uploaded\n", "ncontribs, _ = client.get_totals()\n", "ncontribs" ] @@ -215,12 +211,10 @@ "source": [ "query = {\"data__boundary__exact\": \"tilt\", \"data__n__value__gt\": 0}\n", "count, _ = client.get_totals(query=query)\n", - "print(f\"grain boundaries of type tilt and n>0: {count / ncontribs * 100:.1f}%\")\n", + "print(f\"grain boundaries of type tilt and n>0: {count/ncontribs*100:.1f}%\")\n", "fields = [\"identifier\", \"formula\", \"data.energy.value\", \"data.potential\"]\n", "sort = \"data.energy.value\"\n", - "contribs = client.query_contributions(\n", - " query=query, fields=fields, sort=sort, paginate=True\n", - ")\n", + "contribs = client.query_contributions(query=query, fields=fields, sort=sort, paginate=True)\n", "pd.json_normalize(contribs[\"data\"])" ] } diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/get_started.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/get_started.ipynb index b35a15ce45..049498fcd0 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/get_started.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/get_started.ipynb @@ -60,7 +60,7 @@ "outputs": [], "source": [ "db = DB.Database(\"refractive.db\")\n", - "# db.create_database_from_url()" + "#db.create_database_from_url()" ] }, { @@ -149,11 +149,11 @@ " formula = info[\"book\"]\n", " mpid = mpr.get_materials_ids(formula)[0]\n", "\n", - " rmin, rmax = info[\"rangeMin\"] * 1000, info[\"rangeMax\"] * 1000\n", + " rmin, rmax = info['rangeMin']*1000, info['rangeMax']*1000\n", " mid = (rmin + rmax) / 2\n", " n = mat.get_refractiveindex(mid)\n", " k = mat.get_extinctioncoefficient(mid)\n", - "\n", + " \n", " x = \"wavelength λ [μm]\"\n", " refrac = DataFrame(mat.get_complete_refractive(), columns=[x, \"n\"])\n", " refrac.set_index(x, inplace=True)\n", @@ -164,9 +164,9 @@ " df.attrs[\"title\"] = f\"Complex refractive index (n+ik) for {formula}\"\n", " df.attrs[\"labels\"] = {\n", " \"value\": \"n, k\", # y-axis label\n", - " \"variable\": \"Re/Im\", # legend name (= df.columns.name)\n", + " \"variable\": \"Re/Im\" # legend name (= df.columns.name)\n", " }\n", - " df.plot(**df.attrs) # .show()\n", + " df.plot(**df.attrs)#.show()\n", " df.attrs[\"name\"] = \"n,k(λ)\"\n", " return {\n", " \"project\": name,\n", @@ -178,9 +178,9 @@ " \"range.mid\": f\"{mid} nm\",\n", " \"range.max\": f\"{rmax} nm\",\n", " \"points\": info[\"points\"],\n", - " \"page\": info[\"page\"],\n", + " \"page\": info[\"page\"]\n", " },\n", - " \"tables\": [df],\n", + " \"tables\": [df]\n", " }" ] }, @@ -208,7 +208,10 @@ "metadata": {}, "outputs": [], "source": [ - "client = Client(host=\"workshop-contribs-api.materialsproject.org\", apikey=apikey)" + "client = Client(\n", + " host=\"workshop-contribs-api.materialsproject.org\",\n", + " apikey=apikey\n", + ")" ] }, { @@ -227,21 +230,18 @@ "outputs": [], "source": [ "update = {\n", - " \"unique_identifiers\": False,\n", - " \"references\": [\n", - " {\"label\": \"website\", \"url\": \"https://refractiveindex.info\"},\n", - " {\n", - " \"label\": \"source\",\n", - " \"url\": \"https://refractiveindex.info/download/database/rii-database-2019-02-11.zip\",\n", - " },\n", + " 'unique_identifiers': False,\n", + " 'references': [\n", + " {'label': 'website', 'url': 'https://refractiveindex.info'},\n", + " {'label': 'source', 'url': \"https://refractiveindex.info/download/database/rii-database-2019-02-11.zip\"}\n", " ],\n", - " \"other\": { # describe the root fields here to automatically include tooltips on MP\n", + " \"other\": { # describe the root fields here to automatically include tooltips on MP\n", " \"n\": \"real part of complex refractive index\",\n", " \"k\": \"imaginary part of complex refractive index\",\n", " \"range\": \"wavelength range for n,k in nm\",\n", " \"points\": \"number of λ points in range\",\n", - " \"page\": \"reference to data source/publication\",\n", - " },\n", + " \"page\": \"reference to data source/publication\"\n", + " }\n", "}\n", "# could also update authors, title, long_title, description" ] @@ -280,18 +280,15 @@ "metadata": {}, "outputs": [], "source": [ - "client.init_columns(\n", - " name,\n", - " {\n", - " \"n\": \"\", # dimensionless\n", - " \"k\": \"\",\n", - " \"range.min\": \"nm\",\n", - " \"range.mid\": \"nm\",\n", - " \"range.max\": \"nm\",\n", - " \"points\": \"\",\n", - " \"page\": None, # text\n", - " },\n", - ")" + "client.init_columns(name, {\n", + " \"n\": \"\", # dimensionless\n", + " \"k\": \"\",\n", + " \"range.min\": \"nm\",\n", + " \"range.mid\": \"nm\",\n", + " \"range.max\": \"nm\",\n", + " \"points\": \"\",\n", + " \"page\": None # text \n", + "})" ] }, { @@ -394,7 +391,10 @@ "outputs": [], "source": [ "all_ids = client.get_all_ids(\n", - " {\"project\": name}, include=[\"tables\"], data_id_fields={name: \"page\"}, fmt=\"map\"\n", + " {\"project\": name},\n", + " include=[\"tables\"],\n", + " data_id_fields={name: \"page\"},\n", + " fmt=\"map\"\n", ")" ] }, @@ -439,18 +439,18 @@ "query = {\n", " \"project\": name,\n", " \"formula__contains\": \"Au\",\n", - " # \"identifier__in\": []\n", + " #\"identifier__in\": []\n", + "\n", " \"data__n__value__lt\": 200,\n", " \"data__k__value__gte\": 7,\n", + "\n", " \"_sort\": \"-data__range__mid__value\",\n", " \"_fields\": [\n", - " \"id\",\n", - " \"identifier\",\n", - " \"formula\",\n", + " \"id\", \"identifier\", \"formula\",\n", " \"data.range.mid.value\",\n", " \"data.n.value\",\n", - " \"data.k.value\",\n", - " ],\n", + " \"data.k.value\"\n", + " ]\n", "}\n", "\n", "print(client.get_totals(query))\n", diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/intermatch.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/intermatch.ipynb index b1df676413..8eb5bfd12f 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/intermatch.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/intermatch.ipynb @@ -46,14 +46,11 @@ " \"identifier\": \"mp-48\",\n", " \"data\": {\n", " \"interface\": \"mp-22850\",\n", - " \"Δn\": 1.3,\n", - " \"ε\": 3.6199,\n", - " \"atoms\": 208,\n", - " \"θ\": \"0 °\",\n", + " \"Δn\": 1.3, \"ε\": 3.6199, \"atoms\": 208, \"θ\": \"0 °\",\n", " \"surface\": {\"N₁\": 40, \"N₂\": 6, \"ratio\": 6.666},\n", " \"v₁\": {\"i₁₁\": -8, \"i₁₂\": 8, \"i₂₁\": -3, \"i₂₂\": 3},\n", - " \"v₂\": {\"j₁₁\": -13, \"j₁₂\": 8, \"j₂₁\": -5, \"j₂₂\": 3},\n", - " },\n", + " \"v₂\": {\"j₁₁\": -13, \"j₁₂\": 8, \"j₂₁\": -5, \"j₂₂\": 3}\n", + " }\n", " }\n", "]" ] diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ion_ref_data.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ion_ref_data.ipynb index ca14d3f31a..4543e68cdb 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ion_ref_data.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ion_ref_data.ipynb @@ -29,7 +29,7 @@ "outputs": [], "source": [ "from pprint import pprint\n", - "from monty.serialization import loadfn\n", + "from monty.serialization import loadfn, dumpfn\n", "from pymatgen.core.ion import Ion" ] }, @@ -87,11 +87,13 @@ " if e[\"Name\"] == \"HGaO2[2-]\":\n", " ion_ref_data[i] = {\n", " \"Energy\": -7.1099,\n", - " \"Major_Elements\": [\"Ga\"],\n", + " \"Major_Elements\": [\n", + " \"Ga\"\n", + " ],\n", " \"Name\": \"HGaO3[2-]\",\n", " \"Reference Solid\": \"Ga2O3\",\n", " \"Reference solid energy\": -10.347724703224722,\n", - " \"Source\": \"D. D. Wagman et al., Selected values for inorganic and C1 and C2 Organic substances in SI units, The NBS table of chemical thermodynamic properties, Washington (1982)\",\n", + " \"Source\": \"D. D. Wagman et al., Selected values for inorganic and C1 and C2 Organic substances in SI units, The NBS table of chemical thermodynamic properties, Washington (1982)\"\n", " }\n", " print(\"Replaced entry at index {}\".format(i))" ] @@ -119,8 +121,7 @@ "outputs": [], "source": [ "from mpcontribs.client import Client\n", - "\n", - "name = \"ion_ref_data\" # this should be your project, see from the project URL\n", + "name = 'ion_ref_data' # this should be your project, see from the project URL\n", "client = Client()" ] }, @@ -137,7 +138,7 @@ "metadata": {}, "outputs": [], "source": [ - "ion_contribs = []\n", + "ion_contribs =[]\n", "\n", "for d in ion_ref_data:\n", " ret = {}\n", @@ -146,16 +147,12 @@ " ret[\"identifier\"] = d[\"Name\"]\n", " ret[\"data\"] = {}\n", " ret[\"data\"][\"charge\"] = Ion.from_formula(d[\"Name\"]).charge\n", - " ret[\"data\"][\"ΔGᶠ\"] = \"{:.5g} kJ/mol\".format(\n", - " d[\"Energy\"] * 96.485\n", - " ) # convert from eV/f.u. to kJ/mol\n", + " ret[\"data\"][\"ΔGᶠ\"] = \"{:.5g} kJ/mol\".format(d[\"Energy\"]*96.485) # convert from eV/f.u. to kJ/mol\n", " ret[\"data\"][\"MajElements\"] = d[\"Major_Elements\"][0]\n", " ret[\"data\"][\"RefSolid\"] = d[\"Reference Solid\"]\n", - " ret[\"data\"][\"ΔGᶠRefSolid\"] = \"{:.4g} kJ/mol\".format(\n", - " d[\"Reference solid energy\"] * 96.485\n", - " ) # convert from eV/f.u. to kJ/mol\n", + " ret[\"data\"][\"ΔGᶠRefSolid\"] = \"{:.4g} kJ/mol\".format(d[\"Reference solid energy\"]*96.485)# convert from eV/f.u. to kJ/mol\n", " ret[\"data\"][\"reference\"] = d[\"Source\"]\n", - "\n", + " \n", " ion_contribs.append(ret)" ] }, @@ -192,20 +189,18 @@ "outputs": [], "source": [ "client.projects.update_entry(\n", - " pk=\"ion_ref_data\",\n", - " project={\n", - " \"other\": {\n", - " \"formula\": \"Chemical formula of the aqueous species\",\n", - " \"charge\": \"Charge on the aqueous species\",\n", - " \"ΔGᶠ\": \"Gibbs free energy of formation of the aqueous species from the elements\",\n", - " \"MajElementsᶠ\": None,\n", - " \"MajElements\": \"Elements contained in the aqueous species\",\n", - " \"RefSolid\": \"Solid compound to which the aqueous species energy is referenced\",\n", - " \"ΔGᶠRefSolid\": \"Gibbs free energy of formation of the reference solid compound\",\n", - " \"Ion\": None,\n", - " },\n", - " \"description\": \"This project contains experimental ion dissolution energies that are used by pymatgen when constructing Pourbaix diagrams. See the Persson2012 reference for a detailed description of the thermodynamic framework used.\",\n", - " },\n", + " pk=\"ion_ref_data\", project={\"other\": \n", + " {\"formula\": \"Chemical formula of the aqueous species\",\n", + " \"charge\": \"Charge on the aqueous species\",\n", + " \"ΔGᶠ\": \"Gibbs free energy of formation of the aqueous species from the elements\",\n", + " \"MajElementsᶠ\": None,\n", + " \"MajElements\": \"Elements contained in the aqueous species\",\n", + " \"RefSolid\": \"Solid compound to which the aqueous species energy is referenced\",\n", + " \"ΔGᶠRefSolid\": \"Gibbs free energy of formation of the reference solid compound\",\n", + " \"Ion\": None\n", + " },\n", + " \"description\": \"This project contains experimental ion dissolution energies that are used by pymatgen when constructing Pourbaix diagrams. See the Persson2012 reference for a detailed description of the thermodynamic framework used.\"\n", + " }\n", ").result()" ] }, @@ -216,10 +211,8 @@ "outputs": [], "source": [ "client.projects.update_entry(\n", - " pk=\"ion_ref_data\",\n", - " project={\n", - " \"authors\": \"Various authors (see references). Data compiled by the Materials Project team.\"\n", - " },\n", + " pk=\"ion_ref_data\", project={\"authors\": \"Various authors (see references). Data compiled by the Materials Project team.\"\n", + " }\n", ").result()" ] }, @@ -230,7 +223,8 @@ "outputs": [], "source": [ "client.projects.update_entry(\n", - " pk=\"ion_ref_data\", project={\"title\": \"Aqueous Ion Reference Data\"}\n", + " pk=\"ion_ref_data\", project={\"title\": \"Aqueous Ion Reference Data\"\n", + " }\n", ").result()" ] }, @@ -241,51 +235,18 @@ "outputs": [], "source": [ "client.projects.update_entry(\n", - " pk=\"ion_ref_data\",\n", - " project={\n", - " \"references\": [\n", - " {\n", - " \"label\": \"Persson2012\",\n", - " \"url\": \"https://doi.org/10.1103/PhysRevB.85.235438\",\n", - " },\n", - " {\n", - " \"label\": \"NBS1\",\n", - " \"url\": \"https://nvlpubs.nist.gov/nistpubs/Legacy/TN/nbstechnicalnote270-1.pdf\",\n", - " },\n", - " {\n", - " \"label\": \"NBS2\",\n", - " \"url\": \"https://nvlpubs.nist.gov/nistpubs/Legacy/TN/nbstechnicalnote270-2.pdf\",\n", - " },\n", - " {\n", - " \"label\": \"NBS3\",\n", - " \"url\": \"https://nvlpubs.nist.gov/nistpubs/Legacy/TN/nbstechnicalnote270-3.pdf\",\n", - " },\n", - " {\n", - " \"label\": \"NBS4\",\n", - " \"url\": \"https://nvlpubs.nist.gov/nistpubs/Legacy/TN/nbstechnicalnote270-4.pdf\",\n", - " },\n", - " {\n", - " \"label\": \"NBS5\",\n", - " \"url\": \"https://nvlpubs.nist.gov/nistpubs/Legacy/TN/nbstechnicalnote270-5.pdf\",\n", - " },\n", - " {\n", - " \"label\": \"NBS6\",\n", - " \"url\": \"https://nvlpubs.nist.gov/nistpubs/Legacy/TN/nbstechnicalnote270-6.pdf\",\n", - " },\n", - " {\n", - " \"label\": \"NBS7\",\n", - " \"url\": \"https://nvlpubs.nist.gov/nistpubs/Legacy/TN/nbstechnicalnote270-7.pdf\",\n", - " },\n", - " {\n", - " \"label\": \"NBS8\",\n", - " \"url\": \"https://nvlpubs.nist.gov/nistpubs/Legacy/TN/nbstechnicalnote270-8.pdf\",\n", - " },\n", - " {\n", - " \"label\": \"Pourbaix\",\n", - " \"url\": \"https://www.worldcat.org/title/atlas-of-electrochemical-equilibria-in-aqueous-solutions/oclc/563921897\",\n", - " },\n", - " ]\n", - " },\n", + " pk=\"ion_ref_data\", project={\"references\": [\n", + " {\"label\":\"Persson2012\", 'url':\"https://doi.org/10.1103/PhysRevB.85.235438\"},\n", + " {'label': 'NBS1', 'url': 'https://nvlpubs.nist.gov/nistpubs/Legacy/TN/nbstechnicalnote270-1.pdf'},\n", + " {'label': 'NBS2', 'url': 'https://nvlpubs.nist.gov/nistpubs/Legacy/TN/nbstechnicalnote270-2.pdf'},\n", + " {'label': 'NBS3', 'url': 'https://nvlpubs.nist.gov/nistpubs/Legacy/TN/nbstechnicalnote270-3.pdf'},\n", + " {'label': 'NBS4', 'url': 'https://nvlpubs.nist.gov/nistpubs/Legacy/TN/nbstechnicalnote270-4.pdf'},\n", + " {'label': 'NBS5', 'url': 'https://nvlpubs.nist.gov/nistpubs/Legacy/TN/nbstechnicalnote270-5.pdf'},\n", + " {'label': 'NBS6', 'url': 'https://nvlpubs.nist.gov/nistpubs/Legacy/TN/nbstechnicalnote270-6.pdf'},\n", + " {'label': 'NBS7', 'url': 'https://nvlpubs.nist.gov/nistpubs/Legacy/TN/nbstechnicalnote270-7.pdf'},\n", + " {'label': 'NBS8', 'url': 'https://nvlpubs.nist.gov/nistpubs/Legacy/TN/nbstechnicalnote270-8.pdf'},\n", + " {\"label\":\"Pourbaix\", 'url':\"https://www.worldcat.org/title/atlas-of-electrochemical-equilibria-in-aqueous-solutions/oclc/563921897\"}]\n", + " }\n", ").result()" ] }, @@ -321,7 +282,7 @@ "# need to delete contributions first due to unique_identifiers=False\n", "client.delete_contributions(name)\n", "client.submit_contributions(ion_contribs, per_page=10, skip_dupe_check=True)\n", - "# client.contributions.create_entries(contributions=ion_contribs[0:100]).result()" + "#client.contributions.create_entries(contributions=ion_contribs[0:100]).result()" ] }, { diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/jarvis_dft.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/jarvis_dft.ipynb index 3de2a4beaf..bb08b09503 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/jarvis_dft.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/jarvis_dft.ipynb @@ -6,9 +6,7 @@ "metadata": {}, "outputs": [], "source": [ - "import os\n", - "import json\n", - "import tarfile\n", + "import os, json, tarfile\n", "from mpcontribs.client import Client\n", "from urllib.request import urlretrieve\n", "from monty.json import MontyDecoder\n", @@ -22,7 +20,7 @@ "metadata": {}, "outputs": [], "source": [ - "name = \"jarvis_dft\"\n", + "name = 'jarvis_dft'\n", "client = Client()" ] }, @@ -59,22 +57,22 @@ "metadata": {}, "outputs": [], "source": [ - "dimensions = [\"2d\", \"3d\"]\n", + "dimensions = ['2d', '3d']\n", "tgz = \"jdft_{}.json.tgz\"\n", "config = {\n", " \"file\": f\"https://www.ctcms.nist.gov/~knc6/{tgz}\",\n", " \"details\": \"https://www.ctcms.nist.gov/~knc6/jsmol/{}.html\",\n", - " \"columns\": { # 'mpid'\n", - " \"jid\": {\"name\": \"details\"},\n", - " \"fin_en\": {\"name\": \"E\", \"unit\": \"meV\"},\n", - " \"exfoliation_en\": {\"name\": \"Eₓ\", \"unit\": \"eV\"},\n", - " \"form_enp\": {\"name\": \"ΔH\", \"unit\": \"eV\"},\n", - " \"op_gap\": {\"name\": \"ΔEⱽᴰᵂ\", \"unit\": \"meV\"},\n", - " \"mbj_gap\": {\"name\": \"ΔEᴹᴮᴶ\", \"unit\": \"meV\"},\n", - " \"kv\": {\"name\": \"Kᵥ\", \"unit\": \"GPa\"},\n", - " \"gv\": {\"name\": \"Gᵥ\", \"unit\": \"GPa\"},\n", - " \"magmom\": {\"name\": \"µ\", \"unit\": \"µᵇ\"},\n", - " },\n", + " 'columns': { # 'mpid'\n", + " 'jid': {'name': 'details'},\n", + " 'fin_en': {'name': 'E', 'unit': 'meV'},\n", + " 'exfoliation_en': {'name': 'Eₓ', 'unit': 'eV'},\n", + " 'form_enp': {'name': 'ΔH', 'unit': 'eV'},\n", + " 'op_gap': {'name': 'ΔEⱽᴰᵂ', 'unit': 'meV'},\n", + " 'mbj_gap': {'name': 'ΔEᴹᴮᴶ', 'unit': 'meV'},\n", + " 'kv': {'name': 'Kᵥ', 'unit': 'GPa'},\n", + " 'gv': {'name': 'Gᵥ', 'unit': 'GPa'},\n", + " 'magmom': {'name': 'µ', 'unit': 'µᵇ'}\n", + " }\n", "}" ] }, @@ -89,17 +87,17 @@ "\n", "for dim in dimensions:\n", " url = config[\"file\"].format(dim)\n", - " dbfile = url.rsplit(\"/\")[-1]\n", + " dbfile = url.rsplit('/')[-1]\n", " dbpath = os.path.join(dbdir, dbfile)\n", - "\n", + " \n", " if not os.path.exists(dbpath):\n", - " print(\"downloading\", dbpath, \"...\")\n", + " print('downloading', dbpath, '...')\n", " urlretrieve(url, dbpath)\n", "\n", " with tarfile.open(dbpath, \"r:gz\") as tar:\n", " member = tar.getmembers()[0]\n", " raw_data[dim] = json.load(tar.extractfile(member), cls=MontyDecoder)\n", - "\n", + " \n", " print(dim, len(raw_data[dim]))" ] }, @@ -123,16 +121,15 @@ " for dim in dimensions:\n", " for rd in raw_data[dim]:\n", " contrib = {\n", - " \"project\": name,\n", - " \"is_public\": True,\n", - " \"identifier\": rd[\"mpid\"],\n", - " \"data\": {\"type\": dim.upper()},\n", + " 'project': name, 'is_public': True,\n", + " 'identifier': rd[\"mpid\"],\n", + " 'data': {'type': dim.upper()}\n", " }\n", "\n", " dct = {}\n", - " for k, col in config[\"columns\"].items():\n", - " hdr, unit = col[\"name\"], col.get(\"unit\")\n", - " if k == \"jid\":\n", + " for k, col in config['columns'].items():\n", + " hdr, unit = col['name'], col.get('unit')\n", + " if k == 'jid':\n", " dct[hdr] = config[hdr].format(rd[k])\n", " elif k in rd:\n", " if unit and rd[k]:\n", @@ -140,18 +137,18 @@ " float(rd[k])\n", " except ValueError:\n", " continue\n", - " dct[hdr] = f\"{rd[k]} {unit}\" if unit else rd[k]\n", + " dct[hdr] = f'{rd[k]} {unit}' if unit else rd[k]\n", "\n", " contrib[\"data\"].update(unflatten(dct))\n", "\n", - " contrib[\"structures\"] = [rd[\"final_str\"]]\n", + " contrib[\"structures\"] = [rd['final_str']]\n", " contributions.append(contrib)\n", " pbar.update(1)\n", "\n", "# make sure that contributions with all columns come first\n", - "contributions = [\n", - " d for d in sorted(contributions, key=lambda x: len(x[\"data\"]), reverse=True)\n", - "]" + "contributions = [d for d in sorted(\n", + " contributions, key=lambda x: len(x[\"data\"]), reverse=True\n", + ")]" ] }, { @@ -193,17 +190,13 @@ " \"_order_by\": \"data__ΔEⱽᴰᵂ__value\",\n", " \"order\": \"desc\",\n", " \"_fields\": [\n", - " \"id\",\n", - " \"identifier\",\n", - " \"formula\",\n", - " \"data.type\",\n", - " \"data.ΔEⱽᴰᵂ.value\",\n", - " \"data.ΔEᴹᴮᴶ.value\",\n", - " \"data.Kᵥ.value\",\n", - " \"structures\",\n", + " \"id\", \"identifier\", \"formula\",\n", + " \"data.type\", \"data.ΔEⱽᴰᵂ.value\",\n", + " \"data.ΔEᴹᴮᴶ.value\", \"data.Kᵥ.value\",\n", + " \"structures\"\n", " ],\n", - " \"_limit\": 10,\n", - "}\n", + " \"_limit\": 10\n", + "} \n", "resp = client.contributions.get_entries(**query).result()" ] }, diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/jarvis_dft_2023.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/jarvis_dft_2023.ipynb index 152fddd11d..a5ca1fe7e0 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/jarvis_dft_2023.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/jarvis_dft_2023.ipynb @@ -32,7 +32,7 @@ "metadata": {}, "outputs": [], "source": [ - "name = \"dft_3d\" # TODO dft_2d\n", + "name = 'dft_3d' # TODO dft_2d\n", "data = jarvis_db(name)" ] }, @@ -44,68 +44,62 @@ "outputs": [], "source": [ "columns = {\n", - " \"jid\": {\"name\": \"jarvis.id\", \"unit\": None},\n", - " \"jid\": {\"name\": \"jarvis.link\", \"unit\": None},\n", - " \"Tc_supercon\": {\"name\": \"Tc\", \"unit\": \"K\"},\n", - " \"avg_elec_mass\": {\"name\": \"mass|avg.elec\", \"unit\": \"mₑ\"},\n", - " \"avg_hole_mass\": {\"name\": \"mass|avg.hole\", \"unit\": \"mₑ\"},\n", - " \"bulk_modulus_kv\": {\"name\": \"moduli.bulk|voigt\", \"unit\": \"GPa\"},\n", - " \"shear_modulus_gv\": {\"name\": \"moduli.shear\", \"unit\": \"GPa\"},\n", - " \"crys\": {\"name\": \"crystal\", \"unit\": None},\n", - " \"density\": {\"name\": \"density\", \"unit\": \"g/cm³\"},\n", - " \"dfpt_piezo_max_dielectric\": {\"name\": \"piezo|max.dielectric.total\", \"unit\": \"C/m²\"},\n", - " \"dfpt_piezo_max_dielectric_electronic\": {\n", - " \"name\": \"piezo|max.dielectric.electronic\",\n", - " \"unit\": \"C/m²\",\n", - " },\n", - " \"dfpt_piezo_max_dielectric_ionic\": {\n", - " \"name\": \"piezo|max.dielectric.ionic\",\n", - " \"unit\": \"C/m²\",\n", - " },\n", - " \"dfpt_piezo_max_dij\": {\"name\": \"piezo|max.dij\", \"unit\": \"C/m²\"},\n", - " \"dfpt_piezo_max_eij\": {\"name\": \"piezo|max.eij\", \"unit\": \"C/m²\"},\n", - " \"dimensionality\": {\"name\": \"dimensionality\", \"unit\": None},\n", - " \"effective_masses_300K.n\": {\"name\": \"mass|eff.n|300K\", \"unit\": \"\"},\n", - " \"effective_masses_300K.p\": {\"name\": \"mass|eff.p|300K\", \"unit\": \"\"},\n", - " \"spg_number\": {\"name\": \"spacegroup.number\", \"unit\": \"\"},\n", - " \"spg_symbol\": {\"name\": \"spacegroup.symbol\", \"unit\": None},\n", - " \"hse_gap\": {\"name\": \"bandgaps.HSE\", \"unit\": \"eV\"},\n", - " \"mbj_bandgap\": {\"name\": \"bandgaps.TBmBJ\", \"unit\": \"eV\"},\n", - " \"optb88vdw_bandgap\": {\"name\": \"bandgaps.OptB88vdW\", \"unit\": \"eV\"},\n", - " \"n-powerfact\": {\"name\": \"powerfactor.n\", \"unit\": \"µW/K²/m²\"},\n", - " \"p-powerfact\": {\"name\": \"powerfactor.p\", \"unit\": \"µW/K²/m²\"},\n", - " \"slme\": {\"name\": \"SLME\", \"unit\": \"%\"},\n", - " \"spillage\": {\"name\": \"spillage\", \"unit\": \"\"},\n", - " \"encut\": {\"name\": \"ENCUT\", \"unit\": \"eV\"},\n", - " \"magmom_oszicar\": {\"name\": \"magmoms.oszicar\", \"unit\": \"µB\"},\n", - " \"magmom_outcar\": {\"name\": \"magmoms.outcar\", \"unit\": \"µB\"},\n", - " \"n-Seebeck\": {\"name\": \"seebeck.n\", \"unit\": \"µV/K\"},\n", - " \"p-Seebeck\": {\"name\": \"seebeck.p\", \"unit\": \"µV/K\"},\n", - " \"epsx\": {\"name\": \"refractive.x\", \"unit\": \"\"},\n", - " \"epsy\": {\"name\": \"refractive.y\", \"unit\": \"\"},\n", - " \"epsz\": {\"name\": \"refractive.z\", \"unit\": \"\"},\n", - " \"max_ir_mode\": {\"name\": \"IR.max\", \"unit\": \"cm⁻¹\"},\n", - " \"min_ir_mode\": {\"name\": \"IR.min\", \"unit\": \"cm⁻¹\"},\n", - " \"ncond\": {\"name\": \"Ncond\", \"unit\": \"\"},\n", - " \"nkappa\": {\"name\": \"kappa.n\", \"unit\": \"\"},\n", - " \"pkappa\": {\"name\": \"kappa.p\", \"unit\": \"\"},\n", - " \"exfoliation_energy\": {\"name\": \"energies.exfoliation\", \"unit\": \"eV\"},\n", - " \"formation_energy_peratom\": {\"name\": \"energies.formation\", \"unit\": \"eV/atom\"},\n", - " \"ehull\": {\"name\": \"energies.hull\", \"unit\": \"eV\"},\n", - " \"optb88vdw_total_energy\": {\"name\": \"energies.OptB88vdW\", \"unit\": \"eV\"},\n", - " \"max_efg\": {\"name\": \"EFG\", \"unit\": \"V/m²\"},\n", - " \"func\": {\"name\": \"functional\", \"unit\": None},\n", - " \"kpoint_length_unit\": {\"name\": \"kpoints\", \"unit\": \"\"},\n", - " \"typ\": {\"name\": \"type\", \"unit\": None},\n", - " \"nat\": {\"name\": \"natoms\", \"unit\": \"\"},\n", - " \"search\": {\"name\": \"search\", \"unit\": None},\n", - " \"maxdiff_bz\": {\"name\": \"maxdiff.bz\", \"unit\": \"\"},\n", - " \"maxdiff_mesh\": {\"name\": \"maxdiff.mesh\", \"unit\": \"\"},\n", - " \"mepsx\": {\"name\": \"meps.x\", \"unit\": \"\"},\n", - " \"mepsy\": {\"name\": \"meps.y\", \"unit\": \"\"},\n", - " \"mepsz\": {\"name\": \"meps.z\", \"unit\": \"\"},\n", - " \"pcond\": {\"name\": \"pcond\", \"unit\": \"\"},\n", - " \"poisson\": {\"name\": \"poisson\", \"unit\": \"\"},\n", + " 'jid': {'name': 'jarvis.id', 'unit': None},\n", + " 'jid': {'name': 'jarvis.link', 'unit': None},\n", + " 'Tc_supercon': {'name': 'Tc', 'unit': 'K'},\n", + " 'avg_elec_mass': {'name': 'mass|avg.elec', 'unit': 'mₑ'},\n", + " 'avg_hole_mass': {'name': 'mass|avg.hole', 'unit': 'mₑ'},\n", + " 'bulk_modulus_kv': {'name': 'moduli.bulk|voigt', 'unit': 'GPa'},\n", + " 'shear_modulus_gv': {'name': 'moduli.shear', 'unit': 'GPa'},\n", + " 'crys': {'name': 'crystal', 'unit': None},\n", + " 'density': {'name': 'density', 'unit': 'g/cm³'},\n", + " 'dfpt_piezo_max_dielectric': {'name': 'piezo|max.dielectric.total', 'unit': 'C/m²'},\n", + " 'dfpt_piezo_max_dielectric_electronic': {'name': 'piezo|max.dielectric.electronic', 'unit': 'C/m²'},\n", + " 'dfpt_piezo_max_dielectric_ionic': {'name': 'piezo|max.dielectric.ionic', 'unit': 'C/m²'},\n", + " 'dfpt_piezo_max_dij': {'name': 'piezo|max.dij', 'unit': 'C/m²'},\n", + " 'dfpt_piezo_max_eij': {'name': 'piezo|max.eij', 'unit': 'C/m²'},\n", + " 'dimensionality': {'name': 'dimensionality', 'unit': None},\n", + " 'effective_masses_300K.n': {'name': 'mass|eff.n|300K', 'unit': ''},\n", + " 'effective_masses_300K.p': {'name': 'mass|eff.p|300K', 'unit': ''},\n", + " 'spg_number': {'name': 'spacegroup.number', 'unit': ''},\n", + " 'spg_symbol': {'name': 'spacegroup.symbol', 'unit': None},\n", + " 'hse_gap': {'name': 'bandgaps.HSE', 'unit': 'eV'},\n", + " 'mbj_bandgap': {'name': 'bandgaps.TBmBJ', 'unit': 'eV'},\n", + " 'optb88vdw_bandgap': {'name': 'bandgaps.OptB88vdW', 'unit': 'eV'},\n", + " 'n-powerfact': {'name': 'powerfactor.n', 'unit': 'µW/K²/m²'},\n", + " 'p-powerfact': {'name': 'powerfactor.p', 'unit': 'µW/K²/m²'},\n", + " 'slme': {'name': 'SLME', 'unit': '%'},\n", + " 'spillage': {'name': 'spillage', 'unit': ''},\n", + " 'encut': {'name': 'ENCUT', 'unit': 'eV'},\n", + " 'magmom_oszicar': {'name': 'magmoms.oszicar', 'unit': 'µB'},\n", + " 'magmom_outcar': {'name': 'magmoms.outcar', 'unit': 'µB'},\n", + " 'n-Seebeck': {'name': 'seebeck.n', 'unit': 'µV/K'},\n", + " 'p-Seebeck': {'name': 'seebeck.p', 'unit': 'µV/K'},\n", + " 'epsx': {'name': 'refractive.x', 'unit': ''},\n", + " 'epsy': {'name': 'refractive.y', 'unit': ''},\n", + " 'epsz': {'name': 'refractive.z', 'unit': ''},\n", + " 'max_ir_mode': {'name': 'IR.max', 'unit': 'cm⁻¹'},\n", + " 'min_ir_mode': {'name': 'IR.min', 'unit': 'cm⁻¹'},\n", + " 'ncond': {'name': 'Ncond', 'unit': ''},\n", + " 'nkappa': {'name': 'kappa.n', 'unit': ''},\n", + " 'pkappa': {'name': 'kappa.p', 'unit': ''},\n", + " 'exfoliation_energy': {'name': 'energies.exfoliation', 'unit': 'eV'},\n", + " 'formation_energy_peratom': {'name': 'energies.formation', 'unit': 'eV/atom'},\n", + " 'ehull': {'name': 'energies.hull', 'unit': 'eV'},\n", + " 'optb88vdw_total_energy': {'name': 'energies.OptB88vdW', 'unit': 'eV'}, \n", + " 'max_efg': {'name': 'EFG', 'unit': 'V/m²'},\n", + " 'func': {'name': 'functional', 'unit': None},\n", + " 'kpoint_length_unit': {'name': 'kpoints', 'unit': ''},\n", + " 'typ': {'name': 'type', 'unit': None},\n", + " 'nat': {'name': 'natoms', 'unit': ''}, \n", + " 'search': {'name': 'search', 'unit': None},\n", + " 'maxdiff_bz': {'name': 'maxdiff.bz', 'unit': ''},\n", + " 'maxdiff_mesh': {'name': 'maxdiff.mesh', 'unit': ''},\n", + " 'mepsx': {'name': 'meps.x', 'unit': ''},\n", + " 'mepsy': {'name': 'meps.y', 'unit': ''},\n", + " 'mepsz': {'name': 'meps.z', 'unit': ''},\n", + " 'pcond': {'name': 'pcond', 'unit': ''},\n", + " 'poisson': {'name': 'poisson', 'unit': ''},\n", "}" ] }, @@ -119,22 +113,22 @@ "outputs": [], "source": [ "contributions = []\n", - "list_keys = [\"efg\", \"elastic_tensor\", \"modes\", \"icsd\"]\n", + "list_keys = ['efg', 'elastic_tensor', 'modes', 'icsd']\n", "identifier_key = \"reference\"\n", "formula_key = \"formula\"\n", "prefixes = (\"mp-\", \"mvc-\")\n", - "jarvis_url = \"https://www.ctcms.nist.gov/~knc6/static/JARVIS-DFT/\"\n", + "jarvis_url = 'https://www.ctcms.nist.gov/~knc6/static/JARVIS-DFT/'\n", "identifiers = set()\n", "\n", "for entry in data:\n", " identifier = entry[identifier_key]\n", " if not entry[identifier_key].startswith(prefixes) or identifier in identifiers:\n", " continue\n", - "\n", + " \n", " identifiers.add(identifier)\n", " contrib = {\"identifier\": identifier, \"formula\": entry[formula_key], \"data\": {}}\n", " attm_data = {}\n", - "\n", + " \n", " for k, v in entry.items():\n", " if not v or v == \"na\" or k == \"xml_data_link\":\n", " continue\n", @@ -160,7 +154,7 @@ " elif k in columns:\n", " name, unit = columns[k][\"name\"], columns[k][\"unit\"]\n", " contrib[\"data\"][name] = f\"{v} {unit}\" if unit else v\n", - "\n", + " \n", " if attm_data:\n", " contrib[\"attachments\"] = [Attachment.from_data(\"lists\", attm_data)]\n", "\n", @@ -184,7 +178,7 @@ " if \"files\" in contrib[\"data\"]:\n", " flat_files = flatten(contrib[\"data\"][\"files\"], reducer=\"dot\")\n", " files_columns.update(flat_files.keys())\n", - "\n", + " \n", "files_columns" ] }, @@ -400,12 +394,10 @@ "source": [ "query = {\"data__energies__hull__value__lte\": 0.05}\n", "count, _ = client.get_totals(query=query)\n", - "print(f\"materials with ehull <= 0.05 eV/atom: {count / ncontribs * 100:.1f}%\")\n", + "print(f\"materials with ehull <= 0.05 eV/atom: {count/ncontribs*100:.1f}%\")\n", "fields = [\"identifier\", \"formula\", \"data.energies.hull.value\"]\n", "sort = \"data.energies.hull.value\"\n", - "contribs = client.query_contributions(\n", - " query=query, fields=fields, sort=sort, paginate=True\n", - ")\n", + "contribs = client.query_contributions(query=query, fields=fields, sort=sort, paginate=True)\n", "pd.json_normalize(contribs[\"data\"])" ] }, @@ -479,19 +471,13 @@ " \"data__spillage__value__gte\": 0.5,\n", " \"data__bandgaps__OptB88vdW__value__gt\": 0.01,\n", " \"data__energies__hull__value__lt\": 0.1,\n", - " \"data__SLME__value__gt\": 5,\n", + " \"data__SLME__value__gt\": 5\n", "}\n", "fields = [\n", - " \"identifier\",\n", - " \"formula\",\n", - " \"data.spillage.value\",\n", - " \"data.bandgaps.OptB88vdW.value\",\n", - " \"data.energies.hull.value\",\n", - " \"data.SLME.value\",\n", + " \"identifier\", \"formula\", \"data.spillage.value\", \"data.bandgaps.OptB88vdW.value\",\n", + " \"data.energies.hull.value\", \"data.SLME.value\",\n", "]\n", - "contribs = client.query_contributions(\n", - " query=query, fields=fields, sort=sort, paginate=True\n", - ")\n", + "contribs = client.query_contributions(query=query, fields=fields, sort=sort, paginate=True)\n", "pd.json_normalize(contribs[\"data\"])" ] }, @@ -651,9 +637,7 @@ "# find all cubic materials\n", "query = {\"data__crystal__exact\": \"cubic\"}\n", "fields = [\"identifier\", \"formula\", \"data.crystal\", \"data.energies.hull.value\"]\n", - "contribs = client.query_contributions(\n", - " query=query, fields=fields, sort=sort, paginate=True\n", - ")\n", + "contribs = client.query_contributions(query=query, fields=fields, sort=sort, paginate=True)\n", "pd.json_normalize(contribs[\"data\"])" ] }, diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/matscholar.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/matscholar.ipynb index 979b0aaa7f..31e5a2c243 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/matscholar.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/matscholar.ipynb @@ -7,7 +7,8 @@ "metadata": {}, "outputs": [], "source": [ - "from mpcontribs.client import Client" + "from pathlib import Path\n", + "from mpcontribs.client import Client, Attachment" ] }, { @@ -47,7 +48,7 @@ " \"symmetry.symbol\": None,\n", " \"symmetry.system\": None,\n", " \"symmetry.number\": \"\",\n", - " \"bandgap\": \"eV\",\n", + " \"bandgap\": \"eV\"\n", "}" ] }, @@ -61,20 +62,24 @@ "# generate list of contribution dictionaries\n", "contributions = [\n", " {\n", - " \"identifier\": \"custom_hash\", # or any string to uniquely identify entry/contribution\n", + " \"identifier\": \"custom_hash\", # or any string to uniquely identify entry/contribution\n", " \"formula\": \"Fe3S4\",\n", " \"data\": {\n", - " \"doi\": \"https://doi.org/10.17188/1196965\", # if saved as full URL, a link will be shown in the explorer\n", - " \"symmetry\": {\"symbol\": \"Fd3̅m\", \"system\": \"cubic\", \"number\": 227},\n", - " \"bandgap\": \"3.12 eV\",\n", + " \"doi\": \"https://doi.org/10.17188/1196965\", # if saved as full URL, a link will be shown in the explorer\n", + " \"symmetry\": {\n", + " \"symbol\": \"Fd3̅m\",\n", + " \"system\": \"cubic\",\n", + " \"number\": 227\n", + " },\n", + " \"bandgap\": \"3.12 eV\"\n", " },\n", - " # \"attachments\": [ # create from data, or load gzipped text or images from disk using Path\n", - " # Attachment.from_data(\"other\", {\"hello\": \"world\", \"test\": [1,2,4]})\n", - " # Path(\"2021-02-19_scan_mpids_changed.json.gz\"),\n", - " # Path(\"IMG-20210224-WA0010.jpg\")\n", - " # ],\n", - " # \"structures\": [pymatgen.Structure, ...],\n", - " # \"tables\": [pandas.DataFrame, ...]\n", + "# \"attachments\": [ # create from data, or load gzipped text or images from disk using Path\n", + "# Attachment.from_data(\"other\", {\"hello\": \"world\", \"test\": [1,2,4]})\n", + "# Path(\"2021-02-19_scan_mpids_changed.json.gz\"),\n", + "# Path(\"IMG-20210224-WA0010.jpg\")\n", + "# ],\n", + "# \"structures\": [pymatgen.Structure, ...],\n", + "# \"tables\": [pandas.DataFrame, ...]\n", " },\n", " # ...\n", "]" @@ -106,7 +111,7 @@ "query = {\n", " \"data__bandgap__value__gt\": 3,\n", " \"data__doi__endswith\": \"/1196965\",\n", - " \"data__symmetry__system__exact\": \"cubic\",\n", + " \"data__symmetry__system__exact\": \"cubic\"\n", "}\n", "fields = [\"identifier\", \"formula\", \"data.doi\"]\n", "client.query_contributions(query=query, fields=fields, paginate=True)" diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/melting_points.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/melting_points.ipynb index 95b3ae9d3f..e3fcc9aadc 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/melting_points.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/melting_points.ipynb @@ -58,12 +58,8 @@ "metadata": {}, "outputs": [], "source": [ - "indir = (\n", - " \"/Users/patrick/GoogleDriveLBNL/My Drive/MaterialsProject/gitrepos/mpcontribs-data\"\n", - ")\n", - "melting_pts = pd.DataFrame(\n", - " loadfn(f\"{indir}/melting_points_df_08_08_23.json.gz\")\n", - ") # Note: temps in Kelvin" + "indir = \"/Users/patrick/GoogleDriveLBNL/My Drive/MaterialsProject/gitrepos/mpcontribs-data\"\n", + "melting_pts = pd.DataFrame(loadfn(f\"{indir}/melting_points_df_08_08_23.json.gz\")) # Note: temps in Kelvin" ] }, { @@ -108,14 +104,14 @@ "\n", "for d in data:\n", " val, err = d[\"melting_point\"], d[\"melting_point_uncertainty\"]\n", - " contributions.append(\n", - " {\n", - " \"identifier\": d[\"index\"],\n", - " \"formula\": d[\"reduced_formula\"],\n", - " \"data\": {\"MeltingPoint\": f\"{val}+/-{err} K\"},\n", + " contributions.append({\n", + " \"identifier\": d[\"index\"],\n", + " \"formula\": d[\"reduced_formula\"],\n", + " \"data\": {\n", + " \"MeltingPoint\": f\"{val}+/-{err} K\"\n", " }\n", - " )\n", - "\n", + " })\n", + " \n", "contributions[0]" ] }, diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/mg_cathode_screening_2022.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/mg_cathode_screening_2022.ipynb index b98cfb008d..77de1868c8 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/mg_cathode_screening_2022.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/mg_cathode_screening_2022.ipynb @@ -21,9 +21,7 @@ "metadata": {}, "outputs": [], "source": [ - "client = Client(\n", - " project=\"mg_cathode_screening_2022\"\n", - ") # provide API key via `apikey` argument" + "client = Client(project=\"mg_cathode_screening_2022\") # provide API key via `apikey` argument" ] }, { @@ -52,11 +50,7 @@ "metadata": {}, "outputs": [], "source": [ - "client.update_project(\n", - " update={\n", - " \"description\": \"A computational screening approach to identify high-performance multivalent intercalation cathodes among materials that do not contain the working ion of interest has been developed, which greatly expands the search space that can be considered for material discovery (https://doi.org/10.1021/acsami.2c11733). This magnesium intercalation cathode data set of phase stability, energy density, & transport properties has been generated using these methods but applied to a larger set of materials than the original publication. 5,853 empty host materials of the 16,682 materials previously down selected based on their reducible species oxidation state were prioritized for Mg insertions based on excluding candidates which contained an extractable ion (H, Li, Na, K, Rb, Cs, Mg, Ca, Cs, Ag, Cu). Of these 5,863 attempted Mg insertion workflows, 83% resulted in at least one viable Mg site. This ultimately resulted in 4,872 Mg cathodes from which 229 ApproxNEB workflows were attempted. There were 193 unique structure types in these 229 candidates. All ApproxNEB images calculations successfully completed for 97 electrodes. This data set uses the following python objects: pymatgen.apps.battery.insertion_battery.InsertionElectrode and pymatgen.analysis.diffusion.neb.full_path_mapper.MigrationGraph\"\n", - " }\n", - ")" + "client.update_project(update={\"description\":\"A computational screening approach to identify high-performance multivalent intercalation cathodes among materials that do not contain the working ion of interest has been developed, which greatly expands the search space that can be considered for material discovery (https://doi.org/10.1021/acsami.2c11733). This magnesium intercalation cathode data set of phase stability, energy density, & transport properties has been generated using these methods but applied to a larger set of materials than the original publication. 5,853 empty host materials of the 16,682 materials previously down selected based on their reducible species oxidation state were prioritized for Mg insertions based on excluding candidates which contained an extractable ion (H, Li, Na, K, Rb, Cs, Mg, Ca, Cs, Ag, Cu). Of these 5,863 attempted Mg insertion workflows, 83% resulted in at least one viable Mg site. This ultimately resulted in 4,872 Mg cathodes from which 229 ApproxNEB workflows were attempted. There were 193 unique structure types in these 229 candidates. All ApproxNEB images calculations successfully completed for 97 electrodes. This data set uses the following python objects: pymatgen.apps.battery.insertion_battery.InsertionElectrode and pymatgen.analysis.diffusion.neb.full_path_mapper.MigrationGraph\"})" ] }, { @@ -67,31 +61,31 @@ "outputs": [], "source": [ "# add legend for project in `other`\n", - "client.update_project(\n", - " update={\n", - " \"other\": {\n", - " \"identifier\": \"Material Project ID for empty host material\",\n", - " \"formula\": \"Empty host material chemical formula\",\n", - " \"host.formulaAnonymous\": \"Empty host material anonumous chemical formula\",\n", - " \"host.nelements\": \"Number of distinct elements in empty host material\",\n", - " \"host.chemsys\": \"Empty host material chemical system of distinct elements sorted alphabetically and joined by dashes\",\n", - " \"ICSD.exp\": \"Whether empty host material is an ICSD experimental structure\",\n", - " \"ICSD.ids\": \"Identifiers for the Inorganic Crystal Structure Database\",\n", - " \"battery.id\": \"Unique identifier for electrode where 'js-' distinguishes calculations from the screening development phase\",\n", - " \"battery.formula\": \"Electrode chemical formula including the working ion fraction\",\n", - " \"battery.workingIon\": \"Battery system working ion\",\n", - " \"battery.voltage\": \"Average voltage in Volts across all voltage pairs\",\n", - " \"battery.capacity\": \"Total gravimetric capacity in mAh/g of cathode active material\",\n", - " \"battery.stability|charge\": \"Energy above hull in eV/atom, a metric of the phase stability of the charged (empty) state\",\n", - " \"battery.stability|discharge\": \"Energy above hull in eV/atom, a metric of the phase stability of the discharged (intercalated) state\",\n", - " \"battery.Δvolume\": \"Largest volume change in % across all voltage pairs\",\n", - " \"MigrationGraph.found\": \"Whether a migration graph mapping out connections between working ion sites could be successfully generated\",\n", - " \"MigrationGraph.npaths\": \"The number of possible percolating pathways identified from the migration graph\",\n", - " \"ApproxNEB.uuid\": \"If available, identifier for ApproxNEB calculations for migration graph pathway energetics\",\n", - " \"ApproxNEB.complete\": \"If ApproxNEB calculations are available, the fraction of calculations that were successfully completed\",\n", - " }\n", - " }\n", - ")" + "client.update_project(update={\"other\": {\"identifier\": \"Material Project ID for empty host material\",\n", + " \"formula\": \"Empty host material chemical formula\",\n", + " \n", + " \"host.formulaAnonymous\": \"Empty host material anonumous chemical formula\",\n", + " \"host.nelements\": \"Number of distinct elements in empty host material\",\n", + " \"host.chemsys\": \"Empty host material chemical system of distinct elements sorted alphabetically and joined by dashes\",\n", + " \n", + " \"ICSD.exp\": \"Whether empty host material is an ICSD experimental structure\",\n", + " \"ICSD.ids\": \"Identifiers for the Inorganic Crystal Structure Database\",\n", + " \n", + " \"battery.id\": \"Unique identifier for electrode where 'js-' distinguishes calculations from the screening development phase\",\n", + " \"battery.formula\": \"Electrode chemical formula including the working ion fraction\",\n", + " \"battery.workingIon\": \"Battery system working ion\",\n", + " \"battery.voltage\": \"Average voltage in Volts across all voltage pairs\",\n", + " \"battery.capacity\": \"Total gravimetric capacity in mAh/g of cathode active material\",\n", + " \"battery.stability|charge\": \"Energy above hull in eV/atom, a metric of the phase stability of the charged (empty) state\",\n", + " \"battery.stability|discharge\": \"Energy above hull in eV/atom, a metric of the phase stability of the discharged (intercalated) state\",\n", + " \"battery.Δvolume\": \"Largest volume change in % across all voltage pairs\",\n", + " \n", + " \"MigrationGraph.found\": \"Whether a migration graph mapping out connections between working ion sites could be successfully generated\",\n", + " \"MigrationGraph.npaths\": \"The number of possible percolating pathways identified from the migration graph\",\n", + " \n", + " \"ApproxNEB.uuid\": \"If available, identifier for ApproxNEB calculations for migration graph pathway energetics\",\n", + " \"ApproxNEB.complete\": \"If ApproxNEB calculations are available, the fraction of calculations that were successfully completed\",\n", + "}})" ] }, { @@ -119,7 +113,7 @@ "metadata": {}, "outputs": [], "source": [ - "# client.delete_contributions()" + "#client.delete_contributions()" ] }, { @@ -141,24 +135,22 @@ " \"formula_anonymous\": {\"name\": \"host.formulaAnonymous\", \"unit\": None},\n", " \"nelements\": {\"name\": \"host.nelements\", \"unit\": \"\"},\n", " \"chemsys\": {\"name\": \"host.chemsys\", \"unit\": None},\n", - " \"icsd_experimental\": {\n", - " \"name\": \"ICSD.exp\",\n", - " \"unit\": None,\n", - " }, # convert bool to Yes/No string\n", + " \n", + " \"icsd_experimental\": {\"name\": \"ICSD.exp\", \"unit\": None}, # convert bool to Yes/No string\n", " \"icsd_ids\": {\"name\": \"ICSD.ids\", \"unit\": None},\n", + " \n", " \"battery_id\": {\"name\": \"battery.id\", \"unit\": None},\n", " \"battery_formula\": {\"name\": \"battery.formula\", \"unit\": None},\n", " \"working_ion\": {\"name\": \"battery.workingIon\", \"unit\": None},\n", " \"average_voltage\": {\"name\": \"battery.voltage\", \"unit\": \"V\"},\n", - " \"capacity_grav\": {\"name\": \"battery.capacity\", \"unit\": \"mAh/g\"},\n", + " \"capacity_grav\": {\"name\": \"battery.capacity\", \"unit\": \"mAh/g\"}, \n", " \"stability_charge\": {\"name\": \"battery.stability|charge\", \"unit\": \"eV/atom\"},\n", " \"stability_discharge\": {\"name\": \"battery.stability|discharged\", \"unit\": \"eV/atom\"},\n", " \"max_delta_volume\": {\"name\": \"battery.Δvolume\", \"unit\": \"%\"},\n", + " \n", " \"migration_graph_found\": {\"name\": \"MigrationGraph.found\", \"unit\": None},\n", - " \"num_paths_found\": {\n", - " \"name\": \"MigrationGraph.npaths\",\n", - " \"unit\": \"\",\n", - " }, # emptry string indicates dimensionless number\n", + " \"num_paths_found\": {\"name\": \"MigrationGraph.npaths\", \"unit\": \"\"},# emptry string indicates dimensionless number\n", + " \n", " \"aneb_wf_uuid\": {\"name\": \"ApproxNEB.uuid\", \"unit\": None},\n", " \"aneb_wf_complete\": {\"name\": \"ApproxNEB.complete\", \"unit\": \"\"},\n", "}" @@ -204,19 +196,17 @@ "# Applies cost function based on voltage and stability (specific to Mg) for prioritizing electrodes\n", "# Created by custom MapBuilder: https://github.com/materialsproject/emmet/commit/692bdf5eff67fe1b0f48e1a13cee999af9136aae\n", "rank_store = MongograntStore(\n", - " \"ro:mongodb07-ext.nersc.gov/fw_acr_mv\", \"rank_electrodes_2022\", key=\"battery_id\"\n", + " \"ro:mongodb07-ext.nersc.gov/fw_acr_mv\",\"rank_electrodes_2022\",key=\"battery_id\"\n", ")\n", "rank_store.connect()\n", "print(rank_store.count())\n", "\n", "# Raw ApproxNEB workflow data (note 2 of the 229 ApproxNEB workflows had unsuccessful host calculations)\n", "aneb_store = MongograntStore(\n", - " \"ro:mongodb07-ext.nersc.gov/fw_acr_mv\", \"approx_neb\", key=\"wf_uuid\"\n", + " \"ro:mongodb07-ext.nersc.gov/fw_acr_mv\",\"approx_neb\",key=\"wf_uuid\"\n", ")\n", "aneb_store.connect()\n", - "print(\n", - " aneb_store.count(), aneb_store.count({\"tags\": {\"$all\": [\"migration_graph_2022\"]}})\n", - ")" + "print(aneb_store.count(),aneb_store.count({\"tags\":{\"$all\":[\"migration_graph_2022\"]}}))" ] }, { @@ -239,94 +229,90 @@ "source": [ "contrib_docs = []\n", "for bid in bids:\n", - " rank_doc = rank_store.query_one({\"battery_id\": bid})\n", - " aneb_doc = aneb_store.query_one({\"battery_id\": bid})\n", + " rank_doc = rank_store.query_one({\"battery_id\":bid})\n", + " aneb_doc = aneb_store.query_one({\"battery_id\":bid})\n", "\n", " contrib_doc = {\n", - " \"battery_id\": bid,\n", + " \"battery_id\":bid,\n", " # host structure properties\n", - " \"host_mp_ids\": rank_doc[\"host_mp_ids\"],\n", - " \"icsd_experimental\": rank_doc[\"icsd_experimental\"],\n", - " \"icsd_ids\": rank_doc[\"host_icsd_ids\"],\n", - " \"formula\": rank_doc[\"framework_formula\"],\n", - " \"formula_anonymous\": rank_doc[\"formula_anonymous\"],\n", - " \"nelements\": rank_doc[\"nelements\"],\n", - " \"chemsys\": rank_doc[\"chemsys\"],\n", - " \"composition\": rank_doc[\"framework\"],\n", - " \"structure\": rank_doc[\"host_structure\"],\n", + " \"host_mp_ids\":rank_doc[\"host_mp_ids\"],\n", + " \"icsd_experimental\":rank_doc[\"icsd_experimental\"],\n", + " \"icsd_ids\":rank_doc[\"host_icsd_ids\"],\n", + " \"formula\":rank_doc[\"framework_formula\"],\n", + " \"formula_anonymous\":rank_doc[\"formula_anonymous\"],\n", + " \"nelements\":rank_doc[\"nelements\"],\n", + " \"chemsys\":rank_doc[\"chemsys\"],\n", + " \"composition\":rank_doc[\"framework\"],\n", + " \"structure\":rank_doc[\"host_structure\"],\n", " # electrode properties\n", - " \"working_ion\": rank_doc[\"working_ion\"],\n", - " \"electrode_object\": rank_doc[\"electrode_object\"],\n", - " \"battery_formula\": rank_doc[\"battery_formula\"],\n", - " \"average_voltage\": rank_doc[\"average_voltage\"],\n", - " \"capacity_grav\": rank_doc[\"capacity_grav\"],\n", - " \"stability_charge\": rank_doc[\"stability_charge\"],\n", - " \"stability_discharge\": rank_doc[\"stability_discharge\"],\n", - " \"max_delta_volume\": 100 * rank_doc[\"max_delta_volume\"], # convert to percentage\n", + " \"working_ion\":rank_doc[\"working_ion\"],\n", + " \"electrode_object\":rank_doc[\"electrode_object\"],\n", + " \"battery_formula\":rank_doc[\"battery_formula\"],\n", + " \"average_voltage\":rank_doc[\"average_voltage\"],\n", + " \"capacity_grav\":rank_doc[\"capacity_grav\"],\n", + " \"stability_charge\":rank_doc[\"stability_charge\"],\n", + " \"stability_discharge\":rank_doc[\"stability_discharge\"],\n", + " \"max_delta_volume\":100*rank_doc[\"max_delta_volume\"], #convert to percentage\n", " # migration graph properties\n", - " \"migration_graph_found\": True if rank_doc[\"migration_graph\"] else False,\n", - " \"migration_graph\": {\n", - " \"battery_id\": bid,\n", - " \"migration_graph\": rank_doc[\"migration_graph\"],\n", - " \"hop_cutoff\": rank_doc[\"hop_cutoff\"],\n", - " \"entries_for_generation\": rank_doc[\"entries_for_generation\"],\n", - " \"working_ion_entry\": rank_doc[\"working_ion_entry\"],\n", - " },\n", - " \"num_paths_found\": rank_doc[\"num_paths_found\"],\n", + " \"migration_graph_found\":True if rank_doc[\"migration_graph\"] else False,\n", + " \"migration_graph\":{\"battery_id\":bid,\n", + " \"migration_graph\":rank_doc[\"migration_graph\"],\n", + " \"hop_cutoff\":rank_doc[\"hop_cutoff\"],\n", + " \"entries_for_generation\":rank_doc[\"entries_for_generation\"],\n", + " \"working_ion_entry\":rank_doc[\"working_ion_entry\"],\n", + " },\n", + " \"num_paths_found\":rank_doc[\"num_paths_found\"],\n", " }\n", - "\n", + " \n", " if aneb_doc is not None:\n", " # get aneb data for each hop\n", " aneb_wf_uuid = aneb_doc[\"wf_uuid\"]\n", " aneb_wf_data = {}\n", - " for aneb_hop_key, hop_key in aneb_doc[\"hop_combo_mapping\"].items():\n", + " for aneb_hop_key,hop_key in aneb_doc[\"hop_combo_mapping\"].items():\n", " combo = aneb_hop_key.split(\"+\")\n", " if len(combo) == 2:\n", " c = [int(combo[0]), int(combo[1])]\n", " data = [aneb_doc[\"end_points\"][c[0]]]\n", " if \"images\" not in aneb_doc.keys():\n", - " data.extend([{\"index\": i} for i in range(5)])\n", + " data.extend([{\"index\":i} for i in range(5)])\n", " else:\n", " if aneb_hop_key in aneb_doc[\"images\"]:\n", " data.extend(aneb_doc[\"images\"][aneb_hop_key])\n", " else:\n", - " data.extend([{\"index\": i} for i in range(5)])\n", + " data.extend([{\"index\":i} for i in range(5)])\n", " data.append(aneb_doc[\"end_points\"][c[1]])\n", - " aneb_wf_data.update({hop_key: data})\n", + " aneb_wf_data.update({hop_key:data})\n", " aneb_host = aneb_doc[\"host\"]\n", - "\n", + " \n", " # determine fraction of aneb data available\n", " total = 0\n", " complete = 0\n", - " for k, v in aneb_wf_data.items():\n", + " for k,v in aneb_wf_data.items():\n", " total += len(v)\n", " complete += len([i for i in v if \"output\" in i.keys()])\n", " aneb_wf_complete = complete / total\n", - "\n", + " \n", " else:\n", " aneb_wf_uuid = None\n", " aneb_host = None\n", " aneb_wf_data = None\n", " aneb_wf_complete = None\n", - "\n", + " \n", " # add aneb wf properties and data\n", - " contrib_doc.update(\n", - " {\n", - " \"aneb_wf_uuid\": aneb_wf_uuid,\n", - " \"aneb_wf_data\": {\n", - " \"conversion_matrix\": rank_doc[\"conversion_matrix\"],\n", - " \"matrix_supercell_structure\": rank_doc[\"matrix_supercell_structure\"],\n", - " \"inserted_ion_coords\": rank_doc[\"inserted_ion_coords\"],\n", - " \"insert_coords_combo\": rank_doc[\"insert_coords_combo\"],\n", - " \"host_data\": aneb_host,\n", - " \"hop_data\": aneb_wf_data,\n", - " },\n", - " \"aneb_wf_complete\": aneb_wf_complete,\n", - " }\n", - " )\n", - "\n", + " contrib_doc.update({\n", + " \"aneb_wf_uuid\":aneb_wf_uuid,\n", + " \"aneb_wf_data\":{\"conversion_matrix\":rank_doc[\"conversion_matrix\"],\n", + " \"matrix_supercell_structure\":rank_doc[\"matrix_supercell_structure\"],\n", + " \"inserted_ion_coords\":rank_doc[\"inserted_ion_coords\"],\n", + " \"insert_coords_combo\":rank_doc[\"insert_coords_combo\"],\n", + " \"host_data\":aneb_host,\n", + " \"hop_data\":aneb_wf_data,\n", + " },\n", + " \"aneb_wf_complete\":aneb_wf_complete\n", + " })\n", + " \n", " # clean-up formatting for MP Contribs\n", - " for k, v in contrib_doc.items():\n", + " for k,v in contrib_doc.items():\n", " if type(v) is bool:\n", " if v is True:\n", " contrib_doc[k] = \"yes\"\n", @@ -340,9 +326,9 @@ " contrib_doc[k] = str(v[0])\n", " elif len(v) > 1:\n", " contrib_doc[k] = \",\".join(str(i) for i in v)\n", - "\n", + " \n", " contrib_docs.append(contrib_doc)\n", - "print(len(contrib_docs), \"original\")" + "print(len(contrib_docs),\"original\")" ] }, { @@ -373,7 +359,7 @@ " else:\n", " docs.append(d)\n", "contrib_docs = docs\n", - "print(len(contrib_docs), \"split\")" + "print(len(contrib_docs),\"split\")" ] }, { @@ -398,21 +384,15 @@ "for doc in contrib_docs:\n", " identifier = doc[\"host_mp_ids\"][0] if doc[\"host_mp_ids\"] else doc[\"battery_id\"]\n", " formula = doc[\"formula\"]\n", - " contrib = {\n", - " \"identifier\": identifier,\n", - " \"formula\": formula,\n", - " \"data\": {},\n", - " \"structures\": [],\n", - " \"attachments\": [],\n", - " }\n", - "\n", + " contrib = {\"identifier\": identifier, \"formula\": formula, \"data\": {}, \"structures\": [], \"attachments\": []}\n", + " \n", " for k in structure_keys:\n", " sdct = doc.pop(k, None)\n", " if sdct:\n", " structure = Structure.from_dict(sdct)\n", " structure.name = k\n", " contrib[\"structures\"].append(structure)\n", - "\n", + " \n", " for k in attachment_keys:\n", " # skip attachments if not available\n", " if k == \"migration_graph\" and doc[\"migration_graph_found\"] == \"no\":\n", @@ -424,20 +404,18 @@ " if attm_dct:\n", " attm = Attachment.from_data(k, attm_dct)\n", " contrib[\"attachments\"].append(attm)\n", - "\n", - " clean = {\n", - " k: v for k, v in doc.items() if k[0] != \"_\" and not isinstance(v, datetime)\n", - " }\n", + " \n", + " clean = {k: v for k, v in doc.items() if k[0] != \"_\" and not isinstance(v, datetime)}\n", " raw = Attachment.from_data(\"raw\", clean)\n", " contrib[\"attachments\"].append(raw)\n", - "\n", + " \n", " flat_doc = flatten(clean, max_flatten_depth=2, reducer=\"dot\")\n", " for col, config in columns.items():\n", " value = flat_doc.get(col)\n", " if value:\n", " name, unit = config[\"name\"], config[\"unit\"]\n", " contrib[\"data\"][name] = f\"{value:.3g} {unit}\" if unit else value\n", - "\n", + " \n", " contrib[\"data\"] = unflatten(contrib[\"data\"], splitter=\"dot\")\n", " contributions.append({k: v for k, v in contrib.items() if v})\n", "\n", @@ -510,11 +488,11 @@ "metadata": {}, "outputs": [], "source": [ - "query = {\"identifier\": \"mp-10093\"}\n", - "fields = [\"identifier\", \"ICSD.ids\", \"attachments\"]\n", - "contribs = client.query_contributions(\n", - " query=query, fields=fields, sort=\"identifier\", paginate=True\n", - ")\n", + "query = {\n", + " \"identifier\": \"mp-10093\"\n", + "}\n", + "fields = [\"identifier\",\"ICSD.ids\",\"attachments\"]\n", + "contribs = client.query_contributions(query=query, fields=fields, sort=\"identifier\", paginate=True)\n", "pd.json_normalize(contribs[\"data\"])" ] }, @@ -563,10 +541,10 @@ "source": [ "# use migration graph to identify possible pathways\n", "mg.assign_cost_to_graph()\n", - "for n, path in mg.get_path():\n", - " print(\"path\", n)\n", + "for n,path in mg.get_path():\n", + " print(\"path\",n)\n", " for hop in path:\n", - " print(hop[\"ipos\"], hop[\"epos\"], hop[\"to_jimage\"])\n", + " print(hop[\"ipos\"],hop[\"epos\"],hop[\"to_jimage\"])\n", " print()" ] }, @@ -578,18 +556,14 @@ "outputs": [], "source": [ "# map ApproxNEB data onto migration graph\n", - "for k, v in aneb_data[\"hop_data\"].items():\n", + "for k,v in aneb_data[\"hop_data\"].items():\n", " sc_structs = [Structure.from_dict(i[\"input_structure\"]) for i in v]\n", " energies = [get(i, \"output.energy\") for i in v]\n", " add_edge_data_from_sc(\n", - " mg,\n", - " i_sc=sc_structs[0],\n", - " e_sc=sc_structs[-1],\n", - " data_array=sc_structs,\n", - " key=\"sc_structs\",\n", + " mg,i_sc=sc_structs[0],e_sc=sc_structs[-1],data_array=sc_structs,key=\"sc_structs\"\n", " )\n", " add_edge_data_from_sc(\n", - " mg, i_sc=sc_structs[0], e_sc=sc_structs[-1], data_array=energies, key=\"energies\"\n", + " mg,i_sc=sc_structs[0],e_sc=sc_structs[-1],data_array=energies,key=\"energies\"\n", " )" ] }, @@ -601,10 +575,10 @@ "outputs": [], "source": [ "# evaluate pathway energetics using ApproxNEB data\n", - "for n, path in mg.get_path():\n", - " # for hop in path:\n", - " # print(hop[\"ipos\"],hop[\"epos\"],hop[\"to_jimage\"])\n", - " energies = np.array([hop[\"energies\"] for hop in path], dtype=float)\n", + "for n,path in mg.get_path():\n", + " #for hop in path:\n", + " #print(hop[\"ipos\"],hop[\"epos\"],hop[\"to_jimage\"])\n", + " energies = np.array([hop[\"energies\"] for hop in path],dtype=float)\n", " path_barrier = 1000 * (energies.max() - energies.min())\n", " print(\"path\", n, \"ApproxNEB barrier\", round(path_barrier), \"meV\")" ] diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/mofexplorer.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/mofexplorer.ipynb index 2ef808fd49..a9dc872a85 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/mofexplorer.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/mofexplorer.ipynb @@ -76,7 +76,7 @@ " raw = vs[-1].replace(\"^3\", \"³\")\n", " if raw in ureg:\n", " value, unit = vs[0], raw\n", - " except Exception:\n", + " except Exception as e:\n", " value, unit = v, None\n", " else:\n", " value, unit = vs[0], None\n", @@ -87,7 +87,7 @@ "\n", " if value is None:\n", " raise ValueError(f\"failed parsing {v}\")\n", - "\n", + " \n", " return value, unit" ] }, @@ -108,7 +108,7 @@ "metadata": {}, "outputs": [], "source": [ - "client.init_columns({}) # force reset columns\n", + "client.init_columns({}) # force reset columns\n", "client.init_columns(columns)" ] }, @@ -130,12 +130,14 @@ "contributions = []\n", "\n", "for d in data:\n", - " contrib = {\"identifier\": d[\"identifier\"], \"formula\": d[\"formula\"], \"data\": {}}\n", - "\n", + " contrib = {\n", + " \"identifier\": d[\"identifier\"], \"formula\": d[\"formula\"], \"data\": {}\n", + " }\n", + " \n", " for k, v in flatten(d[\"data\"], reducer=\"dot\").items():\n", " value, unit = get_value_unit(v)\n", " contrib[f\"data.{k}\"] = f\"{value} {unit}\" if unit else value\n", - "\n", + " \n", " contributions.append(unflatten(contrib, splitter=\"dot\"))" ] }, diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ocp/ocp-update.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ocp/ocp-update.ipynb index 866af3cc99..a7bc713994 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ocp/ocp-update.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ocp/ocp-update.ipynb @@ -28,9 +28,7 @@ "metadata": {}, "outputs": [], "source": [ - "df = read_pickle(\n", - " \"/Users/patrick/GoogleDriveLBNL/MaterialsProject/gitrepos/mpcontribs-data/Actual_adsorption_Es.pkl\"\n", - ")" + "df = read_pickle(\"/Users/patrick/GoogleDriveLBNL/MaterialsProject/gitrepos/mpcontribs-data/Actual_adsorption_Es.pkl\")" ] }, { @@ -75,7 +73,7 @@ "results = client.query_contributions(\n", " query=query,\n", " fields=[\"id\", \"identifier\", \"data.adsorptionEnergy.display\"],\n", - " paginate=True,\n", + " paginate=True\n", ")\n", "# TODO 3rd and 4th round of requests takes 30 min (totals & actual query)" ] @@ -100,10 +98,7 @@ "contributions = []\n", "\n", "for d in results[\"data\"]:\n", - " contrib = {\n", - " \"id\": d[\"id\"],\n", - " \"data.systemEnergy\": d[\"data\"][\"adsorptionEnergy\"][\"display\"],\n", - " }\n", + " contrib = {\"id\": d[\"id\"], \"data.systemEnergy\": d[\"data\"][\"adsorptionEnergy\"][\"display\"]}\n", " contrib[\"data.adsorptionEnergy\"] = adsorption[d[\"identifier\"]]\n", " contributions.append(contrib)" ] @@ -144,7 +139,7 @@ "\n", "# if path == \"adsorptionEnergy\":\n", "# new_columns[\"systemEnergy\"] = unit\n", - "\n", + " \n", "# new_columns" ] }, diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ocp/ocp-upload.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ocp/ocp-upload.ipynb index 712452dfbf..7f82031902 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ocp/ocp-upload.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ocp/ocp-upload.ipynb @@ -12,6 +12,7 @@ "from ujson import load\n", "from pymatgen.core.structure import Molecule, Structure\n", "from pathlib import Path\n", + "from time import time\n", "from mpcontribs.client import Client\n", "from tqdm.auto import tqdm" ] @@ -47,27 +48,24 @@ "source": [ "decoder = MontyDecoder()\n", "\n", - "\n", "def get_contribution(path):\n", - "\n", + " \n", " if path.stat().st_size / 1024 / 1024 > 15:\n", " return None\n", - "\n", + " \n", " with gzip.open(path) as f:\n", " data = decoder.process_decoded(load(f))\n", + " \n", + " struct = data['trajectory'][-1]\n", + " struct.add_site_property('tags', [int(t) for t in data['tags']])\n", "\n", - " struct = data[\"trajectory\"][-1]\n", - " struct.add_site_property(\"tags\", [int(t) for t in data[\"tags\"]])\n", - "\n", - " mol = Molecule.from_sites([site for site in struct if site.properties[\"tags\"] == 2])\n", + " mol = Molecule.from_sites([site for site in struct if site.properties['tags'] == 2])\n", " iupac_formula = mol.composition.iupac_formula\n", - " bulk_struct = Structure.from_sites(\n", - " [site for site in struct if site.properties[\"tags\"] != 2]\n", - " )\n", + " bulk_struct = Structure.from_sites([site for site in struct if site.properties['tags'] != 2])\n", " bulk_formula = bulk_struct.composition.reduced_formula\n", "\n", " search_data = {\n", - " \"mpid\": data[\"bulk_id\"],\n", + " \"mpid\": data['bulk_id'],\n", " \"adsorptionEnergy\": data[\"adsorption_energy\"],\n", " # TODO systemEnergy?\n", " \"adsorbateSmiles\": data[\"adsorbate_smiles\"],\n", @@ -77,7 +75,7 @@ " \"k\": data[\"surface_miller_indices\"][1],\n", " \"l\": data[\"surface_miller_indices\"][2],\n", " \"surfaceTop\": data[\"surface_top\"],\n", - " \"surfaceShift\": data[\"surface_shift\"],\n", + " \"surfaceShift\": data[\"surface_shift\"]\n", " }\n", "\n", " return {\n", @@ -85,7 +83,7 @@ " \"identifier\": data[\"id\"],\n", " \"data\": search_data,\n", " \"structures\": [struct],\n", - " \"attachments\": [path],\n", + " \"attachments\": [path]\n", " }" ] }, @@ -142,14 +140,14 @@ " contrib = get_contribution(path)\n", " if not contrib:\n", " continue\n", - "\n", + " \n", " contributions.append(contrib)\n", " cnt += 1\n", - "\n", + " \n", " if not cnt % 2000:\n", " client.submit_contributions(contributions, **kwargs)\n", " contributions.clear()\n", - "\n", + " \n", "if contributions:\n", " client.submit_contributions(contributions, **kwargs)\n", "\n", diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/open_catalyst_project.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/open_catalyst_project.ipynb index a25ff13d05..25f34580fc 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/open_catalyst_project.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/open_catalyst_project.ipynb @@ -9,8 +9,10 @@ "source": [ "from mpcontribs.client import Client\n", "from monty.serialization import loadfn\n", + "from json import loads\n", "from pymatgen.core.structure import Molecule, Structure\n", - "from pathlib import Path" + "from pathlib import Path\n", + "from time import time" ] }, { @@ -54,20 +56,17 @@ "metadata": {}, "outputs": [], "source": [ - "client.init_columns(\n", - " name,\n", - " {\n", - " \"id\": None, # id\n", - " \"energy\": \"meV\", # adsorption_energy\n", - " \"smiles\": None, # adsorbate_smiles\n", - " \"formulas.IUPAC\": None,\n", - " \"formulas.bulk\": None,\n", - " \"formulas.trajectory\": None,\n", - " \"surface.miller\": None,\n", - " \"surface.top\": None,\n", - " \"surface.shift\": \"\",\n", - " },\n", - ")" + "client.init_columns(name, {\n", + " \"id\": None, # id\n", + " \"energy\": \"meV\", # adsorption_energy\n", + " \"smiles\": None, # adsorbate_smiles\n", + " \"formulas.IUPAC\": None,\n", + " \"formulas.bulk\": None,\n", + " \"formulas.trajectory\": None,\n", + " \"surface.miller\": None,\n", + " \"surface.top\": None,\n", + " \"surface.shift\": \"\"\n", + "})" ] }, { @@ -77,9 +76,7 @@ "metadata": {}, "outputs": [], "source": [ - "p = Path(\n", - " \"/Users/patrick/GoogleDriveLBNL/MaterialsProject/gitrepos/mpcontribs-data/ocp-sample\"\n", - ")\n", + "p = Path(\"/Users/patrick/GoogleDriveLBNL/MaterialsProject/gitrepos/mpcontribs-data/ocp-sample\")\n", "jsons = list(p.glob(\"*.json.gz\"))" ] }, @@ -93,33 +90,29 @@ "def get_miller(indices):\n", " return f\"[{indices[0]}{indices[1]}{indices[2]}]\"\n", "\n", - "\n", "def get_contribution(path):\n", - "\n", + " \n", " if path.stat().st_size / 1024 < 150:\n", + " \n", " data = loadfn(path)\n", - " struct = data[\"trajectory\"][-1]\n", - " struct.add_site_property(\"tags\", [int(t) for t in data[\"tags\"]])\n", + " struct = data['trajectory'][-1]\n", + " struct.add_site_property('tags', [int(t) for t in data['tags']])\n", "\n", - " mol = Molecule.from_sites(\n", - " [site for site in struct if site.properties[\"tags\"] == 2]\n", - " )\n", + " mol = Molecule.from_sites([site for site in struct if site.properties['tags'] == 2])\n", " iupac_formula = mol.composition.iupac_formula\n", - " bulk_struct = Structure.from_sites(\n", - " [site for site in struct if site.properties[\"tags\"] != 2]\n", - " )\n", + " bulk_struct = Structure.from_sites([site for site in struct if site.properties['tags'] != 2])\n", " bulk_formula = bulk_struct.composition.reduced_formula\n", "\n", " search_data = {\n", - " \"id\": data[\"id\"],\n", - " \"energy\": f\"{data['adsorption_energy']} meV\",\n", + " \"id\": data['id'],\n", + " \"energy\": f'{data[\"adsorption_energy\"]} meV',\n", " \"smiles\": data[\"adsorbate_smiles\"],\n", " \"formulas.IUPAC\": iupac_formula,\n", " \"formulas.bulk\": bulk_formula,\n", " \"formulas.trajectory\": struct.composition.reduced_formula,\n", " \"surface.miller\": get_miller(data[\"surface_miller_indices\"]),\n", " \"surface.top\": str(data[\"surface_top\"]),\n", - " \"surface.shift\": data[\"surface_shift\"],\n", + " \"surface.shift\": data[\"surface_shift\"]\n", " }\n", "\n", " contribution = {\n", @@ -127,7 +120,7 @@ " \"identifier\": data[\"bulk_id\"],\n", " \"data\": search_data,\n", " \"structures\": [struct],\n", - " \"attachments\": [path],\n", + " \"attachments\": [path]\n", " }\n", "\n", " return contribution" @@ -164,7 +157,7 @@ "all_ids = client.get_all_ids(\n", " {\"project\": name},\n", " include=[\"structures\", \"attachments\"],\n", - " data_id_fields={name: \"id\"},\n", + " data_id_fields={name: \"id\"}\n", ").get(name)" ] }, diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/perovskites_diffusion.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/perovskites_diffusion.ipynb index a702178910..026d09bec2 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/perovskites_diffusion.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/perovskites_diffusion.ipynb @@ -53,7 +53,7 @@ "metadata": {}, "outputs": [], "source": [ - "import tarfile\n", + "import tarfile, os\n", "from pandas import read_excel\n", "\n", "units = {\n", @@ -97,7 +97,7 @@ " key = keys[col]\n", " if isinstance(key, str):\n", " key = key.strip()\n", - " if key not in abbreviations:\n", + " if not key in abbreviations:\n", " abbreviations[key] = col\n", " else:\n", " key = col.strip().lower()\n", @@ -110,7 +110,7 @@ " contcar_path = \"bulk_CONTCARs/{}_CONTCAR\".format(\n", " data[\"directory\"].replace(\"/\", \"_\")\n", " )\n", - " contcar = contcars.extractfile(contcar_path).read().decode(\"utf8\")\n", + " contcar = contcars.extractfile(contcar_path).read().decode(\"utf8\") \n", " structure = Structure.from_str(contcar, \"poscar\", sort=True)\n", "\n", " if identifier is None:\n", @@ -129,16 +129,11 @@ " data[key] = val\n", "\n", " if identifier:\n", - " contributions.append(\n", - " {\n", - " \"project\": name,\n", - " \"identifier\": identifier,\n", - " \"is_public\": True,\n", - " \"data\": data,\n", - " \"structures\": [structure],\n", - " }\n", - " )\n", - "\n", + " contributions.append({\n", + " \"project\": name, \"identifier\": identifier, \"is_public\": True,\n", + " \"data\": data, \"structures\": [structure]\n", + " })\n", + " \n", "len(contributions)" ] }, diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/pycroscopy.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/pycroscopy.ipynb index 5e42a07812..99f10a538d 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/pycroscopy.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/pycroscopy.ipynb @@ -13,7 +13,6 @@ "import matplotlib.pyplot as plt\n", "import torch\n", "from atomai.utils import graphx\n", - "\n", "%matplotlib inline" ] }, @@ -30,7 +29,7 @@ "model_path = f\"{data_dir}/G_MD.tar\"\n", "model = aoi.load_model(model_path)\n", "# model as dict\n", - "device = \"cuda\" if torch.cuda.is_available() else \"cpu\"\n", + "device = 'cuda' if torch.cuda.is_available() else 'cpu'\n", "model_dict = torch.load(model_path, map_location=device)" ] }, @@ -60,22 +59,20 @@ "# model.predict(imgdata, resize=(new_height, new_width))\n", "\n", "map_dict = {0: \"C\", 1: \"Si\"} # classes to chemical elements\n", - "px2ang = 0.104 # pixel-to-angstrom conversion\n", - "coord = coords[0] # take the first (and the only one) frame\n", - "clusters = graphx.find_cycle_clusters(\n", - " coord, cycles=[5, 7], map_dict=map_dict, px2ang=px2ang\n", - ")\n", + "px2ang = 0.104 # pixel-to-angstrom conversion\n", + "coord = coords[0] # take the first (and the only one) frame\n", + "clusters = graphx.find_cycle_clusters(coord, cycles=[5,7], map_dict=map_dict, px2ang=px2ang)\n", "fig, ax = plt.subplots(1, 1, figsize=figsize)\n", - "ax.imshow(imgdata, cmap=\"gray\", origin=\"lower\")\n", + "ax.imshow(imgdata, cmap='gray', origin='lower')\n", "\n", "for i, cl in enumerate(clusters):\n", - " ax.scatter(cl[:, 1], cl[:, 0], s=2, color=\"red\")\n", + " ax.scatter(cl[:, 1], cl[:, 0], s=2, color='red')\n", " xt = int(np.mean(cl[:, 1]))\n", " yt = int(np.mean(cl[:, 0]))\n", - " ax.annotate(str(i + 1), (xt, yt), size=10, color=\"white\")\n", - "\n", + " ax.annotate(str(i+1), (xt, yt), size=10, color='white')\n", + " \n", "img_path_clusters = imgdata_path.replace(\".npy\", \"_clusters.png\")\n", - "plt.savefig(img_path_clusters, bbox_inches=\"tight\")" + "plt.savefig(img_path_clusters, bbox_inches='tight')" ] }, { @@ -86,20 +83,20 @@ "outputs": [], "source": [ "clusters_mod = []\n", - "# adding a column for C atom as class 0\n", + "#adding a column for C atom as class 0\n", "pad_ = 1\n", "for i in range(len(clusters)):\n", - " clusters[i] = np.pad(clusters[i], (0, pad_), \"constant\")\n", + " clusters[i] = np.pad(clusters[i], (0, pad_), 'constant')\n", " clusters[i] = clusters[i][:-1]\n", " clusters_mod.append(clusters[i])\n", - "\n", - "# we can also save all the defects per image frame\n", + " \n", + "#we can also save all the defects per image frame\n", "defect_num = 15\n", "coords_def_15 = {0: clusters_mod[defect_num]}\n", - "plt.scatter(coords_def_15[0][:, 1], coords_def_15[0][:, 0])\n", + "plt.scatter(coords_def_15[0][:,1], coords_def_15[0][:,0])\n", "\n", "img_path_defects = imgdata_path.replace(\".npy\", \"_defects.png\")\n", - "plt.savefig(img_path_defects, bbox_inches=\"tight\")" + "plt.savefig(img_path_defects, bbox_inches='tight')" ] }, { @@ -137,7 +134,10 @@ "outputs": [], "source": [ "imgdata_list = list(imgdata.tolist())\n", - "model_dict[\"weights\"] = {k: v.tolist() for k, v in model_dict[\"weights\"].items()}" + "model_dict[\"weights\"] = {\n", + " k: v.tolist()\n", + " for k, v in model_dict[\"weights\"].items()\n", + "}" ] }, { @@ -147,18 +147,13 @@ "metadata": {}, "outputs": [], "source": [ - "contributions = [\n", - " {\n", - " \"identifier\": \"mp-7576\", # CrSi on MP\n", - " \"data\": {\"clusters\": len(clusters)},\n", - " \"attachments\": Attachments.from_list(\n", - " [\n", - " img_path_clusters,\n", - " img_path_defects, # imgdata_list, model_dict,\n", - " ]\n", - " ),\n", - " }\n", - "]" + "contributions = [{\n", + " \"identifier\": \"mp-7576\", # CrSi on MP\n", + " \"data\": {\"clusters\": len(clusters)},\n", + " \"attachments\": Attachments.from_list([\n", + " img_path_clusters, img_path_defects, #imgdata_list, model_dict,\n", + " ])\n", + "}]" ] }, { diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/pydatarecognition.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/pydatarecognition.ipynb index cc12f86a43..4f1d69e8b4 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/pydatarecognition.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/pydatarecognition.ipynb @@ -8,9 +8,11 @@ "outputs": [], "source": [ "%env MPRESTER_MUTE_PROGRESS_BARS 1\n", + "import os\n", "from pathlib import Path\n", "from mpcontribs.client import Client\n", - "from flatten_dict import unflatten\n", + "from mp_api.client import MPRester\n", + "from flatten_dict import unflatten, flatten\n", "from pymatgen.io.cif import CifParser\n", "from pandas import DataFrame\n", "import numpy as np" @@ -63,42 +65,23 @@ "source": [ "# calculated cifs (NOTE make sure to gzip all CIFs)\n", "contributions = []\n", - "columns = {\"type\": None, \"date\": None, \"wavelength\": \"Å\"} # sets fields and their units\n", + "columns = {\"type\": None, \"date\": None, \"wavelength\": \"Å\"} # sets fields and their units\n", "\n", "for path in (cifs / \"calculated\").iterdir():\n", " for identifier, v in CifParser(path).as_dict().items():\n", " typ, date = v[\"_publcif_pd_cifplot\"].strip().split()\n", - " wavelength = f\"{v['_diffrn_radiation_wavelength']} Å\"\n", + " wavelength = f'{v[\"_diffrn_radiation_wavelength\"]} Å'\n", " intensities = v[\"_pd_calc_intensity_total\"]\n", " prefix, nbins = \"_pd_proc_2theta_range\", len(intensities)\n", - " inc, start, end = (\n", - " float(v[f\"{prefix}_inc\"]),\n", - " float(v[f\"{prefix}_min\"]),\n", - " float(v[f\"{prefix}_max\"]),\n", - " )\n", - " two_theta = np.arange(\n", - " 0, end, inc\n", - " ) # BUG? getting 1999 bins for start=0.02 (converted to Q)\n", - " spectrum = DataFrame({\"2θ\": two_theta, \"intensity\": intensities}).set_index(\n", - " \"2θ\"\n", - " )\n", - " spectrum.attrs = {\n", - " \"name\": \"powder diffraction\",\n", - " \"title\": \"Powder Diffraction Pattern\",\n", - " }\n", - " contributions.append(\n", - " {\n", - " \"identifier\": identifier,\n", - " \"formula\": v[\"_chemical_formula\"],\n", - " \"data\": {\n", - " \"type\": typ,\n", - " \"date\": date,\n", - " \"wavelength\": wavelength,\n", - " \"proc\": d[\"proc\"],\n", - " },\n", - " # \"tables\": [spectrum], \"attachments\": [path]\n", - " }\n", - " )\n", + " inc, start, end = float(v[f\"{prefix}_inc\"]), float(v[f\"{prefix}_min\"]), float(v[f\"{prefix}_max\"])\n", + " two_theta = np.arange(0, end, inc) # BUG? getting 1999 bins for start=0.02 (converted to Q)\n", + " spectrum = DataFrame({\"2θ\": two_theta, \"intensity\": intensities}).set_index(\"2θ\")\n", + " spectrum.attrs = {\"name\": \"powder diffraction\", \"title\": \"Powder Diffraction Pattern\"}\n", + " contributions.append({\n", + " \"identifier\": identifier, \"formula\": v[\"_chemical_formula\"],\n", + " \"data\": {\"type\": typ, \"date\": date, \"wavelength\": wavelength, \"proc\": d[\"proc\"]},\n", + " #\"tables\": [spectrum], \"attachments\": [path]\n", + " })\n", "\n", "len(contributions)" ] @@ -122,7 +105,7 @@ "client.init_columns(columns)\n", "client.submit_contributions(contributions, ignore_dupes=True, per_request=6)\n", "# this shouldn't be necessary but need to re-init columns likely due to bug in API server\n", - "client.init_columns(columns)\n", + "client.init_columns(columns) \n", "\n", "# NOTE submit_contributions can also be used to submit partial updates (can provide example in the future)" ] @@ -166,9 +149,7 @@ "metadata": {}, "outputs": [], "source": [ - "attm = client.get_attachment(\n", - " result[\"data\"][0][\"attachments\"][0][\"id\"]\n", - ") # use attm.unpack() to get file contents" + "attm = client.get_attachment(result[\"data\"][0][\"attachments\"][0][\"id\"]) # use attm.unpack() to get file contents" ] }, { @@ -178,7 +159,7 @@ "metadata": {}, "outputs": [], "source": [ - "table = client.get_table(result[\"data\"][0][\"tables\"][0][\"id\"]) # pandas Dataframe" + "table = client.get_table(result[\"data\"][0][\"tables\"][0][\"id\"]) # pandas Dataframe" ] }, { diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/qsgw_band_structures.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/qsgw_band_structures.ipynb index d52783dd71..33623c3aa5 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/qsgw_band_structures.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/qsgw_band_structures.ipynb @@ -11,7 +11,6 @@ "# - set environment variable MPCONTRIBS_API_KEY to API key\n", "# - more info about client functions in according docstrings\n", "from mpcontribs.client import Client\n", - "\n", "name = \"qsgw_band_structures\"\n", "client = Client(project=name)" ] @@ -40,68 +39,87 @@ "source": [ "contributions = [\n", " {\n", - " \"identifier\": \"mp-1020712\", # ZnSiN2\n", - " \"data\": {\n", - " \"reference\": \"https://doi.org/10.1103/PhysRevB.84.165204\",\n", - " \"Γ\": {\n", - " \"ΔE\": {\"indirect\": \"5.70 eV\", \"direct\": \"5.92 eV\"},\n", - " \"VBM\": {\"b₁\": \"0\", \"a₂\": \"-20 meV\", \"b₂\": \"-40 meV\", \"a₁\": \"-180 meV\"},\n", - " },\n", - " },\n", - " },\n", - " {\n", - " \"identifier\": \"mp-2979\", # ZnGeN2\n", - " \"data\": {\n", - " \"reference\": \"https://doi.org/10.1103/PhysRevB.84.165204\",\n", - " \"Γ\": {\n", - " \"ΔE\": {\"direct\": \"3.60 eV\"},\n", - " \"VBM\": {\"b₁\": \"0\", \"b₂\": \"-28 meV\", \"a₁\": \"-129 meV\"},\n", - " },\n", - " },\n", - " },\n", - " {\n", - " \"identifier\": \"mp-1029469\", # ZnSnN2\n", - " \"data\": {\n", - " \"reference\": \"https://doi.org/10.1103/PhysRevB.91.205207\",\n", - " \"Γ\": {\n", - " \"ΔE\": {\"direct\": \"1.82 eV\"},\n", - " \"VBM\": {\"b₁\": \"0\", \"b₂\": \"-188 meV\", \"a₁\": \"-176 meV\"},\n", - " },\n", - " },\n", - " },\n", - " {\n", - " \"identifier\": \"mp-3677\", # MgSiN2\n", - " \"data\": {\n", - " \"reference\": \"https://doi.org/10.1103/PhysRevB.94.125201\",\n", - " \"Γ\": {\n", - " \"ΔE\": {\n", - " \"indirect\": \"6.08 eV\",\n", - " \"direct\": \"6.53 eV\",\n", - " \"direct3x4x4\": \"6.30 eV\",\n", + " 'identifier': 'mp-1020712', # ZnSiN2\n", + " 'data': {\n", + " 'reference': 'https://doi.org/10.1103/PhysRevB.84.165204',\n", + " 'Γ': {\n", + " 'ΔE': {\n", + " 'indirect': '5.70 eV',\n", + " 'direct': '5.92 eV'\n", + " },\n", + " 'VBM': {\n", + " 'b₁': '0',\n", + " 'a₂': '-20 meV',\n", + " 'b₂': '-40 meV',\n", + " 'a₁': '-180 meV'\n", " }\n", - " },\n", - " },\n", - " },\n", - " {\n", - " \"identifier\": \"mp-7798\", # MgGeN2\n", - " \"data\": {\n", - " \"reference\": \"https://doi.org/10.1016/j.ssc.2019.113664\",\n", - " \"Γ\": {\n", - " \"ΔE\": {\"direct\": \"4.11 eV\"},\n", - " \"VBM\": {\"b₁\": \"0\", \"b₂\": \"-82 meV\", \"a₁\": \"-238 meV\"},\n", - " },\n", - " },\n", - " },\n", - " {\n", - " \"identifier\": \"mp-1029791\", # MgSnN2\n", - " \"data\": {\n", - " \"reference\": \"https://doi.org/10.1016/j.ssc.2019.113664\",\n", - " \"Γ\": {\n", - " \"ΔE\": {\"direct\": \"2.28 eV\"},\n", - " \"VBM\": {\"b₁\": \"0\", \"b₂\": \"-116 meV\", \"a₁\": \"-144 meV\"},\n", - " },\n", - " },\n", - " },\n", + " }\n", + " }\n", + " }, {\n", + " 'identifier': 'mp-2979', # ZnGeN2\n", + " 'data': {\n", + " 'reference': 'https://doi.org/10.1103/PhysRevB.84.165204',\n", + " 'Γ': {\n", + " 'ΔE': {'direct': '3.60 eV'},\n", + " 'VBM': {\n", + " 'b₁': '0',\n", + " 'b₂': '-28 meV',\n", + " 'a₁': '-129 meV'\n", + " }\n", + " }\n", + " }\n", + " }, {\n", + " 'identifier': 'mp-1029469', # ZnSnN2\n", + " 'data': {\n", + " 'reference': 'https://doi.org/10.1103/PhysRevB.91.205207',\n", + " 'Γ': {\n", + " 'ΔE': {'direct': '1.82 eV'},\n", + " 'VBM': {\n", + " 'b₁': '0',\n", + " 'b₂': '-188 meV',\n", + " 'a₁': '-176 meV'\n", + " }\n", + " }\n", + " }\n", + " }, {\n", + " 'identifier': 'mp-3677', # MgSiN2\n", + " 'data': {\n", + " 'reference': 'https://doi.org/10.1103/PhysRevB.94.125201',\n", + " 'Γ': {\n", + " 'ΔE': {\n", + " 'indirect': '6.08 eV',\n", + " 'direct': '6.53 eV',\n", + " 'direct3x4x4': '6.30 eV'\n", + " }\n", + " }\n", + " }\n", + " }, {\n", + " 'identifier': 'mp-7798', # MgGeN2\n", + " 'data': {\n", + " 'reference': 'https://doi.org/10.1016/j.ssc.2019.113664',\n", + " 'Γ' : {\n", + " 'ΔE': {'direct': '4.11 eV'},\n", + " 'VBM': {\n", + " 'b₁': '0',\n", + " 'b₂': '-82 meV',\n", + " 'a₁': '-238 meV'\n", + " }\n", + " }\n", + " }\n", + " }, {\n", + " 'identifier': 'mp-1029791', # MgSnN2\n", + " 'data': {\n", + " 'reference': 'https://doi.org/10.1016/j.ssc.2019.113664',\n", + " 'Γ' : {\n", + " 'ΔE': {'direct': '2.28 eV'},\n", + " 'VBM': {\n", + " 'b₁': '0',\n", + " 'b₂': '-116 meV',\n", + " 'a₁': '-144 meV'\n", + " }\n", + " }\n", + " }\n", + " }\n", "]" ] }, @@ -129,18 +147,16 @@ "outputs": [], "source": [ "# [optional] initialize columns to explicitly set order, visibility and units\n", - "client.init_columns(\n", - " columns={\n", - " \"reference\": None,\n", - " \"Γ.ΔE.direct\": \"eV\",\n", - " \"Γ.ΔE.direct3x4x4\": \"eV\",\n", - " \"Γ.ΔE.indirect\": \"eV\",\n", - " \"Γ.VBM.a₁\": \"meV\",\n", - " \"Γ.VBM.a₂\": \"meV\",\n", - " \"Γ.VBM.b₁\": \"\",\n", - " \"Γ.VBM.b₂\": \"meV\",\n", - " }\n", - ")" + "client.init_columns(columns={\n", + " \"reference\": None,\n", + " \"Γ.ΔE.direct\": \"eV\",\n", + " \"Γ.ΔE.direct3x4x4\": \"eV\",\n", + " \"Γ.ΔE.indirect\": \"eV\",\n", + " \"Γ.VBM.a₁\": \"meV\",\n", + " \"Γ.VBM.a₂\": \"meV\",\n", + " \"Γ.VBM.b₁\": \"\",\n", + " \"Γ.VBM.b₂\": \"meV\",\n", + "})" ] } ], diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/screening_inorganic_pv.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/screening_inorganic_pv.ipynb index 07d2043bee..cb9e56014f 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/screening_inorganic_pv.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/screening_inorganic_pv.ipynb @@ -6,7 +6,7 @@ "metadata": {}, "outputs": [], "source": [ - "import json\n", + "import os, json\n", "from pathlib import Path\n", "from pandas import DataFrame\n", "from mpcontribs.client import Client\n", @@ -41,7 +41,7 @@ " \"summary\": \"SUMMARY.json\",\n", " \"absorption\": \"ABSORPTION-CLIPPED.json\",\n", " \"dos\": \"DOS.json\",\n", - " \"formulae\": \"FORMATTED-FORMULAE.json\",\n", + " \"formulae\": \"FORMATTED-FORMULAE.json\"\n", "}\n", "data = {}\n", "\n", @@ -49,7 +49,7 @@ " path = indir / v\n", " with path.open(mode=\"r\") as f:\n", " data[k] = json.load(f)\n", - "\n", + " \n", "for k, v in data.items():\n", " print(k, len(v))" ] @@ -74,7 +74,7 @@ " \"E_g_d\": {\"path\": \"ΔE.direct\", \"unit\": \"eV\"},\n", " \"E_g_da\": {\"path\": \"ΔE.dipole\", \"unit\": \"eV\"},\n", " \"m_e\": {\"path\": \"mᵉ\", \"unit\": \"mₑ\"},\n", - " \"m_h\": {\"path\": \"mʰ\", \"unit\": \"mₑ\"},\n", + " \"m_h\": {\"path\": \"mʰ\", \"unit\": \"mₑ\"}\n", "}\n", "columns = {c[\"path\"]: c[\"unit\"] for c in config.values()}\n", "contributions = []\n", @@ -82,28 +82,28 @@ "for mp_id, d in data[\"summary\"].items():\n", " formula = data[\"formulae\"][mp_id].replace(\"\", \"\").replace(\"\", \"\")\n", " contrib = {\"project\": name, \"identifier\": mp_id, \"data\": {\"formula\": formula}}\n", - " cdata = {v[\"path\"]: f\"{d[k]} {v['unit']}\" for k, v in config.items()}\n", + " cdata = {v[\"path\"]: f'{d[k]} {v[\"unit\"]}' for k, v in config.items()}\n", " contrib[\"data\"] = unflatten(cdata)\n", - "\n", + " \n", " df_abs = DataFrame(data=data[\"absorption\"][mp_id])\n", " df_abs.columns = [\"hν [eV]\", \"α [cm⁻¹]\"]\n", " df_abs.set_index(\"hν [eV]\", inplace=True)\n", - " df_abs.columns.name = \"\" # legend name\n", + " df_abs.columns.name = \"\" # legend name\n", " df_abs.attrs[\"name\"] = \"absorption\"\n", " df_abs.attrs[\"title\"] = \"optical absorption spectrum\"\n", " df_abs.attrs[\"labels\"] = {\"variable\": \"\", \"value\": \"α [cm⁻¹]\"}\n", "\n", " df_dos = DataFrame(data=data[\"dos\"][mp_id])\n", - " df_dos.columns = [\"E [eV]\", \"DOS [eV⁻¹]\"]\n", + " df_dos.columns = ['E [eV]', 'DOS [eV⁻¹]']\n", " df_dos.set_index(\"E [eV]\", inplace=True)\n", - " df_dos.columns.name = \"\" # legend name\n", + " df_dos.columns.name = \"\" # legend name\n", " df_dos.attrs[\"name\"] = \"DOS\"\n", " df_dos.attrs[\"title\"] = \"electronic density of states\"\n", " df_dos.attrs[\"labels\"] = {\"variable\": \"\", \"value\": \"DOS [eV⁻¹]\"}\n", "\n", " contrib[\"tables\"] = [df_abs, df_dos]\n", " contributions.append(contrib)\n", - "\n", + " \n", "len(contributions)" ] }, diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/silicon_defects.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/silicon_defects.ipynb index ab3ab1d059..b03018e553 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/silicon_defects.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/silicon_defects.ipynb @@ -11,7 +11,7 @@ "from mpcontribs.client import Client, Attachment\n", "from pymatgen.core import Structure\n", "from pathlib import Path\n", - "from flatten_dict import flatten" + "from flatten_dict import flatten, unflatten" ] }, { @@ -57,13 +57,13 @@ " \"mu\": {\"field\": \"mu\", \"unit\": \"\"},\n", " \"spin\": {\"field\": \"spin\", \"unit\": \"\"},\n", " \"ks_diff\": {\"field\": \"ks|diff\", \"unit\": \"\"},\n", - " \"hse0_ks_diff\": {\"field\": \"ks|diff\", \"unit\": \"\"}, # can map to same subkey\n", + " \"hse0_ks_diff\": {\"field\": \"ks|diff\", \"unit\": \"\"}, # can map to same subkey\n", " \"shuffle\": {\"field\": \"shuffle\", \"unit\": None},\n", " \"in_band_transition\": {\"field\": \"transition\", \"unit\": None},\n", " \"missing_vbm\": {\"field\": \"VBM|missing\", \"unit\": None},\n", " \"initial_band\": {\"field\": \"band.initial\", \"unit\": \"\"},\n", " \"final_band\": {\"field\": \"band.final\", \"unit\": \"\"},\n", - " \"inital_band_e\": {\"field\": \"band|e.initial\", \"unit\": \"\"}, # typo in data!\n", + " \"inital_band_e\": {\"field\": \"band|e.initial\", \"unit\": \"\"}, # typo in data!\n", " \"final_band_e\": {\"field\": \"band|e.final\", \"unit\": \"\"},\n", " \"initial_ipr\": {\"field\": \"ipr.initial\", \"unit\": \"\"},\n", " \"final_ipr\": {\"field\": \"ipr.final\", \"unit\": \"\"},\n", @@ -71,9 +71,9 @@ "}\n", "\n", "reorg = {\n", - " \"is_complex\": {\"field\": \"complex\", \"unit\": None}, # str\n", + " \"is_complex\": {\"field\": \"complex\", \"unit\": None}, # str\n", " \"dopant\": {\"field\": \"dopant\", \"unit\": None},\n", - " \"charge\": {\"field\": \"charge\", \"unit\": \"\"}, # dimensionless\n", + " \"charge\": {\"field\": \"charge\", \"unit\": \"\"}, # dimensionless\n", " \"uncorrected_energy\": {\"field\": \"energy|uncorrected\", \"unit\": \"eV\"},\n", " \"chemsys\": {\"field\": \"chemsys\", \"unit\": None},\n", " \"space_group\": {\"field\": \"spacegroup\", \"unit\": None},\n", @@ -95,14 +95,14 @@ "}\n", "\n", "for k, v in list(reorg.items()):\n", - " if \"unit\" not in v:\n", + " if not \"unit\" in v:\n", " root_field = reorg.pop(k).get(\"field\")\n", - "\n", + " \n", " for kk, vv in excitation_reorg.items():\n", " new_key = f\"{k}.{kk}\"\n", " new_field = f\"{root_field}.{vv['field']}\"\n", " reorg[new_key] = {\"field\": new_field, \"unit\": vv[\"unit\"]}\n", - "\n", + " \n", "columns = {v[\"field\"]: v[\"unit\"] for k, v in reorg.items()}\n", "client.init_columns(columns)" ] @@ -117,7 +117,7 @@ "def convert(x, unit=None):\n", " if isinstance(x, bool):\n", " return \"Yes\" if x else \"No\"\n", - "\n", + " \n", " return x if not unit else f\"{x} {unit}\"" ] }, @@ -131,13 +131,8 @@ "contributions = []\n", "structure_keys = [\"initial_defect_structure\", \"final_defect_structure\"]\n", "attm_keys = [\n", - " \"int_eigenvalues\",\n", - " \"raw_eigenvalues\",\n", - " \"ipr\",\n", - " \"defect_ipr\",\n", - " \"raw_tdm_entry\",\n", - " \"hse0_raw_eigenvalues\",\n", - " \"hse0_int_eigenvalues\",\n", + " 'int_eigenvalues', 'raw_eigenvalues', 'ipr', 'defect_ipr', 'raw_tdm_entry',\n", + " 'hse0_raw_eigenvalues', 'hse0_int_eigenvalues'\n", "]\n", "remove_keys = [\"_id\", \"defect_dir\"]\n", "id_key = \"entry_id\"\n", @@ -147,26 +142,23 @@ "\n", "for r in raw:\n", " contrib = {\n", - " \"identifier\": f\"entry-{r[id_key]}\",\n", - " \"formula\": r[formula_key],\n", - " \"data\": {},\n", - " \"structures\": [],\n", - " \"attachments\": [],\n", + " \"identifier\": f\"entry-{r[id_key]}\", \"formula\": r[formula_key],\n", + " \"data\": {}, \"structures\": [], \"attachments\": []\n", " }\n", - "\n", + " \n", " for k, v in flatten(r, reducer=\"dot\").items():\n", " if k.split(\".\", 1)[0] not in skip_keys:\n", " contrib[\"data\"][reorg[k][\"field\"]] = convert(v, unit=reorg[k][\"unit\"])\n", - "\n", + " \n", " for k in structure_keys:\n", " s = Structure.from_dict(r[k])\n", " s.name = k\n", " contrib[\"structures\"].append(s)\n", - "\n", + " \n", " for k in attm_keys:\n", " a = Attachment.from_data(k, json.loads(r[k]))\n", - " contrib[\"attachments\"].append(a)\n", - "\n", + " contrib[\"attachments\"].append(a) \n", + " \n", " contributions.append(contrib)\n", "\n", "len(contributions)" diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/simple_test.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/simple_test.ipynb index d8e5f2db93..08070737a4 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/simple_test.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/simple_test.ipynb @@ -12,7 +12,7 @@ "\n", "client = Client(\n", " host=\"localhost.workshop-contribs-api.materialsproject.org\",\n", - " apikey=\"uZ0vulA09IBtqcGk9U5OYRNt6elCzETM\",\n", + " apikey=\"uZ0vulA09IBtqcGk9U5OYRNt6elCzETM\"\n", ")" ] }, @@ -28,16 +28,13 @@ " \"formula__contains\": \"Au\",\n", " \"data__PF__p__value__lt\": 10,\n", " \"data__PF__n__value__gt\": 1,\n", - " \"_sort\": \"-data.S.n.value\", # descending order\n", - " \"_limit\": 170, # up to maximum 500 per request\n", + "\n", + " \"_sort\": \"-data.S.n.value\", # descending order\n", + " \"_limit\": 170, # up to maximum 500 per request\n", " \"_fields\": [\n", - " \"identifier\",\n", - " \"formula\",\n", - " \"data.metal\",\n", - " \"data.S.n.value\",\n", - " \"data.S.p.value\",\n", - " \"data.PF.n.value\",\n", - " \"data.PF.p.value\",\n", + " \"identifier\", \"formula\", \"data.metal\",\n", + " \"data.S.n.value\", \"data.S.p.value\",\n", + " \"data.PF.n.value\", \"data.PF.p.value\"\n", " ],\n", "}" ] @@ -54,11 +51,13 @@ "\n", "while has_more:\n", " print(\"page\", page)\n", - " resp = client.contributions.get_entries(page=page, **query).result()\n", + " resp = client.contributions.get_entries(\n", + " page=page, **query\n", + " ).result()\n", " contributions += resp[\"data\"]\n", " has_more = resp[\"has_more\"]\n", " page += 1\n", - "\n", + " \n", "len(contributions)" ] }, @@ -80,17 +79,15 @@ "outputs": [], "source": [ "name = \"ws_phuck\"\n", - "client.projects.create_entry(\n", - " project={\n", - " \"name\": name,\n", - " \"title\": \"Workshop Test\",\n", - " \"long_title\": \"Long Workshop Test Title\",\n", - " \"authors\": \"P. Huck, J. Huck\",\n", - " \"description\": \"This is temp. Can be removed anytime\",\n", - " \"references\": [{\"label\": \"google\", \"url\": \"https://google.com\"}],\n", - " \"owner\": \"google:phuck@lbl.gov\",\n", - " }\n", - ").result()" + "client.projects.create_entry(project={\n", + " \"name\": name,\n", + " \"title\": \"Workshop Test\",\n", + " \"long_title\": \"Long Workshop Test Title\",\n", + " \"authors\": \"P. Huck, J. Huck\",\n", + " \"description\": \"This is temp. Can be removed anytime\",\n", + " \"references\": [{\"label\": \"google\", \"url\": \"https://google.com\"}],\n", + " \"owner\": \"google:phuck@lbl.gov\"\n", + "}).result()" ] }, { @@ -120,10 +117,9 @@ "metadata": {}, "outputs": [], "source": [ - "client.init_columns(\n", - " name,\n", - " {\"a\": \"eV\", \"b.c\": None, \"b.d\": None, \"d.e.f\": None, \"x\": None, \"tables\": None},\n", - ")" + "client.init_columns(name, {\n", + " \"a\": \"eV\", \"b.c\": None, \"b.d\": None, \"d.e.f\": None, \"x\": None, \"tables\": None\n", + "})" ] }, { @@ -133,8 +129,8 @@ "metadata": {}, "outputs": [], "source": [ - "data = [[\"tom\", 10], [\"nick\", 15], [\"juli\", 14]]\n", - "df = DataFrame(data, columns=[\"Name\", \"Age\"])\n", + "data = [['tom', 10], ['nick', 15], ['juli', 14]]\n", + "df = DataFrame(data, columns=['Name', 'Age'])\n", "df.set_index(\"Name\", inplace=True)\n", "df" ] @@ -146,25 +142,26 @@ "metadata": {}, "outputs": [], "source": [ - "contributions = [\n", - " {\n", - " \"project\": name,\n", - " \"identifier\": \"mp-4\",\n", - " \"data\": {\n", - " \"a\": \"3 eV\",\n", - " \"b\": {\"c\": \"hello\", \"d\": 5},\n", - " \"d.e.f\": \"nest via dot-notation\",\n", - " \"x\": \"(101)\",\n", - " },\n", - " \"tables\": [df],\n", + "contributions = [{\n", + " \"project\": name,\n", + " \"identifier\": \"mp-4\",\n", + " \"data\": {\n", + " \"a\": \"3 eV\",\n", + " \"b\": {\"c\": \"hello\", \"d\": 5},\n", + " \"d.e.f\": \"nest via dot-notation\",\n", + " \"x\": \"(101)\"\n", " },\n", - " {\n", - " \"project\": name,\n", - " \"identifier\": \"mp-6\",\n", - " \"data\": {\"a\": \"4 eV\", \"b\": {\"c\": \"what\", \"d\": 6}, \"d.e.f\": \"duh\"},\n", - " \"tables\": [df],\n", + " \"tables\": [df]\n", + "}, {\n", + " \"project\": name,\n", + " \"identifier\": \"mp-6\",\n", + " \"data\": {\n", + " \"a\": \"4 eV\",\n", + " \"b\": {\"c\": \"what\", \"d\": 6},\n", + " \"d.e.f\": \"duh\"\n", " },\n", - "]\n", + " \"tables\": [df]\n", + "}]\n", "client.submit_contributions(contributions, ignore_dupes=True)" ] }, @@ -195,9 +192,7 @@ "metadata": {}, "outputs": [], "source": [ - "client.contributions.get_entries(\n", - " project=name, _fields=[\"identifier\", \"is_public\"]\n", - ").result()" + "client.contributions.get_entries(project=name, _fields=[\"identifier\", \"is_public\"]).result()" ] }, { @@ -224,14 +219,13 @@ "\n", "query = {\n", " \"project\": \"carrier_transport\",\n", - " # \"id__not__in\": [\"5f8a3d9183a19cc44d02243e\", \"5f8a3d9283a19cc44d022447\"],\n", - " # \"data__functional__endswith\": \"+U\",\n", - " # \"data__mₑᶜ__p__ε₁__value__gte\": 0,\n", + " #\"id__not__in\": [\"5f8a3d9183a19cc44d02243e\", \"5f8a3d9283a19cc44d022447\"],\n", + " #\"data__functional__endswith\": \"+U\",\n", + " #\"data__mₑᶜ__p__ε₁__value__gte\": 0,\n", " \"last_modified__after\": after,\n", " \"last_modified__before\": before,\n", " \"_fields\": [\"id\", \"last_modified\"],\n", - " \"_limit\": 10,\n", - " \"_sort\": \"last_modified\",\n", + " \"_limit\": 10, \"_sort\": \"last_modified\"\n", "}\n", "client.contributions.get_entries(**query).result()" ] @@ -264,10 +258,10 @@ "outputs": [], "source": [ "client.tables.get_entries(\n", - " # attrs__title__icontains=\"xas\",\n", - " # attrs__labels__index__startswith=\"T\",\n", + " #attrs__title__icontains=\"xas\",\n", + " #attrs__labels__index__startswith=\"T\",\n", " attrs__labels__value__startswith=\"PF\",\n", - " _fields=[\"name\", \"attrs\", \"columns\", \"total_data_rows\"],\n", + " _fields=[\"name\", \"attrs\", \"columns\", \"total_data_rows\"]\n", ").result()" ] }, diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/springer_materials.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/springer_materials.ipynb index 0ec1ad6dc4..ce4e3b1dfd 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/springer_materials.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/springer_materials.ipynb @@ -11,7 +11,7 @@ "import re\n", "from glob import glob\n", "from mpcontribs.client import Client\n", - "from flatten_dict import unflatten" + "from flatten_dict import unflatten, flatten" ] }, { @@ -103,7 +103,7 @@ " # \"Status_of_Phase_Diagram\": {\"name\": \"phasediagram.status\"}\n", "}\n", "\n", - "keys - set(columns_map.keys()) # just making sure I didn't miss a key" + "keys - set(columns_map.keys()) # just making sure I didn't miss a key" ] }, { @@ -116,19 +116,16 @@ "# prep contributions\n", "contributions = []\n", "prop_set = set()\n", - "special_char_map = {ord(\"ä\"): \"ae\", ord(\"ü\"): \"ue\", ord(\"ö\"): \"oe\", ord(\"ß\"): \"ss\"}\n", - "CLEANR = re.compile(\"<.*?>\")\n", - "\n", + "special_char_map = {ord('ä'): 'ae', ord('ü'): 'ue', ord('ö'): 'oe', ord('ß'): 'ss'}\n", + "CLEANR = re.compile('<.*?>') \n", "\n", "def convert_prop(s):\n", " cleaned = \"\".join([c if c.isalnum() else \" \" for c in s])\n", " capitalized = \"\".join([w.capitalize() for w in cleaned.split()])\n", " return capitalized.translate(special_char_map)\n", "\n", - "\n", "def cleanhtml(raw_html):\n", - " return re.sub(CLEANR, \"\", raw_html)\n", - "\n", + " return re.sub(CLEANR, '', raw_html)\n", "\n", "for fn, docs in data.items():\n", " print(fn)\n", @@ -141,11 +138,10 @@ " # for prop in sorted(doc[\"List_of_Physical_Properties\"])\n", " # ] if category == \"physical-properties\" else []\n", " contrib = {\n", - " \"identifier\": identifier,\n", - " \"formula\": formula,\n", + " \"identifier\": identifier, \"formula\": formula,\n", " \"data\": {\"springer.category\": category},\n", " }\n", - "\n", + " \n", " # if properties:\n", " # prop_set |= set(properties)\n", " # for prop in properties:\n", @@ -162,11 +158,11 @@ " if unit is None and \"<\" in val:\n", " val = cleanhtml(val)\n", "\n", - " contrib[\"data\"][name] = f\"{val} {unit}\" if unit else val\n", - "\n", + " contrib[\"data\"][name] = f\"{val} {unit}\" if unit else val \n", + " \n", " contrib[\"data\"] = unflatten(contrib[\"data\"], splitter=\"dot\")\n", " contributions.append(contrib)\n", - "\n", + " \n", "len(contributions)" ] }, @@ -184,7 +180,7 @@ "# for prop in sorted(prop_set):\n", "# columns[f\"properties.available.{prop}\"] = None\n", "\n", - "# client.init_columns(columns)" + "#client.init_columns(columns)" ] }, { @@ -198,9 +194,7 @@ "client.delete_contributions() # need to delete first due to `unique_identifiers=False`\n", "client.init_columns(columns) # good practice :)\n", "client.submit_contributions(contributions)\n", - "client.init_columns(\n", - " columns\n", - ") # just to make sure that all columns show up in the intended order" + "client.init_columns(columns) # just to make sure that all columns show up in the intended order" ] }, { @@ -229,7 +223,7 @@ "query = {\n", " \"data__springer__category__exact\": \"physical-properties\",\n", " \"data__properties__main__exact\": \"elasticity\",\n", - " \"data__properties__stats__samples__value__gt\": 5,\n", + " \"data__properties__stats__samples__value__gt\": 5\n", "}\n", "client.count(query=query)" ] @@ -257,7 +251,7 @@ "springer_id = \"ppp_350781a8aa14dc0b19c6c879daff3be2\"\n", "client.query_contributions(\n", " query={\"data__springer__id__exact\": springer_id},\n", - " fields=[\"id\", \"identifier\", \"data.springer.id\", \"data.properties.pearson\"],\n", + " fields=[\"id\", \"identifier\", \"data.springer.id\", \"data.properties.pearson\"]\n", ")" ] }, @@ -269,12 +263,9 @@ "outputs": [], "source": [ "# count all entries for a list of formulas released before 2023\n", - "client.count(\n", - " query={\n", - " \"formula__in\": [\"Fe2O3\", \"GaAS\"],\n", - " \"data__springer__released__value__lt\": 2023,\n", - " }\n", - ")" + "client.count(query={\n", + " \"formula__in\": [\"Fe2O3\", \"GaAS\"], \"data__springer__released__value__lt\": 2023\n", + "})" ] }, { diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/swf.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/swf.ipynb index 03011858f9..a9741147a6 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/swf.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/swf.ipynb @@ -40,9 +40,7 @@ "metadata": {}, "outputs": [], "source": [ - "datadir = Path(\n", - " \"/Users/patrick/GoogleDriveLBNL/MaterialsProject/gitrepos/mpcontribs-data/swf\"\n", - ")\n", + "datadir = Path(\"/Users/patrick/GoogleDriveLBNL/MaterialsProject/gitrepos/mpcontribs-data/swf\")\n", "identifier = \"mp-1216347\"" ] }, @@ -60,7 +58,7 @@ "kondorsky.attrs = {\n", " \"title\": \"Angular Dependence of Switching Field\",\n", " \"labels\": {\"value\": \"Switching Field [T]\"},\n", - " \"log_y\": True, # TODO check if goes through\n", + " \"log_y\": True # TODO check if goes through\n", "}\n", "kondorsky.plot(**kondorsky.attrs)" ] @@ -79,7 +77,7 @@ "ip.attrs = {\n", " \"title\": \"IP Energy Product\",\n", " \"labels\": {\"value\": \"Composition [at%]\"},\n", - " \"kind\": \"scatter\", # TODO check if goes through\n", + " \"kind\": \"scatter\" # TODO check if goes through\n", "}\n", "ip.plot(**ip.attrs)" ] @@ -103,7 +101,7 @@ "source": [ "# set table names\n", "kondorsky.attrs[\"name\"] = \"Kondorsky\"\n", - "# ip.attrs[\"name\"] = \"IP Energy Product\"" + "#ip.attrs[\"name\"] = \"IP Energy Product\"" ] }, { @@ -115,15 +113,11 @@ }, "outputs": [], "source": [ - "contributions = [\n", - " {\n", - " \"project\": name,\n", - " \"identifier\": identifier,\n", - " \"is_public\": True,\n", - " \"data\": {\"kondorsky\": {\"Fe\": \"42.1707 %\", \"Co\": \"8.034 %\", \"V\": \"49.7953 %\"}},\n", - " \"tables\": [kondorsky, ip], # , moke, vsm, total˜]\n", - " }\n", - "]\n", + "contributions = [{\n", + " \"project\": name, \"identifier\": identifier, \"is_public\": True,\n", + " \"data\": {\"kondorsky\": {\"Fe\": \"42.1707 %\", \"Co\": \"8.034 %\", \"V\": \"49.7953 %\"}},\n", + " \"tables\": [kondorsky, ip]#, moke, vsm, total˜]\n", + "}]\n", "len(contributions)" ] }, diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/transparent_conductors.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/transparent_conductors.ipynb index bd48684926..bc8a8feef7 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/transparent_conductors.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/transparent_conductors.ipynb @@ -7,6 +7,7 @@ "metadata": {}, "outputs": [], "source": [ + "import tarfile, os\n", "import numpy as np\n", "from pandas import read_excel\n", "from mpcontribs.client import Client" @@ -61,7 +62,7 @@ " for row in df.to_dict(orient=\"records\"):\n", " identifier = None\n", " data = {\"doping\": doping}\n", - "\n", + " \n", " for keys, value in row.items():\n", " key = \".\".join(\n", " [\n", @@ -70,10 +71,10 @@ " if not k.startswith(\"Unnamed:\")\n", " ]\n", " )\n", - "\n", + " \n", " if key.endswith(\"experimental doping type\"):\n", " key = key.replace(\"Transport.\", \"\")\n", - "\n", + " \n", " key_split = key.split(\".\")\n", " if len(key_split) > 2:\n", " key = \".\".join(key_split[1:])\n", @@ -99,9 +100,7 @@ " if key.endswith(\")\"):\n", " key, unit = key.rsplit(\" (\", 1)\n", " unit = unit[:-1].replace(\"^-3\", \"⁻³\").replace(\"^20\", \"²⁰\")\n", - " unit = unit.replace(\"V2/cms\", \"cm²/V/s\").replace(\n", - " \"cm^2/Vs\", \"cm²/V/s\"\n", - " )\n", + " unit = unit.replace(\"V2/cms\", \"cm²/V/s\").replace(\"cm^2/Vs\", \"cm²/V/s\")\n", " if \",\" in unit:\n", " extra_key = key.rsplit(\".\", 1)[0].lower() + \".conditions\"\n", " data[extra_key] = unit\n", @@ -116,9 +115,12 @@ "\n", " if done:\n", " break\n", - "\n", - " raw_contributions.append({\"identifier\": identifier, \"data\": data})\n", - "\n", + " \n", + " raw_contributions.append({\n", + " \"identifier\": identifier,\n", + " \"data\": data\n", + " })\n", + " \n", "len(raw_contributions)" ] }, @@ -140,72 +142,48 @@ "outputs": [], "source": [ "keys_map = {\n", - " \"doping\": {}, # don't rename, no unit\n", - " \"number of studies\": {\"rename\": \"studies\", \"unit\": \"\"}, # dimensionless\n", - " \"quality.good or ok\": {\"rename\": \"quality\"},\n", - " \"structure and composition.common dopants\": {\"rename\": \"dopants\"},\n", - " \"structure and composition.space group symbol\": {\"rename\": \"spacegroup\"},\n", - " \"branch point energy.bpe min ratio\": {\"rename\": \"BPE.ratio.min\", \"unit\": \"\"},\n", - " \"branch point energy.bpe max ratio\": {\"rename\": \"BPE.ratio.max\", \"unit\": \"\"},\n", - " \"branch point energy.bpe ratio\": {\"rename\": \"BPE.ratio.mean\", \"unit\": \"\"},\n", - " \"branch point energy.has degenerate bands\": {\"rename\": \"BPE.degenerate\"},\n", - " \"computed gap.hse06 band gap\": {\"rename\": \"computed.gap.HSE06.band\", \"unit\": \"eV\"},\n", - " \"computed gap.hse06 direct gap\": {\n", - " \"rename\": \"computed.gap.HSE06.direct\",\n", - " \"unit\": \"eV\",\n", - " },\n", - " \"computed gap.pbe band gap\": {\"rename\": \"computed.gap.PBE.band\", \"unit\": \"eV\"},\n", - " \"computed gap.pbe direct gap\": {\"rename\": \"computed.gap.PBE.direct\", \"unit\": \"eV\"},\n", - " \"computed m*.conditions\": {\"rename\": \"computed.m*.conditions\"},\n", - " \"computed m*.m* avg\": {\"rename\": \"computed.m*.average\", \"unit\": \"\"},\n", - " \"computed m*.m* planar\": {\"rename\": \"computed.m*.planar\", \"unit\": \"\"},\n", - " \"computed stability.e_above_hull\": {\n", - " \"rename\": \"computed.stability.Eₕ\",\n", - " \"unit\": \"eV\",\n", - " },\n", - " \"computed stability.e_above_pourbaix_hull\": {\n", - " \"rename\": \"computed.stability.Eₚₕ\",\n", - " \"unit\": \"eV\",\n", - " },\n", - " \"experimental doping type\": {\"rename\": \"experimental.doping\"},\n", - " \"experimental gap.max experimental gap\": {\n", - " \"rename\": \"experimental.gap.range.max\",\n", - " \"unit\": \"eV\",\n", - " },\n", - " \"experimental gap.max gap reference\": {\"rename\": \"experimental.gap.references.max\"},\n", - " \"experimental gap.min experimental gap\": {\n", - " \"rename\": \"experimental.gap.range.min\",\n", - " \"unit\": \"eV\",\n", - " },\n", - " \"experimental gap.min gap reference\": {\"rename\": \"experimental.gap.references.min\"},\n", - " \"max experimental conductivity.associated carrier concentration\": {\n", - " \"rename\": \"experimental.conductivity.concentration\",\n", - " \"unit\": \"cm⁻³\",\n", - " },\n", - " \"max experimental conductivity.dopant\": {\n", - " \"rename\": \"experimental.conductivity.dopant\"\n", - " },\n", - " \"max experimental conductivity.max conductivity\": {\n", - " \"rename\": \"experimental.conductivity.max\",\n", - " \"unit\": \"S/cm\",\n", - " },\n", - " \"max experimental conductivity.reference link\": {\n", - " \"rename\": \"experimental.conductivity.reference\"\n", - " },\n", - " \"max experimental conductivity.synthesis method\": {\n", - " \"rename\": \"experimental.conductivity.method\"\n", - " },\n", - " \"max experimental mobility.dopant\": {\"rename\": \"experimental.mobility.dopant\"},\n", - " \"max experimental mobility.max mobility\": {\n", - " \"rename\": \"experimental.mobility.max\",\n", - " \"unit\": \"cm²/V/s\",\n", - " },\n", - " \"max experimental mobility.reference link\": {\n", - " \"rename\": \"experimental.mobility.reference\"\n", + " 'doping': {}, # don't rename, no unit\n", + " 'number of studies': {'rename': 'studies', 'unit': ''}, # dimensionless\n", + " 'quality.good or ok': {'rename': 'quality'},\n", + " 'structure and composition.common dopants': {'rename': 'dopants'},\n", + " 'structure and composition.space group symbol': {'rename': 'spacegroup'},\n", + " \n", + " 'branch point energy.bpe min ratio': {'rename': 'BPE.ratio.min', 'unit': ''},\n", + " 'branch point energy.bpe max ratio': {'rename': 'BPE.ratio.max', 'unit': ''},\n", + " 'branch point energy.bpe ratio': {'rename': 'BPE.ratio.mean', 'unit': ''},\n", + " 'branch point energy.has degenerate bands': {'rename': 'BPE.degenerate'},\n", + " \n", + " 'computed gap.hse06 band gap': {'rename': 'computed.gap.HSE06.band', 'unit': 'eV'},\n", + " 'computed gap.hse06 direct gap': {'rename': 'computed.gap.HSE06.direct', 'unit': 'eV'},\n", + " 'computed gap.pbe band gap': {'rename': 'computed.gap.PBE.band', 'unit': 'eV'},\n", + " 'computed gap.pbe direct gap': {'rename': 'computed.gap.PBE.direct', 'unit': 'eV'},\n", + "\n", + " 'computed m*.conditions': {'rename': 'computed.m*.conditions'},\n", + " 'computed m*.m* avg': {'rename': 'computed.m*.average', 'unit': ''},\n", + " 'computed m*.m* planar': {'rename': 'computed.m*.planar', 'unit': ''},\n", + " 'computed stability.e_above_hull': {'rename': 'computed.stability.Eₕ', 'unit': 'eV'},\n", + " 'computed stability.e_above_pourbaix_hull': {'rename': 'computed.stability.Eₚₕ', 'unit': 'eV'},\n", + "\n", + " 'experimental doping type': {'rename': 'experimental.doping'},\n", + " 'experimental gap.max experimental gap': {'rename': 'experimental.gap.range.max', 'unit': 'eV'},\n", + " 'experimental gap.max gap reference': {'rename': 'experimental.gap.references.max'},\n", + " 'experimental gap.min experimental gap': {'rename': 'experimental.gap.range.min', 'unit': 'eV'},\n", + " 'experimental gap.min gap reference': {'rename': 'experimental.gap.references.min'},\n", + "\n", + " 'max experimental conductivity.associated carrier concentration': {\n", + " 'rename': 'experimental.conductivity.concentration', 'unit': 'cm⁻³'\n", " },\n", - " \"max experimental mobility.synthesis method\": {\n", - " \"rename\": \"experimental.mobility.method\"\n", + " 'max experimental conductivity.dopant': {'rename': 'experimental.conductivity.dopant'},\n", + " 'max experimental conductivity.max conductivity': {\n", + " 'rename': 'experimental.conductivity.max', 'unit': 'S/cm'\n", " },\n", + " 'max experimental conductivity.reference link': {'rename': 'experimental.conductivity.reference'},\n", + " 'max experimental conductivity.synthesis method': {'rename': 'experimental.conductivity.method'},\n", + "\n", + " 'max experimental mobility.dopant': {'rename': 'experimental.mobility.dopant'},\n", + " 'max experimental mobility.max mobility': {'rename': 'experimental.mobility.max', 'unit': 'cm²/V/s'},\n", + " 'max experimental mobility.reference link': {'rename': 'experimental.mobility.reference'},\n", + " 'max experimental mobility.synthesis method': {'rename': 'experimental.mobility.method'},\n", "}" ] }, @@ -216,7 +194,10 @@ "metadata": {}, "outputs": [], "source": [ - "columns = {cfg.get(\"rename\", k): cfg.get(\"unit\") for k, cfg in keys_map.items()}" + "columns = {\n", + " cfg.get(\"rename\", k): cfg.get(\"unit\")\n", + " for k, cfg in keys_map.items()\n", + "}" ] }, { @@ -229,13 +210,11 @@ "contributions = []\n", "\n", "for contrib in raw_contributions:\n", - " contributions.append(\n", - " {\n", - " \"project\": name,\n", - " \"identifier\": contrib[\"identifier\"],\n", - " \"is_public\": True,\n", - " }\n", - " )\n", + " contributions.append({\n", + " \"project\": name,\n", + " \"identifier\": contrib[\"identifier\"],\n", + " \"is_public\": True,\n", + " })\n", " contributions[-1][\"data\"] = {\n", " cfg.get(\"rename\", k): contrib[\"data\"][k]\n", " for k, cfg in keys_map.items()\n", diff --git a/mpcontribs-portal/notebooks/lightsources.materialsproject.org/genesis_efrc_minipipes.ipynb b/mpcontribs-portal/notebooks/lightsources.materialsproject.org/genesis_efrc_minipipes.ipynb index 20a1e071b1..429f4b81ae 100644 --- a/mpcontribs-portal/notebooks/lightsources.materialsproject.org/genesis_efrc_minipipes.ipynb +++ b/mpcontribs-portal/notebooks/lightsources.materialsproject.org/genesis_efrc_minipipes.ipynb @@ -35,9 +35,7 @@ "outputs": [], "source": [ "name = \"genesis_efrc_minipipes\" # MPContribs project name\n", - "indir = Path(\n", - " f\"/Users/patrick/GoogleDriveLBNL/MaterialsProject/gitrepos/mpcontribs-data/{name}\"\n", - ")" + "indir = Path(f\"/Users/patrick/GoogleDriveLBNL/MaterialsProject/gitrepos/mpcontribs-data/{name}\")" ] }, { @@ -52,8 +50,7 @@ "\n", "# adding project name and API key to config (TODO: set through minipipes UI)\n", "config[\"meta\"][\"mpcontribs\"] = {\n", - " \"project\": name,\n", - " \"apikey\": os.environ[\"MPCONTRIBS_API_KEY\"],\n", + " \"project\": name, \"apikey\": os.environ[\"MPCONTRIBS_API_KEY\"]\n", "}\n", "\n", "ped_path = indir / \"PED of BMG for PDF 1-29-20_0035-0070.gr\"\n", @@ -82,7 +79,8 @@ "mpcontribs_config = config[\"meta\"].pop(\"mpcontribs\")\n", "name = mpcontribs_config[\"project\"]\n", "client = Client(\n", - " host=\"lightsources-api.materialsproject.org\", apikey=mpcontribs_config[\"apikey\"]\n", + " host = \"lightsources-api.materialsproject.org\",\n", + " apikey = mpcontribs_config[\"apikey\"]\n", ")" ] }, @@ -144,7 +142,7 @@ "source": [ "contrib = {\n", " \"project\": name,\n", - " \"identifier\": \"TODO\", # usually mp-id, can be custom\n", + " \"identifier\": \"TODO\", # usually mp-id, can be custom\n", " \"formula\": formula,\n", " \"is_public\": True, # will make this contribution public automatically when project is set to public\n", " # data, tables and attachments added explicitly below\n", @@ -170,9 +168,9 @@ "names_map = {\n", " \"i_Reduce_Data.Mask_Images.Mask_f\": \"mask\",\n", " \"i_Reduce_Data.Image_to_IQ.Integrate_f\": \"integrate\",\n", - " \"i_Reduce_Data.IQ_to_PDF.Transform_f\": \"transform\",\n", + " \"i_Reduce_Data.IQ_to_PDF.Transform_f\": \"transform\"\n", "}\n", - "keys_maps = [ # len(runs_meta) = 3\n", + "keys_maps = [ # len(runs_meta) = 3\n", " {\n", " \"alpha\": \"α\",\n", " \"edge\": \"edge\",\n", @@ -180,14 +178,12 @@ " \"upper_threshold\": \"thresholds.upper\",\n", " \"smoothing function\": \"smoothing\",\n", " \"vmin\": \"v.min\",\n", - " \"vmax\": \"v.max\",\n", - " },\n", - " {\n", + " \"vmax\": \"v.max\"\n", + " }, {\n", " \"wavelength (A)\": \"λ\", # TODO unit Angstrom\n", " \"polarization\": \"polarization\",\n", - " \"detector\": \"detector\",\n", - " },\n", - " {\n", + " \"detector\": \"detector\"\n", + " }, {\n", " \"processor\": \"processor\",\n", " \"mode\": \"mode\",\n", " \"qmax\": \"q.max\",\n", @@ -196,8 +192,8 @@ " \"rmin\": \"r.min\",\n", " \"rmax\": \"r.max\",\n", " \"step\": \"step\",\n", - " \"shift\": \"shift\",\n", - " },\n", + " \"shift\": \"shift\"\n", + " }\n", "]\n", "\n", "flat_data = {}\n", @@ -236,7 +232,7 @@ "df.columns.name = \"spectral type\"\n", "df.attrs[\"name\"] = y\n", "df.attrs[\"title\"] = \"Radial Distribution Function\"\n", - "df.attrs[\"labels\"] = {\"value\": f\"{y} [Å⁻²]\"}\n", + "df.attrs[\"labels\"] = {\"value\": f\"{y} [Å⁻²]\"} \n", "# df.plot(**df.attrs)\n", "contrib[\"tables\"] = [df]" ] diff --git a/mpcontribs-portal/notebooks/lightsources.materialsproject.org/get_started.ipynb b/mpcontribs-portal/notebooks/lightsources.materialsproject.org/get_started.ipynb index 5edfa98091..c3162b1883 100644 --- a/mpcontribs-portal/notebooks/lightsources.materialsproject.org/get_started.ipynb +++ b/mpcontribs-portal/notebooks/lightsources.materialsproject.org/get_started.ipynb @@ -7,6 +7,8 @@ "outputs": [], "source": [ "import os\n", + "import json\n", + "import gzip\n", "from zipfile import ZipFile\n", "from io import StringIO, BytesIO\n", "from numpy import where\n", @@ -14,7 +16,8 @@ "from pandas import to_numeric, read_csv\n", "from mpcontribs.client import Client, Attachment\n", "from tqdm.notebook import tqdm\n", - "from decimal import Decimal" + "from decimal import Decimal\n", + "from pathlib import Path" ] }, { @@ -54,16 +57,14 @@ "elements = [\"Co\", \"Cu\", \"Ce\"]\n", "columns = {f\"position.{axis}\": \"mm\" for axis in [\"x\", \"y\"]}\n", "columns.update({f\"composition.{element}\": \"%\" for element in elements})\n", - "columns.update(\n", - " {\n", - " f\"{element}.{spectrum}.{m}\": \"\"\n", - " for element in elements\n", - " for spectrum in [\"XAS\", \"XMCD\"]\n", - " for m in [\"min\", \"max\"]\n", - " }\n", - ")\n", + "columns.update({\n", + " f\"{element}.{spectrum}.{m}\": \"\"\n", + " for element in elements\n", + " for spectrum in [\"XAS\", \"XMCD\"]\n", + " for m in [\"min\", \"max\"]\n", + "})\n", "columns.update({\"tables\": None, \"attachments\": None})\n", - "# columns" + "#columns" ] }, { @@ -84,9 +85,7 @@ "outputs": [], "source": [ "# composition/concentration table\n", - "ctable = read_csv(\n", - " StringIO(\n", - " \"\"\"\n", + "ctable = read_csv(StringIO(\"\"\"\n", "X,\t\tY,\t\tCo,\t\tCu,\t\tCe\n", "-8.5,\t37.6,\t46.2,\t5.3,\t39.3\n", "-8.5,\t107.8,\t70.0,\t8.9,\t15.5\n", @@ -100,13 +99,9 @@ "-5.7,\t104.8,\t54.9,\t19.1,\t15.5\n", "-5.0,\t37.1,\t48.8,\t8.7,\t43.7\n", "-5.0,\t107.1,\t64.8,\t16.9,\t19.2\n", - "\"\"\".replace(\"\\t\", \"\")\n", - " )\n", - ")\n", + "\"\"\".replace('\\t', '')))\n", "\n", - "ctable[\"x/y position [mm]\"] = (\n", - " ctable[\"X\"].astype(\"str\") + \"/\" + ctable[\"Y\"].astype(\"str\")\n", - ")\n", + "ctable[\"x/y position [mm]\"] = ctable[\"X\"].astype('str') + '/' + ctable[\"Y\"].astype('str')\n", "ctable.attrs[\"name\"] = \"Composition Table\"\n", "ctable.attrs[\"meta\"] = {\"X\": \"category\", \"Y\": \"continuous\"} # for plotly\n", "ctable.attrs[\"labels\"] = {\"value\": \"composition [%]\"}\n", @@ -147,7 +142,6 @@ "\n", " return functions\n", "\n", - "\n", "conc_funcs = get_concentration_functions(ctable)\n", "del ctable[\"X\"]\n", "del ctable[\"Y\"]\n", @@ -162,52 +156,49 @@ "source": [ "# paths to gzipped JSON files for attachments\n", "# global params attachment identical for every contribution / across project\n", - "global_params = Attachment.from_data(\n", - " \"files/global-params\",\n", - " {\n", - " \"transfer_fields\": [\n", - " \"I_Norm0\",\n", - " \"Magnet Field\",\n", - " \"Energy\",\n", - " \"Y\",\n", - " \"Z\",\n", - " \"filename_scannumber\",\n", - " ],\n", - " \"labelcols\": [\"Y\", \"Z\"],\n", - " },\n", - ")\n", - "\n", + "global_params = Attachment.from_data(\"files/global-params\", {\n", + " \"transfer_fields\": [\n", + " \"I_Norm0\", \"Magnet Field\", \"Energy\", \"Y\", \"Z\", \"filename_scannumber\"\n", + " ],\n", + " \"labelcols\": [\"Y\", \"Z\"]\n", + "})\n", "\n", "# separate attachment of analysis params for each contribution and element\n", "def analysis_params(identifier, element):\n", " name = f\"files/analysis-params__{identifier}__{element}\"\n", - " return Attachment.from_data(\n", - " name,\n", - " {\n", - " \"get_xas\": {\n", - " \"element\": element,\n", - " \"pre_edge\": (695, 701),\n", - " \"post_edge\": (730, 739),\n", - " },\n", - " \"get_xmcd\": {\n", - " \"L3_range\": (705, 710),\n", - " \"L2_range\": (718, 722),\n", - " },\n", - " \"Remove BG (polynomial)\": {\n", - " \"element\": element,\n", - " \"degree\": 1,\n", - " \"step\": 0,\n", - " \"xmcd_bg_subtract\": True,\n", - " \"scanindex_column\": \"XMCD Index\",\n", - " },\n", - " \"normalize_set\": {\"element\": element, \"scanindex_column\": \"XMCD Index\"},\n", - " \"collapse_set\": {\"columns_to_keep\": [\"Energy\", \"Y\", \"Z\"]},\n", - " \"plot_spectrum\": {\"element\": element, \"E_lower\": 695, \"E_upper\": 760},\n", - " \"gather_final_op_param_values\": {\n", - " \"identifier\": identifier # added for testing to ensure different attachment contents\n", - " },\n", + " return Attachment.from_data(name, {\n", + " \"get_xas\": {\n", + " \"element\": element,\n", + " 'pre_edge': (695, 701),\n", + " 'post_edge': (730, 739),\n", + " },\n", + " \"get_xmcd\": {\n", + " 'L3_range': (705, 710),\n", + " 'L2_range': (718, 722),\n", + " },\n", + " \"Remove BG (polynomial)\": {\n", + " \"element\": element,\n", + " \"degree\": 1,\n", + " \"step\": 0,\n", + " \"xmcd_bg_subtract\": True,\n", + " \"scanindex_column\": \"XMCD Index\"\n", + " },\n", + " \"normalize_set\": {\n", + " \"element\": element,\n", + " \"scanindex_column\": \"XMCD Index\"\n", + " },\n", + " \"collapse_set\": {\n", + " \"columns_to_keep\": [\"Energy\",\"Y\",\"Z\"]\n", " },\n", - " )" + " \"plot_spectrum\": {\n", + " \"element\": element,\n", + " 'E_lower': 695,\n", + " 'E_upper': 760\n", + " },\n", + " \"gather_final_op_param_values\": {\n", + " \"identifier\": identifier # added for testing to ensure different attachment contents\n", + " }\n", + " })" ] }, { @@ -224,7 +215,7 @@ " # randomly assign fake sample id for testing here\n", " fn = os.path.splitext(info.filename)[0]\n", " element, x, y = fn.rsplit(\"_\", 4)\n", - " sample = f\"CMSI-2-10_{idx % 5}\"\n", + " sample = f\"CMSI-2-10_{idx%5}\"\n", " identifier = f\"{sample}__{x}_{y}\"\n", "\n", " # tables and attachments for Co\n", @@ -237,7 +228,7 @@ " df.columns.name = \"spectral type\"\n", " df.attrs[\"name\"] = f\"{element}-XAS/XMCD\"\n", " df.attrs[\"title\"] = f\"XAS and XMCD Spectra for {element}\"\n", - " df.attrs[\"labels\"] = {\"value\": \"a.u.\"}\n", + " df.attrs[\"labels\"] = {\"value\": \"a.u.\"} \n", " params = analysis_params(identifier, element)\n", "\n", " # build contribution\n", @@ -245,39 +236,38 @@ " # TODO auto-convert data.timestamp field in API to enable sorting/filtering\n", " contrib[\"data\"][\"position\"] = {k: f\"{v} mm\" for k, v in zip([\"x\", \"y\"], [x, y])}\n", " contrib[\"data\"][\"composition\"] = {}\n", - "\n", + " \n", " for el, f in conc_funcs.items():\n", " try:\n", - " contrib[\"data\"][\"composition\"][el] = f\"{f(x, y) * 100.0} %\"\n", + " contrib[\"data\"][\"composition\"][el] = f\"{f(x, y) * 100.} %\"\n", " except KeyError:\n", " continue\n", "\n", " if not contrib[\"data\"][\"composition\"]:\n", " print(f\"Could not determine composition for {identifier}!\")\n", " continue\n", - "\n", - " contrib[\"formula\"] = \"\".join(\n", - " [\n", - " \"{}{}\".format(el, int(round(Decimal(comp.split()[0]))))\n", - " for el, comp in contrib[\"data\"][\"composition\"].items()\n", - " ]\n", - " )\n", + " \n", + " contrib[\"formula\"] = \"\".join([\n", + " \"{}{}\".format(el, int(round(Decimal(comp.split()[0]))))\n", + " for el, comp in contrib[\"data\"][\"composition\"].items()\n", + " ])\n", "\n", " contrib[\"data\"][element] = {\n", - " y: {\"min\": df[y].min(), \"max\": df[y].max()} for y in [\"XAS\", \"XMCD\"]\n", + " y: {\"min\": df[y].min(), \"max\": df[y].max()}\n", + " for y in [\"XAS\", \"XMCD\"]\n", " }\n", - "\n", + " \n", " # adding ctable and global_params to every contribution\n", " # ctable could be the same for different subsets of contributions\n", " contrib[\"tables\"] = [ctable, df]\n", " contrib[\"attachments\"] = [global_params, params]\n", " contributions.append(contrib)\n", - "\n", + " \n", "# if len(contributions) > 2:\n", "# break\n", - "\n", + " \n", "# len(contributions)\n", - "# contributions" + "#contributions" ] }, { @@ -297,9 +287,9 @@ "metadata": {}, "outputs": [], "source": [ - "client.contributions.queryContributions(\n", - " project=name, _fields=[\"id\", \"identifier\", \"tables\", \"attachments\", \"notebook\"]\n", - ").result()" + "client.contributions.queryContributions(project=name, _fields=[\n", + " \"id\", \"identifier\", \"tables\", \"attachments\", \"notebook\"\n", + "]).result()" ] }, { @@ -335,7 +325,7 @@ " fake_tables[identifier] = []\n", " for idx, element in enumerate(elements[1:]):\n", " df = contrib[\"tables\"][1].copy()\n", - " df.index = df.index.astype(\"float\") + (idx + 1) * 10\n", + " df.index = df.index.astype(\"float\") + (idx+1)*10\n", " df.attrs[\"name\"] = f\"{element}-XAS/XMCD\"\n", " df.attrs[\"title\"] = f\"XAS and XMCD Spectra for {element}\"\n", " fake_tables[identifier].append(df)" @@ -352,10 +342,14 @@ "identifiers = [c[\"identifier\"] for c in contributions]\n", "\n", "resp = client.contributions.queryContributions(\n", - " project=name, identifier__in=identifiers[:5], _fields=[\"id\", \"identifier\"]\n", + " project=name, identifier__in=identifiers[:5],\n", + " _fields=[\"id\", \"identifier\"]\n", ").result()\n", "\n", - "mapping = {c[\"identifier\"]: c[\"id\"] for c in resp[\"data\"]}\n", + "mapping = {\n", + " c[\"identifier\"]: c[\"id\"]\n", + " for c in resp[\"data\"]\n", + "}\n", "print(mapping)" ] }, @@ -369,7 +363,7 @@ "# example for a single identifier and element\n", "identifier = identifiers[0]\n", "element_index = 1\n", - "component_index = element_index + 1 # index in contribution's component list\n", + "component_index = element_index + 1 # index in contribution's component list\n", "element = elements[element_index]\n", "pk = mapping[identifier]\n", "df = fake_tables[identifier][element_index]\n", @@ -377,9 +371,10 @@ "\n", "contrib = {\n", " \"id\": pk,\n", - " \"data\": {\n", - " element: {y: {\"min\": df[y].min(), \"max\": df[y].max()} for y in [\"XAS\", \"XMCD\"]}\n", - " },\n", + " \"data\": {element: {\n", + " y: {\"min\": df[y].min(), \"max\": df[y].max()}\n", + " for y in [\"XAS\", \"XMCD\"]\n", + " }}, \n", " \"tables\": [None] * component_index + [df], # ensure correct index for update\n", " \"attachments\": [None] * component_index + [params],\n", "}" @@ -409,7 +404,7 @@ "metadata": {}, "outputs": [], "source": [ - "client.get_table(\"608a5a1ddce158e132083323\").display()" + "client.get_table('608a5a1ddce158e132083323').display()" ] }, { diff --git a/mpcontribs-portal/notebooks/ml.materialsproject.org/get_started.ipynb b/mpcontribs-portal/notebooks/ml.materialsproject.org/get_started.ipynb index c43784529b..a13eefdc69 100644 --- a/mpcontribs-portal/notebooks/ml.materialsproject.org/get_started.ipynb +++ b/mpcontribs-portal/notebooks/ml.materialsproject.org/get_started.ipynb @@ -6,9 +6,7 @@ "metadata": {}, "outputs": [], "source": [ - "import wget\n", - "import json\n", - "import math\n", + "import wget, json, os, math\n", "from pathlib import Path\n", "from string import capwords\n", "from pybtex.database import parse_string\n", @@ -43,103 +41,91 @@ " \"clf_pos_label\": None,\n", " \"unit\": None,\n", " \"has_structure\": True,\n", - " },\n", - " {\n", + " }, {\n", " \"name\": \"log_gvrh\",\n", " \"data_file\": \"matbench_log_gvrh.json.gz\",\n", " \"target\": \"log10(G_VRH)\",\n", " \"clf_pos_label\": None,\n", " \"unit\": None,\n", " \"has_structure\": True,\n", - " },\n", - " {\n", + " }, {\n", " \"name\": \"dielectric\",\n", " \"data_file\": \"matbench_dielectric.json.gz\",\n", " \"target\": \"n\",\n", " \"clf_pos_label\": None,\n", " \"unit\": None,\n", " \"has_structure\": True,\n", - " },\n", - " {\n", + " }, {\n", " \"name\": \"jdft2d\",\n", " \"data_file\": \"matbench_jdft2d.json.gz\",\n", " \"target\": \"exfoliation_en\",\n", " \"clf_pos_label\": None,\n", " \"unit\": \"meV/atom\",\n", " \"has_structure\": True,\n", - " },\n", - " {\n", + " }, {\n", " \"name\": \"mp_gap\",\n", " \"data_file\": \"matbench_mp_gap.json.gz\",\n", " \"target\": \"gap pbe\",\n", " \"clf_pos_label\": None,\n", " \"unit\": \"eV\",\n", " \"has_structure\": True,\n", - " },\n", - " {\n", + " }, {\n", " \"name\": \"mp_is_metal\",\n", " \"data_file\": \"matbench_mp_is_metal.json.gz\",\n", " \"target\": \"is_metal\",\n", " \"clf_pos_label\": True,\n", " \"unit\": None,\n", " \"has_structure\": True,\n", - " },\n", - " {\n", + " }, {\n", " \"name\": \"mp_e_form\",\n", " \"data_file\": \"matbench_mp_e_form.json.gz\",\n", " \"target\": \"e_form\",\n", " \"clf_pos_label\": None,\n", " \"unit\": \"eV/atom\",\n", " \"has_structure\": True,\n", - " },\n", - " {\n", + " }, {\n", " \"name\": \"perovskites\",\n", " \"data_file\": \"matbench_perovskites.json.gz\",\n", " \"target\": \"e_form\",\n", " \"clf_pos_label\": None,\n", " \"unit\": \"eV\",\n", " \"has_structure\": True,\n", - " },\n", - " {\n", + " }, {\n", " \"name\": \"glass\",\n", " \"data_file\": \"matbench_glass.json.gz\",\n", " \"target\": \"gfa\",\n", " \"clf_pos_label\": True,\n", " \"unit\": None,\n", " \"has_structure\": False,\n", - " },\n", - " {\n", + " }, {\n", " \"name\": \"expt_is_metal\",\n", " \"data_file\": \"matbench_expt_is_metal.json.gz\",\n", " \"target\": \"is_metal\",\n", " \"clf_pos_label\": True,\n", " \"unit\": None,\n", " \"has_structure\": False,\n", - " },\n", - " {\n", + " }, {\n", " \"name\": \"expt_gap\",\n", " \"data_file\": \"matbench_expt_gap.json.gz\",\n", " \"target\": \"gap expt\",\n", " \"clf_pos_label\": None,\n", " \"unit\": \"eV\",\n", " \"has_structure\": False,\n", - " },\n", - " {\n", + " }, {\n", " \"name\": \"phonons\",\n", " \"data_file\": \"matbench_phonons.json.gz\",\n", " \"target\": \"last phdos peak\",\n", " \"clf_pos_label\": None,\n", " \"unit\": \"cm^-1\",\n", " \"has_structure\": True,\n", - " },\n", - " {\n", + " }, {\n", " \"name\": \"steels\",\n", " \"data_file\": \"matbench_steels.json.gz\",\n", " \"target\": \"yield strength\",\n", " \"clf_pos_label\": None,\n", " \"unit\": \"MPa\",\n", " \"has_structure\": False,\n", - " },\n", + " }\n", "]" ] }, @@ -173,7 +159,7 @@ "source": [ "pybtex.errors.set_strict_mode(False)\n", "mprester = MPRester()\n", - "client = Client(host=\"ml-api.materialsproject.org\")" + "client = Client(host='ml-api.materialsproject.org')" ] }, { @@ -182,16 +168,16 @@ "metadata": {}, "outputs": [], "source": [ - "datadir = Path(\"/Users/patrick/gitrepos/mp/mpcontribs-data/\")\n", - "fn = Path(\"dataset_metadata.json\")\n", + "datadir = Path('/Users/patrick/gitrepos/mp/mpcontribs-data/')\n", + "fn = Path('dataset_metadata.json')\n", "fp = datadir / fn\n", "if not fp.exists():\n", " prefix = \"https://raw.githubusercontent.com/hackingmaterials/matminer\"\n", - " url = f\"{prefix}/master/matminer/datasets/{fn}\"\n", + " url = f'{prefix}/master/matminer/datasets/{fn}'\n", " wget.download(url)\n", " fn.rename(fp)\n", - "\n", - "metadata = json.load(open(fp, \"r\"))" + " \n", + "metadata = json.load(open(fp, 'r'))" ] }, { @@ -213,47 +199,50 @@ " target = ds[\"target\"]\n", " columns = {\n", " target_map[target]: metadata[name][\"columns\"][target],\n", - " primitive_key: metadata[name][\"columns\"][primitive_key],\n", + " primitive_key: metadata[name][\"columns\"][primitive_key]\n", " }\n", " project = {\n", - " \"name\": name,\n", - " \"is_public\": True,\n", - " \"owner\": \"ardunn@lbl.gov\",\n", - " \"title\": name, # TODO update and set long_title\n", - " \"authors\": \"A. Dunn, A. Jain\",\n", - " \"description\": metadata[name][\"description\"]\n", - " + \" If you are viewing this on MPContribs-ML interactively, please ensure the order of the\"\n", + " 'name': name,\n", + " 'is_public': True,\n", + " 'owner': 'ardunn@lbl.gov',\n", + " 'title': name, # TODO update and set long_title\n", + " 'authors': 'A. Dunn, A. Jain',\n", + " 'description': metadata[name]['description'] + \\\n", + " \" If you are viewing this on MPContribs-ML interactively, please ensure the order of the\"\n", " f\"identifiers is sequential (mb-{ds['name']}-0001, mb-{ds['name']}-0002, etc.) before benchmarking.\",\n", - " \"other\": {\"columns\": columns, \"entries\": metadata[name][\"num_entries\"]},\n", - " \"references\": [{\"label\": \"RawData\", \"url\": metadata[\"name\"][\"url\"]}],\n", + " 'other': {\n", + " 'columns': columns,\n", + " 'entries': metadata[name]['num_entries']\n", + " },\n", + " 'references': [\n", + " {'label': 'RawData', 'url': metadata[\"name\"][\"url\"]}\n", + " ]\n", " }\n", - "\n", - " for ref in metadata[name][\"bibtex_refs\"]:\n", + " \n", + " for ref in metadata[name]['bibtex_refs']:\n", " if name == \"matbench_phonons\":\n", " ref = ref.replace(\n", " \"petretto_dwaraknath_miranda_winston_giantomassi_rignanese_van setten_gonze_persson_hautier_2018\",\n", - " \"petretto2018\",\n", + " \"petretto2018\"\n", " )\n", - "\n", - " bib = parse_string(ref, \"bibtex\")\n", + " \n", + " bib = parse_string(ref, 'bibtex')\n", " for key, entry in bib.entries.items():\n", - " key_is_doi = key.startswith(\"doi:\")\n", - " url = (\n", - " \"https://doi.org/\" + key.split(\":\", 1)[-1]\n", - " if key_is_doi\n", - " else entry.fields.get(\"url\")\n", - " )\n", - " k = \"Zhuo2018\" if key_is_doi else capwords(key.replace(\"_\", \"\"))\n", - " if k.startswith(\"C2\"):\n", - " k = \"Castelli2012\"\n", - " elif k.startswith(\"Landolt\"):\n", - " k = \"LB1997\"\n", - " elif k == \"Citrine\":\n", - " url = \"https://www.citrination.com\"\n", - "\n", + " key_is_doi = key.startswith('doi:')\n", + " url = 'https://doi.org/' + key.split(':', 1)[-1] if key_is_doi else entry.fields.get('url')\n", + " k = 'Zhuo2018' if key_is_doi else capwords(key.replace('_', ''))\n", + " if k.startswith('C2'):\n", + " k = 'Castelli2012'\n", + " elif k.startswith('Landolt'):\n", + " k = 'LB1997'\n", + " elif k == 'Citrine':\n", + " url = 'https://www.citrination.com'\n", + " \n", " if len(k) > 8:\n", " k = k[:4] + k[-4:]\n", - " project[\"references\"].append({\"label\": k, \"url\": url})\n", + " project['references'].append(\n", + " {'label': k, 'url': url}\n", + " )\n", "\n", " try:\n", " client.projects.getProjectByName(pk=name, _fields=[\"name\"]).result()\n", @@ -296,7 +285,7 @@ "\n", " for i, row in tqdm(enumerate(df.iterrows()), total=df.shape[0]):\n", " entry = row[1]\n", - " contrib = {\"project\": name, \"is_public\": True}\n", + " contrib = {'project': name, 'is_public': True}\n", "\n", " if \"structure\" in entry.index:\n", " s = entry.loc[\"structure\"]\n", @@ -307,7 +296,7 @@ " else:\n", " c = entry[\"composition\"]\n", "\n", - " id_number = f\"{i + 1:0{id_n_zeros}d}\"\n", + " id_number = f\"{i+1:0{id_n_zeros}d}\"\n", " identifier = f\"mb-{ds['name']}-{id_number}\"\n", " contrib[\"identifier\"] = identifier\n", " contrib[\"data\"] = {target_map[target]: f\"{entry.loc[target]}{unit}\"}\n", @@ -316,7 +305,7 @@ "\n", " with open(fn, \"w\") as f:\n", " json.dump(contributions, f, cls=MontyEncoder)\n", - "\n", + " \n", " print(\"saved to\", fn)" ] }, diff --git a/mpcontribs-portal/supervisord/conf.py b/mpcontribs-portal/supervisord/conf.py index 7b2fd63336..4fb68a6d8e 100644 --- a/mpcontribs-portal/supervisord/conf.py +++ b/mpcontribs-portal/supervisord/conf.py @@ -15,7 +15,7 @@ "api_port": api_port, "portal_port": portal_port, "s3": s3, - "tm": tm.upper(), + "tm": tm.upper() } kwargs = { diff --git a/mpcontribs-portal/wsgi.py b/mpcontribs-portal/wsgi.py index 96ebc59a28..e314b76514 100644 --- a/mpcontribs-portal/wsgi.py +++ b/mpcontribs-portal/wsgi.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- import re import os +import ddtrace.auto import django_settings_file from django.core.wsgi import get_wsgi_application from whitenoise import WhiteNoise diff --git a/mpcontribs-serverless/make_download/app.py b/mpcontribs-serverless/make_download/app.py index f7031828a6..96f98401a7 100644 --- a/mpcontribs-serverless/make_download/app.py +++ b/mpcontribs-serverless/make_download/app.py @@ -1,5 +1,6 @@ # TODO ddtrace import os +import json import logging import boto3 @@ -10,19 +11,18 @@ logger = logging.getLogger() logger.setLevel(os.environ["MPCONTRIBS_CLIENT_LOG_LEVEL"]) -s3_client = boto3.client("s3") +s3_client = boto3.client('s3') timeout = int(os.environ["LAMBDA_TIMEOUT"]) redis_address = os.environ["REDIS_ADDRESS"] store = Redis.from_url(f"redis://{redis_address}") store.ping() - def get_remaining(event, context): - remaining = context.get_remaining_time_in_millis() / 1000.0 - 0.5 + remaining = context.get_remaining_time_in_millis() / 1000. - 0.5 if remaining < 3: raise ValueError("TIMEOUT in 3s!") - elapsed_pct = (timeout - remaining) / timeout * 100.0 + elapsed_pct = (timeout - remaining) / timeout * 100. store.set(event["redis_key"], f"{elapsed_pct:.1f}") return remaining @@ -34,7 +34,9 @@ def lambda_handler(event, context): bucket, filename, fmt, version = event["redis_key"].split(":") try: - client = Client(host=event["host"], headers=event["headers"], project=project) + client = Client( + host=event["host"], headers=event["headers"], project=project + ) remaining = get_remaining(event, context) tmpdir = Path("/tmp") outdir = tmpdir / filename @@ -47,11 +49,9 @@ def lambda_handler(event, context): zipfile = outdir.with_suffix(".zip") resp = zipfile.read_bytes() s3_client.put_object( - Bucket=bucket, - Key=f"{filename}_{fmt}.zip", + Bucket=bucket, Key=f"{filename}_{fmt}.zip", Metadata={"version": version}, - Body=resp, - ContentType="application/zip", + Body=resp, ContentType="application/zip" ) get_remaining(event, context) rmtree(outdir) From eecb71669d7e39c249b3c6492fc9d96b8e9f57fc Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 2 Jun 2026 02:27:05 +0000 Subject: [PATCH 370/591] upgrade dependencies for deployment --- mpcontribs-api/requirements/deployment.txt | 551 ++++++++++++++++++ mpcontribs-client/requirements/deployment.txt | 18 + .../requirements/deployment.txt | 24 + mpcontribs-portal/requirements/deployment.txt | 2 + 4 files changed, 595 insertions(+) create mode 100644 mpcontribs-api/requirements/deployment.txt diff --git a/mpcontribs-api/requirements/deployment.txt b/mpcontribs-api/requirements/deployment.txt new file mode 100644 index 0000000000..7056ece33a --- /dev/null +++ b/mpcontribs-api/requirements/deployment.txt @@ -0,0 +1,551 @@ +# +# This file is autogenerated by pip-compile with Python 3.11 +# by the following command: +# +# pip-compile --output-file=MPContribs/mpcontribs-api/requirements/deployment.txt MPContribs/mpcontribs-api/pyproject.toml python/requirements.txt +# +anyio==4.13.0 + # via jupyter-server +apispec==5.2.2 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +argon2-cffi==25.1.0 + # via + # jupyter-server + # notebook +argon2-cffi-bindings==25.1.0 + # via argon2-cffi +arrow==1.4.0 + # via isoduration +asn1crypto==1.5.1 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +asttokens==3.0.1 + # via stack-data +atlasq-tschaume==0.11.1.dev2 + # via flask-mongorest-mpcontribs +attrs==26.1.0 + # via + # jsonschema + # referencing +backports-zstd==1.5.0 + # via flask-compress +beautifulsoup4==4.14.3 + # via nbconvert +bibtexparser==1.4.4 + # via pymatgen-core +bleach[css]==6.3.0 + # via nbconvert +blinker==1.9.0 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +boltons==25.0.0 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +boto3==1.43.19 + # via flask-mongorest-mpcontribs +botocore==1.43.19 + # via + # boto3 + # s3transfer +brotli==1.2.0 + # via flask-compress +bytecode==0.17.0 + # via ddtrace +certifi==2026.5.20 + # via requests +cffi==2.0.0 + # via + # argon2-cffi-bindings + # cryptography +charset-normalizer==3.4.7 + # via requests +click==8.4.1 + # via + # flask + # rq +comm==0.2.3 + # via ipykernel +contourpy==1.3.3 + # via matplotlib +cramjam==2.11.0 + # via python-snappy +crontab==1.0.5 + # via rq-scheduler +cryptography==48.0.0 + # via pyopenssl +css-html-js-minify==2.5.5 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +cycler==0.12.1 + # via matplotlib +dateparser==1.4.0 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +ddtrace==4.3.0 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +debugpy==1.8.21 + # via ipykernel +decorator==5.3.1 + # via ipython +defusedxml==0.7.1 + # via nbconvert +dnspython==2.8.0 + # via + # mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) + # pymongo +entrypoints==0.4 + # via jupyter-client +envier==0.6.1 + # via ddtrace +executing==2.2.1 + # via stack-data +fastjsonschema==2.21.2 + # via nbformat +fastnumbers==5.1.1 + # via flask-mongorest-mpcontribs +filetype==1.2.0 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +flasgger-tschaume==0.9.7 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +flask==2.2.5 + # via + # flasgger-tschaume + # flask-compress + # flask-marshmallow + # flask-mongoengine-tschaume + # flask-rq2 + # flask-sse +flask-compress==1.24 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +flask-marshmallow==1.4.0 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +flask-mongoengine-tschaume==1.1.0 + # via flask-mongorest-mpcontribs +flask-mongorest-mpcontribs==3.3.0 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +flask-rq2==18.3 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +flask-sse==1.0.0 + # via flask-mongorest-mpcontribs +flatten-dict==0.5.0 + # via flask-mongorest-mpcontribs +flexcache==0.3 + # via pint +flexparser==0.4 + # via pint +fonttools==4.63.0 + # via matplotlib +fqdn==1.5.1 + # via jsonschema +freezegun==1.5.5 + # via rq-scheduler +gevent==26.5.0 + # via gunicorn +greenlet==3.5.1 + # via gevent +gunicorn[gevent]==24.1.1 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +idna==3.17 + # via + # anyio + # jsonschema + # requests +ipykernel==6.29.5 + # via + # nbclassic + # notebook +ipython==9.14.0 + # via ipykernel +ipython-genutils==0.2.0 + # via + # nbclassic + # notebook +ipython-pygments-lexers==1.1.1 + # via ipython +isoduration==20.11.0 + # via jsonschema +itsdangerous==2.2.0 + # via flask +jedi==0.20.0 + # via ipython +jinja2==3.1.6 + # via + # flask + # jupyter-server + # mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) + # nbconvert + # notebook +jmespath==1.1.0 + # via + # boto3 + # botocore +joblib==1.5.3 + # via pymatgen-core +json2html==1.3.0 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +jsonpointer==3.1.1 + # via jsonschema +jsonschema[format-nongpl]==4.26.0 + # via + # flasgger-tschaume + # jupyter-events + # nbformat +jsonschema-specifications==2025.9.1 + # via jsonschema +jupyter-client==7.4.9 + # via + # ipykernel + # jupyter-server + # nbclient + # notebook +jupyter-core==5.9.1 + # via + # ipykernel + # jupyter-client + # jupyter-server + # nbclient + # nbconvert + # nbformat + # notebook +jupyter-events==0.12.1 + # via jupyter-server +jupyter-server==2.19.0 + # via notebook-shim +jupyter-server-terminals==0.5.4 + # via jupyter-server +jupyterlab-pygments==0.3.0 + # via nbconvert +kiwisolver==1.5.0 + # via matplotlib +lark==1.3.1 + # via rfc3987-syntax +lxml==6.1.1 + # via pymatgen-core +markupsafe==3.0.3 + # via + # jinja2 + # nbconvert + # werkzeug +marshmallow==3.26.2 + # via + # flask-marshmallow + # marshmallow-mongoengine + # mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +marshmallow-mongoengine==0.31.2 + # via flask-mongorest-mpcontribs +matplotlib==3.10.9 + # via + # -r python/requirements.txt + # pymatgen-core +matplotlib-inline==0.2.2 + # via + # ipykernel + # ipython +mimerender-pr36==0.0.2 + # via flask-mongorest-mpcontribs +mistune==3.2.1 + # via + # flasgger-tschaume + # nbconvert +mongoengine==0.29.3 + # via + # atlasq-tschaume + # flask-mongoengine-tschaume + # marshmallow-mongoengine +monty==2026.5.18 + # via pymatgen-core +more-itertools==11.1.0 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +mpmath==1.3.0 + # via sympy +narwhals==2.22.0 + # via plotly +nbclassic==1.3.3 + # via notebook +nbclient==0.10.4 + # via nbconvert +nbconvert==7.17.1 + # via + # jupyter-server + # notebook +nbformat==5.10.4 + # via + # jupyter-server + # mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) + # nbclient + # nbconvert + # notebook +nest-asyncio==1.6.0 + # via + # ipykernel + # jupyter-client + # nbclassic + # notebook +networkx==3.6.1 + # via pymatgen-core +notebook==6.5.7 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +notebook-shim==0.2.4 + # via nbclassic +numpy==2.4.6 + # via + # -r python/requirements.txt + # contourpy + # matplotlib + # monty + # mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) + # pandas + # pymatgen-core + # scipy + # spglib +opentelemetry-api==1.42.1 + # via ddtrace +orjson==3.11.9 + # via + # flask-mongorest-mpcontribs + # pymatgen-core +overrides==7.7.0 + # via jupyter-server +packaging==26.2 + # via + # gunicorn + # ipykernel + # jupyter-events + # jupyter-server + # marshmallow + # matplotlib + # nbconvert + # plotly +palettable==3.3.3 + # via pymatgen-core +pandas==3.0.3 + # via + # -r python/requirements.txt + # pymatgen-core +pandocfilters==1.5.1 + # via nbconvert +parso==0.8.7 + # via jedi +pexpect==4.9.0 + # via ipython +pillow==12.2.0 + # via matplotlib +pint==0.25.3 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +platformdirs==4.10.0 + # via + # jupyter-core + # pint +plotly==6.7.0 + # via pymatgen-core +prometheus-client==0.25.0 + # via + # jupyter-server + # notebook +prompt-toolkit==3.0.52 + # via ipython +psutil==7.2.2 + # via + # ipykernel + # ipython +psycopg2-binary==2.9.12 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +ptyprocess==0.7.0 + # via + # pexpect + # terminado +pure-eval==0.2.3 + # via stack-data +pycparser==3.0 + # via cffi +pygments==2.20.0 + # via + # ipython + # ipython-pygments-lexers + # nbconvert +pymatgen==2026.5.4 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +pymatgen-core==2026.5.18 + # via pymatgen +pymongo==4.17.0 + # via + # flask-mongorest-mpcontribs + # mongoengine +pyopenssl==26.2.0 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +pyparsing==3.3.2 + # via + # bibtexparser + # matplotlib +python-dateutil==2.9.0.post0 + # via + # arrow + # botocore + # dateparser + # flask-mongorest-mpcontribs + # freezegun + # jupyter-client + # matplotlib + # pandas + # rq-scheduler +python-json-logger==4.1.0 + # via jupyter-events +python-mimeparse==2.0.0 + # via mimerender-pr36 +python-snappy==0.7.3 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +pytz==2026.2 + # via dateparser +pyyaml==6.0.3 + # via + # flasgger-tschaume + # jupyter-events +pyzmq==27.1.0 + # via + # ipykernel + # jupyter-client + # jupyter-server + # notebook +redis==8.0.0 + # via + # flask-rq2 + # flask-sse + # rq +referencing==0.37.0 + # via + # jsonschema + # jsonschema-specifications + # jupyter-events +regex==2026.5.9 + # via dateparser +requests==2.34.2 + # via + # atlasq-tschaume + # pymatgen-core +rfc3339-validator==0.1.4 + # via + # jsonschema + # jupyter-events +rfc3986-validator==0.1.1 + # via + # jsonschema + # jupyter-events +rfc3987-syntax==1.1.0 + # via jsonschema +rpds-py==2026.5.1 + # via + # jsonschema + # referencing +rq==2.3.2 + # via + # flask-rq2 + # mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) + # rq-scheduler +rq-scheduler==0.14.0 + # via flask-rq2 +ruamel-yaml==0.19.1 + # via monty +s3transfer==0.18.0 + # via boto3 +scipy==1.17.1 + # via + # -r python/requirements.txt + # pymatgen-core +send2trash==2.1.0 + # via + # jupyter-server + # notebook +setproctitle==1.3.7 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +six==1.17.0 + # via + # flasgger-tschaume + # flask-sse + # python-dateutil + # rfc3339-validator +soupsieve==2.8.4 + # via beautifulsoup4 +spglib==2.7.0 + # via pymatgen-core +stack-data==0.6.3 + # via ipython +supervisor==4.3.0 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +sympy==1.14.0 + # via pymatgen-core +tabulate==0.10.0 + # via pymatgen-core +terminado==0.18.1 + # via + # jupyter-server + # jupyter-server-terminals + # notebook +tinycss2==1.4.0 + # via bleach +tornado==6.5.6 + # via + # ipykernel + # jupyter-client + # jupyter-server + # notebook + # terminado +tqdm==4.67.3 + # via pymatgen-core +traitlets==5.15.0 + # via + # ipykernel + # ipython + # jupyter-client + # jupyter-core + # jupyter-events + # jupyter-server + # matplotlib-inline + # nbclient + # nbconvert + # nbformat + # notebook +typing-extensions==4.15.0 + # via + # anyio + # beautifulsoup4 + # flexcache + # flexparser + # ipython + # opentelemetry-api + # pint + # pyopenssl + # referencing + # spglib +tzdata==2026.2 + # via arrow +tzlocal==5.3.1 + # via dateparser +uncertainties==3.2.3 + # via + # mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) + # pymatgen-core +uri-template==1.3.0 + # via jsonschema +urllib3==2.7.0 + # via + # botocore + # requests +wcwidth==0.7.0 + # via prompt-toolkit +webcolors==25.10.0 + # via jsonschema +webencodings==0.5.1 + # via + # bleach + # tinycss2 +websocket-client==1.9.0 + # via + # jupyter-server + # mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +werkzeug==3.1.8 + # via + # flasgger-tschaume + # flask +wrapt==2.2.1 + # via ddtrace +zope-event==6.2 + # via gevent +zope-interface==8.5 + # via gevent +zstandard==0.25.0 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) diff --git a/mpcontribs-client/requirements/deployment.txt b/mpcontribs-client/requirements/deployment.txt index f19c9e1489..231613f00b 100644 --- a/mpcontribs-client/requirements/deployment.txt +++ b/mpcontribs-client/requirements/deployment.txt @@ -50,13 +50,25 @@ fonttools==4.63.0 # via matplotlib fqdn==1.5.1 # via jsonschema +<<<<<<< HEAD idna==3.18 +||||||| parent of 5ef6d1d6 (upgrade dependencies for deployment) +idna==3.16 +======= +idna==3.17 +>>>>>>> 5ef6d1d6 (upgrade dependencies for deployment) # via # jsonschema # requests importlib-resources==7.1.0 # via swagger-spec-validator +<<<<<<< HEAD ipython==9.14.1 +||||||| parent of 5ef6d1d6 (upgrade dependencies for deployment) +ipython==9.13.0 +======= +ipython==9.14.0 +>>>>>>> 5ef6d1d6 (upgrade dependencies for deployment) # via mpcontribs-client (MPContribs/mpcontribs-client/pyproject.toml) ipython-pygments-lexers==1.1.1 # via ipython @@ -100,7 +112,13 @@ msgpack==1.2.1 # via # bravado # bravado-core +<<<<<<< HEAD narwhals==2.22.1 +||||||| parent of 5ef6d1d6 (upgrade dependencies for deployment) +narwhals==2.21.2 +======= +narwhals==2.22.0 +>>>>>>> 5ef6d1d6 (upgrade dependencies for deployment) # via plotly networkx==3.6.1 # via pymatgen-core diff --git a/mpcontribs-kernel-gateway/requirements/deployment.txt b/mpcontribs-kernel-gateway/requirements/deployment.txt index 827d405953..e3a21ebecc 100644 --- a/mpcontribs-kernel-gateway/requirements/deployment.txt +++ b/mpcontribs-kernel-gateway/requirements/deployment.txt @@ -82,7 +82,13 @@ fonttools==4.63.0 # via matplotlib fqdn==1.5.1 # via jsonschema +<<<<<<< HEAD idna==3.18 +||||||| parent of 5ef6d1d6 (upgrade dependencies for deployment) +idna==3.16 +======= +idna==3.17 +>>>>>>> 5ef6d1d6 (upgrade dependencies for deployment) # via # anyio # jsonschema @@ -91,7 +97,13 @@ importlib-resources==7.1.0 # via swagger-spec-validator ipykernel==7.3.0 # via -r MPContribs/mpcontribs-kernel-gateway/requirements.in +<<<<<<< HEAD ipython==9.14.1 +||||||| parent of 5ef6d1d6 (upgrade dependencies for deployment) +ipython==9.13.0 +======= +ipython==9.14.0 +>>>>>>> 5ef6d1d6 (upgrade dependencies for deployment) # via # ipykernel # ipywidgets @@ -190,7 +202,13 @@ msgpack==1.2.1 # via # bravado # bravado-core +<<<<<<< HEAD narwhals==2.22.1 +||||||| parent of 5ef6d1d6 (upgrade dependencies for deployment) +narwhals==2.21.2 +======= +narwhals==2.22.0 +>>>>>>> 5ef6d1d6 (upgrade dependencies for deployment) # via plotly nbclient==0.11.0 # via nbconvert @@ -383,7 +401,13 @@ terminado==0.18.1 # jupyter-server-terminals tinycss2==1.5.1 # via bleach +<<<<<<< HEAD tornado==6.5.7 +||||||| parent of 5ef6d1d6 (upgrade dependencies for deployment) +tornado==6.5.5 +======= +tornado==6.5.6 +>>>>>>> 5ef6d1d6 (upgrade dependencies for deployment) # via # ipykernel # jupyter-client diff --git a/mpcontribs-portal/requirements/deployment.txt b/mpcontribs-portal/requirements/deployment.txt index 5b4666e896..f9295ed52c 100644 --- a/mpcontribs-portal/requirements/deployment.txt +++ b/mpcontribs-portal/requirements/deployment.txt @@ -25,8 +25,10 @@ boltons==25.0.0 # mpcontribs-client # mpcontribs-portal (MPContribs/mpcontribs-portal/pyproject.toml) boto3==1.43.30 +boto3==1.43.25 # via mpcontribs-portal (MPContribs/mpcontribs-portal/pyproject.toml) botocore==1.43.30 +botocore==1.43.25 # via # boto3 # s3transfer From 89b12dcfba881159d4dc2ccb50f8158d9bc6657a Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 4 Jun 2026 14:54:30 -0700 Subject: [PATCH 371/591] Infra changes for rewrite --- mpcontribs-api/Dockerfile | 2 +- mpcontribs-api/requirements/deployment.txt | 551 --------------------- 2 files changed, 1 insertion(+), 552 deletions(-) delete mode 100644 mpcontribs-api/requirements/deployment.txt diff --git a/mpcontribs-api/Dockerfile b/mpcontribs-api/Dockerfile index 2e755f13cc..2a90bcf658 100644 --- a/mpcontribs-api/Dockerfile +++ b/mpcontribs-api/Dockerfile @@ -6,7 +6,7 @@ WORKDIR /app FROM base AS builder RUN apt-get update && apt-get install -y --no-install-recommends gcc git g++ wget liblapack-dev && apt-get clean RUN pip install uv -COPY pyproject.toml uv.lock . +COPY pyproject.toml uv.lock ./ COPY src src ARG CONTRIBS_VERSION RUN SETUPTOOLS_SCM_PRETEND_VERSION=${CONTRIBS_VERSION} uv sync --frozen --no-dev diff --git a/mpcontribs-api/requirements/deployment.txt b/mpcontribs-api/requirements/deployment.txt deleted file mode 100644 index 7056ece33a..0000000000 --- a/mpcontribs-api/requirements/deployment.txt +++ /dev/null @@ -1,551 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.11 -# by the following command: -# -# pip-compile --output-file=MPContribs/mpcontribs-api/requirements/deployment.txt MPContribs/mpcontribs-api/pyproject.toml python/requirements.txt -# -anyio==4.13.0 - # via jupyter-server -apispec==5.2.2 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -argon2-cffi==25.1.0 - # via - # jupyter-server - # notebook -argon2-cffi-bindings==25.1.0 - # via argon2-cffi -arrow==1.4.0 - # via isoduration -asn1crypto==1.5.1 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -asttokens==3.0.1 - # via stack-data -atlasq-tschaume==0.11.1.dev2 - # via flask-mongorest-mpcontribs -attrs==26.1.0 - # via - # jsonschema - # referencing -backports-zstd==1.5.0 - # via flask-compress -beautifulsoup4==4.14.3 - # via nbconvert -bibtexparser==1.4.4 - # via pymatgen-core -bleach[css]==6.3.0 - # via nbconvert -blinker==1.9.0 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -boltons==25.0.0 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -boto3==1.43.19 - # via flask-mongorest-mpcontribs -botocore==1.43.19 - # via - # boto3 - # s3transfer -brotli==1.2.0 - # via flask-compress -bytecode==0.17.0 - # via ddtrace -certifi==2026.5.20 - # via requests -cffi==2.0.0 - # via - # argon2-cffi-bindings - # cryptography -charset-normalizer==3.4.7 - # via requests -click==8.4.1 - # via - # flask - # rq -comm==0.2.3 - # via ipykernel -contourpy==1.3.3 - # via matplotlib -cramjam==2.11.0 - # via python-snappy -crontab==1.0.5 - # via rq-scheduler -cryptography==48.0.0 - # via pyopenssl -css-html-js-minify==2.5.5 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -cycler==0.12.1 - # via matplotlib -dateparser==1.4.0 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -ddtrace==4.3.0 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -debugpy==1.8.21 - # via ipykernel -decorator==5.3.1 - # via ipython -defusedxml==0.7.1 - # via nbconvert -dnspython==2.8.0 - # via - # mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) - # pymongo -entrypoints==0.4 - # via jupyter-client -envier==0.6.1 - # via ddtrace -executing==2.2.1 - # via stack-data -fastjsonschema==2.21.2 - # via nbformat -fastnumbers==5.1.1 - # via flask-mongorest-mpcontribs -filetype==1.2.0 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -flasgger-tschaume==0.9.7 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -flask==2.2.5 - # via - # flasgger-tschaume - # flask-compress - # flask-marshmallow - # flask-mongoengine-tschaume - # flask-rq2 - # flask-sse -flask-compress==1.24 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -flask-marshmallow==1.4.0 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -flask-mongoengine-tschaume==1.1.0 - # via flask-mongorest-mpcontribs -flask-mongorest-mpcontribs==3.3.0 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -flask-rq2==18.3 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -flask-sse==1.0.0 - # via flask-mongorest-mpcontribs -flatten-dict==0.5.0 - # via flask-mongorest-mpcontribs -flexcache==0.3 - # via pint -flexparser==0.4 - # via pint -fonttools==4.63.0 - # via matplotlib -fqdn==1.5.1 - # via jsonschema -freezegun==1.5.5 - # via rq-scheduler -gevent==26.5.0 - # via gunicorn -greenlet==3.5.1 - # via gevent -gunicorn[gevent]==24.1.1 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -idna==3.17 - # via - # anyio - # jsonschema - # requests -ipykernel==6.29.5 - # via - # nbclassic - # notebook -ipython==9.14.0 - # via ipykernel -ipython-genutils==0.2.0 - # via - # nbclassic - # notebook -ipython-pygments-lexers==1.1.1 - # via ipython -isoduration==20.11.0 - # via jsonschema -itsdangerous==2.2.0 - # via flask -jedi==0.20.0 - # via ipython -jinja2==3.1.6 - # via - # flask - # jupyter-server - # mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) - # nbconvert - # notebook -jmespath==1.1.0 - # via - # boto3 - # botocore -joblib==1.5.3 - # via pymatgen-core -json2html==1.3.0 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -jsonpointer==3.1.1 - # via jsonschema -jsonschema[format-nongpl]==4.26.0 - # via - # flasgger-tschaume - # jupyter-events - # nbformat -jsonschema-specifications==2025.9.1 - # via jsonschema -jupyter-client==7.4.9 - # via - # ipykernel - # jupyter-server - # nbclient - # notebook -jupyter-core==5.9.1 - # via - # ipykernel - # jupyter-client - # jupyter-server - # nbclient - # nbconvert - # nbformat - # notebook -jupyter-events==0.12.1 - # via jupyter-server -jupyter-server==2.19.0 - # via notebook-shim -jupyter-server-terminals==0.5.4 - # via jupyter-server -jupyterlab-pygments==0.3.0 - # via nbconvert -kiwisolver==1.5.0 - # via matplotlib -lark==1.3.1 - # via rfc3987-syntax -lxml==6.1.1 - # via pymatgen-core -markupsafe==3.0.3 - # via - # jinja2 - # nbconvert - # werkzeug -marshmallow==3.26.2 - # via - # flask-marshmallow - # marshmallow-mongoengine - # mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -marshmallow-mongoengine==0.31.2 - # via flask-mongorest-mpcontribs -matplotlib==3.10.9 - # via - # -r python/requirements.txt - # pymatgen-core -matplotlib-inline==0.2.2 - # via - # ipykernel - # ipython -mimerender-pr36==0.0.2 - # via flask-mongorest-mpcontribs -mistune==3.2.1 - # via - # flasgger-tschaume - # nbconvert -mongoengine==0.29.3 - # via - # atlasq-tschaume - # flask-mongoengine-tschaume - # marshmallow-mongoengine -monty==2026.5.18 - # via pymatgen-core -more-itertools==11.1.0 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -mpmath==1.3.0 - # via sympy -narwhals==2.22.0 - # via plotly -nbclassic==1.3.3 - # via notebook -nbclient==0.10.4 - # via nbconvert -nbconvert==7.17.1 - # via - # jupyter-server - # notebook -nbformat==5.10.4 - # via - # jupyter-server - # mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) - # nbclient - # nbconvert - # notebook -nest-asyncio==1.6.0 - # via - # ipykernel - # jupyter-client - # nbclassic - # notebook -networkx==3.6.1 - # via pymatgen-core -notebook==6.5.7 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -notebook-shim==0.2.4 - # via nbclassic -numpy==2.4.6 - # via - # -r python/requirements.txt - # contourpy - # matplotlib - # monty - # mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) - # pandas - # pymatgen-core - # scipy - # spglib -opentelemetry-api==1.42.1 - # via ddtrace -orjson==3.11.9 - # via - # flask-mongorest-mpcontribs - # pymatgen-core -overrides==7.7.0 - # via jupyter-server -packaging==26.2 - # via - # gunicorn - # ipykernel - # jupyter-events - # jupyter-server - # marshmallow - # matplotlib - # nbconvert - # plotly -palettable==3.3.3 - # via pymatgen-core -pandas==3.0.3 - # via - # -r python/requirements.txt - # pymatgen-core -pandocfilters==1.5.1 - # via nbconvert -parso==0.8.7 - # via jedi -pexpect==4.9.0 - # via ipython -pillow==12.2.0 - # via matplotlib -pint==0.25.3 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -platformdirs==4.10.0 - # via - # jupyter-core - # pint -plotly==6.7.0 - # via pymatgen-core -prometheus-client==0.25.0 - # via - # jupyter-server - # notebook -prompt-toolkit==3.0.52 - # via ipython -psutil==7.2.2 - # via - # ipykernel - # ipython -psycopg2-binary==2.9.12 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -ptyprocess==0.7.0 - # via - # pexpect - # terminado -pure-eval==0.2.3 - # via stack-data -pycparser==3.0 - # via cffi -pygments==2.20.0 - # via - # ipython - # ipython-pygments-lexers - # nbconvert -pymatgen==2026.5.4 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -pymatgen-core==2026.5.18 - # via pymatgen -pymongo==4.17.0 - # via - # flask-mongorest-mpcontribs - # mongoengine -pyopenssl==26.2.0 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -pyparsing==3.3.2 - # via - # bibtexparser - # matplotlib -python-dateutil==2.9.0.post0 - # via - # arrow - # botocore - # dateparser - # flask-mongorest-mpcontribs - # freezegun - # jupyter-client - # matplotlib - # pandas - # rq-scheduler -python-json-logger==4.1.0 - # via jupyter-events -python-mimeparse==2.0.0 - # via mimerender-pr36 -python-snappy==0.7.3 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -pytz==2026.2 - # via dateparser -pyyaml==6.0.3 - # via - # flasgger-tschaume - # jupyter-events -pyzmq==27.1.0 - # via - # ipykernel - # jupyter-client - # jupyter-server - # notebook -redis==8.0.0 - # via - # flask-rq2 - # flask-sse - # rq -referencing==0.37.0 - # via - # jsonschema - # jsonschema-specifications - # jupyter-events -regex==2026.5.9 - # via dateparser -requests==2.34.2 - # via - # atlasq-tschaume - # pymatgen-core -rfc3339-validator==0.1.4 - # via - # jsonschema - # jupyter-events -rfc3986-validator==0.1.1 - # via - # jsonschema - # jupyter-events -rfc3987-syntax==1.1.0 - # via jsonschema -rpds-py==2026.5.1 - # via - # jsonschema - # referencing -rq==2.3.2 - # via - # flask-rq2 - # mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) - # rq-scheduler -rq-scheduler==0.14.0 - # via flask-rq2 -ruamel-yaml==0.19.1 - # via monty -s3transfer==0.18.0 - # via boto3 -scipy==1.17.1 - # via - # -r python/requirements.txt - # pymatgen-core -send2trash==2.1.0 - # via - # jupyter-server - # notebook -setproctitle==1.3.7 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -six==1.17.0 - # via - # flasgger-tschaume - # flask-sse - # python-dateutil - # rfc3339-validator -soupsieve==2.8.4 - # via beautifulsoup4 -spglib==2.7.0 - # via pymatgen-core -stack-data==0.6.3 - # via ipython -supervisor==4.3.0 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -sympy==1.14.0 - # via pymatgen-core -tabulate==0.10.0 - # via pymatgen-core -terminado==0.18.1 - # via - # jupyter-server - # jupyter-server-terminals - # notebook -tinycss2==1.4.0 - # via bleach -tornado==6.5.6 - # via - # ipykernel - # jupyter-client - # jupyter-server - # notebook - # terminado -tqdm==4.67.3 - # via pymatgen-core -traitlets==5.15.0 - # via - # ipykernel - # ipython - # jupyter-client - # jupyter-core - # jupyter-events - # jupyter-server - # matplotlib-inline - # nbclient - # nbconvert - # nbformat - # notebook -typing-extensions==4.15.0 - # via - # anyio - # beautifulsoup4 - # flexcache - # flexparser - # ipython - # opentelemetry-api - # pint - # pyopenssl - # referencing - # spglib -tzdata==2026.2 - # via arrow -tzlocal==5.3.1 - # via dateparser -uncertainties==3.2.3 - # via - # mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) - # pymatgen-core -uri-template==1.3.0 - # via jsonschema -urllib3==2.7.0 - # via - # botocore - # requests -wcwidth==0.7.0 - # via prompt-toolkit -webcolors==25.10.0 - # via jsonschema -webencodings==0.5.1 - # via - # bleach - # tinycss2 -websocket-client==1.9.0 - # via - # jupyter-server - # mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -werkzeug==3.1.8 - # via - # flasgger-tschaume - # flask -wrapt==2.2.1 - # via ddtrace -zope-event==6.2 - # via gevent -zope-interface==8.5 - # via gevent -zstandard==0.25.0 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) From ce1d7a25f4dcf55968f63047b774a44cfe10762b Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 17 Jun 2026 13:54:01 -0700 Subject: [PATCH 372/591] Stop tracking .claude/ directory --- .claude/worktrees/unify-component-service | 1 - 1 file changed, 1 deletion(-) delete mode 160000 .claude/worktrees/unify-component-service diff --git a/.claude/worktrees/unify-component-service b/.claude/worktrees/unify-component-service deleted file mode 160000 index 7d84eafaec..0000000000 --- a/.claude/worktrees/unify-component-service +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 7d84eafaec7223ee57b2b626f02815075a8dfc47 From b5803c704422c96318a48b282349a8c7faadc2be Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 17 Jun 2026 15:05:22 -0700 Subject: [PATCH 373/591] Revert changes to deployment of other submodules --- .../domains/_shared/repository.py | 2 +- mpcontribs-client/requirements/deployment.txt | 18 -------------- .../requirements/deployment.txt | 24 ------------------- mpcontribs-portal/requirements/deployment.txt | 2 ++ 4 files changed, 3 insertions(+), 43 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py index f194d4dd5c..4a1163b41b 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py @@ -281,7 +281,7 @@ async def download( # Check S3 for the cached file # TODO: Implement if not ignore_cache and self._s3_object_exists(bucket_name=bucket_name, key_name=key_name, s3=s3): - # Download from either presigned url or bytes + # Download from either presigned url pass # If not found in cache, build from MongoDB and save to cache diff --git a/mpcontribs-client/requirements/deployment.txt b/mpcontribs-client/requirements/deployment.txt index 231613f00b..f19c9e1489 100644 --- a/mpcontribs-client/requirements/deployment.txt +++ b/mpcontribs-client/requirements/deployment.txt @@ -50,25 +50,13 @@ fonttools==4.63.0 # via matplotlib fqdn==1.5.1 # via jsonschema -<<<<<<< HEAD idna==3.18 -||||||| parent of 5ef6d1d6 (upgrade dependencies for deployment) -idna==3.16 -======= -idna==3.17 ->>>>>>> 5ef6d1d6 (upgrade dependencies for deployment) # via # jsonschema # requests importlib-resources==7.1.0 # via swagger-spec-validator -<<<<<<< HEAD ipython==9.14.1 -||||||| parent of 5ef6d1d6 (upgrade dependencies for deployment) -ipython==9.13.0 -======= -ipython==9.14.0 ->>>>>>> 5ef6d1d6 (upgrade dependencies for deployment) # via mpcontribs-client (MPContribs/mpcontribs-client/pyproject.toml) ipython-pygments-lexers==1.1.1 # via ipython @@ -112,13 +100,7 @@ msgpack==1.2.1 # via # bravado # bravado-core -<<<<<<< HEAD narwhals==2.22.1 -||||||| parent of 5ef6d1d6 (upgrade dependencies for deployment) -narwhals==2.21.2 -======= -narwhals==2.22.0 ->>>>>>> 5ef6d1d6 (upgrade dependencies for deployment) # via plotly networkx==3.6.1 # via pymatgen-core diff --git a/mpcontribs-kernel-gateway/requirements/deployment.txt b/mpcontribs-kernel-gateway/requirements/deployment.txt index e3a21ebecc..827d405953 100644 --- a/mpcontribs-kernel-gateway/requirements/deployment.txt +++ b/mpcontribs-kernel-gateway/requirements/deployment.txt @@ -82,13 +82,7 @@ fonttools==4.63.0 # via matplotlib fqdn==1.5.1 # via jsonschema -<<<<<<< HEAD idna==3.18 -||||||| parent of 5ef6d1d6 (upgrade dependencies for deployment) -idna==3.16 -======= -idna==3.17 ->>>>>>> 5ef6d1d6 (upgrade dependencies for deployment) # via # anyio # jsonschema @@ -97,13 +91,7 @@ importlib-resources==7.1.0 # via swagger-spec-validator ipykernel==7.3.0 # via -r MPContribs/mpcontribs-kernel-gateway/requirements.in -<<<<<<< HEAD ipython==9.14.1 -||||||| parent of 5ef6d1d6 (upgrade dependencies for deployment) -ipython==9.13.0 -======= -ipython==9.14.0 ->>>>>>> 5ef6d1d6 (upgrade dependencies for deployment) # via # ipykernel # ipywidgets @@ -202,13 +190,7 @@ msgpack==1.2.1 # via # bravado # bravado-core -<<<<<<< HEAD narwhals==2.22.1 -||||||| parent of 5ef6d1d6 (upgrade dependencies for deployment) -narwhals==2.21.2 -======= -narwhals==2.22.0 ->>>>>>> 5ef6d1d6 (upgrade dependencies for deployment) # via plotly nbclient==0.11.0 # via nbconvert @@ -401,13 +383,7 @@ terminado==0.18.1 # jupyter-server-terminals tinycss2==1.5.1 # via bleach -<<<<<<< HEAD tornado==6.5.7 -||||||| parent of 5ef6d1d6 (upgrade dependencies for deployment) -tornado==6.5.5 -======= -tornado==6.5.6 ->>>>>>> 5ef6d1d6 (upgrade dependencies for deployment) # via # ipykernel # jupyter-client diff --git a/mpcontribs-portal/requirements/deployment.txt b/mpcontribs-portal/requirements/deployment.txt index f9295ed52c..b7ddd80be8 100644 --- a/mpcontribs-portal/requirements/deployment.txt +++ b/mpcontribs-portal/requirements/deployment.txt @@ -25,9 +25,11 @@ boltons==25.0.0 # mpcontribs-client # mpcontribs-portal (MPContribs/mpcontribs-portal/pyproject.toml) boto3==1.43.30 +||||||| parent of 24d7b5d6 (Revert changes to deployment of other submodules) boto3==1.43.25 # via mpcontribs-portal (MPContribs/mpcontribs-portal/pyproject.toml) botocore==1.43.30 +||||||| parent of 24d7b5d6 (Revert changes to deployment of other submodules) botocore==1.43.25 # via # boto3 From 82df4e70a2551f1c88e7e6846ae1d5a5c7719b0c Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 17 Jun 2026 17:10:31 -0700 Subject: [PATCH 374/591] Switched to standard docker image. Allows decoupling python versions across our stack easily, but loses centralization. We only had light centralization, but future efforts would not be immediately shared --- mpcontribs-api/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mpcontribs-api/Dockerfile b/mpcontribs-api/Dockerfile index 2a90bcf658..d8dec40b4f 100644 --- a/mpcontribs-api/Dockerfile +++ b/mpcontribs-api/Dockerfile @@ -1,5 +1,5 @@ -# NOTE: base image must be updated to Python 3.14 to satisfy requires-python in pyproject.toml -FROM materialsproject/devops:python-3.1113.4 AS base +# FROM materialsproject/devops:python-3.1113.4 AS base +FROM python:3.14-slim AS base RUN apt-get update && apt-get install -y --no-install-recommends supervisor libopenblas-dev vim && apt-get clean WORKDIR /app From 753b2339fbd13c1d8d02875f5c8887bebc9d1389 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 18 Jun 2026 10:15:40 -0700 Subject: [PATCH 375/591] Improved OTel instrumentation. Removed ddtrace references --- mpcontribs-api/Dockerfile | 11 ++- mpcontribs-api/scripts/start.sh | 6 +- mpcontribs-api/src/mpcontribs_api/app.py | 6 +- mpcontribs-api/src/mpcontribs_api/config.py | 33 +++++++++ .../domains/_shared/components.py | 2 +- .../domains/healthcheck/router.py | 2 +- mpcontribs-api/src/mpcontribs_api/logging.py | 68 ++++++++++++++++++- .../src/mpcontribs_api/middleware.py | 66 ++++++++++++++++++ mpcontribs-api/supervisord/conf.py | 3 +- .../supervisord/supervisord.conf.jinja | 7 +- mpcontribs-api/tests/conftest.py | 2 + 11 files changed, 184 insertions(+), 22 deletions(-) diff --git a/mpcontribs-api/Dockerfile b/mpcontribs-api/Dockerfile index d8dec40b4f..a7b12daba8 100644 --- a/mpcontribs-api/Dockerfile +++ b/mpcontribs-api/Dockerfile @@ -29,14 +29,11 @@ COPY docker-entrypoint.sh . RUN chmod +x main.py scripts/start.sh docker-entrypoint.sh ARG VERSION -ENV PATH="/app/.venv/bin:$PATH" \ - DD_SERVICE=contribs-apis \ - DD_ENV=prod \ - DD_VERSION=$VERSION \ - DD_TRACE_HOST=localhost:8126 \ - DD_MAIN_PACKAGE=mpcontribs-api +# Telemetry (traces/metrics/logs) is emitted via OTLP to the Datadog Agent's OTLP receiver; the +# endpoint and other OTEL settings are configured per-environment in supervisord.conf.jinja +# (MPCONTRIBS_OTEL__*). No Datadog-specific app config lives here. +ENV PATH="/app/.venv/bin:$PATH" -LABEL com.datadoghq.ad.logs='[{"source": "uvicorn", "service": "contribs-apis"}]' EXPOSE 10000 10002 10003 10005 20000 ENTRYPOINT ["/app/docker-entrypoint.sh"] CMD ["/usr/bin/supervisord", "-c", "supervisord.conf"] diff --git a/mpcontribs-api/scripts/start.sh b/mpcontribs-api/scripts/start.sh index 59eefed59c..631f570149 100755 --- a/mpcontribs-api/scripts/start.sh +++ b/mpcontribs-api/scripts/start.sh @@ -10,8 +10,6 @@ PMGRC=$HOME/.pmgrc.yaml set -x -if [[ -n "$DD_TRACE_HOST" ]]; then - wait-for-it.sh "$DD_TRACE_HOST" -q -s -t 10 || echo "WARNING: datadog agent unreachable" -fi - +# No wait for the OTLP collector: the OTEL batch processors tolerate an unavailable endpoint +# (they retry and drop), so startup must not block on it. exec uvicorn mpcontribs_api.app:app --host 0.0.0.0 --port "$API_PORT" diff --git a/mpcontribs-api/src/mpcontribs_api/app.py b/mpcontribs-api/src/mpcontribs_api/app.py index 6c7aaee09b..2fd4c80fa6 100644 --- a/mpcontribs-api/src/mpcontribs_api/app.py +++ b/mpcontribs-api/src/mpcontribs_api/app.py @@ -23,7 +23,7 @@ from mpcontribs_api.domains.tables.models import Table from mpcontribs_api.exceptions import register_exception_handlers from mpcontribs_api.logging import configure_logging, get_logger -from mpcontribs_api.middleware import RequestContextMiddleware +from mpcontribs_api.middleware import RequestContextMiddleware, configure_tracing, instrument_app logger = get_logger(__name__) @@ -94,6 +94,8 @@ async def lifespan(app: FastAPI) -> AsyncGenerator[None]: def create_app(settings: Settings | None = None) -> FastAPI: settings = settings or get_settings() + # Register OTEL providers before logging so the logs pipeline attaches to live telemetry. + configure_tracing(settings) configure_logging(settings) app = FastAPI( @@ -115,6 +117,8 @@ def create_app(settings: Settings | None = None) -> FastAPI: # Add request context to the logger app.add_middleware(RequestContextMiddleware) + # Emit server-side request spans/metrics (no-op when telemetry is disabled). + instrument_app(app, settings) register_exception_handlers(app) app.include_router(healthcheck_router, prefix="/health") app.include_router(v1_router, prefix="/api/v1") diff --git a/mpcontribs-api/src/mpcontribs_api/config.py b/mpcontribs-api/src/mpcontribs_api/config.py index 780a75cb94..61f9f6cebf 100644 --- a/mpcontribs-api/src/mpcontribs_api/config.py +++ b/mpcontribs-api/src/mpcontribs_api/config.py @@ -10,6 +10,36 @@ class RedisSettings(BaseModel): url: SecretStr +class ObservabilitySettings(BaseModel): + """OpenTelemetry settings. + + The application is vendor-neutral: it emits traces, metrics, and logs via OTLP/gRPC to a + collector (in our deployment, the Datadog Agent's OTLP receiver). Datadog is purely the backend. + """ + + enabled: bool = Field( + default=True, + description="Master switch for OTEL setup. Disable in tests/local runs without a collector.", + ) + service_name: str = Field( + default="contribs-apis", + description="Value of the service.name resource attribute. Kept as the legacy Datadog " + "service name so existing dashboards and monitors keep resolving.", + ) + otlp_endpoint: str = Field( + default="localhost:4317", + description="host:port of the OTLP/gRPC receiver (the Datadog Agent's OTLP endpoint).", + ) + insecure: bool = Field( + default=True, + description="Use an insecure (plaintext) gRPC channel. True for a local/sidecar agent without TLS.", + ) + metric_export_interval_ms: int = Field( + default=60_000, + description="How often (ms) the periodic metric reader exports to the collector.", + ) + + class AwsSettings(BaseModel): """AWS Settings @@ -137,6 +167,9 @@ class Settings(BaseSettings): # MPContribs_redis__* redis: RedisSettings + # MPContribs_otel__* + otel: ObservabilitySettings = Field(default_factory=ObservabilitySettings) + # SMTP Settings mail_default_sender: str = Field( description="SMTP Server to send out notifications on new projects and other important moments" diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py index cf13c22579..a7a25d1cbe 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py @@ -17,7 +17,7 @@ class MongoDbComponentsRepository[ TDoc: Component, TIn: Component, TOut: DocumentOut, - TFilter: Filter, # not FilterDepends — see below + TFilter: Filter, TPatch: BaseModel, ](MongoDbRepository[TDoc, TIn, TOut, TFilter, TPatch]): @staticmethod diff --git a/mpcontribs-api/src/mpcontribs_api/domains/healthcheck/router.py b/mpcontribs-api/src/mpcontribs_api/domains/healthcheck/router.py index e099971ab6..88abea6a91 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/healthcheck/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/healthcheck/router.py @@ -28,7 +28,7 @@ async def healthcheck(db: DbDep, s3_client: S3Dep) -> HealthStatus: try: await s3_client.head_bucket(Bucket=settings.aws.health_bucket) - except (ClientError, BotoCoreError): + except ClientError, BotoCoreError: raise HTTPException( status_code=status.HTTP_503_SERVICE_UNAVAILABLE, detail={"status": "unhealthy", "s3": "unreachable"}, diff --git a/mpcontribs-api/src/mpcontribs_api/logging.py b/mpcontribs-api/src/mpcontribs_api/logging.py index ef7f6e6fb8..2c741c5b03 100644 --- a/mpcontribs-api/src/mpcontribs_api/logging.py +++ b/mpcontribs-api/src/mpcontribs_api/logging.py @@ -3,9 +3,30 @@ import structlog from opentelemetry import trace +from opentelemetry._logs import set_logger_provider +from opentelemetry.exporter.otlp.proto.grpc._log_exporter import OTLPLogExporter +from opentelemetry.sdk._logs import LoggerProvider, LoggingHandler +from opentelemetry.sdk._logs.export import BatchLogRecordProcessor +from opentelemetry.sdk.resources import Resource from mpcontribs_api.config import Settings +# Held across calls so repeated configure_logging() (tests, reloads) reuses one provider rather than +# re-registering. Shared with middleware.py, which builds the tracer/meter providers from the same +# resource so all three signals carry identical service identity. +_logger_provider: LoggerProvider | None = None + + +def build_resource(settings: Settings) -> Resource: + """OTEL resource describing this service. Single source of truth for traces, metrics, and logs.""" + return Resource.create( + { + "service.name": settings.otel.service_name, + "service.version": settings.version, + "deployment.environment": settings.environment, + } + ) + def add_otel_trace_context(_, __, event_dict): span = trace.get_current_span() @@ -20,6 +41,44 @@ def add_otel_trace_context(_, __, event_dict): return event_dict +def _build_otlp_log_handler(settings: Settings, log_level: int, shared_processors: list) -> LoggingHandler | None: + """Build a stdlib handler that ships records to the OTLP logs pipeline (the Datadog Agent's OTLP + receiver), or ``None`` when telemetry is disabled. + + The record body is the structlog event rendered to JSON; the SDK stamps each record with the + active span's trace/span ids, so logs correlate with traces. + """ + global _logger_provider + if not settings.otel.enabled: + return None + + if _logger_provider is None: + _logger_provider = LoggerProvider(resource=build_resource(settings)) + _logger_provider.add_log_record_processor( + BatchLogRecordProcessor( + OTLPLogExporter(endpoint=settings.otel.otlp_endpoint, insecure=settings.otel.insecure) + ) + ) + set_logger_provider(_logger_provider) + + handler = LoggingHandler(level=log_level, logger_provider=_logger_provider) + # ProcessorFormatter renders the event dict to a JSON string, which LoggingHandler uses as the + # log body (it calls self.format() when a formatter is set). Always JSON regardless of + # environment - the OTLP body should be structured even when stdout is the dev console renderer. + handler.setFormatter( + structlog.stdlib.ProcessorFormatter( + foreign_pre_chain=shared_processors, + processors=[ + structlog.stdlib.ProcessorFormatter.remove_processors_meta, + structlog.processors.dict_tracebacks, + structlog.processors.EventRenamer("message"), + structlog.processors.JSONRenderer(), + ], + ) + ) + return handler + + def configure_logging(settings: Settings) -> None: is_prod = settings.environment == "prod" log_level = logging.INFO if is_prod else logging.DEBUG @@ -62,8 +121,15 @@ def configure_logging(settings: Settings) -> None: handler = logging.StreamHandler(sys.stdout) handler.setFormatter(formatter) + # stdout stays for kubectl logs/ebugging; the OTLP handler (when enabled) ships the same + # records to the collector, so Datadog ingests via OTLP rather than tailing stdout. + handlers: list[logging.Handler] = [handler] + otlp_handler = _build_otlp_log_handler(settings, log_level, shared_processors) + if otlp_handler is not None: + handlers.append(otlp_handler) + root = logging.getLogger() - root.handlers = [handler] + root.handlers = handlers root.setLevel(log_level) # Let uvicorn's loggers flow through the root handler instead of their own. diff --git a/mpcontribs-api/src/mpcontribs_api/middleware.py b/mpcontribs-api/src/mpcontribs_api/middleware.py index c6fa240125..a313b6545c 100644 --- a/mpcontribs-api/src/mpcontribs_api/middleware.py +++ b/mpcontribs-api/src/mpcontribs_api/middleware.py @@ -1,9 +1,30 @@ +from __future__ import annotations + import uuid from collections.abc import Iterable +from typing import TYPE_CHECKING import structlog +from opentelemetry import metrics, trace +from opentelemetry.exporter.otlp.proto.grpc.metric_exporter import OTLPMetricExporter +from opentelemetry.exporter.otlp.proto.grpc.trace_exporter import OTLPSpanExporter +from opentelemetry.instrumentation.pymongo import PymongoInstrumentor +from opentelemetry.sdk.metrics import MeterProvider +from opentelemetry.sdk.metrics.export import PeriodicExportingMetricReader +from opentelemetry.sdk.trace import TracerProvider +from opentelemetry.sdk.trace.export import BatchSpanProcessor from starlette.types import ASGIApp, Receive, Scope, Send +from mpcontribs_api.config import Settings +from mpcontribs_api.logging import build_resource + +if TYPE_CHECKING: + from fastapi import FastAPI + +# Guards repeated configure_tracing() (tests, reloads) from re-registering providers or +# double-instrumenting pymongo. +_configured = False + # Lowercased ASGI byte header name -> structlog context key. _LOGGED_HEADERS: dict[bytes, str] = { b"user-agent": "user_agent", @@ -36,6 +57,10 @@ async def __call__(self, scope: Scope, receive: Receive, send: Send) -> None: "method": scope["method"], "path": scope["path"], } + # Kong-resolved consumer identity for log correlation + raw_consumer_id = headers.get(b"x-consumer-id") + if raw_consumer_id is not None: + context["consumer_id"] = raw_consumer_id.decode() for header_name, log_key in _LOGGED_HEADERS.items(): value = headers.get(header_name) if value is not None: @@ -45,3 +70,44 @@ async def __call__(self, scope: Scope, receive: Receive, send: Send) -> None: structlog.contextvars.bind_contextvars(**context) await self.app(scope, receive, send) + + +def configure_tracing(settings: Settings) -> None: + """Register the global tracer and meter providers, exporting via OTLP/gRPC to the collector. + + Covers the request-scoped signals: ``instrument_app`` (below) emits server spans and + ``http.server`` metrics through these providers, and pymongo spans cover the DB layer. No-op when + telemetry is disabled or already configured. + """ + global _configured + if _configured or not settings.otel.enabled: + return + + resource = build_resource(settings) + endpoint = settings.otel.otlp_endpoint + insecure = settings.otel.insecure + + tracer_provider = TracerProvider(resource=resource) + tracer_provider.add_span_processor(BatchSpanProcessor(OTLPSpanExporter(endpoint=endpoint, insecure=insecure))) + trace.set_tracer_provider(tracer_provider) + + metric_reader = PeriodicExportingMetricReader( + OTLPMetricExporter(endpoint=endpoint, insecure=insecure), + export_interval_millis=settings.otel.metric_export_interval_ms, + ) + metrics.set_meter_provider(MeterProvider(resource=resource, metric_readers=[metric_reader])) + + # Registers a pymongo command listener, so DB spans cover the async client used by Beanie too. + PymongoInstrumentor().instrument() + + _configured = True + + +def instrument_app(app: FastAPI, settings: Settings) -> None: + """Instrument the FastAPI app for server-side request spans/metrics. No-op when disabled.""" + if not settings.otel.enabled: + return + # Imported lazily: pulls in the ASGI instrumentation, only needed when enabled. + from opentelemetry.instrumentation.fastapi import FastAPIInstrumentor + + FastAPIInstrumentor.instrument_app(app) diff --git a/mpcontribs-api/supervisord/conf.py b/mpcontribs-api/supervisord/conf.py index 3e1c5d128f..1f5bdd5bf7 100644 --- a/mpcontribs-api/supervisord/conf.py +++ b/mpcontribs-api/supervisord/conf.py @@ -30,7 +30,8 @@ "node_env": "production" if PRODUCTION else "development", "flask_log_level": "INFO" if PRODUCTION else "DEBUG", "jupyter_gateway_host": f"localhost:{KG_PORT}" if PRODUCTION else f"kernel-gateway:{KG_PORT}", - "dd_agent_host": "localhost" if PRODUCTION else "datadog", + # OTLP/gRPC receiver: the Datadog Agent sidecar in prod, the "datadog" compose service in dev. + "otel_endpoint": "localhost:4317" if PRODUCTION else "datadog:4317", "mpcontribs_api_host": "localhost" if PRODUCTION else "contribs-apis", } kwargs["flask_debug"] = kwargs["node_env"] == "development" diff --git a/mpcontribs-api/supervisord/supervisord.conf.jinja b/mpcontribs-api/supervisord/supervisord.conf.jinja index 320d7493ec..e02ba99515 100644 --- a/mpcontribs-api/supervisord/supervisord.conf.jinja +++ b/mpcontribs-api/supervisord/supervisord.conf.jinja @@ -14,9 +14,6 @@ environment= AWS_REGION="us-east-1", AWS_DEFAULT_REGION="us-east-1", MAIL_DEFAULT_SENDER="contribs@materialsproject.org", - DD_PROFILING_ENABLED="false", - DD_PROFILING_STACK_V2_ENABLED="false", - DD_LOGS_INJECTION="true", FLASK_APP="mpcontribs.api", PYTHONUNBUFFERED=1, MAX_REQUESTS=0, @@ -26,11 +23,9 @@ environment= NODE_ENV="{{ node_env }}", FLASK_DEBUG="{{ flask_debug }}", FLASK_LOG_LEVEL="{{ flask_log_level }}", - DD_LOG_LEVEL="{{ flask_log_level }}", JUPYTER_GATEWAY_URL="{{ jupyter_gateway_url }}", JUPYTER_GATEWAY_HOST="{{ jupyter_gateway_host }}", - DD_AGENT_HOST="{{ dd_agent_host }}", - DD_TRACE_SAMPLE_RATE="1", + MPCONTRIBS_OTEL__OTLP_ENDPOINT="{{ otel_endpoint }}", TINI_SUBREAPER="true" [program:main] diff --git a/mpcontribs-api/tests/conftest.py b/mpcontribs-api/tests/conftest.py index 80d67d3f56..617139b131 100644 --- a/mpcontribs-api/tests/conftest.py +++ b/mpcontribs-api/tests/conftest.py @@ -14,3 +14,5 @@ os.environ.setdefault("MPCONTRIBS_REDIS__URL", "redis://localhost:6379") os.environ.setdefault("MPCONTRIBS_MAIL_DEFAULT_SENDER", "test@example.com") os.environ.setdefault("MPCONTRIBS_VERSION", "0.0.0-test") +# No OTLP collector in tests: keep telemetry off so the suite doesn't register providers or export. +os.environ.setdefault("MPCONTRIBS_OTEL__ENABLED", "false") From 52f3e553df4f352c6cceec3ae194a159702de09e Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 18 Jun 2026 10:57:54 -0700 Subject: [PATCH 376/591] Fixed uv build wheel building from old directory style --- mpcontribs-api/pyproject.toml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/mpcontribs-api/pyproject.toml b/mpcontribs-api/pyproject.toml index 6366b03a84..1849dbfb4e 100644 --- a/mpcontribs-api/pyproject.toml +++ b/mpcontribs-api/pyproject.toml @@ -10,9 +10,8 @@ relative_to = "__file__" include-package-data = true [tool.setuptools.packages.find] -where = ["."] -exclude = ["scripts","supervisord"] -include = ["mpcontribs.api"] +where = ["src"] +include = ["mpcontribs.api*"] [project] name = "mpcontribs-api" From a3759d6c298155d5a05074818ddcb0a87a22c32a Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 18 Jun 2026 12:15:28 -0700 Subject: [PATCH 377/591] Added dependencies to routes that require users to be logged in --- .../build/lib/mpcontribs_api/api/v1/router.py | 15 +++ .../domains/attachments/router.py | 77 +++++++++++ .../domains/contributions/router.py | 117 +++++++++++++++++ .../domains/healthcheck/router.py | 37 ++++++ .../mpcontribs_api/domains/projects/router.py | 121 ++++++++++++++++++ .../domains/structures/router.py | 95 ++++++++++++++ .../mpcontribs_api/domains/tables/router.py | 95 ++++++++++++++ .../domains/attachments/router.py | 6 +- .../domains/contributions/router.py | 16 +-- .../domains/healthcheck/router.py | 2 +- .../mpcontribs_api/domains/projects/router.py | 7 +- .../domains/structures/router.py | 10 +- .../mpcontribs_api/domains/tables/router.py | 10 +- 13 files changed, 583 insertions(+), 25 deletions(-) create mode 100644 mpcontribs-api/build/lib/mpcontribs_api/api/v1/router.py create mode 100644 mpcontribs-api/build/lib/mpcontribs_api/domains/attachments/router.py create mode 100644 mpcontribs-api/build/lib/mpcontribs_api/domains/contributions/router.py create mode 100644 mpcontribs-api/build/lib/mpcontribs_api/domains/healthcheck/router.py create mode 100644 mpcontribs-api/build/lib/mpcontribs_api/domains/projects/router.py create mode 100644 mpcontribs-api/build/lib/mpcontribs_api/domains/structures/router.py create mode 100644 mpcontribs-api/build/lib/mpcontribs_api/domains/tables/router.py diff --git a/mpcontribs-api/build/lib/mpcontribs_api/api/v1/router.py b/mpcontribs-api/build/lib/mpcontribs_api/api/v1/router.py new file mode 100644 index 0000000000..13dab175ce --- /dev/null +++ b/mpcontribs-api/build/lib/mpcontribs_api/api/v1/router.py @@ -0,0 +1,15 @@ +from fastapi import APIRouter + +from mpcontribs_api.domains.attachments.router import router as attachments_router +from mpcontribs_api.domains.contributions.router import router as contributions_router +from mpcontribs_api.domains.projects.router import router as projects_router +from mpcontribs_api.domains.structures.router import router as structures_router +from mpcontribs_api.domains.tables.router import router as tables_router + +router = APIRouter() + +router.include_router(attachments_router, prefix="/attachments", tags=["attachments"]) +router.include_router(contributions_router, prefix="/contributions", tags=["contributions"]) +router.include_router(projects_router, prefix="/projects", tags=["projects"]) +router.include_router(structures_router, prefix="/structures", tags=["structures"]) +router.include_router(tables_router, prefix="/tables", tags=["tables"]) diff --git a/mpcontribs-api/build/lib/mpcontribs_api/domains/attachments/router.py b/mpcontribs-api/build/lib/mpcontribs_api/domains/attachments/router.py new file mode 100644 index 0000000000..49e2c076b4 --- /dev/null +++ b/mpcontribs-api/build/lib/mpcontribs_api/domains/attachments/router.py @@ -0,0 +1,77 @@ +from typing import Annotated + +from fastapi import APIRouter, Depends +from fastapi.responses import StreamingResponse +from fastapi_filter import FilterDepends + +from mpcontribs_api.dependencies import S3Dep, require_user +from mpcontribs_api.domains._shared.models import ComponentDeleteResponse +from mpcontribs_api.domains._shared.types import ( + DownloadFormat, + FieldSelector, + ShortMimeFormat, + download_filename, +) +from mpcontribs_api.domains.attachments.dependencies import AttachmentServiceDep +from mpcontribs_api.domains.attachments.models import AttachmentFilter, AttachmentOut +from mpcontribs_api.pagination import CursorParams, Page + +router = APIRouter() + + +@router.get("", response_model=Page[AttachmentOut]) +async def get_attachments( + service: AttachmentServiceDep, + pagination: Annotated[CursorParams, Depends()], + filter: AttachmentFilter = FilterDepends(AttachmentFilter), + fields: FieldSelector = AttachmentOut.default_fields(), +): + selected = AttachmentOut.parse_fields(fields) + return await service.get_many(filter=filter, fields=selected, pagination=pagination) + + +@router.get("/{pk}", response_model=AttachmentOut) +async def get_attachment( + service: AttachmentServiceDep, + pk: str, + fields: FieldSelector = AttachmentOut.default_fields(), +): + selected = AttachmentOut.parse_fields(fields) + return await service.get_by_id(id=pk, fields=selected) + + +@router.get("/download/{short_mime}") +async def download_attachment( + service: AttachmentServiceDep, + format: DownloadFormat, + s3: S3Dep, + short_mime: ShortMimeFormat = ShortMimeFormat.GZ, + ignore_cache: bool = False, + filter: AttachmentFilter = FilterDepends(AttachmentFilter), + fields: FieldSelector = AttachmentOut.default_fields(), +) -> StreamingResponse: + selected = AttachmentOut.parse_fields(fields) + body = await service.download( + format=format, + short_mime=short_mime, + ignore_cache=ignore_cache, + filter=filter, + fields=selected, + s3=s3, + ) + filename = download_filename("attachments", format, short_mime) + return StreamingResponse( + body, + media_type="application/gzip", + headers={"Content-Disposition": f'attachment; filename="{filename}"'}, + ) + + +@router.delete("", response_model=ComponentDeleteResponse, dependencies=[Depends(require_user)]) +async def delete_attachments(service: AttachmentServiceDep, filter: AttachmentFilter = FilterDepends(AttachmentFilter)): + return await service.delete(filter=filter) + + +@router.delete("/{id}", response_model=ComponentDeleteResponse, dependencies=[Depends(require_user)]) +async def delete_attachment_by_id(service: AttachmentServiceDep, id: str): + return await service.delete_by_id(id=id) diff --git a/mpcontribs-api/build/lib/mpcontribs_api/domains/contributions/router.py b/mpcontribs-api/build/lib/mpcontribs_api/domains/contributions/router.py new file mode 100644 index 0000000000..cd01cbd825 --- /dev/null +++ b/mpcontribs-api/build/lib/mpcontribs_api/domains/contributions/router.py @@ -0,0 +1,117 @@ +from typing import Annotated + +from fastapi import APIRouter, Depends +from fastapi.responses import StreamingResponse +from fastapi_filter import FilterDepends + +from mpcontribs_api.dependencies import S3Dep, require_user +from mpcontribs_api.domains._shared.bulk import BulkWriteSummary +from mpcontribs_api.domains._shared.types import ( + DownloadFormat, + FieldSelector, + ShortMimeFormat, + download_filename, +) +from mpcontribs_api.domains.contributions.dependencies import ContributionDep, ContributionServiceDep +from mpcontribs_api.domains.contributions.models import ( + Contribution, + ContributionFilter, + ContributionIn, + ContributionOut, + ContributionPatch, +) +from mpcontribs_api.pagination import CursorParams + +router = APIRouter() + + +@router.get("") +async def get_contributions( + repo: ContributionDep, + pagination: Annotated[CursorParams, Depends()], + filter: ContributionFilter = FilterDepends(ContributionFilter), + fields: FieldSelector = ContributionOut.default_fields(), +): + selected = ContributionOut.parse_fields(fields) + return await repo.get_contributions(pagination=pagination, filter=filter, fields=selected) + + +@router.delete("", dependencies=[Depends(require_user)]) +async def delete_contributions( + repo: ContributionDep, + filter: ContributionFilter = FilterDepends(ContributionFilter), +): + return await repo.delete_contributions(filter=filter) + + +# TODO: Might want to take contributions in from request body and run model_validate_json on it (much faster) +@router.post("", response_model=BulkWriteSummary[Contribution], dependencies=[Depends(require_user)]) +async def insert_contributions( + service: ContributionServiceDep, + contributions: list[ContributionIn], +): + return await service.insert_contributions(contributions=contributions) + + +@router.put("", dependencies=[Depends(require_user)]) +async def upsert_contributions( + service: ContributionServiceDep, + contributions: list[ContributionIn], +): + return await service.upsert_contributions(contributions=contributions) + + +@router.get("/download/{short_mime}") +async def download_contributions( + repo: ContributionDep, + s3: S3Dep, + short_mime: ShortMimeFormat = ShortMimeFormat.GZ, + format: DownloadFormat = DownloadFormat.JSONL, + ignore_cache: bool = False, + filter: ContributionFilter = FilterDepends(ContributionFilter), + fields: FieldSelector = ContributionOut.default_fields(), +): + selected = ContributionOut.parse_fields(fields) + body = await repo.download_contributions( + format=format, + short_mime=short_mime, + ignore_cache=ignore_cache, + filter=filter, + fields=selected, + s3=s3, + key_name="", # TODO: Temp + ) + filename = download_filename("contributions", format, short_mime) + return StreamingResponse( + body, + media_type="application/gzip", + headers={"Content-Disposition": f'attachment; filename="{filename}"'}, + ) + + +@router.delete("/{id}", dependencies=[Depends(require_user)]) +async def delete_contribution_by_id( + service: ContributionServiceDep, + id: str, +): + return await service.delete_contributions(ContributionFilter.model_validate({"id": id})) + + +@router.get("/{id}") +async def get_contribution_by_id( + repo: ContributionDep, + id: str, + fields: FieldSelector = ContributionOut.default_fields(), +): + selected = ContributionOut.parse_fields(fields) + return await repo.get_contribution_by_id(id=id, fields=selected) + + +@router.put("/{id}", dependencies=[Depends(require_user)]) +async def upsert_contribution_by_id(repo: ContributionDep, id: str, contribution: ContributionIn): + return await repo.upsert_contribution_by_id(id=id, contribution=contribution) + + +@router.patch("/{id}", dependencies=[Depends(require_user)]) +async def patch_contribution_by_id(repo: ContributionDep, id: str, update: ContributionPatch): + return await repo.patch_contribution_by_id(id=id, update=update) diff --git a/mpcontribs-api/build/lib/mpcontribs_api/domains/healthcheck/router.py b/mpcontribs-api/build/lib/mpcontribs_api/domains/healthcheck/router.py new file mode 100644 index 0000000000..e099971ab6 --- /dev/null +++ b/mpcontribs-api/build/lib/mpcontribs_api/domains/healthcheck/router.py @@ -0,0 +1,37 @@ +from botocore.exceptions import BotoCoreError, ClientError +from fastapi import APIRouter, HTTPException, status +from pydantic import BaseModel + +from mpcontribs_api.config import get_settings +from mpcontribs_api.dependencies import DbDep, S3Dep + +router = APIRouter(tags=["health"]) + +settings = get_settings() + + +class HealthStatus(BaseModel): + status: str + mongo: str + s3: str + + +@router.get("", response_model=HealthStatus, summary="Service health") +async def healthcheck(db: DbDep, s3_client: S3Dep) -> HealthStatus: + try: + await db.client.admin.command("ping") + except Exception: + raise HTTPException( + status_code=status.HTTP_503_SERVICE_UNAVAILABLE, + detail={"status": "unhealthy", "mongo": "unreachable"}, + ) from None + + try: + await s3_client.head_bucket(Bucket=settings.aws.health_bucket) + except (ClientError, BotoCoreError): + raise HTTPException( + status_code=status.HTTP_503_SERVICE_UNAVAILABLE, + detail={"status": "unhealthy", "s3": "unreachable"}, + ) from None + + return HealthStatus(status="healthy", mongo="ok", s3="ok") diff --git a/mpcontribs-api/build/lib/mpcontribs_api/domains/projects/router.py b/mpcontribs-api/build/lib/mpcontribs_api/domains/projects/router.py new file mode 100644 index 0000000000..e82116b270 --- /dev/null +++ b/mpcontribs-api/build/lib/mpcontribs_api/domains/projects/router.py @@ -0,0 +1,121 @@ +from typing import Annotated + +from fastapi import APIRouter, Depends, Response, status +from fastapi_filter import FilterDepends +from starlette.status import HTTP_204_NO_CONTENT + +from mpcontribs_api.dependencies import require_user +from mpcontribs_api.domains._shared.types import FieldSelector +from mpcontribs_api.domains.projects.dependencies import ProjectDep +from mpcontribs_api.domains.projects.models import ( + ProjectFilter, + ProjectIn, + ProjectOut, + ProjectPatch, +) +from mpcontribs_api.pagination import CursorParams + +router = APIRouter() + + +# Brendan TODO: Add in option to select ProjectSummary or ProjectOut +@router.get("", response_model=None) +async def get_projects( + repo: ProjectDep, + pagination: Annotated[CursorParams, Depends()], + filter: ProjectFilter = FilterDepends(ProjectFilter), + fields: FieldSelector = ProjectOut.default_fields(), +): + """Return paginated projects matching a filter. + + Args: + repo (ProjectDep): the project repo we depend on + pagination (CursorParams): arguments for cursor-based pagination + fields (str | None): optional fields to include in return. If None supplied, all fields are returned + + Returns: + list[ProjectSummary]: a list of smaller project payloads + """ + selected = ProjectOut.parse_fields(fields) + return await repo.get_projects(filter=filter, pagination=pagination, fields=selected) + + +@router.get("/{id}", response_model=ProjectOut) +async def get_project_by_id( + id: str, + repo: ProjectDep, + fields: FieldSelector = ProjectOut.default_fields(), +): + """Gets a single project by its ID. + + Args: + id (str): the id of the project to retrieve + repo (ProjectDep): the project repo we depend on + fields (str | None): optional fields to include in return. If None supplied, all fields are returned + + Returns: + ProjectOut: the requested project, actual data returned is determined by the view the user requested + """ + selected = ProjectOut.parse_fields(fields) + return await repo.get_project_by_id(id=id, fields=selected) + + +@router.put("/{id}", response_model=ProjectOut, dependencies=[Depends(require_user)]) +async def upsert_project_by_id( + repo: ProjectDep, + id: str, + project: ProjectIn, +): + """Upsert a project by provided id. + + Upsert: Update document if id is found, otherwise insert new document using id. + Note: Relies on the path param 'id' for finding, rather than the body's id. + + Args: + repo (ProjectDep): the project repo we depend on + id (str): the id of the project to retrieve + project (ProjectIn): the data of the project to upsert + + Returns: + ProjectOut: the full document that either replaced an old one or was inserted + """ + return await repo.upsert_project_by_id(id=id, data=project) + + +@router.patch("/{id}", response_model=ProjectOut, dependencies=[Depends(require_user)]) +async def patch_project_by_id( + repo: ProjectDep, + id: str, + update: ProjectPatch, +): + """Partial update to project identified with 'id'. + + Note: overwrites fields with given values - arrays are not appended to. + + Args: + repo (ProjectDep): the project repo we depend on + id (str): the id of the project to update + update (ProjectPatch): the partial update to apply - unset fields are dropped + - Note: If fields are intentionally set to None, None is applied to the field. + + Returns: + ProjectOut: the full Project with updates applied + """ + return await repo.patch_project_by_id(id=id, update=update) + + +@router.delete("/{id}", status_code=status.HTTP_204_NO_CONTENT, dependencies=[Depends(require_user)]) +async def delete_project_by_id( + repo: ProjectDep, + id: str, +): + """Deletes a project matching id. + + Args: + repo (ProjectDep): the project repo we depend on + id (str): the id of the project to be deleted + Returns: + Response: a response with the 204 response code (rather than FastAPIs default 200) + """ + await repo.delete_project_by_id(id=id) + return Response(status_code=HTTP_204_NO_CONTENT) diff --git a/mpcontribs-api/build/lib/mpcontribs_api/domains/structures/router.py b/mpcontribs-api/build/lib/mpcontribs_api/domains/structures/router.py new file mode 100644 index 0000000000..0a5746607c --- /dev/null +++ b/mpcontribs-api/build/lib/mpcontribs_api/domains/structures/router.py @@ -0,0 +1,95 @@ +from typing import Annotated + +from fastapi import APIRouter, Depends +from fastapi.responses import StreamingResponse +from fastapi_filter import FilterDepends + +from mpcontribs_api.dependencies import S3Dep, require_user +from mpcontribs_api.domains._shared.bulk import BulkWriteSummary +from mpcontribs_api.domains._shared.models import ComponentDeleteResponse +from mpcontribs_api.domains._shared.types import ( + DownloadFormat, + FieldSelector, + ShortMimeFormat, + download_filename, +) +from mpcontribs_api.domains.structures.dependencies import StructureServiceDep +from mpcontribs_api.domains.structures.models import StructureFilter, StructureIn, StructureOut, StructurePatch +from mpcontribs_api.pagination import CursorParams, Page + +router = APIRouter() + + +@router.get("", response_model=Page[StructureOut]) +async def get_structures( + service: StructureServiceDep, + pagination: Annotated[CursorParams, Depends()], + filter: StructureFilter = FilterDepends(StructureFilter), + fields: FieldSelector = StructureOut.default_fields(), +): + selected = StructureOut.parse_fields(fields) + return await service.get_many(filter=filter, fields=selected, pagination=pagination) + + +@router.get("/{pk}", response_model=StructureOut) +async def get_structure( + service: StructureServiceDep, + pk: str, + fields: FieldSelector = StructureOut.default_fields(), +): + selected = StructureOut.parse_fields(fields) + return await service.get_by_id(id=pk, fields=selected) + + +@router.get("/download/{short_mime}") +async def download_structure( + service: StructureServiceDep, + format: DownloadFormat, + s3: S3Dep, + short_mime: ShortMimeFormat = ShortMimeFormat.GZ, + ignore_cache: bool = False, + filter: StructureFilter = FilterDepends(StructureFilter), + fields: FieldSelector = StructureOut.default_fields(), +) -> StreamingResponse: + selected = StructureOut.parse_fields(fields) + body = await service.download( + format=format, + short_mime=short_mime, + ignore_cache=ignore_cache, + filter=filter, + fields=selected, + s3=s3, + ) + filename = download_filename("structures", format, short_mime) + return StreamingResponse( + body, + media_type="application/gzip", + headers={"Content-Disposition": f'attachment; filename="{filename}"'}, + ) + + +@router.post("", response_model=BulkWriteSummary[StructureOut], dependencies=[Depends(require_user)]) +async def insert_structures( + service: StructureServiceDep, + structures: list[StructureIn], +): + return await service.insert(components=structures) + + +@router.delete("", response_model=ComponentDeleteResponse, dependencies=[Depends(require_user)]) +async def delete_structures(service: StructureServiceDep, filter: StructureFilter = FilterDepends(StructureFilter)): + return await service.delete(filter=filter) + + +@router.delete("/{id}", response_model=ComponentDeleteResponse, dependencies=[Depends(require_user)]) +async def delete_structure_by_id(service: StructureServiceDep, id: str): + return await service.delete_by_id(id=id) + + +@router.patch("/{id}", dependencies=[Depends(require_user)]) +async def patch_structure_by_id( + service: StructureServiceDep, + id: str, + update: StructurePatch, +): + return await service.patch_by_id(id=id, update=update) diff --git a/mpcontribs-api/build/lib/mpcontribs_api/domains/tables/router.py b/mpcontribs-api/build/lib/mpcontribs_api/domains/tables/router.py new file mode 100644 index 0000000000..619f4073e0 --- /dev/null +++ b/mpcontribs-api/build/lib/mpcontribs_api/domains/tables/router.py @@ -0,0 +1,95 @@ +from typing import Annotated + +from fastapi import APIRouter, Depends +from fastapi.responses import StreamingResponse +from fastapi_filter import FilterDepends + +from mpcontribs_api.dependencies import S3Dep, require_user +from mpcontribs_api.domains._shared.bulk import BulkWriteSummary +from mpcontribs_api.domains._shared.models import ComponentDeleteResponse +from mpcontribs_api.domains._shared.types import ( + DownloadFormat, + FieldSelector, + ShortMimeFormat, + download_filename, +) +from mpcontribs_api.domains.tables.dependencies import TableServiceDep +from mpcontribs_api.domains.tables.models import Table, TableFilter, TableIn, TableOut, TablePatch +from mpcontribs_api.pagination import CursorParams, Page + +router = APIRouter() + + +@router.get("", response_model=Page[TableOut]) +async def get_tables( + service: TableServiceDep, + pagination: Annotated[CursorParams, Depends()], + filter: TableFilter = FilterDepends(TableFilter), + fields: FieldSelector = TableOut.default_fields(), +): + selected = TableOut.parse_fields(fields) + return await service.get_many(filter=filter, fields=selected, pagination=pagination) + + +@router.get("/{pk}", response_model=TableOut) +async def get_table( + service: TableServiceDep, + pk: str, + fields: FieldSelector = TableOut.default_fields(), +): + selected = TableOut.parse_fields(fields) + return await service.get_by_id(id=pk, fields=selected) + + +@router.get("/download/{short_mime}") +async def download_table( + service: TableServiceDep, + s3: S3Dep, + format: DownloadFormat, + short_mime: ShortMimeFormat = ShortMimeFormat.GZ, + ignore_cache: bool = False, + filter: TableFilter = FilterDepends(TableFilter), + fields: FieldSelector = TableOut.default_fields(), +) -> StreamingResponse: + selected = TableOut.parse_fields(fields) + body = await service.download( + format=format, + short_mime=short_mime, + ignore_cache=ignore_cache, + filter=filter, + fields=selected, + s3=s3, + ) + filename = download_filename("tables", format, short_mime) + return StreamingResponse( + body, + media_type="application/gzip", + headers={"Content-Disposition": f'attachment; filename="{filename}"'}, + ) + + +@router.post("", response_model=BulkWriteSummary[Table], dependencies=[Depends(require_user)]) +async def insert_tables( + service: TableServiceDep, + tables: list[TableIn], +): + return await service.insert(components=tables) + + +@router.delete("", response_model=ComponentDeleteResponse, dependencies=[Depends(require_user)]) +async def delete_tables(service: TableServiceDep, filter: TableFilter = FilterDepends(TableFilter)): + return await service.delete(filter=filter) + + +@router.delete("/{id}", response_model=ComponentDeleteResponse, dependencies=[Depends(require_user)]) +async def delete_table_by_id(service: TableServiceDep, id: str): + return await service.delete_by_id(id=id) + + +@router.patch("/{id}", dependencies=[Depends(require_user)]) +async def patch_table_by_id( + service: TableServiceDep, + id: str, + update: TablePatch, +): + return await service.patch_by_id(id=id, update=update) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py b/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py index 8e4298a97e..49e2c076b4 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py @@ -4,7 +4,7 @@ from fastapi.responses import StreamingResponse from fastapi_filter import FilterDepends -from mpcontribs_api.dependencies import S3Dep +from mpcontribs_api.dependencies import S3Dep, require_user from mpcontribs_api.domains._shared.models import ComponentDeleteResponse from mpcontribs_api.domains._shared.types import ( DownloadFormat, @@ -67,11 +67,11 @@ async def download_attachment( ) -@router.delete("", response_model=ComponentDeleteResponse) +@router.delete("", response_model=ComponentDeleteResponse, dependencies=[Depends(require_user)]) async def delete_attachments(service: AttachmentServiceDep, filter: AttachmentFilter = FilterDepends(AttachmentFilter)): return await service.delete(filter=filter) -@router.delete("/{id}", response_model=ComponentDeleteResponse) +@router.delete("/{id}", response_model=ComponentDeleteResponse, dependencies=[Depends(require_user)]) async def delete_attachment_by_id(service: AttachmentServiceDep, id: str): return await service.delete_by_id(id=id) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py index 06d68f3700..cd01cbd825 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py @@ -4,7 +4,7 @@ from fastapi.responses import StreamingResponse from fastapi_filter import FilterDepends -from mpcontribs_api.dependencies import S3Dep +from mpcontribs_api.dependencies import S3Dep, require_user from mpcontribs_api.domains._shared.bulk import BulkWriteSummary from mpcontribs_api.domains._shared.types import ( DownloadFormat, @@ -36,7 +36,7 @@ async def get_contributions( return await repo.get_contributions(pagination=pagination, filter=filter, fields=selected) -@router.delete("") +@router.delete("", dependencies=[Depends(require_user)]) async def delete_contributions( repo: ContributionDep, filter: ContributionFilter = FilterDepends(ContributionFilter), @@ -45,7 +45,7 @@ async def delete_contributions( # TODO: Might want to take contributions in from request body and run model_validate_json on it (much faster) -@router.post("", response_model=BulkWriteSummary[Contribution]) +@router.post("", response_model=BulkWriteSummary[Contribution], dependencies=[Depends(require_user)]) async def insert_contributions( service: ContributionServiceDep, contributions: list[ContributionIn], @@ -53,7 +53,7 @@ async def insert_contributions( return await service.insert_contributions(contributions=contributions) -@router.put("") +@router.put("", dependencies=[Depends(require_user)]) async def upsert_contributions( service: ContributionServiceDep, contributions: list[ContributionIn], @@ -89,8 +89,8 @@ async def download_contributions( ) -@router.delete("/{id}") -async def delete_contribtion_by_id( +@router.delete("/{id}", dependencies=[Depends(require_user)]) +async def delete_contribution_by_id( service: ContributionServiceDep, id: str, ): @@ -107,11 +107,11 @@ async def get_contribution_by_id( return await repo.get_contribution_by_id(id=id, fields=selected) -@router.put("/{id}") +@router.put("/{id}", dependencies=[Depends(require_user)]) async def upsert_contribution_by_id(repo: ContributionDep, id: str, contribution: ContributionIn): return await repo.upsert_contribution_by_id(id=id, contribution=contribution) -@router.patch("/{id}") +@router.patch("/{id}", dependencies=[Depends(require_user)]) async def patch_contribution_by_id(repo: ContributionDep, id: str, update: ContributionPatch): return await repo.patch_contribution_by_id(id=id, update=update) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/healthcheck/router.py b/mpcontribs-api/src/mpcontribs_api/domains/healthcheck/router.py index 88abea6a91..e099971ab6 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/healthcheck/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/healthcheck/router.py @@ -28,7 +28,7 @@ async def healthcheck(db: DbDep, s3_client: S3Dep) -> HealthStatus: try: await s3_client.head_bucket(Bucket=settings.aws.health_bucket) - except ClientError, BotoCoreError: + except (ClientError, BotoCoreError): raise HTTPException( status_code=status.HTTP_503_SERVICE_UNAVAILABLE, detail={"status": "unhealthy", "s3": "unreachable"}, diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py index 4b0f3704f1..e82116b270 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py @@ -4,6 +4,7 @@ from fastapi_filter import FilterDepends from starlette.status import HTTP_204_NO_CONTENT +from mpcontribs_api.dependencies import require_user from mpcontribs_api.domains._shared.types import FieldSelector from mpcontribs_api.domains.projects.dependencies import ProjectDep from mpcontribs_api.domains.projects.models import ( @@ -59,7 +60,7 @@ async def get_project_by_id( return await repo.get_project_by_id(id=id, fields=selected) -@router.put("/{id}", response_model=ProjectOut) +@router.put("/{id}", response_model=ProjectOut, dependencies=[Depends(require_user)]) async def upsert_project_by_id( repo: ProjectDep, id: str, @@ -81,7 +82,7 @@ async def upsert_project_by_id( return await repo.upsert_project_by_id(id=id, data=project) -@router.patch("/{id}", response_model=ProjectOut) +@router.patch("/{id}", response_model=ProjectOut, dependencies=[Depends(require_user)]) async def patch_project_by_id( repo: ProjectDep, id: str, @@ -103,7 +104,7 @@ async def patch_project_by_id( return await repo.patch_project_by_id(id=id, update=update) -@router.delete("/{id}", status_code=status.HTTP_204_NO_CONTENT) +@router.delete("/{id}", status_code=status.HTTP_204_NO_CONTENT, dependencies=[Depends(require_user)]) async def delete_project_by_id( repo: ProjectDep, id: str, diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py index 0057c4a5d2..0a5746607c 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py @@ -4,7 +4,7 @@ from fastapi.responses import StreamingResponse from fastapi_filter import FilterDepends -from mpcontribs_api.dependencies import S3Dep +from mpcontribs_api.dependencies import S3Dep, require_user from mpcontribs_api.domains._shared.bulk import BulkWriteSummary from mpcontribs_api.domains._shared.models import ComponentDeleteResponse from mpcontribs_api.domains._shared.types import ( @@ -68,7 +68,7 @@ async def download_structure( ) -@router.post("", response_model=BulkWriteSummary[StructureOut]) +@router.post("", response_model=BulkWriteSummary[StructureOut], dependencies=[Depends(require_user)]) async def insert_structures( service: StructureServiceDep, structures: list[StructureIn], @@ -76,17 +76,17 @@ async def insert_structures( return await service.insert(components=structures) -@router.delete("", response_model=ComponentDeleteResponse) +@router.delete("", response_model=ComponentDeleteResponse, dependencies=[Depends(require_user)]) async def delete_structures(service: StructureServiceDep, filter: StructureFilter = FilterDepends(StructureFilter)): return await service.delete(filter=filter) -@router.delete("/{id}", response_model=ComponentDeleteResponse) +@router.delete("/{id}", response_model=ComponentDeleteResponse, dependencies=[Depends(require_user)]) async def delete_structure_by_id(service: StructureServiceDep, id: str): return await service.delete_by_id(id=id) -@router.patch("/{id}") +@router.patch("/{id}", dependencies=[Depends(require_user)]) async def patch_structure_by_id( service: StructureServiceDep, id: str, diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py index 505f021eff..619f4073e0 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py @@ -4,7 +4,7 @@ from fastapi.responses import StreamingResponse from fastapi_filter import FilterDepends -from mpcontribs_api.dependencies import S3Dep +from mpcontribs_api.dependencies import S3Dep, require_user from mpcontribs_api.domains._shared.bulk import BulkWriteSummary from mpcontribs_api.domains._shared.models import ComponentDeleteResponse from mpcontribs_api.domains._shared.types import ( @@ -68,7 +68,7 @@ async def download_table( ) -@router.post("", response_model=BulkWriteSummary[Table]) +@router.post("", response_model=BulkWriteSummary[Table], dependencies=[Depends(require_user)]) async def insert_tables( service: TableServiceDep, tables: list[TableIn], @@ -76,17 +76,17 @@ async def insert_tables( return await service.insert(components=tables) -@router.delete("", response_model=ComponentDeleteResponse) +@router.delete("", response_model=ComponentDeleteResponse, dependencies=[Depends(require_user)]) async def delete_tables(service: TableServiceDep, filter: TableFilter = FilterDepends(TableFilter)): return await service.delete(filter=filter) -@router.delete("/{id}", response_model=ComponentDeleteResponse) +@router.delete("/{id}", response_model=ComponentDeleteResponse, dependencies=[Depends(require_user)]) async def delete_table_by_id(service: TableServiceDep, id: str): return await service.delete_by_id(id=id) -@router.patch("/{id}") +@router.patch("/{id}", dependencies=[Depends(require_user)]) async def patch_table_by_id( service: TableServiceDep, id: str, From 9e81230700454b889f1371634f4ed7e604dcf2a4 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 18 Jun 2026 12:18:44 -0700 Subject: [PATCH 378/591] Requests to contributions or their components are now scoped by the user - users can no longer operate on components that their contributions dontown --- .../domains/_shared/repository.py | 319 ++++++++++++++++++ .../domains/attachments/repository.py | 15 + .../domains/contributions/repository.py | 266 +++++++++++++++ .../domains/projects/repository.py | 111 ++++++ .../domains/structures/repository.py | 15 + .../domains/tables/repository.py | 13 + .../domains/_shared/repository.py | 29 +- .../domains/contributions/repository.py | 37 +- .../domains/projects/repository.py | 34 +- .../db/test_contributions_repository.py | 39 +++ .../db/test_projects_repository.py | 48 +++ 11 files changed, 911 insertions(+), 15 deletions(-) create mode 100644 mpcontribs-api/build/lib/mpcontribs_api/domains/_shared/repository.py create mode 100644 mpcontribs-api/build/lib/mpcontribs_api/domains/attachments/repository.py create mode 100644 mpcontribs-api/build/lib/mpcontribs_api/domains/contributions/repository.py create mode 100644 mpcontribs-api/build/lib/mpcontribs_api/domains/projects/repository.py create mode 100644 mpcontribs-api/build/lib/mpcontribs_api/domains/structures/repository.py create mode 100644 mpcontribs-api/build/lib/mpcontribs_api/domains/tables/repository.py diff --git a/mpcontribs-api/build/lib/mpcontribs_api/domains/_shared/repository.py b/mpcontribs-api/build/lib/mpcontribs_api/domains/_shared/repository.py new file mode 100644 index 0000000000..36f089fb9a --- /dev/null +++ b/mpcontribs-api/build/lib/mpcontribs_api/domains/_shared/repository.py @@ -0,0 +1,319 @@ +import csv +import hashlib +import io +import json +import zlib +from abc import ABC, abstractmethod +from collections.abc import AsyncIterable, AsyncIterator, Callable, Iterable +from contextlib import AbstractAsyncContextManager +from typing import Any + +from beanie import PydanticObjectId, UpdateResponse +from beanie.operators import In, Set +from bson.errors import InvalidId +from fastapi_filter.contrib.beanie import Filter +from pydantic import BaseModel +from pymongo.asynchronous.client_session import AsyncClientSession +from types_aiobotocore_s3 import S3Client + +from mpcontribs_api.authz import User +from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DeleteResponse, DocumentOut +from mpcontribs_api.domains._shared.types import DownloadFormat, ShortMimeFormat +from mpcontribs_api.exceptions import ConflictError, NotFoundError, ValidationError +from mpcontribs_api.pagination import CursorParams, Page, encode_cursor + + +class MongoDbRepository[ + TDoc: BaseDocumentWithInput, + TIn: BaseModel, + TOut: DocumentOut, + TFilter: Filter, + TPatch: BaseModel, +](ABC): + """Base repository encapsulating shared MongoDB access patterns. + + Subclasses bind the document, input, output, filter, and patch types as type parameters, set + the matching ``document_model`` / ``out_model`` class attributes, and implement ``_build_scope`` + to enforce per-user authorization. Shared CRUD logic (scoping, projection, cursor pagination, + insertion, single-document read/patch/delete) lives here so it exists in exactly one place and + cannot drift between resources. Subclasses expose domain-named methods that either forward to a + base method (vocabulary + concrete types for routers, no logic) or implement a genuinely + different shape (bulk insert, compound-key upsert, download). + + Attributes: + document_model: the ``BaseDocumentWithInput`` subclass this repository operates on + out_model: the ``SparseFieldsModel`` subclass used to build projections for reads + _scope (dict[str, Any]): terms injected into every query to enforce user authorization + """ + + document_model: type[TDoc] + out_model: type[TOut] + + def __init__(self, user: User) -> None: + """Initializes an instance based on the current user. + + Args: + user (User): the current user requesting resources + """ + self._scope = self._build_scope(user) + + @staticmethod + @abstractmethod + def _build_scope(user: User) -> dict[str, Any]: + """Provides scope based on current user's permitted groups and publicly released data.""" + ... + + def _convert_object_id(self, id: str) -> PydanticObjectId: + """Converts the string representation of an ObjectId to an ObjectId""" + try: + return PydanticObjectId(id) + except InvalidId: + raise ValidationError("Incorrect Id format. Must be MongoDB ObjectId format.", id=id) from None + + def _not_found(self, id: str) -> str: + """Build a not-found message naming this repository's resource.""" + return f"{self.document_model.__name__} with id {id} not found" + + async def get_many( + self, + filter: TFilter, + fields: frozenset[str] | None = None, + pagination: CursorParams | None = None, + restrict_ids: Iterable[Any] | None = None, + ) -> Page[TOut]: + """Return a scoped, filtered, cursor-paginated page of projected documents. + + Args: + pagination (CursorParams): forward-only cursor parameters + filter (TFilter): the fastapi-filter query to apply on top of the user scope + fields (frozenset[str] | None): fields to project; if None the full document is returned + restrict_ids (Iterable | None): when provided, results are limited to these ids in + addition to the user scope. An empty iterable yields an empty page. Used to gate + reads that are authorized indirectly (e.g. components reachable via a contribution). + """ + pagination = pagination or CursorParams() + + projection = self.out_model.projection(fields) + query = filter.filter(self.document_model.find(self._scope)) + if restrict_ids is not None: + query = query.find(In(self.document_model.id, list(restrict_ids))) + if pagination.cursor is not None: + query = query.find(self.document_model.id > self.document_model.decode_cursor(cursor=pagination.cursor)) # pyright: ignore[reportOptionalOperand] + docs = await query.sort(self.document_model.id).limit(pagination.limit + 1).project(projection).to_list() # pyright: ignore[reportArgumentType] + has_more = len(docs) > pagination.limit + items = docs[: pagination.limit] + next_cursor = encode_cursor(str(items[-1].id)) if has_more and items else None + return Page(items=items, next_cursor=next_cursor) + + async def get_by_id(self, id: Any, fields: frozenset[str] | None) -> TDoc | TOut | None: + """Return a single scoped document by id, projected to the requested fields. + + Args: + id (str): the id of the document to find + fields (frozenset[str] | None): fields to project; if None the full document is returned + """ + return await self.document_model.find_one( + self._scope, + self.document_model.id == id, + projection_model=self.out_model.projection(fields), + ) + + async def list_ids(self, filter: TFilter, session: AsyncClientSession | None = None) -> list[Any]: + """Return just the ids of scoped documents matching ``filter``. + + Projects to ``{"_id": 1}`` so the lookup can be served as a covered query from the + default ``_id`` index without materializing full documents. + + Args: + filter (TFilter): the fastapi-filter query to apply on top of the user scope + session (AsyncClientSession | None): optional client session for transactions + """ + projection = self.out_model.projection(frozenset({"id"})) + query = filter.filter(self.document_model.find(self._scope, session=session)) + docs = await query.project(projection).to_list() + return [doc.id for doc in docs] + + async def insert_one(self, in_resource: TIn) -> TDoc: + """Insert a new document built from its input model, rejecting duplicate ids. + + Args: + in_resource (TIn): the validated input payload to translate and store + """ + document = self.document_model.from_input_model(in_resource) + existing = await self.document_model.find_one(self.document_model.id == document.id) + if existing: + raise ConflictError(f"Cannot insert document.\n Document with ID {document.id} exists") + await document.insert() + return document + + async def delete_by_id(self, id: Any, session: AsyncClientSession | None = None) -> DeleteResponse: + """Delete a single scoped document by id. + + Scoping ensures callers cannot delete documents they are not permitted to see. + + Args: + id (str): the id of the document to delete + """ + doc = await self.document_model.find_one(self._scope, self.document_model.id == id, session=session) + if not doc: + raise NotFoundError("Document with id not found", id=id) + await doc.delete(session=session) + return DeleteResponse(num_deleted=1) + + async def delete_by_ids(self, ids: list[Any], session: AsyncClientSession | None = None) -> DeleteResponse: + """Delete multiple scoped documents by id. + + The user scope is injected so callers cannot delete documents they are not permitted to + see; out-of-scope ids simply match nothing and are reported as zero deletions. + + Args: + ids (list[Any]): list of ids to delete + session: the session to perform the deletes within + + Returns: + DeleteResponse: the result of the deletion + """ + docs = self.document_model.find(self._scope, In(self.document_model.id, ids), session=session) + delete_result = await docs.delete_many(session=session) + if not delete_result: + raise ValidationError("DeleteResult not returned internally") + return DeleteResponse.from_delete_result(delete_result) + + async def patch(self, id: Any, update: TPatch) -> TDoc: + """Partially update a single scoped document by id. + + Only fields explicitly set on ``update`` are applied. An empty patch is a no-op that still + returns the existing document for consistent behavior. Scoping ensures callers cannot patch + documents they are not permitted to see. + + Args: + id (str): the id of the document to update + update (TPatch): the partial update to apply; unset fields are dropped + """ + # Only retain set fields (patch) + update_data = update.model_dump(exclude_unset=True) + # If update is empty, return the model anyways (consistent behavior) + if not update_data: + existing = await self.document_model.find_one(self._scope, self.document_model.id == id) + if existing is None: + raise NotFoundError(self._not_found(id)) + return existing + + # Otherwise, update the fields fully (set) + # Brendan TODO: Set will replace an entire field + # - if we want to append to a list (ie. add a reference) we ned Push/AddToSet + query = self.document_model.find_one(self._scope, self.document_model.id == id).update( + Set(update_data), + response_type=UpdateResponse.NEW_DOCUMENT, + ) + updated = await query # pyright: ignore[reportGeneralTypeIssues] # beanie UpdateQuery is awaitable, but pyright doesn't see it + if updated is None: + raise NotFoundError(self._not_found(id)) + return updated + + def _hash_payload(self, payload: dict[str, Any], *, separators: tuple[str, str] = (",", ":")) -> str: + canonical = json.dumps( + payload, + sort_keys=True, + separators=separators, + ensure_ascii=True, + default=str, # filters may carry ObjectId/datetime values; stringify for a stable key + ) + return hashlib.sha256(canonical.encode("utf-8")).hexdigest() + + def _get_serializer( + self, format: DownloadFormat, fields: frozenset[str] | None + ) -> Callable[[AsyncIterable[TOut]], AsyncIterable[bytes]]: + match format: + case DownloadFormat.JSONL: + return self._serialize_jsonl + case DownloadFormat.CSV: + return lambda rows: self._serialize_csv(rows, fields) + + @staticmethod + async def _serialize_jsonl(rows: AsyncIterable) -> AsyncIterator[bytes]: + async for out in rows: + yield out.model_dump_json().encode() + b"\n" + + @staticmethod + def _csv_cell(value: Any) -> Any: + """Render a cell value for CSV: scalars as-is, dict/list as JSON (not Python repr).""" + if value is None or isinstance(value, (str, int, float, bool)): + return value + return json.dumps(value, ensure_ascii=False, separators=(",", ":")) + + @staticmethod + async def _serialize_csv(rows: AsyncIterable, fields: frozenset[str] | None) -> AsyncIterator[bytes]: + buf = io.StringIO() + writer: csv.DictWriter | None = None + async for out in rows: + row = out.model_dump(mode="json") + if writer is None: + cols = sorted(fields) if fields else list(row.keys()) + writer = csv.DictWriter(buf, fieldnames=cols, extrasaction="ignore") + writer.writeheader() + writer.writerow({key: MongoDbRepository._csv_cell(value) for key, value in row.items()}) + yield buf.getvalue().encode() + buf.seek(0) + buf.truncate(0) + + async def _s3_object_exists(self, bucket_name: str, key_name: str, s3: AbstractAsyncContextManager[S3Client]): + async with s3 as s3_client: + try: + await s3_client.head_object(Bucket=bucket_name, Key=key_name) + return True + except Exception: + return False + + async def download( + self, + format: DownloadFormat, + short_mime: ShortMimeFormat, + ignore_cache: bool, + filter: TFilter, + fields: frozenset[str] | None, + s3: AbstractAsyncContextManager[S3Client], + bucket_name: str, + key_name: str, + restrict_ids: Iterable[Any] | None = None, + ) -> AsyncIterable[bytes]: + # Hash parameters to generate key for cache + payload = { + "format": format, + "short_mime": short_mime, + "filter": filter.model_dump(), + "fields": sorted(fields) if fields else None, + } + _ = self._hash_payload(payload) + + # TODO: S3 download cache. When implemented, this should `await + # self._s3_object_exists(...)` and stream the cached object on a hit. + # The previous code called the coroutine without awaiting it (a no-op + # that always evaluated truthy), so the branch was removed. + + # Build from MongoDB (and, in future, save to cache) + query = filter.filter(self.document_model.find(self._scope)) + if restrict_ids is not None: + query = query.find(In(self.document_model.id, list(restrict_ids))) + query = filter.sort(query) + + serializer = self._get_serializer(format, fields) + + # Compress using gzip level 9 and stream out + compressor = zlib.compressobj(9, zlib.DEFLATED, 16 + zlib.MAX_WBITS) + + async def rows() -> AsyncIterator[TOut]: + async for table in query: + # TODO: We might think about skipping validation to save time + yield self.out_model.model_validate(table, from_attributes=True) + + async for line in serializer(rows()): + chunk = compressor.compress(line) + if chunk: + yield chunk + + # Flush the remaining buffered bytes and the gzip footer + # Without this the stream is a truncated gzip that cannot be decompressed. + tail = compressor.flush() + if tail: + yield tail diff --git a/mpcontribs-api/build/lib/mpcontribs_api/domains/attachments/repository.py b/mpcontribs-api/build/lib/mpcontribs_api/domains/attachments/repository.py new file mode 100644 index 0000000000..6297b117f8 --- /dev/null +++ b/mpcontribs-api/build/lib/mpcontribs_api/domains/attachments/repository.py @@ -0,0 +1,15 @@ +from mpcontribs_api.domains._shared.components import MongoDbComponentsRepository +from mpcontribs_api.domains.attachments.models import ( + Attachment, + AttachmentFilter, + AttachmentIn, + AttachmentOut, + AttachmentPatch, +) + + +class MongoDbAttachmentRepository( + MongoDbComponentsRepository[Attachment, AttachmentIn, AttachmentOut, AttachmentFilter, AttachmentPatch] +): + document_model = Attachment + out_model = AttachmentOut diff --git a/mpcontribs-api/build/lib/mpcontribs_api/domains/contributions/repository.py b/mpcontribs-api/build/lib/mpcontribs_api/domains/contributions/repository.py new file mode 100644 index 0000000000..1a75419689 --- /dev/null +++ b/mpcontribs-api/build/lib/mpcontribs_api/domains/contributions/repository.py @@ -0,0 +1,266 @@ +from collections.abc import AsyncIterable +from contextlib import AbstractAsyncContextManager +from typing import Any + +from beanie import PydanticObjectId, UpdateResponse +from beanie.operators import Set +from pymongo.asynchronous.client_session import AsyncClientSession +from pymongo.results import DeleteResult +from types_aiobotocore_s3 import S3Client + +from mpcontribs_api.authz import User +from mpcontribs_api.domains._shared.repository import MongoDbRepository +from mpcontribs_api.domains._shared.types import DownloadFormat, ShortMimeFormat +from mpcontribs_api.domains.contributions.models import ( + Contribution, + ContributionFilter, + ContributionIn, + ContributionOut, + ContributionPatch, +) +from mpcontribs_api.pagination import CursorParams + + +class MongoDbContributionRepository( + MongoDbRepository[Contribution, ContributionIn, ContributionOut, ContributionFilter, ContributionPatch] +): + """A repository layer for access to MongoDB. + + Shared CRUD logic lives on :class:`MongoDbRepository`; the methods here are domain-named + forwarders that give routers a consistent vocabulary and concrete types, plus the operations + whose shape is contribution-specific (filtered delete, id-keyed upsert, download). + Multi-collection orchestration (component inserts) lives in ``ContributionService``. + """ + + document_model = Contribution + out_model = ContributionOut + + def __init__(self, user: User) -> None: + super().__init__(user) + self._user = user + + @staticmethod + def _build_scope(user: User) -> dict[str, Any]: + """Provides scope based on current user's permitted groups and publicly released data.""" + if user.is_admin: + return {} + ors: list[dict[str, Any]] = [{"is_public": True}] + if not user.is_anonymous: + if user.groups: + ors.append({"project": {"$in": sorted(user.groups)}}) + return {"$or": ors} + + async def get_contributions( + self, + filter: ContributionFilter, + pagination: CursorParams | None = None, + fields: frozenset[str] | None = None, + ): + """Query the Contribution collection, scoped to the current user. See ``get_many``.""" + return await self.get_many(pagination=pagination, filter=filter, fields=fields) + + async def get_contribution_by_id(self, id: str, fields: frozenset[str] | None): + """Find a single contribution by id, scoped to the current user. See ``get_by_id``.""" + return await self.get_by_id(self._convert_object_id(id), fields) + + async def patch_contribution_by_id(self, id: str, update: ContributionPatch): + """Partially update a contribution by id, scoped to the current user. See ``patch``.""" + return await self.patch(self._convert_object_id(id), update) + + async def delete_contribution_by_id(self, id: str) -> None: + """Delete a contribution by id, scoped to the current user. See ``delete_by_id``.""" + await self.delete_by_id(self._convert_object_id(id)) + + async def delete_contributions( + self, + filter: ContributionFilter, + ) -> DeleteResult | None: + """Bulk deletion of Contributions described by the filter. + + Args: + filter (ContribtionFilter): the filter to use to identify contributions to delete + """ + return await filter.filter(self.document_model.find(self._scope)).delete_many() + + async def insert_many_contributions( + self, + docs: list[Contribution], + session: AsyncClientSession | None = None, + ): + """Bulk-insert pre-built Contribution documents. + + Used by the ``ContributionService`` no-component fast path. On partial failure pymongo + raises ``BulkWriteError`` whose ``details["writeErrors"]`` carries per-index error info + that the service maps back into a ``BulkWriteSummary``. + """ + return await self.document_model.insert_many(docs, ordered=False, session=session) + + async def insert_contribution( + self, + doc: Contribution, + session: AsyncClientSession | None = None, + ) -> Contribution: + """Insert a single pre-built Contribution document, optionally in a transaction.""" + await doc.insert(session=session) + return doc + + async def find_one_contribution(self, project: str, identifier: str) -> Contribution | None: + """Find a single contribution by (project, identifier), scoped to the current user.""" + return await self.document_model.find_one( + self._scope, + self.document_model.project == project, + self.document_model.identifier == identifier, + ) + + async def referenced_component_ids( + self, + ref_field: str, + ids: list[PydanticObjectId], + *, + scoped: bool, + ) -> set[PydanticObjectId]: + """Return the subset of ``ids`` referenced by contributions through ``ref_field``. + + Beanie stores each ``Link`` as a DBRef (``{"$ref": ..., "$id": ObjectId}``), so a + component is referenced when its id appears under ``.$id`` on any matching + contribution. + + Args: + ref_field: the contribution link field to inspect ("structures" | "tables" | + "attachments"). Always a fixed class-attr at the call site, never user input. + ids: candidate component ids to test + scoped: when ``True`` the user scope is applied (access gate / reachability); when + ``False`` the check spans every contribution (global integrity check) + + Returns: + set[PydanticObjectId]: the ids in ``ids`` that are still referenced + """ + if not ids: + return set() + key = f"{ref_field}.$id" + query: dict[str, Any] = {key: {"$in": ids}} + if scoped and self._scope: + query = {"$and": [self._scope, query]} + target = set(ids) + referenced: set[PydanticObjectId] = set() + collection = self.document_model.get_pymongo_collection() + async for doc in collection.find(query, {ref_field: 1}): + for ref in doc.get(ref_field) or []: + rid = ref.id if hasattr(ref, "id") else ref.get("$id") + if rid in target: + referenced.add(rid) + return referenced + + # TODO: should return document with update + async def list_referenced_component_ids( + self, + ref_field: str, + *, + scoped: bool, + ) -> set[PydanticObjectId]: + """Return every component id referenced through ``ref_field`` by matching contributions. + + Unlike :meth:`referenced_component_ids`, this takes no candidate list — it enumerates all + ids reachable from contributions in scope. Used to gate component *reads* (list/download) + to only the components a user can reach via a contribution they are allowed to see. + + Args: + ref_field: the contribution link field to inspect ("structures" | "tables" | + "attachments"). Always a fixed class-attr at the call site, never user input. + scoped: when ``True`` the user scope is applied (access gate); when ``False`` the + check spans every contribution. + + Returns: + set[PydanticObjectId]: all component ids referenced via ``ref_field`` + """ + key = f"{ref_field}.$id" + query: dict[str, Any] = {key: {"$exists": True}} + if scoped and self._scope: + query = {"$and": [self._scope, query]} + referenced: set[PydanticObjectId] = set() + collection = self.document_model.get_pymongo_collection() + async for doc in collection.find(query, {ref_field: 1}): + for ref in doc.get(ref_field) or []: + rid = ref.id if hasattr(ref, "id") else ref.get("$id") + if rid is not None: + referenced.add(rid) + return referenced + + async def update_contribution(self, doc: Contribution, update_data: dict[str, Any]) -> None: + """Apply a partial update to an existing Contribution document.""" + await doc.update(Set(update_data)) + + async def upsert_contribution_by_identifiers( + self, + identifiers: dict[str, str], + contribution: ContributionIn, + ) -> Contribution: + """Atomically upsert a Contribution by its identifying fields. + + Relies on the unique index over those fields so that concurrent requests targeting the + same key cannot both win the insert branch. Fields the caller did not set are not touched + (partial update). On insert a fresh Contribution document is written with ``is_public=False``. + + Args: + identifiers: the fields ContributionIn.identifiers() returns (project, identifier) + contribution: the input payload to upsert + + Returns: + Contribution: the document as it stands after the operation + """ + doc = self.document_model.from_input_model(contribution) + update_data = doc.model_dump(exclude={"id"}, exclude_none=True) + query = self.document_model.find_one( + self._scope, + self.document_model.project == identifiers["project"], + self.document_model.identifier == identifiers["identifier"], + ).upsert( + Set(update_data), + on_insert=doc, + response_type=UpdateResponse.NEW_DOCUMENT, + ) + return await query # pyright: ignore[reportGeneralTypeIssues] # beanie UpdateQuery is awaitable, but pyright doesn't see it + + async def upsert_contribution_by_id(self, id: str, contribution: ContributionIn): + """Upserts a single Contribution. + + If Contributions with identical identifiers exist, update, otherwise insert + + Args: + id (str): the id of the Contribution to upsert + contribution (ContributionIn): the Contribution to be upserted + + Returns: + ContributionOut: the upserted document""" + doc = self.document_model.from_input_model(contribution) + query = self.document_model.find_one( + self._scope, + self.document_model.id == self._convert_object_id(id), + ).upsert( + Set(doc.model_dump(exclude={"id"}, exclude_none=True)), + on_insert=doc, + response_type=UpdateResponse.NEW_DOCUMENT, + ) + return await query # pyright: ignore[reportGeneralTypeIssues] # beanie UpdateQuery is awaitable, but pyright doesn't see it + + async def download_contributions( + self, + format: DownloadFormat, + short_mime: ShortMimeFormat, + ignore_cache: bool, + filter: ContributionFilter, + fields: frozenset[str] | None, + key_name: str, + s3: AbstractAsyncContextManager[S3Client], + bucket_name: str = "contributions", + ) -> AsyncIterable[bytes]: + return self.download( + format=format, + short_mime=short_mime, + ignore_cache=ignore_cache, + filter=filter, + fields=fields, + bucket_name=bucket_name, + key_name=key_name, + s3=s3, + ) diff --git a/mpcontribs-api/build/lib/mpcontribs_api/domains/projects/repository.py b/mpcontribs-api/build/lib/mpcontribs_api/domains/projects/repository.py new file mode 100644 index 0000000000..f0f3f09f36 --- /dev/null +++ b/mpcontribs-api/build/lib/mpcontribs_api/domains/projects/repository.py @@ -0,0 +1,111 @@ +from typing import Any + +from mpcontribs_api.authz import User +from mpcontribs_api.domains._shared.repository import MongoDbRepository +from mpcontribs_api.domains.projects.models import ( + Project, + ProjectFilter, + ProjectIn, + ProjectOut, + ProjectPatch, +) +from mpcontribs_api.exceptions import PermissionError +from mpcontribs_api.pagination import CursorParams + + +class MongoDbProjectRepository(MongoDbRepository[Project, ProjectIn, ProjectOut, ProjectFilter, ProjectPatch]): + """A repository layer for access to MongoDB. + + This is the layer that directly interacts with database operations. Shared CRUD logic lives on + :class:`MongoDbRepository`; the methods here are domain-named forwarders that give routers a + consistent vocabulary and concrete types, plus the operations whose shape is genuinely + project-specific (id-keyed upsert). + + Attributes: + _scope (dict[str, Any]): additional terms to inject into mongo queries to enforce user + authorization on resources + """ + + document_model = Project + out_model = ProjectOut + + def __init__(self, user: User) -> None: + super().__init__(user) + self._user = user + + @staticmethod + def _build_scope(user: User) -> dict[str, Any]: + """Provides scope based on current user's permitted groups and publicly released data.""" + if user.is_admin: + return {} + ors: list[dict[str, Any]] = [{"is_public": True, "is_approved": True}] + if not user.is_anonymous: + ors.append({"owner": user.username}) + if user.groups: + ors.append({"_id": {"$in": sorted(user.groups)}}) + return {"$or": ors} + + async def get_projects( + self, + filter: ProjectFilter, + pagination: CursorParams, + fields: frozenset[str] | None, + ): + """Query the Project collection, scoped to the current user. See ``get_many``.""" + return await self.get_many(pagination=pagination, filter=filter, fields=fields) + + async def get_project_by_id(self, id: str, fields: frozenset[str] | None): + """Find a single project by id, scoped to the current user. See ``get_by_id``.""" + return await self.get_by_id(id, fields) + + async def insert_project(self, project: ProjectIn) -> Project: + """Insert a new project, rejecting a duplicate id. See ``insert_one``.""" + return await self.insert_one(project) + + async def patch_project_by_id(self, id: str, update: ProjectPatch) -> Project: + """Partially update a project by id, scoped to the current user. See ``patch``.""" + return await self.patch(id, update) + + async def delete_project_by_id(self, id: str) -> None: + """Delete a project by id, scoped to the current user. See ``delete_by_id``.""" + await self.delete_by_id(id) + + async def upsert_project_by_id(self, id: str, data: ProjectIn) -> Project: + """Upsert a project by provided id, authorized to the current user. + + Update the document if the id exists, otherwise insert a new one under that id. + Authorization (the read scope is for visibility, not write access, so it is not + reused here): + + - **Existing project:** only its ``owner`` or an admin may overwrite it. The stored + ``owner`` is preserved — ownership cannot be reassigned through the request body. + - **New project:** ``owner`` is forced to the caller, ignoring any body value. + + Note: relies on the path param ``id`` for identity, not the body's id. + + Args: + id (str): the id of the project to upsert + data (ProjectIn): the data of the project to upsert + + Returns: + Project: the full document that either replaced an old one or was inserted + + Raises: + PermissionError: if a non-owner, non-admin caller targets an existing project + """ + # The route enforces authentication, so an anonymous caller should never reach here. + if self._user.username is None: + raise PermissionError(required_role="authenticated") + + existing = await self.document_model.find_one(self.document_model.id == id) + project = self.document_model.from_input_model(data) + project.id = id + if existing is not None: + if not (self._user.is_admin or existing.owner == self._user.username): + raise PermissionError(required_role="owner-or-admin") + # Ownership is immutable via upsert; keep the original owner. + project.owner = existing.owner + else: + # New project: the caller owns it, regardless of the submitted owner. + project.owner = self._user.username + return await project.save() diff --git a/mpcontribs-api/build/lib/mpcontribs_api/domains/structures/repository.py b/mpcontribs-api/build/lib/mpcontribs_api/domains/structures/repository.py new file mode 100644 index 0000000000..ab74497850 --- /dev/null +++ b/mpcontribs-api/build/lib/mpcontribs_api/domains/structures/repository.py @@ -0,0 +1,15 @@ +from mpcontribs_api.domains._shared.components import MongoDbComponentsRepository +from mpcontribs_api.domains.structures.models import ( + Structure, + StructureFilter, + StructureIn, + StructureOut, + StructurePatch, +) + + +class MongoDbStructureRepository( + MongoDbComponentsRepository[Structure, StructureIn, StructureOut, StructureFilter, StructurePatch] +): + document_model = Structure + out_model = StructureOut diff --git a/mpcontribs-api/build/lib/mpcontribs_api/domains/tables/repository.py b/mpcontribs-api/build/lib/mpcontribs_api/domains/tables/repository.py new file mode 100644 index 0000000000..a6bda17912 --- /dev/null +++ b/mpcontribs-api/build/lib/mpcontribs_api/domains/tables/repository.py @@ -0,0 +1,13 @@ +from mpcontribs_api.domains._shared.components import MongoDbComponentsRepository +from mpcontribs_api.domains.tables.models import ( + Table, + TableFilter, + TableIn, + TableOut, + TablePatch, +) + + +class MongoDbTableRepository(MongoDbComponentsRepository[Table, TableIn, TableOut, TableFilter, TablePatch]): + document_model = Table + out_model = TableOut diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py index 4a1163b41b..a974c31ba1 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py @@ -4,7 +4,7 @@ import json import zlib from abc import ABC, abstractmethod -from collections.abc import AsyncIterable, AsyncIterator, Callable +from collections.abc import AsyncIterable, AsyncIterator, Callable, Iterable from contextlib import AbstractAsyncContextManager from typing import Any @@ -79,6 +79,7 @@ async def get_many( filter: TFilter, fields: frozenset[str] | None = None, pagination: CursorParams | None = None, + restrict_ids: Iterable[Any] | None = None, ) -> Page[TOut]: """Return a scoped, filtered, cursor-paginated page of projected documents. @@ -86,11 +87,16 @@ async def get_many( pagination (CursorParams): forward-only cursor parameters filter (TFilter): the fastapi-filter query to apply on top of the user scope fields (frozenset[str] | None): fields to project; if None the full document is returned + restrict_ids (Iterable | None): when provided, results are limited to these ids in + addition to the user scope. An empty iterable yields an empty page. Used to gate + reads that are authorized indirectly (e.g. components reachable via a contribution). """ pagination = pagination or CursorParams() projection = self.out_model.projection(fields) query = filter.filter(self.document_model.find(self._scope)) + if restrict_ids is not None: + query = query.find(In(self.document_model.id, list(restrict_ids))) if pagination.cursor is not None: query = query.find(self.document_model.id > self.document_model.decode_cursor(cursor=pagination.cursor)) # pyright: ignore[reportOptionalOperand] docs = await query.sort(self.document_model.id).limit(pagination.limit + 1).project(projection).to_list() # pyright: ignore[reportArgumentType] @@ -155,7 +161,10 @@ async def delete_by_id(self, id: Any, session: AsyncClientSession | None = None) return DeleteResponse(num_deleted=1) async def delete_by_ids(self, ids: list[Any], session: AsyncClientSession | None = None) -> DeleteResponse: - """Delete multiple documents by id. + """Delete multiple scoped documents by id. + + The user scope is injected so callers cannot delete documents they are not permitted to + see; out-of-scope ids simply match nothing and are reported as zero deletions. Args: ids (list[Any]): list of ids to delete @@ -164,9 +173,7 @@ async def delete_by_ids(self, ids: list[Any], session: AsyncClientSession | None Returns: DeleteResponse: the result of the deletion """ - docs = self.document_model.find(In(self.document_model.id, ids), session=session) - if not docs: - raise NotFoundError("No documents with specified ids found", ids=ids) + docs = self.document_model.find(self._scope, In(self.document_model.id, ids), session=session) delete_result = await docs.delete_many(session=session) if not delete_result: raise ValidationError("DeleteResult not returned internally") @@ -268,6 +275,7 @@ async def download( s3: AbstractAsyncContextManager[S3Client], bucket_name: str, key_name: str, + restrict_ids: Iterable[Any] | None = None, ) -> AsyncIterable[bytes]: # Hash parameters to generate key for cache payload = { @@ -278,14 +286,13 @@ async def download( } _ = self._hash_payload(payload) - # Check S3 for the cached file - # TODO: Implement - if not ignore_cache and self._s3_object_exists(bucket_name=bucket_name, key_name=key_name, s3=s3): - # Download from either presigned url - pass + # TODO: S3 download cache. When implemented, this should `await + # self._s3_object_exists(...)` and stream the cached object on a hit. - # If not found in cache, build from MongoDB and save to cache + # Build from MongoDB (and, in future, save to cache) query = filter.filter(self.document_model.find(self._scope)) + if restrict_ids is not None: + query = query.find(In(self.document_model.id, list(restrict_ids))) query = filter.sort(query) serializer = self._get_serializer(format, fields) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py index cc816441fc..8530dcb5d3 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py @@ -151,6 +151,40 @@ async def referenced_component_ids( referenced.add(rid) return referenced + # TODO: should return document with update + async def list_referenced_component_ids( + self, + ref_field: str, + *, + scoped: bool, + ) -> set[PydanticObjectId]: + """Return every component id referenced through ``ref_field`` by matching contributions. + + Unlike :meth:`referenced_component_ids`, this takes no candidate list — it enumerates all + ids reachable from contributions in scope. + + Args: + ref_field: the contribution link field to inspect ("structures" | "tables" | + "attachments"). Always a fixed class-attr at the call site, never user input. + scoped: when ``True`` the user scope is applied (access gate); when ``False`` the + check spans every contribution. + + Returns: + set[PydanticObjectId]: all component ids referenced via ``ref_field`` + """ + key = f"{ref_field}.$id" + query: dict[str, Any] = {key: {"$exists": True}} + if scoped and self._scope: + query = {"$and": [self._scope, query]} + referenced: set[PydanticObjectId] = set() + collection = self.document_model.get_pymongo_collection() + async for doc in collection.find(query, {ref_field: 1}): + for ref in doc.get(ref_field) or []: + rid = ref.id if hasattr(ref, "id") else ref.get("$id") + if rid is not None: + referenced.add(rid) + return referenced + async def update_contribution(self, doc: Contribution, update_data: dict[str, Any]) -> None: """Apply a partial update to an existing Contribution document.""" await doc.update(Set(update_data)) @@ -198,7 +232,7 @@ async def upsert_contribution_by_id(self, id: str, contribution: ContributionIn) Returns: ContributionOut: the upserted document""" doc = self.document_model.from_input_model(contribution) - return self.document_model.find_one( + query = self.document_model.find_one( self._scope, self.document_model.id == self._convert_object_id(id), ).upsert( @@ -206,6 +240,7 @@ async def upsert_contribution_by_id(self, id: str, contribution: ContributionIn) on_insert=doc, response_type=UpdateResponse.NEW_DOCUMENT, ) + return await query # pyright: ignore[reportGeneralTypeIssues] # beanie UpdateQuery is awaitable, but pyright doesn't see it async def download_contributions( self, diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py index 2705963d07..f0f3f09f36 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py @@ -9,6 +9,7 @@ ProjectOut, ProjectPatch, ) +from mpcontribs_api.exceptions import PermissionError from mpcontribs_api.pagination import CursorParams @@ -28,6 +29,10 @@ class MongoDbProjectRepository(MongoDbRepository[Project, ProjectIn, ProjectOut, document_model = Project out_model = ProjectOut + def __init__(self, user: User) -> None: + super().__init__(user) + self._user = user + @staticmethod def _build_scope(user: User) -> dict[str, Any]: """Provides scope based on current user's permitted groups and publicly released data.""" @@ -66,10 +71,17 @@ async def delete_project_by_id(self, id: str) -> None: await self.delete_by_id(id) async def upsert_project_by_id(self, id: str, data: ProjectIn) -> Project: - """Upsert a project by provided id. + """Upsert a project by provided id, authorized to the current user. + + Update the document if the id exists, otherwise insert a new one under that id. + Authorization (the read scope is for visibility, not write access, so it is not + reused here): + + - **Existing project:** only its ``owner`` or an admin may overwrite it. The stored + ``owner`` is preserved — ownership cannot be reassigned through the request body. + - **New project:** ``owner`` is forced to the caller, ignoring any body value. - Upsert: Update document if id is found, otherwise insert new document using id. - Note: Relies on the path param 'id' for finding, rather than the body's id. + Note: relies on the path param ``id`` for identity, not the body's id. Args: id (str): the id of the project to upsert @@ -77,7 +89,23 @@ async def upsert_project_by_id(self, id: str, data: ProjectIn) -> Project: Returns: Project: the full document that either replaced an old one or was inserted + + Raises: + PermissionError: if a non-owner, non-admin caller targets an existing project """ + # The route enforces authentication, so an anonymous caller should never reach here. + if self._user.username is None: + raise PermissionError(required_role="authenticated") + + existing = await self.document_model.find_one(self.document_model.id == id) project = self.document_model.from_input_model(data) project.id = id + if existing is not None: + if not (self._user.is_admin or existing.owner == self._user.username): + raise PermissionError(required_role="owner-or-admin") + # Ownership is immutable via upsert; keep the original owner. + project.owner = existing.owner + else: + # New project: the caller owns it, regardless of the submitted owner. + project.owner = self._user.username return await project.save() diff --git a/mpcontribs-api/tests/integration/db/test_contributions_repository.py b/mpcontribs-api/tests/integration/db/test_contributions_repository.py index 4ed3b7a5b7..4d3cd97c89 100644 --- a/mpcontribs-api/tests/integration/db/test_contributions_repository.py +++ b/mpcontribs-api/tests/integration/db/test_contributions_repository.py @@ -476,3 +476,42 @@ async def test_scope_limits_what_anon_can_delete(self, db): remaining = await Contribution.find().to_list() identifiers = {d.identifier for d in remaining} assert "bdel-scope-priv" in identifiers + + +class TestUpsertContributionById: + async def test_insert_when_id_absent_persists_document(self, db): + new_id = PydanticObjectId() + payload = _contrib_in(identifier="ups-new", _id=new_id) + result = await _repo(ADMIN).upsert_contribution_by_id(str(new_id), payload) + # Must be the resolved document, not an un-awaited query object. + assert isinstance(result, Contribution) + stored = await Contribution.find_one(Contribution.id == new_id) + assert stored is not None + assert stored.identifier == "ups-new" + + async def test_update_when_id_present_applies_change(self, db): + existing = await _insert(identifier="ups-existing") + payload = _contrib_in(identifier="ups-existing", formula="Li2O", _id=existing.id) + result = await _repo(ADMIN).upsert_contribution_by_id(str(existing.id), payload) + assert isinstance(result, Contribution) + stored = await Contribution.find_one(Contribution.id == existing.id) + assert stored is not None + assert stored.formula == "Li2O" + + +class TestDeleteByIdsScope: + async def test_anon_cannot_delete_out_of_scope_ids(self, db): + pub = await _insert(identifier="dbi-pub", is_public=True) + priv = await _insert(identifier="dbi-priv", is_public=False) + # Anonymous scope only sees public docs; deleting both ids must spare the private one. + result = await _repo(ANON).delete_by_ids([pub.id, priv.id]) + assert result.num_deleted == 1 + remaining = {d.identifier for d in await Contribution.find().to_list()} + assert "dbi-priv" in remaining + assert "dbi-pub" not in remaining + + async def test_admin_deletes_all_ids(self, db): + a = await _insert(identifier="dbi-a", is_public=False) + b = await _insert(identifier="dbi-b", is_public=False) + result = await _repo(ADMIN).delete_by_ids([a.id, b.id]) + assert result.num_deleted == 2 diff --git a/mpcontribs-api/tests/integration/db/test_projects_repository.py b/mpcontribs-api/tests/integration/db/test_projects_repository.py index fc6dac2463..137a7495a2 100644 --- a/mpcontribs-api/tests/integration/db/test_projects_repository.py +++ b/mpcontribs-api/tests/integration/db/test_projects_repository.py @@ -293,3 +293,51 @@ async def test_upsert_uses_path_id_not_body_id(self, db): await _repo(ADMIN).upsert_project_by_id(id="path-id", data=data) found = await Project.find_one(Project.id == "path-id") assert found is not None + + +# --------------------------------------------------------------------------- +# upsert_project_by_id — authorization (owner-or-admin) +# --------------------------------------------------------------------------- + +BOB = User(username="google:bob@example.com", groups=frozenset()) + + +class TestUpsertProjectAuthorization: + async def test_owner_can_overwrite_own_project(self, db): + await _insert("auth-own", owner="google:alice@example.com") + data = _project_in("auth-own", owner="google:alice@example.com", title="Owner Edit") + await _repo(ALICE).upsert_project_by_id(id="auth-own", data=data) + found = await Project.find_one(Project.id == "auth-own") + assert found.title == "Owner Edit" + + async def test_admin_can_overwrite_any_project(self, db): + await _insert("auth-admin", owner="google:alice@example.com") + data = _project_in("auth-admin", owner="google:alice@example.com", title="Admin Edit") + await _repo(ADMIN).upsert_project_by_id(id="auth-admin", data=data) + found = await Project.find_one(Project.id == "auth-admin") + assert found.title == "Admin Edit" + + async def test_non_owner_cannot_overwrite(self, db): + await _insert("auth-other", owner="google:alice@example.com", title="Original") + data = _project_in("auth-other", owner="google:alice@example.com", title="Hijacked") + from mpcontribs_api.exceptions import PermissionError as AppPermissionError + + with pytest.raises(AppPermissionError): + await _repo(BOB).upsert_project_by_id(id="auth-other", data=data) + found = await Project.find_one(Project.id == "auth-other") + assert found.title == "Original" + + async def test_new_project_sets_owner_to_caller(self, db): + # Body owner is someone else; the caller's identity must win. + data = _project_in("auth-newowner", owner="google:alice@example.com") + await _repo(BOB).upsert_project_by_id(id="auth-newowner", data=data) + found = await Project.find_one(Project.id == "auth-newowner") + assert found.owner == "google:bob@example.com" + + async def test_update_preserves_original_owner(self, db): + await _insert("auth-preserve", owner="google:alice@example.com") + # Alice tries to reassign ownership via the body; owner must stay hers. + data = _project_in("auth-preserve", owner="google:bob@example.com", title="Edit") + await _repo(ALICE).upsert_project_by_id(id="auth-preserve", data=data) + found = await Project.find_one(Project.id == "auth-preserve") + assert found.owner == "google:alice@example.com" From a92534520104e0af8a4ff4a6f74f85dbcca60c77 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 18 Jun 2026 12:19:36 -0700 Subject: [PATCH 379/591] Enforce contribution-scoped components at service level --- .../mpcontribs_api/domains/_shared/service.py | 172 +++++++++ .../domains/contributions/service.py | 328 ++++++++++++++++++ .../mpcontribs_api/domains/_shared/service.py | 38 +- .../domains/contributions/service.py | 2 +- .../unit/domains/test_component_service.py | 77 ++++ .../unit/domains/test_contribution_service.py | 21 ++ 6 files changed, 628 insertions(+), 10 deletions(-) create mode 100644 mpcontribs-api/build/lib/mpcontribs_api/domains/_shared/service.py create mode 100644 mpcontribs-api/build/lib/mpcontribs_api/domains/contributions/service.py diff --git a/mpcontribs-api/build/lib/mpcontribs_api/domains/_shared/service.py b/mpcontribs-api/build/lib/mpcontribs_api/domains/_shared/service.py new file mode 100644 index 0000000000..686b87df75 --- /dev/null +++ b/mpcontribs-api/build/lib/mpcontribs_api/domains/_shared/service.py @@ -0,0 +1,172 @@ +from collections.abc import AsyncIterable +from contextlib import AbstractAsyncContextManager + +from fastapi_filter.contrib.beanie import Filter +from pydantic import BaseModel +from pymongo.asynchronous.client_session import AsyncClientSession +from types_aiobotocore_s3 import S3Client + +from mpcontribs_api.domains._shared.components import MongoDbComponentsRepository +from mpcontribs_api.domains._shared.models import Component, ComponentDeleteResponse, DocumentOut +from mpcontribs_api.domains._shared.types import DownloadFormat, ShortMimeFormat +from mpcontribs_api.domains.contributions.repository import MongoDbContributionRepository +from mpcontribs_api.exceptions import NotFoundError +from mpcontribs_api.pagination import CursorParams, Page + + +class ComponentService[ + TDoc: Component, + TIn: Component, + TOut: DocumentOut, + TFilter: Filter, + TPatch: BaseModel, +]: + """Service layer for all shared component logic. + + Components (attachments, structures, tables) share the same access model and CRUD surface, so a + single configurable service handles every domain rather than a per-domain subclass. Each domain + is distinguished only by: + + - ``ref_field``: the field on a contribution that references this component type + (``"attachments"`` / ``"structures"`` / ``"tables"``) + - ``bucket_name``: the S3 bucket downloads are cached in (defaults to ``ref_field``) + + Reads, inserts, patches, and downloads forward to the components repository. Deletion is the only + operation with cross-repository logic, applying two gates: + + 1. **Access (scoped):** candidates are restricted to components reachable via a contribution + in the user's scope. A component the user cannot reach is treated as not found. + 2. **Integrity (global):** any reachable candidate still referenced by *any* contribution is + skipped; the rest are deleted. + """ + + def __init__( + self, + components: MongoDbComponentsRepository[TDoc, TIn, TOut, TFilter, TPatch], + contributions: MongoDbContributionRepository, + *, + ref_field: str, + bucket_name: str | None = None, + ) -> None: + self._components = components + self._contributions = contributions + self._ref_field = ref_field + self._bucket_name = bucket_name or ref_field + + async def get_many( + self, + filter: TFilter, + pagination: CursorParams, + fields: frozenset[str] | None, + ) -> Page[TOut]: + """Return a page of components reachable via an in-scope contribution. + + Components have no independent access field, so visibility is gated by contribution + reachability: results are restricted to ids referenced by a contribution the caller is + allowed to see (the same access gate that ``delete`` applies). + """ + allowed = await self._contributions.list_referenced_component_ids(self._ref_field, scoped=True) + return await self._components.get_many( + pagination=pagination, filter=filter, fields=fields, restrict_ids=allowed + ) + + async def get_by_id(self, id: str, fields: frozenset[str] | None) -> TDoc | TOut | None: + """Find a single component by id, gated by contribution reachability. + + Returns ``None`` (treated as not found) when no in-scope contribution references the id, + so callers cannot read a component belonging to a contribution they cannot see. + """ + oid = self._components._convert_object_id(id) + if not await self._contributions.referenced_component_ids(self._ref_field, [oid], scoped=True): + return None + return await self._components.get_component_by_id(id, fields) + + async def insert( + self, + components: list[TIn], + session: AsyncClientSession | None = None, + ) -> list[TDoc]: + """Bulk-insert components, deduplicated by content hash. See ``insert_components``.""" + return await self._components.insert_components(components=components, session=session) + + async def patch_by_id(self, id: str, update: TPatch) -> TDoc: + """Partially update a component by id, gated by contribution reachability. + + Raises ``NotFoundError`` when no in-scope contribution references the id, mirroring the + access gate on ``delete_by_id``. + """ + oid = self._components._convert_object_id(id) + if not await self._contributions.referenced_component_ids(self._ref_field, [oid], scoped=True): + raise NotFoundError(self._components._not_found(id)) + return await self._components.patch_component_by_id(id=id, update=update) + + async def download( + self, + format: DownloadFormat, + short_mime: ShortMimeFormat, + ignore_cache: bool, + filter: TFilter, + fields: frozenset[str] | None, + s3: AbstractAsyncContextManager[S3Client], + ) -> AsyncIterable[bytes]: + """Stream a gzip-compressed export of matching components. See ``download``. + + The S3 cache location is owned by the service: ``bucket_name`` defaults to ``ref_field`` and + ``key_name`` is currently unused. Like the other reads, the export is gated to components + reachable via an in-scope contribution. + """ + allowed = await self._contributions.list_referenced_component_ids(self._ref_field, scoped=True) + return self._components.download( + format=format, + short_mime=short_mime, + ignore_cache=ignore_cache, + filter=filter, + fields=fields, + s3=s3, + bucket_name=self._bucket_name, + key_name="", # TODO: Temp + restrict_ids=allowed, + ) + + async def delete(self, filter: TFilter) -> ComponentDeleteResponse: + """Delete components matching ``filter`` that are reachable and globally unreferenced. + + Args: + filter (TFilter): the component-specific query to apply + + Returns: + ComponentDeleteResponse: count deleted, plus the ids skipped because a contribution + still references them + """ + candidate_ids = await self._components.list_ids(filter) + reachable = await self._contributions.referenced_component_ids(self._ref_field, candidate_ids, scoped=True) + if not reachable: + return ComponentDeleteResponse(num_deleted=0) + referenced = await self._contributions.referenced_component_ids(self._ref_field, list(reachable), scoped=False) + deletable = [cid for cid in reachable if cid not in referenced] + num_deleted = (await self._components.delete_by_ids(deletable)).num_deleted if deletable else 0 + return ComponentDeleteResponse( + num_deleted=num_deleted, + num_skipped=len(referenced), + referenced_ids=sorted(referenced), + ) + + async def delete_by_id(self, id: str) -> ComponentDeleteResponse: + """Delete a single component by id, subject to the access and integrity gates. + + Args: + id (str): the str representation of the component's ObjectId + + Returns: + ComponentDeleteResponse: the deletion result, or a skipped result if still referenced + + Raises: + NotFoundError: if the component is not reachable via any in-scope contribution + """ + oid = self._components._convert_object_id(id) + if not await self._contributions.referenced_component_ids(self._ref_field, [oid], scoped=True): + raise NotFoundError(self._components._not_found(id)) + if await self._contributions.referenced_component_ids(self._ref_field, [oid], scoped=False): + return ComponentDeleteResponse(num_deleted=0, num_skipped=1, referenced_ids=[oid]) + deleted = await self._components.delete_by_id(oid) + return ComponentDeleteResponse(num_deleted=deleted.num_deleted) diff --git a/mpcontribs-api/build/lib/mpcontribs_api/domains/contributions/service.py b/mpcontribs-api/build/lib/mpcontribs_api/domains/contributions/service.py new file mode 100644 index 0000000000..5da70bdc31 --- /dev/null +++ b/mpcontribs-api/build/lib/mpcontribs_api/domains/contributions/service.py @@ -0,0 +1,328 @@ +import asyncio +from collections import defaultdict +from typing import cast + +import structlog +from beanie import Link, PydanticObjectId +from pymongo import AsyncMongoClient +from pymongo.asynchronous.client_session import AsyncClientSession +from pymongo.errors import BulkWriteError + +from mpcontribs_api.config import MongoSettings, get_settings +from mpcontribs_api.domains._shared.bulk import ( + BulkDeleteSummary, + BulkFailure, + BulkWriteSummary, + bulk_failure_from_exception, +) +from mpcontribs_api.domains._shared.repository import MongoDbRepository +from mpcontribs_api.domains.attachments.repository import MongoDbAttachmentRepository +from mpcontribs_api.domains.contributions.models import Contribution, ContributionFilter, ContributionIn +from mpcontribs_api.domains.contributions.repository import MongoDbContributionRepository +from mpcontribs_api.domains.structures.models import Structure +from mpcontribs_api.domains.structures.repository import MongoDbStructureRepository +from mpcontribs_api.domains.tables.models import Table +from mpcontribs_api.domains.tables.repository import MongoDbTableRepository +from mpcontribs_api.exceptions import AppError, ValidationError +from mpcontribs_api.pagination import CursorParams + +logger = structlog.get_logger(__name__) + + +class ContributionService: + def __init__( + self, + client: AsyncMongoClient, + contributions: MongoDbContributionRepository, + structures: MongoDbStructureRepository, + attachments: MongoDbAttachmentRepository, + tables: MongoDbTableRepository, + settings: MongoSettings | None = None, + ): + self._client = client + self._contributions = contributions + self._structures = structures + self._attachments = attachments + self._tables = tables + self._settings = settings or get_settings().mongo + + @property + def _children(self) -> dict[str, MongoDbRepository]: + return { + "structures": self._structures, + "attachments": self._attachments, + "tables": self._tables, + } + + async def insert_contributions( + self, + contributions: list[ContributionIn], + ) -> BulkWriteSummary[Contribution]: + """Atomic bulk insert contributions, atomically per top-level contribution. + + Contributions carrying no components are inserted in one ``insert_many`` (no transaction); + contributions with components run inside their own MongoDB transaction so the contribution + and its components commit or roll back together. Concurrent transactions are bounded by + ``settings.mongo.max_concurrent_transactions``. Per-item failures are returned in the + summary's ``failed`` list; the request as a whole does not raise on partial failure. + + Args: + contributions: contributions to insert; may include nested structures/tables/attachments + + Returns: + BulkWriteSummary[Contribution]: per-item outcome, sized to ``len(contributions)`` + + Raises: + ValidationError: if duplicate keys (project-identifier) are found in ``contributions`` + """ + if not contributions: + return BulkWriteSummary[Contribution](total=0, succeeded=[], failed=[]) + + self._reject_duplicate_keys(contributions) + + oversize_failures, remaining_indices = self._split_oversize(contributions) + no_comp_indices = [i for i in remaining_indices if not contributions[i].has_components()] + with_comp_indices = [i for i in remaining_indices if contributions[i].has_components()] + + no_comp_succeeded, no_comp_failed = await self._insert_no_components( + indices=no_comp_indices, + contributions=contributions, + ) + with_comp_succeeded, with_comp_failed = await self._insert_with_components( + indices=with_comp_indices, + contributions=contributions, + ) + + succeeded = [doc for _, doc in sorted(no_comp_succeeded + with_comp_succeeded, key=lambda p: p[0])] + failed = sorted( + oversize_failures + no_comp_failed + with_comp_failed, + key=lambda f: f.index, + ) + return BulkWriteSummary[Contribution](total=len(contributions), succeeded=succeeded, failed=failed) + + def _reject_duplicate_keys(self, contributions: list[ContributionIn]) -> None: + """Reject the whole batch if any identifying key appears more than once. + + Mongo would surface this as a duplicate key error; catching it upfront keeps a guaranteed + failure from consuming a transaction slot and gives the caller all offending indices at once. + + The dedup key is derived from every value in ``identifiers()`` so adding a field to the + uniqueness contract there flows through here automatically. + """ + seen: dict[tuple[str, ...], list[int]] = defaultdict(list) + for index, contribution in enumerate(contributions): + ids = contribution.identifiers() + seen[tuple(ids.values())].append(index) + duplicates = sorted(index for indices in seen.values() if len(indices) > 1 for index in indices) + if duplicates: + raise ValidationError( + "Duplicate (project, identifier) pairs in batch", + contribution_indices=duplicates, + ) + + def _split_oversize(self, contributions: list[ContributionIn]) -> tuple[list[BulkFailure], list[int]]: + """Reject contributions whose component count exceeds the per-contribution ceiling. + + Returns the failure entries for the oversize items and the indices of the remaining items + that should proceed to Mongo. Doing this upfront avoids burning a transaction slot on a + request guaranteed to exceed transactionLifetimeLimitSeconds. + """ + cap = self._settings.max_components_per_contribution + oversize: list[BulkFailure] = [] + remaining: list[int] = [] + for i, contrib in enumerate(contributions): + count = contrib.component_count() + if count > cap: + oversize.append( + BulkFailure( + index=i, + identifier=contrib.identifiers(), + error_code="validation_error", + message=f"contribution has {count} components, exceeds cap of {cap}. " + "Recommend inserting the component alone, followed by bulk inserts of components", + ) + ) + else: + remaining.append(i) + return oversize, remaining + + async def _insert_no_components( + self, + indices: list[int], + contributions: list[ContributionIn], + ) -> tuple[list[tuple[int, Contribution]], list[BulkFailure]]: + """Single-collection bulk insert for component-free contributions. + + Uses ``ordered=False`` so a single bad item doesn't sink the rest of the batch. pymongo + raises ``BulkWriteError`` with per-index error info on partial failure; we map that back + onto the original input indices. + """ + if not indices: + return [], [] + docs = [Contribution.from_input_model(contributions[i]) for i in indices] + try: + await self._contributions.insert_many_contributions(docs) + return list(zip(indices, docs, strict=False)), [] + except BulkWriteError as exc: + return self._partition_bulk_write_error(indices, docs, contributions, exc) + + @staticmethod + def _partition_bulk_write_error( + indices: list[int], + docs: list[Contribution], + contributions: list[ContributionIn], + exc: BulkWriteError, + ) -> tuple[list[tuple[int, Contribution]], list[BulkFailure]]: + """Map pymongo's per-position writeErrors back to the caller's original input indices.""" + write_errors = exc.details.get("writeErrors", []) if exc.details else [] + failed_positions = {err.get("index"): err for err in write_errors} + succeeded: list[tuple[int, Contribution]] = [] + failed: list[BulkFailure] = [] + for position, (orig_index, doc) in enumerate(zip(indices, docs, strict=False)): + err = failed_positions.get(position) + if err is None: + succeeded.append((orig_index, doc)) + else: + failed.append( + BulkFailure( + index=orig_index, + identifier=contributions[orig_index].identifiers(), + error_code="conflict" if err.get("code") == 11000 else "write_error", + message=err.get("errmsg", "write failed"), + ) + ) + return succeeded, failed + + async def _insert_with_components( + self, + indices: list[int], + contributions: list[ContributionIn], + ) -> tuple[list[tuple[int, Contribution]], list[BulkFailure]]: + """Per-contribution transaction path, bounded by ``max_concurrent_transactions``.""" + if not indices: + return [], [] + sem = asyncio.Semaphore(self._settings.max_concurrent_transactions) + + async def _bounded(orig_index: int) -> Contribution | BulkFailure: + async with sem: + return await self._insert_one_with_components(orig_index, contributions[orig_index]) + + results = await asyncio.gather(*[_bounded(i) for i in indices]) + succeeded: list[tuple[int, Contribution]] = [] + failed: list[BulkFailure] = [] + for orig_index, outcome in zip(indices, results, strict=True): + if isinstance(outcome, BulkFailure): + failed.append(outcome) + else: + succeeded.append((orig_index, outcome)) + return succeeded, failed + + async def _insert_one_with_components( + self, + index: int, + contrib: ContributionIn, + ) -> Contribution | BulkFailure: + """Run a single contribution + its components inside a transaction. + + Uses ``session.with_transaction`` so transient txn errors (write conflicts, primary step- + downs) get pymongo's retry treatment. Any exception is converted to a ``BulkFailure`` so + the surrounding ``asyncio.gather`` sees a normal return value for every coroutine. + """ + try: + async with self._client.start_session() as session: + + async def _txn(s: AsyncClientSession) -> Contribution: + return await self._do_insert(contrib, s) + + return await session.with_transaction(_txn) + except AppError as exc: + return bulk_failure_from_exception(index, contrib.identifiers(), exc) + except Exception as exc: + logger.error("insert_contribution_failed", index=index, identifier=contrib.identifiers(), exc_info=True) + return bulk_failure_from_exception(index, contrib.identifiers(), exc) + + async def _do_insert(self, contrib: ContributionIn, session: AsyncClientSession) -> Contribution: + """Insert components then the contribution itself, all in the given session. + + Components are inserted sequentially because a session is single-threaded — sharing it + across concurrent awaits would corrupt the wire protocol. + """ + structures = await self._structures.insert_components(contrib.structures or [], session=session) + tables = await self._tables.insert_components(contrib.tables or [], session=session) + + doc = Contribution.from_input_model(contrib) + doc.structures = cast(list[Link[Structure]] | None, structures or None) + doc.tables = cast(list[Link[Table]] | None, tables or None) + return await self._contributions.insert_contribution(doc, session=session) + + async def upsert_contributions(self, contributions: list[ContributionIn]) -> list[Contribution]: + """Upsert contributions by their identifying fields, bounded by concurrency caps. + + Components (structures, tables, attachments) must be managed via their respective + services. If any contribution in the batch carries components, the entire request is + rejected before any database writes occur. + + Each item is upserted atomically by ``ContributionIn.identifiers()`` via a single + ``findOneAndUpdate(..., upsert=True)`` so two requests targeting the same key cannot + race past the find branch — the unique index over those fields is the tiebreaker. + Concurrent upserts within a batch are bounded by ``settings.mongo.max_concurrent_transactions`` + + Args: + contributions: contributions to upsert; must not include nested components + + Returns: + list[Contribution]: upserted documents in input order + """ + indices_with_components = [i for i, c in enumerate(contributions) if c.has_components()] + if indices_with_components: + raise ValidationError( + "Components must be managed via their respective services, not via contribution upsert.", + contribution_indices=indices_with_components, + ) + + sem = asyncio.Semaphore(self._settings.max_concurrent_transactions) + + async def _bounded_upsert(contrib: ContributionIn) -> Contribution: + async with sem: + return await self._contributions.upsert_contribution_by_identifiers(contrib.identifiers(), contrib) + + return await asyncio.gather(*[_bounded_upsert(c) for c in contributions]) + + async def delete_contributions(self, filter: ContributionFilter) -> BulkDeleteSummary: + """Delete a contribution and all of its child components + + Doesn't guarantee complete atomicity, but prevents orphaned children by deleting components first. + + Args: + filter (ContributionFilter): the Contribution-specific query to apply on top of the user scope + + + Returns: + BulkDeleteSummary: a summary of how many documents and child documents were deleted + """ + num_deleted_components = 0 + num_deleted_contributions = 0 + # Loop through cursor rather than materialize arbitrary number of Contributions + while True: + # Since we are deleting everything matching filter, we can continuously get the 1st page + page = await self._contributions.get_contributions( + pagination=CursorParams(cursor=None, limit=100), + filter=filter, + ) + # For each component type, gather ObjectIds then bulk delete them + # - components first so no children are left orphaned + for field, repo in self._children.items(): + ids = [link.ref.id for c in page.items for link in (getattr(c, field) or [])] + if ids: + deleted_components = await repo.delete_by_ids(ids) + num_deleted_components += deleted_components.num_deleted if deleted_components else 0 + + # Delete Contributions in this batch by ID + # need to make a new filter so we don't eagerly delete all contributions before their components are deleted + deleted_contribs = await self._contributions.delete_contributions( + ContributionFilter(id__in=[cast(PydanticObjectId, c.id) for c in page.items]) + ) + num_deleted_contributions += deleted_contribs.deleted_count if deleted_contribs else 0 + if not page.items: + break + return BulkDeleteSummary(num_deleted=num_deleted_contributions, num_children_deleted=num_deleted_components) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/service.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/service.py index f7c8d05e98..1b17a18d86 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/service.py @@ -59,11 +59,26 @@ async def get_many( pagination: CursorParams, fields: frozenset[str] | None, ) -> Page[TOut]: - """Return a scoped, filtered, cursor-paginated page of components. See ``get_many``.""" - return await self._components.get_many(pagination=pagination, filter=filter, fields=fields) + """Return a page of components reachable via an in-scope contribution. + + Components have no independent access field, so visibility is gated by contribution + reachability: results are restricted to ids referenced by a contribution the caller is + allowed to see + """ + allowed = await self._contributions.list_referenced_component_ids(self._ref_field, scoped=True) + return await self._components.get_many( + pagination=pagination, filter=filter, fields=fields, restrict_ids=allowed + ) async def get_by_id(self, id: str, fields: frozenset[str] | None) -> TDoc | TOut | None: - """Find a single component by id, scoped to the current user. See ``get_component_by_id``.""" + """Find a single component by id, gated by contribution reachability. + + Returns ``None`` (treated as not found) when no in-scope contribution references the id, + so callers cannot read a component belonging to a contribution they cannot see. + """ + oid = self._components._convert_object_id(id) + if not await self._contributions.referenced_component_ids(self._ref_field, [oid], scoped=True): + return None return await self._components.get_component_by_id(id, fields) async def insert( @@ -75,7 +90,14 @@ async def insert( return await self._components.insert_components(components=components, session=session) async def patch_by_id(self, id: str, update: TPatch) -> TDoc: - """Partially update a component by id, scoped to the current user. See ``patch_component_by_id``.""" + """Partially update a component by id, gated by contribution reachability. + + Raises: + NotFoundError: when no in-scope contribution references the id + """ + oid = self._components._convert_object_id(id) + if not await self._contributions.referenced_component_ids(self._ref_field, [oid], scoped=True): + raise NotFoundError(self._components._not_found(id)) return await self._components.patch_component_by_id(id=id, update=update) async def download( @@ -87,11 +109,8 @@ async def download( fields: frozenset[str] | None, s3: AbstractAsyncContextManager[S3Client], ) -> AsyncIterable[bytes]: - """Stream a gzip-compressed export of matching components. See ``download``. - - The S3 cache location is owned by the service: ``bucket_name`` defaults to ``ref_field`` and - ``key_name`` is currently unused. - """ + """Stream a gzip-compressed export of matching components. See ``download``.""" + allowed = await self._contributions.list_referenced_component_ids(self._ref_field, scoped=True) return self._components.download( format=format, short_mime=short_mime, @@ -101,6 +120,7 @@ async def download( s3=s3, bucket_name=self._bucket_name, key_name="", # TODO: Temp + restrict_ids=allowed, ) async def delete(self, filter: TFilter) -> ComponentDeleteResponse: diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py index dc7b1930a6..5da70bdc31 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py @@ -312,7 +312,7 @@ async def delete_contributions(self, filter: ContributionFilter) -> BulkDeleteSu # For each component type, gather ObjectIds then bulk delete them # - components first so no children are left orphaned for field, repo in self._children.items(): - ids = [link.ref.id for c in page.items for link in getattr(c, field)] + ids = [link.ref.id for c in page.items for link in (getattr(c, field) or [])] if ids: deleted_components = await repo.delete_by_ids(ids) num_deleted_components += deleted_components.num_deleted if deleted_components else 0 diff --git a/mpcontribs-api/tests/unit/domains/test_component_service.py b/mpcontribs-api/tests/unit/domains/test_component_service.py index 090716b402..53f86ce17d 100644 --- a/mpcontribs-api/tests/unit/domains/test_component_service.py +++ b/mpcontribs-api/tests/unit/domains/test_component_service.py @@ -145,3 +145,80 @@ async def test_delete_by_id_reachable_and_unreferenced_deletes(): assert result.num_deleted == 1 assert result.num_skipped == 0 components.delete_by_id.assert_awaited_once_with(oid) + + +# --------------------------------------------------------------------------- +# Read gating: get_by_id / get_many / patch_by_id are reachability-scoped +# --------------------------------------------------------------------------- + + +def _make_read_service(*, reachable: set[PydanticObjectId]) -> tuple[ComponentService, AsyncMock, AsyncMock]: + """ComponentService whose contribution repo reports `reachable` ids as in-scope.""" + components = AsyncMock(name="components") + components._convert_object_id = MagicMock(side_effect=lambda s: PydanticObjectId(s)) + components._not_found = MagicMock(return_value="not found") + + contributions = AsyncMock(name="contributions") + + async def _referenced(ref_field, ids, *, scoped): + return {i for i in ids if i in reachable} if scoped else set() + + contributions.referenced_component_ids = AsyncMock(side_effect=_referenced) + contributions.list_referenced_component_ids = AsyncMock(return_value=reachable) + + service = ComponentService(components, contributions, ref_field="attachments") + return service, components, contributions + + +async def test_get_by_id_unreachable_returns_none_without_fetch(): + oid = _oid() + svc, components, _ = _make_read_service(reachable=set()) + + result = await svc.get_by_id(str(oid), fields=None) + + assert result is None + components.get_component_by_id.assert_not_awaited() + + +async def test_get_by_id_reachable_fetches_component(): + oid = _oid() + svc, components, _ = _make_read_service(reachable={oid}) + components.get_component_by_id = AsyncMock(return_value="the-component") + + result = await svc.get_by_id(str(oid), fields=None) + + assert result == "the-component" + components.get_component_by_id.assert_awaited_once() + + +async def test_get_many_restricts_to_reachable_ids(): + a, b = _oid(), _oid() + svc, components, contributions = _make_read_service(reachable={a, b}) + components.get_many = AsyncMock(return_value="page") + + await svc.get_many(filter=AttachmentFilter(), pagination=None, fields=None) + + contributions.list_referenced_component_ids.assert_awaited_once() + assert contributions.list_referenced_component_ids.await_args.kwargs["scoped"] is True + restrict = components.get_many.await_args.kwargs["restrict_ids"] + assert set(restrict) == {a, b} + + +async def test_patch_by_id_unreachable_raises_not_found(): + oid = _oid() + svc, components, _ = _make_read_service(reachable=set()) + + with pytest.raises(NotFoundError): + await svc.patch_by_id(str(oid), update=MagicMock()) + components.patch_component_by_id.assert_not_awaited() + + +async def test_patch_by_id_reachable_patches(): + oid = _oid() + svc, components, _ = _make_read_service(reachable={oid}) + components.patch_component_by_id = AsyncMock(return_value="patched") + + result = await svc.patch_by_id(str(oid), update=MagicMock()) + + assert result == "patched" + components.patch_component_by_id.assert_awaited_once() diff --git a/mpcontribs-api/tests/unit/domains/test_contribution_service.py b/mpcontribs-api/tests/unit/domains/test_contribution_service.py index 69720ecbc0..2b213789c9 100644 --- a/mpcontribs-api/tests/unit/domains/test_contribution_service.py +++ b/mpcontribs-api/tests/unit/domains/test_contribution_service.py @@ -809,3 +809,24 @@ async def test_children_accumulate_across_pages(self): assert summary.num_children_deleted == 2 assert struct_repo.delete_by_ids.await_count == 2 + + +class TestDeleteContributionsNoneComponents: + """ContributionOut leaves unset component fields as None (not []). + + The cascade loop must tolerate None rather than raising TypeError on iteration. + """ + + async def test_none_component_fields_do_not_raise(self): + svc, contrib_repo, struct_repo, table_repo, attach_repo, _ = _make_service() + doc = SimpleNamespace(id=_oid(), structures=None, tables=None, attachments=None) + contrib_repo.get_contributions.side_effect = [_page([doc]), _page([])] + contrib_repo.delete_contributions.side_effect = [_delete_result(1), _delete_result(0)] + + summary = await svc.delete_contributions(_noop_filter()) + + assert summary.num_deleted == 1 + assert summary.num_children_deleted == 0 + struct_repo.delete_by_ids.assert_not_called() + table_repo.delete_by_ids.assert_not_called() + attach_repo.delete_by_ids.assert_not_called() From d3ed0e4f85da313fb9e0c205e062d2f35db50caf Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 18 Jun 2026 12:20:13 -0700 Subject: [PATCH 380/591] Convert id str to objectid --- .../domains/_shared/components.py | 139 ++++++++++++++++++ .../domains/_shared/components.py | 4 +- 2 files changed, 141 insertions(+), 2 deletions(-) create mode 100644 mpcontribs-api/build/lib/mpcontribs_api/domains/_shared/components.py diff --git a/mpcontribs-api/build/lib/mpcontribs_api/domains/_shared/components.py b/mpcontribs-api/build/lib/mpcontribs_api/domains/_shared/components.py new file mode 100644 index 0000000000..196dde4528 --- /dev/null +++ b/mpcontribs-api/build/lib/mpcontribs_api/domains/_shared/components.py @@ -0,0 +1,139 @@ +from typing import Any + +from beanie import PydanticObjectId +from beanie.operators import In +from fastapi_filter.contrib.beanie import Filter +from pydantic import BaseModel +from pymongo.asynchronous.client_session import AsyncClientSession + +from mpcontribs_api.authz import User +from mpcontribs_api.config import get_settings +from mpcontribs_api.domains._shared.models import Component, DeleteResponse, DocumentOut +from mpcontribs_api.domains._shared.repository import MongoDbRepository +from mpcontribs_api.domains._shared.types import MD5Hash + + +class MongoDbComponentsRepository[ + TDoc: Component, + TIn: Component, + TOut: DocumentOut, + TFilter: Filter, + TPatch: BaseModel, +](MongoDbRepository[TDoc, TIn, TOut, TFilter, TPatch]): + @staticmethod + def _build_scope(user: User) -> dict[str, Any]: + return {} + + async def _check_existing( + self, + components: list[TIn] | TIn, + session: AsyncClientSession | None = None, + ) -> tuple[dict[MD5Hash, TIn], dict[str, TDoc]]: + if not isinstance(components, list): + components = [components] + by_md5 = {comp.md5: comp for comp in components} + + # Full fetch so existing docs come back with their ids + # TODO: Most likely does a COLLSCAN - see if we can project to get a COVERED QUERY + existing_docs = await self.document_model.find( + In(self.document_model.md5, list(by_md5.keys())), + session=session, + ).to_list() + return (by_md5, {doc.md5: doc for doc in existing_docs}) + + async def insert_components( + self, + components: list[TIn], + session: AsyncClientSession | None = None, + ) -> list[TDoc]: + """Bulk-insert components, chunked to fit within a transaction's payload budget. + + Args: + components (list[TIn]): components to insert + session (AsyncClientSession): optional client session; pass when inserting inside a transaction + """ + by_md5, existing_by_md5 = await self._check_existing(components=components, session=session) + # Assign ids manually: insert_many won't populate id back onto these + # objects, and get_dict drops id when it's None. + new_docs: list[TDoc] = [] + for md5, comp in by_md5.items(): + if md5 in existing_by_md5: + continue + doc = self.document_model.model_validate(comp.model_dump()) + doc.id = PydanticObjectId() + new_docs.append(doc) + + # TODO: Might want to delegate this logic to a higher level + # - This method might want to simply insert everything it's given + # Insert by chunks + chunk_size = get_settings().mongo.component_insert_chunk_size + for start in range(0, len(new_docs), chunk_size): + await self.document_model.insert_many( + new_docs[start : start + chunk_size], + ordered=False, + session=session, + ) + + # Return a list of documents reflecting what was stored/found + resolved = existing_by_md5 | {doc.md5: doc for doc in new_docs} + return [resolved[md5] for md5 in by_md5] + + async def insert_component(self, component: TIn, *, session: AsyncClientSession | None = None) -> TDoc: + """Insert a single component. + + Args: + component (TIn): the table to insert + + Returns: + TDoc: the component actually in the database + + Raises: + AppError: If insert_one returns None, raises + """ + return (await self.insert_components(components=[component], session=session))[0] + + async def get_component_by_id(self, id: str, fields: frozenset[str] | None) -> TDoc | TOut | None: + """Find a single component by id. See ``get_by_id``. + + The id must be converted to an ObjectId first; ``get_by_id`` compares against the + ObjectId ``_id`` and a raw string would never match. + """ + return await self.get_by_id(self._convert_object_id(id), fields) + + async def delete_components( + self, + filter: TFilter, + session: AsyncClientSession | None = None, + ) -> DeleteResponse: + """Deletes all components matching ``filter``. + + Args: + filter (TFilter): the query to filter components by + session (AsyncClientSession | None): the current session, used to guarantee transactions + + Returns: + DeleteResponse: A report of the deletion + """ + query = filter.filter(self.document_model.find(self._scope, session=session)) + result = await query.delete(session=session) + return DeleteResponse(num_deleted=result.deleted_count if result else 0) + + async def delete_component_by_id( + self, + id: str, + session: AsyncClientSession | None = None, + ) -> DeleteResponse: + """Deletes a single component by Id. + + Args: + id (str): the str representation of the component's ObjectId + session (AsyncClientSession | None): the current session, used to guarantee transactions + + Returns: + DeleteResponse: A report of the deletion + """ + return await self.delete_by_id(id=self._convert_object_id(id), session=session) + + async def patch_component_by_id(self, id: str, update: TPatch) -> TDoc: + """Partially update a component by id, scoped to the current user. See ``patch``.""" + return await self.patch(self._convert_object_id(id), update) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py index a7a25d1cbe..499a334149 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py @@ -93,8 +93,8 @@ async def insert_component(self, component: TIn, *, session: AsyncClientSession return (await self.insert_components(components=[component], session=session))[0] async def get_component_by_id(self, id: str, fields: frozenset[str] | None) -> TDoc | TOut | None: - """Find a single table by id, scoped to the current user. See ``get_by_id``.""" - return await self.get_by_id(id, fields) + """Find a single component by id. See ``get_by_id``.""" + return await self.get_by_id(self._convert_object_id(id), fields) async def delete_components( self, From 1316cbd2da1a67abb267ac490047af11767dad96 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 18 Jun 2026 12:20:42 -0700 Subject: [PATCH 381/591] Readded start_rq so supervisord doesnt fail --- mpcontribs-api/scripts/start_rq.sh | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100755 mpcontribs-api/scripts/start_rq.sh diff --git a/mpcontribs-api/scripts/start_rq.sh b/mpcontribs-api/scripts/start_rq.sh new file mode 100755 index 0000000000..821f6e0d0b --- /dev/null +++ b/mpcontribs-api/scripts/start_rq.sh @@ -0,0 +1,20 @@ +#!/bin/bash +# +# RQ worker placeholder. +# +# The FastAPI rewrite has not yet ported the background worker (the old worker ran +# `flask rq worker`, and Flask is gone). This stub exists so supervisord's `*-worker` +# programs — referenced by supervisord.conf.jinja and started by main.py's `start("rq:*")` +# — have a command to run and do not crash-loop or enter FATAL. +# +# It honors the same startup stagger as the api process, then blocks so supervisord sees a +# healthy RUNNING process. Replace the `exec sleep infinity` below with the real worker +# entrypoint once background processing is reimplemented. + +set -e +zzz=$((DEPLOYMENT * 60)) +echo "$SUPERVISOR_PROCESS_NAME: waiting for $zzz seconds before start..." +sleep "$zzz" + +echo "$SUPERVISOR_PROCESS_NAME: RQ worker not yet ported to the FastAPI rewrite; idling." +exec sleep infinity From 0b808219e982aaf9349c0d64d8651dd889bd1d4d Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 18 Jun 2026 12:22:03 -0700 Subject: [PATCH 382/591] Moved kwargs to new spec --- mpcontribs-api/supervisord/conf.py | 4 ++++ mpcontribs-api/supervisord/supervisord.conf.jinja | 14 ++++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/mpcontribs-api/supervisord/conf.py b/mpcontribs-api/supervisord/conf.py index 1f5bdd5bf7..9e4070a382 100644 --- a/mpcontribs-api/supervisord/conf.py +++ b/mpcontribs-api/supervisord/conf.py @@ -24,6 +24,10 @@ kwargs = { "production": PRODUCTION, + # MPCONTRIBS_ENVIRONMENT drives the new pydantic Settings (log format, debug mode). + "environment": "prod" if PRODUCTION else "dev", + # MPCONTRIBS_VERSION is required by Settings; sourced from the image build arg at container start. + "version": os.environ.get("CONTRIBS_VERSION", os.environ.get("MPCONTRIBS_VERSION", "0.0.0")), "deployments": deployments, "nworkers": NWORKERS, "reload": int(not PRODUCTION), diff --git a/mpcontribs-api/supervisord/supervisord.conf.jinja b/mpcontribs-api/supervisord/supervisord.conf.jinja index e02ba99515..b2e7e913de 100644 --- a/mpcontribs-api/supervisord/supervisord.conf.jinja +++ b/mpcontribs-api/supervisord/supervisord.conf.jinja @@ -4,17 +4,19 @@ user=root logfile=/tmp/supervisord.log pidfile=/tmp/supervisord.pid environment= - MPCONTRIBS_MONGO_HOST="%(ENV_MPCONTRIBS_MONGO_HOST)s", + MPCONTRIBS_ENVIRONMENT="{{ environment }}", + MPCONTRIBS_VERSION="{{ version }}", + MPCONTRIBS_MONGO__URI="%(ENV_MPCONTRIBS_MONGO__URI)s", {% if not production %} AWS_ACCESS_KEY_ID="%(ENV_AWS_ACCESS_KEY_ID)s", AWS_SECRET_ACCESS_KEY="%(ENV_AWS_SECRET_ACCESS_KEY)s", {% endif %} METADATA_URI="%(ENV_ECS_CONTAINER_METADATA_URI_V4)s", - REDIS_ADDRESS="%(ENV_REDIS_ADDRESS)s", + MPCONTRIBS_REDIS__ADDRESS="%(ENV_REDIS_ADDRESS)s", + MPCONTRIBS_REDIS__URL="%(ENV_REDIS_URL)s", AWS_REGION="us-east-1", AWS_DEFAULT_REGION="us-east-1", - MAIL_DEFAULT_SENDER="contribs@materialsproject.org", - FLASK_APP="mpcontribs.api", + MPCONTRIBS_MAIL_DEFAULT_SENDER="contribs@materialsproject.org", PYTHONUNBUFFERED=1, MAX_REQUESTS=0, MAX_REQUESTS_JITTER=0, @@ -72,13 +74,13 @@ environment= API_PORT={{ cfg.api_port }}, PORTAL_PORT={{ cfg.portal_port }}, MPCONTRIBS_API_HOST="{{ mpcontribs_api_host }}:{{ cfg.api_port }}", - MPCONTRIBS_DB_NAME="mpcontribs-{{ cfg.db }}", + MPCONTRIBS_MONGO__DB_NAME="mpcontribs-{{ cfg.db }}", TRADEMARK="{{ cfg.tm }}", MAX_PROJECTS={{ cfg.max_projects }}, S3_DOWNLOADS_BUCKET="mpcontribs-downloads-{{ cfg.s3 }}", S3_ATTACHMENTS_BUCKET="mpcontribs-attachments-{{ cfg.s3 }}", S3_IMAGES_BUCKET="mpcontribs-images-{{ cfg.s3 }}", - ADMIN_GROUP="admin_{{ deployment }}.materialsproject.org" + MPCONTRIBS_MONGO__ADMIN_GROUP="admin_{{ deployment }}.materialsproject.org" {% endset %} [program:{{ deployment }}-worker] From 36700413112cb8fc45c24876b3baa8faf9b42d62 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 18 Jun 2026 12:24:09 -0700 Subject: [PATCH 383/591] Changed example kwargs to new specs --- mpcontribs-api/.env.example | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mpcontribs-api/.env.example b/mpcontribs-api/.env.example index dd2540996c..2bc5ce6f6f 100644 --- a/mpcontribs-api/.env.example +++ b/mpcontribs-api/.env.example @@ -3,8 +3,8 @@ MPCONTRIBS_ENVIRONMENT=dev MPCONTRIBS_MONGO__URI=mongodb+srv://:@host.hash.mongodb.net/?appName=database-name MPCONTRIBS_MONGO__DB_NAME=database-name -MPCONTRIBS_REDIS_ADDRESS=redis-address # placeholder; not used yet -MPCONTRIBS_REDIS_URL=redis-url +MPCONTRIBS_REDIS__ADDRESS=redis-address # placeholder; not used yet +MPCONTRIBS_REDIS__URL=redis-url MPCONTRIBS_MAIL_DEFAULT_SENDER=mail-default-sender # placeholder; not used yet From 8c43253d3ae0d06ed4ea90a80d10715d7ef2894d Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 18 Jun 2026 12:24:34 -0700 Subject: [PATCH 384/591] Added back n start_rq.sh so build succeeds --- mpcontribs-api/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mpcontribs-api/Dockerfile b/mpcontribs-api/Dockerfile index a7b12daba8..741922e7cb 100644 --- a/mpcontribs-api/Dockerfile +++ b/mpcontribs-api/Dockerfile @@ -26,7 +26,7 @@ COPY supervisord supervisord COPY scripts scripts COPY main.py . COPY docker-entrypoint.sh . -RUN chmod +x main.py scripts/start.sh docker-entrypoint.sh +RUN chmod +x main.py scripts/start.sh scripts/start_rq.sh docker-entrypoint.sh ARG VERSION # Telemetry (traces/metrics/logs) is emitted via OTLP to the Datadog Agent's OTLP receiver; the From 983e5ee735ca0b9297742057a4dab21f148c414b Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 18 Jun 2026 12:24:54 -0700 Subject: [PATCH 385/591] Added lines to ignore build artifacts --- mpcontribs-api/.gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mpcontribs-api/.gitignore b/mpcontribs-api/.gitignore index ce7322d6e6..edd9d60a7a 100644 --- a/mpcontribs-api/.gitignore +++ b/mpcontribs-api/.gitignore @@ -1 +1,2 @@ -src/mpcontribs_api/old +build/ +dist/ From 236ecca80e233f0a05cee6831d0326873dff3d91 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 18 Jun 2026 12:25:19 -0700 Subject: [PATCH 386/591] Modernized claude.md --- mpcontribs-api/CLAUDE.md | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/mpcontribs-api/CLAUDE.md b/mpcontribs-api/CLAUDE.md index 3797e1dcf4..ef6f146b60 100644 --- a/mpcontribs-api/CLAUDE.md +++ b/mpcontribs-api/CLAUDE.md @@ -32,7 +32,6 @@ Copy `.env.example` to `.env`. Key variables (all prefixed `MPCONTRIBS_`): - `MONGO__URI` — MongoDB Atlas URI - `MONGO__DB_NAME` — database name -- `KONG__GATEWAY_SECRET` — shared secret for verifying requests came through Kong - `ENVIRONMENT` — `dev` or `prod` (controls log format and debug mode) ## Architecture @@ -50,19 +49,23 @@ Routers are registered in `src/mpcontribs_api/api/v1/router.py`. ### Authentication and authorization -Kong injects user identity via headers; `auth.py` parses them into a frozen `User` model. The dependency chain is: +Kong injects user identity via headers; `dependencies.get_user` parses them into a frozen `User` model (`authz.py`). The dependency chain is: - `UserDep` — any caller (anonymous or authenticated) -- `AuthedDep` — requires authenticated user (raises 401 otherwise) +- `AuthedDep` / `require_user` — requires an authenticated user (raises 401 otherwise) - `require_role(role)` — factory returning a dependency that requires a specific group membership +All mutating endpoints (POST/PUT/PATCH/DELETE) depend on `require_user`, so anonymous callers get 401; read endpoints (GET) stay open and rely on scope to filter results. + All database access goes through a repository instantiated with the current `User`. The repository's `_scope` dict is injected into every MongoDB query automatically: - **Admins** (members of `mongo.admin_group`): no filter applied - **Authenticated users**: see public+approved data, own resources (`owner == username`), and group resources - **Anonymous**: public + approved only -`verify_gateway()` in `dependencies.py` validates the `x-gateway-secret` header to ensure Kong was the actual caller. +Components (structures/tables/attachments) have no access field of their own; their reads and deletes are gated by whether an in-scope contribution references them (see `ContributionService`/`ComponentService`). + +**Trust boundary:** the service is only reachable through Kong, which terminates auth and sets the identity headers. There is no in-app gateway-secret check today — the deployment network is the boundary, so the identity headers are trusted. If the service is ever exposed off the Kong path, add a gateway-secret (or mTLS) check before trusting those headers. ### Repository pattern From 16eb499b2a6fd27888ba5ba274983b675f28610c Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 18 Jun 2026 12:25:41 -0700 Subject: [PATCH 387/591] Pointed setuptools at the right repo - src --- mpcontribs-api/pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mpcontribs-api/pyproject.toml b/mpcontribs-api/pyproject.toml index 1849dbfb4e..b41f4935c7 100644 --- a/mpcontribs-api/pyproject.toml +++ b/mpcontribs-api/pyproject.toml @@ -11,7 +11,7 @@ include-package-data = true [tool.setuptools.packages.find] where = ["src"] -include = ["mpcontribs.api*"] +include = ["mpcontribs_api*"] [project] name = "mpcontribs-api" From fd5ff410c4f729c9d2ace223310a98326e749916 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 18 Jun 2026 12:26:05 -0700 Subject: [PATCH 388/591] Added and fixed tests --- mpcontribs-api/tests/integration/conftest.py | 4 + .../db/test_component_reachability.py | 85 +++++++++++++++++++ .../integration/test_component_routes.py | 54 ++++++++++++ .../integration/test_contributions_routes.py | 62 ++++++++++++++ .../tests/integration/test_projects.py | 35 ++++++++ mpcontribs-api/tests/unit/test_packaging.py | 35 ++++++++ .../tests/unit/test_supervisord_render.py | 65 ++++++++++++++ 7 files changed, 340 insertions(+) create mode 100644 mpcontribs-api/tests/integration/db/test_component_reachability.py create mode 100644 mpcontribs-api/tests/unit/test_packaging.py create mode 100644 mpcontribs-api/tests/unit/test_supervisord_render.py diff --git a/mpcontribs-api/tests/integration/conftest.py b/mpcontribs-api/tests/integration/conftest.py index 1ee624cca0..d46a85689d 100644 --- a/mpcontribs-api/tests/integration/conftest.py +++ b/mpcontribs-api/tests/integration/conftest.py @@ -33,6 +33,10 @@ def _mock_beanie_collection(): ANON_HEADERS: dict[str, str] = {} +# Forces anonymity even when the client carries default auth headers: get_user() +# treats x-anonymous-consumer == "true" as anonymous regardless of other headers. +FORCE_ANON_HEADERS = {"x-anonymous-consumer": "true"} + AUTHED_HEADERS = { "x-consumer-username": "google:alice@example.com", "x-consumer-id": "test-consumer-id", diff --git a/mpcontribs-api/tests/integration/db/test_component_reachability.py b/mpcontribs-api/tests/integration/db/test_component_reachability.py new file mode 100644 index 0000000000..d5175b68e5 --- /dev/null +++ b/mpcontribs-api/tests/integration/db/test_component_reachability.py @@ -0,0 +1,85 @@ +"""End-to-end reachability gating for component reads. + +Components (structures/tables/attachments) carry no access field of their own. Visibility is +gated by whether a contribution the caller can see references the component. These tests drive the +real ComponentService against MongoDB to confirm reads only surface reachable components. +""" + +import pytest +from beanie import PydanticObjectId + +from mpcontribs_api.authz import User +from mpcontribs_api.domains._shared.service import ComponentService +from mpcontribs_api.domains.attachments.models import Attachment, AttachmentFilter +from mpcontribs_api.domains.attachments.repository import MongoDbAttachmentRepository +from mpcontribs_api.domains.contributions.models import Contribution +from mpcontribs_api.domains.contributions.repository import MongoDbContributionRepository +from mpcontribs_api.pagination import CursorParams + +pytestmark = [pytest.mark.db, pytest.mark.asyncio(loop_scope="session")] + +ANON = User() + + +def _service(user: User) -> ComponentService: + return ComponentService( + MongoDbAttachmentRepository(user), + MongoDbContributionRepository(user), + ref_field="attachments", + ) + + +async def _attachment(md5: str) -> Attachment: + doc = Attachment(_id=PydanticObjectId(), name="d.csv", md5=md5, mime="application/gzip", content=1) + await doc.insert() + return doc + + +async def _contribution(*, is_public: bool, attachments: list[Attachment]) -> Contribution: + doc = Contribution( + _id=PydanticObjectId(), + project="reach-proj", + identifier=f"mp-{md5[:6]}" if (md5 := attachments[0].md5) else "mp-x", + formula="Fe2O3", + data={"x": 1}, + is_public=is_public, + attachments=attachments, + ) + await doc.insert() + return doc + + +class TestComponentReadReachability: + async def test_get_by_id_returns_reachable_component(self, db): + att = await _attachment("a" * 32) + await _contribution(is_public=True, attachments=[att]) + result = await _service(ANON).get_by_id(str(att.id), fields=None) + assert result is not None + assert result.id == att.id + + async def test_get_by_id_hides_unreachable_component(self, db): + att = await _attachment("b" * 32) + # Referenced only by a private contribution -> anonymous cannot reach it. + await _contribution(is_public=False, attachments=[att]) + result = await _service(ANON).get_by_id(str(att.id), fields=None) + assert result is None + + async def test_get_by_id_hides_orphan_component(self, db): + # No contribution references this attachment at all. + att = await _attachment("c" * 32) + result = await _service(ANON).get_by_id(str(att.id), fields=None) + assert result is None + + async def test_get_many_only_lists_reachable(self, db): + pub = await _attachment("d" * 32) + priv = await _attachment("e" * 32) + orphan = await _attachment("f" * 32) + await _contribution(is_public=True, attachments=[pub]) + await _contribution(is_public=False, attachments=[priv]) + + page = await _service(ANON).get_many(filter=AttachmentFilter(), pagination=CursorParams(), fields=None) + ids = {item.id for item in page.items} + + assert pub.id in ids + assert priv.id not in ids + assert orphan.id not in ids diff --git a/mpcontribs-api/tests/integration/test_component_routes.py b/mpcontribs-api/tests/integration/test_component_routes.py index 09ecdfece2..9bdc7ceb98 100644 --- a/mpcontribs-api/tests/integration/test_component_routes.py +++ b/mpcontribs-api/tests/integration/test_component_routes.py @@ -10,6 +10,7 @@ from mpcontribs_api.domains.tables.dependencies import get_table_service from mpcontribs_api.domains.tables.models import TableOut from mpcontribs_api.pagination import Page +from tests.integration.conftest import AUTHED_HEADERS, FORCE_ANON_HEADERS # --------------------------------------------------------------------------- # Fixtures: every component endpoint routes through the unified ComponentService, @@ -17,6 +18,17 @@ # --------------------------------------------------------------------------- +@pytest.fixture(autouse=True) +def _authenticate(client): + """Mutating component endpoints now require an authenticated caller. + + These route tests exercise mutations, so default the shared client to an + authenticated identity. Anonymous-rejection is covered explicitly by the + *RequireAuth tests, which force anonymity with FORCE_ANON_HEADERS. + """ + client.headers.update(AUTHED_HEADERS) + + @pytest.fixture def structure_service(test_app): mock = AsyncMock() @@ -268,3 +280,45 @@ def test_csv_filename_uses_csv_extension(self, client, download_target): prefix, *_ = download_target cd = client.get(f"/api/v1/{prefix}/download/gz?format=csv").headers["content-disposition"] assert ".csv.gz" in cd + + +# =========================================================================== +# Authentication enforcement: component mutations require an authenticated user +# =========================================================================== + + +class TestComponentMutationsRequireAuth: + def test_structures_post_anon_401(self, client, structure_service): + r = client.post("/api/v1/structures", json=[], headers=FORCE_ANON_HEADERS) + assert r.status_code == 401 + structure_service.insert.assert_not_called() + + def test_structures_delete_anon_401(self, client, structure_service): + r = client.delete("/api/v1/structures", headers=FORCE_ANON_HEADERS) + assert r.status_code == 401 + structure_service.delete.assert_not_called() + + def test_structure_delete_by_id_anon_401(self, client, structure_service): + r = client.delete(f"/api/v1/structures/{PydanticObjectId()}", headers=FORCE_ANON_HEADERS) + assert r.status_code == 401 + structure_service.delete_by_id.assert_not_called() + + def test_structure_patch_by_id_anon_401(self, client, structure_service): + r = client.patch(f"/api/v1/structures/{PydanticObjectId()}", json={"name": "x"}, headers=FORCE_ANON_HEADERS) + assert r.status_code == 401 + structure_service.patch_by_id.assert_not_called() + + def test_tables_delete_anon_401(self, client, table_service): + r = client.delete("/api/v1/tables", headers=FORCE_ANON_HEADERS) + assert r.status_code == 401 + table_service.delete.assert_not_called() + + def test_attachment_delete_by_id_anon_401(self, client, attachment_service): + r = client.delete(f"/api/v1/attachments/{PydanticObjectId()}", headers=FORCE_ANON_HEADERS) + assert r.status_code == 401 + attachment_service.delete_by_id.assert_not_called() + + def test_structures_get_still_open_to_anon(self, client, structure_service): + structure_service.get_many.return_value = Page(items=[], next_cursor=None) + r = client.get("/api/v1/structures", headers=FORCE_ANON_HEADERS) + assert r.status_code == 200 diff --git a/mpcontribs-api/tests/integration/test_contributions_routes.py b/mpcontribs-api/tests/integration/test_contributions_routes.py index 0b975ad5a8..06fc77c509 100644 --- a/mpcontribs-api/tests/integration/test_contributions_routes.py +++ b/mpcontribs-api/tests/integration/test_contributions_routes.py @@ -8,12 +8,24 @@ ) from mpcontribs_api.domains.contributions.models import ContributionOut from mpcontribs_api.exceptions import NotFoundError +from tests.integration.conftest import AUTHED_HEADERS, FORCE_ANON_HEADERS # --------------------------------------------------------------------------- # Fixtures # --------------------------------------------------------------------------- +@pytest.fixture(autouse=True) +def _authenticate(client): + """Mutating contribution endpoints now require an authenticated caller. + + Default the shared client to an authenticated identity so the existing + mutation tests still exercise the handler; anonymous-rejection is covered + explicitly by TestContributionMutationsRequireAuth via FORCE_ANON_HEADERS. + """ + client.headers.update(AUTHED_HEADERS) + + @pytest.fixture def contribution_repo(test_app, mock_contribution_repo): test_app.dependency_overrides[get_scoped_contributions] = lambda: mock_contribution_repo @@ -236,3 +248,53 @@ def test_repo_error_surfaces_as_uniform_json(self, client, contribution_repo): r = client.get("/api/v1/contributions/download/gz") assert r.status_code == 404 assert r.json()["error"]["code"] == "not_found" + + +# --------------------------------------------------------------------------- +# Authentication enforcement: contribution mutations require an authenticated user +# --------------------------------------------------------------------------- + + +class TestContributionMutationsRequireAuth: + def test_post_anon_401(self, client, contribution_service): + r = client.post("/api/v1/contributions", json=[], headers=FORCE_ANON_HEADERS) + assert r.status_code == 401 + assert r.json()["error"]["code"] == "authentication_error" + contribution_service.insert_contributions.assert_not_called() + + def test_put_collection_anon_401(self, client, contribution_service): + r = client.put("/api/v1/contributions", json=[], headers=FORCE_ANON_HEADERS) + assert r.status_code == 401 + contribution_service.upsert_contributions.assert_not_called() + + def test_delete_collection_anon_401(self, client, contribution_repo): + r = client.delete("/api/v1/contributions", headers=FORCE_ANON_HEADERS) + assert r.status_code == 401 + contribution_repo.delete_contributions.assert_not_called() + + def test_delete_by_id_anon_401(self, client, contribution_service): + r = client.delete(f"/api/v1/contributions/{PydanticObjectId()}", headers=FORCE_ANON_HEADERS) + assert r.status_code == 401 + + def test_put_by_id_anon_401(self, client, contribution_repo): + r = client.put( + f"/api/v1/contributions/{PydanticObjectId()}", + json=_valid_contribution_body(), + headers=FORCE_ANON_HEADERS, + ) + assert r.status_code == 401 + contribution_repo.upsert_contribution_by_id.assert_not_called() + + def test_patch_by_id_anon_401(self, client, contribution_repo): + r = client.patch( + f"/api/v1/contributions/{PydanticObjectId()}", json={"formula": "H2O"}, headers=FORCE_ANON_HEADERS + ) + assert r.status_code == 401 + contribution_repo.patch_contribution_by_id.assert_not_called() + + def test_get_collection_still_open_to_anon(self, client, contribution_repo): + from mpcontribs_api.pagination import Page + + contribution_repo.get_contributions.return_value = Page(items=[], next_cursor=None) + r = client.get("/api/v1/contributions", headers=FORCE_ANON_HEADERS) + assert r.status_code == 200 diff --git a/mpcontribs-api/tests/integration/test_projects.py b/mpcontribs-api/tests/integration/test_projects.py index 634a17e7cb..0f98857923 100644 --- a/mpcontribs-api/tests/integration/test_projects.py +++ b/mpcontribs-api/tests/integration/test_projects.py @@ -259,3 +259,38 @@ def test_missing_required_field_returns_422(self, client, project_repo): del body["title"] r = client.put("/api/v1/projects/mp-sample", json=body, headers=AUTHED_HEADERS) assert r.status_code == 422 + + +# --------------------------------------------------------------------------- +# Authentication enforcement: mutations require an authenticated user +# --------------------------------------------------------------------------- + + +class TestProjectMutationsRequireAuth: + def _body(self): + return { + "_id": "mp-sample", + "title": "Test Project", + "authors": "Alice", + "description": "A project", + "owner": "google:alice@example.com", + "unique_identifiers": True, + "stats": {"columns": 0, "contributions": 0, "tables": 0, "structures": 0, "attachments": 0, "size": 0.0}, + } + + def test_anonymous_put_returns_401(self, client, project_repo): + project_repo.upsert_project_by_id.return_value = SAMPLE_PROJECT + r = client.put("/api/v1/projects/mp-sample", json=self._body(), headers=ANON_HEADERS) + assert r.status_code == 401 + assert r.json()["error"]["code"] == "authentication_error" + project_repo.upsert_project_by_id.assert_not_called() + + def test_anonymous_patch_returns_401(self, client, project_repo): + r = client.patch("/api/v1/projects/mp-sample", json={"title": "Updated Title"}, headers=ANON_HEADERS) + assert r.status_code == 401 + project_repo.patch_project_by_id.assert_not_called() + + def test_anonymous_delete_returns_401(self, client, project_repo): + r = client.delete("/api/v1/projects/mp-sample", headers=ANON_HEADERS) + assert r.status_code == 401 + project_repo.delete_project_by_id.assert_not_called() diff --git a/mpcontribs-api/tests/unit/test_packaging.py b/mpcontribs-api/tests/unit/test_packaging.py new file mode 100644 index 0000000000..9f5fabdf58 --- /dev/null +++ b/mpcontribs-api/tests/unit/test_packaging.py @@ -0,0 +1,35 @@ +"""Guards against the src-layout packaging regression where the built wheel shipped no code. + +The wheel must contain the importable package so the Docker image's +``uvicorn mpcontribs_api.app:app`` can resolve the module. +""" + +import shutil +import subprocess +import zipfile +from pathlib import Path + +import pytest + +PROJECT_ROOT = Path(__file__).resolve().parents[2] + + +@pytest.mark.skipif(shutil.which("uv") is None, reason="uv not available") +def test_wheel_contains_package(tmp_path: Path) -> None: + result = subprocess.run( + ["uv", "build", "--wheel", "--out-dir", str(tmp_path)], + cwd=PROJECT_ROOT, + env={"SETUPTOOLS_SCM_PRETEND_VERSION": "0.0.0", "PATH": __import__("os").environ.get("PATH", "")}, + capture_output=True, + text=True, + ) + assert result.returncode == 0, f"uv build failed: {result.stderr}" + + wheels = list(tmp_path.glob("*.whl")) + assert wheels, "no wheel produced" + + with zipfile.ZipFile(wheels[0]) as zf: + names = zf.namelist() + assert any(n == "mpcontribs_api/app.py" for n in names), ( + f"wheel is missing the package code; top entries: {sorted(names)[:10]}" + ) diff --git a/mpcontribs-api/tests/unit/test_supervisord_render.py b/mpcontribs-api/tests/unit/test_supervisord_render.py new file mode 100644 index 0000000000..19e660318c --- /dev/null +++ b/mpcontribs-api/tests/unit/test_supervisord_render.py @@ -0,0 +1,65 @@ +"""The rendered supervisord config must export the env vars the new pydantic Settings require. + +The FastAPI rewrite reads nested settings via the ``MPCONTRIBS___`` convention. This +guards against regressing the supervisord template back to the Flask-era flat names, which would +make the container fail Settings validation at startup. +""" + +from pathlib import Path + +import pytest +from jinja2 import Environment, FileSystemLoader + +SUPERVISORD_DIR = Path(__file__).resolve().parents[2] / "supervisord" + +# Names the new Settings model needs present in the process environment. +REQUIRED_ENV_NAMES = [ + "MPCONTRIBS_ENVIRONMENT", + "MPCONTRIBS_MONGO__URI", + "MPCONTRIBS_MONGO__DB_NAME", + "MPCONTRIBS_REDIS__ADDRESS", + "MPCONTRIBS_REDIS__URL", + "MPCONTRIBS_MAIL_DEFAULT_SENDER", + "MPCONTRIBS_VERSION", + "MPCONTRIBS_OTEL__OTLP_ENDPOINT", +] + + +def _render() -> str: + env = Environment(loader=FileSystemLoader(str(SUPERVISORD_DIR))) + template = env.get_template("supervisord.conf.jinja") + return template.render( + production=True, + environment="prod", + version="1.2.3", + deployments={ + "ml": { + "api_port": "10002", + "portal_port": 8082, + "db": "ml", + "s3": "ml", + "tm": "MP", + "max_projects": 3, + } + }, + nworkers=2, + reload=0, + node_env="production", + flask_debug=False, + flask_log_level="INFO", + jupyter_gateway_url="http://localhost:10100", + jupyter_gateway_host="localhost:10100", + otel_endpoint="localhost:4317", + mpcontribs_api_host="localhost", + ) + + +@pytest.mark.parametrize("name", REQUIRED_ENV_NAMES) +def test_required_env_name_present(name: str) -> None: + assert name in _render() + + +def test_no_stale_flat_mongo_db_name() -> None: + rendered = _render() + # The old flat name must not appear as an assignment (the nested name is required instead). + assert "MPCONTRIBS_DB_NAME=" not in rendered From bf198ff2ff3bcfc16d349f13796011a5067a1053 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 18 Jun 2026 12:26:19 -0700 Subject: [PATCH 389/591] Formatting --- mpcontribs-api/src/mpcontribs_api/domains/healthcheck/router.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/healthcheck/router.py b/mpcontribs-api/src/mpcontribs_api/domains/healthcheck/router.py index e099971ab6..88abea6a91 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/healthcheck/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/healthcheck/router.py @@ -28,7 +28,7 @@ async def healthcheck(db: DbDep, s3_client: S3Dep) -> HealthStatus: try: await s3_client.head_bucket(Bucket=settings.aws.health_bucket) - except (ClientError, BotoCoreError): + except ClientError, BotoCoreError: raise HTTPException( status_code=status.HTTP_503_SERVICE_UNAVAILABLE, detail={"status": "unhealthy", "s3": "unreachable"}, From e4a265bdaa3b8fff93f946c005bf0f0ea929b071 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 18 Jun 2026 12:29:14 -0700 Subject: [PATCH 390/591] Removing accidental commit of build artifacts --- .../build/lib/mpcontribs_api/api/v1/router.py | 15 - .../domains/_shared/components.py | 139 -------- .../domains/_shared/repository.py | 319 ----------------- .../mpcontribs_api/domains/_shared/service.py | 172 --------- .../domains/attachments/repository.py | 15 - .../domains/attachments/router.py | 77 ---- .../domains/contributions/repository.py | 266 -------------- .../domains/contributions/router.py | 117 ------- .../domains/contributions/service.py | 328 ------------------ .../domains/healthcheck/router.py | 37 -- .../domains/projects/repository.py | 111 ------ .../mpcontribs_api/domains/projects/router.py | 121 ------- .../domains/structures/repository.py | 15 - .../domains/structures/router.py | 95 ----- .../domains/tables/repository.py | 13 - .../mpcontribs_api/domains/tables/router.py | 95 ----- 16 files changed, 1935 deletions(-) delete mode 100644 mpcontribs-api/build/lib/mpcontribs_api/api/v1/router.py delete mode 100644 mpcontribs-api/build/lib/mpcontribs_api/domains/_shared/components.py delete mode 100644 mpcontribs-api/build/lib/mpcontribs_api/domains/_shared/repository.py delete mode 100644 mpcontribs-api/build/lib/mpcontribs_api/domains/_shared/service.py delete mode 100644 mpcontribs-api/build/lib/mpcontribs_api/domains/attachments/repository.py delete mode 100644 mpcontribs-api/build/lib/mpcontribs_api/domains/attachments/router.py delete mode 100644 mpcontribs-api/build/lib/mpcontribs_api/domains/contributions/repository.py delete mode 100644 mpcontribs-api/build/lib/mpcontribs_api/domains/contributions/router.py delete mode 100644 mpcontribs-api/build/lib/mpcontribs_api/domains/contributions/service.py delete mode 100644 mpcontribs-api/build/lib/mpcontribs_api/domains/healthcheck/router.py delete mode 100644 mpcontribs-api/build/lib/mpcontribs_api/domains/projects/repository.py delete mode 100644 mpcontribs-api/build/lib/mpcontribs_api/domains/projects/router.py delete mode 100644 mpcontribs-api/build/lib/mpcontribs_api/domains/structures/repository.py delete mode 100644 mpcontribs-api/build/lib/mpcontribs_api/domains/structures/router.py delete mode 100644 mpcontribs-api/build/lib/mpcontribs_api/domains/tables/repository.py delete mode 100644 mpcontribs-api/build/lib/mpcontribs_api/domains/tables/router.py diff --git a/mpcontribs-api/build/lib/mpcontribs_api/api/v1/router.py b/mpcontribs-api/build/lib/mpcontribs_api/api/v1/router.py deleted file mode 100644 index 13dab175ce..0000000000 --- a/mpcontribs-api/build/lib/mpcontribs_api/api/v1/router.py +++ /dev/null @@ -1,15 +0,0 @@ -from fastapi import APIRouter - -from mpcontribs_api.domains.attachments.router import router as attachments_router -from mpcontribs_api.domains.contributions.router import router as contributions_router -from mpcontribs_api.domains.projects.router import router as projects_router -from mpcontribs_api.domains.structures.router import router as structures_router -from mpcontribs_api.domains.tables.router import router as tables_router - -router = APIRouter() - -router.include_router(attachments_router, prefix="/attachments", tags=["attachments"]) -router.include_router(contributions_router, prefix="/contributions", tags=["contributions"]) -router.include_router(projects_router, prefix="/projects", tags=["projects"]) -router.include_router(structures_router, prefix="/structures", tags=["structures"]) -router.include_router(tables_router, prefix="/tables", tags=["tables"]) diff --git a/mpcontribs-api/build/lib/mpcontribs_api/domains/_shared/components.py b/mpcontribs-api/build/lib/mpcontribs_api/domains/_shared/components.py deleted file mode 100644 index 196dde4528..0000000000 --- a/mpcontribs-api/build/lib/mpcontribs_api/domains/_shared/components.py +++ /dev/null @@ -1,139 +0,0 @@ -from typing import Any - -from beanie import PydanticObjectId -from beanie.operators import In -from fastapi_filter.contrib.beanie import Filter -from pydantic import BaseModel -from pymongo.asynchronous.client_session import AsyncClientSession - -from mpcontribs_api.authz import User -from mpcontribs_api.config import get_settings -from mpcontribs_api.domains._shared.models import Component, DeleteResponse, DocumentOut -from mpcontribs_api.domains._shared.repository import MongoDbRepository -from mpcontribs_api.domains._shared.types import MD5Hash - - -class MongoDbComponentsRepository[ - TDoc: Component, - TIn: Component, - TOut: DocumentOut, - TFilter: Filter, - TPatch: BaseModel, -](MongoDbRepository[TDoc, TIn, TOut, TFilter, TPatch]): - @staticmethod - def _build_scope(user: User) -> dict[str, Any]: - return {} - - async def _check_existing( - self, - components: list[TIn] | TIn, - session: AsyncClientSession | None = None, - ) -> tuple[dict[MD5Hash, TIn], dict[str, TDoc]]: - if not isinstance(components, list): - components = [components] - by_md5 = {comp.md5: comp for comp in components} - - # Full fetch so existing docs come back with their ids - # TODO: Most likely does a COLLSCAN - see if we can project to get a COVERED QUERY - existing_docs = await self.document_model.find( - In(self.document_model.md5, list(by_md5.keys())), - session=session, - ).to_list() - return (by_md5, {doc.md5: doc for doc in existing_docs}) - - async def insert_components( - self, - components: list[TIn], - session: AsyncClientSession | None = None, - ) -> list[TDoc]: - """Bulk-insert components, chunked to fit within a transaction's payload budget. - - Args: - components (list[TIn]): components to insert - session (AsyncClientSession): optional client session; pass when inserting inside a transaction - """ - by_md5, existing_by_md5 = await self._check_existing(components=components, session=session) - # Assign ids manually: insert_many won't populate id back onto these - # objects, and get_dict drops id when it's None. - new_docs: list[TDoc] = [] - for md5, comp in by_md5.items(): - if md5 in existing_by_md5: - continue - doc = self.document_model.model_validate(comp.model_dump()) - doc.id = PydanticObjectId() - new_docs.append(doc) - - # TODO: Might want to delegate this logic to a higher level - # - This method might want to simply insert everything it's given - # Insert by chunks - chunk_size = get_settings().mongo.component_insert_chunk_size - for start in range(0, len(new_docs), chunk_size): - await self.document_model.insert_many( - new_docs[start : start + chunk_size], - ordered=False, - session=session, - ) - - # Return a list of documents reflecting what was stored/found - resolved = existing_by_md5 | {doc.md5: doc for doc in new_docs} - return [resolved[md5] for md5 in by_md5] - - async def insert_component(self, component: TIn, *, session: AsyncClientSession | None = None) -> TDoc: - """Insert a single component. - - Args: - component (TIn): the table to insert - - Returns: - TDoc: the component actually in the database - - Raises: - AppError: If insert_one returns None, raises - """ - return (await self.insert_components(components=[component], session=session))[0] - - async def get_component_by_id(self, id: str, fields: frozenset[str] | None) -> TDoc | TOut | None: - """Find a single component by id. See ``get_by_id``. - - The id must be converted to an ObjectId first; ``get_by_id`` compares against the - ObjectId ``_id`` and a raw string would never match. - """ - return await self.get_by_id(self._convert_object_id(id), fields) - - async def delete_components( - self, - filter: TFilter, - session: AsyncClientSession | None = None, - ) -> DeleteResponse: - """Deletes all components matching ``filter``. - - Args: - filter (TFilter): the query to filter components by - session (AsyncClientSession | None): the current session, used to guarantee transactions - - Returns: - DeleteResponse: A report of the deletion - """ - query = filter.filter(self.document_model.find(self._scope, session=session)) - result = await query.delete(session=session) - return DeleteResponse(num_deleted=result.deleted_count if result else 0) - - async def delete_component_by_id( - self, - id: str, - session: AsyncClientSession | None = None, - ) -> DeleteResponse: - """Deletes a single component by Id. - - Args: - id (str): the str representation of the component's ObjectId - session (AsyncClientSession | None): the current session, used to guarantee transactions - - Returns: - DeleteResponse: A report of the deletion - """ - return await self.delete_by_id(id=self._convert_object_id(id), session=session) - - async def patch_component_by_id(self, id: str, update: TPatch) -> TDoc: - """Partially update a component by id, scoped to the current user. See ``patch``.""" - return await self.patch(self._convert_object_id(id), update) diff --git a/mpcontribs-api/build/lib/mpcontribs_api/domains/_shared/repository.py b/mpcontribs-api/build/lib/mpcontribs_api/domains/_shared/repository.py deleted file mode 100644 index 36f089fb9a..0000000000 --- a/mpcontribs-api/build/lib/mpcontribs_api/domains/_shared/repository.py +++ /dev/null @@ -1,319 +0,0 @@ -import csv -import hashlib -import io -import json -import zlib -from abc import ABC, abstractmethod -from collections.abc import AsyncIterable, AsyncIterator, Callable, Iterable -from contextlib import AbstractAsyncContextManager -from typing import Any - -from beanie import PydanticObjectId, UpdateResponse -from beanie.operators import In, Set -from bson.errors import InvalidId -from fastapi_filter.contrib.beanie import Filter -from pydantic import BaseModel -from pymongo.asynchronous.client_session import AsyncClientSession -from types_aiobotocore_s3 import S3Client - -from mpcontribs_api.authz import User -from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DeleteResponse, DocumentOut -from mpcontribs_api.domains._shared.types import DownloadFormat, ShortMimeFormat -from mpcontribs_api.exceptions import ConflictError, NotFoundError, ValidationError -from mpcontribs_api.pagination import CursorParams, Page, encode_cursor - - -class MongoDbRepository[ - TDoc: BaseDocumentWithInput, - TIn: BaseModel, - TOut: DocumentOut, - TFilter: Filter, - TPatch: BaseModel, -](ABC): - """Base repository encapsulating shared MongoDB access patterns. - - Subclasses bind the document, input, output, filter, and patch types as type parameters, set - the matching ``document_model`` / ``out_model`` class attributes, and implement ``_build_scope`` - to enforce per-user authorization. Shared CRUD logic (scoping, projection, cursor pagination, - insertion, single-document read/patch/delete) lives here so it exists in exactly one place and - cannot drift between resources. Subclasses expose domain-named methods that either forward to a - base method (vocabulary + concrete types for routers, no logic) or implement a genuinely - different shape (bulk insert, compound-key upsert, download). - - Attributes: - document_model: the ``BaseDocumentWithInput`` subclass this repository operates on - out_model: the ``SparseFieldsModel`` subclass used to build projections for reads - _scope (dict[str, Any]): terms injected into every query to enforce user authorization - """ - - document_model: type[TDoc] - out_model: type[TOut] - - def __init__(self, user: User) -> None: - """Initializes an instance based on the current user. - - Args: - user (User): the current user requesting resources - """ - self._scope = self._build_scope(user) - - @staticmethod - @abstractmethod - def _build_scope(user: User) -> dict[str, Any]: - """Provides scope based on current user's permitted groups and publicly released data.""" - ... - - def _convert_object_id(self, id: str) -> PydanticObjectId: - """Converts the string representation of an ObjectId to an ObjectId""" - try: - return PydanticObjectId(id) - except InvalidId: - raise ValidationError("Incorrect Id format. Must be MongoDB ObjectId format.", id=id) from None - - def _not_found(self, id: str) -> str: - """Build a not-found message naming this repository's resource.""" - return f"{self.document_model.__name__} with id {id} not found" - - async def get_many( - self, - filter: TFilter, - fields: frozenset[str] | None = None, - pagination: CursorParams | None = None, - restrict_ids: Iterable[Any] | None = None, - ) -> Page[TOut]: - """Return a scoped, filtered, cursor-paginated page of projected documents. - - Args: - pagination (CursorParams): forward-only cursor parameters - filter (TFilter): the fastapi-filter query to apply on top of the user scope - fields (frozenset[str] | None): fields to project; if None the full document is returned - restrict_ids (Iterable | None): when provided, results are limited to these ids in - addition to the user scope. An empty iterable yields an empty page. Used to gate - reads that are authorized indirectly (e.g. components reachable via a contribution). - """ - pagination = pagination or CursorParams() - - projection = self.out_model.projection(fields) - query = filter.filter(self.document_model.find(self._scope)) - if restrict_ids is not None: - query = query.find(In(self.document_model.id, list(restrict_ids))) - if pagination.cursor is not None: - query = query.find(self.document_model.id > self.document_model.decode_cursor(cursor=pagination.cursor)) # pyright: ignore[reportOptionalOperand] - docs = await query.sort(self.document_model.id).limit(pagination.limit + 1).project(projection).to_list() # pyright: ignore[reportArgumentType] - has_more = len(docs) > pagination.limit - items = docs[: pagination.limit] - next_cursor = encode_cursor(str(items[-1].id)) if has_more and items else None - return Page(items=items, next_cursor=next_cursor) - - async def get_by_id(self, id: Any, fields: frozenset[str] | None) -> TDoc | TOut | None: - """Return a single scoped document by id, projected to the requested fields. - - Args: - id (str): the id of the document to find - fields (frozenset[str] | None): fields to project; if None the full document is returned - """ - return await self.document_model.find_one( - self._scope, - self.document_model.id == id, - projection_model=self.out_model.projection(fields), - ) - - async def list_ids(self, filter: TFilter, session: AsyncClientSession | None = None) -> list[Any]: - """Return just the ids of scoped documents matching ``filter``. - - Projects to ``{"_id": 1}`` so the lookup can be served as a covered query from the - default ``_id`` index without materializing full documents. - - Args: - filter (TFilter): the fastapi-filter query to apply on top of the user scope - session (AsyncClientSession | None): optional client session for transactions - """ - projection = self.out_model.projection(frozenset({"id"})) - query = filter.filter(self.document_model.find(self._scope, session=session)) - docs = await query.project(projection).to_list() - return [doc.id for doc in docs] - - async def insert_one(self, in_resource: TIn) -> TDoc: - """Insert a new document built from its input model, rejecting duplicate ids. - - Args: - in_resource (TIn): the validated input payload to translate and store - """ - document = self.document_model.from_input_model(in_resource) - existing = await self.document_model.find_one(self.document_model.id == document.id) - if existing: - raise ConflictError(f"Cannot insert document.\n Document with ID {document.id} exists") - await document.insert() - return document - - async def delete_by_id(self, id: Any, session: AsyncClientSession | None = None) -> DeleteResponse: - """Delete a single scoped document by id. - - Scoping ensures callers cannot delete documents they are not permitted to see. - - Args: - id (str): the id of the document to delete - """ - doc = await self.document_model.find_one(self._scope, self.document_model.id == id, session=session) - if not doc: - raise NotFoundError("Document with id not found", id=id) - await doc.delete(session=session) - return DeleteResponse(num_deleted=1) - - async def delete_by_ids(self, ids: list[Any], session: AsyncClientSession | None = None) -> DeleteResponse: - """Delete multiple scoped documents by id. - - The user scope is injected so callers cannot delete documents they are not permitted to - see; out-of-scope ids simply match nothing and are reported as zero deletions. - - Args: - ids (list[Any]): list of ids to delete - session: the session to perform the deletes within - - Returns: - DeleteResponse: the result of the deletion - """ - docs = self.document_model.find(self._scope, In(self.document_model.id, ids), session=session) - delete_result = await docs.delete_many(session=session) - if not delete_result: - raise ValidationError("DeleteResult not returned internally") - return DeleteResponse.from_delete_result(delete_result) - - async def patch(self, id: Any, update: TPatch) -> TDoc: - """Partially update a single scoped document by id. - - Only fields explicitly set on ``update`` are applied. An empty patch is a no-op that still - returns the existing document for consistent behavior. Scoping ensures callers cannot patch - documents they are not permitted to see. - - Args: - id (str): the id of the document to update - update (TPatch): the partial update to apply; unset fields are dropped - """ - # Only retain set fields (patch) - update_data = update.model_dump(exclude_unset=True) - # If update is empty, return the model anyways (consistent behavior) - if not update_data: - existing = await self.document_model.find_one(self._scope, self.document_model.id == id) - if existing is None: - raise NotFoundError(self._not_found(id)) - return existing - - # Otherwise, update the fields fully (set) - # Brendan TODO: Set will replace an entire field - # - if we want to append to a list (ie. add a reference) we ned Push/AddToSet - query = self.document_model.find_one(self._scope, self.document_model.id == id).update( - Set(update_data), - response_type=UpdateResponse.NEW_DOCUMENT, - ) - updated = await query # pyright: ignore[reportGeneralTypeIssues] # beanie UpdateQuery is awaitable, but pyright doesn't see it - if updated is None: - raise NotFoundError(self._not_found(id)) - return updated - - def _hash_payload(self, payload: dict[str, Any], *, separators: tuple[str, str] = (",", ":")) -> str: - canonical = json.dumps( - payload, - sort_keys=True, - separators=separators, - ensure_ascii=True, - default=str, # filters may carry ObjectId/datetime values; stringify for a stable key - ) - return hashlib.sha256(canonical.encode("utf-8")).hexdigest() - - def _get_serializer( - self, format: DownloadFormat, fields: frozenset[str] | None - ) -> Callable[[AsyncIterable[TOut]], AsyncIterable[bytes]]: - match format: - case DownloadFormat.JSONL: - return self._serialize_jsonl - case DownloadFormat.CSV: - return lambda rows: self._serialize_csv(rows, fields) - - @staticmethod - async def _serialize_jsonl(rows: AsyncIterable) -> AsyncIterator[bytes]: - async for out in rows: - yield out.model_dump_json().encode() + b"\n" - - @staticmethod - def _csv_cell(value: Any) -> Any: - """Render a cell value for CSV: scalars as-is, dict/list as JSON (not Python repr).""" - if value is None or isinstance(value, (str, int, float, bool)): - return value - return json.dumps(value, ensure_ascii=False, separators=(",", ":")) - - @staticmethod - async def _serialize_csv(rows: AsyncIterable, fields: frozenset[str] | None) -> AsyncIterator[bytes]: - buf = io.StringIO() - writer: csv.DictWriter | None = None - async for out in rows: - row = out.model_dump(mode="json") - if writer is None: - cols = sorted(fields) if fields else list(row.keys()) - writer = csv.DictWriter(buf, fieldnames=cols, extrasaction="ignore") - writer.writeheader() - writer.writerow({key: MongoDbRepository._csv_cell(value) for key, value in row.items()}) - yield buf.getvalue().encode() - buf.seek(0) - buf.truncate(0) - - async def _s3_object_exists(self, bucket_name: str, key_name: str, s3: AbstractAsyncContextManager[S3Client]): - async with s3 as s3_client: - try: - await s3_client.head_object(Bucket=bucket_name, Key=key_name) - return True - except Exception: - return False - - async def download( - self, - format: DownloadFormat, - short_mime: ShortMimeFormat, - ignore_cache: bool, - filter: TFilter, - fields: frozenset[str] | None, - s3: AbstractAsyncContextManager[S3Client], - bucket_name: str, - key_name: str, - restrict_ids: Iterable[Any] | None = None, - ) -> AsyncIterable[bytes]: - # Hash parameters to generate key for cache - payload = { - "format": format, - "short_mime": short_mime, - "filter": filter.model_dump(), - "fields": sorted(fields) if fields else None, - } - _ = self._hash_payload(payload) - - # TODO: S3 download cache. When implemented, this should `await - # self._s3_object_exists(...)` and stream the cached object on a hit. - # The previous code called the coroutine without awaiting it (a no-op - # that always evaluated truthy), so the branch was removed. - - # Build from MongoDB (and, in future, save to cache) - query = filter.filter(self.document_model.find(self._scope)) - if restrict_ids is not None: - query = query.find(In(self.document_model.id, list(restrict_ids))) - query = filter.sort(query) - - serializer = self._get_serializer(format, fields) - - # Compress using gzip level 9 and stream out - compressor = zlib.compressobj(9, zlib.DEFLATED, 16 + zlib.MAX_WBITS) - - async def rows() -> AsyncIterator[TOut]: - async for table in query: - # TODO: We might think about skipping validation to save time - yield self.out_model.model_validate(table, from_attributes=True) - - async for line in serializer(rows()): - chunk = compressor.compress(line) - if chunk: - yield chunk - - # Flush the remaining buffered bytes and the gzip footer - # Without this the stream is a truncated gzip that cannot be decompressed. - tail = compressor.flush() - if tail: - yield tail diff --git a/mpcontribs-api/build/lib/mpcontribs_api/domains/_shared/service.py b/mpcontribs-api/build/lib/mpcontribs_api/domains/_shared/service.py deleted file mode 100644 index 686b87df75..0000000000 --- a/mpcontribs-api/build/lib/mpcontribs_api/domains/_shared/service.py +++ /dev/null @@ -1,172 +0,0 @@ -from collections.abc import AsyncIterable -from contextlib import AbstractAsyncContextManager - -from fastapi_filter.contrib.beanie import Filter -from pydantic import BaseModel -from pymongo.asynchronous.client_session import AsyncClientSession -from types_aiobotocore_s3 import S3Client - -from mpcontribs_api.domains._shared.components import MongoDbComponentsRepository -from mpcontribs_api.domains._shared.models import Component, ComponentDeleteResponse, DocumentOut -from mpcontribs_api.domains._shared.types import DownloadFormat, ShortMimeFormat -from mpcontribs_api.domains.contributions.repository import MongoDbContributionRepository -from mpcontribs_api.exceptions import NotFoundError -from mpcontribs_api.pagination import CursorParams, Page - - -class ComponentService[ - TDoc: Component, - TIn: Component, - TOut: DocumentOut, - TFilter: Filter, - TPatch: BaseModel, -]: - """Service layer for all shared component logic. - - Components (attachments, structures, tables) share the same access model and CRUD surface, so a - single configurable service handles every domain rather than a per-domain subclass. Each domain - is distinguished only by: - - - ``ref_field``: the field on a contribution that references this component type - (``"attachments"`` / ``"structures"`` / ``"tables"``) - - ``bucket_name``: the S3 bucket downloads are cached in (defaults to ``ref_field``) - - Reads, inserts, patches, and downloads forward to the components repository. Deletion is the only - operation with cross-repository logic, applying two gates: - - 1. **Access (scoped):** candidates are restricted to components reachable via a contribution - in the user's scope. A component the user cannot reach is treated as not found. - 2. **Integrity (global):** any reachable candidate still referenced by *any* contribution is - skipped; the rest are deleted. - """ - - def __init__( - self, - components: MongoDbComponentsRepository[TDoc, TIn, TOut, TFilter, TPatch], - contributions: MongoDbContributionRepository, - *, - ref_field: str, - bucket_name: str | None = None, - ) -> None: - self._components = components - self._contributions = contributions - self._ref_field = ref_field - self._bucket_name = bucket_name or ref_field - - async def get_many( - self, - filter: TFilter, - pagination: CursorParams, - fields: frozenset[str] | None, - ) -> Page[TOut]: - """Return a page of components reachable via an in-scope contribution. - - Components have no independent access field, so visibility is gated by contribution - reachability: results are restricted to ids referenced by a contribution the caller is - allowed to see (the same access gate that ``delete`` applies). - """ - allowed = await self._contributions.list_referenced_component_ids(self._ref_field, scoped=True) - return await self._components.get_many( - pagination=pagination, filter=filter, fields=fields, restrict_ids=allowed - ) - - async def get_by_id(self, id: str, fields: frozenset[str] | None) -> TDoc | TOut | None: - """Find a single component by id, gated by contribution reachability. - - Returns ``None`` (treated as not found) when no in-scope contribution references the id, - so callers cannot read a component belonging to a contribution they cannot see. - """ - oid = self._components._convert_object_id(id) - if not await self._contributions.referenced_component_ids(self._ref_field, [oid], scoped=True): - return None - return await self._components.get_component_by_id(id, fields) - - async def insert( - self, - components: list[TIn], - session: AsyncClientSession | None = None, - ) -> list[TDoc]: - """Bulk-insert components, deduplicated by content hash. See ``insert_components``.""" - return await self._components.insert_components(components=components, session=session) - - async def patch_by_id(self, id: str, update: TPatch) -> TDoc: - """Partially update a component by id, gated by contribution reachability. - - Raises ``NotFoundError`` when no in-scope contribution references the id, mirroring the - access gate on ``delete_by_id``. - """ - oid = self._components._convert_object_id(id) - if not await self._contributions.referenced_component_ids(self._ref_field, [oid], scoped=True): - raise NotFoundError(self._components._not_found(id)) - return await self._components.patch_component_by_id(id=id, update=update) - - async def download( - self, - format: DownloadFormat, - short_mime: ShortMimeFormat, - ignore_cache: bool, - filter: TFilter, - fields: frozenset[str] | None, - s3: AbstractAsyncContextManager[S3Client], - ) -> AsyncIterable[bytes]: - """Stream a gzip-compressed export of matching components. See ``download``. - - The S3 cache location is owned by the service: ``bucket_name`` defaults to ``ref_field`` and - ``key_name`` is currently unused. Like the other reads, the export is gated to components - reachable via an in-scope contribution. - """ - allowed = await self._contributions.list_referenced_component_ids(self._ref_field, scoped=True) - return self._components.download( - format=format, - short_mime=short_mime, - ignore_cache=ignore_cache, - filter=filter, - fields=fields, - s3=s3, - bucket_name=self._bucket_name, - key_name="", # TODO: Temp - restrict_ids=allowed, - ) - - async def delete(self, filter: TFilter) -> ComponentDeleteResponse: - """Delete components matching ``filter`` that are reachable and globally unreferenced. - - Args: - filter (TFilter): the component-specific query to apply - - Returns: - ComponentDeleteResponse: count deleted, plus the ids skipped because a contribution - still references them - """ - candidate_ids = await self._components.list_ids(filter) - reachable = await self._contributions.referenced_component_ids(self._ref_field, candidate_ids, scoped=True) - if not reachable: - return ComponentDeleteResponse(num_deleted=0) - referenced = await self._contributions.referenced_component_ids(self._ref_field, list(reachable), scoped=False) - deletable = [cid for cid in reachable if cid not in referenced] - num_deleted = (await self._components.delete_by_ids(deletable)).num_deleted if deletable else 0 - return ComponentDeleteResponse( - num_deleted=num_deleted, - num_skipped=len(referenced), - referenced_ids=sorted(referenced), - ) - - async def delete_by_id(self, id: str) -> ComponentDeleteResponse: - """Delete a single component by id, subject to the access and integrity gates. - - Args: - id (str): the str representation of the component's ObjectId - - Returns: - ComponentDeleteResponse: the deletion result, or a skipped result if still referenced - - Raises: - NotFoundError: if the component is not reachable via any in-scope contribution - """ - oid = self._components._convert_object_id(id) - if not await self._contributions.referenced_component_ids(self._ref_field, [oid], scoped=True): - raise NotFoundError(self._components._not_found(id)) - if await self._contributions.referenced_component_ids(self._ref_field, [oid], scoped=False): - return ComponentDeleteResponse(num_deleted=0, num_skipped=1, referenced_ids=[oid]) - deleted = await self._components.delete_by_id(oid) - return ComponentDeleteResponse(num_deleted=deleted.num_deleted) diff --git a/mpcontribs-api/build/lib/mpcontribs_api/domains/attachments/repository.py b/mpcontribs-api/build/lib/mpcontribs_api/domains/attachments/repository.py deleted file mode 100644 index 6297b117f8..0000000000 --- a/mpcontribs-api/build/lib/mpcontribs_api/domains/attachments/repository.py +++ /dev/null @@ -1,15 +0,0 @@ -from mpcontribs_api.domains._shared.components import MongoDbComponentsRepository -from mpcontribs_api.domains.attachments.models import ( - Attachment, - AttachmentFilter, - AttachmentIn, - AttachmentOut, - AttachmentPatch, -) - - -class MongoDbAttachmentRepository( - MongoDbComponentsRepository[Attachment, AttachmentIn, AttachmentOut, AttachmentFilter, AttachmentPatch] -): - document_model = Attachment - out_model = AttachmentOut diff --git a/mpcontribs-api/build/lib/mpcontribs_api/domains/attachments/router.py b/mpcontribs-api/build/lib/mpcontribs_api/domains/attachments/router.py deleted file mode 100644 index 49e2c076b4..0000000000 --- a/mpcontribs-api/build/lib/mpcontribs_api/domains/attachments/router.py +++ /dev/null @@ -1,77 +0,0 @@ -from typing import Annotated - -from fastapi import APIRouter, Depends -from fastapi.responses import StreamingResponse -from fastapi_filter import FilterDepends - -from mpcontribs_api.dependencies import S3Dep, require_user -from mpcontribs_api.domains._shared.models import ComponentDeleteResponse -from mpcontribs_api.domains._shared.types import ( - DownloadFormat, - FieldSelector, - ShortMimeFormat, - download_filename, -) -from mpcontribs_api.domains.attachments.dependencies import AttachmentServiceDep -from mpcontribs_api.domains.attachments.models import AttachmentFilter, AttachmentOut -from mpcontribs_api.pagination import CursorParams, Page - -router = APIRouter() - - -@router.get("", response_model=Page[AttachmentOut]) -async def get_attachments( - service: AttachmentServiceDep, - pagination: Annotated[CursorParams, Depends()], - filter: AttachmentFilter = FilterDepends(AttachmentFilter), - fields: FieldSelector = AttachmentOut.default_fields(), -): - selected = AttachmentOut.parse_fields(fields) - return await service.get_many(filter=filter, fields=selected, pagination=pagination) - - -@router.get("/{pk}", response_model=AttachmentOut) -async def get_attachment( - service: AttachmentServiceDep, - pk: str, - fields: FieldSelector = AttachmentOut.default_fields(), -): - selected = AttachmentOut.parse_fields(fields) - return await service.get_by_id(id=pk, fields=selected) - - -@router.get("/download/{short_mime}") -async def download_attachment( - service: AttachmentServiceDep, - format: DownloadFormat, - s3: S3Dep, - short_mime: ShortMimeFormat = ShortMimeFormat.GZ, - ignore_cache: bool = False, - filter: AttachmentFilter = FilterDepends(AttachmentFilter), - fields: FieldSelector = AttachmentOut.default_fields(), -) -> StreamingResponse: - selected = AttachmentOut.parse_fields(fields) - body = await service.download( - format=format, - short_mime=short_mime, - ignore_cache=ignore_cache, - filter=filter, - fields=selected, - s3=s3, - ) - filename = download_filename("attachments", format, short_mime) - return StreamingResponse( - body, - media_type="application/gzip", - headers={"Content-Disposition": f'attachment; filename="{filename}"'}, - ) - - -@router.delete("", response_model=ComponentDeleteResponse, dependencies=[Depends(require_user)]) -async def delete_attachments(service: AttachmentServiceDep, filter: AttachmentFilter = FilterDepends(AttachmentFilter)): - return await service.delete(filter=filter) - - -@router.delete("/{id}", response_model=ComponentDeleteResponse, dependencies=[Depends(require_user)]) -async def delete_attachment_by_id(service: AttachmentServiceDep, id: str): - return await service.delete_by_id(id=id) diff --git a/mpcontribs-api/build/lib/mpcontribs_api/domains/contributions/repository.py b/mpcontribs-api/build/lib/mpcontribs_api/domains/contributions/repository.py deleted file mode 100644 index 1a75419689..0000000000 --- a/mpcontribs-api/build/lib/mpcontribs_api/domains/contributions/repository.py +++ /dev/null @@ -1,266 +0,0 @@ -from collections.abc import AsyncIterable -from contextlib import AbstractAsyncContextManager -from typing import Any - -from beanie import PydanticObjectId, UpdateResponse -from beanie.operators import Set -from pymongo.asynchronous.client_session import AsyncClientSession -from pymongo.results import DeleteResult -from types_aiobotocore_s3 import S3Client - -from mpcontribs_api.authz import User -from mpcontribs_api.domains._shared.repository import MongoDbRepository -from mpcontribs_api.domains._shared.types import DownloadFormat, ShortMimeFormat -from mpcontribs_api.domains.contributions.models import ( - Contribution, - ContributionFilter, - ContributionIn, - ContributionOut, - ContributionPatch, -) -from mpcontribs_api.pagination import CursorParams - - -class MongoDbContributionRepository( - MongoDbRepository[Contribution, ContributionIn, ContributionOut, ContributionFilter, ContributionPatch] -): - """A repository layer for access to MongoDB. - - Shared CRUD logic lives on :class:`MongoDbRepository`; the methods here are domain-named - forwarders that give routers a consistent vocabulary and concrete types, plus the operations - whose shape is contribution-specific (filtered delete, id-keyed upsert, download). - Multi-collection orchestration (component inserts) lives in ``ContributionService``. - """ - - document_model = Contribution - out_model = ContributionOut - - def __init__(self, user: User) -> None: - super().__init__(user) - self._user = user - - @staticmethod - def _build_scope(user: User) -> dict[str, Any]: - """Provides scope based on current user's permitted groups and publicly released data.""" - if user.is_admin: - return {} - ors: list[dict[str, Any]] = [{"is_public": True}] - if not user.is_anonymous: - if user.groups: - ors.append({"project": {"$in": sorted(user.groups)}}) - return {"$or": ors} - - async def get_contributions( - self, - filter: ContributionFilter, - pagination: CursorParams | None = None, - fields: frozenset[str] | None = None, - ): - """Query the Contribution collection, scoped to the current user. See ``get_many``.""" - return await self.get_many(pagination=pagination, filter=filter, fields=fields) - - async def get_contribution_by_id(self, id: str, fields: frozenset[str] | None): - """Find a single contribution by id, scoped to the current user. See ``get_by_id``.""" - return await self.get_by_id(self._convert_object_id(id), fields) - - async def patch_contribution_by_id(self, id: str, update: ContributionPatch): - """Partially update a contribution by id, scoped to the current user. See ``patch``.""" - return await self.patch(self._convert_object_id(id), update) - - async def delete_contribution_by_id(self, id: str) -> None: - """Delete a contribution by id, scoped to the current user. See ``delete_by_id``.""" - await self.delete_by_id(self._convert_object_id(id)) - - async def delete_contributions( - self, - filter: ContributionFilter, - ) -> DeleteResult | None: - """Bulk deletion of Contributions described by the filter. - - Args: - filter (ContribtionFilter): the filter to use to identify contributions to delete - """ - return await filter.filter(self.document_model.find(self._scope)).delete_many() - - async def insert_many_contributions( - self, - docs: list[Contribution], - session: AsyncClientSession | None = None, - ): - """Bulk-insert pre-built Contribution documents. - - Used by the ``ContributionService`` no-component fast path. On partial failure pymongo - raises ``BulkWriteError`` whose ``details["writeErrors"]`` carries per-index error info - that the service maps back into a ``BulkWriteSummary``. - """ - return await self.document_model.insert_many(docs, ordered=False, session=session) - - async def insert_contribution( - self, - doc: Contribution, - session: AsyncClientSession | None = None, - ) -> Contribution: - """Insert a single pre-built Contribution document, optionally in a transaction.""" - await doc.insert(session=session) - return doc - - async def find_one_contribution(self, project: str, identifier: str) -> Contribution | None: - """Find a single contribution by (project, identifier), scoped to the current user.""" - return await self.document_model.find_one( - self._scope, - self.document_model.project == project, - self.document_model.identifier == identifier, - ) - - async def referenced_component_ids( - self, - ref_field: str, - ids: list[PydanticObjectId], - *, - scoped: bool, - ) -> set[PydanticObjectId]: - """Return the subset of ``ids`` referenced by contributions through ``ref_field``. - - Beanie stores each ``Link`` as a DBRef (``{"$ref": ..., "$id": ObjectId}``), so a - component is referenced when its id appears under ``.$id`` on any matching - contribution. - - Args: - ref_field: the contribution link field to inspect ("structures" | "tables" | - "attachments"). Always a fixed class-attr at the call site, never user input. - ids: candidate component ids to test - scoped: when ``True`` the user scope is applied (access gate / reachability); when - ``False`` the check spans every contribution (global integrity check) - - Returns: - set[PydanticObjectId]: the ids in ``ids`` that are still referenced - """ - if not ids: - return set() - key = f"{ref_field}.$id" - query: dict[str, Any] = {key: {"$in": ids}} - if scoped and self._scope: - query = {"$and": [self._scope, query]} - target = set(ids) - referenced: set[PydanticObjectId] = set() - collection = self.document_model.get_pymongo_collection() - async for doc in collection.find(query, {ref_field: 1}): - for ref in doc.get(ref_field) or []: - rid = ref.id if hasattr(ref, "id") else ref.get("$id") - if rid in target: - referenced.add(rid) - return referenced - - # TODO: should return document with update - async def list_referenced_component_ids( - self, - ref_field: str, - *, - scoped: bool, - ) -> set[PydanticObjectId]: - """Return every component id referenced through ``ref_field`` by matching contributions. - - Unlike :meth:`referenced_component_ids`, this takes no candidate list — it enumerates all - ids reachable from contributions in scope. Used to gate component *reads* (list/download) - to only the components a user can reach via a contribution they are allowed to see. - - Args: - ref_field: the contribution link field to inspect ("structures" | "tables" | - "attachments"). Always a fixed class-attr at the call site, never user input. - scoped: when ``True`` the user scope is applied (access gate); when ``False`` the - check spans every contribution. - - Returns: - set[PydanticObjectId]: all component ids referenced via ``ref_field`` - """ - key = f"{ref_field}.$id" - query: dict[str, Any] = {key: {"$exists": True}} - if scoped and self._scope: - query = {"$and": [self._scope, query]} - referenced: set[PydanticObjectId] = set() - collection = self.document_model.get_pymongo_collection() - async for doc in collection.find(query, {ref_field: 1}): - for ref in doc.get(ref_field) or []: - rid = ref.id if hasattr(ref, "id") else ref.get("$id") - if rid is not None: - referenced.add(rid) - return referenced - - async def update_contribution(self, doc: Contribution, update_data: dict[str, Any]) -> None: - """Apply a partial update to an existing Contribution document.""" - await doc.update(Set(update_data)) - - async def upsert_contribution_by_identifiers( - self, - identifiers: dict[str, str], - contribution: ContributionIn, - ) -> Contribution: - """Atomically upsert a Contribution by its identifying fields. - - Relies on the unique index over those fields so that concurrent requests targeting the - same key cannot both win the insert branch. Fields the caller did not set are not touched - (partial update). On insert a fresh Contribution document is written with ``is_public=False``. - - Args: - identifiers: the fields ContributionIn.identifiers() returns (project, identifier) - contribution: the input payload to upsert - - Returns: - Contribution: the document as it stands after the operation - """ - doc = self.document_model.from_input_model(contribution) - update_data = doc.model_dump(exclude={"id"}, exclude_none=True) - query = self.document_model.find_one( - self._scope, - self.document_model.project == identifiers["project"], - self.document_model.identifier == identifiers["identifier"], - ).upsert( - Set(update_data), - on_insert=doc, - response_type=UpdateResponse.NEW_DOCUMENT, - ) - return await query # pyright: ignore[reportGeneralTypeIssues] # beanie UpdateQuery is awaitable, but pyright doesn't see it - - async def upsert_contribution_by_id(self, id: str, contribution: ContributionIn): - """Upserts a single Contribution. - - If Contributions with identical identifiers exist, update, otherwise insert - - Args: - id (str): the id of the Contribution to upsert - contribution (ContributionIn): the Contribution to be upserted - - Returns: - ContributionOut: the upserted document""" - doc = self.document_model.from_input_model(contribution) - query = self.document_model.find_one( - self._scope, - self.document_model.id == self._convert_object_id(id), - ).upsert( - Set(doc.model_dump(exclude={"id"}, exclude_none=True)), - on_insert=doc, - response_type=UpdateResponse.NEW_DOCUMENT, - ) - return await query # pyright: ignore[reportGeneralTypeIssues] # beanie UpdateQuery is awaitable, but pyright doesn't see it - - async def download_contributions( - self, - format: DownloadFormat, - short_mime: ShortMimeFormat, - ignore_cache: bool, - filter: ContributionFilter, - fields: frozenset[str] | None, - key_name: str, - s3: AbstractAsyncContextManager[S3Client], - bucket_name: str = "contributions", - ) -> AsyncIterable[bytes]: - return self.download( - format=format, - short_mime=short_mime, - ignore_cache=ignore_cache, - filter=filter, - fields=fields, - bucket_name=bucket_name, - key_name=key_name, - s3=s3, - ) diff --git a/mpcontribs-api/build/lib/mpcontribs_api/domains/contributions/router.py b/mpcontribs-api/build/lib/mpcontribs_api/domains/contributions/router.py deleted file mode 100644 index cd01cbd825..0000000000 --- a/mpcontribs-api/build/lib/mpcontribs_api/domains/contributions/router.py +++ /dev/null @@ -1,117 +0,0 @@ -from typing import Annotated - -from fastapi import APIRouter, Depends -from fastapi.responses import StreamingResponse -from fastapi_filter import FilterDepends - -from mpcontribs_api.dependencies import S3Dep, require_user -from mpcontribs_api.domains._shared.bulk import BulkWriteSummary -from mpcontribs_api.domains._shared.types import ( - DownloadFormat, - FieldSelector, - ShortMimeFormat, - download_filename, -) -from mpcontribs_api.domains.contributions.dependencies import ContributionDep, ContributionServiceDep -from mpcontribs_api.domains.contributions.models import ( - Contribution, - ContributionFilter, - ContributionIn, - ContributionOut, - ContributionPatch, -) -from mpcontribs_api.pagination import CursorParams - -router = APIRouter() - - -@router.get("") -async def get_contributions( - repo: ContributionDep, - pagination: Annotated[CursorParams, Depends()], - filter: ContributionFilter = FilterDepends(ContributionFilter), - fields: FieldSelector = ContributionOut.default_fields(), -): - selected = ContributionOut.parse_fields(fields) - return await repo.get_contributions(pagination=pagination, filter=filter, fields=selected) - - -@router.delete("", dependencies=[Depends(require_user)]) -async def delete_contributions( - repo: ContributionDep, - filter: ContributionFilter = FilterDepends(ContributionFilter), -): - return await repo.delete_contributions(filter=filter) - - -# TODO: Might want to take contributions in from request body and run model_validate_json on it (much faster) -@router.post("", response_model=BulkWriteSummary[Contribution], dependencies=[Depends(require_user)]) -async def insert_contributions( - service: ContributionServiceDep, - contributions: list[ContributionIn], -): - return await service.insert_contributions(contributions=contributions) - - -@router.put("", dependencies=[Depends(require_user)]) -async def upsert_contributions( - service: ContributionServiceDep, - contributions: list[ContributionIn], -): - return await service.upsert_contributions(contributions=contributions) - - -@router.get("/download/{short_mime}") -async def download_contributions( - repo: ContributionDep, - s3: S3Dep, - short_mime: ShortMimeFormat = ShortMimeFormat.GZ, - format: DownloadFormat = DownloadFormat.JSONL, - ignore_cache: bool = False, - filter: ContributionFilter = FilterDepends(ContributionFilter), - fields: FieldSelector = ContributionOut.default_fields(), -): - selected = ContributionOut.parse_fields(fields) - body = await repo.download_contributions( - format=format, - short_mime=short_mime, - ignore_cache=ignore_cache, - filter=filter, - fields=selected, - s3=s3, - key_name="", # TODO: Temp - ) - filename = download_filename("contributions", format, short_mime) - return StreamingResponse( - body, - media_type="application/gzip", - headers={"Content-Disposition": f'attachment; filename="{filename}"'}, - ) - - -@router.delete("/{id}", dependencies=[Depends(require_user)]) -async def delete_contribution_by_id( - service: ContributionServiceDep, - id: str, -): - return await service.delete_contributions(ContributionFilter.model_validate({"id": id})) - - -@router.get("/{id}") -async def get_contribution_by_id( - repo: ContributionDep, - id: str, - fields: FieldSelector = ContributionOut.default_fields(), -): - selected = ContributionOut.parse_fields(fields) - return await repo.get_contribution_by_id(id=id, fields=selected) - - -@router.put("/{id}", dependencies=[Depends(require_user)]) -async def upsert_contribution_by_id(repo: ContributionDep, id: str, contribution: ContributionIn): - return await repo.upsert_contribution_by_id(id=id, contribution=contribution) - - -@router.patch("/{id}", dependencies=[Depends(require_user)]) -async def patch_contribution_by_id(repo: ContributionDep, id: str, update: ContributionPatch): - return await repo.patch_contribution_by_id(id=id, update=update) diff --git a/mpcontribs-api/build/lib/mpcontribs_api/domains/contributions/service.py b/mpcontribs-api/build/lib/mpcontribs_api/domains/contributions/service.py deleted file mode 100644 index 5da70bdc31..0000000000 --- a/mpcontribs-api/build/lib/mpcontribs_api/domains/contributions/service.py +++ /dev/null @@ -1,328 +0,0 @@ -import asyncio -from collections import defaultdict -from typing import cast - -import structlog -from beanie import Link, PydanticObjectId -from pymongo import AsyncMongoClient -from pymongo.asynchronous.client_session import AsyncClientSession -from pymongo.errors import BulkWriteError - -from mpcontribs_api.config import MongoSettings, get_settings -from mpcontribs_api.domains._shared.bulk import ( - BulkDeleteSummary, - BulkFailure, - BulkWriteSummary, - bulk_failure_from_exception, -) -from mpcontribs_api.domains._shared.repository import MongoDbRepository -from mpcontribs_api.domains.attachments.repository import MongoDbAttachmentRepository -from mpcontribs_api.domains.contributions.models import Contribution, ContributionFilter, ContributionIn -from mpcontribs_api.domains.contributions.repository import MongoDbContributionRepository -from mpcontribs_api.domains.structures.models import Structure -from mpcontribs_api.domains.structures.repository import MongoDbStructureRepository -from mpcontribs_api.domains.tables.models import Table -from mpcontribs_api.domains.tables.repository import MongoDbTableRepository -from mpcontribs_api.exceptions import AppError, ValidationError -from mpcontribs_api.pagination import CursorParams - -logger = structlog.get_logger(__name__) - - -class ContributionService: - def __init__( - self, - client: AsyncMongoClient, - contributions: MongoDbContributionRepository, - structures: MongoDbStructureRepository, - attachments: MongoDbAttachmentRepository, - tables: MongoDbTableRepository, - settings: MongoSettings | None = None, - ): - self._client = client - self._contributions = contributions - self._structures = structures - self._attachments = attachments - self._tables = tables - self._settings = settings or get_settings().mongo - - @property - def _children(self) -> dict[str, MongoDbRepository]: - return { - "structures": self._structures, - "attachments": self._attachments, - "tables": self._tables, - } - - async def insert_contributions( - self, - contributions: list[ContributionIn], - ) -> BulkWriteSummary[Contribution]: - """Atomic bulk insert contributions, atomically per top-level contribution. - - Contributions carrying no components are inserted in one ``insert_many`` (no transaction); - contributions with components run inside their own MongoDB transaction so the contribution - and its components commit or roll back together. Concurrent transactions are bounded by - ``settings.mongo.max_concurrent_transactions``. Per-item failures are returned in the - summary's ``failed`` list; the request as a whole does not raise on partial failure. - - Args: - contributions: contributions to insert; may include nested structures/tables/attachments - - Returns: - BulkWriteSummary[Contribution]: per-item outcome, sized to ``len(contributions)`` - - Raises: - ValidationError: if duplicate keys (project-identifier) are found in ``contributions`` - """ - if not contributions: - return BulkWriteSummary[Contribution](total=0, succeeded=[], failed=[]) - - self._reject_duplicate_keys(contributions) - - oversize_failures, remaining_indices = self._split_oversize(contributions) - no_comp_indices = [i for i in remaining_indices if not contributions[i].has_components()] - with_comp_indices = [i for i in remaining_indices if contributions[i].has_components()] - - no_comp_succeeded, no_comp_failed = await self._insert_no_components( - indices=no_comp_indices, - contributions=contributions, - ) - with_comp_succeeded, with_comp_failed = await self._insert_with_components( - indices=with_comp_indices, - contributions=contributions, - ) - - succeeded = [doc for _, doc in sorted(no_comp_succeeded + with_comp_succeeded, key=lambda p: p[0])] - failed = sorted( - oversize_failures + no_comp_failed + with_comp_failed, - key=lambda f: f.index, - ) - return BulkWriteSummary[Contribution](total=len(contributions), succeeded=succeeded, failed=failed) - - def _reject_duplicate_keys(self, contributions: list[ContributionIn]) -> None: - """Reject the whole batch if any identifying key appears more than once. - - Mongo would surface this as a duplicate key error; catching it upfront keeps a guaranteed - failure from consuming a transaction slot and gives the caller all offending indices at once. - - The dedup key is derived from every value in ``identifiers()`` so adding a field to the - uniqueness contract there flows through here automatically. - """ - seen: dict[tuple[str, ...], list[int]] = defaultdict(list) - for index, contribution in enumerate(contributions): - ids = contribution.identifiers() - seen[tuple(ids.values())].append(index) - duplicates = sorted(index for indices in seen.values() if len(indices) > 1 for index in indices) - if duplicates: - raise ValidationError( - "Duplicate (project, identifier) pairs in batch", - contribution_indices=duplicates, - ) - - def _split_oversize(self, contributions: list[ContributionIn]) -> tuple[list[BulkFailure], list[int]]: - """Reject contributions whose component count exceeds the per-contribution ceiling. - - Returns the failure entries for the oversize items and the indices of the remaining items - that should proceed to Mongo. Doing this upfront avoids burning a transaction slot on a - request guaranteed to exceed transactionLifetimeLimitSeconds. - """ - cap = self._settings.max_components_per_contribution - oversize: list[BulkFailure] = [] - remaining: list[int] = [] - for i, contrib in enumerate(contributions): - count = contrib.component_count() - if count > cap: - oversize.append( - BulkFailure( - index=i, - identifier=contrib.identifiers(), - error_code="validation_error", - message=f"contribution has {count} components, exceeds cap of {cap}. " - "Recommend inserting the component alone, followed by bulk inserts of components", - ) - ) - else: - remaining.append(i) - return oversize, remaining - - async def _insert_no_components( - self, - indices: list[int], - contributions: list[ContributionIn], - ) -> tuple[list[tuple[int, Contribution]], list[BulkFailure]]: - """Single-collection bulk insert for component-free contributions. - - Uses ``ordered=False`` so a single bad item doesn't sink the rest of the batch. pymongo - raises ``BulkWriteError`` with per-index error info on partial failure; we map that back - onto the original input indices. - """ - if not indices: - return [], [] - docs = [Contribution.from_input_model(contributions[i]) for i in indices] - try: - await self._contributions.insert_many_contributions(docs) - return list(zip(indices, docs, strict=False)), [] - except BulkWriteError as exc: - return self._partition_bulk_write_error(indices, docs, contributions, exc) - - @staticmethod - def _partition_bulk_write_error( - indices: list[int], - docs: list[Contribution], - contributions: list[ContributionIn], - exc: BulkWriteError, - ) -> tuple[list[tuple[int, Contribution]], list[BulkFailure]]: - """Map pymongo's per-position writeErrors back to the caller's original input indices.""" - write_errors = exc.details.get("writeErrors", []) if exc.details else [] - failed_positions = {err.get("index"): err for err in write_errors} - succeeded: list[tuple[int, Contribution]] = [] - failed: list[BulkFailure] = [] - for position, (orig_index, doc) in enumerate(zip(indices, docs, strict=False)): - err = failed_positions.get(position) - if err is None: - succeeded.append((orig_index, doc)) - else: - failed.append( - BulkFailure( - index=orig_index, - identifier=contributions[orig_index].identifiers(), - error_code="conflict" if err.get("code") == 11000 else "write_error", - message=err.get("errmsg", "write failed"), - ) - ) - return succeeded, failed - - async def _insert_with_components( - self, - indices: list[int], - contributions: list[ContributionIn], - ) -> tuple[list[tuple[int, Contribution]], list[BulkFailure]]: - """Per-contribution transaction path, bounded by ``max_concurrent_transactions``.""" - if not indices: - return [], [] - sem = asyncio.Semaphore(self._settings.max_concurrent_transactions) - - async def _bounded(orig_index: int) -> Contribution | BulkFailure: - async with sem: - return await self._insert_one_with_components(orig_index, contributions[orig_index]) - - results = await asyncio.gather(*[_bounded(i) for i in indices]) - succeeded: list[tuple[int, Contribution]] = [] - failed: list[BulkFailure] = [] - for orig_index, outcome in zip(indices, results, strict=True): - if isinstance(outcome, BulkFailure): - failed.append(outcome) - else: - succeeded.append((orig_index, outcome)) - return succeeded, failed - - async def _insert_one_with_components( - self, - index: int, - contrib: ContributionIn, - ) -> Contribution | BulkFailure: - """Run a single contribution + its components inside a transaction. - - Uses ``session.with_transaction`` so transient txn errors (write conflicts, primary step- - downs) get pymongo's retry treatment. Any exception is converted to a ``BulkFailure`` so - the surrounding ``asyncio.gather`` sees a normal return value for every coroutine. - """ - try: - async with self._client.start_session() as session: - - async def _txn(s: AsyncClientSession) -> Contribution: - return await self._do_insert(contrib, s) - - return await session.with_transaction(_txn) - except AppError as exc: - return bulk_failure_from_exception(index, contrib.identifiers(), exc) - except Exception as exc: - logger.error("insert_contribution_failed", index=index, identifier=contrib.identifiers(), exc_info=True) - return bulk_failure_from_exception(index, contrib.identifiers(), exc) - - async def _do_insert(self, contrib: ContributionIn, session: AsyncClientSession) -> Contribution: - """Insert components then the contribution itself, all in the given session. - - Components are inserted sequentially because a session is single-threaded — sharing it - across concurrent awaits would corrupt the wire protocol. - """ - structures = await self._structures.insert_components(contrib.structures or [], session=session) - tables = await self._tables.insert_components(contrib.tables or [], session=session) - - doc = Contribution.from_input_model(contrib) - doc.structures = cast(list[Link[Structure]] | None, structures or None) - doc.tables = cast(list[Link[Table]] | None, tables or None) - return await self._contributions.insert_contribution(doc, session=session) - - async def upsert_contributions(self, contributions: list[ContributionIn]) -> list[Contribution]: - """Upsert contributions by their identifying fields, bounded by concurrency caps. - - Components (structures, tables, attachments) must be managed via their respective - services. If any contribution in the batch carries components, the entire request is - rejected before any database writes occur. - - Each item is upserted atomically by ``ContributionIn.identifiers()`` via a single - ``findOneAndUpdate(..., upsert=True)`` so two requests targeting the same key cannot - race past the find branch — the unique index over those fields is the tiebreaker. - Concurrent upserts within a batch are bounded by ``settings.mongo.max_concurrent_transactions`` - - Args: - contributions: contributions to upsert; must not include nested components - - Returns: - list[Contribution]: upserted documents in input order - """ - indices_with_components = [i for i, c in enumerate(contributions) if c.has_components()] - if indices_with_components: - raise ValidationError( - "Components must be managed via their respective services, not via contribution upsert.", - contribution_indices=indices_with_components, - ) - - sem = asyncio.Semaphore(self._settings.max_concurrent_transactions) - - async def _bounded_upsert(contrib: ContributionIn) -> Contribution: - async with sem: - return await self._contributions.upsert_contribution_by_identifiers(contrib.identifiers(), contrib) - - return await asyncio.gather(*[_bounded_upsert(c) for c in contributions]) - - async def delete_contributions(self, filter: ContributionFilter) -> BulkDeleteSummary: - """Delete a contribution and all of its child components - - Doesn't guarantee complete atomicity, but prevents orphaned children by deleting components first. - - Args: - filter (ContributionFilter): the Contribution-specific query to apply on top of the user scope - - - Returns: - BulkDeleteSummary: a summary of how many documents and child documents were deleted - """ - num_deleted_components = 0 - num_deleted_contributions = 0 - # Loop through cursor rather than materialize arbitrary number of Contributions - while True: - # Since we are deleting everything matching filter, we can continuously get the 1st page - page = await self._contributions.get_contributions( - pagination=CursorParams(cursor=None, limit=100), - filter=filter, - ) - # For each component type, gather ObjectIds then bulk delete them - # - components first so no children are left orphaned - for field, repo in self._children.items(): - ids = [link.ref.id for c in page.items for link in (getattr(c, field) or [])] - if ids: - deleted_components = await repo.delete_by_ids(ids) - num_deleted_components += deleted_components.num_deleted if deleted_components else 0 - - # Delete Contributions in this batch by ID - # need to make a new filter so we don't eagerly delete all contributions before their components are deleted - deleted_contribs = await self._contributions.delete_contributions( - ContributionFilter(id__in=[cast(PydanticObjectId, c.id) for c in page.items]) - ) - num_deleted_contributions += deleted_contribs.deleted_count if deleted_contribs else 0 - if not page.items: - break - return BulkDeleteSummary(num_deleted=num_deleted_contributions, num_children_deleted=num_deleted_components) diff --git a/mpcontribs-api/build/lib/mpcontribs_api/domains/healthcheck/router.py b/mpcontribs-api/build/lib/mpcontribs_api/domains/healthcheck/router.py deleted file mode 100644 index e099971ab6..0000000000 --- a/mpcontribs-api/build/lib/mpcontribs_api/domains/healthcheck/router.py +++ /dev/null @@ -1,37 +0,0 @@ -from botocore.exceptions import BotoCoreError, ClientError -from fastapi import APIRouter, HTTPException, status -from pydantic import BaseModel - -from mpcontribs_api.config import get_settings -from mpcontribs_api.dependencies import DbDep, S3Dep - -router = APIRouter(tags=["health"]) - -settings = get_settings() - - -class HealthStatus(BaseModel): - status: str - mongo: str - s3: str - - -@router.get("", response_model=HealthStatus, summary="Service health") -async def healthcheck(db: DbDep, s3_client: S3Dep) -> HealthStatus: - try: - await db.client.admin.command("ping") - except Exception: - raise HTTPException( - status_code=status.HTTP_503_SERVICE_UNAVAILABLE, - detail={"status": "unhealthy", "mongo": "unreachable"}, - ) from None - - try: - await s3_client.head_bucket(Bucket=settings.aws.health_bucket) - except (ClientError, BotoCoreError): - raise HTTPException( - status_code=status.HTTP_503_SERVICE_UNAVAILABLE, - detail={"status": "unhealthy", "s3": "unreachable"}, - ) from None - - return HealthStatus(status="healthy", mongo="ok", s3="ok") diff --git a/mpcontribs-api/build/lib/mpcontribs_api/domains/projects/repository.py b/mpcontribs-api/build/lib/mpcontribs_api/domains/projects/repository.py deleted file mode 100644 index f0f3f09f36..0000000000 --- a/mpcontribs-api/build/lib/mpcontribs_api/domains/projects/repository.py +++ /dev/null @@ -1,111 +0,0 @@ -from typing import Any - -from mpcontribs_api.authz import User -from mpcontribs_api.domains._shared.repository import MongoDbRepository -from mpcontribs_api.domains.projects.models import ( - Project, - ProjectFilter, - ProjectIn, - ProjectOut, - ProjectPatch, -) -from mpcontribs_api.exceptions import PermissionError -from mpcontribs_api.pagination import CursorParams - - -class MongoDbProjectRepository(MongoDbRepository[Project, ProjectIn, ProjectOut, ProjectFilter, ProjectPatch]): - """A repository layer for access to MongoDB. - - This is the layer that directly interacts with database operations. Shared CRUD logic lives on - :class:`MongoDbRepository`; the methods here are domain-named forwarders that give routers a - consistent vocabulary and concrete types, plus the operations whose shape is genuinely - project-specific (id-keyed upsert). - - Attributes: - _scope (dict[str, Any]): additional terms to inject into mongo queries to enforce user - authorization on resources - """ - - document_model = Project - out_model = ProjectOut - - def __init__(self, user: User) -> None: - super().__init__(user) - self._user = user - - @staticmethod - def _build_scope(user: User) -> dict[str, Any]: - """Provides scope based on current user's permitted groups and publicly released data.""" - if user.is_admin: - return {} - ors: list[dict[str, Any]] = [{"is_public": True, "is_approved": True}] - if not user.is_anonymous: - ors.append({"owner": user.username}) - if user.groups: - ors.append({"_id": {"$in": sorted(user.groups)}}) - return {"$or": ors} - - async def get_projects( - self, - filter: ProjectFilter, - pagination: CursorParams, - fields: frozenset[str] | None, - ): - """Query the Project collection, scoped to the current user. See ``get_many``.""" - return await self.get_many(pagination=pagination, filter=filter, fields=fields) - - async def get_project_by_id(self, id: str, fields: frozenset[str] | None): - """Find a single project by id, scoped to the current user. See ``get_by_id``.""" - return await self.get_by_id(id, fields) - - async def insert_project(self, project: ProjectIn) -> Project: - """Insert a new project, rejecting a duplicate id. See ``insert_one``.""" - return await self.insert_one(project) - - async def patch_project_by_id(self, id: str, update: ProjectPatch) -> Project: - """Partially update a project by id, scoped to the current user. See ``patch``.""" - return await self.patch(id, update) - - async def delete_project_by_id(self, id: str) -> None: - """Delete a project by id, scoped to the current user. See ``delete_by_id``.""" - await self.delete_by_id(id) - - async def upsert_project_by_id(self, id: str, data: ProjectIn) -> Project: - """Upsert a project by provided id, authorized to the current user. - - Update the document if the id exists, otherwise insert a new one under that id. - Authorization (the read scope is for visibility, not write access, so it is not - reused here): - - - **Existing project:** only its ``owner`` or an admin may overwrite it. The stored - ``owner`` is preserved — ownership cannot be reassigned through the request body. - - **New project:** ``owner`` is forced to the caller, ignoring any body value. - - Note: relies on the path param ``id`` for identity, not the body's id. - - Args: - id (str): the id of the project to upsert - data (ProjectIn): the data of the project to upsert - - Returns: - Project: the full document that either replaced an old one or was inserted - - Raises: - PermissionError: if a non-owner, non-admin caller targets an existing project - """ - # The route enforces authentication, so an anonymous caller should never reach here. - if self._user.username is None: - raise PermissionError(required_role="authenticated") - - existing = await self.document_model.find_one(self.document_model.id == id) - project = self.document_model.from_input_model(data) - project.id = id - if existing is not None: - if not (self._user.is_admin or existing.owner == self._user.username): - raise PermissionError(required_role="owner-or-admin") - # Ownership is immutable via upsert; keep the original owner. - project.owner = existing.owner - else: - # New project: the caller owns it, regardless of the submitted owner. - project.owner = self._user.username - return await project.save() diff --git a/mpcontribs-api/build/lib/mpcontribs_api/domains/projects/router.py b/mpcontribs-api/build/lib/mpcontribs_api/domains/projects/router.py deleted file mode 100644 index e82116b270..0000000000 --- a/mpcontribs-api/build/lib/mpcontribs_api/domains/projects/router.py +++ /dev/null @@ -1,121 +0,0 @@ -from typing import Annotated - -from fastapi import APIRouter, Depends, Response, status -from fastapi_filter import FilterDepends -from starlette.status import HTTP_204_NO_CONTENT - -from mpcontribs_api.dependencies import require_user -from mpcontribs_api.domains._shared.types import FieldSelector -from mpcontribs_api.domains.projects.dependencies import ProjectDep -from mpcontribs_api.domains.projects.models import ( - ProjectFilter, - ProjectIn, - ProjectOut, - ProjectPatch, -) -from mpcontribs_api.pagination import CursorParams - -router = APIRouter() - - -# Brendan TODO: Add in option to select ProjectSummary or ProjectOut -@router.get("", response_model=None) -async def get_projects( - repo: ProjectDep, - pagination: Annotated[CursorParams, Depends()], - filter: ProjectFilter = FilterDepends(ProjectFilter), - fields: FieldSelector = ProjectOut.default_fields(), -): - """Return paginated projects matching a filter. - - Args: - repo (ProjectDep): the project repo we depend on - pagination (CursorParams): arguments for cursor-based pagination - fields (str | None): optional fields to include in return. If None supplied, all fields are returned - - Returns: - list[ProjectSummary]: a list of smaller project payloads - """ - selected = ProjectOut.parse_fields(fields) - return await repo.get_projects(filter=filter, pagination=pagination, fields=selected) - - -@router.get("/{id}", response_model=ProjectOut) -async def get_project_by_id( - id: str, - repo: ProjectDep, - fields: FieldSelector = ProjectOut.default_fields(), -): - """Gets a single project by its ID. - - Args: - id (str): the id of the project to retrieve - repo (ProjectDep): the project repo we depend on - fields (str | None): optional fields to include in return. If None supplied, all fields are returned - - Returns: - ProjectOut: the requested project, actual data returned is determined by the view the user requested - """ - selected = ProjectOut.parse_fields(fields) - return await repo.get_project_by_id(id=id, fields=selected) - - -@router.put("/{id}", response_model=ProjectOut, dependencies=[Depends(require_user)]) -async def upsert_project_by_id( - repo: ProjectDep, - id: str, - project: ProjectIn, -): - """Upsert a project by provided id. - - Upsert: Update document if id is found, otherwise insert new document using id. - Note: Relies on the path param 'id' for finding, rather than the body's id. - - Args: - repo (ProjectDep): the project repo we depend on - id (str): the id of the project to retrieve - project (ProjectIn): the data of the project to upsert - - Returns: - ProjectOut: the full document that either replaced an old one or was inserted - """ - return await repo.upsert_project_by_id(id=id, data=project) - - -@router.patch("/{id}", response_model=ProjectOut, dependencies=[Depends(require_user)]) -async def patch_project_by_id( - repo: ProjectDep, - id: str, - update: ProjectPatch, -): - """Partial update to project identified with 'id'. - - Note: overwrites fields with given values - arrays are not appended to. - - Args: - repo (ProjectDep): the project repo we depend on - id (str): the id of the project to update - update (ProjectPatch): the partial update to apply - unset fields are dropped - - Note: If fields are intentionally set to None, None is applied to the field. - - Returns: - ProjectOut: the full Project with updates applied - """ - return await repo.patch_project_by_id(id=id, update=update) - - -@router.delete("/{id}", status_code=status.HTTP_204_NO_CONTENT, dependencies=[Depends(require_user)]) -async def delete_project_by_id( - repo: ProjectDep, - id: str, -): - """Deletes a project matching id. - - Args: - repo (ProjectDep): the project repo we depend on - id (str): the id of the project to be deleted - Returns: - Response: a response with the 204 response code (rather than FastAPIs default 200) - """ - await repo.delete_project_by_id(id=id) - return Response(status_code=HTTP_204_NO_CONTENT) diff --git a/mpcontribs-api/build/lib/mpcontribs_api/domains/structures/repository.py b/mpcontribs-api/build/lib/mpcontribs_api/domains/structures/repository.py deleted file mode 100644 index ab74497850..0000000000 --- a/mpcontribs-api/build/lib/mpcontribs_api/domains/structures/repository.py +++ /dev/null @@ -1,15 +0,0 @@ -from mpcontribs_api.domains._shared.components import MongoDbComponentsRepository -from mpcontribs_api.domains.structures.models import ( - Structure, - StructureFilter, - StructureIn, - StructureOut, - StructurePatch, -) - - -class MongoDbStructureRepository( - MongoDbComponentsRepository[Structure, StructureIn, StructureOut, StructureFilter, StructurePatch] -): - document_model = Structure - out_model = StructureOut diff --git a/mpcontribs-api/build/lib/mpcontribs_api/domains/structures/router.py b/mpcontribs-api/build/lib/mpcontribs_api/domains/structures/router.py deleted file mode 100644 index 0a5746607c..0000000000 --- a/mpcontribs-api/build/lib/mpcontribs_api/domains/structures/router.py +++ /dev/null @@ -1,95 +0,0 @@ -from typing import Annotated - -from fastapi import APIRouter, Depends -from fastapi.responses import StreamingResponse -from fastapi_filter import FilterDepends - -from mpcontribs_api.dependencies import S3Dep, require_user -from mpcontribs_api.domains._shared.bulk import BulkWriteSummary -from mpcontribs_api.domains._shared.models import ComponentDeleteResponse -from mpcontribs_api.domains._shared.types import ( - DownloadFormat, - FieldSelector, - ShortMimeFormat, - download_filename, -) -from mpcontribs_api.domains.structures.dependencies import StructureServiceDep -from mpcontribs_api.domains.structures.models import StructureFilter, StructureIn, StructureOut, StructurePatch -from mpcontribs_api.pagination import CursorParams, Page - -router = APIRouter() - - -@router.get("", response_model=Page[StructureOut]) -async def get_structures( - service: StructureServiceDep, - pagination: Annotated[CursorParams, Depends()], - filter: StructureFilter = FilterDepends(StructureFilter), - fields: FieldSelector = StructureOut.default_fields(), -): - selected = StructureOut.parse_fields(fields) - return await service.get_many(filter=filter, fields=selected, pagination=pagination) - - -@router.get("/{pk}", response_model=StructureOut) -async def get_structure( - service: StructureServiceDep, - pk: str, - fields: FieldSelector = StructureOut.default_fields(), -): - selected = StructureOut.parse_fields(fields) - return await service.get_by_id(id=pk, fields=selected) - - -@router.get("/download/{short_mime}") -async def download_structure( - service: StructureServiceDep, - format: DownloadFormat, - s3: S3Dep, - short_mime: ShortMimeFormat = ShortMimeFormat.GZ, - ignore_cache: bool = False, - filter: StructureFilter = FilterDepends(StructureFilter), - fields: FieldSelector = StructureOut.default_fields(), -) -> StreamingResponse: - selected = StructureOut.parse_fields(fields) - body = await service.download( - format=format, - short_mime=short_mime, - ignore_cache=ignore_cache, - filter=filter, - fields=selected, - s3=s3, - ) - filename = download_filename("structures", format, short_mime) - return StreamingResponse( - body, - media_type="application/gzip", - headers={"Content-Disposition": f'attachment; filename="{filename}"'}, - ) - - -@router.post("", response_model=BulkWriteSummary[StructureOut], dependencies=[Depends(require_user)]) -async def insert_structures( - service: StructureServiceDep, - structures: list[StructureIn], -): - return await service.insert(components=structures) - - -@router.delete("", response_model=ComponentDeleteResponse, dependencies=[Depends(require_user)]) -async def delete_structures(service: StructureServiceDep, filter: StructureFilter = FilterDepends(StructureFilter)): - return await service.delete(filter=filter) - - -@router.delete("/{id}", response_model=ComponentDeleteResponse, dependencies=[Depends(require_user)]) -async def delete_structure_by_id(service: StructureServiceDep, id: str): - return await service.delete_by_id(id=id) - - -@router.patch("/{id}", dependencies=[Depends(require_user)]) -async def patch_structure_by_id( - service: StructureServiceDep, - id: str, - update: StructurePatch, -): - return await service.patch_by_id(id=id, update=update) diff --git a/mpcontribs-api/build/lib/mpcontribs_api/domains/tables/repository.py b/mpcontribs-api/build/lib/mpcontribs_api/domains/tables/repository.py deleted file mode 100644 index a6bda17912..0000000000 --- a/mpcontribs-api/build/lib/mpcontribs_api/domains/tables/repository.py +++ /dev/null @@ -1,13 +0,0 @@ -from mpcontribs_api.domains._shared.components import MongoDbComponentsRepository -from mpcontribs_api.domains.tables.models import ( - Table, - TableFilter, - TableIn, - TableOut, - TablePatch, -) - - -class MongoDbTableRepository(MongoDbComponentsRepository[Table, TableIn, TableOut, TableFilter, TablePatch]): - document_model = Table - out_model = TableOut diff --git a/mpcontribs-api/build/lib/mpcontribs_api/domains/tables/router.py b/mpcontribs-api/build/lib/mpcontribs_api/domains/tables/router.py deleted file mode 100644 index 619f4073e0..0000000000 --- a/mpcontribs-api/build/lib/mpcontribs_api/domains/tables/router.py +++ /dev/null @@ -1,95 +0,0 @@ -from typing import Annotated - -from fastapi import APIRouter, Depends -from fastapi.responses import StreamingResponse -from fastapi_filter import FilterDepends - -from mpcontribs_api.dependencies import S3Dep, require_user -from mpcontribs_api.domains._shared.bulk import BulkWriteSummary -from mpcontribs_api.domains._shared.models import ComponentDeleteResponse -from mpcontribs_api.domains._shared.types import ( - DownloadFormat, - FieldSelector, - ShortMimeFormat, - download_filename, -) -from mpcontribs_api.domains.tables.dependencies import TableServiceDep -from mpcontribs_api.domains.tables.models import Table, TableFilter, TableIn, TableOut, TablePatch -from mpcontribs_api.pagination import CursorParams, Page - -router = APIRouter() - - -@router.get("", response_model=Page[TableOut]) -async def get_tables( - service: TableServiceDep, - pagination: Annotated[CursorParams, Depends()], - filter: TableFilter = FilterDepends(TableFilter), - fields: FieldSelector = TableOut.default_fields(), -): - selected = TableOut.parse_fields(fields) - return await service.get_many(filter=filter, fields=selected, pagination=pagination) - - -@router.get("/{pk}", response_model=TableOut) -async def get_table( - service: TableServiceDep, - pk: str, - fields: FieldSelector = TableOut.default_fields(), -): - selected = TableOut.parse_fields(fields) - return await service.get_by_id(id=pk, fields=selected) - - -@router.get("/download/{short_mime}") -async def download_table( - service: TableServiceDep, - s3: S3Dep, - format: DownloadFormat, - short_mime: ShortMimeFormat = ShortMimeFormat.GZ, - ignore_cache: bool = False, - filter: TableFilter = FilterDepends(TableFilter), - fields: FieldSelector = TableOut.default_fields(), -) -> StreamingResponse: - selected = TableOut.parse_fields(fields) - body = await service.download( - format=format, - short_mime=short_mime, - ignore_cache=ignore_cache, - filter=filter, - fields=selected, - s3=s3, - ) - filename = download_filename("tables", format, short_mime) - return StreamingResponse( - body, - media_type="application/gzip", - headers={"Content-Disposition": f'attachment; filename="{filename}"'}, - ) - - -@router.post("", response_model=BulkWriteSummary[Table], dependencies=[Depends(require_user)]) -async def insert_tables( - service: TableServiceDep, - tables: list[TableIn], -): - return await service.insert(components=tables) - - -@router.delete("", response_model=ComponentDeleteResponse, dependencies=[Depends(require_user)]) -async def delete_tables(service: TableServiceDep, filter: TableFilter = FilterDepends(TableFilter)): - return await service.delete(filter=filter) - - -@router.delete("/{id}", response_model=ComponentDeleteResponse, dependencies=[Depends(require_user)]) -async def delete_table_by_id(service: TableServiceDep, id: str): - return await service.delete_by_id(id=id) - - -@router.patch("/{id}", dependencies=[Depends(require_user)]) -async def patch_table_by_id( - service: TableServiceDep, - id: str, - update: TablePatch, -): - return await service.patch_by_id(id=id, update=update) From 2eddd4698855464e210488101a6baba7b533ab27 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 18 Jun 2026 13:03:18 -0700 Subject: [PATCH 391/591] Unified deletion behavior by moving BaseDocumentWithInput to inherit from Document instead of DocumentWithSoftDelet --- .../src/mpcontribs_api/domains/_shared/models.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py index 2c0a258153..2099f70d90 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py @@ -4,7 +4,7 @@ from collections.abc import Mapping from typing import Annotated, Any, ClassVar, Self -from beanie import DocumentWithSoftDelete, PydanticObjectId +from beanie import Document, PydanticObjectId from pydantic import BaseModel, Field from pymongo.results import DeleteResult @@ -13,7 +13,7 @@ from mpcontribs_api.projection import SparseFieldsModel -class BaseDocumentWithInput[TId](DocumentWithSoftDelete): +class BaseDocumentWithInput[TId](Document): """A stored resource document with a required ``id`` and an input counterpart. Subclasses bind their id type as ``TId``. The ``id`` is declared here as required and non-null so @@ -21,8 +21,7 @@ class BaseDocumentWithInput[TId](DocumentWithSoftDelete): type (``ShortStr`` for projects, ``PydanticObjectId`` for contributions). ``from_input_model`` translates a validated input payload into a full document; the base param is intentionally ``Any`` so each resource's override can declare its concrete input model without violating LSP (input - models subclass their document, so they can't be bound as a class type parameter). Soft-delete - behavior is inherited from ``DocumentWithSoftDelete``. + models subclass their document, so they can't be bound as a class type parameter). """ # Required, non-null, resource-specific id. Overrides Document's optional ``PydanticObjectId`` id. From 939272c26bc6e587dcdbbd7a5ff43828644c8b28 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 18 Jun 2026 15:24:43 -0700 Subject: [PATCH 392/591] Upsert now functions like bulk insert, allowing upserts to fail and reporting the successes and failures via BulkWriteSummary --- .../domains/contributions/router.py | 2 +- .../domains/contributions/service.py | 31 ++++++++++++++----- 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py index cd01cbd825..42dcdf562f 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py @@ -53,7 +53,7 @@ async def insert_contributions( return await service.insert_contributions(contributions=contributions) -@router.put("", dependencies=[Depends(require_user)]) +@router.put("", response_model=BulkWriteSummary[Contribution], dependencies=[Depends(require_user)]) async def upsert_contributions( service: ContributionServiceDep, contributions: list[ContributionIn], diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py index 5da70bdc31..dd9bb350c6 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py @@ -255,8 +255,8 @@ async def _do_insert(self, contrib: ContributionIn, session: AsyncClientSession) doc.tables = cast(list[Link[Table]] | None, tables or None) return await self._contributions.insert_contribution(doc, session=session) - async def upsert_contributions(self, contributions: list[ContributionIn]) -> list[Contribution]: - """Upsert contributions by their identifying fields, bounded by concurrency caps. + async def upsert_contributions(self, contributions: list[ContributionIn]) -> BulkWriteSummary[Contribution]: + """Upsert contributions by their identifying fields, reporting per-item outcomes. Components (structures, tables, attachments) must be managed via their respective services. If any contribution in the batch carries components, the entire request is @@ -265,14 +265,22 @@ async def upsert_contributions(self, contributions: list[ContributionIn]) -> lis Each item is upserted atomically by ``ContributionIn.identifiers()`` via a single ``findOneAndUpdate(..., upsert=True)`` so two requests targeting the same key cannot race past the find branch — the unique index over those fields is the tiebreaker. - Concurrent upserts within a batch are bounded by ``settings.mongo.max_concurrent_transactions`` + Concurrent upserts within a batch are bounded by ``settings.mongo.max_concurrent_transactions``. + A single item failing does not fail the batch: it is reported in ``failed`` while the others + still commit (mirroring ``insert_contributions``). Args: contributions: contributions to upsert; must not include nested components Returns: - list[Contribution]: upserted documents in input order + BulkWriteSummary[Contribution]: per-item outcome, sized to ``len(contributions)`` + + Raises: + ValidationError: if any contribution in the batch carries components """ + if not contributions: + return BulkWriteSummary[Contribution](total=0, succeeded=[], failed=[]) + indices_with_components = [i for i, c in enumerate(contributions) if c.has_components()] if indices_with_components: raise ValidationError( @@ -282,11 +290,18 @@ async def upsert_contributions(self, contributions: list[ContributionIn]) -> lis sem = asyncio.Semaphore(self._settings.max_concurrent_transactions) - async def _bounded_upsert(contrib: ContributionIn) -> Contribution: + async def _bounded_upsert(index: int, contrib: ContributionIn) -> Contribution | BulkFailure: async with sem: - return await self._contributions.upsert_contribution_by_identifiers(contrib.identifiers(), contrib) - - return await asyncio.gather(*[_bounded_upsert(c) for c in contributions]) + try: + return await self._contributions.upsert_contribution_by_identifiers(contrib.identifiers(), contrib) + except Exception as exc: + logger.error("upsert_contribution_failed", index=index, identifier=contrib.identifiers()) + return bulk_failure_from_exception(index, contrib.identifiers(), exc) + + results = await asyncio.gather(*[_bounded_upsert(i, c) for i, c in enumerate(contributions)]) + succeeded = [r for r in results if not isinstance(r, BulkFailure)] + failed = [r for r in results if isinstance(r, BulkFailure)] + return BulkWriteSummary[Contribution](total=len(contributions), succeeded=succeeded, failed=failed) async def delete_contributions(self, filter: ContributionFilter) -> BulkDeleteSummary: """Delete a contribution and all of its child components From 06bae18190471771666b39ee698c2dcd7c19549e Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 18 Jun 2026 15:40:43 -0700 Subject: [PATCH 393/591] Improved sensitivity of dict key validation --- .../domains/contributions/models.py | 31 +++++++++++++------ 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py index 8c1a7f45b8..8bfe04c619 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py @@ -51,18 +51,29 @@ def _validate_data_depth(data: dict[str, Any] | None) -> dict[str, Any] | None: def _validate_keys(data: dict[str, Any] | None) -> dict[str, Any] | None: if data is None: return None - if not all(isinstance(k, str) and k.isascii() for k in data.keys()): + keys = list(data.keys()) + if not all(isinstance(k, str) and k.isascii() for k in keys): raise ValidationError("Non-ASCII key found in Contribution.data. All dict keys must be only ASCII") - if any(_DATA_PUNCTUATION_PATTERN.fullmatch(k) is None for k in data.keys()): + if any(k == "" for k in keys): + raise ValidationError("Empty key found in Contribution.data. Keys must be non-empty.") + if any(_DATA_PUNCTUATION_PATTERN.fullmatch(k) is None for k in keys): raise ValidationError( "Punctuation found in Contribution.data keys. Only '_', '*', '/', and at most 1 '|' permitted." ) + # Recurse into nested dicts, including dicts nested inside lists. for v in data.values(): - if isinstance(v, dict): - _validate_keys(v) + _validate_nested_keys(v) return data +def _validate_nested_keys(value: Any) -> None: + if isinstance(value, dict): + _validate_keys(value) + elif isinstance(value, list): + for item in value: + _validate_nested_keys(item) + + class ContributionBase(BaseDocumentWithInput[PydanticObjectId]): project: str identifier: str @@ -103,9 +114,11 @@ class Contribution(ContributionBase): @classmethod def from_input_model(cls, data: ContributionIn) -> Contribution: + # Server-owned fields are not taken from input: is_public starts False, components are + # inserted separately, and last_modified is stamped by the before_event hook. return cls.model_validate( { - **data.model_dump(exclude={"is_public", "structures", "tables", "attachments"}), + **data.model_dump(exclude={"is_public", "structures", "tables", "attachments", "last_modified"}), "is_public": False, } ) @@ -140,11 +153,9 @@ class ContributionOut(DocumentOut[PydanticObjectId]): is_public: bool | None = None last_modified: datetime | None = None needs_build: bool | None = None - data: Annotated[ - dict[str, Any] | None, - BeforeValidator(_validate_data_depth), - BeforeValidator(_validate_keys), - ] = None + # No input validators on the read path: stored documents are trusted, and re-validating here + # would 500 on historical data that missed the correction (see carrier_transport contribs) + data: dict[str, Any] | None = None structures: list[Link[Structure]] | None = None tables: list[Link[Table]] | None = None attachments: list[Link[Attachment]] | None = None From 0e6031cbe8a830af46875af4dd26e3348ebcc025 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 18 Jun 2026 16:00:23 -0700 Subject: [PATCH 394/591] Simplified md5 check and improved patch_component_by_id --- .../domains/_shared/components.py | 80 +++++++++++-------- 1 file changed, 48 insertions(+), 32 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py index 499a334149..1af1edb05e 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py @@ -1,6 +1,5 @@ from typing import Any -from beanie import PydanticObjectId from beanie.operators import In from fastapi_filter.contrib.beanie import Filter from pydantic import BaseModel @@ -8,14 +7,15 @@ from mpcontribs_api.authz import User from mpcontribs_api.config import get_settings -from mpcontribs_api.domains._shared.models import Component, DeleteResponse, DocumentOut +from mpcontribs_api.domains._shared.models import Component, ComponentIn, DeleteResponse, DocumentOut from mpcontribs_api.domains._shared.repository import MongoDbRepository from mpcontribs_api.domains._shared.types import MD5Hash +from mpcontribs_api.exceptions import NotFoundError class MongoDbComponentsRepository[ TDoc: Component, - TIn: Component, + TIn: ComponentIn, TOut: DocumentOut, TFilter: Filter, TPatch: BaseModel, @@ -24,48 +24,50 @@ class MongoDbComponentsRepository[ def _build_scope(user: User) -> dict[str, Any]: return {} - async def _check_existing( + async def _existing_by_md5( self, - components: list[TIn] | TIn, + md5s: list[MD5Hash], session: AsyncClientSession | None = None, - ) -> tuple[dict[MD5Hash, TIn], dict[str, TDoc]]: - if not isinstance(components, list): - components = [components] - by_md5 = {comp.md5: comp for comp in components} - + ) -> dict[str, TDoc]: # Full fetch so existing docs come back with their ids # TODO: Most likely does a COLLSCAN - see if we can project to get a COVERED QUERY existing_docs = await self.document_model.find( - In(self.document_model.md5, list(by_md5.keys())), + In(self.document_model.md5, md5s), session=session, ).to_list() - return (by_md5, {doc.md5: doc for doc in existing_docs}) + return {doc.md5: doc for doc in existing_docs} async def insert_components( self, components: list[TIn], session: AsyncClientSession | None = None, ) -> list[TDoc]: - """Bulk-insert components, chunked to fit within a transaction's payload budget. + """Bulk-insert components, deduplicated by server-computed content hash. + + Each input is built into a full document via ``Component.from_input``, which assigns a fresh + id and computes ``md5`` from the content (the client never supplies it). Inputs are + deduplicated by md5 — both against documents already stored and against each other — so the + return list has one entry per *unique* content, in first-seen order. Args: components (list[TIn]): components to insert session (AsyncClientSession): optional client session; pass when inserting inside a transaction """ - by_md5, existing_by_md5 = await self._check_existing(components=components, session=session) - # Assign ids manually: insert_many won't populate id back onto these - # objects, and get_dict drops id when it's None. - new_docs: list[TDoc] = [] - for md5, comp in by_md5.items(): - if md5 in existing_by_md5: - continue - doc = self.document_model.model_validate(comp.model_dump()) - doc.id = PydanticObjectId() - new_docs.append(doc) - - # TODO: Might want to delegate this logic to a higher level - # - This method might want to simply insert everything it's given - # Insert by chunks + # Build full docs up front so md5 is server-computed before any dedup decision. + docs = [self.document_model.from_input(comp) for comp in components] + existing_by_md5 = await self._existing_by_md5([doc.md5 for doc in docs], session=session) + + # First-seen unique md5 order, and the new documents that need inserting. + unique_md5s: list[str] = [] + new_by_md5: dict[str, TDoc] = {} + for doc in docs: + if doc.md5 not in existing_by_md5 and doc.md5 not in new_by_md5: + new_by_md5[doc.md5] = doc + if doc.md5 not in unique_md5s: + unique_md5s.append(doc.md5) + + # Insert by chunks to stay within a transaction's payload budget. + new_docs = list(new_by_md5.values()) chunk_size = get_settings().mongo.component_insert_chunk_size for start in range(0, len(new_docs), chunk_size): await self.document_model.insert_many( @@ -74,9 +76,9 @@ async def insert_components( session=session, ) - # Return a list of documents reflecting what was stored/found - resolved = existing_by_md5 | {doc.md5: doc for doc in new_docs} - return [resolved[md5] for md5 in by_md5] + # One resolved document per unique md5, in first-seen order. + resolved = existing_by_md5 | new_by_md5 + return [resolved[md5] for md5 in unique_md5s] async def insert_component(self, component: TIn, *, session: AsyncClientSession | None = None) -> TDoc: """Insert a single component. @@ -131,5 +133,19 @@ async def delete_component_by_id( return await self.delete_by_id(id=self._convert_object_id(id), session=session) async def patch_component_by_id(self, id: str, update: TPatch) -> TDoc: - """Partially update a component by id, scoped to the current user. See ``patch``.""" - return await self.patch(self._convert_object_id(id), update) + """Partially update a component by id, recomputing its content hash. + + Components are content-addressed, so a content change must update ``md5``. Unlike the base + ``patch`` (an in-place ``$set``), this loads the full document, applies the set fields, + recomputes ``md5`` from ``hash_fields``, and saves — keeping md5 consistent with content. + """ + oid = self._convert_object_id(id) + doc = await self.document_model.find_one(self._scope, self.document_model.id == oid) + if doc is None: + raise NotFoundError(self._not_found(id)) + update_data = update.model_dump(exclude_unset=True) + for field, value in update_data.items(): + setattr(doc, field, value) + doc.md5 = doc.compute_md5() + await doc.save() + return doc From 88cb4751b370c01ae3ccb9f9bb414154a383b73b Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 18 Jun 2026 16:01:34 -0700 Subject: [PATCH 395/591] Added a constant for how to handle encoding of polars.DataFrames to have consistent (re)serialization --- mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py index 9f7c2ef72f..bfaf0e4a1f 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py @@ -91,6 +91,13 @@ def _serialize_frame(data: pl.DataFrame) -> dict: return data.to_dict(as_series=False) +# Beanie/pymongo would otherwise BSON-encode a pl.DataFrame by iterating it into bare column +# lists, dropping the column names and the dict shape the Pydantic serializer produces — which +# `_coerce_frame` cannot read back. Registering this on a Document's Settings.bson_encoders makes +# the stored form match the serialized form, so frames round-trip losslessly. +FRAME_BSON_ENCODERS = {pl.DataFrame: _serialize_frame} + + PolarsFrame = Annotated[ pl.DataFrame, BeforeValidator(_coerce_frame), From eec7198fad62dabd53a1de965485f3f3f747bc63 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 18 Jun 2026 16:02:27 -0700 Subject: [PATCH 396/591] Improved dataframe handling to read and write dataframes --- .../mpcontribs_api/domains/tables/models.py | 167 +++++++++++------- 1 file changed, 100 insertions(+), 67 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py index 6ea93ed2be..b18e8443e3 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py @@ -1,4 +1,5 @@ -from typing import Any +from collections.abc import Mapping +from typing import Any, Self import polars as pl from beanie import PydanticObjectId @@ -10,9 +11,8 @@ model_validator, ) -from mpcontribs_api.domains._shared.models import Component, DocumentOut +from mpcontribs_api.domains._shared.models import Component, ComponentIn, DocumentOut from mpcontribs_api.domains._shared.types import MD5Hash, PolarsFrame -from mpcontribs_api.exceptions import ValidationError from mpcontribs_api.projection import SparseFieldsModel @@ -27,70 +27,76 @@ class Attributes(BaseModel): labels: Labels -class Table(Component): - model_config = ConfigDict(arbitrary_types_allowed=True) - hash_fields = frozenset({"index", "columns", "data"}) - - attrs: Attributes - total_data_rows: int - data: PolarsFrame +def frame_to_storage(frame: pl.DataFrame) -> tuple[list[str], list[str], list[list[str]]]: + """Split a DataFrame into (index, columns, data) for storage. - class Settings: - name = "tables" + The first column is the index; the rest are the data columns. Every value is stringified. + """ + if not frame.columns: + return [], [], [] + index_col, *data_cols = frame.columns + index = [str(v) for v in frame[index_col].to_list()] + data = [[str(v) for v in row] for row in frame.select(data_cols).iter_rows()] + return index, list(data_cols), data -class TableIn(Table): - @model_validator(mode="after") - def data_dimensions(self): - if len(self.data) != self.total_data_rows: - raise ValidationError( - f"`total_data_rows` ({self.total_data_rows}) does not match number of rows in `data` ({len(self.data)})" - ) - return self +def storage_to_frame(index_label: str, index: list[str], columns: list[str], data: list[list[str]]) -> pl.DataFrame: + """Rebuild the DataFrame from stored (index, columns, data), all columns typed as strings.""" + schema = {name: pl.Utf8 for name in [index_label, *columns]} + rows = [[idx, *row] for idx, row in zip(index, data, strict=True)] + return pl.DataFrame(rows, schema=schema, orient="row") - @staticmethod - def _check_column_collision(columns: list[str], index_name: str) -> None: - if index_name in columns: - raise ValidationError(f"column name collision: {index_name!r} already in columns") - @staticmethod - def _check_index_data_lengths(index: list, data: list[list]) -> None: - if len(index) != len(data): - raise ValidationError(f"length mismatch between `index` ({len(index)}) and `data` ({len(data)})") +def _index_label(attrs: Any) -> str: + """The DataFrame's index-column name comes from ``attrs.labels.index`` (dict or model).""" + if attrs is None: + return "index" + if isinstance(attrs, Mapping): + return attrs.get("labels", {}).get("index", "index") + return getattr(getattr(attrs, "labels", None), "index", "index") - @staticmethod - def _check_declared_row_count(declared: int, data: list[list]) -> None: - if declared != len(data): - raise ValidationError( - f"`total_data_rows` ({declared}) does not match length of `data` ({len(data)}) in source document" - ) - @classmethod - def _validate_input(cls, doc, index_name: str) -> None: - cls._check_column_collision(doc["columns"], index_name) - cls._check_index_data_lengths(doc["index"], doc["data"]) - cls._check_declared_row_count(doc["total_data_rows"], doc["data"]) +class Table(Component): + """Stored table document — matches the existing MongoDB shape (index/columns/data as strings).""" - @classmethod - def from_input(cls, doc, index_name: str = "index"): - cls._validate_input(doc, index_name) + hash_fields = frozenset({"attrs", "index", "columns", "data"}) - columns = [index_name, *doc["columns"]] + attrs: Attributes + index: list[str] + columns: list[str] + data: list[list[str]] + total_data_rows: int - # Strict=false since we explicitly handle our own errors - rows = [[idx, *row] for idx, row in zip(doc["index"], doc["data"], strict=False)] - df = pl.DataFrame(rows, schema=columns, orient="row") + class Settings: + name = "tables" + @classmethod + def from_input(cls, input: TableIn) -> Self: # pyright: ignore[reportIncompatibleMethodOverride] + # The input frame's first column is the index; the rest are the data columns. total_data_rows + # is derived from the data, so it is always consistent by construction. + index, columns, data = frame_to_storage(input.data) return cls( - _id=doc["id"], - name=doc["name"], - md5=doc["md5"], - attrs=doc["attrs"], - data=df, - total_data_rows=doc["total_data_rows"], + _id=PydanticObjectId(), + name=input.name, + attrs=input.attrs, + index=index, + columns=columns, + data=data, + total_data_rows=len(data), ) +class TableIn(ComponentIn): + """User-supplied table content as a DataFrame (first column = index). + + ``_id`` and ``md5`` are server-assigned, so absent here. + """ + + model_config = ConfigDict(arbitrary_types_allowed=True) + attrs: Attributes + data: PolarsFrame + + class TableFilter(Filter): id: PydanticObjectId | None = None id__in: list[PydanticObjectId] | None = None @@ -123,38 +129,65 @@ def id_to_str(self, v: PydanticObjectId | list[PydanticObjectId] | None) -> str return str(v) -class TableSummaryOut(BaseModel): - """Metadata-only table as embedded in contribution responses (no data).""" - - attrs: Attributes - columns: list[str] - total_data_rows: int - total_data_pages: int = 1 - - class TableOut(DocumentOut[PydanticObjectId]): - model_config = ConfigDict(arbitrary_types_allowed=True) + # extra="allow" so that when ``data`` is requested the full document (including the stored + # ``index``/``columns``) is fetched — Beanie derives the Mongo projection from a plain model's + # fields, and the frame can only be rebuilt from all three. ``_assemble_frame`` drops the raw + # storage keys so they never surface on the response. + model_config = ConfigDict(arbitrary_types_allowed=True, extra="allow") name: str | None = None md5: MD5Hash | None = None attrs: Attributes | None = None - columns: list[Any] | None = None total_data_rows: int | None = None - total_data_pages: int | None = None - index: list[Any] | None = None data: PolarsFrame | None = None + @model_validator(mode="before") + @classmethod + def _assemble_frame(cls, value: Any) -> Any: + """Rebuild ``data`` as a DataFrame from the stored ``index``/``columns``/``data`` triple. + + Accepts either a Mongo dict (read path) or a ``Table``-like object (download path, + ``from_attributes``). When the storage triple is absent (e.g. a light projection without + ``data``, or a TableOut built directly with a frame) the input passes through unchanged. + """ + getter = value.get if isinstance(value, Mapping) else lambda key: getattr(value, key, None) + index, columns, raw = getter("index"), getter("columns"), getter("data") + if index is None or columns is None or not isinstance(raw, list): + return value + + attrs = getter("attrs") + index_label = _index_label(attrs) + normalized: dict[str, Any] = { + "_id": getter("id") if isinstance(value, Mapping) and "id" in value else getter("_id") or getter("id"), + "name": getter("name"), + "md5": getter("md5"), + "attrs": attrs, + "total_data_rows": getter("total_data_rows"), + "data": storage_to_frame(index_label, index, columns, raw), + } + return {key: val for key, val in normalized.items() if val is not None} + @staticmethod def default_fields() -> list[str]: + # Light default; the tabular payload (data) is fetched via ?_fields=. return [ "id", "name", "md5", "attrs", - "columns", "total_data_rows", - "total_data_pages", ] + @classmethod + def projection(cls, fields): + # Light reads use the normal partial-projection (no data/index/columns fetched). When the + # frame is requested, fall back to the full model so index+columns+data come back together + # and ``_assemble_frame`` can rebuild it. + if fields is not None and "data" not in fields: + return super().projection(fields) + return cls + class TablePatch(SparseFieldsModel): name: str | None = None + attrs: Attributes | None = None From cdc7ad362960e540bb90c547ef702281a9178087 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 18 Jun 2026 16:04:12 -0700 Subject: [PATCH 397/591] Made ComponentIn to clarify and unify input schema from storage schema --- .../mpcontribs_api/domains/_shared/models.py | 43 ++++++++++++++++++- .../mpcontribs_api/domains/_shared/service.py | 4 +- .../domains/attachments/models.py | 35 ++++++++++----- .../domains/structures/models.py | 24 ++++++++--- 4 files changed, 87 insertions(+), 19 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py index 2099f70d90..2dfb073c66 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py @@ -5,7 +5,7 @@ from typing import Annotated, Any, ClassVar, Self from beanie import Document, PydanticObjectId -from pydantic import BaseModel, Field +from pydantic import BaseModel, Field, model_validator from pymongo.results import DeleteResult from mpcontribs_api import pagination @@ -76,12 +76,51 @@ def canonical_md5(payload: Mapping[str, Any]) -> str: return hashlib.md5(normalized.encode("utf-8")).hexdigest() +class ComponentIn(BaseModel): + """Base for component input payloads. + + Components are content-addressed: the server computes ``md5`` from the content and assigns the + ``_id`` on insert, so neither is part of the input contract. Subclasses add the required content + fields for their resource. + """ + + name: str + + class Component(BaseDocumentWithInput[PydanticObjectId]): + """Stored component document. + + ``md5`` is server-authoritative: it is (re)computed from ``hash_fields`` whenever a full document + is validated — on insert, on update, and on full-document reads — so a client-supplied value can + never define a component's content identity. + """ + name: str - md5: MD5Hash + # Server-computed; the placeholder default is overwritten by ``_recompute_md5`` on validation. + md5: MD5Hash = Field(default="0" * 32) hash_fields: ClassVar[frozenset[str]] + # The md5 functions look redundant but aren't, we should keep both + # Used in patching to compute the hash after an update - should not return self def compute_md5(self) -> str: payload = self.model_dump(mode="json", include=set(self.hash_fields), by_alias=False) return canonical_md5(payload) + + # Used on validation - must return self + @model_validator(mode="after") + def _recompute_md5(self) -> Self: + self.md5 = self.compute_md5() + return self + + @classmethod + def from_input(cls, input: ComponentIn) -> Self: + """Build a stored document from an input payload, assigning a fresh id (md5 is computed). + + The default maps every input field onto the document one-to-one. Subclasses whose document + carries fields that are absent from the input or derived from it should override this - see + ``Table.from_input``, which computes ``total_data_rows`` from the data frame. + """ + payload = input.model_dump() + payload["_id"] = PydanticObjectId() + return cls.model_validate(payload) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/service.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/service.py index 1b17a18d86..d3ce92337e 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/service.py @@ -7,7 +7,7 @@ from types_aiobotocore_s3 import S3Client from mpcontribs_api.domains._shared.components import MongoDbComponentsRepository -from mpcontribs_api.domains._shared.models import Component, ComponentDeleteResponse, DocumentOut +from mpcontribs_api.domains._shared.models import Component, ComponentDeleteResponse, ComponentIn, DocumentOut from mpcontribs_api.domains._shared.types import DownloadFormat, ShortMimeFormat from mpcontribs_api.domains.contributions.repository import MongoDbContributionRepository from mpcontribs_api.exceptions import NotFoundError @@ -16,7 +16,7 @@ class ComponentService[ TDoc: Component, - TIn: Component, + TIn: ComponentIn, TOut: DocumentOut, TFilter: Filter, TPatch: BaseModel, diff --git a/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py b/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py index 3f949dfe74..7f5863706d 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py @@ -2,7 +2,7 @@ from fastapi_filter.contrib.beanie import Filter from pydantic import field_validator -from mpcontribs_api.domains._shared.models import Component, DocumentOut +from mpcontribs_api.domains._shared.models import Component, ComponentIn, DocumentOut from mpcontribs_api.domains._shared.types import FileLike, MD5Hash, MimeFormat from mpcontribs_api.exceptions import ValidationError from mpcontribs_api.projection import SparseFieldsModel @@ -10,6 +10,16 @@ ACCEPTED_FORMATS = ["jpg", "jpeg", "png", "csv", "parquet", "gz"] +def _validate_attachment_name(v: str) -> str: + parts = v.strip().split(".") + if parts[-1].lower() not in ACCEPTED_FORMATS: + raise ValidationError( + f"Attachment extension not in allowed formats: {ACCEPTED_FORMATS}", + found_extension=parts[-1], + ) + return v + + class Attachment(Component): hash_fields = frozenset({"mime", "content"}) mime: MimeFormat @@ -21,32 +31,37 @@ class Settings: @field_validator("name", mode="before") @classmethod def _name_with_extension(cls, v: str) -> str: - parts = v.strip().split(".") - if parts[-1].lower() not in ACCEPTED_FORMATS: - raise ValidationError( - f"Attachment extension not in allowed formats: {ACCEPTED_FORMATS}", - found_extension=parts[-1], - ) - return v + return _validate_attachment_name(v) + +class AttachmentIn(ComponentIn): + """User-supplied attachment content. ``_id`` and ``md5`` are server-assigned, so absent here.""" -class AttachmentIn(Attachment): - pass + mime: MimeFormat + content: int + + @field_validator("name", mode="before") + @classmethod + def _name_with_extension(cls, v: str) -> str: + return _validate_attachment_name(v) class AttachmentOut(DocumentOut[PydanticObjectId]): name: FileLike | None = None md5: MD5Hash | None = None mime: MimeFormat | None = None + content: int | None = None @staticmethod def default_fields() -> list[str]: + # Light default; content fetched via ?_fields=. return ["id", "name", "md5", "mime"] class AttachmentPatch(SparseFieldsModel): name: FileLike | None = None mime: MimeFormat | None = None + content: int | None = None class AttachmentFilter(Filter): diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py index b462d70aea..4fa5b53696 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py @@ -3,8 +3,8 @@ from pydantic import BaseModel, ConfigDict from pymatgen.core import Element -from mpcontribs_api.domains._shared.models import Component, DocumentOut -from mpcontribs_api.domains._shared.types import MD5Hash, PolarsFrame +from mpcontribs_api.domains._shared.models import Component, ComponentIn, DocumentOut +from mpcontribs_api.domains._shared.types import FRAME_BSON_ENCODERS, MD5Hash, PolarsFrame from mpcontribs_api.projection import SparseFieldsModel @@ -55,18 +55,30 @@ class Structure(Component): class Settings: name = "structures" + bson_encoders = FRAME_BSON_ENCODERS -class StructureIn(Structure): - pass +class StructureIn(ComponentIn): + """User-supplied structure content. ``_id`` and ``md5`` are server-assigned, so absent here.""" + + lattice: Lattice + sites: list[Site] + charge: float | None = None + cif: str class StructureOut(DocumentOut[PydanticObjectId]): + model_config = ConfigDict(arbitrary_types_allowed=True) name: str | None = None md5: MD5Hash | None = None + lattice: Lattice | None = None + sites: list[Site] | None = None + charge: float | None = None + cif: str | None = None @staticmethod def default_fields() -> list[str]: + # Light default; content (lattice/sites/charge/cif) is fetched via ?_fields=. return [ "id", "name", @@ -77,7 +89,9 @@ def default_fields() -> list[str]: class StructurePatch(SparseFieldsModel): name: str | None = None lattice: Lattice | None = None - sites: Site | None = None + sites: list[Site] | None = None + charge: float | None = None + cif: str | None = None class StructureFilter(Filter): From 27212861f55e44bb559a934e6cff457d6bb81b11 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 18 Jun 2026 16:04:41 -0700 Subject: [PATCH 398/591] Modified tests to account for new handling --- .../db/test_component_reachability.py | 29 +-- .../db/test_components_repository.py | 110 +++++++--- .../integration/test_component_routes.py | 9 + .../integration/test_contributions_routes.py | 8 +- .../unit/domains/test_attachments_models.py | 32 ++- .../unit/domains/test_contribution_service.py | 40 +++- .../tests/unit/domains/test_shared_models.py | 17 +- .../unit/domains/test_structures_models.py | 48 +++-- .../tests/unit/domains/test_tables_models.py | 192 +++++++++--------- 9 files changed, 295 insertions(+), 190 deletions(-) diff --git a/mpcontribs-api/tests/integration/db/test_component_reachability.py b/mpcontribs-api/tests/integration/db/test_component_reachability.py index d5175b68e5..0f7faf0885 100644 --- a/mpcontribs-api/tests/integration/db/test_component_reachability.py +++ b/mpcontribs-api/tests/integration/db/test_component_reachability.py @@ -29,17 +29,18 @@ def _service(user: User) -> ComponentService: ) -async def _attachment(md5: str) -> Attachment: - doc = Attachment(_id=PydanticObjectId(), name="d.csv", md5=md5, mime="application/gzip", content=1) +async def _attachment(content: int) -> Attachment: + # md5 is server-computed from (mime, content); distinct content -> distinct md5/dedup. + doc = Attachment(_id=PydanticObjectId(), name="d.csv", mime="application/gzip", content=content) await doc.insert() return doc -async def _contribution(*, is_public: bool, attachments: list[Attachment]) -> Contribution: +async def _contribution(identifier: str, *, is_public: bool, attachments: list[Attachment]) -> Contribution: doc = Contribution( _id=PydanticObjectId(), project="reach-proj", - identifier=f"mp-{md5[:6]}" if (md5 := attachments[0].md5) else "mp-x", + identifier=identifier, formula="Fe2O3", data={"x": 1}, is_public=is_public, @@ -51,31 +52,31 @@ async def _contribution(*, is_public: bool, attachments: list[Attachment]) -> Co class TestComponentReadReachability: async def test_get_by_id_returns_reachable_component(self, db): - att = await _attachment("a" * 32) - await _contribution(is_public=True, attachments=[att]) + att = await _attachment(1) + await _contribution("mp-pub", is_public=True, attachments=[att]) result = await _service(ANON).get_by_id(str(att.id), fields=None) assert result is not None assert result.id == att.id async def test_get_by_id_hides_unreachable_component(self, db): - att = await _attachment("b" * 32) + att = await _attachment(2) # Referenced only by a private contribution -> anonymous cannot reach it. - await _contribution(is_public=False, attachments=[att]) + await _contribution("mp-priv", is_public=False, attachments=[att]) result = await _service(ANON).get_by_id(str(att.id), fields=None) assert result is None async def test_get_by_id_hides_orphan_component(self, db): # No contribution references this attachment at all. - att = await _attachment("c" * 32) + att = await _attachment(3) result = await _service(ANON).get_by_id(str(att.id), fields=None) assert result is None async def test_get_many_only_lists_reachable(self, db): - pub = await _attachment("d" * 32) - priv = await _attachment("e" * 32) - orphan = await _attachment("f" * 32) - await _contribution(is_public=True, attachments=[pub]) - await _contribution(is_public=False, attachments=[priv]) + pub = await _attachment(10) + priv = await _attachment(20) + orphan = await _attachment(30) + await _contribution("mp-a", is_public=True, attachments=[pub]) + await _contribution("mp-b", is_public=False, attachments=[priv]) page = await _service(ANON).get_many(filter=AttachmentFilter(), pagination=CursorParams(), fields=None) ids = {item.id for item in page.items} diff --git a/mpcontribs-api/tests/integration/db/test_components_repository.py b/mpcontribs-api/tests/integration/db/test_components_repository.py index 5639553c9d..8a3845aaf5 100644 --- a/mpcontribs-api/tests/integration/db/test_components_repository.py +++ b/mpcontribs-api/tests/integration/db/test_components_repository.py @@ -29,14 +29,9 @@ def _repo() -> MongoDbAttachmentRepository: return MongoDbAttachmentRepository(USER) -def _attachment(md5: str, name: str = "data.csv", content: int = 1) -> AttachmentIn: - return AttachmentIn( - _id=PydanticObjectId(), - name=name, - md5=md5, - mime="application/gzip", - content=content, - ) +def _attachment(content: int = 1, name: str = "data.csv") -> AttachmentIn: + # md5 is server-computed from (mime, content), so `content` drives dedup identity. + return AttachmentIn(name=name, mime="application/gzip", content=content) async def _count() -> int: @@ -49,28 +44,28 @@ async def _count() -> int: class TestInsertComponentsDedupe: - async def test_duplicate_md5_in_batch_inserted_once(self, db): - # Two inputs share an md5; only one document should be written. - await _repo().insert_components([_attachment("a" * 32), _attachment("a" * 32), _attachment("b" * 32)]) + async def test_duplicate_content_in_batch_inserted_once(self, db): + # Two inputs share content (-> same md5); only one document should be written. + await _repo().insert_components([_attachment(1), _attachment(1), _attachment(2)]) assert await _count() == 2 async def test_returns_one_doc_per_unique_md5(self, db): - result = await _repo().insert_components([_attachment("a" * 32), _attachment("a" * 32)]) + result = await _repo().insert_components([_attachment(1), _attachment(1)]) assert len(result) == 1 async def test_existing_md5_not_reinserted(self, db): - await _repo().insert_components([_attachment("a" * 32)]) - # Re-submit the existing md5 alongside a new one. - await _repo().insert_components([_attachment("a" * 32), _attachment("b" * 32)]) + await _repo().insert_components([_attachment(1)]) + # Re-submit the existing content alongside new content. + await _repo().insert_components([_attachment(1), _attachment(2)]) assert await _count() == 2 async def test_existing_doc_returned_with_original_id(self, db): - first = await _repo().insert_components([_attachment("a" * 32)]) - again = await _repo().insert_components([_attachment("a" * 32)]) + first = await _repo().insert_components([_attachment(1)]) + again = await _repo().insert_components([_attachment(1)]) assert again[0].id == first[0].id async def test_inserted_docs_have_ids(self, db): - result = await _repo().insert_components([_attachment("a" * 32), _attachment("b" * 32)]) + result = await _repo().insert_components([_attachment(1), _attachment(2)]) assert all(doc.id is not None for doc in result) @@ -83,8 +78,8 @@ class TestInsertComponentsChunking: async def test_all_docs_persisted_across_multiple_chunks(self, db, monkeypatch): # Force a chunk size smaller than the batch so the chunking loop runs >1 time. monkeypatch.setattr(get_settings().mongo, "component_insert_chunk_size", 2) - # md5 must be 32-char hex; build distinct values explicitly. - attachments = [_attachment(format(i, "032x")) for i in range(5)] + # Distinct content -> distinct md5 so all five survive dedup. + attachments = [_attachment(i) for i in range(5)] result = await _repo().insert_components(attachments) assert len(result) == 5 assert await _count() == 5 @@ -97,10 +92,11 @@ async def test_all_docs_persisted_across_multiple_chunks(self, db, monkeypatch): class TestInsertComponent: async def test_single_insert_persists(self, db): - doc = await _repo().insert_component(_attachment("c" * 32)) + doc = await _repo().insert_component(_attachment(3)) found = await Attachment.find_one(Attachment.id == doc.id) assert found is not None - assert found.md5 == "c" * 32 + assert found.md5 == doc.md5 + assert len(found.md5) == 32 # --------------------------------------------------------------------------- @@ -110,15 +106,15 @@ async def test_single_insert_persists(self, db): class TestDeleteComponents: async def test_filtered_delete_removes_only_matches(self, db): - await _repo().insert_components([_attachment("a" * 32), _attachment("b" * 32)]) - result = await _repo().delete_components(AttachmentFilter(md5="a" * 32)) + keep, drop = await _repo().insert_components([_attachment(1), _attachment(2)]) + result = await _repo().delete_components(AttachmentFilter(md5=drop.md5)) assert result.num_deleted == 1 remaining = {doc.md5 async for doc in Attachment.find_all()} - assert remaining == {"b" * 32} + assert remaining == {keep.md5} async def test_delete_by_id_removes_one(self, db): """delete_component_by_id matches a string id by converting it to ObjectId.""" - [doc] = await _repo().insert_components([_attachment("a" * 32)]) + [doc] = await _repo().insert_components([_attachment(1)]) result = await _repo().delete_component_by_id(str(doc.id)) assert result.num_deleted == 1 assert await _count() == 0 @@ -137,15 +133,26 @@ async def test_delete_by_unknown_id_raises(self, db): class TestPatchComponent: async def test_patch_updates_field(self, db): - [doc] = await _repo().insert_components([_attachment("a" * 32, name="data.csv")]) + [doc] = await _repo().insert_components([_attachment(1, name="data.csv")]) updated = await _repo().patch_component_by_id(str(doc.id), AttachmentPatch(name="renamed.png")) assert updated.name == "renamed.png" async def test_empty_patch_returns_existing(self, db): - [doc] = await _repo().insert_components([_attachment("a" * 32, name="data.csv")]) + [doc] = await _repo().insert_components([_attachment(1, name="data.csv")]) updated = await _repo().patch_component_by_id(str(doc.id), AttachmentPatch()) assert updated.id == doc.id + async def test_patch_content_recomputes_md5(self, db): + # name is not a hash field, so renaming must NOT change md5. + [doc] = await _repo().insert_components([_attachment(1)]) + renamed = await _repo().patch_component_by_id(str(doc.id), AttachmentPatch(name="renamed.png")) + assert renamed.md5 == doc.md5 + # content IS a hash field, so changing it must recompute md5. + rehashed = await _repo().patch_component_by_id(str(doc.id), AttachmentPatch(content=999)) + assert rehashed.md5 != doc.md5 + persisted = await Attachment.find_one(Attachment.id == doc.id) + assert persisted.md5 == rehashed.md5 + # --------------------------------------------------------------------------- # Component download round-trip @@ -155,7 +162,7 @@ async def test_empty_patch_returns_existing(self, db): class TestComponentDownload: async def test_jsonl_download_round_trips(self, db): """Component downloads stream a decompressable gzip of all rows.""" - await _repo().insert_components([_attachment("a" * 32), _attachment("b" * 32)]) + await _repo().insert_components([_attachment(1), _attachment(2)]) stream = _repo().download( format=DownloadFormat.JSONL, short_mime=ShortMimeFormat.GZ, @@ -169,3 +176,48 @@ async def test_jsonl_download_round_trips(self, db): chunks = [c async for c in stream] decompressed = gzip.decompress(b"".join(chunks)) assert decompressed.count(b"\n") == 2 + + +# --------------------------------------------------------------------------- +# Table DataFrame <-> stored (index/columns/data) round-trips through Mongo +# --------------------------------------------------------------------------- + + +class TestTableFrameRoundTrip: + async def test_table_frame_round_trips_via_storage_shape(self, db): + import polars as pl + + from mpcontribs_api.authz import User + from mpcontribs_api.domains.tables.models import TableIn, TableOut + from mpcontribs_api.domains.tables.repository import MongoDbTableRepository + + repo = MongoDbTableRepository(User(username="x", groups=frozenset())) + # First column is the index (named "T [K]"); cells stay as the original formatted strings. + frame = pl.DataFrame( + { + "T [K]": ["100.0", "200.0"], + "1e16": ["2.2718689×10²¹", "2.2745466×10²¹"], + "1e17": ["2.2718684×10²¹", "2.2745438×10²¹"], + } + ) + tin = TableIn( + name="σ(p)", + attrs={"title": "g", "labels": {"index": "T [K]", "value": "σ", "variable": "doping"}}, + data=frame, + ) + [doc] = await repo.insert_components([tin]) + + # Stored in the canonical MongoDB shape: index/columns/data as strings. + raw = await db["tables"].find_one({"_id": doc.id}) + assert raw["index"] == ["100.0", "200.0"] + assert raw["columns"] == ["1e16", "1e17"] + assert raw["data"] == [["2.2718689×10²¹", "2.2718684×10²¹"], ["2.2745466×10²¹", "2.2745438×10²¹"]] + assert raw["total_data_rows"] == 2 + + # Read back: reassembled into the same DataFrame (index folded back as the first column). + out = await repo.get_component_by_id(str(doc.id), TableOut.parse_fields(["data"])) + assert out.data.columns == ["T [K]", "1e16", "1e17"] + assert out.data.equals(frame) + # The raw storage keys must not leak onto the response model. + assert "index" not in out.model_dump() + await db["tables"].delete_many({"_id": doc.id}) diff --git a/mpcontribs-api/tests/integration/test_component_routes.py b/mpcontribs-api/tests/integration/test_component_routes.py index 9bdc7ceb98..c1b49cd8ba 100644 --- a/mpcontribs-api/tests/integration/test_component_routes.py +++ b/mpcontribs-api/tests/integration/test_component_routes.py @@ -89,6 +89,15 @@ def test_valid_fields_forwarded(self, client, structure_service): # parse_fields always includes the id identity field. assert structure_service.get_many.call_args.kwargs["fields"] == frozenset({"id", "name"}) + def test_content_fields_are_selectable(self, client, structure_service): + # Regression for #4: structure content must be reachable via _fields (on the Out model). + structure_service.get_many.return_value = Page(items=[], next_cursor=None) + r = client.get("/api/v1/structures?_fields=lattice&_fields=sites&_fields=charge&_fields=cif") + assert r.status_code == 200 + assert structure_service.get_many.call_args.kwargs["fields"] == frozenset( + {"id", "lattice", "sites", "charge", "cif"} + ) + class TestStructuresDelete: def test_batch_delete_returns_200(self, client, structure_service): diff --git a/mpcontribs-api/tests/integration/test_contributions_routes.py b/mpcontribs-api/tests/integration/test_contributions_routes.py index 06fc77c509..36adad5984 100644 --- a/mpcontribs-api/tests/integration/test_contributions_routes.py +++ b/mpcontribs-api/tests/integration/test_contributions_routes.py @@ -108,11 +108,13 @@ def test_non_list_body_returns_422(self, client, contribution_service): class TestUpsertContributions: def test_empty_list_returns_200(self, client, contribution_service): - contribution_service.upsert_contributions.return_value = [] - assert client.put("/api/v1/contributions", json=[]).status_code == 200 + contribution_service.upsert_contributions.return_value = BulkWriteSummary(total=0, succeeded=[], failed=[]) + r = client.put("/api/v1/contributions", json=[]) + assert r.status_code == 200 + assert set(r.json()) == {"total", "succeeded", "failed"} def test_service_receives_parsed_contributions(self, client, contribution_service): - contribution_service.upsert_contributions.return_value = [] + contribution_service.upsert_contributions.return_value = BulkWriteSummary(total=1, succeeded=[], failed=[]) client.put("/api/v1/contributions", json=[_valid_contribution_body()]) contributions = contribution_service.upsert_contributions.call_args.kwargs["contributions"] assert contributions[0].identifier == "mp-1234" diff --git a/mpcontribs-api/tests/unit/domains/test_attachments_models.py b/mpcontribs-api/tests/unit/domains/test_attachments_models.py index 1a0c82ebfc..f5b17a736a 100644 --- a/mpcontribs-api/tests/unit/domains/test_attachments_models.py +++ b/mpcontribs-api/tests/unit/domains/test_attachments_models.py @@ -46,13 +46,17 @@ def test_name_requires_extension(self): with pytest.raises(AppValidationError): Attachment(**_payload(name="noextension")) - def test_md5_normalized(self): - attachment = Attachment(**_payload(md5="C" * 32)) - assert attachment.md5 == "c" * 32 + def test_md5_is_computed_not_taken_from_input(self): + # A client-supplied md5 is overwritten by the content-derived hash. + attachment = Attachment(**_payload(md5="c" * 32)) + assert attachment.md5 != "c" * 32 + assert len(attachment.md5) == 32 - def test_invalid_md5_raises(self): - with pytest.raises(AppValidationError): - Attachment(**_payload(md5="zz")) + def test_same_content_same_md5(self): + assert Attachment(**_payload()).md5 == Attachment(**_payload()).md5 + + def test_different_content_different_md5(self): + assert Attachment(**_payload(content=1)).md5 != Attachment(**_payload(content=2)).md5 def test_invalid_mime_raises(self): with pytest.raises(AppValidationError): @@ -64,10 +68,18 @@ def test_missing_content_raises(self): with pytest.raises(PydanticValidationError): Attachment(**payload) - def test_attachment_in_is_attachment(self): - # Input models subclass their document so from_input_model can dump them 1:1. - assert issubclass(AttachmentIn, Attachment) - assert isinstance(AttachmentIn(**_payload()), Attachment) + def test_attachment_in_has_no_id_or_md5(self): + assert "md5" not in AttachmentIn.model_fields + assert "id" not in AttachmentIn.model_fields + + def test_attachment_in_validates_name_extension(self): + with pytest.raises(AppValidationError): + AttachmentIn(name="noextension", mime="application/gzip", content=1) + + def test_from_input_assigns_id_and_computes_md5(self): + doc = Attachment.from_input(AttachmentIn(name="s.gz", mime="application/gzip", content=1)) + assert doc.id is not None + assert len(doc.md5) == 32 # --------------------------------------------------------------------------- diff --git a/mpcontribs-api/tests/unit/domains/test_contribution_service.py b/mpcontribs-api/tests/unit/domains/test_contribution_service.py index 2b213789c9..0b8a9d36b2 100644 --- a/mpcontribs-api/tests/unit/domains/test_contribution_service.py +++ b/mpcontribs-api/tests/unit/domains/test_contribution_service.py @@ -488,9 +488,11 @@ async def test_calls_atomic_repo_method_once_per_item(self): contrib_repo.upsert_contribution_by_identifiers.return_value = MagicMock(spec=Contribution) contribs = [_contrib_in(identifier=f"mp-{i}") for i in range(3)] - results = await svc.upsert_contributions(contribs) + summary = await svc.upsert_contributions(contribs) - assert len(results) == 3 + assert summary.total == 3 + assert len(summary.succeeded) == 3 + assert summary.failed == [] assert contrib_repo.upsert_contribution_by_identifiers.call_count == 3 # The legacy read-then-write path must not be used contrib_repo.find_one_contribution.assert_not_called() @@ -521,14 +523,16 @@ async def _upsert(identifiers, contrib): contrib_repo.upsert_contribution_by_identifiers.side_effect = _upsert contribs = [_contrib_in(identifier=f"mp-{i}") for i in range(3)] - results = await svc.upsert_contributions(contribs) + summary = await svc.upsert_contributions(contribs) - assert results == [returned["mp-0"], returned["mp-1"], returned["mp-2"]] + assert summary.succeeded == [returned["mp-0"], returned["mp-1"], returned["mp-2"]] - async def test_empty_batch_returns_empty_list(self): + async def test_empty_batch_returns_empty_summary(self): svc, contrib_repo, *_ = _make_service() - results = await svc.upsert_contributions([]) - assert results == [] + summary = await svc.upsert_contributions([]) + assert summary.total == 0 + assert summary.succeeded == [] + assert summary.failed == [] contrib_repo.upsert_contribution_by_identifiers.assert_not_called() async def test_same_key_concurrent_upserts_both_go_through_atomic_call(self): @@ -543,11 +547,29 @@ async def test_same_key_concurrent_upserts_both_go_through_atomic_call(self): _contrib_in(project="p", identifier="same"), _contrib_in(project="p", identifier="same"), ] - results = await svc.upsert_contributions(contribs) + summary = await svc.upsert_contributions(contribs) - assert len(results) == 2 + assert len(summary.succeeded) == 2 assert contrib_repo.upsert_contribution_by_identifiers.call_count == 2 + async def test_one_failure_is_reported_not_raised(self): + svc, contrib_repo, *_ = _make_service() + + async def _upsert(identifiers, contrib): + if contrib.identifier == "mp-1": + raise ConflictError("boom") + return MagicMock(spec=Contribution) + + contrib_repo.upsert_contribution_by_identifiers.side_effect = _upsert + + contribs = [_contrib_in(identifier=f"mp-{i}") for i in range(3)] + summary = await svc.upsert_contributions(contribs) + + assert summary.total == 3 + assert len(summary.succeeded) == 2 + assert [f.index for f in summary.failed] == [1] + assert summary.failed[0].error_code == "conflict" + # --------------------------------------------------------------------------- # Process-wide write_slots semaphore is honored diff --git a/mpcontribs-api/tests/unit/domains/test_shared_models.py b/mpcontribs-api/tests/unit/domains/test_shared_models.py index 0b67d8edd4..2ba8c3c9d8 100644 --- a/mpcontribs-api/tests/unit/domains/test_shared_models.py +++ b/mpcontribs-api/tests/unit/domains/test_shared_models.py @@ -17,9 +17,7 @@ def _attachment_in(**overrides) -> AttachmentIn: payload = { - "_id": PydanticObjectId(), "name": "data.csv.gz", - "md5": "a" * 32, "mime": "application/gzip", "content": 1, } @@ -32,23 +30,22 @@ class _OidOut(DocumentOut[PydanticObjectId]): # --------------------------------------------------------------------------- -# BaseDocumentWithInput.from_input_model +# Component.from_input (server-assigned id, computed md5) # --------------------------------------------------------------------------- -class TestFromInputModel: +class TestComponentFromInput: def test_returns_document_class_instance(self): - doc = Attachment.from_input_model(_attachment_in()) + doc = Attachment.from_input(_attachment_in()) assert isinstance(doc, Attachment) - def test_all_fields_carried_over(self): - oid = PydanticObjectId() - doc = Attachment.from_input_model(_attachment_in(_id=oid, name="x.gz")) - assert doc.id == oid + def test_content_carried_id_assigned_md5_computed(self): + doc = Attachment.from_input(_attachment_in(name="x.gz")) assert doc.name == "x.gz" - assert doc.md5 == "a" * 32 assert doc.mime == "application/gzip" assert doc.content == 1 + assert doc.id is not None + assert len(doc.md5) == 32 # --------------------------------------------------------------------------- diff --git a/mpcontribs-api/tests/unit/domains/test_structures_models.py b/mpcontribs-api/tests/unit/domains/test_structures_models.py index 5e2744c019..213724b871 100644 --- a/mpcontribs-api/tests/unit/domains/test_structures_models.py +++ b/mpcontribs-api/tests/unit/domains/test_structures_models.py @@ -131,24 +131,38 @@ def test_charge_is_required_but_nullable(self): with pytest.raises(PydanticValidationError): Structure(**payload) - def test_invalid_md5_raises(self): - with pytest.raises(AppValidationError): - Structure(**_structure_payload(md5="nope")) + def test_md5_is_computed_not_taken_from_input(self): + # A client-supplied md5 is overwritten by the content-derived hash. + structure = Structure(**_structure_payload(md5="a" * 32)) + assert structure.md5 != "a" * 32 + assert len(structure.md5) == 32 + + def test_same_content_same_md5(self): + assert Structure(**_structure_payload()).md5 == Structure(**_structure_payload()).md5 + + def test_different_charge_different_md5(self): + assert Structure(**_structure_payload(charge=0.0)).md5 != Structure(**_structure_payload(charge=1.0)).md5 def test_cif_kept_as_raw_string(self): structure = Structure(**_structure_payload()) assert structure.cif.startswith("data_Fe2O3") - def test_structure_in_is_structure(self): - assert issubclass(StructureIn, Structure) - assert isinstance(StructureIn(**_structure_payload()), Structure) - - def test_from_input_model_round_trip(self): - oid = PydanticObjectId() - doc = Structure.from_input_model(StructureIn(**_structure_payload(_id=oid))) + def test_structure_in_has_no_id_or_md5(self): + assert "md5" not in StructureIn.model_fields + assert "id" not in StructureIn.model_fields + + def test_from_input_assigns_id_and_computes_md5(self): + sin = StructureIn( + name="Fe2O3", + lattice=_lattice_payload(), + sites=[_site_payload()], + charge=0.0, + cif="data_Fe2O3\n", + ) + doc = Structure.from_input(sin) assert isinstance(doc, Structure) - assert doc.id == oid - assert doc.md5 == "f" * 32 + assert doc.id is not None + assert len(doc.md5) == 32 # --------------------------------------------------------------------------- @@ -182,10 +196,6 @@ def test_populates_id_from_mongo_alias(self): class TestStructurePatch: - # NOTE: StructurePatch.sites is annotated `Site | None` (singular) while - # Structure.sites is `list[Site]`. A patch produced from this model can - # therefore write a non-list into a list field. Likely a typo; tests below - # pin the current shape so the fix surfaces here when made. def test_all_fields_optional(self): patch = StructurePatch() assert patch.name is None @@ -201,6 +211,12 @@ def test_lattice_patchable(self): assert patch.lattice is not None assert patch.lattice.volume == 1.0 + def test_sites_is_a_list(self): + # Regression: sites must be list[Site], not a single Site. + patch = StructurePatch(sites=[_site_payload()]) + assert isinstance(patch.sites, list) + assert patch.sites[0].label == "Fe" + # --------------------------------------------------------------------------- # StructureFilter diff --git a/mpcontribs-api/tests/unit/domains/test_tables_models.py b/mpcontribs-api/tests/unit/domains/test_tables_models.py index 48804a0379..624a24ace1 100644 --- a/mpcontribs-api/tests/unit/domains/test_tables_models.py +++ b/mpcontribs-api/tests/unit/domains/test_tables_models.py @@ -10,7 +10,6 @@ TableIn, TableOut, TablePatch, - TableSummaryOut, ) from mpcontribs_api.exceptions import ValidationError as AppValidationError @@ -18,36 +17,40 @@ # Helpers # --------------------------------------------------------------------------- -ATTRS = {"title": "Band gaps", "labels": {"index": "T", "value": "gap", "variable": "method"}} +ATTRS = {"title": "Band gaps", "labels": {"index": "T", "value": "gap", "variable": "doping"}} -def _table_payload(**overrides) -> dict: +def _table_doc_payload(**overrides) -> dict: + """Payload for the stored Table document — raw MongoDB shape (index/columns/data as strings).""" payload = { "_id": PydanticObjectId(), "name": "bandgaps", - "md5": "d" * 32, "attrs": ATTRS, + "index": ["100.0", "200.0"], + "columns": ["1e16", "1e17"], + "data": [["1.1", "1.2"], ["2.1", "2.2"]], "total_data_rows": 2, - "data": {"T": [100, 200], "gap": [1.1, 1.2]}, } payload.update(overrides) return payload -def _source_doc(**overrides) -> dict: - """A source document for TableIn.from_input.""" - doc = { - "id": PydanticObjectId(), +def _table_in_frame() -> pl.DataFrame: + # First column is the index (T), the rest are the data columns; all cells are strings. + return pl.DataFrame( + {"T": ["100.0", "200.0"], "1e16": ["1.1", "2.1"], "1e17": ["1.2", "2.2"]} + ) + + +def _table_in_payload(**overrides) -> dict: + """Payload for user input: a DataFrame (first column = index), no _id/md5/total_data_rows.""" + payload = { "name": "bandgaps", - "md5": "d" * 32, "attrs": ATTRS, - "columns": ["gap", "method"], - "index": [100, 200], - "data": [[1.1, "GGA"], [1.2, "HSE"]], - "total_data_rows": 2, + "data": _table_in_frame(), } - doc.update(overrides) - return doc + payload.update(overrides) + return payload # --------------------------------------------------------------------------- @@ -69,93 +72,73 @@ class TestAttributes: def test_valid(self): attrs = Attributes(**ATTRS) assert attrs.title == "Band gaps" - assert attrs.labels.variable == "method" + assert attrs.labels.variable == "doping" # --------------------------------------------------------------------------- -# Table +# Table (stored document) — md5 is server-computed # --------------------------------------------------------------------------- class TestTable: def test_valid_construction(self): - table = Table(**_table_payload()) - assert isinstance(table.data, pl.DataFrame) + table = Table(**_table_doc_payload()) + assert table.index == ["100.0", "200.0"] + assert table.columns == ["1e16", "1e17"] + assert table.data == [["1.1", "1.2"], ["2.1", "2.2"]] assert table.total_data_rows == 2 def test_collection_name(self): assert Table.Settings.name == "tables" - def test_md5_normalized(self): - assert Table(**_table_payload(md5="D" * 32)).md5 == "d" * 32 - - def test_data_serializes_to_column_dict(self): - table = Table(**_table_payload()) - assert table.model_dump()["data"] == {"T": [100, 200], "gap": [1.1, 1.2]} + def test_md5_is_computed_not_taken_from_input(self): + # A client-supplied md5 is ignored; the stored value is derived from content. + table = Table(**_table_doc_payload(md5="d" * 32)) + assert table.md5 != "d" * 32 + assert len(table.md5) == 32 + def test_same_content_same_md5(self): + assert Table(**_table_doc_payload()).md5 == Table(**_table_doc_payload()).md5 -# --------------------------------------------------------------------------- -# TableIn: happy paths -# --------------------------------------------------------------------------- - - -class TestTableInHappyPath: - def test_matching_row_count_validates(self): - table = TableIn(**_table_payload()) - assert len(table.data) == table.total_data_rows + def test_different_data_different_md5(self): + a = Table(**_table_doc_payload()) + b = Table(**_table_doc_payload(data=[["9.9", "8.8"], ["7.7", "6.6"]])) + assert a.md5 != b.md5 - def test_from_input_builds_dataframe_with_index_column(self): - table = TableIn.from_input(_source_doc()) - assert table.data.columns == ["index", "gap", "method"] - assert table.data["index"].to_list() == [100, 200] - - def test_from_input_custom_index_name(self): - table = TableIn.from_input(_source_doc(), index_name="T") - assert table.data.columns == ["T", "gap", "method"] - - def test_from_input_carries_metadata(self): - doc = _source_doc() - table = TableIn.from_input(doc) - assert table.id == doc["id"] - assert table.name == "bandgaps" - assert table.md5 == "d" * 32 - assert table.total_data_rows == 2 + def test_attrs_part_of_md5(self): + a = Table(**_table_doc_payload()) + b = Table(**_table_doc_payload(attrs={**ATTRS, "title": "Different"})) + assert a.md5 != b.md5 - def test_from_input_rows_zip_index_with_data(self): - table = TableIn.from_input(_source_doc()) - assert table.data["gap"].to_list() == [1.1, 1.2] - assert table.data["method"].to_list() == ["GGA", "HSE"] + def test_data_stored_as_string_rows(self): + table = Table(**_table_doc_payload()) + assert table.model_dump()["data"] == [["1.1", "1.2"], ["2.1", "2.2"]] # --------------------------------------------------------------------------- -# TableIn: validation failures (RED — see module docstring) +# TableIn — content only, no id/md5 # --------------------------------------------------------------------------- -class TestTableInValidationFailures: - """All four tests assert the INTENDED domain ValidationError. +class TestTableIn: + def test_has_no_server_assigned_fields(self): + # _id, md5, and total_data_rows are all server-owned, so absent from the input contract. + assert "md5" not in TableIn.model_fields + assert "id" not in TableIn.model_fields + assert "total_data_rows" not in TableIn.model_fields - They fail today because tables/models.py raises pydantic's ValidationError - with a string, which crashes with TypeError before any error can surface. - Fix: import ValidationError from mpcontribs_api.exceptions instead. - """ + def test_from_input_splits_frame_into_storage(self): + # First column -> index; remaining columns -> columns; cells -> row-major string data. + doc = Table.from_input(TableIn(**_table_in_payload())) + assert doc.index == ["100.0", "200.0"] + assert doc.columns == ["1e16", "1e17"] + assert doc.data == [["1.1", "1.2"], ["2.1", "2.2"]] + assert doc.total_data_rows == 2 - def test_row_count_mismatch_raises_validation_error(self): - with pytest.raises(AppValidationError): - TableIn(**_table_payload(total_data_rows=5)) - - def test_from_input_column_collision_raises_validation_error(self): - # index_name defaults to "index"; a source column named "index" collides. - with pytest.raises(AppValidationError): - TableIn.from_input(_source_doc(columns=["index", "gap"])) - - def test_from_input_index_data_length_mismatch_raises_validation_error(self): - with pytest.raises(AppValidationError): - TableIn.from_input(_source_doc(index=[100, 200, 300])) - - def test_from_input_declared_row_count_mismatch_raises_validation_error(self): - with pytest.raises(AppValidationError): - TableIn.from_input(_source_doc(total_data_rows=99)) + def test_built_document_computes_md5(self): + doc = Table.from_input(TableIn(**_table_in_payload())) + assert len(doc.md5) == 32 + assert doc.id is not None # --------------------------------------------------------------------------- @@ -195,20 +178,10 @@ def test_invalid_md5_raises(self): # --------------------------------------------------------------------------- -# TableSummaryOut / TableOut / TablePatch +# TableOut / TablePatch # --------------------------------------------------------------------------- -class TestTableSummaryOut: - def test_valid(self): - summary = TableSummaryOut(attrs=ATTRS, columns=["gap"], total_data_rows=10) - assert summary.total_data_pages == 1 - - def test_explicit_pages(self): - summary = TableSummaryOut(attrs=ATTRS, columns=["gap"], total_data_rows=10, total_data_pages=3) - assert summary.total_data_pages == 3 - - class TestTableOut: def test_all_fields_optional(self): out = TableOut() @@ -217,25 +190,46 @@ def test_all_fields_optional(self): assert out.attrs is None def test_default_fields(self): - assert TableOut.default_fields() == [ - "id", - "name", - "md5", - "attrs", - "columns", - "total_data_rows", - "total_data_pages", - ] + assert TableOut.default_fields() == ["id", "name", "md5", "attrs", "total_data_rows"] def test_default_fields_parseable(self): - # The route default must survive parse_fields without raising. parsed = TableOut.parse_fields(TableOut.default_fields()) assert "attrs" in parsed + def test_content_projectable(self): + # data is on the Out model so it can be requested explicitly. + parsed = TableOut.parse_fields(["data"]) + assert "data" in parsed + def test_data_coerced_when_present(self): out = TableOut(data={"a": [1]}) assert isinstance(out.data, pl.DataFrame) + def test_reconstructs_frame_from_storage_dict(self): + # Read path: a raw Mongo dict with index/columns/data is reassembled into a DataFrame + # whose first column is the index (named by attrs.labels.index), cells preserved as strings. + out = TableOut.model_validate(_table_doc_payload(md5="a" * 32)) + assert isinstance(out.data, pl.DataFrame) + assert out.data.columns == ["T", "1e16", "1e17"] + assert out.data["T"].to_list() == ["100.0", "200.0"] + assert out.data["1e16"].to_list() == ["1.1", "2.1"] + + def test_storage_keys_not_leaked(self): + out = TableOut.model_validate(_table_doc_payload(md5="a" * 32)) + dumped = out.model_dump() + assert "index" not in dumped + assert "columns" not in dumped + + def test_projection_full_model_when_data_requested(self): + # data requested -> full model (so index/columns come back to rebuild the frame). + assert TableOut.projection(TableOut.parse_fields(["data"])) is TableOut + + def test_projection_partial_when_data_not_requested(self): + # light read -> a trimmed projection model that does not pull the storage triple. + proj = TableOut.projection(TableOut.parse_fields(["name"])) + assert proj is not TableOut + assert hasattr(proj, "Settings") + class TestTablePatch: def test_name_optional(self): From a4e33719116b07b07dfeed189b32e2d67b183057 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 22 Jun 2026 10:44:56 -0700 Subject: [PATCH 399/591] Added ty for typechecking --- mpcontribs-api/pyproject.toml | 4 ++++ mpcontribs-api/uv.lock | 27 +++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/mpcontribs-api/pyproject.toml b/mpcontribs-api/pyproject.toml index b41f4935c7..03cb39cc41 100644 --- a/mpcontribs-api/pyproject.toml +++ b/mpcontribs-api/pyproject.toml @@ -63,6 +63,7 @@ dev = [ "pytest-xdist>=3.8.0", "httpx2>=0.28.0", "pytest-asyncio>=1.4.0", + "ty>=0.0.51", ] [tool.pytest.ini_options] @@ -91,3 +92,6 @@ pythonVersion = "3.14" typeCheckingMode = "standard" extraPaths = ["src"] ignore=["tests/"] + +[tool.ty.src] +exlcude = ["tests"] diff --git a/mpcontribs-api/uv.lock b/mpcontribs-api/uv.lock index b874098fbc..a61a82b83a 100644 --- a/mpcontribs-api/uv.lock +++ b/mpcontribs-api/uv.lock @@ -993,6 +993,7 @@ dev = [ { name = "pytest-asyncio" }, { name = "pytest-xdist" }, { name = "ruff" }, + { name = "ty" }, ] [package.metadata] @@ -1022,6 +1023,7 @@ dev = [ { name = "pytest-asyncio", specifier = ">=1.4.0" }, { name = "pytest-xdist", specifier = ">=3.8.0" }, { name = "ruff", specifier = ">=0.9.0" }, + { name = "ty", specifier = ">=0.0.51" }, ] [[package]] @@ -2034,6 +2036,31 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/19/97/56608b2249fe206a67cd573bc93cd9896e1efb9e98bce9c163bcdc704b88/truststore-0.10.4-py3-none-any.whl", hash = "sha256:adaeaecf1cbb5f4de3b1959b42d41f6fab57b2b1666adb59e89cb0b53361d981", size = 18660, upload-time = "2025-08-12T18:49:01.46Z" }, ] +[[package]] +name = "ty" +version = "0.0.51" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/7e/ce/352fcdba5c72ea20e5d2e46e28809cdb617575b71209d971eff2ace8e6c4/ty-0.0.51.tar.gz", hash = "sha256:b90172d46365bb9d51a7011cbb5c60cc4f514f42c86635df6c092b717f85e1ac", size = 5953151, upload-time = "2026-06-19T01:48:58.015Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/2b/8f/8fe7cab79a45320b2cdcd602f16d44c8108d2f418ff7ec316c6212f1f0cc/ty-0.0.51-py3-none-linux_armv6l.whl", hash = "sha256:947986bd82d324b3a5c58ce03f1dad160cdf36443d3e8f64b3484b861ba9bc64", size = 11884805, upload-time = "2026-06-19T01:48:20.184Z" }, + { url = "https://files.pythonhosted.org/packages/fa/b4/56fdc39a3f44c0564fd157e1e59e1f9c3fc5ba57ae4472ded85c67c63d74/ty-0.0.51-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:25a5b31e6f23fd5dc63ad29087ded09932409e4154e2fe07bbaed015035990bb", size = 11633593, upload-time = "2026-06-19T01:48:22.998Z" }, + { url = "https://files.pythonhosted.org/packages/33/57/136e83f24fc04f5afdcabff42f40fa27eae5ac3f0e3f12627d072a55f679/ty-0.0.51-py3-none-macosx_11_0_arm64.whl", hash = "sha256:2faed19a8f1505370de071c008df52a994fc03a204f3267c3a33a32ca26f854f", size = 11063076, upload-time = "2026-06-19T01:48:25.223Z" }, + { url = "https://files.pythonhosted.org/packages/32/f8/5d32f0df5692446440ab781b9b119aa3e0c0dbfa78c583fe9be8417d54fa/ty-0.0.51-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:08adbe53fb8bc9e7f00e89bf1d3c875a02cda76d83f109d2e6ab1ff35a7bfa8c", size = 11579542, upload-time = "2026-06-19T01:48:27.302Z" }, + { url = "https://files.pythonhosted.org/packages/7f/0c/4f54ef338e9623886809ecd508931b0cd5b3aba1e591586a2f6aeaa8bd11/ty-0.0.51-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:dc5e93695ab5dcbf1eef663aee60ec23a413547cc9cb06adcb0d842e9166bd0f", size = 11676189, upload-time = "2026-06-19T01:48:29.518Z" }, + { url = "https://files.pythonhosted.org/packages/56/27/31729066f9b9d3596941edaf267894eefc0b30df4518f003dba5f7276258/ty-0.0.51-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:abd92913bc90d1705ef9391ff8c6822b61e2e827fa295eb30bf0dfabcf815645", size = 12188154, upload-time = "2026-06-19T01:48:31.68Z" }, + { url = "https://files.pythonhosted.org/packages/2f/38/d4301aa12d2283c7130908baf1417a37dfe3e10f5669cb4ce2853c2540b4/ty-0.0.51-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:429a997394dac73870d71b87cc90efc54da3efaf319e72ca18aeef35a78aef90", size = 12780597, upload-time = "2026-06-19T01:48:33.839Z" }, + { url = "https://files.pythonhosted.org/packages/c1/52/4b2e67e53f126d39abe201bd2299e467e27463a284e965ad195cbc217fa0/ty-0.0.51-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:62d94f06e8c317e89b6884f2bde443040e596b88c7c79bd944c84c105b06257a", size = 12491115, upload-time = "2026-06-19T01:48:36.169Z" }, + { url = "https://files.pythonhosted.org/packages/74/50/aabfe55c132ebe72b4d639cbf772d931e11b0990d29c1f691922b6ccabc1/ty-0.0.51-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f8f52952cff665bc52a36147e610c10f5699d30007d7a14ab7f345cff93476ff", size = 12230135, upload-time = "2026-06-19T01:48:38.445Z" }, + { url = "https://files.pythonhosted.org/packages/0d/1b/9aa428052dbed91c50919cd080426a313cf20ce14c6bfe2b71345e548671/ty-0.0.51-py3-none-manylinux_2_31_riscv64.whl", hash = "sha256:c1bd1355aee86af01e4e21b0bc16fc460fb05905761f0d8b8d70841de0feade8", size = 12468123, upload-time = "2026-06-19T01:48:40.47Z" }, + { url = "https://files.pythonhosted.org/packages/0b/5a/f6ce69f2575259386c950c40e02578d0902760cb61f95045e9971182c24e/ty-0.0.51-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:79d1877e93460f936bc10ed1a31525702b7ce51075763ccba993be17f0b9e905", size = 11541672, upload-time = "2026-06-19T01:48:42.635Z" }, + { url = "https://files.pythonhosted.org/packages/35/3a/2af48924a683e959e95e5cc4dc88e5a8595206a0812b869032b95196f2b0/ty-0.0.51-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:cc233a6235fb23e2a44b14731a10043e37ba2f30f2c361cf49ad3633c5b9da9c", size = 11694015, upload-time = "2026-06-19T01:48:44.819Z" }, + { url = "https://files.pythonhosted.org/packages/a4/12/899875d8a60b198c8121cb92ce18e18cc072d23ca2130fcdaa176383ef72/ty-0.0.51-py3-none-musllinux_1_2_i686.whl", hash = "sha256:bc7459348a253247bbfb2669a021e614281b86bbea24c36112b8a6e1a2499a16", size = 11832856, upload-time = "2026-06-19T01:48:47.028Z" }, + { url = "https://files.pythonhosted.org/packages/e6/a2/88f681d826d97cc96ef9f6cadd4935f775758944cee07340aa46113bce28/ty-0.0.51-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:49a21237f6fd1de56beaff0a3e85fe022a09a3401e67e3abec41ce838a5d4d2e", size = 12333449, upload-time = "2026-06-19T01:48:49.091Z" }, + { url = "https://files.pythonhosted.org/packages/f8/61/535a4163b4452c6978c31fedfd7b5803cf3a2253e9455cde350f86638d6a/ty-0.0.51-py3-none-win32.whl", hash = "sha256:61b4b6a003c3ebe53a63a1125c9b6542aa01bc1b6c9a235d01ee328d000d61a9", size = 11177338, upload-time = "2026-06-19T01:48:51.433Z" }, + { url = "https://files.pythonhosted.org/packages/aa/4d/2334fbb74291a20129fa7aaa8f789619ec9b6883b27f997b8baa27e4674f/ty-0.0.51-py3-none-win_amd64.whl", hash = "sha256:608d417cd1eaf79bcbd713d9830d5e3db9d57ec225c3af3e4ac9a9ff66b45d70", size = 12325675, upload-time = "2026-06-19T01:48:53.774Z" }, + { url = "https://files.pythonhosted.org/packages/50/b5/d49096cd5f3694becb86a5a6ccd0f229ead695fc7430d6bc4dd0a104c6fe/ty-0.0.51-py3-none-win_arm64.whl", hash = "sha256:62ced5e380284f12b2dc4802a3e4ed3dac39913fc6719afde7978814a4c7f169", size = 11657350, upload-time = "2026-06-19T01:48:55.904Z" }, +] + [[package]] name = "typer" version = "0.26.7" From f78a4024d13ffe35564ff088f8463b58e2ac4657 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 22 Jun 2026 15:32:43 -0700 Subject: [PATCH 400/591] Removed ty - not mature enough --- mpcontribs-api/pyproject.toml | 4 ---- mpcontribs-api/uv.lock | 27 --------------------------- 2 files changed, 31 deletions(-) diff --git a/mpcontribs-api/pyproject.toml b/mpcontribs-api/pyproject.toml index 03cb39cc41..b41f4935c7 100644 --- a/mpcontribs-api/pyproject.toml +++ b/mpcontribs-api/pyproject.toml @@ -63,7 +63,6 @@ dev = [ "pytest-xdist>=3.8.0", "httpx2>=0.28.0", "pytest-asyncio>=1.4.0", - "ty>=0.0.51", ] [tool.pytest.ini_options] @@ -92,6 +91,3 @@ pythonVersion = "3.14" typeCheckingMode = "standard" extraPaths = ["src"] ignore=["tests/"] - -[tool.ty.src] -exlcude = ["tests"] diff --git a/mpcontribs-api/uv.lock b/mpcontribs-api/uv.lock index a61a82b83a..b874098fbc 100644 --- a/mpcontribs-api/uv.lock +++ b/mpcontribs-api/uv.lock @@ -993,7 +993,6 @@ dev = [ { name = "pytest-asyncio" }, { name = "pytest-xdist" }, { name = "ruff" }, - { name = "ty" }, ] [package.metadata] @@ -1023,7 +1022,6 @@ dev = [ { name = "pytest-asyncio", specifier = ">=1.4.0" }, { name = "pytest-xdist", specifier = ">=3.8.0" }, { name = "ruff", specifier = ">=0.9.0" }, - { name = "ty", specifier = ">=0.0.51" }, ] [[package]] @@ -2036,31 +2034,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/19/97/56608b2249fe206a67cd573bc93cd9896e1efb9e98bce9c163bcdc704b88/truststore-0.10.4-py3-none-any.whl", hash = "sha256:adaeaecf1cbb5f4de3b1959b42d41f6fab57b2b1666adb59e89cb0b53361d981", size = 18660, upload-time = "2025-08-12T18:49:01.46Z" }, ] -[[package]] -name = "ty" -version = "0.0.51" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/7e/ce/352fcdba5c72ea20e5d2e46e28809cdb617575b71209d971eff2ace8e6c4/ty-0.0.51.tar.gz", hash = "sha256:b90172d46365bb9d51a7011cbb5c60cc4f514f42c86635df6c092b717f85e1ac", size = 5953151, upload-time = "2026-06-19T01:48:58.015Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/2b/8f/8fe7cab79a45320b2cdcd602f16d44c8108d2f418ff7ec316c6212f1f0cc/ty-0.0.51-py3-none-linux_armv6l.whl", hash = "sha256:947986bd82d324b3a5c58ce03f1dad160cdf36443d3e8f64b3484b861ba9bc64", size = 11884805, upload-time = "2026-06-19T01:48:20.184Z" }, - { url = "https://files.pythonhosted.org/packages/fa/b4/56fdc39a3f44c0564fd157e1e59e1f9c3fc5ba57ae4472ded85c67c63d74/ty-0.0.51-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:25a5b31e6f23fd5dc63ad29087ded09932409e4154e2fe07bbaed015035990bb", size = 11633593, upload-time = "2026-06-19T01:48:22.998Z" }, - { url = "https://files.pythonhosted.org/packages/33/57/136e83f24fc04f5afdcabff42f40fa27eae5ac3f0e3f12627d072a55f679/ty-0.0.51-py3-none-macosx_11_0_arm64.whl", hash = "sha256:2faed19a8f1505370de071c008df52a994fc03a204f3267c3a33a32ca26f854f", size = 11063076, upload-time = "2026-06-19T01:48:25.223Z" }, - { url = "https://files.pythonhosted.org/packages/32/f8/5d32f0df5692446440ab781b9b119aa3e0c0dbfa78c583fe9be8417d54fa/ty-0.0.51-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:08adbe53fb8bc9e7f00e89bf1d3c875a02cda76d83f109d2e6ab1ff35a7bfa8c", size = 11579542, upload-time = "2026-06-19T01:48:27.302Z" }, - { url = "https://files.pythonhosted.org/packages/7f/0c/4f54ef338e9623886809ecd508931b0cd5b3aba1e591586a2f6aeaa8bd11/ty-0.0.51-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:dc5e93695ab5dcbf1eef663aee60ec23a413547cc9cb06adcb0d842e9166bd0f", size = 11676189, upload-time = "2026-06-19T01:48:29.518Z" }, - { url = "https://files.pythonhosted.org/packages/56/27/31729066f9b9d3596941edaf267894eefc0b30df4518f003dba5f7276258/ty-0.0.51-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:abd92913bc90d1705ef9391ff8c6822b61e2e827fa295eb30bf0dfabcf815645", size = 12188154, upload-time = "2026-06-19T01:48:31.68Z" }, - { url = "https://files.pythonhosted.org/packages/2f/38/d4301aa12d2283c7130908baf1417a37dfe3e10f5669cb4ce2853c2540b4/ty-0.0.51-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:429a997394dac73870d71b87cc90efc54da3efaf319e72ca18aeef35a78aef90", size = 12780597, upload-time = "2026-06-19T01:48:33.839Z" }, - { url = "https://files.pythonhosted.org/packages/c1/52/4b2e67e53f126d39abe201bd2299e467e27463a284e965ad195cbc217fa0/ty-0.0.51-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:62d94f06e8c317e89b6884f2bde443040e596b88c7c79bd944c84c105b06257a", size = 12491115, upload-time = "2026-06-19T01:48:36.169Z" }, - { url = "https://files.pythonhosted.org/packages/74/50/aabfe55c132ebe72b4d639cbf772d931e11b0990d29c1f691922b6ccabc1/ty-0.0.51-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f8f52952cff665bc52a36147e610c10f5699d30007d7a14ab7f345cff93476ff", size = 12230135, upload-time = "2026-06-19T01:48:38.445Z" }, - { url = "https://files.pythonhosted.org/packages/0d/1b/9aa428052dbed91c50919cd080426a313cf20ce14c6bfe2b71345e548671/ty-0.0.51-py3-none-manylinux_2_31_riscv64.whl", hash = "sha256:c1bd1355aee86af01e4e21b0bc16fc460fb05905761f0d8b8d70841de0feade8", size = 12468123, upload-time = "2026-06-19T01:48:40.47Z" }, - { url = "https://files.pythonhosted.org/packages/0b/5a/f6ce69f2575259386c950c40e02578d0902760cb61f95045e9971182c24e/ty-0.0.51-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:79d1877e93460f936bc10ed1a31525702b7ce51075763ccba993be17f0b9e905", size = 11541672, upload-time = "2026-06-19T01:48:42.635Z" }, - { url = "https://files.pythonhosted.org/packages/35/3a/2af48924a683e959e95e5cc4dc88e5a8595206a0812b869032b95196f2b0/ty-0.0.51-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:cc233a6235fb23e2a44b14731a10043e37ba2f30f2c361cf49ad3633c5b9da9c", size = 11694015, upload-time = "2026-06-19T01:48:44.819Z" }, - { url = "https://files.pythonhosted.org/packages/a4/12/899875d8a60b198c8121cb92ce18e18cc072d23ca2130fcdaa176383ef72/ty-0.0.51-py3-none-musllinux_1_2_i686.whl", hash = "sha256:bc7459348a253247bbfb2669a021e614281b86bbea24c36112b8a6e1a2499a16", size = 11832856, upload-time = "2026-06-19T01:48:47.028Z" }, - { url = "https://files.pythonhosted.org/packages/e6/a2/88f681d826d97cc96ef9f6cadd4935f775758944cee07340aa46113bce28/ty-0.0.51-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:49a21237f6fd1de56beaff0a3e85fe022a09a3401e67e3abec41ce838a5d4d2e", size = 12333449, upload-time = "2026-06-19T01:48:49.091Z" }, - { url = "https://files.pythonhosted.org/packages/f8/61/535a4163b4452c6978c31fedfd7b5803cf3a2253e9455cde350f86638d6a/ty-0.0.51-py3-none-win32.whl", hash = "sha256:61b4b6a003c3ebe53a63a1125c9b6542aa01bc1b6c9a235d01ee328d000d61a9", size = 11177338, upload-time = "2026-06-19T01:48:51.433Z" }, - { url = "https://files.pythonhosted.org/packages/aa/4d/2334fbb74291a20129fa7aaa8f789619ec9b6883b27f997b8baa27e4674f/ty-0.0.51-py3-none-win_amd64.whl", hash = "sha256:608d417cd1eaf79bcbd713d9830d5e3db9d57ec225c3af3e4ac9a9ff66b45d70", size = 12325675, upload-time = "2026-06-19T01:48:53.774Z" }, - { url = "https://files.pythonhosted.org/packages/50/b5/d49096cd5f3694becb86a5a6ccd0f229ead695fc7430d6bc4dd0a104c6fe/ty-0.0.51-py3-none-win_arm64.whl", hash = "sha256:62ced5e380284f12b2dc4802a3e4ed3dac39913fc6719afde7978814a4c7f169", size = 11657350, upload-time = "2026-06-19T01:48:55.904Z" }, -] - [[package]] name = "typer" version = "0.26.7" From 05bf510ffaade6b67aba93f192215386f3e00f3b Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 22 Jun 2026 16:47:30 -0700 Subject: [PATCH 401/591] Changed docstring, imports, and added polars dep --- mpcontribs-api/pyproject.toml | 1 + .../domains/structures/models.py | 6 ++-- mpcontribs-api/uv.lock | 30 +++++++++++++++++++ 3 files changed, 33 insertions(+), 4 deletions(-) diff --git a/mpcontribs-api/pyproject.toml b/mpcontribs-api/pyproject.toml index b41f4935c7..bb45761135 100644 --- a/mpcontribs-api/pyproject.toml +++ b/mpcontribs-api/pyproject.toml @@ -48,6 +48,7 @@ dependencies = [ "fastapi-filter>=2.0.1", "aioboto3>=15.5.0", "types-aiobotocore[s3]>=3.7.0", + "polars>=1.41.2", ] [project.urls] diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py index 4fa5b53696..bf48bb8b54 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py @@ -4,7 +4,7 @@ from pymatgen.core import Element from mpcontribs_api.domains._shared.models import Component, ComponentIn, DocumentOut -from mpcontribs_api.domains._shared.types import FRAME_BSON_ENCODERS, MD5Hash, PolarsFrame +from mpcontribs_api.domains._shared.types import MD5Hash, PolarsFrame from mpcontribs_api.projection import SparseFieldsModel @@ -55,11 +55,10 @@ class Structure(Component): class Settings: name = "structures" - bson_encoders = FRAME_BSON_ENCODERS class StructureIn(ComponentIn): - """User-supplied structure content. ``_id`` and ``md5`` are server-assigned, so absent here.""" + """User-supplied structure content.""" lattice: Lattice sites: list[Site] @@ -78,7 +77,6 @@ class StructureOut(DocumentOut[PydanticObjectId]): @staticmethod def default_fields() -> list[str]: - # Light default; content (lattice/sites/charge/cif) is fetched via ?_fields=. return [ "id", "name", diff --git a/mpcontribs-api/uv.lock b/mpcontribs-api/uv.lock index b874098fbc..7aab864368 100644 --- a/mpcontribs-api/uv.lock +++ b/mpcontribs-api/uv.lock @@ -977,6 +977,7 @@ dependencies = [ { name = "opentelemetry-instrumentation-fastapi" }, { name = "opentelemetry-instrumentation-pymongo" }, { name = "opentelemetry-sdk" }, + { name = "polars" }, { name = "pydantic-settings" }, { name = "pymatgen" }, { name = "pymongo" }, @@ -1006,6 +1007,7 @@ requires-dist = [ { name = "opentelemetry-instrumentation-fastapi", specifier = ">=0.63b1" }, { name = "opentelemetry-instrumentation-pymongo", specifier = ">=0.63b1" }, { name = "opentelemetry-sdk", specifier = ">=1.42.1" }, + { name = "polars", specifier = ">=1.41.2" }, { name = "pydantic-settings", specifier = ">=2.14.1" }, { name = "pymatgen" }, { name = "pymongo", specifier = ">=4.17.0" }, @@ -1417,6 +1419,34 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/54/20/4d324d65cc6d9205fabedc306948156824eb9f0ee1633355a8f7ec5c66bf/pluggy-1.6.0-py3-none-any.whl", hash = "sha256:e920276dd6813095e9377c0bc5566d94c932c33b27a3e3945d8389c374dd4746", size = 20538, upload-time = "2025-05-15T12:30:06.134Z" }, ] +[[package]] +name = "polars" +version = "1.41.2" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "polars-runtime-32" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/ff/f9/aeda46259b0669247a160315d2d51269de9504b9dd2f70acadbcb22f46b7/polars-1.41.2.tar.gz", hash = "sha256:256d6731162371b77f3f29a55eacb8c0fc740ddb1a293a01d2ef5b5393c5c708", size = 737996, upload-time = "2026-05-29T17:39:15.604Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/1f/22/28f62d24f7db56ac4343588f9362d49b7b4177e55ac47a466fe696b0099b/polars-1.41.2-py3-none-any.whl", hash = "sha256:23ce9a2910b6e3e8d4258770bf44aa17170958df7af6e85feedf4458a04d8d29", size = 833445, upload-time = "2026-05-29T17:37:05.576Z" }, +] + +[[package]] +name = "polars-runtime-32" +version = "1.41.2" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/f9/56/54e3ea0e9b64f327179049e4742241cc6b1d3e8fa414b05a057dd26df367/polars_runtime_32-1.41.2.tar.gz", hash = "sha256:7af09ec1ab053da2c9669e8d15f809a4083a29be05db57111688b8051062af56", size = 2989474, upload-time = "2026-05-29T17:39:17.257Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/d6/9b/fe72a3811c0357cdb06c67bdc7695fa1623ad47948fc523195f5ac31037f/polars_runtime_32-1.41.2-cp310-abi3-macosx_10_12_x86_64.whl", hash = "sha256:95a08346dac337357cdb825c8076df7d36da54c4caa59a5cb41d0a30691c5edd", size = 52265283, upload-time = "2026-05-29T17:37:09.407Z" }, + { url = "https://files.pythonhosted.org/packages/0a/93/fab9da803fd80d9e83ef88c20932f637a10bc611b20415fc322eec84bc44/polars_runtime_32-1.41.2-cp310-abi3-macosx_11_0_arm64.whl", hash = "sha256:dedfaeec2c7f995298da7319dd9431d662e5dd1d0ec51b1459df4a0234ceff52", size = 46571222, upload-time = "2026-05-29T17:37:13.698Z" }, + { url = "https://files.pythonhosted.org/packages/c8/2a/8843f34a8ac57acd058a39b87b03b580dd352a490e9dae0415e02033bdd4/polars_runtime_32-1.41.2-cp310-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:18eea22c5cc34e27f8a60950458ad81e6a9ea75e89363ca1367e14e7e7f781fc", size = 50409372, upload-time = "2026-05-29T17:37:17.875Z" }, + { url = "https://files.pythonhosted.org/packages/6c/c6/92b352fe88cf51bd0a19fb99e1c0cbe46aa26c14dcf7995b89869cd932ae/polars_runtime_32-1.41.2-cp310-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2630540dfdfb0f36f9b04a07c7c2e3f50bf2ad384113263c1c812007ee9141e0", size = 56405484, upload-time = "2026-05-29T17:37:22.684Z" }, + { url = "https://files.pythonhosted.org/packages/74/c4/bae3174c3b02f6b441d2e58594387abcd509f67a098f682a83b195f08966/polars_runtime_32-1.41.2-cp310-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:20e969e08f9b137e233c04cc04de73d9795f89eb77d34854e40a025965a43763", size = 50603512, upload-time = "2026-05-29T17:37:27.422Z" }, + { url = "https://files.pythonhosted.org/packages/f4/ed/f2d26ae02d92c2689056838ed59e2a626326ad23c2831d58637d25f6c82a/polars_runtime_32-1.41.2-cp310-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:e7016a3deb641b64a31447abbbee0f34bd020a6a9ae34ee6b743837def15e2a4", size = 54328561, upload-time = "2026-05-29T17:37:32.587Z" }, + { url = "https://files.pythonhosted.org/packages/9b/c4/9c3831cc885dc7769e59abf8f583821a5fb4403fd0e4eba0ccc6d47a3d4b/polars_runtime_32-1.41.2-cp310-abi3-win_amd64.whl", hash = "sha256:1e5e5377c315e0dcafdfb2a31adc546abbaeb3f9cb1864e6536523d2af473265", size = 51978643, upload-time = "2026-05-29T17:37:37.443Z" }, + { url = "https://files.pythonhosted.org/packages/cd/c6/79e9f3f270270d7ed5575d92b7bfef49f01abd9275447161275b23b553a8/polars_runtime_32-1.41.2-cp310-abi3-win_arm64.whl", hash = "sha256:843d96f69d18eca53429c1198e58891db7f18111f83b9c419bb45ad9d73eaed5", size = 46006901, upload-time = "2026-05-29T17:37:42.522Z" }, +] + [[package]] name = "propcache" version = "0.5.2" From 2c794162a4d3d4d58190240bf49c6556ad46c277 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Tue, 23 Jun 2026 16:15:05 -0700 Subject: [PATCH 402/591] Commented out unused dependencies --- .../src/mpcontribs_api/dependencies.py | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/dependencies.py b/mpcontribs-api/src/mpcontribs_api/dependencies.py index 1d55c2e5b7..cadf3d0013 100644 --- a/mpcontribs-api/src/mpcontribs_api/dependencies.py +++ b/mpcontribs-api/src/mpcontribs_api/dependencies.py @@ -8,10 +8,7 @@ from types_aiobotocore_s3 import S3Client from mpcontribs_api.authz import User -from mpcontribs_api.exceptions import ( - AuthenticationError, - PermissionError, -) +from mpcontribs_api.exceptions import AuthenticationError def get_db(request: Request) -> AsyncDatabase: @@ -61,7 +58,6 @@ def get_user(request: Request) -> User: groups=frozenset(groups), ) structlog.contextvars.bind_contextvars( - username=user.username, consumer_id=user.consumer_id, is_admin=user.is_admin, ) @@ -77,13 +73,13 @@ def require_user(user: UserDep) -> User: return user -AuthedDep = Annotated[User, Depends(require_user)] +# AuthedDep = Annotated[User, Depends(require_user)] -def require_role(role: str): - def checker(user: AuthedDep) -> User: - if not user.has_role(role): - raise PermissionError(required_role=role) - return user +# def require_role(role: str): +# def checker(user: AuthedDep) -> User: +# if not user.has_role(role): +# raise PermissionError(required_role=role) +# return user - return Annotated[User, Depends(checker)] +# return Annotated[User, Depends(checker)] From 2c7f9c9cb4c4024058d64c4c6a893658d9f3958f Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 24 Jun 2026 10:51:35 -0700 Subject: [PATCH 403/591] Added custom Access logging in line with previous format. --- .../src/mpcontribs_api/exceptions.py | 21 ++++- mpcontribs-api/src/mpcontribs_api/logging.py | 10 ++- .../src/mpcontribs_api/middleware.py | 89 +++++++++++++++++-- 3 files changed, 113 insertions(+), 7 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/exceptions.py b/mpcontribs-api/src/mpcontribs_api/exceptions.py index fc0d1fbb7d..1a47a50826 100644 --- a/mpcontribs-api/src/mpcontribs_api/exceptions.py +++ b/mpcontribs-api/src/mpcontribs_api/exceptions.py @@ -8,11 +8,25 @@ from fastapi.encoders import jsonable_encoder from fastapi.exceptions import RequestValidationError from fastapi.responses import JSONResponse +from opentelemetry import trace +from opentelemetry.trace import Status, StatusCode from starlette.exceptions import HTTPException as StarletteHTTPException logger = structlog.get_logger(__name__) +def _record_on_span(exc: Exception) -> None: + """Attach a server-side exception to the active OTel span so APM error views show the stack. + + No-op when there is no recording span (telemetry disabled or no active span), since the + sentinel span returned in that case reports ``is_recording() == False``. + """ + span = trace.get_current_span() + if span.is_recording(): + span.record_exception(exc) + span.set_status(Status(StatusCode.ERROR, str(exc))) + + class AppError(Exception): """Base for all application-level domain errors. @@ -78,6 +92,7 @@ def register_exception_handlers(app: FastAPI) -> None: @app.exception_handler(AppError) async def _handle_app_error(request: Request, exc: AppError) -> JSONResponse: if exc.status_code >= 500: + _record_on_span(exc) logger.error(exc.error_code, status_code=exc.status_code, exc_info=exc, **exc.context) else: logger.info(exc.error_code, status_code=exc.status_code, **exc.context) @@ -95,6 +110,7 @@ async def _handle_app_error(request: Request, exc: AppError) -> JSONResponse: # Catch-all for anything that isn't an AppError - bugs, unexpected failures. @app.exception_handler(Exception) async def _handle_unexpected(request: Request, exc: Exception) -> JSONResponse: + _record_on_span(exc) logger.exception("unhandled_exception") # full traceback return JSONResponse( status_code=500, @@ -115,7 +131,10 @@ async def _handle_validation(_request: Request, exc: RequestValidationError) -> # Unify http exceptions from starlette with our exception format @app.exception_handler(StarletteHTTPException) - async def _handle_http(request, exc): + async def _handle_http(request: Request, exc: StarletteHTTPException) -> JSONResponse: + if exc.status_code >= 500: + _record_on_span(exc) + logger.error("http_error", status_code=exc.status_code, exc_info=exc) return JSONResponse( status_code=exc.status_code, content=_error_body("http_error", str(exc.detail)), diff --git a/mpcontribs-api/src/mpcontribs_api/logging.py b/mpcontribs-api/src/mpcontribs_api/logging.py index 2c741c5b03..6cf2bcb4c1 100644 --- a/mpcontribs-api/src/mpcontribs_api/logging.py +++ b/mpcontribs-api/src/mpcontribs_api/logging.py @@ -133,11 +133,19 @@ def configure_logging(settings: Settings) -> None: root.setLevel(log_level) # Let uvicorn's loggers flow through the root handler instead of their own. - for name in ("uvicorn", "uvicorn.error", "uvicorn.access"): + for name in ("uvicorn", "uvicorn.error"): lg = logging.getLogger(name) lg.handlers = [] lg.propagate = True + # Silence uvicorn's default access log: RequestContextMiddleware emits our own structured access + # event with status/size/duration and Datadog standard attributes. disabled=True suppresses it + # regardless of uvicorn's --access-log flag, so the two never double-log. + access = logging.getLogger("uvicorn.access") + access.handlers = [] + access.propagate = False + access.disabled = True + def get_logger(name: str | None = None): return structlog.get_logger(name) diff --git a/mpcontribs-api/src/mpcontribs_api/middleware.py b/mpcontribs-api/src/mpcontribs_api/middleware.py index a313b6545c..152fa6e3fb 100644 --- a/mpcontribs-api/src/mpcontribs_api/middleware.py +++ b/mpcontribs-api/src/mpcontribs_api/middleware.py @@ -1,5 +1,5 @@ -from __future__ import annotations - +import os +import time import uuid from collections.abc import Iterable from typing import TYPE_CHECKING @@ -13,10 +13,10 @@ from opentelemetry.sdk.metrics.export import PeriodicExportingMetricReader from opentelemetry.sdk.trace import TracerProvider from opentelemetry.sdk.trace.export import BatchSpanProcessor -from starlette.types import ASGIApp, Receive, Scope, Send +from starlette.types import ASGIApp, Message, Receive, Scope, Send from mpcontribs_api.config import Settings -from mpcontribs_api.logging import build_resource +from mpcontribs_api.logging import build_resource, get_logger if TYPE_CHECKING: from fastapi import FastAPI @@ -25,6 +25,18 @@ # double-instrumenting pymongo. _configured = False +# Dedicated access logger. Emits one structured event per request (see RequestContextMiddleware); +# flows through the same root handlers as everything else (stdout + OTLP when enabled). +_access_logger = get_logger("access") + +# Process identity, matching the old gunicorn ``{group}/{process}`` prefix and ``%(p)s`` pid. The +# SUPERVISOR_* vars are absent outside supervisord (dev, tests), so these render null there. +_PROCESS = { + "name": os.getenv("SUPERVISOR_PROCESS_NAME"), + "group": os.getenv("SUPERVISOR_GROUP_NAME"), + "id": os.getpid(), +} + # Lowercased ASGI byte header name -> structlog context key. _LOGGED_HEADERS: dict[bytes, str] = { b"user-agent": "user_agent", @@ -38,6 +50,16 @@ class RequestContextMiddleware: + """Bind per-request structlog context and emit one structured access log per HTTP request. + + The two concerns live together because both need the request headers parsed once, and this is + the outermost app middleware, so it observes the final status code, total response bytes, and + full request duration. The access event uses Datadog standard attribute names (``http.*``, + ``network.*``, ``duration`` in nanoseconds) so the existing Datadog log pipeline (URL parser, + User-Agent parser, status-category, date remapper) regenerates the same enriched surface the old + gunicorn access logs had. + """ + def __init__(self, app: ASGIApp) -> None: self.app = app @@ -69,7 +91,64 @@ async def __call__(self, scope: Scope, receive: Receive, send: Send) -> None: structlog.contextvars.clear_contextvars() structlog.contextvars.bind_contextvars(**context) - await self.app(scope, receive, send) + # Capture the final status and body size by wrapping send; the app may call send many times + # (streaming/chunked), so body bytes accumulate across http.response.body messages. + status_code = 0 + bytes_written = 0 + + async def send_wrapper(message: Message) -> None: + nonlocal status_code, bytes_written + if message["type"] == "http.response.start": + status_code = message["status"] + elif message["type"] == "http.response.body": + bytes_written += len(message.get("body", b"")) + await send(message) + + start = time.perf_counter() + try: + await self.app(scope, receive, send_wrapper) + except Exception: + # An exception escaped the app's own handlers (e.g. raised in outer middleware or after + # the response had started, so the catch-all never ran). Record it as a 500 instead of + # the sentinel 0 so status-based alerting still fires, then re-raise unchanged. + if status_code == 0: + status_code = 500 + raise + finally: + self._emit_access_log(scope, headers, status_code, bytes_written, start) + + @staticmethod + def _emit_access_log( + scope: Scope, + headers: dict[bytes, bytes], + status_code: int, + bytes_written: int, + start: float, + ) -> None: + duration_ns = int((time.perf_counter() - start) * 1e9) + query_string = scope.get("query_string", b"").decode("latin-1") + path = scope["path"] + url = f"{path}?{query_string}" if query_string else path + # True client IP behind Kong: first X-Forwarded-For hop if present, else the direct peer (which is Kong itself) + forwarded_for = headers.get(b"x-forwarded-for", b"").decode("latin-1") + client = scope.get("client") + client_ip = forwarded_for.split(",")[0].strip() if forwarded_for else (client[0] if client else "") + + _access_logger.info( + "http.access", + http={ + "method": scope["method"], + "status_code": status_code, + "url": url, + "referer": headers.get(b"referer", b"-").decode("latin-1"), + "useragent": headers.get(b"user-agent", b"").decode("latin-1"), + "version": scope.get("http_version", "1.1"), + }, + network={"bytes_written": bytes_written, "client": {"ip": client_ip}}, + duration=duration_ns, # Datadog standard `duration` is nanoseconds + response_time=duration_ns // 1000, # microseconds, matches the old gunicorn %(D)s + process=_PROCESS, + ) def configure_tracing(settings: Settings) -> None: From 8a7650e051103f2bbdb3958b2ad622e6f2ca4914 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 24 Jun 2026 10:52:07 -0700 Subject: [PATCH 404/591] pass exc_info through to logger on upsert error --- .../src/mpcontribs_api/domains/contributions/service.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py index dd9bb350c6..1ac0489217 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py @@ -295,7 +295,9 @@ async def _bounded_upsert(index: int, contrib: ContributionIn) -> Contribution | try: return await self._contributions.upsert_contribution_by_identifiers(contrib.identifiers(), contrib) except Exception as exc: - logger.error("upsert_contribution_failed", index=index, identifier=contrib.identifiers()) + logger.error( + "upsert_contribution_failed", index=index, identifier=contrib.identifiers(), exc_info=True + ) return bulk_failure_from_exception(index, contrib.identifiers(), exc) results = await asyncio.gather(*[_bounded_upsert(i, c) for i, c in enumerate(contributions)]) From 811017fd173486924aa929e1aa1f492fea722bda Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 24 Jun 2026 13:41:00 -0700 Subject: [PATCH 405/591] Added log_level to errors --- .../src/mpcontribs_api/exceptions.py | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/exceptions.py b/mpcontribs-api/src/mpcontribs_api/exceptions.py index 1a47a50826..d3fc03a199 100644 --- a/mpcontribs-api/src/mpcontribs_api/exceptions.py +++ b/mpcontribs-api/src/mpcontribs_api/exceptions.py @@ -1,5 +1,6 @@ from __future__ import annotations +import logging from collections.abc import Sequence from typing import Any @@ -38,6 +39,10 @@ class AppError(Exception): # them off the type without instantiating special-casing. status_code: int = 500 error_code: str = "internal_error" # stable, machine-readable + # Optional stdlib log level override. None => the handler derives it from status_code + # (ERROR for 5xx, INFO for 4xx). Set on a subclass to promote a notable client error, + # e.g. WARNING for auth failures so they're alertable without logging every 404. + log_level: int | None = None def __init__(self, message: str | None = None, **context): self.message = message or self.__class__.__name__ @@ -48,26 +53,31 @@ def __init__(self, message: str | None = None, **context): class NotFoundError(AppError): status_code = 404 error_code = "not_found" + log_level = logging.INFO class ConflictError(AppError): status_code = 409 error_code = "conflict" + log_level = logging.INFO class ValidationError(AppError): status_code = 422 error_code = "validation_error" + log_level = logging.INFO class PermissionError(AppError): status_code = 403 error_code = "permission_denied" + log_level = logging.WARNING # security-relevant: alertable, but not a server fault class AuthenticationError(AppError): status_code = 401 error_code = "authentication_error" + log_level = logging.WARNING # security-relevant: alertable, but not a server fault def _error_body(error_code: str, message: str, **public_context) -> dict: @@ -91,11 +101,15 @@ def register_exception_handlers(app: FastAPI) -> None: @app.exception_handler(AppError) async def _handle_app_error(request: Request, exc: AppError) -> JSONResponse: - if exc.status_code >= 500: + is_server_fault = exc.status_code >= 500 + level = exc.log_level if exc.log_level is not None else (logging.ERROR if is_server_fault else logging.INFO) + if is_server_fault: + # Only genuine server faults carry a traceback and mark the span; client errors + # (incl. opt-in WARNING ones like auth failures) are expected and need neither. _record_on_span(exc) - logger.error(exc.error_code, status_code=exc.status_code, exc_info=exc, **exc.context) + logger.log(level, exc.error_code, status_code=exc.status_code, exc_info=exc, **exc.context) else: - logger.info(exc.error_code, status_code=exc.status_code, **exc.context) + logger.log(level, exc.error_code, status_code=exc.status_code, **exc.context) return JSONResponse( status_code=exc.status_code, content=_error_body( From 1c8b4f11303edb47aa9a21c43f129c09bcad1563 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 24 Jun 2026 16:11:42 -0700 Subject: [PATCH 406/591] Moved healthcheck router to healthcheck instead of health --- mpcontribs-api/src/mpcontribs_api/app.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mpcontribs-api/src/mpcontribs_api/app.py b/mpcontribs-api/src/mpcontribs_api/app.py index 2fd4c80fa6..e51429657d 100644 --- a/mpcontribs-api/src/mpcontribs_api/app.py +++ b/mpcontribs-api/src/mpcontribs_api/app.py @@ -120,7 +120,7 @@ def create_app(settings: Settings | None = None) -> FastAPI: # Emit server-side request spans/metrics (no-op when telemetry is disabled). instrument_app(app, settings) register_exception_handlers(app) - app.include_router(healthcheck_router, prefix="/health") + app.include_router(healthcheck_router, prefix="/healthcheck") app.include_router(v1_router, prefix="/api/v1") return app From a295e27667dac1228a923e4d369017a07f8fb313 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 24 Jun 2026 16:13:26 -0700 Subject: [PATCH 407/591] Added 'version' to healthcheck for backwards compat --- .../src/mpcontribs_api/domains/healthcheck/router.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/healthcheck/router.py b/mpcontribs-api/src/mpcontribs_api/domains/healthcheck/router.py index 88abea6a91..64bbb69fe1 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/healthcheck/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/healthcheck/router.py @@ -11,6 +11,7 @@ class HealthStatus(BaseModel): + version: str status: str mongo: str s3: str @@ -34,4 +35,4 @@ async def healthcheck(db: DbDep, s3_client: S3Dep) -> HealthStatus: detail={"status": "unhealthy", "s3": "unreachable"}, ) from None - return HealthStatus(status="healthy", mongo="ok", s3="ok") + return HealthStatus(version=settings.version, status="healthy", mongo="ok", s3="ok") From 11f04e7c5241c4c39df0f63c9f6e468fdee636b8 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 25 Jun 2026 09:39:33 -0700 Subject: [PATCH 408/591] Added user to contribution service and threaded user into repo to check that the user can modify/insert contributions only under their projects --- .../domains/contributions/dependencies.py | 1 + .../domains/contributions/repository.py | 5 ++ .../domains/contributions/service.py | 78 ++++++++++++++++--- 3 files changed, 73 insertions(+), 11 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/dependencies.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/dependencies.py index b049f32c2c..b0cce8e0df 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/dependencies.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/dependencies.py @@ -22,6 +22,7 @@ def get_scoped_contributions(user: UserDep) -> MongoDbContributionRepository: def get_contribution_service(user: UserDep, client: MongoClientDep) -> ContributionService: return ContributionService( client=client, + user=user, contributions=MongoDbContributionRepository(user), structures=MongoDbStructureRepository(user), attachments=MongoDbAttachmentRepository(user), diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py index 8530dcb5d3..ab98ee9b2d 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py @@ -18,6 +18,7 @@ ContributionOut, ContributionPatch, ) +from mpcontribs_api.exceptions import PermissionError from mpcontribs_api.pagination import CursorParams @@ -207,6 +208,10 @@ async def upsert_contribution_by_identifiers( Returns: Contribution: the document as it stands after the operation """ + # Make sure the user is allowed to upsert a contribution under the provided project + if not self._user.is_admin and identifiers["project"] not in self._user.groups: + raise PermissionError(f"not authorized to write to project '{identifiers['project']}'") + doc = self.document_model.from_input_model(contribution) update_data = doc.model_dump(exclude={"id"}, exclude_none=True) query = self.document_model.find_one( diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py index 1ac0489217..b0ff084d98 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py @@ -1,5 +1,6 @@ import asyncio from collections import defaultdict +from collections.abc import Iterable from typing import cast import structlog @@ -8,6 +9,7 @@ from pymongo.asynchronous.client_session import AsyncClientSession from pymongo.errors import BulkWriteError +from mpcontribs_api.authz import User from mpcontribs_api.config import MongoSettings, get_settings from mpcontribs_api.domains._shared.bulk import ( BulkDeleteSummary, @@ -23,7 +25,7 @@ from mpcontribs_api.domains.structures.repository import MongoDbStructureRepository from mpcontribs_api.domains.tables.models import Table from mpcontribs_api.domains.tables.repository import MongoDbTableRepository -from mpcontribs_api.exceptions import AppError, ValidationError +from mpcontribs_api.exceptions import AppError, PermissionError, ValidationError from mpcontribs_api.pagination import CursorParams logger = structlog.get_logger(__name__) @@ -33,6 +35,7 @@ class ContributionService: def __init__( self, client: AsyncMongoClient, + user: User, contributions: MongoDbContributionRepository, structures: MongoDbStructureRepository, attachments: MongoDbAttachmentRepository, @@ -40,6 +43,7 @@ def __init__( settings: MongoSettings | None = None, ): self._client = client + self._user = user self._contributions = contributions self._structures = structures self._attachments = attachments @@ -80,7 +84,7 @@ async def insert_contributions( self._reject_duplicate_keys(contributions) - oversize_failures, remaining_indices = self._split_oversize(contributions) + failures, remaining_indices = self._split_contributions(contributions) no_comp_indices = [i for i in remaining_indices if not contributions[i].has_components()] with_comp_indices = [i for i in remaining_indices if contributions[i].has_components()] @@ -95,7 +99,7 @@ async def insert_contributions( succeeded = [doc for _, doc in sorted(no_comp_succeeded + with_comp_succeeded, key=lambda p: p[0])] failed = sorted( - oversize_failures + no_comp_failed + with_comp_failed, + failures + no_comp_failed + with_comp_failed, key=lambda f: f.index, ) return BulkWriteSummary[Contribution](total=len(contributions), succeeded=succeeded, failed=failed) @@ -120,24 +124,61 @@ def _reject_duplicate_keys(self, contributions: list[ContributionIn]) -> None: contribution_indices=duplicates, ) - def _split_oversize(self, contributions: list[ContributionIn]) -> tuple[list[BulkFailure], list[int]]: + def _split_unauthorized( + self, + indices: Iterable[int], + contributions: list[ContributionIn], + ) -> tuple[list[BulkFailure], list[int]]: + """Reject contributions whose ``project`` the current user is not permitted to write. + + Authorized iff the user is an admin (writes anything) or the contribution's ``project`` is + one of the user's groups. Anonymous users are blocked at the router, but carry no groups and + are not admins, so they fall through to authorized-for-nothing here (defense-in-depth). + + Partitions ``indices`` into unauthorized ``BulkFailure`` entries and the remaining authorized + indices that should proceed. Mirrors ``_split_oversize`` (same shape) so callers can chain + the splits and keep each index in exactly one bucket, preserving input ordering. + """ + unauthorized: list[BulkFailure] = [] + remaining: list[int] = [] + for i in indices: + contrib = contributions[i] + if self._user.is_admin or contrib.project in self._user.groups: + remaining.append(i) + else: + unauthorized.append( + BulkFailure( + index=i, + identifier=contrib.identifiers(), + error_code=PermissionError.error_code, + message=f"not authorized to write to project '{contrib.project}'", + ) + ) + return unauthorized, remaining + + def _split_oversize( + self, + indices: Iterable[int], + contributions: list[ContributionIn], + ) -> tuple[list[BulkFailure], list[int]]: """Reject contributions whose component count exceeds the per-contribution ceiling. - Returns the failure entries for the oversize items and the indices of the remaining items - that should proceed to Mongo. Doing this upfront avoids burning a transaction slot on a - request guaranteed to exceed transactionLifetimeLimitSeconds. + Partitions ``indices`` into oversize ``BulkFailure`` entries and the remaining indices that + should proceed to Mongo. Doing this upfront avoids burning a transaction slot on a request + guaranteed to exceed transactionLifetimeLimitSeconds. """ cap = self._settings.max_components_per_contribution oversize: list[BulkFailure] = [] remaining: list[int] = [] - for i, contrib in enumerate(contributions): + for i in indices: + contrib = contributions[i] count = contrib.component_count() if count > cap: oversize.append( BulkFailure( index=i, identifier=contrib.identifiers(), - error_code="validation_error", + error_code=ValidationError.error_code, message=f"contribution has {count} components, exceeds cap of {cap}. " "Recommend inserting the component alone, followed by bulk inserts of components", ) @@ -146,6 +187,19 @@ def _split_oversize(self, contributions: list[ContributionIn]) -> tuple[list[Bul remaining.append(i) return oversize, remaining + def _split_contributions(self, contributions) -> tuple[list[BulkFailure], list[int]]: + """Common method for validating contribution write failure logic + + Returns: + tuple[list[BulkFailure], list[int]]: a tuple containing a list of failures and their reasons, + and the indices of valid contributions from 'contributions' to write + """ + # Per-item project authorization (see _split_unauthorized for the per-item vs fail-fast + # decision). Only authorized items reach Mongo; the rest are reported in ``failed``. + unauthorized_failures, authorized_indices = self._split_unauthorized(range(len(contributions)), contributions) + oversize_failures, remaining_indices = self._split_oversize(authorized_indices, contributions) + return (unauthorized_failures + oversize_failures, remaining_indices) + async def _insert_no_components( self, indices: list[int], @@ -288,6 +342,8 @@ async def upsert_contributions(self, contributions: list[ContributionIn]) -> Bul contribution_indices=indices_with_components, ) + failures, remaining_indices = self._split_contributions(contributions) + sem = asyncio.Semaphore(self._settings.max_concurrent_transactions) async def _bounded_upsert(index: int, contrib: ContributionIn) -> Contribution | BulkFailure: @@ -300,9 +356,9 @@ async def _bounded_upsert(index: int, contrib: ContributionIn) -> Contribution | ) return bulk_failure_from_exception(index, contrib.identifiers(), exc) - results = await asyncio.gather(*[_bounded_upsert(i, c) for i, c in enumerate(contributions)]) + results = await asyncio.gather(*[_bounded_upsert(i, contributions[i]) for i in remaining_indices]) succeeded = [r for r in results if not isinstance(r, BulkFailure)] - failed = [r for r in results if isinstance(r, BulkFailure)] + failed = failures + [r for r in results if isinstance(r, BulkFailure)] return BulkWriteSummary[Contribution](total=len(contributions), succeeded=succeeded, failed=failed) async def delete_contributions(self, filter: ContributionFilter) -> BulkDeleteSummary: From c4fc4ed7956228d9627e72e64297517c9ff3644a Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 25 Jun 2026 09:40:06 -0700 Subject: [PATCH 409/591] Added tests for user-contribution validation and modified healthcheck tests to reflect new healthcheck shape --- .../tests/integration/test_healthcheck.py | 26 +++--- .../unit/domains/test_contribution_service.py | 93 +++++++++++++++++++ 2 files changed, 106 insertions(+), 13 deletions(-) diff --git a/mpcontribs-api/tests/integration/test_healthcheck.py b/mpcontribs-api/tests/integration/test_healthcheck.py index a7810fcefc..f98ca854f3 100644 --- a/mpcontribs-api/tests/integration/test_healthcheck.py +++ b/mpcontribs-api/tests/integration/test_healthcheck.py @@ -36,7 +36,7 @@ def _make_s3(head_ok: bool) -> MagicMock: def health_app() -> FastAPI: app = FastAPI() register_exception_handlers(app) - app.include_router(healthcheck_router, prefix="/health") + app.include_router(healthcheck_router, prefix="/healthcheck") return app @@ -53,21 +53,21 @@ def _client(app: FastAPI, db: MagicMock, s3: MagicMock | None = None) -> TestCli class TestHealthcheckHealthy: def test_returns_200(self, health_app): - r = _client(health_app, _make_db(ping_ok=True), _make_s3(head_ok=True)).get("/health") + r = _client(health_app, _make_db(ping_ok=True), _make_s3(head_ok=True)).get("/healthcheck") assert r.status_code == 200 def test_body_reports_healthy(self, health_app): - r = _client(health_app, _make_db(ping_ok=True), _make_s3(head_ok=True)).get("/health") - assert r.json() == {"status": "healthy", "mongo": "ok", "s3": "ok"} + r = _client(health_app, _make_db(ping_ok=True), _make_s3(head_ok=True)).get("/healthcheck") + assert r.json() == {"version": "0.0.0-dev", "status": "healthy", "mongo": "ok", "s3": "ok"} def test_pings_mongo(self, health_app): db = _make_db(ping_ok=True) - _client(health_app, db, _make_s3(head_ok=True)).get("/health") + _client(health_app, db, _make_s3(head_ok=True)).get("/healthcheck") db.client.admin.command.assert_awaited_once_with("ping") def test_probes_s3(self, health_app): s3 = _make_s3(head_ok=True) - _client(health_app, _make_db(ping_ok=True), s3).get("/health") + _client(health_app, _make_db(ping_ok=True), s3).get("/healthcheck") s3.head_bucket.assert_awaited_once() @@ -78,13 +78,13 @@ def test_probes_s3(self, health_app): class TestHealthcheckMongoUnhealthy: def test_returns_503(self, health_app): - r = _client(health_app, _make_db(ping_ok=False)).get("/health") + r = _client(health_app, _make_db(ping_ok=False)).get("/healthcheck") assert r.status_code == 503 def test_body_reports_unreachable(self, health_app): # The StarletteHTTPException handler reshapes the response into the # standard error envelope, stringifying the detail dict into `message`. - r = _client(health_app, _make_db(ping_ok=False)).get("/health") + r = _client(health_app, _make_db(ping_ok=False)).get("/healthcheck") message = r.json()["error"]["message"] assert "unhealthy" in message assert "unreachable" in message @@ -92,13 +92,13 @@ def test_body_reports_unreachable(self, health_app): def test_ping_failure_does_not_leak_exception_text(self, health_app): # The raised HTTPException carries a controlled detail dict, not the # underlying "mongo down" ConnectionError message. - r = _client(health_app, _make_db(ping_ok=False)).get("/health") + r = _client(health_app, _make_db(ping_ok=False)).get("/healthcheck") assert "mongo down" not in r.text def test_s3_not_probed_when_mongo_down(self, health_app): # Mongo is checked first; a failure short-circuits before S3 is touched. s3 = _make_s3(head_ok=True) - _client(health_app, _make_db(ping_ok=False), s3).get("/health") + _client(health_app, _make_db(ping_ok=False), s3).get("/healthcheck") s3.head_bucket.assert_not_awaited() @@ -109,16 +109,16 @@ def test_s3_not_probed_when_mongo_down(self, health_app): class TestHealthcheckS3Unhealthy: def test_returns_503(self, health_app): - r = _client(health_app, _make_db(ping_ok=True), _make_s3(head_ok=False)).get("/health") + r = _client(health_app, _make_db(ping_ok=True), _make_s3(head_ok=False)).get("/healthcheck") assert r.status_code == 503 def test_body_reports_unreachable(self, health_app): - r = _client(health_app, _make_db(ping_ok=True), _make_s3(head_ok=False)).get("/health") + r = _client(health_app, _make_db(ping_ok=True), _make_s3(head_ok=False)).get("/healthcheck") message = r.json()["error"]["message"] assert "unhealthy" in message assert "unreachable" in message def test_s3_failure_does_not_leak_exception_text(self, health_app): # The controlled detail dict is returned, not the underlying boto error text. - r = _client(health_app, _make_db(ping_ok=True), _make_s3(head_ok=False)).get("/health") + r = _client(health_app, _make_db(ping_ok=True), _make_s3(head_ok=False)).get("/healthcheck") assert "s3 down" not in r.text diff --git a/mpcontribs-api/tests/unit/domains/test_contribution_service.py b/mpcontribs-api/tests/unit/domains/test_contribution_service.py index 0b8a9d36b2..4e8b387bb4 100644 --- a/mpcontribs-api/tests/unit/domains/test_contribution_service.py +++ b/mpcontribs-api/tests/unit/domains/test_contribution_service.py @@ -7,6 +7,7 @@ from pymatgen.core import Element from pymongo.errors import BulkWriteError +from mpcontribs_api.authz import ADMIN_GROUP, User from mpcontribs_api.config import MongoSettings from mpcontribs_api.domains.attachments.models import Attachment, AttachmentIn from mpcontribs_api.domains.contributions.models import Contribution, ContributionIn @@ -135,6 +136,12 @@ async def _with_transaction(callback): return client, session +def _admin_user() -> User: + """An admin user — bypasses project write authorization, so tests not exercising authz + keep their previous behavior.""" + return User(username="admin", groups=frozenset({ADMIN_GROUP})) + + def _make_service( contributions=None, structures=None, @@ -143,6 +150,7 @@ def _make_service( client=None, settings: MongoSettings | None = None, write_slots: asyncio.Semaphore | None = None, + user: User | None = None, ) -> tuple[ContributionService, AsyncMock, AsyncMock, AsyncMock, AsyncMock, MagicMock]: contrib_repo = contributions or AsyncMock() struct_repo = structures or AsyncMock() @@ -152,6 +160,7 @@ def _make_service( client, _ = _make_fake_client() svc = ContributionService( client=client, + user=user or _admin_user(), contributions=contrib_repo, structures=struct_repo, tables=table_repo, @@ -571,6 +580,90 @@ async def _upsert(identifiers, contrib): assert summary.failed[0].error_code == "conflict" +# --------------------------------------------------------------------------- +# Project-scoped write authorization (insert + upsert) +# --------------------------------------------------------------------------- + + +def _member_user(*projects: str) -> User: + """Non-admin user whose writable projects are exactly ``projects``.""" + return User(username="alice", groups=frozenset(projects)) + + +class TestWriteAuthorization: + async def test_insert_rejects_unauthorized_project_per_item(self): + svc, contrib_repo, struct_repo, _, _, client = _make_service(user=_member_user("allowed")) + contrib_repo.insert_many_contributions.return_value = None + + contribs = [ + _contrib_in(project="allowed", identifier="ok"), + _contrib_in(project="forbidden", identifier="nope"), + ] + summary = await svc.insert_contributions(contribs) + + assert summary.total == 2 + assert len(summary.succeeded) == 1 + assert [f.index for f in summary.failed] == [1] + assert summary.failed[0].error_code == "permission_denied" + assert "forbidden" in summary.failed[0].message + # Only the authorized item reached Mongo + contrib_repo.insert_many_contributions.assert_called_once() + + async def test_insert_admin_bypasses_authorization(self): + svc, contrib_repo, *_ = _make_service() # default user is admin + contrib_repo.insert_many_contributions.return_value = None + + contribs = [_contrib_in(project="anything", identifier=f"mp-{i}") for i in range(2)] + summary = await svc.insert_contributions(contribs) + + assert summary.total == 2 + assert len(summary.succeeded) == 2 + assert summary.failed == [] + + async def test_insert_unauthorized_and_oversize_yield_single_failure(self): + """An item that is both unauthorized and oversize must produce exactly one BulkFailure + (authorization runs first), preserving total == len(contributions).""" + settings = _make_mongo_settings(max_components_per_contribution=1) + svc, contrib_repo, struct_repo, _, _, _ = _make_service(user=_member_user("allowed"), settings=settings) + + bad = _contrib_in(project="forbidden", identifier="big", structures=[_structure_in(), _structure_in()]) + summary = await svc.insert_contributions([bad]) + + assert summary.total == 1 + assert len(summary.failed) == 1 + assert summary.failed[0].index == 0 + assert summary.failed[0].error_code == "permission_denied" + struct_repo.insert_components.assert_not_called() + + async def test_upsert_rejects_unauthorized_project_per_item(self): + svc, contrib_repo, *_ = _make_service(user=_member_user("allowed")) + contrib_repo.upsert_contribution_by_identifiers.return_value = MagicMock(spec=Contribution) + + contribs = [ + _contrib_in(project="allowed", identifier="ok"), + _contrib_in(project="forbidden", identifier="nope"), + ] + summary = await svc.upsert_contributions(contribs) + + assert summary.total == 2 + assert len(summary.succeeded) == 1 + assert [f.index for f in summary.failed] == [1] + assert summary.failed[0].error_code == "permission_denied" + assert "forbidden" in summary.failed[0].message + # Only the authorized item reached the atomic repo method + contrib_repo.upsert_contribution_by_identifiers.assert_called_once() + + async def test_upsert_anonymous_authorized_for_nothing(self): + svc, contrib_repo, *_ = _make_service(user=User()) # anonymous: no username, no groups + + summary = await svc.upsert_contributions([_contrib_in(project="any", identifier="x")]) + + assert summary.total == 1 + assert summary.succeeded == [] + assert [f.error_code for f in summary.failed] == ["permission_denied"] + contrib_repo.upsert_contribution_by_identifiers.assert_not_called() + + # --------------------------------------------------------------------------- # Process-wide write_slots semaphore is honored # --------------------------------------------------------------------------- From c7724a7ffa69a8a0814def9fa03c0ce8d0d19546 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 25 Jun 2026 09:51:42 -0700 Subject: [PATCH 410/591] Brought user group checking logic onto user --- mpcontribs-api/src/mpcontribs_api/authz.py | 12 ++++++++++++ .../domains/contributions/repository.py | 7 +++---- .../mpcontribs_api/domains/contributions/service.py | 2 +- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/authz.py b/mpcontribs-api/src/mpcontribs_api/authz.py index d5336b2fb6..1982d1a129 100644 --- a/mpcontribs-api/src/mpcontribs_api/authz.py +++ b/mpcontribs-api/src/mpcontribs_api/authz.py @@ -50,3 +50,15 @@ def is_admin(self) -> bool: def has_role(self, role: str) -> bool: return role in self.groups + + @property + def writable_projects(self) -> frozenset[str]: + """Projects this user may write to. Admins are unbounded (handled by can_write)""" + if self.is_anonymous: + return frozenset() + # exclude the admin sentinel so it never leaks into a $in / membership test + return frozenset(g for g in self.groups if g != ADMIN_GROUP) + + def can_write(self, project: str) -> bool: + """Single source of truth for write authorization.""" + return self.is_admin or project in self.writable_projects diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py index ab98ee9b2d..31c2d3dfc4 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py @@ -46,9 +46,8 @@ def _build_scope(user: User) -> dict[str, Any]: if user.is_admin: return {} ors: list[dict[str, Any]] = [{"is_public": True}] - if not user.is_anonymous: - if user.groups: - ors.append({"project": {"$in": sorted(user.groups)}}) + if user.writable_projects: + ors.append({"project": {"$in": sorted(user.writable_projects)}}) return {"$or": ors} async def get_contributions( @@ -209,7 +208,7 @@ async def upsert_contribution_by_identifiers( Contribution: the document as it stands after the operation """ # Make sure the user is allowed to upsert a contribution under the provided project - if not self._user.is_admin and identifiers["project"] not in self._user.groups: + if not self._user.can_write(identifiers["project"]): raise PermissionError(f"not authorized to write to project '{identifiers['project']}'") doc = self.document_model.from_input_model(contribution) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py index b0ff084d98..52bbe32273 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py @@ -143,7 +143,7 @@ def _split_unauthorized( remaining: list[int] = [] for i in indices: contrib = contributions[i] - if self._user.is_admin or contrib.project in self._user.groups: + if self._user.can_write(contrib.project): remaining.append(i) else: unauthorized.append( From 0b4513c3357fbdc0c25e98e18de5445810fdc82e Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 25 Jun 2026 11:18:32 -0700 Subject: [PATCH 411/591] Added redirects for old endpoints to their corresponding new ones, and return a deprecation response on ones with no modern equivalent --- mpcontribs-api/src/mpcontribs_api/app.py | 4 + .../domains/_redirects/router.py | 161 ++++++++++++++++++ mpcontribs-api/tests/integration/conftest.py | 4 + .../tests/integration/test_redirects.py | 143 ++++++++++++++++ 4 files changed, 312 insertions(+) create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/_redirects/router.py create mode 100644 mpcontribs-api/tests/integration/test_redirects.py diff --git a/mpcontribs-api/src/mpcontribs_api/app.py b/mpcontribs-api/src/mpcontribs_api/app.py index e51429657d..29c5d10f4b 100644 --- a/mpcontribs-api/src/mpcontribs_api/app.py +++ b/mpcontribs-api/src/mpcontribs_api/app.py @@ -15,6 +15,7 @@ from mpcontribs_api.api.v1.router import router as v1_router from mpcontribs_api.authz import api_key_scheme from mpcontribs_api.config import Settings, get_settings +from mpcontribs_api.domains._redirects.router import router as redirects_router from mpcontribs_api.domains.attachments.models import Attachment from mpcontribs_api.domains.contributions.models import Contribution from mpcontribs_api.domains.healthcheck.router import router as healthcheck_router @@ -122,6 +123,9 @@ def create_app(settings: Settings | None = None) -> FastAPI: register_exception_handlers(app) app.include_router(healthcheck_router, prefix="/healthcheck") app.include_router(v1_router, prefix="/api/v1") + # Legacy (root-path) endpoints: 308-redirect to /api/v1 where a counterpart + # exists, else 410 Gone. Registered last so it never shadows live routes. + app.include_router(redirects_router) return app diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_redirects/router.py b/mpcontribs-api/src/mpcontribs_api/domains/_redirects/router.py new file mode 100644 index 0000000000..d965e4eecb --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/domains/_redirects/router.py @@ -0,0 +1,161 @@ +"""Compatibility shims for the legacy (Flask/flask-mongorest) MPContribs API. + +The old API was served from the root path (e.g. ``/contributions/``, +``/projects//``). The rewrite serves everything under ``/api/v1`` with +slightly different paths and verbs. This router is mounted at the root and: + +- 308-redirects every legacy endpoint that has a direct counterpart to its new + location (preserving method, body, and query string), and +- returns ``410 Gone`` with a machine-readable "deprecated" body for legacy + endpoints that have no equivalent in the new API (notebooks, the formula/term + search helpers, project-application approval links, and project creation). + +Redirects are permanent (308) so well-behaved clients update their bookmarks +while keeping the original HTTP method and request body intact. +""" + +from fastapi import APIRouter, Request +from fastapi.responses import JSONResponse, RedirectResponse +from starlette.status import HTTP_308_PERMANENT_REDIRECT, HTTP_410_GONE + +router = APIRouter(include_in_schema=False) + +# Base path of the new API. The legacy API lived at the service root. +API_V1 = "/api/v1" + + +def _redirect(request: Request, new_path: str) -> RedirectResponse: + """308-redirect to ``new_path`` under the v1 API, preserving the query string. + + 308 (rather than 301/302) keeps the original method and body, so a legacy + ``POST``/``PUT``/``DELETE`` is replayed against the new endpoint instead of + being silently downgraded to a ``GET``. + """ + target = f"{API_V1}{new_path}" + if request.url.query: + target = f"{target}?{request.url.query}" + return RedirectResponse(url=target, status_code=HTTP_308_PERMANENT_REDIRECT) + + +def _deprecated(message: str, *, replacement: str | None = None) -> JSONResponse: + """Return a ``410 Gone`` in the app's uniform error shape. + + Used for legacy endpoints that have no counterpart in the new API. + """ + detail: dict[str, str] = {} + if replacement is not None: + detail["replacement"] = replacement + body: dict = {"error": {"code": "endpoint_deprecated", "message": message}} + if detail: + body["error"]["detail"] = detail + return JSONResponse( + status_code=HTTP_410_GONE, + content=body, + headers={"Deprecation": "true"}, + ) + + +# --------------------------------------------------------------------------- +# contributions +# --------------------------------------------------------------------------- +@router.get("/contributions/search") +def redirect_contributions_search() -> JSONResponse: + # Formula autocomplete (Atlas $search) was not ported to the new API. + return _deprecated("The contributions formula search endpoint has been removed.") + + +@router.get("/contributions/download/{short_mime}/") +def redirect_download_contributions(request: Request, short_mime: str) -> RedirectResponse: + return _redirect(request, f"/contributions/download/{short_mime}") + + +@router.api_route("/contributions/", methods=["GET", "POST", "PUT", "DELETE"]) +def redirect_contributions_collection(request: Request) -> RedirectResponse: + # GET=list, POST=bulk insert, PUT=bulk upsert, DELETE=delete-by-filter. + return _redirect(request, "/contributions") + + +@router.api_route("/contributions/{pk}/", methods=["GET", "PUT", "DELETE"]) +def redirect_contribution_item(request: Request, pk: str) -> RedirectResponse: + # GET=fetch, PUT=update/upsert, DELETE=delete (all keyed by id). + return _redirect(request, f"/contributions/{pk}") + + +# --------------------------------------------------------------------------- +# projects +# --------------------------------------------------------------------------- +@router.get("/projects/search") +def redirect_projects_search() -> JSONResponse: + return _deprecated("The projects search endpoint has been removed.") + + +@router.get("/projects/applications/{token}") +@router.get("/projects/applications/{token}/{action}") +def redirect_projects_applications(token: str, action: str | None = None) -> JSONResponse: + # Email-driven project approval/denial links; not part of the new API. + return _deprecated("Project application approval links have been removed.") + + +@router.api_route("/projects/", methods=["GET", "POST"], response_model=None) +def redirect_projects_collection(request: Request) -> RedirectResponse | JSONResponse: + if request.method == "POST": + # No project-creation endpoint exists in the new API. + return _deprecated( + "Creating projects via POST is no longer supported. Create a project with PUT /api/v1/projects/{id}.", + replacement=f"{API_V1}/projects/{{id}}", + ) + return _redirect(request, "/projects") + + +@router.api_route("/projects/{pk}/", methods=["GET", "PUT", "DELETE"]) +def redirect_project_item(request: Request, pk: str) -> RedirectResponse: + # GET=fetch, PUT=update/upsert, DELETE=delete. + return _redirect(request, f"/projects/{pk}") + + +# --------------------------------------------------------------------------- +# Components +# --------------------------------------------------------------------------- +def _register_component_redirects(component: str) -> None: + @router.get(f"/{component}/download/{{short_mime}}/", name=f"redirect_download_{component}") + def redirect_download(request: Request, short_mime: str) -> RedirectResponse: + return _redirect(request, f"/{component}/download/{short_mime}") + + @router.get(f"/{component}/", name=f"redirect_{component}_collection") + def redirect_collection(request: Request) -> RedirectResponse: + return _redirect(request, f"/{component}") + + @router.get(f"/{component}/{{pk}}/", name=f"redirect_{component}_item") + def redirect_item(request: Request, pk: str) -> RedirectResponse: + return _redirect(request, f"/{component}/{pk}") + + +for _component in ("structures", "tables", "attachments"): + _register_component_redirects(_component) + + +# --------------------------------------------------------------------------- +# notebooks +# --------------------------------------------------------------------------- +_NOTEBOOKS_GONE = "The notebooks API has been removed." + + +@router.get("/notebooks/build") +def redirect_notebooks_build() -> JSONResponse: + return _deprecated(_NOTEBOOKS_GONE) + + +@router.get("/notebooks/result") +@router.get("/notebooks/result/{job_id}") +def redirect_notebooks_result(job_id: str | None = None) -> JSONResponse: + return _deprecated(_NOTEBOOKS_GONE) + + +@router.get("/notebooks/") +def redirect_notebooks_collection() -> JSONResponse: + return _deprecated(_NOTEBOOKS_GONE) + + +@router.get("/notebooks/{pk}/") +def redirect_notebooks_item(pk: str) -> JSONResponse: + return _deprecated(_NOTEBOOKS_GONE) diff --git a/mpcontribs-api/tests/integration/conftest.py b/mpcontribs-api/tests/integration/conftest.py index d46a85689d..c4be40b215 100644 --- a/mpcontribs-api/tests/integration/conftest.py +++ b/mpcontribs-api/tests/integration/conftest.py @@ -74,8 +74,12 @@ async def _noop_lifespan(app: FastAPI): register_exception_handlers(app) from mpcontribs_api.api.v1.router import router as v1_router + from mpcontribs_api.domains._redirects.router import router as redirects_router app.include_router(v1_router, prefix="/api/v1") + # Mounted last (root path), exactly as in the real app, so legacy-endpoint + # redirect/deprecation behaviour is exercised by integration tests. + app.include_router(redirects_router) return app diff --git a/mpcontribs-api/tests/integration/test_redirects.py b/mpcontribs-api/tests/integration/test_redirects.py new file mode 100644 index 0000000000..31f18f646d --- /dev/null +++ b/mpcontribs-api/tests/integration/test_redirects.py @@ -0,0 +1,143 @@ +"""Tests for the legacy-compatibility redirect/deprecation router. + +The legacy (Flask) API lived at the service root (e.g. ``/contributions/``); +the rewrite serves everything under ``/api/v1``. The redirects router mounted +at the root either 308-redirects to the new location (preserving method, body +and query string) or returns ``410 Gone`` for endpoints with no counterpart. +""" + +import pytest +from fastapi import FastAPI +from fastapi.testclient import TestClient + +from tests.integration.conftest import make_test_app + +# 308 keeps the method/body intact; assert it explicitly so a future change to +# 301/302 (which downgrade POST/PUT to GET) is caught. +PERMANENT_REDIRECT = 308 +GONE = 410 + + +@pytest.fixture(scope="module") +def app() -> FastAPI: + return make_test_app() + + +@pytest.fixture +def client(app: FastAPI): + """Client that does NOT auto-follow redirects, so we can assert on 3xx.""" + with TestClient(app, raise_server_exceptions=False, follow_redirects=False) as c: + yield c + + +# --------------------------------------------------------------------------- +# Redirects: legacy endpoints with a direct /api/v1 counterpart +# --------------------------------------------------------------------------- + +# (method, legacy_path, expected /api/v1 location) +REDIRECT_CASES = [ + # contributions + ("GET", "/contributions/", "/api/v1/contributions"), + ("POST", "/contributions/", "/api/v1/contributions"), + ("PUT", "/contributions/", "/api/v1/contributions"), + ("DELETE", "/contributions/", "/api/v1/contributions"), + ("GET", "/contributions/abc123/", "/api/v1/contributions/abc123"), + ("PUT", "/contributions/abc123/", "/api/v1/contributions/abc123"), + ("DELETE", "/contributions/abc123/", "/api/v1/contributions/abc123"), + ("GET", "/contributions/download/gz/", "/api/v1/contributions/download/gz"), + # projects (GET collection + item verbs) + ("GET", "/projects/", "/api/v1/projects"), + ("GET", "/projects/my-proj/", "/api/v1/projects/my-proj"), + ("PUT", "/projects/my-proj/", "/api/v1/projects/my-proj"), + ("DELETE", "/projects/my-proj/", "/api/v1/projects/my-proj"), + # read-only components + ("GET", "/structures/", "/api/v1/structures"), + ("GET", "/structures/sid/", "/api/v1/structures/sid"), + ("GET", "/structures/download/gz/", "/api/v1/structures/download/gz"), + ("GET", "/tables/", "/api/v1/tables"), + ("GET", "/tables/tid/", "/api/v1/tables/tid"), + ("GET", "/tables/download/gz/", "/api/v1/tables/download/gz"), + ("GET", "/attachments/", "/api/v1/attachments"), + ("GET", "/attachments/aid/", "/api/v1/attachments/aid"), + ("GET", "/attachments/download/gz/", "/api/v1/attachments/download/gz"), +] + + +class TestRedirects: + @pytest.mark.parametrize("method, legacy_path, new_path", REDIRECT_CASES) + def test_status_is_permanent_redirect(self, client, method, legacy_path, new_path): + r = client.request(method, legacy_path) + assert r.status_code == PERMANENT_REDIRECT + + @pytest.mark.parametrize("method, legacy_path, new_path", REDIRECT_CASES) + def test_location_points_to_v1(self, client, method, legacy_path, new_path): + r = client.request(method, legacy_path) + assert r.headers["location"] == new_path + + def test_query_string_is_preserved(self, client): + r = client.get("/contributions/?project=foo&_limit=5") + assert r.headers["location"] == "/api/v1/contributions?project=foo&_limit=5" + + def test_query_string_preserved_on_item(self, client): + r = client.get("/structures/sid/?_fields=id,label") + assert r.headers["location"] == "/api/v1/structures/sid?_fields=id,label" + + def test_download_query_preserved(self, client): + r = client.get("/tables/download/gz/?format=csv") + assert r.headers["location"] == "/api/v1/tables/download/gz?format=csv" + + def test_no_query_string_has_no_trailing_question_mark(self, client): + r = client.get("/projects/") + assert r.headers["location"] == "/api/v1/projects" + assert "?" not in r.headers["location"] + + +# --------------------------------------------------------------------------- +# Deprecations: legacy endpoints with no counterpart → 410 Gone +# --------------------------------------------------------------------------- + +# (method, legacy_path) +GONE_CASES = [ + # search helpers (Atlas $search) were not ported + ("GET", "/contributions/search"), + ("GET", "/projects/search"), + # project creation has no POST endpoint in the new API + ("POST", "/projects/"), + # email-driven application approval links + ("GET", "/projects/applications/sometoken"), + ("GET", "/projects/applications/sometoken/approve"), + ("GET", "/projects/applications/sometoken/deny"), + # the whole notebooks resource was dropped + ("GET", "/notebooks/"), + ("GET", "/notebooks/nbid/"), + ("GET", "/notebooks/build"), + ("GET", "/notebooks/result"), + ("GET", "/notebooks/result/job-1"), +] + + +class TestDeprecated: + @pytest.mark.parametrize("method, path", GONE_CASES) + def test_status_is_gone(self, client, method, path): + assert client.request(method, path).status_code == GONE + + @pytest.mark.parametrize("method, path", GONE_CASES) + def test_error_envelope(self, client, method, path): + body = client.request(method, path).json() + assert body["error"]["code"] == "endpoint_deprecated" + assert body["error"]["message"] + + @pytest.mark.parametrize("method, path", GONE_CASES) + def test_deprecation_header(self, client, method, path): + assert client.request(method, path).headers["deprecation"] == "true" + + def test_post_projects_points_at_put_replacement(self, client): + r = client.post("/projects/") + assert r.status_code == GONE + body = r.json() + assert body["error"]["detail"]["replacement"] == "/api/v1/projects/{id}" + + def test_deprecated_responses_are_not_redirects(self, client): + # A deprecated endpoint must never carry a Location header. + r = client.get("/notebooks/build") + assert "location" not in r.headers From 6cbc276686077919873cdc020eeeda001eb42e8f Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 25 Jun 2026 13:33:13 -0700 Subject: [PATCH 412/591] Added libsnappy back for snappy compression --- mpcontribs-api/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mpcontribs-api/Dockerfile b/mpcontribs-api/Dockerfile index 741922e7cb..48a24ebb16 100644 --- a/mpcontribs-api/Dockerfile +++ b/mpcontribs-api/Dockerfile @@ -4,7 +4,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends supervisor libo WORKDIR /app FROM base AS builder -RUN apt-get update && apt-get install -y --no-install-recommends gcc git g++ wget liblapack-dev && apt-get clean +RUN apt-get update && apt-get install -y --no-install-recommends gcc git g++ wget liblapack-dev libsnappy-dev && apt-get clean RUN pip install uv COPY pyproject.toml uv.lock ./ COPY src src From 534d2c4b87a767b5ea7eb263826f9650c4bfc9f0 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 25 Jun 2026 15:13:05 -0700 Subject: [PATCH 413/591] Added supervisor and python-snappy to deps --- mpcontribs-api/pyproject.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mpcontribs-api/pyproject.toml b/mpcontribs-api/pyproject.toml index bb45761135..9dfd350b5a 100644 --- a/mpcontribs-api/pyproject.toml +++ b/mpcontribs-api/pyproject.toml @@ -29,7 +29,6 @@ dependencies = [ # "pint>=0.24", # "psycopg2-binary", # "rq<=2.3.2", # see https://github.com/rq/Flask-RQ2/issues/620 - # "supervisor", # "setproctitle", # "uncertainties", # "websocket_client", @@ -49,6 +48,8 @@ dependencies = [ "aioboto3>=15.5.0", "types-aiobotocore[s3]>=3.7.0", "polars>=1.41.2", + "supervisor>=4.3.0", + "python-snappy>=0.7.3", ] [project.urls] From dcb2d9822eba1f1dc9122e543b48bb02e5b645ef Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 25 Jun 2026 15:14:34 -0700 Subject: [PATCH 414/591] Made the uv sync no-editable so .pth doesn't cause an error referencing a non-existent location --- mpcontribs-api/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mpcontribs-api/Dockerfile b/mpcontribs-api/Dockerfile index 48a24ebb16..f254a8c601 100644 --- a/mpcontribs-api/Dockerfile +++ b/mpcontribs-api/Dockerfile @@ -9,7 +9,7 @@ RUN pip install uv COPY pyproject.toml uv.lock ./ COPY src src ARG CONTRIBS_VERSION -RUN SETUPTOOLS_SCM_PRETEND_VERSION=${CONTRIBS_VERSION} uv sync --frozen --no-dev +RUN SETUPTOOLS_SCM_PRETEND_VERSION=${CONTRIBS_VERSION} uv sync --frozen --no-dev --no-editable RUN wget -q https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh && \ chmod +x wait-for-it.sh && mv wait-for-it.sh /usr/local/bin/ From 2806d66030a39e471638b3787833c584ada63b8e Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 25 Jun 2026 15:36:06 -0700 Subject: [PATCH 415/591] Added --workers parameterization --- mpcontribs-api/scripts/start.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/mpcontribs-api/scripts/start.sh b/mpcontribs-api/scripts/start.sh index 631f570149..1452743286 100755 --- a/mpcontribs-api/scripts/start.sh +++ b/mpcontribs-api/scripts/start.sh @@ -10,6 +10,4 @@ PMGRC=$HOME/.pmgrc.yaml set -x -# No wait for the OTLP collector: the OTEL batch processors tolerate an unavailable endpoint -# (they retry and drop), so startup must not block on it. -exec uvicorn mpcontribs_api.app:app --host 0.0.0.0 --port "$API_PORT" +exec uvicorn mpcontribs_api.app:app --host 0.0.0.0 --port "$API_PORT" --workers "${NWORKERS:-2}" From 7293b63889873f523310037cc46f8d9b1b3dca2a Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 25 Jun 2026 15:37:00 -0700 Subject: [PATCH 416/591] Brought supervisor up to current use practices --- mpcontribs-api/supervisord/conf.py | 25 +++----- .../supervisord/supervisord.conf.jinja | 15 ----- mpcontribs-api/uv.lock | 63 +++++++++++++++++++ 3 files changed, 71 insertions(+), 32 deletions(-) diff --git a/mpcontribs-api/supervisord/conf.py b/mpcontribs-api/supervisord/conf.py index 9e4070a382..6869eb183b 100644 --- a/mpcontribs-api/supervisord/conf.py +++ b/mpcontribs-api/supervisord/conf.py @@ -4,22 +4,19 @@ DIR = os.path.abspath(os.path.dirname(__file__)) PRODUCTION = int(os.environ.get("PRODUCTION", "1")) -DEFAULT_NWORKERS = 2 if PRODUCTION else 1 -NWORKERS = int(os.environ.get("NWORKERS", DEFAULT_NWORKERS)) -KG_PORT = 10100 +# uvicorn worker count per API process. Same default in dev and prod; override via the NWORKERS env var. +NWORKERS = int(os.environ.get("NWORKERS", "2")) deployments = {} -for deployment in os.environ.get("DEPLOYMENTS", "ml:10002").split(","): - name, db, s3, tm, max_projects, api_port = deployment.split(":") - portal_port = 8080 + int(api_port) % 10000 +# DEPLOYMENTS entries are "name:db:s3:tm:max_projects:api_port" — the format is an external +# deployment contract (also parsed by scripts/healthchecks.py). Only name, db, and api_port are +# consumed today; s3/tm/max_projects are Flask/portal-era fields kept for format compatibility. +for deployment in os.environ.get("DEPLOYMENTS", "ml:ml:ml:MP:3:10002").split(","): + name, db, _s3, _tm, _max_projects, api_port = deployment.split(":") deployments[name] = { "api_port": api_port, - "portal_port": portal_port, "db": db, - "s3": s3, - "tm": tm.upper(), - "max_projects": int(max_projects) if max_projects else 3, } kwargs = { @@ -29,17 +26,11 @@ # MPCONTRIBS_VERSION is required by Settings; sourced from the image build arg at container start. "version": os.environ.get("CONTRIBS_VERSION", os.environ.get("MPCONTRIBS_VERSION", "0.0.0")), "deployments": deployments, + # Consumed by scripts/start.sh: both dev and prod run `uvicorn --workers $NWORKERS`. "nworkers": NWORKERS, - "reload": int(not PRODUCTION), - "node_env": "production" if PRODUCTION else "development", - "flask_log_level": "INFO" if PRODUCTION else "DEBUG", - "jupyter_gateway_host": f"localhost:{KG_PORT}" if PRODUCTION else f"kernel-gateway:{KG_PORT}", # OTLP/gRPC receiver: the Datadog Agent sidecar in prod, the "datadog" compose service in dev. "otel_endpoint": "localhost:4317" if PRODUCTION else "datadog:4317", - "mpcontribs_api_host": "localhost" if PRODUCTION else "contribs-apis", } -kwargs["flask_debug"] = kwargs["node_env"] == "development" -kwargs["jupyter_gateway_url"] = "http://" + kwargs["jupyter_gateway_host"] env = Environment(loader=FileSystemLoader(DIR)) template = env.get_template("supervisord.conf.jinja") diff --git a/mpcontribs-api/supervisord/supervisord.conf.jinja b/mpcontribs-api/supervisord/supervisord.conf.jinja index b2e7e913de..f35013a80f 100644 --- a/mpcontribs-api/supervisord/supervisord.conf.jinja +++ b/mpcontribs-api/supervisord/supervisord.conf.jinja @@ -18,15 +18,7 @@ environment= AWS_DEFAULT_REGION="us-east-1", MPCONTRIBS_MAIL_DEFAULT_SENDER="contribs@materialsproject.org", PYTHONUNBUFFERED=1, - MAX_REQUESTS=0, - MAX_REQUESTS_JITTER=0, NWORKERS={{ nworkers }}, - RELOAD={{ reload }}, - NODE_ENV="{{ node_env }}", - FLASK_DEBUG="{{ flask_debug }}", - FLASK_LOG_LEVEL="{{ flask_log_level }}", - JUPYTER_GATEWAY_URL="{{ jupyter_gateway_url }}", - JUPYTER_GATEWAY_HOST="{{ jupyter_gateway_host }}", MPCONTRIBS_OTEL__OTLP_ENDPOINT="{{ otel_endpoint }}", TINI_SUBREAPER="true" @@ -72,14 +64,7 @@ stderr_logfile_maxbytes=0 environment= DEPLOYMENT={{ loop.index0 }}, API_PORT={{ cfg.api_port }}, - PORTAL_PORT={{ cfg.portal_port }}, - MPCONTRIBS_API_HOST="{{ mpcontribs_api_host }}:{{ cfg.api_port }}", MPCONTRIBS_MONGO__DB_NAME="mpcontribs-{{ cfg.db }}", - TRADEMARK="{{ cfg.tm }}", - MAX_PROJECTS={{ cfg.max_projects }}, - S3_DOWNLOADS_BUCKET="mpcontribs-downloads-{{ cfg.s3 }}", - S3_ATTACHMENTS_BUCKET="mpcontribs-attachments-{{ cfg.s3 }}", - S3_IMAGES_BUCKET="mpcontribs-images-{{ cfg.s3 }}", MPCONTRIBS_MONGO__ADMIN_GROUP="admin_{{ deployment }}.materialsproject.org" {% endset %} diff --git a/mpcontribs-api/uv.lock b/mpcontribs-api/uv.lock index 7aab864368..008b2c5eeb 100644 --- a/mpcontribs-api/uv.lock +++ b/mpcontribs-api/uv.lock @@ -368,6 +368,44 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/ae/8c/469afb6465b853afff216f9528ffda78a915ff880ed58813ba4faf4ba0b6/contourpy-1.3.3-cp314-cp314t-win_arm64.whl", hash = "sha256:b7448cb5a725bb1e35ce88771b86fba35ef418952474492cf7c764059933ff8b", size = 203831, upload-time = "2025-07-26T12:02:51.449Z" }, ] +[[package]] +name = "cramjam" +version = "2.11.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/14/12/34bf6e840a79130dfd0da7badfb6f7810b8fcfd60e75b0539372667b41b6/cramjam-2.11.0.tar.gz", hash = "sha256:5c82500ed91605c2d9781380b378397012e25127e89d64f460fea6aeac4389b4", size = 99100, upload-time = "2025-07-27T21:25:07.559Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/de/07/a1051cdbbe6d723df16d756b97f09da7c1adb69e29695c58f0392bc12515/cramjam-2.11.0-cp314-cp314-macosx_10_12_x86_64.macosx_11_0_arm64.macosx_10_12_universal2.whl", hash = "sha256:7ba5e38c9fbd06f086f4a5a64a1a5b7b417cd3f8fc07a20e5c03651f72f36100", size = 3554141, upload-time = "2025-07-27T21:23:17.938Z" }, + { url = "https://files.pythonhosted.org/packages/74/66/58487d2e16ef3d04f51a7c7f0e69823e806744b4c21101e89da4873074bc/cramjam-2.11.0-cp314-cp314-macosx_10_12_x86_64.whl", hash = "sha256:b8adeee57b41fe08e4520698a4b0bd3cc76dbd81f99424b806d70a5256a391d3", size = 1860353, upload-time = "2025-07-27T21:23:19.593Z" }, + { url = "https://files.pythonhosted.org/packages/67/b4/67f6254d166ffbcc9d5fa1b56876eaa920c32ebc8e9d3d525b27296b693b/cramjam-2.11.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:b96a74fa03a636c8a7d76f700d50e9a8bc17a516d6a72d28711225d641e30968", size = 1693832, upload-time = "2025-07-27T21:23:21.185Z" }, + { url = "https://files.pythonhosted.org/packages/55/a3/4e0b31c0d454ae70c04684ed7c13d3c67b4c31790c278c1e788cb804fa4a/cramjam-2.11.0-cp314-cp314-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:c3811a56fa32e00b377ef79121c0193311fd7501f0fb378f254c7f083cc1fbe0", size = 2027080, upload-time = "2025-07-27T21:23:23.303Z" }, + { url = "https://files.pythonhosted.org/packages/d9/c7/5e8eed361d1d3b8be14f38a54852c5370cc0ceb2c2d543b8ba590c34f080/cramjam-2.11.0-cp314-cp314-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c5d927e87461f8a0d448e4ab5eb2bca9f31ca5d8ea86d70c6f470bb5bc666d7e", size = 1761543, upload-time = "2025-07-27T21:23:24.991Z" }, + { url = "https://files.pythonhosted.org/packages/09/0c/06b7f8b0ce9fde89470505116a01fc0b6cb92d406c4fb1e46f168b5d3fa5/cramjam-2.11.0-cp314-cp314-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:f1f5c450121430fd89cb5767e0a9728ecc65997768fd4027d069cb0368af62f9", size = 1854636, upload-time = "2025-07-27T21:23:26.987Z" }, + { url = "https://files.pythonhosted.org/packages/6f/c6/6ebc02c9d5acdf4e5f2b1ec6e1252bd5feee25762246798ae823b3347457/cramjam-2.11.0-cp314-cp314-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:724aa7490be50235d97f07e2ca10067927c5d7f336b786ddbc868470e822aa25", size = 2032715, upload-time = "2025-07-27T21:23:28.603Z" }, + { url = "https://files.pythonhosted.org/packages/a2/77/a122971c23f5ca4b53e4322c647ac7554626c95978f92d19419315dddd05/cramjam-2.11.0-cp314-cp314-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:54c4637122e7cfd7aac5c1d3d4c02364f446d6923ea34cf9d0e8816d6e7a4936", size = 2069039, upload-time = "2025-07-27T21:23:30.319Z" }, + { url = "https://files.pythonhosted.org/packages/19/0f/f6121b90b86b9093c066889274d26a1de3f29969d45c2ed1ecbe2033cb78/cramjam-2.11.0-cp314-cp314-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:17eb39b1696179fb471eea2de958fa21f40a2cd8bf6b40d428312d5541e19dc4", size = 1979566, upload-time = "2025-07-27T21:23:32.002Z" }, + { url = "https://files.pythonhosted.org/packages/e0/a3/f95bc57fd7f4166ce6da816cfa917fb7df4bb80e669eb459d85586498414/cramjam-2.11.0-cp314-cp314-musllinux_1_1_aarch64.whl", hash = "sha256:36aa5a798aa34e11813a80425a30d8e052d8de4a28f27bfc0368cfc454d1b403", size = 2030905, upload-time = "2025-07-27T21:23:33.696Z" }, + { url = "https://files.pythonhosted.org/packages/fc/52/e429de4e8bc86ee65e090dae0f87f45abd271742c63fb2d03c522ffde28a/cramjam-2.11.0-cp314-cp314-musllinux_1_1_armv7l.whl", hash = "sha256:449fca52774dc0199545fbf11f5128933e5a6833946707885cf7be8018017839", size = 2155592, upload-time = "2025-07-27T21:23:35.375Z" }, + { url = "https://files.pythonhosted.org/packages/6c/6c/65a7a0207787ad39ad804af4da7f06a60149de19481d73d270b540657234/cramjam-2.11.0-cp314-cp314-musllinux_1_1_i686.whl", hash = "sha256:d87d37b3d476f4f7623c56a232045d25bd9b988314702ea01bd9b4a94948a778", size = 2170839, upload-time = "2025-07-27T21:23:37.197Z" }, + { url = "https://files.pythonhosted.org/packages/b2/c5/5c5db505ba692bc844246b066e23901d5905a32baf2f33719c620e65887f/cramjam-2.11.0-cp314-cp314-musllinux_1_1_x86_64.whl", hash = "sha256:26cb45c47d71982d76282e303931c6dd4baee1753e5d48f9a89b3a63e690b3a3", size = 2157236, upload-time = "2025-07-27T21:23:38.854Z" }, + { url = "https://files.pythonhosted.org/packages/b0/22/88e6693e60afe98901e5bbe91b8dea193e3aa7f42e2770f9c3339f5c1065/cramjam-2.11.0-cp314-cp314-win32.whl", hash = "sha256:4efe919d443c2fd112fe25fe636a52f9628250c9a50d9bddb0488d8a6c09acc6", size = 1604136, upload-time = "2025-07-27T21:23:40.56Z" }, + { url = "https://files.pythonhosted.org/packages/cc/f8/01618801cd59ccedcc99f0f96d20be67d8cfc3497da9ccaaad6b481781dd/cramjam-2.11.0-cp314-cp314-win_amd64.whl", hash = "sha256:ccec3524ea41b9abd5600e3e27001fd774199dbb4f7b9cb248fcee37d4bda84c", size = 1710272, upload-time = "2025-07-27T21:23:42.236Z" }, + { url = "https://files.pythonhosted.org/packages/40/81/6cdb3ed222d13ae86bda77aafe8d50566e81a1169d49ed195b6263610704/cramjam-2.11.0-cp314-cp314t-macosx_10_12_x86_64.macosx_11_0_arm64.macosx_10_12_universal2.whl", hash = "sha256:966ac9358b23d21ecd895c418c048e806fd254e46d09b1ff0cdad2eba195ea3e", size = 3559671, upload-time = "2025-07-27T21:23:44.504Z" }, + { url = "https://files.pythonhosted.org/packages/cb/43/52b7e54fe5ba1ef0270d9fdc43dabd7971f70ea2d7179be918c997820247/cramjam-2.11.0-cp314-cp314t-macosx_10_12_x86_64.whl", hash = "sha256:387f09d647a0d38dcb4539f8a14281f8eb6bb1d3e023471eb18a5974b2121c86", size = 1867876, upload-time = "2025-07-27T21:23:46.987Z" }, + { url = "https://files.pythonhosted.org/packages/9d/28/30d5b8d10acd30db3193bc562a313bff722888eaa45cfe32aa09389f2b24/cramjam-2.11.0-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:665b0d8fbbb1a7f300265b43926457ec78385200133e41fef19d85790fc1e800", size = 1695562, upload-time = "2025-07-27T21:23:48.644Z" }, + { url = "https://files.pythonhosted.org/packages/d9/86/ec806f986e01b896a650655024ea52a13e25c3ac8a3a382f493089483cdc/cramjam-2.11.0-cp314-cp314t-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:ca905387c7a371531b9622d93471be4d745ef715f2890c3702479cd4fc85aa51", size = 2025056, upload-time = "2025-07-27T21:23:50.404Z" }, + { url = "https://files.pythonhosted.org/packages/09/43/c2c17586b90848d29d63181f7d14b8bd3a7d00975ad46e3edf2af8af7e1f/cramjam-2.11.0-cp314-cp314t-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3c1aa56aef2c8af55a21ed39040a94a12b53fb23beea290f94d19a76027e2ffb", size = 1764084, upload-time = "2025-07-27T21:23:52.265Z" }, + { url = "https://files.pythonhosted.org/packages/2b/a9/68bc334fadb434a61df10071dc8606702aa4f5b6cdb2df62474fc21d2845/cramjam-2.11.0-cp314-cp314t-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:e5db59c1cdfaa2ab85cc988e602d6919495f735ca8a5fd7603608eb1e23c26d5", size = 1854859, upload-time = "2025-07-27T21:23:54.085Z" }, + { url = "https://files.pythonhosted.org/packages/5b/4e/b48e67835b5811ec5e9cb2e2bcba9c3fd76dab3e732569fe801b542c6ca9/cramjam-2.11.0-cp314-cp314t-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:b1f893014f00fe5e89a660a032e813bf9f6d91de74cd1490cdb13b2b59d0c9a3", size = 2035970, upload-time = "2025-07-27T21:23:55.758Z" }, + { url = "https://files.pythonhosted.org/packages/c4/70/d2ac33d572b4d90f7f0f2c8a1d60fb48f06b128fdc2c05f9b49891bb0279/cramjam-2.11.0-cp314-cp314t-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c26a1eb487947010f5de24943bd7c422dad955b2b0f8650762539778c380ca89", size = 2069320, upload-time = "2025-07-27T21:23:57.494Z" }, + { url = "https://files.pythonhosted.org/packages/1d/4c/85cec77af4a74308ba5fca8e296c4e2f80ec465c537afc7ab1e0ca2f9a00/cramjam-2.11.0-cp314-cp314t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7d5c8bfb438d94e7b892d1426da5fc4b4a5370cc360df9b8d9d77c33b896c37e", size = 1982668, upload-time = "2025-07-27T21:23:59.126Z" }, + { url = "https://files.pythonhosted.org/packages/55/45/938546d1629e008cc3138df7c424ef892719b1796ff408a2ab8550032e5e/cramjam-2.11.0-cp314-cp314t-musllinux_1_1_aarch64.whl", hash = "sha256:cb1fb8c9337ab0da25a01c05d69a0463209c347f16512ac43be5986f3d1ebaf4", size = 2034028, upload-time = "2025-07-27T21:24:00.865Z" }, + { url = "https://files.pythonhosted.org/packages/01/76/b5a53e20505555f1640e66dcf70394bcf51a1a3a072aa18ea35135a0f9ed/cramjam-2.11.0-cp314-cp314t-musllinux_1_1_armv7l.whl", hash = "sha256:1f6449f6de52dde3e2f1038284910c8765a397a25e2d05083870f3f5e7fc682c", size = 2155513, upload-time = "2025-07-27T21:24:02.92Z" }, + { url = "https://files.pythonhosted.org/packages/84/12/8d3f6ceefae81bbe45a347fdfa2219d9f3ac75ebc304f92cd5fcb4fbddc5/cramjam-2.11.0-cp314-cp314t-musllinux_1_1_i686.whl", hash = "sha256:382dec4f996be48ed9c6958d4e30c2b89435d7c2c4dbf32480b3b8886293dd65", size = 2170035, upload-time = "2025-07-27T21:24:04.558Z" }, + { url = "https://files.pythonhosted.org/packages/4b/85/3be6f0a1398f976070672be64f61895f8839857618a2d8cc0d3ab529d3dc/cramjam-2.11.0-cp314-cp314t-musllinux_1_1_x86_64.whl", hash = "sha256:d388bd5723732c3afe1dd1d181e4213cc4e1be210b080572e7d5749f6e955656", size = 2160229, upload-time = "2025-07-27T21:24:06.729Z" }, + { url = "https://files.pythonhosted.org/packages/57/5e/66cfc3635511b20014bbb3f2ecf0095efb3049e9e96a4a9e478e4f3d7b78/cramjam-2.11.0-cp314-cp314t-win32.whl", hash = "sha256:0a70ff17f8e1d13f322df616505550f0f4c39eda62290acb56f069d4857037c8", size = 1610267, upload-time = "2025-07-27T21:24:08.428Z" }, + { url = "https://files.pythonhosted.org/packages/ce/c6/c71e82e041c95ffe6a92ac707785500aa2a515a4339c2c7dd67e3c449249/cramjam-2.11.0-cp314-cp314t-win_amd64.whl", hash = "sha256:028400d699442d40dbda02f74158c73d05cb76587a12490d0bfedd958fd49188", size = 1713108, upload-time = "2025-07-27T21:24:10.147Z" }, +] + [[package]] name = "cycler" version = "0.12.1" @@ -981,7 +1019,9 @@ dependencies = [ { name = "pydantic-settings" }, { name = "pymatgen" }, { name = "pymongo" }, + { name = "python-snappy" }, { name = "structlog" }, + { name = "supervisor" }, { name = "types-aiobotocore", extra = ["s3"] }, ] @@ -1011,7 +1051,9 @@ requires-dist = [ { name = "pydantic-settings", specifier = ">=2.14.1" }, { name = "pymatgen" }, { name = "pymongo", specifier = ">=4.17.0" }, + { name = "python-snappy", specifier = ">=0.7.3" }, { name = "structlog", specifier = ">=25.5.0" }, + { name = "supervisor", specifier = ">=4.3.0" }, { name = "types-aiobotocore", extras = ["s3"], specifier = ">=3.7.0" }, ] @@ -1767,6 +1809,18 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/1c/fd/0318007beb234790993d3ec5afd051d1dbceb733e81e3afe2b981ece3f37/python_multipart-0.0.30-py3-none-any.whl", hash = "sha256:830964def8c90607ac5daa00514e3987815865713ade8d20febc9177ac0c3c5b", size = 29730, upload-time = "2026-05-31T19:24:53.814Z" }, ] +[[package]] +name = "python-snappy" +version = "0.7.3" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "cramjam" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/39/66/9185fbb6605ba92716d9f77fbb13c97eb671cd13c3ad56bd154016fbf08b/python_snappy-0.7.3.tar.gz", hash = "sha256:40216c1badfb2d38ac781ecb162a1d0ec40f8ee9747e610bcfefdfa79486cee3", size = 9337, upload-time = "2024-08-29T13:16:05.705Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/86/c1/0ee413ddd639aebf22c85d6db39f136ccc10e6a4b4dd275a92b5c839de8d/python_snappy-0.7.3-py3-none-any.whl", hash = "sha256:074c0636cfcd97e7251330f428064050ac81a52c62ed884fc2ddebbb60ed7f50", size = 9155, upload-time = "2024-08-29T13:16:04.773Z" }, +] + [[package]] name = "pyyaml" version = "6.0.3" @@ -2022,6 +2076,15 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/a8/45/a132b9074aa18e799b891b91ad72133c98d8042c70f6240e4c5f9dabee2f/structlog-25.5.0-py3-none-any.whl", hash = "sha256:a8453e9b9e636ec59bd9e79bbd4a72f025981b3ba0f5837aebf48f02f37a7f9f", size = 72510, upload-time = "2025-10-27T08:28:21.535Z" }, ] +[[package]] +name = "supervisor" +version = "4.3.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/a9/b5/37e7a3706de436a8a2d75334711dad1afb4ddffab09f25e31d89e467542f/supervisor-4.3.0.tar.gz", hash = "sha256:4a2bf149adf42997e1bb44b70c43b613275ec9852c3edacca86a9166b27e945e", size = 468912, upload-time = "2025-08-23T18:25:02.418Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/0e/65/5e726c372da8a5e35022a94388b12252710aad0c2351699c3d76ae8dba78/supervisor-4.3.0-py2.py3-none-any.whl", hash = "sha256:0bcb763fddafba410f35cbde226aa7f8514b9fb82eb05a0c85f6588d1c13f8db", size = 320736, upload-time = "2025-08-23T18:25:00.767Z" }, +] + [[package]] name = "sympy" version = "1.14.0" From 681c7414d5ddf557ea63b9d20dabe5a53c1490cf Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 25 Jun 2026 15:49:43 -0700 Subject: [PATCH 417/591] Moved log headers into access log specification to avoid duplication of logged info --- .../src/mpcontribs_api/middleware.py | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/middleware.py b/mpcontribs-api/src/mpcontribs_api/middleware.py index 152fa6e3fb..6a5c674366 100644 --- a/mpcontribs-api/src/mpcontribs_api/middleware.py +++ b/mpcontribs-api/src/mpcontribs_api/middleware.py @@ -37,13 +37,11 @@ "id": os.getpid(), } -# Lowercased ASGI byte header name -> structlog context key. -_LOGGED_HEADERS: dict[bytes, str] = { - b"user-agent": "user_agent", +# Optional request headers folded into the access log's ``http.*`` block, only when sent. +_ACCESS_LOG_HEADERS: dict[bytes, str] = { b"accept": "accept", b"accept-language": "accept_language", b"accept-encoding": "accept_encoding", - b"referer": "referer", b"content-type": "content_type", b"content-length": "content_length", } @@ -83,10 +81,6 @@ async def __call__(self, scope: Scope, receive: Receive, send: Send) -> None: raw_consumer_id = headers.get(b"x-consumer-id") if raw_consumer_id is not None: context["consumer_id"] = raw_consumer_id.decode() - for header_name, log_key in _LOGGED_HEADERS.items(): - value = headers.get(header_name) - if value is not None: - context[log_key] = value.decode("latin-1") structlog.contextvars.clear_contextvars() structlog.contextvars.bind_contextvars(**context) @@ -134,16 +128,22 @@ def _emit_access_log( client = scope.get("client") client_ip = forwarded_for.split(",")[0].strip() if forwarded_for else (client[0] if client else "") + http: dict[str, object] = { + "method": scope["method"], + "status_code": status_code, + "url": url, + "referer": headers.get(b"referer", b"-").decode("latin-1"), + "useragent": headers.get(b"user-agent", b"").decode("latin-1"), + "version": scope.get("http_version", "1.1"), + } + for header_name, http_key in _ACCESS_LOG_HEADERS.items(): + value = headers.get(header_name) + if value is not None: + http[http_key] = value.decode("latin-1") + _access_logger.info( "http.access", - http={ - "method": scope["method"], - "status_code": status_code, - "url": url, - "referer": headers.get(b"referer", b"-").decode("latin-1"), - "useragent": headers.get(b"user-agent", b"").decode("latin-1"), - "version": scope.get("http_version", "1.1"), - }, + http=http, network={"bytes_written": bytes_written, "client": {"ip": client_ip}}, duration=duration_ns, # Datadog standard `duration` is nanoseconds response_time=duration_ns // 1000, # microseconds, matches the old gunicorn %(D)s From 91b9edaa654b5ca0d99e475ad86472dba5eee531 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Fri, 26 Jun 2026 09:45:12 -0700 Subject: [PATCH 418/591] Added jinja2 back to dependencies and sorted deps --- mpcontribs-api/pyproject.toml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/mpcontribs-api/pyproject.toml b/mpcontribs-api/pyproject.toml index 9dfd350b5a..87f12d487a 100644 --- a/mpcontribs-api/pyproject.toml +++ b/mpcontribs-api/pyproject.toml @@ -25,7 +25,6 @@ authors = [ {name="The Materials Project", email="feedback@materialsproject.org"}, ] dependencies = [ - # "jinja2", # "pint>=0.24", # "psycopg2-binary", # "rq<=2.3.2", # see https://github.com/rq/Flask-RQ2/issues/620 @@ -33,23 +32,24 @@ dependencies = [ # "uncertainties", # "websocket_client", # "zstandard", + "aioboto3>=15.5.0", + "beanie>=2.1.0", "fastapi[standard]>=0.136.3", - "pymatgen", - "pymongo>=4.17.0", - "pydantic-settings>=2.14.1", - "structlog>=25.5.0", + "fastapi-filter>=2.0.1", + "jinja2", "opentelemetry-api>=1.42.1", - "opentelemetry-sdk>=1.42.1", "opentelemetry-exporter-otlp-proto-grpc>=1.42.1", "opentelemetry-instrumentation-fastapi>=0.63b1", "opentelemetry-instrumentation-pymongo>=0.63b1", - "beanie>=2.1.0", - "fastapi-filter>=2.0.1", - "aioboto3>=15.5.0", - "types-aiobotocore[s3]>=3.7.0", + "opentelemetry-sdk>=1.42.1", "polars>=1.41.2", - "supervisor>=4.3.0", + "pydantic-settings>=2.14.1", + "pymatgen", + "pymongo>=4.17.0", "python-snappy>=0.7.3", + "structlog>=25.5.0", + "supervisor>=4.3.0", + "types-aiobotocore[s3]>=3.7.0", ] [project.urls] From bd7f8113c66606f7271a9325d5d13c66b14b6e1c Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Fri, 26 Jun 2026 10:24:50 -0700 Subject: [PATCH 419/591] Build uv venv outside of app so dependencies load properly --- mpcontribs-api/Dockerfile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/mpcontribs-api/Dockerfile b/mpcontribs-api/Dockerfile index f254a8c601..0e68e27786 100644 --- a/mpcontribs-api/Dockerfile +++ b/mpcontribs-api/Dockerfile @@ -6,6 +6,10 @@ WORKDIR /app FROM base AS builder RUN apt-get update && apt-get install -y --no-install-recommends gcc git g++ wget liblapack-dev libsnappy-dev && apt-get clean RUN pip install uv +# Build the venv OUTSIDE /app: docker-compose bind-mounts the host source over +# /app for live reload, which would mask a /app/.venv and leave `python` falling +# back to the system interpreter (missing deps) +ENV UV_PROJECT_ENVIRONMENT=/opt/venv COPY pyproject.toml uv.lock ./ COPY src src ARG CONTRIBS_VERSION @@ -15,8 +19,8 @@ RUN wget -q https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait- FROM base ARG BUILDARCH -ENV BUILDARCH=x86_64 -COPY --from=builder /app/.venv /app/.venv +ARG BUILDARCH=aarch64 +COPY --from=builder /opt/venv /opt/venv COPY --from=builder /usr/local/bin/wait-for-it.sh /usr/local/bin/ WORKDIR /app @@ -32,7 +36,7 @@ ARG VERSION # Telemetry (traces/metrics/logs) is emitted via OTLP to the Datadog Agent's OTLP receiver; the # endpoint and other OTEL settings are configured per-environment in supervisord.conf.jinja # (MPCONTRIBS_OTEL__*). No Datadog-specific app config lives here. -ENV PATH="/app/.venv/bin:$PATH" +ENV PATH="/opt/venv/bin:$PATH" EXPOSE 10000 10002 10003 10005 20000 ENTRYPOINT ["/app/docker-entrypoint.sh"] From 9c4fa9cb3ac11f033145cdc425d6a3e461763ad5 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Fri, 26 Jun 2026 11:46:05 -0700 Subject: [PATCH 420/591] Fixed env var names to match new format --- mpcontribs-api/supervisord/supervisord.conf.jinja | 4 ---- 1 file changed, 4 deletions(-) diff --git a/mpcontribs-api/supervisord/supervisord.conf.jinja b/mpcontribs-api/supervisord/supervisord.conf.jinja index f35013a80f..4e26c0117a 100644 --- a/mpcontribs-api/supervisord/supervisord.conf.jinja +++ b/mpcontribs-api/supervisord/supervisord.conf.jinja @@ -6,14 +6,11 @@ pidfile=/tmp/supervisord.pid environment= MPCONTRIBS_ENVIRONMENT="{{ environment }}", MPCONTRIBS_VERSION="{{ version }}", - MPCONTRIBS_MONGO__URI="%(ENV_MPCONTRIBS_MONGO__URI)s", {% if not production %} AWS_ACCESS_KEY_ID="%(ENV_AWS_ACCESS_KEY_ID)s", AWS_SECRET_ACCESS_KEY="%(ENV_AWS_SECRET_ACCESS_KEY)s", {% endif %} METADATA_URI="%(ENV_ECS_CONTAINER_METADATA_URI_V4)s", - MPCONTRIBS_REDIS__ADDRESS="%(ENV_REDIS_ADDRESS)s", - MPCONTRIBS_REDIS__URL="%(ENV_REDIS_URL)s", AWS_REGION="us-east-1", AWS_DEFAULT_REGION="us-east-1", MPCONTRIBS_MAIL_DEFAULT_SENDER="contribs@materialsproject.org", @@ -64,7 +61,6 @@ stderr_logfile_maxbytes=0 environment= DEPLOYMENT={{ loop.index0 }}, API_PORT={{ cfg.api_port }}, - MPCONTRIBS_MONGO__DB_NAME="mpcontribs-{{ cfg.db }}", MPCONTRIBS_MONGO__ADMIN_GROUP="admin_{{ deployment }}.materialsproject.org" {% endset %} From 3e3974f2b6a2bfbd39b278b3c1634eb9810ee147 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 29 Jun 2026 10:53:23 -0700 Subject: [PATCH 421/591] Added shared BaseFilter to convert from Beanie's aliased 'id' to real Mongo '_id' --- .../mpcontribs_api/domains/_shared/filters.py | 23 ++++++++++ .../domains/attachments/models.py | 6 +-- .../domains/contributions/models.py | 6 +-- .../mpcontribs_api/domains/projects/models.py | 6 +-- .../domains/structures/models.py | 6 +-- .../mpcontribs_api/domains/tables/models.py | 6 +-- .../db/test_projects_repository.py | 46 +++++++++++++++++++ mpcontribs-api/uv.lock | 2 + 8 files changed, 86 insertions(+), 15 deletions(-) create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/_shared/filters.py diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/filters.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/filters.py new file mode 100644 index 0000000000..027d25dfb5 --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/filters.py @@ -0,0 +1,23 @@ +from collections.abc import Mapping +from typing import Any + +from fastapi_filter.contrib.beanie import Filter + + +class BaseFilter(Filter): + """Base filter that bridges Beanie's ``_id`` alias and fastapi-filter's raw field names. + + Beanie stores a document's primary key under Mongo's ``_id`` (``id`` is just a Pydantic alias), + but fastapi-filter builds query keys from the raw field name read off ``model_dump`` — without + aliases. An ``id`` filter would therefore query a non-existent ``{"id": ...}`` key and match + nothing, while a direct ``Document.id == x`` lookup (which Beanie resolves to ``_id``) succeeds. + Remapping the ``id`` key to ``_id`` here keeps the two read paths consistent. + + Domain filters should subclass this instead of fastapi-filter's ``Filter`` directly. + """ + + def _get_filter_conditions(self, nesting_depth: int = 1) -> list[tuple[Mapping[str, Any], Mapping[str, Any]]]: + return [ + ({"_id" if key == "id" else key: value for key, value in condition.items()}, options) + for condition, options in super()._get_filter_conditions(nesting_depth) + ] diff --git a/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py b/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py index 7f5863706d..4d7375837b 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py @@ -1,7 +1,7 @@ from beanie import PydanticObjectId -from fastapi_filter.contrib.beanie import Filter from pydantic import field_validator +from mpcontribs_api.domains._shared.filters import BaseFilter from mpcontribs_api.domains._shared.models import Component, ComponentIn, DocumentOut from mpcontribs_api.domains._shared.types import FileLike, MD5Hash, MimeFormat from mpcontribs_api.exceptions import ValidationError @@ -64,7 +64,7 @@ class AttachmentPatch(SparseFieldsModel): content: int | None = None -class AttachmentFilter(Filter): +class AttachmentFilter(BaseFilter): id: PydanticObjectId | None = None id__in: list[PydanticObjectId] | None = None id__neq: PydanticObjectId | None = None @@ -86,5 +86,5 @@ class AttachmentFilter(Filter): # sorting order_by: list[str] | None = None - class Constants(Filter.Constants): + class Constants(BaseFilter.Constants): model = Attachment diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py index 8bfe04c619..e202eef76c 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py @@ -14,10 +14,10 @@ ) from bson.errors import InvalidId from fastapi_filter import FilterDepends, with_prefix -from fastapi_filter.contrib.beanie import Filter from pydantic import BeforeValidator, Field, field_validator from pymongo import ASCENDING, IndexModel +from mpcontribs_api.domains._shared.filters import BaseFilter from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut from mpcontribs_api.domains._shared.types import ShortStr from mpcontribs_api.domains.attachments.models import Attachment, AttachmentFilter, AttachmentIn @@ -188,7 +188,7 @@ class ContributionPatch(SparseFieldsModel): attachments: list[Link[Attachment]] | None = None -class ContributionFilter(Filter): +class ContributionFilter(BaseFilter): id: PydanticObjectId | None = None id__in: list[PydanticObjectId] | None = None id__neq: PydanticObjectId | None = None @@ -214,7 +214,7 @@ class ContributionFilter(Filter): # sorting order_by: list[str] | None = None - class Constants(Filter.Constants): + class Constants(BaseFilter.Constants): model = Contribution @field_validator("id", mode="before") diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py index 84082b58cf..7216c82acc 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py @@ -2,10 +2,10 @@ from typing import Any, Literal -from fastapi_filter.contrib.beanie import Filter from pydantic import BaseModel, ConfigDict, Field, HttpUrl from mpcontribs_api import pagination +from mpcontribs_api.domains._shared.filters import BaseFilter from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut from mpcontribs_api.domains._shared.types import PrefixedEmail, ShortStr @@ -100,7 +100,7 @@ def default_fields() -> list[str]: return ["id", "is_public", "title", "owner", "is_approved", "unique_identifiers"] -class ProjectFilter(Filter): +class ProjectFilter(BaseFilter): """Filter fields allowed in requests.""" id: ShortStr | None = None @@ -130,7 +130,7 @@ class ProjectFilter(Filter): # sorting order_by: list[str] | None = None - class Constants(Filter.Constants): + class Constants(BaseFilter.Constants): model = Project diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py index bf48bb8b54..b4c8f6aa53 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py @@ -1,8 +1,8 @@ from beanie import PydanticObjectId -from fastapi_filter.contrib.beanie import Filter from pydantic import BaseModel, ConfigDict from pymatgen.core import Element +from mpcontribs_api.domains._shared.filters import BaseFilter from mpcontribs_api.domains._shared.models import Component, ComponentIn, DocumentOut from mpcontribs_api.domains._shared.types import MD5Hash, PolarsFrame from mpcontribs_api.projection import SparseFieldsModel @@ -92,7 +92,7 @@ class StructurePatch(SparseFieldsModel): cif: str | None = None -class StructureFilter(Filter): +class StructureFilter(BaseFilter): id: PydanticObjectId | None = None id__in: list[PydanticObjectId] | None = None id__neq: PydanticObjectId | None = None @@ -111,5 +111,5 @@ class StructureFilter(Filter): # sorting order_by: list[str] | None = None - class Constants(Filter.Constants): + class Constants(BaseFilter.Constants): model = Structure diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py index b18e8443e3..44cb0368e2 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py @@ -3,7 +3,6 @@ import polars as pl from beanie import PydanticObjectId -from fastapi_filter.contrib.beanie import Filter from pydantic import ( BaseModel, ConfigDict, @@ -11,6 +10,7 @@ model_validator, ) +from mpcontribs_api.domains._shared.filters import BaseFilter from mpcontribs_api.domains._shared.models import Component, ComponentIn, DocumentOut from mpcontribs_api.domains._shared.types import MD5Hash, PolarsFrame from mpcontribs_api.projection import SparseFieldsModel @@ -97,7 +97,7 @@ class TableIn(ComponentIn): data: PolarsFrame -class TableFilter(Filter): +class TableFilter(BaseFilter): id: PydanticObjectId | None = None id__in: list[PydanticObjectId] | None = None id__neq: PydanticObjectId | None = None @@ -117,7 +117,7 @@ class TableFilter(Filter): # sorting order_by: list[str] | None = None - class Constants(Filter.Constants): + class Constants(BaseFilter.Constants): model = Table @field_serializer("id", "id__in", "id__neq") diff --git a/mpcontribs-api/tests/integration/db/test_projects_repository.py b/mpcontribs-api/tests/integration/db/test_projects_repository.py index 137a7495a2..6ec770c1aa 100644 --- a/mpcontribs-api/tests/integration/db/test_projects_repository.py +++ b/mpcontribs-api/tests/integration/db/test_projects_repository.py @@ -142,6 +142,52 @@ async def test_anon_cannot_get_private_project(self, db): assert result is None +# --------------------------------------------------------------------------- +# get_projects — id filtering +# +# Regression: Beanie stores the primary key under Mongo's ``_id`` (``id`` is an +# alias), but fastapi-filter keys queries on the raw field name. Without the +# ``id`` -> ``_id`` remap in BaseFilter these filters matched nothing even +# though get_project_by_id (which queries ``_id`` directly) found the document. +# --------------------------------------------------------------------------- + + +class TestGetProjectsIdFilter: + async def test_filter_by_id_matches(self, db): + from mpcontribs_api.domains.projects.models import ProjectFilter + + await _insert("filter-id-hit") + page = await _repo(ADMIN).get_projects( + filter=ProjectFilter(id="filter-id-hit"), pagination=CursorParams(), fields=None + ) + assert {p.id for p in page.items} == {"filter-id-hit"} + + async def test_filter_by_id_in_matches(self, db): + from mpcontribs_api.domains.projects.models import ProjectFilter + + await _insert("filter-id-in-a") + await _insert("filter-id-in-b") + await _insert("filter-id-in-c") + page = await _repo(ADMIN).get_projects( + filter=ProjectFilter(id__in=["filter-id-in-a", "filter-id-in-b"]), + pagination=CursorParams(), + fields=None, + ) + assert {p.id for p in page.items} == {"filter-id-in-a", "filter-id-in-b"} + + async def test_filter_by_id_neq_excludes(self, db): + from mpcontribs_api.domains.projects.models import ProjectFilter + + await _insert("filter-id-neq-keep") + await _insert("filter-id-neq-drop") + page = await _repo(ADMIN).get_projects( + filter=ProjectFilter(id__neq="filter-id-neq-drop"), pagination=CursorParams(), fields=None + ) + ids = {p.id for p in page.items} + assert "filter-id-neq-keep" in ids + assert "filter-id-neq-drop" not in ids + + # --------------------------------------------------------------------------- # Field projection # --------------------------------------------------------------------------- diff --git a/mpcontribs-api/uv.lock b/mpcontribs-api/uv.lock index 008b2c5eeb..1d0de33fc5 100644 --- a/mpcontribs-api/uv.lock +++ b/mpcontribs-api/uv.lock @@ -1010,6 +1010,7 @@ dependencies = [ { name = "beanie" }, { name = "fastapi", extra = ["standard"] }, { name = "fastapi-filter" }, + { name = "jinja2" }, { name = "opentelemetry-api" }, { name = "opentelemetry-exporter-otlp-proto-grpc" }, { name = "opentelemetry-instrumentation-fastapi" }, @@ -1042,6 +1043,7 @@ requires-dist = [ { name = "beanie", specifier = ">=2.1.0" }, { name = "fastapi", extras = ["standard"], specifier = ">=0.136.3" }, { name = "fastapi-filter", specifier = ">=2.0.1" }, + { name = "jinja2" }, { name = "opentelemetry-api", specifier = ">=1.42.1" }, { name = "opentelemetry-exporter-otlp-proto-grpc", specifier = ">=1.42.1" }, { name = "opentelemetry-instrumentation-fastapi", specifier = ">=0.63b1" }, From 679233914c2b66f7a62bdb6d60ad38a977b94332 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 29 Jun 2026 11:19:47 -0700 Subject: [PATCH 422/591] Pagination cursor pads b64 encoded cursor to safely decode --- mpcontribs-api/src/mpcontribs_api/pagination.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mpcontribs-api/src/mpcontribs_api/pagination.py b/mpcontribs-api/src/mpcontribs_api/pagination.py index e978a613f9..cf4d112984 100644 --- a/mpcontribs-api/src/mpcontribs_api/pagination.py +++ b/mpcontribs-api/src/mpcontribs_api/pagination.py @@ -36,7 +36,9 @@ def encode_cursor(last_id: str) -> str: def decode_cursor(cursor: str) -> str: """Base64 decodes a cursor for pagination""" + # Re-add any base64 padding ('=') that may have been stripped in transit (e.g. via URLs). + padded = cursor + "=" * (-len(cursor) % 4) try: - return base64.urlsafe_b64decode(cursor.encode()).decode() + return base64.urlsafe_b64decode(padded.encode()).decode() except ValueError, UnicodeDecodeError: raise ValueError("malformed cursor") from None From e9b2307c8f7ebf727fb7e51470385fa112489a0b Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 29 Jun 2026 11:52:44 -0700 Subject: [PATCH 423/591] Removed response_model from router 'get_*' methods since that would overwrite the requested fields and add in null values for the non-requested fields --- .../src/mpcontribs_api/domains/attachments/router.py | 6 +++--- .../src/mpcontribs_api/domains/projects/router.py | 5 ++--- .../src/mpcontribs_api/domains/structures/router.py | 6 +++--- mpcontribs-api/src/mpcontribs_api/domains/tables/router.py | 6 +++--- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py b/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py index 49e2c076b4..09214a4fa2 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py @@ -14,12 +14,12 @@ ) from mpcontribs_api.domains.attachments.dependencies import AttachmentServiceDep from mpcontribs_api.domains.attachments.models import AttachmentFilter, AttachmentOut -from mpcontribs_api.pagination import CursorParams, Page +from mpcontribs_api.pagination import CursorParams router = APIRouter() -@router.get("", response_model=Page[AttachmentOut]) +@router.get("") async def get_attachments( service: AttachmentServiceDep, pagination: Annotated[CursorParams, Depends()], @@ -30,7 +30,7 @@ async def get_attachments( return await service.get_many(filter=filter, fields=selected, pagination=pagination) -@router.get("/{pk}", response_model=AttachmentOut) +@router.get("/{pk}") async def get_attachment( service: AttachmentServiceDep, pk: str, diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py index e82116b270..33dce7ebd7 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py @@ -18,8 +18,7 @@ router = APIRouter() -# Brendan TODO: Add in option to select ProjectSummary or ProjectOut -@router.get("", response_model=None) +@router.get("") async def get_projects( repo: ProjectDep, pagination: Annotated[CursorParams, Depends()], @@ -40,7 +39,7 @@ async def get_projects( return await repo.get_projects(filter=filter, pagination=pagination, fields=selected) -@router.get("/{id}", response_model=ProjectOut) +@router.get("/{id}") async def get_project_by_id( id: str, repo: ProjectDep, diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py index 0a5746607c..803047648f 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py @@ -15,12 +15,12 @@ ) from mpcontribs_api.domains.structures.dependencies import StructureServiceDep from mpcontribs_api.domains.structures.models import StructureFilter, StructureIn, StructureOut, StructurePatch -from mpcontribs_api.pagination import CursorParams, Page +from mpcontribs_api.pagination import CursorParams router = APIRouter() -@router.get("", response_model=Page[StructureOut]) +@router.get("") async def get_structures( service: StructureServiceDep, pagination: Annotated[CursorParams, Depends()], @@ -31,7 +31,7 @@ async def get_structures( return await service.get_many(filter=filter, fields=selected, pagination=pagination) -@router.get("/{pk}", response_model=StructureOut) +@router.get("/{pk}") async def get_structure( service: StructureServiceDep, pk: str, diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py index 619f4073e0..703f0c6faa 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py @@ -15,12 +15,12 @@ ) from mpcontribs_api.domains.tables.dependencies import TableServiceDep from mpcontribs_api.domains.tables.models import Table, TableFilter, TableIn, TableOut, TablePatch -from mpcontribs_api.pagination import CursorParams, Page +from mpcontribs_api.pagination import CursorParams router = APIRouter() -@router.get("", response_model=Page[TableOut]) +@router.get("") async def get_tables( service: TableServiceDep, pagination: Annotated[CursorParams, Depends()], @@ -31,7 +31,7 @@ async def get_tables( return await service.get_many(filter=filter, fields=selected, pagination=pagination) -@router.get("/{pk}", response_model=TableOut) +@router.get("/{pk}") async def get_table( service: TableServiceDep, pk: str, From b21cef335ce262fa1966a2de972d9feb32ed940b Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Tue, 30 Jun 2026 14:06:10 -0700 Subject: [PATCH 424/591] Contributions are now versioned. The server derives integer versions from the number of documents sharing (project, identifier) in projects where unique_identifiers=False, otherwise version === 1 --- mpcontribs-api/src/mpcontribs_api/app.py | 2 - .../domains/_shared/repository.py | 2 +- .../domains/contributions/dependencies.py | 2 + .../domains/contributions/models.py | 26 +- .../domains/contributions/repository.py | 56 +++- .../domains/contributions/service.py | 279 +++++++++++++----- .../domains/projects/repository.py | 24 ++ .../unit/domains/test_contribution_service.py | 129 +++++++- .../tests/unit/test_supervisord_render.py | 4 - 9 files changed, 422 insertions(+), 102 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/app.py b/mpcontribs-api/src/mpcontribs_api/app.py index 29c5d10f4b..0e50c916bb 100644 --- a/mpcontribs-api/src/mpcontribs_api/app.py +++ b/mpcontribs-api/src/mpcontribs_api/app.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from collections.abc import AsyncGenerator from contextlib import AbstractAsyncContextManager, AsyncExitStack, asynccontextmanager from typing import cast diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py index a974c31ba1..4e32775443 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py @@ -105,7 +105,7 @@ async def get_many( next_cursor = encode_cursor(str(items[-1].id)) if has_more and items else None return Page(items=items, next_cursor=next_cursor) - async def get_by_id(self, id: Any, fields: frozenset[str] | None) -> TDoc | TOut | None: + async def get_by_id(self, id: Any, fields: frozenset[str] | None = None) -> TDoc | TOut | None: """Return a single scoped document by id, projected to the requested fields. Args: diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/dependencies.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/dependencies.py index b0cce8e0df..805d4357a1 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/dependencies.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/dependencies.py @@ -8,6 +8,7 @@ MongoDbContributionRepository, ) from mpcontribs_api.domains.contributions.service import ContributionService +from mpcontribs_api.domains.projects.repository import MongoDbProjectRepository from mpcontribs_api.domains.structures.repository import MongoDbStructureRepository from mpcontribs_api.domains.tables.repository import MongoDbTableRepository @@ -23,6 +24,7 @@ def get_contribution_service(user: UserDep, client: MongoClientDep) -> Contribut return ContributionService( client=client, user=user, + projects=MongoDbProjectRepository(user), contributions=MongoDbContributionRepository(user), structures=MongoDbStructureRepository(user), attachments=MongoDbAttachmentRepository(user), diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py index e202eef76c..c200aec70e 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py @@ -93,8 +93,8 @@ class Settings: keep_nulls = False indexes = [ IndexModel( - keys=[("project", ASCENDING), ("identifier", ASCENDING)], - name="project_idenfitier", + keys=[("project", ASCENDING), ("identifier", ASCENDING), ("version", ASCENDING)], + name="project_identifier_version", unique=True, ), # Multikey indexes over each Link field's DBRef id so the component-delete @@ -107,6 +107,9 @@ class Settings: class Contribution(ContributionBase): is_public: bool + # Server-owned: the service resolves the real version (see ContributionService._split_non_unique) + # and stamps it on the doc. Defaults to 1 so the no-version (unique-identifier) case is implicit. + version: int = 1 structures: list[Link[Structure]] | None = None tables: list[Link[Table]] | None = None attachments: list[Link[Attachment]] | None = None @@ -115,10 +118,13 @@ class Contribution(ContributionBase): @classmethod def from_input_model(cls, data: ContributionIn) -> Contribution: # Server-owned fields are not taken from input: is_public starts False, components are - # inserted separately, and last_modified is stamped by the before_event hook. + # inserted separately, last_modified is stamped by the before_event hook, and version is + # resolved/stamped by the service (never trusted from the request body). return cls.model_validate( { - **data.model_dump(exclude={"is_public", "structures", "tables", "attachments", "last_modified"}), + **data.model_dump( + exclude={"is_public", "version", "structures", "tables", "attachments", "last_modified"} + ), "is_public": False, } ) @@ -129,6 +135,10 @@ def set_last_modified(self): class ContributionIn(ContributionBase): + # Only meaningful on upsert/update of a non-unique-identifier project, where it selects which + # version to target. Ignored on insert (the service auto-assigns) and for unique-identifier + # projects (inferred as 1). + version: int | None = None structures: list[StructureIn] | None = None tables: list[TableIn] | None = None attachments: list[AttachmentIn] | None = None @@ -149,6 +159,7 @@ def identifiers(self) -> dict[str, str]: class ContributionOut(DocumentOut[PydanticObjectId]): project: str | None = None identifier: str | None = None + version: int | None = None formula: str | None = None is_public: bool | None = None last_modified: datetime | None = None @@ -166,6 +177,7 @@ def default_fields() -> list[str]: "id", "project", "identifier", + "version", "formula", "is_public", "last_modified", @@ -176,6 +188,7 @@ def default_fields() -> list[str]: class ContributionPatch(SparseFieldsModel): project: str | None = None identifier: str | None = None + version: int | None = None formula: str | None = None needs_build: bool | None = None data: Annotated[ @@ -198,6 +211,11 @@ class ContributionFilter(BaseFilter): identifier__neq: ShortStr | None = None identifier__ilike: str | None = None + version: str | None = None + version__in: list[ShortStr] | None = None + version__neq: ShortStr | None = None + version__ilike: str | None = None + formula: str | None = None formula__in: list[ShortStr] | None = None formula__neq: ShortStr | None = None diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py index 31c2d3dfc4..82b91c31b7 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py @@ -112,6 +112,48 @@ async def find_one_contribution(self, project: str, identifier: str) -> Contribu self.document_model.identifier == identifier, ) + async def max_versions(self, keys: list[tuple[str, str]]) -> dict[tuple[str, str], int]: + """Return ``{(project, identifier): max_version}`` for the given keys, scoped to the user. + + Presence of a key in the result also signals that at least one contribution already exists + for it, which the contribution write path uses to enforce uniqueness on unique-identifier + projects and to compute the next version on non-unique ones. Keys with no existing + contributions are absent from the result. + + A single aggregation answers the whole batch so the write path avoids one round-trip per + contribution. Scope is merged into ``$match`` (mirroring :meth:`referenced_component_ids`); + a writer sees every contribution in their own project, so the scoped max equals the global + max for keys they may write. + + Args: + keys: (project, identifier) pairs to look up + + Returns: + dict[tuple[str, str], int]: highest existing version per requested key + """ + if not keys: + return {} + match: dict[str, Any] = {"$or": [{"project": p, "identifier": i} for p, i in keys]} + if self._scope: + match = {"$and": [self._scope, match]} + pipeline: list[dict[str, Any]] = [ + {"$match": match}, + { + "$group": { + "_id": {"project": "$project", "identifier": "$identifier"}, + "max_version": {"$max": "$version"}, + } + }, + ] + collection = self.document_model.get_pymongo_collection() + result: dict[tuple[str, str], int] = {} + async for doc in await collection.aggregate(pipeline): + gid = doc["_id"] + # Versions are >= 1; coalesce a null $max (legacy docs without the field) to 0 while + # still recording the key's presence (existence check for unique-identifier projects). + result[(gid["project"], gid["identifier"])] = doc.get("max_version") or 0 + return result + async def referenced_component_ids( self, ref_field: str, @@ -193,16 +235,20 @@ async def upsert_contribution_by_identifiers( self, identifiers: dict[str, str], contribution: ContributionIn, + version: int, ) -> Contribution: - """Atomically upsert a Contribution by its identifying fields. + """Atomically upsert a Contribution by its identifying fields and resolved version. - Relies on the unique index over those fields so that concurrent requests targeting the - same key cannot both win the insert branch. Fields the caller did not set are not touched - (partial update). On insert a fresh Contribution document is written with ``is_public=False``. + Relies on the unique index over (project, identifier, version) so that concurrent requests + targeting the same key cannot both win the insert branch. Fields the caller did not set are + not touched (partial update). On insert a fresh Contribution document is written with + ``is_public=False``. Args: identifiers: the fields ContributionIn.identifiers() returns (project, identifier) contribution: the input payload to upsert + version: the version resolved by the service (1 for unique-identifier projects, or the + caller-supplied version for non-unique ones); selects which row to update Returns: Contribution: the document as it stands after the operation @@ -212,11 +258,13 @@ async def upsert_contribution_by_identifiers( raise PermissionError(f"not authorized to write to project '{identifiers['project']}'") doc = self.document_model.from_input_model(contribution) + doc.version = version update_data = doc.model_dump(exclude={"id"}, exclude_none=True) query = self.document_model.find_one( self._scope, self.document_model.project == identifiers["project"], self.document_model.identifier == identifiers["identifier"], + self.document_model.version == version, ).upsert( Set(update_data), on_insert=doc, diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py index 52bbe32273..88ba3a523f 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py @@ -1,6 +1,7 @@ import asyncio from collections import defaultdict from collections.abc import Iterable +from dataclasses import dataclass from typing import cast import structlog @@ -21,21 +22,36 @@ from mpcontribs_api.domains.attachments.repository import MongoDbAttachmentRepository from mpcontribs_api.domains.contributions.models import Contribution, ContributionFilter, ContributionIn from mpcontribs_api.domains.contributions.repository import MongoDbContributionRepository +from mpcontribs_api.domains.projects.repository import MongoDbProjectRepository from mpcontribs_api.domains.structures.models import Structure from mpcontribs_api.domains.structures.repository import MongoDbStructureRepository from mpcontribs_api.domains.tables.models import Table from mpcontribs_api.domains.tables.repository import MongoDbTableRepository -from mpcontribs_api.exceptions import AppError, PermissionError, ValidationError +from mpcontribs_api.exceptions import AppError, ConflictError, PermissionError, ValidationError from mpcontribs_api.pagination import CursorParams logger = structlog.get_logger(__name__) +@dataclass(frozen=True, slots=True) +class ResolvedWrite: + """A contribution that passed validation, paired with its server-resolved version. + + Produced by the split pipeline so the resolved version travels with its contribution (and its + original batch index) + """ + + index: int + contribution: ContributionIn + version: int + + class ContributionService: def __init__( self, client: AsyncMongoClient, user: User, + projects: MongoDbProjectRepository, contributions: MongoDbContributionRepository, structures: MongoDbStructureRepository, attachments: MongoDbAttachmentRepository, @@ -44,6 +60,7 @@ def __init__( ): self._client = client self._user = user + self._projects = projects self._contributions = contributions self._structures = structures self._attachments = attachments @@ -70,32 +87,25 @@ async def insert_contributions( ``settings.mongo.max_concurrent_transactions``. Per-item failures are returned in the summary's ``failed`` list; the request as a whole does not raise on partial failure. + Version is server-assigned per contribution: unique-identifier projects reject a duplicate + (project, identifier) as a conflict (version stays 1); non-unique projects auto-increment + from the current max. See ``_split_non_unique``. + Args: contributions: contributions to insert; may include nested structures/tables/attachments Returns: BulkWriteSummary[Contribution]: per-item outcome, sized to ``len(contributions)`` - - Raises: - ValidationError: if duplicate keys (project-identifier) are found in ``contributions`` """ if not contributions: return BulkWriteSummary[Contribution](total=0, succeeded=[], failed=[]) - self._reject_duplicate_keys(contributions) + failures, plan = await self._split_contributions(contributions, is_upsert=False) + no_comp = [item for item in plan if not item.contribution.has_components()] + with_comp = [item for item in plan if item.contribution.has_components()] - failures, remaining_indices = self._split_contributions(contributions) - no_comp_indices = [i for i in remaining_indices if not contributions[i].has_components()] - with_comp_indices = [i for i in remaining_indices if contributions[i].has_components()] - - no_comp_succeeded, no_comp_failed = await self._insert_no_components( - indices=no_comp_indices, - contributions=contributions, - ) - with_comp_succeeded, with_comp_failed = await self._insert_with_components( - indices=with_comp_indices, - contributions=contributions, - ) + no_comp_succeeded, no_comp_failed = await self._insert_no_components(no_comp) + with_comp_succeeded, with_comp_failed = await self._insert_with_components(with_comp) succeeded = [doc for _, doc in sorted(no_comp_succeeded + with_comp_succeeded, key=lambda p: p[0])] failed = sorted( @@ -104,26 +114,6 @@ async def insert_contributions( ) return BulkWriteSummary[Contribution](total=len(contributions), succeeded=succeeded, failed=failed) - def _reject_duplicate_keys(self, contributions: list[ContributionIn]) -> None: - """Reject the whole batch if any identifying key appears more than once. - - Mongo would surface this as a duplicate key error; catching it upfront keeps a guaranteed - failure from consuming a transaction slot and gives the caller all offending indices at once. - - The dedup key is derived from every value in ``identifiers()`` so adding a field to the - uniqueness contract there flows through here automatically. - """ - seen: dict[tuple[str, ...], list[int]] = defaultdict(list) - for index, contribution in enumerate(contributions): - ids = contribution.identifiers() - seen[tuple(ids.values())].append(index) - duplicates = sorted(index for indices in seen.values() if len(indices) > 1 for index in indices) - if duplicates: - raise ValidationError( - "Duplicate (project, identifier) pairs in batch", - contribution_indices=duplicates, - ) - def _split_unauthorized( self, indices: Iterable[int], @@ -154,8 +144,125 @@ def _split_unauthorized( message=f"not authorized to write to project '{contrib.project}'", ) ) + logger.warning( + "User attempted to add contributions to projects they are not authorized for.", + project=contrib.project, + ) return unauthorized, remaining + async def _split_non_unique( + self, + indices: Iterable[int], + contributions: list[ContributionIn], + *, + is_upsert: bool, + ) -> tuple[list[BulkFailure], list[ResolvedWrite]]: + """Apply per-project identifier-uniqueness rules and resolve each contribution's version. + + ``Project.unique_identifiers`` decides the contract per project: + + - **True**: at most one contribution per (project, identifier); version is always 1. On + insert a second one (already in the DB, or a duplicate earlier in this batch) is rejected + as a conflict. On upsert the version is inferred as 1 (any supplied value is ignored). + - **False**: many versions may share (project, identifier). On insert the version is + auto-assigned as ``max(existing) + 1``, sequencing intra-batch duplicates. On upsert the + caller must supply ``version`` to pick the target row, else the item is rejected. + + Iterates ``indices`` in input order so intra-batch duplicates sequence deterministically. + + Returns: + tuple of (rejections, a ``ResolvedWrite`` per survivor pairing it with its version) + """ + indices = list(indices) + failures: list[BulkFailure] = [] + plan: list[ResolvedWrite] = [] + if not indices: + return failures, plan + + # One round-trip each for the per-project uniqueness flags and (insert only) the current + # max version per key, instead of a query per contribution. + unique_map = await self._projects.unique_identifiers_by_id(sorted({contributions[i].project for i in indices})) + max_map: dict[tuple[str, str], int] = {} + if not is_upsert: + keys = sorted({(contributions[i].project, contributions[i].identifier) for i in indices}) + max_map = await self._contributions.max_versions(keys) + + seen: dict[tuple[str, str], int] = defaultdict(int) + for i in indices: + contrib = contributions[i] + key = (contrib.project, contrib.identifier) + + if contrib.project not in unique_map: + failures.append( + BulkFailure( + index=i, + identifier=contrib.identifiers(), + error_code=ValidationError.error_code, + message=f"project '{contrib.project}' not found or not accessible", + ) + ) + logger.info( + "project not found or not accessible", + project=contrib.project, + identifiers=contrib.identifiers(), + ) + continue + + unique = unique_map[contrib.project] + if is_upsert: + if unique: + version = 1 + elif contrib.version is not None: + version = contrib.version + else: + failures.append( + BulkFailure( + index=i, + identifier=contrib.identifiers(), + error_code=ValidationError.error_code, + message=( + f"project '{contrib.project}' allows multiple versions; a 'version' " + "is required to identify which contribution to update" + ), + ) + ) + logger.info( + "ambiguous contribution version in project allowing multiple versions", + project=contrib.project, + identifiers=contrib.identifiers(), + ) + continue + elif unique: + # Insert into a unique-identifier project: the first occurrence wins, anything that + # already exists (in the DB or earlier in this batch) is a conflict. + if key in max_map or seen[key] > 0: + failures.append( + BulkFailure( + index=i, + identifier=contrib.identifiers(), + error_code=ConflictError.error_code, + message=( + f"contribution '{contrib.identifier}' already exists for project '{contrib.project}'" + ), + ) + ) + logger.info( + "contribution already exists in project during insert/upsert/update", + project=contrib.project, + identifiers=contrib.identifiers(), + ) + continue + version = 1 + else: + # Insert into a non-unique-identifier project: next version after the current max, + # sequencing duplicates within this batch (max+1, max+2, ...). + version = max_map.get(key, 0) + 1 + seen[key] + + plan.append(ResolvedWrite(index=i, contribution=contrib, version=version)) + seen[key] += 1 + + return failures, plan + def _split_oversize( self, indices: Iterable[int], @@ -183,27 +290,36 @@ def _split_oversize( "Recommend inserting the component alone, followed by bulk inserts of components", ) ) + logger.info("Attemped to add contribution with too many components.", num_components=count, max=cap) else: remaining.append(i) return oversize, remaining - def _split_contributions(self, contributions) -> tuple[list[BulkFailure], list[int]]: - """Common method for validating contribution write failure logic + async def _split_contributions( + self, contributions: list[ContributionIn], *, is_upsert: bool + ) -> tuple[list[BulkFailure], list[ResolvedWrite]]: + """Common method for validating contribution write failure logic and resolving versions. + + Runs the cheap, local, index-based filters first (authorization, then component-count cap) + so guaranteed failures never reach the DB; ``_split_non_unique`` runs last and turns the + remaining indices into a write plan carrying each resolved version. Returns: - tuple[list[BulkFailure], list[int]]: a tuple containing a list of failures and their reasons, - and the indices of valid contributions from 'contributions' to write + tuple of (failures and their reasons, a ``ResolvedWrite`` per contribution to write) """ # Per-item project authorization (see _split_unauthorized for the per-item vs fail-fast # decision). Only authorized items reach Mongo; the rest are reported in ``failed``. unauthorized_failures, authorized_indices = self._split_unauthorized(range(len(contributions)), contributions) - oversize_failures, remaining_indices = self._split_oversize(authorized_indices, contributions) - return (unauthorized_failures + oversize_failures, remaining_indices) + # Reject contributions that have too many components associated with them. + oversize_failures, sized_indices = self._split_oversize(authorized_indices, contributions) + # Verify identifiers/uniqueness within a project and resolve each version, depending on + # project.unique_identifiers and whether this is an insert or upsert. + non_unique_failures, plan = await self._split_non_unique(sized_indices, contributions, is_upsert=is_upsert) + return (unauthorized_failures + oversize_failures + non_unique_failures, plan) async def _insert_no_components( self, - indices: list[int], - contributions: list[ContributionIn], + items: list[ResolvedWrite], ) -> tuple[list[tuple[int, Contribution]], list[BulkFailure]]: """Single-collection bulk insert for component-free contributions. @@ -211,20 +327,23 @@ async def _insert_no_components( raises ``BulkWriteError`` with per-index error info on partial failure; we map that back onto the original input indices. """ - if not indices: + if not items: return [], [] - docs = [Contribution.from_input_model(contributions[i]) for i in indices] + docs = [] + for item in items: + doc = Contribution.from_input_model(item.contribution) + doc.version = item.version + docs.append(doc) try: await self._contributions.insert_many_contributions(docs) - return list(zip(indices, docs, strict=False)), [] + return [(item.index, doc) for item, doc in zip(items, docs, strict=True)], [] except BulkWriteError as exc: - return self._partition_bulk_write_error(indices, docs, contributions, exc) + return self._partition_bulk_write_error(items, docs, exc) @staticmethod def _partition_bulk_write_error( - indices: list[int], + items: list[ResolvedWrite], docs: list[Contribution], - contributions: list[ContributionIn], exc: BulkWriteError, ) -> tuple[list[tuple[int, Contribution]], list[BulkFailure]]: """Map pymongo's per-position writeErrors back to the caller's original input indices.""" @@ -232,15 +351,15 @@ def _partition_bulk_write_error( failed_positions = {err.get("index"): err for err in write_errors} succeeded: list[tuple[int, Contribution]] = [] failed: list[BulkFailure] = [] - for position, (orig_index, doc) in enumerate(zip(indices, docs, strict=False)): + for position, (item, doc) in enumerate(zip(items, docs, strict=True)): err = failed_positions.get(position) if err is None: - succeeded.append((orig_index, doc)) + succeeded.append((item.index, doc)) else: failed.append( BulkFailure( - index=orig_index, - identifier=contributions[orig_index].identifiers(), + index=item.index, + identifier=item.contribution.identifiers(), error_code="conflict" if err.get("code") == 11000 else "write_error", message=err.get("errmsg", "write failed"), ) @@ -249,53 +368,51 @@ def _partition_bulk_write_error( async def _insert_with_components( self, - indices: list[int], - contributions: list[ContributionIn], + items: list[ResolvedWrite], ) -> tuple[list[tuple[int, Contribution]], list[BulkFailure]]: """Per-contribution transaction path, bounded by ``max_concurrent_transactions``.""" - if not indices: + if not items: return [], [] sem = asyncio.Semaphore(self._settings.max_concurrent_transactions) - async def _bounded(orig_index: int) -> Contribution | BulkFailure: + async def _bounded(item: ResolvedWrite) -> Contribution | BulkFailure: async with sem: - return await self._insert_one_with_components(orig_index, contributions[orig_index]) + return await self._insert_one_with_components(item) - results = await asyncio.gather(*[_bounded(i) for i in indices]) + results = await asyncio.gather(*[_bounded(item) for item in items]) succeeded: list[tuple[int, Contribution]] = [] failed: list[BulkFailure] = [] - for orig_index, outcome in zip(indices, results, strict=True): + for item, outcome in zip(items, results, strict=True): if isinstance(outcome, BulkFailure): failed.append(outcome) else: - succeeded.append((orig_index, outcome)) + succeeded.append((item.index, outcome)) return succeeded, failed - async def _insert_one_with_components( - self, - index: int, - contrib: ContributionIn, - ) -> Contribution | BulkFailure: + async def _insert_one_with_components(self, item: ResolvedWrite) -> Contribution | BulkFailure: """Run a single contribution + its components inside a transaction. Uses ``session.with_transaction`` so transient txn errors (write conflicts, primary step- downs) get pymongo's retry treatment. Any exception is converted to a ``BulkFailure`` so the surrounding ``asyncio.gather`` sees a normal return value for every coroutine. """ + contrib = item.contribution try: async with self._client.start_session() as session: async def _txn(s: AsyncClientSession) -> Contribution: - return await self._do_insert(contrib, s) + return await self._do_insert(contrib, s, item.version) return await session.with_transaction(_txn) except AppError as exc: - return bulk_failure_from_exception(index, contrib.identifiers(), exc) + return bulk_failure_from_exception(item.index, contrib.identifiers(), exc) except Exception as exc: - logger.error("insert_contribution_failed", index=index, identifier=contrib.identifiers(), exc_info=True) - return bulk_failure_from_exception(index, contrib.identifiers(), exc) + logger.error( + "insert_contribution_failed", index=item.index, identifier=contrib.identifiers(), exc_info=True + ) + return bulk_failure_from_exception(item.index, contrib.identifiers(), exc) - async def _do_insert(self, contrib: ContributionIn, session: AsyncClientSession) -> Contribution: + async def _do_insert(self, contrib: ContributionIn, session: AsyncClientSession, version: int) -> Contribution: """Insert components then the contribution itself, all in the given session. Components are inserted sequentially because a session is single-threaded — sharing it @@ -305,6 +422,7 @@ async def _do_insert(self, contrib: ContributionIn, session: AsyncClientSession) tables = await self._tables.insert_components(contrib.tables or [], session=session) doc = Contribution.from_input_model(contrib) + doc.version = version doc.structures = cast(list[Link[Structure]] | None, structures or None) doc.tables = cast(list[Link[Table]] | None, tables or None) return await self._contributions.insert_contribution(doc, session=session) @@ -342,21 +460,24 @@ async def upsert_contributions(self, contributions: list[ContributionIn]) -> Bul contribution_indices=indices_with_components, ) - failures, remaining_indices = self._split_contributions(contributions) + failures, plan = await self._split_contributions(contributions, is_upsert=True) sem = asyncio.Semaphore(self._settings.max_concurrent_transactions) - async def _bounded_upsert(index: int, contrib: ContributionIn) -> Contribution | BulkFailure: + async def _bounded_upsert(item: ResolvedWrite) -> Contribution | BulkFailure: + contrib = item.contribution async with sem: try: - return await self._contributions.upsert_contribution_by_identifiers(contrib.identifiers(), contrib) + return await self._contributions.upsert_contribution_by_identifiers( + contrib.identifiers(), contrib, item.version + ) except Exception as exc: logger.error( - "upsert_contribution_failed", index=index, identifier=contrib.identifiers(), exc_info=True + "upsert_contribution_failed", index=item.index, identifier=contrib.identifiers(), exc_info=True ) - return bulk_failure_from_exception(index, contrib.identifiers(), exc) + return bulk_failure_from_exception(item.index, contrib.identifiers(), exc) - results = await asyncio.gather(*[_bounded_upsert(i, contributions[i]) for i in remaining_indices]) + results = await asyncio.gather(*[_bounded_upsert(item) for item in plan]) succeeded = [r for r in results if not isinstance(r, BulkFailure)] failed = failures + [r for r in results if isinstance(r, BulkFailure)] return BulkWriteSummary[Contribution](total=len(contributions), succeeded=succeeded, failed=failed) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py index f0f3f09f36..0e6f96a96c 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py @@ -58,6 +58,30 @@ async def get_project_by_id(self, id: str, fields: frozenset[str] | None): """Find a single project by id, scoped to the current user. See ``get_by_id``.""" return await self.get_by_id(id, fields) + async def unique_identifiers_by_id(self, ids: list[str]) -> dict[str, bool]: + """Return ``{project_id: unique_identifiers}`` for the given project ids, scoped to the user. + + Used by the contribution write path to apply per-project version rules in one round-trip + instead of fetching each project separately. Projects the user cannot see (or that do not + exist) are simply absent from the result, so the caller can treat them as inaccessible. + + Args: + ids: project ids to look up + + Returns: + dict[str, bool]: mapping of project id to its ``unique_identifiers`` flag + """ + if not ids: + return {} + query: dict[str, Any] = {"_id": {"$in": ids}} + if self._scope: + query = {"$and": [self._scope, query]} + collection = self.document_model.get_pymongo_collection() + result: dict[str, bool] = {} + async for doc in collection.find(query, {"unique_identifiers": 1}): + result[doc["_id"]] = bool(doc.get("unique_identifiers")) + return result + async def insert_project(self, project: ProjectIn) -> Project: """Insert a new project, rejecting a duplicate id. See ``insert_one``.""" return await self.insert_one(project) diff --git a/mpcontribs-api/tests/unit/domains/test_contribution_service.py b/mpcontribs-api/tests/unit/domains/test_contribution_service.py index 4e8b387bb4..02451f5033 100644 --- a/mpcontribs-api/tests/unit/domains/test_contribution_service.py +++ b/mpcontribs-api/tests/unit/domains/test_contribution_service.py @@ -151,16 +151,27 @@ def _make_service( settings: MongoSettings | None = None, write_slots: asyncio.Semaphore | None = None, user: User | None = None, + projects=None, + unique_identifiers: bool = True, ) -> tuple[ContributionService, AsyncMock, AsyncMock, AsyncMock, AsyncMock, MagicMock]: contrib_repo = contributions or AsyncMock() struct_repo = structures or AsyncMock() table_repo = tables or AsyncMock() attach_repo = attachments or AsyncMock() + # Default version resolution: every referenced project reports the ``unique_identifiers`` flag + # and no contribution version exists yet, so the common path resolves version == 1 with no + # conflict. Tests exercising versioning pass their own ``projects`` mock or override + # ``contrib_repo.max_versions``. + projects_repo = projects or AsyncMock() + if projects is None: + projects_repo.unique_identifiers_by_id.side_effect = lambda ids: {pid: unique_identifiers for pid in ids} + contrib_repo.max_versions.return_value = {} if client is None: client, _ = _make_fake_client() svc = ContributionService( client=client, user=user or _admin_user(), + projects=projects_repo, contributions=contrib_repo, structures=struct_repo, tables=table_repo, @@ -206,17 +217,25 @@ async def test_empty_batch_returns_empty_summary_no_db(self): contrib_repo.insert_contribution.assert_not_called() client.start_session.assert_not_called() - async def test_duplicate_project_identifier_raises_validation_error(self): + async def test_duplicate_project_identifier_unique_project_conflicts_later_item(self): + """On a unique-identifier project, a repeated (project, identifier) in one batch no longer + fails the whole request (the old _reject_duplicate_keys behavior). The first occurrence is + inserted at version 1; later duplicates are per-item conflict failures.""" svc, contrib_repo, _, _, _, client = _make_service() + contrib_repo.insert_many_contributions.return_value = None contribs = [ _contrib_in(project="p", identifier="dup"), _contrib_in(project="p", identifier="dup"), ] - with pytest.raises(ValidationError) as exc_info: - await svc.insert_contributions(contribs) - assert exc_info.value.context.get("contribution_indices") == [0, 1] - contrib_repo.insert_many_contributions.assert_not_called() - client.start_session.assert_not_called() + summary = await svc.insert_contributions(contribs) + + assert summary.total == 2 + assert len(summary.succeeded) == 1 + assert summary.succeeded[0].version == 1 + assert [f.index for f in summary.failed] == [1] + assert summary.failed[0].error_code == "conflict" + # Index 0 still reached Mongo (one doc inserted) + assert len(contrib_repo.insert_many_contributions.call_args[0][0]) == 1 async def test_oversize_contribution_goes_to_failures_without_db(self): settings = _make_mongo_settings(max_components_per_contribution=1) @@ -432,6 +451,100 @@ async def _insert(doc, session=None): assert summary.failed == [] +# --------------------------------------------------------------------------- +# Versioning — uniqueness rules + version assignment (insert & upsert) +# --------------------------------------------------------------------------- + + +def _projects_mock(unique_map: dict[str, bool]) -> AsyncMock: + """A projects repo whose unique_identifiers_by_id returns only the known projects.""" + repo = AsyncMock() + repo.unique_identifiers_by_id.side_effect = lambda ids: {pid: unique_map[pid] for pid in ids if pid in unique_map} + return repo + + +class TestContributionVersioning: + async def test_insert_unique_existing_key_conflicts(self): + svc, contrib_repo, *_ = _make_service() # unique_identifiers=True by default + contrib_repo.insert_many_contributions.return_value = None + contrib_repo.max_versions.return_value = {("proj", "mp-1"): 1} + + summary = await svc.insert_contributions([_contrib_in(identifier="mp-1")]) + + assert summary.total == 1 + assert summary.succeeded == [] + assert [f.error_code for f in summary.failed] == ["conflict"] + contrib_repo.insert_many_contributions.assert_not_called() + + async def test_insert_non_unique_assigns_max_plus_one(self): + svc, contrib_repo, *_ = _make_service(unique_identifiers=False) + contrib_repo.insert_many_contributions.return_value = None + contrib_repo.max_versions.return_value = {("proj", "mp-1"): 3} + + summary = await svc.insert_contributions([_contrib_in(identifier="mp-1")]) + + assert len(summary.succeeded) == 1 + assert summary.succeeded[0].version == 4 + docs = contrib_repo.insert_many_contributions.call_args[0][0] + assert docs[0].version == 4 + + async def test_insert_non_unique_no_existing_starts_at_one(self): + svc, contrib_repo, *_ = _make_service(unique_identifiers=False) + contrib_repo.insert_many_contributions.return_value = None + # default max_versions -> {} (no existing contributions) + + summary = await svc.insert_contributions([_contrib_in(identifier="mp-1")]) + + assert summary.succeeded[0].version == 1 + + async def test_insert_non_unique_same_key_twice_sequences_versions(self): + svc, contrib_repo, *_ = _make_service(unique_identifiers=False) + contrib_repo.insert_many_contributions.return_value = None + contrib_repo.max_versions.return_value = {("proj", "dup"): 5} + + contribs = [_contrib_in(identifier="dup"), _contrib_in(identifier="dup")] + summary = await svc.insert_contributions(contribs) + + assert len(summary.succeeded) == 2 + assert sorted(d.version for d in summary.succeeded) == [6, 7] + + async def test_insert_project_not_found_is_validation_failure(self): + svc, contrib_repo, *_ = _make_service(projects=_projects_mock({})) # no projects known + + summary = await svc.insert_contributions([_contrib_in(identifier="mp-1")]) + + assert summary.succeeded == [] + assert [f.error_code for f in summary.failed] == ["validation_error"] + contrib_repo.insert_many_contributions.assert_not_called() + + async def test_upsert_unique_forces_version_one(self): + svc, contrib_repo, *_ = _make_service() # unique by default + contrib_repo.upsert_contribution_by_identifiers.return_value = MagicMock(spec=Contribution) + + # A supplied version is ignored for unique-identifier projects (inferred as 1). + await svc.upsert_contributions([_contrib_in(identifier="mp-1", version=9)]) + + assert contrib_repo.upsert_contribution_by_identifiers.call_args.args[2] == 1 + contrib_repo.max_versions.assert_not_called() + + async def test_upsert_non_unique_requires_version(self): + svc, contrib_repo, *_ = _make_service(unique_identifiers=False) + + summary = await svc.upsert_contributions([_contrib_in(identifier="mp-1")]) # no version + + assert summary.succeeded == [] + assert [f.error_code for f in summary.failed] == ["validation_error"] + contrib_repo.upsert_contribution_by_identifiers.assert_not_called() + + async def test_upsert_non_unique_passes_supplied_version(self): + svc, contrib_repo, *_ = _make_service(unique_identifiers=False) + contrib_repo.upsert_contribution_by_identifiers.return_value = MagicMock(spec=Contribution) + + await svc.upsert_contributions([_contrib_in(identifier="mp-1", version=7)]) + + assert contrib_repo.upsert_contribution_by_identifiers.call_args.args[2] == 7 + + # --------------------------------------------------------------------------- # upsert_contributions — guard clause # --------------------------------------------------------------------------- @@ -524,7 +637,7 @@ async def test_returns_repo_results_in_input_order(self): docs = [MagicMock(spec=Contribution, name=f"doc-{i}") for i in range(3)] returned = {} - async def _upsert(identifiers, contrib): + async def _upsert(identifiers, contrib, version): doc = docs[int(contrib.identifier.split("-")[1])] returned[contrib.identifier] = doc return doc @@ -564,7 +677,7 @@ async def test_same_key_concurrent_upserts_both_go_through_atomic_call(self): async def test_one_failure_is_reported_not_raised(self): svc, contrib_repo, *_ = _make_service() - async def _upsert(identifiers, contrib): + async def _upsert(identifiers, contrib, version): if contrib.identifier == "mp-1": raise ConflictError("boom") return MagicMock(spec=Contribution) diff --git a/mpcontribs-api/tests/unit/test_supervisord_render.py b/mpcontribs-api/tests/unit/test_supervisord_render.py index 19e660318c..e7461f21a3 100644 --- a/mpcontribs-api/tests/unit/test_supervisord_render.py +++ b/mpcontribs-api/tests/unit/test_supervisord_render.py @@ -15,10 +15,6 @@ # Names the new Settings model needs present in the process environment. REQUIRED_ENV_NAMES = [ "MPCONTRIBS_ENVIRONMENT", - "MPCONTRIBS_MONGO__URI", - "MPCONTRIBS_MONGO__DB_NAME", - "MPCONTRIBS_REDIS__ADDRESS", - "MPCONTRIBS_REDIS__URL", "MPCONTRIBS_MAIL_DEFAULT_SENDER", "MPCONTRIBS_VERSION", "MPCONTRIBS_OTEL__OTLP_ENDPOINT", From d37e82ad6fdcf22f6aadd9a3dc15a6b6ac13fbd6 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 1 Jul 2026 09:12:43 -0700 Subject: [PATCH 425/591] Added model and router to expose limits that well-behaved clients should observe --- .../domains/contributions/router.py | 23 +++++++++++++++++++ .../mpcontribs_api/domains/limits/models.py | 14 +++++++++++ .../mpcontribs_api/domains/limits/router.py | 18 +++++++++++++++ 3 files changed, 55 insertions(+) create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/limits/models.py create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/limits/router.py diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py index 42dcdf562f..73466eff28 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py @@ -4,6 +4,7 @@ from fastapi.responses import StreamingResponse from fastapi_filter import FilterDepends +from mpcontribs_api.config import get_settings from mpcontribs_api.dependencies import S3Dep, require_user from mpcontribs_api.domains._shared.bulk import BulkWriteSummary from mpcontribs_api.domains._shared.types import ( @@ -20,11 +21,31 @@ ContributionOut, ContributionPatch, ) +from mpcontribs_api.exceptions import ValidationError from mpcontribs_api.pagination import CursorParams router = APIRouter() +def _enforce_bulk_limit(contributions: list[ContributionIn]) -> None: + """Reject a bulk write larger than the configured per-request ceiling. + + Guards the synchronous bulk endpoints so a single request can't hand the service an unbounded + list. Callers over the limit should chunk (the limit is advertised at ``GET /api/v1/limits``) + or use the async bulk ingestion endpoint. Complements the body-size middleware, which bounds + bytes rather than item count. + """ + limit = get_settings().mongo.bulk_write_limit + count = len(contributions) + if count > limit: + raise ValidationError( + f"Bulk request of {count} contributions exceeds the per-request limit of {limit}. " + "Chunk the request (see GET /api/v1/limits) or use the async bulk ingestion endpoint.", + count=count, + limit=limit, + ) + + @router.get("") async def get_contributions( repo: ContributionDep, @@ -50,6 +71,7 @@ async def insert_contributions( service: ContributionServiceDep, contributions: list[ContributionIn], ): + _enforce_bulk_limit(contributions) return await service.insert_contributions(contributions=contributions) @@ -58,6 +80,7 @@ async def upsert_contributions( service: ContributionServiceDep, contributions: list[ContributionIn], ): + _enforce_bulk_limit(contributions) return await service.upsert_contributions(contributions=contributions) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/limits/models.py b/mpcontribs-api/src/mpcontribs_api/domains/limits/models.py new file mode 100644 index 0000000000..a1fccbc5f7 --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/domains/limits/models.py @@ -0,0 +1,14 @@ +from pydantic import BaseModel + + +class Limits(BaseModel): + """Server-enforced request limits, advertised so callers can size their requests. + + These mirror the values enforced by the body-size middleware and the bulk write endpoints; + consumers (e.g. the mpcontribs client) should read them here rather than hardcoding. + """ + + max_request_bytes: int + bulk_write_limit: int + max_components_per_contribution: int + component_insert_chunk_size: int diff --git a/mpcontribs-api/src/mpcontribs_api/domains/limits/router.py b/mpcontribs-api/src/mpcontribs_api/domains/limits/router.py new file mode 100644 index 0000000000..3d53939933 --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/domains/limits/router.py @@ -0,0 +1,18 @@ +from fastapi import APIRouter + +from mpcontribs_api.config import get_settings +from mpcontribs_api.domains.limits.models import Limits + +router = APIRouter() + + +@router.get("", response_model=Limits, summary="Server-enforced request limits") +async def get_limits() -> Limits: + """Return the request limits the server enforces. Public metadata; no auth required.""" + mongo = get_settings().mongo + return Limits( + max_request_bytes=mongo.max_request_bytes, + bulk_write_limit=mongo.bulk_write_limit, + max_components_per_contribution=mongo.max_components_per_contribution, + component_insert_chunk_size=mongo.component_insert_chunk_size, + ) From 91430ba373e649692b91282c5f36b4ec716528a2 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 1 Jul 2026 09:18:25 -0700 Subject: [PATCH 426/591] Added custom exceptions and middleware to immediately detect oversize requests --- .../src/mpcontribs_api/exceptions.py | 16 ++-- .../src/mpcontribs_api/middleware.py | 82 +++++++++++++++++++ 2 files changed, 93 insertions(+), 5 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/exceptions.py b/mpcontribs-api/src/mpcontribs_api/exceptions.py index d3fc03a199..d84e748178 100644 --- a/mpcontribs-api/src/mpcontribs_api/exceptions.py +++ b/mpcontribs-api/src/mpcontribs_api/exceptions.py @@ -68,6 +68,12 @@ class ValidationError(AppError): log_level = logging.INFO +class PayloadTooLargeError(AppError): + status_code = 413 + error_code = "payload_too_large" + log_level = logging.INFO # expected client error: caller sent an oversized body + + class PermissionError(AppError): status_code = 403 error_code = "permission_denied" @@ -80,7 +86,7 @@ class AuthenticationError(AppError): log_level = logging.WARNING # security-relevant: alertable, but not a server fault -def _error_body(error_code: str, message: str, **public_context) -> dict: +def error_body(error_code: str, message: str, **public_context) -> dict: body: dict[str, Any] = {"error": {"code": error_code, "message": message}} if public_context: body["error"]["detail"] = public_context @@ -112,7 +118,7 @@ async def _handle_app_error(request: Request, exc: AppError) -> JSONResponse: logger.log(level, exc.error_code, status_code=exc.status_code, **exc.context) return JSONResponse( status_code=exc.status_code, - content=_error_body( + content=error_body( exc.error_code, exc.message, # NOTE: not leaking context to client yet @@ -128,7 +134,7 @@ async def _handle_unexpected(request: Request, exc: Exception) -> JSONResponse: logger.exception("unhandled_exception") # full traceback return JSONResponse( status_code=500, - content=_error_body("internal_error", "An unexpected error occurred."), + content=error_body("internal_error", "An unexpected error occurred."), ) # Unify validation errors from pydantic with our exception format @@ -136,7 +142,7 @@ async def _handle_unexpected(request: Request, exc: Exception) -> JSONResponse: async def _handle_validation(_request: Request, exc: RequestValidationError) -> JSONResponse: return JSONResponse( status_code=422, - content=_error_body( + content=error_body( "validation_error", "Request validation failed", errors=jsonable_encoder(_sanitize_validation_errors(exc.errors())), @@ -151,5 +157,5 @@ async def _handle_http(request: Request, exc: StarletteHTTPException) -> JSONRes logger.error("http_error", status_code=exc.status_code, exc_info=exc) return JSONResponse( status_code=exc.status_code, - content=_error_body("http_error", str(exc.detail)), + content=error_body("http_error", str(exc.detail)), ) diff --git a/mpcontribs-api/src/mpcontribs_api/middleware.py b/mpcontribs-api/src/mpcontribs_api/middleware.py index 6a5c674366..8a463a2a22 100644 --- a/mpcontribs-api/src/mpcontribs_api/middleware.py +++ b/mpcontribs-api/src/mpcontribs_api/middleware.py @@ -13,9 +13,11 @@ from opentelemetry.sdk.metrics.export import PeriodicExportingMetricReader from opentelemetry.sdk.trace import TracerProvider from opentelemetry.sdk.trace.export import BatchSpanProcessor +from starlette.responses import JSONResponse from starlette.types import ASGIApp, Message, Receive, Scope, Send from mpcontribs_api.config import Settings +from mpcontribs_api.exceptions import PayloadTooLargeError, error_body from mpcontribs_api.logging import build_resource, get_logger if TYPE_CHECKING: @@ -151,6 +153,86 @@ def _emit_access_log( ) +class _BodyTooLarge(BaseException): + """Internal signal that the streamed body exceeded the limit. + + Derives from ``BaseException`` (not ``Exception``) on purpose: FastAPI's request-body parser + wraps body reads in ``except Exception`` and would otherwise convert our error into a generic + ``400``. A ``BaseException`` slips past that (and past Starlette's exception middleware) so it + propagates back to ``BodySizeLimitMiddleware``, which turns it into the uniform ``413``. + """ + + +class BodySizeLimitMiddleware: + """Reject request bodies larger than ``max_bytes`` so one caller can't OOM the worker. + + Two enforcement points, because a client can lie about (or omit) ``Content-Length``: + + - **Declared size:** if the ``Content-Length`` header exceeds the limit, respond ``413`` + immediately, before the body is read. This is the common case (the mpcontribs client and + any ``requests``-based caller set ``Content-Length``) and avoids buffering the upload at all. + - **Actual size:** otherwise wrap ``receive`` and accumulate the bytes actually delivered + (chunked transfers, or a lying header); once the running total exceeds the limit, abort. The + abort is signalled by a ``BaseException`` raised from the wrapped ``receive`` (see + :class:`_BodyTooLarge` for why) and caught here, so the response is the same uniform ``413`` + as the declared-size path, and the body is never fully buffered. + + Registered inside ``RequestContextMiddleware`` so rejected requests are still access-logged. + """ + + def __init__(self, app: ASGIApp, max_bytes: int) -> None: + self.app = app + self.max_bytes = max_bytes + + async def __call__(self, scope: Scope, receive: Receive, send: Send) -> None: + if scope["type"] != "http": + await self.app(scope, receive, send) + return + + headers = dict(scope["headers"]) + declared = self._declared_length(headers.get(b"content-length")) + if declared is not None and declared > self.max_bytes: + await self._reject(scope, receive, send) + return + + received = 0 + + async def limited_receive() -> Message: + nonlocal received + message = await receive() + if message["type"] == "http.request": + received += len(message.get("body", b"")) + if received > self.max_bytes: + raise _BodyTooLarge + return message + + try: + await self.app(scope, limited_receive, send) + except _BodyTooLarge: + # Overflow detected mid-body-read: the app hasn't started responding yet, so we own the + # response and emit the 413 ourselves. + await self._reject(scope, receive, send) + + @staticmethod + def _declared_length(raw: bytes | None) -> int | None: + if raw is None: + return None + try: + return int(raw) + except ValueError: + return None + + def _message(self) -> str: + return f"Request body exceeds the maximum allowed size of {self.max_bytes} bytes." + + async def _reject(self, scope: Scope, receive: Receive, send: Send) -> None: + response = JSONResponse( + status_code=PayloadTooLargeError.status_code, + content=error_body(PayloadTooLargeError.error_code, self._message()), + ) + await response(scope, receive, send) + + def configure_tracing(settings: Settings) -> None: """Register the global tracer and meter providers, exporting via OTLP/gRPC to the collector. From 4f902308510ddea91c4d59b8409e67f6296479f1 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 1 Jul 2026 09:19:24 -0700 Subject: [PATCH 427/591] Implementing limits endpoint, new exceptions & middleware, and added tests --- .../src/mpcontribs_api/api/v1/router.py | 2 + mpcontribs-api/src/mpcontribs_api/app.py | 11 ++- mpcontribs-api/src/mpcontribs_api/config.py | 17 +++- .../tests/integration/test_body_size_limit.py | 50 +++++++++++ .../tests/integration/test_bulk_limits.py | 78 ++++++++++++++++ .../integration/test_ingest_jobs_routes.py | 89 +++++++++++++++++++ mpcontribs-api/tests/unit/test_exceptions.py | 10 +-- 7 files changed, 247 insertions(+), 10 deletions(-) create mode 100644 mpcontribs-api/tests/integration/test_body_size_limit.py create mode 100644 mpcontribs-api/tests/integration/test_bulk_limits.py create mode 100644 mpcontribs-api/tests/integration/test_ingest_jobs_routes.py diff --git a/mpcontribs-api/src/mpcontribs_api/api/v1/router.py b/mpcontribs-api/src/mpcontribs_api/api/v1/router.py index 13dab175ce..871ce25bdd 100644 --- a/mpcontribs-api/src/mpcontribs_api/api/v1/router.py +++ b/mpcontribs-api/src/mpcontribs_api/api/v1/router.py @@ -2,6 +2,7 @@ from mpcontribs_api.domains.attachments.router import router as attachments_router from mpcontribs_api.domains.contributions.router import router as contributions_router +from mpcontribs_api.domains.limits.router import router as limits_router from mpcontribs_api.domains.projects.router import router as projects_router from mpcontribs_api.domains.structures.router import router as structures_router from mpcontribs_api.domains.tables.router import router as tables_router @@ -10,6 +11,7 @@ router.include_router(attachments_router, prefix="/attachments", tags=["attachments"]) router.include_router(contributions_router, prefix="/contributions", tags=["contributions"]) +router.include_router(limits_router, prefix="/limits", tags=["limits"]) router.include_router(projects_router, prefix="/projects", tags=["projects"]) router.include_router(structures_router, prefix="/structures", tags=["structures"]) router.include_router(tables_router, prefix="/tables", tags=["tables"]) diff --git a/mpcontribs-api/src/mpcontribs_api/app.py b/mpcontribs-api/src/mpcontribs_api/app.py index 0e50c916bb..58b77a2a7a 100644 --- a/mpcontribs-api/src/mpcontribs_api/app.py +++ b/mpcontribs-api/src/mpcontribs_api/app.py @@ -22,7 +22,12 @@ from mpcontribs_api.domains.tables.models import Table from mpcontribs_api.exceptions import register_exception_handlers from mpcontribs_api.logging import configure_logging, get_logger -from mpcontribs_api.middleware import RequestContextMiddleware, configure_tracing, instrument_app +from mpcontribs_api.middleware import ( + BodySizeLimitMiddleware, + RequestContextMiddleware, + configure_tracing, + instrument_app, +) logger = get_logger(__name__) @@ -114,6 +119,10 @@ def create_app(settings: Settings | None = None) -> FastAPI: dependencies=[Depends(api_key_scheme)], ) + # Reject oversized request bodies before they're buffered into memory. Added before + # RequestContextMiddleware: Starlette inserts each added middleware at the front of the stack, + # so the later-added RequestContextMiddleware stays outermost and still access-logs rejections. + app.add_middleware(BodySizeLimitMiddleware, max_bytes=settings.mongo.max_request_bytes) # Add request context to the logger app.add_middleware(RequestContextMiddleware) # Emit server-side request spans/metrics (no-op when telemetry is disabled). diff --git a/mpcontribs-api/src/mpcontribs_api/config.py b/mpcontribs-api/src/mpcontribs_api/config.py index 61f9f6cebf..3995eebb0e 100644 --- a/mpcontribs-api/src/mpcontribs_api/config.py +++ b/mpcontribs-api/src/mpcontribs_api/config.py @@ -82,10 +82,6 @@ class MongoSettings(BaseModel): default=0, description="Minimum number of concurent connections that the pool will maintain connected to each server ", ) - max_global_concurrent_writes: int = Field( - default=100, - description="Maximum number of writes allowed to happen simultaneously. Key for bulk write efficiency.", - ) datetime_conversion: Literal["datetime_ms", "datetime", "datetime_auto", "datetime_clamp"] = Field( default="datetime", description="Specifies how UTC datetimes should be decoded within BSON", @@ -133,6 +129,19 @@ class MongoSettings(BaseModel): default=100, description="Batch size used by component repositories when chunking insert_many calls inside a transaction.", ) + # TODO: Tune default + max_request_bytes: int = Field( + default=16 * 1024 * 1024, + description="Hard ceiling on the size (bytes) of any single request body. Requests exceeding it are rejected " + "with 413 before the body is read into memory, so one caller can't OOM the worker. Mirrors the client's " + "MAX_PAYLOAD (15MB) with headroom.", + ) + # TODO: Tune default + bulk_write_limit: int = Field( + default=1000, + description="Maximum number of items accepted in a single bulk contribution POST/PUT. Larger batches are " + "rejected with 422; callers should chunk (or use the async ingestion endpoint). Advertised via GET /limits.", + ) max_idle_time_ms: int = Field( default=30_000, description="The maximum allowed time a single connection is allowed to sit idle", diff --git a/mpcontribs-api/tests/integration/test_body_size_limit.py b/mpcontribs-api/tests/integration/test_body_size_limit.py new file mode 100644 index 0000000000..0e15e289d8 --- /dev/null +++ b/mpcontribs-api/tests/integration/test_body_size_limit.py @@ -0,0 +1,50 @@ +"""Tests for BodySizeLimitMiddleware — the 413 guard against oversized request bodies.""" + +import pytest +from fastapi import FastAPI +from fastapi.testclient import TestClient + +from mpcontribs_api.exceptions import register_exception_handlers +from mpcontribs_api.middleware import BodySizeLimitMiddleware + +MAX_BYTES = 1024 + + +def _make_app(max_bytes: int = MAX_BYTES) -> FastAPI: + app = FastAPI() + register_exception_handlers(app) + app.add_middleware(BodySizeLimitMiddleware, max_bytes=max_bytes) + + @app.post("/echo") + async def echo(payload: dict) -> dict: + return {"received": len(payload)} + + return app + + +@pytest.fixture +def client() -> TestClient: + return TestClient(_make_app(), raise_server_exceptions=False) + + +class TestBodySizeLimit: + def test_under_limit_passes(self, client: TestClient): + r = client.post("/echo", json={"a": 1}) + assert r.status_code == 200 + + def test_declared_content_length_over_limit_rejected(self, client: TestClient): + # A body whose Content-Length exceeds the ceiling is rejected before it's read. + big = {"blob": "x" * (MAX_BYTES * 2)} + r = client.post("/echo", json=big) + assert r.status_code == 413 + assert r.json()["error"]["code"] == "payload_too_large" + + def test_streamed_body_over_limit_rejected(self, client: TestClient): + # No Content-Length (chunked): the middleware accumulates and rejects via raised AppError, + # which the standard handler renders as a uniform 413. + def gen(): + yield b"x" * (MAX_BYTES * 2) + + r = client.post("/echo", content=gen()) + assert r.status_code == 413 + assert r.json()["error"]["code"] == "payload_too_large" diff --git a/mpcontribs-api/tests/integration/test_bulk_limits.py b/mpcontribs-api/tests/integration/test_bulk_limits.py new file mode 100644 index 0000000000..47021ac442 --- /dev/null +++ b/mpcontribs-api/tests/integration/test_bulk_limits.py @@ -0,0 +1,78 @@ +"""Tests for the per-request bulk-write count guard and the GET /limits contract endpoint.""" + +import pytest +from beanie import PydanticObjectId + +from mpcontribs_api.config import get_settings +from mpcontribs_api.domains._shared.bulk import BulkWriteSummary +from mpcontribs_api.domains.contributions.dependencies import get_contribution_service +from tests.integration.conftest import AUTHED_HEADERS + + +def _valid_contribution_body(**overrides) -> dict: + body = { + "_id": str(PydanticObjectId()), + "project": "test-project", + "identifier": "mp-1234", + "formula": "Fe2O3", + "data": {"band_gap": 2.1}, + } + body.update(overrides) + return body + + +@pytest.fixture +def contribution_service(test_app, mock_contribution_service): + test_app.dependency_overrides[get_contribution_service] = lambda: mock_contribution_service + yield mock_contribution_service + test_app.dependency_overrides.pop(get_contribution_service, None) + + +@pytest.fixture(autouse=True) +def _authenticate(client): + client.headers.update(AUTHED_HEADERS) + + +class TestBulkWriteLimit: + @pytest.fixture(autouse=True) + def _small_limit(self, monkeypatch): + # Shrink the limit so the test doesn't need to build 1000+ bodies. + monkeypatch.setattr(get_settings().mongo, "bulk_write_limit", 2) + + def test_over_limit_post_returns_422(self, client, contribution_service): + body = [_valid_contribution_body() for _ in range(3)] + r = client.post("/api/v1/contributions", json=body) + assert r.status_code == 422 + assert r.json()["error"]["code"] == "validation_error" + contribution_service.insert_contributions.assert_not_called() + + def test_at_limit_post_passes(self, client, contribution_service): + contribution_service.insert_contributions.return_value = BulkWriteSummary(total=2, succeeded=[], failed=[]) + body = [_valid_contribution_body() for _ in range(2)] + r = client.post("/api/v1/contributions", json=body) + assert r.status_code == 200 + contribution_service.insert_contributions.assert_called_once() + + def test_over_limit_put_returns_422(self, client, contribution_service): + body = [_valid_contribution_body() for _ in range(3)] + r = client.put("/api/v1/contributions", json=body) + assert r.status_code == 422 + contribution_service.upsert_contributions.assert_not_called() + + +class TestLimitsEndpoint: + def test_limits_reports_configured_values(self, client): + mongo = get_settings().mongo + r = client.get("/api/v1/limits") + assert r.status_code == 200 + assert r.json() == { + "max_request_bytes": mongo.max_request_bytes, + "bulk_write_limit": mongo.bulk_write_limit, + "max_components_per_contribution": mongo.max_components_per_contribution, + "component_insert_chunk_size": mongo.component_insert_chunk_size, + } + + def test_limits_is_public(self, client): + # No auth headers: still readable (public metadata). + client.headers.clear() + assert client.get("/api/v1/limits").status_code == 200 diff --git a/mpcontribs-api/tests/integration/test_ingest_jobs_routes.py b/mpcontribs-api/tests/integration/test_ingest_jobs_routes.py new file mode 100644 index 0000000000..10465867b7 --- /dev/null +++ b/mpcontribs-api/tests/integration/test_ingest_jobs_routes.py @@ -0,0 +1,89 @@ +"""Tests for the async bulk-ingestion scaffold routes (submit / status). + +The worker is a stub, so these exercise only the route surface: 202 on submit, a persisted +pending job, idempotency replay, auth, and status lookup (found / not-found / bad id). +""" + +from unittest.mock import AsyncMock + +import pytest +from beanie import PydanticObjectId + +from mpcontribs_api.domains.ingest_jobs.dependencies import get_ingest_job_repository +from mpcontribs_api.domains.ingest_jobs.models import IngestJob +from tests.integration.conftest import AUTHED_HEADERS, FORCE_ANON_HEADERS + +BULK_URL = "/api/v1/contributions/bulk" + + +def _job(**overrides) -> IngestJob: + fields = { + "id": PydanticObjectId(), + "owner": "google:alice@example.com", + "status": "pending", + "source": None, + "idempotency_key": None, + } + fields.update(overrides) + return IngestJob(**fields) + + +@pytest.fixture +def ingest_repo(test_app): + repo = AsyncMock() + test_app.dependency_overrides[get_ingest_job_repository] = lambda: repo + yield repo + test_app.dependency_overrides.pop(get_ingest_job_repository, None) + + +@pytest.fixture(autouse=True) +def _authenticate(client): + client.headers.update(AUTHED_HEADERS) + + +class TestSubmitBulkIngest: + def test_submit_returns_202_and_pending_job(self, client, ingest_repo): + job = _job() + ingest_repo.create_job.return_value = job + r = client.post(BULK_URL, json={"source": None}) + assert r.status_code == 202 + body = r.json() + assert body["id"] == str(job.id) + assert body["status"] == "pending" + ingest_repo.create_job.assert_awaited_once() + + def test_submit_requires_auth(self, client, test_app): + # No repo override here: the repository dependency runs require_user, which rejects anon. + r = client.post(BULK_URL, json={"source": None}, headers=FORCE_ANON_HEADERS) + assert r.status_code == 401 + + def test_idempotency_key_replays_existing_job(self, client, ingest_repo): + existing = _job(idempotency_key="abc123") + ingest_repo.find_by_idempotency_key.return_value = existing + r = client.post(BULK_URL, json={"source": None}, headers={"Idempotency-Key": "abc123"}) + assert r.status_code == 202 + assert r.json()["id"] == str(existing.id) + ingest_repo.find_by_idempotency_key.assert_awaited_once_with("abc123") + ingest_repo.create_job.assert_not_called() + + +class TestGetBulkIngestJob: + def test_get_existing_job(self, client, ingest_repo): + job = _job(status="running", total=10, succeeded=4) + ingest_repo.get_job.return_value = job + r = client.get(f"{BULK_URL}/{job.id}") + assert r.status_code == 200 + body = r.json() + assert body["status"] == "running" + assert body["total"] == 10 + assert body["succeeded"] == 4 + + def test_unknown_job_returns_404(self, client, ingest_repo): + ingest_repo.get_job.return_value = None + r = client.get(f"{BULK_URL}/{PydanticObjectId()}") + assert r.status_code == 404 + + def test_invalid_job_id_returns_422(self, client, ingest_repo): + r = client.get(f"{BULK_URL}/not-an-object-id") + assert r.status_code == 422 + ingest_repo.get_job.assert_not_called() diff --git a/mpcontribs-api/tests/unit/test_exceptions.py b/mpcontribs-api/tests/unit/test_exceptions.py index 894dfec0c1..7e167a5813 100644 --- a/mpcontribs-api/tests/unit/test_exceptions.py +++ b/mpcontribs-api/tests/unit/test_exceptions.py @@ -7,28 +7,28 @@ NotFoundError, PermissionError, ValidationError, - _error_body, _sanitize_validation_errors, + error_body, ) class TestErrorBody: def test_minimal_body(self): - body = _error_body("not_found", "Resource not found") + body = error_body("not_found", "Resource not found") assert body == {"error": {"code": "not_found", "message": "Resource not found"}} def test_body_with_context(self): - body = _error_body("not_found", "Resource not found", resource_id="abc", resource_type="project") + body = error_body("not_found", "Resource not found", resource_id="abc", resource_type="project") assert body["error"]["code"] == "not_found" assert body["error"]["message"] == "Resource not found" assert body["error"]["detail"] == {"resource_id": "abc", "resource_type": "project"} def test_no_detail_key_without_context(self): - body = _error_body("conflict", "Duplicate id") + body = error_body("conflict", "Duplicate id") assert "detail" not in body["error"] def test_detail_present_with_context(self): - body = _error_body("conflict", "Duplicate id", existing_id="xyz") + body = error_body("conflict", "Duplicate id", existing_id="xyz") assert "detail" in body["error"] From c41bab2085dec8eac5a635977feb1547161ed1ad Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 9 Jul 2026 16:07:28 -0700 Subject: [PATCH 428/591] Added docstrings to Contribution classes --- .../domains/contributions/models.py | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py index c200aec70e..5d5e08c432 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py @@ -75,6 +75,8 @@ def _validate_nested_keys(value: Any) -> None: class ContributionBase(BaseDocumentWithInput[PydanticObjectId]): + """Shared settings and fields for Contribution, ContributionIn, and ContributionOut.""" + project: str identifier: str formula: str @@ -106,6 +108,8 @@ class Settings: class Contribution(ContributionBase): + """Models what is actually stored in the database.""" + is_public: bool # Server-owned: the service resolves the real version (see ContributionService._split_non_unique) # and stamps it on the doc. Defaults to 1 so the no-version (unique-identifier) case is implicit. @@ -135,6 +139,11 @@ def set_last_modified(self): class ContributionIn(ContributionBase): + """Fields that users are allowed to submit when adding a Contribution. + + version will be inferred if left as None + """ + # Only meaningful on upsert/update of a non-unique-identifier project, where it selects which # version to target. Ignored on insert (the service auto-assigns) and for unique-identifier # projects (inferred as 1). @@ -157,6 +166,11 @@ def identifiers(self) -> dict[str, str]: class ContributionOut(DocumentOut[PydanticObjectId]): + """Models what the users are allowed to see in a return. + + Users can specify further what they want to see if not everything is of interest + """ + project: str | None = None identifier: str | None = None version: int | None = None @@ -186,6 +200,8 @@ def default_fields() -> list[str]: class ContributionPatch(SparseFieldsModel): + """Fields that can be specified for partial updates to a Contribution.""" + project: str | None = None identifier: str | None = None version: int | None = None @@ -202,6 +218,11 @@ class ContributionPatch(SparseFieldsModel): class ContributionFilter(BaseFilter): + """How users can filter searches for Contributions. + + Includes filters for linked documents (Components) + """ + id: PydanticObjectId | None = None id__in: list[PydanticObjectId] | None = None id__neq: PydanticObjectId | None = None From 860b68454ad0164c646634da8ef19346f9b1955f Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 9 Jul 2026 16:10:38 -0700 Subject: [PATCH 429/591] Changed default needs_build to False and removed from ContributionBase so ContributionIn does not need it. --- .../src/mpcontribs_api/domains/contributions/models.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py index 5d5e08c432..b445724831 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py @@ -87,7 +87,7 @@ class ContributionBase(BaseDocumentWithInput[PydanticObjectId]): ] # TODO: Verify that this should default to True and be passed by users - needs_build: bool = True + needs_build: bool = False last_modified: datetime = Field(default_factory=lambda: datetime.now(UTC)) class Settings: @@ -117,7 +117,7 @@ class Contribution(ContributionBase): structures: list[Link[Structure]] | None = None tables: list[Link[Table]] | None = None attachments: list[Link[Attachment]] | None = None - # needs_build: bool = True + # needs_build: bool = False @classmethod def from_input_model(cls, data: ContributionIn) -> Contribution: From d65a5a2442f257b1ed3f88b1ec6e041652115c2b Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 9 Jul 2026 16:15:29 -0700 Subject: [PATCH 430/591] Added deprecation annotations to needs_build --- .../src/mpcontribs_api/domains/contributions/models.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py index b445724831..499a3d8183 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py @@ -1,6 +1,7 @@ import re from datetime import UTC, datetime from typing import Annotated, Any +from warnings import deprecated from beanie import ( Insert, @@ -86,8 +87,6 @@ class ContributionBase(BaseDocumentWithInput[PydanticObjectId]): BeforeValidator(_validate_keys), ] - # TODO: Verify that this should default to True and be passed by users - needs_build: bool = False last_modified: datetime = Field(default_factory=lambda: datetime.now(UTC)) class Settings: @@ -117,7 +116,7 @@ class Contribution(ContributionBase): structures: list[Link[Structure]] | None = None tables: list[Link[Table]] | None = None attachments: list[Link[Attachment]] | None = None - # needs_build: bool = False + needs_build: Annotated[bool | None, deprecated("'needs_build' is deprecated.")] = False @classmethod def from_input_model(cls, data: ContributionIn) -> Contribution: @@ -177,7 +176,7 @@ class ContributionOut(DocumentOut[PydanticObjectId]): formula: str | None = None is_public: bool | None = None last_modified: datetime | None = None - needs_build: bool | None = None + needs_build: Annotated[bool | None, deprecated("'needs_build' is deprecated.")] = None # No input validators on the read path: stored documents are trusted, and re-validating here # would 500 on historical data that missed the correction (see carrier_transport contribs) data: dict[str, Any] | None = None @@ -206,7 +205,7 @@ class ContributionPatch(SparseFieldsModel): identifier: str | None = None version: int | None = None formula: str | None = None - needs_build: bool | None = None + needs_build: Annotated[bool | None, deprecated("'needs_build' is deprecated.")] = None data: Annotated[ dict[str, Any] | None, BeforeValidator(_validate_data_depth), From 0360aa717d8935f15cc56ae461d34c352e32acd6 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 9 Jul 2026 16:17:48 -0700 Subject: [PATCH 431/591] Added is_public=False to ContributionBase and ContributionPatch --- .../src/mpcontribs_api/domains/contributions/models.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py index 499a3d8183..019bfcc774 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py @@ -81,6 +81,7 @@ class ContributionBase(BaseDocumentWithInput[PydanticObjectId]): project: str identifier: str formula: str + is_public: bool = False data: Annotated[ dict[str, Any], BeforeValidator(_validate_data_depth), @@ -206,6 +207,7 @@ class ContributionPatch(SparseFieldsModel): version: int | None = None formula: str | None = None needs_build: Annotated[bool | None, deprecated("'needs_build' is deprecated.")] = None + is_public: bool | None = None data: Annotated[ dict[str, Any] | None, BeforeValidator(_validate_data_depth), From e1b4103d3b1e0c0fc00abcef2998b865df91b302 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 9 Jul 2026 16:19:34 -0700 Subject: [PATCH 432/591] Removed needs_build from ContributionOut.default_fields() and from ContributionPatch --- .../src/mpcontribs_api/domains/contributions/models.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py index 019bfcc774..8c4ceadfe1 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py @@ -110,7 +110,6 @@ class Settings: class Contribution(ContributionBase): """Models what is actually stored in the database.""" - is_public: bool # Server-owned: the service resolves the real version (see ContributionService._split_non_unique) # and stamps it on the doc. Defaults to 1 so the no-version (unique-identifier) case is implicit. version: int = 1 @@ -195,7 +194,6 @@ def default_fields() -> list[str]: "formula", "is_public", "last_modified", - "needs_build", ] @@ -206,7 +204,6 @@ class ContributionPatch(SparseFieldsModel): identifier: str | None = None version: int | None = None formula: str | None = None - needs_build: Annotated[bool | None, deprecated("'needs_build' is deprecated.")] = None is_public: bool | None = None data: Annotated[ dict[str, Any] | None, From e8b8b238e321207cb6e626ed1aff3e2a27ea302a Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 9 Jul 2026 16:54:49 -0700 Subject: [PATCH 433/591] Removed user from Contribution repository since the authz is handled by the service. --- .../mpcontribs_api/domains/contributions/repository.py | 9 --------- 1 file changed, 9 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py index 82b91c31b7..09eb3e5f31 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py @@ -18,7 +18,6 @@ ContributionOut, ContributionPatch, ) -from mpcontribs_api.exceptions import PermissionError from mpcontribs_api.pagination import CursorParams @@ -36,10 +35,6 @@ class MongoDbContributionRepository( document_model = Contribution out_model = ContributionOut - def __init__(self, user: User) -> None: - super().__init__(user) - self._user = user - @staticmethod def _build_scope(user: User) -> dict[str, Any]: """Provides scope based on current user's permitted groups and publicly released data.""" @@ -253,10 +248,6 @@ async def upsert_contribution_by_identifiers( Returns: Contribution: the document as it stands after the operation """ - # Make sure the user is allowed to upsert a contribution under the provided project - if not self._user.can_write(identifiers["project"]): - raise PermissionError(f"not authorized to write to project '{identifiers['project']}'") - doc = self.document_model.from_input_model(contribution) doc.version = version update_data = doc.model_dump(exclude={"id"}, exclude_none=True) From e35d6a296f414858d6b8a8b5147a2672febca259 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 13 Jul 2026 11:57:55 -0700 Subject: [PATCH 434/591] Added manual specfication of username and groups when in dev context --- mpcontribs-api/src/mpcontribs_api/app.py | 16 ++++++++++++++-- mpcontribs-api/src/mpcontribs_api/authz.py | 16 ++++++++++++++++ 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/app.py b/mpcontribs-api/src/mpcontribs_api/app.py index 58b77a2a7a..aa370d0e45 100644 --- a/mpcontribs-api/src/mpcontribs_api/app.py +++ b/mpcontribs-api/src/mpcontribs_api/app.py @@ -11,7 +11,11 @@ from mpcontribs_api._openapi import contact_info, license_info, openapi_tags from mpcontribs_api.api.v1.router import router as v1_router -from mpcontribs_api.authz import api_key_scheme +from mpcontribs_api.authz import ( + api_key_scheme, + authenticated_groups_scheme, + consumer_username_scheme, +) from mpcontribs_api.config import Settings, get_settings from mpcontribs_api.domains._redirects.router import router as redirects_router from mpcontribs_api.domains.attachments.models import Attachment @@ -102,6 +106,14 @@ def create_app(settings: Settings | None = None) -> FastAPI: configure_tracing(settings) configure_logging(settings) + # In prod, Kong injects identity headers; locally expose them as Authorize fields. + security_deps = [Depends(api_key_scheme)] + if settings.environment != "prod": + security_deps += [ + Depends(consumer_username_scheme), + Depends(authenticated_groups_scheme), + ] + app = FastAPI( title="mpcontribs-api", description="Operations to contribute, update and retrieve materials data on Materials Project", @@ -116,7 +128,7 @@ def create_app(settings: Settings | None = None) -> FastAPI: swagger_ui_parameters={ "docExpansion": "none", }, - dependencies=[Depends(api_key_scheme)], + dependencies=security_deps, ) # Reject oversized request bodies before they're buffered into memory. Added before diff --git a/mpcontribs-api/src/mpcontribs_api/authz.py b/mpcontribs-api/src/mpcontribs_api/authz.py index 1982d1a129..2a56f7dc65 100644 --- a/mpcontribs-api/src/mpcontribs_api/authz.py +++ b/mpcontribs-api/src/mpcontribs_api/authz.py @@ -15,6 +15,22 @@ ) +# Dev-only impersonation schemes: locally there is no Kong to translate an API key +# into identity headers, so expose the headers Kong would inject as Authorize fields. +consumer_username_scheme = APIKeyHeader( + name="X-Consumer-Username", + scheme_name="X-Consumer-Username", + auto_error=False, + description="[dev only] Impersonate a Kong-authenticated username", +) +authenticated_groups_scheme = APIKeyHeader( + name="X-Authenticated-Groups", + scheme_name="X-Authenticated-Groups", + auto_error=False, + description="[dev only] Comma-separated groups (incl. your project / admin group)", +) + + ADMIN_GROUP = settings.mongo.admin_group From 4f9d4a8b8d58f707615f7027bf7dbc3bd83d3ff1 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Tue, 14 Jul 2026 11:34:38 -0700 Subject: [PATCH 435/591] Removed outdated tests --- .../integration/test_ingest_jobs_routes.py | 89 ------------------- .../unit/domains/test_contributions_models.py | 2 - 2 files changed, 91 deletions(-) delete mode 100644 mpcontribs-api/tests/integration/test_ingest_jobs_routes.py diff --git a/mpcontribs-api/tests/integration/test_ingest_jobs_routes.py b/mpcontribs-api/tests/integration/test_ingest_jobs_routes.py deleted file mode 100644 index 10465867b7..0000000000 --- a/mpcontribs-api/tests/integration/test_ingest_jobs_routes.py +++ /dev/null @@ -1,89 +0,0 @@ -"""Tests for the async bulk-ingestion scaffold routes (submit / status). - -The worker is a stub, so these exercise only the route surface: 202 on submit, a persisted -pending job, idempotency replay, auth, and status lookup (found / not-found / bad id). -""" - -from unittest.mock import AsyncMock - -import pytest -from beanie import PydanticObjectId - -from mpcontribs_api.domains.ingest_jobs.dependencies import get_ingest_job_repository -from mpcontribs_api.domains.ingest_jobs.models import IngestJob -from tests.integration.conftest import AUTHED_HEADERS, FORCE_ANON_HEADERS - -BULK_URL = "/api/v1/contributions/bulk" - - -def _job(**overrides) -> IngestJob: - fields = { - "id": PydanticObjectId(), - "owner": "google:alice@example.com", - "status": "pending", - "source": None, - "idempotency_key": None, - } - fields.update(overrides) - return IngestJob(**fields) - - -@pytest.fixture -def ingest_repo(test_app): - repo = AsyncMock() - test_app.dependency_overrides[get_ingest_job_repository] = lambda: repo - yield repo - test_app.dependency_overrides.pop(get_ingest_job_repository, None) - - -@pytest.fixture(autouse=True) -def _authenticate(client): - client.headers.update(AUTHED_HEADERS) - - -class TestSubmitBulkIngest: - def test_submit_returns_202_and_pending_job(self, client, ingest_repo): - job = _job() - ingest_repo.create_job.return_value = job - r = client.post(BULK_URL, json={"source": None}) - assert r.status_code == 202 - body = r.json() - assert body["id"] == str(job.id) - assert body["status"] == "pending" - ingest_repo.create_job.assert_awaited_once() - - def test_submit_requires_auth(self, client, test_app): - # No repo override here: the repository dependency runs require_user, which rejects anon. - r = client.post(BULK_URL, json={"source": None}, headers=FORCE_ANON_HEADERS) - assert r.status_code == 401 - - def test_idempotency_key_replays_existing_job(self, client, ingest_repo): - existing = _job(idempotency_key="abc123") - ingest_repo.find_by_idempotency_key.return_value = existing - r = client.post(BULK_URL, json={"source": None}, headers={"Idempotency-Key": "abc123"}) - assert r.status_code == 202 - assert r.json()["id"] == str(existing.id) - ingest_repo.find_by_idempotency_key.assert_awaited_once_with("abc123") - ingest_repo.create_job.assert_not_called() - - -class TestGetBulkIngestJob: - def test_get_existing_job(self, client, ingest_repo): - job = _job(status="running", total=10, succeeded=4) - ingest_repo.get_job.return_value = job - r = client.get(f"{BULK_URL}/{job.id}") - assert r.status_code == 200 - body = r.json() - assert body["status"] == "running" - assert body["total"] == 10 - assert body["succeeded"] == 4 - - def test_unknown_job_returns_404(self, client, ingest_repo): - ingest_repo.get_job.return_value = None - r = client.get(f"{BULK_URL}/{PydanticObjectId()}") - assert r.status_code == 404 - - def test_invalid_job_id_returns_422(self, client, ingest_repo): - r = client.get(f"{BULK_URL}/not-an-object-id") - assert r.status_code == 422 - ingest_repo.get_job.assert_not_called() diff --git a/mpcontribs-api/tests/unit/domains/test_contributions_models.py b/mpcontribs-api/tests/unit/domains/test_contributions_models.py index acabd18254..a571be0598 100644 --- a/mpcontribs-api/tests/unit/domains/test_contributions_models.py +++ b/mpcontribs-api/tests/unit/domains/test_contributions_models.py @@ -57,7 +57,6 @@ def test_required_fields_set_correctly(self): def test_defaults(self): contrib = _make_contribution_in() - assert contrib.needs_build is True assert contrib.structures is None assert contrib.tables is None assert contrib.attachments is None @@ -208,7 +207,6 @@ def test_all_fields_optional(self): def test_partial_patch(self): patch = ContributionPatch(formula="Li2O", needs_build=False) assert patch.formula == "Li2O" - assert patch.needs_build is False assert patch.project is None def test_data_can_be_set(self): From 124b98364c43b12da2d096ac83eda607a3366302 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Tue, 14 Jul 2026 11:34:58 -0700 Subject: [PATCH 436/591] Removed unnecessary generic specification --- mpcontribs-api/src/mpcontribs_api/domains/_shared/bulk.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/bulk.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/bulk.py index 718e2c580f..4284563981 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/bulk.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/bulk.py @@ -27,7 +27,7 @@ class BulkWriteSummary[T](BaseModel): failed: list[BulkFailure] -class BulkDeleteSummary[T](BaseModel): +class BulkDeleteSummary(BaseModel): num_deleted: int num_children_deleted: int From beabcd696f511f96717f9ac583be03256f5fb64b Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Tue, 14 Jul 2026 11:42:53 -0700 Subject: [PATCH 437/591] Added DownloadError and default case to _shared/repo for downloads --- .../src/mpcontribs_api/domains/_shared/repository.py | 4 +++- mpcontribs-api/src/mpcontribs_api/exceptions.py | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py index 4e32775443..66c940d3bc 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py @@ -19,7 +19,7 @@ from mpcontribs_api.authz import User from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DeleteResponse, DocumentOut from mpcontribs_api.domains._shared.types import DownloadFormat, ShortMimeFormat -from mpcontribs_api.exceptions import ConflictError, NotFoundError, ValidationError +from mpcontribs_api.exceptions import ConflictError, DownloadError, NotFoundError, ValidationError from mpcontribs_api.pagination import CursorParams, Page, encode_cursor @@ -229,6 +229,8 @@ def _get_serializer( return self._serialize_jsonl case DownloadFormat.CSV: return lambda rows: self._serialize_csv(rows, fields) + case _: + raise DownloadError("download format unhandled", format=format) @staticmethod async def _serialize_jsonl(rows: AsyncIterable) -> AsyncIterator[bytes]: diff --git a/mpcontribs-api/src/mpcontribs_api/exceptions.py b/mpcontribs-api/src/mpcontribs_api/exceptions.py index d84e748178..f6dfd32040 100644 --- a/mpcontribs-api/src/mpcontribs_api/exceptions.py +++ b/mpcontribs-api/src/mpcontribs_api/exceptions.py @@ -86,6 +86,11 @@ class AuthenticationError(AppError): log_level = logging.WARNING # security-relevant: alertable, but not a server fault +class DownloadError(AppError): + status_code = 415 + error_code = "download_error" + log_level = logging.WARNING + def error_body(error_code: str, message: str, **public_context) -> dict: body: dict[str, Any] = {"error": {"code": error_code, "message": message}} if public_context: From d4c3158d78d4bb02c55ff6c55fcb45775e6c6f30 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Tue, 14 Jul 2026 12:07:14 -0700 Subject: [PATCH 438/591] StructurePatch requires all non-name fields specified for an update and only allows charge to be None. Added tests for it --- .../domains/structures/models.py | 19 ++- .../unit/domains/test_structures_models.py | 147 +++++++++++++++++- 2 files changed, 163 insertions(+), 3 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py index b4c8f6aa53..a9c965cfee 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py @@ -1,10 +1,13 @@ +from typing import Self + from beanie import PydanticObjectId -from pydantic import BaseModel, ConfigDict +from pydantic import BaseModel, ConfigDict, model_validator from pymatgen.core import Element from mpcontribs_api.domains._shared.filters import BaseFilter from mpcontribs_api.domains._shared.models import Component, ComponentIn, DocumentOut from mpcontribs_api.domains._shared.types import MD5Hash, PolarsFrame +from mpcontribs_api.exceptions import ValidationError from mpcontribs_api.projection import SparseFieldsModel @@ -91,6 +94,20 @@ class StructurePatch(SparseFieldsModel): charge: float | None = None cif: str | None = None + @model_validator(mode="after") + def require_all_data_fields(self) -> Self: + """If any of {lattice, sites, charge, cif} are being updated, all must be specified. + + charge is nullable; lattice, sites, and cif must be non-null when patched. + """ + data_fields = frozenset({"lattice", "sites", "charge", "cif"}) + set_fields = data_fields & self.model_fields_set + if set_fields and set_fields != data_fields: + raise ValidationError("must specify all {lattice, sites, charge, cif} if updating one.", update=self) + if set_fields and (self.lattice is None or self.sites is None or self.cif is None): + raise ValidationError("lattice, sites, and cif must be non-null.", update=self) + return self + class StructureFilter(BaseFilter): id: PydanticObjectId | None = None diff --git a/mpcontribs-api/tests/unit/domains/test_structures_models.py b/mpcontribs-api/tests/unit/domains/test_structures_models.py index 213724b871..d4261ba3fe 100644 --- a/mpcontribs-api/tests/unit/domains/test_structures_models.py +++ b/mpcontribs-api/tests/unit/domains/test_structures_models.py @@ -207,17 +207,160 @@ def test_partial_patch_excludes_unset(self): assert patch.model_dump(exclude_unset=True) == {"name": "renamed"} def test_lattice_patchable(self): - patch = StructurePatch(lattice=_lattice_payload()) + # require_all_data_fields forces the full data-field set to be present. + patch = StructurePatch( + lattice=_lattice_payload(), + sites=[_site_payload()], + charge=0.0, + cif="data_Fe2O3\n", + ) assert patch.lattice is not None assert patch.lattice.volume == 1.0 def test_sites_is_a_list(self): # Regression: sites must be list[Site], not a single Site. - patch = StructurePatch(sites=[_site_payload()]) + patch = StructurePatch( + lattice=_lattice_payload(), + sites=[_site_payload()], + charge=0.0, + cif="data_Fe2O3\n", + ) assert isinstance(patch.sites, list) assert patch.sites[0].label == "Fe" +class TestStructurePatchRequireAllDataFields: + """Coverage for the ``require_all_data_fields`` model validator. + + The data fields are {lattice, sites, charge, cif}. The rule: if any of them + is set, all of them must be set. ``name`` is metadata and is exempt. + """ + + def _all_data_fields(self, **overrides) -> dict: + payload = { + "lattice": _lattice_payload(), + "sites": [_site_payload()], + "charge": 0.0, + "cif": "data_Fe2O3\n", + } + payload.update(overrides) + return payload + + # -- passing cases ------------------------------------------------------- + + def test_empty_patch_passes(self): + # No data fields set at all: nothing to enforce. + assert StructurePatch().model_dump(exclude_unset=True) == {} + + def test_only_name_passes(self): + # name is not a data field, so a name-only patch is allowed. + patch = StructurePatch(name="renamed") + assert patch.name == "renamed" + + def test_all_data_fields_set_passes(self): + patch = StructurePatch(**self._all_data_fields()) + assert patch.lattice is not None + assert patch.sites is not None + assert patch.charge == 0.0 + assert patch.cif == "data_Fe2O3\n" + + def test_all_data_fields_plus_name_passes(self): + patch = StructurePatch(**self._all_data_fields(name="renamed")) + assert patch.name == "renamed" + assert patch.cif == "data_Fe2O3\n" + + def test_all_data_fields_with_charge_zero_passes(self): + # 0.0 is a legitimate, "set" value and must not be treated as absent. + patch = StructurePatch(**self._all_data_fields(charge=0.0)) + assert patch.charge == 0.0 + + # -- failing cases: exactly one field set -------------------------------- + + @pytest.mark.parametrize( + "field, value", + [ + ("lattice", _lattice_payload()), + ("sites", [_site_payload()]), + ("charge", 1.0), + ("cif", "data_Fe2O3\n"), + ], + ) + def test_single_data_field_raises(self, field, value): + with pytest.raises(AppValidationError): + StructurePatch(**{field: value}) + + def test_single_data_field_with_name_raises(self): + # name does not satisfy the "all data fields" requirement. + with pytest.raises(AppValidationError): + StructurePatch(name="renamed", charge=1.0) + + # -- failing cases: some but not all ------------------------------------- + + def test_three_of_four_fields_raises(self): + # Everything except charge -> still incomplete. + payload = self._all_data_fields() + del payload["charge"] + with pytest.raises(AppValidationError): + StructurePatch(**payload) + + def test_two_of_four_fields_raises(self): + with pytest.raises(AppValidationError): + StructurePatch(lattice=_lattice_payload(), cif="data_Fe2O3\n") + + def test_explicit_none_charge_counts_as_set(self): + # Enforcement is by which fields were explicitly provided, not by value. + # An explicit charge=None satisfies the requirement. + patch = StructurePatch( + lattice=_lattice_payload(), + sites=[_site_payload()], + cif="data_Fe2O3\n", + charge=None, + ) + assert patch.charge is None + assert "charge" in patch.model_fields_set + + def test_omitted_charge_counts_as_unset(self): + # Omitting charge entirely (three-of-four provided) is still rejected. + with pytest.raises(AppValidationError): + StructurePatch( + lattice=_lattice_payload(), + sites=[_site_payload()], + cif="data_Fe2O3\n", + ) + + # -- failing cases: null non-nullable data fields ------------------------ + # + # lattice, sites, and cif are required/non-null on the Structure document, + # so patching them to None is rejected even when all four are provided. + + @pytest.mark.parametrize("field", ["lattice", "sites", "cif"]) + def test_null_non_nullable_field_raises(self, field): + with pytest.raises(AppValidationError): + StructurePatch(**self._all_data_fields(**{field: None})) + + def test_all_non_nullable_fields_null_raises(self): + with pytest.raises(AppValidationError): + StructurePatch(lattice=None, sites=None, charge=None, cif=None) + + def test_null_non_nullable_error_message(self): + with pytest.raises(AppValidationError) as exc_info: + StructurePatch(**self._all_data_fields(cif=None)) + assert "non-null" in exc_info.value.message + + # -- error content ------------------------------------------------------- + + def test_error_message_and_context(self): + with pytest.raises(AppValidationError) as exc_info: + StructurePatch(charge=1.0) + err = exc_info.value + assert "lattice" in err.message + assert err.status_code == 422 + assert err.error_code == "validation_error" + # The offending model is attached as context for logging. + assert "update" in err.context + assert isinstance(err.context["update"], StructurePatch) + + # --------------------------------------------------------------------------- # StructureFilter # --------------------------------------------------------------------------- From 1b72f078ffadbd3da5f75db2696e5d1ed482f218 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Tue, 14 Jul 2026 12:11:58 -0700 Subject: [PATCH 439/591] Removed dead code --- mpcontribs-api/src/mpcontribs_api/dependencies.py | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/dependencies.py b/mpcontribs-api/src/mpcontribs_api/dependencies.py index cadf3d0013..c13c84643a 100644 --- a/mpcontribs-api/src/mpcontribs_api/dependencies.py +++ b/mpcontribs-api/src/mpcontribs_api/dependencies.py @@ -72,14 +72,3 @@ def require_user(user: UserDep) -> User: raise AuthenticationError("authentication required") return user - -# AuthedDep = Annotated[User, Depends(require_user)] - - -# def require_role(role: str): -# def checker(user: AuthedDep) -> User: -# if not user.has_role(role): -# raise PermissionError(required_role=role) -# return user - -# return Annotated[User, Depends(checker)] From 6fcf82edf2d8e2d595010f52364bbdea46a33b73 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 1 Jun 2026 16:14:24 -0700 Subject: [PATCH 440/591] Ruff formatting and checking --- mpcontribs-api/src/mpcontribs_api/old/core.py | 647 ++++++++++++++++++ .../mpcontribs/ingester/cli.py | 4 +- .../mpcontribs/ingester/webui.py | 11 +- mpcontribs-kernel-gateway/make_seed.py | 1 - mpcontribs-lux/mpcontribs/lux/autogen.py | 2 +- .../esoteric_ephemera/test_schemas.py | 1 - mpcontribs-portal/mpcontribs/portal/views.py | 2 - .../users/als_beamline/scripts/__main__.py | 3 +- .../als_beamline/scripts/translate_PyPt.py | 3 - .../dilute_solute_diffusion/pre_submission.py | 6 +- .../mpcontribs/users/qmcdb/main/views.py | 5 +- .../mpcontribs/users/qmcdb/records/views.py | 7 +- .../users/redox_thermo_csp/pre_submission.py | 9 +- .../redox_thermo_csp/update_energy_data.py | 3 +- .../screening_inorganic_pv/pre_submission.py | 7 +- .../mpcontribs/users/swf/pre_submission.py | 2 - mpcontribs-portal/mpcontribs/users/utils.py | 3 +- .../2dmatpedia.ipynb | 5 +- .../ExpXAS.ipynb | 3 +- .../HFP2023.ipynb | 3 - .../MnO2_phase_selection.ipynb | 3 +- .../carrier_transport.ipynb | 6 +- .../dilute_solute_diffusion.ipynb | 6 +- .../experimental_thermo.ipynb | 2 - .../experimental_thermoelectrics.ipynb | 2 +- .../ferroelectrics.ipynb | 7 +- .../ion_ref_data.ipynb | 2 +- .../jarvis_dft.ipynb | 4 +- .../matscholar.ipynb | 3 +- .../mofexplorer.ipynb | 2 +- .../ocp/ocp-upload.ipynb | 1 - .../open_catalyst_project.ipynb | 4 +- .../perovskites_diffusion.ipynb | 4 +- .../pydatarecognition.ipynb | 4 +- .../screening_inorganic_pv.ipynb | 2 +- .../silicon_defects.ipynb | 4 +- .../springer_materials.ipynb | 2 +- .../transparent_conductors.ipynb | 1 - .../get_started.ipynb | 5 +- .../ml.materialsproject.org/get_started.ipynb | 4 +- mpcontribs-portal/wsgi.py | 1 - mpcontribs-serverless/make_download/app.py | 1 - 42 files changed, 715 insertions(+), 82 deletions(-) create mode 100644 mpcontribs-api/src/mpcontribs_api/old/core.py diff --git a/mpcontribs-api/src/mpcontribs_api/old/core.py b/mpcontribs-api/src/mpcontribs_api/old/core.py new file mode 100644 index 0000000000..a4a600db19 --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/old/core.py @@ -0,0 +1,647 @@ +import os +import yaml + +from copy import deepcopy +from re import Pattern +from importlib import import_module +from flasgger.marshmallow_apispec import SwaggerView as OriginalSwaggerView +from flasgger.marshmallow_apispec import schema2jsonschema +from marshmallow_mongoengine import ModelSchema +from flask_mongorest.views import ResourceView +from mongoengine.queryset import DoesNotExist +from mongoengine.queryset.visitor import Q +from werkzeug.exceptions import Unauthorized +from mpcontribs.api.config import DOC_DIR +from mpcontribs.api import is_gunicorn, get_logger + +logger = get_logger(__name__) + + +def get_limit_params(resource, method): + default = resource.default_limit + bulk = {"BulkUpdate", "BulkDelete"} + maximum = resource.bulk_update_limit if method in bulk else resource.max_limit + return [ + { + "name": "_skip", + "in": "query", + "type": "integer", + "description": "number of items to skip", + }, + { + "name": "_limit", + "in": "query", + "type": "integer", + "default": default, + "maximum": maximum, + "description": "maximum number of items to return", + }, + { + "name": "page", + "in": "query", + "type": "integer", + "description": "page number to return (in batches of `per_page/_limit`; alternative to `_skip`)", + }, + { + "name": "per_page", + "in": "query", + "type": "integer", + "default": default, + "maximum": maximum, + "description": "maximum number of items to return per page (same as `_limit`)", + }, + ] + + +def get_filter_params(name, filters): + filter_params = [] + is_pattern = isinstance(name, Pattern) + label = name.pattern if is_pattern else name + for op in filters: + if op.op == "exact" and not is_pattern: + name = label + description = f"filter {label}" + else: + suffix = op.suf if hasattr(op, "suf") else op.op + name = f"{label}__{suffix}" + description = f"filter {label} via ${op.op}" + + filter_params.append( + { + "name": name, + "in": "query", + "type": op.typ, + "description": description, + } + ) + if op.typ == "array": + filter_params[-1]["items"] = {"type": "string"} + if hasattr(op, "fmt"): + filter_params[-1]["format"] = op.fmt + + if op.allow_negation: + suffix = "not__" + suffix += op.suf if hasattr(op, "suf") else op.op + name = f"{label}__{suffix}" + description = f"filter {label} via ${op.op}" + param = deepcopy(filter_params[-1]) + param["name"] = name + param["description"] = description + filter_params.append(param) + + return filter_params + + +def get_specs(klass, method, collection): + method_name = method.__name__ if hasattr(method, "__name__") else method + default_response = { + "description": "Error", + "schema": {"type": "object", "properties": {"error": {"type": "string"}}}, + } + id_field = klass.resource.document._meta["id_field"].capitalize() + doc_name = collection[:-1].capitalize() + fields_param = None + if klass.resource.fields is not None: + fields_avail = ( + klass.resource.fields + klass.resource.get_optional_fields() + ["_all"] + ) + description = f"List of fields to include in response ({fields_avail})." + description += " Use dot-notation for nested subfields." + fields_param = { + "name": "_fields", + "in": "query", + "default": klass.resource.fields, + "type": "array", + "items": {"type": "string"}, + "description": description, + } + + field_pagination_params = [] + for field, limits in klass.resource.fields_to_paginate.items(): + field_pagination_params.append( + { + "name": f"{field}_page", + "in": "query", + "default": 1, + "type": "integer", + "description": f"page to retrieve for {field} field", + } + ) + field_pagination_params.append( + { + "name": f"{field}_per_page", + "in": "query", + "default": limits[0], + "maximum": limits[1], + "type": "integer", + "description": f"number of items to retrieve per page for {field} field", + } + ) + + filter_params = [] + if hasattr(klass.resource, "filters"): + for k, v in klass.resource.filters.items(): + filter_params += get_filter_params(k, v) + + order_params = [] + if klass.resource.allowed_ordering: + allowed_ordering = [ + o.pattern if isinstance(o, Pattern) else o + for o in klass.resource.allowed_ordering + ] + order_params = [ + { + "name": "_sort", + "in": "query", + "type": "string", + "description": f"sort {collection} via {allowed_ordering}. Prepend +/- for asc/desc.", + } + ] + + spec = None + if method_name == "Fetch": + params = [ + { + "name": "pk", + "in": "path", + "type": "string", + "required": True, + "description": f"{collection[:-1]} (primary key)", + } + ] + if fields_param is not None: + params.append(fields_param) + params += field_pagination_params + spec = { + "summary": f"Retrieve a {collection[:-1]}.", + "operationId": f"get{doc_name}By{id_field}", + "parameters": params, + "responses": { + 200: { + "description": f"single {collection} entry", + "schema": {"$ref": f"#/definitions/{klass.schema_name}"}, + }, + "default": default_response, + }, + } + + elif method_name == "BulkFetch": + params = [fields_param] if fields_param is not None else [] + params += field_pagination_params + params += order_params + params += filter_params + schema_props = { + "data": { + "type": "array", + "items": {"$ref": f"#/definitions/{klass.schema_name}"}, + } + } + if klass.resource.paginate: + schema_props["has_more"] = {"type": "boolean"} + schema_props["total_count"] = {"type": "integer"} + schema_props["total_pages"] = {"type": "integer"} + params += get_limit_params(klass.resource, method_name) + spec = { + "summary": f"Filter and retrieve {collection}.", + "operationId": f"query{doc_name}s", + "parameters": params, + "responses": { + 200: { + "description": f"list of {collection}", + "schema": {"type": "object", "properties": schema_props}, + }, + "default": default_response, + }, + } + + elif method_name == "Download": + params = [ + { + "name": "short_mime", + "in": "path", + "type": "string", + "required": True, + "description": "MIME Download Type: gz", + "default": "gz", + }, + { + "name": "format", + "in": "query", + "type": "string", + "required": True, + "description": f"download {collection} in different formats: {klass.resource.download_formats}", + }, + ] + params += [fields_param] if fields_param is not None else [] + params += order_params + params += filter_params + if klass.resource.paginate: + params += get_limit_params(klass.resource, method_name) + spec = { + "summary": f"Filter and download {collection}.", + "operationId": f"download{doc_name}s", + "parameters": params, + "produces": ["application/gzip"], + "responses": { + 200: { + "description": f"{collection} download", + "schema": {"type": "file"}, + }, + "default": default_response, + }, + } + + elif method_name == "Create": + spec = { + "summary": f"Create a new {collection[:-1]}.", + "operationId": f"create{doc_name}", + "parameters": [ + { + "name": f"{collection[:-1]}", + "in": "body", + "description": f"The object to use for {collection[:-1]} creation", + "schema": {"$ref": f"#/definitions/{klass.schema_name}"}, + } + ], + "responses": { + 200: { + "description": f"{collection[:-1]} created", + "schema": {"$ref": f"#/definitions/{klass.schema_name}"}, + }, + "default": default_response, + }, + } + + elif method_name == "BulkCreate": + spec = { + "summary": f"Create new {collection[:-1]}(s).", + "operationId": f"create{doc_name}s", + "parameters": [ + { + "name": f"{collection}", + "in": "body", + "description": f"The objects to use for {collection[:-1]} creation", + "schema": { + "type": "array", + "items": {"$ref": f"#/definitions/{klass.schema_name}"}, + }, + } + ], + "responses": { + 200: { + "description": f"{collection} created", + "schema": { + "type": "object", + "properties": { + "count": {"type": "integer"}, + "data": { + "type": "array", + "items": {"$ref": f"#/definitions/{klass.schema_name}"}, + }, + }, + }, + }, + "default": default_response, + }, + } + + elif method_name == "Update": + spec = { + "summary": f"Update a {collection[:-1]}.", + "operationId": f"update{doc_name}By{id_field}", + "parameters": [ + { + "name": "pk", + "in": "path", + "type": "string", + "required": True, + "description": f"The {collection[:-1]} (primary key) to update", + }, + { + "name": f"{collection[:-1]}", + "in": "body", + "description": f"The object to use for {collection[:-1]} update", + "schema": {"type": "object"}, + }, + ], + "responses": { + 200: { + "description": f"{collection[:-1]} updated", + "schema": {"$ref": f"#/definitions/{klass.schema_name}"}, + }, + "default": default_response, + }, + } + elif method_name == "BulkUpdate": + params = filter_params + params.append( + { + "name": f"{collection}", + "in": "body", + "description": f"The object to use for {collection} bulk update", + "schema": {"type": "object"}, + } + ) + schema_props = {"count": {"type": "integer"}} + if klass.resource.paginate: + schema_props["has_more"] = {"type": "boolean"} + schema_props["total_count"] = {"type": "integer"} + schema_props["total_pages"] = {"type": "integer"} + params += get_limit_params(klass.resource, method_name) + spec = { + "summary": f"Filter and update {collection}.", + "operationId": f"update{doc_name}s", + "parameters": params, + "responses": { + 200: { + "description": f"Number of {collection} updated", + "schema": {"type": "object", "properties": schema_props}, + }, + "default": default_response, + }, + } + + elif method_name == "BulkDelete": + params = filter_params + schema_props = {"count": {"type": "integer"}} + if klass.resource.paginate: + schema_props["has_more"] = {"type": "boolean"} + schema_props["total_count"] = {"type": "integer"} + schema_props["total_pages"] = {"type": "integer"} + params += get_limit_params(klass.resource, method_name) + spec = { + "summary": f"Filter and delete {collection}.", + "operationId": f"delete{doc_name}s", + "parameters": params, + "responses": { + 200: { + "description": f"Number of {collection} deleted", + "schema": {"type": "object", "properties": schema_props}, + }, + "default": default_response, + }, + } + + elif method_name == "Delete": + spec = { + "summary": f"Delete a {collection[:-1]}.", + "operationId": f"delete{doc_name}By{id_field}", + "parameters": [ + { + "name": "pk", + "in": "path", + "type": "string", + "required": True, + "description": f"The {collection[:-1]} (primary key) to delete", + } + ], + "responses": { + 200: {"description": f"{collection[:-1]} deleted"}, + "default": default_response, + }, + } + + return spec + + +class SwaggerView(OriginalSwaggerView, ResourceView): + """A class-based view defining additional methods""" + + def __init_subclass__(cls, **kwargs): + """initialize Schema, decorators, definitions, and tags""" + super().__init_subclass__(**kwargs) + + if not __name__ == cls.__module__: + # e.g.: cls.__module__ = mpcontribs.api.projects.views + views_path = cls.__module__.split(".") + doc_path = ".".join(views_path[:-1] + ["document"]) + cls.tags = [views_path[-2]] + doc_filepath = doc_path.replace(".", os.sep) + ".py" + if os.path.exists(doc_filepath): + cls.doc_name = cls.tags[0].capitalize() + Model = getattr(import_module(doc_path), cls.doc_name) + cls.schema_name = cls.doc_name + "Schema" + cls.Schema = type( + cls.schema_name, + (ModelSchema, object), + { + "Meta": type( + "Meta", + (object,), + dict(model=Model, ordered=True, model_build_obj=False), + ) + }, + ) + cls.definitions = {cls.schema_name: schema2jsonschema(cls.Schema)} + cls.resource.schema = cls.Schema + + # write flask-mongorest swagger specs + for method in cls.methods: + spec = get_specs(cls, method, cls.tags[0]) + if spec: + dir_path = os.path.join(DOC_DIR, cls.tags[0]) + file_path = os.path.join(dir_path, method.__name__ + ".yml") + if not os.path.exists(file_path): + os.makedirs(dir_path, exist_ok=True) + + if is_gunicorn: + with open(file_path, "w") as f: + yaml.dump(spec, f) + logger.debug( + f"{cls.tags[0]}.{method.__name__} written to {file_path}" + ) + + def get_groups(self, request): + groups = request.headers.get("X-Authenticated-Groups", "").split(",") + groups += request.headers.get("X-Consumer-Groups", "").split(",") + return set(grp.strip() for grp in groups if grp) + + def is_anonymous(self, request): + if not request.headers.get("X-Consumer-Username", ""): + return True + + is_anonymous = request.headers.get("X-Anonymous-Consumer", False) + if isinstance(is_anonymous, str): + is_anonymous = False if is_anonymous == "false" else True + + return is_anonymous + + def is_external(self, request): + return request.headers.get( + "X-Forwarded-Host" + ) is not None and not request.headers.get("Origin") + + def is_admin(self, request): + groups = self.get_groups(request) + admin_group = os.environ.get("ADMIN_GROUP", "admin") + return admin_group in groups + + def is_project_user(self, request, obj): + if hasattr(obj, "owner"): + owner = obj.owner + project = obj.name + elif hasattr(obj, "project"): + owner = obj.project.owner + project = obj.project.name + else: + raise Unauthorized(f"Unable to authorize {obj}") + + groups = self.get_groups(request) + username = request.headers.get("X-Consumer-Username") + return project in groups or owner == username + + def is_admin_or_project_user(self, request, obj): + if self.is_anonymous(request): + return False + + if self.is_admin(request): + return True + + return self.is_project_user(request, obj) + + def get_projects(self): + # project is LazyReferenceFields (multiple queries) + module = import_module("mpcontribs.api.projects.document") + Projects = getattr(module, "Projects") + exclude = list(Projects._fields.keys()) + only = ["name", "owner", "is_public", "is_approved"] + return Projects.objects.exclude(*exclude).only(*only) + + def get_projects_filter(self, username, groups, filter_names=None): + projects = self.get_projects() + if filter_names: + projects = projects.filter(name__in=filter_names) + + q = {"private": [], "public": []} + + for project in projects: + if project.owner == username or project.name in groups: + q["private"].append(project.name) + elif project.is_public and project.is_approved: + q["public"].append(project.name) + + # reduced query + qfilter = Q() + if q["private"]: + qfilter |= Q(project__in=q["private"]) + if q["public"]: + qfilter |= Q(project__in=q["public"], is_public=True) + + return qfilter + + def has_read_permission(self, request, qs): + if self.is_admin(request): + return qs # admins can read all entries + + groups = self.get_groups(request) + is_anonymous = self.is_anonymous(request) + is_external = self.is_external(request) + username = request.headers.get("X-Consumer-Username") + approved_public_filter = Q(is_public=True, is_approved=True) + + if request.path.startswith("/projects/"): + # external or internal requests can both read full project info + # anonymous requests can only read public approved projects + if is_anonymous: + return qs.filter(approved_public_filter) + + # authenticated requests can read approved public or accessible non-public projects + qfilter = approved_public_filter | Q(owner=username) + if groups: + qfilter |= Q(name__in=list(groups)) + + return qs.filter(qfilter) + else: + # contributions are set private/public independent from projects + # anonymous requests: + # - external: only meta-data of public contributions in approved public projects + # - internal: full public contributions in approved public projects + # authenticated requests: + # - private contributions in a public project are only accessible to owner/group + # - any contributions in a private project are only accessible to owner/group + component = request.path.split("/")[1] + + if component == "contributions": + q = qs._query + if is_anonymous and is_external: + qs = qs.exclude("data") + + if q and "project" in q and isinstance(q["project"], str): + projects = self.get_projects() + try: + project = projects.get(name=q["project"]) + except DoesNotExist: + return qs.none() + + if project.owner == username or project.name in groups: + return qs + elif project.is_public and project.is_approved: + return qs.filter(is_public=True) + else: + return qs.none() + else: + names = None + if q and "project" in q and "$in" in q["project"]: + names = q.pop("project").pop("$in") + + qfilter = self.get_projects_filter( + username, groups, filter_names=names + ) + return qs.filter(qfilter) + else: + # get component Object IDs for queryset + pk = request.view_args.get("pk") + from mpcontribs.api.contributions.document import get_resource + + resource = get_resource(component) + + def qfilter(qs): + return qs.clone() + + if pk: + ids = [resource.get_object(pk, qfilter=qfilter).id] + else: + ids = [o.id for o in resource.get_objects(qfilter=qfilter)[0]] + + if not ids: + return qs.none() + + # get list of readable contributions and their component Object IDs + module = import_module("mpcontribs.api.contributions.document") + Contributions = getattr(module, "Contributions") + qfilter = self.get_projects_filter(username, groups) + component = component[:-1] if component == "notebooks" else component + qfilter &= Q(**{f"{component}__in": ids}) + contribs = ( + Contributions.objects(qfilter).only(component).limit(len(ids)) + ) + # return new queryset using "ids__in" + readable_ids = ( + [getattr(contrib, component).id for contrib in contribs] + if component == "notebook" + else [ + dbref.id + for contrib in contribs + for dbref in getattr(contrib, component) + if dbref.id in ids + ] + ) + if not readable_ids: + return qs.none() + + qs._query_obj = Q(id__in=readable_ids) + # exclude optional fields if anonymous external request + if is_anonymous and is_external: + exclude = resource.get_optional_fields() + qs = qs.exclude(*exclude) + + return qs + + def has_add_permission(self, request, obj): + return self.is_admin_or_project_user(request, obj) + + def has_change_permission(self, request, obj): + return self.is_admin_or_project_user(request, obj) + + def has_delete_permission(self, request, obj): + return self.is_admin_or_project_user(request, obj) diff --git a/mpcontribs-ingester/mpcontribs/ingester/cli.py b/mpcontribs-ingester/mpcontribs/ingester/cli.py index 53965cc507..53267ef457 100644 --- a/mpcontribs-ingester/mpcontribs/ingester/cli.py +++ b/mpcontribs-ingester/mpcontribs/ingester/cli.py @@ -1,6 +1,8 @@ # -*- coding: utf-8 -*- # http://flask.pocoo.org/docs/0.10/patterns/appdispatch/ -import os, argparse, string +import os +import argparse +import string from werkzeug.serving import run_simple from werkzeug.wsgi import DispatcherMiddleware, SharedDataMiddleware from flask import Flask diff --git a/mpcontribs-ingester/mpcontribs/ingester/webui.py b/mpcontribs-ingester/mpcontribs/ingester/webui.py index 5d4f711563..c0b4debe56 100644 --- a/mpcontribs-ingester/mpcontribs/ingester/webui.py +++ b/mpcontribs-ingester/mpcontribs/ingester/webui.py @@ -1,7 +1,14 @@ from __future__ import unicode_literals, print_function, absolute_import -import json, os, socket, codecs, time, psutil -import sys, warnings, multiprocessing +import json +import os +import socket +import codecs +import time +import psutil +import sys +import warnings +import multiprocessing from tempfile import gettempdir from flask import render_template, request, Response, Blueprint, current_app from flask import url_for, redirect, make_response, stream_with_context, jsonify diff --git a/mpcontribs-kernel-gateway/make_seed.py b/mpcontribs-kernel-gateway/make_seed.py index f92a5df7c9..28aa21e0d1 100644 --- a/mpcontribs-kernel-gateway/make_seed.py +++ b/mpcontribs-kernel-gateway/make_seed.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -import ddtrace.auto import nbformat as nbf nb = nbf.v4.new_notebook() diff --git a/mpcontribs-lux/mpcontribs/lux/autogen.py b/mpcontribs-lux/mpcontribs/lux/autogen.py index aeee406c21..95d6255663 100644 --- a/mpcontribs-lux/mpcontribs/lux/autogen.py +++ b/mpcontribs-lux/mpcontribs/lux/autogen.py @@ -100,7 +100,7 @@ def pydantic_model(self) -> Type[BaseModel]: self.file_name, orient=orient, lines=self.fmt == "jsonl" ) break - except Exception as exc: + except Exception: continue else: raise ValueError( diff --git a/mpcontribs-lux/tests/projects/esoteric_ephemera/test_schemas.py b/mpcontribs-lux/tests/projects/esoteric_ephemera/test_schemas.py index 70b6ec8019..0d74c5213c 100644 --- a/mpcontribs-lux/tests/projects/esoteric_ephemera/test_schemas.py +++ b/mpcontribs-lux/tests/projects/esoteric_ephemera/test_schemas.py @@ -2,7 +2,6 @@ import gzip import json -from pathlib import Path import numpy as np import pytest diff --git a/mpcontribs-portal/mpcontribs/portal/views.py b/mpcontribs-portal/mpcontribs/portal/views.py index 566a6b6542..ad2c12c1e0 100644 --- a/mpcontribs-portal/mpcontribs/portal/views.py +++ b/mpcontribs-portal/mpcontribs/portal/views.py @@ -12,8 +12,6 @@ from redis import Redis from io import BytesIO from copy import deepcopy -from pathlib import Path -from shutil import make_archive, rmtree from nbconvert import HTMLExporter from bravado.exception import HTTPNotFound from json2html import Json2Html diff --git a/mpcontribs-portal/mpcontribs/users/als_beamline/scripts/__main__.py b/mpcontribs-portal/mpcontribs/users/als_beamline/scripts/__main__.py index bcd0122bda..4fc72ada4a 100644 --- a/mpcontribs-portal/mpcontribs/users/als_beamline/scripts/__main__.py +++ b/mpcontribs-portal/mpcontribs/users/als_beamline/scripts/__main__.py @@ -1,4 +1,5 @@ -import argparse, os +import argparse +import os from mpcontribs.io.archieml.mpfile import MPFile from pre_submission import * diff --git a/mpcontribs-portal/mpcontribs/users/als_beamline/scripts/translate_PyPt.py b/mpcontribs-portal/mpcontribs/users/als_beamline/scripts/translate_PyPt.py index 995f5d045d..232914ab86 100644 --- a/mpcontribs-portal/mpcontribs/users/als_beamline/scripts/translate_PyPt.py +++ b/mpcontribs-portal/mpcontribs/users/als_beamline/scripts/translate_PyPt.py @@ -1,6 +1,3 @@ -import pandas as pd -import os -from scipy.interpolate import interp2d def get_translate(workdir=None): diff --git a/mpcontribs-portal/mpcontribs/users/dilute_solute_diffusion/pre_submission.py b/mpcontribs-portal/mpcontribs/users/dilute_solute_diffusion/pre_submission.py index 045f5bd71f..de41e67fa2 100644 --- a/mpcontribs-portal/mpcontribs/users/dilute_solute_diffusion/pre_submission.py +++ b/mpcontribs-portal/mpcontribs/users/dilute_solute_diffusion/pre_submission.py @@ -1,4 +1,6 @@ -import os, json, requests, sys +import os +import json +import requests from pandas import read_excel, isnull, ExcelWriter, Series from mpcontribs.io.core.recdict import RecursiveDict from mpcontribs.io.core.utils import clean_value, nest_dict @@ -60,7 +62,7 @@ def run(mpfile, hosts=None, download=False): if hosts is not None: if isinstance(hosts, int) and idx + 1 > hosts: break - elif isinstance(hosts, list) and not host in hosts: + elif isinstance(hosts, list) and host not in hosts: continue print("get mp-id for {}".format(host)) diff --git a/mpcontribs-portal/mpcontribs/users/qmcdb/main/views.py b/mpcontribs-portal/mpcontribs/users/qmcdb/main/views.py index 4e4c20ac48..cd80073db9 100644 --- a/mpcontribs-portal/mpcontribs/users/qmcdb/main/views.py +++ b/mpcontribs-portal/mpcontribs/users/qmcdb/main/views.py @@ -1,8 +1,5 @@ from django.shortcuts import render -from django.http import HttpResponseRedirect -from django.contrib.auth.decorators import login_required -from records.forms import MaterialQueryForm, MaterialSubmissionForm -from records.tables import QMCDBSetTable +from records.forms import MaterialQueryForm from records.models import QMCDBSet from django.utils.safestring import mark_safe from django.utils.html import escape diff --git a/mpcontribs-portal/mpcontribs/users/qmcdb/records/views.py b/mpcontribs-portal/mpcontribs/users/qmcdb/records/views.py index c0f0cc1372..589ef8e3e7 100644 --- a/mpcontribs-portal/mpcontribs/users/qmcdb/records/views.py +++ b/mpcontribs-portal/mpcontribs/users/qmcdb/records/views.py @@ -1,18 +1,13 @@ from __future__ import division from django.shortcuts import render from django.http import HttpResponseRedirect, HttpResponse -from django.contrib.auth.decorators import login_required from rest_framework import status from rest_framework.decorators import api_view from rest_framework.response import Response -from records.forms import MaterialQueryForm, MaterialSubmissionForm +from records.forms import MaterialSubmissionForm from records.models import QMCDBSet from records.serializers import QMCDBSetSerializer -from rest_framework.renderers import JSONRenderer -from rest_framework.parsers import JSONParser -from django.utils.six import BytesIO from django.utils.safestring import mark_safe -import numpy as np def manual_qmc_record_submission(request): diff --git a/mpcontribs-portal/mpcontribs/users/redox_thermo_csp/pre_submission.py b/mpcontribs-portal/mpcontribs/users/redox_thermo_csp/pre_submission.py index 15cfaf4de7..e95fd1f18c 100644 --- a/mpcontribs-portal/mpcontribs/users/redox_thermo_csp/pre_submission.py +++ b/mpcontribs-portal/mpcontribs/users/redox_thermo_csp/pre_submission.py @@ -1,16 +1,17 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -import os, json, re, sys +import os +import json +import re +import sys from glob import glob from datetime import datetime from itertools import groupby import pandas as pd -from mpcontribs.io.core.utils import get_composition_from_string from mpcontribs.io.core.recdict import RecursiveDict -from mpcontribs.io.core.utils import clean_value, read_csv, nest_dict +from mpcontribs.io.core.utils import clean_value, read_csv from mpcontribs.io.core.components import Table from mpcontribs.users.utils import duplicate_check -from mpcontribs.users.redox_thermo_csp.utils import redenth_act, get_debye_temp def get_fit_pars(sample_number): diff --git a/mpcontribs-portal/mpcontribs/users/redox_thermo_csp/update_energy_data.py b/mpcontribs-portal/mpcontribs/users/redox_thermo_csp/update_energy_data.py index b2eed60d99..3701993937 100644 --- a/mpcontribs-portal/mpcontribs/users/redox_thermo_csp/update_energy_data.py +++ b/mpcontribs-portal/mpcontribs/users/redox_thermo_csp/update_energy_data.py @@ -2,7 +2,6 @@ import datetime import os import shutil -import numpy as np from energy_analysis import EnergyAnalysis as enera from views import unstable_phases as unst @@ -21,7 +20,7 @@ new_energy_data = old_energy_data for db_id in paramlist: - if not "Exp" in db_id: + if "Exp" not in db_id: print(db_id) data_source = "Theo" # updates only theoretical data celsius = "True" # always True, parameter input in K currently disabled diff --git a/mpcontribs-portal/mpcontribs/users/screening_inorganic_pv/pre_submission.py b/mpcontribs-portal/mpcontribs/users/screening_inorganic_pv/pre_submission.py index 454a5597e3..aef7b1c136 100644 --- a/mpcontribs-portal/mpcontribs/users/screening_inorganic_pv/pre_submission.py +++ b/mpcontribs-portal/mpcontribs/users/screening_inorganic_pv/pre_submission.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- -import os, json +import os +import json from pandas import DataFrame from mpcontribs.io.core.recdict import RecursiveDict from mpcontribs.io.core.utils import clean_value @@ -46,11 +47,11 @@ def run(mpfile, **kwargs): rd = RecursiveDict({"formula": formula}) for k, v in config.items(): value = clean_value(d[k], v[1], max_dgts=4) - if not "." in v[0]: + if "." not in v[0]: rd[v[0]] = value else: keys = v[0].split(".") - if not keys[0] in rd: + if keys[0] not in rd: rd[keys[0]] = RecursiveDict({keys[1]: value}) else: rd[keys[0]][keys[1]] = value diff --git a/mpcontribs-portal/mpcontribs/users/swf/pre_submission.py b/mpcontribs-portal/mpcontribs/users/swf/pre_submission.py index 6c46bc0c1a..8c48375d97 100644 --- a/mpcontribs-portal/mpcontribs/users/swf/pre_submission.py +++ b/mpcontribs-portal/mpcontribs/users/swf/pre_submission.py @@ -1,5 +1,4 @@ from mpcontribs.config import mp_level01_titles -from mpcontribs.io.core.recdict import RecursiveDict from mpcontribs.io.core.utils import clean_value, get_composition_from_string from mpcontribs.users.utils import duplicate_check @@ -26,7 +25,6 @@ def round_to_100_percent(number_set, digit_after_decimal=1): def run(mpfile, **kwargs): import pymatgen import pandas as pd - from mpcontribs.users.swf.rest.rester import SwfRester # load data from google sheet google_sheet = mpfile.document[mp_level01_titles[0]].pop("google_sheet") diff --git a/mpcontribs-portal/mpcontribs/users/utils.py b/mpcontribs-portal/mpcontribs/users/utils.py index 4cf02217e9..e49f04401a 100644 --- a/mpcontribs-portal/mpcontribs/users/utils.py +++ b/mpcontribs-portal/mpcontribs/users/utils.py @@ -1,4 +1,5 @@ -import inspect, os +import inspect +import os from typing import Any, Dict diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/2dmatpedia.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/2dmatpedia.ipynb index daf3c45748..73641ce9f3 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/2dmatpedia.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/2dmatpedia.ipynb @@ -6,9 +6,10 @@ "metadata": {}, "outputs": [], "source": [ - "import os, gzip, json\n", + "import os\n", + "import gzip\n", + "import json\n", "from mpcontribs.client import Client\n", - "from pymatgen.core import Structure\n", "from pymatgen.ext.matproj import MPRester\n", "from urllib.request import urlretrieve\n", "from monty.json import MontyDecoder" diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ExpXAS.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ExpXAS.ipynb index d2fdf9ba09..89ad71cfd9 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ExpXAS.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ExpXAS.ipynb @@ -10,8 +10,7 @@ "from mpcontribs.client import Client\n", "from pathlib import Path\n", "from pandas import read_csv\n", - "import pandas as pd\n", - "import numpy as np" + "import pandas as pd" ] }, { diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/HFP2023.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/HFP2023.ipynb index 9b0f05ceb1..61acc0ccc0 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/HFP2023.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/HFP2023.ipynb @@ -9,15 +9,12 @@ "source": [ "%env MPRESTER_MUTE_PROGRESS_BARS 1\n", "# pip install mpcontribs-client mp_api pandas flatten_dict\n", - "import os\n", "import gzip\n", "import json\n", "\n", "from pathlib import Path\n", "from mpcontribs.client import Client\n", - "from mp_api.client import MPRester\n", "from pymatgen.core import Structure\n", - "from pandas import read_csv\n", "from flatten_dict import flatten, unflatten" ] }, diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/MnO2_phase_selection.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/MnO2_phase_selection.ipynb index d6c63cb805..328c0f2c2f 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/MnO2_phase_selection.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/MnO2_phase_selection.ipynb @@ -6,7 +6,8 @@ "metadata": {}, "outputs": [], "source": [ - "import json, os\n", + "import json\n", + "import os\n", "from mpcontribs.client import Client\n", "from pymatgen.core import Composition, Structure\n", "from pymatgen.ext.matproj import MPRester\n", diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/carrier_transport.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/carrier_transport.ipynb index 68e1c4f64d..e574ababd3 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/carrier_transport.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/carrier_transport.ipynb @@ -7,13 +7,13 @@ "outputs": [], "source": [ "from mpcontribs.client import Client\n", - "import gzip, json, os\n", + "import gzip\n", + "import json\n", + "import os\n", "import numpy as np\n", "from pandas import DataFrame\n", - "from collections import defaultdict\n", "from tqdm.notebook import tqdm\n", "from unflatten import unflatten\n", - "from pathlib import Path\n", "\n", "name = 'carrier_transport'" ] diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/dilute_solute_diffusion.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/dilute_solute_diffusion.ipynb index 3ce892c236..a26d81d3bb 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/dilute_solute_diffusion.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/dilute_solute_diffusion.ipynb @@ -28,7 +28,9 @@ "metadata": {}, "outputs": [], "source": [ - "import os, json, requests, sys\n", + "import os\n", + "import json\n", + "import requests\n", "from pandas import read_excel, isnull, ExcelWriter, Series\n", "from mp_api.client import MPRester\n", "from pathlib import Path\n", @@ -108,7 +110,7 @@ " if hosts is not None:\n", " if isinstance(hosts, int) and idx + 1 > hosts:\n", " break\n", - " elif isinstance(hosts, list) and not host in hosts:\n", + " elif isinstance(hosts, list) and host not in hosts:\n", " continue\n", "\n", " print(\"get mp-id for {}\".format(host))\n", diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/experimental_thermo.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/experimental_thermo.ipynb index a02e07d84a..4ddf73bb08 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/experimental_thermo.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/experimental_thermo.ipynb @@ -48,8 +48,6 @@ "from pathlib import Path\n", "import re\n", "from tqdm import tqdm\n", - "import numpy as np\n", - "import xlrd\n", "from monty.serialization import loadfn, dumpfn" ] }, diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/experimental_thermoelectrics.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/experimental_thermoelectrics.ipynb index fc639fd76a..b3164a38e3 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/experimental_thermoelectrics.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/experimental_thermoelectrics.ipynb @@ -11,7 +11,7 @@ "from mp_api.client import MPRester\n", "import pandas as pd\n", "import os\n", - "from flatten_dict import unflatten, flatten\n", + "from flatten_dict import unflatten\n", "from math import isnan" ] }, diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ferroelectrics.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ferroelectrics.ipynb index 458b629c00..5a2a1a8876 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ferroelectrics.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ferroelectrics.ipynb @@ -11,10 +11,9 @@ "source": [ "import json\n", "import numpy as np\n", - "from mpcontribs.client import Client, Attachment\n", + "from mpcontribs.client import Client\n", "from pathlib import Path\n", - "from flatten_dict import flatten, unflatten\n", - "from pymatgen.core import Structure" + "from flatten_dict import flatten, unflatten" ] }, { @@ -224,7 +223,7 @@ " if conf and k.startswith('polarization') and isinstance(v, list):\n", " name, fields = conf[\"name\"], conf[\"fields\"]\n", " contrib[\"data\"].setdefault(name, {})\n", - " if not \"unit\" in conf:\n", + " if \"unit\" not in conf:\n", " vmax, unit = max(v), fields[\"max\"]\n", " contrib[\"data\"][name]['max'] = f\"{round(vmax, 3)} {unit}\" if unit else v\n", " contrib[\"data\"][name]['index'] = v.index(vmax)\n", diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ion_ref_data.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ion_ref_data.ipynb index 4543e68cdb..318359a7c4 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ion_ref_data.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ion_ref_data.ipynb @@ -29,7 +29,7 @@ "outputs": [], "source": [ "from pprint import pprint\n", - "from monty.serialization import loadfn, dumpfn\n", + "from monty.serialization import loadfn\n", "from pymatgen.core.ion import Ion" ] }, diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/jarvis_dft.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/jarvis_dft.ipynb index bb08b09503..7f08f74b59 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/jarvis_dft.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/jarvis_dft.ipynb @@ -6,7 +6,9 @@ "metadata": {}, "outputs": [], "source": [ - "import os, json, tarfile\n", + "import os\n", + "import json\n", + "import tarfile\n", "from mpcontribs.client import Client\n", "from urllib.request import urlretrieve\n", "from monty.json import MontyDecoder\n", diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/matscholar.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/matscholar.ipynb index 31e5a2c243..bc5766f6de 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/matscholar.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/matscholar.ipynb @@ -7,8 +7,7 @@ "metadata": {}, "outputs": [], "source": [ - "from pathlib import Path\n", - "from mpcontribs.client import Client, Attachment" + "from mpcontribs.client import Client" ] }, { diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/mofexplorer.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/mofexplorer.ipynb index a9dc872a85..c399fc6f96 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/mofexplorer.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/mofexplorer.ipynb @@ -76,7 +76,7 @@ " raw = vs[-1].replace(\"^3\", \"³\")\n", " if raw in ureg:\n", " value, unit = vs[0], raw\n", - " except Exception as e:\n", + " except Exception:\n", " value, unit = v, None\n", " else:\n", " value, unit = vs[0], None\n", diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ocp/ocp-upload.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ocp/ocp-upload.ipynb index 7f82031902..15a7de18c9 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ocp/ocp-upload.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ocp/ocp-upload.ipynb @@ -12,7 +12,6 @@ "from ujson import load\n", "from pymatgen.core.structure import Molecule, Structure\n", "from pathlib import Path\n", - "from time import time\n", "from mpcontribs.client import Client\n", "from tqdm.auto import tqdm" ] diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/open_catalyst_project.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/open_catalyst_project.ipynb index 25f34580fc..934ac1ba4d 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/open_catalyst_project.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/open_catalyst_project.ipynb @@ -9,10 +9,8 @@ "source": [ "from mpcontribs.client import Client\n", "from monty.serialization import loadfn\n", - "from json import loads\n", "from pymatgen.core.structure import Molecule, Structure\n", - "from pathlib import Path\n", - "from time import time" + "from pathlib import Path" ] }, { diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/perovskites_diffusion.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/perovskites_diffusion.ipynb index 026d09bec2..634cb3c77c 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/perovskites_diffusion.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/perovskites_diffusion.ipynb @@ -53,7 +53,7 @@ "metadata": {}, "outputs": [], "source": [ - "import tarfile, os\n", + "import tarfile\n", "from pandas import read_excel\n", "\n", "units = {\n", @@ -97,7 +97,7 @@ " key = keys[col]\n", " if isinstance(key, str):\n", " key = key.strip()\n", - " if not key in abbreviations:\n", + " if key not in abbreviations:\n", " abbreviations[key] = col\n", " else:\n", " key = col.strip().lower()\n", diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/pydatarecognition.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/pydatarecognition.ipynb index 4f1d69e8b4..23c100fe54 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/pydatarecognition.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/pydatarecognition.ipynb @@ -8,11 +8,9 @@ "outputs": [], "source": [ "%env MPRESTER_MUTE_PROGRESS_BARS 1\n", - "import os\n", "from pathlib import Path\n", "from mpcontribs.client import Client\n", - "from mp_api.client import MPRester\n", - "from flatten_dict import unflatten, flatten\n", + "from flatten_dict import unflatten\n", "from pymatgen.io.cif import CifParser\n", "from pandas import DataFrame\n", "import numpy as np" diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/screening_inorganic_pv.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/screening_inorganic_pv.ipynb index cb9e56014f..270bc924d1 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/screening_inorganic_pv.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/screening_inorganic_pv.ipynb @@ -6,7 +6,7 @@ "metadata": {}, "outputs": [], "source": [ - "import os, json\n", + "import json\n", "from pathlib import Path\n", "from pandas import DataFrame\n", "from mpcontribs.client import Client\n", diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/silicon_defects.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/silicon_defects.ipynb index b03018e553..6c100a231c 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/silicon_defects.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/silicon_defects.ipynb @@ -11,7 +11,7 @@ "from mpcontribs.client import Client, Attachment\n", "from pymatgen.core import Structure\n", "from pathlib import Path\n", - "from flatten_dict import flatten, unflatten" + "from flatten_dict import flatten" ] }, { @@ -95,7 +95,7 @@ "}\n", "\n", "for k, v in list(reorg.items()):\n", - " if not \"unit\" in v:\n", + " if \"unit\" not in v:\n", " root_field = reorg.pop(k).get(\"field\")\n", " \n", " for kk, vv in excitation_reorg.items():\n", diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/springer_materials.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/springer_materials.ipynb index ce4e3b1dfd..e7d0958f16 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/springer_materials.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/springer_materials.ipynb @@ -11,7 +11,7 @@ "import re\n", "from glob import glob\n", "from mpcontribs.client import Client\n", - "from flatten_dict import unflatten, flatten" + "from flatten_dict import unflatten" ] }, { diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/transparent_conductors.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/transparent_conductors.ipynb index bc8a8feef7..f123264613 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/transparent_conductors.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/transparent_conductors.ipynb @@ -7,7 +7,6 @@ "metadata": {}, "outputs": [], "source": [ - "import tarfile, os\n", "import numpy as np\n", "from pandas import read_excel\n", "from mpcontribs.client import Client" diff --git a/mpcontribs-portal/notebooks/lightsources.materialsproject.org/get_started.ipynb b/mpcontribs-portal/notebooks/lightsources.materialsproject.org/get_started.ipynb index c3162b1883..3b53d08f6d 100644 --- a/mpcontribs-portal/notebooks/lightsources.materialsproject.org/get_started.ipynb +++ b/mpcontribs-portal/notebooks/lightsources.materialsproject.org/get_started.ipynb @@ -7,8 +7,6 @@ "outputs": [], "source": [ "import os\n", - "import json\n", - "import gzip\n", "from zipfile import ZipFile\n", "from io import StringIO, BytesIO\n", "from numpy import where\n", @@ -16,8 +14,7 @@ "from pandas import to_numeric, read_csv\n", "from mpcontribs.client import Client, Attachment\n", "from tqdm.notebook import tqdm\n", - "from decimal import Decimal\n", - "from pathlib import Path" + "from decimal import Decimal" ] }, { diff --git a/mpcontribs-portal/notebooks/ml.materialsproject.org/get_started.ipynb b/mpcontribs-portal/notebooks/ml.materialsproject.org/get_started.ipynb index a13eefdc69..651a268de2 100644 --- a/mpcontribs-portal/notebooks/ml.materialsproject.org/get_started.ipynb +++ b/mpcontribs-portal/notebooks/ml.materialsproject.org/get_started.ipynb @@ -6,7 +6,9 @@ "metadata": {}, "outputs": [], "source": [ - "import wget, json, os, math\n", + "import wget\n", + "import json\n", + "import math\n", "from pathlib import Path\n", "from string import capwords\n", "from pybtex.database import parse_string\n", diff --git a/mpcontribs-portal/wsgi.py b/mpcontribs-portal/wsgi.py index e314b76514..96ebc59a28 100644 --- a/mpcontribs-portal/wsgi.py +++ b/mpcontribs-portal/wsgi.py @@ -1,7 +1,6 @@ # -*- coding: utf-8 -*- import re import os -import ddtrace.auto import django_settings_file from django.core.wsgi import get_wsgi_application from whitenoise import WhiteNoise diff --git a/mpcontribs-serverless/make_download/app.py b/mpcontribs-serverless/make_download/app.py index 96f98401a7..9783183249 100644 --- a/mpcontribs-serverless/make_download/app.py +++ b/mpcontribs-serverless/make_download/app.py @@ -1,6 +1,5 @@ # TODO ddtrace import os -import json import logging import boto3 From 767bc9c500e9320caafa8fe55d704c6b8db36b47 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 4 Jun 2026 14:54:30 -0700 Subject: [PATCH 441/591] Infra changes for rewrite --- .claude/worktrees/unify-component-service | 1 + mpcontribs-api/scripts/start.sh | 15 +++++++++++++++ 2 files changed, 16 insertions(+) create mode 160000 .claude/worktrees/unify-component-service diff --git a/.claude/worktrees/unify-component-service b/.claude/worktrees/unify-component-service new file mode 160000 index 0000000000..7d84eafaec --- /dev/null +++ b/.claude/worktrees/unify-component-service @@ -0,0 +1 @@ +Subproject commit 7d84eafaec7223ee57b2b626f02815075a8dfc47 diff --git a/mpcontribs-api/scripts/start.sh b/mpcontribs-api/scripts/start.sh index 1452743286..729e75932d 100755 --- a/mpcontribs-api/scripts/start.sh +++ b/mpcontribs-api/scripts/start.sh @@ -10,4 +10,19 @@ PMGRC=$HOME/.pmgrc.yaml set -x +<<<<<< HEAD exec uvicorn mpcontribs_api.app:app --host 0.0.0.0 --port "$API_PORT" --workers "${NWORKERS:-2}" +||||||| parent of ba089932 (Infra changes for rewrite) +if [[ -n "$DD_TRACE_HOST" ]]; then + wait-for-it.sh "$DD_TRACE_HOST" -q -s -t 10 && STATS_ARG="--statsd-host $DD_AGENT_HOST:8125" || echo "WARNING: datadog agent unreachable" +fi + +[[ -n "$STATS_ARG" ]] && CMD="ddtrace-run gunicorn $STATS_ARG" || CMD="gunicorn" +exec $WAIT_FOR -- $CMD $SERVER_APP +======= +if [[ -n "$DD_TRACE_HOST" ]]; then + wait-for-it.sh "$DD_TRACE_HOST" -q -s -t 10 || echo "WARNING: datadog agent unreachable" +fi + +exec uvicorn mpcontribs_api.app:app --host 0.0.0.0 --port "$API_PORT" +>>>>>>> ba089932 (Infra changes for rewrite) From 9cd35cba72d53951adabe2b55f823e447ee6ed1e Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 2 Jun 2026 02:27:05 +0000 Subject: [PATCH 442/591] upgrade dependencies for deployment --- mpcontribs-api/requirements/deployment.txt | 551 ++++++++++++++++++ mpcontribs-client/requirements/deployment.txt | 18 + .../requirements/deployment.txt | 24 + 3 files changed, 593 insertions(+) create mode 100644 mpcontribs-api/requirements/deployment.txt diff --git a/mpcontribs-api/requirements/deployment.txt b/mpcontribs-api/requirements/deployment.txt new file mode 100644 index 0000000000..7056ece33a --- /dev/null +++ b/mpcontribs-api/requirements/deployment.txt @@ -0,0 +1,551 @@ +# +# This file is autogenerated by pip-compile with Python 3.11 +# by the following command: +# +# pip-compile --output-file=MPContribs/mpcontribs-api/requirements/deployment.txt MPContribs/mpcontribs-api/pyproject.toml python/requirements.txt +# +anyio==4.13.0 + # via jupyter-server +apispec==5.2.2 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +argon2-cffi==25.1.0 + # via + # jupyter-server + # notebook +argon2-cffi-bindings==25.1.0 + # via argon2-cffi +arrow==1.4.0 + # via isoduration +asn1crypto==1.5.1 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +asttokens==3.0.1 + # via stack-data +atlasq-tschaume==0.11.1.dev2 + # via flask-mongorest-mpcontribs +attrs==26.1.0 + # via + # jsonschema + # referencing +backports-zstd==1.5.0 + # via flask-compress +beautifulsoup4==4.14.3 + # via nbconvert +bibtexparser==1.4.4 + # via pymatgen-core +bleach[css]==6.3.0 + # via nbconvert +blinker==1.9.0 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +boltons==25.0.0 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +boto3==1.43.19 + # via flask-mongorest-mpcontribs +botocore==1.43.19 + # via + # boto3 + # s3transfer +brotli==1.2.0 + # via flask-compress +bytecode==0.17.0 + # via ddtrace +certifi==2026.5.20 + # via requests +cffi==2.0.0 + # via + # argon2-cffi-bindings + # cryptography +charset-normalizer==3.4.7 + # via requests +click==8.4.1 + # via + # flask + # rq +comm==0.2.3 + # via ipykernel +contourpy==1.3.3 + # via matplotlib +cramjam==2.11.0 + # via python-snappy +crontab==1.0.5 + # via rq-scheduler +cryptography==48.0.0 + # via pyopenssl +css-html-js-minify==2.5.5 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +cycler==0.12.1 + # via matplotlib +dateparser==1.4.0 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +ddtrace==4.3.0 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +debugpy==1.8.21 + # via ipykernel +decorator==5.3.1 + # via ipython +defusedxml==0.7.1 + # via nbconvert +dnspython==2.8.0 + # via + # mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) + # pymongo +entrypoints==0.4 + # via jupyter-client +envier==0.6.1 + # via ddtrace +executing==2.2.1 + # via stack-data +fastjsonschema==2.21.2 + # via nbformat +fastnumbers==5.1.1 + # via flask-mongorest-mpcontribs +filetype==1.2.0 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +flasgger-tschaume==0.9.7 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +flask==2.2.5 + # via + # flasgger-tschaume + # flask-compress + # flask-marshmallow + # flask-mongoengine-tschaume + # flask-rq2 + # flask-sse +flask-compress==1.24 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +flask-marshmallow==1.4.0 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +flask-mongoengine-tschaume==1.1.0 + # via flask-mongorest-mpcontribs +flask-mongorest-mpcontribs==3.3.0 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +flask-rq2==18.3 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +flask-sse==1.0.0 + # via flask-mongorest-mpcontribs +flatten-dict==0.5.0 + # via flask-mongorest-mpcontribs +flexcache==0.3 + # via pint +flexparser==0.4 + # via pint +fonttools==4.63.0 + # via matplotlib +fqdn==1.5.1 + # via jsonschema +freezegun==1.5.5 + # via rq-scheduler +gevent==26.5.0 + # via gunicorn +greenlet==3.5.1 + # via gevent +gunicorn[gevent]==24.1.1 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +idna==3.17 + # via + # anyio + # jsonschema + # requests +ipykernel==6.29.5 + # via + # nbclassic + # notebook +ipython==9.14.0 + # via ipykernel +ipython-genutils==0.2.0 + # via + # nbclassic + # notebook +ipython-pygments-lexers==1.1.1 + # via ipython +isoduration==20.11.0 + # via jsonschema +itsdangerous==2.2.0 + # via flask +jedi==0.20.0 + # via ipython +jinja2==3.1.6 + # via + # flask + # jupyter-server + # mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) + # nbconvert + # notebook +jmespath==1.1.0 + # via + # boto3 + # botocore +joblib==1.5.3 + # via pymatgen-core +json2html==1.3.0 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +jsonpointer==3.1.1 + # via jsonschema +jsonschema[format-nongpl]==4.26.0 + # via + # flasgger-tschaume + # jupyter-events + # nbformat +jsonschema-specifications==2025.9.1 + # via jsonschema +jupyter-client==7.4.9 + # via + # ipykernel + # jupyter-server + # nbclient + # notebook +jupyter-core==5.9.1 + # via + # ipykernel + # jupyter-client + # jupyter-server + # nbclient + # nbconvert + # nbformat + # notebook +jupyter-events==0.12.1 + # via jupyter-server +jupyter-server==2.19.0 + # via notebook-shim +jupyter-server-terminals==0.5.4 + # via jupyter-server +jupyterlab-pygments==0.3.0 + # via nbconvert +kiwisolver==1.5.0 + # via matplotlib +lark==1.3.1 + # via rfc3987-syntax +lxml==6.1.1 + # via pymatgen-core +markupsafe==3.0.3 + # via + # jinja2 + # nbconvert + # werkzeug +marshmallow==3.26.2 + # via + # flask-marshmallow + # marshmallow-mongoengine + # mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +marshmallow-mongoengine==0.31.2 + # via flask-mongorest-mpcontribs +matplotlib==3.10.9 + # via + # -r python/requirements.txt + # pymatgen-core +matplotlib-inline==0.2.2 + # via + # ipykernel + # ipython +mimerender-pr36==0.0.2 + # via flask-mongorest-mpcontribs +mistune==3.2.1 + # via + # flasgger-tschaume + # nbconvert +mongoengine==0.29.3 + # via + # atlasq-tschaume + # flask-mongoengine-tschaume + # marshmallow-mongoengine +monty==2026.5.18 + # via pymatgen-core +more-itertools==11.1.0 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +mpmath==1.3.0 + # via sympy +narwhals==2.22.0 + # via plotly +nbclassic==1.3.3 + # via notebook +nbclient==0.10.4 + # via nbconvert +nbconvert==7.17.1 + # via + # jupyter-server + # notebook +nbformat==5.10.4 + # via + # jupyter-server + # mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) + # nbclient + # nbconvert + # notebook +nest-asyncio==1.6.0 + # via + # ipykernel + # jupyter-client + # nbclassic + # notebook +networkx==3.6.1 + # via pymatgen-core +notebook==6.5.7 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +notebook-shim==0.2.4 + # via nbclassic +numpy==2.4.6 + # via + # -r python/requirements.txt + # contourpy + # matplotlib + # monty + # mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) + # pandas + # pymatgen-core + # scipy + # spglib +opentelemetry-api==1.42.1 + # via ddtrace +orjson==3.11.9 + # via + # flask-mongorest-mpcontribs + # pymatgen-core +overrides==7.7.0 + # via jupyter-server +packaging==26.2 + # via + # gunicorn + # ipykernel + # jupyter-events + # jupyter-server + # marshmallow + # matplotlib + # nbconvert + # plotly +palettable==3.3.3 + # via pymatgen-core +pandas==3.0.3 + # via + # -r python/requirements.txt + # pymatgen-core +pandocfilters==1.5.1 + # via nbconvert +parso==0.8.7 + # via jedi +pexpect==4.9.0 + # via ipython +pillow==12.2.0 + # via matplotlib +pint==0.25.3 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +platformdirs==4.10.0 + # via + # jupyter-core + # pint +plotly==6.7.0 + # via pymatgen-core +prometheus-client==0.25.0 + # via + # jupyter-server + # notebook +prompt-toolkit==3.0.52 + # via ipython +psutil==7.2.2 + # via + # ipykernel + # ipython +psycopg2-binary==2.9.12 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +ptyprocess==0.7.0 + # via + # pexpect + # terminado +pure-eval==0.2.3 + # via stack-data +pycparser==3.0 + # via cffi +pygments==2.20.0 + # via + # ipython + # ipython-pygments-lexers + # nbconvert +pymatgen==2026.5.4 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +pymatgen-core==2026.5.18 + # via pymatgen +pymongo==4.17.0 + # via + # flask-mongorest-mpcontribs + # mongoengine +pyopenssl==26.2.0 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +pyparsing==3.3.2 + # via + # bibtexparser + # matplotlib +python-dateutil==2.9.0.post0 + # via + # arrow + # botocore + # dateparser + # flask-mongorest-mpcontribs + # freezegun + # jupyter-client + # matplotlib + # pandas + # rq-scheduler +python-json-logger==4.1.0 + # via jupyter-events +python-mimeparse==2.0.0 + # via mimerender-pr36 +python-snappy==0.7.3 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +pytz==2026.2 + # via dateparser +pyyaml==6.0.3 + # via + # flasgger-tschaume + # jupyter-events +pyzmq==27.1.0 + # via + # ipykernel + # jupyter-client + # jupyter-server + # notebook +redis==8.0.0 + # via + # flask-rq2 + # flask-sse + # rq +referencing==0.37.0 + # via + # jsonschema + # jsonschema-specifications + # jupyter-events +regex==2026.5.9 + # via dateparser +requests==2.34.2 + # via + # atlasq-tschaume + # pymatgen-core +rfc3339-validator==0.1.4 + # via + # jsonschema + # jupyter-events +rfc3986-validator==0.1.1 + # via + # jsonschema + # jupyter-events +rfc3987-syntax==1.1.0 + # via jsonschema +rpds-py==2026.5.1 + # via + # jsonschema + # referencing +rq==2.3.2 + # via + # flask-rq2 + # mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) + # rq-scheduler +rq-scheduler==0.14.0 + # via flask-rq2 +ruamel-yaml==0.19.1 + # via monty +s3transfer==0.18.0 + # via boto3 +scipy==1.17.1 + # via + # -r python/requirements.txt + # pymatgen-core +send2trash==2.1.0 + # via + # jupyter-server + # notebook +setproctitle==1.3.7 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +six==1.17.0 + # via + # flasgger-tschaume + # flask-sse + # python-dateutil + # rfc3339-validator +soupsieve==2.8.4 + # via beautifulsoup4 +spglib==2.7.0 + # via pymatgen-core +stack-data==0.6.3 + # via ipython +supervisor==4.3.0 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +sympy==1.14.0 + # via pymatgen-core +tabulate==0.10.0 + # via pymatgen-core +terminado==0.18.1 + # via + # jupyter-server + # jupyter-server-terminals + # notebook +tinycss2==1.4.0 + # via bleach +tornado==6.5.6 + # via + # ipykernel + # jupyter-client + # jupyter-server + # notebook + # terminado +tqdm==4.67.3 + # via pymatgen-core +traitlets==5.15.0 + # via + # ipykernel + # ipython + # jupyter-client + # jupyter-core + # jupyter-events + # jupyter-server + # matplotlib-inline + # nbclient + # nbconvert + # nbformat + # notebook +typing-extensions==4.15.0 + # via + # anyio + # beautifulsoup4 + # flexcache + # flexparser + # ipython + # opentelemetry-api + # pint + # pyopenssl + # referencing + # spglib +tzdata==2026.2 + # via arrow +tzlocal==5.3.1 + # via dateparser +uncertainties==3.2.3 + # via + # mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) + # pymatgen-core +uri-template==1.3.0 + # via jsonschema +urllib3==2.7.0 + # via + # botocore + # requests +wcwidth==0.7.0 + # via prompt-toolkit +webcolors==25.10.0 + # via jsonschema +webencodings==0.5.1 + # via + # bleach + # tinycss2 +websocket-client==1.9.0 + # via + # jupyter-server + # mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +werkzeug==3.1.8 + # via + # flasgger-tschaume + # flask +wrapt==2.2.1 + # via ddtrace +zope-event==6.2 + # via gevent +zope-interface==8.5 + # via gevent +zstandard==0.25.0 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) diff --git a/mpcontribs-client/requirements/deployment.txt b/mpcontribs-client/requirements/deployment.txt index f19c9e1489..231613f00b 100644 --- a/mpcontribs-client/requirements/deployment.txt +++ b/mpcontribs-client/requirements/deployment.txt @@ -50,13 +50,25 @@ fonttools==4.63.0 # via matplotlib fqdn==1.5.1 # via jsonschema +<<<<<<< HEAD idna==3.18 +||||||| parent of 5ef6d1d6 (upgrade dependencies for deployment) +idna==3.16 +======= +idna==3.17 +>>>>>>> 5ef6d1d6 (upgrade dependencies for deployment) # via # jsonschema # requests importlib-resources==7.1.0 # via swagger-spec-validator +<<<<<<< HEAD ipython==9.14.1 +||||||| parent of 5ef6d1d6 (upgrade dependencies for deployment) +ipython==9.13.0 +======= +ipython==9.14.0 +>>>>>>> 5ef6d1d6 (upgrade dependencies for deployment) # via mpcontribs-client (MPContribs/mpcontribs-client/pyproject.toml) ipython-pygments-lexers==1.1.1 # via ipython @@ -100,7 +112,13 @@ msgpack==1.2.1 # via # bravado # bravado-core +<<<<<<< HEAD narwhals==2.22.1 +||||||| parent of 5ef6d1d6 (upgrade dependencies for deployment) +narwhals==2.21.2 +======= +narwhals==2.22.0 +>>>>>>> 5ef6d1d6 (upgrade dependencies for deployment) # via plotly networkx==3.6.1 # via pymatgen-core diff --git a/mpcontribs-kernel-gateway/requirements/deployment.txt b/mpcontribs-kernel-gateway/requirements/deployment.txt index 827d405953..e3a21ebecc 100644 --- a/mpcontribs-kernel-gateway/requirements/deployment.txt +++ b/mpcontribs-kernel-gateway/requirements/deployment.txt @@ -82,7 +82,13 @@ fonttools==4.63.0 # via matplotlib fqdn==1.5.1 # via jsonschema +<<<<<<< HEAD idna==3.18 +||||||| parent of 5ef6d1d6 (upgrade dependencies for deployment) +idna==3.16 +======= +idna==3.17 +>>>>>>> 5ef6d1d6 (upgrade dependencies for deployment) # via # anyio # jsonschema @@ -91,7 +97,13 @@ importlib-resources==7.1.0 # via swagger-spec-validator ipykernel==7.3.0 # via -r MPContribs/mpcontribs-kernel-gateway/requirements.in +<<<<<<< HEAD ipython==9.14.1 +||||||| parent of 5ef6d1d6 (upgrade dependencies for deployment) +ipython==9.13.0 +======= +ipython==9.14.0 +>>>>>>> 5ef6d1d6 (upgrade dependencies for deployment) # via # ipykernel # ipywidgets @@ -190,7 +202,13 @@ msgpack==1.2.1 # via # bravado # bravado-core +<<<<<<< HEAD narwhals==2.22.1 +||||||| parent of 5ef6d1d6 (upgrade dependencies for deployment) +narwhals==2.21.2 +======= +narwhals==2.22.0 +>>>>>>> 5ef6d1d6 (upgrade dependencies for deployment) # via plotly nbclient==0.11.0 # via nbconvert @@ -383,7 +401,13 @@ terminado==0.18.1 # jupyter-server-terminals tinycss2==1.5.1 # via bleach +<<<<<<< HEAD tornado==6.5.7 +||||||| parent of 5ef6d1d6 (upgrade dependencies for deployment) +tornado==6.5.5 +======= +tornado==6.5.6 +>>>>>>> 5ef6d1d6 (upgrade dependencies for deployment) # via # ipykernel # jupyter-client From 70d795054b6ed5707b006b5e43f2c15715256879 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 17 Jun 2026 15:05:22 -0700 Subject: [PATCH 443/591] Revert changes to deployment of other submodules --- mpcontribs-client/requirements/deployment.txt | 18 -------------- .../requirements/deployment.txt | 24 ------------------- 2 files changed, 42 deletions(-) diff --git a/mpcontribs-client/requirements/deployment.txt b/mpcontribs-client/requirements/deployment.txt index 231613f00b..f19c9e1489 100644 --- a/mpcontribs-client/requirements/deployment.txt +++ b/mpcontribs-client/requirements/deployment.txt @@ -50,25 +50,13 @@ fonttools==4.63.0 # via matplotlib fqdn==1.5.1 # via jsonschema -<<<<<<< HEAD idna==3.18 -||||||| parent of 5ef6d1d6 (upgrade dependencies for deployment) -idna==3.16 -======= -idna==3.17 ->>>>>>> 5ef6d1d6 (upgrade dependencies for deployment) # via # jsonschema # requests importlib-resources==7.1.0 # via swagger-spec-validator -<<<<<<< HEAD ipython==9.14.1 -||||||| parent of 5ef6d1d6 (upgrade dependencies for deployment) -ipython==9.13.0 -======= -ipython==9.14.0 ->>>>>>> 5ef6d1d6 (upgrade dependencies for deployment) # via mpcontribs-client (MPContribs/mpcontribs-client/pyproject.toml) ipython-pygments-lexers==1.1.1 # via ipython @@ -112,13 +100,7 @@ msgpack==1.2.1 # via # bravado # bravado-core -<<<<<<< HEAD narwhals==2.22.1 -||||||| parent of 5ef6d1d6 (upgrade dependencies for deployment) -narwhals==2.21.2 -======= -narwhals==2.22.0 ->>>>>>> 5ef6d1d6 (upgrade dependencies for deployment) # via plotly networkx==3.6.1 # via pymatgen-core diff --git a/mpcontribs-kernel-gateway/requirements/deployment.txt b/mpcontribs-kernel-gateway/requirements/deployment.txt index e3a21ebecc..827d405953 100644 --- a/mpcontribs-kernel-gateway/requirements/deployment.txt +++ b/mpcontribs-kernel-gateway/requirements/deployment.txt @@ -82,13 +82,7 @@ fonttools==4.63.0 # via matplotlib fqdn==1.5.1 # via jsonschema -<<<<<<< HEAD idna==3.18 -||||||| parent of 5ef6d1d6 (upgrade dependencies for deployment) -idna==3.16 -======= -idna==3.17 ->>>>>>> 5ef6d1d6 (upgrade dependencies for deployment) # via # anyio # jsonschema @@ -97,13 +91,7 @@ importlib-resources==7.1.0 # via swagger-spec-validator ipykernel==7.3.0 # via -r MPContribs/mpcontribs-kernel-gateway/requirements.in -<<<<<<< HEAD ipython==9.14.1 -||||||| parent of 5ef6d1d6 (upgrade dependencies for deployment) -ipython==9.13.0 -======= -ipython==9.14.0 ->>>>>>> 5ef6d1d6 (upgrade dependencies for deployment) # via # ipykernel # ipywidgets @@ -202,13 +190,7 @@ msgpack==1.2.1 # via # bravado # bravado-core -<<<<<<< HEAD narwhals==2.22.1 -||||||| parent of 5ef6d1d6 (upgrade dependencies for deployment) -narwhals==2.21.2 -======= -narwhals==2.22.0 ->>>>>>> 5ef6d1d6 (upgrade dependencies for deployment) # via plotly nbclient==0.11.0 # via nbconvert @@ -401,13 +383,7 @@ terminado==0.18.1 # jupyter-server-terminals tinycss2==1.5.1 # via bleach -<<<<<<< HEAD tornado==6.5.7 -||||||| parent of 5ef6d1d6 (upgrade dependencies for deployment) -tornado==6.5.5 -======= -tornado==6.5.6 ->>>>>>> 5ef6d1d6 (upgrade dependencies for deployment) # via # ipykernel # jupyter-client From 5860ae0d99eb5badc81419b3c95fa43e373d11d8 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 24 Jun 2026 15:42:14 -0700 Subject: [PATCH 444/591] Added Project.category to group together logically connected projects --- .../src/mpcontribs_api/domains/projects/models.py | 12 ++++++++++-- .../mpcontribs_api/domains/projects/repository.py | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py index 7216c82acc..728c1275b4 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py @@ -51,6 +51,7 @@ class Project(BaseDocumentWithInput[ShortStr]): stats: Stats # Optional + category: ShortStr | None = None references: list[Reference] = Field(default_factory=list) long_title: str | None = None other: dict[str, Any] = Field(default_factory=dict) @@ -84,6 +85,7 @@ class ProjectOut(DocumentOut[ShortStr]): authors: str | None = None description: str | None = None title: ShortStr | None = None + category: ShortStr | None = None owner: PrefixedEmail | None = None other: dict[str, Any] | None = None is_public: bool | None = None @@ -117,6 +119,11 @@ class ProjectFilter(BaseFilter): owner__neq: PrefixedEmail | None = None owner__ilike: str | None = None + category: ShortStr | None = None + category__in: list[ShortStr] | None = None + category__neq: ShortStr | None = None + category__ilike: str | None = None + # fuzzy only long_title__ilike: str | None = None @@ -147,12 +154,13 @@ class ProjectPatch(BaseModel): title: ShortStr | None = None authors: str | None = None description: str | None = None + category: ShortStr | None = None owner: PrefixedEmail | None = None unique_identifiers: bool | None = None references: list[Reference] = Field(default_factory=list) long_title: str | None = None other: dict[str, Any] = Field(default_factory=dict) columns: list[Column] = Field(default_factory=list) - is_public: bool = False - is_approved: bool = False + is_public: bool | None = None + is_approved: bool | None = None license: Literal["CCA4", "CCPD"] | None = None diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py index 0e6f96a96c..000be07dca 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py @@ -54,7 +54,7 @@ async def get_projects( """Query the Project collection, scoped to the current user. See ``get_many``.""" return await self.get_many(pagination=pagination, filter=filter, fields=fields) - async def get_project_by_id(self, id: str, fields: frozenset[str] | None): + async def get_project_by_id(self, id: str, fields: frozenset[str] | None) -> Project | ProjectOut | None: """Find a single project by id, scoped to the current user. See ``get_by_id``.""" return await self.get_by_id(id, fields) From e64f2f2683f9da2209657b6de51596e11419620b Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 15 Jul 2026 09:03:37 -0700 Subject: [PATCH 445/591] Removed stale 'old' directory --- mpcontribs-api/src/mpcontribs_api/old/core.py | 647 ------------------ 1 file changed, 647 deletions(-) delete mode 100644 mpcontribs-api/src/mpcontribs_api/old/core.py diff --git a/mpcontribs-api/src/mpcontribs_api/old/core.py b/mpcontribs-api/src/mpcontribs_api/old/core.py deleted file mode 100644 index a4a600db19..0000000000 --- a/mpcontribs-api/src/mpcontribs_api/old/core.py +++ /dev/null @@ -1,647 +0,0 @@ -import os -import yaml - -from copy import deepcopy -from re import Pattern -from importlib import import_module -from flasgger.marshmallow_apispec import SwaggerView as OriginalSwaggerView -from flasgger.marshmallow_apispec import schema2jsonschema -from marshmallow_mongoengine import ModelSchema -from flask_mongorest.views import ResourceView -from mongoengine.queryset import DoesNotExist -from mongoengine.queryset.visitor import Q -from werkzeug.exceptions import Unauthorized -from mpcontribs.api.config import DOC_DIR -from mpcontribs.api import is_gunicorn, get_logger - -logger = get_logger(__name__) - - -def get_limit_params(resource, method): - default = resource.default_limit - bulk = {"BulkUpdate", "BulkDelete"} - maximum = resource.bulk_update_limit if method in bulk else resource.max_limit - return [ - { - "name": "_skip", - "in": "query", - "type": "integer", - "description": "number of items to skip", - }, - { - "name": "_limit", - "in": "query", - "type": "integer", - "default": default, - "maximum": maximum, - "description": "maximum number of items to return", - }, - { - "name": "page", - "in": "query", - "type": "integer", - "description": "page number to return (in batches of `per_page/_limit`; alternative to `_skip`)", - }, - { - "name": "per_page", - "in": "query", - "type": "integer", - "default": default, - "maximum": maximum, - "description": "maximum number of items to return per page (same as `_limit`)", - }, - ] - - -def get_filter_params(name, filters): - filter_params = [] - is_pattern = isinstance(name, Pattern) - label = name.pattern if is_pattern else name - for op in filters: - if op.op == "exact" and not is_pattern: - name = label - description = f"filter {label}" - else: - suffix = op.suf if hasattr(op, "suf") else op.op - name = f"{label}__{suffix}" - description = f"filter {label} via ${op.op}" - - filter_params.append( - { - "name": name, - "in": "query", - "type": op.typ, - "description": description, - } - ) - if op.typ == "array": - filter_params[-1]["items"] = {"type": "string"} - if hasattr(op, "fmt"): - filter_params[-1]["format"] = op.fmt - - if op.allow_negation: - suffix = "not__" - suffix += op.suf if hasattr(op, "suf") else op.op - name = f"{label}__{suffix}" - description = f"filter {label} via ${op.op}" - param = deepcopy(filter_params[-1]) - param["name"] = name - param["description"] = description - filter_params.append(param) - - return filter_params - - -def get_specs(klass, method, collection): - method_name = method.__name__ if hasattr(method, "__name__") else method - default_response = { - "description": "Error", - "schema": {"type": "object", "properties": {"error": {"type": "string"}}}, - } - id_field = klass.resource.document._meta["id_field"].capitalize() - doc_name = collection[:-1].capitalize() - fields_param = None - if klass.resource.fields is not None: - fields_avail = ( - klass.resource.fields + klass.resource.get_optional_fields() + ["_all"] - ) - description = f"List of fields to include in response ({fields_avail})." - description += " Use dot-notation for nested subfields." - fields_param = { - "name": "_fields", - "in": "query", - "default": klass.resource.fields, - "type": "array", - "items": {"type": "string"}, - "description": description, - } - - field_pagination_params = [] - for field, limits in klass.resource.fields_to_paginate.items(): - field_pagination_params.append( - { - "name": f"{field}_page", - "in": "query", - "default": 1, - "type": "integer", - "description": f"page to retrieve for {field} field", - } - ) - field_pagination_params.append( - { - "name": f"{field}_per_page", - "in": "query", - "default": limits[0], - "maximum": limits[1], - "type": "integer", - "description": f"number of items to retrieve per page for {field} field", - } - ) - - filter_params = [] - if hasattr(klass.resource, "filters"): - for k, v in klass.resource.filters.items(): - filter_params += get_filter_params(k, v) - - order_params = [] - if klass.resource.allowed_ordering: - allowed_ordering = [ - o.pattern if isinstance(o, Pattern) else o - for o in klass.resource.allowed_ordering - ] - order_params = [ - { - "name": "_sort", - "in": "query", - "type": "string", - "description": f"sort {collection} via {allowed_ordering}. Prepend +/- for asc/desc.", - } - ] - - spec = None - if method_name == "Fetch": - params = [ - { - "name": "pk", - "in": "path", - "type": "string", - "required": True, - "description": f"{collection[:-1]} (primary key)", - } - ] - if fields_param is not None: - params.append(fields_param) - params += field_pagination_params - spec = { - "summary": f"Retrieve a {collection[:-1]}.", - "operationId": f"get{doc_name}By{id_field}", - "parameters": params, - "responses": { - 200: { - "description": f"single {collection} entry", - "schema": {"$ref": f"#/definitions/{klass.schema_name}"}, - }, - "default": default_response, - }, - } - - elif method_name == "BulkFetch": - params = [fields_param] if fields_param is not None else [] - params += field_pagination_params - params += order_params - params += filter_params - schema_props = { - "data": { - "type": "array", - "items": {"$ref": f"#/definitions/{klass.schema_name}"}, - } - } - if klass.resource.paginate: - schema_props["has_more"] = {"type": "boolean"} - schema_props["total_count"] = {"type": "integer"} - schema_props["total_pages"] = {"type": "integer"} - params += get_limit_params(klass.resource, method_name) - spec = { - "summary": f"Filter and retrieve {collection}.", - "operationId": f"query{doc_name}s", - "parameters": params, - "responses": { - 200: { - "description": f"list of {collection}", - "schema": {"type": "object", "properties": schema_props}, - }, - "default": default_response, - }, - } - - elif method_name == "Download": - params = [ - { - "name": "short_mime", - "in": "path", - "type": "string", - "required": True, - "description": "MIME Download Type: gz", - "default": "gz", - }, - { - "name": "format", - "in": "query", - "type": "string", - "required": True, - "description": f"download {collection} in different formats: {klass.resource.download_formats}", - }, - ] - params += [fields_param] if fields_param is not None else [] - params += order_params - params += filter_params - if klass.resource.paginate: - params += get_limit_params(klass.resource, method_name) - spec = { - "summary": f"Filter and download {collection}.", - "operationId": f"download{doc_name}s", - "parameters": params, - "produces": ["application/gzip"], - "responses": { - 200: { - "description": f"{collection} download", - "schema": {"type": "file"}, - }, - "default": default_response, - }, - } - - elif method_name == "Create": - spec = { - "summary": f"Create a new {collection[:-1]}.", - "operationId": f"create{doc_name}", - "parameters": [ - { - "name": f"{collection[:-1]}", - "in": "body", - "description": f"The object to use for {collection[:-1]} creation", - "schema": {"$ref": f"#/definitions/{klass.schema_name}"}, - } - ], - "responses": { - 200: { - "description": f"{collection[:-1]} created", - "schema": {"$ref": f"#/definitions/{klass.schema_name}"}, - }, - "default": default_response, - }, - } - - elif method_name == "BulkCreate": - spec = { - "summary": f"Create new {collection[:-1]}(s).", - "operationId": f"create{doc_name}s", - "parameters": [ - { - "name": f"{collection}", - "in": "body", - "description": f"The objects to use for {collection[:-1]} creation", - "schema": { - "type": "array", - "items": {"$ref": f"#/definitions/{klass.schema_name}"}, - }, - } - ], - "responses": { - 200: { - "description": f"{collection} created", - "schema": { - "type": "object", - "properties": { - "count": {"type": "integer"}, - "data": { - "type": "array", - "items": {"$ref": f"#/definitions/{klass.schema_name}"}, - }, - }, - }, - }, - "default": default_response, - }, - } - - elif method_name == "Update": - spec = { - "summary": f"Update a {collection[:-1]}.", - "operationId": f"update{doc_name}By{id_field}", - "parameters": [ - { - "name": "pk", - "in": "path", - "type": "string", - "required": True, - "description": f"The {collection[:-1]} (primary key) to update", - }, - { - "name": f"{collection[:-1]}", - "in": "body", - "description": f"The object to use for {collection[:-1]} update", - "schema": {"type": "object"}, - }, - ], - "responses": { - 200: { - "description": f"{collection[:-1]} updated", - "schema": {"$ref": f"#/definitions/{klass.schema_name}"}, - }, - "default": default_response, - }, - } - elif method_name == "BulkUpdate": - params = filter_params - params.append( - { - "name": f"{collection}", - "in": "body", - "description": f"The object to use for {collection} bulk update", - "schema": {"type": "object"}, - } - ) - schema_props = {"count": {"type": "integer"}} - if klass.resource.paginate: - schema_props["has_more"] = {"type": "boolean"} - schema_props["total_count"] = {"type": "integer"} - schema_props["total_pages"] = {"type": "integer"} - params += get_limit_params(klass.resource, method_name) - spec = { - "summary": f"Filter and update {collection}.", - "operationId": f"update{doc_name}s", - "parameters": params, - "responses": { - 200: { - "description": f"Number of {collection} updated", - "schema": {"type": "object", "properties": schema_props}, - }, - "default": default_response, - }, - } - - elif method_name == "BulkDelete": - params = filter_params - schema_props = {"count": {"type": "integer"}} - if klass.resource.paginate: - schema_props["has_more"] = {"type": "boolean"} - schema_props["total_count"] = {"type": "integer"} - schema_props["total_pages"] = {"type": "integer"} - params += get_limit_params(klass.resource, method_name) - spec = { - "summary": f"Filter and delete {collection}.", - "operationId": f"delete{doc_name}s", - "parameters": params, - "responses": { - 200: { - "description": f"Number of {collection} deleted", - "schema": {"type": "object", "properties": schema_props}, - }, - "default": default_response, - }, - } - - elif method_name == "Delete": - spec = { - "summary": f"Delete a {collection[:-1]}.", - "operationId": f"delete{doc_name}By{id_field}", - "parameters": [ - { - "name": "pk", - "in": "path", - "type": "string", - "required": True, - "description": f"The {collection[:-1]} (primary key) to delete", - } - ], - "responses": { - 200: {"description": f"{collection[:-1]} deleted"}, - "default": default_response, - }, - } - - return spec - - -class SwaggerView(OriginalSwaggerView, ResourceView): - """A class-based view defining additional methods""" - - def __init_subclass__(cls, **kwargs): - """initialize Schema, decorators, definitions, and tags""" - super().__init_subclass__(**kwargs) - - if not __name__ == cls.__module__: - # e.g.: cls.__module__ = mpcontribs.api.projects.views - views_path = cls.__module__.split(".") - doc_path = ".".join(views_path[:-1] + ["document"]) - cls.tags = [views_path[-2]] - doc_filepath = doc_path.replace(".", os.sep) + ".py" - if os.path.exists(doc_filepath): - cls.doc_name = cls.tags[0].capitalize() - Model = getattr(import_module(doc_path), cls.doc_name) - cls.schema_name = cls.doc_name + "Schema" - cls.Schema = type( - cls.schema_name, - (ModelSchema, object), - { - "Meta": type( - "Meta", - (object,), - dict(model=Model, ordered=True, model_build_obj=False), - ) - }, - ) - cls.definitions = {cls.schema_name: schema2jsonschema(cls.Schema)} - cls.resource.schema = cls.Schema - - # write flask-mongorest swagger specs - for method in cls.methods: - spec = get_specs(cls, method, cls.tags[0]) - if spec: - dir_path = os.path.join(DOC_DIR, cls.tags[0]) - file_path = os.path.join(dir_path, method.__name__ + ".yml") - if not os.path.exists(file_path): - os.makedirs(dir_path, exist_ok=True) - - if is_gunicorn: - with open(file_path, "w") as f: - yaml.dump(spec, f) - logger.debug( - f"{cls.tags[0]}.{method.__name__} written to {file_path}" - ) - - def get_groups(self, request): - groups = request.headers.get("X-Authenticated-Groups", "").split(",") - groups += request.headers.get("X-Consumer-Groups", "").split(",") - return set(grp.strip() for grp in groups if grp) - - def is_anonymous(self, request): - if not request.headers.get("X-Consumer-Username", ""): - return True - - is_anonymous = request.headers.get("X-Anonymous-Consumer", False) - if isinstance(is_anonymous, str): - is_anonymous = False if is_anonymous == "false" else True - - return is_anonymous - - def is_external(self, request): - return request.headers.get( - "X-Forwarded-Host" - ) is not None and not request.headers.get("Origin") - - def is_admin(self, request): - groups = self.get_groups(request) - admin_group = os.environ.get("ADMIN_GROUP", "admin") - return admin_group in groups - - def is_project_user(self, request, obj): - if hasattr(obj, "owner"): - owner = obj.owner - project = obj.name - elif hasattr(obj, "project"): - owner = obj.project.owner - project = obj.project.name - else: - raise Unauthorized(f"Unable to authorize {obj}") - - groups = self.get_groups(request) - username = request.headers.get("X-Consumer-Username") - return project in groups or owner == username - - def is_admin_or_project_user(self, request, obj): - if self.is_anonymous(request): - return False - - if self.is_admin(request): - return True - - return self.is_project_user(request, obj) - - def get_projects(self): - # project is LazyReferenceFields (multiple queries) - module = import_module("mpcontribs.api.projects.document") - Projects = getattr(module, "Projects") - exclude = list(Projects._fields.keys()) - only = ["name", "owner", "is_public", "is_approved"] - return Projects.objects.exclude(*exclude).only(*only) - - def get_projects_filter(self, username, groups, filter_names=None): - projects = self.get_projects() - if filter_names: - projects = projects.filter(name__in=filter_names) - - q = {"private": [], "public": []} - - for project in projects: - if project.owner == username or project.name in groups: - q["private"].append(project.name) - elif project.is_public and project.is_approved: - q["public"].append(project.name) - - # reduced query - qfilter = Q() - if q["private"]: - qfilter |= Q(project__in=q["private"]) - if q["public"]: - qfilter |= Q(project__in=q["public"], is_public=True) - - return qfilter - - def has_read_permission(self, request, qs): - if self.is_admin(request): - return qs # admins can read all entries - - groups = self.get_groups(request) - is_anonymous = self.is_anonymous(request) - is_external = self.is_external(request) - username = request.headers.get("X-Consumer-Username") - approved_public_filter = Q(is_public=True, is_approved=True) - - if request.path.startswith("/projects/"): - # external or internal requests can both read full project info - # anonymous requests can only read public approved projects - if is_anonymous: - return qs.filter(approved_public_filter) - - # authenticated requests can read approved public or accessible non-public projects - qfilter = approved_public_filter | Q(owner=username) - if groups: - qfilter |= Q(name__in=list(groups)) - - return qs.filter(qfilter) - else: - # contributions are set private/public independent from projects - # anonymous requests: - # - external: only meta-data of public contributions in approved public projects - # - internal: full public contributions in approved public projects - # authenticated requests: - # - private contributions in a public project are only accessible to owner/group - # - any contributions in a private project are only accessible to owner/group - component = request.path.split("/")[1] - - if component == "contributions": - q = qs._query - if is_anonymous and is_external: - qs = qs.exclude("data") - - if q and "project" in q and isinstance(q["project"], str): - projects = self.get_projects() - try: - project = projects.get(name=q["project"]) - except DoesNotExist: - return qs.none() - - if project.owner == username or project.name in groups: - return qs - elif project.is_public and project.is_approved: - return qs.filter(is_public=True) - else: - return qs.none() - else: - names = None - if q and "project" in q and "$in" in q["project"]: - names = q.pop("project").pop("$in") - - qfilter = self.get_projects_filter( - username, groups, filter_names=names - ) - return qs.filter(qfilter) - else: - # get component Object IDs for queryset - pk = request.view_args.get("pk") - from mpcontribs.api.contributions.document import get_resource - - resource = get_resource(component) - - def qfilter(qs): - return qs.clone() - - if pk: - ids = [resource.get_object(pk, qfilter=qfilter).id] - else: - ids = [o.id for o in resource.get_objects(qfilter=qfilter)[0]] - - if not ids: - return qs.none() - - # get list of readable contributions and their component Object IDs - module = import_module("mpcontribs.api.contributions.document") - Contributions = getattr(module, "Contributions") - qfilter = self.get_projects_filter(username, groups) - component = component[:-1] if component == "notebooks" else component - qfilter &= Q(**{f"{component}__in": ids}) - contribs = ( - Contributions.objects(qfilter).only(component).limit(len(ids)) - ) - # return new queryset using "ids__in" - readable_ids = ( - [getattr(contrib, component).id for contrib in contribs] - if component == "notebook" - else [ - dbref.id - for contrib in contribs - for dbref in getattr(contrib, component) - if dbref.id in ids - ] - ) - if not readable_ids: - return qs.none() - - qs._query_obj = Q(id__in=readable_ids) - # exclude optional fields if anonymous external request - if is_anonymous and is_external: - exclude = resource.get_optional_fields() - qs = qs.exclude(*exclude) - - return qs - - def has_add_permission(self, request, obj): - return self.is_admin_or_project_user(request, obj) - - def has_change_permission(self, request, obj): - return self.is_admin_or_project_user(request, obj) - - def has_delete_permission(self, request, obj): - return self.is_admin_or_project_user(request, obj) From da7af78cf676c7708b50efd9c98bdd74adbbe6ca Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 15 Jul 2026 09:18:21 -0700 Subject: [PATCH 446/591] Added custom str types to help with str validation (originally from contrib-data-handling branch --- .../mpcontribs_api/domains/_shared/types.py | 89 +++++++++++++++++++ 1 file changed, 89 insertions(+) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py index bfaf0e4a1f..68061141a7 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py @@ -1,4 +1,5 @@ import re +import unicodedata from enum import StrEnum from typing import Annotated @@ -108,3 +109,91 @@ def _serialize_frame(data: pl.DataFrame) -> dict: ), WithJsonSchema({"type": "object"}, mode="serialization"), ] + + +def _nfkc_casefold(value: str) -> str: + """NFKC + casefold: the case-insensitive, compatibility-folded form used for search/matching. + + Surrounding whitespace is stripped by :func:`nfkc_normalize` before casefolding. + """ + return nfkc_normalize(value).casefold() + + +def nfkc_normalize(value: str) -> str: + """Return ``value`` in Unicode NFKC (compatibility composition) form, preserving case. + + NFKC folds *compatibility* variants onto a canonical form — the MICRO SIGN U+00B5 becomes the + Greek mu, the ``fi`` ligature becomes ``fi``, full-width characters become half-width, and so on. + Unlike :func:`_nfkc_casefold` it does not casefold, so human-facing labels keep their original + case. It is a superset of :func:`nfc_normalize` (NFKC output is already NFC-stable). + + Leading/trailing whitespace is stripped (NFKC first, so compatibility whitespace such as the + NBSP U+00A0 folds to a plain space and is then trimmed) so ``" Foo "`` and ``"Foo"`` collapse to + the same stored form. + """ + return unicodedata.normalize("NFKC", value).strip() + + +def nfc_normalize(value: str) -> str: + """Return ``value`` in Unicode NFC (canonical composition) form. + + NFC folds canonically-equivalent codepoints onto one representative — e.g. the OHM SIGN + (U+2126) and Ångström sign (U+212B) collapse onto the Greek capital omega and ``Å``. This keeps + equivalent spellings of units, labels, and query terms comparable byte-for-byte. It is a no-op on + pure ASCII. NFC is deliberately *not* NFKC: it does not casefold or apply compatibility folding + (so the MICRO SIGN U+00B5 and Greek mu U+03BC stay distinct). + + Leading/trailing whitespace is stripped so equivalent spellings compare byte-for-byte. Note NFC + (unlike NFKC) does not fold compatibility whitespace, but :meth:`str.strip` trims all Unicode + whitespace regardless, so an NBSP-padded value is still trimmed. + """ + return unicodedata.normalize("NFC", value).strip() + + +# Acronym boundary: an uppercase letter followed by an uppercase-then-lowercase +# pair. The trailing capital begins a new word, so ``HTTPResponse`` splits as +# ``HTTP|Response`` +_ACRONYM_BOUNDARY = re.compile(r"(?<=[A-Z])(?=[A-Z][a-z])") + +# camelCase/PascalCase boundary: a lowercase letter or digit immediately followed +# by an uppercase letter (``bandGap`` -> ``band|Gap``). The ``0-9`` in the lookbehind +# also splits ``digit->UPPER`` (``Al2O3`` -> ``al2_o3``) +_CAMEL_BOUNDARY = re.compile(r"(?<=[a-z0-9])(?=[A-Z])") + +# Any run of characters that isn't an ASCII letter or digit collapses to a single +# underscore (spaces, hyphens, punctuation, etc.). +_NON_ALNUM_RUN = re.compile(r"[^a-zA-Z0-9]+") + +_SPECIAL_TERMS = { + "pH": "ph", +} +_SPECIAL_RE = re.compile("|".join(re.escape(k) for k in _SPECIAL_TERMS)) if _SPECIAL_TERMS else None + + +def to_snake_case(name: str) -> str: + """Coerce a single key token to canonical ``snake_case``. + + Rewrites known irregular terms, splits ``camelCase``/``PascalCase`` and + acronym boundaries, lowercases, and collapses every run of non-alphanumeric + characters to a single underscore, trimming leading/trailing underscores. + """ + s = name + if _SPECIAL_RE is not None: + s = _SPECIAL_RE.sub(lambda m: _SPECIAL_TERMS[m.group()], s) + s = _ACRONYM_BOUNDARY.sub("_", s) + s = _CAMEL_BOUNDARY.sub("_", s) + s = _NON_ALNUM_RUN.sub("_", s) + return s.strip("_").lower() + + +# Converts strs to snake case +SnakeCaseStr = Annotated[str, BeforeValidator(func=to_snake_case)] + +# Converts strs to searchable form (NFKC compatibility fold + casefold) +SearchStr = Annotated[str, BeforeValidator(func=_nfkc_casefold)] + +# NFKC-normalizes strs (compatibility fold, case preserved) — for human-facing labels/names +NFKCStr = Annotated[str, BeforeValidator(func=nfkc_normalize)] + +# Converts strs to pretty display form (keeps unicode and most formatting) +DisplayStr = Annotated[str, BeforeValidator(func=nfc_normalize)] From d47cb79133a2e10684bcef88d323cff37db945d4 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 15 Jul 2026 15:31:12 -0700 Subject: [PATCH 447/591] Generalized _shared/repo methods over model-defined identifiers --- .../mpcontribs_api/domains/_shared/models.py | 16 +++ .../domains/_shared/repository.py | 125 +++++++++++++++++- .../domains/contributions/models.py | 11 +- 3 files changed, 146 insertions(+), 6 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py index 2dfb073c66..d055d27a3c 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py @@ -27,6 +27,22 @@ class BaseDocumentWithInput[TId](Document): # Required, non-null, resource-specific id. Overrides Document's optional ``PydanticObjectId`` id. id: TId = Field(alias="_id") # pyright: ignore[reportGeneralTypeIssues, reportIncompatibleVariableOverride] + @classmethod + def identifier_fields(cls) -> frozenset[str]: + """Field names that uniquely identify a document in this collection. + + This is the natural/unique key a caller can supply without first knowing the Mongo ``_id`` + (e.g. ``{"name", "owner"}`` for a project group). The repository pairs these names with + caller-supplied values to locate a single resource, and rejects any value dict whose keys + don't match this set. Defaults to the primary key; subclasses with a meaningful compound key + override it. + """ + return frozenset({"id"}) + + def identifiers(self) -> dict[str, Any]: + """This document's identifier field values, keyed by :meth:`identifier_fields`.""" + return {field: getattr(self, field) for field in self.identifier_fields()} + @classmethod def from_input_model(cls, data: Any) -> Self: """Translate a validated input payload into a full stored document.""" diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py index 66c940d3bc..76a7e8bf45 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py @@ -105,6 +105,62 @@ async def get_many( next_cursor = encode_cursor(str(items[-1].id)) if has_more and items else None return Page(items=items, next_cursor=next_cursor) + def _identifier_query(self, identifiers: dict[str, Any]) -> dict[str, Any]: + """Turn a ``{field: value}`` identifier dict into a scoped Mongo query fragment. + + The keys must be exactly the model's :meth:`identifier_fields` + ``id`` is remapped Mongo's ``_id`` (mirroring ``BaseFilter._get_filter_conditions``) + since a raw dict query does not go through Beanie's alias resolution. + + Args: + identifiers (dict[str, Any]): identifier field values keyed by ``identifier_fields`` + """ + expected = self.document_model.identifier_fields() + if identifiers.keys() != expected: + raise ValidationError( + "identifiers must match the model's identifier fields exactly", + expected=sorted(expected), + received=sorted(identifiers.keys()), + ) + return {("_id" if key == "id" else key): value for key, value in identifiers.items()} + + async def _resolve_one_id(self, identifiers: dict[str, Any], session: AsyncClientSession | None = None) -> Any: + """Resolve the single scoped ``_id`` matching ``identifiers``, or ``None`` if absent. + + Enforces uniqueness: the identifier fields are meant to key at most one document, so if two + are found (a duplicate under a supposedly-unique key) this raises ``ConflictError`` rather + than silently picking one. + """ + query = self._identifier_query(identifiers) + projection = self.out_model.projection(frozenset({"id"})) + docs = ( + await self.document_model.find(self._scope, query, session=session).limit(2).project(projection).to_list() + ) # pyright: ignore[reportArgumentType] + if len(docs) > 1: + raise ConflictError("identifiers matched more than one document", identifiers=identifiers) + return docs[0].id if docs else None + + async def get_one( + self, + identifiers: dict[str, Any], + fields: frozenset[str] | None = None, + ) -> TOut | None: + """Return the single scoped document matching ``identifiers``, projected to ``fields``. + + Returns ``None`` when nothing matches, but ``ConflictError`` if the identifiers match + more than one document. + + Args: + identifiers (dict[str, Any]): identifier field values keyed by ``identifier_fields`` + fields (frozenset[str] | None): fields to project; if None the full document is returned + """ + query = self._identifier_query(identifiers) + projection = self.out_model.projection(fields) + docs = await self.document_model.find(self._scope, query).limit(2).project(projection).to_list() # pyright: ignore[reportArgumentType] + if len(docs) > 1: + raise ConflictError("identifiers matched more than one document", identifiers=identifiers) + return docs[0] if docs else None + async def get_by_id(self, id: Any, fields: frozenset[str] | None = None) -> TDoc | TOut | None: """Return a single scoped document by id, projected to the requested fields. @@ -146,17 +202,55 @@ async def insert_one(self, in_resource: TIn) -> TDoc: await document.insert() return document + async def delete(self, filter: TFilter, session: AsyncClientSession | None = None) -> DeleteResponse: + """Delete every scoped document matching an arbitrary ``filter``. + + This is the bulk path (e.g. "delete every ProjectGroup with owner == X"). It does not raise + on an empty match — a zero count is a valid, unambiguous outcome for a filter delete. Scoping + ensures callers cannot delete documents they are not permitted to see. + + Args: + filter (TFilter): the fastapi-filter query to apply on top of the user scope + session (AsyncClientSession | None): optional client session for transactions + """ + query = filter.filter(self.document_model.find(self._scope, session=session)) + result = await query.delete_many(session=session) + if result is None: + raise ValidationError("DeleteResult not returned internally") + return DeleteResponse.from_delete_result(result) + + async def delete_one( + self, identifiers: dict[str, Any], session: AsyncClientSession | None = None + ) -> DeleteResponse: + """Delete the single scoped document matching ``identifiers``. + + Uniqueness is checked before anything is deleted (see :meth:`_resolve_one_id`), so a + duplicate raises ``ConflictError`` and an absent resource raises ``NotFoundError`` — this + never deletes more than the one intended document. + + Args: + identifiers (dict[str, Any]): identifier field values keyed by ``identifier_fields`` + session (AsyncClientSession | None): optional client session for transactions + """ + oid = await self._resolve_one_id(identifiers, session=session) + if oid is None: + raise NotFoundError(f"{self.document_model.__name__} not found", identifiers=identifiers) + return await self.delete_by_id(oid, session=session) + async def delete_by_id(self, id: Any, session: AsyncClientSession | None = None) -> DeleteResponse: - """Delete a single scoped document by id. + """Delete a single scoped document by its primary key (``_id``). - Scoping ensures callers cannot delete documents they are not permitted to see. + Scoping ensures callers cannot delete documents they are not permitted to see; an id that is + absent or out of scope raises ``NotFoundError``. Kept distinct from :meth:`delete_one`, whose + key is the semantic ``identifier_fields`` (which differs from ``_id`` for some resources). Args: - id (str): the id of the document to delete + id (Any): the primary key of the document to delete + session (AsyncClientSession | None): optional client session for transactions """ doc = await self.document_model.find_one(self._scope, self.document_model.id == id, session=session) - if not doc: - raise NotFoundError("Document with id not found", id=id) + if doc is None: + raise NotFoundError(self._not_found(id)) await doc.delete(session=session) return DeleteResponse(num_deleted=1) @@ -211,6 +305,27 @@ async def patch(self, id: Any, update: TPatch) -> TDoc: raise NotFoundError(self._not_found(id)) return updated + async def patch_one( + self, + identifiers: dict[str, Any], + update: TPatch, + session: AsyncClientSession | None = None, + ) -> TDoc: + """Partially update the single scoped document matching ``identifiers``. + + Resolves the target by its unique identifier fields (raising ``ConflictError`` on a + duplicate, ``NotFoundError`` when absent) and then applies the patch via :meth:`patch`. + + Args: + identifiers (dict[str, Any]): identifier field values keyed by ``identifier_fields`` + update (TPatch): the partial update to apply; unset fields are dropped + session (AsyncClientSession | None): optional client session for transactions + """ + oid = await self._resolve_one_id(identifiers, session=session) + if oid is None: + raise NotFoundError(f"{self.document_model.__name__} not found", identifiers=identifiers) + return await self.patch(oid, update) + def _hash_payload(self, payload: dict[str, Any], *, separators: tuple[str, str] = (",", ":")) -> str: canonical = json.dumps( payload, diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py index 8c4ceadfe1..7b70d10a77 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py @@ -106,6 +106,11 @@ class Settings: IndexModel(keys=[("attachments.$id", ASCENDING)], name="ref_attachments"), ] + @classmethod + def identifier_fields(cls) -> frozenset[str]: + """A contribution is uniquely identified (within a version) by ``project`` + ``identifier``.""" + return frozenset({"project", "identifier"}) + class Contribution(ContributionBase): """Models what is actually stored in the database.""" @@ -160,7 +165,11 @@ def component_count(self) -> int: return len(self.structures or []) + len(self.tables or []) + len(self.attachments or []) def identifiers(self) -> dict[str, str]: - """Returns a dict of unique identifiers for a contribution (outside of id).""" + """Returns this contribution's identifier values (see ``identifier_fields``). + + Overrides the base to narrow the value type to ``str`` for the callers (bulk error + reporting, ``upsert_contribution_by_identifiers``) that key on it. + """ return {"project": self.project, "identifier": self.identifier} From b136c412e58a5a25f378375d159702d985faccaf Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 15 Jul 2026 15:32:05 -0700 Subject: [PATCH 448/591] Created ProjectGroups to model collections of projects --- .../src/mpcontribs_api/api/v1/router.py | 2 + mpcontribs-api/src/mpcontribs_api/app.py | 2 + .../domains/project_groups/dependencies.py | 13 ++ .../domains/project_groups/models.py | 107 ++++++++++++ .../domains/project_groups/repository.py | 74 ++++++++ .../domains/project_groups/router.py | 121 +++++++++++++ .../tests/integration/db/conftest.py | 10 +- .../db/test_project_groups_repository.py | 159 ++++++++++++++++++ .../tests/unit/domains/test_shared_models.py | 42 +++++ 9 files changed, 529 insertions(+), 1 deletion(-) create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/project_groups/dependencies.py create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/project_groups/models.py create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/project_groups/repository.py create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/project_groups/router.py create mode 100644 mpcontribs-api/tests/integration/db/test_project_groups_repository.py diff --git a/mpcontribs-api/src/mpcontribs_api/api/v1/router.py b/mpcontribs-api/src/mpcontribs_api/api/v1/router.py index 871ce25bdd..530751946d 100644 --- a/mpcontribs-api/src/mpcontribs_api/api/v1/router.py +++ b/mpcontribs-api/src/mpcontribs_api/api/v1/router.py @@ -3,6 +3,7 @@ from mpcontribs_api.domains.attachments.router import router as attachments_router from mpcontribs_api.domains.contributions.router import router as contributions_router from mpcontribs_api.domains.limits.router import router as limits_router +from mpcontribs_api.domains.project_groups.router import router as project_groups_router from mpcontribs_api.domains.projects.router import router as projects_router from mpcontribs_api.domains.structures.router import router as structures_router from mpcontribs_api.domains.tables.router import router as tables_router @@ -12,6 +13,7 @@ router.include_router(attachments_router, prefix="/attachments", tags=["attachments"]) router.include_router(contributions_router, prefix="/contributions", tags=["contributions"]) router.include_router(limits_router, prefix="/limits", tags=["limits"]) +router.include_router(project_groups_router, prefix="/project_groups", tags=["project_groups"]) router.include_router(projects_router, prefix="/projects", tags=["projects"]) router.include_router(structures_router, prefix="/structures", tags=["structures"]) router.include_router(tables_router, prefix="/tables", tags=["tables"]) diff --git a/mpcontribs-api/src/mpcontribs_api/app.py b/mpcontribs-api/src/mpcontribs_api/app.py index aa370d0e45..de13195b31 100644 --- a/mpcontribs-api/src/mpcontribs_api/app.py +++ b/mpcontribs-api/src/mpcontribs_api/app.py @@ -21,6 +21,7 @@ from mpcontribs_api.domains.attachments.models import Attachment from mpcontribs_api.domains.contributions.models import Contribution from mpcontribs_api.domains.healthcheck.router import router as healthcheck_router +from mpcontribs_api.domains.project_groups.models import ProjectGroup from mpcontribs_api.domains.projects.models import Project from mpcontribs_api.domains.structures.models import Structure from mpcontribs_api.domains.tables.models import Table @@ -63,6 +64,7 @@ async def _setup_mongo(app: FastAPI, settings: Settings, stack: AsyncExitStack) database=client[settings.mongo.db_name], document_models=[ Project, + ProjectGroup, Contribution, Attachment, Structure, diff --git a/mpcontribs-api/src/mpcontribs_api/domains/project_groups/dependencies.py b/mpcontribs-api/src/mpcontribs_api/domains/project_groups/dependencies.py new file mode 100644 index 0000000000..d1e0aefc54 --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/domains/project_groups/dependencies.py @@ -0,0 +1,13 @@ +from typing import Annotated + +from fastapi import Depends + +from mpcontribs_api.dependencies import UserDep +from mpcontribs_api.domains.project_groups.repository import ProjectGroupRepository + + +def get_project_group_repository(user: UserDep) -> ProjectGroupRepository: + return ProjectGroupRepository(user) + + +ProjectGroupDep = Annotated[ProjectGroupRepository, Depends(get_project_group_repository)] diff --git a/mpcontribs-api/src/mpcontribs_api/domains/project_groups/models.py b/mpcontribs-api/src/mpcontribs_api/domains/project_groups/models.py new file mode 100644 index 0000000000..671398d9ce --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/domains/project_groups/models.py @@ -0,0 +1,107 @@ +from beanie import Link, PydanticObjectId +from bson.errors import InvalidId +from pydantic import Field, field_validator +from pymongo import ASCENDING, IndexModel + +from mpcontribs_api.domains._shared.filters import BaseFilter +from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut +from mpcontribs_api.domains._shared.types import PrefixedEmail, SearchStr, ShortStr +from mpcontribs_api.domains.projects.models import Project +from mpcontribs_api.exceptions import ValidationError +from mpcontribs_api.projection import SparseFieldsModel + + +class ProjectGroup(BaseDocumentWithInput[PydanticObjectId]): + name: SearchStr = Field(max_length=50) + owner: PrefixedEmail + projects: list[Link[Project]] + description: str = Field(max_length=100) + + class Settings: + name = "project_groups" + indexes = [ + IndexModel( + keys=[("name", ASCENDING), ("owner", ASCENDING)], + name="name_owner", + unique=True, + ) + ] + validate_on_save = True + + @classmethod + def identifier_fields(cls) -> frozenset[str]: + """A ``ProjectGroup`` is uniquely identified by its ``name`` + ``owner``.""" + return frozenset({"name", "owner"}) + + @field_validator("projects") + @classmethod + def _reject_duplicate_refs( + cls, + value: list[Link[Project] | Project], + ) -> list[Link[Project] | Project]: + seen: set[ShortStr] = set() + for item in value: + ref_id = item.ref.id if isinstance(item, Link) else item.id + if ref_id in seen: + raise ValidationError( + message="duplicate Project reference in ProjectGroup", + duplicate_id=ref_id, + ) + seen.add(ref_id) + return value + + +class ProjectGroupIn(ProjectGroup): + pass + + +class ProjectGroupOut(DocumentOut[PydanticObjectId]): + name: SearchStr | None = None + owner: PrefixedEmail | None = None + projects: list[Link[Project]] | None = None + description: str | None = None + + @staticmethod + def default_fields() -> list[str]: + return [ + "name", + "description", + "projects", + ] + + +class ProjectGroupPatch(SparseFieldsModel): + name: SearchStr | None = None + owner: PrefixedEmail | None = None + projects: list[Link[Project]] | None = None + description: str | None = None + + +class ProjectGroupFilter(BaseFilter): + id: PydanticObjectId | None = None + id__in: list[PydanticObjectId] | None = None + id__neq: PydanticObjectId | None = None + + name: SearchStr | None = None + name__in: list[SearchStr] | None = None + name__neq: ShortStr | None = None + + owner: PrefixedEmail | None = None + owner__in: list[PrefixedEmail] | None = None + owner__neq: PrefixedEmail | None = None + + order_by: list[str] | None = None + + class Constants(BaseFilter.Constants): + model: ProjectGroup + + @field_validator("id", mode="before") + @classmethod + def convert_str_to_oid(cls, v: str): + try: + return PydanticObjectId(v) + except InvalidId as err: + raise ValidationError( + "Invalid ObjectId format. Must be 12-byte input or a 24-character hex string", + oid=v, + ) from err diff --git a/mpcontribs-api/src/mpcontribs_api/domains/project_groups/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/project_groups/repository.py new file mode 100644 index 0000000000..ff360015e3 --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/domains/project_groups/repository.py @@ -0,0 +1,74 @@ +from typing import Any + +from mpcontribs_api.authz import User +from mpcontribs_api.domains._shared.models import DeleteResponse +from mpcontribs_api.domains._shared.repository import MongoDbRepository +from mpcontribs_api.domains._shared.types import PrefixedEmail, SearchStr +from mpcontribs_api.domains.project_groups.models import ( + ProjectGroup, + ProjectGroupFilter, + ProjectGroupIn, + ProjectGroupOut, + ProjectGroupPatch, +) +from mpcontribs_api.pagination import CursorParams, Page + + +class ProjectGroupRepository( + MongoDbRepository[ProjectGroup, ProjectGroupIn, ProjectGroupOut, ProjectGroupFilter, ProjectGroupPatch] +): + document_model = ProjectGroup + out_model = ProjectGroupOut + + @staticmethod + def _build_scope(user: User) -> dict[str, Any]: + """Provides scope based on current user's permitted groups and publicly released data.""" + if user.is_admin: + return {} + ors: list[dict[str, Any]] = [{"is_public": True, "is_approved": True}] + if not user.is_anonymous: + ors.append({"owner": user.username}) + if user.groups: + ors.append({"_id": {"$in": sorted(user.groups)}}) + return {"$or": ors} + + async def get_project_groups( + self, + pagination: CursorParams, + filter: ProjectGroupFilter, + fields: frozenset[str] | None, + ) -> Page[ProjectGroupOut]: + """Return paginated project groups matching a filter. + + Args: + pagination (CursorParams): arguments for cursor-based pagination + filter (ProjectGroupFilter): optional filters to select ProjectGroups + fields (frozenset[str] | None): the fields to return to a user + """ + return await self.get_many(pagination=pagination, filter=filter, fields=fields) + + async def get_project_group( + self, + name: SearchStr, + owner: PrefixedEmail, + fields: frozenset[str] | None, + ) -> ProjectGroupOut | None: + """Return the single project group identified by ``name`` + ``owner``. See ``get_one``.""" + return await self.get_one({"name": name, "owner": owner}, fields) + + async def insert_project_group(self, project_group: ProjectGroupIn) -> ProjectGroup: + return await self.insert_one(in_resource=project_group) + + async def patch_project_group( + self, name: SearchStr, owner: PrefixedEmail, update: ProjectGroupPatch + ) -> ProjectGroup: + """Patch the single project group identified by ``name`` + ``owner``. See ``patch_one``.""" + return await self.patch_one({"name": name, "owner": owner}, update) + + async def delete_project_group(self, name: SearchStr, owner: PrefixedEmail) -> DeleteResponse: + """Delete the single project group identified by ``name`` + ``owner``. See ``delete_one``.""" + return await self.delete_one({"name": name, "owner": owner}) + + async def delete_project_groups(self, filter: ProjectGroupFilter) -> DeleteResponse: + """Bulk-delete every scoped project group matching ``filter``. See ``delete``.""" + return await self.delete(filter) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/project_groups/router.py b/mpcontribs-api/src/mpcontribs_api/domains/project_groups/router.py new file mode 100644 index 0000000000..9069237271 --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/domains/project_groups/router.py @@ -0,0 +1,121 @@ +from typing import Annotated + +from fastapi import APIRouter, Depends, Response, status +from fastapi_filter import FilterDepends + +from mpcontribs_api.dependencies import require_user +from mpcontribs_api.domains._shared.models import DeleteResponse +from mpcontribs_api.domains._shared.types import FieldSelector, PrefixedEmail, SearchStr +from mpcontribs_api.domains.project_groups.dependencies import ProjectGroupDep +from mpcontribs_api.domains.project_groups.models import ( + ProjectGroupFilter, + ProjectGroupIn, + ProjectGroupOut, + ProjectGroupPatch, +) +from mpcontribs_api.pagination import CursorParams + +router = APIRouter() + + +@router.get("") +async def get_project_groups( + repo: ProjectGroupDep, + pagination: Annotated[CursorParams, Depends()], + filter: ProjectGroupFilter = FilterDepends(ProjectGroupFilter), + fields: FieldSelector = ProjectGroupOut.default_fields(), +): + """Return paginated project groups matching a filter. + + Args: + repo (ProjectGroupDep): the project group repo we depend on + pagination (CursorParams): arguments for cursor-based pagination + filter (ProjectGroupFilter): optional filters to select ProjectGroups + fields (FieldSelector): the fields to return to a user + """ + selected = ProjectGroupOut.parse_fields(fields) + return await repo.get_project_groups(pagination=pagination, filter=filter, fields=selected) + + +@router.get("/item") +async def get_project_group( + repo: ProjectGroupDep, + name: SearchStr, + owner: PrefixedEmail, + fields: FieldSelector = ProjectGroupOut.default_fields(), +): + """Return the single project group identified by ``name`` + ``owner``. + + Args: + repo (ProjectGroupDep): the project group repo we depend on + name (SearchStr): the project group's name + owner (PrefixedEmail): the project group's owner + fields (FieldSelector): the fields to return to a user + """ + selected = ProjectGroupOut.parse_fields(fields) + return await repo.get_project_group(name=name, owner=owner, fields=selected) + + +@router.post("", response_model=ProjectGroupOut, status_code=status.HTTP_201_CREATED, dependencies=[Depends(require_user)]) +async def insert_project_group( + repo: ProjectGroupDep, + project_group: ProjectGroupIn, +): + """Insert a new project group. + + Args: + repo (ProjectGroupDep): the project group repo we depend on + project_group (ProjectGroupIn): the project group to insert + """ + return await repo.insert_project_group(project_group=project_group) + + +@router.patch("/item", response_model=ProjectGroupOut, dependencies=[Depends(require_user)]) +async def patch_project_group( + repo: ProjectGroupDep, + name: SearchStr, + owner: PrefixedEmail, + update: ProjectGroupPatch, +): + """Partially update the project group identified by ``name`` + ``owner``. + + Args: + repo (ProjectGroupDep): the project group repo we depend on + name (SearchStr): the project group's name + owner (PrefixedEmail): the project group's owner + update (ProjectGroupPatch): the partial update to apply - unset fields are dropped + """ + return await repo.patch_project_group(name=name, owner=owner, update=update) + + +@router.delete("/item", status_code=status.HTTP_204_NO_CONTENT, dependencies=[Depends(require_user)]) +async def delete_project_group( + repo: ProjectGroupDep, + name: SearchStr, + owner: PrefixedEmail, +): + """Delete the single project group identified by ``name`` + ``owner``. + + Raises 404 if no such group is visible to the caller, 409 if the identifiers are ambiguous. + + Args: + repo (ProjectGroupDep): the project group repo we depend on + name (SearchStr): the project group's name + owner (PrefixedEmail): the project group's owner + """ + await repo.delete_project_group(name=name, owner=owner) + return Response(status_code=status.HTTP_204_NO_CONTENT) + + +@router.delete("", response_model=DeleteResponse, dependencies=[Depends(require_user)]) +async def delete_project_groups( + repo: ProjectGroupDep, + filter: ProjectGroupFilter = FilterDepends(ProjectGroupFilter), +): + """Bulk-delete every project group matching ``filter`` (e.g. all with a given owner). + + Args: + repo (ProjectGroupDep): the project group repo we depend on + filter (ProjectGroupFilter): the query selecting which project groups to delete + """ + return await repo.delete_project_groups(filter=filter) diff --git a/mpcontribs-api/tests/integration/db/conftest.py b/mpcontribs-api/tests/integration/db/conftest.py index beab815b9f..f4f8caa08f 100644 --- a/mpcontribs-api/tests/integration/db/conftest.py +++ b/mpcontribs-api/tests/integration/db/conftest.py @@ -6,6 +6,7 @@ from mpcontribs_api.config import get_settings from mpcontribs_api.domains.attachments.models import Attachment from mpcontribs_api.domains.contributions.models import Contribution +from mpcontribs_api.domains.project_groups.models import ProjectGroup from mpcontribs_api.domains.projects.models import Project from mpcontribs_api.domains.structures.models import Structure from mpcontribs_api.domains.tables.models import Table @@ -66,7 +67,7 @@ async def db(mongo_client): database = mongo_client[settings.mongo.db_name] await init_beanie( database=database, - document_models=[Project, Contribution, Structure, Table, Attachment], + document_models=[Project, ProjectGroup, Contribution, Structure, Table, Attachment], ) yield database @@ -97,3 +98,10 @@ async def clean_components(db): yield for collection in ("structures", "tables", "attachments"): await db[collection].delete_many({}) + + +@pytest_asyncio.fixture(autouse=True) +async def clean_project_groups(db): + await db["project_groups"].delete_many({}) + yield + await db["project_groups"].delete_many({}) diff --git a/mpcontribs-api/tests/integration/db/test_project_groups_repository.py b/mpcontribs-api/tests/integration/db/test_project_groups_repository.py new file mode 100644 index 0000000000..b247c66043 --- /dev/null +++ b/mpcontribs-api/tests/integration/db/test_project_groups_repository.py @@ -0,0 +1,159 @@ +import pytest +from beanie import PydanticObjectId + +from mpcontribs_api.authz import User +from mpcontribs_api.domains.project_groups.models import ( + ProjectGroup, + ProjectGroupFilter, + ProjectGroupIn, + ProjectGroupPatch, +) +from mpcontribs_api.domains.project_groups.repository import ProjectGroupRepository +from mpcontribs_api.exceptions import ConflictError, NotFoundError, ValidationError + +# Share the session event loop (see the projects repo test for why). +pytestmark = [pytest.mark.db, pytest.mark.asyncio(loop_scope="session")] + + +# --------------------------------------------------------------------------- +# Helpers +# --------------------------------------------------------------------------- + +ADMIN = User(username="google:admin@example.com", groups=frozenset({"admin"})) +ALICE = User(username="google:alice@example.com", groups=frozenset({"mp-team"})) +ANON = User() + +ALICE_EMAIL = "google:alice@example.com" + + +def _repo(user: User) -> ProjectGroupRepository: + return ProjectGroupRepository(user) + + +def _group_in(name: str, owner: str = ALICE_EMAIL, **overrides) -> ProjectGroupIn: + defaults = { + "_id": PydanticObjectId(), + "name": name, + "owner": owner, + "projects": [], + "description": "a group", + } + defaults.update(overrides) + return ProjectGroupIn(**defaults) + + +async def _insert(name: str, owner: str = ALICE_EMAIL, **overrides) -> ProjectGroup: + return await _repo(ADMIN).insert_project_group(_group_in(name, owner, **overrides)) + + +# --------------------------------------------------------------------------- +# get_one +# --------------------------------------------------------------------------- + + +class TestGetOne: + async def test_returns_group_by_identifiers(self, db): + await _insert("group-a") + found = await _repo(ADMIN).get_project_group(name="group-a", owner=ALICE_EMAIL, fields=None) + assert found is not None + assert found.name == "group-a" + assert found.owner == ALICE_EMAIL + + async def test_returns_none_when_absent(self, db): + found = await _repo(ADMIN).get_project_group(name="missing", owner=ALICE_EMAIL, fields=None) + assert found is None + + async def test_out_of_scope_returns_none(self, db): + # Alice's private group is invisible to an anonymous caller. + await _insert("group-priv") + found = await _repo(ANON).get_project_group(name="group-priv", owner=ALICE_EMAIL, fields=None) + assert found is None + + +# --------------------------------------------------------------------------- +# delete_one (identifier-keyed, single-resource, raises) +# --------------------------------------------------------------------------- + + +class TestDeleteOne: + async def test_deletes_matching_group(self, db): + await _insert("del-a") + result = await _repo(ADMIN).delete_project_group(name="del-a", owner=ALICE_EMAIL) + assert result.num_deleted == 1 + assert await ProjectGroup.find_one(ProjectGroup.name == "del-a") is None + + async def test_absent_raises_not_found(self, db): + with pytest.raises(NotFoundError): + await _repo(ADMIN).delete_project_group(name="nope", owner=ALICE_EMAIL) + + async def test_out_of_scope_raises_not_found(self, db): + # Alice's group is out of scope for anon, so it "does not exist" for them. + await _insert("del-scoped") + with pytest.raises(NotFoundError): + await _repo(ANON).delete_project_group(name="del-scoped", owner=ALICE_EMAIL) + # ...and it is untouched. + assert await ProjectGroup.find_one(ProjectGroup.name == "del-scoped") is not None + + async def test_wrong_identifier_keys_raise_validation(self, db): + with pytest.raises(ValidationError): + await _repo(ADMIN).delete_one({"name": "x"}) # missing 'owner' + + async def test_duplicate_identifiers_raise_conflict(self, db): + # The name_owner unique index normally makes this impossible; drop it so we can plant a + # duplicate and exercise the defensive uniqueness guard in _resolve_one_id. Tolerant of a + # prior drop within the same session. + try: + await db["project_groups"].drop_index("name_owner") + except Exception: + pass + await db["project_groups"].insert_many( + [ + {"_id": PydanticObjectId(), "name": "dup", "owner": ALICE_EMAIL, "projects": [], "description": "d"}, + {"_id": PydanticObjectId(), "name": "dup", "owner": ALICE_EMAIL, "projects": [], "description": "d"}, + ] + ) + with pytest.raises(ConflictError): + await _repo(ADMIN).delete_project_group(name="dup", owner=ALICE_EMAIL) + + +# --------------------------------------------------------------------------- +# patch_one +# --------------------------------------------------------------------------- + + +class TestPatchOne: + async def test_updates_field(self, db): + await _insert("patch-a", description="before") + updated = await _repo(ADMIN).patch_project_group( + name="patch-a", owner=ALICE_EMAIL, update=ProjectGroupPatch(description="after") + ) + assert updated.description == "after" + + async def test_absent_raises_not_found(self, db): + with pytest.raises(NotFoundError): + await _repo(ADMIN).patch_project_group( + name="ghost", owner=ALICE_EMAIL, update=ProjectGroupPatch(description="x") + ) + + +# --------------------------------------------------------------------------- +# delete (arbitrary-filter bulk) +# --------------------------------------------------------------------------- + + +class TestDeleteByFilter: + async def test_bulk_deletes_all_matching_owner(self, db): + await _insert("bulk-1") + await _insert("bulk-2") + await _insert("other", owner="google:bob@example.com") + result = await _repo(ADMIN).delete_project_groups( + filter=ProjectGroupFilter(owner=ALICE_EMAIL) + ) + assert result.num_deleted == 2 + assert await ProjectGroup.find_one(ProjectGroup.owner == "google:bob@example.com") is not None + + async def test_no_match_returns_zero(self, db): + result = await _repo(ADMIN).delete_project_groups( + filter=ProjectGroupFilter(owner="google:nobody@example.com") + ) + assert result.num_deleted == 0 diff --git a/mpcontribs-api/tests/unit/domains/test_shared_models.py b/mpcontribs-api/tests/unit/domains/test_shared_models.py index 2ba8c3c9d8..b7cb13ad7d 100644 --- a/mpcontribs-api/tests/unit/domains/test_shared_models.py +++ b/mpcontribs-api/tests/unit/domains/test_shared_models.py @@ -8,6 +8,9 @@ DocumentOut, ) from mpcontribs_api.domains.attachments.models import Attachment, AttachmentIn +from mpcontribs_api.domains.contributions.models import Contribution, ContributionIn +from mpcontribs_api.domains.project_groups.models import ProjectGroup +from mpcontribs_api.domains.projects.models import Project from mpcontribs_api.pagination import encode_cursor # --------------------------------------------------------------------------- @@ -98,6 +101,45 @@ def test_serializes_under_id_not_underscore_id(self): # --------------------------------------------------------------------------- +# --------------------------------------------------------------------------- +# identifier_fields() / identifiers() contract +# --------------------------------------------------------------------------- + + +class TestIdentifierContract: + def test_default_identifier_fields_is_primary_key(self): + # Content-addressed components fall back to the base default. + assert Attachment.identifier_fields() == frozenset({"id"}) + + def test_project_uses_id(self): + assert Project.identifier_fields() == frozenset({"id"}) + + def test_project_group_uses_name_and_owner(self): + assert ProjectGroup.identifier_fields() == frozenset({"name", "owner"}) + + def test_contribution_uses_project_and_identifier(self): + assert Contribution.identifier_fields() == frozenset({"project", "identifier"}) + assert ContributionIn.identifier_fields() == frozenset({"project", "identifier"}) + + def test_default_identifiers_reads_values_off_instance(self): + oid = PydanticObjectId() + doc = Attachment.from_input(_attachment_in()) + doc.id = oid + assert doc.identifiers() == {"id": oid} + + def test_contribution_identifiers_returns_natural_key_values(self): + contrib = ContributionIn( + **{ + "_id": PydanticObjectId(), + "project": "test-project", + "identifier": "mp-1234", + "formula": "Fe2O3", + "data": {}, + } + ) + assert contrib.identifiers() == {"project": "test-project", "identifier": "mp-1234"} + + class TestDeleteResponse: def test_from_delete_result(self): result = DeleteResult({"n": 3}, acknowledged=True) From cc5cc1652ea30f7cb8f3793457310a97de16ee67 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 15 Jul 2026 17:02:44 -0700 Subject: [PATCH 449/591] Added project_groups service to coordinate manipulation of projects within a project group --- .../domains/project_groups/service.py | 111 ++++++++++++++++++ 1 file changed, 111 insertions(+) create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/project_groups/service.py diff --git a/mpcontribs-api/src/mpcontribs_api/domains/project_groups/service.py b/mpcontribs-api/src/mpcontribs_api/domains/project_groups/service.py new file mode 100644 index 0000000000..f059ea19c2 --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/domains/project_groups/service.py @@ -0,0 +1,111 @@ +from beanie import Link + +from mpcontribs_api.domains._shared.bulk import BulkFailure, BulkWriteSummary +from mpcontribs_api.domains._shared.types import PrefixedEmail, SearchStr, ShortStr +from mpcontribs_api.domains.project_groups.models import ProjectGroupOut +from mpcontribs_api.domains.project_groups.repository import ProjectGroupRepository +from mpcontribs_api.domains.projects.repository import MongoDbProjectRepository +from mpcontribs_api.exceptions import NotFoundError + +# Fields the membership operations need off a resolved group: its id (target of the update) and its +# current members (so deletion can tell members from non-members). +_GROUP_FIELDS = frozenset({"id", "projects"}) + + +class ProjectGroupService: + """Coordinates project-group membership changes across the groups and projects collections""" + + def __init__( + self, + groups: ProjectGroupRepository, + projects: MongoDbProjectRepository, + ) -> None: + self._groups = groups + self._projects = projects + + async def _resolve_by_id(self, group_id: str) -> ProjectGroupOut: + """Resolve a visible group by its ObjectId, or raise ``NotFoundError``.""" + oid = self._groups._convert_object_id(group_id) + group = await self._groups.get_by_id(oid, fields=_GROUP_FIELDS) + if group is None: + raise NotFoundError("ProjectGroup not found", id=group_id) + return group # pyright: ignore[reportReturnType] # projected reads return the out model + + async def _resolve_by_identifiers(self, name: SearchStr, owner: PrefixedEmail) -> ProjectGroupOut: + """Resolve a visible group by its ``(name, owner)`` identifiers, or raise ``NotFoundError``. + + Propagates ``ConflictError`` from the repository if the identifiers are ambiguous. + """ + group = await self._groups.get_one({"name": name, "owner": owner}, fields=_GROUP_FIELDS) + if group is None: + raise NotFoundError("ProjectGroup not found", name=name, owner=owner) + return group + + async def _add(self, group: ProjectGroupOut, project_ids: list[ShortStr]) -> BulkWriteSummary[str]: + """Validate each project against the projects collection, then add the valid ones. + + A project that does not exist or is not visible to the caller is reported as a failed item; + the rest are added in a single atomic ``$addToSet`` (idempotent for existing members). + """ + failed: list[BulkFailure] = [] + valid: list[ShortStr] = [] + for index, pid in enumerate(project_ids): + if await self._projects.get_by_id(pid, fields=frozenset({"id"})) is None: + failed.append( + BulkFailure( + index=index, + identifier={"id": pid}, + error_code="not_found", + message=f"Project {pid} not found or not visible", + ) + ) + elif pid not in valid: + valid.append(pid) + + if valid: + await self._groups.add_project_refs(group.id, valid) # pyright: ignore[reportArgumentType] # id is set on a resolved group + return BulkWriteSummary(total=len(project_ids), succeeded=valid, failed=failed) + + async def _delete(self, group: ProjectGroupOut, project_ids: list[ShortStr]) -> BulkWriteSummary[str]: + """Delete requested members from the group; non-members are reported as failed items.""" + current = { + (link.ref.id if isinstance(link, Link) else link.id) for link in (group.projects or []) + } + failed: list[BulkFailure] = [] + present: list[ShortStr] = [] + for index, pid in enumerate(project_ids): + if pid not in current: + failed.append( + BulkFailure( + index=index, + identifier={"id": pid}, + error_code="not_found", + message=f"Project {pid} is not a member of this group", + ) + ) + elif pid not in present: + present.append(pid) + + if present: + await self._groups.delete_project_refs(group.id, present) # pyright: ignore[reportArgumentType] # id is set on a resolved group + return BulkWriteSummary(total=len(project_ids), succeeded=present, failed=failed) + + async def add_projects_by_id(self, group_id: str, project_ids: list[ShortStr]) -> BulkWriteSummary[str]: + """Add projects to the group identified by ``group_id``.""" + return await self._add(await self._resolve_by_id(group_id), project_ids) + + async def add_projects_by_identifiers( + self, name: SearchStr, owner: PrefixedEmail, project_ids: list[ShortStr] + ) -> BulkWriteSummary[str]: + """Add projects to the group identified by ``(name, owner)``.""" + return await self._add(await self._resolve_by_identifiers(name, owner), project_ids) + + async def delete_projects_by_id(self, group_id: str, project_ids: list[ShortStr]) -> BulkWriteSummary[str]: + """Delete projects from the group identified by ``group_id``.""" + return await self._delete(await self._resolve_by_id(group_id), project_ids) + + async def delete_projects_by_identifiers( + self, name: SearchStr, owner: PrefixedEmail, project_ids: list[ShortStr] + ) -> BulkWriteSummary[str]: + """Delete projects from the group identified by ``(name, owner)``.""" + return await self._delete(await self._resolve_by_identifiers(name, owner), project_ids) From 91055fa2b7b6bc2799bf78c8ad5f9f65de376aa2 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 15 Jul 2026 17:03:09 -0700 Subject: [PATCH 450/591] Created ProjectGroupServiceDep --- .../domains/project_groups/dependencies.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/project_groups/dependencies.py b/mpcontribs-api/src/mpcontribs_api/domains/project_groups/dependencies.py index d1e0aefc54..7220513aca 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/project_groups/dependencies.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/project_groups/dependencies.py @@ -4,6 +4,8 @@ from mpcontribs_api.dependencies import UserDep from mpcontribs_api.domains.project_groups.repository import ProjectGroupRepository +from mpcontribs_api.domains.project_groups.service import ProjectGroupService +from mpcontribs_api.domains.projects.repository import MongoDbProjectRepository def get_project_group_repository(user: UserDep) -> ProjectGroupRepository: @@ -11,3 +13,13 @@ def get_project_group_repository(user: UserDep) -> ProjectGroupRepository: ProjectGroupDep = Annotated[ProjectGroupRepository, Depends(get_project_group_repository)] + + +def get_project_group_service(user: UserDep) -> ProjectGroupService: + return ProjectGroupService( + groups=ProjectGroupRepository(user), + projects=MongoDbProjectRepository(user), + ) + + +ProjectGroupServiceDep = Annotated[ProjectGroupService, Depends(get_project_group_service)] From a4a41886794e20fc495972b212b543341c2b8ad0 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 15 Jul 2026 17:03:45 -0700 Subject: [PATCH 451/591] Added logic for manipulation of group membership of projects --- .../domains/project_groups/models.py | 8 +++- .../domains/project_groups/repository.py | 47 ++++++++++++++++++- 2 files changed, 53 insertions(+), 2 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/project_groups/models.py b/mpcontribs-api/src/mpcontribs_api/domains/project_groups/models.py index 671398d9ce..4c2546d81f 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/project_groups/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/project_groups/models.py @@ -1,6 +1,6 @@ from beanie import Link, PydanticObjectId from bson.errors import InvalidId -from pydantic import Field, field_validator +from pydantic import BaseModel, Field, field_validator from pymongo import ASCENDING, IndexModel from mpcontribs_api.domains._shared.filters import BaseFilter @@ -77,6 +77,12 @@ class ProjectGroupPatch(SparseFieldsModel): description: str | None = None +class ProjectRefs(BaseModel): + """Request body for adding/removing projects from a group: the project ids to (un)link.""" + + project_ids: list[ShortStr] = Field(default_factory=list) + + class ProjectGroupFilter(BaseFilter): id: PydanticObjectId | None = None id__in: list[PydanticObjectId] | None = None diff --git a/mpcontribs-api/src/mpcontribs_api/domains/project_groups/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/project_groups/repository.py index ff360015e3..eee5c19ced 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/project_groups/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/project_groups/repository.py @@ -1,9 +1,14 @@ from typing import Any +from beanie import PydanticObjectId, UpdateResponse +from beanie.operators import AddToSet, Pull +from bson import DBRef +from pymongo.asynchronous.client_session import AsyncClientSession + from mpcontribs_api.authz import User from mpcontribs_api.domains._shared.models import DeleteResponse from mpcontribs_api.domains._shared.repository import MongoDbRepository -from mpcontribs_api.domains._shared.types import PrefixedEmail, SearchStr +from mpcontribs_api.domains._shared.types import PrefixedEmail, SearchStr, ShortStr from mpcontribs_api.domains.project_groups.models import ( ProjectGroup, ProjectGroupFilter, @@ -72,3 +77,43 @@ async def delete_project_group(self, name: SearchStr, owner: PrefixedEmail) -> D async def delete_project_groups(self, filter: ProjectGroupFilter) -> DeleteResponse: """Bulk-delete every scoped project group matching ``filter``. See ``delete``.""" return await self.delete(filter) + + async def add_project_refs( + self, + group_id: PydanticObjectId, + project_ids: list[ShortStr], + session: AsyncClientSession | None = None, + ) -> ProjectGroup | None: + """Atomically add project references to a scoped group, deduplicating existing members. + + Args: + group_id (PydanticObjectId): the id of the group to modify + project_ids (list[ShortStr]): project ids to add (already validated by the service) + session (AsyncClientSession | None): optional client session for transactions + """ + refs = [DBRef("projects", pid) for pid in project_ids] + query = self.document_model.find_one(self._scope, self.document_model.id == group_id, session=session).update( + AddToSet({"projects": {"$each": refs}}), + response_type=UpdateResponse.NEW_DOCUMENT, + ) + return await query # pyright: ignore[reportGeneralTypeIssues] # beanie UpdateQuery is awaitable + + async def delete_project_refs( + self, + group_id: PydanticObjectId, + project_ids: list[ShortStr], + session: AsyncClientSession | None = None, + ) -> ProjectGroup | None: + """Atomically delete project references from a scoped group. + + Args: + group_id (PydanticObjectId): the id of the group to modify + project_ids (list[ShortStr]): project ids to delete + session (AsyncClientSession | None): optional client session for transactions + """ + refs = [DBRef("projects", pid) for pid in project_ids] + query = self.document_model.find_one(self._scope, self.document_model.id == group_id, session=session).update( + Pull({"projects": {"$in": refs}}), + response_type=UpdateResponse.NEW_DOCUMENT, + ) + return await query # pyright: ignore[reportGeneralTypeIssues] # beanie UpdateQuery is awaitable From e5d715d43dc18cca4c81da61c148231e7c1647b5 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 15 Jul 2026 17:04:29 -0700 Subject: [PATCH 452/591] Added routes for individual project group operations --- .../domains/project_groups/router.py | 53 ++++++++++++++++++- 1 file changed, 52 insertions(+), 1 deletion(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/project_groups/router.py b/mpcontribs-api/src/mpcontribs_api/domains/project_groups/router.py index 9069237271..a27b485b34 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/project_groups/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/project_groups/router.py @@ -4,14 +4,16 @@ from fastapi_filter import FilterDepends from mpcontribs_api.dependencies import require_user +from mpcontribs_api.domains._shared.bulk import BulkWriteSummary from mpcontribs_api.domains._shared.models import DeleteResponse from mpcontribs_api.domains._shared.types import FieldSelector, PrefixedEmail, SearchStr -from mpcontribs_api.domains.project_groups.dependencies import ProjectGroupDep +from mpcontribs_api.domains.project_groups.dependencies import ProjectGroupDep, ProjectGroupServiceDep from mpcontribs_api.domains.project_groups.models import ( ProjectGroupFilter, ProjectGroupIn, ProjectGroupOut, ProjectGroupPatch, + ProjectRefs, ) from mpcontribs_api.pagination import CursorParams @@ -119,3 +121,52 @@ async def delete_project_groups( filter (ProjectGroupFilter): the query selecting which project groups to delete """ return await repo.delete_project_groups(filter=filter) + + +@router.post("/item/projects", response_model=BulkWriteSummary[str], dependencies=[Depends(require_user)]) +async def add_projects_by_identifiers( + service: ProjectGroupServiceDep, + name: SearchStr, + owner: PrefixedEmail, + body: ProjectRefs, +): + """Add projects to the group identified by ``name`` + ``owner``. + + Each project is verified against the projects collection (scoped to the caller); unknown or + invisible projects are reported per-item in the response rather than failing the whole request. + """ + return await service.add_projects_by_identifiers(name=name, owner=owner, project_ids=body.project_ids) + + +@router.delete("/item/projects", response_model=BulkWriteSummary[str], dependencies=[Depends(require_user)]) +async def delete_projects_by_identifiers( + service: ProjectGroupServiceDep, + name: SearchStr, + owner: PrefixedEmail, + body: ProjectRefs, +): + """Delete projects from the group identified by ``name`` + ``owner``. + + Ids that are not members of the group are reported per-item in the response. + """ + return await service.delete_projects_by_identifiers(name=name, owner=owner, project_ids=body.project_ids) + + +@router.post("/{id}/projects", response_model=BulkWriteSummary[str], dependencies=[Depends(require_user)]) +async def add_projects_by_id( + service: ProjectGroupServiceDep, + id: str, + body: ProjectRefs, +): + """Add projects to the group identified by ``id``. See ``add_projects_by_identifiers``.""" + return await service.add_projects_by_id(group_id=id, project_ids=body.project_ids) + + +@router.delete("/{id}/projects", response_model=BulkWriteSummary[str], dependencies=[Depends(require_user)]) +async def delete_projects_by_id( + service: ProjectGroupServiceDep, + id: str, + body: ProjectRefs, +): + """Delete projects from the group identified by ``id``. See ``delete_projects_by_identifiers``.""" + return await service.delete_projects_by_id(group_id=id, project_ids=body.project_ids) From 7b6400d675971c3f633accecae617a8ae64206c0 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 15 Jul 2026 17:04:42 -0700 Subject: [PATCH 453/591] Added tests --- .../db/test_project_groups_service.py | 154 ++++++++++++++++++ .../domains/test_project_group_service.py | 144 ++++++++++++++++ 2 files changed, 298 insertions(+) create mode 100644 mpcontribs-api/tests/integration/db/test_project_groups_service.py create mode 100644 mpcontribs-api/tests/unit/domains/test_project_group_service.py diff --git a/mpcontribs-api/tests/integration/db/test_project_groups_service.py b/mpcontribs-api/tests/integration/db/test_project_groups_service.py new file mode 100644 index 0000000000..d9c034f420 --- /dev/null +++ b/mpcontribs-api/tests/integration/db/test_project_groups_service.py @@ -0,0 +1,154 @@ +import pytest +from beanie import PydanticObjectId + +from mpcontribs_api.authz import User +from mpcontribs_api.domains.project_groups.models import ProjectGroup, ProjectGroupIn +from mpcontribs_api.domains.project_groups.repository import ProjectGroupRepository +from mpcontribs_api.domains.project_groups.service import ProjectGroupService +from mpcontribs_api.domains.projects.models import ProjectIn, Stats +from mpcontribs_api.domains.projects.repository import MongoDbProjectRepository +from mpcontribs_api.exceptions import ConflictError, NotFoundError + +pytestmark = [pytest.mark.db, pytest.mark.asyncio(loop_scope="session")] + + +# --------------------------------------------------------------------------- +# Helpers +# --------------------------------------------------------------------------- + +ADMIN = User(username="google:admin@example.com", groups=frozenset({"admin"})) +ALICE = User(username="google:alice@example.com", groups=frozenset({"mp-team"})) +ANON = User() + +ALICE_EMAIL = "google:alice@example.com" +BOB_EMAIL = "google:bob@example.com" +STATS = Stats(columns=0, contributions=0, tables=0, structures=0, attachments=0, size=0.0) + + +def _service(user: User = ADMIN) -> ProjectGroupService: + return ProjectGroupService(groups=ProjectGroupRepository(user), projects=MongoDbProjectRepository(user)) + + +async def _insert_project(pid: str, owner: str = ALICE_EMAIL, **overrides): + payload = { + "_id": pid, + "title": pid[:30], + "authors": "Author", + "description": "desc", + "owner": owner, + "unique_identifiers": True, + "stats": STATS, + } + payload.update(overrides) + return await MongoDbProjectRepository(ADMIN).insert_project(ProjectIn(**payload)) + + +async def _insert_group(name: str, owner: str = ALICE_EMAIL) -> ProjectGroup: + return await ProjectGroupRepository(ADMIN).insert_project_group( + ProjectGroupIn(_id=PydanticObjectId(), name=name, owner=owner, projects=[], description="d") + ) + + +async def _members(group_id: PydanticObjectId) -> list[str]: + doc = await ProjectGroup.find_one(ProjectGroup.id == group_id) + assert doc is not None + return sorted(link.ref.id for link in (doc.projects or [])) + + +# --------------------------------------------------------------------------- +# add +# --------------------------------------------------------------------------- + + +class TestAdd: + async def test_add_by_id_links_projects(self, db): + group = await _insert_group("add-id") + await _insert_project("mp-1") + await _insert_project("mp-2") + summary = await _service().add_projects_by_id(str(group.id), ["mp-1", "mp-2"]) + assert summary.succeeded == ["mp-1", "mp-2"] + assert summary.failed == [] + assert await _members(group.id) == ["mp-1", "mp-2"] + + async def test_add_by_identifiers_links_projects(self, db): + group = await _insert_group("add-ident") + await _insert_project("mp-x") + summary = await _service().add_projects_by_identifiers("add-ident", ALICE_EMAIL, ["mp-x"]) + assert summary.succeeded == ["mp-x"] + assert await _members(group.id) == ["mp-x"] + + async def test_add_is_idempotent(self, db): + group = await _insert_group("add-idem") + await _insert_project("mp-1") + await _service().add_projects_by_id(str(group.id), ["mp-1"]) + await _service().add_projects_by_id(str(group.id), ["mp-1"]) + assert await _members(group.id) == ["mp-1"] + + async def test_missing_project_fails_and_leaves_group_unchanged(self, db): + group = await _insert_group("add-missing") + summary = await _service().add_projects_by_id(str(group.id), ["ghost"]) + assert summary.succeeded == [] + assert summary.failed[0].error_code == "not_found" + assert await _members(group.id) == [] + + async def test_out_of_scope_project_fails(self, db): + # Bob's private project is invisible to Alice, so she cannot link it. + group = await _insert_group("add-scope") + await _insert_project("mp-bob", owner=BOB_EMAIL) + summary = await _service(ALICE).add_projects_by_id(str(group.id), ["mp-bob"]) + assert summary.succeeded == [] + assert summary.failed[0].error_code == "not_found" + assert await _members(group.id) == [] + + async def test_group_not_visible_raises_not_found(self, db): + group = await _insert_group("add-priv") # owned by Alice, invisible to anon + with pytest.raises(NotFoundError): + await _service(ANON).add_projects_by_id(str(group.id), []) + + async def test_ambiguous_identifiers_raise_conflict(self, db): + # Drop the unique index so we can plant a duplicate and exercise the uniqueness guard. + try: + await db["project_groups"].drop_index("name_owner") + except Exception: + pass + await db["project_groups"].insert_many( + [ + {"_id": PydanticObjectId(), "name": "dup", "owner": ALICE_EMAIL, "projects": [], "description": "d"}, + {"_id": PydanticObjectId(), "name": "dup", "owner": ALICE_EMAIL, "projects": [], "description": "d"}, + ] + ) + with pytest.raises(ConflictError): + await _service().add_projects_by_identifiers("dup", ALICE_EMAIL, []) + + +# --------------------------------------------------------------------------- +# delete +# --------------------------------------------------------------------------- + + +class TestDelete: + async def test_delete_by_id_unlinks_project(self, db): + group = await _insert_group("rm-id") + await _insert_project("mp-1") + await _insert_project("mp-2") + await _service().add_projects_by_id(str(group.id), ["mp-1", "mp-2"]) + summary = await _service().delete_projects_by_id(str(group.id), ["mp-1"]) + assert summary.succeeded == ["mp-1"] + assert await _members(group.id) == ["mp-2"] + + async def test_delete_by_identifiers_unlinks_project(self, db): + group = await _insert_group("rm-ident") + await _insert_project("mp-1") + await _service().add_projects_by_id(str(group.id), ["mp-1"]) + summary = await _service().delete_projects_by_identifiers("rm-ident", ALICE_EMAIL, ["mp-1"]) + assert summary.succeeded == ["mp-1"] + assert await _members(group.id) == [] + + async def test_delete_non_member_reported_as_failure(self, db): + group = await _insert_group("rm-nonmember") + await _insert_project("mp-1") + await _service().add_projects_by_id(str(group.id), ["mp-1"]) + summary = await _service().delete_projects_by_id(str(group.id), ["ghost"]) + assert summary.succeeded == [] + assert summary.failed[0].error_code == "not_found" + assert await _members(group.id) == ["mp-1"] diff --git a/mpcontribs-api/tests/unit/domains/test_project_group_service.py b/mpcontribs-api/tests/unit/domains/test_project_group_service.py new file mode 100644 index 0000000000..8385b6c7a9 --- /dev/null +++ b/mpcontribs-api/tests/unit/domains/test_project_group_service.py @@ -0,0 +1,144 @@ +from unittest.mock import AsyncMock, MagicMock + +import pytest +from beanie import Link, PydanticObjectId +from bson import DBRef + +from mpcontribs_api.domains.project_groups.models import ProjectGroupOut +from mpcontribs_api.domains.project_groups.service import ProjectGroupService +from mpcontribs_api.domains.projects.models import Project +from mpcontribs_api.exceptions import ConflictError, NotFoundError + +pytestmark = pytest.mark.asyncio + + +# --------------------------------------------------------------------------- +# Helpers +# --------------------------------------------------------------------------- + + +def _make_service(group: ProjectGroupOut | None, *, visible_projects: set[str] | None = None, ambiguous: bool = False): + """Build a service over stubbed repos. + + ``group`` is what the groups repo resolves to (None => not found). ``visible_projects`` gates + which project ids the projects repo reports as existing/visible. ``ambiguous`` makes identifier + resolution raise ConflictError (duplicate under the unique key). + """ + visible = visible_projects or set() + groups = AsyncMock() + projects = AsyncMock() + + if ambiguous: + groups.get_one.side_effect = ConflictError("ambiguous") + else: + groups.get_one.return_value = group + groups.get_by_id.return_value = group + # _convert_object_id is a sync repo method; keep it sync so the service gets a real id, not a coroutine. + groups._convert_object_id = MagicMock(side_effect=lambda s: PydanticObjectId(s)) + groups.add_project_refs.return_value = group + groups.delete_project_refs.return_value = group + + async def _get_project(pid, fields=None): + return {"_id": pid} if pid in visible else None + + projects.get_by_id.side_effect = _get_project + + return ProjectGroupService(groups=groups, projects=projects), groups, projects + + +def _group(project_ids: list[str] | None = None) -> ProjectGroupOut: + group = ProjectGroupOut.model_validate( + {"_id": PydanticObjectId(), "name": "g", "owner": "google:a@b.com", "projects": []} + ) + # Members are stored as Links (DBRefs); set them directly to sidestep Link revalidation. + group.projects = [Link(DBRef("projects", pid), Project) for pid in (project_ids or [])] + return group + + +# --------------------------------------------------------------------------- +# Group resolution +# --------------------------------------------------------------------------- + + +class TestGroupResolution: + async def test_add_by_id_missing_group_raises_not_found(self): + service, _, _ = _make_service(None) + with pytest.raises(NotFoundError): + await service.add_projects_by_id("0" * 24, ["mp-1"]) + + async def test_add_by_identifiers_missing_group_raises_not_found(self): + service, _, _ = _make_service(None) + with pytest.raises(NotFoundError): + await service.add_projects_by_identifiers("g", "google:a@b.com", ["mp-1"]) + + async def test_ambiguous_identifiers_propagate_conflict(self): + service, _, _ = _make_service(_group(), ambiguous=True) + with pytest.raises(ConflictError): + await service.add_projects_by_identifiers("g", "google:a@b.com", ["mp-1"]) + + +# --------------------------------------------------------------------------- +# add +# --------------------------------------------------------------------------- + + +class TestAddProjects: + async def test_valid_projects_are_added(self): + group = _group() + service, groups, _ = _make_service(group, visible_projects={"mp-1", "mp-2"}) + summary = await service.add_projects_by_id(str(group.id), ["mp-1", "mp-2"]) + assert summary.total == 2 + assert summary.succeeded == ["mp-1", "mp-2"] + assert summary.failed == [] + groups.add_project_refs.assert_awaited_once_with(group.id, ["mp-1", "mp-2"]) + + async def test_missing_project_reported_as_failure(self): + group = _group() + service, groups, _ = _make_service(group, visible_projects={"mp-1"}) + summary = await service.add_projects_by_id(str(group.id), ["mp-1", "ghost"]) + assert summary.succeeded == ["mp-1"] + assert len(summary.failed) == 1 + assert summary.failed[0].index == 1 + assert summary.failed[0].error_code == "not_found" + # only the valid id is written + groups.add_project_refs.assert_awaited_once_with(group.id, ["mp-1"]) + + async def test_no_valid_projects_skips_update(self): + group = _group() + service, groups, _ = _make_service(group, visible_projects=set()) + summary = await service.add_projects_by_id(str(group.id), ["ghost"]) + assert summary.succeeded == [] + assert len(summary.failed) == 1 + groups.add_project_refs.assert_not_awaited() + + async def test_duplicate_input_added_once(self): + group = _group() + service, groups, _ = _make_service(group, visible_projects={"mp-1"}) + summary = await service.add_projects_by_id(str(group.id), ["mp-1", "mp-1"]) + assert summary.succeeded == ["mp-1"] + groups.add_project_refs.assert_awaited_once_with(group.id, ["mp-1"]) + + +# --------------------------------------------------------------------------- +# delete +# --------------------------------------------------------------------------- + + +class TestDeleteProjects: + async def test_members_deleted_non_members_reported(self): + group = _group(["mp-1", "mp-2"]) + service, groups, _ = _make_service(group) + summary = await service.delete_projects_by_id(str(group.id), ["mp-1", "ghost"]) + assert summary.succeeded == ["mp-1"] + assert len(summary.failed) == 1 + assert summary.failed[0].index == 1 + assert summary.failed[0].error_code == "not_found" + groups.delete_project_refs.assert_awaited_once_with(group.id, ["mp-1"]) + + async def test_no_members_skips_update(self): + group = _group(["mp-1"]) + service, groups, _ = _make_service(group) + summary = await service.delete_projects_by_id(str(group.id), ["ghost"]) + assert summary.succeeded == [] + assert len(summary.failed) == 1 + groups.delete_project_refs.assert_not_awaited() From 376037ebb707c0e155ab7b7a02501f2ad135b345 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 15 Jul 2026 22:16:43 -0700 Subject: [PATCH 454/591] Added __contains filter operator --- .../mpcontribs_api/domains/_shared/filters.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/filters.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/filters.py index 027d25dfb5..4cd05d3bad 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/filters.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/filters.py @@ -2,6 +2,11 @@ from typing import Any from fastapi_filter.contrib.beanie import Filter +from fastapi_filter.contrib.beanie.filter import _odm_operator_transformer +from pydantic import ValidationInfo, field_validator + +# Register a custom __contains filter suffix to search where lists are a superset of a provided list +_odm_operator_transformer.setdefault("contains", lambda value: {"$all": value}) class BaseFilter(Filter): @@ -16,6 +21,20 @@ class BaseFilter(Filter): Domain filters should subclass this instead of fastapi-filter's ``Filter`` directly. """ + @field_validator("*", mode="before") + @classmethod + def _split_contains(cls, value: str | None, field: ValidationInfo) -> list[str] | str | None: + """Split a comma-separated ``__contains`` query string into a list. + + ``FilterDepends`` collapses list-typed filter fields to a single string query param and + relies on a before-validator to re-expand it. fastapi-filter only does this for ``__in`` + and ``__nin``; mirror it here for the ``contains`` operator so ``?tags__contains=a,c`` + parses into ``["a", "c"]``. + """ + if field.field_name is not None and field.field_name.endswith("__contains") and isinstance(value, str): + return value.split(",") if value else [] + return value + def _get_filter_conditions(self, nesting_depth: int = 1) -> list[tuple[Mapping[str, Any], Mapping[str, Any]]]: return [ ({"_id" if key == "id" else key: value for key, value in condition.items()}, options) From 38cf31fb6a2165a1c2885d66a7416f00e6cadf92 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 15 Jul 2026 22:17:32 -0700 Subject: [PATCH 455/591] Renamed 'category' to 'tags' for clearer terminology --- .../mpcontribs_api/domains/projects/models.py | 13 +++-- .../db/test_projects_repository.py | 51 +++++++++++++++++++ 2 files changed, 57 insertions(+), 7 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py index 728c1275b4..589ee198c3 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py @@ -51,7 +51,7 @@ class Project(BaseDocumentWithInput[ShortStr]): stats: Stats # Optional - category: ShortStr | None = None + tags: list[ShortStr] | None = None references: list[Reference] = Field(default_factory=list) long_title: str | None = None other: dict[str, Any] = Field(default_factory=dict) @@ -85,7 +85,7 @@ class ProjectOut(DocumentOut[ShortStr]): authors: str | None = None description: str | None = None title: ShortStr | None = None - category: ShortStr | None = None + tags: list[ShortStr] | None = None owner: PrefixedEmail | None = None other: dict[str, Any] | None = None is_public: bool | None = None @@ -119,10 +119,9 @@ class ProjectFilter(BaseFilter): owner__neq: PrefixedEmail | None = None owner__ilike: str | None = None - category: ShortStr | None = None - category__in: list[ShortStr] | None = None - category__neq: ShortStr | None = None - category__ilike: str | None = None + tags: list[ShortStr] | None = None # exact match of list + tags__in: list[ShortStr] | None = None # if at least one tag is present + tags__contains: list[ShortStr] | None = None # Project.tags must be a superset of these # fuzzy only long_title__ilike: str | None = None @@ -154,7 +153,7 @@ class ProjectPatch(BaseModel): title: ShortStr | None = None authors: str | None = None description: str | None = None - category: ShortStr | None = None + tags: list[ShortStr] | None = None owner: PrefixedEmail | None = None unique_identifiers: bool | None = None references: list[Reference] = Field(default_factory=list) diff --git a/mpcontribs-api/tests/integration/db/test_projects_repository.py b/mpcontribs-api/tests/integration/db/test_projects_repository.py index 6ec770c1aa..7e33766870 100644 --- a/mpcontribs-api/tests/integration/db/test_projects_repository.py +++ b/mpcontribs-api/tests/integration/db/test_projects_repository.py @@ -188,6 +188,57 @@ async def test_filter_by_id_neq_excludes(self, db): assert "filter-id-neq-drop" not in ids +# --------------------------------------------------------------------------- +# get_projects — tags filtering +# +# ``tags__contains`` maps to MongoDB ``$all``: a project matches only when its +# tags are a superset of every value supplied (the query list is a subset of +# the stored array). Contrast with ``tags__in`` ($in), which matches on any +# single overlapping tag. +# --------------------------------------------------------------------------- + + +class TestGetProjectsTagsFilter: + async def test_contains_requires_all_tags_as_subset(self, db): + from mpcontribs_api.domains.projects.models import ProjectFilter + + await _insert("tags-superset", tags=["alpha", "beta", "gamma"]) + await _insert("tags-partial", tags=["alpha", "beta"]) + await _insert("tags-none", tags=["delta"]) + page = await _repo(ADMIN).get_projects( + filter=ProjectFilter(tags__contains=["alpha", "gamma"]), + pagination=CursorParams(), + fields=None, + ) + assert {p.id for p in page.items} == {"tags-superset"} + + async def test_contains_single_tag(self, db): + from mpcontribs_api.domains.projects.models import ProjectFilter + + await _insert("tags-single-hit", tags=["alpha", "beta"]) + await _insert("tags-single-miss", tags=["beta", "gamma"]) + page = await _repo(ADMIN).get_projects( + filter=ProjectFilter(tags__contains=["alpha"]), + pagination=CursorParams(), + fields=None, + ) + assert {p.id for p in page.items} == {"tags-single-hit"} + + async def test_contains_parses_comma_string(self, db): + from mpcontribs_api.domains.projects.models import ProjectFilter + + await _insert("tags-csv-hit", tags=["alpha", "beta", "gamma"]) + await _insert("tags-csv-miss", tags=["alpha"]) + # FilterDepends collapses the list query param to a comma string; the + # BaseFilter validator must re-expand it. + page = await _repo(ADMIN).get_projects( + filter=ProjectFilter(tags__contains="alpha,beta"), + pagination=CursorParams(), + fields=None, + ) + assert {p.id for p in page.items} == {"tags-csv-hit"} + + # --------------------------------------------------------------------------- # Field projection # --------------------------------------------------------------------------- From 859f0174e2d4253f760285f76021e06e9bd2ce1f Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 15 Jul 2026 22:17:41 -0700 Subject: [PATCH 456/591] Formatting --- mpcontribs-api/src/mpcontribs_api/dependencies.py | 1 - .../src/mpcontribs_api/domains/project_groups/router.py | 4 +++- .../src/mpcontribs_api/domains/project_groups/service.py | 4 +--- mpcontribs-api/src/mpcontribs_api/exceptions.py | 1 + 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/dependencies.py b/mpcontribs-api/src/mpcontribs_api/dependencies.py index c13c84643a..0e0aa03278 100644 --- a/mpcontribs-api/src/mpcontribs_api/dependencies.py +++ b/mpcontribs-api/src/mpcontribs_api/dependencies.py @@ -71,4 +71,3 @@ def require_user(user: UserDep) -> User: if user.is_anonymous: raise AuthenticationError("authentication required") return user - diff --git a/mpcontribs-api/src/mpcontribs_api/domains/project_groups/router.py b/mpcontribs-api/src/mpcontribs_api/domains/project_groups/router.py index a27b485b34..68ee6afdb5 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/project_groups/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/project_groups/router.py @@ -58,7 +58,9 @@ async def get_project_group( return await repo.get_project_group(name=name, owner=owner, fields=selected) -@router.post("", response_model=ProjectGroupOut, status_code=status.HTTP_201_CREATED, dependencies=[Depends(require_user)]) +@router.post( + "", response_model=ProjectGroupOut, status_code=status.HTTP_201_CREATED, dependencies=[Depends(require_user)] +) async def insert_project_group( repo: ProjectGroupDep, project_group: ProjectGroupIn, diff --git a/mpcontribs-api/src/mpcontribs_api/domains/project_groups/service.py b/mpcontribs-api/src/mpcontribs_api/domains/project_groups/service.py index f059ea19c2..0aa2151943 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/project_groups/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/project_groups/service.py @@ -68,9 +68,7 @@ async def _add(self, group: ProjectGroupOut, project_ids: list[ShortStr]) -> Bul async def _delete(self, group: ProjectGroupOut, project_ids: list[ShortStr]) -> BulkWriteSummary[str]: """Delete requested members from the group; non-members are reported as failed items.""" - current = { - (link.ref.id if isinstance(link, Link) else link.id) for link in (group.projects or []) - } + current = {(link.ref.id if isinstance(link, Link) else link.id) for link in (group.projects or [])} failed: list[BulkFailure] = [] present: list[ShortStr] = [] for index, pid in enumerate(project_ids): diff --git a/mpcontribs-api/src/mpcontribs_api/exceptions.py b/mpcontribs-api/src/mpcontribs_api/exceptions.py index f6dfd32040..bcfc098235 100644 --- a/mpcontribs-api/src/mpcontribs_api/exceptions.py +++ b/mpcontribs-api/src/mpcontribs_api/exceptions.py @@ -91,6 +91,7 @@ class DownloadError(AppError): error_code = "download_error" log_level = logging.WARNING + def error_body(error_code: str, message: str, **public_context) -> dict: body: dict[str, Any] = {"error": {"code": error_code, "message": message}} if public_context: From 4aba4fdfc7d5ff63ae82432526f858e1a5a3933e Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 15 Jul 2026 22:30:14 -0700 Subject: [PATCH 457/591] Added is_public field to ProjectGroup models and fixed scope --- .../src/mpcontribs_api/domains/project_groups/models.py | 9 +++++++-- .../mpcontribs_api/domains/project_groups/repository.py | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/project_groups/models.py b/mpcontribs-api/src/mpcontribs_api/domains/project_groups/models.py index 4c2546d81f..d7793250a9 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/project_groups/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/project_groups/models.py @@ -14,6 +14,7 @@ class ProjectGroup(BaseDocumentWithInput[PydanticObjectId]): name: SearchStr = Field(max_length=50) owner: PrefixedEmail + is_public: bool = False projects: list[Link[Project]] description: str = Field(max_length=100) @@ -21,8 +22,8 @@ class Settings: name = "project_groups" indexes = [ IndexModel( - keys=[("name", ASCENDING), ("owner", ASCENDING)], - name="name_owner", + keys=[("name", ASCENDING), ("owner", ASCENDING), ("is_public", ASCENDING)], + name="name_owner_is_public", unique=True, ) ] @@ -58,6 +59,7 @@ class ProjectGroupIn(ProjectGroup): class ProjectGroupOut(DocumentOut[PydanticObjectId]): name: SearchStr | None = None owner: PrefixedEmail | None = None + is_public: bool | None = None projects: list[Link[Project]] | None = None description: str | None = None @@ -73,6 +75,7 @@ def default_fields() -> list[str]: class ProjectGroupPatch(SparseFieldsModel): name: SearchStr | None = None owner: PrefixedEmail | None = None + is_public: bool | None = None projects: list[Link[Project]] | None = None description: str | None = None @@ -96,6 +99,8 @@ class ProjectGroupFilter(BaseFilter): owner__in: list[PrefixedEmail] | None = None owner__neq: PrefixedEmail | None = None + is_public: bool | None = None + order_by: list[str] | None = None class Constants(BaseFilter.Constants): diff --git a/mpcontribs-api/src/mpcontribs_api/domains/project_groups/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/project_groups/repository.py index eee5c19ced..d0f96009d0 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/project_groups/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/project_groups/repository.py @@ -30,7 +30,7 @@ def _build_scope(user: User) -> dict[str, Any]: """Provides scope based on current user's permitted groups and publicly released data.""" if user.is_admin: return {} - ors: list[dict[str, Any]] = [{"is_public": True, "is_approved": True}] + ors: list[dict[str, Any]] = [{"is_public": True}] if not user.is_anonymous: ors.append({"owner": user.username}) if user.groups: From cec41adce787f3bc037a20f219010155a18c3794 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 15 Jul 2026 23:03:27 -0700 Subject: [PATCH 458/591] ProjectGroup converts from input model and ProjectGroupIn has proper fields (no id, list of str for projects) --- .../domains/project_groups/models.py | 34 +++++++++++++++---- .../db/test_project_groups_repository.py | 29 +++++++++++++++- .../db/test_project_groups_service.py | 2 +- 3 files changed, 56 insertions(+), 9 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/project_groups/models.py b/mpcontribs-api/src/mpcontribs_api/domains/project_groups/models.py index d7793250a9..79d0fea8d2 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/project_groups/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/project_groups/models.py @@ -1,6 +1,7 @@ from beanie import Link, PydanticObjectId +from bson import DBRef from bson.errors import InvalidId -from pydantic import BaseModel, Field, field_validator +from pydantic import BaseModel, ConfigDict, Field, field_validator from pymongo import ASCENDING, IndexModel from mpcontribs_api.domains._shared.filters import BaseFilter @@ -14,9 +15,9 @@ class ProjectGroup(BaseDocumentWithInput[PydanticObjectId]): name: SearchStr = Field(max_length=50) owner: PrefixedEmail - is_public: bool = False - projects: list[Link[Project]] description: str = Field(max_length=100) + is_public: bool = False + projects: list[Link[Project]] | None = None class Settings: name = "project_groups" @@ -34,12 +35,23 @@ def identifier_fields(cls) -> frozenset[str]: """A ``ProjectGroup`` is uniquely identified by its ``name`` + ``owner``.""" return frozenset({"name", "owner"}) + @classmethod + def from_input_model(cls, data: ProjectGroupIn) -> ProjectGroup: + """Build a stored group from input, assigning a fresh ``_id`` and resolving member ids to links""" + payload = data.model_dump() + project_ids = payload.pop("projects", None) or [] + payload["_id"] = PydanticObjectId() + payload["projects"] = [DBRef("projects", pid) for pid in project_ids] + return cls.model_validate(payload) + @field_validator("projects") @classmethod def _reject_duplicate_refs( cls, - value: list[Link[Project] | Project], - ) -> list[Link[Project] | Project]: + value: list[Link[Project] | Project] | None, + ) -> list[Link[Project] | Project] | None: + if value is None: + return value seen: set[ShortStr] = set() for item in value: ref_id = item.ref.id if isinstance(item, Link) else item.id @@ -52,8 +64,16 @@ def _reject_duplicate_refs( return value -class ProjectGroupIn(ProjectGroup): - pass +class ProjectGroupIn(BaseModel): + """User-supplied fields for creating a project group""" + + model_config = ConfigDict(extra="forbid") + + name: SearchStr = Field(max_length=50) + owner: PrefixedEmail + description: str = Field(max_length=100) + is_public: bool = False + projects: list[ShortStr] = Field(default_factory=list) class ProjectGroupOut(DocumentOut[PydanticObjectId]): diff --git a/mpcontribs-api/tests/integration/db/test_project_groups_repository.py b/mpcontribs-api/tests/integration/db/test_project_groups_repository.py index b247c66043..8488b85bdc 100644 --- a/mpcontribs-api/tests/integration/db/test_project_groups_repository.py +++ b/mpcontribs-api/tests/integration/db/test_project_groups_repository.py @@ -32,7 +32,6 @@ def _repo(user: User) -> ProjectGroupRepository: def _group_in(name: str, owner: str = ALICE_EMAIL, **overrides) -> ProjectGroupIn: defaults = { - "_id": PydanticObjectId(), "name": name, "owner": owner, "projects": [], @@ -157,3 +156,31 @@ async def test_no_match_returns_zero(self, db): filter=ProjectGroupFilter(owner="google:nobody@example.com") ) assert result.num_deleted == 0 + + +# --------------------------------------------------------------------------- +# insert_project_group +# +# The input model carries no ``_id`` (the server assigns the ObjectId) and takes +# plain project ids, which from_input_model resolves into stored Links/DBRefs. +# --------------------------------------------------------------------------- + + +class TestInsertProjectGroup: + async def test_assigns_object_id(self, db): + group = await _insert("ins-oid") + assert isinstance(group.id, PydanticObjectId) + + async def test_resolves_project_ids_to_links(self, db): + await _insert("ins-with-projects", projects=["mp-alpha", "mp-beta"]) + doc = await ProjectGroup.find_one(ProjectGroup.name == "ins-with-projects") + assert doc is not None + assert doc.projects is not None + assert {link.ref.collection for link in doc.projects} == {"projects"} + assert sorted(link.ref.id for link in doc.projects) == ["mp-alpha", "mp-beta"] + + async def test_empty_projects_default(self, db): + await _insert("ins-no-projects") + doc = await ProjectGroup.find_one(ProjectGroup.name == "ins-no-projects") + assert doc is not None + assert doc.projects == [] diff --git a/mpcontribs-api/tests/integration/db/test_project_groups_service.py b/mpcontribs-api/tests/integration/db/test_project_groups_service.py index d9c034f420..dfd81ddcda 100644 --- a/mpcontribs-api/tests/integration/db/test_project_groups_service.py +++ b/mpcontribs-api/tests/integration/db/test_project_groups_service.py @@ -45,7 +45,7 @@ async def _insert_project(pid: str, owner: str = ALICE_EMAIL, **overrides): async def _insert_group(name: str, owner: str = ALICE_EMAIL) -> ProjectGroup: return await ProjectGroupRepository(ADMIN).insert_project_group( - ProjectGroupIn(_id=PydanticObjectId(), name=name, owner=owner, projects=[], description="d") + ProjectGroupIn(name=name, owner=owner, projects=[], description="d") ) From 76fb5d31f2571f0c704d3407f3abdad40c08aceb Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 16 Jul 2026 09:33:50 -0700 Subject: [PATCH 459/591] Resolved issue where POST/PUT did not return a document with server-defined fields (ie. id) filled in --- .../src/mpcontribs_api/domains/_shared/models.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py index d055d27a3c..7051658f9e 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py @@ -5,7 +5,7 @@ from typing import Annotated, Any, ClassVar, Self from beanie import Document, PydanticObjectId -from pydantic import BaseModel, Field, model_validator +from pydantic import BaseModel, ConfigDict, Field, model_validator from pymongo.results import DeleteResult from mpcontribs_api import pagination @@ -59,8 +59,10 @@ class DocumentOut[TId](SparseFieldsModel): Mirrors :class:`BaseDocumentWithInput`: subclasses bind their id type as ``TId`` so each resource owns its id type, while the field (optional, since projections may omit it) and its alias wiring - are declared once here for the repository to read off any resource's output model. - """ + are declared once here for the repository to read off any resource's output model.""" + + # lets POST/PUT responses correctly bring ``_id`` into ``id``, without it ``id`` ends up as None + model_config = ConfigDict(populate_by_name=True) id: Annotated[TId | None, Field(alias="_id", serialization_alias="id")] = None From b040ad05a9bce90fab80c60a33e75d8e69d812cf Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 16 Jul 2026 09:38:17 -0700 Subject: [PATCH 460/591] Improved error catching on _shared/repo insert_one --- .../mpcontribs_api/domains/_shared/repository.py | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py index 76a7e8bf45..c1a65c62e0 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py @@ -14,6 +14,7 @@ from fastapi_filter.contrib.beanie import Filter from pydantic import BaseModel from pymongo.asynchronous.client_session import AsyncClientSession +from pymongo.errors import DuplicateKeyError from types_aiobotocore_s3 import S3Client from mpcontribs_api.authz import User @@ -190,16 +191,21 @@ async def list_ids(self, filter: TFilter, session: AsyncClientSession | None = N return [doc.id for doc in docs] async def insert_one(self, in_resource: TIn) -> TDoc: - """Insert a new document built from its input model, rejecting duplicate ids. + """Insert a new document built from its input model, rejecting an existing duplicate. + + Duplicates are determined by model-declared identifiers that uniquely identify a document. Args: in_resource (TIn): the validated input payload to translate and store """ document = self.document_model.from_input_model(in_resource) - existing = await self.document_model.find_one(self.document_model.id == document.id) - if existing: - raise ConflictError(f"Cannot insert document.\n Document with ID {document.id} exists") - await document.insert() + try: + await document.insert() + except DuplicateKeyError as exc: + raise ConflictError( + f"Cannot insert {self.document_model.__name__}: a conflicting document already exists", + identifiers=document.identifiers(), + ) from exc return document async def delete(self, filter: TFilter, session: AsyncClientSession | None = None) -> DeleteResponse: From 0355ea55ea31557116f4db808da125116ae092f0 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 16 Jul 2026 09:38:53 -0700 Subject: [PATCH 461/591] Improved index structure: unique key is now minimal --- .../src/mpcontribs_api/domains/project_groups/models.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/project_groups/models.py b/mpcontribs-api/src/mpcontribs_api/domains/project_groups/models.py index 79d0fea8d2..2788c16aa0 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/project_groups/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/project_groups/models.py @@ -22,11 +22,15 @@ class ProjectGroup(BaseDocumentWithInput[PydanticObjectId]): class Settings: name = "project_groups" indexes = [ + IndexModel( + keys=[("name", ASCENDING), ("owner", ASCENDING)], + name="name_owner", + unique=True, + ), IndexModel( keys=[("name", ASCENDING), ("owner", ASCENDING), ("is_public", ASCENDING)], name="name_owner_is_public", - unique=True, - ) + ), ] validate_on_save = True From 0a7a2ff242f19ade91244bf93c9818962d60226c Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 16 Jul 2026 09:39:30 -0700 Subject: [PATCH 462/591] Added tests for project-group duplication --- .../db/test_project_groups_repository.py | 13 ++++ .../tests/integration/test_project_groups.py | 76 +++++++++++++++++++ 2 files changed, 89 insertions(+) create mode 100644 mpcontribs-api/tests/integration/test_project_groups.py diff --git a/mpcontribs-api/tests/integration/db/test_project_groups_repository.py b/mpcontribs-api/tests/integration/db/test_project_groups_repository.py index 8488b85bdc..82723fd30e 100644 --- a/mpcontribs-api/tests/integration/db/test_project_groups_repository.py +++ b/mpcontribs-api/tests/integration/db/test_project_groups_repository.py @@ -184,3 +184,16 @@ async def test_empty_projects_default(self, db): doc = await ProjectGroup.find_one(ProjectGroup.name == "ins-no-projects") assert doc is not None assert doc.projects == [] + + async def test_duplicate_identifiers_raise_conflict(self, db): + # A ProjectGroup's identity is name + owner, not its server-assigned _id (a fresh ObjectId is + # minted per insert). insert_one must reject a second group with the same name+owner cleanly. + await _insert("ins-dup") + with pytest.raises(ConflictError): + await _insert("ins-dup") + + async def test_same_name_different_owner_allowed(self, db): + # name alone is not the identity: the same name under a different owner is a distinct group. + await _insert("ins-shared-name", owner=ALICE_EMAIL) + other = await _insert("ins-shared-name", owner="google:bob@example.com") + assert other.owner == "google:bob@example.com" diff --git a/mpcontribs-api/tests/integration/test_project_groups.py b/mpcontribs-api/tests/integration/test_project_groups.py new file mode 100644 index 0000000000..35726048b7 --- /dev/null +++ b/mpcontribs-api/tests/integration/test_project_groups.py @@ -0,0 +1,76 @@ +from types import SimpleNamespace +from unittest.mock import AsyncMock + +import pytest + +from mpcontribs_api.domains.project_groups.dependencies import get_project_group_repository +from tests.integration.conftest import AUTHED_HEADERS + +# A valid 24-char hex ObjectId string (ProjectGroupOut.id is a PydanticObjectId). +SAMPLE_OID = "6eb7cf5a86d9755df3a6c593" + + +@pytest.fixture +def group_repo(test_app): + repo = AsyncMock() + test_app.dependency_overrides[get_project_group_repository] = lambda: repo + yield repo + test_app.dependency_overrides.pop(get_project_group_repository, None) + + +# --------------------------------------------------------------------------- +# POST /api/v1/project_groups +# +# The handler returns the stored document, which FastAPI coerces into +# ProjectGroupOut with from_attributes=True. A Beanie Document exposes ``.id`` +# (not ``._id``), so the response model must populate its id by field name as +# well as the ``_id`` alias — otherwise every create/update response would +# serialise ``id: null`` and callers couldn't see what id their group got. +# --------------------------------------------------------------------------- + + +class TestInsertProjectGroupResponse: + def _body(self, **overrides): + body = { + "name": "my-group", + "owner": "google:alice@example.com", + "description": "d", + "projects": [], + } + body.update(overrides) + return body + + def _inserted(self, **overrides): + """Stand-in for the stored document: exposes ``.id`` like a Beanie Document.""" + attrs = { + "id": SAMPLE_OID, + "name": "my-group", + "owner": "google:alice@example.com", + "is_public": False, + "projects": None, + "description": "d", + } + attrs.update(overrides) + return SimpleNamespace(**attrs) + + def test_returns_201(self, client, group_repo): + group_repo.insert_project_group.return_value = self._inserted() + r = client.post("/api/v1/project_groups", json=self._body(), headers=AUTHED_HEADERS) + assert r.status_code == 201 + + def test_response_includes_generated_id(self, client, group_repo): + group_repo.insert_project_group.return_value = self._inserted() + body = client.post("/api/v1/project_groups", json=self._body(), headers=AUTHED_HEADERS).json() + assert body["id"] == SAMPLE_OID + + def test_response_echoes_full_document(self, client, group_repo): + group_repo.insert_project_group.return_value = self._inserted(name="echo-group", is_public=True) + body = client.post( + "/api/v1/project_groups", + json=self._body(name="echo-group", is_public=True), + headers=AUTHED_HEADERS, + ).json() + assert body["id"] == SAMPLE_OID + assert body["name"] == "echo-group" + assert body["owner"] == "google:alice@example.com" + assert body["is_public"] is True From 625896833f67fe4545ae74fbc519f07dbf4f2bb1 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 16 Jul 2026 09:49:27 -0700 Subject: [PATCH 463/591] Made inserting ProjectGroups a service-level concern by requiring that projects in a group during POST must be valid projects in a user's scope --- .../domains/project_groups/router.py | 9 +++-- .../domains/project_groups/service.py | 15 ++++++-- .../tests/integration/test_project_groups.py | 24 ++++++------- .../domains/test_project_group_service.py | 34 ++++++++++++++++++- 4 files changed, 64 insertions(+), 18 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/project_groups/router.py b/mpcontribs-api/src/mpcontribs_api/domains/project_groups/router.py index 68ee6afdb5..70a783b526 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/project_groups/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/project_groups/router.py @@ -62,16 +62,19 @@ async def get_project_group( "", response_model=ProjectGroupOut, status_code=status.HTTP_201_CREATED, dependencies=[Depends(require_user)] ) async def insert_project_group( - repo: ProjectGroupDep, + service: ProjectGroupServiceDep, project_group: ProjectGroupIn, ): """Insert a new project group. + Each referenced project is verified against the projects collection (scoped to the caller); + creation is rejected with 404 if any project id is unknown or not visible. + Args: - repo (ProjectGroupDep): the project group repo we depend on + service (ProjectGroupServiceDep): the project group service we depend on project_group (ProjectGroupIn): the project group to insert """ - return await repo.insert_project_group(project_group=project_group) + return await service.insert(project_group=project_group) @router.patch("/item", response_model=ProjectGroupOut, dependencies=[Depends(require_user)]) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/project_groups/service.py b/mpcontribs-api/src/mpcontribs_api/domains/project_groups/service.py index 0aa2151943..5976da27ca 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/project_groups/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/project_groups/service.py @@ -2,7 +2,7 @@ from mpcontribs_api.domains._shared.bulk import BulkFailure, BulkWriteSummary from mpcontribs_api.domains._shared.types import PrefixedEmail, SearchStr, ShortStr -from mpcontribs_api.domains.project_groups.models import ProjectGroupOut +from mpcontribs_api.domains.project_groups.models import ProjectGroup, ProjectGroupIn, ProjectGroupOut from mpcontribs_api.domains.project_groups.repository import ProjectGroupRepository from mpcontribs_api.domains.projects.repository import MongoDbProjectRepository from mpcontribs_api.exceptions import NotFoundError @@ -23,6 +23,17 @@ def __init__( self._groups = groups self._projects = projects + async def _project_exists(self, project_id: ShortStr) -> bool: + """Whether a project with ``project_id`` exists and is visible to the caller.""" + return await self._projects.get_by_id(project_id, fields=frozenset({"id"})) is not None + + async def insert(self, project_group: ProjectGroupIn) -> ProjectGroup: + """Insert a new group after verifying every referenced project exists and is visible""" + missing = [pid for pid in project_group.projects if not await self._project_exists(pid)] + if missing: + raise NotFoundError("One or more projects not found or not visible", ids=missing) + return await self._groups.insert_project_group(project_group) + async def _resolve_by_id(self, group_id: str) -> ProjectGroupOut: """Resolve a visible group by its ObjectId, or raise ``NotFoundError``.""" oid = self._groups._convert_object_id(group_id) @@ -50,7 +61,7 @@ async def _add(self, group: ProjectGroupOut, project_ids: list[ShortStr]) -> Bul failed: list[BulkFailure] = [] valid: list[ShortStr] = [] for index, pid in enumerate(project_ids): - if await self._projects.get_by_id(pid, fields=frozenset({"id"})) is None: + if not await self._project_exists(pid): failed.append( BulkFailure( index=index, diff --git a/mpcontribs-api/tests/integration/test_project_groups.py b/mpcontribs-api/tests/integration/test_project_groups.py index 35726048b7..e12ff146fd 100644 --- a/mpcontribs-api/tests/integration/test_project_groups.py +++ b/mpcontribs-api/tests/integration/test_project_groups.py @@ -3,7 +3,7 @@ import pytest -from mpcontribs_api.domains.project_groups.dependencies import get_project_group_repository +from mpcontribs_api.domains.project_groups.dependencies import get_project_group_service from tests.integration.conftest import AUTHED_HEADERS # A valid 24-char hex ObjectId string (ProjectGroupOut.id is a PydanticObjectId). @@ -11,11 +11,11 @@ @pytest.fixture -def group_repo(test_app): - repo = AsyncMock() - test_app.dependency_overrides[get_project_group_repository] = lambda: repo - yield repo - test_app.dependency_overrides.pop(get_project_group_repository, None) +def group_service(test_app): + service = AsyncMock() + test_app.dependency_overrides[get_project_group_service] = lambda: service + yield service + test_app.dependency_overrides.pop(get_project_group_service, None) # --------------------------------------------------------------------------- @@ -53,18 +53,18 @@ def _inserted(self, **overrides): attrs.update(overrides) return SimpleNamespace(**attrs) - def test_returns_201(self, client, group_repo): - group_repo.insert_project_group.return_value = self._inserted() + def test_returns_201(self, client, group_service): + group_service.insert.return_value = self._inserted() r = client.post("/api/v1/project_groups", json=self._body(), headers=AUTHED_HEADERS) assert r.status_code == 201 - def test_response_includes_generated_id(self, client, group_repo): - group_repo.insert_project_group.return_value = self._inserted() + def test_response_includes_generated_id(self, client, group_service): + group_service.insert.return_value = self._inserted() body = client.post("/api/v1/project_groups", json=self._body(), headers=AUTHED_HEADERS).json() assert body["id"] == SAMPLE_OID - def test_response_echoes_full_document(self, client, group_repo): - group_repo.insert_project_group.return_value = self._inserted(name="echo-group", is_public=True) + def test_response_echoes_full_document(self, client, group_service): + group_service.insert.return_value = self._inserted(name="echo-group", is_public=True) body = client.post( "/api/v1/project_groups", json=self._body(name="echo-group", is_public=True), diff --git a/mpcontribs-api/tests/unit/domains/test_project_group_service.py b/mpcontribs-api/tests/unit/domains/test_project_group_service.py index 8385b6c7a9..d1de793a28 100644 --- a/mpcontribs-api/tests/unit/domains/test_project_group_service.py +++ b/mpcontribs-api/tests/unit/domains/test_project_group_service.py @@ -4,7 +4,7 @@ from beanie import Link, PydanticObjectId from bson import DBRef -from mpcontribs_api.domains.project_groups.models import ProjectGroupOut +from mpcontribs_api.domains.project_groups.models import ProjectGroupIn, ProjectGroupOut from mpcontribs_api.domains.project_groups.service import ProjectGroupService from mpcontribs_api.domains.projects.models import Project from mpcontribs_api.exceptions import ConflictError, NotFoundError @@ -55,6 +55,38 @@ def _group(project_ids: list[str] | None = None) -> ProjectGroupOut: return group +# --------------------------------------------------------------------------- +# insert +# --------------------------------------------------------------------------- + + +class TestInsert: + def _payload(self, projects: list[str]) -> ProjectGroupIn: + return ProjectGroupIn(name="g", owner="google:a@b.com", description="d", projects=projects) + + async def test_all_projects_valid_inserts(self): + service, groups, _ = _make_service(None, visible_projects={"mp-1", "mp-2"}) + groups.insert_project_group.return_value = "stored" + payload = self._payload(["mp-1", "mp-2"]) + result = await service.insert(payload) + assert result == "stored" + groups.insert_project_group.assert_awaited_once_with(payload) + + async def test_missing_project_raises_not_found_and_skips_insert(self): + service, groups, _ = _make_service(None, visible_projects={"mp-1"}) + with pytest.raises(NotFoundError) as exc: + await service.insert(self._payload(["mp-1", "ghost"])) + assert exc.value.context["ids"] == ["ghost"] + groups.insert_project_group.assert_not_awaited() + + async def test_empty_projects_inserts_without_validation(self): + service, groups, projects = _make_service(None) + payload = self._payload([]) + await service.insert(payload) + projects.get_by_id.assert_not_awaited() + groups.insert_project_group.assert_awaited_once_with(payload) + + # --------------------------------------------------------------------------- # Group resolution # --------------------------------------------------------------------------- From ff4ba2c852ba8a5c81dac7dd227837d6285d6f21 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 16 Jul 2026 13:22:39 -0700 Subject: [PATCH 464/591] Added settings for controlling initiative permissions --- mpcontribs-api/src/mpcontribs_api/config.py | 23 +++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/mpcontribs-api/src/mpcontribs_api/config.py b/mpcontribs-api/src/mpcontribs_api/config.py index 3995eebb0e..17175a8d0c 100644 --- a/mpcontribs-api/src/mpcontribs_api/config.py +++ b/mpcontribs-api/src/mpcontribs_api/config.py @@ -157,6 +157,26 @@ def _clamp_concurrency(self): return self +class InitiativeSettings(BaseModel): + """Limits governing user-owned initiatives.""" + + max_unapproved_per_owner: int = Field( + default=3, + description="Maximum number of unapproved initiatives a single owner may have at once. Enforced on create.", + ) + max_projects_per_unapproved: int = Field( + default=2, + description="Maximum number of projects that may be assigned to an unapproved initiative. Enforced when a " + "project's initiative is set via PATCH.", + ) + + +class DomainSettings(BaseModel): + """Settings to configure the domain logic of MPContribs""" + + initiatives: InitiativeSettings = Field(default_factory=InitiativeSettings) + + class Settings(BaseSettings): model_config = SettingsConfigDict( env_file=".env", @@ -179,6 +199,9 @@ class Settings(BaseSettings): # MPContribs_otel__* otel: ObservabilitySettings = Field(default_factory=ObservabilitySettings) + # MPContribs_domain_* + domain: DomainSettings = Field(default_factory=DomainSettings) + # SMTP Settings mail_default_sender: str = Field( description="SMTP Server to send out notifications on new projects and other important moments" From 66a784e28eea00185199c66b5d9a574fa923b478 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 16 Jul 2026 13:23:30 -0700 Subject: [PATCH 465/591] Added flexibility to roles, allowing prefixing with resource --- mpcontribs-api/src/mpcontribs_api/authz.py | 34 +++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/mpcontribs-api/src/mpcontribs_api/authz.py b/mpcontribs-api/src/mpcontribs_api/authz.py index 2a56f7dc65..27fd78de63 100644 --- a/mpcontribs-api/src/mpcontribs_api/authz.py +++ b/mpcontribs-api/src/mpcontribs_api/authz.py @@ -33,6 +33,9 @@ ADMIN_GROUP = settings.mongo.admin_group +# prefix to user roles to disambiguate from project roles, which are bare ids +INITIATIVE_ROLE_PREFIX = "initiative:" + class User(BaseModel): """User definition derived from request headers. @@ -64,7 +67,29 @@ def is_anonymous(self) -> bool: def is_admin(self) -> bool: return (not self.is_anonymous) and (ADMIN_GROUP in self.groups) - def has_role(self, role: str) -> bool: + @property + def project_roles(self) -> list[str]: + return [ + role[len(INITIATIVE_ROLE_PREFIX) :] for role in self.groups if not role.startswith(INITIATIVE_ROLE_PREFIX) + ] + + @property + def initiative_roles(self) -> list[str]: + """The initiative slugs this user collaborates on, decoded from their ``initiative:`` roles.""" + return [role[len(INITIATIVE_ROLE_PREFIX) :] for role in self.groups if role.startswith(INITIATIVE_ROLE_PREFIX)] + + def has_role(self, role: str, *, resource: str | None = None) -> bool: + """Determine whether a user has a role assigned to them. + + Specifying resource as: + - ``INITIATIVE_ROLE_PREFIX`` looks for roles scoped to initiatives + - "project" looks for roles scoped to projects (no actual prefix implementation yet) + - None looks for roles by matching the entire string + """ + if resource == INITIATIVE_ROLE_PREFIX[:-1]: + return role in self.initiative_roles + if resource == "project": + return role in self.project_roles return role in self.groups @property @@ -75,6 +100,13 @@ def writable_projects(self) -> frozenset[str]: # exclude the admin sentinel so it never leaks into a $in / membership test return frozenset(g for g in self.groups if g != ADMIN_GROUP) + def can_manage(self, id: str, resource: str) -> bool: + """Determines whether a user can manage a resource. + + If the user is known and either an admin or has a valid role assigned, they can manage + """ + return (not self.is_anonymous) and (self.is_admin or self.has_role(role=id, resource=resource)) + def can_write(self, project: str) -> bool: """Single source of truth for write authorization.""" return self.is_admin or project in self.writable_projects From 1d1b71ac46ae901f800cc131d782e42ea0d11249 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 16 Jul 2026 13:25:23 -0700 Subject: [PATCH 466/591] Added Initiative domain, for a canonical grouping of projects (ie ALab) --- .../src/mpcontribs_api/api/v1/router.py | 2 + mpcontribs-api/src/mpcontribs_api/app.py | 2 + .../domains/initiatives/__init__.py | 0 .../domains/initiatives/dependencies.py | 13 ++ .../domains/initiatives/models.py | 151 ++++++++++++++ .../domains/initiatives/repository.py | 140 +++++++++++++ .../domains/initiatives/router.py | 79 ++++++++ .../db/test_initiatives_repository.py | 184 ++++++++++++++++++ .../db/test_initiatives_service.py | 177 +++++++++++++++++ .../tests/integration/test_initiatives.py | 135 +++++++++++++ 10 files changed, 883 insertions(+) create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/initiatives/__init__.py create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/initiatives/dependencies.py create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/initiatives/models.py create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/initiatives/repository.py create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/initiatives/router.py create mode 100644 mpcontribs-api/tests/integration/db/test_initiatives_repository.py create mode 100644 mpcontribs-api/tests/integration/db/test_initiatives_service.py create mode 100644 mpcontribs-api/tests/integration/test_initiatives.py diff --git a/mpcontribs-api/src/mpcontribs_api/api/v1/router.py b/mpcontribs-api/src/mpcontribs_api/api/v1/router.py index 530751946d..511632c048 100644 --- a/mpcontribs-api/src/mpcontribs_api/api/v1/router.py +++ b/mpcontribs-api/src/mpcontribs_api/api/v1/router.py @@ -2,6 +2,7 @@ from mpcontribs_api.domains.attachments.router import router as attachments_router from mpcontribs_api.domains.contributions.router import router as contributions_router +from mpcontribs_api.domains.initiatives.router import router as initiatives_router from mpcontribs_api.domains.limits.router import router as limits_router from mpcontribs_api.domains.project_groups.router import router as project_groups_router from mpcontribs_api.domains.projects.router import router as projects_router @@ -12,6 +13,7 @@ router.include_router(attachments_router, prefix="/attachments", tags=["attachments"]) router.include_router(contributions_router, prefix="/contributions", tags=["contributions"]) +router.include_router(initiatives_router, prefix="/initiatives", tags=["initiatives"]) router.include_router(limits_router, prefix="/limits", tags=["limits"]) router.include_router(project_groups_router, prefix="/project_groups", tags=["project_groups"]) router.include_router(projects_router, prefix="/projects", tags=["projects"]) diff --git a/mpcontribs-api/src/mpcontribs_api/app.py b/mpcontribs-api/src/mpcontribs_api/app.py index de13195b31..e48efa9d4b 100644 --- a/mpcontribs-api/src/mpcontribs_api/app.py +++ b/mpcontribs-api/src/mpcontribs_api/app.py @@ -21,6 +21,7 @@ from mpcontribs_api.domains.attachments.models import Attachment from mpcontribs_api.domains.contributions.models import Contribution from mpcontribs_api.domains.healthcheck.router import router as healthcheck_router +from mpcontribs_api.domains.initiatives.models import Initiative from mpcontribs_api.domains.project_groups.models import ProjectGroup from mpcontribs_api.domains.projects.models import Project from mpcontribs_api.domains.structures.models import Structure @@ -65,6 +66,7 @@ async def _setup_mongo(app: FastAPI, settings: Settings, stack: AsyncExitStack) document_models=[ Project, ProjectGroup, + Initiative, Contribution, Attachment, Structure, diff --git a/mpcontribs-api/src/mpcontribs_api/domains/initiatives/__init__.py b/mpcontribs-api/src/mpcontribs_api/domains/initiatives/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/mpcontribs-api/src/mpcontribs_api/domains/initiatives/dependencies.py b/mpcontribs-api/src/mpcontribs_api/domains/initiatives/dependencies.py new file mode 100644 index 0000000000..a81d8c8d5d --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/domains/initiatives/dependencies.py @@ -0,0 +1,13 @@ +from typing import Annotated + +from fastapi import Depends + +from mpcontribs_api.dependencies import UserDep +from mpcontribs_api.domains.initiatives.repository import InitiativeRepository + + +def get_initiative_repository(user: UserDep) -> InitiativeRepository: + return InitiativeRepository(user) + + +InitiativeDep = Annotated[InitiativeRepository, Depends(get_initiative_repository)] diff --git a/mpcontribs-api/src/mpcontribs_api/domains/initiatives/models.py b/mpcontribs-api/src/mpcontribs_api/domains/initiatives/models.py new file mode 100644 index 0000000000..49914166fc --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/domains/initiatives/models.py @@ -0,0 +1,151 @@ +from __future__ import annotations + +import re +from typing import Annotated, Self + +from beanie import PydanticObjectId +from bson.errors import InvalidId +from pydantic import BaseModel, BeforeValidator, ConfigDict, Field, field_validator, model_validator +from pymongo import ASCENDING, IndexModel + +from mpcontribs_api.domains._shared.filters import BaseFilter +from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut +from mpcontribs_api.domains._shared.types import NFKCStr, PrefixedEmail +from mpcontribs_api.exceptions import ValidationError +from mpcontribs_api.projection import SparseFieldsModel + +# A URL-safe, human-readable slug +# Also carried in user.groups like ``initiative:`` +_SLUG_RE = re.compile(r"^[a-z0-9]+(?:-[a-z0-9]+)*$") + + +def _validate_slug(v: str) -> str: + v = v.strip().lower() + if not _SLUG_RE.match(v): + raise ValidationError( + "slug must be lowercase alphanumeric words separated by single hyphens, e.g. 'battery-genome-2025'", + slug=v, + ) + return v + + +Slug = Annotated[str, Field(min_length=3, max_length=50), BeforeValidator(_validate_slug)] + + +class Initiative(BaseDocumentWithInput[PydanticObjectId]): + """A canonical, authoritative grouping of projects into a larger organizational effort. + + Unlike an ad-hoc ``ProjectGroup`` (many-to-many, user-curated), an initiative is the single + canonical parent of its member projects: a project points at *at most one* initiative via + ``Project.initiative``. Membership is therefore derived from the projects collection — an + initiative stores no project list of its own. + + Collaborator rights are drawn from the caller's roles, mirroring how projects use groups: a + user may manage an initiative (add projects, patch it) if they own it, are an admin, or carry + the ``initiative:`` role. + """ + + slug: Slug + name: NFKCStr = Field(max_length=100) + owner: PrefixedEmail + is_public: bool = False + is_approved: bool = False + + class Settings: + name = "initiatives" + keep_nulls = False + indexes = [ + IndexModel(keys=[("slug", ASCENDING)], name="slug", unique=True), + IndexModel( + keys=[("owner", ASCENDING), ("is_approved", ASCENDING), ("is_public", ASCENDING)], + name="owner_is_approved_is_public", + ), + ] + validate_on_save = True + + @classmethod + def identifier_fields(cls) -> frozenset[str]: + """An ``Initiative`` is uniquely identified by its globally-unique ``slug``.""" + return frozenset({"slug"}) + + @model_validator(mode="after") + def _public_requires_approved(self) -> Self: + """An initiative cannot be public until it has been approved.""" + if self.is_public and not self.is_approved: + raise ValidationError("an initiative cannot be public until it is approved", slug=self.slug) + return self + + +class InitiativeIn(BaseModel): + """User-supplied fields for creating an initiative. + + ``owner`` is forced to the caller and ``is_public`` / ``is_approved`` always start ``False`` + (an admin approves later), so none of them are part of the input contract. + """ + + model_config = ConfigDict(extra="forbid") + + slug: Slug + name: NFKCStr = Field(max_length=100) + + +class InitiativeOut(DocumentOut[PydanticObjectId]): + slug: Slug | None = None + name: NFKCStr | None = None + owner: PrefixedEmail | None = None + is_public: bool | None = None + is_approved: bool | None = None + + @staticmethod + def default_fields() -> list[str]: + return ["slug", "name", "owner", "is_public", "is_approved"] + + +class InitiativePatch(SparseFieldsModel): + """Partial update to an initiative. + + ``slug`` and ``owner`` are immutable and intentionally absent. ``is_approved`` is admin-only + (enforced in the repository), and the ``is_public`` ⇒ ``is_approved`` invariant is re-checked + there against the resulting state, since a partial ``$set`` bypasses the document validator. + """ + + name: NFKCStr | None = Field(default=None, max_length=100) + is_public: bool | None = None + is_approved: bool | None = None + + +class InitiativeFilter(BaseFilter): + id: PydanticObjectId | None = None + id__in: list[PydanticObjectId] | None = None + id__neq: PydanticObjectId | None = None + + slug: Slug | None = None + slug__in: list[Slug] | None = None + slug__neq: Slug | None = None + + name: NFKCStr | None = None + name__in: list[NFKCStr] | None = None + name__neq: NFKCStr | None = None + + owner: PrefixedEmail | None = None + owner__in: list[PrefixedEmail] | None = None + owner__neq: PrefixedEmail | None = None + + is_public: bool | None = None + is_approved: bool | None = None + + order_by: list[str] | None = None + + class Constants(BaseFilter.Constants): + model = Initiative + + @field_validator("id", mode="before") + @classmethod + def convert_str_to_oid(cls, v: str): + try: + return PydanticObjectId(v) + except InvalidId as err: + raise ValidationError( + "Invalid ObjectId format. Must be 12-byte input or a 24-character hex string", + oid=v, + ) from err diff --git a/mpcontribs-api/src/mpcontribs_api/domains/initiatives/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/initiatives/repository.py new file mode 100644 index 0000000000..bce9f706b1 --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/domains/initiatives/repository.py @@ -0,0 +1,140 @@ +from typing import Any + +from beanie import PydanticObjectId +from pymongo.errors import DuplicateKeyError + +from mpcontribs_api.authz import User +from mpcontribs_api.config import get_settings +from mpcontribs_api.domains._shared.models import DeleteResponse +from mpcontribs_api.domains._shared.repository import MongoDbRepository +from mpcontribs_api.domains.initiatives.models import ( + Initiative, + InitiativeFilter, + InitiativeIn, + InitiativeOut, + InitiativePatch, +) +from mpcontribs_api.exceptions import ConflictError, NotFoundError, PermissionError, ValidationError +from mpcontribs_api.pagination import CursorParams, Page + + +class InitiativeRepository( + MongoDbRepository[Initiative, InitiativeIn, InitiativeOut, InitiativeFilter, InitiativePatch] +): + document_model = Initiative + out_model = InitiativeOut + + def __init__(self, user: User) -> None: + super().__init__(user) + self._user = user + self._limits = get_settings().domain.initiatives + + @staticmethod + def _build_scope(user: User) -> dict[str, Any]: + """Scope reads to what the caller may see: public+approved, owned, or collaborated-on.""" + if user.is_admin: + return {} + ors: list[dict[str, Any]] = [{"is_public": True, "is_approved": True}] + if not user.is_anonymous: + ors.append({"owner": user.username}) + slugs = user.initiative_roles + if slugs: + ors.append({"slug": {"$in": sorted(slugs)}}) + return {"$or": ors} + + async def get_initiatives( + self, + pagination: CursorParams, + filter: InitiativeFilter, + fields: frozenset[str] | None, + ) -> Page[InitiativeOut]: + """Return a scoped, filtered, paginated page of initiatives. See ``get_many``.""" + return await self.get_many(pagination=pagination, filter=filter, fields=fields) + + async def get_initiative(self, slug: str, fields: frozenset[str] | None) -> InitiativeOut | None: + """Return the single scoped initiative identified by ``slug``. See ``get_one``.""" + return await self.get_one({"slug": slug}, fields) + + async def resolve_visible(self, slug: str) -> Initiative | None: + """Return the full scoped initiative document for ``slug`` (or None), for write-path checks.""" + return await self.document_model.find_one(self._scope, self.document_model.slug == slug) + + async def insert_initiative(self, data: InitiativeIn) -> Initiative: + """Create an initiative owned by the caller, enforcing the per-owner unapproved quota. + + ``owner`` is forced to the caller and the initiative starts unapproved and private. A + non-admin who already owns ``max_unapproved_per_owner`` unapproved initiatives is rejected + with 409. A duplicate ``slug`` (globally unique) is also a 409. + """ + if self._user.username is None: + raise PermissionError(required_role="authenticated") + + if not self._user.is_admin: + unapproved = await self.document_model.find( + self.document_model.owner == self._user.username, + self.document_model.is_approved == False, # noqa: E712 — Beanie needs the value, not `is` + ).count() + if unapproved >= self._limits.max_unapproved_per_owner: + raise ConflictError( + "owner already has the maximum number of unapproved initiatives", + limit=self._limits.max_unapproved_per_owner, + ) + + # ``BaseDocumentWithInput`` makes ``id`` required (no auto-default), so mint the ObjectId + # here — as ``ProjectGroup.from_input_model`` does — and force owner/flags server-side. + initiative = self.document_model.model_validate( + { + "_id": PydanticObjectId(), + "slug": data.slug, + "name": data.name, + "owner": self._user.username, + } + ) + try: + await initiative.insert() + except DuplicateKeyError as exc: # unique slug index + raise ConflictError("an initiative with this slug already exists", slug=data.slug) from exc + return initiative + + async def patch_initiative(self, slug: str, update: InitiativePatch) -> Initiative: + """Patch a scoped initiative by ``slug``, enforcing manage rights and approval rules. + + - The caller must be able to *manage* the initiative (owner/collaborator/admin); mere + visibility (e.g. a public initiative) is not enough. + - Only an admin may change ``is_approved``. + - The resulting state must satisfy ``is_public ⇒ is_approved`` (re-checked here because a + partial ``$set`` does not run the document validator). + """ + existing = await self.resolve_visible(slug) + if existing is None: + raise NotFoundError("Initiative not found", slug=slug) + if not ( + self._user.can_manage(id=existing.slug, resource="initiative") + or self._user.username == self.document_model.owner + ): + raise PermissionError(required_role="initiative-owner-collaborator-or-admin") + + data = update.model_dump(exclude_unset=True) + if "is_approved" in data and not self._user.is_admin: + raise PermissionError(required_role="admin") + + resulting_approved = data.get("is_approved", existing.is_approved) + resulting_public = data.get("is_public", existing.is_public) + if resulting_public and not resulting_approved: + raise ValidationError("an initiative cannot be public until it is approved", slug=slug) + + return await self.patch(existing.id, update) + + async def delete_initiative(self, slug: str) -> DeleteResponse: + """Delete a scoped initiative by ``slug``. Restricted to the owner or an admin. + + Collaborators may contribute projects but may not dissolve the effort. Deleting an + initiative does not touch member projects; their ``initiative`` link simply dangles until + re-pointed (reads resolve a missing link to null). + """ + existing = await self.resolve_visible(slug) + if existing is None: + raise NotFoundError("Initiative not found", slug=slug) + if not (self._user.is_admin or existing.owner == self._user.username): + raise PermissionError(required_role="owner-or-admin") + return await self.delete_by_id(existing.id) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/initiatives/router.py b/mpcontribs-api/src/mpcontribs_api/domains/initiatives/router.py new file mode 100644 index 0000000000..844818fd50 --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/domains/initiatives/router.py @@ -0,0 +1,79 @@ +from typing import Annotated + +from fastapi import APIRouter, Depends, Response, status +from fastapi_filter import FilterDepends + +from mpcontribs_api.dependencies import require_user +from mpcontribs_api.domains._shared.types import FieldSelector +from mpcontribs_api.domains.initiatives.dependencies import InitiativeDep +from mpcontribs_api.domains.initiatives.models import ( + InitiativeFilter, + InitiativeIn, + InitiativeOut, + InitiativePatch, +) +from mpcontribs_api.pagination import CursorParams + +router = APIRouter() + + +@router.get("") +async def get_initiatives( + repo: InitiativeDep, + pagination: Annotated[CursorParams, Depends()], + filter: InitiativeFilter = FilterDepends(InitiativeFilter), + fields: FieldSelector = InitiativeOut.default_fields(), +): + """Return paginated initiatives matching a filter, scoped to the caller.""" + selected = InitiativeOut.parse_fields(fields) + return await repo.get_initiatives(pagination=pagination, filter=filter, fields=selected) + + +@router.get("/{slug}") +async def get_initiative( + repo: InitiativeDep, + slug: str, + fields: FieldSelector = InitiativeOut.default_fields(), +): + """Return the single initiative identified by ``slug``, scoped to the caller.""" + selected = InitiativeOut.parse_fields(fields) + return await repo.get_initiative(slug=slug, fields=selected) + + +@router.post( + "", response_model=InitiativeOut, status_code=status.HTTP_201_CREATED, dependencies=[Depends(require_user)] +) +async def insert_initiative( + repo: InitiativeDep, + initiative: InitiativeIn, +): + """Create a new initiative owned by the caller. + + Starts unapproved and private. Rejected with 409 if the caller already owns the maximum number + of unapproved initiatives, or if the slug is already taken. + """ + return await repo.insert_initiative(data=initiative) + + +@router.patch("/{slug}", response_model=InitiativeOut, dependencies=[Depends(require_user)]) +async def patch_initiative( + repo: InitiativeDep, + slug: str, + update: InitiativePatch, +): + """Partially update the initiative identified by ``slug``. + + Requires manage rights (owner/collaborator/admin). ``is_approved`` is admin-only, and an + initiative cannot be made public until it is approved. + """ + return await repo.patch_initiative(slug=slug, update=update) + + +@router.delete("/{slug}", status_code=status.HTTP_204_NO_CONTENT, dependencies=[Depends(require_user)]) +async def delete_initiative( + repo: InitiativeDep, + slug: str, +): + """Delete the initiative identified by ``slug``. Restricted to its owner or an admin.""" + await repo.delete_initiative(slug=slug) + return Response(status_code=status.HTTP_204_NO_CONTENT) diff --git a/mpcontribs-api/tests/integration/db/test_initiatives_repository.py b/mpcontribs-api/tests/integration/db/test_initiatives_repository.py new file mode 100644 index 0000000000..f36f2a995a --- /dev/null +++ b/mpcontribs-api/tests/integration/db/test_initiatives_repository.py @@ -0,0 +1,184 @@ +import pytest + +from mpcontribs_api.authz import User +from mpcontribs_api.config import get_settings +from mpcontribs_api.domains.initiatives.models import Initiative, InitiativeIn, InitiativePatch +from mpcontribs_api.domains.initiatives.repository import InitiativeRepository +from mpcontribs_api.exceptions import ConflictError, NotFoundError, PermissionError, ValidationError + +# Share the session event loop (see the projects repo test for why). +pytestmark = [pytest.mark.db, pytest.mark.asyncio(loop_scope="session")] + + +# --------------------------------------------------------------------------- +# Helpers +# --------------------------------------------------------------------------- + +ADMIN = User(username="google:admin@example.com", groups=frozenset({"admin"})) +ALICE = User(username="google:alice@example.com", groups=frozenset({"mp-team"})) +BOB = User(username="google:bob@example.com", groups=frozenset({"mp-team"})) +ANON = User() + +ALICE_EMAIL = "google:alice@example.com" +BOB_EMAIL = "google:bob@example.com" + + +def _repo(user: User) -> InitiativeRepository: + return InitiativeRepository(user) + + +def _collaborator(slug: str, username: str = BOB_EMAIL) -> User: + """A user whose role grants them collaborator rights on ``slug``.""" + return User(username=username, groups=frozenset({f"initiative:{slug}"})) + + +async def _insert(slug: str, owner_user: User = ALICE, name: str = "An Initiative") -> Initiative: + return await _repo(owner_user).insert_initiative(InitiativeIn(slug=slug, name=name)) + + +async def _approve(slug: str) -> Initiative: + return await _repo(ADMIN).patch_initiative(slug, InitiativePatch(is_approved=True)) + + +# --------------------------------------------------------------------------- +# Create + owner forcing +# --------------------------------------------------------------------------- + + +class TestInsert: + async def test_forces_owner_and_starts_private_unapproved(self, db): + created = await _insert("battery-genome", ALICE) + assert created.owner == ALICE_EMAIL + assert created.is_public is False + assert created.is_approved is False + + async def test_duplicate_slug_is_conflict(self, db): + await _insert("dup-slug", ALICE) + with pytest.raises(ConflictError): + await _insert("dup-slug", BOB) # globally unique, even across owners + + async def test_anonymous_cannot_create(self, db): + with pytest.raises(PermissionError): + await _repo(ANON).insert_initiative(InitiativeIn(slug="anon-init", name="x")) + + async def test_invalid_slug_rejected(self, db): + with pytest.raises(ValidationError): + InitiativeIn(slug="Not A Slug!", name="x") + + +class TestUnapprovedPerOwnerLimit: + async def test_owner_capped_at_configured_unapproved(self, db): + limit = get_settings().initiatives.max_unapproved_per_owner + for i in range(limit): + await _insert(f"cap-{i}", ALICE) + with pytest.raises(ConflictError): + await _insert("cap-over", ALICE) + + async def test_approved_do_not_count_against_quota(self, db): + limit = get_settings().initiatives.max_unapproved_per_owner + for i in range(limit): + await _insert(f"quota-{i}", ALICE) + await _approve("quota-0") # frees a slot + # A fresh unapproved initiative now fits again. + assert await _insert("quota-extra", ALICE) is not None + + async def test_admin_is_exempt(self, db): + limit = get_settings().initiatives.max_unapproved_per_owner + for i in range(limit + 2): + await _repo(ADMIN).insert_initiative(InitiativeIn(slug=f"admin-{i}", name="x")) + + +# --------------------------------------------------------------------------- +# Approval + public invariant +# --------------------------------------------------------------------------- + + +class TestApprovalAndPublic: + async def test_only_admin_may_approve(self, db): + await _insert("approve-me", ALICE) + with pytest.raises(PermissionError): + await _repo(ALICE).patch_initiative("approve-me", InitiativePatch(is_approved=True)) + approved = await _approve("approve-me") + assert approved.is_approved is True + + async def test_cannot_make_public_while_unapproved(self, db): + await _insert("public-fail", ALICE) + with pytest.raises(ValidationError): + await _repo(ALICE).patch_initiative("public-fail", InitiativePatch(is_public=True)) + + async def test_public_allowed_once_approved(self, db): + await _insert("public-ok", ALICE) + await _approve("public-ok") + patched = await _repo(ALICE).patch_initiative("public-ok", InitiativePatch(is_public=True)) + assert patched.is_public is True + + async def test_admin_can_approve_and_publish_together(self, db): + await _insert("publish-both", ALICE) + patched = await _repo(ADMIN).patch_initiative( + "publish-both", InitiativePatch(is_approved=True, is_public=True) + ) + assert patched.is_approved is True and patched.is_public is True + + +# --------------------------------------------------------------------------- +# Manage rights (patch) + read scope +# --------------------------------------------------------------------------- + + +class TestManageAndScope: + async def test_owner_can_rename(self, db): + await _insert("rename-me", ALICE) + patched = await _repo(ALICE).patch_initiative("rename-me", InitiativePatch(name="Renamed")) + assert patched.name == "Renamed" + + async def test_collaborator_can_patch(self, db): + await _insert("collab-patch", ALICE) + patched = await _repo(_collaborator("collab-patch")).patch_initiative( + "collab-patch", InitiativePatch(name="By Collaborator") + ) + assert patched.name == "By Collaborator" + + async def test_visible_but_unmanaged_cannot_patch(self, db): + # An approved+public initiative is visible to everyone, but a stranger still cannot manage it. + await _insert("visible-public", ALICE) + await _approve("visible-public") + await _repo(ALICE).patch_initiative("visible-public", InitiativePatch(is_public=True)) + stranger = User(username="google:carol@example.com", groups=frozenset()) + with pytest.raises(PermissionError): + await _repo(stranger).patch_initiative("visible-public", InitiativePatch(name="hijack")) + + async def test_private_unapproved_scope(self, db): + await _insert("scoped-priv", ALICE) + assert await _repo(ALICE).get_initiative("scoped-priv", fields=None) is not None # owner + assert await _repo(ADMIN).get_initiative("scoped-priv", fields=None) is not None # admin + assert await _repo(_collaborator("scoped-priv")).get_initiative("scoped-priv", fields=None) is not None + assert await _repo(ANON).get_initiative("scoped-priv", fields=None) is None # anon + assert await _repo(BOB).get_initiative("scoped-priv", fields=None) is None # unrelated user + + async def test_public_approved_visible_to_anon(self, db): + await _insert("scoped-pub", ALICE) + await _approve("scoped-pub") + await _repo(ALICE).patch_initiative("scoped-pub", InitiativePatch(is_public=True)) + assert await _repo(ANON).get_initiative("scoped-pub", fields=None) is not None + + +# --------------------------------------------------------------------------- +# Delete (owner or admin only) +# --------------------------------------------------------------------------- + + +class TestDelete: + async def test_owner_can_delete(self, db): + await _insert("del-owner", ALICE) + result = await _repo(ALICE).delete_initiative("del-owner") + assert result.num_deleted == 1 + assert await _repo(ADMIN).get_initiative("del-owner", fields=None) is None + + async def test_collaborator_cannot_delete(self, db): + await _insert("del-collab", ALICE) + with pytest.raises(PermissionError): + await _repo(_collaborator("del-collab")).delete_initiative("del-collab") + + async def test_missing_is_not_found(self, db): + with pytest.raises(NotFoundError): + await _repo(ADMIN).delete_initiative("nope-missing") diff --git a/mpcontribs-api/tests/integration/db/test_initiatives_service.py b/mpcontribs-api/tests/integration/db/test_initiatives_service.py new file mode 100644 index 0000000000..c10fbaf6e8 --- /dev/null +++ b/mpcontribs-api/tests/integration/db/test_initiatives_service.py @@ -0,0 +1,177 @@ +import pytest +from beanie import Link + +from mpcontribs_api.authz import User +from mpcontribs_api.config import get_settings +from mpcontribs_api.domains.initiatives.models import InitiativeIn, InitiativePatch +from mpcontribs_api.domains.initiatives.repository import InitiativeRepository +from mpcontribs_api.domains.projects.models import Project, ProjectIn, ProjectPatch, Stats +from mpcontribs_api.domains.projects.repository import MongoDbProjectRepository +from mpcontribs_api.domains.projects.service import ProjectInitiativeService +from mpcontribs_api.exceptions import ConflictError, NotFoundError, PermissionError + +pytestmark = [pytest.mark.db, pytest.mark.asyncio(loop_scope="session")] + + +# --------------------------------------------------------------------------- +# Helpers +# --------------------------------------------------------------------------- + +ADMIN = User(username="google:admin@example.com", groups=frozenset({"admin"})) +ALICE = User(username="google:alice@example.com", groups=frozenset({"mp-team"})) +CAROL = User(username="google:carol@example.com", groups=frozenset()) + +ALICE_EMAIL = "google:alice@example.com" +BOB_EMAIL = "google:bob@example.com" +CAROL_EMAIL = "google:carol@example.com" +STATS = Stats(columns=0, contributions=0, tables=0, structures=0, attachments=0, size=0.0) + + +def _service(user: User) -> ProjectInitiativeService: + return ProjectInitiativeService( + projects=MongoDbProjectRepository(user), + initiatives=InitiativeRepository(user), + ) + + +def _collaborator(slug: str, username: str = BOB_EMAIL) -> User: + return User(username=username, groups=frozenset({f"initiative:{slug}"})) + + +async def _insert_project(pid: str, owner: str = ALICE_EMAIL) -> Project: + return await MongoDbProjectRepository(ADMIN).insert_project( + ProjectIn( + _id=pid, + title=pid[:30], + authors="Author", + description="desc", + owner=owner, + unique_identifiers=True, + stats=STATS, + ) + ) + + +async def _insert_initiative(slug: str, owner_user: User = ALICE): + return await InitiativeRepository(owner_user).insert_initiative(InitiativeIn(slug=slug, name="Init")) + + +def _assigned_id(project: Project): + """The initiative _id a returned project points at, or None.""" + link = project.initiative + if link is None: + return None + return link.ref.id if isinstance(link, Link) else link.id + + +# --------------------------------------------------------------------------- +# Happy-path assignment +# --------------------------------------------------------------------------- + + +class TestAssign: + async def test_owner_of_both_can_assign(self, db): + await _insert_project("proj-a", owner=ALICE_EMAIL) + init = await _insert_initiative("init-a", ALICE) + updated = await _service(ALICE).patch("proj-a", ProjectPatch(initiative="init-a")) + assert _assigned_id(updated) == init.id + + async def test_collaborator_can_assign_own_project(self, db): + await _insert_project("proj-b", owner=BOB_EMAIL) + init = await _insert_initiative("init-collab", ALICE) + bob = _collaborator("init-collab") + updated = await _service(bob).patch("proj-b", ProjectPatch(initiative="init-collab")) + assert _assigned_id(updated) == init.id + + async def test_plain_patch_passes_through_untouched(self, db): + await _insert_project("proj-plain", owner=ALICE_EMAIL) + init = await _insert_initiative("init-plain", ALICE) + await _service(ALICE).patch("proj-plain", ProjectPatch(initiative="init-plain")) + # A patch that does not mention `initiative` must not disturb the existing assignment. + updated = await _service(ALICE).patch("proj-plain", ProjectPatch(title="new-title")) + assert updated.title == "new-title" + assert _assigned_id(updated) == init.id + + async def test_unassign_clears_link(self, db): + await _insert_project("proj-un", owner=ALICE_EMAIL) + await _insert_initiative("init-un", ALICE) + await _service(ALICE).patch("proj-un", ProjectPatch(initiative="init-un")) + updated = await _service(ALICE).patch("proj-un", ProjectPatch(initiative=None)) + assert _assigned_id(updated) is None + + +# --------------------------------------------------------------------------- +# Both-rights enforcement +# --------------------------------------------------------------------------- + + +class TestBothRights: + async def test_visible_but_unmanaged_initiative_rejected(self, db): + # Carol owns her project (project-write ok) and can *see* this public+approved initiative, + # but she neither owns nor collaborates on it, so she still cannot assign to it. + await _insert_project("proj-c", owner=CAROL_EMAIL) + await _insert_initiative("init-c", ALICE) + await InitiativeRepository(ADMIN).patch_initiative( + "init-c", InitiativePatch(is_approved=True, is_public=True) + ) + with pytest.raises(PermissionError): + await _service(CAROL).patch("proj-c", ProjectPatch(initiative="init-c")) + + async def test_invisible_initiative_is_not_found(self, db): + # Alice's private initiative is invisible to Carol, so it reads as not-found (not a 403). + await _insert_project("proj-c2", owner=CAROL_EMAIL) + await _insert_initiative("init-priv", ALICE) + with pytest.raises(NotFoundError): + await _service(CAROL).patch("proj-c2", ProjectPatch(initiative="init-priv")) + + async def test_manager_without_project_write_rejected(self, db): + # Alice manages the initiative but cannot see/write Bob's private project. + await _insert_project("proj-bob", owner=BOB_EMAIL) + await _insert_initiative("init-d", ALICE) + with pytest.raises(NotFoundError): + await _service(ALICE).patch("proj-bob", ProjectPatch(initiative="init-d")) + + async def test_assign_to_missing_initiative_is_not_found(self, db): + await _insert_project("proj-ghost", owner=ALICE_EMAIL) + with pytest.raises(NotFoundError): + await _service(ALICE).patch("proj-ghost", ProjectPatch(initiative="ghost-init")) + + +# --------------------------------------------------------------------------- +# Member cap on unapproved initiatives +# --------------------------------------------------------------------------- + + +class TestMemberCap: + async def test_unapproved_capped_at_configured_members(self, db): + cap = get_settings().initiatives.max_projects_per_unapproved + await _insert_initiative("init-cap", ALICE) + for i in range(cap): + await _insert_project(f"cap-proj-{i}", owner=ALICE_EMAIL) + await _service(ALICE).patch(f"cap-proj-{i}", ProjectPatch(initiative="init-cap")) + await _insert_project("cap-proj-over", owner=ALICE_EMAIL) + with pytest.raises(ConflictError): + await _service(ALICE).patch("cap-proj-over", ProjectPatch(initiative="init-cap")) + + async def test_reassigning_existing_member_is_idempotent(self, db): + cap = get_settings().initiatives.max_projects_per_unapproved + await _insert_initiative("init-idem", ALICE) + for i in range(cap): + await _insert_project(f"idem-proj-{i}", owner=ALICE_EMAIL) + await _service(ALICE).patch(f"idem-proj-{i}", ProjectPatch(initiative="init-idem")) + # At the cap, re-assigning a project that is already a member must not trip the limit. + again = await _service(ALICE).patch("idem-proj-0", ProjectPatch(initiative="init-idem")) + assert again.initiative is not None + + async def test_approved_initiative_has_no_member_cap(self, db): + cap = get_settings().initiatives.max_projects_per_unapproved + await _insert_initiative("init-approved", ALICE) + await InitiativeRepository(ADMIN).patch_initiative("init-approved", InitiativePatch(is_approved=True)) + for i in range(cap + 2): # comfortably past the unapproved cap + await _insert_project(f"appr-proj-{i}", owner=ALICE_EMAIL) + await _service(ALICE).patch(f"appr-proj-{i}", ProjectPatch(initiative="init-approved")) + count = await MongoDbProjectRepository(ADMIN).count_initiative_members( + initiative_id=(await InitiativeRepository(ADMIN).resolve_visible("init-approved")).id, # type: ignore[union-attr] + exclude_project_id=None, + ) + assert count == cap + 2 diff --git a/mpcontribs-api/tests/integration/test_initiatives.py b/mpcontribs-api/tests/integration/test_initiatives.py new file mode 100644 index 0000000000..c0eba7a471 --- /dev/null +++ b/mpcontribs-api/tests/integration/test_initiatives.py @@ -0,0 +1,135 @@ +from types import SimpleNamespace +from unittest.mock import AsyncMock + +import pytest + +from mpcontribs_api.domains.initiatives.dependencies import get_initiative_repository +from mpcontribs_api.exceptions import NotFoundError +from mpcontribs_api.pagination import Page +from tests.integration.conftest import AUTHED_HEADERS, FORCE_ANON_HEADERS + +SAMPLE_OID = "6eb7cf5a86d9755df3a6c593" + + +@pytest.fixture +def initiative_repo(test_app): + repo = AsyncMock() + test_app.dependency_overrides[get_initiative_repository] = lambda: repo + yield repo + test_app.dependency_overrides.pop(get_initiative_repository, None) + + +def _stored(**overrides): + """Stand-in for the stored document: exposes ``.id`` like a Beanie Document.""" + attrs = { + "id": SAMPLE_OID, + "slug": "battery-genome", + "name": "Battery Genome", + "owner": "google:alice@example.com", + "is_public": False, + "is_approved": False, + } + attrs.update(overrides) + return SimpleNamespace(**attrs) + + +# --------------------------------------------------------------------------- +# POST /api/v1/initiatives +# --------------------------------------------------------------------------- + + +class TestInsert: + def test_returns_201_and_echoes_id(self, client, initiative_repo): + initiative_repo.insert_initiative.return_value = _stored() + r = client.post( + "/api/v1/initiatives", + json={"slug": "battery-genome", "name": "Battery Genome"}, + headers=AUTHED_HEADERS, + ) + assert r.status_code == 201 + assert r.json()["id"] == SAMPLE_OID + + def test_anonymous_rejected_401(self, client, initiative_repo): + r = client.post( + "/api/v1/initiatives", + json={"slug": "battery-genome", "name": "Battery Genome"}, + headers=FORCE_ANON_HEADERS, + ) + assert r.status_code == 401 + + def test_invalid_slug_returns_422(self, client, initiative_repo): + r = client.post( + "/api/v1/initiatives", + json={"slug": "Not A Slug!", "name": "x"}, + headers=AUTHED_HEADERS, + ) + assert r.status_code == 422 + + +# --------------------------------------------------------------------------- +# GET /api/v1/initiatives (+ /{slug}) +# --------------------------------------------------------------------------- + + +class TestGet: + def test_list_returns_200(self, client, initiative_repo): + initiative_repo.get_initiatives.return_value = Page(items=[], next_cursor=None) + r = client.get("/api/v1/initiatives", headers=AUTHED_HEADERS) + assert r.status_code == 200 + + def test_get_by_slug_returns_200(self, client, initiative_repo): + initiative_repo.get_initiative.return_value = _stored() + r = client.get("/api/v1/initiatives/battery-genome", headers=AUTHED_HEADERS) + assert r.status_code == 200 + assert r.json()["slug"] == "battery-genome" + + +# --------------------------------------------------------------------------- +# PATCH /api/v1/initiatives/{slug} +# --------------------------------------------------------------------------- + + +class TestPatch: + def test_patch_returns_200(self, client, initiative_repo): + initiative_repo.patch_initiative.return_value = _stored(name="Renamed") + r = client.patch( + "/api/v1/initiatives/battery-genome", + json={"name": "Renamed"}, + headers=AUTHED_HEADERS, + ) + assert r.status_code == 200 + assert r.json()["name"] == "Renamed" + + def test_anonymous_rejected_401(self, client, initiative_repo): + r = client.patch( + "/api/v1/initiatives/battery-genome", + json={"name": "Renamed"}, + headers=FORCE_ANON_HEADERS, + ) + assert r.status_code == 401 + + def test_not_found_propagates_404(self, client, initiative_repo): + initiative_repo.patch_initiative.side_effect = NotFoundError("nope") + r = client.patch( + "/api/v1/initiatives/missing", + json={"name": "Renamed"}, + headers=AUTHED_HEADERS, + ) + assert r.status_code == 404 + + +# --------------------------------------------------------------------------- +# DELETE /api/v1/initiatives/{slug} +# --------------------------------------------------------------------------- + + +class TestDelete: + def test_delete_returns_204(self, client, initiative_repo): + initiative_repo.delete_initiative.return_value = None + r = client.delete("/api/v1/initiatives/battery-genome", headers=AUTHED_HEADERS) + assert r.status_code == 204 + assert r.content == b"" + + def test_anonymous_rejected_401(self, client, initiative_repo): + r = client.delete("/api/v1/initiatives/battery-genome", headers=FORCE_ANON_HEADERS) + assert r.status_code == 401 From 2d1c361c4546686753dc3535dd0e8a3ee0815149 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 16 Jul 2026 13:26:08 -0700 Subject: [PATCH 467/591] Added initiative as a field on models and implemented logic for managing project-initiative interactions --- .../domains/projects/dependencies.py | 12 +++ .../mpcontribs_api/domains/projects/models.py | 8 ++ .../domains/projects/repository.py | 45 ++++++++++- .../mpcontribs_api/domains/projects/router.py | 13 +++- .../domains/projects/service.py | 76 +++++++++++++++++++ .../tests/integration/db/conftest.py | 10 ++- .../db/test_project_groups_repository.py | 13 +++- .../db/test_project_groups_service.py | 12 ++- .../tests/integration/test_projects.py | 33 +++++--- 9 files changed, 201 insertions(+), 21 deletions(-) create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/projects/service.py diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/dependencies.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/dependencies.py index 94535cc67d..e1d791ea21 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/dependencies.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/dependencies.py @@ -3,9 +3,11 @@ from fastapi import Depends from mpcontribs_api.dependencies import UserDep +from mpcontribs_api.domains.initiatives.repository import InitiativeRepository from mpcontribs_api.domains.projects.repository import ( MongoDbProjectRepository, ) +from mpcontribs_api.domains.projects.service import ProjectService def get_scoped_projects(user: UserDep) -> MongoDbProjectRepository: @@ -13,3 +15,13 @@ def get_scoped_projects(user: UserDep) -> MongoDbProjectRepository: ProjectDep = Annotated[MongoDbProjectRepository, Depends(get_scoped_projects)] + + +def get_project_service(user: UserDep) -> ProjectService: + return ProjectService( + projects=MongoDbProjectRepository(user), + initiatives=InitiativeRepository(user), + ) + + +ProjectServiceDep = Annotated[ProjectService, Depends(get_project_service)] diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py index 589ee198c3..d8b307b026 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py @@ -2,12 +2,14 @@ from typing import Any, Literal +from beanie import Link from pydantic import BaseModel, ConfigDict, Field, HttpUrl from mpcontribs_api import pagination from mpcontribs_api.domains._shared.filters import BaseFilter from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut from mpcontribs_api.domains._shared.types import PrefixedEmail, ShortStr +from mpcontribs_api.domains.initiatives.models import Initiative class Column(BaseModel): @@ -60,6 +62,8 @@ class Project(BaseDocumentWithInput[ShortStr]): is_approved: bool = False license: Literal["CCA4", "CCPD"] | None = None + initiative: Link[Initiative] | None = None + # Empty method for now. Keeping for business logic later @classmethod def from_input_model(cls, data: ProjectIn) -> Project: @@ -96,6 +100,7 @@ class ProjectOut(DocumentOut[ShortStr]): stats: Stats | None = None columns: list[Column] | None = None license: Literal["CCA4", "CCPD"] | None = None + initiative: Link[Initiative] | None = None @staticmethod def default_fields() -> list[str]: @@ -163,3 +168,6 @@ class ProjectPatch(BaseModel): is_public: bool | None = None is_approved: bool | None = None license: Literal["CCA4", "CCPD"] | None = None + + # str here, but ProjectService coerces to a Link + initiative: str | None = None diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py index 000be07dca..00e8373824 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py @@ -1,5 +1,9 @@ from typing import Any +from beanie import PydanticObjectId, UpdateResponse +from beanie.operators import Set +from bson import DBRef + from mpcontribs_api.authz import User from mpcontribs_api.domains._shared.repository import MongoDbRepository from mpcontribs_api.domains.projects.models import ( @@ -9,7 +13,7 @@ ProjectOut, ProjectPatch, ) -from mpcontribs_api.exceptions import PermissionError +from mpcontribs_api.exceptions import NotFoundError, PermissionError from mpcontribs_api.pagination import CursorParams @@ -133,3 +137,42 @@ async def upsert_project_by_id(self, id: str, data: ProjectIn) -> Project: # New project: the caller owns it, regardless of the submitted owner. project.owner = self._user.username return await project.save() + + async def set_initiative(self, id: str, ref: DBRef | None) -> Project: + """Set a scoped project's canonical initiative link. + + The link is written as-is (a ``DBRef`` into ``initiatives`` or ``None``); all authorization + and limit checks are the caller's (see ``ProjectInitiativeService``). Scoping ensures a + project the caller cannot see is reported as not found rather than silently missed. + + Args: + id (str): the id of the project to update + ref (DBRef | None): the initiative reference to assign, or None to unassign + """ + query = self.document_model.find_one(self._scope, self.document_model.id == id).update( + Set({"initiative": ref}), + response_type=UpdateResponse.NEW_DOCUMENT, + ) + updated = await query # pyright: ignore[reportGeneralTypeIssues] # beanie UpdateQuery is awaitable + if updated is None: + raise NotFoundError(self._not_found(id)) + return updated + + async def count_initiative_members(self, initiative_id: PydanticObjectId, exclude_project_id: str | None) -> int: + """Count projects assigned to an initiative, ignoring user scope. + + The unapproved-initiative member limit is an integrity constraint on the initiative's true + size, so it must count every member regardless of who can see them — a scoped count could + let a collaborator overshoot the cap with projects they cannot see. ``exclude_project_id`` + drops the project being (re)assigned so re-assigning an existing member is idempotent and + never trips the limit. + + Args: + initiative_id (PydanticObjectId): the initiative whose members to count + exclude_project_id (str | None): a project id to exclude from the count, if any + """ + collection = self.document_model.get_pymongo_collection() + query: dict[str, Any] = {"initiative.$id": initiative_id} + if exclude_project_id is not None: + query["_id"] = {"$ne": exclude_project_id} + return await collection.count_documents(query) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py index 33dce7ebd7..56d453a948 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py @@ -6,7 +6,7 @@ from mpcontribs_api.dependencies import require_user from mpcontribs_api.domains._shared.types import FieldSelector -from mpcontribs_api.domains.projects.dependencies import ProjectDep +from mpcontribs_api.domains.projects.dependencies import ProjectDep, ProjectServiceDep from mpcontribs_api.domains.projects.models import ( ProjectFilter, ProjectIn, @@ -83,7 +83,7 @@ async def upsert_project_by_id( @router.patch("/{id}", response_model=ProjectOut, dependencies=[Depends(require_user)]) async def patch_project_by_id( - repo: ProjectDep, + service: ProjectServiceDep, id: str, update: ProjectPatch, ): @@ -91,8 +91,13 @@ async def patch_project_by_id( Note: overwrites fields with given values - arrays are not appended to. + The ``initiative`` field carries an initiative ``slug`` (or ``null`` to unassign). Setting it + is gated by the assignment service: the caller must be able to manage the target initiative + (owner/collaborator/admin) and an unapproved initiative may not exceed its member cap. Plain + field patches take the fast path straight to the repository. + Args: - repo (ProjectDep): the project repo we depend on + service (ProjectServiceDep): the project assignment service we depend on id (str): the id of the project to update update (ProjectPatch): the partial update to apply - unset fields are dropped - Note: If fields are intentionally set to None, None is applied to the field. @@ -100,7 +105,7 @@ async def patch_project_by_id( Returns: ProjectOut: the full Project with updates applied """ - return await repo.patch_project_by_id(id=id, update=update) + return await service.patch(id=id, update=update) @router.delete("/{id}", status_code=status.HTTP_204_NO_CONTENT, dependencies=[Depends(require_user)]) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/service.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/service.py new file mode 100644 index 0000000000..f95fbacb49 --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/service.py @@ -0,0 +1,76 @@ +from bson import DBRef + +from mpcontribs_api.config import get_settings +from mpcontribs_api.domains.initiatives.repository import InitiativeRepository +from mpcontribs_api.domains.projects.models import Project, ProjectPatch +from mpcontribs_api.domains.projects.repository import MongoDbProjectRepository +from mpcontribs_api.exceptions import ConflictError, NotFoundError, PermissionError + + +class ProjectService: + """Coordinates assigning a project to its canonical initiative across the two collections.""" + + def __init__( + self, + projects: MongoDbProjectRepository, + initiatives: InitiativeRepository, + ) -> None: + self._projects = projects + self._initiatives = initiatives + self._limits = get_settings().domain.initiatives + + async def patch(self, id: str, update: ProjectPatch) -> Project: + """Apply a project patch, routing an ``initiative`` change through the assignment checks. + + ``initiative`` carries the target initiative's ``slug`` (or ``null`` to unassign). It is + split out of the patch so it never reaches the raw ``$set`` as a bare string; any remaining + fields are applied first, then the initiative link is set. + """ + if "initiative" not in update.model_fields_set: + return await self._projects.patch_project_by_id(id=id, update=update) + + data = update.model_dump(exclude_unset=True) + slug = data.pop("initiative", None) + + # Resolve the target link (and run the both-rights + limit checks) before touching anything. + ref = await self._resolve_initiative_assignment(project_id=id, slug=slug) + + # Apply any co-submitted plain fields first, so a single request can rename and assign. + if data: + await self._projects.patch_project_by_id(id=id, update=ProjectPatch(**data)) + return await self._projects.set_initiative(id=id, ref=ref) + + async def _resolve_initiative_assignment(self, project_id: str, slug: str | None) -> DBRef | None: + """Validate an initiative assignment and return the link to store (or None to unassign). + + Unassigning needs only project-write access (already enforced downstream). Assigning + additionally requires that the caller can manage the target initiative and that an + unapproved target has room under its member cap. + """ + if slug is None: + return None + + initiative = await self._initiatives.resolve_visible(slug) + if initiative is None: + raise NotFoundError("Initiative not found or not visible", slug=slug) + + if not self._initiatives._user.can_manage(id=initiative.slug, resource="initiative"): + raise PermissionError( + message="user does not have adequate acceess to this resource", + required_role="initiative-owner-collaborator-or-admin", + resource_id=initiative.slug, + ) + + if not initiative.is_approved: + members = await self._projects.count_initiative_members( + initiative_id=initiative.id, + exclude_project_id=project_id, + ) + if members >= self._limits.max_projects_per_unapproved: + raise ConflictError( + message="unapproved initiative already has the maximum number of assigned projects", + slug=slug, + limit=self._limits.max_projects_per_unapproved, + ) + + return DBRef("initiatives", initiative.id) diff --git a/mpcontribs-api/tests/integration/db/conftest.py b/mpcontribs-api/tests/integration/db/conftest.py index f4f8caa08f..841b0fc3d4 100644 --- a/mpcontribs-api/tests/integration/db/conftest.py +++ b/mpcontribs-api/tests/integration/db/conftest.py @@ -6,6 +6,7 @@ from mpcontribs_api.config import get_settings from mpcontribs_api.domains.attachments.models import Attachment from mpcontribs_api.domains.contributions.models import Contribution +from mpcontribs_api.domains.initiatives.models import Initiative from mpcontribs_api.domains.project_groups.models import ProjectGroup from mpcontribs_api.domains.projects.models import Project from mpcontribs_api.domains.structures.models import Structure @@ -67,7 +68,7 @@ async def db(mongo_client): database = mongo_client[settings.mongo.db_name] await init_beanie( database=database, - document_models=[Project, ProjectGroup, Contribution, Structure, Table, Attachment], + document_models=[Project, ProjectGroup, Initiative, Contribution, Structure, Table, Attachment], ) yield database @@ -105,3 +106,10 @@ async def clean_project_groups(db): await db["project_groups"].delete_many({}) yield await db["project_groups"].delete_many({}) + + +@pytest_asyncio.fixture(autouse=True) +async def clean_initiatives(db): + await db["initiatives"].delete_many({}) + yield + await db["initiatives"].delete_many({}) diff --git a/mpcontribs-api/tests/integration/db/test_project_groups_repository.py b/mpcontribs-api/tests/integration/db/test_project_groups_repository.py index 82723fd30e..fc19448017 100644 --- a/mpcontribs-api/tests/integration/db/test_project_groups_repository.py +++ b/mpcontribs-api/tests/integration/db/test_project_groups_repository.py @@ -111,8 +111,17 @@ async def test_duplicate_identifiers_raise_conflict(self, db): {"_id": PydanticObjectId(), "name": "dup", "owner": ALICE_EMAIL, "projects": [], "description": "d"}, ] ) - with pytest.raises(ConflictError): - await _repo(ADMIN).delete_project_group(name="dup", owner=ALICE_EMAIL) + try: + with pytest.raises(ConflictError): + await _repo(ADMIN).delete_project_group(name="dup", owner=ALICE_EMAIL) + finally: + # Restore the unique index we dropped so order-dependent tests that rely on it (e.g. the + # insert-duplicate guard) still see it. Planted duplicates must go first, or the unique + # index rebuild would fail. + await db["project_groups"].delete_many({"name": "dup"}) + await db["project_groups"].create_index( + [("name", 1), ("owner", 1)], name="name_owner", unique=True + ) # --------------------------------------------------------------------------- diff --git a/mpcontribs-api/tests/integration/db/test_project_groups_service.py b/mpcontribs-api/tests/integration/db/test_project_groups_service.py index dfd81ddcda..5aac87b567 100644 --- a/mpcontribs-api/tests/integration/db/test_project_groups_service.py +++ b/mpcontribs-api/tests/integration/db/test_project_groups_service.py @@ -117,8 +117,16 @@ async def test_ambiguous_identifiers_raise_conflict(self, db): {"_id": PydanticObjectId(), "name": "dup", "owner": ALICE_EMAIL, "projects": [], "description": "d"}, ] ) - with pytest.raises(ConflictError): - await _service().add_projects_by_identifiers("dup", ALICE_EMAIL, []) + try: + with pytest.raises(ConflictError): + await _service().add_projects_by_identifiers("dup", ALICE_EMAIL, []) + finally: + # Restore the unique index we dropped so order-dependent tests that rely on it still see + # it. Planted duplicates must go first, or the unique index rebuild would fail. + await db["project_groups"].delete_many({"name": "dup"}) + await db["project_groups"].create_index( + [("name", 1), ("owner", 1)], name="name_owner", unique=True + ) # --------------------------------------------------------------------------- diff --git a/mpcontribs-api/tests/integration/test_projects.py b/mpcontribs-api/tests/integration/test_projects.py index 0f98857923..e157665880 100644 --- a/mpcontribs-api/tests/integration/test_projects.py +++ b/mpcontribs-api/tests/integration/test_projects.py @@ -1,6 +1,8 @@ +from unittest.mock import AsyncMock + import pytest -from mpcontribs_api.domains.projects.dependencies import get_scoped_projects +from mpcontribs_api.domains.projects.dependencies import get_project_initiative_service, get_scoped_projects from mpcontribs_api.domains.projects.models import ProjectOut, Stats from mpcontribs_api.exceptions import ConflictError, NotFoundError from mpcontribs_api.pagination import Page @@ -37,6 +39,15 @@ def project_repo(test_app, mock_project_repo): test_app.dependency_overrides.pop(get_scoped_projects, None) +@pytest.fixture +def project_service(test_app): + """Override the assignment service the PATCH route depends on with an async mock.""" + service = AsyncMock() + test_app.dependency_overrides[get_project_initiative_service] = lambda: service + yield service + test_app.dependency_overrides.pop(get_project_initiative_service, None) + + # --------------------------------------------------------------------------- # GET /api/v1/projects # --------------------------------------------------------------------------- @@ -154,8 +165,8 @@ def test_no_fields_param_uses_default_fields(self, client, project_repo): class TestPatchProject: - def test_valid_patch_returns_200(self, client, project_repo): - project_repo.patch_project_by_id.return_value = SAMPLE_PROJECT + def test_valid_patch_returns_200(self, client, project_service): + project_service.patch.return_value = SAMPLE_PROJECT r = client.patch( "/api/v1/projects/mp-sample", json={"title": "Updated Title"}, @@ -163,9 +174,9 @@ def test_valid_patch_returns_200(self, client, project_repo): ) assert r.status_code == 200 - def test_patch_response_is_project_out(self, client, project_repo): + def test_patch_response_is_project_out(self, client, project_service): updated = ProjectOut(id="mp-sample", title="Updated Title") - project_repo.patch_project_by_id.return_value = updated + project_service.patch.return_value = updated body = client.patch( "/api/v1/projects/mp-sample", json={"title": "Updated Title"}, @@ -173,8 +184,8 @@ def test_patch_response_is_project_out(self, client, project_repo): ).json() assert body["title"] == "Updated Title" - def test_not_found_returns_404(self, client, project_repo): - project_repo.patch_project_by_id.side_effect = NotFoundError("not found") + def test_not_found_returns_404(self, client, project_service): + project_service.patch.side_effect = NotFoundError("not found") r = client.patch( "/api/v1/projects/missing", json={"title": "x" * 5}, @@ -182,7 +193,7 @@ def test_not_found_returns_404(self, client, project_repo): ) assert r.status_code == 404 - def test_invalid_title_too_short_returns_422(self, client, project_repo): + def test_invalid_title_too_short_returns_422(self, client, project_service): r = client.patch( "/api/v1/projects/mp-sample", json={"title": "ab"}, @@ -190,14 +201,14 @@ def test_invalid_title_too_short_returns_422(self, client, project_repo): ) assert r.status_code == 422 - def test_id_and_update_forwarded_to_repo(self, client, project_repo): - project_repo.patch_project_by_id.return_value = SAMPLE_PROJECT + def test_id_and_update_forwarded_to_service(self, client, project_service): + project_service.patch.return_value = SAMPLE_PROJECT client.patch( "/api/v1/projects/mp-sample", json={"title": "New Name"}, headers=AUTHED_HEADERS, ) - _, kwargs = project_repo.patch_project_by_id.call_args + _, kwargs = project_service.patch.call_args assert kwargs["id"] == "mp-sample" assert kwargs["update"].title == "New Name" From aced4c160712893954ebe7c19e6eb4b11532c1f2 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 16 Jul 2026 17:01:46 -0700 Subject: [PATCH 468/591] Removed user from repo fields --- .../src/mpcontribs_api/domains/_shared/repository.py | 1 + .../src/mpcontribs_api/domains/initiatives/repository.py | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py index c1a65c62e0..b5e276f4d2 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py @@ -56,6 +56,7 @@ def __init__(self, user: User) -> None: Args: user (User): the current user requesting resources """ + self._user = user self._scope = self._build_scope(user) @staticmethod diff --git a/mpcontribs-api/src/mpcontribs_api/domains/initiatives/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/initiatives/repository.py index bce9f706b1..6c373a5221 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/initiatives/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/initiatives/repository.py @@ -26,7 +26,6 @@ class InitiativeRepository( def __init__(self, user: User) -> None: super().__init__(user) - self._user = user self._limits = get_settings().domain.initiatives @staticmethod @@ -109,8 +108,7 @@ async def patch_initiative(self, slug: str, update: InitiativePatch) -> Initiati if existing is None: raise NotFoundError("Initiative not found", slug=slug) if not ( - self._user.can_manage(id=existing.slug, resource="initiative") - or self._user.username == self.document_model.owner + self._user.can_manage(id=existing.slug, resource="initiative") or self._user.username == existing.owner ): raise PermissionError(required_role="initiative-owner-collaborator-or-admin") From ccfd1f9d212ec459f24f6625d573437467f9468c Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 16 Jul 2026 17:08:28 -0700 Subject: [PATCH 469/591] Automatically set caller as owner of ProjectGroup on Insert --- .../src/mpcontribs_api/domains/project_groups/service.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/project_groups/service.py b/mpcontribs-api/src/mpcontribs_api/domains/project_groups/service.py index 5976da27ca..b882208aed 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/project_groups/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/project_groups/service.py @@ -28,7 +28,13 @@ async def _project_exists(self, project_id: ShortStr) -> bool: return await self._projects.get_by_id(project_id, fields=frozenset({"id"})) is not None async def insert(self, project_group: ProjectGroupIn) -> ProjectGroup: - """Insert a new group after verifying every referenced project exists and is visible""" + """Insert a new group after verifying every referenced project exists and is visible. + + Non-admins are set as owner automatically, while admins can specify owners. + """ + user = self._groups._user + if not user.is_admin: + project_group = project_group.model_copy(update={"owner": user.username}) missing = [pid for pid in project_group.projects if not await self._project_exists(pid)] if missing: raise NotFoundError("One or more projects not found or not visible", ids=missing) From b4ff3b023191a970fb41bd2cb8395bdb7c450daa Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 16 Jul 2026 17:19:11 -0700 Subject: [PATCH 470/591] Require users inserting components to have at least one project assigned to them --- .../src/mpcontribs_api/domains/structures/router.py | 4 ++-- mpcontribs-api/src/mpcontribs_api/domains/tables/router.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py index 803047648f..efa86a2e38 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py @@ -4,7 +4,7 @@ from fastapi.responses import StreamingResponse from fastapi_filter import FilterDepends -from mpcontribs_api.dependencies import S3Dep, require_user +from mpcontribs_api.dependencies import S3Dep, require_user, require_writer from mpcontribs_api.domains._shared.bulk import BulkWriteSummary from mpcontribs_api.domains._shared.models import ComponentDeleteResponse from mpcontribs_api.domains._shared.types import ( @@ -68,7 +68,7 @@ async def download_structure( ) -@router.post("", response_model=BulkWriteSummary[StructureOut], dependencies=[Depends(require_user)]) +@router.post("", response_model=BulkWriteSummary[StructureOut], dependencies=[Depends(require_writer)]) async def insert_structures( service: StructureServiceDep, structures: list[StructureIn], diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py index 703f0c6faa..658a650575 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py @@ -4,7 +4,7 @@ from fastapi.responses import StreamingResponse from fastapi_filter import FilterDepends -from mpcontribs_api.dependencies import S3Dep, require_user +from mpcontribs_api.dependencies import S3Dep, require_user, require_writer from mpcontribs_api.domains._shared.bulk import BulkWriteSummary from mpcontribs_api.domains._shared.models import ComponentDeleteResponse from mpcontribs_api.domains._shared.types import ( @@ -68,7 +68,7 @@ async def download_table( ) -@router.post("", response_model=BulkWriteSummary[Table], dependencies=[Depends(require_user)]) +@router.post("", response_model=BulkWriteSummary[Table], dependencies=[Depends(require_writer)]) async def insert_tables( service: TableServiceDep, tables: list[TableIn], From 4e175e7a6450ff84270299c7224fa0b38f80735a Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 16 Jul 2026 17:19:40 -0700 Subject: [PATCH 471/591] require_writer requires a user have at least one project assigned to them --- mpcontribs-api/src/mpcontribs_api/dependencies.py | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/mpcontribs-api/src/mpcontribs_api/dependencies.py b/mpcontribs-api/src/mpcontribs_api/dependencies.py index 0e0aa03278..e145920f70 100644 --- a/mpcontribs-api/src/mpcontribs_api/dependencies.py +++ b/mpcontribs-api/src/mpcontribs_api/dependencies.py @@ -8,7 +8,7 @@ from types_aiobotocore_s3 import S3Client from mpcontribs_api.authz import User -from mpcontribs_api.exceptions import AuthenticationError +from mpcontribs_api.exceptions import AuthenticationError, PermissionError def get_db(request: Request) -> AsyncDatabase: @@ -71,3 +71,16 @@ def require_user(user: UserDep) -> User: if user.is_anonymous: raise AuthenticationError("authentication required") return user + + +def require_writer(user: UserDep) -> User: + """Require an authenticated caller who can write to at least one project. + + Controls access to creating components if you do not have contributions to attach them to. + Helps to limit orphanned components + """ + if user.is_anonymous: + raise AuthenticationError("authentication required") + if not (user.is_admin or user.writable_projects): + raise PermissionError("write access to at least one project is required") + return user From 5fe29d37f7865a408b1743ebe9b16ec77b196958 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 16 Jul 2026 17:21:12 -0700 Subject: [PATCH 472/591] Added parsing user roles for project-group: strings --- mpcontribs-api/src/mpcontribs_api/authz.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/mpcontribs-api/src/mpcontribs_api/authz.py b/mpcontribs-api/src/mpcontribs_api/authz.py index 27fd78de63..99d6713ace 100644 --- a/mpcontribs-api/src/mpcontribs_api/authz.py +++ b/mpcontribs-api/src/mpcontribs_api/authz.py @@ -36,6 +36,9 @@ # prefix to user roles to disambiguate from project roles, which are bare ids INITIATIVE_ROLE_PREFIX = "initiative:" +# prefix for project-group roles: a group's _id (an ObjectId hex string) is granted as ``project-group:`` +PROJECT_GROUP_ROLE_PREFIX = "project-group:" + class User(BaseModel): """User definition derived from request headers. @@ -78,6 +81,16 @@ def initiative_roles(self) -> list[str]: """The initiative slugs this user collaborates on, decoded from their ``initiative:`` roles.""" return [role[len(INITIATIVE_ROLE_PREFIX) :] for role in self.groups if role.startswith(INITIATIVE_ROLE_PREFIX)] + @property + def project_group_roles(self) -> list[str]: + """The project-group ids this user may access, decoded from their ``project-group:`` roles. + + Values are the raw hex strings; callers that query by ``_id`` must convert them + """ + return [ + role[len(PROJECT_GROUP_ROLE_PREFIX) :] for role in self.groups if role.startswith(PROJECT_GROUP_ROLE_PREFIX) + ] + def has_role(self, role: str, *, resource: str | None = None) -> bool: """Determine whether a user has a role assigned to them. From bd8ac131c9940c4ad4bd92035b008acc62529979 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 16 Jul 2026 17:22:24 -0700 Subject: [PATCH 473/591] Improved handling of user roles and permissions along with informative errors --- .../domains/project_groups/repository.py | 31 ++++++++-- .../domains/projects/repository.py | 56 +++++++++++++++---- .../domains/projects/service.py | 3 +- 3 files changed, 73 insertions(+), 17 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/project_groups/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/project_groups/repository.py index d0f96009d0..f615923a39 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/project_groups/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/project_groups/repository.py @@ -3,6 +3,7 @@ from beanie import PydanticObjectId, UpdateResponse from beanie.operators import AddToSet, Pull from bson import DBRef +from bson.errors import InvalidId from pymongo.asynchronous.client_session import AsyncClientSession from mpcontribs_api.authz import User @@ -16,6 +17,7 @@ ProjectGroupOut, ProjectGroupPatch, ) +from mpcontribs_api.exceptions import NotFoundError, PermissionError from mpcontribs_api.pagination import CursorParams, Page @@ -27,14 +29,20 @@ class ProjectGroupRepository( @staticmethod def _build_scope(user: User) -> dict[str, Any]: - """Provides scope based on current user's permitted groups and publicly released data.""" + """Scope reads to what the caller may see: public groups, ones they own, or ones granted.""" if user.is_admin: return {} ors: list[dict[str, Any]] = [{"is_public": True}] if not user.is_anonymous: ors.append({"owner": user.username}) - if user.groups: - ors.append({"_id": {"$in": sorted(user.groups)}}) + granted: list[PydanticObjectId] = [] + for raw in user.project_group_roles: + try: + granted.append(PydanticObjectId(raw)) + except InvalidId: + continue + if granted: + ors.append({"_id": {"$in": sorted(granted)}}) return {"$or": ors} async def get_project_groups( @@ -71,11 +79,22 @@ async def patch_project_group( return await self.patch_one({"name": name, "owner": owner}, update) async def delete_project_group(self, name: SearchStr, owner: PrefixedEmail) -> DeleteResponse: - """Delete the single project group identified by ``name`` + ``owner``. See ``delete_one``.""" - return await self.delete_one({"name": name, "owner": owner}) + """Delete the single project group identified by ``name`` + ``owner``.""" + oid = await self._resolve_one_id({"name": name, "owner": owner}) + if oid is None: + raise NotFoundError(f"{self.document_model.__name__} not found", name=name, owner=owner) + if not (self._user.is_admin or owner == self._user.username): + raise PermissionError(required_role="owner-or-admin") + return await self.delete_by_id(oid) async def delete_project_groups(self, filter: ProjectGroupFilter) -> DeleteResponse: - """Bulk-delete every scoped project group matching ``filter``. See ``delete``.""" + """Bulk-delete project groups matching ``filter``, restricted to the caller's own. + + A non-admin's bulk delete is scoped to their own groups (overriding any ``owner`` in the + filter) so it can never remove public groups belonging to others. See ``delete``. + """ + if not self._user.is_admin: + filter.owner = self._user.username return await self.delete(filter) async def add_project_refs( diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py index 00e8373824..3a403e6f7b 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py @@ -13,7 +13,7 @@ ProjectOut, ProjectPatch, ) -from mpcontribs_api.exceptions import NotFoundError, PermissionError +from mpcontribs_api.exceptions import NotFoundError, PermissionError, ValidationError from mpcontribs_api.pagination import CursorParams @@ -33,10 +33,6 @@ class MongoDbProjectRepository(MongoDbRepository[Project, ProjectIn, ProjectOut, document_model = Project out_model = ProjectOut - def __init__(self, user: User) -> None: - super().__init__(user) - self._user = user - @staticmethod def _build_scope(user: User) -> dict[str, Any]: """Provides scope based on current user's permitted groups and publicly released data.""" @@ -91,24 +87,55 @@ async def insert_project(self, project: ProjectIn) -> Project: return await self.insert_one(project) async def patch_project_by_id(self, id: str, update: ProjectPatch) -> Project: - """Partially update a project by id, scoped to the current user. See ``patch``.""" + """Partially update a scoped project by id, enforcing approval rules. + + - Only an admin may change ``is_approved``. + - Resulting state must satisfy is_public <-> is_approved condition + + The ``initiative`` field is split out upstream in ``ProjectService.patch``, so it never + reaches this method. + """ + data = update.model_dump(exclude_unset=True) + if "is_approved" in data and not self._user.is_admin: + raise PermissionError(required_role="admin") + + existing = await self.document_model.find_one(self._scope, self.document_model.id == id) + if existing is None: + raise NotFoundError(self._not_found(id)) + + resulting_approved = data.get("is_approved", existing.is_approved) + resulting_public = data.get("is_public", existing.is_public) + if resulting_public and not resulting_approved: + raise ValidationError("a project cannot be public until it is approved", id=id) + return await self.patch(id, update) async def delete_project_by_id(self, id: str) -> None: - """Delete a project by id, scoped to the current user. See ``delete_by_id``.""" + """Delete a scoped project by id. Restricted to the owner or an admin. + + Visibility (public/approved or group membership) is not enough to delete: a project can + only be dissolved by its owner (or an admin). A caller who cannot see the project gets a + 404; a caller who can see it but does not own it gets a 403. + """ + existing = await self.document_model.find_one(self._scope, self.document_model.id == id) + if existing is None: + raise NotFoundError(self._not_found(id)) + if not (self._user.is_admin or existing.owner == self._user.username): + raise PermissionError(required_role="owner-or-admin") await self.delete_by_id(id) async def upsert_project_by_id(self, id: str, data: ProjectIn) -> Project: """Upsert a project by provided id, authorized to the current user. Update the document if the id exists, otherwise insert a new one under that id. - Authorization (the read scope is for visibility, not write access, so it is not - reused here): - **Existing project:** only its ``owner`` or an admin may overwrite it. The stored - ``owner`` is preserved — ownership cannot be reassigned through the request body. + ``owner`` is preserved - ownership cannot be reassigned through the request body. - **New project:** ``owner`` is forced to the caller, ignoring any body value. + an existing project keeps its stored approval and a new one starts unapproved. The resulting + document must also satisfy ``is_public ⇒ is_approved``. + Note: relies on the path param ``id`` for identity, not the body's id. Args: @@ -133,9 +160,18 @@ async def upsert_project_by_id(self, id: str, data: ProjectIn) -> Project: raise PermissionError(required_role="owner-or-admin") # Ownership is immutable via upsert; keep the original owner. project.owner = existing.owner + # Approval is admin-only; a non-admin keeps the project's stored approval state. + if not self._user.is_admin: + project.is_approved = existing.is_approved else: # New project: the caller owns it, regardless of the submitted owner. project.owner = self._user.username + # Approval is admin-only; a non-admin's new project always starts unapproved. + if not self._user.is_admin: + project.is_approved = False + + if project.is_public and not project.is_approved: + raise ValidationError("a project cannot be public until it is approved", id=id) return await project.save() async def set_initiative(self, id: str, ref: DBRef | None) -> Project: diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/service.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/service.py index f95fbacb49..95c8120689 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/service.py @@ -54,7 +54,8 @@ async def _resolve_initiative_assignment(self, project_id: str, slug: str | None if initiative is None: raise NotFoundError("Initiative not found or not visible", slug=slug) - if not self._initiatives._user.can_manage(id=initiative.slug, resource="initiative"): + user = self._initiatives._user + if not (user.can_manage(id=initiative.slug, resource="initiative") or initiative.owner == user.username): raise PermissionError( message="user does not have adequate acceess to this resource", required_role="initiative-owner-collaborator-or-admin", From 4db18945974ec486870543b18a78ede57335db92 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 16 Jul 2026 17:22:42 -0700 Subject: [PATCH 474/591] Initatives and ProjectGroup testing --- .../db/test_initiatives_repository.py | 61 ++++++++- .../db/test_initiatives_service.py | 38 +++++- .../db/test_project_groups_repository.py | 71 ++++++++++- .../db/test_project_groups_service.py | 15 +++ .../db/test_projects_repository.py | 118 +++++++++++++++++- .../integration/test_component_routes.py | 32 +++++ .../tests/integration/test_projects.py | 6 +- .../unit/domains/test_initiatives_models.py | 100 +++++++++++++++ .../domains/test_project_group_service.py | 5 + 9 files changed, 431 insertions(+), 15 deletions(-) create mode 100644 mpcontribs-api/tests/unit/domains/test_initiatives_models.py diff --git a/mpcontribs-api/tests/integration/db/test_initiatives_repository.py b/mpcontribs-api/tests/integration/db/test_initiatives_repository.py index f36f2a995a..c4aec88ccd 100644 --- a/mpcontribs-api/tests/integration/db/test_initiatives_repository.py +++ b/mpcontribs-api/tests/integration/db/test_initiatives_repository.py @@ -2,9 +2,15 @@ from mpcontribs_api.authz import User from mpcontribs_api.config import get_settings -from mpcontribs_api.domains.initiatives.models import Initiative, InitiativeIn, InitiativePatch +from mpcontribs_api.domains.initiatives.models import ( + Initiative, + InitiativeFilter, + InitiativeIn, + InitiativePatch, +) from mpcontribs_api.domains.initiatives.repository import InitiativeRepository from mpcontribs_api.exceptions import ConflictError, NotFoundError, PermissionError, ValidationError +from mpcontribs_api.pagination import CursorParams # Share the session event loop (see the projects repo test for why). pytestmark = [pytest.mark.db, pytest.mark.asyncio(loop_scope="session")] @@ -68,14 +74,14 @@ async def test_invalid_slug_rejected(self, db): class TestUnapprovedPerOwnerLimit: async def test_owner_capped_at_configured_unapproved(self, db): - limit = get_settings().initiatives.max_unapproved_per_owner + limit = get_settings().domain.initiatives.max_unapproved_per_owner for i in range(limit): await _insert(f"cap-{i}", ALICE) with pytest.raises(ConflictError): await _insert("cap-over", ALICE) async def test_approved_do_not_count_against_quota(self, db): - limit = get_settings().initiatives.max_unapproved_per_owner + limit = get_settings().domain.initiatives.max_unapproved_per_owner for i in range(limit): await _insert(f"quota-{i}", ALICE) await _approve("quota-0") # frees a slot @@ -83,7 +89,7 @@ async def test_approved_do_not_count_against_quota(self, db): assert await _insert("quota-extra", ALICE) is not None async def test_admin_is_exempt(self, db): - limit = get_settings().initiatives.max_unapproved_per_owner + limit = get_settings().domain.initiatives.max_unapproved_per_owner for i in range(limit + 2): await _repo(ADMIN).insert_initiative(InitiativeIn(slug=f"admin-{i}", name="x")) @@ -182,3 +188,50 @@ async def test_collaborator_cannot_delete(self, db): async def test_missing_is_not_found(self, db): with pytest.raises(NotFoundError): await _repo(ADMIN).delete_initiative("nope-missing") + + +# --------------------------------------------------------------------------- +# Listing + filtering (scoped) +# --------------------------------------------------------------------------- + + +class TestListAndFilter: + async def test_list_scoped_to_caller(self, db): + await _insert("mine-1", ALICE) + await _insert("bobs-1", BOB) # Bob's private initiative, invisible to Alice + page = await _repo(ALICE).get_initiatives(CursorParams(), InitiativeFilter(), fields=None) + slugs = {i.slug for i in page.items} + assert "mine-1" in slugs + assert "bobs-1" not in slugs + + async def test_filter_by_is_approved(self, db): + await _insert("appr-1", ALICE) + await _insert("unappr-1", ALICE) + await _approve("appr-1") + page = await _repo(ADMIN).get_initiatives(CursorParams(), InitiativeFilter(is_approved=True), fields=None) + slugs = {i.slug for i in page.items} + assert "appr-1" in slugs + assert "unappr-1" not in slugs + + async def test_filter_by_owner(self, db): + await _insert("owned-alice", ALICE) + await _insert("owned-bob", BOB) + page = await _repo(ADMIN).get_initiatives(CursorParams(), InitiativeFilter(owner=BOB_EMAIL), fields=None) + assert {i.slug for i in page.items} == {"owned-bob"} + + +# --------------------------------------------------------------------------- +# Admin bypass +# --------------------------------------------------------------------------- + + +class TestAdminBypass: + async def test_admin_can_patch_non_owned(self, db): + await _insert("admin-patch", ALICE) + patched = await _repo(ADMIN).patch_initiative("admin-patch", InitiativePatch(name="Admin Renamed")) + assert patched.name == "Admin Renamed" + + async def test_admin_can_delete_non_owned(self, db): + await _insert("admin-del", ALICE) + result = await _repo(ADMIN).delete_initiative("admin-del") + assert result.num_deleted == 1 diff --git a/mpcontribs-api/tests/integration/db/test_initiatives_service.py b/mpcontribs-api/tests/integration/db/test_initiatives_service.py index c10fbaf6e8..cf83f42e53 100644 --- a/mpcontribs-api/tests/integration/db/test_initiatives_service.py +++ b/mpcontribs-api/tests/integration/db/test_initiatives_service.py @@ -7,7 +7,7 @@ from mpcontribs_api.domains.initiatives.repository import InitiativeRepository from mpcontribs_api.domains.projects.models import Project, ProjectIn, ProjectPatch, Stats from mpcontribs_api.domains.projects.repository import MongoDbProjectRepository -from mpcontribs_api.domains.projects.service import ProjectInitiativeService +from mpcontribs_api.domains.projects.service import ProjectService from mpcontribs_api.exceptions import ConflictError, NotFoundError, PermissionError pytestmark = [pytest.mark.db, pytest.mark.asyncio(loop_scope="session")] @@ -27,8 +27,8 @@ STATS = Stats(columns=0, contributions=0, tables=0, structures=0, attachments=0, size=0.0) -def _service(user: User) -> ProjectInitiativeService: - return ProjectInitiativeService( +def _service(user: User) -> ProjectService: + return ProjectService( projects=MongoDbProjectRepository(user), initiatives=InitiativeRepository(user), ) @@ -144,7 +144,7 @@ async def test_assign_to_missing_initiative_is_not_found(self, db): class TestMemberCap: async def test_unapproved_capped_at_configured_members(self, db): - cap = get_settings().initiatives.max_projects_per_unapproved + cap = get_settings().domain.initiatives.max_projects_per_unapproved await _insert_initiative("init-cap", ALICE) for i in range(cap): await _insert_project(f"cap-proj-{i}", owner=ALICE_EMAIL) @@ -154,7 +154,7 @@ async def test_unapproved_capped_at_configured_members(self, db): await _service(ALICE).patch("cap-proj-over", ProjectPatch(initiative="init-cap")) async def test_reassigning_existing_member_is_idempotent(self, db): - cap = get_settings().initiatives.max_projects_per_unapproved + cap = get_settings().domain.initiatives.max_projects_per_unapproved await _insert_initiative("init-idem", ALICE) for i in range(cap): await _insert_project(f"idem-proj-{i}", owner=ALICE_EMAIL) @@ -164,7 +164,7 @@ async def test_reassigning_existing_member_is_idempotent(self, db): assert again.initiative is not None async def test_approved_initiative_has_no_member_cap(self, db): - cap = get_settings().initiatives.max_projects_per_unapproved + cap = get_settings().domain.initiatives.max_projects_per_unapproved await _insert_initiative("init-approved", ALICE) await InitiativeRepository(ADMIN).patch_initiative("init-approved", InitiativePatch(is_approved=True)) for i in range(cap + 2): # comfortably past the unapproved cap @@ -175,3 +175,29 @@ async def test_approved_initiative_has_no_member_cap(self, db): exclude_project_id=None, ) assert count == cap + 2 + + +# --------------------------------------------------------------------------- +# Admin bypass + unassignment rights +# --------------------------------------------------------------------------- + + +class TestAdminAndUnassign: + async def test_admin_can_assign_to_any_initiative(self, db): + # Alice's private initiative is manageable by an admin even though the admin holds no role. + await _insert_project("adm-proj", owner=ALICE_EMAIL) + init = await _insert_initiative("adm-init", ALICE) + updated = await _service(ADMIN).patch("adm-proj", ProjectPatch(initiative="adm-init")) + assert _assigned_id(updated) == init.id + + async def test_project_owner_can_unassign_without_initiative_rights(self, db): + # A collaborator assigns Bob's project; Bob, lacking any initiative role, can still detach + # his own project — unassignment needs only project-write access. + await _insert_project("detach-proj", owner=BOB_EMAIL) + await _insert_initiative("detach-init", ALICE) + await _service(_collaborator("detach-init", username=BOB_EMAIL)).patch( + "detach-proj", ProjectPatch(initiative="detach-init") + ) + bob_plain = User(username=BOB_EMAIL, groups=frozenset()) + updated = await _service(bob_plain).patch("detach-proj", ProjectPatch(initiative=None)) + assert _assigned_id(updated) is None diff --git a/mpcontribs-api/tests/integration/db/test_project_groups_repository.py b/mpcontribs-api/tests/integration/db/test_project_groups_repository.py index fc19448017..26928cfb9a 100644 --- a/mpcontribs-api/tests/integration/db/test_project_groups_repository.py +++ b/mpcontribs-api/tests/integration/db/test_project_groups_repository.py @@ -9,7 +9,8 @@ ProjectGroupPatch, ) from mpcontribs_api.domains.project_groups.repository import ProjectGroupRepository -from mpcontribs_api.exceptions import ConflictError, NotFoundError, ValidationError +from mpcontribs_api.exceptions import ConflictError, NotFoundError, PermissionError, ValidationError +from mpcontribs_api.pagination import CursorParams # Share the session event loop (see the projects repo test for why). pytestmark = [pytest.mark.db, pytest.mark.asyncio(loop_scope="session")] @@ -21,9 +22,11 @@ ADMIN = User(username="google:admin@example.com", groups=frozenset({"admin"})) ALICE = User(username="google:alice@example.com", groups=frozenset({"mp-team"})) +BOB = User(username="google:bob@example.com", groups=frozenset()) ANON = User() ALICE_EMAIL = "google:alice@example.com" +BOB_EMAIL = "google:bob@example.com" def _repo(user: User) -> ProjectGroupRepository: @@ -69,6 +72,50 @@ async def test_out_of_scope_returns_none(self, db): assert found is None +# --------------------------------------------------------------------------- +# project-group: role scoping +# --------------------------------------------------------------------------- + + +def _role_user(group_id, username: str = "google:carol@example.com") -> User: + """A non-owner authenticated user granted access to one group via its project-group role.""" + return User(username=username, groups=frozenset({f"project-group:{group_id}"})) + + +class TestGroupRoleScope: + async def test_role_grants_visibility(self, db): + group = await _insert("role-vis") # Alice's private group + found = await _repo(_role_user(group.id)).get_project_group(name="role-vis", owner=ALICE_EMAIL, fields=None) + assert found is not None + assert found.id == group.id + + async def test_without_role_not_visible(self, db): + await _insert("role-none") + found = await _repo(BOB).get_project_group(name="role-none", owner=ALICE_EMAIL, fields=None) + assert found is None + + async def test_malformed_role_is_ignored(self, db): + await _insert("role-bad") + member = User(username="google:carol@example.com", groups=frozenset({"project-group:not-an-oid"})) + # A malformed role id must not raise; it simply grants nothing. + found = await _repo(member).get_project_group(name="role-bad", owner=ALICE_EMAIL, fields=None) + assert found is None + + async def test_role_appears_in_listing(self, db): + group = await _insert("role-list") + page = await _repo(_role_user(group.id)).get_project_groups( + pagination=CursorParams(), filter=ProjectGroupFilter(), fields=None + ) + assert group.id in {g.id for g in page.items} + + async def test_role_grants_scope_but_not_delete(self, db): + # Scope makes the group visible, but deletion remains owner-or-admin (403 for a role holder). + group = await _insert("role-del") + with pytest.raises(PermissionError): + await _repo(_role_user(group.id)).delete_project_group(name="role-del", owner=ALICE_EMAIL) + assert await ProjectGroup.find_one(ProjectGroup.name == "role-del") is not None + + # --------------------------------------------------------------------------- # delete_one (identifier-keyed, single-resource, raises) # --------------------------------------------------------------------------- @@ -93,6 +140,18 @@ async def test_out_of_scope_raises_not_found(self, db): # ...and it is untouched. assert await ProjectGroup.find_one(ProjectGroup.name == "del-scoped") is not None + async def test_owner_can_delete_own(self, db): + await _insert("del-own", owner=ALICE_EMAIL) + result = await _repo(ALICE).delete_project_group(name="del-own", owner=ALICE_EMAIL) + assert result.num_deleted == 1 + + async def test_visible_public_non_owner_forbidden(self, db): + # Bob can *see* Alice's public group but does not own it → 403, and it is left intact. + await _insert("del-pub", owner=ALICE_EMAIL, is_public=True) + with pytest.raises(PermissionError): + await _repo(BOB).delete_project_group(name="del-pub", owner=ALICE_EMAIL) + assert await ProjectGroup.find_one(ProjectGroup.name == "del-pub") is not None + async def test_wrong_identifier_keys_raise_validation(self, db): with pytest.raises(ValidationError): await _repo(ADMIN).delete_one({"name": "x"}) # missing 'owner' @@ -166,6 +225,16 @@ async def test_no_match_returns_zero(self, db): ) assert result.num_deleted == 0 + async def test_non_admin_bulk_restricted_to_own(self, db): + # A broad filter from a non-admin is pinned to their own groups: a public group owned by + # someone else must survive even though the filter would otherwise match it. + await _insert("own-bulk", owner=ALICE_EMAIL, is_public=True) + await _insert("other-bulk", owner=BOB_EMAIL, is_public=True) + result = await _repo(ALICE).delete_project_groups(filter=ProjectGroupFilter(is_public=True)) + assert result.num_deleted == 1 + assert await ProjectGroup.find_one(ProjectGroup.name == "own-bulk") is None + assert await ProjectGroup.find_one(ProjectGroup.name == "other-bulk") is not None + # --------------------------------------------------------------------------- # insert_project_group diff --git a/mpcontribs-api/tests/integration/db/test_project_groups_service.py b/mpcontribs-api/tests/integration/db/test_project_groups_service.py index 5aac87b567..af7d188f85 100644 --- a/mpcontribs-api/tests/integration/db/test_project_groups_service.py +++ b/mpcontribs-api/tests/integration/db/test_project_groups_service.py @@ -134,6 +134,21 @@ async def test_ambiguous_identifiers_raise_conflict(self, db): # --------------------------------------------------------------------------- +class TestInsert: + async def test_non_admin_owner_forced_to_caller(self, db): + # Alice submits Bob as owner; the caller's identity must win so she can manage the group. + group = await _service(ALICE).insert( + ProjectGroupIn(name="ins-forced", owner=BOB_EMAIL, projects=[], description="d") + ) + assert group.owner == ALICE_EMAIL + + async def test_admin_may_set_owner_on_behalf(self, db): + group = await _service(ADMIN).insert( + ProjectGroupIn(name="ins-onbehalf", owner=BOB_EMAIL, projects=[], description="d") + ) + assert group.owner == BOB_EMAIL + + class TestDelete: async def test_delete_by_id_unlinks_project(self, db): group = await _insert_group("rm-id") diff --git a/mpcontribs-api/tests/integration/db/test_projects_repository.py b/mpcontribs-api/tests/integration/db/test_projects_repository.py index 7e33766870..f824d01c9e 100644 --- a/mpcontribs-api/tests/integration/db/test_projects_repository.py +++ b/mpcontribs-api/tests/integration/db/test_projects_repository.py @@ -3,7 +3,7 @@ from mpcontribs_api.authz import User from mpcontribs_api.domains.projects.models import Project, ProjectIn, ProjectOut, ProjectPatch, Stats from mpcontribs_api.domains.projects.repository import MongoDbProjectRepository -from mpcontribs_api.exceptions import ConflictError, NotFoundError +from mpcontribs_api.exceptions import ConflictError, NotFoundError, PermissionError, ValidationError from mpcontribs_api.pagination import CursorParams # All tests in this module share the session event loop so they can reuse the @@ -365,6 +365,38 @@ async def test_delete_nonexistent_throws_error(self, db): with pytest.raises(NotFoundError, match="not found"): await _repo(ADMIN).delete_project_by_id(id="ghost-id") + async def test_owner_can_delete_own_project(self, db): + await _insert("del-own", owner="google:alice@example.com") + await _repo(ALICE).delete_project_by_id(id="del-own") + assert await Project.find_one(Project.id == "del-own") is None + + async def test_admin_can_delete_any_project(self, db): + await _insert("del-admin", owner="google:alice@example.com") + await _repo(ADMIN).delete_project_by_id(id="del-admin") + assert await Project.find_one(Project.id == "del-admin") is None + + async def test_group_member_non_owner_cannot_delete(self, db): + # A user whose group contains the project slug can *see* it, but only the owner may delete. + member = User(username="google:carol@example.com", groups=frozenset({"del-grp"})) + await _insert("del-grp", owner="google:alice@example.com") + with pytest.raises(PermissionError): + await _repo(member).delete_project_by_id(id="del-grp") + assert await Project.find_one(Project.id == "del-grp") is not None + + async def test_visible_public_non_owner_cannot_delete(self, db): + # BOB can see the public+approved project but does not own it → 403, not a silent success. + await _insert("del-pub", owner="google:alice@example.com", is_public=True, is_approved=True) + with pytest.raises(PermissionError): + await _repo(BOB).delete_project_by_id(id="del-pub") + assert await Project.find_one(Project.id == "del-pub") is not None + + async def test_out_of_scope_delete_not_found(self, db): + # BOB cannot see Alice's private project → 404 (existence is not leaked as a 403). + await _insert("del-hidden", owner="google:alice@example.com", is_public=False) + with pytest.raises(NotFoundError): + await _repo(BOB).delete_project_by_id(id="del-hidden") + assert await Project.find_one(Project.id == "del-hidden") is not None + # --------------------------------------------------------------------------- # upsert_project_by_id @@ -438,3 +470,87 @@ async def test_update_preserves_original_owner(self, db): await _repo(ALICE).upsert_project_by_id(id="auth-preserve", data=data) found = await Project.find_one(Project.id == "auth-preserve") assert found.owner == "google:alice@example.com" + + +# --------------------------------------------------------------------------- +# is_approved is admin-only (patch + upsert) +# --------------------------------------------------------------------------- + + +class TestApprovalIsAdminOnly: + async def test_non_admin_cannot_patch_is_approved(self, db): + await _insert("appr-patch", owner="google:alice@example.com") + with pytest.raises(PermissionError): + await _repo(ALICE).patch_project_by_id(id="appr-patch", update=ProjectPatch(is_approved=True)) + found = await Project.find_one(Project.id == "appr-patch") + assert found.is_approved is False + + async def test_admin_can_patch_is_approved(self, db): + await _insert("appr-patch-admin", owner="google:alice@example.com") + await _repo(ADMIN).patch_project_by_id(id="appr-patch-admin", update=ProjectPatch(is_approved=True)) + found = await Project.find_one(Project.id == "appr-patch-admin") + assert found.is_approved is True + + async def test_non_admin_upsert_new_project_stays_unapproved(self, db): + # Body asks for approval; a non-admin's new project must start unapproved. + data = _project_in("appr-new", owner="google:bob@example.com", is_approved=True) + await _repo(BOB).upsert_project_by_id(id="appr-new", data=data) + found = await Project.find_one(Project.id == "appr-new") + assert found.is_approved is False + + async def test_non_admin_upsert_cannot_change_existing_approval(self, db): + # Admin seeds an approved project; the owner (non-admin) cannot un-approve it via PUT. + await _insert("appr-existing", owner="google:alice@example.com", is_approved=True) + data = _project_in("appr-existing", owner="google:alice@example.com", is_approved=False) + await _repo(ALICE).upsert_project_by_id(id="appr-existing", data=data) + found = await Project.find_one(Project.id == "appr-existing") + assert found.is_approved is True + + async def test_admin_upsert_can_approve(self, db): + data = _project_in("appr-admin-new", is_approved=True) + await _repo(ADMIN).upsert_project_by_id(id="appr-admin-new", data=data) + found = await Project.find_one(Project.id == "appr-admin-new") + assert found.is_approved is True + + +# --------------------------------------------------------------------------- +# a project cannot be public unless approved +# --------------------------------------------------------------------------- + + +class TestPublicRequiresApproved: + async def test_patch_public_on_unapproved_rejected(self, db): + await _insert("pub-unappr", owner="google:alice@example.com", is_approved=False) + with pytest.raises(ValidationError, match="approved"): + await _repo(ADMIN).patch_project_by_id(id="pub-unappr", update=ProjectPatch(is_public=True)) + found = await Project.find_one(Project.id == "pub-unappr") + assert found.is_public is False + + async def test_patch_public_and_approved_together_succeeds(self, db): + await _insert("pub-both", owner="google:alice@example.com", is_approved=False) + await _repo(ADMIN).patch_project_by_id( + id="pub-both", update=ProjectPatch(is_public=True, is_approved=True) + ) + found = await Project.find_one(Project.id == "pub-both") + assert found.is_public is True + assert found.is_approved is True + + async def test_patch_public_on_approved_succeeds(self, db): + await _insert("pub-approved", owner="google:alice@example.com", is_approved=True) + await _repo(ADMIN).patch_project_by_id(id="pub-approved", update=ProjectPatch(is_public=True)) + found = await Project.find_one(Project.id == "pub-approved") + assert found.is_public is True + + async def test_upsert_public_unapproved_rejected(self, db): + # A non-admin's public+approved body is coerced to unapproved, which then violates the invariant. + data = _project_in("pub-upsert", owner="google:bob@example.com", is_public=True, is_approved=True) + with pytest.raises(ValidationError, match="approved"): + await _repo(BOB).upsert_project_by_id(id="pub-upsert", data=data) + assert await Project.find_one(Project.id == "pub-upsert") is None + + async def test_admin_upsert_public_approved_succeeds(self, db): + data = _project_in("pub-upsert-admin", is_public=True, is_approved=True) + await _repo(ADMIN).upsert_project_by_id(id="pub-upsert-admin", data=data) + found = await Project.find_one(Project.id == "pub-upsert-admin") + assert found.is_public is True + assert found.is_approved is True diff --git a/mpcontribs-api/tests/integration/test_component_routes.py b/mpcontribs-api/tests/integration/test_component_routes.py index c1b49cd8ba..f47fb1ae64 100644 --- a/mpcontribs-api/tests/integration/test_component_routes.py +++ b/mpcontribs-api/tests/integration/test_component_routes.py @@ -331,3 +331,35 @@ def test_structures_get_still_open_to_anon(self, client, structure_service): structure_service.get_many.return_value = Page(items=[], next_cursor=None) r = client.get("/api/v1/structures", headers=FORCE_ANON_HEADERS) assert r.status_code == 200 + + +# =========================================================================== +# Component inserts require the caller be a writer of at least one project +# (authenticated alone is not enough — require_writer). +# =========================================================================== + +# Authenticated, but carries no groups -> no writable projects. Override the default +# groups header (AUTHED_HEADERS sets mp-team) to empty so the caller is a non-writer. +NON_WRITER_HEADERS = { + "x-consumer-username": "google:nogroups@example.com", + "x-authenticated-groups": "", +} + + +class TestComponentInsertRequiresWriter: + def test_structures_post_non_writer_403(self, client, structure_service): + r = client.post("/api/v1/structures", json=[], headers=NON_WRITER_HEADERS) + assert r.status_code == 403 + structure_service.insert.assert_not_called() + + def test_tables_post_non_writer_403(self, client, table_service): + r = client.post("/api/v1/tables", json=[], headers=NON_WRITER_HEADERS) + assert r.status_code == 403 + table_service.insert.assert_not_called() + + def test_structures_post_writer_allowed(self, client, structure_service): + # The default AUTHED_HEADERS identity carries the mp-team group -> writer. + structure_service.insert.return_value = {"total": 0, "succeeded": [], "failed": []} + r = client.post("/api/v1/structures", json=[]) + assert r.status_code == 200 + structure_service.insert.assert_awaited_once() diff --git a/mpcontribs-api/tests/integration/test_projects.py b/mpcontribs-api/tests/integration/test_projects.py index e157665880..a7ff999b55 100644 --- a/mpcontribs-api/tests/integration/test_projects.py +++ b/mpcontribs-api/tests/integration/test_projects.py @@ -2,7 +2,7 @@ import pytest -from mpcontribs_api.domains.projects.dependencies import get_project_initiative_service, get_scoped_projects +from mpcontribs_api.domains.projects.dependencies import get_project_service, get_scoped_projects from mpcontribs_api.domains.projects.models import ProjectOut, Stats from mpcontribs_api.exceptions import ConflictError, NotFoundError from mpcontribs_api.pagination import Page @@ -43,9 +43,9 @@ def project_repo(test_app, mock_project_repo): def project_service(test_app): """Override the assignment service the PATCH route depends on with an async mock.""" service = AsyncMock() - test_app.dependency_overrides[get_project_initiative_service] = lambda: service + test_app.dependency_overrides[get_project_service] = lambda: service yield service - test_app.dependency_overrides.pop(get_project_initiative_service, None) + test_app.dependency_overrides.pop(get_project_service, None) # --------------------------------------------------------------------------- diff --git a/mpcontribs-api/tests/unit/domains/test_initiatives_models.py b/mpcontribs-api/tests/unit/domains/test_initiatives_models.py new file mode 100644 index 0000000000..956c82c137 --- /dev/null +++ b/mpcontribs-api/tests/unit/domains/test_initiatives_models.py @@ -0,0 +1,100 @@ +import pytest +from beanie import PydanticObjectId +from pydantic import ValidationError as PydanticValidationError + +from mpcontribs_api.domains.initiatives.models import ( + Initiative, + InitiativeIn, + InitiativeOut, + InitiativePatch, +) +from mpcontribs_api.exceptions import ValidationError + +OID = PydanticObjectId() +OWNER = "google:alice@example.com" + + +def _init(**overrides) -> Initiative: + payload = {"_id": OID, "slug": "battery-genome", "name": "Battery Genome", "owner": OWNER} + payload.update(overrides) + return Initiative.model_validate(payload) + + +# --------------------------------------------------------------------------- +# Slug validation / normalisation +# --------------------------------------------------------------------------- + + +class TestSlug: + def test_lowercases_and_strips(self): + assert _init(slug=" Battery-Genome-2025 ").slug == "battery-genome-2025" + + @pytest.mark.parametrize("bad", ["has space", "under_score", "trailing-", "-leading", "sym!bol", "Dou--ble"]) + def test_rejects_malformed_slug(self, bad): + with pytest.raises(ValidationError): + _init(slug=bad) + + def test_rejects_too_short_via_length(self): + # "ab" is well-formed but below the 3-char minimum, so the length constraint rejects it. + with pytest.raises(PydanticValidationError): + _init(slug="ab") + + +# --------------------------------------------------------------------------- +# Initiative document invariants +# --------------------------------------------------------------------------- + + +class TestInitiative: + def test_defaults_private_unapproved(self): + init = _init() + assert init.is_public is False + assert init.is_approved is False + + def test_public_and_approved_ok(self): + init = _init(is_public=True, is_approved=True) + assert init.is_public is True + + def test_public_without_approved_rejected(self): + with pytest.raises(ValidationError): + _init(is_public=True, is_approved=False) + + +# --------------------------------------------------------------------------- +# InitiativeIn (create contract) +# --------------------------------------------------------------------------- + + +class TestInitiativeIn: + def test_minimal_valid(self): + data = InitiativeIn(slug="battery-genome", name="Battery Genome") + assert data.slug == "battery-genome" + + @pytest.mark.parametrize("field", ["owner", "is_public", "is_approved", "id", "unknown"]) + def test_forbids_server_controlled_and_unknown_fields(self, field): + # owner and the flags are forced server-side; none are part of the input contract. + with pytest.raises(PydanticValidationError): + InitiativeIn(slug="battery-genome", name="Battery Genome", **{field: "x"}) + + def test_normalises_slug(self): + assert InitiativeIn(slug="Battery-Genome", name="x").slug == "battery-genome" + + +# --------------------------------------------------------------------------- +# InitiativeOut / InitiativePatch shape +# --------------------------------------------------------------------------- + + +class TestOutAndPatch: + def test_out_populates_id_from_alias(self): + out = InitiativeOut.model_validate({"_id": OID, "slug": "battery-genome"}) + assert out.id == OID + + def test_patch_tracks_only_set_fields(self): + patch = InitiativePatch(name="Renamed") + assert patch.model_dump(exclude_unset=True) == {"name": "Renamed"} + + def test_patch_has_no_slug_or_owner_field(self): + # slug and owner are immutable, so they are not part of the patch surface. + assert "slug" not in InitiativePatch.model_fields + assert "owner" not in InitiativePatch.model_fields diff --git a/mpcontribs-api/tests/unit/domains/test_project_group_service.py b/mpcontribs-api/tests/unit/domains/test_project_group_service.py index d1de793a28..d5ab9ef0de 100644 --- a/mpcontribs-api/tests/unit/domains/test_project_group_service.py +++ b/mpcontribs-api/tests/unit/domains/test_project_group_service.py @@ -4,6 +4,7 @@ from beanie import Link, PydanticObjectId from bson import DBRef +from mpcontribs_api.authz import User from mpcontribs_api.domains.project_groups.models import ProjectGroupIn, ProjectGroupOut from mpcontribs_api.domains.project_groups.service import ProjectGroupService from mpcontribs_api.domains.projects.models import Project @@ -27,6 +28,10 @@ def _make_service(group: ProjectGroupOut | None, *, visible_projects: set[str] | visible = visible_projects or set() groups = AsyncMock() projects = AsyncMock() + # insert() forces owner to the caller for non-admins; give the stub an admin user so these + # payload-identity assertions exercise the pass-through path (owner-forcing is covered end-to-end + # in the db service test). + groups._user = User(username="google:admin@example.com", groups=frozenset({"admin"})) if ambiguous: groups.get_one.side_effect = ConflictError("ambiguous") From 6c1b1d32e04e2a0161faac9bd0a6f8411022611d Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Fri, 17 Jul 2026 08:53:56 -0700 Subject: [PATCH 475/591] Added mp_category for MP defined categories. Improve ProjectIn to exclude server-defined fields --- .../mpcontribs_api/domains/projects/models.py | 46 ++++++++++++++----- 1 file changed, 35 insertions(+), 11 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py index d8b307b026..fe03054ee4 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py @@ -24,12 +24,12 @@ def segments(self) -> tuple[str, ...]: class Stats(BaseModel): - columns: int - contributions: int - tables: int - structures: int - attachments: int - size: float + columns: int = 0 + contributions: int = 0 + tables: int = 0 + structures: int = 0 + attachments: int = 0 + size: float = 0 class Reference(BaseModel): @@ -50,10 +50,11 @@ class Project(BaseDocumentWithInput[ShortStr]): description: str owner: PrefixedEmail unique_identifiers: bool - stats: Stats # Optional + stats: Stats = Field(default_factory=Stats) tags: list[ShortStr] | None = None + mp_category: str | None = None references: list[Reference] = Field(default_factory=list) long_title: str | None = None other: dict[str, Any] = Field(default_factory=dict) @@ -64,7 +65,6 @@ class Project(BaseDocumentWithInput[ShortStr]): initiative: Link[Initiative] | None = None - # Empty method for now. Keeping for business logic later @classmethod def from_input_model(cls, data: ProjectIn) -> Project: return cls(**data.model_dump()) @@ -77,6 +77,10 @@ def decode_cursor(cursor: str) -> str: """ return pagination.decode_cursor(cursor) + @classmethod + def server_managed_fields(cls) -> tuple: + return ("is_public", "is_approved", "stats", "mp_category") + class Settings: name = "projects" keep_nulls = False @@ -90,6 +94,7 @@ class ProjectOut(DocumentOut[ShortStr]): description: str | None = None title: ShortStr | None = None tags: list[ShortStr] | None = None + mp_category: str | None = None owner: PrefixedEmail | None = None other: dict[str, Any] | None = None is_public: bool | None = None @@ -128,6 +133,11 @@ class ProjectFilter(BaseFilter): tags__in: list[ShortStr] | None = None # if at least one tag is present tags__contains: list[ShortStr] | None = None # Project.tags must be a superset of these + mp_category: str | None = None + mp_category__in: list[str] | None = None + mp_category__neq: str | None = None + mp_category__ilike: str | None = None + # fuzzy only long_title__ilike: str | None = None @@ -145,11 +155,25 @@ class Constants(BaseFilter.Constants): model = Project -# Keeping for business logic separation. May have specific implementation later -class ProjectIn(Project): +class ProjectIn(BaseModel): """Representation of user-supplied input.""" - pass + id: ShortStr + title: ShortStr + authors: str + description: str + owner: PrefixedEmail + unique_identifiers: bool + + # Optional + tags: list[ShortStr] | None = None + references: list[Reference] = Field(default_factory=list) + long_title: str | None = None + other: dict[str, Any] = Field(default_factory=dict) + columns: list[Column] = Field(default_factory=list) + license: Literal["CCA4", "CCPD"] | None = None + + initiative: Link[Initiative] | None = None class ProjectPatch(BaseModel): From e3c3f16c27bfe3a304b1fe97101ebc1877505e63 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Fri, 17 Jul 2026 08:54:14 -0700 Subject: [PATCH 476/591] Exclude server-managed fields from patching --- .../domains/projects/repository.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py index 3a403e6f7b..6bd677024a 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py @@ -130,11 +130,11 @@ async def upsert_project_by_id(self, id: str, data: ProjectIn) -> Project: Update the document if the id exists, otherwise insert a new one under that id. - **Existing project:** only its ``owner`` or an admin may overwrite it. The stored - ``owner`` is preserved - ownership cannot be reassigned through the request body. - - **New project:** ``owner`` is forced to the caller, ignoring any body value. - - an existing project keeps its stored approval and a new one starts unapproved. The resulting - document must also satisfy ``is_public ⇒ is_approved``. + ``owner`` and all server-managed fields (see ``Project.server_managed_fields``) are + preserved - ``ProjectIn`` cannot carry them, so a PUT never resets approval, publication, + or stats. + - **New project:** ``owner`` is forced to the caller; server-managed fields keep their + defaults Note: relies on the path param ``id`` for identity, not the body's id. @@ -160,9 +160,9 @@ async def upsert_project_by_id(self, id: str, data: ProjectIn) -> Project: raise PermissionError(required_role="owner-or-admin") # Ownership is immutable via upsert; keep the original owner. project.owner = existing.owner - # Approval is admin-only; a non-admin keeps the project's stored approval state. - if not self._user.is_admin: - project.is_approved = existing.is_approved + # make sure a full replacement doesn't overwrite server-defined fields + for field in self.document_model.server_managed_fields(): + setattr(project, field, getattr(existing, field)) else: # New project: the caller owns it, regardless of the submitted owner. project.owner = self._user.username From 20961e7216834ffff45fdac744ffba955de19c91 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Fri, 17 Jul 2026 08:54:45 -0700 Subject: [PATCH 477/591] Syncing tests with new Project models and methods --- .../db/test_initiatives_service.py | 6 +- .../db/test_project_groups_service.py | 6 +- .../db/test_projects_repository.py | 108 ++++++++++-------- .../tests/integration/test_projects.py | 6 +- .../unit/domains/test_projects_models.py | 18 +-- 5 files changed, 75 insertions(+), 69 deletions(-) diff --git a/mpcontribs-api/tests/integration/db/test_initiatives_service.py b/mpcontribs-api/tests/integration/db/test_initiatives_service.py index cf83f42e53..061f8acad0 100644 --- a/mpcontribs-api/tests/integration/db/test_initiatives_service.py +++ b/mpcontribs-api/tests/integration/db/test_initiatives_service.py @@ -5,7 +5,7 @@ from mpcontribs_api.config import get_settings from mpcontribs_api.domains.initiatives.models import InitiativeIn, InitiativePatch from mpcontribs_api.domains.initiatives.repository import InitiativeRepository -from mpcontribs_api.domains.projects.models import Project, ProjectIn, ProjectPatch, Stats +from mpcontribs_api.domains.projects.models import Project, ProjectIn, ProjectPatch from mpcontribs_api.domains.projects.repository import MongoDbProjectRepository from mpcontribs_api.domains.projects.service import ProjectService from mpcontribs_api.exceptions import ConflictError, NotFoundError, PermissionError @@ -24,7 +24,6 @@ ALICE_EMAIL = "google:alice@example.com" BOB_EMAIL = "google:bob@example.com" CAROL_EMAIL = "google:carol@example.com" -STATS = Stats(columns=0, contributions=0, tables=0, structures=0, attachments=0, size=0.0) def _service(user: User) -> ProjectService: @@ -41,13 +40,12 @@ def _collaborator(slug: str, username: str = BOB_EMAIL) -> User: async def _insert_project(pid: str, owner: str = ALICE_EMAIL) -> Project: return await MongoDbProjectRepository(ADMIN).insert_project( ProjectIn( - _id=pid, + id=pid, title=pid[:30], authors="Author", description="desc", owner=owner, unique_identifiers=True, - stats=STATS, ) ) diff --git a/mpcontribs-api/tests/integration/db/test_project_groups_service.py b/mpcontribs-api/tests/integration/db/test_project_groups_service.py index af7d188f85..4c9d5acb45 100644 --- a/mpcontribs-api/tests/integration/db/test_project_groups_service.py +++ b/mpcontribs-api/tests/integration/db/test_project_groups_service.py @@ -5,7 +5,7 @@ from mpcontribs_api.domains.project_groups.models import ProjectGroup, ProjectGroupIn from mpcontribs_api.domains.project_groups.repository import ProjectGroupRepository from mpcontribs_api.domains.project_groups.service import ProjectGroupService -from mpcontribs_api.domains.projects.models import ProjectIn, Stats +from mpcontribs_api.domains.projects.models import ProjectIn from mpcontribs_api.domains.projects.repository import MongoDbProjectRepository from mpcontribs_api.exceptions import ConflictError, NotFoundError @@ -22,7 +22,6 @@ ALICE_EMAIL = "google:alice@example.com" BOB_EMAIL = "google:bob@example.com" -STATS = Stats(columns=0, contributions=0, tables=0, structures=0, attachments=0, size=0.0) def _service(user: User = ADMIN) -> ProjectGroupService: @@ -31,13 +30,12 @@ def _service(user: User = ADMIN) -> ProjectGroupService: async def _insert_project(pid: str, owner: str = ALICE_EMAIL, **overrides): payload = { - "_id": pid, + "id": pid, "title": pid[:30], "authors": "Author", "description": "desc", "owner": owner, "unique_identifiers": True, - "stats": STATS, } payload.update(overrides) return await MongoDbProjectRepository(ADMIN).insert_project(ProjectIn(**payload)) diff --git a/mpcontribs-api/tests/integration/db/test_projects_repository.py b/mpcontribs-api/tests/integration/db/test_projects_repository.py index f824d01c9e..ece6566b7e 100644 --- a/mpcontribs-api/tests/integration/db/test_projects_repository.py +++ b/mpcontribs-api/tests/integration/db/test_projects_repository.py @@ -16,8 +16,6 @@ # Helpers # --------------------------------------------------------------------------- -STATS = Stats(columns=0, contributions=0, tables=0, structures=0, attachments=0, size=0.0) - ADMIN = User(username="google:admin@example.com", groups=frozenset({"admin"})) ALICE = User(username="google:alice@example.com", groups=frozenset({"mp-team"})) ANON = User() @@ -28,22 +26,36 @@ def _repo(user: User) -> MongoDbProjectRepository: def _project_in(id: str, **overrides) -> ProjectIn: + """Build a user-supplied ``ProjectIn`` (content fields only — no server-managed fields).""" defaults = { - "_id": id, + "id": id, "title": id[:30], "authors": "Test Author", "description": "Test description", "owner": "google:alice@example.com", "unique_identifiers": True, - "stats": STATS, } defaults.update(overrides) return ProjectIn(**defaults) async def _insert(id: str, **overrides) -> Project: - project_in = _project_in(id, **overrides) - return await _repo(ADMIN).insert_project(project_in) + """Seed a Project document directly. + + ``ProjectIn`` no longer carries server-managed fields, so seeding a specific ``is_public`` / + ``is_approved`` / ``stats`` state (as the scope tests need) is done by building the stored + ``Project`` and inserting it, bypassing the input contract. + """ + defaults = { + "_id": id, + "title": id[:30], + "authors": "Test Author", + "description": "Test description", + "owner": "google:alice@example.com", + "unique_identifiers": True, + } + defaults.update(overrides) + return await Project(**defaults).insert() # --------------------------------------------------------------------------- @@ -53,25 +65,22 @@ async def _insert(id: str, **overrides) -> Project: class TestInsertProject: async def test_inserted_project_is_retrievable(self, db): - await _insert("ins-basic") + await _repo(ADMIN).insert_project(_project_in("ins-basic")) found = await Project.find_one(Project.id == "ins-basic") assert found is not None assert found.id == "ins-basic" async def test_duplicate_id_raises_conflict(self, db): - await _insert("ins-dup") + await _repo(ADMIN).insert_project(_project_in("ins-dup")) with pytest.raises(ConflictError): - await _insert("ins-dup") + await _repo(ADMIN).insert_project(_project_in("ins-dup")) - async def test_default_not_public(self, db): - await _insert("ins-priv") + async def test_insert_defaults_private_and_unapproved(self, db): + # ProjectIn carries no is_public/is_approved, so an inserted project is private and unapproved. + await _repo(ADMIN).insert_project(_project_in("ins-priv")) found = await Project.find_one(Project.id == "ins-priv") assert found.is_public is False - - async def test_explicit_public(self, db): - await _insert("ins-pub", is_public=True, is_approved=True) - found = await Project.find_one(Project.id == "ins-pub") - assert found.is_public is True + assert found.is_approved is False # --------------------------------------------------------------------------- @@ -473,7 +482,7 @@ async def test_update_preserves_original_owner(self, db): # --------------------------------------------------------------------------- -# is_approved is admin-only (patch + upsert) +# is_approved is admin-only (via PATCH — ProjectIn cannot carry it) # --------------------------------------------------------------------------- @@ -491,30 +500,9 @@ async def test_admin_can_patch_is_approved(self, db): found = await Project.find_one(Project.id == "appr-patch-admin") assert found.is_approved is True - async def test_non_admin_upsert_new_project_stays_unapproved(self, db): - # Body asks for approval; a non-admin's new project must start unapproved. - data = _project_in("appr-new", owner="google:bob@example.com", is_approved=True) - await _repo(BOB).upsert_project_by_id(id="appr-new", data=data) - found = await Project.find_one(Project.id == "appr-new") - assert found.is_approved is False - - async def test_non_admin_upsert_cannot_change_existing_approval(self, db): - # Admin seeds an approved project; the owner (non-admin) cannot un-approve it via PUT. - await _insert("appr-existing", owner="google:alice@example.com", is_approved=True) - data = _project_in("appr-existing", owner="google:alice@example.com", is_approved=False) - await _repo(ALICE).upsert_project_by_id(id="appr-existing", data=data) - found = await Project.find_one(Project.id == "appr-existing") - assert found.is_approved is True - - async def test_admin_upsert_can_approve(self, db): - data = _project_in("appr-admin-new", is_approved=True) - await _repo(ADMIN).upsert_project_by_id(id="appr-admin-new", data=data) - found = await Project.find_one(Project.id == "appr-admin-new") - assert found.is_approved is True - # --------------------------------------------------------------------------- -# a project cannot be public unless approved +# a project cannot be public unless approved (enforced on PATCH) # --------------------------------------------------------------------------- @@ -541,16 +529,38 @@ async def test_patch_public_on_approved_succeeds(self, db): found = await Project.find_one(Project.id == "pub-approved") assert found.is_public is True - async def test_upsert_public_unapproved_rejected(self, db): - # A non-admin's public+approved body is coerced to unapproved, which then violates the invariant. - data = _project_in("pub-upsert", owner="google:bob@example.com", is_public=True, is_approved=True) - with pytest.raises(ValidationError, match="approved"): - await _repo(BOB).upsert_project_by_id(id="pub-upsert", data=data) - assert await Project.find_one(Project.id == "pub-upsert") is None - async def test_admin_upsert_public_approved_succeeds(self, db): - data = _project_in("pub-upsert-admin", is_public=True, is_approved=True) - await _repo(ADMIN).upsert_project_by_id(id="pub-upsert-admin", data=data) - found = await Project.find_one(Project.id == "pub-upsert-admin") +# --------------------------------------------------------------------------- +# upsert (PUT) cannot set server-managed fields; it preserves them on update +# --------------------------------------------------------------------------- + + +class TestUpsertServerManagedFields: + async def test_new_project_is_private_and_unapproved(self, db): + # ProjectIn has no is_public/is_approved, so a new PUT project starts safe by default. + await _repo(BOB).upsert_project_by_id(id="srv-new", data=_project_in("srv-new")) + found = await Project.find_one(Project.id == "srv-new") + assert found.is_public is False + assert found.is_approved is False + + async def test_admin_upsert_cannot_approve_via_body(self, db): + # Approval is PATCH-only even for an admin; a PUT can never approve a project. + await _repo(ADMIN).upsert_project_by_id(id="srv-admin-new", data=_project_in("srv-admin-new")) + found = await Project.find_one(Project.id == "srv-admin-new") + assert found.is_approved is False + + async def test_update_preserves_public_and_approved(self, db): + # A full-replace PUT by the owner must not wipe server-managed publication/approval. + await _insert("srv-preserve", owner="google:alice@example.com", is_public=True, is_approved=True) + data = _project_in("srv-preserve", owner="google:alice@example.com", title="Renamed Title") + await _repo(ALICE).upsert_project_by_id(id="srv-preserve", data=data) + found = await Project.find_one(Project.id == "srv-preserve") + assert found.title == "Renamed Title" # content fields still update assert found.is_public is True assert found.is_approved is True + + async def test_update_preserves_stats(self, db): + await _insert("srv-stats", owner="google:alice@example.com", stats=Stats(contributions=7)) + await _repo(ALICE).upsert_project_by_id(id="srv-stats", data=_project_in("srv-stats")) + found = await Project.find_one(Project.id == "srv-stats") + assert found.stats.contributions == 7 diff --git a/mpcontribs-api/tests/integration/test_projects.py b/mpcontribs-api/tests/integration/test_projects.py index a7ff999b55..e5fcf39a19 100644 --- a/mpcontribs-api/tests/integration/test_projects.py +++ b/mpcontribs-api/tests/integration/test_projects.py @@ -244,13 +244,12 @@ def test_id_forwarded_to_repo(self, client, project_repo): class TestUpsertProject: def _valid_body(self, **overrides): body = { - "_id": "mp-sample", + "id": "mp-sample", "title": "Test Project", "authors": "Alice", "description": "A project", "owner": "google:alice@example.com", "unique_identifiers": True, - "stats": {"columns": 0, "contributions": 0, "tables": 0, "structures": 0, "attachments": 0, "size": 0.0}, } body.update(overrides) return body @@ -280,13 +279,12 @@ def test_missing_required_field_returns_422(self, client, project_repo): class TestProjectMutationsRequireAuth: def _body(self): return { - "_id": "mp-sample", + "id": "mp-sample", "title": "Test Project", "authors": "Alice", "description": "A project", "owner": "google:alice@example.com", "unique_identifiers": True, - "stats": {"columns": 0, "contributions": 0, "tables": 0, "structures": 0, "attachments": 0, "size": 0.0}, } def test_anonymous_put_returns_401(self, client, project_repo): diff --git a/mpcontribs-api/tests/unit/domains/test_projects_models.py b/mpcontribs-api/tests/unit/domains/test_projects_models.py index b874091e73..70f1cab883 100644 --- a/mpcontribs-api/tests/unit/domains/test_projects_models.py +++ b/mpcontribs-api/tests/unit/domains/test_projects_models.py @@ -59,9 +59,15 @@ def test_zero_values_allowed(self): stats = Stats(columns=0, contributions=0, tables=0, structures=0, attachments=0, size=0.0) assert stats.contributions == 0 - def test_missing_field_raises(self): - with pytest.raises(PydanticValidationError): - Stats(columns=1, contributions=2, tables=3, structures=4, attachments=5) # missing size + def test_fields_default_to_zero(self): + # Stats is server-computed and every field defaults to zero, so an empty Stats is valid. + stats = Stats() + assert stats.columns == 0 + assert stats.contributions == 0 + assert stats.tables == 0 + assert stats.structures == 0 + assert stats.attachments == 0 + assert stats.size == 0.0 # --------------------------------------------------------------------------- @@ -196,19 +202,15 @@ def test_invalid_license_raises(self): # --------------------------------------------------------------------------- -VALID_STATS = Stats(columns=0, contributions=0, tables=0, structures=0, attachments=0, size=0.0) - - class TestProjectFromInputModel: def _make_input(self, **overrides): defaults = { - "_id": "test-proj", + "id": "test-proj", "title": "Test Project", "authors": "Alice, Bob", "description": "A test project", "owner": "google:alice@example.com", "unique_identifiers": True, - "stats": VALID_STATS, } defaults.update(overrides) return ProjectIn(**defaults) From 975fe9db8c060cdb86505b83d81d436ca3782f41 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Fri, 17 Jul 2026 10:42:36 -0700 Subject: [PATCH 478/591] Switched tags to be SearchStr to improve usability --- .../mpcontribs_api/domains/projects/models.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py index fe03054ee4..08d1e08b5e 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py @@ -8,7 +8,7 @@ from mpcontribs_api import pagination from mpcontribs_api.domains._shared.filters import BaseFilter from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut -from mpcontribs_api.domains._shared.types import PrefixedEmail, ShortStr +from mpcontribs_api.domains._shared.types import PrefixedEmail, SearchStr, ShortStr from mpcontribs_api.domains.initiatives.models import Initiative @@ -53,7 +53,7 @@ class Project(BaseDocumentWithInput[ShortStr]): # Optional stats: Stats = Field(default_factory=Stats) - tags: list[ShortStr] | None = None + tags: list[SearchStr] | None = None mp_category: str | None = None references: list[Reference] = Field(default_factory=list) long_title: str | None = None @@ -93,7 +93,7 @@ class ProjectOut(DocumentOut[ShortStr]): authors: str | None = None description: str | None = None title: ShortStr | None = None - tags: list[ShortStr] | None = None + tags: list[SearchStr] | None = None mp_category: str | None = None owner: PrefixedEmail | None = None other: dict[str, Any] | None = None @@ -129,9 +129,9 @@ class ProjectFilter(BaseFilter): owner__neq: PrefixedEmail | None = None owner__ilike: str | None = None - tags: list[ShortStr] | None = None # exact match of list - tags__in: list[ShortStr] | None = None # if at least one tag is present - tags__contains: list[ShortStr] | None = None # Project.tags must be a superset of these + tags: list[SearchStr] | None = None # exact match of list + tags__in: list[SearchStr] | None = None # if at least one tag is present + tags__contains: list[SearchStr] | None = None # Project.tags must be a superset of these mp_category: str | None = None mp_category__in: list[str] | None = None @@ -166,7 +166,7 @@ class ProjectIn(BaseModel): unique_identifiers: bool # Optional - tags: list[ShortStr] | None = None + tags: list[SearchStr] | None = None references: list[Reference] = Field(default_factory=list) long_title: str | None = None other: dict[str, Any] = Field(default_factory=dict) @@ -182,7 +182,7 @@ class ProjectPatch(BaseModel): title: ShortStr | None = None authors: str | None = None description: str | None = None - tags: list[ShortStr] | None = None + tags: list[SearchStr] | None = None owner: PrefixedEmail | None = None unique_identifiers: bool | None = None references: list[Reference] = Field(default_factory=list) From 22207a9503efa822e8bc139c9254d5c1a96648d9 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Fri, 17 Jul 2026 10:43:46 -0700 Subject: [PATCH 479/591] Tests for tags as SearchStr --- .../unit/domains/test_search_str_tags.py | 128 ++++++++++++++++++ 1 file changed, 128 insertions(+) create mode 100644 mpcontribs-api/tests/unit/domains/test_search_str_tags.py diff --git a/mpcontribs-api/tests/unit/domains/test_search_str_tags.py b/mpcontribs-api/tests/unit/domains/test_search_str_tags.py new file mode 100644 index 0000000000..01ae17359d --- /dev/null +++ b/mpcontribs-api/tests/unit/domains/test_search_str_tags.py @@ -0,0 +1,128 @@ +"""Fuzz the ``SearchStr`` normalizer behind ``tags`` (and the other places it is reused). + +``tags`` is ``list[SearchStr]`` on ``ProjectIn`` / ``ProjectOut`` / ``ProjectPatch`` and on every +``ProjectFilter`` operator (``tags`` / ``tags__in`` / ``tags__contains``); ``SearchStr`` also backs +other fields such as ``ProjectGroupFilter.name``. ``SearchStr`` runs ``_nfkc_casefold`` — NFKC +compatibility fold, whitespace strip, then casefold — so a stored tag and a query tag always +collapse to the same bytes. These tests hit the tricky unicode edges and prove the normalizer is +applied identically wherever it is declared. + +All non-ASCII codepoints use ``\\u`` escapes so the source is unambiguous byte-for-byte. +""" + +import random + +import pytest +from pydantic import TypeAdapter + +from mpcontribs_api.domains._shared.types import SearchStr +from mpcontribs_api.domains.project_groups.models import ProjectGroupFilter +from mpcontribs_api.domains.projects.models import ProjectFilter, ProjectIn, ProjectPatch + +_search = TypeAdapter(SearchStr) + + +# (id, raw, expected) — each row targets a distinct edge of NFKC + strip + casefold. +_CASES = [ + ("ascii_casefold", "BandGap", "bandgap"), + ("hyphen_preserved", "Band-Gap", "band-gap"), # SearchStr does not strip punctuation + ("eszett_grows_length", "Straße", "strasse"), # U+00DF casefolds to "ss" (grows length) + ("greek_final_sigma", "ΟΔΟΣ", "οδοσ"), # Σ -> σ (not ς) + ("ligature_fi", "file", "file"), # NFKC decomposes the fi ligature + ("micro_sign_to_mu", "µ", "μ"), # MICRO SIGN -> GREEK SMALL LETTER MU + ("kelvin_sign", "K", "k"), # KELVIN SIGN -> latin k + ("fullwidth_to_ascii", "ＡＢ", "ab"), # fullwidth A B -> ascii + ("superscript_digit", "m²", "m2"), # m² -> m2 + ("combining_composes", "é", "é"), # e + COMBINING ACUTE -> precomposed é + ("roman_numeral", "Ⅷ", "viii"), # ROMAN NUMERAL EIGHT -> viii + ("nbsp_trimmed", " tag ", "tag"), # NBSP folds to space, then strip + ("mixed_whitespace_trimmed", " Tag\n", "tag"), + ("turkish_dotted_I", "İ", "i̇"), # İ casefolds to i + COMBINING DOT ABOVE + ("empty_after_strip", " ", ""), # no min length: whitespace-only -> "" +] + + +@pytest.mark.parametrize("raw,expected", [(r, e) for _, r, e in _CASES], ids=[i for i, _, _ in _CASES]) +def test_searchstr_normalization(raw, expected): + out = _search.validate_python(raw) + assert out == expected + # every realistic tag must be a stable key: re-folding it changes nothing + assert _search.validate_python(out) == out + + +def test_searchstr_fuzz_output_is_stripped_and_casefolded(): + """Whatever the input's unicode form, the output is always trimmed and fully casefolded. + + These are the invariants that hold universally. Idempotency does *not* hold for every input -- + see ``test_searchstr_casefold_expansion_breaks_idempotency`` -- so it is asserted only for the + realistic cases above, not fuzzed here. + + Seeded so the run is deterministic. Draws from ranges that break naive normalizers (latin-1 + supplement, combining marks, greek, fullwidth, ligatures, roman numerals, and whitespace). + """ + rng = random.Random(1729) + pool = ( + [chr(c) for c in range(0x20, 0x7F)] # ascii printable + + [chr(c) for c in range(0xA0, 0x100)] # latin-1 supplement (µ, ß, é, NBSP, ...) + + [chr(c) for c in range(0x300, 0x370)] # combining marks + + [chr(c) for c in range(0x391, 0x3CA)] # greek letters + + [chr(c) for c in range(0xFF01, 0xFF5F)] # fullwidth forms + + [chr(c) for c in range(0xFB00, 0xFB07)] # latin ligatures + + [chr(c) for c in range(0x2160, 0x2180)] # roman numerals + + ["\t", "\n", "\r", "\x20", " ", " "] # tab/nl/cr/space/NBSP/em-space + ) + for _ in range(2000): + raw = "".join(rng.choice(pool) for _ in range(rng.randint(0, 8))) + out = _search.validate_python(raw) + assert out == out.strip(), f"leaked surrounding whitespace for {raw!r}" + assert out == out.casefold(), f"not casefold-stable for {raw!r}" + + +# ligature + uppercase + trailing NBSP -> "file": exercises fold, casefold, and trim at once. +_MESSY_TAG = " fiLE " + +_TAG_FIELD_EXTRACTORS = [ + ( + "project_in_tags", + lambda t: ProjectIn( + id="proj-x", + title="title-x", + authors="a", + description="d", + owner="google:a@b.com", + unique_identifiers=True, + tags=[t], + ).tags, + ), + ("project_patch_tags", lambda t: ProjectPatch(tags=[t]).tags), + ("filter_tags", lambda t: ProjectFilter(tags=[t]).tags), + ("filter_tags__in", lambda t: ProjectFilter(tags__in=[t]).tags__in), + ("filter_tags__contains", lambda t: ProjectFilter(tags__contains=[t]).tags__contains), + # "etc.": the same SearchStr normalizer, reused on a non-tag list field on another model. + ("project_group_filter_name__in", lambda t: ProjectGroupFilter(name__in=[t]).name__in), +] + + +@pytest.mark.parametrize( + "extract", [e for _, e in _TAG_FIELD_EXTRACTORS], ids=[i for i, _ in _TAG_FIELD_EXTRACTORS] +) +def test_searchstr_normalized_across_models(extract): + assert extract(_MESSY_TAG) == ["file"] + + +@pytest.mark.xfail( + strict=True, + reason="_nfkc_casefold is not idempotent when casefold expands a char sitting before a combining mark", +) +def test_searchstr_casefold_expansion_breaks_idempotency(): + """Documents a real edge: a casefold-expanding char (ß -> ss) followed by a combining mark. + + NFKC runs before casefold, so ``ß`` + combining circumflex stays decomposed through the first + fold (-> ``ss`` + circumflex). Re-folding then NFKC-composes ``s`` + circumflex into ``ŝ``, so + the value is not stable under a second pass. Because ``ProjectOut.tags`` is also + ``list[SearchStr]``, a stored tag re-normalizes on read and can round-trip to a different + string. xfail(strict) so this flips to a failure the moment the normalizer is made idempotent + (e.g. a trailing NFKC pass after casefold). + """ + once = _search.validate_python("ß̂") # eszett + COMBINING CIRCUMFLEX ACCENT + assert _search.validate_python(once) == once From fbe2a5e78f3557ae0720f3566f60a0b690c3fcc7 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Fri, 17 Jul 2026 10:44:06 -0700 Subject: [PATCH 480/591] Fixed bug in role parsing resulting in improper roles --- mpcontribs-api/src/mpcontribs_api/authz.py | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/authz.py b/mpcontribs-api/src/mpcontribs_api/authz.py index 99d6713ace..3dfc72b0b9 100644 --- a/mpcontribs-api/src/mpcontribs_api/authz.py +++ b/mpcontribs-api/src/mpcontribs_api/authz.py @@ -39,6 +39,10 @@ # prefix for project-group roles: a group's _id (an ObjectId hex string) is granted as ``project-group:`` PROJECT_GROUP_ROLE_PREFIX = "project-group:" +# A role carrying one of these prefixes is scoped to a non-project resource; a role with none of +# them is a bare project id. +_RESOURCE_ROLE_PREFIXES = (INITIATIVE_ROLE_PREFIX, PROJECT_GROUP_ROLE_PREFIX) + class User(BaseModel): """User definition derived from request headers. @@ -72,9 +76,12 @@ def is_admin(self) -> bool: @property def project_roles(self) -> list[str]: - return [ - role[len(INITIATIVE_ROLE_PREFIX) :] for role in self.groups if not role.startswith(INITIATIVE_ROLE_PREFIX) - ] + """The project ids this user carries, from their bare (unprefixed) roles. + + Resource-scoped roles (``initiative:``, ``project-group:``) and the admin sentinel are + excluded, leaving only bare project ids. + """ + return [role for role in self.groups if role != ADMIN_GROUP and not role.startswith(_RESOURCE_ROLE_PREFIXES)] @property def initiative_roles(self) -> list[str]: @@ -96,7 +103,7 @@ def has_role(self, role: str, *, resource: str | None = None) -> bool: Specifying resource as: - ``INITIATIVE_ROLE_PREFIX`` looks for roles scoped to initiatives - - "project" looks for roles scoped to projects (no actual prefix implementation yet) + - "project" looks for bare (unprefixed) project roles - None looks for roles by matching the entire string """ if resource == INITIATIVE_ROLE_PREFIX[:-1]: @@ -110,8 +117,9 @@ def writable_projects(self) -> frozenset[str]: """Projects this user may write to. Admins are unbounded (handled by can_write)""" if self.is_anonymous: return frozenset() - # exclude the admin sentinel so it never leaks into a $in / membership test - return frozenset(g for g in self.groups if g != ADMIN_GROUP) + # only bare project roles are writable projects; the admin sentinel and resource-scoped + # roles (initiative:/project-group:) must never leak into a $in / membership test + return frozenset(self.project_roles) def can_manage(self, id: str, resource: str) -> bool: """Determines whether a user can manage a resource. From 47eec4f2f07411a2a9394b25c0a2140f75bbbcc9 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Fri, 17 Jul 2026 10:45:40 -0700 Subject: [PATCH 481/591] Removed requirements/ --- mpcontribs-api/requirements/deployment.txt | 551 --------------------- 1 file changed, 551 deletions(-) delete mode 100644 mpcontribs-api/requirements/deployment.txt diff --git a/mpcontribs-api/requirements/deployment.txt b/mpcontribs-api/requirements/deployment.txt deleted file mode 100644 index 7056ece33a..0000000000 --- a/mpcontribs-api/requirements/deployment.txt +++ /dev/null @@ -1,551 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.11 -# by the following command: -# -# pip-compile --output-file=MPContribs/mpcontribs-api/requirements/deployment.txt MPContribs/mpcontribs-api/pyproject.toml python/requirements.txt -# -anyio==4.13.0 - # via jupyter-server -apispec==5.2.2 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -argon2-cffi==25.1.0 - # via - # jupyter-server - # notebook -argon2-cffi-bindings==25.1.0 - # via argon2-cffi -arrow==1.4.0 - # via isoduration -asn1crypto==1.5.1 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -asttokens==3.0.1 - # via stack-data -atlasq-tschaume==0.11.1.dev2 - # via flask-mongorest-mpcontribs -attrs==26.1.0 - # via - # jsonschema - # referencing -backports-zstd==1.5.0 - # via flask-compress -beautifulsoup4==4.14.3 - # via nbconvert -bibtexparser==1.4.4 - # via pymatgen-core -bleach[css]==6.3.0 - # via nbconvert -blinker==1.9.0 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -boltons==25.0.0 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -boto3==1.43.19 - # via flask-mongorest-mpcontribs -botocore==1.43.19 - # via - # boto3 - # s3transfer -brotli==1.2.0 - # via flask-compress -bytecode==0.17.0 - # via ddtrace -certifi==2026.5.20 - # via requests -cffi==2.0.0 - # via - # argon2-cffi-bindings - # cryptography -charset-normalizer==3.4.7 - # via requests -click==8.4.1 - # via - # flask - # rq -comm==0.2.3 - # via ipykernel -contourpy==1.3.3 - # via matplotlib -cramjam==2.11.0 - # via python-snappy -crontab==1.0.5 - # via rq-scheduler -cryptography==48.0.0 - # via pyopenssl -css-html-js-minify==2.5.5 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -cycler==0.12.1 - # via matplotlib -dateparser==1.4.0 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -ddtrace==4.3.0 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -debugpy==1.8.21 - # via ipykernel -decorator==5.3.1 - # via ipython -defusedxml==0.7.1 - # via nbconvert -dnspython==2.8.0 - # via - # mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) - # pymongo -entrypoints==0.4 - # via jupyter-client -envier==0.6.1 - # via ddtrace -executing==2.2.1 - # via stack-data -fastjsonschema==2.21.2 - # via nbformat -fastnumbers==5.1.1 - # via flask-mongorest-mpcontribs -filetype==1.2.0 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -flasgger-tschaume==0.9.7 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -flask==2.2.5 - # via - # flasgger-tschaume - # flask-compress - # flask-marshmallow - # flask-mongoengine-tschaume - # flask-rq2 - # flask-sse -flask-compress==1.24 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -flask-marshmallow==1.4.0 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -flask-mongoengine-tschaume==1.1.0 - # via flask-mongorest-mpcontribs -flask-mongorest-mpcontribs==3.3.0 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -flask-rq2==18.3 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -flask-sse==1.0.0 - # via flask-mongorest-mpcontribs -flatten-dict==0.5.0 - # via flask-mongorest-mpcontribs -flexcache==0.3 - # via pint -flexparser==0.4 - # via pint -fonttools==4.63.0 - # via matplotlib -fqdn==1.5.1 - # via jsonschema -freezegun==1.5.5 - # via rq-scheduler -gevent==26.5.0 - # via gunicorn -greenlet==3.5.1 - # via gevent -gunicorn[gevent]==24.1.1 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -idna==3.17 - # via - # anyio - # jsonschema - # requests -ipykernel==6.29.5 - # via - # nbclassic - # notebook -ipython==9.14.0 - # via ipykernel -ipython-genutils==0.2.0 - # via - # nbclassic - # notebook -ipython-pygments-lexers==1.1.1 - # via ipython -isoduration==20.11.0 - # via jsonschema -itsdangerous==2.2.0 - # via flask -jedi==0.20.0 - # via ipython -jinja2==3.1.6 - # via - # flask - # jupyter-server - # mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) - # nbconvert - # notebook -jmespath==1.1.0 - # via - # boto3 - # botocore -joblib==1.5.3 - # via pymatgen-core -json2html==1.3.0 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -jsonpointer==3.1.1 - # via jsonschema -jsonschema[format-nongpl]==4.26.0 - # via - # flasgger-tschaume - # jupyter-events - # nbformat -jsonschema-specifications==2025.9.1 - # via jsonschema -jupyter-client==7.4.9 - # via - # ipykernel - # jupyter-server - # nbclient - # notebook -jupyter-core==5.9.1 - # via - # ipykernel - # jupyter-client - # jupyter-server - # nbclient - # nbconvert - # nbformat - # notebook -jupyter-events==0.12.1 - # via jupyter-server -jupyter-server==2.19.0 - # via notebook-shim -jupyter-server-terminals==0.5.4 - # via jupyter-server -jupyterlab-pygments==0.3.0 - # via nbconvert -kiwisolver==1.5.0 - # via matplotlib -lark==1.3.1 - # via rfc3987-syntax -lxml==6.1.1 - # via pymatgen-core -markupsafe==3.0.3 - # via - # jinja2 - # nbconvert - # werkzeug -marshmallow==3.26.2 - # via - # flask-marshmallow - # marshmallow-mongoengine - # mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -marshmallow-mongoengine==0.31.2 - # via flask-mongorest-mpcontribs -matplotlib==3.10.9 - # via - # -r python/requirements.txt - # pymatgen-core -matplotlib-inline==0.2.2 - # via - # ipykernel - # ipython -mimerender-pr36==0.0.2 - # via flask-mongorest-mpcontribs -mistune==3.2.1 - # via - # flasgger-tschaume - # nbconvert -mongoengine==0.29.3 - # via - # atlasq-tschaume - # flask-mongoengine-tschaume - # marshmallow-mongoengine -monty==2026.5.18 - # via pymatgen-core -more-itertools==11.1.0 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -mpmath==1.3.0 - # via sympy -narwhals==2.22.0 - # via plotly -nbclassic==1.3.3 - # via notebook -nbclient==0.10.4 - # via nbconvert -nbconvert==7.17.1 - # via - # jupyter-server - # notebook -nbformat==5.10.4 - # via - # jupyter-server - # mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) - # nbclient - # nbconvert - # notebook -nest-asyncio==1.6.0 - # via - # ipykernel - # jupyter-client - # nbclassic - # notebook -networkx==3.6.1 - # via pymatgen-core -notebook==6.5.7 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -notebook-shim==0.2.4 - # via nbclassic -numpy==2.4.6 - # via - # -r python/requirements.txt - # contourpy - # matplotlib - # monty - # mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) - # pandas - # pymatgen-core - # scipy - # spglib -opentelemetry-api==1.42.1 - # via ddtrace -orjson==3.11.9 - # via - # flask-mongorest-mpcontribs - # pymatgen-core -overrides==7.7.0 - # via jupyter-server -packaging==26.2 - # via - # gunicorn - # ipykernel - # jupyter-events - # jupyter-server - # marshmallow - # matplotlib - # nbconvert - # plotly -palettable==3.3.3 - # via pymatgen-core -pandas==3.0.3 - # via - # -r python/requirements.txt - # pymatgen-core -pandocfilters==1.5.1 - # via nbconvert -parso==0.8.7 - # via jedi -pexpect==4.9.0 - # via ipython -pillow==12.2.0 - # via matplotlib -pint==0.25.3 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -platformdirs==4.10.0 - # via - # jupyter-core - # pint -plotly==6.7.0 - # via pymatgen-core -prometheus-client==0.25.0 - # via - # jupyter-server - # notebook -prompt-toolkit==3.0.52 - # via ipython -psutil==7.2.2 - # via - # ipykernel - # ipython -psycopg2-binary==2.9.12 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -ptyprocess==0.7.0 - # via - # pexpect - # terminado -pure-eval==0.2.3 - # via stack-data -pycparser==3.0 - # via cffi -pygments==2.20.0 - # via - # ipython - # ipython-pygments-lexers - # nbconvert -pymatgen==2026.5.4 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -pymatgen-core==2026.5.18 - # via pymatgen -pymongo==4.17.0 - # via - # flask-mongorest-mpcontribs - # mongoengine -pyopenssl==26.2.0 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -pyparsing==3.3.2 - # via - # bibtexparser - # matplotlib -python-dateutil==2.9.0.post0 - # via - # arrow - # botocore - # dateparser - # flask-mongorest-mpcontribs - # freezegun - # jupyter-client - # matplotlib - # pandas - # rq-scheduler -python-json-logger==4.1.0 - # via jupyter-events -python-mimeparse==2.0.0 - # via mimerender-pr36 -python-snappy==0.7.3 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -pytz==2026.2 - # via dateparser -pyyaml==6.0.3 - # via - # flasgger-tschaume - # jupyter-events -pyzmq==27.1.0 - # via - # ipykernel - # jupyter-client - # jupyter-server - # notebook -redis==8.0.0 - # via - # flask-rq2 - # flask-sse - # rq -referencing==0.37.0 - # via - # jsonschema - # jsonschema-specifications - # jupyter-events -regex==2026.5.9 - # via dateparser -requests==2.34.2 - # via - # atlasq-tschaume - # pymatgen-core -rfc3339-validator==0.1.4 - # via - # jsonschema - # jupyter-events -rfc3986-validator==0.1.1 - # via - # jsonschema - # jupyter-events -rfc3987-syntax==1.1.0 - # via jsonschema -rpds-py==2026.5.1 - # via - # jsonschema - # referencing -rq==2.3.2 - # via - # flask-rq2 - # mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) - # rq-scheduler -rq-scheduler==0.14.0 - # via flask-rq2 -ruamel-yaml==0.19.1 - # via monty -s3transfer==0.18.0 - # via boto3 -scipy==1.17.1 - # via - # -r python/requirements.txt - # pymatgen-core -send2trash==2.1.0 - # via - # jupyter-server - # notebook -setproctitle==1.3.7 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -six==1.17.0 - # via - # flasgger-tschaume - # flask-sse - # python-dateutil - # rfc3339-validator -soupsieve==2.8.4 - # via beautifulsoup4 -spglib==2.7.0 - # via pymatgen-core -stack-data==0.6.3 - # via ipython -supervisor==4.3.0 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -sympy==1.14.0 - # via pymatgen-core -tabulate==0.10.0 - # via pymatgen-core -terminado==0.18.1 - # via - # jupyter-server - # jupyter-server-terminals - # notebook -tinycss2==1.4.0 - # via bleach -tornado==6.5.6 - # via - # ipykernel - # jupyter-client - # jupyter-server - # notebook - # terminado -tqdm==4.67.3 - # via pymatgen-core -traitlets==5.15.0 - # via - # ipykernel - # ipython - # jupyter-client - # jupyter-core - # jupyter-events - # jupyter-server - # matplotlib-inline - # nbclient - # nbconvert - # nbformat - # notebook -typing-extensions==4.15.0 - # via - # anyio - # beautifulsoup4 - # flexcache - # flexparser - # ipython - # opentelemetry-api - # pint - # pyopenssl - # referencing - # spglib -tzdata==2026.2 - # via arrow -tzlocal==5.3.1 - # via dateparser -uncertainties==3.2.3 - # via - # mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) - # pymatgen-core -uri-template==1.3.0 - # via jsonschema -urllib3==2.7.0 - # via - # botocore - # requests -wcwidth==0.7.0 - # via prompt-toolkit -webcolors==25.10.0 - # via jsonschema -webencodings==0.5.1 - # via - # bleach - # tinycss2 -websocket-client==1.9.0 - # via - # jupyter-server - # mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -werkzeug==3.1.8 - # via - # flasgger-tschaume - # flask -wrapt==2.2.1 - # via ddtrace -zope-event==6.2 - # via gevent -zope-interface==8.5 - # via gevent -zstandard==0.25.0 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) From e6a648bc9ca1d5550a0deb210415be2eefcb717e Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Fri, 17 Jul 2026 10:52:18 -0700 Subject: [PATCH 482/591] Undid non-mpcontribs-api changes --- mpcontribs-ingester/mpcontribs/ingester/cli.py | 4 +--- mpcontribs-ingester/mpcontribs/ingester/webui.py | 11 ++--------- mpcontribs-kernel-gateway/make_seed.py | 1 + mpcontribs-lux/mpcontribs/lux/autogen.py | 2 +- .../tests/projects/esoteric_ephemera/test_schemas.py | 1 + mpcontribs-portal/mpcontribs/portal/views.py | 2 ++ .../mpcontribs/users/als_beamline/scripts/__main__.py | 3 +-- .../users/als_beamline/scripts/translate_PyPt.py | 3 +++ .../users/dilute_solute_diffusion/pre_submission.py | 6 ++---- .../mpcontribs/users/qmcdb/main/views.py | 5 ++++- .../mpcontribs/users/qmcdb/records/views.py | 7 ++++++- .../users/redox_thermo_csp/pre_submission.py | 9 ++++----- .../users/redox_thermo_csp/update_energy_data.py | 3 ++- .../users/screening_inorganic_pv/pre_submission.py | 7 +++---- .../mpcontribs/users/swf/pre_submission.py | 2 ++ mpcontribs-portal/mpcontribs/users/utils.py | 3 +-- .../contribs.materialsproject.org/2dmatpedia.ipynb | 5 ++--- .../contribs.materialsproject.org/ExpXAS.ipynb | 3 ++- .../contribs.materialsproject.org/HFP2023.ipynb | 3 +++ .../MnO2_phase_selection.ipynb | 3 +-- .../carrier_transport.ipynb | 6 +++--- .../dilute_solute_diffusion.ipynb | 6 ++---- .../experimental_thermo.ipynb | 2 ++ .../experimental_thermoelectrics.ipynb | 2 +- .../ferroelectrics.ipynb | 7 ++++--- .../contribs.materialsproject.org/ion_ref_data.ipynb | 2 +- .../contribs.materialsproject.org/jarvis_dft.ipynb | 4 +--- .../contribs.materialsproject.org/matscholar.ipynb | 3 ++- .../contribs.materialsproject.org/mofexplorer.ipynb | 2 +- .../ocp/ocp-upload.ipynb | 1 + .../open_catalyst_project.ipynb | 4 +++- .../perovskites_diffusion.ipynb | 4 ++-- .../pydatarecognition.ipynb | 4 +++- .../screening_inorganic_pv.ipynb | 2 +- .../silicon_defects.ipynb | 4 ++-- .../springer_materials.ipynb | 2 +- .../transparent_conductors.ipynb | 1 + .../get_started.ipynb | 5 ++++- .../ml.materialsproject.org/get_started.ipynb | 4 +--- mpcontribs-portal/wsgi.py | 1 + mpcontribs-serverless/make_download/app.py | 1 + 41 files changed, 82 insertions(+), 68 deletions(-) diff --git a/mpcontribs-ingester/mpcontribs/ingester/cli.py b/mpcontribs-ingester/mpcontribs/ingester/cli.py index 53267ef457..53965cc507 100644 --- a/mpcontribs-ingester/mpcontribs/ingester/cli.py +++ b/mpcontribs-ingester/mpcontribs/ingester/cli.py @@ -1,8 +1,6 @@ # -*- coding: utf-8 -*- # http://flask.pocoo.org/docs/0.10/patterns/appdispatch/ -import os -import argparse -import string +import os, argparse, string from werkzeug.serving import run_simple from werkzeug.wsgi import DispatcherMiddleware, SharedDataMiddleware from flask import Flask diff --git a/mpcontribs-ingester/mpcontribs/ingester/webui.py b/mpcontribs-ingester/mpcontribs/ingester/webui.py index c0b4debe56..5d4f711563 100644 --- a/mpcontribs-ingester/mpcontribs/ingester/webui.py +++ b/mpcontribs-ingester/mpcontribs/ingester/webui.py @@ -1,14 +1,7 @@ from __future__ import unicode_literals, print_function, absolute_import -import json -import os -import socket -import codecs -import time -import psutil -import sys -import warnings -import multiprocessing +import json, os, socket, codecs, time, psutil +import sys, warnings, multiprocessing from tempfile import gettempdir from flask import render_template, request, Response, Blueprint, current_app from flask import url_for, redirect, make_response, stream_with_context, jsonify diff --git a/mpcontribs-kernel-gateway/make_seed.py b/mpcontribs-kernel-gateway/make_seed.py index 28aa21e0d1..f92a5df7c9 100644 --- a/mpcontribs-kernel-gateway/make_seed.py +++ b/mpcontribs-kernel-gateway/make_seed.py @@ -1,4 +1,5 @@ # -*- coding: utf-8 -*- +import ddtrace.auto import nbformat as nbf nb = nbf.v4.new_notebook() diff --git a/mpcontribs-lux/mpcontribs/lux/autogen.py b/mpcontribs-lux/mpcontribs/lux/autogen.py index 95d6255663..aeee406c21 100644 --- a/mpcontribs-lux/mpcontribs/lux/autogen.py +++ b/mpcontribs-lux/mpcontribs/lux/autogen.py @@ -100,7 +100,7 @@ def pydantic_model(self) -> Type[BaseModel]: self.file_name, orient=orient, lines=self.fmt == "jsonl" ) break - except Exception: + except Exception as exc: continue else: raise ValueError( diff --git a/mpcontribs-lux/tests/projects/esoteric_ephemera/test_schemas.py b/mpcontribs-lux/tests/projects/esoteric_ephemera/test_schemas.py index 0d74c5213c..70b6ec8019 100644 --- a/mpcontribs-lux/tests/projects/esoteric_ephemera/test_schemas.py +++ b/mpcontribs-lux/tests/projects/esoteric_ephemera/test_schemas.py @@ -2,6 +2,7 @@ import gzip import json +from pathlib import Path import numpy as np import pytest diff --git a/mpcontribs-portal/mpcontribs/portal/views.py b/mpcontribs-portal/mpcontribs/portal/views.py index ad2c12c1e0..566a6b6542 100644 --- a/mpcontribs-portal/mpcontribs/portal/views.py +++ b/mpcontribs-portal/mpcontribs/portal/views.py @@ -12,6 +12,8 @@ from redis import Redis from io import BytesIO from copy import deepcopy +from pathlib import Path +from shutil import make_archive, rmtree from nbconvert import HTMLExporter from bravado.exception import HTTPNotFound from json2html import Json2Html diff --git a/mpcontribs-portal/mpcontribs/users/als_beamline/scripts/__main__.py b/mpcontribs-portal/mpcontribs/users/als_beamline/scripts/__main__.py index 4fc72ada4a..bcd0122bda 100644 --- a/mpcontribs-portal/mpcontribs/users/als_beamline/scripts/__main__.py +++ b/mpcontribs-portal/mpcontribs/users/als_beamline/scripts/__main__.py @@ -1,5 +1,4 @@ -import argparse -import os +import argparse, os from mpcontribs.io.archieml.mpfile import MPFile from pre_submission import * diff --git a/mpcontribs-portal/mpcontribs/users/als_beamline/scripts/translate_PyPt.py b/mpcontribs-portal/mpcontribs/users/als_beamline/scripts/translate_PyPt.py index 232914ab86..995f5d045d 100644 --- a/mpcontribs-portal/mpcontribs/users/als_beamline/scripts/translate_PyPt.py +++ b/mpcontribs-portal/mpcontribs/users/als_beamline/scripts/translate_PyPt.py @@ -1,3 +1,6 @@ +import pandas as pd +import os +from scipy.interpolate import interp2d def get_translate(workdir=None): diff --git a/mpcontribs-portal/mpcontribs/users/dilute_solute_diffusion/pre_submission.py b/mpcontribs-portal/mpcontribs/users/dilute_solute_diffusion/pre_submission.py index de41e67fa2..045f5bd71f 100644 --- a/mpcontribs-portal/mpcontribs/users/dilute_solute_diffusion/pre_submission.py +++ b/mpcontribs-portal/mpcontribs/users/dilute_solute_diffusion/pre_submission.py @@ -1,6 +1,4 @@ -import os -import json -import requests +import os, json, requests, sys from pandas import read_excel, isnull, ExcelWriter, Series from mpcontribs.io.core.recdict import RecursiveDict from mpcontribs.io.core.utils import clean_value, nest_dict @@ -62,7 +60,7 @@ def run(mpfile, hosts=None, download=False): if hosts is not None: if isinstance(hosts, int) and idx + 1 > hosts: break - elif isinstance(hosts, list) and host not in hosts: + elif isinstance(hosts, list) and not host in hosts: continue print("get mp-id for {}".format(host)) diff --git a/mpcontribs-portal/mpcontribs/users/qmcdb/main/views.py b/mpcontribs-portal/mpcontribs/users/qmcdb/main/views.py index cd80073db9..4e4c20ac48 100644 --- a/mpcontribs-portal/mpcontribs/users/qmcdb/main/views.py +++ b/mpcontribs-portal/mpcontribs/users/qmcdb/main/views.py @@ -1,5 +1,8 @@ from django.shortcuts import render -from records.forms import MaterialQueryForm +from django.http import HttpResponseRedirect +from django.contrib.auth.decorators import login_required +from records.forms import MaterialQueryForm, MaterialSubmissionForm +from records.tables import QMCDBSetTable from records.models import QMCDBSet from django.utils.safestring import mark_safe from django.utils.html import escape diff --git a/mpcontribs-portal/mpcontribs/users/qmcdb/records/views.py b/mpcontribs-portal/mpcontribs/users/qmcdb/records/views.py index 589ef8e3e7..c0f0cc1372 100644 --- a/mpcontribs-portal/mpcontribs/users/qmcdb/records/views.py +++ b/mpcontribs-portal/mpcontribs/users/qmcdb/records/views.py @@ -1,13 +1,18 @@ from __future__ import division from django.shortcuts import render from django.http import HttpResponseRedirect, HttpResponse +from django.contrib.auth.decorators import login_required from rest_framework import status from rest_framework.decorators import api_view from rest_framework.response import Response -from records.forms import MaterialSubmissionForm +from records.forms import MaterialQueryForm, MaterialSubmissionForm from records.models import QMCDBSet from records.serializers import QMCDBSetSerializer +from rest_framework.renderers import JSONRenderer +from rest_framework.parsers import JSONParser +from django.utils.six import BytesIO from django.utils.safestring import mark_safe +import numpy as np def manual_qmc_record_submission(request): diff --git a/mpcontribs-portal/mpcontribs/users/redox_thermo_csp/pre_submission.py b/mpcontribs-portal/mpcontribs/users/redox_thermo_csp/pre_submission.py index e95fd1f18c..15cfaf4de7 100644 --- a/mpcontribs-portal/mpcontribs/users/redox_thermo_csp/pre_submission.py +++ b/mpcontribs-portal/mpcontribs/users/redox_thermo_csp/pre_submission.py @@ -1,17 +1,16 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -import os -import json -import re -import sys +import os, json, re, sys from glob import glob from datetime import datetime from itertools import groupby import pandas as pd +from mpcontribs.io.core.utils import get_composition_from_string from mpcontribs.io.core.recdict import RecursiveDict -from mpcontribs.io.core.utils import clean_value, read_csv +from mpcontribs.io.core.utils import clean_value, read_csv, nest_dict from mpcontribs.io.core.components import Table from mpcontribs.users.utils import duplicate_check +from mpcontribs.users.redox_thermo_csp.utils import redenth_act, get_debye_temp def get_fit_pars(sample_number): diff --git a/mpcontribs-portal/mpcontribs/users/redox_thermo_csp/update_energy_data.py b/mpcontribs-portal/mpcontribs/users/redox_thermo_csp/update_energy_data.py index 3701993937..b2eed60d99 100644 --- a/mpcontribs-portal/mpcontribs/users/redox_thermo_csp/update_energy_data.py +++ b/mpcontribs-portal/mpcontribs/users/redox_thermo_csp/update_energy_data.py @@ -2,6 +2,7 @@ import datetime import os import shutil +import numpy as np from energy_analysis import EnergyAnalysis as enera from views import unstable_phases as unst @@ -20,7 +21,7 @@ new_energy_data = old_energy_data for db_id in paramlist: - if "Exp" not in db_id: + if not "Exp" in db_id: print(db_id) data_source = "Theo" # updates only theoretical data celsius = "True" # always True, parameter input in K currently disabled diff --git a/mpcontribs-portal/mpcontribs/users/screening_inorganic_pv/pre_submission.py b/mpcontribs-portal/mpcontribs/users/screening_inorganic_pv/pre_submission.py index aef7b1c136..454a5597e3 100644 --- a/mpcontribs-portal/mpcontribs/users/screening_inorganic_pv/pre_submission.py +++ b/mpcontribs-portal/mpcontribs/users/screening_inorganic_pv/pre_submission.py @@ -1,6 +1,5 @@ # -*- coding: utf-8 -*- -import os -import json +import os, json from pandas import DataFrame from mpcontribs.io.core.recdict import RecursiveDict from mpcontribs.io.core.utils import clean_value @@ -47,11 +46,11 @@ def run(mpfile, **kwargs): rd = RecursiveDict({"formula": formula}) for k, v in config.items(): value = clean_value(d[k], v[1], max_dgts=4) - if "." not in v[0]: + if not "." in v[0]: rd[v[0]] = value else: keys = v[0].split(".") - if keys[0] not in rd: + if not keys[0] in rd: rd[keys[0]] = RecursiveDict({keys[1]: value}) else: rd[keys[0]][keys[1]] = value diff --git a/mpcontribs-portal/mpcontribs/users/swf/pre_submission.py b/mpcontribs-portal/mpcontribs/users/swf/pre_submission.py index 8c48375d97..6c46bc0c1a 100644 --- a/mpcontribs-portal/mpcontribs/users/swf/pre_submission.py +++ b/mpcontribs-portal/mpcontribs/users/swf/pre_submission.py @@ -1,4 +1,5 @@ from mpcontribs.config import mp_level01_titles +from mpcontribs.io.core.recdict import RecursiveDict from mpcontribs.io.core.utils import clean_value, get_composition_from_string from mpcontribs.users.utils import duplicate_check @@ -25,6 +26,7 @@ def round_to_100_percent(number_set, digit_after_decimal=1): def run(mpfile, **kwargs): import pymatgen import pandas as pd + from mpcontribs.users.swf.rest.rester import SwfRester # load data from google sheet google_sheet = mpfile.document[mp_level01_titles[0]].pop("google_sheet") diff --git a/mpcontribs-portal/mpcontribs/users/utils.py b/mpcontribs-portal/mpcontribs/users/utils.py index e49f04401a..4cf02217e9 100644 --- a/mpcontribs-portal/mpcontribs/users/utils.py +++ b/mpcontribs-portal/mpcontribs/users/utils.py @@ -1,5 +1,4 @@ -import inspect -import os +import inspect, os from typing import Any, Dict diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/2dmatpedia.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/2dmatpedia.ipynb index 73641ce9f3..daf3c45748 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/2dmatpedia.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/2dmatpedia.ipynb @@ -6,10 +6,9 @@ "metadata": {}, "outputs": [], "source": [ - "import os\n", - "import gzip\n", - "import json\n", + "import os, gzip, json\n", "from mpcontribs.client import Client\n", + "from pymatgen.core import Structure\n", "from pymatgen.ext.matproj import MPRester\n", "from urllib.request import urlretrieve\n", "from monty.json import MontyDecoder" diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ExpXAS.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ExpXAS.ipynb index 89ad71cfd9..d2fdf9ba09 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ExpXAS.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ExpXAS.ipynb @@ -10,7 +10,8 @@ "from mpcontribs.client import Client\n", "from pathlib import Path\n", "from pandas import read_csv\n", - "import pandas as pd" + "import pandas as pd\n", + "import numpy as np" ] }, { diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/HFP2023.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/HFP2023.ipynb index 61acc0ccc0..9b0f05ceb1 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/HFP2023.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/HFP2023.ipynb @@ -9,12 +9,15 @@ "source": [ "%env MPRESTER_MUTE_PROGRESS_BARS 1\n", "# pip install mpcontribs-client mp_api pandas flatten_dict\n", + "import os\n", "import gzip\n", "import json\n", "\n", "from pathlib import Path\n", "from mpcontribs.client import Client\n", + "from mp_api.client import MPRester\n", "from pymatgen.core import Structure\n", + "from pandas import read_csv\n", "from flatten_dict import flatten, unflatten" ] }, diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/MnO2_phase_selection.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/MnO2_phase_selection.ipynb index 328c0f2c2f..d6c63cb805 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/MnO2_phase_selection.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/MnO2_phase_selection.ipynb @@ -6,8 +6,7 @@ "metadata": {}, "outputs": [], "source": [ - "import json\n", - "import os\n", + "import json, os\n", "from mpcontribs.client import Client\n", "from pymatgen.core import Composition, Structure\n", "from pymatgen.ext.matproj import MPRester\n", diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/carrier_transport.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/carrier_transport.ipynb index e574ababd3..68e1c4f64d 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/carrier_transport.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/carrier_transport.ipynb @@ -7,13 +7,13 @@ "outputs": [], "source": [ "from mpcontribs.client import Client\n", - "import gzip\n", - "import json\n", - "import os\n", + "import gzip, json, os\n", "import numpy as np\n", "from pandas import DataFrame\n", + "from collections import defaultdict\n", "from tqdm.notebook import tqdm\n", "from unflatten import unflatten\n", + "from pathlib import Path\n", "\n", "name = 'carrier_transport'" ] diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/dilute_solute_diffusion.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/dilute_solute_diffusion.ipynb index a26d81d3bb..3ce892c236 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/dilute_solute_diffusion.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/dilute_solute_diffusion.ipynb @@ -28,9 +28,7 @@ "metadata": {}, "outputs": [], "source": [ - "import os\n", - "import json\n", - "import requests\n", + "import os, json, requests, sys\n", "from pandas import read_excel, isnull, ExcelWriter, Series\n", "from mp_api.client import MPRester\n", "from pathlib import Path\n", @@ -110,7 +108,7 @@ " if hosts is not None:\n", " if isinstance(hosts, int) and idx + 1 > hosts:\n", " break\n", - " elif isinstance(hosts, list) and host not in hosts:\n", + " elif isinstance(hosts, list) and not host in hosts:\n", " continue\n", "\n", " print(\"get mp-id for {}\".format(host))\n", diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/experimental_thermo.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/experimental_thermo.ipynb index 4ddf73bb08..a02e07d84a 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/experimental_thermo.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/experimental_thermo.ipynb @@ -48,6 +48,8 @@ "from pathlib import Path\n", "import re\n", "from tqdm import tqdm\n", + "import numpy as np\n", + "import xlrd\n", "from monty.serialization import loadfn, dumpfn" ] }, diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/experimental_thermoelectrics.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/experimental_thermoelectrics.ipynb index b3164a38e3..fc639fd76a 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/experimental_thermoelectrics.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/experimental_thermoelectrics.ipynb @@ -11,7 +11,7 @@ "from mp_api.client import MPRester\n", "import pandas as pd\n", "import os\n", - "from flatten_dict import unflatten\n", + "from flatten_dict import unflatten, flatten\n", "from math import isnan" ] }, diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ferroelectrics.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ferroelectrics.ipynb index 5a2a1a8876..458b629c00 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ferroelectrics.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ferroelectrics.ipynb @@ -11,9 +11,10 @@ "source": [ "import json\n", "import numpy as np\n", - "from mpcontribs.client import Client\n", + "from mpcontribs.client import Client, Attachment\n", "from pathlib import Path\n", - "from flatten_dict import flatten, unflatten" + "from flatten_dict import flatten, unflatten\n", + "from pymatgen.core import Structure" ] }, { @@ -223,7 +224,7 @@ " if conf and k.startswith('polarization') and isinstance(v, list):\n", " name, fields = conf[\"name\"], conf[\"fields\"]\n", " contrib[\"data\"].setdefault(name, {})\n", - " if \"unit\" not in conf:\n", + " if not \"unit\" in conf:\n", " vmax, unit = max(v), fields[\"max\"]\n", " contrib[\"data\"][name]['max'] = f\"{round(vmax, 3)} {unit}\" if unit else v\n", " contrib[\"data\"][name]['index'] = v.index(vmax)\n", diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ion_ref_data.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ion_ref_data.ipynb index 318359a7c4..4543e68cdb 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ion_ref_data.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ion_ref_data.ipynb @@ -29,7 +29,7 @@ "outputs": [], "source": [ "from pprint import pprint\n", - "from monty.serialization import loadfn\n", + "from monty.serialization import loadfn, dumpfn\n", "from pymatgen.core.ion import Ion" ] }, diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/jarvis_dft.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/jarvis_dft.ipynb index 7f08f74b59..bb08b09503 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/jarvis_dft.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/jarvis_dft.ipynb @@ -6,9 +6,7 @@ "metadata": {}, "outputs": [], "source": [ - "import os\n", - "import json\n", - "import tarfile\n", + "import os, json, tarfile\n", "from mpcontribs.client import Client\n", "from urllib.request import urlretrieve\n", "from monty.json import MontyDecoder\n", diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/matscholar.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/matscholar.ipynb index bc5766f6de..31e5a2c243 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/matscholar.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/matscholar.ipynb @@ -7,7 +7,8 @@ "metadata": {}, "outputs": [], "source": [ - "from mpcontribs.client import Client" + "from pathlib import Path\n", + "from mpcontribs.client import Client, Attachment" ] }, { diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/mofexplorer.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/mofexplorer.ipynb index c399fc6f96..a9dc872a85 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/mofexplorer.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/mofexplorer.ipynb @@ -76,7 +76,7 @@ " raw = vs[-1].replace(\"^3\", \"³\")\n", " if raw in ureg:\n", " value, unit = vs[0], raw\n", - " except Exception:\n", + " except Exception as e:\n", " value, unit = v, None\n", " else:\n", " value, unit = vs[0], None\n", diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ocp/ocp-upload.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ocp/ocp-upload.ipynb index 15a7de18c9..7f82031902 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/ocp/ocp-upload.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/ocp/ocp-upload.ipynb @@ -12,6 +12,7 @@ "from ujson import load\n", "from pymatgen.core.structure import Molecule, Structure\n", "from pathlib import Path\n", + "from time import time\n", "from mpcontribs.client import Client\n", "from tqdm.auto import tqdm" ] diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/open_catalyst_project.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/open_catalyst_project.ipynb index 934ac1ba4d..25f34580fc 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/open_catalyst_project.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/open_catalyst_project.ipynb @@ -9,8 +9,10 @@ "source": [ "from mpcontribs.client import Client\n", "from monty.serialization import loadfn\n", + "from json import loads\n", "from pymatgen.core.structure import Molecule, Structure\n", - "from pathlib import Path" + "from pathlib import Path\n", + "from time import time" ] }, { diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/perovskites_diffusion.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/perovskites_diffusion.ipynb index 634cb3c77c..026d09bec2 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/perovskites_diffusion.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/perovskites_diffusion.ipynb @@ -53,7 +53,7 @@ "metadata": {}, "outputs": [], "source": [ - "import tarfile\n", + "import tarfile, os\n", "from pandas import read_excel\n", "\n", "units = {\n", @@ -97,7 +97,7 @@ " key = keys[col]\n", " if isinstance(key, str):\n", " key = key.strip()\n", - " if key not in abbreviations:\n", + " if not key in abbreviations:\n", " abbreviations[key] = col\n", " else:\n", " key = col.strip().lower()\n", diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/pydatarecognition.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/pydatarecognition.ipynb index 23c100fe54..4f1d69e8b4 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/pydatarecognition.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/pydatarecognition.ipynb @@ -8,9 +8,11 @@ "outputs": [], "source": [ "%env MPRESTER_MUTE_PROGRESS_BARS 1\n", + "import os\n", "from pathlib import Path\n", "from mpcontribs.client import Client\n", - "from flatten_dict import unflatten\n", + "from mp_api.client import MPRester\n", + "from flatten_dict import unflatten, flatten\n", "from pymatgen.io.cif import CifParser\n", "from pandas import DataFrame\n", "import numpy as np" diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/screening_inorganic_pv.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/screening_inorganic_pv.ipynb index 270bc924d1..cb9e56014f 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/screening_inorganic_pv.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/screening_inorganic_pv.ipynb @@ -6,7 +6,7 @@ "metadata": {}, "outputs": [], "source": [ - "import json\n", + "import os, json\n", "from pathlib import Path\n", "from pandas import DataFrame\n", "from mpcontribs.client import Client\n", diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/silicon_defects.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/silicon_defects.ipynb index 6c100a231c..b03018e553 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/silicon_defects.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/silicon_defects.ipynb @@ -11,7 +11,7 @@ "from mpcontribs.client import Client, Attachment\n", "from pymatgen.core import Structure\n", "from pathlib import Path\n", - "from flatten_dict import flatten" + "from flatten_dict import flatten, unflatten" ] }, { @@ -95,7 +95,7 @@ "}\n", "\n", "for k, v in list(reorg.items()):\n", - " if \"unit\" not in v:\n", + " if not \"unit\" in v:\n", " root_field = reorg.pop(k).get(\"field\")\n", " \n", " for kk, vv in excitation_reorg.items():\n", diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/springer_materials.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/springer_materials.ipynb index e7d0958f16..ce4e3b1dfd 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/springer_materials.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/springer_materials.ipynb @@ -11,7 +11,7 @@ "import re\n", "from glob import glob\n", "from mpcontribs.client import Client\n", - "from flatten_dict import unflatten" + "from flatten_dict import unflatten, flatten" ] }, { diff --git a/mpcontribs-portal/notebooks/contribs.materialsproject.org/transparent_conductors.ipynb b/mpcontribs-portal/notebooks/contribs.materialsproject.org/transparent_conductors.ipynb index f123264613..bc8a8feef7 100644 --- a/mpcontribs-portal/notebooks/contribs.materialsproject.org/transparent_conductors.ipynb +++ b/mpcontribs-portal/notebooks/contribs.materialsproject.org/transparent_conductors.ipynb @@ -7,6 +7,7 @@ "metadata": {}, "outputs": [], "source": [ + "import tarfile, os\n", "import numpy as np\n", "from pandas import read_excel\n", "from mpcontribs.client import Client" diff --git a/mpcontribs-portal/notebooks/lightsources.materialsproject.org/get_started.ipynb b/mpcontribs-portal/notebooks/lightsources.materialsproject.org/get_started.ipynb index 3b53d08f6d..c3162b1883 100644 --- a/mpcontribs-portal/notebooks/lightsources.materialsproject.org/get_started.ipynb +++ b/mpcontribs-portal/notebooks/lightsources.materialsproject.org/get_started.ipynb @@ -7,6 +7,8 @@ "outputs": [], "source": [ "import os\n", + "import json\n", + "import gzip\n", "from zipfile import ZipFile\n", "from io import StringIO, BytesIO\n", "from numpy import where\n", @@ -14,7 +16,8 @@ "from pandas import to_numeric, read_csv\n", "from mpcontribs.client import Client, Attachment\n", "from tqdm.notebook import tqdm\n", - "from decimal import Decimal" + "from decimal import Decimal\n", + "from pathlib import Path" ] }, { diff --git a/mpcontribs-portal/notebooks/ml.materialsproject.org/get_started.ipynb b/mpcontribs-portal/notebooks/ml.materialsproject.org/get_started.ipynb index 651a268de2..a13eefdc69 100644 --- a/mpcontribs-portal/notebooks/ml.materialsproject.org/get_started.ipynb +++ b/mpcontribs-portal/notebooks/ml.materialsproject.org/get_started.ipynb @@ -6,9 +6,7 @@ "metadata": {}, "outputs": [], "source": [ - "import wget\n", - "import json\n", - "import math\n", + "import wget, json, os, math\n", "from pathlib import Path\n", "from string import capwords\n", "from pybtex.database import parse_string\n", diff --git a/mpcontribs-portal/wsgi.py b/mpcontribs-portal/wsgi.py index 96ebc59a28..e314b76514 100644 --- a/mpcontribs-portal/wsgi.py +++ b/mpcontribs-portal/wsgi.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- import re import os +import ddtrace.auto import django_settings_file from django.core.wsgi import get_wsgi_application from whitenoise import WhiteNoise diff --git a/mpcontribs-serverless/make_download/app.py b/mpcontribs-serverless/make_download/app.py index 9783183249..96f98401a7 100644 --- a/mpcontribs-serverless/make_download/app.py +++ b/mpcontribs-serverless/make_download/app.py @@ -1,5 +1,6 @@ # TODO ddtrace import os +import json import logging import boto3 From 6b24b3526301d7a264740ff37bba4e00a301cf23 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Fri, 17 Jul 2026 10:53:52 -0700 Subject: [PATCH 483/591] Removed .claude --- .claude/worktrees/unify-component-service | 1 - 1 file changed, 1 deletion(-) delete mode 160000 .claude/worktrees/unify-component-service diff --git a/.claude/worktrees/unify-component-service b/.claude/worktrees/unify-component-service deleted file mode 160000 index 7d84eafaec..0000000000 --- a/.claude/worktrees/unify-component-service +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 7d84eafaec7223ee57b2b626f02815075a8dfc47 From 54229cdb1b62356f07df8af8d963d2a8b9899cad Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Fri, 17 Jul 2026 10:54:48 -0700 Subject: [PATCH 484/591] Synced start.sh with dev --- mpcontribs-api/scripts/start.sh | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/mpcontribs-api/scripts/start.sh b/mpcontribs-api/scripts/start.sh index 729e75932d..1452743286 100755 --- a/mpcontribs-api/scripts/start.sh +++ b/mpcontribs-api/scripts/start.sh @@ -10,19 +10,4 @@ PMGRC=$HOME/.pmgrc.yaml set -x -<<<<<< HEAD exec uvicorn mpcontribs_api.app:app --host 0.0.0.0 --port "$API_PORT" --workers "${NWORKERS:-2}" -||||||| parent of ba089932 (Infra changes for rewrite) -if [[ -n "$DD_TRACE_HOST" ]]; then - wait-for-it.sh "$DD_TRACE_HOST" -q -s -t 10 && STATS_ARG="--statsd-host $DD_AGENT_HOST:8125" || echo "WARNING: datadog agent unreachable" -fi - -[[ -n "$STATS_ARG" ]] && CMD="ddtrace-run gunicorn $STATS_ARG" || CMD="gunicorn" -exec $WAIT_FOR -- $CMD $SERVER_APP -======= -if [[ -n "$DD_TRACE_HOST" ]]; then - wait-for-it.sh "$DD_TRACE_HOST" -q -s -t 10 || echo "WARNING: datadog agent unreachable" -fi - -exec uvicorn mpcontribs_api.app:app --host 0.0.0.0 --port "$API_PORT" ->>>>>>> ba089932 (Infra changes for rewrite) From 77cc80971cf84ba6a027692188df030c615d50be Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Fri, 17 Jul 2026 11:33:55 -0700 Subject: [PATCH 485/591] Moved Slug type into types.py --- .../mpcontribs_api/domains/_shared/types.py | 17 +++++++++++++ .../domains/initiatives/models.py | 24 +++---------------- 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py index 68061141a7..0abe108bca 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py @@ -197,3 +197,20 @@ def to_snake_case(name: str) -> str: # Converts strs to pretty display form (keeps unicode and most formatting) DisplayStr = Annotated[str, BeforeValidator(func=nfc_normalize)] + +# A URL-safe, human-readable slug +# carried in user.groups like ``initiative:`` +_SLUG_RE = re.compile(r"^[a-z0-9]+(?:-[a-z0-9]+)*$") + + +def _validate_slug(v: str) -> str: + v = v.strip().lower() + if not _SLUG_RE.match(v): + raise ValidationError( + "slug must be lowercase alphanumeric words separated by single hyphens, e.g. 'battery-genome-2025'", + slug=v, + ) + return v + + +Slug = Annotated[str, Field(min_length=3, max_length=50), BeforeValidator(_validate_slug)] diff --git a/mpcontribs-api/src/mpcontribs_api/domains/initiatives/models.py b/mpcontribs-api/src/mpcontribs_api/domains/initiatives/models.py index 49914166fc..a140191a76 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/initiatives/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/initiatives/models.py @@ -1,36 +1,18 @@ from __future__ import annotations -import re -from typing import Annotated, Self +from typing import Self from beanie import PydanticObjectId from bson.errors import InvalidId -from pydantic import BaseModel, BeforeValidator, ConfigDict, Field, field_validator, model_validator +from pydantic import BaseModel, ConfigDict, Field, field_validator, model_validator from pymongo import ASCENDING, IndexModel from mpcontribs_api.domains._shared.filters import BaseFilter from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut -from mpcontribs_api.domains._shared.types import NFKCStr, PrefixedEmail +from mpcontribs_api.domains._shared.types import NFKCStr, PrefixedEmail, Slug from mpcontribs_api.exceptions import ValidationError from mpcontribs_api.projection import SparseFieldsModel -# A URL-safe, human-readable slug -# Also carried in user.groups like ``initiative:`` -_SLUG_RE = re.compile(r"^[a-z0-9]+(?:-[a-z0-9]+)*$") - - -def _validate_slug(v: str) -> str: - v = v.strip().lower() - if not _SLUG_RE.match(v): - raise ValidationError( - "slug must be lowercase alphanumeric words separated by single hyphens, e.g. 'battery-genome-2025'", - slug=v, - ) - return v - - -Slug = Annotated[str, Field(min_length=3, max_length=50), BeforeValidator(_validate_slug)] - class Initiative(BaseDocumentWithInput[PydanticObjectId]): """A canonical, authoritative grouping of projects into a larger organizational effort. From 48a9112483b08f2540529af920d4d2bc10d86683 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 22 Jun 2026 16:55:23 -0700 Subject: [PATCH 486/591] Added quota settings to config --- mpcontribs-api/src/mpcontribs_api/config.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/mpcontribs-api/src/mpcontribs_api/config.py b/mpcontribs-api/src/mpcontribs_api/config.py index 3995eebb0e..9f9e0bedcf 100644 --- a/mpcontribs-api/src/mpcontribs_api/config.py +++ b/mpcontribs-api/src/mpcontribs_api/config.py @@ -5,6 +5,21 @@ from pydantic_settings import BaseSettings, SettingsConfigDict +class UserSettings(BaseModel): + max_projects: int = Field( + default=3, + description="The maximumum number of projects a single user is allowed to create", + ) + max_unapproved_contributions_per_project: int = Field( + default=500, + description="The maximum number of unapproved contributions a single user is allowed to have per project", + ) + max_columns: int = Field( + default=160, + description="The maximum number of columns a project is allowed to have", + ) + + class RedisSettings(BaseModel): address: SecretStr url: SecretStr @@ -179,6 +194,9 @@ class Settings(BaseSettings): # MPContribs_otel__* otel: ObservabilitySettings = Field(default_factory=ObservabilitySettings) + # MPContribs_user__* + user: UserSettings = Field(default_factory=UserSettings) + # SMTP Settings mail_default_sender: str = Field( description="SMTP Server to send out notifications on new projects and other important moments" From 8550193146e15eaf2f6c761464b92ada5ceb53f6 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 22 Jun 2026 17:15:53 -0700 Subject: [PATCH 487/591] Added check for max_projects in upsert_project_by_id and insert_project --- .../mpcontribs_api/domains/projects/repository.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py index 0e6f96a96c..07a60a8491 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py @@ -1,6 +1,7 @@ from typing import Any from mpcontribs_api.authz import User +from mpcontribs_api.config import get_settings from mpcontribs_api.domains._shared.repository import MongoDbRepository from mpcontribs_api.domains.projects.models import ( Project, @@ -45,6 +46,16 @@ def _build_scope(user: User) -> dict[str, Any]: ors.append({"_id": {"$in": sorted(user.groups)}}) return {"$or": ors} + async def _check_num_projects(self, data: ProjectIn): + settings = get_settings() + result = await Project.find(Project.owner == data.owner).count() + if result > settings.user.max_projects: + raise PermissionError( + f"Cannot be owner of more than {settings.user.max_projects} projects", + owner=data.owner, + num_projects=result, + ) + async def get_projects( self, filter: ProjectFilter, @@ -84,6 +95,7 @@ async def unique_identifiers_by_id(self, ids: list[str]) -> dict[str, bool]: async def insert_project(self, project: ProjectIn) -> Project: """Insert a new project, rejecting a duplicate id. See ``insert_one``.""" + await self._check_num_projects(project) return await self.insert_one(project) async def patch_project_by_id(self, id: str, update: ProjectPatch) -> Project: @@ -121,6 +133,8 @@ async def upsert_project_by_id(self, id: str, data: ProjectIn) -> Project: if self._user.username is None: raise PermissionError(required_role="authenticated") + await self._check_num_projects(data) + existing = await self.document_model.find_one(self.document_model.id == id) project = self.document_model.from_input_model(data) project.id = id From de5ff4aad9af38b4531d1463018e74255af5e689 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 22 Jun 2026 17:21:47 -0700 Subject: [PATCH 488/591] Added check for column length onto Project and ProjectPatch models --- .../mpcontribs_api/domains/projects/models.py | 27 ++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py index 7216c82acc..69abf0308a 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py @@ -2,12 +2,17 @@ from typing import Any, Literal -from pydantic import BaseModel, ConfigDict, Field, HttpUrl +from fastapi_filter.contrib.beanie import Filter +from pydantic import BaseModel, ConfigDict, Field, HttpUrl, field_validator from mpcontribs_api import pagination from mpcontribs_api.domains._shared.filters import BaseFilter +from mpcontribs_api.config import get_settings from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut from mpcontribs_api.domains._shared.types import PrefixedEmail, ShortStr +from mpcontribs_api.exceptions import ValidationError + +settings = get_settings() class Column(BaseModel): @@ -72,6 +77,16 @@ def decode_cursor(cursor: str) -> str: """ return pagination.decode_cursor(cursor) + @field_validator("columns", mode="before") + @classmethod + def limit_column_length(cls, c: list[Column]) -> list[Column]: + if len(c) > settings.user.max_columns: + raise ValidationError( + f"columns cannot have more than {settings.user.max_columns} entries", + column_length=len(c), + ) + return c + class Settings: name = "projects" keep_nulls = False @@ -156,3 +171,13 @@ class ProjectPatch(BaseModel): is_public: bool = False is_approved: bool = False license: Literal["CCA4", "CCPD"] | None = None + + @field_validator("columns", mode="before") + @classmethod + def limit_column_length(cls, c: list[Column]) -> list[Column]: + if len(c) > settings.user.max_columns: + raise ValidationError( + f"columns cannot have more than {settings.user.max_columns} entries", + column_length=len(c), + ) + return c From 391f0f1f27b7098ad1d578d30f126c6116838ed5 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 24 Jun 2026 11:57:34 -0700 Subject: [PATCH 489/591] Added unapproved contribution limits --- .../domains/contributions/repository.py | 8 ++ .../domains/contributions/service.py | 89 ++++++++++++++----- 2 files changed, 75 insertions(+), 22 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py index 09eb3e5f31..4a09341092 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py @@ -45,6 +45,14 @@ def _build_scope(user: User) -> dict[str, Any]: ors.append({"project": {"$in": sorted(user.writable_projects)}}) return {"$or": ors} + async def count_contributions_for_project(self, project_name: str) -> int: + """Count contributions already stored for a project. + + Unscoped on purpose: the unapproved-contribution quota is a property of the project as a + whole, not of what the current user can see. The cap comparison lives in the service. + """ + return await self.document_model.find(self.document_model.project == project_name).count() + async def get_contributions( self, filter: ContributionFilter, diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py index 88ba3a523f..27695a67fe 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py @@ -75,6 +75,23 @@ def _children(self) -> dict[str, MongoDbRepository]: "tables": self._tables, } + async def _remaining_unapproved_quota(self, project_id: str) -> int | None: + """How many more contributions may be added to ``project_id`` in this batch. + + Returns ``None`` when the quota does not apply — the project is approved, or it could not + be read in the current scope (existence/permission is enforced on insert, not here). + + For an unapproved project the cap is on the project's total contribution count, so the + remaining allowance is ``cap - existing`` (clamped at zero). The ``+ 1`` mirrors the + previous per-insert gate, which rejected only once the stored count exceeded the cap. + """ + project = await self._projects.get_by_id(project_id, fields=frozenset({"is_approved"})) + if not project or project.is_approved: + return None + cap = get_settings().user.max_unapproved_contributions_per_project + existing = await self._contributions.count_contributions_for_project(project_id) + return max(0, cap - existing + 1) + async def insert_contributions( self, contributions: list[ContributionIn], @@ -104,12 +121,26 @@ async def insert_contributions( no_comp = [item for item in plan if not item.contribution.has_components()] with_comp = [item for item in plan if item.contribution.has_components()] - no_comp_succeeded, no_comp_failed = await self._insert_no_components(no_comp) - with_comp_succeeded, with_comp_failed = await self._insert_with_components(with_comp) + # Reject contributions that exceed the component limit + oversize_failures, remaining_indices = self._split_oversize(contributions) + # Reject contributions that are being added to an unapproved project and cause the project to exceed the + # contribution limit + quota_failures, remaining_indices = await self._split_quota_exceeded(remaining_indices, contributions) + no_comp_indices = [i for i in remaining_indices if not contributions[i].has_components()] + with_comp_indices = [i for i in remaining_indices if contributions[i].has_components()] + + no_comp_succeeded, no_comp_failed = await self._insert_no_components( + indices=no_comp_indices, + contributions=contributions, + ) + with_comp_succeeded, with_comp_failed = await self._insert_with_components( + indices=with_comp_indices, + contributions=contributions, + ) succeeded = [doc for _, doc in sorted(no_comp_succeeded + with_comp_succeeded, key=lambda p: p[0])] failed = sorted( - failures + no_comp_failed + with_comp_failed, + oversize_failures + quota_failures + no_comp_failed + with_comp_failed, key=lambda f: f.index, ) return BulkWriteSummary[Contribution](total=len(contributions), succeeded=succeeded, failed=failed) @@ -295,27 +326,41 @@ def _split_oversize( remaining.append(i) return oversize, remaining - async def _split_contributions( - self, contributions: list[ContributionIn], *, is_upsert: bool - ) -> tuple[list[BulkFailure], list[ResolvedWrite]]: - """Common method for validating contribution write failure logic and resolving versions. - - Runs the cheap, local, index-based filters first (authorization, then component-count cap) - so guaranteed failures never reach the DB; ``_split_non_unique`` runs last and turns the - remaining indices into a write plan carrying each resolved version. + async def _split_quota_exceeded( + self, + indices: list[int], + contributions: list[ContributionIn], + ) -> tuple[list[BulkFailure], list[int]]: + """Trim each unapproved project's in-batch contributions to its remaining quota. - Returns: - tuple of (failures and their reasons, a ``ResolvedWrite`` per contribution to write) + The unapproved-contribution cap is on a project's total count, so the batch's own additions + count toward it: a project with N slots left accepts the first N contributions for it (input + order) and rejects the rest. Rejections are non-terminal — they land in ``failed`` while the + rest of the batch proceeds, mirroring ``_split_oversize``. The policy is evaluated once per + distinct project. """ - # Per-item project authorization (see _split_unauthorized for the per-item vs fail-fast - # decision). Only authorized items reach Mongo; the rest are reported in ``failed``. - unauthorized_failures, authorized_indices = self._split_unauthorized(range(len(contributions)), contributions) - # Reject contributions that have too many components associated with them. - oversize_failures, sized_indices = self._split_oversize(authorized_indices, contributions) - # Verify identifiers/uniqueness within a project and resolve each version, depending on - # project.unique_identifiers and whether this is an insert or upsert. - non_unique_failures, plan = await self._split_non_unique(sized_indices, contributions, is_upsert=is_upsert) - return (unauthorized_failures + oversize_failures + non_unique_failures, plan) + by_project: dict[str, list[int]] = defaultdict(list) + for i in indices: + by_project[contributions[i].project].append(i) + + cap = get_settings().user.max_unapproved_contributions_per_project + failures: list[BulkFailure] = [] + remaining: list[int] = [] + for project_id, project_indices in by_project.items(): + quota = await self._remaining_unapproved_quota(project_id) + if quota is None: + remaining.extend(project_indices) + continue + remaining.extend(project_indices[:quota]) + exc = PermissionError( + "Attempted to add more than the allowed number of unapproved contributions", + project=project_id, + max_contribs=cap, + ) + failures.extend( + bulk_failure_from_exception(i, contributions[i].identifiers(), exc) for i in project_indices[quota:] + ) + return failures, sorted(remaining) async def _insert_no_components( self, From d91c870ee99753e3c50be389d2c3a8e2933c398d Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 24 Jun 2026 11:57:44 -0700 Subject: [PATCH 490/591] Added tests --- .../unit/domains/test_contribution_service.py | 98 +++++++++++++++++++ 1 file changed, 98 insertions(+) diff --git a/mpcontribs-api/tests/unit/domains/test_contribution_service.py b/mpcontribs-api/tests/unit/domains/test_contribution_service.py index 02451f5033..74ebc6c143 100644 --- a/mpcontribs-api/tests/unit/domains/test_contribution_service.py +++ b/mpcontribs-api/tests/unit/domains/test_contribution_service.py @@ -148,6 +148,7 @@ def _make_service( tables=None, attachments=None, client=None, + projects=None, settings: MongoSettings | None = None, write_slots: asyncio.Semaphore | None = None, user: User | None = None, @@ -181,6 +182,20 @@ def _make_service( return svc, contrib_repo, struct_repo, table_repo, attach_repo, client +def _approved_projects_repo() -> AsyncMock: + """A projects repo whose every project reads as approved (quota does not apply).""" + repo = AsyncMock() + repo.get_by_id = AsyncMock(return_value=MagicMock(is_approved=True)) + return repo + + +def _unapproved_projects_repo() -> AsyncMock: + """A projects repo whose every project reads as unapproved (quota applies).""" + repo = AsyncMock() + repo.get_by_id = AsyncMock(return_value=MagicMock(is_approved=False)) + return repo + + def _fake_structure() -> Structure: s = MagicMock(spec=Structure) s.id = _oid() @@ -257,6 +272,89 @@ async def test_oversize_contribution_goes_to_failures_without_db(self): contrib_repo.insert_many_contributions.assert_called_once() +# --------------------------------------------------------------------------- +# insert_contributions — unapproved-contribution quota +# --------------------------------------------------------------------------- + + +def _projects_repo_by_approval(approval: dict[str, bool]) -> AsyncMock: + """Projects repo whose ``get_by_id`` reports approval per project id from ``approval``.""" + repo = AsyncMock() + + async def _get_by_id(project_id, fields=None): + return MagicMock(is_approved=approval[project_id]) + + repo.get_by_id = AsyncMock(side_effect=_get_by_id) + return repo + + +class TestInsertContributionsUnapprovedQuota: + async def test_unapproved_project_at_capacity_fails_all(self, monkeypatch): + monkeypatch.setattr(get_settings().user, "max_unapproved_contributions_per_project", 2) + contrib_repo = AsyncMock() + contrib_repo.insert_many_contributions.return_value = None + contrib_repo.count_contributions_for_project.return_value = 5 # already over cap + svc, *_ = _make_service(contributions=contrib_repo, projects=_unapproved_projects_repo()) + + summary = await svc.insert_contributions([_contrib_in(identifier=f"mp-{i}") for i in range(3)]) + + assert summary.total == 3 + assert [f.index for f in summary.failed] == [0, 1, 2] + assert all(f.error_code == "permission_denied" for f in summary.failed) + assert summary.succeeded == [] + contrib_repo.insert_many_contributions.assert_not_called() + + async def test_batch_trimmed_to_remaining_capacity(self, monkeypatch): + # cap 5, 4 already stored -> remaining = 5 - 4 + 1 = 2 slots for this batch + monkeypatch.setattr(get_settings().user, "max_unapproved_contributions_per_project", 5) + contrib_repo = AsyncMock() + contrib_repo.insert_many_contributions.return_value = None + contrib_repo.count_contributions_for_project.return_value = 4 + svc, *_ = _make_service(contributions=contrib_repo, projects=_unapproved_projects_repo()) + + summary = await svc.insert_contributions([_contrib_in(identifier=f"mp-{i}") for i in range(4)]) + + assert summary.total == 4 + assert len(summary.succeeded) == 2 + assert [f.index for f in summary.failed] == [2, 3] + # Only the two accepted contributions reached the database + inserted = contrib_repo.insert_many_contributions.call_args[0][0] + assert len(inserted) == 2 + + async def test_approved_project_is_unlimited(self, monkeypatch): + monkeypatch.setattr(get_settings().user, "max_unapproved_contributions_per_project", 1) + contrib_repo = AsyncMock() + contrib_repo.insert_many_contributions.return_value = None + svc, *_ = _make_service(contributions=contrib_repo, projects=_approved_projects_repo()) + + summary = await svc.insert_contributions([_contrib_in(identifier=f"mp-{i}") for i in range(3)]) + + assert len(summary.succeeded) == 3 + assert summary.failed == [] + # Approved short-circuits before counting stored contributions + contrib_repo.count_contributions_for_project.assert_not_called() + + async def test_quota_evaluated_per_project(self, monkeypatch): + monkeypatch.setattr(get_settings().user, "max_unapproved_contributions_per_project", 2) + contrib_repo = AsyncMock() + contrib_repo.insert_many_contributions.return_value = None + contrib_repo.count_contributions_for_project.return_value = 99 # only consulted for the unapproved one + projects = _projects_repo_by_approval({"ok": True, "bad": False}) + svc, *_ = _make_service(contributions=contrib_repo, projects=projects) + + contribs = [ + _contrib_in(project="ok", identifier="a"), + _contrib_in(project="bad", identifier="b"), + _contrib_in(project="ok", identifier="c"), + ] + summary = await svc.insert_contributions(contribs) + + assert [f.index for f in summary.failed] == [1] + assert len(summary.succeeded) == 2 + inserted_ids = {d.identifier for d in contrib_repo.insert_many_contributions.call_args[0][0]} + assert inserted_ids == {"a", "c"} + + # --------------------------------------------------------------------------- # insert_contributions — no-component fast path # --------------------------------------------------------------------------- From 81f79e33e30a5413084ed3423389ae8a6dddf6df Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 24 Jun 2026 13:24:03 -0700 Subject: [PATCH 491/591] Added logging for insert event exceeding unapproved contribution limits --- .../domains/contributions/service.py | 68 ++++++++++++++----- 1 file changed, 51 insertions(+), 17 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py index 27695a67fe..0292137e8f 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py @@ -32,6 +32,10 @@ logger = structlog.get_logger(__name__) +# Upper bound on rejected identifiers attached to a single quota-breach log line, so an +# adversarial mega-batch can't blow up the log payload. The counts are always exact. +_QUOTA_LOG_IDENTIFIER_CAP = 100 + @dataclass(frozen=True, slots=True) class ResolvedWrite: @@ -75,22 +79,17 @@ def _children(self) -> dict[str, MongoDbRepository]: "tables": self._tables, } - async def _remaining_unapproved_quota(self, project_id: str) -> int | None: - """How many more contributions may be added to ``project_id`` in this batch. + async def _unapproved_stored_count(self, project_id: str) -> int | None: + """Contributions already stored for an unapproved ``project_id``, else ``None``. Returns ``None`` when the quota does not apply — the project is approved, or it could not - be read in the current scope (existence/permission is enforced on insert, not here). - - For an unapproved project the cap is on the project's total contribution count, so the - remaining allowance is ``cap - existing`` (clamped at zero). The ``+ 1`` mirrors the - previous per-insert gate, which rejected only once the stored count exceeded the cap. + be read in the current scope (existence/permission is enforced on insert, not here). The + caller turns the count into a remaining allowance against the cap. """ project = await self._projects.get_by_id(project_id, fields=frozenset({"is_approved"})) if not project or project.is_approved: return None - cap = get_settings().user.max_unapproved_contributions_per_project - existing = await self._contributions.count_contributions_for_project(project_id) - return max(0, cap - existing + 1) + return await self._contributions.count_contributions_for_project(project_id) async def insert_contributions( self, @@ -337,7 +336,11 @@ async def _split_quota_exceeded( count toward it: a project with N slots left accepts the first N contributions for it (input order) and rejects the rest. Rejections are non-terminal — they land in ``failed`` while the rest of the batch proceeds, mirroring ``_split_oversize``. The policy is evaluated once per - distinct project. + distinct project, and each breach is logged for audit/abuse monitoring (the response is a + 200 with embedded failures, so the access log alone cannot surface it). + + The ``+ 1`` in the allowance mirrors the previous per-insert gate, which rejected only once + the stored count exceeded the cap. """ by_project: dict[str, list[int]] = defaultdict(list) for i in indices: @@ -347,21 +350,52 @@ async def _split_quota_exceeded( failures: list[BulkFailure] = [] remaining: list[int] = [] for project_id, project_indices in by_project.items(): - quota = await self._remaining_unapproved_quota(project_id) - if quota is None: + stored = await self._unapproved_stored_count(project_id) + if stored is None: remaining.extend(project_indices) continue - remaining.extend(project_indices[:quota]) + allowed = max(0, cap - stored + 1) + accepted, rejected = project_indices[:allowed], project_indices[allowed:] + remaining.extend(accepted) + if not rejected: + continue + self._log_quota_exceeded(project_id, contributions, cap, stored, len(accepted), rejected) exc = PermissionError( "Attempted to add more than the allowed number of unapproved contributions", project=project_id, max_contribs=cap, ) - failures.extend( - bulk_failure_from_exception(i, contributions[i].identifiers(), exc) for i in project_indices[quota:] - ) + failures.extend(bulk_failure_from_exception(i, contributions[i].identifiers(), exc) for i in rejected) return failures, sorted(remaining) + @staticmethod + def _log_quota_exceeded( + project_id: str, + contributions: list[ContributionIn], + cap: int, + stored: int, + accepted: int, + rejected: list[int], + ) -> None: + """Emit a structured audit event for an unapproved-project quota breach. + + Request/user correlation (``consumer_id``, ``request_id``, ``trace_id``) is merged from the + per-request contextvars, so only the domain-specific dimensions are added here. The rejected + identifier list is capped to keep a pathological batch from bloating a single log line. + """ + rejected_identifiers = [contributions[i].identifier for i in rejected[:_QUOTA_LOG_IDENTIFIER_CAP]] + logger.warning( + "contribution.unapproved_quota_exceeded", + project=project_id, + max_allowed=cap, + stored=stored, + attempted=accepted + len(rejected), + accepted=accepted, + rejected=len(rejected), + rejected_identifiers=rejected_identifiers, + rejected_identifiers_truncated=len(rejected) > _QUOTA_LOG_IDENTIFIER_CAP, + ) + async def _insert_no_components( self, items: list[ResolvedWrite], From 1b686647beb4529871855498074d0b766f797363 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 24 Jun 2026 13:24:40 -0700 Subject: [PATCH 492/591] Test that going over unapproved contribution limit emits a log --- .../unit/domains/test_contribution_service.py | 36 ++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/mpcontribs-api/tests/unit/domains/test_contribution_service.py b/mpcontribs-api/tests/unit/domains/test_contribution_service.py index 74ebc6c143..e706a9f2d4 100644 --- a/mpcontribs-api/tests/unit/domains/test_contribution_service.py +++ b/mpcontribs-api/tests/unit/domains/test_contribution_service.py @@ -1,5 +1,5 @@ import asyncio -from unittest.mock import AsyncMock, MagicMock +from unittest.mock import AsyncMock, MagicMock, patch import polars as pl import pytest @@ -11,6 +11,7 @@ from mpcontribs_api.config import MongoSettings from mpcontribs_api.domains.attachments.models import Attachment, AttachmentIn from mpcontribs_api.domains.contributions.models import Contribution, ContributionIn +from mpcontribs_api.domains.contributions import service as service_module from mpcontribs_api.domains.contributions.service import ContributionService from mpcontribs_api.domains.structures.models import ( Lattice, @@ -354,6 +355,39 @@ async def test_quota_evaluated_per_project(self, monkeypatch): inserted_ids = {d.identifier for d in contrib_repo.insert_many_contributions.call_args[0][0]} assert inserted_ids == {"a", "c"} + async def test_breach_emits_structured_audit_log(self, monkeypatch): + monkeypatch.setattr(get_settings().user, "max_unapproved_contributions_per_project", 2) + contrib_repo = AsyncMock() + contrib_repo.insert_many_contributions.return_value = None + contrib_repo.count_contributions_for_project.return_value = 5 + svc, *_ = _make_service(contributions=contrib_repo, projects=_unapproved_projects_repo()) + + with patch.object(service_module.logger, "warning") as warn: + await svc.insert_contributions([_contrib_in(project="p", identifier=f"mp-{i}") for i in range(3)]) + + warn.assert_called_once() + event, kwargs = warn.call_args.args[0], warn.call_args.kwargs + assert event == "contribution.unapproved_quota_exceeded" + assert kwargs["project"] == "p" + assert kwargs["max_allowed"] == 2 + assert kwargs["stored"] == 5 + assert kwargs["attempted"] == 3 + assert kwargs["accepted"] == 0 + assert kwargs["rejected"] == 3 + assert kwargs["rejected_identifiers"] == ["mp-0", "mp-1", "mp-2"] + assert kwargs["rejected_identifiers_truncated"] is False + + async def test_approved_project_emits_no_audit_log(self, monkeypatch): + monkeypatch.setattr(get_settings().user, "max_unapproved_contributions_per_project", 1) + contrib_repo = AsyncMock() + contrib_repo.insert_many_contributions.return_value = None + svc, *_ = _make_service(contributions=contrib_repo, projects=_approved_projects_repo()) + + with patch.object(service_module.logger, "warning") as warn: + await svc.insert_contributions([_contrib_in(identifier=f"mp-{i}") for i in range(3)]) + + warn.assert_not_called() + # --------------------------------------------------------------------------- # insert_contributions — no-component fast path From 3959f2c6488ee34f718e08e1be119d2e8bc76227 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 20 Jul 2026 10:24:24 -0700 Subject: [PATCH 493/591] Reimplemented the contribution quota handling. --- .../domains/contributions/repository.py | 22 +++ .../domains/contributions/router.py | 4 +- .../domains/contributions/service.py | 144 ++++++++++++------ .../integration/test_contributions_routes.py | 8 +- .../unit/domains/test_contribution_service.py | 122 ++++++++++++++- 5 files changed, 244 insertions(+), 56 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py index 4a09341092..d12fb5587c 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py @@ -53,6 +53,28 @@ async def count_contributions_for_project(self, project_name: str) -> int: """ return await self.document_model.find(self.document_model.project == project_name).count() + async def existing_versioned_keys( + self, keys: list[tuple[str, str, int]] + ) -> set[tuple[str, str, int]]: + """Return which ``(project, identifier, version)`` triples already have a stored document. + + Args: + keys: (project, identifier, version) triples to test + + Returns: + set[tuple[str, str, int]]: the subset of ``keys`` that already exist + """ + if not keys: + return set() + match: dict[str, Any] = { + "$or": [{"project": p, "identifier": i, "version": v} for p, i, v in keys] + } + collection = self.document_model.get_pymongo_collection() + existing: set[tuple[str, str, int]] = set() + async for doc in collection.find(match, {"project": 1, "identifier": 1, "version": 1}): + existing.add((doc["project"], doc["identifier"], doc["version"])) + return existing + async def get_contributions( self, filter: ContributionFilter, diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py index 73466eff28..8e71750003 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py @@ -131,8 +131,8 @@ async def get_contribution_by_id( @router.put("/{id}", dependencies=[Depends(require_user)]) -async def upsert_contribution_by_id(repo: ContributionDep, id: str, contribution: ContributionIn): - return await repo.upsert_contribution_by_id(id=id, contribution=contribution) +async def upsert_contribution_by_id(service: ContributionServiceDep, id: str, contribution: ContributionIn): + return await service.upsert_contribution_by_id(id=id, contribution=contribution) @router.patch("/{id}", dependencies=[Depends(require_user)]) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py index 0292137e8f..26ba11fa86 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py @@ -120,26 +120,12 @@ async def insert_contributions( no_comp = [item for item in plan if not item.contribution.has_components()] with_comp = [item for item in plan if item.contribution.has_components()] - # Reject contributions that exceed the component limit - oversize_failures, remaining_indices = self._split_oversize(contributions) - # Reject contributions that are being added to an unapproved project and cause the project to exceed the - # contribution limit - quota_failures, remaining_indices = await self._split_quota_exceeded(remaining_indices, contributions) - no_comp_indices = [i for i in remaining_indices if not contributions[i].has_components()] - with_comp_indices = [i for i in remaining_indices if contributions[i].has_components()] - - no_comp_succeeded, no_comp_failed = await self._insert_no_components( - indices=no_comp_indices, - contributions=contributions, - ) - with_comp_succeeded, with_comp_failed = await self._insert_with_components( - indices=with_comp_indices, - contributions=contributions, - ) + no_comp_succeeded, no_comp_failed = await self._insert_no_components(no_comp) + with_comp_succeeded, with_comp_failed = await self._insert_with_components(with_comp) succeeded = [doc for _, doc in sorted(no_comp_succeeded + with_comp_succeeded, key=lambda p: p[0])] failed = sorted( - oversize_failures + quota_failures + no_comp_failed + with_comp_failed, + failures + no_comp_failed + with_comp_failed, key=lambda f: f.index, ) return BulkWriteSummary[Contribution](total=len(contributions), succeeded=succeeded, failed=failed) @@ -327,55 +313,62 @@ def _split_oversize( async def _split_quota_exceeded( self, - indices: list[int], - contributions: list[ContributionIn], - ) -> tuple[list[BulkFailure], list[int]]: - """Trim each unapproved project's in-batch contributions to its remaining quota. - - The unapproved-contribution cap is on a project's total count, so the batch's own additions - count toward it: a project with N slots left accepts the first N contributions for it (input - order) and rejects the rest. Rejections are non-terminal — they land in ``failed`` while the - rest of the batch proceeds, mirroring ``_split_oversize``. The policy is evaluated once per - distinct project, and each breach is logged for audit/abuse monitoring (the response is a - 200 with embedded failures, so the access log alone cannot surface it). - - The ``+ 1`` in the allowance mirrors the previous per-insert gate, which rejected only once - the stored count exceeded the cap. - """ - by_project: dict[str, list[int]] = defaultdict(list) - for i in indices: - by_project[contributions[i].project].append(i) + plan: list[ResolvedWrite], + *, + is_upsert: bool, + ) -> tuple[list[BulkFailure], list[ResolvedWrite]]: + """Trim each unapproved project's newly-created contributions to its remaining quota.""" + by_project: dict[str, list[ResolvedWrite]] = defaultdict(list) + for item in plan: + by_project[item.contribution.project].append(item) cap = get_settings().user.max_unapproved_contributions_per_project failures: list[BulkFailure] = [] - remaining: list[int] = [] - for project_id, project_indices in by_project.items(): + survivors: list[ResolvedWrite] = [] + for project_id, items in by_project.items(): stored = await self._unapproved_stored_count(project_id) if stored is None: - remaining.extend(project_indices) + survivors.extend(items) continue + # Upserts against an existing row are updates (no new document); only absent keys count. + existing = await self._existing_keys(items) if is_upsert else set() allowed = max(0, cap - stored + 1) - accepted, rejected = project_indices[:allowed], project_indices[allowed:] - remaining.extend(accepted) + rejected: list[ResolvedWrite] = [] + for item in items: + key = (item.contribution.project, item.contribution.identifier, item.version) + if key in existing: + survivors.append(item) + elif allowed > 0: + survivors.append(item) + allowed -= 1 + else: + rejected.append(item) if not rejected: continue - self._log_quota_exceeded(project_id, contributions, cap, stored, len(accepted), rejected) + self._log_quota_exceeded(project_id, cap, stored, len(items) - len(rejected), rejected) exc = PermissionError( "Attempted to add more than the allowed number of unapproved contributions", project=project_id, max_contribs=cap, ) - failures.extend(bulk_failure_from_exception(i, contributions[i].identifiers(), exc) for i in rejected) - return failures, sorted(remaining) + failures.extend( + bulk_failure_from_exception(item.index, item.contribution.identifiers(), exc) for item in rejected + ) + survivors.sort(key=lambda item: item.index) + return failures, survivors + + async def _existing_keys(self, items: list[ResolvedWrite]) -> set[tuple[str, str, int]]: + """Return which of ``items``' ``(project, identifier, version)`` keys already exist.""" + keys = [(item.contribution.project, item.contribution.identifier, item.version) for item in items] + return await self._contributions.existing_versioned_keys(keys) @staticmethod def _log_quota_exceeded( project_id: str, - contributions: list[ContributionIn], cap: int, stored: int, accepted: int, - rejected: list[int], + rejected: list[ResolvedWrite], ) -> None: """Emit a structured audit event for an unapproved-project quota breach. @@ -383,7 +376,7 @@ def _log_quota_exceeded( per-request contextvars, so only the domain-specific dimensions are added here. The rejected identifier list is capped to keep a pathological batch from bloating a single log line. """ - rejected_identifiers = [contributions[i].identifier for i in rejected[:_QUOTA_LOG_IDENTIFIER_CAP]] + rejected_identifiers = [item.contribution.identifier for item in rejected[:_QUOTA_LOG_IDENTIFIER_CAP]] logger.warning( "contribution.unapproved_quota_exceeded", project=project_id, @@ -396,6 +389,31 @@ def _log_quota_exceeded( rejected_identifiers_truncated=len(rejected) > _QUOTA_LOG_IDENTIFIER_CAP, ) + async def _split_contributions( + self, contributions: list[ContributionIn], *, is_upsert: bool + ) -> tuple[list[BulkFailure], list[ResolvedWrite]]: + """Common method for validating contribution write failure logic and resolving versions. + + Runs the cheap, local, index-based filters first (authorization, then component-count cap) + so guaranteed failures never reach the DB; ``_split_non_unique`` then turns the survivors + into a write plan carrying each resolved version, and the unapproved-contribution quota runs + last on that plan. + + Returns: + tuple of (failures and their reasons, a ``ResolvedWrite`` per contribution to write) + """ + # Per-item project authorization (see _split_unauthorized for the per-item vs fail-fast + # decision). Only authorized items reach Mongo; the rest are reported in ``failed``. + unauthorized_failures, authorized_indices = self._split_unauthorized(range(len(contributions)), contributions) + # Reject contributions that have too many components associated with them. + oversize_failures, sized_indices = self._split_oversize(authorized_indices, contributions) + # Verify identifiers/uniqueness within a project and resolve each version, depending on + # project.unique_identifiers and whether this is an insert or upsert. + non_unique_failures, plan = await self._split_non_unique(sized_indices, contributions, is_upsert=is_upsert) + # Reject writes that would push an unapproved project past its contribution cap. + quota_failures, plan = await self._split_quota_exceeded(plan, is_upsert=is_upsert) + return (unauthorized_failures + oversize_failures + non_unique_failures + quota_failures, plan) + async def _insert_no_components( self, items: list[ResolvedWrite], @@ -561,6 +579,40 @@ async def _bounded_upsert(item: ResolvedWrite) -> Contribution | BulkFailure: failed = failures + [r for r in results if isinstance(r, BulkFailure)] return BulkWriteSummary[Contribution](total=len(contributions), succeeded=succeeded, failed=failed) + async def upsert_contribution_by_id(self, id: str, contribution: ContributionIn) -> Contribution: + """Upsert a single contribution by document id, enforcing the unapproved-project quota. + + Updating an existing (in-scope) contribution is always allowed. When ``id`` matches nothing + the repository inserts a new document, so the same unapproved cap that bounds inserts is + applied first: a new contribution for an unapproved project already at (or over) the cap is + rejected before the write. + + Raises: + PermissionError: inserting a new contribution would exceed the unapproved cap + """ + existing = await self._contributions.get_contribution_by_id(id, fields=frozenset({"id"})) + if existing is None: + stored = await self._unapproved_stored_count(contribution.project) + cap = get_settings().user.max_unapproved_contributions_per_project + if stored is not None and stored > cap: + logger.warning( + "contribution.unapproved_quota_exceeded", + project=contribution.project, + max_allowed=cap, + stored=stored, + attempted=1, + accepted=0, + rejected=1, + rejected_identifiers=[contribution.identifier], + rejected_identifiers_truncated=False, + ) + raise PermissionError( + "Attempted to add more than the allowed number of unapproved contributions", + project=contribution.project, + max_contribs=cap, + ) + return await self._contributions.upsert_contribution_by_id(id, contribution) + async def delete_contributions(self, filter: ContributionFilter) -> BulkDeleteSummary: """Delete a contribution and all of its child components diff --git a/mpcontribs-api/tests/integration/test_contributions_routes.py b/mpcontribs-api/tests/integration/test_contributions_routes.py index 36adad5984..67075ef71e 100644 --- a/mpcontribs-api/tests/integration/test_contributions_routes.py +++ b/mpcontribs-api/tests/integration/test_contributions_routes.py @@ -145,8 +145,8 @@ def test_patch_by_id_conventional_path(self, client, contribution_repo): r = client.patch(f"/api/v1/contributions/{PydanticObjectId()}", json={"formula": "H2O"}) assert r.status_code == 200 - def test_put_by_id_conventional_path(self, client, contribution_repo): - contribution_repo.upsert_contribution_by_id.return_value = SAMPLE_OUT + def test_put_by_id_conventional_path(self, client, contribution_service): + contribution_service.upsert_contribution_by_id.return_value = SAMPLE_OUT r = client.put(f"/api/v1/contributions/{PydanticObjectId()}", json=_valid_contribution_body()) assert r.status_code == 200 @@ -278,14 +278,14 @@ def test_delete_by_id_anon_401(self, client, contribution_service): r = client.delete(f"/api/v1/contributions/{PydanticObjectId()}", headers=FORCE_ANON_HEADERS) assert r.status_code == 401 - def test_put_by_id_anon_401(self, client, contribution_repo): + def test_put_by_id_anon_401(self, client, contribution_service): r = client.put( f"/api/v1/contributions/{PydanticObjectId()}", json=_valid_contribution_body(), headers=FORCE_ANON_HEADERS, ) assert r.status_code == 401 - contribution_repo.upsert_contribution_by_id.assert_not_called() + contribution_service.upsert_contribution_by_id.assert_not_called() def test_patch_by_id_anon_401(self, client, contribution_repo): r = client.patch( diff --git a/mpcontribs-api/tests/unit/domains/test_contribution_service.py b/mpcontribs-api/tests/unit/domains/test_contribution_service.py index e706a9f2d4..93435de61c 100644 --- a/mpcontribs-api/tests/unit/domains/test_contribution_service.py +++ b/mpcontribs-api/tests/unit/domains/test_contribution_service.py @@ -8,10 +8,10 @@ from pymongo.errors import BulkWriteError from mpcontribs_api.authz import ADMIN_GROUP, User -from mpcontribs_api.config import MongoSettings +from mpcontribs_api.config import MongoSettings, get_settings from mpcontribs_api.domains.attachments.models import Attachment, AttachmentIn -from mpcontribs_api.domains.contributions.models import Contribution, ContributionIn from mpcontribs_api.domains.contributions import service as service_module +from mpcontribs_api.domains.contributions.models import Contribution, ContributionIn from mpcontribs_api.domains.contributions.service import ContributionService from mpcontribs_api.domains.structures.models import ( Lattice, @@ -22,7 +22,7 @@ StructureIn, ) from mpcontribs_api.domains.tables.models import Attributes, Labels, Table, TableIn -from mpcontribs_api.exceptions import ConflictError, ValidationError +from mpcontribs_api.exceptions import ConflictError, PermissionError, ValidationError pytestmark = pytest.mark.asyncio @@ -153,7 +153,6 @@ def _make_service( settings: MongoSettings | None = None, write_slots: asyncio.Semaphore | None = None, user: User | None = None, - projects=None, unique_identifiers: bool = True, ) -> tuple[ContributionService, AsyncMock, AsyncMock, AsyncMock, AsyncMock, MagicMock]: contrib_repo = contributions or AsyncMock() @@ -187,6 +186,7 @@ def _approved_projects_repo() -> AsyncMock: """A projects repo whose every project reads as approved (quota does not apply).""" repo = AsyncMock() repo.get_by_id = AsyncMock(return_value=MagicMock(is_approved=True)) + repo.unique_identifiers_by_id.side_effect = lambda ids: {pid: True for pid in ids} return repo @@ -194,6 +194,7 @@ def _unapproved_projects_repo() -> AsyncMock: """A projects repo whose every project reads as unapproved (quota applies).""" repo = AsyncMock() repo.get_by_id = AsyncMock(return_value=MagicMock(is_approved=False)) + repo.unique_identifiers_by_id.side_effect = lambda ids: {pid: True for pid in ids} return repo @@ -286,6 +287,7 @@ async def _get_by_id(project_id, fields=None): return MagicMock(is_approved=approval[project_id]) repo.get_by_id = AsyncMock(side_effect=_get_by_id) + repo.unique_identifiers_by_id.side_effect = lambda ids: {pid: True for pid in ids} return repo @@ -389,6 +391,118 @@ async def test_approved_project_emits_no_audit_log(self, monkeypatch): warn.assert_not_called() +# --------------------------------------------------------------------------- +# upsert_contributions — unapproved-contribution quota (new docs only) +# --------------------------------------------------------------------------- + + +class TestUpsertContributionsUnapprovedQuota: + async def test_only_new_documents_count_against_cap(self, monkeypatch): + # cap 2, 2 stored -> one slot for a new document; updating an existing one is free. + monkeypatch.setattr(get_settings().user, "max_unapproved_contributions_per_project", 2) + contrib_repo = AsyncMock() + contrib_repo.upsert_contribution_by_identifiers.return_value = MagicMock(spec=Contribution) + contrib_repo.count_contributions_for_project.return_value = 2 + contrib_repo.existing_versioned_keys.return_value = {("proj", "a", 1)} # 'a' already exists + svc, *_ = _make_service(contributions=contrib_repo, projects=_unapproved_projects_repo()) + + contribs = [ + _contrib_in(identifier="a"), # update of an existing contribution -> always allowed + _contrib_in(identifier="b"), # new -> consumes the one remaining slot + _contrib_in(identifier="c"), # new -> over cap, rejected + ] + summary = await svc.upsert_contributions(contribs) + + assert len(summary.succeeded) == 2 + assert [f.index for f in summary.failed] == [2] + assert summary.failed[0].error_code == "permission_denied" + upserted = {c.args[1].identifier for c in contrib_repo.upsert_contribution_by_identifiers.call_args_list} + assert upserted == {"a", "b"} + + async def test_pure_updates_are_never_capped(self, monkeypatch): + monkeypatch.setattr(get_settings().user, "max_unapproved_contributions_per_project", 1) + contrib_repo = AsyncMock() + contrib_repo.upsert_contribution_by_identifiers.return_value = MagicMock(spec=Contribution) + contrib_repo.count_contributions_for_project.return_value = 99 # far over cap + contrib_repo.existing_versioned_keys.return_value = {("proj", f"mp-{i}", 1) for i in range(3)} + svc, *_ = _make_service(contributions=contrib_repo, projects=_unapproved_projects_repo()) + + summary = await svc.upsert_contributions([_contrib_in(identifier=f"mp-{i}") for i in range(3)]) + + assert len(summary.succeeded) == 3 + assert summary.failed == [] + assert contrib_repo.upsert_contribution_by_identifiers.call_count == 3 + + async def test_approved_project_skips_quota(self, monkeypatch): + monkeypatch.setattr(get_settings().user, "max_unapproved_contributions_per_project", 1) + contrib_repo = AsyncMock() + contrib_repo.upsert_contribution_by_identifiers.return_value = MagicMock(spec=Contribution) + svc, *_ = _make_service(contributions=contrib_repo, projects=_approved_projects_repo()) + + summary = await svc.upsert_contributions([_contrib_in(identifier=f"mp-{i}") for i in range(3)]) + + assert len(summary.succeeded) == 3 + assert summary.failed == [] + contrib_repo.count_contributions_for_project.assert_not_called() + contrib_repo.existing_versioned_keys.assert_not_called() + + +# --------------------------------------------------------------------------- +# upsert_contribution_by_id — single-record quota +# --------------------------------------------------------------------------- + + +class TestUpsertContributionByIdQuota: + async def test_update_existing_allowed_even_over_cap(self, monkeypatch): + monkeypatch.setattr(get_settings().user, "max_unapproved_contributions_per_project", 1) + contrib_repo = AsyncMock() + contrib_repo.get_contribution_by_id.return_value = MagicMock(spec=Contribution) # id exists -> update + contrib_repo.count_contributions_for_project.return_value = 99 + contrib_repo.upsert_contribution_by_id.return_value = MagicMock(spec=Contribution) + svc, *_ = _make_service(contributions=contrib_repo, projects=_unapproved_projects_repo()) + + await svc.upsert_contribution_by_id("someid", _contrib_in()) + + contrib_repo.upsert_contribution_by_id.assert_called_once() + contrib_repo.count_contributions_for_project.assert_not_called() + + async def test_new_insert_over_cap_rejected(self, monkeypatch): + monkeypatch.setattr(get_settings().user, "max_unapproved_contributions_per_project", 2) + contrib_repo = AsyncMock() + contrib_repo.get_contribution_by_id.return_value = None # id absent -> would insert + contrib_repo.count_contributions_for_project.return_value = 5 # over cap + svc, *_ = _make_service(contributions=contrib_repo, projects=_unapproved_projects_repo()) + + with pytest.raises(PermissionError): + await svc.upsert_contribution_by_id("someid", _contrib_in()) + + contrib_repo.upsert_contribution_by_id.assert_not_called() + + async def test_new_insert_under_cap_allowed(self, monkeypatch): + monkeypatch.setattr(get_settings().user, "max_unapproved_contributions_per_project", 5) + contrib_repo = AsyncMock() + contrib_repo.get_contribution_by_id.return_value = None + contrib_repo.count_contributions_for_project.return_value = 1 + contrib_repo.upsert_contribution_by_id.return_value = MagicMock(spec=Contribution) + svc, *_ = _make_service(contributions=contrib_repo, projects=_unapproved_projects_repo()) + + await svc.upsert_contribution_by_id("someid", _contrib_in()) + + contrib_repo.upsert_contribution_by_id.assert_called_once() + + async def test_new_insert_approved_project_unlimited(self, monkeypatch): + monkeypatch.setattr(get_settings().user, "max_unapproved_contributions_per_project", 1) + contrib_repo = AsyncMock() + contrib_repo.get_contribution_by_id.return_value = None + contrib_repo.upsert_contribution_by_id.return_value = MagicMock(spec=Contribution) + svc, *_ = _make_service(contributions=contrib_repo, projects=_approved_projects_repo()) + + await svc.upsert_contribution_by_id("someid", _contrib_in()) + + contrib_repo.upsert_contribution_by_id.assert_called_once() + contrib_repo.count_contributions_for_project.assert_not_called() + + # --------------------------------------------------------------------------- # insert_contributions — no-component fast path # --------------------------------------------------------------------------- From 0c80fa888b25b4b58a3c5bdf0547f616890db189 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 20 Jul 2026 10:46:56 -0700 Subject: [PATCH 494/591] Fixed N+1 projects being allowed --- .../domains/contributions/repository.py | 10 +--- .../domains/contributions/service.py | 4 +- .../mpcontribs_api/domains/projects/models.py | 3 +- .../domains/projects/repository.py | 20 ++++--- .../db/test_projects_repository.py | 51 +++++++++++++++++ .../unit/domains/test_contribution_service.py | 49 +++++++++++++++-- .../unit/domains/test_projects_models.py | 55 +++++++++++++++++++ 7 files changed, 168 insertions(+), 24 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py index d12fb5587c..094f11a85b 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py @@ -48,14 +48,12 @@ def _build_scope(user: User) -> dict[str, Any]: async def count_contributions_for_project(self, project_name: str) -> int: """Count contributions already stored for a project. - Unscoped on purpose: the unapproved-contribution quota is a property of the project as a + Unscoped: the unapproved-contribution quota is a property of the project as a whole, not of what the current user can see. The cap comparison lives in the service. """ return await self.document_model.find(self.document_model.project == project_name).count() - async def existing_versioned_keys( - self, keys: list[tuple[str, str, int]] - ) -> set[tuple[str, str, int]]: + async def existing_versioned_keys(self, keys: list[tuple[str, str, int]]) -> set[tuple[str, str, int]]: """Return which ``(project, identifier, version)`` triples already have a stored document. Args: @@ -66,9 +64,7 @@ async def existing_versioned_keys( """ if not keys: return set() - match: dict[str, Any] = { - "$or": [{"project": p, "identifier": i, "version": v} for p, i, v in keys] - } + match: dict[str, Any] = {"$or": [{"project": p, "identifier": i, "version": v} for p, i, v in keys]} collection = self.document_model.get_pymongo_collection() existing: set[tuple[str, str, int]] = set() async for doc in collection.find(match, {"project": 1, "identifier": 1, "version": 1}): diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py index 26ba11fa86..c6cf680967 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py @@ -332,7 +332,7 @@ async def _split_quota_exceeded( continue # Upserts against an existing row are updates (no new document); only absent keys count. existing = await self._existing_keys(items) if is_upsert else set() - allowed = max(0, cap - stored + 1) + allowed = max(0, cap - stored) rejected: list[ResolvedWrite] = [] for item in items: key = (item.contribution.project, item.contribution.identifier, item.version) @@ -594,7 +594,7 @@ async def upsert_contribution_by_id(self, id: str, contribution: ContributionIn) if existing is None: stored = await self._unapproved_stored_count(contribution.project) cap = get_settings().user.max_unapproved_contributions_per_project - if stored is not None and stored > cap: + if stored is not None and stored >= cap: logger.warning( "contribution.unapproved_quota_exceeded", project=contribution.project, diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py index 69abf0308a..240ef80d2b 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py @@ -2,12 +2,11 @@ from typing import Any, Literal -from fastapi_filter.contrib.beanie import Filter from pydantic import BaseModel, ConfigDict, Field, HttpUrl, field_validator from mpcontribs_api import pagination -from mpcontribs_api.domains._shared.filters import BaseFilter from mpcontribs_api.config import get_settings +from mpcontribs_api.domains._shared.filters import BaseFilter from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut from mpcontribs_api.domains._shared.types import PrefixedEmail, ShortStr from mpcontribs_api.exceptions import ValidationError diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py index 07a60a8491..6a184f7feb 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py @@ -46,13 +46,14 @@ def _build_scope(user: User) -> dict[str, Any]: ors.append({"_id": {"$in": sorted(user.groups)}}) return {"$or": ors} - async def _check_num_projects(self, data: ProjectIn): + async def _check_num_projects(self, owner: str): + """Reject a *new* project that would push ``owner`` past the per-user cap.""" settings = get_settings() - result = await Project.find(Project.owner == data.owner).count() - if result > settings.user.max_projects: + result = await Project.find(Project.owner == owner).count() + if result >= settings.user.max_projects: raise PermissionError( f"Cannot be owner of more than {settings.user.max_projects} projects", - owner=data.owner, + owner=owner, num_projects=result, ) @@ -95,7 +96,7 @@ async def unique_identifiers_by_id(self, ids: list[str]) -> dict[str, bool]: async def insert_project(self, project: ProjectIn) -> Project: """Insert a new project, rejecting a duplicate id. See ``insert_one``.""" - await self._check_num_projects(project) + await self._check_num_projects(project.owner) return await self.insert_one(project) async def patch_project_by_id(self, id: str, update: ProjectPatch) -> Project: @@ -133,17 +134,18 @@ async def upsert_project_by_id(self, id: str, data: ProjectIn) -> Project: if self._user.username is None: raise PermissionError(required_role="authenticated") - await self._check_num_projects(data) - existing = await self.document_model.find_one(self.document_model.id == id) project = self.document_model.from_input_model(data) project.id = id if existing is not None: if not (self._user.is_admin or existing.owner == self._user.username): raise PermissionError(required_role="owner-or-admin") - # Ownership is immutable via upsert; keep the original owner. + # Ownership is immutable via upsert; keep the original owner. Updating an existing + # project does not create a new one, so the per-user project cap does not apply. project.owner = existing.owner else: - # New project: the caller owns it, regardless of the submitted owner. + # New project: the caller owns it, regardless of the submitted owner. Enforce the + # per-user cap against the caller before creating another project under their name. project.owner = self._user.username + await self._check_num_projects(self._user.username) return await project.save() diff --git a/mpcontribs-api/tests/integration/db/test_projects_repository.py b/mpcontribs-api/tests/integration/db/test_projects_repository.py index 6ec770c1aa..d73a020ed5 100644 --- a/mpcontribs-api/tests/integration/db/test_projects_repository.py +++ b/mpcontribs-api/tests/integration/db/test_projects_repository.py @@ -387,3 +387,54 @@ async def test_update_preserves_original_owner(self, db): await _repo(ALICE).upsert_project_by_id(id="auth-preserve", data=data) found = await Project.find_one(Project.id == "auth-preserve") assert found.owner == "google:alice@example.com" + + +# --------------------------------------------------------------------------- +# Per-user project-count quota (max_projects) +# --------------------------------------------------------------------------- + + +ALICE_EMAIL = "google:alice@example.com" + + +class TestProjectCountQuota: + async def test_insert_can_reach_exactly_cap(self, db, monkeypatch): + # The cap is inclusive: a user may own up to (not fewer than) max_projects. + from mpcontribs_api.config import get_settings + + monkeypatch.setattr(get_settings().user, "max_projects", 2) + await _insert("cap-1", owner=ALICE_EMAIL) + await _insert("cap-2", owner=ALICE_EMAIL) + assert await Project.find(Project.owner == ALICE_EMAIL).count() == 2 + + async def test_insert_over_cap_rejected(self, db, monkeypatch): + from mpcontribs_api.config import get_settings + from mpcontribs_api.exceptions import PermissionError as AppPermissionError + + monkeypatch.setattr(get_settings().user, "max_projects", 2) + await _insert("cap-a", owner=ALICE_EMAIL) + await _insert("cap-b", owner=ALICE_EMAIL) + with pytest.raises(AppPermissionError): + await _insert("cap-c", owner=ALICE_EMAIL) + + async def test_upsert_new_project_over_cap_rejected(self, db, monkeypatch): + # A brand-new project via upsert is counted against the caller's cap. + from mpcontribs_api.config import get_settings + from mpcontribs_api.exceptions import PermissionError as AppPermissionError + + monkeypatch.setattr(get_settings().user, "max_projects", 1) + await _insert("owned-1", owner=ALICE_EMAIL) + data = _project_in("new-proj", owner=ALICE_EMAIL) + with pytest.raises(AppPermissionError): + await _repo(ALICE).upsert_project_by_id(id="new-proj", data=data) + + async def test_upsert_existing_project_allowed_at_cap(self, db, monkeypatch): + # Regression: updating a project you already own must never be blocked by the cap, even + # when you are exactly at it. Only *new* projects count against the quota. + from mpcontribs_api.config import get_settings + + monkeypatch.setattr(get_settings().user, "max_projects", 1) + await _insert("owned-only", owner=ALICE_EMAIL) + data = _project_in("owned-only", owner=ALICE_EMAIL, title="Updated Title") + result = await _repo(ALICE).upsert_project_by_id(id="owned-only", data=data) + assert result.title == "Updated Title" diff --git a/mpcontribs-api/tests/unit/domains/test_contribution_service.py b/mpcontribs-api/tests/unit/domains/test_contribution_service.py index 93435de61c..18ee6f5930 100644 --- a/mpcontribs-api/tests/unit/domains/test_contribution_service.py +++ b/mpcontribs-api/tests/unit/domains/test_contribution_service.py @@ -308,11 +308,11 @@ async def test_unapproved_project_at_capacity_fails_all(self, monkeypatch): contrib_repo.insert_many_contributions.assert_not_called() async def test_batch_trimmed_to_remaining_capacity(self, monkeypatch): - # cap 5, 4 already stored -> remaining = 5 - 4 + 1 = 2 slots for this batch + # cap 5, 3 already stored -> remaining = 5 - 3 = 2 slots for this batch monkeypatch.setattr(get_settings().user, "max_unapproved_contributions_per_project", 5) contrib_repo = AsyncMock() contrib_repo.insert_many_contributions.return_value = None - contrib_repo.count_contributions_for_project.return_value = 4 + contrib_repo.count_contributions_for_project.return_value = 3 svc, *_ = _make_service(contributions=contrib_repo, projects=_unapproved_projects_repo()) summary = await svc.insert_contributions([_contrib_in(identifier=f"mp-{i}") for i in range(4)]) @@ -324,6 +324,34 @@ async def test_batch_trimmed_to_remaining_capacity(self, monkeypatch): inserted = contrib_repo.insert_many_contributions.call_args[0][0] assert len(inserted) == 2 + async def test_batch_may_fill_project_to_exactly_cap(self, monkeypatch): + # cap 3, 2 stored -> exactly one slot; the batch fills the project to the cap, not past it. + monkeypatch.setattr(get_settings().user, "max_unapproved_contributions_per_project", 3) + contrib_repo = AsyncMock() + contrib_repo.insert_many_contributions.return_value = None + contrib_repo.count_contributions_for_project.return_value = 2 + svc, *_ = _make_service(contributions=contrib_repo, projects=_unapproved_projects_repo()) + + summary = await svc.insert_contributions([_contrib_in(identifier=f"mp-{i}") for i in range(2)]) + + assert summary.total == 2 + assert len(summary.succeeded) == 1 + assert [f.index for f in summary.failed] == [1] + + async def test_batch_at_exactly_cap_rejects_all_new(self, monkeypatch): + # cap 3, 3 stored -> zero remaining slots; a project already at the cap admits nothing new. + monkeypatch.setattr(get_settings().user, "max_unapproved_contributions_per_project", 3) + contrib_repo = AsyncMock() + contrib_repo.insert_many_contributions.return_value = None + contrib_repo.count_contributions_for_project.return_value = 3 + svc, *_ = _make_service(contributions=contrib_repo, projects=_unapproved_projects_repo()) + + summary = await svc.insert_contributions([_contrib_in(identifier=f"mp-{i}") for i in range(2)]) + + assert [f.index for f in summary.failed] == [0, 1] + assert summary.succeeded == [] + contrib_repo.insert_many_contributions.assert_not_called() + async def test_approved_project_is_unlimited(self, monkeypatch): monkeypatch.setattr(get_settings().user, "max_unapproved_contributions_per_project", 1) contrib_repo = AsyncMock() @@ -398,8 +426,8 @@ async def test_approved_project_emits_no_audit_log(self, monkeypatch): class TestUpsertContributionsUnapprovedQuota: async def test_only_new_documents_count_against_cap(self, monkeypatch): - # cap 2, 2 stored -> one slot for a new document; updating an existing one is free. - monkeypatch.setattr(get_settings().user, "max_unapproved_contributions_per_project", 2) + # cap 3, 2 stored -> one slot for a new document; updating an existing one is free. + monkeypatch.setattr(get_settings().user, "max_unapproved_contributions_per_project", 3) contrib_repo = AsyncMock() contrib_repo.upsert_contribution_by_identifiers.return_value = MagicMock(spec=Contribution) contrib_repo.count_contributions_for_project.return_value = 2 @@ -490,6 +518,19 @@ async def test_new_insert_under_cap_allowed(self, monkeypatch): contrib_repo.upsert_contribution_by_id.assert_called_once() + async def test_new_insert_at_exactly_cap_rejected(self, monkeypatch): + # stored == cap: the project is full, so a brand-new document is rejected (no cap+1 slack). + monkeypatch.setattr(get_settings().user, "max_unapproved_contributions_per_project", 2) + contrib_repo = AsyncMock() + contrib_repo.get_contribution_by_id.return_value = None + contrib_repo.count_contributions_for_project.return_value = 2 + svc, *_ = _make_service(contributions=contrib_repo, projects=_unapproved_projects_repo()) + + with pytest.raises(PermissionError): + await svc.upsert_contribution_by_id("someid", _contrib_in()) + + contrib_repo.upsert_contribution_by_id.assert_not_called() + async def test_new_insert_approved_project_unlimited(self, monkeypatch): monkeypatch.setattr(get_settings().user, "max_unapproved_contributions_per_project", 1) contrib_repo = AsyncMock() diff --git a/mpcontribs-api/tests/unit/domains/test_projects_models.py b/mpcontribs-api/tests/unit/domains/test_projects_models.py index b874091e73..fd4a6d23da 100644 --- a/mpcontribs-api/tests/unit/domains/test_projects_models.py +++ b/mpcontribs-api/tests/unit/domains/test_projects_models.py @@ -254,3 +254,58 @@ def test_returns_plain_str_not_object_id(self): def test_malformed_cursor_raises_value_error(self): with pytest.raises(ValueError): Project.decode_cursor("!!!not-base64!!!") + + +# --------------------------------------------------------------------------- +# Column-length quota (max_columns) +# --------------------------------------------------------------------------- + + +def _columns(n: int) -> list[Column]: + return [Column(path=f"data.col_{i}") for i in range(n)] + + +class TestColumnLengthQuota: + """A project may carry at most ``user.max_columns`` columns; the limit is inclusive.""" + + def _make_input(self, columns: list[Column]) -> dict: + return { + "_id": "cols-proj", + "title": "Columns Project", + "authors": "Alice", + "description": "desc", + "owner": "google:alice@example.com", + "unique_identifiers": True, + "stats": VALID_STATS, + "columns": columns, + } + + def test_project_in_at_cap_is_allowed(self, monkeypatch): + from mpcontribs_api.config import get_settings + + monkeypatch.setattr(get_settings().user, "max_columns", 2) + project = ProjectIn(**self._make_input(_columns(2))) + assert len(project.columns) == 2 + + def test_project_in_over_cap_raises(self, monkeypatch): + from mpcontribs_api.config import get_settings + from mpcontribs_api.exceptions import ValidationError as AppValidationError + + monkeypatch.setattr(get_settings().user, "max_columns", 2) + with pytest.raises(AppValidationError): + ProjectIn(**self._make_input(_columns(3))) + + def test_project_patch_at_cap_is_allowed(self, monkeypatch): + from mpcontribs_api.config import get_settings + + monkeypatch.setattr(get_settings().user, "max_columns", 2) + patch = ProjectPatch(columns=_columns(2)) + assert len(patch.columns) == 2 + + def test_project_patch_over_cap_raises(self, monkeypatch): + from mpcontribs_api.config import get_settings + from mpcontribs_api.exceptions import ValidationError as AppValidationError + + monkeypatch.setattr(get_settings().user, "max_columns", 2) + with pytest.raises(AppValidationError): + ProjectPatch(columns=_columns(3)) From 94d25068b8aa253970388573f72eb077f560479c Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 22 Jul 2026 16:08:28 -0700 Subject: [PATCH 495/591] Legacy docs that exceed current column limits are able to be returned. Adding project with columns=None is now valid --- mpcontribs-api/src/mpcontribs_api/config.py | 2 +- .../mpcontribs_api/domains/projects/models.py | 39 ++++++++++--------- 2 files changed, 21 insertions(+), 20 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/config.py b/mpcontribs-api/src/mpcontribs_api/config.py index 9f9e0bedcf..d5d36480ea 100644 --- a/mpcontribs-api/src/mpcontribs_api/config.py +++ b/mpcontribs-api/src/mpcontribs_api/config.py @@ -8,7 +8,7 @@ class UserSettings(BaseModel): max_projects: int = Field( default=3, - description="The maximumum number of projects a single user is allowed to create", + description="The maximum number of projects a single user is allowed to create", ) max_unapproved_contributions_per_project: int = Field( default=500, diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py index 240ef80d2b..fe09e7481d 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py @@ -11,7 +11,20 @@ from mpcontribs_api.domains._shared.types import PrefixedEmail, ShortStr from mpcontribs_api.exceptions import ValidationError -settings = get_settings() + +def _validate_column_limit(columns: Any) -> Any: + """Reject input carrying more than the configured column cap. + + Allows legacy docs that exceed cap to be returned without raising an error. + """ + if isinstance(columns, list): + max_columns = get_settings().user.max_columns + if len(columns) > max_columns: + raise ValidationError( + f"columns cannot have more than {max_columns} entries", + column_length=len(columns), + ) + return columns class Column(BaseModel): @@ -76,16 +89,6 @@ def decode_cursor(cursor: str) -> str: """ return pagination.decode_cursor(cursor) - @field_validator("columns", mode="before") - @classmethod - def limit_column_length(cls, c: list[Column]) -> list[Column]: - if len(c) > settings.user.max_columns: - raise ValidationError( - f"columns cannot have more than {settings.user.max_columns} entries", - column_length=len(c), - ) - return c - class Settings: name = "projects" keep_nulls = False @@ -152,7 +155,10 @@ class Constants(BaseFilter.Constants): class ProjectIn(Project): """Representation of user-supplied input.""" - pass + @field_validator("columns", mode="before") + @classmethod + def limit_column_length(cls, c: Any) -> Any: + return _validate_column_limit(c) class ProjectPatch(BaseModel): @@ -173,10 +179,5 @@ class ProjectPatch(BaseModel): @field_validator("columns", mode="before") @classmethod - def limit_column_length(cls, c: list[Column]) -> list[Column]: - if len(c) > settings.user.max_columns: - raise ValidationError( - f"columns cannot have more than {settings.user.max_columns} entries", - column_length=len(c), - ) - return c + def limit_column_length(cls, c: Any) -> Any: + return _validate_column_limit(c) From 4927a84f3e1a9e3cebd1656c04c147cfd42a8465 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 22 Jul 2026 16:53:25 -0700 Subject: [PATCH 496/591] Fixed bug where users could insert a contribution into a project they don't have write access to by using upsert_contribution_by_id --- .../domains/contributions/service.py | 16 +++--- .../unit/domains/test_contribution_service.py | 57 +++++++++++++++++++ 2 files changed, 66 insertions(+), 7 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py index c6cf680967..a1f1c1a3bf 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py @@ -580,16 +580,18 @@ async def _bounded_upsert(item: ResolvedWrite) -> Contribution | BulkFailure: return BulkWriteSummary[Contribution](total=len(contributions), succeeded=succeeded, failed=failed) async def upsert_contribution_by_id(self, id: str, contribution: ContributionIn) -> Contribution: - """Upsert a single contribution by document id, enforcing the unapproved-project quota. - - Updating an existing (in-scope) contribution is always allowed. When ``id`` matches nothing - the repository inserts a new document, so the same unapproved cap that bounds inserts is - applied first: a new contribution for an unapproved project already at (or over) the cap is - rejected before the write. + """Upsert a single contribution by document id, enforcing write authorization and the quota. Raises: - PermissionError: inserting a new contribution would exceed the unapproved cap + PermissionError: the caller may not write the target project, or inserting a new + contribution would exceed the unapproved cap """ + if not self._user.can_write(contribution.project): + raise PermissionError( + f"not authorized to write to project '{contribution.project}'", + project=contribution.project, + ) + existing = await self._contributions.get_contribution_by_id(id, fields=frozenset({"id"})) if existing is None: stored = await self._unapproved_stored_count(contribution.project) diff --git a/mpcontribs-api/tests/unit/domains/test_contribution_service.py b/mpcontribs-api/tests/unit/domains/test_contribution_service.py index 18ee6f5930..838608b7ab 100644 --- a/mpcontribs-api/tests/unit/domains/test_contribution_service.py +++ b/mpcontribs-api/tests/unit/domains/test_contribution_service.py @@ -1063,6 +1063,63 @@ async def test_upsert_anonymous_authorized_for_nothing(self): assert [f.error_code for f in summary.failed] == ["permission_denied"] contrib_repo.upsert_contribution_by_identifiers.assert_not_called() + async def test_upsert_by_id_rejects_unauthorized_project(self): + # A member of "allowed" cannot write "forbidden" through the by-id endpoint. The check runs + # before any DB access, so neither the existence read nor the write is attempted — closing + # the gap where the upsert's unscoped insert branch would create the contribution anyway. + svc, contrib_repo, *_ = _make_service(user=_member_user("allowed")) + + with pytest.raises(PermissionError, match="forbidden"): + await svc.upsert_contribution_by_id("someid", _contrib_in(project="forbidden")) + + contrib_repo.get_contribution_by_id.assert_not_called() + contrib_repo.upsert_contribution_by_id.assert_not_called() + + async def test_upsert_by_id_unauthorized_cannot_overwrite_public_contribution(self): + # Defense against overwriting a project's public contribution you don't own: even though the + # repository read scope would admit a public row, authorization is enforced up front. + svc, contrib_repo, *_ = _make_service(user=_member_user("allowed")) + # An existing (readable) contribution must not lower the bar — authz still rejects the write. + contrib_repo.get_contribution_by_id.return_value = MagicMock(spec=Contribution) + + with pytest.raises(PermissionError, match="forbidden"): + await svc.upsert_contribution_by_id("someid", _contrib_in(project="forbidden")) + + contrib_repo.upsert_contribution_by_id.assert_not_called() + + async def test_upsert_by_id_anonymous_authorized_for_nothing(self): + svc, contrib_repo, *_ = _make_service(user=User()) # anonymous: no username, no groups + + with pytest.raises(PermissionError): + await svc.upsert_contribution_by_id("someid", _contrib_in(project="any")) + + contrib_repo.get_contribution_by_id.assert_not_called() + contrib_repo.upsert_contribution_by_id.assert_not_called() + + async def test_upsert_by_id_authorized_member_proceeds(self): + # A member writing to their own project passes authorization; updating an existing row is + # not gated by the quota, so the write goes through. + contrib_repo = AsyncMock() + contrib_repo.get_contribution_by_id.return_value = MagicMock(spec=Contribution) # exists -> update + contrib_repo.upsert_contribution_by_id.return_value = MagicMock(spec=Contribution) + svc, *_ = _make_service( + contributions=contrib_repo, projects=_unapproved_projects_repo(), user=_member_user("allowed") + ) + + await svc.upsert_contribution_by_id("someid", _contrib_in(project="allowed")) + + contrib_repo.upsert_contribution_by_id.assert_called_once() + + async def test_upsert_by_id_admin_bypasses_authorization(self): + contrib_repo = AsyncMock() + contrib_repo.get_contribution_by_id.return_value = MagicMock(spec=Contribution) + contrib_repo.upsert_contribution_by_id.return_value = MagicMock(spec=Contribution) + svc, *_ = _make_service(contributions=contrib_repo, projects=_approved_projects_repo()) # admin default + + await svc.upsert_contribution_by_id("someid", _contrib_in(project="anything")) + + contrib_repo.upsert_contribution_by_id.assert_called_once() + # --------------------------------------------------------------------------- # Process-wide write_slots semaphore is honored From b09ad55cce116c31da8073e41af0e54de7adfd7d Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 23 Jul 2026 10:51:14 -0700 Subject: [PATCH 497/591] Added comments denoting potentials for race-conditions exceeding quota limits by small amounts --- .../src/mpcontribs_api/domains/contributions/service.py | 2 ++ .../src/mpcontribs_api/domains/projects/repository.py | 2 ++ 2 files changed, 4 insertions(+) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py index a1f1c1a3bf..4ca81bf34c 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py @@ -89,6 +89,8 @@ async def _unapproved_stored_count(self, project_id: str) -> int | None: project = await self._projects.get_by_id(project_id, fields=frozenset({"is_approved"})) if not project or project.is_approved: return None + # Soft limit: this count feeds a non-atomic check-then-write, so concurrent writes to the + # same project can overshoot the cap by a bounded amount. Acceptable for an anti-abuse quota. return await self._contributions.count_contributions_for_project(project_id) async def insert_contributions( diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py index 6a184f7feb..204a6ea78f 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py @@ -49,6 +49,8 @@ def _build_scope(user: User) -> dict[str, Any]: async def _check_num_projects(self, owner: str): """Reject a *new* project that would push ``owner`` past the per-user cap.""" settings = get_settings() + # Soft limit: this count-then-insert is not atomic, so concurrent creates by the same owner + # can overshoot the cap by a bounded amount. Acceptable for an anti-abuse quota. result = await Project.find(Project.owner == owner).count() if result >= settings.user.max_projects: raise PermissionError( From 932d11f58c5f792ad5eb681ab9c6cab67b531f73 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 23 Jul 2026 13:24:58 -0700 Subject: [PATCH 498/591] Added models and logic to support updates of Contributions and Contribution.data also updating Projects.stats and Projects.columns --- .../domains/contributions/repository.py | 107 ++++++++- .../domains/contributions/router.py | 11 +- .../domains/contributions/service.py | 126 +++++++--- .../domains/contributions/stats.py | 100 ++++++++ .../mpcontribs_api/domains/projects/models.py | 4 +- .../domains/projects/repository.py | 35 ++- .../integration/db/test_stats_recompute.py | 223 ++++++++++++++++++ .../domains/test_contribution_repository.py | 76 ++++++ .../unit/domains/test_contribution_service.py | 141 +++++------ .../unit/domains/test_contribution_stats.py | 71 ++++++ 10 files changed, 774 insertions(+), 120 deletions(-) create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/contributions/stats.py create mode 100644 mpcontribs-api/tests/integration/db/test_stats_recompute.py create mode 100644 mpcontribs-api/tests/unit/domains/test_contribution_repository.py create mode 100644 mpcontribs-api/tests/unit/domains/test_contribution_stats.py diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py index 1f404f48cc..a746f11992 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py @@ -18,9 +18,65 @@ ContributionOut, ContributionPatch, ) +from mpcontribs_api.domains.contributions.stats import ( + ColumnStat, + ProjectAggregate, + finalize_columns, + merge_contribution_columns, +) from mpcontribs_api.exceptions import PermissionError from mpcontribs_api.pagination import CursorParams +_ANNOTATED_LEAF_KEYS = frozenset({"value", "input_value", "display"}) + + +def _is_atomic_leaf(value: Any) -> bool: + """Whether a merge should replace ``value`` whole rather than descend into it. + + Non-dicts (scalars, lists) are always atomic. A dict is atomic only when it is an + annotated-value leaf; plain nested group dicts are *not* atomic so their sibling keys survive + the merge. + """ + if not isinstance(value, dict): + return True + return _ANNOTATED_LEAF_KEYS.issubset(value.keys()) + + +def _flatten_for_merge(prefix: str, value: dict[str, Any]) -> dict[str, Any]: + """Flatten a nested dict into ``{dotted.path: leaf}`` entries for a merge ``$set``. + + Recurses through plain group dicts so ``$set`` touches only the leaves named in the patch and + every unmentioned sibling key is preserved; stops at atomic leaves (see :func:`_is_atomic_leaf`). + An empty dict contributes nothing — merge adds/overwrites leaves, it never clears a subtree. + """ + flattened: dict[str, Any] = {} + for key, leaf in value.items(): + path = f"{prefix}.{key}" + if _is_atomic_leaf(leaf): + flattened[path] = leaf + else: + flattened.update(_flatten_for_merge(path, leaf)) + return flattened + + +def _build_update_set(update_data: dict[str, Any], *, replace_data: bool) -> dict[str, Any]: + """Translate a patch's field map into the document handed to ``$set``. + + With ``replace_data`` the map is used verbatim, so a dict field (``data``) overwrites the stored + value whole. Otherwise dict-valued fields are flattened to dotted paths so they deep-merge into + the stored dict — adding/overwriting only the named leaves — while scalar and list fields always + set directly. + """ + if replace_data: + return update_data + document: dict[str, Any] = {} + for field, value in update_data.items(): + if isinstance(value, dict): + document.update(_flatten_for_merge(field, value)) + else: + document[field] = value + return document + class MongoDbContributionRepository( MongoDbRepository[Contribution, ContributionIn, ContributionOut, ContributionFilter, ContributionPatch] @@ -138,13 +194,15 @@ async def _find_one_and_set( ) return await result # pyright: ignore[reportGeneralTypeIssues] # beanie UpdateQuery is awaitable, but pyright doesn't see it - async def patch_pivot_row( + async def update_contribution_by_identifiers( self, project: str, identifier: str, version: int, condition_key: str, update_data: dict[str, Any], + *, + replace_data: bool = False, ) -> Contribution | None: """Apply ``update_data`` to the single scoped row identified by its full pivot identity. @@ -152,14 +210,28 @@ async def patch_pivot_row( a patch updates exactly one pivoted contribution and never changes which row it is. Returns the updated document, or ``None`` when no in-scope row matches (the caller decides whether a missing row is an error). + + ``replace_data`` controls how dict-valued fields (notably ``data``) are applied: + + - **False (default):** deep-merge. Only the leaves named in ``update_data`` are ``$set`` (via + dotted paths), so unmentioned keys already in the stored dict are preserved (an addition). + - **True:** overwrite. The dict field replaces the stored value whole, dropping keys not in + the patch. + + Scalar and list fields always set directly regardless of ``replace_data``. """ - return await self._find_one_and_set( + document = _build_update_set(update_data, replace_data=replace_data) + criteria = ( self.document_model.project == project, self.document_model.identifier == identifier, self.document_model.version == version, self.document_model.condition_key == condition_key, - update_data=update_data, ) + # A merge whose only dict fields were empty produces no $set paths; MongoDB rejects an empty + # $set, so treat it as a no-op and return the current row unchanged. + if not document: + return await self.document_model.find_one(self._scope, *criteria) + return await self._find_one_and_set(*criteria, update_data=document) async def max_versions(self, keys: list[tuple[str, str, str]]) -> dict[tuple[str, str, str], int]: """Return ``{(project, identifier, condition_key): max_version}`` for the given keys. @@ -277,6 +349,35 @@ async def list_referenced_component_ids( """ return await self._scan_referenced_ids(ref_field, {"$exists": True}, scoped=scoped) + async def aggregate_project_stats(self, project_id: str) -> ProjectAggregate: + """Recompute derived stats/columns for one project from its current contributions. + + Deliberately **unscoped**: this is a system-computed rollup, not a user-facing read. Stats + must reflect every contribution in the project (a group contributor who cannot see sibling + contributions must not persist an undercount), so no user scope is merged into the ``$match``. + """ + collection = self.document_model.get_pymongo_collection() + match: dict[str, Any] = {"project": project_id} + + agg = ProjectAggregate() + pipeline: list[dict[str, Any]] = [ + {"$match": match}, + {"$group": {"_id": None, "contributions": {"$sum": 1}, "size": {"$sum": {"$bsonSize": "$$ROOT"}}}}, + ] + async for row in await collection.aggregate(pipeline): + agg.contributions = int(row.get("contributions", 0)) + agg.size = float(row.get("size", 0)) + + agg.structures = len(await collection.distinct("structures.$id", match)) + agg.tables = len(await collection.distinct("tables.$id", match)) + agg.attachments = len(await collection.distinct("attachments.$id", match)) + + acc: dict[str, ColumnStat] = {} + async for doc in collection.find(match, {"data": 1}): + merge_contribution_columns(acc, doc.get("data") or {}) + agg.columns = finalize_columns(acc) + return agg + async def upsert_contribution_by_identifiers( self, identifiers: dict[str, str | int], diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py index c9529e5ea6..995bd0c820 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py @@ -139,5 +139,12 @@ async def upsert_contribution_by_id(repo: ContributionDep, id: str, contribution @router.patch("/{id}", dependencies=[Depends(require_user)]) -async def patch_contribution_by_id(service: ContributionServiceDep, id: str, update: ContributionPatch): - return await service.patch_contribution(id=id, patch=update) +async def patch_contribution_by_id( + service: ContributionServiceDep, + id: str, + update: ContributionPatch, + replace_data: bool = False, +): + # replace_data=false (default) merges the patch's `data` into the stored dict (an addition); + # replace_data=true overwrites `data` whole, dropping columns not in the patch. + return await service.patch_contribution(id=id, patch=update, replace_data=replace_data) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py index 878ab64b2f..7e218f2265 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py @@ -28,6 +28,7 @@ ) from mpcontribs_api.domains.contributions.pivot import expand_contribution, expand_data from mpcontribs_api.domains.contributions.repository import MongoDbContributionRepository +from mpcontribs_api.domains.projects.models import Column, Stats from mpcontribs_api.domains.projects.repository import MongoDbProjectRepository from mpcontribs_api.domains.structures.models import Structure from mpcontribs_api.domains.structures.repository import MongoDbStructureRepository @@ -137,6 +138,7 @@ async def insert_contributions( failures + no_comp_failed + with_comp_failed, key=lambda f: f.index, ) + await self.update_project({doc.project for doc in succeeded}) return BulkWriteSummary[Contribution](total=len(contributions), succeeded=succeeded, failed=failed) def _expand_batch( @@ -598,9 +600,12 @@ async def _bounded_upsert(item: ResolvedWrite) -> Contribution | BulkFailure: results = await asyncio.gather(*[_bounded_upsert(item) for item in plan]) succeeded = [r for r in results if not isinstance(r, BulkFailure)] failed = failures + [r for r in results if isinstance(r, BulkFailure)] + await self.update_project({doc.project for doc in succeeded}) return BulkWriteSummary[Contribution](total=len(contributions), succeeded=succeeded, failed=failed) - async def patch_contribution(self, id: str, patch: ContributionPatch) -> list[Contribution]: + async def patch_contribution( + self, id: str, patch: ContributionPatch, *, replace_data: bool = False + ) -> list[Contribution]: """Partially update a contribution, fanning condition-bearing ``data`` onto its pivoted rows. The ``{id}`` in the path anchors the update: its stored ``(project, identifier, version)`` is @@ -616,9 +621,15 @@ async def patch_contribution(self, id: str, patch: ContributionPatch) -> list[Co Non-``data`` fields set on the patch are applied to every row the patch touches. + ``replace_data`` chooses how ``data`` is written onto each targeted row: by default (``False``) + it deep-merges — only the columns present in the patch are added/overwritten and any other + stored columns survive — so a patch is an *addition*. With ``True`` the patch's ``data`` + overwrites the row's ``data`` whole, dropping columns not in the patch (a full replace). + Args: id: the id of a contribution the caller may see; anchors the (project, identifier, version) patch: the partial update; ``data`` may carry unit/condition annotations + replace_data: overwrite ``data`` whole instead of merging the patch into it (default merge) Returns: list[Contribution]: the updated document(s), one per row the patch touched @@ -643,38 +654,54 @@ async def patch_contribution(self, id: str, patch: ContributionPatch) -> list[Co if patch.data is None: if not scalar_update: return [target] - updated = await self._contributions.patch_pivot_row( + updated = await self._contributions.update_contribution_by_identifiers( target.project, target.identifier, target.version, target.condition_key, scalar_update ) - return [updated] if updated is not None else [] - - rows = expand_data(patch.data) - - # No conditions: single row targeting the {id} contribution itself (units annotated in place). - if not any(row.condition_key for row in rows): - update_data = {**scalar_update, "data": rows[0].data} - updated = await self._contributions.patch_pivot_row( - target.project, target.identifier, target.version, target.condition_key, update_data - ) - return [updated] if updated is not None else [] - - # Conditions present: fan each signature onto the sibling row that already carries it. Missing - # rows are rejected — a patch matches existing pivots, it never mints new condition_keys. - updated_rows: list[Contribution] = [] - for row in rows: - update_data = {**scalar_update, "data": row.data} - updated = await self._contributions.patch_pivot_row( - target.project, target.identifier, target.version, row.condition_key, update_data - ) - if updated is None: - raise ValidationError( - f"no existing contribution for project '{target.project}', identifier " - f"'{target.identifier}', version {target.version} with condition_key " - f"'{row.condition_key}'; a patch updates existing pivoted rows and cannot create new ones", - condition_key=row.condition_key, + result = [updated] if updated is not None else [] + else: + rows = expand_data(patch.data) + # No conditions: single row targeting the {id} contribution itself (units annotated in place). + if not any(row.condition_key for row in rows): + update_data = {**scalar_update, "data": rows[0].data} + updated = await self._contributions.update_contribution_by_identifiers( + target.project, + target.identifier, + target.version, + target.condition_key, + update_data, + replace_data=replace_data, ) - updated_rows.append(updated) - return updated_rows + result = [updated] if updated is not None else [] + else: + # Conditions present: fan each signature onto the sibling row that already carries it. + # Missing rows are rejected — a patch matches existing pivots, never makes condition_keys. + updated_rows: list[Contribution] = [] + for row in rows: + update_data = {**scalar_update, "data": row.data} + updated = await self._contributions.update_contribution_by_identifiers( + target.project, + target.identifier, + target.version, + row.condition_key, + update_data, + replace_data=replace_data, + ) + if updated is None: + raise ValidationError( + f"no existing contribution for project '{target.project}', identifier " + f"'{target.identifier}', version {target.version} with condition_key " + f"'{row.condition_key}'; a patch updates existing pivoted rows and cannot create new ones", + project=target.project, + identifier=target.identifier, + version=target.version, + condition_key=row.condition_key, + ) + updated_rows.append(updated) + result = updated_rows + + # A patch can shift a column's min/max, its unit, or the document size — refresh the rollup. + await self.update_project({target.project}) + return result async def delete_contributions(self, filter: ContributionFilter) -> BulkDeleteSummary: """Delete a contribution and all of its child components @@ -690,6 +717,8 @@ async def delete_contributions(self, filter: ContributionFilter) -> BulkDeleteSu """ num_deleted_components = 0 num_deleted_contributions = 0 + # Projects touched by this delete, so their rollup stats can be recomputed once at the end. + affected_projects: set[str] = set() # Loop through cursor rather than materialize arbitrary number of Contributions while True: # Since we are deleting everything matching filter, we can continuously get the 1st page @@ -697,6 +726,7 @@ async def delete_contributions(self, filter: ContributionFilter) -> BulkDeleteSu pagination=CursorParams(cursor=None, limit=100), filter=filter, ) + affected_projects.update(c.project for c in page.items if c.project is not None) # For each component type, gather ObjectIds then bulk delete them # - components first so no children are left orphaned for field, repo in self._children.items(): @@ -713,4 +743,40 @@ async def delete_contributions(self, filter: ContributionFilter) -> BulkDeleteSu num_deleted_contributions += deleted_contribs.deleted_count if deleted_contribs else 0 if not page.items: break + await self.update_project(affected_projects) return BulkDeleteSummary(num_deleted=num_deleted_contributions, num_children_deleted=num_deleted_components) + + async def update_project(self, project_ids: Iterable[str]) -> None: + """Recompute ``Project.stats``/``Project.columns`` from current contributions, per project. + + Called after a contribution write/delete so a project's rollup stays in sync with its + contributions. Recomputes from the DB (rather than applying a per-write delta) because + ``columns`` min/max cannot be maintained incrementally on delete. Runs after the write + commits — the stats are eventually consistent, not part of the write's transaction. + + The recompute is best-effort: a failure to refresh one project's stats is logged and does + not fail the originating write (the data is already committed; stats self-heal on the next + write). Contributions in a batch almost always target a single project, so the affected set + is small and each project is aggregated sequentially. + """ + pids = {pid for pid in project_ids if pid} + if not pids: + return + updates: dict[str, tuple[Stats, list[Column]]] = {} + for pid in sorted(pids): + try: + agg = await self._contributions.aggregate_project_stats(pid) + except Exception: + logger.error("project_stats_recompute_failed", project=pid, exc_info=True) + continue + stats = Stats( + columns=len(agg.columns), + contributions=agg.contributions, + tables=agg.tables, + structures=agg.structures, + attachments=agg.attachments, + size=agg.size, + ) + columns = [Column(path=c.path, min=c.min, max=c.max, unit=c.unit) for c in agg.columns] + updates[pid] = (stats, columns) + await self._projects.set_stats_and_columns(updates) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/stats.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/stats.py new file mode 100644 index 0000000000..cc9e15a39a --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/stats.py @@ -0,0 +1,100 @@ +from collections.abc import Iterator +from dataclasses import dataclass, field +from typing import Any + +# Sentinel unit for a column whose leaves are not numeric (see module docstring). +NON_NUMERIC_UNIT = "NaN" + + +@dataclass(slots=True) +class ColumnStat: + """Accumulated min/max/unit for one dotted ``data`` path across a project's contributions.""" + + path: str + min: float | None = None + max: float | None = None + unit: str | None = None + # True once any contribution had a numeric value at this path. A path only ever seen as a + # non-numeric leaf keeps min/max None and reports the NON_NUMERIC_UNIT sentinel. + numeric: bool = False + + +@dataclass(slots=True) +class ProjectAggregate: + """Everything needed to rebuild ``Project.stats``/``Project.columns`` for one project.""" + + contributions: int = 0 + structures: int = 0 + tables: int = 0 + attachments: int = 0 + size: float = 0.0 + columns: list[ColumnStat] = field(default_factory=list) + + +def _is_annotated_leaf(node: dict[str, Any]) -> bool: + """True when ``node`` is the canonical annotated-data leaf shape (numeric ``value`` + ``display``). + + Both fields are always present on a leaf produced by ``AnnotatedData.as_dict`` and ``value`` is a + finite float, so requiring both distinguishes a leaf from an ordinary nested ``data`` object + (whose keys are user-supplied snake_case names). + """ + value = node.get("value") + return "display" in node and isinstance(value, (int, float)) and not isinstance(value, bool) + + +def iter_leaves(data: dict[str, Any], prefix: str = "") -> Iterator[tuple[str, float | None, str | None]]: + """Yield ``(path, numeric_value, unit)`` for every leaf of one contribution's ``data``. + + ``numeric_value`` is ``None`` for a non-numeric leaf; ``unit`` is the canonical unit for an + annotated leaf (possibly ``None``), ``None`` for a bare number, and :data:`NON_NUMERIC_UNIT` + for a non-numeric leaf. Nested plain objects are recursed; annotated leaves are not. + """ + for key, node in data.items(): + path = f"{prefix}.{key}" if prefix else key + if isinstance(node, dict): + if _is_annotated_leaf(node): + yield path, float(node["value"]), node.get("unit") + else: + yield from iter_leaves(node, path) + elif isinstance(node, bool): + # bool is an int subclass; a boolean is categorical, not a measurement. + yield path, None, NON_NUMERIC_UNIT + elif isinstance(node, (int, float)): + yield path, float(node), None + else: + yield path, None, NON_NUMERIC_UNIT + + +def merge_contribution_columns(acc: dict[str, ColumnStat], data: dict[str, Any]) -> None: + """Fold one contribution's ``data`` leaves into the per-path accumulator ``acc`` in place.""" + for path, value, unit in iter_leaves(data): + col = acc.get(path) + if col is None: + col = acc[path] = ColumnStat(path=path) + if value is None: + # Non-numeric leaf: only adopt the sentinel unit if we have not seen a numeric value. + if not col.numeric and col.unit is None: + col.unit = unit + continue + if not col.numeric: + col.numeric = True + col.min = col.max = value + col.unit = unit + else: + col.min = value if col.min is None else min(col.min, value) + col.max = value if col.max is None else max(col.max, value) + # Canonical (SI) units are consistent per path; keep the first numeric unit seen. + if col.unit is None: + col.unit = unit + + +def finalize_columns(acc: dict[str, ColumnStat]) -> list[ColumnStat]: + """Return the accumulated columns sorted by path, with non-numeric units normalized. + + A column that never saw a numeric value reports the :data:`NON_NUMERIC_UNIT` sentinel and leaves + ``min``/``max`` as ``None``. + """ + for col in acc.values(): + if not col.numeric and col.unit is None: + col.unit = NON_NUMERIC_UNIT + return [acc[path] for path in sorted(acc)] diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py index 7216c82acc..41d9c8935b 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py @@ -15,6 +15,7 @@ class Column(BaseModel): min: float | None = None max: float | None = None unit: str | None = None + precision: int | None = None @property def segments(self) -> tuple[str, ...]: @@ -59,7 +60,6 @@ class Project(BaseDocumentWithInput[ShortStr]): is_approved: bool = False license: Literal["CCA4", "CCPD"] | None = None - # Empty method for now. Keeping for business logic later @classmethod def from_input_model(cls, data: ProjectIn) -> Project: return cls(**data.model_dump()) @@ -68,7 +68,7 @@ def from_input_model(cls, data: ProjectIn) -> Project: def decode_cursor(cursor: str) -> str: """Decodes cursor and returns it as a str. - Needs override over parent class since Project.id is a simple str + Needs to override the parent class since Project.id is a simple str """ return pagination.decode_cursor(cursor) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py index 0e6f96a96c..93af6288e5 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py @@ -1,13 +1,17 @@ from typing import Any +from pymongo import UpdateOne + from mpcontribs_api.authz import User from mpcontribs_api.domains._shared.repository import MongoDbRepository from mpcontribs_api.domains.projects.models import ( + Column, Project, ProjectFilter, ProjectIn, ProjectOut, ProjectPatch, + Stats, ) from mpcontribs_api.exceptions import PermissionError from mpcontribs_api.pagination import CursorParams @@ -82,6 +86,33 @@ async def unique_identifiers_by_id(self, ids: list[str]) -> dict[str, bool]: result[doc["_id"]] = bool(doc.get("unique_identifiers")) return result + async def set_stats_and_columns(self, updates: dict[str, tuple[Stats, list[Column]]]) -> None: + """Overwrite the derived ``stats``/``columns`` of the given projects in one bulk write. + + A **system-computed write**: identity is the project ``_id`` alone and the user scope is + deliberately not applied. Stats are recomputed from a project's contributions after a write + (see ``ContributionService.update_project``) and must land even when the caller is a group + contributor who does not own the project. Missing ids match nothing and are silently skipped. + + Args: + updates: ``{project_id: (stats, columns)}`` to persist + """ + if not updates: + return + ops = [ + UpdateOne( + {"_id": pid}, + { + "$set": { + "stats": stats.model_dump(mode="json"), + "columns": [c.model_dump(mode="json") for c in cols], + } + }, + ) + for pid, (stats, cols) in updates.items() + ] + await self.document_model.get_pymongo_collection().bulk_write(ops, ordered=False) + async def insert_project(self, project: ProjectIn) -> Project: """Insert a new project, rejecting a duplicate id. See ``insert_one``.""" return await self.insert_one(project) @@ -130,6 +161,8 @@ async def upsert_project_by_id(self, id: str, data: ProjectIn) -> Project: # Ownership is immutable via upsert; keep the original owner. project.owner = existing.owner else: + # TODO: Check if Kong supplies email # New project: the caller owns it, regardless of the submitted owner. - project.owner = self._user.username + # project.owner = self._user.username + pass return await project.save() diff --git a/mpcontribs-api/tests/integration/db/test_stats_recompute.py b/mpcontribs-api/tests/integration/db/test_stats_recompute.py new file mode 100644 index 0000000000..b5e290e1af --- /dev/null +++ b/mpcontribs-api/tests/integration/db/test_stats_recompute.py @@ -0,0 +1,223 @@ +"""End-to-end tests for the Project.stats/columns recompute driven by contribution writes. + +Every contribution insert/delete recomputes the owning project's rollup (see +``ContributionService.update_project``). These tests drive the real service against the dev DB and +assert the project's persisted ``stats``/``columns`` after each step of the lifecycle: + + create project -> empty + insert 1 contribution with two structures + two tables (and data) -> filled + delete it -> empty + insert 1 contribution with no components -> filled from data only + delete it -> empty + insert two contributions whose data overlaps and diverges -> merged columns (a new column appears) + +Attachments are intentionally excluded from the "two of each component" step: the contribution +insert path only wires structures and tables (see ContributionService._do_insert_group), so +attachments submitted on a contribution would be dropped and never counted. Structure/table/ +attachment counting is symmetric in the aggregation, so this still exercises the component path. +""" + +import polars as pl +import pytest +from beanie import PydanticObjectId +from pymatgen.core import Element + +from mpcontribs_api.authz import User +from mpcontribs_api.domains.contributions.models import ContributionFilter, ContributionIn +from mpcontribs_api.domains.contributions.repository import MongoDbContributionRepository +from mpcontribs_api.domains.contributions.service import ContributionService +from mpcontribs_api.domains.attachments.repository import MongoDbAttachmentRepository +from mpcontribs_api.domains.projects.models import Column, Project, ProjectIn, Stats +from mpcontribs_api.domains.projects.repository import MongoDbProjectRepository +from mpcontribs_api.domains.structures.models import Lattice, Site, SiteProperties, Species, StructureIn +from mpcontribs_api.domains.structures.repository import MongoDbStructureRepository +from mpcontribs_api.domains.tables.models import TableIn +from mpcontribs_api.domains.tables.repository import MongoDbTableRepository + +pytestmark = [pytest.mark.db, pytest.mark.asyncio(loop_scope="session")] + + +ADMIN = User(username="google:admin@example.com", groups=frozenset({"admin"})) +EMPTY_STATS = Stats(columns=0, contributions=0, tables=0, structures=0, attachments=0, size=0.0) +PID = "stats-proj" + + +# --------------------------------------------------------------------------- +# Builders +# --------------------------------------------------------------------------- + + +def _service(client) -> ContributionService: + """A ContributionService wired exactly like the FastAPI dependency, for ADMIN.""" + return ContributionService( + client=client, + user=ADMIN, + projects=MongoDbProjectRepository(ADMIN), + contributions=MongoDbContributionRepository(ADMIN), + structures=MongoDbStructureRepository(ADMIN), + attachments=MongoDbAttachmentRepository(ADMIN), + tables=MongoDbTableRepository(ADMIN), + ) + + +async def _make_project(unique_identifiers: bool = True) -> Project: + project_in = ProjectIn( + _id=PID, + title="Stats Project", + authors="Test Author", + description="Recompute lifecycle fixture", + owner="google:admin@example.com", + unique_identifiers=unique_identifiers, + stats=EMPTY_STATS, + ) + return await MongoDbProjectRepository(ADMIN).insert_project(project_in) + + +def _structure(charge: float | None) -> StructureIn: + """A valid structure; ``charge`` is a hash field, so varying it yields a distinct md5.""" + return StructureIn( + name="struct", + lattice=Lattice( + matrix=pl.DataFrame([[1.0, 0.0, 0.0], [0.0, 1.0, 0.0], [0.0, 0.0, 1.0]]), + pbc=[True, True, True], + a=1.0, b=1.0, c=1.0, + alpha=90.0, beta=90.0, gamma=90.0, + volume=1.0, + ), + sites=[ + Site( + species=[Species(element=Element("Fe"), occu=1)], + abc=[0.0, 0.0, 0.0], + properties=SiteProperties(magmom=0.0), + label="Fe", + xyz=[0.0, 0.0, 0.0], + ) + ], + charge=charge, + cif="", + ) + + +def _table(value: float) -> TableIn: + """A valid table; distinct ``data`` yields a distinct md5.""" + return TableIn( + name="table", + attrs={"title": "t", "labels": {"index": "x", "value": "y", "variable": "z"}}, + data=pl.DataFrame({"col": [value]}), + ) + + +def _contrib_in(identifier: str, data: dict, **overrides) -> ContributionIn: + return ContributionIn(project=PID, identifier=identifier, formula="Fe2O3", data=data, **overrides) + + +# --------------------------------------------------------------------------- +# Assertion helpers +# --------------------------------------------------------------------------- + + +async def _project() -> Project: + """Re-read the full project document from the DB.""" + project = await Project.find_one(Project.id == PID) + assert project is not None + return project + + +async def _assert_empty() -> None: + project = await _project() + assert project.stats == EMPTY_STATS + assert project.columns == [] + + +def _columns_by_path(project: Project) -> dict[str, Column]: + return {c.path: c for c in project.columns} + + +# --------------------------------------------------------------------------- +# Tests +# --------------------------------------------------------------------------- + + +class TestStatsRecomputeLifecycle: + async def test_new_project_starts_empty(self, db, mongo_client): + await _make_project() + await _assert_empty() + + async def test_full_lifecycle(self, db, mongo_client): + svc = _service(mongo_client) + await _make_project() + await _assert_empty() + + # --- insert one contribution with two structures + two tables (+ data) --- + summary = await svc.insert_contributions( + [ + _contrib_in( + "with-components", + data={"band_gap": 2.1, "energy": -5.0}, + structures=[_structure(charge=None), _structure(charge=1.0)], + tables=[_table(1.0), _table(2.0)], + ) + ] + ) + assert summary.failed == [] + assert len(summary.succeeded) == 1 + + project = await _project() + assert project.stats.contributions == 1 + assert project.stats.structures == 2 + assert project.stats.tables == 2 + assert project.stats.attachments == 0 + assert project.stats.size > 0 + cols = _columns_by_path(project) + assert set(cols) == {"band_gap", "energy"} + assert project.stats.columns == 2 + assert (cols["band_gap"].min, cols["band_gap"].max) == (2.1, 2.1) + assert (cols["energy"].min, cols["energy"].max) == (-5.0, -5.0) + + # --- remove it -> back to empty --- + # NOTE: svc.delete_contributions() cannot delete a contribution that references real + # structure/table components: its cascade re-reads the contribution through ContributionFilter, + # whose nested component sub-filters make Beanie fetch the linked components, and the fetched + # frame content (e.g. Lattice.matrix) fails to round-trip (Structure/Table don't register + # FRAME_BSON_ENCODERS, so it is stored as a bare list _coerce_frame rejects). That is a + # pre-existing bug unrelated to the stats recompute. To still assert the removal recompute, + # drop the docs directly and recompute; the no-components case below covers delete() end-to-end. + await db["contributions"].delete_many({"project": PID}) + for coll in ("structures", "tables"): + await db[coll].delete_many({}) + await svc.update_project([PID]) + await _assert_empty() + + # --- insert one contribution with no components --- + summary = await svc.insert_contributions([_contrib_in("no-components", data={"band_gap": 3.0})]) + assert summary.failed == [] + project = await _project() + assert project.stats.contributions == 1 + assert project.stats.structures == 0 + assert project.stats.tables == 0 + assert project.stats.size > 0 + cols = _columns_by_path(project) + assert set(cols) == {"band_gap"} + assert (cols["band_gap"].min, cols["band_gap"].max) == (3.0, 3.0) + + # --- remove it -> empty again --- + deleted = await svc.delete_contributions(ContributionFilter(id=summary.succeeded[0].id)) + assert deleted.num_deleted == 1 + await _assert_empty() + + # --- add two contributions whose data overlaps ("shared") and diverges ("b" is new) --- + await svc.insert_contributions([_contrib_in("c-one", data={"a": 1.0, "shared": 5.0})]) + project = await _project() + assert project.stats.contributions == 1 + assert set(_columns_by_path(project)) == {"a", "shared"} + + await svc.insert_contributions([_contrib_in("c-two", data={"shared": 9.0, "b": 2.0})]) + project = await _project() + assert project.stats.contributions == 2 + cols = _columns_by_path(project) + # The second contribution introduces a brand-new column and widens a shared one. + assert set(cols) == {"a", "shared", "b"} + assert project.stats.columns == 3 + assert (cols["shared"].min, cols["shared"].max) == (5.0, 9.0) + assert (cols["a"].min, cols["a"].max) == (1.0, 1.0) + assert (cols["b"].min, cols["b"].max) == (2.0, 2.0) diff --git a/mpcontribs-api/tests/unit/domains/test_contribution_repository.py b/mpcontribs-api/tests/unit/domains/test_contribution_repository.py new file mode 100644 index 0000000000..f1c135f68c --- /dev/null +++ b/mpcontribs-api/tests/unit/domains/test_contribution_repository.py @@ -0,0 +1,76 @@ +"""Unit tests for the contribution repository's dict merge/replace update helpers. + +Covers the pure translation from a patch's field map to the ``$set`` document: with ``replace_data`` +a dict field overwrites whole; without it, dict fields deep-merge into dotted ``$set`` paths so +unmentioned stored keys survive (an addition), stopping at atomic annotated-value leaves. +""" + +from mpcontribs_api.domains.contributions.repository import ( + _build_update_set, + _flatten_for_merge, + _is_atomic_leaf, +) + + +class TestIsAtomicLeaf: + def test_scalars_and_lists_are_atomic(self): + assert _is_atomic_leaf(1) + assert _is_atomic_leaf("x") + assert _is_atomic_leaf([1, 2, 3]) + assert _is_atomic_leaf(None) + + def test_annotated_leaf_is_atomic(self): + leaf = {"value": 1.0, "input_value": 1.0, "display": "1 eV", "unit": "eV"} + assert _is_atomic_leaf(leaf) + + def test_plain_group_dict_is_not_atomic(self): + assert not _is_atomic_leaf({"a": 1, "b": 2}) + + def test_partial_leaf_shape_is_not_atomic(self): + # Missing a required leaf marker ("display") -> treated as a descendable group. + assert not _is_atomic_leaf({"value": 1.0, "input_value": 1.0}) + + +class TestFlattenForMerge: + def test_top_level_scalars_become_dotted_paths(self): + assert _flatten_for_merge("data", {"a": 1, "b": 2}) == {"data.a": 1, "data.b": 2} + + def test_nested_group_flattens_to_leaves(self): + # A plain nested group is descended so sibling leaves are addressed individually and any + # unmentioned sibling in the stored dict survives the merge. + out = _flatten_for_merge("data", {"group": {"x": 1, "y": 2}}) + assert out == {"data.group.x": 1, "data.group.y": 2} + + def test_annotated_leaf_stays_whole(self): + leaf = {"value": 4.2, "input_value": 4.2, "display": "4.2 eV", "unit": "eV"} + out = _flatten_for_merge("data", {"bandgap": leaf}) + # Not descended into value/unit/... — the leaf is set atomically. + assert out == {"data.bandgap": leaf} + + def test_empty_dict_contributes_nothing(self): + assert _flatten_for_merge("data", {}) == {} + assert _flatten_for_merge("data", {"group": {}}) == {} + + +class TestBuildUpdateSet: + def test_replace_passes_through_verbatim(self): + update = {"formula": "H2O", "data": {"a": 1}} + assert _build_update_set(update, replace_data=True) == update + + def test_merge_flattens_only_dict_fields(self): + update = {"formula": "H2O", "needs_build": False, "data": {"a": 1, "grp": {"b": 2}}} + assert _build_update_set(update, replace_data=False) == { + "formula": "H2O", + "needs_build": False, + "data.a": 1, + "data.grp.b": 2, + } + + def test_merge_keeps_list_fields_direct(self): + update = {"structures": [{"$id": 1}]} + assert _build_update_set(update, replace_data=False) == update + + def test_merge_of_only_empty_dict_yields_empty_document(self): + # Signals the caller (update_contribution_by_identifiers) to treat the patch as a no-op + # rather than issue an empty (and MongoDB-rejected) $set. + assert _build_update_set({"data": {}}, replace_data=False) == {} diff --git a/mpcontribs-api/tests/unit/domains/test_contribution_service.py b/mpcontribs-api/tests/unit/domains/test_contribution_service.py index 1bd7732838..b8cf32cd99 100644 --- a/mpcontribs-api/tests/unit/domains/test_contribution_service.py +++ b/mpcontribs-api/tests/unit/domains/test_contribution_service.py @@ -12,6 +12,7 @@ from mpcontribs_api.domains.attachments.models import Attachment, AttachmentIn from mpcontribs_api.domains.contributions.models import Contribution, ContributionIn, ContributionPatch from mpcontribs_api.domains.contributions.service import ContributionService +from mpcontribs_api.domains.contributions.stats import ProjectAggregate from mpcontribs_api.domains.structures.models import ( Lattice, Site, @@ -168,6 +169,9 @@ def _make_service( if projects is None: projects_repo.unique_identifiers_by_id.side_effect = lambda ids: {pid: unique_identifiers for pid in ids} contrib_repo.max_versions.return_value = {} + # Every write/delete path recomputes project stats at the end (see ContributionService.update_project); + # return a real (empty) aggregate so the mapping to Stats/Column has concrete values, not mocks. + contrib_repo.aggregate_project_stats.return_value = ProjectAggregate() if client is None: client, _ = _make_fake_client() svc = ContributionService( @@ -558,7 +562,7 @@ async def test_insert_project_not_found_is_validation_failure(self): async def test_upsert_unique_forces_version_one(self): svc, contrib_repo, *_ = _make_service() # unique by default - contrib_repo.upsert_contribution_by_identifiers.return_value = MagicMock(spec=Contribution) + contrib_repo.upsert_contribution_by_identifiers.return_value = MagicMock(spec=Contribution, project="proj") # A supplied version is ignored for unique-identifier projects (inferred as 1). await svc.upsert_contributions([_contrib_in(identifier="mp-1", version=9)]) @@ -569,7 +573,7 @@ async def test_upsert_unique_forces_version_one(self): async def test_upsert_non_unique_defaults_version_to_one_when_no_existing_row(self): # No row exists yet -> unambiguous insert -> default to version 1 rather than rejecting. svc, contrib_repo, *_ = _make_service(unique_identifiers=False) - contrib_repo.upsert_contribution_by_identifiers.return_value = MagicMock(spec=Contribution) + contrib_repo.upsert_contribution_by_identifiers.return_value = MagicMock(spec=Contribution, project="proj") contrib_repo.max_versions.return_value = {} # nothing exists summary = await svc.upsert_contributions([_contrib_in(identifier="mp-1")]) # no version @@ -594,7 +598,7 @@ async def test_upsert_non_unique_unversioned_with_existing_row_is_ambiguous(self async def test_upsert_non_unique_with_existing_row_and_version_targets_it(self): # With an existing row, supplying the version resolves the ambiguity and proceeds. svc, contrib_repo, *_ = _make_service(unique_identifiers=False) - contrib_repo.upsert_contribution_by_identifiers.return_value = MagicMock(spec=Contribution) + contrib_repo.upsert_contribution_by_identifiers.return_value = MagicMock(spec=Contribution, project="proj") contrib_repo.max_versions.return_value = {("proj", "mp-1", ""): 2} summary = await svc.upsert_contributions([_contrib_in(identifier="mp-1", version=2)]) @@ -606,7 +610,7 @@ async def test_upsert_unique_unversioned_with_existing_row_is_not_ambiguous(self # Unique-identifier projects have at most one row per identity, so upsert stays unambiguous # (version 1) even when a row exists; max_versions is not even consulted. svc, contrib_repo, *_ = _make_service() # unique by default - contrib_repo.upsert_contribution_by_identifiers.return_value = MagicMock(spec=Contribution) + contrib_repo.upsert_contribution_by_identifiers.return_value = MagicMock(spec=Contribution, project="proj") summary = await svc.upsert_contributions([_contrib_in(identifier="mp-1")]) # no version @@ -616,7 +620,7 @@ async def test_upsert_unique_unversioned_with_existing_row_is_not_ambiguous(self async def test_upsert_non_unique_passes_supplied_version(self): svc, contrib_repo, *_ = _make_service(unique_identifiers=False) - contrib_repo.upsert_contribution_by_identifiers.return_value = MagicMock(spec=Contribution) + contrib_repo.upsert_contribution_by_identifiers.return_value = MagicMock(spec=Contribution, project="proj") await svc.upsert_contributions([_contrib_in(identifier="mp-1", version=7)]) @@ -703,7 +707,7 @@ async def test_expanded_count_over_limit_raises(self): async def test_upsert_passes_condition_key_to_repo(self): svc, contrib_repo, *_ = _make_service() # unique -> version 1, condition_key differentiates - contrib_repo.upsert_contribution_by_identifiers.return_value = MagicMock(spec=Contribution) + contrib_repo.upsert_contribution_by_identifiers.return_value = MagicMock(spec=Contribution, project="proj") await svc.upsert_contributions([_pivoting_contrib()]) @@ -774,7 +778,7 @@ async def test_raises_before_any_db_write(self): class TestUpsertContributionsAtomic: async def test_calls_atomic_repo_method_once_per_item(self): svc, contrib_repo, *_ = _make_service() - contrib_repo.upsert_contribution_by_identifiers.return_value = MagicMock(spec=Contribution) + contrib_repo.upsert_contribution_by_identifiers.return_value = MagicMock(spec=Contribution, project="proj") contribs = [_contrib_in(identifier=f"mp-{i}") for i in range(3)] summary = await svc.upsert_contributions(contribs) @@ -789,7 +793,7 @@ async def test_calls_atomic_repo_method_once_per_item(self): async def test_passes_identifiers_dict_and_input_to_repo(self): svc, contrib_repo, *_ = _make_service() - contrib_repo.upsert_contribution_by_identifiers.return_value = MagicMock(spec=Contribution) + contrib_repo.upsert_contribution_by_identifiers.return_value = MagicMock(spec=Contribution, project="proj") contrib = _contrib_in(project="my-proj", identifier="mp-99") await svc.upsert_contributions([contrib]) @@ -802,6 +806,8 @@ async def test_passes_identifiers_dict_and_input_to_repo(self): async def test_returns_repo_results_in_input_order(self): svc, contrib_repo, *_ = _make_service() docs = [MagicMock(spec=Contribution, name=f"doc-{i}") for i in range(3)] + for doc in docs: + doc.project = "proj" # real project so update_project can aggregate the affected set returned = {} async def _upsert(identifiers, contrib, condition_key=""): @@ -830,7 +836,7 @@ async def test_same_key_concurrent_upserts_both_go_through_atomic_call(self): tiebreaker — the service must not pre-deduplicate or otherwise swallow one. """ svc, contrib_repo, *_ = _make_service() - contrib_repo.upsert_contribution_by_identifiers.return_value = MagicMock(spec=Contribution) + contrib_repo.upsert_contribution_by_identifiers.return_value = MagicMock(spec=Contribution, project="proj") contribs = [ _contrib_in(project="prj", identifier="same"), @@ -847,7 +853,7 @@ async def test_one_failure_is_reported_not_raised(self): async def _upsert(identifiers, contrib, condition_key=""): if contrib.identifier == "mp-1": raise ConflictError("boom") - return MagicMock(spec=Contribution) + return MagicMock(spec=Contribution, project="proj") contrib_repo.upsert_contribution_by_identifiers.side_effect = _upsert @@ -917,7 +923,7 @@ async def test_insert_unauthorized_and_oversize_yield_single_failure(self): async def test_upsert_rejects_unauthorized_project_per_item(self): svc, contrib_repo, *_ = _make_service(user=_member_user("allowed")) - contrib_repo.upsert_contribution_by_identifiers.return_value = MagicMock(spec=Contribution) + contrib_repo.upsert_contribution_by_identifiers.return_value = MagicMock(spec=Contribution, project="proj") contribs = [ _contrib_in(project="allowed", identifier="ok"), @@ -944,61 +950,6 @@ async def test_upsert_anonymous_authorized_for_nothing(self): contrib_repo.upsert_contribution_by_identifiers.assert_not_called() -# --------------------------------------------------------------------------- -# Process-wide write_slots semaphore is honored -# --------------------------------------------------------------------------- - - -# class TestProcessWideWriteSlots: -# async def test_upsert_acquires_global_write_slot(self): -# write_slots = asyncio.Semaphore(1) -# svc, contrib_repo, *_ = _make_service(write_slots=write_slots) - -# in_flight = 0 -# peak = 0 - -# async def _upsert(identifiers, contrib): -# nonlocal in_flight, peak -# in_flight += 1 -# peak = max(peak, in_flight) -# await asyncio.sleep(0) # let other coroutines try to enter -# in_flight -= 1 -# return MagicMock(spec=Contribution) - -# contrib_repo.upsert_contribution_by_identifiers.side_effect = _upsert - -# contribs = [_contrib_in(identifier=f"mp-{i}") for i in range(5)] -# await svc.upsert_contributions(contribs) - -# assert peak == 1 # global semaphore of 1 must serialize all 5 - -# async def test_insert_with_components_acquires_global_write_slot(self): -# write_slots = asyncio.Semaphore(1) -# svc, contrib_repo, struct_repo, table_repo, attach_repo, _ = _make_service(write_slots=write_slots) - -# struct_repo.insert_components.return_value = [_fake_structure()] -# table_repo.insert_components.return_value = [] -# attach_repo.insert_components.return_value = [] - -# in_flight = 0 -# peak = 0 - -# async def _insert(doc, session=None): -# nonlocal in_flight, peak -# in_flight += 1 -# peak = max(peak, in_flight) -# await asyncio.sleep(0) -# in_flight -= 1 -# return doc - -# contrib_repo.insert_contribution.side_effect = _insert - -# contribs = [_contrib_in(identifier=f"c{i}", structures=[_structure_in()]) for i in range(4)] -# await svc.insert_contributions(contribs) - -# assert peak == 1 - - # --------------------------------------------------------------------------- # delete_contributions — cascade delete (components-first), cursor loop # --------------------------------------------------------------------------- @@ -1015,10 +966,11 @@ def _link(ref_id: PydanticObjectId) -> SimpleNamespace: return SimpleNamespace(ref=SimpleNamespace(id=ref_id)) -def _contrib_doc(structures=None, attachments=None, tables=None, id_=None) -> SimpleNamespace: +def _contrib_doc(structures=None, attachments=None, tables=None, id_=None, project="proj") -> SimpleNamespace: """A contribution page item exposing the attributes delete_contributions reads.""" return SimpleNamespace( id=id_ or _oid(), + project=project, structures=[_link(s) for s in (structures or [])], attachments=[_link(a) for a in (attachments or [])], tables=[_link(t) for t in (tables or [])], @@ -1214,7 +1166,7 @@ class TestDeleteContributionsNoneComponents: async def test_none_component_fields_do_not_raise(self): svc, contrib_repo, struct_repo, table_repo, attach_repo, _ = _make_service() - doc = SimpleNamespace(id=_oid(), structures=None, tables=None, attachments=None) + doc = SimpleNamespace(id=_oid(), project="proj", structures=None, tables=None, attachments=None) contrib_repo.get_contributions.side_effect = [_page([doc]), _page([])] contrib_repo.delete_contributions.side_effect = [_delete_result(1), _delete_result(0)] @@ -1234,7 +1186,7 @@ async def test_none_component_fields_do_not_raise(self): def _target_doc(project="mp-team", identifier="mp-1", version=1, condition_key="") -> MagicMock: """A stored Contribution the patch path anchors on (only identity attrs are read).""" - doc = MagicMock(spec=Contribution) + doc = MagicMock(spec=Contribution, project="proj") doc.project = project doc.identifier = identifier doc.version = version @@ -1256,7 +1208,7 @@ async def test_unauthorized_project_raises(self): contrib_repo.get_contribution_document.return_value = _target_doc(project="mp-team") with pytest.raises(PermissionError): await svc.patch_contribution(str(_oid()), ContributionPatch(formula="H2O")) - contrib_repo.patch_pivot_row.assert_not_called() + contrib_repo.update_contribution_by_identifiers.assert_not_called() async def test_empty_patch_is_noop_returns_target(self): svc, contrib_repo, *_ = _make_service() @@ -1264,20 +1216,20 @@ async def test_empty_patch_is_noop_returns_target(self): contrib_repo.get_contribution_document.return_value = target result = await svc.patch_contribution(str(_oid()), ContributionPatch()) assert result == [target] - contrib_repo.patch_pivot_row.assert_not_called() + contrib_repo.update_contribution_by_identifiers.assert_not_called() async def test_scalar_only_patch_updates_target_row(self): svc, contrib_repo, *_ = _make_service() target = _target_doc(condition_key="") contrib_repo.get_contribution_document.return_value = target updated = _target_doc() - contrib_repo.patch_pivot_row.return_value = updated + contrib_repo.update_contribution_by_identifiers.return_value = updated result = await svc.patch_contribution(str(_oid()), ContributionPatch(formula="H2O", needs_build=False)) assert result == [updated] - contrib_repo.patch_pivot_row.assert_awaited_once() - args, _ = contrib_repo.patch_pivot_row.call_args + contrib_repo.update_contribution_by_identifiers.assert_awaited_once() + args, _ = contrib_repo.update_contribution_by_identifiers.call_args project, identifier, version, condition_key, update_data = args assert (project, identifier, version, condition_key) == ("mp-team", "mp-1", 1, "") assert update_data == {"formula": "H2O", "needs_build": False} @@ -1287,12 +1239,12 @@ async def test_data_without_conditions_annotates_and_patches_target(self): svc, contrib_repo, *_ = _make_service() target = _target_doc(condition_key="") contrib_repo.get_contribution_document.return_value = target - contrib_repo.patch_pivot_row.return_value = _target_doc() + contrib_repo.update_contribution_by_identifiers.return_value = _target_doc() await svc.patch_contribution(str(_oid()), ContributionPatch(data={"bandgap (eV)": 4.2})) - contrib_repo.patch_pivot_row.assert_awaited_once() - args, _ = contrib_repo.patch_pivot_row.call_args + contrib_repo.update_contribution_by_identifiers.assert_awaited_once() + args, _ = contrib_repo.update_contribution_by_identifiers.call_args *_identity, condition_key, update_data = args # No conditions -> the target row's own condition_key, data annotated in place. assert condition_key == "" @@ -1304,7 +1256,7 @@ async def test_data_with_conditions_fans_out_to_matching_rows(self): svc, contrib_repo, *_ = _make_service() contrib_repo.get_contribution_document.return_value = _target_doc() # Each fanned signature resolves to an existing row. - contrib_repo.patch_pivot_row.side_effect = [_target_doc(), _target_doc()] + contrib_repo.update_contribution_by_identifiers.side_effect = [_target_doc(), _target_doc()] result = await svc.patch_contribution( str(_oid()), @@ -1312,19 +1264,44 @@ async def test_data_with_conditions_fans_out_to_matching_rows(self): ) assert len(result) == 2 - assert contrib_repo.patch_pivot_row.await_count == 2 - condition_keys = {call.args[3] for call in contrib_repo.patch_pivot_row.call_args_list} + assert contrib_repo.update_contribution_by_identifiers.await_count == 2 + condition_keys = {call.args[3] for call in contrib_repo.update_contribution_by_identifiers.call_args_list} # Two distinct, non-empty condition signatures (one per temperature). assert len(condition_keys) == 2 assert all(ck for ck in condition_keys) - for call in contrib_repo.patch_pivot_row.call_args_list: + for call in contrib_repo.update_contribution_by_identifiers.call_args_list: data = call.args[4]["data"] assert "t" in data and "conductivity" in data # condition column + measurement async def test_condition_signature_without_existing_row_rejected(self): svc, contrib_repo, *_ = _make_service() contrib_repo.get_contribution_document.return_value = _target_doc() - contrib_repo.patch_pivot_row.return_value = None # no stored row carries this condition_key + contrib_repo.update_contribution_by_identifiers.return_value = None # no stored row carries this condition_key with pytest.raises(ValidationError, match="cannot create new ones"): await svc.patch_contribution(str(_oid()), ContributionPatch(data={"conductivity (S/cm, T=300K)": 1.2})) + + async def test_data_patch_defaults_to_merge(self): + # Without an explicit flag, the repo is asked to merge (replace_data=False) so a data patch + # is an addition that preserves unmentioned stored columns. + svc, contrib_repo, *_ = _make_service() + contrib_repo.get_contribution_document.return_value = _target_doc(condition_key="") + contrib_repo.update_contribution_by_identifiers.return_value = _target_doc() + + await svc.patch_contribution(str(_oid()), ContributionPatch(data={"bandgap (eV)": 4.2})) + + _, kwargs = contrib_repo.update_contribution_by_identifiers.call_args + assert kwargs["replace_data"] is False + + async def test_data_patch_forwards_replace_flag(self): + # replace_data=True is threaded through so the repo overwrites the row's data whole. + svc, contrib_repo, *_ = _make_service() + contrib_repo.get_contribution_document.return_value = _target_doc(condition_key="") + contrib_repo.update_contribution_by_identifiers.return_value = _target_doc() + + await svc.patch_contribution( + str(_oid()), ContributionPatch(data={"bandgap (eV)": 4.2}), replace_data=True + ) + + _, kwargs = contrib_repo.update_contribution_by_identifiers.call_args + assert kwargs["replace_data"] is True diff --git a/mpcontribs-api/tests/unit/domains/test_contribution_stats.py b/mpcontribs-api/tests/unit/domains/test_contribution_stats.py new file mode 100644 index 0000000000..b578727106 --- /dev/null +++ b/mpcontribs-api/tests/unit/domains/test_contribution_stats.py @@ -0,0 +1,71 @@ +"""Unit tests for the pure column/stats derivation helpers (no DB).""" + +from mpcontribs_api.domains.contributions.stats import ( + NON_NUMERIC_UNIT, + ColumnStat, + finalize_columns, + iter_leaves, + merge_contribution_columns, +) + + +def _annotated(value: float, unit: str | None = None) -> dict: + """A minimal canonical annotated-leaf dict (see AnnotatedData.as_dict).""" + leaf = {"value": value, "input_value": value, "display": str(value)} + if unit is not None: + leaf["unit"] = unit + return leaf + + +def _columns(*datas: dict) -> list[ColumnStat]: + acc: dict[str, ColumnStat] = {} + for data in datas: + merge_contribution_columns(acc, data) + return finalize_columns(acc) + + +class TestIterLeaves: + def test_annotated_leaf_is_numeric_with_unit(self): + leaves = list(iter_leaves({"a": _annotated(300.0, "K")})) + assert leaves == [("a", 300.0, "K")] + + def test_annotated_leaf_is_not_recursed(self): + # The leaf dict carries value/display; its inner keys must not become nested paths. + paths = [p for p, _, _ in iter_leaves({"t": _annotated(1.0, "eV")})] + assert paths == ["t"] + + def test_nested_plain_object_is_recursed_with_dotted_path(self): + leaves = list(iter_leaves({"a": {"b": _annotated(1.0)}})) + assert leaves == [("a.b", 1.0, None)] + + def test_bare_number_is_numeric_without_unit(self): + assert list(iter_leaves({"n": 5})) == [("n", 5.0, None)] + + def test_string_and_bool_are_non_numeric(self): + leaves = dict((p, (v, u)) for p, v, u in iter_leaves({"s": "cubic", "flag": True})) + assert leaves["s"] == (None, NON_NUMERIC_UNIT) + assert leaves["flag"] == (None, NON_NUMERIC_UNIT) + + +class TestMergeAndFinalize: + def test_min_max_track_across_contributions(self): + cols = _columns({"x": _annotated(1.0, "m")}, {"x": _annotated(3.0, "m")}, {"x": _annotated(2.0, "m")}) + assert len(cols) == 1 + assert (cols[0].path, cols[0].min, cols[0].max, cols[0].unit) == ("x", 1.0, 3.0, "m") + + def test_non_numeric_column_has_none_bounds_and_sentinel_unit(self): + cols = _columns({"phase": "cubic"}) + assert (cols[0].min, cols[0].max, cols[0].unit) == (None, None, NON_NUMERIC_UNIT) + + def test_numeric_wins_when_a_path_is_mixed(self): + # Numeric in one contribution, missing/other in another: bounds come from the numeric value. + cols = _columns({"v": _annotated(2.0, "eV")}, {"v": "n/a"}) + assert (cols[0].min, cols[0].max, cols[0].unit) == (2.0, 2.0, "eV") + + def test_columns_sorted_by_path(self): + cols = _columns({"b": _annotated(1.0), "a": _annotated(1.0), "a.c": _annotated(1.0)}) + assert [c.path for c in cols] == ["a", "a.c", "b"] + + def test_bare_number_column_has_no_unit(self): + cols = _columns({"count": 7}) + assert (cols[0].min, cols[0].max, cols[0].unit) == (7.0, 7.0, None) From 54e18821f984c694fc3b846e1372138a33192f57 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 23 Jul 2026 15:27:15 -0700 Subject: [PATCH 499/591] Refactored project models and updated repo and tests to respect new forms. Increased enforcement of Project management business logic --- .../mpcontribs_api/domains/projects/models.py | 62 +++++++++------ .../domains/projects/repository.py | 44 +++++++++-- .../db/test_projects_repository.py | 76 +++++++++++++++++-- .../integration/db/test_stats_recompute.py | 4 +- .../unit/domains/test_projects_models.py | 27 ++++--- 5 files changed, 164 insertions(+), 49 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py index 41d9c8935b..bc330923d5 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from typing import Any, Literal from pydantic import BaseModel, ConfigDict, Field, HttpUrl @@ -30,6 +28,11 @@ class Stats(BaseModel): attachments: int size: float + @classmethod + def empty(cls) -> Stats: + """A zeroed rollup for a project with no contributions yet.""" + return cls(columns=0, contributions=0, tables=0, structures=0, attachments=0, size=0.0) + class Reference(BaseModel): # TODO: Labels have some restrictions, not sure exactly what yet @@ -37,32 +40,40 @@ class Reference(BaseModel): url: HttpUrl -class Project(BaseDocumentWithInput[ShortStr]): - """Document model of what is actually stored. - - Binds ``id`` to ``ShortStr`` (a meaningful string id, always supplied) via the generic base. - """ - - # Required +class ProjectBase(BaseModel): title: ShortStr authors: str description: str owner: PrefixedEmail unique_identifiers: bool - stats: Stats # Optional references: list[Reference] = Field(default_factory=list) long_title: str | None = None other: dict[str, Any] = Field(default_factory=dict) - columns: list[Column] = Field(default_factory=list) is_public: bool = False is_approved: bool = False license: Literal["CCA4", "CCPD"] | None = None + class Settings: + name = "projects" + keep_nulls = False + + +class Project(ProjectBase, BaseDocumentWithInput[ShortStr]): + """Document model of what is actually stored. + + Binds ``id`` to ``ShortStr`` (a meaningful string id, always supplied) via the generic base. + """ + + # Server-owned: derived from the project's contributions + stats: Stats = Field(default_factory=Stats.empty) + columns: list[Column] = Field(default_factory=list) + @classmethod - def from_input_model(cls, data: ProjectIn) -> Project: - return cls(**data.model_dump()) + def from_input_model(cls, data: ProjectIn, id: str) -> Project: # pyright: ignore[reportIncompatibleMethodOverride] + # ``id`` comes from the request path, not the body (see ``ProjectIn``). + return cls(_id=id, **data.model_dump()) @staticmethod def decode_cursor(cursor: str) -> str: @@ -72,10 +83,6 @@ def decode_cursor(cursor: str) -> str: """ return pagination.decode_cursor(cursor) - class Settings: - name = "projects" - keep_nulls = False - class ProjectOut(DocumentOut[ShortStr]): """Full response of all public-facing fields.""" @@ -134,15 +141,24 @@ class Constants(BaseFilter.Constants): model = Project -# Keeping for business logic separation. May have specific implementation later -class ProjectIn(Project): - """Representation of user-supplied input.""" +# Left for namespace similarity between modules +class ProjectIn(ProjectBase): + """User-supplied input for a project write. + + Carries no ``id`` (it comes from the request path) and no ``stats``/``columns`` (server-owned, + recomputed from contributions). ``is_approved`` is accepted but only honored for admins. + """ pass class ProjectPatch(BaseModel): - """Nullable Project representation of user-supplied data for partial update (patch).""" + """Nullable Project representation of user-supplied data for partial update (patch). + + ``stats`` and ``columns`` are intentionally absent: they are server-owned and recomputed from + the project's contributions, never patched by a client. ``is_approved`` is accepted but the + repository allows only admins to change it. + """ title: ShortStr | None = None authors: str | None = None @@ -152,7 +168,7 @@ class ProjectPatch(BaseModel): references: list[Reference] = Field(default_factory=list) long_title: str | None = None other: dict[str, Any] = Field(default_factory=dict) - columns: list[Column] = Field(default_factory=list) is_public: bool = False - is_approved: bool = False + # None => unset (left unchanged); admin-only when set (enforced in the repository). + is_approved: bool | None = None license: Literal["CCA4", "CCPD"] | None = None diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py index 93af6288e5..1e1d0ac367 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py @@ -13,7 +13,7 @@ ProjectPatch, Stats, ) -from mpcontribs_api.exceptions import PermissionError +from mpcontribs_api.exceptions import ConflictError, PermissionError from mpcontribs_api.pagination import CursorParams @@ -113,12 +113,31 @@ async def set_stats_and_columns(self, updates: dict[str, tuple[Stats, list[Colum ] await self.document_model.get_pymongo_collection().bulk_write(ops, ordered=False) - async def insert_project(self, project: ProjectIn) -> Project: - """Insert a new project, rejecting a duplicate id. See ``insert_one``.""" - return await self.insert_one(project) + async def insert_project(self, id: str, project: ProjectIn) -> Project: + """Insert a new project under ``id`` (supplied by the caller), rejecting a duplicate id. + + Projects carry a meaningful ``ShortStr`` id that is not part of the input body, so — unlike + the generic ``insert_one`` — the id is passed explicitly and stamped onto the document here. + """ + document = Project.from_input_model(project, id=id) + existing = await self.document_model.find_one(self.document_model.id == id) + if existing: + raise ConflictError(f"Cannot insert document.\n Document with ID {id} exists") + await document.insert() + return document async def patch_project_by_id(self, id: str, update: ProjectPatch) -> Project: - """Partially update a project by id, scoped to the current user. See ``patch``.""" + """Partially update a project by id, scoped to the current user. See ``patch``. + + ``is_approved`` is an admin-only curation flag: a non-admin that sets it (to any value) is + rejected. ``stats``/``columns`` are not on the patch model at all, so they cannot be + client-patched. Both remain server-owned. + + Raises: + PermissionError: if a non-admin caller sets ``is_approved`` + """ + if update.is_approved is not None and not self._user.is_admin: + raise PermissionError(required_role="admin") return await self.patch(id, update) async def delete_project_by_id(self, id: str) -> None: @@ -153,16 +172,25 @@ async def upsert_project_by_id(self, id: str, data: ProjectIn) -> Project: raise PermissionError(required_role="authenticated") existing = await self.document_model.find_one(self.document_model.id == id) - project = self.document_model.from_input_model(data) - project.id = id + project = self.document_model.from_input_model(data, id=id) if existing is not None: if not (self._user.is_admin or existing.owner == self._user.username): raise PermissionError(required_role="owner-or-admin") # Ownership is immutable via upsert; keep the original owner. project.owner = existing.owner + # Server-owned rollups are never taken from the request body; keep the stored values + # (they self-heal on the next contribution write via ``ContributionService``). + project.stats = existing.stats + project.columns = existing.columns + # Approval is an admin-only curation flag: a non-admin cannot toggle it via a full + # overwrite, so preserve whatever is already stored. + if not self._user.is_admin: + project.is_approved = existing.is_approved else: # TODO: Check if Kong supplies email # New project: the caller owns it, regardless of the submitted owner. # project.owner = self._user.username - pass + # A new project starts unapproved; only an admin may create it pre-approved. + if not self._user.is_admin: + project.is_approved = False return await project.save() diff --git a/mpcontribs-api/tests/integration/db/test_projects_repository.py b/mpcontribs-api/tests/integration/db/test_projects_repository.py index 2b2236d4b6..ae9ebd63b3 100644 --- a/mpcontribs-api/tests/integration/db/test_projects_repository.py +++ b/mpcontribs-api/tests/integration/db/test_projects_repository.py @@ -1,9 +1,10 @@ import pytest from mpcontribs_api.authz import User -from mpcontribs_api.domains.projects.models import Project, ProjectIn, ProjectOut, ProjectPatch, Stats +from mpcontribs_api.domains.projects.models import Column, Project, ProjectIn, ProjectOut, ProjectPatch, Stats from mpcontribs_api.domains.projects.repository import MongoDbProjectRepository from mpcontribs_api.exceptions import ConflictError, NotFoundError +from mpcontribs_api.exceptions import PermissionError as AppPermissionError from mpcontribs_api.pagination import CursorParams # All tests in this module share the session event loop so they can reuse the @@ -16,8 +17,6 @@ # Helpers # --------------------------------------------------------------------------- -STATS = Stats(columns=0, contributions=0, tables=0, structures=0, attachments=0, size=0.0) - ADMIN = User(username="google:admin@example.com", groups=frozenset({"admin"})) ALICE = User(username="google:alice@example.com", groups=frozenset({"mp-team"})) ANON = User() @@ -28,14 +27,13 @@ def _repo(user: User) -> MongoDbProjectRepository: def _project_in(id: str, **overrides) -> ProjectIn: + # No id (it comes from the path) and no stats/columns (server-owned) on the input model. defaults = { - "_id": id, "title": id[:30], "authors": "Test Author", "description": "Test description", "owner": "google:alice@example.com", "unique_identifiers": True, - "stats": STATS, } defaults.update(overrides) return ProjectIn(**defaults) @@ -43,7 +41,7 @@ def _project_in(id: str, **overrides) -> ProjectIn: async def _insert(id: str, **overrides) -> Project: project_in = _project_in(id, **overrides) - return await _repo(ADMIN).insert_project(project_in) + return await _repo(ADMIN).insert_project(id, project_in) # --------------------------------------------------------------------------- @@ -387,3 +385,69 @@ async def test_update_preserves_original_owner(self, db): await _repo(ALICE).upsert_project_by_id(id="auth-preserve", data=data) found = await Project.find_one(Project.id == "auth-preserve") assert found.owner == "google:alice@example.com" + + +# --------------------------------------------------------------------------- +# Server-owned fields: stats / columns are derived, is_approved is admin-only +# --------------------------------------------------------------------------- + + +class TestServerOwnedFields: + async def test_upsert_update_preserves_stats_and_columns(self, db): + await _insert("srv-preserve") + # A server-computed rollup already lives on the stored document. + stored = await Project.find_one(Project.id == "srv-preserve") + stored.stats = Stats(columns=2, contributions=5, tables=1, structures=0, attachments=0, size=42.0) + stored.columns = [Column(path="data.band_gap", min=0.0, max=1.0, unit="eV")] + await stored.save() + # A full overwrite must not clobber them. + await _repo(ADMIN).upsert_project_by_id(id="srv-preserve", data=_project_in("srv-preserve", title="Edited")) + found = await Project.find_one(Project.id == "srv-preserve") + assert found.title == "Edited" + assert found.stats.contributions == 5 + assert [c.path for c in found.columns] == ["data.band_gap"] + + async def test_upsert_new_starts_with_empty_stats(self, db): + await _repo(ALICE).upsert_project_by_id(id="srv-new-empty", data=_project_in("srv-new-empty")) + found = await Project.find_one(Project.id == "srv-new-empty") + assert found.stats == Stats.empty() + assert found.columns == [] + + async def test_non_admin_cannot_approve_new_project_via_upsert(self, db): + data = _project_in("srv-approve-new", is_approved=True) + await _repo(ALICE).upsert_project_by_id(id="srv-approve-new", data=data) + found = await Project.find_one(Project.id == "srv-approve-new") + assert found.is_approved is False + + async def test_admin_can_approve_new_project_via_upsert(self, db): + data = _project_in("srv-approve-admin", is_approved=True) + await _repo(ADMIN).upsert_project_by_id(id="srv-approve-admin", data=data) + found = await Project.find_one(Project.id == "srv-approve-admin") + assert found.is_approved is True + + async def test_non_admin_cannot_change_approval_via_upsert(self, db): + await _insert("srv-approve-existing", owner="google:alice@example.com", is_approved=True) + # The owner (non-admin) overwrites and tries to un-approve; approval must stick. + data = _project_in("srv-approve-existing", owner="google:alice@example.com", is_approved=False) + await _repo(ALICE).upsert_project_by_id(id="srv-approve-existing", data=data) + found = await Project.find_one(Project.id == "srv-approve-existing") + assert found.is_approved is True + + async def test_non_admin_cannot_approve_via_patch(self, db): + await _insert("srv-patch-approve", owner="google:alice@example.com") + with pytest.raises(AppPermissionError): + await _repo(ALICE).patch_project_by_id(id="srv-patch-approve", update=ProjectPatch(is_approved=True)) + found = await Project.find_one(Project.id == "srv-patch-approve") + assert found.is_approved is False + + async def test_admin_can_approve_via_patch(self, db): + await _insert("srv-patch-admin", owner="google:alice@example.com") + await _repo(ADMIN).patch_project_by_id(id="srv-patch-admin", update=ProjectPatch(is_approved=True)) + found = await Project.find_one(Project.id == "srv-patch-admin") + assert found.is_approved is True + + async def test_non_admin_plain_patch_is_allowed(self, db): + await _insert("srv-patch-plain", owner="google:alice@example.com") + await _repo(ALICE).patch_project_by_id(id="srv-patch-plain", update=ProjectPatch(title="New Title")) + found = await Project.find_one(Project.id == "srv-patch-plain") + assert found.title == "New Title" diff --git a/mpcontribs-api/tests/integration/db/test_stats_recompute.py b/mpcontribs-api/tests/integration/db/test_stats_recompute.py index b5e290e1af..6fb68e1b55 100644 --- a/mpcontribs-api/tests/integration/db/test_stats_recompute.py +++ b/mpcontribs-api/tests/integration/db/test_stats_recompute.py @@ -62,15 +62,13 @@ def _service(client) -> ContributionService: async def _make_project(unique_identifiers: bool = True) -> Project: project_in = ProjectIn( - _id=PID, title="Stats Project", authors="Test Author", description="Recompute lifecycle fixture", owner="google:admin@example.com", unique_identifiers=unique_identifiers, - stats=EMPTY_STATS, ) - return await MongoDbProjectRepository(ADMIN).insert_project(project_in) + return await MongoDbProjectRepository(ADMIN).insert_project(PID, project_in) def _structure(charge: float | None) -> StructureIn: diff --git a/mpcontribs-api/tests/unit/domains/test_projects_models.py b/mpcontribs-api/tests/unit/domains/test_projects_models.py index b874091e73..1eb3fdb846 100644 --- a/mpcontribs-api/tests/unit/domains/test_projects_models.py +++ b/mpcontribs-api/tests/unit/domains/test_projects_models.py @@ -184,7 +184,15 @@ def test_invalid_short_str_for_title_raises(self): def test_default_lists_are_empty(self): patch = ProjectPatch() assert patch.references == [] - assert patch.columns == [] + + def test_is_approved_defaults_to_none(self): + # None => unset, so an ordinary patch never implicitly touches approval. + assert ProjectPatch().is_approved is None + + def test_columns_is_not_a_patch_field(self): + # ``columns`` is server-owned and must not be accepted on the patch model. + assert "columns" not in ProjectPatch.model_fields + assert "stats" not in ProjectPatch.model_fields def test_invalid_license_raises(self): with pytest.raises(PydanticValidationError): @@ -196,43 +204,44 @@ def test_invalid_license_raises(self): # --------------------------------------------------------------------------- -VALID_STATS = Stats(columns=0, contributions=0, tables=0, structures=0, attachments=0, size=0.0) - - class TestProjectFromInputModel: def _make_input(self, **overrides): defaults = { - "_id": "test-proj", "title": "Test Project", "authors": "Alice, Bob", "description": "A test project", "owner": "google:alice@example.com", "unique_identifiers": True, - "stats": VALID_STATS, } defaults.update(overrides) return ProjectIn(**defaults) def test_from_input_model_creates_project(self): project_in = self._make_input() - project = Project.from_input_model(project_in) + project = Project.from_input_model(project_in, id="test-proj") assert isinstance(project, Project) assert project.id == "test-proj" assert project.title == "Test Project" def test_from_input_model_preserves_owner(self): project_in = self._make_input(owner="github:bob@github.com") - project = Project.from_input_model(project_in) + project = Project.from_input_model(project_in, id="test-proj") assert project.owner == "github:bob@github.com" def test_from_input_model_defaults(self): project_in = self._make_input() - project = Project.from_input_model(project_in) + project = Project.from_input_model(project_in, id="test-proj") assert project.is_public is False assert project.is_approved is False assert project.references == [] assert project.columns == [] + def test_from_input_model_starts_with_empty_server_owned_fields(self): + # stats/columns aren't on the input model and default empty on the document. + project = Project.from_input_model(self._make_input(), id="test-proj") + assert project.stats == Stats.empty() + assert project.columns == [] + # --------------------------------------------------------------------------- # Project.decode_cursor (string-id override) From c69efca71df36a5f4734bf85a0131b7535e1af84 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 23 Jul 2026 15:31:16 -0700 Subject: [PATCH 500/591] Updated references to old 'patch_pivot_row' to 'update_contribution_by_identifiers --- .../domains/contributions/repository.py | 3 +- .../db/test_contributions_repository.py | 33 ++++++++++++++----- 2 files changed, 26 insertions(+), 10 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py index a746f11992..2f3f368918 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py @@ -184,7 +184,8 @@ async def _find_one_and_set( Applies ``$set`` of ``update_data`` to the single in-scope row matching ``criteria``. When ``on_insert`` is given the operation upserts (writing ``on_insert`` if nothing matches) and always returns a document; otherwise it is a plain update that returns ``None`` on no match. - Shared by :meth:`patch_pivot_row` and both upsert methods so the query mechanics live once. + Shared by :meth:`update_contribution_by_identifiers` and both upsert methods so the query + mechanics live once. """ query = self.document_model.find_one(self._scope, *criteria) result = ( diff --git a/mpcontribs-api/tests/integration/db/test_contributions_repository.py b/mpcontribs-api/tests/integration/db/test_contributions_repository.py index 4016f6de7c..75aee374d5 100644 --- a/mpcontribs-api/tests/integration/db/test_contributions_repository.py +++ b/mpcontribs-api/tests/integration/db/test_contributions_repository.py @@ -343,31 +343,46 @@ async def test_project_identifier_combination_is_unique_lookup(self, db): # --------------------------------------------------------------------------- -# patch_pivot_row (scoped find-one-and-update by pivot identity) +# update_contribution_by_identifiers (scoped find-one-and-update by pivot identity) # --------------------------------------------------------------------------- -class TestPatchPivotRow: +class TestUpdateContributionByIdentifiers: async def test_updates_single_field(self, db): doc = await _insert(identifier="patch-formula") - updated = await _repo(ADMIN).patch_pivot_row( + updated = await _repo(ADMIN).update_contribution_by_identifiers( doc.project, doc.identifier, doc.version, doc.condition_key, {"formula": "SiO2"} ) assert updated is not None and updated.formula == "SiO2" found = await Contribution.find_one(Contribution.id == doc.id) assert found.formula == "SiO2" - async def test_updates_data_field(self, db): - doc = await _insert(identifier="patch-data") - await _repo(ADMIN).patch_pivot_row( + async def test_updates_data_field_merges_by_default(self, db): + # Default (replace_data=False) deep-merges: the new leaf is added, existing leaves survive. + doc = await _insert(identifier="patch-data") # data == {"band_gap": 2.1} + await _repo(ADMIN).update_contribution_by_identifiers( doc.project, doc.identifier, doc.version, doc.condition_key, {"data": {"energy": -5.0}} ) found = await Contribution.find_one(Contribution.id == doc.id) + assert found.data == {"band_gap": 2.1, "energy": -5.0} + + async def test_updates_data_field_replaces_when_requested(self, db): + # replace_data=True overwrites the whole data field, dropping keys not in the patch. + doc = await _insert(identifier="patch-data-replace") # data == {"band_gap": 2.1} + await _repo(ADMIN).update_contribution_by_identifiers( + doc.project, + doc.identifier, + doc.version, + doc.condition_key, + {"data": {"energy": -5.0}}, + replace_data=True, + ) + found = await Contribution.find_one(Contribution.id == doc.id) assert found.data == {"energy": -5.0} async def test_unrelated_fields_unchanged(self, db): doc = await _insert(identifier="patch-preserve", formula="Fe2O3") - await _repo(ADMIN).patch_pivot_row( + await _repo(ADMIN).update_contribution_by_identifiers( doc.project, doc.identifier, doc.version, doc.condition_key, {"needs_build": False} ) found = await Contribution.find_one(Contribution.id == doc.id) @@ -375,7 +390,7 @@ async def test_unrelated_fields_unchanged(self, db): async def test_no_matching_row_returns_none(self, db): doc = await _insert(identifier="patch-nomatch") - result = await _repo(ADMIN).patch_pivot_row( + result = await _repo(ADMIN).update_contribution_by_identifiers( doc.project, doc.identifier, doc.version, "conditions.temperature", {"formula": "X"} ) assert result is None @@ -383,7 +398,7 @@ async def test_no_matching_row_returns_none(self, db): async def test_anon_cannot_patch_private_row(self, db): doc = await _insert(identifier="patch-anon-priv", is_public=False) # Scope hides the private row from anonymous callers, so nothing matches to update. - result = await _repo(ANON).patch_pivot_row( + result = await _repo(ANON).update_contribution_by_identifiers( doc.project, doc.identifier, doc.version, doc.condition_key, {"formula": "X"} ) assert result is None From 9beef12d0fb7b935a9ad9adc7216b53b7a0fad39 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 23 Jul 2026 15:41:46 -0700 Subject: [PATCH 501/591] Fixed bug where inserting a document via upsert_contribution_by_id caused the provided id to be overwritten --- .../domains/contributions/repository.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py index 2f3f368918..ae963c3c90 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py @@ -422,19 +422,20 @@ async def upsert_contribution_by_identifiers( return cast(Contribution, result) # upsert always returns the resulting document async def upsert_contribution_by_id(self, id: str, contribution: ContributionIn) -> Contribution: - """Upserts a single Contribution. + """Upserts a single Contribution addressed by the ``id`` in the request path. - If Contributions with identical identifiers exist, update, otherwise insert - - Args: + If a Contribution with that id exists it is updated; otherwise a new one is inserted **under + that same id**. Args: id (str): the id of the Contribution to upsert contribution (ContributionIn): the Contribution to be upserted Returns: - ContributionOut: the upserted document""" + Contribution: the upserted document""" + oid = self._convert_object_id(id) doc = self.document_model.from_input_model(contribution) + doc.id = oid result = await self._find_one_and_set( - self.document_model.id == self._convert_object_id(id), + self.document_model.id == oid, update_data=doc.model_dump(exclude={"id"}, exclude_none=True), on_insert=doc, ) From 03f6d56fbe7f5df7714a79b55147bae2d3e4325a Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 23 Jul 2026 15:44:00 -0700 Subject: [PATCH 502/591] Added can_write check on upsert_contribution_by_id to prevent user from writing to any project --- .../domains/contributions/repository.py | 13 +++++++++++-- .../db/test_contributions_repository.py | 18 ++++++++++++++++++ 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py index ae963c3c90..850608367b 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py @@ -425,12 +425,21 @@ async def upsert_contribution_by_id(self, id: str, contribution: ContributionIn) """Upserts a single Contribution addressed by the ``id`` in the request path. If a Contribution with that id exists it is updated; otherwise a new one is inserted **under - that same id**. Args: + that same id**. + + Args: id (str): the id of the Contribution to upsert contribution (ContributionIn): the Contribution to be upserted Returns: - Contribution: the upserted document""" + Contribution: the upserted document + + Raises: + PermissionError: if the caller is not authorized to write to ``contribution.project`` + """ + if not self._user.can_write(contribution.project): + raise PermissionError(f"not authorized to write to project '{contribution.project}'") + oid = self._convert_object_id(id) doc = self.document_model.from_input_model(contribution) doc.id = oid diff --git a/mpcontribs-api/tests/integration/db/test_contributions_repository.py b/mpcontribs-api/tests/integration/db/test_contributions_repository.py index 75aee374d5..4f67f1cea6 100644 --- a/mpcontribs-api/tests/integration/db/test_contributions_repository.py +++ b/mpcontribs-api/tests/integration/db/test_contributions_repository.py @@ -10,6 +10,7 @@ ) from mpcontribs_api.domains.contributions.repository import MongoDbContributionRepository from mpcontribs_api.exceptions import NotFoundError, ValidationError +from mpcontribs_api.exceptions import PermissionError as AppPermissionError from mpcontribs_api.pagination import CursorParams pytestmark = [pytest.mark.db, pytest.mark.asyncio(loop_scope="session")] @@ -490,6 +491,23 @@ async def test_update_when_id_present_applies_change(self, db): assert stored is not None assert stored.formula == "Li2O" + async def test_authorized_non_admin_can_upsert_into_own_project(self, db): + # ALICE is in group "mp-team", so she may write to that project. + new_id = PydanticObjectId() + payload = _contrib_in(project="mp-team", identifier="ups-authz-ok", _id=new_id) + await _repo(ALICE).upsert_contribution_by_id(str(new_id), payload) + stored = await Contribution.find_one(Contribution.id == new_id) + assert stored is not None + assert stored.project == "mp-team" + + async def test_unauthorized_project_is_rejected_and_nothing_written(self, db): + # ALICE cannot write to "test-proj"; the insert must be refused, not silently written. + new_id = PydanticObjectId() + payload = _contrib_in(project="test-proj", identifier="ups-authz-deny", _id=new_id) + with pytest.raises(AppPermissionError): + await _repo(ALICE).upsert_contribution_by_id(str(new_id), payload) + assert await Contribution.find_one(Contribution.id == new_id) is None + class TestDeleteByIdsScope: async def test_anon_cannot_delete_out_of_scope_ids(self, db): From 4d52ead46ec749924d61845e36f089d912cf6d15 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Fri, 24 Jul 2026 13:00:43 -0700 Subject: [PATCH 503/591] Removed display and added precision to Contribution.data leaves. Also parse scalar numbers to leaves, while leaving legacy Contributions untouched --- mpcontribs-api/src/mpcontribs_api/_openapi.py | 51 ++++-- .../mpcontribs_api/domains/_shared/types.py | 44 +++-- .../mpcontribs_api/domains/_shared/units.py | 141 +++++++++------ .../domains/contributions/pivot.py | 59 +++++-- .../domains/contributions/repository.py | 14 +- .../domains/contributions/stats.py | 22 +-- .../mpcontribs_api/domains/projects/models.py | 1 - .../unit/domains/test_conditions_fuzz.py | 4 +- .../domains/test_contribution_repository.py | 13 +- .../unit/domains/test_contributions_models.py | 12 ++ .../unit/domains/test_contributions_pivot.py | 14 +- .../tests/unit/domains/test_units.py | 167 ++++++++++++------ 12 files changed, 352 insertions(+), 190 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/_openapi.py b/mpcontribs-api/src/mpcontribs_api/_openapi.py index c23a0ff04b..24c899475f 100644 --- a/mpcontribs-api/src/mpcontribs_api/_openapi.py +++ b/mpcontribs-api/src/mpcontribs_api/_openapi.py @@ -13,19 +13,36 @@ `"band_gap"`, and the **keys you read back may differ from the keys you submitted**. Keys must be ASCII and must not reduce to an empty string (e.g. `"***"` is rejected). -**Annotated keys (units + conditions):** a top-level key may carry an annotation in parentheses: +**Reserved keys:** `value`, `unit`, `input_value`, `input_unit`, `error`, `input_error`, +`precision`, and `display` are reserved for the stored value-leaf shape and may **not** be used as +data keys (a key that coerces to any of these is rejected). - "name (unit, condition1=value1, condition2=value2, ...)" +**Values become structured leaves.** Any value that reads as a number is stored as a *quantity leaf* +(see the response schema) capturing its value, unit, uncertainty, and precision; anything that does +not (a word like `"cubic"`, a boolean, a list) is stored as-is. Scalars **inside lists** are left +as-is (a list is treated as array data, not a column of measurements). -- The single token without an `=` is the **unit** (e.g. `eV`, `S/cm`, `K`); units are left verbatim - (not coerced) so they round-trip through Pint. -- Each `k=v` token is a **condition**. Condition names are coerced to `snake_case` like any other key. -- The `name` may be a dotted path (`"transport.conductivity (S/cm)"`) to nest the value. -- A key with no parentheses is a plain, fully backward-compatible key. +**Two ways to give a unit (both accepted, they converge):** + +1. In the **key**, via an annotation in parentheses: + `"name (unit, condition1=value1, condition2=value2, ...)"` — with the value a bare number + (`{"bandgap (eV)": 5}`). +2. In the **value** string itself (`{"bandgap": "5 eV"}`). + +Annotation rules: the single token without an `=` is the **unit** (e.g. `eV`, `S/cm`, `K`), left +verbatim so it round-trips through Pint; each `k=v` token is a **condition** (names coerced to +`snake_case`); `name` may be a dotted path (`"transport.conductivity (S/cm)"`) to nest the value; a +key with no parentheses is a plain key. If a unit is given in **both** the key and the value and they +differ, the **key's unit wins** — the value is converted into it (a dimensional mismatch is rejected). Recognized units are canonicalized to SI base units on write (the submitted form is preserved too — -see the response schema). Magnitudes may carry uncertainty as `"4.2(3)"`, `"4.2+/-0.3"`, or -`"4.2±0.3"`. +see the response schema); an unrecognized unit is kept verbatim. Magnitudes may carry uncertainty as +`"4.2(3)"`, `"4.2+/-0.3"`, or `"4.2±0.3"`. Precision (significant figures) is captured from a string +magnitude such as `"1.000"`; a bare JSON number carries no trailing-zero information. + +The server does **not** produce a formatted `display` string — the response returns the structured +fields (`input_value`/`input_unit`/`input_error`/`precision`) so clients render values however they +prefer. (`display` remains a reserved key for backward compatibility with older stored leaves.) **Pivoting on conditions:** if any key carries conditions, the single submission is *expanded* into one contribution per distinct condition signature. Each resulting contribution stores its conditions @@ -44,16 +61,22 @@ Hierarchical contribution data. Keys are stored in `snake_case` (see the write schema for the coercion rules), so they may differ from the keys originally submitted. -Values that were submitted with a unit annotation are stored as an **annotated leaf** object: +Any value that reads as a number is stored as a **quantity leaf** object: - `value` / `unit`: the SI-canonical magnitude and unit (or the submitted form when the unit is unrecognized or dimensionless) -- `input_value` / `input_unit`: the magnitude and unit exactly as submitted +- `input_value` / `input_unit`: the magnitude and unit as submitted (omitted for a bare, unitless, + exact number that ``value`` already fully describes) - `error`: the (SI-propagated) standard deviation — present only when the magnitude carried an - uncertainty -- `display`: a human-readable rendering of the *submitted* magnitude/unit (e.g. `"4.2+/-0.3 eV"`) + uncertainty; `input_error` is the same in the submitted unit +- `precision`: the number of significant figures the submission carried — present only when it is + derivable (a string magnitude such as `"1.000"`) + +There is no server-rendered `display` string: `input_value`, `input_unit`, `input_error`, and +`precision` reproduce the submitted form exactly, so a client can format the value however it likes. -Plain (unannotated) values keep whatever JSON shape they were submitted with. +Values that are not numeric (words, booleans, lists) keep whatever JSON shape they were submitted +with (after `snake_case` key coercion). """ openapi_tags = [ diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py index 6ebf1a4d51..ffe9aca1bc 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py @@ -273,6 +273,23 @@ def parse_annotated_key(key: str) -> ParsedKey: return ParsedKey(path=path, unit=unit, conditions=conditions) +# Users cannot use these values in their Contributions.data key names - reserved for describing numeric values +RESERVED_LEAF_KEYS = frozenset( + {"value", "unit", "input_value", "input_unit", "error", "input_error", "precision", "display"} +) + + +def is_quantity_leaf(node: Any) -> bool: + """True when ``node`` is a stored quantity leaf (numeric ``value`` + only reserved keys.""" + if not isinstance(node, dict): + return False + value = node.get("value") + if not isinstance(value, (int, float)) or isinstance(value, bool): + return False + # node.keys is a subset of RESERVED_LEAF_KEYS + return node.keys() <= RESERVED_LEAF_KEYS + + def _coerce_key(key: Any) -> str: """Coerce one dict key to ``snake_case``, rejecting non-ASCII or empty-after-coercion keys.""" if not isinstance(key, str) or not key.isascii(): @@ -309,6 +326,9 @@ def coerce_keys(value: Any) -> Any: def _get_dict_depth(x: Any) -> int: + # If x is a leaf (value + metadata) dict it counts as a single level of nesting (treat it as scalar) + if is_quantity_leaf(x): + return 0 if isinstance(x, dict): return 1 + max((_get_dict_depth(v) for v in x.values()), default=0) elif isinstance(x, list): @@ -338,8 +358,15 @@ def _validate_plain_key(key: Any) -> None: raise ValidationError("Non-ASCII key found in Contribution.data. All dict keys must be only ASCII") if key == "": raise ValidationError("Empty key found in Contribution.data. Keys must be non-empty.") - if not to_snake_case(key): + coerced = to_snake_case(key) + if not coerced: raise ValidationError(f"data key '{key}' reduces to an empty string after snake_case coercion") + if coerced in RESERVED_LEAF_KEYS: + raise ValidationError( + f"data key '{key}' is reserved for annotated-value leaves and may not be used", + key=key, + reserved=sorted(RESERVED_LEAF_KEYS), + ) def _validate_nested_keys(value: Any) -> None: @@ -354,6 +381,10 @@ def _validate_keys(data: dict[str, Any] | None) -> dict[str, Any] | None: """Strict plain-key validation for a single dict level (used for nested levels).""" if data is None: return None + # A server-built quantity leaf legitimately uses the reserved key names; do not descend into it + # (re-validation after normalization/expansion would otherwise reject its own keys). + if is_quantity_leaf(data): + return data for key in data: _validate_plain_key(key) # Recurse into nested dicts, including dicts nested inside lists. @@ -395,13 +426,7 @@ def _validate_data_keys(data: dict[str, Any] | None) -> dict[str, Any] | None: def validate_contribution_data(data: dict[str, Any] | None) -> dict[str, Any] | None: - """Run the full write-path ``data`` validation (depth + annotated/plain keys). - - This is the runtime equivalent of the :data:`ContributionData` validator chain, exposed as a - plain function so expansion (:mod:`mpcontribs_api.domains.contributions.pivot`) can re-check the - data it rewrites — ``model_copy`` bypasses Pydantic validators, so pivoted rows are re-validated - here before they are stored. - """ + """Run the full write-path ``data`` validation (depth + annotated/plain keys).""" _validate_data_depth(data) _validate_data_keys(data) return data @@ -409,6 +434,5 @@ def validate_contribution_data(data: dict[str, Any] | None) -> dict[str, Any] | ContributionData = Annotated[ dict[str, Any] | None, - BeforeValidator(_validate_data_depth), - BeforeValidator(_validate_data_keys), + BeforeValidator(validate_contribution_data), ] diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/units.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/units.py index a176ded0c9..265f738f22 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/units.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/units.py @@ -141,25 +141,54 @@ def _split_ufloat(magnitude: float | UFloat) -> tuple[float, float | None]: return float(magnitude), None +def _reconcile_units(mag: str, embedded_unit: str | None, key_unit: str | None) -> tuple[Any, str | None]: + """Reconcile a value-embedded unit with a key-annotation unit (the key unit wins). + + Returns ``(magnitude, unit)``: + + - only one unit present (or neither) -> that unit, magnitude unchanged; + - both present and equal -> that unit, magnitude unchanged; + - both present and different -> the magnitude is converted from ``embedded_unit`` into + ``key_unit`` via Pint, so the stored form honors the key's declared unit. + + Raises: + UnitError: when the two units differ and are not dimensionally convertible (including when + either is a unit Pint does not recognize). + """ + if not (embedded_unit and key_unit) or nfc_normalize(embedded_unit) == nfc_normalize(key_unit): + return mag, key_unit or embedded_unit + try: + converted = _UREG.Quantity(_parse_magnitude(mag), embedded_unit).to(key_unit) + except Exception as err: # broad catch: undefined unit or dimensionality mismatch + raise UnitError( + f"value unit {embedded_unit!r} is not convertible to the key unit {key_unit!r}", + value=mag, + ) from err + return converted.magnitude, key_unit + + class AnnotatedData(BaseModel): - """The canonical shape of an annotated ``Contribution.data`` leaf, and its factory. + """The canonical shape of a ``Contribution.data`` quantity leaf, and its factory. ``value``/``unit`` hold the SI-canonical form (or the submitted form when the unit is - unrecognized/dimensionless); ``input_value``/``input_unit`` always hold the submitted form. - ``error`` is the (SI-propagated) standard deviation, present only when the magnitude carried an - uncertainty. ``display`` is a human-readable rendering of the *submitted* magnitude/unit. - - This model is the single source of truth for the leaf: :meth:`from_submission` builds one from a - raw value + unit, :meth:`as_dict` serializes it to the stored dict, and :meth:`identity_scalar` - renders its contribution to a condition identity string. + unrecognized/dimensionless); ``input_value``/``input_unit`` hold the submitted form. ``error`` is + the (SI-propagated) standard deviation, present only when the magnitude carried an uncertainty; + ``input_error`` is the same uncertainty in the submitted unit. ``precision`` is the number of + significant digits the submission carried (string magnitudes only); it is ``None`` for a numeric + submission, which carries no trailing-zero information. + + The leaf carries no human-readable ``display`` string: clients format the value however they + like from these fields (``input_value``/``input_unit``/``input_error``/``precision`` reproduce the + submitted form exactly). """ value: float unit: str | None = None - input_value: float + input_value: float | None = None input_unit: str | None = None error: float | None = None - display: str + input_error: float | None = None + precision: int | None = None @classmethod def from_submission(cls, value: Any, unit: str | None) -> Self: @@ -167,12 +196,13 @@ def from_submission(cls, value: Any, unit: str | None) -> Self: Args: value: the submitted magnitude (number, or a string possibly carrying uncertainty) - unit: the unit string parsed from the annotated key, or ``None``/empty for unit-less + unit: the resolved unit string, or ``None``/empty for unit-less ``value``/``unit`` are canonical SI when convertible else the submitted form; - ``input_value``/``input_unit`` are always the submitted form; ``error`` is present only for an - uncertain magnitude; ``display`` renders the submitted form (trailing-zero precision preserved, - capped at ``float_precision`` significant figures). + ``input_value``/``input_unit`` hold the submitted form (kept only when a unit is present or + canonicalization changed the magnitude); ``error`` is present only for an uncertain magnitude; + ``precision`` is the submitted significant-figure count for a string magnitude (``None`` for a + numeric submission). Raises: UnitError: if the magnitude cannot be parsed. @@ -182,8 +212,9 @@ def from_submission(cls, value: Any, unit: str | None) -> Self: unit = nfc_normalize(unit) magnitude = _parse_magnitude(value) nominal, error = _split_ufloat(magnitude) - # display always reflects the submitted (pre-canonicalization) magnitude/unit. - display = _format_display(value, nominal, error, unit, settings.mpcontribs.float_precision) + # Precision is only recoverable from a string submission + cap = settings.mpcontribs.float_precision + precision = min(_count_sig_figs(value), cap) if isinstance(value, str) else None # Canonicalize to SI base units when Pint recognizes the unit; otherwise keep the submitted form. canon_value, canon_unit, canon_error = nominal, unit, error @@ -207,9 +238,42 @@ def from_submission(cls, value: Any, unit: str | None) -> Self: input_value=nominal, input_unit=unit, error=canon_error, - display=display, + input_error=error, + precision=precision, ) + @classmethod + def try_from_value(cls, value: Any, key_unit: str | None) -> Self | None: + """Build a leaf from an arbitrary scalar, or return ``None`` when it is categorical. + + Handles both spreadsheet forms and reconciles the two possible unit sources (decision: + the key unit wins on conflict): + + - a number -> magnitude from the number, unit from ``key_unit`` (may be ``None``); + - a string that does not start like a number (``"cubic"``) -> ``None`` (keep it verbatim); + - a string that starts like a number -> split into magnitude + embedded unit; if both an + embedded unit and ``key_unit`` are present and differ, the magnitude is converted from the + embedded unit into ``key_unit`` (raising :class:`UnitError` on a dimensional mismatch), so + the stored form honors the key's declared unit. An unrecognized unit is kept verbatim. + + ``bool`` is categorical (returns ``None``); it is an ``int`` subclass but never a measurement. + """ + if isinstance(value, bool): + return None + if isinstance(value, (int, float)): + return cls.from_submission(value, key_unit) + if not isinstance(value, str): + return None + text = _normalize_sci_notation(value.strip()) + if not _NUMERIC_START.match(text): + return None + match = _MAGNITUDE_UNIT.match(text) + if match is None: + return None + mag, embedded_unit = match.group("mag").strip(), match.group("unit").strip() or None + magnitude, unit = _reconcile_units(mag, embedded_unit, key_unit) + return cls.from_submission(magnitude, unit) + def as_dict(self) -> dict[str, Any]: """The stored leaf shape: ``model_dump(exclude_none=True)`` so ``None`` fields are omitted.""" return self.model_dump(exclude_none=True) @@ -251,7 +315,8 @@ def _count_sig_figs(mag: str) -> int: Trailing zeros after a decimal point are significant (``"1.000"`` -> 4, so higher measurement confidence than ``"1.0"``); leading zeros are not (``"0.00500"`` -> 3). Falls back to 1 when no - number leads the string. Used to preserve user-supplied precision in the ``display`` string. + number leads the string. Captured as the leaf's ``precision`` field so clients can reproduce the + submitted precision when formatting. """ m = _LEADING_NUM.match(mag.strip()) if not m: @@ -263,46 +328,6 @@ def _count_sig_figs(mag: str) -> int: return len(s.lstrip("0") or "0") -def _format_number(x: float, sig_figs: int, *, keep_trailing_zeros: bool) -> str: - """Render ``x`` to ``sig_figs`` significant figures. - - With ``keep_trailing_zeros`` the ``#`` format flag retains the zeros the user typed - (``"1.000"``); the bare trailing ``.`` that flag can leave (``"5."``, ``"1.e+03"``) is stripped. - Without it, trailing zeros are trimmed (plain ``g``) — used for numeric input, which carries no - trailing-zero information to preserve. - """ - sig_figs = max(sig_figs, 1) - flag = "#" if keep_trailing_zeros else "" - s = format(x, f"{flag}.{sig_figs}g") - if s.endswith("."): - s = s[:-1] - return s.replace(".e", "e").replace(".E", "E") - - -def _display_magnitude(value: Any, nominal: float, cap: int) -> str: - """Format the nominal magnitude for display, capped at ``cap`` significant figures. - - A string submission keeps its trailing zeros up to the cap (precision is meaningful: ``"1.000"`` - vs ``"1.0"``); a numeric submission carries no such information, so it is rendered trimmed and - capped. ``cap`` is the length cap that bounds how much precision a caller can submit. - """ - if isinstance(value, str): - return _format_number(nominal, min(_count_sig_figs(value), cap), keep_trailing_zeros=True) - return _format_number(nominal, cap, keep_trailing_zeros=False) - - -def _format_display(value: Any, nominal: float, error: float | None, unit: str | None, cap: int) -> str: - """Render the submitted magnitude/unit for display, e.g. ``"4.20 eV"``, ``"4.2+/-0.3 eV"``, ``"5"``. - - The nominal magnitude preserves the submitted trailing zeros (capped at ``cap`` sig figs); the - uncertainty is rendered trimmed and capped. - """ - mag = _display_magnitude(value, nominal, cap) - if error is not None: - mag = f"{mag}+/-{_format_number(error, cap, keep_trailing_zeros=False)}" - return f"{mag} {unit}" if unit else mag - - def _format_unit(units: Any) -> str: """Render Pint units compactly (``"kilogram / second ** 2"`` style default is fine).""" return f"{units:~}" if str(units) else "" diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/pivot.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/pivot.py index a3478068ab..a807b06001 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/pivot.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/pivot.py @@ -3,7 +3,6 @@ from mpcontribs_api.domains._shared.types import ( ParsedKey, - coerce_keys, parse_annotated_key, to_snake_case, validate_contribution_data, @@ -61,6 +60,45 @@ def _set_nested(target: dict[str, Any], segments: tuple[str, ...], value: Any) - cursor[leaf] = value +def normalize_node(value: Any, key_unit: str | None = None) -> Any: + """Recursively coerce dict keys to ``snake_case`` and turn scalar measurements into quantity leaves. + + This is the write-path core of "every numeric becomes a leaf": + + - **dict**: each key is coerced to ``snake_case`` (sibling collisions rejected); values recurse + with no inherited unit — only a top-level annotated key carries a unit (``key_unit``). + - **list**: elements recurse, but scalar elements are left verbatim (a list is array data, not a + column of measurements — mirrors :func:`mpcontribs_api.domains.contributions.stats.iter_leaves`, + which never treats list scalars as columns). + - **scalar**: promoted to a quantity leaf via :meth:`AnnotatedData.try_from_value` when it parses + as a number (optionally carrying a unit); otherwise kept verbatim (categorical string, bool). + + ``key_unit`` (from a top-level annotated key) is applied only to a scalar value; when it labels a + dict/list value it has no scalar to annotate and is ignored. + + Raises: + ValidationError: on a key that empties after coercion, a sibling-key collision, or a value + whose unit cannot be parsed/reconciled. + """ + if isinstance(value, dict): + out: dict[str, Any] = {} + for key, sub in value.items(): + coerced = to_snake_case(key) + if not coerced: + raise ValidationError(f"data key '{key}' reduces to an empty string after snake_case coercion") + if coerced in out: + raise ValidationError(f"data keys collide after snake_case coercion: '{coerced}'") + out[coerced] = normalize_node(sub) + return out + if isinstance(value, list): + return [normalize_node(item) for item in value] + try: + leaf = AnnotatedData.try_from_value(value, key_unit) + except UnitError as err: + raise ValidationError(f"could not parse value {value!r}: {err}") from err + return leaf.as_dict() if leaf is not None else value + + def expand_data(data: dict[str, Any]) -> list[ExpandedData]: """Annotate units and pivot a ``data`` mapping on its condition signatures. @@ -79,15 +117,11 @@ def expand_data(data: dict[str, Any]) -> list[ExpandedData]: ValidationError: on a malformed annotation, a path/column collision, or expanded data that violates the depth/key rules. """ - # parse_annotated_key raises DataKeyError (a ValidationError) on a malformed key; it propagates - # with its structured context and error_code intact and is rendered by the app error handlers. parsed = {raw_key: parse_annotated_key(raw_key) for raw_key in data} if not any(pk.is_annotated for pk in parsed.values()): - # Nothing annotated, but keys still get snake_case coercion (all-plain data). Return the - # original object untouched when coercion is a no-op so callers can short-circuit. - coerced = coerce_keys(data) - return [ExpandedData(data=data if coerced == data else coerced, condition_key="")] + normalized = normalize_node(data) + return [ExpandedData(data=data if normalized == data else normalized, condition_key="")] # Split columns into the condition-less broadcast set and the conditioned groups (keyed by the # canonical condition_key so physically-equal signatures merge into one row). @@ -120,16 +154,7 @@ def _coerce_segments(pk: ParsedKey) -> tuple[str, ...]: return segments def _annotate_column(row_data: dict[str, Any], raw_key: str, pk: ParsedKey) -> None: - try: - # Annotated leaves are produced (already canonical) by the AnnotatedData factory; plain - # values keep their structure but have their nested keys coerced to snake_case. - leaf = ( - AnnotatedData.from_submission(data[raw_key], pk.unit).as_dict() - if pk.is_annotated - else coerce_keys(data[raw_key]) - ) - except UnitError as err: - raise ValidationError(f"could not parse value for '{raw_key}': {err}") from err + leaf = normalize_node(data[raw_key], pk.unit if pk.is_annotated else None) _set_nested(row_data, _coerce_segments(pk), leaf) def _finalize(row_data: dict[str, Any], ckey: str) -> ExpandedData: diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py index 850608367b..de84fc6d38 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py @@ -10,7 +10,7 @@ from mpcontribs_api.authz import User from mpcontribs_api.domains._shared.repository import MongoDbRepository -from mpcontribs_api.domains._shared.types import DownloadFormat, ShortMimeFormat +from mpcontribs_api.domains._shared.types import DownloadFormat, ShortMimeFormat, is_quantity_leaf from mpcontribs_api.domains.contributions.models import ( Contribution, ContributionFilter, @@ -27,19 +27,15 @@ from mpcontribs_api.exceptions import PermissionError from mpcontribs_api.pagination import CursorParams -_ANNOTATED_LEAF_KEYS = frozenset({"value", "input_value", "display"}) - def _is_atomic_leaf(value: Any) -> bool: """Whether a merge should replace ``value`` whole rather than descend into it. - Non-dicts (scalars, lists) are always atomic. A dict is atomic only when it is an - annotated-value leaf; plain nested group dicts are *not* atomic so their sibling keys survive - the merge. + Non-dicts (scalars, lists) are always atomic. A dict is atomic only when it is a quantity leaf + (see :func:`mpcontribs_api.domains._shared.types.is_quantity_leaf`); plain nested group dicts are + *not* atomic so their sibling keys survive the merge. """ - if not isinstance(value, dict): - return True - return _ANNOTATED_LEAF_KEYS.issubset(value.keys()) + return not isinstance(value, dict) or is_quantity_leaf(value) def _flatten_for_merge(prefix: str, value: dict[str, Any]) -> dict[str, Any]: diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/stats.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/stats.py index cc9e15a39a..f05df1362e 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/stats.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/stats.py @@ -2,6 +2,8 @@ from dataclasses import dataclass, field from typing import Any +from mpcontribs_api.domains._shared.types import is_quantity_leaf + # Sentinel unit for a column whose leaves are not numeric (see module docstring). NON_NUMERIC_UNIT = "NaN" @@ -31,28 +33,18 @@ class ProjectAggregate: columns: list[ColumnStat] = field(default_factory=list) -def _is_annotated_leaf(node: dict[str, Any]) -> bool: - """True when ``node`` is the canonical annotated-data leaf shape (numeric ``value`` + ``display``). - - Both fields are always present on a leaf produced by ``AnnotatedData.as_dict`` and ``value`` is a - finite float, so requiring both distinguishes a leaf from an ordinary nested ``data`` object - (whose keys are user-supplied snake_case names). - """ - value = node.get("value") - return "display" in node and isinstance(value, (int, float)) and not isinstance(value, bool) - - def iter_leaves(data: dict[str, Any], prefix: str = "") -> Iterator[tuple[str, float | None, str | None]]: """Yield ``(path, numeric_value, unit)`` for every leaf of one contribution's ``data``. - ``numeric_value`` is ``None`` for a non-numeric leaf; ``unit`` is the canonical unit for an - annotated leaf (possibly ``None``), ``None`` for a bare number, and :data:`NON_NUMERIC_UNIT` - for a non-numeric leaf. Nested plain objects are recursed; annotated leaves are not. + ``numeric_value`` is ``None`` for a non-numeric leaf; ``unit`` is the canonical unit for a + quantity leaf (possibly ``None``), ``None`` for a legacy bare number, and :data:`NON_NUMERIC_UNIT` + for a non-numeric leaf. Nested plain objects are recursed; quantity leaves are not. The bare + int/float branches below handle legacy documents written before scalars were normalized to leaves. """ for key, node in data.items(): path = f"{prefix}.{key}" if prefix else key if isinstance(node, dict): - if _is_annotated_leaf(node): + if is_quantity_leaf(node): yield path, float(node["value"]), node.get("unit") else: yield from iter_leaves(node, path) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py index bc330923d5..5ae03fd552 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py @@ -13,7 +13,6 @@ class Column(BaseModel): min: float | None = None max: float | None = None unit: str | None = None - precision: int | None = None @property def segments(self) -> tuple[str, ...]: diff --git a/mpcontribs-api/tests/unit/domains/test_conditions_fuzz.py b/mpcontribs-api/tests/unit/domains/test_conditions_fuzz.py index 2e916a640c..7428f4b717 100644 --- a/mpcontribs-api/tests/unit/domains/test_conditions_fuzz.py +++ b/mpcontribs-api/tests/unit/domains/test_conditions_fuzz.py @@ -44,7 +44,9 @@ def test_never_raises_and_leaf_is_finite_and_json_safe(self, raw): # A numeric leaf must be finite (the inf/NaN guard) and representable in strict JSON so it # survives storage and canonical_md5 hashing. assert math.isfinite(out["value"]) - assert math.isfinite(out["input_value"]) + # input_value is omitted for a bare, exact, unit-less number (value fully describes it). + if "input_value" in out: + assert math.isfinite(out["input_value"]) json.dumps(out, allow_nan=False) @settings(max_examples=200, deadline=None, suppress_health_check=[HealthCheck.too_slow]) diff --git a/mpcontribs-api/tests/unit/domains/test_contribution_repository.py b/mpcontribs-api/tests/unit/domains/test_contribution_repository.py index f1c135f68c..5682a57a7e 100644 --- a/mpcontribs-api/tests/unit/domains/test_contribution_repository.py +++ b/mpcontribs-api/tests/unit/domains/test_contribution_repository.py @@ -26,9 +26,16 @@ def test_annotated_leaf_is_atomic(self): def test_plain_group_dict_is_not_atomic(self): assert not _is_atomic_leaf({"a": 1, "b": 2}) - def test_partial_leaf_shape_is_not_atomic(self): - # Missing a required leaf marker ("display") -> treated as a descendable group. - assert not _is_atomic_leaf({"value": 1.0, "input_value": 1.0}) + def test_minimal_value_leaf_is_atomic(self): + # A bare-number leaf has only ``value`` (no input_value/display) and is still a leaf. + assert _is_atomic_leaf({"value": 1.0}) + assert _is_atomic_leaf({"value": 1.0, "input_value": 1.0}) + + def test_dict_with_non_reserved_key_is_not_atomic(self): + # A numeric ``value`` alongside a non-reserved key is a descendable group, not a leaf. + assert not _is_atomic_leaf({"value": 1.0, "extra": 2}) + # ``value`` present but non-numeric -> not a leaf either. + assert not _is_atomic_leaf({"value": "text"}) class TestFlattenForMerge: diff --git a/mpcontribs-api/tests/unit/domains/test_contributions_models.py b/mpcontribs-api/tests/unit/domains/test_contributions_models.py index d42b60ccb3..60cc485197 100644 --- a/mpcontribs-api/tests/unit/domains/test_contributions_models.py +++ b/mpcontribs-api/tests/unit/domains/test_contributions_models.py @@ -119,6 +119,18 @@ def test_data_key_validation(self): with pytest.raises(ValidationError, match="reduces to an empty string"): _make_contribution_in(data={"***": "fail"}) + def test_reserved_leaf_keys_rejected(self): + # A data key that coerces to a reserved value-leaf name is rejected on write. + for bad in ("value", "unit", "error", "precision", "input_value", "display"): + with pytest.raises(ValidationError, match="reserved"): + _make_contribution_in(data={bad: 1}) + # rejected when nested, too + with pytest.raises(ValidationError, match="reserved"): + _make_contribution_in(data={"group": {"unit": "x"}}) + # and when used as a condition name in an annotated key + with pytest.raises(ValidationError, match="reserved"): + _make_contribution_in(data={"x (eV, value=3)": 1}) + # There isn't currently value validation. This is to check that that is true def test_data_value_validation(self): pipes_in_values = {"test": "pass||"} diff --git a/mpcontribs-api/tests/unit/domains/test_contributions_pivot.py b/mpcontribs-api/tests/unit/domains/test_contributions_pivot.py index f37207bbc3..3e8d337730 100644 --- a/mpcontribs-api/tests/unit/domains/test_contributions_pivot.py +++ b/mpcontribs-api/tests/unit/domains/test_contributions_pivot.py @@ -134,12 +134,13 @@ def test_duplicate_condition_raises(self): class TestExpandContribution: - def test_no_annotations_returns_unchanged(self): + def test_no_annotations_still_normalizes_scalars_to_leaves(self): c = _contrib_in({"a": {"b": 1.5}, "plain": 3}) rows = expand_contribution(c) assert len(rows) == 1 assert rows[0].condition_key == "" - assert rows[0].contribution is c # untouched, same object + # Every numeric scalar is promoted to a quantity leaf, at any nesting depth. + assert rows[0].contribution.data == {"a": {"b": {"value": 1.5}}, "plain": {"value": 3.0}} def test_unit_only_annotates_in_place_single_row(self): rows = expand_contribution(_contrib_in({"bandgap (eV)": 1.1})) @@ -225,13 +226,14 @@ def test_components_allowed_when_not_pivoting(self): def test_plain_keys_coerced_when_no_annotations(self): rows = expand_contribution(_contrib_in({"Band Gap": 1.5, "nested": {"Sub Key": 2}})) assert len(rows) == 1 - assert rows[0].contribution.data == {"band_gap": 1.5, "nested": {"sub_key": 2}} + # keys coerced to snake_case, numeric values promoted to leaves + assert rows[0].contribution.data == {"band_gap": {"value": 1.5}, "nested": {"sub_key": {"value": 2.0}}} - def test_no_op_coercion_returns_same_object(self): - # all keys already snake_case -> the original contribution object is returned untouched + def test_already_snake_case_keys_still_leafify_numbers(self): + # Even with nothing to coerce, bare numbers are normalized to quantity leaves. c = _contrib_in({"band_gap": 1.5, "nested": {"sub_key": 2}}) rows = expand_contribution(c) - assert rows[0].contribution is c + assert rows[0].contribution.data == {"band_gap": {"value": 1.5}, "nested": {"sub_key": {"value": 2.0}}} def test_annotated_path_segments_coerced(self): rows = expand_contribution(_contrib_in({"Band Gap (eV, T=300K)": 1.1})) diff --git a/mpcontribs-api/tests/unit/domains/test_units.py b/mpcontribs-api/tests/unit/domains/test_units.py index 56d0ea03bc..2990071d88 100644 --- a/mpcontribs-api/tests/unit/domains/test_units.py +++ b/mpcontribs-api/tests/unit/domains/test_units.py @@ -1,7 +1,6 @@ import math import pytest -from pydantic import ValidationError as PydanticValidationError from mpcontribs_api.config import get_settings from mpcontribs_api.domains._shared.units import ( @@ -33,20 +32,13 @@ def test_recognized_unit_canonicalizes_to_si_and_keeps_original(self): assert math.isclose(leaf["value"], 4.2 * 1.602176634e-19, rel_tol=1e-9) assert leaf["unit"] != "eV" # canonicalized to base units assert "error" not in leaf - # display renders the submitted (pre-canonicalization) form - assert leaf["display"] == "4.2 eV" - - def test_display_renders_submitted_form(self): - assert AnnotatedData.from_submission(4.2, "eV").as_dict()["display"] == "4.2 eV" - assert AnnotatedData.from_submission("4.2(3)", "eV").as_dict()["display"] == "4.2+/-0.3 eV" - assert AnnotatedData.from_submission(5, None).as_dict()["display"] == "5" - # unrecognized unit still renders verbatim - assert AnnotatedData.from_submission(1.0, "widgets").as_dict()["display"] == "1 widgets" + # no formatted display string is ever stored; clients format from the structured fields + assert "display" not in leaf def test_unitless_value(self): - # exclude_none drops unit/input_unit for a unit-less leaf; display is always present. + # A bare, exact, unit-less number is fully described by ``value``: input_*/display are omitted. leaf = AnnotatedData.from_submission(5, None).as_dict() - assert leaf == {"value": 5.0, "input_value": 5.0, "display": "5"} + assert leaf == {"value": 5.0} def test_unknown_unit_stored_as_submitted(self): leaf = AnnotatedData.from_submission(1.0, "widgets").as_dict() @@ -61,7 +53,7 @@ def test_unit_nfc_normalized(self): assert ohm_sign != greek_omega leaf = AnnotatedData.from_submission(1.0, ohm_sign).as_dict() assert leaf["input_unit"] == greek_omega - assert ohm_sign not in leaf["display"] + assert ohm_sign not in leaf["input_unit"] # Both spellings produce the identical stored/canonical leaf. assert leaf == AnnotatedData.from_submission(1.0, greek_omega).as_dict() @@ -223,7 +215,7 @@ def test_categorical_in_key(self): # --------------------------------------------------------------------------- -# display precision — preserve submitted trailing zeros, still cap length +# precision — count submitted significant figures, capped at the float-precision length # --------------------------------------------------------------------------- @@ -248,55 +240,48 @@ def test_counts(self, mag, expected): assert _count_sig_figs(mag) == expected -class TestDisplayPreservesTrailingZeros: - """display keeps the trailing zeros the user typed (precision signal), but stays capped. +class TestPrecisionCapture: + """The leaf's ``precision`` records the submitted significant figures, capped, for client use. Trailing zeros are informative — "1.000" claims more measurement confidence than "1.0" — so we - must not trim them, while still bounding length at float_precision significant figures. + store the sig-fig count so a client can reproduce it, while bounding it at float_precision. """ @pytest.mark.parametrize( - ("submitted", "expected_display"), + ("submitted", "expected_precision"), [ - ("1.000", "1.000 eV"), - ("1.0", "1.0 eV"), - ("4.20", "4.20 eV"), - ("300.0", "300.0 eV"), - ("0.00500", "0.00500 eV"), - ("5", "5 eV"), + ("1.000", 4), + ("1.0", 2), + ("4.20", 3), + ("300.0", 4), + ("0.00500", 3), + ("5", 1), ], ) - def test_string_input_preserves_trailing_zeros(self, submitted, expected_display): - assert AnnotatedData.from_submission(submitted, "eV").as_dict()["display"] == expected_display - - def test_numeric_input_has_no_trailing_zeros_to_preserve(self): - # A JSON number loses "1.000" -> 1.0 before it reaches us, so display is trimmed. - assert AnnotatedData.from_submission(1.000, "eV").as_dict()["display"] == "1 eV" - assert AnnotatedData.from_submission(4.20, "eV").as_dict()["display"] == "4.2 eV" - - def test_trailing_zeros_preserved_through_condition_path(self): - leaf = parse_condition_value("1.000 eV") - assert leaf["display"] == "1.000 eV" - - def test_length_cap_enforced_beyond_precision(self): - # 14 submitted sig figs are rounded down to the float_precision cap. - display = AnnotatedData.from_submission("1.2345678901234", "eV").as_dict()["display"] - mantissa = display.split(" ")[0].lstrip("-").replace(".", "") - assert len(mantissa.lstrip("0")) <= _FLOAT_PRECISION - - def test_trailing_zeros_capped_at_precision(self): - # More trailing zeros than the cap are truncated to exactly float_precision sig figs. + def test_string_input_records_precision(self, submitted, expected_precision): + assert AnnotatedData.from_submission(submitted, "eV").precision == expected_precision + + def test_numeric_input_has_no_precision(self): + # A JSON number loses "1.000" -> 1.0 before it reaches us, so there is nothing to record. + assert AnnotatedData.from_submission(1.000, "eV").precision is None + assert AnnotatedData.from_submission(4.20, "eV").precision is None + + def test_precision_captured_through_condition_path(self): + assert parse_condition_value("1.000 eV")["precision"] == 4 + + def test_precision_capped_at_float_precision(self): + # 14 submitted sig figs are capped at the float_precision length. + assert AnnotatedData.from_submission("1.2345678901234", "eV").precision == _FLOAT_PRECISION zeros = "1." + "0" * (_FLOAT_PRECISION + 5) - mantissa = AnnotatedData.from_submission(zeros, "eV").as_dict()["display"].split(" ")[0].replace(".", "") - assert len(mantissa) == _FLOAT_PRECISION + assert AnnotatedData.from_submission(zeros, "eV").precision == _FLOAT_PRECISION - def test_display_does_not_change_stored_numeric_value(self): - # Preserving display precision must not alter the stored float value/input_value. + def test_precision_does_not_change_stored_numeric_value(self): + # Recording precision must not alter the stored float value/input_value. leaf = AnnotatedData.from_submission("1.000", "eV").as_dict() assert leaf["input_value"] == 1.0 def test_identity_still_normalizes_regardless_of_trailing_zeros(self): - # condition_key uses the canonical float, not display: "300" and "300.0" still collapse. + # condition_key uses the canonical float, not precision: "300" and "300.0" still collapse. assert AnnotatedData.condition_key({"T": parse_condition_value("300 K")}) == AnnotatedData.condition_key( {"T": parse_condition_value("300.000 K")} ) @@ -309,20 +294,23 @@ def test_identity_still_normalizes_regardless_of_trailing_zeros(self): class TestAnnotatedData: def test_unit_and_error_optional(self): - leaf = AnnotatedData(value=5.0, input_value=5.0, display="5") + leaf = AnnotatedData(value=5.0, input_value=5.0) assert leaf.unit is None assert leaf.input_unit is None assert leaf.error is None + assert leaf.precision is None def test_unit_case_preserved(self): # units must never be casefolded (eV stays eV, not ev) - leaf = AnnotatedData(value=1.0, unit="eV", input_value=1.0, input_unit="eV", display="1 eV") + leaf = AnnotatedData(value=1.0, unit="eV", input_value=1.0, input_unit="eV") assert leaf.unit == "eV" assert leaf.input_unit == "eV" - def test_display_required(self): - with pytest.raises(PydanticValidationError): - AnnotatedData(value=5.0, input_value=5.0) + def test_display_not_stored(self): + # display is derived on read, never a stored field: value alone is a valid leaf. + leaf = AnnotatedData(value=5.0).as_dict() + assert leaf == {"value": 5.0} + assert "display" not in leaf class TestAnnotatedDataFactory: @@ -333,7 +321,7 @@ def test_from_submission_returns_model(self): assert isinstance(leaf, AnnotatedData) assert leaf.input_value == 4.2 assert leaf.input_unit == "eV" - assert leaf.display == "4.2 eV" + assert leaf.precision == 2 # "4.2" -> 2 significant figures def test_from_submission_canonicalizes_to_si(self): leaf = AnnotatedData.from_submission(4.2, "eV") @@ -346,7 +334,7 @@ def test_from_submission_raises_on_unparseable(self): def test_as_dict_omits_none_fields(self): leaf = AnnotatedData.from_submission(5, None).as_dict() - assert leaf == {"value": 5.0, "input_value": 5.0, "display": "5"} + assert leaf == {"value": 5.0} def test_identity_scalar_categorical_verbatim(self): assert AnnotatedData.identity_scalar("cubic") == "cubic" @@ -367,3 +355,70 @@ def test_condition_key_method_builds_sorted_identity(self): def test_condition_key_method_empty(self): assert AnnotatedData.condition_key({}) == "" + + +# --------------------------------------------------------------------------- +# try_from_value — the unified scalar entry point (leaf vs categorical, unit sources) +# --------------------------------------------------------------------------- + + +class TestTryFromValue: + def test_bare_number_becomes_unitless_leaf(self): + leaf = AnnotatedData.try_from_value(5, None) + assert leaf is not None + assert leaf.as_dict() == {"value": 5.0} + + def test_number_with_key_unit(self): # spreadsheet scenario A: "bandgap (eV)" -> 5 + leaf = AnnotatedData.try_from_value(5, "eV") + assert leaf is not None + assert leaf.input_value == 5.0 + assert leaf.input_unit == "eV" + + def test_string_with_embedded_unit(self): # spreadsheet scenario B: "bandgap" -> "5 eV" + leaf = AnnotatedData.try_from_value("5 eV", None) + assert leaf is not None + assert leaf.input_value == 5.0 + assert leaf.input_unit == "eV" + + def test_scenarios_a_and_b_converge(self): + # Unit-in-key (number value) and unit-in-value (string) produce the same physical leaf. + a = AnnotatedData.try_from_value(5, "eV") + b = AnnotatedData.try_from_value("5 eV", None) + assert a is not None and b is not None + for field in ("value", "unit", "input_value", "input_unit"): + assert getattr(a, field) == getattr(b, field) + + def test_categorical_string_is_not_a_leaf(self): + assert AnnotatedData.try_from_value("cubic", None) is None + + def test_boolean_is_not_a_leaf(self): + assert AnnotatedData.try_from_value(True, None) is None + + def test_unrecognized_unit_in_value_kept_verbatim(self): + leaf = AnnotatedData.try_from_value("5 apples", None) + assert leaf is not None + assert leaf.value == 5.0 + assert leaf.unit == "apples" + assert leaf.input_unit == "apples" + + def test_precision_captured_from_string(self): + leaf = AnnotatedData.try_from_value("5.00 eV", None) + assert leaf is not None + assert leaf.precision == 3 + + def test_conflicting_units_key_wins_via_conversion(self): + # key unit eV, value unit meV -> converted into eV (5 meV == 0.005 eV). + leaf = AnnotatedData.try_from_value("5 meV", "eV") + assert leaf is not None + assert leaf.input_unit == "eV" + assert math.isclose(leaf.input_value, 0.005, rel_tol=1e-9) + + def test_conflicting_units_same_dimension_ok(self): + leaf = AnnotatedData.try_from_value("5 eV", "eV") + assert leaf is not None + assert leaf.input_unit == "eV" + assert leaf.input_value == 5.0 + + def test_incompatible_units_rejected(self): + with pytest.raises(UnitError): + AnnotatedData.try_from_value("5 kg", "eV") From 8207cf7bef2e590e04ff390c7ffa2258b79598c7 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Fri, 24 Jul 2026 14:13:35 -0700 Subject: [PATCH 504/591] Extracted Contributions.data specific functions to contributions/data --- .../mpcontribs_api/domains/_shared/types.py | 243 +----------------- .../domains/contributions/data.py | 241 +++++++++++++++++ 2 files changed, 243 insertions(+), 241 deletions(-) create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/contributions/data.py diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py index ffe9aca1bc..06136ce2c0 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py @@ -1,17 +1,13 @@ import re import unicodedata -from dataclasses import dataclass, field from enum import StrEnum -from typing import Annotated, Any +from typing import Annotated import polars as pl from fastapi import Query from pydantic import BeforeValidator, Field, PlainSerializer, WithJsonSchema -from mpcontribs_api.config import get_settings -from mpcontribs_api.exceptions import DataKeyError, ValidationError - -settings = get_settings() +from mpcontribs_api.exceptions import ValidationError ShortStr = Annotated[str, Field(min_length=3, max_length=30)] @@ -201,238 +197,3 @@ def to_snake_case(name: str) -> str: # Converts strs to pretty display form (keeps unicode and most formatting) DisplayStr = Annotated[str, BeforeValidator(func=nfc_normalize)] - - -# Contribution.data key grammar, coercion, and validation -# Put here to avoid circular import of contributions.models and contributions.pivot - - -@dataclass(frozen=True, slots=True) -class ParsedKey: - """A ``data`` key split into its path, optional unit, and ordered conditions.""" - - path: str - unit: str | None - # Insertion-ordered {condition_name: raw_value_string}; empty when the key carried no conditions. - conditions: dict[str, str] = field(default_factory=dict) - - @property - def is_annotated(self) -> bool: - """True when the key carried a unit and/or any conditions (i.e. had an annotation block).""" - return self.unit is not None or bool(self.conditions) - - @property - def segments(self) -> tuple[str, ...]: - """The path split on '.' into nesting segments.""" - return tuple(self.path.split(".")) - - -def parse_annotated_key(key: str) -> ParsedKey: - """Parse a raw ``data`` key into a :class:`ParsedKey`. - - A key with no ``(...)`` block is a plain path (unit ``None``, no conditions) — fully backward - compatible. Inside the block, the one token without ``=`` is the unit and every ``k=v`` token is - a condition, in submission order. - - Raises: - DataKeyError: on a malformed annotation (unbalanced parens, empty path, empty condition name, - or more than one unit token). - """ - if "(" not in key: - path = key.strip() - if not path: - raise DataKeyError("empty data key") - return ParsedKey(path=path, unit=None) - - stripped = key.rstrip() - open_idx = stripped.index("(") - if not stripped.endswith(")"): - raise DataKeyError(f"unbalanced annotation in data key {key!r}") - path = stripped[:open_idx].strip() - if not path: - raise DataKeyError(f"data key {key!r} has an annotation but no name") - - inner = stripped[open_idx + 1 : -1] - unit: str | None = None - conditions: dict[str, str] = {} - for token in (t.strip() for t in inner.split(",")): - if not token: - continue - if "=" in token: - name, value = token.split("=", 1) - name = name.strip() - if not name: - raise DataKeyError(f"empty condition name in data key {key!r}") - if name in conditions: - raise DataKeyError(f"duplicate condition {name!r} in data key {key!r}") - conditions[name] = value.strip() - else: - if unit is not None: - raise DataKeyError(f"multiple unit tokens ({unit!r}, {token!r}) in data key {key!r}") - unit = token - return ParsedKey(path=path, unit=unit, conditions=conditions) - - -# Users cannot use these values in their Contributions.data key names - reserved for describing numeric values -RESERVED_LEAF_KEYS = frozenset( - {"value", "unit", "input_value", "input_unit", "error", "input_error", "precision", "display"} -) - - -def is_quantity_leaf(node: Any) -> bool: - """True when ``node`` is a stored quantity leaf (numeric ``value`` + only reserved keys.""" - if not isinstance(node, dict): - return False - value = node.get("value") - if not isinstance(value, (int, float)) or isinstance(value, bool): - return False - # node.keys is a subset of RESERVED_LEAF_KEYS - return node.keys() <= RESERVED_LEAF_KEYS - - -def _coerce_key(key: Any) -> str: - """Coerce one dict key to ``snake_case``, rejecting non-ASCII or empty-after-coercion keys.""" - if not isinstance(key, str) or not key.isascii(): - raise DataKeyError("Non-ASCII key found in Contribution.data. All dict keys must be only ASCII") - coerced = to_snake_case(key) - if not coerced: - raise DataKeyError(f"data key '{key}' reduces to an empty string after snake_case coercion") - return coerced - - -def coerce_keys(value: Any) -> Any: - """Recursively rebuild ``value`` with every dict key coerced to ``snake_case``. - - Walks dicts (coercing keys) and lists (element-wise), leaving scalars untouched. Used for the - nested/plain portions of ``data``; the annotated leaves produced by - :func:`mpcontribs_api.domains._shared.units.annotate_value` are already canonical and are never - routed through here. - - Raises: - ValidationError: if a key is non-ASCII, reduces to an empty string after coercion, or two - sibling keys collide on the same coerced name. - """ - if isinstance(value, dict): - out: dict[str, Any] = {} - for key, sub in value.items(): - coerced = _coerce_key(key) - if coerced in out: - raise DataKeyError(f"data keys collide after snake_case coercion: '{coerced}'") - out[coerced] = coerce_keys(sub) - return out - if isinstance(value, list): - return [coerce_keys(item) for item in value] - return value - - -def _get_dict_depth(x: Any) -> int: - # If x is a leaf (value + metadata) dict it counts as a single level of nesting (treat it as scalar) - if is_quantity_leaf(x): - return 0 - if isinstance(x, dict): - return 1 + max((_get_dict_depth(v) for v in x.values()), default=0) - elif isinstance(x, list): - return max((_get_dict_depth(item) for item in x), default=0) - return 0 - - -def _validate_data_depth(data: dict[str, Any] | None) -> dict[str, Any] | None: - if data is None: - return None - depth = _get_dict_depth(data) - max_depth = settings.mpcontribs.max_contrib_data_depth - if depth > max_depth: - raise ValidationError(f"Depth of Contribution.data must be <= {max_depth}.", depth=depth, max_depth=max_depth) - return data - - -def _validate_plain_key(key: Any) -> None: - """Validate a single plain key token (a path segment or a condition name). - - Punctuation, spaces, and casing are no longer rejected: keys are coerced to ``snake_case`` on the - write path (see :func:`to_snake_case`). This only rejects keys that cannot be coerced into a - usable token: non-ASCII, empty, or ones that reduce to an empty string after coercion - (e.g. ``"***"``). - """ - if not isinstance(key, str) or not key.isascii(): - raise ValidationError("Non-ASCII key found in Contribution.data. All dict keys must be only ASCII") - if key == "": - raise ValidationError("Empty key found in Contribution.data. Keys must be non-empty.") - coerced = to_snake_case(key) - if not coerced: - raise ValidationError(f"data key '{key}' reduces to an empty string after snake_case coercion") - if coerced in RESERVED_LEAF_KEYS: - raise ValidationError( - f"data key '{key}' is reserved for annotated-value leaves and may not be used", - key=key, - reserved=sorted(RESERVED_LEAF_KEYS), - ) - - -def _validate_nested_keys(value: Any) -> None: - if isinstance(value, dict): - _validate_keys(value) - elif isinstance(value, list): - for item in value: - _validate_nested_keys(item) - - -def _validate_keys(data: dict[str, Any] | None) -> dict[str, Any] | None: - """Strict plain-key validation for a single dict level (used for nested levels).""" - if data is None: - return None - # A server-built quantity leaf legitimately uses the reserved key names; do not descend into it - # (re-validation after normalization/expansion would otherwise reject its own keys). - if is_quantity_leaf(data): - return data - for key in data: - _validate_plain_key(key) - # Recurse into nested dicts, including dicts nested inside lists. - for v in data.values(): - _validate_nested_keys(v) - return data - - -def _validate_data_keys(data: dict[str, Any] | None) -> dict[str, Any] | None: - """Top-level ``data`` key validation, allowing the annotated pattern. - - Each top-level key may be either a plain key or the annotated form - ``name (unit, cond1=..., cond2=...)``. The name's dotted segments and every condition name are - held to the same plain-key rules (units are unconstrained); nested levels stay strictly plain. - Expansion (see :mod:`mpcontribs_api.domains.contributions.pivot`) later rewrites annotated keys - into plain ones, so stored keys always satisfy :func:`_validate_keys`. - """ - if data is None: - return None - for raw_key in data: - if not isinstance(raw_key, str): - raise ValidationError("Non-ASCII key found in Contribution.data. All dict keys must be only ASCII") - try: - parsed = parse_annotated_key(raw_key) - except ValidationError as err: - raise ValidationError(f"Malformed annotated key in Contribution.data: {err}") from err - if not parsed.is_annotated: - # A plain key keeps the original strict rule (no '.' nesting); only annotated keys may - # use dotted paths, whose segments are validated individually below. - _validate_plain_key(raw_key) - continue - for segment in parsed.segments: - _validate_plain_key(segment) - for condition_name in parsed.conditions: - _validate_plain_key(condition_name) - for v in data.values(): - _validate_nested_keys(v) - return data - - -def validate_contribution_data(data: dict[str, Any] | None) -> dict[str, Any] | None: - """Run the full write-path ``data`` validation (depth + annotated/plain keys).""" - _validate_data_depth(data) - _validate_data_keys(data) - return data - - -ContributionData = Annotated[ - dict[str, Any] | None, - BeforeValidator(validate_contribution_data), -] diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/data.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/data.py new file mode 100644 index 0000000000..22f64426e8 --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/data.py @@ -0,0 +1,241 @@ +from dataclasses import dataclass, field +from typing import Annotated, Any + +from pydantic import BeforeValidator + +from mpcontribs_api.config import get_settings +from mpcontribs_api.domains._shared.types import to_snake_case +from mpcontribs_api.exceptions import DataKeyError, ValidationError + +settings = get_settings() + + +@dataclass(frozen=True, slots=True) +class ParsedKey: + """A ``data`` key split into its path, optional unit, and ordered conditions.""" + + path: str + unit: str | None + # Insertion-ordered {condition_name: raw_value_string}; empty when the key carried no conditions. + conditions: dict[str, str] = field(default_factory=dict) + + @property + def is_annotated(self) -> bool: + """True when the key carried a unit and/or any conditions (i.e. had an annotation block).""" + return self.unit is not None or bool(self.conditions) + + @property + def segments(self) -> tuple[str, ...]: + """The path split on '.' into nesting segments.""" + return tuple(self.path.split(".")) + + +def parse_annotated_key(key: str) -> ParsedKey: + """Parse a raw ``data`` key into a :class:`ParsedKey`. + + A key with no ``(...)`` block is a plain path (unit ``None``, no conditions) — fully backward + compatible. Inside the block, the one token without ``=`` is the unit and every ``k=v`` token is + a condition, in submission order. + + Raises: + DataKeyError: on a malformed annotation (unbalanced parens, empty path, empty condition name, + or more than one unit token). + """ + if "(" not in key: + path = key.strip() + if not path: + raise DataKeyError("empty data key") + return ParsedKey(path=path, unit=None) + + stripped = key.rstrip() + open_idx = stripped.index("(") + if not stripped.endswith(")"): + raise DataKeyError(f"unbalanced annotation in data key {key!r}") + path = stripped[:open_idx].strip() + if not path: + raise DataKeyError(f"data key {key!r} has an annotation but no name") + + inner = stripped[open_idx + 1 : -1] + unit: str | None = None + conditions: dict[str, str] = {} + for token in (t.strip() for t in inner.split(",")): + if not token: + continue + if "=" in token: + name, value = token.split("=", 1) + name = name.strip() + if not name: + raise DataKeyError(f"empty condition name in data key {key!r}") + if name in conditions: + raise DataKeyError(f"duplicate condition {name!r} in data key {key!r}") + conditions[name] = value.strip() + else: + if unit is not None: + raise DataKeyError(f"multiple unit tokens ({unit!r}, {token!r}) in data key {key!r}") + unit = token + return ParsedKey(path=path, unit=unit, conditions=conditions) + + +# Users cannot use these values in their Contributions.data key names - reserved for describing numeric values +RESERVED_LEAF_KEYS = frozenset( + {"value", "unit", "input_value", "input_unit", "error", "input_error", "precision", "display"} +) + + +def is_quantity_leaf(node: Any) -> bool: + """True when ``node`` is a stored quantity leaf (numeric ``value`` + only reserved keys.""" + if not isinstance(node, dict): + return False + value = node.get("value") + if not isinstance(value, (int, float)) or isinstance(value, bool): + return False + # node.keys is a subset of RESERVED_LEAF_KEYS + return node.keys() <= RESERVED_LEAF_KEYS + + +def _coerce_key(key: Any) -> str: + """Coerce one dict key to ``snake_case``, rejecting non-ASCII or empty-after-coercion keys.""" + if not isinstance(key, str) or not key.isascii(): + raise DataKeyError("Non-ASCII key found in Contribution.data. All dict keys must be only ASCII") + coerced = to_snake_case(key) + if not coerced: + raise DataKeyError(f"data key '{key}' reduces to an empty string after snake_case coercion") + return coerced + + +def coerce_keys(value: Any) -> Any: + """Recursively rebuild ``value`` with every dict key coerced to ``snake_case``. + + Walks dicts (coercing keys) and lists (element-wise), leaving scalars untouched. Used for the + nested/plain portions of ``data``; the annotated leaves produced by + :func:`mpcontribs_api.domains._shared.units.annotate_value` are already canonical and are never + routed through here. + + Raises: + ValidationError: if a key is non-ASCII, reduces to an empty string after coercion, or two + sibling keys collide on the same coerced name. + """ + if isinstance(value, dict): + out: dict[str, Any] = {} + for key, sub in value.items(): + coerced = _coerce_key(key) + if coerced in out: + raise DataKeyError(f"data keys collide after snake_case coercion: '{coerced}'") + out[coerced] = coerce_keys(sub) + return out + if isinstance(value, list): + return [coerce_keys(item) for item in value] + return value + + +def _get_dict_depth(x: Any) -> int: + # If x is a leaf (value + metadata) dict it counts as a single level of nesting (treat it as scalar) + if is_quantity_leaf(x): + return 0 + if isinstance(x, dict): + return 1 + max((_get_dict_depth(v) for v in x.values()), default=0) + elif isinstance(x, list): + return max((_get_dict_depth(item) for item in x), default=0) + return 0 + + +def _validate_data_depth(data: dict[str, Any] | None) -> dict[str, Any] | None: + if data is None: + return None + depth = _get_dict_depth(data) + max_depth = settings.mpcontribs.max_contrib_data_depth + if depth > max_depth: + raise ValidationError(f"Depth of Contribution.data must be <= {max_depth}.", depth=depth, max_depth=max_depth) + return data + + +def _validate_plain_key(key: Any) -> None: + """Validate a single plain key token (a path segment or a condition name). + + Punctuation, spaces, and casing are no longer rejected: keys are coerced to ``snake_case`` on the + write path (see :func:`to_snake_case`). This only rejects keys that cannot be coerced into a + usable token: non-ASCII, empty, or ones that reduce to an empty string after coercion + (e.g. ``"***"``). + """ + if not isinstance(key, str) or not key.isascii(): + raise ValidationError("Non-ASCII key found in Contribution.data. All dict keys must be only ASCII") + if key == "": + raise ValidationError("Empty key found in Contribution.data. Keys must be non-empty.") + coerced = to_snake_case(key) + if not coerced: + raise ValidationError(f"data key '{key}' reduces to an empty string after snake_case coercion") + if coerced in RESERVED_LEAF_KEYS: + raise ValidationError( + f"data key '{key}' is reserved for annotated-value leaves and may not be used", + key=key, + reserved=sorted(RESERVED_LEAF_KEYS), + ) + + +def _validate_nested_keys(value: Any) -> None: + if isinstance(value, dict): + _validate_keys(value) + elif isinstance(value, list): + for item in value: + _validate_nested_keys(item) + + +def _validate_keys(data: dict[str, Any] | None) -> dict[str, Any] | None: + """Strict plain-key validation for a single dict level (used for nested levels).""" + if data is None: + return None + # A server-built quantity leaf legitimately uses the reserved key names; do not descend into it + # (re-validation after normalization/expansion would otherwise reject its own keys). + if is_quantity_leaf(data): + return data + for key in data: + _validate_plain_key(key) + # Recurse into nested dicts, including dicts nested inside lists. + for v in data.values(): + _validate_nested_keys(v) + return data + + +def _validate_data_keys(data: dict[str, Any] | None) -> dict[str, Any] | None: + """Top-level ``data`` key validation, allowing the annotated pattern. + + Each top-level key may be either a plain key or the annotated form + ``name (unit, cond1=..., cond2=...)``. The name's dotted segments and every condition name are + held to the same plain-key rules (units are unconstrained); nested levels stay strictly plain. + Expansion (see :mod:`mpcontribs_api.domains.contributions.pivot`) later rewrites annotated keys + into plain ones, so stored keys always satisfy :func:`_validate_keys`. + """ + if data is None: + return None + for raw_key in data: + if not isinstance(raw_key, str): + raise ValidationError("Non-ASCII key found in Contribution.data. All dict keys must be only ASCII") + try: + parsed = parse_annotated_key(raw_key) + except ValidationError as err: + raise ValidationError(f"Malformed annotated key in Contribution.data: {err}") from err + if not parsed.is_annotated: + # A plain key keeps the original strict rule (no '.' nesting); only annotated keys may + # use dotted paths, whose segments are validated individually below. + _validate_plain_key(raw_key) + continue + for segment in parsed.segments: + _validate_plain_key(segment) + for condition_name in parsed.conditions: + _validate_plain_key(condition_name) + for v in data.values(): + _validate_nested_keys(v) + return data + + +def validate_contribution_data(data: dict[str, Any] | None) -> dict[str, Any] | None: + """Run the full write-path ``data`` validation (depth + annotated/plain keys).""" + _validate_data_depth(data) + _validate_data_keys(data) + return data + + +ContributionData = Annotated[ + dict[str, Any] | None, + BeforeValidator(validate_contribution_data), +] From 5d0a4b9b8bb6c3b43cf06b39181acdb633aa6fde Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Fri, 24 Jul 2026 14:14:09 -0700 Subject: [PATCH 505/591] Updated tests to reference contributions/data --- .../src/mpcontribs_api/domains/contributions/models.py | 3 ++- .../src/mpcontribs_api/domains/contributions/pivot.py | 6 +++--- .../src/mpcontribs_api/domains/contributions/repository.py | 5 +++-- .../src/mpcontribs_api/domains/contributions/stats.py | 2 +- .../tests/unit/domains/test_contributions_pivot.py | 4 ++-- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py index 364a1ed51f..27c5b6f04f 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py @@ -19,8 +19,9 @@ from mpcontribs_api._openapi import CONTRIBUTION_DATA_INPUT_DESCRIPTION, CONTRIBUTION_DATA_OUTPUT_DESCRIPTION from mpcontribs_api.domains._shared.filters import BaseFilter from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut -from mpcontribs_api.domains._shared.types import ContributionData, DisplayStr, SearchStr, ShortStr +from mpcontribs_api.domains._shared.types import DisplayStr, SearchStr, ShortStr from mpcontribs_api.domains.attachments.models import Attachment, AttachmentFilter, AttachmentIn +from mpcontribs_api.domains.contributions.data import ContributionData from mpcontribs_api.domains.structures.models import Structure, StructureFilter, StructureIn from mpcontribs_api.domains.tables.models import Table, TableFilter, TableIn from mpcontribs_api.exceptions import ValidationError diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/pivot.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/pivot.py index a807b06001..b486459b3c 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/pivot.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/pivot.py @@ -1,13 +1,13 @@ from dataclasses import dataclass from typing import TYPE_CHECKING, Any -from mpcontribs_api.domains._shared.types import ( +from mpcontribs_api.domains._shared.types import to_snake_case +from mpcontribs_api.domains._shared.units import AnnotatedData, UnitError, parse_condition_value +from mpcontribs_api.domains.contributions.data import ( ParsedKey, parse_annotated_key, - to_snake_case, validate_contribution_data, ) -from mpcontribs_api.domains._shared.units import AnnotatedData, UnitError, parse_condition_value from mpcontribs_api.exceptions import ValidationError if TYPE_CHECKING: diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py index de84fc6d38..6f49eab861 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py @@ -10,7 +10,8 @@ from mpcontribs_api.authz import User from mpcontribs_api.domains._shared.repository import MongoDbRepository -from mpcontribs_api.domains._shared.types import DownloadFormat, ShortMimeFormat, is_quantity_leaf +from mpcontribs_api.domains._shared.types import DownloadFormat, ShortMimeFormat +from mpcontribs_api.domains.contributions.data import is_quantity_leaf from mpcontribs_api.domains.contributions.models import ( Contribution, ContributionFilter, @@ -32,7 +33,7 @@ def _is_atomic_leaf(value: Any) -> bool: """Whether a merge should replace ``value`` whole rather than descend into it. Non-dicts (scalars, lists) are always atomic. A dict is atomic only when it is a quantity leaf - (see :func:`mpcontribs_api.domains._shared.types.is_quantity_leaf`); plain nested group dicts are + (see :func:`mpcontribs_api.domains.contributions.data.is_quantity_leaf`); plain nested group dicts are *not* atomic so their sibling keys survive the merge. """ return not isinstance(value, dict) or is_quantity_leaf(value) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/stats.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/stats.py index f05df1362e..adca710940 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/stats.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/stats.py @@ -2,7 +2,7 @@ from dataclasses import dataclass, field from typing import Any -from mpcontribs_api.domains._shared.types import is_quantity_leaf +from mpcontribs_api.domains.contributions.data import is_quantity_leaf # Sentinel unit for a column whose leaves are not numeric (see module docstring). NON_NUMERIC_UNIT = "NaN" diff --git a/mpcontribs-api/tests/unit/domains/test_contributions_pivot.py b/mpcontribs-api/tests/unit/domains/test_contributions_pivot.py index 3e8d337730..3b9756f1f9 100644 --- a/mpcontribs-api/tests/unit/domains/test_contributions_pivot.py +++ b/mpcontribs-api/tests/unit/domains/test_contributions_pivot.py @@ -3,10 +3,10 @@ import pytest from beanie import PydanticObjectId -from mpcontribs_api.domains._shared.types import ( +from mpcontribs_api.domains._shared.types import to_snake_case +from mpcontribs_api.domains.contributions.data import ( coerce_keys, parse_annotated_key, - to_snake_case, ) from mpcontribs_api.domains.contributions.models import ContributionIn from mpcontribs_api.domains.contributions.pivot import expand_contribution From aa00697e19f730084cb0fc912397786392864dfe Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Fri, 24 Jul 2026 14:15:09 -0700 Subject: [PATCH 506/591] Only add input_* fields to leaf if we modified fields from their input values --- .../src/mpcontribs_api/domains/_shared/units.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/units.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/units.py index 265f738f22..0083e6cf22 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/units.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/units.py @@ -232,13 +232,15 @@ def from_submission(cls, value: Any, unit: str | None) -> Self: canon_value, canon_error = cv, ce canon_unit = _format_unit(quantity.units) + # Keep the input_* if we had to coerce things + keep_input = bool(unit) or canon_value != nominal return cls( value=canon_value, unit=canon_unit, - input_value=nominal, - input_unit=unit, + input_value=nominal if keep_input else None, + input_unit=unit if keep_input else None, error=canon_error, - input_error=error, + input_error=error if keep_input else None, precision=precision, ) From 60f368622cecfc552db9f5c79731ef93f9454f6a Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 27 Jul 2026 10:01:51 -0700 Subject: [PATCH 507/591] Implemented user-defined 'unique_value' to deduplicate contributions in the case that {project, material_id, chemical_system_id, formula} is not enough. Also added condition_key - logic implemented in another branch --- .../src/mpcontribs_api/dependencies.py | 1 - .../domains/contributions/models.py | 142 +++++++--- .../domains/contributions/repository.py | 167 ++++++++---- .../domains/contributions/router.py | 8 +- .../domains/contributions/service.py | 257 +++++++++++------- .../mpcontribs_api/domains/projects/models.py | 41 ++- .../domains/projects/repository.py | 20 +- .../src/mpcontribs_api/exceptions.py | 1 + .../tests/integration/db/conftest.py | 11 +- .../db/test_component_reachability.py | 3 +- .../db/test_contributions_repository.py | 65 +++-- .../tests/integration/db/test_download.py | 21 +- .../db/test_projects_repository.py | 1 - .../tests/integration/test_bulk_limits.py | 3 +- .../tests/integration/test_contributions.py | 3 +- .../integration/test_contributions_routes.py | 17 +- .../tests/integration/test_projects.py | 2 - .../unit/domains/test_contribution_service.py | 180 +++++++----- .../unit/domains/test_contributions_models.py | 69 ++++- .../unit/domains/test_projects_models.py | 35 ++- 20 files changed, 724 insertions(+), 323 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/dependencies.py b/mpcontribs-api/src/mpcontribs_api/dependencies.py index c13c84643a..0e0aa03278 100644 --- a/mpcontribs-api/src/mpcontribs_api/dependencies.py +++ b/mpcontribs-api/src/mpcontribs_api/dependencies.py @@ -71,4 +71,3 @@ def require_user(user: UserDep) -> User: if user.is_anonymous: raise AuthenticationError("authentication required") return user - diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py index 8c4ceadfe1..43c463cb30 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py @@ -75,11 +75,58 @@ def _validate_nested_keys(value: Any) -> None: _validate_nested_keys(item) +Scalar = str | int | float | bool + +# Identity in index order: the three fixed fields plus unique_value and condition_key. condition_key +# is "" until pivoting is wired in (contrib-data-handling merge). +IdentityKey = tuple[str, str, str, str, Scalar | None, str] + + +def _value_at(data: dict[str, Any], path: str) -> Any: + """Resolve a dotted ``path`` inside ``data``; raises ``KeyError`` if any segment is absent.""" + cursor: Any = data + for segment in path.split("."): + if not isinstance(cursor, dict) or segment not in cursor: + raise KeyError(path) + cursor = cursor[segment] + return cursor + + +def extract_unique_value(data: dict[str, Any] | None, unique_column: str) -> Scalar: + """Promote the value at a project's ``unique_column`` path to the Contribution's identity value. + + Args: + data: the contribution's ``data`` payload + unique_column: the dotted path the project designated as its uniqueness discriminator + + Returns: + Scalar: the scalar value at ``unique_column`` + + Raises: + ValidationError: if the path is absent or resolves to a non-scalar (dict/list/None) + """ + try: + value = _value_at(data or {}, unique_column) + except KeyError as err: + raise ValidationError( + f"unique_column '{unique_column}' is required by the project but missing from Contribution.data", + unique_column=unique_column, + ) from err + if not isinstance(value, Scalar): + raise ValidationError( + f"unique_column '{unique_column}' must resolve to a scalar (str/int/float/bool), " + f"got '{type(value).__name__}'", + unique_column=unique_column, + ) + return value + + class ContributionBase(BaseDocumentWithInput[PydanticObjectId]): """Shared settings and fields for Contribution, ContributionIn, and ContributionOut.""" project: str - identifier: str + material_id: str + chemical_system_id: str formula: str is_public: bool = False data: Annotated[ @@ -95,8 +142,15 @@ class Settings: keep_nulls = False indexes = [ IndexModel( - keys=[("project", ASCENDING), ("identifier", ASCENDING), ("version", ASCENDING)], - name="project_identifier_version", + keys=[ + ("project", ASCENDING), + ("material_id", ASCENDING), + ("chemical_system_id", ASCENDING), + ("formula", ASCENDING), + ("unique_value", ASCENDING), + ("condition_key", ASCENDING), + ], + name="project_identity", unique=True, ), # Multikey indexes over each Link field's DBRef id so the component-delete @@ -110,9 +164,13 @@ class Settings: class Contribution(ContributionBase): """Models what is actually stored in the database.""" - # Server-owned: the service resolves the real version (see ContributionService._split_non_unique) - # and stamps it on the doc. Defaults to 1 so the no-version (unique-identifier) case is implicit. - version: int = 1 + # Server-owned: the service extracts this from data at the project's unique_column path and stamps + # it on the doc (see ContributionService._resolve_identity). None when the project sets no + # unique_column, in which case the (project, material_id, chemical_system_id, formula) triple is + # the identity. Never trusted from the request body. + unique_value: Scalar | None = None + # Server-owned pivot-condition discriminator; "" until pivoting is wired in (see IdentityKey). + condition_key: str = "" structures: list[Link[Structure]] | None = None tables: list[Link[Table]] | None = None attachments: list[Link[Attachment]] | None = None @@ -121,13 +179,11 @@ class Contribution(ContributionBase): @classmethod def from_input_model(cls, data: ContributionIn) -> Contribution: # Server-owned fields are not taken from input: is_public starts False, components are - # inserted separately, last_modified is stamped by the before_event hook, and version is + # inserted separately, last_modified is stamped by the before_event hook, and unique_value is # resolved/stamped by the service (never trusted from the request body). return cls.model_validate( { - **data.model_dump( - exclude={"is_public", "version", "structures", "tables", "attachments", "last_modified"} - ), + **data.model_dump(exclude={"is_public", "structures", "tables", "attachments", "last_modified"}), "is_public": False, } ) @@ -138,15 +194,8 @@ def set_last_modified(self): class ContributionIn(ContributionBase): - """Fields that users are allowed to submit when adding a Contribution. + """Fields that users are allowed to submit when adding a Contribution.""" - version will be inferred if left as None - """ - - # Only meaningful on upsert/update of a non-unique-identifier project, where it selects which - # version to target. Ignored on insert (the service auto-assigns) and for unique-identifier - # projects (inferred as 1). - version: int | None = None structures: list[StructureIn] | None = None tables: list[TableIn] | None = None attachments: list[AttachmentIn] | None = None @@ -159,9 +208,20 @@ def component_count(self) -> int: """Returns the total number of components (structures, tables, attachments) in the contribution""" return len(self.structures or []) + len(self.tables or []) + len(self.attachments or []) - def identifiers(self) -> dict[str, str]: - """Returns a dict of unique identifiers for a contribution (outside of id).""" - return {"project": self.project, "identifier": self.identifier} + def identifiers(self, unique_value: Scalar | None = None, condition_key: str = "") -> dict[str, Any]: + """Returns the identity fields of a contribution (outside of id) for reporting and upsert. + + ``unique_value`` and ``condition_key`` are server-resolved, so they are passed in rather than + read off the input model. + """ + return { + "project": self.project, + "material_id": self.material_id, + "chemical_system_id": self.chemical_system_id, + "formula": self.formula, + "unique_value": unique_value, + "condition_key": condition_key, + } class ContributionOut(DocumentOut[PydanticObjectId]): @@ -171,9 +231,11 @@ class ContributionOut(DocumentOut[PydanticObjectId]): """ project: str | None = None - identifier: str | None = None - version: int | None = None + material_id: str | None = None + chemical_system_id: str | None = None formula: str | None = None + unique_value: Scalar | None = None + condition_key: str | None = None is_public: bool | None = None last_modified: datetime | None = None needs_build: Annotated[bool | None, deprecated("'needs_build' is deprecated.")] = None @@ -189,9 +251,10 @@ def default_fields() -> list[str]: return [ "id", "project", - "identifier", - "version", + "material_id", + "chemical_system_id", "formula", + "unique_value", "is_public", "last_modified", ] @@ -201,8 +264,8 @@ class ContributionPatch(SparseFieldsModel): """Fields that can be specified for partial updates to a Contribution.""" project: str | None = None - identifier: str | None = None - version: int | None = None + material_id: str | None = None + chemical_system_id: str | None = None formula: str | None = None is_public: bool | None = None data: Annotated[ @@ -225,21 +288,30 @@ class ContributionFilter(BaseFilter): id__in: list[PydanticObjectId] | None = None id__neq: PydanticObjectId | None = None - identifier: str | None = None - identifier__in: list[ShortStr] | None = None - identifier__neq: ShortStr | None = None - identifier__ilike: str | None = None + material_id: str | None = None + material_id__in: list[ShortStr] | None = None + material_id__neq: ShortStr | None = None + material_id__ilike: str | None = None - version: str | None = None - version__in: list[ShortStr] | None = None - version__neq: ShortStr | None = None - version__ilike: str | None = None + chemical_system_id: str | None = None + chemical_system_id__in: list[ShortStr] | None = None + chemical_system_id__neq: ShortStr | None = None + chemical_system_id__ilike: str | None = None formula: str | None = None formula__in: list[ShortStr] | None = None formula__neq: ShortStr | None = None formula__ilike: str | None = None + unique_value: Scalar | None = None + unique_value__in: list[Scalar] | None = None + unique_value__neq: Scalar | None = None + + condition_key: str | None = None + condition_key__in: list[str] | None = None + condition_key__neq: str | None = None + condition_key__ilike: str | None = None + is_public: bool | None = None needs_build: bool | None = None diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py index 09eb3e5f31..9fb2be44fb 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py @@ -17,9 +17,15 @@ ContributionIn, ContributionOut, ContributionPatch, + IdentityKey, + Scalar, ) +from mpcontribs_api.exceptions import NotFoundError from mpcontribs_api.pagination import CursorParams +# Sentinel for "leave unique_value untouched" on patch (distinct from a real None value). +_UNSET: Any = object() + class MongoDbContributionRepository( MongoDbRepository[Contribution, ContributionIn, ContributionOut, ContributionFilter, ContributionPatch] @@ -58,9 +64,30 @@ async def get_contribution_by_id(self, id: str, fields: frozenset[str] | None): """Find a single contribution by id, scoped to the current user. See ``get_by_id``.""" return await self.get_by_id(self._convert_object_id(id), fields) - async def patch_contribution_by_id(self, id: str, update: ContributionPatch): - """Partially update a contribution by id, scoped to the current user. See ``patch``.""" - return await self.patch(self._convert_object_id(id), update) + async def patch_contribution_by_id( + self, + id: str, + update: ContributionPatch, + unique_value: Scalar | None = _UNSET, + ): + """Partially update a contribution by id, scoped to the current user. + + ``unique_value`` is server-recomputed by the service when the patch changes ``data`` or + ``project`` (the inputs to identity); left as ``_UNSET`` it is not touched. When set, it is + folded into the ``$set`` so the identity index stays consistent with the patched ``data``. + """ + if unique_value is _UNSET: + return await self.patch(self._convert_object_id(id), update) + update_data = update.model_dump(exclude_unset=True) + update_data["unique_value"] = unique_value + query = self.document_model.find_one( + self._scope, + self.document_model.id == self._convert_object_id(id), + ).update(Set(update_data), response_type=UpdateResponse.NEW_DOCUMENT) + updated = await query # pyright: ignore[reportGeneralTypeIssues] # beanie UpdateQuery is awaitable + if updated is None: + raise NotFoundError(self._not_found(id)) + return updated async def delete_contribution_by_id(self, id: str) -> None: """Delete a contribution by id, scoped to the current user. See ``delete_by_id``.""" @@ -99,55 +126,79 @@ async def insert_contribution( await doc.insert(session=session) return doc - async def find_one_contribution(self, project: str, identifier: str) -> Contribution | None: - """Find a single contribution by (project, identifier), scoped to the current user.""" + async def find_one_contribution( + self, + project: str, + material_id: str, + chemical_system_id: str, + formula: str, + unique_value: Scalar | None = None, + condition_key: str = "", + ) -> Contribution | None: + """Find a single contribution by its full identity, scoped to the current user.""" return await self.document_model.find_one( self._scope, self.document_model.project == project, - self.document_model.identifier == identifier, + self.document_model.material_id == material_id, + self.document_model.chemical_system_id == chemical_system_id, + self.document_model.formula == formula, + self.document_model.unique_value == unique_value, + self.document_model.condition_key == condition_key, ) - async def max_versions(self, keys: list[tuple[str, str]]) -> dict[tuple[str, str], int]: - """Return ``{(project, identifier): max_version}`` for the given keys, scoped to the user. - - Presence of a key in the result also signals that at least one contribution already exists - for it, which the contribution write path uses to enforce uniqueness on unique-identifier - projects and to compute the next version on non-unique ones. Keys with no existing - contributions are absent from the result. + async def existing_identities(self, keys: list[IdentityKey]) -> set[IdentityKey]: + """Return the subset of identity tuples that already exist, scoped to the user. - A single aggregation answers the whole batch so the write path avoids one round-trip per - contribution. Scope is merged into ``$match`` (mirroring :meth:`referenced_component_ids`); - a writer sees every contribution in their own project, so the scoped max equals the global - max for keys they may write. + One query answers the whole batch so the write path avoids a round-trip per contribution. + Scope is merged into the match (mirroring :meth:`referenced_component_ids`); a writer sees + every contribution in their own project, so this equals the global existence check for keys + they may write. A null ``unique_value`` matches documents where the field is null or absent + (the empty-``unique_column`` case, since ``keep_nulls=False`` strips it). Args: - keys: (project, identifier) pairs to look up + keys: identity tuples (project, material_id, chemical_system_id, formula, unique_value) Returns: - dict[tuple[str, str], int]: highest existing version per requested key + set[IdentityKey]: the subset of ``keys`` already present """ if not keys: - return {} - match: dict[str, Any] = {"$or": [{"project": p, "identifier": i} for p, i in keys]} - if self._scope: - match = {"$and": [self._scope, match]} - pipeline: list[dict[str, Any]] = [ - {"$match": match}, + return set() + ors = [ { - "$group": { - "_id": {"project": "$project", "identifier": "$identifier"}, - "max_version": {"$max": "$version"}, - } - }, + "project": project, + "material_id": material_id, + "chemical_system_id": chemical_system_id, + "formula": formula, + "unique_value": unique_value, + "condition_key": condition_key, + } + for (project, material_id, chemical_system_id, formula, unique_value, condition_key) in keys ] + match: dict[str, Any] = {"$or": ors} + if self._scope: + match = {"$and": [self._scope, match]} + projection = { + "project": 1, + "material_id": 1, + "chemical_system_id": 1, + "formula": 1, + "unique_value": 1, + "condition_key": 1, + } collection = self.document_model.get_pymongo_collection() - result: dict[tuple[str, str], int] = {} - async for doc in await collection.aggregate(pipeline): - gid = doc["_id"] - # Versions are >= 1; coalesce a null $max (legacy docs without the field) to 0 while - # still recording the key's presence (existence check for unique-identifier projects). - result[(gid["project"], gid["identifier"])] = doc.get("max_version") or 0 - return result + found: set[IdentityKey] = set() + async for doc in collection.find(match, projection): + found.add( + ( + doc["project"], + doc["material_id"], + doc["chemical_system_id"], + doc["formula"], + doc.get("unique_value"), + doc.get("condition_key") or "", + ) + ) + return found async def referenced_component_ids( self, @@ -228,34 +279,35 @@ async def update_contribution(self, doc: Contribution, update_data: dict[str, An async def upsert_contribution_by_identifiers( self, - identifiers: dict[str, str], + identifiers: dict[str, Any], contribution: ContributionIn, - version: int, ) -> Contribution: - """Atomically upsert a Contribution by its identifying fields and resolved version. + """Atomically upsert a Contribution by its full identity. - Relies on the unique index over (project, identifier, version) so that concurrent requests - targeting the same key cannot both win the insert branch. Fields the caller did not set are - not touched (partial update). On insert a fresh Contribution document is written with - ``is_public=False``. + Relies on the unique index over (project, material_id, chemical_system_id, formula, + unique_value) so that concurrent requests targeting the same identity cannot both win the + insert branch. Fields the caller did not set are not touched (partial update). On insert a + fresh Contribution document is written with ``is_public=False``. Args: - identifiers: the fields ContributionIn.identifiers() returns (project, identifier) + identifiers: the identity dict ContributionIn.identifiers(unique_value) returns contribution: the input payload to upsert - version: the version resolved by the service (1 for unique-identifier projects, or the - caller-supplied version for non-unique ones); selects which row to update Returns: Contribution: the document as it stands after the operation """ doc = self.document_model.from_input_model(contribution) - doc.version = version + doc.unique_value = identifiers["unique_value"] + doc.condition_key = identifiers["condition_key"] update_data = doc.model_dump(exclude={"id"}, exclude_none=True) query = self.document_model.find_one( self._scope, self.document_model.project == identifiers["project"], - self.document_model.identifier == identifiers["identifier"], - self.document_model.version == version, + self.document_model.material_id == identifiers["material_id"], + self.document_model.chemical_system_id == identifiers["chemical_system_id"], + self.document_model.formula == identifiers["formula"], + self.document_model.unique_value == identifiers["unique_value"], + self.document_model.condition_key == identifiers["condition_key"], ).upsert( Set(update_data), on_insert=doc, @@ -263,18 +315,27 @@ async def upsert_contribution_by_identifiers( ) return await query # pyright: ignore[reportGeneralTypeIssues] # beanie UpdateQuery is awaitable, but pyright doesn't see it - async def upsert_contribution_by_id(self, id: str, contribution: ContributionIn): - """Upserts a single Contribution. + async def upsert_contribution_by_id( + self, + id: str, + contribution: ContributionIn, + unique_value: Scalar | None = None, + ): + """Upserts a single Contribution by its Mongo ``_id``. - If Contributions with identical identifiers exist, update, otherwise insert + If a Contribution with this id exists it is updated, otherwise inserted. ``unique_value`` is + server-resolved by the service from the project's ``unique_column`` and stamped on the doc so + the identity index stays correct. Args: id (str): the id of the Contribution to upsert contribution (ContributionIn): the Contribution to be upserted + unique_value: the resolved identity value to stamp on the document Returns: ContributionOut: the upserted document""" doc = self.document_model.from_input_model(contribution) + doc.unique_value = unique_value query = self.document_model.find_one( self._scope, self.document_model.id == self._convert_object_id(id), diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py index 73466eff28..0590ff32cd 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py @@ -131,10 +131,10 @@ async def get_contribution_by_id( @router.put("/{id}", dependencies=[Depends(require_user)]) -async def upsert_contribution_by_id(repo: ContributionDep, id: str, contribution: ContributionIn): - return await repo.upsert_contribution_by_id(id=id, contribution=contribution) +async def upsert_contribution_by_id(service: ContributionServiceDep, id: str, contribution: ContributionIn): + return await service.upsert_contribution_by_id(id=id, contribution=contribution) @router.patch("/{id}", dependencies=[Depends(require_user)]) -async def patch_contribution_by_id(repo: ContributionDep, id: str, update: ContributionPatch): - return await repo.patch_contribution_by_id(id=id, update=update) +async def patch_contribution_by_id(service: ContributionServiceDep, id: str, update: ContributionPatch): + return await service.patch_contribution_by_id(id=id, update=update) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py index 88ba3a523f..fe9c0e0726 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py @@ -1,5 +1,4 @@ import asyncio -from collections import defaultdict from collections.abc import Iterable from dataclasses import dataclass from typing import cast @@ -20,14 +19,22 @@ ) from mpcontribs_api.domains._shared.repository import MongoDbRepository from mpcontribs_api.domains.attachments.repository import MongoDbAttachmentRepository -from mpcontribs_api.domains.contributions.models import Contribution, ContributionFilter, ContributionIn +from mpcontribs_api.domains.contributions.models import ( + Contribution, + ContributionFilter, + ContributionIn, + ContributionPatch, + IdentityKey, + Scalar, + extract_unique_value, +) from mpcontribs_api.domains.contributions.repository import MongoDbContributionRepository from mpcontribs_api.domains.projects.repository import MongoDbProjectRepository from mpcontribs_api.domains.structures.models import Structure from mpcontribs_api.domains.structures.repository import MongoDbStructureRepository from mpcontribs_api.domains.tables.models import Table from mpcontribs_api.domains.tables.repository import MongoDbTableRepository -from mpcontribs_api.exceptions import AppError, ConflictError, PermissionError, ValidationError +from mpcontribs_api.exceptions import AppError, ConflictError, NotFoundError, PermissionError, ValidationError from mpcontribs_api.pagination import CursorParams logger = structlog.get_logger(__name__) @@ -35,15 +42,16 @@ @dataclass(frozen=True, slots=True) class ResolvedWrite: - """A contribution that passed validation, paired with its server-resolved version. + """A contribution that passed validation, paired with its server-resolved identity value. - Produced by the split pipeline so the resolved version travels with its contribution (and its - original batch index) + Produced by the split pipeline so the resolved ``unique_value`` travels with its contribution + (and its original batch index). """ index: int contribution: ContributionIn - version: int + unique_value: Scalar | None + condition_key: str = "" class ContributionService: @@ -87,9 +95,8 @@ async def insert_contributions( ``settings.mongo.max_concurrent_transactions``. Per-item failures are returned in the summary's ``failed`` list; the request as a whole does not raise on partial failure. - Version is server-assigned per contribution: unique-identifier projects reject a duplicate - (project, identifier) as a conflict (version stays 1); non-unique projects auto-increment - from the current max. See ``_split_non_unique``. + A duplicate identity ``(project, material_id, chemical_system_id, formula, unique_value)`` + is rejected as a conflict. See ``_resolve_identity``. Args: contributions: contributions to insert; may include nested structures/tables/attachments @@ -150,28 +157,31 @@ def _split_unauthorized( ) return unauthorized, remaining - async def _split_non_unique( + async def _resolve_identity( self, indices: Iterable[int], contributions: list[ContributionIn], *, is_upsert: bool, ) -> tuple[list[BulkFailure], list[ResolvedWrite]]: - """Apply per-project identifier-uniqueness rules and resolve each contribution's version. + """Resolve each contribution's identity (``unique_value``) and reject duplicates. - ``Project.unique_identifiers`` decides the contract per project: + A project designates at most one ``unique_column``; its value is promoted from the + contribution's ``data`` to ``unique_value``, the tail of the identity tuple + ``(project, material_id, chemical_system_id, formula, unique_value)``. A contribution is + rejected when: - - **True**: at most one contribution per (project, identifier); version is always 1. On - insert a second one (already in the DB, or a duplicate earlier in this batch) is rejected - as a conflict. On upsert the version is inferred as 1 (any supplied value is ignored). - - **False**: many versions may share (project, identifier). On insert the version is - auto-assigned as ``max(existing) + 1``, sequencing intra-batch duplicates. On upsert the - caller must supply ``version`` to pick the target row, else the item is rejected. + - its ``project`` is not found or not accessible; + - the project sets a ``unique_column`` but the value is missing or non-scalar; or + - (insert only) its identity collides with an existing document or with an earlier item in + this batch. Collisions are conflicts, never silently disambiguated. - Iterates ``indices`` in input order so intra-batch duplicates sequence deterministically. + On upsert no collision check runs: an existing identity is the update target, and two items + with the same identity in one batch both reach the atomic upsert (the unique index is the + race tiebreaker). Iterates ``indices`` in input order so duplicates are caught deterministically. Returns: - tuple of (rejections, a ``ResolvedWrite`` per survivor pairing it with its version) + tuple of (rejections, a ``ResolvedWrite`` per survivor pairing it with its unique_value) """ indices = list(indices) failures: list[BulkFailure] = [] @@ -179,20 +189,16 @@ async def _split_non_unique( if not indices: return failures, plan - # One round-trip each for the per-project uniqueness flags and (insert only) the current - # max version per key, instead of a query per contribution. - unique_map = await self._projects.unique_identifiers_by_id(sorted({contributions[i].project for i in indices})) - max_map: dict[tuple[str, str], int] = {} - if not is_upsert: - keys = sorted({(contributions[i].project, contributions[i].identifier) for i in indices}) - max_map = await self._contributions.max_versions(keys) + # One round-trip for the per-project unique_column, instead of a query per contribution. + unique_columns = await self._projects.unique_columns_by_id(sorted({contributions[i].project for i in indices})) - seen: dict[tuple[str, str], int] = defaultdict(int) + # First pass: validate accessibility + resolve each unique_value, collecting identity tuples + # so the existence check can be batched into a single query. + resolved: list[tuple[int, ContributionIn, Scalar | None]] = [] + keys: list[IdentityKey] = [] for i in indices: contrib = contributions[i] - key = (contrib.project, contrib.identifier) - - if contrib.project not in unique_map: + if contrib.project not in unique_columns: failures.append( BulkFailure( index=i, @@ -208,58 +214,74 @@ async def _split_non_unique( ) continue - unique = unique_map[contrib.project] - if is_upsert: - if unique: - version = 1 - elif contrib.version is not None: - version = contrib.version - else: + unique_column = unique_columns[contrib.project] + unique_value: Scalar | None = None + if unique_column is not None: + try: + unique_value = extract_unique_value(contrib.data, unique_column) + except ValidationError as err: failures.append( BulkFailure( index=i, identifier=contrib.identifiers(), error_code=ValidationError.error_code, - message=( - f"project '{contrib.project}' allows multiple versions; a 'version' " - "is required to identify which contribution to update" - ), - ) - ) - logger.info( - "ambiguous contribution version in project allowing multiple versions", - project=contrib.project, - identifiers=contrib.identifiers(), - ) - continue - elif unique: - # Insert into a unique-identifier project: the first occurrence wins, anything that - # already exists (in the DB or earlier in this batch) is a conflict. - if key in max_map or seen[key] > 0: - failures.append( - BulkFailure( - index=i, - identifier=contrib.identifiers(), - error_code=ConflictError.error_code, - message=( - f"contribution '{contrib.identifier}' already exists for project '{contrib.project}'" - ), + message=err.message, ) ) logger.info( - "contribution already exists in project during insert/upsert/update", + "missing or non-scalar unique_column value", project=contrib.project, identifiers=contrib.identifiers(), ) continue - version = 1 - else: - # Insert into a non-unique-identifier project: next version after the current max, - # sequencing duplicates within this batch (max+1, max+2, ...). - version = max_map.get(key, 0) + 1 + seen[key] - plan.append(ResolvedWrite(index=i, contribution=contrib, version=version)) - seen[key] += 1 + resolved.append((i, contrib, unique_value)) + keys.append( + ( + contrib.project, + contrib.material_id, + contrib.chemical_system_id, + contrib.formula, + unique_value, + "", + ) + ) + + # Second pass (insert only): reject identity collisions against existing docs and earlier + # items in this batch. Upsert skips this — an existing identity is the update target and the + # unique index arbitrates intra-batch races. + if is_upsert: + plan.extend(ResolvedWrite(index=i, contribution=contrib, unique_value=uv) for i, contrib, uv in resolved) + return failures, plan + + existing = await self._contributions.existing_identities(keys) + seen: set[IdentityKey] = set() + for i, contrib, unique_value in resolved: + key: IdentityKey = ( + contrib.project, + contrib.material_id, + contrib.chemical_system_id, + contrib.formula, + unique_value, + "", + ) + if key in existing or key in seen: + failures.append( + BulkFailure( + index=i, + identifier=contrib.identifiers(unique_value), + error_code=ConflictError.error_code, + message=f"a contribution with this identity already exists for project '{contrib.project}'", + ) + ) + logger.info( + "duplicate contribution identity", + project=contrib.project, + identifiers=contrib.identifiers(unique_value), + ) + continue + seen.add(key) + plan.append(ResolvedWrite(index=i, contribution=contrib, unique_value=unique_value)) return failures, plan @@ -298,11 +320,11 @@ def _split_oversize( async def _split_contributions( self, contributions: list[ContributionIn], *, is_upsert: bool ) -> tuple[list[BulkFailure], list[ResolvedWrite]]: - """Common method for validating contribution write failure logic and resolving versions. + """Common method for validating contribution write failure logic and resolving identity. Runs the cheap, local, index-based filters first (authorization, then component-count cap) - so guaranteed failures never reach the DB; ``_split_non_unique`` runs last and turns the - remaining indices into a write plan carrying each resolved version. + so guaranteed failures never reach the DB; ``_resolve_identity`` runs last and turns the + remaining indices into a write plan carrying each resolved ``unique_value``. Returns: tuple of (failures and their reasons, a ``ResolvedWrite`` per contribution to write) @@ -312,10 +334,10 @@ async def _split_contributions( unauthorized_failures, authorized_indices = self._split_unauthorized(range(len(contributions)), contributions) # Reject contributions that have too many components associated with them. oversize_failures, sized_indices = self._split_oversize(authorized_indices, contributions) - # Verify identifiers/uniqueness within a project and resolve each version, depending on - # project.unique_identifiers and whether this is an insert or upsert. - non_unique_failures, plan = await self._split_non_unique(sized_indices, contributions, is_upsert=is_upsert) - return (unauthorized_failures + oversize_failures + non_unique_failures, plan) + # Resolve each contribution's identity (unique_value from the project's unique_column) and + # reject duplicates, per project config and whether this is an insert or upsert. + identity_failures, plan = await self._resolve_identity(sized_indices, contributions, is_upsert=is_upsert) + return (unauthorized_failures + oversize_failures + identity_failures, plan) async def _insert_no_components( self, @@ -332,7 +354,8 @@ async def _insert_no_components( docs = [] for item in items: doc = Contribution.from_input_model(item.contribution) - doc.version = item.version + doc.unique_value = item.unique_value + doc.condition_key = item.condition_key docs.append(doc) try: await self._contributions.insert_many_contributions(docs) @@ -359,7 +382,7 @@ def _partition_bulk_write_error( failed.append( BulkFailure( index=item.index, - identifier=item.contribution.identifiers(), + identifier=item.contribution.identifiers(item.unique_value, item.condition_key), error_code="conflict" if err.get("code") == 11000 else "write_error", message=err.get("errmsg", "write failed"), ) @@ -401,18 +424,31 @@ async def _insert_one_with_components(self, item: ResolvedWrite) -> Contribution async with self._client.start_session() as session: async def _txn(s: AsyncClientSession) -> Contribution: - return await self._do_insert(contrib, s, item.version) + return await self._do_insert(contrib, s, item.unique_value, item.condition_key) return await session.with_transaction(_txn) except AppError as exc: - return bulk_failure_from_exception(item.index, contrib.identifiers(), exc) + return bulk_failure_from_exception( + item.index, contrib.identifiers(item.unique_value, item.condition_key), exc + ) except Exception as exc: logger.error( - "insert_contribution_failed", index=item.index, identifier=contrib.identifiers(), exc_info=True + "insert_contribution_failed", + index=item.index, + identifier=contrib.identifiers(item.unique_value, item.condition_key), + exc_info=True, + ) + return bulk_failure_from_exception( + item.index, contrib.identifiers(item.unique_value, item.condition_key), exc ) - return bulk_failure_from_exception(item.index, contrib.identifiers(), exc) - async def _do_insert(self, contrib: ContributionIn, session: AsyncClientSession, version: int) -> Contribution: + async def _do_insert( + self, + contrib: ContributionIn, + session: AsyncClientSession, + unique_value: Scalar | None, + condition_key: str = "", + ) -> Contribution: """Insert components then the contribution itself, all in the given session. Components are inserted sequentially because a session is single-threaded — sharing it @@ -422,7 +458,8 @@ async def _do_insert(self, contrib: ContributionIn, session: AsyncClientSession, tables = await self._tables.insert_components(contrib.tables or [], session=session) doc = Contribution.from_input_model(contrib) - doc.version = version + doc.unique_value = unique_value + doc.condition_key = condition_key doc.structures = cast(list[Link[Structure]] | None, structures or None) doc.tables = cast(list[Link[Table]] | None, tables or None) return await self._contributions.insert_contribution(doc, session=session) @@ -466,22 +503,56 @@ async def upsert_contributions(self, contributions: list[ContributionIn]) -> Bul async def _bounded_upsert(item: ResolvedWrite) -> Contribution | BulkFailure: contrib = item.contribution + identifiers = contrib.identifiers(item.unique_value, item.condition_key) async with sem: try: - return await self._contributions.upsert_contribution_by_identifiers( - contrib.identifiers(), contrib, item.version - ) + return await self._contributions.upsert_contribution_by_identifiers(identifiers, contrib) except Exception as exc: - logger.error( - "upsert_contribution_failed", index=item.index, identifier=contrib.identifiers(), exc_info=True - ) - return bulk_failure_from_exception(item.index, contrib.identifiers(), exc) + logger.error("upsert_contribution_failed", index=item.index, identifier=identifiers, exc_info=True) + return bulk_failure_from_exception(item.index, identifiers, exc) results = await asyncio.gather(*[_bounded_upsert(item) for item in plan]) succeeded = [r for r in results if not isinstance(r, BulkFailure)] failed = failures + [r for r in results if isinstance(r, BulkFailure)] return BulkWriteSummary[Contribution](total=len(contributions), succeeded=succeeded, failed=failed) + async def _resolve_unique_value(self, project: str, data: dict | None) -> Scalar | None: + """Resolve the identity value for one contribution from its project's ``unique_column``. + + Returns ``None`` when the project designates no ``unique_column`` (or is not accessible). + Raises ``ValidationError`` when a ``unique_column`` is set but its value is missing/non-scalar. + """ + columns = await self._projects.unique_columns_by_id([project]) + unique_column = columns.get(project) + if unique_column is None: + return None + return extract_unique_value(data, unique_column) + + async def upsert_contribution_by_id(self, id: str, contribution: ContributionIn) -> Contribution: + """Upsert a single contribution by Mongo id, resolving its server-owned ``unique_value``.""" + if not self._user.can_write(contribution.project): + raise PermissionError(f"not authorized to write to project '{contribution.project}'") + unique_value = await self._resolve_unique_value(contribution.project, contribution.data) + return await self._contributions.upsert_contribution_by_id(id, contribution, unique_value) + + async def patch_contribution_by_id(self, id: str, update: ContributionPatch) -> Contribution: + """Patch a single contribution by id, recomputing ``unique_value`` if identity inputs change. + + ``unique_value`` derives from (project, data); it is only recomputed when the patch touches + either, so metadata-only patches (e.g. ``is_public``) don't re-read the project or risk + failing on a legacy document missing the unique_column value. + """ + set_fields = update.model_dump(exclude_unset=True) + if "data" not in set_fields and "project" not in set_fields: + return await self._contributions.patch_contribution_by_id(id, update) + existing = await self._contributions.get_contribution_by_id(id, fields=None) + if existing is None or existing.project is None: + raise NotFoundError(f"contribution '{id}' not found") + project = set_fields.get("project") or existing.project + data = set_fields["data"] if "data" in set_fields else existing.data + unique_value = await self._resolve_unique_value(project, data) + return await self._contributions.patch_contribution_by_id(id, update, unique_value=unique_value) + async def delete_contributions(self, filter: ContributionFilter) -> BulkDeleteSummary: """Delete a contribution and all of its child components diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py index 7216c82acc..c88926871a 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py @@ -2,12 +2,26 @@ from typing import Any, Literal -from pydantic import BaseModel, ConfigDict, Field, HttpUrl +from pydantic import BaseModel, ConfigDict, Field, HttpUrl, field_validator from mpcontribs_api import pagination from mpcontribs_api.domains._shared.filters import BaseFilter from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut from mpcontribs_api.domains._shared.types import PrefixedEmail, ShortStr +from mpcontribs_api.exceptions import ValidationError + + +def _validate_unique_column(value: str | None) -> str | None: + """Shape-only check for ``unique_column``: a non-empty, non-blank dotted-path string or None. + + No subset-of-``columns`` check: ``columns`` is derived and eventually consistent, so a path may + legitimately not appear there yet. Correctness is enforced per contribution at write time. + """ + if value is None: + return None + if not value.strip() or any(not segment for segment in value.split(".")): + raise ValidationError("unique_column must be a non-empty dotted path (no blank segments).", value=value) + return value class Column(BaseModel): @@ -47,9 +61,13 @@ class Project(BaseDocumentWithInput[ShortStr]): authors: str description: str owner: PrefixedEmail - unique_identifiers: bool stats: Stats + # The single data column (dotted path) that disambiguates contributions sharing the same + # (material_id, chemical_system_id, formula). None -> that triple must be unique on its own. Its + # value is promoted to Contribution.unique_value on write (see contributions.extract_unique_value). + unique_column: str | None = None + # Optional references: list[Reference] = Field(default_factory=list) long_title: str | None = None @@ -59,6 +77,11 @@ class Project(BaseDocumentWithInput[ShortStr]): is_approved: bool = False license: Literal["CCA4", "CCPD"] | None = None + @field_validator("unique_column") + @classmethod + def _check_unique_column(cls, v: str | None) -> str | None: + return _validate_unique_column(v) + # Empty method for now. Keeping for business logic later @classmethod def from_input_model(cls, data: ProjectIn) -> Project: @@ -89,7 +112,7 @@ class ProjectOut(DocumentOut[ShortStr]): is_public: bool | None = None is_approved: bool | None = None long_title: str | None = None - unique_identifiers: bool | None = None + unique_column: str | None = None references: list[Reference] | None = None stats: Stats | None = None columns: list[Column] | None = None @@ -97,7 +120,7 @@ class ProjectOut(DocumentOut[ShortStr]): @staticmethod def default_fields() -> list[str]: - return ["id", "is_public", "title", "owner", "is_approved", "unique_identifiers"] + return ["id", "is_public", "title", "owner", "is_approved", "unique_column"] class ProjectFilter(BaseFilter): @@ -122,7 +145,8 @@ class ProjectFilter(BaseFilter): is_public: bool | None = None is_approved: bool | None = None - unique_identifiers: bool | None = None + unique_column: str | None = None + unique_column__neq: str | None = None license: Literal["CCA4", "CCPD"] | None = None license__in: list[Literal["CCA4", "CCPD"]] | None = None @@ -148,7 +172,7 @@ class ProjectPatch(BaseModel): authors: str | None = None description: str | None = None owner: PrefixedEmail | None = None - unique_identifiers: bool | None = None + unique_column: str | None = None references: list[Reference] = Field(default_factory=list) long_title: str | None = None other: dict[str, Any] = Field(default_factory=dict) @@ -156,3 +180,8 @@ class ProjectPatch(BaseModel): is_public: bool = False is_approved: bool = False license: Literal["CCA4", "CCPD"] | None = None + + @field_validator("unique_column") + @classmethod + def _check_unique_column(cls, v: str | None) -> str | None: + return _validate_unique_column(v) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py index 0e6f96a96c..ba6387e41b 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py @@ -58,18 +58,20 @@ async def get_project_by_id(self, id: str, fields: frozenset[str] | None): """Find a single project by id, scoped to the current user. See ``get_by_id``.""" return await self.get_by_id(id, fields) - async def unique_identifiers_by_id(self, ids: list[str]) -> dict[str, bool]: - """Return ``{project_id: unique_identifiers}`` for the given project ids, scoped to the user. + async def unique_columns_by_id(self, ids: list[str]) -> dict[str, str | None]: + """Return ``{project_id: unique_column}`` for the given project ids, scoped to the user. - Used by the contribution write path to apply per-project version rules in one round-trip - instead of fetching each project separately. Projects the user cannot see (or that do not - exist) are simply absent from the result, so the caller can treat them as inaccessible. + Used by the contribution write path to resolve each project's identity discriminator in one + round-trip instead of fetching each project separately. ``unique_column`` is ``None`` when the + project sets none (identity is then the fixed-field triple). Projects the user cannot see (or + that do not exist) are simply absent from the result, so the caller can treat them as + inaccessible. Args: ids: project ids to look up Returns: - dict[str, bool]: mapping of project id to its ``unique_identifiers`` flag + dict[str, str | None]: mapping of project id to its ``unique_column`` (or ``None``) """ if not ids: return {} @@ -77,9 +79,9 @@ async def unique_identifiers_by_id(self, ids: list[str]) -> dict[str, bool]: if self._scope: query = {"$and": [self._scope, query]} collection = self.document_model.get_pymongo_collection() - result: dict[str, bool] = {} - async for doc in collection.find(query, {"unique_identifiers": 1}): - result[doc["_id"]] = bool(doc.get("unique_identifiers")) + result: dict[str, str | None] = {} + async for doc in collection.find(query, {"unique_column": 1}): + result[doc["_id"]] = doc.get("unique_column") return result async def insert_project(self, project: ProjectIn) -> Project: diff --git a/mpcontribs-api/src/mpcontribs_api/exceptions.py b/mpcontribs-api/src/mpcontribs_api/exceptions.py index f6dfd32040..bcfc098235 100644 --- a/mpcontribs-api/src/mpcontribs_api/exceptions.py +++ b/mpcontribs-api/src/mpcontribs_api/exceptions.py @@ -91,6 +91,7 @@ class DownloadError(AppError): error_code = "download_error" log_level = logging.WARNING + def error_body(error_code: str, message: str, **public_context) -> dict: body: dict[str, Any] = {"error": {"code": error_code, "message": message}} if public_context: diff --git a/mpcontribs-api/tests/integration/db/conftest.py b/mpcontribs-api/tests/integration/db/conftest.py index beab815b9f..60c92214c9 100644 --- a/mpcontribs-api/tests/integration/db/conftest.py +++ b/mpcontribs-api/tests/integration/db/conftest.py @@ -61,9 +61,18 @@ async def mongo_client(): @pytest_asyncio.fixture(scope="session") async def db(mongo_client): - """Database handle with Beanie initialised against the test database.""" + """Database handle with Beanie initialised against the test database. + + Drops the collections first so init_beanie rebuilds exactly the current indexes on empty + collections. init_beanie creates model indexes but never drops removed ones, so a stale unique + index left in the dev DB (e.g. the old project_identifier_version) would collapse every now-null + identity field to one key and throw duplicate-key errors; and leftover documents from an earlier + schema could make the new unique index fail to build. Dropping the collection clears both. + """ settings = get_settings() database = mongo_client[settings.mongo.db_name] + for collection in ("projects", "contributions", "structures", "tables", "attachments"): + await database.drop_collection(collection) await init_beanie( database=database, document_models=[Project, Contribution, Structure, Table, Attachment], diff --git a/mpcontribs-api/tests/integration/db/test_component_reachability.py b/mpcontribs-api/tests/integration/db/test_component_reachability.py index 0f7faf0885..eae386fa31 100644 --- a/mpcontribs-api/tests/integration/db/test_component_reachability.py +++ b/mpcontribs-api/tests/integration/db/test_component_reachability.py @@ -40,7 +40,8 @@ async def _contribution(identifier: str, *, is_public: bool, attachments: list[A doc = Contribution( _id=PydanticObjectId(), project="reach-proj", - identifier=identifier, + material_id=identifier, + chemical_system_id="Fe-O", formula="Fe2O3", data={"x": 1}, is_public=is_public, diff --git a/mpcontribs-api/tests/integration/db/test_contributions_repository.py b/mpcontribs-api/tests/integration/db/test_contributions_repository.py index 4d3cd97c89..3e962fc48c 100644 --- a/mpcontribs-api/tests/integration/db/test_contributions_repository.py +++ b/mpcontribs-api/tests/integration/db/test_contributions_repository.py @@ -30,11 +30,19 @@ def _repo(user: User = ADMIN) -> MongoDbContributionRepository: return MongoDbContributionRepository(user) -def _contrib_in(project: str = "test-proj", identifier: str = "mp-1", **overrides) -> ContributionIn: +# Tests use ``identifier=`` to mint distinct contributions; it maps onto material_id, which (with the +# fixed chemical_system_id/formula defaults) makes each contribution's identity tuple differ. +def _contrib_in( + project: str = "test-proj", + identifier: str = "mp-1", + chemical_system_id: str = "Fe-O", + **overrides, +) -> ContributionIn: defaults: dict = { "_id": PydanticObjectId(), "project": project, - "identifier": identifier, + "material_id": identifier, + "chemical_system_id": chemical_system_id, "formula": "Fe2O3", "data": {"band_gap": 2.1}, } @@ -42,14 +50,21 @@ def _contrib_in(project: str = "test-proj", identifier: str = "mp-1", **override return ContributionIn(**defaults) -async def _insert(project="test-proj", identifier="mp-1", is_public: bool = False, **overrides) -> Contribution: +async def _insert( + project="test-proj", + identifier="mp-1", + chemical_system_id="Fe-O", + is_public: bool = False, + **overrides, +) -> Contribution: # Build a Contribution directly so is_public can be set explicitly. # from_input_model() always forces is_public=False, which is correct for # user-submitted data but inconvenient for test setup. doc = Contribution( _id=PydanticObjectId(), project=project, - identifier=identifier, + material_id=identifier, + chemical_system_id=chemical_system_id, formula=overrides.pop("formula", "Fe2O3"), data=overrides.pop("data", {"band_gap": 2.1}), is_public=is_public, @@ -73,7 +88,7 @@ async def test_inserted_document_is_retrievable(self, db): doc = await _insert(identifier="ins-basic") found = await Contribution.find_one(Contribution.id == doc.id) assert found is not None - assert found.identifier == "ins-basic" + assert found.material_id == "ins-basic" async def test_is_public_defaults_to_false(self, db): doc = await _insert(identifier="ins-priv") @@ -93,7 +108,7 @@ async def test_insert_via_repo(self, db): result = await _repo().insert_contribution(doc) found = await Contribution.find_one(Contribution.id == result.id) assert found is not None - assert found.identifier == "ins-via-repo" + assert found.material_id == "ins-via-repo" # --------------------------------------------------------------------------- @@ -196,7 +211,7 @@ async def test_all_items_covered_across_pages(self, db): page = await _repo(ADMIN).get_contributions( pagination=CursorParams(limit=2, cursor=cursor), filter=_noop_filter(), fields=None ) - identifiers.update(c.identifier for c in page.items if c.identifier) + identifiers.update(c.material_id for c in page.items if c.material_id) cursor = page.next_cursor if cursor is None: break @@ -231,14 +246,14 @@ async def test_filter_by_formula(self, db): formulas = {c.formula for c in page.items} assert formulas == {"Fe2O3"} - async def test_filter_by_identifier_ilike(self, db): + async def test_filter_by_material_id_ilike(self, db): await _insert(identifier="ilike-abc", is_public=True) await _insert(identifier="ilike-xyz", is_public=True) - f = ContributionFilter(identifier__ilike="ilike-a") + f = ContributionFilter(material_id__ilike="ilike-a") page = await _repo(ADMIN).get_contributions( pagination=CursorParams(), filter=f, fields=None ) - identifiers = {c.identifier for c in page.items} + identifiers = {c.material_id for c in page.items} assert "ilike-abc" in identifiers assert "ilike-xyz" not in identifiers @@ -258,7 +273,7 @@ async def test_filter_by_needs_build(self, db): page = await _repo(ADMIN).get_contributions( pagination=CursorParams(), filter=f, fields=None ) - identifiers = {c.identifier for c in page.items} + identifiers = {c.material_id for c in page.items} assert "nb-false" in identifiers assert "nb-true" not in identifiers @@ -273,7 +288,7 @@ async def test_returns_doc_for_valid_id(self, db): doc = await _insert(identifier="get-id") result = await _repo(ADMIN).get_contribution_by_id(str(doc.id), fields=None) assert result is not None - assert result.identifier == "get-id" + assert result.material_id == "get-id" async def test_returns_none_for_missing_id(self, db): result = await _repo(ADMIN).get_contribution_by_id(str(PydanticObjectId()), fields=None) @@ -308,39 +323,39 @@ async def test_projection_limits_fields(self, db): # --------------------------------------------------------------------------- -# find_one_contribution (by project + identifier) +# find_one_contribution (by full identity) # --------------------------------------------------------------------------- class TestFindOneContribution: async def test_finds_existing_doc(self, db): await _insert(project="find-proj", identifier="find-id") - result = await _repo(ADMIN).find_one_contribution("find-proj", "find-id") + result = await _repo(ADMIN).find_one_contribution("find-proj", "find-id", "Fe-O", "Fe2O3") assert result is not None assert result.project == "find-proj" - assert result.identifier == "find-id" + assert result.material_id == "find-id" async def test_returns_none_for_missing_combination(self, db): await _insert(project="miss-proj", identifier="miss-id") - result = await _repo(ADMIN).find_one_contribution("miss-proj", "wrong-id") + result = await _repo(ADMIN).find_one_contribution("miss-proj", "wrong-id", "Fe-O", "Fe2O3") assert result is None async def test_scope_prevents_anon_finding_private(self, db): await _insert(project="anon-scope", identifier="priv-doc", is_public=False) - result = await _repo(ANON).find_one_contribution("anon-scope", "priv-doc") + result = await _repo(ANON).find_one_contribution("anon-scope", "priv-doc", "Fe-O", "Fe2O3") assert result is None async def test_scope_allows_anon_finding_public(self, db): await _insert(project="anon-scope-pub", identifier="pub-doc", is_public=True) - result = await _repo(ANON).find_one_contribution("anon-scope-pub", "pub-doc") + result = await _repo(ANON).find_one_contribution("anon-scope-pub", "pub-doc", "Fe-O", "Fe2O3") assert result is not None - async def test_project_identifier_combination_is_unique_lookup(self, db): + async def test_full_identity_is_unique_lookup(self, db): await _insert(project="same-proj", identifier="id-a") await _insert(project="same-proj", identifier="id-b") - result = await _repo(ADMIN).find_one_contribution("same-proj", "id-a") + result = await _repo(ADMIN).find_one_contribution("same-proj", "id-a", "Fe-O", "Fe2O3") assert result is not None - assert result.identifier == "id-a" + assert result.material_id == "id-a" # --------------------------------------------------------------------------- @@ -463,7 +478,7 @@ async def test_bulk_delete_with_filter(self, db): await _repo(ADMIN).delete_contributions(f) remaining = await Contribution.find().to_list() assert len(remaining) == 1 - assert remaining[0].identifier == "bdel-keep" + assert remaining[0].material_id == "bdel-keep" async def test_bulk_delete_empty_collection_is_silent(self, db): await _repo(ADMIN).delete_contributions(_noop_filter()) @@ -474,7 +489,7 @@ async def test_scope_limits_what_anon_can_delete(self, db): await _repo(ANON).delete_contributions(_noop_filter()) # Anonymous scope: only public visible, so only the public doc is deleted. remaining = await Contribution.find().to_list() - identifiers = {d.identifier for d in remaining} + identifiers = {d.material_id for d in remaining} assert "bdel-scope-priv" in identifiers @@ -487,7 +502,7 @@ async def test_insert_when_id_absent_persists_document(self, db): assert isinstance(result, Contribution) stored = await Contribution.find_one(Contribution.id == new_id) assert stored is not None - assert stored.identifier == "ups-new" + assert stored.material_id == "ups-new" async def test_update_when_id_present_applies_change(self, db): existing = await _insert(identifier="ups-existing") @@ -506,7 +521,7 @@ async def test_anon_cannot_delete_out_of_scope_ids(self, db): # Anonymous scope only sees public docs; deleting both ids must spare the private one. result = await _repo(ANON).delete_by_ids([pub.id, priv.id]) assert result.num_deleted == 1 - remaining = {d.identifier for d in await Contribution.find().to_list()} + remaining = {d.material_id for d in await Contribution.find().to_list()} assert "dbi-priv" in remaining assert "dbi-pub" not in remaining diff --git a/mpcontribs-api/tests/integration/db/test_download.py b/mpcontribs-api/tests/integration/db/test_download.py index 6800689aa6..560ab6a395 100644 --- a/mpcontribs-api/tests/integration/db/test_download.py +++ b/mpcontribs-api/tests/integration/db/test_download.py @@ -30,7 +30,8 @@ async def _insert(project: str, identifier: str, is_public: bool, **overrides) - doc = Contribution( _id=PydanticObjectId(), project=project, - identifier=identifier, + material_id=identifier, + chemical_system_id=overrides.pop("chemical_system_id", "Fe-O"), formula=overrides.pop("formula", "Fe2O3"), data=overrides.pop("data", {"band_gap": 2.1}), is_public=is_public, @@ -88,17 +89,17 @@ class TestDownloadJsonl: async def test_admin_downloads_all_rows(self, db): await _seed_scope_fixture() rows = _parse_jsonl(await _download_bytes(_repo(ADMIN))) - assert {r["identifier"] for r in rows} == {"mp-public", "mp-group", "mp-private"} + assert {r["material_id"] for r in rows} == {"mp-public", "mp-group", "mp-private"} async def test_anonymous_sees_only_public(self, db): await _seed_scope_fixture() rows = _parse_jsonl(await _download_bytes(_repo(ANON))) - assert {r["identifier"] for r in rows} == {"mp-public"} + assert {r["material_id"] for r in rows} == {"mp-public"} async def test_group_member_sees_public_and_group(self, db): await _seed_scope_fixture() rows = _parse_jsonl(await _download_bytes(_repo(ALICE))) - assert {r["identifier"] for r in rows} == {"mp-public", "mp-group"} + assert {r["material_id"] for r in rows} == {"mp-public", "mp-group"} async def test_rows_carry_expected_fields(self, db): await _insert("pub-proj", "mp-1", is_public=True, formula="Li2O") @@ -117,14 +118,14 @@ async def test_filter_limits_returned_rows(self, db): await _insert("pub-proj", "keep-me", is_public=True) await _insert("pub-proj", "drop-me", is_public=True) rows = _parse_jsonl( - await _download_bytes(_repo(ADMIN), filter=ContributionFilter(identifier="keep-me")) + await _download_bytes(_repo(ADMIN), filter=ContributionFilter(material_id="keep-me")) ) - assert {r["identifier"] for r in rows} == {"keep-me"} + assert {r["material_id"] for r in rows} == {"keep-me"} async def test_empty_result_is_valid_empty_gzip(self, db): # No documents match -> the stream is genuinely empty and decompresses to b"". # (This path never enters the compress loop, so the missing-flush bug doesn't bite.) - raw = await _download_bytes(_repo(ADMIN), filter=ContributionFilter(identifier="no-such-id")) + raw = await _download_bytes(_repo(ADMIN), filter=ContributionFilter(material_id="no-such-id")) assert raw == b"" @@ -142,8 +143,8 @@ async def test_csv_has_header_and_rows(self, db): async def test_csv_projects_only_requested_fields(self, db): await _insert("pub-proj", "mp-1", is_public=True) - fields = frozenset({"id", "identifier"}) + fields = frozenset({"id", "material_id"}) rows = _parse_csv(await _download_bytes(_repo(ADMIN), format="csv", fields=fields)) # Only the requested columns (plus the always-present id) appear. - assert set(rows[0].keys()) <= {"id", "identifier"} - assert rows[0]["identifier"] == "mp-1" + assert set(rows[0].keys()) <= {"id", "material_id"} + assert rows[0]["material_id"] == "mp-1" diff --git a/mpcontribs-api/tests/integration/db/test_projects_repository.py b/mpcontribs-api/tests/integration/db/test_projects_repository.py index 6ec770c1aa..ee929e2ded 100644 --- a/mpcontribs-api/tests/integration/db/test_projects_repository.py +++ b/mpcontribs-api/tests/integration/db/test_projects_repository.py @@ -34,7 +34,6 @@ def _project_in(id: str, **overrides) -> ProjectIn: "authors": "Test Author", "description": "Test description", "owner": "google:alice@example.com", - "unique_identifiers": True, "stats": STATS, } defaults.update(overrides) diff --git a/mpcontribs-api/tests/integration/test_bulk_limits.py b/mpcontribs-api/tests/integration/test_bulk_limits.py index 47021ac442..f7e7b0eb9f 100644 --- a/mpcontribs-api/tests/integration/test_bulk_limits.py +++ b/mpcontribs-api/tests/integration/test_bulk_limits.py @@ -13,7 +13,8 @@ def _valid_contribution_body(**overrides) -> dict: body = { "_id": str(PydanticObjectId()), "project": "test-project", - "identifier": "mp-1234", + "material_id": "mp-1234", + "chemical_system_id": "Fe-O", "formula": "Fe2O3", "data": {"band_gap": 2.1}, } diff --git a/mpcontribs-api/tests/integration/test_contributions.py b/mpcontribs-api/tests/integration/test_contributions.py index 7f61ac4bb2..88c4767244 100644 --- a/mpcontribs-api/tests/integration/test_contributions.py +++ b/mpcontribs-api/tests/integration/test_contributions.py @@ -19,7 +19,8 @@ def contribution_repo(test_app, mock_contribution_repo): SAMPLE_CONTRIBUTION = ContributionOut( project="mp-project", - identifier="mp-001", + material_id="mp-001", + chemical_system_id="Fe-O", formula="Fe2O3", is_public=True, data={"band_gap": 2.1}, diff --git a/mpcontribs-api/tests/integration/test_contributions_routes.py b/mpcontribs-api/tests/integration/test_contributions_routes.py index 36adad5984..9145c1aa97 100644 --- a/mpcontribs-api/tests/integration/test_contributions_routes.py +++ b/mpcontribs-api/tests/integration/test_contributions_routes.py @@ -47,7 +47,8 @@ def _valid_contribution_body(**overrides) -> dict: body = { "_id": str(PydanticObjectId()), "project": "test-project", - "identifier": "mp-1234", + "material_id": "mp-1234", + "chemical_system_id": "Fe-O", "formula": "Fe2O3", "data": {"band_gap": 2.1}, } @@ -55,7 +56,7 @@ def _valid_contribution_body(**overrides) -> dict: return body -SAMPLE_OUT = ContributionOut(project="p", identifier="mp-1", formula="Fe2O3") +SAMPLE_OUT = ContributionOut(project="p", material_id="mp-1", formula="Fe2O3") # =========================================================================== @@ -91,7 +92,7 @@ def test_malformed_body_returns_422(self, client, contribution_service): # Missing required 'formula'. r = client.post( "/api/v1/contributions", - json=[{"_id": str(PydanticObjectId()), "project": "p", "identifier": "mp-1"}], + json=[{"_id": str(PydanticObjectId()), "project": "p", "material_id": "mp-1"}], ) assert r.status_code == 422 contribution_service.insert_contributions.assert_not_called() @@ -117,7 +118,7 @@ def test_service_receives_parsed_contributions(self, client, contribution_servic contribution_service.upsert_contributions.return_value = BulkWriteSummary(total=1, succeeded=[], failed=[]) client.put("/api/v1/contributions", json=[_valid_contribution_body()]) contributions = contribution_service.upsert_contributions.call_args.kwargs["contributions"] - assert contributions[0].identifier == "mp-1234" + assert contributions[0].material_id == "mp-1234" def test_malformed_body_returns_422(self, client, contribution_service): r = client.put( @@ -140,13 +141,13 @@ def test_get_by_id_conventional_path(self, client, contribution_repo): contribution_repo.get_contribution_by_id.return_value = SAMPLE_OUT assert client.get(f"/api/v1/contributions/{PydanticObjectId()}").status_code == 200 - def test_patch_by_id_conventional_path(self, client, contribution_repo): - contribution_repo.patch_contribution_by_id.return_value = SAMPLE_OUT + def test_patch_by_id_conventional_path(self, client, contribution_service): + contribution_service.patch_contribution_by_id.return_value = SAMPLE_OUT r = client.patch(f"/api/v1/contributions/{PydanticObjectId()}", json={"formula": "H2O"}) assert r.status_code == 200 - def test_put_by_id_conventional_path(self, client, contribution_repo): - contribution_repo.upsert_contribution_by_id.return_value = SAMPLE_OUT + def test_put_by_id_conventional_path(self, client, contribution_service): + contribution_service.upsert_contribution_by_id.return_value = SAMPLE_OUT r = client.put(f"/api/v1/contributions/{PydanticObjectId()}", json=_valid_contribution_body()) assert r.status_code == 200 diff --git a/mpcontribs-api/tests/integration/test_projects.py b/mpcontribs-api/tests/integration/test_projects.py index 0f98857923..0b4d9fa229 100644 --- a/mpcontribs-api/tests/integration/test_projects.py +++ b/mpcontribs-api/tests/integration/test_projects.py @@ -238,7 +238,6 @@ def _valid_body(self, **overrides): "authors": "Alice", "description": "A project", "owner": "google:alice@example.com", - "unique_identifiers": True, "stats": {"columns": 0, "contributions": 0, "tables": 0, "structures": 0, "attachments": 0, "size": 0.0}, } body.update(overrides) @@ -274,7 +273,6 @@ def _body(self): "authors": "Alice", "description": "A project", "owner": "google:alice@example.com", - "unique_identifiers": True, "stats": {"columns": 0, "contributions": 0, "tables": 0, "structures": 0, "attachments": 0, "size": 0.0}, } diff --git a/mpcontribs-api/tests/unit/domains/test_contribution_service.py b/mpcontribs-api/tests/unit/domains/test_contribution_service.py index 02451f5033..1ea296dc54 100644 --- a/mpcontribs-api/tests/unit/domains/test_contribution_service.py +++ b/mpcontribs-api/tests/unit/domains/test_contribution_service.py @@ -88,13 +88,26 @@ def _structure_in(**overrides) -> StructureIn: return StructureIn(**defaults) -def _contrib_in(project="proj", identifier="mp-1", formula="Fe2O3", **kwargs) -> ContributionIn: +def _contrib_in( + project="proj", + material_id="mp-1", + chemical_system_id="Fe-O", + formula="Fe2O3", + identifier=None, + data=None, + **kwargs, +) -> ContributionIn: + # Many tests pass ``identifier=`` to mint distinct contributions; map it onto material_id so the + # identity tuple (project, material_id, chemical_system_id, formula, unique_value) differs. + if identifier is not None: + material_id = identifier return ContributionIn( _id=_oid(), project=project, - identifier=identifier, + material_id=material_id, + chemical_system_id=chemical_system_id, formula=formula, - data={}, + data={} if data is None else data, **kwargs, ) @@ -152,20 +165,19 @@ def _make_service( write_slots: asyncio.Semaphore | None = None, user: User | None = None, projects=None, - unique_identifiers: bool = True, + unique_column: str | None = None, ) -> tuple[ContributionService, AsyncMock, AsyncMock, AsyncMock, AsyncMock, MagicMock]: contrib_repo = contributions or AsyncMock() struct_repo = structures or AsyncMock() table_repo = tables or AsyncMock() attach_repo = attachments or AsyncMock() - # Default version resolution: every referenced project reports the ``unique_identifiers`` flag - # and no contribution version exists yet, so the common path resolves version == 1 with no - # conflict. Tests exercising versioning pass their own ``projects`` mock or override - # ``contrib_repo.max_versions``. + # Default identity resolution: every referenced project reports its ``unique_column`` (None by + # default -> identity is the fixed-field triple), and no identity exists yet, so the common path + # resolves with no conflict. Tests exercising duplicates override ``existing_identities``. projects_repo = projects or AsyncMock() if projects is None: - projects_repo.unique_identifiers_by_id.side_effect = lambda ids: {pid: unique_identifiers for pid in ids} - contrib_repo.max_versions.return_value = {} + projects_repo.unique_columns_by_id.side_effect = lambda ids: {pid: unique_column for pid in ids} + contrib_repo.existing_identities.return_value = set() if client is None: client, _ = _make_fake_client() svc = ContributionService( @@ -217,10 +229,9 @@ async def test_empty_batch_returns_empty_summary_no_db(self): contrib_repo.insert_contribution.assert_not_called() client.start_session.assert_not_called() - async def test_duplicate_project_identifier_unique_project_conflicts_later_item(self): - """On a unique-identifier project, a repeated (project, identifier) in one batch no longer - fails the whole request (the old _reject_duplicate_keys behavior). The first occurrence is - inserted at version 1; later duplicates are per-item conflict failures.""" + async def test_duplicate_identity_in_one_batch_conflicts_later_item(self): + """A repeated identity within one batch does not fail the whole request: the first occurrence + is inserted; later intra-batch duplicates are per-item conflict failures.""" svc, contrib_repo, _, _, _, client = _make_service() contrib_repo.insert_many_contributions.return_value = None contribs = [ @@ -231,7 +242,6 @@ async def test_duplicate_project_identifier_unique_project_conflicts_later_item( assert summary.total == 2 assert len(summary.succeeded) == 1 - assert summary.succeeded[0].version == 1 assert [f.index for f in summary.failed] == [1] assert summary.failed[0].error_code == "conflict" # Index 0 still reached Mongo (one doc inserted) @@ -365,8 +375,8 @@ async def test_failure_on_second_of_three_yields_summary(self): attach_repo.insert_components.return_value = [] async def _insert(doc, session=None): - # Fail the second contribution by inspecting the doc identifier - if doc.identifier == "fail": + # Fail the second contribution by inspecting the doc's material_id + if doc.material_id == "fail": raise ConflictError("conflict on insert") return doc @@ -408,7 +418,7 @@ async def _insert(doc, session=None): ] await svc.insert_contributions(contribs) - captured_by_id = {c.identifier: c for c in captured} + captured_by_id = {c.material_id: c for c in captured} assert captured_by_id["a"].structures == [struct_a] assert captured_by_id["b"].structures == [struct_b] @@ -456,18 +466,22 @@ async def _insert(doc, session=None): # --------------------------------------------------------------------------- -def _projects_mock(unique_map: dict[str, bool]) -> AsyncMock: - """A projects repo whose unique_identifiers_by_id returns only the known projects.""" +def _projects_mock(unique_map: dict[str, str | None]) -> AsyncMock: + """A projects repo whose unique_columns_by_id returns only the known projects. + + ``unique_map`` maps each known project id to its ``unique_column`` (or None). Projects absent from + the map are treated as not found/accessible. + """ repo = AsyncMock() - repo.unique_identifiers_by_id.side_effect = lambda ids: {pid: unique_map[pid] for pid in ids if pid in unique_map} + repo.unique_columns_by_id.side_effect = lambda ids: {pid: unique_map[pid] for pid in ids if pid in unique_map} return repo -class TestContributionVersioning: - async def test_insert_unique_existing_key_conflicts(self): - svc, contrib_repo, *_ = _make_service() # unique_identifiers=True by default +class TestContributionIdentity: + async def test_insert_existing_identity_conflicts(self): + svc, contrib_repo, *_ = _make_service() contrib_repo.insert_many_contributions.return_value = None - contrib_repo.max_versions.return_value = {("proj", "mp-1"): 1} + contrib_repo.existing_identities.return_value = {("proj", "mp-1", "Fe-O", "Fe2O3", None, "")} summary = await svc.insert_contributions([_contrib_in(identifier="mp-1")]) @@ -476,37 +490,66 @@ async def test_insert_unique_existing_key_conflicts(self): assert [f.error_code for f in summary.failed] == ["conflict"] contrib_repo.insert_many_contributions.assert_not_called() - async def test_insert_non_unique_assigns_max_plus_one(self): - svc, contrib_repo, *_ = _make_service(unique_identifiers=False) + async def test_insert_no_existing_identity_succeeds(self): + svc, contrib_repo, *_ = _make_service() contrib_repo.insert_many_contributions.return_value = None - contrib_repo.max_versions.return_value = {("proj", "mp-1"): 3} summary = await svc.insert_contributions([_contrib_in(identifier="mp-1")]) assert len(summary.succeeded) == 1 - assert summary.succeeded[0].version == 4 docs = contrib_repo.insert_many_contributions.call_args[0][0] - assert docs[0].version == 4 + assert docs[0].unique_value is None - async def test_insert_non_unique_no_existing_starts_at_one(self): - svc, contrib_repo, *_ = _make_service(unique_identifiers=False) + async def test_insert_unique_column_promotes_value_to_unique_value(self): + svc, contrib_repo, *_ = _make_service(unique_column="sample_id") contrib_repo.insert_many_contributions.return_value = None - # default max_versions -> {} (no existing contributions) - summary = await svc.insert_contributions([_contrib_in(identifier="mp-1")]) + summary = await svc.insert_contributions([_contrib_in(data={"sample_id": "A"})]) - assert summary.succeeded[0].version == 1 + assert len(summary.succeeded) == 1 + docs = contrib_repo.insert_many_contributions.call_args[0][0] + assert docs[0].unique_value == "A" - async def test_insert_non_unique_same_key_twice_sequences_versions(self): - svc, contrib_repo, *_ = _make_service(unique_identifiers=False) + async def test_insert_same_triple_distinct_unique_value_both_succeed(self): + svc, contrib_repo, *_ = _make_service(unique_column="sample_id") contrib_repo.insert_many_contributions.return_value = None - contrib_repo.max_versions.return_value = {("proj", "dup"): 5} - contribs = [_contrib_in(identifier="dup"), _contrib_in(identifier="dup")] + contribs = [_contrib_in(data={"sample_id": "A"}), _contrib_in(data={"sample_id": "B"})] summary = await svc.insert_contributions(contribs) assert len(summary.succeeded) == 2 - assert sorted(d.version for d in summary.succeeded) == [6, 7] + docs = contrib_repo.insert_many_contributions.call_args[0][0] + assert sorted(d.unique_value for d in docs) == ["A", "B"] + + async def test_insert_missing_unique_column_value_is_validation_failure(self): + svc, contrib_repo, *_ = _make_service(unique_column="sample_id") + contrib_repo.insert_many_contributions.return_value = None + + summary = await svc.insert_contributions([_contrib_in(data={"other": 1})]) + + assert summary.succeeded == [] + assert [f.error_code for f in summary.failed] == ["validation_error"] + contrib_repo.insert_many_contributions.assert_not_called() + + async def test_insert_non_scalar_unique_column_value_is_validation_failure(self): + svc, contrib_repo, *_ = _make_service(unique_column="sample_id") + contrib_repo.insert_many_contributions.return_value = None + + summary = await svc.insert_contributions([_contrib_in(data={"sample_id": {"nested": 1}})]) + + assert summary.succeeded == [] + assert [f.error_code for f in summary.failed] == ["validation_error"] + + async def test_insert_empty_unique_column_dup_triple_conflicts(self): + """With no unique_column, two contributions sharing the fixed-field triple collide.""" + svc, contrib_repo, *_ = _make_service() # unique_column=None + contrib_repo.insert_many_contributions.return_value = None + + contribs = [_contrib_in(identifier="mp-1"), _contrib_in(identifier="mp-1")] + summary = await svc.insert_contributions(contribs) + + assert len(summary.succeeded) == 1 + assert [f.error_code for f in summary.failed] == ["conflict"] async def test_insert_project_not_found_is_validation_failure(self): svc, contrib_repo, *_ = _make_service(projects=_projects_mock({})) # no projects known @@ -517,32 +560,34 @@ async def test_insert_project_not_found_is_validation_failure(self): assert [f.error_code for f in summary.failed] == ["validation_error"] contrib_repo.insert_many_contributions.assert_not_called() - async def test_upsert_unique_forces_version_one(self): - svc, contrib_repo, *_ = _make_service() # unique by default + async def test_upsert_does_not_conflict_on_existing_identity(self): + """Upsert targets an existing identity (update), so it must not pre-reject as a conflict.""" + svc, contrib_repo, *_ = _make_service() contrib_repo.upsert_contribution_by_identifiers.return_value = MagicMock(spec=Contribution) - # A supplied version is ignored for unique-identifier projects (inferred as 1). - await svc.upsert_contributions([_contrib_in(identifier="mp-1", version=9)]) + await svc.upsert_contributions([_contrib_in(identifier="mp-1")]) - assert contrib_repo.upsert_contribution_by_identifiers.call_args.args[2] == 1 - contrib_repo.max_versions.assert_not_called() + # existing_identities is not consulted on the upsert path + contrib_repo.existing_identities.assert_not_called() + contrib_repo.upsert_contribution_by_identifiers.assert_called_once() - async def test_upsert_non_unique_requires_version(self): - svc, contrib_repo, *_ = _make_service(unique_identifiers=False) + async def test_upsert_passes_resolved_unique_value_in_identifiers(self): + svc, contrib_repo, *_ = _make_service(unique_column="sample_id") + contrib_repo.upsert_contribution_by_identifiers.return_value = MagicMock(spec=Contribution) - summary = await svc.upsert_contributions([_contrib_in(identifier="mp-1")]) # no version + await svc.upsert_contributions([_contrib_in(data={"sample_id": "A"})]) - assert summary.succeeded == [] - assert [f.error_code for f in summary.failed] == ["validation_error"] - contrib_repo.upsert_contribution_by_identifiers.assert_not_called() + identifiers = contrib_repo.upsert_contribution_by_identifiers.call_args.args[0] + assert identifiers["unique_value"] == "A" - async def test_upsert_non_unique_passes_supplied_version(self): - svc, contrib_repo, *_ = _make_service(unique_identifiers=False) - contrib_repo.upsert_contribution_by_identifiers.return_value = MagicMock(spec=Contribution) + async def test_upsert_missing_unique_column_value_is_validation_failure(self): + svc, contrib_repo, *_ = _make_service(unique_column="sample_id") - await svc.upsert_contributions([_contrib_in(identifier="mp-1", version=7)]) + summary = await svc.upsert_contributions([_contrib_in(data={"other": 1})]) - assert contrib_repo.upsert_contribution_by_identifiers.call_args.args[2] == 7 + assert summary.succeeded == [] + assert [f.error_code for f in summary.failed] == ["validation_error"] + contrib_repo.upsert_contribution_by_identifiers.assert_not_called() # --------------------------------------------------------------------------- @@ -625,11 +670,18 @@ async def test_passes_identifiers_dict_and_input_to_repo(self): svc, contrib_repo, *_ = _make_service() contrib_repo.upsert_contribution_by_identifiers.return_value = MagicMock(spec=Contribution) - contrib = _contrib_in(project="my-proj", identifier="mp-99") + contrib = _contrib_in(project="my-proj", material_id="mp-99") await svc.upsert_contributions([contrib]) call = contrib_repo.upsert_contribution_by_identifiers.call_args - assert call.args[0] == {"project": "my-proj", "identifier": "mp-99"} + assert call.args[0] == { + "project": "my-proj", + "material_id": "mp-99", + "chemical_system_id": "Fe-O", + "formula": "Fe2O3", + "unique_value": None, + "condition_key": "", + } assert call.args[1] is contrib async def test_returns_repo_results_in_input_order(self): @@ -637,9 +689,9 @@ async def test_returns_repo_results_in_input_order(self): docs = [MagicMock(spec=Contribution, name=f"doc-{i}") for i in range(3)] returned = {} - async def _upsert(identifiers, contrib, version): - doc = docs[int(contrib.identifier.split("-")[1])] - returned[contrib.identifier] = doc + async def _upsert(identifiers, contrib): + doc = docs[int(contrib.material_id.split("-")[1])] + returned[contrib.material_id] = doc return doc contrib_repo.upsert_contribution_by_identifiers.side_effect = _upsert @@ -677,8 +729,8 @@ async def test_same_key_concurrent_upserts_both_go_through_atomic_call(self): async def test_one_failure_is_reported_not_raised(self): svc, contrib_repo, *_ = _make_service() - async def _upsert(identifiers, contrib, version): - if contrib.identifier == "mp-1": + async def _upsert(identifiers, contrib): + if contrib.material_id == "mp-1": raise ConflictError("boom") return MagicMock(spec=Contribution) diff --git a/mpcontribs-api/tests/unit/domains/test_contributions_models.py b/mpcontribs-api/tests/unit/domains/test_contributions_models.py index a571be0598..b73125c723 100644 --- a/mpcontribs-api/tests/unit/domains/test_contributions_models.py +++ b/mpcontribs-api/tests/unit/domains/test_contributions_models.py @@ -13,6 +13,7 @@ ContributionIn, ContributionOut, ContributionPatch, + extract_unique_value, ) from mpcontribs_api.exceptions import ValidationError @@ -26,7 +27,8 @@ def _make_contribution_in(**overrides) -> ContributionIn: defaults: dict = { "_id": PydanticObjectId(), "project": "test-project", - "identifier": "mp-1234", + "material_id": "mp-1234", + "chemical_system_id": "Fe-O", "formula": "Fe2O3", "data": {"band_gap": {"value": 2.1, "unit": "eV"}}, } @@ -45,13 +47,15 @@ def test_required_fields_set_correctly(self): **{ "_id": PydanticObjectId(), "project": "mp-project", - "identifier": "mp-001", + "material_id": "mp-001", + "chemical_system_id": "Fe-O", "formula": "Fe2O3", "data": {}, } ) assert contrib.project == "mp-project" - assert contrib.identifier == "mp-001" + assert contrib.material_id == "mp-001" + assert contrib.chemical_system_id == "Fe-O" assert contrib.formula == "Fe2O3" assert contrib.data == {} @@ -72,7 +76,8 @@ def test_missing_project_raises(self): ContributionIn( **{ "_id": PydanticObjectId(), - "identifier": "mp-001", + "material_id": "mp-001", + "chemical_system_id": "Fe-O", "formula": "Fe", "data": {}, } @@ -84,7 +89,8 @@ def test_missing_formula_raises(self): **{ "_id": PydanticObjectId(), "project": "proj", - "identifier": "mp-001", + "material_id": "mp-001", + "chemical_system_id": "Fe-O", "data": {}, } ) @@ -179,7 +185,8 @@ def test_partial_population(self): out = ContributionOut(project="mp-proj", formula="Li2O") assert out.project == "mp-proj" assert out.formula == "Li2O" - assert out.identifier is None + assert out.material_id is None + assert out.unique_value is None def test_is_public_field(self): out = ContributionOut(is_public=True) @@ -200,7 +207,8 @@ class TestContributionPatch: def test_all_fields_optional(self): patch = ContributionPatch() assert patch.project is None - assert patch.identifier is None + assert patch.material_id is None + assert patch.chemical_system_id is None assert patch.formula is None assert patch.data is None @@ -214,6 +222,53 @@ def test_data_can_be_set(self): assert patch.data == {"new_key": 42} +# --------------------------------------------------------------------------- +# extract_unique_value — promoting a project's unique_column to the identity value +# --------------------------------------------------------------------------- + + +class TestExtractUniqueValue: + def test_top_level_scalar(self): + assert extract_unique_value({"sample_id": "A"}, "sample_id") == "A" + + def test_nested_dotted_path(self): + assert extract_unique_value({"conditions": {"temp": 300}}, "conditions.temp") == 300 + + def test_accepts_bool_and_float(self): + assert extract_unique_value({"flag": True}, "flag") is True + assert extract_unique_value({"x": 1.5}, "x") == 1.5 + + def test_missing_path_raises(self): + with pytest.raises(ValidationError, match="missing from Contribution.data"): + extract_unique_value({"other": 1}, "sample_id") + + def test_missing_when_data_none_raises(self): + with pytest.raises(ValidationError): + extract_unique_value(None, "sample_id") + + def test_non_scalar_dict_raises(self): + with pytest.raises(ValidationError, match="must resolve to a scalar"): + extract_unique_value({"sample_id": {"nested": 1}}, "sample_id") + + def test_non_scalar_list_raises(self): + with pytest.raises(ValidationError, match="must resolve to a scalar"): + extract_unique_value({"sample_id": [1, 2]}, "sample_id") + + +class TestContributionOutDefaultFields: + def test_default_fields_are_identity_and_metadata(self): + assert ContributionOut.default_fields() == [ + "id", + "project", + "material_id", + "chemical_system_id", + "formula", + "unique_value", + "is_public", + "last_modified", + ] + + # --------------------------------------------------------------------------- # MongoDbContributionRepository._build_scope (pure logic, no DB needed) # --------------------------------------------------------------------------- diff --git a/mpcontribs-api/tests/unit/domains/test_projects_models.py b/mpcontribs-api/tests/unit/domains/test_projects_models.py index b874091e73..2e739e256e 100644 --- a/mpcontribs-api/tests/unit/domains/test_projects_models.py +++ b/mpcontribs-api/tests/unit/domains/test_projects_models.py @@ -10,6 +10,40 @@ Reference, Stats, ) +from mpcontribs_api.exceptions import ValidationError + + +class TestUniqueColumnValidation: + def _make_input(self, **overrides): + defaults = { + "_id": "uc-proj", + "title": "Test Project", + "authors": "Alice", + "description": "A test project", + "owner": "google:alice@example.com", + "stats": Stats(columns=0, contributions=0, tables=0, structures=0, attachments=0, size=0.0), + } + defaults.update(overrides) + return ProjectIn(**defaults) + + def test_none_is_allowed(self): + assert self._make_input().unique_column is None + + def test_dotted_path_accepted_even_if_absent_from_columns(self): + # No subset-of-columns check: columns is derived/eventually-consistent. + assert self._make_input(unique_column="conditions.temp").unique_column == "conditions.temp" + + def test_empty_string_rejected(self): + with pytest.raises(ValidationError): + self._make_input(unique_column="") + + def test_blank_segment_rejected(self): + with pytest.raises(ValidationError): + self._make_input(unique_column="a..b") + + def test_patch_validates_unique_column(self): + with pytest.raises(ValidationError): + ProjectPatch(unique_column="a..b") # --------------------------------------------------------------------------- # Column @@ -207,7 +241,6 @@ def _make_input(self, **overrides): "authors": "Alice, Bob", "description": "A test project", "owner": "google:alice@example.com", - "unique_identifiers": True, "stats": VALID_STATS, } defaults.update(overrides) From f0199185747f5fab6fefdcb7e0813b2c5e7032e7 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 27 Jul 2026 10:52:51 -0700 Subject: [PATCH 508/591] Created 'Identity' to unify Contribution identity handling logic --- .../domains/contributions/models.py | 120 ++++++++++++++---- .../domains/contributions/repository.py | 34 +---- .../domains/contributions/service.py | 20 +-- 3 files changed, 102 insertions(+), 72 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py index 43c463cb30..4ababc848b 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py @@ -1,6 +1,8 @@ import re +from collections.abc import Mapping +from dataclasses import dataclass, fields from datetime import UTC, datetime -from typing import Annotated, Any +from typing import Annotated, Any, cast from warnings import deprecated from beanie import ( @@ -121,6 +123,71 @@ def extract_unique_value(data: dict[str, Any] | None, unique_column: str) -> Sca return value +# dataclass construction is cheaper than Pydantic.BaseModel +@dataclass(frozen=True, slots=True) +class Identity: + """The full identity of a Contribution. + + Field declaration order IS the identity/index column order: ``as_tuple``, ``index_model``, and + ``projection`` iterate ``dataclasses.fields`` in that order, so the order is declared exactly once + (below). Reordering the fields reorders the unique index — a schema change, not a cosmetic edit. + + ``unique_value`` is the project's ``unique_column`` value promoted onto the document (``None`` when + the project sets no ``unique_column``); ``condition_key`` is the pivot discriminator, ``""`` until + pivoting is wired in. + """ + + project: str + material_id: str + chemical_system_id: str + formula: str + unique_value: Scalar | None = None + condition_key: str = "" + + def as_tuple(self) -> IdentityKey: + """Identity as a hashable tuple in index order (for set membership / dedup).""" + return cast(IdentityKey, tuple(getattr(self, f.name) for f in fields(self))) + + def as_dict(self) -> dict[str, Any]: + """Identity as a flat dict keyed by field name (for Mongo match clauses and upsert).""" + return {f.name: getattr(self, f.name) for f in fields(self)} + + @classmethod + def from_tuple(cls, key: IdentityKey) -> Identity: + """Rebuild from an ``as_tuple()`` value. ``IdentityKey`` is fixed-shape in ``FIELDS`` order.""" + project, material_id, chemical_system_id, formula, unique_value, condition_key = key + return cls( + project=project, + material_id=material_id, + chemical_system_id=chemical_system_id, + formula=formula, + unique_value=unique_value, + condition_key=condition_key, + ) + + @classmethod + def from_document(cls, doc: Mapping[str, Any]) -> Identity: + """Build from a raw Mongo document/projection, tolerating null-stripped fields.""" + return cls( + project=doc["project"], + material_id=doc["material_id"], + chemical_system_id=doc["chemical_system_id"], + formula=doc["formula"], + unique_value=doc.get("unique_value"), + condition_key=doc.get("condition_key") or "", + ) + + @classmethod + def index_model(cls, name: str = "project_identity", *, unique: bool = True) -> IndexModel: + """The unique index enforcing identity — keys follow the field order so they can't drift.""" + return IndexModel(keys=[(f.name, ASCENDING) for f in fields(cls)], name=name, unique=unique) + + @classmethod + def projection(cls) -> dict[str, int]: + """A Mongo projection selecting exactly the identity fields.""" + return {f.name: 1 for f in fields(cls)} + + class ContributionBase(BaseDocumentWithInput[PydanticObjectId]): """Shared settings and fields for Contribution, ContributionIn, and ContributionOut.""" @@ -141,18 +208,7 @@ class Settings: name = "contributions" keep_nulls = False indexes = [ - IndexModel( - keys=[ - ("project", ASCENDING), - ("material_id", ASCENDING), - ("chemical_system_id", ASCENDING), - ("formula", ASCENDING), - ("unique_value", ASCENDING), - ("condition_key", ASCENDING), - ], - name="project_identity", - unique=True, - ), + Identity.index_model(), # Multikey indexes over each Link field's DBRef id so the component-delete # reference check (referenced_component_ids) is index-served, not a COLLSCAN. IndexModel(keys=[("structures.$id", ASCENDING)], name="ref_structures"), @@ -192,6 +248,18 @@ def from_input_model(cls, data: ContributionIn) -> Contribution: def set_last_modified(self): self.last_modified = datetime.now(UTC) + @property + def identity(self) -> Identity: + """This document's identity, read straight off its own stored fields.""" + return Identity( + project=self.project, + material_id=self.material_id, + chemical_system_id=self.chemical_system_id, + formula=self.formula, + unique_value=self.unique_value, + condition_key=self.condition_key, + ) + class ContributionIn(ContributionBase): """Fields that users are allowed to submit when adding a Contribution.""" @@ -208,20 +276,24 @@ def component_count(self) -> int: """Returns the total number of components (structures, tables, attachments) in the contribution""" return len(self.structures or []) + len(self.tables or []) + len(self.attachments or []) - def identifiers(self, unique_value: Scalar | None = None, condition_key: str = "") -> dict[str, Any]: - """Returns the identity fields of a contribution (outside of id) for reporting and upsert. + def identity(self, unique_value: Scalar | None = None, condition_key: str = "") -> Identity: + """Build this contribution's :class:`Identity` from its flat fields plus server-resolved parts. ``unique_value`` and ``condition_key`` are server-resolved, so they are passed in rather than - read off the input model. + read off the (untrusted) input model. """ - return { - "project": self.project, - "material_id": self.material_id, - "chemical_system_id": self.chemical_system_id, - "formula": self.formula, - "unique_value": unique_value, - "condition_key": condition_key, - } + return Identity( + project=self.project, + material_id=self.material_id, + chemical_system_id=self.chemical_system_id, + formula=self.formula, + unique_value=unique_value, + condition_key=condition_key, + ) + + def identifiers(self, unique_value: Scalar | None = None, condition_key: str = "") -> dict[str, Any]: + """Returns the identity fields of a contribution (outside of id) for reporting and upsert.""" + return self.identity(unique_value, condition_key).as_dict() class ContributionOut(DocumentOut[PydanticObjectId]): diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py index 9fb2be44fb..196b5caa0e 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py @@ -17,6 +17,7 @@ ContributionIn, ContributionOut, ContributionPatch, + Identity, IdentityKey, Scalar, ) @@ -163,41 +164,14 @@ async def existing_identities(self, keys: list[IdentityKey]) -> set[IdentityKey] """ if not keys: return set() - ors = [ - { - "project": project, - "material_id": material_id, - "chemical_system_id": chemical_system_id, - "formula": formula, - "unique_value": unique_value, - "condition_key": condition_key, - } - for (project, material_id, chemical_system_id, formula, unique_value, condition_key) in keys - ] + ors = [Identity.from_tuple(key).as_dict() for key in keys] match: dict[str, Any] = {"$or": ors} if self._scope: match = {"$and": [self._scope, match]} - projection = { - "project": 1, - "material_id": 1, - "chemical_system_id": 1, - "formula": 1, - "unique_value": 1, - "condition_key": 1, - } collection = self.document_model.get_pymongo_collection() found: set[IdentityKey] = set() - async for doc in collection.find(match, projection): - found.add( - ( - doc["project"], - doc["material_id"], - doc["chemical_system_id"], - doc["formula"], - doc.get("unique_value"), - doc.get("condition_key") or "", - ) - ) + async for doc in collection.find(match, Identity.projection()): + found.add(Identity.from_document(doc).as_tuple()) return found async def referenced_component_ids( diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py index fe9c0e0726..bc8ca65694 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py @@ -236,16 +236,7 @@ async def _resolve_identity( continue resolved.append((i, contrib, unique_value)) - keys.append( - ( - contrib.project, - contrib.material_id, - contrib.chemical_system_id, - contrib.formula, - unique_value, - "", - ) - ) + keys.append(contrib.identity(unique_value).as_tuple()) # Second pass (insert only): reject identity collisions against existing docs and earlier # items in this batch. Upsert skips this — an existing identity is the update target and the @@ -257,14 +248,7 @@ async def _resolve_identity( existing = await self._contributions.existing_identities(keys) seen: set[IdentityKey] = set() for i, contrib, unique_value in resolved: - key: IdentityKey = ( - contrib.project, - contrib.material_id, - contrib.chemical_system_id, - contrib.formula, - unique_value, - "", - ) + key: IdentityKey = contrib.identity(unique_value).as_tuple() if key in existing or key in seen: failures.append( BulkFailure( From 60e61b0d840354468e988eb9ff4a40da2f3fc2ec Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 27 Jul 2026 11:51:33 -0700 Subject: [PATCH 509/591] Added validation to contribution id fields --- .../mpcontribs_api/domains/_shared/types.py | 112 ++++++++++++++++++ .../domains/contributions/models.py | 11 +- .../db/test_contributions_repository.py | 20 ++-- .../unit/domains/test_contribution_service.py | 24 +++- .../unit/domains/test_contributions_models.py | 86 +++++++++++++- 5 files changed, 235 insertions(+), 18 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py index bfaf0e4a1f..9a9a24592d 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py @@ -1,15 +1,127 @@ import re +import unicodedata from enum import StrEnum from typing import Annotated import polars as pl from fastapi import Query from pydantic import BeforeValidator, Field, PlainSerializer, WithJsonSchema +from pymatgen.core import Element from mpcontribs_api.exceptions import ValidationError ShortStr = Annotated[str, Field(min_length=3, max_length=30)] +# "mp-" followed by one or more digits; leading zeros are trimmed afterwards. +_MATERIAL_ID_RE = re.compile(r"^mp-([0-9]+)$") +_MAX_MATERIAL_ID_DIGITS = 7 + + +def _validate_material_id(v: str | None) -> str | None: + """Normalize a Materials Project id: ``mp-`` + up to 7 digits, leading zeros trimmed. + + ``"mp-001"`` -> ``"mp-1"``. Rejects anything not shaped ``mp-`` and any value whose + significant (leading-zero-trimmed) digit count exceeds 7. + """ + if v is None: + return None + if not isinstance(v, str): + raise ValidationError(f"material_id must be a string, got '{type(v).__name__}'", material_id=v) + s = v.strip() + match = _MATERIAL_ID_RE.match(s) + if match is None: + raise ValidationError( + f"material_id '{v}' invalid. Must be 'mp-' followed by digits (e.g. 'mp-149')", + material_id=v, + ) + trimmed = match.group(1).lstrip("0") or "0" + if len(trimmed) > _MAX_MATERIAL_ID_DIGITS: + raise ValidationError( + f"material_id '{v}' invalid. Numeric part must be at most {_MAX_MATERIAL_ID_DIGITS} digits", + material_id=v, + ) + return f"mp-{trimmed}" + + +MaterialId = Annotated[str, BeforeValidator(_validate_material_id)] + + +def _validate_chemical_system_id(v: str | None) -> str | None: + """Validate a hyphen-delimited chemical system of element symbols, e.g. ``"Fe-O"``.""" + if v is None: + return None + if not isinstance(v, str): + raise ValidationError(f"chemical_system_id must be a string, got '{type(v).__name__}'", chemical_system_id=v) + s = v.strip() + if not s: + raise ValidationError("chemical_system_id must not be empty", chemical_system_id=v) + for token in s.split("-"): + if not Element.is_valid_symbol(token): + raise ValidationError( + f"chemical_system_id '{v}' invalid. '{token}' is not a valid element symbol", + chemical_system_id=v, + invalid_token=token, + ) + return s + + +ChemicalSystemId = Annotated[str, BeforeValidator(_validate_chemical_system_id)] + + +# Each token is an element symbol (upper, optional lower) followed by an optional integer count. +_FORMULA_TOKEN_RE = re.compile(r"([A-Z][a-z]?)([0-9]*)") + + +def _validate_formula(v: str | None) -> str | None: + """Validate/normalize a formula: element symbols each optionally followed by a count. + + The value is NFKC-normalized first, so unicode subscripts/superscripts and full-width forms + fold to their ASCII equivalents (``"Fe₂O₃"`` -> ``"Fe2O3"``). Leading zeros in counts are then + trimmed (``"Fe02O3"`` -> ``"Fe2O3"``). Rejects unknown element symbols, stray characters, and + non-positive counts (``"Fe0"``). + """ + if v is None: + return None + if not isinstance(v, str): + raise ValidationError(f"formula must be a string, got '{type(v).__name__}'", formula=v) + s = unicodedata.normalize("NFKC", v).strip() + if not s: + raise ValidationError("formula must not be empty", formula=v) + parts: list[str] = [] + pos = 0 + for match in _FORMULA_TOKEN_RE.finditer(s): + # A gap between the previous match end and this match start means a stray/invalid character. + if match.start() != pos: + break + symbol, count = match.group(1), match.group(2) + if not Element.is_valid_symbol(symbol): + raise ValidationError( + f"formula '{v}' invalid. '{symbol}' is not a valid element symbol", + formula=v, + invalid_symbol=symbol, + ) + if count: + trimmed = count.lstrip("0") + if not trimmed: + raise ValidationError( + f"formula '{v}' invalid. Count for '{symbol}' must be a positive integer", + formula=v, + invalid_count=count, + ) + count = trimmed + parts.append(f"{symbol}{count}") + pos = match.end() + if pos != len(s): + raise ValidationError( + f"formula '{v}' invalid. Must be valid element symbols each optionally followed by a " + "positive integer count (e.g. 'Fe2O3')", + formula=v, + ) + return "".join(parts) + + +Formula = Annotated[str, BeforeValidator(_validate_formula)] + FieldSelector = Annotated[list[str] | None, Query(alias="_fields")] _EMAIL_RE = re.compile(r"^[^:@\s]+:[^:@\s]+@[^@\s]+\.[^@\s]+$") diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py index 4ababc848b..ed8917b2e0 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py @@ -22,7 +22,7 @@ from mpcontribs_api.domains._shared.filters import BaseFilter from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut -from mpcontribs_api.domains._shared.types import ShortStr +from mpcontribs_api.domains._shared.types import ChemicalSystemId, Formula, MaterialId, ShortStr from mpcontribs_api.domains.attachments.models import Attachment, AttachmentFilter, AttachmentIn from mpcontribs_api.domains.structures.models import Structure, StructureFilter, StructureIn from mpcontribs_api.domains.tables.models import Table, TableFilter, TableIn @@ -264,6 +264,9 @@ def identity(self) -> Identity: class ContributionIn(ContributionBase): """Fields that users are allowed to submit when adding a Contribution.""" + material_id: MaterialId + chemical_system_id: ChemicalSystemId + formula: Formula structures: list[StructureIn] | None = None tables: list[TableIn] | None = None attachments: list[AttachmentIn] | None = None @@ -336,9 +339,9 @@ class ContributionPatch(SparseFieldsModel): """Fields that can be specified for partial updates to a Contribution.""" project: str | None = None - material_id: str | None = None - chemical_system_id: str | None = None - formula: str | None = None + material_id: MaterialId | None = None + chemical_system_id: ChemicalSystemId | None = None + formula: Formula | None = None is_public: bool | None = None data: Annotated[ dict[str, Any] | None, diff --git a/mpcontribs-api/tests/integration/db/test_contributions_repository.py b/mpcontribs-api/tests/integration/db/test_contributions_repository.py index 3e962fc48c..e8c44d56f8 100644 --- a/mpcontribs-api/tests/integration/db/test_contributions_repository.py +++ b/mpcontribs-api/tests/integration/db/test_contributions_repository.py @@ -103,12 +103,12 @@ async def test_fields_are_persisted(self, db): assert found.data == {"x": 1} async def test_insert_via_repo(self, db): - ci = _contrib_in(identifier="ins-via-repo") + ci = _contrib_in(identifier="mp-4001") doc = Contribution.from_input_model(ci) result = await _repo().insert_contribution(doc) found = await Contribution.find_one(Contribution.id == result.id) assert found is not None - assert found.material_id == "ins-via-repo" + assert found.material_id == "mp-4001" # --------------------------------------------------------------------------- @@ -118,14 +118,14 @@ async def test_insert_via_repo(self, db): class TestInsertManyContributions: async def test_all_docs_persisted(self, db): - docs = [Contribution.from_input_model(_contrib_in(identifier=f"bulk-{i}")) for i in range(5)] + docs = [Contribution.from_input_model(_contrib_in(identifier=f"mp-{4100 + i}")) for i in range(5)] await _repo().insert_many_contributions(docs) for doc in docs: found = await Contribution.find_one(Contribution.id == doc.id) assert found is not None async def test_returns_insert_result(self, db): - docs = [Contribution.from_input_model(_contrib_in(identifier=f"bulk-ret-{i}")) for i in range(3)] + docs = [Contribution.from_input_model(_contrib_in(identifier=f"mp-{4200 + i}")) for i in range(3)] result = await _repo().insert_many_contributions(docs) assert result is not None @@ -420,13 +420,13 @@ async def test_empty_patch_is_a_noop(self, db): async def test_raises_validation_error_for_bad_id(self, db): with pytest.raises(ValidationError): - await _repo(ADMIN).patch_contribution_by_id("bad-id", ContributionPatch(formula="X")) + await _repo(ADMIN).patch_contribution_by_id("bad-id", ContributionPatch(formula="Fe2O3")) async def test_anon_cannot_patch_private_doc(self, db): from mpcontribs_api.exceptions import NotFoundError doc = await _insert(identifier="patch-anon-priv", is_public=False) with pytest.raises(NotFoundError): - await _repo(ANON).patch_contribution_by_id(str(doc.id), ContributionPatch(formula="X")) + await _repo(ANON).patch_contribution_by_id(str(doc.id), ContributionPatch(formula="Fe2O3")) # --------------------------------------------------------------------------- @@ -496,17 +496,17 @@ async def test_scope_limits_what_anon_can_delete(self, db): class TestUpsertContributionById: async def test_insert_when_id_absent_persists_document(self, db): new_id = PydanticObjectId() - payload = _contrib_in(identifier="ups-new", _id=new_id) + payload = _contrib_in(identifier="mp-4002", _id=new_id) result = await _repo(ADMIN).upsert_contribution_by_id(str(new_id), payload) # Must be the resolved document, not an un-awaited query object. assert isinstance(result, Contribution) stored = await Contribution.find_one(Contribution.id == new_id) assert stored is not None - assert stored.material_id == "ups-new" + assert stored.material_id == "mp-4002" async def test_update_when_id_present_applies_change(self, db): - existing = await _insert(identifier="ups-existing") - payload = _contrib_in(identifier="ups-existing", formula="Li2O", _id=existing.id) + existing = await _insert(identifier="mp-4003") + payload = _contrib_in(identifier="mp-4003", formula="Li2O", _id=existing.id) result = await _repo(ADMIN).upsert_contribution_by_id(str(existing.id), payload) assert isinstance(result, Contribution) stored = await Contribution.find_one(Contribution.id == existing.id) diff --git a/mpcontribs-api/tests/unit/domains/test_contribution_service.py b/mpcontribs-api/tests/unit/domains/test_contribution_service.py index 1ea296dc54..b85b4f1b8b 100644 --- a/mpcontribs-api/tests/unit/domains/test_contribution_service.py +++ b/mpcontribs-api/tests/unit/domains/test_contribution_service.py @@ -88,6 +88,23 @@ def _structure_in(**overrides) -> StructureIn: return StructureIn(**defaults) +_MP_ID_REGISTRY: dict[str, str] = {} + + +def _mp_id_for(label: str) -> str: + """Map an arbitrary test label onto a stable, valid ``material_id`` (``mp-``). + + ``ContributionIn`` now validates ``material_id`` as ``mp-``, but these tests use + readable labels (``"dup"``, ``"ok"``, ...) purely to mint identities. This preserves the + pairing semantics they rely on — the same label always yields the same id (so intentional + duplicates still collide) and distinct labels yield distinct ids — while producing a value the + validator accepts. Values already shaped ``mp-`` pass through unchanged. + """ + if label.startswith("mp-") and label[3:].isdigit(): + return label + return _MP_ID_REGISTRY.setdefault(label, f"mp-{9_000_000 + len(_MP_ID_REGISTRY)}") + + def _contrib_in( project="proj", material_id="mp-1", @@ -101,6 +118,7 @@ def _contrib_in( # identity tuple (project, material_id, chemical_system_id, formula, unique_value) differs. if identifier is not None: material_id = identifier + material_id = _mp_id_for(material_id) return ContributionIn( _id=_oid(), project=project, @@ -376,7 +394,7 @@ async def test_failure_on_second_of_three_yields_summary(self): async def _insert(doc, session=None): # Fail the second contribution by inspecting the doc's material_id - if doc.material_id == "fail": + if doc.material_id == _mp_id_for("fail"): raise ConflictError("conflict on insert") return doc @@ -419,8 +437,8 @@ async def _insert(doc, session=None): await svc.insert_contributions(contribs) captured_by_id = {c.material_id: c for c in captured} - assert captured_by_id["a"].structures == [struct_a] - assert captured_by_id["b"].structures == [struct_b] + assert captured_by_id[_mp_id_for("a")].structures == [struct_a] + assert captured_by_id[_mp_id_for("b")].structures == [struct_b] # --------------------------------------------------------------------------- diff --git a/mpcontribs-api/tests/unit/domains/test_contributions_models.py b/mpcontribs-api/tests/unit/domains/test_contributions_models.py index b73125c723..eda0d2aced 100644 --- a/mpcontribs-api/tests/unit/domains/test_contributions_models.py +++ b/mpcontribs-api/tests/unit/domains/test_contributions_models.py @@ -54,7 +54,8 @@ def test_required_fields_set_correctly(self): } ) assert contrib.project == "mp-project" - assert contrib.material_id == "mp-001" + # material_id is normalized on input: leading zeros in the numeric part are trimmed. + assert contrib.material_id == "mp-1" assert contrib.chemical_system_id == "Fe-O" assert contrib.formula == "Fe2O3" assert contrib.data == {} @@ -136,6 +137,89 @@ def test_data_value_validation(self): _make_contribution_in(data=ascii_in_values) assert True +# --------------------------------------------------------------------------- +# Contribution identifier validation (material_id / chemical_system_id / formula) +# +# Validation lives on the input models (ContributionIn / ContributionPatch), not the stored +# Contribution, so these exercise it through ContributionIn. +# --------------------------------------------------------------------------- + + +class TestMaterialIdValidation: + @pytest.mark.parametrize( + ("given", "expected"), + [ + ("mp-149", "mp-149"), + ("mp-1234567", "mp-1234567"), + ("mp-001", "mp-1"), # leading zeros trimmed + ("mp-0001234", "mp-1234"), + (" mp-42 ", "mp-42"), # surrounding whitespace stripped + ], + ) + def test_valid_material_id_is_normalized(self, given, expected): + assert _make_contribution_in(material_id=given).material_id == expected + + @pytest.mark.parametrize( + "bad", + ["mp-12345678", "MP-1", "mp-", "mp-1a", "1234", "mvc-1", "mp-1.0"], + ) + def test_invalid_material_id_raises(self, bad): + with pytest.raises(ValidationError, match="material_id"): + _make_contribution_in(material_id=bad) + + +class TestChemicalSystemIdValidation: + @pytest.mark.parametrize("good", ["Fe-O", "Li-Fe-O", "Fe", "H"]) + def test_valid_chemical_system_id(self, good): + assert _make_contribution_in(chemical_system_id=good).chemical_system_id == good + + @pytest.mark.parametrize("bad", ["Xx-O", "fe-o", "Fe-", "-Fe", "Fe--O", ""]) + def test_invalid_chemical_system_id_raises(self, bad): + with pytest.raises(ValidationError, match="chemical_system_id"): + _make_contribution_in(chemical_system_id=bad) + + +class TestFormulaValidation: + @pytest.mark.parametrize( + ("given", "expected"), + [ + ("Fe2O3", "Fe2O3"), + ("LiFeO2", "LiFeO2"), + ("Fe", "Fe"), + ("Fe02O3", "Fe2O3"), # leading zeros in counts trimmed + ("FeO03", "FeO3"), + ("Fe₂O₃", "Fe2O3"), # NFKC folds unicode subscripts + ("Co³O₄", "Co3O4"), # ...and superscripts + ("Ｆｅ２Ｏ３", "Fe2O3"), # ...and full-width forms + ], + ) + def test_valid_formula_is_normalized(self, given, expected): + assert _make_contribution_in(formula=given).formula == expected + + @pytest.mark.parametrize("bad", ["X", "fe2", "Fe2xO", "2FeO", "Fe0", ""]) + def test_invalid_formula_raises(self, bad): + with pytest.raises(ValidationError, match="formula"): + _make_contribution_in(formula=bad) + + +class TestPatchIdentifierValidation: + def test_patch_normalizes_material_id(self): + assert ContributionPatch(material_id="mp-007").material_id == "mp-7" + + def test_patch_normalizes_formula(self): + assert ContributionPatch(formula="Fe02O3").formula == "Fe2O3" + + def test_patch_rejects_bad_chemical_system_id(self): + with pytest.raises(ValidationError, match="chemical_system_id"): + ContributionPatch(chemical_system_id="Zz") + + def test_patch_identifiers_stay_optional(self): + patch = ContributionPatch(is_public=True) + assert patch.material_id is None + assert patch.chemical_system_id is None + assert patch.formula is None + + # --------------------------------------------------------------------------- # Contribution.from_input_model # --------------------------------------------------------------------------- From 466aff73e514a923b6e7c1351b374841d464dfaa Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 27 Jul 2026 14:19:17 -0700 Subject: [PATCH 510/591] Contribution identifiers now follow a hierarchy (chem_sys_id < formula < material_id - ie. a formula must be specified if a material_id is). --- .../domains/contributions/models.py | 59 ++++++++++++++----- .../domains/contributions/service.py | 58 ++++++++++++++++-- .../db/test_contributions_repository.py | 37 ++++++++++++ .../unit/domains/test_contribution_service.py | 52 +++++++++++++++- .../unit/domains/test_contributions_models.py | 57 ++++++++++++++---- 5 files changed, 231 insertions(+), 32 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py index ed8917b2e0..cbb57ef0e5 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py @@ -17,7 +17,7 @@ ) from bson.errors import InvalidId from fastapi_filter import FilterDepends, with_prefix -from pydantic import BeforeValidator, Field, field_validator +from pydantic import BeforeValidator, Field, field_validator, model_validator from pymongo import ASCENDING, IndexModel from mpcontribs_api.domains._shared.filters import BaseFilter @@ -79,9 +79,10 @@ def _validate_nested_keys(value: Any) -> None: Scalar = str | int | float | bool -# Identity in index order: the three fixed fields plus unique_value and condition_key. condition_key -# is "" until pivoting is wired in (contrib-data-handling merge). -IdentityKey = tuple[str, str, str, str, Scalar | None, str] +# Identity in index order: project, material_id, chemical_system_id, formula, unique_value, +# condition_key. material_id/formula are nullable (identifier hierarchy); condition_key is "" until +# pivoting is wired in (contrib-data-handling merge). +IdentityKey = tuple[str, str | None, str, str | None, Scalar | None, str] def _value_at(data: dict[str, Any], path: str) -> Any: @@ -135,12 +136,18 @@ class Identity: ``unique_value`` is the project's ``unique_column`` value promoted onto the document (``None`` when the project sets no ``unique_column``); ``condition_key`` is the pivot discriminator, ``""`` until pivoting is wired in. + + ``material_id`` and ``formula`` are nullable: identifiers follow a specificity hierarchy + (``chemical_system_id`` > ``formula`` > ``material_id``), so a contribution may stop at the + chemical-system or formula level. """ + # WARNING: the order the fields are specified in reflects their ordering for indices. Changing the order + # creates index migration. Only change intentionally project: str - material_id: str + material_id: str | None chemical_system_id: str - formula: str + formula: str | None unique_value: Scalar | None = None condition_key: str = "" @@ -170,9 +177,9 @@ def from_document(cls, doc: Mapping[str, Any]) -> Identity: """Build from a raw Mongo document/projection, tolerating null-stripped fields.""" return cls( project=doc["project"], - material_id=doc["material_id"], + material_id=doc.get("material_id"), chemical_system_id=doc["chemical_system_id"], - formula=doc["formula"], + formula=doc.get("formula"), unique_value=doc.get("unique_value"), condition_key=doc.get("condition_key") or "", ) @@ -191,10 +198,12 @@ def projection(cls) -> dict[str, int]: class ContributionBase(BaseDocumentWithInput[PydanticObjectId]): """Shared settings and fields for Contribution, ContributionIn, and ContributionOut.""" + # Identifiers follow a specificity hierarchy: chemical_system_id > formula > material_id. + # chemical_system_id is always required project: str - material_id: str + material_id: str | None = None chemical_system_id: str - formula: str + formula: str | None = None is_public: bool = False data: Annotated[ dict[str, Any], @@ -222,8 +231,8 @@ class Contribution(ContributionBase): # Server-owned: the service extracts this from data at the project's unique_column path and stamps # it on the doc (see ContributionService._resolve_identity). None when the project sets no - # unique_column, in which case the (project, material_id, chemical_system_id, formula) triple is - # the identity. Never trusted from the request body. + # unique_column, in which case the identity is the (project, material_id, chemical_system_id, + # formula) tuple. Never trusted from the request body. unique_value: Scalar | None = None # Server-owned pivot-condition discriminator; "" until pivoting is wired in (see IdentityKey). condition_key: str = "" @@ -262,15 +271,35 @@ def identity(self) -> Identity: class ContributionIn(ContributionBase): - """Fields that users are allowed to submit when adding a Contribution.""" + """Fields that users are allowed to submit when adding a Contribution. - material_id: MaterialId + Identifiers follow the specificity hierarchy ``chemical_system_id`` > ``formula`` > + ``material_id``: ``chemical_system_id`` is always required, and each lower level requires the ones + above it (see :meth:`_check_identifier_hierarchy`). + """ + + material_id: MaterialId | None = None chemical_system_id: ChemicalSystemId - formula: Formula + formula: Formula | None = None structures: list[StructureIn] | None = None tables: list[TableIn] | None = None attachments: list[AttachmentIn] | None = None + @model_validator(mode="after") + def _check_identifier_hierarchy(self) -> ContributionIn: + """Enforce ``chemical_system_id`` > ``formula`` > ``material_id``. + + ``chemical_system_id`` is required + ``material_id`` requires ``formula`` to be specified + """ + if self.material_id is not None and self.formula is None: + raise ValidationError( + "formula is required when material_id is specified " + "(identifier hierarchy: chemical_system_id > formula > material_id).", + material_id=self.material_id, + ) + return self + def has_components(self) -> bool: """Returns ``True`` if the contribution has any components (structures, tables, attachments)""" return bool(self.structures or self.tables or self.attachments) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py index bc8ca65694..dba33ecf6b 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py @@ -519,24 +519,72 @@ async def upsert_contribution_by_id(self, id: str, contribution: ContributionIn) unique_value = await self._resolve_unique_value(contribution.project, contribution.data) return await self._contributions.upsert_contribution_by_id(id, contribution, unique_value) + # Identity fields subject to the specificity hierarchy chemical_system_id > formula > material_id. + _IDENTITY_FIELDS = frozenset({"material_id", "chemical_system_id", "formula"}) + async def patch_contribution_by_id(self, id: str, update: ContributionPatch) -> Contribution: - """Patch a single contribution by id, recomputing ``unique_value`` if identity inputs change. + """Patch a single contribution by id. - ``unique_value`` derives from (project, data); it is only recomputed when the patch touches - either, so metadata-only patches (e.g. ``is_public``) don't re-read the project or risk - failing on a legacy document missing the unique_column value. + Re-reads the existing document when the patch touches identity inputs, to (a) recompute + ``unique_value`` when ``data``/``project`` change and (b) validate the identifier hierarchy + against the *merged* state when ``material_id``/``chemical_system_id``/``formula``. Metadata-only + patches (e.g. ``is_public``) skip the read entirely, so they don't risk failing on a legacy document + missing the unique_column value. """ set_fields = update.model_dump(exclude_unset=True) - if "data" not in set_fields and "project" not in set_fields: + touches_unique = "data" in set_fields or "project" in set_fields + touches_identity = bool(self._IDENTITY_FIELDS & set_fields.keys()) + if not touches_unique and not touches_identity: return await self._contributions.patch_contribution_by_id(id, update) + existing = await self._contributions.get_contribution_by_id(id, fields=None) if existing is None or existing.project is None: raise NotFoundError(f"contribution '{id}' not found") + + if touches_identity: + self._validate_identifier_hierarchy_merged( + set_fields, + existing_material_id=existing.material_id, + existing_chemical_system_id=existing.chemical_system_id, + existing_formula=existing.formula, + ) + if not touches_unique: + return await self._contributions.patch_contribution_by_id(id, update) + project = set_fields.get("project") or existing.project data = set_fields["data"] if "data" in set_fields else existing.data unique_value = await self._resolve_unique_value(project, data) return await self._contributions.patch_contribution_by_id(id, update, unique_value=unique_value) + @staticmethod + def _validate_identifier_hierarchy_merged( + set_fields: dict, + *, + existing_material_id: str | None, + existing_chemical_system_id: str | None, + existing_formula: str | None, + ) -> None: + """Reject a patch whose merged identity violates chemical_system_id > formula > material_id. + + The merged value of each identity field is the patched value when set (``exclude_unset``, so + an explicit ``null`` counts) and the existing document's value otherwise. + """ + chemical_system_id = ( + set_fields["chemical_system_id"] if "chemical_system_id" in set_fields else existing_chemical_system_id + ) + material_id = set_fields["material_id"] if "material_id" in set_fields else existing_material_id + formula = set_fields["formula"] if "formula" in set_fields else existing_formula + if not chemical_system_id: + raise ValidationError( + "chemical_system_id is required (identifier hierarchy: chemical_system_id > formula > material_id)." + ) + if material_id is not None and formula is None: + raise ValidationError( + "formula is required when material_id is specified " + "(identifier hierarchy: chemical_system_id > formula > material_id).", + material_id=material_id, + ) + async def delete_contributions(self, filter: ContributionFilter) -> BulkDeleteSummary: """Delete a contribution and all of its child components diff --git a/mpcontribs-api/tests/integration/db/test_contributions_repository.py b/mpcontribs-api/tests/integration/db/test_contributions_repository.py index e8c44d56f8..4c528c5dff 100644 --- a/mpcontribs-api/tests/integration/db/test_contributions_repository.py +++ b/mpcontribs-api/tests/integration/db/test_contributions_repository.py @@ -111,6 +111,43 @@ async def test_insert_via_repo(self, db): assert found.material_id == "mp-4001" +# --------------------------------------------------------------------------- +# Identifier hierarchy: chemical_system_id > formula > material_id +# A contribution may stop at the chemical-system level (null material_id/formula). +# --------------------------------------------------------------------------- + + +class TestNullableIdentifierHierarchy: + async def test_chemical_system_only_persists_with_null_identifiers(self, db): + ci = _contrib_in(project="chem-only", material_id=None, formula=None) + doc = Contribution.from_input_model(ci) + result = await _repo().insert_contribution(doc) + found = await Contribution.find_one(Contribution.id == result.id) + assert found is not None + assert found.chemical_system_id == "Fe-O" + # keep_nulls=False strips the absent identity fields; they read back as None. + assert found.material_id is None + assert found.formula is None + + async def test_existing_identities_matches_null_identity(self, db): + ci = _contrib_in(project="chem-only", material_id=None, formula=None) + await _repo().insert_contribution(Contribution.from_input_model(ci)) + key = ci.identity().as_tuple() + found = await _repo().existing_identities([key]) + assert key in found + + async def test_duplicate_chemical_system_only_collides_on_unique_index(self, db): + from pymongo.errors import DuplicateKeyError + + ci = _contrib_in(project="chem-only", material_id=None, formula=None) + await _repo().insert_contribution(Contribution.from_input_model(ci)) + dup = _contrib_in(project="chem-only", material_id=None, formula=None) + # Same (project, chemical_system_id) with null material_id/formula/unique_value is one + # unique key — the second insert must be rejected. + with pytest.raises(DuplicateKeyError): + await _repo().insert_contribution(Contribution.from_input_model(dup)) + + # --------------------------------------------------------------------------- # insert_many_contributions (bulk) # --------------------------------------------------------------------------- diff --git a/mpcontribs-api/tests/unit/domains/test_contribution_service.py b/mpcontribs-api/tests/unit/domains/test_contribution_service.py index b85b4f1b8b..3797ebcf81 100644 --- a/mpcontribs-api/tests/unit/domains/test_contribution_service.py +++ b/mpcontribs-api/tests/unit/domains/test_contribution_service.py @@ -10,7 +10,7 @@ from mpcontribs_api.authz import ADMIN_GROUP, User from mpcontribs_api.config import MongoSettings from mpcontribs_api.domains.attachments.models import Attachment, AttachmentIn -from mpcontribs_api.domains.contributions.models import Contribution, ContributionIn +from mpcontribs_api.domains.contributions.models import Contribution, ContributionIn, ContributionPatch from mpcontribs_api.domains.contributions.service import ContributionService from mpcontribs_api.domains.structures.models import ( Lattice, @@ -1128,3 +1128,53 @@ async def test_none_component_fields_do_not_raise(self): struct_repo.delete_by_ids.assert_not_called() table_repo.delete_by_ids.assert_not_called() attach_repo.delete_by_ids.assert_not_called() + + +# --------------------------------------------------------------------------- +# patch_contribution_by_id — identifier hierarchy on the merged state +# --------------------------------------------------------------------------- + + +def _existing_doc(*, material_id, chemical_system_id, formula, project="proj"): + """A stand-in for the persisted document that patch re-reads to validate the merged identity.""" + return SimpleNamespace( + id=_oid(), + project=project, + material_id=material_id, + chemical_system_id=chemical_system_id, + formula=formula, + data={}, + ) + + +class TestPatchIdentifierHierarchy: + async def test_patch_material_id_onto_doc_without_formula_raises(self): + svc, contrib_repo, *_ = _make_service() + existing = _existing_doc(material_id=None, chemical_system_id="Fe-O", formula=None) + contrib_repo.get_contribution_by_id.return_value = existing + + with pytest.raises(ValidationError, match="formula is required when material_id"): + await svc.patch_contribution_by_id(str(existing.id), ContributionPatch(material_id="mp-1")) + + # Rejected before any write. + contrib_repo.patch_contribution_by_id.assert_not_called() + + async def test_patch_material_id_when_existing_has_formula_ok(self): + svc, contrib_repo, *_ = _make_service() + existing = _existing_doc(material_id=None, chemical_system_id="Fe-O", formula="Fe2O3") + contrib_repo.get_contribution_by_id.return_value = existing + contrib_repo.patch_contribution_by_id.return_value = MagicMock(spec=Contribution) + + await svc.patch_contribution_by_id(str(existing.id), ContributionPatch(material_id="mp-1")) + + contrib_repo.patch_contribution_by_id.assert_called_once() + + async def test_metadata_only_patch_skips_existing_read(self): + svc, contrib_repo, *_ = _make_service() + contrib_repo.patch_contribution_by_id.return_value = MagicMock(spec=Contribution) + + await svc.patch_contribution_by_id("some-id", ContributionPatch(is_public=True)) + + # No identity/unique inputs touched -> no re-read, straight to the plain patch. + contrib_repo.get_contribution_by_id.assert_not_called() + contrib_repo.patch_contribution_by_id.assert_called_once() diff --git a/mpcontribs-api/tests/unit/domains/test_contributions_models.py b/mpcontribs-api/tests/unit/domains/test_contributions_models.py index eda0d2aced..9e0a44cd9c 100644 --- a/mpcontribs-api/tests/unit/domains/test_contributions_models.py +++ b/mpcontribs-api/tests/unit/domains/test_contributions_models.py @@ -84,17 +84,19 @@ def test_missing_project_raises(self): } ) - def test_missing_formula_raises(self): - with pytest.raises(PydanticValidationError): - ContributionIn( - **{ - "_id": PydanticObjectId(), - "project": "proj", - "material_id": "mp-001", - "chemical_system_id": "Fe-O", - "data": {}, - } - ) + def test_formula_optional_when_no_material_id(self): + # formula is no longer unconditionally required: a chemical-system-level contribution is + # valid (identifier hierarchy: chemical_system_id > formula > material_id). + contrib = ContributionIn( + **{ + "_id": PydanticObjectId(), + "project": "proj", + "chemical_system_id": "Fe-O", + "data": {}, + } + ) + assert contrib.formula is None + assert contrib.material_id is None def test_data_can_be_empty_dict(self): contrib = _make_contribution_in(data={}) @@ -220,6 +222,39 @@ def test_patch_identifiers_stay_optional(self): assert patch.formula is None +class TestIdentifierHierarchy: + """chemical_system_id > formula > material_id: each level requires the ones above it.""" + + def _build(self, **identity): + return ContributionIn( + _id=PydanticObjectId(), project="proj", data={}, **identity + ) + + def test_chemical_system_only_is_valid(self): + contrib = self._build(chemical_system_id="Fe-O") + assert contrib.chemical_system_id == "Fe-O" + assert contrib.formula is None + assert contrib.material_id is None + + def test_chemical_system_and_formula_is_valid(self): + contrib = self._build(chemical_system_id="Fe-O", formula="Fe2O3") + assert contrib.formula == "Fe2O3" + assert contrib.material_id is None + + def test_full_triple_is_valid(self): + contrib = self._build(chemical_system_id="Fe-O", formula="Fe2O3", material_id="mp-1") + assert contrib.material_id == "mp-1" + + def test_material_id_without_formula_raises(self): + with pytest.raises(ValidationError, match="formula is required when material_id"): + self._build(chemical_system_id="Fe-O", material_id="mp-1") + + def test_missing_chemical_system_raises(self): + # chemical_system_id is required by its type, so omitting it is a Pydantic error. + with pytest.raises(PydanticValidationError): + self._build(formula="Fe2O3") + + # --------------------------------------------------------------------------- # Contribution.from_input_model # --------------------------------------------------------------------------- From d9fef1915fc0065bdc0655c010b996a3dc1440dd Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 27 Jul 2026 14:19:34 -0700 Subject: [PATCH 511/591] Ignore build dirs from basedpyright --- mpcontribs-api/pyproject.toml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mpcontribs-api/pyproject.toml b/mpcontribs-api/pyproject.toml index 87f12d487a..7902638f50 100644 --- a/mpcontribs-api/pyproject.toml +++ b/mpcontribs-api/pyproject.toml @@ -92,4 +92,6 @@ max-line-length = 120 pythonVersion = "3.14" typeCheckingMode = "standard" extraPaths = ["src"] -ignore=["tests/"] +# "build/" is a setuptools build artifact (gitignored); type-checking its stale copies produces +# phantom errors against superseded source. +ignore=["tests/", "build/"] From 5f861d272eb4475aef00f96e6e4717d9aa5ebb53 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 27 Jul 2026 15:05:44 -0700 Subject: [PATCH 512/591] Extracted identifier hierarchy check to Identity --- .../domains/contributions/models.py | 27 +++++++++++-------- .../domains/contributions/repository.py | 5 ++-- .../domains/contributions/service.py | 22 +++++---------- 3 files changed, 26 insertions(+), 28 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py index cbb57ef0e5..396d404fdd 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py @@ -194,6 +194,20 @@ def projection(cls) -> dict[str, int]: """A Mongo projection selecting exactly the identity fields.""" return {f.name: 1 for f in fields(cls)} + @staticmethod + def check_hierarchy(material_id: str | None, chemical_system_id: str | None, formula: str | None) -> None: + """Enforce the identifier specificity hierarchy ``chemical_system_id`` > ``formula`` > ``material_id.""" + if not chemical_system_id: + raise ValidationError( + "chemical_system_id is required (identifier hierarchy: chemical_system_id > formula > material_id)." + ) + if material_id is not None and formula is None: + raise ValidationError( + "formula is required when material_id is specified " + "(identifier hierarchy: chemical_system_id > formula > material_id).", + material_id=material_id, + ) + class ContributionBase(BaseDocumentWithInput[PydanticObjectId]): """Shared settings and fields for Contribution, ContributionIn, and ContributionOut.""" @@ -287,17 +301,8 @@ class ContributionIn(ContributionBase): @model_validator(mode="after") def _check_identifier_hierarchy(self) -> ContributionIn: - """Enforce ``chemical_system_id`` > ``formula`` > ``material_id``. - - ``chemical_system_id`` is required - ``material_id`` requires ``formula`` to be specified - """ - if self.material_id is not None and self.formula is None: - raise ValidationError( - "formula is required when material_id is specified " - "(identifier hierarchy: chemical_system_id > formula > material_id).", - material_id=self.material_id, - ) + """Enforce ``chemical_system_id`` > ``formula`` > ``material_id`` (see :meth:`Identity.check_hierarchy`).""" + Identity.check_hierarchy(self.material_id, self.chemical_system_id, self.formula) return self def has_components(self) -> bool: diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py index 196b5caa0e..cff38630eb 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py @@ -157,7 +157,8 @@ async def existing_identities(self, keys: list[IdentityKey]) -> set[IdentityKey] (the empty-``unique_column`` case, since ``keep_nulls=False`` strips it). Args: - keys: identity tuples (project, material_id, chemical_system_id, formula, unique_value) + keys: identity tuples (project, material_id, chemical_system_id, formula, unique_value, + condition_key) Returns: set[IdentityKey]: the subset of ``keys`` already present @@ -259,7 +260,7 @@ async def upsert_contribution_by_identifiers( """Atomically upsert a Contribution by its full identity. Relies on the unique index over (project, material_id, chemical_system_id, formula, - unique_value) so that concurrent requests targeting the same identity cannot both win the + unique_value, condition_key) so that concurrent requests targeting the same identity cannot both win the insert branch. Fields the caller did not set are not touched (partial update). On insert a fresh Contribution document is written with ``is_public=False``. diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py index dba33ecf6b..109f488912 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py @@ -24,6 +24,7 @@ ContributionFilter, ContributionIn, ContributionPatch, + Identity, IdentityKey, Scalar, extract_unique_value, @@ -95,8 +96,8 @@ async def insert_contributions( ``settings.mongo.max_concurrent_transactions``. Per-item failures are returned in the summary's ``failed`` list; the request as a whole does not raise on partial failure. - A duplicate identity ``(project, material_id, chemical_system_id, formula, unique_value)`` - is rejected as a conflict. See ``_resolve_identity``. + A duplicate identity ``(project, material_id, chemical_system_id, formula, unique_value, + condition_key)`` is rejected as a conflict. See ``_resolve_identity``. Args: contributions: contributions to insert; may include nested structures/tables/attachments @@ -167,9 +168,9 @@ async def _resolve_identity( """Resolve each contribution's identity (``unique_value``) and reject duplicates. A project designates at most one ``unique_column``; its value is promoted from the - contribution's ``data`` to ``unique_value``, the tail of the identity tuple - ``(project, material_id, chemical_system_id, formula, unique_value)``. A contribution is - rejected when: + contribution's ``data`` to ``unique_value`` in the identity tuple + ``(project, material_id, chemical_system_id, formula, unique_value, condition_key)``. A + contribution is rejected when: - its ``project`` is not found or not accessible; - the project sets a ``unique_column`` but the value is missing or non-scalar; or @@ -574,16 +575,7 @@ def _validate_identifier_hierarchy_merged( ) material_id = set_fields["material_id"] if "material_id" in set_fields else existing_material_id formula = set_fields["formula"] if "formula" in set_fields else existing_formula - if not chemical_system_id: - raise ValidationError( - "chemical_system_id is required (identifier hierarchy: chemical_system_id > formula > material_id)." - ) - if material_id is not None and formula is None: - raise ValidationError( - "formula is required when material_id is specified " - "(identifier hierarchy: chemical_system_id > formula > material_id).", - material_id=material_id, - ) + Identity.check_hierarchy(material_id, chemical_system_id, formula) async def delete_contributions(self, filter: ContributionFilter) -> BulkDeleteSummary: """Delete a contribution and all of its child components From d3a640e2b5e8c8a4ba845f886044a46ca266fd50 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 27 Jul 2026 15:14:31 -0700 Subject: [PATCH 513/591] Caught error in contribution/repositry:update_contribution_by_id where an update to the identity fields collides with a preexisting identity --- .../domains/contributions/models.py | 8 ----- .../domains/contributions/repository.py | 33 +++++++++++-------- .../domains/contributions/service.py | 2 +- .../db/test_contributions_repository.py | 11 ++++++- 4 files changed, 31 insertions(+), 23 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py index 396d404fdd..f0d747a30a 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py @@ -132,14 +132,6 @@ class Identity: Field declaration order IS the identity/index column order: ``as_tuple``, ``index_model``, and ``projection`` iterate ``dataclasses.fields`` in that order, so the order is declared exactly once (below). Reordering the fields reorders the unique index — a schema change, not a cosmetic edit. - - ``unique_value`` is the project's ``unique_column`` value promoted onto the document (``None`` when - the project sets no ``unique_column``); ``condition_key`` is the pivot discriminator, ``""`` until - pivoting is wired in. - - ``material_id`` and ``formula`` are nullable: identifiers follow a specificity hierarchy - (``chemical_system_id`` > ``formula`` > ``material_id``), so a contribution may stop at the - chemical-system or formula level. """ # WARNING: the order the fields are specified in reflects their ordering for indices. Changing the order diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py index cff38630eb..0c7cccae21 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py @@ -5,6 +5,7 @@ from beanie import PydanticObjectId, UpdateResponse from beanie.operators import Set from pymongo.asynchronous.client_session import AsyncClientSession +from pymongo.errors import DuplicateKeyError from pymongo.results import DeleteResult from types_aiobotocore_s3 import S3Client @@ -21,7 +22,7 @@ IdentityKey, Scalar, ) -from mpcontribs_api.exceptions import NotFoundError +from mpcontribs_api.exceptions import ConflictError, NotFoundError from mpcontribs_api.pagination import CursorParams # Sentinel for "leave unique_value untouched" on patch (distinct from a real None value). @@ -77,18 +78,24 @@ async def patch_contribution_by_id( ``project`` (the inputs to identity); left as ``_UNSET`` it is not touched. When set, it is folded into the ``$set`` so the identity index stays consistent with the patched ``data``. """ - if unique_value is _UNSET: - return await self.patch(self._convert_object_id(id), update) - update_data = update.model_dump(exclude_unset=True) - update_data["unique_value"] = unique_value - query = self.document_model.find_one( - self._scope, - self.document_model.id == self._convert_object_id(id), - ).update(Set(update_data), response_type=UpdateResponse.NEW_DOCUMENT) - updated = await query # pyright: ignore[reportGeneralTypeIssues] # beanie UpdateQuery is awaitable - if updated is None: - raise NotFoundError(self._not_found(id)) - return updated + try: + if unique_value is _UNSET: + return await self.patch(self._convert_object_id(id), update) + update_data = update.model_dump(exclude_unset=True) + update_data["unique_value"] = unique_value + query = self.document_model.find_one( + self._scope, + self.document_model.id == self._convert_object_id(id), + ).update(Set(update_data), response_type=UpdateResponse.NEW_DOCUMENT) + updated = await query # pyright: ignore[reportGeneralTypeIssues] # beanie UpdateQuery is awaitable + if updated is None: + raise NotFoundError(self._not_found(id)) + return updated + except DuplicateKeyError as err: + raise ConflictError( + f"contribution '{id}' cannot be patched: the resulting identity already exists", + id=id, + ) from err async def delete_contribution_by_id(self, id: str) -> None: """Delete a contribution by id, scoped to the current user. See ``delete_by_id``.""" diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py index 109f488912..82678d0a81 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py @@ -173,7 +173,7 @@ async def _resolve_identity( contribution is rejected when: - its ``project`` is not found or not accessible; - - the project sets a ``unique_column`` but the value is missing or non-scalar; or + - the project sets a ``unique_column`` but the value is missing or non-scalar - (insert only) its identity collides with an existing document or with an earlier item in this batch. Collisions are conflicts, never silently disambiguated. diff --git a/mpcontribs-api/tests/integration/db/test_contributions_repository.py b/mpcontribs-api/tests/integration/db/test_contributions_repository.py index 4c528c5dff..aa2262e2d7 100644 --- a/mpcontribs-api/tests/integration/db/test_contributions_repository.py +++ b/mpcontribs-api/tests/integration/db/test_contributions_repository.py @@ -10,7 +10,7 @@ ContributionPatch, ) from mpcontribs_api.domains.contributions.repository import MongoDbContributionRepository -from mpcontribs_api.exceptions import NotFoundError, ValidationError +from mpcontribs_api.exceptions import ConflictError, NotFoundError, ValidationError from mpcontribs_api.pagination import CursorParams pytestmark = [pytest.mark.db, pytest.mark.asyncio(loop_scope="session")] @@ -465,6 +465,15 @@ async def test_anon_cannot_patch_private_doc(self, db): with pytest.raises(NotFoundError): await _repo(ANON).patch_contribution_by_id(str(doc.id), ContributionPatch(formula="Fe2O3")) + async def test_patch_onto_existing_identity_raises_conflict(self, db): + # Two contributions differing only by material_id, so distinct identities. + await _insert(project="patch-dup", identifier="mp-100") + victim = await _insert(project="patch-dup", identifier="mp-200") + # Patching victim's material_id onto the first doc's makes the identities collide; the unique + # index rejects the write, which the repo surfaces as a ConflictError (409) not a raw 500. + with pytest.raises(ConflictError): + await _repo(ADMIN).patch_contribution_by_id(str(victim.id), ContributionPatch(material_id="mp-100")) + # --------------------------------------------------------------------------- # delete_contribution_by_id From 36fb5cc5d5433d089386c73caaba948803d9137c Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 27 Jul 2026 15:19:21 -0700 Subject: [PATCH 514/591] Removed unused find_one_contribution method and associated tests --- .../domains/contributions/repository.py | 20 ----------- .../db/test_contributions_repository.py | 36 ------------------- .../unit/domains/test_contribution_service.py | 2 -- 3 files changed, 58 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py index 0c7cccae21..97efef5815 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py @@ -134,26 +134,6 @@ async def insert_contribution( await doc.insert(session=session) return doc - async def find_one_contribution( - self, - project: str, - material_id: str, - chemical_system_id: str, - formula: str, - unique_value: Scalar | None = None, - condition_key: str = "", - ) -> Contribution | None: - """Find a single contribution by its full identity, scoped to the current user.""" - return await self.document_model.find_one( - self._scope, - self.document_model.project == project, - self.document_model.material_id == material_id, - self.document_model.chemical_system_id == chemical_system_id, - self.document_model.formula == formula, - self.document_model.unique_value == unique_value, - self.document_model.condition_key == condition_key, - ) - async def existing_identities(self, keys: list[IdentityKey]) -> set[IdentityKey]: """Return the subset of identity tuples that already exist, scoped to the user. diff --git a/mpcontribs-api/tests/integration/db/test_contributions_repository.py b/mpcontribs-api/tests/integration/db/test_contributions_repository.py index aa2262e2d7..879c23554c 100644 --- a/mpcontribs-api/tests/integration/db/test_contributions_repository.py +++ b/mpcontribs-api/tests/integration/db/test_contributions_repository.py @@ -359,42 +359,6 @@ async def test_projection_limits_fields(self, db): assert not hasattr(result, "data") -# --------------------------------------------------------------------------- -# find_one_contribution (by full identity) -# --------------------------------------------------------------------------- - - -class TestFindOneContribution: - async def test_finds_existing_doc(self, db): - await _insert(project="find-proj", identifier="find-id") - result = await _repo(ADMIN).find_one_contribution("find-proj", "find-id", "Fe-O", "Fe2O3") - assert result is not None - assert result.project == "find-proj" - assert result.material_id == "find-id" - - async def test_returns_none_for_missing_combination(self, db): - await _insert(project="miss-proj", identifier="miss-id") - result = await _repo(ADMIN).find_one_contribution("miss-proj", "wrong-id", "Fe-O", "Fe2O3") - assert result is None - - async def test_scope_prevents_anon_finding_private(self, db): - await _insert(project="anon-scope", identifier="priv-doc", is_public=False) - result = await _repo(ANON).find_one_contribution("anon-scope", "priv-doc", "Fe-O", "Fe2O3") - assert result is None - - async def test_scope_allows_anon_finding_public(self, db): - await _insert(project="anon-scope-pub", identifier="pub-doc", is_public=True) - result = await _repo(ANON).find_one_contribution("anon-scope-pub", "pub-doc", "Fe-O", "Fe2O3") - assert result is not None - - async def test_full_identity_is_unique_lookup(self, db): - await _insert(project="same-proj", identifier="id-a") - await _insert(project="same-proj", identifier="id-b") - result = await _repo(ADMIN).find_one_contribution("same-proj", "id-a", "Fe-O", "Fe2O3") - assert result is not None - assert result.material_id == "id-a" - - # --------------------------------------------------------------------------- # update_contribution # --------------------------------------------------------------------------- diff --git a/mpcontribs-api/tests/unit/domains/test_contribution_service.py b/mpcontribs-api/tests/unit/domains/test_contribution_service.py index 3797ebcf81..d1fe1282ac 100644 --- a/mpcontribs-api/tests/unit/domains/test_contribution_service.py +++ b/mpcontribs-api/tests/unit/domains/test_contribution_service.py @@ -657,7 +657,6 @@ async def test_raises_before_any_db_write(self): with pytest.raises(ValidationError): await svc.upsert_contributions([dirty]) contrib_repo.upsert_contribution_by_identifiers.assert_not_called() - contrib_repo.find_one_contribution.assert_not_called() contrib_repo.insert_contribution.assert_not_called() contrib_repo.update_contribution.assert_not_called() @@ -680,7 +679,6 @@ async def test_calls_atomic_repo_method_once_per_item(self): assert summary.failed == [] assert contrib_repo.upsert_contribution_by_identifiers.call_count == 3 # The legacy read-then-write path must not be used - contrib_repo.find_one_contribution.assert_not_called() contrib_repo.update_contribution.assert_not_called() contrib_repo.insert_contribution.assert_not_called() From c07a934927519f8c7dde4014e14096de354d0279 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 27 Jul 2026 15:31:27 -0700 Subject: [PATCH 515/591] Catch DuplicateKeyErrors in bulk scenarios --- .../mpcontribs_api/domains/_shared/bulk.py | 16 +++++++--- .../domains/contributions/repository.py | 30 ++++++++++++------- .../db/test_contributions_repository.py | 20 +++++++++++++ .../tests/unit/domains/test_shared_bulk.py | 9 ++++++ 4 files changed, 61 insertions(+), 14 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/bulk.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/bulk.py index 4284563981..2837c8dbec 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/bulk.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/bulk.py @@ -1,8 +1,9 @@ from typing import Any from pydantic import BaseModel +from pymongo.errors import DuplicateKeyError -from mpcontribs_api.exceptions import AppError +from mpcontribs_api.exceptions import AppError, ConflictError class BulkFailure(BaseModel): @@ -35,10 +36,17 @@ class BulkDeleteSummary(BaseModel): def bulk_failure_from_exception(index: int, identifier: dict[str, Any] | None, exc: BaseException) -> BulkFailure: """Translate any exception into a BulkFailure entry. - ``AppError`` subclasses contribute their ``error_code`` and ``message``; everything else - collapses to ``internal_error`` with the exception class name in the message so we don't - leak tracebacks or framework internals to the client. + ``AppError`` subclasses contribute their ``error_code`` and ``message``. A raw pymongo + ``DuplicateKeyError`` (a unique-index violation, e.g. a colliding identity on the transactional + insert or upsert paths) maps to ``conflict`` """ if isinstance(exc, AppError): return BulkFailure(index=index, identifier=identifier, error_code=exc.error_code, message=exc.message) + if isinstance(exc, DuplicateKeyError): + return BulkFailure( + index=index, + identifier=identifier, + error_code=ConflictError.error_code, + message="a resource with these identifiers already exists", + ) return BulkFailure(index=index, identifier=identifier, error_code="internal_error", message=type(exc).__name__) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py index 97efef5815..ea33c4622d 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py @@ -287,7 +287,9 @@ async def upsert_contribution_by_id( If a Contribution with this id exists it is updated, otherwise inserted. ``unique_value`` is server-resolved by the service from the project's ``unique_column`` and stamped on the doc so - the identity index stays correct. + the identity index stays correct. Because it is server-owned it is forced into the ``$set`` + (bypassing ``exclude_none``), so re-resolving to ``None`` clears a previously-stored value on + update rather than leaving it stale. Args: id (str): the id of the Contribution to upsert @@ -298,15 +300,23 @@ async def upsert_contribution_by_id( ContributionOut: the upserted document""" doc = self.document_model.from_input_model(contribution) doc.unique_value = unique_value - query = self.document_model.find_one( - self._scope, - self.document_model.id == self._convert_object_id(id), - ).upsert( - Set(doc.model_dump(exclude={"id"}, exclude_none=True)), - on_insert=doc, - response_type=UpdateResponse.NEW_DOCUMENT, - ) - return await query # pyright: ignore[reportGeneralTypeIssues] # beanie UpdateQuery is awaitable, but pyright doesn't see it + update_data = doc.model_dump(exclude={"id"}, exclude_none=True) + update_data["unique_value"] = unique_value + try: + query = self.document_model.find_one( + self._scope, + self.document_model.id == self._convert_object_id(id), + ).upsert( + Set(update_data), + on_insert=doc, + response_type=UpdateResponse.NEW_DOCUMENT, + ) + return await query # pyright: ignore[reportGeneralTypeIssues] # beanie UpdateQuery is awaitable, but pyright doesn't see it + except DuplicateKeyError as err: + raise ConflictError( + f"contribution '{id}' cannot be upserted: the resulting identity already exists", + id=id, + ) from err async def download_contributions( self, diff --git a/mpcontribs-api/tests/integration/db/test_contributions_repository.py b/mpcontribs-api/tests/integration/db/test_contributions_repository.py index 879c23554c..b54eaa6636 100644 --- a/mpcontribs-api/tests/integration/db/test_contributions_repository.py +++ b/mpcontribs-api/tests/integration/db/test_contributions_repository.py @@ -523,6 +523,26 @@ async def test_update_when_id_present_applies_change(self, db): assert stored is not None assert stored.formula == "Li2O" + async def test_update_clears_unique_value_when_resolved_to_none(self, db): + # A doc previously stamped with a unique_value whose project later drops its unique_column: + # re-resolving to None must clear the stored value, not leave it stale (exclude_none would). + existing = await _insert(identifier="mp-4004", unique_value="batch-A") + assert existing.unique_value == "batch-A" + payload = _contrib_in(identifier="mp-4004", _id=existing.id) + await _repo(ADMIN).upsert_contribution_by_id(str(existing.id), payload, unique_value=None) + stored = await Contribution.find_one(Contribution.id == existing.id) + assert stored is not None + assert stored.unique_value is None + + async def test_upsert_onto_existing_identity_raises_conflict(self, db): + # Two docs differing only by material_id; PUTting victim's identity onto the first's collides + # on the unique index, which the repo surfaces as a ConflictError (409) not a raw 500. + await _insert(project="uid-dup", identifier="mp-100") + victim = await _insert(project="uid-dup", identifier="mp-200") + payload = _contrib_in(project="uid-dup", identifier="mp-100", _id=victim.id) + with pytest.raises(ConflictError): + await _repo(ADMIN).upsert_contribution_by_id(str(victim.id), payload) + class TestDeleteByIdsScope: async def test_anon_cannot_delete_out_of_scope_ids(self, db): diff --git a/mpcontribs-api/tests/unit/domains/test_shared_bulk.py b/mpcontribs-api/tests/unit/domains/test_shared_bulk.py index 32b900839c..3fd3eb6cb5 100644 --- a/mpcontribs-api/tests/unit/domains/test_shared_bulk.py +++ b/mpcontribs-api/tests/unit/domains/test_shared_bulk.py @@ -103,6 +103,15 @@ def test_app_error_default_message_is_class_name(self): failure = bulk_failure_from_exception(0, None, ConflictError()) assert failure.message == "ConflictError" + def test_duplicate_key_error_maps_to_conflict(self): + # A raw pymongo unique-index violation is a conflict (409), not an internal error, matching + # the ordered=False bulk-insert path's handling of duplicate-key (11000) writeErrors. + from pymongo.errors import DuplicateKeyError + + failure = bulk_failure_from_exception(1, None, DuplicateKeyError("E11000 duplicate key")) + assert failure.error_code == "conflict" + assert "already exists" in failure.message + def test_generic_exception_collapses_to_internal_error(self): failure = bulk_failure_from_exception(1, None, RuntimeError("secret traceback details")) assert failure.error_code == "internal_error" From d514e2ef492bcc56f8efd1500b0a24bf93ba2adf Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 27 Jul 2026 15:59:30 -0700 Subject: [PATCH 516/591] Added HIERARCHY_FIELDS to Identity and removed unused from_/to_tuple logic --- .../mpcontribs_api/domains/_shared/types.py | 2 -- .../domains/contributions/models.py | 35 +++++-------------- .../domains/contributions/repository.py | 25 ++++++------- .../domains/contributions/service.py | 14 +++----- .../db/test_contributions_repository.py | 2 +- .../unit/domains/test_contribution_service.py | 11 ++++-- 6 files changed, 34 insertions(+), 55 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py index 9a9a24592d..f1294abb71 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py @@ -82,8 +82,6 @@ def _validate_formula(v: str | None) -> str | None: """ if v is None: return None - if not isinstance(v, str): - raise ValidationError(f"formula must be a string, got '{type(v).__name__}'", formula=v) s = unicodedata.normalize("NFKC", v).strip() if not s: raise ValidationError("formula must not be empty", formula=v) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py index f0d747a30a..4b5302104d 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py @@ -2,7 +2,7 @@ from collections.abc import Mapping from dataclasses import dataclass, fields from datetime import UTC, datetime -from typing import Annotated, Any, cast +from typing import Annotated, Any, ClassVar from warnings import deprecated from beanie import ( @@ -79,11 +79,6 @@ def _validate_nested_keys(value: Any) -> None: Scalar = str | int | float | bool -# Identity in index order: project, material_id, chemical_system_id, formula, unique_value, -# condition_key. material_id/formula are nullable (identifier hierarchy); condition_key is "" until -# pivoting is wired in (contrib-data-handling merge). -IdentityKey = tuple[str, str | None, str, str | None, Scalar | None, str] - def _value_at(data: dict[str, Any], path: str) -> Any: """Resolve a dotted ``path`` inside ``data``; raises ``KeyError`` if any segment is absent.""" @@ -129,9 +124,8 @@ def extract_unique_value(data: dict[str, Any] | None, unique_column: str) -> Sca class Identity: """The full identity of a Contribution. - Field declaration order IS the identity/index column order: ``as_tuple``, ``index_model``, and - ``projection`` iterate ``dataclasses.fields`` in that order, so the order is declared exactly once - (below). Reordering the fields reorders the unique index — a schema change, not a cosmetic edit. + Field declaration order IS the identity/index column order: ``index_model`` and ``projection`` + iterate ``dataclasses.fields`` in that order, so the order is declared exactly once (below). """ # WARNING: the order the fields are specified in reflects their ordering for indices. Changing the order @@ -143,27 +137,10 @@ class Identity: unique_value: Scalar | None = None condition_key: str = "" - def as_tuple(self) -> IdentityKey: - """Identity as a hashable tuple in index order (for set membership / dedup).""" - return cast(IdentityKey, tuple(getattr(self, f.name) for f in fields(self))) - def as_dict(self) -> dict[str, Any]: """Identity as a flat dict keyed by field name (for Mongo match clauses and upsert).""" return {f.name: getattr(self, f.name) for f in fields(self)} - @classmethod - def from_tuple(cls, key: IdentityKey) -> Identity: - """Rebuild from an ``as_tuple()`` value. ``IdentityKey`` is fixed-shape in ``FIELDS`` order.""" - project, material_id, chemical_system_id, formula, unique_value, condition_key = key - return cls( - project=project, - material_id=material_id, - chemical_system_id=chemical_system_id, - formula=formula, - unique_value=unique_value, - condition_key=condition_key, - ) - @classmethod def from_document(cls, doc: Mapping[str, Any]) -> Identity: """Build from a raw Mongo document/projection, tolerating null-stripped fields.""" @@ -186,6 +163,10 @@ def projection(cls) -> dict[str, int]: """A Mongo projection selecting exactly the identity fields.""" return {f.name: 1 for f in fields(cls)} + # The identifier fields governed by the specificity hierarchy enforced in ``check_hierarchy`` + # (excludes ``project``/``unique_value``/``condition_key``, which don't participate). + HIERARCHY_FIELDS: ClassVar[frozenset[str]] = frozenset({"material_id", "chemical_system_id", "formula"}) + @staticmethod def check_hierarchy(material_id: str | None, chemical_system_id: str | None, formula: str | None) -> None: """Enforce the identifier specificity hierarchy ``chemical_system_id`` > ``formula`` > ``material_id.""" @@ -240,7 +221,7 @@ class Contribution(ContributionBase): # unique_column, in which case the identity is the (project, material_id, chemical_system_id, # formula) tuple. Never trusted from the request body. unique_value: Scalar | None = None - # Server-owned pivot-condition discriminator; "" until pivoting is wired in (see IdentityKey). + # Server-owned pivot-condition discriminator; "" until pivoting is wired in (see Identity). condition_key: str = "" structures: list[Link[Structure]] | None = None tables: list[Link[Table]] | None = None diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py index ea33c4622d..b8026579e8 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py @@ -19,7 +19,6 @@ ContributionOut, ContributionPatch, Identity, - IdentityKey, Scalar, ) from mpcontribs_api.exceptions import ConflictError, NotFoundError @@ -134,32 +133,30 @@ async def insert_contribution( await doc.insert(session=session) return doc - async def existing_identities(self, keys: list[IdentityKey]) -> set[IdentityKey]: - """Return the subset of identity tuples that already exist, scoped to the user. + async def existing_identities(self, identities: list[Identity]) -> set[Identity]: + """Return the subset of identities that already exist, scoped to the user. One query answers the whole batch so the write path avoids a round-trip per contribution. Scope is merged into the match (mirroring :meth:`referenced_component_ids`); a writer sees - every contribution in their own project, so this equals the global existence check for keys - they may write. A null ``unique_value`` matches documents where the field is null or absent - (the empty-``unique_column`` case, since ``keep_nulls=False`` strips it). + every contribution in their own project, so this equals the global existence check for + identities they may write. A null ``unique_value`` matches documents where the field is null + or absent (the empty-``unique_column`` case, since ``keep_nulls=False`` strips it). Args: - keys: identity tuples (project, material_id, chemical_system_id, formula, unique_value, - condition_key) + identities: the identities to test for existence Returns: - set[IdentityKey]: the subset of ``keys`` already present + set[Identity]: the subset of ``identities`` already present """ - if not keys: + if not identities: return set() - ors = [Identity.from_tuple(key).as_dict() for key in keys] - match: dict[str, Any] = {"$or": ors} + match: dict[str, Any] = {"$or": [identity.as_dict() for identity in identities]} if self._scope: match = {"$and": [self._scope, match]} collection = self.document_model.get_pymongo_collection() - found: set[IdentityKey] = set() + found: set[Identity] = set() async for doc in collection.find(match, Identity.projection()): - found.add(Identity.from_document(doc).as_tuple()) + found.add(Identity.from_document(doc)) return found async def referenced_component_ids( diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py index 82678d0a81..5ca34a504a 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py @@ -25,7 +25,6 @@ ContributionIn, ContributionPatch, Identity, - IdentityKey, Scalar, extract_unique_value, ) @@ -196,7 +195,7 @@ async def _resolve_identity( # First pass: validate accessibility + resolve each unique_value, collecting identity tuples # so the existence check can be batched into a single query. resolved: list[tuple[int, ContributionIn, Scalar | None]] = [] - keys: list[IdentityKey] = [] + keys: list[Identity] = [] for i in indices: contrib = contributions[i] if contrib.project not in unique_columns: @@ -237,7 +236,7 @@ async def _resolve_identity( continue resolved.append((i, contrib, unique_value)) - keys.append(contrib.identity(unique_value).as_tuple()) + keys.append(contrib.identity(unique_value)) # Second pass (insert only): reject identity collisions against existing docs and earlier # items in this batch. Upsert skips this — an existing identity is the update target and the @@ -247,9 +246,9 @@ async def _resolve_identity( return failures, plan existing = await self._contributions.existing_identities(keys) - seen: set[IdentityKey] = set() + seen: set[Identity] = set() for i, contrib, unique_value in resolved: - key: IdentityKey = contrib.identity(unique_value).as_tuple() + key: Identity = contrib.identity(unique_value) if key in existing or key in seen: failures.append( BulkFailure( @@ -520,9 +519,6 @@ async def upsert_contribution_by_id(self, id: str, contribution: ContributionIn) unique_value = await self._resolve_unique_value(contribution.project, contribution.data) return await self._contributions.upsert_contribution_by_id(id, contribution, unique_value) - # Identity fields subject to the specificity hierarchy chemical_system_id > formula > material_id. - _IDENTITY_FIELDS = frozenset({"material_id", "chemical_system_id", "formula"}) - async def patch_contribution_by_id(self, id: str, update: ContributionPatch) -> Contribution: """Patch a single contribution by id. @@ -534,7 +530,7 @@ async def patch_contribution_by_id(self, id: str, update: ContributionPatch) -> """ set_fields = update.model_dump(exclude_unset=True) touches_unique = "data" in set_fields or "project" in set_fields - touches_identity = bool(self._IDENTITY_FIELDS & set_fields.keys()) + touches_identity = bool(Identity.HIERARCHY_FIELDS & set_fields.keys()) if not touches_unique and not touches_identity: return await self._contributions.patch_contribution_by_id(id, update) diff --git a/mpcontribs-api/tests/integration/db/test_contributions_repository.py b/mpcontribs-api/tests/integration/db/test_contributions_repository.py index b54eaa6636..31671b1c56 100644 --- a/mpcontribs-api/tests/integration/db/test_contributions_repository.py +++ b/mpcontribs-api/tests/integration/db/test_contributions_repository.py @@ -132,7 +132,7 @@ async def test_chemical_system_only_persists_with_null_identifiers(self, db): async def test_existing_identities_matches_null_identity(self, db): ci = _contrib_in(project="chem-only", material_id=None, formula=None) await _repo().insert_contribution(Contribution.from_input_model(ci)) - key = ci.identity().as_tuple() + key = ci.identity() found = await _repo().existing_identities([key]) assert key in found diff --git a/mpcontribs-api/tests/unit/domains/test_contribution_service.py b/mpcontribs-api/tests/unit/domains/test_contribution_service.py index d1fe1282ac..0e74b99fc0 100644 --- a/mpcontribs-api/tests/unit/domains/test_contribution_service.py +++ b/mpcontribs-api/tests/unit/domains/test_contribution_service.py @@ -10,7 +10,12 @@ from mpcontribs_api.authz import ADMIN_GROUP, User from mpcontribs_api.config import MongoSettings from mpcontribs_api.domains.attachments.models import Attachment, AttachmentIn -from mpcontribs_api.domains.contributions.models import Contribution, ContributionIn, ContributionPatch +from mpcontribs_api.domains.contributions.models import ( + Contribution, + ContributionIn, + ContributionPatch, + Identity, +) from mpcontribs_api.domains.contributions.service import ContributionService from mpcontribs_api.domains.structures.models import ( Lattice, @@ -499,7 +504,9 @@ class TestContributionIdentity: async def test_insert_existing_identity_conflicts(self): svc, contrib_repo, *_ = _make_service() contrib_repo.insert_many_contributions.return_value = None - contrib_repo.existing_identities.return_value = {("proj", "mp-1", "Fe-O", "Fe2O3", None, "")} + contrib_repo.existing_identities.return_value = { + Identity(project="proj", material_id="mp-1", chemical_system_id="Fe-O", formula="Fe2O3") + } summary = await svc.insert_contributions([_contrib_in(identifier="mp-1")]) From 27d03b630de14e1dc5893cc626f6be21e64ca5c0 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 27 Jul 2026 16:55:51 -0700 Subject: [PATCH 517/591] Set Project.owner to the caller that created the Project --- .../src/mpcontribs_api/domains/contributions/data.py | 6 +++--- .../src/mpcontribs_api/domains/projects/repository.py | 5 ++--- .../tests/integration/db/test_projects_repository.py | 4 ++-- .../tests/unit/domains/test_contributions_models.py | 5 +++-- .../tests/unit/domains/test_contributions_pivot.py | 8 ++++++++ 5 files changed, 18 insertions(+), 10 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/data.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/data.py index 22f64426e8..0dddd2e6f2 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/data.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/data.py @@ -153,9 +153,9 @@ def _validate_plain_key(key: Any) -> None: """Validate a single plain key token (a path segment or a condition name). Punctuation, spaces, and casing are no longer rejected: keys are coerced to ``snake_case`` on the - write path (see :func:`to_snake_case`). This only rejects keys that cannot be coerced into a - usable token: non-ASCII, empty, or ones that reduce to an empty string after coercion - (e.g. ``"***"``). + write path (see :func:`to_snake_case`), which folds ``*``/``/``/``|`` and any other non-alphanumeric + run to ``_``. This only rejects keys that cannot be coerced into a usable token: non-ASCII, empty, + or ones that reduce to an empty string after coercion (e.g. ``"***"``). """ if not isinstance(key, str) or not key.isascii(): raise ValidationError("Non-ASCII key found in Contribution.data. All dict keys must be only ASCII") diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py index 1e1d0ac367..60c6a914f1 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py @@ -187,9 +187,8 @@ async def upsert_project_by_id(self, id: str, data: ProjectIn) -> Project: if not self._user.is_admin: project.is_approved = existing.is_approved else: - # TODO: Check if Kong supplies email - # New project: the caller owns it, regardless of the submitted owner. - # project.owner = self._user.username + # New project is owned by the caller + project.owner = self._user.username # A new project starts unapproved; only an admin may create it pre-approved. if not self._user.is_admin: project.is_approved = False diff --git a/mpcontribs-api/tests/integration/db/test_projects_repository.py b/mpcontribs-api/tests/integration/db/test_projects_repository.py index ae9ebd63b3..fac02ca2f1 100644 --- a/mpcontribs-api/tests/integration/db/test_projects_repository.py +++ b/mpcontribs-api/tests/integration/db/test_projects_repository.py @@ -372,11 +372,11 @@ async def test_non_owner_cannot_overwrite(self, db): assert found.title == "Original" async def test_new_project_sets_owner_to_caller(self, db): - # Body owner is someone else; the caller's identity must win. + # Body carries a foreign owner; the authenticated caller's identity must win on insert. data = _project_in("auth-newowner", owner="google:alice@example.com") await _repo(BOB).upsert_project_by_id(id="auth-newowner", data=data) found = await Project.find_one(Project.id == "auth-newowner") - assert found.owner == "google:alice@example.com" + assert found.owner == "google:bob@example.com" async def test_update_preserves_original_owner(self, db): await _insert("auth-preserve", owner="google:alice@example.com") diff --git a/mpcontribs-api/tests/unit/domains/test_contributions_models.py b/mpcontribs-api/tests/unit/domains/test_contributions_models.py index 60cc485197..4fb51eb508 100644 --- a/mpcontribs-api/tests/unit/domains/test_contributions_models.py +++ b/mpcontribs-api/tests/unit/domains/test_contributions_models.py @@ -109,11 +109,12 @@ def test_data_depth_validation(self): def test_data_key_validation(self): # Punctuation/spaces/casing are no longer rejected at the ContributionIn level: keys are - # coerced to snake_case later (in expand_contribution), so validation only checks that a key - # is ASCII and can be coerced to a non-empty token. + # coerced to snake_case later (in expand_contribution), which folds '*', '/', and '|' to '_', + # so validation only checks that a key is ASCII and can be coerced to a non-empty token. _make_contribution_in(data={"test.": "pass"}) _make_contribution_in(data={"Band Gap": "pass"}) _make_contribution_in(data={"test||": "pass"}) + _make_contribution_in(data={"a/b*c": "pass"}) with pytest.raises(ValidationError, match="Non-ASCII key found in Contribution.data"): _make_contribution_in(data={"ΔE": "fail"}) with pytest.raises(ValidationError, match="reduces to an empty string"): diff --git a/mpcontribs-api/tests/unit/domains/test_contributions_pivot.py b/mpcontribs-api/tests/unit/domains/test_contributions_pivot.py index 3b9756f1f9..4757d5366c 100644 --- a/mpcontribs-api/tests/unit/domains/test_contributions_pivot.py +++ b/mpcontribs-api/tests/unit/domains/test_contributions_pivot.py @@ -241,6 +241,14 @@ def test_annotated_path_segments_coerced(self): assert set(data) == {"band_gap", "t"} assert data["band_gap"]["input_unit"] == "eV" + def test_forbidden_name_chars_folded_to_underscore(self): + # '*', '/', and '|' are allowed in the name portion but folded to '_' (not rejected). The + # same characters stay verbatim inside a unit (S/cm), which is never snake_cased. + rows = expand_contribution(_contrib_in({"a/b*c|d (S/cm)": 5})) + data = rows[0].contribution.data + assert set(data) == {"a_b_c_d"} + assert data["a_b_c_d"]["input_unit"] == "S/cm" + def test_dotted_path_segments_coerced(self): rows = expand_contribution(_contrib_in({"Outer.Inner Key (eV)": 1.1})) data = rows[0].contribution.data From e6212f75915efba614bd4b62891b2c4af35c7bbf Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 27 Jul 2026 22:09:58 -0700 Subject: [PATCH 518/591] _fields arguments in routers now accept None (default fields), [] (identity and sparse_always, and _all (all fields) --- .../domains/attachments/models.py | 4 +- .../domains/attachments/router.py | 6 +-- .../domains/contributions/models.py | 6 +-- .../domains/contributions/router.py | 6 +-- .../mpcontribs_api/domains/projects/models.py | 4 +- .../mpcontribs_api/domains/projects/router.py | 10 +++-- .../domains/structures/models.py | 6 +-- .../domains/structures/router.py | 6 +-- .../mpcontribs_api/domains/tables/models.py | 6 +-- .../mpcontribs_api/domains/tables/router.py | 6 +-- .../src/mpcontribs_api/projection.py | 34 ++++++++++++++--- .../tests/integration/test_projects.py | 35 +++++++++++++++++ .../unit/domains/test_projects_models.py | 13 ++++++- .../unit/domains/test_structures_models.py | 2 +- .../tests/unit/domains/test_tables_models.py | 2 +- mpcontribs-api/tests/unit/test_projection.py | 38 +++++++++++++++++-- 16 files changed, 142 insertions(+), 42 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py b/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py index c24ef2a158..e379c7317c 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/attachments/models.py @@ -53,9 +53,9 @@ class AttachmentOut(DocumentOut[PydanticObjectId]): content: int | None = None @staticmethod - def default_fields() -> list[str]: + def default_fields() -> tuple[str, ...]: # Light default; content fetched via ?_fields=. - return ["id", "name", "md5", "mime"] + return ("id", "name", "md5", "mime") class AttachmentPatch(SparseFieldsModel): diff --git a/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py b/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py index 09214a4fa2..a6b6d1a814 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py @@ -24,7 +24,7 @@ async def get_attachments( service: AttachmentServiceDep, pagination: Annotated[CursorParams, Depends()], filter: AttachmentFilter = FilterDepends(AttachmentFilter), - fields: FieldSelector = AttachmentOut.default_fields(), + fields: FieldSelector = None, ): selected = AttachmentOut.parse_fields(fields) return await service.get_many(filter=filter, fields=selected, pagination=pagination) @@ -34,7 +34,7 @@ async def get_attachments( async def get_attachment( service: AttachmentServiceDep, pk: str, - fields: FieldSelector = AttachmentOut.default_fields(), + fields: FieldSelector = None, ): selected = AttachmentOut.parse_fields(fields) return await service.get_by_id(id=pk, fields=selected) @@ -48,7 +48,7 @@ async def download_attachment( short_mime: ShortMimeFormat = ShortMimeFormat.GZ, ignore_cache: bool = False, filter: AttachmentFilter = FilterDepends(AttachmentFilter), - fields: FieldSelector = AttachmentOut.default_fields(), + fields: FieldSelector = None, ) -> StreamingResponse: selected = AttachmentOut.parse_fields(fields) body = await service.download( diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py index 27c5b6f04f..1b7ce3d7d5 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py @@ -145,8 +145,8 @@ class ContributionOut(DocumentOut[PydanticObjectId]): attachments: list[Link[Attachment]] | None = None @staticmethod - def default_fields() -> list[str]: - return [ + def default_fields() -> tuple[str, ...]: + return ( "id", "project", "identifier", @@ -156,7 +156,7 @@ def default_fields() -> list[str]: "is_public", "last_modified", "needs_build", - ] + ) class ContributionPatch(SparseFieldsModel): diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py index 995bd0c820..5775c85ecb 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py @@ -54,7 +54,7 @@ async def get_contributions( repo: ContributionDep, pagination: Annotated[CursorParams, Depends()], filter: ContributionFilter = FilterDepends(ContributionFilter), - fields: FieldSelector = ContributionOut.default_fields(), + fields: FieldSelector = None, ): selected = ContributionOut.parse_fields(fields) return await repo.get_contributions(pagination=pagination, filter=filter, fields=selected) @@ -95,7 +95,7 @@ async def download_contributions( format: DownloadFormat = DownloadFormat.JSONL, ignore_cache: bool = False, filter: ContributionFilter = FilterDepends(ContributionFilter), - fields: FieldSelector = ContributionOut.default_fields(), + fields: FieldSelector = None, ): selected = ContributionOut.parse_fields(fields) body = await repo.download_contributions( @@ -127,7 +127,7 @@ async def delete_contribution_by_id( async def get_contribution_by_id( repo: ContributionDep, id: str, - fields: FieldSelector = ContributionOut.default_fields(), + fields: FieldSelector = None, ): selected = ContributionOut.parse_fields(fields) return await repo.get_contribution_by_id(id=id, fields=selected) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py index 5ae03fd552..b3c97113eb 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py @@ -102,8 +102,8 @@ class ProjectOut(DocumentOut[ShortStr]): license: Literal["CCA4", "CCPD"] | None = None @staticmethod - def default_fields() -> list[str]: - return ["id", "is_public", "title", "owner", "is_approved", "unique_identifiers"] + def default_fields() -> tuple[str, ...]: + return ("id", "is_public", "title", "owner", "is_approved", "unique_identifiers") class ProjectFilter(BaseFilter): diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py index 33dce7ebd7..e8f0408fc7 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py @@ -23,14 +23,15 @@ async def get_projects( repo: ProjectDep, pagination: Annotated[CursorParams, Depends()], filter: ProjectFilter = FilterDepends(ProjectFilter), - fields: FieldSelector = ProjectOut.default_fields(), + fields: FieldSelector = None, ): """Return paginated projects matching a filter. Args: repo (ProjectDep): the project repo we depend on pagination (CursorParams): arguments for cursor-based pagination - fields (str | None): optional fields to include in return. If None supplied, all fields are returned + fields (list[str] | None): optional ``_fields`` selection. Omitted -> server defaults; + empty (``?_fields=``) -> identity fields only; ``_all`` -> the full document Returns: list[ProjectSummary]: a list of smaller project payloads @@ -43,14 +44,15 @@ async def get_projects( async def get_project_by_id( id: str, repo: ProjectDep, - fields: FieldSelector = ProjectOut.default_fields(), + fields: FieldSelector = None, ): """Gets a single project by its ID. Args: id (str): the id of the project to retrieve repo (ProjectDep): the project repo we depend on - fields (str | None): optional fields to include in return. If None supplied, all fields are returned + fields (list[str] | None): optional ``_fields`` selection. Omitted -> server defaults; + empty (``?_fields=``) -> identity fields only; ``_all`` -> the full document Returns: ProjectOut: the requested project, actual data returned is determined by the view the user requested diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py index b9ab911935..d7cccf923d 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py @@ -76,12 +76,12 @@ class StructureOut(DocumentOut[PydanticObjectId]): cif: str | None = None @staticmethod - def default_fields() -> list[str]: - return [ + def default_fields() -> tuple[str, ...]: + return ( "id", "name", "md5", - ] + ) class StructurePatch(SparseFieldsModel): diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py index 803047648f..e27ae2821e 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py @@ -25,7 +25,7 @@ async def get_structures( service: StructureServiceDep, pagination: Annotated[CursorParams, Depends()], filter: StructureFilter = FilterDepends(StructureFilter), - fields: FieldSelector = StructureOut.default_fields(), + fields: FieldSelector = None, ): selected = StructureOut.parse_fields(fields) return await service.get_many(filter=filter, fields=selected, pagination=pagination) @@ -35,7 +35,7 @@ async def get_structures( async def get_structure( service: StructureServiceDep, pk: str, - fields: FieldSelector = StructureOut.default_fields(), + fields: FieldSelector = None, ): selected = StructureOut.parse_fields(fields) return await service.get_by_id(id=pk, fields=selected) @@ -49,7 +49,7 @@ async def download_structure( short_mime: ShortMimeFormat = ShortMimeFormat.GZ, ignore_cache: bool = False, filter: StructureFilter = FilterDepends(StructureFilter), - fields: FieldSelector = StructureOut.default_fields(), + fields: FieldSelector = None, ) -> StreamingResponse: selected = StructureOut.parse_fields(fields) body = await service.download( diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py index fa8e343a0b..c2a6e22cad 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/models.py @@ -170,15 +170,15 @@ def _assemble_frame(cls, value: Any) -> Any: return {key: val for key, val in normalized.items() if val is not None} @staticmethod - def default_fields() -> list[str]: + def default_fields() -> tuple[str, ...]: # Light default; the tabular payload (data) is fetched via ?_fields=. - return [ + return ( "id", "name", "md5", "attrs", "total_data_rows", - ] + ) @classmethod def projection(cls, fields): diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py index 703f0c6faa..78d49dca0d 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py @@ -25,7 +25,7 @@ async def get_tables( service: TableServiceDep, pagination: Annotated[CursorParams, Depends()], filter: TableFilter = FilterDepends(TableFilter), - fields: FieldSelector = TableOut.default_fields(), + fields: FieldSelector = None, ): selected = TableOut.parse_fields(fields) return await service.get_many(filter=filter, fields=selected, pagination=pagination) @@ -35,7 +35,7 @@ async def get_tables( async def get_table( service: TableServiceDep, pk: str, - fields: FieldSelector = TableOut.default_fields(), + fields: FieldSelector = None, ): selected = TableOut.parse_fields(fields) return await service.get_by_id(id=pk, fields=selected) @@ -49,7 +49,7 @@ async def download_table( short_mime: ShortMimeFormat = ShortMimeFormat.GZ, ignore_cache: bool = False, filter: TableFilter = FilterDepends(TableFilter), - fields: FieldSelector = TableOut.default_fields(), + fields: FieldSelector = None, ) -> StreamingResponse: selected = TableOut.parse_fields(fields) body = await service.download( diff --git a/mpcontribs-api/src/mpcontribs_api/projection.py b/mpcontribs-api/src/mpcontribs_api/projection.py index 0346a1f210..161ec44dab 100644 --- a/mpcontribs-api/src/mpcontribs_api/projection.py +++ b/mpcontribs-api/src/mpcontribs_api/projection.py @@ -28,6 +28,9 @@ ModelT = TypeVar("ModelT", bound=BaseModel) +# Sentinel value in ``_fields`` that requests the entire document (``?_fields=_all``). +ALL_FIELDS = "_all" + # How a model field's annotation is categorised for projection. FieldKind = Literal["model", "dict", "list", "scalar"] # A path step may also land on a dict key ("opaque") or a name absent from a model ("unknown"). @@ -205,26 +208,47 @@ def field_names(cls) -> frozenset[str]: """Return the top-level field names that may appear in ``_fields``.""" return frozenset(cls.model_fields) + @staticmethod + def default_fields() -> tuple[str, ...]: + """Field paths returned when ``_fields`` is omitted. + + The base is empty (identity fields only); each resource output model overrides this with + the columns a bare list/detail request should carry. + """ + return () + @classmethod def parse_fields(cls, raw: list | None) -> frozenset[str] | None: """Validate and normalise a raw ``_fields`` value into a set of paths. + Distinguishes the three legacy selection modes, since FastAPI collapses an omitted query + parameter and an empty one only if a non-``None`` default hides it (so routes must default + the parameter to ``None``): + + - **omitted** (``raw is None``): the model's :meth:`default_fields`. + - **present but empty** (``?_fields=`` -> ``['']``, or ``[]``): only the identity fields and + ``sparse_always`` — the cheap "just totals / ids" selection. + - **``_all`` anywhere in the list**: every field (returns ``None``). + Args: raw (list): The list of field paths from the ``_fields`` query parameter, or None when the query parameter was omitted. Returns: - None when every field should be returned (parameter omitted), - otherwise the validated, collapsed set of dotted paths, always - including this model's ``sparse_always`` fields. + None when every field should be returned (``_all`` requested), otherwise the + validated, collapsed set of dotted paths, always including this model's + ``sparse_always`` and identity fields. Raises: ValidationError: If a requested path names an unknown field or selects subfields of a scalar or list field. """ - if not raw: - return None # None == all fields + if raw is None: + # Parameter omitted: fall back to this model's server-chosen defaults. + raw = list(cls.default_fields()) requested = frozenset(name.strip() for name in raw if name.strip()) + if ALL_FIELDS in requested: + return None # explicit _all == every field for path in requested: _validate_path(cls, path) return _collapse(requested | cls.sparse_always | cls._identity_fields()) diff --git a/mpcontribs-api/tests/integration/test_projects.py b/mpcontribs-api/tests/integration/test_projects.py index 0f98857923..392e3a7db8 100644 --- a/mpcontribs-api/tests/integration/test_projects.py +++ b/mpcontribs-api/tests/integration/test_projects.py @@ -100,6 +100,41 @@ def test_valid_fields_param_forwarded(self, client, project_repo): assert "title" in kwargs["fields"] +# --------------------------------------------------------------------------- +# _fields three-way selection semantics (omitted / empty / _all) +# --------------------------------------------------------------------------- + + +class TestFieldSelectionSemantics: + def test_omitted_fields_forwards_route_defaults(self, client, project_repo): + # No _fields query param -> the route's default_fields() (identity + summary columns). + project_repo.get_projects.return_value = Page(items=[], next_cursor=None) + client.get("/api/v1/projects", headers=AUTHED_HEADERS) + _, kwargs = project_repo.get_projects.call_args + assert kwargs["fields"] == frozenset(ProjectOut.default_fields()) + + def test_empty_fields_forwards_identity_only(self, client, project_repo): + # `?_fields=` (present but empty) -> only the identity field, the cheap "just ids" call. + project_repo.get_projects.return_value = Page(items=[], next_cursor=None) + client.get("/api/v1/projects", params={"_fields": ""}, headers=AUTHED_HEADERS) + _, kwargs = project_repo.get_projects.call_args + assert kwargs["fields"] == frozenset({"id"}) + + def test_all_sentinel_forwards_none(self, client, project_repo): + # `?_fields=_all` -> None, i.e. project every field. + project_repo.get_projects.return_value = Page(items=[], next_cursor=None) + client.get("/api/v1/projects", params={"_fields": "_all"}, headers=AUTHED_HEADERS) + _, kwargs = project_repo.get_projects.call_args + assert kwargs["fields"] is None + + def test_empty_fields_detail_forwards_identity_only(self, client, project_repo): + # Same three-way rule on the detail route. + project_repo.get_project_by_id.return_value = SAMPLE_PROJECT + client.get("/api/v1/projects/mp-sample", params={"_fields": ""}, headers=AUTHED_HEADERS) + _, kwargs = project_repo.get_project_by_id.call_args + assert kwargs["fields"] == frozenset({"id"}) + + # --------------------------------------------------------------------------- # GET /api/v1/projects/{id} # --------------------------------------------------------------------------- diff --git a/mpcontribs-api/tests/unit/domains/test_projects_models.py b/mpcontribs-api/tests/unit/domains/test_projects_models.py index 1eb3fdb846..68533ca2eb 100644 --- a/mpcontribs-api/tests/unit/domains/test_projects_models.py +++ b/mpcontribs-api/tests/unit/domains/test_projects_models.py @@ -129,8 +129,17 @@ def test_invalid_license_raises(self): class TestProjectOutProjection: - def test_parse_fields_none_returns_none(self): - assert ProjectOut.parse_fields(None) is None + def test_parse_fields_none_returns_default_fields(self): + # Omitted _fields (None) -> the route's default_fields() (plus identity), not "all". + assert ProjectOut.parse_fields(None) == frozenset(ProjectOut.default_fields()) + + def test_parse_fields_empty_returns_identity_only(self): + # Present-but-empty _fields -> identity fields only. + assert ProjectOut.parse_fields([]) == frozenset({"id"}) + + def test_parse_fields_all_sentinel_returns_none(self): + # `_all` -> every field. + assert ProjectOut.parse_fields(["_all"]) is None def test_parse_fields_valid_field(self): result = ProjectOut.parse_fields(["title"]) diff --git a/mpcontribs-api/tests/unit/domains/test_structures_models.py b/mpcontribs-api/tests/unit/domains/test_structures_models.py index 213724b871..5a8f51dc63 100644 --- a/mpcontribs-api/tests/unit/domains/test_structures_models.py +++ b/mpcontribs-api/tests/unit/domains/test_structures_models.py @@ -178,7 +178,7 @@ def test_all_fields_optional(self): assert out.md5 is None def test_default_fields(self): - assert StructureOut.default_fields() == ["id", "name", "md5"] + assert StructureOut.default_fields() == ("id", "name", "md5") def test_default_fields_parseable(self): # The route default must survive parse_fields without raising. diff --git a/mpcontribs-api/tests/unit/domains/test_tables_models.py b/mpcontribs-api/tests/unit/domains/test_tables_models.py index 952908321b..98cd07f4e6 100644 --- a/mpcontribs-api/tests/unit/domains/test_tables_models.py +++ b/mpcontribs-api/tests/unit/domains/test_tables_models.py @@ -228,7 +228,7 @@ def test_all_fields_optional(self): assert out.attrs is None def test_default_fields(self): - assert TableOut.default_fields() == ["id", "name", "md5", "attrs", "total_data_rows"] + assert TableOut.default_fields() == ("id", "name", "md5", "attrs", "total_data_rows") def test_default_fields_parseable(self): parsed = TableOut.parse_fields(TableOut.default_fields()) diff --git a/mpcontribs-api/tests/unit/test_projection.py b/mpcontribs-api/tests/unit/test_projection.py index a8c627155a..43cbdd01f9 100644 --- a/mpcontribs-api/tests/unit/test_projection.py +++ b/mpcontribs-api/tests/unit/test_projection.py @@ -222,12 +222,42 @@ def test_does_not_include_nested(self): # --------------------------------------------------------------------------- +class WithDefaults(SparseFieldsModel): + """Model exercising the three-way `_fields` semantics: has identity + server defaults.""" + + id: str | None = Field(default=None, alias="_id", serialization_alias="id") + name: str | None = None + age: int | None = None + + @staticmethod + def default_fields() -> tuple[str, ...]: + return ("id", "name") + + class TestParseFields: - def test_none_returns_none(self): - assert Simple.parse_fields(None) is None + def test_omitted_returns_default_fields(self): + # Parameter omitted (None) -> the model's server-chosen defaults (plus identity). + assert WithDefaults.parse_fields(None) == frozenset({"id", "name"}) + + def test_empty_list_returns_identity_only(self): + # Explicitly empty selection -> only identity fields (the cheap "just ids/totals" call). + assert WithDefaults.parse_fields([]) == frozenset({"id"}) + + def test_empty_string_selection_returns_identity_only(self): + # FastAPI renders `?_fields=` as [""]; stripped to empty -> identity only, not "all". + assert WithDefaults.parse_fields([""]) == frozenset({"id"}) + + def test_all_sentinel_returns_none(self): + # `_all` anywhere -> every field (None sentinel). + assert WithDefaults.parse_fields(["_all"]) is None + assert WithDefaults.parse_fields(["name", "_all"]) is None + + def test_normal_selection_includes_identity(self): + assert WithDefaults.parse_fields(["age"]) == frozenset({"age", "id"}) - def test_empty_list_returns_none(self): - assert Simple.parse_fields([]) is None + def test_base_model_omitted_is_identity_only(self): + # A model without a default_fields override falls back to the empty base default. + assert Simple.parse_fields(None) == frozenset() def test_single_valid_field(self): result = Simple.parse_fields(["name"]) From 644b6a5bd803cb303b95c940a1cb0c33ad32c8f7 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 27 Jul 2026 22:27:50 -0700 Subject: [PATCH 519/591] Encoded Structure.lattice.matrix as a 3x3 matrix rather than a polars dataframe. Remvoed FRAME_BSON_ENCODERS --- .../mpcontribs_api/domains/_shared/types.py | 7 -- .../domains/structures/models.py | 50 ++++++++++- .../integration/db/test_stats_recompute.py | 17 ++-- .../db/test_structures_repository.py | 82 +++++++++++++++++++ .../unit/domains/test_contribution_service.py | 2 +- .../unit/domains/test_structures_models.py | 57 +++++++++++-- 6 files changed, 190 insertions(+), 25 deletions(-) create mode 100644 mpcontribs-api/tests/integration/db/test_structures_repository.py diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py index 06136ce2c0..6f56a0f624 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py @@ -92,13 +92,6 @@ def _serialize_frame(data: pl.DataFrame) -> dict: return data.to_dict(as_series=False) -# Beanie/pymongo would otherwise BSON-encode a pl.DataFrame by iterating it into bare column -# lists, dropping the column names and the dict shape the Pydantic serializer produces — which -# `_coerce_frame` cannot read back. Registering this on a Document's Settings.bson_encoders makes -# the stored form match the serialized form, so frames round-trip losslessly. -FRAME_BSON_ENCODERS = {pl.DataFrame: _serialize_frame} - - PolarsFrame = Annotated[ pl.DataFrame, BeforeValidator(_coerce_frame), diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py index d7cccf923d..ecce6241e8 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/structures/models.py @@ -1,13 +1,57 @@ +from typing import Annotated + from beanie import PydanticObjectId -from pydantic import BaseModel, ConfigDict +from pydantic import BaseModel, BeforeValidator, ConfigDict from pymatgen.core import Element from mpcontribs_api.domains._shared.filters import BaseFilter from mpcontribs_api.domains._shared.models import Component, ComponentIn, DocumentOut -from mpcontribs_api.domains._shared.types import MD5Hash, NFKCStr, PolarsFrame +from mpcontribs_api.domains._shared.types import MD5Hash, NFKCStr +from mpcontribs_api.exceptions import ValidationError from mpcontribs_api.projection import SparseFieldsModel +def _validate_lattice_matrix(value: object) -> list[list[float]]: + """Validate a lattice matrix as exactly three rows of three numbers (row-major 3x3). + + A crystal lattice matrix is nine floats with a fixed shape, so it is stored and typed as a plain + nested list. + + Args: + value: the raw ``matrix`` payload from a request body or a stored document. + + Returns: + list[list[float]]: the validated 3x3 matrix with every cell coerced to ``float``. + + Raises: + ValidationError: if ``value`` is not a 3x3 nested sequence of numbers. + """ + if not isinstance(value, (list, tuple)): + raise ValidationError(f"lattice matrix must be a 3x3 nested list, got {type(value).__name__}") + rows = list(value) + if len(rows) != 3: + raise ValidationError(f"lattice matrix must be 3x3: got {len(rows)} rows, expected 3") + matrix: list[list[float]] = [] + for i, row in enumerate(rows): + if not isinstance(row, (list, tuple)): + raise ValidationError(f"lattice matrix row {i} must be a list of 3 numbers, got {type(row).__name__}") + cells = list(row) + if len(cells) != 3: + raise ValidationError(f"lattice matrix must be 3x3: row {i} has {len(cells)} columns, expected 3") + converted: list[float] = [] + for j, cell in enumerate(cells): + # ``bool`` is an ``int`` subclass but is not a valid matrix entry. + if isinstance(cell, bool) or not isinstance(cell, (int, float)): + raise ValidationError(f"lattice matrix cell [{i}][{j}] must be numeric, got {cell!r}") + converted.append(float(cell)) + matrix.append(converted) + return matrix + + +# Row-major 3x3 matrix of floats; validated for shape, matching the stored (pymatgen) representation. +LatticeMatrix = Annotated[list[list[float]], BeforeValidator(_validate_lattice_matrix)] + + class SiteProperties(BaseModel): magmom: float @@ -19,7 +63,7 @@ class Species(BaseModel): class Lattice(BaseModel): model_config = ConfigDict(arbitrary_types_allowed=True) - matrix: PolarsFrame + matrix: LatticeMatrix pbc: list[bool] a: float b: float diff --git a/mpcontribs-api/tests/integration/db/test_stats_recompute.py b/mpcontribs-api/tests/integration/db/test_stats_recompute.py index 6fb68e1b55..a4a461c8d8 100644 --- a/mpcontribs-api/tests/integration/db/test_stats_recompute.py +++ b/mpcontribs-api/tests/integration/db/test_stats_recompute.py @@ -76,7 +76,7 @@ def _structure(charge: float | None) -> StructureIn: return StructureIn( name="struct", lattice=Lattice( - matrix=pl.DataFrame([[1.0, 0.0, 0.0], [0.0, 1.0, 0.0], [0.0, 0.0, 1.0]]), + matrix=[[1.0, 0.0, 0.0], [0.0, 1.0, 0.0], [0.0, 0.0, 1.0]], pbc=[True, True, True], a=1.0, b=1.0, c=1.0, alpha=90.0, beta=90.0, gamma=90.0, @@ -173,13 +173,14 @@ async def test_full_lifecycle(self, db, mongo_client): assert (cols["energy"].min, cols["energy"].max) == (-5.0, -5.0) # --- remove it -> back to empty --- - # NOTE: svc.delete_contributions() cannot delete a contribution that references real - # structure/table components: its cascade re-reads the contribution through ContributionFilter, - # whose nested component sub-filters make Beanie fetch the linked components, and the fetched - # frame content (e.g. Lattice.matrix) fails to round-trip (Structure/Table don't register - # FRAME_BSON_ENCODERS, so it is stored as a bare list _coerce_frame rejects). That is a - # pre-existing bug unrelated to the stats recompute. To still assert the removal recompute, - # drop the docs directly and recompute; the no-components case below covers delete() end-to-end. + # NOTE: svc.delete_contributions() cannot delete a contribution that references a real table + # component: its cascade re-reads the contribution through ContributionFilter, whose nested + # component sub-filters make Beanie fetch the linked components, and the fetched Table.data + # frame fails to round-trip (Table.data is a PolarsFrame that pymongo stores as bare column + # lists which _coerce_frame rejects on read). That is a pre-existing bug in the tables domain, + # unrelated to the stats recompute. (Structure.lattice.matrix used to hit the same bug but is + # now a plain nested-list type that round-trips.) To still assert the removal recompute, drop + # the docs directly and recompute; the no-components case below covers delete() end-to-end. await db["contributions"].delete_many({"project": PID}) for coll in ("structures", "tables"): await db[coll].delete_many({}) diff --git a/mpcontribs-api/tests/integration/db/test_structures_repository.py b/mpcontribs-api/tests/integration/db/test_structures_repository.py new file mode 100644 index 0000000000..b53d85380f --- /dev/null +++ b/mpcontribs-api/tests/integration/db/test_structures_repository.py @@ -0,0 +1,82 @@ +import pytest + +from mpcontribs_api.domains.structures.models import Structure, StructureIn + +pytestmark = [pytest.mark.db, pytest.mark.asyncio(loop_scope="session")] + + +# --------------------------------------------------------------------------- +# Helpers +# --------------------------------------------------------------------------- + +# A deliberately asymmetric matrix so a transposed or reordered round-trip would be caught. +MATRIX = [[1.0, 2.0, 3.0], [4.0, 5.0, 6.0], [7.0, 8.0, 9.0]] + + +def _structure_in(**overrides) -> StructureIn: + payload = { + "name": "Fe2O3", + "lattice": { + "matrix": MATRIX, + "pbc": [True, True, True], + "a": 1.0, + "b": 1.0, + "c": 1.0, + "alpha": 90.0, + "beta": 90.0, + "gamma": 90.0, + "volume": 1.0, + }, + "sites": [ + { + "species": [{"element": "Fe", "occu": 1}], + "abc": [0.0, 0.0, 0.0], + "properties": {"magmom": 2.2}, + "label": "Fe", + "xyz": [0.0, 0.0, 0.0], + } + ], + "charge": 0.0, + "cif": "data_Fe2O3\n_cell_length_a 1.0\n", + } + payload.update(overrides) + return StructureIn(**payload) + + +# --------------------------------------------------------------------------- +# Lattice matrix round-trip through MongoDB +# +# Regression: Lattice.matrix used to be typed as a PolarsFrame whose BSON form +# (a bare column list) could not be read back by _coerce_frame. Retyped as a +# plain row-major 3x3 nested list, it now survives an insert -> read cycle with +# values and ordering intact. +# --------------------------------------------------------------------------- + + +class TestLatticeMatrixRoundTrip: + async def test_matrix_survives_insert_and_read(self, db): + doc = Structure.from_input(_structure_in()) + await doc.insert() + + read = await Structure.get(doc.id) + assert read is not None + assert read.lattice.matrix == MATRIX + + async def test_matrix_ordering_preserved(self, db): + doc = Structure.from_input(_structure_in()) + await doc.insert() + + read = await Structure.get(doc.id) + assert read is not None + # Row-major: element [i][j] lands back exactly where it started. + for i in range(3): + for j in range(3): + assert read.lattice.matrix[i][j] == MATRIX[i][j] + + async def test_matrix_cells_are_floats_after_read(self, db): + doc = Structure.from_input(_structure_in()) + await doc.insert() + + read = await Structure.get(doc.id) + assert read is not None + assert all(isinstance(cell, float) for row in read.lattice.matrix for cell in row) diff --git a/mpcontribs-api/tests/unit/domains/test_contribution_service.py b/mpcontribs-api/tests/unit/domains/test_contribution_service.py index b8cf32cd99..439acc4e92 100644 --- a/mpcontribs-api/tests/unit/domains/test_contribution_service.py +++ b/mpcontribs-api/tests/unit/domains/test_contribution_service.py @@ -67,7 +67,7 @@ def _structure_in(**overrides) -> StructureIn: "name": "test-struct", "md5": "c" * 32, "lattice": Lattice( - matrix=pl.DataFrame([[1.0, 0.0, 0.0], [0.0, 1.0, 0.0], [0.0, 0.0, 1.0]]), + matrix=[[1.0, 0.0, 0.0], [0.0, 1.0, 0.0], [0.0, 0.0, 1.0]], pbc=[True, True, True], a=1.0, b=1.0, c=1.0, alpha=90.0, beta=90.0, gamma=90.0, diff --git a/mpcontribs-api/tests/unit/domains/test_structures_models.py b/mpcontribs-api/tests/unit/domains/test_structures_models.py index 5a8f51dc63..456a341df0 100644 --- a/mpcontribs-api/tests/unit/domains/test_structures_models.py +++ b/mpcontribs-api/tests/unit/domains/test_structures_models.py @@ -1,4 +1,3 @@ -import polars as pl import pytest from beanie import PydanticObjectId from pydantic import ValidationError as PydanticValidationError @@ -13,6 +12,7 @@ StructureIn, StructureOut, StructurePatch, + _validate_lattice_matrix, ) from mpcontribs_api.exceptions import ValidationError as AppValidationError @@ -23,7 +23,7 @@ def _lattice_payload(**overrides) -> dict: payload = { - "matrix": {"x": [1.0, 0.0, 0.0], "y": [0.0, 1.0, 0.0], "z": [0.0, 0.0, 1.0]}, + "matrix": [[1.0, 0.0, 0.0], [0.0, 1.0, 0.0], [0.0, 0.0, 1.0]], "pbc": [True, True, True], "a": 1.0, "b": 1.0, @@ -94,13 +94,18 @@ def test_element_enum_passthrough(self): class TestLattice: def test_valid_construction(self): lattice = Lattice(**_lattice_payload()) - assert isinstance(lattice.matrix, pl.DataFrame) + assert lattice.matrix == [[1.0, 0.0, 0.0], [0.0, 1.0, 0.0], [0.0, 0.0, 1.0]] assert lattice.pbc == [True, True, True] assert lattice.volume == 1.0 - def test_matrix_coerced_from_dict(self): - lattice = Lattice(**_lattice_payload()) - assert lattice.matrix.columns == ["x", "y", "z"] + def test_matrix_preserves_row_major_ordering(self): + lattice = Lattice(**_lattice_payload(matrix=[[1.0, 2.0, 3.0], [4.0, 5.0, 6.0], [7.0, 8.0, 9.0]])) + assert lattice.matrix == [[1.0, 2.0, 3.0], [4.0, 5.0, 6.0], [7.0, 8.0, 9.0]] + + def test_integer_cells_coerced_to_float(self): + lattice = Lattice(**_lattice_payload(matrix=[[1, 0, 0], [0, 1, 0], [0, 0, 1]])) + assert lattice.matrix == [[1.0, 0.0, 0.0], [0.0, 1.0, 0.0], [0.0, 0.0, 1.0]] + assert all(isinstance(cell, float) for row in lattice.matrix for cell in row) def test_missing_angles_raise(self): payload = _lattice_payload() @@ -109,6 +114,46 @@ def test_missing_angles_raise(self): Lattice(**payload) +class TestLatticeMatrixShape: + def test_valid_3x3_accepted(self): + result = _validate_lattice_matrix([[1, 2, 3], [4, 5, 6], [7, 8, 9]]) + assert result == [[1.0, 2.0, 3.0], [4.0, 5.0, 6.0], [7.0, 8.0, 9.0]] + + def test_too_few_rows_2x3_rejected(self): + # 2x3: names the actual row count. + with pytest.raises(AppValidationError, match="got 2 rows"): + _validate_lattice_matrix([[1, 2, 3], [4, 5, 6]]) + + def test_wrong_columns_3x2_rejected(self): + # 3x2: names the offending row's column count. + with pytest.raises(AppValidationError, match="row 0 has 2 columns"): + _validate_lattice_matrix([[1, 2], [3, 4], [5, 6]]) + + def test_ragged_rows_rejected(self): + # A late ragged row is caught and its index/width named. + with pytest.raises(AppValidationError, match="row 2 has 2 columns"): + _validate_lattice_matrix([[1, 2, 3], [4, 5, 6], [7, 8]]) + + def test_non_numeric_cell_rejected(self): + # The offending value appears in the message. + with pytest.raises(AppValidationError, match=r"cell \[1\]\[2\] must be numeric, got 'x'"): + _validate_lattice_matrix([[1, 2, 3], [4, 5, "x"], [7, 8, 9]]) + + def test_boolean_cell_rejected(self): + # bool is an int subclass but not a valid matrix entry. + with pytest.raises(AppValidationError, match="must be numeric"): + _validate_lattice_matrix([[1, 2, 3], [4, 5, 6], [7, 8, True]]) + + def test_non_nested_rejected(self): + with pytest.raises(AppValidationError, match="3x3 nested list"): + _validate_lattice_matrix("not a matrix") + + def test_rejected_at_model_construction(self): + # The BeforeValidator's domain error propagates through model validation. + with pytest.raises(AppValidationError, match="3x3"): + Lattice(**_lattice_payload(matrix=[[1, 2, 3], [4, 5, 6]])) + + # --------------------------------------------------------------------------- # Structure / StructureIn # --------------------------------------------------------------------------- From 73acc5ec12642a135d639074135e48d0a5a8ddb3 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 27 Jul 2026 22:45:19 -0700 Subject: [PATCH 520/591] Removed 'needs_build' from Contributions --- .../mpcontribs_api/domains/contributions/models.py | 8 -------- .../db/test_contributions_repository.py | 14 +------------- .../unit/domains/test_contribution_repository.py | 4 ++-- .../unit/domains/test_contribution_service.py | 4 ++-- .../unit/domains/test_contributions_models.py | 4 +--- 5 files changed, 6 insertions(+), 28 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py index 1b7ce3d7d5..98050ccc79 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py @@ -34,8 +34,6 @@ class ContributionBase(BaseModel): formula: DisplayStr data: ContributionData = Field(description=CONTRIBUTION_DATA_INPUT_DESCRIPTION) - # TODO: Verify that this should default to True and be passed by users - needs_build: bool = True last_modified: datetime = Field(default_factory=lambda: datetime.now(UTC)) class Settings: @@ -75,7 +73,6 @@ class Contribution(ContributionBase, BaseDocumentWithInput[PydanticObjectId]): structures: list[Link[Structure]] | None = None tables: list[Link[Table]] | None = None attachments: list[Link[Attachment]] | None = None - # needs_build: bool = True @classmethod def from_input_model(cls, data: ContributionIn) -> Contribution: @@ -136,7 +133,6 @@ class ContributionOut(DocumentOut[PydanticObjectId]): formula: str | None = None is_public: bool | None = None last_modified: datetime | None = None - needs_build: bool | None = None # No input validators on the read path: stored documents are trusted, and re-validating here # would 500 on historical data that missed the correction (see carrier_transport contribs) data: dict[str, Any] | None = Field(default=None, description=CONTRIBUTION_DATA_OUTPUT_DESCRIPTION) @@ -155,7 +151,6 @@ def default_fields() -> tuple[str, ...]: "formula", "is_public", "last_modified", - "needs_build", ) @@ -164,7 +159,6 @@ class ContributionPatch(SparseFieldsModel): identifier: SearchStr | None = None version: int | None = None formula: DisplayStr | None = None - needs_build: bool | None = None data: ContributionData = Field(default=None, description=CONTRIBUTION_DATA_INPUT_DESCRIPTION) structures: list[Link[Structure]] | None = None tables: list[Link[Table]] | None = None @@ -193,8 +187,6 @@ class ContributionFilter(BaseFilter): is_public: bool | None = None - needs_build: bool | None = None - table: TableFilter | None = FilterDepends(with_prefix("tables", TableFilter)) attachment: AttachmentFilter | None = FilterDepends(with_prefix("attachments", AttachmentFilter)) structure: StructureFilter | None = FilterDepends(with_prefix("structures", StructureFilter)) diff --git a/mpcontribs-api/tests/integration/db/test_contributions_repository.py b/mpcontribs-api/tests/integration/db/test_contributions_repository.py index 4f67f1cea6..ea444d4a33 100644 --- a/mpcontribs-api/tests/integration/db/test_contributions_repository.py +++ b/mpcontribs-api/tests/integration/db/test_contributions_repository.py @@ -251,18 +251,6 @@ async def test_filter_by_is_public(self, db): ) assert all(c.is_public is True for c in page.items) - async def test_filter_by_needs_build(self, db): - await _insert(identifier="nb-true", needs_build=True, is_public=True) - await _insert(identifier="nb-false", needs_build=False, is_public=True) - f = ContributionFilter(needs_build=False) - page = await _repo(ADMIN).get_contributions( - pagination=CursorParams(), filter=f, fields=None - ) - identifiers = {c.identifier for c in page.items} - assert "nb-false" in identifiers - assert "nb-true" not in identifiers - - # --------------------------------------------------------------------------- # get_contribution_by_id # --------------------------------------------------------------------------- @@ -384,7 +372,7 @@ async def test_updates_data_field_replaces_when_requested(self, db): async def test_unrelated_fields_unchanged(self, db): doc = await _insert(identifier="patch-preserve", formula="Fe2O3") await _repo(ADMIN).update_contribution_by_identifiers( - doc.project, doc.identifier, doc.version, doc.condition_key, {"needs_build": False} + doc.project, doc.identifier, doc.version, doc.condition_key, {"is_public": True} ) found = await Contribution.find_one(Contribution.id == doc.id) assert found.formula == "Fe2O3" diff --git a/mpcontribs-api/tests/unit/domains/test_contribution_repository.py b/mpcontribs-api/tests/unit/domains/test_contribution_repository.py index 5682a57a7e..8493b08429 100644 --- a/mpcontribs-api/tests/unit/domains/test_contribution_repository.py +++ b/mpcontribs-api/tests/unit/domains/test_contribution_repository.py @@ -65,10 +65,10 @@ def test_replace_passes_through_verbatim(self): assert _build_update_set(update, replace_data=True) == update def test_merge_flattens_only_dict_fields(self): - update = {"formula": "H2O", "needs_build": False, "data": {"a": 1, "grp": {"b": 2}}} + update = {"formula": "H2O", "version": 2, "data": {"a": 1, "grp": {"b": 2}}} assert _build_update_set(update, replace_data=False) == { "formula": "H2O", - "needs_build": False, + "version": 2, "data.a": 1, "data.grp.b": 2, } diff --git a/mpcontribs-api/tests/unit/domains/test_contribution_service.py b/mpcontribs-api/tests/unit/domains/test_contribution_service.py index 439acc4e92..c4f054c265 100644 --- a/mpcontribs-api/tests/unit/domains/test_contribution_service.py +++ b/mpcontribs-api/tests/unit/domains/test_contribution_service.py @@ -1225,14 +1225,14 @@ async def test_scalar_only_patch_updates_target_row(self): updated = _target_doc() contrib_repo.update_contribution_by_identifiers.return_value = updated - result = await svc.patch_contribution(str(_oid()), ContributionPatch(formula="H2O", needs_build=False)) + result = await svc.patch_contribution(str(_oid()), ContributionPatch(formula="H2O")) assert result == [updated] contrib_repo.update_contribution_by_identifiers.assert_awaited_once() args, _ = contrib_repo.update_contribution_by_identifiers.call_args project, identifier, version, condition_key, update_data = args assert (project, identifier, version, condition_key) == ("mp-team", "mp-1", 1, "") - assert update_data == {"formula": "H2O", "needs_build": False} + assert update_data == {"formula": "H2O"} assert "data" not in update_data # no data on the patch async def test_data_without_conditions_annotates_and_patches_target(self): diff --git a/mpcontribs-api/tests/unit/domains/test_contributions_models.py b/mpcontribs-api/tests/unit/domains/test_contributions_models.py index 4fb51eb508..1c5372e3d7 100644 --- a/mpcontribs-api/tests/unit/domains/test_contributions_models.py +++ b/mpcontribs-api/tests/unit/domains/test_contributions_models.py @@ -57,7 +57,6 @@ def test_required_fields_set_correctly(self): def test_defaults(self): contrib = _make_contribution_in() - assert contrib.needs_build is True assert contrib.structures is None assert contrib.tables is None assert contrib.attachments is None @@ -217,9 +216,8 @@ def test_all_fields_optional(self): assert patch.data is None def test_partial_patch(self): - patch = ContributionPatch(formula="Li2O", needs_build=False) + patch = ContributionPatch(formula="Li2O") assert patch.formula == "Li2O" - assert patch.needs_build is False assert patch.project is None def test_data_can_be_set(self): From fab2f2b53294cc2fedb3eb99a2b91490d7986ac8 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Tue, 28 Jul 2026 11:32:00 -0700 Subject: [PATCH 521/591] Added BulkUpdateSummary to handle the bulk update of Contributions, which right now only allows setting of is_public --- .../mpcontribs_api/domains/_shared/bulk.py | 16 +++ .../domains/contributions/models.py | 8 ++ .../domains/contributions/repository.py | 33 ++++++ .../domains/contributions/router.py | 17 ++- .../domains/contributions/service.py | 25 +++++ .../tests/integration/db/test_bulk_publish.py | 105 ++++++++++++++++++ .../integration/test_contributions_routes.py | 38 ++++++- .../unit/domains/test_contribution_service.py | 74 +++++++++++- .../unit/domains/test_contributions_models.py | 6 + 9 files changed, 319 insertions(+), 3 deletions(-) create mode 100644 mpcontribs-api/tests/integration/db/test_bulk_publish.py diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/bulk.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/bulk.py index 718e2c580f..a8106027d7 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/bulk.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/bulk.py @@ -32,6 +32,22 @@ class BulkDeleteSummary[T](BaseModel): num_children_deleted: int +class BulkUpdateSummary(BaseModel): + """Result of a filtered bulk update. + + No per-item result, reflects MongoDB's bulk update response. + + Attributes: + matched: documents the (scoped) filter matched + modified: documents whose stored value actually changed + projects: the projects the update touched, so the caller can see its blast radius + """ + + matched: int + modified: int + projects: list[str] + + def bulk_failure_from_exception(index: int, identifier: dict[str, Any] | None, exc: BaseException) -> BulkFailure: """Translate any exception into a BulkFailure entry. diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py index 98050ccc79..841b635f4a 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py @@ -159,6 +159,7 @@ class ContributionPatch(SparseFieldsModel): identifier: SearchStr | None = None version: int | None = None formula: DisplayStr | None = None + is_public: bool | None = None data: ContributionData = Field(default=None, description=CONTRIBUTION_DATA_INPUT_DESCRIPTION) structures: list[Link[Structure]] | None = None tables: list[Link[Table]] | None = None @@ -207,3 +208,10 @@ def convert_str_to_oid(cls, v: str): "Invalid ObjectId format. Must be 12-byte input or a 24-character hex string", oid=v, ) from err + + +# Right now, only is_public makes sense to update across multiple Contributions +class ContributionBulkUpdate(BaseModel): + """Body of the filtered bulk-update route (``PATCH /api/v1/contributions``).""" + + is_public: bool diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py index 6f49eab861..32bf1c1271 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py @@ -9,6 +9,7 @@ from types_aiobotocore_s3 import S3Client from mpcontribs_api.authz import User +from mpcontribs_api.domains._shared.bulk import BulkUpdateSummary from mpcontribs_api.domains._shared.repository import MongoDbRepository from mpcontribs_api.domains._shared.types import DownloadFormat, ShortMimeFormat from mpcontribs_api.domains.contributions.data import is_quantity_leaf @@ -131,6 +132,38 @@ async def delete_contributions( """ return await filter.filter(self.document_model.find(self._scope)).delete_many() + async def bulk_update( + self, + filter: ContributionFilter, + fields: dict[str, Any], + *, + project_constraint: frozenset[str] | None, + ) -> BulkUpdateSummary: + """``$set`` ``fields`` on every scoped row matching ``filter``, optionally limited to projects. + + Args: + filter: the caller-supplied query, applied on top of the user scope + fields: the field/value map handed verbatim to ``$set`` + project_constraint: projects the update is limited to, or ``None`` for no limit + + Returns: + BulkUpdateSummary: the counts of matched and modified contribs, and the list of the projects changed + """ + criteria: list[Any] = [] + if self._scope: + criteria.append(self._scope) + if project_constraint is not None: + criteria.append({"project": {"$in": sorted(project_constraint)}}) + query = filter.filter(self.document_model.find(*criteria)).get_filter_query() + collection = self.document_model.get_pymongo_collection() + # Distinct projects among the *matched* rows (computed before the write, since ``fields`` may + # change values the filter keyed on) so the caller can recompute those projects' rollups. + projects = {p for p in await collection.distinct("project", query) if p is not None} + result = await collection.update_many(query, {"$set": fields}) + return BulkUpdateSummary( + matched=result.matched_count, modified=result.modified_count, projects=sorted(projects) + ) + async def insert_many_contributions( self, docs: list[Contribution], diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py index 5775c85ecb..08974b04e5 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py @@ -6,7 +6,7 @@ from mpcontribs_api.config import get_settings from mpcontribs_api.dependencies import S3Dep, require_user -from mpcontribs_api.domains._shared.bulk import BulkWriteSummary +from mpcontribs_api.domains._shared.bulk import BulkUpdateSummary, BulkWriteSummary from mpcontribs_api.domains._shared.types import ( DownloadFormat, FieldSelector, @@ -16,6 +16,7 @@ from mpcontribs_api.domains.contributions.dependencies import ContributionDep, ContributionServiceDep from mpcontribs_api.domains.contributions.models import ( Contribution, + ContributionBulkUpdate, ContributionFilter, ContributionIn, ContributionOut, @@ -68,6 +69,20 @@ async def delete_contributions( return await repo.delete_contributions(filter=filter) +@router.patch("", dependencies=[Depends(require_user)]) +async def bulk_update_contributions( + service: ContributionServiceDep, + body: ContributionBulkUpdate, + filter: ContributionFilter = FilterDepends(ContributionFilter), +) -> BulkUpdateSummary: + """Update every contribution matching ``filter`` that the caller may write. + + The update is constrained to the caller's writable projects (admins are unconstrained), so a + filter that also matches public contributions in other projects leaves those untouched. + """ + return await service.bulk_update(filter=filter, update=body) + + # TODO: Might want to take contributions in from request body and run model_validate_json on it (much faster) @router.post("", response_model=BulkWriteSummary[Contribution], dependencies=[Depends(require_user)]) async def insert_contributions( diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py index 7e218f2265..db62b135ed 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py @@ -15,6 +15,7 @@ from mpcontribs_api.domains._shared.bulk import ( BulkDeleteSummary, BulkFailure, + BulkUpdateSummary, BulkWriteSummary, bulk_failure_from_exception, ) @@ -22,6 +23,7 @@ from mpcontribs_api.domains.attachments.repository import MongoDbAttachmentRepository from mpcontribs_api.domains.contributions.models import ( Contribution, + ContributionBulkUpdate, ContributionFilter, ContributionIn, ContributionPatch, @@ -703,6 +705,29 @@ async def patch_contribution( await self.update_project({target.project}) return result + async def bulk_update(self, filter: ContributionFilter, update: ContributionBulkUpdate) -> BulkUpdateSummary: + """Apply a filtered field update to every contribution matching ``filter`` the caller may write. + + Scoped to Contributions that a user can write to. Only the touched projects' rollups afterward, as the + other write paths do. + + Args: + filter: the contributions to target, applied on top of the user scope + update: the fields to set; every field the caller supplied is applied verbatim + + Returns: + BulkUpdateSummary: matched/modified counts and the projects touched + """ + fields = update.model_dump(exclude_unset=True) + if not fields: + # Nothing to set: MongoDB rejects an empty $set, so short-circuit with a no-op result. + return BulkUpdateSummary(matched=0, modified=0, projects=[]) + # Admins may write any project; everyone else is limited to the projects they own/contribute to. + project_constraint = None if self._user.is_admin else self._user.writable_projects + update_summary = await self._contributions.bulk_update(filter, fields, project_constraint=project_constraint) + await self.update_project(project_ids=update_summary.projects) + return update_summary + async def delete_contributions(self, filter: ContributionFilter) -> BulkDeleteSummary: """Delete a contribution and all of its child components diff --git a/mpcontribs-api/tests/integration/db/test_bulk_publish.py b/mpcontribs-api/tests/integration/db/test_bulk_publish.py new file mode 100644 index 0000000000..3245b8f0ce --- /dev/null +++ b/mpcontribs-api/tests/integration/db/test_bulk_publish.py @@ -0,0 +1,105 @@ +import pytest + +from mpcontribs_api.authz import User +from mpcontribs_api.domains.attachments.repository import MongoDbAttachmentRepository +from mpcontribs_api.domains.contributions.models import ( + Contribution, + ContributionBulkUpdate, + ContributionFilter, + ContributionIn, + ContributionPatch, +) +from mpcontribs_api.domains.contributions.repository import MongoDbContributionRepository +from mpcontribs_api.domains.contributions.service import ContributionService +from mpcontribs_api.domains.projects.repository import MongoDbProjectRepository +from mpcontribs_api.domains.structures.repository import MongoDbStructureRepository +from mpcontribs_api.domains.tables.repository import MongoDbTableRepository + +pytestmark = [pytest.mark.db, pytest.mark.asyncio(loop_scope="session")] + +# ALICE may write only PROJ_A; PROJ_B is foreign to her. ADMIN may write anything. +ALICE = User(username="google:alice@example.com", groups=frozenset({"proj-a"})) +ADMIN = User(username="google:admin@example.com", groups=frozenset({"admin"})) +PROJ_A = "proj-a" +PROJ_B = "proj-b" + + +def _service(client, user: User) -> ContributionService: + """A ContributionService wired exactly like the FastAPI dependency, for ``user``.""" + return ContributionService( + client=client, + user=user, + projects=MongoDbProjectRepository(user), + contributions=MongoDbContributionRepository(user), + structures=MongoDbStructureRepository(user), + attachments=MongoDbAttachmentRepository(user), + tables=MongoDbTableRepository(user), + ) + + +async def _insert(project: str, identifier: str, *, is_public: bool) -> Contribution: + """Insert one contribution directly (bypassing the write pipeline) with a chosen visibility.""" + doc = Contribution.from_input_model( + ContributionIn(project=project, identifier=identifier, formula="Fe2O3", data={"x": 1.0}) + ) + doc.is_public = is_public + await doc.insert() + return doc + + +async def _is_public(cid) -> bool: + found = await Contribution.find_one(Contribution.id == cid) + assert found is not None + return found.is_public + + +class TestBulkPublishAuthorization: + async def test_publishes_only_writable_projects(self, db, mongo_client): + # Alice's own project is private-but-writable; the foreign project is out of her write scope. + a = await _insert(PROJ_A, "c1", is_public=False) + b = await _insert(PROJ_B, "c1", is_public=False) + + summary = await _service(mongo_client, ALICE).bulk_update( + ContributionFilter(), ContributionBulkUpdate(is_public=True) + ) + + assert summary.projects == [PROJ_A] + assert (summary.matched, summary.modified) == (1, 1) + assert await _is_public(a.id) is True + assert await _is_public(b.id) is False # foreign project untouched + + async def test_public_in_other_project_not_modified(self, db, mongo_client): + # A public contribution in a foreign project is *readable* by Alice (scope), but the bulk + # update constrains to writable projects, so a filter matching it modifies nothing. + b = await _insert(PROJ_B, "pub", is_public=True) + + summary = await _service(mongo_client, ALICE).bulk_update( + ContributionFilter(is_public=True), ContributionBulkUpdate(is_public=False) + ) + + assert (summary.matched, summary.modified) == (0, 0) + assert summary.projects == [] + assert await _is_public(b.id) is True # still public + + async def test_admin_is_unconstrained_by_project(self, db, mongo_client): + a = await _insert(PROJ_A, "c1", is_public=False) + b = await _insert(PROJ_B, "c1", is_public=False) + + summary = await _service(mongo_client, ADMIN).bulk_update( + ContributionFilter(), ContributionBulkUpdate(is_public=True) + ) + + assert set(summary.projects) == {PROJ_A, PROJ_B} + assert (summary.matched, summary.modified) == (2, 2) + assert await _is_public(a.id) is True + assert await _is_public(b.id) is True + + +class TestSinglePublish: + async def test_patch_by_id_publishes_single_contribution(self, db, mongo_client): + a = await _insert(PROJ_A, "c1", is_public=False) + + result = await _service(mongo_client, ALICE).patch_contribution(str(a.id), ContributionPatch(is_public=True)) + + assert len(result) == 1 + assert await _is_public(a.id) is True diff --git a/mpcontribs-api/tests/integration/test_contributions_routes.py b/mpcontribs-api/tests/integration/test_contributions_routes.py index 1900be16f6..e745566a2a 100644 --- a/mpcontribs-api/tests/integration/test_contributions_routes.py +++ b/mpcontribs-api/tests/integration/test_contributions_routes.py @@ -1,7 +1,7 @@ import pytest from beanie import PydanticObjectId -from mpcontribs_api.domains._shared.bulk import BulkDeleteSummary, BulkWriteSummary +from mpcontribs_api.domains._shared.bulk import BulkDeleteSummary, BulkUpdateSummary, BulkWriteSummary from mpcontribs_api.domains.contributions.dependencies import ( get_contribution_service, get_scoped_contributions, @@ -259,6 +259,37 @@ def test_repo_error_surfaces_as_uniform_json(self, client, contribution_repo): # --------------------------------------------------------------------------- +class TestBulkUpdateContributions: + def test_publish_returns_200_and_summary(self, client, contribution_service): + contribution_service.bulk_update.return_value = BulkUpdateSummary(matched=3, modified=2, projects=["mp-team"]) + r = client.patch("/api/v1/contributions", json={"is_public": True}) + assert r.status_code == 200 + assert r.json() == {"matched": 3, "modified": 2, "projects": ["mp-team"]} + + def test_forwards_update_and_filter(self, client, contribution_service): + from mpcontribs_api.domains.contributions.models import ContributionFilter + + contribution_service.bulk_update.return_value = BulkUpdateSummary(matched=0, modified=0, projects=[]) + client.patch("/api/v1/contributions?project=mp-team", json={"is_public": True}) + contribution_service.bulk_update.assert_awaited_once() + kwargs = contribution_service.bulk_update.call_args.kwargs + assert kwargs["update"].is_public is True + assert isinstance(kwargs["filter"], ContributionFilter) + + def test_missing_is_public_returns_422(self, client, contribution_service): + r = client.patch("/api/v1/contributions", json={}) + assert r.status_code == 422 + contribution_service.bulk_update.assert_not_called() + + def test_patch_by_id_forwards_is_public(self, client, contribution_service): + # The single-contribution publish path: {"is_public": true} reaches the service patch. + contribution_service.patch_contribution.return_value = [SAMPLE_OUT] + r = client.patch(f"/api/v1/contributions/{PydanticObjectId()}", json={"is_public": True}) + assert r.status_code == 200 + patch = contribution_service.patch_contribution.call_args.kwargs["patch"] + assert patch.is_public is True + + class TestContributionMutationsRequireAuth: def test_post_anon_401(self, client, contribution_service): r = client.post("/api/v1/contributions", json=[], headers=FORCE_ANON_HEADERS) @@ -276,6 +307,11 @@ def test_delete_collection_anon_401(self, client, contribution_repo): assert r.status_code == 401 contribution_repo.delete_contributions.assert_not_called() + def test_patch_collection_anon_401(self, client, contribution_service): + r = client.patch("/api/v1/contributions", json={"is_public": True}, headers=FORCE_ANON_HEADERS) + assert r.status_code == 401 + contribution_service.bulk_update.assert_not_called() + def test_delete_by_id_anon_401(self, client, contribution_service): r = client.delete(f"/api/v1/contributions/{PydanticObjectId()}", headers=FORCE_ANON_HEADERS) assert r.status_code == 401 diff --git a/mpcontribs-api/tests/unit/domains/test_contribution_service.py b/mpcontribs-api/tests/unit/domains/test_contribution_service.py index c4f054c265..e8b2de7e09 100644 --- a/mpcontribs-api/tests/unit/domains/test_contribution_service.py +++ b/mpcontribs-api/tests/unit/domains/test_contribution_service.py @@ -10,7 +10,14 @@ from mpcontribs_api.authz import ADMIN_GROUP, User from mpcontribs_api.config import MongoSettings from mpcontribs_api.domains.attachments.models import Attachment, AttachmentIn -from mpcontribs_api.domains.contributions.models import Contribution, ContributionIn, ContributionPatch +from mpcontribs_api.domains._shared.bulk import BulkUpdateSummary +from mpcontribs_api.domains.contributions.models import ( + Contribution, + ContributionBulkUpdate, + ContributionFilter, + ContributionIn, + ContributionPatch, +) from mpcontribs_api.domains.contributions.service import ContributionService from mpcontribs_api.domains.contributions.stats import ProjectAggregate from mpcontribs_api.domains.structures.models import ( @@ -1235,6 +1242,19 @@ async def test_scalar_only_patch_updates_target_row(self): assert update_data == {"formula": "H2O"} assert "data" not in update_data # no data on the patch + async def test_is_public_patch_flows_through(self): + # Publishing a single contribution: is_public is a scalar field, so it reaches the repo's + # update verbatim via patch.model_dump(exclude_unset=True, exclude={"data"}). + svc, contrib_repo, *_ = _make_service() + contrib_repo.get_contribution_document.return_value = _target_doc(condition_key="") + contrib_repo.update_contribution_by_identifiers.return_value = _target_doc() + + await svc.patch_contribution(str(_oid()), ContributionPatch(is_public=True)) + + args, _ = contrib_repo.update_contribution_by_identifiers.call_args + *_ignored, update_data = args + assert update_data == {"is_public": True} + async def test_data_without_conditions_annotates_and_patches_target(self): svc, contrib_repo, *_ = _make_service() target = _target_doc(condition_key="") @@ -1305,3 +1325,55 @@ async def test_data_patch_forwards_replace_flag(self): _, kwargs = contrib_repo.update_contribution_by_identifiers.call_args assert kwargs["replace_data"] is True + + +# --------------------------------------------------------------------------- +# bulk_update — filtered field update, project-authorized +# --------------------------------------------------------------------------- + + +class TestBulkUpdate: + async def test_non_admin_constrains_to_writable_projects(self): + # A non-admin's bulk update is limited to the projects they may write, not merely read. + user = User(username="google:alice@example.com", groups=frozenset({"mp-team"})) + svc, contrib_repo, *_ = _make_service(user=user) + contrib_repo.bulk_update.return_value = BulkUpdateSummary(matched=3, modified=2, projects=["mp-team"]) + + summary = await svc.bulk_update(ContributionFilter(), ContributionBulkUpdate(is_public=True)) + + contrib_repo.bulk_update.assert_awaited_once() + args, kwargs = contrib_repo.bulk_update.call_args + assert args[1] == {"is_public": True} + assert kwargs["project_constraint"] == frozenset({"mp-team"}) + assert (summary.matched, summary.modified, summary.projects) == (3, 2, ["mp-team"]) + + async def test_admin_is_unconstrained(self): + # Admins update across any project: no project constraint is applied. + svc, contrib_repo, *_ = _make_service() # admin by default + contrib_repo.bulk_update.return_value = BulkUpdateSummary(matched=1, modified=1, projects=["any-proj"]) + + await svc.bulk_update(ContributionFilter(), ContributionBulkUpdate(is_public=True)) + + _, kwargs = contrib_repo.bulk_update.call_args + assert kwargs["project_constraint"] is None + + async def test_only_set_fields_are_written(self): + # The service $sets exactly the fields the body carried (exclude_unset), so extending + # ContributionBulkUpdate with new fields flows through without touching the service. + svc, contrib_repo, *_ = _make_service() + contrib_repo.bulk_update.return_value = BulkUpdateSummary(matched=1, modified=1, projects=["p"]) + + await svc.bulk_update(ContributionFilter(), ContributionBulkUpdate(is_public=False)) + + args, _ = contrib_repo.bulk_update.call_args + assert args[1] == {"is_public": False} + + async def test_recomputes_touched_project_stats(self): + # Every touched project's rollup is recomputed afterward, like the other write paths. + svc, contrib_repo, *_ = _make_service() + contrib_repo.bulk_update.return_value = BulkUpdateSummary(matched=2, modified=2, projects=["pa", "pb"]) + + await svc.bulk_update(ContributionFilter(), ContributionBulkUpdate(is_public=False)) + + aggregated = {call.args[0] for call in contrib_repo.aggregate_project_stats.call_args_list} + assert aggregated == {"pa", "pb"} diff --git a/mpcontribs-api/tests/unit/domains/test_contributions_models.py b/mpcontribs-api/tests/unit/domains/test_contributions_models.py index 1c5372e3d7..2bce6e4277 100644 --- a/mpcontribs-api/tests/unit/domains/test_contributions_models.py +++ b/mpcontribs-api/tests/unit/domains/test_contributions_models.py @@ -214,12 +214,18 @@ def test_all_fields_optional(self): assert patch.identifier is None assert patch.formula is None assert patch.data is None + assert patch.is_public is None def test_partial_patch(self): patch = ContributionPatch(formula="Li2O") assert patch.formula == "Li2O" assert patch.project is None + def test_is_public_settable(self): + # A contribution's visibility is patchable (publishing), unlike on ``ContributionIn``. + assert ContributionPatch(is_public=True).is_public is True + assert ContributionPatch(is_public=False).is_public is False + def test_data_can_be_set(self): patch = ContributionPatch(data={"new_key": 42}) assert patch.data == {"new_key": 42} From a17069cce66b01c9538554d9a7d35ad8fd4ea412 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Tue, 28 Jul 2026 15:37:40 -0700 Subject: [PATCH 522/591] Restored out-of-scope diffs to origin/dev --- .github/workflows/testing.yml | 2 - .pre-commit-config.yaml | 6 ++ mpcontribs-client/pyproject.toml | 4 +- mpcontribs-client/requirements/deployment.txt | 8 +-- .../requirements/ubuntu-latest_py3.11.txt | 6 +- .../requirements/ubuntu-latest_py3.12.txt | 6 +- mpcontribs-client/tests/test_client.py | 7 ++- mpcontribs-kernel-gateway/Dockerfile | 2 +- .../requirements/deployment.txt | 16 ++--- .../requirements/ubuntu-latest_py3.11.txt | 12 ++-- .../ubuntu-latest_py3.11_extras.txt | 12 ++-- .../requirements/ubuntu-latest_py3.12.txt | 12 ++-- .../ubuntu-latest_py3.12_extras.txt | 12 ++-- .../lux/projects/alab/schemas/experiments.py | 27 +++++++- .../requirements-ubuntu-latest_py3.11.txt | 18 +++--- ...quirements-ubuntu-latest_py3.11_extras.txt | 24 +++---- .../requirements-ubuntu-latest_py3.12.txt | 18 +++--- ...quirements-ubuntu-latest_py3.12_extras.txt | 24 +++---- mpcontribs-lux/tests/test_autogen.py | 19 ++---- mpcontribs-lux/uv.lock | 62 +++++++++++++++++-- mpcontribs-portal/Dockerfile | 4 +- mpcontribs-portal/package.json | 18 +++--- mpcontribs-portal/pyproject.toml | 3 +- mpcontribs-portal/requirements/deployment.txt | 20 +++--- .../requirements/ubuntu-latest_py3.11.txt | 12 ++-- .../ubuntu-latest_py3.11_extras.txt | 14 ++--- .../requirements/ubuntu-latest_py3.12.txt | 12 ++-- .../ubuntu-latest_py3.12_extras.txt | 14 ++--- .../dependencies/requirements.txt | 55 +++++----------- 29 files changed, 254 insertions(+), 195 deletions(-) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 20bdbf43f5..5e488957d0 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -58,8 +58,6 @@ jobs: run: | cd mpcontribs-client python${{ matrix.python-version }} -m pip install --no-deps . - python${{ matrix.python-version }} -m flake8 --max-line-length 100 - python${{ matrix.python-version }} -m pycodestyle --max-line-length 100 . python${{ matrix.python-version }} -m pytest -n auto -v -s --cov=mpcontribs/client --cov-report=term-missing --cov-report=xml --ignore=bravado python${{ matrix.python-version }} -m build --outdir ../dist diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index eeb6cde658..70b9f4d62d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -12,6 +12,12 @@ exclude: | ) repos: + - repo: https://github.com/charliermarsh/ruff-pre-commit + rev: v0.12.0 + hooks: + - id: ruff + args: [--fix, --ignore, "D,E501,E741,E402"] + - repo: https://github.com/pre-commit/pre-commit-hooks rev: v6.0.0 hooks: diff --git a/mpcontribs-client/pyproject.toml b/mpcontribs-client/pyproject.toml index ecf1e0ceed..b7cfed6839 100644 --- a/mpcontribs-client/pyproject.toml +++ b/mpcontribs-client/pyproject.toml @@ -14,6 +14,9 @@ where = ["."] exclude = ["tests"] include = ["mpcontribs.client"] +[tool.ruff.lint.pycodestyle] +max-line-length = 100 + [project] name = "mpcontribs-client" dynamic = ["version"] @@ -53,7 +56,6 @@ Documentation = "https://docs.materialsproject.org/services/mpcontribs" dev = [ "flake8", "pytest", - "pytest-flake8", "pytest-pycodestyle", "pytest-cov", "pytest-xdist", diff --git a/mpcontribs-client/requirements/deployment.txt b/mpcontribs-client/requirements/deployment.txt index b70e9fb704..f19c9e1489 100644 --- a/mpcontribs-client/requirements/deployment.txt +++ b/mpcontribs-client/requirements/deployment.txt @@ -84,7 +84,7 @@ lark==1.3.1 # via rfc3987-syntax lxml==6.1.1 # via pymatgen-core -matplotlib==3.10.9 +matplotlib==3.11.0 # via # -r python/requirements.txt # pymatgen-core @@ -96,7 +96,7 @@ monty==2026.5.18 # via pymatgen-core mpmath==1.3.0 # via sympy -msgpack==1.1.2 +msgpack==1.2.1 # via # bravado # bravado-core @@ -230,7 +230,7 @@ sympy==1.14.0 # via pymatgen-core tabulate==0.10.0 # via pymatgen-core -tqdm==4.68.1 +tqdm==4.68.2 # via # mpcontribs-client (MPContribs/mpcontribs-client/pyproject.toml) # pymatgen-core @@ -250,7 +250,7 @@ typing-extensions==4.15.0 # swagger-spec-validator tzdata==2026.2 # via arrow -ujson==5.12.1 +ujson==5.13.0 # via mpcontribs-client (MPContribs/mpcontribs-client/pyproject.toml) uncertainties==3.2.3 # via pymatgen-core diff --git a/mpcontribs-client/requirements/ubuntu-latest_py3.11.txt b/mpcontribs-client/requirements/ubuntu-latest_py3.11.txt index a458a3d981..3beb6a244a 100644 --- a/mpcontribs-client/requirements/ubuntu-latest_py3.11.txt +++ b/mpcontribs-client/requirements/ubuntu-latest_py3.11.txt @@ -50,7 +50,7 @@ fonttools==4.63.0 # via matplotlib fqdn==1.5.1 # via jsonschema -idna==3.15 +idna==3.18 # via # jsonschema # requests @@ -94,7 +94,7 @@ monty==2026.5.18 # via pymatgen-core mpmath==1.3.0 # via sympy -msgpack==1.1.2 +msgpack==1.2.1 # via # bravado # bravado-core @@ -244,7 +244,7 @@ typing-extensions==4.15.0 # swagger-spec-validator tzdata==2026.2 # via arrow -ujson==5.12.1 +ujson==5.13.0 # via mpcontribs-client (pyproject.toml) uncertainties==3.2.3 # via pymatgen-core diff --git a/mpcontribs-client/requirements/ubuntu-latest_py3.12.txt b/mpcontribs-client/requirements/ubuntu-latest_py3.12.txt index 2c31ad32ed..150beba0ea 100644 --- a/mpcontribs-client/requirements/ubuntu-latest_py3.12.txt +++ b/mpcontribs-client/requirements/ubuntu-latest_py3.12.txt @@ -50,7 +50,7 @@ fonttools==4.63.0 # via matplotlib fqdn==1.5.1 # via jsonschema -idna==3.15 +idna==3.18 # via # jsonschema # requests @@ -94,7 +94,7 @@ monty==2026.5.18 # via pymatgen-core mpmath==1.3.0 # via sympy -msgpack==1.1.2 +msgpack==1.2.1 # via # bravado # bravado-core @@ -243,7 +243,7 @@ typing-extensions==4.15.0 # swagger-spec-validator tzdata==2026.2 # via arrow -ujson==5.12.1 +ujson==5.13.0 # via mpcontribs-client (pyproject.toml) uncertainties==3.2.3 # via pymatgen-core diff --git a/mpcontribs-client/tests/test_client.py b/mpcontribs-client/tests/test_client.py index 8dd7c344c9..819490c037 100644 --- a/mpcontribs-client/tests/test_client.py +++ b/mpcontribs-client/tests/test_client.py @@ -1,10 +1,11 @@ -import pytest import logging +from unittest.mock import MagicMock, patch -from unittest.mock import patch, MagicMock -from mpcontribs.client import validate_email, Client, email_format +import pytest from swagger_spec_validator.common import SwaggerValidationError +from mpcontribs.client import Client, email_format, validate_email + logger = logging.Logger(__name__) logger.propagate = True diff --git a/mpcontribs-kernel-gateway/Dockerfile b/mpcontribs-kernel-gateway/Dockerfile index 3c479ac0ee..1360d95403 100644 --- a/mpcontribs-kernel-gateway/Dockerfile +++ b/mpcontribs-kernel-gateway/Dockerfile @@ -1,4 +1,4 @@ -FROM materialsproject/devops:python-3.1113.4 AS base +FROM materialsproject/devops:python-3.1113.17 AS base RUN apt-get update && apt-get install -y --no-install-recommends libopenblas-dev libpq-dev curl && apt-get clean FROM base AS python-deps diff --git a/mpcontribs-kernel-gateway/requirements/deployment.txt b/mpcontribs-kernel-gateway/requirements/deployment.txt index 238296ed41..827d405953 100644 --- a/mpcontribs-kernel-gateway/requirements/deployment.txt +++ b/mpcontribs-kernel-gateway/requirements/deployment.txt @@ -89,7 +89,7 @@ idna==3.18 # requests importlib-resources==7.1.0 # via swagger-spec-validator -ipykernel==7.2.0 +ipykernel==7.3.0 # via -r MPContribs/mpcontribs-kernel-gateway/requirements.in ipython==9.14.1 # via @@ -124,7 +124,7 @@ jsonschema[format-nongpl]==4.26.0 # swagger-spec-validator jsonschema-specifications==2025.9.1 # via jsonschema -jupyter-client==8.9.0 +jupyter-client==8.9.1 # via # -r MPContribs/mpcontribs-kernel-gateway/requirements.in # ipykernel @@ -144,7 +144,7 @@ jupyter-events==0.12.1 # via jupyter-server jupyter-kernel-gateway==3.0.1 # via -r MPContribs/mpcontribs-kernel-gateway/requirements.in -jupyter-server==2.19.0 +jupyter-server==2.20.0 # via jupyter-kernel-gateway jupyter-server-terminals==0.5.4 # via jupyter-server @@ -168,7 +168,7 @@ markupsafe==3.0.3 # via # jinja2 # nbconvert -matplotlib==3.10.9 +matplotlib==3.11.0 # via # -r python/requirements.txt # pymatgen-core @@ -186,7 +186,7 @@ mpcontribs-client==5.10.5 # via -r MPContribs/mpcontribs-kernel-gateway/requirements.in mpmath==1.3.0 # via sympy -msgpack==1.1.2 +msgpack==1.2.1 # via # bravado # bravado-core @@ -201,7 +201,7 @@ nbformat==5.10.4 # jupyter-server # nbclient # nbconvert -nest-asyncio==1.6.0 +nest-asyncio2==1.7.2 # via ipykernel networkx==3.6.1 # via pymatgen-core @@ -390,7 +390,7 @@ tornado==6.5.7 # jupyter-kernel-gateway # jupyter-server # terminado -tqdm==4.68.1 +tqdm==4.68.2 # via # mpcontribs-client # pymatgen-core @@ -424,7 +424,7 @@ typing-extensions==4.15.0 # swagger-spec-validator tzdata==2026.2 # via arrow -ujson==5.12.1 +ujson==5.13.0 # via mpcontribs-client uncertainties==3.2.3 # via pymatgen-core diff --git a/mpcontribs-kernel-gateway/requirements/ubuntu-latest_py3.11.txt b/mpcontribs-kernel-gateway/requirements/ubuntu-latest_py3.11.txt index 58e4375daf..e6e4d71cf7 100644 --- a/mpcontribs-kernel-gateway/requirements/ubuntu-latest_py3.11.txt +++ b/mpcontribs-kernel-gateway/requirements/ubuntu-latest_py3.11.txt @@ -22,7 +22,7 @@ beautifulsoup4==4.14.3 # via nbconvert bibtexparser==1.4.4 # via pymatgen-core -bleach[css]==6.3.0 +bleach[css]==6.4.0 # via nbconvert blinker==1.9.0 # via -r requirements.in @@ -82,7 +82,7 @@ fonttools==4.63.0 # via matplotlib fqdn==1.5.1 # via jsonschema -idna==3.15 +idna==3.18 # via # anyio # jsonschema @@ -146,7 +146,7 @@ jupyter-events==0.12.1 # via jupyter-server jupyter-kernel-gateway==3.0.1 # via -r requirements.in -jupyter-server==2.18.2 +jupyter-server==2.20.0 # via jupyter-kernel-gateway jupyter-server-terminals==0.5.4 # via jupyter-server @@ -186,7 +186,7 @@ mpcontribs-client==5.10.5 # via -r requirements.in mpmath==1.3.0 # via sympy -msgpack==1.1.2 +msgpack==1.2.1 # via # bravado # bravado-core @@ -379,7 +379,7 @@ terminado==0.18.1 # jupyter-server-terminals tinycss2==1.4.0 # via bleach -tornado==6.5.5 +tornado==6.5.7 # via # ipykernel # jupyter-client @@ -419,7 +419,7 @@ typing-extensions==4.15.0 # swagger-spec-validator tzdata==2026.2 # via arrow -ujson==5.12.1 +ujson==5.13.0 # via mpcontribs-client uncertainties==3.2.3 # via pymatgen-core diff --git a/mpcontribs-kernel-gateway/requirements/ubuntu-latest_py3.11_extras.txt b/mpcontribs-kernel-gateway/requirements/ubuntu-latest_py3.11_extras.txt index dd3cbe3c39..a0ccde26a0 100644 --- a/mpcontribs-kernel-gateway/requirements/ubuntu-latest_py3.11_extras.txt +++ b/mpcontribs-kernel-gateway/requirements/ubuntu-latest_py3.11_extras.txt @@ -22,7 +22,7 @@ beautifulsoup4==4.14.3 # via nbconvert bibtexparser==1.4.4 # via pymatgen-core -bleach[css]==6.3.0 +bleach[css]==6.4.0 # via nbconvert blinker==1.9.0 # via -r requirements.in @@ -82,7 +82,7 @@ fonttools==4.63.0 # via matplotlib fqdn==1.5.1 # via jsonschema -idna==3.15 +idna==3.18 # via # anyio # jsonschema @@ -146,7 +146,7 @@ jupyter-events==0.12.1 # via jupyter-server jupyter-kernel-gateway==3.0.1 # via -r requirements.in -jupyter-server==2.18.2 +jupyter-server==2.20.0 # via jupyter-kernel-gateway jupyter-server-terminals==0.5.4 # via jupyter-server @@ -186,7 +186,7 @@ mpcontribs-client==5.10.5 # via -r requirements.in mpmath==1.3.0 # via sympy -msgpack==1.1.2 +msgpack==1.2.1 # via # bravado # bravado-core @@ -379,7 +379,7 @@ terminado==0.18.1 # jupyter-server-terminals tinycss2==1.4.0 # via bleach -tornado==6.5.5 +tornado==6.5.7 # via # ipykernel # jupyter-client @@ -419,7 +419,7 @@ typing-extensions==4.15.0 # swagger-spec-validator tzdata==2026.2 # via arrow -ujson==5.12.1 +ujson==5.13.0 # via mpcontribs-client uncertainties==3.2.3 # via pymatgen-core diff --git a/mpcontribs-kernel-gateway/requirements/ubuntu-latest_py3.12.txt b/mpcontribs-kernel-gateway/requirements/ubuntu-latest_py3.12.txt index 7e8f1858f9..3e37de61df 100644 --- a/mpcontribs-kernel-gateway/requirements/ubuntu-latest_py3.12.txt +++ b/mpcontribs-kernel-gateway/requirements/ubuntu-latest_py3.12.txt @@ -22,7 +22,7 @@ beautifulsoup4==4.14.3 # via nbconvert bibtexparser==1.4.4 # via pymatgen-core -bleach[css]==6.3.0 +bleach[css]==6.4.0 # via nbconvert blinker==1.9.0 # via -r requirements.in @@ -82,7 +82,7 @@ fonttools==4.63.0 # via matplotlib fqdn==1.5.1 # via jsonschema -idna==3.15 +idna==3.18 # via # anyio # jsonschema @@ -146,7 +146,7 @@ jupyter-events==0.12.1 # via jupyter-server jupyter-kernel-gateway==3.0.1 # via -r requirements.in -jupyter-server==2.18.2 +jupyter-server==2.20.0 # via jupyter-kernel-gateway jupyter-server-terminals==0.5.4 # via jupyter-server @@ -186,7 +186,7 @@ mpcontribs-client==5.10.5 # via -r requirements.in mpmath==1.3.0 # via sympy -msgpack==1.1.2 +msgpack==1.2.1 # via # bravado # bravado-core @@ -377,7 +377,7 @@ terminado==0.18.1 # jupyter-server-terminals tinycss2==1.4.0 # via bleach -tornado==6.5.5 +tornado==6.5.7 # via # ipykernel # jupyter-client @@ -416,7 +416,7 @@ typing-extensions==4.15.0 # swagger-spec-validator tzdata==2026.2 # via arrow -ujson==5.12.1 +ujson==5.13.0 # via mpcontribs-client uncertainties==3.2.3 # via pymatgen-core diff --git a/mpcontribs-kernel-gateway/requirements/ubuntu-latest_py3.12_extras.txt b/mpcontribs-kernel-gateway/requirements/ubuntu-latest_py3.12_extras.txt index 31ccc84e2a..01f8914f02 100644 --- a/mpcontribs-kernel-gateway/requirements/ubuntu-latest_py3.12_extras.txt +++ b/mpcontribs-kernel-gateway/requirements/ubuntu-latest_py3.12_extras.txt @@ -22,7 +22,7 @@ beautifulsoup4==4.14.3 # via nbconvert bibtexparser==1.4.4 # via pymatgen-core -bleach[css]==6.3.0 +bleach[css]==6.4.0 # via nbconvert blinker==1.9.0 # via -r requirements.in @@ -82,7 +82,7 @@ fonttools==4.63.0 # via matplotlib fqdn==1.5.1 # via jsonschema -idna==3.15 +idna==3.18 # via # anyio # jsonschema @@ -146,7 +146,7 @@ jupyter-events==0.12.1 # via jupyter-server jupyter-kernel-gateway==3.0.1 # via -r requirements.in -jupyter-server==2.18.2 +jupyter-server==2.20.0 # via jupyter-kernel-gateway jupyter-server-terminals==0.5.4 # via jupyter-server @@ -186,7 +186,7 @@ mpcontribs-client==5.10.5 # via -r requirements.in mpmath==1.3.0 # via sympy -msgpack==1.1.2 +msgpack==1.2.1 # via # bravado # bravado-core @@ -377,7 +377,7 @@ terminado==0.18.1 # jupyter-server-terminals tinycss2==1.4.0 # via bleach -tornado==6.5.5 +tornado==6.5.7 # via # ipykernel # jupyter-client @@ -416,7 +416,7 @@ typing-extensions==4.15.0 # swagger-spec-validator tzdata==2026.2 # via arrow -ujson==5.12.1 +ujson==5.13.0 # via mpcontribs-client uncertainties==3.2.3 # via pymatgen-core diff --git a/mpcontribs-lux/mpcontribs/lux/projects/alab/schemas/experiments.py b/mpcontribs-lux/mpcontribs/lux/projects/alab/schemas/experiments.py index d242ad2723..6d6d0018e6 100644 --- a/mpcontribs-lux/mpcontribs/lux/projects/alab/schemas/experiments.py +++ b/mpcontribs-lux/mpcontribs/lux/projects/alab/schemas/experiments.py @@ -40,11 +40,27 @@ class Experiment(BaseModel, extra="forbid"): description="Root experiment type (NSC, Na, PG, MINES, TRI)" ) + global_formula: str = Field( + description=( + "The canonical formula for the target material, independent of per-run precursor adjustments." + "Represents what the experiment was ultimately trying to synthesize. This should be same as `formula`." + ), + ) + experiment_subgroup: str | None = Field( default=None, description="Experiment subgroup (e.g., NSC_249, Na_123)" ) - target_formula: str = Field(description="Target chemical formula") + target_formula: str | None = Field( + default=None, + description=( + "The formula used internally to determine precursor weights." + "May differ from the true intended formula (global_formula) due to experimental" + "constraints (e.g. oxygen mass balancing corrections, excess" + "alkali for battery materials). Not always a chemically meaningful" + "representation of what was attempted. Can be null if there is no adjustment for experiment." + ), + ) last_updated: datetime = Field(description="Last modification timestamp") @@ -56,6 +72,11 @@ class Experiment(BaseModel, extra="forbid"): default=None, description="Optional notes about the experiment" ) + precursor_powders: list[str] | None = Field( + default=None, + description="List of precursor powder names used in the experiment", + ) + # === Heating fields (prefix: heating_) === heating_method: Literal["standard", "atmosphere", "manual", "none"] | None = Field( default=None, description="Heating method used" @@ -85,6 +106,10 @@ class Experiment(BaseModel, extra="forbid"): default=None, description="Whether low temperature calcination was used" ) + heating_furnace_name: str | None = Field( + default=None, description="Heating furnace type" + ) + # === Recovery fields (prefix: recovery_) === recovery_total_dosed_mass_mg: float | None = Field( default=None, description="Total mass of all powders dosed in mg" diff --git a/mpcontribs-lux/requirements/requirements-ubuntu-latest_py3.11.txt b/mpcontribs-lux/requirements/requirements-ubuntu-latest_py3.11.txt index bb73ebe8aa..274ef06606 100644 --- a/mpcontribs-lux/requirements/requirements-ubuntu-latest_py3.11.txt +++ b/mpcontribs-lux/requirements/requirements-ubuntu-latest_py3.11.txt @@ -20,9 +20,9 @@ cycler==0.12.1 # via matplotlib emmet-core==0.86.2 # via mpcontribs-lux (pyproject.toml) -fonttools==4.61.0 +fonttools==4.63.0 # via matplotlib -idna==3.11 +idna==3.18 # via requests joblib==1.5.2 # via pymatgen @@ -52,7 +52,7 @@ numpy==2.3.5 # pymatgen-io-validation # scipy # spglib -orjson==3.11.5 +orjson==3.11.9 # via pymatgen packaging==25.0 # via @@ -64,11 +64,11 @@ pandas==2.3.3 # via # mpcontribs-lux (pyproject.toml) # pymatgen -pillow==12.0.0 +pillow==12.2.0 # via matplotlib plotly==6.5.0 # via pymatgen -pyarrow==22.0.0 +pyarrow==24.0.0 # via mpcontribs-lux (pyproject.toml) pybtex==0.25.1 # via emmet-core @@ -79,7 +79,7 @@ pydantic==2.12.5 # pymatgen-io-validation pydantic-core==2.41.5 # via pydantic -pydantic-settings==2.12.0 +pydantic-settings==2.14.2 # via # emmet-core # pymatgen-io-validation @@ -97,13 +97,13 @@ python-dateutil==2.9.0.post0 # via # matplotlib # pandas -python-dotenv==1.2.1 +python-dotenv==1.2.2 # via pydantic-settings pytz==2025.2 # via pandas pyyaml==6.0.3 # via pybtex -requests==2.32.5 +requests==2.34.2 # via # pymatgen # pymatgen-io-validation @@ -140,5 +140,5 @@ tzdata==2025.2 # via pandas uncertainties==3.2.3 # via pymatgen -urllib3==2.6.1 +urllib3==2.7.0 # via requests diff --git a/mpcontribs-lux/requirements/requirements-ubuntu-latest_py3.11_extras.txt b/mpcontribs-lux/requirements/requirements-ubuntu-latest_py3.11_extras.txt index cb109503c9..c52b69183b 100644 --- a/mpcontribs-lux/requirements/requirements-ubuntu-latest_py3.11_extras.txt +++ b/mpcontribs-lux/requirements/requirements-ubuntu-latest_py3.11_extras.txt @@ -28,15 +28,15 @@ emmet-core==0.86.2 # via mpcontribs-lux (pyproject.toml) execnet==2.1.2 # via pytest-xdist -filelock==3.20.0 +filelock==3.29.4 # via virtualenv flake8==7.3.0 # via mpcontribs-lux (pyproject.toml) -fonttools==4.61.0 +fonttools==4.63.0 # via matplotlib identify==2.6.15 # via pre-commit -idna==3.11 +idna==3.18 # via requests iniconfig==2.3.0 # via pytest @@ -80,7 +80,7 @@ numpy==2.3.5 # pymatgen-io-validation # scipy # spglib -orjson==3.11.5 +orjson==3.11.9 # via pymatgen packaging==25.0 # via @@ -95,7 +95,7 @@ pandas==2.3.3 # pymatgen pathspec==0.12.1 # via mypy -pillow==12.0.0 +pillow==12.2.0 # via matplotlib platformdirs==4.5.1 # via virtualenv @@ -107,7 +107,7 @@ pluggy==1.6.0 # pytest-cov pre-commit==4.5.0 # via mpcontribs-lux (pyproject.toml) -pyarrow==22.0.0 +pyarrow==24.0.0 # via mpcontribs-lux (pyproject.toml) pybtex==0.25.1 # via emmet-core @@ -122,7 +122,7 @@ pydantic==2.12.5 # pymatgen-io-validation pydantic-core==2.41.5 # via pydantic -pydantic-settings==2.12.0 +pydantic-settings==2.14.2 # via # emmet-core # pymatgen-io-validation @@ -142,7 +142,7 @@ pyparsing==3.2.5 # via # bibtexparser # matplotlib -pytest==9.0.2 +pytest==9.1.1 # via # mpcontribs-lux (pyproject.toml) # pytest-cov @@ -155,7 +155,7 @@ python-dateutil==2.9.0.post0 # via # matplotlib # pandas -python-dotenv==1.2.1 +python-dotenv==1.2.2 # via pydantic-settings pytz==2025.2 # via pandas @@ -163,7 +163,7 @@ pyyaml==6.0.3 # via # pre-commit # pybtex -requests==2.32.5 +requests==2.34.2 # via # pymatgen # pymatgen-io-validation @@ -203,7 +203,7 @@ tzdata==2025.2 # via pandas uncertainties==3.2.3 # via pymatgen -urllib3==2.6.1 +urllib3==2.7.0 # via requests -virtualenv==20.35.4 +virtualenv==21.5.1 # via pre-commit diff --git a/mpcontribs-lux/requirements/requirements-ubuntu-latest_py3.12.txt b/mpcontribs-lux/requirements/requirements-ubuntu-latest_py3.12.txt index bb73ebe8aa..274ef06606 100644 --- a/mpcontribs-lux/requirements/requirements-ubuntu-latest_py3.12.txt +++ b/mpcontribs-lux/requirements/requirements-ubuntu-latest_py3.12.txt @@ -20,9 +20,9 @@ cycler==0.12.1 # via matplotlib emmet-core==0.86.2 # via mpcontribs-lux (pyproject.toml) -fonttools==4.61.0 +fonttools==4.63.0 # via matplotlib -idna==3.11 +idna==3.18 # via requests joblib==1.5.2 # via pymatgen @@ -52,7 +52,7 @@ numpy==2.3.5 # pymatgen-io-validation # scipy # spglib -orjson==3.11.5 +orjson==3.11.9 # via pymatgen packaging==25.0 # via @@ -64,11 +64,11 @@ pandas==2.3.3 # via # mpcontribs-lux (pyproject.toml) # pymatgen -pillow==12.0.0 +pillow==12.2.0 # via matplotlib plotly==6.5.0 # via pymatgen -pyarrow==22.0.0 +pyarrow==24.0.0 # via mpcontribs-lux (pyproject.toml) pybtex==0.25.1 # via emmet-core @@ -79,7 +79,7 @@ pydantic==2.12.5 # pymatgen-io-validation pydantic-core==2.41.5 # via pydantic -pydantic-settings==2.12.0 +pydantic-settings==2.14.2 # via # emmet-core # pymatgen-io-validation @@ -97,13 +97,13 @@ python-dateutil==2.9.0.post0 # via # matplotlib # pandas -python-dotenv==1.2.1 +python-dotenv==1.2.2 # via pydantic-settings pytz==2025.2 # via pandas pyyaml==6.0.3 # via pybtex -requests==2.32.5 +requests==2.34.2 # via # pymatgen # pymatgen-io-validation @@ -140,5 +140,5 @@ tzdata==2025.2 # via pandas uncertainties==3.2.3 # via pymatgen -urllib3==2.6.1 +urllib3==2.7.0 # via requests diff --git a/mpcontribs-lux/requirements/requirements-ubuntu-latest_py3.12_extras.txt b/mpcontribs-lux/requirements/requirements-ubuntu-latest_py3.12_extras.txt index cb109503c9..c52b69183b 100644 --- a/mpcontribs-lux/requirements/requirements-ubuntu-latest_py3.12_extras.txt +++ b/mpcontribs-lux/requirements/requirements-ubuntu-latest_py3.12_extras.txt @@ -28,15 +28,15 @@ emmet-core==0.86.2 # via mpcontribs-lux (pyproject.toml) execnet==2.1.2 # via pytest-xdist -filelock==3.20.0 +filelock==3.29.4 # via virtualenv flake8==7.3.0 # via mpcontribs-lux (pyproject.toml) -fonttools==4.61.0 +fonttools==4.63.0 # via matplotlib identify==2.6.15 # via pre-commit -idna==3.11 +idna==3.18 # via requests iniconfig==2.3.0 # via pytest @@ -80,7 +80,7 @@ numpy==2.3.5 # pymatgen-io-validation # scipy # spglib -orjson==3.11.5 +orjson==3.11.9 # via pymatgen packaging==25.0 # via @@ -95,7 +95,7 @@ pandas==2.3.3 # pymatgen pathspec==0.12.1 # via mypy -pillow==12.0.0 +pillow==12.2.0 # via matplotlib platformdirs==4.5.1 # via virtualenv @@ -107,7 +107,7 @@ pluggy==1.6.0 # pytest-cov pre-commit==4.5.0 # via mpcontribs-lux (pyproject.toml) -pyarrow==22.0.0 +pyarrow==24.0.0 # via mpcontribs-lux (pyproject.toml) pybtex==0.25.1 # via emmet-core @@ -122,7 +122,7 @@ pydantic==2.12.5 # pymatgen-io-validation pydantic-core==2.41.5 # via pydantic -pydantic-settings==2.12.0 +pydantic-settings==2.14.2 # via # emmet-core # pymatgen-io-validation @@ -142,7 +142,7 @@ pyparsing==3.2.5 # via # bibtexparser # matplotlib -pytest==9.0.2 +pytest==9.1.1 # via # mpcontribs-lux (pyproject.toml) # pytest-cov @@ -155,7 +155,7 @@ python-dateutil==2.9.0.post0 # via # matplotlib # pandas -python-dotenv==1.2.1 +python-dotenv==1.2.2 # via pydantic-settings pytz==2025.2 # via pandas @@ -163,7 +163,7 @@ pyyaml==6.0.3 # via # pre-commit # pybtex -requests==2.32.5 +requests==2.34.2 # via # pymatgen # pymatgen-io-validation @@ -203,7 +203,7 @@ tzdata==2025.2 # via pandas uncertainties==3.2.3 # via pymatgen -urllib3==2.6.1 +urllib3==2.7.0 # via requests -virtualenv==20.35.4 +virtualenv==21.5.1 # via pre-commit diff --git a/mpcontribs-lux/tests/test_autogen.py b/mpcontribs-lux/tests/test_autogen.py index 71cd04a67e..81678eb433 100644 --- a/mpcontribs-lux/tests/test_autogen.py +++ b/mpcontribs-lux/tests/test_autogen.py @@ -1,7 +1,6 @@ """Test and demo automatic generation of schemas.""" import gzip -from importlib_resources import files as import_module_path import importlib.util import json from pathlib import Path @@ -22,20 +21,14 @@ def dynamically_load_module_from_path(path: Path, module_name: str): def test_schema_generation(test_dir): - - base_module_path = import_module_path("mpcontribs.lux") + example_file = ( + Path(__file__).resolve().parents[1] + / "examples" + / "cubic_solid_expt_data.json.gz" + ) temp_file = NamedTemporaryFile(suffix=".json") - with gzip.open( - ( - import_module_path("mpcontribs.lux") - / ".." - / ".." - / "examples" - / "cubic_solid_expt_data.json.gz" - ).resolve(), - "rb", - ) as source_file: + with gzip.open(example_file, "rb") as source_file: temp_file.write(json.dumps(json.load(source_file)["data"]).encode()) temp_file.seek(0) diff --git a/mpcontribs-lux/uv.lock b/mpcontribs-lux/uv.lock index 0fdf7d4419..2088514ba2 100644 --- a/mpcontribs-lux/uv.lock +++ b/mpcontribs-lux/uv.lock @@ -200,6 +200,18 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/0a/4c/925909008ed5a988ccbb72dcc897407e5d6d3bd72410d69e051fc0c14647/charset_normalizer-3.4.4-py3-none-any.whl", hash = "sha256:7a32c560861a02ff789ad905a2fe94e3f840803362c84fecf1851cb4cf3dc37f", size = 53402, upload-time = "2025-10-14T04:42:31.76Z" }, ] +[[package]] +name = "click" +version = "8.4.2" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "colorama", marker = "sys_platform == 'win32'" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/76/d4/81420972a676e8ffea40450d8c8c92943e7218a78fe9b64359836cc9876b/click-8.4.2.tar.gz", hash = "sha256:9a6cea6e60b17ebe0a44c5cc636d94f09bd66142c1cd7d8b4cd731c4917a15f6", size = 338000, upload-time = "2026-06-24T17:45:15.148Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/fb/e2/79c688af8b210d232694e31e59da9f6ec747bae31c3f5946e4e9b98860d5/click-8.4.2-py3-none-any.whl", hash = "sha256:e6f9f66136c816745b9d65817da91d61d957fb16e02e4dcd0552553c5a197b76", size = 119243, upload-time = "2026-06-24T17:45:13.73Z" }, +] + [[package]] name = "colorama" version = "0.4.6" @@ -699,6 +711,18 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/0e/3d/72cc9ec90bb80b5b1a65f0bb74a0f540195837baaf3b98c7fa4a7aa9718e/librt-0.6.3-cp314-cp314t-win_arm64.whl", hash = "sha256:afb39550205cc5e5c935762c6bf6a2bb34f7d21a68eadb25e2db7bf3593fecc0", size = 20246, upload-time = "2025-11-29T14:01:44.13Z" }, ] +[[package]] +name = "markdown-it-py" +version = "4.2.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "mdurl" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/06/ff/7841249c247aa650a76b9ee4bbaeae59370dc8bfd2f6c01f3630c35eb134/markdown_it_py-4.2.0.tar.gz", hash = "sha256:04a21681d6fbb623de53f6f364d352309d4094dd4194040a10fd51833e418d49", size = 82454, upload-time = "2026-05-07T12:08:28.36Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/b3/81/4da04ced5a082363ecfa159c010d200ecbd959ae410c10c0264a38cac0f5/markdown_it_py-4.2.0-py3-none-any.whl", hash = "sha256:9f7ebbcd14fe59494226453aed97c1070d83f8d24b6fc3a3bcf9a38092641c4a", size = 91687, upload-time = "2026-05-07T12:08:27.182Z" }, +] + [[package]] name = "matplotlib" version = "3.10.7" @@ -772,6 +796,15 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/27/1a/1f68f9ba0c207934b35b86a8ca3aad8395a3d6dd7921c0686e23853ff5a9/mccabe-0.7.0-py2.py3-none-any.whl", hash = "sha256:6c2d30ab6be0e4a46919781807b4f0d834ebdd6c6e3dca0bda5a15f863427b6e", size = 7350, upload-time = "2022-01-24T01:14:49.62Z" }, ] +[[package]] +name = "mdurl" +version = "0.1.2" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/d6/54/cfe61301667036ec958cb99bd3efefba235e65cdeb9c84d24a8293ba1d90/mdurl-0.1.2.tar.gz", hash = "sha256:bb413d29f5eea38f31dd4754dd7377d4465116fb207585f97bf925588687c1ba", size = 8729, upload-time = "2022-08-14T12:40:10.846Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/b3/38/89ba8ad64ae25be8de66a6d463314cf1eb366222074cfda9ee839c56a4b4/mdurl-0.1.2-py3-none-any.whl", hash = "sha256:84008a41e51615a49fc9966191ff91509e3c40b939176e643fd50a5c2196b8f8", size = 9979, upload-time = "2022-08-14T12:40:09.779Z" }, +] + [[package]] name = "monty" version = "2025.3.3" @@ -795,6 +828,10 @@ dependencies = [ ] [package.optional-dependencies] +cli = [ + { name = "click" }, + { name = "rich" }, +] test = [ { name = "flake8" }, { name = "mypy" }, @@ -809,7 +846,8 @@ test = [ [package.metadata] requires-dist = [ - { name = "emmet-core", specifier = ">0.85.0" }, + { name = "click", marker = "extra == 'cli'" }, + { name = "emmet-core", specifier = ">0.86.0" }, { name = "flake8", marker = "extra == 'test'" }, { name = "mypy", marker = "extra == 'test'" }, { name = "mypy-extensions", marker = "extra == 'test'" }, @@ -821,8 +859,9 @@ requires-dist = [ { name = "pytest", marker = "extra == 'test'" }, { name = "pytest-cov", marker = "extra == 'test'" }, { name = "pytest-xdist", marker = "extra == 'test'" }, + { name = "rich", marker = "extra == 'cli'" }, ] -provides-extras = ["test"] +provides-extras = ["cli", "test"] [[package]] name = "mpmath" @@ -1573,7 +1612,7 @@ wheels = [ [[package]] name = "pytest" -version = "9.0.1" +version = "9.0.3" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "colorama", marker = "sys_platform == 'win32'" }, @@ -1582,9 +1621,9 @@ dependencies = [ { name = "pluggy" }, { name = "pygments" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/07/56/f013048ac4bc4c1d9be45afd4ab209ea62822fb1598f40687e6bf45dcea4/pytest-9.0.1.tar.gz", hash = "sha256:3e9c069ea73583e255c3b21cf46b8d3c56f6e3a1a8f6da94ccb0fcf57b9d73c8", size = 1564125, upload-time = "2025-11-12T13:05:09.333Z" } +sdist = { url = "https://files.pythonhosted.org/packages/7d/0d/549bd94f1a0a402dc8cf64563a117c0f3765662e2e668477624baeec44d5/pytest-9.0.3.tar.gz", hash = "sha256:b86ada508af81d19edeb213c681b1d48246c1a91d304c6c81a427674c17eb91c", size = 1572165, upload-time = "2026-04-07T17:16:18.027Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/0b/8b/6300fb80f858cda1c51ffa17075df5d846757081d11ab4aa35cef9e6258b/pytest-9.0.1-py3-none-any.whl", hash = "sha256:67be0030d194df2dfa7b556f2e56fb3c3315bd5c8822c6951162b92b32ce7dad", size = 373668, upload-time = "2025-11-12T13:05:07.379Z" }, + { url = "https://files.pythonhosted.org/packages/d4/24/a372aaf5c9b7208e7112038812994107bc65a84cd00e0354a88c2c77a617/pytest-9.0.3-py3-none-any.whl", hash = "sha256:2c5efc453d45394fdd706ade797c0a81091eccd1d6e4bccfcd476e2b8e0ab5d9", size = 375249, upload-time = "2026-04-07T17:16:16.13Z" }, ] [[package]] @@ -1714,6 +1753,19 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/1e/db/4254e3eabe8020b458f1a747140d32277ec7a271daf1d235b70dc0b4e6e3/requests-2.32.5-py3-none-any.whl", hash = "sha256:2462f94637a34fd532264295e186976db0f5d453d1cdd31473c85a6a161affb6", size = 64738, upload-time = "2025-08-18T20:46:00.542Z" }, ] +[[package]] +name = "rich" +version = "15.0.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "markdown-it-py" }, + { name = "pygments" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/c0/8f/0722ca900cc807c13a6a0c696dacf35430f72e0ec571c4275d2371fca3e9/rich-15.0.0.tar.gz", hash = "sha256:edd07a4824c6b40189fb7ac9bc4c52536e9780fbbfbddf6f1e2502c31b068c36", size = 230680, upload-time = "2026-04-12T08:24:00.75Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/82/3b/64d4899d73f91ba49a8c18a8ff3f0ea8f1c1d75481760df8c68ef5235bf5/rich-15.0.0-py3-none-any.whl", hash = "sha256:33bd4ef74232fb73fe9279a257718407f169c09b78a87ad3d296f548e27de0bb", size = 310654, upload-time = "2026-04-12T08:24:02.83Z" }, +] + [[package]] name = "ruamel-yaml" version = "0.18.16" diff --git a/mpcontribs-portal/Dockerfile b/mpcontribs-portal/Dockerfile index 9f5510f3e6..2e97061fb9 100644 --- a/mpcontribs-portal/Dockerfile +++ b/mpcontribs-portal/Dockerfile @@ -1,6 +1,6 @@ -FROM materialsproject/devops:python-3.1113.4 AS base +FROM materialsproject/devops:python-3.1113.17 AS base RUN apt-get update && apt-get install -y --no-install-recommends libopenblas-dev && apt-get clean -FROM node:25.0.0-slim AS node +FROM node:26.4.0-slim AS node FROM node AS webpack-deps RUN apt-get update && apt-get install -y --no-install-recommends \ diff --git a/mpcontribs-portal/package.json b/mpcontribs-portal/package.json index e2567d69df..f0111d82c2 100644 --- a/mpcontribs-portal/package.json +++ b/mpcontribs-portal/package.json @@ -19,21 +19,21 @@ "dependencies": { "@babel/core": "^7.23.2", "@babel/preset-env": "^7.23.2", - "@fortawesome/fontawesome-free": "^6.4.2", + "@fortawesome/fontawesome-free": "^7.3.0", "@vizuaalog/bulmajs": "^0.12.2", - "babel-loader": "^9.1.3", + "babel-loader": "^10.1.1", "babel-plugin-lodash": "^3.3.4", - "bulma": "^0.9.4", + "bulma": "^1.0.4", "bulma-checkradio": "^2.1.3", "bulma-tooltip": "^3.0.2", "clean-webpack-plugin": "^4.0.0", - "compression-webpack-plugin": "^11.0.0", + "compression-webpack-plugin": "^12.0.0", "core-js": "^3.33.1", "css-loader": "^7.0.0", - "handsontable": "^13.1.0", + "handsontable": "^17.1.0", "highlight.js": "^11.9.0", "imports-loader": "^5.0.0", - "jquery": "^3.7.1", + "jquery": "^4.0.0", "js-sha1": "^0.7.0", "lodash": "^4.17.21", "lodash-webpack-plugin": "^0.11.6", @@ -42,14 +42,14 @@ "plotly.js": "^3.0.0", "requirejs": "^2.3.6", "sass": "^1.69.4", - "sass-loader": "^14.0.0", + "sass-loader": "^17.0.0", "select2": "^4.1.0-rc.0", "terser-webpack-plugin": "^5.3.9", "typy": "^3.3.0", "underscore": "^1.13.6", "webpack": "^5.89.0", - "webpack-bundle-analyzer": "^4.9.1", - "webpack-cli": "^5.1.4", + "webpack-bundle-analyzer": "^5.3.0", + "webpack-cli": "^7.1.0", "webpack4-bundle-tracker": "^0.4.3-beta" } } diff --git a/mpcontribs-portal/pyproject.toml b/mpcontribs-portal/pyproject.toml index 83e1f7aeda..347977253e 100644 --- a/mpcontribs-portal/pyproject.toml +++ b/mpcontribs-portal/pyproject.toml @@ -29,7 +29,7 @@ dependencies = [ "boto3", "ddtrace==4.3.0", "Django>=3.2,<4.0", - "django-extensions", + "django>=4.2.30,<5.0", "django-settings-file", "django-webpack4-loader", "fastnumbers", @@ -56,7 +56,6 @@ Documentation = "https://docs.materialsproject.org/services/mpcontribs" dev = [ "flake8", "pytest", - "pytest-flake8", "pytest-pycodestyle", "pytest-xdist", ] diff --git a/mpcontribs-portal/requirements/deployment.txt b/mpcontribs-portal/requirements/deployment.txt index d4168362c3..b7ddd80be8 100644 --- a/mpcontribs-portal/requirements/deployment.txt +++ b/mpcontribs-portal/requirements/deployment.txt @@ -24,8 +24,12 @@ boltons==25.0.0 # via # mpcontribs-client # mpcontribs-portal (MPContribs/mpcontribs-portal/pyproject.toml) +boto3==1.43.30 +||||||| parent of 24d7b5d6 (Revert changes to deployment of other submodules) boto3==1.43.25 # via mpcontribs-portal (MPContribs/mpcontribs-portal/pyproject.toml) +botocore==1.43.30 +||||||| parent of 24d7b5d6 (Revert changes to deployment of other submodules) botocore==1.43.25 # via # boto3 @@ -56,7 +60,7 @@ decorator==5.3.1 # via ipython defusedxml==0.7.1 # via nbconvert -django==3.2.25 +django==6.0.6 # via # django-extensions # django-settings-file @@ -103,7 +107,7 @@ idna==3.18 # requests importlib-resources==7.1.0 # via swagger-spec-validator -ipykernel==7.2.0 +ipykernel==7.3.0 # via mpcontribs-portal (MPContribs/mpcontribs-portal/pyproject.toml) ipython==9.14.1 # via @@ -142,7 +146,7 @@ jsonschema[format-nongpl]==4.26.0 # swagger-spec-validator jsonschema-specifications==2025.9.1 # via jsonschema -jupyter-client==8.9.0 +jupyter-client==8.9.1 # via # ipykernel # nbclient @@ -165,7 +169,7 @@ markupsafe==3.0.3 # via # jinja2 # nbconvert -matplotlib==3.10.9 +matplotlib==3.11.0 # via # -r python/requirements.txt # pymatgen-core @@ -185,7 +189,7 @@ mpcontribs-client==5.10.5 # via mpcontribs-portal (MPContribs/mpcontribs-portal/pyproject.toml) mpmath==1.3.0 # via sympy -msgpack==1.1.2 +msgpack==1.2.1 # via # bravado # bravado-core @@ -200,7 +204,7 @@ nbformat==5.10.4 # mpcontribs-portal (MPContribs/mpcontribs-portal/pyproject.toml) # nbclient # nbconvert -nest-asyncio==1.6.0 +nest-asyncio2==1.7.2 # via ipykernel networkx==3.6.1 # via pymatgen-core @@ -367,7 +371,7 @@ tornado==6.5.7 # via # ipykernel # jupyter-client -tqdm==4.68.1 +tqdm==4.68.2 # via # mpcontribs-client # pymatgen-core @@ -396,7 +400,7 @@ typing-extensions==4.15.0 # swagger-spec-validator tzdata==2026.2 # via arrow -ujson==5.12.1 +ujson==5.13.0 # via mpcontribs-client uncertainties==3.2.3 # via pymatgen-core diff --git a/mpcontribs-portal/requirements/ubuntu-latest_py3.11.txt b/mpcontribs-portal/requirements/ubuntu-latest_py3.11.txt index e0603bbb38..cd18d95a69 100644 --- a/mpcontribs-portal/requirements/ubuntu-latest_py3.11.txt +++ b/mpcontribs-portal/requirements/ubuntu-latest_py3.11.txt @@ -18,7 +18,7 @@ beautifulsoup4==4.14.3 # via nbconvert bibtexparser==1.4.4 # via pymatgen-core -bleach[css]==6.3.0 +bleach[css]==6.4.0 # via nbconvert boltons==25.0.0 # via @@ -56,7 +56,7 @@ decorator==5.3.1 # via ipython defusedxml==0.7.1 # via nbconvert -django==3.2.25 +django==6.0.6 # via # django-extensions # django-settings-file @@ -97,7 +97,7 @@ greenlet==3.5.0 # via gevent gunicorn[gevent]==24.1.1 # via mpcontribs-portal (pyproject.toml) -idna==3.15 +idna==3.18 # via # jsonschema # requests @@ -185,7 +185,7 @@ mpcontribs-client==5.10.5 # via mpcontribs-portal (pyproject.toml) mpmath==1.3.0 # via sympy -msgpack==1.1.2 +msgpack==1.2.1 # via # bravado # bravado-core @@ -360,7 +360,7 @@ tabulate==0.10.0 # via pymatgen-core tinycss2==1.4.0 # via bleach -tornado==6.5.5 +tornado==6.5.7 # via # ipykernel # jupyter-client @@ -392,7 +392,7 @@ typing-extensions==4.15.0 # swagger-spec-validator tzdata==2026.2 # via arrow -ujson==5.12.1 +ujson==5.13.0 # via mpcontribs-client uncertainties==3.2.3 # via pymatgen-core diff --git a/mpcontribs-portal/requirements/ubuntu-latest_py3.11_extras.txt b/mpcontribs-portal/requirements/ubuntu-latest_py3.11_extras.txt index 646843cd4a..b8acbcbfcc 100644 --- a/mpcontribs-portal/requirements/ubuntu-latest_py3.11_extras.txt +++ b/mpcontribs-portal/requirements/ubuntu-latest_py3.11_extras.txt @@ -18,7 +18,7 @@ beautifulsoup4==4.14.3 # via nbconvert bibtexparser==1.4.4 # via pymatgen-core -bleach[css]==6.3.0 +bleach[css]==6.4.0 # via nbconvert boltons==25.0.0 # via @@ -61,7 +61,7 @@ decorator==5.3.1 # via ipython defusedxml==0.7.1 # via nbconvert -django==3.2.25 +django==4.2.30 # via # django-extensions # django-settings-file @@ -120,7 +120,7 @@ gunicorn[gevent]==24.1.1 # via # mpcontribs-portal # mpcontribs-portal (pyproject.toml) -idna==3.15 +idna==3.18 # via # jsonschema # requests @@ -223,7 +223,7 @@ mpcontribs-portal[dev] @ file:///home/runner/work/MPContribs/MPContribs/mpcontri # via mpcontribs-portal (pyproject.toml) mpmath==1.3.0 # via sympy -msgpack==1.1.2 +msgpack==1.2.1 # via # bravado # bravado-core @@ -327,7 +327,7 @@ pyparsing==3.3.2 # via # bibtexparser # matplotlib -pytest==9.0.3 +pytest==9.1.1 # via # mpcontribs-portal # mpcontribs-portal (pyproject.toml) @@ -435,7 +435,7 @@ tabulate==0.10.0 # via pymatgen-core tinycss2==1.4.0 # via bleach -tornado==6.5.5 +tornado==6.5.7 # via # ipykernel # jupyter-client @@ -467,7 +467,7 @@ typing-extensions==4.15.0 # swagger-spec-validator tzdata==2026.2 # via arrow -ujson==5.12.1 +ujson==5.13.0 # via mpcontribs-client uncertainties==3.2.3 # via pymatgen-core diff --git a/mpcontribs-portal/requirements/ubuntu-latest_py3.12.txt b/mpcontribs-portal/requirements/ubuntu-latest_py3.12.txt index cb81ab25df..7d49402aae 100644 --- a/mpcontribs-portal/requirements/ubuntu-latest_py3.12.txt +++ b/mpcontribs-portal/requirements/ubuntu-latest_py3.12.txt @@ -18,7 +18,7 @@ beautifulsoup4==4.14.3 # via nbconvert bibtexparser==1.4.4 # via pymatgen-core -bleach[css]==6.3.0 +bleach[css]==6.4.0 # via nbconvert boltons==25.0.0 # via @@ -56,7 +56,7 @@ decorator==5.3.1 # via ipython defusedxml==0.7.1 # via nbconvert -django==3.2.25 +django==6.0.6 # via # django-extensions # django-settings-file @@ -97,7 +97,7 @@ greenlet==3.5.0 # via gevent gunicorn[gevent]==24.1.1 # via mpcontribs-portal (pyproject.toml) -idna==3.15 +idna==3.18 # via # jsonschema # requests @@ -185,7 +185,7 @@ mpcontribs-client==5.10.5 # via mpcontribs-portal (pyproject.toml) mpmath==1.3.0 # via sympy -msgpack==1.1.2 +msgpack==1.2.1 # via # bravado # bravado-core @@ -360,7 +360,7 @@ tabulate==0.10.0 # via pymatgen-core tinycss2==1.4.0 # via bleach -tornado==6.5.5 +tornado==6.5.7 # via # ipykernel # jupyter-client @@ -391,7 +391,7 @@ typing-extensions==4.15.0 # swagger-spec-validator tzdata==2026.2 # via arrow -ujson==5.12.1 +ujson==5.13.0 # via mpcontribs-client uncertainties==3.2.3 # via pymatgen-core diff --git a/mpcontribs-portal/requirements/ubuntu-latest_py3.12_extras.txt b/mpcontribs-portal/requirements/ubuntu-latest_py3.12_extras.txt index b542c21308..7b81e17541 100644 --- a/mpcontribs-portal/requirements/ubuntu-latest_py3.12_extras.txt +++ b/mpcontribs-portal/requirements/ubuntu-latest_py3.12_extras.txt @@ -18,7 +18,7 @@ beautifulsoup4==4.14.3 # via nbconvert bibtexparser==1.4.4 # via pymatgen-core -bleach[css]==6.3.0 +bleach[css]==6.4.0 # via nbconvert boltons==25.0.0 # via @@ -61,7 +61,7 @@ decorator==5.3.1 # via ipython defusedxml==0.7.1 # via nbconvert -django==3.2.25 +django==4.2.30 # via # django-extensions # django-settings-file @@ -120,7 +120,7 @@ gunicorn[gevent]==24.1.1 # via # mpcontribs-portal # mpcontribs-portal (pyproject.toml) -idna==3.15 +idna==3.18 # via # jsonschema # requests @@ -223,7 +223,7 @@ mpcontribs-portal[dev] @ file:///home/runner/work/MPContribs/MPContribs/mpcontri # via mpcontribs-portal (pyproject.toml) mpmath==1.3.0 # via sympy -msgpack==1.1.2 +msgpack==1.2.1 # via # bravado # bravado-core @@ -327,7 +327,7 @@ pyparsing==3.3.2 # via # bibtexparser # matplotlib -pytest==9.0.3 +pytest==9.1.1 # via # mpcontribs-portal # mpcontribs-portal (pyproject.toml) @@ -435,7 +435,7 @@ tabulate==0.10.0 # via pymatgen-core tinycss2==1.4.0 # via bleach -tornado==6.5.5 +tornado==6.5.7 # via # ipykernel # jupyter-client @@ -466,7 +466,7 @@ typing-extensions==4.15.0 # swagger-spec-validator tzdata==2026.2 # via arrow -ujson==5.12.1 +ujson==5.13.0 # via mpcontribs-client uncertainties==3.2.3 # via pymatgen-core diff --git a/mpcontribs-serverless/dependencies/requirements.txt b/mpcontribs-serverless/dependencies/requirements.txt index 92f1aa9e3c..a0318bd502 100644 --- a/mpcontribs-serverless/dependencies/requirements.txt +++ b/mpcontribs-serverless/dependencies/requirements.txt @@ -9,10 +9,7 @@ asttokens==2.1.0 async-timeout==4.0.2 # via redis attrs==22.1.0 - # via - # cattrs - # ddtrace - # jsonschema + # via jsonschema backcall==0.2.0 # via ipython boltons==21.0.0 @@ -23,8 +20,6 @@ bravado-core==5.17.1 # via bravado bytecode==0.13.0 # via ddtrace -cattrs==22.2.0 - # via ddtrace certifi==2024.7.4 # via requests charset-normalizer==2.1.1 @@ -33,9 +28,7 @@ contourpy==1.0.6 # via matplotlib cycler==0.11.0 # via matplotlib -ddsketch==2.0.4 - # via ddtrace -ddtrace==1.5.3 +ddtrace==4.3.0 # via -r requirements.in decorator==5.1.1 # via ipython @@ -43,21 +36,19 @@ dnspython==2.6.1 # via # pyisemail # pymongo -envier==0.4.0 +envier==0.6.1 # via ddtrace -exceptiongroup==1.2.0 - # via cattrs executing==1.2.0 # via stack-data filetype==1.1.0 # via mpcontribs-client flatten-dict==0.4.2 # via mpcontribs-client -fonttools==4.43.0 +fonttools==4.60.2 # via matplotlib future==0.18.3 # via uncertainties -idna==3.7 +idna==3.18 # via # jsonschema # requests @@ -76,7 +67,6 @@ jsonref==1.0.0.post1 jsonschema[format]==3.2.0 # via # bravado-core - # ddtrace # mpcontribs-client # swagger-spec-validator kiwisolver==1.4.4 @@ -95,7 +85,7 @@ mpcontribs-client==4.5.0 # via -r requirements.in mpmath==1.3.0 # via sympy -msgpack==1.0.4 +msgpack==1.2.1 # via # bravado # bravado-core @@ -109,10 +99,10 @@ numpy==1.26.4 # pymatgen # scipy # spglib +opentelemetry-api==1.43.0 + # via ddtrace packaging==21.3 - # via - # ddtrace - # matplotlib + # via matplotlib palettable==3.3.0 # via pymatgen pandas==2.2.2 @@ -125,7 +115,7 @@ pexpect==4.8.0 # via ipython pickleshare==0.7.5 # via ipython -pillow==10.3.0 +pillow==12.2.0 # via matplotlib pint==0.19.2 # via mpcontribs-client @@ -135,10 +125,6 @@ plotly==5.11.0 # pymatgen prompt-toolkit==3.0.31 # via ipython -protobuf==4.21.9 - # via - # ddsketch - # ddtrace ptyprocess==0.7.0 # via pexpect pure-eval==0.2.2 @@ -177,7 +163,7 @@ pyyaml==6.0 # swagger-spec-validator redis==4.4.4 # via -r requirements.in -requests==2.32.3 +requests==2.34.2 # via # bravado # bravado-core @@ -204,8 +190,6 @@ six==1.16.0 # asttokens # bravado # bravado-core - # ddsketch - # ddtrace # flatten-dict # jsonschema # latexcodec @@ -227,9 +211,7 @@ sympy==1.11.1 tabulate==0.9.0 # via pymatgen tenacity==8.1.0 - # via - # ddtrace - # plotly + # via plotly tqdm==4.66.3 # via # mpcontribs-client @@ -238,24 +220,21 @@ traitlets==5.5.0 # via # ipython # matplotlib-inline -typing-extensions==4.4.0 +typing-extensions==4.15.0 # via # bravado - # ddtrace + # opentelemetry-api tzdata==2024.1 # via pandas -ujson==5.5.0 +ujson==5.13.0 # via mpcontribs-client uncertainties==3.1.7 # via pymatgen -urllib3==1.26.19 +urllib3==2.7.0 # via requests wcwidth==0.2.5 # via prompt-toolkit webcolors==1.12 # via jsonschema -xmltodict==0.13.0 +wrapt==2.2.2 # via ddtrace - -# The following packages are considered to be unsafe in a requirements file: -# setuptools From 0b410dd6f7e577bae74d5d8e69b99c4d0173e559 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 30 Jul 2026 14:46:02 -0700 Subject: [PATCH 523/591] Renamed UserSettings to QuotaSettings to better reflect intent --- mpcontribs-api/src/mpcontribs_api/config.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/config.py b/mpcontribs-api/src/mpcontribs_api/config.py index d5d36480ea..c424ae878b 100644 --- a/mpcontribs-api/src/mpcontribs_api/config.py +++ b/mpcontribs-api/src/mpcontribs_api/config.py @@ -5,7 +5,7 @@ from pydantic_settings import BaseSettings, SettingsConfigDict -class UserSettings(BaseModel): +class QuotaLimits(BaseModel): max_projects: int = Field( default=3, description="The maximum number of projects a single user is allowed to create", @@ -194,8 +194,8 @@ class Settings(BaseSettings): # MPContribs_otel__* otel: ObservabilitySettings = Field(default_factory=ObservabilitySettings) - # MPContribs_user__* - user: UserSettings = Field(default_factory=UserSettings) + # MPContribs_quota__* + quota: QuotaLimits = Field(default_factory=QuotaLimits) # SMTP Settings mail_default_sender: str = Field( From fbbb649a02b800c615f51fe9f6f0aab552c77918 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 30 Jul 2026 14:48:52 -0700 Subject: [PATCH 524/591] Added dependency for admin users --- mpcontribs-api/src/mpcontribs_api/dependencies.py | 15 ++++++++++++++- mpcontribs-api/src/mpcontribs_api/exceptions.py | 1 + 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/mpcontribs-api/src/mpcontribs_api/dependencies.py b/mpcontribs-api/src/mpcontribs_api/dependencies.py index c13c84643a..2f4b925f65 100644 --- a/mpcontribs-api/src/mpcontribs_api/dependencies.py +++ b/mpcontribs-api/src/mpcontribs_api/dependencies.py @@ -8,7 +8,7 @@ from types_aiobotocore_s3 import S3Client from mpcontribs_api.authz import User -from mpcontribs_api.exceptions import AuthenticationError +from mpcontribs_api.exceptions import AuthenticationError, PermissionError def get_db(request: Request) -> AsyncDatabase: @@ -72,3 +72,16 @@ def require_user(user: UserDep) -> User: raise AuthenticationError("authentication required") return user + +def require_admin(user: UserDep) -> User: + """Require an authenticated admin caller. + + Distinguishes the two failure modes: an anonymous caller gets 401 (authenticate first), while an + authenticated non-admin gets 403 (authenticated, but not permitted). Gates the admin-only + consumer-override routes. + """ + if user.is_anonymous: + raise AuthenticationError("authentication required") + if not user.is_admin: + raise PermissionError(required_role="admin") + return user diff --git a/mpcontribs-api/src/mpcontribs_api/exceptions.py b/mpcontribs-api/src/mpcontribs_api/exceptions.py index f6dfd32040..bcfc098235 100644 --- a/mpcontribs-api/src/mpcontribs_api/exceptions.py +++ b/mpcontribs-api/src/mpcontribs_api/exceptions.py @@ -91,6 +91,7 @@ class DownloadError(AppError): error_code = "download_error" log_level = logging.WARNING + def error_body(error_code: str, message: str, **public_context) -> dict: body: dict[str, Any] = {"error": {"code": error_code, "message": message}} if public_context: From acc2b8d203c3eab651b010441746ee6f356b84ce Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Fri, 31 Jul 2026 13:20:23 -0700 Subject: [PATCH 525/591] Removed __future__ annotations imports --- mpcontribs-api/src/mpcontribs_api/exceptions.py | 2 -- mpcontribs-api/src/mpcontribs_api/projection.py | 2 -- 2 files changed, 4 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/exceptions.py b/mpcontribs-api/src/mpcontribs_api/exceptions.py index bcfc098235..f8249a51d1 100644 --- a/mpcontribs-api/src/mpcontribs_api/exceptions.py +++ b/mpcontribs-api/src/mpcontribs_api/exceptions.py @@ -1,5 +1,3 @@ -from __future__ import annotations - import logging from collections.abc import Sequence from typing import Any diff --git a/mpcontribs-api/src/mpcontribs_api/projection.py b/mpcontribs-api/src/mpcontribs_api/projection.py index 0346a1f210..337266dc44 100644 --- a/mpcontribs-api/src/mpcontribs_api/projection.py +++ b/mpcontribs-api/src/mpcontribs_api/projection.py @@ -5,8 +5,6 @@ SparseFieldsModel """ -from __future__ import annotations - from collections.abc import Iterator from functools import lru_cache from typing import ( From c76a5ef5af5145a759517826d0c4cd68200ee8dc Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Fri, 31 Jul 2026 13:25:03 -0700 Subject: [PATCH 526/591] feat(Consumer): consumer is used to define mpcontribs user-specific configuration consumer config is read from a new MongoDB collection mirroring core.mp_consumers --- .../domains/consumers/dependencies.py | 31 +++++ .../domains/consumers/models.py | 128 ++++++++++++++++++ .../domains/consumers/repository.py | 93 +++++++++++++ .../domains/consumers/router.py | 72 ++++++++++ 4 files changed, 324 insertions(+) create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/consumers/dependencies.py create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/consumers/models.py create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/consumers/repository.py create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/consumers/router.py diff --git a/mpcontribs-api/src/mpcontribs_api/domains/consumers/dependencies.py b/mpcontribs-api/src/mpcontribs_api/domains/consumers/dependencies.py new file mode 100644 index 0000000000..ce53f76513 --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/domains/consumers/dependencies.py @@ -0,0 +1,31 @@ +from typing import Annotated + +from fastapi import Depends + +from mpcontribs_api.dependencies import UserDep +from mpcontribs_api.domains.consumers.models import ConsumerSettings +from mpcontribs_api.domains.consumers.repository import MongoDbConsumerRepository + + +def get_scoped_consumers(user: UserDep) -> MongoDbConsumerRepository: + return MongoDbConsumerRepository(user) + + +ConsumerDep = Annotated[MongoDbConsumerRepository, Depends(get_scoped_consumers)] + + +async def get_effective_limits(user: UserDep) -> ConsumerSettings: + """Resolve the settings in effect for the current caller. + + Returns the ``settings`` of the caller's stored ``Consumer`` override if one exists, otherwise a + default ``ConsumerSettings`` (which fills from the env-backed global defaults). Callers with no + ``consumer_id`` (anonymous or dev) skip the lookup. + """ + if user.consumer_id is None: + return ConsumerSettings() + + override = await MongoDbConsumerRepository(user).get_by_consumer_id(user.consumer_id) + return override.settings if override is not None else ConsumerSettings() + + +ConsumerLimitsDep = Annotated[ConsumerSettings, Depends(get_effective_limits)] diff --git a/mpcontribs-api/src/mpcontribs_api/domains/consumers/models.py b/mpcontribs-api/src/mpcontribs_api/domains/consumers/models.py new file mode 100644 index 0000000000..e53b4ac9b5 --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/domains/consumers/models.py @@ -0,0 +1,128 @@ +from beanie import PydanticObjectId +from fastapi_filter import FilterDepends, with_prefix +from pydantic import BaseModel, Field +from pymongo import ASCENDING, IndexModel + +from mpcontribs_api.config import get_settings +from mpcontribs_api.domains._shared.filters import BaseFilter +from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut + + +class ConsumerSettings(BaseModel): + """Per-consumer settings — the effective, fully-resolved values read by the app. + + The quota limits default directly from the env-backed ``config.QuotaLimits`` (so an unset field + resolves to its global default), and this model is free to grow settings beyond quota limits. + Because unset fields fall back to defaults, admins can supply only the fields they want to change + (the repository/input paths use ``exclude_unset`` to keep an override partial). + """ + + max_projects: int = Field(default_factory=lambda: get_settings().quota.max_projects, ge=0) + max_unapproved_contributions_per_project: int = Field( + default_factory=lambda: get_settings().quota.max_unapproved_contributions_per_project, ge=0 + ) + max_columns: int = Field(default_factory=lambda: get_settings().quota.max_columns, ge=0) + + +class ConsumerSettingsFilter(BaseFilter): + max_projects: int | None = None + max_projects__gte: int | None = None + max_projects__lte: int | None = None + + max_unapproved_contributions_per_project: int | None = None + max_unapproved_contributions_per_project__gte: int | None = None + max_unapproved_contributions_per_project__lte: int | None = None + + max_columns: int | None = None + max_columns__gte: int | None = None + max_columns__lte: int | None = None + + # sorting + order_by: list[str] | None = None + + +class Consumer(BaseDocumentWithInput[PydanticObjectId]): + """Admin-managed, per-consumer overrides of the global quota limits. + + Stored in ``mp_consumers`` and matched to a request by Kong's ``consumer_id``. The quota limits + live under ``settings`` (a ``QuotaLimits``); an admin can override a single limit and any field + they leave unset inherits the env-backed default, snapshotted onto the document at insert time. + """ + + consumer_id: str + settings: ConsumerSettings = Field(default_factory=ConsumerSettings) + + @classmethod + def with_defaults(cls, consumer_id: str = "") -> Consumer: + """In-memory Consumer whose ``settings`` carry the env-backed default limits. + + Never persisted; a throwaway ``_id`` is minted only to satisfy the document's required id. + """ + return cls.model_validate({"_id": PydanticObjectId(), "consumer_id": consumer_id}) + + @classmethod + def from_input_model(cls, data: ConsumerIn) -> Consumer: + """Build a stored document from an input payload, minting a fresh server-owned ``_id``. + + Unset fields snapshot the current env defaults (``ConsumerSettings`` fills them from + ``config.QuotaLimits``), so the stored document always carries fully-resolved values. + """ + settings = data.settings if data.settings is not None else ConsumerSettings() + return cls.model_validate({"_id": PydanticObjectId(), "consumer_id": data.consumer_id, "settings": settings}) + + class Settings: + name = "mp_consumers" + keep_nulls = False + indexes = [IndexModel([("consumer_id", ASCENDING)], name="consumer_id", unique=True)] + + +class ConsumerIn(BaseModel): + """Admin-supplied payload to create a consumer override. + + Limits left unset inherit the env-backed global defaults. + """ + + consumer_id: str + settings: ConsumerSettings | None = None + + +class ConsumerPatch(BaseModel): + """Partial update to a consumer override. + + Only the limits present under ``settings`` are changed; the rest are left as stored. + """ + + settings: ConsumerSettings | None = None + + +class ConsumerOut(DocumentOut[PydanticObjectId]): + """Public-facing representation of a consumer override.""" + + consumer_id: str | None = None + settings: ConsumerSettings | None = None + + @staticmethod + def default_fields() -> list[str]: + return [*ConsumerOut.model_fields] + + +class ConsumerFilter(BaseFilter): + """Filter fields allowed when listing consumer overrides. + + The quota limits live under ``settings`` on the document, so the flat filter names here are + remapped to dotted ``settings.`` Mongo keys in ``_get_filter_conditions``. + """ + + id: PydanticObjectId | None = None + id__in: list[PydanticObjectId] | None = None + + consumer_id: str | None = None + consumer_id__in: list[str] | None = None + + settings: ConsumerSettingsFilter | None = FilterDepends(with_prefix("tables", ConsumerSettingsFilter)) + + # sorting + order_by: list[str] | None = None + + class Constants(BaseFilter.Constants): + model = Consumer diff --git a/mpcontribs-api/src/mpcontribs_api/domains/consumers/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/consumers/repository.py new file mode 100644 index 0000000000..08463950cd --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/domains/consumers/repository.py @@ -0,0 +1,93 @@ +from typing import Any + +from beanie import UpdateResponse +from beanie.operators import Set + +from mpcontribs_api.authz import User +from mpcontribs_api.domains._shared.repository import MongoDbRepository +from mpcontribs_api.domains.consumers.models import ( + Consumer, + ConsumerFilter, + ConsumerIn, + ConsumerOut, + ConsumerPatch, +) +from mpcontribs_api.exceptions import ConflictError, NotFoundError +from mpcontribs_api.pagination import CursorParams + + +class MongoDbConsumerRepository(MongoDbRepository[Consumer, ConsumerIn, ConsumerOut, ConsumerFilter, ConsumerPatch]): + """Repository for admin-managed consumer overrides. + + Consumer overrides are an admin-only resource: every route that reaches this repository is + gated by ``require_admin``, so no per-user read scope is needed and ``_build_scope`` returns an + empty filter (admins see all overrides). + """ + + document_model = Consumer + out_model = ConsumerOut + + @staticmethod + def _build_scope(user: User) -> dict[str, Any]: + # Admin-only resource (routes enforce ``require_admin``); no visibility filter required. + return {} + + async def get_consumers( + self, + filter: ConsumerFilter, + pagination: CursorParams, + fields: frozenset[str] | None, + ): + """List consumer overrides. See ``get_many``.""" + return await self.get_many(pagination=pagination, filter=filter, fields=fields) + + async def get_consumer_by_id(self, id: str, fields: frozenset[str] | None): + """Find a single consumer override by its document id. See ``get_by_id``.""" + return await self.get_by_id(self._convert_object_id(id), fields) + + async def get_by_consumer_id(self, consumer_id: str) -> Consumer | None: + """Return the override document for a Kong ``consumer_id``, or ``None`` if none exists.""" + return await Consumer.find_one(Consumer.consumer_id == consumer_id) + + async def insert_consumer(self, consumer: ConsumerIn) -> Consumer: + """Insert a new override, rejecting a duplicate ``consumer_id`` with a clean 409. + + The unique index on ``consumer_id`` is the hard guarantee; this pre-check turns the common + case into a readable conflict instead of a raw driver error. + """ + existing = await self.get_by_consumer_id(consumer.consumer_id) + if existing is not None: + raise ConflictError( + "An override for this consumer already exists", + consumer_id=consumer.consumer_id, + ) + return await self.insert_one(consumer) + + async def patch_consumer_by_id(self, id: str, update: ConsumerPatch) -> Consumer: + """Partially update an override's limits by document id. + + The limits live under a nested ``settings`` sub-document; the update is flattened to dotted + ``settings.`` keys so a partial patch changes only the named limits and leaves the + siblings intact (a plain ``$set`` of ``settings`` would replace the whole sub-document). + """ + object_id = self._convert_object_id(id) + overrides = update.settings.model_dump(exclude_unset=True) if update.settings else {} + dotted = {f"settings.{field}": value for field, value in overrides.items()} + if not dotted: + # Empty patch is a no-op that still returns the existing document (consistent behavior). + existing = await Consumer.find_one(Consumer.id == object_id) + if existing is None: + raise NotFoundError(self._not_found(id)) + return existing + + updated = await Consumer.find_one(Consumer.id == object_id).update( + Set(dotted), + response_type=UpdateResponse.NEW_DOCUMENT, + ) # pyright: ignore[reportGeneralTypeIssues] # beanie UpdateQuery is awaitable, but pyright doesn't see it + if updated is None: + raise NotFoundError(self._not_found(id)) + return updated + + async def delete_consumer_by_id(self, id: str) -> None: + """Delete an override by document id. See ``delete_by_id``.""" + await self.delete_by_id(self._convert_object_id(id)) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/consumers/router.py b/mpcontribs-api/src/mpcontribs_api/domains/consumers/router.py new file mode 100644 index 0000000000..89f6e00bc3 --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/domains/consumers/router.py @@ -0,0 +1,72 @@ +from typing import Annotated + +from fastapi import APIRouter, Depends, Response, status +from fastapi_filter import FilterDepends + +from mpcontribs_api.dependencies import require_admin +from mpcontribs_api.domains._shared.types import FieldSelector +from mpcontribs_api.domains.consumers.dependencies import ConsumerDep +from mpcontribs_api.domains.consumers.models import ( + ConsumerFilter, + ConsumerIn, + ConsumerOut, + ConsumerPatch, +) +from mpcontribs_api.pagination import CursorParams + +# Admin-only override management. Every route depends on ``require_admin``; the router as a whole is +# mounted with ``include_in_schema=False`` (see api/v1/router.py) so it is hidden from the OpenAPI +# spec while remaining reachable by callers that know the path. +router = APIRouter(dependencies=[Depends(require_admin)]) + + +@router.get("") +async def get_consumers( + repo: ConsumerDep, + pagination: Annotated[CursorParams, Depends()], + filter: ConsumerFilter = FilterDepends(ConsumerFilter), + fields: FieldSelector = ConsumerOut.default_fields(), +): + """List consumer overrides (admin only).""" + selected = ConsumerOut.parse_fields(fields) + return await repo.get_consumers(filter=filter, pagination=pagination, fields=selected) + + +@router.get("/{id}") +async def get_consumer_by_id( + id: str, + repo: ConsumerDep, + fields: FieldSelector = ConsumerOut.default_fields(), +): + """Get a single consumer override by document id (admin only).""" + selected = ConsumerOut.parse_fields(fields) + return await repo.get_consumer_by_id(id=id, fields=selected) + + +@router.post("", response_model=ConsumerOut, status_code=status.HTTP_201_CREATED) +async def create_consumer( + repo: ConsumerDep, + consumer: ConsumerIn, +): + """Create a new consumer override, rejecting a duplicate ``consumer_id`` with 409 (admin only).""" + return await repo.insert_consumer(consumer) + + +@router.patch("/{id}", response_model=ConsumerOut) +async def patch_consumer_by_id( + repo: ConsumerDep, + id: str, + update: ConsumerPatch, +): + """Partially update a consumer override by document id (admin only).""" + return await repo.patch_consumer_by_id(id=id, update=update) + + +@router.delete("/{id}", status_code=status.HTTP_204_NO_CONTENT) +async def delete_consumer_by_id( + repo: ConsumerDep, + id: str, +): + """Delete a consumer override by document id (admin only).""" + await repo.delete_consumer_by_id(id=id) + return Response(status_code=status.HTTP_204_NO_CONTENT) From 88fcce0a505ec0aefa39eeb0344ecdbe5c301621 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Fri, 31 Jul 2026 13:27:38 -0700 Subject: [PATCH 527/591] refactor(Implement-Consumer): wiring Consumer throughout code, replacing old quota implementations --- .../src/mpcontribs_api/api/v1/router.py | 9 ++++++ mpcontribs-api/src/mpcontribs_api/app.py | 2 ++ .../domains/contributions/dependencies.py | 10 ++++-- .../domains/contributions/router.py | 10 ++++-- .../domains/contributions/service.py | 7 ++-- .../domains/projects/dependencies.py | 5 +-- .../mpcontribs_api/domains/projects/models.py | 32 +++++-------------- .../domains/projects/repository.py | 18 ++++++++--- 8 files changed, 55 insertions(+), 38 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/api/v1/router.py b/mpcontribs-api/src/mpcontribs_api/api/v1/router.py index 871ce25bdd..fe71d8326d 100644 --- a/mpcontribs-api/src/mpcontribs_api/api/v1/router.py +++ b/mpcontribs-api/src/mpcontribs_api/api/v1/router.py @@ -1,6 +1,7 @@ from fastapi import APIRouter from mpcontribs_api.domains.attachments.router import router as attachments_router +from mpcontribs_api.domains.consumers.router import router as consumers_router from mpcontribs_api.domains.contributions.router import router as contributions_router from mpcontribs_api.domains.limits.router import router as limits_router from mpcontribs_api.domains.projects.router import router as projects_router @@ -15,3 +16,11 @@ router.include_router(projects_router, prefix="/projects", tags=["projects"]) router.include_router(structures_router, prefix="/structures", tags=["structures"]) router.include_router(tables_router, prefix="/tables", tags=["tables"]) +# Admin-only override management. Hidden from the OpenAPI schema (include_in_schema=False) but +# still routable; every route additionally enforces require_admin. +router.include_router( + consumers_router, + prefix="/admin/consumers", + tags=["admin"], + include_in_schema=False, +) diff --git a/mpcontribs-api/src/mpcontribs_api/app.py b/mpcontribs-api/src/mpcontribs_api/app.py index aa370d0e45..c79e22c8fb 100644 --- a/mpcontribs-api/src/mpcontribs_api/app.py +++ b/mpcontribs-api/src/mpcontribs_api/app.py @@ -19,6 +19,7 @@ from mpcontribs_api.config import Settings, get_settings from mpcontribs_api.domains._redirects.router import router as redirects_router from mpcontribs_api.domains.attachments.models import Attachment +from mpcontribs_api.domains.consumers.models import Consumer from mpcontribs_api.domains.contributions.models import Contribution from mpcontribs_api.domains.healthcheck.router import router as healthcheck_router from mpcontribs_api.domains.projects.models import Project @@ -67,6 +68,7 @@ async def _setup_mongo(app: FastAPI, settings: Settings, stack: AsyncExitStack) Attachment, Structure, Table, + Consumer, ], ) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/dependencies.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/dependencies.py index 805d4357a1..cb368ad641 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/dependencies.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/dependencies.py @@ -4,6 +4,7 @@ from mpcontribs_api.dependencies import MongoClientDep, UserDep from mpcontribs_api.domains.attachments.repository import MongoDbAttachmentRepository +from mpcontribs_api.domains.consumers.dependencies import ConsumerLimitsDep from mpcontribs_api.domains.contributions.repository import ( MongoDbContributionRepository, ) @@ -20,15 +21,20 @@ def get_scoped_contributions(user: UserDep) -> MongoDbContributionRepository: ContributionDep = Annotated[MongoDbContributionRepository, Depends(get_scoped_contributions)] -def get_contribution_service(user: UserDep, client: MongoClientDep) -> ContributionService: +def get_contribution_service( + user: UserDep, + client: MongoClientDep, + limits: ConsumerLimitsDep, +) -> ContributionService: return ContributionService( client=client, user=user, - projects=MongoDbProjectRepository(user), + projects=MongoDbProjectRepository(user, limits), contributions=MongoDbContributionRepository(user), structures=MongoDbStructureRepository(user), attachments=MongoDbAttachmentRepository(user), tables=MongoDbTableRepository(user), + limits=limits, ) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py index 8e71750003..251ce0eaa3 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py @@ -7,6 +7,7 @@ from mpcontribs_api.config import get_settings from mpcontribs_api.dependencies import S3Dep, require_user from mpcontribs_api.domains._shared.bulk import BulkWriteSummary +from mpcontribs_api.domains._shared.models import DeleteResponse from mpcontribs_api.domains._shared.types import ( DownloadFormat, FieldSelector, @@ -57,12 +58,15 @@ async def get_contributions( return await repo.get_contributions(pagination=pagination, filter=filter, fields=selected) -@router.delete("", dependencies=[Depends(require_user)]) +@router.delete("", response_model=DeleteResponse, dependencies=[Depends(require_user)]) async def delete_contributions( repo: ContributionDep, filter: ContributionFilter = FilterDepends(ContributionFilter), -): - return await repo.delete_contributions(filter=filter) +) -> DeleteResponse: + # The repository returns a raw pymongo DeleteResult (or None when the filter matched nothing); + # convert it to the typed DeleteResponse so the endpoint has a stable, serializable contract. + result = await repo.delete_contributions(filter=filter) + return DeleteResponse.from_delete_result(result) if result is not None else DeleteResponse(num_deleted=0) # TODO: Might want to take contributions in from request body and run model_validate_json on it (much faster) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py index 4ca81bf34c..1ff9cf4224 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py @@ -20,6 +20,7 @@ ) from mpcontribs_api.domains._shared.repository import MongoDbRepository from mpcontribs_api.domains.attachments.repository import MongoDbAttachmentRepository +from mpcontribs_api.domains.consumers.models import ConsumerSettings from mpcontribs_api.domains.contributions.models import Contribution, ContributionFilter, ContributionIn from mpcontribs_api.domains.contributions.repository import MongoDbContributionRepository from mpcontribs_api.domains.projects.repository import MongoDbProjectRepository @@ -61,6 +62,7 @@ def __init__( attachments: MongoDbAttachmentRepository, tables: MongoDbTableRepository, settings: MongoSettings | None = None, + limits: ConsumerSettings | None = None, ): self._client = client self._user = user @@ -70,6 +72,7 @@ def __init__( self._attachments = attachments self._tables = tables self._settings = settings or get_settings().mongo + self._limits = limits or ConsumerSettings() @property def _children(self) -> dict[str, MongoDbRepository]: @@ -324,7 +327,7 @@ async def _split_quota_exceeded( for item in plan: by_project[item.contribution.project].append(item) - cap = get_settings().user.max_unapproved_contributions_per_project + cap = self._limits.max_unapproved_contributions_per_project failures: list[BulkFailure] = [] survivors: list[ResolvedWrite] = [] for project_id, items in by_project.items(): @@ -597,7 +600,7 @@ async def upsert_contribution_by_id(self, id: str, contribution: ContributionIn) existing = await self._contributions.get_contribution_by_id(id, fields=frozenset({"id"})) if existing is None: stored = await self._unapproved_stored_count(contribution.project) - cap = get_settings().user.max_unapproved_contributions_per_project + cap = self._limits.max_unapproved_contributions_per_project if stored is not None and stored >= cap: logger.warning( "contribution.unapproved_quota_exceeded", diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/dependencies.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/dependencies.py index 94535cc67d..b74b44f935 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/dependencies.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/dependencies.py @@ -3,13 +3,14 @@ from fastapi import Depends from mpcontribs_api.dependencies import UserDep +from mpcontribs_api.domains.consumers.dependencies import ConsumerLimitsDep from mpcontribs_api.domains.projects.repository import ( MongoDbProjectRepository, ) -def get_scoped_projects(user: UserDep) -> MongoDbProjectRepository: - return MongoDbProjectRepository(user) +def get_scoped_projects(user: UserDep, limits: ConsumerLimitsDep) -> MongoDbProjectRepository: + return MongoDbProjectRepository(user, limits) ProjectDep = Annotated[MongoDbProjectRepository, Depends(get_scoped_projects)] diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py index fe09e7481d..eaaae69351 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py @@ -1,30 +1,24 @@ -from __future__ import annotations - from typing import Any, Literal -from pydantic import BaseModel, ConfigDict, Field, HttpUrl, field_validator +from pydantic import BaseModel, ConfigDict, Field, HttpUrl from mpcontribs_api import pagination -from mpcontribs_api.config import get_settings from mpcontribs_api.domains._shared.filters import BaseFilter from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut from mpcontribs_api.domains._shared.types import PrefixedEmail, ShortStr from mpcontribs_api.exceptions import ValidationError -def _validate_column_limit(columns: Any) -> Any: - """Reject input carrying more than the configured column cap. +def check_column_limit(columns: Any, max_columns: int) -> None: + """Reject a *write* carrying more columns than ``max_columns`` allows. Allows legacy docs that exceed cap to be returned without raising an error. """ - if isinstance(columns, list): - max_columns = get_settings().user.max_columns - if len(columns) > max_columns: - raise ValidationError( - f"columns cannot have more than {max_columns} entries", - column_length=len(columns), - ) - return columns + if isinstance(columns, list) and len(columns) > max_columns: + raise ValidationError( + f"columns cannot have more than {max_columns} entries", + column_length=len(columns), + ) class Column(BaseModel): @@ -155,11 +149,6 @@ class Constants(BaseFilter.Constants): class ProjectIn(Project): """Representation of user-supplied input.""" - @field_validator("columns", mode="before") - @classmethod - def limit_column_length(cls, c: Any) -> Any: - return _validate_column_limit(c) - class ProjectPatch(BaseModel): """Nullable Project representation of user-supplied data for partial update (patch).""" @@ -176,8 +165,3 @@ class ProjectPatch(BaseModel): is_public: bool = False is_approved: bool = False license: Literal["CCA4", "CCPD"] | None = None - - @field_validator("columns", mode="before") - @classmethod - def limit_column_length(cls, c: Any) -> Any: - return _validate_column_limit(c) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py index 204a6ea78f..e7acd48c15 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py @@ -1,14 +1,15 @@ from typing import Any from mpcontribs_api.authz import User -from mpcontribs_api.config import get_settings from mpcontribs_api.domains._shared.repository import MongoDbRepository +from mpcontribs_api.domains.consumers.models import ConsumerSettings from mpcontribs_api.domains.projects.models import ( Project, ProjectFilter, ProjectIn, ProjectOut, ProjectPatch, + check_column_limit, ) from mpcontribs_api.exceptions import PermissionError from mpcontribs_api.pagination import CursorParams @@ -30,9 +31,10 @@ class MongoDbProjectRepository(MongoDbRepository[Project, ProjectIn, ProjectOut, document_model = Project out_model = ProjectOut - def __init__(self, user: User) -> None: + def __init__(self, user: User, limits: ConsumerSettings | None = None) -> None: super().__init__(user) self._user = user + self._limits = limits or ConsumerSettings() @staticmethod def _build_scope(user: User) -> dict[str, Any]: @@ -48,13 +50,13 @@ def _build_scope(user: User) -> dict[str, Any]: async def _check_num_projects(self, owner: str): """Reject a *new* project that would push ``owner`` past the per-user cap.""" - settings = get_settings() + max_projects = self._limits.max_projects # Soft limit: this count-then-insert is not atomic, so concurrent creates by the same owner # can overshoot the cap by a bounded amount. Acceptable for an anti-abuse quota. result = await Project.find(Project.owner == owner).count() - if result >= settings.user.max_projects: + if result >= max_projects: raise PermissionError( - f"Cannot be owner of more than {settings.user.max_projects} projects", + f"Cannot be owner of more than {max_projects} projects", owner=owner, num_projects=result, ) @@ -98,11 +100,16 @@ async def unique_identifiers_by_id(self, ids: list[str]) -> dict[str, bool]: async def insert_project(self, project: ProjectIn) -> Project: """Insert a new project, rejecting a duplicate id. See ``insert_one``.""" + check_column_limit(project.columns, self._limits.max_columns) await self._check_num_projects(project.owner) return await self.insert_one(project) async def patch_project_by_id(self, id: str, update: ProjectPatch) -> Project: """Partially update a project by id, scoped to the current user. See ``patch``.""" + # Only enforce the column cap when the caller actually sends columns; an unset field is a + # no-op and must not be checked against its empty default. + if "columns" in update.model_fields_set: + check_column_limit(update.columns, self._limits.max_columns) return await self.patch(id, update) async def delete_project_by_id(self, id: str) -> None: @@ -136,6 +143,7 @@ async def upsert_project_by_id(self, id: str, data: ProjectIn) -> Project: if self._user.username is None: raise PermissionError(required_role="authenticated") + check_column_limit(data.columns, self._limits.max_columns) existing = await self.document_model.find_one(self.document_model.id == id) project = self.document_model.from_input_model(data) project.id = id From a28a6d8ce9522a96d2aac6c77821f8b81675e032 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Fri, 31 Jul 2026 13:29:20 -0700 Subject: [PATCH 528/591] build(commitizen): tooling to use commitizen --- mpcontribs-api/pyproject.toml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/mpcontribs-api/pyproject.toml b/mpcontribs-api/pyproject.toml index 87f12d487a..74990c00b5 100644 --- a/mpcontribs-api/pyproject.toml +++ b/mpcontribs-api/pyproject.toml @@ -13,6 +13,13 @@ include-package-data = true where = ["src"] include = ["mpcontribs_api*"] +[tool.commitizen] +name = "cz_conventional_commits" +tag_format = "v$version" +version_scheme = "pep440" +version_provider = "uv" +update_changelog_on_bump = true + [project] name = "mpcontribs-api" dynamic = ["version"] From f4fc003bb6d4e58035d2bb6f184ce3daec037c4c Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Fri, 31 Jul 2026 14:27:26 -0700 Subject: [PATCH 529/591] test(Consumer-tests): added tests for consumer and modified tests to use consumer for quota limits --- mpcontribs-api/src/mpcontribs_api/config.py | 4 +- .../domains/consumers/models.py | 6 +- mpcontribs-api/tests/integration/conftest.py | 8 + .../tests/integration/db/conftest.py | 10 +- .../db/test_consumers_repository.py | 153 ++++++++++++++++++ .../db/test_projects_repository.py | 88 ++++++++-- .../unit/domains/test_consumers_models.py | 73 +++++++++ .../unit/domains/test_contribution_service.py | 32 ++-- .../unit/domains/test_projects_models.py | 69 ++++---- 9 files changed, 370 insertions(+), 73 deletions(-) create mode 100644 mpcontribs-api/tests/integration/db/test_consumers_repository.py create mode 100644 mpcontribs-api/tests/unit/domains/test_consumers_models.py diff --git a/mpcontribs-api/src/mpcontribs_api/config.py b/mpcontribs-api/src/mpcontribs_api/config.py index c424ae878b..971d438012 100644 --- a/mpcontribs-api/src/mpcontribs_api/config.py +++ b/mpcontribs-api/src/mpcontribs_api/config.py @@ -194,8 +194,8 @@ class Settings(BaseSettings): # MPContribs_otel__* otel: ObservabilitySettings = Field(default_factory=ObservabilitySettings) - # MPContribs_quota__* - quota: QuotaLimits = Field(default_factory=QuotaLimits) + # MPContribs_consumer__* + consumer: QuotaLimits = Field(default_factory=QuotaLimits) # SMTP Settings mail_default_sender: str = Field( diff --git a/mpcontribs-api/src/mpcontribs_api/domains/consumers/models.py b/mpcontribs-api/src/mpcontribs_api/domains/consumers/models.py index e53b4ac9b5..6d1ba5deb7 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/consumers/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/consumers/models.py @@ -17,11 +17,11 @@ class ConsumerSettings(BaseModel): (the repository/input paths use ``exclude_unset`` to keep an override partial). """ - max_projects: int = Field(default_factory=lambda: get_settings().quota.max_projects, ge=0) + max_projects: int = Field(default_factory=lambda: get_settings().consumer.max_projects, ge=0) max_unapproved_contributions_per_project: int = Field( - default_factory=lambda: get_settings().quota.max_unapproved_contributions_per_project, ge=0 + default_factory=lambda: get_settings().consumer.max_unapproved_contributions_per_project, ge=0 ) - max_columns: int = Field(default_factory=lambda: get_settings().quota.max_columns, ge=0) + max_columns: int = Field(default_factory=lambda: get_settings().consumer.max_columns, ge=0) class ConsumerSettingsFilter(BaseFilter): diff --git a/mpcontribs-api/tests/integration/conftest.py b/mpcontribs-api/tests/integration/conftest.py index c4be40b215..a66b7d68e0 100644 --- a/mpcontribs-api/tests/integration/conftest.py +++ b/mpcontribs-api/tests/integration/conftest.py @@ -96,6 +96,14 @@ def test_app() -> FastAPI: @pytest.fixture def client(test_app: FastAPI): """Function-scoped client; dependency overrides are cleared after each test.""" + from mpcontribs_api.domains.consumers.dependencies import get_effective_limits + from mpcontribs_api.domains.consumers.models import ConsumerSettings + + # Mock-based integration tests run without a database. Resolving per-consumer limits normally + # awaits the (mocked) consumers collection, which would 500 the request before it reaches the + # code under test. Default the dependency to the global-default limits; tests that specifically + # assert override behavior can install their own override. + test_app.dependency_overrides[get_effective_limits] = lambda: ConsumerSettings() with TestClient(test_app, raise_server_exceptions=False) as c: yield c test_app.dependency_overrides.clear() diff --git a/mpcontribs-api/tests/integration/db/conftest.py b/mpcontribs-api/tests/integration/db/conftest.py index beab815b9f..87cc59e58b 100644 --- a/mpcontribs-api/tests/integration/db/conftest.py +++ b/mpcontribs-api/tests/integration/db/conftest.py @@ -5,6 +5,7 @@ from mpcontribs_api.config import get_settings from mpcontribs_api.domains.attachments.models import Attachment +from mpcontribs_api.domains.consumers.models import Consumer from mpcontribs_api.domains.contributions.models import Contribution from mpcontribs_api.domains.projects.models import Project from mpcontribs_api.domains.structures.models import Structure @@ -66,7 +67,7 @@ async def db(mongo_client): database = mongo_client[settings.mongo.db_name] await init_beanie( database=database, - document_models=[Project, Contribution, Structure, Table, Attachment], + document_models=[Project, Contribution, Structure, Table, Attachment, Consumer], ) yield database @@ -97,3 +98,10 @@ async def clean_components(db): yield for collection in ("structures", "tables", "attachments"): await db[collection].delete_many({}) + + +@pytest_asyncio.fixture(autouse=True) +async def clean_consumers(db): + await db["mp_consumers"].delete_many({}) + yield + await db["mp_consumers"].delete_many({}) diff --git a/mpcontribs-api/tests/integration/db/test_consumers_repository.py b/mpcontribs-api/tests/integration/db/test_consumers_repository.py new file mode 100644 index 0000000000..4fd78cec79 --- /dev/null +++ b/mpcontribs-api/tests/integration/db/test_consumers_repository.py @@ -0,0 +1,153 @@ +import pytest + +from mpcontribs_api.authz import User +from mpcontribs_api.config import get_settings +from mpcontribs_api.domains.consumers.dependencies import get_effective_limits +from mpcontribs_api.domains.consumers.models import ( + Consumer, + ConsumerIn, + ConsumerPatch, + ConsumerSettings, +) +from mpcontribs_api.domains.consumers.repository import MongoDbConsumerRepository +from mpcontribs_api.exceptions import ConflictError, NotFoundError + +# Same loop-scope contract as the other db suites (see test_projects_repository). +pytestmark = [pytest.mark.db, pytest.mark.asyncio(loop_scope="session")] + + +ADMIN = User(username="google:admin@example.com", groups=frozenset({"admin"})) + + +def _repo() -> MongoDbConsumerRepository: + # Consumer management is admin-only and unscoped, so the acting user is immaterial here. + return MongoDbConsumerRepository(ADMIN) + + +# --------------------------------------------------------------------------- +# insert_consumer / get_by_consumer_id +# --------------------------------------------------------------------------- + + +class TestInsertAndLookup: + async def test_insert_then_lookup_by_consumer_id(self, db): + await _repo().insert_consumer(ConsumerIn(consumer_id="kong-1")) + found = await _repo().get_by_consumer_id("kong-1") + assert found is not None + assert found.consumer_id == "kong-1" + + async def test_duplicate_consumer_id_raises_conflict(self, db): + await _repo().insert_consumer(ConsumerIn(consumer_id="kong-dup")) + with pytest.raises(ConflictError): + await _repo().insert_consumer(ConsumerIn(consumer_id="kong-dup")) + + async def test_lookup_missing_returns_none(self, db): + assert await _repo().get_by_consumer_id("kong-absent") is None + + async def test_partial_override_snapshots_defaults_for_siblings(self, db): + # Admin overrides only max_projects; the stored document must carry a fully-resolved + # settings block, with untouched limits snapshotted from the global defaults. + await _repo().insert_consumer( + ConsumerIn(consumer_id="kong-partial", settings=ConsumerSettings(max_projects=1)) + ) + stored = await _repo().get_by_consumer_id("kong-partial") + assert stored is not None + assert stored.settings.max_projects == 1 + assert stored.settings.max_columns == get_settings().consumer.max_columns + + +# --------------------------------------------------------------------------- +# get_consumer_by_id (document id) +# --------------------------------------------------------------------------- + + +class TestGetByDocumentId: + async def test_returns_out_model(self, db): + created = await _repo().insert_consumer(ConsumerIn(consumer_id="kong-doc")) + result = await _repo().get_consumer_by_id(id=str(created.id), fields=None) + assert result is not None + assert result.consumer_id == "kong-doc" + + async def test_missing_returns_none(self, db): + from beanie import PydanticObjectId + + result = await _repo().get_consumer_by_id(id=str(PydanticObjectId()), fields=None) + assert result is None + + +# --------------------------------------------------------------------------- +# patch_consumer_by_id — partial, sibling-preserving +# --------------------------------------------------------------------------- + + +class TestPatchConsumer: + async def test_patch_changes_only_named_limit(self, db): + created = await _repo().insert_consumer(ConsumerIn(consumer_id="kong-patch")) + original_columns = created.settings.max_columns + + updated = await _repo().patch_consumer_by_id( + id=str(created.id), + update=ConsumerPatch(settings=ConsumerSettings(max_projects=1)), + ) + assert updated.settings.max_projects == 1 + # Sibling limit untouched: a nested-key $set, not a whole-subdocument replace. + assert updated.settings.max_columns == original_columns + + async def test_empty_patch_returns_existing_unchanged(self, db): + created = await _repo().insert_consumer(ConsumerIn(consumer_id="kong-noop")) + result = await _repo().patch_consumer_by_id(id=str(created.id), update=ConsumerPatch()) + assert result.consumer_id == "kong-noop" + assert result.settings.max_projects == created.settings.max_projects + + async def test_patch_missing_raises_not_found(self, db): + from beanie import PydanticObjectId + + with pytest.raises(NotFoundError): + await _repo().patch_consumer_by_id( + id=str(PydanticObjectId()), + update=ConsumerPatch(settings=ConsumerSettings(max_projects=1)), + ) + + +# --------------------------------------------------------------------------- +# delete_consumer_by_id +# --------------------------------------------------------------------------- + + +class TestDeleteConsumer: + async def test_delete_removes_override(self, db): + created = await _repo().insert_consumer(ConsumerIn(consumer_id="kong-del")) + await _repo().delete_consumer_by_id(id=str(created.id)) + assert await _repo().get_by_consumer_id("kong-del") is None + + async def test_delete_missing_raises_not_found(self, db): + from beanie import PydanticObjectId + + with pytest.raises(NotFoundError): + await _repo().delete_consumer_by_id(id=str(PydanticObjectId())) + + +# --------------------------------------------------------------------------- +# get_effective_limits — the resolution actually consumed by the write paths +# --------------------------------------------------------------------------- + + +class TestEffectiveLimits: + async def test_no_consumer_id_returns_defaults_without_lookup(self, db): + # A caller with no Kong consumer_id (anonymous/dev) never touches the override collection. + user = User(username="google:alice@example.com", groups=frozenset()) + limits = await get_effective_limits(user) + assert limits.max_projects == get_settings().consumer.max_projects + + async def test_stored_override_is_returned(self, db): + await _repo().insert_consumer( + ConsumerIn(consumer_id="kong-eff", settings=ConsumerSettings(max_projects=42)) + ) + user = User(consumer_id="kong-eff", username="google:alice@example.com", groups=frozenset()) + limits = await get_effective_limits(user) + assert limits.max_projects == 42 + + async def test_consumer_id_without_override_falls_back_to_defaults(self, db): + user = User(consumer_id="kong-unknown", username="google:alice@example.com", groups=frozenset()) + limits = await get_effective_limits(user) + assert limits.max_projects == get_settings().consumer.max_projects diff --git a/mpcontribs-api/tests/integration/db/test_projects_repository.py b/mpcontribs-api/tests/integration/db/test_projects_repository.py index d73a020ed5..e9db7c8bc0 100644 --- a/mpcontribs-api/tests/integration/db/test_projects_repository.py +++ b/mpcontribs-api/tests/integration/db/test_projects_repository.py @@ -1,9 +1,10 @@ import pytest from mpcontribs_api.authz import User +from mpcontribs_api.domains.consumers.models import ConsumerSettings from mpcontribs_api.domains.projects.models import Project, ProjectIn, ProjectOut, ProjectPatch, Stats from mpcontribs_api.domains.projects.repository import MongoDbProjectRepository -from mpcontribs_api.exceptions import ConflictError, NotFoundError +from mpcontribs_api.exceptions import ConflictError, NotFoundError, ValidationError from mpcontribs_api.pagination import CursorParams # All tests in this module share the session event loop so they can reuse the @@ -23,8 +24,13 @@ ANON = User() -def _repo(user: User) -> MongoDbProjectRepository: - return MongoDbProjectRepository(user) +def _repo(user: User, limits: ConsumerSettings | None = None) -> MongoDbProjectRepository: + return MongoDbProjectRepository(user, limits) + + +def _cols(n: int) -> list[dict[str, str]]: + """n column definitions (coerced into Column by ProjectIn/ProjectPatch).""" + return [{"path": f"data.col_{i}"} for i in range(n)] def _project_in(id: str, **overrides) -> ProjectIn: @@ -219,26 +225,28 @@ async def test_no_projection_returns_all_fields(self, db): class TestPagination: async def test_limit_is_respected(self, db): + # Distinct owners: pagination is orthogonal to the per-owner project cap, so keep every + # project under its own owner rather than tripping max_projects. for i in range(5): - await _insert(f"pag-limit-{i:02d}", is_public=True, is_approved=True) + await _insert(f"pag-limit-{i:02d}", owner=f"google:pager{i}@example.com", is_public=True, is_approved=True) page = await _repo(ADMIN).get_projects(filter=_noop_filter(), pagination=CursorParams(limit=3), fields=None) assert len(page.items) == 3 async def test_next_cursor_set_when_more_items(self, db): for i in range(4): - await _insert(f"pag-cursor-{i:02d}", is_public=True, is_approved=True) + await _insert(f"pag-cursor-{i:02d}", owner=f"google:pager{i}@example.com", is_public=True, is_approved=True) page = await _repo(ADMIN).get_projects(filter=_noop_filter(), pagination=CursorParams(limit=2), fields=None) assert page.next_cursor is not None async def test_next_cursor_none_on_last_page(self, db): for i in range(3): - await _insert(f"pag-last-{i:02d}", is_public=True, is_approved=True) + await _insert(f"pag-last-{i:02d}", owner=f"google:pager{i}@example.com", is_public=True, is_approved=True) page = await _repo(ADMIN).get_projects(filter=_noop_filter(), pagination=CursorParams(limit=10), fields=None) assert page.next_cursor is None async def test_cursor_fetches_next_page(self, db): for i in range(4): - await _insert(f"pag-next-{i:02d}", is_public=True, is_approved=True) + await _insert(f"pag-next-{i:02d}", owner=f"google:pager{i}@example.com", is_public=True, is_approved=True) page1 = await _repo(ADMIN).get_projects(filter=_noop_filter(), pagination=CursorParams(limit=2), fields=None) assert page1.next_cursor is not None page2 = await _repo(ADMIN).get_projects( @@ -250,7 +258,7 @@ async def test_cursor_fetches_next_page(self, db): async def test_all_items_covered_across_pages(self, db): for i in range(5): - await _insert(f"pag-all-{i:02d}", is_public=True, is_approved=True) + await _insert(f"pag-all-{i:02d}", owner=f"google:pager{i}@example.com", is_public=True, is_approved=True) all_ids: set[str] = set() cursor = None while True: @@ -402,7 +410,7 @@ async def test_insert_can_reach_exactly_cap(self, db, monkeypatch): # The cap is inclusive: a user may own up to (not fewer than) max_projects. from mpcontribs_api.config import get_settings - monkeypatch.setattr(get_settings().user, "max_projects", 2) + monkeypatch.setattr(get_settings().consumer, "max_projects", 2) await _insert("cap-1", owner=ALICE_EMAIL) await _insert("cap-2", owner=ALICE_EMAIL) assert await Project.find(Project.owner == ALICE_EMAIL).count() == 2 @@ -411,7 +419,7 @@ async def test_insert_over_cap_rejected(self, db, monkeypatch): from mpcontribs_api.config import get_settings from mpcontribs_api.exceptions import PermissionError as AppPermissionError - monkeypatch.setattr(get_settings().user, "max_projects", 2) + monkeypatch.setattr(get_settings().consumer, "max_projects", 2) await _insert("cap-a", owner=ALICE_EMAIL) await _insert("cap-b", owner=ALICE_EMAIL) with pytest.raises(AppPermissionError): @@ -422,7 +430,7 @@ async def test_upsert_new_project_over_cap_rejected(self, db, monkeypatch): from mpcontribs_api.config import get_settings from mpcontribs_api.exceptions import PermissionError as AppPermissionError - monkeypatch.setattr(get_settings().user, "max_projects", 1) + monkeypatch.setattr(get_settings().consumer, "max_projects", 1) await _insert("owned-1", owner=ALICE_EMAIL) data = _project_in("new-proj", owner=ALICE_EMAIL) with pytest.raises(AppPermissionError): @@ -433,8 +441,64 @@ async def test_upsert_existing_project_allowed_at_cap(self, db, monkeypatch): # when you are exactly at it. Only *new* projects count against the quota. from mpcontribs_api.config import get_settings - monkeypatch.setattr(get_settings().user, "max_projects", 1) + monkeypatch.setattr(get_settings().consumer, "max_projects", 1) await _insert("owned-only", owner=ALICE_EMAIL) data = _project_in("owned-only", owner=ALICE_EMAIL, title="Updated Title") result = await _repo(ALICE).upsert_project_by_id(id="owned-only", data=data) assert result.title == "Updated Title" + + async def test_injected_consumer_override_lowers_cap(self, db): + # A per-consumer override resolves to a ConsumerSettings injected into the repo; the cap it + # carries is enforced without touching global config. Here the override tightens the cap to 1. + repo = _repo(ALICE, ConsumerSettings(max_projects=1)) + await repo.insert_project(_project_in("override-1", owner=ALICE_EMAIL)) + from mpcontribs_api.exceptions import PermissionError as AppPermissionError + + with pytest.raises(AppPermissionError): + await repo.insert_project(_project_in("override-2", owner=ALICE_EMAIL)) + + +# --------------------------------------------------------------------------- +# Per-project column-count quota (max_columns) — repository enforcement +# +# The cap moved off the ProjectIn/ProjectPatch models onto the repository, which checks each write +# against the caller's effective ``max_columns``. These tests drive that limit via an injected +# ``ConsumerSettings`` — the same object a per-consumer override resolves to in production. +# --------------------------------------------------------------------------- + + +class TestColumnLimitEnforcement: + async def test_insert_at_cap_allowed(self, db): + # Inclusive cap: exactly max_columns is accepted. + repo = _repo(ADMIN, ConsumerSettings(max_columns=2)) + await repo.insert_project(_project_in("cols-ok", columns=_cols(2))) + found = await Project.find_one(Project.id == "cols-ok") + assert found is not None + assert len(found.columns) == 2 + + async def test_insert_over_cap_rejected(self, db): + repo = _repo(ADMIN, ConsumerSettings(max_columns=2)) + with pytest.raises(ValidationError): + await repo.insert_project(_project_in("cols-over", columns=_cols(3))) + assert await Project.find_one(Project.id == "cols-over") is None + + async def test_patch_over_cap_rejected(self, db): + await _insert("cols-patch") # created under the generous default cap + repo = _repo(ADMIN, ConsumerSettings(max_columns=2)) + with pytest.raises(ValidationError): + await repo.patch_project_by_id("cols-patch", ProjectPatch(columns=_cols(3))) + + async def test_patch_without_columns_not_checked(self, db): + # A columns-less patch (e.g. a title edit) must not be measured against the cap, even when + # the stored document already carries more columns than the current cap allows. + await _insert("cols-title", columns=_cols(5)) + repo = _repo(ADMIN, ConsumerSettings(max_columns=2)) + result = await repo.patch_project_by_id("cols-title", ProjectPatch(title="New Title")) + assert result.title == "New Title" + + async def test_upsert_over_cap_rejected(self, db): + repo = _repo(ALICE, ConsumerSettings(max_columns=2)) + data = _project_in("cols-upsert", owner=ALICE_EMAIL, columns=_cols(3)) + with pytest.raises(ValidationError): + await repo.upsert_project_by_id("cols-upsert", data) + assert await Project.find_one(Project.id == "cols-upsert") is None diff --git a/mpcontribs-api/tests/unit/domains/test_consumers_models.py b/mpcontribs-api/tests/unit/domains/test_consumers_models.py new file mode 100644 index 0000000000..573ba55600 --- /dev/null +++ b/mpcontribs-api/tests/unit/domains/test_consumers_models.py @@ -0,0 +1,73 @@ +import pytest + +from mpcontribs_api.config import get_settings +from mpcontribs_api.domains.consumers.models import ( + Consumer, + ConsumerIn, + ConsumerSettings, +) + +# --------------------------------------------------------------------------- +# ConsumerSettings — the effective, fully-resolved limits. +# +# Every field defaults from the env-backed global ``config.consumer`` block, so an admin can supply +# only the fields they want to change and the rest inherit the global default. This is the mechanism +# behind per-consumer overrides, so its resolution rules are worth pinning. +# --------------------------------------------------------------------------- + + +class TestConsumerSettingsDefaults: + def test_unset_fields_fall_back_to_global_defaults(self): + settings = ConsumerSettings() + globals_ = get_settings().consumer + assert settings.max_projects == globals_.max_projects + assert settings.max_unapproved_contributions_per_project == globals_.max_unapproved_contributions_per_project + assert settings.max_columns == globals_.max_columns + + def test_partial_override_keeps_other_defaults(self): + # Overriding one limit must not disturb the siblings — they still resolve to the global. + settings = ConsumerSettings(max_projects=99) + assert settings.max_projects == 99 + assert settings.max_columns == get_settings().consumer.max_columns + + def test_only_explicit_field_is_marked_set(self): + # patch_consumer_by_id relies on exclude_unset to touch only the named limit, so a partial + # override must report exactly the fields the admin supplied. + settings = ConsumerSettings(max_columns=5) + assert settings.model_dump(exclude_unset=True) == {"max_columns": 5} + + def test_defaults_track_global_config(self, monkeypatch): + # A ConsumerSettings built after the global default changes must reflect the new value — + # the fallback is read at construction time, not import time. + monkeypatch.setattr(get_settings().consumer, "max_projects", 42) + assert ConsumerSettings().max_projects == 42 + + def test_negative_limit_rejected(self): + # Limits are counts; ``ge=0`` guards against a nonsensical negative override. + with pytest.raises(ValueError): + ConsumerSettings(max_projects=-1) + + +# --------------------------------------------------------------------------- +# Consumer document construction +# --------------------------------------------------------------------------- + + +class TestConsumerConstruction: + def test_with_defaults_snapshots_global_limits(self): + consumer = Consumer.with_defaults("kong-123") + assert consumer.consumer_id == "kong-123" + assert consumer.settings.max_projects == get_settings().consumer.max_projects + + def test_from_input_model_fills_defaults_when_settings_omitted(self): + # An admin who supplies no settings gets a fully-resolved snapshot of the global defaults. + consumer = Consumer.from_input_model(ConsumerIn(consumer_id="kong-x")) + assert consumer.consumer_id == "kong-x" + assert consumer.settings.max_columns == get_settings().consumer.max_columns + + def test_from_input_model_preserves_supplied_override(self): + payload = ConsumerIn(consumer_id="kong-y", settings=ConsumerSettings(max_projects=7)) + consumer = Consumer.from_input_model(payload) + assert consumer.settings.max_projects == 7 + # Server mints its own id regardless of input. + assert consumer.id is not None diff --git a/mpcontribs-api/tests/unit/domains/test_contribution_service.py b/mpcontribs-api/tests/unit/domains/test_contribution_service.py index 838608b7ab..cf64968e6f 100644 --- a/mpcontribs-api/tests/unit/domains/test_contribution_service.py +++ b/mpcontribs-api/tests/unit/domains/test_contribution_service.py @@ -293,7 +293,7 @@ async def _get_by_id(project_id, fields=None): class TestInsertContributionsUnapprovedQuota: async def test_unapproved_project_at_capacity_fails_all(self, monkeypatch): - monkeypatch.setattr(get_settings().user, "max_unapproved_contributions_per_project", 2) + monkeypatch.setattr(get_settings().consumer, "max_unapproved_contributions_per_project", 2) contrib_repo = AsyncMock() contrib_repo.insert_many_contributions.return_value = None contrib_repo.count_contributions_for_project.return_value = 5 # already over cap @@ -309,7 +309,7 @@ async def test_unapproved_project_at_capacity_fails_all(self, monkeypatch): async def test_batch_trimmed_to_remaining_capacity(self, monkeypatch): # cap 5, 3 already stored -> remaining = 5 - 3 = 2 slots for this batch - monkeypatch.setattr(get_settings().user, "max_unapproved_contributions_per_project", 5) + monkeypatch.setattr(get_settings().consumer, "max_unapproved_contributions_per_project", 5) contrib_repo = AsyncMock() contrib_repo.insert_many_contributions.return_value = None contrib_repo.count_contributions_for_project.return_value = 3 @@ -326,7 +326,7 @@ async def test_batch_trimmed_to_remaining_capacity(self, monkeypatch): async def test_batch_may_fill_project_to_exactly_cap(self, monkeypatch): # cap 3, 2 stored -> exactly one slot; the batch fills the project to the cap, not past it. - monkeypatch.setattr(get_settings().user, "max_unapproved_contributions_per_project", 3) + monkeypatch.setattr(get_settings().consumer, "max_unapproved_contributions_per_project", 3) contrib_repo = AsyncMock() contrib_repo.insert_many_contributions.return_value = None contrib_repo.count_contributions_for_project.return_value = 2 @@ -340,7 +340,7 @@ async def test_batch_may_fill_project_to_exactly_cap(self, monkeypatch): async def test_batch_at_exactly_cap_rejects_all_new(self, monkeypatch): # cap 3, 3 stored -> zero remaining slots; a project already at the cap admits nothing new. - monkeypatch.setattr(get_settings().user, "max_unapproved_contributions_per_project", 3) + monkeypatch.setattr(get_settings().consumer, "max_unapproved_contributions_per_project", 3) contrib_repo = AsyncMock() contrib_repo.insert_many_contributions.return_value = None contrib_repo.count_contributions_for_project.return_value = 3 @@ -353,7 +353,7 @@ async def test_batch_at_exactly_cap_rejects_all_new(self, monkeypatch): contrib_repo.insert_many_contributions.assert_not_called() async def test_approved_project_is_unlimited(self, monkeypatch): - monkeypatch.setattr(get_settings().user, "max_unapproved_contributions_per_project", 1) + monkeypatch.setattr(get_settings().consumer, "max_unapproved_contributions_per_project", 1) contrib_repo = AsyncMock() contrib_repo.insert_many_contributions.return_value = None svc, *_ = _make_service(contributions=contrib_repo, projects=_approved_projects_repo()) @@ -366,7 +366,7 @@ async def test_approved_project_is_unlimited(self, monkeypatch): contrib_repo.count_contributions_for_project.assert_not_called() async def test_quota_evaluated_per_project(self, monkeypatch): - monkeypatch.setattr(get_settings().user, "max_unapproved_contributions_per_project", 2) + monkeypatch.setattr(get_settings().consumer, "max_unapproved_contributions_per_project", 2) contrib_repo = AsyncMock() contrib_repo.insert_many_contributions.return_value = None contrib_repo.count_contributions_for_project.return_value = 99 # only consulted for the unapproved one @@ -386,7 +386,7 @@ async def test_quota_evaluated_per_project(self, monkeypatch): assert inserted_ids == {"a", "c"} async def test_breach_emits_structured_audit_log(self, monkeypatch): - monkeypatch.setattr(get_settings().user, "max_unapproved_contributions_per_project", 2) + monkeypatch.setattr(get_settings().consumer, "max_unapproved_contributions_per_project", 2) contrib_repo = AsyncMock() contrib_repo.insert_many_contributions.return_value = None contrib_repo.count_contributions_for_project.return_value = 5 @@ -408,7 +408,7 @@ async def test_breach_emits_structured_audit_log(self, monkeypatch): assert kwargs["rejected_identifiers_truncated"] is False async def test_approved_project_emits_no_audit_log(self, monkeypatch): - monkeypatch.setattr(get_settings().user, "max_unapproved_contributions_per_project", 1) + monkeypatch.setattr(get_settings().consumer, "max_unapproved_contributions_per_project", 1) contrib_repo = AsyncMock() contrib_repo.insert_many_contributions.return_value = None svc, *_ = _make_service(contributions=contrib_repo, projects=_approved_projects_repo()) @@ -427,7 +427,7 @@ async def test_approved_project_emits_no_audit_log(self, monkeypatch): class TestUpsertContributionsUnapprovedQuota: async def test_only_new_documents_count_against_cap(self, monkeypatch): # cap 3, 2 stored -> one slot for a new document; updating an existing one is free. - monkeypatch.setattr(get_settings().user, "max_unapproved_contributions_per_project", 3) + monkeypatch.setattr(get_settings().consumer, "max_unapproved_contributions_per_project", 3) contrib_repo = AsyncMock() contrib_repo.upsert_contribution_by_identifiers.return_value = MagicMock(spec=Contribution) contrib_repo.count_contributions_for_project.return_value = 2 @@ -448,7 +448,7 @@ async def test_only_new_documents_count_against_cap(self, monkeypatch): assert upserted == {"a", "b"} async def test_pure_updates_are_never_capped(self, monkeypatch): - monkeypatch.setattr(get_settings().user, "max_unapproved_contributions_per_project", 1) + monkeypatch.setattr(get_settings().consumer, "max_unapproved_contributions_per_project", 1) contrib_repo = AsyncMock() contrib_repo.upsert_contribution_by_identifiers.return_value = MagicMock(spec=Contribution) contrib_repo.count_contributions_for_project.return_value = 99 # far over cap @@ -462,7 +462,7 @@ async def test_pure_updates_are_never_capped(self, monkeypatch): assert contrib_repo.upsert_contribution_by_identifiers.call_count == 3 async def test_approved_project_skips_quota(self, monkeypatch): - monkeypatch.setattr(get_settings().user, "max_unapproved_contributions_per_project", 1) + monkeypatch.setattr(get_settings().consumer, "max_unapproved_contributions_per_project", 1) contrib_repo = AsyncMock() contrib_repo.upsert_contribution_by_identifiers.return_value = MagicMock(spec=Contribution) svc, *_ = _make_service(contributions=contrib_repo, projects=_approved_projects_repo()) @@ -482,7 +482,7 @@ async def test_approved_project_skips_quota(self, monkeypatch): class TestUpsertContributionByIdQuota: async def test_update_existing_allowed_even_over_cap(self, monkeypatch): - monkeypatch.setattr(get_settings().user, "max_unapproved_contributions_per_project", 1) + monkeypatch.setattr(get_settings().consumer, "max_unapproved_contributions_per_project", 1) contrib_repo = AsyncMock() contrib_repo.get_contribution_by_id.return_value = MagicMock(spec=Contribution) # id exists -> update contrib_repo.count_contributions_for_project.return_value = 99 @@ -495,7 +495,7 @@ async def test_update_existing_allowed_even_over_cap(self, monkeypatch): contrib_repo.count_contributions_for_project.assert_not_called() async def test_new_insert_over_cap_rejected(self, monkeypatch): - monkeypatch.setattr(get_settings().user, "max_unapproved_contributions_per_project", 2) + monkeypatch.setattr(get_settings().consumer, "max_unapproved_contributions_per_project", 2) contrib_repo = AsyncMock() contrib_repo.get_contribution_by_id.return_value = None # id absent -> would insert contrib_repo.count_contributions_for_project.return_value = 5 # over cap @@ -507,7 +507,7 @@ async def test_new_insert_over_cap_rejected(self, monkeypatch): contrib_repo.upsert_contribution_by_id.assert_not_called() async def test_new_insert_under_cap_allowed(self, monkeypatch): - monkeypatch.setattr(get_settings().user, "max_unapproved_contributions_per_project", 5) + monkeypatch.setattr(get_settings().consumer, "max_unapproved_contributions_per_project", 5) contrib_repo = AsyncMock() contrib_repo.get_contribution_by_id.return_value = None contrib_repo.count_contributions_for_project.return_value = 1 @@ -520,7 +520,7 @@ async def test_new_insert_under_cap_allowed(self, monkeypatch): async def test_new_insert_at_exactly_cap_rejected(self, monkeypatch): # stored == cap: the project is full, so a brand-new document is rejected (no cap+1 slack). - monkeypatch.setattr(get_settings().user, "max_unapproved_contributions_per_project", 2) + monkeypatch.setattr(get_settings().consumer, "max_unapproved_contributions_per_project", 2) contrib_repo = AsyncMock() contrib_repo.get_contribution_by_id.return_value = None contrib_repo.count_contributions_for_project.return_value = 2 @@ -532,7 +532,7 @@ async def test_new_insert_at_exactly_cap_rejected(self, monkeypatch): contrib_repo.upsert_contribution_by_id.assert_not_called() async def test_new_insert_approved_project_unlimited(self, monkeypatch): - monkeypatch.setattr(get_settings().user, "max_unapproved_contributions_per_project", 1) + monkeypatch.setattr(get_settings().consumer, "max_unapproved_contributions_per_project", 1) contrib_repo = AsyncMock() contrib_repo.get_contribution_by_id.return_value = None contrib_repo.upsert_contribution_by_id.return_value = MagicMock(spec=Contribution) diff --git a/mpcontribs-api/tests/unit/domains/test_projects_models.py b/mpcontribs-api/tests/unit/domains/test_projects_models.py index fd4a6d23da..6718067adf 100644 --- a/mpcontribs-api/tests/unit/domains/test_projects_models.py +++ b/mpcontribs-api/tests/unit/domains/test_projects_models.py @@ -9,7 +9,9 @@ ProjectPatch, Reference, Stats, + check_column_limit, ) +from mpcontribs_api.exceptions import ValidationError as AppValidationError # --------------------------------------------------------------------------- # Column @@ -266,46 +268,35 @@ def _columns(n: int) -> list[Column]: class TestColumnLengthQuota: - """A project may carry at most ``user.max_columns`` columns; the limit is inclusive.""" - - def _make_input(self, columns: list[Column]) -> dict: - return { - "_id": "cols-proj", - "title": "Columns Project", - "authors": "Alice", - "description": "desc", - "owner": "google:alice@example.com", - "unique_identifiers": True, - "stats": VALID_STATS, - "columns": columns, - } - - def test_project_in_at_cap_is_allowed(self, monkeypatch): - from mpcontribs_api.config import get_settings - - monkeypatch.setattr(get_settings().user, "max_columns", 2) - project = ProjectIn(**self._make_input(_columns(2))) - assert len(project.columns) == 2 + """The column cap is enforced by ``check_column_limit`` (called from the repository with the + caller's effective ``max_columns``), not by the ``ProjectIn``/``ProjectPatch`` models. These + tests pin the pure function's contract: the cap is inclusive, over-cap writes raise, and a + non-list value is a no-op so legacy documents that already exceed the cap can still be read back. + """ - def test_project_in_over_cap_raises(self, monkeypatch): - from mpcontribs_api.config import get_settings - from mpcontribs_api.exceptions import ValidationError as AppValidationError - - monkeypatch.setattr(get_settings().user, "max_columns", 2) - with pytest.raises(AppValidationError): - ProjectIn(**self._make_input(_columns(3))) + def test_at_cap_is_allowed(self): + # Inclusive: exactly max_columns entries must pass. + check_column_limit(_columns(2), max_columns=2) - def test_project_patch_at_cap_is_allowed(self, monkeypatch): - from mpcontribs_api.config import get_settings - - monkeypatch.setattr(get_settings().user, "max_columns", 2) - patch = ProjectPatch(columns=_columns(2)) - assert len(patch.columns) == 2 - - def test_project_patch_over_cap_raises(self, monkeypatch): - from mpcontribs_api.config import get_settings - from mpcontribs_api.exceptions import ValidationError as AppValidationError + def test_under_cap_is_allowed(self): + check_column_limit(_columns(1), max_columns=2) - monkeypatch.setattr(get_settings().user, "max_columns", 2) + def test_over_cap_raises(self): with pytest.raises(AppValidationError): - ProjectPatch(columns=_columns(3)) + check_column_limit(_columns(3), max_columns=2) + + def test_error_reports_offending_length(self): + with pytest.raises(AppValidationError) as exc_info: + check_column_limit(_columns(5), max_columns=2) + assert exc_info.value.context["column_length"] == 5 + + def test_none_is_noop(self): + # A read path may pass a non-list (e.g. an unset field); it must never raise so legacy + # documents that predate the cap remain retrievable. + check_column_limit(None, max_columns=0) + + def test_model_does_not_enforce_cap(self): + # Regression guard: the cap moved off the model into the repository. Constructing a model + # with more columns than any cap must NOT raise here — enforcement happens on write. + patch = ProjectPatch(columns=_columns(50)) + assert len(patch.columns) == 50 From a5ffdbaab571c449ab9e38325428d0a354786466 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Fri, 31 Jul 2026 14:41:33 -0700 Subject: [PATCH 530/591] test(conftest-edits): added autouse and scope to conftests --- mpcontribs-api/tests/integration/conftest.py | 7 ++++++- mpcontribs-api/tests/integration/db/conftest.py | 5 ++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/mpcontribs-api/tests/integration/conftest.py b/mpcontribs-api/tests/integration/conftest.py index a66b7d68e0..aedf431107 100644 --- a/mpcontribs-api/tests/integration/conftest.py +++ b/mpcontribs-api/tests/integration/conftest.py @@ -9,7 +9,7 @@ from mpcontribs_api.middleware import RequestContextMiddleware -@pytest.fixture(autouse=True, scope="session") +@pytest.fixture(autouse=True) def _mock_beanie_collection(): """Stub Beanie's collection check for mock-based integration tests. @@ -19,6 +19,11 @@ def _mock_beanie_collection(): The tests/integration/db/ conftest overrides this fixture with a no-op so DB tests still get the real Beanie collection after init_beanie(). + + Function-scoped (not session): the patch must be torn down after each mock-based test so it + can never leak into the real-DB tests that share this process. A session-scoped patch, once + entered by any route test, stayed active and silently turned the DB tests' collections into + MagicMocks — making their inserts vanish depending on collection order. """ import beanie diff --git a/mpcontribs-api/tests/integration/db/conftest.py b/mpcontribs-api/tests/integration/db/conftest.py index 87cc59e58b..c625bd6829 100644 --- a/mpcontribs-api/tests/integration/db/conftest.py +++ b/mpcontribs-api/tests/integration/db/conftest.py @@ -21,13 +21,16 @@ ] -@pytest.fixture(scope="session") +@pytest.fixture(autouse=True) def _mock_beanie_collection(): """Override the parent integration conftest's Beanie mock. DB tests initialise Beanie for real via init_beanie(), so the mock must not intercept get_pymongo_collection(). Defining this fixture here (same name, no patch) causes pytest to use this no-op instead of the parent's version. + + Autouse + function-scoped so it deterministically shadows the parent patch for every DB test, + regardless of the order route tests and DB tests are collected in. """ yield From 02f00341a73011b0148b7050bd5056d16cf5c65e Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Fri, 31 Jul 2026 16:17:32 -0700 Subject: [PATCH 531/591] docs(consumer-filter): changed prefix to reflect the right model --- mpcontribs-api/src/mpcontribs_api/domains/consumers/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/consumers/models.py b/mpcontribs-api/src/mpcontribs_api/domains/consumers/models.py index 6d1ba5deb7..b1e81b57e1 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/consumers/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/consumers/models.py @@ -119,7 +119,7 @@ class ConsumerFilter(BaseFilter): consumer_id: str | None = None consumer_id__in: list[str] | None = None - settings: ConsumerSettingsFilter | None = FilterDepends(with_prefix("tables", ConsumerSettingsFilter)) + settings: ConsumerSettingsFilter | None = FilterDepends(with_prefix("settings", ConsumerSettingsFilter)) # sorting order_by: list[str] | None = None From 4294c0c22d0b7bfec7fe64e8cc02fa6e8584dff3 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 3 Aug 2026 09:15:37 -0700 Subject: [PATCH 532/591] perf(MongoDbContributionRepository): removed _id from projection in internal query --- .../src/mpcontribs_api/domains/contributions/repository.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py index 094f11a85b..45925712a3 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py @@ -48,7 +48,7 @@ def _build_scope(user: User) -> dict[str, Any]: async def count_contributions_for_project(self, project_name: str) -> int: """Count contributions already stored for a project. - Unscoped: the unapproved-contribution quota is a property of the project as a + Unscoped on purpose: the unapproved-contribution quota is a property of the project as a whole, not of what the current user can see. The cap comparison lives in the service. """ return await self.document_model.find(self.document_model.project == project_name).count() @@ -67,7 +67,7 @@ async def existing_versioned_keys(self, keys: list[tuple[str, str, int]]) -> set match: dict[str, Any] = {"$or": [{"project": p, "identifier": i, "version": v} for p, i, v in keys]} collection = self.document_model.get_pymongo_collection() existing: set[tuple[str, str, int]] = set() - async for doc in collection.find(match, {"project": 1, "identifier": 1, "version": 1}): + async for doc in collection.find(match, {"_id": 0, "project": 1, "identifier": 1, "version": 1}): existing.add((doc["project"], doc["identifier"], doc["version"])) return existing From aaebd0affea865e62607a031124e0cbac44983a5 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 3 Aug 2026 11:45:54 -0700 Subject: [PATCH 533/591] perf(ContributionService): removed duplicate logging of exceeding quota during upsert by id --- .../src/mpcontribs_api/domains/contributions/service.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py index 1ff9cf4224..578bf0376b 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py @@ -602,8 +602,8 @@ async def upsert_contribution_by_id(self, id: str, contribution: ContributionIn) stored = await self._unapproved_stored_count(contribution.project) cap = self._limits.max_unapproved_contributions_per_project if stored is not None and stored >= cap: - logger.warning( - "contribution.unapproved_quota_exceeded", + raise PermissionError( + "Attempted to add more than the allowed number of unapproved contributions", project=contribution.project, max_allowed=cap, stored=stored, @@ -613,11 +613,6 @@ async def upsert_contribution_by_id(self, id: str, contribution: ContributionIn) rejected_identifiers=[contribution.identifier], rejected_identifiers_truncated=False, ) - raise PermissionError( - "Attempted to add more than the allowed number of unapproved contributions", - project=contribution.project, - max_contribs=cap, - ) return await self._contributions.upsert_contribution_by_id(id, contribution) async def delete_contributions(self, filter: ContributionFilter) -> BulkDeleteSummary: From bc3de1eb5f99e8d17ba88e72170fae3ef035c37a Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 3 Aug 2026 13:33:28 -0700 Subject: [PATCH 534/591] style(check_column_limit): renamed check_column_limit -> validate_column_limit for clarity --- .../src/mpcontribs_api/domains/projects/models.py | 2 +- .../mpcontribs_api/domains/projects/repository.py | 8 ++++---- .../tests/unit/domains/test_projects_models.py | 14 +++++++------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py index eaaae69351..231d49d1ec 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py @@ -9,7 +9,7 @@ from mpcontribs_api.exceptions import ValidationError -def check_column_limit(columns: Any, max_columns: int) -> None: +def validate_column_limit(columns: Any, max_columns: int) -> None: """Reject a *write* carrying more columns than ``max_columns`` allows. Allows legacy docs that exceed cap to be returned without raising an error. diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py index e7acd48c15..aea306260f 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py @@ -9,7 +9,7 @@ ProjectIn, ProjectOut, ProjectPatch, - check_column_limit, + validate_column_limit, ) from mpcontribs_api.exceptions import PermissionError from mpcontribs_api.pagination import CursorParams @@ -100,7 +100,7 @@ async def unique_identifiers_by_id(self, ids: list[str]) -> dict[str, bool]: async def insert_project(self, project: ProjectIn) -> Project: """Insert a new project, rejecting a duplicate id. See ``insert_one``.""" - check_column_limit(project.columns, self._limits.max_columns) + validate_column_limit(project.columns, self._limits.max_columns) await self._check_num_projects(project.owner) return await self.insert_one(project) @@ -109,7 +109,7 @@ async def patch_project_by_id(self, id: str, update: ProjectPatch) -> Project: # Only enforce the column cap when the caller actually sends columns; an unset field is a # no-op and must not be checked against its empty default. if "columns" in update.model_fields_set: - check_column_limit(update.columns, self._limits.max_columns) + validate_column_limit(update.columns, self._limits.max_columns) return await self.patch(id, update) async def delete_project_by_id(self, id: str) -> None: @@ -143,7 +143,7 @@ async def upsert_project_by_id(self, id: str, data: ProjectIn) -> Project: if self._user.username is None: raise PermissionError(required_role="authenticated") - check_column_limit(data.columns, self._limits.max_columns) + validate_column_limit(data.columns, self._limits.max_columns) existing = await self.document_model.find_one(self.document_model.id == id) project = self.document_model.from_input_model(data) project.id = id diff --git a/mpcontribs-api/tests/unit/domains/test_projects_models.py b/mpcontribs-api/tests/unit/domains/test_projects_models.py index 6718067adf..c2f06764fd 100644 --- a/mpcontribs-api/tests/unit/domains/test_projects_models.py +++ b/mpcontribs-api/tests/unit/domains/test_projects_models.py @@ -9,7 +9,7 @@ ProjectPatch, Reference, Stats, - check_column_limit, + validate_column_limit, ) from mpcontribs_api.exceptions import ValidationError as AppValidationError @@ -268,7 +268,7 @@ def _columns(n: int) -> list[Column]: class TestColumnLengthQuota: - """The column cap is enforced by ``check_column_limit`` (called from the repository with the + """The column cap is enforced by ``validate_column_limit`` (called from the repository with the caller's effective ``max_columns``), not by the ``ProjectIn``/``ProjectPatch`` models. These tests pin the pure function's contract: the cap is inclusive, over-cap writes raise, and a non-list value is a no-op so legacy documents that already exceed the cap can still be read back. @@ -276,24 +276,24 @@ class TestColumnLengthQuota: def test_at_cap_is_allowed(self): # Inclusive: exactly max_columns entries must pass. - check_column_limit(_columns(2), max_columns=2) + validate_column_limit(_columns(2), max_columns=2) def test_under_cap_is_allowed(self): - check_column_limit(_columns(1), max_columns=2) + validate_column_limit(_columns(1), max_columns=2) def test_over_cap_raises(self): with pytest.raises(AppValidationError): - check_column_limit(_columns(3), max_columns=2) + validate_column_limit(_columns(3), max_columns=2) def test_error_reports_offending_length(self): with pytest.raises(AppValidationError) as exc_info: - check_column_limit(_columns(5), max_columns=2) + validate_column_limit(_columns(5), max_columns=2) assert exc_info.value.context["column_length"] == 5 def test_none_is_noop(self): # A read path may pass a non-list (e.g. an unset field); it must never raise so legacy # documents that predate the cap remain retrievable. - check_column_limit(None, max_columns=0) + validate_column_limit(None, max_columns=0) def test_model_does_not_enforce_cap(self): # Regression guard: the cap moved off the model into the repository. Constructing a model From 08126db98929306b544c64a7ef7f41593d40e591 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 3 Aug 2026 15:13:57 -0700 Subject: [PATCH 535/591] docs(ContributionService-and-authz): corrected documentation of logs and docstrings --- mpcontribs-api/src/mpcontribs_api/authz.py | 2 +- .../src/mpcontribs_api/domains/contributions/service.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/authz.py b/mpcontribs-api/src/mpcontribs_api/authz.py index 2a56f7dc65..bd332ac2c4 100644 --- a/mpcontribs-api/src/mpcontribs_api/authz.py +++ b/mpcontribs-api/src/mpcontribs_api/authz.py @@ -38,7 +38,7 @@ class User(BaseModel): """User definition derived from request headers. Attributes: - consumer_id (str | None): Kong id, for logging only + consumer_id (str | None): Kong id username (str | None): the username of the active user - if None, the user is anonymous groups (frozenset[str]): the groups the user is part of - used for access control """ diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py index 578bf0376b..d556b836fb 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py @@ -354,7 +354,7 @@ async def _split_quota_exceeded( exc = PermissionError( "Attempted to add more than the allowed number of unapproved contributions", project=project_id, - max_contribs=cap, + max_allowed=cap, ) failures.extend( bulk_failure_from_exception(item.index, item.contribution.identifiers(), exc) for item in rejected From c5f1274142bff1a2cc55ff017d0331ef26ead46b Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 3 Aug 2026 16:20:56 -0700 Subject: [PATCH 536/591] build(deployments.txt): restored deployments.txt from submodules to their status on origin/dev --- mpcontribs-api/requirements/deployment.txt | 551 ------------------ mpcontribs-client/requirements/deployment.txt | 2 +- .../requirements/deployment.txt | 4 +- mpcontribs-portal/requirements/deployment.txt | 8 +- 4 files changed, 9 insertions(+), 556 deletions(-) delete mode 100644 mpcontribs-api/requirements/deployment.txt diff --git a/mpcontribs-api/requirements/deployment.txt b/mpcontribs-api/requirements/deployment.txt deleted file mode 100644 index 106f844841..0000000000 --- a/mpcontribs-api/requirements/deployment.txt +++ /dev/null @@ -1,551 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.11 -# by the following command: -# -# pip-compile --output-file=MPContribs/mpcontribs-api/requirements/deployment.txt MPContribs/mpcontribs-api/pyproject.toml python/requirements.txt -# -anyio==4.13.0 - # via jupyter-server -apispec==5.2.2 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -argon2-cffi==25.1.0 - # via - # jupyter-server - # notebook -argon2-cffi-bindings==25.1.0 - # via argon2-cffi -arrow==1.4.0 - # via isoduration -asn1crypto==1.5.1 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -asttokens==3.0.1 - # via stack-data -atlasq-tschaume==0.11.1.dev2 - # via flask-mongorest-mpcontribs -attrs==26.1.0 - # via - # jsonschema - # referencing -backports-zstd==1.6.0 - # via flask-compress -beautifulsoup4==4.15.0 - # via nbconvert -bibtexparser==1.4.4 - # via pymatgen-core -bleach[css]==6.4.0 - # via nbconvert -blinker==1.9.0 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -boltons==25.0.0 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -boto3==1.43.30 - # via flask-mongorest-mpcontribs -botocore==1.43.30 - # via - # boto3 - # s3transfer -brotli==1.2.0 - # via flask-compress -bytecode==0.18.1 - # via ddtrace -certifi==2026.5.20 - # via requests -cffi==2.0.0 - # via - # argon2-cffi-bindings - # cryptography -charset-normalizer==3.4.7 - # via requests -click==8.4.1 - # via - # flask - # rq -comm==0.2.3 - # via ipykernel -contourpy==1.3.3 - # via matplotlib -cramjam==2.11.0 - # via python-snappy -crontab==1.0.5 - # via rq-scheduler -cryptography==49.0.0 - # via pyopenssl -css-html-js-minify==2.5.5 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -cycler==0.12.1 - # via matplotlib -dateparser==1.4.1 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -ddtrace==4.3.0 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -debugpy==1.8.21 - # via ipykernel -decorator==5.3.1 - # via ipython -defusedxml==0.7.1 - # via nbconvert -dnspython==2.8.0 - # via - # mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) - # pymongo -entrypoints==0.4 - # via jupyter-client -envier==0.6.1 - # via ddtrace -executing==2.2.1 - # via stack-data -fastjsonschema==2.21.2 - # via nbformat -fastnumbers==5.1.1 - # via flask-mongorest-mpcontribs -filetype==1.2.0 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -flasgger-tschaume==0.9.7 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -flask==2.2.5 - # via - # flasgger-tschaume - # flask-compress - # flask-marshmallow - # flask-mongoengine-tschaume - # flask-rq2 - # flask-sse -flask-compress==1.24 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -flask-marshmallow==1.4.0 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -flask-mongoengine-tschaume==1.1.0 - # via flask-mongorest-mpcontribs -flask-mongorest-mpcontribs==3.3.0 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -flask-rq2==18.3 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -flask-sse==1.0.0 - # via flask-mongorest-mpcontribs -flatten-dict==0.5.0 - # via flask-mongorest-mpcontribs -flexcache==0.3 - # via pint -flexparser==0.4 - # via pint -fonttools==4.63.0 - # via matplotlib -fqdn==1.5.1 - # via jsonschema -freezegun==1.5.5 - # via rq-scheduler -gevent==26.5.0 - # via gunicorn -greenlet==3.5.1 - # via gevent -gunicorn[gevent]==24.1.1 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -idna==3.18 - # via - # anyio - # jsonschema - # requests -ipykernel==6.29.5 - # via - # nbclassic - # notebook -ipython==9.14.1 - # via ipykernel -ipython-genutils==0.2.0 - # via - # nbclassic - # notebook -ipython-pygments-lexers==1.1.1 - # via ipython -isoduration==20.11.0 - # via jsonschema -itsdangerous==2.2.0 - # via flask -jedi==0.20.0 - # via ipython -jinja2==3.1.6 - # via - # flask - # jupyter-server - # mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) - # nbconvert - # notebook -jmespath==1.1.0 - # via - # boto3 - # botocore -joblib==1.5.3 - # via pymatgen-core -json2html==1.3.0 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -jsonpointer==3.1.1 - # via jsonschema -jsonschema[format-nongpl]==4.26.0 - # via - # flasgger-tschaume - # jupyter-events - # nbformat -jsonschema-specifications==2025.9.1 - # via jsonschema -jupyter-client==7.4.9 - # via - # ipykernel - # jupyter-server - # nbclient - # notebook -jupyter-core==5.9.1 - # via - # ipykernel - # jupyter-client - # jupyter-server - # nbclient - # nbconvert - # nbformat - # notebook -jupyter-events==0.12.1 - # via jupyter-server -jupyter-server==2.19.0 - # via notebook-shim -jupyter-server-terminals==0.5.4 - # via jupyter-server -jupyterlab-pygments==0.3.0 - # via nbconvert -kiwisolver==1.5.0 - # via matplotlib -lark==1.3.1 - # via rfc3987-syntax -lxml==6.1.1 - # via pymatgen-core -markupsafe==3.0.3 - # via - # jinja2 - # nbconvert - # werkzeug -marshmallow==3.26.2 - # via - # flask-marshmallow - # marshmallow-mongoengine - # mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -marshmallow-mongoengine==0.31.2 - # via flask-mongorest-mpcontribs -matplotlib==3.11.0 - # via - # -r python/requirements.txt - # pymatgen-core -matplotlib-inline==0.2.2 - # via - # ipykernel - # ipython -mimerender-pr36==0.0.2 - # via flask-mongorest-mpcontribs -mistune==3.2.1 - # via - # flasgger-tschaume - # nbconvert -mongoengine==0.29.3 - # via - # atlasq-tschaume - # flask-mongoengine-tschaume - # marshmallow-mongoengine -monty==2026.5.18 - # via pymatgen-core -more-itertools==11.1.0 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -mpmath==1.3.0 - # via sympy -narwhals==2.22.1 - # via plotly -nbclassic==1.3.3 - # via notebook -nbclient==0.11.0 - # via nbconvert -nbconvert==7.17.1 - # via - # jupyter-server - # notebook -nbformat==5.10.4 - # via - # jupyter-server - # mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) - # nbclient - # nbconvert - # notebook -nest-asyncio==1.6.0 - # via - # ipykernel - # jupyter-client - # nbclassic - # notebook -networkx==3.6.1 - # via pymatgen-core -notebook==6.5.7 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -notebook-shim==0.2.4 - # via nbclassic -numpy==2.4.6 - # via - # -r python/requirements.txt - # contourpy - # matplotlib - # monty - # mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) - # pandas - # pymatgen-core - # scipy - # spglib -opentelemetry-api==1.42.1 - # via ddtrace -orjson==3.11.9 - # via - # flask-mongorest-mpcontribs - # pymatgen-core -overrides==7.7.0 - # via jupyter-server -packaging==26.2 - # via - # gunicorn - # ipykernel - # jupyter-events - # jupyter-server - # marshmallow - # matplotlib - # nbconvert - # plotly -palettable==3.3.3 - # via pymatgen-core -pandas==3.0.3 - # via - # -r python/requirements.txt - # pymatgen-core -pandocfilters==1.5.1 - # via nbconvert -parso==0.8.7 - # via jedi -pexpect==4.9.0 - # via ipython -pillow==12.2.0 - # via matplotlib -pint==0.25.3 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -platformdirs==4.10.0 - # via - # jupyter-core - # pint -plotly==6.8.0 - # via pymatgen-core -prometheus-client==0.25.0 - # via - # jupyter-server - # notebook -prompt-toolkit==3.0.52 - # via ipython -psutil==7.2.2 - # via - # ipykernel - # ipython -psycopg2-binary==2.9.12 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -ptyprocess==0.7.0 - # via - # pexpect - # terminado -pure-eval==0.2.3 - # via stack-data -pycparser==3.0 - # via cffi -pygments==2.20.0 - # via - # ipython - # ipython-pygments-lexers - # nbconvert -pymatgen==2026.5.4 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -pymatgen-core==2026.5.18 - # via pymatgen -pymongo==4.17.0 - # via - # flask-mongorest-mpcontribs - # mongoengine -pyopenssl==26.3.0 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -pyparsing==3.3.2 - # via - # bibtexparser - # matplotlib -python-dateutil==2.9.0.post0 - # via - # arrow - # botocore - # dateparser - # flask-mongorest-mpcontribs - # freezegun - # jupyter-client - # matplotlib - # pandas - # rq-scheduler -python-json-logger==4.1.0 - # via jupyter-events -python-mimeparse==2.0.0 - # via mimerender-pr36 -python-snappy==0.7.3 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -pytz==2026.2 - # via dateparser -pyyaml==6.0.3 - # via - # flasgger-tschaume - # jupyter-events -pyzmq==27.1.0 - # via - # ipykernel - # jupyter-client - # jupyter-server - # notebook -redis==8.0.0 - # via - # flask-rq2 - # flask-sse - # rq -referencing==0.37.0 - # via - # jsonschema - # jsonschema-specifications - # jupyter-events -regex==2026.5.9 - # via dateparser -requests==2.34.2 - # via - # atlasq-tschaume - # pymatgen-core -rfc3339-validator==0.1.4 - # via - # jsonschema - # jupyter-events -rfc3986-validator==0.1.1 - # via - # jsonschema - # jupyter-events -rfc3987-syntax==1.1.0 - # via jsonschema -rpds-py==2026.5.1 - # via - # jsonschema - # referencing -rq==2.3.2 - # via - # flask-rq2 - # mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) - # rq-scheduler -rq-scheduler==0.14.0 - # via flask-rq2 -ruamel-yaml==0.19.1 - # via monty -s3transfer==0.18.0 - # via boto3 -scipy==1.17.1 - # via - # -r python/requirements.txt - # pymatgen-core -send2trash==2.1.0 - # via - # jupyter-server - # notebook -setproctitle==1.3.7 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -six==1.17.0 - # via - # flasgger-tschaume - # flask-sse - # python-dateutil - # rfc3339-validator -soupsieve==2.8.4 - # via beautifulsoup4 -spglib==2.7.0 - # via pymatgen-core -stack-data==0.6.3 - # via ipython -supervisor==4.3.0 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -sympy==1.14.0 - # via pymatgen-core -tabulate==0.10.0 - # via pymatgen-core -terminado==0.18.1 - # via - # jupyter-server - # jupyter-server-terminals - # notebook -tinycss2==1.5.1 - # via bleach -tornado==6.5.7 - # via - # ipykernel - # jupyter-client - # jupyter-server - # notebook - # terminado -tqdm==4.68.2 - # via pymatgen-core -traitlets==5.15.1 - # via - # ipykernel - # ipython - # jupyter-client - # jupyter-core - # jupyter-events - # jupyter-server - # matplotlib-inline - # nbclient - # nbconvert - # nbformat - # notebook -typing-extensions==4.15.0 - # via - # anyio - # beautifulsoup4 - # flexcache - # flexparser - # ipython - # opentelemetry-api - # pint - # pyopenssl - # referencing - # spglib -tzdata==2026.2 - # via arrow -tzlocal==5.4 - # via dateparser -uncertainties==3.2.3 - # via - # mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) - # pymatgen-core -uri-template==1.3.0 - # via jsonschema -urllib3==2.7.0 - # via - # botocore - # requests -wcwidth==0.8.1 - # via prompt-toolkit -webcolors==25.10.0 - # via jsonschema -webencodings==0.5.1 - # via - # bleach - # tinycss2 -websocket-client==1.9.0 - # via - # jupyter-server - # mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) -werkzeug==3.1.8 - # via - # flasgger-tschaume - # flask -wrapt==2.2.1 - # via ddtrace -zope-event==6.2 - # via gevent -zope-interface==8.5 - # via gevent -zstandard==0.25.0 - # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) diff --git a/mpcontribs-client/requirements/deployment.txt b/mpcontribs-client/requirements/deployment.txt index 3e29d28e9e..f19c9e1489 100644 --- a/mpcontribs-client/requirements/deployment.txt +++ b/mpcontribs-client/requirements/deployment.txt @@ -96,7 +96,7 @@ monty==2026.5.18 # via pymatgen-core mpmath==1.3.0 # via sympy -msgpack==1.2.0 +msgpack==1.2.1 # via # bravado # bravado-core diff --git a/mpcontribs-kernel-gateway/requirements/deployment.txt b/mpcontribs-kernel-gateway/requirements/deployment.txt index f67c12a219..827d405953 100644 --- a/mpcontribs-kernel-gateway/requirements/deployment.txt +++ b/mpcontribs-kernel-gateway/requirements/deployment.txt @@ -144,7 +144,7 @@ jupyter-events==0.12.1 # via jupyter-server jupyter-kernel-gateway==3.0.1 # via -r MPContribs/mpcontribs-kernel-gateway/requirements.in -jupyter-server==2.19.0 +jupyter-server==2.20.0 # via jupyter-kernel-gateway jupyter-server-terminals==0.5.4 # via jupyter-server @@ -186,7 +186,7 @@ mpcontribs-client==5.10.5 # via -r MPContribs/mpcontribs-kernel-gateway/requirements.in mpmath==1.3.0 # via sympy -msgpack==1.2.0 +msgpack==1.2.1 # via # bravado # bravado-core diff --git a/mpcontribs-portal/requirements/deployment.txt b/mpcontribs-portal/requirements/deployment.txt index 9954cc8efe..b7ddd80be8 100644 --- a/mpcontribs-portal/requirements/deployment.txt +++ b/mpcontribs-portal/requirements/deployment.txt @@ -25,8 +25,12 @@ boltons==25.0.0 # mpcontribs-client # mpcontribs-portal (MPContribs/mpcontribs-portal/pyproject.toml) boto3==1.43.30 +||||||| parent of 24d7b5d6 (Revert changes to deployment of other submodules) +boto3==1.43.25 # via mpcontribs-portal (MPContribs/mpcontribs-portal/pyproject.toml) botocore==1.43.30 +||||||| parent of 24d7b5d6 (Revert changes to deployment of other submodules) +botocore==1.43.25 # via # boto3 # s3transfer @@ -56,7 +60,7 @@ decorator==5.3.1 # via ipython defusedxml==0.7.1 # via nbconvert -django==3.2.25 +django==6.0.6 # via # django-extensions # django-settings-file @@ -185,7 +189,7 @@ mpcontribs-client==5.10.5 # via mpcontribs-portal (MPContribs/mpcontribs-portal/pyproject.toml) mpmath==1.3.0 # via sympy -msgpack==1.2.0 +msgpack==1.2.1 # via # bravado # bravado-core From c70bb452528e9e17a82dc40d0255e2c75b98409a Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 3 Aug 2026 16:44:59 -0700 Subject: [PATCH 537/591] build(uv.lock): sync with new pyproject.toml --- mpcontribs-api/uv.lock | 55 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/mpcontribs-api/uv.lock b/mpcontribs-api/uv.lock index 1d0de33fc5..52b5682bd6 100644 --- a/mpcontribs-api/uv.lock +++ b/mpcontribs-api/uv.lock @@ -368,6 +368,45 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/ae/8c/469afb6465b853afff216f9528ffda78a915ff880ed58813ba4faf4ba0b6/contourpy-1.3.3-cp314-cp314t-win_arm64.whl", hash = "sha256:b7448cb5a725bb1e35ce88771b86fba35ef418952474492cf7c764059933ff8b", size = 203831, upload-time = "2025-07-26T12:02:51.449Z" }, ] +[[package]] +name = "coverage" +version = "7.15.3" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/f4/45/78dbf9604ee5b3db24efbf26bed1cb58862fb40480cba821963c69348751/coverage-7.15.3.tar.gz", hash = "sha256:ae7ea5a4614acf399ef0483c4cb34f8f8f01df848d8fcbe7d3ce0865733f1c4d", size = 935592, upload-time = "2026-08-02T18:50:17.006Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/35/6f/8c2dc014357618b3226c90f731b8282766c3685786f422558991dc49fbf2/coverage-7.15.3-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:1e3bb08ad574bd9fb6a991f645728f70d333c1c1958dd5fcde65e24cb862813d", size = 222571, upload-time = "2026-08-02T18:49:11.242Z" }, + { url = "https://files.pythonhosted.org/packages/07/50/d867c7ceae9d56b7e74ee61ea834f1aa4f9a1e1c7f0ce39393ba573b1c12/coverage-7.15.3-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:9e5860eaff02a0b7f1b73304bdf846596ee62ab3a78d25c68044ebf684cb1fef", size = 222902, upload-time = "2026-08-02T18:49:13.448Z" }, + { url = "https://files.pythonhosted.org/packages/62/77/4f6dfc490c5f2bcacb2d296d9aa4d1e128c43b48e94ad313fec7f49f09ad/coverage-7.15.3-cp314-cp314-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:60874e5bd67f0b1bdbe42ab42c7bafa66a6fb8de88721af6df3f7a02713960cd", size = 253947, upload-time = "2026-08-02T18:49:15.304Z" }, + { url = "https://files.pythonhosted.org/packages/16/8a/6777f192af264165103e2a3d3768dbadb9894a0a2359a16877141d9ae8f5/coverage-7.15.3-cp314-cp314-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:f9147be876e9d83765e0b82176674dc248a6b9283e25e01e7462611b97e9b731", size = 256452, upload-time = "2026-08-02T18:49:17.801Z" }, + { url = "https://files.pythonhosted.org/packages/7d/7b/3d7ac46a0234bc684f41ee42be95e29b2b6525695adb04083609d5ac2149/coverage-7.15.3-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:61a01f8c3804760fcc5a3d31c4f3cab792d660d44e17bf7adeaf0ea51e07821e", size = 257798, upload-time = "2026-08-02T18:49:19.878Z" }, + { url = "https://files.pythonhosted.org/packages/ff/1e/c6ee59c29afcb5fdb35f936381340d1a06429a07c48f20e809646647acbe/coverage-7.15.3-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:95bf3e7f26f792e25eb185f85a5a659d48479265176dcfe22b6f334fd0081b5c", size = 260112, upload-time = "2026-08-02T18:49:21.858Z" }, + { url = "https://files.pythonhosted.org/packages/c1/e1/e8ea39a46e89e3a143312ee5f80336e992e3ae8fe44bf9c76b83fefeed42/coverage-7.15.3-cp314-cp314-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:44c41eff9e413fed8740eca75d5438ebeb9d3e45e7cd37c67329213e7a72c764", size = 253944, upload-time = "2026-08-02T18:49:23.926Z" }, + { url = "https://files.pythonhosted.org/packages/95/67/31ab5f6a37fd887d1386f81f0da9306851ad2264e9baaa9c7f606e0b3e17/coverage-7.15.3-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:54146bafb61f3ba9895b43af0dd17eba01561d586d44ce84ea221b0cbbee5a9e", size = 255805, upload-time = "2026-08-02T18:49:25.973Z" }, + { url = "https://files.pythonhosted.org/packages/fb/6a/ee505a80c8fd89620fb337c0596daecff87f33171fbb4ee3015fc3d7331f/coverage-7.15.3-cp314-cp314-musllinux_1_2_i686.whl", hash = "sha256:af000dd1bb859ff8066fda4c79512ff938c798116540307226b373099c7b151f", size = 253769, upload-time = "2026-08-02T18:49:27.883Z" }, + { url = "https://files.pythonhosted.org/packages/b0/41/6ab0f81c9e89660230d8f3f581d4732e5ddb75a885b0a5dfc73d315dc94f/coverage-7.15.3-cp314-cp314-musllinux_1_2_ppc64le.whl", hash = "sha256:a1b82490577f3889950b5a04f18712aef0207243e0749d60fe28c3c73ebfd5fd", size = 258045, upload-time = "2026-08-02T18:49:30.201Z" }, + { url = "https://files.pythonhosted.org/packages/bc/62/c995e91cae28cf31d6defab3bfb553dda5ac83ac7381b0f2b121264c307a/coverage-7.15.3-cp314-cp314-musllinux_1_2_riscv64.whl", hash = "sha256:c4fc90a60154c3e4b8a2dc206d6dbe852f1c235c249e0dc0cef909d032c9591a", size = 253587, upload-time = "2026-08-02T18:49:32.349Z" }, + { url = "https://files.pythonhosted.org/packages/84/df/f2049980f82d6890321f2065f9e66216eabbf4b2001815db958bc543f40a/coverage-7.15.3-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:f25bb884814a892948b4c20394db3f2364dd452d9492736479e7a493e63b0eb6", size = 255243, upload-time = "2026-08-02T18:49:34.324Z" }, + { url = "https://files.pythonhosted.org/packages/1d/82/2c841b67a978c0eb9c3707630b68f93f9e7585d78bb906bc8823ec6b07a5/coverage-7.15.3-cp314-cp314-win32.whl", hash = "sha256:722dbf8e7828fbcfe0dc8586167dc0a5ce85ad6ea171dbb21ed3f8d6581d3cb8", size = 224759, upload-time = "2026-08-02T18:49:36.326Z" }, + { url = "https://files.pythonhosted.org/packages/b3/78/5c93ec43784fd3e404ca23cd0584ae24bc1732de4a3fc194b68c3be88db0/coverage-7.15.3-cp314-cp314-win_amd64.whl", hash = "sha256:64d0845f9c3ed47302bed265c15ab4dbb64aa4ec1490839b8e328f4e7fa914d2", size = 225246, upload-time = "2026-08-02T18:49:38.366Z" }, + { url = "https://files.pythonhosted.org/packages/9d/77/813a054371f3b018cc63c6bdb46a3c35d5e95d4e3ed4f1449d4196106db5/coverage-7.15.3-cp314-cp314-win_arm64.whl", hash = "sha256:69bc14684f8fbbee9f9dbaa4fe79719b0da9725fc37956785c06ec365acf6926", size = 224673, upload-time = "2026-08-02T18:49:40.552Z" }, + { url = "https://files.pythonhosted.org/packages/8f/63/8c9f36cc71178d26db930baa03a4494abcc516d8d41bf820d0d85ef1d80b/coverage-7.15.3-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:f92df943c24b96cb215ca26b4f6a2283e63c5db80f1635aceea7fff11311917b", size = 223298, upload-time = "2026-08-02T18:49:42.634Z" }, + { url = "https://files.pythonhosted.org/packages/54/66/211f24d058ce9f56ebf1420d55b7574fdae924f6da3836f83c8bd4793e38/coverage-7.15.3-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:66591c46bdd2971d3ae2bc503a5f0459c2edcaf6b7e045b292000cc95bc6cb95", size = 223568, upload-time = "2026-08-02T18:49:44.706Z" }, + { url = "https://files.pythonhosted.org/packages/dd/bb/9c2ad5574a0d6420a96c6cade4f8a683931b9e79fe609f8924d7b6964616/coverage-7.15.3-cp314-cp314t-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:caa64458b81b18bfc67cdf1f6dc02b23e3edc672f2f8e11771fad75865415a43", size = 264932, upload-time = "2026-08-02T18:49:47.153Z" }, + { url = "https://files.pythonhosted.org/packages/ba/91/938c39e77bdd5a0a440412f975609ce3702dabbda6ac715719d93ca45a7b/coverage-7.15.3-cp314-cp314t-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:447f5421ccf5475956cf516d4ca1d575f487947b6f4e11f9d80c6aefe24b3dc8", size = 267052, upload-time = "2026-08-02T18:49:49.324Z" }, + { url = "https://files.pythonhosted.org/packages/b0/a3/7b431a98af35d9cc6394e54cde9435b33b8591672fbece6a4931267d7a8e/coverage-7.15.3-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:7a0c77ef8cd483a4987a5d12d1d9d5f7ee598dfdc6c0844417d847e5768dc779", size = 269473, upload-time = "2026-08-02T18:49:51.599Z" }, + { url = "https://files.pythonhosted.org/packages/32/58/dbc9951dce46be47a732823a1c571f62bcabdd54a68d8c281489a1a55cfb/coverage-7.15.3-cp314-cp314t-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:0b273f4ff657446a06c2d85bf80e134fa869a92852ba5f87854a70e1fb44da77", size = 270591, upload-time = "2026-08-02T18:49:53.865Z" }, + { url = "https://files.pythonhosted.org/packages/71/bd/1d610772c7c0889bfe477a59c46ee66ea53e271f3f06951e9d55b317f7c6/coverage-7.15.3-cp314-cp314t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:daea8c4fafa22488600405be2c2be525a9406fba3fc0a83acc726db3e14e2005", size = 264007, upload-time = "2026-08-02T18:49:55.875Z" }, + { url = "https://files.pythonhosted.org/packages/69/97/852eb3dcdba156b1a9078503f098499916bf889f964b61ad4a08223ac169/coverage-7.15.3-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:93ff57c530f3fa7aa69f92fb9b8892b8aa82712aa970842f4abf28657f42fb57", size = 266926, upload-time = "2026-08-02T18:49:57.944Z" }, + { url = "https://files.pythonhosted.org/packages/52/f8/b72cd238757fba2b587fc7dee047efe6e10b0c18343509faaaf502dd4680/coverage-7.15.3-cp314-cp314t-musllinux_1_2_i686.whl", hash = "sha256:4df21bef8b800eebda9018f53d49c9ace3aeb0090c850139b27923aafcb83e91", size = 264529, upload-time = "2026-08-02T18:50:00.035Z" }, + { url = "https://files.pythonhosted.org/packages/b8/0a/6c52ec4b7fb007cb6433d1fcfda4080cb15d75ad37ef9c31025f3427293e/coverage-7.15.3-cp314-cp314t-musllinux_1_2_ppc64le.whl", hash = "sha256:db567b02685f26034adcbd85055f80d12cdf02111b8ed00886093d98b2874ce2", size = 268263, upload-time = "2026-08-02T18:50:02.161Z" }, + { url = "https://files.pythonhosted.org/packages/c0/4e/f1f9aa3efd109a04353563a43fb5155340c1fdcdeaa6296ebed3b6f510ea/coverage-7.15.3-cp314-cp314t-musllinux_1_2_riscv64.whl", hash = "sha256:5318dd51b8600b947e058cf5a4fe54d183d9d13c49b97b64ca7be05a34df9bef", size = 263377, upload-time = "2026-08-02T18:50:04.243Z" }, + { url = "https://files.pythonhosted.org/packages/dd/fb/6b268a0b2728ef1c379ad656b899274477a5f6bed1bf6765b4b387fb0601/coverage-7.15.3-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:c995bfa383c54704839b6c4c2627a1c00895597ada0e5e8190c81d8bd620555c", size = 265688, upload-time = "2026-08-02T18:50:06.428Z" }, + { url = "https://files.pythonhosted.org/packages/29/54/1a3ea96e5d5e7cd41dc432597bfc60692910e635d05e1cc25a8ccc243581/coverage-7.15.3-cp314-cp314t-win32.whl", hash = "sha256:6433fafb8da0e1d02eb53411e0ecdadb6b88f0224fdc23317e703c0e88937d42", size = 225066, upload-time = "2026-08-02T18:50:08.533Z" }, + { url = "https://files.pythonhosted.org/packages/31/9d/a7b0d9afd18ed5274dd00651a78e7810a931c70d94b79996f150bec1a30f/coverage-7.15.3-cp314-cp314t-win_amd64.whl", hash = "sha256:fe578952b1b29fe8c777f43f241d49efac4b56724a3434f5d22ebe3c208df429", size = 225897, upload-time = "2026-08-02T18:50:10.572Z" }, + { url = "https://files.pythonhosted.org/packages/ca/11/34c5ae40b945e69aa72b87dc268135b7049905f3824af573b7073acbb946/coverage-7.15.3-cp314-cp314t-win_arm64.whl", hash = "sha256:d2e1acb7aee29dfa8f3e48c23f36670898baca1209d9bdd3985a50c7f982165e", size = 225212, upload-time = "2026-08-02T18:50:12.63Z" }, + { url = "https://files.pythonhosted.org/packages/37/e7/7069b3d6c018917f49ba2e1c5fb910e498c7fefa3a1b78cb1b79e61ff45d/coverage-7.15.3-py3-none-any.whl", hash = "sha256:da78fa6fc7dafe4212839173133ee85afcf42c5cd5f3e47fa7c1c210453b445e", size = 214297, upload-time = "2026-08-02T18:50:14.709Z" }, +] + [[package]] name = "cramjam" version = "2.11.0" @@ -1033,6 +1072,7 @@ dev = [ { name = "pydocstringformatter" }, { name = "pytest" }, { name = "pytest-asyncio" }, + { name = "pytest-cov" }, { name = "pytest-xdist" }, { name = "ruff" }, ] @@ -1066,6 +1106,7 @@ dev = [ { name = "pydocstringformatter", specifier = ">=0.7.0" }, { name = "pytest", specifier = ">=9.0.3" }, { name = "pytest-asyncio", specifier = ">=1.4.0" }, + { name = "pytest-cov", specifier = ">=7.1.0" }, { name = "pytest-xdist", specifier = ">=3.8.0" }, { name = "ruff", specifier = ">=0.9.0" }, ] @@ -1768,6 +1809,20 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/03/e2/08a497ef684b88559c9cc5f4ad53a37e7b99e727094a86d6ea32536d5d3c/pytest_asyncio-1.4.0-py3-none-any.whl", hash = "sha256:933ca923a23075a87fb7070c0ec272a6848489824d887c85c812670932835aa1", size = 16930, upload-time = "2026-05-26T09:56:02.576Z" }, ] +[[package]] +name = "pytest-cov" +version = "7.1.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "coverage" }, + { name = "pluggy" }, + { name = "pytest" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/b1/51/a849f96e117386044471c8ec2bd6cfebacda285da9525c9106aeb28da671/pytest_cov-7.1.0.tar.gz", hash = "sha256:30674f2b5f6351aa09702a9c8c364f6a01c27aae0c1366ae8016160d1efc56b2", size = 55592, upload-time = "2026-03-21T20:11:16.284Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/9d/7a/d968e294073affff457b041c2be9868a40c1c71f4a35fcc1e45e5493067b/pytest_cov-7.1.0-py3-none-any.whl", hash = "sha256:a0461110b7865f9a271aa1b51e516c9a95de9d696734a2f71e3e78f46e1d4678", size = 22876, upload-time = "2026-03-21T20:11:14.438Z" }, +] + [[package]] name = "pytest-xdist" version = "3.8.0" From 41986283cd210b64c61d784e4903de169b142684 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Tue, 4 Aug 2026 09:44:14 -0700 Subject: [PATCH 538/591] ci(.github/workflows): added 'smart' ci for submodules on a new tool stack (uv + justfile) requires owners to add submodules that migrate to new tool stack to specify in ci.yml --- .github/workflows/_python_ci.yml | 29 +++++++++++++++++------------ .github/workflows/ci.yml | 27 +++++++++++++++++++++++---- 2 files changed, 40 insertions(+), 16 deletions(-) diff --git a/.github/workflows/_python_ci.yml b/.github/workflows/_python_ci.yml index 09cc09bf53..106992b96b 100644 --- a/.github/workflows/_python_ci.yml +++ b/.github/workflows/_python_ci.yml @@ -1,4 +1,9 @@ -# Reusable CI runner +# Reusable CI runner. +# +# The `test` job always runs the suite named by `test-suite` +# The `lint` and `typecheck` jobs only run when `run-quality` is true — the caller +# sets that for pushes/PRs to dev or master, and leaves it false for feature-branch +# pushes (which only get the fast unit suite). name: _python-ci on: @@ -13,17 +18,23 @@ on: required: false type: string default: "" - coverage-artifact: - description: "Name for the uploaded coverage XML; empty = don't upload" + test-suite: + description: "Suite passed to `just test ` (e.g. u = unit, all = everything)" required: false type: string - default: "" + default: "u" + run-quality: + description: "Run the lint/format/lock and typecheck gates (dev/master only)" + required: false + type: boolean + default: false permissions: contents: read jobs: lint: + if: ${{ inputs.run-quality }} runs-on: ubuntu-latest defaults: run: @@ -42,6 +53,7 @@ jobs: - run: just lock-check typecheck: + if: ${{ inputs.run-quality }} runs-on: ubuntu-latest defaults: run: @@ -71,11 +83,4 @@ jobs: - uses: extractions/setup-just@v4 - run: uv python install ${{ inputs.python-version }} - run: just install - - run: just test ci - - name: Upload coverage - if: ${{ inputs.coverage-artifact != '' }} - uses: actions/upload-artifact@v4 - with: - name: ${{ inputs.coverage-artifact }} - path: ${{ inputs.package }}/coverage.xml - if-no-files-found: ignore + - run: just test ${{ inputs.test-suite }} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d85c3d4915..9e21f95d37 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,15 +1,19 @@ # Adding a package: once it has a uv-based justfile contract (install/lint/ -# format-check/typecheck/lock-check/test ci), add it to BOTH the paths-filter +# format-check/typecheck/lock-check/test), add it to BOTH the paths-filter # `filters` below AND the `config` map in the discover step. Until a package is # migrated, leave it out - it stays covered by the legacy testing.yml instead. +# +# What runs where (see the `full` flag computed in discover): +# - push to any branch -> unit suite only (`just test u`) +# - push/PR to dev or master -> lint + format + typecheck + full `just test` name: ci on: pull_request: - branches: [master] + branches: [dev, master] push: - branches: [master] + branches: ["**"] concurrency: group: ${{ github.workflow }}-${{ github.ref }} @@ -23,7 +27,21 @@ jobs: runs-on: ubuntu-latest outputs: packages: ${{ steps.build.outputs.packages }} + full: ${{ steps.level.outputs.full }} steps: + - name: Determine gate level + id: level + # "full" = the lint/format/typecheck + whole-suite gate. It applies to + # any pull_request (only dev/master are targeted, per the trigger above) + # and to direct pushes to dev/master. Every other push gets unit only. + run: | + if [ "${{ github.event_name }}" = "pull_request" ] \ + || [ "${{ github.ref }}" = "refs/heads/dev" ] \ + || [ "${{ github.ref }}" = "refs/heads/master" ]; then + echo "full=true" >> "$GITHUB_OUTPUT" + else + echo "full=false" >> "$GITHUB_OUTPUT" + fi - uses: actions/checkout@v4 - uses: dorny/paths-filter@v3 id: filter @@ -67,7 +85,8 @@ jobs: with: package: ${{ matrix.package }} python-version: ${{ matrix.python-version }} - coverage-artifact: coverage-${{ matrix.package }} + test-suite: ${{ needs.discover.outputs.full == 'true' && 'all' || 'u' }} + run-quality: ${{ needs.discover.outputs.full == 'true' }} # Always-reporting aggregate gate. Make ONLY this a required status check gate: From 969c8039c0dad2bd4c7bbcefb9cca6eeee06a973 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Tue, 4 Aug 2026 15:08:21 -0700 Subject: [PATCH 539/591] ci(ci.yml): removed both push pull_request ci steps from running when pushing to a pr previosuly, discover (push) and test (push) ci steps would run when pushing to an open pr, alongside their (pull_request) counterparts. This commit removes the extra steps. --- .github/workflows/ci.yml | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9e21f95d37..b26be42245 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,17 +3,21 @@ # `filters` below AND the `config` map in the discover step. Until a package is # migrated, leave it out - it stays covered by the legacy testing.yml instead. # -# What runs where (see the `full` flag computed in discover): -# - push to any branch -> unit suite only (`just test u`) -# - push/PR to dev or master -> lint + format + typecheck + full `just test` +# Gate levels (see the `full` flag in discover): +# - pull_request into dev/master -> unit only (`just test u`), on every push +# - merge_group (PR entered the -> full gate: lint + format + typecheck + +# merge queue via "merge when `just test`. This is the real pre-merge +# ready") gate and runs once, at merge time. +# - push to dev/master (post-merge) -> full gate (safety net). name: ci on: pull_request: branches: [dev, master] + merge_group: push: - branches: ["**"] + branches: [dev, master] concurrency: group: ${{ github.workflow }}-${{ github.ref }} @@ -31,11 +35,12 @@ jobs: steps: - name: Determine gate level id: level - # "full" = the lint/format/typecheck + whole-suite gate. It applies to - # any pull_request (only dev/master are targeted, per the trigger above) - # and to direct pushes to dev/master. Every other push gets unit only. + # "full" = the lint/format/typecheck + whole-suite gate. It runs for + # merge_group (a PR entering the merge queue) and for direct pushes to + # dev/master. A plain pull_request stays unit-only so open-PR pushes are + # cheap; the full suite only fires when the PR is queued to merge. run: | - if [ "${{ github.event_name }}" = "pull_request" ] \ + if [ "${{ github.event_name }}" = "merge_group" ] \ || [ "${{ github.ref }}" = "refs/heads/dev" ] \ || [ "${{ github.ref }}" = "refs/heads/master" ]; then echo "full=true" >> "$GITHUB_OUTPUT" From 9f16b0d29da829bed17e1b330a3a4076e7946681 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Tue, 4 Aug 2026 16:34:51 -0700 Subject: [PATCH 540/591] test(test_healthcheck): fixed 'test_body_reports_healthy" test version field mock endpoint sets version as 0.0.0-test, but test incorrectly specified 0.0.0-dev --- mpcontribs-api/tests/integration/test_healthcheck.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mpcontribs-api/tests/integration/test_healthcheck.py b/mpcontribs-api/tests/integration/test_healthcheck.py index f98ca854f3..e06e09e8ef 100644 --- a/mpcontribs-api/tests/integration/test_healthcheck.py +++ b/mpcontribs-api/tests/integration/test_healthcheck.py @@ -58,7 +58,7 @@ def test_returns_200(self, health_app): def test_body_reports_healthy(self, health_app): r = _client(health_app, _make_db(ping_ok=True), _make_s3(head_ok=True)).get("/healthcheck") - assert r.json() == {"version": "0.0.0-dev", "status": "healthy", "mongo": "ok", "s3": "ok"} + assert r.json() == {"version": "0.0.0-test", "status": "healthy", "mongo": "ok", "s3": "ok"} def test_pings_mongo(self, health_app): db = _make_db(ping_ok=True) From 1c982e54ffe6970be23f5fd6712d3ca51926ce9d Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Tue, 4 Aug 2026 16:41:31 -0700 Subject: [PATCH 541/591] docs(main.py): silenced basedpyright warning of proper boto3 client usage boto3 determines client methods dynamically at runtime, pyright doesn't like that --- mpcontribs-api/main.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mpcontribs-api/main.py b/mpcontribs-api/main.py index d9d5a740c0..99c5ad1ea2 100755 --- a/mpcontribs-api/main.py +++ b/mpcontribs-api/main.py @@ -33,8 +33,9 @@ def start(program): cluster = labels[f"{prefix}.cluster"].split("/", 1)[1] family = labels[f"{prefix}.task-definition-family"] version = int(labels[f"{prefix}.task-definition-version"]) - task_arns = client.list_tasks(cluster=cluster, family=family).get("taskArns", []) - tasks = client.describe_tasks(cluster=cluster, tasks=task_arns).get("tasks", []) + task_arns = client.list_tasks(cluster=cluster, family=family).get("taskArns", []) # pyright: ignore[reportAttributeAccessIssue] - boto3 dynamically routes methods + tasks = client.describe_tasks(cluster=cluster, tasks=task_arns).get("tasks", []) # pyright: ignore[reportAttributeAccessIssue] - boto3 dynamically routes methods + ntasks = 0 for task in tasks: From 35a1c2a163d5be48fd9901388d8e61bd37ac5310 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Tue, 4 Aug 2026 16:52:32 -0700 Subject: [PATCH 542/591] ci(testing.yml): testing.yml no longer runs on mpcontribs-api, since it is on a new tooling and ci-stack previously, testing.yml would try to run in mpcontribs-api and cause failures due to python-version mismatch --- .github/workflows/testing.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 5e488957d0..f324fa033c 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -5,10 +5,16 @@ on: push: branches: - master + # mpcontribs-api is on the new uv/py3.14 stack and is covered by ci.yml. + # Keep the legacy suite (client + lux) from firing on api-only changes. + paths-ignore: + - "mpcontribs-api/**" pull_request: branches: - master + paths-ignore: + - "mpcontribs-api/**" jobs: test: @@ -30,10 +36,8 @@ jobs: - name: Install dependencies run: | python${{ matrix.python-version }} -m pip install --upgrade "pip<25.3" build pip-tools pre-commit - python${{ matrix.python-version }} -m piptools compile --extra dev -o requirements.txt mpcontribs-client/pyproject.toml mpcontribs-api/pyproject.toml + python${{ matrix.python-version }} -m piptools compile --extra dev -o requirements.txt mpcontribs-client/pyproject.toml python${{ matrix.python-version }} -m pip install -r requirements.txt - cd mpcontribs-api - python${{ matrix.python-version }} -m pip install --no-deps . - name: Set SSL_CERT_FILE (Linux) if: matrix.os == 'ubuntu-latest' || matrix.os == 'macos-latest' run: | From 8ebd82cfe1f80c2d19e9c124aa962ac929a1b09a Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Tue, 4 Aug 2026 17:05:33 -0700 Subject: [PATCH 543/591] ci(rulesets): added json ruleset specs to protect dev and master I don't have the access to make rulesets right now --- .github/rulesets/dev.json | 48 ++++++++++++++++++++++++++++++++++++ .github/rulesets/master.json | 48 ++++++++++++++++++++++++++++++++++++ 2 files changed, 96 insertions(+) create mode 100644 .github/rulesets/dev.json create mode 100644 .github/rulesets/master.json diff --git a/.github/rulesets/dev.json b/.github/rulesets/dev.json new file mode 100644 index 0000000000..54b694eaac --- /dev/null +++ b/.github/rulesets/dev.json @@ -0,0 +1,48 @@ +{ + "name": "Protect dev", + "target": "branch", + "enforcement": "active", + "conditions": { + "ref_name": { + "include": ["refs/heads/dev"], + "exclude": [] + } + }, + "rules": [ + { "type": "deletion" }, + { "type": "non_fast_forward" }, + { + "type": "pull_request", + "parameters": { + "required_approving_review_count": 0, + "dismiss_stale_reviews_on_push": false, + "require_code_owner_review": false, + "require_last_push_approval": false, + "required_review_thread_resolution": false, + "allowed_merge_methods": ["squash", "merge", "rebase"] + } + }, + { + "type": "required_status_checks", + "parameters": { + "strict_required_status_checks_policy": false, + "do_not_enforce_on_create": false, + "required_status_checks": [ + { "context": "ci-success" } + ] + } + }, + { + "type": "merge_queue", + "parameters": { + "check_response_timeout_minutes": 60, + "grouping_strategy": "ALLGREEN", + "max_entries_to_build": 5, + "max_entries_to_merge": 5, + "merge_method": "SQUASH", + "min_entries_to_merge": 1, + "min_entries_to_merge_wait_minutes": 5 + } + } + ] +} diff --git a/.github/rulesets/master.json b/.github/rulesets/master.json new file mode 100644 index 0000000000..e8168e0e91 --- /dev/null +++ b/.github/rulesets/master.json @@ -0,0 +1,48 @@ +{ + "name": "Protect master", + "target": "branch", + "enforcement": "active", + "conditions": { + "ref_name": { + "include": ["refs/heads/master"], + "exclude": [] + } + }, + "rules": [ + { "type": "deletion" }, + { "type": "non_fast_forward" }, + { + "type": "pull_request", + "parameters": { + "required_approving_review_count": 0, + "dismiss_stale_reviews_on_push": false, + "require_code_owner_review": false, + "require_last_push_approval": false, + "required_review_thread_resolution": false, + "allowed_merge_methods": ["squash", "merge", "rebase"] + } + }, + { + "type": "required_status_checks", + "parameters": { + "strict_required_status_checks_policy": false, + "do_not_enforce_on_create": false, + "required_status_checks": [ + { "context": "ci-success" } + ] + } + }, + { + "type": "merge_queue", + "parameters": { + "check_response_timeout_minutes": 60, + "grouping_strategy": "ALLGREEN", + "max_entries_to_build": 5, + "max_entries_to_merge": 5, + "merge_method": "SQUASH", + "min_entries_to_merge": 1, + "min_entries_to_merge_wait_minutes": 5 + } + } + ] +} From 4ecedc5fb07260da160a097a687a3f754e95f3f5 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 5 Aug 2026 14:43:47 -0700 Subject: [PATCH 544/591] fix(ContributionBase): added `version` to identifier_fields --- .../src/mpcontribs_api/domains/contributions/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py index 7b70d10a77..db65cc6f3f 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py @@ -109,7 +109,7 @@ class Settings: @classmethod def identifier_fields(cls) -> frozenset[str]: """A contribution is uniquely identified (within a version) by ``project`` + ``identifier``.""" - return frozenset({"project", "identifier"}) + return frozenset({"project", "identifier", "version"}) class Contribution(ContributionBase): From e5457e6a686ca1ac1a29c32aa2c3ed85f998edd8 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 5 Aug 2026 15:53:45 -0700 Subject: [PATCH 545/591] docs(InitiativeRepository): modified documentation --- .../src/mpcontribs_api/domains/initiatives/repository.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/initiatives/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/initiatives/repository.py index 6c373a5221..18381b5111 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/initiatives/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/initiatives/repository.py @@ -79,8 +79,7 @@ async def insert_initiative(self, data: InitiativeIn) -> Initiative: limit=self._limits.max_unapproved_per_owner, ) - # ``BaseDocumentWithInput`` makes ``id`` required (no auto-default), so mint the ObjectId - # here — as ``ProjectGroup.from_input_model`` does — and force owner/flags server-side. + # ``BaseDocumentWithInput`` makes ``id`` required (no auto-default), so mint the ObjectId here initiative = self.document_model.model_validate( { "_id": PydanticObjectId(), @@ -98,8 +97,7 @@ async def insert_initiative(self, data: InitiativeIn) -> Initiative: async def patch_initiative(self, slug: str, update: InitiativePatch) -> Initiative: """Patch a scoped initiative by ``slug``, enforcing manage rights and approval rules. - - The caller must be able to *manage* the initiative (owner/collaborator/admin); mere - visibility (e.g. a public initiative) is not enough. + - The caller must be able to *manage* the initiative (owner/collaborator/admin) - Only an admin may change ``is_approved``. - The resulting state must satisfy ``is_public ⇒ is_approved`` (re-checked here because a partial ``$set`` does not run the document validator). @@ -114,7 +112,7 @@ async def patch_initiative(self, slug: str, update: InitiativePatch) -> Initiati data = update.model_dump(exclude_unset=True) if "is_approved" in data and not self._user.is_admin: - raise PermissionError(required_role="admin") + raise PermissionError("only admins can set `is_approved`", required_role="admin") resulting_approved = data.get("is_approved", existing.is_approved) resulting_public = data.get("is_public", existing.is_public) From 4f38f9d980e497735b4e0457f7c59b872474a5a0 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 5 Aug 2026 16:01:46 -0700 Subject: [PATCH 546/591] refactor(MongoDbRepository): unified patching logic and removed _resolve_one_id patching logic was duplicated. _resovle_one_id is redundant since `identifiers` uniquely specify a document --- .../domains/_shared/repository.py | 68 ++++++++----------- .../domains/initiatives/models.py | 2 - .../domains/project_groups/repository.py | 14 ++-- 3 files changed, 37 insertions(+), 47 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py index b5e276f4d2..015635fde1 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py @@ -126,22 +126,6 @@ def _identifier_query(self, identifiers: dict[str, Any]) -> dict[str, Any]: ) return {("_id" if key == "id" else key): value for key, value in identifiers.items()} - async def _resolve_one_id(self, identifiers: dict[str, Any], session: AsyncClientSession | None = None) -> Any: - """Resolve the single scoped ``_id`` matching ``identifiers``, or ``None`` if absent. - - Enforces uniqueness: the identifier fields are meant to key at most one document, so if two - are found (a duplicate under a supposedly-unique key) this raises ``ConflictError`` rather - than silently picking one. - """ - query = self._identifier_query(identifiers) - projection = self.out_model.projection(frozenset({"id"})) - docs = ( - await self.document_model.find(self._scope, query, session=session).limit(2).project(projection).to_list() - ) # pyright: ignore[reportArgumentType] - if len(docs) > 1: - raise ConflictError("identifiers matched more than one document", identifiers=identifiers) - return docs[0].id if docs else None - async def get_one( self, identifiers: dict[str, Any], @@ -149,19 +133,13 @@ async def get_one( ) -> TOut | None: """Return the single scoped document matching ``identifiers``, projected to ``fields``. - Returns ``None`` when nothing matches, but ``ConflictError`` if the identifiers match - more than one document. - Args: identifiers (dict[str, Any]): identifier field values keyed by ``identifier_fields`` fields (frozenset[str] | None): fields to project; if None the full document is returned """ query = self._identifier_query(identifiers) projection = self.out_model.projection(fields) - docs = await self.document_model.find(self._scope, query).limit(2).project(projection).to_list() # pyright: ignore[reportArgumentType] - if len(docs) > 1: - raise ConflictError("identifiers matched more than one document", identifiers=identifiers) - return docs[0] if docs else None + return await self.document_model.find_one(self._scope, query, projection_model=projection) # pyright: ignore[reportArgumentType] async def get_by_id(self, id: Any, fields: frozenset[str] | None = None) -> TDoc | TOut | None: """Return a single scoped document by id, projected to the requested fields. @@ -231,18 +209,15 @@ async def delete_one( ) -> DeleteResponse: """Delete the single scoped document matching ``identifiers``. - Uniqueness is checked before anything is deleted (see :meth:`_resolve_one_id`), so a - duplicate raises ``ConflictError`` and an absent resource raises ``NotFoundError`` — this - never deletes more than the one intended document. - Args: identifiers (dict[str, Any]): identifier field values keyed by ``identifier_fields`` session (AsyncClientSession | None): optional client session for transactions """ - oid = await self._resolve_one_id(identifiers, session=session) - if oid is None: + query = self._identifier_query(identifiers) + result = await self.document_model.find_one(self._scope, query, session=session).delete(session=session) # pyright: ignore[reportArgumentType] + if result is None or result.deleted_count == 0: raise NotFoundError(f"{self.document_model.__name__} not found", identifiers=identifiers) - return await self.delete_by_id(oid, session=session) + return DeleteResponse.from_delete_result(result) async def delete_by_id(self, id: Any, session: AsyncClientSession | None = None) -> DeleteResponse: """Delete a single scoped document by its primary key (``_id``). @@ -291,25 +266,40 @@ async def patch(self, id: Any, update: TPatch) -> TDoc: id (str): the id of the document to update update (TPatch): the partial update to apply; unset fields are dropped """ + return await self._patch_matching(self.document_model.id == id, update, NotFoundError(self._not_found(id))) + + async def _patch_matching( + self, + match: Any, + update: TPatch, + not_found: NotFoundError, + session: AsyncClientSession | None = None, + ) -> TDoc: + """Apply a partial update to the single scoped document matching ``match``. + + ``match`` is any beanie filter that keys at most one in-scope document — a primary-key + equality (:meth:`patch`) or a unique-identifier query (:meth:`patch_one`). An empty patch + is a no-op that still returns the existing document; a missing target raises ``not_found``. + """ # Only retain set fields (patch) update_data = update.model_dump(exclude_unset=True) # If update is empty, return the model anyways (consistent behavior) if not update_data: - existing = await self.document_model.find_one(self._scope, self.document_model.id == id) + existing = await self.document_model.find_one(self._scope, match, session=session) if existing is None: - raise NotFoundError(self._not_found(id)) + raise not_found return existing # Otherwise, update the fields fully (set) # Brendan TODO: Set will replace an entire field # - if we want to append to a list (ie. add a reference) we ned Push/AddToSet - query = self.document_model.find_one(self._scope, self.document_model.id == id).update( + query = self.document_model.find_one(self._scope, match, session=session).update( Set(update_data), response_type=UpdateResponse.NEW_DOCUMENT, ) updated = await query # pyright: ignore[reportGeneralTypeIssues] # beanie UpdateQuery is awaitable, but pyright doesn't see it if updated is None: - raise NotFoundError(self._not_found(id)) + raise not_found return updated async def patch_one( @@ -320,18 +310,14 @@ async def patch_one( ) -> TDoc: """Partially update the single scoped document matching ``identifiers``. - Resolves the target by its unique identifier fields (raising ``ConflictError`` on a - duplicate, ``NotFoundError`` when absent) and then applies the patch via :meth:`patch`. - Args: identifiers (dict[str, Any]): identifier field values keyed by ``identifier_fields`` update (TPatch): the partial update to apply; unset fields are dropped session (AsyncClientSession | None): optional client session for transactions """ - oid = await self._resolve_one_id(identifiers, session=session) - if oid is None: - raise NotFoundError(f"{self.document_model.__name__} not found", identifiers=identifiers) - return await self.patch(oid, update) + query = self._identifier_query(identifiers) + not_found = NotFoundError(f"{self.document_model.__name__} not found", identifiers=identifiers) + return await self._patch_matching(query, update, not_found, session=session) def _hash_payload(self, payload: dict[str, Any], *, separators: tuple[str, str] = (",", ":")) -> str: canonical = json.dumps( diff --git a/mpcontribs-api/src/mpcontribs_api/domains/initiatives/models.py b/mpcontribs-api/src/mpcontribs_api/domains/initiatives/models.py index a140191a76..10cf63180f 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/initiatives/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/initiatives/models.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from typing import Self from beanie import PydanticObjectId diff --git a/mpcontribs-api/src/mpcontribs_api/domains/project_groups/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/project_groups/repository.py index f615923a39..faef61afcd 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/project_groups/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/project_groups/repository.py @@ -79,13 +79,19 @@ async def patch_project_group( return await self.patch_one({"name": name, "owner": owner}, update) async def delete_project_group(self, name: SearchStr, owner: PrefixedEmail) -> DeleteResponse: - """Delete the single project group identified by ``name`` + ``owner``.""" - oid = await self._resolve_one_id({"name": name, "owner": owner}) - if oid is None: + """Delete the single project group identified by ``name`` + ``owner``. + + Absence (in scope) takes precedence over the ownership gate: a non-admin may only delete + their own group, so deleting another owner's visible (public) group is forbidden rather + than silently a no-op. The ``name`` + ``owner`` unique index makes the match unambiguous. + """ + doc = await self.document_model.find_one(self._scope, {"name": name, "owner": owner}) # pyright: ignore[reportArgumentType] + if doc is None: raise NotFoundError(f"{self.document_model.__name__} not found", name=name, owner=owner) if not (self._user.is_admin or owner == self._user.username): raise PermissionError(required_role="owner-or-admin") - return await self.delete_by_id(oid) + await doc.delete() + return DeleteResponse(num_deleted=1) async def delete_project_groups(self, filter: ProjectGroupFilter) -> DeleteResponse: """Bulk-delete project groups matching ``filter``, restricted to the caller's own. From 296dafc353cb729713b04769f4ed0b8a5e8990a2 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 5 Aug 2026 16:04:27 -0700 Subject: [PATCH 547/591] refactor(MongoDbProjectRepository): deduplicated patch logic previously, patching an initiative with a project used 2 db calls --- .../domains/projects/repository.py | 58 +++++++++++-------- .../domains/projects/service.py | 13 ++--- 2 files changed, 41 insertions(+), 30 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py index 6bd677024a..222c7988e1 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py @@ -93,7 +93,41 @@ async def patch_project_by_id(self, id: str, update: ProjectPatch) -> Project: - Resulting state must satisfy is_public <-> is_approved condition The ``initiative`` field is split out upstream in ``ProjectService.patch``, so it never - reaches this method. + reaches this method; an assignment that also edits plain fields goes through + :meth:`patch_project_with_initiative` instead. + """ + await self._enforce_patch_rules(id, update) + return await self.patch(id, update) + + async def patch_project_with_initiative(self, id: str, update: ProjectPatch, ref: DBRef | None) -> Project: + """Atomically apply a partial project update together with its canonical initiative link. + + Args: + id (str): the id of the project to update + update (ProjectPatch): the partial update to apply; unset fields are dropped. The + ``initiative`` slug must already be stripped — the resolved ``ref`` carries the link. + ref (DBRef | None): the initiative reference to assign, or None to unassign + """ + await self._enforce_patch_rules(id, update) + data = update.model_dump(exclude_unset=True) + data["initiative"] = ref + query = self.document_model.find_one(self._scope, self.document_model.id == id).update( + Set(data), + response_type=UpdateResponse.NEW_DOCUMENT, + ) + updated = await query # pyright: ignore[reportGeneralTypeIssues] # beanie UpdateQuery is awaitable + if updated is None: + raise NotFoundError(self._not_found(id)) + return updated + + async def _enforce_patch_rules(self, id: str, update: ProjectPatch) -> None: + """Enforce project patch invariants against the scoped target. + + - Only an admin may change ``is_approved``. + - The resulting state must satisfy the is_public -> is_approved condition. + + Raises ``NotFoundError`` when the project is invisible to the caller or absent, so both the + plain and initiative-bearing patch paths reject unseen documents identically. """ data = update.model_dump(exclude_unset=True) if "is_approved" in data and not self._user.is_admin: @@ -108,8 +142,6 @@ async def patch_project_by_id(self, id: str, update: ProjectPatch) -> Project: if resulting_public and not resulting_approved: raise ValidationError("a project cannot be public until it is approved", id=id) - return await self.patch(id, update) - async def delete_project_by_id(self, id: str) -> None: """Delete a scoped project by id. Restricted to the owner or an admin. @@ -174,26 +206,6 @@ async def upsert_project_by_id(self, id: str, data: ProjectIn) -> Project: raise ValidationError("a project cannot be public until it is approved", id=id) return await project.save() - async def set_initiative(self, id: str, ref: DBRef | None) -> Project: - """Set a scoped project's canonical initiative link. - - The link is written as-is (a ``DBRef`` into ``initiatives`` or ``None``); all authorization - and limit checks are the caller's (see ``ProjectInitiativeService``). Scoping ensures a - project the caller cannot see is reported as not found rather than silently missed. - - Args: - id (str): the id of the project to update - ref (DBRef | None): the initiative reference to assign, or None to unassign - """ - query = self.document_model.find_one(self._scope, self.document_model.id == id).update( - Set({"initiative": ref}), - response_type=UpdateResponse.NEW_DOCUMENT, - ) - updated = await query # pyright: ignore[reportGeneralTypeIssues] # beanie UpdateQuery is awaitable - if updated is None: - raise NotFoundError(self._not_found(id)) - return updated - async def count_initiative_members(self, initiative_id: PydanticObjectId, exclude_project_id: str | None) -> int: """Count projects assigned to an initiative, ignoring user scope. diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/service.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/service.py index 95c8120689..2852aee49a 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/service.py @@ -22,9 +22,11 @@ def __init__( async def patch(self, id: str, update: ProjectPatch) -> Project: """Apply a project patch, routing an ``initiative`` change through the assignment checks. - ``initiative`` carries the target initiative's ``slug`` (or ``null`` to unassign). It is - split out of the patch so it never reaches the raw ``$set`` as a bare string; any remaining - fields are applied first, then the initiative link is set. + ``initiative`` carries the target initiative's ``slug`` (or ``null`` to unassign). When + present it is split out of the patch (so it never reaches the raw ``$set`` as a bare + string), resolved to a link — running the both-rights and member-cap checks — then written + together with any co-submitted plain fields in a single atomic update, so the request never + persists a half-applied change. """ if "initiative" not in update.model_fields_set: return await self._projects.patch_project_by_id(id=id, update=update) @@ -35,10 +37,7 @@ async def patch(self, id: str, update: ProjectPatch) -> Project: # Resolve the target link (and run the both-rights + limit checks) before touching anything. ref = await self._resolve_initiative_assignment(project_id=id, slug=slug) - # Apply any co-submitted plain fields first, so a single request can rename and assign. - if data: - await self._projects.patch_project_by_id(id=id, update=ProjectPatch(**data)) - return await self._projects.set_initiative(id=id, ref=ref) + return await self._projects.patch_project_with_initiative(id=id, update=ProjectPatch(**data), ref=ref) async def _resolve_initiative_assignment(self, project_id: str, slug: str | None) -> DBRef | None: """Validate an initiative assignment and return the link to store (or None to unassign). From 3a14ca25a6e277f191ff5c37876449ed7f9bdd58 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 5 Aug 2026 16:12:08 -0700 Subject: [PATCH 548/591] test(tests): removed unnecessary tests and corrected test that checks contribution identifier_fields --- .../db/test_project_groups_repository.py | 26 ------------------- .../db/test_project_groups_service.py | 23 ---------------- .../tests/unit/domains/test_shared_models.py | 6 ++--- 3 files changed, 3 insertions(+), 52 deletions(-) diff --git a/mpcontribs-api/tests/integration/db/test_project_groups_repository.py b/mpcontribs-api/tests/integration/db/test_project_groups_repository.py index 26928cfb9a..3cb20f5b56 100644 --- a/mpcontribs-api/tests/integration/db/test_project_groups_repository.py +++ b/mpcontribs-api/tests/integration/db/test_project_groups_repository.py @@ -156,32 +156,6 @@ async def test_wrong_identifier_keys_raise_validation(self, db): with pytest.raises(ValidationError): await _repo(ADMIN).delete_one({"name": "x"}) # missing 'owner' - async def test_duplicate_identifiers_raise_conflict(self, db): - # The name_owner unique index normally makes this impossible; drop it so we can plant a - # duplicate and exercise the defensive uniqueness guard in _resolve_one_id. Tolerant of a - # prior drop within the same session. - try: - await db["project_groups"].drop_index("name_owner") - except Exception: - pass - await db["project_groups"].insert_many( - [ - {"_id": PydanticObjectId(), "name": "dup", "owner": ALICE_EMAIL, "projects": [], "description": "d"}, - {"_id": PydanticObjectId(), "name": "dup", "owner": ALICE_EMAIL, "projects": [], "description": "d"}, - ] - ) - try: - with pytest.raises(ConflictError): - await _repo(ADMIN).delete_project_group(name="dup", owner=ALICE_EMAIL) - finally: - # Restore the unique index we dropped so order-dependent tests that rely on it (e.g. the - # insert-duplicate guard) still see it. Planted duplicates must go first, or the unique - # index rebuild would fail. - await db["project_groups"].delete_many({"name": "dup"}) - await db["project_groups"].create_index( - [("name", 1), ("owner", 1)], name="name_owner", unique=True - ) - # --------------------------------------------------------------------------- # patch_one diff --git a/mpcontribs-api/tests/integration/db/test_project_groups_service.py b/mpcontribs-api/tests/integration/db/test_project_groups_service.py index 4c9d5acb45..5bbadf2fd2 100644 --- a/mpcontribs-api/tests/integration/db/test_project_groups_service.py +++ b/mpcontribs-api/tests/integration/db/test_project_groups_service.py @@ -103,29 +103,6 @@ async def test_group_not_visible_raises_not_found(self, db): with pytest.raises(NotFoundError): await _service(ANON).add_projects_by_id(str(group.id), []) - async def test_ambiguous_identifiers_raise_conflict(self, db): - # Drop the unique index so we can plant a duplicate and exercise the uniqueness guard. - try: - await db["project_groups"].drop_index("name_owner") - except Exception: - pass - await db["project_groups"].insert_many( - [ - {"_id": PydanticObjectId(), "name": "dup", "owner": ALICE_EMAIL, "projects": [], "description": "d"}, - {"_id": PydanticObjectId(), "name": "dup", "owner": ALICE_EMAIL, "projects": [], "description": "d"}, - ] - ) - try: - with pytest.raises(ConflictError): - await _service().add_projects_by_identifiers("dup", ALICE_EMAIL, []) - finally: - # Restore the unique index we dropped so order-dependent tests that rely on it still see - # it. Planted duplicates must go first, or the unique index rebuild would fail. - await db["project_groups"].delete_many({"name": "dup"}) - await db["project_groups"].create_index( - [("name", 1), ("owner", 1)], name="name_owner", unique=True - ) - # --------------------------------------------------------------------------- # delete diff --git a/mpcontribs-api/tests/unit/domains/test_shared_models.py b/mpcontribs-api/tests/unit/domains/test_shared_models.py index b7cb13ad7d..959973eea5 100644 --- a/mpcontribs-api/tests/unit/domains/test_shared_models.py +++ b/mpcontribs-api/tests/unit/domains/test_shared_models.py @@ -117,9 +117,9 @@ def test_project_uses_id(self): def test_project_group_uses_name_and_owner(self): assert ProjectGroup.identifier_fields() == frozenset({"name", "owner"}) - def test_contribution_uses_project_and_identifier(self): - assert Contribution.identifier_fields() == frozenset({"project", "identifier"}) - assert ContributionIn.identifier_fields() == frozenset({"project", "identifier"}) + def test_contribution_uses_project_identifier_version(self): + assert Contribution.identifier_fields() == frozenset({"project", "identifier", "version"}) + assert ContributionIn.identifier_fields() == frozenset({"project", "identifier", "version"}) def test_default_identifiers_reads_values_off_instance(self): oid = PydanticObjectId() From b6f0d344557d69ddafe57032baa6b3e903bb0cd8 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 5 Aug 2026 16:33:33 -0700 Subject: [PATCH 549/591] refactor(MongoDbRepository): removed useless abstraction of NotFoundError (_not_found()) --- .../src/mpcontribs_api/domains/_shared/repository.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py index 015635fde1..54a1573e22 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py @@ -72,10 +72,6 @@ def _convert_object_id(self, id: str) -> PydanticObjectId: except InvalidId: raise ValidationError("Incorrect Id format. Must be MongoDB ObjectId format.", id=id) from None - def _not_found(self, id: str) -> str: - """Build a not-found message naming this repository's resource.""" - return f"{self.document_model.__name__} with id {id} not found" - async def get_many( self, filter: TFilter, @@ -232,7 +228,7 @@ async def delete_by_id(self, id: Any, session: AsyncClientSession | None = None) """ doc = await self.document_model.find_one(self._scope, self.document_model.id == id, session=session) if doc is None: - raise NotFoundError(self._not_found(id)) + raise NotFoundError(message=f"{self.document_model.__name__} not found by id", id=id) await doc.delete(session=session) return DeleteResponse(num_deleted=1) @@ -266,7 +262,9 @@ async def patch(self, id: Any, update: TPatch) -> TDoc: id (str): the id of the document to update update (TPatch): the partial update to apply; unset fields are dropped """ - return await self._patch_matching(self.document_model.id == id, update, NotFoundError(self._not_found(id))) + return await self._patch_matching( + self.document_model.id == id, update, NotFoundError(f"{self.document_model.__name__} not found", id=id) + ) async def _patch_matching( self, From 96d18423aab74626881dc3d5f74b80d3ad40024e Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 12 Aug 2026 05:47:00 -0400 Subject: [PATCH 550/591] feat(types): materialid now accepts both alphaid and mpid formats - no conversion between them yet --- .../mpcontribs_api/domains/_shared/types.py | 63 ++++++++++++------- .../unit/domains/test_contributions_models.py | 29 +++++++-- 2 files changed, 66 insertions(+), 26 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py index f1294abb71..a6a9543d53 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py @@ -12,35 +12,56 @@ ShortStr = Annotated[str, Field(min_length=3, max_length=30)] -# "mp-" followed by one or more digits; leading zeros are trimmed afterwards. -_MATERIAL_ID_RE = re.compile(r"^mp-([0-9]+)$") +# A material id is ``mp-`` followed by either a numeric id (MpId) or an alphabetic id (AlphaId). +# The whole value is lowercased first, so ``"MP-abc"`` and ``"mp-ABC"`` both normalize identically. +_MATERIAL_ID_DIGITS_RE = re.compile(r"^mp-([0-9]+)$") _MAX_MATERIAL_ID_DIGITS = 7 +_MATERIAL_ID_ALPHA_RE = re.compile(r"^mp-([a-z]+)$") +_ALPHA_ID_LENGTH = 8 + def _validate_material_id(v: str | None) -> str | None: - """Normalize a Materials Project id: ``mp-`` + up to 7 digits, leading zeros trimmed. + """Normalize a Materials Project id, accepting either the numeric (MpId) or alphabetic (AlphaId) form. + + The value is lowercased first (``"MP-abc"`` / ``"mp-ABC"`` -> ``"mp-aaaaaabc"``). - ``"mp-001"`` -> ``"mp-1"``. Rejects anything not shaped ``mp-`` and any value whose - significant (leading-zero-trimmed) digit count exceeds 7. + MpId: ``mp-`` + up to 7 digits, leading zeros trimmed (``"mp-001"`` -> ``"mp-1"``). + AlphaId: ``mp-`` + up to 8 letters, left-padded with 'a's to 8 (``"mp-bcd"`` -> ``"mp-aaaaabcd"``). + Rejects anything not shaped ``mp-`` or ``mp-``, numeric ids with more than 7 + significant digits, and alpha ids with more than 8 letters. """ if v is None: return None - if not isinstance(v, str): - raise ValidationError(f"material_id must be a string, got '{type(v).__name__}'", material_id=v) - s = v.strip() - match = _MATERIAL_ID_RE.match(s) - if match is None: - raise ValidationError( - f"material_id '{v}' invalid. Must be 'mp-' followed by digits (e.g. 'mp-149')", - material_id=v, - ) - trimmed = match.group(1).lstrip("0") or "0" - if len(trimmed) > _MAX_MATERIAL_ID_DIGITS: - raise ValidationError( - f"material_id '{v}' invalid. Numeric part must be at most {_MAX_MATERIAL_ID_DIGITS} digits", - material_id=v, - ) - return f"mp-{trimmed}" + s = v.strip().lower() + + digits_match = _MATERIAL_ID_DIGITS_RE.match(s) + if digits_match is not None: + trimmed = digits_match.group(1).lstrip("0") or "0" + if len(trimmed) > _MAX_MATERIAL_ID_DIGITS: + raise ValidationError( + f"material_id '{v}' invalid. Numeric part must be at most {_MAX_MATERIAL_ID_DIGITS} digits", + material_id=v, + ) + return f"mp-{trimmed}" + + alpha_match = _MATERIAL_ID_ALPHA_RE.match(s) + if alpha_match is not None: + # Left-pad with 'a's to a fixed width of 8; every provided letter is significant, so a caller + # who drops leading 'a's (``"mp-bcd"``) and one who spells them out (``"mp-aaaaabcd"``) agree. + letters = alpha_match.group(1) + if len(letters) > _ALPHA_ID_LENGTH: + raise ValidationError( + f"material_id '{v}' invalid. Alphabetic part must be at most {_ALPHA_ID_LENGTH} letters", + material_id=v, + ) + return f"mp-{letters.rjust(_ALPHA_ID_LENGTH, 'a')}" + + raise ValidationError( + f"material_id '{v}' invalid. Must be 'mp-' followed by digits (e.g. 'mp-149') " + "or up to 8 letters (e.g. 'mp-abcd')", + material_id=v, + ) MaterialId = Annotated[str, BeforeValidator(_validate_material_id)] diff --git a/mpcontribs-api/tests/unit/domains/test_contributions_models.py b/mpcontribs-api/tests/unit/domains/test_contributions_models.py index 9e0a44cd9c..91d7821962 100644 --- a/mpcontribs-api/tests/unit/domains/test_contributions_models.py +++ b/mpcontribs-api/tests/unit/domains/test_contributions_models.py @@ -123,7 +123,7 @@ def test_data_key_validation(self): _make_contribution_in(data=valid_punctuation) assert True with pytest.raises(ValidationError, match="Punctuation found in Contribution.data keys"): - _make_contribution_in(data=invalid_punctuation) + _make_contribution_in(data=invalid_punctuation) with pytest.raises(ValidationError, match="Punctuation found in Contribution.data keys"): _make_contribution_in(data=too_many_pipes) with pytest.raises(ValidationError, match="Non-ASCII key found in Contribution.data"): @@ -139,6 +139,7 @@ def test_data_value_validation(self): _make_contribution_in(data=ascii_in_values) assert True + # --------------------------------------------------------------------------- # Contribution identifier validation (material_id / chemical_system_id / formula) # @@ -151,11 +152,23 @@ class TestMaterialIdValidation: @pytest.mark.parametrize( ("given", "expected"), [ + # Numeric (MpId) form: leading zeros trimmed. ("mp-149", "mp-149"), ("mp-1234567", "mp-1234567"), ("mp-001", "mp-1"), # leading zeros trimmed ("mp-0001234", "mp-1234"), (" mp-42 ", "mp-42"), # surrounding whitespace stripped + ("MP-149", "mp-149"), # prefix lowercased + # Alphabetic (AlphaId) form: left-padded with 'a' to a fixed width of 8, never stripped. + ("mp-abcdefgh", "mp-abcdefgh"), # already full width, unchanged + ("mp-b", "mp-aaaaaaab"), # dropped leading 'a's re-padded by us + ("mp-bcd", "mp-aaaaabcd"), + ("mp-abc", "mp-aaaaaabc"), # a leading 'a' is significant, not stripped + ("mp-aaaaaabc", "mp-aaaaaabc"), # explicit padding is idempotent + ("MP-abc", "mp-aaaaaabc"), # prefix lowercased + ("mp-ABC", "mp-aaaaaabc"), # letters lowercased + ("mp-a", "mp-aaaaaaaa"), # single letter padded to full width + (" mp-xyz ", "mp-aaaaaxyz"), # surrounding whitespace stripped ], ) def test_valid_material_id_is_normalized(self, given, expected): @@ -163,7 +176,15 @@ def test_valid_material_id_is_normalized(self, given, expected): @pytest.mark.parametrize( "bad", - ["mp-12345678", "MP-1", "mp-", "mp-1a", "1234", "mvc-1", "mp-1.0"], + [ + "mp-12345678", # too many significant digits + "mp-", # empty body + "mp-1a", # mixed digits and letters + "1234", # missing prefix + "mvc-1", # wrong prefix + "mp-1.0", # non-integer + "mp-abcdefghi", # 9 letters, one over the cap + ], ) def test_invalid_material_id_raises(self, bad): with pytest.raises(ValidationError, match="material_id"): @@ -226,9 +247,7 @@ class TestIdentifierHierarchy: """chemical_system_id > formula > material_id: each level requires the ones above it.""" def _build(self, **identity): - return ContributionIn( - _id=PydanticObjectId(), project="proj", data={}, **identity - ) + return ContributionIn(_id=PydanticObjectId(), project="proj", data={}, **identity) def test_chemical_system_only_is_valid(self): contrib = self._build(chemical_system_id="Fe-O") From c3f5a407e57a2a9d231133a92c5b30949d16930e Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 13 Aug 2026 11:44:00 -0700 Subject: [PATCH 551/591] perf(types): chemical system ids now normalize tokens to first char uppercase, second char lowercase, regardless of input Previously FE, fE, and fe would not be valid. Now they all get coerced to Fe before element validation --- .../src/mpcontribs_api/domains/_shared/types.py | 10 ++++++---- .../unit/domains/test_contributions_models.py | 15 ++++++++++++++- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py index a6a9543d53..d5a5ee1a1a 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py @@ -71,19 +71,21 @@ def _validate_chemical_system_id(v: str | None) -> str | None: """Validate a hyphen-delimited chemical system of element symbols, e.g. ``"Fe-O"``.""" if v is None: return None - if not isinstance(v, str): - raise ValidationError(f"chemical_system_id must be a string, got '{type(v).__name__}'", chemical_system_id=v) s = v.strip() if not s: raise ValidationError("chemical_system_id must not be empty", chemical_system_id=v) + normalized_tokens: list[str] = [] for token in s.split("-"): - if not Element.is_valid_symbol(token): + # Normalize casing (e.g. "fe", "FE", "fE" -> "Fe") before validating. + normalized = token.capitalize() + if not Element.is_valid_symbol(normalized): raise ValidationError( f"chemical_system_id '{v}' invalid. '{token}' is not a valid element symbol", chemical_system_id=v, invalid_token=token, ) - return s + normalized_tokens.append(normalized) + return "-".join(normalized_tokens) ChemicalSystemId = Annotated[str, BeforeValidator(_validate_chemical_system_id)] diff --git a/mpcontribs-api/tests/unit/domains/test_contributions_models.py b/mpcontribs-api/tests/unit/domains/test_contributions_models.py index 91d7821962..2acca2bf90 100644 --- a/mpcontribs-api/tests/unit/domains/test_contributions_models.py +++ b/mpcontribs-api/tests/unit/domains/test_contributions_models.py @@ -196,7 +196,20 @@ class TestChemicalSystemIdValidation: def test_valid_chemical_system_id(self, good): assert _make_contribution_in(chemical_system_id=good).chemical_system_id == good - @pytest.mark.parametrize("bad", ["Xx-O", "fe-o", "Fe-", "-Fe", "Fe--O", ""]) + @pytest.mark.parametrize( + ("given", "expected"), + [ + ("fe-o", "Fe-O"), # all lowercase + ("FE-O", "Fe-O"), # all uppercase + ("fE-o", "Fe-O"), # mixed case + ("li-FE-o", "Li-Fe-O"), + ("h", "H"), + ], + ) + def test_chemical_system_id_case_is_normalized(self, given, expected): + assert _make_contribution_in(chemical_system_id=given).chemical_system_id == expected + + @pytest.mark.parametrize("bad", ["Xx-O", "Fe-", "-Fe", "Fe--O", ""]) def test_invalid_chemical_system_id_raises(self, bad): with pytest.raises(ValidationError, match="chemical_system_id"): _make_contribution_in(chemical_system_id=bad) From ebc371cc6411771eaeafc4e151234ddc85fcc6ec Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 13 Aug 2026 15:43:24 -0700 Subject: [PATCH 552/591] perf(Formula): formulas now accept fractional subscripts Accept formulas like Fe0.4Si2 --- .../mpcontribs_api/domains/_shared/types.py | 40 ++++++++++++++----- .../unit/domains/test_contributions_models.py | 29 ++++++++++++-- 2 files changed, 55 insertions(+), 14 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py index d5a5ee1a1a..36114a422f 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py @@ -91,17 +91,37 @@ def _validate_chemical_system_id(v: str | None) -> str | None: ChemicalSystemId = Annotated[str, BeforeValidator(_validate_chemical_system_id)] -# Each token is an element symbol (upper, optional lower) followed by an optional integer count. -_FORMULA_TOKEN_RE = re.compile(r"([A-Z][a-z]?)([0-9]*)") +# Each token is an element symbol (upper, optional lower) followed by an optional count. The count +# may be an integer or a decimal (e.g. ``"Si0.2C0.64"``), so fractional stoichiometries are allowed. +_FORMULA_TOKEN_RE = re.compile(r"([A-Z][a-z]?)([0-9]*\.?[0-9]*)") + + +def _normalize_count(count: str) -> str | None: + """Normalize an integer or decimal count, returning ``None`` if it is not positive. + + Trims leading zeros (``"02"`` -> ``"2"``) and trailing fractional zeros (``"0.20"`` -> ``"0.2"``, + ``"2.0"`` -> ``"2"``), and infers an omitted leading zero (``".1"`` -> ``"0.1"``). A count that + collapses to zero (``"0"``, ``"0.0"``) or has no digits (``"."``) returns ``None``. + """ + if "." in count: + int_part, frac_part = count.split(".", 1) + int_part = int_part.lstrip("0") + frac_part = frac_part.rstrip("0") + if frac_part: + return f"{int_part or '0'}.{frac_part}" + # Fractional part collapsed to zero -> treat as a whole number (``None`` if that is zero too). + return int_part or None + return count.lstrip("0") or None def _validate_formula(v: str | None) -> str | None: """Validate/normalize a formula: element symbols each optionally followed by a count. The value is NFKC-normalized first, so unicode subscripts/superscripts and full-width forms - fold to their ASCII equivalents (``"Fe₂O₃"`` -> ``"Fe2O3"``). Leading zeros in counts are then - trimmed (``"Fe02O3"`` -> ``"Fe2O3"``). Rejects unknown element symbols, stray characters, and - non-positive counts (``"Fe0"``). + fold to their ASCII equivalents (``"Fe₂O₃"`` -> ``"Fe2O3"``). Counts may be integers or decimals + (``"Si0.2C0.64"``); leading zeros and trailing fractional zeros are then trimmed + (``"Fe02O3"`` -> ``"Fe2O3"``, ``"Fe2.0O3"`` -> ``"Fe2O3"``). Rejects unknown element symbols, + stray characters, and non-positive counts (``"Fe0"``). """ if v is None: return None @@ -122,20 +142,20 @@ def _validate_formula(v: str | None) -> str | None: invalid_symbol=symbol, ) if count: - trimmed = count.lstrip("0") - if not trimmed: + normalized = _normalize_count(count) + if normalized is None: raise ValidationError( - f"formula '{v}' invalid. Count for '{symbol}' must be a positive integer", + f"formula '{v}' invalid. Count for '{symbol}' must be a positive number", formula=v, invalid_count=count, ) - count = trimmed + count = normalized parts.append(f"{symbol}{count}") pos = match.end() if pos != len(s): raise ValidationError( f"formula '{v}' invalid. Must be valid element symbols each optionally followed by a " - "positive integer count (e.g. 'Fe2O3')", + "positive integer or decimal count (e.g. 'Fe2O3', 'Si0.2C0.64')", formula=v, ) return "".join(parts) diff --git a/mpcontribs-api/tests/unit/domains/test_contributions_models.py b/mpcontribs-api/tests/unit/domains/test_contributions_models.py index 2acca2bf90..35868b119e 100644 --- a/mpcontribs-api/tests/unit/domains/test_contributions_models.py +++ b/mpcontribs-api/tests/unit/domains/test_contributions_models.py @@ -224,15 +224,36 @@ class TestFormulaValidation: ("Fe", "Fe"), ("Fe02O3", "Fe2O3"), # leading zeros in counts trimmed ("FeO03", "FeO3"), - ("Fe₂O₃", "Fe2O3"), # NFKC folds unicode subscripts - ("Co³O₄", "Co3O4"), # ...and superscripts - ("Ｆｅ２Ｏ３", "Fe2O3"), # ...and full-width forms + ("Si0.2Fe0.1C4", "Si0.2Fe0.1C4"), + ("Si00.04", "Si0.04"), + ("Fe0.1", "Fe0.1"), + ("Fe.1", "Fe0.1"), + ("Fe00.1", "Fe0.1"), + ("Fe2.0O3", "Fe2O3"), + ("Fe0.20O3", "Fe0.2O3"), + ("Fe₂O₃", "Fe2O3"), + ("Co³O₄", "Co3O4"), + ("Ｆｅ２Ｏ３", "Fe2O3"), ], ) def test_valid_formula_is_normalized(self, given, expected): assert _make_contribution_in(formula=given).formula == expected - @pytest.mark.parametrize("bad", ["X", "fe2", "Fe2xO", "2FeO", "Fe0", ""]) + @pytest.mark.parametrize( + "bad", + [ + "X", + "fe2", + "Fe2xO", + "2FeO", + "Fe0", + "", + "Si0.0.4", + "Si0,1", + "Si0.0", + "Si.", + ], + ) def test_invalid_formula_raises(self, bad): with pytest.raises(ValidationError, match="formula"): _make_contribution_in(formula=bad) From 5006178d4eb944716c9806e985bdc1e78760c5ae Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 13 Aug 2026 16:14:37 -0700 Subject: [PATCH 553/591] perf(BulkFailure): creating a bulkfailure now automatically emits an info log --- mpcontribs-api/src/mpcontribs_api/config.py | 4 ++-- .../src/mpcontribs_api/domains/_shared/bulk.py | 17 +++++++++++++++-- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/config.py b/mpcontribs-api/src/mpcontribs_api/config.py index 3995eebb0e..6251009d40 100644 --- a/mpcontribs-api/src/mpcontribs_api/config.py +++ b/mpcontribs-api/src/mpcontribs_api/config.py @@ -1,5 +1,5 @@ from functools import lru_cache -from typing import Literal +from typing import Literal, Self from pydantic import BaseModel, Field, SecretStr, model_validator from pydantic_settings import BaseSettings, SettingsConfigDict @@ -149,7 +149,7 @@ class MongoSettings(BaseModel): timeout_ms: int = Field(default=60_000, description="The end-to-end allowed time for an operation") @model_validator(mode="after") - def _clamp_concurrency(self): + def _clamp_concurrency(self) -> Self: if self.max_pool_size: per_request_cap = max(1, self.max_pool_size // 2) if self.max_concurrent_transactions > per_request_cap: diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/bulk.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/bulk.py index 2837c8dbec..694cf4cc48 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/bulk.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/bulk.py @@ -1,10 +1,13 @@ -from typing import Any +from typing import Any, Self -from pydantic import BaseModel +import structlog +from pydantic import BaseModel, model_validator from pymongo.errors import DuplicateKeyError from mpcontribs_api.exceptions import AppError, ConflictError +logger = structlog.get_logger(__name__) + class BulkFailure(BaseModel): """A single failed item in a bulk write, identified by its position in the input batch.""" @@ -14,6 +17,16 @@ class BulkFailure(BaseModel): error_code: str message: str + @model_validator(mode="after") + def _emit_log(self) -> Self: + logger.info( + message=self.message, + error_code=self.error_code, + index=self.index, + identifier=self.identifier, + ) + return self + class BulkWriteSummary[T](BaseModel): """Result of a bulk write that supports per-item failure reporting. From 2dc81c569b984fa4df935ea3163f9a348d2caa19 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Thu, 13 Aug 2026 17:03:28 -0700 Subject: [PATCH 554/591] refactor(Identity): moved identity to be a shared type and abstract logic, created contributionidentity as a subclass New Identity subclasses have to specify fields where order matters (changing order leads to schema migrations) --- .../mpcontribs_api/domains/_shared/bulk.py | 1 + .../mpcontribs_api/domains/_shared/types.py | 79 ++++++++- .../domains/contributions/models.py | 65 ++------ .../domains/contributions/repository.py | 12 +- .../domains/contributions/service.py | 12 +- .../unit/domains/test_contribution_service.py | 4 +- .../unit/domains/test_contributions_models.py | 157 ++++++++++++++++++ 7 files changed, 260 insertions(+), 70 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/bulk.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/bulk.py index 694cf4cc48..bffb17d0d9 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/bulk.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/bulk.py @@ -20,6 +20,7 @@ class BulkFailure(BaseModel): @model_validator(mode="after") def _emit_log(self) -> Self: logger.info( + "bulk item failed", message=self.message, error_code=self.error_code, index=self.index, diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py index 36114a422f..fe8f4513d8 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py @@ -1,17 +1,24 @@ import re import unicodedata +from abc import ABC +from collections.abc import Mapping +from dataclasses import MISSING, dataclass, fields from enum import StrEnum -from typing import Annotated +from functools import cache +from typing import Annotated, Any, Self, get_args, get_type_hints import polars as pl from fastapi import Query from pydantic import BeforeValidator, Field, PlainSerializer, WithJsonSchema from pymatgen.core import Element +from pymongo import ASCENDING, IndexModel from mpcontribs_api.exceptions import ValidationError ShortStr = Annotated[str, Field(min_length=3, max_length=30)] +Scalar = str | int | float | bool + # A material id is ``mp-`` followed by either a numeric id (MpId) or an alphabetic id (AlphaId). # The whole value is lowercased first, so ``"MP-abc"`` and ``"mp-ABC"`` both normalize identically. _MATERIAL_ID_DIGITS_RE = re.compile(r"^mp-([0-9]+)$") @@ -261,3 +268,73 @@ def _serialize_frame(data: pl.DataFrame) -> dict: ), WithJsonSchema({"type": "object"}, mode="serialization"), ] + + +@cache +def _optional_field_names(cls: type) -> frozenset[str]: + """Names of ``cls``'s dataclass fields whose type admits ``None`` (resolved through string annotations).""" + hints = get_type_hints(cls) + return frozenset(f.name for f in fields(cls) if type(None) in get_args(hints.get(f.name))) + + +# dataclass construction is cheaper than Pydantic.BaseModel +@dataclass(frozen=True, slots=True) +class Identity(ABC): # noqa: B024 # base kept abstract as a marker; from_document is a shared concrete helper + """The full identity of a document model. + + Field declaration order IS the identity/index column order: ``index_model`` and ``projection`` + iterate ``dataclasses.fields`` in that order, so the order is declared exactly once (below). + """ + + # WARNING: the order the fields are specified in reflects their ordering for indices. Changing the order + # creates index migration. Only change intentionally + + def as_dict(self) -> dict[str, Any]: + """Identity as a flat dict keyed by field name (for Mongo match clauses and upsert).""" + return {f.name: getattr(self, f.name) for f in fields(self)} + + @classmethod + def from_document(cls, doc: Mapping[str, Any]) -> Self: + """Build from a raw Mongo document/projection, tolerating null-stripped fields. + + Generic over any ``@dataclass`` subclass: iterates the concrete class's own fields, + falling back to each field's default (or ``None`` for a defaultless Optional field) when the + document omits it, since Mongo strips nulls (``keep_nulls=False``). Required non-null fields + that are absent surface as a ``TypeError`` from the constructor. + """ + optional = _optional_field_names(cls) + kwargs: dict[str, Any] = {} + for f in fields(cls): + if doc.get(f.name) is not None: + kwargs[f.name] = doc[f.name] + elif f.default is not MISSING: + kwargs[f.name] = f.default + elif f.default_factory is not MISSING: + kwargs[f.name] = f.default_factory() + elif f.name in optional: + kwargs[f.name] = None + return cls(**kwargs) + + @classmethod + def index_model(cls, name: str = "project_identity", *, unique: bool = True) -> IndexModel: + """The unique index enforcing identity — keys follow the field order so they can't drift.""" + return IndexModel(keys=[(f.name, ASCENDING) for f in fields(cls)], name=name, unique=unique) + + @classmethod + def projection(cls) -> dict[str, int]: + """A Mongo projection selecting exactly the identity fields.""" + return {f.name: 1 for f in fields(cls)} + + @staticmethod + def check_hierarchy(material_id: str | None, chemical_system_id: str | None, formula: str | None) -> None: + """Enforce the identifier specificity hierarchy ``chemical_system_id`` > ``formula`` > ``material_id.""" + if not chemical_system_id: + raise ValidationError( + "chemical_system_id is required (identifier hierarchy: chemical_system_id > formula > material_id)." + ) + if material_id is not None and formula is None: + raise ValidationError( + "formula is required when material_id is specified " + "(identifier hierarchy: chemical_system_id > formula > material_id).", + material_id=material_id, + ) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py index 4b5302104d..1c35ee3a45 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py @@ -1,6 +1,5 @@ import re -from collections.abc import Mapping -from dataclasses import dataclass, fields +from dataclasses import dataclass from datetime import UTC, datetime from typing import Annotated, Any, ClassVar from warnings import deprecated @@ -22,7 +21,7 @@ from mpcontribs_api.domains._shared.filters import BaseFilter from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut -from mpcontribs_api.domains._shared.types import ChemicalSystemId, Formula, MaterialId, ShortStr +from mpcontribs_api.domains._shared.types import ChemicalSystemId, Formula, Identity, MaterialId, Scalar, ShortStr from mpcontribs_api.domains.attachments.models import Attachment, AttachmentFilter, AttachmentIn from mpcontribs_api.domains.structures.models import Structure, StructureFilter, StructureIn from mpcontribs_api.domains.tables.models import Table, TableFilter, TableIn @@ -77,9 +76,6 @@ def _validate_nested_keys(value: Any) -> None: _validate_nested_keys(item) -Scalar = str | int | float | bool - - def _value_at(data: dict[str, Any], path: str) -> Any: """Resolve a dotted ``path`` inside ``data``; raises ``KeyError`` if any segment is absent.""" cursor: Any = data @@ -119,9 +115,8 @@ def extract_unique_value(data: dict[str, Any] | None, unique_column: str) -> Sca return value -# dataclass construction is cheaper than Pydantic.BaseModel @dataclass(frozen=True, slots=True) -class Identity: +class ContributionIdentity(Identity): """The full identity of a Contribution. Field declaration order IS the identity/index column order: ``index_model`` and ``projection`` @@ -137,50 +132,10 @@ class Identity: unique_value: Scalar | None = None condition_key: str = "" - def as_dict(self) -> dict[str, Any]: - """Identity as a flat dict keyed by field name (for Mongo match clauses and upsert).""" - return {f.name: getattr(self, f.name) for f in fields(self)} - - @classmethod - def from_document(cls, doc: Mapping[str, Any]) -> Identity: - """Build from a raw Mongo document/projection, tolerating null-stripped fields.""" - return cls( - project=doc["project"], - material_id=doc.get("material_id"), - chemical_system_id=doc["chemical_system_id"], - formula=doc.get("formula"), - unique_value=doc.get("unique_value"), - condition_key=doc.get("condition_key") or "", - ) - - @classmethod - def index_model(cls, name: str = "project_identity", *, unique: bool = True) -> IndexModel: - """The unique index enforcing identity — keys follow the field order so they can't drift.""" - return IndexModel(keys=[(f.name, ASCENDING) for f in fields(cls)], name=name, unique=unique) - - @classmethod - def projection(cls) -> dict[str, int]: - """A Mongo projection selecting exactly the identity fields.""" - return {f.name: 1 for f in fields(cls)} - # The identifier fields governed by the specificity hierarchy enforced in ``check_hierarchy`` # (excludes ``project``/``unique_value``/``condition_key``, which don't participate). HIERARCHY_FIELDS: ClassVar[frozenset[str]] = frozenset({"material_id", "chemical_system_id", "formula"}) - @staticmethod - def check_hierarchy(material_id: str | None, chemical_system_id: str | None, formula: str | None) -> None: - """Enforce the identifier specificity hierarchy ``chemical_system_id`` > ``formula`` > ``material_id.""" - if not chemical_system_id: - raise ValidationError( - "chemical_system_id is required (identifier hierarchy: chemical_system_id > formula > material_id)." - ) - if material_id is not None and formula is None: - raise ValidationError( - "formula is required when material_id is specified " - "(identifier hierarchy: chemical_system_id > formula > material_id).", - material_id=material_id, - ) - class ContributionBase(BaseDocumentWithInput[PydanticObjectId]): """Shared settings and fields for Contribution, ContributionIn, and ContributionOut.""" @@ -204,7 +159,7 @@ class Settings: name = "contributions" keep_nulls = False indexes = [ - Identity.index_model(), + ContributionIdentity.index_model(), # Multikey indexes over each Link field's DBRef id so the component-delete # reference check (referenced_component_ids) is index-served, not a COLLSCAN. IndexModel(keys=[("structures.$id", ASCENDING)], name="ref_structures"), @@ -245,9 +200,9 @@ def set_last_modified(self): self.last_modified = datetime.now(UTC) @property - def identity(self) -> Identity: + def identity(self) -> ContributionIdentity: """This document's identity, read straight off its own stored fields.""" - return Identity( + return ContributionIdentity( project=self.project, material_id=self.material_id, chemical_system_id=self.chemical_system_id, @@ -275,7 +230,7 @@ class ContributionIn(ContributionBase): @model_validator(mode="after") def _check_identifier_hierarchy(self) -> ContributionIn: """Enforce ``chemical_system_id`` > ``formula`` > ``material_id`` (see :meth:`Identity.check_hierarchy`).""" - Identity.check_hierarchy(self.material_id, self.chemical_system_id, self.formula) + ContributionIdentity.check_hierarchy(self.material_id, self.chemical_system_id, self.formula) return self def has_components(self) -> bool: @@ -286,13 +241,13 @@ def component_count(self) -> int: """Returns the total number of components (structures, tables, attachments) in the contribution""" return len(self.structures or []) + len(self.tables or []) + len(self.attachments or []) - def identity(self, unique_value: Scalar | None = None, condition_key: str = "") -> Identity: - """Build this contribution's :class:`Identity` from its flat fields plus server-resolved parts. + def identity(self, unique_value: Scalar | None = None, condition_key: str = "") -> ContributionIdentity: + """Build this contribution's :class:`ContributionIdentity` from its flat fields plus server-resolved parts. ``unique_value`` and ``condition_key`` are server-resolved, so they are passed in rather than read off the (untrusted) input model. """ - return Identity( + return ContributionIdentity( project=self.project, material_id=self.material_id, chemical_system_id=self.chemical_system_id, diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py index b8026579e8..8096a52df2 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py @@ -15,10 +15,10 @@ from mpcontribs_api.domains.contributions.models import ( Contribution, ContributionFilter, + ContributionIdentity, ContributionIn, ContributionOut, ContributionPatch, - Identity, Scalar, ) from mpcontribs_api.exceptions import ConflictError, NotFoundError @@ -133,7 +133,7 @@ async def insert_contribution( await doc.insert(session=session) return doc - async def existing_identities(self, identities: list[Identity]) -> set[Identity]: + async def existing_identities(self, identities: list[ContributionIdentity]) -> set[ContributionIdentity]: """Return the subset of identities that already exist, scoped to the user. One query answers the whole batch so the write path avoids a round-trip per contribution. @@ -146,7 +146,7 @@ async def existing_identities(self, identities: list[Identity]) -> set[Identity] identities: the identities to test for existence Returns: - set[Identity]: the subset of ``identities`` already present + set[ContributionIdentity]: the subset of ``identities`` already present """ if not identities: return set() @@ -154,9 +154,9 @@ async def existing_identities(self, identities: list[Identity]) -> set[Identity] if self._scope: match = {"$and": [self._scope, match]} collection = self.document_model.get_pymongo_collection() - found: set[Identity] = set() - async for doc in collection.find(match, Identity.projection()): - found.add(Identity.from_document(doc)) + found: set[ContributionIdentity] = set() + async for doc in collection.find(match, ContributionIdentity.projection()): + found.add(ContributionIdentity.from_document(doc)) return found async def referenced_component_ids( diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py index 5ca34a504a..c20dd09336 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py @@ -22,9 +22,9 @@ from mpcontribs_api.domains.contributions.models import ( Contribution, ContributionFilter, + ContributionIdentity, ContributionIn, ContributionPatch, - Identity, Scalar, extract_unique_value, ) @@ -195,7 +195,7 @@ async def _resolve_identity( # First pass: validate accessibility + resolve each unique_value, collecting identity tuples # so the existence check can be batched into a single query. resolved: list[tuple[int, ContributionIn, Scalar | None]] = [] - keys: list[Identity] = [] + keys: list[ContributionIdentity] = [] for i in indices: contrib = contributions[i] if contrib.project not in unique_columns: @@ -246,9 +246,9 @@ async def _resolve_identity( return failures, plan existing = await self._contributions.existing_identities(keys) - seen: set[Identity] = set() + seen: set[ContributionIdentity] = set() for i, contrib, unique_value in resolved: - key: Identity = contrib.identity(unique_value) + key: ContributionIdentity = contrib.identity(unique_value) if key in existing or key in seen: failures.append( BulkFailure( @@ -530,7 +530,7 @@ async def patch_contribution_by_id(self, id: str, update: ContributionPatch) -> """ set_fields = update.model_dump(exclude_unset=True) touches_unique = "data" in set_fields or "project" in set_fields - touches_identity = bool(Identity.HIERARCHY_FIELDS & set_fields.keys()) + touches_identity = bool(ContributionIdentity.HIERARCHY_FIELDS & set_fields.keys()) if not touches_unique and not touches_identity: return await self._contributions.patch_contribution_by_id(id, update) @@ -571,7 +571,7 @@ def _validate_identifier_hierarchy_merged( ) material_id = set_fields["material_id"] if "material_id" in set_fields else existing_material_id formula = set_fields["formula"] if "formula" in set_fields else existing_formula - Identity.check_hierarchy(material_id, chemical_system_id, formula) + ContributionIdentity.check_hierarchy(material_id, chemical_system_id, formula) async def delete_contributions(self, filter: ContributionFilter) -> BulkDeleteSummary: """Delete a contribution and all of its child components diff --git a/mpcontribs-api/tests/unit/domains/test_contribution_service.py b/mpcontribs-api/tests/unit/domains/test_contribution_service.py index 0e74b99fc0..733fd3ab0d 100644 --- a/mpcontribs-api/tests/unit/domains/test_contribution_service.py +++ b/mpcontribs-api/tests/unit/domains/test_contribution_service.py @@ -12,9 +12,9 @@ from mpcontribs_api.domains.attachments.models import Attachment, AttachmentIn from mpcontribs_api.domains.contributions.models import ( Contribution, + ContributionIdentity, ContributionIn, ContributionPatch, - Identity, ) from mpcontribs_api.domains.contributions.service import ContributionService from mpcontribs_api.domains.structures.models import ( @@ -505,7 +505,7 @@ async def test_insert_existing_identity_conflicts(self): svc, contrib_repo, *_ = _make_service() contrib_repo.insert_many_contributions.return_value = None contrib_repo.existing_identities.return_value = { - Identity(project="proj", material_id="mp-1", chemical_system_id="Fe-O", formula="Fe2O3") + ContributionIdentity(project="proj", material_id="mp-1", chemical_system_id="Fe-O", formula="Fe2O3") } summary = await svc.insert_contributions([_contrib_in(identifier="mp-1")]) diff --git a/mpcontribs-api/tests/unit/domains/test_contributions_models.py b/mpcontribs-api/tests/unit/domains/test_contributions_models.py index 35868b119e..4dd04a1112 100644 --- a/mpcontribs-api/tests/unit/domains/test_contributions_models.py +++ b/mpcontribs-api/tests/unit/domains/test_contributions_models.py @@ -7,9 +7,11 @@ from mpcontribs_api.authz import User from mpcontribs_api.domains.contributions.repository import MongoDbContributionRepository +from mpcontribs_api.domains._shared.types import Identity from mpcontribs_api.domains.contributions.models import ( Contribution, ContributionFilter, + ContributionIdentity, ContributionIn, ContributionOut, ContributionPatch, @@ -17,6 +19,17 @@ ) from mpcontribs_api.exceptions import ValidationError +# The identity/index column order, declared once here so the tests fail loudly if the field order +# in ContributionIdentity ever drifts (which silently forces a Mongo index migration). +IDENTITY_FIELD_ORDER = [ + "project", + "material_id", + "chemical_system_id", + "formula", + "unique_value", + "condition_key", +] + # --------------------------------------------------------------------------- # Helpers # --------------------------------------------------------------------------- @@ -510,3 +523,147 @@ def test_object_id_passthrough(self): def test_malformed_id_raises_validation_error(self): with pytest.raises(ValidationError): ContributionFilter(id="not-an-object-id") + + +# --------------------------------------------------------------------------- +# ContributionIdentity — the concrete identity dataclass (renamed from Identity, +# which is now the shared abstract base holding the index/projection machinery) +# --------------------------------------------------------------------------- + + +def _identity(**overrides) -> ContributionIdentity: + """A fully-populated ContributionIdentity, overridable per test.""" + defaults: dict = { + "project": "proj", + "material_id": "mp-1", + "chemical_system_id": "Fe-O", + "formula": "Fe2O3", + "unique_value": None, + "condition_key": "", + } + defaults.update(overrides) + return ContributionIdentity(**defaults) + + +class TestContributionIdentityStructure: + def test_is_concrete_subclass_of_identity_abc(self): + # Identity is the abstract base; ContributionIdentity is the concrete, field-bearing subclass. + assert issubclass(ContributionIdentity, Identity) + assert ContributionIdentity is not Identity + + def test_field_order_matches_index_and_projection(self): + # Field declaration order IS the index column order — reordering silently forces a Mongo + # index migration, so index_model keys, projection keys, and as_dict all pin the same order. + index_keys = [key for key, _direction in ContributionIdentity.index_model().document["key"].items()] + assert index_keys == IDENTITY_FIELD_ORDER + assert list(ContributionIdentity.projection().keys()) == IDENTITY_FIELD_ORDER + assert list(_identity().as_dict().keys()) == IDENTITY_FIELD_ORDER + + def test_hierarchy_fields_are_the_identifier_triple(self): + assert ContributionIdentity.HIERARCHY_FIELDS == frozenset({"material_id", "chemical_system_id", "formula"}) + + +class TestContributionIdentityIndexModel: + def test_default_index_is_named_and_unique(self): + index = ContributionIdentity.index_model() + assert index.document["name"] == "project_identity" + assert index.document["unique"] is True + + def test_unique_can_be_disabled(self): + assert ContributionIdentity.index_model(unique=False).document["unique"] is False + + +class TestContributionIdentityProjection: + def test_projection_selects_exactly_the_identity_fields(self): + assert ContributionIdentity.projection() == dict.fromkeys(IDENTITY_FIELD_ORDER, 1) + + +class TestContributionIdentityAsDict: + def test_as_dict_is_flat_and_keyed_by_field_name(self): + identity = _identity(unique_value="A", condition_key="cond") + assert identity.as_dict() == { + "project": "proj", + "material_id": "mp-1", + "chemical_system_id": "Fe-O", + "formula": "Fe2O3", + "unique_value": "A", + "condition_key": "cond", + } + + +class TestContributionIdentityFromDocument: + def test_full_document_round_trips(self): + identity = _identity(unique_value="A", condition_key="cond") + assert ContributionIdentity.from_document(identity.as_dict()) == identity + + def test_null_stripped_document_falls_back_to_defaults(self): + # Contributions are stored with keep_nulls=False, so a chem-system-only contribution's + # projected identity doc omits material_id/formula/unique_value/condition_key entirely. + rebuilt = ContributionIdentity.from_document({"project": "proj", "chemical_system_id": "Fe-O"}) + assert rebuilt == ContributionIdentity( + project="proj", + material_id=None, + chemical_system_id="Fe-O", + formula=None, + unique_value=None, + condition_key="", + ) + + def test_explicit_null_is_treated_as_absent(self): + # A doc that carries an explicit null (rather than omitting the key) resolves identically. + rebuilt = ContributionIdentity.from_document( + {"project": "proj", "material_id": None, "chemical_system_id": "Fe-O", "formula": None} + ) + assert rebuilt.material_id is None + assert rebuilt.formula is None + + def test_missing_required_non_null_field_raises(self): + # project and chemical_system_id are non-null identity fields; their absence is data + # corruption, so from_document surfaces it as a TypeError rather than fabricating a value. + with pytest.raises(TypeError): + ContributionIdentity.from_document({"chemical_system_id": "Fe-O"}) # no project + with pytest.raises(TypeError): + ContributionIdentity.from_document({"project": "proj"}) # no chemical_system_id + + +class TestContributionIdentityEqualityAndHashing: + """Identity equality/hashing is what powers conflict dedup in ContributionService.""" + + def test_identical_identities_are_equal_and_collapse_in_a_set(self): + # existing_identities returns a set and the insert path checks `key in existing/seen`, + # so two identities over the same fields must be equal and hash-collapse. + assert _identity() == _identity() + assert len({_identity(), _identity()}) == 1 + + def test_same_triple_distinct_unique_value_are_different_identities(self): + # The whole point of unique_value: same (project, ids) but a distinct discriminator is a + # distinct identity, so both survive as separate members and neither conflicts. + a = _identity(unique_value="A") + b = _identity(unique_value="B") + assert a != b + assert len({a, b}) == 2 + + def test_identity_is_frozen(self): + with pytest.raises(Exception): # noqa: B017,PT011 -- dataclasses.FrozenInstanceError + _identity().project = "other" # type: ignore[misc] + + +class TestContributionIdentityCheckHierarchy: + """check_hierarchy enforces chemical_system_id > formula > material_id (shared ABC logic).""" + + def test_full_identifier_stack_passes(self): + ContributionIdentity.check_hierarchy("mp-1", "Fe-O", "Fe2O3") + + def test_chemical_system_only_passes(self): + ContributionIdentity.check_hierarchy(None, "Fe-O", None) + + def test_missing_chemical_system_is_rejected(self): + with pytest.raises(ValidationError, match="chemical_system_id is required"): + ContributionIdentity.check_hierarchy(None, None, "Fe2O3") + + def test_material_id_without_formula_is_rejected(self): + with pytest.raises(ValidationError, match="formula is required"): + ContributionIdentity.check_hierarchy("mp-1", "Fe-O", None) + + def test_formula_without_material_id_is_allowed(self): + ContributionIdentity.check_hierarchy(None, "Fe-O", "Fe2O3") From 410c72ae599eb93e39b9ca5c6bf1b7b82145f650 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Fri, 14 Aug 2026 08:53:19 -0700 Subject: [PATCH 555/591] refactor(Identity): moved check_hierarchy() from Identity to ContributionIdentity Identity has no builtin hierarchy --- .../src/mpcontribs_api/domains/_shared/types.py | 14 -------------- .../mpcontribs_api/domains/contributions/models.py | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py index fe8f4513d8..d1e884f860 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py @@ -324,17 +324,3 @@ def index_model(cls, name: str = "project_identity", *, unique: bool = True) -> def projection(cls) -> dict[str, int]: """A Mongo projection selecting exactly the identity fields.""" return {f.name: 1 for f in fields(cls)} - - @staticmethod - def check_hierarchy(material_id: str | None, chemical_system_id: str | None, formula: str | None) -> None: - """Enforce the identifier specificity hierarchy ``chemical_system_id`` > ``formula`` > ``material_id.""" - if not chemical_system_id: - raise ValidationError( - "chemical_system_id is required (identifier hierarchy: chemical_system_id > formula > material_id)." - ) - if material_id is not None and formula is None: - raise ValidationError( - "formula is required when material_id is specified " - "(identifier hierarchy: chemical_system_id > formula > material_id).", - material_id=material_id, - ) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py index 1c35ee3a45..49f53b3a38 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py @@ -136,6 +136,20 @@ class ContributionIdentity(Identity): # (excludes ``project``/``unique_value``/``condition_key``, which don't participate). HIERARCHY_FIELDS: ClassVar[frozenset[str]] = frozenset({"material_id", "chemical_system_id", "formula"}) + @staticmethod + def check_hierarchy(material_id: str | None, chemical_system_id: str | None, formula: str | None) -> None: + """Enforce the identifier specificity hierarchy ``chemical_system_id`` > ``formula`` > ``material_id.""" + if not chemical_system_id: + raise ValidationError( + "chemical_system_id is required (identifier hierarchy: chemical_system_id > formula > material_id)." + ) + if material_id is not None and formula is None: + raise ValidationError( + "formula is required when material_id is specified " + "(identifier hierarchy: chemical_system_id > formula > material_id).", + material_id=material_id, + ) + class ContributionBase(BaseDocumentWithInput[PydanticObjectId]): """Shared settings and fields for Contribution, ContributionIn, and ContributionOut.""" From 939a2a05f4d9bf3df0cfeb2eb25e2b8c8e2050fb Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Fri, 14 Aug 2026 09:14:17 -0700 Subject: [PATCH 556/591] refactor(ContributionIn): renamed identifiers -> identity_dict to clarify intent --- .../domains/contributions/models.py | 2 +- .../domains/contributions/repository.py | 2 +- .../domains/contributions/service.py | 30 +++++++++---------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py index 49f53b3a38..3f1bee424f 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py @@ -270,7 +270,7 @@ def identity(self, unique_value: Scalar | None = None, condition_key: str = "") condition_key=condition_key, ) - def identifiers(self, unique_value: Scalar | None = None, condition_key: str = "") -> dict[str, Any]: + def identity_dict(self, unique_value: Scalar | None = None, condition_key: str = "") -> dict[str, Any]: """Returns the identity fields of a contribution (outside of id) for reporting and upsert.""" return self.identity(unique_value, condition_key).as_dict() diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py index 0c401a6cbc..717b2dee43 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py @@ -257,7 +257,7 @@ async def upsert_contribution_by_identifiers( fresh Contribution document is written with ``is_public=False``. Args: - identifiers: the identity dict ContributionIn.identifiers(unique_value) returns + identifiers: the identity dict ContributionIn.identity_dict(unique_value) returns contribution: the input payload to upsert Returns: diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py index 7123c765df..b90e93f1bf 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py @@ -168,7 +168,7 @@ def _split_unauthorized( unauthorized.append( BulkFailure( index=i, - identifier=contrib.identifiers(), + identifier=contrib.identity_dict(), error_code=PermissionError.error_code, message=f"not authorized to write to project '{contrib.project}'", ) @@ -224,7 +224,7 @@ async def _resolve_identity( failures.append( BulkFailure( index=i, - identifier=contrib.identifiers(), + identifier=contrib.identity_dict(), error_code=ValidationError.error_code, message=f"project '{contrib.project}' not found or not accessible", ) @@ -232,7 +232,7 @@ async def _resolve_identity( logger.info( "project not found or not accessible", project=contrib.project, - identifiers=contrib.identifiers(), + identifiers=contrib.identity_dict(), ) continue @@ -245,7 +245,7 @@ async def _resolve_identity( failures.append( BulkFailure( index=i, - identifier=contrib.identifiers(), + identifier=contrib.identity_dict(), error_code=ValidationError.error_code, message=err.message, ) @@ -253,7 +253,7 @@ async def _resolve_identity( logger.info( "missing or non-scalar unique_column value", project=contrib.project, - identifiers=contrib.identifiers(), + identifiers=contrib.identity_dict(), ) continue @@ -275,7 +275,7 @@ async def _resolve_identity( failures.append( BulkFailure( index=i, - identifier=contrib.identifiers(unique_value), + identifier=contrib.identity_dict(unique_value), error_code=ConflictError.error_code, message=f"a contribution with this identity already exists for project '{contrib.project}'", ) @@ -283,7 +283,7 @@ async def _resolve_identity( logger.info( "duplicate contribution identity", project=contrib.project, - identifiers=contrib.identifiers(unique_value), + identifiers=contrib.identity_dict(unique_value), ) continue seen.add(key) @@ -312,7 +312,7 @@ def _split_oversize( oversize.append( BulkFailure( index=i, - identifier=contrib.identifiers(), + identifier=contrib.identity_dict(), error_code=ValidationError.error_code, message=f"contribution has {count} components, exceeds cap of {cap}. " "Recommend inserting the component alone, followed by bulk inserts of components", @@ -364,7 +364,7 @@ async def _split_quota_exceeded( max_allowed=cap, ) failures.extend( - bulk_failure_from_exception(item.index, item.contribution.identifiers(), exc) for item in rejected + bulk_failure_from_exception(item.index, item.contribution.identity_dict(), exc) for item in rejected ) survivors.sort(key=lambda item: item.index) return failures, survivors @@ -468,7 +468,7 @@ def _partition_bulk_write_error( failed.append( BulkFailure( index=item.index, - identifier=item.contribution.identifiers(item.unique_value, item.condition_key), + identifier=item.contribution.identity_dict(item.unique_value, item.condition_key), error_code="conflict" if err.get("code") == 11000 else "write_error", message=err.get("errmsg", "write failed"), ) @@ -515,17 +515,17 @@ async def _txn(s: AsyncClientSession) -> Contribution: return await session.with_transaction(_txn) except AppError as exc: return bulk_failure_from_exception( - item.index, contrib.identifiers(item.unique_value, item.condition_key), exc + item.index, contrib.identity_dict(item.unique_value, item.condition_key), exc ) except Exception as exc: logger.error( "insert_contribution_failed", index=item.index, - identifier=contrib.identifiers(item.unique_value, item.condition_key), + identifier=contrib.identity_dict(item.unique_value, item.condition_key), exc_info=True, ) return bulk_failure_from_exception( - item.index, contrib.identifiers(item.unique_value, item.condition_key), exc + item.index, contrib.identity_dict(item.unique_value, item.condition_key), exc ) async def _do_insert( @@ -557,7 +557,7 @@ async def upsert_contributions(self, contributions: list[ContributionIn]) -> Bul services. If any contribution in the batch carries components, the entire request is rejected before any database writes occur. - Each item is upserted atomically by ``ContributionIn.identifiers()`` via a single + Each item is upserted atomically by ``ContributionIn.identity_dict()`` via a single ``findOneAndUpdate(..., upsert=True)`` so two requests targeting the same key cannot race past the find branch — the unique index over those fields is the tiebreaker. Concurrent upserts within a batch are bounded by ``settings.mongo.max_concurrent_transactions``. @@ -589,7 +589,7 @@ async def upsert_contributions(self, contributions: list[ContributionIn]) -> Bul async def _bounded_upsert(item: ResolvedWrite) -> Contribution | BulkFailure: contrib = item.contribution - identifiers = contrib.identifiers(item.unique_value, item.condition_key) + identifiers = contrib.identity_dict(item.unique_value, item.condition_key) async with sem: try: return await self._contributions.upsert_contribution_by_identifiers(identifiers, contrib) From 304a35540dffae069eeedf563bb1100d0c4056c9 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Fri, 14 Aug 2026 16:18:15 -0700 Subject: [PATCH 557/591] refactor(ContributionService): removed _partition_bulk_write_error and inlined logic since it was called in one place --- .../domains/contributions/service.py | 43 ++++++++----------- 1 file changed, 17 insertions(+), 26 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py index 6be507beba..245e93ca17 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py @@ -503,33 +503,24 @@ async def _insert_no_components( await self._contributions.insert_many_contributions(docs) return [(item.index, doc) for item, doc in zip(items, docs, strict=True)], [] except BulkWriteError as exc: - return self._partition_bulk_write_error(items, docs, exc) - - @staticmethod - def _partition_bulk_write_error( - items: list[PreparedWrite], - docs: list[Contribution], - exc: BulkWriteError, - ) -> tuple[list[tuple[int, Contribution]], list[BulkFailure]]: - """Map pymongo's per-position writeErrors back to the caller's original input indices.""" - write_errors = exc.details.get("writeErrors", []) if exc.details else [] - failed_positions = {err.get("index"): err for err in write_errors} - succeeded: list[tuple[int, Contribution]] = [] - failed: list[BulkFailure] = [] - for position, (item, doc) in enumerate(zip(items, docs, strict=True)): - err = failed_positions.get(position) - if err is None: - succeeded.append((item.index, doc)) - else: - failed.append( - BulkFailure( - index=item.index, - identifier=item.contribution.identity_dict(item.unique_value, item.condition_key), - error_code="conflict" if err.get("code") == 11000 else "write_error", - message=err.get("errmsg", "write failed"), + write_errors = exc.details.get("writeErrors", []) if exc.details else [] + failed_positions = {err.get("index"): err for err in write_errors} + succeeded: list[tuple[int, Contribution]] = [] + failed: list[BulkFailure] = [] + for position, (item, doc) in enumerate(zip(items, docs, strict=True)): + err = failed_positions.get(position) + if err is None: + succeeded.append((item.index, doc)) + else: + failed.append( + BulkFailure( + index=item.index, + identifier=item.contribution.identity_dict(item.unique_value, item.condition_key), + error_code="conflict" if err.get("code") == 11000 else "write_error", + message=err.get("errmsg", "write failed"), + ) ) - ) - return succeeded, failed + return succeeded, failed async def _insert_with_components( self, From 8ee184835f872ab018021663580549fab5bb3ee3 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 17 Aug 2026 10:26:18 -0700 Subject: [PATCH 558/591] feat(Identity): added 'model_fields' method to return a frozenset of class fields used in identification --- mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py index 54c50d8c1a..1130178f4f 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py @@ -374,6 +374,11 @@ def as_dict(self) -> dict[str, Any]: """Identity as a flat dict keyed by field name (for Mongo match clauses and upsert).""" return {f.name: getattr(self, f.name) for f in fields(self)} + @classmethod + def model_fields(cls) -> frozenset[str]: + """Returns the field names as a frozenset""" + return frozenset(f.name for f in fields(cls)) + @classmethod def from_document(cls, doc: Mapping[str, Any]) -> Self: """Build from a raw Mongo document/projection, tolerating null-stripped fields. From a9b75be25becd9c39febdb1b3e2a3b43aa5ff5ad Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 17 Aug 2026 10:27:09 -0700 Subject: [PATCH 559/591] feat(BulkUpdateSummary): added 'failed' field to track failures during bulk updates --- .../src/mpcontribs_api/domains/_shared/bulk.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/bulk.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/bulk.py index 26f58a5eb9..096fc1f303 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/bulk.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/bulk.py @@ -48,19 +48,20 @@ class BulkDeleteSummary[T](BaseModel): class BulkUpdateSummary(BaseModel): - """Result of a filtered bulk update. - - No per-item result, reflects MongoDB's bulk update response. + """Result of a bulk update. Attributes: matched: documents the (scoped) filter matched - modified: documents whose stored value actually changed + modified: documents whose stored value actually changed (fast path) or were successfully + patched (per-row path) projects: the projects the update touched, so the caller can see its blast radius + failed: per-row failures (e.g. identity collisions); always empty on the fast path """ matched: int modified: int projects: list[str] + failed: list[BulkFailure] = [] def bulk_failure_from_exception(index: int, identifier: dict[str, Any] | None, exc: BaseException) -> BulkFailure: From 41191a9728f1f84fd82ed20f2de22d3076d135bc Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 17 Aug 2026 10:29:10 -0700 Subject: [PATCH 560/591] refactor(consumers/router.py): moved default fields for get methods into body this is the proper way of handling defaults defined by class methods --- .../src/mpcontribs_api/domains/consumers/router.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/consumers/router.py b/mpcontribs-api/src/mpcontribs_api/domains/consumers/router.py index ba15952a38..af19d78dff 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/consumers/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/consumers/router.py @@ -25,9 +25,11 @@ async def get_consumers( repo: ConsumerDep, pagination: Annotated[CursorParams, Depends()], filter: ConsumerFilter = FilterDepends(ConsumerFilter), - fields: FieldSelector = list(ConsumerOut.default_fields()), + fields: FieldSelector = None, ): """List consumer overrides (admin only).""" + if fields is None: + fields = list(ConsumerOut.default_fields()) selected = ConsumerOut.parse_fields(fields) return await repo.get_consumers(filter=filter, pagination=pagination, fields=selected) @@ -36,9 +38,11 @@ async def get_consumers( async def get_consumer_by_id( id: str, repo: ConsumerDep, - fields: FieldSelector = list(ConsumerOut.default_fields()), + fields: FieldSelector = None, ): """Get a single consumer override by document id (admin only).""" + if fields is None: + fields = list(ConsumerOut.default_fields()) selected = ConsumerOut.parse_fields(fields) return await repo.get_consumer_by_id(id=id, fields=selected) From d911e2c71b7a8cfa40a554ade6d738d3a4c1d474 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 17 Aug 2026 11:49:48 -0700 Subject: [PATCH 561/591] refactor(units.py): renamed 'AnnotatedData' to 'QuantityLeaf' to clarfiy vs Contribution(Patch)Data Also consolidataed leaf-parsing logic to within the class --- .../mpcontribs_api/domains/_shared/units.py | 147 +++++++++++++----- 1 file changed, 111 insertions(+), 36 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/units.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/units.py index 0083e6cf22..20bfff9199 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/units.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/units.py @@ -1,30 +1,10 @@ -"""Unit parsing and SI canonicalization for annotated contribution data. - -Contribution ``data`` keys may be submitted in the annotated form -``name (unit, cond1=val1, cond2=val2, ...)``. This module turns a raw value plus a unit string -into a normalized leaf that is canonicalized to SI base units whenever Pint recognizes the unit, -while always retaining the value/unit exactly as submitted (provenance). - -Design notes: - -- **SI-when-possible**: a recognized unit is converted to base units via Pint; ``value``/``unit`` - hold the canonical form, ``input_value``/``input_unit`` hold the original. An unrecognized or - dimensionless unit is stored verbatim (``value``/``unit`` == ``input_*``). -- **Uncertainties**: a string magnitude such as ``"4.2(3)"`` or ``"4.2+/-0.3"`` is parsed with the - ``uncertainties`` package; the nominal value lands in ``value`` and the (SI-propagated) standard - deviation in ``error``. -- **Identity precision**: :func:`condition_key` renders numeric conditions from their canonical SI - magnitude at a fixed precision, so ``T=300K`` and ``T=300.0K`` (and, deliberately, - ``T=26.85degC``) collapse to the same key rather than splitting into separate pivoted rows. -""" - import math import re -from typing import Any, Self +from typing import Any, ClassVar, Self import pint from pydantic import BaseModel -from uncertainties import UFloat, ufloat_fromstr +from uncertainties import UFloat, ufloat, ufloat_fromstr from uncertainties.core import AffineScalarFunc from mpcontribs_api.config import get_settings @@ -167,19 +147,20 @@ def _reconcile_units(mag: str, embedded_unit: str | None, key_unit: str | None) return converted.magnitude, key_unit -class AnnotatedData(BaseModel): - """The canonical shape of a ``Contribution.data`` quantity leaf, and its factory. +class QuantityLeaf(BaseModel): + """The canonical shape of a ``Contribution.data`` quantity leaf, its factory, and its predicates. ``value``/``unit`` hold the SI-canonical form (or the submitted form when the unit is - unrecognized/dimensionless); ``input_value``/``input_unit`` hold the submitted form. ``error`` is - the (SI-propagated) standard deviation, present only when the magnitude carried an uncertainty; - ``input_error`` is the same uncertainty in the submitted unit. ``precision`` is the number of - significant digits the submission carried (string magnitudes only); it is ``None`` for a numeric - submission, which carries no trailing-zero information. - - The leaf carries no human-readable ``display`` string: clients format the value however they - like from these fields (``input_value``/``input_unit``/``input_error``/``precision`` reproduce the - submitted form exactly). + unrecognized/dimensionless) + ``input_value``/``input_unit`` hold the submitted form. + ``error`` is the (SI-propagated) standard deviation, present only when the magnitude carried an uncertainty + ``input_error`` is the same uncertainty in the submitted unit. + ``precision`` is the number of significant digits the submission carried (string magnitudes only); it is ``None`` + for a numeric submission, which carries no trailing-zero information. ``display`` is an optional free-form + human-readable string (never derived; carried verbatim when supplied). + + The model fields *are* the reserved leaf keys (see :meth:`reserved_keys`): callers may not use + them as plain ``data`` keys. """ value: float @@ -189,6 +170,42 @@ class AnnotatedData(BaseModel): error: float | None = None input_error: float | None = None precision: int | None = None + display: str | None = None + + # Each canonical leaf field paired with the ``input_*`` field that records its submitted form. + _INPUT_FIELD_OF: ClassVar[dict[str, str]] = { + "value": "input_value", + "unit": "input_unit", + "error": "input_error", + } + + @classmethod + def reserved_keys(cls) -> frozenset[str]: + """The keys reserved for annotated-value leaves — the model fields themselves. + + Callers may not use these as plain ``data`` keys; a stored leaf uses only these keys. + """ + return frozenset(cls.model_fields) + + @classmethod + def is_leaf(cls, node: Any) -> bool: + """True when ``node`` is a stored quantity leaf (numeric ``value`` + only reserved keys).""" + if not isinstance(node, dict): + return False + value = node.get("value") + if not isinstance(value, (int, float)) or isinstance(value, bool): + return False + return node.keys() <= cls.reserved_keys() + + @classmethod + def is_fragment(cls, node: Any) -> bool: + """True when ``node`` addresses fields *inside* a leaf (all keys reserved; ``value`` optional). + + Unlike :meth:`is_leaf` this does not require a numeric ``value``, so a partial fragment like + ``{'unit': 'kg'}`` qualifies. It lets a patch update a single field of a stored leaf; the strict + insert path still rejects reserved keys as plain keys, so fragments are a patch-only shape. + """ + return isinstance(node, dict) and bool(node) and node.keys() <= cls.reserved_keys() @classmethod def from_submission(cls, value: Any, unit: str | None) -> Self: @@ -215,11 +232,25 @@ def from_submission(cls, value: Any, unit: str | None) -> Self: # Precision is only recoverable from a string submission cap = settings.mpcontribs.float_precision precision = min(_count_sig_figs(value), cap) if isinstance(value, str) else None + return cls._from_parts(nominal, error, unit, precision=precision) + @classmethod + def _from_parts(cls, nominal: float, error: float | None, unit: str | None, *, precision: int | None) -> Self: + """Canonicalize a pre-split ``(nominal, error, unit)`` submission into a leaf. + + The post-parse half of :meth:`from_submission`, shared with :meth:`patch_leaf`: SI-convert + (propagating the uncertainty through Pint) when the unit is recognized, keep the ``input_*`` + provenance when a unit is present or canonicalization changed the magnitude, and carry + ``precision`` through. ``nominal``/``error`` are the submitted magnitude and uncertainty in + ``unit``. + """ + if unit: + unit = nfc_normalize(unit) # Canonicalize to SI base units when Pint recognizes the unit; otherwise keep the submitted form. canon_value, canon_unit, canon_error = nominal, unit, error if unit: try: + magnitude = ufloat(nominal, error) if error is not None else nominal quantity = _UREG.Quantity(magnitude, unit).to_base_units() except Exception: # broad catch: any Pint failure -> keep the submitted unit pass @@ -244,6 +275,50 @@ def from_submission(cls, value: Any, unit: str | None) -> Self: precision=precision, ) + @classmethod + def patch_leaf(cls, existing: dict[str, Any], overrides: dict[str, Any]) -> dict[str, Any]: + """Re-derive a stored quantity leaf after a partial patch, re-canonicalizing to SI. + + Handles conversion of values/errors/units during partial updates to keep coerced and + input values in-sync. + + Args: + existing: the stored leaf dict being patched (a quantity leaf). + overrides: the patch fragment (a subset of reserved leaf keys). + + Raises: + UnitError: if the merged magnitude cannot be parsed. + """ + + def submitted(canon_key: str) -> Any: + input_key = cls._INPUT_FIELD_OF[canon_key] + if canon_key in overrides: + return overrides[canon_key] + if input_key in overrides: + return overrides[input_key] + if existing.get(input_key) is not None: + return existing[input_key] + return existing.get(canon_key) + + unit = submitted("unit") + magnitude = _parse_magnitude(submitted("value")) + nominal, parsed_error = _split_ufloat(magnitude) + # An explicit error override wins; otherwise an uncertainty embedded in the magnitude wins; + # otherwise the existing submitted error carries over. + if "error" in overrides or "input_error" in overrides: + error = overrides.get("error", overrides.get("input_error")) + elif parsed_error is not None: + error = parsed_error + else: + error = submitted("error") + + precision = overrides.get("precision", existing.get("precision")) + leaf = cls._from_parts(nominal, error, unit, precision=precision).as_dict() + display = overrides.get("display", existing.get("display")) + if display is not None: + leaf["display"] = display + return leaf + @classmethod def try_from_value(cls, value: Any, key_unit: str | None) -> Self | None: """Build a leaf from an arbitrary scalar, or return ``None`` when it is categorical. @@ -305,7 +380,7 @@ def condition_key(conditions: dict[str, dict[str, Any] | str]) -> str: """ if not conditions: return "" - return ", ".join(f"{name}={AnnotatedData.identity_scalar(conditions[name])}" for name in sorted(conditions)) + return ", ".join(f"{name}={QuantityLeaf.identity_scalar(conditions[name])}" for name in sorted(conditions)) # Leading signed number of a magnitude string (mantissa only; stops at an exponent or uncertainty). @@ -347,12 +422,12 @@ def parse_condition_value(raw: str) -> dict[str, Any] | str: if not _NUMERIC_START.match(raw): return raw # Split the leading magnitude from the trailing unit ourselves, then build the leaf via - # AnnotatedData so conditions canonicalize exactly like measurement leaves (offset units included). + # QuantityLeaf so conditions canonicalize exactly like measurement leaves (offset units included). match = _MAGNITUDE_UNIT.match(raw) if match is None: return raw mag, unit = match.group("mag").strip(), match.group("unit").strip() try: - return AnnotatedData.from_submission(mag, unit or None).as_dict() + return QuantityLeaf.from_submission(mag, unit or None).as_dict() except UnitError: return raw From 69d975c6b118a75edf9f7ebc7fb699a8b3ba0943 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 17 Aug 2026 12:05:23 -0700 Subject: [PATCH 562/591] refactor(QuantityLeaf): further consolidated leaf-related logic --- .../mpcontribs_api/domains/_shared/units.py | 67 ++++++++++++++++- .../domains/contributions/data.py | 74 ++++++++++--------- 2 files changed, 106 insertions(+), 35 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/units.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/units.py index 20bfff9199..bca9e64dd9 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/units.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/units.py @@ -1,6 +1,6 @@ import math import re -from typing import Any, ClassVar, Self +from typing import Any, ClassVar, Self, cast import pint from pydantic import BaseModel @@ -319,6 +319,71 @@ def submitted(canon_key: str) -> Any: leaf["display"] = display return leaf + @classmethod + def patches_leaf(cls, target: Any, value: Any) -> bool: + """Whether ``value`` patches the stored quantity leaf ``target`` (vs. descending a group). + + True when ``target`` is a quantity leaf and ``value`` is either a bare scalar (updates the + magnitude) or a leaf fragment / whole leaf (updates named leaf fields). A plain group value + falls through to normal descent, even onto a leaf (a deliberate mixed-shape edge). + """ + return cls.is_leaf(target) and (not isinstance(value, dict) or cls.is_fragment(value)) + + @classmethod + def _leaf_overrides(cls, value: Any) -> dict[str, Any]: + """The submitted-field overrides a patch ``value`` applies to a stored leaf. + + A bare scalar means "new magnitude" (``{'value': scalar}``); a fragment/leaf dict is used as-is. + """ + return value if isinstance(value, dict) else {"value": value} + + @classmethod + def flatten_merge_paths(cls, existing: Any, patch: dict[str, Any], prefix: str = "") -> dict[str, Any]: + """Dotted ``$set`` paths that additively merge ``patch`` into the stored ``existing`` value. + + Resolves each patch entry against the *stored* shape so only named leaves are written and every + unmentioned sibling survives (the additive default). Per key: + + - a patch onto a stored quantity leaf (a bare scalar, or a fragment like ``{'unit': 'kg'}``) sets + the *whole* re-derived leaf (see :meth:`patch_leaf`), so its canonical and ``input_*`` halves + stay in sync — a sub-path ``$set`` couldn't re-convert the siblings; + - any other nested dict is descended (so a plain group sets only the named leaves, keeping siblings); + - any other scalar/list sets its path directly. + + An empty dict contributes nothing — merge never clears a subtree. + """ + paths: dict[str, Any] = {} + existing_dict = existing if isinstance(existing, dict) else None + for key, value in patch.items(): + path = f"{prefix}{key}" + target = existing_dict.get(key) if existing_dict is not None else None + if cls.patches_leaf(target, value): + paths[path] = cls.patch_leaf(cast(dict[str, Any], target), cls._leaf_overrides(value)) + elif isinstance(value, dict): + paths.update(cls.flatten_merge_paths(target, value, prefix=f"{path}.")) + else: + paths[path] = value + return paths + + @classmethod + def merge_data(cls, existing: Any, patch: dict[str, Any]) -> dict[str, Any]: + """The post-merge view of ``existing`` after applying ``patch``, matching :meth:`flatten_merge_paths`. + + Used to resolve identity (``unique_value``) against the same state the dotted ``$set`` will leave + behind, without re-reading after the write. Follows the identical per-key rule: re-derive a stored + quantity leaf that the patch touches, else descend nested dicts, else replace the key. + """ + merged = dict(existing) if isinstance(existing, dict) else {} + for key, value in patch.items(): + target = merged.get(key) + if cls.patches_leaf(target, value): + merged[key] = cls.patch_leaf(cast(dict[str, Any], target), cls._leaf_overrides(value)) + elif isinstance(value, dict): + merged[key] = cls.merge_data(target, value) + else: + merged[key] = value + return merged + @classmethod def try_from_value(cls, value: Any, key_unit: str | None) -> Self | None: """Build a leaf from an arbitrary scalar, or return ``None`` when it is categorical. diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/data.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/data.py index 0dddd2e6f2..c70c3eacd4 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/data.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/data.py @@ -1,10 +1,12 @@ from dataclasses import dataclass, field +from functools import partial from typing import Annotated, Any from pydantic import BeforeValidator from mpcontribs_api.config import get_settings from mpcontribs_api.domains._shared.types import to_snake_case +from mpcontribs_api.domains._shared.units import QuantityLeaf from mpcontribs_api.exceptions import DataKeyError, ValidationError settings = get_settings() @@ -76,23 +78,6 @@ def parse_annotated_key(key: str) -> ParsedKey: return ParsedKey(path=path, unit=unit, conditions=conditions) -# Users cannot use these values in their Contributions.data key names - reserved for describing numeric values -RESERVED_LEAF_KEYS = frozenset( - {"value", "unit", "input_value", "input_unit", "error", "input_error", "precision", "display"} -) - - -def is_quantity_leaf(node: Any) -> bool: - """True when ``node`` is a stored quantity leaf (numeric ``value`` + only reserved keys.""" - if not isinstance(node, dict): - return False - value = node.get("value") - if not isinstance(value, (int, float)) or isinstance(value, bool): - return False - # node.keys is a subset of RESERVED_LEAF_KEYS - return node.keys() <= RESERVED_LEAF_KEYS - - def _coerce_key(key: Any) -> str: """Coerce one dict key to ``snake_case``, rejecting non-ASCII or empty-after-coercion keys.""" if not isinstance(key, str) or not key.isascii(): @@ -130,7 +115,7 @@ def coerce_keys(value: Any) -> Any: def _get_dict_depth(x: Any) -> int: # If x is a leaf (value + metadata) dict it counts as a single level of nesting (treat it as scalar) - if is_quantity_leaf(x): + if QuantityLeaf.is_leaf(x): return 0 if isinstance(x, dict): return 1 + max((_get_dict_depth(v) for v in x.values()), default=0) @@ -164,39 +149,46 @@ def _validate_plain_key(key: Any) -> None: coerced = to_snake_case(key) if not coerced: raise ValidationError(f"data key '{key}' reduces to an empty string after snake_case coercion") - if coerced in RESERVED_LEAF_KEYS: + if coerced in QuantityLeaf.reserved_keys(): raise ValidationError( f"data key '{key}' is reserved for annotated-value leaves and may not be used", key=key, - reserved=sorted(RESERVED_LEAF_KEYS), + reserved=sorted(QuantityLeaf.reserved_keys()), ) -def _validate_nested_keys(value: Any) -> None: +def _validate_nested_keys(value: Any, *, allow_leaf_fragments: bool = False) -> None: if isinstance(value, dict): - _validate_keys(value) + _validate_keys(value, allow_leaf_fragments=allow_leaf_fragments) elif isinstance(value, list): for item in value: - _validate_nested_keys(item) + _validate_nested_keys(item, allow_leaf_fragments=allow_leaf_fragments) + +def _validate_keys(data: dict[str, Any] | None, *, allow_leaf_fragments: bool = False) -> dict[str, Any] | None: + """Strict plain-key validation for a single dict level (used for nested levels). -def _validate_keys(data: dict[str, Any] | None) -> dict[str, Any] | None: - """Strict plain-key validation for a single dict level (used for nested levels).""" + With ``allow_leaf_fragments`` (the patch/merge path), a dict whose keys are all reserved leaf + keys is accepted as a terminal fragment addressing fields *inside* a stored quantity leaf (e.g. + ``{'unit': 'kg'}``); the strict insert path leaves this off and rejects reserved keys as plain keys. + """ if data is None: return None # A server-built quantity leaf legitimately uses the reserved key names; do not descend into it # (re-validation after normalization/expansion would otherwise reject its own keys). - if is_quantity_leaf(data): + if QuantityLeaf.is_leaf(data): + return data + if allow_leaf_fragments and QuantityLeaf.is_fragment(data): return data for key in data: _validate_plain_key(key) # Recurse into nested dicts, including dicts nested inside lists. for v in data.values(): - _validate_nested_keys(v) + _validate_nested_keys(v, allow_leaf_fragments=allow_leaf_fragments) return data -def _validate_data_keys(data: dict[str, Any] | None) -> dict[str, Any] | None: +def _validate_data_keys(data: dict[str, Any] | None, *, allow_leaf_fragments: bool = False) -> dict[str, Any] | None: """Top-level ``data`` key validation, allowing the annotated pattern. Each top-level key may be either a plain key or the annotated form @@ -204,6 +196,9 @@ def _validate_data_keys(data: dict[str, Any] | None) -> dict[str, Any] | None: held to the same plain-key rules (units are unconstrained); nested levels stay strictly plain. Expansion (see :mod:`mpcontribs_api.domains.contributions.pivot`) later rewrites annotated keys into plain ones, so stored keys always satisfy :func:`_validate_keys`. + + ``allow_leaf_fragments`` is threaded to nested levels only (the patch/merge path); top-level keys + stay strict, since a reserved key at the root addresses no leaf. """ if data is None: return None @@ -224,18 +219,29 @@ def _validate_data_keys(data: dict[str, Any] | None) -> dict[str, Any] | None: for condition_name in parsed.conditions: _validate_plain_key(condition_name) for v in data.values(): - _validate_nested_keys(v) + _validate_nested_keys(v, allow_leaf_fragments=allow_leaf_fragments) return data -def validate_contribution_data(data: dict[str, Any] | None) -> dict[str, Any] | None: - """Run the full write-path ``data`` validation (depth + annotated/plain keys).""" +def validate_contribution_data( + data: dict[str, Any] | None, *, allow_leaf_fragments: bool = False +) -> dict[str, Any] | None: + """Run the write-path ``data`` validation (depth + annotated/plain keys). + + ``allow_leaf_fragments`` (the merge-patch path) additionally accepts a nested dict of only reserved + leaf keys as a terminal fragment addressing a field inside a stored quantity leaf (e.g. ``{'bandgap': + {'unit': 'kg'}}``). The strict insert path rejects reserved keys as plain keys; a whole-dict + overwrite (``replace_data=True``) re-runs this strictly, since the payload becomes a full document. + """ _validate_data_depth(data) - _validate_data_keys(data) + _validate_data_keys(data, allow_leaf_fragments=allow_leaf_fragments) return data -ContributionData = Annotated[ +# Two field types over the same validator: inserts/whole-document writes are strict; a merge patch +# additionally permits leaf fragments (see ``allow_leaf_fragments`` above). +ContributionData = Annotated[dict[str, Any] | None, BeforeValidator(validate_contribution_data)] +ContributionPatchData = Annotated[ dict[str, Any] | None, - BeforeValidator(validate_contribution_data), + BeforeValidator(partial(validate_contribution_data, allow_leaf_fragments=True)), ] From 7069e1d957827273f4ff5a995b84c9b2a923fc6d Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 17 Aug 2026 12:07:06 -0700 Subject: [PATCH 563/591] refactor(contributions/models.py): added project filters to ContributionFilter and removed ContributionBulkUpdate Bulk updates to contributions now permit all fields to be set rather than just 'is_public' --- .../domains/contributions/models.py | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py index 90016969c1..32b8372fc4 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py @@ -23,7 +23,7 @@ from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut from mpcontribs_api.domains._shared.types import ChemicalSystemId, Formula, Identity, MaterialId, Scalar, ShortStr from mpcontribs_api.domains.attachments.models import Attachment, AttachmentFilter, AttachmentIn -from mpcontribs_api.domains.contributions.data import ContributionData +from mpcontribs_api.domains.contributions.data import ContributionData, ContributionPatchData from mpcontribs_api.domains.structures.models import Structure, StructureFilter, StructureIn from mpcontribs_api.domains.tables.models import Table, TableFilter, TableIn from mpcontribs_api.exceptions import ValidationError @@ -333,7 +333,9 @@ class ContributionPatch(SparseFieldsModel): chemical_system_id: ChemicalSystemId | None = None formula: Formula | None = None is_public: bool | None = None - data: ContributionData = Field(default=None, description=CONTRIBUTION_DATA_INPUT_DESCRIPTION) + # Permissive validator: a merge patch may address a single field inside a stored quantity leaf + # (e.g. ``{"bandgap": {"unit": "kg"}}``). replace_data=True re-validates strictly in the service. + data: ContributionPatchData = Field(default=None, description=CONTRIBUTION_DATA_INPUT_DESCRIPTION) structures: list[Link[Structure]] | None = None tables: list[Link[Table]] | None = None attachments: list[Link[Attachment]] | None = None @@ -344,6 +346,10 @@ class ContributionFilter(BaseFilter): id__in: list[PydanticObjectId] | None = None id__neq: PydanticObjectId | None = None + project: str | None = None + project__in: list[ShortStr] | None = None + project__neq: str | None = None + material_id: str | None = None material_id__in: list[ShortStr] | None = None material_id__neq: ShortStr | None = None @@ -390,10 +396,3 @@ def convert_str_to_oid(cls, v: str): "Invalid ObjectId format. Must be 12-byte input or a 24-character hex string", oid=v, ) from err - - -# Right now, only is_public makes sense to update across multiple Contributions -class ContributionBulkUpdate(BaseModel): - """Body of the filtered bulk-update route (``PATCH /api/v1/contributions``).""" - - is_public: bool From 1f971127bf891cc16a9a3652c14d39b6a8df9436 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 17 Aug 2026 12:08:20 -0700 Subject: [PATCH 564/591] refactor(pivot.py-and-stats.py): use QuantityLeaf --- .../src/mpcontribs_api/domains/contributions/pivot.py | 8 ++++---- .../src/mpcontribs_api/domains/contributions/stats.py | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/pivot.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/pivot.py index b486459b3c..a3d4bb845d 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/pivot.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/pivot.py @@ -2,7 +2,7 @@ from typing import TYPE_CHECKING, Any from mpcontribs_api.domains._shared.types import to_snake_case -from mpcontribs_api.domains._shared.units import AnnotatedData, UnitError, parse_condition_value +from mpcontribs_api.domains._shared.units import QuantityLeaf, UnitError, parse_condition_value from mpcontribs_api.domains.contributions.data import ( ParsedKey, parse_annotated_key, @@ -70,7 +70,7 @@ def normalize_node(value: Any, key_unit: str | None = None) -> Any: - **list**: elements recurse, but scalar elements are left verbatim (a list is array data, not a column of measurements — mirrors :func:`mpcontribs_api.domains.contributions.stats.iter_leaves`, which never treats list scalars as columns). - - **scalar**: promoted to a quantity leaf via :meth:`AnnotatedData.try_from_value` when it parses + - **scalar**: promoted to a quantity leaf via :meth:`QuantityLeaf.try_from_value` when it parses as a number (optionally carrying a unit); otherwise kept verbatim (categorical string, bool). ``key_unit`` (from a top-level annotated key) is applied only to a scalar value; when it labels a @@ -93,7 +93,7 @@ def normalize_node(value: Any, key_unit: str | None = None) -> Any: if isinstance(value, list): return [normalize_node(item) for item in value] try: - leaf = AnnotatedData.try_from_value(value, key_unit) + leaf = QuantityLeaf.try_from_value(value, key_unit) except UnitError as err: raise ValidationError(f"could not parse value {value!r}: {err}") from err return leaf.as_dict() if leaf is not None else value @@ -142,7 +142,7 @@ def expand_data(data: dict[str, Any]) -> list[ExpandedData]: if cname in parsed_conditions: raise ValidationError(f"condition names collide after snake_case coercion: '{cname}'") parsed_conditions[cname] = parse_condition_value(val) - ckey = AnnotatedData.condition_key(parsed_conditions) + ckey = QuantityLeaf.condition_key(parsed_conditions) groups.setdefault(ckey, []).append((raw_key, pk)) # First signature seen for this canonical key wins the stored condition columns. group_conditions.setdefault(ckey, parsed_conditions) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/stats.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/stats.py index adca710940..920318c3c3 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/stats.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/stats.py @@ -2,7 +2,7 @@ from dataclasses import dataclass, field from typing import Any -from mpcontribs_api.domains.contributions.data import is_quantity_leaf +from mpcontribs_api.domains._shared.units import QuantityLeaf # Sentinel unit for a column whose leaves are not numeric (see module docstring). NON_NUMERIC_UNIT = "NaN" @@ -44,7 +44,7 @@ def iter_leaves(data: dict[str, Any], prefix: str = "") -> Iterator[tuple[str, f for key, node in data.items(): path = f"{prefix}.{key}" if prefix else key if isinstance(node, dict): - if is_quantity_leaf(node): + if QuantityLeaf.is_leaf(node): yield path, float(node["value"]), node.get("unit") else: yield from iter_leaves(node, path) From b4652d9c01020f4b281ed4b3ca5ea42adee9983e Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 17 Aug 2026 12:12:16 -0700 Subject: [PATCH 565/591] refactor(ContributionMongoDbRepository): patching Contribution.data does not default to a dict overwrite updating Contribution.data appends/updates specific fields rather than overwriting the entire dict. Full replacements can still be performed by passing 'replace_data=true' --- .../domains/contributions/repository.py | 85 ++++++++++--------- 1 file changed, 44 insertions(+), 41 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py index 92b777039c..b4a5d6a8dd 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py @@ -13,7 +13,7 @@ from mpcontribs_api.domains._shared.bulk import BulkUpdateSummary from mpcontribs_api.domains._shared.repository import MongoDbRepository from mpcontribs_api.domains._shared.types import DownloadFormat, ShortMimeFormat -from mpcontribs_api.domains.contributions.data import is_quantity_leaf +from mpcontribs_api.domains._shared.units import QuantityLeaf from mpcontribs_api.domains.contributions.models import ( Contribution, ContributionFilter, @@ -36,47 +36,21 @@ _UNSET: Any = object() -def _is_atomic_leaf(value: Any) -> bool: - """Whether a merge should replace ``value`` whole rather than descend into it. - - Non-dicts (scalars, lists) are always atomic. A dict is atomic only when it is a quantity leaf - (see :func:`mpcontribs_api.domains.contributions.data.is_quantity_leaf`); plain nested group dicts are - *not* atomic so their sibling keys survive the merge. - """ - return not isinstance(value, dict) or is_quantity_leaf(value) - - -def _flatten_for_merge(prefix: str, value: dict[str, Any]) -> dict[str, Any]: - """Flatten a nested dict into ``{dotted.path: leaf}`` entries for a merge ``$set``. - - Recurses through plain group dicts so ``$set`` touches only the leaves named in the patch and - every unmentioned sibling key is preserved; stops at atomic leaves (see :func:`_is_atomic_leaf`). - An empty dict contributes nothing — merge adds/overwrites leaves, it never clears a subtree. - """ - flattened: dict[str, Any] = {} - for key, leaf in value.items(): - path = f"{prefix}.{key}" - if _is_atomic_leaf(leaf): - flattened[path] = leaf - else: - flattened.update(_flatten_for_merge(path, leaf)) - return flattened - - -def _build_update_set(update_data: dict[str, Any], *, replace_data: bool) -> dict[str, Any]: +def _build_update_set(update_data: dict[str, Any], existing_data: Any, *, replace_data: bool) -> dict[str, Any]: """Translate a patch's field map into the document handed to ``$set``. - With ``replace_data`` the map is used verbatim, so a dict field (``data``) overwrites the stored - value whole. Otherwise dict-valued fields are flattened to dotted paths so they deep-merge into - the stored dict — adding/overwriting only the named leaves — while scalar and list fields always + With ``replace_data`` the map is used verbatim, so ``data`` overwrites the stored dict whole. + Otherwise the ``data`` dict is flattened against the stored ``existing_data`` into dotted paths + so it additively merges — only the named leaves are written, a bare scalar routes onto a stored + quantity leaf's ``value``, sibling survives. All other fields (scalars, lists, identity inputs) set directly. """ if replace_data: return update_data document: dict[str, Any] = {} for field, value in update_data.items(): - if isinstance(value, dict): - document.update(_flatten_for_merge(field, value)) + if field == "data" and isinstance(value, dict): + document.update(QuantityLeaf.flatten_merge_paths(existing_data, value, prefix="data.")) else: document[field] = value return document @@ -136,17 +110,27 @@ async def patch_contribution_by_id( id: str, update: ContributionPatch, unique_value: Scalar | None = _UNSET, + *, + replace_data: bool = False, + existing_data: Any = None, ): """Partially update a contribution by id, scoped to the current user. ``unique_value`` is server-recomputed by the service when the patch changes ``data`` or ``project`` (the inputs to identity); left as ``_UNSET`` it is not touched. When set, it is folded into the ``$set`` so the identity index stays consistent with the patched ``data``. + + ``data`` additively merges into the stored dict by default (unmentioned leaves survive, and a + bare scalar routes onto a stored quantity leaf's ``value``); the merge is resolved against the + caller-supplied ``existing_data``. Pass ``replace_data`` to overwrite the whole ``data`` dict + instead. See ``_build_update_set``. """ try: if unique_value is _UNSET: return await self.patch(self._convert_object_id(id), update) - update_data = update.model_dump(exclude_unset=True) + update_data = _build_update_set( + update.model_dump(exclude_unset=True), existing_data, replace_data=replace_data + ) update_data["unique_value"] = unique_value query = self.document_model.find_one( self._scope, @@ -181,15 +165,16 @@ async def bulk_update( self, filter: ContributionFilter, fields: dict[str, Any], - *, - project_constraint: frozenset[str] | None, ) -> BulkUpdateSummary: - """``$set`` ``fields`` on every scoped row matching ``filter``, optionally limited to projects. + """``$set`` ``fields`` on every scoped row matching ``filter``. + + Callers that need to limit the update to specific projects (e.g. a non-admin's writable + projects) inject them into ``filter`` via ``project__in`` rather than a separate argument + here. Args: filter: the caller-supplied query, applied on top of the user scope fields: the field/value map handed verbatim to ``$set`` - project_constraint: projects the update is limited to, or ``None`` for no limit Returns: BulkUpdateSummary: the counts of matched and modified contribs, and the list of the projects changed @@ -197,8 +182,6 @@ async def bulk_update( criteria: list[Any] = [] if self._scope: criteria.append(self._scope) - if project_constraint is not None: - criteria.append({"project": {"$in": sorted(project_constraint)}}) query = filter.filter(self.document_model.find(*criteria)).get_filter_query() collection = self.document_model.get_pymongo_collection() # Distinct projects among the *matched* rows (computed before the write, since ``fields`` may @@ -209,6 +192,26 @@ async def bulk_update( matched=result.matched_count, modified=result.modified_count, projects=sorted(projects) ) + async def get_contribution_ids( + self, + filter: ContributionFilter, + ) -> list[PydanticObjectId]: + """Return the ids of scoped rows matching ``filter``. + + Callers that need to limit the match to specific projects (e.g. a non-admin's writable + projects on a bulk write) inject them into ``filter`` via ``project__in`` rather than a + separate argument here. + + Args: + filter: the caller-supplied query, applied on top of the user scope + """ + criteria: list[Any] = [] + if self._scope: + criteria.append(self._scope) + query = filter.filter(self.document_model.find(*criteria)).get_filter_query() + collection = self.document_model.get_pymongo_collection() + return [doc["_id"] async for doc in collection.find(query, {"_id": 1})] + async def insert_many_contributions( self, docs: list[Contribution], From a0c2c58a4d5fe4b1d17e6738a0cfb63662cd0745 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 17 Aug 2026 12:13:19 -0700 Subject: [PATCH 566/591] refactor(ContributionRouter): wiring in changes to patching contributions --- .../domains/contributions/router.py | 29 ++++++++++++++----- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py index eef46f9441..662cbc5529 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py @@ -17,7 +17,6 @@ from mpcontribs_api.domains.contributions.dependencies import ContributionDep, ContributionServiceDep from mpcontribs_api.domains.contributions.models import ( Contribution, - ContributionBulkUpdate, ContributionFilter, ContributionIn, ContributionOut, @@ -74,17 +73,21 @@ async def delete_contributions( @router.patch("", dependencies=[Depends(require_user)]) -async def bulk_update_contributions( +async def patch_contributions( service: ContributionServiceDep, - body: ContributionBulkUpdate, + body: ContributionPatch, filter: ContributionFilter = FilterDepends(ContributionFilter), + replace_data: bool = False, ) -> BulkUpdateSummary: """Update every contribution matching ``filter`` that the caller may write. - The update is constrained to the caller's writable projects (admins are unconstrained), so a - filter that also matches public contributions in other projects leaves those untouched. + Allows updates within the user's scope. If Identity fields are modified, updates occur per-row, + and may result in failures reported in BulkUpdateSummary.failed + + ``data`` deep-merges into each row's stored ``data`` by default + Pass ``?replace_data=true`` to overwrite the whole ``data`` dict instead. """ - return await service.bulk_update(filter=filter, update=body) + return await service.bulk_update(filter=filter, update=body, replace_data=replace_data) # TODO: Might want to take contributions in from request body and run model_validate_json on it (much faster) @@ -158,5 +161,15 @@ async def upsert_contribution_by_id(service: ContributionServiceDep, id: str, co @router.patch("/{id}", dependencies=[Depends(require_user)]) -async def patch_contribution_by_id(service: ContributionServiceDep, id: str, update: ContributionPatch): - return await service.patch_contribution_by_id(id=id, update=update) +async def patch_contribution_by_id( + service: ContributionServiceDep, + id: str, + update: ContributionPatch, + replace_data: bool = False, +): + """Patch one contribution by id. + + ``data`` deep-merges into the stored ``data`` by default (unmentioned leaves survive); pass + ``?replace_data=true`` to overwrite the whole ``data`` dict instead. + """ + return await service.patch_contribution_by_id(id=id, update=update, replace_data=replace_data) From 4db3ac3083ffb15dffbbe4ff0a67c9c2b853f073 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 17 Aug 2026 12:16:10 -0700 Subject: [PATCH 567/591] feat(ContributionService): service-level changes to allow for non-destructive modification of Contribution.data in bulk and single patch cases --- .../domains/contributions/service.py | 112 +++++++++++++++--- 1 file changed, 97 insertions(+), 15 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py index 245e93ca17..3ddacf8ea6 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py @@ -20,11 +20,12 @@ bulk_failure_from_exception, ) from mpcontribs_api.domains._shared.repository import MongoDbRepository +from mpcontribs_api.domains._shared.units import QuantityLeaf from mpcontribs_api.domains.attachments.repository import MongoDbAttachmentRepository from mpcontribs_api.domains.consumers.models import ConsumerSettings +from mpcontribs_api.domains.contributions.data import validate_contribution_data from mpcontribs_api.domains.contributions.models import ( Contribution, - ContributionBulkUpdate, ContributionFilter, ContributionIdentity, ContributionIn, @@ -666,28 +667,87 @@ async def _bounded_upsert(item: PreparedWrite) -> Contribution | BulkFailure: await self.update_project({doc.project for doc in succeeded}) return BulkWriteSummary[Contribution](total=len(contributions), succeeded=succeeded, failed=failed) - async def bulk_update(self, filter: ContributionFilter, update: ContributionBulkUpdate) -> BulkUpdateSummary: - """Apply a filtered field update to every contribution matching ``filter`` the caller may write. + async def bulk_update( + self, + filter: ContributionFilter, + update: ContributionPatch, + *, + replace_data: bool = False, + ) -> BulkUpdateSummary: + """Apply a filtered patch to every contribution matching ``filter`` the caller may write. + + Updates constrained to user's scope. Only the touched projects' rollups are recomputed. + + Two shapes, chosen by which fields the patch touches: - Scoped to Contributions that a user can write to. Only the touched projects' rollups afterward, as the - other write paths do. + - **Fast path** — the patch touches no identity input. A single ``$set`` is applied to every + matched row in one ``update_many``. + - **Per-row path** — the patch changes an Identifer field (or ``data``). Each matched row is + patched individually via ``patch_contribution_by_id`` and any per-row conflict is reported + in ``failed``. + + A ``data`` patch deep-merges into each row's stored ``data`` by default (unmentioned leaves + survive); pass ``replace_data`` to overwrite the whole ``data`` dict instead. Args: filter: the contributions to target, applied on top of the user scope - update: the fields to set; every field the caller supplied is applied verbatim + update: the fields to patch; unset fields are left untouched + replace_data: overwrite ``data`` wholesale rather than merging into the stored dict Returns: - BulkUpdateSummary: matched/modified counts and the projects touched + BulkUpdateSummary: matched/modified counts, the projects touched, and per-row failures """ fields = update.model_dump(exclude_unset=True) if not fields: # Nothing to set: MongoDB rejects an empty $set, so short-circuit with a no-op result. return BulkUpdateSummary(matched=0, modified=0, projects=[]) - # Admins may write any project; everyone else is limited to the projects they own/contribute to. - project_constraint = None if self._user.is_admin else self._user.writable_projects - update_summary = await self._contributions.bulk_update(filter, fields, project_constraint=project_constraint) - await self.update_project(project_ids=update_summary.projects) - return update_summary + filter = ( + filter + if self._user.is_admin + else filter.model_copy(update={"project__in": sorted(self._user.writable_projects)}) + ) + + touches_identity = bool(ContributionIdentity.model_fields() & fields.keys()) or "data" in fields + if not touches_identity: + # No identity/unique_value recompute needed, so a uniform $set is safe. + summary = await self._contributions.bulk_update(filter, fields) + await self.update_project(project_ids=summary.projects) + return summary + + return await self._bulk_patch_per_row(filter, update, replace_data=replace_data) + + async def _bulk_patch_per_row( + self, + filter: ContributionFilter, + update: ContributionPatch, + *, + replace_data: bool = False, + ) -> BulkUpdateSummary: + """Patch each row matching ``filter`` individually. + + Concurrently validates reach contribution's identity, reporting failures in ``BulkUpdateSummary.failed``. + """ + ids = await self._contributions.get_contribution_ids(filter) + if not ids: + return BulkUpdateSummary(matched=0, modified=0, projects=[]) + + sem = asyncio.Semaphore(self._settings.max_concurrent_transactions) + + async def _patch_one(index: int, oid: PydanticObjectId) -> Contribution | BulkFailure: + async with sem: + try: + return await self.patch_contribution_by_id(str(oid), update, replace_data=replace_data) + except Exception as exc: + logger.info("bulk_patch_item_failed", id=str(oid)) + return bulk_failure_from_exception(index, {"id": str(oid)}, exc) + + results = await asyncio.gather(*[_patch_one(i, oid) for i, oid in enumerate(ids)]) + succeeded = [r for r in results if not isinstance(r, BulkFailure)] + failed = [r for r in results if isinstance(r, BulkFailure)] + projects = {doc.project for doc in succeeded if doc.project is not None} + # Update the project to keep columns and stats in-sync + await self.update_project(projects) + return BulkUpdateSummary(matched=len(ids), modified=len(succeeded), projects=sorted(projects), failed=failed) async def _resolve_unique_value(self, project: str, data: dict | None) -> Scalar | None: """Resolve the identity value for one contribution from its project's ``unique_column``. @@ -723,7 +783,9 @@ async def upsert_contribution_by_id(self, id: str, contribution: ContributionIn) unique_value = await self._resolve_unique_value(contribution.project, contribution.data) return await self._contributions.upsert_contribution_by_id(id, contribution, unique_value) - async def patch_contribution_by_id(self, id: str, update: ContributionPatch) -> Contribution: + async def patch_contribution_by_id( + self, id: str, update: ContributionPatch, *, replace_data: bool = False + ) -> Contribution: """Patch a single contribution by id. Re-reads the existing document when the patch touches identity inputs, to (a) recompute @@ -731,6 +793,13 @@ async def patch_contribution_by_id(self, id: str, update: ContributionPatch) -> against the *merged* state when ``material_id``/``chemical_system_id``/``formula``. Metadata-only patches (e.g. ``is_public``) skip the read entirely, so they don't risk failing on a legacy document missing the unique_column value. + + ``data`` additively merges into the stored dict by default so unmentioned leaves survive (a + bare scalar routes onto a stored quantity leaf's ``value``); pass ``replace_data`` to overwrite + the whole ``data`` dict. On replace the payload becomes a standalone document, so it is + re-validated strictly (the permissive patch validator allows leaf fragments a full doc may not). + ``unique_value`` is resolved against the same post-write view the repository will persist, and + that view (``existing_data``) is handed to the repository so its dotted ``$set`` agrees. """ set_fields = update.model_dump(exclude_unset=True) touches_unique = "data" in set_fields or "project" in set_fields @@ -738,6 +807,10 @@ async def patch_contribution_by_id(self, id: str, update: ContributionPatch) -> if not touches_unique and not touches_identity: return await self._contributions.patch_contribution_by_id(id, update) + if replace_data and set_fields.get("data") is not None: + # A whole-dict overwrite must satisfy the strict insert-path rules (no leaf fragments). + validate_contribution_data(set_fields["data"]) + existing = await self._contributions.get_contribution_by_id(id, fields=None) if existing is None or existing.project is None: raise NotFoundError(f"contribution '{id}' not found") @@ -753,9 +826,18 @@ async def patch_contribution_by_id(self, id: str, update: ContributionPatch) -> return await self._contributions.patch_contribution_by_id(id, update) project = set_fields.get("project") or existing.project - data = set_fields["data"] if "data" in set_fields else existing.data + # Resolve unique_value against the data the write will actually leave behind: the merged view + # when merging (so an untouched unique_column value survives), or the patch's data on replace. + if "data" not in set_fields: + data = existing.data + elif replace_data: + data = set_fields["data"] + else: + data = QuantityLeaf.merge_data(existing.data, set_fields["data"]) unique_value = await self._resolve_unique_value(project, data) - return await self._contributions.patch_contribution_by_id(id, update, unique_value=unique_value) + return await self._contributions.patch_contribution_by_id( + id, update, unique_value=unique_value, replace_data=replace_data, existing_data=existing.data + ) @staticmethod def _validate_identifier_hierarchy_merged( From 1a150f650f0ddf0f11602618a276532b3c172e15 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 17 Aug 2026 12:17:18 -0700 Subject: [PATCH 568/591] test(tests): tests for Contribution and unit.py refactors Primarily focused on additive Contribution.data logic --- .../tests/integration/db/test_bulk_publish.py | 130 ++++++++++++- .../integration/test_contributions_routes.py | 40 +++- .../unit/domains/test_conditions_fuzz.py | 28 +-- .../domains/test_contribution_repository.py | 156 ++++++++-------- .../unit/domains/test_contribution_service.py | 62 ++++++- .../unit/domains/test_contribution_stats.py | 2 +- .../tests/unit/domains/test_units.py | 173 ++++++++++++------ 7 files changed, 434 insertions(+), 157 deletions(-) diff --git a/mpcontribs-api/tests/integration/db/test_bulk_publish.py b/mpcontribs-api/tests/integration/db/test_bulk_publish.py index 0acb0022ae..8615b25a58 100644 --- a/mpcontribs-api/tests/integration/db/test_bulk_publish.py +++ b/mpcontribs-api/tests/integration/db/test_bulk_publish.py @@ -1,10 +1,10 @@ import pytest from mpcontribs_api.authz import User +from mpcontribs_api.domains._shared.units import QuantityLeaf from mpcontribs_api.domains.attachments.repository import MongoDbAttachmentRepository from mpcontribs_api.domains.contributions.models import ( Contribution, - ContributionBulkUpdate, ContributionFilter, ContributionIn, ContributionPatch, @@ -64,7 +64,7 @@ async def test_publishes_only_writable_projects(self, db, mongo_client): b = await _insert(PROJ_B, "c1", is_public=False) summary = await _service(mongo_client, ALICE).bulk_update( - ContributionFilter(), ContributionBulkUpdate(is_public=True) + ContributionFilter(), ContributionPatch(is_public=True) ) assert summary.projects == [PROJ_A] @@ -78,7 +78,7 @@ async def test_public_in_other_project_not_modified(self, db, mongo_client): b = await _insert(PROJ_B, "pub", is_public=True) summary = await _service(mongo_client, ALICE).bulk_update( - ContributionFilter(is_public=True), ContributionBulkUpdate(is_public=False) + ContributionFilter(is_public=True), ContributionPatch(is_public=False) ) assert (summary.matched, summary.modified) == (0, 0) @@ -90,7 +90,7 @@ async def test_admin_is_unconstrained_by_project(self, db, mongo_client): b = await _insert(PROJ_B, "c1", is_public=False) summary = await _service(mongo_client, ADMIN).bulk_update( - ContributionFilter(), ContributionBulkUpdate(is_public=True) + ContributionFilter(), ContributionPatch(is_public=True) ) assert set(summary.projects) == {PROJ_A, PROJ_B} @@ -109,3 +109,125 @@ async def test_patch_by_id_publishes_single_contribution(self, db, mongo_client) assert result.is_public is True assert await _is_public(a.id) is True + + +async def _insert_row(project: str, *, formula: str, data: dict) -> Contribution: + """Insert one contribution with a chosen formula/data so callers control the identity tuple.""" + doc = Contribution.from_input_model( + ContributionIn(project=project, chemical_system_id="Fe-O", formula=formula, data=data) + ) + await doc.insert() + return doc + + +async def _reload(cid) -> Contribution: + found = await Contribution.find_one(Contribution.id == cid) + assert found is not None + return found + + +class TestBulkPatchPerRow: + """Filter patches that touch identity inputs run per row (recompute + collision reporting).""" + + async def test_bulk_data_patch_merges_into_every_matched_row(self, db, mongo_client): + # Two distinct identities in Alice's writable project; a data patch is merged into both so + # each row keeps its own pre-existing ``x`` and gains the patched ``y``. + a = await _insert_row(PROJ_A, formula="Fe2O3", data={"x": 1.0}) + b = await _insert_row(PROJ_A, formula="Fe3O4", data={"x": 2.0}) + + summary = await _service(mongo_client, ALICE).bulk_update( + ContributionFilter(chemical_system_id="Fe-O"), ContributionPatch(data={"y": 9.0}) + ) + + assert (summary.matched, summary.modified) == (2, 2) + assert summary.projects == [PROJ_A] + assert summary.failed == [] + # Additive by default: the unmentioned ``x`` survives on each row; ``y`` is added. + assert (await _reload(a.id)).data == {"x": 1.0, "y": 9.0} + assert (await _reload(b.id)).data == {"x": 2.0, "y": 9.0} + + async def test_bulk_data_patch_replaces_data_when_replace_data_set(self, db, mongo_client): + # replace_data=True overwrites each row's ``data`` wholesale, dropping the unmentioned ``x``. + a = await _insert_row(PROJ_A, formula="Fe2O3", data={"x": 1.0}) + b = await _insert_row(PROJ_A, formula="Fe3O4", data={"x": 2.0}) + + summary = await _service(mongo_client, ALICE).bulk_update( + ContributionFilter(chemical_system_id="Fe-O"), + ContributionPatch(data={"y": 9.0}), + replace_data=True, + ) + + assert (summary.matched, summary.modified) == (2, 2) + for cid in (a.id, b.id): + assert (await _reload(cid)).data == {"y": 9.0} + + async def test_bare_scalar_updates_quantity_leaf_magnitude(self, db, mongo_client): + # A stored quantity leaf is conceptually a scalar: a bare-scalar patch is the new submitted + # magnitude. The leaf is re-derived end-to-end (unit kept, input_value updated), and the + # persisted leaf matches the pure patch_leaf helper. + leaf = QuantityLeaf.from_submission(2.0, "m").as_dict() + c = await _insert_row(PROJ_A, formula="Fe2O3", data={"bandgap": leaf}) + + summary = await _service(mongo_client, ALICE).bulk_update( + ContributionFilter(chemical_system_id="Fe-O"), ContributionPatch(data={"bandgap": 5.0}) + ) + + assert (summary.matched, summary.modified) == (1, 1) + reloaded = (await _reload(c.id)).data["bandgap"] + assert reloaded == QuantityLeaf.patch_leaf(leaf, {"value": 5.0}) + assert reloaded["input_value"] == 5.0 + assert reloaded["unit"] == "m" + + async def test_unit_change_re_syncs_and_re_converts_leaf(self, db, mongo_client): + # Updating the unit re-canonicalizes the whole leaf: input_unit tracks the new unit and the + # canonical value/error are re-converted to SI (2 m -> input 2 km -> 2000 m). + leaf = QuantityLeaf.from_submission(2.0, "m").as_dict() + c = await _insert_row(PROJ_A, formula="Fe2O3", data={"bandgap": leaf}) + + summary = await _service(mongo_client, ALICE).bulk_update( + ContributionFilter(chemical_system_id="Fe-O"), ContributionPatch(data={"bandgap": {"unit": "km"}}) + ) + + assert (summary.matched, summary.modified) == (1, 1) + reloaded = (await _reload(c.id)).data["bandgap"] + assert reloaded == QuantityLeaf.patch_leaf(leaf, {"unit": "km"}) + assert reloaded["input_unit"] == "km" + assert reloaded["input_value"] == 2.0 + assert reloaded["value"] == 2000.0 + + async def test_identity_collision_reports_per_row_conflict(self, db, mongo_client): + # Setting formula to a value another matched row already owns collides on the identity index: + # the already-Fe2O3 row is a no-op success, the Fe3O4 row conflicts against it. + keep = await _insert_row(PROJ_A, formula="Fe2O3", data={"x": 1.0}) + clash = await _insert_row(PROJ_A, formula="Fe3O4", data={"x": 2.0}) + + summary = await _service(mongo_client, ALICE).bulk_update( + ContributionFilter(chemical_system_id="Fe-O"), ContributionPatch(formula="Fe2O3") + ) + + assert summary.matched == 2 + assert summary.modified == 1 + assert len(summary.failed) == 1 + assert summary.failed[0].error_code == "conflict" + # The clashing row is left untouched; the pre-existing Fe2O3 row is unchanged. + assert (await _reload(clash.id)).formula == "Fe3O4" + assert (await _reload(keep.id)).formula == "Fe2O3" + + async def test_per_row_patch_respects_writable_constraint(self, db, mongo_client): + # A data patch (identity-touching) must honor the same writable-project gate as the fast path: + # Alice's row is patched, the foreign-project row (readable-but-not-writable) is not. + mine = await _insert_row(PROJ_A, formula="Fe2O3", data={"x": 1.0}) + foreign = Contribution.from_input_model( + ContributionIn(project=PROJ_B, chemical_system_id="Fe-O", formula="Fe2O3", data={"x": 1.0}) + ) + foreign.is_public = True + await foreign.insert() + + summary = await _service(mongo_client, ALICE).bulk_update( + ContributionFilter(chemical_system_id="Fe-O"), ContributionPatch(data={"y": 9.0}) + ) + + assert (summary.matched, summary.modified) == (1, 1) + assert summary.projects == [PROJ_A] + assert (await _reload(mine.id)).data == {"x": 1.0, "y": 9.0} # merged, not replaced + assert (await _reload(foreign.id)).data == {"x": 1.0} # foreign project untouched diff --git a/mpcontribs-api/tests/integration/test_contributions_routes.py b/mpcontribs-api/tests/integration/test_contributions_routes.py index 3a3fb8bc92..a61ea72af3 100644 --- a/mpcontribs-api/tests/integration/test_contributions_routes.py +++ b/mpcontribs-api/tests/integration/test_contributions_routes.py @@ -263,7 +263,7 @@ def test_publish_returns_200_and_summary(self, client, contribution_service): contribution_service.bulk_update.return_value = BulkUpdateSummary(matched=3, modified=2, projects=["mp-team"]) r = client.patch("/api/v1/contributions", json={"is_public": True}) assert r.status_code == 200 - assert r.json() == {"matched": 3, "modified": 2, "projects": ["mp-team"]} + assert r.json() == {"matched": 3, "modified": 2, "projects": ["mp-team"], "failed": []} def test_forwards_update_and_filter(self, client, contribution_service): from mpcontribs_api.domains.contributions.models import ContributionFilter @@ -275,10 +275,33 @@ def test_forwards_update_and_filter(self, client, contribution_service): assert kwargs["update"].is_public is True assert isinstance(kwargs["filter"], ContributionFilter) - def test_missing_is_public_returns_422(self, client, contribution_service): + def test_forwards_full_patch_body(self, client, contribution_service): + # The bulk patch now accepts the same fields as the single-item patch (not just is_public). + contribution_service.bulk_update.return_value = BulkUpdateSummary(matched=1, modified=1, projects=["mp-team"]) + r = client.patch("/api/v1/contributions", json={"formula": "Fe2O3", "data": {"y": 9.0}}) + assert r.status_code == 200 + update = contribution_service.bulk_update.call_args.kwargs["update"] + assert update.formula == "Fe2O3" + assert update.data == {"y": 9.0} + + def test_empty_patch_is_accepted_as_noop(self, client, contribution_service): + # An empty patch is a valid no-op (parity with the single-item patch), no longer a 422. + contribution_service.bulk_update.return_value = BulkUpdateSummary(matched=0, modified=0, projects=[]) r = client.patch("/api/v1/contributions", json={}) - assert r.status_code == 422 - contribution_service.bulk_update.assert_not_called() + assert r.status_code == 200 + contribution_service.bulk_update.assert_awaited_once() + + def test_replace_data_query_param_forwarded(self, client, contribution_service): + # ?replace_data=true opts a data patch out of the additive-merge default (whole-dict overwrite). + contribution_service.bulk_update.return_value = BulkUpdateSummary(matched=0, modified=0, projects=[]) + client.patch("/api/v1/contributions?replace_data=true", json={"data": {"y": 9.0}}) + assert contribution_service.bulk_update.call_args.kwargs["replace_data"] is True + + def test_replace_data_defaults_to_false(self, client, contribution_service): + # Omitting the flag keeps the additive-merge default. + contribution_service.bulk_update.return_value = BulkUpdateSummary(matched=0, modified=0, projects=[]) + client.patch("/api/v1/contributions", json={"data": {"y": 9.0}}) + assert contribution_service.bulk_update.call_args.kwargs["replace_data"] is False def test_patch_by_id_forwards_is_public(self, client, contribution_service): # The single-contribution publish path: {"is_public": true} reaches the service patch. @@ -288,6 +311,15 @@ def test_patch_by_id_forwards_is_public(self, client, contribution_service): update = contribution_service.patch_contribution_by_id.call_args.kwargs["update"] assert update.is_public is True + def test_patch_by_id_forwards_replace_data(self, client, contribution_service): + # The single-item path exposes the same overwrite opt-out as the bulk path. + contribution_service.patch_contribution_by_id.return_value = SAMPLE_OUT + r = client.patch( + f"/api/v1/contributions/{PydanticObjectId()}?replace_data=true", json={"data": {"y": 9.0}} + ) + assert r.status_code == 200 + assert contribution_service.patch_contribution_by_id.call_args.kwargs["replace_data"] is True + class TestContributionMutationsRequireAuth: def test_post_anon_401(self, client, contribution_service): diff --git a/mpcontribs-api/tests/unit/domains/test_conditions_fuzz.py b/mpcontribs-api/tests/unit/domains/test_conditions_fuzz.py index 7428f4b717..5701623fd8 100644 --- a/mpcontribs-api/tests/unit/domains/test_conditions_fuzz.py +++ b/mpcontribs-api/tests/unit/domains/test_conditions_fuzz.py @@ -2,12 +2,12 @@ Conditions are the most adversarial slice of the normalization surface: their raw values are typed by users (UI, client, raw REST) and flow through ``parse_condition_value`` -> -``AnnotatedData.from_submission`` -> ``AnnotatedData.condition_key`` -> pivot grouping. These tests +``QuantityLeaf.from_submission`` -> ``QuantityLeaf.condition_key`` -> pivot grouping. These tests pin the invariants that must hold for *any* input: - ``parse_condition_value`` never raises and never yields a non-finite leaf value. - Every produced leaf is JSON-serializable with ``allow_nan=False`` (so it can be stored and hashed). -- ``AnnotatedData.condition_key`` is deterministic and independent of condition insertion order. +- ``QuantityLeaf.condition_key`` is deterministic and independent of condition insertion order. - Physically-equal numeric conditions collapse to one identity string. - ``expand_data`` only ever raises ``ValidationError`` (never a bare KeyError/TypeError/etc.). """ @@ -20,7 +20,7 @@ from hypothesis import strategies as st from mpcontribs_api.domains._shared.units import ( - AnnotatedData, + QuantityLeaf, UnitError, parse_condition_value, ) @@ -64,17 +64,17 @@ class TestConditionKeyProperties: def test_deterministic_and_order_independent(self, pairs): conditions = {name: parse_condition_value(value) for name, value in pairs} reversed_order = dict(reversed(list(conditions.items()))) - key = AnnotatedData.condition_key(conditions) - assert key == AnnotatedData.condition_key(dict(conditions)) # deterministic - assert key == AnnotatedData.condition_key(reversed_order) # independent of insertion order + key = QuantityLeaf.condition_key(conditions) + assert key == QuantityLeaf.condition_key(dict(conditions)) # deterministic + assert key == QuantityLeaf.condition_key(reversed_order) # independent of insertion order @settings(max_examples=200, deadline=None, suppress_health_check=[HealthCheck.too_slow]) @given(st.integers(min_value=-10_000, max_value=10_000)) def test_equal_numeric_representations_collapse(self, n): # An integer rendered as int, float, and scientific notation is one physical value -> one key. - int_key = AnnotatedData.condition_key({"x": parse_condition_value(f"{n}K")}) - float_key = AnnotatedData.condition_key({"x": parse_condition_value(f"{float(n)}K")}) - sci_key = AnnotatedData.condition_key({"x": parse_condition_value(f"{n:e}K")}) + int_key = QuantityLeaf.condition_key({"x": parse_condition_value(f"{n}K")}) + float_key = QuantityLeaf.condition_key({"x": parse_condition_value(f"{float(n)}K")}) + sci_key = QuantityLeaf.condition_key({"x": parse_condition_value(f"{n:e}K")}) assert int_key == float_key == sci_key @settings(max_examples=300, deadline=None, suppress_health_check=[HealthCheck.too_slow]) @@ -86,8 +86,8 @@ def test_equal_numeric_representations_collapse(self, n): ) def test_human_sci_notation_matches_e_notation(self, mantissa, exponent, mult, op): # For any mantissa/exponent, "x10^" must produce the same identity as "e". - human = AnnotatedData.condition_key({"x": parse_condition_value(f"{mantissa}{mult}10{op}{exponent} K")}) - canonical = AnnotatedData.condition_key({"x": parse_condition_value(f"{mantissa}e{exponent} K")}) + human = QuantityLeaf.condition_key({"x": parse_condition_value(f"{mantissa}{mult}10{op}{exponent} K")}) + canonical = QuantityLeaf.condition_key({"x": parse_condition_value(f"{mantissa}e{exponent} K")}) assert human == canonical @@ -138,13 +138,13 @@ class TestNonFiniteMagnitudeGuard: @pytest.mark.parametrize("bad", [float("inf"), float("-inf"), float("nan")]) def test_annotate_value_rejects_non_finite_float(self, bad): with pytest.raises(UnitError): - AnnotatedData.from_submission(bad, "K").as_dict() + QuantityLeaf.from_submission(bad, "K").as_dict() @pytest.mark.parametrize("bad", ["1e999", "-1e999", "1e999", "inf", "nan"]) def test_annotate_value_rejects_overflowing_string(self, bad): # "inf"/"nan" as bare strings are unparseable floats; "1e999" overflows. All raise. with pytest.raises(UnitError): - AnnotatedData.from_submission(bad, "K").as_dict() + QuantityLeaf.from_submission(bad, "K").as_dict() def test_condition_falls_back_to_categorical_for_overflow(self): # A non-finite numeric condition is not stored as inf; it degrades to a categorical string. @@ -157,7 +157,7 @@ def test_non_finite_measurement_leaf_rejected_by_expand(self): def test_uncertainty_with_non_finite_nominal_rejected(self): with pytest.raises(UnitError): - AnnotatedData.from_submission("1e999+/-1", "K").as_dict() + QuantityLeaf.from_submission("1e999+/-1", "K").as_dict() class TestConditionEdgeCases: diff --git a/mpcontribs-api/tests/unit/domains/test_contribution_repository.py b/mpcontribs-api/tests/unit/domains/test_contribution_repository.py index 8493b08429..57499955e7 100644 --- a/mpcontribs-api/tests/unit/domains/test_contribution_repository.py +++ b/mpcontribs-api/tests/unit/domains/test_contribution_repository.py @@ -1,83 +1,89 @@ -"""Unit tests for the contribution repository's dict merge/replace update helpers. - -Covers the pure translation from a patch's field map to the ``$set`` document: with ``replace_data`` -a dict field overwrites whole; without it, dict fields deep-merge into dotted ``$set`` paths so -unmentioned stored keys survive (an addition), stopping at atomic annotated-value leaves. +"""Unit tests for the contribution data merge helpers. + +Covers the additive-merge translation of a patch's ``data`` against the *stored* shape: +``flatten_merge_paths`` produces the dotted ``$set`` paths Mongo receives, and ``merge_data`` produces +the equivalent post-write view used to resolve identity. Both follow one rule — a patch onto a stored +quantity leaf re-derives the whole leaf (so its canonical and ``input_*`` halves stay in sync, see +``patch_leaf``), a plain group is descended so unmentioned siblings survive, and any other scalar +sets its path directly. Precise SI-conversion behavior of ``patch_leaf`` is covered in ``test_units``. """ -from mpcontribs_api.domains.contributions.repository import ( - _build_update_set, - _flatten_for_merge, - _is_atomic_leaf, -) - - -class TestIsAtomicLeaf: - def test_scalars_and_lists_are_atomic(self): - assert _is_atomic_leaf(1) - assert _is_atomic_leaf("x") - assert _is_atomic_leaf([1, 2, 3]) - assert _is_atomic_leaf(None) - - def test_annotated_leaf_is_atomic(self): - leaf = {"value": 1.0, "input_value": 1.0, "display": "1 eV", "unit": "eV"} - assert _is_atomic_leaf(leaf) - - def test_plain_group_dict_is_not_atomic(self): - assert not _is_atomic_leaf({"a": 1, "b": 2}) - - def test_minimal_value_leaf_is_atomic(self): - # A bare-number leaf has only ``value`` (no input_value/display) and is still a leaf. - assert _is_atomic_leaf({"value": 1.0}) - assert _is_atomic_leaf({"value": 1.0, "input_value": 1.0}) - - def test_dict_with_non_reserved_key_is_not_atomic(self): - # A numeric ``value`` alongside a non-reserved key is a descendable group, not a leaf. - assert not _is_atomic_leaf({"value": 1.0, "extra": 2}) - # ``value`` present but non-numeric -> not a leaf either. - assert not _is_atomic_leaf({"value": "text"}) - +from mpcontribs_api.domains._shared.units import QuantityLeaf + +# A stored leaf submitted as "2 m" (metre is an SI base unit, so canonical == submitted). +LEAF = QuantityLeaf.from_submission(2.0, "m").as_dict() + +# The merge helpers now live on QuantityLeaf; aliased here to keep the test bodies readable. +flatten_merge_paths = QuantityLeaf.flatten_merge_paths +merge_data = QuantityLeaf.merge_data + + +class TestIsLeafFragment: + def test_reserved_only_dict_is_a_fragment(self): + assert QuantityLeaf.is_fragment({"unit": "kg"}) + assert QuantityLeaf.is_fragment({"value": 5, "unit": "kg"}) + assert QuantityLeaf.is_fragment({"error": 0.1}) + + def test_non_reserved_or_empty_is_not_a_fragment(self): + assert not QuantityLeaf.is_fragment({"unit": "kg", "x": 1}) # mixed reserved + plain + assert not QuantityLeaf.is_fragment({"x": 1}) + assert not QuantityLeaf.is_fragment({}) + assert not QuantityLeaf.is_fragment(5) + assert not QuantityLeaf.is_fragment("eV") + + +class TestFlattenMergePaths: + def test_new_scalar_key_sets_directly(self): + assert flatten_merge_paths({}, {"y": 9}, prefix="data.") == {"data.y": 9} + + def test_leaf_patch_sets_the_whole_recomputed_leaf(self): + # A fragment touching a stored leaf writes the whole re-derived leaf at its path (not a + # sub-path), so value/unit/error and input_* can be re-synced together. Changing the unit to + # km re-converts the magnitude (2 m -> input 2 km -> 2000 m) and updates input_unit. + out = flatten_merge_paths({"bandgap": LEAF}, {"bandgap": {"unit": "km"}}, prefix="data.") + assert set(out) == {"data.bandgap"} # whole leaf, not data.bandgap.unit + assert out["data.bandgap"] == QuantityLeaf.patch_leaf(LEAF, {"unit": "km"}) + assert out["data.bandgap"]["value"] == 2000.0 + assert out["data.bandgap"]["input_unit"] == "km" + + def test_bare_scalar_onto_leaf_updates_magnitude(self): + # A bare scalar is the new submitted magnitude; the leaf is re-derived, keeping the unit. + out = flatten_merge_paths({"bandgap": LEAF}, {"bandgap": 5.0}, prefix="data.") + assert out == {"data.bandgap": QuantityLeaf.patch_leaf(LEAF, {"value": 5.0})} + assert out["data.bandgap"]["input_value"] == 5.0 + assert out["data.bandgap"]["unit"] == "m" + + def test_plain_group_descends_and_keeps_siblings(self): + assert flatten_merge_paths({"grp": {"a": 1}}, {"grp": {"b": 2}}, prefix="data.") == {"data.grp.b": 2} + + def test_bare_scalar_onto_non_leaf_sets_directly(self): + # Target is a plain group (not a quantity leaf) -> no leaf recompute, set the path itself. + assert flatten_merge_paths({"grp": {"a": 1}}, {"grp": 7}, prefix="data.") == {"data.grp": 7} + + def test_new_leaf_shaped_value_onto_absent_key_descends(self): + # No stored leaf to re-sync against -> ordinary descent (stored raw, canonicalized on insert). + assert flatten_merge_paths({}, {"q": {"value": 3, "unit": "m"}}, prefix="data.") == { + "data.q.value": 3, + "data.q.unit": "m", + } -class TestFlattenForMerge: - def test_top_level_scalars_become_dotted_paths(self): - assert _flatten_for_merge("data", {"a": 1, "b": 2}) == {"data.a": 1, "data.b": 2} + def test_empty_dict_contributes_nothing(self): + assert flatten_merge_paths({"grp": {"a": 1}}, {"grp": {}}, prefix="data.") == {} - def test_nested_group_flattens_to_leaves(self): - # A plain nested group is descended so sibling leaves are addressed individually and any - # unmentioned sibling in the stored dict survives the merge. - out = _flatten_for_merge("data", {"group": {"x": 1, "y": 2}}) - assert out == {"data.group.x": 1, "data.group.y": 2} - def test_annotated_leaf_stays_whole(self): - leaf = {"value": 4.2, "input_value": 4.2, "display": "4.2 eV", "unit": "eV"} - out = _flatten_for_merge("data", {"bandgap": leaf}) - # Not descended into value/unit/... — the leaf is set atomically. - assert out == {"data.bandgap": leaf} +class TestMergeData: + def test_leaf_patch_matches_flatten(self): + # merge_data is the post-write view flatten_merge_paths would produce, key by key. + merged = merge_data({"bandgap": LEAF}, {"bandgap": {"unit": "km"}}) + assert merged["bandgap"] == QuantityLeaf.patch_leaf(LEAF, {"unit": "km"}) - def test_empty_dict_contributes_nothing(self): - assert _flatten_for_merge("data", {}) == {} - assert _flatten_for_merge("data", {"group": {}}) == {} - - -class TestBuildUpdateSet: - def test_replace_passes_through_verbatim(self): - update = {"formula": "H2O", "data": {"a": 1}} - assert _build_update_set(update, replace_data=True) == update - - def test_merge_flattens_only_dict_fields(self): - update = {"formula": "H2O", "version": 2, "data": {"a": 1, "grp": {"b": 2}}} - assert _build_update_set(update, replace_data=False) == { - "formula": "H2O", - "version": 2, - "data.a": 1, - "data.grp.b": 2, - } + def test_bare_scalar_rederives_leaf(self): + merged = merge_data({"bandgap": LEAF}, {"bandgap": 5.0}) + assert merged["bandgap"] == QuantityLeaf.patch_leaf(LEAF, {"value": 5.0}) - def test_merge_keeps_list_fields_direct(self): - update = {"structures": [{"$id": 1}]} - assert _build_update_set(update, replace_data=False) == update + def test_new_key_and_sibling_survival(self): + merged = merge_data({"x": 1, "grp": {"a": 1}}, {"y": 2, "grp": {"b": 2}}) + assert merged == {"x": 1, "y": 2, "grp": {"a": 1, "b": 2}} - def test_merge_of_only_empty_dict_yields_empty_document(self): - # Signals the caller (update_contribution_by_identifiers) to treat the patch as a no-op - # rather than issue an empty (and MongoDB-rejected) $set. - assert _build_update_set({"data": {}}, replace_data=False) == {} + def test_none_base_treated_as_empty(self): + assert merge_data(None, {"y": 2}) == {"y": 2} diff --git a/mpcontribs-api/tests/unit/domains/test_contribution_service.py b/mpcontribs-api/tests/unit/domains/test_contribution_service.py index a2d7b1d1fb..2a5a7dbcbc 100644 --- a/mpcontribs-api/tests/unit/domains/test_contribution_service.py +++ b/mpcontribs-api/tests/unit/domains/test_contribution_service.py @@ -10,10 +10,8 @@ from mpcontribs_api.authz import ADMIN_GROUP, User from mpcontribs_api.config import MongoSettings, get_settings from mpcontribs_api.domains.attachments.models import Attachment, AttachmentIn -from mpcontribs_api.domains._shared.bulk import BulkUpdateSummary from mpcontribs_api.domains.contributions.models import ( Contribution, - ContributionBulkUpdate, ContributionFilter, ContributionIdentity, ContributionIn, @@ -1529,3 +1527,63 @@ async def test_metadata_only_patch_skips_existing_read(self): # No identity/unique inputs touched -> no re-read, straight to the plain patch. contrib_repo.get_contribution_by_id.assert_not_called() contrib_repo.patch_contribution_by_id.assert_called_once() + + +# --------------------------------------------------------------------------- +# patch_contribution_by_id — data merge vs replace + unique_value resolution +# --------------------------------------------------------------------------- + + +class TestPatchDataMergeReplace: + async def test_data_patch_defaults_to_merge_and_forwards_replace_false(self): + svc, contrib_repo, *_ = _make_service() + existing = _existing_doc(material_id=None, chemical_system_id="Fe-O", formula="Fe2O3") + existing.data = {"x": 1.0} + contrib_repo.get_contribution_by_id.return_value = existing + contrib_repo.patch_contribution_by_id.return_value = MagicMock(spec=Contribution) + + await svc.patch_contribution_by_id(str(existing.id), ContributionPatch(data={"y": 9.0})) + + # The repo performs the actual dotted-$set merge; the service just forwards replace_data=False. + assert contrib_repo.patch_contribution_by_id.call_args.kwargs["replace_data"] is False + + async def test_replace_data_flag_forwarded_to_repo(self): + svc, contrib_repo, *_ = _make_service() + existing = _existing_doc(material_id=None, chemical_system_id="Fe-O", formula="Fe2O3") + existing.data = {"x": 1.0} + contrib_repo.get_contribution_by_id.return_value = existing + contrib_repo.patch_contribution_by_id.return_value = MagicMock(spec=Contribution) + + await svc.patch_contribution_by_id( + str(existing.id), ContributionPatch(data={"y": 9.0}), replace_data=True + ) + + assert contrib_repo.patch_contribution_by_id.call_args.kwargs["replace_data"] is True + + async def test_merge_resolves_unique_value_from_merged_state(self): + # The unique_column value lives in the stored data and is NOT in the patch. A merge preserves + # it, so unique_value must resolve against the merged view rather than raising "missing". + svc, contrib_repo, *_ = _make_service(unique_column="sample_id") + existing = _existing_doc(material_id=None, chemical_system_id="Fe-O", formula="Fe2O3") + existing.data = {"sample_id": 42, "x": 1.0} + contrib_repo.get_contribution_by_id.return_value = existing + contrib_repo.patch_contribution_by_id.return_value = MagicMock(spec=Contribution) + + await svc.patch_contribution_by_id(str(existing.id), ContributionPatch(data={"y": 9.0})) + + # Resolved from {sample_id:42, x:1, y:9}, so the untouched unique_value survives the merge. + assert contrib_repo.patch_contribution_by_id.call_args.kwargs["unique_value"] == 42 + + async def test_replace_resolves_unique_value_from_patch_data_only(self): + # On replace the stored data is discarded, so a unique_column absent from the patch is a + # genuine validation failure (the resulting document would lack it). + svc, contrib_repo, *_ = _make_service(unique_column="sample_id") + existing = _existing_doc(material_id=None, chemical_system_id="Fe-O", formula="Fe2O3") + existing.data = {"sample_id": 42} + contrib_repo.get_contribution_by_id.return_value = existing + + with pytest.raises(ValidationError, match="unique_column"): + await svc.patch_contribution_by_id( + str(existing.id), ContributionPatch(data={"y": 9.0}), replace_data=True + ) + contrib_repo.patch_contribution_by_id.assert_not_called() diff --git a/mpcontribs-api/tests/unit/domains/test_contribution_stats.py b/mpcontribs-api/tests/unit/domains/test_contribution_stats.py index b578727106..65a17e54d4 100644 --- a/mpcontribs-api/tests/unit/domains/test_contribution_stats.py +++ b/mpcontribs-api/tests/unit/domains/test_contribution_stats.py @@ -10,7 +10,7 @@ def _annotated(value: float, unit: str | None = None) -> dict: - """A minimal canonical annotated-leaf dict (see AnnotatedData.as_dict).""" + """A minimal canonical annotated-leaf dict (see QuantityLeaf.as_dict).""" leaf = {"value": value, "input_value": value, "display": str(value)} if unit is not None: leaf["unit"] = unit diff --git a/mpcontribs-api/tests/unit/domains/test_units.py b/mpcontribs-api/tests/unit/domains/test_units.py index 2990071d88..5e1ad616ff 100644 --- a/mpcontribs-api/tests/unit/domains/test_units.py +++ b/mpcontribs-api/tests/unit/domains/test_units.py @@ -4,7 +4,7 @@ from mpcontribs_api.config import get_settings from mpcontribs_api.domains._shared.units import ( - AnnotatedData, + QuantityLeaf, UnitError, _count_sig_figs, _normalize_sci_notation, @@ -16,7 +16,7 @@ def _ckey(condition_value: str) -> str: """Build the identity key for a single-condition row (terse helper for equivalence tests).""" - return AnnotatedData.condition_key({"x": parse_condition_value(condition_value)}) + return QuantityLeaf.condition_key({"x": parse_condition_value(condition_value)}) # --------------------------------------------------------------------------- # annotate_value — SI canonicalization + provenance @@ -25,7 +25,7 @@ def _ckey(condition_value: str) -> str: class TestAnnotateValue: def test_recognized_unit_canonicalizes_to_si_and_keeps_original(self): - leaf = AnnotatedData.from_submission(4.2, "eV").as_dict() + leaf = QuantityLeaf.from_submission(4.2, "eV").as_dict() assert leaf["input_value"] == 4.2 assert leaf["input_unit"] == "eV" # 4.2 eV in joules @@ -37,11 +37,11 @@ def test_recognized_unit_canonicalizes_to_si_and_keeps_original(self): def test_unitless_value(self): # A bare, exact, unit-less number is fully described by ``value``: input_*/display are omitted. - leaf = AnnotatedData.from_submission(5, None).as_dict() + leaf = QuantityLeaf.from_submission(5, None).as_dict() assert leaf == {"value": 5.0} def test_unknown_unit_stored_as_submitted(self): - leaf = AnnotatedData.from_submission(1.0, "widgets").as_dict() + leaf = QuantityLeaf.from_submission(1.0, "widgets").as_dict() assert leaf["value"] == 1.0 assert leaf["unit"] == "widgets" assert leaf["input_unit"] == "widgets" @@ -51,38 +51,38 @@ def test_unit_nfc_normalized(self): # before it is stored or rendered, so the two spellings collapse to one stored form. ohm_sign, greek_omega = "Ω", "Ω" assert ohm_sign != greek_omega - leaf = AnnotatedData.from_submission(1.0, ohm_sign).as_dict() + leaf = QuantityLeaf.from_submission(1.0, ohm_sign).as_dict() assert leaf["input_unit"] == greek_omega assert ohm_sign not in leaf["input_unit"] # Both spellings produce the identical stored/canonical leaf. - assert leaf == AnnotatedData.from_submission(1.0, greek_omega).as_dict() + assert leaf == QuantityLeaf.from_submission(1.0, greek_omega).as_dict() def test_offset_unit_canonicalizes_to_kelvin(self): # degC magnitude passed separately is convertible (unlike the string form). - leaf = AnnotatedData.from_submission(26.85, "degC").as_dict() + leaf = QuantityLeaf.from_submission(26.85, "degC").as_dict() assert math.isclose(leaf["value"], 300.0, rel_tol=1e-6) assert leaf["unit"] == "K" assert leaf["input_value"] == 26.85 assert leaf["input_unit"] == "degC" def test_uncertainty_notation_parsed_and_propagated(self): - leaf = AnnotatedData.from_submission("4.2(3)", "eV").as_dict() + leaf = QuantityLeaf.from_submission("4.2(3)", "eV").as_dict() assert "error" in leaf # error scales with the same eV->J factor as the value assert math.isclose(leaf["error"], 0.3 * 1.602176634e-19, rel_tol=1e-6) def test_plain_numeric_string_has_no_implied_uncertainty(self): - leaf = AnnotatedData.from_submission("300", "K").as_dict() + leaf = QuantityLeaf.from_submission("300", "K").as_dict() assert "error" not in leaf assert math.isclose(leaf["value"], 300.0) def test_unparseable_magnitude_raises(self): with pytest.raises(UnitError): - AnnotatedData.from_submission("not-a-number", "eV").as_dict() + QuantityLeaf.from_submission("not-a-number", "eV").as_dict() def test_boolean_magnitude_rejected(self): with pytest.raises(UnitError): - AnnotatedData.from_submission(True, "eV").as_dict() + QuantityLeaf.from_submission(True, "eV").as_dict() # --------------------------------------------------------------------------- @@ -177,13 +177,13 @@ def test_equivalence_holds_with_units(self): assert _ckey(spelling) == _ckey("100 S/cm") def test_measurement_leaf_value_is_hundred(self): - # The measurement-leaf path (AnnotatedData.from_submission) normalizes too, not just conditions. + # The measurement-leaf path (QuantityLeaf.from_submission) normalizes too, not just conditions. for spelling in ("1x10^2", "1×10^2", "10²", "1x10**2"): - assert math.isclose(AnnotatedData.from_submission(spelling, "m").as_dict()["input_value"], 100.0) + assert math.isclose(QuantityLeaf.from_submission(spelling, "m").as_dict()["input_value"], 100.0) def test_negative_exponent_measurement_leaf(self): for spelling in ("1x10^-5", "1×10⁻⁵"): - assert math.isclose(AnnotatedData.from_submission(spelling, "m").as_dict()["input_value"], 1e-5) + assert math.isclose(QuantityLeaf.from_submission(spelling, "m").as_dict()["input_value"], 1e-5) # --------------------------------------------------------------------------- @@ -193,25 +193,25 @@ def test_negative_exponent_measurement_leaf(self): class TestConditionKey: def test_empty_when_no_conditions(self): - assert AnnotatedData.condition_key({}) == "" + assert QuantityLeaf.condition_key({}) == "" def test_sorted_by_name(self): - key = AnnotatedData.condition_key({"T": parse_condition_value("300K"), "P": parse_condition_value("1atm")}) + key = QuantityLeaf.condition_key({"T": parse_condition_value("300K"), "P": parse_condition_value("1atm")}) assert key.index("P=") < key.index("T=") def test_physically_equal_conditions_collapse(self): # 300 K and 26.85 degC are the same temperature -> same key. - assert AnnotatedData.condition_key({"T": parse_condition_value("300K")}) == AnnotatedData.condition_key( + assert QuantityLeaf.condition_key({"T": parse_condition_value("300K")}) == QuantityLeaf.condition_key( {"T": parse_condition_value("26.85degC")} ) def test_fixed_precision_normalizes_representations(self): - assert AnnotatedData.condition_key({"T": parse_condition_value("300K")}) == AnnotatedData.condition_key( + assert QuantityLeaf.condition_key({"T": parse_condition_value("300K")}) == QuantityLeaf.condition_key( {"T": parse_condition_value("300.0K")} ) def test_categorical_in_key(self): - assert AnnotatedData.condition_key({"phase": "cubic"}) == "phase=cubic" + assert QuantityLeaf.condition_key({"phase": "cubic"}) == "phase=cubic" # --------------------------------------------------------------------------- @@ -259,42 +259,42 @@ class TestPrecisionCapture: ], ) def test_string_input_records_precision(self, submitted, expected_precision): - assert AnnotatedData.from_submission(submitted, "eV").precision == expected_precision + assert QuantityLeaf.from_submission(submitted, "eV").precision == expected_precision def test_numeric_input_has_no_precision(self): # A JSON number loses "1.000" -> 1.0 before it reaches us, so there is nothing to record. - assert AnnotatedData.from_submission(1.000, "eV").precision is None - assert AnnotatedData.from_submission(4.20, "eV").precision is None + assert QuantityLeaf.from_submission(1.000, "eV").precision is None + assert QuantityLeaf.from_submission(4.20, "eV").precision is None def test_precision_captured_through_condition_path(self): assert parse_condition_value("1.000 eV")["precision"] == 4 def test_precision_capped_at_float_precision(self): # 14 submitted sig figs are capped at the float_precision length. - assert AnnotatedData.from_submission("1.2345678901234", "eV").precision == _FLOAT_PRECISION + assert QuantityLeaf.from_submission("1.2345678901234", "eV").precision == _FLOAT_PRECISION zeros = "1." + "0" * (_FLOAT_PRECISION + 5) - assert AnnotatedData.from_submission(zeros, "eV").precision == _FLOAT_PRECISION + assert QuantityLeaf.from_submission(zeros, "eV").precision == _FLOAT_PRECISION def test_precision_does_not_change_stored_numeric_value(self): # Recording precision must not alter the stored float value/input_value. - leaf = AnnotatedData.from_submission("1.000", "eV").as_dict() + leaf = QuantityLeaf.from_submission("1.000", "eV").as_dict() assert leaf["input_value"] == 1.0 def test_identity_still_normalizes_regardless_of_trailing_zeros(self): # condition_key uses the canonical float, not precision: "300" and "300.0" still collapse. - assert AnnotatedData.condition_key({"T": parse_condition_value("300 K")}) == AnnotatedData.condition_key( + assert QuantityLeaf.condition_key({"T": parse_condition_value("300 K")}) == QuantityLeaf.condition_key( {"T": parse_condition_value("300.000 K")} ) # --------------------------------------------------------------------------- -# AnnotatedData — the leaf shape model +# QuantityLeaf — the leaf shape model # --------------------------------------------------------------------------- -class TestAnnotatedData: +class TestQuantityLeaf: def test_unit_and_error_optional(self): - leaf = AnnotatedData(value=5.0, input_value=5.0) + leaf = QuantityLeaf(value=5.0, input_value=5.0) assert leaf.unit is None assert leaf.input_unit is None assert leaf.error is None @@ -302,59 +302,59 @@ def test_unit_and_error_optional(self): def test_unit_case_preserved(self): # units must never be casefolded (eV stays eV, not ev) - leaf = AnnotatedData(value=1.0, unit="eV", input_value=1.0, input_unit="eV") + leaf = QuantityLeaf(value=1.0, unit="eV", input_value=1.0, input_unit="eV") assert leaf.unit == "eV" assert leaf.input_unit == "eV" def test_display_not_stored(self): # display is derived on read, never a stored field: value alone is a valid leaf. - leaf = AnnotatedData(value=5.0).as_dict() + leaf = QuantityLeaf(value=5.0).as_dict() assert leaf == {"value": 5.0} assert "display" not in leaf -class TestAnnotatedDataFactory: +class TestQuantityLeafFactory: """The factory surface: from_submission -> as_dict, and identity_scalar / condition_key.""" def test_from_submission_returns_model(self): - leaf = AnnotatedData.from_submission("4.2", "eV") - assert isinstance(leaf, AnnotatedData) + leaf = QuantityLeaf.from_submission("4.2", "eV") + assert isinstance(leaf, QuantityLeaf) assert leaf.input_value == 4.2 assert leaf.input_unit == "eV" assert leaf.precision == 2 # "4.2" -> 2 significant figures def test_from_submission_canonicalizes_to_si(self): - leaf = AnnotatedData.from_submission(4.2, "eV") + leaf = QuantityLeaf.from_submission(4.2, "eV") assert leaf.unit != "eV" # base units assert math.isclose(leaf.value, 4.2 * 1.602176634e-19, rel_tol=1e-9) def test_from_submission_raises_on_unparseable(self): with pytest.raises(UnitError): - AnnotatedData.from_submission("not-a-number", "eV") + QuantityLeaf.from_submission("not-a-number", "eV") def test_as_dict_omits_none_fields(self): - leaf = AnnotatedData.from_submission(5, None).as_dict() + leaf = QuantityLeaf.from_submission(5, None).as_dict() assert leaf == {"value": 5.0} def test_identity_scalar_categorical_verbatim(self): - assert AnnotatedData.identity_scalar("cubic") == "cubic" + assert QuantityLeaf.identity_scalar("cubic") == "cubic" def test_identity_scalar_numeric_leaf_with_unit(self): - leaf = AnnotatedData.from_submission("300", "K").as_dict() - scalar = AnnotatedData.identity_scalar(leaf) + leaf = QuantityLeaf.from_submission("300", "K").as_dict() + scalar = QuantityLeaf.identity_scalar(leaf) assert scalar == "300:K" def test_identity_scalar_numeric_leaf_without_unit(self): - leaf = AnnotatedData.from_submission("5", None).as_dict() - assert AnnotatedData.identity_scalar(leaf) == "5" + leaf = QuantityLeaf.from_submission("5", None).as_dict() + assert QuantityLeaf.identity_scalar(leaf) == "5" def test_condition_key_method_builds_sorted_identity(self): conditions = {"T": parse_condition_value("300K"), "P": parse_condition_value("1atm")} - key = AnnotatedData.condition_key(conditions) + key = QuantityLeaf.condition_key(conditions) assert key.index("P=") < key.index("T=") # sorted by name def test_condition_key_method_empty(self): - assert AnnotatedData.condition_key({}) == "" + assert QuantityLeaf.condition_key({}) == "" # --------------------------------------------------------------------------- @@ -364,61 +364,120 @@ def test_condition_key_method_empty(self): class TestTryFromValue: def test_bare_number_becomes_unitless_leaf(self): - leaf = AnnotatedData.try_from_value(5, None) + leaf = QuantityLeaf.try_from_value(5, None) assert leaf is not None assert leaf.as_dict() == {"value": 5.0} def test_number_with_key_unit(self): # spreadsheet scenario A: "bandgap (eV)" -> 5 - leaf = AnnotatedData.try_from_value(5, "eV") + leaf = QuantityLeaf.try_from_value(5, "eV") assert leaf is not None assert leaf.input_value == 5.0 assert leaf.input_unit == "eV" def test_string_with_embedded_unit(self): # spreadsheet scenario B: "bandgap" -> "5 eV" - leaf = AnnotatedData.try_from_value("5 eV", None) + leaf = QuantityLeaf.try_from_value("5 eV", None) assert leaf is not None assert leaf.input_value == 5.0 assert leaf.input_unit == "eV" def test_scenarios_a_and_b_converge(self): # Unit-in-key (number value) and unit-in-value (string) produce the same physical leaf. - a = AnnotatedData.try_from_value(5, "eV") - b = AnnotatedData.try_from_value("5 eV", None) + a = QuantityLeaf.try_from_value(5, "eV") + b = QuantityLeaf.try_from_value("5 eV", None) assert a is not None and b is not None for field in ("value", "unit", "input_value", "input_unit"): assert getattr(a, field) == getattr(b, field) def test_categorical_string_is_not_a_leaf(self): - assert AnnotatedData.try_from_value("cubic", None) is None + assert QuantityLeaf.try_from_value("cubic", None) is None def test_boolean_is_not_a_leaf(self): - assert AnnotatedData.try_from_value(True, None) is None + assert QuantityLeaf.try_from_value(True, None) is None def test_unrecognized_unit_in_value_kept_verbatim(self): - leaf = AnnotatedData.try_from_value("5 apples", None) + leaf = QuantityLeaf.try_from_value("5 apples", None) assert leaf is not None assert leaf.value == 5.0 assert leaf.unit == "apples" assert leaf.input_unit == "apples" def test_precision_captured_from_string(self): - leaf = AnnotatedData.try_from_value("5.00 eV", None) + leaf = QuantityLeaf.try_from_value("5.00 eV", None) assert leaf is not None assert leaf.precision == 3 def test_conflicting_units_key_wins_via_conversion(self): # key unit eV, value unit meV -> converted into eV (5 meV == 0.005 eV). - leaf = AnnotatedData.try_from_value("5 meV", "eV") + leaf = QuantityLeaf.try_from_value("5 meV", "eV") assert leaf is not None assert leaf.input_unit == "eV" assert math.isclose(leaf.input_value, 0.005, rel_tol=1e-9) def test_conflicting_units_same_dimension_ok(self): - leaf = AnnotatedData.try_from_value("5 eV", "eV") + leaf = QuantityLeaf.try_from_value("5 eV", "eV") assert leaf is not None assert leaf.input_unit == "eV" assert leaf.input_value == 5.0 def test_incompatible_units_rejected(self): with pytest.raises(UnitError): - AnnotatedData.try_from_value("5 kg", "eV") + QuantityLeaf.try_from_value("5 kg", "eV") + + +class TestRepatchLeaf: + """Re-deriving a stored leaf after a partial patch, keeping submitted/canonical pairs in sync.""" + + def _leaf(self, value, unit): + return QuantityLeaf.from_submission(value, unit).as_dict() + + def test_unit_change_reconverts_value(self): + # 2 m stored; re-submit the unit as km -> the magnitude is reinterpreted (2 km) and + # re-canonicalized to SI (2000 m); input_unit tracks the new unit, input_value is unchanged. + leaf = self._leaf(2.0, "m") + out = QuantityLeaf.patch_leaf(leaf, {"unit": "km"}) + assert out["input_unit"] == "km" + assert out["input_value"] == 2.0 + assert out["value"] == 2000.0 + + def test_input_unit_change_is_equivalent_to_unit_change(self): + # "vice versa": patching the input_ member drives the same re-derivation. + leaf = self._leaf(2.0, "m") + assert QuantityLeaf.patch_leaf(leaf, {"input_unit": "km"}) == QuantityLeaf.patch_leaf( + leaf, {"unit": "km"} + ) + + def test_value_change_keeps_unit_and_reconverts(self): + leaf = self._leaf(2.0, "km") # canonical 2000 m + out = QuantityLeaf.patch_leaf(leaf, {"value": 3.0}) + assert out["input_value"] == 3.0 + assert out["input_unit"] == "km" + assert out["value"] == 3000.0 + + def test_error_and_value_reconvert_together_on_unit_change(self): + # An uncertain magnitude: changing the unit re-converts both value and error; input_error + # stays in the submitted unit and precision is preserved. + leaf = self._leaf("2.0+/-0.1", "km") + out = QuantityLeaf.patch_leaf(leaf, {"unit": "m"}) + assert out["input_unit"] == "m" + assert out["input_value"] == 2.0 + assert out["input_error"] == 0.1 + assert out["value"] == 2.0 # 2 m + assert out["error"] == 0.1 + assert out["precision"] == 2 + + def test_explicit_error_override(self): + leaf = self._leaf("2.0+/-0.1", "m") + out = QuantityLeaf.patch_leaf(leaf, {"error": 0.5}) + assert out["input_error"] == 0.5 + assert out["error"] == 0.5 + + def test_unrelated_field_unchanged(self): + # Patching only the unit leaves the submitted magnitude and its canonical value intact. + leaf = self._leaf(2.0, "m") + out = QuantityLeaf.patch_leaf(leaf, {"unit": "m"}) + assert out == leaf + + def test_unparseable_override_raises(self): + leaf = self._leaf(2.0, "m") + with pytest.raises(UnitError): + QuantityLeaf.patch_leaf(leaf, {"value": "not-a-number"}) From aaffc32f91763bc0a8d052885945c7f56ad009bf Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 17 Aug 2026 12:23:56 -0700 Subject: [PATCH 569/591] docs(_shared/filters.py): Removed verbose docstrings --- .../mpcontribs_api/domains/_shared/filters.py | 34 ++++--------------- 1 file changed, 7 insertions(+), 27 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/filters.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/filters.py index c52c3fd90a..caa91f2969 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/filters.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/filters.py @@ -9,13 +9,8 @@ def _normalize_query_values(value: Any) -> Any: """Recursively NFC-normalize every string in a built query condition value. - fastapi-filter wraps a filter's value into operator dicts before it reaches us (``{"$ne": v}``, - ``{"$in": [...]}``, ``{"$regex": ".*v.*", "$options": "i"}``), so a query term can be nested a - few levels deep. Normalizing every string — bare, inside operator dicts, and inside ``$in``/ - ``$nin`` lists — means a term typed with a canonically-equivalent spelling (e.g. the OHM SIGN - U+2126 vs the Greek omega) matches NFC-normalized stored data. NFC is a no-op on ASCII, so ids, - md5 hex, and regex metacharacters are untouched. Dict *keys* (field names, ``$``-operators) are - ASCII and left as-is. + fastapi-filter does custom wrapping of queries to translate into MongoDB. + This handles normalization of values within the query. """ if isinstance(value, str): return nfc_normalize(value) @@ -27,28 +22,13 @@ def _normalize_query_values(value: Any) -> Any: class BaseFilter(Filter): - """Base filter that bridges Beanie's ``_id`` alias and fastapi-filter's raw field names. - - Beanie stores a document's primary key under Mongo's ``_id`` (``id`` is just a Pydantic alias), - but fastapi-filter builds query keys from the raw field name read off ``model_dump`` — without - aliases. An ``id`` filter would therefore query a non-existent ``{"id": ...}`` key and match - nothing, while a direct ``Document.id == x`` lookup (which Beanie resolves to ``_id``) succeeds. - Remapping the ``id`` key to ``_id`` here keeps the two read paths consistent. - - String values are also NFC-normalized (see :func:`_normalize_query_values`) so queries match the - NFC-normalized units, labels, and other display strings stored on the write path. - - Store/query normalization invariant: this NFC pass is a global catch-all and only lines up with - fields stored at NFC or lighter. A field normalized *more* aggressively on write (e.g. a - ``SearchStr`` identifier that is NFKC-folded and casefolded, or an ``NFKCStr`` name) must declare - that same normalization type on its filter field so the query value is folded identically — - otherwise an exact/``__in``/``__neq`` lookup silently misses. See ``ContributionFilter.identifier`` - (SearchStr) and the component ``name`` filters (NFKCStr) for the pattern. - - Domain filters should subclass this instead of fastapi-filter's ``Filter`` directly. - """ + """Base filter that bridges Beanie's ``_id`` alias and fastapi-filter's raw field names.""" def _get_filter_conditions(self, nesting_depth: int = 1) -> list[tuple[Mapping[str, Any], Mapping[str, Any]]]: + """Overrides Filter._get_filter_conditions to allow us to specify 'id' instead of '_id' in our models. + + Underscored fields are special in Pydantic. + """ return [ ( {("_id" if key == "id" else key): _normalize_query_values(value) for key, value in condition.items()}, From dbe2a0991f95efd26841c033c949f569750ae22d Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 17 Aug 2026 15:13:34 -0700 Subject: [PATCH 570/591] refactor(ContributionStoredData): made a type alias for Contribution.data validator logic now lives in data.py:ContributionStoredData rather than directly in models --- .../mpcontribs_api/domains/_shared/units.py | 6 +- .../domains/contributions/data.py | 22 ++++- .../domains/contributions/models.py | 86 +++---------------- .../unit/domains/test_contributions_models.py | 14 +-- 4 files changed, 44 insertions(+), 84 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/units.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/units.py index bca9e64dd9..a2e096d950 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/units.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/units.py @@ -370,8 +370,7 @@ def merge_data(cls, existing: Any, patch: dict[str, Any]) -> dict[str, Any]: """The post-merge view of ``existing`` after applying ``patch``, matching :meth:`flatten_merge_paths`. Used to resolve identity (``unique_value``) against the same state the dotted ``$set`` will leave - behind, without re-reading after the write. Follows the identical per-key rule: re-derive a stored - quantity leaf that the patch touches, else descend nested dicts, else replace the key. + behind. """ merged = dict(existing) if isinstance(existing, dict) else {} for key, value in patch.items(): @@ -388,8 +387,7 @@ def merge_data(cls, existing: Any, patch: dict[str, Any]) -> dict[str, Any]: def try_from_value(cls, value: Any, key_unit: str | None) -> Self | None: """Build a leaf from an arbitrary scalar, or return ``None`` when it is categorical. - Handles both spreadsheet forms and reconciles the two possible unit sources (decision: - the key unit wins on conflict): + 3 accepted and handled case: - a number -> magnitude from the number, unit from ``key_unit`` (may be ``None``); - a string that does not start like a number (``"cubic"``) -> ``None`` (keep it verbatim); diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/data.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/data.py index c70c3eacd4..6f2bff9301 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/data.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/data.py @@ -238,10 +238,28 @@ def validate_contribution_data( return data -# Two field types over the same validator: inserts/whole-document writes are strict; a merge patch -# additionally permits leaf fragments (see ``allow_leaf_fragments`` above). +def validate_stored_contribution_data(data: dict[str, Any] | None) -> dict[str, Any] | None: + """Validate the persisted ``Contribution.data`` (depth + strict *plain* keys at every level). + + This is the stored-document counterpart to :func:`validate_contribution_data`. By the time a + :class:`~mpcontribs_api.domains.contributions.models.Contribution` is built, pivot/expansion has + already coerced every key to canonical snake_case, so the stored payload must satisfy the plain-key + rules at *every* level — the annotated-key grammar (``name (unit, cond=...)``) is no longer allowed + even at the top level. The depth bound is the same settings-driven limit as the input path, so the + two cannot drift. + """ + _validate_data_depth(data) + _validate_keys(data) + return data + + +# Three field types over one shared validation core, so the input, patch, and stored paths cannot +# drift on depth or key rules: inserts/whole-document writes are strict; a merge patch additionally +# permits leaf fragments (see ``allow_leaf_fragments`` above); the stored document requires fully +# coerced plain keys (no annotated-key grammar). ContributionData = Annotated[dict[str, Any] | None, BeforeValidator(validate_contribution_data)] ContributionPatchData = Annotated[ dict[str, Any] | None, BeforeValidator(partial(validate_contribution_data, allow_leaf_fragments=True)), ] +ContributionStoredData = Annotated[dict[str, Any] | None, BeforeValidator(validate_stored_contribution_data)] diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py index 32b8372fc4..d085087d12 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py @@ -1,7 +1,6 @@ -import re from dataclasses import dataclass from datetime import UTC, datetime -from typing import Annotated, Any, ClassVar +from typing import Any, ClassVar from beanie import ( Insert, @@ -15,7 +14,7 @@ ) from bson.errors import InvalidId from fastapi_filter import FilterDepends, with_prefix -from pydantic import BaseModel, BeforeValidator, Field, field_validator, model_validator +from pydantic import BaseModel, Field, field_validator, model_validator from pymongo import ASCENDING, IndexModel from mpcontribs_api._openapi import CONTRIBUTION_DATA_INPUT_DESCRIPTION, CONTRIBUTION_DATA_OUTPUT_DESCRIPTION @@ -23,60 +22,13 @@ from mpcontribs_api.domains._shared.models import BaseDocumentWithInput, DocumentOut from mpcontribs_api.domains._shared.types import ChemicalSystemId, Formula, Identity, MaterialId, Scalar, ShortStr from mpcontribs_api.domains.attachments.models import Attachment, AttachmentFilter, AttachmentIn -from mpcontribs_api.domains.contributions.data import ContributionData, ContributionPatchData +from mpcontribs_api.domains.contributions.data import ContributionData, ContributionPatchData, ContributionStoredData from mpcontribs_api.domains.structures.models import Structure, StructureFilter, StructureIn from mpcontribs_api.domains.tables.models import Table, TableFilter, TableIn from mpcontribs_api.exceptions import ValidationError from mpcontribs_api.projection import SparseFieldsModel -def _get_dict_depth(x) -> int: - if isinstance(x, dict): - return 1 + max((_get_dict_depth(v) for v in x.values()), default=0) - elif isinstance(x, list): - return max((_get_dict_depth(item) for item in x), default=0) - return 0 - - -def _validate_data_depth(data: dict[str, Any] | None) -> dict[str, Any] | None: - if data is None: - return None - depth = _get_dict_depth(data) - if depth > 7: - raise ValidationError("Depth of Contribution.data must be <= 7.", depth=depth) - return data - - -# Forbid punctuation, excluding: '*', '/' and exactly 1 '|' anywhere in string -_DATA_PUNCTUATION_PATTERN = re.compile(r"(?![^|]*\|[^|]*\|)[^\x21-\x29\x2B-\x2E\x3A-\x40\x5B-\x5E\x60\x7B\x7D-\x7E]*") - - -def _validate_keys(data: dict[str, Any] | None) -> dict[str, Any] | None: - if data is None: - return None - keys = list(data.keys()) - if not all(isinstance(k, str) and k.isascii() for k in keys): - raise ValidationError("Non-ASCII key found in Contribution.data. All dict keys must be only ASCII") - if any(k == "" for k in keys): - raise ValidationError("Empty key found in Contribution.data. Keys must be non-empty.") - if any(_DATA_PUNCTUATION_PATTERN.fullmatch(k) is None for k in keys): - raise ValidationError( - "Punctuation found in Contribution.data keys. Only '_', '*', '/', and at most 1 '|' permitted." - ) - # Recurse into nested dicts, including dicts nested inside lists. - for v in data.values(): - _validate_nested_keys(v) - return data - - -def _validate_nested_keys(value: Any) -> None: - if isinstance(value, dict): - _validate_keys(value) - elif isinstance(value, list): - for item in value: - _validate_nested_keys(item) - - def _value_at(data: dict[str, Any], path: str) -> Any: """Resolve a dotted ``path`` inside ``data``; raises ``KeyError`` if any segment is absent.""" cursor: Any = data @@ -155,13 +107,11 @@ def check_hierarchy(material_id: str | None, chemical_system_id: str | None, for class ContributionBase(BaseModel): """Shared fields for Contribution, ContributionIn, and ContributionOut. - Intentionally a plain ``BaseModel`` (not a ``Document``): only the stored ``Contribution`` - mixes in ``BaseDocumentWithInput``, so the input model never requires a client-supplied ``_id``. - ``data`` uses the annotation-aware ``ContributionData`` validator: raw input may carry the pivot grammar (``conductivity (S/cm, T=300K)``, dotted paths) and punctuation folded to ``_`` on write, while non-ASCII, empty-after-coercion, and reserved leaf keys are still rejected. The *strict* - key check (``_validate_keys``) is applied only to the coerced, stored ``Contribution.data``. + plain-key check (``ContributionStoredData``) is applied only to the coerced, stored + ``Contribution.data`` (see :class:`Contribution`). """ # Identifiers follow a specificity hierarchy: chemical_system_id > formula > material_id. @@ -189,26 +139,16 @@ class Settings: class Contribution(ContributionBase, BaseDocumentWithInput[PydanticObjectId]): - """Models what is actually stored in the database. + """Models what is actually stored in the database.""" - Only the stored document mixes in ``BaseDocumentWithInput`` (required ``_id``); ``ContributionIn`` - does not. Beanie reads ``Settings``/indexes off ``ContributionBase`` via the MRO. - """ + # Strict validation applies to what is stored: pivot has already coerced input keys to clean + # snake_case by the time a Contribution is built, so the stored path validates every key as a plain + # key at every level rather than parsing the annotated-key grammar raw ContributionIn input carries. + # ContributionStoredData shares data.py's depth + key core with the input/patch aliases, so the + # stored and input paths cannot drift on depth or key rules (see validate_stored_contribution_data). + data: ContributionStoredData - # Strict key validation applies to what is stored: pivot has already coerced input keys to clean - # snake_case by the time a Contribution is built, so the punctuation rule never sees the - # annotation grammar that raw ContributionIn input is allowed to carry. Typed to match the base's - # ``dict | None`` so the stricter validators are an override of the same field, not a new type. - data: Annotated[ - dict[str, Any] | None, - BeforeValidator(_validate_data_depth), - BeforeValidator(_validate_keys), - ] - - # Server-owned: the service extracts this from data at the project's unique_column path and stamps - # it on the doc (see ContributionService._resolve_identity). None when the project sets no - # unique_column, in which case the identity is the (project, material_id, chemical_system_id, - # formula) tuple. Never trusted from the request body. + # Server owner - uses Project.unique_column to extract the value from Contribution.data unique_value: Scalar | None = None # Server-owned pivot-condition discriminator; "" until pivoting is wired in (see Identity). condition_key: str = "" diff --git a/mpcontribs-api/tests/unit/domains/test_contributions_models.py b/mpcontribs-api/tests/unit/domains/test_contributions_models.py index 695c56c8a3..7cd93e4af0 100644 --- a/mpcontribs-api/tests/unit/domains/test_contributions_models.py +++ b/mpcontribs-api/tests/unit/domains/test_contributions_models.py @@ -138,11 +138,15 @@ def test_data_key_validation(self): with pytest.raises(ValidationError, match="reduces to an empty string"): _make_contribution_in(data={"***": "fail"}) - # The strict punctuation rule applies to the coerced, *stored* document. Pivot coerces input - # keys clean before a Contribution is built, so this only guards the stored invariant. The - # BeforeValidator runs before Beanie's collection lookup, so the ValidationError surfaces first. - with pytest.raises(ValidationError, match="Punctuation found in Contribution.data keys"): - Contribution(_id=PydanticObjectId(), project="p", chemical_system_id="Fe-O", data={"bad.key": 1}) + # The stored document shares the input path's key rules (ContributionStoredData draws on the + # same data.py core), so a coercible-punctuation key is accepted here just as on input, while + # reserved and non-ASCII keys are still rejected. The BeforeValidator runs before Beanie's + # collection lookup, so any ValidationError surfaces first. + Contribution(_id=PydanticObjectId(), project="p", chemical_system_id="Fe-O", data={"bad.key": 1}) + with pytest.raises(ValidationError, match="reserved"): + Contribution(_id=PydanticObjectId(), project="p", chemical_system_id="Fe-O", data={"group": {"unit": "x"}}) + with pytest.raises(ValidationError, match="Non-ASCII key found in Contribution.data"): + Contribution(_id=PydanticObjectId(), project="p", chemical_system_id="Fe-O", data={"ΔE": 1}) def test_reserved_leaf_keys_rejected(self): # A data key that coerces to a reserved value-leaf name is rejected on write. From 03f483c3b3bfc2f6d165001935ac7162d01b8833 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 17 Aug 2026 15:17:06 -0700 Subject: [PATCH 571/591] docs(contributions/models.py): removed excessive comments --- .../src/mpcontribs_api/domains/contributions/models.py | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py index d085087d12..3a3d15fea6 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py @@ -141,11 +141,7 @@ class Settings: class Contribution(ContributionBase, BaseDocumentWithInput[PydanticObjectId]): """Models what is actually stored in the database.""" - # Strict validation applies to what is stored: pivot has already coerced input keys to clean - # snake_case by the time a Contribution is built, so the stored path validates every key as a plain - # key at every level rather than parsing the annotated-key grammar raw ContributionIn input carries. - # ContributionStoredData shares data.py's depth + key core with the input/patch aliases, so the - # stored and input paths cannot drift on depth or key rules (see validate_stored_contribution_data). + # Strict validation over stored data rather than coercsion data: ContributionStoredData # Server owner - uses Project.unique_column to extract the value from Contribution.data @@ -158,9 +154,6 @@ class Contribution(ContributionBase, BaseDocumentWithInput[PydanticObjectId]): @classmethod def from_input_model(cls, data: ContributionIn) -> Contribution: - # Server-owned fields are not taken from input: the id is minted here (never accepted from the - # body), is_public starts False, components are inserted separately, last_modified is stamped - # by the before_event hook, and unique_value is resolved/stamped by the service. return cls.model_validate( { **data.model_dump(exclude={"is_public", "structures", "tables", "attachments", "last_modified"}), From 6182ade250da8e9359fb64716e723d38f3ac9b4b Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 17 Aug 2026 15:25:15 -0700 Subject: [PATCH 572/591] docs(pivot.py): removed reference to old concept of 'version --- .../src/mpcontribs_api/domains/contributions/pivot.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/pivot.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/pivot.py index a3d4bb845d..a7f38999ac 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/pivot.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/pivot.py @@ -32,7 +32,7 @@ class ExpandedContribution: """One pivoted contribution paired with its server-computed ``condition_key``. ``condition_key`` is carried alongside (not on the input model) so it is never taken from the - request body — mirroring how the service resolves ``version``. + request body. """ contribution: ContributionIn From 2f071d990f7d5e0afbffbc84856fe111b7cf4fec Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 17 Aug 2026 16:56:57 -0700 Subject: [PATCH 573/591] refactor(contributions): refactored coercion and handling of data keys --- .../mpcontribs_api/domains/_shared/paths.py | 24 ++++++ .../mpcontribs_api/domains/_shared/types.py | 56 +++++++++++++- .../domains/contributions/data.py | 49 +----------- .../domains/contributions/pivot.py | 75 +++++++------------ .../unit/domains/test_contributions_pivot.py | 22 +++--- 5 files changed, 119 insertions(+), 107 deletions(-) create mode 100644 mpcontribs-api/src/mpcontribs_api/domains/_shared/paths.py diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/paths.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/paths.py new file mode 100644 index 0000000000..d7656e2e8f --- /dev/null +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/paths.py @@ -0,0 +1,24 @@ +from typing import Any + +from mpcontribs_api.exceptions import ValidationError + + +def set_nested(target: dict[str, Any], segments: tuple[str, ...], value: Any) -> None: + """Write ``value`` at the dotted ``segments`` path inside ``target``. + + Raises: + ValidationError: if a segment collides with an existing leaf, or two source columns resolve + to the same path (e.g. the same name+conditions with different units). + """ + cursor = target + for seg in segments[:-1]: + existing = cursor.get(seg) + if existing is None: + existing = cursor[seg] = {} + elif not isinstance(existing, dict): + raise ValidationError(f"conflicting data paths: '{seg}' is both a value and a parent") + cursor = existing + leaf = segments[-1] + if leaf in cursor: + raise ValidationError(f"conflicting data columns resolve to the same path '{'.'.join(segments)}'") + cursor[leaf] = value diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py index 1130178f4f..f6b77f22bf 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/types.py @@ -1,7 +1,7 @@ import re import unicodedata from abc import ABC -from collections.abc import Mapping +from collections.abc import Callable, Mapping from dataclasses import MISSING, dataclass, fields from enum import StrEnum from functools import cache @@ -13,7 +13,7 @@ from pymatgen.core import Element from pymongo import ASCENDING, IndexModel -from mpcontribs_api.exceptions import ValidationError +from mpcontribs_api.exceptions import DataKeyError, ValidationError ShortStr = Annotated[str, Field(min_length=3, max_length=30)] @@ -351,6 +351,58 @@ def to_snake_case(name: str) -> str: DisplayStr = Annotated[str, BeforeValidator(func=nfc_normalize)] +def coerce_key(key: Any, *, require_ascii: bool = False, reserved: frozenset[str] | None = None) -> str: + """Coerce one dict key to canonical ``snake_case``, enforcing the shared write-path key guards. + + Always rejects a key that reduces to an empty string after coercion. The extra guards are opt-in + per call site, since not every caller wants them (e.g. the post-validation write path skips the + ASCII check because keys were already validated): + + - ``require_ascii``: reject a non-``str`` or non-ASCII key before coercion. + - ``reserved``: reject a coerced key that lands in the reserved-leaf-key set. + + Raises: + DataKeyError: on a non-ASCII (when required), empty-after-coercion, or reserved key. It is a + :class:`ValidationError` subclass, so callers catching either still see it. + """ + if require_ascii and (not isinstance(key, str) or not key.isascii()): + raise DataKeyError("Non-ASCII key found in Contribution.data. All dict keys must be only ASCII") + coerced = to_snake_case(key) + if not coerced: + raise DataKeyError(f"data key '{key}' reduces to an empty string after snake_case coercion") + if reserved is not None and coerced in reserved: + raise DataKeyError( + f"data key '{key}' is reserved for annotated-value leaves and may not be used", + key=key, + reserved=sorted(reserved), + ) + return coerced + + +def map_keys(value: Any, *, coerce: Callable[[Any], str], on_scalar: Callable[[Any], Any] = lambda x: x) -> Any: + """Recursively rebuild ``value`` with every dict key coerced via ``coerce``. + + Dicts have each key coerced (sibling collisions on the coerced name rejected) and their values + recursed; lists recurse element-wise; every scalar is passed through ``on_scalar`` (identity by + default). This is the shared walk behind the write-path key coercion. + + Raises: + DataKeyError: if two sibling keys collide on the same coerced name (``coerce`` may raise its + own errors per key). + """ + if isinstance(value, dict): + out: dict[str, Any] = {} + for key, sub in value.items(): + coerced = coerce(key) + if coerced in out: + raise DataKeyError("data keys collide after coercion", value=coerced) + out[coerced] = map_keys(sub, coerce=coerce, on_scalar=on_scalar) + return out + if isinstance(value, list): + return [map_keys(item, coerce=coerce, on_scalar=on_scalar) for item in value] + return on_scalar(value) + + @cache def _optional_field_names(cls: type) -> frozenset[str]: """Names of ``cls``'s dataclass fields whose type admits ``None`` (resolved through string annotations).""" diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/data.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/data.py index 6f2bff9301..659601662a 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/data.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/data.py @@ -5,7 +5,7 @@ from pydantic import BeforeValidator from mpcontribs_api.config import get_settings -from mpcontribs_api.domains._shared.types import to_snake_case +from mpcontribs_api.domains._shared.types import coerce_key from mpcontribs_api.domains._shared.units import QuantityLeaf from mpcontribs_api.exceptions import DataKeyError, ValidationError @@ -78,41 +78,6 @@ def parse_annotated_key(key: str) -> ParsedKey: return ParsedKey(path=path, unit=unit, conditions=conditions) -def _coerce_key(key: Any) -> str: - """Coerce one dict key to ``snake_case``, rejecting non-ASCII or empty-after-coercion keys.""" - if not isinstance(key, str) or not key.isascii(): - raise DataKeyError("Non-ASCII key found in Contribution.data. All dict keys must be only ASCII") - coerced = to_snake_case(key) - if not coerced: - raise DataKeyError(f"data key '{key}' reduces to an empty string after snake_case coercion") - return coerced - - -def coerce_keys(value: Any) -> Any: - """Recursively rebuild ``value`` with every dict key coerced to ``snake_case``. - - Walks dicts (coercing keys) and lists (element-wise), leaving scalars untouched. Used for the - nested/plain portions of ``data``; the annotated leaves produced by - :func:`mpcontribs_api.domains._shared.units.annotate_value` are already canonical and are never - routed through here. - - Raises: - ValidationError: if a key is non-ASCII, reduces to an empty string after coercion, or two - sibling keys collide on the same coerced name. - """ - if isinstance(value, dict): - out: dict[str, Any] = {} - for key, sub in value.items(): - coerced = _coerce_key(key) - if coerced in out: - raise DataKeyError(f"data keys collide after snake_case coercion: '{coerced}'") - out[coerced] = coerce_keys(sub) - return out - if isinstance(value, list): - return [coerce_keys(item) for item in value] - return value - - def _get_dict_depth(x: Any) -> int: # If x is a leaf (value + metadata) dict it counts as a single level of nesting (treat it as scalar) if QuantityLeaf.is_leaf(x): @@ -142,19 +107,9 @@ def _validate_plain_key(key: Any) -> None: run to ``_``. This only rejects keys that cannot be coerced into a usable token: non-ASCII, empty, or ones that reduce to an empty string after coercion (e.g. ``"***"``). """ - if not isinstance(key, str) or not key.isascii(): - raise ValidationError("Non-ASCII key found in Contribution.data. All dict keys must be only ASCII") if key == "": raise ValidationError("Empty key found in Contribution.data. Keys must be non-empty.") - coerced = to_snake_case(key) - if not coerced: - raise ValidationError(f"data key '{key}' reduces to an empty string after snake_case coercion") - if coerced in QuantityLeaf.reserved_keys(): - raise ValidationError( - f"data key '{key}' is reserved for annotated-value leaves and may not be used", - key=key, - reserved=sorted(QuantityLeaf.reserved_keys()), - ) + coerce_key(key, require_ascii=True, reserved=QuantityLeaf.reserved_keys()) def _validate_nested_keys(value: Any, *, allow_leaf_fragments: bool = False) -> None: diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/pivot.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/pivot.py index a7f38999ac..929d7345ea 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/pivot.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/pivot.py @@ -1,7 +1,8 @@ from dataclasses import dataclass from typing import TYPE_CHECKING, Any -from mpcontribs_api.domains._shared.types import to_snake_case +from mpcontribs_api.domains._shared.paths import set_nested +from mpcontribs_api.domains._shared.types import coerce_key, map_keys from mpcontribs_api.domains._shared.units import QuantityLeaf, UnitError, parse_condition_value from mpcontribs_api.domains.contributions.data import ( ParsedKey, @@ -39,25 +40,22 @@ class ExpandedContribution: condition_key: str -def _set_nested(target: dict[str, Any], segments: tuple[str, ...], value: Any) -> None: - """Write ``value`` at the dotted ``segments`` path inside ``target``. +def _try_coerce_leaf(value: Any, key_unit: str | None = None) -> Any: + """Promote a scalar to a quantity leaf, or keep it verbatim when categorical. + + The scalar half of the write-path "every numeric becomes a leaf" rule: a numeric (optionally + unit-carrying) value becomes a quantity-leaf dict via :meth:`QuantityLeaf.try_from_value`; a + categorical string or bool is kept as-is. ``key_unit`` (from a top-level annotated key) annotates + only a scalar value. Raises: - ValidationError: if a segment collides with an existing leaf, or two source columns resolve - to the same path (e.g. the same name+conditions with different units). + ValidationError: on a value whose unit cannot be parsed/reconciled. """ - cursor = target - for seg in segments[:-1]: - existing = cursor.get(seg) - if existing is None: - existing = cursor[seg] = {} - elif not isinstance(existing, dict): - raise ValidationError(f"conflicting data paths: '{seg}' is both a value and a parent") - cursor = existing - leaf = segments[-1] - if leaf in cursor: - raise ValidationError(f"conflicting data columns resolve to the same path '{'.'.join(segments)}'") - cursor[leaf] = value + try: + leaf = QuantityLeaf.try_from_value(value, key_unit) + except UnitError as err: + raise ValidationError(f"could not parse value {value!r}: {err}") from err + return leaf.as_dict() if leaf is not None else value def normalize_node(value: Any, key_unit: str | None = None) -> Any: @@ -70,33 +68,20 @@ def normalize_node(value: Any, key_unit: str | None = None) -> Any: - **list**: elements recurse, but scalar elements are left verbatim (a list is array data, not a column of measurements — mirrors :func:`mpcontribs_api.domains.contributions.stats.iter_leaves`, which never treats list scalars as columns). - - **scalar**: promoted to a quantity leaf via :meth:`QuantityLeaf.try_from_value` when it parses - as a number (optionally carrying a unit); otherwise kept verbatim (categorical string, bool). + - **scalar**: promoted to a quantity leaf via :func:`_try_coerce_leaf` when it parses as a number + (optionally carrying a unit); otherwise kept verbatim (categorical string, bool). ``key_unit`` (from a top-level annotated key) is applied only to a scalar value; when it labels a - dict/list value it has no scalar to annotate and is ignored. + dict/list value it has no scalar to annotate and is ignored (the recursive walk annotates no + nested scalar with a unit). Raises: ValidationError: on a key that empties after coercion, a sibling-key collision, or a value whose unit cannot be parsed/reconciled. """ - if isinstance(value, dict): - out: dict[str, Any] = {} - for key, sub in value.items(): - coerced = to_snake_case(key) - if not coerced: - raise ValidationError(f"data key '{key}' reduces to an empty string after snake_case coercion") - if coerced in out: - raise ValidationError(f"data keys collide after snake_case coercion: '{coerced}'") - out[coerced] = normalize_node(sub) - return out - if isinstance(value, list): - return [normalize_node(item) for item in value] - try: - leaf = QuantityLeaf.try_from_value(value, key_unit) - except UnitError as err: - raise ValidationError(f"could not parse value {value!r}: {err}") from err - return leaf.as_dict() if leaf is not None else value + if isinstance(value, (dict, list)): + return map_keys(value, coerce=coerce_key, on_scalar=_try_coerce_leaf) + return _try_coerce_leaf(value, key_unit) def expand_data(data: dict[str, Any]) -> list[ExpandedData]: @@ -136,9 +121,7 @@ def expand_data(data: dict[str, Any]) -> list[ExpandedData]: # any other key (values and the unit are left verbatim). parsed_conditions: dict[str, Any] = {} for name, val in pk.conditions.items(): - cname = to_snake_case(name) - if not cname: - raise ValidationError(f"condition name '{name}' reduces to empty after snake_case coercion") + cname = coerce_key(name) if cname in parsed_conditions: raise ValidationError(f"condition names collide after snake_case coercion: '{cname}'") parsed_conditions[cname] = parse_condition_value(val) @@ -147,15 +130,9 @@ def expand_data(data: dict[str, Any]) -> list[ExpandedData]: # First signature seen for this canonical key wins the stored condition columns. group_conditions.setdefault(ckey, parsed_conditions) - def _coerce_segments(pk: ParsedKey) -> tuple[str, ...]: - segments = tuple(to_snake_case(seg) for seg in pk.segments) - if any(not seg for seg in segments): - raise ValidationError(f"data key '{pk.path}' has a path segment that is empty after snake_case coercion") - return segments - def _annotate_column(row_data: dict[str, Any], raw_key: str, pk: ParsedKey) -> None: leaf = normalize_node(data[raw_key], pk.unit if pk.is_annotated else None) - _set_nested(row_data, _coerce_segments(pk), leaf) + set_nested(row_data, tuple(coerce_key(seg) for seg in pk.segments), leaf) def _finalize(row_data: dict[str, Any], ckey: str) -> ExpandedData: # model_copy (in expand_contribution) and the patch path both skip Pydantic validators, so @@ -174,9 +151,9 @@ def _finalize(row_data: dict[str, Any], ckey: str) -> ExpandedData: for ckey, members in groups.items(): row_data = {} # Conditions become ordinary columns first, so a measurement colliding with a condition name - # is caught by _set_nested. + # is caught by set_nested. for name, leaf in group_conditions[ckey].items(): - _set_nested(row_data, (name,), leaf) + set_nested(row_data, (name,), leaf) for raw_key, pk in members: _annotate_column(row_data, raw_key, pk) for raw_key, pk in broadcast: diff --git a/mpcontribs-api/tests/unit/domains/test_contributions_pivot.py b/mpcontribs-api/tests/unit/domains/test_contributions_pivot.py index 9db71bbab2..b1e7782358 100644 --- a/mpcontribs-api/tests/unit/domains/test_contributions_pivot.py +++ b/mpcontribs-api/tests/unit/domains/test_contributions_pivot.py @@ -1,12 +1,16 @@ import math +from functools import partial import pytest -from mpcontribs_api.domains._shared.types import to_snake_case +from mpcontribs_api.domains._shared.types import coerce_key, map_keys, to_snake_case from mpcontribs_api.domains.contributions.data import ( - coerce_keys, parse_annotated_key, ) + +# The recursive snake_case key walk formerly exposed as ``data.coerce_keys`` — now the shared +# ``map_keys`` driven by ``coerce_key`` with the strict (ASCII-checking) key guard. +_coerce_keys = partial(map_keys, coerce=partial(coerce_key, require_ascii=True)) from mpcontribs_api.domains.contributions.models import ContributionIn from mpcontribs_api.domains.contributions.pivot import expand_contribution from mpcontribs_api.exceptions import DataKeyError, ValidationError @@ -24,7 +28,7 @@ def _contrib_in(data, **overrides) -> ContributionIn: # --------------------------------------------------------------------------- -# to_snake_case / coerce_keys +# to_snake_case / map_keys + coerce_key # --------------------------------------------------------------------------- @@ -51,26 +55,26 @@ def test_only_separators_reduces_to_empty(self): assert to_snake_case("***") == "" -class TestCoerceKeys: +class TestMapKeys: def test_recurses_dicts_and_lists(self): - out = coerce_keys({"Band Gap": {"pH-Value": 1}, "List": [{"Inner Key": 2}]}) + out = _coerce_keys({"Band Gap": {"pH-Value": 1}, "List": [{"Inner Key": 2}]}) assert out == {"band_gap": {"ph_value": 1}, "list": [{"inner_key": 2}]} def test_leaves_values_untouched(self): # only keys are coerced; string/number values pass through verbatim - assert coerce_keys({"Key": "Value.With/Punct"}) == {"key": "Value.With/Punct"} + assert _coerce_keys({"Key": "Value.With/Punct"}) == {"key": "Value.With/Punct"} def test_collision_raises(self): with pytest.raises(ValidationError, match="collide after snake_case coercion"): - coerce_keys({"Band Gap": 1, "band_gap": 2}) + _coerce_keys({"Band Gap": 1, "band_gap": 2}) def test_non_ascii_key_raises(self): with pytest.raises(ValidationError, match="Non-ASCII"): - coerce_keys({"ΔE": 1}) + _coerce_keys({"ΔE": 1}) def test_empty_after_coercion_raises(self): with pytest.raises(ValidationError, match="reduces to an empty string"): - coerce_keys({"***": 1}) + _coerce_keys({"***": 1}) # --------------------------------------------------------------------------- From ab739d157c0c06ed7b51bb480d3105865f4613dd Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Mon, 17 Aug 2026 17:00:02 -0700 Subject: [PATCH 574/591] refactor(MongoDbContributionRepository): refactored how (list_)referneced_components_ids is structured reduced code duplication and unnecessary abstractions --- .../mpcontribs_api/domains/_shared/service.py | 4 +- .../domains/contributions/repository.py | 54 ++++++------------- .../unit/domains/test_component_service.py | 14 ++--- 3 files changed, 27 insertions(+), 45 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/service.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/service.py index d3ce92337e..a8885f2433 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/service.py @@ -65,7 +65,7 @@ async def get_many( reachability: results are restricted to ids referenced by a contribution the caller is allowed to see """ - allowed = await self._contributions.list_referenced_component_ids(self._ref_field, scoped=True) + allowed = await self._contributions.referenced_component_ids(self._ref_field, scoped=True) return await self._components.get_many( pagination=pagination, filter=filter, fields=fields, restrict_ids=allowed ) @@ -110,7 +110,7 @@ async def download( s3: AbstractAsyncContextManager[S3Client], ) -> AsyncIterable[bytes]: """Stream a gzip-compressed export of matching components. See ``download``.""" - allowed = await self._contributions.list_referenced_component_ids(self._ref_field, scoped=True) + allowed = await self._contributions.referenced_component_ids(self._ref_field, scoped=True) return self._components.download( format=format, short_mime=short_mime, diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py index b4a5d6a8dd..787a7007ca 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py @@ -260,30 +260,38 @@ async def existing_identities(self, identities: list[ContributionIdentity]) -> s found.add(ContributionIdentity.from_document(doc)) return found - async def _scan_referenced_ids( + async def referenced_component_ids( self, ref_field: str, - match: dict[str, Any], + ids: list[PydanticObjectId] | None = None, *, scoped: bool, - target: set[PydanticObjectId] | None = None, ) -> set[PydanticObjectId]: """Return component ids referenced through ``ref_field`` by matching contributions. Beanie stores each ``Link`` as a DBRef (``{"$ref": ..., "$id": ObjectId}``), so a component - is referenced when its id appears under ``.$id``. ``match`` is the query applied - to that path ("$in" a candidate list, or "$exists" to enumerate all). When ``target`` is - given only ids in it are kept (the candidate-subset case); otherwise every referenced id is - returned. ``scoped`` merges the user scope into the query (access gate) when ``True``. + is referenced when its id appears under ``.$id``. When ``ids`` is given, only that + candidate subset is tested and the returned set is a subset of ``ids`` (access-gate / + reachability check); when ``ids`` is ``None``, every referenced id is enumerated. ``scoped`` + merges the user scope into the query (access gate) when ``True``; when ``False`` the check + spans every contribution (global integrity check). Args: ref_field: the contribution link field to inspect ("structures" | "tables" | "attachments"). Always a fixed class-attr at the call site, never user input. - match: the query predicate for ``.$id`` + ids: optional candidate list; when given, only ids in it are returned scoped: when ``True`` the user scope is applied; when ``False`` the check spans every contribution (global integrity check) - target: optional candidate set; when given, only ids in it are returned """ + if ids is None: + match: dict[str, Any] = {"$exists": True} + target: set[PydanticObjectId] | None = None + elif not ids: + return set() + else: + match = {"$in": ids} + target = set(ids) + query: dict[str, Any] = {f"{ref_field}.$id": match} if scoped and self._scope: query = {"$and": [self._scope, query]} @@ -296,34 +304,6 @@ async def _scan_referenced_ids( referenced.add(rid) return referenced - async def referenced_component_ids( - self, - ref_field: str, - ids: list[PydanticObjectId], - *, - scoped: bool, - ) -> set[PydanticObjectId]: - """Return the subset of ``ids`` referenced by contributions through ``ref_field``. - - Access-gate / reachability check for a known candidate list. See :meth:`_scan_referenced_ids`. - """ - if not ids: - return set() - return await self._scan_referenced_ids(ref_field, {"$in": ids}, scoped=scoped, target=set(ids)) - - async def list_referenced_component_ids( - self, - ref_field: str, - *, - scoped: bool, - ) -> set[PydanticObjectId]: - """Return every component id referenced through ``ref_field`` by matching contributions. - - Unlike :meth:`referenced_component_ids`, this takes no candidate list — it enumerates all - ids reachable from contributions in scope. See :meth:`_scan_referenced_ids`. - """ - return await self._scan_referenced_ids(ref_field, {"$exists": True}, scoped=scoped) - async def aggregate_project_stats(self, project_id: str) -> ProjectAggregate: """Recompute derived stats/columns for one project from its current contributions. diff --git a/mpcontribs-api/tests/unit/domains/test_component_service.py b/mpcontribs-api/tests/unit/domains/test_component_service.py index 53f86ce17d..d75b02c009 100644 --- a/mpcontribs-api/tests/unit/domains/test_component_service.py +++ b/mpcontribs-api/tests/unit/domains/test_component_service.py @@ -35,9 +35,9 @@ def _make_service( contributions = AsyncMock(name="contributions") - async def _referenced(ref_field, ids, *, scoped): + async def _referenced(ref_field, ids=None, *, scoped): pool = reachable if scoped else referenced - return {i for i in ids if i in pool} + return set(pool) if ids is None else {i for i in ids if i in pool} contributions.referenced_component_ids = AsyncMock(side_effect=_referenced) @@ -160,11 +160,12 @@ def _make_read_service(*, reachable: set[PydanticObjectId]) -> tuple[ComponentSe contributions = AsyncMock(name="contributions") - async def _referenced(ref_field, ids, *, scoped): + async def _referenced(ref_field, ids=None, *, scoped): + if ids is None: + return set(reachable) if scoped else set() return {i for i in ids if i in reachable} if scoped else set() contributions.referenced_component_ids = AsyncMock(side_effect=_referenced) - contributions.list_referenced_component_ids = AsyncMock(return_value=reachable) service = ComponentService(components, contributions, ref_field="attachments") return service, components, contributions @@ -198,8 +199,9 @@ async def test_get_many_restricts_to_reachable_ids(): await svc.get_many(filter=AttachmentFilter(), pagination=None, fields=None) - contributions.list_referenced_component_ids.assert_awaited_once() - assert contributions.list_referenced_component_ids.await_args.kwargs["scoped"] is True + contributions.referenced_component_ids.assert_awaited_once() + assert contributions.referenced_component_ids.await_args.kwargs["scoped"] is True + assert contributions.referenced_component_ids.await_args.args[1:] == () restrict = components.get_many.await_args.kwargs["restrict_ids"] assert set(restrict) == {a, b} From 44056c80829d76afebd12e701e40d7ef890d9477 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Tue, 18 Aug 2026 09:55:49 -0700 Subject: [PATCH 575/591] docs(ContributionService): reduced verbose docstrings --- .../domains/contributions/service.py | 31 +++++-------------- 1 file changed, 7 insertions(+), 24 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py index 3ddacf8ea6..1b8186bc61 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py @@ -55,15 +55,12 @@ class PreparedWrite: """One expanded (pivoted) contribution carried through the bulk-write pipeline. - Expansion can turn a single submitted contribution into many rows (see - :func:`mpcontribs_api.domains.contributions.pivot.expand_contribution`); every row keeps the - ``index`` of the submission it came from so per-item failures report against the original batch - position, and carries the server-computed ``condition_key`` that (with project+identifier) + Every row keeps the ``index`` of the submission it came from so per-item failures report + against the original batch position, and carries the server-computed ``condition_key`` that identifies it. - ``unique_value`` is ``None`` until identity resolution (see ``_resolve_identity``) promotes the - project's ``unique_column`` value out of the contribution's ``data``; it then travels with the - row into the write. + ``unique_value`` is ``None`` until identity resolution promotes the project's ``unique_column`` + value out of the contribution's ``data``. """ index: int @@ -131,9 +128,6 @@ async def insert_contributions( by ``settings.mongo.max_concurrent_transactions``. Per-item failures are returned in the summary's ``failed`` list; the request as a whole does not raise on partial failure. - A duplicate identity ``(project, material_id, chemical_system_id, formula, unique_value, - condition_key)`` is rejected as a conflict. See ``_resolve_identity``. - Args: contributions: contributions to insert; may include nested structures/tables/attachments @@ -162,14 +156,7 @@ def _expand_batch( self, contributions: list[ContributionIn], ) -> tuple[list[BulkFailure], list[PreparedWrite]]: - """Annotate units and pivot each submission on its conditions, keeping the original index. - - A submission may expand into several rows (one per condition signature) or be rejected as a - whole (malformed annotation or colliding columns). Any components on the submission ride - along on every resulting row (see :func:`...pivot.expand_contribution`). A rejection becomes - a single ``BulkFailure`` against the submission's original index; every surviving row carries - that index and its ``condition_key`` forward. - """ + """Annotate units and pivot each submission on its conditions, keeping the original index.""" failures: list[BulkFailure] = [] prepared: list[PreparedWrite] = [] for i, contrib in enumerate(contributions): @@ -189,10 +176,6 @@ def _split_unauthorized( ) -> tuple[list[BulkFailure], list[PreparedWrite]]: """Reject contributions whose ``project`` the current user is not permitted to write. - Authorized iff the user is an admin (writes anything) or the contribution's ``project`` is - one of the user's groups. Anonymous users are blocked at the router, but carry no groups and - are not admins, so they fall through to authorized-for-nothing here (defense-in-depth). - Partitions ``items`` into unauthorized ``BulkFailure`` entries and the remaining authorized items that should proceed. Mirrors ``_split_oversize`` (same shape) so callers can chain the splits and keep each item in exactly one bucket, preserving input ordering. @@ -256,7 +239,7 @@ async def _resolve_identity( # First pass: validate accessibility + resolve each unique_value, collecting identity tuples # so the existence check can be batched into a single query. condition_key is server-computed - # by pivot and carried on each PreparedWrite, so it travels with the resolved row. + # by pivot and carried on each PreparedWrite resolved: list[tuple[int, ContributionIn, Scalar | None, str]] = [] keys: list[ContributionIdentity] = [] for item in items: @@ -302,7 +285,7 @@ async def _resolve_identity( keys.append(contrib.identity(unique_value, condition_key)) # Second pass (insert only): reject identity collisions against existing docs and earlier - # items in this batch. Upsert skips this — an existing identity is the update target and the + # items in this batch. Upsert skips this - an existing identity is the update target and the # unique index arbitrates intra-batch races. if is_upsert: plan.extend( From 55e41f4cb6139c40f62699d9e59419beb78b0788 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Tue, 18 Aug 2026 09:59:02 -0700 Subject: [PATCH 576/591] refactor(ContributionService): inlined _log_quota_exceeded as it was only used once --- .../domains/contributions/service.py | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py index 1b8186bc61..8af53e9eb3 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py @@ -385,7 +385,20 @@ async def _split_quota_exceeded( rejected.append(item) if not rejected: continue - self._log_quota_exceeded(project_id, cap, stored, len(items) - len(rejected), rejected) + + rejected_identifiers = [item.contribution.material_id for item in rejected[:_QUOTA_LOG_IDENTIFIER_CAP]] + if len(rejected_identifiers): + logger.warning( + "contribution.unapproved_quota_exceeded", + project=project_id, + max_allowed=cap, + stored=stored, + attempted=len(items) + len(rejected), + accepted=len(items), + rejected=len(rejected), + rejected_identifiers=rejected_identifiers, + rejected_identifiers_truncated=len(rejected) > _QUOTA_LOG_IDENTIFIER_CAP, + ) exc = PermissionError( "Attempted to add more than the allowed number of unapproved contributions", project=project_id, From 448e12289fbd2494bc02a759de9e8e4d136cfef8 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Tue, 18 Aug 2026 11:17:43 -0700 Subject: [PATCH 577/591] build(requirements/): restored requirements to their status on dev --- mpcontribs-api/requirements/deployment.txt | 551 +++++++++++++++ .../requirements/ubuntu-latest_py3.11.txt | 544 +++++++++++++++ .../ubuntu-latest_py3.11_extras.txt | 638 ++++++++++++++++++ .../requirements/ubuntu-latest_py3.12.txt | 541 +++++++++++++++ .../ubuntu-latest_py3.12_extras.txt | 635 +++++++++++++++++ 5 files changed, 2909 insertions(+) create mode 100644 mpcontribs-api/requirements/deployment.txt create mode 100644 mpcontribs-api/requirements/ubuntu-latest_py3.11.txt create mode 100644 mpcontribs-api/requirements/ubuntu-latest_py3.11_extras.txt create mode 100644 mpcontribs-api/requirements/ubuntu-latest_py3.12.txt create mode 100644 mpcontribs-api/requirements/ubuntu-latest_py3.12_extras.txt diff --git a/mpcontribs-api/requirements/deployment.txt b/mpcontribs-api/requirements/deployment.txt new file mode 100644 index 0000000000..aa410cf409 --- /dev/null +++ b/mpcontribs-api/requirements/deployment.txt @@ -0,0 +1,551 @@ +# +# This file is autogenerated by pip-compile with Python 3.11 +# by the following command: +# +# pip-compile --output-file=MPContribs/mpcontribs-api/requirements/deployment.txt MPContribs/mpcontribs-api/pyproject.toml python/requirements.txt +# +anyio==4.14.2 + # via jupyter-server +apispec==5.2.2 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +argon2-cffi==25.1.0 + # via + # jupyter-server + # notebook +argon2-cffi-bindings==25.1.0 + # via argon2-cffi +arrow==1.4.0 + # via isoduration +asn1crypto==1.5.1 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +asttokens==3.0.2 + # via stack-data +atlasq-tschaume==0.11.1.dev2 + # via flask-mongorest-mpcontribs +attrs==26.1.0 + # via + # jsonschema + # referencing +backports-zstd==1.6.0 + # via flask-compress +beautifulsoup4==4.15.0 + # via nbconvert +bibtexparser==1.4.4 + # via pymatgen-core +bleach[css]==6.4.0 + # via nbconvert +blinker==1.9.0 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +boltons==26.0.0 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +boto3==1.43.47 + # via flask-mongorest-mpcontribs +botocore==1.43.47 + # via + # boto3 + # s3transfer +brotli==1.2.0 + # via flask-compress +bytecode==0.18.1 + # via ddtrace +certifi==2026.6.17 + # via requests +cffi==2.1.0 + # via + # argon2-cffi-bindings + # cryptography +charset-normalizer==3.4.9 + # via requests +click==8.4.2 + # via + # flask + # rq +comm==0.2.3 + # via ipykernel +contourpy==1.3.3 + # via matplotlib +cramjam==2.11.0 + # via python-snappy +crontab==1.0.5 + # via rq-scheduler +cryptography==49.0.0 + # via pyopenssl +css-html-js-minify==2.5.5 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +cycler==0.12.1 + # via matplotlib +dateparser==1.4.1 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +ddtrace==4.3.0 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +debugpy==1.8.21 + # via ipykernel +decorator==5.3.1 + # via ipython +defusedxml==0.7.1 + # via nbconvert +dnspython==2.8.0 + # via + # mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) + # pymongo +entrypoints==0.4 + # via jupyter-client +envier==0.6.1 + # via ddtrace +executing==2.2.1 + # via stack-data +fastjsonschema==2.21.2 + # via nbformat +fastnumbers==5.2.0 + # via flask-mongorest-mpcontribs +filetype==1.2.0 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +flasgger-tschaume==0.9.7 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +flask==2.2.5 + # via + # flasgger-tschaume + # flask-compress + # flask-marshmallow + # flask-mongoengine-tschaume + # flask-rq2 + # flask-sse +flask-compress==1.24 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +flask-marshmallow==1.4.0 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +flask-mongoengine-tschaume==1.1.0 + # via flask-mongorest-mpcontribs +flask-mongorest-mpcontribs==3.3.0 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +flask-rq2==18.3 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +flask-sse==1.0.0 + # via flask-mongorest-mpcontribs +flatten-dict==0.5.0 + # via flask-mongorest-mpcontribs +flexcache==0.3 + # via pint +flexparser==0.4 + # via pint +fonttools==4.63.0 + # via matplotlib +fqdn==1.5.1 + # via jsonschema +freezegun==1.5.5 + # via rq-scheduler +gevent==26.5.0 + # via gunicorn +greenlet==3.5.3 + # via gevent +gunicorn[gevent]==24.1.1 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +idna==3.18 + # via + # anyio + # jsonschema + # requests +ipykernel==6.29.5 + # via + # nbclassic + # notebook +ipython==9.15.0 + # via ipykernel +ipython-genutils==0.2.0 + # via + # nbclassic + # notebook +ipython-pygments-lexers==1.1.1 + # via ipython +isoduration==20.11.0 + # via jsonschema +itsdangerous==2.2.0 + # via flask +jedi==0.20.0 + # via ipython +jinja2==3.1.6 + # via + # flask + # jupyter-server + # mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) + # nbconvert + # notebook +jmespath==1.1.0 + # via + # boto3 + # botocore +joblib==1.5.3 + # via pymatgen-core +json2html==1.3.0 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +jsonpointer==3.1.1 + # via jsonschema +jsonschema[format-nongpl]==4.26.0 + # via + # flasgger-tschaume + # jupyter-events + # nbformat +jsonschema-specifications==2025.9.1 + # via jsonschema +jupyter-client==7.4.9 + # via + # ipykernel + # jupyter-server + # nbclient + # notebook +jupyter-core==5.9.1 + # via + # ipykernel + # jupyter-client + # jupyter-server + # nbclient + # nbconvert + # nbformat + # notebook +jupyter-events==0.12.1 + # via jupyter-server +jupyter-server==2.20.0 + # via notebook-shim +jupyter-server-terminals==0.5.4 + # via jupyter-server +jupyterlab-pygments==0.3.0 + # via nbconvert +kiwisolver==1.5.0 + # via matplotlib +lark==1.3.1 + # via rfc3987-syntax +lxml==6.1.1 + # via pymatgen-core +markupsafe==3.0.3 + # via + # jinja2 + # nbconvert + # werkzeug +marshmallow==3.26.2 + # via + # flask-marshmallow + # marshmallow-mongoengine + # mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +marshmallow-mongoengine==0.31.2 + # via flask-mongorest-mpcontribs +matplotlib==3.11.0 + # via + # -r python/requirements.txt + # pymatgen-core +matplotlib-inline==0.2.2 + # via + # ipykernel + # ipython +mimerender-pr36==0.0.2 + # via flask-mongorest-mpcontribs +mistune==3.3.3 + # via + # flasgger-tschaume + # nbconvert +mongoengine==0.29.3 + # via + # atlasq-tschaume + # flask-mongoengine-tschaume + # marshmallow-mongoengine +monty==2026.5.18 + # via pymatgen-core +more-itertools==11.1.0 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +mpmath==1.3.0 + # via sympy +narwhals==2.24.0 + # via plotly +nbclassic==1.3.3 + # via notebook +nbclient==0.11.0 + # via nbconvert +nbconvert==7.17.1 + # via + # jupyter-server + # notebook +nbformat==5.10.4 + # via + # jupyter-server + # mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) + # nbclient + # nbconvert + # notebook +nest-asyncio==1.6.0 + # via + # ipykernel + # jupyter-client + # nbclassic + # notebook +networkx==3.6.1 + # via pymatgen-core +notebook==6.5.7 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +notebook-shim==0.2.4 + # via nbclassic +numpy==2.4.6 + # via + # -r python/requirements.txt + # contourpy + # matplotlib + # monty + # mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) + # pandas + # pymatgen-core + # scipy + # spglib +opentelemetry-api==1.43.0 + # via ddtrace +orjson==3.11.9 + # via + # flask-mongorest-mpcontribs + # pymatgen-core +overrides==7.7.0 + # via jupyter-server +packaging==26.2 + # via + # gunicorn + # ipykernel + # jupyter-events + # jupyter-server + # marshmallow + # matplotlib + # nbconvert + # plotly +palettable==3.3.3 + # via pymatgen-core +pandas==3.0.3 + # via + # -r python/requirements.txt + # pymatgen-core +pandocfilters==1.5.1 + # via nbconvert +parso==0.8.7 + # via jedi +pexpect==4.9.0 + # via ipython +pillow==12.3.0 + # via matplotlib +pint==0.25.3 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +platformdirs==4.10.0 + # via + # jupyter-core + # pint +plotly==6.9.0 + # via pymatgen-core +prometheus-client==0.25.0 + # via + # jupyter-server + # notebook +prompt-toolkit==3.0.52 + # via ipython +psutil==7.2.2 + # via + # ipykernel + # ipython +psycopg2-binary==2.9.12 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +ptyprocess==0.7.0 + # via + # pexpect + # terminado +pure-eval==0.2.3 + # via stack-data +pycparser==3.0 + # via cffi +pygments==2.20.0 + # via + # ipython + # ipython-pygments-lexers + # nbconvert +pymatgen==2026.5.4 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +pymatgen-core==2026.5.18 + # via pymatgen +pymongo==4.17.0 + # via + # flask-mongorest-mpcontribs + # mongoengine +pyopenssl==26.3.0 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +pyparsing==3.3.2 + # via + # bibtexparser + # matplotlib +python-dateutil==2.9.0.post0 + # via + # arrow + # botocore + # dateparser + # flask-mongorest-mpcontribs + # freezegun + # jupyter-client + # matplotlib + # pandas + # rq-scheduler +python-json-logger==4.1.0 + # via jupyter-events +python-mimeparse==2.0.0 + # via mimerender-pr36 +python-snappy==0.7.3 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +pytz==2026.2 + # via dateparser +pyyaml==6.0.3 + # via + # flasgger-tschaume + # jupyter-events +pyzmq==27.1.0 + # via + # ipykernel + # jupyter-client + # jupyter-server + # notebook +redis==8.0.1 + # via + # flask-rq2 + # flask-sse + # rq +referencing==0.37.0 + # via + # jsonschema + # jsonschema-specifications + # jupyter-events +regex==2026.7.10 + # via dateparser +requests==2.34.2 + # via + # atlasq-tschaume + # pymatgen-core +rfc3339-validator==0.1.4 + # via + # jsonschema + # jupyter-events +rfc3986-validator==0.1.1 + # via + # jsonschema + # jupyter-events +rfc3987-syntax==1.1.0 + # via jsonschema +rpds-py==2026.6.3 + # via + # jsonschema + # referencing +rq==2.3.2 + # via + # flask-rq2 + # mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) + # rq-scheduler +rq-scheduler==0.14.0 + # via flask-rq2 +ruamel-yaml==0.19.1 + # via monty +s3transfer==0.19.1 + # via boto3 +scipy==1.17.1 + # via + # -r python/requirements.txt + # pymatgen-core +send2trash==2.1.0 + # via + # jupyter-server + # notebook +setproctitle==1.3.7 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +six==1.17.0 + # via + # flasgger-tschaume + # flask-sse + # python-dateutil + # rfc3339-validator +soupsieve==2.8.4 + # via beautifulsoup4 +spglib==2.7.0 + # via pymatgen-core +stack-data==0.6.3 + # via ipython +supervisor==4.3.0 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +sympy==1.14.0 + # via pymatgen-core +tabulate==0.10.0 + # via pymatgen-core +terminado==0.18.1 + # via + # jupyter-server + # jupyter-server-terminals + # notebook +tinycss2==1.5.1 + # via bleach +tornado==6.5.7 + # via + # ipykernel + # jupyter-client + # jupyter-server + # notebook + # terminado +tqdm==4.68.4 + # via pymatgen-core +traitlets==5.15.1 + # via + # ipykernel + # ipython + # jupyter-client + # jupyter-core + # jupyter-events + # jupyter-server + # matplotlib-inline + # nbclient + # nbconvert + # nbformat + # notebook +typing-extensions==4.16.0 + # via + # anyio + # beautifulsoup4 + # flexcache + # flexparser + # ipython + # opentelemetry-api + # pint + # pyopenssl + # referencing + # spglib +tzdata==2026.3 + # via arrow +tzlocal==5.4.4 + # via dateparser +uncertainties==3.2.3 + # via + # mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) + # pymatgen-core +uri-template==1.3.0 + # via jsonschema +urllib3==2.7.0 + # via + # botocore + # requests +wcwidth==0.8.2 + # via prompt-toolkit +webcolors==25.10.0 + # via jsonschema +webencodings==0.5.1 + # via + # bleach + # tinycss2 +websocket-client==1.9.0 + # via + # jupyter-server + # mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) +werkzeug==3.1.8 + # via + # flasgger-tschaume + # flask +wrapt==2.2.2 + # via ddtrace +zope-event==6.2 + # via gevent +zope-interface==8.5 + # via gevent +zstandard==0.25.0 + # via mpcontribs-api (MPContribs/mpcontribs-api/pyproject.toml) diff --git a/mpcontribs-api/requirements/ubuntu-latest_py3.11.txt b/mpcontribs-api/requirements/ubuntu-latest_py3.11.txt new file mode 100644 index 0000000000..299cac5493 --- /dev/null +++ b/mpcontribs-api/requirements/ubuntu-latest_py3.11.txt @@ -0,0 +1,544 @@ +# +# This file is autogenerated by pip-compile with Python 3.11 +# by the following command: +# +# pip-compile --output-file=requirements/ubuntu-latest_py3.11.txt +# +anyio==4.14.1 + # via jupyter-server +apispec==5.2.2 + # via mpcontribs-api (pyproject.toml) +argon2-cffi==25.1.0 + # via + # jupyter-server + # notebook +argon2-cffi-bindings==25.1.0 + # via argon2-cffi +arrow==1.4.0 + # via isoduration +asn1crypto==1.5.1 + # via mpcontribs-api (pyproject.toml) +asttokens==3.0.1 + # via stack-data +atlasq-tschaume==0.11.1.dev2 + # via flask-mongorest-mpcontribs +attrs==26.1.0 + # via + # jsonschema + # referencing +backports-zstd==1.6.0 + # via flask-compress +beautifulsoup4==4.15.0 + # via nbconvert +bibtexparser==1.4.4 + # via pymatgen-core +bleach[css]==6.4.0 + # via nbconvert +blinker==1.9.0 + # via mpcontribs-api (pyproject.toml) +boltons==26.0.0 + # via mpcontribs-api (pyproject.toml) +boto3==1.43.45 + # via flask-mongorest-mpcontribs +botocore==1.43.45 + # via + # boto3 + # s3transfer +brotli==1.2.0 + # via flask-compress +bytecode==0.18.1 + # via ddtrace +certifi==2026.6.17 + # via requests +cffi==2.1.0 + # via + # argon2-cffi-bindings + # cryptography +charset-normalizer==3.4.9 + # via requests +click==8.4.2 + # via + # flask + # rq +comm==0.2.3 + # via ipykernel +contourpy==1.3.3 + # via matplotlib +cramjam==2.11.0 + # via python-snappy +crontab==1.0.5 + # via rq-scheduler +cryptography==49.0.0 + # via pyopenssl +css-html-js-minify==2.5.5 + # via mpcontribs-api (pyproject.toml) +cycler==0.12.1 + # via matplotlib +dateparser==1.4.1 + # via mpcontribs-api (pyproject.toml) +ddtrace==4.3.0 + # via mpcontribs-api (pyproject.toml) +debugpy==1.8.21 + # via ipykernel +decorator==5.3.1 + # via ipython +defusedxml==0.7.1 + # via nbconvert +dnspython==2.8.0 + # via + # mpcontribs-api (pyproject.toml) + # pymongo +entrypoints==0.4 + # via jupyter-client +envier==0.6.1 + # via ddtrace +executing==2.2.1 + # via stack-data +fastjsonschema==2.21.2 + # via nbformat +fastnumbers==5.2.0 + # via flask-mongorest-mpcontribs +filetype==1.2.0 + # via mpcontribs-api (pyproject.toml) +flasgger-tschaume==0.9.7 + # via mpcontribs-api (pyproject.toml) +flask==2.2.5 + # via + # flasgger-tschaume + # flask-compress + # flask-marshmallow + # flask-mongoengine-tschaume + # flask-rq2 + # flask-sse +flask-compress==1.24 + # via mpcontribs-api (pyproject.toml) +flask-marshmallow==1.4.0 + # via mpcontribs-api (pyproject.toml) +flask-mongoengine-tschaume==1.1.0 + # via flask-mongorest-mpcontribs +flask-mongorest-mpcontribs==3.3.0 + # via mpcontribs-api (pyproject.toml) +flask-rq2==18.3 + # via mpcontribs-api (pyproject.toml) +flask-sse==1.0.0 + # via flask-mongorest-mpcontribs +flatten-dict==0.5.0 + # via flask-mongorest-mpcontribs +flexcache==0.3 + # via pint +flexparser==0.4 + # via pint +fonttools==4.63.0 + # via matplotlib +fqdn==1.5.1 + # via jsonschema +freezegun==1.5.5 + # via rq-scheduler +gevent==26.5.0 + # via gunicorn +greenlet==3.5.3 + # via gevent +gunicorn[gevent]==24.1.1 + # via mpcontribs-api (pyproject.toml) +idna==3.18 + # via + # anyio + # jsonschema + # requests +ipykernel==6.29.5 + # via + # nbclassic + # notebook +ipython==9.15.0 + # via ipykernel +ipython-genutils==0.2.0 + # via + # nbclassic + # notebook +ipython-pygments-lexers==1.1.1 + # via ipython +isoduration==20.11.0 + # via jsonschema +itsdangerous==2.2.0 + # via flask +jedi==0.20.0 + # via ipython +jinja2==3.1.6 + # via + # flask + # jupyter-server + # mpcontribs-api (pyproject.toml) + # nbconvert + # notebook +jmespath==1.1.0 + # via + # boto3 + # botocore +joblib==1.5.3 + # via pymatgen-core +json2html==1.3.0 + # via mpcontribs-api (pyproject.toml) +jsonpointer==3.1.1 + # via jsonschema +jsonschema[format-nongpl]==4.26.0 + # via + # flasgger-tschaume + # jupyter-events + # nbformat +jsonschema-specifications==2025.9.1 + # via jsonschema +jupyter-client==7.4.9 + # via + # ipykernel + # jupyter-server + # nbclient + # notebook +jupyter-core==5.9.1 + # via + # ipykernel + # jupyter-client + # jupyter-server + # nbclient + # nbconvert + # nbformat + # notebook +jupyter-events==0.12.1 + # via jupyter-server +jupyter-server==2.20.0 + # via notebook-shim +jupyter-server-terminals==0.5.4 + # via jupyter-server +jupyterlab-pygments==0.3.0 + # via nbconvert +kiwisolver==1.5.0 + # via matplotlib +lark==1.3.1 + # via rfc3987-syntax +lxml==6.1.1 + # via pymatgen-core +markupsafe==3.0.3 + # via + # jinja2 + # nbconvert + # werkzeug +marshmallow==3.26.2 + # via + # flask-marshmallow + # marshmallow-mongoengine + # mpcontribs-api (pyproject.toml) +marshmallow-mongoengine==0.31.2 + # via flask-mongorest-mpcontribs +matplotlib==3.11.0 + # via pymatgen-core +matplotlib-inline==0.2.2 + # via + # ipykernel + # ipython +mimerender-pr36==0.0.2 + # via flask-mongorest-mpcontribs +mistune==3.3.3 + # via + # flasgger-tschaume + # nbconvert +mongoengine==0.29.3 + # via + # atlasq-tschaume + # flask-mongoengine-tschaume + # marshmallow-mongoengine +monty==2026.5.18 + # via pymatgen-core +more-itertools==11.1.0 + # via mpcontribs-api (pyproject.toml) +mpmath==1.3.0 + # via sympy +narwhals==2.23.0 + # via plotly +nbclassic==1.3.3 + # via notebook +nbclient==0.11.0 + # via nbconvert +nbconvert==7.17.1 + # via + # jupyter-server + # notebook +nbformat==5.10.4 + # via + # jupyter-server + # mpcontribs-api (pyproject.toml) + # nbclient + # nbconvert + # notebook +nest-asyncio==1.6.0 + # via + # ipykernel + # jupyter-client + # nbclassic + # notebook +networkx==3.6.1 + # via pymatgen-core +notebook==6.5.7 + # via mpcontribs-api (pyproject.toml) +notebook-shim==0.2.4 + # via nbclassic +numpy==2.4.6 + # via + # contourpy + # matplotlib + # monty + # mpcontribs-api (pyproject.toml) + # pandas + # pymatgen-core + # scipy + # spglib +opentelemetry-api==1.43.0 + # via ddtrace +orjson==3.11.9 + # via + # flask-mongorest-mpcontribs + # pymatgen-core +overrides==7.7.0 + # via jupyter-server +packaging==26.2 + # via + # gunicorn + # ipykernel + # jupyter-events + # jupyter-server + # marshmallow + # matplotlib + # nbconvert + # plotly +palettable==3.3.3 + # via pymatgen-core +pandas==3.0.3 + # via pymatgen-core +pandocfilters==1.5.1 + # via nbconvert +parso==0.8.7 + # via jedi +pexpect==4.9.0 + # via ipython +pillow==12.3.0 + # via matplotlib +pint==0.25.3 + # via mpcontribs-api (pyproject.toml) +platformdirs==4.10.0 + # via + # jupyter-core + # pint +plotly==6.9.0 + # via pymatgen-core +prometheus-client==0.25.0 + # via + # jupyter-server + # notebook +prompt-toolkit==3.0.52 + # via ipython +psutil==7.2.2 + # via + # ipykernel + # ipython +psycopg2-binary==2.9.12 + # via mpcontribs-api (pyproject.toml) +ptyprocess==0.7.0 + # via + # pexpect + # terminado +pure-eval==0.2.3 + # via stack-data +pycparser==3.0 + # via cffi +pygments==2.20.0 + # via + # ipython + # ipython-pygments-lexers + # nbconvert +pymatgen==2026.5.4 + # via mpcontribs-api (pyproject.toml) +pymatgen-core==2026.5.18 + # via pymatgen +pymongo==4.17.0 + # via + # flask-mongorest-mpcontribs + # mongoengine +pyopenssl==26.3.0 + # via mpcontribs-api (pyproject.toml) +pyparsing==3.3.2 + # via + # bibtexparser + # matplotlib +python-dateutil==2.9.0.post0 + # via + # arrow + # botocore + # dateparser + # flask-mongorest-mpcontribs + # freezegun + # jupyter-client + # matplotlib + # pandas + # rq-scheduler +python-json-logger==4.1.0 + # via jupyter-events +python-mimeparse==2.0.0 + # via mimerender-pr36 +python-snappy==0.7.3 + # via mpcontribs-api (pyproject.toml) +pytz==2026.2 + # via dateparser +pyyaml==6.0.3 + # via + # flasgger-tschaume + # jupyter-events +pyzmq==27.1.0 + # via + # ipykernel + # jupyter-client + # jupyter-server + # notebook +redis==8.0.1 + # via + # flask-rq2 + # flask-sse + # rq +referencing==0.37.0 + # via + # jsonschema + # jsonschema-specifications + # jupyter-events +regex==2026.6.28 + # via dateparser +requests==2.34.2 + # via + # atlasq-tschaume + # pymatgen-core +rfc3339-validator==0.1.4 + # via + # jsonschema + # jupyter-events +rfc3986-validator==0.1.1 + # via + # jsonschema + # jupyter-events +rfc3987-syntax==1.1.0 + # via jsonschema +rpds-py==2026.6.3 + # via + # jsonschema + # referencing +rq==2.3.2 + # via + # flask-rq2 + # mpcontribs-api (pyproject.toml) + # rq-scheduler +rq-scheduler==0.14.0 + # via flask-rq2 +ruamel-yaml==0.19.1 + # via monty +s3transfer==0.19.0 + # via boto3 +scipy==1.17.1 + # via pymatgen-core +send2trash==2.1.0 + # via + # jupyter-server + # notebook +setproctitle==1.3.7 + # via mpcontribs-api (pyproject.toml) +six==1.17.0 + # via + # flasgger-tschaume + # flask-sse + # python-dateutil + # rfc3339-validator +soupsieve==2.8.4 + # via beautifulsoup4 +spglib==2.7.0 + # via pymatgen-core +stack-data==0.6.3 + # via ipython +supervisor==4.3.0 + # via mpcontribs-api (pyproject.toml) +sympy==1.14.0 + # via pymatgen-core +tabulate==0.10.0 + # via pymatgen-core +terminado==0.18.1 + # via + # jupyter-server + # jupyter-server-terminals + # notebook +tinycss2==1.5.1 + # via bleach +tornado==6.5.7 + # via + # ipykernel + # jupyter-client + # jupyter-server + # notebook + # terminado +tqdm==4.68.4 + # via pymatgen-core +traitlets==5.15.1 + # via + # ipykernel + # ipython + # jupyter-client + # jupyter-core + # jupyter-events + # jupyter-server + # matplotlib-inline + # nbclient + # nbconvert + # nbformat + # notebook +typing-extensions==4.16.0 + # via + # anyio + # beautifulsoup4 + # flexcache + # flexparser + # ipython + # opentelemetry-api + # pint + # pyopenssl + # referencing + # spglib +tzdata==2026.2 + # via arrow +tzlocal==5.4.4 + # via dateparser +uncertainties==3.2.3 + # via + # mpcontribs-api (pyproject.toml) + # pymatgen-core +uri-template==1.3.0 + # via jsonschema +urllib3==2.7.0 + # via + # botocore + # requests +wcwidth==0.8.2 + # via prompt-toolkit +webcolors==25.10.0 + # via jsonschema +webencodings==0.5.1 + # via + # bleach + # tinycss2 +websocket-client==1.9.0 + # via + # jupyter-server + # mpcontribs-api (pyproject.toml) +werkzeug==3.1.8 + # via + # flasgger-tschaume + # flask +wrapt==2.2.2 + # via ddtrace +zope-event==6.2 + # via gevent +zope-interface==8.5 + # via gevent +zstandard==0.25.0 + # via mpcontribs-api (pyproject.toml) diff --git a/mpcontribs-api/requirements/ubuntu-latest_py3.11_extras.txt b/mpcontribs-api/requirements/ubuntu-latest_py3.11_extras.txt new file mode 100644 index 0000000000..bcd2ea20c5 --- /dev/null +++ b/mpcontribs-api/requirements/ubuntu-latest_py3.11_extras.txt @@ -0,0 +1,638 @@ +# +# This file is autogenerated by pip-compile with Python 3.11 +# by the following command: +# +# pip-compile --all-extras --output-file=requirements/ubuntu-latest_py3.11_extras.txt +# +anyio==4.14.1 + # via jupyter-server +apispec==5.2.2 + # via + # mpcontribs-api + # mpcontribs-api (pyproject.toml) +argon2-cffi==25.1.0 + # via + # jupyter-server + # notebook +argon2-cffi-bindings==25.1.0 + # via argon2-cffi +arrow==1.4.0 + # via isoduration +asn1crypto==1.5.1 + # via + # mpcontribs-api + # mpcontribs-api (pyproject.toml) +asttokens==3.0.1 + # via stack-data +atlasq-tschaume==0.11.1.dev2 + # via flask-mongorest-mpcontribs +attrs==26.1.0 + # via + # jsonschema + # referencing +backports-zstd==1.6.0 + # via flask-compress +beautifulsoup4==4.15.0 + # via nbconvert +bibtexparser==1.4.4 + # via pymatgen-core +bleach[css]==6.4.0 + # via nbconvert +blinker==1.9.0 + # via + # mpcontribs-api + # mpcontribs-api (pyproject.toml) +boltons==26.0.0 + # via + # mpcontribs-api + # mpcontribs-api (pyproject.toml) +boto3==1.43.45 + # via flask-mongorest-mpcontribs +botocore==1.43.45 + # via + # boto3 + # s3transfer +brotli==1.2.0 + # via flask-compress +bytecode==0.18.1 + # via ddtrace +certifi==2026.6.17 + # via requests +cffi==2.1.0 + # via + # argon2-cffi-bindings + # cryptography +charset-normalizer==3.4.9 + # via requests +click==8.4.2 + # via + # flask + # rq +comm==0.2.3 + # via ipykernel +contourpy==1.3.3 + # via matplotlib +cramjam==2.11.0 + # via python-snappy +crontab==1.0.5 + # via rq-scheduler +cryptography==49.0.0 + # via pyopenssl +css-html-js-minify==2.5.5 + # via + # mpcontribs-api + # mpcontribs-api (pyproject.toml) +cycler==0.12.1 + # via matplotlib +dateparser==1.4.1 + # via + # mpcontribs-api + # mpcontribs-api (pyproject.toml) +ddtrace==4.3.0 + # via + # mpcontribs-api + # mpcontribs-api (pyproject.toml) +debugpy==1.8.21 + # via ipykernel +decorator==5.3.1 + # via ipython +defusedxml==0.7.1 + # via nbconvert +dnspython==2.8.0 + # via + # mpcontribs-api + # mpcontribs-api (pyproject.toml) + # pymongo +entrypoints==0.4 + # via jupyter-client +envier==0.6.1 + # via ddtrace +execnet==2.1.2 + # via pytest-xdist +executing==2.2.1 + # via stack-data +fastjsonschema==2.21.2 + # via nbformat +fastnumbers==5.2.0 + # via flask-mongorest-mpcontribs +filetype==1.2.0 + # via + # mpcontribs-api + # mpcontribs-api (pyproject.toml) +flake8==7.3.0 + # via + # mpcontribs-api + # mpcontribs-api (pyproject.toml) +flasgger-tschaume==0.9.7 + # via + # mpcontribs-api + # mpcontribs-api (pyproject.toml) +flask==2.2.5 + # via + # flasgger-tschaume + # flask-compress + # flask-marshmallow + # flask-mongoengine-tschaume + # flask-rq2 + # flask-sse +flask-compress==1.24 + # via + # mpcontribs-api + # mpcontribs-api (pyproject.toml) +flask-marshmallow==1.4.0 + # via + # mpcontribs-api + # mpcontribs-api (pyproject.toml) +flask-mongoengine-tschaume==1.1.0 + # via flask-mongorest-mpcontribs +flask-mongorest-mpcontribs==3.3.0 + # via + # mpcontribs-api + # mpcontribs-api (pyproject.toml) +flask-rq2==18.3 + # via + # mpcontribs-api + # mpcontribs-api (pyproject.toml) +flask-sse==1.0.0 + # via flask-mongorest-mpcontribs +flatten-dict==0.5.0 + # via flask-mongorest-mpcontribs +flexcache==0.3 + # via pint +flexparser==0.4 + # via pint +fonttools==4.63.0 + # via matplotlib +fqdn==1.5.1 + # via jsonschema +freezegun==1.5.5 + # via rq-scheduler +gevent==26.5.0 + # via gunicorn +greenlet==3.5.3 + # via gevent +gunicorn[gevent]==24.1.1 + # via + # mpcontribs-api + # mpcontribs-api (pyproject.toml) +idna==3.18 + # via + # anyio + # jsonschema + # requests +iniconfig==2.3.0 + # via pytest +ipykernel==6.29.5 + # via + # nbclassic + # notebook +ipython==9.15.0 + # via ipykernel +ipython-genutils==0.2.0 + # via + # nbclassic + # notebook +ipython-pygments-lexers==1.1.1 + # via ipython +isoduration==20.11.0 + # via jsonschema +itsdangerous==2.2.0 + # via flask +jedi==0.20.0 + # via ipython +jinja2==3.1.6 + # via + # flask + # jupyter-server + # mpcontribs-api + # mpcontribs-api (pyproject.toml) + # nbconvert + # notebook +jmespath==1.1.0 + # via + # boto3 + # botocore +joblib==1.5.3 + # via pymatgen-core +json2html==1.3.0 + # via + # mpcontribs-api + # mpcontribs-api (pyproject.toml) +jsonpointer==3.1.1 + # via jsonschema +jsonschema[format-nongpl]==4.26.0 + # via + # flasgger-tschaume + # jupyter-events + # nbformat +jsonschema-specifications==2025.9.1 + # via jsonschema +jupyter-client==7.4.9 + # via + # ipykernel + # jupyter-server + # nbclient + # notebook +jupyter-core==5.9.1 + # via + # ipykernel + # jupyter-client + # jupyter-server + # nbclient + # nbconvert + # nbformat + # notebook +jupyter-events==0.12.1 + # via jupyter-server +jupyter-server==2.20.0 + # via notebook-shim +jupyter-server-terminals==0.5.4 + # via jupyter-server +jupyterlab-pygments==0.3.0 + # via nbconvert +kiwisolver==1.5.0 + # via matplotlib +lark==1.3.1 + # via rfc3987-syntax +lxml==6.1.1 + # via pymatgen-core +markupsafe==3.0.3 + # via + # jinja2 + # nbconvert + # werkzeug +marshmallow==3.26.2 + # via + # flask-marshmallow + # marshmallow-mongoengine + # mpcontribs-api + # mpcontribs-api (pyproject.toml) +marshmallow-mongoengine==0.31.2 + # via flask-mongorest-mpcontribs +matplotlib==3.11.0 + # via pymatgen-core +matplotlib-inline==0.2.2 + # via + # ipykernel + # ipython +mccabe==0.7.0 + # via flake8 +mimerender-pr36==0.0.2 + # via flask-mongorest-mpcontribs +mistune==3.3.3 + # via + # flasgger-tschaume + # nbconvert +mongoengine==0.29.3 + # via + # atlasq-tschaume + # flask-mongoengine-tschaume + # marshmallow-mongoengine +monty==2026.5.18 + # via pymatgen-core +more-itertools==11.1.0 + # via + # mpcontribs-api + # mpcontribs-api (pyproject.toml) +mpcontribs-api[dev] @ file:///home/runner/work/MPContribs/MPContribs/mpcontribs-api + # via mpcontribs-api (pyproject.toml) +mpmath==1.3.0 + # via sympy +narwhals==2.23.0 + # via plotly +nbclassic==1.3.3 + # via notebook +nbclient==0.11.0 + # via nbconvert +nbconvert==7.17.1 + # via + # jupyter-server + # notebook +nbformat==5.10.4 + # via + # jupyter-server + # mpcontribs-api + # mpcontribs-api (pyproject.toml) + # nbclient + # nbconvert + # notebook +nest-asyncio==1.6.0 + # via + # ipykernel + # jupyter-client + # nbclassic + # notebook +networkx==3.6.1 + # via pymatgen-core +notebook==6.5.7 + # via + # mpcontribs-api + # mpcontribs-api (pyproject.toml) +notebook-shim==0.2.4 + # via nbclassic +numpy==2.4.6 + # via + # contourpy + # matplotlib + # monty + # mpcontribs-api + # mpcontribs-api (pyproject.toml) + # pandas + # pymatgen-core + # scipy + # spglib +opentelemetry-api==1.43.0 + # via ddtrace +orjson==3.11.9 + # via + # flask-mongorest-mpcontribs + # pymatgen-core +overrides==7.7.0 + # via jupyter-server +packaging==26.2 + # via + # gunicorn + # ipykernel + # jupyter-events + # jupyter-server + # marshmallow + # matplotlib + # nbconvert + # plotly + # pytest +palettable==3.3.3 + # via pymatgen-core +pandas==3.0.3 + # via pymatgen-core +pandocfilters==1.5.1 + # via nbconvert +parso==0.8.7 + # via jedi +pexpect==4.9.0 + # via ipython +pillow==12.3.0 + # via matplotlib +pint==0.25.3 + # via + # mpcontribs-api + # mpcontribs-api (pyproject.toml) +platformdirs==4.10.0 + # via + # jupyter-core + # pint +plotly==6.9.0 + # via pymatgen-core +pluggy==1.6.0 + # via pytest +prometheus-client==0.25.0 + # via + # jupyter-server + # notebook +prompt-toolkit==3.0.52 + # via ipython +psutil==7.2.2 + # via + # ipykernel + # ipython +psycopg2-binary==2.9.12 + # via + # mpcontribs-api + # mpcontribs-api (pyproject.toml) +ptyprocess==0.7.0 + # via + # pexpect + # terminado +pure-eval==0.2.3 + # via stack-data +pycodestyle==2.14.0 + # via + # flake8 + # pytest-pycodestyle +pycparser==3.0 + # via cffi +pyflakes==3.4.0 + # via flake8 +pygments==2.20.0 + # via + # ipython + # ipython-pygments-lexers + # nbconvert + # pytest +pymatgen==2026.5.4 + # via + # mpcontribs-api + # mpcontribs-api (pyproject.toml) +pymatgen-core==2026.5.18 + # via pymatgen +pymongo==4.17.0 + # via + # flask-mongorest-mpcontribs + # mongoengine +pyopenssl==26.3.0 + # via + # mpcontribs-api + # mpcontribs-api (pyproject.toml) +pyparsing==3.3.2 + # via + # bibtexparser + # matplotlib +pytest==9.1.1 + # via + # mpcontribs-api + # mpcontribs-api (pyproject.toml) + # pytest-pycodestyle + # pytest-xdist +pytest-pycodestyle==2.5.0 + # via + # mpcontribs-api + # mpcontribs-api (pyproject.toml) +pytest-xdist==3.8.0 + # via + # mpcontribs-api + # mpcontribs-api (pyproject.toml) +python-dateutil==2.9.0.post0 + # via + # arrow + # botocore + # dateparser + # flask-mongorest-mpcontribs + # freezegun + # jupyter-client + # matplotlib + # pandas + # rq-scheduler +python-json-logger==4.1.0 + # via jupyter-events +python-mimeparse==2.0.0 + # via mimerender-pr36 +python-snappy==0.7.3 + # via + # mpcontribs-api + # mpcontribs-api (pyproject.toml) +pytz==2026.2 + # via dateparser +pyyaml==6.0.3 + # via + # flasgger-tschaume + # jupyter-events +pyzmq==27.1.0 + # via + # ipykernel + # jupyter-client + # jupyter-server + # notebook +redis==8.0.1 + # via + # flask-rq2 + # flask-sse + # rq +referencing==0.37.0 + # via + # jsonschema + # jsonschema-specifications + # jupyter-events +regex==2026.6.28 + # via dateparser +requests==2.34.2 + # via + # atlasq-tschaume + # pymatgen-core +rfc3339-validator==0.1.4 + # via + # jsonschema + # jupyter-events +rfc3986-validator==0.1.1 + # via + # jsonschema + # jupyter-events +rfc3987-syntax==1.1.0 + # via jsonschema +rpds-py==2026.6.3 + # via + # jsonschema + # referencing +rq==2.3.2 + # via + # flask-rq2 + # mpcontribs-api + # mpcontribs-api (pyproject.toml) + # rq-scheduler +rq-scheduler==0.14.0 + # via flask-rq2 +ruamel-yaml==0.19.1 + # via monty +s3transfer==0.19.0 + # via boto3 +scipy==1.17.1 + # via pymatgen-core +send2trash==2.1.0 + # via + # jupyter-server + # notebook +setproctitle==1.3.7 + # via + # mpcontribs-api + # mpcontribs-api (pyproject.toml) +six==1.17.0 + # via + # flasgger-tschaume + # flask-sse + # python-dateutil + # rfc3339-validator +soupsieve==2.8.4 + # via beautifulsoup4 +spglib==2.7.0 + # via pymatgen-core +stack-data==0.6.3 + # via ipython +supervisor==4.3.0 + # via + # mpcontribs-api + # mpcontribs-api (pyproject.toml) +sympy==1.14.0 + # via pymatgen-core +tabulate==0.10.0 + # via pymatgen-core +terminado==0.18.1 + # via + # jupyter-server + # jupyter-server-terminals + # notebook +tinycss2==1.5.1 + # via bleach +tornado==6.5.7 + # via + # ipykernel + # jupyter-client + # jupyter-server + # notebook + # terminado +tqdm==4.68.4 + # via pymatgen-core +traitlets==5.15.1 + # via + # ipykernel + # ipython + # jupyter-client + # jupyter-core + # jupyter-events + # jupyter-server + # matplotlib-inline + # nbclient + # nbconvert + # nbformat + # notebook +typing-extensions==4.16.0 + # via + # anyio + # beautifulsoup4 + # flexcache + # flexparser + # ipython + # opentelemetry-api + # pint + # pyopenssl + # referencing + # spglib +tzdata==2026.2 + # via arrow +tzlocal==5.4.4 + # via dateparser +uncertainties==3.2.3 + # via + # mpcontribs-api + # mpcontribs-api (pyproject.toml) + # pymatgen-core +uri-template==1.3.0 + # via jsonschema +urllib3==2.7.0 + # via + # botocore + # requests +wcwidth==0.8.2 + # via prompt-toolkit +webcolors==25.10.0 + # via jsonschema +webencodings==0.5.1 + # via + # bleach + # tinycss2 +websocket-client==1.9.0 + # via + # jupyter-server + # mpcontribs-api + # mpcontribs-api (pyproject.toml) +werkzeug==3.1.8 + # via + # flasgger-tschaume + # flask +wrapt==2.2.2 + # via ddtrace +zope-event==6.2 + # via gevent +zope-interface==8.5 + # via gevent +zstandard==0.25.0 + # via + # mpcontribs-api + # mpcontribs-api (pyproject.toml) diff --git a/mpcontribs-api/requirements/ubuntu-latest_py3.12.txt b/mpcontribs-api/requirements/ubuntu-latest_py3.12.txt new file mode 100644 index 0000000000..2852a24b47 --- /dev/null +++ b/mpcontribs-api/requirements/ubuntu-latest_py3.12.txt @@ -0,0 +1,541 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --output-file=requirements/ubuntu-latest_py3.12.txt +# +anyio==4.14.1 + # via jupyter-server +apispec==5.2.2 + # via mpcontribs-api (pyproject.toml) +argon2-cffi==25.1.0 + # via + # jupyter-server + # notebook +argon2-cffi-bindings==25.1.0 + # via argon2-cffi +arrow==1.4.0 + # via isoduration +asn1crypto==1.5.1 + # via mpcontribs-api (pyproject.toml) +asttokens==3.0.1 + # via stack-data +atlasq-tschaume==0.11.1.dev2 + # via flask-mongorest-mpcontribs +attrs==26.1.0 + # via + # jsonschema + # referencing +backports-zstd==1.6.0 + # via flask-compress +beautifulsoup4==4.15.0 + # via nbconvert +bibtexparser==1.4.4 + # via pymatgen-core +bleach[css]==6.4.0 + # via nbconvert +blinker==1.9.0 + # via mpcontribs-api (pyproject.toml) +boltons==26.0.0 + # via mpcontribs-api (pyproject.toml) +boto3==1.43.45 + # via flask-mongorest-mpcontribs +botocore==1.43.45 + # via + # boto3 + # s3transfer +brotli==1.2.0 + # via flask-compress +bytecode==0.18.1 + # via ddtrace +certifi==2026.6.17 + # via requests +cffi==2.1.0 + # via + # argon2-cffi-bindings + # cryptography +charset-normalizer==3.4.9 + # via requests +click==8.4.2 + # via + # flask + # rq +comm==0.2.3 + # via ipykernel +contourpy==1.3.3 + # via matplotlib +cramjam==2.11.0 + # via python-snappy +crontab==1.0.5 + # via rq-scheduler +cryptography==49.0.0 + # via pyopenssl +css-html-js-minify==2.5.5 + # via mpcontribs-api (pyproject.toml) +cycler==0.12.1 + # via matplotlib +dateparser==1.4.1 + # via mpcontribs-api (pyproject.toml) +ddtrace==4.3.0 + # via mpcontribs-api (pyproject.toml) +debugpy==1.8.21 + # via ipykernel +decorator==5.3.1 + # via ipython +defusedxml==0.7.1 + # via nbconvert +dnspython==2.8.0 + # via + # mpcontribs-api (pyproject.toml) + # pymongo +entrypoints==0.4 + # via jupyter-client +envier==0.6.1 + # via ddtrace +executing==2.2.1 + # via stack-data +fastjsonschema==2.21.2 + # via nbformat +fastnumbers==5.2.0 + # via flask-mongorest-mpcontribs +filetype==1.2.0 + # via mpcontribs-api (pyproject.toml) +flasgger-tschaume==0.9.7 + # via mpcontribs-api (pyproject.toml) +flask==2.2.5 + # via + # flasgger-tschaume + # flask-compress + # flask-marshmallow + # flask-mongoengine-tschaume + # flask-rq2 + # flask-sse +flask-compress==1.24 + # via mpcontribs-api (pyproject.toml) +flask-marshmallow==1.4.0 + # via mpcontribs-api (pyproject.toml) +flask-mongoengine-tschaume==1.1.0 + # via flask-mongorest-mpcontribs +flask-mongorest-mpcontribs==3.3.0 + # via mpcontribs-api (pyproject.toml) +flask-rq2==18.3 + # via mpcontribs-api (pyproject.toml) +flask-sse==1.0.0 + # via flask-mongorest-mpcontribs +flatten-dict==0.5.0 + # via flask-mongorest-mpcontribs +flexcache==0.3 + # via pint +flexparser==0.4 + # via pint +fonttools==4.63.0 + # via matplotlib +fqdn==1.5.1 + # via jsonschema +freezegun==1.5.5 + # via rq-scheduler +gevent==26.5.0 + # via gunicorn +greenlet==3.5.3 + # via gevent +gunicorn[gevent]==24.1.1 + # via mpcontribs-api (pyproject.toml) +idna==3.18 + # via + # anyio + # jsonschema + # requests +ipykernel==6.29.5 + # via + # nbclassic + # notebook +ipython==9.15.0 + # via ipykernel +ipython-genutils==0.2.0 + # via + # nbclassic + # notebook +ipython-pygments-lexers==1.1.1 + # via ipython +isoduration==20.11.0 + # via jsonschema +itsdangerous==2.2.0 + # via flask +jedi==0.20.0 + # via ipython +jinja2==3.1.6 + # via + # flask + # jupyter-server + # mpcontribs-api (pyproject.toml) + # nbconvert + # notebook +jmespath==1.1.0 + # via + # boto3 + # botocore +joblib==1.5.3 + # via pymatgen-core +json2html==1.3.0 + # via mpcontribs-api (pyproject.toml) +jsonpointer==3.1.1 + # via jsonschema +jsonschema[format-nongpl]==4.26.0 + # via + # flasgger-tschaume + # jupyter-events + # nbformat +jsonschema-specifications==2025.9.1 + # via jsonschema +jupyter-client==7.4.9 + # via + # ipykernel + # jupyter-server + # nbclient + # notebook +jupyter-core==5.9.1 + # via + # ipykernel + # jupyter-client + # jupyter-server + # nbclient + # nbconvert + # nbformat + # notebook +jupyter-events==0.12.1 + # via jupyter-server +jupyter-server==2.20.0 + # via notebook-shim +jupyter-server-terminals==0.5.4 + # via jupyter-server +jupyterlab-pygments==0.3.0 + # via nbconvert +kiwisolver==1.5.0 + # via matplotlib +lark==1.3.1 + # via rfc3987-syntax +lxml==6.1.1 + # via pymatgen-core +markupsafe==3.0.3 + # via + # jinja2 + # nbconvert + # werkzeug +marshmallow==3.26.2 + # via + # flask-marshmallow + # marshmallow-mongoengine + # mpcontribs-api (pyproject.toml) +marshmallow-mongoengine==0.31.2 + # via flask-mongorest-mpcontribs +matplotlib==3.11.0 + # via pymatgen-core +matplotlib-inline==0.2.2 + # via + # ipykernel + # ipython +mimerender-pr36==0.0.2 + # via flask-mongorest-mpcontribs +mistune==3.3.3 + # via + # flasgger-tschaume + # nbconvert +mongoengine==0.29.3 + # via + # atlasq-tschaume + # flask-mongoengine-tschaume + # marshmallow-mongoengine +monty==2026.5.18 + # via pymatgen-core +more-itertools==11.1.0 + # via mpcontribs-api (pyproject.toml) +mpmath==1.3.0 + # via sympy +narwhals==2.23.0 + # via plotly +nbclassic==1.3.3 + # via notebook +nbclient==0.11.0 + # via nbconvert +nbconvert==7.17.1 + # via + # jupyter-server + # notebook +nbformat==5.10.4 + # via + # jupyter-server + # mpcontribs-api (pyproject.toml) + # nbclient + # nbconvert + # notebook +nest-asyncio==1.6.0 + # via + # ipykernel + # jupyter-client + # nbclassic + # notebook +networkx==3.6.1 + # via pymatgen-core +notebook==6.5.7 + # via mpcontribs-api (pyproject.toml) +notebook-shim==0.2.4 + # via nbclassic +numpy==2.5.1 + # via + # contourpy + # matplotlib + # monty + # mpcontribs-api (pyproject.toml) + # pandas + # pymatgen-core + # scipy + # spglib +opentelemetry-api==1.43.0 + # via ddtrace +orjson==3.11.9 + # via + # flask-mongorest-mpcontribs + # pymatgen-core +packaging==26.2 + # via + # gunicorn + # ipykernel + # jupyter-events + # jupyter-server + # marshmallow + # matplotlib + # nbconvert + # plotly +palettable==3.3.3 + # via pymatgen-core +pandas==3.0.3 + # via pymatgen-core +pandocfilters==1.5.1 + # via nbconvert +parso==0.8.7 + # via jedi +pexpect==4.9.0 + # via ipython +pillow==12.3.0 + # via matplotlib +pint==0.25.3 + # via mpcontribs-api (pyproject.toml) +platformdirs==4.10.0 + # via + # jupyter-core + # pint +plotly==6.9.0 + # via pymatgen-core +prometheus-client==0.25.0 + # via + # jupyter-server + # notebook +prompt-toolkit==3.0.52 + # via ipython +psutil==7.2.2 + # via + # ipykernel + # ipython +psycopg2-binary==2.9.12 + # via mpcontribs-api (pyproject.toml) +ptyprocess==0.7.0 + # via + # pexpect + # terminado +pure-eval==0.2.3 + # via stack-data +pycparser==3.0 + # via cffi +pygments==2.20.0 + # via + # ipython + # ipython-pygments-lexers + # nbconvert +pymatgen==2026.5.4 + # via mpcontribs-api (pyproject.toml) +pymatgen-core==2026.5.18 + # via pymatgen +pymongo==4.17.0 + # via + # flask-mongorest-mpcontribs + # mongoengine +pyopenssl==26.3.0 + # via mpcontribs-api (pyproject.toml) +pyparsing==3.3.2 + # via + # bibtexparser + # matplotlib +python-dateutil==2.9.0.post0 + # via + # arrow + # botocore + # dateparser + # flask-mongorest-mpcontribs + # freezegun + # jupyter-client + # matplotlib + # pandas + # rq-scheduler +python-json-logger==4.1.0 + # via jupyter-events +python-mimeparse==2.0.0 + # via mimerender-pr36 +python-snappy==0.7.3 + # via mpcontribs-api (pyproject.toml) +pytz==2026.2 + # via dateparser +pyyaml==6.0.3 + # via + # flasgger-tschaume + # jupyter-events +pyzmq==27.1.0 + # via + # ipykernel + # jupyter-client + # jupyter-server + # notebook +redis==8.0.1 + # via + # flask-rq2 + # flask-sse + # rq +referencing==0.37.0 + # via + # jsonschema + # jsonschema-specifications + # jupyter-events +regex==2026.6.28 + # via dateparser +requests==2.34.2 + # via + # atlasq-tschaume + # pymatgen-core +rfc3339-validator==0.1.4 + # via + # jsonschema + # jupyter-events +rfc3986-validator==0.1.1 + # via + # jsonschema + # jupyter-events +rfc3987-syntax==1.1.0 + # via jsonschema +rpds-py==2026.6.3 + # via + # jsonschema + # referencing +rq==2.3.2 + # via + # flask-rq2 + # mpcontribs-api (pyproject.toml) + # rq-scheduler +rq-scheduler==0.14.0 + # via flask-rq2 +ruamel-yaml==0.19.1 + # via monty +s3transfer==0.19.0 + # via boto3 +scipy==1.18.0 + # via pymatgen-core +send2trash==2.1.0 + # via + # jupyter-server + # notebook +setproctitle==1.3.7 + # via mpcontribs-api (pyproject.toml) +six==1.17.0 + # via + # flasgger-tschaume + # flask-sse + # python-dateutil + # rfc3339-validator +soupsieve==2.8.4 + # via beautifulsoup4 +spglib==2.7.0 + # via pymatgen-core +stack-data==0.6.3 + # via ipython +supervisor==4.3.0 + # via mpcontribs-api (pyproject.toml) +sympy==1.14.0 + # via pymatgen-core +tabulate==0.10.0 + # via pymatgen-core +terminado==0.18.1 + # via + # jupyter-server + # jupyter-server-terminals + # notebook +tinycss2==1.5.1 + # via bleach +tornado==6.5.7 + # via + # ipykernel + # jupyter-client + # jupyter-server + # notebook + # terminado +tqdm==4.68.4 + # via pymatgen-core +traitlets==5.15.1 + # via + # ipykernel + # ipython + # jupyter-client + # jupyter-core + # jupyter-events + # jupyter-server + # matplotlib-inline + # nbclient + # nbconvert + # nbformat + # notebook +typing-extensions==4.16.0 + # via + # anyio + # beautifulsoup4 + # flexcache + # flexparser + # opentelemetry-api + # pint + # pyopenssl + # referencing + # spglib +tzdata==2026.2 + # via arrow +tzlocal==5.4.4 + # via dateparser +uncertainties==3.2.3 + # via + # mpcontribs-api (pyproject.toml) + # pymatgen-core +uri-template==1.3.0 + # via jsonschema +urllib3==2.7.0 + # via + # botocore + # requests +wcwidth==0.8.2 + # via prompt-toolkit +webcolors==25.10.0 + # via jsonschema +webencodings==0.5.1 + # via + # bleach + # tinycss2 +websocket-client==1.9.0 + # via + # jupyter-server + # mpcontribs-api (pyproject.toml) +werkzeug==3.1.8 + # via + # flasgger-tschaume + # flask +wrapt==2.2.2 + # via ddtrace +zope-event==6.2 + # via gevent +zope-interface==8.5 + # via gevent +zstandard==0.25.0 + # via mpcontribs-api (pyproject.toml) diff --git a/mpcontribs-api/requirements/ubuntu-latest_py3.12_extras.txt b/mpcontribs-api/requirements/ubuntu-latest_py3.12_extras.txt new file mode 100644 index 0000000000..105287c5eb --- /dev/null +++ b/mpcontribs-api/requirements/ubuntu-latest_py3.12_extras.txt @@ -0,0 +1,635 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --all-extras --output-file=requirements/ubuntu-latest_py3.12_extras.txt +# +anyio==4.14.1 + # via jupyter-server +apispec==5.2.2 + # via + # mpcontribs-api + # mpcontribs-api (pyproject.toml) +argon2-cffi==25.1.0 + # via + # jupyter-server + # notebook +argon2-cffi-bindings==25.1.0 + # via argon2-cffi +arrow==1.4.0 + # via isoduration +asn1crypto==1.5.1 + # via + # mpcontribs-api + # mpcontribs-api (pyproject.toml) +asttokens==3.0.1 + # via stack-data +atlasq-tschaume==0.11.1.dev2 + # via flask-mongorest-mpcontribs +attrs==26.1.0 + # via + # jsonschema + # referencing +backports-zstd==1.6.0 + # via flask-compress +beautifulsoup4==4.15.0 + # via nbconvert +bibtexparser==1.4.4 + # via pymatgen-core +bleach[css]==6.4.0 + # via nbconvert +blinker==1.9.0 + # via + # mpcontribs-api + # mpcontribs-api (pyproject.toml) +boltons==26.0.0 + # via + # mpcontribs-api + # mpcontribs-api (pyproject.toml) +boto3==1.43.45 + # via flask-mongorest-mpcontribs +botocore==1.43.45 + # via + # boto3 + # s3transfer +brotli==1.2.0 + # via flask-compress +bytecode==0.18.1 + # via ddtrace +certifi==2026.6.17 + # via requests +cffi==2.1.0 + # via + # argon2-cffi-bindings + # cryptography +charset-normalizer==3.4.9 + # via requests +click==8.4.2 + # via + # flask + # rq +comm==0.2.3 + # via ipykernel +contourpy==1.3.3 + # via matplotlib +cramjam==2.11.0 + # via python-snappy +crontab==1.0.5 + # via rq-scheduler +cryptography==49.0.0 + # via pyopenssl +css-html-js-minify==2.5.5 + # via + # mpcontribs-api + # mpcontribs-api (pyproject.toml) +cycler==0.12.1 + # via matplotlib +dateparser==1.4.1 + # via + # mpcontribs-api + # mpcontribs-api (pyproject.toml) +ddtrace==4.3.0 + # via + # mpcontribs-api + # mpcontribs-api (pyproject.toml) +debugpy==1.8.21 + # via ipykernel +decorator==5.3.1 + # via ipython +defusedxml==0.7.1 + # via nbconvert +dnspython==2.8.0 + # via + # mpcontribs-api + # mpcontribs-api (pyproject.toml) + # pymongo +entrypoints==0.4 + # via jupyter-client +envier==0.6.1 + # via ddtrace +execnet==2.1.2 + # via pytest-xdist +executing==2.2.1 + # via stack-data +fastjsonschema==2.21.2 + # via nbformat +fastnumbers==5.2.0 + # via flask-mongorest-mpcontribs +filetype==1.2.0 + # via + # mpcontribs-api + # mpcontribs-api (pyproject.toml) +flake8==7.3.0 + # via + # mpcontribs-api + # mpcontribs-api (pyproject.toml) +flasgger-tschaume==0.9.7 + # via + # mpcontribs-api + # mpcontribs-api (pyproject.toml) +flask==2.2.5 + # via + # flasgger-tschaume + # flask-compress + # flask-marshmallow + # flask-mongoengine-tschaume + # flask-rq2 + # flask-sse +flask-compress==1.24 + # via + # mpcontribs-api + # mpcontribs-api (pyproject.toml) +flask-marshmallow==1.4.0 + # via + # mpcontribs-api + # mpcontribs-api (pyproject.toml) +flask-mongoengine-tschaume==1.1.0 + # via flask-mongorest-mpcontribs +flask-mongorest-mpcontribs==3.3.0 + # via + # mpcontribs-api + # mpcontribs-api (pyproject.toml) +flask-rq2==18.3 + # via + # mpcontribs-api + # mpcontribs-api (pyproject.toml) +flask-sse==1.0.0 + # via flask-mongorest-mpcontribs +flatten-dict==0.5.0 + # via flask-mongorest-mpcontribs +flexcache==0.3 + # via pint +flexparser==0.4 + # via pint +fonttools==4.63.0 + # via matplotlib +fqdn==1.5.1 + # via jsonschema +freezegun==1.5.5 + # via rq-scheduler +gevent==26.5.0 + # via gunicorn +greenlet==3.5.3 + # via gevent +gunicorn[gevent]==24.1.1 + # via + # mpcontribs-api + # mpcontribs-api (pyproject.toml) +idna==3.18 + # via + # anyio + # jsonschema + # requests +iniconfig==2.3.0 + # via pytest +ipykernel==6.29.5 + # via + # nbclassic + # notebook +ipython==9.15.0 + # via ipykernel +ipython-genutils==0.2.0 + # via + # nbclassic + # notebook +ipython-pygments-lexers==1.1.1 + # via ipython +isoduration==20.11.0 + # via jsonschema +itsdangerous==2.2.0 + # via flask +jedi==0.20.0 + # via ipython +jinja2==3.1.6 + # via + # flask + # jupyter-server + # mpcontribs-api + # mpcontribs-api (pyproject.toml) + # nbconvert + # notebook +jmespath==1.1.0 + # via + # boto3 + # botocore +joblib==1.5.3 + # via pymatgen-core +json2html==1.3.0 + # via + # mpcontribs-api + # mpcontribs-api (pyproject.toml) +jsonpointer==3.1.1 + # via jsonschema +jsonschema[format-nongpl]==4.26.0 + # via + # flasgger-tschaume + # jupyter-events + # nbformat +jsonschema-specifications==2025.9.1 + # via jsonschema +jupyter-client==7.4.9 + # via + # ipykernel + # jupyter-server + # nbclient + # notebook +jupyter-core==5.9.1 + # via + # ipykernel + # jupyter-client + # jupyter-server + # nbclient + # nbconvert + # nbformat + # notebook +jupyter-events==0.12.1 + # via jupyter-server +jupyter-server==2.20.0 + # via notebook-shim +jupyter-server-terminals==0.5.4 + # via jupyter-server +jupyterlab-pygments==0.3.0 + # via nbconvert +kiwisolver==1.5.0 + # via matplotlib +lark==1.3.1 + # via rfc3987-syntax +lxml==6.1.1 + # via pymatgen-core +markupsafe==3.0.3 + # via + # jinja2 + # nbconvert + # werkzeug +marshmallow==3.26.2 + # via + # flask-marshmallow + # marshmallow-mongoengine + # mpcontribs-api + # mpcontribs-api (pyproject.toml) +marshmallow-mongoengine==0.31.2 + # via flask-mongorest-mpcontribs +matplotlib==3.11.0 + # via pymatgen-core +matplotlib-inline==0.2.2 + # via + # ipykernel + # ipython +mccabe==0.7.0 + # via flake8 +mimerender-pr36==0.0.2 + # via flask-mongorest-mpcontribs +mistune==3.3.3 + # via + # flasgger-tschaume + # nbconvert +mongoengine==0.29.3 + # via + # atlasq-tschaume + # flask-mongoengine-tschaume + # marshmallow-mongoengine +monty==2026.5.18 + # via pymatgen-core +more-itertools==11.1.0 + # via + # mpcontribs-api + # mpcontribs-api (pyproject.toml) +mpcontribs-api[dev] @ file:///home/runner/work/MPContribs/MPContribs/mpcontribs-api + # via mpcontribs-api (pyproject.toml) +mpmath==1.3.0 + # via sympy +narwhals==2.23.0 + # via plotly +nbclassic==1.3.3 + # via notebook +nbclient==0.11.0 + # via nbconvert +nbconvert==7.17.1 + # via + # jupyter-server + # notebook +nbformat==5.10.4 + # via + # jupyter-server + # mpcontribs-api + # mpcontribs-api (pyproject.toml) + # nbclient + # nbconvert + # notebook +nest-asyncio==1.6.0 + # via + # ipykernel + # jupyter-client + # nbclassic + # notebook +networkx==3.6.1 + # via pymatgen-core +notebook==6.5.7 + # via + # mpcontribs-api + # mpcontribs-api (pyproject.toml) +notebook-shim==0.2.4 + # via nbclassic +numpy==2.5.1 + # via + # contourpy + # matplotlib + # monty + # mpcontribs-api + # mpcontribs-api (pyproject.toml) + # pandas + # pymatgen-core + # scipy + # spglib +opentelemetry-api==1.43.0 + # via ddtrace +orjson==3.11.9 + # via + # flask-mongorest-mpcontribs + # pymatgen-core +packaging==26.2 + # via + # gunicorn + # ipykernel + # jupyter-events + # jupyter-server + # marshmallow + # matplotlib + # nbconvert + # plotly + # pytest +palettable==3.3.3 + # via pymatgen-core +pandas==3.0.3 + # via pymatgen-core +pandocfilters==1.5.1 + # via nbconvert +parso==0.8.7 + # via jedi +pexpect==4.9.0 + # via ipython +pillow==12.3.0 + # via matplotlib +pint==0.25.3 + # via + # mpcontribs-api + # mpcontribs-api (pyproject.toml) +platformdirs==4.10.0 + # via + # jupyter-core + # pint +plotly==6.9.0 + # via pymatgen-core +pluggy==1.6.0 + # via pytest +prometheus-client==0.25.0 + # via + # jupyter-server + # notebook +prompt-toolkit==3.0.52 + # via ipython +psutil==7.2.2 + # via + # ipykernel + # ipython +psycopg2-binary==2.9.12 + # via + # mpcontribs-api + # mpcontribs-api (pyproject.toml) +ptyprocess==0.7.0 + # via + # pexpect + # terminado +pure-eval==0.2.3 + # via stack-data +pycodestyle==2.14.0 + # via + # flake8 + # pytest-pycodestyle +pycparser==3.0 + # via cffi +pyflakes==3.4.0 + # via flake8 +pygments==2.20.0 + # via + # ipython + # ipython-pygments-lexers + # nbconvert + # pytest +pymatgen==2026.5.4 + # via + # mpcontribs-api + # mpcontribs-api (pyproject.toml) +pymatgen-core==2026.5.18 + # via pymatgen +pymongo==4.17.0 + # via + # flask-mongorest-mpcontribs + # mongoengine +pyopenssl==26.3.0 + # via + # mpcontribs-api + # mpcontribs-api (pyproject.toml) +pyparsing==3.3.2 + # via + # bibtexparser + # matplotlib +pytest==9.1.1 + # via + # mpcontribs-api + # mpcontribs-api (pyproject.toml) + # pytest-pycodestyle + # pytest-xdist +pytest-pycodestyle==2.5.0 + # via + # mpcontribs-api + # mpcontribs-api (pyproject.toml) +pytest-xdist==3.8.0 + # via + # mpcontribs-api + # mpcontribs-api (pyproject.toml) +python-dateutil==2.9.0.post0 + # via + # arrow + # botocore + # dateparser + # flask-mongorest-mpcontribs + # freezegun + # jupyter-client + # matplotlib + # pandas + # rq-scheduler +python-json-logger==4.1.0 + # via jupyter-events +python-mimeparse==2.0.0 + # via mimerender-pr36 +python-snappy==0.7.3 + # via + # mpcontribs-api + # mpcontribs-api (pyproject.toml) +pytz==2026.2 + # via dateparser +pyyaml==6.0.3 + # via + # flasgger-tschaume + # jupyter-events +pyzmq==27.1.0 + # via + # ipykernel + # jupyter-client + # jupyter-server + # notebook +redis==8.0.1 + # via + # flask-rq2 + # flask-sse + # rq +referencing==0.37.0 + # via + # jsonschema + # jsonschema-specifications + # jupyter-events +regex==2026.6.28 + # via dateparser +requests==2.34.2 + # via + # atlasq-tschaume + # pymatgen-core +rfc3339-validator==0.1.4 + # via + # jsonschema + # jupyter-events +rfc3986-validator==0.1.1 + # via + # jsonschema + # jupyter-events +rfc3987-syntax==1.1.0 + # via jsonschema +rpds-py==2026.6.3 + # via + # jsonschema + # referencing +rq==2.3.2 + # via + # flask-rq2 + # mpcontribs-api + # mpcontribs-api (pyproject.toml) + # rq-scheduler +rq-scheduler==0.14.0 + # via flask-rq2 +ruamel-yaml==0.19.1 + # via monty +s3transfer==0.19.0 + # via boto3 +scipy==1.18.0 + # via pymatgen-core +send2trash==2.1.0 + # via + # jupyter-server + # notebook +setproctitle==1.3.7 + # via + # mpcontribs-api + # mpcontribs-api (pyproject.toml) +six==1.17.0 + # via + # flasgger-tschaume + # flask-sse + # python-dateutil + # rfc3339-validator +soupsieve==2.8.4 + # via beautifulsoup4 +spglib==2.7.0 + # via pymatgen-core +stack-data==0.6.3 + # via ipython +supervisor==4.3.0 + # via + # mpcontribs-api + # mpcontribs-api (pyproject.toml) +sympy==1.14.0 + # via pymatgen-core +tabulate==0.10.0 + # via pymatgen-core +terminado==0.18.1 + # via + # jupyter-server + # jupyter-server-terminals + # notebook +tinycss2==1.5.1 + # via bleach +tornado==6.5.7 + # via + # ipykernel + # jupyter-client + # jupyter-server + # notebook + # terminado +tqdm==4.68.4 + # via pymatgen-core +traitlets==5.15.1 + # via + # ipykernel + # ipython + # jupyter-client + # jupyter-core + # jupyter-events + # jupyter-server + # matplotlib-inline + # nbclient + # nbconvert + # nbformat + # notebook +typing-extensions==4.16.0 + # via + # anyio + # beautifulsoup4 + # flexcache + # flexparser + # opentelemetry-api + # pint + # pyopenssl + # referencing + # spglib +tzdata==2026.2 + # via arrow +tzlocal==5.4.4 + # via dateparser +uncertainties==3.2.3 + # via + # mpcontribs-api + # mpcontribs-api (pyproject.toml) + # pymatgen-core +uri-template==1.3.0 + # via jsonschema +urllib3==2.7.0 + # via + # botocore + # requests +wcwidth==0.8.2 + # via prompt-toolkit +webcolors==25.10.0 + # via jsonschema +webencodings==0.5.1 + # via + # bleach + # tinycss2 +websocket-client==1.9.0 + # via + # jupyter-server + # mpcontribs-api + # mpcontribs-api (pyproject.toml) +werkzeug==3.1.8 + # via + # flasgger-tschaume + # flask +wrapt==2.2.2 + # via ddtrace +zope-event==6.2 + # via gevent +zope-interface==8.5 + # via gevent +zstandard==0.25.0 + # via + # mpcontribs-api + # mpcontribs-api (pyproject.toml) From 4e0a47fab346a0584bb13022e3ebe9c9c39175cc Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Tue, 18 Aug 2026 11:41:01 -0700 Subject: [PATCH 578/591] docs(ContributionService): finished revising long docstrings --- .../domains/contributions/service.py | 42 ++++--------------- 1 file changed, 9 insertions(+), 33 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py index 8af53e9eb3..8d7880ac4b 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py @@ -526,11 +526,8 @@ async def _insert_with_components( """Per-submission transaction path, bounded by ``max_concurrent_transactions``. Rows that pivoted out of the same submission share an ``index`` and carry identical component - inputs (see :func:`mpcontribs_api.domains.contributions.pivot.expand_contribution`), so they - are grouped and written together in one transaction: the shared components are inserted once - (deduplicated by content hash in the components repo) and every row in the group links to the - resulting ids. A submission that did not pivot is simply a group of one, preserving the - previous one-transaction-per-row shape. + inputs, so they are grouped and written together in one transaction: the shared components are + inserted once and every row in the group links to the resulting ids. """ if not items: return [], [] @@ -559,11 +556,7 @@ async def _bounded(group: list[PreparedWrite]) -> list[Contribution] | BulkFailu async def _insert_group_with_components(self, group: list[PreparedWrite]) -> list[Contribution] | BulkFailure: """Run one submission's pivoted rows + their shared components inside a transaction. - Uses ``session.with_transaction`` so transient txn errors (write conflicts, primary step- - downs) get pymongo's retry treatment, and so the components and every pivoted row of the - submission commit or roll back together. Any exception is converted to a single - ``BulkFailure`` against the submission's index so the surrounding ``asyncio.gather`` sees a - normal return value for every coroutine. + Uses transactions to keep a contribution and its components in-sync. Failed writes are returned as BulkFailures. """ index = group[0].index contrib = group[0].contribution @@ -587,14 +580,7 @@ async def _txn(s: AsyncClientSession) -> list[Contribution]: return bulk_failure_from_exception(index, contrib.identity_dict(unique_value, condition_key), exc) async def _do_insert_group(self, group: list[PreparedWrite], session: AsyncClientSession) -> list[Contribution]: - """Insert the submission's shared components once, then every pivoted row, all in ``session``. - Every row in ``group`` came from the same submission and carries identical component inputs, - so the components are inserted a single time — the components repo deduplicates by content - hash and returns the already-stored document (its id) when the content exists — and each - row's contribution links to those shared ids. Components are inserted sequentially because a - session is single-threaded — sharing it across concurrent awaits would corrupt the wire - protocol. - """ + """Perform the insert of Contributions and their components within a single session.""" template = group[0].contribution structures = await self._structures.insert_components(template.structures or [], session=session) tables = await self._tables.insert_components(template.tables or [], session=session) @@ -610,6 +596,7 @@ async def _do_insert_group(self, group: list[PreparedWrite], session: AsyncClien inserted.append(await self._contributions.insert_contribution(doc, session=session)) return inserted + # TODO: Allow components to be upserted async def upsert_contributions(self, contributions: list[ContributionIn]) -> BulkWriteSummary[Contribution]: """Upsert contributions by their identifying fields, reporting per-item outcomes. @@ -758,12 +745,7 @@ async def _resolve_unique_value(self, project: str, data: dict | None) -> Scalar return extract_unique_value(data, unique_column) async def upsert_contribution_by_id(self, id: str, contribution: ContributionIn) -> Contribution: - """Upsert a single contribution by Mongo id, resolving its server-owned ``unique_value``. - - A brand-new document (the id does not yet exist) counts against the project's - unapproved-contribution quota; updating an existing document is always allowed. The id-existence - check runs first so updates never pay for the (unscoped) stored-count query. - """ + """Upsert a single contribution by Mongo id, resolving its server-owned ``unique_value``.""" if not self._user.can_write(contribution.project): raise PermissionError(f"not authorized to write to project '{contribution.project}'") existing = await self._contributions.get_contribution_by_id(id, fields=None) @@ -794,8 +776,7 @@ async def patch_contribution_by_id( bare scalar routes onto a stored quantity leaf's ``value``); pass ``replace_data`` to overwrite the whole ``data`` dict. On replace the payload becomes a standalone document, so it is re-validated strictly (the permissive patch validator allows leaf fragments a full doc may not). - ``unique_value`` is resolved against the same post-write view the repository will persist, and - that view (``existing_data``) is handed to the repository so its dotted ``$set`` agrees. + ``unique_value`` is resolved against the same post-write view the repository will persist. """ set_fields = update.model_dump(exclude_unset=True) touches_unique = "data" in set_fields or "project" in set_fields @@ -901,15 +882,10 @@ async def delete_contributions(self, filter: ContributionFilter) -> BulkDeleteSu async def update_project(self, project_ids: Iterable[str]) -> None: """Recompute ``Project.stats``/``Project.columns`` from current contributions, per project. - Called after a contribution write/delete so a project's rollup stays in sync with its - contributions. Recomputes from the DB (rather than applying a per-write delta) because - ``columns`` min/max cannot be maintained incrementally on delete. Runs after the write - commits — the stats are eventually consistent, not part of the write's transaction. + Called after a write/delete. Uses the DB directly rather than a delta from the operation. The recompute is best-effort: a failure to refresh one project's stats is logged and does - not fail the originating write (the data is already committed; stats self-heal on the next - write). Contributions in a batch almost always target a single project, so the affected set - is small and each project is aggregated sequentially. + not fail the originating write. """ pids = {pid for pid in project_ids if pid} if not pids: From 6debe79681476c9d07fc4e21101752aae304f5b7 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Tue, 18 Aug 2026 12:01:40 -0700 Subject: [PATCH 579/591] docs(projects/models.py): modified documentation and docstrings --- .../mpcontribs_api/domains/projects/models.py | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py index b344b37a51..3965059226 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py @@ -10,11 +10,7 @@ def _validate_unique_column(value: str | None) -> str | None: - """Shape-only check for ``unique_column``: a non-empty, non-blank dotted-path string or None. - - No subset-of-``columns`` check: ``columns`` is derived and eventually consistent, so a path may - legitimately not appear there yet. Correctness is enforced per contribution at write time. - """ + """Shape-only check for ``unique_column``: a non-empty, non-blank dotted-path string or None.""" if value is None: return None if not value.strip() or any(not segment for segment in value.split(".")): @@ -84,8 +80,7 @@ class ProjectBase(BaseModel): is_approved: bool = False license: Literal["CCA4", "CCPD"] | None = None - # Validated on every representation (input and stored) so a bad unique_column is rejected at the - # door, consistent with ProjectPatch. See _validate_unique_column. + # Validated on every representation (input and stored) so a bad unique_column is rejected immediately @field_validator("unique_column") @classmethod def _check_unique_column(cls, v: str | None) -> str | None: @@ -97,10 +92,7 @@ class Settings: class Project(ProjectBase, BaseDocumentWithInput[ShortStr]): - """Document model of what is actually stored. - - Binds ``id`` to ``ShortStr`` (a meaningful string id, always supplied) via the generic base. - """ + """Document model of what is actually stored.""" # Server-owned: derived from the project's contributions stats: Stats = Field(default_factory=Stats.empty) @@ -204,7 +196,7 @@ class ProjectPatch(BaseModel): long_title: str | None = None other: dict[str, Any] = Field(default_factory=dict) is_public: bool = False - # None => unset (left unchanged); admin-only when set (enforced in the repository). + # None => unset (left unchanged); admin-only when set is_approved: bool | None = None license: Literal["CCA4", "CCPD"] | None = None From 93dfd8a63681635c44996fd3b2216a722cbb3d24 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Tue, 18 Aug 2026 13:48:28 -0700 Subject: [PATCH 580/591] test(many): fixed failing tests --- .../src/mpcontribs_api/domains/contributions/service.py | 4 ++-- mpcontribs-api/tests/unit/domains/test_contributions_pivot.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py index 8d7880ac4b..e0239a0cfc 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py @@ -393,8 +393,8 @@ async def _split_quota_exceeded( project=project_id, max_allowed=cap, stored=stored, - attempted=len(items) + len(rejected), - accepted=len(items), + attempted=len(items), + accepted=len(items) - len(rejected), rejected=len(rejected), rejected_identifiers=rejected_identifiers, rejected_identifiers_truncated=len(rejected) > _QUOTA_LOG_IDENTIFIER_CAP, diff --git a/mpcontribs-api/tests/unit/domains/test_contributions_pivot.py b/mpcontribs-api/tests/unit/domains/test_contributions_pivot.py index b1e7782358..d059145b9a 100644 --- a/mpcontribs-api/tests/unit/domains/test_contributions_pivot.py +++ b/mpcontribs-api/tests/unit/domains/test_contributions_pivot.py @@ -65,7 +65,7 @@ def test_leaves_values_untouched(self): assert _coerce_keys({"Key": "Value.With/Punct"}) == {"key": "Value.With/Punct"} def test_collision_raises(self): - with pytest.raises(ValidationError, match="collide after snake_case coercion"): + with pytest.raises(ValidationError, match="data keys collide after coercion"): _coerce_keys({"Band Gap": 1, "band_gap": 2}) def test_non_ascii_key_raises(self): From ed213357297141f65c30ad60f5d431fe32844e3a Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Tue, 18 Aug 2026 16:03:53 -0700 Subject: [PATCH 581/591] refactor(multiple): brought logic into higher level classes and simplified some method grammar moved from *_by_id and *_by_identifiers into a unified *_one grammar --- .../domains/_shared/components.py | 39 ------- .../mpcontribs_api/domains/_shared/models.py | 19 ++++ .../domains/_shared/repository.py | 94 +++++++--------- .../mpcontribs_api/domains/_shared/service.py | 58 ++++++---- .../domains/attachments/router.py | 26 +++-- .../domains/contributions/models.py | 2 +- .../domains/contributions/repository.py | 82 +++++--------- .../domains/contributions/router.py | 18 +-- .../domains/contributions/service.py | 52 ++++++++- .../domains/initiatives/repository.py | 25 +++-- .../domains/initiatives/router.py | 12 +- .../domains/project_groups/repository.py | 34 ++---- .../domains/project_groups/router.py | 36 +++--- .../domains/project_groups/service.py | 73 +++++++------ .../domains/projects/repository.py | 43 ++++---- .../mpcontribs_api/domains/projects/router.py | 28 ++--- .../domains/projects/service.py | 22 +++- .../domains/structures/router.py | 19 ++-- .../mpcontribs_api/domains/tables/router.py | 19 ++-- .../db/test_component_reachability.py | 6 +- .../db/test_components_repository.py | 46 ++++++-- .../db/test_contributions_repository.py | 103 ++++++++++++------ .../db/test_initiatives_repository.py | 48 ++++---- .../db/test_initiatives_service.py | 44 ++++---- .../db/test_project_groups_repository.py | 32 +++--- .../db/test_project_groups_service.py | 26 ++--- .../db/test_projects_repository.py | 80 +++++++------- .../integration/test_component_routes.py | 26 ++--- .../integration/test_contributions_routes.py | 40 +++---- .../tests/integration/test_initiatives.py | 8 +- .../tests/integration/test_projects.py | 88 ++++++++------- .../unit/domains/test_component_service.py | 45 ++++---- .../unit/domains/test_contribution_service.py | 40 ++++--- .../domains/test_project_group_service.py | 35 +++--- .../tests/unit/domains/test_shared_models.py | 10 +- 35 files changed, 729 insertions(+), 649 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py index 1af1edb05e..fd2841eb2e 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py @@ -10,7 +10,6 @@ from mpcontribs_api.domains._shared.models import Component, ComponentIn, DeleteResponse, DocumentOut from mpcontribs_api.domains._shared.repository import MongoDbRepository from mpcontribs_api.domains._shared.types import MD5Hash -from mpcontribs_api.exceptions import NotFoundError class MongoDbComponentsRepository[ @@ -94,10 +93,6 @@ async def insert_component(self, component: TIn, *, session: AsyncClientSession """ return (await self.insert_components(components=[component], session=session))[0] - async def get_component_by_id(self, id: str, fields: frozenset[str] | None) -> TDoc | TOut | None: - """Find a single component by id. See ``get_by_id``.""" - return await self.get_by_id(self._convert_object_id(id), fields) - async def delete_components( self, filter: TFilter, @@ -115,37 +110,3 @@ async def delete_components( query = filter.filter(self.document_model.find(self._scope, session=session)) result = await query.delete(session=session) return DeleteResponse(num_deleted=result.deleted_count if result else 0) - - async def delete_component_by_id( - self, - id: str, - session: AsyncClientSession | None = None, - ) -> DeleteResponse: - """Deletes a single component by Id. - - Args: - id (str): the str representation of the component's ObjectId - session (AsyncClientSession | None): the current session, used to guarantee transactions - - Returns: - DeleteResponse: A report of the deletion - """ - return await self.delete_by_id(id=self._convert_object_id(id), session=session) - - async def patch_component_by_id(self, id: str, update: TPatch) -> TDoc: - """Partially update a component by id, recomputing its content hash. - - Components are content-addressed, so a content change must update ``md5``. Unlike the base - ``patch`` (an in-place ``$set``), this loads the full document, applies the set fields, - recomputes ``md5`` from ``hash_fields``, and saves — keeping md5 consistent with content. - """ - oid = self._convert_object_id(id) - doc = await self.document_model.find_one(self._scope, self.document_model.id == oid) - if doc is None: - raise NotFoundError(self._not_found(id)) - update_data = update.model_dump(exclude_unset=True) - for field, value in update_data.items(): - setattr(doc, field, value) - doc.md5 = doc.compute_md5() - await doc.save() - return doc diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py index 7051658f9e..0c16342e84 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/models.py @@ -24,6 +24,7 @@ class BaseDocumentWithInput[TId](Document): models subclass their document, so they can't be bound as a class type parameter). """ + HAS_DERIVED_FIELDS: ClassVar[bool] = False # Required, non-null, resource-specific id. Overrides Document's optional ``PydanticObjectId`` id. id: TId = Field(alias="_id") # pyright: ignore[reportGeneralTypeIssues, reportIncompatibleVariableOverride] @@ -43,6 +44,14 @@ def identifiers(self) -> dict[str, Any]: """This document's identifier field values, keyed by :meth:`identifier_fields`.""" return {field: getattr(self, field) for field in self.identifier_fields()} + def derived_field_updates(self) -> dict[str, Any]: + """Server-derived fields to persist alongside a patch. + + Called by the repository on a copy of this document that already has the patch applied + in memory; the returned mapping is merged into the same ``$set`` write. Default: none. + """ + return {} + @classmethod def from_input_model(cls, data: Any) -> Self: """Translate a validated input payload into a full stored document.""" @@ -113,12 +122,22 @@ class Component(BaseDocumentWithInput[PydanticObjectId]): never define a component's content identity. """ + HAS_DERIVED_FIELDS: ClassVar[bool] = True name: str # Server-computed; the placeholder default is overwritten by ``_recompute_md5`` on validation. md5: MD5Hash = Field(default="0" * 32) hash_fields: ClassVar[frozenset[str]] + @classmethod + def identifier_fields(cls) -> frozenset[str]: + """A component is content-addressed: its ``md5`` uniquely identifies its content.""" + return frozenset({"md5"}) + + def derived_field_updates(self) -> dict[str, Any]: + """Recompute ``md5`` from the (patched-in-memory) content so the write stays authoritative.""" + return {"md5": self.compute_md5()} + # The md5 functions look redundant but aren't, we should keep both # Used in patching to compute the hash after an update - should not return self def compute_md5(self) -> str: diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py index 54a1573e22..1219690abd 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py @@ -72,6 +72,26 @@ def _convert_object_id(self, id: str) -> PydanticObjectId: except InvalidId: raise ValidationError("Incorrect Id format. Must be MongoDB ObjectId format.", id=id) from None + def coerce_identifiers(self, identifiers: dict[str, Any]) -> dict[str, Any]: + """Return ``identifiers`` with a string ``id`` coerced to the model's primary-key type. + + Externally supplied ids arrive as strings (path/query params). ObjectId-keyed models need + that string parsed into a ``PydanticObjectId`` before it can match ``_id``; string-keyed + models (e.g. ``Project``, whose id is its name) and every non-``id`` identifier key pass + through untouched. Idempotent: an already-parsed id is returned unchanged. + + This is the single home for identifier coercion so services that resolve documents by id + (and reuse the parsed id for cross-repository lookups) do not each reimplement it. + + Raises: + ValidationError: if ``id`` is a string that is not a valid ObjectId, for an + ObjectId-keyed model + """ + id = identifiers.get("id") + if isinstance(id, str) and self.document_model.model_fields["id"].annotation is PydanticObjectId: + return {**identifiers, "id": self._convert_object_id(id)} + return identifiers + async def get_many( self, filter: TFilter, @@ -106,17 +126,20 @@ async def get_many( def _identifier_query(self, identifiers: dict[str, Any]) -> dict[str, Any]: """Turn a ``{field: value}`` identifier dict into a scoped Mongo query fragment. - The keys must be exactly the model's :meth:`identifier_fields` - ``id`` is remapped Mongo's ``_id`` (mirroring ``BaseFilter._get_filter_conditions``) - since a raw dict query does not go through Beanie's alias resolution. + The keys must be either the model's :meth:`identifier_fields` exactly, or the bare + primary-key form ``{"id": ...}`` (which addresses any document by its ``_id`` regardless of + its semantic identifier). ``id`` is remapped to Mongo's ``_id`` (mirroring + ``BaseFilter._get_filter_conditions``) since a raw dict query does not go through Beanie's + alias resolution. Args: - identifiers (dict[str, Any]): identifier field values keyed by ``identifier_fields`` + identifiers (dict[str, Any]): identifier field values keyed by ``identifier_fields``, + or ``{"id": }`` """ expected = self.document_model.identifier_fields() - if identifiers.keys() != expected: + if identifiers.keys() != expected and identifiers.keys() != {"id"}: raise ValidationError( - "identifiers must match the model's identifier fields exactly", + "identifiers must match the model's identifier fields, or be a bare {'id': ...}", expected=sorted(expected), received=sorted(identifiers.keys()), ) @@ -137,19 +160,6 @@ async def get_one( projection = self.out_model.projection(fields) return await self.document_model.find_one(self._scope, query, projection_model=projection) # pyright: ignore[reportArgumentType] - async def get_by_id(self, id: Any, fields: frozenset[str] | None = None) -> TDoc | TOut | None: - """Return a single scoped document by id, projected to the requested fields. - - Args: - id (str): the id of the document to find - fields (frozenset[str] | None): fields to project; if None the full document is returned - """ - return await self.document_model.find_one( - self._scope, - self.document_model.id == id, - projection_model=self.out_model.projection(fields), - ) - async def list_ids(self, filter: TFilter, session: AsyncClientSession | None = None) -> list[Any]: """Return just the ids of scoped documents matching ``filter``. @@ -215,23 +225,6 @@ async def delete_one( raise NotFoundError(f"{self.document_model.__name__} not found", identifiers=identifiers) return DeleteResponse.from_delete_result(result) - async def delete_by_id(self, id: Any, session: AsyncClientSession | None = None) -> DeleteResponse: - """Delete a single scoped document by its primary key (``_id``). - - Scoping ensures callers cannot delete documents they are not permitted to see; an id that is - absent or out of scope raises ``NotFoundError``. Kept distinct from :meth:`delete_one`, whose - key is the semantic ``identifier_fields`` (which differs from ``_id`` for some resources). - - Args: - id (Any): the primary key of the document to delete - session (AsyncClientSession | None): optional client session for transactions - """ - doc = await self.document_model.find_one(self._scope, self.document_model.id == id, session=session) - if doc is None: - raise NotFoundError(message=f"{self.document_model.__name__} not found by id", id=id) - await doc.delete(session=session) - return DeleteResponse(num_deleted=1) - async def delete_by_ids(self, ids: list[Any], session: AsyncClientSession | None = None) -> DeleteResponse: """Delete multiple scoped documents by id. @@ -251,21 +244,6 @@ async def delete_by_ids(self, ids: list[Any], session: AsyncClientSession | None raise ValidationError("DeleteResult not returned internally") return DeleteResponse.from_delete_result(delete_result) - async def patch(self, id: Any, update: TPatch) -> TDoc: - """Partially update a single scoped document by id. - - Only fields explicitly set on ``update`` are applied. An empty patch is a no-op that still - returns the existing document for consistent behavior. Scoping ensures callers cannot patch - documents they are not permitted to see. - - Args: - id (str): the id of the document to update - update (TPatch): the partial update to apply; unset fields are dropped - """ - return await self._patch_matching( - self.document_model.id == id, update, NotFoundError(f"{self.document_model.__name__} not found", id=id) - ) - async def _patch_matching( self, match: Any, @@ -275,19 +253,27 @@ async def _patch_matching( ) -> TDoc: """Apply a partial update to the single scoped document matching ``match``. - ``match`` is any beanie filter that keys at most one in-scope document — a primary-key - equality (:meth:`patch`) or a unique-identifier query (:meth:`patch_one`). An empty patch + ``match`` is any beanie filter that keys at most one in-scope document. An empty patch is a no-op that still returns the existing document; a missing target raises ``not_found``. """ # Only retain set fields (patch) update_data = update.model_dump(exclude_unset=True) + existing = await self.document_model.find_one(self._scope, match, session=session) # If update is empty, return the model anyways (consistent behavior) if not update_data: - existing = await self.document_model.find_one(self._scope, match, session=session) if existing is None: raise not_found return existing + # Server-derived fields depend on the resulting document, which a bare $set never revalidates. + # Load, apply the patch in memory, and fold the recomputed values in. + if self.document_model.HAS_DERIVED_FIELDS: + if existing is None: + raise not_found + for field, value in update_data.items(): + setattr(existing, field, value) + update_data |= existing.derived_field_updates() + # Otherwise, update the fields fully (set) # Brendan TODO: Set will replace an entire field # - if we want to append to a list (ie. add a reference) we ned Push/AddToSet diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/service.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/service.py index d3ce92337e..a97d177aec 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/service.py @@ -1,6 +1,8 @@ from collections.abc import AsyncIterable from contextlib import AbstractAsyncContextManager +from typing import Any +from beanie import PydanticObjectId from fastapi_filter.contrib.beanie import Filter from pydantic import BaseModel from pymongo.asynchronous.client_session import AsyncClientSession @@ -70,16 +72,24 @@ async def get_many( pagination=pagination, filter=filter, fields=fields, restrict_ids=allowed ) - async def get_by_id(self, id: str, fields: frozenset[str] | None) -> TDoc | TOut | None: - """Find a single component by id, gated by contribution reachability. + async def _resolve_component_id(self, identifiers: dict[str, Any]) -> PydanticObjectId | None: + """Return the component ``_id`` after finding it via identifiers, or None if absent.""" + if "id" in identifiers: + return identifiers["id"] + existing = await self._components.get_one(identifiers, frozenset({"id"})) + return existing.id if existing is not None else None - Returns ``None`` (treated as not found) when no in-scope contribution references the id, - so callers cannot read a component belonging to a contribution they cannot see. + async def get_one(self, identifiers: dict[str, Any], fields: frozenset[str] | None) -> TDoc | TOut | None: + """Find a single component matching ``identifiers``, gated by contribution reachability. + + Returns ``None`` when no in-scope contribution references the component. + Accepts either the bare ``{"id": ...}`` form or the content-hash ``{"md5": ...}`` form. """ - oid = self._components._convert_object_id(id) - if not await self._contributions.referenced_component_ids(self._ref_field, [oid], scoped=True): + identifiers = self._components.coerce_identifiers(identifiers) + oid = await self._resolve_component_id(identifiers) + if oid is None or not await self._contributions.referenced_component_ids(self._ref_field, [oid], scoped=True): return None - return await self._components.get_component_by_id(id, fields) + return await self._components.get_one(identifiers, fields) async def insert( self, @@ -89,16 +99,19 @@ async def insert( """Bulk-insert components, deduplicated by content hash. See ``insert_components``.""" return await self._components.insert_components(components=components, session=session) - async def patch_by_id(self, id: str, update: TPatch) -> TDoc: - """Partially update a component by id, gated by contribution reachability. + async def patch_one(self, identifiers: dict[str, Any], update: TPatch) -> TDoc: + """Partially update a component matching ``identifiers``, gated by contribution reachability. + + Accepts either the bare ``{"id": ...}`` form or the content-hash ``{"md5": ...}`` form. Raises: - NotFoundError: when no in-scope contribution references the id + NotFoundError: when no in-scope contribution references the component """ - oid = self._components._convert_object_id(id) - if not await self._contributions.referenced_component_ids(self._ref_field, [oid], scoped=True): - raise NotFoundError(self._components._not_found(id)) - return await self._components.patch_component_by_id(id=id, update=update) + identifiers = self._components.coerce_identifiers(identifiers) + oid = await self._resolve_component_id(identifiers) + if oid is None or not await self._contributions.referenced_component_ids(self._ref_field, [oid], scoped=True): + raise NotFoundError(f"{self._components.document_model.__name__} not found", **identifiers) + return await self._components.patch_one(identifiers, update) async def download( self, @@ -146,11 +159,13 @@ async def delete(self, filter: TFilter) -> ComponentDeleteResponse: referenced_ids=sorted(referenced), ) - async def delete_by_id(self, id: str) -> ComponentDeleteResponse: - """Delete a single component by id, subject to the access and integrity gates. + async def delete_one(self, identifiers: dict[str, Any]) -> ComponentDeleteResponse: + """Delete a single component matching ``identifiers``, subject to the access and integrity gates. + + Accepts either the bare ``{"id": ...}`` form or the content-hash ``{"md5": ...}`` form. Args: - id (str): the str representation of the component's ObjectId + identifiers (dict[str, Any]): identifier field values, ``{"id": ...}`` or ``{"md5": ...}`` Returns: ComponentDeleteResponse: the deletion result, or a skipped result if still referenced @@ -158,10 +173,11 @@ async def delete_by_id(self, id: str) -> ComponentDeleteResponse: Raises: NotFoundError: if the component is not reachable via any in-scope contribution """ - oid = self._components._convert_object_id(id) - if not await self._contributions.referenced_component_ids(self._ref_field, [oid], scoped=True): - raise NotFoundError(self._components._not_found(id)) + identifiers = self._components.coerce_identifiers(identifiers) + oid = await self._resolve_component_id(identifiers) + if oid is None or not await self._contributions.referenced_component_ids(self._ref_field, [oid], scoped=True): + raise NotFoundError(f"{self._components.document_model.__name__} not found", **identifiers) if await self._contributions.referenced_component_ids(self._ref_field, [oid], scoped=False): return ComponentDeleteResponse(num_deleted=0, num_skipped=1, referenced_ids=[oid]) - deleted = await self._components.delete_by_id(oid) + deleted = await self._components.delete_one({"id": oid}) return ComponentDeleteResponse(num_deleted=deleted.num_deleted) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py b/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py index 09214a4fa2..de913e2474 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py @@ -13,7 +13,7 @@ download_filename, ) from mpcontribs_api.domains.attachments.dependencies import AttachmentServiceDep -from mpcontribs_api.domains.attachments.models import AttachmentFilter, AttachmentOut +from mpcontribs_api.domains.attachments.models import AttachmentFilter, AttachmentOut, AttachmentPatch from mpcontribs_api.pagination import CursorParams router = APIRouter() @@ -30,14 +30,15 @@ async def get_attachments( return await service.get_many(filter=filter, fields=selected, pagination=pagination) -@router.get("/{pk}") -async def get_attachment( +@router.get("/{id}") +async def get_one( service: AttachmentServiceDep, - pk: str, + id: str, fields: FieldSelector = AttachmentOut.default_fields(), ): + """Return a single attachment addressed by its ``_id``.""" selected = AttachmentOut.parse_fields(fields) - return await service.get_by_id(id=pk, fields=selected) + return await service.get_one(identifiers={"id": id}, fields=selected) @router.get("/download/{short_mime}") @@ -73,5 +74,16 @@ async def delete_attachments(service: AttachmentServiceDep, filter: AttachmentFi @router.delete("/{id}", response_model=ComponentDeleteResponse, dependencies=[Depends(require_user)]) -async def delete_attachment_by_id(service: AttachmentServiceDep, id: str): - return await service.delete_by_id(id=id) +async def delete_one(service: AttachmentServiceDep, id: str): + """Delete a single attachment addressed by its ``_id``.""" + return await service.delete_one(identifiers={"id": id}) + + +@router.patch("/{id}", dependencies=[Depends(require_user)]) +async def patch_one( + service: AttachmentServiceDep, + id: str, + update: AttachmentPatch, +): + """Patch a single attachment addressed by its ``_id`` or its content ``md5``.""" + return await service.patch_one(identifiers={"id": id}, update=update) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py index db65cc6f3f..5999bfaa31 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/models.py @@ -168,7 +168,7 @@ def identifiers(self) -> dict[str, str]: """Returns this contribution's identifier values (see ``identifier_fields``). Overrides the base to narrow the value type to ``str`` for the callers (bulk error - reporting, ``upsert_contribution_by_identifiers``) that key on it. + reporting, ``upsert_one``) that key on it. """ return {"project": self.project, "identifier": self.identifier} diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py index 09eb3e5f31..f0ad3954c4 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py @@ -54,18 +54,6 @@ async def get_contributions( """Query the Contribution collection, scoped to the current user. See ``get_many``.""" return await self.get_many(pagination=pagination, filter=filter, fields=fields) - async def get_contribution_by_id(self, id: str, fields: frozenset[str] | None): - """Find a single contribution by id, scoped to the current user. See ``get_by_id``.""" - return await self.get_by_id(self._convert_object_id(id), fields) - - async def patch_contribution_by_id(self, id: str, update: ContributionPatch): - """Partially update a contribution by id, scoped to the current user. See ``patch``.""" - return await self.patch(self._convert_object_id(id), update) - - async def delete_contribution_by_id(self, id: str) -> None: - """Delete a contribution by id, scoped to the current user. See ``delete_by_id``.""" - await self.delete_by_id(self._convert_object_id(id)) - async def delete_contributions( self, filter: ContributionFilter, @@ -99,14 +87,6 @@ async def insert_contribution( await doc.insert(session=session) return doc - async def find_one_contribution(self, project: str, identifier: str) -> Contribution | None: - """Find a single contribution by (project, identifier), scoped to the current user.""" - return await self.document_model.find_one( - self._scope, - self.document_model.project == project, - self.document_model.identifier == identifier, - ) - async def max_versions(self, keys: list[tuple[str, str]]) -> dict[tuple[str, str], int]: """Return ``{(project, identifier): max_version}`` for the given keys, scoped to the user. @@ -226,62 +206,50 @@ async def update_contribution(self, doc: Contribution, update_data: dict[str, An """Apply a partial update to an existing Contribution document.""" await doc.update(Set(update_data)) - async def upsert_contribution_by_identifiers( + async def upsert_one( self, - identifiers: dict[str, str], + identifiers: dict[str, Any], contribution: ContributionIn, - version: int, + version: int | None = None, + session: AsyncClientSession | None = None, ) -> Contribution: - """Atomically upsert a Contribution by its identifying fields and resolved version. + """Atomically upsert a single Contribution addressed by ``identifiers``. - Relies on the unique index over (project, identifier, version) so that concurrent requests - targeting the same key cannot both win the insert branch. Fields the caller did not set are - not touched (partial update). On insert a fresh Contribution document is written with - ``is_public=False``. + Accepts either the bare ``{"id": ...}`` form (individual PUT) or the semantic + ``{"project", "identifier"}``, matching through the base + :meth:`MongoDbRepository._identifier_query`. When ``version`` is supplied it is stamped on + the document and folded into the semantic match, so the unique index over + (project, identifier, version) lets concurrent requests targeting the same key not both win + the insert branch. Fields the caller did not set are not touched (partial update); on insert + a fresh Contribution document is written with ``is_public=False``. Args: - identifiers: the fields ContributionIn.identifiers() returns (project, identifier) + identifiers: ``{"id": ...}`` or the ``{"project", "identifier"}`` pair contribution: the input payload to upsert - version: the version resolved by the service (1 for unique-identifier projects, or the - caller-supplied version for non-unique ones); selects which row to update + version: the version resolved by the service (selects which row to update); required for + the semantic form, ignored for the id form + session: optional client session for transactions Returns: Contribution: the document as it stands after the operation """ doc = self.document_model.from_input_model(contribution) - doc.version = version + match = identifiers + if version is not None: + doc.version = version + # The semantic (project, identifier) match must be pinned to the resolved version. + if "id" not in match: + match["version"] = version update_data = doc.model_dump(exclude={"id"}, exclude_none=True) query = self.document_model.find_one( self._scope, - self.document_model.project == identifiers["project"], - self.document_model.identifier == identifiers["identifier"], - self.document_model.version == version, + self._identifier_query(match), + session=session, ).upsert( Set(update_data), on_insert=doc, response_type=UpdateResponse.NEW_DOCUMENT, - ) - return await query # pyright: ignore[reportGeneralTypeIssues] # beanie UpdateQuery is awaitable, but pyright doesn't see it - - async def upsert_contribution_by_id(self, id: str, contribution: ContributionIn): - """Upserts a single Contribution. - - If Contributions with identical identifiers exist, update, otherwise insert - - Args: - id (str): the id of the Contribution to upsert - contribution (ContributionIn): the Contribution to be upserted - - Returns: - ContributionOut: the upserted document""" - doc = self.document_model.from_input_model(contribution) - query = self.document_model.find_one( - self._scope, - self.document_model.id == self._convert_object_id(id), - ).upsert( - Set(doc.model_dump(exclude={"id"}, exclude_none=True)), - on_insert=doc, - response_type=UpdateResponse.NEW_DOCUMENT, + session=session, ) return await query # pyright: ignore[reportGeneralTypeIssues] # beanie UpdateQuery is awaitable, but pyright doesn't see it diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py index 73466eff28..6162aa82a2 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py @@ -113,28 +113,28 @@ async def download_contributions( @router.delete("/{id}", dependencies=[Depends(require_user)]) -async def delete_contribution_by_id( +async def delete_one( service: ContributionServiceDep, id: str, ): - return await service.delete_contributions(ContributionFilter.model_validate({"id": id})) + return await service.delete_one({"id": id}) @router.get("/{id}") -async def get_contribution_by_id( - repo: ContributionDep, +async def get_one( + service: ContributionServiceDep, id: str, fields: FieldSelector = ContributionOut.default_fields(), ): selected = ContributionOut.parse_fields(fields) - return await repo.get_contribution_by_id(id=id, fields=selected) + return await service.get_one({"id": id}, fields=selected) @router.put("/{id}", dependencies=[Depends(require_user)]) -async def upsert_contribution_by_id(repo: ContributionDep, id: str, contribution: ContributionIn): - return await repo.upsert_contribution_by_id(id=id, contribution=contribution) +async def upsert_one(service: ContributionServiceDep, id: str, contribution: ContributionIn): + return await service.upsert_one({"id": id}, contribution=contribution) @router.patch("/{id}", dependencies=[Depends(require_user)]) -async def patch_contribution_by_id(repo: ContributionDep, id: str, update: ContributionPatch): - return await repo.patch_contribution_by_id(id=id, update=update) +async def patch_one(service: ContributionServiceDep, id: str, update: ContributionPatch): + return await service.patch_one({"id": id}, update=update) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py index 88ba3a523f..8cd3c29e1a 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py @@ -2,7 +2,7 @@ from collections import defaultdict from collections.abc import Iterable from dataclasses import dataclass -from typing import cast +from typing import Any, cast import structlog from beanie import Link, PydanticObjectId @@ -20,7 +20,13 @@ ) from mpcontribs_api.domains._shared.repository import MongoDbRepository from mpcontribs_api.domains.attachments.repository import MongoDbAttachmentRepository -from mpcontribs_api.domains.contributions.models import Contribution, ContributionFilter, ContributionIn +from mpcontribs_api.domains.contributions.models import ( + Contribution, + ContributionFilter, + ContributionIn, + ContributionOut, + ContributionPatch, +) from mpcontribs_api.domains.contributions.repository import MongoDbContributionRepository from mpcontribs_api.domains.projects.repository import MongoDbProjectRepository from mpcontribs_api.domains.structures.models import Structure @@ -75,6 +81,44 @@ def _children(self) -> dict[str, MongoDbRepository]: "tables": self._tables, } + async def get_one( + self, identifiers: dict[str, Any], fields: frozenset[str] | None + ) -> Contribution | ContributionOut | None: + """Return the single scoped contribution matching ``identifiers``. + + Accepts either the bare ``{"id": ...}`` form or the semantic + ``{"project", "identifier", "version"}`` set, resolved by the base ``_identifier_query``. + """ + return await self._contributions.get_one(self._contributions.coerce_identifiers(identifiers), fields) + + async def patch_one(self, identifiers: dict[str, Any], update: ContributionPatch) -> Contribution: + """Partially update the single scoped contribution matching ``identifiers``.""" + return await self._contributions.patch_one(self._contributions.coerce_identifiers(identifiers), update) + + async def upsert_one( + self, identifiers: dict[str, Any], contribution: ContributionIn, version: int | None = None + ) -> Contribution: + """Upsert the single scoped contribution matching ``identifiers``. See repository ``upsert_one``.""" + return await self._contributions.upsert_one(self._contributions.coerce_identifiers(identifiers), contribution, version) + + async def delete_one(self, identifiers: dict[str, Any]) -> BulkDeleteSummary: + """Delete a single contribution and its child components, matching ``identifiers``. + + Accepts either the bare ``{"id": ...}`` form or the semantic + ``{"project", "identifier", "version"}`` set. Cascades component deletion via + :meth:`delete_contributions` so children are never orphaned; a missing target is a zero-count + result (mirroring the bulk delete path, which does not 404). + """ + identifiers = self._contributions.coerce_identifiers(identifiers) + if set(identifiers) == {"id"}: + filter = ContributionFilter(id=identifiers["id"]) + else: + existing = await self._contributions.get_one(identifiers, frozenset({"id"})) + if existing is None: + return BulkDeleteSummary(num_deleted=0, num_children_deleted=0) + filter = ContributionFilter(id=existing.id) + return await self.delete_contributions(filter) + async def insert_contributions( self, contributions: list[ContributionIn], @@ -468,9 +512,7 @@ async def _bounded_upsert(item: ResolvedWrite) -> Contribution | BulkFailure: contrib = item.contribution async with sem: try: - return await self._contributions.upsert_contribution_by_identifiers( - contrib.identifiers(), contrib, item.version - ) + return await self._contributions.upsert_one(contrib.identifiers(), contrib, item.version) except Exception as exc: logger.error( "upsert_contribution_failed", index=item.index, identifier=contrib.identifiers(), exc_info=True diff --git a/mpcontribs-api/src/mpcontribs_api/domains/initiatives/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/initiatives/repository.py index 18381b5111..6c52d57304 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/initiatives/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/initiatives/repository.py @@ -1,6 +1,7 @@ from typing import Any from beanie import PydanticObjectId +from pymongo.asynchronous.client_session import AsyncClientSession from pymongo.errors import DuplicateKeyError from mpcontribs_api.authz import User @@ -50,10 +51,6 @@ async def get_initiatives( """Return a scoped, filtered, paginated page of initiatives. See ``get_many``.""" return await self.get_many(pagination=pagination, filter=filter, fields=fields) - async def get_initiative(self, slug: str, fields: frozenset[str] | None) -> InitiativeOut | None: - """Return the single scoped initiative identified by ``slug``. See ``get_one``.""" - return await self.get_one({"slug": slug}, fields) - async def resolve_visible(self, slug: str) -> Initiative | None: """Return the full scoped initiative document for ``slug`` (or None), for write-path checks.""" return await self.document_model.find_one(self._scope, self.document_model.slug == slug) @@ -94,14 +91,20 @@ async def insert_initiative(self, data: InitiativeIn) -> Initiative: raise ConflictError("an initiative with this slug already exists", slug=data.slug) from exc return initiative - async def patch_initiative(self, slug: str, update: InitiativePatch) -> Initiative: + async def patch_one( # pyright: ignore[reportIncompatibleMethodOverride] + self, identifiers: dict[str, Any], update: InitiativePatch, session: AsyncClientSession | None = None + ) -> Initiative: """Patch a scoped initiative by ``slug``, enforcing manage rights and approval rules. - The caller must be able to *manage* the initiative (owner/collaborator/admin) - Only an admin may change ``is_approved``. - The resulting state must satisfy ``is_public ⇒ is_approved`` (re-checked here because a partial ``$set`` does not run the document validator). + + ``identifiers`` is the ``{"slug": ...}`` form; the auth checks run against the resolved + document, and the write itself is delegated to the base :meth:`MongoDbRepository.patch_one`. """ + slug = identifiers["slug"] existing = await self.resolve_visible(slug) if existing is None: raise NotFoundError("Initiative not found", slug=slug) @@ -119,18 +122,24 @@ async def patch_initiative(self, slug: str, update: InitiativePatch) -> Initiati if resulting_public and not resulting_approved: raise ValidationError("an initiative cannot be public until it is approved", slug=slug) - return await self.patch(existing.id, update) + return await super().patch_one(identifiers, update, session=session) - async def delete_initiative(self, slug: str) -> DeleteResponse: + async def delete_one( + self, identifiers: dict[str, Any], session: AsyncClientSession | None = None + ) -> DeleteResponse: """Delete a scoped initiative by ``slug``. Restricted to the owner or an admin. Collaborators may contribute projects but may not dissolve the effort. Deleting an initiative does not touch member projects; their ``initiative`` link simply dangles until re-pointed (reads resolve a missing link to null). + + ``identifiers`` is the ``{"slug": ...}`` form; the write is delegated to the base + :meth:`MongoDbRepository.delete_one`. """ + slug = identifiers["slug"] existing = await self.resolve_visible(slug) if existing is None: raise NotFoundError("Initiative not found", slug=slug) if not (self._user.is_admin or existing.owner == self._user.username): raise PermissionError(required_role="owner-or-admin") - return await self.delete_by_id(existing.id) + return await super().delete_one(identifiers, session=session) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/initiatives/router.py b/mpcontribs-api/src/mpcontribs_api/domains/initiatives/router.py index 844818fd50..8a41815ae6 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/initiatives/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/initiatives/router.py @@ -30,14 +30,14 @@ async def get_initiatives( @router.get("/{slug}") -async def get_initiative( +async def get_one( repo: InitiativeDep, slug: str, fields: FieldSelector = InitiativeOut.default_fields(), ): """Return the single initiative identified by ``slug``, scoped to the caller.""" selected = InitiativeOut.parse_fields(fields) - return await repo.get_initiative(slug=slug, fields=selected) + return await repo.get_one({"slug": slug}, fields=selected) @router.post( @@ -56,7 +56,7 @@ async def insert_initiative( @router.patch("/{slug}", response_model=InitiativeOut, dependencies=[Depends(require_user)]) -async def patch_initiative( +async def patch_one( repo: InitiativeDep, slug: str, update: InitiativePatch, @@ -66,14 +66,14 @@ async def patch_initiative( Requires manage rights (owner/collaborator/admin). ``is_approved`` is admin-only, and an initiative cannot be made public until it is approved. """ - return await repo.patch_initiative(slug=slug, update=update) + return await repo.patch_one({"slug": slug}, update=update) @router.delete("/{slug}", status_code=status.HTTP_204_NO_CONTENT, dependencies=[Depends(require_user)]) -async def delete_initiative( +async def delete_one( repo: InitiativeDep, slug: str, ): """Delete the initiative identified by ``slug``. Restricted to its owner or an admin.""" - await repo.delete_initiative(slug=slug) + await repo.delete_one({"slug": slug}) return Response(status_code=status.HTTP_204_NO_CONTENT) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/project_groups/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/project_groups/repository.py index faef61afcd..31ed1f129d 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/project_groups/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/project_groups/repository.py @@ -9,7 +9,7 @@ from mpcontribs_api.authz import User from mpcontribs_api.domains._shared.models import DeleteResponse from mpcontribs_api.domains._shared.repository import MongoDbRepository -from mpcontribs_api.domains._shared.types import PrefixedEmail, SearchStr, ShortStr +from mpcontribs_api.domains._shared.types import ShortStr from mpcontribs_api.domains.project_groups.models import ( ProjectGroup, ProjectGroupFilter, @@ -60,38 +60,26 @@ async def get_project_groups( """ return await self.get_many(pagination=pagination, filter=filter, fields=fields) - async def get_project_group( - self, - name: SearchStr, - owner: PrefixedEmail, - fields: frozenset[str] | None, - ) -> ProjectGroupOut | None: - """Return the single project group identified by ``name`` + ``owner``. See ``get_one``.""" - return await self.get_one({"name": name, "owner": owner}, fields) - async def insert_project_group(self, project_group: ProjectGroupIn) -> ProjectGroup: return await self.insert_one(in_resource=project_group) - async def patch_project_group( - self, name: SearchStr, owner: PrefixedEmail, update: ProjectGroupPatch - ) -> ProjectGroup: - """Patch the single project group identified by ``name`` + ``owner``. See ``patch_one``.""" - return await self.patch_one({"name": name, "owner": owner}, update) - - async def delete_project_group(self, name: SearchStr, owner: PrefixedEmail) -> DeleteResponse: - """Delete the single project group identified by ``name`` + ``owner``. + async def delete_one( + self, identifiers: dict[str, Any], session: AsyncClientSession | None = None + ) -> DeleteResponse: + """Delete the single project group matching ``identifiers`` (``{name, owner}`` or ``{id}``). Absence (in scope) takes precedence over the ownership gate: a non-admin may only delete their own group, so deleting another owner's visible (public) group is forbidden rather than silently a no-op. The ``name`` + ``owner`` unique index makes the match unambiguous. + The auth check runs against the resolved document; the write is delegated to the base + :meth:`MongoDbRepository.delete_one`. """ - doc = await self.document_model.find_one(self._scope, {"name": name, "owner": owner}) # pyright: ignore[reportArgumentType] + doc = await self.document_model.find_one(self._scope, self._identifier_query(identifiers), session=session) # pyright: ignore[reportArgumentType] if doc is None: - raise NotFoundError(f"{self.document_model.__name__} not found", name=name, owner=owner) - if not (self._user.is_admin or owner == self._user.username): + raise NotFoundError(f"{self.document_model.__name__} not found", **identifiers) + if not (self._user.is_admin or doc.owner == self._user.username): raise PermissionError(required_role="owner-or-admin") - await doc.delete() - return DeleteResponse(num_deleted=1) + return await super().delete_one(identifiers, session=session) async def delete_project_groups(self, filter: ProjectGroupFilter) -> DeleteResponse: """Bulk-delete project groups matching ``filter``, restricted to the caller's own. diff --git a/mpcontribs-api/src/mpcontribs_api/domains/project_groups/router.py b/mpcontribs-api/src/mpcontribs_api/domains/project_groups/router.py index 70a783b526..5854180d92 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/project_groups/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/project_groups/router.py @@ -40,8 +40,8 @@ async def get_project_groups( @router.get("/item") -async def get_project_group( - repo: ProjectGroupDep, +async def get_one( + service: ProjectGroupServiceDep, name: SearchStr, owner: PrefixedEmail, fields: FieldSelector = ProjectGroupOut.default_fields(), @@ -49,13 +49,13 @@ async def get_project_group( """Return the single project group identified by ``name`` + ``owner``. Args: - repo (ProjectGroupDep): the project group repo we depend on + service (ProjectGroupServiceDep): the project group service we depend on name (SearchStr): the project group's name owner (PrefixedEmail): the project group's owner fields (FieldSelector): the fields to return to a user """ selected = ProjectGroupOut.parse_fields(fields) - return await repo.get_project_group(name=name, owner=owner, fields=selected) + return await service.get_one({"name": name, "owner": owner}, fields=selected) @router.post( @@ -78,8 +78,8 @@ async def insert_project_group( @router.patch("/item", response_model=ProjectGroupOut, dependencies=[Depends(require_user)]) -async def patch_project_group( - repo: ProjectGroupDep, +async def patch_one( + service: ProjectGroupServiceDep, name: SearchStr, owner: PrefixedEmail, update: ProjectGroupPatch, @@ -87,17 +87,17 @@ async def patch_project_group( """Partially update the project group identified by ``name`` + ``owner``. Args: - repo (ProjectGroupDep): the project group repo we depend on + service (ProjectGroupServiceDep): the project group service we depend on name (SearchStr): the project group's name owner (PrefixedEmail): the project group's owner update (ProjectGroupPatch): the partial update to apply - unset fields are dropped """ - return await repo.patch_project_group(name=name, owner=owner, update=update) + return await service.patch_one({"name": name, "owner": owner}, update=update) @router.delete("/item", status_code=status.HTTP_204_NO_CONTENT, dependencies=[Depends(require_user)]) -async def delete_project_group( - repo: ProjectGroupDep, +async def delete_one( + service: ProjectGroupServiceDep, name: SearchStr, owner: PrefixedEmail, ): @@ -106,11 +106,11 @@ async def delete_project_group( Raises 404 if no such group is visible to the caller, 409 if the identifiers are ambiguous. Args: - repo (ProjectGroupDep): the project group repo we depend on + service (ProjectGroupServiceDep): the project group service we depend on name (SearchStr): the project group's name owner (PrefixedEmail): the project group's owner """ - await repo.delete_project_group(name=name, owner=owner) + await service.delete_one({"name": name, "owner": owner}) return Response(status_code=status.HTTP_204_NO_CONTENT) @@ -140,7 +140,7 @@ async def add_projects_by_identifiers( Each project is verified against the projects collection (scoped to the caller); unknown or invisible projects are reported per-item in the response rather than failing the whole request. """ - return await service.add_projects_by_identifiers(name=name, owner=owner, project_ids=body.project_ids) + return await service.add_projects({"name": name, "owner": owner}, body.project_ids) @router.delete("/item/projects", response_model=BulkWriteSummary[str], dependencies=[Depends(require_user)]) @@ -154,7 +154,7 @@ async def delete_projects_by_identifiers( Ids that are not members of the group are reported per-item in the response. """ - return await service.delete_projects_by_identifiers(name=name, owner=owner, project_ids=body.project_ids) + return await service.delete_projects({"name": name, "owner": owner}, body.project_ids) @router.post("/{id}/projects", response_model=BulkWriteSummary[str], dependencies=[Depends(require_user)]) @@ -163,8 +163,8 @@ async def add_projects_by_id( id: str, body: ProjectRefs, ): - """Add projects to the group identified by ``id``. See ``add_projects_by_identifiers``.""" - return await service.add_projects_by_id(group_id=id, project_ids=body.project_ids) + """Add projects to the group identified by ``id``. See ``add_projects``.""" + return await service.add_projects({"id": id}, body.project_ids) @router.delete("/{id}/projects", response_model=BulkWriteSummary[str], dependencies=[Depends(require_user)]) @@ -173,5 +173,5 @@ async def delete_projects_by_id( id: str, body: ProjectRefs, ): - """Delete projects from the group identified by ``id``. See ``delete_projects_by_identifiers``.""" - return await service.delete_projects_by_id(group_id=id, project_ids=body.project_ids) + """Delete projects from the group identified by ``id``. See ``delete_projects``.""" + return await service.delete_projects({"id": id}, body.project_ids) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/project_groups/service.py b/mpcontribs-api/src/mpcontribs_api/domains/project_groups/service.py index b882208aed..be62035cd5 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/project_groups/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/project_groups/service.py @@ -1,8 +1,16 @@ +from typing import Any + from beanie import Link from mpcontribs_api.domains._shared.bulk import BulkFailure, BulkWriteSummary -from mpcontribs_api.domains._shared.types import PrefixedEmail, SearchStr, ShortStr -from mpcontribs_api.domains.project_groups.models import ProjectGroup, ProjectGroupIn, ProjectGroupOut +from mpcontribs_api.domains._shared.models import DeleteResponse +from mpcontribs_api.domains._shared.types import ShortStr +from mpcontribs_api.domains.project_groups.models import ( + ProjectGroup, + ProjectGroupIn, + ProjectGroupOut, + ProjectGroupPatch, +) from mpcontribs_api.domains.project_groups.repository import ProjectGroupRepository from mpcontribs_api.domains.projects.repository import MongoDbProjectRepository from mpcontribs_api.exceptions import NotFoundError @@ -25,7 +33,7 @@ def __init__( async def _project_exists(self, project_id: ShortStr) -> bool: """Whether a project with ``project_id`` exists and is visible to the caller.""" - return await self._projects.get_by_id(project_id, fields=frozenset({"id"})) is not None + return await self._projects.get_one({"id": project_id}, fields=frozenset({"id"})) is not None async def insert(self, project_group: ProjectGroupIn) -> ProjectGroup: """Insert a new group after verifying every referenced project exists and is visible. @@ -40,23 +48,30 @@ async def insert(self, project_group: ProjectGroupIn) -> ProjectGroup: raise NotFoundError("One or more projects not found or not visible", ids=missing) return await self._groups.insert_project_group(project_group) - async def _resolve_by_id(self, group_id: str) -> ProjectGroupOut: - """Resolve a visible group by its ObjectId, or raise ``NotFoundError``.""" - oid = self._groups._convert_object_id(group_id) - group = await self._groups.get_by_id(oid, fields=_GROUP_FIELDS) - if group is None: - raise NotFoundError("ProjectGroup not found", id=group_id) - return group # pyright: ignore[reportReturnType] # projected reads return the out model + async def get_one(self, identifiers: dict[str, Any], fields: frozenset[str] | None) -> ProjectGroupOut | None: + """Return the single group matching ``identifiers`` (``{"name", "owner"}`` or ``{"id"}``).""" + return await self._groups.get_one(identifiers, fields) + + async def patch_one(self, identifiers: dict[str, Any], update: ProjectGroupPatch) -> ProjectGroup: + """Patch the single group matching ``identifiers`` (``{"name", "owner"}`` or ``{"id"}``).""" + return await self._groups.patch_one(identifiers, update) - async def _resolve_by_identifiers(self, name: SearchStr, owner: PrefixedEmail) -> ProjectGroupOut: - """Resolve a visible group by its ``(name, owner)`` identifiers, or raise ``NotFoundError``. + async def delete_one(self, identifiers: dict[str, Any]) -> DeleteResponse: + """Delete the single group matching ``identifiers`` (``{"name", "owner"}`` or ``{"id"}``).""" + return await self._groups.delete_one(identifiers) - Propagates ``ConflictError`` from the repository if the identifiers are ambiguous. + async def _resolve_one(self, identifiers: dict[str, Any]) -> ProjectGroupOut: + """Resolve a visible group matching ``identifiers``, or raise ``NotFoundError``. + + ``identifiers`` is either the primary-key form ``{"id": }`` or the semantic + ``{"name": ..., "owner": ...}``. Propagates ``ConflictError`` from the repository if + ``(name, owner)`` identifiers are ambiguous. """ - group = await self._groups.get_one({"name": name, "owner": owner}, fields=_GROUP_FIELDS) + query = self._groups.coerce_identifiers(identifiers) + group = await self._groups.get_one(query, fields=_GROUP_FIELDS) if group is None: - raise NotFoundError("ProjectGroup not found", name=name, owner=owner) - return group + raise NotFoundError("ProjectGroup not found", **identifiers) + return group # pyright: ignore[reportReturnType] # projected reads return the out model async def _add(self, group: ProjectGroupOut, project_ids: list[ShortStr]) -> BulkWriteSummary[str]: """Validate each project against the projects collection, then add the valid ones. @@ -105,22 +120,10 @@ async def _delete(self, group: ProjectGroupOut, project_ids: list[ShortStr]) -> await self._groups.delete_project_refs(group.id, present) # pyright: ignore[reportArgumentType] # id is set on a resolved group return BulkWriteSummary(total=len(project_ids), succeeded=present, failed=failed) - async def add_projects_by_id(self, group_id: str, project_ids: list[ShortStr]) -> BulkWriteSummary[str]: - """Add projects to the group identified by ``group_id``.""" - return await self._add(await self._resolve_by_id(group_id), project_ids) - - async def add_projects_by_identifiers( - self, name: SearchStr, owner: PrefixedEmail, project_ids: list[ShortStr] - ) -> BulkWriteSummary[str]: - """Add projects to the group identified by ``(name, owner)``.""" - return await self._add(await self._resolve_by_identifiers(name, owner), project_ids) - - async def delete_projects_by_id(self, group_id: str, project_ids: list[ShortStr]) -> BulkWriteSummary[str]: - """Delete projects from the group identified by ``group_id``.""" - return await self._delete(await self._resolve_by_id(group_id), project_ids) - - async def delete_projects_by_identifiers( - self, name: SearchStr, owner: PrefixedEmail, project_ids: list[ShortStr] - ) -> BulkWriteSummary[str]: - """Delete projects from the group identified by ``(name, owner)``.""" - return await self._delete(await self._resolve_by_identifiers(name, owner), project_ids) + async def add_projects(self, identifiers: dict[str, Any], project_ids: list[ShortStr]) -> BulkWriteSummary[str]: + """Add projects to the group matching ``identifiers`` (``{"id": ...}`` or ``{"name", "owner"}``).""" + return await self._add(await self._resolve_one(identifiers), project_ids) + + async def delete_projects(self, identifiers: dict[str, Any], project_ids: list[ShortStr]) -> BulkWriteSummary[str]: + """Delete projects from the group matching ``identifiers`` (``{"id": ...}`` or ``{"name", "owner"}``).""" + return await self._delete(await self._resolve_one(identifiers), project_ids) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py index 222c7988e1..ec22f17d66 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py @@ -3,8 +3,10 @@ from beanie import PydanticObjectId, UpdateResponse from beanie.operators import Set from bson import DBRef +from pymongo.asynchronous.client_session import AsyncClientSession from mpcontribs_api.authz import User +from mpcontribs_api.domains._shared.models import DeleteResponse from mpcontribs_api.domains._shared.repository import MongoDbRepository from mpcontribs_api.domains.projects.models import ( Project, @@ -54,10 +56,6 @@ async def get_projects( """Query the Project collection, scoped to the current user. See ``get_many``.""" return await self.get_many(pagination=pagination, filter=filter, fields=fields) - async def get_project_by_id(self, id: str, fields: frozenset[str] | None) -> Project | ProjectOut | None: - """Find a single project by id, scoped to the current user. See ``get_by_id``.""" - return await self.get_by_id(id, fields) - async def unique_identifiers_by_id(self, ids: list[str]) -> dict[str, bool]: """Return ``{project_id: unique_identifiers}`` for the given project ids, scoped to the user. @@ -86,18 +84,20 @@ async def insert_project(self, project: ProjectIn) -> Project: """Insert a new project, rejecting a duplicate id. See ``insert_one``.""" return await self.insert_one(project) - async def patch_project_by_id(self, id: str, update: ProjectPatch) -> Project: + async def patch_one( # pyright: ignore[reportIncompatibleMethodOverride] + self, identifiers: dict[str, Any], update: ProjectPatch, session: AsyncClientSession | None = None + ) -> Project: """Partially update a scoped project by id, enforcing approval rules. - Only an admin may change ``is_approved``. - Resulting state must satisfy is_public <-> is_approved condition - The ``initiative`` field is split out upstream in ``ProjectService.patch``, so it never + The ``initiative`` field is split out upstream in ``ProjectService.patch_one``, so it never reaches this method; an assignment that also edits plain fields goes through :meth:`patch_project_with_initiative` instead. """ - await self._enforce_patch_rules(id, update) - return await self.patch(id, update) + await self._enforce_patch_rules(identifiers["id"], update) + return await super().patch_one(identifiers, update, session=session) async def patch_project_with_initiative(self, id: str, update: ProjectPatch, ref: DBRef | None) -> Project: """Atomically apply a partial project update together with its canonical initiative link. @@ -111,13 +111,13 @@ async def patch_project_with_initiative(self, id: str, update: ProjectPatch, ref await self._enforce_patch_rules(id, update) data = update.model_dump(exclude_unset=True) data["initiative"] = ref - query = self.document_model.find_one(self._scope, self.document_model.id == id).update( + query = self.document_model.find_one(self._scope, self._identifier_query({"id": id})).update( Set(data), response_type=UpdateResponse.NEW_DOCUMENT, ) updated = await query # pyright: ignore[reportGeneralTypeIssues] # beanie UpdateQuery is awaitable if updated is None: - raise NotFoundError(self._not_found(id)) + raise NotFoundError(f"{self.document_model.__name__} not found", id=id) return updated async def _enforce_patch_rules(self, id: str, update: ProjectPatch) -> None: @@ -135,28 +135,32 @@ async def _enforce_patch_rules(self, id: str, update: ProjectPatch) -> None: existing = await self.document_model.find_one(self._scope, self.document_model.id == id) if existing is None: - raise NotFoundError(self._not_found(id)) + raise NotFoundError(f"{self.document_model.__name__} not found", id=id) resulting_approved = data.get("is_approved", existing.is_approved) resulting_public = data.get("is_public", existing.is_public) if resulting_public and not resulting_approved: raise ValidationError("a project cannot be public until it is approved", id=id) - async def delete_project_by_id(self, id: str) -> None: + async def delete_one( + self, identifiers: dict[str, Any], session: AsyncClientSession | None = None + ) -> DeleteResponse: """Delete a scoped project by id. Restricted to the owner or an admin. Visibility (public/approved or group membership) is not enough to delete: a project can only be dissolved by its owner (or an admin). A caller who cannot see the project gets a - 404; a caller who can see it but does not own it gets a 403. + 404; a caller who can see it but does not own it gets a 403. The auth check runs against the + resolved document; the write is delegated to the base :meth:`MongoDbRepository.delete_one`. """ - existing = await self.document_model.find_one(self._scope, self.document_model.id == id) + id = identifiers["id"] + existing = await self.document_model.find_one(self._scope, self._identifier_query({"id": id})) if existing is None: - raise NotFoundError(self._not_found(id)) + raise NotFoundError(f"{self.document_model.__name__} not found", id=id) if not (self._user.is_admin or existing.owner == self._user.username): raise PermissionError(required_role="owner-or-admin") - await self.delete_by_id(id) + return await super().delete_one(identifiers, session=session) - async def upsert_project_by_id(self, id: str, data: ProjectIn) -> Project: + async def upsert_one(self, identifiers: dict[str, Any], data: ProjectIn) -> Project: """Upsert a project by provided id, authorized to the current user. Update the document if the id exists, otherwise insert a new one under that id. @@ -168,10 +172,10 @@ async def upsert_project_by_id(self, id: str, data: ProjectIn) -> Project: - **New project:** ``owner`` is forced to the caller; server-managed fields keep their defaults - Note: relies on the path param ``id`` for identity, not the body's id. + Note: relies on the identifier ``id`` for identity, not the body's id. Args: - id (str): the id of the project to upsert + identifiers (dict[str, Any]): the identifier of the project to upsert (``{"id": ...}``) data (ProjectIn): the data of the project to upsert Returns: @@ -184,6 +188,7 @@ async def upsert_project_by_id(self, id: str, data: ProjectIn) -> Project: if self._user.username is None: raise PermissionError(required_role="authenticated") + id = identifiers["id"] existing = await self.document_model.find_one(self.document_model.id == id) project = self.document_model.from_input_model(data) project.id = id diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py index 56d453a948..82f3d9d506 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py @@ -40,28 +40,28 @@ async def get_projects( @router.get("/{id}") -async def get_project_by_id( +async def get_one( id: str, - repo: ProjectDep, + service: ProjectServiceDep, fields: FieldSelector = ProjectOut.default_fields(), ): """Gets a single project by its ID. Args: id (str): the id of the project to retrieve - repo (ProjectDep): the project repo we depend on + service (ProjectServiceDep): the project service we depend on fields (str | None): optional fields to include in return. If None supplied, all fields are returned Returns: ProjectOut: the requested project, actual data returned is determined by the view the user requested """ selected = ProjectOut.parse_fields(fields) - return await repo.get_project_by_id(id=id, fields=selected) + return await service.get_one({"id": id}, fields=selected) @router.put("/{id}", response_model=ProjectOut, dependencies=[Depends(require_user)]) -async def upsert_project_by_id( - repo: ProjectDep, +async def upsert_one( + service: ProjectServiceDep, id: str, project: ProjectIn, ): @@ -71,18 +71,18 @@ async def upsert_project_by_id( Note: Relies on the path param 'id' for finding, rather than the body's id. Args: - repo (ProjectDep): the project repo we depend on + service (ProjectServiceDep): the project service we depend on id (str): the id of the project to retrieve project (ProjectIn): the data of the project to upsert Returns: ProjectOut: the full document that either replaced an old one or was inserted """ - return await repo.upsert_project_by_id(id=id, data=project) + return await service.upsert_one({"id": id}, data=project) @router.patch("/{id}", response_model=ProjectOut, dependencies=[Depends(require_user)]) -async def patch_project_by_id( +async def patch_one( service: ProjectServiceDep, id: str, update: ProjectPatch, @@ -105,21 +105,21 @@ async def patch_project_by_id( Returns: ProjectOut: the full Project with updates applied """ - return await service.patch(id=id, update=update) + return await service.patch_one({"id": id}, update=update) @router.delete("/{id}", status_code=status.HTTP_204_NO_CONTENT, dependencies=[Depends(require_user)]) -async def delete_project_by_id( - repo: ProjectDep, +async def delete_one( + service: ProjectServiceDep, id: str, ): """Deletes a project matching id. Args: - repo (ProjectDep): the project repo we depend on + service (ProjectServiceDep): the project service we depend on id (str): the id of the project to be deleted Returns: Response: a response with the 204 response code (rather than FastAPIs default 200) """ - await repo.delete_project_by_id(id=id) + await service.delete_one({"id": id}) return Response(status_code=HTTP_204_NO_CONTENT) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/service.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/service.py index 2852aee49a..067bea3a3b 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/service.py @@ -1,8 +1,11 @@ +from typing import Any + from bson import DBRef from mpcontribs_api.config import get_settings +from mpcontribs_api.domains._shared.models import DeleteResponse from mpcontribs_api.domains.initiatives.repository import InitiativeRepository -from mpcontribs_api.domains.projects.models import Project, ProjectPatch +from mpcontribs_api.domains.projects.models import Project, ProjectIn, ProjectOut, ProjectPatch from mpcontribs_api.domains.projects.repository import MongoDbProjectRepository from mpcontribs_api.exceptions import ConflictError, NotFoundError, PermissionError @@ -19,7 +22,7 @@ def __init__( self._initiatives = initiatives self._limits = get_settings().domain.initiatives - async def patch(self, id: str, update: ProjectPatch) -> Project: + async def patch_one(self, identifiers: dict[str, Any], update: ProjectPatch) -> Project: """Apply a project patch, routing an ``initiative`` change through the assignment checks. ``initiative`` carries the target initiative's ``slug`` (or ``null`` to unassign). When @@ -28,8 +31,9 @@ async def patch(self, id: str, update: ProjectPatch) -> Project: together with any co-submitted plain fields in a single atomic update, so the request never persists a half-applied change. """ + id = identifiers["id"] if "initiative" not in update.model_fields_set: - return await self._projects.patch_project_by_id(id=id, update=update) + return await self._projects.patch_one(identifiers, update) data = update.model_dump(exclude_unset=True) slug = data.pop("initiative", None) @@ -39,6 +43,18 @@ async def patch(self, id: str, update: ProjectPatch) -> Project: return await self._projects.patch_project_with_initiative(id=id, update=ProjectPatch(**data), ref=ref) + async def get_one(self, identifiers: dict[str, Any], fields: frozenset[str] | None) -> Project | ProjectOut | None: + """Return the single scoped project matching ``identifiers`` (``{"id": ...}``).""" + return await self._projects.get_one(identifiers, fields) + + async def upsert_one(self, identifiers: dict[str, Any], data: ProjectIn) -> Project: + """Upsert the project addressed by ``identifiers`` (``{"id": ...}``). See repository.""" + return await self._projects.upsert_one(identifiers, data) + + async def delete_one(self, identifiers: dict[str, Any]) -> DeleteResponse: + """Delete the scoped project addressed by ``identifiers`` (``{"id": ...}``). See repository.""" + return await self._projects.delete_one(identifiers) + async def _resolve_initiative_assignment(self, project_id: str, slug: str | None) -> DBRef | None: """Validate an initiative assignment and return the link to store (or None to unassign). diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py index efa86a2e38..52ed017112 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py @@ -31,14 +31,15 @@ async def get_structures( return await service.get_many(filter=filter, fields=selected, pagination=pagination) -@router.get("/{pk}") -async def get_structure( +@router.get("/{id}") +async def get_one( service: StructureServiceDep, - pk: str, + id: str, fields: FieldSelector = StructureOut.default_fields(), ): + """Return a single structure addressed by its ``_id`` or its content ``md5``.""" selected = StructureOut.parse_fields(fields) - return await service.get_by_id(id=pk, fields=selected) + return await service.get_one(identifiers={"id": id}, fields=selected) @router.get("/download/{short_mime}") @@ -82,14 +83,16 @@ async def delete_structures(service: StructureServiceDep, filter: StructureFilte @router.delete("/{id}", response_model=ComponentDeleteResponse, dependencies=[Depends(require_user)]) -async def delete_structure_by_id(service: StructureServiceDep, id: str): - return await service.delete_by_id(id=id) +async def delete_one(service: StructureServiceDep, id: str): + """Delete a single structure addressed by its ``_id`` or its content ``md5``.""" + return await service.delete_one(identifiers={"id": id}) @router.patch("/{id}", dependencies=[Depends(require_user)]) -async def patch_structure_by_id( +async def patch_one( service: StructureServiceDep, id: str, update: StructurePatch, ): - return await service.patch_by_id(id=id, update=update) + """Patch a single structure addressed by its ``_id`` or its content ``md5``.""" + return await service.patch_one(identifiers={"id": id}, update=update) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py index 658a650575..e63ace859a 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py @@ -31,14 +31,15 @@ async def get_tables( return await service.get_many(filter=filter, fields=selected, pagination=pagination) -@router.get("/{pk}") -async def get_table( +@router.get("/{id}") +async def get_one( service: TableServiceDep, - pk: str, + id: str, fields: FieldSelector = TableOut.default_fields(), ): + """Return a single table addressed by its ``_id`` or its content ``md5``.""" selected = TableOut.parse_fields(fields) - return await service.get_by_id(id=pk, fields=selected) + return await service.get_one(identifiers={"id": id}, fields=selected) @router.get("/download/{short_mime}") @@ -82,14 +83,16 @@ async def delete_tables(service: TableServiceDep, filter: TableFilter = FilterDe @router.delete("/{id}", response_model=ComponentDeleteResponse, dependencies=[Depends(require_user)]) -async def delete_table_by_id(service: TableServiceDep, id: str): - return await service.delete_by_id(id=id) +async def delete_one(service: TableServiceDep, id: str): + """Delete a single table addressed by its ``_id``""" + return await service.delete_one(identifiers={"id": id}) @router.patch("/{id}", dependencies=[Depends(require_user)]) -async def patch_table_by_id( +async def patch_one( service: TableServiceDep, id: str, update: TablePatch, ): - return await service.patch_by_id(id=id, update=update) + """Patch a single table addressed by its ``_id``.""" + return await service.patch_one(identifiers={"id": id}, update=update) diff --git a/mpcontribs-api/tests/integration/db/test_component_reachability.py b/mpcontribs-api/tests/integration/db/test_component_reachability.py index 0f7faf0885..c4d9ee6549 100644 --- a/mpcontribs-api/tests/integration/db/test_component_reachability.py +++ b/mpcontribs-api/tests/integration/db/test_component_reachability.py @@ -54,7 +54,7 @@ class TestComponentReadReachability: async def test_get_by_id_returns_reachable_component(self, db): att = await _attachment(1) await _contribution("mp-pub", is_public=True, attachments=[att]) - result = await _service(ANON).get_by_id(str(att.id), fields=None) + result = await _service(ANON).get_one({"id": str(att.id)}, fields=None) assert result is not None assert result.id == att.id @@ -62,13 +62,13 @@ async def test_get_by_id_hides_unreachable_component(self, db): att = await _attachment(2) # Referenced only by a private contribution -> anonymous cannot reach it. await _contribution("mp-priv", is_public=False, attachments=[att]) - result = await _service(ANON).get_by_id(str(att.id), fields=None) + result = await _service(ANON).get_one({"id": str(att.id)}, fields=None) assert result is None async def test_get_by_id_hides_orphan_component(self, db): # No contribution references this attachment at all. att = await _attachment(3) - result = await _service(ANON).get_by_id(str(att.id), fields=None) + result = await _service(ANON).get_one({"id": str(att.id)}, fields=None) assert result is None async def test_get_many_only_lists_reachable(self, db): diff --git a/mpcontribs-api/tests/integration/db/test_components_repository.py b/mpcontribs-api/tests/integration/db/test_components_repository.py index 8a3845aaf5..d48b025a0c 100644 --- a/mpcontribs-api/tests/integration/db/test_components_repository.py +++ b/mpcontribs-api/tests/integration/db/test_components_repository.py @@ -100,7 +100,7 @@ async def test_single_insert_persists(self, db): # --------------------------------------------------------------------------- -# delete_components / delete_component_by_id +# delete_components / delete_one # --------------------------------------------------------------------------- @@ -113,9 +113,9 @@ async def test_filtered_delete_removes_only_matches(self, db): assert remaining == {keep.md5} async def test_delete_by_id_removes_one(self, db): - """delete_component_by_id matches a string id by converting it to ObjectId.""" + """The inherited base delete_one removes a single component by its primary key.""" [doc] = await _repo().insert_components([_attachment(1)]) - result = await _repo().delete_component_by_id(str(doc.id)) + result = await _repo().delete_one({"id": doc.id}) assert result.num_deleted == 1 assert await _count() == 0 @@ -123,32 +123,58 @@ async def test_delete_by_unknown_id_raises(self, db): from mpcontribs_api.exceptions import NotFoundError with pytest.raises(NotFoundError): - await _repo().delete_component_by_id(str(PydanticObjectId())) + await _repo().delete_one({"id": PydanticObjectId()}) + + async def test_delete_by_md5_removes_one(self, db): + """A component is addressable by its content md5 (its declared identifier) as well as by id.""" + [doc] = await _repo().insert_components([_attachment(1)]) + result = await _repo().delete_one({"md5": doc.md5}) + assert result.num_deleted == 1 + assert await _count() == 0 + + +# --------------------------------------------------------------------------- +# get_one / patch_one address a component by id or by its content md5 +# --------------------------------------------------------------------------- + + +class TestAddressComponentByMd5: + async def test_get_one_by_md5(self, db): + [doc] = await _repo().insert_components([_attachment(1)]) + by_md5 = await _repo().get_one({"md5": doc.md5}, fields=None) + by_id = await _repo().get_one({"id": doc.id}, fields=None) + assert by_md5 is not None + assert by_md5.id == by_id.id == doc.id + + async def test_patch_one_by_md5(self, db): + [doc] = await _repo().insert_components([_attachment(1, name="data.csv")]) + updated = await _repo().patch_one({"md5": doc.md5}, AttachmentPatch(name="renamed.png")) + assert updated.name == "renamed.png" # --------------------------------------------------------------------------- -# patch_component_by_id +# patch_one recomputes the derived md5 # --------------------------------------------------------------------------- class TestPatchComponent: async def test_patch_updates_field(self, db): [doc] = await _repo().insert_components([_attachment(1, name="data.csv")]) - updated = await _repo().patch_component_by_id(str(doc.id), AttachmentPatch(name="renamed.png")) + updated = await _repo().patch_one({"id": doc.id}, AttachmentPatch(name="renamed.png")) assert updated.name == "renamed.png" async def test_empty_patch_returns_existing(self, db): [doc] = await _repo().insert_components([_attachment(1, name="data.csv")]) - updated = await _repo().patch_component_by_id(str(doc.id), AttachmentPatch()) + updated = await _repo().patch_one({"id": doc.id}, AttachmentPatch()) assert updated.id == doc.id async def test_patch_content_recomputes_md5(self, db): # name is not a hash field, so renaming must NOT change md5. [doc] = await _repo().insert_components([_attachment(1)]) - renamed = await _repo().patch_component_by_id(str(doc.id), AttachmentPatch(name="renamed.png")) + renamed = await _repo().patch_one({"id": doc.id}, AttachmentPatch(name="renamed.png")) assert renamed.md5 == doc.md5 # content IS a hash field, so changing it must recompute md5. - rehashed = await _repo().patch_component_by_id(str(doc.id), AttachmentPatch(content=999)) + rehashed = await _repo().patch_one({"id": doc.id}, AttachmentPatch(content=999)) assert rehashed.md5 != doc.md5 persisted = await Attachment.find_one(Attachment.id == doc.id) assert persisted.md5 == rehashed.md5 @@ -215,7 +241,7 @@ async def test_table_frame_round_trips_via_storage_shape(self, db): assert raw["total_data_rows"] == 2 # Read back: reassembled into the same DataFrame (index folded back as the first column). - out = await repo.get_component_by_id(str(doc.id), TableOut.parse_fields(["data"])) + out = await repo.get_one({"id": doc.id}, TableOut.parse_fields(["data"])) assert out.data.columns == ["T [K]", "1e16", "1e17"] assert out.data.equals(frame) # The raw storage keys must not leak onto the response model. diff --git a/mpcontribs-api/tests/integration/db/test_contributions_repository.py b/mpcontribs-api/tests/integration/db/test_contributions_repository.py index 4d3cd97c89..bfc60f4977 100644 --- a/mpcontribs-api/tests/integration/db/test_contributions_repository.py +++ b/mpcontribs-api/tests/integration/db/test_contributions_repository.py @@ -264,84 +264,96 @@ async def test_filter_by_needs_build(self, db): # --------------------------------------------------------------------------- -# get_contribution_by_id +# get_one (by id) # --------------------------------------------------------------------------- class TestGetContributionById: async def test_returns_doc_for_valid_id(self, db): doc = await _insert(identifier="get-id") - result = await _repo(ADMIN).get_contribution_by_id(str(doc.id), fields=None) + result = await _repo(ADMIN).get_one({"id": doc.id}, fields=None) assert result is not None assert result.identifier == "get-id" async def test_returns_none_for_missing_id(self, db): - result = await _repo(ADMIN).get_contribution_by_id(str(PydanticObjectId()), fields=None) + result = await _repo(ADMIN).get_one({"id": PydanticObjectId()}, fields=None) assert result is None async def test_admin_can_get_private_doc(self, db): doc = await _insert(identifier="get-priv", is_public=False) - result = await _repo(ADMIN).get_contribution_by_id(str(doc.id), fields=None) + result = await _repo(ADMIN).get_one({"id": doc.id}, fields=None) assert result is not None async def test_anon_cannot_get_private_doc(self, db): doc = await _insert(identifier="get-anon-priv", is_public=False) - result = await _repo(ANON).get_contribution_by_id(str(doc.id), fields=None) + result = await _repo(ANON).get_one({"id": doc.id}, fields=None) assert result is None async def test_anon_can_get_public_doc(self, db): doc = await _insert(identifier="get-anon-pub", is_public=True) - result = await _repo(ANON).get_contribution_by_id(str(doc.id), fields=None) + result = await _repo(ANON).get_one({"id": doc.id}, fields=None) assert result is not None - async def test_raises_validation_error_for_bad_id_format(self, db): - with pytest.raises(ValidationError): - await _repo(ADMIN).get_contribution_by_id("not-an-objectid", fields=None) - async def test_projection_limits_fields(self, db): doc = await _insert(identifier="get-proj", is_public=True) fields = ContributionOut.parse_fields(["formula"]) - result = await _repo(ADMIN).get_contribution_by_id(str(doc.id), fields=fields) + result = await _repo(ADMIN).get_one({"id": doc.id}, fields=fields) assert result is not None assert result.formula == "Fe2O3" assert not hasattr(result, "data") # --------------------------------------------------------------------------- -# find_one_contribution (by project + identifier) +# get_one (by the semantic {project, identifier, version} triple) # --------------------------------------------------------------------------- -class TestFindOneContribution: +class TestGetContributionBySemanticIdentifiers: async def test_finds_existing_doc(self, db): await _insert(project="find-proj", identifier="find-id") - result = await _repo(ADMIN).find_one_contribution("find-proj", "find-id") + result = await _repo(ADMIN).get_one( + {"project": "find-proj", "identifier": "find-id", "version": 1}, fields=None + ) assert result is not None assert result.project == "find-proj" assert result.identifier == "find-id" async def test_returns_none_for_missing_combination(self, db): await _insert(project="miss-proj", identifier="miss-id") - result = await _repo(ADMIN).find_one_contribution("miss-proj", "wrong-id") + result = await _repo(ADMIN).get_one( + {"project": "miss-proj", "identifier": "wrong-id", "version": 1}, fields=None + ) assert result is None async def test_scope_prevents_anon_finding_private(self, db): await _insert(project="anon-scope", identifier="priv-doc", is_public=False) - result = await _repo(ANON).find_one_contribution("anon-scope", "priv-doc") + result = await _repo(ANON).get_one( + {"project": "anon-scope", "identifier": "priv-doc", "version": 1}, fields=None + ) assert result is None async def test_scope_allows_anon_finding_public(self, db): await _insert(project="anon-scope-pub", identifier="pub-doc", is_public=True) - result = await _repo(ANON).find_one_contribution("anon-scope-pub", "pub-doc") + result = await _repo(ANON).get_one( + {"project": "anon-scope-pub", "identifier": "pub-doc", "version": 1}, fields=None + ) assert result is not None - async def test_project_identifier_combination_is_unique_lookup(self, db): + async def test_project_identifier_version_is_unique_lookup(self, db): await _insert(project="same-proj", identifier="id-a") await _insert(project="same-proj", identifier="id-b") - result = await _repo(ADMIN).find_one_contribution("same-proj", "id-a") + result = await _repo(ADMIN).get_one( + {"project": "same-proj", "identifier": "id-a", "version": 1}, fields=None + ) assert result is not None assert result.identifier == "id-a" + async def test_partial_identifier_set_is_rejected(self, db): + # The semantic set must be complete: version is part of the contribution's identity. + await _insert(project="partial-proj", identifier="partial-id") + with pytest.raises(ValidationError): + await _repo(ADMIN).get_one({"project": "partial-proj", "identifier": "partial-id"}, fields=None) + # --------------------------------------------------------------------------- # update_contribution @@ -379,65 +391,72 @@ def _naive(dt): # --------------------------------------------------------------------------- -# patch_contribution_by_id +# patch_one (by id) # --------------------------------------------------------------------------- class TestPatchContributionById: async def test_updates_formula(self, db): doc = await _insert(identifier="patch-formula") - await _repo(ADMIN).patch_contribution_by_id(str(doc.id), ContributionPatch(formula="Li2O")) + await _repo(ADMIN).patch_one({"id": doc.id}, ContributionPatch(formula="Li2O")) found = await Contribution.find_one(Contribution.id == doc.id) assert found.formula == "Li2O" async def test_unset_fields_not_overwritten(self, db): doc = await _insert(identifier="patch-preserve", formula="Fe2O3") - await _repo(ADMIN).patch_contribution_by_id(str(doc.id), ContributionPatch(needs_build=False)) + await _repo(ADMIN).patch_one({"id": doc.id}, ContributionPatch(needs_build=False)) found = await Contribution.find_one(Contribution.id == doc.id) assert found.formula == "Fe2O3" async def test_empty_patch_is_a_noop(self, db): doc = await _insert(identifier="patch-empty", formula="Fe2O3") - result = await _repo(ADMIN).patch_contribution_by_id(str(doc.id), ContributionPatch()) + result = await _repo(ADMIN).patch_one({"id": doc.id}, ContributionPatch()) assert result is not None found = await Contribution.find_one(Contribution.id == doc.id) assert found.formula == "Fe2O3" - async def test_raises_validation_error_for_bad_id(self, db): - with pytest.raises(ValidationError): - await _repo(ADMIN).patch_contribution_by_id("bad-id", ContributionPatch(formula="X")) + async def test_patch_by_semantic_identifiers(self, db): + # The same patch reachable through the full {project, identifier, version} identity. + await _insert(project="patch-sem", identifier="sem-id", formula="Fe2O3") + await _repo(ADMIN).patch_one( + {"project": "patch-sem", "identifier": "sem-id", "version": 1}, ContributionPatch(formula="Li2O") + ) + found = await Contribution.find_one(Contribution.project == "patch-sem") + assert found.formula == "Li2O" async def test_anon_cannot_patch_private_doc(self, db): from mpcontribs_api.exceptions import NotFoundError doc = await _insert(identifier="patch-anon-priv", is_public=False) with pytest.raises(NotFoundError): - await _repo(ANON).patch_contribution_by_id(str(doc.id), ContributionPatch(formula="X")) + await _repo(ANON).patch_one({"id": doc.id}, ContributionPatch(formula="X")) # --------------------------------------------------------------------------- -# delete_contribution_by_id +# delete_one (by id) # --------------------------------------------------------------------------- class TestDeleteContributionById: async def test_deleted_doc_not_found_afterwards(self, db): doc = await _insert(identifier="del-me") - await _repo(ADMIN).delete_contribution_by_id(str(doc.id)) + await _repo(ADMIN).delete_one({"id": doc.id}) found = await Contribution.find_one(Contribution.id == doc.id) assert found is None async def test_delete_nonexistent_throws_error(self, db): with pytest.raises(NotFoundError, match="not found"): - await _repo(ADMIN).delete_contribution_by_id(str(PydanticObjectId())) + await _repo(ADMIN).delete_one({"id": PydanticObjectId()}) - async def test_raises_validation_error_for_bad_id(self, db): - with pytest.raises(ValidationError): - await _repo(ADMIN).delete_contribution_by_id("not-an-id") + async def test_delete_by_semantic_identifiers(self, db): + await _insert(project="del-sem", identifier="sem-id") + await _repo(ADMIN).delete_one({"project": "del-sem", "identifier": "sem-id", "version": 1}) + found = await Contribution.find_one(Contribution.project == "del-sem") + assert found is None async def test_anon_cannot_delete_private_doc(self, db): doc = await _insert(identifier="del-anon-priv", is_public=False) with pytest.raises(NotFoundError, match="not found"): - await _repo(ANON).delete_contribution_by_id(str(doc.id)) + await _repo(ANON).delete_one({"id": doc.id}) # Scope prevents anonymous from seeing the doc, so it is never deleted. still_there = await Contribution.find_one(Contribution.id == doc.id) assert still_there is not None @@ -482,7 +501,7 @@ class TestUpsertContributionById: async def test_insert_when_id_absent_persists_document(self, db): new_id = PydanticObjectId() payload = _contrib_in(identifier="ups-new", _id=new_id) - result = await _repo(ADMIN).upsert_contribution_by_id(str(new_id), payload) + result = await _repo(ADMIN).upsert_one({"id": new_id}, payload) # Must be the resolved document, not an un-awaited query object. assert isinstance(result, Contribution) stored = await Contribution.find_one(Contribution.id == new_id) @@ -492,7 +511,19 @@ async def test_insert_when_id_absent_persists_document(self, db): async def test_update_when_id_present_applies_change(self, db): existing = await _insert(identifier="ups-existing") payload = _contrib_in(identifier="ups-existing", formula="Li2O", _id=existing.id) - result = await _repo(ADMIN).upsert_contribution_by_id(str(existing.id), payload) + result = await _repo(ADMIN).upsert_one({"id": existing.id}, payload) + assert isinstance(result, Contribution) + stored = await Contribution.find_one(Contribution.id == existing.id) + assert stored is not None + assert stored.formula == "Li2O" + + async def test_upsert_by_semantic_identifiers_with_version(self, db): + # The bulk-upsert path keys on {project, identifier} + resolved version. + existing = await _insert(project="ups-sem", identifier="sem-id", formula="Fe2O3") + payload = _contrib_in(project="ups-sem", identifier="sem-id", formula="Li2O") + result = await _repo(ADMIN).upsert_one( + {"project": "ups-sem", "identifier": "sem-id"}, payload, version=1 + ) assert isinstance(result, Contribution) stored = await Contribution.find_one(Contribution.id == existing.id) assert stored is not None diff --git a/mpcontribs-api/tests/integration/db/test_initiatives_repository.py b/mpcontribs-api/tests/integration/db/test_initiatives_repository.py index c4aec88ccd..5881002c02 100644 --- a/mpcontribs-api/tests/integration/db/test_initiatives_repository.py +++ b/mpcontribs-api/tests/integration/db/test_initiatives_repository.py @@ -43,7 +43,7 @@ async def _insert(slug: str, owner_user: User = ALICE, name: str = "An Initiativ async def _approve(slug: str) -> Initiative: - return await _repo(ADMIN).patch_initiative(slug, InitiativePatch(is_approved=True)) + return await _repo(ADMIN).patch_one({"slug": slug}, InitiativePatch(is_approved=True)) # --------------------------------------------------------------------------- @@ -103,26 +103,24 @@ class TestApprovalAndPublic: async def test_only_admin_may_approve(self, db): await _insert("approve-me", ALICE) with pytest.raises(PermissionError): - await _repo(ALICE).patch_initiative("approve-me", InitiativePatch(is_approved=True)) + await _repo(ALICE).patch_one({"slug": "approve-me"}, InitiativePatch(is_approved=True)) approved = await _approve("approve-me") assert approved.is_approved is True async def test_cannot_make_public_while_unapproved(self, db): await _insert("public-fail", ALICE) with pytest.raises(ValidationError): - await _repo(ALICE).patch_initiative("public-fail", InitiativePatch(is_public=True)) + await _repo(ALICE).patch_one({"slug": "public-fail"}, InitiativePatch(is_public=True)) async def test_public_allowed_once_approved(self, db): await _insert("public-ok", ALICE) await _approve("public-ok") - patched = await _repo(ALICE).patch_initiative("public-ok", InitiativePatch(is_public=True)) + patched = await _repo(ALICE).patch_one({"slug": "public-ok"}, InitiativePatch(is_public=True)) assert patched.is_public is True async def test_admin_can_approve_and_publish_together(self, db): await _insert("publish-both", ALICE) - patched = await _repo(ADMIN).patch_initiative( - "publish-both", InitiativePatch(is_approved=True, is_public=True) - ) + patched = await _repo(ADMIN).patch_one({"slug": "publish-both"}, InitiativePatch(is_approved=True, is_public=True)) assert patched.is_approved is True and patched.is_public is True @@ -134,38 +132,36 @@ async def test_admin_can_approve_and_publish_together(self, db): class TestManageAndScope: async def test_owner_can_rename(self, db): await _insert("rename-me", ALICE) - patched = await _repo(ALICE).patch_initiative("rename-me", InitiativePatch(name="Renamed")) + patched = await _repo(ALICE).patch_one({"slug": "rename-me"}, InitiativePatch(name="Renamed")) assert patched.name == "Renamed" async def test_collaborator_can_patch(self, db): await _insert("collab-patch", ALICE) - patched = await _repo(_collaborator("collab-patch")).patch_initiative( - "collab-patch", InitiativePatch(name="By Collaborator") - ) + patched = await _repo(_collaborator("collab-patch")).patch_one({"slug": "collab-patch"}, InitiativePatch(name="By Collaborator")) assert patched.name == "By Collaborator" async def test_visible_but_unmanaged_cannot_patch(self, db): # An approved+public initiative is visible to everyone, but a stranger still cannot manage it. await _insert("visible-public", ALICE) await _approve("visible-public") - await _repo(ALICE).patch_initiative("visible-public", InitiativePatch(is_public=True)) + await _repo(ALICE).patch_one({"slug": "visible-public"}, InitiativePatch(is_public=True)) stranger = User(username="google:carol@example.com", groups=frozenset()) with pytest.raises(PermissionError): - await _repo(stranger).patch_initiative("visible-public", InitiativePatch(name="hijack")) + await _repo(stranger).patch_one({"slug": "visible-public"}, InitiativePatch(name="hijack")) async def test_private_unapproved_scope(self, db): await _insert("scoped-priv", ALICE) - assert await _repo(ALICE).get_initiative("scoped-priv", fields=None) is not None # owner - assert await _repo(ADMIN).get_initiative("scoped-priv", fields=None) is not None # admin - assert await _repo(_collaborator("scoped-priv")).get_initiative("scoped-priv", fields=None) is not None - assert await _repo(ANON).get_initiative("scoped-priv", fields=None) is None # anon - assert await _repo(BOB).get_initiative("scoped-priv", fields=None) is None # unrelated user + assert await _repo(ALICE).get_one({"slug": "scoped-priv"}, fields=None) is not None # owner + assert await _repo(ADMIN).get_one({"slug": "scoped-priv"}, fields=None) is not None # admin + assert await _repo(_collaborator("scoped-priv")).get_one({"slug": "scoped-priv"}, fields=None) is not None + assert await _repo(ANON).get_one({"slug": "scoped-priv"}, fields=None) is None # anon + assert await _repo(BOB).get_one({"slug": "scoped-priv"}, fields=None) is None # unrelated user async def test_public_approved_visible_to_anon(self, db): await _insert("scoped-pub", ALICE) await _approve("scoped-pub") - await _repo(ALICE).patch_initiative("scoped-pub", InitiativePatch(is_public=True)) - assert await _repo(ANON).get_initiative("scoped-pub", fields=None) is not None + await _repo(ALICE).patch_one({"slug": "scoped-pub"}, InitiativePatch(is_public=True)) + assert await _repo(ANON).get_one({"slug": "scoped-pub"}, fields=None) is not None # --------------------------------------------------------------------------- @@ -176,18 +172,18 @@ async def test_public_approved_visible_to_anon(self, db): class TestDelete: async def test_owner_can_delete(self, db): await _insert("del-owner", ALICE) - result = await _repo(ALICE).delete_initiative("del-owner") + result = await _repo(ALICE).delete_one({"slug": "del-owner"}) assert result.num_deleted == 1 - assert await _repo(ADMIN).get_initiative("del-owner", fields=None) is None + assert await _repo(ADMIN).get_one({"slug": "del-owner"}, fields=None) is None async def test_collaborator_cannot_delete(self, db): await _insert("del-collab", ALICE) with pytest.raises(PermissionError): - await _repo(_collaborator("del-collab")).delete_initiative("del-collab") + await _repo(_collaborator("del-collab")).delete_one({"slug": "del-collab"}) async def test_missing_is_not_found(self, db): with pytest.raises(NotFoundError): - await _repo(ADMIN).delete_initiative("nope-missing") + await _repo(ADMIN).delete_one({"slug": "nope-missing"}) # --------------------------------------------------------------------------- @@ -228,10 +224,10 @@ async def test_filter_by_owner(self, db): class TestAdminBypass: async def test_admin_can_patch_non_owned(self, db): await _insert("admin-patch", ALICE) - patched = await _repo(ADMIN).patch_initiative("admin-patch", InitiativePatch(name="Admin Renamed")) + patched = await _repo(ADMIN).patch_one({"slug": "admin-patch"}, InitiativePatch(name="Admin Renamed")) assert patched.name == "Admin Renamed" async def test_admin_can_delete_non_owned(self, db): await _insert("admin-del", ALICE) - result = await _repo(ADMIN).delete_initiative("admin-del") + result = await _repo(ADMIN).delete_one({"slug": "admin-del"}) assert result.num_deleted == 1 diff --git a/mpcontribs-api/tests/integration/db/test_initiatives_service.py b/mpcontribs-api/tests/integration/db/test_initiatives_service.py index 061f8acad0..4e16fd0dbd 100644 --- a/mpcontribs-api/tests/integration/db/test_initiatives_service.py +++ b/mpcontribs-api/tests/integration/db/test_initiatives_service.py @@ -71,30 +71,30 @@ class TestAssign: async def test_owner_of_both_can_assign(self, db): await _insert_project("proj-a", owner=ALICE_EMAIL) init = await _insert_initiative("init-a", ALICE) - updated = await _service(ALICE).patch("proj-a", ProjectPatch(initiative="init-a")) + updated = await _service(ALICE).patch_one({"id": "proj-a"}, ProjectPatch(initiative="init-a")) assert _assigned_id(updated) == init.id async def test_collaborator_can_assign_own_project(self, db): await _insert_project("proj-b", owner=BOB_EMAIL) init = await _insert_initiative("init-collab", ALICE) bob = _collaborator("init-collab") - updated = await _service(bob).patch("proj-b", ProjectPatch(initiative="init-collab")) + updated = await _service(bob).patch_one({"id": "proj-b"}, ProjectPatch(initiative="init-collab")) assert _assigned_id(updated) == init.id async def test_plain_patch_passes_through_untouched(self, db): await _insert_project("proj-plain", owner=ALICE_EMAIL) init = await _insert_initiative("init-plain", ALICE) - await _service(ALICE).patch("proj-plain", ProjectPatch(initiative="init-plain")) + await _service(ALICE).patch_one({"id": "proj-plain"}, ProjectPatch(initiative="init-plain")) # A patch that does not mention `initiative` must not disturb the existing assignment. - updated = await _service(ALICE).patch("proj-plain", ProjectPatch(title="new-title")) + updated = await _service(ALICE).patch_one({"id": "proj-plain"}, ProjectPatch(title="new-title")) assert updated.title == "new-title" assert _assigned_id(updated) == init.id async def test_unassign_clears_link(self, db): await _insert_project("proj-un", owner=ALICE_EMAIL) await _insert_initiative("init-un", ALICE) - await _service(ALICE).patch("proj-un", ProjectPatch(initiative="init-un")) - updated = await _service(ALICE).patch("proj-un", ProjectPatch(initiative=None)) + await _service(ALICE).patch_one({"id": "proj-un"}, ProjectPatch(initiative="init-un")) + updated = await _service(ALICE).patch_one({"id": "proj-un"}, ProjectPatch(initiative=None)) assert _assigned_id(updated) is None @@ -109,30 +109,30 @@ async def test_visible_but_unmanaged_initiative_rejected(self, db): # but she neither owns nor collaborates on it, so she still cannot assign to it. await _insert_project("proj-c", owner=CAROL_EMAIL) await _insert_initiative("init-c", ALICE) - await InitiativeRepository(ADMIN).patch_initiative( - "init-c", InitiativePatch(is_approved=True, is_public=True) + await InitiativeRepository(ADMIN).patch_one( + {"slug": "init-c"}, InitiativePatch(is_approved=True, is_public=True) ) with pytest.raises(PermissionError): - await _service(CAROL).patch("proj-c", ProjectPatch(initiative="init-c")) + await _service(CAROL).patch_one({"id": "proj-c"}, ProjectPatch(initiative="init-c")) async def test_invisible_initiative_is_not_found(self, db): # Alice's private initiative is invisible to Carol, so it reads as not-found (not a 403). await _insert_project("proj-c2", owner=CAROL_EMAIL) await _insert_initiative("init-priv", ALICE) with pytest.raises(NotFoundError): - await _service(CAROL).patch("proj-c2", ProjectPatch(initiative="init-priv")) + await _service(CAROL).patch_one({"id": "proj-c2"}, ProjectPatch(initiative="init-priv")) async def test_manager_without_project_write_rejected(self, db): # Alice manages the initiative but cannot see/write Bob's private project. await _insert_project("proj-bob", owner=BOB_EMAIL) await _insert_initiative("init-d", ALICE) with pytest.raises(NotFoundError): - await _service(ALICE).patch("proj-bob", ProjectPatch(initiative="init-d")) + await _service(ALICE).patch_one({"id": "proj-bob"}, ProjectPatch(initiative="init-d")) async def test_assign_to_missing_initiative_is_not_found(self, db): await _insert_project("proj-ghost", owner=ALICE_EMAIL) with pytest.raises(NotFoundError): - await _service(ALICE).patch("proj-ghost", ProjectPatch(initiative="ghost-init")) + await _service(ALICE).patch_one({"id": "proj-ghost"}, ProjectPatch(initiative="ghost-init")) # --------------------------------------------------------------------------- @@ -146,28 +146,28 @@ async def test_unapproved_capped_at_configured_members(self, db): await _insert_initiative("init-cap", ALICE) for i in range(cap): await _insert_project(f"cap-proj-{i}", owner=ALICE_EMAIL) - await _service(ALICE).patch(f"cap-proj-{i}", ProjectPatch(initiative="init-cap")) + await _service(ALICE).patch_one({"id": f"cap-proj-{i}"}, ProjectPatch(initiative="init-cap")) await _insert_project("cap-proj-over", owner=ALICE_EMAIL) with pytest.raises(ConflictError): - await _service(ALICE).patch("cap-proj-over", ProjectPatch(initiative="init-cap")) + await _service(ALICE).patch_one({"id": "cap-proj-over"}, ProjectPatch(initiative="init-cap")) async def test_reassigning_existing_member_is_idempotent(self, db): cap = get_settings().domain.initiatives.max_projects_per_unapproved await _insert_initiative("init-idem", ALICE) for i in range(cap): await _insert_project(f"idem-proj-{i}", owner=ALICE_EMAIL) - await _service(ALICE).patch(f"idem-proj-{i}", ProjectPatch(initiative="init-idem")) + await _service(ALICE).patch_one({"id": f"idem-proj-{i}"}, ProjectPatch(initiative="init-idem")) # At the cap, re-assigning a project that is already a member must not trip the limit. - again = await _service(ALICE).patch("idem-proj-0", ProjectPatch(initiative="init-idem")) + again = await _service(ALICE).patch_one({"id": "idem-proj-0"}, ProjectPatch(initiative="init-idem")) assert again.initiative is not None async def test_approved_initiative_has_no_member_cap(self, db): cap = get_settings().domain.initiatives.max_projects_per_unapproved await _insert_initiative("init-approved", ALICE) - await InitiativeRepository(ADMIN).patch_initiative("init-approved", InitiativePatch(is_approved=True)) + await InitiativeRepository(ADMIN).patch_one({"slug": "init-approved"}, InitiativePatch(is_approved=True)) for i in range(cap + 2): # comfortably past the unapproved cap await _insert_project(f"appr-proj-{i}", owner=ALICE_EMAIL) - await _service(ALICE).patch(f"appr-proj-{i}", ProjectPatch(initiative="init-approved")) + await _service(ALICE).patch_one({"id": f"appr-proj-{i}"}, ProjectPatch(initiative="init-approved")) count = await MongoDbProjectRepository(ADMIN).count_initiative_members( initiative_id=(await InitiativeRepository(ADMIN).resolve_visible("init-approved")).id, # type: ignore[union-attr] exclude_project_id=None, @@ -185,7 +185,7 @@ async def test_admin_can_assign_to_any_initiative(self, db): # Alice's private initiative is manageable by an admin even though the admin holds no role. await _insert_project("adm-proj", owner=ALICE_EMAIL) init = await _insert_initiative("adm-init", ALICE) - updated = await _service(ADMIN).patch("adm-proj", ProjectPatch(initiative="adm-init")) + updated = await _service(ADMIN).patch_one({"id": "adm-proj"}, ProjectPatch(initiative="adm-init")) assert _assigned_id(updated) == init.id async def test_project_owner_can_unassign_without_initiative_rights(self, db): @@ -193,9 +193,9 @@ async def test_project_owner_can_unassign_without_initiative_rights(self, db): # his own project — unassignment needs only project-write access. await _insert_project("detach-proj", owner=BOB_EMAIL) await _insert_initiative("detach-init", ALICE) - await _service(_collaborator("detach-init", username=BOB_EMAIL)).patch( - "detach-proj", ProjectPatch(initiative="detach-init") + await _service(_collaborator("detach-init", username=BOB_EMAIL)).patch_one( + {"id": "detach-proj"}, ProjectPatch(initiative="detach-init") ) bob_plain = User(username=BOB_EMAIL, groups=frozenset()) - updated = await _service(bob_plain).patch("detach-proj", ProjectPatch(initiative=None)) + updated = await _service(bob_plain).patch_one({"id": "detach-proj"}, ProjectPatch(initiative=None)) assert _assigned_id(updated) is None diff --git a/mpcontribs-api/tests/integration/db/test_project_groups_repository.py b/mpcontribs-api/tests/integration/db/test_project_groups_repository.py index 3cb20f5b56..739cdaa529 100644 --- a/mpcontribs-api/tests/integration/db/test_project_groups_repository.py +++ b/mpcontribs-api/tests/integration/db/test_project_groups_repository.py @@ -56,19 +56,19 @@ async def _insert(name: str, owner: str = ALICE_EMAIL, **overrides) -> ProjectGr class TestGetOne: async def test_returns_group_by_identifiers(self, db): await _insert("group-a") - found = await _repo(ADMIN).get_project_group(name="group-a", owner=ALICE_EMAIL, fields=None) + found = await _repo(ADMIN).get_one({"name": "group-a", "owner": ALICE_EMAIL}, fields=None) assert found is not None assert found.name == "group-a" assert found.owner == ALICE_EMAIL async def test_returns_none_when_absent(self, db): - found = await _repo(ADMIN).get_project_group(name="missing", owner=ALICE_EMAIL, fields=None) + found = await _repo(ADMIN).get_one({"name": "missing", "owner": ALICE_EMAIL}, fields=None) assert found is None async def test_out_of_scope_returns_none(self, db): # Alice's private group is invisible to an anonymous caller. await _insert("group-priv") - found = await _repo(ANON).get_project_group(name="group-priv", owner=ALICE_EMAIL, fields=None) + found = await _repo(ANON).get_one({"name": "group-priv", "owner": ALICE_EMAIL}, fields=None) assert found is None @@ -85,20 +85,20 @@ def _role_user(group_id, username: str = "google:carol@example.com") -> User: class TestGroupRoleScope: async def test_role_grants_visibility(self, db): group = await _insert("role-vis") # Alice's private group - found = await _repo(_role_user(group.id)).get_project_group(name="role-vis", owner=ALICE_EMAIL, fields=None) + found = await _repo(_role_user(group.id)).get_one({"name": "role-vis", "owner": ALICE_EMAIL}, fields=None) assert found is not None assert found.id == group.id async def test_without_role_not_visible(self, db): await _insert("role-none") - found = await _repo(BOB).get_project_group(name="role-none", owner=ALICE_EMAIL, fields=None) + found = await _repo(BOB).get_one({"name": "role-none", "owner": ALICE_EMAIL}, fields=None) assert found is None async def test_malformed_role_is_ignored(self, db): await _insert("role-bad") member = User(username="google:carol@example.com", groups=frozenset({"project-group:not-an-oid"})) # A malformed role id must not raise; it simply grants nothing. - found = await _repo(member).get_project_group(name="role-bad", owner=ALICE_EMAIL, fields=None) + found = await _repo(member).get_one({"name": "role-bad", "owner": ALICE_EMAIL}, fields=None) assert found is None async def test_role_appears_in_listing(self, db): @@ -112,7 +112,7 @@ async def test_role_grants_scope_but_not_delete(self, db): # Scope makes the group visible, but deletion remains owner-or-admin (403 for a role holder). group = await _insert("role-del") with pytest.raises(PermissionError): - await _repo(_role_user(group.id)).delete_project_group(name="role-del", owner=ALICE_EMAIL) + await _repo(_role_user(group.id)).delete_one({"name": "role-del", "owner": ALICE_EMAIL}) assert await ProjectGroup.find_one(ProjectGroup.name == "role-del") is not None @@ -124,32 +124,32 @@ async def test_role_grants_scope_but_not_delete(self, db): class TestDeleteOne: async def test_deletes_matching_group(self, db): await _insert("del-a") - result = await _repo(ADMIN).delete_project_group(name="del-a", owner=ALICE_EMAIL) + result = await _repo(ADMIN).delete_one({"name": "del-a", "owner": ALICE_EMAIL}) assert result.num_deleted == 1 assert await ProjectGroup.find_one(ProjectGroup.name == "del-a") is None async def test_absent_raises_not_found(self, db): with pytest.raises(NotFoundError): - await _repo(ADMIN).delete_project_group(name="nope", owner=ALICE_EMAIL) + await _repo(ADMIN).delete_one({"name": "nope", "owner": ALICE_EMAIL}) async def test_out_of_scope_raises_not_found(self, db): # Alice's group is out of scope for anon, so it "does not exist" for them. await _insert("del-scoped") with pytest.raises(NotFoundError): - await _repo(ANON).delete_project_group(name="del-scoped", owner=ALICE_EMAIL) + await _repo(ANON).delete_one({"name": "del-scoped", "owner": ALICE_EMAIL}) # ...and it is untouched. assert await ProjectGroup.find_one(ProjectGroup.name == "del-scoped") is not None async def test_owner_can_delete_own(self, db): await _insert("del-own", owner=ALICE_EMAIL) - result = await _repo(ALICE).delete_project_group(name="del-own", owner=ALICE_EMAIL) + result = await _repo(ALICE).delete_one({"name": "del-own", "owner": ALICE_EMAIL}) assert result.num_deleted == 1 async def test_visible_public_non_owner_forbidden(self, db): # Bob can *see* Alice's public group but does not own it → 403, and it is left intact. await _insert("del-pub", owner=ALICE_EMAIL, is_public=True) with pytest.raises(PermissionError): - await _repo(BOB).delete_project_group(name="del-pub", owner=ALICE_EMAIL) + await _repo(BOB).delete_one({"name": "del-pub", "owner": ALICE_EMAIL}) assert await ProjectGroup.find_one(ProjectGroup.name == "del-pub") is not None async def test_wrong_identifier_keys_raise_validation(self, db): @@ -165,16 +165,12 @@ async def test_wrong_identifier_keys_raise_validation(self, db): class TestPatchOne: async def test_updates_field(self, db): await _insert("patch-a", description="before") - updated = await _repo(ADMIN).patch_project_group( - name="patch-a", owner=ALICE_EMAIL, update=ProjectGroupPatch(description="after") - ) + updated = await _repo(ADMIN).patch_one({"name": "patch-a", "owner": ALICE_EMAIL}, ProjectGroupPatch(description="after")) assert updated.description == "after" async def test_absent_raises_not_found(self, db): with pytest.raises(NotFoundError): - await _repo(ADMIN).patch_project_group( - name="ghost", owner=ALICE_EMAIL, update=ProjectGroupPatch(description="x") - ) + await _repo(ADMIN).patch_one({"name": "ghost", "owner": ALICE_EMAIL}, ProjectGroupPatch(description="x")) # --------------------------------------------------------------------------- diff --git a/mpcontribs-api/tests/integration/db/test_project_groups_service.py b/mpcontribs-api/tests/integration/db/test_project_groups_service.py index 5bbadf2fd2..332141eff9 100644 --- a/mpcontribs-api/tests/integration/db/test_project_groups_service.py +++ b/mpcontribs-api/tests/integration/db/test_project_groups_service.py @@ -63,7 +63,7 @@ async def test_add_by_id_links_projects(self, db): group = await _insert_group("add-id") await _insert_project("mp-1") await _insert_project("mp-2") - summary = await _service().add_projects_by_id(str(group.id), ["mp-1", "mp-2"]) + summary = await _service().add_projects({"id": str(group.id)}, ["mp-1", "mp-2"]) assert summary.succeeded == ["mp-1", "mp-2"] assert summary.failed == [] assert await _members(group.id) == ["mp-1", "mp-2"] @@ -71,20 +71,20 @@ async def test_add_by_id_links_projects(self, db): async def test_add_by_identifiers_links_projects(self, db): group = await _insert_group("add-ident") await _insert_project("mp-x") - summary = await _service().add_projects_by_identifiers("add-ident", ALICE_EMAIL, ["mp-x"]) + summary = await _service().add_projects({"name": "add-ident", "owner": ALICE_EMAIL}, ["mp-x"]) assert summary.succeeded == ["mp-x"] assert await _members(group.id) == ["mp-x"] async def test_add_is_idempotent(self, db): group = await _insert_group("add-idem") await _insert_project("mp-1") - await _service().add_projects_by_id(str(group.id), ["mp-1"]) - await _service().add_projects_by_id(str(group.id), ["mp-1"]) + await _service().add_projects({"id": str(group.id)}, ["mp-1"]) + await _service().add_projects({"id": str(group.id)}, ["mp-1"]) assert await _members(group.id) == ["mp-1"] async def test_missing_project_fails_and_leaves_group_unchanged(self, db): group = await _insert_group("add-missing") - summary = await _service().add_projects_by_id(str(group.id), ["ghost"]) + summary = await _service().add_projects({"id": str(group.id)}, ["ghost"]) assert summary.succeeded == [] assert summary.failed[0].error_code == "not_found" assert await _members(group.id) == [] @@ -93,7 +93,7 @@ async def test_out_of_scope_project_fails(self, db): # Bob's private project is invisible to Alice, so she cannot link it. group = await _insert_group("add-scope") await _insert_project("mp-bob", owner=BOB_EMAIL) - summary = await _service(ALICE).add_projects_by_id(str(group.id), ["mp-bob"]) + summary = await _service(ALICE).add_projects({"id": str(group.id)}, ["mp-bob"]) assert summary.succeeded == [] assert summary.failed[0].error_code == "not_found" assert await _members(group.id) == [] @@ -101,7 +101,7 @@ async def test_out_of_scope_project_fails(self, db): async def test_group_not_visible_raises_not_found(self, db): group = await _insert_group("add-priv") # owned by Alice, invisible to anon with pytest.raises(NotFoundError): - await _service(ANON).add_projects_by_id(str(group.id), []) + await _service(ANON).add_projects({"id": str(group.id)}, []) # --------------------------------------------------------------------------- @@ -129,24 +129,24 @@ async def test_delete_by_id_unlinks_project(self, db): group = await _insert_group("rm-id") await _insert_project("mp-1") await _insert_project("mp-2") - await _service().add_projects_by_id(str(group.id), ["mp-1", "mp-2"]) - summary = await _service().delete_projects_by_id(str(group.id), ["mp-1"]) + await _service().add_projects({"id": str(group.id)}, ["mp-1", "mp-2"]) + summary = await _service().delete_projects({"id": str(group.id)}, ["mp-1"]) assert summary.succeeded == ["mp-1"] assert await _members(group.id) == ["mp-2"] async def test_delete_by_identifiers_unlinks_project(self, db): group = await _insert_group("rm-ident") await _insert_project("mp-1") - await _service().add_projects_by_id(str(group.id), ["mp-1"]) - summary = await _service().delete_projects_by_identifiers("rm-ident", ALICE_EMAIL, ["mp-1"]) + await _service().add_projects({"id": str(group.id)}, ["mp-1"]) + summary = await _service().delete_projects({"name": "rm-ident", "owner": ALICE_EMAIL}, ["mp-1"]) assert summary.succeeded == ["mp-1"] assert await _members(group.id) == [] async def test_delete_non_member_reported_as_failure(self, db): group = await _insert_group("rm-nonmember") await _insert_project("mp-1") - await _service().add_projects_by_id(str(group.id), ["mp-1"]) - summary = await _service().delete_projects_by_id(str(group.id), ["ghost"]) + await _service().add_projects({"id": str(group.id)}, ["mp-1"]) + summary = await _service().delete_projects({"id": str(group.id)}, ["ghost"]) assert summary.succeeded == [] assert summary.failed[0].error_code == "not_found" assert await _members(group.id) == ["mp-1"] diff --git a/mpcontribs-api/tests/integration/db/test_projects_repository.py b/mpcontribs-api/tests/integration/db/test_projects_repository.py index ece6566b7e..a0286afb0b 100644 --- a/mpcontribs-api/tests/integration/db/test_projects_repository.py +++ b/mpcontribs-api/tests/integration/db/test_projects_repository.py @@ -125,29 +125,29 @@ def _noop_filter(): # --------------------------------------------------------------------------- -# get_project_by_id +# get_one # --------------------------------------------------------------------------- class TestGetProjectById: async def test_returns_project_for_valid_id(self, db): await _insert("get-by-id") - result = await _repo(ADMIN).get_project_by_id(id="get-by-id", fields=None) + result = await _repo(ADMIN).get_one({"id": "get-by-id"}, fields=None) assert result is not None assert result.id == "get-by-id" async def test_returns_none_for_missing_id(self, db): - result = await _repo(ADMIN).get_project_by_id(id="does-not-exist", fields=None) + result = await _repo(ADMIN).get_one({"id": "does-not-exist"}, fields=None) assert result is None async def test_admin_can_get_private_project(self, db): await _insert("get-priv", is_public=False) - result = await _repo(ADMIN).get_project_by_id(id="get-priv", fields=None) + result = await _repo(ADMIN).get_one({"id": "get-priv"}, fields=None) assert result is not None async def test_anon_cannot_get_private_project(self, db): await _insert("get-priv-anon", is_public=False) - result = await _repo(ANON).get_project_by_id(id="get-priv-anon", fields=None) + result = await _repo(ANON).get_one({"id": "get-priv-anon"}, fields=None) assert result is None @@ -157,7 +157,7 @@ async def test_anon_cannot_get_private_project(self, db): # Regression: Beanie stores the primary key under Mongo's ``_id`` (``id`` is an # alias), but fastapi-filter keys queries on the raw field name. Without the # ``id`` -> ``_id`` remap in BaseFilter these filters matched nothing even -# though get_project_by_id (which queries ``_id`` directly) found the document. +# though get_one (which queries ``_id`` directly) found the document. # --------------------------------------------------------------------------- @@ -325,7 +325,7 @@ async def test_all_items_covered_across_pages(self, db): # --------------------------------------------------------------------------- -# patch_project_by_id +# patch_one # --------------------------------------------------------------------------- @@ -333,7 +333,7 @@ class TestPatchProject: async def test_updates_single_field(self, db): await _insert("patch-me") patch = ProjectPatch(title="Updated Title") - await _repo(ADMIN).patch_project_by_id(id="patch-me", update=patch) + await _repo(ADMIN).patch_one({"id": "patch-me"}, patch) found = await Project.find_one(Project.id == "patch-me") assert found.title == "Updated Title" @@ -341,47 +341,47 @@ async def test_unset_fields_not_overwritten(self, db): await _insert("patch-preserve") original = await Project.find_one(Project.id == "patch-preserve") patch = ProjectPatch(title="New Title") - await _repo(ADMIN).patch_project_by_id(id="patch-preserve", update=patch) + await _repo(ADMIN).patch_one({"id": "patch-preserve"}, patch) found = await Project.find_one(Project.id == "patch-preserve") assert found.authors == original.authors async def test_not_found_raises(self, db): patch = ProjectPatch(title="Won't work") with pytest.raises(NotFoundError): - await _repo(ADMIN).patch_project_by_id(id="no-such-id", update=patch) + await _repo(ADMIN).patch_one({"id": "no-such-id"}, patch) async def test_empty_patch_returns_existing(self, db): await _insert("patch-empty") - result = await _repo(ADMIN).patch_project_by_id(id="patch-empty", update=ProjectPatch()) + result = await _repo(ADMIN).patch_one({"id": "patch-empty"}, ProjectPatch()) assert result.id == "patch-empty" # --------------------------------------------------------------------------- -# delete_project_by_id (soft-delete via DocumentWithSoftDelete) +# delete_one (soft-delete via DocumentWithSoftDelete) # --------------------------------------------------------------------------- class TestDeleteProject: async def test_deleted_project_not_in_default_query(self, db): await _insert("del-me", is_public=True, is_approved=True) - await _repo(ADMIN).delete_project_by_id(id="del-me") + await _repo(ADMIN).delete_one({"id": "del-me"}) page = await _repo(ADMIN).get_projects(filter=_noop_filter(), pagination=CursorParams(), fields=None) ids = {p.id for p in page.items} assert "del-me" not in ids async def test_delete_nonexistent_throws_error(self, db): - # delete_project_by_id does find_one().delete() — Error if not found + # delete_one does find_one().delete() — Error if not found with pytest.raises(NotFoundError, match="not found"): - await _repo(ADMIN).delete_project_by_id(id="ghost-id") + await _repo(ADMIN).delete_one({"id": "ghost-id"}) async def test_owner_can_delete_own_project(self, db): await _insert("del-own", owner="google:alice@example.com") - await _repo(ALICE).delete_project_by_id(id="del-own") + await _repo(ALICE).delete_one({"id": "del-own"}) assert await Project.find_one(Project.id == "del-own") is None async def test_admin_can_delete_any_project(self, db): await _insert("del-admin", owner="google:alice@example.com") - await _repo(ADMIN).delete_project_by_id(id="del-admin") + await _repo(ADMIN).delete_one({"id": "del-admin"}) assert await Project.find_one(Project.id == "del-admin") is None async def test_group_member_non_owner_cannot_delete(self, db): @@ -389,52 +389,52 @@ async def test_group_member_non_owner_cannot_delete(self, db): member = User(username="google:carol@example.com", groups=frozenset({"del-grp"})) await _insert("del-grp", owner="google:alice@example.com") with pytest.raises(PermissionError): - await _repo(member).delete_project_by_id(id="del-grp") + await _repo(member).delete_one({"id": "del-grp"}) assert await Project.find_one(Project.id == "del-grp") is not None async def test_visible_public_non_owner_cannot_delete(self, db): # BOB can see the public+approved project but does not own it → 403, not a silent success. await _insert("del-pub", owner="google:alice@example.com", is_public=True, is_approved=True) with pytest.raises(PermissionError): - await _repo(BOB).delete_project_by_id(id="del-pub") + await _repo(BOB).delete_one({"id": "del-pub"}) assert await Project.find_one(Project.id == "del-pub") is not None async def test_out_of_scope_delete_not_found(self, db): # BOB cannot see Alice's private project → 404 (existence is not leaked as a 403). await _insert("del-hidden", owner="google:alice@example.com", is_public=False) with pytest.raises(NotFoundError): - await _repo(BOB).delete_project_by_id(id="del-hidden") + await _repo(BOB).delete_one({"id": "del-hidden"}) assert await Project.find_one(Project.id == "del-hidden") is not None # --------------------------------------------------------------------------- -# upsert_project_by_id +# upsert_one # --------------------------------------------------------------------------- class TestUpsertProject: async def test_upsert_creates_new_project(self, db): data = _project_in("upsert-new") - await _repo(ADMIN).upsert_project_by_id(id="upsert-new", data=data) + await _repo(ADMIN).upsert_one({"id": "upsert-new"}, data=data) found = await Project.find_one(Project.id == "upsert-new") assert found is not None async def test_upsert_updates_existing_project(self, db): await _insert("upsert-existing") data = _project_in("upsert-existing", title="Replaced Title") - await _repo(ADMIN).upsert_project_by_id(id="upsert-existing", data=data) + await _repo(ADMIN).upsert_one({"id": "upsert-existing"}, data=data) found = await Project.find_one(Project.id == "upsert-existing") assert found.title == "Replaced Title" async def test_upsert_uses_path_id_not_body_id(self, db): data = _project_in("body-id") - await _repo(ADMIN).upsert_project_by_id(id="path-id", data=data) + await _repo(ADMIN).upsert_one({"id": "path-id"}, data=data) found = await Project.find_one(Project.id == "path-id") assert found is not None # --------------------------------------------------------------------------- -# upsert_project_by_id — authorization (owner-or-admin) +# upsert_one — authorization (owner-or-admin) # --------------------------------------------------------------------------- BOB = User(username="google:bob@example.com", groups=frozenset()) @@ -444,14 +444,14 @@ class TestUpsertProjectAuthorization: async def test_owner_can_overwrite_own_project(self, db): await _insert("auth-own", owner="google:alice@example.com") data = _project_in("auth-own", owner="google:alice@example.com", title="Owner Edit") - await _repo(ALICE).upsert_project_by_id(id="auth-own", data=data) + await _repo(ALICE).upsert_one({"id": "auth-own"}, data=data) found = await Project.find_one(Project.id == "auth-own") assert found.title == "Owner Edit" async def test_admin_can_overwrite_any_project(self, db): await _insert("auth-admin", owner="google:alice@example.com") data = _project_in("auth-admin", owner="google:alice@example.com", title="Admin Edit") - await _repo(ADMIN).upsert_project_by_id(id="auth-admin", data=data) + await _repo(ADMIN).upsert_one({"id": "auth-admin"}, data=data) found = await Project.find_one(Project.id == "auth-admin") assert found.title == "Admin Edit" @@ -461,14 +461,14 @@ async def test_non_owner_cannot_overwrite(self, db): from mpcontribs_api.exceptions import PermissionError as AppPermissionError with pytest.raises(AppPermissionError): - await _repo(BOB).upsert_project_by_id(id="auth-other", data=data) + await _repo(BOB).upsert_one({"id": "auth-other"}, data=data) found = await Project.find_one(Project.id == "auth-other") assert found.title == "Original" async def test_new_project_sets_owner_to_caller(self, db): # Body owner is someone else; the caller's identity must win. data = _project_in("auth-newowner", owner="google:alice@example.com") - await _repo(BOB).upsert_project_by_id(id="auth-newowner", data=data) + await _repo(BOB).upsert_one({"id": "auth-newowner"}, data=data) found = await Project.find_one(Project.id == "auth-newowner") assert found.owner == "google:bob@example.com" @@ -476,7 +476,7 @@ async def test_update_preserves_original_owner(self, db): await _insert("auth-preserve", owner="google:alice@example.com") # Alice tries to reassign ownership via the body; owner must stay hers. data = _project_in("auth-preserve", owner="google:bob@example.com", title="Edit") - await _repo(ALICE).upsert_project_by_id(id="auth-preserve", data=data) + await _repo(ALICE).upsert_one({"id": "auth-preserve"}, data=data) found = await Project.find_one(Project.id == "auth-preserve") assert found.owner == "google:alice@example.com" @@ -490,13 +490,13 @@ class TestApprovalIsAdminOnly: async def test_non_admin_cannot_patch_is_approved(self, db): await _insert("appr-patch", owner="google:alice@example.com") with pytest.raises(PermissionError): - await _repo(ALICE).patch_project_by_id(id="appr-patch", update=ProjectPatch(is_approved=True)) + await _repo(ALICE).patch_one({"id": "appr-patch"}, ProjectPatch(is_approved=True)) found = await Project.find_one(Project.id == "appr-patch") assert found.is_approved is False async def test_admin_can_patch_is_approved(self, db): await _insert("appr-patch-admin", owner="google:alice@example.com") - await _repo(ADMIN).patch_project_by_id(id="appr-patch-admin", update=ProjectPatch(is_approved=True)) + await _repo(ADMIN).patch_one({"id": "appr-patch-admin"}, ProjectPatch(is_approved=True)) found = await Project.find_one(Project.id == "appr-patch-admin") assert found.is_approved is True @@ -510,14 +510,14 @@ class TestPublicRequiresApproved: async def test_patch_public_on_unapproved_rejected(self, db): await _insert("pub-unappr", owner="google:alice@example.com", is_approved=False) with pytest.raises(ValidationError, match="approved"): - await _repo(ADMIN).patch_project_by_id(id="pub-unappr", update=ProjectPatch(is_public=True)) + await _repo(ADMIN).patch_one({"id": "pub-unappr"}, ProjectPatch(is_public=True)) found = await Project.find_one(Project.id == "pub-unappr") assert found.is_public is False async def test_patch_public_and_approved_together_succeeds(self, db): await _insert("pub-both", owner="google:alice@example.com", is_approved=False) - await _repo(ADMIN).patch_project_by_id( - id="pub-both", update=ProjectPatch(is_public=True, is_approved=True) + await _repo(ADMIN).patch_one( + {"id": "pub-both"}, ProjectPatch(is_public=True, is_approved=True) ) found = await Project.find_one(Project.id == "pub-both") assert found.is_public is True @@ -525,7 +525,7 @@ async def test_patch_public_and_approved_together_succeeds(self, db): async def test_patch_public_on_approved_succeeds(self, db): await _insert("pub-approved", owner="google:alice@example.com", is_approved=True) - await _repo(ADMIN).patch_project_by_id(id="pub-approved", update=ProjectPatch(is_public=True)) + await _repo(ADMIN).patch_one({"id": "pub-approved"}, ProjectPatch(is_public=True)) found = await Project.find_one(Project.id == "pub-approved") assert found.is_public is True @@ -538,14 +538,14 @@ async def test_patch_public_on_approved_succeeds(self, db): class TestUpsertServerManagedFields: async def test_new_project_is_private_and_unapproved(self, db): # ProjectIn has no is_public/is_approved, so a new PUT project starts safe by default. - await _repo(BOB).upsert_project_by_id(id="srv-new", data=_project_in("srv-new")) + await _repo(BOB).upsert_one({"id": "srv-new"}, data=_project_in("srv-new")) found = await Project.find_one(Project.id == "srv-new") assert found.is_public is False assert found.is_approved is False async def test_admin_upsert_cannot_approve_via_body(self, db): # Approval is PATCH-only even for an admin; a PUT can never approve a project. - await _repo(ADMIN).upsert_project_by_id(id="srv-admin-new", data=_project_in("srv-admin-new")) + await _repo(ADMIN).upsert_one({"id": "srv-admin-new"}, data=_project_in("srv-admin-new")) found = await Project.find_one(Project.id == "srv-admin-new") assert found.is_approved is False @@ -553,7 +553,7 @@ async def test_update_preserves_public_and_approved(self, db): # A full-replace PUT by the owner must not wipe server-managed publication/approval. await _insert("srv-preserve", owner="google:alice@example.com", is_public=True, is_approved=True) data = _project_in("srv-preserve", owner="google:alice@example.com", title="Renamed Title") - await _repo(ALICE).upsert_project_by_id(id="srv-preserve", data=data) + await _repo(ALICE).upsert_one({"id": "srv-preserve"}, data=data) found = await Project.find_one(Project.id == "srv-preserve") assert found.title == "Renamed Title" # content fields still update assert found.is_public is True @@ -561,6 +561,6 @@ async def test_update_preserves_public_and_approved(self, db): async def test_update_preserves_stats(self, db): await _insert("srv-stats", owner="google:alice@example.com", stats=Stats(contributions=7)) - await _repo(ALICE).upsert_project_by_id(id="srv-stats", data=_project_in("srv-stats")) + await _repo(ALICE).upsert_one({"id": "srv-stats"}, data=_project_in("srv-stats")) found = await Project.find_one(Project.id == "srv-stats") assert found.stats.contributions == 7 diff --git a/mpcontribs-api/tests/integration/test_component_routes.py b/mpcontribs-api/tests/integration/test_component_routes.py index f47fb1ae64..6452a4c1a7 100644 --- a/mpcontribs-api/tests/integration/test_component_routes.py +++ b/mpcontribs-api/tests/integration/test_component_routes.py @@ -127,15 +127,15 @@ def test_post_forwards_to_service(self, client, structure_service): class TestStructuresByIdRouting: def test_get_by_id_conventional_path(self, client, structure_service): - structure_service.get_by_id.return_value = SAMPLE_STRUCTURE + structure_service.get_one.return_value = SAMPLE_STRUCTURE assert client.get(f"/api/v1/structures/{PydanticObjectId()}").status_code == 200 def test_delete_by_id_conventional_path(self, client, structure_service): - structure_service.delete_by_id.return_value = ComponentDeleteResponse(num_deleted=1) + structure_service.delete_one.return_value = ComponentDeleteResponse(num_deleted=1) assert client.delete(f"/api/v1/structures/{PydanticObjectId()}").status_code == 200 def test_patch_by_id_conventional_path(self, client, structure_service): - structure_service.patch_by_id.return_value = SAMPLE_STRUCTURE + structure_service.patch_one.return_value = SAMPLE_STRUCTURE r = client.patch(f"/api/v1/structures/{PydanticObjectId()}", json={"name": "renamed"}) assert r.status_code == 200 @@ -186,15 +186,15 @@ def test_post_forwards_to_service(self, client, table_service): class TestTablesByIdRouting: def test_get_by_id_conventional_path(self, client, table_service): - table_service.get_by_id.return_value = SAMPLE_TABLE + table_service.get_one.return_value = SAMPLE_TABLE assert client.get(f"/api/v1/tables/{PydanticObjectId()}").status_code == 200 def test_delete_by_id_conventional_path(self, client, table_service): - table_service.delete_by_id.return_value = ComponentDeleteResponse(num_deleted=1) + table_service.delete_one.return_value = ComponentDeleteResponse(num_deleted=1) assert client.delete(f"/api/v1/tables/{PydanticObjectId()}").status_code == 200 def test_patch_by_id_conventional_path(self, client, table_service): - table_service.patch_by_id.return_value = SAMPLE_TABLE + table_service.patch_one.return_value = SAMPLE_TABLE r = client.patch(f"/api/v1/tables/{PydanticObjectId()}", json={"name": "x"}) assert r.status_code == 200 @@ -212,14 +212,14 @@ def test_list_calls_attachment_service(self, client, attachment_service): attachment_service.get_many.assert_awaited_once() def test_get_by_id_calls_attachment_service(self, client, attachment_service): - attachment_service.get_by_id.return_value = None + attachment_service.get_one.return_value = None client.get(f"/api/v1/attachments/{PydanticObjectId()}") - attachment_service.get_by_id.assert_awaited_once() + attachment_service.get_one.assert_awaited_once() def test_delete_by_id_calls_attachment_service(self, client, attachment_service): - attachment_service.delete_by_id.return_value = ComponentDeleteResponse(num_deleted=1) + attachment_service.delete_one.return_value = ComponentDeleteResponse(num_deleted=1) client.delete(f"/api/v1/attachments/{PydanticObjectId()}") - attachment_service.delete_by_id.assert_awaited_once() + attachment_service.delete_one.assert_awaited_once() def test_batch_delete_calls_attachment_service(self, client, attachment_service): attachment_service.delete.return_value = ComponentDeleteResponse(num_deleted=0) @@ -310,12 +310,12 @@ def test_structures_delete_anon_401(self, client, structure_service): def test_structure_delete_by_id_anon_401(self, client, structure_service): r = client.delete(f"/api/v1/structures/{PydanticObjectId()}", headers=FORCE_ANON_HEADERS) assert r.status_code == 401 - structure_service.delete_by_id.assert_not_called() + structure_service.delete_one.assert_not_called() def test_structure_patch_by_id_anon_401(self, client, structure_service): r = client.patch(f"/api/v1/structures/{PydanticObjectId()}", json={"name": "x"}, headers=FORCE_ANON_HEADERS) assert r.status_code == 401 - structure_service.patch_by_id.assert_not_called() + structure_service.patch_one.assert_not_called() def test_tables_delete_anon_401(self, client, table_service): r = client.delete("/api/v1/tables", headers=FORCE_ANON_HEADERS) @@ -325,7 +325,7 @@ def test_tables_delete_anon_401(self, client, table_service): def test_attachment_delete_by_id_anon_401(self, client, attachment_service): r = client.delete(f"/api/v1/attachments/{PydanticObjectId()}", headers=FORCE_ANON_HEADERS) assert r.status_code == 401 - attachment_service.delete_by_id.assert_not_called() + attachment_service.delete_one.assert_not_called() def test_structures_get_still_open_to_anon(self, client, structure_service): structure_service.get_many.return_value = Page(items=[], next_cursor=None) diff --git a/mpcontribs-api/tests/integration/test_contributions_routes.py b/mpcontribs-api/tests/integration/test_contributions_routes.py index 36adad5984..0921854f8e 100644 --- a/mpcontribs-api/tests/integration/test_contributions_routes.py +++ b/mpcontribs-api/tests/integration/test_contributions_routes.py @@ -136,24 +136,22 @@ def test_malformed_body_returns_422(self, client, contribution_service): class TestContributionByIdRouting: """RED: routes mount as /contributions{id} not /contributions/{id}.""" - def test_get_by_id_conventional_path(self, client, contribution_repo): - contribution_repo.get_contribution_by_id.return_value = SAMPLE_OUT + def test_get_by_id_conventional_path(self, client, contribution_service): + contribution_service.get_one.return_value = SAMPLE_OUT assert client.get(f"/api/v1/contributions/{PydanticObjectId()}").status_code == 200 - def test_patch_by_id_conventional_path(self, client, contribution_repo): - contribution_repo.patch_contribution_by_id.return_value = SAMPLE_OUT + def test_patch_by_id_conventional_path(self, client, contribution_service): + contribution_service.patch_one.return_value = SAMPLE_OUT r = client.patch(f"/api/v1/contributions/{PydanticObjectId()}", json={"formula": "H2O"}) assert r.status_code == 200 - def test_put_by_id_conventional_path(self, client, contribution_repo): - contribution_repo.upsert_contribution_by_id.return_value = SAMPLE_OUT + def test_put_by_id_conventional_path(self, client, contribution_service): + contribution_service.upsert_one.return_value = SAMPLE_OUT r = client.put(f"/api/v1/contributions/{PydanticObjectId()}", json=_valid_contribution_body()) assert r.status_code == 200 def test_delete_by_id_conventional_path(self, client, contribution_service): - contribution_service.delete_contributions.return_value = BulkDeleteSummary( - num_deleted=1, num_children_deleted=0 - ) + contribution_service.delete_one.return_value = BulkDeleteSummary(num_deleted=1, num_children_deleted=0) assert client.delete(f"/api/v1/contributions/{PydanticObjectId()}").status_code == 200 def test_download_route_conventional_path(self, client, contribution_repo): @@ -168,23 +166,17 @@ def test_download_route_conventional_path(self, client, contribution_repo): class TestDeleteContributionByIdWiring: def test_delete_delegates_to_service(self, client, contribution_service): - contribution_service.delete_contributions.return_value = BulkDeleteSummary( - num_deleted=1, num_children_deleted=2 - ) + contribution_service.delete_one.return_value = BulkDeleteSummary(num_deleted=1, num_children_deleted=2) oid = PydanticObjectId() - # NOTE: glued path is intentional here — see module docstring. r = client.delete(f"/api/v1/contributions/{oid}") assert r.status_code == 200 - contribution_service.delete_contributions.assert_awaited_once() + contribution_service.delete_one.assert_awaited_once() - def test_delete_builds_filter_from_path_id(self, client, contribution_service): - contribution_service.delete_contributions.return_value = BulkDeleteSummary( - num_deleted=1, num_children_deleted=0 - ) + def test_delete_passes_id_identifiers_to_service(self, client, contribution_service): + contribution_service.delete_one.return_value = BulkDeleteSummary(num_deleted=1, num_children_deleted=0) oid = PydanticObjectId() client.delete(f"/api/v1/contributions/{oid}") - passed_filter = contribution_service.delete_contributions.call_args.args[0] - assert passed_filter.id == oid + assert contribution_service.delete_one.call_args.args[0] == {"id": str(oid)} # =========================================================================== @@ -278,21 +270,21 @@ def test_delete_by_id_anon_401(self, client, contribution_service): r = client.delete(f"/api/v1/contributions/{PydanticObjectId()}", headers=FORCE_ANON_HEADERS) assert r.status_code == 401 - def test_put_by_id_anon_401(self, client, contribution_repo): + def test_put_by_id_anon_401(self, client, contribution_service): r = client.put( f"/api/v1/contributions/{PydanticObjectId()}", json=_valid_contribution_body(), headers=FORCE_ANON_HEADERS, ) assert r.status_code == 401 - contribution_repo.upsert_contribution_by_id.assert_not_called() + contribution_service.upsert_one.assert_not_called() - def test_patch_by_id_anon_401(self, client, contribution_repo): + def test_patch_by_id_anon_401(self, client, contribution_service): r = client.patch( f"/api/v1/contributions/{PydanticObjectId()}", json={"formula": "H2O"}, headers=FORCE_ANON_HEADERS ) assert r.status_code == 401 - contribution_repo.patch_contribution_by_id.assert_not_called() + contribution_service.patch_one.assert_not_called() def test_get_collection_still_open_to_anon(self, client, contribution_repo): from mpcontribs_api.pagination import Page diff --git a/mpcontribs-api/tests/integration/test_initiatives.py b/mpcontribs-api/tests/integration/test_initiatives.py index c0eba7a471..516bb5b469 100644 --- a/mpcontribs-api/tests/integration/test_initiatives.py +++ b/mpcontribs-api/tests/integration/test_initiatives.py @@ -78,7 +78,7 @@ def test_list_returns_200(self, client, initiative_repo): assert r.status_code == 200 def test_get_by_slug_returns_200(self, client, initiative_repo): - initiative_repo.get_initiative.return_value = _stored() + initiative_repo.get_one.return_value = _stored() r = client.get("/api/v1/initiatives/battery-genome", headers=AUTHED_HEADERS) assert r.status_code == 200 assert r.json()["slug"] == "battery-genome" @@ -91,7 +91,7 @@ def test_get_by_slug_returns_200(self, client, initiative_repo): class TestPatch: def test_patch_returns_200(self, client, initiative_repo): - initiative_repo.patch_initiative.return_value = _stored(name="Renamed") + initiative_repo.patch_one.return_value = _stored(name="Renamed") r = client.patch( "/api/v1/initiatives/battery-genome", json={"name": "Renamed"}, @@ -109,7 +109,7 @@ def test_anonymous_rejected_401(self, client, initiative_repo): assert r.status_code == 401 def test_not_found_propagates_404(self, client, initiative_repo): - initiative_repo.patch_initiative.side_effect = NotFoundError("nope") + initiative_repo.patch_one.side_effect = NotFoundError("nope") r = client.patch( "/api/v1/initiatives/missing", json={"name": "Renamed"}, @@ -125,7 +125,7 @@ def test_not_found_propagates_404(self, client, initiative_repo): class TestDelete: def test_delete_returns_204(self, client, initiative_repo): - initiative_repo.delete_initiative.return_value = None + initiative_repo.delete_one.return_value = None r = client.delete("/api/v1/initiatives/battery-genome", headers=AUTHED_HEADERS) assert r.status_code == 204 assert r.content == b"" diff --git a/mpcontribs-api/tests/integration/test_projects.py b/mpcontribs-api/tests/integration/test_projects.py index e5fcf39a19..7a7179c562 100644 --- a/mpcontribs-api/tests/integration/test_projects.py +++ b/mpcontribs-api/tests/integration/test_projects.py @@ -117,44 +117,43 @@ def test_valid_fields_param_forwarded(self, client, project_repo): class TestGetProjectById: - def test_found_returns_200(self, client, project_repo): - project_repo.get_project_by_id.return_value = SAMPLE_PROJECT + def test_found_returns_200(self, client, project_service): + project_service.get_one.return_value = SAMPLE_PROJECT r = client.get("/api/v1/projects/mp-sample", headers=AUTHED_HEADERS) assert r.status_code == 200 - def test_response_contains_project_data(self, client, project_repo): - project_repo.get_project_by_id.return_value = SAMPLE_PROJECT + def test_response_contains_project_data(self, client, project_service): + project_service.get_one.return_value = SAMPLE_PROJECT body = client.get("/api/v1/projects/mp-sample", headers=AUTHED_HEADERS).json() assert body["id"] == "mp-sample" assert body["title"] == "Sample Project" - def test_not_found_returns_404(self, client, project_repo): - project_repo.get_project_by_id.side_effect = NotFoundError("project not found") + def test_not_found_returns_404(self, client, project_service): + project_service.get_one.side_effect = NotFoundError("project not found") r = client.get("/api/v1/projects/nonexistent", headers=AUTHED_HEADERS) assert r.status_code == 404 - def test_not_found_error_code(self, client, project_repo): - project_repo.get_project_by_id.side_effect = NotFoundError("project not found") + def test_not_found_error_code(self, client, project_service): + project_service.get_one.side_effect = NotFoundError("project not found") body = client.get("/api/v1/projects/nonexistent", headers=AUTHED_HEADERS).json() assert body["error"]["code"] == "not_found" - def test_id_forwarded_to_repo(self, client, project_repo): - project_repo.get_project_by_id.return_value = SAMPLE_PROJECT + def test_id_forwarded_to_service(self, client, project_service): + project_service.get_one.return_value = SAMPLE_PROJECT client.get("/api/v1/projects/my-specific-id", headers=AUTHED_HEADERS) - _, kwargs = project_repo.get_project_by_id.call_args - assert kwargs["id"] == "my-specific-id" + assert project_service.get_one.call_args.args[0] == {"id": "my-specific-id"} - def test_fields_param_forwarded(self, client, project_repo): - project_repo.get_project_by_id.return_value = SAMPLE_PROJECT + def test_fields_param_forwarded(self, client, project_service): + project_service.get_one.return_value = SAMPLE_PROJECT client.get("/api/v1/projects/mp-sample", params={"_fields": "title"}, headers=AUTHED_HEADERS) - _, kwargs = project_repo.get_project_by_id.call_args + _, kwargs = project_service.get_one.call_args assert kwargs["fields"] is not None assert "title" in kwargs["fields"] - def test_no_fields_param_uses_default_fields(self, client, project_repo): - project_repo.get_project_by_id.return_value = SAMPLE_PROJECT + def test_no_fields_param_uses_default_fields(self, client, project_service): + project_service.get_one.return_value = SAMPLE_PROJECT client.get("/api/v1/projects/mp-sample", headers=AUTHED_HEADERS) - _, kwargs = project_repo.get_project_by_id.call_args + _, kwargs = project_service.get_one.call_args assert kwargs["fields"] is not None assert "title" in kwargs["fields"] @@ -166,7 +165,7 @@ def test_no_fields_param_uses_default_fields(self, client, project_repo): class TestPatchProject: def test_valid_patch_returns_200(self, client, project_service): - project_service.patch.return_value = SAMPLE_PROJECT + project_service.patch_one.return_value = SAMPLE_PROJECT r = client.patch( "/api/v1/projects/mp-sample", json={"title": "Updated Title"}, @@ -176,7 +175,7 @@ def test_valid_patch_returns_200(self, client, project_service): def test_patch_response_is_project_out(self, client, project_service): updated = ProjectOut(id="mp-sample", title="Updated Title") - project_service.patch.return_value = updated + project_service.patch_one.return_value = updated body = client.patch( "/api/v1/projects/mp-sample", json={"title": "Updated Title"}, @@ -185,7 +184,7 @@ def test_patch_response_is_project_out(self, client, project_service): assert body["title"] == "Updated Title" def test_not_found_returns_404(self, client, project_service): - project_service.patch.side_effect = NotFoundError("not found") + project_service.patch_one.side_effect = NotFoundError("not found") r = client.patch( "/api/v1/projects/missing", json={"title": "x" * 5}, @@ -202,15 +201,15 @@ def test_invalid_title_too_short_returns_422(self, client, project_service): assert r.status_code == 422 def test_id_and_update_forwarded_to_service(self, client, project_service): - project_service.patch.return_value = SAMPLE_PROJECT + project_service.patch_one.return_value = SAMPLE_PROJECT client.patch( "/api/v1/projects/mp-sample", json={"title": "New Name"}, headers=AUTHED_HEADERS, ) - _, kwargs = project_service.patch.call_args - assert kwargs["id"] == "mp-sample" - assert kwargs["update"].title == "New Name" + call = project_service.patch_one.call_args + assert call.args[0] == {"id": "mp-sample"} + assert call.kwargs["update"].title == "New Name" # --------------------------------------------------------------------------- @@ -219,21 +218,20 @@ def test_id_and_update_forwarded_to_service(self, client, project_service): class TestDeleteProject: - def test_delete_returns_204(self, client, project_repo): - project_repo.delete_project_by_id.return_value = None + def test_delete_returns_204(self, client, project_service): + project_service.delete_one.return_value = None r = client.delete("/api/v1/projects/mp-sample", headers=AUTHED_HEADERS) assert r.status_code == 204 - def test_delete_response_has_no_body(self, client, project_repo): - project_repo.delete_project_by_id.return_value = None + def test_delete_response_has_no_body(self, client, project_service): + project_service.delete_one.return_value = None r = client.delete("/api/v1/projects/mp-sample", headers=AUTHED_HEADERS) assert r.content == b"" - def test_id_forwarded_to_repo(self, client, project_repo): - project_repo.delete_project_by_id.return_value = None + def test_id_forwarded_to_service(self, client, project_service): + project_service.delete_one.return_value = None client.delete("/api/v1/projects/mp-sample", headers=AUTHED_HEADERS) - _, kwargs = project_repo.delete_project_by_id.call_args - assert kwargs["id"] == "mp-sample" + assert project_service.delete_one.call_args.args[0] == {"id": "mp-sample"} # --------------------------------------------------------------------------- @@ -254,17 +252,17 @@ def _valid_body(self, **overrides): body.update(overrides) return body - def test_valid_upsert_returns_200(self, client, project_repo): - project_repo.upsert_project_by_id.return_value = SAMPLE_PROJECT + def test_valid_upsert_returns_200(self, client, project_service): + project_service.upsert_one.return_value = SAMPLE_PROJECT r = client.put("/api/v1/projects/mp-sample", json=self._valid_body(), headers=AUTHED_HEADERS) assert r.status_code == 200 - def test_conflict_returns_409(self, client, project_repo): - project_repo.upsert_project_by_id.side_effect = ConflictError("already exists") + def test_conflict_returns_409(self, client, project_service): + project_service.upsert_one.side_effect = ConflictError("already exists") r = client.put("/api/v1/projects/mp-sample", json=self._valid_body(), headers=AUTHED_HEADERS) assert r.status_code == 409 - def test_missing_required_field_returns_422(self, client, project_repo): + def test_missing_required_field_returns_422(self, client, project_service): body = self._valid_body() del body["title"] r = client.put("/api/v1/projects/mp-sample", json=body, headers=AUTHED_HEADERS) @@ -287,19 +285,19 @@ def _body(self): "unique_identifiers": True, } - def test_anonymous_put_returns_401(self, client, project_repo): - project_repo.upsert_project_by_id.return_value = SAMPLE_PROJECT + def test_anonymous_put_returns_401(self, client, project_service): + project_service.upsert_one.return_value = SAMPLE_PROJECT r = client.put("/api/v1/projects/mp-sample", json=self._body(), headers=ANON_HEADERS) assert r.status_code == 401 assert r.json()["error"]["code"] == "authentication_error" - project_repo.upsert_project_by_id.assert_not_called() + project_service.upsert_one.assert_not_called() - def test_anonymous_patch_returns_401(self, client, project_repo): + def test_anonymous_patch_returns_401(self, client, project_service): r = client.patch("/api/v1/projects/mp-sample", json={"title": "Updated Title"}, headers=ANON_HEADERS) assert r.status_code == 401 - project_repo.patch_project_by_id.assert_not_called() + project_service.patch_one.assert_not_called() - def test_anonymous_delete_returns_401(self, client, project_repo): + def test_anonymous_delete_returns_401(self, client, project_service): r = client.delete("/api/v1/projects/mp-sample", headers=ANON_HEADERS) assert r.status_code == 401 - project_repo.delete_project_by_id.assert_not_called() + project_service.delete_one.assert_not_called() diff --git a/mpcontribs-api/tests/unit/domains/test_component_service.py b/mpcontribs-api/tests/unit/domains/test_component_service.py index 53f86ce17d..e297f81a4d 100644 --- a/mpcontribs-api/tests/unit/domains/test_component_service.py +++ b/mpcontribs-api/tests/unit/domains/test_component_service.py @@ -15,6 +15,13 @@ def _oid() -> PydanticObjectId: return PydanticObjectId() +def _coerce_identifiers(identifiers: dict) -> dict: + """Stub for the repo's ObjectId-keyed ``coerce_identifiers`` (string id -> ObjectId).""" + if isinstance(identifiers.get("id"), str): + return {**identifiers, "id": PydanticObjectId(identifiers["id"])} + return identifiers + + def _make_service( *, candidate_ids: list[PydanticObjectId], @@ -29,9 +36,8 @@ def _make_service( components = AsyncMock(name="components") components.list_ids = AsyncMock(return_value=candidate_ids) components.delete_by_ids = AsyncMock(side_effect=lambda ids: DeleteResponse(num_deleted=len(ids))) - components.delete_by_id = AsyncMock(return_value=DeleteResponse(num_deleted=1)) - components._convert_object_id = MagicMock(side_effect=lambda s: PydanticObjectId(s)) - components._not_found = MagicMock(return_value="not found") + components.delete_one = AsyncMock(return_value=DeleteResponse(num_deleted=1)) + components.coerce_identifiers = MagicMock(side_effect=_coerce_identifiers) contributions = AsyncMock(name="contributions") @@ -121,30 +127,30 @@ async def test_delete_by_id_not_reachable_raises_not_found(): svc, _, _ = _make_service(candidate_ids=[], reachable=set(), referenced=set()) with pytest.raises(NotFoundError): - await svc.delete_by_id(str(oid)) + await svc.delete_one({"id": str(oid)}) async def test_delete_by_id_referenced_is_skipped(): oid = _oid() svc, components, _ = _make_service(candidate_ids=[], reachable={oid}, referenced={oid}) - result = await svc.delete_by_id(str(oid)) + result = await svc.delete_one({"id": str(oid)}) assert result.num_deleted == 0 assert result.num_skipped == 1 assert result.referenced_ids == [oid] - components.delete_by_id.assert_not_awaited() + components.delete_one.assert_not_awaited() async def test_delete_by_id_reachable_and_unreferenced_deletes(): oid = _oid() svc, components, _ = _make_service(candidate_ids=[], reachable={oid}, referenced=set()) - result = await svc.delete_by_id(str(oid)) + result = await svc.delete_one({"id": str(oid)}) assert result.num_deleted == 1 assert result.num_skipped == 0 - components.delete_by_id.assert_awaited_once_with(oid) + components.delete_one.assert_awaited_once_with({"id": oid}) # --------------------------------------------------------------------------- @@ -155,8 +161,7 @@ async def test_delete_by_id_reachable_and_unreferenced_deletes(): def _make_read_service(*, reachable: set[PydanticObjectId]) -> tuple[ComponentService, AsyncMock, AsyncMock]: """ComponentService whose contribution repo reports `reachable` ids as in-scope.""" components = AsyncMock(name="components") - components._convert_object_id = MagicMock(side_effect=lambda s: PydanticObjectId(s)) - components._not_found = MagicMock(return_value="not found") + components.coerce_identifiers = MagicMock(side_effect=_coerce_identifiers) contributions = AsyncMock(name="contributions") @@ -174,21 +179,21 @@ async def test_get_by_id_unreachable_returns_none_without_fetch(): oid = _oid() svc, components, _ = _make_read_service(reachable=set()) - result = await svc.get_by_id(str(oid), fields=None) + result = await svc.get_one({"id": str(oid)}, fields=None) assert result is None - components.get_component_by_id.assert_not_awaited() + components.get_one.assert_not_awaited() async def test_get_by_id_reachable_fetches_component(): oid = _oid() svc, components, _ = _make_read_service(reachable={oid}) - components.get_component_by_id = AsyncMock(return_value="the-component") + components.get_one = AsyncMock(return_value="the-component") - result = await svc.get_by_id(str(oid), fields=None) + result = await svc.get_one({"id": str(oid)}, fields=None) assert result == "the-component" - components.get_component_by_id.assert_awaited_once() + components.get_one.assert_awaited_once() async def test_get_many_restricts_to_reachable_ids(): @@ -209,16 +214,16 @@ async def test_patch_by_id_unreachable_raises_not_found(): svc, components, _ = _make_read_service(reachable=set()) with pytest.raises(NotFoundError): - await svc.patch_by_id(str(oid), update=MagicMock()) - components.patch_component_by_id.assert_not_awaited() + await svc.patch_one({"id": str(oid)}, update=MagicMock()) + components.patch_one.assert_not_awaited() async def test_patch_by_id_reachable_patches(): oid = _oid() svc, components, _ = _make_read_service(reachable={oid}) - components.patch_component_by_id = AsyncMock(return_value="patched") + components.patch_one = AsyncMock(return_value="patched") - result = await svc.patch_by_id(str(oid), update=MagicMock()) + result = await svc.patch_one({"id": str(oid)}, update=MagicMock()) assert result == "patched" - components.patch_component_by_id.assert_awaited_once() + components.patch_one.assert_awaited_once() diff --git a/mpcontribs-api/tests/unit/domains/test_contribution_service.py b/mpcontribs-api/tests/unit/domains/test_contribution_service.py index 02451f5033..cfdc4e6695 100644 --- a/mpcontribs-api/tests/unit/domains/test_contribution_service.py +++ b/mpcontribs-api/tests/unit/domains/test_contribution_service.py @@ -519,12 +519,12 @@ async def test_insert_project_not_found_is_validation_failure(self): async def test_upsert_unique_forces_version_one(self): svc, contrib_repo, *_ = _make_service() # unique by default - contrib_repo.upsert_contribution_by_identifiers.return_value = MagicMock(spec=Contribution) + contrib_repo.upsert_one.return_value = MagicMock(spec=Contribution) # A supplied version is ignored for unique-identifier projects (inferred as 1). await svc.upsert_contributions([_contrib_in(identifier="mp-1", version=9)]) - assert contrib_repo.upsert_contribution_by_identifiers.call_args.args[2] == 1 + assert contrib_repo.upsert_one.call_args.args[2] == 1 contrib_repo.max_versions.assert_not_called() async def test_upsert_non_unique_requires_version(self): @@ -534,15 +534,15 @@ async def test_upsert_non_unique_requires_version(self): assert summary.succeeded == [] assert [f.error_code for f in summary.failed] == ["validation_error"] - contrib_repo.upsert_contribution_by_identifiers.assert_not_called() + contrib_repo.upsert_one.assert_not_called() async def test_upsert_non_unique_passes_supplied_version(self): svc, contrib_repo, *_ = _make_service(unique_identifiers=False) - contrib_repo.upsert_contribution_by_identifiers.return_value = MagicMock(spec=Contribution) + contrib_repo.upsert_one.return_value = MagicMock(spec=Contribution) await svc.upsert_contributions([_contrib_in(identifier="mp-1", version=7)]) - assert contrib_repo.upsert_contribution_by_identifiers.call_args.args[2] == 7 + assert contrib_repo.upsert_one.call_args.args[2] == 7 # --------------------------------------------------------------------------- @@ -593,8 +593,7 @@ async def test_raises_before_any_db_write(self): dirty = _contrib_in(structures=[_structure_in()]) with pytest.raises(ValidationError): await svc.upsert_contributions([dirty]) - contrib_repo.upsert_contribution_by_identifiers.assert_not_called() - contrib_repo.find_one_contribution.assert_not_called() + contrib_repo.upsert_one.assert_not_called() contrib_repo.insert_contribution.assert_not_called() contrib_repo.update_contribution.assert_not_called() @@ -607,7 +606,7 @@ async def test_raises_before_any_db_write(self): class TestUpsertContributionsAtomic: async def test_calls_atomic_repo_method_once_per_item(self): svc, contrib_repo, *_ = _make_service() - contrib_repo.upsert_contribution_by_identifiers.return_value = MagicMock(spec=Contribution) + contrib_repo.upsert_one.return_value = MagicMock(spec=Contribution) contribs = [_contrib_in(identifier=f"mp-{i}") for i in range(3)] summary = await svc.upsert_contributions(contribs) @@ -615,20 +614,19 @@ async def test_calls_atomic_repo_method_once_per_item(self): assert summary.total == 3 assert len(summary.succeeded) == 3 assert summary.failed == [] - assert contrib_repo.upsert_contribution_by_identifiers.call_count == 3 + assert contrib_repo.upsert_one.call_count == 3 # The legacy read-then-write path must not be used - contrib_repo.find_one_contribution.assert_not_called() contrib_repo.update_contribution.assert_not_called() contrib_repo.insert_contribution.assert_not_called() async def test_passes_identifiers_dict_and_input_to_repo(self): svc, contrib_repo, *_ = _make_service() - contrib_repo.upsert_contribution_by_identifiers.return_value = MagicMock(spec=Contribution) + contrib_repo.upsert_one.return_value = MagicMock(spec=Contribution) contrib = _contrib_in(project="my-proj", identifier="mp-99") await svc.upsert_contributions([contrib]) - call = contrib_repo.upsert_contribution_by_identifiers.call_args + call = contrib_repo.upsert_one.call_args assert call.args[0] == {"project": "my-proj", "identifier": "mp-99"} assert call.args[1] is contrib @@ -642,7 +640,7 @@ async def _upsert(identifiers, contrib, version): returned[contrib.identifier] = doc return doc - contrib_repo.upsert_contribution_by_identifiers.side_effect = _upsert + contrib_repo.upsert_one.side_effect = _upsert contribs = [_contrib_in(identifier=f"mp-{i}") for i in range(3)] summary = await svc.upsert_contributions(contribs) @@ -655,7 +653,7 @@ async def test_empty_batch_returns_empty_summary(self): assert summary.total == 0 assert summary.succeeded == [] assert summary.failed == [] - contrib_repo.upsert_contribution_by_identifiers.assert_not_called() + contrib_repo.upsert_one.assert_not_called() async def test_same_key_concurrent_upserts_both_go_through_atomic_call(self): """Race-safety regression: two items with the same (project, identifier) in one batch @@ -663,7 +661,7 @@ async def test_same_key_concurrent_upserts_both_go_through_atomic_call(self): tiebreaker — the service must not pre-deduplicate or otherwise swallow one. """ svc, contrib_repo, *_ = _make_service() - contrib_repo.upsert_contribution_by_identifiers.return_value = MagicMock(spec=Contribution) + contrib_repo.upsert_one.return_value = MagicMock(spec=Contribution) contribs = [ _contrib_in(project="p", identifier="same"), @@ -672,7 +670,7 @@ async def test_same_key_concurrent_upserts_both_go_through_atomic_call(self): summary = await svc.upsert_contributions(contribs) assert len(summary.succeeded) == 2 - assert contrib_repo.upsert_contribution_by_identifiers.call_count == 2 + assert contrib_repo.upsert_one.call_count == 2 async def test_one_failure_is_reported_not_raised(self): svc, contrib_repo, *_ = _make_service() @@ -682,7 +680,7 @@ async def _upsert(identifiers, contrib, version): raise ConflictError("boom") return MagicMock(spec=Contribution) - contrib_repo.upsert_contribution_by_identifiers.side_effect = _upsert + contrib_repo.upsert_one.side_effect = _upsert contribs = [_contrib_in(identifier=f"mp-{i}") for i in range(3)] summary = await svc.upsert_contributions(contribs) @@ -750,7 +748,7 @@ async def test_insert_unauthorized_and_oversize_yield_single_failure(self): async def test_upsert_rejects_unauthorized_project_per_item(self): svc, contrib_repo, *_ = _make_service(user=_member_user("allowed")) - contrib_repo.upsert_contribution_by_identifiers.return_value = MagicMock(spec=Contribution) + contrib_repo.upsert_one.return_value = MagicMock(spec=Contribution) contribs = [ _contrib_in(project="allowed", identifier="ok"), @@ -764,7 +762,7 @@ async def test_upsert_rejects_unauthorized_project_per_item(self): assert summary.failed[0].error_code == "permission_denied" assert "forbidden" in summary.failed[0].message # Only the authorized item reached the atomic repo method - contrib_repo.upsert_contribution_by_identifiers.assert_called_once() + contrib_repo.upsert_one.assert_called_once() async def test_upsert_anonymous_authorized_for_nothing(self): svc, contrib_repo, *_ = _make_service(user=User()) # anonymous: no username, no groups @@ -774,7 +772,7 @@ async def test_upsert_anonymous_authorized_for_nothing(self): assert summary.total == 1 assert summary.succeeded == [] assert [f.error_code for f in summary.failed] == ["permission_denied"] - contrib_repo.upsert_contribution_by_identifiers.assert_not_called() + contrib_repo.upsert_one.assert_not_called() # --------------------------------------------------------------------------- @@ -798,7 +796,7 @@ async def test_upsert_anonymous_authorized_for_nothing(self): # in_flight -= 1 # return MagicMock(spec=Contribution) -# contrib_repo.upsert_contribution_by_identifiers.side_effect = _upsert +# contrib_repo.upsert_one.side_effect = _upsert # contribs = [_contrib_in(identifier=f"mp-{i}") for i in range(5)] # await svc.upsert_contributions(contribs) diff --git a/mpcontribs-api/tests/unit/domains/test_project_group_service.py b/mpcontribs-api/tests/unit/domains/test_project_group_service.py index d5ab9ef0de..52a90d68b9 100644 --- a/mpcontribs-api/tests/unit/domains/test_project_group_service.py +++ b/mpcontribs-api/tests/unit/domains/test_project_group_service.py @@ -37,16 +37,21 @@ def _make_service(group: ProjectGroupOut | None, *, visible_projects: set[str] | groups.get_one.side_effect = ConflictError("ambiguous") else: groups.get_one.return_value = group - groups.get_by_id.return_value = group - # _convert_object_id is a sync repo method; keep it sync so the service gets a real id, not a coroutine. - groups._convert_object_id = MagicMock(side_effect=lambda s: PydanticObjectId(s)) + # coerce_identifiers is a sync repo method; keep it sync so the service gets a real dict, not a coroutine. + def _coerce_identifiers(identifiers): + if isinstance(identifiers.get("id"), str): + return {**identifiers, "id": PydanticObjectId(identifiers["id"])} + return identifiers + + groups.coerce_identifiers = MagicMock(side_effect=_coerce_identifiers) groups.add_project_refs.return_value = group groups.delete_project_refs.return_value = group - async def _get_project(pid, fields=None): + async def _get_project(identifiers, fields=None): + pid = identifiers["id"] return {"_id": pid} if pid in visible else None - projects.get_by_id.side_effect = _get_project + projects.get_one.side_effect = _get_project return ProjectGroupService(groups=groups, projects=projects), groups, projects @@ -88,7 +93,7 @@ async def test_empty_projects_inserts_without_validation(self): service, groups, projects = _make_service(None) payload = self._payload([]) await service.insert(payload) - projects.get_by_id.assert_not_awaited() + projects.get_one.assert_not_awaited() groups.insert_project_group.assert_awaited_once_with(payload) @@ -101,17 +106,17 @@ class TestGroupResolution: async def test_add_by_id_missing_group_raises_not_found(self): service, _, _ = _make_service(None) with pytest.raises(NotFoundError): - await service.add_projects_by_id("0" * 24, ["mp-1"]) + await service.add_projects({"id": "0" * 24}, ["mp-1"]) async def test_add_by_identifiers_missing_group_raises_not_found(self): service, _, _ = _make_service(None) with pytest.raises(NotFoundError): - await service.add_projects_by_identifiers("g", "google:a@b.com", ["mp-1"]) + await service.add_projects({"name": "g", "owner": "google:a@b.com"}, ["mp-1"]) async def test_ambiguous_identifiers_propagate_conflict(self): service, _, _ = _make_service(_group(), ambiguous=True) with pytest.raises(ConflictError): - await service.add_projects_by_identifiers("g", "google:a@b.com", ["mp-1"]) + await service.add_projects({"name": "g", "owner": "google:a@b.com"}, ["mp-1"]) # --------------------------------------------------------------------------- @@ -123,7 +128,7 @@ class TestAddProjects: async def test_valid_projects_are_added(self): group = _group() service, groups, _ = _make_service(group, visible_projects={"mp-1", "mp-2"}) - summary = await service.add_projects_by_id(str(group.id), ["mp-1", "mp-2"]) + summary = await service.add_projects({"id": str(group.id)}, ["mp-1", "mp-2"]) assert summary.total == 2 assert summary.succeeded == ["mp-1", "mp-2"] assert summary.failed == [] @@ -132,7 +137,7 @@ async def test_valid_projects_are_added(self): async def test_missing_project_reported_as_failure(self): group = _group() service, groups, _ = _make_service(group, visible_projects={"mp-1"}) - summary = await service.add_projects_by_id(str(group.id), ["mp-1", "ghost"]) + summary = await service.add_projects({"id": str(group.id)}, ["mp-1", "ghost"]) assert summary.succeeded == ["mp-1"] assert len(summary.failed) == 1 assert summary.failed[0].index == 1 @@ -143,7 +148,7 @@ async def test_missing_project_reported_as_failure(self): async def test_no_valid_projects_skips_update(self): group = _group() service, groups, _ = _make_service(group, visible_projects=set()) - summary = await service.add_projects_by_id(str(group.id), ["ghost"]) + summary = await service.add_projects({"id": str(group.id)}, ["ghost"]) assert summary.succeeded == [] assert len(summary.failed) == 1 groups.add_project_refs.assert_not_awaited() @@ -151,7 +156,7 @@ async def test_no_valid_projects_skips_update(self): async def test_duplicate_input_added_once(self): group = _group() service, groups, _ = _make_service(group, visible_projects={"mp-1"}) - summary = await service.add_projects_by_id(str(group.id), ["mp-1", "mp-1"]) + summary = await service.add_projects({"id": str(group.id)}, ["mp-1", "mp-1"]) assert summary.succeeded == ["mp-1"] groups.add_project_refs.assert_awaited_once_with(group.id, ["mp-1"]) @@ -165,7 +170,7 @@ class TestDeleteProjects: async def test_members_deleted_non_members_reported(self): group = _group(["mp-1", "mp-2"]) service, groups, _ = _make_service(group) - summary = await service.delete_projects_by_id(str(group.id), ["mp-1", "ghost"]) + summary = await service.delete_projects({"id": str(group.id)}, ["mp-1", "ghost"]) assert summary.succeeded == ["mp-1"] assert len(summary.failed) == 1 assert summary.failed[0].index == 1 @@ -175,7 +180,7 @@ async def test_members_deleted_non_members_reported(self): async def test_no_members_skips_update(self): group = _group(["mp-1"]) service, groups, _ = _make_service(group) - summary = await service.delete_projects_by_id(str(group.id), ["ghost"]) + summary = await service.delete_projects({"id": str(group.id)}, ["ghost"]) assert summary.succeeded == [] assert len(summary.failed) == 1 groups.delete_project_refs.assert_not_awaited() diff --git a/mpcontribs-api/tests/unit/domains/test_shared_models.py b/mpcontribs-api/tests/unit/domains/test_shared_models.py index 959973eea5..b883731733 100644 --- a/mpcontribs-api/tests/unit/domains/test_shared_models.py +++ b/mpcontribs-api/tests/unit/domains/test_shared_models.py @@ -107,11 +107,12 @@ def test_serializes_under_id_not_underscore_id(self): class TestIdentifierContract: - def test_default_identifier_fields_is_primary_key(self): - # Content-addressed components fall back to the base default. - assert Attachment.identifier_fields() == frozenset({"id"}) + def test_component_uses_md5(self): + # Content-addressed components identify by their content hash. + assert Attachment.identifier_fields() == frozenset({"md5"}) def test_project_uses_id(self): + # Project inherits the base default (primary key) unchanged. assert Project.identifier_fields() == frozenset({"id"}) def test_project_group_uses_name_and_owner(self): @@ -125,7 +126,8 @@ def test_default_identifiers_reads_values_off_instance(self): oid = PydanticObjectId() doc = Attachment.from_input(_attachment_in()) doc.id = oid - assert doc.identifiers() == {"id": oid} + # identifiers() reads the declared identifier fields off the instance — md5 for components. + assert doc.identifiers() == {"md5": doc.md5} def test_contribution_identifiers_returns_natural_key_values(self): contrib = ContributionIn( From 4f28a5ebcd9f422115ec3644f40a7fe2c29927cc Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 19 Aug 2026 10:22:55 -0700 Subject: [PATCH 582/591] build(pyproject.toml): removed commented out packages --- mpcontribs-api/pyproject.toml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/mpcontribs-api/pyproject.toml b/mpcontribs-api/pyproject.toml index 6b89a5c763..e66fd3e176 100644 --- a/mpcontribs-api/pyproject.toml +++ b/mpcontribs-api/pyproject.toml @@ -32,13 +32,7 @@ authors = [ {name="The Materials Project", email="feedback@materialsproject.org"}, ] dependencies = [ - # "pint>=0.24", - # "psycopg2-binary", # "rq<=2.3.2", # see https://github.com/rq/Flask-RQ2/issues/620 - # "setproctitle", - # "uncertainties", - # "websocket_client", - # "zstandard", "aioboto3>=15.5.0", "beanie>=2.1.0", "fastapi[standard]>=0.136.3", From c72dda42693fe11739a26e7d0df106523cd266c7 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 19 Aug 2026 10:49:52 -0700 Subject: [PATCH 583/591] docs(MongoDbRepository): removed some long docstrings --- .../domains/_shared/repository.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py index 1219690abd..cda16a5e3b 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py @@ -75,14 +75,6 @@ def _convert_object_id(self, id: str) -> PydanticObjectId: def coerce_identifiers(self, identifiers: dict[str, Any]) -> dict[str, Any]: """Return ``identifiers`` with a string ``id`` coerced to the model's primary-key type. - Externally supplied ids arrive as strings (path/query params). ObjectId-keyed models need - that string parsed into a ``PydanticObjectId`` before it can match ``_id``; string-keyed - models (e.g. ``Project``, whose id is its name) and every non-``id`` identifier key pass - through untouched. Idempotent: an already-parsed id is returned unchanged. - - This is the single home for identifier coercion so services that resolve documents by id - (and reuse the parsed id for cross-repository lookups) do not each reimplement it. - Raises: ValidationError: if ``id`` is a string that is not a valid ObjectId, for an ObjectId-keyed model @@ -244,6 +236,15 @@ async def delete_by_ids(self, ids: list[Any], session: AsyncClientSession | None raise ValidationError("DeleteResult not returned internally") return DeleteResponse.from_delete_result(delete_result) + def _patch_update_fields(self, update: TPatch) -> dict[str, Any]: + """Map a patch model to the MongoDB ``$set`` field dict. + + Defaults to the patch's set fields (``exclude_unset``), which replaces each named field + wholesale. Subclasses whose patch targets a nested sub-document override this to emit dotted + ``parent.child`` keys so only the named leaves change and their siblings are left intact. + """ + return update.model_dump(exclude_unset=True) + async def _patch_matching( self, match: Any, @@ -257,7 +258,7 @@ async def _patch_matching( is a no-op that still returns the existing document; a missing target raises ``not_found``. """ # Only retain set fields (patch) - update_data = update.model_dump(exclude_unset=True) + update_data = self._patch_update_fields(update) existing = await self.document_model.find_one(self._scope, match, session=session) # If update is empty, return the model anyways (consistent behavior) if not update_data: From 22ca3d20081208283689dc40eab303ff8942e45e Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 19 Aug 2026 10:51:18 -0700 Subject: [PATCH 584/591] refactor(MongoDbContributionRepository): removed redundant subclass-specific methods in favor of parent class methods --- .../domains/consumers/dependencies.py | 4 +- .../domains/consumers/models.py | 5 ++ .../domains/consumers/repository.py | 67 +++---------------- .../domains/consumers/router.py | 2 +- .../db/test_consumers_repository.py | 11 +-- 5 files changed, 23 insertions(+), 66 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/consumers/dependencies.py b/mpcontribs-api/src/mpcontribs_api/domains/consumers/dependencies.py index ce53f76513..3e69d7bbb3 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/consumers/dependencies.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/consumers/dependencies.py @@ -24,8 +24,8 @@ async def get_effective_limits(user: UserDep) -> ConsumerSettings: if user.consumer_id is None: return ConsumerSettings() - override = await MongoDbConsumerRepository(user).get_by_consumer_id(user.consumer_id) - return override.settings if override is not None else ConsumerSettings() + override = await MongoDbConsumerRepository(user).get_one({"consumer_id": user.consumer_id}) + return override.settings if override and override.settings else ConsumerSettings() ConsumerLimitsDep = Annotated[ConsumerSettings, Depends(get_effective_limits)] diff --git a/mpcontribs-api/src/mpcontribs_api/domains/consumers/models.py b/mpcontribs-api/src/mpcontribs_api/domains/consumers/models.py index a4f8a543c0..6e6d218ae2 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/consumers/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/consumers/models.py @@ -52,6 +52,11 @@ class Consumer(BaseDocumentWithInput[PydanticObjectId]): consumer_id: str settings: ConsumerSettings = Field(default_factory=ConsumerSettings) + @classmethod + def identifier_fields(cls) -> frozenset[str]: + """A consumer override is keyed by Kong's ``consumer_id`` (its unique natural key).""" + return frozenset({"consumer_id"}) + @classmethod def with_defaults(cls, consumer_id: str = "") -> Consumer: """In-memory Consumer whose ``settings`` carry the env-backed default limits. diff --git a/mpcontribs-api/src/mpcontribs_api/domains/consumers/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/consumers/repository.py index 7d4f644d95..a1db8e2429 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/consumers/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/consumers/repository.py @@ -1,9 +1,5 @@ from typing import Any -from beanie import UpdateResponse -from beanie.operators import Set -from pymongo.asynchronous.client_session import AsyncClientSession - from mpcontribs_api.authz import User from mpcontribs_api.domains._shared.repository import MongoDbRepository from mpcontribs_api.domains.consumers.models import ( @@ -13,8 +9,6 @@ ConsumerOut, ConsumerPatch, ) -from mpcontribs_api.exceptions import ConflictError, NotFoundError -from mpcontribs_api.pagination import CursorParams class MongoDbConsumerRepository(MongoDbRepository[Consumer, ConsumerIn, ConsumerOut, ConsumerFilter, ConsumerPatch]): @@ -22,7 +16,9 @@ class MongoDbConsumerRepository(MongoDbRepository[Consumer, ConsumerIn, Consumer Consumer overrides are an admin-only resource: every route that reaches this repository is gated by ``require_admin``, so no per-user read scope is needed and ``_build_scope`` returns an - empty filter (admins see all overrides). + empty filter (admins see all overrides). Reads and deletes use the base repository directly + (keyed on ``consumer_id`` via ``Consumer.identifier_fields``); only the nested-``settings`` patch + shape is resource-specific. """ document_model = Consumer @@ -33,57 +29,12 @@ def _build_scope(user: User) -> dict[str, Any]: # Admin-only resource (routes enforce ``require_admin``); no visibility filter required. return {} - async def get_consumers( - self, - filter: ConsumerFilter, - pagination: CursorParams, - fields: frozenset[str] | None, - ): - """List consumer overrides. See ``get_many``.""" - return await self.get_many(pagination=pagination, filter=filter, fields=fields) - - async def get_by_consumer_id(self, consumer_id: str) -> Consumer | None: - """Return the override document for a Kong ``consumer_id``, or ``None`` if none exists.""" - return await Consumer.find_one(Consumer.consumer_id == consumer_id) + def _patch_update_fields(self, update: ConsumerPatch) -> dict[str, Any]: + """Flatten the patch to dotted ``settings.`` keys. - async def insert_one(self, in_resource: ConsumerIn) -> Consumer: - """Insert a new override, rejecting a duplicate ``consumer_id`` with a clean 409. - - The unique index on ``consumer_id`` is the hard guarantee; this pre-check turns the common - case into a readable conflict instead of a raw driver error. + The limits live under a nested ``settings`` sub-document; dotting the update makes a partial + patch change only the named limits and leave the siblings intact (a plain ``$set`` of + ``settings`` would replace the whole sub-document). """ - existing = await self.get_by_consumer_id(in_resource.consumer_id) - if existing is not None: - raise ConflictError( - "An override for this consumer already exists", - consumer_id=in_resource.consumer_id, - ) - return await super().insert_one(in_resource) - - async def patch_one( # pyright: ignore[reportIncompatibleMethodOverride] - self, identifiers: dict[str, Any], update: ConsumerPatch, session: AsyncClientSession | None = None - ) -> Consumer: - """Partially update an override's limits by identifiers. - - The limits live under a nested ``settings`` sub-document; the update is flattened to dotted - ``settings.`` keys so a partial patch changes only the named limits and leaves the - siblings intact (a plain ``$set`` of ``settings`` would replace the whole sub-document). - """ - match = self._identifier_query(identifiers) - not_found = NotFoundError(f"{self.document_model.__name__} not found", identifiers=identifiers) overrides = update.settings.model_dump(exclude_unset=True) if update.settings else {} - dotted = {f"settings.{field}": value for field, value in overrides.items()} - if not dotted: - # Empty patch is a no-op that still returns the existing document (consistent behavior). - existing = await self.document_model.find_one(self._scope, match, session=session) - if existing is None: - raise not_found - return existing - - updated = await self.document_model.find_one(self._scope, match, session=session).update( - Set(dotted), - response_type=UpdateResponse.NEW_DOCUMENT, - ) # pyright: ignore[reportGeneralTypeIssues] # beanie UpdateQuery is awaitable, but pyright doesn't see it - if updated is None: - raise not_found - return updated + return {f"settings.{field}": value for field, value in overrides.items()} diff --git a/mpcontribs-api/src/mpcontribs_api/domains/consumers/router.py b/mpcontribs-api/src/mpcontribs_api/domains/consumers/router.py index a6ebff8d76..b515422e16 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/consumers/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/consumers/router.py @@ -31,7 +31,7 @@ async def get_consumers( if fields is None: fields = list(ConsumerOut.default_fields()) selected = ConsumerOut.parse_fields(fields) - return await repo.get_consumers(filter=filter, pagination=pagination, fields=selected) + return await repo.get_many(filter=filter, pagination=pagination, fields=selected) @router.get("/{id}") diff --git a/mpcontribs-api/tests/integration/db/test_consumers_repository.py b/mpcontribs-api/tests/integration/db/test_consumers_repository.py index 99b7b14b6d..9abecdf0ba 100644 --- a/mpcontribs-api/tests/integration/db/test_consumers_repository.py +++ b/mpcontribs-api/tests/integration/db/test_consumers_repository.py @@ -25,14 +25,14 @@ def _repo() -> MongoDbConsumerRepository: # --------------------------------------------------------------------------- -# insert_one / get_by_consumer_id +# insert_one / get_one (by consumer_id) # --------------------------------------------------------------------------- class TestInsertAndLookup: async def test_insert_then_lookup_by_consumer_id(self, db): await _repo().insert_one(ConsumerIn(consumer_id="kong-1")) - found = await _repo().get_by_consumer_id("kong-1") + found = await _repo().get_one({"consumer_id": "kong-1"}) assert found is not None assert found.consumer_id == "kong-1" @@ -42,7 +42,7 @@ async def test_duplicate_consumer_id_raises_conflict(self, db): await _repo().insert_one(ConsumerIn(consumer_id="kong-dup")) async def test_lookup_missing_returns_none(self, db): - assert await _repo().get_by_consumer_id("kong-absent") is None + assert await _repo().get_one({"consumer_id": "kong-absent"}) is None async def test_partial_override_snapshots_defaults_for_siblings(self, db): # Admin overrides only max_projects; the stored document must carry a fully-resolved @@ -50,8 +50,9 @@ async def test_partial_override_snapshots_defaults_for_siblings(self, db): await _repo().insert_one( ConsumerIn(consumer_id="kong-partial", settings=ConsumerSettings(max_projects=1)) ) - stored = await _repo().get_by_consumer_id("kong-partial") + stored = await _repo().get_one({"consumer_id": "kong-partial"}) assert stored is not None + assert stored.settings is not None assert stored.settings.max_projects == 1 assert stored.settings.max_columns == get_settings().consumer.max_columns @@ -118,7 +119,7 @@ class TestDeleteConsumer: async def test_delete_removes_override(self, db): created = await _repo().insert_one(ConsumerIn(consumer_id="kong-del")) await _repo().delete_one({"id": created.id}) - assert await _repo().get_by_consumer_id("kong-del") is None + assert await _repo().get_one({"consumer_id": "kong-del"}) is None async def test_delete_missing_raises_not_found(self, db): from beanie import PydanticObjectId From 977672d2462e5be1adddff3281c4128f9775d99e Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 19 Aug 2026 11:13:01 -0700 Subject: [PATCH 585/591] refactor(Stats): removed empty() classmethod in favor of idiomatic pydantic field default declarations --- .../src/mpcontribs_api/domains/projects/models.py | 7 +------ .../tests/integration/db/test_projects_repository.py | 2 +- mpcontribs-api/tests/unit/domains/test_projects_models.py | 2 +- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py index 6b6def1fc1..df10bb5702 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py @@ -51,11 +51,6 @@ class Stats(BaseModel): attachments: int = 0 size: float = 0 - @classmethod - def empty(cls) -> Stats: - """A zeroed rollup for a project with no contributions yet.""" - return cls(columns=0, contributions=0, tables=0, structures=0, attachments=0, size=0.0) - class Reference(BaseModel): # TODO: Labels have some restrictions, not sure exactly what yet @@ -103,7 +98,7 @@ class Project(ProjectBase, BaseDocumentWithInput[ShortStr]): """Document model of what is actually stored.""" # Server-owned: derived from the project's contributions - stats: Stats = Field(default_factory=Stats.empty) + stats: Stats = Field(default_factory=Stats) columns: list[Column] = Field(default_factory=list) @classmethod diff --git a/mpcontribs-api/tests/integration/db/test_projects_repository.py b/mpcontribs-api/tests/integration/db/test_projects_repository.py index ed945c6eec..f4761f4878 100644 --- a/mpcontribs-api/tests/integration/db/test_projects_repository.py +++ b/mpcontribs-api/tests/integration/db/test_projects_repository.py @@ -584,7 +584,7 @@ async def test_upsert_update_preserves_stats_and_columns(self, db): async def test_upsert_new_starts_with_empty_stats(self, db): await _repo(ALICE).upsert_one({"id": "srv-new-empty"}, _project_in("srv-new-empty")) found = await Project.find_one(Project.id == "srv-new-empty") - assert found.stats == Stats.empty() + assert found.stats == Stats() assert found.columns == [] async def test_non_admin_cannot_approve_new_project_via_upsert(self, db): diff --git a/mpcontribs-api/tests/unit/domains/test_projects_models.py b/mpcontribs-api/tests/unit/domains/test_projects_models.py index e17fb12fdc..5a35cbdac8 100644 --- a/mpcontribs-api/tests/unit/domains/test_projects_models.py +++ b/mpcontribs-api/tests/unit/domains/test_projects_models.py @@ -288,7 +288,7 @@ def test_from_input_model_defaults(self): def test_from_input_model_starts_with_empty_server_owned_fields(self): # stats/columns aren't on the input model and default empty on the document. project = Project.from_input_model(self._make_input(), id="test-proj") - assert project.stats == Stats.empty() + assert project.stats == Stats() assert project.columns == [] From d784e0a1da26d419ccaf2b0d4654841d3aafc750 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 19 Aug 2026 11:26:41 -0700 Subject: [PATCH 586/591] refactor(Project): removed repeated class Settings that improperly overrode the ProjectBase declaration --- mpcontribs-api/src/mpcontribs_api/domains/projects/models.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py index df10bb5702..5e4a510c33 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/models.py @@ -118,10 +118,6 @@ def decode_cursor(cursor: str) -> str: def server_managed_fields(cls) -> tuple: return ("is_public", "is_approved", "stats", "mp_category") - class Settings: - name = "projects" - keep_nulls = False - class ProjectOut(DocumentOut[ShortStr]): """Full response of all public-facing fields.""" From 3ed1bc1accc02aa86afb164e36327d0da85e2903 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 19 Aug 2026 11:29:03 -0700 Subject: [PATCH 587/591] refactor(MongoDbProjectRepository): removed patch_project_with_initiative in favor of a unified, general patch implementation --- .../domains/contributions/service.py | 4 +- .../domains/projects/dependencies.py | 2 +- .../domains/projects/repository.py | 38 +++++-------------- .../domains/projects/service.py | 3 +- 4 files changed, 14 insertions(+), 33 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py index c2ab6df4de..f68773a7fc 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py @@ -117,9 +117,7 @@ async def patch_one(self, identifiers: dict[str, Any], update: ContributionPatch async def upsert_one(self, identifiers: dict[str, Any], contribution: ContributionIn) -> Contribution: """Upsert the single scoped contribution matching ``identifiers``. See repository ``upsert_one``.""" - return await self._contributions.upsert_one( - self._contributions.coerce_identifiers(identifiers), contribution - ) + return await self._contributions.upsert_one(self._contributions.coerce_identifiers(identifiers), contribution) async def delete_one(self, identifiers: dict[str, Any]) -> BulkDeleteSummary: """Delete a single contribution and its child components, matching ``identifiers``. diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/dependencies.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/dependencies.py index 24ba2c0093..393e4759e7 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/dependencies.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/dependencies.py @@ -3,8 +3,8 @@ from fastapi import Depends from mpcontribs_api.dependencies import UserDep -from mpcontribs_api.domains.initiatives.repository import InitiativeRepository from mpcontribs_api.domains.consumers.dependencies import ConsumerLimitsDep +from mpcontribs_api.domains.initiatives.repository import InitiativeRepository from mpcontribs_api.domains.projects.repository import ( MongoDbProjectRepository, ) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py index 3566674e25..073d05cd58 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py @@ -1,8 +1,6 @@ from typing import Any -from beanie import PydanticObjectId, UpdateResponse -from beanie.operators import Set -from bson import DBRef +from beanie import PydanticObjectId from pymongo import UpdateOne from pymongo.asynchronous.client_session import AsyncClientSession @@ -146,7 +144,11 @@ async def insert_project(self, id: str, project: ProjectIn) -> Project: return document async def patch_one( # pyright: ignore[reportIncompatibleMethodOverride] - self, identifiers: dict[str, Any], update: ProjectPatch, session: AsyncClientSession | None = None + self, + identifiers: dict[str, Any], + update: ProjectPatch, + session: AsyncClientSession | None = None, + extra_set: dict[str, Any] | None = None, ) -> Project: """Partially update a scoped project by id, enforcing approval rules. @@ -154,32 +156,12 @@ async def patch_one( # pyright: ignore[reportIncompatibleMethodOverride] - Resulting state must satisfy is_public <-> is_approved condition The ``initiative`` field is split out upstream in ``ProjectService.patch_one``, so it never - reaches this method; an assignment that also edits plain fields goes through - :meth:`patch_project_with_initiative` instead. + reaches this method as a bare slug; an assignment that also edits plain fields arrives with + the resolved link passed through ``extra_set`` (``{"initiative": }``) and is + written together with the plain fields in the single ``$set``. """ await self._enforce_patch_rules(identifiers["id"], update) - return await super().patch_one(identifiers, update, session=session) - - async def patch_project_with_initiative(self, id: str, update: ProjectPatch, ref: DBRef | None) -> Project: - """Atomically apply a partial project update together with its canonical initiative link. - - Args: - id (str): the id of the project to update - update (ProjectPatch): the partial update to apply; unset fields are dropped. The - ``initiative`` slug must already be stripped — the resolved ``ref`` carries the link. - ref (DBRef | None): the initiative reference to assign, or None to unassign - """ - await self._enforce_patch_rules(id, update) - data = update.model_dump(exclude_unset=True) - data["initiative"] = ref - query = self.document_model.find_one(self._scope, self._identifier_query({"id": id})).update( - Set(data), - response_type=UpdateResponse.NEW_DOCUMENT, - ) - updated = await query # pyright: ignore[reportGeneralTypeIssues] # beanie UpdateQuery is awaitable - if updated is None: - raise NotFoundError(f"{self.document_model.__name__} not found", id=id) - return updated + return await super().patch_one(identifiers, update, session=session, extra_set=extra_set) async def _enforce_patch_rules(self, id: str, update: ProjectPatch) -> None: """Enforce project patch invariants against the scoped target. diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/service.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/service.py index 067bea3a3b..adc4fe0ffd 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/service.py @@ -41,7 +41,8 @@ async def patch_one(self, identifiers: dict[str, Any], update: ProjectPatch) -> # Resolve the target link (and run the both-rights + limit checks) before touching anything. ref = await self._resolve_initiative_assignment(project_id=id, slug=slug) - return await self._projects.patch_project_with_initiative(id=id, update=ProjectPatch(**data), ref=ref) + # `initiative` is server derived, so ProjectPatch can't handle it (expects str), so hand it in extra_set + return await self._projects.patch_one(identifiers, ProjectPatch(**data), extra_set={"initiative": ref}) async def get_one(self, identifiers: dict[str, Any], fields: frozenset[str] | None) -> Project | ProjectOut | None: """Return the single scoped project matching ``identifiers`` (``{"id": ...}``).""" From 5afc70da21349084e8629eee84d3e52077ca7f4e Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 19 Aug 2026 11:31:27 -0700 Subject: [PATCH 588/591] refactor(MongoDbRepository): added `extra_sets` as an argument in `patch_one` to handle server calculated fields that don't fit within *Patch (ie. Links) --- .../src/mpcontribs_api/domains/_shared/repository.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py index cda16a5e3b..baacda8e2f 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py @@ -251,14 +251,21 @@ async def _patch_matching( update: TPatch, not_found: NotFoundError, session: AsyncClientSession | None = None, + extra_set: dict[str, Any] | None = None, ) -> TDoc: """Apply a partial update to the single scoped document matching ``match``. ``match`` is any beanie filter that keys at most one in-scope document. An empty patch is a no-op that still returns the existing document; a missing target raises ``not_found``. + + ``extra_set`` carries server-resolved fields that the patch model cannot express — e.g. a + slug that a service has already resolved to a ``DBRef`` link. Its keys are merged into the + ``$set`` after the patch dump, so a non-empty ``extra_set`` also makes the update non-empty. """ # Only retain set fields (patch) update_data = self._patch_update_fields(update) + if extra_set: + update_data |= extra_set existing = await self.document_model.find_one(self._scope, match, session=session) # If update is empty, return the model anyways (consistent behavior) if not update_data: @@ -292,6 +299,7 @@ async def patch_one( identifiers: dict[str, Any], update: TPatch, session: AsyncClientSession | None = None, + extra_set: dict[str, Any] | None = None, ) -> TDoc: """Partially update the single scoped document matching ``identifiers``. @@ -299,10 +307,12 @@ async def patch_one( identifiers (dict[str, Any]): identifier field values keyed by ``identifier_fields`` update (TPatch): the partial update to apply; unset fields are dropped session (AsyncClientSession | None): optional client session for transactions + extra_set (dict[str, Any] | None): server-resolved fields to merge into the ``$set`` + alongside the patch — for values the patch model cannot carry (e.g. a resolved link) """ query = self._identifier_query(identifiers) not_found = NotFoundError(f"{self.document_model.__name__} not found", identifiers=identifiers) - return await self._patch_matching(query, update, not_found, session=session) + return await self._patch_matching(query, update, not_found, session=session, extra_set=extra_set) def _hash_payload(self, payload: dict[str, Any], *, separators: tuple[str, str] = (",", ":")) -> str: canonical = json.dumps( From 71b04b1fd4018acb5f5608676f16ac3e273d96e9 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 19 Aug 2026 12:03:14 -0700 Subject: [PATCH 589/591] fix(Initiative): added from_input_model and fixed return type of default_fields to tuple --- .../src/mpcontribs_api/domains/initiatives/models.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/initiatives/models.py b/mpcontribs-api/src/mpcontribs_api/domains/initiatives/models.py index 10cf63180f..3f5a3db923 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/initiatives/models.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/initiatives/models.py @@ -43,6 +43,10 @@ class Settings: ] validate_on_save = True + @classmethod + def from_input_model(cls, data: InitiativeIn, owner: PrefixedEmail) -> Self: # pyright: ignore[reportIncompatibleMethodOverride] + return cls(_id=PydanticObjectId(), **data.model_dump(), owner=owner) + @classmethod def identifier_fields(cls) -> frozenset[str]: """An ``Initiative`` is uniquely identified by its globally-unique ``slug``.""" @@ -77,8 +81,8 @@ class InitiativeOut(DocumentOut[PydanticObjectId]): is_approved: bool | None = None @staticmethod - def default_fields() -> list[str]: - return ["slug", "name", "owner", "is_public", "is_approved"] + def default_fields() -> tuple[str, ...]: + return ("slug", "name", "owner", "is_public", "is_approved") class InitiativePatch(SparseFieldsModel): From 12e5f727fe947579088cf86deb33aff4ac24a1c3 Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 19 Aug 2026 12:04:38 -0700 Subject: [PATCH 590/591] refactor(MongoDbInitiativeRepository): removed `is_visible` asa useless one-line abstraction and implemente from_input_model --- .../domains/initiatives/repository.py | 19 +++---------------- .../domains/projects/service.py | 8 ++++---- .../db/test_initiatives_service.py | 2 +- 3 files changed, 8 insertions(+), 21 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/initiatives/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/initiatives/repository.py index 6c52d57304..8c3d8933bd 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/initiatives/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/initiatives/repository.py @@ -1,6 +1,5 @@ from typing import Any -from beanie import PydanticObjectId from pymongo.asynchronous.client_session import AsyncClientSession from pymongo.errors import DuplicateKeyError @@ -51,10 +50,6 @@ async def get_initiatives( """Return a scoped, filtered, paginated page of initiatives. See ``get_many``.""" return await self.get_many(pagination=pagination, filter=filter, fields=fields) - async def resolve_visible(self, slug: str) -> Initiative | None: - """Return the full scoped initiative document for ``slug`` (or None), for write-path checks.""" - return await self.document_model.find_one(self._scope, self.document_model.slug == slug) - async def insert_initiative(self, data: InitiativeIn) -> Initiative: """Create an initiative owned by the caller, enforcing the per-owner unapproved quota. @@ -76,15 +71,7 @@ async def insert_initiative(self, data: InitiativeIn) -> Initiative: limit=self._limits.max_unapproved_per_owner, ) - # ``BaseDocumentWithInput`` makes ``id`` required (no auto-default), so mint the ObjectId here - initiative = self.document_model.model_validate( - { - "_id": PydanticObjectId(), - "slug": data.slug, - "name": data.name, - "owner": self._user.username, - } - ) + initiative = self.document_model.from_input_model(data=data, owner=self._user.username) try: await initiative.insert() except DuplicateKeyError as exc: # unique slug index @@ -105,7 +92,7 @@ async def patch_one( # pyright: ignore[reportIncompatibleMethodOverride] document, and the write itself is delegated to the base :meth:`MongoDbRepository.patch_one`. """ slug = identifiers["slug"] - existing = await self.resolve_visible(slug) + existing = await self.document_model.find_one(self._scope, self.document_model.slug == slug) if existing is None: raise NotFoundError("Initiative not found", slug=slug) if not ( @@ -137,7 +124,7 @@ async def delete_one( :meth:`MongoDbRepository.delete_one`. """ slug = identifiers["slug"] - existing = await self.resolve_visible(slug) + existing = await self.document_model.find_one(self._scope, self.document_model.slug == slug) if existing is None: raise NotFoundError("Initiative not found", slug=slug) if not (self._user.is_admin or existing.owner == self._user.username): diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/service.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/service.py index adc4fe0ffd..7ae294d3ad 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/service.py @@ -66,16 +66,16 @@ async def _resolve_initiative_assignment(self, project_id: str, slug: str | None if slug is None: return None - initiative = await self._initiatives.resolve_visible(slug) - if initiative is None: + initiative = await self._initiatives.get_one({"slug": slug}) + if initiative is None or initiative.id is None: raise NotFoundError("Initiative not found or not visible", slug=slug) user = self._initiatives._user - if not (user.can_manage(id=initiative.slug, resource="initiative") or initiative.owner == user.username): + if not (user.can_manage(id=slug, resource="initiative") or initiative.owner == user.username): raise PermissionError( message="user does not have adequate acceess to this resource", required_role="initiative-owner-collaborator-or-admin", - resource_id=initiative.slug, + resource_id=slug, ) if not initiative.is_approved: diff --git a/mpcontribs-api/tests/integration/db/test_initiatives_service.py b/mpcontribs-api/tests/integration/db/test_initiatives_service.py index 785516bd7d..2a59037d42 100644 --- a/mpcontribs-api/tests/integration/db/test_initiatives_service.py +++ b/mpcontribs-api/tests/integration/db/test_initiatives_service.py @@ -171,7 +171,7 @@ async def test_approved_initiative_has_no_member_cap(self, db, monkeypatch): await _insert_project(f"appr-proj-{i}", owner=ALICE_EMAIL) await _service(ALICE).patch_one({"id": f"appr-proj-{i}"}, ProjectPatch(initiative="init-approved")) count = await MongoDbProjectRepository(ADMIN).count_initiative_members( - initiative_id=(await InitiativeRepository(ADMIN).resolve_visible("init-approved")).id, # type: ignore[union-attr] + initiative_id=(await InitiativeRepository(ADMIN).get_one({"slug": "init-approved"})).id, # type: ignore[union-attr] exclude_project_id=None, ) assert count == cap + 2 From 04a1fb9e8e6d53b35a21cd6fccc8042a48d59e7e Mon Sep 17 00:00:00 2001 From: Brendan Foley Date: Wed, 19 Aug 2026 14:15:12 -0700 Subject: [PATCH 591/591] refactor(multiple): unified crud grammar for domains all domains now expose public `*_one` and `*_many` rather than including their domain in the method names. This allows for a similar method space regardless of domain --- .../domains/_shared/components.py | 15 +- .../domains/_shared/repository.py | 21 +- .../mpcontribs_api/domains/_shared/service.py | 14 +- .../domains/attachments/router.py | 2 +- .../domains/contributions/repository.py | 81 +-- .../domains/contributions/router.py | 21 +- .../domains/contributions/service.py | 92 ++-- .../domains/initiatives/repository.py | 12 +- .../domains/initiatives/router.py | 4 +- .../domains/project_groups/repository.py | 28 +- .../domains/project_groups/router.py | 6 +- .../domains/project_groups/service.py | 4 +- .../domains/projects/repository.py | 14 +- .../mpcontribs_api/domains/projects/router.py | 2 +- .../domains/structures/router.py | 4 +- .../mpcontribs_api/domains/tables/router.py | 4 +- .../db/test_initiatives_repository.py | 2 +- .../tests/integration/test_bulk_limits.py | 8 +- .../integration/test_component_routes.py | 36 +- .../tests/integration/test_contributions.py | 37 +- .../integration/test_contributions_routes.py | 68 +-- .../tests/integration/test_initiatives.py | 4 +- .../tests/integration/test_project_groups.py | 6 +- .../tests/integration/test_projects.py | 36 +- .../unit/domains/test_component_service.py | 18 +- .../unit/domains/test_contribution_service.py | 484 +++++++++--------- .../domains/test_project_group_service.py | 26 +- 27 files changed, 480 insertions(+), 569 deletions(-) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py index fd2841eb2e..ba5bb3ff19 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/components.py @@ -36,7 +36,7 @@ async def _existing_by_md5( ).to_list() return {doc.md5: doc for doc in existing_docs} - async def insert_components( + async def insert_many( self, components: list[TIn], session: AsyncClientSession | None = None, @@ -79,21 +79,18 @@ async def insert_components( resolved = existing_by_md5 | new_by_md5 return [resolved[md5] for md5 in unique_md5s] - async def insert_component(self, component: TIn, *, session: AsyncClientSession | None = None) -> TDoc: - """Insert a single component. + async def insert_one(self, component: TIn, *, session: AsyncClientSession | None = None) -> TDoc: # pyright: ignore[reportIncompatibleMethodOverride] + """Insert a single component, deduplicated by content hash. Args: - component (TIn): the table to insert + component (TIn): the component to insert Returns: TDoc: the component actually in the database - - Raises: - AppError: If insert_one returns None, raises """ - return (await self.insert_components(components=[component], session=session))[0] + return (await self.insert_many(components=[component], session=session))[0] - async def delete_components( + async def delete_many( self, filter: TFilter, session: AsyncClientSession | None = None, diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py index baacda8e2f..925be9b060 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/repository.py @@ -185,7 +185,7 @@ async def insert_one(self, in_resource: TIn) -> TDoc: ) from exc return document - async def delete(self, filter: TFilter, session: AsyncClientSession | None = None) -> DeleteResponse: + async def delete_many(self, filter: TFilter, session: AsyncClientSession | None = None) -> DeleteResponse: """Delete every scoped document matching an arbitrary ``filter``. This is the bulk path (e.g. "delete every ProjectGroup with owner == X"). It does not raise @@ -217,25 +217,6 @@ async def delete_one( raise NotFoundError(f"{self.document_model.__name__} not found", identifiers=identifiers) return DeleteResponse.from_delete_result(result) - async def delete_by_ids(self, ids: list[Any], session: AsyncClientSession | None = None) -> DeleteResponse: - """Delete multiple scoped documents by id. - - The user scope is injected so callers cannot delete documents they are not permitted to - see; out-of-scope ids simply match nothing and are reported as zero deletions. - - Args: - ids (list[Any]): list of ids to delete - session: the session to perform the deletes within - - Returns: - DeleteResponse: the result of the deletion - """ - docs = self.document_model.find(self._scope, In(self.document_model.id, ids), session=session) - delete_result = await docs.delete_many(session=session) - if not delete_result: - raise ValidationError("DeleteResult not returned internally") - return DeleteResponse.from_delete_result(delete_result) - def _patch_update_fields(self, update: TPatch) -> dict[str, Any]: """Map a patch model to the MongoDB ``$set`` field dict. diff --git a/mpcontribs-api/src/mpcontribs_api/domains/_shared/service.py b/mpcontribs-api/src/mpcontribs_api/domains/_shared/service.py index 5f9f77e64c..9fd3fab7c5 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/_shared/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/_shared/service.py @@ -91,13 +91,13 @@ async def get_one(self, identifiers: dict[str, Any], fields: frozenset[str] | No return None return await self._components.get_one(identifiers, fields) - async def insert( + async def insert_many( self, components: list[TIn], session: AsyncClientSession | None = None, ) -> list[TDoc]: - """Bulk-insert components, deduplicated by content hash. See ``insert_components``.""" - return await self._components.insert_components(components=components, session=session) + """Bulk-insert components, deduplicated by content hash. See repository ``insert_many``.""" + return await self._components.insert_many(components=components, session=session) async def patch_one(self, identifiers: dict[str, Any], update: TPatch) -> TDoc: """Partially update a component matching ``identifiers``, gated by contribution reachability. @@ -136,7 +136,7 @@ async def download( restrict_ids=allowed, ) - async def delete(self, filter: TFilter) -> ComponentDeleteResponse: + async def delete_many(self, filter: TFilter) -> ComponentDeleteResponse: """Delete components matching ``filter`` that are reachable and globally unreferenced. Args: @@ -152,7 +152,11 @@ async def delete(self, filter: TFilter) -> ComponentDeleteResponse: return ComponentDeleteResponse(num_deleted=0) referenced = await self._contributions.referenced_component_ids(self._ref_field, list(reachable), scoped=False) deletable = [cid for cid in reachable if cid not in referenced] - num_deleted = (await self._components.delete_by_ids(deletable)).num_deleted if deletable else 0 + num_deleted = ( + (await self._components.delete_many(type(filter)(id__in=deletable))).num_deleted # pyright: ignore[reportCallIssue] + if deletable + else 0 + ) return ComponentDeleteResponse( num_deleted=num_deleted, num_skipped=len(referenced), diff --git a/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py b/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py index 2dda882c10..1dc965e885 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/attachments/router.py @@ -70,7 +70,7 @@ async def download_attachment( @router.delete("", response_model=ComponentDeleteResponse, dependencies=[Depends(require_user)]) async def delete_attachments(service: AttachmentServiceDep, filter: AttachmentFilter = FilterDepends(AttachmentFilter)): - return await service.delete(filter=filter) + return await service.delete_many(filter=filter) @router.delete("/{id}", response_model=ComponentDeleteResponse, dependencies=[Depends(require_user)]) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py index c098181490..0af02f0abe 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/repository.py @@ -6,7 +6,6 @@ from beanie.operators import Set from pymongo.asynchronous.client_session import AsyncClientSession from pymongo.errors import DuplicateKeyError -from pymongo.results import DeleteResult from types_aiobotocore_s3 import S3Client from mpcontribs_api.authz import User @@ -30,7 +29,6 @@ merge_contribution_columns, ) from mpcontribs_api.exceptions import ConflictError, NotFoundError, PermissionError -from mpcontribs_api.pagination import CursorParams # Sentinel for "leave unique_value untouched" on patch (distinct from a real None value). _UNSET: Any = object() @@ -92,15 +90,6 @@ async def count_contributions_for_project(self, project_name: str) -> int: """ return await self.document_model.find(self.document_model.project == project_name).count() - async def get_contributions( - self, - filter: ContributionFilter, - pagination: CursorParams | None = None, - fields: frozenset[str] | None = None, - ): - """Query the Contribution collection, scoped to the current user. See ``get_many``.""" - return await self.get_many(pagination=pagination, filter=filter, fields=fields) - async def patch_one( # pyright: ignore[reportIncompatibleMethodOverride] self, identifiers: dict[str, Any], @@ -145,18 +134,7 @@ async def patch_one( # pyright: ignore[reportIncompatibleMethodOverride] identifiers=identifiers, ) from err - async def delete_contributions( - self, - filter: ContributionFilter, - ) -> DeleteResult | None: - """Bulk deletion of Contributions described by the filter. - - Args: - filter (ContribtionFilter): the filter to use to identify contributions to delete - """ - return await filter.filter(self.document_model.find(self._scope)).delete_many() - - async def bulk_update( + async def patch_many( self, filter: ContributionFilter, fields: dict[str, Any], @@ -187,9 +165,10 @@ async def bulk_update( matched=result.matched_count, modified=result.modified_count, projects=sorted(projects) ) - async def get_contribution_ids( + async def list_ids( # pyright: ignore[reportIncompatibleMethodOverride] self, filter: ContributionFilter, + session: AsyncClientSession | None = None, ) -> list[PydanticObjectId]: """Return the ids of scoped rows matching ``filter``. @@ -199,6 +178,7 @@ async def get_contribution_ids( Args: filter: the caller-supplied query, applied on top of the user scope + session: unused; accepted to match the base ``list_ids`` signature """ criteria: list[Any] = [] if self._scope: @@ -207,7 +187,7 @@ async def get_contribution_ids( collection = self.document_model.get_pymongo_collection() return [doc["_id"] async for doc in collection.find(query, {"_id": 1})] - async def insert_many_contributions( + async def insert_many( # pyright: ignore[reportIncompatibleMethodOverride] self, docs: list[Contribution], session: AsyncClientSession | None = None, @@ -220,7 +200,7 @@ async def insert_many_contributions( """ return await self.document_model.insert_many(docs, ordered=False, session=session) - async def insert_contribution( + async def insert_one( # pyright: ignore[reportIncompatibleMethodOverride] self, doc: Contribution, session: AsyncClientSession | None = None, @@ -328,26 +308,23 @@ async def aggregate_project_stats(self, project_id: str) -> ProjectAggregate: agg.columns = finalize_columns(acc) return agg - async def upsert_one( + async def upsert_one( # pyright: ignore[reportIncompatibleMethodOverride] self, identifiers: dict[str, Any], contribution: ContributionIn, + unique_value: Scalar | None = _UNSET, session: AsyncClientSession | None = None, ) -> Contribution: - """Atomically upsert a Contribution by its full identity. - - Relies on the unique index over (project, material_id, chemical_system_id, formula, - unique_value, condition_key) so that concurrent requests targeting the same identity cannot both win the - insert branch. Fields the caller did not set are not touched (partial update). On insert a - fresh Contribution document is written with ``is_public=False``. + """Atomically upsert a single Contribution, keyed by the shape of ``identifiers``. - Args: - identifiers: the identity dict ContributionIn.identity_dict(unique_value) returns - contribution: the input payload to upsert - - Returns: - Contribution: the document as it stands after the operation + Relies on the unique index over the identity fields as the concurrency tiebreaker. + On insert a fresh document is written with ``is_public=False``. """ + if identifiers.keys() == {"id"}: + return await self._upsert_by_id( + identifiers["id"], contribution, None if unique_value is _UNSET else unique_value + ) + project = str(identifiers["project"]) # Make sure the user is allowed to upsert a contribution under the provided project if not self._user.can_write(project): @@ -373,31 +350,13 @@ async def upsert_one( result = await query # pyright: ignore[reportGeneralTypeIssues] # beanie UpdateQuery is awaitable, but pyright doesn't see it return cast(Contribution, result) # upsert always returns the resulting document - async def upsert_contribution_by_id( + async def _upsert_by_id( self, id: str, contribution: ContributionIn, unique_value: Scalar | None = None, - ): - """Upserts a single Contribution by its Mongo ``_id``. - - If a Contribution with this id exists it is updated, otherwise inserted. ``unique_value`` is - server-resolved by the service from the project's ``unique_column`` and stamped on the doc so - the identity index stays correct. Because it is server-owned it is forced into the ``$set`` - (bypassing ``exclude_none``), so re-resolving to ``None`` clears a previously-stored value on - update rather than leaving it stale. - - Args: - id (str): the id of the Contribution to upsert - contribution (ContributionIn): the Contribution to be upserted - unique_value: the resolved identity value to stamp on the document - - Returns: - Contribution: the upserted document - - Raises: - PermissionError: if the caller is not authorized to write to ``contribution.project`` - """ + ) -> Contribution: + """Upsert a single Contribution keyed on its Mongo ``_id`` (see :meth:`upsert_one`).""" if not self._user.can_write(contribution.project): raise PermissionError(f"not authorized to write to project '{contribution.project}'") @@ -412,7 +371,7 @@ async def upsert_contribution_by_id( try: query = self.document_model.find_one( self._scope, - self.document_model.id == self._convert_object_id(id), + self.document_model.id == oid, ).upsert( Set(update_data), on_insert=doc, diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py index 7ac123ea31..a62e425929 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/router.py @@ -58,7 +58,7 @@ async def get_contributions( fields: FieldSelector = None, ): selected = ContributionOut.parse_fields(fields) - return await repo.get_contributions(pagination=pagination, filter=filter, fields=selected) + return await repo.get_many(pagination=pagination, filter=filter, fields=selected) @router.delete("", response_model=DeleteResponse, dependencies=[Depends(require_user)]) @@ -66,10 +66,7 @@ async def delete_contributions( repo: ContributionDep, filter: ContributionFilter = FilterDepends(ContributionFilter), ) -> DeleteResponse: - # The repository returns a raw pymongo DeleteResult (or None when the filter matched nothing); - # convert it to the typed DeleteResponse so the endpoint has a stable, serializable contract. - result = await repo.delete_contributions(filter=filter) - return DeleteResponse.from_delete_result(result) if result is not None else DeleteResponse(num_deleted=0) + return await repo.delete_many(filter=filter) @router.patch("", dependencies=[Depends(require_user)]) @@ -87,7 +84,7 @@ async def patch_contributions( ``data`` deep-merges into each row's stored ``data`` by default Pass ``?replace_data=true`` to overwrite the whole ``data`` dict instead. """ - return await service.bulk_update(filter=filter, update=body, replace_data=replace_data) + return await service.patch_many(filter=filter, update=body, replace_data=replace_data) # TODO: Might want to take contributions in from request body and run model_validate_json on it (much faster) @@ -97,7 +94,7 @@ async def insert_contributions( contributions: list[ContributionIn], ): _enforce_bulk_limit(contributions) - return await service.insert_contributions(contributions=contributions) + return await service.insert_many(contributions=contributions) @router.put("", response_model=BulkWriteSummary[Contribution], dependencies=[Depends(require_user)]) @@ -106,7 +103,7 @@ async def upsert_contributions( contributions: list[ContributionIn], ): _enforce_bulk_limit(contributions) - return await service.upsert_contributions(contributions=contributions) + return await service.upsert_many(contributions=contributions) @router.get("/download/{short_mime}") @@ -158,13 +155,13 @@ async def get_one( @router.put("/{id}", dependencies=[Depends(require_user)]) async def upsert_one(service: ContributionServiceDep, id: str, contribution: ContributionIn): # The by-id upsert resolves the server-owned ``unique_value`` and enforces the unapproved quota - # (see ``ContributionService.upsert_contribution_by_id``), which the generic identity upsert does not. - return await service.upsert_contribution_by_id(id, contribution) + # (see ``ContributionService.upsert_one``), which the generic identity upsert does not. + return await service.upsert_one({"id": id}, contribution) @router.patch("/{id}", dependencies=[Depends(require_user)]) async def patch_one(service: ContributionServiceDep, id: str, update: ContributionPatch, replace_data: bool = False): # The by-id patch re-resolves ``unique_value`` and validates the identifier hierarchy against the - # merged state (see ``ContributionService.patch_contribution_by_id``); ``?replace_data=true`` + # merged state (see ``ContributionService.patch_one``); ``?replace_data=true`` # overwrites the whole ``data`` dict instead of deep-merging. - return await service.patch_contribution_by_id(id, update=update, replace_data=replace_data) + return await service.patch_one({"id": id}, update=update, replace_data=replace_data) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py index f68773a7fc..cc16bb719f 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/contributions/service.py @@ -21,6 +21,7 @@ ) from mpcontribs_api.domains._shared.repository import MongoDbRepository from mpcontribs_api.domains._shared.units import QuantityLeaf +from mpcontribs_api.domains.attachments.models import AttachmentFilter from mpcontribs_api.domains.attachments.repository import MongoDbAttachmentRepository from mpcontribs_api.domains.consumers.models import ConsumerSettings from mpcontribs_api.domains.contributions.data import validate_contribution_data @@ -38,9 +39,9 @@ from mpcontribs_api.domains.contributions.repository import MongoDbContributionRepository from mpcontribs_api.domains.projects.models import Column, Stats from mpcontribs_api.domains.projects.repository import MongoDbProjectRepository -from mpcontribs_api.domains.structures.models import Structure +from mpcontribs_api.domains.structures.models import Structure, StructureFilter from mpcontribs_api.domains.structures.repository import MongoDbStructureRepository -from mpcontribs_api.domains.tables.models import Table +from mpcontribs_api.domains.tables.models import Table, TableFilter from mpcontribs_api.domains.tables.repository import MongoDbTableRepository from mpcontribs_api.exceptions import AppError, ConflictError, NotFoundError, PermissionError, ValidationError from mpcontribs_api.pagination import CursorParams @@ -111,20 +112,12 @@ async def get_one( """ return await self._contributions.get_one(self._contributions.coerce_identifiers(identifiers), fields) - async def patch_one(self, identifiers: dict[str, Any], update: ContributionPatch) -> Contribution: - """Partially update the single scoped contribution matching ``identifiers``.""" - return await self._contributions.patch_one(self._contributions.coerce_identifiers(identifiers), update) - - async def upsert_one(self, identifiers: dict[str, Any], contribution: ContributionIn) -> Contribution: - """Upsert the single scoped contribution matching ``identifiers``. See repository ``upsert_one``.""" - return await self._contributions.upsert_one(self._contributions.coerce_identifiers(identifiers), contribution) - async def delete_one(self, identifiers: dict[str, Any]) -> BulkDeleteSummary: """Delete a single contribution and its child components, matching ``identifiers``. Accepts either the bare ``{"id": ...}`` form or the semantic ``{"project", "identifier", "version"}`` set. Cascades component deletion via - :meth:`delete_contributions` so children are never orphaned; a missing target is a zero-count + :meth:`delete_many` so children are never orphaned; a missing target is a zero-count result (mirroring the bulk delete path, which does not 404). """ identifiers = self._contributions.coerce_identifiers(identifiers) @@ -135,7 +128,7 @@ async def delete_one(self, identifiers: dict[str, Any]) -> BulkDeleteSummary: if existing is None: return BulkDeleteSummary(num_deleted=0, num_children_deleted=0) filter = ContributionFilter(id=existing.id) - return await self.delete_contributions(filter) + return await self.delete_many(filter) async def _unapproved_stored_count(self, project_id: str) -> int | None: """Contributions already stored for an unapproved ``project_id``, else ``None``. @@ -151,7 +144,7 @@ async def _unapproved_stored_count(self, project_id: str) -> int | None: # same project can overshoot the cap by a bounded amount. Acceptable for an anti-abuse quota. return await self._contributions.count_contributions_for_project(project_id) - async def insert_contributions( + async def insert_many( self, contributions: list[ContributionIn], ) -> BulkWriteSummary[Contribution]: @@ -534,7 +527,7 @@ async def _insert_no_components( doc.condition_key = item.condition_key docs.append(doc) try: - await self._contributions.insert_many_contributions(docs) + await self._contributions.insert_many(docs) return [(item.index, doc) for item, doc in zip(items, docs, strict=True)], [] except BulkWriteError as exc: write_errors = exc.details.get("writeErrors", []) if exc.details else [] @@ -619,8 +612,8 @@ async def _txn(s: AsyncClientSession) -> list[Contribution]: async def _do_insert_group(self, group: list[PreparedWrite], session: AsyncClientSession) -> list[Contribution]: """Perform the insert of Contributions and their components within a single session.""" template = group[0].contribution - structures = await self._structures.insert_components(template.structures or [], session=session) - tables = await self._tables.insert_components(template.tables or [], session=session) + structures = await self._structures.insert_many(template.structures or [], session=session) + tables = await self._tables.insert_many(template.tables or [], session=session) struct_links = cast(list[Link[Structure]] | None, structures or None) table_links = cast(list[Link[Table]] | None, tables or None) inserted: list[Contribution] = [] @@ -630,11 +623,11 @@ async def _do_insert_group(self, group: list[PreparedWrite], session: AsyncClien doc.condition_key = item.condition_key doc.structures = struct_links doc.tables = table_links - inserted.append(await self._contributions.insert_contribution(doc, session=session)) + inserted.append(await self._contributions.insert_one(doc, session=session)) return inserted # TODO: Allow components to be upserted - async def upsert_contributions(self, contributions: list[ContributionIn]) -> BulkWriteSummary[Contribution]: + async def upsert_many(self, contributions: list[ContributionIn]) -> BulkWriteSummary[Contribution]: """Upsert contributions by their identifying fields, reporting per-item outcomes. Components (structures, tables, attachments) must be managed via their respective @@ -646,7 +639,7 @@ async def upsert_contributions(self, contributions: list[ContributionIn]) -> Bul race past the find branch — the unique index over those fields is the tiebreaker. Concurrent upserts within a batch are bounded by ``settings.mongo.max_concurrent_transactions``. A single item failing does not fail the batch: it is reported in ``failed`` while the others - still commit (mirroring ``insert_contributions``). + still commit (mirroring ``insert_many``). Args: contributions: contributions to upsert; must not include nested components @@ -687,7 +680,7 @@ async def _bounded_upsert(item: PreparedWrite) -> Contribution | BulkFailure: await self.update_project({doc.project for doc in succeeded}) return BulkWriteSummary[Contribution](total=len(contributions), succeeded=succeeded, failed=failed) - async def bulk_update( + async def patch_many( self, filter: ContributionFilter, update: ContributionPatch, @@ -703,7 +696,7 @@ async def bulk_update( - **Fast path** — the patch touches no identity input. A single ``$set`` is applied to every matched row in one ``update_many``. - **Per-row path** — the patch changes an Identifer field (or ``data``). Each matched row is - patched individually via ``patch_contribution_by_id`` and any per-row conflict is reported + patched individually via ``patch_one`` and any per-row conflict is reported in ``failed``. A ``data`` patch deep-merges into each row's stored ``data`` by default (unmentioned leaves @@ -730,7 +723,7 @@ async def bulk_update( touches_identity = bool(ContributionIdentity.model_fields() & fields.keys()) or "data" in fields if not touches_identity: # No identity/unique_value recompute needed, so a uniform $set is safe. - summary = await self._contributions.bulk_update(filter, fields) + summary = await self._contributions.patch_many(filter, fields) await self.update_project(project_ids=summary.projects) return summary @@ -747,7 +740,7 @@ async def _bulk_patch_per_row( Concurrently validates reach contribution's identity, reporting failures in ``BulkUpdateSummary.failed``. """ - ids = await self._contributions.get_contribution_ids(filter) + ids = await self._contributions.list_ids(filter) if not ids: return BulkUpdateSummary(matched=0, modified=0, projects=[]) @@ -756,7 +749,7 @@ async def _bulk_patch_per_row( async def _patch_one(index: int, oid: PydanticObjectId) -> Contribution | BulkFailure: async with sem: try: - return await self.patch_contribution_by_id(str(oid), update, replace_data=replace_data) + return await self.patch_one({"id": str(oid)}, update, replace_data=replace_data) except Exception as exc: logger.info("bulk_patch_item_failed", id=str(oid)) return bulk_failure_from_exception(index, {"id": str(oid)}, exc) @@ -781,11 +774,17 @@ async def _resolve_unique_value(self, project: str, data: dict | None) -> Scalar return None return extract_unique_value(data, unique_column) - async def upsert_contribution_by_id(self, id: str, contribution: ContributionIn) -> Contribution: - """Upsert a single contribution by Mongo id, resolving its server-owned ``unique_value``.""" + async def upsert_one(self, identifiers: dict[str, Any], contribution: ContributionIn) -> Contribution: + """Upsert the single scoped contribution matching ``identifiers``, resolving ``unique_value``. + + The router upserts by ``{"id": ...}``. The server-owned ``unique_value`` (from the project's + ``unique_column``) is resolved and stamped so the identity index stays correct, and an + unapproved project's contribution cap is enforced when the upsert would insert a new document. + """ if not self._user.can_write(contribution.project): raise PermissionError(f"not authorized to write to project '{contribution.project}'") - existing = await self._contributions.get_one(self._contributions.coerce_identifiers({"id": id}), None) + identifiers = self._contributions.coerce_identifiers(identifiers) + existing = await self._contributions.get_one(identifiers, None) if existing is None: stored = await self._unapproved_stored_count(contribution.project) cap = self._limits.max_unapproved_contributions_per_project @@ -796,12 +795,12 @@ async def upsert_contribution_by_id(self, id: str, contribution: ContributionIn) max_allowed=cap, ) unique_value = await self._resolve_unique_value(contribution.project, contribution.data) - return await self._contributions.upsert_contribution_by_id(id, contribution, unique_value) + return await self._contributions.upsert_one(identifiers, contribution, unique_value) - async def patch_contribution_by_id( - self, id: str, update: ContributionPatch, *, replace_data: bool = False + async def patch_one( + self, identifiers: dict[str, Any], update: ContributionPatch, *, replace_data: bool = False ) -> Contribution: - """Patch a single contribution by id. + """Partially update the single scoped contribution matching ``identifiers``. Re-reads the existing document when the patch touches identity inputs, to (a) recompute ``unique_value`` when ``data``/``project`` change and (b) validate the identifier hierarchy @@ -815,19 +814,20 @@ async def patch_contribution_by_id( re-validated strictly (the permissive patch validator allows leaf fragments a full doc may not). ``unique_value`` is resolved against the same post-write view the repository will persist. """ + identifiers = self._contributions.coerce_identifiers(identifiers) set_fields = update.model_dump(exclude_unset=True) touches_unique = "data" in set_fields or "project" in set_fields touches_identity = bool(ContributionIdentity.HIERARCHY_FIELDS & set_fields.keys()) if not touches_unique and not touches_identity: - return await self._contributions.patch_one(self._contributions.coerce_identifiers({"id": id}), update) + return await self._contributions.patch_one(identifiers, update) if replace_data and set_fields.get("data") is not None: # A whole-dict overwrite must satisfy the strict insert-path rules (no leaf fragments). validate_contribution_data(set_fields["data"]) - existing = await self._contributions.get_one(self._contributions.coerce_identifiers({"id": id}), None) + existing = await self._contributions.get_one(identifiers, None) if existing is None or existing.project is None: - raise NotFoundError(f"contribution '{id}' not found") + raise NotFoundError("contribution not found", identifiers=identifiers) if touches_identity: self._validate_identifier_hierarchy_merged( @@ -837,7 +837,7 @@ async def patch_contribution_by_id( existing_formula=existing.formula, ) if not touches_unique: - return await self._contributions.patch_one(self._contributions.coerce_identifiers({"id": id}), update) + return await self._contributions.patch_one(identifiers, update) project = set_fields.get("project") or existing.project # Resolve unique_value against the data the write will actually leave behind: the merged view @@ -850,7 +850,7 @@ async def patch_contribution_by_id( data = QuantityLeaf.merge_data(existing.data, set_fields["data"]) unique_value = await self._resolve_unique_value(project, data) return await self._contributions.patch_one( - self._contributions.coerce_identifiers({"id": id}), + identifiers, update, unique_value=unique_value, replace_data=replace_data, @@ -877,8 +877,16 @@ def _validate_identifier_hierarchy_merged( formula = set_fields["formula"] if "formula" in set_fields else existing_formula ContributionIdentity.check_hierarchy(material_id, chemical_system_id, formula) - async def delete_contributions(self, filter: ContributionFilter) -> BulkDeleteSummary: - """Delete a contribution and all of its child components + # Filter type per child component field, used to delete a batch of child ids through the + # canonical ``delete_many(filter)`` path (id-list deletes go through ``id__in``). + _CHILD_FILTERS: dict[str, type] = { + "structures": StructureFilter, + "tables": TableFilter, + "attachments": AttachmentFilter, + } + + async def delete_many(self, filter: ContributionFilter) -> BulkDeleteSummary: + """Delete contributions matching ``filter`` and all of their child components. Doesn't guarantee complete atomicity, but prevents orphaned children by deleting components first. @@ -896,7 +904,7 @@ async def delete_contributions(self, filter: ContributionFilter) -> BulkDeleteSu # Loop through cursor rather than materialize arbitrary number of Contributions while True: # Since we are deleting everything matching filter, we can continuously get the 1st page - page = await self._contributions.get_contributions( + page = await self._contributions.get_many( pagination=CursorParams(cursor=None, limit=100), filter=filter, ) @@ -906,15 +914,15 @@ async def delete_contributions(self, filter: ContributionFilter) -> BulkDeleteSu for field, repo in self._children.items(): ids = [link.ref.id for c in page.items for link in (getattr(c, field) or [])] if ids: - deleted_components = await repo.delete_by_ids(ids) + deleted_components = await repo.delete_many(self._CHILD_FILTERS[field](id__in=ids)) num_deleted_components += deleted_components.num_deleted if deleted_components else 0 # Delete Contributions in this batch by ID # need to make a new filter so we don't eagerly delete all contributions before their components are deleted - deleted_contribs = await self._contributions.delete_contributions( + deleted_contribs = await self._contributions.delete_many( ContributionFilter(id__in=[cast(PydanticObjectId, c.id) for c in page.items]) ) - num_deleted_contributions += deleted_contribs.deleted_count if deleted_contribs else 0 + num_deleted_contributions += deleted_contribs.num_deleted if deleted_contribs else 0 if not page.items: break await self.update_project(affected_projects) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/initiatives/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/initiatives/repository.py index 8c3d8933bd..a2b137cd7a 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/initiatives/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/initiatives/repository.py @@ -15,7 +15,6 @@ InitiativePatch, ) from mpcontribs_api.exceptions import ConflictError, NotFoundError, PermissionError, ValidationError -from mpcontribs_api.pagination import CursorParams, Page class InitiativeRepository( @@ -41,16 +40,7 @@ def _build_scope(user: User) -> dict[str, Any]: ors.append({"slug": {"$in": sorted(slugs)}}) return {"$or": ors} - async def get_initiatives( - self, - pagination: CursorParams, - filter: InitiativeFilter, - fields: frozenset[str] | None, - ) -> Page[InitiativeOut]: - """Return a scoped, filtered, paginated page of initiatives. See ``get_many``.""" - return await self.get_many(pagination=pagination, filter=filter, fields=fields) - - async def insert_initiative(self, data: InitiativeIn) -> Initiative: + async def insert_one(self, data: InitiativeIn) -> Initiative: # pyright: ignore[reportIncompatibleMethodOverride] """Create an initiative owned by the caller, enforcing the per-owner unapproved quota. ``owner`` is forced to the caller and the initiative starts unapproved and private. A diff --git a/mpcontribs-api/src/mpcontribs_api/domains/initiatives/router.py b/mpcontribs-api/src/mpcontribs_api/domains/initiatives/router.py index 8a41815ae6..9daf7b2dd5 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/initiatives/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/initiatives/router.py @@ -26,7 +26,7 @@ async def get_initiatives( ): """Return paginated initiatives matching a filter, scoped to the caller.""" selected = InitiativeOut.parse_fields(fields) - return await repo.get_initiatives(pagination=pagination, filter=filter, fields=selected) + return await repo.get_many(pagination=pagination, filter=filter, fields=selected) @router.get("/{slug}") @@ -52,7 +52,7 @@ async def insert_initiative( Starts unapproved and private. Rejected with 409 if the caller already owns the maximum number of unapproved initiatives, or if the slug is already taken. """ - return await repo.insert_initiative(data=initiative) + return await repo.insert_one(data=initiative) @router.patch("/{slug}", response_model=InitiativeOut, dependencies=[Depends(require_user)]) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/project_groups/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/project_groups/repository.py index 31ed1f129d..f36418d6cc 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/project_groups/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/project_groups/repository.py @@ -18,7 +18,6 @@ ProjectGroupPatch, ) from mpcontribs_api.exceptions import NotFoundError, PermissionError -from mpcontribs_api.pagination import CursorParams, Page class ProjectGroupRepository( @@ -45,24 +44,6 @@ def _build_scope(user: User) -> dict[str, Any]: ors.append({"_id": {"$in": sorted(granted)}}) return {"$or": ors} - async def get_project_groups( - self, - pagination: CursorParams, - filter: ProjectGroupFilter, - fields: frozenset[str] | None, - ) -> Page[ProjectGroupOut]: - """Return paginated project groups matching a filter. - - Args: - pagination (CursorParams): arguments for cursor-based pagination - filter (ProjectGroupFilter): optional filters to select ProjectGroups - fields (frozenset[str] | None): the fields to return to a user - """ - return await self.get_many(pagination=pagination, filter=filter, fields=fields) - - async def insert_project_group(self, project_group: ProjectGroupIn) -> ProjectGroup: - return await self.insert_one(in_resource=project_group) - async def delete_one( self, identifiers: dict[str, Any], session: AsyncClientSession | None = None ) -> DeleteResponse: @@ -81,15 +62,18 @@ async def delete_one( raise PermissionError(required_role="owner-or-admin") return await super().delete_one(identifiers, session=session) - async def delete_project_groups(self, filter: ProjectGroupFilter) -> DeleteResponse: + async def delete_many( # pyright: ignore[reportIncompatibleMethodOverride] + self, filter: ProjectGroupFilter, session: AsyncClientSession | None = None + ) -> DeleteResponse: """Bulk-delete project groups matching ``filter``, restricted to the caller's own. A non-admin's bulk delete is scoped to their own groups (overriding any ``owner`` in the - filter) so it can never remove public groups belonging to others. See ``delete``. + filter) so it can never remove public groups belonging to others. The write is delegated to + the base :meth:`MongoDbRepository.delete_many`. """ if not self._user.is_admin: filter.owner = self._user.username - return await self.delete(filter) + return await super().delete_many(filter, session=session) async def add_project_refs( self, diff --git a/mpcontribs-api/src/mpcontribs_api/domains/project_groups/router.py b/mpcontribs-api/src/mpcontribs_api/domains/project_groups/router.py index 5854180d92..2192156301 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/project_groups/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/project_groups/router.py @@ -36,7 +36,7 @@ async def get_project_groups( fields (FieldSelector): the fields to return to a user """ selected = ProjectGroupOut.parse_fields(fields) - return await repo.get_project_groups(pagination=pagination, filter=filter, fields=selected) + return await repo.get_many(pagination=pagination, filter=filter, fields=selected) @router.get("/item") @@ -74,7 +74,7 @@ async def insert_project_group( service (ProjectGroupServiceDep): the project group service we depend on project_group (ProjectGroupIn): the project group to insert """ - return await service.insert(project_group=project_group) + return await service.insert_one(project_group=project_group) @router.patch("/item", response_model=ProjectGroupOut, dependencies=[Depends(require_user)]) @@ -125,7 +125,7 @@ async def delete_project_groups( repo (ProjectGroupDep): the project group repo we depend on filter (ProjectGroupFilter): the query selecting which project groups to delete """ - return await repo.delete_project_groups(filter=filter) + return await repo.delete_many(filter=filter) @router.post("/item/projects", response_model=BulkWriteSummary[str], dependencies=[Depends(require_user)]) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/project_groups/service.py b/mpcontribs-api/src/mpcontribs_api/domains/project_groups/service.py index be62035cd5..87d1b7aaeb 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/project_groups/service.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/project_groups/service.py @@ -35,7 +35,7 @@ async def _project_exists(self, project_id: ShortStr) -> bool: """Whether a project with ``project_id`` exists and is visible to the caller.""" return await self._projects.get_one({"id": project_id}, fields=frozenset({"id"})) is not None - async def insert(self, project_group: ProjectGroupIn) -> ProjectGroup: + async def insert_one(self, project_group: ProjectGroupIn) -> ProjectGroup: """Insert a new group after verifying every referenced project exists and is visible. Non-admins are set as owner automatically, while admins can specify owners. @@ -46,7 +46,7 @@ async def insert(self, project_group: ProjectGroupIn) -> ProjectGroup: missing = [pid for pid in project_group.projects if not await self._project_exists(pid)] if missing: raise NotFoundError("One or more projects not found or not visible", ids=missing) - return await self._groups.insert_project_group(project_group) + return await self._groups.insert_one(in_resource=project_group) async def get_one(self, identifiers: dict[str, Any], fields: frozenset[str] | None) -> ProjectGroupOut | None: """Return the single group matching ``identifiers`` (``{"name", "owner"}`` or ``{"id"}``).""" diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py index 073d05cd58..de31d1d846 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/repository.py @@ -18,7 +18,6 @@ Stats, ) from mpcontribs_api.exceptions import ConflictError, NotFoundError, PermissionError, ValidationError -from mpcontribs_api.pagination import CursorParams class MongoDbProjectRepository(MongoDbRepository[Project, ProjectIn, ProjectOut, ProjectFilter, ProjectPatch]): @@ -67,15 +66,6 @@ async def _check_num_projects(self, owner: str): num_projects=result, ) - async def get_projects( - self, - filter: ProjectFilter, - pagination: CursorParams, - fields: frozenset[str] | None, - ): - """Query the Project collection, scoped to the current user. See ``get_many``.""" - return await self.get_many(pagination=pagination, filter=filter, fields=fields) - async def unique_columns_by_id(self, ids: list[str]) -> dict[str, str | None]: """Return ``{project_id: unique_column}`` for the given project ids, scoped to the user. @@ -129,11 +119,11 @@ async def set_stats_and_columns(self, updates: dict[str, tuple[Stats, list[Colum ] await self.document_model.get_pymongo_collection().bulk_write(ops, ordered=False) - async def insert_project(self, id: str, project: ProjectIn) -> Project: + async def insert_one(self, id: str, project: ProjectIn) -> Project: # pyright: ignore[reportIncompatibleMethodOverride] """Insert a new project under ``id`` (supplied by the caller), rejecting a duplicate id. Projects carry a meaningful ``ShortStr`` id that is not part of the input body, so — unlike - the generic ``insert_one`` — the id is passed explicitly and stamped onto the document here. + the generic base ``insert_one`` — the id is passed explicitly and stamped onto the document here. """ await self._check_num_projects(project.owner) document = Project.from_input_model(project, id=id) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py index 4d4c8be8e6..09f7c6bb67 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/projects/router.py @@ -37,7 +37,7 @@ async def get_projects( list[ProjectSummary]: a list of smaller project payloads """ selected = ProjectOut.parse_fields(fields) - return await repo.get_projects(filter=filter, pagination=pagination, fields=selected) + return await repo.get_many(filter=filter, pagination=pagination, fields=selected) @router.get("/{id}") diff --git a/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py b/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py index 998021ebc3..f9f83c69ba 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/structures/router.py @@ -74,12 +74,12 @@ async def insert_structures( service: StructureServiceDep, structures: list[StructureIn], ): - return await service.insert(components=structures) + return await service.insert_many(components=structures) @router.delete("", response_model=ComponentDeleteResponse, dependencies=[Depends(require_user)]) async def delete_structures(service: StructureServiceDep, filter: StructureFilter = FilterDepends(StructureFilter)): - return await service.delete(filter=filter) + return await service.delete_many(filter=filter) @router.delete("/{id}", response_model=ComponentDeleteResponse, dependencies=[Depends(require_user)]) diff --git a/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py b/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py index a9d40f2436..3f2bdff6df 100644 --- a/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py +++ b/mpcontribs-api/src/mpcontribs_api/domains/tables/router.py @@ -74,12 +74,12 @@ async def insert_tables( service: TableServiceDep, tables: list[TableIn], ): - return await service.insert(components=tables) + return await service.insert_many(components=tables) @router.delete("", response_model=ComponentDeleteResponse, dependencies=[Depends(require_user)]) async def delete_tables(service: TableServiceDep, filter: TableFilter = FilterDepends(TableFilter)): - return await service.delete(filter=filter) + return await service.delete_many(filter=filter) @router.delete("/{id}", response_model=ComponentDeleteResponse, dependencies=[Depends(require_user)]) diff --git a/mpcontribs-api/tests/integration/db/test_initiatives_repository.py b/mpcontribs-api/tests/integration/db/test_initiatives_repository.py index 5881002c02..d5151ba947 100644 --- a/mpcontribs-api/tests/integration/db/test_initiatives_repository.py +++ b/mpcontribs-api/tests/integration/db/test_initiatives_repository.py @@ -39,7 +39,7 @@ def _collaborator(slug: str, username: str = BOB_EMAIL) -> User: async def _insert(slug: str, owner_user: User = ALICE, name: str = "An Initiative") -> Initiative: - return await _repo(owner_user).insert_initiative(InitiativeIn(slug=slug, name=name)) + return await _repo(owner_user).insert_one(InitiativeIn(slug=slug, name=name)) async def _approve(slug: str) -> Initiative: diff --git a/mpcontribs-api/tests/integration/test_bulk_limits.py b/mpcontribs-api/tests/integration/test_bulk_limits.py index f7e7b0eb9f..4cb877734c 100644 --- a/mpcontribs-api/tests/integration/test_bulk_limits.py +++ b/mpcontribs-api/tests/integration/test_bulk_limits.py @@ -45,20 +45,20 @@ def test_over_limit_post_returns_422(self, client, contribution_service): r = client.post("/api/v1/contributions", json=body) assert r.status_code == 422 assert r.json()["error"]["code"] == "validation_error" - contribution_service.insert_contributions.assert_not_called() + contribution_service.insert_many.assert_not_called() def test_at_limit_post_passes(self, client, contribution_service): - contribution_service.insert_contributions.return_value = BulkWriteSummary(total=2, succeeded=[], failed=[]) + contribution_service.insert_many.return_value = BulkWriteSummary(total=2, succeeded=[], failed=[]) body = [_valid_contribution_body() for _ in range(2)] r = client.post("/api/v1/contributions", json=body) assert r.status_code == 200 - contribution_service.insert_contributions.assert_called_once() + contribution_service.insert_many.assert_called_once() def test_over_limit_put_returns_422(self, client, contribution_service): body = [_valid_contribution_body() for _ in range(3)] r = client.put("/api/v1/contributions", json=body) assert r.status_code == 422 - contribution_service.upsert_contributions.assert_not_called() + contribution_service.upsert_many.assert_not_called() class TestLimitsEndpoint: diff --git a/mpcontribs-api/tests/integration/test_component_routes.py b/mpcontribs-api/tests/integration/test_component_routes.py index 6452a4c1a7..7a17db299a 100644 --- a/mpcontribs-api/tests/integration/test_component_routes.py +++ b/mpcontribs-api/tests/integration/test_component_routes.py @@ -101,28 +101,28 @@ def test_content_fields_are_selectable(self, client, structure_service): class TestStructuresDelete: def test_batch_delete_returns_200(self, client, structure_service): - structure_service.delete.return_value = ComponentDeleteResponse(num_deleted=3) + structure_service.delete_many.return_value = ComponentDeleteResponse(num_deleted=3) r = client.delete("/api/v1/structures") assert r.status_code == 200 assert r.json() == {"num_deleted": 3, "num_skipped": 0, "referenced_ids": []} def test_service_delete_called(self, client, structure_service): - structure_service.delete.return_value = ComponentDeleteResponse(num_deleted=0) + structure_service.delete_many.return_value = ComponentDeleteResponse(num_deleted=0) client.delete("/api/v1/structures") - structure_service.delete.assert_awaited_once() + structure_service.delete_many.assert_awaited_once() class TestStructuresInsert: def test_post_route_exists(self, client, structure_service): # Empty body -> handler invoked; service returns a summary-shaped object. - structure_service.insert.return_value = {"total": 0, "succeeded": [], "failed": []} + structure_service.insert_many.return_value = {"total": 0, "succeeded": [], "failed": []} r = client.post("/api/v1/structures", json=[]) assert r.status_code != 404 def test_post_forwards_to_service(self, client, structure_service): - structure_service.insert.return_value = {"total": 0, "succeeded": [], "failed": []} + structure_service.insert_many.return_value = {"total": 0, "succeeded": [], "failed": []} client.post("/api/v1/structures", json=[]) - structure_service.insert.assert_awaited_once() + structure_service.insert_many.assert_awaited_once() class TestStructuresByIdRouting: @@ -169,7 +169,7 @@ def test_default_fields_accepted(self, client, table_service): class TestTablesDelete: def test_batch_delete_returns_200(self, client, table_service): - table_service.delete.return_value = ComponentDeleteResponse(num_deleted=2) + table_service.delete_many.return_value = ComponentDeleteResponse(num_deleted=2) assert client.delete("/api/v1/tables").json() == { "num_deleted": 2, "num_skipped": 0, @@ -179,9 +179,9 @@ def test_batch_delete_returns_200(self, client, table_service): class TestTablesInsert: def test_post_forwards_to_service(self, client, table_service): - table_service.insert.return_value = {"total": 0, "succeeded": [], "failed": []} + table_service.insert_many.return_value = {"total": 0, "succeeded": [], "failed": []} client.post("/api/v1/tables", json=[]) - table_service.insert.assert_awaited_once() + table_service.insert_many.assert_awaited_once() class TestTablesByIdRouting: @@ -222,9 +222,9 @@ def test_delete_by_id_calls_attachment_service(self, client, attachment_service) attachment_service.delete_one.assert_awaited_once() def test_batch_delete_calls_attachment_service(self, client, attachment_service): - attachment_service.delete.return_value = ComponentDeleteResponse(num_deleted=0) + attachment_service.delete_many.return_value = ComponentDeleteResponse(num_deleted=0) client.delete("/api/v1/attachments") - attachment_service.delete.assert_awaited_once() + attachment_service.delete_many.assert_awaited_once() # =========================================================================== @@ -300,12 +300,12 @@ class TestComponentMutationsRequireAuth: def test_structures_post_anon_401(self, client, structure_service): r = client.post("/api/v1/structures", json=[], headers=FORCE_ANON_HEADERS) assert r.status_code == 401 - structure_service.insert.assert_not_called() + structure_service.insert_many.assert_not_called() def test_structures_delete_anon_401(self, client, structure_service): r = client.delete("/api/v1/structures", headers=FORCE_ANON_HEADERS) assert r.status_code == 401 - structure_service.delete.assert_not_called() + structure_service.delete_many.assert_not_called() def test_structure_delete_by_id_anon_401(self, client, structure_service): r = client.delete(f"/api/v1/structures/{PydanticObjectId()}", headers=FORCE_ANON_HEADERS) @@ -320,7 +320,7 @@ def test_structure_patch_by_id_anon_401(self, client, structure_service): def test_tables_delete_anon_401(self, client, table_service): r = client.delete("/api/v1/tables", headers=FORCE_ANON_HEADERS) assert r.status_code == 401 - table_service.delete.assert_not_called() + table_service.delete_many.assert_not_called() def test_attachment_delete_by_id_anon_401(self, client, attachment_service): r = client.delete(f"/api/v1/attachments/{PydanticObjectId()}", headers=FORCE_ANON_HEADERS) @@ -350,16 +350,16 @@ class TestComponentInsertRequiresWriter: def test_structures_post_non_writer_403(self, client, structure_service): r = client.post("/api/v1/structures", json=[], headers=NON_WRITER_HEADERS) assert r.status_code == 403 - structure_service.insert.assert_not_called() + structure_service.insert_many.assert_not_called() def test_tables_post_non_writer_403(self, client, table_service): r = client.post("/api/v1/tables", json=[], headers=NON_WRITER_HEADERS) assert r.status_code == 403 - table_service.insert.assert_not_called() + table_service.insert_many.assert_not_called() def test_structures_post_writer_allowed(self, client, structure_service): # The default AUTHED_HEADERS identity carries the mp-team group -> writer. - structure_service.insert.return_value = {"total": 0, "succeeded": [], "failed": []} + structure_service.insert_many.return_value = {"total": 0, "succeeded": [], "failed": []} r = client.post("/api/v1/structures", json=[]) assert r.status_code == 200 - structure_service.insert.assert_awaited_once() + structure_service.insert_many.assert_awaited_once() diff --git a/mpcontribs-api/tests/integration/test_contributions.py b/mpcontribs-api/tests/integration/test_contributions.py index 88c4767244..645a3d0ce2 100644 --- a/mpcontribs-api/tests/integration/test_contributions.py +++ b/mpcontribs-api/tests/integration/test_contributions.py @@ -1,5 +1,6 @@ import pytest +from mpcontribs_api.domains._shared.models import DeleteResponse from mpcontribs_api.domains.contributions.dependencies import get_scoped_contributions from mpcontribs_api.domains.contributions.models import ContributionOut from mpcontribs_api.pagination import Page @@ -34,48 +35,48 @@ def contribution_repo(test_app, mock_contribution_repo): class TestListContributions: def test_empty_page_returns_200(self, client, contribution_repo): - contribution_repo.get_contributions.return_value = Page(items=[], next_cursor=None) + contribution_repo.get_many.return_value = Page(items=[], next_cursor=None) r = client.get("/api/v1/contributions", headers=AUTHED_HEADERS) assert r.status_code == 200 def test_response_has_page_shape(self, client, contribution_repo): - contribution_repo.get_contributions.return_value = Page(items=[], next_cursor=None) + contribution_repo.get_many.return_value = Page(items=[], next_cursor=None) body = client.get("/api/v1/contributions", headers=AUTHED_HEADERS).json() assert "items" in body assert "next_cursor" in body def test_items_in_response(self, client, contribution_repo): - contribution_repo.get_contributions.return_value = Page(items=[SAMPLE_CONTRIBUTION], next_cursor=None) + contribution_repo.get_many.return_value = Page(items=[SAMPLE_CONTRIBUTION], next_cursor=None) body = client.get("/api/v1/contributions", headers=AUTHED_HEADERS).json() assert len(body["items"]) == 1 def test_repo_called_with_pagination(self, client, contribution_repo): - contribution_repo.get_contributions.return_value = Page(items=[], next_cursor=None) + contribution_repo.get_many.return_value = Page(items=[], next_cursor=None) client.get("/api/v1/contributions", params={"limit": 10}, headers=AUTHED_HEADERS) - _, kwargs = contribution_repo.get_contributions.call_args + _, kwargs = contribution_repo.get_many.call_args assert kwargs["pagination"].limit == 10 def test_fields_forwarded(self, client, contribution_repo): - contribution_repo.get_contributions.return_value = Page(items=[], next_cursor=None) + contribution_repo.get_many.return_value = Page(items=[], next_cursor=None) client.get("/api/v1/contributions", params={"_fields": ["formula"]}, headers=AUTHED_HEADERS) - _, kwargs = contribution_repo.get_contributions.call_args + _, kwargs = contribution_repo.get_many.call_args assert kwargs["fields"] is not None assert "formula" in kwargs["fields"] def test_invalid_fields_returns_422(self, client, contribution_repo): - contribution_repo.get_contributions.return_value = Page(items=[], next_cursor=None) + contribution_repo.get_many.return_value = Page(items=[], next_cursor=None) r = client.get("/api/v1/contributions", params={"_fields": "bad_field"}, headers=AUTHED_HEADERS) assert r.status_code == 422 def test_anonymous_can_list(self, client, contribution_repo): - contribution_repo.get_contributions.return_value = Page(items=[], next_cursor=None) + contribution_repo.get_many.return_value = Page(items=[], next_cursor=None) r = client.get("/api/v1/contributions", headers=ANON_HEADERS) assert r.status_code == 200 def test_filter_param_forwarded_to_repo(self, client, contribution_repo): - contribution_repo.get_contributions.return_value = Page(items=[], next_cursor=None) + contribution_repo.get_many.return_value = Page(items=[], next_cursor=None) client.get("/api/v1/contributions", params={"formula": "Fe2O3"}, headers=AUTHED_HEADERS) - contribution_repo.get_contributions.assert_called_once() + contribution_repo.get_many.assert_called_once() # --------------------------------------------------------------------------- @@ -85,19 +86,19 @@ def test_filter_param_forwarded_to_repo(self, client, contribution_repo): class TestDeleteContributions: def test_batch_delete_returns_200(self, client, contribution_repo): - contribution_repo.delete_contributions.return_value = None + contribution_repo.delete_many.return_value = DeleteResponse(num_deleted=0) r = client.delete("/api/v1/contributions", headers=AUTHED_HEADERS) assert r.status_code == 200 def test_repo_delete_called(self, client, contribution_repo): - contribution_repo.delete_contributions.return_value = None + contribution_repo.delete_many.return_value = None client.delete("/api/v1/contributions", headers=AUTHED_HEADERS) - contribution_repo.delete_contributions.assert_called_once() + contribution_repo.delete_many.assert_called_once() def test_filter_forwarded_to_repo(self, client, contribution_repo): - contribution_repo.delete_contributions.return_value = None + contribution_repo.delete_many.return_value = None client.delete("/api/v1/contributions", params={"is_public": "true"}, headers=AUTHED_HEADERS) - _, kwargs = contribution_repo.delete_contributions.call_args + _, kwargs = contribution_repo.delete_many.call_args assert kwargs["filter"] is not None @@ -110,14 +111,14 @@ class TestStubEndpoints: """These endpoints are stubs in the repo but the routes must be wired.""" def test_post_contributions_route_exists(self, client, contribution_repo): - contribution_repo.insert_contributions.return_value = None + contribution_repo.insert_many.return_value = None r = client.post("/api/v1/contributions", json=[], headers=AUTHED_HEADERS) # Should reach the route (not 404/405) even if the handler is a stub assert r.status_code != 404 assert r.status_code != 405 def test_put_contributions_route_exists(self, client, contribution_repo): - contribution_repo.upsert_contributions.return_value = None + contribution_repo.upsert_many.return_value = None r = client.put("/api/v1/contributions", json=[], headers=AUTHED_HEADERS) assert r.status_code != 404 assert r.status_code != 405 diff --git a/mpcontribs-api/tests/integration/test_contributions_routes.py b/mpcontribs-api/tests/integration/test_contributions_routes.py index 4df2d4c38a..9e8060fcb7 100644 --- a/mpcontribs-api/tests/integration/test_contributions_routes.py +++ b/mpcontribs-api/tests/integration/test_contributions_routes.py @@ -66,25 +66,25 @@ def _valid_contribution_body(**overrides) -> dict: class TestInsertContributions: def test_empty_list_returns_200(self, client, contribution_service): - contribution_service.insert_contributions.return_value = BulkWriteSummary( + contribution_service.insert_many.return_value = BulkWriteSummary( total=0, succeeded=[], failed=[] ) r = client.post("/api/v1/contributions", json=[]) assert r.status_code == 200 def test_response_has_summary_shape(self, client, contribution_service): - contribution_service.insert_contributions.return_value = BulkWriteSummary( + contribution_service.insert_many.return_value = BulkWriteSummary( total=0, succeeded=[], failed=[] ) body = client.post("/api/v1/contributions", json=[]).json() assert set(body) == {"total", "succeeded", "failed"} def test_service_receives_parsed_contributions(self, client, contribution_service): - contribution_service.insert_contributions.return_value = BulkWriteSummary( + contribution_service.insert_many.return_value = BulkWriteSummary( total=1, succeeded=[], failed=[] ) client.post("/api/v1/contributions", json=[_valid_contribution_body()]) - contributions = contribution_service.insert_contributions.call_args.kwargs["contributions"] + contributions = contribution_service.insert_many.call_args.kwargs["contributions"] assert len(contributions) == 1 assert contributions[0].project == "test-project" @@ -95,7 +95,7 @@ def test_malformed_body_returns_422(self, client, contribution_service): json=[{"_id": str(PydanticObjectId()), "project": "p", "material_id": "mp-1"}], ) assert r.status_code == 422 - contribution_service.insert_contributions.assert_not_called() + contribution_service.insert_many.assert_not_called() def test_non_list_body_returns_422(self, client, contribution_service): r = client.post("/api/v1/contributions", json=_valid_contribution_body()) @@ -109,15 +109,15 @@ def test_non_list_body_returns_422(self, client, contribution_service): class TestUpsertContributions: def test_empty_list_returns_200(self, client, contribution_service): - contribution_service.upsert_contributions.return_value = BulkWriteSummary(total=0, succeeded=[], failed=[]) + contribution_service.upsert_many.return_value = BulkWriteSummary(total=0, succeeded=[], failed=[]) r = client.put("/api/v1/contributions", json=[]) assert r.status_code == 200 assert set(r.json()) == {"total", "succeeded", "failed"} def test_service_receives_parsed_contributions(self, client, contribution_service): - contribution_service.upsert_contributions.return_value = BulkWriteSummary(total=1, succeeded=[], failed=[]) + contribution_service.upsert_many.return_value = BulkWriteSummary(total=1, succeeded=[], failed=[]) client.put("/api/v1/contributions", json=[_valid_contribution_body()]) - contributions = contribution_service.upsert_contributions.call_args.kwargs["contributions"] + contributions = contribution_service.upsert_many.call_args.kwargs["contributions"] assert contributions[0].material_id == "mp-1234" def test_malformed_body_returns_422(self, client, contribution_service): @@ -126,7 +126,7 @@ def test_malformed_body_returns_422(self, client, contribution_service): json=[{"_id": str(PydanticObjectId()), "project": "p"}], ) assert r.status_code == 422 - contribution_service.upsert_contributions.assert_not_called() + contribution_service.upsert_many.assert_not_called() # =========================================================================== @@ -142,12 +142,12 @@ def test_get_by_id_conventional_path(self, client, contribution_service): assert client.get(f"/api/v1/contributions/{PydanticObjectId()}").status_code == 200 def test_patch_by_id_conventional_path(self, client, contribution_service): - contribution_service.patch_contribution_by_id.return_value = SAMPLE_OUT + contribution_service.patch_one.return_value = SAMPLE_OUT r = client.patch(f"/api/v1/contributions/{PydanticObjectId()}", json={"formula": "H2O"}) assert r.status_code == 200 def test_put_by_id_conventional_path(self, client, contribution_service): - contribution_service.upsert_contribution_by_id.return_value = SAMPLE_OUT + contribution_service.upsert_one.return_value = SAMPLE_OUT r = client.put(f"/api/v1/contributions/{PydanticObjectId()}", json=_valid_contribution_body()) assert r.status_code == 200 @@ -252,7 +252,7 @@ def test_repo_error_surfaces_as_uniform_json(self, client, contribution_repo): class TestBulkUpdateContributions: def test_publish_returns_200_and_summary(self, client, contribution_service): - contribution_service.bulk_update.return_value = BulkUpdateSummary(matched=3, modified=2, projects=["mp-team"]) + contribution_service.patch_many.return_value = BulkUpdateSummary(matched=3, modified=2, projects=["mp-team"]) r = client.patch("/api/v1/contributions", json={"is_public": True}) assert r.status_code == 200 assert r.json() == {"matched": 3, "modified": 2, "projects": ["mp-team"], "failed": []} @@ -260,57 +260,57 @@ def test_publish_returns_200_and_summary(self, client, contribution_service): def test_forwards_update_and_filter(self, client, contribution_service): from mpcontribs_api.domains.contributions.models import ContributionFilter - contribution_service.bulk_update.return_value = BulkUpdateSummary(matched=0, modified=0, projects=[]) + contribution_service.patch_many.return_value = BulkUpdateSummary(matched=0, modified=0, projects=[]) client.patch("/api/v1/contributions?project=mp-team", json={"is_public": True}) - contribution_service.bulk_update.assert_awaited_once() - kwargs = contribution_service.bulk_update.call_args.kwargs + contribution_service.patch_many.assert_awaited_once() + kwargs = contribution_service.patch_many.call_args.kwargs assert kwargs["update"].is_public is True assert isinstance(kwargs["filter"], ContributionFilter) def test_forwards_full_patch_body(self, client, contribution_service): # The bulk patch now accepts the same fields as the single-item patch (not just is_public). - contribution_service.bulk_update.return_value = BulkUpdateSummary(matched=1, modified=1, projects=["mp-team"]) + contribution_service.patch_many.return_value = BulkUpdateSummary(matched=1, modified=1, projects=["mp-team"]) r = client.patch("/api/v1/contributions", json={"formula": "Fe2O3", "data": {"y": 9.0}}) assert r.status_code == 200 - update = contribution_service.bulk_update.call_args.kwargs["update"] + update = contribution_service.patch_many.call_args.kwargs["update"] assert update.formula == "Fe2O3" assert update.data == {"y": 9.0} def test_empty_patch_is_accepted_as_noop(self, client, contribution_service): # An empty patch is a valid no-op (parity with the single-item patch), no longer a 422. - contribution_service.bulk_update.return_value = BulkUpdateSummary(matched=0, modified=0, projects=[]) + contribution_service.patch_many.return_value = BulkUpdateSummary(matched=0, modified=0, projects=[]) r = client.patch("/api/v1/contributions", json={}) assert r.status_code == 200 - contribution_service.bulk_update.assert_awaited_once() + contribution_service.patch_many.assert_awaited_once() def test_replace_data_query_param_forwarded(self, client, contribution_service): # ?replace_data=true opts a data patch out of the additive-merge default (whole-dict overwrite). - contribution_service.bulk_update.return_value = BulkUpdateSummary(matched=0, modified=0, projects=[]) + contribution_service.patch_many.return_value = BulkUpdateSummary(matched=0, modified=0, projects=[]) client.patch("/api/v1/contributions?replace_data=true", json={"data": {"y": 9.0}}) - assert contribution_service.bulk_update.call_args.kwargs["replace_data"] is True + assert contribution_service.patch_many.call_args.kwargs["replace_data"] is True def test_replace_data_defaults_to_false(self, client, contribution_service): # Omitting the flag keeps the additive-merge default. - contribution_service.bulk_update.return_value = BulkUpdateSummary(matched=0, modified=0, projects=[]) + contribution_service.patch_many.return_value = BulkUpdateSummary(matched=0, modified=0, projects=[]) client.patch("/api/v1/contributions", json={"data": {"y": 9.0}}) - assert contribution_service.bulk_update.call_args.kwargs["replace_data"] is False + assert contribution_service.patch_many.call_args.kwargs["replace_data"] is False def test_patch_by_id_forwards_is_public(self, client, contribution_service): # The single-contribution publish path: {"is_public": true} reaches the service patch. - contribution_service.patch_contribution_by_id.return_value = SAMPLE_OUT + contribution_service.patch_one.return_value = SAMPLE_OUT r = client.patch(f"/api/v1/contributions/{PydanticObjectId()}", json={"is_public": True}) assert r.status_code == 200 - update = contribution_service.patch_contribution_by_id.call_args.kwargs["update"] + update = contribution_service.patch_one.call_args.kwargs["update"] assert update.is_public is True def test_patch_by_id_forwards_replace_data(self, client, contribution_service): # The single-item path exposes the same overwrite opt-out as the bulk path. - contribution_service.patch_contribution_by_id.return_value = SAMPLE_OUT + contribution_service.patch_one.return_value = SAMPLE_OUT r = client.patch( f"/api/v1/contributions/{PydanticObjectId()}?replace_data=true", json={"data": {"y": 9.0}} ) assert r.status_code == 200 - assert contribution_service.patch_contribution_by_id.call_args.kwargs["replace_data"] is True + assert contribution_service.patch_one.call_args.kwargs["replace_data"] is True class TestContributionMutationsRequireAuth: @@ -318,22 +318,22 @@ def test_post_anon_401(self, client, contribution_service): r = client.post("/api/v1/contributions", json=[], headers=FORCE_ANON_HEADERS) assert r.status_code == 401 assert r.json()["error"]["code"] == "authentication_error" - contribution_service.insert_contributions.assert_not_called() + contribution_service.insert_many.assert_not_called() def test_put_collection_anon_401(self, client, contribution_service): r = client.put("/api/v1/contributions", json=[], headers=FORCE_ANON_HEADERS) assert r.status_code == 401 - contribution_service.upsert_contributions.assert_not_called() + contribution_service.upsert_many.assert_not_called() def test_delete_collection_anon_401(self, client, contribution_repo): r = client.delete("/api/v1/contributions", headers=FORCE_ANON_HEADERS) assert r.status_code == 401 - contribution_repo.delete_contributions.assert_not_called() + contribution_repo.delete_many.assert_not_called() def test_patch_collection_anon_401(self, client, contribution_service): r = client.patch("/api/v1/contributions", json={"is_public": True}, headers=FORCE_ANON_HEADERS) assert r.status_code == 401 - contribution_service.bulk_update.assert_not_called() + contribution_service.patch_many.assert_not_called() def test_delete_by_id_anon_401(self, client, contribution_service): r = client.delete(f"/api/v1/contributions/{PydanticObjectId()}", headers=FORCE_ANON_HEADERS) @@ -346,18 +346,18 @@ def test_put_by_id_anon_401(self, client, contribution_service): headers=FORCE_ANON_HEADERS, ) assert r.status_code == 401 - contribution_service.upsert_contribution_by_id.assert_not_called() + contribution_service.upsert_one.assert_not_called() def test_patch_by_id_anon_401(self, client, contribution_service): r = client.patch( f"/api/v1/contributions/{PydanticObjectId()}", json={"formula": "H2O"}, headers=FORCE_ANON_HEADERS ) assert r.status_code == 401 - contribution_service.patch_contribution_by_id.assert_not_called() + contribution_service.patch_one.assert_not_called() def test_get_collection_still_open_to_anon(self, client, contribution_repo): from mpcontribs_api.pagination import Page - contribution_repo.get_contributions.return_value = Page(items=[], next_cursor=None) + contribution_repo.get_many.return_value = Page(items=[], next_cursor=None) r = client.get("/api/v1/contributions", headers=FORCE_ANON_HEADERS) assert r.status_code == 200 diff --git a/mpcontribs-api/tests/integration/test_initiatives.py b/mpcontribs-api/tests/integration/test_initiatives.py index 516bb5b469..c559418418 100644 --- a/mpcontribs-api/tests/integration/test_initiatives.py +++ b/mpcontribs-api/tests/integration/test_initiatives.py @@ -40,7 +40,7 @@ def _stored(**overrides): class TestInsert: def test_returns_201_and_echoes_id(self, client, initiative_repo): - initiative_repo.insert_initiative.return_value = _stored() + initiative_repo.insert_one.return_value = _stored() r = client.post( "/api/v1/initiatives", json={"slug": "battery-genome", "name": "Battery Genome"}, @@ -73,7 +73,7 @@ def test_invalid_slug_returns_422(self, client, initiative_repo): class TestGet: def test_list_returns_200(self, client, initiative_repo): - initiative_repo.get_initiatives.return_value = Page(items=[], next_cursor=None) + initiative_repo.get_many.return_value = Page(items=[], next_cursor=None) r = client.get("/api/v1/initiatives", headers=AUTHED_HEADERS) assert r.status_code == 200 diff --git a/mpcontribs-api/tests/integration/test_project_groups.py b/mpcontribs-api/tests/integration/test_project_groups.py index e12ff146fd..18c216da71 100644 --- a/mpcontribs-api/tests/integration/test_project_groups.py +++ b/mpcontribs-api/tests/integration/test_project_groups.py @@ -54,17 +54,17 @@ def _inserted(self, **overrides): return SimpleNamespace(**attrs) def test_returns_201(self, client, group_service): - group_service.insert.return_value = self._inserted() + group_service.insert_one.return_value = self._inserted() r = client.post("/api/v1/project_groups", json=self._body(), headers=AUTHED_HEADERS) assert r.status_code == 201 def test_response_includes_generated_id(self, client, group_service): - group_service.insert.return_value = self._inserted() + group_service.insert_one.return_value = self._inserted() body = client.post("/api/v1/project_groups", json=self._body(), headers=AUTHED_HEADERS).json() assert body["id"] == SAMPLE_OID def test_response_echoes_full_document(self, client, group_service): - group_service.insert.return_value = self._inserted(name="echo-group", is_public=True) + group_service.insert_one.return_value = self._inserted(name="echo-group", is_public=True) body = client.post( "/api/v1/project_groups", json=self._body(name="echo-group", is_public=True), diff --git a/mpcontribs-api/tests/integration/test_projects.py b/mpcontribs-api/tests/integration/test_projects.py index 48c74a3827..1172afb3ec 100644 --- a/mpcontribs-api/tests/integration/test_projects.py +++ b/mpcontribs-api/tests/integration/test_projects.py @@ -55,18 +55,18 @@ def project_service(test_app): class TestListProjects: def test_empty_page_returns_200(self, client, project_repo): - project_repo.get_projects.return_value = Page(items=[], next_cursor=None) + project_repo.get_many.return_value = Page(items=[], next_cursor=None) r = client.get("/api/v1/projects", headers=AUTHED_HEADERS) assert r.status_code == 200 def test_response_has_items_and_cursor(self, client, project_repo): - project_repo.get_projects.return_value = Page(items=[], next_cursor=None) + project_repo.get_many.return_value = Page(items=[], next_cursor=None) body = client.get("/api/v1/projects", headers=AUTHED_HEADERS).json() assert "items" in body assert "next_cursor" in body def test_items_returned_in_response(self, client, project_repo): - project_repo.get_projects.return_value = Page(items=[SAMPLE_PROJECT], next_cursor=None) + project_repo.get_many.return_value = Page(items=[SAMPLE_PROJECT], next_cursor=None) body = client.get("/api/v1/projects", headers=AUTHED_HEADERS).json() assert len(body["items"]) == 1 @@ -74,29 +74,29 @@ def test_next_cursor_set_when_more_pages(self, client, project_repo): from mpcontribs_api.pagination import encode_cursor cursor = encode_cursor("mp-sample") - project_repo.get_projects.return_value = Page(items=[SAMPLE_PROJECT], next_cursor=cursor) + project_repo.get_many.return_value = Page(items=[SAMPLE_PROJECT], next_cursor=cursor) body = client.get("/api/v1/projects", headers=AUTHED_HEADERS).json() assert body["next_cursor"] == cursor def test_repo_get_project_called(self, client, project_repo): - project_repo.get_projects.return_value = Page(items=[], next_cursor=None) + project_repo.get_many.return_value = Page(items=[], next_cursor=None) client.get("/api/v1/projects", headers=AUTHED_HEADERS) - project_repo.get_projects.assert_called_once() + project_repo.get_many.assert_called_once() def test_anonymous_user_reaches_route(self, client, project_repo): - project_repo.get_projects.return_value = Page(items=[], next_cursor=None) + project_repo.get_many.return_value = Page(items=[], next_cursor=None) r = client.get("/api/v1/projects", headers=ANON_HEADERS) assert r.status_code == 200 def test_invalid_fields_param_returns_422(self, client, project_repo): - project_repo.get_projects.return_value = Page(items=[], next_cursor=None) + project_repo.get_many.return_value = Page(items=[], next_cursor=None) r = client.get("/api/v1/projects", params={"_fields": "nonexistent_field"}, headers=AUTHED_HEADERS) assert r.status_code == 422 def test_limit_param_forwarded(self, client, project_repo): - project_repo.get_projects.return_value = Page(items=[], next_cursor=None) + project_repo.get_many.return_value = Page(items=[], next_cursor=None) client.get("/api/v1/projects", params={"limit": 5}, headers=AUTHED_HEADERS) - _, kwargs = project_repo.get_projects.call_args + _, kwargs = project_repo.get_many.call_args assert kwargs["pagination"].limit == 5 def test_limit_above_max_returns_422(self, client, project_repo): @@ -104,9 +104,9 @@ def test_limit_above_max_returns_422(self, client, project_repo): assert r.status_code == 422 def test_valid_fields_param_forwarded(self, client, project_repo): - project_repo.get_projects.return_value = Page(items=[], next_cursor=None) + project_repo.get_many.return_value = Page(items=[], next_cursor=None) client.get("/api/v1/projects", params=[("_fields", "title"), ("_fields", "authors")], headers=AUTHED_HEADERS) - _, kwargs = project_repo.get_projects.call_args + _, kwargs = project_repo.get_many.call_args assert kwargs["fields"] is not None assert "title" in kwargs["fields"] @@ -119,23 +119,23 @@ def test_valid_fields_param_forwarded(self, client, project_repo): class TestFieldSelectionSemantics: def test_omitted_fields_forwards_route_defaults(self, client, project_repo): # No _fields query param -> the route's default_fields() (identity + summary columns). - project_repo.get_projects.return_value = Page(items=[], next_cursor=None) + project_repo.get_many.return_value = Page(items=[], next_cursor=None) client.get("/api/v1/projects", headers=AUTHED_HEADERS) - _, kwargs = project_repo.get_projects.call_args + _, kwargs = project_repo.get_many.call_args assert kwargs["fields"] == frozenset(ProjectOut.default_fields()) def test_empty_fields_forwards_identity_only(self, client, project_repo): # `?_fields=` (present but empty) -> only the identity field, the cheap "just ids" call. - project_repo.get_projects.return_value = Page(items=[], next_cursor=None) + project_repo.get_many.return_value = Page(items=[], next_cursor=None) client.get("/api/v1/projects", params={"_fields": ""}, headers=AUTHED_HEADERS) - _, kwargs = project_repo.get_projects.call_args + _, kwargs = project_repo.get_many.call_args assert kwargs["fields"] == frozenset({"id"}) def test_all_sentinel_forwards_none(self, client, project_repo): # `?_fields=_all` -> None, i.e. project every field. - project_repo.get_projects.return_value = Page(items=[], next_cursor=None) + project_repo.get_many.return_value = Page(items=[], next_cursor=None) client.get("/api/v1/projects", params={"_fields": "_all"}, headers=AUTHED_HEADERS) - _, kwargs = project_repo.get_projects.call_args + _, kwargs = project_repo.get_many.call_args assert kwargs["fields"] is None def test_empty_fields_detail_forwards_identity_only(self, client, project_service): diff --git a/mpcontribs-api/tests/unit/domains/test_component_service.py b/mpcontribs-api/tests/unit/domains/test_component_service.py index c9f981e374..0333f9f283 100644 --- a/mpcontribs-api/tests/unit/domains/test_component_service.py +++ b/mpcontribs-api/tests/unit/domains/test_component_service.py @@ -35,7 +35,7 @@ def _make_service( """ components = AsyncMock(name="components") components.list_ids = AsyncMock(return_value=candidate_ids) - components.delete_by_ids = AsyncMock(side_effect=lambda ids: DeleteResponse(num_deleted=len(ids))) + components.delete_many = AsyncMock(side_effect=lambda filter: DeleteResponse(num_deleted=len(filter.id__in))) components.delete_one = AsyncMock(return_value=DeleteResponse(num_deleted=1)) components.coerce_identifiers = MagicMock(side_effect=_coerce_identifiers) @@ -62,33 +62,33 @@ async def test_delete_reachable_and_unreferenced_deletes_all(): candidate_ids=[a, b], reachable={a, b}, referenced=set() ) - result = await svc.delete(AttachmentFilter()) + result = await svc.delete_many(AttachmentFilter()) assert isinstance(result, ComponentDeleteResponse) assert result.num_deleted == 2 assert result.num_skipped == 0 assert result.referenced_ids == [] - components.delete_by_ids.assert_awaited_once() - assert set(components.delete_by_ids.await_args.args[0]) == {a, b} + components.delete_many.assert_awaited_once() + assert set(components.delete_many.await_args.args[0].id__in) == {a, b} async def test_delete_skips_globally_referenced(): a, b = _oid(), _oid() svc, components, _ = _make_service(candidate_ids=[a, b], reachable={a, b}, referenced={b}) - result = await svc.delete(AttachmentFilter()) + result = await svc.delete_many(AttachmentFilter()) assert result.num_deleted == 1 assert result.num_skipped == 1 assert result.referenced_ids == [b] - assert components.delete_by_ids.await_args.args[0] == [a] + assert components.delete_many.await_args.args[0].id__in == [a] async def test_delete_not_reachable_deletes_nothing(): a = _oid() svc, components, contributions = _make_service(candidate_ids=[a], reachable=set(), referenced={a}) - result = await svc.delete(AttachmentFilter()) + result = await svc.delete_many(AttachmentFilter()) assert result.num_deleted == 0 assert result.num_skipped == 0 @@ -101,7 +101,7 @@ async def test_delete_not_reachable_deletes_nothing(): async def test_delete_empty_candidate_set(): svc, components, _ = _make_service(candidate_ids=[], reachable=set(), referenced=set()) - result = await svc.delete(AttachmentFilter()) + result = await svc.delete_many(AttachmentFilter()) assert result.num_deleted == 0 components.delete_by_ids.assert_not_awaited() @@ -111,7 +111,7 @@ async def test_delete_checks_scoped_before_global(): a = _oid() svc, _, contributions = _make_service(candidate_ids=[a], reachable={a}, referenced=set()) - await svc.delete(AttachmentFilter()) + await svc.delete_many(AttachmentFilter()) scoped_flags = [c.kwargs["scoped"] for c in contributions.referenced_component_ids.await_args_list] assert scoped_flags == [True, False] diff --git a/mpcontribs-api/tests/unit/domains/test_contribution_service.py b/mpcontribs-api/tests/unit/domains/test_contribution_service.py index b62d99aa00..e02cf5c648 100644 --- a/mpcontribs-api/tests/unit/domains/test_contribution_service.py +++ b/mpcontribs-api/tests/unit/domains/test_contribution_service.py @@ -256,7 +256,7 @@ def _fake_attachment() -> Attachment: # --------------------------------------------------------------------------- -# insert_contributions — pre-checks (cheap, no DB) +# insert_many — pre-checks (cheap, no DB) # --------------------------------------------------------------------------- @@ -264,55 +264,55 @@ class TestInsertContributionsPreChecks: async def test_empty_batch_returns_empty_summary_no_db(self): svc, contrib_repo, struct_repo, table_repo, attach_repo, client = _make_service() - summary = await svc.insert_contributions([]) + summary = await svc.insert_many([]) assert summary.total == 0 assert summary.succeeded == [] assert summary.failed == [] - contrib_repo.insert_many_contributions.assert_not_called() - contrib_repo.insert_contribution.assert_not_called() + contrib_repo.insert_many.assert_not_called() + contrib_repo.insert_one.assert_not_called() client.start_session.assert_not_called() async def test_duplicate_identity_in_one_batch_conflicts_later_item(self): """A repeated identity within one batch does not fail the whole request: the first occurrence is inserted; later intra-batch duplicates are per-item conflict failures.""" svc, contrib_repo, _, _, _, client = _make_service() - contrib_repo.insert_many_contributions.return_value = None + contrib_repo.insert_many.return_value = None contribs = [ _contrib_in(project="prj", identifier="dup"), _contrib_in(project="prj", identifier="dup"), ] - summary = await svc.insert_contributions(contribs) + summary = await svc.insert_many(contribs) assert summary.total == 2 assert len(summary.succeeded) == 1 assert [f.index for f in summary.failed] == [1] assert summary.failed[0].error_code == "conflict" # Index 0 still reached Mongo (one doc inserted) - assert len(contrib_repo.insert_many_contributions.call_args[0][0]) == 1 + assert len(contrib_repo.insert_many.call_args[0][0]) == 1 async def test_oversize_contribution_goes_to_failures_without_db(self): settings = _make_mongo_settings(max_components_per_contribution=1) svc, contrib_repo, struct_repo, _, _, client = _make_service(settings=settings) - contrib_repo.insert_many_contributions.return_value = None + contrib_repo.insert_many.return_value = None good = _contrib_in(identifier="ok") oversize = _contrib_in(identifier="big", structures=[_structure_in(), _structure_in()]) - summary = await svc.insert_contributions([good, oversize]) + summary = await svc.insert_many([good, oversize]) assert summary.total == 2 assert len(summary.failed) == 1 assert summary.failed[0].index == 1 assert summary.failed[0].error_code == "validation_error" # Oversize never reached the component repo - struct_repo.insert_components.assert_not_called() + struct_repo.insert_many.assert_not_called() # And the in-pool contribution did go through the no-component fast path - contrib_repo.insert_many_contributions.assert_called_once() + contrib_repo.insert_many.assert_called_once() # --------------------------------------------------------------------------- -# insert_contributions — unapproved-contribution quota +# insert_many — unapproved-contribution quota # --------------------------------------------------------------------------- @@ -332,44 +332,44 @@ class TestInsertContributionsUnapprovedQuota: async def test_unapproved_project_at_capacity_fails_all(self, monkeypatch): monkeypatch.setattr(get_settings().consumer, "max_unapproved_contributions_per_project", 2) contrib_repo = AsyncMock() - contrib_repo.insert_many_contributions.return_value = None + contrib_repo.insert_many.return_value = None contrib_repo.count_contributions_for_project.return_value = 5 # already over cap svc, *_ = _make_service(contributions=contrib_repo, projects=_unapproved_projects_repo()) - summary = await svc.insert_contributions([_contrib_in(identifier=f"mp-{i}") for i in range(3)]) + summary = await svc.insert_many([_contrib_in(identifier=f"mp-{i}") for i in range(3)]) assert summary.total == 3 assert [f.index for f in summary.failed] == [0, 1, 2] assert all(f.error_code == "permission_denied" for f in summary.failed) assert summary.succeeded == [] - contrib_repo.insert_many_contributions.assert_not_called() + contrib_repo.insert_many.assert_not_called() async def test_batch_trimmed_to_remaining_capacity(self, monkeypatch): # cap 5, 3 already stored -> remaining = 5 - 3 = 2 slots for this batch monkeypatch.setattr(get_settings().consumer, "max_unapproved_contributions_per_project", 5) contrib_repo = AsyncMock() - contrib_repo.insert_many_contributions.return_value = None + contrib_repo.insert_many.return_value = None contrib_repo.count_contributions_for_project.return_value = 3 svc, *_ = _make_service(contributions=contrib_repo, projects=_unapproved_projects_repo()) - summary = await svc.insert_contributions([_contrib_in(identifier=f"mp-{i}") for i in range(4)]) + summary = await svc.insert_many([_contrib_in(identifier=f"mp-{i}") for i in range(4)]) assert summary.total == 4 assert len(summary.succeeded) == 2 assert [f.index for f in summary.failed] == [2, 3] # Only the two accepted contributions reached the database - inserted = contrib_repo.insert_many_contributions.call_args[0][0] + inserted = contrib_repo.insert_many.call_args[0][0] assert len(inserted) == 2 async def test_batch_may_fill_project_to_exactly_cap(self, monkeypatch): # cap 3, 2 stored -> exactly one slot; the batch fills the project to the cap, not past it. monkeypatch.setattr(get_settings().consumer, "max_unapproved_contributions_per_project", 3) contrib_repo = AsyncMock() - contrib_repo.insert_many_contributions.return_value = None + contrib_repo.insert_many.return_value = None contrib_repo.count_contributions_for_project.return_value = 2 svc, *_ = _make_service(contributions=contrib_repo, projects=_unapproved_projects_repo()) - summary = await svc.insert_contributions([_contrib_in(identifier=f"mp-{i}") for i in range(2)]) + summary = await svc.insert_many([_contrib_in(identifier=f"mp-{i}") for i in range(2)]) assert summary.total == 2 assert len(summary.succeeded) == 1 @@ -379,23 +379,23 @@ async def test_batch_at_exactly_cap_rejects_all_new(self, monkeypatch): # cap 3, 3 stored -> zero remaining slots; a project already at the cap admits nothing new. monkeypatch.setattr(get_settings().consumer, "max_unapproved_contributions_per_project", 3) contrib_repo = AsyncMock() - contrib_repo.insert_many_contributions.return_value = None + contrib_repo.insert_many.return_value = None contrib_repo.count_contributions_for_project.return_value = 3 svc, *_ = _make_service(contributions=contrib_repo, projects=_unapproved_projects_repo()) - summary = await svc.insert_contributions([_contrib_in(identifier=f"mp-{i}") for i in range(2)]) + summary = await svc.insert_many([_contrib_in(identifier=f"mp-{i}") for i in range(2)]) assert [f.index for f in summary.failed] == [0, 1] assert summary.succeeded == [] - contrib_repo.insert_many_contributions.assert_not_called() + contrib_repo.insert_many.assert_not_called() async def test_approved_project_is_unlimited(self, monkeypatch): monkeypatch.setattr(get_settings().consumer, "max_unapproved_contributions_per_project", 1) contrib_repo = AsyncMock() - contrib_repo.insert_many_contributions.return_value = None + contrib_repo.insert_many.return_value = None svc, *_ = _make_service(contributions=contrib_repo, projects=_approved_projects_repo()) - summary = await svc.insert_contributions([_contrib_in(identifier=f"mp-{i}") for i in range(3)]) + summary = await svc.insert_many([_contrib_in(identifier=f"mp-{i}") for i in range(3)]) assert len(summary.succeeded) == 3 assert summary.failed == [] @@ -405,7 +405,7 @@ async def test_approved_project_is_unlimited(self, monkeypatch): async def test_quota_evaluated_per_project(self, monkeypatch): monkeypatch.setattr(get_settings().consumer, "max_unapproved_contributions_per_project", 2) contrib_repo = AsyncMock() - contrib_repo.insert_many_contributions.return_value = None + contrib_repo.insert_many.return_value = None contrib_repo.count_contributions_for_project.return_value = 99 # only consulted for the unapproved one projects = _projects_repo_by_approval({"ok": True, "bad": False}) svc, *_ = _make_service(contributions=contrib_repo, projects=projects) @@ -415,22 +415,22 @@ async def test_quota_evaluated_per_project(self, monkeypatch): _contrib_in(project="bad", identifier="b"), _contrib_in(project="ok", identifier="c"), ] - summary = await svc.insert_contributions(contribs) + summary = await svc.insert_many(contribs) assert [f.index for f in summary.failed] == [1] assert len(summary.succeeded) == 2 - inserted_ids = {d.material_id for d in contrib_repo.insert_many_contributions.call_args[0][0]} + inserted_ids = {d.material_id for d in contrib_repo.insert_many.call_args[0][0]} assert inserted_ids == {_mp_id_for("a"), _mp_id_for("c")} async def test_breach_emits_structured_audit_log(self, monkeypatch): monkeypatch.setattr(get_settings().consumer, "max_unapproved_contributions_per_project", 2) contrib_repo = AsyncMock() - contrib_repo.insert_many_contributions.return_value = None + contrib_repo.insert_many.return_value = None contrib_repo.count_contributions_for_project.return_value = 5 svc, *_ = _make_service(contributions=contrib_repo, projects=_unapproved_projects_repo()) with patch.object(service_module.logger, "warning") as warn: - await svc.insert_contributions([_contrib_in(project="p", identifier=f"mp-{i}") for i in range(3)]) + await svc.insert_many([_contrib_in(project="p", identifier=f"mp-{i}") for i in range(3)]) warn.assert_called_once() event, kwargs = warn.call_args.args[0], warn.call_args.kwargs @@ -447,17 +447,17 @@ async def test_breach_emits_structured_audit_log(self, monkeypatch): async def test_approved_project_emits_no_audit_log(self, monkeypatch): monkeypatch.setattr(get_settings().consumer, "max_unapproved_contributions_per_project", 1) contrib_repo = AsyncMock() - contrib_repo.insert_many_contributions.return_value = None + contrib_repo.insert_many.return_value = None svc, *_ = _make_service(contributions=contrib_repo, projects=_approved_projects_repo()) with patch.object(service_module.logger, "warning") as warn: - await svc.insert_contributions([_contrib_in(identifier=f"mp-{i}") for i in range(3)]) + await svc.insert_many([_contrib_in(identifier=f"mp-{i}") for i in range(3)]) warn.assert_not_called() # --------------------------------------------------------------------------- -# upsert_contributions — unapproved-contribution quota (new docs only) +# upsert_many — unapproved-contribution quota (new docs only) # --------------------------------------------------------------------------- @@ -481,7 +481,7 @@ async def test_only_new_documents_count_against_cap(self, monkeypatch): _contrib_in(identifier="b"), # new -> consumes the one remaining slot _contrib_in(identifier="c"), # new -> over cap, rejected ] - summary = await svc.upsert_contributions(contribs) + summary = await svc.upsert_many(contribs) assert len(summary.succeeded) == 2 assert [f.index for f in summary.failed] == [2] @@ -503,7 +503,7 @@ async def test_pure_updates_are_never_capped(self, monkeypatch): for i in range(3) } - summary = await svc.upsert_contributions([_contrib_in(identifier=f"mp-{i}") for i in range(3)]) + summary = await svc.upsert_many([_contrib_in(identifier=f"mp-{i}") for i in range(3)]) assert len(summary.succeeded) == 3 assert summary.failed == [] @@ -515,7 +515,7 @@ async def test_approved_project_skips_quota(self, monkeypatch): contrib_repo.upsert_one.return_value = MagicMock(spec=Contribution, project="proj") svc, *_ = _make_service(contributions=contrib_repo, projects=_approved_projects_repo()) - summary = await svc.upsert_contributions([_contrib_in(identifier=f"mp-{i}") for i in range(3)]) + summary = await svc.upsert_many([_contrib_in(identifier=f"mp-{i}") for i in range(3)]) assert len(summary.succeeded) == 3 assert summary.failed == [] @@ -524,7 +524,7 @@ async def test_approved_project_skips_quota(self, monkeypatch): # --------------------------------------------------------------------------- -# upsert_contribution_by_id — single-record quota +# upsert_one — single-record quota # --------------------------------------------------------------------------- @@ -534,12 +534,12 @@ async def test_update_existing_allowed_even_over_cap(self, monkeypatch): contrib_repo = AsyncMock() contrib_repo.get_one.return_value = MagicMock(spec=Contribution) # id exists -> update contrib_repo.count_contributions_for_project.return_value = 99 - contrib_repo.upsert_contribution_by_id.return_value = MagicMock(spec=Contribution) + contrib_repo.upsert_one.return_value = MagicMock(spec=Contribution) svc, *_ = _make_service(contributions=contrib_repo, projects=_unapproved_projects_repo()) - await svc.upsert_contribution_by_id("someid", _contrib_in()) + await svc.upsert_one("someid", _contrib_in()) - contrib_repo.upsert_contribution_by_id.assert_called_once() + contrib_repo.upsert_one.assert_called_once() contrib_repo.count_contributions_for_project.assert_not_called() async def test_new_insert_over_cap_rejected(self, monkeypatch): @@ -550,21 +550,21 @@ async def test_new_insert_over_cap_rejected(self, monkeypatch): svc, *_ = _make_service(contributions=contrib_repo, projects=_unapproved_projects_repo()) with pytest.raises(PermissionError): - await svc.upsert_contribution_by_id("someid", _contrib_in()) + await svc.upsert_one("someid", _contrib_in()) - contrib_repo.upsert_contribution_by_id.assert_not_called() + contrib_repo.upsert_one.assert_not_called() async def test_new_insert_under_cap_allowed(self, monkeypatch): monkeypatch.setattr(get_settings().consumer, "max_unapproved_contributions_per_project", 5) contrib_repo = AsyncMock() contrib_repo.get_one.return_value = None contrib_repo.count_contributions_for_project.return_value = 1 - contrib_repo.upsert_contribution_by_id.return_value = MagicMock(spec=Contribution) + contrib_repo.upsert_one.return_value = MagicMock(spec=Contribution) svc, *_ = _make_service(contributions=contrib_repo, projects=_unapproved_projects_repo()) - await svc.upsert_contribution_by_id("someid", _contrib_in()) + await svc.upsert_one("someid", _contrib_in()) - contrib_repo.upsert_contribution_by_id.assert_called_once() + contrib_repo.upsert_one.assert_called_once() async def test_new_insert_at_exactly_cap_rejected(self, monkeypatch): # stored == cap: the project is full, so a brand-new document is rejected (no cap+1 slack). @@ -575,51 +575,51 @@ async def test_new_insert_at_exactly_cap_rejected(self, monkeypatch): svc, *_ = _make_service(contributions=contrib_repo, projects=_unapproved_projects_repo()) with pytest.raises(PermissionError): - await svc.upsert_contribution_by_id("someid", _contrib_in()) + await svc.upsert_one("someid", _contrib_in()) - contrib_repo.upsert_contribution_by_id.assert_not_called() + contrib_repo.upsert_one.assert_not_called() async def test_new_insert_approved_project_unlimited(self, monkeypatch): monkeypatch.setattr(get_settings().consumer, "max_unapproved_contributions_per_project", 1) contrib_repo = AsyncMock() contrib_repo.get_one.return_value = None - contrib_repo.upsert_contribution_by_id.return_value = MagicMock(spec=Contribution) + contrib_repo.upsert_one.return_value = MagicMock(spec=Contribution) svc, *_ = _make_service(contributions=contrib_repo, projects=_approved_projects_repo()) - await svc.upsert_contribution_by_id("someid", _contrib_in()) + await svc.upsert_one("someid", _contrib_in()) - contrib_repo.upsert_contribution_by_id.assert_called_once() + contrib_repo.upsert_one.assert_called_once() contrib_repo.count_contributions_for_project.assert_not_called() # --------------------------------------------------------------------------- -# insert_contributions — no-component fast path +# insert_many — no-component fast path # --------------------------------------------------------------------------- class TestInsertContributionsNoComponentPath: async def test_all_no_components_uses_single_insert_many(self): svc, contrib_repo, _, _, _, client = _make_service() - contrib_repo.insert_many_contributions.return_value = None + contrib_repo.insert_many.return_value = None contribs = [_contrib_in(identifier=f"mp-{i}") for i in range(3)] - summary = await svc.insert_contributions(contribs) + summary = await svc.insert_many(contribs) - contrib_repo.insert_many_contributions.assert_called_once() + contrib_repo.insert_many.assert_called_once() # Zero transactions opened client.start_session.assert_not_called() - contrib_repo.insert_contribution.assert_not_called() + contrib_repo.insert_one.assert_not_called() assert summary.total == 3 assert len(summary.succeeded) == 3 assert summary.failed == [] async def test_is_public_forced_false_on_inserted_docs(self): svc, contrib_repo, _, _, _, _ = _make_service() - contrib_repo.insert_many_contributions.return_value = None + contrib_repo.insert_many.return_value = None - await svc.insert_contributions([_contrib_in()]) + await svc.insert_many([_contrib_in()]) - docs = contrib_repo.insert_many_contributions.call_args[0][0] + docs = contrib_repo.insert_many.call_args[0][0] assert all(d.is_public is False for d in docs) async def test_bulk_write_error_partitions_succeeded_and_failed(self): @@ -632,10 +632,10 @@ async def test_bulk_write_error_partitions_succeeded_and_failed(self): {"index": 5, "code": 11000, "errmsg": "duplicate key"}, ] }) - contrib_repo.insert_many_contributions.side_effect = bulk_err + contrib_repo.insert_many.side_effect = bulk_err contribs = [_contrib_in(identifier=f"mp-{i}") for i in range(6)] - summary = await svc.insert_contributions(contribs) + summary = await svc.insert_many(contribs) assert summary.total == 6 assert sorted(f.index for f in summary.failed) == [2, 5] @@ -645,7 +645,7 @@ async def test_bulk_write_error_partitions_succeeded_and_failed(self): # --------------------------------------------------------------------------- -# insert_contributions — per-contribution transaction path +# insert_many — per-contribution transaction path # --------------------------------------------------------------------------- @@ -653,17 +653,17 @@ class TestInsertContributionsTransactionPath: async def test_with_components_opens_session_per_contribution(self): svc, contrib_repo, struct_repo, table_repo, attach_repo, client = _make_service() - struct_repo.insert_components.return_value = [_fake_structure()] - table_repo.insert_components.return_value = [] - attach_repo.insert_components.return_value = [] + struct_repo.insert_many.return_value = [_fake_structure()] + table_repo.insert_many.return_value = [] + attach_repo.insert_many.return_value = [] async def _insert(doc, session=None): return doc - contrib_repo.insert_contribution.side_effect = _insert + contrib_repo.insert_one.side_effect = _insert contribs = [_contrib_in(identifier=f"c{i}", structures=[_structure_in()]) for i in range(3)] - summary = await svc.insert_contributions(contribs) + summary = await svc.insert_many(contribs) assert client.start_session.call_count == 3 assert summary.total == 3 @@ -674,30 +674,30 @@ async def test_session_threaded_to_all_repo_calls(self): client, session = _make_fake_client() svc, contrib_repo, struct_repo, table_repo, _, _ = _make_service(client=client) - struct_repo.insert_components.return_value = [_fake_structure()] - table_repo.insert_components.return_value = [_fake_table()] + struct_repo.insert_many.return_value = [_fake_structure()] + table_repo.insert_many.return_value = [_fake_table()] async def _insert(doc, session=None): return doc - contrib_repo.insert_contribution.side_effect = _insert + contrib_repo.insert_one.side_effect = _insert contrib = _contrib_in( structures=[_structure_in()], tables=[_table_in()], attachments=[_attachment_in()], ) - await svc.insert_contributions([contrib]) - assert struct_repo.insert_components.call_args.kwargs["session"] is session - assert table_repo.insert_components.call_args.kwargs["session"] is session - assert contrib_repo.insert_contribution.call_args.kwargs["session"] is session + await svc.insert_many([contrib]) + assert struct_repo.insert_many.call_args.kwargs["session"] is session + assert table_repo.insert_many.call_args.kwargs["session"] is session + assert contrib_repo.insert_one.call_args.kwargs["session"] is session async def test_failure_on_second_of_three_yields_summary(self): svc, contrib_repo, struct_repo, table_repo, attach_repo, _ = _make_service() - struct_repo.insert_components.return_value = [_fake_structure()] - table_repo.insert_components.return_value = [] - attach_repo.insert_components.return_value = [] + struct_repo.insert_many.return_value = [_fake_structure()] + table_repo.insert_many.return_value = [] + attach_repo.insert_many.return_value = [] async def _insert(doc, session=None): # Fail the second contribution by inspecting the doc's material_id @@ -705,14 +705,14 @@ async def _insert(doc, session=None): raise ConflictError("conflict on insert") return doc - contrib_repo.insert_contribution.side_effect = _insert + contrib_repo.insert_one.side_effect = _insert contribs = [ _contrib_in(identifier="ok-1", structures=[_structure_in()]), _contrib_in(identifier="fail", structures=[_structure_in()]), _contrib_in(identifier="ok-2", structures=[_structure_in()]), ] - summary = await svc.insert_contributions(contribs) + summary = await svc.insert_many(contribs) assert summary.total == 3 assert len(summary.succeeded) == 2 @@ -725,9 +725,9 @@ async def test_component_links_wired_per_contribution(self): struct_a, struct_b = _fake_structure(), _fake_structure() struct_calls = iter([[struct_a], [struct_b]]) - struct_repo.insert_components.side_effect = lambda *_args, **_kwargs: next(struct_calls) - table_repo.insert_components.return_value = [] - attach_repo.insert_components.return_value = [] + struct_repo.insert_many.side_effect = lambda *_args, **_kwargs: next(struct_calls) + table_repo.insert_many.return_value = [] + attach_repo.insert_many.return_value = [] captured: list[Contribution] = [] @@ -735,25 +735,25 @@ async def _insert(doc, session=None): captured.append(doc) return doc - contrib_repo.insert_contribution.side_effect = _insert + contrib_repo.insert_one.side_effect = _insert contribs = [ _contrib_in(identifier="a", structures=[_structure_in()]), _contrib_in(identifier="b", structures=[_structure_in()]), ] - await svc.insert_contributions(contribs) + await svc.insert_many(contribs) - captured_by_id = {c.material_id: c for c in captured} - assert captured_by_id[_mp_id_for("a")].structures == [struct_a] - assert captured_by_id[_mp_id_for("b")].structures == [struct_b] + captured = {c.material_id: c for c in captured} + assert captured[_mp_id_for("a")].structures == [struct_a] + assert captured[_mp_id_for("b")].structures == [struct_b] async def test_pivoting_submission_shares_components_across_rows(self): svc, contrib_repo, struct_repo, table_repo, attach_repo, client = _make_service() shared = _fake_structure() - struct_repo.insert_components.return_value = [shared] - table_repo.insert_components.return_value = [] - attach_repo.insert_components.return_value = [] + struct_repo.insert_many.return_value = [shared] + table_repo.insert_many.return_value = [] + attach_repo.insert_many.return_value = [] captured: list[Contribution] = [] @@ -761,7 +761,7 @@ async def _insert(doc, session=None): captured.append(doc) return doc - contrib_repo.insert_contribution.side_effect = _insert + contrib_repo.insert_one.side_effect = _insert # One submission that pivots into two rows (T=300K / T=400K) and carries a structure. contrib = _contrib_in( @@ -769,12 +769,12 @@ async def _insert(doc, session=None): data={"x (eV, T=300K)": 1, "x (eV, T=400K)": 2}, structures=[_structure_in()], ) - summary = await svc.insert_contributions([contrib]) + summary = await svc.insert_many([contrib]) # Components inserted once for the whole submission; both rows written in one transaction. - assert struct_repo.insert_components.call_count == 1 + assert struct_repo.insert_many.call_count == 1 assert client.start_session.call_count == 1 - assert contrib_repo.insert_contribution.call_count == 2 + assert contrib_repo.insert_one.call_count == 2 # Both pivoted rows link to the same shared structure and carry distinct condition keys. assert len(captured) == 2 assert all(doc.structures == [shared] for doc in captured) @@ -786,7 +786,7 @@ async def _insert(doc, session=None): # --------------------------------------------------------------------------- -# insert_contributions — mixed batch (partitioned across paths) +# insert_many — mixed batch (partitioned across paths) # --------------------------------------------------------------------------- @@ -794,15 +794,15 @@ class TestInsertContributionsMixedBatch: async def test_mixed_batch_routes_correctly(self): svc, contrib_repo, struct_repo, table_repo, attach_repo, client = _make_service() - struct_repo.insert_components.return_value = [_fake_structure()] - table_repo.insert_components.return_value = [] - attach_repo.insert_components.return_value = [] - contrib_repo.insert_many_contributions.return_value = None + struct_repo.insert_many.return_value = [_fake_structure()] + table_repo.insert_many.return_value = [] + attach_repo.insert_many.return_value = [] + contrib_repo.insert_many.return_value = None async def _insert(doc, session=None): return doc - contrib_repo.insert_contribution.side_effect = _insert + contrib_repo.insert_one.side_effect = _insert contribs = [ _contrib_in(identifier="bare-1"), @@ -810,14 +810,14 @@ async def _insert(doc, session=None): _contrib_in(identifier="bare-2"), _contrib_in(identifier="with-2", structures=[_structure_in()]), ] - summary = await svc.insert_contributions(contribs) + summary = await svc.insert_many(contribs) # No-component path: single batched call - contrib_repo.insert_many_contributions.assert_called_once() - assert len(contrib_repo.insert_many_contributions.call_args[0][0]) == 2 + contrib_repo.insert_many.assert_called_once() + assert len(contrib_repo.insert_many.call_args[0][0]) == 2 # With-component path: one session per item assert client.start_session.call_count == 2 - assert contrib_repo.insert_contribution.call_count == 2 + assert contrib_repo.insert_one.call_count == 2 assert summary.total == 4 assert len(summary.succeeded) == 4 assert summary.failed == [] @@ -842,64 +842,64 @@ def _projects_mock(unique_map: dict[str, str | None]) -> AsyncMock: class TestContributionIdentity: async def test_insert_existing_identity_conflicts(self): svc, contrib_repo, *_ = _make_service() - contrib_repo.insert_many_contributions.return_value = None + contrib_repo.insert_many.return_value = None contrib_repo.existing_identities.return_value = { ContributionIdentity(project="proj", material_id="mp-1", chemical_system_id="Fe-O", formula="Fe2O3") } - summary = await svc.insert_contributions([_contrib_in(identifier="mp-1")]) + summary = await svc.insert_many([_contrib_in(identifier="mp-1")]) assert summary.total == 1 assert summary.succeeded == [] assert [f.error_code for f in summary.failed] == ["conflict"] - contrib_repo.insert_many_contributions.assert_not_called() + contrib_repo.insert_many.assert_not_called() async def test_insert_no_existing_identity_succeeds(self): svc, contrib_repo, *_ = _make_service() - contrib_repo.insert_many_contributions.return_value = None + contrib_repo.insert_many.return_value = None - summary = await svc.insert_contributions([_contrib_in(identifier="mp-1")]) + summary = await svc.insert_many([_contrib_in(identifier="mp-1")]) assert len(summary.succeeded) == 1 - docs = contrib_repo.insert_many_contributions.call_args[0][0] + docs = contrib_repo.insert_many.call_args[0][0] assert docs[0].unique_value is None async def test_insert_unique_column_promotes_value_to_unique_value(self): svc, contrib_repo, *_ = _make_service(unique_column="sample_id") - contrib_repo.insert_many_contributions.return_value = None + contrib_repo.insert_many.return_value = None - summary = await svc.insert_contributions([_contrib_in(data={"sample_id": "A"})]) + summary = await svc.insert_many([_contrib_in(data={"sample_id": "A"})]) assert len(summary.succeeded) == 1 - docs = contrib_repo.insert_many_contributions.call_args[0][0] + docs = contrib_repo.insert_many.call_args[0][0] assert docs[0].unique_value == "A" async def test_insert_same_triple_distinct_unique_value_both_succeed(self): svc, contrib_repo, *_ = _make_service(unique_column="sample_id") - contrib_repo.insert_many_contributions.return_value = None + contrib_repo.insert_many.return_value = None contribs = [_contrib_in(data={"sample_id": "A"}), _contrib_in(data={"sample_id": "B"})] - summary = await svc.insert_contributions(contribs) + summary = await svc.insert_many(contribs) assert len(summary.succeeded) == 2 - docs = contrib_repo.insert_many_contributions.call_args[0][0] + docs = contrib_repo.insert_many.call_args[0][0] assert sorted(d.unique_value for d in docs) == ["A", "B"] async def test_insert_missing_unique_column_value_is_validation_failure(self): svc, contrib_repo, *_ = _make_service(unique_column="sample_id") - contrib_repo.insert_many_contributions.return_value = None + contrib_repo.insert_many.return_value = None - summary = await svc.insert_contributions([_contrib_in(data={"other": 1})]) + summary = await svc.insert_many([_contrib_in(data={"other": 1})]) assert summary.succeeded == [] assert [f.error_code for f in summary.failed] == ["validation_error"] - contrib_repo.insert_many_contributions.assert_not_called() + contrib_repo.insert_many.assert_not_called() async def test_insert_non_scalar_unique_column_value_is_validation_failure(self): svc, contrib_repo, *_ = _make_service(unique_column="sample_id") - contrib_repo.insert_many_contributions.return_value = None + contrib_repo.insert_many.return_value = None - summary = await svc.insert_contributions([_contrib_in(data={"sample_id": {"nested": 1}})]) + summary = await svc.insert_many([_contrib_in(data={"sample_id": {"nested": 1}})]) assert summary.succeeded == [] assert [f.error_code for f in summary.failed] == ["validation_error"] @@ -907,10 +907,10 @@ async def test_insert_non_scalar_unique_column_value_is_validation_failure(self) async def test_insert_empty_unique_column_dup_triple_conflicts(self): """With no unique_column, two contributions sharing the fixed-field triple collide.""" svc, contrib_repo, *_ = _make_service() # unique_column=None - contrib_repo.insert_many_contributions.return_value = None + contrib_repo.insert_many.return_value = None contribs = [_contrib_in(identifier="mp-1"), _contrib_in(identifier="mp-1")] - summary = await svc.insert_contributions(contribs) + summary = await svc.insert_many(contribs) assert len(summary.succeeded) == 1 assert [f.error_code for f in summary.failed] == ["conflict"] @@ -918,18 +918,18 @@ async def test_insert_empty_unique_column_dup_triple_conflicts(self): async def test_insert_project_not_found_is_validation_failure(self): svc, contrib_repo, *_ = _make_service(projects=_projects_mock({})) # no projects known - summary = await svc.insert_contributions([_contrib_in(identifier="mp-1")]) + summary = await svc.insert_many([_contrib_in(identifier="mp-1")]) assert summary.succeeded == [] assert [f.error_code for f in summary.failed] == ["validation_error"] - contrib_repo.insert_many_contributions.assert_not_called() + contrib_repo.insert_many.assert_not_called() async def test_upsert_does_not_conflict_on_existing_identity(self): """Upsert targets an existing identity (update), so it must not pre-reject as a conflict.""" svc, contrib_repo, *_ = _make_service() contrib_repo.upsert_one.return_value = MagicMock(spec=Contribution, project="proj") - await svc.upsert_contributions([_contrib_in(identifier="mp-1")]) + await svc.upsert_many([_contrib_in(identifier="mp-1")]) # existing_identities is not consulted on the upsert path contrib_repo.existing_identities.assert_not_called() @@ -939,7 +939,7 @@ async def test_upsert_passes_resolved_unique_value_in_identifiers(self): svc, contrib_repo, *_ = _make_service(unique_column="sample_id") contrib_repo.upsert_one.return_value = MagicMock(spec=Contribution, project="proj") - await svc.upsert_contributions([_contrib_in(data={"sample_id": "A"})]) + await svc.upsert_many([_contrib_in(data={"sample_id": "A"})]) identifiers = contrib_repo.upsert_one.call_args.args[0] assert identifiers["unique_value"] == "A" @@ -947,7 +947,7 @@ async def test_upsert_passes_resolved_unique_value_in_identifiers(self): async def test_upsert_missing_unique_column_value_is_validation_failure(self): svc, contrib_repo, *_ = _make_service(unique_column="sample_id") - summary = await svc.upsert_contributions([_contrib_in(data={"other": 1})]) + summary = await svc.upsert_many([_contrib_in(data={"other": 1})]) assert summary.succeeded == [] assert [f.error_code for f in summary.failed] == ["validation_error"] @@ -956,7 +956,7 @@ async def test_upsert_missing_unique_column_value_is_validation_failure(self): # --------------------------------------------------------------------------- -# upsert_contributions — guard clause +# upsert_many — guard clause # --------------------------------------------------------------------------- @@ -965,26 +965,26 @@ async def test_raises_validation_error_when_any_contrib_has_structures(self): svc, *_ = _make_service() contrib = _contrib_in(structures=[_structure_in()]) with pytest.raises(ValidationError): - await svc.upsert_contributions([contrib]) + await svc.upsert_many([contrib]) async def test_raises_validation_error_when_any_contrib_has_tables(self): svc, *_ = _make_service() contrib = _contrib_in(tables=[_table_in()]) with pytest.raises(ValidationError): - await svc.upsert_contributions([contrib]) + await svc.upsert_many([contrib]) async def test_raises_validation_error_when_any_contrib_has_attachments(self): svc, *_ = _make_service() contrib = _contrib_in(attachments=[_attachment_in()]) with pytest.raises(ValidationError): - await svc.upsert_contributions([contrib]) + await svc.upsert_many([contrib]) async def test_error_reports_indices_of_offending_contribs(self): svc, *_ = _make_service() clean = _contrib_in(identifier="clean") dirty = _contrib_in(identifier="dirty", structures=[_structure_in()]) with pytest.raises(ValidationError) as exc_info: - await svc.upsert_contributions([clean, dirty]) + await svc.upsert_many([clean, dirty]) assert exc_info.value.context.get("contribution_indices") == [1] async def test_multiple_offenders_all_indices_reported(self): @@ -995,20 +995,20 @@ async def test_multiple_offenders_all_indices_reported(self): _contrib_in(identifier="c2", tables=[_table_in()]), ] with pytest.raises(ValidationError) as exc_info: - await svc.upsert_contributions(contribs) + await svc.upsert_many(contribs) assert exc_info.value.context.get("contribution_indices") == [0, 2] async def test_raises_before_any_db_write(self): svc, contrib_repo, *_ = _make_service() dirty = _contrib_in(structures=[_structure_in()]) with pytest.raises(ValidationError): - await svc.upsert_contributions([dirty]) + await svc.upsert_many([dirty]) contrib_repo.upsert_one.assert_not_called() - contrib_repo.insert_contribution.assert_not_called() + contrib_repo.insert_one.assert_not_called() # --------------------------------------------------------------------------- -# upsert_contributions — atomic dispatch +# upsert_many — atomic dispatch # --------------------------------------------------------------------------- @@ -1018,21 +1018,21 @@ async def test_calls_atomic_repo_method_once_per_item(self): contrib_repo.upsert_one.return_value = MagicMock(spec=Contribution, project="proj") contribs = [_contrib_in(identifier=f"mp-{i}") for i in range(3)] - summary = await svc.upsert_contributions(contribs) + summary = await svc.upsert_many(contribs) assert summary.total == 3 assert len(summary.succeeded) == 3 assert summary.failed == [] assert contrib_repo.upsert_one.call_count == 3 # The atomic upsert path is used, not the bulk insert path. - contrib_repo.insert_contribution.assert_not_called() + contrib_repo.insert_one.assert_not_called() async def test_passes_identifiers_dict_and_input_to_repo(self): svc, contrib_repo, *_ = _make_service() contrib_repo.upsert_one.return_value = MagicMock(spec=Contribution, project="proj") contrib = _contrib_in(project="my-proj", material_id="mp-99") - await svc.upsert_contributions([contrib]) + await svc.upsert_many([contrib]) call = contrib_repo.upsert_one.call_args assert call.args[0] == { @@ -1060,13 +1060,13 @@ async def _upsert(identifiers, contrib): contrib_repo.upsert_one.side_effect = _upsert contribs = [_contrib_in(identifier=f"mp-{i}") for i in range(3)] - summary = await svc.upsert_contributions(contribs) + summary = await svc.upsert_many(contribs) assert summary.succeeded == [returned["mp-0"], returned["mp-1"], returned["mp-2"]] async def test_empty_batch_returns_empty_summary(self): svc, contrib_repo, *_ = _make_service() - summary = await svc.upsert_contributions([]) + summary = await svc.upsert_many([]) assert summary.total == 0 assert summary.succeeded == [] assert summary.failed == [] @@ -1084,7 +1084,7 @@ async def test_same_key_concurrent_upserts_both_go_through_atomic_call(self): _contrib_in(project="prj", identifier="same"), _contrib_in(project="prj", identifier="same"), ] - summary = await svc.upsert_contributions(contribs) + summary = await svc.upsert_many(contribs) assert len(summary.succeeded) == 2 assert contrib_repo.upsert_one.call_count == 2 @@ -1100,7 +1100,7 @@ async def _upsert(identifiers, contrib): contrib_repo.upsert_one.side_effect = _upsert contribs = [_contrib_in(identifier=f"mp-{i}") for i in range(3)] - summary = await svc.upsert_contributions(contribs) + summary = await svc.upsert_many(contribs) assert summary.total == 3 assert len(summary.succeeded) == 2 @@ -1121,13 +1121,13 @@ def _member_user(*projects: str) -> User: class TestWriteAuthorization: async def test_insert_rejects_unauthorized_project_per_item(self): svc, contrib_repo, struct_repo, _, _, client = _make_service(user=_member_user("allowed")) - contrib_repo.insert_many_contributions.return_value = None + contrib_repo.insert_many.return_value = None contribs = [ _contrib_in(project="allowed", identifier="ok"), _contrib_in(project="forbidden", identifier="nope"), ] - summary = await svc.insert_contributions(contribs) + summary = await svc.insert_many(contribs) assert summary.total == 2 assert len(summary.succeeded) == 1 @@ -1135,14 +1135,14 @@ async def test_insert_rejects_unauthorized_project_per_item(self): assert summary.failed[0].error_code == "permission_denied" assert "forbidden" in summary.failed[0].message # Only the authorized item reached Mongo - contrib_repo.insert_many_contributions.assert_called_once() + contrib_repo.insert_many.assert_called_once() async def test_insert_admin_bypasses_authorization(self): svc, contrib_repo, *_ = _make_service() # default user is admin - contrib_repo.insert_many_contributions.return_value = None + contrib_repo.insert_many.return_value = None contribs = [_contrib_in(project="anything", identifier=f"mp-{i}") for i in range(2)] - summary = await svc.insert_contributions(contribs) + summary = await svc.insert_many(contribs) assert summary.total == 2 assert len(summary.succeeded) == 2 @@ -1155,13 +1155,13 @@ async def test_insert_unauthorized_and_oversize_yield_single_failure(self): svc, contrib_repo, struct_repo, _, _, _ = _make_service(user=_member_user("allowed"), settings=settings) bad = _contrib_in(project="forbidden", identifier="big", structures=[_structure_in(), _structure_in()]) - summary = await svc.insert_contributions([bad]) + summary = await svc.insert_many([bad]) assert summary.total == 1 assert len(summary.failed) == 1 assert summary.failed[0].index == 0 assert summary.failed[0].error_code == "permission_denied" - struct_repo.insert_components.assert_not_called() + struct_repo.insert_many.assert_not_called() async def test_upsert_rejects_unauthorized_project_per_item(self): svc, contrib_repo, *_ = _make_service(user=_member_user("allowed")) @@ -1171,7 +1171,7 @@ async def test_upsert_rejects_unauthorized_project_per_item(self): _contrib_in(project="allowed", identifier="ok"), _contrib_in(project="forbidden", identifier="nope"), ] - summary = await svc.upsert_contributions(contribs) + summary = await svc.upsert_many(contribs) assert summary.total == 2 assert len(summary.succeeded) == 1 @@ -1184,26 +1184,26 @@ async def test_upsert_rejects_unauthorized_project_per_item(self): async def test_upsert_anonymous_authorized_for_nothing(self): svc, contrib_repo, *_ = _make_service(user=User()) # anonymous: no username, no groups - summary = await svc.upsert_contributions([_contrib_in(project="any", identifier="x")]) + summary = await svc.upsert_many([_contrib_in(project="any", identifier="x")]) assert summary.total == 1 assert summary.succeeded == [] assert [f.error_code for f in summary.failed] == ["permission_denied"] contrib_repo.upsert_one.assert_not_called() - async def test_upsert_by_id_rejects_unauthorized_project(self): + async def test_upsert_rejects_unauthorized_project(self): # A member of "allowed" cannot write "forbidden" through the by-id endpoint. The check runs # before any DB access, so neither the existence read nor the write is attempted — closing # the gap where the upsert's unscoped insert branch would create the contribution anyway. svc, contrib_repo, *_ = _make_service(user=_member_user("allowed")) with pytest.raises(PermissionError, match="forbidden"): - await svc.upsert_contribution_by_id("someid", _contrib_in(project="forbidden")) + await svc.upsert_one("someid", _contrib_in(project="forbidden")) contrib_repo.get_one.assert_not_called() - contrib_repo.upsert_contribution_by_id.assert_not_called() + contrib_repo.upsert_one.assert_not_called() - async def test_upsert_by_id_unauthorized_cannot_overwrite_public_contribution(self): + async def test_upsert_unauthorized_cannot_overwrite_public_contribution(self): # Defense against overwriting a project's public contribution you don't own: even though the # repository read scope would admit a public row, authorization is enforced up front. svc, contrib_repo, *_ = _make_service(user=_member_user("allowed")) @@ -1211,46 +1211,46 @@ async def test_upsert_by_id_unauthorized_cannot_overwrite_public_contribution(se contrib_repo.get_one.return_value = MagicMock(spec=Contribution) with pytest.raises(PermissionError, match="forbidden"): - await svc.upsert_contribution_by_id("someid", _contrib_in(project="forbidden")) + await svc.upsert_one("someid", _contrib_in(project="forbidden")) - contrib_repo.upsert_contribution_by_id.assert_not_called() + contrib_repo.upsert_one.assert_not_called() - async def test_upsert_by_id_anonymous_authorized_for_nothing(self): + async def test_upsert_anonymous_authorized_for_nothing(self): svc, contrib_repo, *_ = _make_service(user=User()) # anonymous: no username, no groups with pytest.raises(PermissionError): - await svc.upsert_contribution_by_id("someid", _contrib_in(project="any")) + await svc.upsert_one("someid", _contrib_in(project="any")) contrib_repo.get_one.assert_not_called() - contrib_repo.upsert_contribution_by_id.assert_not_called() + contrib_repo.upsert_one.assert_not_called() - async def test_upsert_by_id_authorized_member_proceeds(self): + async def test_upsert_authorized_member_proceeds(self): # A member writing to their own project passes authorization; updating an existing row is # not gated by the quota, so the write goes through. contrib_repo = AsyncMock() contrib_repo.get_one.return_value = MagicMock(spec=Contribution) # exists -> update - contrib_repo.upsert_contribution_by_id.return_value = MagicMock(spec=Contribution) + contrib_repo.upsert_one.return_value = MagicMock(spec=Contribution) svc, *_ = _make_service( contributions=contrib_repo, projects=_unapproved_projects_repo(), user=_member_user("allowed") ) - await svc.upsert_contribution_by_id("someid", _contrib_in(project="allowed")) + await svc.upsert_one("someid", _contrib_in(project="allowed")) - contrib_repo.upsert_contribution_by_id.assert_called_once() + contrib_repo.upsert_one.assert_called_once() - async def test_upsert_by_id_admin_bypasses_authorization(self): + async def test_upsert_admin_bypasses_authorization(self): contrib_repo = AsyncMock() contrib_repo.get_one.return_value = MagicMock(spec=Contribution) - contrib_repo.upsert_contribution_by_id.return_value = MagicMock(spec=Contribution) + contrib_repo.upsert_one.return_value = MagicMock(spec=Contribution) svc, *_ = _make_service(contributions=contrib_repo, projects=_approved_projects_repo()) # admin default - await svc.upsert_contribution_by_id("someid", _contrib_in(project="anything")) + await svc.upsert_one("someid", _contrib_in(project="anything")) - contrib_repo.upsert_contribution_by_id.assert_called_once() + contrib_repo.upsert_one.assert_called_once() # --------------------------------------------------------------------------- -# delete_contributions — cascade delete (components-first), cursor loop +# delete_many — cascade delete (components-first), cursor loop # --------------------------------------------------------------------------- from types import SimpleNamespace # noqa: E402 @@ -1266,7 +1266,7 @@ def _link(ref_id: PydanticObjectId) -> SimpleNamespace: def _contrib_doc(structures=None, attachments=None, tables=None, id_=None, project="proj") -> SimpleNamespace: - """A contribution page item exposing the attributes delete_contributions reads.""" + """A contribution page item exposing the attributes delete_many reads.""" return SimpleNamespace( id=id_ or _oid(), project=project, @@ -1281,8 +1281,8 @@ def _page(items) -> Page: def _delete_result(n: int) -> SimpleNamespace: - """Stand-in for pymongo DeleteResult (only ``.deleted_count`` is read).""" - return SimpleNamespace(deleted_count=n) + """Stand-in for the delete result (only ``.num_deleted`` is read).""" + return SimpleNamespace(num_deleted=n) def _noop_filter() -> ContributionFilter: @@ -1292,33 +1292,33 @@ def _noop_filter() -> ContributionFilter: class TestDeleteContributionsEmpty: async def test_empty_match_returns_zero_summary(self): svc, contrib_repo, *_ = _make_service() - contrib_repo.get_contributions.return_value = _page([]) - contrib_repo.delete_contributions.return_value = _delete_result(0) + contrib_repo.get_many.return_value = _page([]) + contrib_repo.delete_many.return_value = _delete_result(0) - summary = await svc.delete_contributions(_noop_filter()) + summary = await svc.delete_many(_noop_filter()) assert summary.num_deleted == 0 assert summary.num_children_deleted == 0 async def test_empty_match_does_not_call_child_repos(self): svc, contrib_repo, struct_repo, table_repo, attach_repo, _ = _make_service() - contrib_repo.get_contributions.return_value = _page([]) - contrib_repo.delete_contributions.return_value = _delete_result(0) + contrib_repo.get_many.return_value = _page([]) + contrib_repo.delete_many.return_value = _delete_result(0) - await svc.delete_contributions(_noop_filter()) + await svc.delete_many(_noop_filter()) - struct_repo.delete_by_ids.assert_not_called() - table_repo.delete_by_ids.assert_not_called() - attach_repo.delete_by_ids.assert_not_called() + struct_repo.delete_many.assert_not_called() + table_repo.delete_many.assert_not_called() + attach_repo.delete_many.assert_not_called() async def test_empty_match_terminates_after_one_page(self): svc, contrib_repo, *_ = _make_service() - contrib_repo.get_contributions.return_value = _page([]) - contrib_repo.delete_contributions.return_value = _delete_result(0) + contrib_repo.get_many.return_value = _page([]) + contrib_repo.delete_many.return_value = _delete_result(0) - await svc.delete_contributions(_noop_filter()) + await svc.delete_many(_noop_filter()) - assert contrib_repo.get_contributions.await_count == 1 + assert contrib_repo.get_many.await_count == 1 class TestDeleteContributionsSinglePage: @@ -1326,23 +1326,23 @@ async def test_deletes_contributions_then_terminates(self): svc, contrib_repo, *_ = _make_service() docs = [_contrib_doc() for _ in range(3)] # First call returns the page; second returns empty so the loop ends. - contrib_repo.get_contributions.side_effect = [_page(docs), _page([])] - contrib_repo.delete_contributions.side_effect = [_delete_result(3), _delete_result(0)] + contrib_repo.get_many.side_effect = [_page(docs), _page([])] + contrib_repo.delete_many.side_effect = [_delete_result(3), _delete_result(0)] - summary = await svc.delete_contributions(_noop_filter()) + summary = await svc.delete_many(_noop_filter()) assert summary.num_deleted == 3 async def test_no_components_means_no_child_deletes(self): svc, contrib_repo, struct_repo, table_repo, attach_repo, _ = _make_service() - contrib_repo.get_contributions.side_effect = [_page([_contrib_doc()]), _page([])] - contrib_repo.delete_contributions.side_effect = [_delete_result(1), _delete_result(0)] + contrib_repo.get_many.side_effect = [_page([_contrib_doc()]), _page([])] + contrib_repo.delete_many.side_effect = [_delete_result(1), _delete_result(0)] - summary = await svc.delete_contributions(_noop_filter()) + summary = await svc.delete_many(_noop_filter()) - struct_repo.delete_by_ids.assert_not_called() - table_repo.delete_by_ids.assert_not_called() - attach_repo.delete_by_ids.assert_not_called() + struct_repo.delete_many.assert_not_called() + table_repo.delete_many.assert_not_called() + attach_repo.delete_many.assert_not_called() assert summary.num_children_deleted == 0 async def test_components_deleted_before_contributions(self): @@ -1351,7 +1351,7 @@ async def test_components_deleted_before_contributions(self): svc, contrib_repo, struct_repo, table_repo, attach_repo, _ = _make_service() doc = _contrib_doc(structures=[_oid()], tables=[_oid()], attachments=[_oid()]) - contrib_repo.get_contributions.side_effect = [_page([doc]), _page([])] + contrib_repo.get_many.side_effect = [_page([doc]), _page([])] def _make_child_recorder(name): async def _record(ids, *a, **k): @@ -1360,17 +1360,17 @@ async def _record(ids, *a, **k): return _record - struct_repo.delete_by_ids.side_effect = _make_child_recorder("structures") - table_repo.delete_by_ids.side_effect = _make_child_recorder("tables") - attach_repo.delete_by_ids.side_effect = _make_child_recorder("attachments") + struct_repo.delete_many.side_effect = _make_child_recorder("structures") + table_repo.delete_many.side_effect = _make_child_recorder("tables") + attach_repo.delete_many.side_effect = _make_child_recorder("attachments") async def _record_contrib(_filter, *a, **k): order.append("contributions") return _delete_result(1) - contrib_repo.delete_contributions.side_effect = _record_contrib + contrib_repo.delete_many.side_effect = _record_contrib - await svc.delete_contributions(_noop_filter()) + await svc.delete_many(_noop_filter()) # The loop makes a final pass on the empty page that still issues one # (no-op) contribution delete before breaking, so there are two @@ -1383,78 +1383,78 @@ async def test_child_ids_collected_from_links(self): svc, contrib_repo, struct_repo, *_ = _make_service() s1, s2 = _oid(), _oid() doc = _contrib_doc(structures=[s1, s2]) - contrib_repo.get_contributions.side_effect = [_page([doc]), _page([])] - struct_repo.delete_by_ids.return_value = DeleteResponse(num_deleted=2) - contrib_repo.delete_contributions.side_effect = [_delete_result(1), _delete_result(0)] + contrib_repo.get_many.side_effect = [_page([doc]), _page([])] + struct_repo.delete_many.return_value = DeleteResponse(num_deleted=2) + contrib_repo.delete_many.side_effect = [_delete_result(1), _delete_result(0)] - await svc.delete_contributions(_noop_filter()) + await svc.delete_many(_noop_filter()) - called_ids = struct_repo.delete_by_ids.await_args.args[0] - assert set(called_ids) == {s1, s2} + called_filter = struct_repo.delete_many.await_args.args[0] + assert set(called_filter.id__in) == {s1, s2} async def test_child_counts_accumulated_across_types(self): svc, contrib_repo, struct_repo, table_repo, attach_repo, _ = _make_service() doc = _contrib_doc(structures=[_oid()], tables=[_oid(), _oid()], attachments=[_oid()]) - contrib_repo.get_contributions.side_effect = [_page([doc]), _page([])] - struct_repo.delete_by_ids.return_value = DeleteResponse(num_deleted=1) - table_repo.delete_by_ids.return_value = DeleteResponse(num_deleted=2) - attach_repo.delete_by_ids.return_value = DeleteResponse(num_deleted=1) - contrib_repo.delete_contributions.side_effect = [_delete_result(1), _delete_result(0)] + contrib_repo.get_many.side_effect = [_page([doc]), _page([])] + struct_repo.delete_many.return_value = DeleteResponse(num_deleted=1) + table_repo.delete_many.return_value = DeleteResponse(num_deleted=2) + attach_repo.delete_many.return_value = DeleteResponse(num_deleted=1) + contrib_repo.delete_many.side_effect = [_delete_result(1), _delete_result(0)] - summary = await svc.delete_contributions(_noop_filter()) + summary = await svc.delete_many(_noop_filter()) assert summary.num_children_deleted == 4 - async def test_contributions_deleted_by_id_in_of_page(self): + async def test_contributions_deleted_in_of_page(self): svc, contrib_repo, *_ = _make_service() ids = [_oid(), _oid()] docs = [_contrib_doc(id_=i) for i in ids] - contrib_repo.get_contributions.side_effect = [_page(docs), _page([])] - contrib_repo.delete_contributions.side_effect = [_delete_result(2), _delete_result(0)] + contrib_repo.get_many.side_effect = [_page(docs), _page([])] + contrib_repo.delete_many.side_effect = [_delete_result(2), _delete_result(0)] - await svc.delete_contributions(_noop_filter()) + await svc.delete_many(_noop_filter()) - first_call_filter = contrib_repo.delete_contributions.await_args_list[0].args[0] + first_call_filter = contrib_repo.delete_many.await_args_list[0].args[0] assert set(first_call_filter.id__in) == set(ids) class TestDeleteContributionsMultiPage: async def test_loops_until_page_empty(self): svc, contrib_repo, *_ = _make_service() - contrib_repo.get_contributions.side_effect = [ + contrib_repo.get_many.side_effect = [ _page([_contrib_doc() for _ in range(2)]), _page([_contrib_doc()]), _page([]), ] - contrib_repo.delete_contributions.side_effect = [ + contrib_repo.delete_many.side_effect = [ _delete_result(2), _delete_result(1), _delete_result(0), ] - summary = await svc.delete_contributions(_noop_filter()) + summary = await svc.delete_many(_noop_filter()) assert summary.num_deleted == 3 - assert contrib_repo.get_contributions.await_count == 3 + assert contrib_repo.get_many.await_count == 3 async def test_children_accumulate_across_pages(self): svc, contrib_repo, struct_repo, *_ = _make_service() - contrib_repo.get_contributions.side_effect = [ + contrib_repo.get_many.side_effect = [ _page([_contrib_doc(structures=[_oid()])]), _page([_contrib_doc(structures=[_oid()])]), _page([]), ] - struct_repo.delete_by_ids.return_value = DeleteResponse(num_deleted=1) - contrib_repo.delete_contributions.side_effect = [ + struct_repo.delete_many.return_value = DeleteResponse(num_deleted=1) + contrib_repo.delete_many.side_effect = [ _delete_result(1), _delete_result(1), _delete_result(0), ] - summary = await svc.delete_contributions(_noop_filter()) + summary = await svc.delete_many(_noop_filter()) assert summary.num_children_deleted == 2 - assert struct_repo.delete_by_ids.await_count == 2 + assert struct_repo.delete_many.await_count == 2 class TestDeleteContributionsNoneComponents: @@ -1466,20 +1466,20 @@ class TestDeleteContributionsNoneComponents: async def test_none_component_fields_do_not_raise(self): svc, contrib_repo, struct_repo, table_repo, attach_repo, _ = _make_service() doc = SimpleNamespace(id=_oid(), project="proj", structures=None, tables=None, attachments=None) - contrib_repo.get_contributions.side_effect = [_page([doc]), _page([])] - contrib_repo.delete_contributions.side_effect = [_delete_result(1), _delete_result(0)] + contrib_repo.get_many.side_effect = [_page([doc]), _page([])] + contrib_repo.delete_many.side_effect = [_delete_result(1), _delete_result(0)] - summary = await svc.delete_contributions(_noop_filter()) + summary = await svc.delete_many(_noop_filter()) assert summary.num_deleted == 1 assert summary.num_children_deleted == 0 - struct_repo.delete_by_ids.assert_not_called() - table_repo.delete_by_ids.assert_not_called() - attach_repo.delete_by_ids.assert_not_called() + struct_repo.delete_many.assert_not_called() + table_repo.delete_many.assert_not_called() + attach_repo.delete_many.assert_not_called() # --------------------------------------------------------------------------- -# patch_contribution_by_id — identifier hierarchy on the merged state +# patch_one — identifier hierarchy on the merged state # --------------------------------------------------------------------------- @@ -1502,7 +1502,7 @@ async def test_patch_material_id_onto_doc_without_formula_raises(self): contrib_repo.get_one.return_value = existing with pytest.raises(ValidationError, match="formula is required when material_id"): - await svc.patch_contribution_by_id(str(existing.id), ContributionPatch(material_id="mp-1")) + await svc.patch_one(str(existing.id), ContributionPatch(material_id="mp-1")) # Rejected before any write. contrib_repo.patch_one.assert_not_called() @@ -1513,7 +1513,7 @@ async def test_patch_material_id_when_existing_has_formula_ok(self): contrib_repo.get_one.return_value = existing contrib_repo.patch_one.return_value = MagicMock(spec=Contribution) - await svc.patch_contribution_by_id(str(existing.id), ContributionPatch(material_id="mp-1")) + await svc.patch_one(str(existing.id), ContributionPatch(material_id="mp-1")) contrib_repo.patch_one.assert_called_once() @@ -1521,7 +1521,7 @@ async def test_metadata_only_patch_skips_existing_read(self): svc, contrib_repo, *_ = _make_service() contrib_repo.patch_one.return_value = MagicMock(spec=Contribution) - await svc.patch_contribution_by_id("some-id", ContributionPatch(is_public=True)) + await svc.patch_one("some-id", ContributionPatch(is_public=True)) # No identity/unique inputs touched -> no re-read, straight to the plain patch. contrib_repo.get_one.assert_not_called() @@ -1529,7 +1529,7 @@ async def test_metadata_only_patch_skips_existing_read(self): # --------------------------------------------------------------------------- -# patch_contribution_by_id — data merge vs replace + unique_value resolution +# patch_one — data merge vs replace + unique_value resolution # --------------------------------------------------------------------------- @@ -1541,7 +1541,7 @@ async def test_data_patch_defaults_to_merge_and_forwards_replace_false(self): contrib_repo.get_one.return_value = existing contrib_repo.patch_one.return_value = MagicMock(spec=Contribution) - await svc.patch_contribution_by_id(str(existing.id), ContributionPatch(data={"y": 9.0})) + await svc.patch_one(str(existing.id), ContributionPatch(data={"y": 9.0})) # The repo performs the actual dotted-$set merge; the service just forwards replace_data=False. assert contrib_repo.patch_one.call_args.kwargs["replace_data"] is False @@ -1553,7 +1553,7 @@ async def test_replace_data_flag_forwarded_to_repo(self): contrib_repo.get_one.return_value = existing contrib_repo.patch_one.return_value = MagicMock(spec=Contribution) - await svc.patch_contribution_by_id( + await svc.patch_one( str(existing.id), ContributionPatch(data={"y": 9.0}), replace_data=True ) @@ -1568,7 +1568,7 @@ async def test_merge_resolves_unique_value_from_merged_state(self): contrib_repo.get_one.return_value = existing contrib_repo.patch_one.return_value = MagicMock(spec=Contribution) - await svc.patch_contribution_by_id(str(existing.id), ContributionPatch(data={"y": 9.0})) + await svc.patch_one(str(existing.id), ContributionPatch(data={"y": 9.0})) # Resolved from {sample_id:42, x:1, y:9}, so the untouched unique_value survives the merge. assert contrib_repo.patch_one.call_args.kwargs["unique_value"] == 42 @@ -1582,7 +1582,7 @@ async def test_replace_resolves_unique_value_from_patch_data_only(self): contrib_repo.get_one.return_value = existing with pytest.raises(ValidationError, match="unique_column"): - await svc.patch_contribution_by_id( + await svc.patch_one( str(existing.id), ContributionPatch(data={"y": 9.0}), replace_data=True ) contrib_repo.patch_one.assert_not_called() diff --git a/mpcontribs-api/tests/unit/domains/test_project_group_service.py b/mpcontribs-api/tests/unit/domains/test_project_group_service.py index 52a90d68b9..c4a5127662 100644 --- a/mpcontribs-api/tests/unit/domains/test_project_group_service.py +++ b/mpcontribs-api/tests/unit/domains/test_project_group_service.py @@ -28,7 +28,7 @@ def _make_service(group: ProjectGroupOut | None, *, visible_projects: set[str] | visible = visible_projects or set() groups = AsyncMock() projects = AsyncMock() - # insert() forces owner to the caller for non-admins; give the stub an admin user so these + #.insert_one() forces owner to the caller for non-admins; give the stub an admin user so these # payload-identity assertions exercise the pass-through path (owner-forcing is covered end-to-end # in the db service test). groups._user = User(username="google:admin@example.com", groups=frozenset({"admin"})) @@ -66,35 +66,35 @@ def _group(project_ids: list[str] | None = None) -> ProjectGroupOut: # --------------------------------------------------------------------------- -# insert +#.insert_one # --------------------------------------------------------------------------- -class TestInsert: +class TestInsert_one: def _payload(self, projects: list[str]) -> ProjectGroupIn: return ProjectGroupIn(name="g", owner="google:a@b.com", description="d", projects=projects) - async def test_all_projects_valid_inserts(self): + async def test_all_projects_valid_insert_ones(self): service, groups, _ = _make_service(None, visible_projects={"mp-1", "mp-2"}) - groups.insert_project_group.return_value = "stored" + groups.insert_one.return_value = "stored" payload = self._payload(["mp-1", "mp-2"]) - result = await service.insert(payload) + result = await service.insert_one(payload) assert result == "stored" - groups.insert_project_group.assert_awaited_once_with(payload) + groups.insert_one.assert_awaited_once_with(in_resource=payload) - async def test_missing_project_raises_not_found_and_skips_insert(self): + async def test_missing_project_raises_not_found_and_skips_insert_one(self): service, groups, _ = _make_service(None, visible_projects={"mp-1"}) with pytest.raises(NotFoundError) as exc: - await service.insert(self._payload(["mp-1", "ghost"])) + await service.insert_one(self._payload(["mp-1", "ghost"])) assert exc.value.context["ids"] == ["ghost"] - groups.insert_project_group.assert_not_awaited() + groups.insert_one.assert_not_awaited() - async def test_empty_projects_inserts_without_validation(self): + async def test_empty_projects_insert_ones_without_validation(self): service, groups, projects = _make_service(None) payload = self._payload([]) - await service.insert(payload) + await service.insert_one(payload) projects.get_one.assert_not_awaited() - groups.insert_project_group.assert_awaited_once_with(payload) + groups.insert_one.assert_awaited_once_with(in_resource=payload) # ---------------------------------------------------------------------------